Game-Decompilation/pokecrystal
1
0
Fork 0
mirror of https://github.com/pret/pokecrystal.git synced 2024-12-03 19:01:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

warp_event x, y, map, warp_id

Browse Source
This commit is contained in:
Rangi 2018-02-01 21:54:00 -05:00
parent 323ef81286
commit 3088a77a21
383 changed files with 1317 additions and 1317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/map_event_scripts.md
View File

@ -106,7 +106,7 @@
<pre>
db <i>N</i> ; warp events
warp_event <i>x</i>, <i>y</i>, <i>warp_id</i>, <i>map</i>
warp_event <i>x</i>, <i>y</i>, <i>map</i>, <i>warp_id</i>
</pre>

8
macros/scripts/maps.asm
View File

@ -19,10 +19,10 @@ ENDM
warp_event: MACRO
;\1: x: left to right, starts at 0
;\2: y: top to bottom, starts at 0
;\3: warp destination: starts at 1
;\4: map id: from constants/map_constants.asm
db \2, \1, \3
map \4
;\3: map id: from constants/map_constants.asm
;\4: warp destination: starts at 1
db \2, \1, \4
map \3
ENDM
coord_event: MACRO

4
maps/AzaleaGym.asm
View File

@ -363,8 +363,8 @@ AzaleaGym_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 4, 15, 5, AZALEA_TOWN
warp_event 5, 15, 5, AZALEA_TOWN
warp_event 4, 15, AZALEA_TOWN, 5
warp_event 5, 15, AZALEA_TOWN, 5
db 0 ; coord events

4
maps/AzaleaMart.asm
View File

@ -47,8 +47,8 @@ AzaleaMart_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 2, 7, 3, AZALEA_TOWN
warp_event 3, 7, 3, AZALEA_TOWN
warp_event 2, 7, AZALEA_TOWN, 3
warp_event 3, 7, AZALEA_TOWN, 3
db 0 ; coord events

6
maps/AzaleaPokecenter1F.asm
View File

@ -78,9 +78,9 @@ AzaleaPokecenter1F_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
warp_event 3, 7, 1, AZALEA_TOWN
warp_event 4, 7, 1, AZALEA_TOWN
warp_event 0, 7, 1, POKECENTER_2F
warp_event 3, 7, AZALEA_TOWN, 1
warp_event 4, 7, AZALEA_TOWN, 1
warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events

16
maps/AzaleaTown.asm
View File

@ -457,14 +457,14 @@ AzaleaTown_MapEvents:
db 0, 0 ; filler
db 8 ; warp events
warp_event 15, 9, 1, AZALEA_POKECENTER_1F
warp_event 21, 13, 1, CHARCOAL_KILN
warp_event 21, 5, 2, AZALEA_MART
warp_event 9, 5, 1, KURTS_HOUSE
warp_event 10, 15, 1, AZALEA_GYM
warp_event 31, 7, 1, SLOWPOKE_WELL_B1F
warp_event 2, 10, 3, ILEX_FOREST_AZALEA_GATE
warp_event 2, 11, 4, ILEX_FOREST_AZALEA_GATE
warp_event 15, 9, AZALEA_POKECENTER_1F, 1
warp_event 21, 13, CHARCOAL_KILN, 1
warp_event 21, 5, AZALEA_MART, 2
warp_event 9, 5, KURTS_HOUSE, 1
warp_event 10, 15, AZALEA_GYM, 1
warp_event 31, 7, SLOWPOKE_WELL_B1F, 1
warp_event 2, 10, ILEX_FOREST_AZALEA_GATE, 3
warp_event 2, 11, ILEX_FOREST_AZALEA_GATE, 4
db 3 ; coord events
coord_event 5, 10, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene1

6
maps/BattleTower1F.asm
View File

@ -795,9 +795,9 @@ BattleTower1F_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
warp_event 7, 9, 3, BATTLE_TOWER_OUTSIDE
warp_event 8, 9, 4, BATTLE_TOWER_OUTSIDE
warp_event 7, 0, 1, BATTLE_TOWER_ELEVATOR
warp_event 7, 9, BATTLE_TOWER_OUTSIDE, 3
warp_event 8, 9, BATTLE_TOWER_OUTSIDE, 4
warp_event 7, 0, BATTLE_TOWER_ELEVATOR, 1
db 0 ; coord events

4
maps/BattleTowerBattleRoom.asm
View File

@ -140,8 +140,8 @@ BattleTowerBattleRoom_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 3, 7, 4, BATTLE_TOWER_HALLWAY
warp_event 4, 7, 4, BATTLE_TOWER_HALLWAY
warp_event 3, 7, BATTLE_TOWER_HALLWAY, 4
warp_event 4, 7, BATTLE_TOWER_HALLWAY, 4
db 0 ; coord events

4
maps/BattleTowerElevator.asm
View File

@ -45,8 +45,8 @@ BattleTowerElevator_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 1, 3, 1, BATTLE_TOWER_HALLWAY
warp_event 2, 3, 1, BATTLE_TOWER_HALLWAY
warp_event 1, 3, BATTLE_TOWER_HALLWAY, 1
warp_event 2, 3, BATTLE_TOWER_HALLWAY, 1
db 0 ; coord events

12
maps/BattleTowerHallway.asm
View File

@ -78,12 +78,12 @@ BattleTowerHallway_MapEvents:
db 0, 0 ; filler
db 6 ; warp events
warp_event 11, 1, 1, BATTLE_TOWER_ELEVATOR
warp_event 5, 0, 1, BATTLE_TOWER_BATTLE_ROOM
warp_event 7, 0, 1, BATTLE_TOWER_BATTLE_ROOM
warp_event 9, 0, 1, BATTLE_TOWER_BATTLE_ROOM
warp_event 13, 0, 1, BATTLE_TOWER_BATTLE_ROOM
warp_event 15, 0, 1, BATTLE_TOWER_BATTLE_ROOM
warp_event 11, 1, BATTLE_TOWER_ELEVATOR, 1
warp_event 5, 0, BATTLE_TOWER_BATTLE_ROOM, 1
warp_event 7, 0, BATTLE_TOWER_BATTLE_ROOM, 1
warp_event 9, 0, BATTLE_TOWER_BATTLE_ROOM, 1
warp_event 13, 0, BATTLE_TOWER_BATTLE_ROOM, 1
warp_event 15, 0, BATTLE_TOWER_BATTLE_ROOM, 1
db 0 ; coord events

8
maps/BattleTowerOutside.asm
View File

@ -128,10 +128,10 @@ BattleTowerOutside_MapEvents:
db 0, 0 ; filler
db 4 ; warp events
warp_event 8, 21, 3, ROUTE_40_BATTLE_TOWER_GATE
warp_event 9, 21, 4, ROUTE_40_BATTLE_TOWER_GATE
warp_event 8, 9, 1, BATTLE_TOWER_1F
warp_event 9, 9, 2, BATTLE_TOWER_1F
warp_event 8, 21, ROUTE_40_BATTLE_TOWER_GATE, 3
warp_event 9, 21, ROUTE_40_BATTLE_TOWER_GATE, 4
warp_event 8, 9, BATTLE_TOWER_1F, 1
warp_event 9, 9, BATTLE_TOWER_1F, 2
db 0 ; coord events

4
maps/BillsBrothersHouse.asm
View File

@ -29,8 +29,8 @@ BillsBrothersHouse_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 2, 7, 4, FUCHSIA_CITY
warp_event 3, 7, 4, FUCHSIA_CITY
warp_event 2, 7, FUCHSIA_CITY, 4
warp_event 3, 7, FUCHSIA_CITY, 4
db 0 ; coord events

4
maps/BillsFamilysHouse.asm
View File

@ -244,8 +244,8 @@ BillsFamilysHouse_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 2, 7, 4, GOLDENROD_CITY
warp_event 3, 7, 4, GOLDENROD_CITY
warp_event 2, 7, GOLDENROD_CITY, 4
warp_event 3, 7, GOLDENROD_CITY, 4
db 0 ; coord events

4
maps/BillsHouse.asm
View File

