pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

grep -rl warp_def . | xargs sed -i s/warp_def/warp_event/g

Browse Source
This commit is contained in:
Rangi 2018-01-28 13:20:04 -05:00
parent 84c798e9f4
commit 477adc72af
383 changed files with 1314 additions and 1314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/map_scripts.md
View File

@ -78,7 +78,7 @@ Callback types:
### <code>.Warps: db <i>N</i></code>
<pre>
warp_def <i>x</i>, <i>y</i>, <i>warp_id</i>, <i>map</i>
warp_event <i>x</i>, <i>y</i>, <i>warp_id</i>, <i>map</i>
</pre>

2
macros/scripts/maps.asm
View File

@ -15,7 +15,7 @@ callback: MACRO
dbw \1, \2
ENDM
warp_def: MACRO
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
maps/AzaleaGym.asm
View File

@ -367,8 +367,8 @@ AzaleaGym_MapEvents:
.Warps:
db 2
warp_def 4, 15, 5, AZALEA_TOWN
warp_def 5, 15, 5, AZALEA_TOWN
warp_event 4, 15, 5, AZALEA_TOWN
warp_event 5, 15, 5, AZALEA_TOWN
.CoordEvents:
db 0

4
maps/AzaleaMart.asm
View File

@ -51,8 +51,8 @@ AzaleaMart_MapEvents:
.Warps:
db 2
warp_def 2, 7, 3, AZALEA_TOWN
warp_def 3, 7, 3, AZALEA_TOWN
warp_event 2, 7, 3, AZALEA_TOWN
warp_event 3, 7, 3, AZALEA_TOWN
.CoordEvents:
db 0

6
maps/AzaleaPokecenter1F.asm
View File

@ -82,9 +82,9 @@ AzaleaPokecenter1F_MapEvents:
.Warps:
db 3
warp_def 3, 7, 1, AZALEA_TOWN
warp_def 4, 7, 1, AZALEA_TOWN
warp_def 0, 7, 1, POKECENTER_2F
warp_event 3, 7, 1, AZALEA_TOWN
warp_event 4, 7, 1, AZALEA_TOWN
warp_event 0, 7, 1, POKECENTER_2F
.CoordEvents:
db 0

16
maps/AzaleaTown.asm
View File

@ -461,14 +461,14 @@ AzaleaTown_MapEvents:
.Warps:
db 8
warp_def 15, 9, 1, AZALEA_POKECENTER_1F
warp_def 21, 13, 1, CHARCOAL_KILN
warp_def 21, 5, 2, AZALEA_MART
warp_def 9, 5, 1, KURTS_HOUSE
warp_def 10, 15, 1, AZALEA_GYM
warp_def 31, 7, 1, SLOWPOKE_WELL_B1F
warp_def 2, 10, 3, ILEX_FOREST_AZALEA_GATE
warp_def 2, 11, 4, ILEX_FOREST_AZALEA_GATE
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
.CoordEvents:
db 3

6
maps/BattleTower1F.asm
View File

@ -799,9 +799,9 @@ BattleTower1F_MapEvents:
.Warps:
db 3
warp_def 7, 9, 3, BATTLE_TOWER_OUTSIDE
warp_def 8, 9, 4, BATTLE_TOWER_OUTSIDE
warp_def 7, 0, 1, BATTLE_TOWER_ELEVATOR
warp_event 7, 9, 3, BATTLE_TOWER_OUTSIDE
warp_event 8, 9, 4, BATTLE_TOWER_OUTSIDE
warp_event 7, 0, 1, BATTLE_TOWER_ELEVATOR
.CoordEvents:
db 0

4
maps/BattleTowerBattleRoom.asm
View File

@ -144,8 +144,8 @@ BattleTowerBattleRoom_MapEvents:
.Warps:
db 2
warp_def 3, 7, 4, BATTLE_TOWER_HALLWAY
warp_def 4, 7, 4, BATTLE_TOWER_HALLWAY
warp_event 3, 7, 4, BATTLE_TOWER_HALLWAY
warp_event 4, 7, 4, BATTLE_TOWER_HALLWAY
.CoordEvents:
db 0

4
maps/BattleTowerElevator.asm
View File

@ -50,8 +50,8 @@ BattleTowerElevator_MapEvents:
.Warps:
db 2
warp_def 1, 3, 1, BATTLE_TOWER_HALLWAY
warp_def 2, 3, 1, BATTLE_TOWER_HALLWAY
warp_event 1, 3, 1, BATTLE_TOWER_HALLWAY
warp_event 2, 3, 1, BATTLE_TOWER_HALLWAY
.CoordEvents:
db 0

12
maps/BattleTowerHallway.asm
View File

@ -82,12 +82,12 @@ BattleTowerHallway_MapEvents:
.Warps:
db 6
warp_def 11, 1, 1, BATTLE_TOWER_ELEVATOR
warp_def 5, 0, 1, BATTLE_TOWER_BATTLE_ROOM
warp_def 7, 0, 1, BATTLE_TOWER_BATTLE_ROOM
warp_def 9, 0, 1, BATTLE_TOWER_BATTLE_ROOM
warp_def 13, 0, 1, BATTLE_TOWER_BATTLE_ROOM
warp_def 15, 0, 1, BATTLE_TOWER_BATTLE_ROOM
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
.CoordEvents:
db 0

8
maps/BattleTowerOutside.asm
View File

@ -132,10 +132,10 @@ BattleTowerOutside_MapEvents:
.Warps:
db 4
warp_def 8, 21, 3, ROUTE_40_BATTLE_TOWER_GATE
warp_def 9, 21, 4, ROUTE_40_BATTLE_TOWER_GATE
warp_def 8, 9, 1, BATTLE_TOWER_1F
warp_def 9, 9, 2, BATTLE_TOWER_1F
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
.CoordEvents:
db 0

4
maps/BillsBrothersHouse.asm
View File

@ -33,8 +33,8 @@ BillsBrothersHouse_MapEvents:
.Warps:
db 2
warp_def 2, 7, 4, FUCHSIA_CITY
warp_def 3, 7, 4, FUCHSIA_CITY
warp_event 2, 7, 4, FUCHSIA_CITY
warp_event 3, 7, 4, FUCHSIA_CITY
.CoordEvents:
db 0

4
maps/BillsFamilysHouse.asm
View File

@ -248,8 +248,8 @@ BillsFamilysHouse_MapEvents:
.Warps:
db 2
warp_def 2, 7, 4, GOLDENROD_CITY
warp_def 3, 7, 4, GOLDENROD_CITY
warp_event 2, 7, 4, GOLDENROD_CITY
warp_event 3, 7, 4, GOLDENROD_CITY
.CoordEvents:
db 0

