From e66219e7caf043cf894c37665adf47dd25ca20b2 Mon Sep 17 00:00:00 2001 From: CreamElDudJafar Date: Sun, 23 Nov 2025 09:20:34 -0600 Subject: [PATCH] Rename NidorinoIntro to PikachuIntro --- data/cgb/bg_map_attributes.asm | 2 +- data/sgb/sgb_packets.asm | 4 ++-- engine/gfx/bg_map_attributes.asm | 2 +- engine/gfx/palettes.asm | 11 ++++++----- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/data/cgb/bg_map_attributes.asm b/data/cgb/bg_map_attributes.asm index 81535e72a..2ebafd95f 100644 --- a/data/cgb/bg_map_attributes.asm +++ b/data/cgb/bg_map_attributes.asm @@ -173,7 +173,7 @@ BGMapAttributes_PartyMenu: db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 -BGMapAttributes_NidorinoIntro: +BGMapAttributes_PikachuIntro: db $23 dw $000d db $00 diff --git a/data/sgb/sgb_packets.asm b/data/sgb/sgb_packets.asm index f42475cac..f644a5ec7 100644 --- a/data/sgb/sgb_packets.asm +++ b/data/sgb/sgb_packets.asm @@ -91,7 +91,7 @@ BlkPacket_Titlescreen: ATTR_BLK_DATA %010, 0,0,0, 09,08, 10,08 ; pika bubble: pal 0 ds 12, 0 -BlkPacket_NidorinoIntro: +BlkPacket_PikachuIntro: ATTR_BLK 3 ATTR_BLK_DATA %011, 1,1,0, 00,00, 19,03 ; upper black bar: pal 1 ATTR_BLK_DATA %011, 0,0,0, 00,04, 19,13 ; letterbox: pal 0 @@ -145,7 +145,7 @@ PalPacket_Slots: PAL_SET PAL_SLOTS1, PAL_SLOTS2, PAL_SLOTS3, PAL_SL PalPacket_Titlescreen: PAL_SET PAL_LOGO2, PAL_LOGO1, PAL_MEWMON, PAL_PURPLEMON PalPacket_TrainerCard: PAL_SET PAL_MEWMON, PAL_BADGE, PAL_REDMON, PAL_YELLOWMON PalPacket_Generic: PAL_SET PAL_MEWMON, 0, 0, 0 -PalPacket_NidorinoIntro: PAL_SET PAL_PURPLEMON, PAL_BLACK, 0, 0 +PalPacket_PikachuIntro: PAL_SET PAL_PURPLEMON, PAL_BLACK, 0, 0 PalPacket_GameFreakIntro: PAL_SET PAL_GAMEFREAK, PAL_REDMON, PAL_VIRIDIAN, PAL_BLUEMON PalPacket_PikachusBeach: PAL_SET PAL_PIKACHUS_BEACH, PAL_PIKACHUS_BEACH, PAL_PIKACHUS_BEACH, PAL_PIKACHUS_BEACH PalPacket_PikachusBeachTitle: PAL_SET PAL_PIKACHUS_BEACH, PAL_PIKACHUS_BEACH_TITLE, PAL_PIKACHUS_BEACH, PAL_PIKACHUS_BEACH diff --git a/engine/gfx/bg_map_attributes.asm b/engine/gfx/bg_map_attributes.asm index cc550ff8c..e3b6d0cfa 100644 --- a/engine/gfx/bg_map_attributes.asm +++ b/engine/gfx/bg_map_attributes.asm @@ -109,7 +109,7 @@ BGMapAttributesPointers: dw BGMapAttributes_GameFreakIntro dw BGMapAttributes_TrainerCard dw BGMapAttributes_PartyMenu - dw BGMapAttributes_NidorinoIntro + dw BGMapAttributes_PikachuIntro dw BGMapAttributes_TitleScreen dw BGMapAttributes_Slots dw BGMapAttributes_Pokedex diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index e46c6715f..700858c7c 100644 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -127,9 +127,10 @@ SetPal_Generic: ld de, BlkPacket_WholeScreen ret -SetPal_NidorinoIntro: - ld hl, PalPacket_NidorinoIntro - ld de, BlkPacket_NidorinoIntro +; used for splash screen and the Pikachu intro scenes surfing and flying +SetPal_PikachuIntro: + ld hl, PalPacket_PikachuIntro + ld de, BlkPacket_PikachuIntro ret SetPal_GameFreakIntro: @@ -272,7 +273,7 @@ SetPalFunctions: dw SetPal_Pokedex dw SetPal_Slots dw SetPal_TitleScreen - dw SetPal_NidorinoIntro + dw SetPal_PikachuIntro dw SetPal_Generic dw SetPal_Overworld dw SetPal_PartyMenu @@ -1054,7 +1055,7 @@ palPacketPointers: dw BlkPacket_Pokedex dw BlkPacket_Slots dw BlkPacket_Titlescreen - dw BlkPacket_NidorinoIntro + dw BlkPacket_PikachuIntro dw wPartyMenuBlkPacket dw wTrainerCardBlkPacket dw BlkPacket_GameFreakIntro