@ -355,8 +355,8 @@ BillsHouse_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 2, 7, 1, ROUTE_25
warp_event 3, 7, 1, ROUTE_25
warp_event 2, 7, ROUTE_25, 1
warp_event 3, 7, ROUTE_25, 1
db 0 ; coord events

16
maps/BlackthornCity.asm
View File

@ -314,14 +314,14 @@ BlackthornCity_MapEvents:
db 0, 0 ; filler
db 8 ; warp events
warp_event 18, 11, 1, BLACKTHORN_GYM_1F
warp_event 13, 21, 1, BLACKTHORN_DRAGON_SPEECH_HOUSE
warp_event 29, 23, 1, BLACKTHORN_EMYS_HOUSE
warp_event 15, 29, 2, BLACKTHORN_MART
warp_event 21, 29, 1, BLACKTHORN_POKECENTER_1F
warp_event 9, 31, 1, MOVE_DELETERS_HOUSE
warp_event 36, 9, 2, ICE_PATH_1F
warp_event 20, 1, 1, DRAGONS_DEN_1F
warp_event 18, 11, BLACKTHORN_GYM_1F, 1
warp_event 13, 21, BLACKTHORN_DRAGON_SPEECH_HOUSE, 1
warp_event 29, 23, BLACKTHORN_EMYS_HOUSE, 1
warp_event 15, 29, BLACKTHORN_MART, 2
warp_event 21, 29, BLACKTHORN_POKECENTER_1F, 1
warp_event 9, 31, MOVE_DELETERS_HOUSE, 1
warp_event 36, 9, ICE_PATH_1F, 2
warp_event 20, 1, DRAGONS_DEN_1F, 1
db 0 ; coord events

4
maps/BlackthornDragonSpeechHouse.asm
View File

@ -49,8 +49,8 @@ BlackthornDragonSpeechHouse_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 2, 7, 2, BLACKTHORN_CITY
warp_event 3, 7, 2, BLACKTHORN_CITY
warp_event 2, 7, BLACKTHORN_CITY, 2
warp_event 3, 7, BLACKTHORN_CITY, 2
db 0 ; coord events

4
maps/BlackthornEmysHouse.asm
View File

@ -21,8 +21,8 @@ BlackthornEmysHouse_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 2, 7, 3, BLACKTHORN_CITY
warp_event 3, 7, 3, BLACKTHORN_CITY
warp_event 2, 7, BLACKTHORN_CITY, 3
warp_event 3, 7, BLACKTHORN_CITY, 3
db 0 ; coord events

14
maps/BlackthornGym1F.asm
View File

@ -388,13 +388,13 @@ BlackthornGym1F_MapEvents:
db 0, 0 ; filler
db 7 ; warp events
warp_event 4, 17, 1, BLACKTHORN_CITY
warp_event 5, 17, 1, BLACKTHORN_CITY
warp_event 1, 7, 1, BLACKTHORN_GYM_2F
warp_event 7, 9, 2, BLACKTHORN_GYM_2F
warp_event 2, 6, 3, BLACKTHORN_GYM_2F
warp_event 7, 7, 4, BLACKTHORN_GYM_2F
warp_event 7, 6, 5, BLACKTHORN_GYM_2F
warp_event 4, 17, BLACKTHORN_CITY, 1
warp_event 5, 17, BLACKTHORN_CITY, 1
warp_event 1, 7, BLACKTHORN_GYM_2F, 1
warp_event 7, 9, BLACKTHORN_GYM_2F, 2
warp_event 2, 6, BLACKTHORN_GYM_2F, 3
warp_event 7, 7, BLACKTHORN_GYM_2F, 4
warp_event 7, 6, BLACKTHORN_GYM_2F, 5
db 0 ; coord events

10
maps/BlackthornGym2F.asm
View File

@ -127,11 +127,11 @@ BlackthornGym2F_MapEvents:
db 0, 0 ; filler
db 5 ; warp events
warp_event 1, 7, 3, BLACKTHORN_GYM_1F
warp_event 7, 9, 4, BLACKTHORN_GYM_1F
warp_event 2, 5, 5, BLACKTHORN_GYM_1F ; hole
warp_event 8, 7, 6, BLACKTHORN_GYM_1F ; hole
warp_event 8, 3, 7, BLACKTHORN_GYM_1F ; hole
warp_event 1, 7, BLACKTHORN_GYM_1F, 3
warp_event 7, 9, BLACKTHORN_GYM_1F, 4
warp_event 2, 5, BLACKTHORN_GYM_1F, 5 ; hole
warp_event 8, 7, BLACKTHORN_GYM_1F, 6 ; hole
warp_event 8, 3, BLACKTHORN_GYM_1F, 7 ; hole
db 0 ; coord events

4
maps/BlackthornMart.asm
View File

@ -48,8 +48,8 @@ BlackthornMart_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 2, 7, 4, BLACKTHORN_CITY
warp_event 3, 7, 4, BLACKTHORN_CITY
warp_event 2, 7, BLACKTHORN_CITY, 4
warp_event 3, 7, BLACKTHORN_CITY, 4
db 0 ; coord events

6
maps/BlackthornPokecenter1F.asm
View File

@ -51,9 +51,9 @@ BlackthornPokecenter1F_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
warp_event 3, 7, 5, BLACKTHORN_CITY
warp_event 4, 7, 5, BLACKTHORN_CITY
warp_event 0, 7, 1, POKECENTER_2F
warp_event 3, 7, BLACKTHORN_CITY, 5
warp_event 4, 7, BLACKTHORN_CITY, 5
warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events

4
maps/BluesHouse.asm
View File

@ -146,8 +146,8 @@ BluesHouse_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 2, 7, 2, PALLET_TOWN
warp_event 3, 7, 2, PALLET_TOWN
warp_event 2, 7, PALLET_TOWN, 2
warp_event 3, 7, PALLET_TOWN, 2
db 0 ; coord events

8
maps/BrunosRoom.asm
View File

@ -126,10 +126,10 @@ BrunosRoom_MapEvents:
db 0, 0 ; filler
db 4 ; warp events
warp_event 4, 17, 3, KOGAS_ROOM
warp_event 5, 17, 4, KOGAS_ROOM
warp_event 4, 2, 1, KARENS_ROOM
warp_event 5, 2, 2, KARENS_ROOM
warp_event 4, 17, KOGAS_ROOM, 3
warp_event 5, 17, KOGAS_ROOM, 4
warp_event 4, 2, KARENS_ROOM, 1
warp_event 5, 2, KARENS_ROOM, 2
db 0 ; coord events

28
maps/BurnedTower1F.asm
View File

@ -279,20 +279,20 @@ BurnedTower1F_MapEvents:
db 0, 0 ; filler
db 14 ; warp events
warp_event 9, 15, 13, ECRUTEAK_CITY
warp_event 10, 15, 13, ECRUTEAK_CITY
warp_event 10, 9, 1, BURNED_TOWER_B1F
warp_event 5, 5, 1, BURNED_TOWER_B1F
warp_event 5, 6, 1, BURNED_TOWER_B1F
warp_event 4, 6, 1, BURNED_TOWER_B1F
warp_event 15, 4, 2, BURNED_TOWER_B1F
warp_event 15, 5, 2, BURNED_TOWER_B1F
warp_event 10, 7, 3, BURNED_TOWER_B1F
warp_event 5, 14, 4, BURNED_TOWER_B1F
warp_event 4, 14, 4, BURNED_TOWER_B1F
warp_event 14, 14, 5, BURNED_TOWER_B1F
warp_event 15, 14, 5, BURNED_TOWER_B1F
warp_event 7, 15, 6, BURNED_TOWER_B1F
warp_event 9, 15, ECRUTEAK_CITY, 13
warp_event 10, 15, ECRUTEAK_CITY, 13
warp_event 10, 9, BURNED_TOWER_B1F, 1
warp_event 5, 5, BURNED_TOWER_B1F, 1
warp_event 5, 6, BURNED_TOWER_B1F, 1
warp_event 4, 6, BURNED_TOWER_B1F, 1
warp_event 15, 4, BURNED_TOWER_B1F, 2
warp_event 15, 5, BURNED_TOWER_B1F, 2
warp_event 10, 7, BURNED_TOWER_B1F, 3
warp_event 5, 14, BURNED_TOWER_B1F, 4
warp_event 4, 14, BURNED_TOWER_B1F, 4
warp_event 14, 14, BURNED_TOWER_B1F, 5
warp_event 15, 14, BURNED_TOWER_B1F, 5
warp_event 7, 15, BURNED_TOWER_B1F, 6
db 1 ; coord events
coord_event 11, 9, SCENE_BURNEDTOWER1F_RIVAL_BATTLE, BurnedTowerRivalBattleScript

