summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xengine/bank1c.asm10
-rwxr-xr-xengine/bank2.asm4
-rwxr-xr-xengine/home.asm50
-rwxr-xr-xengine/music1.asm136
-rwxr-xr-xengine/music2.asm136
-rwxr-xr-xengine/sfx.asm30
6 files changed, 183 insertions, 183 deletions
diff --git a/engine/bank1c.asm b/engine/bank1c.asm
index 1f206c2..3c43f3a 100755
--- a/engine/bank1c.asm
+++ b/engine/bank1c.asm
@@ -163,13 +163,13 @@ Func_70136: ; 70136 (1c:4136)
or $1
ld [$cabb], a
ld a, $e4
- ld [$ff47], a
+ ld [rBGP], a
call Func_040c
xor a
- ld [$ff92], a
- ld [$ff43], a
- ld [$ff93], a
- ld [$ff42], a
+ ld [CURR_SCX], a
+ ld [rSCX], a
+ ld [CURR_SCY], a
+ ld [rSCY], a
pop de
pop bc
pop hl
diff --git a/engine/bank2.asm b/engine/bank2.asm
index 8c37ca7..9392206 100755
--- a/engine/bank2.asm
+++ b/engine/bank2.asm
@@ -100,7 +100,7 @@ Unknown_8de2: ; 8de2 (2:4de2)
INCBIN "baserom.gbc",$8de2,$8dea - $8de2
Func_8dea: ; 8dea (2:4dea)
- ld a, [$ff8f]
+ ld a, [BUTTONS_PRESSED_2]
and $8
ret z
ld a, [$cd10]
@@ -418,7 +418,7 @@ Func_9065: ; 9065 (2:5065)
ld d, a
ld a, [$ceb0]
ld e, a
- ld a, [$ff8f]
+ ld a, [BUTTONS_PRESSED_2]
or a
jr z, .asm_90a6
bit 5, a
diff --git a/engine/home.asm b/engine/home.asm
index 64c7541..f6b0d6e 100755
--- a/engine/home.asm
+++ b/engine/home.asm
@@ -484,11 +484,11 @@ Func_042d: ; 042d (0:042d)
ret z
ld hl, CURR_BGP
ld a, [hli]
- ld [$ff47], a
+ ld [rBGP], a
ld a, [hli]
- ld [$ff48], a
+ ld [rOBP0], a
ld a, [hl]
- ld [$ff49], a
+ ld [rOBP1], a
ld a, [DATA_CONSOLE]
cp CONSOLE_CGB
jr z, asm_44a
@@ -533,7 +533,7 @@ InitializePalettes: ; 0467 (0:0467)
ld [$ff00+c], a
inc c
.asm_47f
- ld a, [$ff41]
+ ld a, [rSTAT]
and $2
jr nz, .asm_47f
ld a, [hl]
@@ -1537,12 +1537,12 @@ MemcpyHLDE_hblank: ; 0c19 (0:0c19)
.loop
ei
di
- ld a, [$ff41] ;
+ ld a, [rSTAT] ;
and $3 ;
jr nz, .loop ; assert hblank
ld a, [hl]
ld [de], a
- ld a, [$ff41] ;
+ ld a, [rSTAT] ;
and $3 ;
jr nz, .loop ; assert still in hblank
ei
@@ -1559,12 +1559,12 @@ MemcpyDEHL_hblank: ; 0c32 (0:0c32)
.asm_c33
ei
di
- ld a, [$ff41]
+ ld a, [rSTAT]
and $3
jr nz, .asm_c33
ld a, [de]
ld [hl], a
- ld a, [$ff41]
+ ld a, [rSTAT]
and $3
jr nz, .asm_c33
ei
@@ -1586,13 +1586,13 @@ Func_0c91: ; 0c91 (0:0c91)
jr z, .asm_caa
ret
.asm_c9d
- ld a, [$ff02]
+ ld a, [rSC]
add a
ret c
ld a, $1
- ld [$ff02], a
+ ld [rSC], a
ld a, $81
- ld [$ff02], a
+ ld [rSC], a
ret
.asm_caa
ld a, [$cb76]
@@ -1629,16 +1629,16 @@ SerialHandler: ; 0d26 (0:0d26)
ld a, [$cb74]
or a
jr z, .asm_d55
- ld a, [$ff01]
+ ld a, [rSB]
call Func_0d77
call Func_0dc8
push af
.asm_d44
- ld a, [$ff02]
+ ld a, [rSC]
add a
jr c, .asm_d44
pop af
- ld [$ff01], a
+ ld [rSB], a
ld a, [$cb74]
cp $29
jr z, .asm_d6e
@@ -1646,16 +1646,16 @@ SerialHandler: ; 0d26 (0:0d26)
.asm_d55
ld a, $1
ld [$cba2], a
- ld a, [$ff01]
+ ld a, [rSB]
ld [$cba5], a
ld a, $ac
- ld [$ff01], a
+ ld [rSB], a
ld a, [$cba5]
cp $12
jr z, .asm_d6e
.asm_d6a
ld a, $80
- ld [$ff02], a
+ ld [rSC], a
.asm_d6e
ld hl, $cb76
inc [hl]
@@ -2824,7 +2824,7 @@ Func_2636: ; 2636 (0:2636)
Func_264b: ; 264b (0:264b)
xor a
ld [$cd99], a
- ld a, [$ff8f]
+ ld a, [BUTTONS_PRESSED_2]
or a
jr z, .asm_2685
ld b, a
@@ -3054,7 +3054,7 @@ Func_2af0: ; 2af0 (0:2af0)
ld a, [BUTTONS_PRESSED]
bit 0, a
jr nz, .asm_2b50
- ld a, [$ff8f]
+ ld a, [BUTTONS_PRESSED_2]
and $30
jr z, .asm_2b1f
ld a, $1
@@ -3569,14 +3569,14 @@ Func_31e5: ; 31e5 (0:31e5)
jr Func_31e0
Func_31ea: ; 31ea (0:31ea)
- ld a, [$ff01]
+ ld a, [rSB]
ld [$ce6e], a
Func_31ef: ; 31ef (0:31ef)
xor a
jr Func_31e0
Func_31f2: ; 31f2 (0:31f2)
- ld a, [$ff01]
+ ld a, [rSB]
ld [$ce6f], a
xor a
ld [$ce63], a
@@ -3601,11 +3601,11 @@ Func_31fc: ; 31fc (0:31fc)
ld [hl], a
ld a, e
Func_3212: ; 3212 (0:3212)
- ld [$ff01], a
+ ld [rSB], a
ld a, $1
- ld [$ff02], a
+ ld [rSC], a
ld a, $81
- ld [$ff02], a
+ ld [rSC], a
ret
; 0x321d
@@ -4123,7 +4123,7 @@ INCBIN "baserom.gbc",$3c46,$3c48 - $3c46
Func_3c48: ; 3c48 (0:3c48)
push af
- ld a, [$ff40]
+ ld a, [rLCDC]
bit 7, a
jr z, .asm_3c58
push bc
diff --git a/engine/music1.asm b/engine/music1.asm
index 6527069..8130ddf 100755
--- a/engine/music1.asm
+++ b/engine/music1.asm
@@ -106,13 +106,13 @@ Func_f406f: ; f406f (3d:406f)
Func_f407d: ; f407d (3d:407d)
xor a
- ld [$ff26], a
+ ld [rNR52], a
ld a, $80
- ld [$ff26], a
+ ld [rNR52], a
ld a, $77
- ld [$ff24], a
+ ld [rNR50], a
ld a, $ff
- ld [$ff25], a
+ ld [rNR51], a
ld a, $3d
ld [$dd81], a
ld a, $80
@@ -168,8 +168,8 @@ Func_f40e9: ; f40e9 (3d:40e9)
ld hl, Func_fc003
call Bankswitch3dTo3f
ld a, [$dd81]
- ld [$ff80], a
- ld [$2000], a
+ ld [CURR_ROM_BANK], a
+ ld [MBC3RomBank], a
ld a, [$ddf2]
cp $0
jr z, .asm_f4109
@@ -216,34 +216,34 @@ Func_f414b: ; f414b (3d:414b)
bit 0, d
jr nz, .asm_f415f
ld a, $8
- ld [$ff12], a
+ ld [rNR12], a
swap a
- ld [$ff14], a
+ ld [rNR14], a
.asm_f415f
xor a
ld [$dd8e], a
bit 1, d
jr nz, .asm_f416f
ld a, $8
- ld [$ff17], a
+ ld [rNR22], a
swap a
- ld [$ff19], a
+ ld [rNR24], a
.asm_f416f
xor a
ld [$dd90], a
bit 3, d
jr nz, .asm_f417f
ld a, $8
- ld [$ff21], a
+ ld [rNR42], a
swap a
- ld [$ff23], a
+ ld [rNR44], a
.asm_f417f
xor a
ld [$dd8f], a
bit 2, d
jr nz, .asm_f418b
ld a, $0
- ld [$ff1c], a
+ ld [rNR32], a
.asm_f418b
ret
@@ -256,8 +256,8 @@ Music1_PlaySong: ; f418c (3d:418c)
add hl, bc
ld a, [hl]
ld [$dd81], a
- ld [$ff80], a
- ld [$2000], a
+ ld [CURR_ROM_BANK], a
+ ld [MBC3RomBank], a
pop af
add a
ld c, a
@@ -399,7 +399,7 @@ Func_f42a5: ; f42a5 (3d:42a5)
ld a, [$dd8c]
bit 0, a
jr nz, .asm_f42d4
- ld hl, $ff12
+ ld hl, rNR12
ld a, [wMusicE9]
ld [hli], a
inc hl
@@ -429,9 +429,9 @@ Func_f42a5: ; f42a5 (3d:42a5)
bit 0, a
jr nz, .asm_f4309
ld a, $8
- ld [$ff12], a
+ ld [rNR12], a
swap a
- ld [$ff14], a
+ ld [rNR14], a
.asm_f4309
ret
@@ -452,7 +452,7 @@ Func_f430a: ; f430a (3d:430a)
ld a, [$dd8c]
bit 1, a
jr nz, .asm_f4339
- ld hl, $ff17
+ ld hl, rNR22
ld a, [$ddc8]
ld [hli], a
inc hl
@@ -482,9 +482,9 @@ Func_f430a: ; f430a (3d:430a)
bit 1, a
jr nz, .asm_f436e
ld a, $8
- ld [$ff17], a
+ ld [rNR22], a
swap a
- ld [$ff19], a
+ ld [rNR24], a
.asm_f436e
ret
@@ -506,7 +506,7 @@ Func_f436f: ; f436f (3d:436f)
cp $1
jr z, .asm_f4398
ld a, [$ddc9]
- ld [$ff1c], a
+ ld [rNR32], a
.asm_f4398
ld a, [$ddbd]
dec a
@@ -531,9 +531,9 @@ Func_f436f: ; f436f (3d:436f)
bit 2, a
jr nz, .asm_f43cd
ld a, $0
- ld [$ff1c], a
+ ld [rNR32], a
ld a, $80
- ld [$ff1e], a
+ ld [rNR34], a
.asm_f43cd
ret
@@ -569,9 +569,9 @@ Func_f43ce: ; f43ce (3d:43ce)
xor a
ld [$ddef], a
ld a, $8
- ld [$ff21], a
+ ld [rNR42], a
swap a
- ld [$ff23], a
+ ld [rNR44], a
.asm_f4413
ret
@@ -1167,25 +1167,25 @@ Func_f4714: ; f4714 (3d:4714)
cp $80
jr z, .asm_f4733
ld a, [wMusicVolume]
- ld [$ff12], a
+ ld [rNR12], a
ld d, $80
.asm_f4733
ld [hl], $2
ld a, $8
- ld [$ff10], a
+ ld [rNR10], a
ld a, [wMusicDuty]
- ld [$ff11], a
+ ld [rNR11], a
ld a, [$dda5]
- ld [$ff13], a
+ ld [rNR13], a
ld a, [$dda6]
or d
- ld [$ff14], a
+ ld [rNR14], a
.asm_f4749
ret
.asm_f474a
ld hl, wMusicTie
ld [hl], $0
- ld hl, $ff12
+ ld hl, rNR12
ld a, $8
ld [hli], a
inc hl
@@ -1206,23 +1206,23 @@ Func_f475a: ; f475a (3d:475a)
cp $80
jr z, .asm_f4779
ld a, [$dde8]
- ld [$ff17], a
+ ld [rNR22], a
ld d, $80
.asm_f4779
ld [hl], $2
ld a, [$dd87]
- ld [$ff16], a
+ ld [rNR21], a
ld a, [$dda7]
- ld [$ff18], a
+ ld [rNR23], a
ld a, [$dda8]
or d
- ld [$ff19], a
+ ld [rNR24], a
.asm_f478b
ret
.asm_f478c
ld hl, $dd92
ld [hl], $0
- ld hl, $ff17
+ ld hl, rNR22
ld a, $8
ld [hli], a
inc hl
@@ -1239,7 +1239,7 @@ Func_f479c: ; f479c (3d:479c)
or a
jr z, .asm_f47b3
xor a
- ld [$ff1a], a
+ ld [rNR30], a
call Func_f47ea
ld d, $80
.asm_f47b3
@@ -1251,28 +1251,28 @@ Func_f479c: ; f479c (3d:479c)
cp $80
jr z, .asm_f47cc
ld a, [$dde9]
- ld [$ff1c], a
+ ld [rNR32], a
xor a
- ld [$ff1a], a
+ ld [rNR30], a
ld d, $80
.asm_f47cc
ld [hl], $2
xor a
- ld [$ff1b], a
+ ld [rNR31], a
ld a, [$dda9]
- ld [$ff1d], a
+ ld [rNR33], a
ld a, $80
- ld [$ff1a], a
+ ld [rNR30], a
ld a, [$ddaa]
or d
- ld [$ff1e], a
+ ld [rNR34], a
.asm_f47e0
ret
.asm_f47e1
ld hl, wMusicTie
ld [hl], $0
xor a
- ld [$ff1a], a
+ ld [rNR30], a
ret
Func_f47ea: ; f479c (3d:47ea)
@@ -1306,7 +1306,7 @@ Func_f480a: ; f480a (3d:480a)
ld a, [$ddba]
cp $0
jr z, asm_f482a
- ld de, $ff20
+ ld de, rNR41
ld hl, $ddab
ld a, [hli]
ld [de], a
@@ -1324,7 +1324,7 @@ Func_f480a: ; f480a (3d:480a)
asm_f482a
xor a
ld [$ddef], a
- ld hl, $ff21
+ ld hl, rNR42
ld a, $8
ld [hli], a
inc hl
@@ -1349,7 +1349,7 @@ Func_f4839: ; f4839 (3d:4839)
jr nz, .asm_f4853
jr asm_f482a
.asm_f4853
- ld [$ff22], a
+ ld [rNR43], a
inc de
ld a, d
ld [hld], a
@@ -1368,7 +1368,7 @@ Func_f485a: ; f485a (3d:485a)
Func_f4866: ; f4866 (3d:4866)
ld a, [$ddf1]
- ld [$ff24], a
+ ld [rNR50], a
ld a, [$dd8c]
or a
ld hl, wMusicDC
@@ -1397,7 +1397,7 @@ Func_f4866: ; f4866 (3d:4866)
swap e
or e
and d
- ld [$ff25], a
+ ld [rNR51], a
ret
Func_f4898: ; f4898 (3d:4898)
@@ -1495,13 +1495,13 @@ Func_f490b: ; f490b (3d:490b)
bit 0, a
jr nz, .asm_f4966
ld a, e
- ld [$ff13], a
- ld a, [$ff11]
+ ld [rNR13], a
+ ld a, [rNR11]
and $c0
- ld [$ff11], a
+ ld [rNR11], a
ld a, d
and $3f
- ld [$ff14], a
+ ld [rNR14], a
ret
.asm_f492c
cp $1
@@ -1513,12 +1513,12 @@ Func_f490b: ; f490b (3d:490b)
bit 1, a
jr nz, .asm_f4966
ld a, e
- ld [$ff18], a
- ld a, [$ff16]
+ ld [rNR23], a
+ ld a, [rNR21]
and $c0
- ld [$ff16], a
+ ld [rNR21], a
ld a, d
- ld [$ff19], a
+ ld [rNR24], a
ret
.asm_f494b
cp $2
@@ -1530,11 +1530,11 @@ Func_f490b: ; f490b (3d:490b)
bit 2, a
jr nz, .asm_f4966
ld a, e
- ld [$ff1d], a
+ ld [rNR33], a
xor a
- ld [$ff1b], a
+ ld [rNR31], a
ld a, d
- ld [$ff1e], a
+ ld [rNR34], a
.asm_f4966
ret
@@ -1567,28 +1567,28 @@ Func_f4980: ; f4980 (3d:4980)
bit 0, d
jr nz, .asm_f4990
ld a, $8
- ld [$ff12], a
+ ld [rNR12], a
swap a
- ld [$ff14], a
+ ld [rNR14], a
.asm_f4990
bit 1, d
jr nz, .asm_f499c
swap a
- ld [$ff17], a
+ ld [rNR22], a
swap a
- ld [$ff19], a
+ ld [rNR24], a
.asm_f499c
bit 3, d
jr nz, .asm_f49a8
swap a
- ld [$ff21], a
+ ld [rNR42], a
swap a
- ld [$ff23], a
+ ld [rNR44], a
.asm_f49a8
bit 2, d
jr nz, .asm_f49b0
ld a, $0
- ld [$ff1c], a
+ ld [rNR32], a
.asm_f49b0
ret
diff --git a/engine/music2.asm b/engine/music2.asm
index 0b308b8..bb30bf2 100755
--- a/engine/music2.asm
+++ b/engine/music2.asm
@@ -106,13 +106,13 @@ Func_f806f: ; f806f (3e:406f)
Func_f807d: ; f807d (3e:407d)
xor a
- ld [$ff26], a
+ ld [rNR52], a
ld a, $80
- ld [$ff26], a
+ ld [rNR52], a
ld a, $77
- ld [$ff24], a
+ ld [rNR50], a
ld a, $ff
- ld [$ff25], a
+ ld [rNR51], a
ld a, $3d
ld [$dd81], a
ld a, $80
@@ -168,8 +168,8 @@ Func_f80e9: ; f80e9 (3e:40e9)
ld hl, Func_fc003
call Bankswitch3dTo3f
ld a, [$dd81]
- ld [$ff80], a
- ld [$2000], a
+ ld [CURR_ROM_BANK], a
+ ld [MBC3RomBank], a
ld a, [$ddf2]
cp $0
jr z, .asm_f8109
@@ -216,34 +216,34 @@ Func_f814b: ; f814b (3e:414b)
bit 0, d
jr nz, .asm_f815f
ld a, $8
- ld [$ff12], a
+ ld [rNR12], a
swap a
- ld [$ff14], a
+ ld [rNR14], a
.asm_f815f
xor a
ld [$dd8e], a
bit 1, d
jr nz, .asm_f816f
ld a, $8
- ld [$ff17], a
+ ld [rNR22], a
swap a
- ld [$ff19], a
+ ld [rNR24], a
.asm_f816f
xor a
ld [$dd90], a
bit 3, d
jr nz, .asm_f817f
ld a, $8
- ld [$ff21], a
+ ld [rNR42], a
swap a
- ld [$ff23], a
+ ld [rNR44], a
.asm_f817f
xor a
ld [$dd8f], a
bit 2, d
jr nz, .asm_f818b
ld a, $0
- ld [$ff1c], a
+ ld [rNR32], a
.asm_f818b
ret
@@ -256,8 +256,8 @@ Music2_PlaySong: ; f818c (3e:418c)
add hl, bc
ld a, [hl]
ld [$dd81], a
- ld [$ff80], a
- ld [$2000], a
+ ld [CURR_ROM_BANK], a
+ ld [MBC3RomBank], a
pop af
add a
ld c, a
@@ -399,7 +399,7 @@ Func_f82a5: ; f82a5 (3e:42a5)
ld a, [$dd8c]
bit 0, a
jr nz, .asm_f82d4
- ld hl, $ff12
+ ld hl, rNR12
ld a, [wMusicE9]
ld [hli], a
inc hl
@@ -429,9 +429,9 @@ Func_f82a5: ; f82a5 (3e:42a5)
bit 0, a
jr nz, .asm_f8309
ld a, $8
- ld [$ff12], a
+ ld [rNR12], a
swap a
- ld [$ff14], a
+ ld [rNR14], a
.asm_f8309
ret
@@ -452,7 +452,7 @@ Func_f830a: ; f830a (3e:430a)
ld a, [$dd8c]
bit 1, a
jr nz, .asm_f8339
- ld hl, $ff17
+ ld hl, rNR22
ld a, [$ddc8]
ld [hli], a
inc hl
@@ -482,9 +482,9 @@ Func_f830a: ; f830a (3e:430a)
bit 1, a
jr nz, .asm_f836e
ld a, $8
- ld [$ff17], a
+ ld [rNR22], a
swap a
- ld [$ff19], a
+ ld [rNR24], a
.asm_f836e
ret
@@ -506,7 +506,7 @@ Func_f836f: ; f836f (3e:436f)
cp $1
jr z, .asm_f8398
ld a, [$ddc9]
- ld [$ff1c], a
+ ld [rNR32], a
.asm_f8398
ld a, [$ddbd]
dec a
@@ -531,9 +531,9 @@ Func_f836f: ; f836f (3e:436f)
bit 2, a
jr nz, .asm_f83cd
ld a, $0
- ld [$ff1c], a
+ ld [rNR32], a
ld a, $80
- ld [$ff1e], a
+ ld [rNR34], a
.asm_f83cd
ret
@@ -569,9 +569,9 @@ Func_f83ce: ; f83ce (3e:43ce)
xor a
ld [$ddef], a
ld a, $8
- ld [$ff21], a
+ ld [rNR42], a
swap a
- ld [$ff23], a
+ ld [rNR44], a
.asm_f8413
ret
@@ -1167,25 +1167,25 @@ Func_f8714: ; f8714 (3e:4714)
cp $80
jr z, .asm_f8733
ld a, [wMusicVolume]
- ld [$ff12], a
+ ld [rNR12], a
ld d, $80
.asm_f8733
ld [hl], $2
ld a, $8
- ld [$ff10], a
+ ld [rNR10], a
ld a, [wMusicDuty]
- ld [$ff11], a
+ ld [rNR11], a
ld a, [$dda5]
- ld [$ff13], a
+ ld [rNR13], a
ld a, [$dda6]
or d
- ld [$ff14], a
+ ld [rNR14], a
.asm_f8749
ret
.asm_f874a
ld hl, wMusicTie
ld [hl], $0
- ld hl, $ff12
+ ld hl, rNR12
ld a, $8
ld [hli], a
inc hl
@@ -1206,23 +1206,23 @@ Func_f875a: ; f875a (3e:475a)
cp $80
jr z, .asm_f8779
ld a, [$dde8]
- ld [$ff17], a
+ ld [rNR22], a
ld d, $80
.asm_f8779
ld [hl], $2
ld a, [$dd87]
- ld [$ff16], a
+ ld [rNR21], a
ld a, [$dda7]
- ld [$ff18], a
+ ld [rNR23], a
ld a, [$dda8]
or d
- ld [$ff19], a
+ ld [rNR24], a
.asm_f878b
ret
.asm_f878c
ld hl, $dd92
ld [hl], $0
- ld hl, $ff17
+ ld hl, rNR22
ld a, $8
ld [hli], a
inc hl
@@ -1239,7 +1239,7 @@ Func_f879c: ; f879c (3e:479c)
or a
jr z, .asm_f87b3
xor a
- ld [$ff1a], a
+ ld [rNR30], a
call Func_f87ea
ld d, $80
.asm_f87b3
@@ -1251,28 +1251,28 @@ Func_f879c: ; f879c (3e:479c)
cp $80
jr z, .asm_f87cc
ld a, [$dde9]
- ld [$ff1c], a
+ ld [rNR32], a
xor a
- ld [$ff1a], a
+ ld [rNR30], a
ld d, $80
.asm_f87cc
ld [hl], $2
xor a
- ld [$ff1b], a
+ ld [rNR31], a
ld a, [$dda9]
- ld [$ff1d], a
+ ld [rNR33], a
ld a, $80
- ld [$ff1a], a
+ ld [rNR30], a
ld a, [$ddaa]
or d
- ld [$ff1e], a
+ ld [rNR34], a
.asm_f87e0
ret
.asm_f87e1
ld hl, wMusicTie
ld [hl], $0
xor a
- ld [$ff1a], a
+ ld [rNR30], a
ret
Func_f87ea: ; f879c (3e:47ea)
@@ -1306,7 +1306,7 @@ Func_f880a: ; f880a (3e:480a)
ld a, [$ddba]
cp $0
jr z, asm_f882a
- ld de, $ff20
+ ld de, rNR41
ld hl, $ddab
ld a, [hli]
ld [de], a
@@ -1324,7 +1324,7 @@ Func_f880a: ; f880a (3e:480a)
asm_f882a
xor a
ld [$ddef], a
- ld hl, $ff21
+ ld hl, rNR42
ld a, $8
ld [hli], a
inc hl
@@ -1349,7 +1349,7 @@ Func_f8839: ; f8839 (3e:4839)
jr nz, .asm_f8853
jr asm_f882a
.asm_f8853
- ld [$ff22], a
+ ld [rNR43], a
inc de
ld a, d
ld [hld], a
@@ -1368,7 +1368,7 @@ Func_f885a: ; f885a (3e:485a)
Func_f8866: ; f8866 (3e:4866)
ld a, [$ddf1]
- ld [$ff24], a
+ ld [rNR50], a
ld a, [$dd8c]
or a
ld hl, wMusicDC
@@ -1397,7 +1397,7 @@ Func_f8866: ; f8866 (3e:4866)
swap e
or e
and d
- ld [$ff25], a
+ ld [rNR51], a
ret
Func_f8898: ; f8898 (3e:4898)
@@ -1495,13 +1495,13 @@ Func_f890b: ; f890b (3e:490b)
bit 0, a
jr nz, .asm_f8966
ld a, e
- ld [$ff13], a
- ld a, [$ff11]
+ ld [rNR13], a
+ ld a, [rNR11]
and $c0
- ld [$ff11], a
+ ld [rNR11], a
ld a, d
and $3f
- ld [$ff14], a
+ ld [rNR14], a
ret
.asm_f892c
cp $1
@@ -1513,12 +1513,12 @@ Func_f890b: ; f890b (3e:490b)
bit 1, a
jr nz, .asm_f8966
ld a, e
- ld [$ff18], a
- ld a, [$ff16]
+ ld [rNR23], a
+ ld a, [rNR21]
and $c0
- ld [$ff16], a
+ ld [rNR21], a
ld a, d
- ld [$ff19], a
+ ld [rNR24], a
ret
.asm_f894b
cp $2
@@ -1530,11 +1530,11 @@ Func_f890b: ; f890b (3e:490b)
bit 2, a
jr nz, .asm_f8966
ld a, e
- ld [$ff1d], a
+ ld [rNR33], a
xor a
- ld [$ff1b], a
+ ld [rNR31], a
ld a, d
- ld [$ff1e], a
+ ld [rNR34], a
.asm_f8966
ret
@@ -1567,28 +1567,28 @@ Func_f8980: ; f8980 (3e:4980)
bit 0, d
jr nz, .asm_f8990
ld a, $8
- ld [$ff12], a
+ ld [rNR12], a
swap a
- ld [$ff14], a
+ ld [rNR14], a
.asm_f8990
bit 1, d
jr nz, .asm_f899c
swap a
- ld [$ff17], a
+ ld [rNR22], a
swap a
- ld [$ff19], a
+ ld [rNR24], a
.asm_f899c
bit 3, d
jr nz, .asm_f89a8
swap a
- ld [$ff21], a
+ ld [rNR42], a
swap a
- ld [$ff23], a
+ ld [rNR44], a
.asm_f89a8
bit 2, d
jr nz, .asm_f89b0
ld a, $0
- ld [$ff1c], a
+ ld [rNR32], a
.asm_f89b0
ret
diff --git a/engine/sfx.asm b/engine/sfx.asm
index 7fb7861..63a83b6 100755
--- a/engine/sfx.asm
+++ b/engine/sfx.asm
@@ -170,7 +170,7 @@ SFX_0: ; fc0ce (3f:40ce)
ld [hl], $0
or d
ld d, a
- ld hl, $ff11
+ ld hl, rNR11
ld a, c
add a
add a
@@ -203,7 +203,7 @@ SFX_1: ; fc10e (3f:410e)
ld a, [hli]
ld e, a
push hl
- ld hl, $ff12
+ ld hl, rNR12
ld a, c
add a
add a
@@ -217,7 +217,7 @@ SFX_1: ; fc10e (3f:410e)
SFX_2: ; fc127 (3f:4127)
swap a
ld e, a
- ld hl, $ff11
+ ld hl, rNR11
ld a, c
add a
add a
@@ -331,7 +331,7 @@ Func_fc18d: ; fc18d (3f:418d)
ld [hl], $0
or d
ld d, a
- ld hl, $ff11
+ ld hl, rNR11
ld a, c
add a
add a
@@ -380,7 +380,7 @@ Func_fc1cd: ; fc1cd (3f:41cd)
ld [hl], $0
or e
ld e, a
- ld hl, $ff20
+ ld hl, rNR41
xor a
ld [hli], a
inc hl
@@ -400,7 +400,7 @@ SFX_7: ; fc202 (3f:4202)
ld h, [hl]
ld l, a
ld a, $0
- ld [$ff1a], a
+ ld [rNR30], a
ld b, d
ld de, $ff30
.asm_fc215
@@ -414,7 +414,7 @@ SFX_7: ; fc202 (3f:4202)
ld a, $1
ld [$dd8b], a
ld a, $80
- ld [$ff1a], a
+ ld [rNR30], a
ld b, $0
pop hl
jp Func_fc094
@@ -461,7 +461,7 @@ SFX_end: ; fc249 (3f:4249)
add c
ld e, a
ld d, b
- ld hl, $ff12
+ ld hl, rNR12
add hl, de
ld a, $8
ld [hli], a
@@ -481,14 +481,14 @@ Func_fc26c: ; fc26c (3f:426c)
Func_fc279: ; fc279 (3f:4279)
ld a, $8
- ld a, [$ff12]
- ld a, [$ff17]
- ld a, [$ff1c]
- ld a, [$ff21]
+ ld a, [rNR12]
+ ld a, [rNR22]
+ ld a, [rNR32]
+ ld a, [rNR42]
ld a, $80
- ld a, [$ff14]
- ld a, [$ff19]
- ld a, [$ff23]
+ ld a, [rNR14]
+ ld a, [rNR24]
+ ld a, [rNR44]
xor a
ld [$dd8c], a
ret
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-03 22:02:52 +0000