Game-Decompilation/pokecrystal
1
0
Fork 0
mirror of https://github.com/pret/pokecrystal.git synced 2024-11-24 05:50:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replaced GROUP_, MAP_ references with the map macro

Browse Source 
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
This commit is contained in:
PikalaxALT 2015-07-23 12:59:19 -04:00
parent 185b0a1c86
commit 432df825d4
389 changed files with 1551 additions and 1551 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
constants/map_constants.asm
View File

@ -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

4
engine/phone_scripts.asm
View File

@ -1001,7 +1001,7 @@ UnknownScript_0xbd6a6:
iftrue UnknownScript_0xbd6bd
setflag ENGINE_DUNSPARCE_SWARM
pokenamemem DUNSPARCE, $1
loadwilddata $0, GROUP_DARK_CAVE_VIOLET_ENTRANCE, MAP_DARK_CAVE_VIOLET_ENTRANCE
loadwilddata $0, DARK_CAVE_VIOLET_ENTRANCE
displaylocation DARK_CAVE, $2
farjump UnknownScript_0xa05de
@ -1224,7 +1224,7 @@ UnknownScript_0xbd887:
iftrue UnknownScript_0xbd8a2
setflag ENGINE_YANMA_SWARM
pokenamemem YANMA, $1
loadwilddata $1, GROUP_ROUTE_35, MAP_ROUTE_35
loadwilddata $1, ROUTE_35
displaylocation ROUTE_35, $2
farjump UnknownScript_0xa05ce

2
engine/spawn_points.asm
View File

@ -89,7 +89,7 @@ IsSpawnPoint: ; 15344
.next
push bc
ld bc, 4
ld bc, 4 ; length of a spawn table entry
add hl, bc
pop bc
inc c

6
engine/std_scripts.asm
View File

@ -298,7 +298,7 @@ RadioTowerRocketsScript:
clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
specialphonecall ELMCALL_WEIRDBROADCAST
domaptrigger GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN, $1
domaptrigger MAHOGANY_TOWN, $1
end
BugContestResultsWarpScript:
@ -307,7 +307,7 @@ BugContestResultsWarpScript:
setevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
clearevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
setevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
warp GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE, $0, $4
warp ROUTE_36_NATIONAL_PARK_GATE, $0, $4
applymovement $0, Movement_ContestResults_WalkAfterWarp
BugContestResultsScript:
@ -356,7 +356,7 @@ BugContestResults_DidNotLeaveMons
BugContestResults_CleanUp
loadmovesprites
dotrigger $0
domaptrigger GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE, $0
domaptrigger ROUTE_35_NATIONAL_PARK_GATE, $0
setevent EVENT_BUG_CATCHING_CONTESTANT_1A
setevent EVENT_BUG_CATCHING_CONTESTANT_2A
setevent EVENT_BUG_CATCHING_CONTESTANT_3A

31
macros/event.asm
View File

@ -120,16 +120,14 @@ ptcallasm: macro
enum checkmaptriggers_command
checkmaptriggers: macro
db checkmaptriggers_command
db \1 ; map_group
db \2 ; map_id
map \1 ; map
endm
enum domaptrigger_command
domaptrigger: macro
db domaptrigger_command
db \1 ; map_group
db \2 ; map_id
db \3 ; trigger_id
map \1 ; map
db \2 ; trigger_id
endm
enum checktriggers_command
@ -385,24 +383,21 @@ xycompare: macro
warpmod: macro
db warpmod_command
db \1 ; warp_id
db \2 ; map_group
db \3 ; map_id
map \2 ; map
endm
enum blackoutmod_command
blackoutmod: macro
db blackoutmod_command
db \1 ; map_group
db \2 ; map_id
map \1 ; map
endm
enum warp_command
warp: macro
db warp_command
db \1 ; map_group
db \2 ; map_id
db \3 ; x
db \4 ; y
map \1 ; map
db \2 ; x
db \3 ; y
endm
enum readmoney_command
@ -997,8 +992,7 @@ verbosegiveitem2: macro
loadwilddata: macro
db loadwilddata_command
db \1 ; flag
db \2 ; map_group
db \3 ; map_id
map \2 ; map
endm
enum halloffame_command
@ -1015,10 +1009,9 @@ credits: macro
warpfacing: macro
db warpfacing_command
db \1 ; facing
db \2 ; map_group
db \3 ; map_id
db \4 ; x
db \5 ; y
map \2 ; map
db \3 ; x
db \4 ; y
endm
enum storetext_command

8
macros/map.asm
View File

@ -61,8 +61,7 @@ warp_def: macro
db \1 ; y
db \2 ; x
db \3 ; warp_to
db \4 ; map group
db \5 ; map number
map \4 ; map
endm
@ -177,3 +176,8 @@ newgroup: MACRO
const_value = const_value + 1
enum_start 1
ENDM
elevfloor: MACRO
db \1, \2
map \3
ENDM

4
maps/AzaleaGym.asm
View File

@ -358,8 +358,8 @@ AzaleaGym_MapEventHeader:
.Warps:
db 2
warp_def $f, $4, 5, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN
warp_def $f, $5, 5, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN
warp_def $f, $4, 5, AZALEA_TOWN
warp_def $f, $5, 5, AZALEA_TOWN
.XYTriggers:
db 0

4
maps/AzaleaMart.asm
View File

@ -46,8 +46,8 @@ AzaleaMart_MapEventHeader:
.Warps:
db 2
warp_def $7, $2, 3, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN
warp_def $7, $3, 3, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN
warp_def $7, $2, 3, AZALEA_TOWN
warp_def $7, $3, 3, AZALEA_TOWN
.XYTriggers:
db 0

6
maps/AzaleaPokeCenter1F.asm
View File

@ -78,9 +78,9 @@ AzaleaPokeCenter1F_MapEventHeader:
.Warps:
db 3
warp_def $7, $3, 1, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN
warp_def $7, $4, 1, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN
warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F
warp_def $7, $3, 1, AZALEA_TOWN
warp_def $7, $4, 1, AZALEA_TOWN
warp_def $7, $0, 1, POKECENTER_2F
.XYTriggers:
db 0

16
maps/AzaleaTown.asm
View File

@ -452,14 +452,14 @@ AzaleaTown_MapEventHeader:
.Warps:
db 8
warp_def $9, $f, 1, GROUP_AZALEA_POKECENTER_1F, MAP_AZALEA_POKECENTER_1F
warp_def $d, $15, 1, GROUP_CHARCOAL_KILN, MAP_CHARCOAL_KILN
warp_def $5, $15, 2, GROUP_AZALEA_MART, MAP_AZALEA_MART
warp_def $5, $9, 1, GROUP_KURTS_HOUSE, MAP_KURTS_HOUSE
warp_def $f, $a, 1, GROUP_AZALEA_GYM, MAP_AZALEA_GYM
warp_def $7, $1f, 1, GROUP_SLOWPOKE_WELL_B1F, MAP_SLOWPOKE_WELL_B1F
warp_def $a, $2, 3, GROUP_ILEX_FOREST_AZALEA_GATE, MAP_ILEX_FOREST_AZALEA_GATE
warp_def $b, $2, 4, GROUP_ILEX_FOREST_AZALEA_GATE, MAP_ILEX_FOREST_AZALEA_GATE
warp_def $9, $f, 1, AZALEA_POKECENTER_1F
warp_def $d, $15, 1, CHARCOAL_KILN
warp_def $5, $15, 2, AZALEA_MART
warp_def $5, $9, 1, KURTS_HOUSE
warp_def $f, $a, 1, AZALEA_GYM
warp_def $7, $1f, 1, SLOWPOKE_WELL_B1F
warp_def $a, $2, 3, ILEX_FOREST_AZALEA_GATE
warp_def $b, $2, 4, ILEX_FOREST_AZALEA_GATE
.XYTriggers:
db 3

12
maps/BattleTower1F.asm
View File

@ -102,9 +102,9 @@ UnknownScript_0x9e44e:
special Function170687
UnknownScript_0x9e454:
musicfadeout MUSIC_NONE, $8
domaptrigger GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM, $0
domaptrigger GROUP_BATTLE_TOWER_ELEVATOR, MAP_BATTLE_TOWER_ELEVATOR, $0
domaptrigger GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY, $0
domaptrigger BATTLE_TOWER_BATTLE_ROOM, $0
domaptrigger BATTLE_TOWER_ELEVATOR, $0
domaptrigger BATTLE_TOWER_HALLWAY, $0
follow $2, $0
applymovement $2, MovementData_0x9e571
writebyte $a
@ -797,9 +797,9 @@ BattleTower1F_MapEventHeader:
.Warps:
db 3
warp_def $9, $7, 3, GROUP_BATTLE_TOWER_OUTSIDE, MAP_BATTLE_TOWER_OUTSIDE
warp_def $9, $8, 4, GROUP_BATTLE_TOWER_OUTSIDE, MAP_BATTLE_TOWER_OUTSIDE
warp_def $0, $7, 1, GROUP_BATTLE_TOWER_ELEVATOR, MAP_BATTLE_TOWER_ELEVATOR
warp_def $9, $7, 3, BATTLE_TOWER_OUTSIDE
warp_def $9, $8, 4, BATTLE_TOWER_OUTSIDE
warp_def $0, $7, 1, BATTLE_TOWER_ELEVATOR
.XYTriggers:
db 0

10
maps/BattleTowerBattleRoom.asm
View File

@ -85,14 +85,14 @@ UnknownScript_0x9f4a3:
special Function170687
loadmovesprites
special FadeBlackBGMap
warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7
warpfacing $1, BATTLE_TOWER_1F, $7, $7
loadfont
jump UnknownScript_0x9e4b0
UnknownScript_0x9f4c2:
pause 60
special Special_BattleTowerFade
warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7
warpfacing $1, BATTLE_TOWER_1F, $7, $7
writebyte $4
special Function170687
loadfont
@ -104,7 +104,7 @@ UnknownScript_0x9f4c2:
UnknownScript_0x9f4d9:
pause 60
special Special_BattleTowerFade
warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7
warpfacing $1, BATTLE_TOWER_1F, $7, $7
BattleTowerBattleRoomScript_0x9f4e4:
loadfont
writetext UnknownText_0x9eaef
@ -144,8 +144,8 @@ BattleTowerBattleRoom_MapEventHeader:
.Warps:
db 2
warp_def $7, $3, 4, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY
warp_def $7, $4, 4, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY
warp_def $7, $3, 4, BATTLE_TOWER_HALLWAY
warp_def $7, $4, 4, BATTLE_TOWER_HALLWAY
.XYTriggers:
db 0

