Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced GROUP_, MAP_ references with the map macro

Browse Source 
Updated macros that rely on the GROUP_, MAP_ constants to use the map macro

Added GROUP_NONE and MAP_NONE for the sake of compatibility with this new scheme

Added new macro elevfloor to simplify the definition of elevators under this new scheme
This commit is contained in:
PikalaxALT
2015-07-23 12:59:19 -04:00
parent 185b0a1c86
commit 432df825d4
389 changed files with 1551 additions and 1551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
maps/FastShip1F.asm
View File

@@ -27,7 +27,7 @@ FastShip1F_MapScriptHeader:
pause 30
playsound SFX_BOAT
earthquake 30
blackoutmod GROUP_FAST_SHIP_CABINS_SW_SSW_NW, MAP_FAST_SHIP_CABINS_SW_SSW_NW
blackoutmod FAST_SHIP_CABINS_SW_SSW_NW
clearevent EVENT_FAST_SHIP_HAS_ARRIVED
checkevent EVENT_FAST_SHIP_FIRST_TIME
iftrue .Vermilion
@@ -67,8 +67,8 @@ SailorScript_0x75160:
special FadeBlackBGMap
waitbutton
setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
domaptrigger GROUP_VERMILION_PORT, MAP_VERMILION_PORT, $1
warp GROUP_VERMILION_PORT, MAP_VERMILION_PORT, $7, $11
domaptrigger VERMILION_PORT, $1
warp VERMILION_PORT, $7, $11
end
._Olivine
@@ -80,8 +80,8 @@ SailorScript_0x75160:
special FadeBlackBGMap
waitbutton
setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
domaptrigger GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $1
warp GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $7, $17
domaptrigger OLIVINE_PORT, $1
warp OLIVINE_PORT, $7, $17
end
.LetThePlayerOut:
@@ -287,18 +287,18 @@ FastShip1F_MapEventHeader:
.Warps:
db 12
warp_def $1, $19, 255, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F
warp_def $8, $1b, 1, GROUP_FAST_SHIP_CABINS_NNW_NNE_NE, MAP_FAST_SHIP_CABINS_NNW_NNE_NE
warp_def $8, $17, 2, GROUP_FAST_SHIP_CABINS_NNW_NNE_NE, MAP_FAST_SHIP_CABINS_NNW_NNE_NE
warp_def $8, $13, 3, GROUP_FAST_SHIP_CABINS_NNW_NNE_NE, MAP_FAST_SHIP_CABINS_NNW_NNE_NE
warp_def $8, $f, 1, GROUP_FAST_SHIP_CABINS_SW_SSW_NW, MAP_FAST_SHIP_CABINS_SW_SSW_NW
warp_def $f, $f, 2, GROUP_FAST_SHIP_CABINS_SW_SSW_NW, MAP_FAST_SHIP_CABINS_SW_SSW_NW
warp_def $f, $13, 4, GROUP_FAST_SHIP_CABINS_SW_SSW_NW, MAP_FAST_SHIP_CABINS_SW_SSW_NW
warp_def $f, $17, 1, GROUP_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, MAP_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
warp_def $f, $1b, 3, GROUP_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, MAP_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
warp_def $d, $3, 5, GROUP_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, MAP_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
warp_def $c, $6, 1, GROUP_FAST_SHIP_B1F, MAP_FAST_SHIP_B1F
warp_def $e, $1e, 2, GROUP_FAST_SHIP_B1F, MAP_FAST_SHIP_B1F
warp_def $1, $19, 255, FAST_SHIP_1F
warp_def $8, $1b, 1, FAST_SHIP_CABINS_NNW_NNE_NE
warp_def $8, $17, 2, FAST_SHIP_CABINS_NNW_NNE_NE
warp_def $8, $13, 3, FAST_SHIP_CABINS_NNW_NNE_NE
warp_def $8, $f, 1, FAST_SHIP_CABINS_SW_SSW_NW
warp_def $f, $f, 2, FAST_SHIP_CABINS_SW_SSW_NW
warp_def $f, $13, 4, FAST_SHIP_CABINS_SW_SSW_NW
warp_def $f, $17, 1, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
warp_def $f, $1b, 3, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
warp_def $d, $3, 5, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
warp_def $c, $6, 1, FAST_SHIP_B1F
warp_def $e, $1e, 2, FAST_SHIP_B1F
.XYTriggers:
db 2