pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07: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
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

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