summaryrefslogtreecommitdiff
path: root/src/engine/bank3.asm
diff options
context:
space:
mode:
authorxCrystal <rgr.crystal@gmail.com>2016-01-17 19:09:39 +0100
committerxCrystal <rgr.crystal@gmail.com>2016-01-17 19:09:39 +0100
commitbc8350903659f0c9dad446ee7617779c78b44e2d (patch)
treebe572299c9852c925eee55c370a1202b1751ee1b /src/engine/bank3.asm
parent4b9f2a50f768f44d7f6ea4dc6efe72b8b6f3b616 (diff)
name some ram addresses and functions, mostly menu input related
also replace other wram/hram addresses that were hardcoded despite the label already existing
Diffstat (limited to 'src/engine/bank3.asm')
-rwxr-xr-xsrc/engine/bank3.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/engine/bank3.asm b/src/engine/bank3.asm
index 38a56cd..3ec9202 100755
--- a/src/engine/bank3.asm
+++ b/src/engine/bank3.asm
@@ -539,9 +539,9 @@ Func_c484: ; c484 (3:4484)
Func_c491: ; c491 (3:4491)
ld a, [$d0b6]
- ld [$ff92], a
+ ld [hSCX], a
ld a, [$d0b7]
- ld [$ff93], a
+ ld [hSCY], a
ret
Func_c49c: ; c49c (3:449c)
@@ -620,7 +620,7 @@ Func_c510: ; c510 (3:4510)
call nz, Func_c6dc
ret
.asm_c535
- ld a, [$ff91]
+ ld a, [hButtonsPressed]
and $8
call nz, Func_c74d
ret
@@ -684,7 +684,7 @@ Func_c58b: ; c58b (3:458b)
ret
Func_c5ac: ; c5ac (3:45ac)
- ld a, [$ff90]
+ ld a, [hButtonsHeld]
and $f0
jr z, .asm_c5bf
call Func_c5cb
@@ -693,7 +693,7 @@ Func_c5ac: ; c5ac (3:45ac)
and $1
jr nz, .asm_c5ca
.asm_c5bf
- ld a, [$ff91]
+ ld a, [hButtonsPressed]
and $1
jr z, .asm_c5ca
call Func_c71e
@@ -802,7 +802,7 @@ Func_c66c: ; c66c (3:466c)
push hl
push bc
ld c, $1
- ld a, [$ff90]
+ ld a, [hButtonsHeld]
bit 1, a
jr z, .asm_c67e
ld a, [$d338]
@@ -1002,8 +1002,8 @@ Func_c7b3: ; c7b3 (3:47b3)
Func_c7b8: ; c7b8 (3:47b8)
xor a
- ld [$ff92], a
- ld [$ff93], a
+ ld [hSCX], a
+ ld [hSCY], a
call Set_OBJ_8x16
farcall Func_1288c
farcall Func_8db0
@@ -1012,8 +1012,8 @@ Func_c7b8: ; c7b8 (3:47b8)
Func_c7cc: ; c7cc (3:47cc)
xor a
- ld [$ff92], a
- ld [$ff93], a
+ ld [hSCX], a
+ ld [hSCY], a
call Set_OBJ_8x16
farcall Func_1288c
farcall Func_a288
@@ -1395,8 +1395,8 @@ DeckMachine_d336: ; d336 (3:5336)
call PlaySong
call Func_04a2
xor a
- ld [$ff92], a
- ld [$ff93], a
+ ld [hSCX], a
+ ld [hSCY], a
farcall Func_1288c
call EnableLCD
pop bc