4
maps/BattleTowerElevator.asm
View File

@ -49,8 +49,8 @@ BattleTowerElevator_MapEventHeader:
.Warps:
db 2
warp_def $3, $1, 1, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY
warp_def $3, $2, 1, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY
warp_def $3, $1, 1, BATTLE_TOWER_HALLWAY
warp_def $3, $2, 1, BATTLE_TOWER_HALLWAY
.XYTriggers:
db 0

12
maps/BattleTowerHallway.asm
View File

@ -81,12 +81,12 @@ BattleTowerHallway_MapEventHeader:
.Warps:
db 6
warp_def $1, $b, 1, GROUP_BATTLE_TOWER_ELEVATOR, MAP_BATTLE_TOWER_ELEVATOR
warp_def $0, $5, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM
warp_def $0, $7, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM
warp_def $0, $9, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM
warp_def $0, $d, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM
warp_def $0, $f, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM
warp_def $1, $b, 1, BATTLE_TOWER_ELEVATOR
warp_def $0, $5, 1, BATTLE_TOWER_BATTLE_ROOM
warp_def $0, $7, 1, BATTLE_TOWER_BATTLE_ROOM
warp_def $0, $9, 1, BATTLE_TOWER_BATTLE_ROOM
warp_def $0, $d, 1, BATTLE_TOWER_BATTLE_ROOM
warp_def $0, $f, 1, BATTLE_TOWER_BATTLE_ROOM
.XYTriggers:
db 0

8
maps/BattleTowerOutside.asm
View File

@ -128,10 +128,10 @@ BattleTowerOutside_MapEventHeader:
.Warps:
db 4
warp_def $15, $8, 3, GROUP_ROUTE_40_BATTLE_TOWER_GATE, MAP_ROUTE_40_BATTLE_TOWER_GATE
warp_def $15, $9, 4, GROUP_ROUTE_40_BATTLE_TOWER_GATE, MAP_ROUTE_40_BATTLE_TOWER_GATE
warp_def $9, $8, 1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F
warp_def $9, $9, 2, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F
warp_def $15, $8, 3, ROUTE_40_BATTLE_TOWER_GATE
warp_def $15, $9, 4, ROUTE_40_BATTLE_TOWER_GATE
warp_def $9, $8, 1, BATTLE_TOWER_1F
warp_def $9, $9, 2, BATTLE_TOWER_1F
.XYTriggers:
db 0

4
maps/BillsHouse.asm
View File

@ -356,8 +356,8 @@ BillsHouse_MapEventHeader:
.Warps:
db 2
warp_def $7, $2, 1, GROUP_ROUTE_25, MAP_ROUTE_25
warp_def $7, $3, 1, GROUP_ROUTE_25, MAP_ROUTE_25
warp_def $7, $2, 1, ROUTE_25
warp_def $7, $3, 1, ROUTE_25
.XYTriggers:
db 0

16
maps/BlackthornCity.asm
View File

@ -309,14 +309,14 @@ BlackthornCity_MapEventHeader:
.Warps:
db 8
warp_def $b, $12, 1, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F
warp_def $15, $d, 1, GROUP_BLACKTHORN_DRAGON_SPEECH_HOUSE, MAP_BLACKTHORN_DRAGON_SPEECH_HOUSE
warp_def $17, $1d, 1, GROUP_BLACKTHORN_DODRIO_TRADE_HOUSE, MAP_BLACKTHORN_DODRIO_TRADE_HOUSE
warp_def $1d, $f, 2, GROUP_BLACKTHORN_MART, MAP_BLACKTHORN_MART
warp_def $1d, $15, 1, GROUP_BLACKTHORN_POKECENTER_1F, MAP_BLACKTHORN_POKECENTER_1F
warp_def $1f, $9, 1, GROUP_MOVE_DELETERS_HOUSE, MAP_MOVE_DELETERS_HOUSE
warp_def $9, $24, 2, GROUP_ICE_PATH_1F, MAP_ICE_PATH_1F
warp_def $1, $14, 1, GROUP_DRAGONS_DEN_1F, MAP_DRAGONS_DEN_1F
warp_def $b, $12, 1, BLACKTHORN_GYM_1F
warp_def $15, $d, 1, BLACKTHORN_DRAGON_SPEECH_HOUSE
warp_def $17, $1d, 1, BLACKTHORN_DODRIO_TRADE_HOUSE
warp_def $1d, $f, 2, BLACKTHORN_MART
warp_def $1d, $15, 1, BLACKTHORN_POKECENTER_1F
warp_def $1f, $9, 1, MOVE_DELETERS_HOUSE
warp_def $9, $24, 2, ICE_PATH_1F
warp_def $1, $14, 1, DRAGONS_DEN_1F
.XYTriggers:
db 0

4
maps/BlackthornDodrioTradeHouse.asm
View File

@ -22,8 +22,8 @@ BlackthornDodrioTradeHouse_MapEventHeader:
.Warps:
db 2
warp_def $7, $2, 3, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY
warp_def $7, $3, 3, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY
warp_def $7, $2, 3, BLACKTHORN_CITY
warp_def $7, $3, 3, BLACKTHORN_CITY
.XYTriggers:
db 0

4
maps/BlackthornDragonSpeechHouse.asm
View File

@ -47,8 +47,8 @@ BlackthornDragonSpeechHouse_MapEventHeader:
.Warps:
db 2
warp_def $7, $2, 2, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY
warp_def $7, $3, 2, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY
warp_def $7, $2, 2, BLACKTHORN_CITY
warp_def $7, $3, 2, BLACKTHORN_CITY
.XYTriggers:
db 0

14
maps/BlackthornGym1F.asm
View File

@ -386,13 +386,13 @@ BlackthornGym1F_MapEventHeader:
.Warps:
db 7
warp_def $11, $4, 1, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY
warp_def $11, $5, 1, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY
warp_def $7, $1, 1, GROUP_BLACKTHORN_GYM_2F, MAP_BLACKTHORN_GYM_2F
warp_def $9, $7, 2, GROUP_BLACKTHORN_GYM_2F, MAP_BLACKTHORN_GYM_2F
warp_def $6, $2, 3, GROUP_BLACKTHORN_GYM_2F, MAP_BLACKTHORN_GYM_2F
warp_def $7, $7, 4, GROUP_BLACKTHORN_GYM_2F, MAP_BLACKTHORN_GYM_2F
warp_def $6, $7, 5, GROUP_BLACKTHORN_GYM_2F, MAP_BLACKTHORN_GYM_2F
warp_def $11, $4, 1, BLACKTHORN_CITY
warp_def $11, $5, 1, BLACKTHORN_CITY
warp_def $7, $1, 1, BLACKTHORN_GYM_2F
warp_def $9, $7, 2, BLACKTHORN_GYM_2F
warp_def $6, $2, 3, BLACKTHORN_GYM_2F
warp_def $7, $7, 4, BLACKTHORN_GYM_2F
warp_def $6, $7, 5, BLACKTHORN_GYM_2F
.XYTriggers:
db 0

10
maps/BlackthornGym2F.asm
View File

@ -131,11 +131,11 @@ BlackthornGym2F_MapEventHeader:
.Warps:
db 5
warp_def $7, $1, 3, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F
warp_def $9, $7, 4, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F
warp_def $5, $2, 5, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F
warp_def $7, $8, 6, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F
warp_def $3, $8, 7, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F
warp_def $7, $1, 3, BLACKTHORN_GYM_1F
warp_def $9, $7, 4, BLACKTHORN_GYM_1F
warp_def $5, $2, 5, BLACKTHORN_GYM_1F
warp_def $7, $8, 6, BLACKTHORN_GYM_1F
warp_def $3, $8, 7, BLACKTHORN_GYM_1F
.XYTriggers:
db 0

4
maps/BlackthornMart.asm
View File

@ -47,8 +47,8 @@ BlackthornMart_MapEventHeader:
.Warps:
db 2
warp_def $7, $2, 4, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY
warp_def $7, $3, 4, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY
warp_def $7, $2, 4, BLACKTHORN_CITY
warp_def $7, $3, 4, BLACKTHORN_CITY
.XYTriggers:
db 0

6
maps/BlackthornPokeCenter1F.asm
View File

@ -49,9 +49,9 @@ BlackthornPokeCenter1F_MapEventHeader:
.Warps:
db 3
warp_def $7, $3, 5, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY
warp_def $7, $4, 5, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY
warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F
warp_def $7, $3, 5, BLACKTHORN_CITY
warp_def $7, $4, 5, BLACKTHORN_CITY
warp_def $7, $0, 1, POKECENTER_2F
.XYTriggers:
db 0

4
maps/BluesHouse.asm
View File

@ -147,8 +147,8 @@ BluesHouse_MapEventHeader:
.Warps:
db 2
warp_def $7, $2, 2, GROUP_PALLET_TOWN, MAP_PALLET_TOWN
warp_def $7, $3, 2, GROUP_PALLET_TOWN, MAP_PALLET_TOWN
warp_def $7, $2, 2, PALLET_TOWN
warp_def $7, $3, 2, PALLET_TOWN
.XYTriggers:
db 0

8
maps/BrunosRoom.asm
View File

@ -132,10 +132,10 @@ BrunosRoom_MapEventHeader:
.Warps:
db 4
warp_def $11, $4, 3, GROUP_KOGAS_ROOM, MAP_KOGAS_ROOM
warp_def $11, $5, 4, GROUP_KOGAS_ROOM, MAP_KOGAS_ROOM
warp_def $2, $4, 1, GROUP_KARENS_ROOM, MAP_KARENS_ROOM
warp_def $2, $5, 2, GROUP_KARENS_ROOM, MAP_KARENS_ROOM
warp_def $11, $4, 3, KOGAS_ROOM
warp_def $11, $5, 4, KOGAS_ROOM
warp_def $2, $4, 1, KARENS_ROOM
warp_def $2, $5, 2, KARENS_ROOM
.XYTriggers:
db 0

28
maps/BurnedTower1F.asm
View File