4
maps/BillsHouse.asm
View File

@ -359,8 +359,8 @@ BillsHouse_MapEvents:
.Warps:
db 2
warp_def 2, 7, 1, ROUTE_25
warp_def 3, 7, 1, ROUTE_25
warp_event 2, 7, 1, ROUTE_25
warp_event 3, 7, 1, ROUTE_25
.CoordEvents:
db 0

16
maps/BlackthornCity.asm
View File

@ -318,14 +318,14 @@ BlackthornCity_MapEvents:
.Warps:
db 8
warp_def 18, 11, 1, BLACKTHORN_GYM_1F
warp_def 13, 21, 1, BLACKTHORN_DRAGON_SPEECH_HOUSE
warp_def 29, 23, 1, BLACKTHORN_EMYS_HOUSE
warp_def 15, 29, 2, BLACKTHORN_MART
warp_def 21, 29, 1, BLACKTHORN_POKECENTER_1F
warp_def 9, 31, 1, MOVE_DELETERS_HOUSE
warp_def 36, 9, 2, ICE_PATH_1F
warp_def 20, 1, 1, DRAGONS_DEN_1F
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
.CoordEvents:
db 0

4
maps/BlackthornDragonSpeechHouse.asm
View File

@ -53,8 +53,8 @@ BlackthornDragonSpeechHouse_MapEvents:
.Warps:
db 2
warp_def 2, 7, 2, BLACKTHORN_CITY
warp_def 3, 7, 2, BLACKTHORN_CITY
warp_event 2, 7, 2, BLACKTHORN_CITY
warp_event 3, 7, 2, BLACKTHORN_CITY
.CoordEvents:
db 0

4
maps/BlackthornEmysHouse.asm
View File

@ -25,8 +25,8 @@ BlackthornEmysHouse_MapEvents:
.Warps:
db 2
warp_def 2, 7, 3, BLACKTHORN_CITY
warp_def 3, 7, 3, BLACKTHORN_CITY
warp_event 2, 7, 3, BLACKTHORN_CITY
warp_event 3, 7, 3, BLACKTHORN_CITY
.CoordEvents:
db 0

14
maps/BlackthornGym1F.asm
View File

@ -392,13 +392,13 @@ BlackthornGym1F_MapEvents:
.Warps:
db 7
warp_def 4, 17, 1, BLACKTHORN_CITY
warp_def 5, 17, 1, BLACKTHORN_CITY
warp_def 1, 7, 1, BLACKTHORN_GYM_2F
warp_def 7, 9, 2, BLACKTHORN_GYM_2F
warp_def 2, 6, 3, BLACKTHORN_GYM_2F
warp_def 7, 7, 4, BLACKTHORN_GYM_2F
warp_def 7, 6, 5, BLACKTHORN_GYM_2F
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
.CoordEvents:
db 0

10
maps/BlackthornGym2F.asm
View File

@ -131,11 +131,11 @@ BlackthornGym2F_MapEvents:
.Warps:
db 5
warp_def 1, 7, 3, BLACKTHORN_GYM_1F
warp_def 7, 9, 4, BLACKTHORN_GYM_1F
warp_def 2, 5, 5, BLACKTHORN_GYM_1F ; hole
warp_def 8, 7, 6, BLACKTHORN_GYM_1F ; hole
warp_def 8, 3, 7, BLACKTHORN_GYM_1F ; hole
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
.CoordEvents:
db 0

4
maps/BlackthornMart.asm
View File

@ -52,8 +52,8 @@ BlackthornMart_MapEvents:
.Warps:
db 2
warp_def 2, 7, 4, BLACKTHORN_CITY
warp_def 3, 7, 4, BLACKTHORN_CITY
warp_event 2, 7, 4, BLACKTHORN_CITY
warp_event 3, 7, 4, BLACKTHORN_CITY
.CoordEvents:
db 0

6
maps/BlackthornPokecenter1F.asm
View File

@ -55,9 +55,9 @@ BlackthornPokecenter1F_MapEvents:
.Warps:
db 3
warp_def 3, 7, 5, BLACKTHORN_CITY
warp_def 4, 7, 5, BLACKTHORN_CITY
warp_def 0, 7, 1, POKECENTER_2F
warp_event 3, 7, 5, BLACKTHORN_CITY
warp_event 4, 7, 5, BLACKTHORN_CITY
warp_event 0, 7, 1, POKECENTER_2F
.CoordEvents:
db 0

4
maps/BluesHouse.asm
View File

@ -150,8 +150,8 @@ BluesHouse_MapEvents:
.Warps:
db 2
warp_def 2, 7, 2, PALLET_TOWN
warp_def 3, 7, 2, PALLET_TOWN
warp_event 2, 7, 2, PALLET_TOWN
warp_event 3, 7, 2, PALLET_TOWN
.CoordEvents:
db 0

8
maps/BrunosRoom.asm
View File

@ -130,10 +130,10 @@ BrunosRoom_MapEvents:
.Warps:
db 4
warp_def 4, 17, 3, KOGAS_ROOM
warp_def 5, 17, 4, KOGAS_ROOM
warp_def 4, 2, 1, KARENS_ROOM
warp_def 5, 2, 2, KARENS_ROOM
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
.CoordEvents:
db 0

28
maps/BurnedTower1F.asm
View File

@ -283,20 +283,20 @@ BurnedTower1F_MapEvents:
.Warps:
db 14
warp_def 9, 15, 13, ECRUTEAK_CITY
warp_def 10, 15, 13, ECRUTEAK_CITY
warp_def 10, 9, 1, BURNED_TOWER_B1F
warp_def 5, 5, 1, BURNED_TOWER_B1F
warp_def 5, 6, 1, BURNED_TOWER_B1F
warp_def 4, 6, 1, BURNED_TOWER_B1F
warp_def 15, 4, 2, BURNED_TOWER_B1F
warp_def 15, 5, 2, BURNED_TOWER_B1F
warp_def 10, 7, 3, BURNED_TOWER_B1F
warp_def 5, 14, 4, BURNED_TOWER_B1F
warp_def 4, 14, 4, BURNED_TOWER_B1F
warp_def 14, 14, 5, BURNED_TOWER_B1F
warp_def 15, 14, 5, BURNED_TOWER_B1F
warp_def 7, 15, 6, BURNED_TOWER_B1F
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
.CoordEvents:
db 1

12
maps/BurnedTowerB1F.asm
View File

