diff options
author | yenatch <yenatch@gmail.com> | 2014-05-26 14:04:56 -0700 |
---|---|---|
committer | yenatch <yenatch@gmail.com> | 2014-05-26 22:04:39 -0700 |
commit | 40c17c906b2b3f65b3b04b1933b90238a7ac5566 (patch) | |
tree | 6de26c959808d5a792b692f2300c33557c1dbfab /scripts/halloffameroom.asm | |
parent | 52ba96f5f4ec53450a0ff6257ea1040d09b7e537 (diff) |
Remove most static wram addresses. Use labels instead.
For unknown addresses, use "w<address>".
Label overleads are still an issue.
Diffstat (limited to 'scripts/halloffameroom.asm')
-rwxr-xr-x | scripts/halloffameroom.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/halloffameroom.asm b/scripts/halloffameroom.asm index d91fad22..f88d8498 100755 --- a/scripts/halloffameroom.asm +++ b/scripts/halloffameroom.asm @@ -21,14 +21,14 @@ HallofFameRoomScript3: ; 5a4ba (16:64ba) HallofFameRoomScript2: ; 5a4bb (16:64bb) call Delay3 - ld a, [$d358] + ld a, [wd358] push af xor a ld [wJoyIgnore], a ld a, $55 call Predef pop af - ld [$d358], a + ld [wd358], a ld hl, W_FLAGS_D733 res 1, [hl] inc hl @@ -40,7 +40,7 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb) ld [hl], a ld [W_LANCECURSCRIPT], a ld [W_HALLOFFAMEROOMCURSCRIPT], a - ld hl, $d863 + ld hl, wd863 ld [hli], a ld [hli], a ld [hli], a @@ -63,11 +63,11 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb) HallofFameRoomScript0: ; 5a50d (16:650d) ld a, $ff ld [wJoyIgnore], a - ld hl, $ccd3 + ld hl, wccd3 ld de, RLEMovement5a528 call DecodeRLEList dec a - ld [$cd38], a + ld [wcd38], a call Func_3486 ld a, $1 ld [W_HALLOFFAMEROOMCURSCRIPT], a @@ -78,11 +78,11 @@ RLEMovement5a528: ; 5a528 (16:6528) db $ff HallofFameRoomScript1: ; 5a52b (16:652b) - ld a, [$cd38] + ld a, [wcd38] and a ret nz ld a, $1 - ld [$d528], a + ld [wd528], a ld a, $1 ld [$ff8c], a call SetSpriteMovementBytesToFF @@ -93,14 +93,14 @@ HallofFameRoomScript1: ; 5a52b (16:652b) xor a ld [wJoyIgnore], a inc a - ld [$d528], a + ld [wd528], a ld a, $1 ld [$ff8c], a call DisplayTextID ld a, $ff ld [wJoyIgnore], a ld a, $8 - ld [$cc4d], a + ld [wcc4d], a ld a, $11 call Predef ld a, $2 |