@ -283,20 +283,20 @@ BurnedTower1F_MapEventHeader:
.Warps:
db 14
warp_def $f, $9, 13, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY
warp_def $f, $a, 13, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY
warp_def $9, $a, 1, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F
warp_def $5, $5, 1, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F
warp_def $6, $5, 1, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F
warp_def $6, $4, 1, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F
warp_def $4, $f, 2, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F
warp_def $5, $f, 2, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F
warp_def $7, $a, 3, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F
warp_def $e, $5, 4, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F
warp_def $e, $4, 4, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F
warp_def $e, $e, 5, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F
warp_def $e, $f, 5, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F
warp_def $f, $7, 6, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F
warp_def $f, $9, 13, ECRUTEAK_CITY
warp_def $f, $a, 13, ECRUTEAK_CITY
warp_def $9, $a, 1, BURNED_TOWER_B1F
warp_def $5, $5, 1, BURNED_TOWER_B1F
warp_def $6, $5, 1, BURNED_TOWER_B1F
warp_def $6, $4, 1, BURNED_TOWER_B1F
warp_def $4, $f, 2, BURNED_TOWER_B1F
warp_def $5, $f, 2, BURNED_TOWER_B1F
warp_def $7, $a, 3, BURNED_TOWER_B1F
warp_def $e, $5, 4, BURNED_TOWER_B1F
warp_def $e, $4, 4, BURNED_TOWER_B1F
warp_def $e, $e, 5, BURNED_TOWER_B1F
warp_def $e, $f, 5, BURNED_TOWER_B1F
warp_def $f, $7, 6, BURNED_TOWER_B1F
.XYTriggers:
db 1

16
maps/BurnedTowerB1F.asm
View File

@ -78,8 +78,8 @@ UnknownScript_0x18616b:
dotrigger $1
setevent EVENT_RELEASED_THE_BEASTS
special InitRoamMons
domaptrigger GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM, $1
domaptrigger GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY, $1
domaptrigger ECRUTEAK_GYM, $1
domaptrigger CIANWOOD_CITY, $1
clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
setevent EVENT_ECRUTEAK_GYM_GRAMPS
clearevent EVENT_ECRUTEAK_CITY_GRAMPS
@ -235,12 +235,12 @@ BurnedTowerB1F_MapEventHeader:
.Warps:
db 6
warp_def $9, $a, 3, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F
warp_def $7, $11, 7, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F
warp_def $8, $a, 9, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F
warp_def $d, $3, 10, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F
warp_def $e, $11, 12, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F
warp_def $f, $7, 14, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F
warp_def $9, $a, 3, BURNED_TOWER_1F
warp_def $7, $11, 7, BURNED_TOWER_1F
warp_def $8, $a, 9, BURNED_TOWER_1F
warp_def $d, $3, 10, BURNED_TOWER_1F
warp_def $e, $11, 12, BURNED_TOWER_1F
warp_def $f, $7, 14, BURNED_TOWER_1F
.XYTriggers:
db 1

4
maps/CeladonCafe.asm
View File

@ -206,8 +206,8 @@ CeladonCafe_MapEventHeader:
.Warps:
db 2
warp_def $7, $6, 9, GROUP_CELADON_CITY, MAP_CELADON_CITY
warp_def $7, $7, 9, GROUP_CELADON_CITY, MAP_CELADON_CITY
warp_def $7, $6, 9, CELADON_CITY
warp_def $7, $7, 9, CELADON_CITY
.XYTriggers:
db 0

18
maps/CeladonCity.asm
View File

@ -231,15 +231,15 @@ CeladonCity_MapEventHeader:
.Warps:
db 9
warp_def $9, $4, 1, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F
warp_def $9, $10, 1, GROUP_CELADON_MANSION_1F, MAP_CELADON_MANSION_1F
warp_def $3, $10, 3, GROUP_CELADON_MANSION_1F, MAP_CELADON_MANSION_1F
warp_def $3, $11, 3, GROUP_CELADON_MANSION_1F, MAP_CELADON_MANSION_1F
warp_def $9, $1d, 1, GROUP_CELADON_POKECENTER_1F, MAP_CELADON_POKECENTER_1F
warp_def $13, $12, 1, GROUP_CELADON_GAME_CORNER, MAP_CELADON_GAME_CORNER
warp_def $13, $17, 1, GROUP_CELADON_GAME_CORNER_PRIZE_ROOM, MAP_CELADON_GAME_CORNER_PRIZE_ROOM
warp_def $1d, $a, 1, GROUP_CELADON_GYM, MAP_CELADON_GYM
warp_def $1d, $19, 1, GROUP_CELADON_CAFE, MAP_CELADON_CAFE
warp_def $9, $4, 1, CELADON_DEPT_STORE_1F
warp_def $9, $10, 1, CELADON_MANSION_1F
warp_def $3, $10, 3, CELADON_MANSION_1F
warp_def $3, $11, 3, CELADON_MANSION_1F
warp_def $9, $1d, 1, CELADON_POKECENTER_1F
warp_def $13, $12, 1, CELADON_GAME_CORNER
warp_def $13, $17, 1, CELADON_GAME_CORNER_PRIZE_ROOM
warp_def $1d, $a, 1, CELADON_GYM
warp_def $1d, $19, 1, CELADON_CAFE
.XYTriggers:
db 0

8
maps/CeladonDeptStore1F.asm
View File

@ -74,10 +74,10 @@ CeladonDeptStore1F_MapEventHeader:
.Warps:
db 4
warp_def $7, $7, 1, GROUP_CELADON_CITY, MAP_CELADON_CITY
warp_def $7, $8, 1, GROUP_CELADON_CITY, MAP_CELADON_CITY
warp_def $0, $f, 2, GROUP_CELADON_DEPT_STORE_2F, MAP_CELADON_DEPT_STORE_2F
warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR
warp_def $7, $7, 1, CELADON_CITY
warp_def $7, $8, 1, CELADON_CITY
warp_def $0, $f, 2, CELADON_DEPT_STORE_2F
warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR
.XYTriggers:
db 0

6
maps/CeladonDeptStore2F.asm
View File

@ -68,9 +68,9 @@ CeladonDeptStore2F_MapEventHeader:
.Warps:
db 3
warp_def $0, $c, 1, GROUP_CELADON_DEPT_STORE_3F, MAP_CELADON_DEPT_STORE_3F
warp_def $0, $f, 3, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F
warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR
warp_def $0, $c, 1, CELADON_DEPT_STORE_3F
warp_def $0, $f, 3, CELADON_DEPT_STORE_1F
warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR
.XYTriggers:
db 0

6
maps/CeladonDeptStore3F.asm
View File

@ -93,9 +93,9 @@ CeladonDeptStore3F_MapEventHeader:
.Warps:
db 3
warp_def $0, $c, 1, GROUP_CELADON_DEPT_STORE_2F, MAP_CELADON_DEPT_STORE_2F
warp_def $0, $f, 2, GROUP_CELADON_DEPT_STORE_4F, MAP_CELADON_DEPT_STORE_4F
warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR
warp_def $0, $c, 1, CELADON_DEPT_STORE_2F
warp_def $0, $f, 2, CELADON_DEPT_STORE_4F
warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR
.XYTriggers:
db 0

6
maps/CeladonDeptStore4F.asm
View File

@ -51,9 +51,9 @@ CeladonDeptStore4F_MapEventHeader:
.Warps:
db 3
warp_def $0, $c, 1, GROUP_CELADON_DEPT_STORE_5F, MAP_CELADON_DEPT_STORE_5F
warp_def $0, $f, 2, GROUP_CELADON_DEPT_STORE_3F, MAP_CELADON_DEPT_STORE_3F
warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR
warp_def $0, $c, 1, CELADON_DEPT_STORE_5F
warp_def $0, $f, 2, CELADON_DEPT_STORE_3F
warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR
.XYTriggers:
db 0

6
maps/CeladonDeptStore5F.asm
View File

@ -70,9 +70,9 @@ CeladonDeptStore5F_MapEventHeader:
.Warps:
db 3
warp_def $0, $c, 1, GROUP_CELADON_DEPT_STORE_4F, MAP_CELADON_DEPT_STORE_4F
warp_def $0, $f, 1, GROUP_CELADON_DEPT_STORE_6F, MAP_CELADON_DEPT_STORE_6F
warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR
warp_def $0, $c, 1, CELADON_DEPT_STORE_4F
warp_def $0, $f, 1, CELADON_DEPT_STORE_6F
warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR
.XYTriggers:
db 0

4
maps/CeladonDeptStore6F.asm
View File

@ -151,8 +151,8 @@ CeladonDeptStore6F_MapEventHeader:
.Warps:
db 2
warp_def $0, $f, 2, GROUP_CELADON_DEPT_STORE_5F, MAP_CELADON_DEPT_STORE_5F
warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR
warp_def $0, $f, 2, CELADON_DEPT_STORE_5F
warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR
.XYTriggers:
db 0

16
maps/CeladonDeptStoreElevator.asm
View File

@ -20,12 +20,12 @@ UnknownScript_0x713bd:
Elevator_0x713be:
db 6 ; floors
db _1F, 4, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F
db _2F, 3, GROUP_CELADON_DEPT_STORE_2F, MAP_CELADON_DEPT_STORE_2F
db _3F, 3, GROUP_CELADON_DEPT_STORE_3F, MAP_CELADON_DEPT_STORE_3F
db _4F, 3, GROUP_CELADON_DEPT_STORE_4F, MAP_CELADON_DEPT_STORE_4F
db _5F, 3, GROUP_CELADON_DEPT_STORE_5F, MAP_CELADON_DEPT_STORE_5F
db _6F, 2, GROUP_CELADON_DEPT_STORE_6F, MAP_CELADON_DEPT_STORE_6F
elevfloor _1F, 4, CELADON_DEPT_STORE_1F
elevfloor _2F, 3, CELADON_DEPT_STORE_2F
elevfloor _3F, 3, CELADON_DEPT_STORE_3F
elevfloor _4F, 3, CELADON_DEPT_STORE_4F
elevfloor _5F, 3, CELADON_DEPT_STORE_5F
elevfloor _6F, 2, CELADON_DEPT_STORE_6F
db $ff ; end
@ -35,8 +35,8 @@ CeladonDeptStoreElevator_MapEventHeader:
.Warps:
db 2
warp_def $3, $1, 255, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F
warp_def $3, $2, 255, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F
warp_def $3, $1, 255, CELADON_DEPT_STORE_1F
warp_def $3, $2, 255, CELADON_DEPT_STORE_1F
.XYTriggers:
db 0

4
maps/CeladonGameCorner.asm
View File