12
maps/BurnedTowerB1F.asm
View File

@ -237,12 +237,12 @@ BurnedTowerB1F_MapEvents:
db 0, 0 ; filler
db 6 ; warp events
warp_event 10, 9, 3, BURNED_TOWER_1F
warp_event 17, 7, 7, BURNED_TOWER_1F
warp_event 10, 8, 9, BURNED_TOWER_1F
warp_event 3, 13, 10, BURNED_TOWER_1F
warp_event 17, 14, 12, BURNED_TOWER_1F
warp_event 7, 15, 14, BURNED_TOWER_1F
warp_event 10, 9, BURNED_TOWER_1F, 3
warp_event 17, 7, BURNED_TOWER_1F, 7
warp_event 10, 8, BURNED_TOWER_1F, 9
warp_event 3, 13, BURNED_TOWER_1F, 10
warp_event 17, 14, BURNED_TOWER_1F, 12
warp_event 7, 15, BURNED_TOWER_1F, 14
db 1 ; coord events
coord_event 10, 6, SCENE_DEFAULT, ReleaseTheBeasts

4
maps/CeladonCafe.asm
View File

@ -209,8 +209,8 @@ CeladonCafe_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 6, 7, 9, CELADON_CITY
warp_event 7, 7, 9, CELADON_CITY
warp_event 6, 7, CELADON_CITY, 9
warp_event 7, 7, CELADON_CITY, 9
db 0 ; coord events

18
maps/CeladonCity.asm
View File

@ -236,15 +236,15 @@ CeladonCity_MapEvents:
db 0, 0 ; filler
db 9 ; warp events
warp_event 4, 9, 1, CELADON_DEPT_STORE_1F
warp_event 16, 9, 1, CELADON_MANSION_1F
warp_event 16, 3, 3, CELADON_MANSION_1F
warp_event 17, 3, 3, CELADON_MANSION_1F
warp_event 29, 9, 1, CELADON_POKECENTER_1F
warp_event 18, 19, 1, CELADON_GAME_CORNER
warp_event 23, 19, 1, CELADON_GAME_CORNER_PRIZE_ROOM
warp_event 10, 29, 1, CELADON_GYM
warp_event 25, 29, 1, CELADON_CAFE
warp_event 4, 9, CELADON_DEPT_STORE_1F, 1
warp_event 16, 9, CELADON_MANSION_1F, 1
warp_event 16, 3, CELADON_MANSION_1F, 3
warp_event 17, 3, CELADON_MANSION_1F, 3
warp_event 29, 9, CELADON_POKECENTER_1F, 1
warp_event 18, 19, CELADON_GAME_CORNER, 1
warp_event 23, 19, CELADON_GAME_CORNER_PRIZE_ROOM, 1
warp_event 10, 29, CELADON_GYM, 1
warp_event 25, 29, CELADON_CAFE, 1
db 0 ; coord events

8
maps/CeladonDeptStore1F.asm
View File

@ -75,10 +75,10 @@ CeladonDeptStore1F_MapEvents:
db 0, 0 ; filler
db 4 ; warp events
warp_event 7, 7, 1, CELADON_CITY
warp_event 8, 7, 1, CELADON_CITY
warp_event 15, 0, 2, CELADON_DEPT_STORE_2F
warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
warp_event 7, 7, CELADON_CITY, 1
warp_event 8, 7, CELADON_CITY, 1
warp_event 15, 0, CELADON_DEPT_STORE_2F, 2
warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1
db 0 ; coord events

6
maps/CeladonDeptStore2F.asm
View File

@ -70,9 +70,9 @@ CeladonDeptStore2F_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
warp_event 12, 0, 1, CELADON_DEPT_STORE_3F
warp_event 15, 0, 3, CELADON_DEPT_STORE_1F
warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
warp_event 12, 0, CELADON_DEPT_STORE_3F, 1
warp_event 15, 0, CELADON_DEPT_STORE_1F, 3
warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1
db 0 ; coord events

6
maps/CeladonDeptStore3F.asm
View File

@ -96,9 +96,9 @@ CeladonDeptStore3F_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
warp_event 12, 0, 1, CELADON_DEPT_STORE_2F
warp_event 15, 0, 2, CELADON_DEPT_STORE_4F
warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
warp_event 12, 0, CELADON_DEPT_STORE_2F, 1
warp_event 15, 0, CELADON_DEPT_STORE_4F, 2
warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1
db 0 ; coord events

6
maps/CeladonDeptStore4F.asm
View File

@ -52,9 +52,9 @@ CeladonDeptStore4F_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
warp_event 12, 0, 1, CELADON_DEPT_STORE_5F
warp_event 15, 0, 2, CELADON_DEPT_STORE_3F
warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
warp_event 12, 0, CELADON_DEPT_STORE_5F, 1
warp_event 15, 0, CELADON_DEPT_STORE_3F, 2
warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1
db 0 ; coord events

6
maps/CeladonDeptStore5F.asm
View File

@ -73,9 +73,9 @@ CeladonDeptStore5F_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
warp_event 12, 0, 1, CELADON_DEPT_STORE_4F
warp_event 15, 0, 1, CELADON_DEPT_STORE_6F
warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
warp_event 12, 0, CELADON_DEPT_STORE_4F, 1
warp_event 15, 0, CELADON_DEPT_STORE_6F, 1
warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1
db 0 ; coord events

4
maps/CeladonDeptStore6F.asm
View File

@ -147,8 +147,8 @@ CeladonDeptStore6F_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 15, 0, 2, CELADON_DEPT_STORE_5F
warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
warp_event 15, 0, CELADON_DEPT_STORE_5F, 2
warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1
db 0 ; coord events

4
maps/CeladonDeptStoreElevator.asm
View File

@ -29,8 +29,8 @@ CeladonDeptStoreElevator_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 1, 3, -1, CELADON_DEPT_STORE_1F
warp_event 2, 3, -1, CELADON_DEPT_STORE_1F
warp_event 1, 3, CELADON_DEPT_STORE_1F, -1
warp_event 2, 3, CELADON_DEPT_STORE_1F, -1
db 0 ; coord events

4
maps/CeladonGameCorner.asm
View File

@ -283,8 +283,8 @@ CeladonGameCorner_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 14, 13, 6, CELADON_CITY
warp_event 15, 13, 6, CELADON_CITY
warp_event 14, 13, CELADON_CITY, 6
warp_event 15, 13, CELADON_CITY, 6
db 0 ; coord events

4
maps/CeladonGameCornerPrizeRoom.asm
View File

@ -265,8 +265,8 @@ CeladonGameCornerPrizeRoom_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 2, 5, 7, CELADON_CITY
warp_event 3, 5, 7, CELADON_CITY
warp_event 2, 5, CELADON_CITY, 7
warp_event 3, 5, CELADON_CITY, 7
db 0 ; coord events

4
maps/CeladonGym.asm
View File

@ -269,8 +269,8 @@ CeladonGym_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 4, 17, 8, CELADON_CITY
warp_event 5, 17, 8, CELADON_CITY
warp_event 4, 17, CELADON_CITY, 8
warp_event 5, 17, CELADON_CITY, 8
db 0 ; coord events

10
maps/CeladonMansion1F.asm
View File

@ -76,11 +76,11 @@ CeladonMansion1F_MapEvents:
db 0, 0 ; filler
db 5 ; warp events
warp_event 6, 9, 2, CELADON_CITY
warp_event 7, 9, 2, CELADON_CITY
warp_event 3, 0, 3, CELADON_CITY
warp_event 0, 0, 1, CELADON_MANSION_2F
warp_event 7, 0, 4, CELADON_MANSION_2F
warp_event 6, 9, CELADON_CITY, 2
warp_event 7, 9, CELADON_CITY, 2
warp_event 3, 0, CELADON_CITY, 3
warp_event 0, 0, CELADON_MANSION_2F, 1
warp_event 7, 0, CELADON_MANSION_2F, 4
db 0 ; coord events

