diff options
| author | yenatch <yenatch@gmail.com> | 2014-07-12 09:02:49 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-07-12 09:02:49 -0400 |
| commit | fb11ff7e55be56cef9234c8443614f04f2157a1e (patch) | |
| tree | a6aa8d0745bd07d0b80090491b5e4b6652de4420 /scripts/rockethideoutelevator.asm | |
| parent | 15427f532085846ab6b51719be687951a094cb6c (diff) | |
| parent | 9f29f21d9d43baa7124991dcf3b093fc6c615706 (diff) | |
Merge pull request #48 from yenatch/master
Clean up post-split main.asm. Get rid of static wram addresses. Lay out a foundation for Yellow.
Diffstat (limited to 'scripts/rockethideoutelevator.asm')
| -rwxr-xr-x | scripts/rockethideoutelevator.asm | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/scripts/rockethideoutelevator.asm b/scripts/rockethideoutelevator.asm index 57e62177..73313dd7 100755 --- a/scripts/rockethideoutelevator.asm +++ b/scripts/rockethideoutelevator.asm @@ -1,5 +1,5 @@ RocketHideoutElevatorScript: ; 45710 (11:5710) - ld hl, $d126 + ld hl, wd126 bit 5, [hl] res 5, [hl] push hl @@ -9,16 +9,16 @@ RocketHideoutElevatorScript: ; 45710 (11:5710) res 7, [hl] call nz, RocketHideoutElevatorScript_4575f xor a - ld [$cf0c], a + ld [wcf0c], a inc a - ld [$cc3c], a + ld [wcc3c], a ret RocketHideoutElevatorScript_4572c: ; 4572c (11:572c) - ld hl, $d3af - ld a, [$d73b] + ld hl, wd3af + ld a, [wd73b] ld b, a - ld a, [$d73c] + ld a, [wd73c] ld c, a call RocketHideoutElevatorScript_4573a @@ -35,7 +35,7 @@ RocketHideoutElevatorScript_45741: ; 45741 (11:5741) ld hl, RocketHideoutElavatorFloors ; $5754 call LoadItemList ld hl, RocketHideoutElevatorWarpMaps ; $5759 - ld de, $cc5b + ld de, wcc5b ld bc, $0006 call CopyData ret @@ -68,8 +68,7 @@ RocketHideoutElevatorText1: ; 4576d (11:576d) jr z, .asm_8d8f0 ; 0x45773 call RocketHideoutElevatorScript_45741 ld hl, RocketHideoutElevatorWarpMaps ; $5759 - ld a, $61 - call Predef + predef Func_1c9c6 jr .asm_46c43 ; 0x45780 .asm_8d8f0 ; 0x45782 ld hl, RocketHideoutElevatorText_4578b |