@ -276,8 +276,8 @@ CeladonGameCorner_MapEventHeader:
.Warps:
db 2
warp_def $d, $e, 6, GROUP_CELADON_CITY, MAP_CELADON_CITY
warp_def $d, $f, 6, GROUP_CELADON_CITY, MAP_CELADON_CITY
warp_def $d, $e, 6, CELADON_CITY
warp_def $d, $f, 6, CELADON_CITY
.XYTriggers:
db 0

4
maps/CeladonGameCornerPrizeRoom.asm
View File

@ -271,8 +271,8 @@ CeladonGameCornerPrizeRoom_MapEventHeader:
.Warps:
db 2
warp_def $5, $2, 7, GROUP_CELADON_CITY, MAP_CELADON_CITY
warp_def $5, $3, 7, GROUP_CELADON_CITY, MAP_CELADON_CITY
warp_def $5, $2, 7, CELADON_CITY
warp_def $5, $3, 7, CELADON_CITY
.XYTriggers:
db 0

4
maps/CeladonGym.asm
View File

@ -265,8 +265,8 @@ CeladonGym_MapEventHeader:
.Warps:
db 2
warp_def $11, $4, 8, GROUP_CELADON_CITY, MAP_CELADON_CITY
warp_def $11, $5, 8, GROUP_CELADON_CITY, MAP_CELADON_CITY
warp_def $11, $4, 8, CELADON_CITY
warp_def $11, $5, 8, CELADON_CITY
.XYTriggers:
db 0

10
maps/CeladonMansion1F.asm
View File

@ -74,11 +74,11 @@ CeladonMansion1F_MapEventHeader:
.Warps:
db 5
warp_def $9, $6, 2, GROUP_CELADON_CITY, MAP_CELADON_CITY
warp_def $9, $7, 2, GROUP_CELADON_CITY, MAP_CELADON_CITY
warp_def $0, $3, 3, GROUP_CELADON_CITY, MAP_CELADON_CITY
warp_def $0, $0, 1, GROUP_CELADON_MANSION_2F, MAP_CELADON_MANSION_2F
warp_def $0, $7, 4, GROUP_CELADON_MANSION_2F, MAP_CELADON_MANSION_2F
warp_def $9, $6, 2, CELADON_CITY
warp_def $9, $7, 2, CELADON_CITY
warp_def $0, $3, 3, CELADON_CITY
warp_def $0, $0, 1, CELADON_MANSION_2F
warp_def $0, $7, 4, CELADON_MANSION_2F
.XYTriggers:
db 0

8
maps/CeladonMansion2F.asm
View File

@ -55,10 +55,10 @@ CeladonMansion2F_MapEventHeader:
.Warps:
db 4
warp_def $0, $0, 4, GROUP_CELADON_MANSION_1F, MAP_CELADON_MANSION_1F
warp_def $0, $1, 2, GROUP_CELADON_MANSION_3F, MAP_CELADON_MANSION_3F
warp_def $0, $6, 3, GROUP_CELADON_MANSION_3F, MAP_CELADON_MANSION_3F
warp_def $0, $7, 5, GROUP_CELADON_MANSION_1F, MAP_CELADON_MANSION_1F
warp_def $0, $0, 4, CELADON_MANSION_1F
warp_def $0, $1, 2, CELADON_MANSION_3F
warp_def $0, $6, 3, CELADON_MANSION_3F
warp_def $0, $7, 5, CELADON_MANSION_1F
.XYTriggers:
db 0

8
maps/CeladonMansion3F.asm
View File

@ -189,10 +189,10 @@ CeladonMansion3F_MapEventHeader:
.Warps:
db 4
warp_def $0, $0, 1, GROUP_CELADON_MANSION_ROOF, MAP_CELADON_MANSION_ROOF
warp_def $0, $1, 2, GROUP_CELADON_MANSION_2F, MAP_CELADON_MANSION_2F
warp_def $0, $6, 3, GROUP_CELADON_MANSION_2F, MAP_CELADON_MANSION_2F
warp_def $0, $7, 2, GROUP_CELADON_MANSION_ROOF, MAP_CELADON_MANSION_ROOF
warp_def $0, $0, 1, CELADON_MANSION_ROOF
warp_def $0, $1, 2, CELADON_MANSION_2F
warp_def $0, $6, 3, CELADON_MANSION_2F
warp_def $0, $7, 2, CELADON_MANSION_ROOF
.XYTriggers:
db 0

6
maps/CeladonMansionRoof.asm
View File

@ -36,9 +36,9 @@ CeladonMansionRoof_MapEventHeader:
.Warps:
db 3
warp_def $1, $1, 1, GROUP_CELADON_MANSION_3F, MAP_CELADON_MANSION_3F
warp_def $1, $6, 4, GROUP_CELADON_MANSION_3F, MAP_CELADON_MANSION_3F
warp_def $5, $2, 1, GROUP_CELADON_MANSION_ROOF_HOUSE, MAP_CELADON_MANSION_ROOF_HOUSE
warp_def $1, $1, 1, CELADON_MANSION_3F
warp_def $1, $6, 4, CELADON_MANSION_3F
warp_def $5, $2, 1, CELADON_MANSION_ROOF_HOUSE
.XYTriggers:
db 0

4
maps/CeladonMansionRoofHouse.asm
View File

@ -119,8 +119,8 @@ CeladonMansionRoofHouse_MapEventHeader:
.Warps:
db 2
warp_def $7, $2, 3, GROUP_CELADON_MANSION_ROOF, MAP_CELADON_MANSION_ROOF
warp_def $7, $3, 3, GROUP_CELADON_MANSION_ROOF, MAP_CELADON_MANSION_ROOF
warp_def $7, $2, 3, CELADON_MANSION_ROOF
warp_def $7, $3, 3, CELADON_MANSION_ROOF
.XYTriggers:
db 0

6
maps/CeladonPokeCenter1F.asm
View File

@ -144,9 +144,9 @@ CeladonPokeCenter1F_MapEventHeader:
.Warps:
db 3
warp_def $7, $3, 5, GROUP_CELADON_CITY, MAP_CELADON_CITY
warp_def $7, $4, 5, GROUP_CELADON_CITY, MAP_CELADON_CITY
warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F
warp_def $7, $3, 5, CELADON_CITY
warp_def $7, $4, 5, CELADON_CITY
warp_def $7, $0, 1, POKECENTER_2F
.XYTriggers:
db 0

2
maps/CeladonPokeCenter2FBeta.asm
View File

@ -11,7 +11,7 @@ CeladonPokeCenter2FBeta_MapEventHeader:
.Warps:
db 1
warp_def $7, $0, 3, GROUP_CELADON_POKECENTER_1F, MAP_CELADON_POKECENTER_1F
warp_def $7, $0, 3, CELADON_POKECENTER_1F
.XYTriggers:
db 0

12
maps/CeruleanCity.asm
View File

@ -275,12 +275,12 @@ CeruleanCity_MapEventHeader:
.Warps:
db 6
warp_def $f, $7, 1, GROUP_CERULEAN_GYM_BADGE_SPEECH_HOUSE, MAP_CERULEAN_GYM_BADGE_SPEECH_HOUSE
warp_def $11, $1c, 1, GROUP_CERULEAN_POLICE_STATION, MAP_CERULEAN_POLICE_STATION
warp_def $13, $d, 1, GROUP_CERULEAN_TRADE_SPEECH_HOUSE, MAP_CERULEAN_TRADE_SPEECH_HOUSE
warp_def $15, $13, 1, GROUP_CERULEAN_POKECENTER_1F, MAP_CERULEAN_POKECENTER_1F
warp_def $17, $1e, 1, GROUP_CERULEAN_GYM, MAP_CERULEAN_GYM
warp_def $1d, $19, 2, GROUP_CERULEAN_MART, MAP_CERULEAN_MART
warp_def $f, $7, 1, CERULEAN_GYM_BADGE_SPEECH_HOUSE
warp_def $11, $1c, 1, CERULEAN_POLICE_STATION
warp_def $13, $d, 1, CERULEAN_TRADE_SPEECH_HOUSE
warp_def $15, $13, 1, CERULEAN_POKECENTER_1F
warp_def $17, $1e, 1, CERULEAN_GYM
warp_def $1d, $19, 2, CERULEAN_MART
.XYTriggers:
db 0

8
maps/CeruleanGym.asm
View File

@ -43,8 +43,8 @@ UnknownScript_0x1883de:
clearevent EVENT_ROUTE_24_ROCKET
clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND
dotrigger $0
domaptrigger GROUP_ROUTE_25, MAP_ROUTE_25, $1
domaptrigger GROUP_POWER_PLANT, MAP_POWER_PLANT, $0
domaptrigger ROUTE_25, $1
domaptrigger POWER_PLANT, $0
waitbutton
special RestartMapMusic
pause 15
@ -363,8 +363,8 @@ CeruleanGym_MapEventHeader:
.Warps:
db 2
warp_def $f, $4, 5, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY
warp_def $f, $5, 5, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY
warp_def $f, $4, 5, CERULEAN_CITY
warp_def $f, $5, 5, CERULEAN_CITY
.XYTriggers:
db 0

4
maps/CeruleanGymBadgeSpeechHouse.asm
View File

@ -19,8 +19,8 @@ CeruleanGymBadgeSpeechHouse_MapEventHeader:
.Warps:
db 2
warp_def $7, $2, 1, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY
warp_def $7, $3, 1, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY
warp_def $7, $2, 1, CERULEAN_CITY
warp_def $7, $3, 1, CERULEAN_CITY
.XYTriggers:
db 0

4
maps/CeruleanMart.asm
View File

@ -46,8 +46,8 @@ CeruleanMart_MapEventHeader:
.Warps:
db 2
warp_def $7, $2, 6, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY
warp_def $7, $3, 6, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY
warp_def $7, $2, 6, CERULEAN_CITY
warp_def $7, $3, 6, CERULEAN_CITY
.XYTriggers:
db 0

6
maps/CeruleanPokeCenter1F.asm
View File

@ -63,9 +63,9 @@ CeruleanPokeCenter1F_MapEventHeader:
.Warps:
db 3
warp_def $7, $3, 4, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY
warp_def $7, $4, 4, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY
warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F
warp_def $7, $3, 4, CERULEAN_CITY
warp_def $7, $4, 4, CERULEAN_CITY
warp_def $7, $0, 1, POKECENTER_2F
.XYTriggers:
db 0