8
maps/CeladonMansion2F.asm
View File

@ -51,10 +51,10 @@ CeladonMansion2F_MapEvents:
db 0, 0 ; filler
db 4 ; warp events
warp_event 0, 0, 4, CELADON_MANSION_1F
warp_event 1, 0, 2, CELADON_MANSION_3F
warp_event 6, 0, 3, CELADON_MANSION_3F
warp_event 7, 0, 5, CELADON_MANSION_1F
warp_event 0, 0, CELADON_MANSION_1F, 4
warp_event 1, 0, CELADON_MANSION_3F, 2
warp_event 6, 0, CELADON_MANSION_3F, 3
warp_event 7, 0, CELADON_MANSION_1F, 5
db 0 ; coord events

8
maps/CeladonMansion3F.asm
View File

@ -191,10 +191,10 @@ CeladonMansion3F_MapEvents:
db 0, 0 ; filler
db 4 ; warp events
warp_event 0, 0, 1, CELADON_MANSION_ROOF
warp_event 1, 0, 2, CELADON_MANSION_2F
warp_event 6, 0, 3, CELADON_MANSION_2F
warp_event 7, 0, 2, CELADON_MANSION_ROOF
warp_event 0, 0, CELADON_MANSION_ROOF, 1
warp_event 1, 0, CELADON_MANSION_2F, 2
warp_event 6, 0, CELADON_MANSION_2F, 3
warp_event 7, 0, CELADON_MANSION_ROOF, 2
db 0 ; coord events

6
maps/CeladonMansionRoof.asm
View File

@ -35,9 +35,9 @@ CeladonMansionRoof_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
warp_event 1, 1, 1, CELADON_MANSION_3F
warp_event 6, 1, 4, CELADON_MANSION_3F
warp_event 2, 5, 1, CELADON_MANSION_ROOF_HOUSE
warp_event 1, 1, CELADON_MANSION_3F, 1
warp_event 6, 1, CELADON_MANSION_3F, 4
warp_event 2, 5, CELADON_MANSION_ROOF_HOUSE, 1
db 0 ; coord events

4
maps/CeladonMansionRoofHouse.asm
View File

@ -118,8 +118,8 @@ CeladonMansionRoofHouse_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 2, 7, 3, CELADON_MANSION_ROOF
warp_event 3, 7, 3, CELADON_MANSION_ROOF
warp_event 2, 7, CELADON_MANSION_ROOF, 3
warp_event 3, 7, CELADON_MANSION_ROOF, 3
db 0 ; coord events

6
maps/CeladonPokecenter1F.asm
View File

@ -147,9 +147,9 @@ CeladonPokecenter1F_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
warp_event 3, 7, 5, CELADON_CITY
warp_event 4, 7, 5, CELADON_CITY
warp_event 0, 7, 1, POKECENTER_2F
warp_event 3, 7, CELADON_CITY, 5
warp_event 4, 7, CELADON_CITY, 5
warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events

2
maps/CeladonPokecenter2FBeta.asm
View File

@ -7,7 +7,7 @@ CeladonPokecenter2FBeta_MapEvents:
db 0, 0 ; filler
db 1 ; warp events
warp_event 0, 7, 3, CELADON_POKECENTER_1F
warp_event 0, 7, CELADON_POKECENTER_1F, 3
db 0 ; coord events

12
maps/CeruleanCity.asm
View File

@ -277,12 +277,12 @@ CeruleanCity_MapEvents:
db 0, 0 ; filler
db 6 ; warp events
warp_event 7, 15, 1, CERULEAN_GYM_BADGE_SPEECH_HOUSE
warp_event 28, 17, 1, CERULEAN_POLICE_STATION
warp_event 13, 19, 1, CERULEAN_TRADE_SPEECH_HOUSE
warp_event 19, 21, 1, CERULEAN_POKECENTER_1F
warp_event 30, 23, 1, CERULEAN_GYM
warp_event 25, 29, 2, CERULEAN_MART
warp_event 7, 15, CERULEAN_GYM_BADGE_SPEECH_HOUSE, 1
warp_event 28, 17, CERULEAN_POLICE_STATION, 1
warp_event 13, 19, CERULEAN_TRADE_SPEECH_HOUSE, 1
warp_event 19, 21, CERULEAN_POKECENTER_1F, 1
warp_event 30, 23, CERULEAN_GYM, 1
warp_event 25, 29, CERULEAN_MART, 2
db 0 ; coord events

4
maps/CeruleanGym.asm
View File

@ -364,8 +364,8 @@ CeruleanGym_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 4, 15, 5, CERULEAN_CITY
warp_event 5, 15, 5, CERULEAN_CITY
warp_event 4, 15, CERULEAN_CITY, 5
warp_event 5, 15, CERULEAN_CITY, 5
db 0 ; coord events

4
maps/CeruleanGymBadgeSpeechHouse.asm
View File

@ -18,8 +18,8 @@ CeruleanGymBadgeSpeechHouse_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 2, 7, 1, CERULEAN_CITY
warp_event 3, 7, 1, CERULEAN_CITY
warp_event 2, 7, CERULEAN_CITY, 1
warp_event 3, 7, CERULEAN_CITY, 1
db 0 ; coord events

4
maps/CeruleanMart.asm
View File

@ -47,8 +47,8 @@ CeruleanMart_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 2, 7, 6, CERULEAN_CITY
warp_event 3, 7, 6, CERULEAN_CITY
warp_event 2, 7, CERULEAN_CITY, 6
warp_event 3, 7, CERULEAN_CITY, 6
db 0 ; coord events

6
maps/CeruleanPokecenter1F.asm
View File

@ -64,9 +64,9 @@ CeruleanPokecenter1F_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
warp_event 3, 7, 4, CERULEAN_CITY
warp_event 4, 7, 4, CERULEAN_CITY
warp_event 0, 7, 1, POKECENTER_2F
warp_event 3, 7, CERULEAN_CITY, 4
warp_event 4, 7, CERULEAN_CITY, 4
warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events

2
maps/CeruleanPokecenter2FBeta.asm
View File

@ -7,7 +7,7 @@ CeruleanPokecenter2FBeta_MapEvents:
db 0, 0 ; filler
db 1 ; warp events
warp_event 0, 7, 1, CERULEAN_POKECENTER_1F
warp_event 0, 7, CERULEAN_POKECENTER_1F, 1
db 0 ; coord events

4
maps/CeruleanPoliceStation.asm
View File

@ -45,8 +45,8 @@ CeruleanPoliceStation_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 2, 7, 2, CERULEAN_CITY
warp_event 3, 7, 2, CERULEAN_CITY
warp_event 2, 7, CERULEAN_CITY, 2
warp_event 3, 7, CERULEAN_CITY, 2
db 0 ; coord events

4
maps/CeruleanTradeSpeechHouse.asm
View File

@ -55,8 +55,8 @@ CeruleanTradeSpeechHouse_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 2, 7, 3, CERULEAN_CITY
warp_event 3, 7, 3, CERULEAN_CITY
warp_event 2, 7, CERULEAN_CITY, 3
warp_event 3, 7, CERULEAN_CITY, 3
db 0 ; coord events

4
maps/CharcoalKiln.asm
View File

@ -150,8 +150,8 @@ CharcoalKiln_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 2, 7, 2, AZALEA_TOWN
warp_event 3, 7, 2, AZALEA_TOWN
warp_event 2, 7, AZALEA_TOWN, 2
warp_event 3, 7, AZALEA_TOWN, 2
db 0 ; coord events

10
maps/CherrygroveCity.asm
View File