@ -241,12 +241,12 @@ BurnedTowerB1F_MapEvents:
.Warps:
db 6
warp_def 10, 9, 3, BURNED_TOWER_1F
warp_def 17, 7, 7, BURNED_TOWER_1F
warp_def 10, 8, 9, BURNED_TOWER_1F
warp_def 3, 13, 10, BURNED_TOWER_1F
warp_def 17, 14, 12, BURNED_TOWER_1F
warp_def 7, 15, 14, BURNED_TOWER_1F
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
.CoordEvents:
db 1

4
maps/CeladonCafe.asm
View File

@ -213,8 +213,8 @@ CeladonCafe_MapEvents:
.Warps:
db 2
warp_def 6, 7, 9, CELADON_CITY
warp_def 7, 7, 9, CELADON_CITY
warp_event 6, 7, 9, CELADON_CITY
warp_event 7, 7, 9, CELADON_CITY
.CoordEvents:
db 0

18
maps/CeladonCity.asm
View File

@ -240,15 +240,15 @@ CeladonCity_MapEvents:
.Warps:
db 9
warp_def 4, 9, 1, CELADON_DEPT_STORE_1F
warp_def 16, 9, 1, CELADON_MANSION_1F
warp_def 16, 3, 3, CELADON_MANSION_1F
warp_def 17, 3, 3, CELADON_MANSION_1F
warp_def 29, 9, 1, CELADON_POKECENTER_1F
warp_def 18, 19, 1, CELADON_GAME_CORNER
warp_def 23, 19, 1, CELADON_GAME_CORNER_PRIZE_ROOM
warp_def 10, 29, 1, CELADON_GYM
warp_def 25, 29, 1, CELADON_CAFE
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
.CoordEvents:
db 0

8
maps/CeladonDeptStore1F.asm
View File

@ -79,10 +79,10 @@ CeladonDeptStore1F_MapEvents:
.Warps:
db 4
warp_def 7, 7, 1, CELADON_CITY
warp_def 8, 7, 1, CELADON_CITY
warp_def 15, 0, 2, CELADON_DEPT_STORE_2F
warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
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
.CoordEvents:
db 0

6
maps/CeladonDeptStore2F.asm
View File

@ -74,9 +74,9 @@ CeladonDeptStore2F_MapEvents:
.Warps:
db 3
warp_def 12, 0, 1, CELADON_DEPT_STORE_3F
warp_def 15, 0, 3, CELADON_DEPT_STORE_1F
warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
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
.CoordEvents:
db 0

6
maps/CeladonDeptStore3F.asm
View File

@ -100,9 +100,9 @@ CeladonDeptStore3F_MapEvents:
.Warps:
db 3
warp_def 12, 0, 1, CELADON_DEPT_STORE_2F
warp_def 15, 0, 2, CELADON_DEPT_STORE_4F
warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
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
.CoordEvents:
db 0

6
maps/CeladonDeptStore4F.asm
View File

@ -56,9 +56,9 @@ CeladonDeptStore4F_MapEvents:
.Warps:
db 3
warp_def 12, 0, 1, CELADON_DEPT_STORE_5F
warp_def 15, 0, 2, CELADON_DEPT_STORE_3F
warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
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
.CoordEvents:
db 0

6
maps/CeladonDeptStore5F.asm
View File

@ -77,9 +77,9 @@ CeladonDeptStore5F_MapEvents:
.Warps:
db 3
warp_def 12, 0, 1, CELADON_DEPT_STORE_4F
warp_def 15, 0, 1, CELADON_DEPT_STORE_6F
warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
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
.CoordEvents:
db 0

4
maps/CeladonDeptStore6F.asm
View File

@ -151,8 +151,8 @@ CeladonDeptStore6F_MapEvents:
.Warps:
db 2
warp_def 15, 0, 2, CELADON_DEPT_STORE_5F
warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
warp_event 15, 0, 2, CELADON_DEPT_STORE_5F
warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
.CoordEvents:
db 0

4
maps/CeladonDeptStoreElevator.asm
View File

@ -33,8 +33,8 @@ CeladonDeptStoreElevator_MapEvents:
.Warps:
db 2
warp_def 1, 3, -1, CELADON_DEPT_STORE_1F
warp_def 2, 3, -1, CELADON_DEPT_STORE_1F
warp_event 1, 3, -1, CELADON_DEPT_STORE_1F
warp_event 2, 3, -1, CELADON_DEPT_STORE_1F
.CoordEvents:
db 0

4
maps/CeladonGameCorner.asm
View File

@ -287,8 +287,8 @@ CeladonGameCorner_MapEvents:
.Warps:
db 2
warp_def 14, 13, 6, CELADON_CITY
warp_def 15, 13, 6, CELADON_CITY
warp_event 14, 13, 6, CELADON_CITY
warp_event 15, 13, 6, CELADON_CITY
.CoordEvents:
db 0

4
maps/CeladonGameCornerPrizeRoom.asm
View File

@ -269,8 +269,8 @@ CeladonGameCornerPrizeRoom_MapEvents:
.Warps:
db 2
warp_def 2, 5, 7, CELADON_CITY
warp_def 3, 5, 7, CELADON_CITY
warp_event 2, 5, 7, CELADON_CITY
warp_event 3, 5, 7, CELADON_CITY
.CoordEvents:
db 0

4
maps/CeladonGym.asm
View File

@ -273,8 +273,8 @@ CeladonGym_MapEvents:
.Warps:
db 2
warp_def 4, 17, 8, CELADON_CITY
warp_def 5, 17, 8, CELADON_CITY
warp_event 4, 17, 8, CELADON_CITY
warp_event 5, 17, 8, CELADON_CITY
.CoordEvents:
db 0

10
maps/CeladonMansion1F.asm
View File

@ -80,11 +80,11 @@ CeladonMansion1F_MapEvents:
.Warps:
db 5
warp_def 6, 9, 2, CELADON_CITY
warp_def 7, 9, 2, CELADON_CITY
warp_def 3, 0, 3, CELADON_CITY
warp_def 0, 0, 1, CELADON_MANSION_2F
warp_def 7, 0, 4, CELADON_MANSION_2F
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
.CoordEvents:
db 0

8
maps/CeladonMansion2F.asm
View File

@ -55,10 +55,10 @@ CeladonMansion2F_MapEvents:
.Warps:
db 4
warp_def 0, 0, 4, CELADON_MANSION_1F
warp_def 1, 0, 2, CELADON_MANSION_3F
warp_def 6, 0, 3, CELADON_MANSION_3F
warp_def 7, 0, 5, CELADON_MANSION_1F
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
.CoordEvents:
db 0