2
maps/CeruleanPokeCenter2FBeta.asm
View File

@ -11,7 +11,7 @@ CeruleanPokeCenter2FBeta_MapEventHeader:
.Warps:
db 1
warp_def $7, $0, 1, GROUP_CERULEAN_POKECENTER_1F, MAP_CERULEAN_POKECENTER_1F
warp_def $7, $0, 1, CERULEAN_POKECENTER_1F
.XYTriggers:
db 0

4
maps/CeruleanPoliceStation.asm
View File

@ -44,8 +44,8 @@ CeruleanPoliceStation_MapEventHeader:
.Warps:
db 2
warp_def $7, $2, 2, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY
warp_def $7, $3, 2, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY
warp_def $7, $2, 2, CERULEAN_CITY
warp_def $7, $3, 2, CERULEAN_CITY
.XYTriggers:
db 0

4
maps/CeruleanTradeSpeechHouse.asm
View File

@ -53,8 +53,8 @@ CeruleanTradeSpeechHouse_MapEventHeader:
.Warps:
db 2
warp_def $7, $2, 3, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY
warp_def $7, $3, 3, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY
warp_def $7, $2, 3, CERULEAN_CITY
warp_def $7, $3, 3, CERULEAN_CITY
.XYTriggers:
db 0

4
maps/CharcoalKiln.asm
View File

@ -149,8 +149,8 @@ CharcoalKiln_MapEventHeader:
.Warps:
db 2
warp_def $7, $2, 2, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN
warp_def $7, $3, 2, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN
warp_def $7, $2, 2, AZALEA_TOWN
warp_def $7, $3, 2, AZALEA_TOWN
.XYTriggers:
db 0

10
maps/CherrygroveCity.asm
View File

@ -550,11 +550,11 @@ CherrygroveCity_MapEventHeader:
.Warps:
db 5
warp_def $3, $17, 2, GROUP_CHERRYGROVE_MART, MAP_CHERRYGROVE_MART
warp_def $3, $1d, 1, GROUP_CHERRYGROVE_POKECENTER_1F, MAP_CHERRYGROVE_POKECENTER_1F
warp_def $7, $11, 1, GROUP_CHERRYGROVE_GYM_SPEECH_HOUSE, MAP_CHERRYGROVE_GYM_SPEECH_HOUSE
warp_def $9, $19, 1, GROUP_GUIDE_GENTS_HOUSE, MAP_GUIDE_GENTS_HOUSE
warp_def $b, $1f, 1, GROUP_CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, MAP_CHERRYGROVE_EVOLUTION_SPEECH_HOUSE
warp_def $3, $17, 2, CHERRYGROVE_MART
warp_def $3, $1d, 1, CHERRYGROVE_POKECENTER_1F
warp_def $7, $11, 1, CHERRYGROVE_GYM_SPEECH_HOUSE
warp_def $9, $19, 1, GUIDE_GENTS_HOUSE
warp_def $b, $1f, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE
.XYTriggers:
db 2

4
maps/CherrygroveEvolutionSpeechHouse.asm
View File

@ -43,8 +43,8 @@ CherrygroveEvolutionSpeechHouse_MapEventHeader:
.Warps:
db 2
warp_def $7, $2, 5, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY
warp_def $7, $3, 5, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY
warp_def $7, $2, 5, CHERRYGROVE_CITY
warp_def $7, $3, 5, CHERRYGROVE_CITY
.XYTriggers:
db 0

4
maps/CherrygroveGymSpeechHouse.asm
View File

@ -46,8 +46,8 @@ CherrygroveGymSpeechHouse_MapEventHeader:
.Warps:
db 2
warp_def $7, $2, 3, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY
warp_def $7, $3, 3, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY
warp_def $7, $2, 3, CHERRYGROVE_CITY
warp_def $7, $3, 3, CHERRYGROVE_CITY
.XYTriggers:
db 0

4
maps/CherrygroveMart.asm
View File

@ -72,8 +72,8 @@ CherrygroveMart_MapEventHeader:
.Warps:
db 2
warp_def $7, $2, 1, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY
warp_def $7, $3, 1, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY
warp_def $7, $2, 1, CHERRYGROVE_CITY
warp_def $7, $3, 1, CHERRYGROVE_CITY
.XYTriggers:
db 0

6
maps/CherrygrovePokeCenter1F.asm
View File

@ -68,9 +68,9 @@ CherrygrovePokeCenter1F_MapEventHeader:
.Warps:
db 3
warp_def $7, $3, 2, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY
warp_def $7, $4, 2, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY
warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F
warp_def $7, $3, 2, CHERRYGROVE_CITY
warp_def $7, $4, 2, CHERRYGROVE_CITY
warp_def $7, $0, 1, POKECENTER_2F
.XYTriggers:
db 0

16
maps/CianwoodCity.asm
View File

@ -41,7 +41,7 @@ UnknownScript_0x1a001e:
pause 10
dotrigger $0
clearevent EVENT_SAW_SUICUNE_ON_ROUTE_42
domaptrigger GROUP_ROUTE_42, MAP_ROUTE_42, $1
domaptrigger ROUTE_42, $1
checkevent EVENT_FOUGHT_EUSINE
iftrue .Done
setevent EVENT_FOUGHT_EUSINE
@ -376,13 +376,13 @@ CianwoodCity_MapEventHeader:
.Warps:
db 7
warp_def $29, $11, 1, GROUP_MANIAS_HOUSE, MAP_MANIAS_HOUSE
warp_def $2b, $8, 1, GROUP_CIANWOOD_GYM, MAP_CIANWOOD_GYM
warp_def $2b, $17, 1, GROUP_CIANWOOD_POKECENTER_1F, MAP_CIANWOOD_POKECENTER_1F
warp_def $2f, $f, 1, GROUP_CIANWOOD_PHARMACY, MAP_CIANWOOD_PHARMACY
warp_def $1f, $9, 1, GROUP_CIANWOOD_CITY_PHOTO_STUDIO, MAP_CIANWOOD_CITY_PHOTO_STUDIO
warp_def $25, $f, 1, GROUP_CIANWOOD_LUGIA_SPEECH_HOUSE, MAP_CIANWOOD_LUGIA_SPEECH_HOUSE
warp_def $11, $5, 1, GROUP_POKE_SEERS_HOUSE, MAP_POKE_SEERS_HOUSE
warp_def $29, $11, 1, MANIAS_HOUSE
warp_def $2b, $8, 1, CIANWOOD_GYM
warp_def $2b, $17, 1, CIANWOOD_POKECENTER_1F
warp_def $2f, $f, 1, CIANWOOD_PHARMACY
warp_def $1f, $9, 1, CIANWOOD_CITY_PHOTO_STUDIO
warp_def $25, $f, 1, CIANWOOD_LUGIA_SPEECH_HOUSE
warp_def $11, $5, 1, POKE_SEERS_HOUSE
.XYTriggers:
db 1

4
maps/CianwoodCityPhotoStudio.asm
View File

@ -51,8 +51,8 @@ CianwoodCityPhotoStudio_MapEventHeader:
.Warps:
db 2
warp_def $7, $2, 5, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY
warp_def $7, $3, 5, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY
warp_def $7, $2, 5, CIANWOOD_CITY
warp_def $7, $3, 5, CIANWOOD_CITY
.XYTriggers:
db 0

4
maps/CianwoodGym.asm
View File

@ -300,8 +300,8 @@ CianwoodGym_MapEventHeader:
.Warps:
db 2
warp_def $11, $4, 2, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY
warp_def $11, $5, 2, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY
warp_def $11, $4, 2, CIANWOOD_CITY
warp_def $11, $5, 2, CIANWOOD_CITY
.XYTriggers:
db 0

4
maps/CianwoodLugiaSpeechHouse.asm
View File

@ -62,8 +62,8 @@ CianwoodLugiaSpeechHouse_MapEventHeader:
.Warps:
db 2
warp_def $7, $2, 6, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY
warp_def $7, $3, 6, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY
warp_def $7, $2, 6, CIANWOOD_CITY
warp_def $7, $3, 6, CIANWOOD_CITY
.XYTriggers:
db 0

4
maps/CianwoodPharmacy.asm
View File

@ -77,8 +77,8 @@ CianwoodPharmacy_MapEventHeader:
.Warps:
db 2
warp_def $7, $2, 4, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY
warp_def $7, $3, 4, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY
warp_def $7, $2, 4, CIANWOOD_CITY
warp_def $7, $3, 4, CIANWOOD_CITY
.XYTriggers:
db 0

6
maps/CianwoodPokeCenter1F.asm
View File

@ -131,9 +131,9 @@ CianwoodPokeCenter1F_MapEventHeader:
.Warps:
db 3
warp_def $7, $3, 3, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY
warp_def $7, $4, 3, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY
warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F
warp_def $7, $3, 3, CIANWOOD_CITY
warp_def $7, $4, 3, CIANWOOD_CITY
warp_def $7, $0, 1, POKECENTER_2F
.XYTriggers:
db 0

2
maps/CinnabarIsland.asm
View File

@ -132,7 +132,7 @@ CinnabarIsland_MapEventHeader:
.Warps:
db 1
warp_def $b, $b, 1, GROUP_CINNABAR_POKECENTER_1F, MAP_CINNABAR_POKECENTER_1F
warp_def $b, $b, 1, CINNABAR_POKECENTER_1F
.XYTriggers:
db 0

6
maps/CinnabarPokeCenter1F.asm
View File

@ -35,9 +35,9 @@ CinnabarPokeCenter1F_MapEventHeader:
.Warps:
db 3
warp_def $7, $3, 1, GROUP_CINNABAR_ISLAND, MAP_CINNABAR_ISLAND
warp_def $7, $4, 1, GROUP_CINNABAR_ISLAND, MAP_CINNABAR_ISLAND
warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F
warp_def $7, $3, 1, CINNABAR_ISLAND
warp_def $7, $4, 1, CINNABAR_ISLAND
warp_def $7, $0, 1, POKECENTER_2F
.XYTriggers:
db 0

2
maps/CinnabarPokeCenter2FBeta.asm
View File

@ -11,7 +11,7 @@ CinnabarPokeCenter2FBeta_MapEventHeader:
.Warps:
db 1
warp_def $7, $0, 3, GROUP_CINNABAR_POKECENTER_1F, MAP_CINNABAR_POKECENTER_1F
warp_def $7, $0, 3, CINNABAR_POKECENTER_1F
.XYTriggers:
db 0

