warp_event x, y, map, warp_id

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

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>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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