8
maps/CeladonMansion3F.asm
View File

@ -195,10 +195,10 @@ CeladonMansion3F_MapEvents:
.Warps:
db 4
warp_def 0, 0, 1, CELADON_MANSION_ROOF
warp_def 1, 0, 2, CELADON_MANSION_2F
warp_def 6, 0, 3, CELADON_MANSION_2F
warp_def 7, 0, 2, CELADON_MANSION_ROOF
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
.CoordEvents:
db 0

6
maps/CeladonMansionRoof.asm
View File

@ -39,9 +39,9 @@ CeladonMansionRoof_MapEvents:
.Warps:
db 3
warp_def 1, 1, 1, CELADON_MANSION_3F
warp_def 6, 1, 4, CELADON_MANSION_3F
warp_def 2, 5, 1, CELADON_MANSION_ROOF_HOUSE
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
.CoordEvents:
db 0

4
maps/CeladonMansionRoofHouse.asm
View File

@ -122,8 +122,8 @@ CeladonMansionRoofHouse_MapEvents:
.Warps:
db 2
warp_def 2, 7, 3, CELADON_MANSION_ROOF
warp_def 3, 7, 3, CELADON_MANSION_ROOF
warp_event 2, 7, 3, CELADON_MANSION_ROOF
warp_event 3, 7, 3, CELADON_MANSION_ROOF
.CoordEvents:
db 0

6
maps/CeladonPokecenter1F.asm
View File

@ -151,9 +151,9 @@ CeladonPokecenter1F_MapEvents:
.Warps:
db 3
warp_def 3, 7, 5, CELADON_CITY
warp_def 4, 7, 5, CELADON_CITY
warp_def 0, 7, 1, POKECENTER_2F
warp_event 3, 7, 5, CELADON_CITY
warp_event 4, 7, 5, CELADON_CITY
warp_event 0, 7, 1, POKECENTER_2F
.CoordEvents:
db 0

2
maps/CeladonPokecenter2FBeta.asm
View File

@ -11,7 +11,7 @@ CeladonPokecenter2FBeta_MapEvents:
.Warps:
db 1
warp_def 0, 7, 3, CELADON_POKECENTER_1F
warp_event 0, 7, 3, CELADON_POKECENTER_1F
.CoordEvents:
db 0

12
maps/CeruleanCity.asm
View File

@ -281,12 +281,12 @@ CeruleanCity_MapEvents:
.Warps:
db 6
warp_def 7, 15, 1, CERULEAN_GYM_BADGE_SPEECH_HOUSE
warp_def 28, 17, 1, CERULEAN_POLICE_STATION
warp_def 13, 19, 1, CERULEAN_TRADE_SPEECH_HOUSE
warp_def 19, 21, 1, CERULEAN_POKECENTER_1F
warp_def 30, 23, 1, CERULEAN_GYM
warp_def 25, 29, 2, CERULEAN_MART
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
.CoordEvents:
db 0

4
maps/CeruleanGym.asm
View File

@ -368,8 +368,8 @@ CeruleanGym_MapEvents:
.Warps:
db 2
warp_def 4, 15, 5, CERULEAN_CITY
warp_def 5, 15, 5, CERULEAN_CITY
warp_event 4, 15, 5, CERULEAN_CITY
warp_event 5, 15, 5, CERULEAN_CITY
.CoordEvents:
db 0

4
maps/CeruleanGymBadgeSpeechHouse.asm
View File

@ -22,8 +22,8 @@ CeruleanGymBadgeSpeechHouse_MapEvents:
.Warps:
db 2
warp_def 2, 7, 1, CERULEAN_CITY
warp_def 3, 7, 1, CERULEAN_CITY
warp_event 2, 7, 1, CERULEAN_CITY
warp_event 3, 7, 1, CERULEAN_CITY
.CoordEvents:
db 0

4
maps/CeruleanMart.asm
View File

@ -51,8 +51,8 @@ CeruleanMart_MapEvents:
.Warps:
db 2
warp_def 2, 7, 6, CERULEAN_CITY
warp_def 3, 7, 6, CERULEAN_CITY
warp_event 2, 7, 6, CERULEAN_CITY
warp_event 3, 7, 6, CERULEAN_CITY
.CoordEvents:
db 0

6
maps/CeruleanPokecenter1F.asm
View File

@ -68,9 +68,9 @@ CeruleanPokecenter1F_MapEvents:
.Warps:
db 3
warp_def 3, 7, 4, CERULEAN_CITY
warp_def 4, 7, 4, CERULEAN_CITY
warp_def 0, 7, 1, POKECENTER_2F
warp_event 3, 7, 4, CERULEAN_CITY
warp_event 4, 7, 4, CERULEAN_CITY
warp_event 0, 7, 1, POKECENTER_2F
.CoordEvents:
db 0

2
maps/CeruleanPokecenter2FBeta.asm
View File

@ -11,7 +11,7 @@ CeruleanPokecenter2FBeta_MapEvents:
.Warps:
db 1
warp_def 0, 7, 1, CERULEAN_POKECENTER_1F
warp_event 0, 7, 1, CERULEAN_POKECENTER_1F
.CoordEvents:
db 0

4
maps/CeruleanPoliceStation.asm
View File

@ -49,8 +49,8 @@ CeruleanPoliceStation_MapEvents:
.Warps:
db 2
warp_def 2, 7, 2, CERULEAN_CITY
warp_def 3, 7, 2, CERULEAN_CITY
warp_event 2, 7, 2, CERULEAN_CITY
warp_event 3, 7, 2, CERULEAN_CITY
.CoordEvents:
db 0

4
maps/CeruleanTradeSpeechHouse.asm
View File

@ -59,8 +59,8 @@ CeruleanTradeSpeechHouse_MapEvents:
.Warps:
db 2
warp_def 2, 7, 3, CERULEAN_CITY
warp_def 3, 7, 3, CERULEAN_CITY
warp_event 2, 7, 3, CERULEAN_CITY
warp_event 3, 7, 3, CERULEAN_CITY
.CoordEvents:
db 0

4
maps/CharcoalKiln.asm
View File

@ -154,8 +154,8 @@ CharcoalKiln_MapEvents:
.Warps:
db 2
warp_def 2, 7, 2, AZALEA_TOWN
warp_def 3, 7, 2, AZALEA_TOWN
warp_event 2, 7, 2, AZALEA_TOWN
warp_event 3, 7, 2, AZALEA_TOWN
.CoordEvents:
db 0

10
maps/CherrygroveCity.asm
View File

