Skip to content

Rename NidorinoIntro to PikachuIntro to avoid confusion #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
CreamElDudJafar wants to merge 1 commit into from
Closed

Rename NidorinoIntro to PikachuIntro to avoid confusion #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/cgb/bg_map_attributes.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions data/sgb/sgb_packets.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion engine/gfx/bg_map_attributes.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 6 additions & 5 deletions engine/gfx/palettes.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

@Rangi42 Rangi42 Nov 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the label name is fine, this comment isn't necessary.

Suggested change
; 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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down