8
maps/Colosseum.asm
View File

@ -39,12 +39,12 @@ ColosseumScript_SetWhichChris:
return
ColosseumScript_InitializeCB:
domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $2
domaptrigger POKECENTER_2F, $2
return
ColosseumScript_Initialize:
dotrigger $1
domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $2
domaptrigger POKECENTER_2F, $2
end
MapColosseumSignpost1Script:
@ -70,8 +70,8 @@ Colosseum_MapEventHeader:
.Warps:
db 2
warp_def $7, $4, 3, GROUP_POKECENTER_2F, MAP_POKECENTER_2F
warp_def $7, $5, 3, GROUP_POKECENTER_2F, MAP_POKECENTER_2F
warp_def $7, $4, 3, POKECENTER_2F
warp_def $7, $5, 3, POKECENTER_2F
.XYTriggers:
db 0

6
maps/CopycatsHouse1F.asm
View File

@ -73,9 +73,9 @@ CopycatsHouse1F_MapEventHeader:
.Warps:
db 3
warp_def $7, $2, 8, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY
warp_def $7, $3, 8, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY
warp_def $0, $2, 1, GROUP_COPYCATS_HOUSE_2F, MAP_COPYCATS_HOUSE_2F
warp_def $7, $2, 8, SAFFRON_CITY
warp_def $7, $3, 8, SAFFRON_CITY
warp_def $0, $2, 1, COPYCATS_HOUSE_2F
.XYTriggers:
db 0

2
maps/CopycatsHouse2F.asm
View File

@ -361,7 +361,7 @@ CopycatsHouse2F_MapEventHeader:
.Warps:
db 1
warp_def $0, $3, 3, GROUP_COPYCATS_HOUSE_1F, MAP_COPYCATS_HOUSE_1F
warp_def $0, $3, 3, COPYCATS_HOUSE_1F
.XYTriggers:
db 0

4
maps/DanceTheatre.asm
View File

@ -332,8 +332,8 @@ DanceTheatre_MapEventHeader:
.Warps:
db 2
warp_def $d, $5, 8, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY
warp_def $d, $6, 8, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY
warp_def $d, $5, 8, ECRUTEAK_CITY
warp_def $d, $6, 8, ECRUTEAK_CITY
.XYTriggers:
db 0

4
maps/DarkCaveBlackthornEntrance.asm
View File

@ -62,8 +62,8 @@ DarkCaveBlackthornEntrance_MapEventHeader:
.Warps:
db 2
warp_def $3, $17, 1, GROUP_ROUTE_45, MAP_ROUTE_45
warp_def $19, $3, 2, GROUP_DARK_CAVE_VIOLET_ENTRANCE, MAP_DARK_CAVE_VIOLET_ENTRANCE
warp_def $3, $17, 1, ROUTE_45
warp_def $19, $3, 2, DARK_CAVE_VIOLET_ENTRANCE
.XYTriggers:
db 0

6
maps/DarkCaveVioletEntrance.asm
View File

@ -30,9 +30,9 @@ DarkCaveVioletEntrance_MapEventHeader:
.Warps:
db 3
warp_def $f, $3, 3, GROUP_ROUTE_31, MAP_ROUTE_31
warp_def $1, $11, 2, GROUP_DARK_CAVE_BLACKTHORN_ENTRANCE, MAP_DARK_CAVE_BLACKTHORN_ENTRANCE
warp_def $21, $23, 3, GROUP_ROUTE_46, MAP_ROUTE_46
warp_def $f, $3, 3, ROUTE_31
warp_def $1, $11, 2, DARK_CAVE_BLACKTHORN_ENTRANCE
warp_def $21, $23, 3, ROUTE_46
.XYTriggers:
db 0

8
maps/DayCare.asm
View File

@ -160,10 +160,10 @@ DayCare_MapEventHeader:
.Warps:
db 4
warp_def $5, $0, 3, GROUP_ROUTE_34, MAP_ROUTE_34
warp_def $6, $0, 4, GROUP_ROUTE_34, MAP_ROUTE_34
warp_def $7, $2, 5, GROUP_ROUTE_34, MAP_ROUTE_34
warp_def $7, $3, 5, GROUP_ROUTE_34, MAP_ROUTE_34
warp_def $5, $0, 3, ROUTE_34
warp_def $6, $0, 4, ROUTE_34
warp_def $7, $2, 5, ROUTE_34
warp_def $7, $3, 5, ROUTE_34
.XYTriggers:
db 0

12
maps/DiglettsCave.asm
View File

@ -26,12 +26,12 @@ DiglettsCave_MapEventHeader:
.Warps:
db 6
warp_def $21, $3, 10, GROUP_VERMILION_CITY, MAP_VERMILION_CITY
warp_def $1f, $5, 5, GROUP_DIGLETTS_CAVE, MAP_DIGLETTS_CAVE
warp_def $5, $f, 5, GROUP_ROUTE_2, MAP_ROUTE_2
warp_def $3, $11, 6, GROUP_DIGLETTS_CAVE, MAP_DIGLETTS_CAVE
warp_def $21, $11, 2, GROUP_DIGLETTS_CAVE, MAP_DIGLETTS_CAVE
warp_def $3, $3, 4, GROUP_DIGLETTS_CAVE, MAP_DIGLETTS_CAVE
warp_def $21, $3, 10, VERMILION_CITY
warp_def $1f, $5, 5, DIGLETTS_CAVE
warp_def $5, $f, 5, ROUTE_2
warp_def $3, $11, 6, DIGLETTS_CAVE
warp_def $21, $11, 2, DIGLETTS_CAVE
warp_def $3, $3, 4, DIGLETTS_CAVE
.XYTriggers:
db 0

6
maps/DragonShrine.asm
View File

@ -162,7 +162,7 @@ DragonShrineTestScript:
special RestartMapMusic
specialphonecall ELMCALL_MASTERBALL
dotrigger $1
domaptrigger GROUP_DRAGONS_DEN_B1F, MAP_DRAGONS_DEN_B1F, $1
domaptrigger DRAGONS_DEN_B1F, $1
writetext UnknownText_0x18d9f2
keeptextopen
writetext UnknownText_0x18da0b
@ -670,8 +670,8 @@ DragonShrine_MapEventHeader:
.Warps:
db 2
warp_def $9, $4, 2, GROUP_DRAGONS_DEN_B1F, MAP_DRAGONS_DEN_B1F
warp_def $9, $5, 2, GROUP_DRAGONS_DEN_B1F, MAP_DRAGONS_DEN_B1F
warp_def $9, $4, 2, DRAGONS_DEN_B1F
warp_def $9, $5, 2, DRAGONS_DEN_B1F
.XYTriggers:
db 0

8
maps/DragonsDen1F.asm
View File

@ -11,10 +11,10 @@ DragonsDen1F_MapEventHeader:
.Warps:
db 4
warp_def $5, $3, 8, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY
warp_def $3, $3, 4, GROUP_DRAGONS_DEN_1F, MAP_DRAGONS_DEN_1F
warp_def $f, $5, 1, GROUP_DRAGONS_DEN_B1F, MAP_DRAGONS_DEN_B1F
warp_def $d, $5, 2, GROUP_DRAGONS_DEN_1F, MAP_DRAGONS_DEN_1F
warp_def $5, $3, 8, BLACKTHORN_CITY
warp_def $3, $3, 4, DRAGONS_DEN_1F
warp_def $f, $5, 1, DRAGONS_DEN_B1F
warp_def $d, $5, 2, DRAGONS_DEN_1F
.XYTriggers:
db 0

4
maps/DragonsDenB1F.asm
View File

@ -403,8 +403,8 @@ DragonsDenB1F_MapEventHeader:
.Warps:
db 2
warp_def $3, $14, 3, GROUP_DRAGONS_DEN_1F, MAP_DRAGONS_DEN_1F
warp_def $1d, $13, 1, GROUP_DRAGON_SHRINE, MAP_DRAGON_SHRINE
warp_def $3, $14, 3, DRAGONS_DEN_1F
warp_def $1d, $13, 1, DRAGON_SHRINE
.XYTriggers:
db 1

4
maps/EarlsPokemonAcademy.asm
View File

@ -410,8 +410,8 @@ EarlsPokemonAcademy_MapEventHeader:
.Warps:
db 2
warp_def $f, $3, 3, GROUP_VIOLET_CITY, MAP_VIOLET_CITY
warp_def $f, $4, 3, GROUP_VIOLET_CITY, MAP_VIOLET_CITY
warp_def $f, $3, 3, VIOLET_CITY
warp_def $f, $4, 3, VIOLET_CITY
.XYTriggers:
db 0

30
maps/EcruteakCity.asm
View File

@ -258,21 +258,21 @@ EcruteakCity_MapEventHeader:
.Warps:
db 15
warp_def $1a, $23, 1, GROUP_ROUTE_42_ECRUTEAK_GATE, MAP_ROUTE_42_ECRUTEAK_GATE
warp_def $1b, $23, 2, GROUP_ROUTE_42_ECRUTEAK_GATE, MAP_ROUTE_42_ECRUTEAK_GATE
warp_def $b, $12, 1, GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE
warp_def $2, $14, 1, GROUP_WISE_TRIOS_ROOM, MAP_WISE_TRIOS_ROOM
warp_def $3, $14, 2, GROUP_WISE_TRIOS_ROOM, MAP_WISE_TRIOS_ROOM
warp_def $1b, $17, 1, GROUP_ECRUTEAK_POKECENTER_1F, MAP_ECRUTEAK_POKECENTER_1F
warp_def $15, $5, 1, GROUP_ECRUTEAK_LUGIA_SPEECH_HOUSE, MAP_ECRUTEAK_LUGIA_SPEECH_HOUSE
warp_def $15, $17, 1, GROUP_DANCE_THEATRE, MAP_DANCE_THEATRE
warp_def $15, $1d, 2, GROUP_ECRUTEAK_MART, MAP_ECRUTEAK_MART
warp_def $1b, $6, 1, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $1b, $d, 1, GROUP_ECRUTEAK_ITEMFINDER_HOUSE, MAP_ECRUTEAK_ITEMFINDER_HOUSE
warp_def $7, $25, 1, GROUP_TIN_TOWER_1F, MAP_TIN_TOWER_1F
warp_def $5, $5, 1, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F
warp_def $12, $0, 3, GROUP_ROUTE_38_ECRUTEAK_GATE, MAP_ROUTE_38_ECRUTEAK_GATE
warp_def $13, $0, 4, GROUP_ROUTE_38_ECRUTEAK_GATE, MAP_ROUTE_38_ECRUTEAK_GATE
warp_def $1a, $23, 1, ROUTE_42_ECRUTEAK_GATE
warp_def $1b, $23, 2, ROUTE_42_ECRUTEAK_GATE
warp_def $b, $12, 1, ECRUTEAK_HOUSE
warp_def $2, $14, 1, WISE_TRIOS_ROOM
warp_def $3, $14, 2, WISE_TRIOS_ROOM
warp_def $1b, $17, 1, ECRUTEAK_POKECENTER_1F
warp_def $15, $5, 1, ECRUTEAK_LUGIA_SPEECH_HOUSE
warp_def $15, $17, 1, DANCE_THEATRE
warp_def $15, $1d, 2, ECRUTEAK_MART
warp_def $1b, $6, 1, ECRUTEAK_GYM
warp_def $1b, $d, 1, ECRUTEAK_ITEMFINDER_HOUSE
warp_def $7, $25, 1, TIN_TOWER_1F
warp_def $5, $5, 1, BURNED_TOWER_1F
warp_def $12, $0, 3, ROUTE_38_ECRUTEAK_GATE
warp_def $13, $0, 4, ROUTE_38_ECRUTEAK_GATE
.XYTriggers:
db 0