@ -552,11 +552,11 @@ CherrygroveCity_MapEvents:
.Warps:
db 5
warp_def 23, 3, 2, CHERRYGROVE_MART
warp_def 29, 3, 1, CHERRYGROVE_POKECENTER_1F
warp_def 17, 7, 1, CHERRYGROVE_GYM_SPEECH_HOUSE
warp_def 25, 9, 1, GUIDE_GENTS_HOUSE
warp_def 31, 11, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE
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
.CoordEvents:
db 2

4
maps/CherrygroveEvolutionSpeechHouse.asm
View File

@ -47,8 +47,8 @@ CherrygroveEvolutionSpeechHouse_MapEvents:
.Warps:
db 2
warp_def 2, 7, 5, CHERRYGROVE_CITY
warp_def 3, 7, 5, CHERRYGROVE_CITY
warp_event 2, 7, 5, CHERRYGROVE_CITY
warp_event 3, 7, 5, CHERRYGROVE_CITY
.CoordEvents:
db 0

4
maps/CherrygroveGymSpeechHouse.asm
View File

@ -50,8 +50,8 @@ CherrygroveGymSpeechHouse_MapEvents:
.Warps:
db 2
warp_def 2, 7, 3, CHERRYGROVE_CITY
warp_def 3, 7, 3, CHERRYGROVE_CITY
warp_event 2, 7, 3, CHERRYGROVE_CITY
warp_event 3, 7, 3, CHERRYGROVE_CITY
.CoordEvents:
db 0

4
maps/CherrygroveMart.asm
View File

@ -77,8 +77,8 @@ CherrygroveMart_MapEvents:
.Warps:
db 2
warp_def 2, 7, 1, CHERRYGROVE_CITY
warp_def 3, 7, 1, CHERRYGROVE_CITY
warp_event 2, 7, 1, CHERRYGROVE_CITY
warp_event 3, 7, 1, CHERRYGROVE_CITY
.CoordEvents:
db 0

6
maps/CherrygrovePokecenter1F.asm
View File

@ -74,9 +74,9 @@ CherrygrovePokecenter1F_MapEvents:
.Warps:
db 3
warp_def 3, 7, 2, CHERRYGROVE_CITY
warp_def 4, 7, 2, CHERRYGROVE_CITY
warp_def 0, 7, 1, POKECENTER_2F
warp_event 3, 7, 2, CHERRYGROVE_CITY
warp_event 4, 7, 2, CHERRYGROVE_CITY
warp_event 0, 7, 1, POKECENTER_2F
.CoordEvents:
db 0

14
maps/CianwoodCity.asm
View File

@ -386,13 +386,13 @@ CianwoodCity_MapEvents:
.Warps:
db 7
warp_def 17, 41, 1, MANIAS_HOUSE
warp_def 8, 43, 1, CIANWOOD_GYM
warp_def 23, 43, 1, CIANWOOD_POKECENTER_1F
warp_def 15, 47, 1, CIANWOOD_PHARMACY
warp_def 9, 31, 1, CIANWOOD_PHOTO_STUDIO
warp_def 15, 37, 1, CIANWOOD_LUGIA_SPEECH_HOUSE
warp_def 5, 17, 1, POKE_SEERS_HOUSE
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
.CoordEvents:
db 1

4
maps/CianwoodGym.asm
View File

@ -311,8 +311,8 @@ CianwoodGym_MapEvents:
.Warps:
db 2
warp_def 4, 17, 2, CIANWOOD_CITY
warp_def 5, 17, 2, CIANWOOD_CITY
warp_event 4, 17, 2, CIANWOOD_CITY
warp_event 5, 17, 2, CIANWOOD_CITY
.CoordEvents:
db 0

4
maps/CianwoodLugiaSpeechHouse.asm
View File

@ -67,8 +67,8 @@ CianwoodLugiaSpeechHouse_MapEvents:
.Warps:
db 2
warp_def 2, 7, 6, CIANWOOD_CITY
warp_def 3, 7, 6, CIANWOOD_CITY
warp_event 2, 7, 6, CIANWOOD_CITY
warp_event 3, 7, 6, CIANWOOD_CITY
.CoordEvents:
db 0

4
maps/CianwoodPharmacy.asm
View File

@ -78,8 +78,8 @@ CianwoodPharmacy_MapEvents:
.Warps:
db 2
warp_def 2, 7, 4, CIANWOOD_CITY
warp_def 3, 7, 4, CIANWOOD_CITY
warp_event 2, 7, 4, CIANWOOD_CITY
warp_event 3, 7, 4, CIANWOOD_CITY
.CoordEvents:
db 0

4
maps/CianwoodPhotoStudio.asm
View File

@ -54,8 +54,8 @@ CianwoodPhotoStudio_MapEvents:
.Warps:
db 2
warp_def 2, 7, 5, CIANWOOD_CITY
warp_def 3, 7, 5, CIANWOOD_CITY
warp_event 2, 7, 5, CIANWOOD_CITY
warp_event 3, 7, 5, CIANWOOD_CITY
.CoordEvents:
db 0

6
maps/CianwoodPokecenter1F.asm
View File

@ -137,9 +137,9 @@ CianwoodPokecenter1F_MapEvents:
.Warps:
db 3
warp_def 3, 7, 3, CIANWOOD_CITY
warp_def 4, 7, 3, CIANWOOD_CITY
warp_def 0, 7, 1, POKECENTER_2F
warp_event 3, 7, 3, CIANWOOD_CITY
warp_event 4, 7, 3, CIANWOOD_CITY
warp_event 0, 7, 1, POKECENTER_2F
.CoordEvents:
db 0

2
maps/CinnabarIsland.asm
View File

@ -133,7 +133,7 @@ CinnabarIsland_MapEvents:
.Warps:
db 1
warp_def 11, 11, 1, CINNABAR_POKECENTER_1F
warp_event 11, 11, 1, CINNABAR_POKECENTER_1F
.CoordEvents:
db 0

6
maps/CinnabarPokecenter1F.asm
View File

@ -40,9 +40,9 @@ CinnabarPokecenter1F_MapEvents:
.Warps:
db 3
warp_def 3, 7, 1, CINNABAR_ISLAND
warp_def 4, 7, 1, CINNABAR_ISLAND
warp_def 0, 7, 1, POKECENTER_2F
warp_event 3, 7, 1, CINNABAR_ISLAND
warp_event 4, 7, 1, CINNABAR_ISLAND
warp_event 0, 7, 1, POKECENTER_2F
.CoordEvents:
db 0

2
maps/CinnabarPokecenter2FBeta.asm
View File