@ -548,11 +548,11 @@ CherrygroveCity_MapEvents:
db 0, 0 ; filler
db 5 ; warp events
warp_event 23, 3, 2, CHERRYGROVE_MART
warp_event 29, 3, 1, CHERRYGROVE_POKECENTER_1F
warp_event 17, 7, 1, CHERRYGROVE_GYM_SPEECH_HOUSE
warp_event 25, 9, 1, GUIDE_GENTS_HOUSE
warp_event 31, 11, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE
warp_event 23, 3, CHERRYGROVE_MART, 2
warp_event 29, 3, CHERRYGROVE_POKECENTER_1F, 1
warp_event 17, 7, CHERRYGROVE_GYM_SPEECH_HOUSE, 1
warp_event 25, 9, GUIDE_GENTS_HOUSE, 1
warp_event 31, 11, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, 1
db 2 ; coord events
coord_event 33, 6, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveSilverSceneNorth

4
maps/CherrygroveEvolutionSpeechHouse.asm
View File

@ -43,8 +43,8 @@ CherrygroveEvolutionSpeechHouse_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 2, 7, 5, CHERRYGROVE_CITY
warp_event 3, 7, 5, CHERRYGROVE_CITY
warp_event 2, 7, CHERRYGROVE_CITY, 5
warp_event 3, 7, CHERRYGROVE_CITY, 5
db 0 ; coord events

4
maps/CherrygroveGymSpeechHouse.asm
View File

@ -46,8 +46,8 @@ CherrygroveGymSpeechHouse_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 2, 7, 3, CHERRYGROVE_CITY
warp_event 3, 7, 3, CHERRYGROVE_CITY
warp_event 2, 7, CHERRYGROVE_CITY, 3
warp_event 3, 7, CHERRYGROVE_CITY, 3
db 0 ; coord events

4
maps/CherrygroveMart.asm
View File

@ -73,8 +73,8 @@ CherrygroveMart_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 2, 7, 1, CHERRYGROVE_CITY
warp_event 3, 7, 1, CHERRYGROVE_CITY
warp_event 2, 7, CHERRYGROVE_CITY, 1
warp_event 3, 7, CHERRYGROVE_CITY, 1
db 0 ; coord events

6
maps/CherrygrovePokecenter1F.asm
View File

@ -70,9 +70,9 @@ CherrygrovePokecenter1F_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
warp_event 3, 7, 2, CHERRYGROVE_CITY
warp_event 4, 7, 2, CHERRYGROVE_CITY
warp_event 0, 7, 1, POKECENTER_2F
warp_event 3, 7, CHERRYGROVE_CITY, 2
warp_event 4, 7, CHERRYGROVE_CITY, 2
warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events

14
maps/CianwoodCity.asm
View File

@ -382,13 +382,13 @@ CianwoodCity_MapEvents:
db 0, 0 ; filler
db 7 ; warp events
warp_event 17, 41, 1, MANIAS_HOUSE
warp_event 8, 43, 1, CIANWOOD_GYM
warp_event 23, 43, 1, CIANWOOD_POKECENTER_1F
warp_event 15, 47, 1, CIANWOOD_PHARMACY
warp_event 9, 31, 1, CIANWOOD_PHOTO_STUDIO
warp_event 15, 37, 1, CIANWOOD_LUGIA_SPEECH_HOUSE
warp_event 5, 17, 1, POKE_SEERS_HOUSE
warp_event 17, 41, MANIAS_HOUSE, 1
warp_event 8, 43, CIANWOOD_GYM, 1
warp_event 23, 43, CIANWOOD_POKECENTER_1F, 1
warp_event 15, 47, CIANWOOD_PHARMACY, 1
warp_event 9, 31, CIANWOOD_PHOTO_STUDIO, 1
warp_event 15, 37, CIANWOOD_LUGIA_SPEECH_HOUSE, 1
warp_event 5, 17, POKE_SEERS_HOUSE, 1
db 1 ; coord events
coord_event 11, 16, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE, CianwoodCitySuicuneAndEusine

4
maps/CianwoodGym.asm
View File

@ -307,8 +307,8 @@ CianwoodGym_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 4, 17, 2, CIANWOOD_CITY
warp_event 5, 17, 2, CIANWOOD_CITY
warp_event 4, 17, CIANWOOD_CITY, 2
warp_event 5, 17, CIANWOOD_CITY, 2
db 0 ; coord events

4
maps/CianwoodLugiaSpeechHouse.asm
View File

@ -63,8 +63,8 @@ CianwoodLugiaSpeechHouse_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 2, 7, 6, CIANWOOD_CITY
warp_event 3, 7, 6, CIANWOOD_CITY
warp_event 2, 7, CIANWOOD_CITY, 6
warp_event 3, 7, CIANWOOD_CITY, 6
db 0 ; coord events

4
maps/CianwoodPharmacy.asm
View File

@ -74,8 +74,8 @@ CianwoodPharmacy_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 2, 7, 4, CIANWOOD_CITY
warp_event 3, 7, 4, CIANWOOD_CITY
warp_event 2, 7, CIANWOOD_CITY, 4
warp_event 3, 7, CIANWOOD_CITY, 4
db 0 ; coord events

4
maps/CianwoodPhotoStudio.asm
View File

@ -50,8 +50,8 @@ CianwoodPhotoStudio_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 2, 7, 5, CIANWOOD_CITY
warp_event 3, 7, 5, CIANWOOD_CITY
warp_event 2, 7, CIANWOOD_CITY, 5
warp_event 3, 7, CIANWOOD_CITY, 5
db 0 ; coord events

6
maps/CianwoodPokecenter1F.asm
View File

@ -133,9 +133,9 @@ CianwoodPokecenter1F_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
warp_event 3, 7, 3, CIANWOOD_CITY
warp_event 4, 7, 3, CIANWOOD_CITY
warp_event 0, 7, 1, POKECENTER_2F
warp_event 3, 7, CIANWOOD_CITY, 3
warp_event 4, 7, CIANWOOD_CITY, 3
warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events

2
maps/CinnabarIsland.asm
View File

@ -129,7 +129,7 @@ CinnabarIsland_MapEvents:
db 0, 0 ; filler
db 1 ; warp events
warp_event 11, 11, 1, CINNABAR_POKECENTER_1F
warp_event 11, 11, CINNABAR_POKECENTER_1F, 1
db 0 ; coord events

6
maps/CinnabarPokecenter1F.asm
View File

@ -36,9 +36,9 @@ CinnabarPokecenter1F_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
warp_event 3, 7, 1, CINNABAR_ISLAND
warp_event 4, 7, 1, CINNABAR_ISLAND
warp_event 0, 7, 1, POKECENTER_2F
warp_event 3, 7, CINNABAR_ISLAND, 1
warp_event 4, 7, CINNABAR_ISLAND, 1
warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events

2
maps/CinnabarPokecenter2FBeta.asm
View File

@ -7,7 +7,7 @@ CinnabarPokecenter2FBeta_MapEvents:
db 0, 0 ; filler
db 1 ; warp events
warp_event 0, 7, 3, CINNABAR_POKECENTER_1F
warp_event 0, 7, CINNABAR_POKECENTER_1F, 3
db 0 ; coord events

4
maps/Colosseum.asm
View File

@ -64,8 +64,8 @@ Colosseum_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 4, 7, 3, POKECENTER_2F
warp_event 5, 7, 3, POKECENTER_2F
warp_event 4, 7, POKECENTER_2F, 3
warp_event 5, 7, POKECENTER_2F, 3
db 0 ; coord events

6
maps/CopycatsHouse1F.asm
View File

@ -74,9 +74,9 @@ CopycatsHouse1F_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
warp_event 2, 7, 8, SAFFRON_CITY
warp_event 3, 7, 8, SAFFRON_CITY
warp_event 2, 0, 1, COPYCATS_HOUSE_2F
warp_event 2, 7, SAFFRON_CITY, 8
warp_event 3, 7, SAFFRON_CITY, 8
warp_event 2, 0, COPYCATS_HOUSE_2F, 1
db 0 ; coord events

2
maps/CopycatsHouse2F.asm
View File

@ -362,7 +362,7 @@ CopycatsHouse2F_MapEvents:
db 0, 0 ; filler
db 1 ; warp events
warp_event 3, 0, 3, COPYCATS_HOUSE_1F
warp_event 3, 0, COPYCATS_HOUSE_1F, 3
db 0 ; coord events

4
maps/DanceTheatre.asm
View File

