diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-08-10 10:03:55 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-08-10 10:03:55 -0500 |
| commit | dfa266f05cb909c0e79d8c21b83a7a744a99b64a (patch) | |
| tree | 82d237354b5657e9c79701e56692b2f37cec01ae | |
| parent | 66bc517605860c9f716a176ed467d34097985895 (diff) | |
Use constants for elevator floors
| -rwxr-xr-x | constants/item_constants.asm | 14 | ||||
| -rwxr-xr-x | scripts/celadonmartelevator.asm | 6 | ||||
| -rwxr-xr-x | scripts/rockethideoutelevator.asm | 4 | ||||
| -rwxr-xr-x | scripts/silphcoelevator.asm | 12 |
4 files changed, 33 insertions, 3 deletions
diff --git a/constants/item_constants.asm b/constants/item_constants.asm index dd321b45..d0ad12e6 100755 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -85,6 +85,20 @@ SAFARI_ROCK EQU $16 ; overload const MAX_ETHER ; $51 const ELIXER ; $52 const MAX_ELIXER ; $53 + const FLOOR_B2F ; $54 + const FLOOR_B1F ; $55 + const FLOOR_1F ; $56 + const FLOOR_2F ; $57 + const FLOOR_3F ; $58 + const FLOOR_4F ; $59 + const FLOOR_5F ; $5A + const FLOOR_6F ; $5B + const FLOOR_7F ; $5C + const FLOOR_8F ; $5D + const FLOOR_9F ; $5E + const FLOOR_10F ; $5F + const FLOOR_11F ; $60 + const FLOOR_B4F ; $61 const_value = $C4 diff --git a/scripts/celadonmartelevator.asm b/scripts/celadonmartelevator.asm index ea4792c0..9295d8e6 100755 --- a/scripts/celadonmartelevator.asm +++ b/scripts/celadonmartelevator.asm @@ -41,7 +41,11 @@ CeladonMartElevatorScript_48631: ; 48631 (12:4631) CeladonMartElavatorFloors: ; 48643 (12:4643) db $05 ; num elements in list - db $56, $57, $58, $59, $5A ; "1F", "2F", "3F", "4F, "5F" + db FLOOR_1F + db FLOOR_2F + db FLOOR_3F + db FLOOR_4F + db FLOOR_5F db $FF ; terminator CeldaonMartElevatorWarpMaps: ; 4864a (12:464a) diff --git a/scripts/rockethideoutelevator.asm b/scripts/rockethideoutelevator.asm index ac936b46..21a543e9 100755 --- a/scripts/rockethideoutelevator.asm +++ b/scripts/rockethideoutelevator.asm @@ -42,7 +42,9 @@ RocketHideoutElevatorScript_45741: ; 45741 (11:5741) RocketHideoutElavatorFloors: ; 45754 (11:5754) db $03 ; num elements in list - db $55, $54, $61 ; "B1F", "B2F", "B4F" + db FLOOR_B1F + db FLOOR_B2F + db FLOOR_B4F db $FF ; terminator RocketHideoutElevatorWarpMaps: ; 45759 (11:5759) diff --git a/scripts/silphcoelevator.asm b/scripts/silphcoelevator.asm index 5bd189ae..3e36214e 100755 --- a/scripts/silphcoelevator.asm +++ b/scripts/silphcoelevator.asm @@ -42,7 +42,17 @@ SilphCoElevatorScript_457f1: ; 457f1 (11:57f1) SilphCoElavatorFloors: ; 45804 (11:45804) db $0B ; num elements in list - db $56, $57, $58, $59, $5A, $5B, $5C, $5D, $5E, $5F, $60 ; "1F", "2F", "3F", "4F", ... , "11F" + db FLOOR_1F + db FLOOR_2F + db FLOOR_3F + db FLOOR_4F + db FLOOR_5F + db FLOOR_6F + db FLOOR_7F + db FLOOR_8F + db FLOOR_9F + db FLOOR_10F + db FLOOR_11F db $FF ; terminator SilphCoElevatorWarpMaps: ; 45811 (11:45811) |