diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-02 17:38:08 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-02 17:38:08 -0500 |
| commit | 0f37a42ad45d8950c83b31215523e2e1cc7c2d21 (patch) | |
| tree | f15ae45541840b49a54e21d3e355a81a66a904ee /engine | |
| parent | d4950870266b9c7305430e251b76e83175b81068 (diff) | |
Mart constants
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/map_triggers.asm | 2 | ||||
| -rw-r--r-- | engine/std_scripts.asm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engine/map_triggers.asm b/engine/map_triggers.asm index 2b190fa3e..52822f90b 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_MART_1F, wMahoganyMart1FTrigger + trigger_def MAHOGANY_MARTTYPE_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/std_scripts.asm b/engine/std_scripts.asm index 5c0df0355..1bb4a61d8 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_MART_LANCE_AND_DRAGONITE + setevent EVENT_MAHOGANY_MARTTYPE_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_MART_OWNERS + setevent EVENT_MAHOGANY_MARTTYPE_OWNERS setevent EVENT_TIN_TOWER_ROOF_HO_OH setevent EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA setevent EVENT_KRISS_HOUSE_2F_CONSOLE |