@ -339,8 +339,8 @@ DanceTheatre_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 5, 13, 8, ECRUTEAK_CITY
warp_event 6, 13, 8, ECRUTEAK_CITY
warp_event 5, 13, ECRUTEAK_CITY, 8
warp_event 6, 13, ECRUTEAK_CITY, 8
db 0 ; coord events

4
maps/DarkCaveBlackthornEntrance.asm
View File

@ -63,8 +63,8 @@ DarkCaveBlackthornEntrance_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 23, 3, 1, ROUTE_45
warp_event 3, 25, 2, DARK_CAVE_VIOLET_ENTRANCE
warp_event 23, 3, ROUTE_45, 1
warp_event 3, 25, DARK_CAVE_VIOLET_ENTRANCE, 2
db 0 ; coord events

6
maps/DarkCaveVioletEntrance.asm
View File

@ -35,9 +35,9 @@ DarkCaveVioletEntrance_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
warp_event 3, 15, 3, ROUTE_31
warp_event 17, 1, 2, DARK_CAVE_BLACKTHORN_ENTRANCE
warp_event 35, 33, 3, ROUTE_46
warp_event 3, 15, ROUTE_31, 3
warp_event 17, 1, DARK_CAVE_BLACKTHORN_ENTRANCE, 2
warp_event 35, 33, ROUTE_46, 3
db 0 ; coord events

8
maps/DayCare.asm
View File

@ -157,10 +157,10 @@ DayCare_MapEvents:
db 0, 0 ; filler
db 4 ; warp events
warp_event 0, 5, 3, ROUTE_34
warp_event 0, 6, 4, ROUTE_34
warp_event 2, 7, 5, ROUTE_34
warp_event 3, 7, 5, ROUTE_34
warp_event 0, 5, ROUTE_34, 3
warp_event 0, 6, ROUTE_34, 4
warp_event 2, 7, ROUTE_34, 5
warp_event 3, 7, ROUTE_34, 5
db 0 ; coord events

4
maps/DayOfWeekSiblingsHouse.asm
View File

@ -72,8 +72,8 @@ DayOfWeekSiblingsHouse_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 2, 7, 3, ROUTE_26
warp_event 3, 7, 3, ROUTE_26
warp_event 2, 7, ROUTE_26, 3
warp_event 3, 7, ROUTE_26, 3
db 0 ; coord events

12
maps/DiglettsCave.asm
View File

@ -24,12 +24,12 @@ DiglettsCave_MapEvents:
db 0, 0 ; filler
db 6 ; warp events
warp_event 3, 33, 10, VERMILION_CITY
warp_event 5, 31, 5, DIGLETTS_CAVE
warp_event 15, 5, 5, ROUTE_2
warp_event 17, 3, 6, DIGLETTS_CAVE
warp_event 17, 33, 2, DIGLETTS_CAVE
warp_event 3, 3, 4, DIGLETTS_CAVE
warp_event 3, 33, VERMILION_CITY, 10
warp_event 5, 31, DIGLETTS_CAVE, 5
warp_event 15, 5, ROUTE_2, 5
warp_event 17, 3, DIGLETTS_CAVE, 6
warp_event 17, 33, DIGLETTS_CAVE, 2
warp_event 3, 3, DIGLETTS_CAVE, 4
db 0 ; coord events

4
maps/DragonShrine.asm
View File

@ -659,8 +659,8 @@ DragonShrine_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 4, 9, 2, DRAGONS_DEN_B1F
warp_event 5, 9, 2, DRAGONS_DEN_B1F
warp_event 4, 9, DRAGONS_DEN_B1F, 2
warp_event 5, 9, DRAGONS_DEN_B1F, 2
db 0 ; coord events

8
maps/DragonsDen1F.asm
View File

@ -7,10 +7,10 @@ DragonsDen1F_MapEvents:
db 0, 0 ; filler
db 4 ; warp events
warp_event 3, 5, 8, BLACKTHORN_CITY
warp_event 3, 3, 4, DRAGONS_DEN_1F
warp_event 5, 15, 1, DRAGONS_DEN_B1F
warp_event 5, 13, 2, DRAGONS_DEN_1F
warp_event 3, 5, BLACKTHORN_CITY, 8
warp_event 3, 3, DRAGONS_DEN_1F, 4
warp_event 5, 15, DRAGONS_DEN_B1F, 1
warp_event 5, 13, DRAGONS_DEN_1F, 2
db 0 ; coord events

4
maps/DragonsDenB1F.asm
View File

@ -408,8 +408,8 @@ DragonsDenB1F_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 20, 3, 3, DRAGONS_DEN_1F
warp_event 19, 29, 1, DRAGON_SHRINE
warp_event 20, 3, DRAGONS_DEN_1F, 3
warp_event 19, 29, DRAGON_SHRINE, 1
db 1 ; coord events
coord_event 19, 30, SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM, DragonsDenB1F_ClairScene

4
maps/EarlsPokemonAcademy.asm
View File

@ -413,8 +413,8 @@ EarlsPokemonAcademy_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 3, 15, 3, VIOLET_CITY
warp_event 4, 15, 3, VIOLET_CITY
warp_event 3, 15, VIOLET_CITY, 3
warp_event 4, 15, VIOLET_CITY, 3
db 0 ; coord events

30
maps/EcruteakCity.asm
View File

@ -261,21 +261,21 @@ EcruteakCity_MapEvents:
db 0, 0 ; filler
db 15 ; warp events
warp_event 35, 26, 1, ROUTE_42_ECRUTEAK_GATE
warp_event 35, 27, 2, ROUTE_42_ECRUTEAK_GATE
warp_event 18, 11, 1, ECRUTEAK_TIN_TOWER_ENTRANCE
warp_event 20, 2, 1, WISE_TRIOS_ROOM
warp_event 20, 3, 2, WISE_TRIOS_ROOM
warp_event 23, 27, 1, ECRUTEAK_POKECENTER_1F
warp_event 5, 21, 1, ECRUTEAK_LUGIA_SPEECH_HOUSE
warp_event 23, 21, 1, DANCE_THEATRE
warp_event 29, 21, 2, ECRUTEAK_MART
warp_event 6, 27, 1, ECRUTEAK_GYM
warp_event 13, 27, 1, ECRUTEAK_ITEMFINDER_HOUSE
warp_event 37, 7, 1, TIN_TOWER_1F
warp_event 5, 5, 1, BURNED_TOWER_1F
warp_event 0, 18, 3, ROUTE_38_ECRUTEAK_GATE
warp_event 0, 19, 4, ROUTE_38_ECRUTEAK_GATE
warp_event 35, 26, ROUTE_42_ECRUTEAK_GATE, 1
warp_event 35, 27, ROUTE_42_ECRUTEAK_GATE, 2
warp_event 18, 11, ECRUTEAK_TIN_TOWER_ENTRANCE, 1
warp_event 20, 2, WISE_TRIOS_ROOM, 1
warp_event 20, 3, WISE_TRIOS_ROOM, 2
warp_event 23, 27, ECRUTEAK_POKECENTER_1F, 1
warp_event 5, 21, ECRUTEAK_LUGIA_SPEECH_HOUSE, 1
warp_event 23, 21, DANCE_THEATRE, 1
warp_event 29, 21, ECRUTEAK_MART, 2
warp_event 6, 27, ECRUTEAK_GYM, 1
warp_event 13, 27, ECRUTEAK_ITEMFINDER_HOUSE, 1
warp_event 37, 7, TIN_TOWER_1F, 1
warp_event 5, 5, BURNED_TOWER_1F, 1
warp_event 0, 18, ROUTE_38_ECRUTEAK_GATE, 3
warp_event 0, 19, ROUTE_38_ECRUTEAK_GATE, 4
db 0 ; coord events

66
maps/EcruteakGym.asm
View File

