Skip to content

Commit

Permalink
warp_event x, y, map, warp_id
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rangi42
Rangi42 committed Feb 2, 2018
1 parent 323ef81 commit 3088a77
Show file tree
Hide file tree
Showing 383 changed files with 1,317 additions and 1,317 deletions.
2 changes: 1 addition & 1 deletion docs/map_event_scripts.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>


Expand Down
8 changes: 4 additions & 4 deletions macros/scripts/maps.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions maps/AzaleaGym.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions maps/AzaleaMart.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions maps/AzaleaPokecenter1F.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
16 changes: 8 additions & 8 deletions maps/AzaleaTown.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions maps/BattleTower1F.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions maps/BattleTowerBattleRoom.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions maps/BattleTowerElevator.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
12 changes: 6 additions & 6 deletions maps/BattleTowerHallway.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions maps/BattleTowerOutside.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions maps/BillsBrothersHouse.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions maps/BillsFamilysHouse.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions maps/BillsHouse.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
16 changes: 8 additions & 8 deletions maps/BlackthornCity.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions maps/BlackthornDragonSpeechHouse.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions maps/BlackthornEmysHouse.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
14 changes: 7 additions & 7 deletions maps/BlackthornGym1F.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions maps/BlackthornGym2F.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions maps/BlackthornMart.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions maps/BlackthornPokecenter1F.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions maps/BluesHouse.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions maps/BrunosRoom.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
28 changes: 14 additions & 14 deletions maps/BurnedTower1F.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions maps/BurnedTowerB1F.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions maps/CeladonCafe.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading

0 comments on commit 3088a77

Please sign in to comment.