ref: 432df825d4039a44a49fff01ef843395ab5abb3d
parent: 185b0a1c86e442d9c3ecd38d7c3fc7cfdb24be21
author: PikalaxALT <PikalaxALT@gmail.com>
date: Thu Jul 23 08:59:19 EDT 2015
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
--- 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
--- 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
--- a/engine/phone_scripts.asm
+++ b/engine/phone_scripts.asm
@@ -1001,7 +1001,7 @@
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 @@
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
--- a/engine/spawn_points.asm
+++ b/engine/spawn_points.asm
@@ -89,7 +89,7 @@
.next
push bc
- ld bc, 4
+ ld bc, 4 ; length of a spawn table entry
add hl, bc
pop bc
inc c
--- a/engine/std_scripts.asm
+++ b/engine/std_scripts.asm
@@ -298,7 +298,7 @@
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 @@
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_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
--- a/macros/event.asm
+++ b/macros/event.asm
@@ -120,16 +120,14 @@
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 @@
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 @@
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 @@
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
--- a/macros/map.asm
+++ b/macros/map.asm
@@ -61,8 +61,7 @@
db \1 ; y
db \2 ; x
db \3 ; warp_to
- db \4 ; map group
- db \5 ; map number
+ map \4 ; map
endm
@@ -176,4 +175,9 @@
newgroup: MACRO
const_value = const_value + 1
enum_start 1
+ENDM
+
+elevfloor: MACRO
+ db \1, \2
+ map \3
ENDM
--- 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
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -358,8 +358,8 @@
.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
--- a/maps/AzaleaMart.asm
+++ b/maps/AzaleaMart.asm
@@ -46,8 +46,8 @@
.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
--- a/maps/AzaleaPokeCenter1F.asm
+++ b/maps/AzaleaPokeCenter1F.asm
@@ -78,9 +78,9 @@
.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
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -452,14 +452,14 @@
.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
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -102,9 +102,9 @@
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 @@
.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
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -85,7 +85,7 @@
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
@@ -92,7 +92,7 @@
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_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 @@
.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
--- a/maps/BattleTowerElevator.asm
+++ b/maps/BattleTowerElevator.asm
@@ -49,8 +49,8 @@
.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
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -81,12 +81,12 @@
.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
--- a/maps/BattleTowerOutside.asm
+++ b/maps/BattleTowerOutside.asm
@@ -128,10 +128,10 @@
.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
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -356,8 +356,8 @@
.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
--- a/maps/BlackthornCity.asm
+++ b/maps/BlackthornCity.asm
@@ -309,14 +309,14 @@
.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
--- a/maps/BlackthornDodrioTradeHouse.asm
+++ b/maps/BlackthornDodrioTradeHouse.asm
@@ -22,8 +22,8 @@
.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
--- a/maps/BlackthornDragonSpeechHouse.asm
+++ b/maps/BlackthornDragonSpeechHouse.asm
@@ -47,8 +47,8 @@
.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
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -386,13 +386,13 @@
.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
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -131,11 +131,11 @@
.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
--- a/maps/BlackthornMart.asm
+++ b/maps/BlackthornMart.asm
@@ -47,8 +47,8 @@
.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
--- a/maps/BlackthornPokeCenter1F.asm
+++ b/maps/BlackthornPokeCenter1F.asm
@@ -49,9 +49,9 @@
.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
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -147,8 +147,8 @@
.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
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -132,10 +132,10 @@
.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
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -283,20 +283,20 @@
.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
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -78,8 +78,8 @@
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 @@
.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
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -206,8 +206,8 @@
.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
--- a/maps/CeladonCity.asm
+++ b/maps/CeladonCity.asm
@@ -231,15 +231,15 @@
.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
--- a/maps/CeladonDeptStore1F.asm
+++ b/maps/CeladonDeptStore1F.asm
@@ -74,10 +74,10 @@
.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
--- a/maps/CeladonDeptStore2F.asm
+++ b/maps/CeladonDeptStore2F.asm
@@ -68,9 +68,9 @@
.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
--- a/maps/CeladonDeptStore3F.asm
+++ b/maps/CeladonDeptStore3F.asm
@@ -93,9 +93,9 @@
.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
--- a/maps/CeladonDeptStore4F.asm
+++ b/maps/CeladonDeptStore4F.asm
@@ -51,9 +51,9 @@
.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
--- a/maps/CeladonDeptStore5F.asm
+++ b/maps/CeladonDeptStore5F.asm
@@ -70,9 +70,9 @@
.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
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -151,8 +151,8 @@
.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
--- a/maps/CeladonDeptStoreElevator.asm
+++ b/maps/CeladonDeptStoreElevator.asm
@@ -20,12 +20,12 @@
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 @@
.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
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -276,8 +276,8 @@
.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
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -271,8 +271,8 @@
.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
--- a/maps/CeladonGym.asm
+++ b/maps/CeladonGym.asm
@@ -265,8 +265,8 @@
.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
--- a/maps/CeladonMansion1F.asm
+++ b/maps/CeladonMansion1F.asm
@@ -74,11 +74,11 @@
.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
--- a/maps/CeladonMansion2F.asm
+++ b/maps/CeladonMansion2F.asm
@@ -55,10 +55,10 @@
.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
--- a/maps/CeladonMansion3F.asm
+++ b/maps/CeladonMansion3F.asm
@@ -189,10 +189,10 @@
.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
--- a/maps/CeladonMansionRoof.asm
+++ b/maps/CeladonMansionRoof.asm
@@ -36,9 +36,9 @@
.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
--- a/maps/CeladonMansionRoofHouse.asm
+++ b/maps/CeladonMansionRoofHouse.asm
@@ -119,8 +119,8 @@
.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
--- a/maps/CeladonPokeCenter1F.asm
+++ b/maps/CeladonPokeCenter1F.asm
@@ -144,9 +144,9 @@
.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
--- a/maps/CeladonPokeCenter2FBeta.asm
+++ b/maps/CeladonPokeCenter2FBeta.asm
@@ -11,7 +11,7 @@
.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
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -275,12 +275,12 @@
.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
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -43,8 +43,8 @@
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 @@
.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
--- a/maps/CeruleanGymBadgeSpeechHouse.asm
+++ b/maps/CeruleanGymBadgeSpeechHouse.asm
@@ -19,8 +19,8 @@
.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
--- a/maps/CeruleanMart.asm
+++ b/maps/CeruleanMart.asm
@@ -46,8 +46,8 @@
.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
--- a/maps/CeruleanPokeCenter1F.asm
+++ b/maps/CeruleanPokeCenter1F.asm
@@ -63,9 +63,9 @@
.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
--- a/maps/CeruleanPokeCenter2FBeta.asm
+++ b/maps/CeruleanPokeCenter2FBeta.asm
@@ -11,7 +11,7 @@
.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
--- a/maps/CeruleanPoliceStation.asm
+++ b/maps/CeruleanPoliceStation.asm
@@ -44,8 +44,8 @@
.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
--- a/maps/CeruleanTradeSpeechHouse.asm
+++ b/maps/CeruleanTradeSpeechHouse.asm
@@ -53,8 +53,8 @@
.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
--- a/maps/CharcoalKiln.asm
+++ b/maps/CharcoalKiln.asm
@@ -149,8 +149,8 @@
.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
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -550,11 +550,11 @@
.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
--- a/maps/CherrygroveEvolutionSpeechHouse.asm
+++ b/maps/CherrygroveEvolutionSpeechHouse.asm
@@ -43,8 +43,8 @@
.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
--- a/maps/CherrygroveGymSpeechHouse.asm
+++ b/maps/CherrygroveGymSpeechHouse.asm
@@ -46,8 +46,8 @@
.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
--- a/maps/CherrygroveMart.asm
+++ b/maps/CherrygroveMart.asm
@@ -72,8 +72,8 @@
.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
--- a/maps/CherrygrovePokeCenter1F.asm
+++ b/maps/CherrygrovePokeCenter1F.asm
@@ -68,9 +68,9 @@
.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
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -41,7 +41,7 @@
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 @@
.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
--- a/maps/CianwoodCityPhotoStudio.asm
+++ b/maps/CianwoodCityPhotoStudio.asm
@@ -51,8 +51,8 @@
.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
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -300,8 +300,8 @@
.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
--- a/maps/CianwoodLugiaSpeechHouse.asm
+++ b/maps/CianwoodLugiaSpeechHouse.asm
@@ -62,8 +62,8 @@
.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
--- a/maps/CianwoodPharmacy.asm
+++ b/maps/CianwoodPharmacy.asm
@@ -77,8 +77,8 @@
.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
--- a/maps/CianwoodPokeCenter1F.asm
+++ b/maps/CianwoodPokeCenter1F.asm
@@ -131,9 +131,9 @@
.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
--- a/maps/CinnabarIsland.asm
+++ b/maps/CinnabarIsland.asm
@@ -132,7 +132,7 @@
.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
--- a/maps/CinnabarPokeCenter1F.asm
+++ b/maps/CinnabarPokeCenter1F.asm
@@ -35,9 +35,9 @@
.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
--- a/maps/CinnabarPokeCenter2FBeta.asm
+++ b/maps/CinnabarPokeCenter2FBeta.asm
@@ -11,7 +11,7 @@
.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
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -39,12 +39,12 @@
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 @@
.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
--- a/maps/CopycatsHouse1F.asm
+++ b/maps/CopycatsHouse1F.asm
@@ -73,9 +73,9 @@
.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
--- a/maps/CopycatsHouse2F.asm
+++ b/maps/CopycatsHouse2F.asm
@@ -361,7 +361,7 @@
.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
--- a/maps/DanceTheatre.asm
+++ b/maps/DanceTheatre.asm
@@ -332,8 +332,8 @@
.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
--- a/maps/DarkCaveBlackthornEntrance.asm
+++ b/maps/DarkCaveBlackthornEntrance.asm
@@ -62,8 +62,8 @@
.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
--- a/maps/DarkCaveVioletEntrance.asm
+++ b/maps/DarkCaveVioletEntrance.asm
@@ -30,9 +30,9 @@
.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
--- a/maps/DayCare.asm
+++ b/maps/DayCare.asm
@@ -160,10 +160,10 @@
.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
--- a/maps/DiglettsCave.asm
+++ b/maps/DiglettsCave.asm
@@ -26,12 +26,12 @@
.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
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -162,7 +162,7 @@
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 @@
.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
--- a/maps/DragonsDen1F.asm
+++ b/maps/DragonsDen1F.asm
@@ -11,10 +11,10 @@
.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
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -403,8 +403,8 @@
.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
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -410,8 +410,8 @@
.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
--- a/maps/EcruteakCity.asm
+++ b/maps/EcruteakCity.asm
@@ -258,21 +258,21 @@
.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
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -36,7 +36,7 @@
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 @@
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 @@
.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
--- a/maps/EcruteakHouse.asm
+++ b/maps/EcruteakHouse.asm
@@ -282,11 +282,11 @@
.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
--- a/maps/EcruteakItemfinderHouse.asm
+++ b/maps/EcruteakItemfinderHouse.asm
@@ -164,8 +164,8 @@
.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
--- a/maps/EcruteakLugiaSpeechHouse.asm
+++ b/maps/EcruteakLugiaSpeechHouse.asm
@@ -46,8 +46,8 @@
.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
--- a/maps/EcruteakMart.asm
+++ b/maps/EcruteakMart.asm
@@ -46,8 +46,8 @@
.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
--- a/maps/EcruteakPokeCenter1F.asm
+++ b/maps/EcruteakPokeCenter1F.asm
@@ -207,9 +207,9 @@
.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
--- a/maps/ElmsHouse.asm
+++ b/maps/ElmsHouse.asm
@@ -85,8 +85,8 @@
.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
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -272,7 +272,7 @@
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 @@
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 @@
.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
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -27,7 +27,7 @@
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 @@
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 @@
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 @@
.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
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -442,8 +442,8 @@
.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
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -89,7 +89,7 @@
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 @@
.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
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -68,7 +68,7 @@
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 @@
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 @@
.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
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -222,11 +222,11 @@
.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
--- a/maps/FightingDojo.asm
+++ b/maps/FightingDojo.asm
@@ -44,8 +44,8 @@
.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
--- a/maps/FuchsiaBillSpeechHouse.asm
+++ b/maps/FuchsiaBillSpeechHouse.asm
@@ -29,8 +29,8 @@
.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
--- a/maps/FuchsiaCity.asm
+++ b/maps/FuchsiaCity.asm
@@ -126,17 +126,17 @@
.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
--- a/maps/FuchsiaGym.asm
+++ b/maps/FuchsiaGym.asm
@@ -378,8 +378,8 @@
.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
--- a/maps/FuchsiaMart.asm
+++ b/maps/FuchsiaMart.asm
@@ -38,8 +38,8 @@
.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
--- a/maps/FuchsiaPokeCenter1F.asm
+++ b/maps/FuchsiaPokeCenter1F.asm
@@ -90,9 +90,9 @@
.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
--- a/maps/FuchsiaPokeCenter2FBeta.asm
+++ b/maps/FuchsiaPokeCenter2FBeta.asm
@@ -11,7 +11,7 @@
.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
--- a/maps/GoldenrodBikeShop.asm
+++ b/maps/GoldenrodBikeShop.asm
@@ -105,8 +105,8 @@
.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
--- a/maps/GoldenrodBillsHouse.asm
+++ b/maps/GoldenrodBillsHouse.asm
@@ -243,8 +243,8 @@
.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
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -545,21 +545,21 @@
.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
--- a/maps/GoldenrodDeptStore1F.asm
+++ b/maps/GoldenrodDeptStore1F.asm
@@ -78,10 +78,10 @@
.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
--- a/maps/GoldenrodDeptStore2F.asm
+++ b/maps/GoldenrodDeptStore2F.asm
@@ -99,9 +99,9 @@
.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
--- a/maps/GoldenrodDeptStore3F.asm
+++ b/maps/GoldenrodDeptStore3F.asm
@@ -57,9 +57,9 @@
.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
--- a/maps/GoldenrodDeptStore4F.asm
+++ b/maps/GoldenrodDeptStore4F.asm
@@ -77,9 +77,9 @@
.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
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -218,9 +218,9 @@
.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
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -151,9 +151,9 @@
.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
--- a/maps/GoldenrodDeptStoreB1F.asm
+++ b/maps/GoldenrodDeptStoreB1F.asm
@@ -109,9 +109,9 @@
.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
--- a/maps/GoldenrodDeptStoreElevator.asm
+++ b/maps/GoldenrodDeptStoreElevator.asm
@@ -46,13 +46,13 @@
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 @@
.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
--- a/maps/GoldenrodDeptStoreRoof.asm
+++ b/maps/GoldenrodDeptStoreRoof.asm
@@ -211,7 +211,7 @@
.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
--- a/maps/GoldenrodFlowerShop.asm
+++ b/maps/GoldenrodFlowerShop.asm
@@ -161,8 +161,8 @@
.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
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -437,8 +437,8 @@
.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
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -379,8 +379,8 @@
.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
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -137,8 +137,8 @@
.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
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -168,10 +168,10 @@
.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
--- a/maps/GoldenrodNameRatersHouse.asm
+++ b/maps/GoldenrodNameRatersHouse.asm
@@ -27,8 +27,8 @@
.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
--- a/maps/GoldenrodPPSpeechHouse.asm
+++ b/maps/GoldenrodPPSpeechHouse.asm
@@ -53,8 +53,8 @@
.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
--- a/maps/GoldenrodPokeCenter1F.asm
+++ b/maps/GoldenrodPokeCenter1F.asm
@@ -803,10 +803,10 @@
.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
--- a/maps/GoldenrodPokeComCenter2FMobile.asm
+++ b/maps/GoldenrodPokeComCenter2FMobile.asm
@@ -269,8 +269,8 @@
.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
--- a/maps/GuideGentsHouse.asm
+++ b/maps/GuideGentsHouse.asm
@@ -30,8 +30,8 @@
.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
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -37,7 +37,7 @@
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 @@
.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
--- a/maps/IcePath1F.asm
+++ b/maps/IcePath1F.asm
@@ -20,10 +20,10 @@
.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
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -89,14 +89,14 @@
.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
--- a/maps/IcePathB2FBlackthornSide.asm
+++ b/maps/IcePathB2FBlackthornSide.asm
@@ -18,8 +18,8 @@
.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
--- a/maps/IcePathB2FMahoganySide.asm
+++ b/maps/IcePathB2FMahoganySide.asm
@@ -29,12 +29,12 @@
.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
--- a/maps/IcePathB3F.asm
+++ b/maps/IcePathB3F.asm
@@ -17,8 +17,8 @@
.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
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -933,9 +933,9 @@
.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
--- a/maps/IlexForestAzaleaGate.asm
+++ b/maps/IlexForestAzaleaGate.asm
@@ -32,10 +32,10 @@
.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
--- a/maps/IndigoPlateauPokeCenter1F.asm
+++ b/maps/IndigoPlateauPokeCenter1F.asm
@@ -16,12 +16,12 @@
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 @@
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 @@
.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
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -140,10 +140,10 @@
.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
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -137,10 +137,10 @@
.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
--- a/maps/KrissHouse1F.asm
+++ b/maps/KrissHouse1F.asm
@@ -386,9 +386,9 @@
.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
--- a/maps/KrissHouse2F.asm
+++ b/maps/KrissHouse2F.asm
@@ -89,7 +89,7 @@
loadmovesprites
end
.Warp
- warp 0, 0, $0, $0
+ warp NONE, $0, $0
end
KrisRadioText1:
@@ -118,7 +118,7 @@
.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
--- a/maps/KrissNeighborsHouse.asm
+++ b/maps/KrissNeighborsHouse.asm
@@ -100,8 +100,8 @@
.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
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -307,7 +307,7 @@
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 @@
.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
--- a/maps/LakeofRage.asm
+++ b/maps/LakeofRage.asm
@@ -53,7 +53,7 @@
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 @@
.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
--- a/maps/LakeofRageHiddenPowerHouse.asm
+++ b/maps/LakeofRageHiddenPowerHouse.asm
@@ -70,8 +70,8 @@
.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
--- a/maps/LakeofRageMagikarpHouse.asm
+++ b/maps/LakeofRageMagikarpHouse.asm
@@ -208,8 +208,8 @@
.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
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -127,7 +127,7 @@
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 @@
.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
--- a/maps/LavRadioTower1F.asm
+++ b/maps/LavRadioTower1F.asm
@@ -220,8 +220,8 @@
.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
--- a/maps/LavenderMart.asm
+++ b/maps/LavenderMart.asm
@@ -48,8 +48,8 @@
.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
--- a/maps/LavenderNameRater.asm
+++ b/maps/LavenderNameRater.asm
@@ -29,8 +29,8 @@
.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
--- a/maps/LavenderPokeCenter1F.asm
+++ b/maps/LavenderPokeCenter1F.asm
@@ -80,9 +80,9 @@
.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
--- a/maps/LavenderPokeCenter2FBeta.asm
+++ b/maps/LavenderPokeCenter2FBeta.asm
@@ -11,7 +11,7 @@
.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
--- a/maps/LavenderTown.asm
+++ b/maps/LavenderTown.asm
@@ -107,13 +107,13 @@
.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
--- a/maps/LavenderTownSpeechHouse.asm
+++ b/maps/LavenderTownSpeechHouse.asm
@@ -31,8 +31,8 @@
.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
--- a/maps/MahoganyGym.asm
+++ b/maps/MahoganyGym.asm
@@ -369,8 +369,8 @@
.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
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -224,9 +224,9 @@
.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
--- a/maps/MahoganyPokeCenter1F.asm
+++ b/maps/MahoganyPokeCenter1F.asm
@@ -53,9 +53,9 @@
.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
--- a/maps/MahoganyRedGyaradosSpeechHouse.asm
+++ b/maps/MahoganyRedGyaradosSpeechHouse.asm
@@ -62,8 +62,8 @@
.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
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -248,11 +248,11 @@
.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
--- a/maps/ManiasHouse.asm
+++ b/maps/ManiasHouse.asm
@@ -201,8 +201,8 @@
.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
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -18,7 +18,7 @@
MobileBattleRoom_Initialize:
dotrigger $1
- domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $5
+ domaptrigger POKECENTER_2F, $5
end
MapMobileBattleRoomSignpost0Script:
@@ -74,8 +74,8 @@
.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
--- a/maps/MobileTradeRoomMobile.asm
+++ b/maps/MobileTradeRoomMobile.asm
@@ -18,7 +18,7 @@
MobileTradeRoomMobile_Initialize:
dotrigger $1
- domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $4
+ domaptrigger POKECENTER_2F, $4
end
MapMobileTradeRoomMobileSignpost0Script:
@@ -42,8 +42,8 @@
.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
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -165,14 +165,14 @@
.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
--- a/maps/MountMoonGiftShop.asm
+++ b/maps/MountMoonGiftShop.asm
@@ -27,8 +27,8 @@
.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
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -140,9 +140,9 @@
.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
--- a/maps/MountMortar1FInside.asm
+++ b/maps/MountMortar1FInside.asm
@@ -111,12 +111,12 @@
.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
--- a/maps/MountMortar1FOutside.asm
+++ b/maps/MountMortar1FOutside.asm
@@ -21,15 +21,15 @@
.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
--- a/maps/MountMortar2FInside.asm
+++ b/maps/MountMortar2FInside.asm
@@ -64,8 +64,8 @@
.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
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -132,8 +132,8 @@
.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
--- a/maps/MoveDeletersHouse.asm
+++ b/maps/MoveDeletersHouse.asm
@@ -22,8 +22,8 @@
.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
--- a/maps/MrFujisHouse.asm
+++ b/maps/MrFujisHouse.asm
@@ -78,8 +78,8 @@
.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
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -34,7 +34,7 @@
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 @@
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 @@
.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
--- a/maps/MrPsychicsHouse.asm
+++ b/maps/MrPsychicsHouse.asm
@@ -50,8 +50,8 @@
.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
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -504,10 +504,10 @@
.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
--- a/maps/NationalParkBugContest.asm
+++ b/maps/NationalParkBugContest.asm
@@ -213,10 +213,10 @@
.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
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -286,10 +286,10 @@
.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
--- a/maps/OaksLab.asm
+++ b/maps/OaksLab.asm
@@ -256,8 +256,8 @@
.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
--- a/maps/OlivineCafe.asm
+++ b/maps/OlivineCafe.asm
@@ -79,8 +79,8 @@
.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
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -291,17 +291,17 @@
.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
--- a/maps/OlivineGoodRodHouse.asm
+++ b/maps/OlivineGoodRodHouse.asm
@@ -85,8 +85,8 @@
.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
--- a/maps/OlivineGym.asm
+++ b/maps/OlivineGym.asm
@@ -199,8 +199,8 @@
.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
--- a/maps/OlivineHouseBeta.asm
+++ b/maps/OlivineHouseBeta.asm
@@ -41,8 +41,8 @@
.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
--- a/maps/OlivineLighthouse1F.asm
+++ b/maps/OlivineLighthouse1F.asm
@@ -38,11 +38,11 @@
.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
--- a/maps/OlivineLighthouse2F.asm
+++ b/maps/OlivineLighthouse2F.asm
@@ -206,12 +206,12 @@
.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
--- a/maps/OlivineLighthouse3F.asm
+++ b/maps/OlivineLighthouse3F.asm
@@ -112,15 +112,15 @@
.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
--- a/maps/OlivineLighthouse4F.asm
+++ b/maps/OlivineLighthouse4F.asm
@@ -83,16 +83,16 @@
.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
--- a/maps/OlivineLighthouse5F.asm
+++ b/maps/OlivineLighthouse5F.asm
@@ -90,13 +90,13 @@
.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
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -258,9 +258,9 @@
.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
--- a/maps/OlivineMart.asm
+++ b/maps/OlivineMart.asm
@@ -46,8 +46,8 @@
.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
--- a/maps/OlivinePokeCenter1F.asm
+++ b/maps/OlivinePokeCenter1F.asm
@@ -47,9 +47,9 @@
.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
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -21,7 +21,7 @@
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 @@
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 @@
.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
--- a/maps/OlivinePortPassage.asm
+++ b/maps/OlivinePortPassage.asm
@@ -22,11 +22,11 @@
.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
--- a/maps/OlivinePunishmentSpeechHouse.asm
+++ b/maps/OlivinePunishmentSpeechHouse.asm
@@ -41,8 +41,8 @@
.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
--- a/maps/OlivineVoltorbHouse.asm
+++ b/maps/OlivineVoltorbHouse.asm
@@ -22,8 +22,8 @@
.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
--- a/maps/PalletTown.asm
+++ b/maps/PalletTown.asm
@@ -73,9 +73,9 @@
.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
--- a/maps/PewterCity.asm
+++ b/maps/PewterCity.asm
@@ -153,11 +153,11 @@
.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
--- a/maps/PewterGym.asm
+++ b/maps/PewterGym.asm
@@ -209,8 +209,8 @@
.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
--- a/maps/PewterMart.asm
+++ b/maps/PewterMart.asm
@@ -46,8 +46,8 @@
.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
--- a/maps/PewterNidoranSpeechHouse.asm
+++ b/maps/PewterNidoranSpeechHouse.asm
@@ -30,8 +30,8 @@
.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
--- a/maps/PewterPokeCEnter2FBeta.asm
+++ b/maps/PewterPokeCEnter2FBeta.asm
@@ -11,7 +11,7 @@
.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
--- a/maps/PewterPokeCenter1F.asm
+++ b/maps/PewterPokeCenter1F.asm
@@ -66,9 +66,9 @@
.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
--- a/maps/PewterSnoozeSpeechHouse.asm
+++ b/maps/PewterSnoozeSpeechHouse.asm
@@ -23,8 +23,8 @@
.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
--- a/maps/PokeCenter2F.asm
+++ b/maps/PokeCenter2F.asm
@@ -373,7 +373,7 @@
special Special_AbortLink
scall Script_CleanUpFemaleFlagAfterTrade
dotrigger $0
- domaptrigger GROUP_TRADE_CENTER, MAP_TRADE_CENTER, $0
+ domaptrigger TRADE_CENTER, $0
end
Script_LeftMobileTradeRoom:
@@ -380,7 +380,7 @@
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,7 +393,7 @@
special Special_AbortLink
scall Script_CleanUpFemaleFlagAfterBattle
dotrigger $0
- domaptrigger GROUP_COLOSSEUM, MAP_COLOSSEUM, $0
+ domaptrigger COLOSSEUM, $0
end
Script_LeftMobileBattleRoom:
@@ -400,7 +400,7 @@
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 @@
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 @@
.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
--- a/maps/PokeSeersHouse.asm
+++ b/maps/PokeSeersHouse.asm
@@ -19,8 +19,8 @@
.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
--- a/maps/PokemonFanClub.asm
+++ b/maps/PokemonFanClub.asm
@@ -294,8 +294,8 @@
.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
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -141,7 +141,7 @@
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 @@
.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
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -470,9 +470,9 @@
.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
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -703,8 +703,8 @@
.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
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -328,9 +328,9 @@
.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
--- a/maps/RadioTower4F.asm
+++ b/maps/RadioTower4F.asm
@@ -242,10 +242,10 @@
.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
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -122,7 +122,7 @@
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 @@
.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
--- a/maps/RedsHouse1F.asm
+++ b/maps/RedsHouse1F.asm
@@ -79,9 +79,9 @@
.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
--- a/maps/RedsHouse2F.asm
+++ b/maps/RedsHouse2F.asm
@@ -31,7 +31,7 @@
.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
--- a/maps/RockTunnel1F.asm
+++ b/maps/RockTunnel1F.asm
@@ -25,12 +25,12 @@
.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
--- a/maps/RockTunnelB1F.asm
+++ b/maps/RockTunnelB1F.asm
@@ -24,10 +24,10 @@
.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
--- a/maps/Route10North.asm
+++ b/maps/Route10North.asm
@@ -21,8 +21,8 @@
.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
--- a/maps/Route10PokeCenter1F.asm
+++ b/maps/Route10PokeCenter1F.asm
@@ -80,9 +80,9 @@
.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
--- a/maps/Route10PokeCenter2FBeta.asm
+++ b/maps/Route10PokeCenter2FBeta.asm
@@ -11,7 +11,7 @@
.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
--- a/maps/Route10South.asm
+++ b/maps/Route10South.asm
@@ -77,7 +77,7 @@
.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
--- a/maps/Route12.asm
+++ b/maps/Route12.asm
@@ -165,7 +165,7 @@
.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
--- a/maps/Route12SuperRodHouse.asm
+++ b/maps/Route12SuperRodHouse.asm
@@ -82,8 +82,8 @@
.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
--- a/maps/Route15.asm
+++ b/maps/Route15.asm
@@ -198,8 +198,8 @@
.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
--- a/maps/Route15FuchsiaGate.asm
+++ b/maps/Route15FuchsiaGate.asm
@@ -22,10 +22,10 @@
.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
--- a/maps/Route16.asm
+++ b/maps/Route16.asm
@@ -37,11 +37,11 @@
.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
--- a/maps/Route16FuchsiaSpeechHouse.asm
+++ b/maps/Route16FuchsiaSpeechHouse.asm
@@ -25,8 +25,8 @@
.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
--- a/maps/Route16Gate.asm
+++ b/maps/Route16Gate.asm
@@ -65,10 +65,10 @@
.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
--- a/maps/Route17.asm
+++ b/maps/Route17.asm
@@ -137,8 +137,8 @@
.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
--- a/maps/Route1718Gate.asm
+++ b/maps/Route1718Gate.asm
@@ -56,10 +56,10 @@
.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
--- a/maps/Route18.asm
+++ b/maps/Route18.asm
@@ -79,8 +79,8 @@
.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
--- a/maps/Route19.asm
+++ b/maps/Route19.asm
@@ -235,7 +235,7 @@
.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
--- a/maps/Route19FuchsiaGate.asm
+++ b/maps/Route19FuchsiaGate.asm
@@ -48,10 +48,10 @@
.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
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -142,11 +142,11 @@
.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
--- a/maps/Route20.asm
+++ b/maps/Route20.asm
@@ -116,7 +116,7 @@
.Warps:
db 1
- warp_def $7, $26, 1, GROUP_SEAFOAM_GYM, MAP_SEAFOAM_GYM
+ warp_def $7, $26, 1, SEAFOAM_GYM
.XYTriggers:
db 0
--- a/maps/Route22.asm
+++ b/maps/Route22.asm
@@ -21,7 +21,7 @@
.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
--- a/maps/Route23.asm
+++ b/maps/Route23.asm
@@ -30,10 +30,10 @@
.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
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -425,7 +425,7 @@
.Warps:
db 1
- warp_def $5, $2f, 1, GROUP_BILLS_HOUSE, MAP_BILLS_HOUSE
+ warp_def $5, $2f, 1, BILLS_HOUSE
.XYTriggers:
db 2
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -408,9 +408,9 @@
.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
--- a/maps/Route26DayofWeekSiblingsHouse.asm
+++ b/maps/Route26DayofWeekSiblingsHouse.asm
@@ -73,8 +73,8 @@
.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
--- a/maps/Route26HealSpeechHouse.asm
+++ b/maps/Route26HealSpeechHouse.asm
@@ -51,8 +51,8 @@
.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
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -464,9 +464,9 @@
.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
--- a/maps/Route27SandstormHouse.asm
+++ b/maps/Route27SandstormHouse.asm
@@ -96,8 +96,8 @@
.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
--- a/maps/Route28.asm
+++ b/maps/Route28.asm
@@ -22,8 +22,8 @@
.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
--- a/maps/Route28FamousSpeechHouse.asm
+++ b/maps/Route28FamousSpeechHouse.asm
@@ -74,8 +74,8 @@
.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
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -416,7 +416,7 @@
.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
--- a/maps/Route2946Gate.asm
+++ b/maps/Route2946Gate.asm
@@ -38,10 +38,10 @@
.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
--- a/maps/Route2Gate.asm
+++ b/maps/Route2Gate.asm
@@ -28,10 +28,10 @@
.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
--- a/maps/Route2NuggetSpeechHouse.asm
+++ b/maps/Route2NuggetSpeechHouse.asm
@@ -55,8 +55,8 @@
.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
--- a/maps/Route3.asm
+++ b/maps/Route3.asm
@@ -132,7 +132,7 @@
.Warps:
db 1
- warp_def $1, $34, 1, GROUP_MOUNT_MOON, MAP_MOUNT_MOON
+ warp_def $1, $34, 1, MOUNT_MOON
.XYTriggers:
db 0
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -400,8 +400,8 @@
.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
--- a/maps/Route30BerrySpeechHouse.asm
+++ b/maps/Route30BerrySpeechHouse.asm
@@ -49,8 +49,8 @@
.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
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -416,9 +416,9 @@
.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
--- a/maps/Route31VioletGate.asm
+++ b/maps/Route31VioletGate.asm
@@ -29,10 +29,10 @@
.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
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -925,10 +925,10 @@
.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
--- a/maps/Route32PokeCenter1F.asm
+++ b/maps/Route32PokeCenter1F.asm
@@ -95,9 +95,9 @@
.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
--- a/maps/Route32RuinsofAlphGate.asm
+++ b/maps/Route32RuinsofAlphGate.asm
@@ -47,10 +47,10 @@
.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
--- a/maps/Route33.asm
+++ b/maps/Route33.asm
@@ -195,7 +195,7 @@
.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
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -756,11 +756,11 @@
.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
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -138,10 +138,10 @@
.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
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -455,9 +455,9 @@
.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
--- a/maps/Route35Goldenrodgate.asm
+++ b/maps/Route35Goldenrodgate.asm
@@ -196,10 +196,10 @@
.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
--- a/maps/Route35NationalParkgate.asm
+++ b/maps/Route35NationalParkgate.asm
@@ -77,7 +77,7 @@
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 @@
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 @@
.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
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -40,7 +40,7 @@
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 @@
.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
--- a/maps/Route36NationalParkgate.asm
+++ b/maps/Route36NationalParkgate.asm
@@ -85,7 +85,7 @@
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 @@
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 @@
.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
--- a/maps/Route36RuinsofAlphgate.asm
+++ b/maps/Route36RuinsofAlphgate.asm
@@ -36,10 +36,10 @@
.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
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -469,8 +469,8 @@
.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
--- a/maps/Route38EcruteakGate.asm
+++ b/maps/Route38EcruteakGate.asm
@@ -27,10 +27,10 @@
.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
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -338,8 +338,8 @@
.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
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@@ -189,8 +189,8 @@
.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
--- a/maps/Route39Farmhouse.asm
+++ b/maps/Route39Farmhouse.asm
@@ -194,8 +194,8 @@
.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
--- a/maps/Route4.asm
+++ b/maps/Route4.asm
@@ -121,7 +121,7 @@
.Warps:
db 1
- warp_def $5, $2, 2, GROUP_MOUNT_MOON, MAP_MOUNT_MOON
+ warp_def $5, $2, 2, MOUNT_MOON
.XYTriggers:
db 0
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -332,7 +332,7 @@
.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
--- a/maps/Route40BattleTowerGate.asm
+++ b/maps/Route40BattleTowerGate.asm
@@ -75,10 +75,10 @@
.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
--- a/maps/Route41.asm
+++ b/maps/Route41.asm
@@ -335,10 +335,10 @@
.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
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -24,7 +24,7 @@
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 @@
.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
--- a/maps/Route42EcruteakGate.asm
+++ b/maps/Route42EcruteakGate.asm
@@ -22,10 +22,10 @@
.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
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -12,11 +12,11 @@
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 @@
.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
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -23,11 +23,11 @@
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 @@
.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
--- a/maps/Route43MahoganyGate.asm
+++ b/maps/Route43MahoganyGate.asm
@@ -41,10 +41,10 @@
.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
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -500,7 +500,7 @@
.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
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -523,7 +523,7 @@
.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
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -248,9 +248,9 @@
.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
--- a/maps/Route5.asm
+++ b/maps/Route5.asm
@@ -42,10 +42,10 @@
.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
--- a/maps/Route5CleanseTagSpeechHouse.asm
+++ b/maps/Route5CleanseTagSpeechHouse.asm
@@ -62,8 +62,8 @@
.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
--- a/maps/Route5SaffronCityGate.asm
+++ b/maps/Route5SaffronCityGate.asm
@@ -23,10 +23,10 @@
.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
--- a/maps/Route5UndergroundEntrance.asm
+++ b/maps/Route5UndergroundEntrance.asm
@@ -22,9 +22,9 @@
.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
--- a/maps/Route6.asm
+++ b/maps/Route6.asm
@@ -92,8 +92,8 @@
.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
--- a/maps/Route6SaffronGate.asm
+++ b/maps/Route6SaffronGate.asm
@@ -62,10 +62,10 @@
.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
--- a/maps/Route6UndergroundEntrance.asm
+++ b/maps/Route6UndergroundEntrance.asm
@@ -11,9 +11,9 @@
.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
--- a/maps/Route7.asm
+++ b/maps/Route7.asm
@@ -40,8 +40,8 @@
.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
--- a/maps/Route7SaffronGate.asm
+++ b/maps/Route7SaffronGate.asm
@@ -48,10 +48,10 @@
.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
--- a/maps/Route8.asm
+++ b/maps/Route8.asm
@@ -170,8 +170,8 @@
.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
--- a/maps/Route8SaffronGate.asm
+++ b/maps/Route8SaffronGate.asm
@@ -22,10 +22,10 @@
.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
--- a/maps/Route9.asm
+++ b/maps/Route9.asm
@@ -204,7 +204,7 @@
.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
--- a/maps/RuinsofAlphAerodactylChamber.asm
+++ b/maps/RuinsofAlphAerodactylChamber.asm
@@ -64,7 +64,7 @@
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 @@
.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
--- a/maps/RuinsofAlphAerodactylItemRoom.asm
+++ b/maps/RuinsofAlphAerodactylItemRoom.asm
@@ -32,10 +32,10 @@
.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
--- a/maps/RuinsofAlphAerodactylWordRoom.asm
+++ b/maps/RuinsofAlphAerodactylWordRoom.asm
@@ -11,9 +11,9 @@
.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
--- a/maps/RuinsofAlphHoOhChamber.asm
+++ b/maps/RuinsofAlphHoOhChamber.asm
@@ -65,7 +65,7 @@
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 @@
.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
--- a/maps/RuinsofAlphHoOhItemRoom.asm
+++ b/maps/RuinsofAlphHoOhItemRoom.asm
@@ -32,10 +32,10 @@
.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
--- a/maps/RuinsofAlphHoOhWordRoom.asm
+++ b/maps/RuinsofAlphHoOhWordRoom.asm
@@ -11,9 +11,9 @@
.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
--- a/maps/RuinsofAlphInnerChamber.asm
+++ b/maps/RuinsofAlphInnerChamber.asm
@@ -81,15 +81,15 @@
.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
--- a/maps/RuinsofAlphKabutoChamber.asm
+++ b/maps/RuinsofAlphKabutoChamber.asm
@@ -70,7 +70,7 @@
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 @@
.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
--- a/maps/RuinsofAlphKabutoItemRoom.asm
+++ b/maps/RuinsofAlphKabutoItemRoom.asm
@@ -32,10 +32,10 @@
.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
--- a/maps/RuinsofAlphKabutoWordRoom.asm
+++ b/maps/RuinsofAlphKabutoWordRoom.asm
@@ -11,9 +11,9 @@
.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
--- a/maps/RuinsofAlphOmanyteChamber.asm
+++ b/maps/RuinsofAlphOmanyteChamber.asm
@@ -65,7 +65,7 @@
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 @@
.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
--- a/maps/RuinsofAlphOmanyteItemRoom.asm
+++ b/maps/RuinsofAlphOmanyteItemRoom.asm
@@ -32,10 +32,10 @@
.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
--- a/maps/RuinsofAlphOmanyteWordRoom.asm
+++ b/maps/RuinsofAlphOmanyteWordRoom.asm
@@ -11,9 +11,9 @@
.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
--- a/maps/RuinsofAlphOutside.asm
+++ b/maps/RuinsofAlphOutside.asm
@@ -64,7 +64,7 @@
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 @@
.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
--- a/maps/RuinsofAlphResearchCenter.asm
+++ b/maps/RuinsofAlphResearchCenter.asm
@@ -398,8 +398,8 @@
.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
--- a/maps/SafariZoneBeta.asm
+++ b/maps/SafariZoneBeta.asm
@@ -11,8 +11,8 @@
.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
--- a/maps/SafariZoneFuchsiaGateBeta.asm
+++ b/maps/SafariZoneFuchsiaGateBeta.asm
@@ -11,10 +11,10 @@
.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
--- a/maps/SafariZoneMainOffice.asm
+++ b/maps/SafariZoneMainOffice.asm
@@ -11,8 +11,8 @@
.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
--- a/maps/SafariZoneWardensHome.asm
+++ b/maps/SafariZoneWardensHome.asm
@@ -79,8 +79,8 @@
.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
--- a/maps/SaffronCity.asm
+++ b/maps/SaffronCity.asm
@@ -263,21 +263,21 @@
.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
--- a/maps/SaffronGym.asm
+++ b/maps/SaffronGym.asm
@@ -288,38 +288,38 @@
.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
--- a/maps/SaffronMart.asm
+++ b/maps/SaffronMart.asm
@@ -38,8 +38,8 @@
.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
--- a/maps/SaffronPokeCenter1F.asm
+++ b/maps/SaffronPokeCenter1F.asm
@@ -111,9 +111,9 @@
.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
--- a/maps/SaffronPokeCenter2FBeta.asm
+++ b/maps/SaffronPokeCenter2FBeta.asm
@@ -11,7 +11,7 @@
.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
--- a/maps/SaffronTrainStation.asm
+++ b/maps/SaffronTrainStation.asm
@@ -217,10 +217,10 @@
.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
--- a/maps/SeafoamGym.asm
+++ b/maps/SeafoamGym.asm
@@ -161,7 +161,7 @@
.Warps:
db 1
- warp_def $5, $5, 1, GROUP_ROUTE_20, MAP_ROUTE_20
+ warp_def $5, $5, 1, ROUTE_20
.XYTriggers:
db 0
--- a/maps/SilphCo1F.asm
+++ b/maps/SilphCo1F.asm
@@ -57,8 +57,8 @@
.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
--- a/maps/SilverCaveItemRooms.asm
+++ b/maps/SilverCaveItemRooms.asm
@@ -17,8 +17,8 @@
.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
--- a/maps/SilverCaveOutside.asm
+++ b/maps/SilverCaveOutside.asm
@@ -31,8 +31,8 @@
.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
--- a/maps/SilverCavePokeCenter1F.asm
+++ b/maps/SilverCavePokeCenter1F.asm
@@ -31,9 +31,9 @@
.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
--- a/maps/SilverCaveRoom1.asm
+++ b/maps/SilverCaveRoom1.asm
@@ -31,8 +31,8 @@
.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
--- a/maps/SilverCaveRoom2.asm
+++ b/maps/SilverCaveRoom2.asm
@@ -24,10 +24,10 @@
.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
--- a/maps/SilverCaveRoom3.asm
+++ b/maps/SilverCaveRoom3.asm
@@ -53,7 +53,7 @@
.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
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -46,7 +46,7 @@
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 @@
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 @@
.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
--- a/maps/SlowpokeWellB2F.asm
+++ b/maps/SlowpokeWellB2F.asm
@@ -63,7 +63,7 @@
.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
--- a/maps/SoulHouse.asm
+++ b/maps/SoulHouse.asm
@@ -72,8 +72,8 @@
.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
--- a/maps/SproutTower1F.asm
+++ b/maps/SproutTower1F.asm
@@ -100,11 +100,11 @@
.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
--- a/maps/SproutTower2F.asm
+++ b/maps/SproutTower2F.asm
@@ -85,10 +85,10 @@
.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
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -328,7 +328,7 @@
.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
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -730,10 +730,10 @@
.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
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -906,11 +906,11 @@
.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
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -561,10 +561,10 @@
.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
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -34,7 +34,7 @@
TimeCapsule_Initialize:
dotrigger $1
- domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $3
+ domaptrigger POKECENTER_2F, $3
end
MapTimeCapsuleSignpost1Script:
@@ -60,8 +60,8 @@
.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
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -119,11 +119,11 @@
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 @@
.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
--- a/maps/TinTower2F.asm
+++ b/maps/TinTower2F.asm
@@ -11,8 +11,8 @@
.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
--- a/maps/TinTower3F.asm
+++ b/maps/TinTower3F.asm
@@ -14,8 +14,8 @@
.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
--- a/maps/TinTower4F.asm
+++ b/maps/TinTower4F.asm
@@ -24,10 +24,10 @@
.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
--- a/maps/TinTower5F.asm
+++ b/maps/TinTower5F.asm
@@ -22,10 +22,10 @@
.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
--- a/maps/TinTower6F.asm
+++ b/maps/TinTower6F.asm
@@ -14,8 +14,8 @@
.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
--- a/maps/TinTower7F.asm
+++ b/maps/TinTower7F.asm
@@ -14,11 +14,11 @@
.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
--- a/maps/TinTower8F.asm
+++ b/maps/TinTower8F.asm
@@ -20,12 +20,12 @@
.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
--- a/maps/TinTower9F.asm
+++ b/maps/TinTower9F.asm
@@ -22,13 +22,13 @@
.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
--- a/maps/TinTowerRoof.asm
+++ b/maps/TinTowerRoof.asm
@@ -50,7 +50,7 @@
.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
--- a/maps/TohjoFalls.asm
+++ b/maps/TohjoFalls.asm
@@ -14,8 +14,8 @@
.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
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -34,7 +34,7 @@
TradeCenter_Initialize:
dotrigger $1
- domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $1
+ domaptrigger POKECENTER_2F, $1
end
MapTradeCenterSignpost1Script:
@@ -60,8 +60,8 @@
.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
--- a/maps/TrainerHouse1F.asm
+++ b/maps/TrainerHouse1F.asm
@@ -136,9 +136,9 @@
.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
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -173,7 +173,7 @@
.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
--- a/maps/Underground.asm
+++ b/maps/Underground.asm
@@ -19,8 +19,8 @@
.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
--- a/maps/UndergroundPathSwitchRoomEntrances.asm
+++ b/maps/UndergroundPathSwitchRoomEntrances.asm
@@ -119,7 +119,7 @@
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 @@
.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
--- a/maps/UndergroundWarehouse.asm
+++ b/maps/UndergroundWarehouse.asm
@@ -210,9 +210,9 @@
.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
--- a/maps/UnionCave1F.asm
+++ b/maps/UnionCave1F.asm
@@ -194,10 +194,10 @@
.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
--- a/maps/UnionCaveB1F.asm
+++ b/maps/UnionCaveB1F.asm
@@ -149,11 +149,11 @@
.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
--- a/maps/UnionCaveB2F.asm
+++ b/maps/UnionCaveB2F.asm
@@ -142,7 +142,7 @@
.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
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -267,16 +267,16 @@
.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
--- a/maps/VermilionGym.asm
+++ b/maps/VermilionGym.asm
@@ -259,8 +259,8 @@
.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
--- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm
+++ b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm
@@ -23,8 +23,8 @@
.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
--- a/maps/VermilionHouseFishingSpeechHouse.asm
+++ b/maps/VermilionHouseFishingSpeechHouse.asm
@@ -53,8 +53,8 @@
.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
--- a/maps/VermilionMagnetTrainSpeechHouse.asm
+++ b/maps/VermilionMagnetTrainSpeechHouse.asm
@@ -35,8 +35,8 @@
.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
--- a/maps/VermilionMart.asm
+++ b/maps/VermilionMart.asm
@@ -37,8 +37,8 @@
.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
--- a/maps/VermilionPokeCenter1F.asm
+++ b/maps/VermilionPokeCenter1F.asm
@@ -76,9 +76,9 @@
.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
--- a/maps/VermilionPokeCenter2FBeta.asm
+++ b/maps/VermilionPokeCenter2FBeta.asm
@@ -11,7 +11,7 @@
.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
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -33,7 +33,7 @@
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 @@
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 @@
.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
--- a/maps/VermilionPortPassage.asm
+++ b/maps/VermilionPortPassage.asm
@@ -21,11 +21,11 @@
.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
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -240,16 +240,16 @@
.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
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -100,14 +100,14 @@
.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
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -276,15 +276,15 @@
.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
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -30,7 +30,7 @@
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 @@
.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
--- a/maps/VioletMart.asm
+++ b/maps/VioletMart.asm
@@ -49,8 +49,8 @@
.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
--- a/maps/VioletNicknameSpeechHouse.asm
+++ b/maps/VioletNicknameSpeechHouse.asm
@@ -45,8 +45,8 @@
.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
--- a/maps/VioletOnixTradeHouse.asm
+++ b/maps/VioletOnixTradeHouse.asm
@@ -34,8 +34,8 @@
.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
--- a/maps/VioletPokeCenter1F.asm
+++ b/maps/VioletPokeCenter1F.asm
@@ -25,7 +25,7 @@
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 @@
.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
--- a/maps/ViridianCity.asm
+++ b/maps/ViridianCity.asm
@@ -217,11 +217,11 @@
.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
--- a/maps/ViridianGym.asm
+++ b/maps/ViridianGym.asm
@@ -170,8 +170,8 @@
.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
--- a/maps/ViridianMart.asm
+++ b/maps/ViridianMart.asm
@@ -37,8 +37,8 @@
.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
--- a/maps/ViridianNicknameSpeechHouse.asm
+++ b/maps/ViridianNicknameSpeechHouse.asm
@@ -61,8 +61,8 @@
.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
--- a/maps/ViridianPokeCenter1F.asm
+++ b/maps/ViridianPokeCenter1F.asm
@@ -71,9 +71,9 @@
.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
--- a/maps/ViridianPokeCenter2FBeta.asm
+++ b/maps/ViridianPokeCenter2FBeta.asm
@@ -11,7 +11,7 @@
.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
--- a/maps/WarehouseEntrance.asm
+++ b/maps/WarehouseEntrance.asm
@@ -649,12 +649,12 @@
.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
--- a/maps/WhirlIslandB1F.asm
+++ b/maps/WhirlIslandB1F.asm
@@ -41,15 +41,15 @@
.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
--- a/maps/WhirlIslandB2F.asm
+++ b/maps/WhirlIslandB2F.asm
@@ -20,10 +20,10 @@
.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
--- a/maps/WhirlIslandCave.asm
+++ b/maps/WhirlIslandCave.asm
@@ -11,8 +11,8 @@
.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
--- a/maps/WhirlIslandLugiaChamber.asm
+++ b/maps/WhirlIslandLugiaChamber.asm
@@ -49,7 +49,7 @@
.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
--- a/maps/WhirlIslandNE.asm
+++ b/maps/WhirlIslandNE.asm
@@ -14,9 +14,9 @@
.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
--- a/maps/WhirlIslandNW.asm
+++ b/maps/WhirlIslandNW.asm
@@ -11,10 +11,10 @@
.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
--- a/maps/WhirlIslandSE.asm
+++ b/maps/WhirlIslandSE.asm
@@ -11,8 +11,8 @@
.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
--- a/maps/WhirlIslandSW.asm
+++ b/maps/WhirlIslandSW.asm
@@ -14,11 +14,11 @@
.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
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -136,9 +136,9 @@
.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
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -347,9 +347,9 @@
.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