diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/map_triggers.asm | 2 | ||||
| -rw-r--r-- | engine/pack.asm | 2 | ||||
| -rw-r--r-- | engine/std_scripts.asm | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/engine/map_triggers.asm b/engine/map_triggers.asm index 52822f90b..2b190fa3e 100644 --- a/engine/map_triggers.asm +++ b/engine/map_triggers.asm @@ -71,7 +71,7 @@ ENDM trigger_def RUINS_OF_ALPH_OMANYTE_CHAMBER, wRuinsOfAlphOmanyteChamberTrigger trigger_def RUINS_OF_ALPH_AERODACTYL_CHAMBER, wRuinsOfAlphAerodactylChamberTrigger trigger_def RUINS_OF_ALPH_INNER_CHAMBER, wRuinsOfAlphInnerChamberTrigger - trigger_def MAHOGANY_MARTTYPE_1F, wMahoganyMart1FTrigger + trigger_def MAHOGANY_MART_1F, wMahoganyMart1FTrigger trigger_def TEAM_ROCKET_BASE_B1F, wTeamRocketBaseB1FTrigger trigger_def TEAM_ROCKET_BASE_B2F, wTeamRocketBaseB2FTrigger trigger_def TEAM_ROCKET_BASE_B3F, wTeamRocketBaseB3FTrigger diff --git a/engine/pack.asm b/engine/pack.asm index c9168789d..b753d6ade 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -1411,7 +1411,7 @@ Function10955: ; 10955 ld a, BANK(PackMenuGFX) call FarCopyBytes hlcoord 0, 1 - lb bc, 0, 220 + ld bc, 220 ld a, $24 call ByteFill hlcoord 5, 1 diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index 1bb4a61d8..5c0df0355 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -489,7 +489,7 @@ InitializeEventsScript: setevent EVENT_ILEX_FOREST_APPRENTICE setevent EVENT_ILEX_FOREST_FARFETCHD setevent EVENT_ILEX_FOREST_CHARCOAL_MASTER - setevent EVENT_MAHOGANY_MARTTYPE_LANCE_AND_DRAGONITE + setevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE setevent EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE setevent EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE setevent EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE @@ -535,7 +535,7 @@ InitializeEventsScript: setevent EVENT_FAST_SHIP_B1F_SAILOR_RIGHT setevent EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR setevent EVENT_LAKE_OF_RAGE_CIVILIANS - setevent EVENT_MAHOGANY_MARTTYPE_OWNERS + setevent EVENT_MAHOGANY_MART_OWNERS setevent EVENT_TIN_TOWER_ROOF_HO_OH setevent EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA setevent EVENT_KRISS_HOUSE_2F_CONSOLE |