Skip to content

Commit e66219e

Browse files
Rename NidorinoIntro to PikachuIntro
1 parent 451b494 commit e66219e

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

data/cgb/bg_map_attributes.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ BGMapAttributes_PartyMenu:
173173
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
174174
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
175175

176-
BGMapAttributes_NidorinoIntro:
176+
BGMapAttributes_PikachuIntro:
177177
db $23
178178
dw $000d
179179
db $00

data/sgb/sgb_packets.asm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ BlkPacket_Titlescreen:
9191
ATTR_BLK_DATA %010, 0,0,0, 09,08, 10,08 ; pika bubble: pal 0
9292
ds 12, 0
9393

94-
BlkPacket_NidorinoIntro:
94+
BlkPacket_PikachuIntro:
9595
ATTR_BLK 3
9696
ATTR_BLK_DATA %011, 1,1,0, 00,00, 19,03 ; upper black bar: pal 1
9797
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
145145
PalPacket_Titlescreen: PAL_SET PAL_LOGO2, PAL_LOGO1, PAL_MEWMON, PAL_PURPLEMON
146146
PalPacket_TrainerCard: PAL_SET PAL_MEWMON, PAL_BADGE, PAL_REDMON, PAL_YELLOWMON
147147
PalPacket_Generic: PAL_SET PAL_MEWMON, 0, 0, 0
148-
PalPacket_NidorinoIntro: PAL_SET PAL_PURPLEMON, PAL_BLACK, 0, 0
148+
PalPacket_PikachuIntro: PAL_SET PAL_PURPLEMON, PAL_BLACK, 0, 0
149149
PalPacket_GameFreakIntro: PAL_SET PAL_GAMEFREAK, PAL_REDMON, PAL_VIRIDIAN, PAL_BLUEMON
150150
PalPacket_PikachusBeach: PAL_SET PAL_PIKACHUS_BEACH, PAL_PIKACHUS_BEACH, PAL_PIKACHUS_BEACH, PAL_PIKACHUS_BEACH
151151
PalPacket_PikachusBeachTitle: PAL_SET PAL_PIKACHUS_BEACH, PAL_PIKACHUS_BEACH_TITLE, PAL_PIKACHUS_BEACH, PAL_PIKACHUS_BEACH

engine/gfx/bg_map_attributes.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ BGMapAttributesPointers:
109109
dw BGMapAttributes_GameFreakIntro
110110
dw BGMapAttributes_TrainerCard
111111
dw BGMapAttributes_PartyMenu
112-
dw BGMapAttributes_NidorinoIntro
112+
dw BGMapAttributes_PikachuIntro
113113
dw BGMapAttributes_TitleScreen
114114
dw BGMapAttributes_Slots
115115
dw BGMapAttributes_Pokedex

engine/gfx/palettes.asm

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,10 @@ SetPal_Generic:
127127
ld de, BlkPacket_WholeScreen
128128
ret
129129

130-
SetPal_NidorinoIntro:
131-
ld hl, PalPacket_NidorinoIntro
132-
ld de, BlkPacket_NidorinoIntro
130+
; used for splash screen and the Pikachu intro scenes surfing and flying
131+
SetPal_PikachuIntro:
132+
ld hl, PalPacket_PikachuIntro
133+
ld de, BlkPacket_PikachuIntro
133134
ret
134135

135136
SetPal_GameFreakIntro:
@@ -272,7 +273,7 @@ SetPalFunctions:
272273
dw SetPal_Pokedex
273274
dw SetPal_Slots
274275
dw SetPal_TitleScreen
275-
dw SetPal_NidorinoIntro
276+
dw SetPal_PikachuIntro
276277
dw SetPal_Generic
277278
dw SetPal_Overworld
278279
dw SetPal_PartyMenu
@@ -1054,7 +1055,7 @@ palPacketPointers:
10541055
dw BlkPacket_Pokedex
10551056
dw BlkPacket_Slots
10561057
dw BlkPacket_Titlescreen
1057-
dw BlkPacket_NidorinoIntro
1058+
dw BlkPacket_PikachuIntro
10581059
dw wPartyMenuBlkPacket
10591060
dw wTrainerCardBlkPacket
10601061
dw BlkPacket_GameFreakIntro

0 commit comments

Comments
 (0)