@ -388,39 +388,39 @@ EcruteakGym_MapEvents:
db 0, 0 ; filler
db 33 ; warp events
warp_event 4, 17, 10, ECRUTEAK_CITY
warp_event 5, 17, 10, ECRUTEAK_CITY
warp_event 4, 14, 4, ECRUTEAK_GYM
warp_event 2, 4, 3, ECRUTEAK_GYM
warp_event 3, 4, 3, ECRUTEAK_GYM
warp_event 4, 4, 3, ECRUTEAK_GYM
warp_event 4, 5, 3, ECRUTEAK_GYM
warp_event 6, 7, 3, ECRUTEAK_GYM
warp_event 7, 4, 3, ECRUTEAK_GYM
warp_event 2, 6, 3, ECRUTEAK_GYM
warp_event 3, 6, 3, ECRUTEAK_GYM
warp_event 4, 6, 3, ECRUTEAK_GYM
warp_event 5, 6, 3, ECRUTEAK_GYM
warp_event 7, 6, 3, ECRUTEAK_GYM
warp_event 7, 7, 3, ECRUTEAK_GYM
warp_event 4, 8, 3, ECRUTEAK_GYM
warp_event 5, 8, 3, ECRUTEAK_GYM
warp_event 6, 8, 3, ECRUTEAK_GYM
warp_event 7, 8, 3, ECRUTEAK_GYM
warp_event 2, 8, 3, ECRUTEAK_GYM
warp_event 2, 9, 3, ECRUTEAK_GYM
warp_event 2, 10, 3, ECRUTEAK_GYM
warp_event 2, 11, 3, ECRUTEAK_GYM
warp_event 4, 10, 3, ECRUTEAK_GYM
warp_event 5, 10, 3, ECRUTEAK_GYM
warp_event 2, 12, 3, ECRUTEAK_GYM
warp_event 3, 12, 3, ECRUTEAK_GYM
warp_event 4, 12, 3, ECRUTEAK_GYM
warp_event 5, 12, 3, ECRUTEAK_GYM
warp_event 7, 10, 3, ECRUTEAK_GYM
warp_event 7, 11, 3, ECRUTEAK_GYM
warp_event 7, 12, 3, ECRUTEAK_GYM
warp_event 7, 13, 3, ECRUTEAK_GYM
warp_event 4, 17, ECRUTEAK_CITY, 10
warp_event 5, 17, ECRUTEAK_CITY, 10
warp_event 4, 14, ECRUTEAK_GYM, 4
warp_event 2, 4, ECRUTEAK_GYM, 3
warp_event 3, 4, ECRUTEAK_GYM, 3
warp_event 4, 4, ECRUTEAK_GYM, 3
warp_event 4, 5, ECRUTEAK_GYM, 3
warp_event 6, 7, ECRUTEAK_GYM, 3
warp_event 7, 4, ECRUTEAK_GYM, 3
warp_event 2, 6, ECRUTEAK_GYM, 3
warp_event 3, 6, ECRUTEAK_GYM, 3
warp_event 4, 6, ECRUTEAK_GYM, 3
warp_event 5, 6, ECRUTEAK_GYM, 3
warp_event 7, 6, ECRUTEAK_GYM, 3
warp_event 7, 7, ECRUTEAK_GYM, 3
warp_event 4, 8, ECRUTEAK_GYM, 3
warp_event 5, 8, ECRUTEAK_GYM, 3
warp_event 6, 8, ECRUTEAK_GYM, 3
warp_event 7, 8, ECRUTEAK_GYM, 3
warp_event 2, 8, ECRUTEAK_GYM, 3
warp_event 2, 9, ECRUTEAK_GYM, 3
warp_event 2, 10, ECRUTEAK_GYM, 3
warp_event 2, 11, ECRUTEAK_GYM, 3
warp_event 4, 10, ECRUTEAK_GYM, 3
warp_event 5, 10, ECRUTEAK_GYM, 3
warp_event 2, 12, ECRUTEAK_GYM, 3
warp_event 3, 12, ECRUTEAK_GYM, 3
warp_event 4, 12, ECRUTEAK_GYM, 3
warp_event 5, 12, ECRUTEAK_GYM, 3
warp_event 7, 10, ECRUTEAK_GYM, 3
warp_event 7, 11, ECRUTEAK_GYM, 3
warp_event 7, 12, ECRUTEAK_GYM, 3
warp_event 7, 13, ECRUTEAK_GYM, 3
db 0 ; coord events

4
maps/EcruteakItemfinderHouse.asm
View File

@ -164,8 +164,8 @@ EcruteakItemfinderHouse_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 3, 7, 11, ECRUTEAK_CITY
warp_event 4, 7, 11, ECRUTEAK_CITY
warp_event 3, 7, ECRUTEAK_CITY, 11
warp_event 4, 7, ECRUTEAK_CITY, 11
db 0 ; coord events

4
maps/EcruteakLugiaSpeechHouse.asm
View File

@ -46,8 +46,8 @@ EcruteakLugiaSpeechHouse_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 3, 7, 7, ECRUTEAK_CITY
warp_event 4, 7, 7, ECRUTEAK_CITY
warp_event 3, 7, ECRUTEAK_CITY, 7
warp_event 4, 7, ECRUTEAK_CITY, 7
db 0 ; coord events

4
maps/EcruteakMart.asm
View File

@ -47,8 +47,8 @@ EcruteakMart_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 2, 7, 9, ECRUTEAK_CITY
warp_event 3, 7, 9, ECRUTEAK_CITY
warp_event 2, 7, ECRUTEAK_CITY, 9
warp_event 3, 7, ECRUTEAK_CITY, 9
db 0 ; coord events

6
maps/EcruteakPokecenter1F.asm
View File

@ -208,9 +208,9 @@ EcruteakPokecenter1F_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
warp_event 3, 7, 6, ECRUTEAK_CITY
warp_event 4, 7, 6, ECRUTEAK_CITY
warp_event 0, 7, 1, POKECENTER_2F
warp_event 3, 7, ECRUTEAK_CITY, 6
warp_event 4, 7, ECRUTEAK_CITY, 6
warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events

10
maps/EcruteakTinTowerEntrance.asm
View File

@ -279,11 +279,11 @@ EcruteakTinTowerEntrance_MapEvents:
db 0, 0 ; filler
db 5 ; warp events
warp_event 4, 17, 3, ECRUTEAK_CITY
warp_event 5, 17, 3, ECRUTEAK_CITY
warp_event 5, 3, 4, ECRUTEAK_TIN_TOWER_ENTRANCE
warp_event 17, 15, 3, ECRUTEAK_TIN_TOWER_ENTRANCE
warp_event 17, 3, 3, WISE_TRIOS_ROOM
warp_event 4, 17, ECRUTEAK_CITY, 3
warp_event 5, 17, ECRUTEAK_CITY, 3
warp_event 5, 3, ECRUTEAK_TIN_TOWER_ENTRANCE, 4
warp_event 17, 15, ECRUTEAK_TIN_TOWER_ENTRANCE, 3
warp_event 17, 3, WISE_TRIOS_ROOM, 3
db 2 ; coord events
coord_event 4, 7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent1

4
maps/ElmsHouse.asm
View File

@ -85,8 +85,8 @@ ElmsHouse_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 2, 7, 4, NEW_BARK_TOWN
warp_event 3, 7, 4, NEW_BARK_TOWN
warp_event 2, 7, NEW_BARK_TOWN, 4
warp_event 3, 7, NEW_BARK_TOWN, 4
db 0 ; coord events

4
maps/ElmsLab.asm
View File

@ -1372,8 +1372,8 @@ ElmsLab_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 4, 11, 1, NEW_BARK_TOWN
warp_event 5, 11, 1, NEW_BARK_TOWN
warp_event 4, 11, NEW_BARK_TOWN, 1
warp_event 5, 11, NEW_BARK_TOWN, 1
db 8 ; coord events
coord_event 4, 6, SCENE_ELMSLAB_CANT_LEAVE, LabTryToLeaveScript

24
maps/FastShip1F.asm
View File