@ -11,7 +11,7 @@ CinnabarPokecenter2FBeta_MapEvents:
.Warps:
db 1
warp_def 0, 7, 3, CINNABAR_POKECENTER_1F
warp_event 0, 7, 3, CINNABAR_POKECENTER_1F
.CoordEvents:
db 0

4
maps/Colosseum.asm
View File

@ -68,8 +68,8 @@ Colosseum_MapEvents:
.Warps:
db 2
warp_def 4, 7, 3, POKECENTER_2F
warp_def 5, 7, 3, POKECENTER_2F
warp_event 4, 7, 3, POKECENTER_2F
warp_event 5, 7, 3, POKECENTER_2F
.CoordEvents:
db 0

6
maps/CopycatsHouse1F.asm
View File

@ -78,9 +78,9 @@ CopycatsHouse1F_MapEvents:
.Warps:
db 3
warp_def 2, 7, 8, SAFFRON_CITY
warp_def 3, 7, 8, SAFFRON_CITY
warp_def 2, 0, 1, COPYCATS_HOUSE_2F
warp_event 2, 7, 8, SAFFRON_CITY
warp_event 3, 7, 8, SAFFRON_CITY
warp_event 2, 0, 1, COPYCATS_HOUSE_2F
.CoordEvents:
db 0

2
maps/CopycatsHouse2F.asm
View File

@ -366,7 +366,7 @@ CopycatsHouse2F_MapEvents:
.Warps:
db 1
warp_def 3, 0, 3, COPYCATS_HOUSE_1F
warp_event 3, 0, 3, COPYCATS_HOUSE_1F
.CoordEvents:
db 0

4
maps/DanceTheatre.asm
View File

@ -343,8 +343,8 @@ DanceTheatre_MapEvents:
.Warps:
db 2
warp_def 5, 13, 8, ECRUTEAK_CITY
warp_def 6, 13, 8, ECRUTEAK_CITY
warp_event 5, 13, 8, ECRUTEAK_CITY
warp_event 6, 13, 8, ECRUTEAK_CITY
.CoordEvents:
db 0

4
maps/DarkCaveBlackthornEntrance.asm
View File

@ -67,8 +67,8 @@ DarkCaveBlackthornEntrance_MapEvents:
.Warps:
db 2
warp_def 23, 3, 1, ROUTE_45
warp_def 3, 25, 2, DARK_CAVE_VIOLET_ENTRANCE
warp_event 23, 3, 1, ROUTE_45
warp_event 3, 25, 2, DARK_CAVE_VIOLET_ENTRANCE
.CoordEvents:
db 0

6
maps/DarkCaveVioletEntrance.asm
View File

@ -39,9 +39,9 @@ DarkCaveVioletEntrance_MapEvents:
.Warps:
db 3
warp_def 3, 15, 3, ROUTE_31
warp_def 17, 1, 2, DARK_CAVE_BLACKTHORN_ENTRANCE
warp_def 35, 33, 3, ROUTE_46
warp_event 3, 15, 3, ROUTE_31
warp_event 17, 1, 2, DARK_CAVE_BLACKTHORN_ENTRANCE
warp_event 35, 33, 3, ROUTE_46
.CoordEvents:
db 0

8
maps/DayCare.asm
View File

@ -161,10 +161,10 @@ DayCare_MapEvents:
.Warps:
db 4
warp_def 0, 5, 3, ROUTE_34
warp_def 0, 6, 4, ROUTE_34
warp_def 2, 7, 5, ROUTE_34
warp_def 3, 7, 5, ROUTE_34
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
.CoordEvents:
db 0

4
maps/DayOfWeekSiblingsHouse.asm
View File

@ -76,8 +76,8 @@ DayOfWeekSiblingsHouse_MapEvents:
.Warps:
db 2
warp_def 2, 7, 3, ROUTE_26
warp_def 3, 7, 3, ROUTE_26
warp_event 2, 7, 3, ROUTE_26
warp_event 3, 7, 3, ROUTE_26
.CoordEvents:
db 0

12
maps/DiglettsCave.asm
View File

@ -28,12 +28,12 @@ DiglettsCave_MapEvents:
.Warps:
db 6
warp_def 3, 33, 10, VERMILION_CITY
warp_def 5, 31, 5, DIGLETTS_CAVE
warp_def 15, 5, 5, ROUTE_2
warp_def 17, 3, 6, DIGLETTS_CAVE
warp_def 17, 33, 2, DIGLETTS_CAVE
warp_def 3, 3, 4, DIGLETTS_CAVE
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
.CoordEvents:
db 0

4
maps/DragonShrine.asm
View File

@ -663,8 +663,8 @@ DragonShrine_MapEvents:
.Warps:
db 2
warp_def 4, 9, 2, DRAGONS_DEN_B1F
warp_def 5, 9, 2, DRAGONS_DEN_B1F
warp_event 4, 9, 2, DRAGONS_DEN_B1F
warp_event 5, 9, 2, DRAGONS_DEN_B1F
.CoordEvents:
db 0

8
maps/DragonsDen1F.asm
View File

@ -11,10 +11,10 @@ DragonsDen1F_MapEvents:
.Warps:
db 4
warp_def 3, 5, 8, BLACKTHORN_CITY
warp_def 3, 3, 4, DRAGONS_DEN_1F
warp_def 5, 15, 1, DRAGONS_DEN_B1F
warp_def 5, 13, 2, DRAGONS_DEN_1F
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
.CoordEvents:
db 0

4
maps/DragonsDenB1F.asm
View File

@ -412,8 +412,8 @@ DragonsDenB1F_MapEvents:
.Warps:
db 2
warp_def 20, 3, 3, DRAGONS_DEN_1F
warp_def 19, 29, 1, DRAGON_SHRINE
warp_event 20, 3, 3, DRAGONS_DEN_1F
warp_event 19, 29, 1, DRAGON_SHRINE
.CoordEvents:
db 1

4
maps/EarlsPokemonAcademy.asm
View File

@ -417,8 +417,8 @@ EarlsPokemonAcademy_MapEvents:
.Warps:
db 2
warp_def 3, 15, 3, VIOLET_CITY
warp_def 4, 15, 3, VIOLET_CITY
warp_event 3, 15, 3, VIOLET_CITY
warp_event 4, 15, 3, VIOLET_CITY
.CoordEvents:
db 0

30
maps/EcruteakCity.asm
View File