70
maps/EcruteakGym.asm
View File

@ -36,7 +36,7 @@ MortyScript_0x99d58:
setflag ENGINE_FOGBADGE
checkcode VAR_BADGES
scall EcruteakGymTriggerRockets
domaptrigger GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE, $1
domaptrigger ECRUTEAK_HOUSE, $1
setevent EVENT_RANG_CLEAR_BELL_1
setevent EVENT_RANG_CLEAR_BELL_2
.FightDone
@ -87,7 +87,7 @@ UnknownScript_0x99dc6:
special FadeBlackBGMap
playsound SFX_ENTER_DOOR
waitbutton
warp GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY, $6, $1b
warp ECRUTEAK_CITY, $6, $1b
end
TrainerSageJeffrey:
@ -385,39 +385,39 @@ EcruteakGym_MapEventHeader:
.Warps:
db 33
warp_def $11, $4, 10, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY
warp_def $11, $5, 10, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY
warp_def $e, $4, 4, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $4, $2, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $4, $3, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $4, $4, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $5, $4, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $7, $6, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $4, $7, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $6, $2, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $6, $3, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $6, $4, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $6, $5, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $6, $7, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $7, $7, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $8, $4, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $8, $5, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $8, $6, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $8, $7, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $8, $2, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $9, $2, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $a, $2, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $b, $2, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $a, $4, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $a, $5, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $c, $2, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $c, $3, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $c, $4, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $c, $5, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $a, $7, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $b, $7, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $c, $7, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $d, $7, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM
warp_def $11, $4, 10, ECRUTEAK_CITY
warp_def $11, $5, 10, ECRUTEAK_CITY
warp_def $e, $4, 4, ECRUTEAK_GYM
warp_def $4, $2, 3, ECRUTEAK_GYM
warp_def $4, $3, 3, ECRUTEAK_GYM
warp_def $4, $4, 3, ECRUTEAK_GYM
warp_def $5, $4, 3, ECRUTEAK_GYM
warp_def $7, $6, 3, ECRUTEAK_GYM
warp_def $4, $7, 3, ECRUTEAK_GYM
warp_def $6, $2, 3, ECRUTEAK_GYM
warp_def $6, $3, 3, ECRUTEAK_GYM
warp_def $6, $4, 3, ECRUTEAK_GYM
warp_def $6, $5, 3, ECRUTEAK_GYM
warp_def $6, $7, 3, ECRUTEAK_GYM
warp_def $7, $7, 3, ECRUTEAK_GYM
warp_def $8, $4, 3, ECRUTEAK_GYM
warp_def $8, $5, 3, ECRUTEAK_GYM
warp_def $8, $6, 3, ECRUTEAK_GYM
warp_def $8, $7, 3, ECRUTEAK_GYM
warp_def $8, $2, 3, ECRUTEAK_GYM
warp_def $9, $2, 3, ECRUTEAK_GYM
warp_def $a, $2, 3, ECRUTEAK_GYM
warp_def $b, $2, 3, ECRUTEAK_GYM
warp_def $a, $4, 3, ECRUTEAK_GYM
warp_def $a, $5, 3, ECRUTEAK_GYM
warp_def $c, $2, 3, ECRUTEAK_GYM
warp_def $c, $3, 3, ECRUTEAK_GYM
warp_def $c, $4, 3, ECRUTEAK_GYM
warp_def $c, $5, 3, ECRUTEAK_GYM
warp_def $a, $7, 3, ECRUTEAK_GYM
warp_def $b, $7, 3, ECRUTEAK_GYM
warp_def $c, $7, 3, ECRUTEAK_GYM
warp_def $d, $7, 3, ECRUTEAK_GYM
.XYTriggers:
db 0

10
maps/EcruteakHouse.asm
View File

@ -282,11 +282,11 @@ EcruteakHouse_MapEventHeader:
.Warps:
db 5
warp_def $11, $4, 3, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY
warp_def $11, $5, 3, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY
warp_def $3, $5, 4, GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE
warp_def $f, $11, 3, GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE
warp_def $3, $11, 3, GROUP_WISE_TRIOS_ROOM, MAP_WISE_TRIOS_ROOM
warp_def $11, $4, 3, ECRUTEAK_CITY
warp_def $11, $5, 3, ECRUTEAK_CITY
warp_def $3, $5, 4, ECRUTEAK_HOUSE
warp_def $f, $11, 3, ECRUTEAK_HOUSE
warp_def $3, $11, 3, WISE_TRIOS_ROOM
.XYTriggers:
db 2

4
maps/EcruteakItemfinderHouse.asm
View File

@ -164,8 +164,8 @@ EcruteakItemfinderHouse_MapEventHeader:
.Warps:
db 2
warp_def $7, $3, 11, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY
warp_def $7, $4, 11, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY
warp_def $7, $3, 11, ECRUTEAK_CITY
warp_def $7, $4, 11, ECRUTEAK_CITY
.XYTriggers:
db 0

4
maps/EcruteakLugiaSpeechHouse.asm
View File

@ -46,8 +46,8 @@ EcruteakLugiaSpeechHouse_MapEventHeader:
.Warps:
db 2
warp_def $7, $3, 7, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY
warp_def $7, $4, 7, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY
warp_def $7, $3, 7, ECRUTEAK_CITY
warp_def $7, $4, 7, ECRUTEAK_CITY
.XYTriggers:
db 0

4
maps/EcruteakMart.asm
View File

@ -46,8 +46,8 @@ EcruteakMart_MapEventHeader:
.Warps:
db 2
warp_def $7, $2, 9, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY
warp_def $7, $3, 9, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY
warp_def $7, $2, 9, ECRUTEAK_CITY
warp_def $7, $3, 9, ECRUTEAK_CITY
.XYTriggers:
db 0

6
maps/EcruteakPokeCenter1F.asm
View File

@ -207,9 +207,9 @@ EcruteakPokeCenter1F_MapEventHeader:
.Warps:
db 3
warp_def $7, $3, 6, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY
warp_def $7, $4, 6, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY
warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F
warp_def $7, $3, 6, ECRUTEAK_CITY
warp_def $7, $4, 6, ECRUTEAK_CITY
warp_def $7, $0, 1, POKECENTER_2F
.XYTriggers:
db 0

4
maps/ElmsHouse.asm
View File

@ -85,8 +85,8 @@ ElmsHouse_MapEventHeader:
.Warps:
db 2
warp_def $7, $2, 4, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN
warp_def $7, $3, 4, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN
warp_def $7, $2, 4, NEW_BARK_TOWN
warp_def $7, $3, 4, NEW_BARK_TOWN
.XYTriggers:
db 0

8
maps/ElmsLab.asm
View File

@ -272,7 +272,7 @@ ElmDirectionsScript:
setevent EVENT_GOT_A_POKEMON_FROM_ELM
setevent EVENT_RIVAL_CHERRYGROVE_CITY
dotrigger $5
domaptrigger GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN, $1
domaptrigger NEW_BARK_TOWN, $1
end
ElmDescribesMrPokemonScript:
@ -338,7 +338,7 @@ ElmAfterTheftScript:
keeptextopen
setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
setflag ENGINE_BUG_CONTEST_ON
domaptrigger GROUP_ROUTE_29, MAP_ROUTE_29, $1
domaptrigger ROUTE_29, $1
clearevent EVENT_ROUTE_30_YOUNGSTER_JOEY
setevent EVENT_ROUTE_30_BATTLE
writetext ElmAfterTheftText6
@ -1373,8 +1373,8 @@ ElmsLab_MapEventHeader:
.Warps:
db 2
warp_def $b, $4, 1, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN
warp_def $b, $5, 1, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN
warp_def $b, $4, 1, NEW_BARK_TOWN
warp_def $b, $5, 1, NEW_BARK_TOWN
.XYTriggers:
db 8

34
maps/FastShip1F.asm
View File

