diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-23 12:59:19 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-23 12:59:19 -0400 |
| commit | 432df825d4039a44a49fff01ef843395ab5abb3d (patch) | |
| tree | 5a2dce3edf871a8d420b927411cee6ef1f931781 | |
| parent | 185b0a1c86e442d9c3ecd38d7c3fc7cfdb24be21 (diff) | |
Replaced GROUP_, MAP_ references with the map macro
Updated macros that rely on the GROUP_, MAP_ constants to use the map macro
Added GROUP_NONE and MAP_NONE for the sake of compatibility with this new scheme
Added new macro elevfloor to simplify the definition of elevators under this new scheme
389 files changed, 1551 insertions, 1551 deletions
diff --git a/constants/deco_constants.asm b/constants/deco_constants.asm index 1038e40f7..de8edb652 100644 --- a/constants/deco_constants.asm +++ b/constants/deco_constants.asm @@ -1,105 +1,105 @@ -const_value = 1
- const DECO_PLANT
- const DECO_BED
- const DECO_CARPET
- const DECO_POSTER
- const DECO_DOLL
- const DECO_BIGDOLL
-
-const_value = 1
- const PUT_IT_AWAY
- const MAGNAPLANT
- const TROPICPLANT
- const JUMBOPLANT
- const TOWN_MAP_D
- const FAMICOM
- const SUPER_NES
- const NINTENDO_64
- const VIRTUAL_BOY
- const GOLD_TROPHY
- const SILVER_TROPHY
- const SURF_PIKA_DOLL
- const _BED
- const _CARPET
- const _POSTER
- const _DOLL
- const BIG_
- const FEATHERY_BED
- const PIKACHU_BED
- const PINK_BED
- const POLKADOT_BED
- const RED_CARPET
- const BLUE_CARPET
- const YELLOW_CARPET
- const GREEN_CARPET
-
-const_value = 1
- const SET_UP_BED
- const PUT_AWAY_BED
- const SET_UP_CARPET
- const PUT_AWAY_CARPET
- const SET_UP_PLANT
- const PUT_AWAY_PLANT
- const SET_UP_POSTER
- const PUT_AWAY_POSTER
- const SET_UP_CONSOLE
- const PUT_AWAY_CONSOLE
- const SET_UP_BIG_DOLL
- const PUT_AWAY_BIG_DOLL
- const SET_UP_DOLL
- const PUT_AWAY_DOLL
- const SET_UP_ORNAMENT
- const PUT_AWAY_ORNAMENT
-
-const_value = 2
- const DECO_FEATHERY_BED ; 2
- const DECO_PINK_BED ; 3
- const DECO_POLKADOT_BED ; 4
- const DECO_PIKACHU_BED ; 5
-const_value = const_value + 1
- const DECO_RED_CARPET ; 7
- const DECO_BLUE_CARPET ; 8
- const DECO_YELLOW_CARPET ; 9
- const DECO_GREEN_CARPET ; a
-const_value = const_value + 1
- const DECO_MAGNAPLANT ; c
- const DECO_TROPICPLANT ; d
- const DECO_JUMBOPLANT ; e
-const_value = const_value + 1
- const DECO_TOWN_MAP ; 10
- const DECO_PIKACHU_POSTER ; 11
- const DECO_CLEFAIRY_POSTER ; 12
- const DECO_JIGGLYPUFF_POSTER ; 13
-const_value = const_value + 1
- const DECO_FAMICOM ; 15
- const DECO_SNES ; 16
- const DECO_N64 ; 17
- const DECO_VIRTUAL_BOY ; 18
-const_value = const_value + 1
- const DECO_BIG_SNORLAX_DOLL ; 1a
- const DECO_BIG_ONIX_DOLL ; 1b
- const DECO_BIG_LAPRAS_DOLL ; 1c
-const_value = const_value + 1
- const DECO_PIKACHU_DOLL ; 1e
- const DECO_SURF_PIKACHU_DOLL ; 1f
- const DECO_CLEFAIRY_DOLL ; 20
- const DECO_JIGGLYPUFF_DOLL ; 21
- const DECO_BULBASAUR_DOLL ; 22
- const DECO_CHARMANDER_DOLL ; 23
- const DECO_SQUIRTLE_DOLL ; 24
- const DECO_POLIWAG_DOLL ; 25
- const DECO_DIGLETT_DOLL ; 26
- const DECO_STARMIE_DOLL ; 27
- const DECO_MAGIKARP_DOLL ; 28
- const DECO_ODDISH_DOLL ; 29
- const DECO_GENGAR_DOLL ; 2a
- const DECO_SHELLDER_DOLL ; 2b
- const DECO_GRIMER_DOLL ; 2c
- const DECO_VOLTORB_DOLL ; 2d
- const DECO_WEEDLE_DOLL ; 2e
- const DECO_UNOWN_DOLL ; 2f
- const DECO_GEODUDE_DOLL ; 30
- const DECO_MACHOP_DOLL ; 31
- const DECO_TENTACOOL_DOLL ; 32
- const DECO_GOLD_TROPHY_DOLL ; 33
- const DECO_SILVER_TROPHY_DOLL ; 34
+const_value = 1 + const DECO_PLANT + const DECO_BED + const DECO_CARPET + const DECO_POSTER + const DECO_DOLL + const DECO_BIGDOLL + +const_value = 1 + const PUT_IT_AWAY + const MAGNAPLANT + const TROPICPLANT + const JUMBOPLANT + const TOWN_MAP_D + const FAMICOM + const SUPER_NES + const NINTENDO_64 + const VIRTUAL_BOY + const GOLD_TROPHY + const SILVER_TROPHY + const SURF_PIKA_DOLL + const _BED + const _CARPET + const _POSTER + const _DOLL + const BIG_ + const FEATHERY_BED + const PIKACHU_BED + const PINK_BED + const POLKADOT_BED + const RED_CARPET + const BLUE_CARPET + const YELLOW_CARPET + const GREEN_CARPET + +const_value = 1 + const SET_UP_BED + const PUT_AWAY_BED + const SET_UP_CARPET + const PUT_AWAY_CARPET + const SET_UP_PLANT + const PUT_AWAY_PLANT + const SET_UP_POSTER + const PUT_AWAY_POSTER + const SET_UP_CONSOLE + const PUT_AWAY_CONSOLE + const SET_UP_BIG_DOLL + const PUT_AWAY_BIG_DOLL + const SET_UP_DOLL + const PUT_AWAY_DOLL + const SET_UP_ORNAMENT + const PUT_AWAY_ORNAMENT + +const_value = 2 + const DECO_FEATHERY_BED ; 2 + const DECO_PINK_BED ; 3 + const DECO_POLKADOT_BED ; 4 + const DECO_PIKACHU_BED ; 5 +const_value = const_value + 1 + const DECO_RED_CARPET ; 7 + const DECO_BLUE_CARPET ; 8 + const DECO_YELLOW_CARPET ; 9 + const DECO_GREEN_CARPET ; a +const_value = const_value + 1 + const DECO_MAGNAPLANT ; c + const DECO_TROPICPLANT ; d + const DECO_JUMBOPLANT ; e +const_value = const_value + 1 + const DECO_TOWN_MAP ; 10 + const DECO_PIKACHU_POSTER ; 11 + const DECO_CLEFAIRY_POSTER ; 12 + const DECO_JIGGLYPUFF_POSTER ; 13 +const_value = const_value + 1 + const DECO_FAMICOM ; 15 + const DECO_SNES ; 16 + const DECO_N64 ; 17 + const DECO_VIRTUAL_BOY ; 18 +const_value = const_value + 1 + const DECO_BIG_SNORLAX_DOLL ; 1a + const DECO_BIG_ONIX_DOLL ; 1b + const DECO_BIG_LAPRAS_DOLL ; 1c +const_value = const_value + 1 + const DECO_PIKACHU_DOLL ; 1e + const DECO_SURF_PIKACHU_DOLL ; 1f + const DECO_CLEFAIRY_DOLL ; 20 + const DECO_JIGGLYPUFF_DOLL ; 21 + const DECO_BULBASAUR_DOLL ; 22 + const DECO_CHARMANDER_DOLL ; 23 + const DECO_SQUIRTLE_DOLL ; 24 + const DECO_POLIWAG_DOLL ; 25 + const DECO_DIGLETT_DOLL ; 26 + const DECO_STARMIE_DOLL ; 27 + const DECO_MAGIKARP_DOLL ; 28 + const DECO_ODDISH_DOLL ; 29 + const DECO_GENGAR_DOLL ; 2a + const DECO_SHELLDER_DOLL ; 2b + const DECO_GRIMER_DOLL ; 2c + const DECO_VOLTORB_DOLL ; 2d + const DECO_WEEDLE_DOLL ; 2e + const DECO_UNOWN_DOLL ; 2f + const DECO_GEODUDE_DOLL ; 30 + const DECO_MACHOP_DOLL ; 31 + const DECO_TENTACOOL_DOLL ; 32 + const DECO_GOLD_TROPHY_DOLL ; 33 + const DECO_SILVER_TROPHY_DOLL ; 34 diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 49cf9c847..50b9aec25 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -1,5 +1,8 @@ -GROUP_N_A EQU -1 -MAP_N_A EQU -1 +GROUP_N_A EQU -1 +MAP_N_A EQU -1 + +GROUP_NONE EQU 0 +MAP_NONE EQU 0 ; map group ids const_def diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index 9aba26450..a7a41a8ce 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -1001,7 +1001,7 @@ UnknownScript_0xbd6a6: iftrue UnknownScript_0xbd6bd setflag ENGINE_DUNSPARCE_SWARM pokenamemem DUNSPARCE, $1 - loadwilddata $0, GROUP_DARK_CAVE_VIOLET_ENTRANCE, MAP_DARK_CAVE_VIOLET_ENTRANCE + loadwilddata $0, DARK_CAVE_VIOLET_ENTRANCE displaylocation DARK_CAVE, $2 farjump UnknownScript_0xa05de @@ -1224,7 +1224,7 @@ UnknownScript_0xbd887: iftrue UnknownScript_0xbd8a2 setflag ENGINE_YANMA_SWARM pokenamemem YANMA, $1 - loadwilddata $1, GROUP_ROUTE_35, MAP_ROUTE_35 + loadwilddata $1, ROUTE_35 displaylocation ROUTE_35, $2 farjump UnknownScript_0xa05ce diff --git a/engine/spawn_points.asm b/engine/spawn_points.asm index d5a648594..e577dc528 100644 --- a/engine/spawn_points.asm +++ b/engine/spawn_points.asm @@ -89,7 +89,7 @@ IsSpawnPoint: ; 15344 .next push bc - ld bc, 4 + ld bc, 4 ; length of a spawn table entry add hl, bc pop bc inc c diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index aa0b879a7..b1d6d0f08 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -298,7 +298,7 @@ RadioTowerRocketsScript: clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST specialphonecall ELMCALL_WEIRDBROADCAST - domaptrigger GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN, $1 + domaptrigger MAHOGANY_TOWN, $1 end BugContestResultsWarpScript: @@ -307,7 +307,7 @@ BugContestResultsWarpScript: setevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY clearevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY setevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE - warp GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE, $0, $4 + warp ROUTE_36_NATIONAL_PARK_GATE, $0, $4 applymovement $0, Movement_ContestResults_WalkAfterWarp BugContestResultsScript: @@ -356,7 +356,7 @@ BugContestResults_DidNotLeaveMons BugContestResults_CleanUp loadmovesprites dotrigger $0 - domaptrigger GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE, $0 + domaptrigger ROUTE_35_NATIONAL_PARK_GATE, $0 setevent EVENT_BUG_CATCHING_CONTESTANT_1A setevent EVENT_BUG_CATCHING_CONTESTANT_2A setevent EVENT_BUG_CATCHING_CONTESTANT_3A diff --git a/macros/event.asm b/macros/event.asm index 678648a04..f2ab6fae5 100644 --- a/macros/event.asm +++ b/macros/event.asm @@ -120,16 +120,14 @@ ptcallasm: macro enum checkmaptriggers_command checkmaptriggers: macro db checkmaptriggers_command - db \1 ; map_group - db \2 ; map_id + map \1 ; map endm enum domaptrigger_command domaptrigger: macro db domaptrigger_command - db \1 ; map_group - db \2 ; map_id - db \3 ; trigger_id + map \1 ; map + db \2 ; trigger_id endm enum checktriggers_command @@ -385,24 +383,21 @@ xycompare: macro warpmod: macro db warpmod_command db \1 ; warp_id - db \2 ; map_group - db \3 ; map_id + map \2 ; map endm enum blackoutmod_command blackoutmod: macro db blackoutmod_command - db \1 ; map_group - db \2 ; map_id + map \1 ; map endm enum warp_command warp: macro db warp_command - db \1 ; map_group - db \2 ; map_id - db \3 ; x - db \4 ; y + map \1 ; map + db \2 ; x + db \3 ; y endm enum readmoney_command @@ -997,8 +992,7 @@ verbosegiveitem2: macro loadwilddata: macro db loadwilddata_command db \1 ; flag - db \2 ; map_group - db \3 ; map_id + map \2 ; map endm enum halloffame_command @@ -1015,10 +1009,9 @@ credits: macro warpfacing: macro db warpfacing_command db \1 ; facing - db \2 ; map_group - db \3 ; map_id - db \4 ; x - db \5 ; y + map \2 ; map + db \3 ; x + db \4 ; y endm enum storetext_command diff --git a/macros/map.asm b/macros/map.asm index 17b1f5a65..30609e7ed 100644 --- a/macros/map.asm +++ b/macros/map.asm @@ -61,8 +61,7 @@ warp_def: macro db \1 ; y db \2 ; x db \3 ; warp_to - db \4 ; map group - db \5 ; map number + map \4 ; map endm @@ -177,3 +176,8 @@ newgroup: MACRO const_value = const_value + 1 enum_start 1 ENDM + +elevfloor: MACRO + db \1, \2 + map \3 +ENDM diff --git a/macros/trainer.asm b/macros/trainer.asm index b7c8ad803..2e6c61884 100644 --- a/macros/trainer.asm +++ b/macros/trainer.asm @@ -1,11 +1,11 @@ -trainerclass: MACRO
- enum \1
-const_value = 1
-ENDM
-
-trainer: MACRO
- ; flag, group, id, seen text, win text, lost text, talk-again text
- dw \1
- db \2, \3
- dw \4, \5, \6, \7
-ENDM
+trainerclass: MACRO + enum \1 +const_value = 1 +ENDM + +trainer: MACRO + ; flag, group, id, seen text, win text, lost text, talk-again text + dw \1 + db \2, \3 + dw \4, \5, \6, \7 +ENDM diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 4752a7545..b17939eef 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -358,8 +358,8 @@ AzaleaGym_MapEventHeader: .Warps: db 2 - warp_def $f, $4, 5, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN - warp_def $f, $5, 5, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN + warp_def $f, $4, 5, AZALEA_TOWN + warp_def $f, $5, 5, AZALEA_TOWN .XYTriggers: db 0 diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index ab03d588f..9a2642d23 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -46,8 +46,8 @@ AzaleaMart_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 3, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN - warp_def $7, $3, 3, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN + warp_def $7, $2, 3, AZALEA_TOWN + warp_def $7, $3, 3, AZALEA_TOWN .XYTriggers: db 0 diff --git a/maps/AzaleaPokeCenter1F.asm b/maps/AzaleaPokeCenter1F.asm index 344d258d7..5ca60d551 100644 --- a/maps/AzaleaPokeCenter1F.asm +++ b/maps/AzaleaPokeCenter1F.asm @@ -78,9 +78,9 @@ AzaleaPokeCenter1F_MapEventHeader: .Warps: db 3 - warp_def $7, $3, 1, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN - warp_def $7, $4, 1, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN - warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F + warp_def $7, $3, 1, AZALEA_TOWN + warp_def $7, $4, 1, AZALEA_TOWN + warp_def $7, $0, 1, POKECENTER_2F .XYTriggers: db 0 diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index c77258a31..c3016dd89 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -452,14 +452,14 @@ AzaleaTown_MapEventHeader: .Warps: db 8 - warp_def $9, $f, 1, GROUP_AZALEA_POKECENTER_1F, MAP_AZALEA_POKECENTER_1F - warp_def $d, $15, 1, GROUP_CHARCOAL_KILN, MAP_CHARCOAL_KILN - warp_def $5, $15, 2, GROUP_AZALEA_MART, MAP_AZALEA_MART - warp_def $5, $9, 1, GROUP_KURTS_HOUSE, MAP_KURTS_HOUSE - warp_def $f, $a, 1, GROUP_AZALEA_GYM, MAP_AZALEA_GYM - warp_def $7, $1f, 1, GROUP_SLOWPOKE_WELL_B1F, MAP_SLOWPOKE_WELL_B1F - warp_def $a, $2, 3, GROUP_ILEX_FOREST_AZALEA_GATE, MAP_ILEX_FOREST_AZALEA_GATE - warp_def $b, $2, 4, GROUP_ILEX_FOREST_AZALEA_GATE, MAP_ILEX_FOREST_AZALEA_GATE + warp_def $9, $f, 1, AZALEA_POKECENTER_1F + warp_def $d, $15, 1, CHARCOAL_KILN + warp_def $5, $15, 2, AZALEA_MART + warp_def $5, $9, 1, KURTS_HOUSE + warp_def $f, $a, 1, AZALEA_GYM + warp_def $7, $1f, 1, SLOWPOKE_WELL_B1F + warp_def $a, $2, 3, ILEX_FOREST_AZALEA_GATE + warp_def $b, $2, 4, ILEX_FOREST_AZALEA_GATE .XYTriggers: db 3 diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index fa5247b77..3672cbc6f 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -102,9 +102,9 @@ UnknownScript_0x9e44e: special Function170687 UnknownScript_0x9e454: musicfadeout MUSIC_NONE, $8 - domaptrigger GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM, $0 - domaptrigger GROUP_BATTLE_TOWER_ELEVATOR, MAP_BATTLE_TOWER_ELEVATOR, $0 - domaptrigger GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY, $0 + domaptrigger BATTLE_TOWER_BATTLE_ROOM, $0 + domaptrigger BATTLE_TOWER_ELEVATOR, $0 + domaptrigger BATTLE_TOWER_HALLWAY, $0 follow $2, $0 applymovement $2, MovementData_0x9e571 writebyte $a @@ -797,9 +797,9 @@ BattleTower1F_MapEventHeader: .Warps: db 3 - warp_def $9, $7, 3, GROUP_BATTLE_TOWER_OUTSIDE, MAP_BATTLE_TOWER_OUTSIDE - warp_def $9, $8, 4, GROUP_BATTLE_TOWER_OUTSIDE, MAP_BATTLE_TOWER_OUTSIDE - warp_def $0, $7, 1, GROUP_BATTLE_TOWER_ELEVATOR, MAP_BATTLE_TOWER_ELEVATOR + warp_def $9, $7, 3, BATTLE_TOWER_OUTSIDE + warp_def $9, $8, 4, BATTLE_TOWER_OUTSIDE + warp_def $0, $7, 1, BATTLE_TOWER_ELEVATOR .XYTriggers: db 0 diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 82753c221..c3930061d 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -85,14 +85,14 @@ UnknownScript_0x9f4a3: special Function170687 loadmovesprites special FadeBlackBGMap - warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7 + warpfacing $1, BATTLE_TOWER_1F, $7, $7 loadfont jump UnknownScript_0x9e4b0 UnknownScript_0x9f4c2: pause 60 special Special_BattleTowerFade - warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7 + warpfacing $1, BATTLE_TOWER_1F, $7, $7 writebyte $4 special Function170687 loadfont @@ -104,7 +104,7 @@ UnknownScript_0x9f4c2: UnknownScript_0x9f4d9: pause 60 special Special_BattleTowerFade - warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7 + warpfacing $1, BATTLE_TOWER_1F, $7, $7 BattleTowerBattleRoomScript_0x9f4e4: loadfont writetext UnknownText_0x9eaef @@ -144,8 +144,8 @@ BattleTowerBattleRoom_MapEventHeader: .Warps: db 2 - warp_def $7, $3, 4, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY - warp_def $7, $4, 4, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY + warp_def $7, $3, 4, BATTLE_TOWER_HALLWAY + warp_def $7, $4, 4, BATTLE_TOWER_HALLWAY .XYTriggers: db 0 diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index dafc0b3ff..2844ca926 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -49,8 +49,8 @@ BattleTowerElevator_MapEventHeader: .Warps: db 2 - warp_def $3, $1, 1, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY - warp_def $3, $2, 1, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY + warp_def $3, $1, 1, BATTLE_TOWER_HALLWAY + warp_def $3, $2, 1, BATTLE_TOWER_HALLWAY .XYTriggers: db 0 diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 311f8cc0f..7b9ce8f19 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -81,12 +81,12 @@ BattleTowerHallway_MapEventHeader: .Warps: db 6 - warp_def $1, $b, 1, GROUP_BATTLE_TOWER_ELEVATOR, MAP_BATTLE_TOWER_ELEVATOR - warp_def $0, $5, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM - warp_def $0, $7, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM - warp_def $0, $9, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM - warp_def $0, $d, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM - warp_def $0, $f, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM + warp_def $1, $b, 1, BATTLE_TOWER_ELEVATOR + warp_def $0, $5, 1, BATTLE_TOWER_BATTLE_ROOM + warp_def $0, $7, 1, BATTLE_TOWER_BATTLE_ROOM + warp_def $0, $9, 1, BATTLE_TOWER_BATTLE_ROOM + warp_def $0, $d, 1, BATTLE_TOWER_BATTLE_ROOM + warp_def $0, $f, 1, BATTLE_TOWER_BATTLE_ROOM .XYTriggers: db 0 diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index fe6374fe9..7211cb4d7 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -128,10 +128,10 @@ BattleTowerOutside_MapEventHeader: .Warps: db 4 - warp_def $15, $8, 3, GROUP_ROUTE_40_BATTLE_TOWER_GATE, MAP_ROUTE_40_BATTLE_TOWER_GATE - warp_def $15, $9, 4, GROUP_ROUTE_40_BATTLE_TOWER_GATE, MAP_ROUTE_40_BATTLE_TOWER_GATE - warp_def $9, $8, 1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F - warp_def $9, $9, 2, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F + warp_def $15, $8, 3, ROUTE_40_BATTLE_TOWER_GATE + warp_def $15, $9, 4, ROUTE_40_BATTLE_TOWER_GATE + warp_def $9, $8, 1, BATTLE_TOWER_1F + warp_def $9, $9, 2, BATTLE_TOWER_1F .XYTriggers: db 0 diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index 80c57851b..2adb05fb9 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -356,8 +356,8 @@ BillsHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 1, GROUP_ROUTE_25, MAP_ROUTE_25 - warp_def $7, $3, 1, GROUP_ROUTE_25, MAP_ROUTE_25 + warp_def $7, $2, 1, ROUTE_25 + warp_def $7, $3, 1, ROUTE_25 .XYTriggers: db 0 diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index acf85e29e..9a7c06cf3 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -309,14 +309,14 @@ BlackthornCity_MapEventHeader: .Warps: db 8 - warp_def $b, $12, 1, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F - warp_def $15, $d, 1, GROUP_BLACKTHORN_DRAGON_SPEECH_HOUSE, MAP_BLACKTHORN_DRAGON_SPEECH_HOUSE - warp_def $17, $1d, 1, GROUP_BLACKTHORN_DODRIO_TRADE_HOUSE, MAP_BLACKTHORN_DODRIO_TRADE_HOUSE - warp_def $1d, $f, 2, GROUP_BLACKTHORN_MART, MAP_BLACKTHORN_MART - warp_def $1d, $15, 1, GROUP_BLACKTHORN_POKECENTER_1F, MAP_BLACKTHORN_POKECENTER_1F - warp_def $1f, $9, 1, GROUP_MOVE_DELETERS_HOUSE, MAP_MOVE_DELETERS_HOUSE - warp_def $9, $24, 2, GROUP_ICE_PATH_1F, MAP_ICE_PATH_1F - warp_def $1, $14, 1, GROUP_DRAGONS_DEN_1F, MAP_DRAGONS_DEN_1F + warp_def $b, $12, 1, BLACKTHORN_GYM_1F + warp_def $15, $d, 1, BLACKTHORN_DRAGON_SPEECH_HOUSE + warp_def $17, $1d, 1, BLACKTHORN_DODRIO_TRADE_HOUSE + warp_def $1d, $f, 2, BLACKTHORN_MART + warp_def $1d, $15, 1, BLACKTHORN_POKECENTER_1F + warp_def $1f, $9, 1, MOVE_DELETERS_HOUSE + warp_def $9, $24, 2, ICE_PATH_1F + warp_def $1, $14, 1, DRAGONS_DEN_1F .XYTriggers: db 0 diff --git a/maps/BlackthornDodrioTradeHouse.asm b/maps/BlackthornDodrioTradeHouse.asm index a841b0ec2..0762b0f7c 100644 --- a/maps/BlackthornDodrioTradeHouse.asm +++ b/maps/BlackthornDodrioTradeHouse.asm @@ -22,8 +22,8 @@ BlackthornDodrioTradeHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 3, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY - warp_def $7, $3, 3, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY + warp_def $7, $2, 3, BLACKTHORN_CITY + warp_def $7, $3, 3, BLACKTHORN_CITY .XYTriggers: db 0 diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 75ea0894f..03fb74ef0 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -47,8 +47,8 @@ BlackthornDragonSpeechHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 2, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY - warp_def $7, $3, 2, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY + warp_def $7, $2, 2, BLACKTHORN_CITY + warp_def $7, $3, 2, BLACKTHORN_CITY .XYTriggers: db 0 diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 27701ded6..aef1a9305 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -386,13 +386,13 @@ BlackthornGym1F_MapEventHeader: .Warps: db 7 - warp_def $11, $4, 1, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY - warp_def $11, $5, 1, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY - warp_def $7, $1, 1, GROUP_BLACKTHORN_GYM_2F, MAP_BLACKTHORN_GYM_2F - warp_def $9, $7, 2, GROUP_BLACKTHORN_GYM_2F, MAP_BLACKTHORN_GYM_2F - warp_def $6, $2, 3, GROUP_BLACKTHORN_GYM_2F, MAP_BLACKTHORN_GYM_2F - warp_def $7, $7, 4, GROUP_BLACKTHORN_GYM_2F, MAP_BLACKTHORN_GYM_2F - warp_def $6, $7, 5, GROUP_BLACKTHORN_GYM_2F, MAP_BLACKTHORN_GYM_2F + warp_def $11, $4, 1, BLACKTHORN_CITY + warp_def $11, $5, 1, BLACKTHORN_CITY + warp_def $7, $1, 1, BLACKTHORN_GYM_2F + warp_def $9, $7, 2, BLACKTHORN_GYM_2F + warp_def $6, $2, 3, BLACKTHORN_GYM_2F + warp_def $7, $7, 4, BLACKTHORN_GYM_2F + warp_def $6, $7, 5, BLACKTHORN_GYM_2F .XYTriggers: db 0 diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 0286367e3..0c58cb480 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -131,11 +131,11 @@ BlackthornGym2F_MapEventHeader: .Warps: db 5 - warp_def $7, $1, 3, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F - warp_def $9, $7, 4, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F - warp_def $5, $2, 5, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F - warp_def $7, $8, 6, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F - warp_def $3, $8, 7, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F + warp_def $7, $1, 3, BLACKTHORN_GYM_1F + warp_def $9, $7, 4, BLACKTHORN_GYM_1F + warp_def $5, $2, 5, BLACKTHORN_GYM_1F + warp_def $7, $8, 6, BLACKTHORN_GYM_1F + warp_def $3, $8, 7, BLACKTHORN_GYM_1F .XYTriggers: db 0 diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index 784e97203..315672a45 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -47,8 +47,8 @@ BlackthornMart_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 4, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY - warp_def $7, $3, 4, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY + warp_def $7, $2, 4, BLACKTHORN_CITY + warp_def $7, $3, 4, BLACKTHORN_CITY .XYTriggers: db 0 diff --git a/maps/BlackthornPokeCenter1F.asm b/maps/BlackthornPokeCenter1F.asm index 1f766c544..840c6b7b4 100644 --- a/maps/BlackthornPokeCenter1F.asm +++ b/maps/BlackthornPokeCenter1F.asm @@ -49,9 +49,9 @@ BlackthornPokeCenter1F_MapEventHeader: .Warps: db 3 - warp_def $7, $3, 5, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY - warp_def $7, $4, 5, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY - warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F + warp_def $7, $3, 5, BLACKTHORN_CITY + warp_def $7, $4, 5, BLACKTHORN_CITY + warp_def $7, $0, 1, POKECENTER_2F .XYTriggers: db 0 diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index c4ed75fe3..5b9af110a 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -147,8 +147,8 @@ BluesHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 2, GROUP_PALLET_TOWN, MAP_PALLET_TOWN - warp_def $7, $3, 2, GROUP_PALLET_TOWN, MAP_PALLET_TOWN + warp_def $7, $2, 2, PALLET_TOWN + warp_def $7, $3, 2, PALLET_TOWN .XYTriggers: db 0 diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index d5c1be4ac..7dbc9da33 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -132,10 +132,10 @@ BrunosRoom_MapEventHeader: .Warps: db 4 - warp_def $11, $4, 3, GROUP_KOGAS_ROOM, MAP_KOGAS_ROOM - warp_def $11, $5, 4, GROUP_KOGAS_ROOM, MAP_KOGAS_ROOM - warp_def $2, $4, 1, GROUP_KARENS_ROOM, MAP_KARENS_ROOM - warp_def $2, $5, 2, GROUP_KARENS_ROOM, MAP_KARENS_ROOM + warp_def $11, $4, 3, KOGAS_ROOM + warp_def $11, $5, 4, KOGAS_ROOM + warp_def $2, $4, 1, KARENS_ROOM + warp_def $2, $5, 2, KARENS_ROOM .XYTriggers: db 0 diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index b1e0dc278..bdb9740fb 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -283,20 +283,20 @@ BurnedTower1F_MapEventHeader: .Warps: db 14 - warp_def $f, $9, 13, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - warp_def $f, $a, 13, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - warp_def $9, $a, 1, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F - warp_def $5, $5, 1, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F - warp_def $6, $5, 1, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F - warp_def $6, $4, 1, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F - warp_def $4, $f, 2, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F - warp_def $5, $f, 2, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F - warp_def $7, $a, 3, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F - warp_def $e, $5, 4, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F - warp_def $e, $4, 4, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F - warp_def $e, $e, 5, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F - warp_def $e, $f, 5, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F - warp_def $f, $7, 6, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F + warp_def $f, $9, 13, ECRUTEAK_CITY + warp_def $f, $a, 13, ECRUTEAK_CITY + warp_def $9, $a, 1, BURNED_TOWER_B1F + warp_def $5, $5, 1, BURNED_TOWER_B1F + warp_def $6, $5, 1, BURNED_TOWER_B1F + warp_def $6, $4, 1, BURNED_TOWER_B1F + warp_def $4, $f, 2, BURNED_TOWER_B1F + warp_def $5, $f, 2, BURNED_TOWER_B1F + warp_def $7, $a, 3, BURNED_TOWER_B1F + warp_def $e, $5, 4, BURNED_TOWER_B1F + warp_def $e, $4, 4, BURNED_TOWER_B1F + warp_def $e, $e, 5, BURNED_TOWER_B1F + warp_def $e, $f, 5, BURNED_TOWER_B1F + warp_def $f, $7, 6, BURNED_TOWER_B1F .XYTriggers: db 1 diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 0b88c21c5..e651a3268 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -78,8 +78,8 @@ UnknownScript_0x18616b: dotrigger $1 setevent EVENT_RELEASED_THE_BEASTS special InitRoamMons - domaptrigger GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM, $1 - domaptrigger GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY, $1 + domaptrigger ECRUTEAK_GYM, $1 + domaptrigger CIANWOOD_CITY, $1 clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY setevent EVENT_ECRUTEAK_GYM_GRAMPS clearevent EVENT_ECRUTEAK_CITY_GRAMPS @@ -235,12 +235,12 @@ BurnedTowerB1F_MapEventHeader: .Warps: db 6 - warp_def $9, $a, 3, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F - warp_def $7, $11, 7, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F - warp_def $8, $a, 9, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F - warp_def $d, $3, 10, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F - warp_def $e, $11, 12, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F - warp_def $f, $7, 14, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F + warp_def $9, $a, 3, BURNED_TOWER_1F + warp_def $7, $11, 7, BURNED_TOWER_1F + warp_def $8, $a, 9, BURNED_TOWER_1F + warp_def $d, $3, 10, BURNED_TOWER_1F + warp_def $e, $11, 12, BURNED_TOWER_1F + warp_def $f, $7, 14, BURNED_TOWER_1F .XYTriggers: db 1 diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 63e8a4f92..2aa93bb7e 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -206,8 +206,8 @@ CeladonCafe_MapEventHeader: .Warps: db 2 - warp_def $7, $6, 9, GROUP_CELADON_CITY, MAP_CELADON_CITY - warp_def $7, $7, 9, GROUP_CELADON_CITY, MAP_CELADON_CITY + warp_def $7, $6, 9, CELADON_CITY + warp_def $7, $7, 9, CELADON_CITY .XYTriggers: db 0 diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 1d595b448..b09c9c850 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -231,15 +231,15 @@ CeladonCity_MapEventHeader: .Warps: db 9 - warp_def $9, $4, 1, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F - warp_def $9, $10, 1, GROUP_CELADON_MANSION_1F, MAP_CELADON_MANSION_1F - warp_def $3, $10, 3, GROUP_CELADON_MANSION_1F, MAP_CELADON_MANSION_1F - warp_def $3, $11, 3, GROUP_CELADON_MANSION_1F, MAP_CELADON_MANSION_1F - warp_def $9, $1d, 1, GROUP_CELADON_POKECENTER_1F, MAP_CELADON_POKECENTER_1F - warp_def $13, $12, 1, GROUP_CELADON_GAME_CORNER, MAP_CELADON_GAME_CORNER - warp_def $13, $17, 1, GROUP_CELADON_GAME_CORNER_PRIZE_ROOM, MAP_CELADON_GAME_CORNER_PRIZE_ROOM - warp_def $1d, $a, 1, GROUP_CELADON_GYM, MAP_CELADON_GYM - warp_def $1d, $19, 1, GROUP_CELADON_CAFE, MAP_CELADON_CAFE + warp_def $9, $4, 1, CELADON_DEPT_STORE_1F + warp_def $9, $10, 1, CELADON_MANSION_1F + warp_def $3, $10, 3, CELADON_MANSION_1F + warp_def $3, $11, 3, CELADON_MANSION_1F + warp_def $9, $1d, 1, CELADON_POKECENTER_1F + warp_def $13, $12, 1, CELADON_GAME_CORNER + warp_def $13, $17, 1, CELADON_GAME_CORNER_PRIZE_ROOM + warp_def $1d, $a, 1, CELADON_GYM + warp_def $1d, $19, 1, CELADON_CAFE .XYTriggers: db 0 diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index fb3b38222..1088f9b7a 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -74,10 +74,10 @@ CeladonDeptStore1F_MapEventHeader: .Warps: db 4 - warp_def $7, $7, 1, GROUP_CELADON_CITY, MAP_CELADON_CITY - warp_def $7, $8, 1, GROUP_CELADON_CITY, MAP_CELADON_CITY - warp_def $0, $f, 2, GROUP_CELADON_DEPT_STORE_2F, MAP_CELADON_DEPT_STORE_2F - warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR + warp_def $7, $7, 1, CELADON_CITY + warp_def $7, $8, 1, CELADON_CITY + warp_def $0, $f, 2, CELADON_DEPT_STORE_2F + warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR .XYTriggers: db 0 diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index 46954a03e..72fbdc554 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -68,9 +68,9 @@ CeladonDeptStore2F_MapEventHeader: .Warps: db 3 - warp_def $0, $c, 1, GROUP_CELADON_DEPT_STORE_3F, MAP_CELADON_DEPT_STORE_3F - warp_def $0, $f, 3, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F - warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR + warp_def $0, $c, 1, CELADON_DEPT_STORE_3F + warp_def $0, $f, 3, CELADON_DEPT_STORE_1F + warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR .XYTriggers: db 0 diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index d1db6e1e3..61f8a14fd 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -93,9 +93,9 @@ CeladonDeptStore3F_MapEventHeader: .Warps: db 3 - warp_def $0, $c, 1, GROUP_CELADON_DEPT_STORE_2F, MAP_CELADON_DEPT_STORE_2F - warp_def $0, $f, 2, GROUP_CELADON_DEPT_STORE_4F, MAP_CELADON_DEPT_STORE_4F - warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR + warp_def $0, $c, 1, CELADON_DEPT_STORE_2F + warp_def $0, $f, 2, CELADON_DEPT_STORE_4F + warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR .XYTriggers: db 0 diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index 873942e48..4d8a374b8 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -51,9 +51,9 @@ CeladonDeptStore4F_MapEventHeader: .Warps: db 3 - warp_def $0, $c, 1, GROUP_CELADON_DEPT_STORE_5F, MAP_CELADON_DEPT_STORE_5F - warp_def $0, $f, 2, GROUP_CELADON_DEPT_STORE_3F, MAP_CELADON_DEPT_STORE_3F - warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR + warp_def $0, $c, 1, CELADON_DEPT_STORE_5F + warp_def $0, $f, 2, CELADON_DEPT_STORE_3F + warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR .XYTriggers: db 0 diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index e21fc4f39..c9e182893 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -70,9 +70,9 @@ CeladonDeptStore5F_MapEventHeader: .Warps: db 3 - warp_def $0, $c, 1, GROUP_CELADON_DEPT_STORE_4F, MAP_CELADON_DEPT_STORE_4F - warp_def $0, $f, 1, GROUP_CELADON_DEPT_STORE_6F, MAP_CELADON_DEPT_STORE_6F - warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR + warp_def $0, $c, 1, CELADON_DEPT_STORE_4F + warp_def $0, $f, 1, CELADON_DEPT_STORE_6F + warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR .XYTriggers: db 0 diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index b708bb1b0..7f2d608c2 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -151,8 +151,8 @@ CeladonDeptStore6F_MapEventHeader: .Warps: db 2 - warp_def $0, $f, 2, GROUP_CELADON_DEPT_STORE_5F, MAP_CELADON_DEPT_STORE_5F - warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR + warp_def $0, $f, 2, CELADON_DEPT_STORE_5F + warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR .XYTriggers: db 0 diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm index 81b696418..dd620a13d 100644 --- a/maps/CeladonDeptStoreElevator.asm +++ b/maps/CeladonDeptStoreElevator.asm @@ -20,12 +20,12 @@ UnknownScript_0x713bd: Elevator_0x713be: db 6 ; floors - db _1F, 4, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F - db _2F, 3, GROUP_CELADON_DEPT_STORE_2F, MAP_CELADON_DEPT_STORE_2F - db _3F, 3, GROUP_CELADON_DEPT_STORE_3F, MAP_CELADON_DEPT_STORE_3F - db _4F, 3, GROUP_CELADON_DEPT_STORE_4F, MAP_CELADON_DEPT_STORE_4F - db _5F, 3, GROUP_CELADON_DEPT_STORE_5F, MAP_CELADON_DEPT_STORE_5F - db _6F, 2, GROUP_CELADON_DEPT_STORE_6F, MAP_CELADON_DEPT_STORE_6F + elevfloor _1F, 4, CELADON_DEPT_STORE_1F + elevfloor _2F, 3, CELADON_DEPT_STORE_2F + elevfloor _3F, 3, CELADON_DEPT_STORE_3F + elevfloor _4F, 3, CELADON_DEPT_STORE_4F + elevfloor _5F, 3, CELADON_DEPT_STORE_5F + elevfloor _6F, 2, CELADON_DEPT_STORE_6F db $ff ; end @@ -35,8 +35,8 @@ CeladonDeptStoreElevator_MapEventHeader: .Warps: db 2 - warp_def $3, $1, 255, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F - warp_def $3, $2, 255, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F + warp_def $3, $1, 255, CELADON_DEPT_STORE_1F + warp_def $3, $2, 255, CELADON_DEPT_STORE_1F .XYTriggers: db 0 diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index c117a60e7..c62452ba2 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -276,8 +276,8 @@ CeladonGameCorner_MapEventHeader: .Warps: db 2 - warp_def $d, $e, 6, GROUP_CELADON_CITY, MAP_CELADON_CITY - warp_def $d, $f, 6, GROUP_CELADON_CITY, MAP_CELADON_CITY + warp_def $d, $e, 6, CELADON_CITY + warp_def $d, $f, 6, CELADON_CITY .XYTriggers: db 0 diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index adf3b2b61..3c79d659f 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -271,8 +271,8 @@ CeladonGameCornerPrizeRoom_MapEventHeader: .Warps: db 2 - warp_def $5, $2, 7, GROUP_CELADON_CITY, MAP_CELADON_CITY - warp_def $5, $3, 7, GROUP_CELADON_CITY, MAP_CELADON_CITY + warp_def $5, $2, 7, CELADON_CITY + warp_def $5, $3, 7, CELADON_CITY .XYTriggers: db 0 diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 018506a81..02dbe52e5 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -265,8 +265,8 @@ CeladonGym_MapEventHeader: .Warps: db 2 - warp_def $11, $4, 8, GROUP_CELADON_CITY, MAP_CELADON_CITY - warp_def $11, $5, 8, GROUP_CELADON_CITY, MAP_CELADON_CITY + warp_def $11, $4, 8, CELADON_CITY + warp_def $11, $5, 8, CELADON_CITY .XYTriggers: db 0 diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index f7d0836d0..a2d837c7a 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -74,11 +74,11 @@ CeladonMansion1F_MapEventHeader: .Warps: db 5 - warp_def $9, $6, 2, GROUP_CELADON_CITY, MAP_CELADON_CITY - warp_def $9, $7, 2, GROUP_CELADON_CITY, MAP_CELADON_CITY - warp_def $0, $3, 3, GROUP_CELADON_CITY, MAP_CELADON_CITY - warp_def $0, $0, 1, GROUP_CELADON_MANSION_2F, MAP_CELADON_MANSION_2F - warp_def $0, $7, 4, GROUP_CELADON_MANSION_2F, MAP_CELADON_MANSION_2F + warp_def $9, $6, 2, CELADON_CITY + warp_def $9, $7, 2, CELADON_CITY + warp_def $0, $3, 3, CELADON_CITY + warp_def $0, $0, 1, CELADON_MANSION_2F + warp_def $0, $7, 4, CELADON_MANSION_2F .XYTriggers: db 0 diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm index cdbdc9ab3..fbe54d617 100644 --- a/maps/CeladonMansion2F.asm +++ b/maps/CeladonMansion2F.asm @@ -55,10 +55,10 @@ CeladonMansion2F_MapEventHeader: .Warps: db 4 - warp_def $0, $0, 4, GROUP_CELADON_MANSION_1F, MAP_CELADON_MANSION_1F - warp_def $0, $1, 2, GROUP_CELADON_MANSION_3F, MAP_CELADON_MANSION_3F - warp_def $0, $6, 3, GROUP_CELADON_MANSION_3F, MAP_CELADON_MANSION_3F - warp_def $0, $7, 5, GROUP_CELADON_MANSION_1F, MAP_CELADON_MANSION_1F + warp_def $0, $0, 4, CELADON_MANSION_1F + warp_def $0, $1, 2, CELADON_MANSION_3F + warp_def $0, $6, 3, CELADON_MANSION_3F + warp_def $0, $7, 5, CELADON_MANSION_1F .XYTriggers: db 0 diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 05064d7cd..10d550ba7 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -189,10 +189,10 @@ CeladonMansion3F_MapEventHeader: .Warps: db 4 - warp_def $0, $0, 1, GROUP_CELADON_MANSION_ROOF, MAP_CELADON_MANSION_ROOF - warp_def $0, $1, 2, GROUP_CELADON_MANSION_2F, MAP_CELADON_MANSION_2F - warp_def $0, $6, 3, GROUP_CELADON_MANSION_2F, MAP_CELADON_MANSION_2F - warp_def $0, $7, 2, GROUP_CELADON_MANSION_ROOF, MAP_CELADON_MANSION_ROOF + warp_def $0, $0, 1, CELADON_MANSION_ROOF + warp_def $0, $1, 2, CELADON_MANSION_2F + warp_def $0, $6, 3, CELADON_MANSION_2F + warp_def $0, $7, 2, CELADON_MANSION_ROOF .XYTriggers: db 0 diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index f3f0952c3..5727b1e43 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -36,9 +36,9 @@ CeladonMansionRoof_MapEventHeader: .Warps: db 3 - warp_def $1, $1, 1, GROUP_CELADON_MANSION_3F, MAP_CELADON_MANSION_3F - warp_def $1, $6, 4, GROUP_CELADON_MANSION_3F, MAP_CELADON_MANSION_3F - warp_def $5, $2, 1, GROUP_CELADON_MANSION_ROOF_HOUSE, MAP_CELADON_MANSION_ROOF_HOUSE + warp_def $1, $1, 1, CELADON_MANSION_3F + warp_def $1, $6, 4, CELADON_MANSION_3F + warp_def $5, $2, 1, CELADON_MANSION_ROOF_HOUSE .XYTriggers: db 0 diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index ff08f5f46..15ff84c32 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -119,8 +119,8 @@ CeladonMansionRoofHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 3, GROUP_CELADON_MANSION_ROOF, MAP_CELADON_MANSION_ROOF - warp_def $7, $3, 3, GROUP_CELADON_MANSION_ROOF, MAP_CELADON_MANSION_ROOF + warp_def $7, $2, 3, CELADON_MANSION_ROOF + warp_def $7, $3, 3, CELADON_MANSION_ROOF .XYTriggers: db 0 diff --git a/maps/CeladonPokeCenter1F.asm b/maps/CeladonPokeCenter1F.asm index ea509bc72..7d395516a 100644 --- a/maps/CeladonPokeCenter1F.asm +++ b/maps/CeladonPokeCenter1F.asm @@ -144,9 +144,9 @@ CeladonPokeCenter1F_MapEventHeader: .Warps: db 3 - warp_def $7, $3, 5, GROUP_CELADON_CITY, MAP_CELADON_CITY - warp_def $7, $4, 5, GROUP_CELADON_CITY, MAP_CELADON_CITY - warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F + warp_def $7, $3, 5, CELADON_CITY + warp_def $7, $4, 5, CELADON_CITY + warp_def $7, $0, 1, POKECENTER_2F .XYTriggers: db 0 diff --git a/maps/CeladonPokeCenter2FBeta.asm b/maps/CeladonPokeCenter2FBeta.asm index 94ccc840c..9c8d25332 100644 --- a/maps/CeladonPokeCenter2FBeta.asm +++ b/maps/CeladonPokeCenter2FBeta.asm @@ -11,7 +11,7 @@ CeladonPokeCenter2FBeta_MapEventHeader: .Warps: db 1 - warp_def $7, $0, 3, GROUP_CELADON_POKECENTER_1F, MAP_CELADON_POKECENTER_1F + warp_def $7, $0, 3, CELADON_POKECENTER_1F .XYTriggers: db 0 diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 7d78ab042..fd1e0ffe2 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -275,12 +275,12 @@ CeruleanCity_MapEventHeader: .Warps: db 6 - warp_def $f, $7, 1, GROUP_CERULEAN_GYM_BADGE_SPEECH_HOUSE, MAP_CERULEAN_GYM_BADGE_SPEECH_HOUSE - warp_def $11, $1c, 1, GROUP_CERULEAN_POLICE_STATION, MAP_CERULEAN_POLICE_STATION - warp_def $13, $d, 1, GROUP_CERULEAN_TRADE_SPEECH_HOUSE, MAP_CERULEAN_TRADE_SPEECH_HOUSE - warp_def $15, $13, 1, GROUP_CERULEAN_POKECENTER_1F, MAP_CERULEAN_POKECENTER_1F - warp_def $17, $1e, 1, GROUP_CERULEAN_GYM, MAP_CERULEAN_GYM - warp_def $1d, $19, 2, GROUP_CERULEAN_MART, MAP_CERULEAN_MART + warp_def $f, $7, 1, CERULEAN_GYM_BADGE_SPEECH_HOUSE + warp_def $11, $1c, 1, CERULEAN_POLICE_STATION + warp_def $13, $d, 1, CERULEAN_TRADE_SPEECH_HOUSE + warp_def $15, $13, 1, CERULEAN_POKECENTER_1F + warp_def $17, $1e, 1, CERULEAN_GYM + warp_def $1d, $19, 2, CERULEAN_MART .XYTriggers: db 0 diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index e92abbb99..81f7ac745 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -43,8 +43,8 @@ UnknownScript_0x1883de: clearevent EVENT_ROUTE_24_ROCKET clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND dotrigger $0 - domaptrigger GROUP_ROUTE_25, MAP_ROUTE_25, $1 - domaptrigger GROUP_POWER_PLANT, MAP_POWER_PLANT, $0 + domaptrigger ROUTE_25, $1 + domaptrigger POWER_PLANT, $0 waitbutton special RestartMapMusic pause 15 @@ -363,8 +363,8 @@ CeruleanGym_MapEventHeader: .Warps: db 2 - warp_def $f, $4, 5, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY - warp_def $f, $5, 5, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY + warp_def $f, $4, 5, CERULEAN_CITY + warp_def $f, $5, 5, CERULEAN_CITY .XYTriggers: db 0 diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index bef69683b..a25e2ee88 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -19,8 +19,8 @@ CeruleanGymBadgeSpeechHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 1, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY - warp_def $7, $3, 1, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY + warp_def $7, $2, 1, CERULEAN_CITY + warp_def $7, $3, 1, CERULEAN_CITY .XYTriggers: db 0 diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index d634b999c..8d982215a 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -46,8 +46,8 @@ CeruleanMart_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 6, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY - warp_def $7, $3, 6, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY + warp_def $7, $2, 6, CERULEAN_CITY + warp_def $7, $3, 6, CERULEAN_CITY .XYTriggers: db 0 diff --git a/maps/CeruleanPokeCenter1F.asm b/maps/CeruleanPokeCenter1F.asm index 77b9adeae..2537d5998 100644 --- a/maps/CeruleanPokeCenter1F.asm +++ b/maps/CeruleanPokeCenter1F.asm @@ -63,9 +63,9 @@ CeruleanPokeCenter1F_MapEventHeader: .Warps: db 3 - warp_def $7, $3, 4, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY - warp_def $7, $4, 4, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY - warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F + warp_def $7, $3, 4, CERULEAN_CITY + warp_def $7, $4, 4, CERULEAN_CITY + warp_def $7, $0, 1, POKECENTER_2F .XYTriggers: db 0 diff --git a/maps/CeruleanPokeCenter2FBeta.asm b/maps/CeruleanPokeCenter2FBeta.asm index 6678e73c6..4479a484f 100644 --- a/maps/CeruleanPokeCenter2FBeta.asm +++ b/maps/CeruleanPokeCenter2FBeta.asm @@ -11,7 +11,7 @@ CeruleanPokeCenter2FBeta_MapEventHeader: .Warps: db 1 - warp_def $7, $0, 1, GROUP_CERULEAN_POKECENTER_1F, MAP_CERULEAN_POKECENTER_1F + warp_def $7, $0, 1, CERULEAN_POKECENTER_1F .XYTriggers: db 0 diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index d0bdc7999..21841a6de 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -44,8 +44,8 @@ CeruleanPoliceStation_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 2, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY - warp_def $7, $3, 2, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY + warp_def $7, $2, 2, CERULEAN_CITY + warp_def $7, $3, 2, CERULEAN_CITY .XYTriggers: db 0 diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index b0451d91c..0d0cf9e28 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -53,8 +53,8 @@ CeruleanTradeSpeechHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 3, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY - warp_def $7, $3, 3, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY + warp_def $7, $2, 3, CERULEAN_CITY + warp_def $7, $3, 3, CERULEAN_CITY .XYTriggers: db 0 diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index 5b9698ca7..2d747cc9f 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -149,8 +149,8 @@ CharcoalKiln_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 2, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN - warp_def $7, $3, 2, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN + warp_def $7, $2, 2, AZALEA_TOWN + warp_def $7, $3, 2, AZALEA_TOWN .XYTriggers: db 0 diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index bd8168dbc..8b7135a26 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -550,11 +550,11 @@ CherrygroveCity_MapEventHeader: .Warps: db 5 - warp_def $3, $17, 2, GROUP_CHERRYGROVE_MART, MAP_CHERRYGROVE_MART - warp_def $3, $1d, 1, GROUP_CHERRYGROVE_POKECENTER_1F, MAP_CHERRYGROVE_POKECENTER_1F - warp_def $7, $11, 1, GROUP_CHERRYGROVE_GYM_SPEECH_HOUSE, MAP_CHERRYGROVE_GYM_SPEECH_HOUSE - warp_def $9, $19, 1, GROUP_GUIDE_GENTS_HOUSE, MAP_GUIDE_GENTS_HOUSE - warp_def $b, $1f, 1, GROUP_CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, MAP_CHERRYGROVE_EVOLUTION_SPEECH_HOUSE + warp_def $3, $17, 2, CHERRYGROVE_MART + warp_def $3, $1d, 1, CHERRYGROVE_POKECENTER_1F + warp_def $7, $11, 1, CHERRYGROVE_GYM_SPEECH_HOUSE + warp_def $9, $19, 1, GUIDE_GENTS_HOUSE + warp_def $b, $1f, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE .XYTriggers: db 2 diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index 7d7e17f0e..bea832e84 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -43,8 +43,8 @@ CherrygroveEvolutionSpeechHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 5, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY - warp_def $7, $3, 5, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY + warp_def $7, $2, 5, CHERRYGROVE_CITY + warp_def $7, $3, 5, CHERRYGROVE_CITY .XYTriggers: db 0 diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index f95fe3396..456a3c44e 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -46,8 +46,8 @@ CherrygroveGymSpeechHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 3, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY - warp_def $7, $3, 3, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY + warp_def $7, $2, 3, CHERRYGROVE_CITY + warp_def $7, $3, 3, CHERRYGROVE_CITY .XYTriggers: db 0 diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 56f613467..2bafc8df4 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -72,8 +72,8 @@ CherrygroveMart_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 1, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY - warp_def $7, $3, 1, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY + warp_def $7, $2, 1, CHERRYGROVE_CITY + warp_def $7, $3, 1, CHERRYGROVE_CITY .XYTriggers: db 0 diff --git a/maps/CherrygrovePokeCenter1F.asm b/maps/CherrygrovePokeCenter1F.asm index 4827f1440..bba5534bd 100644 --- a/maps/CherrygrovePokeCenter1F.asm +++ b/maps/CherrygrovePokeCenter1F.asm @@ -68,9 +68,9 @@ CherrygrovePokeCenter1F_MapEventHeader: .Warps: db 3 - warp_def $7, $3, 2, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY - warp_def $7, $4, 2, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY - warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F + warp_def $7, $3, 2, CHERRYGROVE_CITY + warp_def $7, $4, 2, CHERRYGROVE_CITY + warp_def $7, $0, 1, POKECENTER_2F .XYTriggers: db 0 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index c54521f0c..350c5e89f 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -41,7 +41,7 @@ UnknownScript_0x1a001e: pause 10 dotrigger $0 clearevent EVENT_SAW_SUICUNE_ON_ROUTE_42 - domaptrigger GROUP_ROUTE_42, MAP_ROUTE_42, $1 + domaptrigger ROUTE_42, $1 checkevent EVENT_FOUGHT_EUSINE iftrue .Done setevent EVENT_FOUGHT_EUSINE @@ -376,13 +376,13 @@ CianwoodCity_MapEventHeader: .Warps: db 7 - warp_def $29, $11, 1, GROUP_MANIAS_HOUSE, MAP_MANIAS_HOUSE - warp_def $2b, $8, 1, GROUP_CIANWOOD_GYM, MAP_CIANWOOD_GYM - warp_def $2b, $17, 1, GROUP_CIANWOOD_POKECENTER_1F, MAP_CIANWOOD_POKECENTER_1F - warp_def $2f, $f, 1, GROUP_CIANWOOD_PHARMACY, MAP_CIANWOOD_PHARMACY - warp_def $1f, $9, 1, GROUP_CIANWOOD_CITY_PHOTO_STUDIO, MAP_CIANWOOD_CITY_PHOTO_STUDIO - warp_def $25, $f, 1, GROUP_CIANWOOD_LUGIA_SPEECH_HOUSE, MAP_CIANWOOD_LUGIA_SPEECH_HOUSE - warp_def $11, $5, 1, GROUP_POKE_SEERS_HOUSE, MAP_POKE_SEERS_HOUSE + warp_def $29, $11, 1, MANIAS_HOUSE + warp_def $2b, $8, 1, CIANWOOD_GYM + warp_def $2b, $17, 1, CIANWOOD_POKECENTER_1F + warp_def $2f, $f, 1, CIANWOOD_PHARMACY + warp_def $1f, $9, 1, CIANWOOD_CITY_PHOTO_STUDIO + warp_def $25, $f, 1, CIANWOOD_LUGIA_SPEECH_HOUSE + warp_def $11, $5, 1, POKE_SEERS_HOUSE .XYTriggers: db 1 diff --git a/maps/CianwoodCityPhotoStudio.asm b/maps/CianwoodCityPhotoStudio.asm index 98dae6883..8a806851f 100644 --- a/maps/CianwoodCityPhotoStudio.asm +++ b/maps/CianwoodCityPhotoStudio.asm @@ -51,8 +51,8 @@ CianwoodCityPhotoStudio_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 5, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY - warp_def $7, $3, 5, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY + warp_def $7, $2, 5, CIANWOOD_CITY + warp_def $7, $3, 5, CIANWOOD_CITY .XYTriggers: db 0 diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 245a550d8..c4ebbaa65 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -300,8 +300,8 @@ CianwoodGym_MapEventHeader: .Warps: db 2 - warp_def $11, $4, 2, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY - warp_def $11, $5, 2, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY + warp_def $11, $4, 2, CIANWOOD_CITY + warp_def $11, $5, 2, CIANWOOD_CITY .XYTriggers: db 0 diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index c6621f9aa..94549161f 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -62,8 +62,8 @@ CianwoodLugiaSpeechHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 6, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY - warp_def $7, $3, 6, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY + warp_def $7, $2, 6, CIANWOOD_CITY + warp_def $7, $3, 6, CIANWOOD_CITY .XYTriggers: db 0 diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 210708780..9193cf354 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -77,8 +77,8 @@ CianwoodPharmacy_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 4, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY - warp_def $7, $3, 4, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY + warp_def $7, $2, 4, CIANWOOD_CITY + warp_def $7, $3, 4, CIANWOOD_CITY .XYTriggers: db 0 diff --git a/maps/CianwoodPokeCenter1F.asm b/maps/CianwoodPokeCenter1F.asm index 65d38670c..08c4e5f3e 100644 --- a/maps/CianwoodPokeCenter1F.asm +++ b/maps/CianwoodPokeCenter1F.asm @@ -131,9 +131,9 @@ CianwoodPokeCenter1F_MapEventHeader: .Warps: db 3 - warp_def $7, $3, 3, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY - warp_def $7, $4, 3, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY - warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F + warp_def $7, $3, 3, CIANWOOD_CITY + warp_def $7, $4, 3, CIANWOOD_CITY + warp_def $7, $0, 1, POKECENTER_2F .XYTriggers: db 0 diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 6b5132a8b..50c21a1ca 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -132,7 +132,7 @@ CinnabarIsland_MapEventHeader: .Warps: db 1 - warp_def $b, $b, 1, GROUP_CINNABAR_POKECENTER_1F, MAP_CINNABAR_POKECENTER_1F + warp_def $b, $b, 1, CINNABAR_POKECENTER_1F .XYTriggers: db 0 diff --git a/maps/CinnabarPokeCenter1F.asm b/maps/CinnabarPokeCenter1F.asm index 1eea0d2f5..b00fb3c99 100644 --- a/maps/CinnabarPokeCenter1F.asm +++ b/maps/CinnabarPokeCenter1F.asm @@ -35,9 +35,9 @@ CinnabarPokeCenter1F_MapEventHeader: .Warps: db 3 - warp_def $7, $3, 1, GROUP_CINNABAR_ISLAND, MAP_CINNABAR_ISLAND - warp_def $7, $4, 1, GROUP_CINNABAR_ISLAND, MAP_CINNABAR_ISLAND - warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F + warp_def $7, $3, 1, CINNABAR_ISLAND + warp_def $7, $4, 1, CINNABAR_ISLAND + warp_def $7, $0, 1, POKECENTER_2F .XYTriggers: db 0 diff --git a/maps/CinnabarPokeCenter2FBeta.asm b/maps/CinnabarPokeCenter2FBeta.asm index 13243c78a..fb9d96b7a 100644 --- a/maps/CinnabarPokeCenter2FBeta.asm +++ b/maps/CinnabarPokeCenter2FBeta.asm @@ -11,7 +11,7 @@ CinnabarPokeCenter2FBeta_MapEventHeader: .Warps: db 1 - warp_def $7, $0, 3, GROUP_CINNABAR_POKECENTER_1F, MAP_CINNABAR_POKECENTER_1F + warp_def $7, $0, 3, CINNABAR_POKECENTER_1F .XYTriggers: db 0 diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index a23704d74..4ad76f010 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -39,12 +39,12 @@ ColosseumScript_SetWhichChris: return ColosseumScript_InitializeCB: - domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $2 + domaptrigger POKECENTER_2F, $2 return ColosseumScript_Initialize: dotrigger $1 - domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $2 + domaptrigger POKECENTER_2F, $2 end MapColosseumSignpost1Script: @@ -70,8 +70,8 @@ Colosseum_MapEventHeader: .Warps: db 2 - warp_def $7, $4, 3, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - warp_def $7, $5, 3, GROUP_POKECENTER_2F, MAP_POKECENTER_2F + warp_def $7, $4, 3, POKECENTER_2F + warp_def $7, $5, 3, POKECENTER_2F .XYTriggers: db 0 diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index 475d1aa2c..028e102e5 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -73,9 +73,9 @@ CopycatsHouse1F_MapEventHeader: .Warps: db 3 - warp_def $7, $2, 8, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - warp_def $7, $3, 8, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - warp_def $0, $2, 1, GROUP_COPYCATS_HOUSE_2F, MAP_COPYCATS_HOUSE_2F + warp_def $7, $2, 8, SAFFRON_CITY + warp_def $7, $3, 8, SAFFRON_CITY + warp_def $0, $2, 1, COPYCATS_HOUSE_2F .XYTriggers: db 0 diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 3d71a10ce..d08e34ac2 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -361,7 +361,7 @@ CopycatsHouse2F_MapEventHeader: .Warps: db 1 - warp_def $0, $3, 3, GROUP_COPYCATS_HOUSE_1F, MAP_COPYCATS_HOUSE_1F + warp_def $0, $3, 3, COPYCATS_HOUSE_1F .XYTriggers: db 0 diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index af863699e..0149d37e6 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -332,8 +332,8 @@ DanceTheatre_MapEventHeader: .Warps: db 2 - warp_def $d, $5, 8, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - warp_def $d, $6, 8, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY + warp_def $d, $5, 8, ECRUTEAK_CITY + warp_def $d, $6, 8, ECRUTEAK_CITY .XYTriggers: db 0 diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index 6fcbec599..947e38bab 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -62,8 +62,8 @@ DarkCaveBlackthornEntrance_MapEventHeader: .Warps: db 2 - warp_def $3, $17, 1, GROUP_ROUTE_45, MAP_ROUTE_45 - warp_def $19, $3, 2, GROUP_DARK_CAVE_VIOLET_ENTRANCE, MAP_DARK_CAVE_VIOLET_ENTRANCE + warp_def $3, $17, 1, ROUTE_45 + warp_def $19, $3, 2, DARK_CAVE_VIOLET_ENTRANCE .XYTriggers: db 0 diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index 4eeec3c3e..ca91573fd 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -30,9 +30,9 @@ DarkCaveVioletEntrance_MapEventHeader: .Warps: db 3 - warp_def $f, $3, 3, GROUP_ROUTE_31, MAP_ROUTE_31 - warp_def $1, $11, 2, GROUP_DARK_CAVE_BLACKTHORN_ENTRANCE, MAP_DARK_CAVE_BLACKTHORN_ENTRANCE - warp_def $21, $23, 3, GROUP_ROUTE_46, MAP_ROUTE_46 + warp_def $f, $3, 3, ROUTE_31 + warp_def $1, $11, 2, DARK_CAVE_BLACKTHORN_ENTRANCE + warp_def $21, $23, 3, ROUTE_46 .XYTriggers: db 0 diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 1f81580f2..9263f749a 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -160,10 +160,10 @@ DayCare_MapEventHeader: .Warps: db 4 - warp_def $5, $0, 3, GROUP_ROUTE_34, MAP_ROUTE_34 - warp_def $6, $0, 4, GROUP_ROUTE_34, MAP_ROUTE_34 - warp_def $7, $2, 5, GROUP_ROUTE_34, MAP_ROUTE_34 - warp_def $7, $3, 5, GROUP_ROUTE_34, MAP_ROUTE_34 + warp_def $5, $0, 3, ROUTE_34 + warp_def $6, $0, 4, ROUTE_34 + warp_def $7, $2, 5, ROUTE_34 + warp_def $7, $3, 5, ROUTE_34 .XYTriggers: db 0 diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 65e44d06e..5a52bfa12 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -26,12 +26,12 @@ DiglettsCave_MapEventHeader: .Warps: db 6 - warp_def $21, $3, 10, GROUP_VERMILION_CITY, MAP_VERMILION_CITY - warp_def $1f, $5, 5, GROUP_DIGLETTS_CAVE, MAP_DIGLETTS_CAVE - warp_def $5, $f, 5, GROUP_ROUTE_2, MAP_ROUTE_2 - warp_def $3, $11, 6, GROUP_DIGLETTS_CAVE, MAP_DIGLETTS_CAVE - warp_def $21, $11, 2, GROUP_DIGLETTS_CAVE, MAP_DIGLETTS_CAVE - warp_def $3, $3, 4, GROUP_DIGLETTS_CAVE, MAP_DIGLETTS_CAVE + warp_def $21, $3, 10, VERMILION_CITY + warp_def $1f, $5, 5, DIGLETTS_CAVE + warp_def $5, $f, 5, ROUTE_2 + warp_def $3, $11, 6, DIGLETTS_CAVE + warp_def $21, $11, 2, DIGLETTS_CAVE + warp_def $3, $3, 4, DIGLETTS_CAVE .XYTriggers: db 0 diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 0136c24bc..5f8243e62 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -162,7 +162,7 @@ DragonShrineTestScript: special RestartMapMusic specialphonecall ELMCALL_MASTERBALL dotrigger $1 - domaptrigger GROUP_DRAGONS_DEN_B1F, MAP_DRAGONS_DEN_B1F, $1 + domaptrigger DRAGONS_DEN_B1F, $1 writetext UnknownText_0x18d9f2 keeptextopen writetext UnknownText_0x18da0b @@ -670,8 +670,8 @@ DragonShrine_MapEventHeader: .Warps: db 2 - warp_def $9, $4, 2, GROUP_DRAGONS_DEN_B1F, MAP_DRAGONS_DEN_B1F - warp_def $9, $5, 2, GROUP_DRAGONS_DEN_B1F, MAP_DRAGONS_DEN_B1F + warp_def $9, $4, 2, DRAGONS_DEN_B1F + warp_def $9, $5, 2, DRAGONS_DEN_B1F .XYTriggers: db 0 diff --git a/maps/DragonsDen1F.asm b/maps/DragonsDen1F.asm index de37ae8c8..aaadae4d4 100644 --- a/maps/DragonsDen1F.asm +++ b/maps/DragonsDen1F.asm @@ -11,10 +11,10 @@ DragonsDen1F_MapEventHeader: .Warps: db 4 - warp_def $5, $3, 8, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY - warp_def $3, $3, 4, GROUP_DRAGONS_DEN_1F, MAP_DRAGONS_DEN_1F - warp_def $f, $5, 1, GROUP_DRAGONS_DEN_B1F, MAP_DRAGONS_DEN_B1F - warp_def $d, $5, 2, GROUP_DRAGONS_DEN_1F, MAP_DRAGONS_DEN_1F + warp_def $5, $3, 8, BLACKTHORN_CITY + warp_def $3, $3, 4, DRAGONS_DEN_1F + warp_def $f, $5, 1, DRAGONS_DEN_B1F + warp_def $d, $5, 2, DRAGONS_DEN_1F .XYTriggers: db 0 diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 5e2f2f71d..e500b2e85 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -403,8 +403,8 @@ DragonsDenB1F_MapEventHeader: .Warps: db 2 - warp_def $3, $14, 3, GROUP_DRAGONS_DEN_1F, MAP_DRAGONS_DEN_1F - warp_def $1d, $13, 1, GROUP_DRAGON_SHRINE, MAP_DRAGON_SHRINE + warp_def $3, $14, 3, DRAGONS_DEN_1F + warp_def $1d, $13, 1, DRAGON_SHRINE .XYTriggers: db 1 diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index f91725c5e..ecdb3df45 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -410,8 +410,8 @@ EarlsPokemonAcademy_MapEventHeader: .Warps: db 2 - warp_def $f, $3, 3, GROUP_VIOLET_CITY, MAP_VIOLET_CITY - warp_def $f, $4, 3, GROUP_VIOLET_CITY, MAP_VIOLET_CITY + warp_def $f, $3, 3, VIOLET_CITY + warp_def $f, $4, 3, VIOLET_CITY .XYTriggers: db 0 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 542b23c7b..6c7b479e0 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -258,21 +258,21 @@ EcruteakCity_MapEventHeader: .Warps: db 15 - warp_def $1a, $23, 1, GROUP_ROUTE_42_ECRUTEAK_GATE, MAP_ROUTE_42_ECRUTEAK_GATE - warp_def $1b, $23, 2, GROUP_ROUTE_42_ECRUTEAK_GATE, MAP_ROUTE_42_ECRUTEAK_GATE - warp_def $b, $12, 1, GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE - warp_def $2, $14, 1, GROUP_WISE_TRIOS_ROOM, MAP_WISE_TRIOS_ROOM - warp_def $3, $14, 2, GROUP_WISE_TRIOS_ROOM, MAP_WISE_TRIOS_ROOM - warp_def $1b, $17, 1, GROUP_ECRUTEAK_POKECENTER_1F, MAP_ECRUTEAK_POKECENTER_1F - warp_def $15, $5, 1, GROUP_ECRUTEAK_LUGIA_SPEECH_HOUSE, MAP_ECRUTEAK_LUGIA_SPEECH_HOUSE - warp_def $15, $17, 1, GROUP_DANCE_THEATRE, MAP_DANCE_THEATRE - warp_def $15, $1d, 2, GROUP_ECRUTEAK_MART, MAP_ECRUTEAK_MART - warp_def $1b, $6, 1, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $1b, $d, 1, GROUP_ECRUTEAK_ITEMFINDER_HOUSE, MAP_ECRUTEAK_ITEMFINDER_HOUSE - warp_def $7, $25, 1, GROUP_TIN_TOWER_1F, MAP_TIN_TOWER_1F - warp_def $5, $5, 1, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F - warp_def $12, $0, 3, GROUP_ROUTE_38_ECRUTEAK_GATE, MAP_ROUTE_38_ECRUTEAK_GATE - warp_def $13, $0, 4, GROUP_ROUTE_38_ECRUTEAK_GATE, MAP_ROUTE_38_ECRUTEAK_GATE + warp_def $1a, $23, 1, ROUTE_42_ECRUTEAK_GATE + warp_def $1b, $23, 2, ROUTE_42_ECRUTEAK_GATE + warp_def $b, $12, 1, ECRUTEAK_HOUSE + warp_def $2, $14, 1, WISE_TRIOS_ROOM + warp_def $3, $14, 2, WISE_TRIOS_ROOM + warp_def $1b, $17, 1, ECRUTEAK_POKECENTER_1F + warp_def $15, $5, 1, ECRUTEAK_LUGIA_SPEECH_HOUSE + warp_def $15, $17, 1, DANCE_THEATRE + warp_def $15, $1d, 2, ECRUTEAK_MART + warp_def $1b, $6, 1, ECRUTEAK_GYM + warp_def $1b, $d, 1, ECRUTEAK_ITEMFINDER_HOUSE + warp_def $7, $25, 1, TIN_TOWER_1F + warp_def $5, $5, 1, BURNED_TOWER_1F + warp_def $12, $0, 3, ROUTE_38_ECRUTEAK_GATE + warp_def $13, $0, 4, ROUTE_38_ECRUTEAK_GATE .XYTriggers: db 0 diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index f6c46f587..94e5dbf41 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -36,7 +36,7 @@ MortyScript_0x99d58: setflag ENGINE_FOGBADGE checkcode VAR_BADGES scall EcruteakGymTriggerRockets - domaptrigger GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE, $1 + domaptrigger ECRUTEAK_HOUSE, $1 setevent EVENT_RANG_CLEAR_BELL_1 setevent EVENT_RANG_CLEAR_BELL_2 .FightDone @@ -87,7 +87,7 @@ UnknownScript_0x99dc6: special FadeBlackBGMap playsound SFX_ENTER_DOOR waitbutton - warp GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY, $6, $1b + warp ECRUTEAK_CITY, $6, $1b end TrainerSageJeffrey: @@ -385,39 +385,39 @@ EcruteakGym_MapEventHeader: .Warps: db 33 - warp_def $11, $4, 10, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - warp_def $11, $5, 10, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - warp_def $e, $4, 4, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $4, $2, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $4, $3, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $4, $4, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $5, $4, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $7, $6, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $4, $7, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $6, $2, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $6, $3, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $6, $4, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $6, $5, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $6, $7, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $7, $7, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $8, $4, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $8, $5, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $8, $6, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $8, $7, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $8, $2, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $9, $2, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $a, $2, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $b, $2, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $a, $4, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $a, $5, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $c, $2, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $c, $3, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $c, $4, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $c, $5, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $a, $7, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $b, $7, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $c, $7, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - warp_def $d, $7, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM + warp_def $11, $4, 10, ECRUTEAK_CITY + warp_def $11, $5, 10, ECRUTEAK_CITY + warp_def $e, $4, 4, ECRUTEAK_GYM + warp_def $4, $2, 3, ECRUTEAK_GYM + warp_def $4, $3, 3, ECRUTEAK_GYM + warp_def $4, $4, 3, ECRUTEAK_GYM + warp_def $5, $4, 3, ECRUTEAK_GYM + warp_def $7, $6, 3, ECRUTEAK_GYM + warp_def $4, $7, 3, ECRUTEAK_GYM + warp_def $6, $2, 3, ECRUTEAK_GYM + warp_def $6, $3, 3, ECRUTEAK_GYM + warp_def $6, $4, 3, ECRUTEAK_GYM + warp_def $6, $5, 3, ECRUTEAK_GYM + warp_def $6, $7, 3, ECRUTEAK_GYM + warp_def $7, $7, 3, ECRUTEAK_GYM + warp_def $8, $4, 3, ECRUTEAK_GYM + warp_def $8, $5, 3, ECRUTEAK_GYM + warp_def $8, $6, 3, ECRUTEAK_GYM + warp_def $8, $7, 3, ECRUTEAK_GYM + warp_def $8, $2, 3, ECRUTEAK_GYM + warp_def $9, $2, 3, ECRUTEAK_GYM + warp_def $a, $2, 3, ECRUTEAK_GYM + warp_def $b, $2, 3, ECRUTEAK_GYM + warp_def $a, $4, 3, ECRUTEAK_GYM + warp_def $a, $5, 3, ECRUTEAK_GYM + warp_def $c, $2, 3, ECRUTEAK_GYM + warp_def $c, $3, 3, ECRUTEAK_GYM + warp_def $c, $4, 3, ECRUTEAK_GYM + warp_def $c, $5, 3, ECRUTEAK_GYM + warp_def $a, $7, 3, ECRUTEAK_GYM + warp_def $b, $7, 3, ECRUTEAK_GYM + warp_def $c, $7, 3, ECRUTEAK_GYM + warp_def $d, $7, 3, ECRUTEAK_GYM .XYTriggers: db 0 diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 314394cf7..4b46f0a12 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -282,11 +282,11 @@ EcruteakHouse_MapEventHeader: .Warps: db 5 - warp_def $11, $4, 3, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - warp_def $11, $5, 3, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - warp_def $3, $5, 4, GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE - warp_def $f, $11, 3, GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE - warp_def $3, $11, 3, GROUP_WISE_TRIOS_ROOM, MAP_WISE_TRIOS_ROOM + warp_def $11, $4, 3, ECRUTEAK_CITY + warp_def $11, $5, 3, ECRUTEAK_CITY + warp_def $3, $5, 4, ECRUTEAK_HOUSE + warp_def $f, $11, 3, ECRUTEAK_HOUSE + warp_def $3, $11, 3, WISE_TRIOS_ROOM .XYTriggers: db 2 diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index 358abdf13..cb1bc3a48 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -164,8 +164,8 @@ EcruteakItemfinderHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $3, 11, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - warp_def $7, $4, 11, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY + warp_def $7, $3, 11, ECRUTEAK_CITY + warp_def $7, $4, 11, ECRUTEAK_CITY .XYTriggers: db 0 diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index be6623449..b7d213f5f 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -46,8 +46,8 @@ EcruteakLugiaSpeechHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $3, 7, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - warp_def $7, $4, 7, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY + warp_def $7, $3, 7, ECRUTEAK_CITY + warp_def $7, $4, 7, ECRUTEAK_CITY .XYTriggers: db 0 diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index 63fd8ed48..e11e0695a 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -46,8 +46,8 @@ EcruteakMart_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 9, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - warp_def $7, $3, 9, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY + warp_def $7, $2, 9, ECRUTEAK_CITY + warp_def $7, $3, 9, ECRUTEAK_CITY .XYTriggers: db 0 diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm index 68057be2c..b76542bdc 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokeCenter1F.asm @@ -207,9 +207,9 @@ EcruteakPokeCenter1F_MapEventHeader: .Warps: db 3 - warp_def $7, $3, 6, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - warp_def $7, $4, 6, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F + warp_def $7, $3, 6, ECRUTEAK_CITY + warp_def $7, $4, 6, ECRUTEAK_CITY + warp_def $7, $0, 1, POKECENTER_2F .XYTriggers: db 0 diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index ff0c971a7..1eb6949a8 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -85,8 +85,8 @@ ElmsHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 4, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN - warp_def $7, $3, 4, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN + warp_def $7, $2, 4, NEW_BARK_TOWN + warp_def $7, $3, 4, NEW_BARK_TOWN .XYTriggers: db 0 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index d6c242e4a..07a902cf6 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -272,7 +272,7 @@ ElmDirectionsScript: setevent EVENT_GOT_A_POKEMON_FROM_ELM setevent EVENT_RIVAL_CHERRYGROVE_CITY dotrigger $5 - domaptrigger GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN, $1 + domaptrigger NEW_BARK_TOWN, $1 end ElmDescribesMrPokemonScript: @@ -338,7 +338,7 @@ ElmAfterTheftScript: keeptextopen setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM setflag ENGINE_BUG_CONTEST_ON - domaptrigger GROUP_ROUTE_29, MAP_ROUTE_29, $1 + domaptrigger ROUTE_29, $1 clearevent EVENT_ROUTE_30_YOUNGSTER_JOEY setevent EVENT_ROUTE_30_BATTLE writetext ElmAfterTheftText6 @@ -1373,8 +1373,8 @@ ElmsLab_MapEventHeader: .Warps: db 2 - warp_def $b, $4, 1, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN - warp_def $b, $5, 1, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN + warp_def $b, $4, 1, NEW_BARK_TOWN + warp_def $b, $5, 1, NEW_BARK_TOWN .XYTriggers: db 8 diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 16ff3d059..8c71bdce0 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -27,7 +27,7 @@ FastShip1F_MapScriptHeader: pause 30 playsound SFX_BOAT earthquake 30 - blackoutmod GROUP_FAST_SHIP_CABINS_SW_SSW_NW, MAP_FAST_SHIP_CABINS_SW_SSW_NW + blackoutmod FAST_SHIP_CABINS_SW_SSW_NW clearevent EVENT_FAST_SHIP_HAS_ARRIVED checkevent EVENT_FAST_SHIP_FIRST_TIME iftrue .Vermilion @@ -67,8 +67,8 @@ SailorScript_0x75160: special FadeBlackBGMap waitbutton setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY - domaptrigger GROUP_VERMILION_PORT, MAP_VERMILION_PORT, $1 - warp GROUP_VERMILION_PORT, MAP_VERMILION_PORT, $7, $11 + domaptrigger VERMILION_PORT, $1 + warp VERMILION_PORT, $7, $11 end ._Olivine @@ -80,8 +80,8 @@ SailorScript_0x75160: special FadeBlackBGMap waitbutton setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY - domaptrigger GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $1 - warp GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $7, $17 + domaptrigger OLIVINE_PORT, $1 + warp OLIVINE_PORT, $7, $17 end .LetThePlayerOut: @@ -287,18 +287,18 @@ FastShip1F_MapEventHeader: .Warps: db 12 - warp_def $1, $19, 255, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - warp_def $8, $1b, 1, GROUP_FAST_SHIP_CABINS_NNW_NNE_NE, MAP_FAST_SHIP_CABINS_NNW_NNE_NE - warp_def $8, $17, 2, GROUP_FAST_SHIP_CABINS_NNW_NNE_NE, MAP_FAST_SHIP_CABINS_NNW_NNE_NE - warp_def $8, $13, 3, GROUP_FAST_SHIP_CABINS_NNW_NNE_NE, MAP_FAST_SHIP_CABINS_NNW_NNE_NE - warp_def $8, $f, 1, GROUP_FAST_SHIP_CABINS_SW_SSW_NW, MAP_FAST_SHIP_CABINS_SW_SSW_NW - warp_def $f, $f, 2, GROUP_FAST_SHIP_CABINS_SW_SSW_NW, MAP_FAST_SHIP_CABINS_SW_SSW_NW - warp_def $f, $13, 4, GROUP_FAST_SHIP_CABINS_SW_SSW_NW, MAP_FAST_SHIP_CABINS_SW_SSW_NW - warp_def $f, $17, 1, GROUP_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, MAP_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN - warp_def $f, $1b, 3, GROUP_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, MAP_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN - warp_def $d, $3, 5, GROUP_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, MAP_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN - warp_def $c, $6, 1, GROUP_FAST_SHIP_B1F, MAP_FAST_SHIP_B1F - warp_def $e, $1e, 2, GROUP_FAST_SHIP_B1F, MAP_FAST_SHIP_B1F + warp_def $1, $19, 255, FAST_SHIP_1F + warp_def $8, $1b, 1, FAST_SHIP_CABINS_NNW_NNE_NE + warp_def $8, $17, 2, FAST_SHIP_CABINS_NNW_NNE_NE + warp_def $8, $13, 3, FAST_SHIP_CABINS_NNW_NNE_NE + warp_def $8, $f, 1, FAST_SHIP_CABINS_SW_SSW_NW + warp_def $f, $f, 2, FAST_SHIP_CABINS_SW_SSW_NW + warp_def $f, $13, 4, FAST_SHIP_CABINS_SW_SSW_NW + warp_def $f, $17, 1, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN + warp_def $f, $1b, 3, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN + warp_def $d, $3, 5, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN + warp_def $c, $6, 1, FAST_SHIP_B1F + warp_def $e, $1e, 2, FAST_SHIP_B1F .XYTriggers: db 2 diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 9c821933a..537cf3de9 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -442,8 +442,8 @@ FastShipB1F_MapEventHeader: .Warps: db 2 - warp_def $b, $5, 11, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - warp_def $d, $1f, 12, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F + warp_def $b, $5, 11, FAST_SHIP_1F + warp_def $d, $1f, 12, FAST_SHIP_1F .XYTriggers: db 2 diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index 979ede647..d53265a2d 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -89,7 +89,7 @@ SailorScript_0x755f1: closetext loadmovesprites setevent EVENT_FAST_SHIP_LAZY_SAILOR - domaptrigger GROUP_FAST_SHIP_B1F, MAP_FAST_SHIP_B1F, $1 + domaptrigger FAST_SHIP_B1F, $1 checkcode VAR_FACING if_equal $3, UnknownScript_0x75629 applymovement $6, MovementData_0x75637 @@ -263,9 +263,9 @@ FastShipCabins_NNW_NNE_NE_MapEventHeader: .Warps: db 3 - warp_def $0, $2, 2, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - warp_def $c, $2, 3, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - warp_def $18, $2, 4, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F + warp_def $0, $2, 2, FAST_SHIP_1F + warp_def $c, $2, 3, FAST_SHIP_1F + warp_def $18, $2, 4, FAST_SHIP_1F .XYTriggers: db 0 diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 5376c64cd..1e8578524 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -68,7 +68,7 @@ UnknownScript_0x75f09: writetext UnknownText_0x76143 keeptextopen setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY - domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $0 + domaptrigger FAST_SHIP_1F, $0 jump UnknownScript_0x75f37 GentlemanScript_0x75f1f: @@ -81,7 +81,7 @@ GentlemanScript_0x75f1f: writetext UnknownText_0x760ae closetext loadmovesprites - domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $0 + domaptrigger FAST_SHIP_1F, $0 end UnknownScript_0x75f37: @@ -455,12 +455,12 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader: .Warps: db 6 - warp_def $7, $2, 8, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - warp_def $7, $3, 8, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - warp_def $13, $2, 9, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - warp_def $13, $3, 9, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - warp_def $21, $2, 10, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - warp_def $21, $3, 10, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F + warp_def $7, $2, 8, FAST_SHIP_1F + warp_def $7, $3, 8, FAST_SHIP_1F + warp_def $13, $2, 9, FAST_SHIP_1F + warp_def $13, $3, 9, FAST_SHIP_1F + warp_def $21, $2, 10, FAST_SHIP_1F + warp_def $21, $3, 10, FAST_SHIP_1F .XYTriggers: db 0 diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 5b62f4b09..d54ed06ec 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -222,11 +222,11 @@ FastShipCabins_SW_SSW_NW_MapEventHeader: .Warps: db 5 - warp_def $0, $2, 5, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - warp_def $13, $2, 6, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - warp_def $13, $3, 6, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - warp_def $1f, $2, 7, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - warp_def $1f, $3, 7, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F + warp_def $0, $2, 5, FAST_SHIP_1F + warp_def $13, $2, 6, FAST_SHIP_1F + warp_def $13, $3, 6, FAST_SHIP_1F + warp_def $1f, $2, 7, FAST_SHIP_1F + warp_def $1f, $3, 7, FAST_SHIP_1F .XYTriggers: db 0 diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index ce0515e79..3347b71a8 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -44,8 +44,8 @@ FightingDojo_MapEventHeader: .Warps: db 2 - warp_def $b, $4, 1, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - warp_def $b, $5, 1, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY + warp_def $b, $4, 1, SAFFRON_CITY + warp_def $b, $5, 1, SAFFRON_CITY .XYTriggers: db 0 diff --git a/maps/FuchsiaBillSpeechHouse.asm b/maps/FuchsiaBillSpeechHouse.asm index ae31a356e..730da64f6 100644 --- a/maps/FuchsiaBillSpeechHouse.asm +++ b/maps/FuchsiaBillSpeechHouse.asm @@ -29,8 +29,8 @@ FuchsiaBillSpeechHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 4, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY - warp_def $7, $3, 4, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY + warp_def $7, $2, 4, FUCHSIA_CITY + warp_def $7, $3, 4, FUCHSIA_CITY .XYTriggers: db 0 diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 7dcb20190..46cdada09 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -126,17 +126,17 @@ FuchsiaCity_MapEventHeader: .Warps: db 11 - warp_def $d, $5, 2, GROUP_FUCHSIA_MART, MAP_FUCHSIA_MART - warp_def $d, $16, 1, GROUP_SAFARI_ZONE_MAIN_OFFICE, MAP_SAFARI_ZONE_MAIN_OFFICE - warp_def $1b, $8, 1, GROUP_FUCHSIA_GYM, MAP_FUCHSIA_GYM - warp_def $1b, $b, 1, GROUP_FUCHSIA_BILL_SPEECH_HOUSE, MAP_FUCHSIA_BILL_SPEECH_HOUSE - warp_def $1b, $13, 1, GROUP_FUCHSIA_POKECENTER_1F, MAP_FUCHSIA_POKECENTER_1F - warp_def $1b, $1b, 1, GROUP_SAFARI_ZONE_WARDENS_HOME, MAP_SAFARI_ZONE_WARDENS_HOME - warp_def $3, $12, 3, GROUP_SAFARI_ZONE_FUCHSIA_GATE_BETA, MAP_SAFARI_ZONE_FUCHSIA_GATE_BETA - warp_def $16, $25, 1, GROUP_ROUTE_15_FUCHSIA_GATE, MAP_ROUTE_15_FUCHSIA_GATE - warp_def $17, $25, 2, GROUP_ROUTE_15_FUCHSIA_GATE, MAP_ROUTE_15_FUCHSIA_GATE - warp_def $23, $7, 1, GROUP_ROUTE_19___FUCHSIA_GATE, MAP_ROUTE_19___FUCHSIA_GATE - warp_def $23, $8, 2, GROUP_ROUTE_19___FUCHSIA_GATE, MAP_ROUTE_19___FUCHSIA_GATE + warp_def $d, $5, 2, FUCHSIA_MART + warp_def $d, $16, 1, SAFARI_ZONE_MAIN_OFFICE + warp_def $1b, $8, 1, FUCHSIA_GYM + warp_def $1b, $b, 1, FUCHSIA_BILL_SPEECH_HOUSE + warp_def $1b, $13, 1, FUCHSIA_POKECENTER_1F + warp_def $1b, $1b, 1, SAFARI_ZONE_WARDENS_HOME + warp_def $3, $12, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA + warp_def $16, $25, 1, ROUTE_15_FUCHSIA_GATE + warp_def $17, $25, 2, ROUTE_15_FUCHSIA_GATE + warp_def $23, $7, 1, ROUTE_19___FUCHSIA_GATE + warp_def $23, $8, 2, ROUTE_19___FUCHSIA_GATE .XYTriggers: db 0 diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 16363b003..09c515275 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -378,8 +378,8 @@ FuchsiaGym_MapEventHeader: .Warps: db 2 - warp_def $11, $4, 3, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY - warp_def $11, $5, 3, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY + warp_def $11, $4, 3, FUCHSIA_CITY + warp_def $11, $5, 3, FUCHSIA_CITY .XYTriggers: db 0 diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index 6102bcb35..11371aaf3 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -38,8 +38,8 @@ FuchsiaMart_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 1, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY - warp_def $7, $3, 1, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY + warp_def $7, $2, 1, FUCHSIA_CITY + warp_def $7, $3, 1, FUCHSIA_CITY .XYTriggers: db 0 diff --git a/maps/FuchsiaPokeCenter1F.asm b/maps/FuchsiaPokeCenter1F.asm index 4dda55a23..8c1a737c4 100644 --- a/maps/FuchsiaPokeCenter1F.asm +++ b/maps/FuchsiaPokeCenter1F.asm @@ -90,9 +90,9 @@ FuchsiaPokeCenter1F_MapEventHeader: .Warps: db 3 - warp_def $7, $3, 5, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY - warp_def $7, $4, 5, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY - warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F + warp_def $7, $3, 5, FUCHSIA_CITY + warp_def $7, $4, 5, FUCHSIA_CITY + warp_def $7, $0, 1, POKECENTER_2F .XYTriggers: db 0 diff --git a/maps/FuchsiaPokeCenter2FBeta.asm b/maps/FuchsiaPokeCenter2FBeta.asm index 20ab0c4b7..7ba5508a9 100644 --- a/maps/FuchsiaPokeCenter2FBeta.asm +++ b/maps/FuchsiaPokeCenter2FBeta.asm @@ -11,7 +11,7 @@ FuchsiaPokeCenter2FBeta_MapEventHeader: .Warps: db 1 - warp_def $7, $0, 3, GROUP_FUCHSIA_POKECENTER_1F, MAP_FUCHSIA_POKECENTER_1F + warp_def $7, $0, 3, FUCHSIA_POKECENTER_1F .XYTriggers: db 0 diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index 909b07788..b6f11aa24 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -105,8 +105,8 @@ GoldenrodBikeShop_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 2, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - warp_def $7, $3, 2, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY + warp_def $7, $2, 2, GOLDENROD_CITY + warp_def $7, $3, 2, GOLDENROD_CITY .XYTriggers: db 0 diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm index d442cf482..8686b4ec8 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/GoldenrodBillsHouse.asm @@ -243,8 +243,8 @@ GoldenrodBillsHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 4, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - warp_def $7, $3, 4, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY + warp_def $7, $2, 4, GOLDENROD_CITY + warp_def $7, $3, 4, GOLDENROD_CITY .XYTriggers: db 0 diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 20c70eb0e..cd2646b78 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -545,21 +545,21 @@ GoldenrodCity_MapEventHeader: .Warps: db 15 - warp_def $7, $18, 1, GROUP_GOLDENROD_GYM, MAP_GOLDENROD_GYM - warp_def $1d, $1d, 1, GROUP_GOLDENROD_BIKE_SHOP, MAP_GOLDENROD_BIKE_SHOP - warp_def $15, $1f, 1, GROUP_GOLDENROD_HAPPINESS_RATER, MAP_GOLDENROD_HAPPINESS_RATER - warp_def $19, $5, 1, GROUP_GOLDENROD_BILLS_HOUSE, MAP_GOLDENROD_BILLS_HOUSE - warp_def $d, $9, 2, GROUP_GOLDENROD_MAGNET_TRAIN_STATION, MAP_GOLDENROD_MAGNET_TRAIN_STATION - warp_def $5, $1d, 1, GROUP_GOLDENROD_FLOWER_SHOP, MAP_GOLDENROD_FLOWER_SHOP - warp_def $9, $21, 1, GROUP_GOLDENROD_PP_SPEECH_HOUSE, MAP_GOLDENROD_PP_SPEECH_HOUSE - warp_def $7, $f, 1, GROUP_GOLDENROD_NAME_RATERS_HOUSE, MAP_GOLDENROD_NAME_RATERS_HOUSE - warp_def $1b, $18, 1, GROUP_GOLDENROD_DEPT_STORE_1F, MAP_GOLDENROD_DEPT_STORE_1F - warp_def $15, $e, 1, GROUP_GOLDENROD_GAME_CORNER, MAP_GOLDENROD_GAME_CORNER - warp_def $f, $5, 1, GROUP_RADIO_TOWER_1F, MAP_RADIO_TOWER_1F - warp_def $1, $13, 3, GROUP_ROUTE_35_GOLDENROD_GATE, MAP_ROUTE_35_GOLDENROD_GATE - warp_def $5, $9, 8, GROUP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, MAP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES - warp_def $1d, $b, 5, GROUP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, MAP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES - warp_def $1b, $f, 1, GROUP_GOLDENROD_POKECENTER_1F, MAP_GOLDENROD_POKECENTER_1F + warp_def $7, $18, 1, GOLDENROD_GYM + warp_def $1d, $1d, 1, GOLDENROD_BIKE_SHOP + warp_def $15, $1f, 1, GOLDENROD_HAPPINESS_RATER + warp_def $19, $5, 1, GOLDENROD_BILLS_HOUSE + warp_def $d, $9, 2, GOLDENROD_MAGNET_TRAIN_STATION + warp_def $5, $1d, 1, GOLDENROD_FLOWER_SHOP + warp_def $9, $21, 1, GOLDENROD_PP_SPEECH_HOUSE + warp_def $7, $f, 1, GOLDENROD_NAME_RATERS_HOUSE + warp_def $1b, $18, 1, GOLDENROD_DEPT_STORE_1F + warp_def $15, $e, 1, GOLDENROD_GAME_CORNER + warp_def $f, $5, 1, RADIO_TOWER_1F + warp_def $1, $13, 3, ROUTE_35_GOLDENROD_GATE + warp_def $5, $9, 8, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES + warp_def $1d, $b, 5, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES + warp_def $1b, $f, 1, GOLDENROD_POKECENTER_1F .XYTriggers: db 0 diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index 06a9f823e..8074a2454 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -78,10 +78,10 @@ GoldenrodDeptStore1F_MapEventHeader: .Warps: db 4 - warp_def $7, $7, 9, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - warp_def $7, $8, 9, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - warp_def $0, $f, 2, GROUP_GOLDENROD_DEPT_STORE_2F, MAP_GOLDENROD_DEPT_STORE_2F - warp_def $0, $2, 1, GROUP_GOLDENROD_DEPT_STORE_ELEVATOR, MAP_GOLDENROD_DEPT_STORE_ELEVATOR + warp_def $7, $7, 9, GOLDENROD_CITY + warp_def $7, $8, 9, GOLDENROD_CITY + warp_def $0, $f, 2, GOLDENROD_DEPT_STORE_2F + warp_def $0, $2, 1, GOLDENROD_DEPT_STORE_ELEVATOR .XYTriggers: db 0 diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index be84a789f..9b9086924 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -99,9 +99,9 @@ GoldenrodDeptStore2F_MapEventHeader: .Warps: db 3 - warp_def $0, $c, 1, GROUP_GOLDENROD_DEPT_STORE_3F, MAP_GOLDENROD_DEPT_STORE_3F - warp_def $0, $f, 3, GROUP_GOLDENROD_DEPT_STORE_1F, MAP_GOLDENROD_DEPT_STORE_1F - warp_def $0, $2, 1, GROUP_GOLDENROD_DEPT_STORE_ELEVATOR, MAP_GOLDENROD_DEPT_STORE_ELEVATOR + warp_def $0, $c, 1, GOLDENROD_DEPT_STORE_3F + warp_def $0, $f, 3, GOLDENROD_DEPT_STORE_1F + warp_def $0, $2, 1, GOLDENROD_DEPT_STORE_ELEVATOR .XYTriggers: db 0 diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index b21371879..2dad01395 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -57,9 +57,9 @@ GoldenrodDeptStore3F_MapEventHeader: .Warps: db 3 - warp_def $0, $c, 1, GROUP_GOLDENROD_DEPT_STORE_2F, MAP_GOLDENROD_DEPT_STORE_2F - warp_def $0, $f, 2, GROUP_GOLDENROD_DEPT_STORE_4F, MAP_GOLDENROD_DEPT_STORE_4F - warp_def $0, $2, 1, GROUP_GOLDENROD_DEPT_STORE_ELEVATOR, MAP_GOLDENROD_DEPT_STORE_ELEVATOR + warp_def $0, $c, 1, GOLDENROD_DEPT_STORE_2F + warp_def $0, $f, 2, GOLDENROD_DEPT_STORE_4F + warp_def $0, $2, 1, GOLDENROD_DEPT_STORE_ELEVATOR .XYTriggers: db 0 diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index 0606fa4bd..34279040c 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -77,9 +77,9 @@ GoldenrodDeptStore4F_MapEventHeader: .Warps: db 3 - warp_def $0, $c, 1, GROUP_GOLDENROD_DEPT_STORE_5F, MAP_GOLDENROD_DEPT_STORE_5F - warp_def $0, $f, 2, GROUP_GOLDENROD_DEPT_STORE_3F, MAP_GOLDENROD_DEPT_STORE_3F - warp_def $0, $2, 1, GROUP_GOLDENROD_DEPT_STORE_ELEVATOR, MAP_GOLDENROD_DEPT_STORE_ELEVATOR + warp_def $0, $c, 1, GOLDENROD_DEPT_STORE_5F + warp_def $0, $f, 2, GOLDENROD_DEPT_STORE_3F + warp_def $0, $2, 1, GOLDENROD_DEPT_STORE_ELEVATOR .XYTriggers: db 0 diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 834b82614..6c92bbcad 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -218,9 +218,9 @@ GoldenrodDeptStore5F_MapEventHeader: .Warps: db 3 - warp_def $0, $c, 1, GROUP_GOLDENROD_DEPT_STORE_4F, MAP_GOLDENROD_DEPT_STORE_4F - warp_def $0, $f, 1, GROUP_GOLDENROD_DEPT_STORE_6F, MAP_GOLDENROD_DEPT_STORE_6F - warp_def $0, $2, 1, GROUP_GOLDENROD_DEPT_STORE_ELEVATOR, MAP_GOLDENROD_DEPT_STORE_ELEVATOR + warp_def $0, $c, 1, GOLDENROD_DEPT_STORE_4F + warp_def $0, $f, 1, GOLDENROD_DEPT_STORE_6F + warp_def $0, $2, 1, GOLDENROD_DEPT_STORE_ELEVATOR .XYTriggers: db 0 diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 588746745..96a815cc6 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -151,9 +151,9 @@ GoldenrodDeptStore6F_MapEventHeader: .Warps: db 3 - warp_def $0, $f, 2, GROUP_GOLDENROD_DEPT_STORE_5F, MAP_GOLDENROD_DEPT_STORE_5F - warp_def $0, $2, 1, GROUP_GOLDENROD_DEPT_STORE_ELEVATOR, MAP_GOLDENROD_DEPT_STORE_ELEVATOR - warp_def $0, $d, 1, GROUP_GOLDENROD_DEPT_STORE_ROOF, MAP_GOLDENROD_DEPT_STORE_ROOF + warp_def $0, $f, 2, GOLDENROD_DEPT_STORE_5F + warp_def $0, $2, 1, GOLDENROD_DEPT_STORE_ELEVATOR + warp_def $0, $d, 1, GOLDENROD_DEPT_STORE_ROOF .XYTriggers: db 0 diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index d80feb513..3386d29d4 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -109,9 +109,9 @@ GoldenrodDeptStoreB1F_MapEventHeader: .Warps: db 3 - warp_def $2, $11, 3, GROUP_UNDERGROUND_WAREHOUSE, MAP_UNDERGROUND_WAREHOUSE - warp_def $4, $9, 1, GROUP_GOLDENROD_DEPT_STORE_ELEVATOR, MAP_GOLDENROD_DEPT_STORE_ELEVATOR - warp_def $4, $a, 2, GROUP_GOLDENROD_DEPT_STORE_ELEVATOR, MAP_GOLDENROD_DEPT_STORE_ELEVATOR + warp_def $2, $11, 3, UNDERGROUND_WAREHOUSE + warp_def $4, $9, 1, GOLDENROD_DEPT_STORE_ELEVATOR + warp_def $4, $a, 2, GOLDENROD_DEPT_STORE_ELEVATOR .XYTriggers: db 0 diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index 8a7b85375..a7ca59c89 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -46,13 +46,13 @@ MapGoldenrodDeptStoreElevatorSignpost0Script: Elevator_0x566e0: db 7 ; floors - db _B1F, 2, GROUP_GOLDENROD_DEPT_STORE_B1F, MAP_GOLDENROD_DEPT_STORE_B1F - db _1F, 4, GROUP_GOLDENROD_DEPT_STORE_1F, MAP_GOLDENROD_DEPT_STORE_1F - db _2F, 3, GROUP_GOLDENROD_DEPT_STORE_2F, MAP_GOLDENROD_DEPT_STORE_2F - db _3F, 3, GROUP_GOLDENROD_DEPT_STORE_3F, MAP_GOLDENROD_DEPT_STORE_3F - db _4F, 3, GROUP_GOLDENROD_DEPT_STORE_4F, MAP_GOLDENROD_DEPT_STORE_4F - db _5F, 3, GROUP_GOLDENROD_DEPT_STORE_5F, MAP_GOLDENROD_DEPT_STORE_5F - db _6F, 2, GROUP_GOLDENROD_DEPT_STORE_6F, MAP_GOLDENROD_DEPT_STORE_6F + elevfloor _B1F, 2, GOLDENROD_DEPT_STORE_B1F + elevfloor _1F, 4, GOLDENROD_DEPT_STORE_1F + elevfloor _2F, 3, GOLDENROD_DEPT_STORE_2F + elevfloor _3F, 3, GOLDENROD_DEPT_STORE_3F + elevfloor _4F, 3, GOLDENROD_DEPT_STORE_4F + elevfloor _5F, 3, GOLDENROD_DEPT_STORE_5F + elevfloor _6F, 2, GOLDENROD_DEPT_STORE_6F db $ff ; end @@ -62,8 +62,8 @@ GoldenrodDeptStoreElevator_MapEventHeader: .Warps: db 2 - warp_def $3, $1, 255, GROUP_GOLDENROD_DEPT_STORE_1F, MAP_GOLDENROD_DEPT_STORE_1F - warp_def $3, $2, 255, GROUP_GOLDENROD_DEPT_STORE_1F, MAP_GOLDENROD_DEPT_STORE_1F + warp_def $3, $1, 255, GOLDENROD_DEPT_STORE_1F + warp_def $3, $2, 255, GOLDENROD_DEPT_STORE_1F .XYTriggers: db 0 diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index ba80f2773..bd12344ca 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -211,7 +211,7 @@ GoldenrodDeptStoreRoof_MapEventHeader: .Warps: db 1 - warp_def $1, $d, 3, GROUP_GOLDENROD_DEPT_STORE_6F, MAP_GOLDENROD_DEPT_STORE_6F + warp_def $1, $d, 3, GOLDENROD_DEPT_STORE_6F .XYTriggers: db 0 diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 31193c714..0ef5a19f3 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -161,8 +161,8 @@ GoldenrodFlowerShop_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 6, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - warp_def $7, $3, 6, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY + warp_def $7, $2, 6, GOLDENROD_CITY + warp_def $7, $3, 6, GOLDENROD_CITY .XYTriggers: db 0 diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 898b292d5..2915c2389 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -437,8 +437,8 @@ GoldenrodGameCorner_MapEventHeader: .Warps: db 2 - warp_def $d, $2, 10, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - warp_def $d, $3, 10, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY + warp_def $d, $2, 10, GOLDENROD_CITY + warp_def $d, $3, 10, GOLDENROD_CITY .XYTriggers: db 0 diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 3504c3f4a..424a798bb 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -379,8 +379,8 @@ GoldenrodGym_MapEventHeader: .Warps: db 2 - warp_def $11, $2, 1, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - warp_def $11, $3, 1, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY + warp_def $11, $2, 1, GOLDENROD_CITY + warp_def $11, $3, 1, GOLDENROD_CITY .XYTriggers: db 1 diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 74bcf5b51..970994680 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -137,8 +137,8 @@ GoldenrodHappinessRater_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 3, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - warp_def $7, $3, 3, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY + warp_def $7, $2, 3, GOLDENROD_CITY + warp_def $7, $3, 3, GOLDENROD_CITY .XYTriggers: db 0 diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index 339bc55ee..118c86945 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -168,10 +168,10 @@ GoldenrodMagnetTrainStation_MapEventHeader: .Warps: db 4 - warp_def $11, $8, 5, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - warp_def $11, $9, 5, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - warp_def $5, $6, 4, GROUP_SAFFRON_TRAIN_STATION, MAP_SAFFRON_TRAIN_STATION - warp_def $5, $b, 3, GROUP_SAFFRON_TRAIN_STATION, MAP_SAFFRON_TRAIN_STATION + warp_def $11, $8, 5, GOLDENROD_CITY + warp_def $11, $9, 5, GOLDENROD_CITY + warp_def $5, $6, 4, SAFFRON_TRAIN_STATION + warp_def $5, $b, 3, SAFFRON_TRAIN_STATION .XYTriggers: db 1 diff --git a/maps/GoldenrodNameRatersHouse.asm b/maps/GoldenrodNameRatersHouse.asm index 587e052d2..bd0539722 100644 --- a/maps/GoldenrodNameRatersHouse.asm +++ b/maps/GoldenrodNameRatersHouse.asm @@ -27,8 +27,8 @@ GoldenrodNameRatersHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 8, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - warp_def $7, $3, 8, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY + warp_def $7, $2, 8, GOLDENROD_CITY + warp_def $7, $3, 8, GOLDENROD_CITY .XYTriggers: db 0 diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index d41659542..6b0d7c051 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -53,8 +53,8 @@ GoldenrodPPSpeechHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 7, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - warp_def $7, $3, 7, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY + warp_def $7, $2, 7, GOLDENROD_CITY + warp_def $7, $3, 7, GOLDENROD_CITY .XYTriggers: db 0 diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokeCenter1F.asm index c74f59265..91a8201ad 100644 --- a/maps/GoldenrodPokeCenter1F.asm +++ b/maps/GoldenrodPokeCenter1F.asm @@ -803,10 +803,10 @@ GoldenrodPokeCenter1F_MapEventHeader: .Warps: db 4 - warp_def $7, $3, 15, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - warp_def $7, $4, 15, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - warp_def $6, $0, 1, GROUP_GOLDENROD_POKECOM_CENTER_2F_MOBILE, MAP_GOLDENROD_POKECOM_CENTER_2F_MOBILE - warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F + warp_def $7, $3, 15, GOLDENROD_CITY + warp_def $7, $4, 15, GOLDENROD_CITY + warp_def $6, $0, 1, GOLDENROD_POKECOM_CENTER_2F_MOBILE + warp_def $7, $0, 1, POKECENTER_2F .XYTriggers: db 2 diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index 44da9ca7b..f408ea3b7 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -269,8 +269,8 @@ GoldenrodPokeComCenter2FMobile_MapEventHeader: .Warps: db 2 - warp_def $1f, $0, 3, GROUP_GOLDENROD_POKECENTER_1F, MAP_GOLDENROD_POKECENTER_1F - warp_def $1f, $1, 3, GROUP_GOLDENROD_POKECENTER_1F, MAP_GOLDENROD_POKECENTER_1F + warp_def $1f, $0, 3, GOLDENROD_POKECENTER_1F + warp_def $1f, $1, 3, GOLDENROD_POKECENTER_1F .XYTriggers: db 0 diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index cf35df9ba..cdd8d205b 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -30,8 +30,8 @@ GuideGentsHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 4, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY - warp_def $7, $3, 4, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY + warp_def $7, $2, 4, CHERRYGROVE_CITY + warp_def $7, $3, 4, CHERRYGROVE_CITY .XYTriggers: db 0 diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index 91595fa04..e9b66a3af 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -37,7 +37,7 @@ HallOfFameScript: clearevent EVENT_RED_IN_MT_SILVER setevent EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME clearevent EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME - domaptrigger GROUP_SPROUT_TOWER_3F, MAP_SPROUT_TOWER_3F, $1 + domaptrigger SPROUT_TOWER_3F, $1 special HealParty checkevent EVENT_GOT_SS_TICKET_FROM_ELM iftrue .SkipPhoneCall @@ -115,8 +115,8 @@ HallOfFame_MapEventHeader: .Warps: db 2 - warp_def $d, $4, 3, GROUP_LANCES_ROOM, MAP_LANCES_ROOM - warp_def $d, $5, 4, GROUP_LANCES_ROOM, MAP_LANCES_ROOM + warp_def $d, $4, 3, LANCES_ROOM + warp_def $d, $5, 4, LANCES_ROOM .XYTriggers: db 0 diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index c233edeba..4ef9ed31f 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -20,10 +20,10 @@ IcePath1F_MapEventHeader: .Warps: db 4 - warp_def $13, $4, 1, GROUP_ROUTE_44, MAP_ROUTE_44 - warp_def $1b, $24, 7, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY - warp_def $5, $25, 1, GROUP_ICE_PATH_B1F, MAP_ICE_PATH_B1F - warp_def $d, $25, 7, GROUP_ICE_PATH_B1F, MAP_ICE_PATH_B1F + warp_def $13, $4, 1, ROUTE_44 + warp_def $1b, $24, 7, BLACKTHORN_CITY + warp_def $5, $25, 1, ICE_PATH_B1F + warp_def $d, $25, 7, ICE_PATH_B1F .XYTriggers: db 0 diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 06a9d9ee8..775c7c1a4 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -89,14 +89,14 @@ IcePathB1F_MapEventHeader: .Warps: db 8 - warp_def $f, $3, 3, GROUP_ICE_PATH_1F, MAP_ICE_PATH_1F - warp_def $3, $11, 1, GROUP_ICE_PATH_B2F_MAHOGANY_SIDE, MAP_ICE_PATH_B2F_MAHOGANY_SIDE - warp_def $2, $b, 3, GROUP_ICE_PATH_B2F_MAHOGANY_SIDE, MAP_ICE_PATH_B2F_MAHOGANY_SIDE - warp_def $7, $4, 4, GROUP_ICE_PATH_B2F_MAHOGANY_SIDE, MAP_ICE_PATH_B2F_MAHOGANY_SIDE - warp_def $c, $5, 5, GROUP_ICE_PATH_B2F_MAHOGANY_SIDE, MAP_ICE_PATH_B2F_MAHOGANY_SIDE - warp_def $d, $c, 6, GROUP_ICE_PATH_B2F_MAHOGANY_SIDE, MAP_ICE_PATH_B2F_MAHOGANY_SIDE - warp_def $19, $5, 4, GROUP_ICE_PATH_1F, MAP_ICE_PATH_1F - warp_def $1b, $b, 1, GROUP_ICE_PATH_B2F_BLACKTHORN_SIDE, MAP_ICE_PATH_B2F_BLACKTHORN_SIDE + warp_def $f, $3, 3, ICE_PATH_1F + warp_def $3, $11, 1, ICE_PATH_B2F_MAHOGANY_SIDE + warp_def $2, $b, 3, ICE_PATH_B2F_MAHOGANY_SIDE + warp_def $7, $4, 4, ICE_PATH_B2F_MAHOGANY_SIDE + warp_def $c, $5, 5, ICE_PATH_B2F_MAHOGANY_SIDE + warp_def $d, $c, 6, ICE_PATH_B2F_MAHOGANY_SIDE + warp_def $19, $5, 4, ICE_PATH_1F + warp_def $1b, $b, 1, ICE_PATH_B2F_BLACKTHORN_SIDE .XYTriggers: db 0 diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index cc2d35fed..40546d0e3 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -18,8 +18,8 @@ IcePathB2FBlackthornSide_MapEventHeader: .Warps: db 2 - warp_def $f, $3, 8, GROUP_ICE_PATH_B1F, MAP_ICE_PATH_B1F - warp_def $3, $3, 2, GROUP_ICE_PATH_B3F, MAP_ICE_PATH_B3F + warp_def $f, $3, 8, ICE_PATH_B1F + warp_def $3, $3, 2, ICE_PATH_B3F .XYTriggers: db 0 diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index 925021077..78b66bd53 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -29,12 +29,12 @@ IcePathB2FMahoganySide_MapEventHeader: .Warps: db 6 - warp_def $1, $11, 2, GROUP_ICE_PATH_B1F, MAP_ICE_PATH_B1F - warp_def $b, $9, 1, GROUP_ICE_PATH_B3F, MAP_ICE_PATH_B3F - warp_def $4, $b, 3, GROUP_ICE_PATH_B1F, MAP_ICE_PATH_B1F - warp_def $6, $4, 4, GROUP_ICE_PATH_B1F, MAP_ICE_PATH_B1F - warp_def $c, $4, 5, GROUP_ICE_PATH_B1F, MAP_ICE_PATH_B1F - warp_def $c, $c, 6, GROUP_ICE_PATH_B1F, MAP_ICE_PATH_B1F + warp_def $1, $11, 2, ICE_PATH_B1F + warp_def $b, $9, 1, ICE_PATH_B3F + warp_def $4, $b, 3, ICE_PATH_B1F + warp_def $6, $4, 4, ICE_PATH_B1F + warp_def $c, $4, 5, ICE_PATH_B1F + warp_def $c, $c, 6, ICE_PATH_B1F .XYTriggers: db 0 diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index e03b38d16..9b8578545 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -17,8 +17,8 @@ IcePathB3F_MapEventHeader: .Warps: db 2 - warp_def $5, $3, 2, GROUP_ICE_PATH_B2F_MAHOGANY_SIDE, MAP_ICE_PATH_B2F_MAHOGANY_SIDE - warp_def $5, $f, 2, GROUP_ICE_PATH_B2F_BLACKTHORN_SIDE, MAP_ICE_PATH_B2F_BLACKTHORN_SIDE + warp_def $5, $3, 2, ICE_PATH_B2F_MAHOGANY_SIDE + warp_def $5, $f, 2, ICE_PATH_B2F_BLACKTHORN_SIDE .XYTriggers: db 0 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index aa4535afb..ed049120d 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -933,9 +933,9 @@ IlexForest_MapEventHeader: .Warps: db 3 - warp_def $5, $1, 3, GROUP_ROUTE_34_ILEX_FOREST_GATE, MAP_ROUTE_34_ILEX_FOREST_GATE - warp_def $2a, $3, 1, GROUP_ILEX_FOREST_AZALEA_GATE, MAP_ILEX_FOREST_AZALEA_GATE - warp_def $2b, $3, 2, GROUP_ILEX_FOREST_AZALEA_GATE, MAP_ILEX_FOREST_AZALEA_GATE + warp_def $5, $1, 3, ROUTE_34_ILEX_FOREST_GATE + warp_def $2a, $3, 1, ILEX_FOREST_AZALEA_GATE + warp_def $2b, $3, 2, ILEX_FOREST_AZALEA_GATE .XYTriggers: db 0 diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index 68ac4631f..eb3ca64ee 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -32,10 +32,10 @@ IlexForestAzaleaGate_MapEventHeader: .Warps: db 4 - warp_def $4, $0, 2, GROUP_ILEX_FOREST, MAP_ILEX_FOREST - warp_def $5, $0, 3, GROUP_ILEX_FOREST, MAP_ILEX_FOREST - warp_def $4, $9, 7, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN - warp_def $5, $9, 8, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN + warp_def $4, $0, 2, ILEX_FOREST + warp_def $5, $0, 3, ILEX_FOREST + warp_def $4, $9, 7, AZALEA_TOWN + warp_def $5, $9, 8, AZALEA_TOWN .XYTriggers: db 0 diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index 1e91d6319..553b26417 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -16,12 +16,12 @@ UnknownScript_0x180009: end UnknownScript_0x18000a: - domaptrigger GROUP_WILLS_ROOM, MAP_WILLS_ROOM, $0 - domaptrigger GROUP_KOGAS_ROOM, MAP_KOGAS_ROOM, $0 - domaptrigger GROUP_BRUNOS_ROOM, MAP_BRUNOS_ROOM, $0 - domaptrigger GROUP_KARENS_ROOM, MAP_KARENS_ROOM, $0 - domaptrigger GROUP_LANCES_ROOM, MAP_LANCES_ROOM, $0 - domaptrigger GROUP_HALL_OF_FAME, MAP_HALL_OF_FAME, $0 + domaptrigger WILLS_ROOM, $0 + domaptrigger KOGAS_ROOM, $0 + domaptrigger BRUNOS_ROOM, $0 + domaptrigger KARENS_ROOM, $0 + domaptrigger LANCES_ROOM, $0 + domaptrigger HALL_OF_FAME, $0 clearevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED clearevent EVENT_WILLS_ROOM_EXIT_OPEN clearevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED @@ -156,7 +156,7 @@ TeleportGuyScript: playsound SFX_WARP_TO special FadeBlackBGMap waitbutton - warp GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN, $d, $6 + warp NEW_BARK_TOWN, $d, $6 end .No @@ -304,10 +304,10 @@ IndigoPlateauPokeCenter1F_MapEventHeader: .Warps: db 4 - warp_def $d, $5, 1, GROUP_ROUTE_23, MAP_ROUTE_23 - warp_def $d, $6, 2, GROUP_ROUTE_23, MAP_ROUTE_23 - warp_def $d, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - warp_def $3, $e, 1, GROUP_WILLS_ROOM, MAP_WILLS_ROOM + warp_def $d, $5, 1, ROUTE_23 + warp_def $d, $6, 2, ROUTE_23 + warp_def $d, $0, 1, POKECENTER_2F + warp_def $3, $e, 1, WILLS_ROOM .XYTriggers: db 2 diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index 3e0f761e8..722f1d100 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -140,10 +140,10 @@ KarensRoom_MapEventHeader: .Warps: db 4 - warp_def $11, $4, 3, GROUP_BRUNOS_ROOM, MAP_BRUNOS_ROOM - warp_def $11, $5, 4, GROUP_BRUNOS_ROOM, MAP_BRUNOS_ROOM - warp_def $2, $4, 1, GROUP_LANCES_ROOM, MAP_LANCES_ROOM - warp_def $2, $5, 2, GROUP_LANCES_ROOM, MAP_LANCES_ROOM + warp_def $11, $4, 3, BRUNOS_ROOM + warp_def $11, $5, 4, BRUNOS_ROOM + warp_def $2, $4, 1, LANCES_ROOM + warp_def $2, $5, 2, LANCES_ROOM .XYTriggers: db 0 diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 957d4dc6c..cbd800513 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -137,10 +137,10 @@ KogasRoom_MapEventHeader: .Warps: db 4 - warp_def $11, $4, 2, GROUP_WILLS_ROOM, MAP_WILLS_ROOM - warp_def $11, $5, 3, GROUP_WILLS_ROOM, MAP_WILLS_ROOM - warp_def $2, $4, 1, GROUP_BRUNOS_ROOM, MAP_BRUNOS_ROOM - warp_def $2, $5, 2, GROUP_BRUNOS_ROOM, MAP_BRUNOS_ROOM + warp_def $11, $4, 2, WILLS_ROOM + warp_def $11, $5, 3, WILLS_ROOM + warp_def $2, $4, 1, BRUNOS_ROOM + warp_def $2, $5, 2, BRUNOS_ROOM .XYTriggers: db 0 diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index e18a0b073..305a11331 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -386,9 +386,9 @@ KrissHouse1F_MapEventHeader: .Warps: db 3 - warp_def $7, $6, 2, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN - warp_def $7, $7, 2, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN - warp_def $0, $9, 1, GROUP_KRISS_HOUSE_2F, MAP_KRISS_HOUSE_2F + warp_def $7, $6, 2, NEW_BARK_TOWN + warp_def $7, $7, 2, NEW_BARK_TOWN + warp_def $0, $9, 1, KRISS_HOUSE_2F .XYTriggers: db 2 diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index b3f66669d..ca95f86c5 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -89,7 +89,7 @@ KrissHousePC: loadmovesprites end .Warp - warp 0, 0, $0, $0 + warp NONE, $0, $0 end KrisRadioText1: @@ -118,7 +118,7 @@ KrissHouse2F_MapEventHeader: .Warps: db 1 - warp_def $0, $7, 3, GROUP_KRISS_HOUSE_1F, MAP_KRISS_HOUSE_1F + warp_def $0, $7, 3, KRISS_HOUSE_1F .XYTriggers: db 0 diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm index 33277c655..667bd5872 100644 --- a/maps/KrissNeighborsHouse.asm +++ b/maps/KrissNeighborsHouse.asm @@ -100,8 +100,8 @@ KrissNeighborsHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 3, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN - warp_def $7, $3, 3, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN + warp_def $7, $2, 3, NEW_BARK_TOWN + warp_def $7, $3, 3, NEW_BARK_TOWN .XYTriggers: db 0 diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index ab800684a..44ead6da0 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -307,7 +307,7 @@ KurtScript_0x18e178: clearevent EVENT_AZALEA_TOWN_KURT waitbutton special RestartMapMusic - domaptrigger GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN, $2 + domaptrigger AZALEA_TOWN, $2 end KurtScript_0x18e3bd: @@ -678,8 +678,8 @@ KurtsHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $3, 4, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN - warp_def $7, $4, 4, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN + warp_def $7, $3, 4, AZALEA_TOWN + warp_def $7, $4, 4, AZALEA_TOWN .XYTriggers: db 0 diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index 48415c105..6a71f7387 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeofRage.asm @@ -53,7 +53,7 @@ UnknownScript_0x70035: disappear $2 clearevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE setevent EVENT_DECIDED_TO_HELP_LANCE - domaptrigger GROUP_MAHOGANY_MART_1F, MAP_MAHOGANY_MART_1F, $1 + domaptrigger MAHOGANY_MART_1F, $1 end UnknownScript_0x7004e: @@ -493,8 +493,8 @@ LakeofRage_MapEventHeader: .Warps: db 2 - warp_def $3, $7, 1, GROUP_LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, MAP_LAKE_OF_RAGE_HIDDEN_POWER_HOUSE - warp_def $1f, $1b, 1, GROUP_LAKE_OF_RAGE_MAGIKARP_HOUSE, MAP_LAKE_OF_RAGE_MAGIKARP_HOUSE + warp_def $3, $7, 1, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE + warp_def $1f, $1b, 1, LAKE_OF_RAGE_MAGIKARP_HOUSE .XYTriggers: db 0 diff --git a/maps/LakeofRageHiddenPowerHouse.asm b/maps/LakeofRageHiddenPowerHouse.asm index 927b0f50f..2d30cf6ee 100644 --- a/maps/LakeofRageHiddenPowerHouse.asm +++ b/maps/LakeofRageHiddenPowerHouse.asm @@ -70,8 +70,8 @@ LakeofRageHiddenPowerHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 1, GROUP_LAKE_OF_RAGE, MAP_LAKE_OF_RAGE - warp_def $7, $3, 1, GROUP_LAKE_OF_RAGE, MAP_LAKE_OF_RAGE + warp_def $7, $2, 1, LAKE_OF_RAGE + warp_def $7, $3, 1, LAKE_OF_RAGE .XYTriggers: db 0 diff --git a/maps/LakeofRageMagikarpHouse.asm b/maps/LakeofRageMagikarpHouse.asm index 849641d3d..25bfbe1f3 100644 --- a/maps/LakeofRageMagikarpHouse.asm +++ b/maps/LakeofRageMagikarpHouse.asm @@ -208,8 +208,8 @@ LakeofRageMagikarpHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 2, GROUP_LAKE_OF_RAGE, MAP_LAKE_OF_RAGE - warp_def $7, $3, 2, GROUP_LAKE_OF_RAGE, MAP_LAKE_OF_RAGE + warp_def $7, $2, 2, LAKE_OF_RAGE + warp_def $7, $3, 2, LAKE_OF_RAGE .XYTriggers: db 0 diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index adb731ceb..35f84ad61 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -127,7 +127,7 @@ LanceScript_0x180e7b: applymovement $3, MovementData_0x180f5b special FadeBlackBGMap pause 15 - warpfacing $1, GROUP_HALL_OF_FAME, MAP_HALL_OF_FAME, $4, $d + warpfacing $1, HALL_OF_FAME, $4, $d end MovementData_0x180f33: @@ -343,10 +343,10 @@ LancesRoom_MapEventHeader: .Warps: db 4 - warp_def $17, $4, 3, GROUP_KARENS_ROOM, MAP_KARENS_ROOM - warp_def $17, $5, 4, GROUP_KARENS_ROOM, MAP_KARENS_ROOM - warp_def $1, $4, 1, GROUP_HALL_OF_FAME, MAP_HALL_OF_FAME - warp_def $1, $5, 2, GROUP_HALL_OF_FAME, MAP_HALL_OF_FAME + warp_def $17, $4, 3, KARENS_ROOM + warp_def $17, $5, 4, KARENS_ROOM + warp_def $1, $4, 1, HALL_OF_FAME + warp_def $1, $5, 2, HALL_OF_FAME .XYTriggers: db 2 diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index ac7b6fc58..522f758ac 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -220,8 +220,8 @@ LavRadioTower1F_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 7, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN - warp_def $7, $3, 7, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN + warp_def $7, $2, 7, LAVENDER_TOWN + warp_def $7, $3, 7, LAVENDER_TOWN .XYTriggers: db 0 diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index 5e67cd923..f28dd7959 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -48,8 +48,8 @@ LavenderMart_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 5, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN - warp_def $7, $3, 5, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN + warp_def $7, $2, 5, LAVENDER_TOWN + warp_def $7, $3, 5, LAVENDER_TOWN .XYTriggers: db 0 diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index ac813572a..6a16ac43c 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -29,8 +29,8 @@ LavenderNameRater_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 4, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN - warp_def $7, $3, 4, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN + warp_def $7, $2, 4, LAVENDER_TOWN + warp_def $7, $3, 4, LAVENDER_TOWN .XYTriggers: db 0 diff --git a/maps/LavenderPokeCenter1F.asm b/maps/LavenderPokeCenter1F.asm index 716cf4254..77f7e9153 100644 --- a/maps/LavenderPokeCenter1F.asm +++ b/maps/LavenderPokeCenter1F.asm @@ -80,9 +80,9 @@ LavenderPokeCenter1F_MapEventHeader: .Warps: db 3 - warp_def $7, $3, 1, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN - warp_def $7, $4, 1, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN - warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F + warp_def $7, $3, 1, LAVENDER_TOWN + warp_def $7, $4, 1, LAVENDER_TOWN + warp_def $7, $0, 1, POKECENTER_2F .XYTriggers: db 0 diff --git a/maps/LavenderPokeCenter2FBeta.asm b/maps/LavenderPokeCenter2FBeta.asm index 3f8caf8f9..9d31d8d4e 100644 --- a/maps/LavenderPokeCenter2FBeta.asm +++ b/maps/LavenderPokeCenter2FBeta.asm @@ -11,7 +11,7 @@ LavenderPokeCenter2FBeta_MapEventHeader: .Warps: db 1 - warp_def $7, $0, 3, GROUP_LAVENDER_POKECENTER_1F, MAP_LAVENDER_POKECENTER_1F + warp_def $7, $0, 3, LAVENDER_POKECENTER_1F .XYTriggers: db 0 diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 5ad9f91fe..de799a7de 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -107,13 +107,13 @@ LavenderTown_MapEventHeader: .Warps: db 7 - warp_def $5, $5, 1, GROUP_LAVENDER_POKECENTER_1F, MAP_LAVENDER_POKECENTER_1F - warp_def $9, $5, 1, GROUP_MR_FUJIS_HOUSE, MAP_MR_FUJIS_HOUSE - warp_def $d, $3, 1, GROUP_LAVENDER_TOWN_SPEECH_HOUSE, MAP_LAVENDER_TOWN_SPEECH_HOUSE - warp_def $d, $7, 1, GROUP_LAVENDER_NAME_RATER, MAP_LAVENDER_NAME_RATER - warp_def $5, $1, 2, GROUP_LAVENDER_MART, MAP_LAVENDER_MART - warp_def $b, $d, 1, GROUP_SOUL_HOUSE, MAP_SOUL_HOUSE - warp_def $5, $e, 1, GROUP_LAV_RADIO_TOWER_1F, MAP_LAV_RADIO_TOWER_1F + warp_def $5, $5, 1, LAVENDER_POKECENTER_1F + warp_def $9, $5, 1, MR_FUJIS_HOUSE + warp_def $d, $3, 1, LAVENDER_TOWN_SPEECH_HOUSE + warp_def $d, $7, 1, LAVENDER_NAME_RATER + warp_def $5, $1, 2, LAVENDER_MART + warp_def $b, $d, 1, SOUL_HOUSE + warp_def $5, $e, 1, LAV_RADIO_TOWER_1F .XYTriggers: db 0 diff --git a/maps/LavenderTownSpeechHouse.asm b/maps/LavenderTownSpeechHouse.asm index 78af1d47c..547384cb5 100644 --- a/maps/LavenderTownSpeechHouse.asm +++ b/maps/LavenderTownSpeechHouse.asm @@ -31,8 +31,8 @@ LavenderTownSpeechHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 3, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN - warp_def $7, $3, 3, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN + warp_def $7, $2, 3, LAVENDER_TOWN + warp_def $7, $3, 3, LAVENDER_TOWN .XYTriggers: db 0 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 4ceb6f660..99b38f247 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -369,8 +369,8 @@ MahoganyGym_MapEventHeader: .Warps: db 2 - warp_def $11, $4, 3, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN - warp_def $11, $5, 3, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN + warp_def $11, $4, 3, MAHOGANY_TOWN + warp_def $11, $5, 3, MAHOGANY_TOWN .XYTriggers: db 0 diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 9a725f422..d9eb48dbb 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -224,9 +224,9 @@ MahoganyMart1F_MapEventHeader: .Warps: db 3 - warp_def $7, $3, 1, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN - warp_def $7, $4, 1, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN - warp_def $3, $7, 1, GROUP_TEAM_ROCKET_BASE_B1F, MAP_TEAM_ROCKET_BASE_B1F + warp_def $7, $3, 1, MAHOGANY_TOWN + warp_def $7, $4, 1, MAHOGANY_TOWN + warp_def $3, $7, 1, TEAM_ROCKET_BASE_B1F .XYTriggers: db 0 diff --git a/maps/MahoganyPokeCenter1F.asm b/maps/MahoganyPokeCenter1F.asm index 8a5374fb0..c07f803cd 100644 --- a/maps/MahoganyPokeCenter1F.asm +++ b/maps/MahoganyPokeCenter1F.asm @@ -53,9 +53,9 @@ MahoganyPokeCenter1F_MapEventHeader: .Warps: db 3 - warp_def $7, $3, 4, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN - warp_def $7, $4, 4, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN - warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F + warp_def $7, $3, 4, MAHOGANY_TOWN + warp_def $7, $4, 4, MAHOGANY_TOWN + warp_def $7, $0, 1, POKECENTER_2F .XYTriggers: db 0 diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index 347b64441..478472000 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -62,8 +62,8 @@ MahoganyRedGyaradosSpeechHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 2, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN - warp_def $7, $3, 2, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN + warp_def $7, $2, 2, MAHOGANY_TOWN + warp_def $7, $3, 2, MAHOGANY_TOWN .XYTriggers: db 0 diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index d48596bd3..aa9e1afa9 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -248,11 +248,11 @@ MahoganyTown_MapEventHeader: .Warps: db 5 - warp_def $7, $b, 1, GROUP_MAHOGANY_MART_1F, MAP_MAHOGANY_MART_1F - warp_def $7, $11, 1, GROUP_MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, MAP_MAHOGANY_RED_GYARADOS_SPEECH_HOUSE - warp_def $d, $6, 1, GROUP_MAHOGANY_GYM, MAP_MAHOGANY_GYM - warp_def $d, $f, 1, GROUP_MAHOGANY_POKECENTER_1F, MAP_MAHOGANY_POKECENTER_1F - warp_def $1, $9, 3, GROUP_ROUTE_43_MAHOGANY_GATE, MAP_ROUTE_43_MAHOGANY_GATE + 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 + warp_def $1, $9, 3, ROUTE_43_MAHOGANY_GATE .XYTriggers: db 2 diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index 4353733db..cdedd81a4 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -201,8 +201,8 @@ ManiasHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 1, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY - warp_def $7, $3, 1, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY + warp_def $7, $2, 1, CIANWOOD_CITY + warp_def $7, $3, 1, CIANWOOD_CITY .XYTriggers: db 0 diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index e721f5dfa..06dd75a0a 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -18,7 +18,7 @@ MobileBattleRoom_MapScriptHeader: MobileBattleRoom_Initialize: dotrigger $1 - domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $5 + domaptrigger POKECENTER_2F, $5 end MapMobileBattleRoomSignpost0Script: @@ -74,8 +74,8 @@ MobileBattleRoom_MapEventHeader: .Warps: db 2 - warp_def $7, $4, 6, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - warp_def $7, $5, 6, GROUP_POKECENTER_2F, MAP_POKECENTER_2F + warp_def $7, $4, 6, POKECENTER_2F + warp_def $7, $5, 6, POKECENTER_2F .XYTriggers: db 0 diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm index 8bea1200e..bebb82452 100644 --- a/maps/MobileTradeRoomMobile.asm +++ b/maps/MobileTradeRoomMobile.asm @@ -18,7 +18,7 @@ MobileTradeRoomMobile_MapScriptHeader: MobileTradeRoomMobile_Initialize: dotrigger $1 - domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $4 + domaptrigger POKECENTER_2F, $4 end MapMobileTradeRoomMobileSignpost0Script: @@ -42,8 +42,8 @@ MobileTradeRoomMobile_MapEventHeader: .Warps: db 2 - warp_def $7, $4, 5, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - warp_def $7, $5, 5, GROUP_POKECENTER_2F, MAP_POKECENTER_2F + warp_def $7, $4, 5, POKECENTER_2F + warp_def $7, $5, 5, POKECENTER_2F .XYTriggers: db 0 diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 94ef24277..44c98feb7 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -165,14 +165,14 @@ MountMoon_MapEventHeader: .Warps: db 8 - warp_def $3, $3, 1, GROUP_ROUTE_3, MAP_ROUTE_3 - warp_def $f, $f, 1, GROUP_ROUTE_4, MAP_ROUTE_4 - warp_def $3, $d, 7, GROUP_MOUNT_MOON, MAP_MOUNT_MOON - warp_def $b, $f, 8, GROUP_MOUNT_MOON, MAP_MOUNT_MOON - warp_def $5, $19, 1, GROUP_MOUNT_MOON_SQUARE, MAP_MOUNT_MOON_SQUARE - warp_def $f, $19, 2, GROUP_MOUNT_MOON_SQUARE, MAP_MOUNT_MOON_SQUARE - warp_def $3, $19, 3, GROUP_MOUNT_MOON, MAP_MOUNT_MOON - warp_def $d, $19, 4, GROUP_MOUNT_MOON, MAP_MOUNT_MOON + warp_def $3, $3, 1, ROUTE_3 + warp_def $f, $f, 1, ROUTE_4 + warp_def $3, $d, 7, MOUNT_MOON + warp_def $b, $f, 8, MOUNT_MOON + warp_def $5, $19, 1, MOUNT_MOON_SQUARE + warp_def $f, $19, 2, MOUNT_MOON_SQUARE + warp_def $3, $19, 3, MOUNT_MOON + warp_def $d, $19, 4, MOUNT_MOON .XYTriggers: db 0 diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index 673cbde08..c6ac6b349 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -27,8 +27,8 @@ MountMoonGiftShop_MapEventHeader: .Warps: db 2 - warp_def $7, $3, 3, GROUP_MOUNT_MOON_SQUARE, MAP_MOUNT_MOON_SQUARE - warp_def $7, $4, 3, GROUP_MOUNT_MOON_SQUARE, MAP_MOUNT_MOON_SQUARE + warp_def $7, $3, 3, MOUNT_MOON_SQUARE + warp_def $7, $4, 3, MOUNT_MOON_SQUARE .XYTriggers: db 0 diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 111b1284b..7a22eda1d 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -140,9 +140,9 @@ MountMoonSquare_MapEventHeader: .Warps: db 3 - warp_def $5, $14, 5, GROUP_MOUNT_MOON, MAP_MOUNT_MOON - warp_def $b, $16, 6, GROUP_MOUNT_MOON, MAP_MOUNT_MOON - warp_def $7, $d, 1, GROUP_MOUNT_MOON_GIFT_SHOP, MAP_MOUNT_MOON_GIFT_SHOP + warp_def $5, $14, 5, MOUNT_MOON + warp_def $b, $16, 6, MOUNT_MOON + warp_def $7, $d, 1, MOUNT_MOON_GIFT_SHOP .XYTriggers: db 1 diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 2f8def0ae..b97cdcb3f 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -111,12 +111,12 @@ MountMortar1FInside_MapEventHeader: .Warps: db 6 - warp_def $2f, $b, 5, GROUP_MOUNT_MORTAR_1F_OUTSIDE, MAP_MOUNT_MORTAR_1F_OUTSIDE - warp_def $2f, $1d, 6, GROUP_MOUNT_MORTAR_1F_OUTSIDE, MAP_MOUNT_MORTAR_1F_OUTSIDE - warp_def $27, $5, 8, GROUP_MOUNT_MORTAR_1F_OUTSIDE, MAP_MOUNT_MORTAR_1F_OUTSIDE - warp_def $29, $21, 9, GROUP_MOUNT_MORTAR_1F_OUTSIDE, MAP_MOUNT_MORTAR_1F_OUTSIDE - warp_def $13, $3, 1, GROUP_MOUNT_MORTAR_B1F, MAP_MOUNT_MORTAR_B1F - warp_def $9, $9, 2, GROUP_MOUNT_MORTAR_2F_INSIDE, MAP_MOUNT_MORTAR_2F_INSIDE + warp_def $2f, $b, 5, MOUNT_MORTAR_1F_OUTSIDE + warp_def $2f, $1d, 6, MOUNT_MORTAR_1F_OUTSIDE + warp_def $27, $5, 8, MOUNT_MORTAR_1F_OUTSIDE + warp_def $29, $21, 9, MOUNT_MORTAR_1F_OUTSIDE + warp_def $13, $3, 1, MOUNT_MORTAR_B1F + warp_def $9, $9, 2, MOUNT_MORTAR_2F_INSIDE .XYTriggers: db 0 diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index 81d95b2c8..a11c39d48 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -21,15 +21,15 @@ MountMortar1FOutside_MapEventHeader: .Warps: db 9 - warp_def $21, $3, 3, GROUP_ROUTE_42, MAP_ROUTE_42 - warp_def $21, $11, 4, GROUP_ROUTE_42, MAP_ROUTE_42 - warp_def $21, $25, 5, GROUP_ROUTE_42, MAP_ROUTE_42 - warp_def $5, $11, 1, GROUP_MOUNT_MORTAR_2F_INSIDE, MAP_MOUNT_MORTAR_2F_INSIDE - warp_def $15, $b, 1, GROUP_MOUNT_MORTAR_1F_INSIDE, MAP_MOUNT_MORTAR_1F_INSIDE - warp_def $15, $1d, 2, GROUP_MOUNT_MORTAR_1F_INSIDE, MAP_MOUNT_MORTAR_1F_INSIDE - warp_def $1d, $11, 2, GROUP_MOUNT_MORTAR_B1F, MAP_MOUNT_MORTAR_B1F - warp_def $d, $7, 3, GROUP_MOUNT_MORTAR_1F_INSIDE, MAP_MOUNT_MORTAR_1F_INSIDE - warp_def $d, $21, 4, GROUP_MOUNT_MORTAR_1F_INSIDE, MAP_MOUNT_MORTAR_1F_INSIDE + warp_def $21, $3, 3, ROUTE_42 + warp_def $21, $11, 4, ROUTE_42 + warp_def $21, $25, 5, ROUTE_42 + warp_def $5, $11, 1, MOUNT_MORTAR_2F_INSIDE + warp_def $15, $b, 1, MOUNT_MORTAR_1F_INSIDE + warp_def $15, $1d, 2, MOUNT_MORTAR_1F_INSIDE + warp_def $1d, $11, 2, MOUNT_MORTAR_B1F + warp_def $d, $7, 3, MOUNT_MORTAR_1F_INSIDE + warp_def $d, $21, 4, MOUNT_MORTAR_1F_INSIDE .XYTriggers: db 0 diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index cbd8589a7..d3808d1f3 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -64,8 +64,8 @@ MountMortar2FInside_MapEventHeader: .Warps: db 2 - warp_def $21, $11, 4, GROUP_MOUNT_MORTAR_1F_OUTSIDE, MAP_MOUNT_MORTAR_1F_OUTSIDE - warp_def $5, $3, 6, GROUP_MOUNT_MORTAR_1F_INSIDE, MAP_MOUNT_MORTAR_1F_INSIDE + warp_def $21, $11, 4, MOUNT_MORTAR_1F_OUTSIDE + warp_def $5, $3, 6, MOUNT_MORTAR_1F_INSIDE .XYTriggers: db 0 diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index e64b8566a..e376de303 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -132,8 +132,8 @@ MountMortarB1F_MapEventHeader: .Warps: db 2 - warp_def $3, $3, 5, GROUP_MOUNT_MORTAR_1F_INSIDE, MAP_MOUNT_MORTAR_1F_INSIDE - warp_def $1d, $13, 7, GROUP_MOUNT_MORTAR_1F_OUTSIDE, MAP_MOUNT_MORTAR_1F_OUTSIDE + warp_def $3, $3, 5, MOUNT_MORTAR_1F_INSIDE + warp_def $1d, $13, 7, MOUNT_MORTAR_1F_OUTSIDE .XYTriggers: db 0 diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index 693a42090..f15ece414 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -22,8 +22,8 @@ MoveDeletersHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 6, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY - warp_def $7, $3, 6, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY + warp_def $7, $2, 6, BLACKTHORN_CITY + warp_def $7, $3, 6, BLACKTHORN_CITY .XYTriggers: db 0 diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index ad6fd7526..178b793d4 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -78,8 +78,8 @@ MrFujisHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 2, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN - warp_def $7, $3, 2, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN + warp_def $7, $2, 2, LAVENDER_TOWN + warp_def $7, $3, 2, LAVENDER_TOWN .XYTriggers: db 0 diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 3a45cf125..faf770a09 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -34,7 +34,7 @@ UnknownScript_0x196e56: waitbutton itemnotify setevent EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON - blackoutmod GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY + blackoutmod CHERRYGROVE_CITY writetext UnknownText_0x196feb keeptextopen spriteface $2, RIGHT @@ -124,8 +124,8 @@ UnknownScript_0x196ec9: setevent EVENT_KRISS_HOUSE_1F_NEIGHBOR clearevent EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR dotrigger $1 - domaptrigger GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY, $1 - domaptrigger GROUP_ELMS_LAB, MAP_ELMS_LAB, $3 + domaptrigger CHERRYGROVE_CITY, $1 + domaptrigger ELMS_LAB, $3 specialphonecall ELMCALL_ROBBED clearevent EVENT_COP_IN_ELMS_LAB checkevent EVENT_GOT_TOTODILE_FROM_ELM @@ -376,8 +376,8 @@ MrPokemonsHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 2, GROUP_ROUTE_30, MAP_ROUTE_30 - warp_def $7, $3, 2, GROUP_ROUTE_30, MAP_ROUTE_30 + warp_def $7, $2, 2, ROUTE_30 + warp_def $7, $3, 2, ROUTE_30 .XYTriggers: db 0 diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 182d7f30c..9853a5faa 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -50,8 +50,8 @@ MrPsychicsHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 5, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - warp_def $7, $3, 5, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY + warp_def $7, $2, 5, SAFFRON_CITY + warp_def $7, $3, 5, SAFFRON_CITY .XYTriggers: db 0 diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index d352d5ec3..0ead74f48 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -504,10 +504,10 @@ NationalPark_MapEventHeader: .Warps: db 4 - warp_def $12, $21, 1, GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE - warp_def $13, $21, 2, GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE - warp_def $2f, $a, 1, GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE - warp_def $2f, $b, 2, GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE + warp_def $12, $21, 1, ROUTE_36_NATIONAL_PARK_GATE + warp_def $13, $21, 2, ROUTE_36_NATIONAL_PARK_GATE + warp_def $2f, $a, 1, ROUTE_35_NATIONAL_PARK_GATE + warp_def $2f, $b, 2, ROUTE_35_NATIONAL_PARK_GATE .XYTriggers: db 0 diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index fb31d0bbd..220f8faed 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -213,10 +213,10 @@ NationalParkBugContest_MapEventHeader: .Warps: db 4 - warp_def $12, $21, 1, GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE - warp_def $13, $21, 1, GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE - warp_def $2f, $a, 1, GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE - warp_def $2f, $b, 1, GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE + warp_def $12, $21, 1, ROUTE_36_NATIONAL_PARK_GATE + warp_def $13, $21, 1, ROUTE_36_NATIONAL_PARK_GATE + warp_def $2f, $a, 1, ROUTE_35_NATIONAL_PARK_GATE + warp_def $2f, $b, 1, ROUTE_35_NATIONAL_PARK_GATE .XYTriggers: db 0 diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 9513b4104..1bd3f13dd 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -286,10 +286,10 @@ NewBarkTown_MapEventHeader: .Warps: db 4 - warp_def $3, $6, 1, GROUP_ELMS_LAB, MAP_ELMS_LAB - warp_def $5, $d, 1, GROUP_KRISS_HOUSE_1F, MAP_KRISS_HOUSE_1F - warp_def $b, $3, 1, GROUP_KRISS_NEIGHBORS_HOUSE, MAP_KRISS_NEIGHBORS_HOUSE - warp_def $d, $b, 1, GROUP_ELMS_HOUSE, MAP_ELMS_HOUSE + warp_def $3, $6, 1, ELMS_LAB + warp_def $5, $d, 1, KRISS_HOUSE_1F + warp_def $b, $3, 1, KRISS_NEIGHBORS_HOUSE + warp_def $d, $b, 1, ELMS_HOUSE .XYTriggers: db 2 diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 7f78384a9..48dff35b4 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -256,8 +256,8 @@ OaksLab_MapEventHeader: .Warps: db 2 - warp_def $b, $4, 3, GROUP_PALLET_TOWN, MAP_PALLET_TOWN - warp_def $b, $5, 3, GROUP_PALLET_TOWN, MAP_PALLET_TOWN + warp_def $b, $4, 3, PALLET_TOWN + warp_def $b, $5, 3, PALLET_TOWN .XYTriggers: db 0 diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index 31bcb3a96..546628d29 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -79,8 +79,8 @@ OlivineCafe_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 7, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY - warp_def $7, $3, 7, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY + warp_def $7, $2, 7, OLIVINE_CITY + warp_def $7, $3, 7, OLIVINE_CITY .XYTriggers: db 0 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 5dc18c99f..5fe3817de 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -291,17 +291,17 @@ OlivineCity_MapEventHeader: .Warps: db 11 - warp_def $15, $d, 1, GROUP_OLIVINE_POKECENTER_1F, MAP_OLIVINE_POKECENTER_1F - warp_def $b, $a, 1, GROUP_OLIVINE_GYM, MAP_OLIVINE_GYM - warp_def $b, $19, 1, GROUP_OLIVINE_VOLTORB_HOUSE, MAP_OLIVINE_VOLTORB_HOUSE - warp_def $0, $0, 1, GROUP_OLIVINE_HOUSE_BETA, MAP_OLIVINE_HOUSE_BETA - warp_def $b, $1d, 1, GROUP_OLIVINE_PUNISHMENT_SPEECH_HOUSE, MAP_OLIVINE_PUNISHMENT_SPEECH_HOUSE - warp_def $f, $d, 1, GROUP_OLIVINE_GOOD_ROD_HOUSE, MAP_OLIVINE_GOOD_ROD_HOUSE - warp_def $15, $7, 1, GROUP_OLIVINE_CAFE, MAP_OLIVINE_CAFE - warp_def $11, $13, 2, GROUP_OLIVINE_MART, MAP_OLIVINE_MART - warp_def $1b, $1d, 1, GROUP_OLIVINE_LIGHTHOUSE_1F, MAP_OLIVINE_LIGHTHOUSE_1F - warp_def $1b, $13, 1, GROUP_OLIVINE_PORT_PASSAGE, MAP_OLIVINE_PORT_PASSAGE - warp_def $1b, $14, 2, GROUP_OLIVINE_PORT_PASSAGE, MAP_OLIVINE_PORT_PASSAGE + warp_def $15, $d, 1, OLIVINE_POKECENTER_1F + warp_def $b, $a, 1, OLIVINE_GYM + warp_def $b, $19, 1, OLIVINE_VOLTORB_HOUSE + warp_def $0, $0, 1, OLIVINE_HOUSE_BETA + warp_def $b, $1d, 1, OLIVINE_PUNISHMENT_SPEECH_HOUSE + warp_def $f, $d, 1, OLIVINE_GOOD_ROD_HOUSE + warp_def $15, $7, 1, OLIVINE_CAFE + warp_def $11, $13, 2, OLIVINE_MART + warp_def $1b, $1d, 1, OLIVINE_LIGHTHOUSE_1F + warp_def $1b, $13, 1, OLIVINE_PORT_PASSAGE + warp_def $1b, $14, 2, OLIVINE_PORT_PASSAGE .XYTriggers: db 2 diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 676c074fc..3e1f5f3cf 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -85,8 +85,8 @@ OlivineGoodRodHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 6, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY - warp_def $7, $3, 6, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY + warp_def $7, $2, 6, OLIVINE_CITY + warp_def $7, $3, 6, OLIVINE_CITY .XYTriggers: db 0 diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index b1195f8dd..d10a1ee35 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -199,8 +199,8 @@ OlivineGym_MapEventHeader: .Warps: db 2 - warp_def $f, $4, 2, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY - warp_def $f, $5, 2, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY + warp_def $f, $4, 2, OLIVINE_CITY + warp_def $f, $5, 2, OLIVINE_CITY .XYTriggers: db 0 diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index 9cfac68a2..bfa1a76d4 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -41,8 +41,8 @@ OlivineHouseBeta_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 4, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY - warp_def $7, $3, 4, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY + warp_def $7, $2, 4, OLIVINE_CITY + warp_def $7, $3, 4, OLIVINE_CITY .XYTriggers: db 0 diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index d63d7b039..a281e17ba 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -38,11 +38,11 @@ OlivineLighthouse1F_MapEventHeader: .Warps: db 5 - warp_def $11, $a, 9, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY - warp_def $11, $b, 9, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY - warp_def $b, $3, 1, GROUP_OLIVINE_LIGHTHOUSE_2F, MAP_OLIVINE_LIGHTHOUSE_2F - warp_def $d, $10, 3, GROUP_OLIVINE_LIGHTHOUSE_2F, MAP_OLIVINE_LIGHTHOUSE_2F - warp_def $d, $11, 4, GROUP_OLIVINE_LIGHTHOUSE_2F, MAP_OLIVINE_LIGHTHOUSE_2F + warp_def $11, $a, 9, OLIVINE_CITY + warp_def $11, $b, 9, OLIVINE_CITY + warp_def $b, $3, 1, OLIVINE_LIGHTHOUSE_2F + warp_def $d, $10, 3, OLIVINE_LIGHTHOUSE_2F + warp_def $d, $11, 4, OLIVINE_LIGHTHOUSE_2F .XYTriggers: db 0 diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 2fd90734b..f3a7669cc 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -206,12 +206,12 @@ OlivineLighthouse2F_MapEventHeader: .Warps: db 6 - warp_def $b, $3, 3, GROUP_OLIVINE_LIGHTHOUSE_1F, MAP_OLIVINE_LIGHTHOUSE_1F - warp_def $3, $5, 2, GROUP_OLIVINE_LIGHTHOUSE_3F, MAP_OLIVINE_LIGHTHOUSE_3F - warp_def $d, $10, 4, GROUP_OLIVINE_LIGHTHOUSE_1F, MAP_OLIVINE_LIGHTHOUSE_1F - warp_def $d, $11, 5, GROUP_OLIVINE_LIGHTHOUSE_1F, MAP_OLIVINE_LIGHTHOUSE_1F - warp_def $b, $10, 4, GROUP_OLIVINE_LIGHTHOUSE_3F, MAP_OLIVINE_LIGHTHOUSE_3F - warp_def $b, $11, 5, GROUP_OLIVINE_LIGHTHOUSE_3F, MAP_OLIVINE_LIGHTHOUSE_3F + warp_def $b, $3, 3, OLIVINE_LIGHTHOUSE_1F + warp_def $3, $5, 2, OLIVINE_LIGHTHOUSE_3F + warp_def $d, $10, 4, OLIVINE_LIGHTHOUSE_1F + warp_def $d, $11, 5, OLIVINE_LIGHTHOUSE_1F + warp_def $b, $10, 4, OLIVINE_LIGHTHOUSE_3F + warp_def $b, $11, 5, OLIVINE_LIGHTHOUSE_3F .XYTriggers: db 0 diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index e3603d91b..e5571e985 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -112,15 +112,15 @@ OlivineLighthouse3F_MapEventHeader: .Warps: db 9 - warp_def $3, $d, 1, GROUP_OLIVINE_LIGHTHOUSE_4F, MAP_OLIVINE_LIGHTHOUSE_4F - warp_def $3, $5, 2, GROUP_OLIVINE_LIGHTHOUSE_2F, MAP_OLIVINE_LIGHTHOUSE_2F - warp_def $5, $9, 4, GROUP_OLIVINE_LIGHTHOUSE_4F, MAP_OLIVINE_LIGHTHOUSE_4F - warp_def $b, $10, 5, GROUP_OLIVINE_LIGHTHOUSE_2F, MAP_OLIVINE_LIGHTHOUSE_2F - warp_def $b, $11, 6, GROUP_OLIVINE_LIGHTHOUSE_2F, MAP_OLIVINE_LIGHTHOUSE_2F - warp_def $9, $10, 5, GROUP_OLIVINE_LIGHTHOUSE_4F, MAP_OLIVINE_LIGHTHOUSE_4F - warp_def $9, $11, 6, GROUP_OLIVINE_LIGHTHOUSE_4F, MAP_OLIVINE_LIGHTHOUSE_4F - warp_def $3, $8, 7, GROUP_OLIVINE_LIGHTHOUSE_4F, MAP_OLIVINE_LIGHTHOUSE_4F - warp_def $3, $9, 8, GROUP_OLIVINE_LIGHTHOUSE_4F, MAP_OLIVINE_LIGHTHOUSE_4F + warp_def $3, $d, 1, OLIVINE_LIGHTHOUSE_4F + warp_def $3, $5, 2, OLIVINE_LIGHTHOUSE_2F + warp_def $5, $9, 4, OLIVINE_LIGHTHOUSE_4F + warp_def $b, $10, 5, OLIVINE_LIGHTHOUSE_2F + warp_def $b, $11, 6, OLIVINE_LIGHTHOUSE_2F + warp_def $9, $10, 5, OLIVINE_LIGHTHOUSE_4F + warp_def $9, $11, 6, OLIVINE_LIGHTHOUSE_4F + warp_def $3, $8, 7, OLIVINE_LIGHTHOUSE_4F + warp_def $3, $9, 8, OLIVINE_LIGHTHOUSE_4F .XYTriggers: db 0 diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index 4b62a34bd..c7136b2d1 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -83,16 +83,16 @@ OlivineLighthouse4F_MapEventHeader: .Warps: db 10 - warp_def $3, $d, 1, GROUP_OLIVINE_LIGHTHOUSE_3F, MAP_OLIVINE_LIGHTHOUSE_3F - warp_def $5, $3, 2, GROUP_OLIVINE_LIGHTHOUSE_5F, MAP_OLIVINE_LIGHTHOUSE_5F - warp_def $7, $9, 3, GROUP_OLIVINE_LIGHTHOUSE_5F, MAP_OLIVINE_LIGHTHOUSE_5F - warp_def $5, $9, 3, GROUP_OLIVINE_LIGHTHOUSE_3F, MAP_OLIVINE_LIGHTHOUSE_3F - warp_def $9, $10, 6, GROUP_OLIVINE_LIGHTHOUSE_3F, MAP_OLIVINE_LIGHTHOUSE_3F - warp_def $9, $11, 7, GROUP_OLIVINE_LIGHTHOUSE_3F, MAP_OLIVINE_LIGHTHOUSE_3F - warp_def $3, $8, 8, GROUP_OLIVINE_LIGHTHOUSE_3F, MAP_OLIVINE_LIGHTHOUSE_3F - warp_def $3, $9, 9, GROUP_OLIVINE_LIGHTHOUSE_3F, MAP_OLIVINE_LIGHTHOUSE_3F - warp_def $7, $10, 4, GROUP_OLIVINE_LIGHTHOUSE_5F, MAP_OLIVINE_LIGHTHOUSE_5F - warp_def $7, $11, 5, GROUP_OLIVINE_LIGHTHOUSE_5F, MAP_OLIVINE_LIGHTHOUSE_5F + warp_def $3, $d, 1, OLIVINE_LIGHTHOUSE_3F + warp_def $5, $3, 2, OLIVINE_LIGHTHOUSE_5F + warp_def $7, $9, 3, OLIVINE_LIGHTHOUSE_5F + warp_def $5, $9, 3, OLIVINE_LIGHTHOUSE_3F + warp_def $9, $10, 6, OLIVINE_LIGHTHOUSE_3F + warp_def $9, $11, 7, OLIVINE_LIGHTHOUSE_3F + warp_def $3, $8, 8, OLIVINE_LIGHTHOUSE_3F + warp_def $3, $9, 9, OLIVINE_LIGHTHOUSE_3F + warp_def $7, $10, 4, OLIVINE_LIGHTHOUSE_5F + warp_def $7, $11, 5, OLIVINE_LIGHTHOUSE_5F .XYTriggers: db 0 diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 7bc8285c5..0f3315d91 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -90,13 +90,13 @@ OlivineLighthouse5F_MapEventHeader: .Warps: db 7 - warp_def $f, $9, 1, GROUP_OLIVINE_LIGHTHOUSE_6F, MAP_OLIVINE_LIGHTHOUSE_6F - warp_def $5, $3, 2, GROUP_OLIVINE_LIGHTHOUSE_4F, MAP_OLIVINE_LIGHTHOUSE_4F - warp_def $7, $9, 3, GROUP_OLIVINE_LIGHTHOUSE_4F, MAP_OLIVINE_LIGHTHOUSE_4F - warp_def $7, $10, 9, GROUP_OLIVINE_LIGHTHOUSE_4F, MAP_OLIVINE_LIGHTHOUSE_4F - warp_def $7, $11, 10, GROUP_OLIVINE_LIGHTHOUSE_4F, MAP_OLIVINE_LIGHTHOUSE_4F - warp_def $5, $10, 2, GROUP_OLIVINE_LIGHTHOUSE_6F, MAP_OLIVINE_LIGHTHOUSE_6F - warp_def $5, $11, 3, GROUP_OLIVINE_LIGHTHOUSE_6F, MAP_OLIVINE_LIGHTHOUSE_6F + warp_def $f, $9, 1, OLIVINE_LIGHTHOUSE_6F + warp_def $5, $3, 2, OLIVINE_LIGHTHOUSE_4F + warp_def $7, $9, 3, OLIVINE_LIGHTHOUSE_4F + warp_def $7, $10, 9, OLIVINE_LIGHTHOUSE_4F + warp_def $7, $11, 10, OLIVINE_LIGHTHOUSE_4F + warp_def $5, $10, 2, OLIVINE_LIGHTHOUSE_6F + warp_def $5, $11, 3, OLIVINE_LIGHTHOUSE_6F .XYTriggers: db 0 diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index bdb351af7..78267e0b1 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -258,9 +258,9 @@ OlivineLighthouse6F_MapEventHeader: .Warps: db 3 - warp_def $f, $9, 1, GROUP_OLIVINE_LIGHTHOUSE_5F, MAP_OLIVINE_LIGHTHOUSE_5F - warp_def $5, $10, 6, GROUP_OLIVINE_LIGHTHOUSE_5F, MAP_OLIVINE_LIGHTHOUSE_5F - warp_def $5, $11, 7, GROUP_OLIVINE_LIGHTHOUSE_5F, MAP_OLIVINE_LIGHTHOUSE_5F + warp_def $f, $9, 1, OLIVINE_LIGHTHOUSE_5F + warp_def $5, $10, 6, OLIVINE_LIGHTHOUSE_5F + warp_def $5, $11, 7, OLIVINE_LIGHTHOUSE_5F .XYTriggers: db 0 diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index f8910aceb..e2a613cc8 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -46,8 +46,8 @@ OlivineMart_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 8, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY - warp_def $7, $3, 8, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY + warp_def $7, $2, 8, OLIVINE_CITY + warp_def $7, $3, 8, OLIVINE_CITY .XYTriggers: db 0 diff --git a/maps/OlivinePokeCenter1F.asm b/maps/OlivinePokeCenter1F.asm index 8c45a40c8..206f60ed5 100644 --- a/maps/OlivinePokeCenter1F.asm +++ b/maps/OlivinePokeCenter1F.asm @@ -47,9 +47,9 @@ OlivinePokeCenter1F_MapEventHeader: .Warps: db 3 - warp_def $7, $3, 1, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY - warp_def $7, $4, 1, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY - warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F + warp_def $7, $3, 1, OLIVINE_CITY + warp_def $7, $4, 1, OLIVINE_CITY + warp_def $7, $0, 1, POKECENTER_2F .XYTriggers: db 0 diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index e68aa1edd..0c78fdf89 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -21,7 +21,7 @@ UnknownScript_0x748b1: appear $2 dotrigger $0 setevent EVENT_GAVE_KURT_APRICORNS - blackoutmod GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY + blackoutmod OLIVINE_CITY end SailorScript_0x748c0: @@ -57,8 +57,8 @@ SailorScript_0x748c0: UnknownScript_0x7490a: clearevent EVENT_FAST_SHIP_DESTINATION_OLIVINE appear $2 - domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $1 - warp GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $19, $1 + domaptrigger FAST_SHIP_1F, $1 + warp FAST_SHIP_1F, $19, $1 end UnknownScript_0x74919: @@ -384,8 +384,8 @@ OlivinePort_MapEventHeader: .Warps: db 2 - warp_def $7, $b, 5, GROUP_OLIVINE_PORT_PASSAGE, MAP_OLIVINE_PORT_PASSAGE - warp_def $17, $7, 1, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F + warp_def $7, $b, 5, OLIVINE_PORT_PASSAGE + warp_def $17, $7, 1, FAST_SHIP_1F .XYTriggers: db 1 diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index 22a0a322f..019cc2341 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -22,11 +22,11 @@ OlivinePortPassage_MapEventHeader: .Warps: db 5 - warp_def $0, $f, 10, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY - warp_def $0, $10, 11, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY - warp_def $4, $f, 4, GROUP_OLIVINE_PORT_PASSAGE, MAP_OLIVINE_PORT_PASSAGE - warp_def $2, $3, 3, GROUP_OLIVINE_PORT_PASSAGE, MAP_OLIVINE_PORT_PASSAGE - warp_def $e, $3, 1, GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT + warp_def $0, $f, 10, OLIVINE_CITY + warp_def $0, $10, 11, OLIVINE_CITY + warp_def $4, $f, 4, OLIVINE_PORT_PASSAGE + warp_def $2, $3, 3, OLIVINE_PORT_PASSAGE + warp_def $e, $3, 1, OLIVINE_PORT .XYTriggers: db 0 diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index 9d9c784e1..fd7a2c5eb 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -41,8 +41,8 @@ OlivinePunishmentSpeechHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 5, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY - warp_def $7, $3, 5, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY + warp_def $7, $2, 5, OLIVINE_CITY + warp_def $7, $3, 5, OLIVINE_CITY .XYTriggers: db 0 diff --git a/maps/OlivineVoltorbHouse.asm b/maps/OlivineVoltorbHouse.asm index 4fc047470..cf281cbc6 100644 --- a/maps/OlivineVoltorbHouse.asm +++ b/maps/OlivineVoltorbHouse.asm @@ -22,8 +22,8 @@ OlivineVoltorbHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 3, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY - warp_def $7, $3, 3, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY + warp_def $7, $2, 3, OLIVINE_CITY + warp_def $7, $3, 3, OLIVINE_CITY .XYTriggers: db 0 diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index c6a64db89..1b7aaa81a 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -73,9 +73,9 @@ PalletTown_MapEventHeader: .Warps: db 3 - warp_def $5, $5, 1, GROUP_REDS_HOUSE_1F, MAP_REDS_HOUSE_1F - warp_def $5, $d, 1, GROUP_BLUES_HOUSE, MAP_BLUES_HOUSE - warp_def $b, $c, 1, GROUP_OAKS_LAB, MAP_OAKS_LAB + warp_def $5, $5, 1, REDS_HOUSE_1F + warp_def $5, $d, 1, BLUES_HOUSE + warp_def $b, $c, 1, OAKS_LAB .XYTriggers: db 0 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 3537949a5..01d59a728 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -153,11 +153,11 @@ PewterCity_MapEventHeader: .Warps: db 5 - warp_def $d, $1d, 1, GROUP_PEWTER_NIDORAN_SPEECH_HOUSE, MAP_PEWTER_NIDORAN_SPEECH_HOUSE - warp_def $11, $10, 1, GROUP_PEWTER_GYM, MAP_PEWTER_GYM - warp_def $11, $17, 2, GROUP_PEWTER_MART, MAP_PEWTER_MART - warp_def $19, $d, 1, GROUP_PEWTER_POKECENTER_1F, MAP_PEWTER_POKECENTER_1F - warp_def $1d, $7, 1, GROUP_PEWTER_SNOOZE_SPEECH_HOUSE, MAP_PEWTER_SNOOZE_SPEECH_HOUSE + warp_def $d, $1d, 1, PEWTER_NIDORAN_SPEECH_HOUSE + warp_def $11, $10, 1, PEWTER_GYM + warp_def $11, $17, 2, PEWTER_MART + warp_def $19, $d, 1, PEWTER_POKECENTER_1F + warp_def $1d, $7, 1, PEWTER_SNOOZE_SPEECH_HOUSE .XYTriggers: db 0 diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 7737c0a64..fb8293caa 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -209,8 +209,8 @@ PewterGym_MapEventHeader: .Warps: db 2 - warp_def $d, $4, 2, GROUP_PEWTER_CITY, MAP_PEWTER_CITY - warp_def $d, $5, 2, GROUP_PEWTER_CITY, MAP_PEWTER_CITY + warp_def $d, $4, 2, PEWTER_CITY + warp_def $d, $5, 2, PEWTER_CITY .XYTriggers: db 0 diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index b5f172010..88ed6b12f 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -46,8 +46,8 @@ PewterMart_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 3, GROUP_PEWTER_CITY, MAP_PEWTER_CITY - warp_def $7, $3, 3, GROUP_PEWTER_CITY, MAP_PEWTER_CITY + warp_def $7, $2, 3, PEWTER_CITY + warp_def $7, $3, 3, PEWTER_CITY .XYTriggers: db 0 diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index a81ded4fa..3390bae68 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -30,8 +30,8 @@ PewterNidoranSpeechHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 1, GROUP_PEWTER_CITY, MAP_PEWTER_CITY - warp_def $7, $3, 1, GROUP_PEWTER_CITY, MAP_PEWTER_CITY + warp_def $7, $2, 1, PEWTER_CITY + warp_def $7, $3, 1, PEWTER_CITY .XYTriggers: db 0 diff --git a/maps/PewterPokeCEnter2FBeta.asm b/maps/PewterPokeCEnter2FBeta.asm index 5756d3d8d..74bd290ff 100644 --- a/maps/PewterPokeCEnter2FBeta.asm +++ b/maps/PewterPokeCEnter2FBeta.asm @@ -11,7 +11,7 @@ PewterPokeCEnter2FBeta_MapEventHeader: .Warps: db 1 - warp_def $7, $0, 3, GROUP_PEWTER_POKECENTER_1F, MAP_PEWTER_POKECENTER_1F + warp_def $7, $0, 3, PEWTER_POKECENTER_1F .XYTriggers: db 0 diff --git a/maps/PewterPokeCenter1F.asm b/maps/PewterPokeCenter1F.asm index b55fd7c44..0abf7d9e6 100644 --- a/maps/PewterPokeCenter1F.asm +++ b/maps/PewterPokeCenter1F.asm @@ -66,9 +66,9 @@ PewterPokeCenter1F_MapEventHeader: .Warps: db 3 - warp_def $7, $3, 4, GROUP_PEWTER_CITY, MAP_PEWTER_CITY - warp_def $7, $4, 4, GROUP_PEWTER_CITY, MAP_PEWTER_CITY - warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F + warp_def $7, $3, 4, PEWTER_CITY + warp_def $7, $4, 4, PEWTER_CITY + warp_def $7, $0, 1, POKECENTER_2F .XYTriggers: db 0 diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index 72821d4b6..7d626414d 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -23,8 +23,8 @@ PewterSnoozeSpeechHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 5, GROUP_PEWTER_CITY, MAP_PEWTER_CITY - warp_def $7, $3, 5, GROUP_PEWTER_CITY, MAP_PEWTER_CITY + warp_def $7, $2, 5, PEWTER_CITY + warp_def $7, $3, 5, PEWTER_CITY .XYTriggers: db 0 diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index ed4636921..c1074fd3b 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -373,14 +373,14 @@ Script_LeftCableTradeCenter: special Special_AbortLink scall Script_CleanUpFemaleFlagAfterTrade dotrigger $0 - domaptrigger GROUP_TRADE_CENTER, MAP_TRADE_CENTER, $0 + domaptrigger TRADE_CENTER, $0 end Script_LeftMobileTradeRoom: special Function101220 scall Script_WalkOutOfMobileTradeRoom dotrigger $0 - domaptrigger GROUP_MOBILE_TRADE_ROOM_MOBILE, MAP_MOBILE_TRADE_ROOM_MOBILE, $0 + domaptrigger MOBILE_TRADE_ROOM_MOBILE, $0 end Script_WalkOutOfMobileTradeRoom: @@ -393,14 +393,14 @@ Script_LeftCableColosseum: special Special_AbortLink scall Script_CleanUpFemaleFlagAfterBattle dotrigger $0 - domaptrigger GROUP_COLOSSEUM, MAP_COLOSSEUM, $0 + domaptrigger COLOSSEUM, $0 end Script_LeftMobileBattleRoom: special Function101220 scall Script_WalkOutOfMobileBattleRoom dotrigger $0 - domaptrigger GROUP_MOBILE_BATTLE_ROOM, MAP_MOBILE_BATTLE_ROOM, $0 + domaptrigger MOBILE_BATTLE_ROOM, $0 end Script_WalkOutOfMobileBattleRoom: @@ -576,7 +576,7 @@ Script_LeftTimeCapsule: applymovement $4, MovementData_0x192d01 .Done: dotrigger $0 - domaptrigger GROUP_TIME_CAPSULE, MAP_TIME_CAPSULE, $0 + domaptrigger TIME_CAPSULE, $0 end MapPokeCenter2FSignpost0Script: @@ -1024,12 +1024,12 @@ PokeCenter2F_MapEventHeader: .Warps: db 6 - warp_def $7, $0, -1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - warp_def $0, $5, 1, GROUP_TRADE_CENTER, MAP_TRADE_CENTER - warp_def $0, $9, 1, GROUP_COLOSSEUM, MAP_COLOSSEUM - warp_def $2, $d, 1, GROUP_TIME_CAPSULE, MAP_TIME_CAPSULE - warp_def $0, $6, 1, GROUP_MOBILE_TRADE_ROOM_MOBILE, MAP_MOBILE_TRADE_ROOM_MOBILE - warp_def $0, $a, 1, GROUP_MOBILE_BATTLE_ROOM, MAP_MOBILE_BATTLE_ROOM + warp_def $7, $0, -1, POKECENTER_2F + warp_def $0, $5, 1, TRADE_CENTER + warp_def $0, $9, 1, COLOSSEUM + warp_def $2, $d, 1, TIME_CAPSULE + warp_def $0, $6, 1, MOBILE_TRADE_ROOM_MOBILE + warp_def $0, $a, 1, MOBILE_BATTLE_ROOM .XYTriggers: db 0 diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index 0d4a288a0..f5df21404 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -19,8 +19,8 @@ PokeSeersHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 7, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY - warp_def $7, $3, 7, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY + warp_def $7, $2, 7, CIANWOOD_CITY + warp_def $7, $3, 7, CIANWOOD_CITY .XYTriggers: db 0 diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index c88c6bdc0..7b5f42a6c 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -294,8 +294,8 @@ PokemonFanClub_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 3, GROUP_VERMILION_CITY, MAP_VERMILION_CITY - warp_def $7, $3, 3, GROUP_VERMILION_CITY, MAP_VERMILION_CITY + warp_def $7, $2, 3, VERMILION_CITY + warp_def $7, $3, 3, VERMILION_CITY .XYTriggers: db 0 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index ee45ddcf1..c23440f26 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -141,7 +141,7 @@ PowerPlantManager: setevent EVENT_MET_MANAGER_AT_POWER_PLANT clearevent EVENT_CERULEAN_GYM_ROCKET clearevent EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM - domaptrigger GROUP_CERULEAN_GYM, MAP_CERULEAN_GYM, $1 + domaptrigger CERULEAN_GYM, $1 dotrigger $1 end @@ -387,8 +387,8 @@ PowerPlant_MapEventHeader: .Warps: db 2 - warp_def $11, $2, 2, GROUP_ROUTE_10_NORTH, MAP_ROUTE_10_NORTH - warp_def $11, $3, 2, GROUP_ROUTE_10_NORTH, MAP_ROUTE_10_NORTH + warp_def $11, $2, 2, ROUTE_10_NORTH + warp_def $11, $3, 2, ROUTE_10_NORTH .XYTriggers: db 1 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 27e9e8391..c25aae10f 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -470,9 +470,9 @@ RadioTower1F_MapEventHeader: .Warps: db 3 - warp_def $7, $2, 11, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - warp_def $7, $3, 11, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - warp_def $0, $f, 2, GROUP_RADIO_TOWER_2F, MAP_RADIO_TOWER_2F + warp_def $7, $2, 11, GOLDENROD_CITY + warp_def $7, $3, 11, GOLDENROD_CITY + warp_def $0, $f, 2, RADIO_TOWER_2F .XYTriggers: db 0 diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index e5ec9dfee..a04e92576 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -703,8 +703,8 @@ RadioTower2F_MapEventHeader: .Warps: db 2 - warp_def $0, $0, 1, GROUP_RADIO_TOWER_3F, MAP_RADIO_TOWER_3F - warp_def $0, $f, 3, GROUP_RADIO_TOWER_1F, MAP_RADIO_TOWER_1F + warp_def $0, $0, 1, RADIO_TOWER_3F + warp_def $0, $f, 3, RADIO_TOWER_1F .XYTriggers: db 0 diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 17abebca7..d31e8262d 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -328,9 +328,9 @@ RadioTower3F_MapEventHeader: .Warps: db 3 - warp_def $0, $0, 1, GROUP_RADIO_TOWER_2F, MAP_RADIO_TOWER_2F - warp_def $0, $7, 2, GROUP_RADIO_TOWER_4F, MAP_RADIO_TOWER_4F - warp_def $0, $11, 4, GROUP_RADIO_TOWER_4F, MAP_RADIO_TOWER_4F + warp_def $0, $0, 1, RADIO_TOWER_2F + warp_def $0, $7, 2, RADIO_TOWER_4F + warp_def $0, $11, 4, RADIO_TOWER_4F .XYTriggers: db 0 diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 4981214bf..e36589060 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -242,10 +242,10 @@ RadioTower4F_MapEventHeader: .Warps: db 4 - warp_def $0, $0, 1, GROUP_RADIO_TOWER_5F, MAP_RADIO_TOWER_5F - warp_def $0, $9, 2, GROUP_RADIO_TOWER_3F, MAP_RADIO_TOWER_3F - warp_def $0, $c, 2, GROUP_RADIO_TOWER_5F, MAP_RADIO_TOWER_5F - warp_def $0, $11, 3, GROUP_RADIO_TOWER_3F, MAP_RADIO_TOWER_3F + warp_def $0, $0, 1, RADIO_TOWER_5F + warp_def $0, $9, 2, RADIO_TOWER_3F + warp_def $0, $c, 2, RADIO_TOWER_5F + warp_def $0, $11, 3, RADIO_TOWER_3F .XYTriggers: db 0 diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index b435e6a80..3ee5aaacf 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -122,7 +122,7 @@ UnknownScript_0x6006e: closetext loadmovesprites dotrigger $2 - domaptrigger GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE, $0 + domaptrigger ECRUTEAK_HOUSE, $0 setevent EVENT_GOT_CLEAR_BELL setevent EVENT_TEAM_ROCKET_DISBANDED jump UnknownScript_0x600f1 @@ -421,8 +421,8 @@ RadioTower5F_MapEventHeader: .Warps: db 2 - warp_def $0, $0, 1, GROUP_RADIO_TOWER_4F, MAP_RADIO_TOWER_4F - warp_def $0, $c, 3, GROUP_RADIO_TOWER_4F, MAP_RADIO_TOWER_4F + warp_def $0, $0, 1, RADIO_TOWER_4F + warp_def $0, $c, 3, RADIO_TOWER_4F .XYTriggers: db 2 diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index 3de913163..0860f7ba2 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -79,9 +79,9 @@ RedsHouse1F_MapEventHeader: .Warps: db 3 - warp_def $7, $2, 1, GROUP_PALLET_TOWN, MAP_PALLET_TOWN - warp_def $7, $3, 1, GROUP_PALLET_TOWN, MAP_PALLET_TOWN - warp_def $0, $7, 1, GROUP_REDS_HOUSE_2F, MAP_REDS_HOUSE_2F + warp_def $7, $2, 1, PALLET_TOWN + warp_def $7, $3, 1, PALLET_TOWN + warp_def $0, $7, 1, REDS_HOUSE_2F .XYTriggers: db 0 diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm index 895288e0a..5704cdcaf 100644 --- a/maps/RedsHouse2F.asm +++ b/maps/RedsHouse2F.asm @@ -31,7 +31,7 @@ RedsHouse2F_MapEventHeader: .Warps: db 1 - warp_def $0, $7, 3, GROUP_REDS_HOUSE_1F, MAP_REDS_HOUSE_1F + warp_def $0, $7, 3, REDS_HOUSE_1F .XYTriggers: db 0 diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index 3eeeb7a18..9f7102ff3 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -25,12 +25,12 @@ RockTunnel1F_MapEventHeader: .Warps: db 6 - warp_def $3, $f, 1, GROUP_ROUTE_9, MAP_ROUTE_9 - warp_def $19, $b, 1, GROUP_ROUTE_10_SOUTH, MAP_ROUTE_10_SOUTH - warp_def $3, $5, 3, GROUP_ROCK_TUNNEL_B1F, MAP_ROCK_TUNNEL_B1F - warp_def $9, $f, 2, GROUP_ROCK_TUNNEL_B1F, MAP_ROCK_TUNNEL_B1F - warp_def $3, $1b, 4, GROUP_ROCK_TUNNEL_B1F, MAP_ROCK_TUNNEL_B1F - warp_def $d, $1b, 1, GROUP_ROCK_TUNNEL_B1F, MAP_ROCK_TUNNEL_B1F + warp_def $3, $f, 1, ROUTE_9 + warp_def $19, $b, 1, ROUTE_10_SOUTH + warp_def $3, $5, 3, ROCK_TUNNEL_B1F + warp_def $9, $f, 2, ROCK_TUNNEL_B1F + warp_def $3, $1b, 4, ROCK_TUNNEL_B1F + warp_def $d, $1b, 1, ROCK_TUNNEL_B1F .XYTriggers: db 0 diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index 74b1aac1a..571574dd2 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -24,10 +24,10 @@ RockTunnelB1F_MapEventHeader: .Warps: db 4 - warp_def $3, $3, 6, GROUP_ROCK_TUNNEL_1F, MAP_ROCK_TUNNEL_1F - warp_def $9, $11, 4, GROUP_ROCK_TUNNEL_1F, MAP_ROCK_TUNNEL_1F - warp_def $3, $17, 3, GROUP_ROCK_TUNNEL_1F, MAP_ROCK_TUNNEL_1F - warp_def $17, $19, 5, GROUP_ROCK_TUNNEL_1F, MAP_ROCK_TUNNEL_1F + warp_def $3, $3, 6, ROCK_TUNNEL_1F + warp_def $9, $11, 4, ROCK_TUNNEL_1F + warp_def $3, $17, 3, ROCK_TUNNEL_1F + warp_def $17, $19, 5, ROCK_TUNNEL_1F .XYTriggers: db 0 diff --git a/maps/Route10North.asm b/maps/Route10North.asm index a8a1eb85a..29b345fed 100644 --- a/maps/Route10North.asm +++ b/maps/Route10North.asm @@ -21,8 +21,8 @@ Route10North_MapEventHeader: .Warps: db 2 - warp_def $1, $b, 1, GROUP_ROUTE_10_POKECENTER_1F, MAP_ROUTE_10_POKECENTER_1F - warp_def $9, $3, 1, GROUP_POWER_PLANT, MAP_POWER_PLANT + warp_def $1, $b, 1, ROUTE_10_POKECENTER_1F + warp_def $9, $3, 1, POWER_PLANT .XYTriggers: db 0 diff --git a/maps/Route10PokeCenter1F.asm b/maps/Route10PokeCenter1F.asm index 20a17a426..76940de76 100644 --- a/maps/Route10PokeCenter1F.asm +++ b/maps/Route10PokeCenter1F.asm @@ -80,9 +80,9 @@ Route10PokeCenter1F_MapEventHeader: .Warps: db 3 - warp_def $7, $3, 1, GROUP_ROUTE_10_NORTH, MAP_ROUTE_10_NORTH - warp_def $7, $4, 1, GROUP_ROUTE_10_NORTH, MAP_ROUTE_10_NORTH - warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F + warp_def $7, $3, 1, ROUTE_10_NORTH + warp_def $7, $4, 1, ROUTE_10_NORTH + warp_def $7, $0, 1, POKECENTER_2F .XYTriggers: db 0 diff --git a/maps/Route10PokeCenter2FBeta.asm b/maps/Route10PokeCenter2FBeta.asm index 92257396a..a4a4aed6f 100644 --- a/maps/Route10PokeCenter2FBeta.asm +++ b/maps/Route10PokeCenter2FBeta.asm @@ -11,7 +11,7 @@ Route10PokeCenter2FBeta_MapEventHeader: .Warps: db 1 - warp_def $7, $0, 3, GROUP_ROUTE_10_POKECENTER_1F, MAP_ROUTE_10_POKECENTER_1F + warp_def $7, $0, 3, ROUTE_10_POKECENTER_1F .XYTriggers: db 0 diff --git a/maps/Route10South.asm b/maps/Route10South.asm index 764a8b715..9003585e4 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -77,7 +77,7 @@ Route10South_MapEventHeader: .Warps: db 1 - warp_def $1, $6, 2, GROUP_ROCK_TUNNEL_1F, MAP_ROCK_TUNNEL_1F + warp_def $1, $6, 2, ROCK_TUNNEL_1F .XYTriggers: db 0 diff --git a/maps/Route12.asm b/maps/Route12.asm index 8a481791c..d62f7c1b6 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -165,7 +165,7 @@ Route12_MapEventHeader: .Warps: db 1 - warp_def $21, $b, 1, GROUP_ROUTE_12_SUPER_ROD_HOUSE, MAP_ROUTE_12_SUPER_ROD_HOUSE + warp_def $21, $b, 1, ROUTE_12_SUPER_ROD_HOUSE .XYTriggers: db 0 diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index 2b84b5b46..663f9f292 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -82,8 +82,8 @@ Route12SuperRodHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 1, GROUP_ROUTE_12, MAP_ROUTE_12 - warp_def $7, $3, 1, GROUP_ROUTE_12, MAP_ROUTE_12 + warp_def $7, $2, 1, ROUTE_12 + warp_def $7, $3, 1, ROUTE_12 .XYTriggers: db 0 diff --git a/maps/Route15.asm b/maps/Route15.asm index b9d37bb28..f7307549c 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -198,8 +198,8 @@ Route15_MapEventHeader: .Warps: db 2 - warp_def $4, $2, 3, GROUP_ROUTE_15_FUCHSIA_GATE, MAP_ROUTE_15_FUCHSIA_GATE - warp_def $5, $2, 4, GROUP_ROUTE_15_FUCHSIA_GATE, MAP_ROUTE_15_FUCHSIA_GATE + warp_def $4, $2, 3, ROUTE_15_FUCHSIA_GATE + warp_def $5, $2, 4, ROUTE_15_FUCHSIA_GATE .XYTriggers: db 0 diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index a5ff662fb..0c11dd45e 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -22,10 +22,10 @@ Route15FuchsiaGate_MapEventHeader: .Warps: db 4 - warp_def $4, $0, 8, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY - warp_def $5, $0, 9, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY - warp_def $4, $9, 1, GROUP_ROUTE_15, MAP_ROUTE_15 - warp_def $5, $9, 2, GROUP_ROUTE_15, MAP_ROUTE_15 + warp_def $4, $0, 8, FUCHSIA_CITY + warp_def $5, $0, 9, FUCHSIA_CITY + warp_def $4, $9, 1, ROUTE_15 + warp_def $5, $9, 2, ROUTE_15 .XYTriggers: db 0 diff --git a/maps/Route16.asm b/maps/Route16.asm index 1f8306bc9..21a4a5962 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -37,11 +37,11 @@ Route16_MapEventHeader: .Warps: db 5 - warp_def $1, $3, 1, GROUP_ROUTE_16_FUCHSIA_SPEECH_HOUSE, MAP_ROUTE_16_FUCHSIA_SPEECH_HOUSE - warp_def $6, $e, 3, GROUP_ROUTE_16_GATE, MAP_ROUTE_16_GATE - warp_def $7, $e, 4, GROUP_ROUTE_16_GATE, MAP_ROUTE_16_GATE - warp_def $6, $9, 1, GROUP_ROUTE_16_GATE, MAP_ROUTE_16_GATE - warp_def $7, $9, 2, GROUP_ROUTE_16_GATE, MAP_ROUTE_16_GATE + warp_def $1, $3, 1, ROUTE_16_FUCHSIA_SPEECH_HOUSE + warp_def $6, $e, 3, ROUTE_16_GATE + warp_def $7, $e, 4, ROUTE_16_GATE + warp_def $6, $9, 1, ROUTE_16_GATE + warp_def $7, $9, 2, ROUTE_16_GATE .XYTriggers: db 0 diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index 7fcfdc58b..71d0c8ef1 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -25,8 +25,8 @@ Route16FuchsiaSpeechHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 1, GROUP_ROUTE_16, MAP_ROUTE_16 - warp_def $7, $3, 1, GROUP_ROUTE_16, MAP_ROUTE_16 + warp_def $7, $2, 1, ROUTE_16 + warp_def $7, $3, 1, ROUTE_16 .XYTriggers: db 0 diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index ba38719db..f9dd0a41a 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -65,10 +65,10 @@ Route16Gate_MapEventHeader: .Warps: db 4 - warp_def $4, $0, 4, GROUP_ROUTE_16, MAP_ROUTE_16 - warp_def $5, $0, 5, GROUP_ROUTE_16, MAP_ROUTE_16 - warp_def $4, $9, 2, GROUP_ROUTE_16, MAP_ROUTE_16 - warp_def $5, $9, 3, GROUP_ROUTE_16, MAP_ROUTE_16 + warp_def $4, $0, 4, ROUTE_16 + warp_def $5, $0, 5, ROUTE_16 + warp_def $4, $9, 2, ROUTE_16 + warp_def $5, $9, 3, ROUTE_16 .XYTriggers: db 2 diff --git a/maps/Route17.asm b/maps/Route17.asm index b9d7747e0..9949916c3 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -137,8 +137,8 @@ Route17_MapEventHeader: .Warps: db 2 - warp_def $52, $11, 1, GROUP_ROUTE_17_18_GATE, MAP_ROUTE_17_18_GATE - warp_def $53, $11, 2, GROUP_ROUTE_17_18_GATE, MAP_ROUTE_17_18_GATE + warp_def $52, $11, 1, ROUTE_17_18_GATE + warp_def $53, $11, 2, ROUTE_17_18_GATE .XYTriggers: db 0 diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm index a44a09dc3..2964f97d0 100644 --- a/maps/Route1718Gate.asm +++ b/maps/Route1718Gate.asm @@ -56,10 +56,10 @@ Route1718Gate_MapEventHeader: .Warps: db 4 - warp_def $4, $0, 1, GROUP_ROUTE_17, MAP_ROUTE_17 - warp_def $5, $0, 2, GROUP_ROUTE_17, MAP_ROUTE_17 - warp_def $4, $9, 1, GROUP_ROUTE_18, MAP_ROUTE_18 - warp_def $5, $9, 2, GROUP_ROUTE_18, MAP_ROUTE_18 + warp_def $4, $0, 1, ROUTE_17 + warp_def $5, $0, 2, ROUTE_17 + warp_def $4, $9, 1, ROUTE_18 + warp_def $5, $9, 2, ROUTE_18 .XYTriggers: db 2 diff --git a/maps/Route18.asm b/maps/Route18.asm index fb3eea1e7..6a7759c46 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -79,8 +79,8 @@ Route18_MapEventHeader: .Warps: db 2 - warp_def $6, $2, 3, GROUP_ROUTE_17_18_GATE, MAP_ROUTE_17_18_GATE - warp_def $7, $2, 4, GROUP_ROUTE_17_18_GATE, MAP_ROUTE_17_18_GATE + warp_def $6, $2, 3, ROUTE_17_18_GATE + warp_def $7, $2, 4, ROUTE_17_18_GATE .XYTriggers: db 0 diff --git a/maps/Route19.asm b/maps/Route19.asm index 0ec9be135..24b79d8b9 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -235,7 +235,7 @@ Route19_MapEventHeader: .Warps: db 1 - warp_def $3, $7, 3, GROUP_ROUTE_19___FUCHSIA_GATE, MAP_ROUTE_19___FUCHSIA_GATE + warp_def $3, $7, 3, ROUTE_19___FUCHSIA_GATE .XYTriggers: db 0 diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index 83559633e..5be75e24d 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -48,10 +48,10 @@ Route19FuchsiaGate_MapEventHeader: .Warps: db 4 - warp_def $0, $4, 10, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY - warp_def $0, $5, 11, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY - warp_def $7, $4, 1, GROUP_ROUTE_19, MAP_ROUTE_19 - warp_def $7, $5, 1, GROUP_ROUTE_19, MAP_ROUTE_19 + warp_def $0, $4, 10, FUCHSIA_CITY + warp_def $0, $5, 11, FUCHSIA_CITY + warp_def $7, $4, 1, ROUTE_19 + warp_def $7, $5, 1, ROUTE_19 .XYTriggers: db 0 diff --git a/maps/Route2.asm b/maps/Route2.asm index 2fb81e3f8..cc9a220e4 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -142,11 +142,11 @@ Route2_MapEventHeader: .Warps: db 5 - warp_def $f, $f, 1, GROUP_ROUTE_2_NUGGET_SPEECH_HOUSE, MAP_ROUTE_2_NUGGET_SPEECH_HOUSE - warp_def $1f, $f, 3, GROUP_ROUTE_2_GATE, MAP_ROUTE_2_GATE - warp_def $1b, $10, 1, GROUP_ROUTE_2_GATE, MAP_ROUTE_2_GATE - warp_def $1b, $11, 2, GROUP_ROUTE_2_GATE, MAP_ROUTE_2_GATE - warp_def $7, $c, 3, GROUP_DIGLETTS_CAVE, MAP_DIGLETTS_CAVE + warp_def $f, $f, 1, ROUTE_2_NUGGET_SPEECH_HOUSE + warp_def $1f, $f, 3, ROUTE_2_GATE + warp_def $1b, $10, 1, ROUTE_2_GATE + warp_def $1b, $11, 2, ROUTE_2_GATE + warp_def $7, $c, 3, DIGLETTS_CAVE .XYTriggers: db 0 diff --git a/maps/Route20.asm b/maps/Route20.asm index 4f90a042f..84a9727f6 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -116,7 +116,7 @@ Route20_MapEventHeader: .Warps: db 1 - warp_def $7, $26, 1, GROUP_SEAFOAM_GYM, MAP_SEAFOAM_GYM + warp_def $7, $26, 1, SEAFOAM_GYM .XYTriggers: db 0 diff --git a/maps/Route22.asm b/maps/Route22.asm index 60d82f4f0..875651460 100644 --- a/maps/Route22.asm +++ b/maps/Route22.asm @@ -21,7 +21,7 @@ Route22_MapEventHeader: .Warps: db 1 - warp_def $5, $d, 1, GROUP_VICTORY_ROAD_GATE, MAP_VICTORY_ROAD_GATE + warp_def $5, $d, 1, VICTORY_ROAD_GATE .XYTriggers: db 0 diff --git a/maps/Route23.asm b/maps/Route23.asm index 900b8186e..29f3c0ba6 100644 --- a/maps/Route23.asm +++ b/maps/Route23.asm @@ -30,10 +30,10 @@ Route23_MapEventHeader: .Warps: db 4 - warp_def $5, $9, 1, GROUP_INDIGO_PLATEAU_POKECENTER_1F, MAP_INDIGO_PLATEAU_POKECENTER_1F - warp_def $5, $a, 2, GROUP_INDIGO_PLATEAU_POKECENTER_1F, MAP_INDIGO_PLATEAU_POKECENTER_1F - warp_def $d, $9, 10, GROUP_VICTORY_ROAD, MAP_VICTORY_ROAD - warp_def $d, $a, 10, GROUP_VICTORY_ROAD, MAP_VICTORY_ROAD + warp_def $5, $9, 1, INDIGO_PLATEAU_POKECENTER_1F + warp_def $5, $a, 2, INDIGO_PLATEAU_POKECENTER_1F + warp_def $d, $9, 10, VICTORY_ROAD + warp_def $d, $a, 10, VICTORY_ROAD .XYTriggers: db 0 diff --git a/maps/Route25.asm b/maps/Route25.asm index 0a1803b0a..16b220f68 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -425,7 +425,7 @@ Route25_MapEventHeader: .Warps: db 1 - warp_def $5, $2f, 1, GROUP_BILLS_HOUSE, MAP_BILLS_HOUSE + warp_def $5, $2f, 1, BILLS_HOUSE .XYTriggers: db 2 diff --git a/maps/Route26.asm b/maps/Route26.asm index b6f5ebab6..975ee2697 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -408,9 +408,9 @@ Route26_MapEventHeader: .Warps: db 3 - warp_def $5, $7, 3, GROUP_VICTORY_ROAD_GATE, MAP_VICTORY_ROAD_GATE - warp_def $39, $f, 1, GROUP_ROUTE_26_HEAL_SPEECH_HOUSE, MAP_ROUTE_26_HEAL_SPEECH_HOUSE - warp_def $47, $5, 1, GROUP_ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, MAP_ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE + warp_def $5, $7, 3, VICTORY_ROAD_GATE + warp_def $39, $f, 1, ROUTE_26_HEAL_SPEECH_HOUSE + warp_def $47, $5, 1, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE .XYTriggers: db 0 diff --git a/maps/Route26DayofWeekSiblingsHouse.asm b/maps/Route26DayofWeekSiblingsHouse.asm index 10260ba7c..0d91563fe 100644 --- a/maps/Route26DayofWeekSiblingsHouse.asm +++ b/maps/Route26DayofWeekSiblingsHouse.asm @@ -73,8 +73,8 @@ Route26DayofWeekSiblingsHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 3, GROUP_ROUTE_26, MAP_ROUTE_26 - warp_def $7, $3, 3, GROUP_ROUTE_26, MAP_ROUTE_26 + warp_def $7, $2, 3, ROUTE_26 + warp_def $7, $3, 3, ROUTE_26 .XYTriggers: db 0 diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm index 267802ef4..c85882a08 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealSpeechHouse.asm @@ -51,8 +51,8 @@ Route26HealSpeechHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 2, GROUP_ROUTE_26, MAP_ROUTE_26 - warp_def $7, $3, 2, GROUP_ROUTE_26, MAP_ROUTE_26 + warp_def $7, $2, 2, ROUTE_26 + warp_def $7, $3, 2, ROUTE_26 .XYTriggers: db 0 diff --git a/maps/Route27.asm b/maps/Route27.asm index 9d6f7dca6..90394adb2 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -464,9 +464,9 @@ Route27_MapEventHeader: .Warps: db 3 - warp_def $7, $21, 1, GROUP_ROUTE_27_SANDSTORM_HOUSE, MAP_ROUTE_27_SANDSTORM_HOUSE - warp_def $5, $1a, 1, GROUP_TOHJO_FALLS, MAP_TOHJO_FALLS - warp_def $5, $24, 2, GROUP_TOHJO_FALLS, MAP_TOHJO_FALLS + warp_def $7, $21, 1, ROUTE_27_SANDSTORM_HOUSE + warp_def $5, $1a, 1, TOHJO_FALLS + warp_def $5, $24, 2, TOHJO_FALLS .XYTriggers: db 2 diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index 0b05f0ec4..8a445eb7c 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -96,8 +96,8 @@ Route27SandstormHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 1, GROUP_ROUTE_27, MAP_ROUTE_27 - warp_def $7, $3, 1, GROUP_ROUTE_27, MAP_ROUTE_27 + warp_def $7, $2, 1, ROUTE_27 + warp_def $7, $3, 1, ROUTE_27 .XYTriggers: db 0 diff --git a/maps/Route28.asm b/maps/Route28.asm index b32d030f0..320e62d4c 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -22,8 +22,8 @@ Route28_MapEventHeader: .Warps: db 2 - warp_def $3, $7, 1, GROUP_ROUTE_28_FAMOUS_SPEECH_HOUSE, MAP_ROUTE_28_FAMOUS_SPEECH_HOUSE - warp_def $5, $21, 7, GROUP_VICTORY_ROAD_GATE, MAP_VICTORY_ROAD_GATE + warp_def $3, $7, 1, ROUTE_28_FAMOUS_SPEECH_HOUSE + warp_def $5, $21, 7, VICTORY_ROAD_GATE .XYTriggers: db 0 diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm index ed9db8957..5ea70338f 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28FamousSpeechHouse.asm @@ -74,8 +74,8 @@ Route28FamousSpeechHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 1, GROUP_ROUTE_28, MAP_ROUTE_28 - warp_def $7, $3, 1, GROUP_ROUTE_28, MAP_ROUTE_28 + warp_def $7, $2, 1, ROUTE_28 + warp_def $7, $3, 1, ROUTE_28 .XYTriggers: db 0 diff --git a/maps/Route29.asm b/maps/Route29.asm index 8d5afd5fe..b2a3c1926 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -416,7 +416,7 @@ Route29_MapEventHeader: .Warps: db 1 - warp_def $1, $1b, 3, GROUP_ROUTE_29_46_GATE, MAP_ROUTE_29_46_GATE + warp_def $1, $1b, 3, ROUTE_29_46_GATE .XYTriggers: db 2 diff --git a/maps/Route2946Gate.asm b/maps/Route2946Gate.asm index aeb67342a..8c2ebe7b0 100644 --- a/maps/Route2946Gate.asm +++ b/maps/Route2946Gate.asm @@ -38,10 +38,10 @@ Route2946Gate_MapEventHeader: .Warps: db 4 - warp_def $0, $4, 1, GROUP_ROUTE_46, MAP_ROUTE_46 - warp_def $0, $5, 2, GROUP_ROUTE_46, MAP_ROUTE_46 - warp_def $7, $4, 1, GROUP_ROUTE_29, MAP_ROUTE_29 - warp_def $7, $5, 1, GROUP_ROUTE_29, MAP_ROUTE_29 + warp_def $0, $4, 1, ROUTE_46 + warp_def $0, $5, 2, ROUTE_46 + warp_def $7, $4, 1, ROUTE_29 + warp_def $7, $5, 1, ROUTE_29 .XYTriggers: db 0 diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index 8a92a2cf6..6108f1528 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -28,10 +28,10 @@ Route2Gate_MapEventHeader: .Warps: db 4 - warp_def $0, $4, 3, GROUP_ROUTE_2, MAP_ROUTE_2 - warp_def $0, $5, 4, GROUP_ROUTE_2, MAP_ROUTE_2 - warp_def $7, $4, 2, GROUP_ROUTE_2, MAP_ROUTE_2 - warp_def $7, $5, 2, GROUP_ROUTE_2, MAP_ROUTE_2 + warp_def $0, $4, 3, ROUTE_2 + warp_def $0, $5, 4, ROUTE_2 + warp_def $7, $4, 2, ROUTE_2 + warp_def $7, $5, 2, ROUTE_2 .XYTriggers: db 0 diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetSpeechHouse.asm index 54e7f4433..231d27e90 100644 --- a/maps/Route2NuggetSpeechHouse.asm +++ b/maps/Route2NuggetSpeechHouse.asm @@ -55,8 +55,8 @@ Route2NuggetSpeechHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 1, GROUP_ROUTE_2, MAP_ROUTE_2 - warp_def $7, $3, 1, GROUP_ROUTE_2, MAP_ROUTE_2 + warp_def $7, $2, 1, ROUTE_2 + warp_def $7, $3, 1, ROUTE_2 .XYTriggers: db 0 diff --git a/maps/Route3.asm b/maps/Route3.asm index 7db9dc951..8754d9b1b 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -132,7 +132,7 @@ Route3_MapEventHeader: .Warps: db 1 - warp_def $1, $34, 1, GROUP_MOUNT_MOON, MAP_MOUNT_MOON + warp_def $1, $34, 1, MOUNT_MOON .XYTriggers: db 0 diff --git a/maps/Route30.asm b/maps/Route30.asm index 5a7223183..3198eb84c 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -400,8 +400,8 @@ Route30_MapEventHeader: .Warps: db 2 - warp_def $27, $7, 1, GROUP_ROUTE_30_BERRY_SPEECH_HOUSE, MAP_ROUTE_30_BERRY_SPEECH_HOUSE - warp_def $5, $11, 1, GROUP_MR_POKEMONS_HOUSE, MAP_MR_POKEMONS_HOUSE + warp_def $27, $7, 1, ROUTE_30_BERRY_SPEECH_HOUSE + warp_def $5, $11, 1, MR_POKEMONS_HOUSE .XYTriggers: db 0 diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerrySpeechHouse.asm index 23af447b0..d0a6c5e77 100644 --- a/maps/Route30BerrySpeechHouse.asm +++ b/maps/Route30BerrySpeechHouse.asm @@ -49,8 +49,8 @@ Route30BerrySpeechHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 1, GROUP_ROUTE_30, MAP_ROUTE_30 - warp_def $7, $3, 1, GROUP_ROUTE_30, MAP_ROUTE_30 + warp_def $7, $2, 1, ROUTE_30 + warp_def $7, $3, 1, ROUTE_30 .XYTriggers: db 0 diff --git a/maps/Route31.asm b/maps/Route31.asm index 1b48dfc24..d5ca7e713 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -416,9 +416,9 @@ Route31_MapEventHeader: .Warps: db 3 - warp_def $6, $4, 3, GROUP_ROUTE_31_VIOLET_GATE, MAP_ROUTE_31_VIOLET_GATE - warp_def $7, $4, 4, GROUP_ROUTE_31_VIOLET_GATE, MAP_ROUTE_31_VIOLET_GATE - warp_def $5, $22, 1, GROUP_DARK_CAVE_VIOLET_ENTRANCE, MAP_DARK_CAVE_VIOLET_ENTRANCE + warp_def $6, $4, 3, ROUTE_31_VIOLET_GATE + warp_def $7, $4, 4, ROUTE_31_VIOLET_GATE + warp_def $5, $22, 1, DARK_CAVE_VIOLET_ENTRANCE .XYTriggers: db 0 diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index 032b0f141..de2a344bd 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -29,10 +29,10 @@ Route31VioletGate_MapEventHeader: .Warps: db 4 - warp_def $4, $0, 8, GROUP_VIOLET_CITY, MAP_VIOLET_CITY - warp_def $5, $0, 9, GROUP_VIOLET_CITY, MAP_VIOLET_CITY - warp_def $4, $9, 1, GROUP_ROUTE_31, MAP_ROUTE_31 - warp_def $5, $9, 2, GROUP_ROUTE_31, MAP_ROUTE_31 + warp_def $4, $0, 8, VIOLET_CITY + warp_def $5, $0, 9, VIOLET_CITY + warp_def $4, $9, 1, ROUTE_31 + warp_def $5, $9, 2, ROUTE_31 .XYTriggers: db 0 diff --git a/maps/Route32.asm b/maps/Route32.asm index 2a832897c..c3f53a3e4 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -925,10 +925,10 @@ Route32_MapEventHeader: .Warps: db 4 - warp_def $49, $b, 1, GROUP_ROUTE_32_POKECENTER_1F, MAP_ROUTE_32_POKECENTER_1F - warp_def $2, $4, 3, GROUP_ROUTE_32_RUINS_OF_ALPH_GATE, MAP_ROUTE_32_RUINS_OF_ALPH_GATE - warp_def $3, $4, 4, GROUP_ROUTE_32_RUINS_OF_ALPH_GATE, MAP_ROUTE_32_RUINS_OF_ALPH_GATE - warp_def $4f, $6, 4, GROUP_UNION_CAVE_1F, MAP_UNION_CAVE_1F + warp_def $49, $b, 1, ROUTE_32_POKECENTER_1F + warp_def $2, $4, 3, ROUTE_32_RUINS_OF_ALPH_GATE + warp_def $3, $4, 4, ROUTE_32_RUINS_OF_ALPH_GATE + warp_def $4f, $6, 4, UNION_CAVE_1F .XYTriggers: db 2 diff --git a/maps/Route32PokeCenter1F.asm b/maps/Route32PokeCenter1F.asm index a12d8e06e..a94c31f08 100644 --- a/maps/Route32PokeCenter1F.asm +++ b/maps/Route32PokeCenter1F.asm @@ -95,9 +95,9 @@ Route32PokeCenter1F_MapEventHeader: .Warps: db 3 - warp_def $7, $3, 1, GROUP_ROUTE_32, MAP_ROUTE_32 - warp_def $7, $4, 1, GROUP_ROUTE_32, MAP_ROUTE_32 - warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F + warp_def $7, $3, 1, ROUTE_32 + warp_def $7, $4, 1, ROUTE_32 + warp_def $7, $0, 1, POKECENTER_2F .XYTriggers: db 0 diff --git a/maps/Route32RuinsofAlphGate.asm b/maps/Route32RuinsofAlphGate.asm index 57ffd34bd..db9ebad45 100644 --- a/maps/Route32RuinsofAlphGate.asm +++ b/maps/Route32RuinsofAlphGate.asm @@ -47,10 +47,10 @@ Route32RuinsofAlphGate_MapEventHeader: .Warps: db 4 - warp_def $4, $0, 10, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE - warp_def $5, $0, 11, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE - warp_def $4, $9, 2, GROUP_ROUTE_32, MAP_ROUTE_32 - warp_def $5, $9, 3, GROUP_ROUTE_32, MAP_ROUTE_32 + warp_def $4, $0, 10, RUINS_OF_ALPH_OUTSIDE + warp_def $5, $0, 11, RUINS_OF_ALPH_OUTSIDE + warp_def $4, $9, 2, ROUTE_32 + warp_def $5, $9, 3, ROUTE_32 .XYTriggers: db 0 diff --git a/maps/Route33.asm b/maps/Route33.asm index f71be809c..ed4406173 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -195,7 +195,7 @@ Route33_MapEventHeader: .Warps: db 1 - warp_def $9, $b, 3, GROUP_UNION_CAVE_1F, MAP_UNION_CAVE_1F + warp_def $9, $b, 3, UNION_CAVE_1F .XYTriggers: db 0 diff --git a/maps/Route34.asm b/maps/Route34.asm index 9ed7261bd..651076d91 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -756,11 +756,11 @@ Route34_MapEventHeader: .Warps: db 5 - warp_def $25, $d, 1, GROUP_ROUTE_34_ILEX_FOREST_GATE, MAP_ROUTE_34_ILEX_FOREST_GATE - warp_def $25, $e, 2, GROUP_ROUTE_34_ILEX_FOREST_GATE, MAP_ROUTE_34_ILEX_FOREST_GATE - warp_def $e, $b, 1, GROUP_DAYCARE, MAP_DAYCARE - warp_def $f, $b, 2, GROUP_DAYCARE, MAP_DAYCARE - warp_def $f, $d, 3, GROUP_DAYCARE, MAP_DAYCARE + warp_def $25, $d, 1, ROUTE_34_ILEX_FOREST_GATE + warp_def $25, $e, 2, ROUTE_34_ILEX_FOREST_GATE + warp_def $e, $b, 1, DAYCARE + warp_def $f, $b, 2, DAYCARE + warp_def $f, $d, 3, DAYCARE .XYTriggers: db 0 diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 8b55d58d5..c0e31fa1d 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -138,10 +138,10 @@ Route34IlexForestGate_MapEventHeader: .Warps: db 4 - warp_def $0, $4, 1, GROUP_ROUTE_34, MAP_ROUTE_34 - warp_def $0, $5, 2, GROUP_ROUTE_34, MAP_ROUTE_34 - warp_def $7, $4, 1, GROUP_ILEX_FOREST, MAP_ILEX_FOREST - warp_def $7, $5, 1, GROUP_ILEX_FOREST, MAP_ILEX_FOREST + warp_def $0, $4, 1, ROUTE_34 + warp_def $0, $5, 2, ROUTE_34 + warp_def $7, $4, 1, ILEX_FOREST + warp_def $7, $5, 1, ILEX_FOREST .XYTriggers: db 1 diff --git a/maps/Route35.asm b/maps/Route35.asm index c2a483730..4fa0f3ad1 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -455,9 +455,9 @@ Route35_MapEventHeader: .Warps: db 3 - warp_def $21, $9, 1, GROUP_ROUTE_35_GOLDENROD_GATE, MAP_ROUTE_35_GOLDENROD_GATE - warp_def $21, $a, 2, GROUP_ROUTE_35_GOLDENROD_GATE, MAP_ROUTE_35_GOLDENROD_GATE - warp_def $5, $3, 3, GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE + warp_def $21, $9, 1, ROUTE_35_GOLDENROD_GATE + warp_def $21, $a, 2, ROUTE_35_GOLDENROD_GATE + warp_def $5, $3, 3, ROUTE_35_NATIONAL_PARK_GATE .XYTriggers: db 0 diff --git a/maps/Route35Goldenrodgate.asm b/maps/Route35Goldenrodgate.asm index 192e2673d..72a6e38db 100644 --- a/maps/Route35Goldenrodgate.asm +++ b/maps/Route35Goldenrodgate.asm @@ -196,10 +196,10 @@ Route35Goldenrodgate_MapEventHeader: .Warps: db 4 - warp_def $0, $4, 1, GROUP_ROUTE_35, MAP_ROUTE_35 - warp_def $0, $5, 2, GROUP_ROUTE_35, MAP_ROUTE_35 - warp_def $7, $4, 12, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - warp_def $7, $5, 12, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY + warp_def $0, $4, 1, ROUTE_35 + warp_def $0, $5, 2, ROUTE_35 + warp_def $7, $4, 12, GOLDENROD_CITY + warp_def $7, $5, 12, GOLDENROD_CITY .XYTriggers: db 0 diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm index 64a37061a..88bdfff2d 100644 --- a/maps/Route35NationalParkgate.asm +++ b/maps/Route35NationalParkgate.asm @@ -77,7 +77,7 @@ Route35NationalParkgate_GoBackIn: playsound SFX_ENTER_DOOR special FadeBlackBGMap waitbutton - warpfacing $1, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $a, $2f + warpfacing $1, NATIONAL_PARK_BUG_CONTEST, $a, $2f end OfficerScript_0x6a204: @@ -115,7 +115,7 @@ Route35NationalParkgate_OkayToProceed: special FadeBlackBGMap waitbutton special Special_SelectRandomBugContestContestants - warpfacing $1, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $a, $2f + warpfacing $1, NATIONAL_PARK_BUG_CONTEST, $a, $2f end Route35NationalParkgate_EnterContest: @@ -444,10 +444,10 @@ Route35NationalParkgate_MapEventHeader: .Warps: db 4 - warp_def $0, $3, 3, GROUP_NATIONAL_PARK, MAP_NATIONAL_PARK - warp_def $0, $4, 4, GROUP_NATIONAL_PARK, MAP_NATIONAL_PARK - warp_def $7, $3, 3, GROUP_ROUTE_35, MAP_ROUTE_35 - warp_def $7, $4, 3, GROUP_ROUTE_35, MAP_ROUTE_35 + warp_def $0, $3, 3, NATIONAL_PARK + warp_def $0, $4, 4, NATIONAL_PARK + warp_def $7, $3, 3, ROUTE_35 + warp_def $7, $4, 3, ROUTE_35 .XYTriggers: db 0 diff --git a/maps/Route36.asm b/maps/Route36.asm index 517971e15..ceb5cb119 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -40,7 +40,7 @@ UnknownScript_0x19401b: pause 10 dotrigger $0 clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY - domaptrigger GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY, $1 + domaptrigger CIANWOOD_CITY, $1 end WeirdTreeScript_0x19403c: @@ -660,10 +660,10 @@ Route36_MapEventHeader: .Warps: db 4 - warp_def $8, $12, 3, GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE - warp_def $9, $12, 4, GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE - warp_def $d, $2f, 1, GROUP_ROUTE_36_RUINS_OF_ALPH_GATE, MAP_ROUTE_36_RUINS_OF_ALPH_GATE - warp_def $d, $30, 2, GROUP_ROUTE_36_RUINS_OF_ALPH_GATE, MAP_ROUTE_36_RUINS_OF_ALPH_GATE + warp_def $8, $12, 3, ROUTE_36_NATIONAL_PARK_GATE + warp_def $9, $12, 4, ROUTE_36_NATIONAL_PARK_GATE + warp_def $d, $2f, 1, ROUTE_36_RUINS_OF_ALPH_GATE + warp_def $d, $30, 2, ROUTE_36_RUINS_OF_ALPH_GATE .XYTriggers: db 2 diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm index c01e66d5b..50096a375 100644 --- a/maps/Route36NationalParkgate.asm +++ b/maps/Route36NationalParkgate.asm @@ -85,7 +85,7 @@ Route36NationalParkgate_MapScriptHeader: playsound SFX_EXIT_BUILDING special FadeBlackBGMap waitbutton - warpfacing $2, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $21, $12 + warpfacing $2, NATIONAL_PARK_BUG_CONTEST, $21, $12 end .CopyContestants: @@ -169,7 +169,7 @@ Route36OfficerScriptContest: special FadeBlackBGMap waitbutton special Special_SelectRandomBugContestContestants - warpfacing $2, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $21, $12 + warpfacing $2, NATIONAL_PARK_BUG_CONTEST, $21, $12 end .LeaveMonsWithOfficer: @@ -848,10 +848,10 @@ Route36NationalParkgate_MapEventHeader: .Warps: db 4 - warp_def $4, $0, 1, GROUP_NATIONAL_PARK, MAP_NATIONAL_PARK - warp_def $5, $0, 2, GROUP_NATIONAL_PARK, MAP_NATIONAL_PARK - warp_def $4, $9, 1, GROUP_ROUTE_36, MAP_ROUTE_36 - warp_def $5, $9, 2, GROUP_ROUTE_36, MAP_ROUTE_36 + warp_def $4, $0, 1, NATIONAL_PARK + warp_def $5, $0, 2, NATIONAL_PARK + warp_def $4, $9, 1, ROUTE_36 + warp_def $5, $9, 2, ROUTE_36 .XYTriggers: db 0 diff --git a/maps/Route36RuinsofAlphgate.asm b/maps/Route36RuinsofAlphgate.asm index 4854e7f8b..b5b4d1c03 100644 --- a/maps/Route36RuinsofAlphgate.asm +++ b/maps/Route36RuinsofAlphgate.asm @@ -36,10 +36,10 @@ Route36RuinsofAlphgate_MapEventHeader: .Warps: db 4 - warp_def $0, $4, 3, GROUP_ROUTE_36, MAP_ROUTE_36 - warp_def $0, $5, 4, GROUP_ROUTE_36, MAP_ROUTE_36 - warp_def $7, $4, 9, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE - warp_def $7, $5, 9, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE + warp_def $0, $4, 3, ROUTE_36 + warp_def $0, $5, 4, ROUTE_36 + warp_def $7, $4, 9, RUINS_OF_ALPH_OUTSIDE + warp_def $7, $5, 9, RUINS_OF_ALPH_OUTSIDE .XYTriggers: db 0 diff --git a/maps/Route38.asm b/maps/Route38.asm index 47b35d3bc..52a625da3 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -469,8 +469,8 @@ Route38_MapEventHeader: .Warps: db 2 - warp_def $8, $23, 1, GROUP_ROUTE_38_ECRUTEAK_GATE, MAP_ROUTE_38_ECRUTEAK_GATE - warp_def $9, $23, 2, GROUP_ROUTE_38_ECRUTEAK_GATE, MAP_ROUTE_38_ECRUTEAK_GATE + warp_def $8, $23, 1, ROUTE_38_ECRUTEAK_GATE + warp_def $9, $23, 2, ROUTE_38_ECRUTEAK_GATE .XYTriggers: db 0 diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index f5cf4d418..a3a6cf7ec 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -27,10 +27,10 @@ Route38EcruteakGate_MapEventHeader: .Warps: db 4 - warp_def $4, $0, 1, GROUP_ROUTE_38, MAP_ROUTE_38 - warp_def $5, $0, 2, GROUP_ROUTE_38, MAP_ROUTE_38 - warp_def $4, $9, 14, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - warp_def $5, $9, 15, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY + warp_def $4, $0, 1, ROUTE_38 + warp_def $5, $0, 2, ROUTE_38 + warp_def $4, $9, 14, ECRUTEAK_CITY + warp_def $5, $9, 15, ECRUTEAK_CITY .XYTriggers: db 0 diff --git a/maps/Route39.asm b/maps/Route39.asm index 76a2b4c55..17997374f 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -338,8 +338,8 @@ Route39_MapEventHeader: .Warps: db 2 - warp_def $3, $1, 1, GROUP_ROUTE_39_BARN, MAP_ROUTE_39_BARN - warp_def $3, $5, 1, GROUP_ROUTE_39_FARMHOUSE, MAP_ROUTE_39_FARMHOUSE + warp_def $3, $1, 1, ROUTE_39_BARN + warp_def $3, $5, 1, ROUTE_39_FARMHOUSE .XYTriggers: db 0 diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 11cab1d7f..c37b5ce73 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -189,8 +189,8 @@ Route39Barn_MapEventHeader: .Warps: db 2 - warp_def $7, $3, 1, GROUP_ROUTE_39, MAP_ROUTE_39 - warp_def $7, $4, 1, GROUP_ROUTE_39, MAP_ROUTE_39 + warp_def $7, $3, 1, ROUTE_39 + warp_def $7, $4, 1, ROUTE_39 .XYTriggers: db 0 diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index 2e43e5635..9c130d9d4 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -194,8 +194,8 @@ Route39Farmhouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 2, GROUP_ROUTE_39, MAP_ROUTE_39 - warp_def $7, $3, 2, GROUP_ROUTE_39, MAP_ROUTE_39 + warp_def $7, $2, 2, ROUTE_39 + warp_def $7, $3, 2, ROUTE_39 .XYTriggers: db 0 diff --git a/maps/Route4.asm b/maps/Route4.asm index df00a04c0..3bb048631 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -121,7 +121,7 @@ Route4_MapEventHeader: .Warps: db 1 - warp_def $5, $2, 2, GROUP_MOUNT_MOON, MAP_MOUNT_MOON + warp_def $5, $2, 2, MOUNT_MOON .XYTriggers: db 0 diff --git a/maps/Route40.asm b/maps/Route40.asm index 6fd99ee3a..896e1013f 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -332,7 +332,7 @@ Route40_MapEventHeader: .Warps: db 1 - warp_def $5, $9, 1, GROUP_ROUTE_40_BATTLE_TOWER_GATE, MAP_ROUTE_40_BATTLE_TOWER_GATE + warp_def $5, $9, 1, ROUTE_40_BATTLE_TOWER_GATE .XYTriggers: db 0 diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index f5905a9ba..06e903103 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -75,10 +75,10 @@ Route40BattleTowerGate_MapEventHeader: .Warps: db 4 - warp_def $7, $4, 1, GROUP_ROUTE_40, MAP_ROUTE_40 - warp_def $7, $5, 1, GROUP_ROUTE_40, MAP_ROUTE_40 - warp_def $0, $4, 1, GROUP_BATTLE_TOWER_OUTSIDE, MAP_BATTLE_TOWER_OUTSIDE - warp_def $0, $5, 2, GROUP_BATTLE_TOWER_OUTSIDE, MAP_BATTLE_TOWER_OUTSIDE + warp_def $7, $4, 1, ROUTE_40 + warp_def $7, $5, 1, ROUTE_40 + warp_def $0, $4, 1, BATTLE_TOWER_OUTSIDE + warp_def $0, $5, 2, BATTLE_TOWER_OUTSIDE .XYTriggers: db 0 diff --git a/maps/Route41.asm b/maps/Route41.asm index a2fc0a74c..7062f584a 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -335,10 +335,10 @@ Route41_MapEventHeader: .Warps: db 4 - warp_def $11, $c, 1, GROUP_WHIRL_ISLAND_NW, MAP_WHIRL_ISLAND_NW - warp_def $13, $24, 1, GROUP_WHIRL_ISLAND_NE, MAP_WHIRL_ISLAND_NE - warp_def $25, $c, 1, GROUP_WHIRL_ISLAND_SW, MAP_WHIRL_ISLAND_SW - warp_def $2d, $24, 1, GROUP_WHIRL_ISLAND_SE, MAP_WHIRL_ISLAND_SE + warp_def $11, $c, 1, WHIRL_ISLAND_NW + warp_def $13, $24, 1, WHIRL_ISLAND_NE + warp_def $25, $c, 1, WHIRL_ISLAND_SW + warp_def $2d, $24, 1, WHIRL_ISLAND_SE .XYTriggers: db 0 diff --git a/maps/Route42.asm b/maps/Route42.asm index 2ca42a7dc..75b2dcbcf 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -24,7 +24,7 @@ UnknownScript_0x1a9218: pause 10 dotrigger $0 clearevent EVENT_SAW_SUICUNE_ON_ROUTE_36 - domaptrigger GROUP_ROUTE_36, MAP_ROUTE_36, $1 + domaptrigger ROUTE_36, $1 end TrainerFisherTully1: @@ -316,11 +316,11 @@ Route42_MapEventHeader: .Warps: db 5 - warp_def $8, $0, 3, GROUP_ROUTE_42_ECRUTEAK_GATE, MAP_ROUTE_42_ECRUTEAK_GATE - warp_def $9, $0, 4, GROUP_ROUTE_42_ECRUTEAK_GATE, MAP_ROUTE_42_ECRUTEAK_GATE - warp_def $5, $a, 1, GROUP_MOUNT_MORTAR_1F_OUTSIDE, MAP_MOUNT_MORTAR_1F_OUTSIDE - warp_def $9, $1c, 2, GROUP_MOUNT_MORTAR_1F_OUTSIDE, MAP_MOUNT_MORTAR_1F_OUTSIDE - warp_def $7, $2e, 3, GROUP_MOUNT_MORTAR_1F_OUTSIDE, MAP_MOUNT_MORTAR_1F_OUTSIDE + warp_def $8, $0, 3, ROUTE_42_ECRUTEAK_GATE + warp_def $9, $0, 4, ROUTE_42_ECRUTEAK_GATE + warp_def $5, $a, 1, MOUNT_MORTAR_1F_OUTSIDE + warp_def $9, $1c, 2, MOUNT_MORTAR_1F_OUTSIDE + warp_def $7, $2e, 3, MOUNT_MORTAR_1F_OUTSIDE .XYTriggers: db 1 diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index 4158ab230..bc1cbf2ef 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -22,10 +22,10 @@ Route42EcruteakGate_MapEventHeader: .Warps: db 4 - warp_def $4, $0, 1, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - warp_def $5, $0, 2, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - warp_def $4, $9, 1, GROUP_ROUTE_42, MAP_ROUTE_42 - warp_def $5, $9, 2, GROUP_ROUTE_42, MAP_ROUTE_42 + warp_def $4, $0, 1, ECRUTEAK_CITY + warp_def $5, $0, 2, ECRUTEAK_CITY + warp_def $4, $9, 1, ROUTE_42 + warp_def $5, $9, 2, ROUTE_42 .XYTriggers: db 0 diff --git a/maps/Route43.asm b/maps/Route43.asm index 85799e520..bf2722e8c 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -12,11 +12,11 @@ Route43_MapScriptHeader: UnknownScript_0x19d051: checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x19d05c - domaptrigger GROUP_ROUTE_43_GATE, MAP_ROUTE_43_GATE, $0 + domaptrigger ROUTE_43_GATE, $0 return UnknownScript_0x19d05c: - domaptrigger GROUP_ROUTE_43_GATE, MAP_ROUTE_43_GATE, $1 + domaptrigger ROUTE_43_GATE, $1 return TrainerCamperSpencer: @@ -499,11 +499,11 @@ Route43_MapEventHeader: .Warps: db 5 - warp_def $33, $9, 1, GROUP_ROUTE_43_MAHOGANY_GATE, MAP_ROUTE_43_MAHOGANY_GATE - warp_def $33, $a, 2, GROUP_ROUTE_43_MAHOGANY_GATE, MAP_ROUTE_43_MAHOGANY_GATE - warp_def $23, $11, 3, GROUP_ROUTE_43_GATE, MAP_ROUTE_43_GATE - warp_def $1f, $11, 1, GROUP_ROUTE_43_GATE, MAP_ROUTE_43_GATE - warp_def $1f, $12, 2, GROUP_ROUTE_43_GATE, MAP_ROUTE_43_GATE + warp_def $33, $9, 1, ROUTE_43_MAHOGANY_GATE + warp_def $33, $a, 2, ROUTE_43_MAHOGANY_GATE + warp_def $23, $11, 3, ROUTE_43_GATE + warp_def $1f, $11, 1, ROUTE_43_GATE + warp_def $1f, $12, 2, ROUTE_43_GATE .XYTriggers: db 0 diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 4ab30615a..0c848f2e9 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -23,11 +23,11 @@ UnknownScript_0x19abc9: UnknownScript_0x19abca: checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x19abd5 - domaptrigger GROUP_ROUTE_43, MAP_ROUTE_43, $0 + domaptrigger ROUTE_43, $0 return UnknownScript_0x19abd5: - domaptrigger GROUP_ROUTE_43, MAP_ROUTE_43, $1 + domaptrigger ROUTE_43, $1 return UnknownScript_0x19abda: @@ -251,10 +251,10 @@ Route43Gate_MapEventHeader: .Warps: db 4 - warp_def $0, $4, 4, GROUP_ROUTE_43, MAP_ROUTE_43 - warp_def $0, $5, 5, GROUP_ROUTE_43, MAP_ROUTE_43 - warp_def $7, $4, 3, GROUP_ROUTE_43, MAP_ROUTE_43 - warp_def $7, $5, 3, GROUP_ROUTE_43, MAP_ROUTE_43 + warp_def $0, $4, 4, ROUTE_43 + warp_def $0, $5, 5, ROUTE_43 + warp_def $7, $4, 3, ROUTE_43 + warp_def $7, $5, 3, ROUTE_43 .XYTriggers: db 0 diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index 8ef780243..58949cef2 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -41,10 +41,10 @@ Route43MahoganyGate_MapEventHeader: .Warps: db 4 - warp_def $0, $4, 1, GROUP_ROUTE_43, MAP_ROUTE_43 - warp_def $0, $5, 2, GROUP_ROUTE_43, MAP_ROUTE_43 - warp_def $7, $4, 5, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN - warp_def $7, $5, 5, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN + warp_def $0, $4, 1, ROUTE_43 + warp_def $0, $5, 2, ROUTE_43 + warp_def $7, $4, 5, MAHOGANY_TOWN + warp_def $7, $5, 5, MAHOGANY_TOWN .XYTriggers: db 0 diff --git a/maps/Route44.asm b/maps/Route44.asm index 86c54a885..f2f1dd074 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -500,7 +500,7 @@ Route44_MapEventHeader: .Warps: db 1 - warp_def $7, $38, 1, GROUP_ICE_PATH_1F, MAP_ICE_PATH_1F + warp_def $7, $38, 1, ICE_PATH_1F .XYTriggers: db 0 diff --git a/maps/Route45.asm b/maps/Route45.asm index 160fd7090..add7736a7 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -523,7 +523,7 @@ Route45_MapEventHeader: .Warps: db 1 - warp_def $5, $2, 1, GROUP_DARK_CAVE_BLACKTHORN_ENTRANCE, MAP_DARK_CAVE_BLACKTHORN_ENTRANCE + warp_def $5, $2, 1, DARK_CAVE_BLACKTHORN_ENTRANCE .XYTriggers: db 0 diff --git a/maps/Route46.asm b/maps/Route46.asm index 58cd08645..8b3e73b60 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -248,9 +248,9 @@ Route46_MapEventHeader: .Warps: db 3 - warp_def $21, $7, 1, GROUP_ROUTE_29_46_GATE, MAP_ROUTE_29_46_GATE - warp_def $21, $8, 2, GROUP_ROUTE_29_46_GATE, MAP_ROUTE_29_46_GATE - warp_def $5, $e, 3, GROUP_DARK_CAVE_VIOLET_ENTRANCE, MAP_DARK_CAVE_VIOLET_ENTRANCE + warp_def $21, $7, 1, ROUTE_29_46_GATE + warp_def $21, $8, 2, ROUTE_29_46_GATE + warp_def $5, $e, 3, DARK_CAVE_VIOLET_ENTRANCE .XYTriggers: db 0 diff --git a/maps/Route5.asm b/maps/Route5.asm index e1413523a..dac192623 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -42,10 +42,10 @@ Route5_MapEventHeader: .Warps: db 4 - warp_def $f, $11, 1, GROUP_ROUTE_5_UNDERGROUND_ENTRANCE, MAP_ROUTE_5_UNDERGROUND_ENTRANCE - warp_def $11, $8, 1, GROUP_ROUTE_5_SAFFRON_CITY_GATE, MAP_ROUTE_5_SAFFRON_CITY_GATE - warp_def $11, $9, 2, GROUP_ROUTE_5_SAFFRON_CITY_GATE, MAP_ROUTE_5_SAFFRON_CITY_GATE - warp_def $b, $a, 1, GROUP_ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, MAP_ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE + warp_def $f, $11, 1, ROUTE_5_UNDERGROUND_ENTRANCE + warp_def $11, $8, 1, ROUTE_5_SAFFRON_CITY_GATE + warp_def $11, $9, 2, ROUTE_5_SAFFRON_CITY_GATE + warp_def $b, $a, 1, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE .XYTriggers: db 0 diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm index 8c65f57d9..a3dca106e 100644 --- a/maps/Route5CleanseTagSpeechHouse.asm +++ b/maps/Route5CleanseTagSpeechHouse.asm @@ -62,8 +62,8 @@ Route5CleanseTagSpeechHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 4, GROUP_ROUTE_5, MAP_ROUTE_5 - warp_def $7, $3, 4, GROUP_ROUTE_5, MAP_ROUTE_5 + warp_def $7, $2, 4, ROUTE_5 + warp_def $7, $3, 4, ROUTE_5 .XYTriggers: db 0 diff --git a/maps/Route5SaffronCityGate.asm b/maps/Route5SaffronCityGate.asm index 92392edc0..fe953b515 100644 --- a/maps/Route5SaffronCityGate.asm +++ b/maps/Route5SaffronCityGate.asm @@ -23,10 +23,10 @@ Route5SaffronCityGate_MapEventHeader: .Warps: db 4 - warp_def $0, $4, 2, GROUP_ROUTE_5, MAP_ROUTE_5 - warp_def $0, $5, 3, GROUP_ROUTE_5, MAP_ROUTE_5 - warp_def $7, $4, 9, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - warp_def $7, $5, 9, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY + warp_def $0, $4, 2, ROUTE_5 + warp_def $0, $5, 3, ROUTE_5 + warp_def $7, $4, 9, SAFFRON_CITY + warp_def $7, $5, 9, SAFFRON_CITY .XYTriggers: db 0 diff --git a/maps/Route5UndergroundEntrance.asm b/maps/Route5UndergroundEntrance.asm index a56946e23..884a7efb8 100644 --- a/maps/Route5UndergroundEntrance.asm +++ b/maps/Route5UndergroundEntrance.asm @@ -22,9 +22,9 @@ Route5UndergroundEntrance_MapEventHeader: .Warps: db 3 - warp_def $7, $3, 1, GROUP_ROUTE_5, MAP_ROUTE_5 - warp_def $7, $4, 1, GROUP_ROUTE_5, MAP_ROUTE_5 - warp_def $3, $4, 1, GROUP_UNDERGROUND, MAP_UNDERGROUND + warp_def $7, $3, 1, ROUTE_5 + warp_def $7, $4, 1, ROUTE_5 + warp_def $3, $4, 1, UNDERGROUND .XYTriggers: db 0 diff --git a/maps/Route6.asm b/maps/Route6.asm index 06e2f0c7c..471a72a6b 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -92,8 +92,8 @@ Route6_MapEventHeader: .Warps: db 2 - warp_def $3, $11, 1, GROUP_ROUTE_6_UNDERGROUND_ENTRANCE, MAP_ROUTE_6_UNDERGROUND_ENTRANCE - warp_def $1, $6, 3, GROUP_ROUTE_6_SAFFRON_GATE, MAP_ROUTE_6_SAFFRON_GATE + warp_def $3, $11, 1, ROUTE_6_UNDERGROUND_ENTRANCE + warp_def $1, $6, 3, ROUTE_6_SAFFRON_GATE .XYTriggers: db 0 diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index 33d8b5029..07a136d11 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -62,10 +62,10 @@ Route6SaffronGate_MapEventHeader: .Warps: db 4 - warp_def $0, $4, 12, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - warp_def $0, $5, 13, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - warp_def $7, $4, 2, GROUP_ROUTE_6, MAP_ROUTE_6 - warp_def $7, $5, 2, GROUP_ROUTE_6, MAP_ROUTE_6 + warp_def $0, $4, 12, SAFFRON_CITY + warp_def $0, $5, 13, SAFFRON_CITY + warp_def $7, $4, 2, ROUTE_6 + warp_def $7, $5, 2, ROUTE_6 .XYTriggers: db 0 diff --git a/maps/Route6UndergroundEntrance.asm b/maps/Route6UndergroundEntrance.asm index 56b52d2cc..e1dbd1b86 100644 --- a/maps/Route6UndergroundEntrance.asm +++ b/maps/Route6UndergroundEntrance.asm @@ -11,9 +11,9 @@ Route6UndergroundEntrance_MapEventHeader: .Warps: db 3 - warp_def $7, $3, 1, GROUP_ROUTE_6, MAP_ROUTE_6 - warp_def $7, $4, 1, GROUP_ROUTE_6, MAP_ROUTE_6 - warp_def $3, $4, 2, GROUP_UNDERGROUND, MAP_UNDERGROUND + warp_def $7, $3, 1, ROUTE_6 + warp_def $7, $4, 1, ROUTE_6 + warp_def $3, $4, 2, UNDERGROUND .XYTriggers: db 0 diff --git a/maps/Route7.asm b/maps/Route7.asm index 8953a3c25..5ccd0239c 100644 --- a/maps/Route7.asm +++ b/maps/Route7.asm @@ -40,8 +40,8 @@ Route7_MapEventHeader: .Warps: db 2 - warp_def $6, $f, 1, GROUP_ROUTE_7_SAFFRON_GATE, MAP_ROUTE_7_SAFFRON_GATE - warp_def $7, $f, 2, GROUP_ROUTE_7_SAFFRON_GATE, MAP_ROUTE_7_SAFFRON_GATE + warp_def $6, $f, 1, ROUTE_7_SAFFRON_GATE + warp_def $7, $f, 2, ROUTE_7_SAFFRON_GATE .XYTriggers: db 0 diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index f1e209da1..3e8c81157 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -48,10 +48,10 @@ Route7SaffronGate_MapEventHeader: .Warps: db 4 - warp_def $4, $0, 1, GROUP_ROUTE_7, MAP_ROUTE_7 - warp_def $5, $0, 2, GROUP_ROUTE_7, MAP_ROUTE_7 - warp_def $4, $9, 10, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - warp_def $5, $9, 11, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY + warp_def $4, $0, 1, ROUTE_7 + warp_def $5, $0, 2, ROUTE_7 + warp_def $4, $9, 10, SAFFRON_CITY + warp_def $5, $9, 11, SAFFRON_CITY .XYTriggers: db 0 diff --git a/maps/Route8.asm b/maps/Route8.asm index f8fd07184..250765b24 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -170,8 +170,8 @@ Route8_MapEventHeader: .Warps: db 2 - warp_def $4, $4, 3, GROUP_ROUTE_8_SAFFRON_GATE, MAP_ROUTE_8_SAFFRON_GATE - warp_def $5, $4, 4, GROUP_ROUTE_8_SAFFRON_GATE, MAP_ROUTE_8_SAFFRON_GATE + warp_def $4, $4, 3, ROUTE_8_SAFFRON_GATE + warp_def $5, $4, 4, ROUTE_8_SAFFRON_GATE .XYTriggers: db 0 diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index aa9cb7ca9..71a7e2308 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -22,10 +22,10 @@ Route8SaffronGate_MapEventHeader: .Warps: db 4 - warp_def $4, $0, 14, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - warp_def $5, $0, 15, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - warp_def $4, $9, 1, GROUP_ROUTE_8, MAP_ROUTE_8 - warp_def $5, $9, 2, GROUP_ROUTE_8, MAP_ROUTE_8 + warp_def $4, $0, 14, SAFFRON_CITY + warp_def $5, $0, 15, SAFFRON_CITY + warp_def $4, $9, 1, ROUTE_8 + warp_def $5, $9, 2, ROUTE_8 .XYTriggers: db 0 diff --git a/maps/Route9.asm b/maps/Route9.asm index dbf5ad79a..fefe4b9cf 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -204,7 +204,7 @@ Route9_MapEventHeader: .Warps: db 1 - warp_def $f, $30, 1, GROUP_ROCK_TUNNEL_1F, MAP_ROCK_TUNNEL_1F + warp_def $f, $30, 1, ROCK_TUNNEL_1F .XYTriggers: db 0 diff --git a/maps/RuinsofAlphAerodactylChamber.asm b/maps/RuinsofAlphAerodactylChamber.asm index aebf46743..56b5fcbef 100644 --- a/maps/RuinsofAlphAerodactylChamber.asm +++ b/maps/RuinsofAlphAerodactylChamber.asm @@ -64,7 +64,7 @@ UnknownScript_0x58df7: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_AERODACTYL_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_3 - domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 + domaptrigger RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 showemote EMOTE_SHOCK, $0, 15 changeblock $2, $2, $18 @@ -154,11 +154,11 @@ RuinsofAlphAerodactylChamber_MapEventHeader: .Warps: db 5 - warp_def $9, $3, 4, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE - warp_def $9, $4, 4, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE - warp_def $3, $3, 8, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER - warp_def $3, $4, 9, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER - warp_def $0, $4, 1, GROUP_RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, MAP_RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM + warp_def $9, $3, 4, RUINS_OF_ALPH_OUTSIDE + warp_def $9, $4, 4, RUINS_OF_ALPH_OUTSIDE + warp_def $3, $3, 8, RUINS_OF_ALPH_INNER_CHAMBER + warp_def $3, $4, 9, RUINS_OF_ALPH_INNER_CHAMBER + warp_def $0, $4, 1, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM .XYTriggers: db 0 diff --git a/maps/RuinsofAlphAerodactylItemRoom.asm b/maps/RuinsofAlphAerodactylItemRoom.asm index 1eb5ece90..9b983b9f6 100644 --- a/maps/RuinsofAlphAerodactylItemRoom.asm +++ b/maps/RuinsofAlphAerodactylItemRoom.asm @@ -32,10 +32,10 @@ RuinsofAlphAerodactylItemRoom_MapEventHeader: .Warps: db 4 - warp_def $9, $3, 5, GROUP_RUINS_OF_ALPH_AERODACTYL_CHAMBER, MAP_RUINS_OF_ALPH_AERODACTYL_CHAMBER - warp_def $9, $4, 5, GROUP_RUINS_OF_ALPH_AERODACTYL_CHAMBER, MAP_RUINS_OF_ALPH_AERODACTYL_CHAMBER - warp_def $1, $3, 1, GROUP_RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, MAP_RUINS_OF_ALPH_AERODACTYL_WORD_ROOM - warp_def $1, $4, 2, GROUP_RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, MAP_RUINS_OF_ALPH_AERODACTYL_WORD_ROOM + warp_def $9, $3, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER + warp_def $9, $4, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER + warp_def $1, $3, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM + warp_def $1, $4, 2, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM .XYTriggers: db 0 diff --git a/maps/RuinsofAlphAerodactylWordRoom.asm b/maps/RuinsofAlphAerodactylWordRoom.asm index 29d56222e..e79ca5c21 100644 --- a/maps/RuinsofAlphAerodactylWordRoom.asm +++ b/maps/RuinsofAlphAerodactylWordRoom.asm @@ -11,9 +11,9 @@ RuinsofAlphAerodactylWordRoom_MapEventHeader: .Warps: db 3 - warp_def $5, $9, 3, GROUP_RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, MAP_RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM - warp_def $5, $a, 4, GROUP_RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, MAP_RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM - warp_def $b, $11, 8, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER + warp_def $5, $9, 3, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM + warp_def $5, $a, 4, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM + warp_def $b, $11, 8, RUINS_OF_ALPH_INNER_CHAMBER .XYTriggers: db 0 diff --git a/maps/RuinsofAlphHoOhChamber.asm b/maps/RuinsofAlphHoOhChamber.asm index b75262481..0cbab2ad9 100644 --- a/maps/RuinsofAlphHoOhChamber.asm +++ b/maps/RuinsofAlphHoOhChamber.asm @@ -65,7 +65,7 @@ UnknownScript_0x585ba: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_HO_OH_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_4 - domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 + domaptrigger RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 showemote EMOTE_SHOCK, $0, 15 changeblock $2, $2, $18 @@ -155,11 +155,11 @@ RuinsofAlphHoOhChamber_MapEventHeader: .Warps: db 5 - warp_def $9, $3, 1, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE - warp_def $9, $4, 1, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE - warp_def $3, $3, 2, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER - warp_def $3, $4, 3, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER - warp_def $0, $4, 1, GROUP_RUINS_OF_ALPH_HO_OH_ITEM_ROOM, MAP_RUINS_OF_ALPH_HO_OH_ITEM_ROOM + warp_def $9, $3, 1, RUINS_OF_ALPH_OUTSIDE + warp_def $9, $4, 1, RUINS_OF_ALPH_OUTSIDE + warp_def $3, $3, 2, RUINS_OF_ALPH_INNER_CHAMBER + warp_def $3, $4, 3, RUINS_OF_ALPH_INNER_CHAMBER + warp_def $0, $4, 1, RUINS_OF_ALPH_HO_OH_ITEM_ROOM .XYTriggers: db 0 diff --git a/maps/RuinsofAlphHoOhItemRoom.asm b/maps/RuinsofAlphHoOhItemRoom.asm index 70476bbde..f848a91ef 100644 --- a/maps/RuinsofAlphHoOhItemRoom.asm +++ b/maps/RuinsofAlphHoOhItemRoom.asm @@ -32,10 +32,10 @@ RuinsofAlphHoOhItemRoom_MapEventHeader: .Warps: db 4 - warp_def $9, $3, 5, GROUP_RUINS_OF_ALPH_HO_OH_CHAMBER, MAP_RUINS_OF_ALPH_HO_OH_CHAMBER - warp_def $9, $4, 5, GROUP_RUINS_OF_ALPH_HO_OH_CHAMBER, MAP_RUINS_OF_ALPH_HO_OH_CHAMBER - warp_def $1, $3, 1, GROUP_RUINS_OF_ALPH_HO_OH_WORD_ROOM, MAP_RUINS_OF_ALPH_HO_OH_WORD_ROOM - warp_def $1, $4, 2, GROUP_RUINS_OF_ALPH_HO_OH_WORD_ROOM, MAP_RUINS_OF_ALPH_HO_OH_WORD_ROOM + warp_def $9, $3, 5, RUINS_OF_ALPH_HO_OH_CHAMBER + warp_def $9, $4, 5, RUINS_OF_ALPH_HO_OH_CHAMBER + warp_def $1, $3, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM + warp_def $1, $4, 2, RUINS_OF_ALPH_HO_OH_WORD_ROOM .XYTriggers: db 0 diff --git a/maps/RuinsofAlphHoOhWordRoom.asm b/maps/RuinsofAlphHoOhWordRoom.asm index f11abcd6a..e0d35fa14 100644 --- a/maps/RuinsofAlphHoOhWordRoom.asm +++ b/maps/RuinsofAlphHoOhWordRoom.asm @@ -11,9 +11,9 @@ RuinsofAlphHoOhWordRoom_MapEventHeader: .Warps: db 3 - warp_def $9, $9, 3, GROUP_RUINS_OF_ALPH_HO_OH_ITEM_ROOM, MAP_RUINS_OF_ALPH_HO_OH_ITEM_ROOM - warp_def $9, $a, 4, GROUP_RUINS_OF_ALPH_HO_OH_ITEM_ROOM, MAP_RUINS_OF_ALPH_HO_OH_ITEM_ROOM - warp_def $15, $11, 2, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER + warp_def $9, $9, 3, RUINS_OF_ALPH_HO_OH_ITEM_ROOM + warp_def $9, $a, 4, RUINS_OF_ALPH_HO_OH_ITEM_ROOM + warp_def $15, $11, 2, RUINS_OF_ALPH_INNER_CHAMBER .XYTriggers: db 0 diff --git a/maps/RuinsofAlphInnerChamber.asm b/maps/RuinsofAlphInnerChamber.asm index 311714c86..1cb326e31 100644 --- a/maps/RuinsofAlphInnerChamber.asm +++ b/maps/RuinsofAlphInnerChamber.asm @@ -81,15 +81,15 @@ RuinsofAlphInnerChamber_MapEventHeader: .Warps: db 9 - warp_def $d, $a, 5, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE - warp_def $f, $3, 3, GROUP_RUINS_OF_ALPH_HO_OH_CHAMBER, MAP_RUINS_OF_ALPH_HO_OH_CHAMBER - warp_def $f, $4, 4, GROUP_RUINS_OF_ALPH_HO_OH_CHAMBER, MAP_RUINS_OF_ALPH_HO_OH_CHAMBER - warp_def $3, $f, 3, GROUP_RUINS_OF_ALPH_KABUTO_CHAMBER, MAP_RUINS_OF_ALPH_KABUTO_CHAMBER - warp_def $3, $10, 4, GROUP_RUINS_OF_ALPH_KABUTO_CHAMBER, MAP_RUINS_OF_ALPH_KABUTO_CHAMBER - warp_def $15, $3, 3, GROUP_RUINS_OF_ALPH_OMANYTE_CHAMBER, MAP_RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def $15, $4, 4, GROUP_RUINS_OF_ALPH_OMANYTE_CHAMBER, MAP_RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def $18, $f, 3, GROUP_RUINS_OF_ALPH_AERODACTYL_CHAMBER, MAP_RUINS_OF_ALPH_AERODACTYL_CHAMBER - warp_def $18, $10, 4, GROUP_RUINS_OF_ALPH_AERODACTYL_CHAMBER, MAP_RUINS_OF_ALPH_AERODACTYL_CHAMBER + warp_def $d, $a, 5, RUINS_OF_ALPH_OUTSIDE + warp_def $f, $3, 3, RUINS_OF_ALPH_HO_OH_CHAMBER + warp_def $f, $4, 4, RUINS_OF_ALPH_HO_OH_CHAMBER + warp_def $3, $f, 3, RUINS_OF_ALPH_KABUTO_CHAMBER + warp_def $3, $10, 4, RUINS_OF_ALPH_KABUTO_CHAMBER + warp_def $15, $3, 3, RUINS_OF_ALPH_OMANYTE_CHAMBER + warp_def $15, $4, 4, RUINS_OF_ALPH_OMANYTE_CHAMBER + warp_def $18, $f, 3, RUINS_OF_ALPH_AERODACTYL_CHAMBER + warp_def $18, $10, 4, RUINS_OF_ALPH_AERODACTYL_CHAMBER .XYTriggers: db 0 diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsofAlphKabutoChamber.asm index 18f537546..a405637b4 100644 --- a/maps/RuinsofAlphKabutoChamber.asm +++ b/maps/RuinsofAlphKabutoChamber.asm @@ -70,7 +70,7 @@ UnknownScript_0x58778: setevent EVENT_SOLVED_KABUTO_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_1 setevent EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST - domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 + domaptrigger RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 showemote EMOTE_SHOCK, $0, 15 changeblock $2, $2, $18 @@ -264,11 +264,11 @@ RuinsofAlphKabutoChamber_MapEventHeader: .Warps: db 5 - warp_def $9, $3, 2, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE - warp_def $9, $4, 2, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE - warp_def $3, $3, 4, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER - warp_def $3, $4, 5, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER - warp_def $0, $4, 1, GROUP_RUINS_OF_ALPH_KABUTO_ITEM_ROOM, MAP_RUINS_OF_ALPH_KABUTO_ITEM_ROOM + warp_def $9, $3, 2, RUINS_OF_ALPH_OUTSIDE + warp_def $9, $4, 2, RUINS_OF_ALPH_OUTSIDE + warp_def $3, $3, 4, RUINS_OF_ALPH_INNER_CHAMBER + warp_def $3, $4, 5, RUINS_OF_ALPH_INNER_CHAMBER + warp_def $0, $4, 1, RUINS_OF_ALPH_KABUTO_ITEM_ROOM .XYTriggers: db 0 diff --git a/maps/RuinsofAlphKabutoItemRoom.asm b/maps/RuinsofAlphKabutoItemRoom.asm index 67c4c8681..81ec02f41 100644 --- a/maps/RuinsofAlphKabutoItemRoom.asm +++ b/maps/RuinsofAlphKabutoItemRoom.asm @@ -32,10 +32,10 @@ RuinsofAlphKabutoItemRoom_MapEventHeader: .Warps: db 4 - warp_def $9, $3, 5, GROUP_RUINS_OF_ALPH_KABUTO_CHAMBER, MAP_RUINS_OF_ALPH_KABUTO_CHAMBER - warp_def $9, $4, 5, GROUP_RUINS_OF_ALPH_KABUTO_CHAMBER, MAP_RUINS_OF_ALPH_KABUTO_CHAMBER - warp_def $1, $3, 1, GROUP_RUINS_OF_ALPH_KABUTO_WORD_ROOM, MAP_RUINS_OF_ALPH_KABUTO_WORD_ROOM - warp_def $1, $4, 2, GROUP_RUINS_OF_ALPH_KABUTO_WORD_ROOM, MAP_RUINS_OF_ALPH_KABUTO_WORD_ROOM + warp_def $9, $3, 5, RUINS_OF_ALPH_KABUTO_CHAMBER + warp_def $9, $4, 5, RUINS_OF_ALPH_KABUTO_CHAMBER + warp_def $1, $3, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM + warp_def $1, $4, 2, RUINS_OF_ALPH_KABUTO_WORD_ROOM .XYTriggers: db 0 diff --git a/maps/RuinsofAlphKabutoWordRoom.asm b/maps/RuinsofAlphKabutoWordRoom.asm index 24b821c6d..8d754f657 100644 --- a/maps/RuinsofAlphKabutoWordRoom.asm +++ b/maps/RuinsofAlphKabutoWordRoom.asm @@ -11,9 +11,9 @@ RuinsofAlphKabutoWordRoom_MapEventHeader: .Warps: db 3 - warp_def $5, $9, 3, GROUP_RUINS_OF_ALPH_KABUTO_ITEM_ROOM, MAP_RUINS_OF_ALPH_KABUTO_ITEM_ROOM - warp_def $5, $a, 4, GROUP_RUINS_OF_ALPH_KABUTO_ITEM_ROOM, MAP_RUINS_OF_ALPH_KABUTO_ITEM_ROOM - warp_def $b, $11, 4, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER + warp_def $5, $9, 3, RUINS_OF_ALPH_KABUTO_ITEM_ROOM + warp_def $5, $a, 4, RUINS_OF_ALPH_KABUTO_ITEM_ROOM + warp_def $b, $11, 4, RUINS_OF_ALPH_INNER_CHAMBER .XYTriggers: db 0 diff --git a/maps/RuinsofAlphOmanyteChamber.asm b/maps/RuinsofAlphOmanyteChamber.asm index 39113d64a..ee80cfaa0 100644 --- a/maps/RuinsofAlphOmanyteChamber.asm +++ b/maps/RuinsofAlphOmanyteChamber.asm @@ -65,7 +65,7 @@ UnknownScript_0x58c36: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_OMANYTE_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_2 - domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 + domaptrigger RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 showemote EMOTE_SHOCK, $0, 15 changeblock $2, $2, $18 @@ -155,11 +155,11 @@ RuinsofAlphOmanyteChamber_MapEventHeader: .Warps: db 5 - warp_def $9, $3, 3, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE - warp_def $9, $4, 3, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE - warp_def $3, $3, 6, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER - warp_def $3, $4, 7, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER - warp_def $0, $4, 1, GROUP_RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, MAP_RUINS_OF_ALPH_OMANYTE_ITEM_ROOM + warp_def $9, $3, 3, RUINS_OF_ALPH_OUTSIDE + warp_def $9, $4, 3, RUINS_OF_ALPH_OUTSIDE + warp_def $3, $3, 6, RUINS_OF_ALPH_INNER_CHAMBER + warp_def $3, $4, 7, RUINS_OF_ALPH_INNER_CHAMBER + warp_def $0, $4, 1, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM .XYTriggers: db 0 diff --git a/maps/RuinsofAlphOmanyteItemRoom.asm b/maps/RuinsofAlphOmanyteItemRoom.asm index 2cc8a786b..e855d0aef 100644 --- a/maps/RuinsofAlphOmanyteItemRoom.asm +++ b/maps/RuinsofAlphOmanyteItemRoom.asm @@ -32,10 +32,10 @@ RuinsofAlphOmanyteItemRoom_MapEventHeader: .Warps: db 4 - warp_def $9, $3, 5, GROUP_RUINS_OF_ALPH_OMANYTE_CHAMBER, MAP_RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def $9, $4, 5, GROUP_RUINS_OF_ALPH_OMANYTE_CHAMBER, MAP_RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def $1, $3, 1, GROUP_RUINS_OF_ALPH_OMANYTE_WORD_ROOM, MAP_RUINS_OF_ALPH_OMANYTE_WORD_ROOM - warp_def $1, $4, 2, GROUP_RUINS_OF_ALPH_OMANYTE_WORD_ROOM, MAP_RUINS_OF_ALPH_OMANYTE_WORD_ROOM + warp_def $9, $3, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER + warp_def $9, $4, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER + warp_def $1, $3, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM + warp_def $1, $4, 2, RUINS_OF_ALPH_OMANYTE_WORD_ROOM .XYTriggers: db 0 diff --git a/maps/RuinsofAlphOmanyteWordRoom.asm b/maps/RuinsofAlphOmanyteWordRoom.asm index cfd469320..7600f41d9 100644 --- a/maps/RuinsofAlphOmanyteWordRoom.asm +++ b/maps/RuinsofAlphOmanyteWordRoom.asm @@ -11,9 +11,9 @@ RuinsofAlphOmanyteWordRoom_MapEventHeader: .Warps: db 3 - warp_def $7, $9, 3, GROUP_RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, MAP_RUINS_OF_ALPH_OMANYTE_ITEM_ROOM - warp_def $7, $a, 4, GROUP_RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, MAP_RUINS_OF_ALPH_OMANYTE_ITEM_ROOM - warp_def $d, $11, 6, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER + warp_def $7, $9, 3, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM + warp_def $7, $a, 4, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM + warp_def $d, $11, 6, RUINS_OF_ALPH_INNER_CHAMBER .XYTriggers: db 0 diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsofAlphOutside.asm index 510a2a66b..5f98205c1 100644 --- a/maps/RuinsofAlphOutside.asm +++ b/maps/RuinsofAlphOutside.asm @@ -64,7 +64,7 @@ UnknownScript_0x58044: disappear $3 stopfollow applymovement $0, MovementData_0x580c5 - domaptrigger GROUP_RUINS_OF_ALPH_RESEARCH_CENTER, MAP_RUINS_OF_ALPH_RESEARCH_CENTER, $1 + domaptrigger RUINS_OF_ALPH_RESEARCH_CENTER, $1 warpcheck end @@ -286,17 +286,17 @@ RuinsofAlphOutside_MapEventHeader: .Warps: db 11 - warp_def $11, $2, 1, GROUP_RUINS_OF_ALPH_HO_OH_CHAMBER, MAP_RUINS_OF_ALPH_HO_OH_CHAMBER - warp_def $7, $e, 1, GROUP_RUINS_OF_ALPH_KABUTO_CHAMBER, MAP_RUINS_OF_ALPH_KABUTO_CHAMBER - warp_def $1d, $2, 1, GROUP_RUINS_OF_ALPH_OMANYTE_CHAMBER, MAP_RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def $21, $10, 1, GROUP_RUINS_OF_ALPH_AERODACTYL_CHAMBER, MAP_RUINS_OF_ALPH_AERODACTYL_CHAMBER - warp_def $d, $a, 1, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER - warp_def $b, $11, 1, GROUP_RUINS_OF_ALPH_RESEARCH_CENTER, MAP_RUINS_OF_ALPH_RESEARCH_CENTER - warp_def $13, $6, 1, GROUP_UNION_CAVE_B1F, MAP_UNION_CAVE_B1F - warp_def $1b, $6, 2, GROUP_UNION_CAVE_B1F, MAP_UNION_CAVE_B1F - warp_def $5, $7, 3, GROUP_ROUTE_36_RUINS_OF_ALPH_GATE, MAP_ROUTE_36_RUINS_OF_ALPH_GATE - warp_def $14, $d, 1, GROUP_ROUTE_32_RUINS_OF_ALPH_GATE, MAP_ROUTE_32_RUINS_OF_ALPH_GATE - warp_def $15, $d, 2, GROUP_ROUTE_32_RUINS_OF_ALPH_GATE, MAP_ROUTE_32_RUINS_OF_ALPH_GATE + warp_def $11, $2, 1, RUINS_OF_ALPH_HO_OH_CHAMBER + warp_def $7, $e, 1, RUINS_OF_ALPH_KABUTO_CHAMBER + warp_def $1d, $2, 1, RUINS_OF_ALPH_OMANYTE_CHAMBER + warp_def $21, $10, 1, RUINS_OF_ALPH_AERODACTYL_CHAMBER + warp_def $d, $a, 1, RUINS_OF_ALPH_INNER_CHAMBER + warp_def $b, $11, 1, RUINS_OF_ALPH_RESEARCH_CENTER + warp_def $13, $6, 1, UNION_CAVE_B1F + warp_def $1b, $6, 2, UNION_CAVE_B1F + warp_def $5, $7, 3, ROUTE_36_RUINS_OF_ALPH_GATE + warp_def $14, $d, 1, ROUTE_32_RUINS_OF_ALPH_GATE + warp_def $15, $d, 2, ROUTE_32_RUINS_OF_ALPH_GATE .XYTriggers: db 2 diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsofAlphResearchCenter.asm index 121a624af..7c835e69c 100644 --- a/maps/RuinsofAlphResearchCenter.asm +++ b/maps/RuinsofAlphResearchCenter.asm @@ -398,8 +398,8 @@ RuinsofAlphResearchCenter_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 6, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE - warp_def $7, $3, 6, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE + warp_def $7, $2, 6, RUINS_OF_ALPH_OUTSIDE + warp_def $7, $3, 6, RUINS_OF_ALPH_OUTSIDE .XYTriggers: db 0 diff --git a/maps/SafariZoneBeta.asm b/maps/SafariZoneBeta.asm index ba0306348..2f5fbe2ab 100644 --- a/maps/SafariZoneBeta.asm +++ b/maps/SafariZoneBeta.asm @@ -11,8 +11,8 @@ SafariZoneBeta_MapEventHeader: .Warps: db 2 - warp_def $17, $9, 1, GROUP_SAFARI_ZONE_FUCHSIA_GATE_BETA, MAP_SAFARI_ZONE_FUCHSIA_GATE_BETA - warp_def $17, $a, 2, GROUP_SAFARI_ZONE_FUCHSIA_GATE_BETA, MAP_SAFARI_ZONE_FUCHSIA_GATE_BETA + warp_def $17, $9, 1, SAFARI_ZONE_FUCHSIA_GATE_BETA + warp_def $17, $a, 2, SAFARI_ZONE_FUCHSIA_GATE_BETA .XYTriggers: db 0 diff --git a/maps/SafariZoneFuchsiaGateBeta.asm b/maps/SafariZoneFuchsiaGateBeta.asm index 3118cc247..60b24d4e1 100644 --- a/maps/SafariZoneFuchsiaGateBeta.asm +++ b/maps/SafariZoneFuchsiaGateBeta.asm @@ -11,10 +11,10 @@ SafariZoneFuchsiaGateBeta_MapEventHeader: .Warps: db 4 - warp_def $0, $4, 1, GROUP_SAFARI_ZONE_BETA, MAP_SAFARI_ZONE_BETA - warp_def $0, $5, 2, GROUP_SAFARI_ZONE_BETA, MAP_SAFARI_ZONE_BETA - warp_def $7, $4, 7, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY - warp_def $7, $5, 7, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY + warp_def $0, $4, 1, SAFARI_ZONE_BETA + warp_def $0, $5, 2, SAFARI_ZONE_BETA + warp_def $7, $4, 7, FUCHSIA_CITY + warp_def $7, $5, 7, FUCHSIA_CITY .XYTriggers: db 0 diff --git a/maps/SafariZoneMainOffice.asm b/maps/SafariZoneMainOffice.asm index ec00d976c..a116519ba 100644 --- a/maps/SafariZoneMainOffice.asm +++ b/maps/SafariZoneMainOffice.asm @@ -11,8 +11,8 @@ SafariZoneMainOffice_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 2, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY - warp_def $7, $3, 2, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY + warp_def $7, $2, 2, FUCHSIA_CITY + warp_def $7, $3, 2, FUCHSIA_CITY .XYTriggers: db 0 diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index 19f296234..cbdd9f911 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -79,8 +79,8 @@ SafariZoneWardensHome_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 6, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY - warp_def $7, $3, 6, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY + warp_def $7, $2, 6, FUCHSIA_CITY + warp_def $7, $3, 6, FUCHSIA_CITY .XYTriggers: db 0 diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 947e3192b..9647363c3 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -263,21 +263,21 @@ SaffronCity_MapEventHeader: .Warps: db 15 - warp_def $3, $1a, 1, GROUP_FIGHTING_DOJO, MAP_FIGHTING_DOJO - warp_def $3, $22, 1, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $b, $19, 2, GROUP_SAFFRON_MART, MAP_SAFFRON_MART - warp_def $1d, $9, 1, GROUP_SAFFRON_POKECENTER_1F, MAP_SAFFRON_POKECENTER_1F - warp_def $1d, $1b, 1, GROUP_MR_PSYCHICS_HOUSE, MAP_MR_PSYCHICS_HOUSE - warp_def $3, $8, 2, GROUP_SAFFRON_TRAIN_STATION, MAP_SAFFRON_TRAIN_STATION - warp_def $15, $12, 1, GROUP_SILPH_CO_1F, MAP_SILPH_CO_1F - warp_def $b, $9, 1, GROUP_COPYCATS_HOUSE_1F, MAP_COPYCATS_HOUSE_1F - warp_def $3, $12, 3, GROUP_ROUTE_5_SAFFRON_CITY_GATE, MAP_ROUTE_5_SAFFRON_CITY_GATE - warp_def $18, $0, 3, GROUP_ROUTE_7_SAFFRON_GATE, MAP_ROUTE_7_SAFFRON_GATE - warp_def $19, $0, 4, GROUP_ROUTE_7_SAFFRON_GATE, MAP_ROUTE_7_SAFFRON_GATE - warp_def $21, $10, 1, GROUP_ROUTE_6_SAFFRON_GATE, MAP_ROUTE_6_SAFFRON_GATE - warp_def $21, $11, 2, GROUP_ROUTE_6_SAFFRON_GATE, MAP_ROUTE_6_SAFFRON_GATE - warp_def $16, $27, 1, GROUP_ROUTE_8_SAFFRON_GATE, MAP_ROUTE_8_SAFFRON_GATE - warp_def $17, $27, 2, GROUP_ROUTE_8_SAFFRON_GATE, MAP_ROUTE_8_SAFFRON_GATE + warp_def $3, $1a, 1, FIGHTING_DOJO + warp_def $3, $22, 1, SAFFRON_GYM + warp_def $b, $19, 2, SAFFRON_MART + warp_def $1d, $9, 1, SAFFRON_POKECENTER_1F + warp_def $1d, $1b, 1, MR_PSYCHICS_HOUSE + warp_def $3, $8, 2, SAFFRON_TRAIN_STATION + warp_def $15, $12, 1, SILPH_CO_1F + warp_def $b, $9, 1, COPYCATS_HOUSE_1F + warp_def $3, $12, 3, ROUTE_5_SAFFRON_CITY_GATE + warp_def $18, $0, 3, ROUTE_7_SAFFRON_GATE + warp_def $19, $0, 4, ROUTE_7_SAFFRON_GATE + warp_def $21, $10, 1, ROUTE_6_SAFFRON_GATE + warp_def $21, $11, 2, ROUTE_6_SAFFRON_GATE + warp_def $16, $27, 1, ROUTE_8_SAFFRON_GATE + warp_def $17, $27, 2, ROUTE_8_SAFFRON_GATE .XYTriggers: db 0 diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index dbb330478..d5df76706 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -288,38 +288,38 @@ SaffronGym_MapEventHeader: .Warps: db 32 - warp_def $11, $8, 2, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - warp_def $11, $9, 2, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - warp_def $f, $b, 18, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $f, $13, 19, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $b, $13, 20, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $b, $1, 21, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $3, $5, 22, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $5, $b, 23, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $f, $1, 24, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $3, $13, 25, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $11, $f, 26, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $11, $5, 27, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $9, $5, 28, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $3, $9, 29, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $9, $f, 30, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $5, $f, 31, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $5, $1, 32, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $11, $13, 3, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $9, $13, 4, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $9, $1, 5, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $5, $5, 6, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $3, $b, 7, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $11, $1, 8, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $5, $13, 9, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $f, $f, 10, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $f, $5, 11, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $b, $5, 12, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $5, $9, 13, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $b, $f, 14, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $3, $f, 15, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $3, $1, 16, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - warp_def $9, $b, 17, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM + warp_def $11, $8, 2, SAFFRON_CITY + warp_def $11, $9, 2, SAFFRON_CITY + warp_def $f, $b, 18, SAFFRON_GYM + warp_def $f, $13, 19, SAFFRON_GYM + warp_def $b, $13, 20, SAFFRON_GYM + warp_def $b, $1, 21, SAFFRON_GYM + warp_def $3, $5, 22, SAFFRON_GYM + warp_def $5, $b, 23, SAFFRON_GYM + warp_def $f, $1, 24, SAFFRON_GYM + warp_def $3, $13, 25, SAFFRON_GYM + warp_def $11, $f, 26, SAFFRON_GYM + warp_def $11, $5, 27, SAFFRON_GYM + warp_def $9, $5, 28, SAFFRON_GYM + warp_def $3, $9, 29, SAFFRON_GYM + warp_def $9, $f, 30, SAFFRON_GYM + warp_def $5, $f, 31, SAFFRON_GYM + warp_def $5, $1, 32, SAFFRON_GYM + warp_def $11, $13, 3, SAFFRON_GYM + warp_def $9, $13, 4, SAFFRON_GYM + warp_def $9, $1, 5, SAFFRON_GYM + warp_def $5, $5, 6, SAFFRON_GYM + warp_def $3, $b, 7, SAFFRON_GYM + warp_def $11, $1, 8, SAFFRON_GYM + warp_def $5, $13, 9, SAFFRON_GYM + warp_def $f, $f, 10, SAFFRON_GYM + warp_def $f, $5, 11, SAFFRON_GYM + warp_def $b, $5, 12, SAFFRON_GYM + warp_def $5, $9, 13, SAFFRON_GYM + warp_def $b, $f, 14, SAFFRON_GYM + warp_def $3, $f, 15, SAFFRON_GYM + warp_def $3, $1, 16, SAFFRON_GYM + warp_def $9, $b, 17, SAFFRON_GYM .XYTriggers: db 0 diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index df0e3c684..ed5a11e49 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -38,8 +38,8 @@ SaffronMart_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 3, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - warp_def $7, $3, 3, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY + warp_def $7, $2, 3, SAFFRON_CITY + warp_def $7, $3, 3, SAFFRON_CITY .XYTriggers: db 0 diff --git a/maps/SaffronPokeCenter1F.asm b/maps/SaffronPokeCenter1F.asm index e155cc53f..1649a6e2e 100644 --- a/maps/SaffronPokeCenter1F.asm +++ b/maps/SaffronPokeCenter1F.asm @@ -111,9 +111,9 @@ SaffronPokeCenter1F_MapEventHeader: .Warps: db 3 - warp_def $7, $3, 4, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - warp_def $7, $4, 4, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F + warp_def $7, $3, 4, SAFFRON_CITY + warp_def $7, $4, 4, SAFFRON_CITY + warp_def $7, $0, 1, POKECENTER_2F .XYTriggers: db 0 diff --git a/maps/SaffronPokeCenter2FBeta.asm b/maps/SaffronPokeCenter2FBeta.asm index a3c6d29ab..987236d0b 100644 --- a/maps/SaffronPokeCenter2FBeta.asm +++ b/maps/SaffronPokeCenter2FBeta.asm @@ -11,7 +11,7 @@ SaffronPokeCenter2FBeta_MapEventHeader: .Warps: db 1 - warp_def $7, $0, 3, GROUP_SAFFRON_POKECENTER_1F, MAP_SAFFRON_POKECENTER_1F + warp_def $7, $0, 3, SAFFRON_POKECENTER_1F .XYTriggers: db 0 diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index 6ba8972a9..e9cd86b13 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -217,10 +217,10 @@ SaffronTrainStation_MapEventHeader: .Warps: db 4 - warp_def $11, $8, 6, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - warp_def $11, $9, 6, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - warp_def $5, $6, 4, GROUP_GOLDENROD_MAGNET_TRAIN_STATION, MAP_GOLDENROD_MAGNET_TRAIN_STATION - warp_def $5, $b, 3, GROUP_GOLDENROD_MAGNET_TRAIN_STATION, MAP_GOLDENROD_MAGNET_TRAIN_STATION + warp_def $11, $8, 6, SAFFRON_CITY + warp_def $11, $9, 6, SAFFRON_CITY + warp_def $5, $6, 4, GOLDENROD_MAGNET_TRAIN_STATION + warp_def $5, $b, 3, GOLDENROD_MAGNET_TRAIN_STATION .XYTriggers: db 1 diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index 29bcd8bca..ebfb1240e 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -161,7 +161,7 @@ SeafoamGym_MapEventHeader: .Warps: db 1 - warp_def $5, $5, 1, GROUP_ROUTE_20, MAP_ROUTE_20 + warp_def $5, $5, 1, ROUTE_20 .XYTriggers: db 0 diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index 8107ce95e..96fdffb85 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -57,8 +57,8 @@ SilphCo1F_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 7, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - warp_def $7, $3, 7, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY + warp_def $7, $2, 7, SAFFRON_CITY + warp_def $7, $3, 7, SAFFRON_CITY .XYTriggers: db 0 diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index 2a1cd68f3..080c8ed9b 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -17,8 +17,8 @@ SilverCaveItemRooms_MapEventHeader: .Warps: db 2 - warp_def $3, $d, 3, GROUP_SILVER_CAVE_ROOM_2, MAP_SILVER_CAVE_ROOM_2 - warp_def $f, $7, 4, GROUP_SILVER_CAVE_ROOM_2, MAP_SILVER_CAVE_ROOM_2 + warp_def $3, $d, 3, SILVER_CAVE_ROOM_2 + warp_def $f, $7, 4, SILVER_CAVE_ROOM_2 .XYTriggers: db 0 diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 84520d6ba..51718ba61 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -31,8 +31,8 @@ SilverCaveOutside_MapEventHeader: .Warps: db 2 - warp_def $13, $17, 1, GROUP_SILVER_CAVE_POKECENTER_1F, MAP_SILVER_CAVE_POKECENTER_1F - warp_def $b, $12, 1, GROUP_SILVER_CAVE_ROOM_1, MAP_SILVER_CAVE_ROOM_1 + warp_def $13, $17, 1, SILVER_CAVE_POKECENTER_1F + warp_def $b, $12, 1, SILVER_CAVE_ROOM_1 .XYTriggers: db 0 diff --git a/maps/SilverCavePokeCenter1F.asm b/maps/SilverCavePokeCenter1F.asm index 1887ce73b..5498df670 100644 --- a/maps/SilverCavePokeCenter1F.asm +++ b/maps/SilverCavePokeCenter1F.asm @@ -31,9 +31,9 @@ SilverCavePokeCenter1F_MapEventHeader: .Warps: db 3 - warp_def $7, $3, 1, GROUP_SILVER_CAVE_OUTSIDE, MAP_SILVER_CAVE_OUTSIDE - warp_def $7, $4, 1, GROUP_SILVER_CAVE_OUTSIDE, MAP_SILVER_CAVE_OUTSIDE - warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F + warp_def $7, $3, 1, SILVER_CAVE_OUTSIDE + warp_def $7, $4, 1, SILVER_CAVE_OUTSIDE + warp_def $7, $0, 1, POKECENTER_2F .XYTriggers: db 0 diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 28cc88f41..a75b7f9fd 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -31,8 +31,8 @@ SilverCaveRoom1_MapEventHeader: .Warps: db 2 - warp_def $21, $9, 2, GROUP_SILVER_CAVE_OUTSIDE, MAP_SILVER_CAVE_OUTSIDE - warp_def $1, $f, 1, GROUP_SILVER_CAVE_ROOM_2, MAP_SILVER_CAVE_ROOM_2 + warp_def $21, $9, 2, SILVER_CAVE_OUTSIDE + warp_def $1, $f, 1, SILVER_CAVE_ROOM_2 .XYTriggers: db 0 diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index 39c128e8b..be515d209 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -24,10 +24,10 @@ SilverCaveRoom2_MapEventHeader: .Warps: db 4 - warp_def $1f, $11, 2, GROUP_SILVER_CAVE_ROOM_1, MAP_SILVER_CAVE_ROOM_1 - warp_def $5, $b, 1, GROUP_SILVER_CAVE_ROOM_3, MAP_SILVER_CAVE_ROOM_3 - warp_def $15, $d, 1, GROUP_SILVER_CAVE_ITEM_ROOMS, MAP_SILVER_CAVE_ITEM_ROOMS - warp_def $3, $17, 2, GROUP_SILVER_CAVE_ITEM_ROOMS, MAP_SILVER_CAVE_ITEM_ROOMS + warp_def $1f, $11, 2, SILVER_CAVE_ROOM_1 + warp_def $5, $b, 1, SILVER_CAVE_ROOM_3 + warp_def $15, $d, 1, SILVER_CAVE_ITEM_ROOMS + warp_def $3, $17, 2, SILVER_CAVE_ITEM_ROOMS .XYTriggers: db 0 diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index c1035849e..5898ed55e 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -53,7 +53,7 @@ SilverCaveRoom3_MapEventHeader: .Warps: db 1 - warp_def $21, $9, 2, GROUP_SILVER_CAVE_ROOM_2, MAP_SILVER_CAVE_ROOM_2 + warp_def $21, $9, 2, SILVER_CAVE_ROOM_2 .XYTriggers: db 0 diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 971e3e30a..31dc8ffe3 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -46,7 +46,7 @@ GruntM1Script: loadmovesprites setevent EVENT_CLEARED_SLOWPOKE_WELL variablesprite SPRITE_AZALEA_ROCKET, SPRITE_SILVER - domaptrigger GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN, $1 + domaptrigger AZALEA_TOWN, $1 clearevent EVENT_ILEX_FOREST_APPRENTICE clearevent EVENT_ILEX_FOREST_FARFETCHD setevent EVENT_CHARCOAL_KILN_FARFETCH_D @@ -59,7 +59,7 @@ GruntM1Script: special FadeBlackBGMap special HealParty pause 15 - warp GROUP_KURTS_HOUSE, MAP_KURTS_HOUSE, $3, $3 + warp KURTS_HOUSE, $3, $3 end TrainerGruntM2: @@ -315,8 +315,8 @@ SlowpokeWellB1F_MapEventHeader: .Warps: db 2 - warp_def $f, $11, 6, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN - warp_def $b, $7, 1, GROUP_SLOWPOKE_WELL_B2F, MAP_SLOWPOKE_WELL_B2F + warp_def $f, $11, 6, AZALEA_TOWN + warp_def $b, $7, 1, SLOWPOKE_WELL_B2F .XYTriggers: db 0 diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index ae74443ec..25b3a4178 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -63,7 +63,7 @@ SlowpokeWellB2F_MapEventHeader: .Warps: db 1 - warp_def $b, $9, 2, GROUP_SLOWPOKE_WELL_B1F, MAP_SLOWPOKE_WELL_B1F + warp_def $b, $9, 2, SLOWPOKE_WELL_B1F .XYTriggers: db 0 diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index 6f3aeca87..e78d758d4 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -72,8 +72,8 @@ SoulHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $4, 6, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN - warp_def $7, $5, 6, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN + warp_def $7, $4, 6, LAVENDER_TOWN + warp_def $7, $5, 6, LAVENDER_TOWN .XYTriggers: db 0 diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 82b1e33b9..d77d5869a 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -100,11 +100,11 @@ SproutTower1F_MapEventHeader: .Warps: db 5 - warp_def $f, $9, 7, GROUP_VIOLET_CITY, MAP_VIOLET_CITY - warp_def $f, $a, 7, GROUP_VIOLET_CITY, MAP_VIOLET_CITY - warp_def $4, $6, 1, GROUP_SPROUT_TOWER_2F, MAP_SPROUT_TOWER_2F - warp_def $6, $2, 2, GROUP_SPROUT_TOWER_2F, MAP_SPROUT_TOWER_2F - warp_def $3, $11, 3, GROUP_SPROUT_TOWER_2F, MAP_SPROUT_TOWER_2F + warp_def $f, $9, 7, VIOLET_CITY + warp_def $f, $a, 7, VIOLET_CITY + warp_def $4, $6, 1, SPROUT_TOWER_2F + warp_def $6, $2, 2, SPROUT_TOWER_2F + warp_def $3, $11, 3, SPROUT_TOWER_2F .XYTriggers: db 0 diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index bcf59da24..c76bcb251 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -85,10 +85,10 @@ SproutTower2F_MapEventHeader: .Warps: db 4 - warp_def $4, $6, 3, GROUP_SPROUT_TOWER_1F, MAP_SPROUT_TOWER_1F - warp_def $6, $2, 4, GROUP_SPROUT_TOWER_1F, MAP_SPROUT_TOWER_1F - warp_def $3, $11, 5, GROUP_SPROUT_TOWER_1F, MAP_SPROUT_TOWER_1F - warp_def $e, $a, 1, GROUP_SPROUT_TOWER_3F, MAP_SPROUT_TOWER_3F + warp_def $4, $6, 3, SPROUT_TOWER_1F + warp_def $6, $2, 4, SPROUT_TOWER_1F + warp_def $3, $11, 5, SPROUT_TOWER_1F + warp_def $e, $a, 1, SPROUT_TOWER_3F .XYTriggers: db 0 diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 148ef23a6..6ee4850fa 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -328,7 +328,7 @@ SproutTower3F_MapEventHeader: .Warps: db 1 - warp_def $e, $a, 4, GROUP_SPROUT_TOWER_2F, MAP_SPROUT_TOWER_2F + warp_def $e, $a, 4, SPROUT_TOWER_2F .XYTriggers: db 1 diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 32582ccc7..e637dba1b 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -730,10 +730,10 @@ TeamRocketBaseB1F_MapEventHeader: .Warps: db 4 - warp_def $2, $1b, 3, GROUP_MAHOGANY_MART_1F, MAP_MAHOGANY_MART_1F - warp_def $e, $3, 1, GROUP_TEAM_ROCKET_BASE_B2F, MAP_TEAM_ROCKET_BASE_B2F - warp_def $f, $5, 4, GROUP_TEAM_ROCKET_BASE_B1F, MAP_TEAM_ROCKET_BASE_B1F - warp_def $2, $19, 3, GROUP_TEAM_ROCKET_BASE_B1F, MAP_TEAM_ROCKET_BASE_B1F + 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 .XYTriggers: db 30 diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 701173fba..5bd17623d 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -906,11 +906,11 @@ TeamRocketBaseB2F_MapEventHeader: .Warps: db 5 - warp_def $e, $3, 2, GROUP_TEAM_ROCKET_BASE_B1F, MAP_TEAM_ROCKET_BASE_B1F - warp_def $2, $3, 1, GROUP_TEAM_ROCKET_BASE_B3F, MAP_TEAM_ROCKET_BASE_B3F - warp_def $2, $1b, 2, GROUP_TEAM_ROCKET_BASE_B3F, MAP_TEAM_ROCKET_BASE_B3F - warp_def $6, $3, 3, GROUP_TEAM_ROCKET_BASE_B3F, MAP_TEAM_ROCKET_BASE_B3F - warp_def $e, $1b, 4, GROUP_TEAM_ROCKET_BASE_B3F, MAP_TEAM_ROCKET_BASE_B3F + warp_def $e, $3, 2, TEAM_ROCKET_BASE_B1F + warp_def $2, $3, 1, TEAM_ROCKET_BASE_B3F + warp_def $2, $1b, 2, TEAM_ROCKET_BASE_B3F + warp_def $6, $3, 3, TEAM_ROCKET_BASE_B3F + warp_def $e, $1b, 4, TEAM_ROCKET_BASE_B3F .XYTriggers: db 9 diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index f0a2519ef..469d3ec0c 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -561,10 +561,10 @@ TeamRocketBaseB3F_MapEventHeader: .Warps: db 4 - warp_def $2, $3, 2, GROUP_TEAM_ROCKET_BASE_B2F, MAP_TEAM_ROCKET_BASE_B2F - warp_def $2, $1b, 3, GROUP_TEAM_ROCKET_BASE_B2F, MAP_TEAM_ROCKET_BASE_B2F - warp_def $6, $3, 4, GROUP_TEAM_ROCKET_BASE_B2F, MAP_TEAM_ROCKET_BASE_B2F - warp_def $e, $1b, 5, GROUP_TEAM_ROCKET_BASE_B2F, MAP_TEAM_ROCKET_BASE_B2F + warp_def $2, $3, 2, TEAM_ROCKET_BASE_B2F + warp_def $2, $1b, 3, TEAM_ROCKET_BASE_B2F + warp_def $6, $3, 4, TEAM_ROCKET_BASE_B2F + warp_def $e, $1b, 5, TEAM_ROCKET_BASE_B2F .XYTriggers: db 3 diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index 8fce13350..b38d7afd2 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -34,7 +34,7 @@ TimeCapsule_SetWhichChris: TimeCapsule_Initialize: dotrigger $1 - domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $3 + domaptrigger POKECENTER_2F, $3 end MapTimeCapsuleSignpost1Script: @@ -60,8 +60,8 @@ TimeCapsule_MapEventHeader: .Warps: db 2 - warp_def $7, $4, 4, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - warp_def $7, $5, 4, GROUP_POKECENTER_2F, MAP_POKECENTER_2F + warp_def $7, $4, 4, POKECENTER_2F + warp_def $7, $5, 4, POKECENTER_2F .XYTriggers: db 0 diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index e051f844e..9d534ab64 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -119,11 +119,11 @@ UnknownScript_0x1850d7: disappear $2 setevent EVENT_FOUGHT_SUICUNE setevent EVENT_SAW_SUICUNE_ON_ROUTE_42 - domaptrigger GROUP_ROUTE_42, MAP_ROUTE_42, $0 + domaptrigger ROUTE_42, $0 setevent EVENT_SAW_SUICUNE_ON_ROUTE_36 - domaptrigger GROUP_ROUTE_36, MAP_ROUTE_36, $0 + domaptrigger ROUTE_36, $0 setevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY - domaptrigger GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY, $0 + domaptrigger CIANWOOD_CITY, $0 dotrigger $1 clearevent EVENT_SET_WHEN_FOUGHT_HO_OH returnafterbattle @@ -522,9 +522,9 @@ TinTower1F_MapEventHeader: .Warps: db 3 - warp_def $f, $9, 12, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - warp_def $f, $a, 12, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - warp_def $2, $a, 2, GROUP_TIN_TOWER_2F, MAP_TIN_TOWER_2F + warp_def $f, $9, 12, ECRUTEAK_CITY + warp_def $f, $a, 12, ECRUTEAK_CITY + warp_def $2, $a, 2, TIN_TOWER_2F .XYTriggers: db 0 diff --git a/maps/TinTower2F.asm b/maps/TinTower2F.asm index 254b8e930..95c9724ea 100644 --- a/maps/TinTower2F.asm +++ b/maps/TinTower2F.asm @@ -11,8 +11,8 @@ TinTower2F_MapEventHeader: .Warps: db 2 - warp_def $e, $a, 1, GROUP_TIN_TOWER_3F, MAP_TIN_TOWER_3F - warp_def $2, $a, 3, GROUP_TIN_TOWER_1F, MAP_TIN_TOWER_1F + warp_def $e, $a, 1, TIN_TOWER_3F + warp_def $2, $a, 3, TIN_TOWER_1F .XYTriggers: db 0 diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index 705da3cb4..087959357 100644 --- a/maps/TinTower3F.asm +++ b/maps/TinTower3F.asm @@ -14,8 +14,8 @@ TinTower3F_MapEventHeader: .Warps: db 2 - warp_def $e, $a, 1, GROUP_TIN_TOWER_2F, MAP_TIN_TOWER_2F - warp_def $2, $10, 2, GROUP_TIN_TOWER_4F, MAP_TIN_TOWER_4F + warp_def $e, $a, 1, TIN_TOWER_2F + warp_def $2, $10, 2, TIN_TOWER_4F .XYTriggers: db 0 diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index a514ca86d..167380eb4 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -24,10 +24,10 @@ TinTower4F_MapEventHeader: .Warps: db 4 - warp_def $4, $2, 2, GROUP_TIN_TOWER_5F, MAP_TIN_TOWER_5F - warp_def $2, $10, 2, GROUP_TIN_TOWER_3F, MAP_TIN_TOWER_3F - warp_def $e, $2, 3, GROUP_TIN_TOWER_5F, MAP_TIN_TOWER_5F - warp_def $f, $11, 4, GROUP_TIN_TOWER_5F, MAP_TIN_TOWER_5F + warp_def $4, $2, 2, TIN_TOWER_5F + warp_def $2, $10, 2, TIN_TOWER_3F + warp_def $e, $2, 3, TIN_TOWER_5F + warp_def $f, $11, 4, TIN_TOWER_5F .XYTriggers: db 0 diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index 06e56eaf7..57159095e 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -22,10 +22,10 @@ TinTower5F_MapEventHeader: .Warps: db 4 - warp_def $f, $b, 2, GROUP_TIN_TOWER_6F, MAP_TIN_TOWER_6F - warp_def $4, $2, 1, GROUP_TIN_TOWER_4F, MAP_TIN_TOWER_4F - warp_def $e, $2, 3, GROUP_TIN_TOWER_4F, MAP_TIN_TOWER_4F - warp_def $f, $11, 4, GROUP_TIN_TOWER_4F, MAP_TIN_TOWER_4F + warp_def $f, $b, 2, TIN_TOWER_6F + warp_def $4, $2, 1, TIN_TOWER_4F + warp_def $e, $2, 3, TIN_TOWER_4F + warp_def $f, $11, 4, TIN_TOWER_4F .XYTriggers: db 0 diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm index 4fb1758a5..15e6c4d4d 100644 --- a/maps/TinTower6F.asm +++ b/maps/TinTower6F.asm @@ -14,8 +14,8 @@ TinTower6F_MapEventHeader: .Warps: db 2 - warp_def $9, $3, 1, GROUP_TIN_TOWER_7F, MAP_TIN_TOWER_7F - warp_def $f, $b, 1, GROUP_TIN_TOWER_5F, MAP_TIN_TOWER_5F + warp_def $9, $3, 1, TIN_TOWER_7F + warp_def $f, $b, 1, TIN_TOWER_5F .XYTriggers: db 0 diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index ceb4494b5..ba5a228d8 100644 --- a/maps/TinTower7F.asm +++ b/maps/TinTower7F.asm @@ -14,11 +14,11 @@ TinTower7F_MapEventHeader: .Warps: db 5 - warp_def $9, $3, 1, GROUP_TIN_TOWER_6F, MAP_TIN_TOWER_6F - warp_def $f, $a, 1, GROUP_TIN_TOWER_8F, MAP_TIN_TOWER_8F - warp_def $7, $c, 4, GROUP_TIN_TOWER_7F, MAP_TIN_TOWER_7F - warp_def $3, $8, 3, GROUP_TIN_TOWER_7F, MAP_TIN_TOWER_7F - warp_def $9, $6, 5, GROUP_TIN_TOWER_9F, MAP_TIN_TOWER_9F + warp_def $9, $3, 1, TIN_TOWER_6F + warp_def $f, $a, 1, TIN_TOWER_8F + warp_def $7, $c, 4, TIN_TOWER_7F + warp_def $3, $8, 3, TIN_TOWER_7F + warp_def $9, $6, 5, TIN_TOWER_9F .XYTriggers: db 0 diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index 15da97cf2..fd35904ec 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -20,12 +20,12 @@ TinTower8F_MapEventHeader: .Warps: db 6 - warp_def $5, $2, 2, GROUP_TIN_TOWER_7F, MAP_TIN_TOWER_7F - warp_def $b, $2, 1, GROUP_TIN_TOWER_9F, MAP_TIN_TOWER_9F - warp_def $7, $10, 2, GROUP_TIN_TOWER_9F, MAP_TIN_TOWER_9F - warp_def $3, $a, 3, GROUP_TIN_TOWER_9F, MAP_TIN_TOWER_9F - warp_def $f, $e, 6, GROUP_TIN_TOWER_9F, MAP_TIN_TOWER_9F - warp_def $9, $6, 7, GROUP_TIN_TOWER_9F, MAP_TIN_TOWER_9F + warp_def $5, $2, 2, TIN_TOWER_7F + warp_def $b, $2, 1, TIN_TOWER_9F + warp_def $7, $10, 2, TIN_TOWER_9F + warp_def $3, $a, 3, TIN_TOWER_9F + warp_def $f, $e, 6, TIN_TOWER_9F + warp_def $9, $6, 7, TIN_TOWER_9F .XYTriggers: db 0 diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index a27114998..60cb34373 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -22,13 +22,13 @@ TinTower9F_MapEventHeader: .Warps: db 7 - warp_def $3, $c, 2, GROUP_TIN_TOWER_8F, MAP_TIN_TOWER_8F - warp_def $5, $2, 3, GROUP_TIN_TOWER_8F, MAP_TIN_TOWER_8F - warp_def $7, $c, 4, GROUP_TIN_TOWER_8F, MAP_TIN_TOWER_8F - warp_def $9, $7, 1, GROUP_TIN_TOWER_ROOF, MAP_TIN_TOWER_ROOF - warp_def $7, $10, 5, GROUP_TIN_TOWER_7F, MAP_TIN_TOWER_7F - warp_def $d, $6, 5, GROUP_TIN_TOWER_8F, MAP_TIN_TOWER_8F - warp_def $d, $8, 6, GROUP_TIN_TOWER_8F, MAP_TIN_TOWER_8F + warp_def $3, $c, 2, TIN_TOWER_8F + warp_def $5, $2, 3, TIN_TOWER_8F + warp_def $7, $c, 4, TIN_TOWER_8F + warp_def $9, $7, 1, TIN_TOWER_ROOF + warp_def $7, $10, 5, TIN_TOWER_7F + warp_def $d, $6, 5, TIN_TOWER_8F + warp_def $d, $8, 6, TIN_TOWER_8F .XYTriggers: db 0 diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index 1d3aef3bd..a8a1f1942 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -50,7 +50,7 @@ TinTowerRoof_MapEventHeader: .Warps: db 1 - warp_def $d, $9, 4, GROUP_TIN_TOWER_9F, MAP_TIN_TOWER_9F + warp_def $d, $9, 4, TIN_TOWER_9F .XYTriggers: db 0 diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index ee3a16e6b..b6e82debf 100644 --- a/maps/TohjoFalls.asm +++ b/maps/TohjoFalls.asm @@ -14,8 +14,8 @@ TohjoFalls_MapEventHeader: .Warps: db 2 - warp_def $f, $d, 2, GROUP_ROUTE_27, MAP_ROUTE_27 - warp_def $f, $19, 3, GROUP_ROUTE_27, MAP_ROUTE_27 + warp_def $f, $d, 2, ROUTE_27 + warp_def $f, $19, 3, ROUTE_27 .XYTriggers: db 0 diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 6e3db4772..0cffc5c74 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -34,7 +34,7 @@ TradeCenter_SetWhichChris: TradeCenter_Initialize: dotrigger $1 - domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $1 + domaptrigger POKECENTER_2F, $1 end MapTradeCenterSignpost1Script: @@ -60,8 +60,8 @@ TradeCenter_MapEventHeader: .Warps: db 2 - warp_def $7, $4, 2, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - warp_def $7, $5, 2, GROUP_POKECENTER_2F, MAP_POKECENTER_2F + warp_def $7, $4, 2, POKECENTER_2F + warp_def $7, $5, 2, POKECENTER_2F .XYTriggers: db 0 diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index e18ed7b90..9cde87651 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -136,9 +136,9 @@ TrainerHouse1F_MapEventHeader: .Warps: db 3 - warp_def $d, $2, 3, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY - warp_def $d, $3, 3, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY - warp_def $2, $8, 1, GROUP_TRAINER_HOUSE_B1F, MAP_TRAINER_HOUSE_B1F + warp_def $d, $2, 3, VIRIDIAN_CITY + warp_def $d, $3, 3, VIRIDIAN_CITY + warp_def $2, $8, 1, TRAINER_HOUSE_B1F .XYTriggers: db 0 diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index 1be37c9aa..184e09120 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -173,7 +173,7 @@ TrainerHouseB1F_MapEventHeader: .Warps: db 1 - warp_def $4, $9, 3, GROUP_TRAINER_HOUSE_1F, MAP_TRAINER_HOUSE_1F + warp_def $4, $9, 3, TRAINER_HOUSE_1F .XYTriggers: db 1 diff --git a/maps/Underground.asm b/maps/Underground.asm index e2672a95b..d021507f7 100644 --- a/maps/Underground.asm +++ b/maps/Underground.asm @@ -19,8 +19,8 @@ Underground_MapEventHeader: .Warps: db 2 - warp_def $2, $3, 3, GROUP_ROUTE_5_UNDERGROUND_ENTRANCE, MAP_ROUTE_5_UNDERGROUND_ENTRANCE - warp_def $18, $3, 3, GROUP_ROUTE_6_UNDERGROUND_ENTRANCE, MAP_ROUTE_6_UNDERGROUND_ENTRANCE + warp_def $2, $3, 3, ROUTE_5_UNDERGROUND_ENTRANCE + warp_def $18, $3, 3, ROUTE_6_UNDERGROUND_ENTRANCE .XYTriggers: db 0 diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index 14273808b..2c9ccd2f2 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -119,7 +119,7 @@ UnknownScript_0x7cad4: checkevent EVENT_RIVAL_BURNED_TOWER iftrue UnknownScript_0x7cae1 setevent EVENT_RIVAL_BURNED_TOWER - domaptrigger GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F, $1 + domaptrigger BURNED_TOWER_1F, $1 UnknownScript_0x7cae1: playmusic MUSIC_RIVAL_ENCOUNTER loadfont @@ -897,15 +897,15 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader: .Warps: db 9 - warp_def $3, $17, 6, GROUP_WAREHOUSE_ENTRANCE, MAP_WAREHOUSE_ENTRANCE - warp_def $a, $16, 1, GROUP_UNDERGROUND_WAREHOUSE, MAP_UNDERGROUND_WAREHOUSE - warp_def $a, $17, 2, GROUP_UNDERGROUND_WAREHOUSE, MAP_UNDERGROUND_WAREHOUSE - warp_def $19, $5, 2, GROUP_WAREHOUSE_ENTRANCE, MAP_WAREHOUSE_ENTRANCE - warp_def $1d, $4, 14, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - warp_def $1d, $5, 14, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - warp_def $19, $15, 1, GROUP_WAREHOUSE_ENTRANCE, MAP_WAREHOUSE_ENTRANCE - warp_def $1d, $14, 13, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - warp_def $1d, $15, 13, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY + warp_def $3, $17, 6, WAREHOUSE_ENTRANCE + warp_def $a, $16, 1, UNDERGROUND_WAREHOUSE + warp_def $a, $17, 2, UNDERGROUND_WAREHOUSE + warp_def $19, $5, 2, WAREHOUSE_ENTRANCE + warp_def $1d, $4, 14, GOLDENROD_CITY + warp_def $1d, $5, 14, GOLDENROD_CITY + warp_def $19, $15, 1, WAREHOUSE_ENTRANCE + warp_def $1d, $14, 13, GOLDENROD_CITY + warp_def $1d, $15, 13, GOLDENROD_CITY .XYTriggers: db 2 diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index 7f036735b..2fe008230 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -210,9 +210,9 @@ UndergroundWarehouse_MapEventHeader: .Warps: db 3 - warp_def $c, $2, 2, GROUP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, MAP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES - warp_def $c, $3, 3, GROUP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, MAP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES - warp_def $2, $11, 1, GROUP_GOLDENROD_DEPT_STORE_B1F, MAP_GOLDENROD_DEPT_STORE_B1F + warp_def $c, $2, 2, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES + warp_def $c, $3, 3, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES + warp_def $2, $11, 1, GOLDENROD_DEPT_STORE_B1F .XYTriggers: db 0 diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index 89bcb27ae..4d6cf0f1c 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -194,10 +194,10 @@ UnionCave1F_MapEventHeader: .Warps: db 4 - warp_def $13, $5, 3, GROUP_UNION_CAVE_B1F, MAP_UNION_CAVE_B1F - warp_def $21, $3, 4, GROUP_UNION_CAVE_B1F, MAP_UNION_CAVE_B1F - warp_def $1f, $11, 1, GROUP_ROUTE_33, MAP_ROUTE_33 - warp_def $3, $11, 4, GROUP_ROUTE_32, MAP_ROUTE_32 + warp_def $13, $5, 3, UNION_CAVE_B1F + warp_def $21, $3, 4, UNION_CAVE_B1F + warp_def $1f, $11, 1, ROUTE_33 + warp_def $3, $11, 4, ROUTE_32 .XYTriggers: db 0 diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index 2e23e9072..14c1579b5 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -149,11 +149,11 @@ UnionCaveB1F_MapEventHeader: .Warps: db 5 - warp_def $3, $3, 7, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE - warp_def $b, $3, 8, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE - warp_def $13, $7, 1, GROUP_UNION_CAVE_1F, MAP_UNION_CAVE_1F - warp_def $21, $3, 2, GROUP_UNION_CAVE_1F, MAP_UNION_CAVE_1F - warp_def $1f, $11, 1, GROUP_UNION_CAVE_B2F, MAP_UNION_CAVE_B2F + warp_def $3, $3, 7, RUINS_OF_ALPH_OUTSIDE + warp_def $b, $3, 8, RUINS_OF_ALPH_OUTSIDE + warp_def $13, $7, 1, UNION_CAVE_1F + warp_def $21, $3, 2, UNION_CAVE_1F + warp_def $1f, $11, 1, UNION_CAVE_B2F .XYTriggers: db 0 diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index b97276ce7..60ece9a2a 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -142,7 +142,7 @@ UnionCaveB2F_MapEventHeader: .Warps: db 1 - warp_def $3, $5, 5, GROUP_UNION_CAVE_B1F, MAP_UNION_CAVE_B1F + warp_def $3, $5, 5, UNION_CAVE_B1F .XYTriggers: db 0 diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 7b5a63afd..4a3e2df42 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -267,16 +267,16 @@ VermilionCity_MapEventHeader: .Warps: db 10 - warp_def $5, $5, 1, GROUP_VERMILION_HOUSE_FISHING_SPEECH_HOUSE, MAP_VERMILION_HOUSE_FISHING_SPEECH_HOUSE - warp_def $5, $9, 1, GROUP_VERMILION_POKECENTER_1F, MAP_VERMILION_POKECENTER_1F - warp_def $d, $7, 1, GROUP_POKEMON_FAN_CLUB, MAP_POKEMON_FAN_CLUB - warp_def $d, $d, 1, GROUP_VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, MAP_VERMILION_MAGNET_TRAIN_SPEECH_HOUSE - warp_def $d, $15, 2, GROUP_VERMILION_MART, MAP_VERMILION_MART - warp_def $11, $15, 1, GROUP_VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, MAP_VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE - warp_def $13, $a, 1, GROUP_VERMILION_GYM, MAP_VERMILION_GYM - warp_def $1f, $13, 1, GROUP_VERMILION_PORT_PASSAGE, MAP_VERMILION_PORT_PASSAGE - warp_def $1f, $14, 2, GROUP_VERMILION_PORT_PASSAGE, MAP_VERMILION_PORT_PASSAGE - warp_def $7, $22, 1, GROUP_DIGLETTS_CAVE, MAP_DIGLETTS_CAVE + warp_def $5, $5, 1, VERMILION_HOUSE_FISHING_SPEECH_HOUSE + warp_def $5, $9, 1, VERMILION_POKECENTER_1F + warp_def $d, $7, 1, POKEMON_FAN_CLUB + warp_def $d, $d, 1, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE + warp_def $d, $15, 2, VERMILION_MART + warp_def $11, $15, 1, VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE + warp_def $13, $a, 1, VERMILION_GYM + warp_def $1f, $13, 1, VERMILION_PORT_PASSAGE + warp_def $1f, $14, 2, VERMILION_PORT_PASSAGE + warp_def $7, $22, 1, DIGLETTS_CAVE .XYTriggers: db 0 diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 4b637c1d3..b73d55ccd 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -259,8 +259,8 @@ VermilionGym_MapEventHeader: .Warps: db 2 - warp_def $11, $4, 7, GROUP_VERMILION_CITY, MAP_VERMILION_CITY - warp_def $11, $5, 7, GROUP_VERMILION_CITY, MAP_VERMILION_CITY + warp_def $11, $4, 7, VERMILION_CITY + warp_def $11, $5, 7, VERMILION_CITY .XYTriggers: db 0 diff --git a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm index 2fa1fc65f..e1aceaa84 100644 --- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm +++ b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm @@ -23,8 +23,8 @@ VermilionHouseDiglettsCaveSpeechHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 6, GROUP_VERMILION_CITY, MAP_VERMILION_CITY - warp_def $7, $3, 6, GROUP_VERMILION_CITY, MAP_VERMILION_CITY + warp_def $7, $2, 6, VERMILION_CITY + warp_def $7, $3, 6, VERMILION_CITY .XYTriggers: db 0 diff --git a/maps/VermilionHouseFishingSpeechHouse.asm b/maps/VermilionHouseFishingSpeechHouse.asm index 48c4c8cbb..a9feb5910 100644 --- a/maps/VermilionHouseFishingSpeechHouse.asm +++ b/maps/VermilionHouseFishingSpeechHouse.asm @@ -53,8 +53,8 @@ VermilionHouseFishingSpeechHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 1, GROUP_VERMILION_CITY, MAP_VERMILION_CITY - warp_def $7, $3, 1, GROUP_VERMILION_CITY, MAP_VERMILION_CITY + warp_def $7, $2, 1, VERMILION_CITY + warp_def $7, $3, 1, VERMILION_CITY .XYTriggers: db 0 diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index d76778627..c360406dd 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -35,8 +35,8 @@ VermilionMagnetTrainSpeechHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 4, GROUP_VERMILION_CITY, MAP_VERMILION_CITY - warp_def $7, $3, 4, GROUP_VERMILION_CITY, MAP_VERMILION_CITY + warp_def $7, $2, 4, VERMILION_CITY + warp_def $7, $3, 4, VERMILION_CITY .XYTriggers: db 0 diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index 2054323ff..e41ea9e9a 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -37,8 +37,8 @@ VermilionMart_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 5, GROUP_VERMILION_CITY, MAP_VERMILION_CITY - warp_def $7, $3, 5, GROUP_VERMILION_CITY, MAP_VERMILION_CITY + warp_def $7, $2, 5, VERMILION_CITY + warp_def $7, $3, 5, VERMILION_CITY .XYTriggers: db 0 diff --git a/maps/VermilionPokeCenter1F.asm b/maps/VermilionPokeCenter1F.asm index bb9457982..7c496da34 100644 --- a/maps/VermilionPokeCenter1F.asm +++ b/maps/VermilionPokeCenter1F.asm @@ -76,9 +76,9 @@ VermilionPokeCenter1F_MapEventHeader: .Warps: db 3 - warp_def $7, $3, 2, GROUP_VERMILION_CITY, MAP_VERMILION_CITY - warp_def $7, $4, 2, GROUP_VERMILION_CITY, MAP_VERMILION_CITY - warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F + warp_def $7, $3, 2, VERMILION_CITY + warp_def $7, $4, 2, VERMILION_CITY + warp_def $7, $0, 1, POKECENTER_2F .XYTriggers: db 0 diff --git a/maps/VermilionPokeCenter2FBeta.asm b/maps/VermilionPokeCenter2FBeta.asm index f3a435000..3d8ad1efc 100644 --- a/maps/VermilionPokeCenter2FBeta.asm +++ b/maps/VermilionPokeCenter2FBeta.asm @@ -11,7 +11,7 @@ VermilionPokeCenter2FBeta_MapEventHeader: .Warps: db 1 - warp_def $7, $0, 3, GROUP_VERMILION_POKECENTER_1F, MAP_VERMILION_POKECENTER_1F + warp_def $7, $0, 3, VERMILION_POKECENTER_1F .XYTriggers: db 0 diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 07e6ae00c..4fc84e9ae 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -33,7 +33,7 @@ UnknownScript_0x74da6: clearevent EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M setevent EVENT_FAST_SHIP_FIRST_TIME setevent EVENT_GAVE_KURT_APRICORNS - blackoutmod GROUP_VERMILION_CITY, MAP_VERMILION_CITY + blackoutmod VERMILION_CITY end SailorScript_0x74dc4: @@ -67,8 +67,8 @@ SailorScript_0x74dc4: clearevent EVENT_BEAT_SCHOOLBOY_RICKY setevent EVENT_FAST_SHIP_DESTINATION_OLIVINE appear $2 - domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $1 - warp GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $19, $1 + domaptrigger FAST_SHIP_1F, $1 + warp FAST_SHIP_1F, $19, $1 end UnknownScript_0x74e1a: @@ -304,8 +304,8 @@ VermilionPort_MapEventHeader: .Warps: db 2 - warp_def $5, $9, 5, GROUP_VERMILION_PORT_PASSAGE, MAP_VERMILION_PORT_PASSAGE - warp_def $11, $7, 1, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F + warp_def $5, $9, 5, VERMILION_PORT_PASSAGE + warp_def $11, $7, 1, FAST_SHIP_1F .XYTriggers: db 1 diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index 8ac0b8694..dd154b705 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -21,11 +21,11 @@ VermilionPortPassage_MapEventHeader: .Warps: db 5 - warp_def $0, $f, 8, GROUP_VERMILION_CITY, MAP_VERMILION_CITY - warp_def $0, $10, 9, GROUP_VERMILION_CITY, MAP_VERMILION_CITY - warp_def $4, $f, 4, GROUP_VERMILION_PORT_PASSAGE, MAP_VERMILION_PORT_PASSAGE - warp_def $2, $3, 3, GROUP_VERMILION_PORT_PASSAGE, MAP_VERMILION_PORT_PASSAGE - warp_def $e, $3, 1, GROUP_VERMILION_PORT, MAP_VERMILION_PORT + warp_def $0, $f, 8, VERMILION_CITY + warp_def $0, $10, 9, VERMILION_CITY + warp_def $4, $f, 4, VERMILION_PORT_PASSAGE + warp_def $2, $3, 3, VERMILION_PORT_PASSAGE + warp_def $e, $3, 1, VERMILION_PORT .XYTriggers: db 0 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 509bd0303..232b6f1b1 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -240,16 +240,16 @@ VictoryRoad_MapEventHeader: .Warps: db 10 - warp_def $43, $9, 5, GROUP_VICTORY_ROAD_GATE, MAP_VICTORY_ROAD_GATE - warp_def $31, $1, 3, GROUP_VICTORY_ROAD, MAP_VICTORY_ROAD - warp_def $23, $1, 2, GROUP_VICTORY_ROAD, MAP_VICTORY_ROAD - warp_def $1f, $d, 5, GROUP_VICTORY_ROAD, MAP_VICTORY_ROAD - warp_def $11, $d, 4, GROUP_VICTORY_ROAD, MAP_VICTORY_ROAD - warp_def $21, $11, 7, GROUP_VICTORY_ROAD, MAP_VICTORY_ROAD - warp_def $13, $11, 6, GROUP_VICTORY_ROAD, MAP_VICTORY_ROAD - warp_def $b, $0, 9, GROUP_VICTORY_ROAD, MAP_VICTORY_ROAD - warp_def $1b, $0, 8, GROUP_VICTORY_ROAD, MAP_VICTORY_ROAD - warp_def $5, $d, 3, GROUP_ROUTE_23, MAP_ROUTE_23 + warp_def $43, $9, 5, VICTORY_ROAD_GATE + warp_def $31, $1, 3, VICTORY_ROAD + warp_def $23, $1, 2, VICTORY_ROAD + warp_def $1f, $d, 5, VICTORY_ROAD + warp_def $11, $d, 4, VICTORY_ROAD + warp_def $21, $11, 7, VICTORY_ROAD + warp_def $13, $11, 6, VICTORY_ROAD + warp_def $b, $0, 9, VICTORY_ROAD + warp_def $1b, $0, 8, VICTORY_ROAD + warp_def $5, $d, 3, ROUTE_23 .XYTriggers: db 2 diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index c57b2251e..0789a19f9 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -100,14 +100,14 @@ VictoryRoadGate_MapEventHeader: .Warps: db 8 - warp_def $7, $11, 1, GROUP_ROUTE_22, MAP_ROUTE_22 - warp_def $7, $12, 1, GROUP_ROUTE_22, MAP_ROUTE_22 - warp_def $11, $9, 1, GROUP_ROUTE_26, MAP_ROUTE_26 - warp_def $11, $a, 1, GROUP_ROUTE_26, MAP_ROUTE_26 - warp_def $0, $9, 1, GROUP_VICTORY_ROAD, MAP_VICTORY_ROAD - warp_def $0, $a, 1, GROUP_VICTORY_ROAD, MAP_VICTORY_ROAD - warp_def $7, $1, 2, GROUP_ROUTE_28, MAP_ROUTE_28 - warp_def $7, $2, 2, GROUP_ROUTE_28, MAP_ROUTE_28 + warp_def $7, $11, 1, ROUTE_22 + warp_def $7, $12, 1, ROUTE_22 + warp_def $11, $9, 1, ROUTE_26 + warp_def $11, $a, 1, ROUTE_26 + warp_def $0, $9, 1, VICTORY_ROAD + warp_def $0, $a, 1, VICTORY_ROAD + warp_def $7, $1, 2, ROUTE_28 + warp_def $7, $2, 2, ROUTE_28 .XYTriggers: db 1 diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 5adefc5d2..cd0052c20 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -276,15 +276,15 @@ VioletCity_MapEventHeader: .Warps: db 9 - warp_def $11, $9, 2, GROUP_VIOLET_MART, MAP_VIOLET_MART - warp_def $11, $12, 1, GROUP_VIOLET_GYM, MAP_VIOLET_GYM - warp_def $11, $1e, 1, GROUP_EARLS_POKEMON_ACADEMY, MAP_EARLS_POKEMON_ACADEMY - warp_def $f, $3, 1, GROUP_VIOLET_NICKNAME_SPEECH_HOUSE, MAP_VIOLET_NICKNAME_SPEECH_HOUSE - warp_def $19, $1f, 1, GROUP_VIOLET_POKECENTER_1F, MAP_VIOLET_POKECENTER_1F - warp_def $1d, $15, 1, GROUP_VIOLET_ONIX_TRADE_HOUSE, MAP_VIOLET_ONIX_TRADE_HOUSE - warp_def $5, $17, 1, GROUP_SPROUT_TOWER_1F, MAP_SPROUT_TOWER_1F - warp_def $18, $27, 1, GROUP_ROUTE_31_VIOLET_GATE, MAP_ROUTE_31_VIOLET_GATE - warp_def $19, $27, 2, GROUP_ROUTE_31_VIOLET_GATE, MAP_ROUTE_31_VIOLET_GATE + warp_def $11, $9, 2, VIOLET_MART + warp_def $11, $12, 1, VIOLET_GYM + warp_def $11, $1e, 1, EARLS_POKEMON_ACADEMY + warp_def $f, $3, 1, VIOLET_NICKNAME_SPEECH_HOUSE + warp_def $19, $1f, 1, VIOLET_POKECENTER_1F + warp_def $1d, $15, 1, VIOLET_ONIX_TRADE_HOUSE + warp_def $5, $17, 1, SPROUT_TOWER_1F + warp_def $18, $27, 1, ROUTE_31_VIOLET_GATE + warp_def $19, $27, 2, ROUTE_31_VIOLET_GATE .XYTriggers: db 0 diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index a2201c4c5..658c445ea 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -30,7 +30,7 @@ FalknerScript_0x683c2: iftrue .SpeechAfterTM setevent EVENT_BEAT_BIRD_KEEPER_ROD setevent EVENT_BEAT_BIRD_KEEPER_ABE - domaptrigger GROUP_ELMS_LAB, MAP_ELMS_LAB, $2 + domaptrigger ELMS_LAB, $2 specialphonecall ELMCALL_ASSISTANT writetext UnknownText_0x685c8 keeptextopen @@ -281,8 +281,8 @@ VioletGym_MapEventHeader: .Warps: db 2 - warp_def $f, $4, 2, GROUP_VIOLET_CITY, MAP_VIOLET_CITY - warp_def $f, $5, 2, GROUP_VIOLET_CITY, MAP_VIOLET_CITY + warp_def $f, $4, 2, VIOLET_CITY + warp_def $f, $5, 2, VIOLET_CITY .XYTriggers: db 0 diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index 23bc3d6a4..1a62a4191 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -49,8 +49,8 @@ VioletMart_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 1, GROUP_VIOLET_CITY, MAP_VIOLET_CITY - warp_def $7, $3, 1, GROUP_VIOLET_CITY, MAP_VIOLET_CITY + warp_def $7, $2, 1, VIOLET_CITY + warp_def $7, $3, 1, VIOLET_CITY .XYTriggers: db 0 diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index 9545c6e36..ca490336b 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -45,8 +45,8 @@ VioletNicknameSpeechHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $3, 4, GROUP_VIOLET_CITY, MAP_VIOLET_CITY - warp_def $7, $4, 4, GROUP_VIOLET_CITY, MAP_VIOLET_CITY + warp_def $7, $3, 4, VIOLET_CITY + warp_def $7, $4, 4, VIOLET_CITY .XYTriggers: db 0 diff --git a/maps/VioletOnixTradeHouse.asm b/maps/VioletOnixTradeHouse.asm index c92b5632a..6ba1c3f5f 100644 --- a/maps/VioletOnixTradeHouse.asm +++ b/maps/VioletOnixTradeHouse.asm @@ -34,8 +34,8 @@ VioletOnixTradeHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $3, 6, GROUP_VIOLET_CITY, MAP_VIOLET_CITY - warp_def $7, $4, 6, GROUP_VIOLET_CITY, MAP_VIOLET_CITY + warp_def $7, $3, 6, VIOLET_CITY + warp_def $7, $4, 6, VIOLET_CITY .XYTriggers: db 0 diff --git a/maps/VioletPokeCenter1F.asm b/maps/VioletPokeCenter1F.asm index 284094753..a49859c3a 100644 --- a/maps/VioletPokeCenter1F.asm +++ b/maps/VioletPokeCenter1F.asm @@ -25,7 +25,7 @@ UnknownScript_0x694d7: setevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE clearevent EVENT_ELMS_AIDE_IN_LAB clearevent EVENT_TOGEPI_HATCHED - domaptrigger GROUP_ROUTE_32, MAP_ROUTE_32, $1 + domaptrigger ROUTE_32, $1 writetext UnknownText_0x695c5 closetext loadmovesprites @@ -214,9 +214,9 @@ VioletPokeCenter1F_MapEventHeader: .Warps: db 3 - warp_def $7, $3, 5, GROUP_VIOLET_CITY, MAP_VIOLET_CITY - warp_def $7, $4, 5, GROUP_VIOLET_CITY, MAP_VIOLET_CITY - warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F + warp_def $7, $3, 5, VIOLET_CITY + warp_def $7, $4, 5, VIOLET_CITY + warp_def $7, $0, 1, POKECENTER_2F .XYTriggers: db 0 diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 8d748a8e3..4aa8cfc09 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -217,11 +217,11 @@ ViridianCity_MapEventHeader: .Warps: db 5 - warp_def $7, $20, 1, GROUP_VIRIDIAN_GYM, MAP_VIRIDIAN_GYM - warp_def $9, $15, 1, GROUP_VIRIDIAN_NICKNAME_SPEECH_HOUSE, MAP_VIRIDIAN_NICKNAME_SPEECH_HOUSE - warp_def $f, $17, 1, GROUP_TRAINER_HOUSE_1F, MAP_TRAINER_HOUSE_1F - warp_def $13, $1d, 2, GROUP_VIRIDIAN_MART, MAP_VIRIDIAN_MART - warp_def $19, $17, 1, GROUP_VIRIDIAN_POKECENTER_1F, MAP_VIRIDIAN_POKECENTER_1F + warp_def $7, $20, 1, VIRIDIAN_GYM + warp_def $9, $15, 1, VIRIDIAN_NICKNAME_SPEECH_HOUSE + warp_def $f, $17, 1, TRAINER_HOUSE_1F + warp_def $13, $1d, 2, VIRIDIAN_MART + warp_def $19, $17, 1, VIRIDIAN_POKECENTER_1F .XYTriggers: db 0 diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index 30aa729b2..687e412b0 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -170,8 +170,8 @@ ViridianGym_MapEventHeader: .Warps: db 2 - warp_def $11, $4, 1, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY - warp_def $11, $5, 1, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY + warp_def $11, $4, 1, VIRIDIAN_CITY + warp_def $11, $5, 1, VIRIDIAN_CITY .XYTriggers: db 0 diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index 441cf81b7..2171f0fa3 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -37,8 +37,8 @@ ViridianMart_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 4, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY - warp_def $7, $3, 4, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY + warp_def $7, $2, 4, VIRIDIAN_CITY + warp_def $7, $3, 4, VIRIDIAN_CITY .XYTriggers: db 0 diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index f6479e7c9..204bafbc0 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -61,8 +61,8 @@ ViridianNicknameSpeechHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 2, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY - warp_def $7, $3, 2, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY + warp_def $7, $2, 2, VIRIDIAN_CITY + warp_def $7, $3, 2, VIRIDIAN_CITY .XYTriggers: db 0 diff --git a/maps/ViridianPokeCenter1F.asm b/maps/ViridianPokeCenter1F.asm index 7d72c8558..92aa0337d 100644 --- a/maps/ViridianPokeCenter1F.asm +++ b/maps/ViridianPokeCenter1F.asm @@ -71,9 +71,9 @@ ViridianPokeCenter1F_MapEventHeader: .Warps: db 3 - warp_def $7, $3, 5, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY - warp_def $7, $4, 5, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY - warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F + warp_def $7, $3, 5, VIRIDIAN_CITY + warp_def $7, $4, 5, VIRIDIAN_CITY + warp_def $7, $0, 1, POKECENTER_2F .XYTriggers: db 0 diff --git a/maps/ViridianPokeCenter2FBeta.asm b/maps/ViridianPokeCenter2FBeta.asm index 9140390db..c545a50bc 100644 --- a/maps/ViridianPokeCenter2FBeta.asm +++ b/maps/ViridianPokeCenter2FBeta.asm @@ -11,7 +11,7 @@ ViridianPokeCenter2FBeta_MapEventHeader: .Warps: db 1 - warp_def $7, $0, 3, GROUP_VIRIDIAN_POKECENTER_1F, MAP_VIRIDIAN_POKECENTER_1F + warp_def $7, $0, 3, VIRIDIAN_POKECENTER_1F .XYTriggers: db 0 diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index b1c32d372..24ccb85b4 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -649,12 +649,12 @@ WarehouseEntrance_MapEventHeader: .Warps: db 6 - warp_def $2, $3, 7, GROUP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, MAP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES - warp_def $22, $3, 4, GROUP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, MAP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES - warp_def $6, $12, 4, GROUP_WAREHOUSE_ENTRANCE, MAP_WAREHOUSE_ENTRANCE - warp_def $1f, $15, 3, GROUP_WAREHOUSE_ENTRANCE, MAP_WAREHOUSE_ENTRANCE - warp_def $1f, $16, 3, GROUP_WAREHOUSE_ENTRANCE, MAP_WAREHOUSE_ENTRANCE - warp_def $1b, $16, 1, GROUP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, MAP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES + warp_def $2, $3, 7, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES + warp_def $22, $3, 4, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES + warp_def $6, $12, 4, WAREHOUSE_ENTRANCE + warp_def $1f, $15, 3, WAREHOUSE_ENTRANCE + warp_def $1f, $16, 3, WAREHOUSE_ENTRANCE + warp_def $1b, $16, 1, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES .XYTriggers: db 0 diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index bfa027695..c553e7005 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -41,15 +41,15 @@ WhirlIslandB1F_MapEventHeader: .Warps: db 9 - warp_def $5, $5, 2, GROUP_WHIRL_ISLAND_NW, MAP_WHIRL_ISLAND_NW - warp_def $3, $23, 2, GROUP_WHIRL_ISLAND_NE, MAP_WHIRL_ISLAND_NE - warp_def $9, $1d, 3, GROUP_WHIRL_ISLAND_NE, MAP_WHIRL_ISLAND_NE - warp_def $1f, $9, 3, GROUP_WHIRL_ISLAND_SW, MAP_WHIRL_ISLAND_SW - warp_def $1f, $17, 2, GROUP_WHIRL_ISLAND_SW, MAP_WHIRL_ISLAND_SW - warp_def $1d, $1f, 2, GROUP_WHIRL_ISLAND_SE, MAP_WHIRL_ISLAND_SE - warp_def $15, $19, 1, GROUP_WHIRL_ISLAND_B2F, MAP_WHIRL_ISLAND_B2F - warp_def $1b, $d, 2, GROUP_WHIRL_ISLAND_B2F, MAP_WHIRL_ISLAND_B2F - warp_def $15, $11, 1, GROUP_WHIRL_ISLAND_CAVE, MAP_WHIRL_ISLAND_CAVE + warp_def $5, $5, 2, WHIRL_ISLAND_NW + warp_def $3, $23, 2, WHIRL_ISLAND_NE + warp_def $9, $1d, 3, WHIRL_ISLAND_NE + warp_def $1f, $9, 3, WHIRL_ISLAND_SW + warp_def $1f, $17, 2, WHIRL_ISLAND_SW + warp_def $1d, $1f, 2, WHIRL_ISLAND_SE + warp_def $15, $19, 1, WHIRL_ISLAND_B2F + warp_def $1b, $d, 2, WHIRL_ISLAND_B2F + warp_def $15, $11, 1, WHIRL_ISLAND_CAVE .XYTriggers: db 0 diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index 87fd91dec..1f41fd1fd 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -20,10 +20,10 @@ WhirlIslandB2F_MapEventHeader: .Warps: db 4 - warp_def $5, $b, 7, GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F - warp_def $b, $7, 8, GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F - warp_def $19, $7, 1, GROUP_WHIRL_ISLAND_LUGIA_CHAMBER, MAP_WHIRL_ISLAND_LUGIA_CHAMBER - warp_def $1f, $d, 5, GROUP_WHIRL_ISLAND_SW, MAP_WHIRL_ISLAND_SW + warp_def $5, $b, 7, WHIRL_ISLAND_B1F + warp_def $b, $7, 8, WHIRL_ISLAND_B1F + warp_def $19, $7, 1, WHIRL_ISLAND_LUGIA_CHAMBER + warp_def $1f, $d, 5, WHIRL_ISLAND_SW .XYTriggers: db 0 diff --git a/maps/WhirlIslandCave.asm b/maps/WhirlIslandCave.asm index af104ab9d..3b2b6f0e7 100644 --- a/maps/WhirlIslandCave.asm +++ b/maps/WhirlIslandCave.asm @@ -11,8 +11,8 @@ WhirlIslandCave_MapEventHeader: .Warps: db 2 - warp_def $5, $7, 9, GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F - warp_def $d, $3, 4, GROUP_WHIRL_ISLAND_NW, MAP_WHIRL_ISLAND_NW + warp_def $5, $7, 9, WHIRL_ISLAND_B1F + warp_def $d, $3, 4, WHIRL_ISLAND_NW .XYTriggers: db 0 diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index a1edf2f24..d60f92e98 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -49,7 +49,7 @@ WhirlIslandLugiaChamber_MapEventHeader: .Warps: db 1 - warp_def $d, $9, 3, GROUP_WHIRL_ISLAND_B2F, MAP_WHIRL_ISLAND_B2F + warp_def $d, $9, 3, WHIRL_ISLAND_B2F .XYTriggers: db 0 diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index bc57e4957..eabac750a 100644 --- a/maps/WhirlIslandNE.asm +++ b/maps/WhirlIslandNE.asm @@ -14,9 +14,9 @@ WhirlIslandNE_MapEventHeader: .Warps: db 3 - warp_def $d, $3, 2, GROUP_ROUTE_41, MAP_ROUTE_41 - warp_def $3, $11, 2, GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F - warp_def $b, $d, 3, GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F + warp_def $d, $3, 2, ROUTE_41 + warp_def $3, $11, 2, WHIRL_ISLAND_B1F + warp_def $b, $d, 3, WHIRL_ISLAND_B1F .XYTriggers: db 0 diff --git a/maps/WhirlIslandNW.asm b/maps/WhirlIslandNW.asm index 5a9da92be..60eafae8e 100644 --- a/maps/WhirlIslandNW.asm +++ b/maps/WhirlIslandNW.asm @@ -11,10 +11,10 @@ WhirlIslandNW_MapEventHeader: .Warps: db 4 - warp_def $7, $5, 1, GROUP_ROUTE_41, MAP_ROUTE_41 - warp_def $3, $5, 1, GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F - warp_def $f, $3, 4, GROUP_WHIRL_ISLAND_SW, MAP_WHIRL_ISLAND_SW - warp_def $f, $7, 2, GROUP_WHIRL_ISLAND_CAVE, MAP_WHIRL_ISLAND_CAVE + warp_def $7, $5, 1, ROUTE_41 + warp_def $3, $5, 1, WHIRL_ISLAND_B1F + warp_def $f, $3, 4, WHIRL_ISLAND_SW + warp_def $f, $7, 2, WHIRL_ISLAND_CAVE .XYTriggers: db 0 diff --git a/maps/WhirlIslandSE.asm b/maps/WhirlIslandSE.asm index ebea7cafc..32cad9594 100644 --- a/maps/WhirlIslandSE.asm +++ b/maps/WhirlIslandSE.asm @@ -11,8 +11,8 @@ WhirlIslandSE_MapEventHeader: .Warps: db 2 - warp_def $d, $5, 4, GROUP_ROUTE_41, MAP_ROUTE_41 - warp_def $3, $5, 6, GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F + warp_def $d, $5, 4, ROUTE_41 + warp_def $3, $5, 6, WHIRL_ISLAND_B1F .XYTriggers: db 0 diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index d93bf14ea..a30e38ab9 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -14,11 +14,11 @@ WhirlIslandSW_MapEventHeader: .Warps: db 5 - warp_def $7, $5, 3, GROUP_ROUTE_41, MAP_ROUTE_41 - warp_def $3, $11, 5, GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F - warp_def $3, $3, 4, GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F - warp_def $f, $3, 3, GROUP_WHIRL_ISLAND_NW, MAP_WHIRL_ISLAND_NW - warp_def $f, $11, 4, GROUP_WHIRL_ISLAND_B2F, MAP_WHIRL_ISLAND_B2F + warp_def $7, $5, 3, ROUTE_41 + warp_def $3, $11, 5, WHIRL_ISLAND_B1F + warp_def $3, $3, 4, WHIRL_ISLAND_B1F + warp_def $f, $3, 3, WHIRL_ISLAND_NW + warp_def $f, $11, 4, WHIRL_ISLAND_B2F .XYTriggers: db 0 diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 2cde824e9..fb393921b 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -136,9 +136,9 @@ WillsRoom_MapEventHeader: .Warps: db 3 - warp_def $11, $5, 4, GROUP_INDIGO_PLATEAU_POKECENTER_1F, MAP_INDIGO_PLATEAU_POKECENTER_1F - warp_def $2, $4, 1, GROUP_KOGAS_ROOM, MAP_KOGAS_ROOM - warp_def $2, $5, 2, GROUP_KOGAS_ROOM, MAP_KOGAS_ROOM + warp_def $11, $5, 4, INDIGO_PLATEAU_POKECENTER_1F + warp_def $2, $4, 1, KOGAS_ROOM + warp_def $2, $5, 2, KOGAS_ROOM .XYTriggers: db 0 diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index 87524c1b4..fcb6ebf09 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -347,9 +347,9 @@ WiseTriosRoom_MapEventHeader: .Warps: db 3 - warp_def $4, $7, 4, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - warp_def $5, $7, 5, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - warp_def $4, $1, 5, GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE + warp_def $4, $7, 4, ECRUTEAK_CITY + warp_def $5, $7, 5, ECRUTEAK_CITY + warp_def $4, $1, 5, ECRUTEAK_HOUSE .XYTriggers: db 1 |