@ -265,21 +265,21 @@ EcruteakCity_MapEvents:
.Warps:
db 15
warp_def 35, 26, 1, ROUTE_42_ECRUTEAK_GATE
warp_def 35, 27, 2, ROUTE_42_ECRUTEAK_GATE
warp_def 18, 11, 1, ECRUTEAK_TIN_TOWER_ENTRANCE
warp_def 20, 2, 1, WISE_TRIOS_ROOM
warp_def 20, 3, 2, WISE_TRIOS_ROOM
warp_def 23, 27, 1, ECRUTEAK_POKECENTER_1F
warp_def 5, 21, 1, ECRUTEAK_LUGIA_SPEECH_HOUSE
warp_def 23, 21, 1, DANCE_THEATRE
warp_def 29, 21, 2, ECRUTEAK_MART
warp_def 6, 27, 1, ECRUTEAK_GYM
warp_def 13, 27, 1, ECRUTEAK_ITEMFINDER_HOUSE
warp_def 37, 7, 1, TIN_TOWER_1F
warp_def 5, 5, 1, BURNED_TOWER_1F
warp_def 0, 18, 3, ROUTE_38_ECRUTEAK_GATE
warp_def 0, 19, 4, ROUTE_38_ECRUTEAK_GATE
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
.CoordEvents:
db 0

66
maps/EcruteakGym.asm
View File

@ -392,39 +392,39 @@ EcruteakGym_MapEvents:
.Warps:
db 33
warp_def 4, 17, 10, ECRUTEAK_CITY
warp_def 5, 17, 10, ECRUTEAK_CITY
warp_def 4, 14, 4, ECRUTEAK_GYM
warp_def 2, 4, 3, ECRUTEAK_GYM
warp_def 3, 4, 3, ECRUTEAK_GYM
warp_def 4, 4, 3, ECRUTEAK_GYM
warp_def 4, 5, 3, ECRUTEAK_GYM
warp_def 6, 7, 3, ECRUTEAK_GYM
warp_def 7, 4, 3, ECRUTEAK_GYM
warp_def 2, 6, 3, ECRUTEAK_GYM
warp_def 3, 6, 3, ECRUTEAK_GYM
warp_def 4, 6, 3, ECRUTEAK_GYM
warp_def 5, 6, 3, ECRUTEAK_GYM
warp_def 7, 6, 3, ECRUTEAK_GYM
warp_def 7, 7, 3, ECRUTEAK_GYM
warp_def 4, 8, 3, ECRUTEAK_GYM
warp_def 5, 8, 3, ECRUTEAK_GYM
warp_def 6, 8, 3, ECRUTEAK_GYM
warp_def 7, 8, 3, ECRUTEAK_GYM
warp_def 2, 8, 3, ECRUTEAK_GYM
warp_def 2, 9, 3, ECRUTEAK_GYM
warp_def 2, 10, 3, ECRUTEAK_GYM
warp_def 2, 11, 3, ECRUTEAK_GYM
warp_def 4, 10, 3, ECRUTEAK_GYM
warp_def 5, 10, 3, ECRUTEAK_GYM
warp_def 2, 12, 3, ECRUTEAK_GYM
warp_def 3, 12, 3, ECRUTEAK_GYM
warp_def 4, 12, 3, ECRUTEAK_GYM
warp_def 5, 12, 3, ECRUTEAK_GYM
warp_def 7, 10, 3, ECRUTEAK_GYM
warp_def 7, 11, 3, ECRUTEAK_GYM
warp_def 7, 12, 3, ECRUTEAK_GYM
warp_def 7, 13, 3, ECRUTEAK_GYM
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
.CoordEvents:
db 0

4
maps/EcruteakItemfinderHouse.asm
View File

@ -168,8 +168,8 @@ EcruteakItemfinderHouse_MapEvents:
.Warps:
db 2
warp_def 3, 7, 11, ECRUTEAK_CITY
warp_def 4, 7, 11, ECRUTEAK_CITY
warp_event 3, 7, 11, ECRUTEAK_CITY
warp_event 4, 7, 11, ECRUTEAK_CITY
.CoordEvents:
db 0

4
maps/EcruteakLugiaSpeechHouse.asm
View File

@ -50,8 +50,8 @@ EcruteakLugiaSpeechHouse_MapEvents:
.Warps:
db 2
warp_def 3, 7, 7, ECRUTEAK_CITY
warp_def 4, 7, 7, ECRUTEAK_CITY
warp_event 3, 7, 7, ECRUTEAK_CITY
warp_event 4, 7, 7, ECRUTEAK_CITY
.CoordEvents:
db 0

4
maps/EcruteakMart.asm
View File

@ -51,8 +51,8 @@ EcruteakMart_MapEvents:
.Warps:
db 2
warp_def 2, 7, 9, ECRUTEAK_CITY
warp_def 3, 7, 9, ECRUTEAK_CITY
warp_event 2, 7, 9, ECRUTEAK_CITY
warp_event 3, 7, 9, ECRUTEAK_CITY
.CoordEvents:
db 0

6
maps/EcruteakPokecenter1F.asm
View File

@ -212,9 +212,9 @@ EcruteakPokecenter1F_MapEvents:
.Warps:
db 3
warp_def 3, 7, 6, ECRUTEAK_CITY
warp_def 4, 7, 6, ECRUTEAK_CITY
warp_def 0, 7, 1, POKECENTER_2F
warp_event 3, 7, 6, ECRUTEAK_CITY
warp_event 4, 7, 6, ECRUTEAK_CITY
warp_event 0, 7, 1, POKECENTER_2F
.CoordEvents:
db 0

10
maps/EcruteakTinTowerEntrance.asm
View File

@ -283,11 +283,11 @@ EcruteakTinTowerEntrance_MapEvents:
.Warps:
db 5
warp_def 4, 17, 3, ECRUTEAK_CITY
warp_def 5, 17, 3, ECRUTEAK_CITY
warp_def 5, 3, 4, ECRUTEAK_TIN_TOWER_ENTRANCE
warp_def 17, 15, 3, ECRUTEAK_TIN_TOWER_ENTRANCE
warp_def 17, 3, 3, WISE_TRIOS_ROOM
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
.CoordEvents:
db 2

4
maps/ElmsHouse.asm
View File

@ -89,8 +89,8 @@ ElmsHouse_MapEvents:
.Warps:
db 2
warp_def 2, 7, 4, NEW_BARK_TOWN
warp_def 3, 7, 4, NEW_BARK_TOWN
warp_event 2, 7, 4, NEW_BARK_TOWN
warp_event 3, 7, 4, NEW_BARK_TOWN
.CoordEvents:
db 0

4
maps/ElmsLab.asm
View File

