Replaced GROUP_, MAP_ references with the map macro

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

View File

@@ -20,12 +20,12 @@ UnknownScript_0x713bd:
Elevator_0x713be:
db 6 ; floors
db _1F, 4, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F
db _2F, 3, GROUP_CELADON_DEPT_STORE_2F, MAP_CELADON_DEPT_STORE_2F
db _3F, 3, GROUP_CELADON_DEPT_STORE_3F, MAP_CELADON_DEPT_STORE_3F
db _4F, 3, GROUP_CELADON_DEPT_STORE_4F, MAP_CELADON_DEPT_STORE_4F
db _5F, 3, GROUP_CELADON_DEPT_STORE_5F, MAP_CELADON_DEPT_STORE_5F
db _6F, 2, GROUP_CELADON_DEPT_STORE_6F, MAP_CELADON_DEPT_STORE_6F
elevfloor _1F, 4, CELADON_DEPT_STORE_1F
elevfloor _2F, 3, CELADON_DEPT_STORE_2F
elevfloor _3F, 3, CELADON_DEPT_STORE_3F
elevfloor _4F, 3, CELADON_DEPT_STORE_4F
elevfloor _5F, 3, CELADON_DEPT_STORE_5F
elevfloor _6F, 2, CELADON_DEPT_STORE_6F
db $ff ; end
@@ -35,8 +35,8 @@ CeladonDeptStoreElevator_MapEventHeader:
.Warps:
db 2
warp_def $3, $1, 255, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F
warp_def $3, $2, 255, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F
warp_def $3, $1, 255, CELADON_DEPT_STORE_1F
warp_def $3, $2, 255, CELADON_DEPT_STORE_1F
.XYTriggers:
db 0