diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/events/std_scripts.asm | 20 | ||||
| -rw-r--r-- | engine/gfx/cgb_layouts.asm | 4 | ||||
| -rw-r--r-- | engine/gfx/sgb_layouts.asm | 6 | ||||
| -rw-r--r-- | engine/movie/title.asm | 2 |
4 files changed, 16 insertions, 16 deletions
diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index c1e9164c..0ec1e76c 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -441,16 +441,16 @@ InitializeEventsScript: setevent EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER setevent EVENT_RADIO_TOWER_CIVILIANS_AFTER setevent EVENT_ILEX_FOREST_APPRENTICE - setevent EVENT_ILEX_FOREST_FARFETCHD1 - setevent EVENT_ILEX_FOREST_FARFETCHD2 - setevent EVENT_ILEX_FOREST_FARFETCHD3 - setevent EVENT_ILEX_FOREST_FARFETCHD4 - setevent EVENT_ILEX_FOREST_FARFETCHD5 - setevent EVENT_ILEX_FOREST_FARFETCHD6 - setevent EVENT_ILEX_FOREST_FARFETCHD7 - setevent EVENT_ILEX_FOREST_FARFETCHD8 - setevent EVENT_ILEX_FOREST_FARFETCHD9 - setevent EVENT_ILEX_FOREST_FARFETCHD10 + setevent EVENT_ILEX_FOREST_FARFETCHD_1 + setevent EVENT_ILEX_FOREST_FARFETCHD_2 + setevent EVENT_ILEX_FOREST_FARFETCHD_3 + setevent EVENT_ILEX_FOREST_FARFETCHD_4 + setevent EVENT_ILEX_FOREST_FARFETCHD_5 + setevent EVENT_ILEX_FOREST_FARFETCHD_6 + setevent EVENT_ILEX_FOREST_FARFETCHD_7 + setevent EVENT_ILEX_FOREST_FARFETCHD_8 + setevent EVENT_ILEX_FOREST_FARFETCHD_9 + setevent EVENT_ILEX_FOREST_FARFETCHD_10 setevent EVENT_ILEX_FOREST_CHARCOAL_MASTER setevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE setevent EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm index a9a2038a..f368468f 100644 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm @@ -61,7 +61,7 @@ LoadSGBLayoutCGB: dw _CGB_TrainerOrMonFrontpicPals dw _CGB_MysteryGift dw _CGB1e - dw _CGB_Pokedex_5_5 + dw _CGB_Pokedex_5x5 _CGB_BattleGrayscale: ld hl, PalPacket_BattleGrayscale + 1 @@ -229,7 +229,7 @@ _CGB_Pokedex: call FillBoxCGB jp _CGB_Pokedex_Resume -_CGB_Pokedex_5_5: +_CGB_Pokedex_5x5: call _CGB_Pokedex_Init hlcoord 1, 1, wAttrmap lb bc, 5, 5 diff --git a/engine/gfx/sgb_layouts.asm b/engine/gfx/sgb_layouts.asm index 561d6063..8e86210f 100644 --- a/engine/gfx/sgb_layouts.asm +++ b/engine/gfx/sgb_layouts.asm @@ -53,7 +53,7 @@ LoadSGBLayout: dw .SGB_TrainerOrMonFrontpicPals dw .SGB_MysteryGift dw .SGB1e - dw .SGB_Pokedex_5_5 + dw .SGB_Pokedex_5x5 .SGB_BattleGrayscale: ld hl, PalPacket_BattleGrayscale @@ -224,9 +224,9 @@ LoadSGBLayout: ld de, BlkPacket_Pokedex_PC ret -.SGB_Pokedex_5_5: +.SGB_Pokedex_5x5: call .SGB_Pokedex - ld de, BlkPacket_9f65 + ld de, BlkPacket_Pokedex_5x5 ret .SGB_BillsPC: diff --git a/engine/movie/title.asm b/engine/movie/title.asm index e3d93b3d..cfcf8c62 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -69,7 +69,7 @@ TitleScreen: ld [hl], a ; wTitleScreenTimer + 1 depixel 12, 11 - ld a, SPRITE_ANIM_INDEX_GS_INTRO_HO_OH + ld a, SPRITE_ANIM_INDEX_GS_INTRO_HO_OH_LUGIA call InitSpriteAnimStruct ld hl, wSpriteAnim1 ld de, wSpriteAnim10 |