@ -1376,8 +1376,8 @@ ElmsLab_MapEvents:
.Warps:
db 2
warp_def 4, 11, 1, NEW_BARK_TOWN
warp_def 5, 11, 1, NEW_BARK_TOWN
warp_event 4, 11, 1, NEW_BARK_TOWN
warp_event 5, 11, 1, NEW_BARK_TOWN
.CoordEvents:
db 8

24
maps/FastShip1F.asm
View File

@ -291,18 +291,18 @@ FastShip1F_MapEvents:
.Warps:
db 12
warp_def 25, 1, -1, FAST_SHIP_1F
warp_def 27, 8, 1, FAST_SHIP_CABINS_NNW_NNE_NE
warp_def 23, 8, 2, FAST_SHIP_CABINS_NNW_NNE_NE
warp_def 19, 8, 3, FAST_SHIP_CABINS_NNW_NNE_NE
warp_def 15, 8, 1, FAST_SHIP_CABINS_SW_SSW_NW
warp_def 15, 15, 2, FAST_SHIP_CABINS_SW_SSW_NW
warp_def 19, 15, 4, FAST_SHIP_CABINS_SW_SSW_NW
warp_def 23, 15, 1, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
warp_def 27, 15, 3, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
warp_def 3, 13, 5, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
warp_def 6, 12, 1, FAST_SHIP_B1F
warp_def 30, 14, 2, FAST_SHIP_B1F
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
.CoordEvents:
db 2

4
maps/FastShipB1F.asm
View File

@ -454,8 +454,8 @@ FastShipB1F_MapEvents:
.Warps:
db 2
warp_def 5, 11, 11, FAST_SHIP_1F
warp_def 31, 13, 12, FAST_SHIP_1F
warp_event 5, 11, 11, FAST_SHIP_1F
warp_event 31, 13, 12, FAST_SHIP_1F
.CoordEvents:
db 2

6
maps/FastShipCabins_NNW_NNE_NE.asm
View File

@ -272,9 +272,9 @@ FastShipCabins_NNW_NNE_NE_MapEvents:
.Warps:
db 3
warp_def 2, 0, 2, FAST_SHIP_1F
warp_def 2, 12, 3, FAST_SHIP_1F
warp_def 2, 24, 4, FAST_SHIP_1F
warp_event 2, 0, 2, FAST_SHIP_1F
warp_event 2, 12, 3, FAST_SHIP_1F
warp_event 2, 24, 4, FAST_SHIP_1F
.CoordEvents:
db 0

12
maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
View File

@ -468,12 +468,12 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEvents:
.Warps:
db 6
warp_def 2, 7, 8, FAST_SHIP_1F
warp_def 3, 7, 8, FAST_SHIP_1F
warp_def 2, 19, 9, FAST_SHIP_1F
warp_def 3, 19, 9, FAST_SHIP_1F
warp_def 2, 33, 10, FAST_SHIP_1F
warp_def 3, 33, 10, FAST_SHIP_1F
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
.CoordEvents:
db 0

10
maps/FastShipCabins_SW_SSW_NW.asm
View File

@ -228,11 +228,11 @@ FastShipCabins_SW_SSW_NW_MapEvents:
.Warps:
db 5
warp_def 2, 0, 5, FAST_SHIP_1F
warp_def 2, 19, 6, FAST_SHIP_1F
warp_def 3, 19, 6, FAST_SHIP_1F
warp_def 2, 31, 7, FAST_SHIP_1F
warp_def 3, 31, 7, FAST_SHIP_1F
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
.CoordEvents:
db 0

4
maps/FightingDojo.asm
View File

@ -48,8 +48,8 @@ FightingDojo_MapEvents:
.Warps:
db 2
warp_def 4, 11, 1, SAFFRON_CITY
warp_def 5, 11, 1, SAFFRON_CITY
warp_event 4, 11, 1, SAFFRON_CITY
warp_event 5, 11, 1, SAFFRON_CITY
.CoordEvents:
db 0

22
maps/FuchsiaCity.asm
View File

@ -130,17 +130,17 @@ FuchsiaCity_MapEvents:
.Warps:
db 11
warp_def 5, 13, 2, FUCHSIA_MART
warp_def 22, 13, 1, SAFARI_ZONE_MAIN_OFFICE
warp_def 8, 27, 1, FUCHSIA_GYM
warp_def 11, 27, 1, BILLS_BROTHERS_HOUSE
warp_def 19, 27, 1, FUCHSIA_POKECENTER_1F
warp_def 27, 27, 1, SAFARI_ZONE_WARDENS_HOME
warp_def 18, 3, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA
warp_def 37, 22, 1, ROUTE_15_FUCHSIA_GATE
warp_def 37, 23, 2, ROUTE_15_FUCHSIA_GATE
warp_def 7, 35, 1, ROUTE_19_FUCHSIA_GATE
warp_def 8, 35, 2, ROUTE_19_FUCHSIA_GATE
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
.CoordEvents:
db 0

4
maps/FuchsiaGym.asm
View File

@ -386,8 +386,8 @@ FuchsiaGym_MapEvents:
.Warps:
db 2
warp_def 4, 17, 3, FUCHSIA_CITY
warp_def 5, 17, 3, FUCHSIA_CITY
warp_event 4, 17, 3, FUCHSIA_CITY
warp_event 5, 17, 3, FUCHSIA_CITY
.CoordEvents:
db 0

4
maps/FuchsiaMart.asm
View File

@ -43,8 +43,8 @@ FuchsiaMart_MapEvents:
.Warps:
db 2
warp_def 2, 7, 1, FUCHSIA_CITY
warp_def 3, 7, 1, FUCHSIA_CITY
warp_event 2, 7, 1, FUCHSIA_CITY
warp_event 3, 7, 1, FUCHSIA_CITY
.CoordEvents:
db 0

6
maps/FuchsiaPokecenter1F.asm
View File

@ -94,9 +94,9 @@ FuchsiaPokecenter1F_MapEvents:
.Warps:
db 3
warp_def 3, 7, 5, FUCHSIA_CITY
warp_def 4, 7, 5, FUCHSIA_CITY
warp_def 0, 7, 1, POKECENTER_2F
warp_event 3, 7, 5, FUCHSIA_CITY
warp_event 4, 7, 5, FUCHSIA_CITY
warp_event 0, 7, 1, POKECENTER_2F
.CoordEvents:
db 0

2
maps/FuchsiaPokecenter2FBeta.asm
View File

@ -11,7 +11,7 @@ FuchsiaPokecenter2FBeta_MapEvents:
.Warps:
db 1
warp_def 0, 7, 3, FUCHSIA_POKECENTER_1F
warp_event 0, 7, 3, FUCHSIA_POKECENTER_1F
.CoordEvents:
db 0

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