@ -287,18 +287,18 @@ FastShip1F_MapEvents:
db 0, 0 ; filler
db 12 ; warp events
warp_event 25, 1, -1, FAST_SHIP_1F
warp_event 27, 8, 1, FAST_SHIP_CABINS_NNW_NNE_NE
warp_event 23, 8, 2, FAST_SHIP_CABINS_NNW_NNE_NE
warp_event 19, 8, 3, FAST_SHIP_CABINS_NNW_NNE_NE
warp_event 15, 8, 1, FAST_SHIP_CABINS_SW_SSW_NW
warp_event 15, 15, 2, FAST_SHIP_CABINS_SW_SSW_NW
warp_event 19, 15, 4, FAST_SHIP_CABINS_SW_SSW_NW
warp_event 23, 15, 1, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
warp_event 27, 15, 3, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
warp_event 3, 13, 5, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
warp_event 6, 12, 1, FAST_SHIP_B1F
warp_event 30, 14, 2, FAST_SHIP_B1F
warp_event 25, 1, FAST_SHIP_1F, -1
warp_event 27, 8, FAST_SHIP_CABINS_NNW_NNE_NE, 1
warp_event 23, 8, FAST_SHIP_CABINS_NNW_NNE_NE, 2
warp_event 19, 8, FAST_SHIP_CABINS_NNW_NNE_NE, 3
warp_event 15, 8, FAST_SHIP_CABINS_SW_SSW_NW, 1
warp_event 15, 15, FAST_SHIP_CABINS_SW_SSW_NW, 2
warp_event 19, 15, FAST_SHIP_CABINS_SW_SSW_NW, 4
warp_event 23, 15, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 1
warp_event 27, 15, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 3
warp_event 3, 13, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 5
warp_event 6, 12, FAST_SHIP_B1F, 1
warp_event 30, 14, FAST_SHIP_B1F, 2
db 2 ; coord events
coord_event 24, 6, SCENE_FASTSHIP1F_MEET_GRANDPA, WorriedGrandpaSceneLeft

4
maps/FastShipB1F.asm
View File

@ -450,8 +450,8 @@ FastShipB1F_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 5, 11, 11, FAST_SHIP_1F
warp_event 31, 13, 12, FAST_SHIP_1F
warp_event 5, 11, FAST_SHIP_1F, 11
warp_event 31, 13, FAST_SHIP_1F, 12
db 2 ; coord events
coord_event 30, 7, SCENE_DEFAULT, UnknownScript_0x7673c

6
maps/FastShipCabins_NNW_NNE_NE.asm
View File

@ -268,9 +268,9 @@ FastShipCabins_NNW_NNE_NE_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
warp_event 2, 0, 2, FAST_SHIP_1F
warp_event 2, 12, 3, FAST_SHIP_1F
warp_event 2, 24, 4, FAST_SHIP_1F
warp_event 2, 0, FAST_SHIP_1F, 2
warp_event 2, 12, FAST_SHIP_1F, 3
warp_event 2, 24, FAST_SHIP_1F, 4
db 0 ; coord events

12
maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
View File

@ -464,12 +464,12 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEvents:
db 0, 0 ; filler
db 6 ; warp events
warp_event 2, 7, 8, FAST_SHIP_1F
warp_event 3, 7, 8, FAST_SHIP_1F
warp_event 2, 19, 9, FAST_SHIP_1F
warp_event 3, 19, 9, FAST_SHIP_1F
warp_event 2, 33, 10, FAST_SHIP_1F
warp_event 3, 33, 10, FAST_SHIP_1F
warp_event 2, 7, FAST_SHIP_1F, 8
warp_event 3, 7, FAST_SHIP_1F, 8
warp_event 2, 19, FAST_SHIP_1F, 9
warp_event 3, 19, FAST_SHIP_1F, 9
warp_event 2, 33, FAST_SHIP_1F, 10
warp_event 3, 33, FAST_SHIP_1F, 10
db 0 ; coord events

10
maps/FastShipCabins_SW_SSW_NW.asm
View File

@ -224,11 +224,11 @@ FastShipCabins_SW_SSW_NW_MapEvents:
db 0, 0 ; filler
db 5 ; warp events
warp_event 2, 0, 5, FAST_SHIP_1F
warp_event 2, 19, 6, FAST_SHIP_1F
warp_event 3, 19, 6, FAST_SHIP_1F
warp_event 2, 31, 7, FAST_SHIP_1F
warp_event 3, 31, 7, FAST_SHIP_1F
warp_event 2, 0, FAST_SHIP_1F, 5
warp_event 2, 19, FAST_SHIP_1F, 6
warp_event 3, 19, FAST_SHIP_1F, 6
warp_event 2, 31, FAST_SHIP_1F, 7
warp_event 3, 31, FAST_SHIP_1F, 7
db 0 ; coord events

4
maps/FightingDojo.asm
View File

@ -44,8 +44,8 @@ FightingDojo_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 4, 11, 1, SAFFRON_CITY
warp_event 5, 11, 1, SAFFRON_CITY
warp_event 4, 11, SAFFRON_CITY, 1
warp_event 5, 11, SAFFRON_CITY, 1
db 0 ; coord events

22
maps/FuchsiaCity.asm
View File

@ -126,17 +126,17 @@ FuchsiaCity_MapEvents:
db 0, 0 ; filler
db 11 ; warp events
warp_event 5, 13, 2, FUCHSIA_MART
warp_event 22, 13, 1, SAFARI_ZONE_MAIN_OFFICE
warp_event 8, 27, 1, FUCHSIA_GYM
warp_event 11, 27, 1, BILLS_BROTHERS_HOUSE
warp_event 19, 27, 1, FUCHSIA_POKECENTER_1F
warp_event 27, 27, 1, SAFARI_ZONE_WARDENS_HOME
warp_event 18, 3, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA
warp_event 37, 22, 1, ROUTE_15_FUCHSIA_GATE
warp_event 37, 23, 2, ROUTE_15_FUCHSIA_GATE
warp_event 7, 35, 1, ROUTE_19_FUCHSIA_GATE
warp_event 8, 35, 2, ROUTE_19_FUCHSIA_GATE
warp_event 5, 13, FUCHSIA_MART, 2
warp_event 22, 13, SAFARI_ZONE_MAIN_OFFICE, 1
warp_event 8, 27, FUCHSIA_GYM, 1
warp_event 11, 27, BILLS_BROTHERS_HOUSE, 1
warp_event 19, 27, FUCHSIA_POKECENTER_1F, 1
warp_event 27, 27, SAFARI_ZONE_WARDENS_HOME, 1
warp_event 18, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3
warp_event 37, 22, ROUTE_15_FUCHSIA_GATE, 1
warp_event 37, 23, ROUTE_15_FUCHSIA_GATE, 2
warp_event 7, 35, ROUTE_19_FUCHSIA_GATE, 1
warp_event 8, 35, ROUTE_19_FUCHSIA_GATE, 2
db 0 ; coord events

4
maps/FuchsiaGym.asm
View File

@ -382,8 +382,8 @@ FuchsiaGym_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 4, 17, 3, FUCHSIA_CITY
warp_event 5, 17, 3, FUCHSIA_CITY
warp_event 4, 17, FUCHSIA_CITY, 3
warp_event 5, 17, FUCHSIA_CITY, 3
db 0 ; coord events

4
maps/FuchsiaMart.asm
View File

@ -39,8 +39,8 @@ FuchsiaMart_MapEvents:
db 0, 0 ; filler
db 2 ; warp events
warp_event 2, 7, 1, FUCHSIA_CITY
warp_event 3, 7, 1, FUCHSIA_CITY
warp_event 2, 7, FUCHSIA_CITY, 1
warp_event 3, 7, FUCHSIA_CITY, 1
db 0 ; coord events

6
maps/FuchsiaPokecenter1F.asm
View File

@ -90,9 +90,9 @@ FuchsiaPokecenter1F_MapEvents:
db 0, 0 ; filler
db 3 ; warp events
warp_event 3, 7, 5, FUCHSIA_CITY
warp_event 4, 7, 5, FUCHSIA_CITY
warp_event 0, 7, 1, POKECENTER_2F
warp_event 3, 7, FUCHSIA_CITY, 5
warp_event 4, 7, FUCHSIA_CITY, 5
warp_event 0, 7, POKECENTER_2F, 1
db 0 ; coord events

2
maps/FuchsiaPokecenter2FBeta.asm
View File

@ -7,7 +7,7 @@ FuchsiaPokecenter2FBeta_MapEvents:
db 0, 0 ; filler
db 1 ; warp events
warp_event 0, 7, 3, FUCHSIA_POKECENTER_1F
warp_event 0, 7, FUCHSIA_POKECENTER_1F, 3
db 0 ; coord events

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