diff options
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/BlackthornGym1F.asm | 2 | ||||
| -rw-r--r-- | maps/LakeofRage.asm | 4 | ||||
| -rw-r--r-- | maps/MahoganyMart1F.asm | 6 | ||||
| -rw-r--r-- | maps/MahoganyTown.asm | 4 | ||||
| -rw-r--r-- | maps/RadioTower5F.asm | 2 | ||||
| -rw-r--r-- | maps/TeamRocketBaseB1F.asm | 2 | ||||
| -rw-r--r-- | maps/second_map_headers.asm | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 081736b6a..ca810cf23 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -47,7 +47,7 @@ ClairScript_0x194e24: setevent EVENT_BEAT_COOLTRAINERM_MIKE setevent EVENT_BEAT_COOLTRAINERF_FRAN setevent EVENT_BEAT_COOLTRAINERF_LOLA - clearevent EVENT_MAHOGANY_MARTTYPE_OWNERS + clearevent EVENT_MAHOGANY_MART_OWNERS setevent EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN clearevent EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN end diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index 0f03243e6..3ecc820cb 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeofRage.asm @@ -51,9 +51,9 @@ UnknownScript_0x70035: playsound SFX_WARP_TO applymovement $2, MovementData_0x70155 disappear $2 - clearevent EVENT_MAHOGANY_MARTTYPE_LANCE_AND_DRAGONITE + clearevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE setevent EVENT_DECIDED_TO_HELP_LANCE - domaptrigger MAHOGANY_MARTTYPE_1F, $1 + domaptrigger MAHOGANY_MART_1F, $1 end UnknownScript_0x7004e: diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 427911e8b..95ad194dc 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -238,6 +238,6 @@ MahoganyMart1F_MapEventHeader: db 5 person_event SPRITE_PHARMACIST, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_BLACK_BELT, 6, 1, SPRITEMOVEDATA_03, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_LANCE, 6, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MAHOGANY_MARTTYPE_LANCE_AND_DRAGONITE - person_event SPRITE_DRAGON, 6, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MAHOGANY_MARTTYPE_LANCE_AND_DRAGONITE - person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MARTTYPE_OWNERS + person_event SPRITE_LANCE, 6, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE + person_event SPRITE_DRAGON, 6, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE + person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 7b78e67cc..f7c1bcc08 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -248,7 +248,7 @@ MahoganyTown_MapEventHeader: .Warps: db 5 - warp_def $7, $b, 1, MAHOGANY_MARTTYPE_1F + warp_def $7, $b, 1, MAHOGANY_MART_1F warp_def $7, $11, 1, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE warp_def $d, $6, 1, MAHOGANY_GYM warp_def $d, $f, 1, MAHOGANY_POKECENTER_1F @@ -271,4 +271,4 @@ MahoganyTown_MapEventHeader: person_event SPRITE_POKEFAN_M, 8, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST person_event SPRITE_GRAMPS, 9, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, 0, 0, GrampsScript_0x19007e, -1 person_event SPRITE_FISHER, 14, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x190092, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM - person_event SPRITE_LASS, 8, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, LassScript_0x190095, EVENT_MAHOGANY_MARTTYPE_OWNERS + person_event SPRITE_LASS, 8, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, LassScript_0x190095, EVENT_MAHOGANY_MART_OWNERS diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 964d96eda..a7516aa10 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -102,7 +102,7 @@ UnknownScript_0x6006e: setevent EVENT_GOLDENROD_CITY_ROCKET_SCOUT setevent EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER setevent EVENT_RADIO_TOWER_ROCKET_TAKEOVER - clearevent EVENT_MAHOGANY_MARTTYPE_OWNERS + clearevent EVENT_MAHOGANY_MART_OWNERS clearflag ENGINE_ROCKETS_IN_MAHOGANY clearevent EVENT_GOLDENROD_CITY_CIVILIANS clearevent EVENT_RADIO_TOWER_CIVILIANS_AFTER diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 6b2378a3a..ea250ae37 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -730,7 +730,7 @@ TeamRocketBaseB1F_MapEventHeader: .Warps: db 4 - warp_def $2, $1b, 3, MAHOGANY_MARTTYPE_1F + warp_def $2, $1b, 3, MAHOGANY_MART_1F warp_def $e, $3, 1, TEAM_ROCKET_BASE_B2F warp_def $f, $5, 4, TEAM_ROCKET_BASE_B1F warp_def $2, $19, 3, TEAM_ROCKET_BASE_B1F diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm index 1c02fdfc3..c79d02a33 100644 --- a/maps/second_map_headers.asm +++ b/maps/second_map_headers.asm @@ -325,7 +325,7 @@ map_header_2 OlivineLighthouse4F, OLIVINE_LIGHTHOUSE_4F, $0, 0 map_header_2 OlivineLighthouse5F, OLIVINE_LIGHTHOUSE_5F, $0, 0 map_header_2 OlivineLighthouse6F, OLIVINE_LIGHTHOUSE_6F, $0, 0 - map_header_2 MahoganyMart1F, MAHOGANY_MARTTYPE_1F, $0, 0 + map_header_2 MahoganyMart1F, MAHOGANY_MART_1F, $0, 0 map_header_2 TeamRocketBaseB1F, TEAM_ROCKET_BASE_B1F, $0, 0 map_header_2 TeamRocketBaseB2F, TEAM_ROCKET_BASE_B2F, $0, 0 map_header_2 TeamRocketBaseB3F, TEAM_ROCKET_BASE_B3F, $0, 0 |