@ -27,7 +27,7 @@ FastShip1F_MapScriptHeader:
pause 30
playsound SFX_BOAT
earthquake 30
blackoutmod GROUP_FAST_SHIP_CABINS_SW_SSW_NW, MAP_FAST_SHIP_CABINS_SW_SSW_NW
blackoutmod FAST_SHIP_CABINS_SW_SSW_NW
clearevent EVENT_FAST_SHIP_HAS_ARRIVED
checkevent EVENT_FAST_SHIP_FIRST_TIME
iftrue .Vermilion
@ -67,8 +67,8 @@ SailorScript_0x75160:
special FadeBlackBGMap
waitbutton
setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
domaptrigger GROUP_VERMILION_PORT, MAP_VERMILION_PORT, $1
warp GROUP_VERMILION_PORT, MAP_VERMILION_PORT, $7, $11
domaptrigger VERMILION_PORT, $1
warp VERMILION_PORT, $7, $11
end
._Olivine
@ -80,8 +80,8 @@ SailorScript_0x75160:
special FadeBlackBGMap
waitbutton
setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
domaptrigger GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $1
warp GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $7, $17
domaptrigger OLIVINE_PORT, $1
warp OLIVINE_PORT, $7, $17
end
.LetThePlayerOut:
@ -287,18 +287,18 @@ FastShip1F_MapEventHeader:
.Warps:
db 12
warp_def $1, $19, 255, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F
warp_def $8, $1b, 1, GROUP_FAST_SHIP_CABINS_NNW_NNE_NE, MAP_FAST_SHIP_CABINS_NNW_NNE_NE
warp_def $8, $17, 2, GROUP_FAST_SHIP_CABINS_NNW_NNE_NE, MAP_FAST_SHIP_CABINS_NNW_NNE_NE
warp_def $8, $13, 3, GROUP_FAST_SHIP_CABINS_NNW_NNE_NE, MAP_FAST_SHIP_CABINS_NNW_NNE_NE
warp_def $8, $f, 1, GROUP_FAST_SHIP_CABINS_SW_SSW_NW, MAP_FAST_SHIP_CABINS_SW_SSW_NW
warp_def $f, $f, 2, GROUP_FAST_SHIP_CABINS_SW_SSW_NW, MAP_FAST_SHIP_CABINS_SW_SSW_NW
warp_def $f, $13, 4, GROUP_FAST_SHIP_CABINS_SW_SSW_NW, MAP_FAST_SHIP_CABINS_SW_SSW_NW
warp_def $f, $17, 1, GROUP_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, MAP_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
warp_def $f, $1b, 3, GROUP_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, MAP_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
warp_def $d, $3, 5, GROUP_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, MAP_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
warp_def $c, $6, 1, GROUP_FAST_SHIP_B1F, MAP_FAST_SHIP_B1F
warp_def $e, $1e, 2, GROUP_FAST_SHIP_B1F, MAP_FAST_SHIP_B1F
warp_def $1, $19, 255, FAST_SHIP_1F
warp_def $8, $1b, 1, FAST_SHIP_CABINS_NNW_NNE_NE
warp_def $8, $17, 2, FAST_SHIP_CABINS_NNW_NNE_NE
warp_def $8, $13, 3, FAST_SHIP_CABINS_NNW_NNE_NE
warp_def $8, $f, 1, FAST_SHIP_CABINS_SW_SSW_NW
warp_def $f, $f, 2, FAST_SHIP_CABINS_SW_SSW_NW
warp_def $f, $13, 4, FAST_SHIP_CABINS_SW_SSW_NW
warp_def $f, $17, 1, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
warp_def $f, $1b, 3, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
warp_def $d, $3, 5, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
warp_def $c, $6, 1, FAST_SHIP_B1F
warp_def $e, $1e, 2, FAST_SHIP_B1F
.XYTriggers:
db 2

4
maps/FastShipB1F.asm
View File

@ -442,8 +442,8 @@ FastShipB1F_MapEventHeader:
.Warps:
db 2
warp_def $b, $5, 11, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F
warp_def $d, $1f, 12, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F
warp_def $b, $5, 11, FAST_SHIP_1F
warp_def $d, $1f, 12, FAST_SHIP_1F
.XYTriggers:
db 2

8
maps/FastShipCabins_NNW_NNE_NE.asm
View File

@ -89,7 +89,7 @@ SailorScript_0x755f1:
closetext
loadmovesprites
setevent EVENT_FAST_SHIP_LAZY_SAILOR
domaptrigger GROUP_FAST_SHIP_B1F, MAP_FAST_SHIP_B1F, $1
domaptrigger FAST_SHIP_B1F, $1
checkcode VAR_FACING
if_equal $3, UnknownScript_0x75629
applymovement $6, MovementData_0x75637
@ -263,9 +263,9 @@ FastShipCabins_NNW_NNE_NE_MapEventHeader:
.Warps:
db 3
warp_def $0, $2, 2, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F
warp_def $c, $2, 3, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F
warp_def $18, $2, 4, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F
warp_def $0, $2, 2, FAST_SHIP_1F
warp_def $c, $2, 3, FAST_SHIP_1F
warp_def $18, $2, 4, FAST_SHIP_1F
.XYTriggers:
db 0

16
maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
View File

@ -68,7 +68,7 @@ UnknownScript_0x75f09:
writetext UnknownText_0x76143
keeptextopen
setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $0
domaptrigger FAST_SHIP_1F, $0
jump UnknownScript_0x75f37
GentlemanScript_0x75f1f:
@ -81,7 +81,7 @@ GentlemanScript_0x75f1f:
writetext UnknownText_0x760ae
closetext
loadmovesprites
domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $0
domaptrigger FAST_SHIP_1F, $0
end
UnknownScript_0x75f37:
@ -455,12 +455,12 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader:
.Warps:
db 6
warp_def $7, $2, 8, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F
warp_def $7, $3, 8, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F
warp_def $13, $2, 9, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F
warp_def $13, $3, 9, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F
warp_def $21, $2, 10, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F
warp_def $21, $3, 10, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F
warp_def $7, $2, 8, FAST_SHIP_1F
warp_def $7, $3, 8, FAST_SHIP_1F
warp_def $13, $2, 9, FAST_SHIP_1F
warp_def $13, $3, 9, FAST_SHIP_1F
warp_def $21, $2, 10, FAST_SHIP_1F
warp_def $21, $3, 10, FAST_SHIP_1F
.XYTriggers:
db 0

10
maps/FastShipCabins_SW_SSW_NW.asm
View File

@ -222,11 +222,11 @@ FastShipCabins_SW_SSW_NW_MapEventHeader:
.Warps:
db 5
warp_def $0, $2, 5, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F
warp_def $13, $2, 6, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F
warp_def $13, $3, 6, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F
warp_def $1f, $2, 7, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F
warp_def $1f, $3, 7, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F
warp_def $0, $2, 5, FAST_SHIP_1F
warp_def $13, $2, 6, FAST_SHIP_1F
warp_def $13, $3, 6, FAST_SHIP_1F
warp_def $1f, $2, 7, FAST_SHIP_1F
warp_def $1f, $3, 7, FAST_SHIP_1F
.XYTriggers:
db 0

4
maps/FightingDojo.asm
View File

@ -44,8 +44,8 @@ FightingDojo_MapEventHeader:
.Warps:
db 2
warp_def $b, $4, 1, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY
warp_def $b, $5, 1, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY
warp_def $b, $4, 1, SAFFRON_CITY
warp_def $b, $5, 1, SAFFRON_CITY
.XYTriggers:
db 0

4
maps/FuchsiaBillSpeechHouse.asm
View File

@ -29,8 +29,8 @@ FuchsiaBillSpeechHouse_MapEventHeader:
.Warps:
db 2
warp_def $7, $2, 4, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY
warp_def $7, $3, 4, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY
warp_def $7, $2, 4, FUCHSIA_CITY
warp_def $7, $3, 4, FUCHSIA_CITY
.XYTriggers:
db 0

22
maps/FuchsiaCity.asm
View File

@ -126,17 +126,17 @@ FuchsiaCity_MapEventHeader:
.Warps:
db 11
warp_def $d, $5, 2, GROUP_FUCHSIA_MART, MAP_FUCHSIA_MART
warp_def $d, $16, 1, GROUP_SAFARI_ZONE_MAIN_OFFICE, MAP_SAFARI_ZONE_MAIN_OFFICE
warp_def $1b, $8, 1, GROUP_FUCHSIA_GYM, MAP_FUCHSIA_GYM
warp_def $1b, $b, 1, GROUP_FUCHSIA_BILL_SPEECH_HOUSE, MAP_FUCHSIA_BILL_SPEECH_HOUSE
warp_def $1b, $13, 1, GROUP_FUCHSIA_POKECENTER_1F, MAP_FUCHSIA_POKECENTER_1F
warp_def $1b, $1b, 1, GROUP_SAFARI_ZONE_WARDENS_HOME, MAP_SAFARI_ZONE_WARDENS_HOME
warp_def $3, $12, 3, GROUP_SAFARI_ZONE_FUCHSIA_GATE_BETA, MAP_SAFARI_ZONE_FUCHSIA_GATE_BETA
warp_def $16, $25, 1, GROUP_ROUTE_15_FUCHSIA_GATE, MAP_ROUTE_15_FUCHSIA_GATE
warp_def $17, $25, 2, GROUP_ROUTE_15_FUCHSIA_GATE, MAP_ROUTE_15_FUCHSIA_GATE
warp_def $23, $7, 1, GROUP_ROUTE_19___FUCHSIA_GATE, MAP_ROUTE_19___FUCHSIA_GATE
warp_def $23, $8, 2, GROUP_ROUTE_19___FUCHSIA_GATE, MAP_ROUTE_19___FUCHSIA_GATE
warp_def $d, $5, 2, FUCHSIA_MART
warp_def $d, $16, 1, SAFARI_ZONE_MAIN_OFFICE
warp_def $1b, $8, 1, FUCHSIA_GYM
warp_def $1b, $b, 1, FUCHSIA_BILL_SPEECH_HOUSE
warp_def $1b, $13, 1, FUCHSIA_POKECENTER_1F
warp_def $1b, $1b, 1, SAFARI_ZONE_WARDENS_HOME
warp_def $3, $12, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA
warp_def $16, $25, 1, ROUTE_15_FUCHSIA_GATE
warp_def $17, $25, 2, ROUTE_15_FUCHSIA_GATE
warp_def $23, $7, 1, ROUTE_19___FUCHSIA_GATE
warp_def $23, $8, 2, ROUTE_19___FUCHSIA_GATE
.XYTriggers:
db 0

4
maps/FuchsiaGym.asm
View File

@ -378,8 +378,8 @@ FuchsiaGym_MapEventHeader:
.Warps:
db 2
warp_def $11, $4, 3, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY
warp_def $11, $5, 3, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY
warp_def $11, $4, 3, FUCHSIA_CITY
warp_def $11, $5, 3, FUCHSIA_CITY
.XYTriggers:
db 0

4
maps/FuchsiaMart.asm
View File

@ -38,8 +38,8 @@ FuchsiaMart_MapEventHeader:
.Warps:
db 2
warp_def $7, $2, 1, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY
warp_def $7, $3, 1, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY
warp_def $7, $2, 1, FUCHSIA_CITY
warp_def $7, $3, 1, FUCHSIA_CITY
.XYTriggers:
db 0

Some files were not shown because too many files have changed in this diff Show More