summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2016-04-09 15:47:28 -0500
committerdannye <corrnondacqb@yahoo.com>2016-04-09 15:47:28 -0500
commit9c57218a97f990348545e320a840ca7c0f46e50a (patch)
tree943b4878f51cb7fe1fb8c5700b4f609ab23fe360 /src
parent9518f4e113fcd9dfb734b979138a04ace11bf2ad (diff)
Lots of wram addresses
Diffstat (limited to 'src')
-rwxr-xr-xsrc/audio/music1.asm456
-rwxr-xr-xsrc/audio/music2.asm440
-rwxr-xr-xsrc/audio/sfx.asm32
-rwxr-xr-xsrc/engine/bank1.asm88
-rwxr-xr-xsrc/engine/bank1c.asm38
-rwxr-xr-xsrc/engine/bank2.asm78
-rwxr-xr-xsrc/engine/bank20.asm32
-rwxr-xr-xsrc/engine/bank3.asm340
-rwxr-xr-xsrc/engine/bank4.asm268
-rwxr-xr-xsrc/engine/bank6.asm2
-rwxr-xr-xsrc/engine/bank7.asm56
-rw-r--r--src/engine/effect_functions.asm4
-rwxr-xr-xsrc/engine/home.asm2
-rwxr-xr-xsrc/wram.asm543
14 files changed, 1423 insertions, 956 deletions
diff --git a/src/audio/music1.asm b/src/audio/music1.asm
index 8a9db6e..35a9a7b 100755
--- a/src/audio/music1.asm
+++ b/src/audio/music1.asm
@@ -36,7 +36,7 @@ Func_f4021: ; f4021 (3d:4021)
ld hl, NumberOfSongs1
cp [hl]
jr nc, .asm_f402b
- ld [$dd80], a
+ ld [wdd80], a
.asm_f402b
pop hl
ret
@@ -51,27 +51,27 @@ Func_f402d: ; f402d (3d:402d)
ld hl, Unknown_f4e85
add hl, bc
ld b, [hl]
- ld a, [$dd83]
+ ld a, [wdd83]
or a
jr z, .asm_f4043
cp b
jr c, .asm_f404b
.asm_f4043
ld a, b
- ld [$dd83], a
+ ld [wdd83], a
ld a, c
- ld [$dd82], a
+ ld [wdd82], a
.asm_f404b
pop hl
pop bc
ret
Func_f404e: ; f404e (3d:404e)
- ld [$ddf0], a
+ ld [wddf0], a
ret
Func_f4052: ; f4052 (3d:4052)
- ld a, [$dd80]
+ ld a, [wdd80]
cp $80
ld a, $1
ret nz
@@ -79,7 +79,7 @@ Func_f4052: ; f4052 (3d:4052)
ret
Func_f405c: ; f405c (3d:405c)
- ld a, [$dd82]
+ ld a, [wdd82]
cp $80
ld a, $1
ret nz
@@ -87,9 +87,9 @@ Func_f405c: ; f405c (3d:405c)
ret
Func_f4066: ; f4066 (3d:4066)
- ld a, [$ddf2]
+ ld a, [wddf2]
xor $1
- ld [$ddf2], a
+ ld [wddf2], a
ret
Func_f406f: ; f406f (3d:406f)
@@ -99,7 +99,7 @@ Func_f406f: ; f406f (3d:406f)
ld b, a
swap b
or b
- ld [$ddf1], a
+ ld [wMusicPanning], a
pop af
pop bc
ret
@@ -114,19 +114,19 @@ Func_f407d: ; f407d (3d:407d)
ld a, $ff
ld [rNR51], a
ld a, $3d
- ld [$dd81], a
+ ld [wdd81], a
ld a, $80
- ld [$dd80], a
- ld [$dd82], a
- ld a, $77
- ld [$ddf1], a
+ ld [wdd80], a
+ ld [wdd82], a
+ ld a, $77 ; set both speakers to max volume
+ ld [wMusicPanning], a
xor a
- ld [$dd8c], a
- ld [$de53], a
+ ld [wdd8c], a
+ ld [wde53], a
ld [wMusicWaveChange], a
- ld [$ddef], a
- ld [$ddf0], a
- ld [$ddf2], a
+ ld [wddef], a
+ ld [wddf0], a
+ ld [wddf2], a
dec a
ld [wMusicDC], a
ld de, $0001
@@ -167,10 +167,10 @@ Func_f40e9: ; f40e9 (3d:40e9)
call Func_f411c
ld hl, Func_fc003
call Bankswitch3dTo3f
- ld a, [$dd81]
+ ld a, [wdd81]
ldh [hBankROM], a
ld [MBC3RomBank], a
- ld a, [$ddf2]
+ ld a, [wddf2]
cp $0
jr z, .asm_f4109
call Func_f4980
@@ -186,65 +186,65 @@ Func_f40e9: ; f40e9 (3d:40e9)
ret
Func_f411c: ; f411c (3d:411c)
- ld a, [$dd80]
+ ld a, [wdd80]
rla
jr c, .asm_f4133
- call Func_f414b
- ld a, [$dd80]
+ call Music1_StopAllChannels
+ ld a, [wdd80]
call Music1_PlaySong
- ld a, [$dd80]
+ ld a, [wdd80]
or $80
- ld [$dd80], a
+ ld [wdd80], a
.asm_f4133
- ld a, [$dd82]
+ ld a, [wdd82]
rla
jr c, .asm_f414a
- ld a, [$dd82]
+ ld a, [wdd82]
ld hl, Func_fc000
call Bankswitch3dTo3f
- ld a, [$dd82]
+ ld a, [wdd82]
or $80
- ld [$dd82], a
+ ld [wdd82], a
.asm_f414a
ret
-Func_f414b: ; f414b (3d:414b)
- ld a, [$dd8c]
+Music1_StopAllChannels: ; f414b (3d:414b)
+ ld a, [wdd8c]
ld d, a
xor a
ld [wMusicIsPlaying], a
bit 0, d
- jr nz, .asm_f415f
+ jr nz, .stopChannel2
ld a, $8
ld [rNR12], a
swap a
ld [rNR14], a
-.asm_f415f
+.stopChannel2
xor a
- ld [$dd8e], a
+ ld [wMusicIsPlaying + 1], a
bit 1, d
- jr nz, .asm_f416f
+ jr nz, .stopChannel4
ld a, $8
ld [rNR22], a
swap a
ld [rNR24], a
-.asm_f416f
+.stopChannel4
xor a
- ld [$dd90], a
+ ld [wMusicIsPlaying + 3], a
bit 3, d
- jr nz, .asm_f417f
+ jr nz, .stopChannel3
ld a, $8
ld [rNR42], a
swap a
ld [rNR44], a
-.asm_f417f
+.stopChannel3
xor a
- ld [$dd8f], a
+ ld [wMusicIsPlaying + 2], a
bit 2, d
- jr nz, .asm_f418b
+ jr nz, .done
ld a, $0
ld [rNR32], a
-.asm_f418b
+.done
ret
; plays the song given by the id in a
@@ -255,7 +255,7 @@ Music1_PlaySong: ; f418c (3d:418c)
ld hl, SongBanks1
add hl, bc
ld a, [hl]
- ld [$dd81], a
+ ld [wdd81], a
ldh [hBankROM], a
ld [MBC3RomBank], a
pop af
@@ -273,17 +273,17 @@ Music1_PlaySong: ; f418c (3d:418c)
ld b, h
ld c, l
rr e
- jr nc, .asm_f41eb
+ jr nc, .noChannel1
ld a, [bc]
inc bc
- ld [$dd95], a
- ld [wMusicMainLoop], a
+ ld [wMusicChannelPointers], a
+ ld [wMusicMainLoopStart], a
ld a, [bc]
inc bc
- ld [$dd96], a
- ld [$dd9e], a
+ ld [wMusicChannelPointers + 1], a
+ ld [wMusicMainLoopStart + 1], a
ld a, $1
- ld [$ddbb], a
+ ld [wddbb], a
ld [wMusicIsPlaying], a
xor a
ld [wMusicTie], a
@@ -294,89 +294,89 @@ Music1_PlaySong: ; f418c (3d:418c)
ld a, [Unknown_f4c20]
ld [wMusicReturnAddress], a
ld a, [Unknown_f4c20 + 1]
- ld [$ddf4], a
+ ld [wMusicReturnAddress + 1], a
ld a, $8
ld [wMusicE9], a
-.asm_f41eb
+.noChannel1
rr e
- jr nc, .asm_f4228
+ jr nc, .noChannel2
ld a, [bc]
inc bc
- ld [$dd97], a
- ld [$dd9f], a
+ ld [wMusicChannelPointers + 2], a
+ ld [wMusicMainLoopStart + 2], a
ld a, [bc]
inc bc
- ld [$dd98], a
- ld [$dda0], a
+ ld [wMusicChannelPointers + 3], a
+ ld [wMusicMainLoopStart + 3], a
ld a, $1
- ld [$ddbc], a
- ld [$dd8e], a
+ ld [wddbb + 1], a
+ ld [wMusicIsPlaying + 1], a
xor a
- ld [$dd92], a
- ld [$ddeb], a
- ld [$ddc0], a
- ld [$dde0], a
- ld [$ddcc], a
+ ld [wMusicTie + 1], a
+ ld [wMusicE4 + 1], a
+ ld [wMusicE8 + 1], a
+ ld [wMusicVibratoDelay + 1], a
+ ld [wMusicEC + 1], a
ld a, [Unknown_f4c20 + 2]
- ld [$ddf5], a
+ ld [wMusicReturnAddress + 2], a
ld a, [Unknown_f4c20 + 3]
- ld [$ddf6], a
+ ld [wMusicReturnAddress + 3], a
ld a, $8
- ld [$ddc8], a
-.asm_f4228
+ ld [wMusicE9 + 1], a
+.noChannel2
rr e
- jr nc, .asm_f4265
+ jr nc, .noChannel3
ld a, [bc]
inc bc
- ld [$dd99], a
- ld [$dda1], a
+ ld [wMusicChannelPointers + 4], a
+ ld [wMusicMainLoopStart + 4], a
ld a, [bc]
inc bc
- ld [$dd9a], a
- ld [$dda2], a
+ ld [wMusicChannelPointers + 5], a
+ ld [wMusicMainLoopStart + 5], a
ld a, $1
- ld [$ddbd], a
- ld [$dd8f], a
+ ld [wddbb + 2], a
+ ld [wMusicIsPlaying + 2], a
xor a
- ld [$dd93], a
- ld [$ddec], a
- ld [$ddc1], a
- ld [$dde1], a
- ld [$ddcd], a
+ ld [wMusicTie + 2], a
+ ld [wMusicE4 + 2], a
+ ld [wMusicE8 + 2], a
+ ld [wMusicVibratoDelay + 2], a
+ ld [wMusicEC + 2], a
ld a, [Unknown_f4c20 + 4]
- ld [$ddf7], a
+ ld [wMusicReturnAddress + 4], a
ld a, [Unknown_f4c20 + 5]
- ld [$ddf8], a
+ ld [wMusicReturnAddress + 5], a
ld a, $40
- ld [$ddc9], a
-.asm_f4265
+ ld [wMusicE9 + 2], a
+.noChannel3
rr e
- jr nc, .asm_f429f
+ jr nc, .noChannel4
ld a, [bc]
inc bc
- ld [$dd9b], a
- ld [$dda3], a
+ ld [wMusicChannelPointers + 6], a
+ ld [wMusicMainLoopStart + 6], a
ld a, [bc]
inc bc
- ld [$dd9c], a
- ld [$dda4], a
+ ld [wMusicChannelPointers + 7], a
+ ld [wMusicMainLoopStart + 7], a
ld a, $1
- ld [$ddbe], a
- ld [$dd90], a
+ ld [wddbb + 3], a
+ ld [wMusicIsPlaying + 3], a
xor a
- ld [$dd94], a
- ld [$ddc2], a
- ld [$dde2], a
- ld [$ddce], a
+ ld [wMusicTie + 3], a
+ ld [wMusicE8 + 3], a
+ ld [wMusicVibratoDelay + 3], a
+ ld [wMusicEC + 3], a
ld a, [Unknown_f4c20 + 6]
- ld [$ddf9], a
+ ld [wMusicReturnAddress + 6], a
ld a, [Unknown_f4c20 + 7]
- ld [$ddfa], a
+ ld [wMusicReturnAddress + 7], a
ld a, $40
- ld [$ddca], a
-.asm_f429f
+ ld [wMusicE9 + 3], a
+.noChannel4
xor a
- ld [$ddf2], a
+ ld [wddf2], a
ret
Func_f42a4: ; f42a4 (3d:42a4)
@@ -386,17 +386,17 @@ Func_f42a5: ; f42a5 (3d:42a5)
ld a, [wMusicIsPlaying]
or a
jr z, .asm_f42fa
- ld a, [$ddb7]
+ ld a, [wddb7]
cp $0
jr z, .asm_f42d4
- ld a, [$ddc3]
+ ld a, [wddc3]
dec a
- ld [$ddc3], a
+ ld [wddc3], a
jr nz, .asm_f42d4
- ld a, [$ddbb]
+ ld a, [wddbb]
cp $1
jr z, .asm_f42d4
- ld a, [$dd8c]
+ ld a, [wdd8c]
bit 0, a
jr nz, .asm_f42d4
ld hl, rNR12
@@ -406,13 +406,13 @@ Func_f42a5: ; f42a5 (3d:42a5)
ld a, $80
ld [hl], a
.asm_f42d4
- ld a, [$ddbb]
+ ld a, [wddbb]
dec a
- ld [$ddbb], a
+ ld [wddbb], a
jr nz, .asm_f42f4
- ld a, [$dd96]
+ ld a, [wMusicChannelPointers + 1]
ld h, a
- ld a, [$dd95]
+ ld a, [wMusicChannelPointers]
ld l, a
ld bc, $0000
call Music1_PlayNextNote
@@ -425,7 +425,7 @@ Func_f42a5: ; f42a5 (3d:42a5)
call Func_f485a
ret
.asm_f42fa
- ld a, [$dd8c]
+ ld a, [wdd8c]
bit 0, a
jr nz, .asm_f4309
ld a, $8
@@ -436,40 +436,40 @@ Func_f42a5: ; f42a5 (3d:42a5)
ret
Func_f430a: ; f430a (3d:430a)
- ld a, [$dd8e]
+ ld a, [wMusicIsPlaying + 1]
or a
jr z, .asm_f435f
- ld a, [$ddb8]
+ ld a, [wddb8]
cp $0
jr z, .asm_f4339
- ld a, [$ddc4]
+ ld a, [wddc3 + 1]
dec a
- ld [$ddc4], a
+ ld [wddc3 + 1], a
jr nz, .asm_f4339
- ld a, [$ddbc]
+ ld a, [wddbb + 1]
cp $1
jr z, .asm_f4339
- ld a, [$dd8c]
+ ld a, [wdd8c]
bit 1, a
jr nz, .asm_f4339
ld hl, rNR22
- ld a, [$ddc8]
+ ld a, [wMusicE9 + 1]
ld [hli], a
inc hl
ld a, $80
ld [hl], a
.asm_f4339
- ld a, [$ddbc]
+ ld a, [wddbb + 1]
dec a
- ld [$ddbc], a
+ ld [wddbb + 1], a
jr nz, .asm_f4359
- ld a, [$dd98]
+ ld a, [wMusicChannelPointers + 3]
ld h, a
- ld a, [$dd97]
+ ld a, [wMusicChannelPointers + 2]
ld l, a
ld bc, $0001
call Music1_PlayNextNote
- ld a, [$dd8e]
+ ld a, [wMusicIsPlaying + 1]
or a
jr z, .asm_f435f
call Func_f475a
@@ -478,7 +478,7 @@ Func_f430a: ; f430a (3d:430a)
call Func_f485a
ret
.asm_f435f
- ld a, [$dd8c]
+ ld a, [wdd8c]
bit 1, a
jr nz, .asm_f436e
ld a, $8
@@ -489,36 +489,36 @@ Func_f430a: ; f430a (3d:430a)
ret
Func_f436f: ; f436f (3d:436f)
- ld a, [$dd8f]
+ ld a, [wMusicIsPlaying + 2]
or a
jr z, .asm_f43be
- ld a, [$ddb9]
+ ld a, [wddb9]
cp $0
jr z, .asm_f4398
- ld a, [$ddc5]
+ ld a, [wddc3 + 2]
dec a
- ld [$ddc5], a
+ ld [wddc3 + 2], a
jr nz, .asm_f4398
- ld a, [$dd8c]
+ ld a, [wdd8c]
bit 2, a
jr nz, .asm_f4398
- ld a, [$ddbd]
+ ld a, [wddbb + 2]
cp $1
jr z, .asm_f4398
- ld a, [$ddc9]
+ ld a, [wMusicE9 + 2]
ld [rNR32], a
.asm_f4398
- ld a, [$ddbd]
+ ld a, [wddbb + 2]
dec a
- ld [$ddbd], a
+ ld [wddbb + 2], a
jr nz, .asm_f43b8
- ld a, [$dd9a]
+ ld a, [wMusicChannelPointers + 5]
ld h, a
- ld a, [$dd99]
+ ld a, [wMusicChannelPointers + 4]
ld l, a
ld bc, $0002
call Music1_PlayNextNote
- ld a, [$dd8f]
+ ld a, [wMusicIsPlaying + 2]
or a
jr z, .asm_f43be
call Func_f479c
@@ -527,7 +527,7 @@ Func_f436f: ; f436f (3d:436f)
call Func_f485a
ret
.asm_f43be
- ld a, [$dd8c]
+ ld a, [wdd8c]
bit 2, a
jr nz, .asm_f43cd
ld a, $0
@@ -538,36 +538,36 @@ Func_f436f: ; f436f (3d:436f)
ret
Func_f43ce: ; f43ce (3d:43ce)
- ld a, [$dd90]
+ ld a, [wMusicIsPlaying + 3]
or a
jr z, .asm_f4400
- ld a, [$ddbe]
+ ld a, [wddbb + 3]
dec a
- ld [$ddbe], a
+ ld [wddbb + 3], a
jr nz, .asm_f43f6
- ld a, [$dd9c]
+ ld a, [wMusicChannelPointers + 7]
ld h, a
- ld a, [$dd9b]
+ ld a, [wMusicChannelPointers + 6]
ld l, a
ld bc, $0003
call Music1_PlayNextNote
- ld a, [$dd90]
+ ld a, [wMusicIsPlaying + 3]
or a
jr z, .asm_f4400
call Func_f480a
jr .asm_f4413
.asm_f43f6
- ld a, [$ddef]
+ ld a, [wddef]
or a
jr z, .asm_f4413
call Func_f4839
ret
.asm_f4400
- ld a, [$dd8c]
+ ld a, [wdd8c]
bit 3, a
jr nz, .asm_f4413
xor a
- ld [$ddef], a
+ ld [wddef], a
ld a, $8
ld [rNR42], a
swap a
@@ -797,7 +797,7 @@ Music1_note: ; f448c (3d:448c)
ld [hli], a
ld [hl], d
ld a, $1
- ld [$ddef], a
+ ld [wddef], a
jr .asm_f458e
.asm_f4564
ld hl, $dda5
@@ -911,7 +911,7 @@ Music1_MainLoop: ; f45ef (3d:45ef)
pop de
push de
dec de
- ld hl, wMusicMainLoop
+ ld hl, wMusicMainLoopStart
add hl, bc
add hl, bc
ld [hl], e
@@ -921,7 +921,7 @@ Music1_MainLoop: ; f45ef (3d:45ef)
Music1_EndMainLoop: ; f45fd (3d:45fd)
pop hl
- ld hl, wMusicMainLoop
+ ld hl, wMusicMainLoopStart
add hl, bc
add hl, bc
ld a, [hli]
@@ -1020,7 +1020,7 @@ Music1_duty: ; f4674 (3d:4674)
ld a, [de]
and $c0
inc de
- ld hl, wMusicDuty
+ ld hl, wMusicDuty1
add hl, bc
ld [hl], a
ld h, d
@@ -1155,10 +1155,10 @@ Music1_PlayNextNote_pop ; f4710 (3d:4710)
jp Music1_PlayNextNote
Func_f4714: ; f4714 (3d:4714)
- ld a, [$dd8c]
+ ld a, [wdd8c]
bit 0, a
jr nz, .asm_f4749
- ld a, [$ddb7]
+ ld a, [wddb7]
cp $0
jr z, .asm_f474a
ld d, $0
@@ -1173,11 +1173,11 @@ Func_f4714: ; f4714 (3d:4714)
ld [hl], $2
ld a, $8
ld [rNR10], a
- ld a, [wMusicDuty]
+ ld a, [wMusicDuty1]
ld [rNR11], a
- ld a, [$dda5]
+ ld a, [wMusicCh1CurPitch]
ld [rNR13], a
- ld a, [$dda6]
+ ld a, [wMusicCh1CurOctave]
or d
ld [rNR14], a
.asm_f4749
@@ -1194,10 +1194,10 @@ Func_f4714: ; f4714 (3d:4714)
ret
Func_f475a: ; f475a (3d:475a)
- ld a, [$dd8c]
+ ld a, [wdd8c]
bit 1, a
jr nz, .asm_f478b
- ld a, [$ddb8]
+ ld a, [wddb8]
cp $0
jr z, .asm_f478c
ld d, $0
@@ -1205,16 +1205,16 @@ Func_f475a: ; f475a (3d:475a)
ld a, [hl]
cp $80
jr z, .asm_f4779
- ld a, [$dde8]
+ ld a, [wMusicVolume + 1]
ld [rNR22], a
ld d, $80
.asm_f4779
ld [hl], $2
- ld a, [$dd87]
+ ld a, [wMusicDuty2]
ld [rNR21], a
- ld a, [$dda7]
+ ld a, [wMusicCh2CurPitch]
ld [rNR23], a
- ld a, [$dda8]
+ ld a, [wMusicCh2CurOctave]
or d
ld [rNR24], a
.asm_f478b
@@ -1231,7 +1231,7 @@ Func_f475a: ; f475a (3d:475a)
ret
Func_f479c: ; f479c (3d:479c)
- ld a, [$dd8c]
+ ld a, [wdd8c]
bit 2, a
jr nz, .asm_f47e0
ld d, $0
@@ -1243,14 +1243,14 @@ Func_f479c: ; f479c (3d:479c)
call Func_f47ea
ld d, $80
.asm_f47b3
- ld a, [$ddb9]
+ ld a, [wddb9]
cp $0
jr z, .asm_f47e1
ld hl, $dd93
ld a, [hl]
cp $80
jr z, .asm_f47cc
- ld a, [$dde9]
+ ld a, [wMusicVolume + 2]
ld [rNR32], a
xor a
ld [rNR30], a
@@ -1259,11 +1259,11 @@ Func_f479c: ; f479c (3d:479c)
ld [hl], $2
xor a
ld [rNR31], a
- ld a, [$dda9]
+ ld a, [wMusicCh3CurPitch]
ld [rNR33], a
ld a, $80
ld [rNR30], a
- ld a, [$ddaa]
+ ld a, [wMusicCh3CurOctave]
or d
ld [rNR34], a
.asm_f47e0
@@ -1300,10 +1300,10 @@ Func_f47ea: ; f479c (3d:47ea)
ret
Func_f480a: ; f480a (3d:480a)
- ld a, [$dd8c]
+ ld a, [wdd8c]
bit 3, a
jr nz, .asm_f4829
- ld a, [$ddba]
+ ld a, [wddba]
cp $0
jr z, asm_f482a
ld de, rNR41
@@ -1323,7 +1323,7 @@ Func_f480a: ; f480a (3d:480a)
ret
asm_f482a
xor a
- ld [$ddef], a
+ ld [wddef], a
ld hl, rNR42
ld a, $8
ld [hli], a
@@ -1333,11 +1333,11 @@ asm_f482a
ret
Func_f4839: ; f4839 (3d:4839)
- ld a, [$dd8c]
+ ld a, [wdd8c]
bit 3, a
jr z, .asm_f4846
xor a
- ld [$ddef], a
+ ld [wddef], a
jr .asm_f4859
.asm_f4846
ld hl, $dded
@@ -1367,14 +1367,14 @@ Func_f485a: ; f485a (3d:485a)
ret
Func_f4866: ; f4866 (3d:4866)
- ld a, [$ddf1]
+ ld a, [wMusicPanning]
ld [rNR50], a
- ld a, [$dd8c]
+ ld a, [wdd8c]
or a
ld hl, wMusicDC
ld a, [hli]
jr z, .asm_f4888
- ld a, [$dd8c]
+ ld a, [wdd8c]
and $f
ld d, a
swap d
@@ -1390,7 +1390,7 @@ Func_f4866: ; f4866 (3d:4866)
or d
.asm_f4888
ld d, a
- ld a, [$ddf0]
+ ld a, [wddf0]
xor $ff
and $f
ld e, a
@@ -1487,13 +1487,13 @@ Func_f4898: ; f4898 (3d:4898)
Func_f490b: ; f490b (3d:490b)
cp $0
- jr nz, .asm_f492c
+ jr nz, .notChannel1
ld a, [wMusicVibratoDelay]
cp $0
- jr z, .asm_f4966
- ld a, [$dd8c]
+ jr z, .done
+ ld a, [wdd8c]
bit 0, a
- jr nz, .asm_f4966
+ jr nz, .done
ld a, e
ld [rNR13], a
ld a, [rNR11]
@@ -1503,15 +1503,15 @@ Func_f490b: ; f490b (3d:490b)
and $3f
ld [rNR14], a
ret
-.asm_f492c
+.notChannel1
cp $1
- jr nz, .asm_f494b
- ld a, [$dde0]
+ jr nz, .notChannel2
+ ld a, [wMusicVibratoDelay + 1]
cp $0
- jr z, .asm_f4966
- ld a, [$dd8c]
+ jr z, .done
+ ld a, [wdd8c]
bit 1, a
- jr nz, .asm_f4966
+ jr nz, .done
ld a, e
ld [rNR23], a
ld a, [rNR21]
@@ -1520,22 +1520,22 @@ Func_f490b: ; f490b (3d:490b)
ld a, d
ld [rNR24], a
ret
-.asm_f494b
+.notChannel2
cp $2
- jr nz, .asm_f4966
- ld a, [$dde1]
+ jr nz, .done
+ ld a, [wMusicVibratoDelay + 2]
cp $0
- jr z, .asm_f4966
- ld a, [$dd8c]
+ jr z, .done
+ ld a, [wdd8c]
bit 2, a
- jr nz, .asm_f4966
+ jr nz, .done
ld a, e
ld [rNR33], a
xor a
ld [rNR31], a
ld a, d
ld [rNR34], a
-.asm_f4966
+.done
ret
Func_f4967: ; f4967 (3d:4967)
@@ -1562,7 +1562,7 @@ Func_f4967: ; f4967 (3d:4967)
ret
Func_f4980: ; f4980 (3d:4980)
- ld a, [$dd8c]
+ ld a, [wdd8c]
ld d, a
bit 0, d
jr nz, .asm_f4990
@@ -1605,40 +1605,40 @@ Func_f49b1: ; f49b1 (3d:49b1)
or a
ret nz
ld a, $80
- ld [$dd80], a
+ ld [wdd80], a
ret
Func_f49c4: ; f49c4 (3d:49c4)
di
call Func_f4980
call Func_f49dc
- call Func_f414b
+ call Music1_StopAllChannels
ei
ret
Func_f49d0: ; f49d0 (3d:49d0)
di
call Func_f4980
- call Func_f414b
+ call Music1_StopAllChannels
call Func_f4b01
ei
ret
Func_f49dc: ; f49dc (3d:49dc)
- ld a, [$dd80]
- ld [$de55], a
- ld a, [$dd81]
- ld [$de56], a
+ ld a, [wdd80]
+ ld [wde55], a
+ ld a, [wdd81]
+ ld [wde56], a
ld a, [wMusicDC]
- ld [$de57], a
- ld hl, wMusicDuty
+ ld [wde57], a
+ ld hl, wMusicDuty1
ld de, $de58
ld a, $4
call Music1_CopyData
ld a, [wMusicWave]
- ld [$de5c], a
+ ld [wde5c], a
ld a, [wMusicWaveChange]
- ld [$de5d], a
+ ld [wde5d], a
ld hl, wMusicIsPlaying
ld de, $de5e
ld a, $4
@@ -1651,14 +1651,14 @@ Func_f49dc: ; f49dc (3d:49dc)
ld de, $de66
ld a, $8
call Music1_CopyData
- ld hl, wMusicMainLoop
+ ld hl, wMusicMainLoopStart
ld de, $de6e
ld a, $8
call Music1_CopyData
- ld a, [$ddab]
- ld [$de76], a
- ld a, [$ddac]
- ld [$de77], a
+ ld a, [wddab]
+ ld [wde76], a
+ ld a, [wddac]
+ ld [wde77], a
ld hl, wMusicOctave
ld de, $de78
ld a, $4
@@ -1704,10 +1704,10 @@ Func_f49dc: ; f49dc (3d:49dc)
ld a, $4
call Music1_CopyData
ld a, $0
- ld [$dddb], a
- ld [$dddc], a
- ld [$dddd], a
- ld [$ddde], a
+ ld [wdddb], a
+ ld [wdddb + 1], a
+ ld [wdddb + 2], a
+ ld [wdddb + 3], a
ld hl, wMusicVolume
ld de, $dea4
ld a, $3
@@ -1721,7 +1721,7 @@ Func_f49dc: ; f49dc (3d:49dc)
ld a, $2
call Music1_CopyData
ld a, $0
- ld [$deac], a
+ ld [wdeac], a
ld hl, wMusicReturnAddress
ld de, $dead
ld a, $8
@@ -1733,17 +1733,17 @@ Func_f49dc: ; f49dc (3d:49dc)
ret
Func_f4b01: ; f4b01 (3d:4b01)
- ld a, [$de55]
- ld [$dd80], a
- ld a, [$de56]
- ld [$dd81], a
- ld a, [$de57]
+ ld a, [wde55]
+ ld [wdd80], a
+ ld a, [wde56]
+ ld [wdd81], a
+ ld a, [wde57]
ld [wMusicDC], a
ld hl, $de58
- ld de, wMusicDuty
+ ld de, wMusicDuty1
ld a, $4
call Music1_CopyData
- ld a, [$de5c]
+ ld a, [wde5c]
ld [wMusicWave], a
ld a, $1
ld [wMusicWaveChange], a
@@ -1760,13 +1760,13 @@ Func_f4b01: ; f4b01 (3d:4b01)
ld a, $8
call Music1_CopyData
ld hl, $de6e
- ld de, wMusicMainLoop
+ ld de, wMusicMainLoopStart
ld a, $8
call Music1_CopyData
- ld a, [$de76]
- ld [$ddab], a
- ld a, [$de77]
- ld [$ddac], a
+ ld a, [wde76]
+ ld [wddab], a
+ ld a, [wde77]
+ ld [wddac], a
ld hl, $de78
ld de, wMusicOctave
ld a, $4
@@ -1823,8 +1823,8 @@ Func_f4b01: ; f4b01 (3d:4b01)
ld de, $dded
ld a, $2
call Music1_CopyData
- ld a, [$deac]
- ld [$ddef], a
+ ld a, [wdeac]
+ ld [wddef], a
ld hl, $dead
ld de, wMusicReturnAddress
ld a, $8
diff --git a/src/audio/music2.asm b/src/audio/music2.asm
index 3fb7993..5bdc8d3 100755
--- a/src/audio/music2.asm
+++ b/src/audio/music2.asm
@@ -36,7 +36,7 @@ Func_f8021: ; f8021 (3e:4021)
ld hl, NumberOfSongs2
cp [hl]
jr nc, .asm_f802b
- ld [$dd80], a
+ ld [wdd80], a
.asm_f802b
pop hl
ret
@@ -51,27 +51,27 @@ Func_f802d: ; f802d (3e:402d)
ld hl, Unknown_f8e85
add hl, bc
ld b, [hl]
- ld a, [$dd83]
+ ld a, [wdd83]
or a
jr z, .asm_f8043
cp b
jr c, .asm_f804b
.asm_f8043
ld a, b
- ld [$dd83], a
+ ld [wdd83], a
ld a, c
- ld [$dd82], a
+ ld [wdd82], a
.asm_f804b
pop hl
pop bc
ret
Func_f804e: ; f804e (3e:404e)
- ld [$ddf0], a
+ ld [wddf0], a
ret
Func_f8052: ; f8052 (3e:4052)
- ld a, [$dd80]
+ ld a, [wdd80]
cp $80
ld a, $1
ret nz
@@ -79,7 +79,7 @@ Func_f8052: ; f8052 (3e:4052)
ret
Func_f805c: ; f805c (3e:405c)
- ld a, [$dd82]
+ ld a, [wdd82]
cp $80
ld a, $1
ret nz
@@ -87,9 +87,9 @@ Func_f805c: ; f805c (3e:405c)
ret
Func_f8066: ; f8066 (3e:4066)
- ld a, [$ddf2]
+ ld a, [wddf2]
xor $1
- ld [$ddf2], a
+ ld [wddf2], a
ret
Func_f806f: ; f806f (3e:406f)
@@ -99,7 +99,7 @@ Func_f806f: ; f806f (3e:406f)
ld b, a
swap b
or b
- ld [$ddf1], a
+ ld [wMusicPanning], a
pop af
pop bc
ret
@@ -114,19 +114,19 @@ Func_f807d: ; f807d (3e:407d)
ld a, $ff
ld [rNR51], a
ld a, $3d
- ld [$dd81], a
+ ld [wdd81], a
ld a, $80
- ld [$dd80], a
- ld [$dd82], a
- ld a, $77
- ld [$ddf1], a
+ ld [wdd80], a
+ ld [wdd82], a
+ ld a, $77 ; set both speakers to max volume
+ ld [wMusicPanning], a
xor a
- ld [$dd8c], a
- ld [$de53], a
+ ld [wdd8c], a
+ ld [wde53], a
ld [wMusicWaveChange], a
- ld [$ddef], a
- ld [$ddf0], a
- ld [$ddf2], a
+ ld [wddef], a
+ ld [wddf0], a
+ ld [wddf2], a
dec a
ld [wMusicDC], a
ld de, $0001
@@ -167,10 +167,10 @@ Func_f80e9: ; f80e9 (3e:40e9)
call Func_f811c
ld hl, Func_fc003
call Bankswitch3dTo3f
- ld a, [$dd81]
+ ld a, [wdd81]
ldh [hBankROM], a
ld [MBC3RomBank], a
- ld a, [$ddf2]
+ ld a, [wddf2]
cp $0
jr z, .asm_f8109
call Func_f8980
@@ -186,65 +186,65 @@ Func_f80e9: ; f80e9 (3e:40e9)
ret
Func_f811c: ; f811c (3e:411c)
- ld a, [$dd80]
+ ld a, [wdd80]
rla
jr c, .asm_f8133
call Func_f814b
- ld a, [$dd80]
+ ld a, [wdd80]
call Music2_PlaySong
- ld a, [$dd80]
+ ld a, [wdd80]
or $80
- ld [$dd80], a
+ ld [wdd80], a
.asm_f8133
- ld a, [$dd82]
+ ld a, [wdd82]
rla
jr c, .asm_f814a
- ld a, [$dd82]
+ ld a, [wdd82]
ld hl, Func_fc000
call Bankswitch3dTo3f
- ld a, [$dd82]
+ ld a, [wdd82]
or $80
- ld [$dd82], a
+ ld [wdd82], a
.asm_f814a
ret
Func_f814b: ; f814b (3e:414b)
- ld a, [$dd8c]
+ ld a, [wdd8c]
ld d, a
xor a
ld [wMusicIsPlaying], a
bit 0, d
- jr nz, .asm_f815f
+ jr nz, .stopChannel2
ld a, $8
ld [rNR12], a
swap a
ld [rNR14], a
-.asm_f815f
+.stopChannel2
xor a
- ld [$dd8e], a
+ ld [wMusicIsPlaying + 1], a
bit 1, d
- jr nz, .asm_f816f
+ jr nz, .stopChannel4
ld a, $8
ld [rNR22], a
swap a
ld [rNR24], a
-.asm_f816f
+.stopChannel4
xor a
- ld [$dd90], a
+ ld [wMusicIsPlaying + 3], a
bit 3, d
- jr nz, .asm_f817f
+ jr nz, .stopChannel3
ld a, $8
ld [rNR42], a
swap a
ld [rNR44], a
-.asm_f817f
+.stopChannel3
xor a
- ld [$dd8f], a
+ ld [wMusicIsPlaying + 2], a
bit 2, d
- jr nz, .asm_f818b
+ jr nz, .done
ld a, $0
ld [rNR32], a
-.asm_f818b
+.done
ret
; plays the song given by the id in a
@@ -255,7 +255,7 @@ Music2_PlaySong: ; f818c (3e:418c)
ld hl, SongBanks2
add hl, bc
ld a, [hl]
- ld [$dd81], a
+ ld [wdd81], a
ldh [hBankROM], a
ld [MBC3RomBank], a
pop af
@@ -273,17 +273,17 @@ Music2_PlaySong: ; f818c (3e:418c)
ld b, h
ld c, l
rr e
- jr nc, .asm_f81eb
+ jr nc, .noChannel1
ld a, [bc]
inc bc
- ld [$dd95], a
- ld [wMusicMainLoop], a
+ ld [wMusicChannelPointers], a
+ ld [wMusicMainLoopStart], a
ld a, [bc]
inc bc
- ld [$dd96], a
- ld [$dd9e], a
+ ld [wMusicChannelPointers + 1], a
+ ld [wMusicMainLoopStart + 1], a
ld a, $1
- ld [$ddbb], a
+ ld [wddbb], a
ld [wMusicIsPlaying], a
xor a
ld [wMusicTie], a
@@ -291,92 +291,92 @@ Music2_PlaySong: ; f818c (3e:418c)
ld [wMusicE8], a
ld [wMusicVibratoDelay], a
ld [wMusicEC], a
- ld a, [Unknown_f8c20]
+ ld a, [Unknown_f4c20]
ld [wMusicReturnAddress], a
- ld a, [Unknown_f8c20 + 1]
- ld [$ddf4], a
+ ld a, [Unknown_f4c20 + 1]
+ ld [wMusicReturnAddress + 1], a
ld a, $8
ld [wMusicE9], a
-.asm_f81eb
+.noChannel1
rr e
- jr nc, .asm_f8228
+ jr nc, .noChannel2
ld a, [bc]
inc bc
- ld [$dd97], a
- ld [$dd9f], a
+ ld [wMusicChannelPointers + 2], a
+ ld [wMusicMainLoopStart + 2], a
ld a, [bc]
inc bc
- ld [$dd98], a
- ld [$dda0], a
+ ld [wMusicChannelPointers + 3], a
+ ld [wMusicMainLoopStart + 3], a
ld a, $1
- ld [$ddbc], a
- ld [$dd8e], a
+ ld [wddbb + 1], a
+ ld [wMusicIsPlaying + 1], a
xor a
- ld [$dd92], a
- ld [$ddeb], a
- ld [$ddc0], a
- ld [$dde0], a
- ld [$ddcc], a
- ld a, [Unknown_f8c20 + 2]
- ld [$ddf5], a
- ld a, [Unknown_f8c20 + 3]
- ld [$ddf6], a
+ ld [wMusicTie + 1], a
+ ld [wMusicE4 + 1], a
+ ld [wMusicE8 + 1], a
+ ld [wMusicVibratoDelay + 1], a
+ ld [wMusicEC + 1], a
+ ld a, [Unknown_f4c20 + 2]
+ ld [wMusicReturnAddress + 2], a
+ ld a, [Unknown_f4c20 + 3]
+ ld [wMusicReturnAddress + 3], a
ld a, $8
- ld [$ddc8], a
-.asm_f8228
+ ld [wMusicE9 + 1], a
+.noChannel2
rr e
- jr nc, .asm_f8265
+ jr nc, .noChannel3
ld a, [bc]
inc bc
- ld [$dd99], a
- ld [$dda1], a
+ ld [wMusicChannelPointers + 4], a
+ ld [wMusicMainLoopStart + 4], a
ld a, [bc]
inc bc
- ld [$dd9a], a
- ld [$dda2], a
+ ld [wMusicChannelPointers + 5], a
+ ld [wMusicMainLoopStart + 5], a
ld a, $1
- ld [$ddbd], a
- ld [$dd8f], a
+ ld [wddbb + 2], a
+ ld [wMusicIsPlaying + 2], a
xor a
- ld [$dd93], a
- ld [$ddec], a
- ld [$ddc1], a
- ld [$dde1], a
- ld [$ddcd], a
- ld a, [Unknown_f8c20 + 4]
- ld [$ddf7], a
- ld a, [Unknown_f8c20 + 5]
- ld [$ddf8], a
+ ld [wMusicTie + 2], a
+ ld [wMusicE4 + 2], a
+ ld [wMusicE8 + 2], a
+ ld [wMusicVibratoDelay + 2], a
+ ld [wMusicEC + 2], a
+ ld a, [Unknown_f4c20 + 4]
+ ld [wMusicReturnAddress + 4], a
+ ld a, [Unknown_f4c20 + 5]
+ ld [wMusicReturnAddress + 5], a
ld a, $40
- ld [$ddc9], a
-.asm_f8265
+ ld [wMusicE9 + 2], a
+.noChannel3
rr e
- jr nc, .asm_f829f
+ jr nc, .noChannel4
ld a, [bc]
inc bc
- ld [$dd9b], a
- ld [$dda3], a
+ ld [wMusicChannelPointers + 6], a
+ ld [wMusicMainLoopStart + 6], a
ld a, [bc]
inc bc
- ld [$dd9c], a
- ld [$dda4], a
+ ld [wMusicChannelPointers + 7], a
+ ld [wMusicMainLoopStart + 7], a
ld a, $1
- ld [$ddbe], a
- ld [$dd90], a
+ ld [wddbb + 3], a
+ ld [wMusicIsPlaying + 3], a
xor a
- ld [$dd94], a
- ld [$ddc2], a
- ld [$dde2], a
- ld [$ddce], a
- ld a, [Unknown_f8c20 + 6]
- ld [$ddf9], a
- ld a, [Unknown_f8c20 + 7]
- ld [$ddfa], a
+ ld [wMusicTie + 3], a
+ ld [wMusicE8 + 3], a
+ ld [wMusicVibratoDelay + 3], a
+ ld [wMusicEC + 3], a
+ ld a, [Unknown_f4c20 + 6]
+ ld [wMusicReturnAddress + 6], a
+ ld a, [Unknown_f4c20 + 7]
+ ld [wMusicReturnAddress + 7], a
ld a, $40
- ld [$ddca], a
-.asm_f829f
+ ld [wMusicE9 + 3], a
+.noChannel4
xor a
- ld [$ddf2], a
+ ld [wddf2], a
ret
Func_f82a4: ; f82a4 (3e:42a4)
@@ -386,17 +386,17 @@ Func_f82a5: ; f82a5 (3e:42a5)
ld a, [wMusicIsPlaying]
or a
jr z, .asm_f82fa
- ld a, [$ddb7]
+ ld a, [wddb7]
cp $0
jr z, .asm_f82d4
- ld a, [$ddc3]
+ ld a, [wddc3]
dec a
- ld [$ddc3], a
+ ld [wddc3], a
jr nz, .asm_f82d4
- ld a, [$ddbb]
+ ld a, [wddbb]
cp $1
jr z, .asm_f82d4
- ld a, [$dd8c]
+ ld a, [wdd8c]
bit 0, a
jr nz, .asm_f82d4
ld hl, rNR12
@@ -406,13 +406,13 @@ Func_f82a5: ; f82a5 (3e:42a5)
ld a, $80
ld [hl], a
.asm_f82d4
- ld a, [$ddbb]
+ ld a, [wddbb]
dec a
- ld [$ddbb], a
+ ld [wddbb], a
jr nz, .asm_f82f4
- ld a, [$dd96]
+ ld a, [wMusicChannelPointers + 1]
ld h, a
- ld a, [$dd95]
+ ld a, [wMusicChannelPointers]
ld l, a
ld bc, $0000
call Music2_PlayNextNote
@@ -425,7 +425,7 @@ Func_f82a5: ; f82a5 (3e:42a5)
call Func_f885a
ret
.asm_f82fa
- ld a, [$dd8c]
+ ld a, [wdd8c]
bit 0, a
jr nz, .asm_f8309
ld a, $8
@@ -436,40 +436,40 @@ Func_f82a5: ; f82a5 (3e:42a5)
ret
Func_f830a: ; f830a (3e:430a)
- ld a, [$dd8e]
+ ld a, [wMusicIsPlaying + 1]
or a
jr z, .asm_f835f
- ld a, [$ddb8]
+ ld a, [wddb8]
cp $0
jr z, .asm_f8339
- ld a, [$ddc4]
+ ld a, [wddc3 + 1]
dec a
- ld [$ddc4], a
+ ld [wddc3 + 1], a
jr nz, .asm_f8339
- ld a, [$ddbc]
+ ld a, [wddbb + 1]
cp $1
jr z, .asm_f8339
- ld a, [$dd8c]
+ ld a, [wdd8c]
bit 1, a
jr nz, .asm_f8339
ld hl, rNR22
- ld a, [$ddc8]
+ ld a, [wMusicE9 + 1]
ld [hli], a
inc hl
ld a, $80
ld [hl], a
.asm_f8339
- ld a, [$ddbc]
+ ld a, [wddbb + 1]
dec a
- ld [$ddbc], a
+ ld [wddbb + 1], a
jr nz, .asm_f8359
- ld a, [$dd98]
+ ld a, [wMusicChannelPointers + 3]
ld h, a
- ld a, [$dd97]
+ ld a, [wMusicChannelPointers + 2]
ld l, a
ld bc, $0001
call Music2_PlayNextNote
- ld a, [$dd8e]
+ ld a, [wMusicIsPlaying + 1]
or a
jr z, .asm_f835f
call Func_f875a
@@ -478,7 +478,7 @@ Func_f830a: ; f830a (3e:430a)
call Func_f885a
ret
.asm_f835f
- ld a, [$dd8c]
+ ld a, [wdd8c]
bit 1, a
jr nz, .asm_f836e
ld a, $8
@@ -489,36 +489,36 @@ Func_f830a: ; f830a (3e:430a)
ret
Func_f836f: ; f836f (3e:436f)
- ld a, [$dd8f]
+ ld a, [wMusicIsPlaying + 2]
or a
jr z, .asm_f83be
- ld a, [$ddb9]
+ ld a, [wddb9]
cp $0
jr z, .asm_f8398
- ld a, [$ddc5]
+ ld a, [wddc3 + 2]
dec a
- ld [$ddc5], a
+ ld [wddc3 + 2], a
jr nz, .asm_f8398
- ld a, [$dd8c]
+ ld a, [wdd8c]
bit 2, a
jr nz, .asm_f8398
- ld a, [$ddbd]
+ ld a, [wddbb + 2]
cp $1
jr z, .asm_f8398
- ld a, [$ddc9]
+ ld a, [wMusicE9 + 2]
ld [rNR32], a
.asm_f8398
- ld a, [$ddbd]
+ ld a, [wddbb + 2]
dec a
- ld [$ddbd], a
+ ld [wddbb + 2], a
jr nz, .asm_f83b8
- ld a, [$dd9a]
+ ld a, [wMusicChannelPointers + 5]
ld h, a
- ld a, [$dd99]
+ ld a, [wMusicChannelPointers + 4]
ld l, a
ld bc, $0002
call Music2_PlayNextNote
- ld a, [$dd8f]
+ ld a, [wMusicIsPlaying + 2]
or a
jr z, .asm_f83be
call Func_f879c
@@ -527,7 +527,7 @@ Func_f836f: ; f836f (3e:436f)
call Func_f885a
ret
.asm_f83be
- ld a, [$dd8c]
+ ld a, [wdd8c]
bit 2, a
jr nz, .asm_f83cd
ld a, $0
@@ -538,36 +538,36 @@ Func_f836f: ; f836f (3e:436f)
ret
Func_f83ce: ; f83ce (3e:43ce)
- ld a, [$dd90]
+ ld a, [wMusicIsPlaying + 3]
or a
jr z, .asm_f8400
- ld a, [$ddbe]
+ ld a, [wddbb + 3]
dec a
- ld [$ddbe], a
+ ld [wddbb + 3], a
jr nz, .asm_f83f6
- ld a, [$dd9c]
+ ld a, [wMusicChannelPointers + 7]
ld h, a
- ld a, [$dd9b]
+ ld a, [wMusicChannelPointers + 6]
ld l, a
ld bc, $0003
call Music2_PlayNextNote
- ld a, [$dd90]
+ ld a, [wMusicIsPlaying + 3]
or a
jr z, .asm_f8400
call Func_f880a
jr .asm_f8413
.asm_f83f6
- ld a, [$ddef]
+ ld a, [wddef]
or a
jr z, .asm_f8413
call Func_f8839
ret
.asm_f8400
- ld a, [$dd8c]
+ ld a, [wdd8c]
bit 3, a
jr nz, .asm_f8413
xor a
- ld [$ddef], a
+ ld [wddef], a
ld a, $8
ld [rNR42], a
swap a
@@ -797,7 +797,7 @@ Music2_note: ; f448c (3d:448c)
ld [hli], a
ld [hl], d
ld a, $1
- ld [$ddef], a
+ ld [wddef], a
jr .asm_f858e
.asm_f8564
ld hl, $dda5
@@ -911,7 +911,7 @@ Music2_MainLoop: ; f85ef (3e:45ef)
pop de
push de
dec de
- ld hl, wMusicMainLoop
+ ld hl, wMusicMainLoopStart
add hl, bc
add hl, bc
ld [hl], e
@@ -921,7 +921,7 @@ Music2_MainLoop: ; f85ef (3e:45ef)
Music2_EndMainLoop: ; f85fd (3e:45fd)
pop hl
- ld hl, wMusicMainLoop
+ ld hl, wMusicMainLoopStart
add hl, bc
add hl, bc
ld a, [hli]
@@ -1020,7 +1020,7 @@ Music2_duty: ; f8674 (3e:4674)
ld a, [de]
and $c0
inc de
- ld hl, wMusicDuty
+ ld hl, wMusicDuty1
add hl, bc
ld [hl], a
ld h, d
@@ -1155,10 +1155,10 @@ Music2_PlayNextNote_pop: ; f8710 (3e:4710)
jp Music2_PlayNextNote
Func_f8714: ; f8714 (3e:4714)
- ld a, [$dd8c]
+ ld a, [wdd8c]
bit 0, a
jr nz, .asm_f8749
- ld a, [$ddb7]
+ ld a, [wddb7]
cp $0
jr z, .asm_f874a
ld d, $0
@@ -1173,11 +1173,11 @@ Func_f8714: ; f8714 (3e:4714)
ld [hl], $2
ld a, $8
ld [rNR10], a
- ld a, [wMusicDuty]
+ ld a, [wMusicDuty1]
ld [rNR11], a
- ld a, [$dda5]
+ ld a, [wMusicCh1CurPitch]
ld [rNR13], a
- ld a, [$dda6]
+ ld a, [wMusicCh1CurOctave]
or d
ld [rNR14], a
.asm_f8749
@@ -1194,10 +1194,10 @@ Func_f8714: ; f8714 (3e:4714)
ret
Func_f875a: ; f875a (3e:475a)
- ld a, [$dd8c]
+ ld a, [wdd8c]
bit 1, a
jr nz, .asm_f878b
- ld a, [$ddb8]
+ ld a, [wddb8]
cp $0
jr z, .asm_f878c
ld d, $0
@@ -1205,16 +1205,16 @@ Func_f875a: ; f875a (3e:475a)
ld a, [hl]
cp $80
jr z, .asm_f8779
- ld a, [$dde8]
+ ld a, [wMusicVolume + 1]
ld [rNR22], a
ld d, $80
.asm_f8779
ld [hl], $2
- ld a, [$dd87]
+ ld a, [wMusicDuty2]
ld [rNR21], a
- ld a, [$dda7]
+ ld a, [wMusicCh2CurPitch]
ld [rNR23], a
- ld a, [$dda8]
+ ld a, [wMusicCh2CurOctave]
or d
ld [rNR24], a
.asm_f878b
@@ -1231,7 +1231,7 @@ Func_f875a: ; f875a (3e:475a)
ret
Func_f879c: ; f879c (3e:479c)
- ld a, [$dd8c]
+ ld a, [wdd8c]
bit 2, a
jr nz, .asm_f87e0
ld d, $0
@@ -1243,14 +1243,14 @@ Func_f879c: ; f879c (3e:479c)
call Func_f87ea
ld d, $80
.asm_f87b3
- ld a, [$ddb9]
+ ld a, [wddb9]
cp $0
jr z, .asm_f87e1
ld hl, $dd93
ld a, [hl]
cp $80
jr z, .asm_f87cc
- ld a, [$dde9]
+ ld a, [wMusicVolume + 2]
ld [rNR32], a
xor a
ld [rNR30], a
@@ -1259,11 +1259,11 @@ Func_f879c: ; f879c (3e:479c)
ld [hl], $2
xor a
ld [rNR31], a
- ld a, [$dda9]
+ ld a, [wMusicCh3CurPitch]
ld [rNR33], a
ld a, $80
ld [rNR30], a
- ld a, [$ddaa]
+ ld a, [wMusicCh3CurOctave]
or d
ld [rNR34], a
.asm_f87e0
@@ -1300,10 +1300,10 @@ Func_f87ea: ; f879c (3e:47ea)
ret
Func_f880a: ; f880a (3e:480a)
- ld a, [$dd8c]
+ ld a, [wdd8c]
bit 3, a
jr nz, .asm_f8829
- ld a, [$ddba]
+ ld a, [wddba]
cp $0
jr z, asm_f882a
ld de, rNR41
@@ -1323,7 +1323,7 @@ Func_f880a: ; f880a (3e:480a)
ret
asm_f882a
xor a
- ld [$ddef], a
+ ld [wddef], a
ld hl, rNR42
ld a, $8
ld [hli], a
@@ -1333,11 +1333,11 @@ asm_f882a
ret
Func_f8839: ; f8839 (3e:4839)
- ld a, [$dd8c]
+ ld a, [wdd8c]
bit 3, a
jr z, .asm_f8846
xor a
- ld [$ddef], a
+ ld [wddef], a
jr .asm_f8859
.asm_f8846
ld hl, $dded
@@ -1367,14 +1367,14 @@ Func_f885a: ; f885a (3e:485a)
ret
Func_f8866: ; f8866 (3e:4866)
- ld a, [$ddf1]
+ ld a, [wMusicPanning]
ld [rNR50], a
- ld a, [$dd8c]
+ ld a, [wdd8c]
or a
ld hl, wMusicDC
ld a, [hli]
jr z, .asm_f8888
- ld a, [$dd8c]
+ ld a, [wdd8c]
and $f
ld d, a
swap d
@@ -1390,7 +1390,7 @@ Func_f8866: ; f8866 (3e:4866)
or d
.asm_f8888
ld d, a
- ld a, [$ddf0]
+ ld a, [wddf0]
xor $ff
and $f
ld e, a
@@ -1491,7 +1491,7 @@ Func_f890b: ; f890b (3e:490b)
ld a, [wMusicVibratoDelay]
cp $0
jr z, .asm_f8966
- ld a, [$dd8c]
+ ld a, [wdd8c]
bit 0, a
jr nz, .asm_f8966
ld a, e
@@ -1506,10 +1506,10 @@ Func_f890b: ; f890b (3e:490b)
.asm_f892c
cp $1
jr nz, .asm_f894b
- ld a, [$dde0]
+ ld a, [wMusicVibratoDelay + 1]
cp $0
jr z, .asm_f8966
- ld a, [$dd8c]
+ ld a, [wdd8c]
bit 1, a
jr nz, .asm_f8966
ld a, e
@@ -1523,10 +1523,10 @@ Func_f890b: ; f890b (3e:490b)
.asm_f894b
cp $2
jr nz, .asm_f8966
- ld a, [$dde1]
+ ld a, [wMusicVibratoDelay + 2]
cp $0
jr z, .asm_f8966
- ld a, [$dd8c]
+ ld a, [wdd8c]
bit 2, a
jr nz, .asm_f8966
ld a, e
@@ -1562,7 +1562,7 @@ Func_f8967: ; f8967 (3e:4967)
ret
Func_f8980: ; f8980 (3e:4980)
- ld a, [$dd8c]
+ ld a, [wdd8c]
ld d, a
bit 0, d
jr nz, .asm_f8990
@@ -1605,7 +1605,7 @@ Func_f89b1: ; f89b1 (3e:49b1)
or a
ret nz
ld a, $80
- ld [$dd80], a
+ ld [wdd80], a
ret
Func_f89c4: ; f89c4 (3e:49c4)
@@ -1625,20 +1625,20 @@ Func_f89d0: ; f89d0 (3e:49d0)
ret
Func_f89dc: ; f89dc (3e:49dc)
- ld a, [$dd80]
- ld [$de55], a
- ld a, [$dd81]
- ld [$de56], a
+ ld a, [wdd80]
+ ld [wde55], a
+ ld a, [wdd81]
+ ld [wde56], a
ld a, [wMusicDC]
- ld [$de57], a
- ld hl, wMusicDuty
+ ld [wde57], a
+ ld hl, wMusicDuty1
ld de, $de58
ld a, $4
call Music2_CopyData
ld a, [wMusicWave]
- ld [$de5c], a
+ ld [wde5c], a
ld a, [wMusicWaveChange]
- ld [$de5d], a
+ ld [wde5d], a
ld hl, wMusicIsPlaying
ld de, $de5e
ld a, $4
@@ -1651,14 +1651,14 @@ Func_f89dc: ; f89dc (3e:49dc)
ld de, $de66
ld a, $8
call Music2_CopyData
- ld hl, wMusicMainLoop
+ ld hl, wMusicMainLoopStart
ld de, $de6e
ld a, $8
call Music2_CopyData
- ld a, [$ddab]
- ld [$de76], a
- ld a, [$ddac]
- ld [$de77], a
+ ld a, [wddab]
+ ld [wde76], a
+ ld a, [wddac]
+ ld [wde77], a
ld hl, wMusicOctave
ld de, $de78
ld a, $4
@@ -1704,10 +1704,10 @@ Func_f89dc: ; f89dc (3e:49dc)
ld a, $4
call Music2_CopyData
ld a, $0
- ld [$dddb], a
- ld [$dddc], a
- ld [$dddd], a
- ld [$ddde], a
+ ld [wdddb], a
+ ld [wdddb + 1], a
+ ld [wdddb + 2], a
+ ld [wdddb + 3], a
ld hl, wMusicVolume
ld de, $dea4
ld a, $3
@@ -1721,7 +1721,7 @@ Func_f89dc: ; f89dc (3e:49dc)
ld a, $2
call Music2_CopyData
ld a, $0
- ld [$deac], a
+ ld [wdeac], a
ld hl, wMusicReturnAddress
ld de, $dead
ld a, $8
@@ -1733,17 +1733,17 @@ Func_f89dc: ; f89dc (3e:49dc)
ret
Func_f8b01: ; f8b01 (3e:4b01)
- ld a, [$de55]
- ld [$dd80], a
- ld a, [$de56]
- ld [$dd81], a
- ld a, [$de57]
+ ld a, [wde55]
+ ld [wdd80], a
+ ld a, [wde56]
+ ld [wdd81], a
+ ld a, [wde57]
ld [wMusicDC], a
ld hl, $de58
- ld de, wMusicDuty
+ ld de, wMusicDuty1
ld a, $4
call Music2_CopyData
- ld a, [$de5c]
+ ld a, [wde5c]
ld [wMusicWave], a
ld a, $1
ld [wMusicWaveChange], a
@@ -1760,13 +1760,13 @@ Func_f8b01: ; f8b01 (3e:4b01)
ld a, $8
call Music2_CopyData
ld hl, $de6e
- ld de, wMusicMainLoop
+ ld de, wMusicMainLoopStart
ld a, $8
call Music2_CopyData
- ld a, [$de76]
- ld [$ddab], a
- ld a, [$de77]
- ld [$ddac], a
+ ld a, [wde76]
+ ld [wddab], a
+ ld a, [wde77]
+ ld [wddac], a
ld hl, $de78
ld de, wMusicOctave
ld a, $4
@@ -1823,8 +1823,8 @@ Func_f8b01: ; f8b01 (3e:4b01)
ld de, $dded
ld a, $2
call Music2_CopyData
- ld a, [$deac]
- ld [$ddef], a
+ ld a, [wdeac]
+ ld [wddef], a
ld hl, $dead
ld de, wMusicReturnAddress
ld a, $8
diff --git a/src/audio/sfx.asm b/src/audio/sfx.asm
index cb3e2a8..8bd9fd3 100755
--- a/src/audio/sfx.asm
+++ b/src/audio/sfx.asm
@@ -11,27 +11,27 @@ Func_fc006: ; fc006 (3f:4006)
add a
ld c, a
ld b, $0
- ld a, [$de53]
+ ld a, [wde53]
or a
jr z, .asm_fc019
call Func_fc279
.asm_fc019
ld a, $1
- ld [$de53], a
+ ld [wde53], a
ld hl, SFXHeaderPointers
add hl, bc
ld a, [hli]
ld h, [hl]
ld l, a
ld a, [hli]
- ld [$dd8c], a
- ld [$de54], a
+ ld [wdd8c], a
+ ld [wde54], a
ld de, $de4b
ld c, $0
.asm_fc031
- ld a, [$de54]
+ ld a, [wde54]
rrca
- ld [$de54], a
+ ld [wde54], a
jr nc, .asm_fc050
ld a, [hli]
ld [de], a
@@ -60,7 +60,7 @@ Func_fc006: ; fc006 (3f:4006)
ret
Func_fc059: ; fc059 (3f:4059)
- ld a, [$dd8c]
+ ld a, [wdd8c]
or a
jr nz, .asm_fc063
call Func_fc26c
@@ -69,8 +69,8 @@ Func_fc059: ; fc059 (3f:4059)
xor a
ld b, a
ld c, a
- ld a, [$dd8c]
- ld [$de54], a
+ ld a, [wdd8c]
+ ld [wde54], a
.asm_fc06c
ld hl, $de54
ld a, [hl]
@@ -412,7 +412,7 @@ SFX_7: ; fc202 (3f:4202)
cp $10
jr nz, .asm_fc215
ld a, $1
- ld [$dd8b], a
+ ld [wMusicWaveChange], a
ld a, $80
ld [rNR30], a
ld b, $0
@@ -452,9 +452,9 @@ SFX_end: ; fc249 (3f:4249)
dec e
jr nz, .asm_fc24d
ld e, a
- ld a, [$dd8c]
+ ld a, [wdd8c]
and e
- ld [$dd8c], a
+ ld [wdd8c], a
ld a, c
rlca
rlca
@@ -473,10 +473,10 @@ SFX_end: ; fc249 (3f:4249)
Func_fc26c: ; fc26c (3f:426c)
xor a
- ld [$de53], a
- ld [$dd83], a
+ ld [wde53], a
+ ld [wdd83], a
ld a, $80
- ld [$dd82], a
+ ld [wdd82], a
ret
Func_fc279: ; fc279 (3f:4279)
@@ -490,7 +490,7 @@ Func_fc279: ; fc279 (3f:4279)
ld a, [rNR24]
ld a, [rNR44]
xor a
- ld [$dd8c], a
+ ld [wdd8c], a
ret
INCLUDE "audio/sfx_headers.asm"
diff --git a/src/engine/bank1.asm b/src/engine/bank1.asm
index 7544314..4d4582f 100755
--- a/src/engine/bank1.asm
+++ b/src/engine/bank1.asm
@@ -6,9 +6,9 @@ Func_4000: ; 4000 (1:4000)
call EnableInt_Timer
call EnableExtRAM
ld a, [$a006]
- ld [$ce47], a
+ ld [wTextSpeed], a
ld a, [$a009]
- ld [$ccf2], a
+ ld [wccf2], a
call DisableExtRAM
ld a, $1
ld [wUppercaseFlag], a
@@ -51,7 +51,7 @@ StartDuel: ; 409f (1:409f)
ldh [hWhoseTurn], a
ld a, $0
ld [wPlayerDuelistType], a
- ld a, [$cc19]
+ ld a, [wcc19]
ld [wOpponentDeckId], a
call LoadPlayerDeck
call SwapTurn
@@ -70,14 +70,14 @@ StartDuel: ; 409f (1:409f)
.asm_40ca
ld hl, [sp+$0]
ld a, l
- ld [$cbe5], a
+ ld [wcbe5], a
ld a, h
- ld [$cbe6], a
+ ld [wcbe6], a
xor a
ld [wCurrentDuelMenuItem], a
call $420b
- ld a, [$cc18]
- ld [$cc08], a
+ ld a, [wcc18]
+ ld [wcc08], a
call $70aa
ld a, [wDuelTheme]
call PlaySong
@@ -104,7 +104,7 @@ StartDuel: ; 409f (1:409f)
jr nz, .duelFinished
ld hl, $cc06
inc [hl]
- ld a, [$cc09]
+ ld a, [wcc09]
cp $80
jr z, .asm_4126
@@ -120,7 +120,7 @@ StartDuel: ; 409f (1:409f)
cp $f
jr c, .nextTurn
xor a
- ld [$d0c3], a
+ ld [wd0c3], a
ret
.duelFinished
@@ -156,7 +156,7 @@ StartDuel: ; 409f (1:409f)
jr nz, .opponentWonBattle
.playerWonBattle
xor a
- ld [$d0c3], a
+ ld [wd0c3], a
ld a, $5d
ld c, MUSIC_MATCHVICTORY
text_hl WonDuelText
@@ -168,7 +168,7 @@ StartDuel: ; 409f (1:409f)
jr nz, .playerWonBattle
.opponentWonBattle
ld a, $1
- ld [$d0c3], a
+ ld [wd0c3], a
ld a, $5e
ld c, MUSIC_MATCHLOSS
text_hl LostDuelText
@@ -205,9 +205,9 @@ StartDuel: ; 409f (1:409f)
text_hl StartSuddenDeathMatchText
call DrawWideTextBox_WaitForInput
ld a, $1
- ld [$cc08], a
+ ld [wcc08], a
call $70aa
- ld a, [$cc09]
+ ld a, [wcc09]
cp $1
jr z, .asm_41f3
ld a, PLAYER_TURN
@@ -236,8 +236,8 @@ INCBIN "baserom.gbc",$420b,$4225 - $420b
DrawCardFromDeck: ; 4225 (1:4225)
ld a, DUELVARS_DUELIST_TYPE
call GetTurnDuelistVariable
- ld [$cc0d], a
- ld a, [$cc06]
+ ld [wcc0d], a
+ ld a, [wcc06]
cp a, $02
jr c, .asm_4237
call $70f6
@@ -254,7 +254,7 @@ DrawCardFromDeck: ; 4225 (1:4225)
.deckNotEmpty
ldh [hTempCardNumber], a
call AddCardToHand
- ld a, [$cc0d]
+ ld a, [wcc0d]
cp $00
jr z, Func_4262
call SwapTurn
@@ -273,20 +273,20 @@ Func_4268:
Func_426d:
call $4f9d
- ld a, [$cc0d]
+ ld a, [wcc0d]
cp a, $00
jr z, PrintDuelMenu
cp a, $01
jp z, $6911
xor a
ld [wVBlankCtr], a
- ld [$cbf9], a
+ ld [wcbf9], a
text_hl DuelistIsThinkingText
call Func_2a36
call Func_2bbf
ld a, $ff
- ld [$cc11], a
- ld [$cc10], a
+ ld [wcc11], a
+ ld [wcc10], a
ret
PrintDuelMenu:
@@ -324,7 +324,7 @@ Func_42ac:
ldh a, [hButtonsPressed]
bit SELECT_F, a
jp nz, $458e
- ld a, [$cbe7]
+ ld a, [wcbe7]
or a
jr nz, Func_42ac
call Func_271a
@@ -405,7 +405,7 @@ PlayerRetreat: ; 43ab (1:43ab)
cp a, $01
ldh [$ffa0], a
jr nz, Func_43f1
- ld a, [$cc0c]
+ ld a, [wcc0c]
or a
jr nz, Func_43e8
call $45bb
@@ -613,7 +613,7 @@ Func_478b: ; 478b (1:478b)
ld a, $01
ld [wCardPageNumber], a
xor a
- ld [$cbc9], a
+ ld [wcbc9], a
call Func_04a2
call Func_3b31
ld de, $8a00
@@ -642,7 +642,7 @@ Func_478b: ; 478b (1:478b)
ld a, $02
.asm_47cb
- ld [$cc04], a
+ ld [wcc04], a
.asm_47ce
call Func_47ec
@@ -669,7 +669,7 @@ AttackMenuCursorData:
db $00
Func_47ec: ; $47ec (1:47ec)
- ld a, [$cc04]
+ ld a, [wcc04]
ld hl, $47f5
jp JumpToFunctionInTable
@@ -722,7 +722,7 @@ LoadPokemonMovesToDuelCardOrAttackList: ; 4823 (1:4823)
ld b, $0d
ld hl, wDuelCardOrAttackList
xor a
- ld [$cbc7], a
+ ld [wCardPageNumber], a
ld de, wCardBuffer1Move1Name
call CheckIfMoveExists
jr c, .checkForSecondAttackSlot
@@ -984,7 +984,7 @@ AIMakeDecision: ; 67be (1:67be)
ld hl, $cbe1
or [hl]
jr nz, .turnEnded
- ld a, [$cbf9]
+ ld a, [wcbf9]
or a
ret nz
ld [wVBlankCtr], a
@@ -1149,17 +1149,17 @@ InitializeDuelVariables: ; 7107 (1:7107)
INCBIN "baserom.gbc",$7133,$71ad - $7133
_TossCoin: ; 71ad (1:71ad)
- ld [$cd9c], a
+ ld [wcd9c], a
ld a, [wcac2]
cp $6
jr z, .asm_71c1
xor a
- ld [$cd9f], a
+ ld [wcd9f], a
call Func_04a2
call $210f
.asm_71c1
- ld a, [$cd9f]
+ ld a, [wcd9f]
or a
jr nz, .asm_71ec
ld a, $6
@@ -1186,31 +1186,31 @@ _TossCoin: ; 71ad (1:71ad)
call EnableLCD
ld a, $f1
call GetTurnDuelistVariable
- ld [$cd9e], a
+ ld [wcd9e], a
call Func_0f58
xor a
- ld [$cd9d], a
+ ld [wcd9d], a
.asm_7204
- ld a, [$cd9c]
+ ld a, [wcd9c]
cp $2
jr c, .asm_7223
ld bc, $0f0b
- ld a, [$cd9f]
+ ld a, [wcd9f]
inc a
call $65b7
ld b, $11
ld a, $2e
call Func_06c3
inc b
- ld a, [$cd9c]
+ ld a, [wcd9c]
call $65b7
.asm_7223
call Func_3b21
ld a, $58
call Func_3b6a
- ld a, [$cd9e]
+ ld a, [wcd9e]
or a
jr z, .asm_7236
call $7324
@@ -1233,7 +1233,7 @@ _TossCoin: ; 71ad (1:71ad)
.asm_724d
ld a, d
call Func_3b6a
- ld a, [$cd9e]
+ ld a, [wcd9e]
or a
jr z, .asm_725e
ld a, e
@@ -1264,7 +1264,7 @@ _TossCoin: ; 71ad (1:71ad)
.asm_727c
ld a, b
call Func_3b6a
- ld a, [$cd9e]
+ ld a, [wcd9e]
or a
jr z, .asm_728a
ld a, $1
@@ -1281,13 +1281,13 @@ _TossCoin: ; 71ad (1:71ad)
.asm_7292
ld a, d
call Func_3796
- ld a, [$cd9c]
+ ld a, [wcd9c]
dec a
jr z, .asm_72b9
ld a, c
push af
ld e, $0
- ld a, [$cd9f]
+ ld a, [wcd9f]
.asm_72a3
cp $a
jr c, .asm_72ad
@@ -1307,7 +1307,7 @@ _TossCoin: ; 71ad (1:71ad)
.asm_72b9
ld hl, $cd9f
inc [hl]
- ld a, [$cd9e]
+ ld a, [wcd9e]
or a
jr z, .asm_72dc
ld a, [hl]
@@ -1315,7 +1315,7 @@ _TossCoin: ; 71ad (1:71ad)
cp [hl]
call z, WaitForWideTextBoxInput
call $7324
- ld a, [$cd9c]
+ ld a, [wcd9c]
ld hl, $cd9d
or [hl]
jr nz, .asm_72e2
@@ -1328,14 +1328,14 @@ _TossCoin: ; 71ad (1:71ad)
.asm_72e2
call Func_3b31
- ld a, [$cd9f]
+ ld a, [wcd9f]
ld hl, $cd9c
cp [hl]
jp c, .asm_7204
call Func_0f58
call Func_3b31
call Func_3b21
- ld a, [$cd9d]
+ ld a, [wcd9d]
or a
ret z
scf
diff --git a/src/engine/bank1c.asm b/src/engine/bank1c.asm
index 3f0351a..6d9d685 100755
--- a/src/engine/bank1c.asm
+++ b/src/engine/bank1c.asm
@@ -1,5 +1,5 @@
Func_70000: ; 70000 (1c:4000)
- ld a, [$cab4]
+ ld a, [wConsole]
cp $1
ret nz
ld b, $1
@@ -14,7 +14,7 @@ Func_70000: ; 70000 (1c:4000)
ret
Func_70018: ; 70018 (1c:4018)
- ld a, [$cab4]
+ ld a, [wConsole]
cp $1
ret nz
ld a, $0
@@ -44,7 +44,7 @@ Unknown_70057: ; 70057 (1c:4057)
INCBIN "baserom.gbc",$70057,$70082 - $70057
Func_70082: ; 70082 (1c:4082)
- ld a, [$cab4]
+ ld a, [wConsole]
cp $1
ret nz
push hl
@@ -147,21 +147,21 @@ Func_70136: ; 70136 (1c:4136)
push bc
push de
ldh a, [hSCX]
- ld [$d41d], a
+ ld [wd41d], a
ldh a, [hSCY]
- ld [$d41e], a
- ld a, [$cabc]
- ld [$d41f], a
- ld a, [$cabb]
- ld [$d420], a
+ ld [wd41e], a
+ ld a, [wBGP]
+ ld [wd41f], a
+ ld a, [wLCDC]
+ ld [wd420], a
di
ld hl, SGB_MASK_EN_ON_701a0
call SendSGB
call DisableLCD
- ld a, [$cabb]
+ ld a, [wLCDC]
and $41
or $1
- ld [$cabb], a
+ ld [wLCDC], a
ld a, $e4
ld [rBGP], a
call Func_040c
@@ -183,14 +183,14 @@ Func_70177: ; 70177 (1c:4177)
call EnableLCD
pop hl
call SendSGB
- ld a, [$d41d]
+ ld a, [wd41d]
ldh [hSCX], a
- ld a, [$d41e]
+ ld a, [wd41e]
ldh [hSCY], a
- ld a, [$d41f]
+ ld a, [wd41f]
call Func_040c
- ld a, [$d420]
- ld [$cabb], a
+ ld a, [wd420]
+ ld [wLCDC], a
call DisableLCD
ei
pop de
@@ -217,13 +217,13 @@ Func_701c0: ; 701c0 (1c:41c0)
ld [hli], a
dec c
jr nz, .asm_701cb
- ld a, [$cab6]
+ ld a, [wTileMapFill]
push af
xor a
- ld [$cab6], a
+ ld [wTileMapFill], a
call Func_04a2
pop af
- ld [$cab6], a
+ ld [wTileMapFill], a
di
ld hl, SGB_MASK_EN_OFF_701b0
call SendSGB
diff --git a/src/engine/bank2.asm b/src/engine/bank2.asm
index 5c36476..48d39cc 100755
--- a/src/engine/bank2.asm
+++ b/src/engine/bank2.asm
@@ -41,11 +41,11 @@ INCBIN "baserom.gbc",$8d15,$8d56 - $8d15
Func_8d56: ; 8d56 (2:4d56)
xor a
- ld [$cab6], a
+ ld [wTileMapFill], a
call Func_04a2
call Func_099c
ld a, $1
- ld [$cac0], a
+ ld [wVBlankOAMCopyToggle], a
call Func_2119
call Func_20b0
call Func_8d0b
@@ -93,7 +93,7 @@ Func_8dbc: ; 8dbc (2:4dbc)
ldh a, [hCurrentMenuItem]
cp $ff
ret z
- ld [$ceb1], a
+ ld [wceb1], a
jp Func_8e42
Unknown_8de2: ; 8de2 (2:4de2)
@@ -104,7 +104,7 @@ Func_8dea: ; 8dea (2:4dea)
and START
ret z
ld a, [wCurMenuItem]
- ld [$ceb1], a
+ ld [wceb1], a
call Func_8ff2
jp nc, Func_8e05
ld a, $ff
@@ -123,7 +123,7 @@ Func_8e05: ; 8e05 (2:4e05)
call Func_8e1f
ld a, $ff
call Func_9168
- ld a, [$ceb1]
+ ld a, [wceb1]
scf
ret
@@ -138,7 +138,7 @@ Func_8e1f: ; 8e1f (2:4e1f)
ld hl, $cebb
call Func_9843
ld a, $3c
- ld [$cecc], a
+ ld [wcecc], a
ld hl, $cebb
ld [hl], a
call Func_9e41
@@ -156,13 +156,13 @@ Func_8e42: ; 8e42 (2:4e42)
cp $ff
jr nz, .asm_8e64
call Func_90d8
- ld a, [$ceb1]
+ ld a, [wceb1]
jp Func_8dbc
.asm_8e64
- ld a, [$ceaf]
+ ld a, [wceaf]
or a
jp nz, Func_8f8a
- ld a, [$ceb0]
+ ld a, [wceb0]
or a
jp nz, .asm_8ecf
call Func_9048
@@ -206,7 +206,7 @@ Func_8e42: ; 8e42 (2:4e42)
.asm_8ec4
ld a, $ff
call Func_9168
- ld a, [$ceb1]
+ ld a, [wceb1]
jp Func_8dbc
.asm_8ecf
call Func_8ff2
@@ -228,11 +228,11 @@ Func_8e42: ; 8e42 (2:4e42)
call Func_92b4
ld a, $ff
call Func_9168
- ld a, [$ceb1]
+ ld a, [wceb1]
jp Func_8dbc
Func_8f05: ; 8f05 (2:4f05)
- ld a, [$ceb1]
+ ld a, [wceb1]
or a
jr nz, .asm_8f10
ld hl, Unknown_a763
@@ -254,7 +254,7 @@ Func_8f05: ; 8f05 (2:4f05)
ld bc, $0401
ld de, $cfb9
farcall Func_1ad89
- ld a, [$cfb9]
+ ld a, [wcfb9]
or a
ret nz
call Func_8f38
@@ -314,7 +314,7 @@ Func_8f38: ; 8f38 (2:4f38)
ret
Func_8f8a: ; 8f8a (2:4f8a)
- ld a, [$ceb0]
+ ld a, [wceb0]
or a
jp nz, Func_9026
call Func_8ff2
@@ -336,7 +336,7 @@ Func_8f9d: ; 8f9d (2:4f9d)
ld hl, $0000
ld bc, $0202
call Func_1f5f
- ld a, [$ceb1]
+ ld a, [wceb1]
call EnableExtRAM
ld [$b700], a
call DisableExtRAM
@@ -346,21 +346,21 @@ Func_8f9d: ; 8f9d (2:4f9d)
call Func_9253
call DisableExtRAM
xor a
- ld [$ce3f], a
- ld [$ce40], a
+ ld [wce3f], a
+ ld [wce40], a
text_hl ChosenAsDuelingDeckText
call DrawWideTextBox_WaitForInput
- ld a, [$ceb1]
+ ld a, [wceb1]
jp Func_8dbc
Func_8fe8: ; 8fe8 (2:4fe8)
text_hl ThereIsNoDeckHereText
call DrawWideTextBox_WaitForInput
- ld a, [$ceb1]
+ ld a, [wceb1]
ret
Func_8ff2: ; 8ff2 (2:4ff2)
- ld a, [$ceb1]
+ ld a, [wceb1]
ld hl, $ceb2
ld b, $0
ld c, a
@@ -381,7 +381,7 @@ Unknown_9027: ; 9027 (2:5027)
INCBIN "baserom.gbc",$9027,$9038 - $9027
Func_9038: ; 9038 (2:5038)
- ld a, [$ceb1]
+ ld a, [wceb1]
ld h, a
ld l, $54
call HtimesL
@@ -393,7 +393,7 @@ Func_9038: ; 9038 (2:5038)
Func_9048: ; 9048 (2:5048)
push af
- ld a, [$ceb1]
+ ld a, [wceb1]
ld h, a
ld l, $54
call HtimesL
@@ -406,17 +406,17 @@ Func_9048: ; 9048 (2:5048)
Func_905a: ; 905a (2:505a)
xor a
- ld [$ceaf], a
- ld [$ceb0], a
- ld [$cea3], a
+ ld [wceaf], a
+ ld [wceb0], a
+ ld [wcea3], a
ret
Func_9065: ; 9065 (2:5065)
xor a
- ld [$cfe3], a
- ld a, [$ceaf]
+ ld [wcfe3], a
+ ld a, [wceaf]
ld d, a
- ld a, [$ceb0]
+ ld a, [wceb0]
ld e, a
ldh a, [hButtonsPressed2]
or a
@@ -441,16 +441,16 @@ Func_9065: ; 9065 (2:5065)
ld e, a
.asm_9090
ld a, $1
- ld [$cfe3], a
+ ld [wcfe3], a
push de
call Func_90d8
pop de
ld a, d
- ld [$ceaf], a
+ ld [wceaf], a
ld a, e
- ld [$ceb0], a
+ ld [wceb0], a
xor a
- ld [$cea3], a
+ ld [wcea3], a
.asm_90a6
ldh a, [hButtonsPressed]
and A_BUTTON | B_BUTTON
@@ -468,7 +468,7 @@ Func_9065: ; 9065 (2:5065)
scf
ret
.asm_90c1
- ld a, [$cfe3]
+ ld a, [wcfe3]
or a
jr z, .asm_90ca
call Func_3796
@@ -487,13 +487,13 @@ asm_90da
ld e, a
ld a, $a
ld l, a
- ld a, [$ceaf]
+ ld a, [wceaf]
ld h, a
call HtimesL
ld a, l
add $1
ld b, a
- ld a, [$ceb0]
+ ld a, [wceb0]
sla a
add $e
ld c, a
@@ -593,7 +593,7 @@ Func_9168: ; 9168 (2:5168)
call Func_9314
jr c, .asm_91bd
ld a, $1
- ld [$ceb2], a
+ ld [wceb2], a
.asm_91bd
ld a, [hffb5]
bit 1, a
@@ -606,7 +606,7 @@ Func_9168: ; 9168 (2:5168)
call Func_9314
jr c, .asm_91da
ld a, $1
- ld [$ceb3], a
+ ld [wceb3], a
.asm_91da
ld a, [hffb5]
bit 2, a
@@ -619,7 +619,7 @@ Func_9168: ; 9168 (2:5168)
call Func_9314
jr c, .asm_91f7
ld a, $1
- ld [$ceb4], a
+ ld [wceb4], a
.asm_91f7
ld a, [hffb5]
bit 3, a
@@ -632,7 +632,7 @@ Func_9168: ; 9168 (2:5168)
call Func_9314
jr c, .asm_9214
ld a, $1
- ld [$ceb5], a
+ ld [wceb5], a
.asm_9214
call EnableExtRAM
ld a, [$b700]
diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm
index 11ca29a..453cf61 100755
--- a/src/engine/bank20.asm
+++ b/src/engine/bank20.asm
@@ -26,12 +26,12 @@ Func_8020f: ; 8020f (20:420f)
Func_80229: ; 80229 (20:4229)
ld a, [hli]
- ld [$d4c4], a
+ ld [wd4c4], a
ld a, [hli]
- ld [$d4c5], a
+ ld [wd4c5], a
ld a, [hli]
add $20
- ld [$d4c6], a
+ ld [wd4c6], a
ret
; 0x80238
@@ -44,9 +44,9 @@ Func_8025b: ; 8025b (20:425b)
call Func_80229
ld a, [hl]
push af
- ld [$d4c8], a
+ ld [wd4c8], a
ld a, $10
- ld [$d4c7], a
+ ld [wd4c7], a
call Func_80274
pop af
pop hl
@@ -62,9 +62,9 @@ asm_8027c
push hl
push bc
push de
- ld a, [$d4c8]
+ ld a, [wd4c8]
ld b, a
- ld a, [$d4c7]
+ ld a, [wd4c7]
ld c, a
ld hl, $d4c2
ld e, [hl]
@@ -84,31 +84,31 @@ asm_8027c
ret
Func_8029f: ; 8029f (20:429f)
- ld a, [$d4ca]
+ ld a, [wd4ca]
swap a
push af
and $f0
- ld [$d4c2], a
+ ld [wd4c2], a
pop af
and $f
add $80
- ld [$d4c3], a
- ld a, [$d4cb]
+ ld [wd4c3], a
+ ld a, [wd4cb]
and $1
call BankswitchVRAM
ret
Func_802bb: ; 802bb (20:42bb)
- ld a, [$d4ca]
+ ld a, [wd4ca]
push af
xor $80
- ld [$d4ca], a
+ ld [wd4ca], a
call Func_8029f
- ld a, [$d4c3]
+ ld a, [wd4c3]
add $8
- ld [$d4c3], a
+ ld [wd4c3], a
pop af
- ld [$d4ca], a
+ ld [wd4ca], a
ret
; 0x802d4
diff --git a/src/engine/bank3.asm b/src/engine/bank3.asm
index f3bcee9..feb7c05 100755
--- a/src/engine/bank3.asm
+++ b/src/engine/bank3.asm
@@ -4,22 +4,22 @@ LoadMap: ; c000 (3:4000)
bank1call Func_6785
call DisableExtRAM
ld a, $0
- ld [$d0b5], a
+ ld [wd0b5], a
xor a
- ld [$d10f], a
- ld [$d110], a
- ld [$d113], a
+ ld [wd10f], a
+ ld [wd110], a
+ ld [wMatchStartTheme], a
farcall Func_10a9b
call Func_c1a4
call Func_099c
xor a
- ld [$cab6], a
+ ld [wTileMapFill], a
call Func_2119
call Set_OBJ_8x8
xor a
- ld [$cd08], a
+ ld [wcd08], a
xor a
- ld [$d291], a
+ ld [wd291], a
.asm_c037
farcall Func_10ab4
call Func_c1a4
@@ -29,11 +29,11 @@ LoadMap: ; c000 (3:4000)
ld a, PLAYER_TURN
ldh [hWhoseTurn], a
farcall Func_1c440
- ld a, [$d0bb]
+ ld a, [wd0bb]
ld [wCurMap], a
- ld a, [$d0bc]
+ ld a, [wd0bc]
ld [wPlayerXCoord], a
- ld a, [$d0bd]
+ ld a, [wd0bd]
ld [wPlayerYCoord], a
call Func_c36a
call Func_c184
@@ -45,8 +45,8 @@ LoadMap: ; c000 (3:4000)
farcall Func_80480
call Func_c199
xor a
- ld [$d0b4], a
- ld [$d0c1], a
+ ld [wd0b4], a
+ ld [wd0c1], a
call Func_39fc
farcall Func_10af9
call Func_c141
@@ -70,7 +70,7 @@ LoadMap: ; c000 (3:4000)
.asm_c0b6
farcall Func_10ab4
call Func_c1a0
- ld a, [$d113]
+ ld a, [wMatchStartTheme]
or a
jr z, .asm_c0ca
call Func_c280
@@ -80,7 +80,7 @@ LoadMap: ; c000 (3:4000)
ret
Func_c0ce: ; c0ce (3:40ce)
- ld a, [$d0bf]
+ ld a, [wd0bf]
res 7, a
rlca
add PointerTable_c0e0 & $ff
@@ -108,15 +108,15 @@ Func_c0ed: ; c0ed (3:40ed)
ret
Func_c0f1: ; c0f1 (3:40f1)
- ld a, [$d3b6]
- ld [$d3aa], a
+ ld a, [wd3b6]
+ ld [wd3aa], a
farcall Func_1c768
ld a, c
- ld [$d0c6], a
+ ld [wd0c6], a
ld a, b
- ld [$d0c7], a
+ ld [wd0c7], a
ld a, $3
- ld [$d0bf], a
+ ld [wd0bf], a
jr Func_c10a
Func_c10a: ; c10a (3:410a)
@@ -127,20 +127,20 @@ Func_c10a: ; c10a (3:410a)
jp [hl]
Func_c111: ; c111 (3:4111)
- ld a, [$d0c1]
+ ld a, [wd0c1]
bit 0, a
call nz, Func_c135
- ld a, [$d0c1]
+ ld a, [wd0c1]
bit 1, a
jr z, .asm_c12a
- ld a, [$d3b6]
- ld [$d3aa], a
+ ld a, [wd3b6]
+ ld [wd3aa], a
farcall Func_1c5e9
.asm_c12a
xor a
- ld [$d0c1], a
- ld a, [$d0c0]
- ld [$d0bf], a
+ ld [wd0c1], a
+ ld a, [wd0c0]
+ ld [wd0bf], a
ret
Func_c135: ; c135 (3:4135)
@@ -170,24 +170,24 @@ PointerTable_c152: ; c152 (3:4152)
dw Func_fcad
Func_c158: ; c158 (3:4158)
- ld a, [$d0c2]
+ ld a, [wd0c2]
cp $1
ret nz
- ld a, [$d0c4]
- ld [$d3ab], a
+ ld a, [wd0c4]
+ ld [wd3ab], a
call Func_39c3
jr c, .asm_c179
- ld a, [$d3aa]
+ ld a, [wd3aa]
ld l, $4
call Func_39ad
- ld a, [$d0c5]
+ ld a, [wd0c5]
ld [hl], a
farcall Func_1c58e
.asm_c179
ret
Func_c17a: ; c17a (3:417a)
- ld a, [$d0bf]
+ ld a, [wd0bf]
cp $3
ret z
call Func_c9b8
@@ -202,8 +202,8 @@ Func_c184: ; c184 (3:4184)
ld c, $0
.asm_c190
ld a, c
- ld [$d0bf], a
- ld [$d0c0], a
+ ld [wd0bf], a
+ ld [wd0c0], a
pop bc
ret
@@ -227,15 +227,15 @@ Func_c1a4: ; c1a4 (3:41a4)
Func_c1b1: ; c1b1 (3:41b1)
ld a, $c
- ld [$d32e], a
+ ld [wd32e], a
ld a, $0
- ld [$d0bb], a
+ ld [wd0bb], a
ld a, $c
- ld [$d0bc], a
+ ld [wd0bc], a
ld a, $c
- ld [$d0bd], a
+ ld [wd0bd], a
ld a, $2
- ld [$d0be], a
+ ld [wd0be], a
call Func_c9cb
call Func_c9dd
farcall Func_80b7a
@@ -257,32 +257,32 @@ Func_c1ed: ; c1ed (3:41ed)
Func_c1f8: ; c1f8 (3:41f8)
xor a
- ld [$d0b8], a
- ld [$d0b9], a
- ld [$d0ba], a
- ld [$d11b], a
- ld [$d0c2], a
- ld [$d111], a
- ld [$d112], a
- ld [$d3b8], a
+ ld [wd0b8], a
+ ld [wd0b9], a
+ ld [wd0ba], a
+ ld [wd11b], a
+ ld [wd0c2], a
+ ld [wd111], a
+ ld [wd112], a
+ ld [wd3b8], a
call EnableExtRAM
ld a, [$a007]
- ld [$d421], a
+ ld [wd421], a
ld a, [$a006]
- ld [$ce47], a
+ ld [wTextSpeed], a
call DisableExtRAM
farcall Func_10756
ret
Func_c228: ; c228 (3:4228)
ld a, [wCurMap]
- ld [$d0bb], a
+ ld [wd0bb], a
ld a, [wPlayerXCoord]
- ld [$d0bc], a
+ ld [wd0bc], a
ld a, [wPlayerYCoord]
- ld [$d0bd], a
- ld a, [$d334]
- ld [$d0be], a
+ ld [wd0bd], a
+ ld a, [wd334]
+ ld [wd0be], a
ret
Func_c241: ; c241 (3:4241)
@@ -341,7 +341,7 @@ Func_c280: ; c280 (3:4280)
call Func_c228
call Func_3ca0
call Func_099c
- ld hl, $cac0
+ ld hl, wVBlankOAMCopyToggle
inc [hl]
call EnableLCD
call DoFrameIfLCDEnabled
@@ -371,7 +371,7 @@ Func_c2a3: ; c2a3 (3:42a3)
call Func_3ca0
call Func_099c
ld a, $1
- ld [$cac0], a
+ ld [wVBlankOAMCopyToggle], a
call EnableLCD
call DoFrameIfLCDEnabled
call DisableLCD
@@ -395,11 +395,11 @@ Func_c2db: ; c2db (3:42db)
ldh [hWhoseTurn], a
call Func_c241
call Func_04a2
- ld a, [$d111]
+ ld a, [wd111]
push af
farcall Func_80000
pop af
- ld [$d111], a
+ ld [wd111], a
ld hl, $d0c1
res 0, [hl]
call Func_c34e
@@ -424,16 +424,16 @@ Func_c2db: ; c2db (3:42db)
Func_c32b: ; c32b (3:432b)
ld a, l
- ld [$d10f], a
+ ld [wd10f], a
ld a, h
- ld [$d110], a
+ ld [wd110], a
jr Func_c2db
Func_c335: ; c335 (3:4335)
- ld a, [$cabd]
- ld [$d10c], a
- ld a, [$cabe]
- ld [$d10d], a
+ ld a, [wOBP0]
+ ld [wd10c], a
+ ld a, [wOBP1]
+ ld [wd10d], a
ld hl, $cb30
ld de, $d0cc
ld bc, $0040
@@ -441,10 +441,10 @@ Func_c335: ; c335 (3:4335)
ret
Func_c34e: ; c34e (3:434e)
- ld a, [$d10c]
- ld [$cabd], a
- ld a, [$d10d]
- ld [$cabe], a
+ ld a, [wd10c]
+ ld [wOBP0], a
+ ld a, [wd10d]
+ ld [wOBP1], a
ld hl, $d0cc
ld de, $cb30
ld bc, $0040
@@ -454,12 +454,12 @@ Func_c34e: ; c34e (3:434e)
Func_c36a: ; c36a (3:436a)
xor a
- ld [$d323], a
+ ld [wd323], a
ld a, [wCurMap]
cp POKEMON_DOME_ENTRANCE
jr nz, .asm_c379
xor a
- ld [$d324], a
+ ld [wd324], a
.asm_c379
ret
; 0xc37a
@@ -467,23 +467,23 @@ Func_c36a: ; c36a (3:436a)
INCBIN "baserom.gbc",$c37a,$c41c - $c37a
Func_c41c: ; c41c (3:441c)
- ld a, [$d332]
+ ld a, [wd332]
sub $40
- ld [$d235], a
- ld a, [$d333]
+ ld [wd235], a
+ ld a, [wd333]
sub $40
- ld [$d236], a
+ ld [wd236], a
call Func_c430
ret
Func_c430: ; c430 (3:4430)
push bc
- ld a, [$d237]
+ ld a, [wd237]
sla a
sla a
sla a
ld b, a
- ld a, [$d235]
+ ld a, [wd235]
cp $b1
jr c, .asm_c445
xor a
@@ -493,13 +493,13 @@ Func_c430: ; c430 (3:4430)
jr c, .asm_c449
ld a, b
.asm_c449
- ld [$d235], a
- ld a, [$d238]
+ ld [wd235], a
+ ld a, [wd238]
sla a
sla a
sla a
ld b, a
- ld a, [$d236]
+ ld a, [wd236]
cp $b9
jr c, .asm_c460
xor a
@@ -509,38 +509,38 @@ Func_c430: ; c430 (3:4430)
jr c, .asm_c464
ld a, b
.asm_c464
- ld [$d236], a
+ ld [wd236], a
pop bc
ret
Func_c469: ; c469 (3:4469)
- ld a, [$d235]
+ ld a, [wd235]
add $4
and $f8
rrca
rrca
rrca
- ld [$d233], a
- ld a, [$d236]
+ ld [wd233], a
+ ld a, [wd236]
add $4
and $f8
rrca
rrca
rrca
- ld [$d234], a
+ ld [wd234], a
ret
Func_c484: ; c484 (3:4484)
- ld a, [$d235]
- ld [$d0b6], a
- ld a, [$d236]
- ld [$d0b7], a
+ ld a, [wd235]
+ ld [wd0b6], a
+ ld a, [wd236]
+ ld [wd0b7], a
ret
Func_c491: ; c491 (3:4491)
- ld a, [$d0b6]
+ ld a, [wd0b6]
ldh [hSCX], a
- ld a, [$d0b7]
+ ld a, [wd0b7]
ldh [hSCY], a
ret
@@ -551,50 +551,50 @@ Func_c49c: ; c49c (3:449c)
rlca
rlca
rlca
- ld [$d332], a
+ ld [wd332], a
ld a, [wPlayerYCoord]
and $1f
ld [wPlayerYCoord], a
rlca
rlca
rlca
- ld [$d333], a
+ ld [wd333], a
ret
Func_c4b9: ; c4b9 (3:44b9)
xor a
- ld [$d4ca], a
- ld [$d4cb], a
+ ld [wd4ca], a
+ ld [wd4cb], a
ld a, $1d
farcall Func_80418
ld b, $0
- ld a, [$cab4]
+ ld a, [wConsole]
cp $2
jr nz, .asm_c4d1
ld b, $1e
.asm_c4d1
ld a, b
- ld [$d337], a
+ ld [wd337], a
ld a, $0
farcall Func_1299f
- ld a, [$d4cf]
- ld [$d336], a
+ ld a, [wd4cf]
+ ld [wd336], a
ld b, $2
ld a, [wCurMap]
cp OVERWORLD_MAP
jr z, .asm_c4ee
- ld a, [$d0be]
+ ld a, [wd0be]
ld b, a
.asm_c4ee
ld a, b
- ld [$d334], a
+ ld [wd334], a
call Func_c5e9
ld a, [wCurMap]
cp OVERWORLD_MAP
call nz, Func_c6f7
xor a
- ld [$d335], a
- ld [$d338], a
+ ld [wd335], a
+ ld [wd338], a
ld a, [wCurMap]
cp OVERWORLD_MAP
jr nz, .asm_c50f
@@ -603,19 +603,19 @@ Func_c4b9: ; c4b9 (3:44b9)
ret
Func_c510: ; c510 (3:4510)
- ld a, [$d336]
- ld [$d4cf], a
- ld a, [$d335]
+ ld a, [wd336]
+ ld [wd4cf], a
+ ld a, [wd335]
bit 4, a
ret nz
bit 0, a
call z, Func_c5ac
- ld a, [$d335]
+ ld a, [wd335]
or a
jr z, .asm_c535
bit 0, a
call nz, Func_c66c
- ld a, [$d335]
+ ld a, [wd335]
bit 1, a
call nz, Func_c6dc
ret
@@ -629,8 +629,8 @@ Func_c510: ; c510 (3:4510)
INCBIN "baserom.gbc",$c53d,$c554 - $c53d
Func_c554: ; c554 (3:4554)
- ld a, [$d336]
- ld [$d4cf], a
+ ld a, [wd336]
+ ld [wd4cf], a
ld a, [wCurMap]
cp OVERWORLD_MAP
jr nz, .asm_c566
@@ -641,17 +641,17 @@ Func_c554: ; c554 (3:4554)
push bc
push de
call Func_c58b
- ld a, [$d235]
+ ld a, [wd235]
ld d, a
- ld a, [$d236]
+ ld a, [wd236]
ld e, a
ld c, $2
call Func_3dbf
- ld a, [$d332]
+ ld a, [wd332]
sub d
add $8
ld [hli], a
- ld a, [$d333]
+ ld a, [wd333]
sub e
add $10
ld [hli], a
@@ -689,7 +689,7 @@ Func_c5ac: ; c5ac (3:45ac)
jr z, .asm_c5bf
call Func_c5cb
call Func_c5fe
- ld a, [$d335]
+ ld a, [wd335]
and $1
jr nz, .asm_c5ca
.asm_c5bf
@@ -703,7 +703,7 @@ Func_c5ac: ; c5ac (3:45ac)
Func_c5cb: ; c5cb (3:45cb)
call Func_c5d5
- ld [$d334], a
+ ld [wd334], a
call Func_c5e9
ret
@@ -727,11 +727,11 @@ Unknown_c5e5: ; c5e5 (3:45e5)
Func_c5e9: ; c5e9 (3:45e9)
push bc
- ld a, [$d336]
- ld [$d4cf], a
- ld a, [$d337]
+ ld a, [wd336]
+ ld [wd4cf], a
+ ld a, [wd337]
ld b, a
- ld a, [$d334]
+ ld a, [wd334]
add b
farcall Func_12ab5
pop bc
@@ -763,11 +763,11 @@ Func_c619: ; c619 (3:4619)
ld [wPlayerXCoord], a
ld a, c
ld [wPlayerYCoord], a
- ld a, [$d335]
+ ld a, [wd335]
or $1
- ld [$d335], a
+ ld [wd335], a
ld a, $10
- ld [$d338], a
+ ld [wd338], a
ld c, $f
call Func_3dbf
set 2, [hl]
@@ -781,7 +781,7 @@ Func_c619: ; c619 (3:4619)
ret
Func_c653: ; c653 (3:4653)
- ld a, [$d334]
+ ld a, [wd334]
rlca
ld c, a
ld b, $0
@@ -805,12 +805,12 @@ Func_c66c: ; c66c (3:466c)
ldh a, [hButtonsHeld]
bit B_BUTTON_F, a
jr z, .asm_c67e
- ld a, [$d338]
+ ld a, [wd338]
cp $2
jr c, .asm_c67e
inc c
.asm_c67e
- ld a, [$d334]
+ ld a, [wd334]
call Func_c694
pop bc
pop hl
@@ -838,14 +838,14 @@ Func_c694: ; c694 (3:4694)
or a
call nz, Func_c6d4
pop hl
- ld a, [$d338]
+ ld a, [wd338]
dec a
- ld [$d338], a
+ ld [wd338], a
jr z, .asm_c6b8
dec c
jr nz, .asm_c6a0
.asm_c6b8
- ld a, [$d338]
+ ld a, [wd338]
or a
jr nz, .asm_c6c3
ld hl, $d335
@@ -881,15 +881,15 @@ Func_c6dc: ; c6dc (3:46dc)
call Func_c6f7
call Func_3997
call Func_c70d
- ld a, [$d0bf]
+ ld a, [wd0bf]
cp $1
call z, Func_c9c0
pop hl
ret
Func_c6f7: ; c6f7 (3:46f7)
- ld a, [$d336]
- ld [$d4cf], a
+ ld a, [wd336]
+ ld [wd4cf], a
ld c, $f
call Func_3dbf
res 2, [hl]
@@ -913,15 +913,15 @@ Func_c70d: ; c70d (3:470d)
Func_c71e: ; c71e (3:471e)
ld a, $ff
- ld [$d3b6], a
+ ld [wd3b6], a
call Func_c653
call Func_3927
and $40
jr z, .asm_c73d
farcall Func_1c72e
jr c, .asm_c73d
- ld a, [$d3aa]
- ld [$d3b6], a
+ ld a, [wd3aa]
+ ld [wd3b6], a
ld a, $2
jr .asm_c748
.asm_c73d
@@ -933,7 +933,7 @@ Func_c71e: ; c71e (3:471e)
or a
ret
.asm_c748
- ld [$d0bf], a
+ ld [wd0bf], a
scf
ret
@@ -961,14 +961,14 @@ MainMenu_c75a: ; c75a (3:475a)
call MenuCursorAcceptInput
jr nc, .asm_c76a
ld a, e
- ld [$d0b8], a
+ ld [wd0b8], a
ldh a, [hCurrentMenuItem]
cp e
jr nz, .asm_c793
cp $5
jr z, .asm_c793
call Func_c2a3
- ld a, [$d0b8]
+ ld a, [wd0b8]
ld hl, PointerTable_c7a2
call JumpToFunctionInTable
ld hl, Func_c797
@@ -979,7 +979,7 @@ MainMenu_c75a: ; c75a (3:475a)
ret
Func_c797: ; c797 (3:4797)
- ld a, [$d0b8]
+ ld a, [wd0b8]
ld hl, Unknown_cd98
farcall Func_111e9
ret
@@ -1045,14 +1045,14 @@ PC_c7ea: ; c7ea (3:47ea)
call MenuCursorAcceptInput
jr nc, .asm_c806
ld a, e
- ld [$d0b9], a
+ ld [wd0b9], a
ldh a, [hCurrentMenuItem]
cp e
jr nz, .asm_c82f
cp $4
jr z, .asm_c82f
call Func_c2a3
- ld a, [$d0b9]
+ ld a, [wd0b9]
ld hl, $4846
call JumpToFunctionInTable
ld hl, $484e
@@ -1065,7 +1065,7 @@ PC_c7ea: ; c7ea (3:47ea)
call $4891
call Func_c111
xor a
- ld [$d112], a
+ ld [wd112], a
call Func_39fc
ret
; 0xc846
@@ -1079,7 +1079,7 @@ Func_c935: ; c935 (3:4935)
inc hl
ld [hl], b
ld a, $3
- ld [$d0bf], a
+ ld [wd0bf], a
pop hl
ret
@@ -1092,28 +1092,28 @@ Func_c943: ; c943 (3:4943)
jr nc, .asm_c98f
.asm_c94d
ld a, l
- ld [$d4c4], a
+ ld [wd4c4], a
ld a, h
- ld [$d4c5], a
+ ld [wd4c5], a
ld a, $4
- ld [$d4c6], a
+ ld [wd4c6], a
ld de, $d3ab
ld bc, $0006
call Func_3bf5
- ld a, [$d3ab]
+ ld a, [wd3ab]
or a
jr z, .asm_c98f
push hl
- ld a, [$d3af]
+ ld a, [wd3af]
ld l, a
- ld a, [$d3b0]
+ ld a, [wd3b0]
ld h, a
or l
jr z, .asm_c97a
call Func_3c45
jr nc, .asm_c988
.asm_c97a
- ld a, [$d3ab]
+ ld a, [wd3ab]
farcall Func_11857
call Func_c998
farcall Func_1c485
@@ -1131,22 +1131,22 @@ Func_c943: ; c943 (3:4943)
ret
Func_c998: ; c998 (3:4998)
- ld a, [$d3ab]
+ ld a, [wd3ab]
cp $22
ret nz
- ld a, [$d3d0]
+ ld a, [wd3d0]
or a
ret z
ld b, $4
- ld a, [$cab4]
+ ld a, [wConsole]
cp $2
jr nz, .asm_c9ae
ld b, $e
.asm_c9ae
ld a, b
- ld [$d3b1], a
+ ld [wd3b1], a
ld a, $0
- ld [$d3b2], a
+ ld [wd3b2], a
ret
Func_c9b8: ; c9b8 (3:49b8)
@@ -1187,7 +1187,7 @@ Func_c9cb: ; c9cb (3:49cb)
Func_c9dd: ; c9dd (3:49dd)
xor a
- ld [$d411], a
+ ld [wd411], a
call Func_c9e8
call Func_ca0e
ret
@@ -1205,7 +1205,7 @@ Func_c9e8: ; c9e8 (3:49e8)
ld b, $0
ld hl, Unknown_ca0a
add hl, bc
- ld a, [$d0bb]
+ ld a, [wd0bb]
cp [hl]
jr z, .asm_c9f2
.asm_ca04
@@ -1218,7 +1218,7 @@ Unknown_ca0a: ; ca0a (3:4a04)
INCBIN "baserom.gbc",$ca0a,$ca0e - $ca0a
Func_ca0e: ; ca0e (3:4a0e)
- ld a, [$d32e]
+ ld a, [wd32e]
cp $b
jr z, .asm_ca68
call Func_ca69
@@ -1279,7 +1279,7 @@ Func_ca6c: ; ca6c (3:4a6c)
push bc
call Func_cb1d
ld c, [hl]
- ld a, [$d3d1]
+ ld a, [wd3d1]
.asm_ca75
bit 0, a
jr nz, .asm_ca7f
@@ -1301,7 +1301,7 @@ Func_ca8f: ; ca8f (3:4a8f)
push hl
push bc
call Func_cb1d
- ld a, [$d3d1]
+ ld a, [wd3d1]
.asm_ca9a
bit 0, a
jr nz, .asm_caa4
@@ -1309,10 +1309,10 @@ Func_ca8f: ; ca8f (3:4a8f)
sla c
jr .asm_ca9a
.asm_caa4
- ld a, [$d3d1]
+ ld a, [wd3d1]
and c
ld c, a
- ld a, [$d3d1]
+ ld a, [wd3d1]
cpl
and [hl]
or c
@@ -1351,7 +1351,7 @@ Func_cb1d: ; cb1d (3:4b1d)
ld a, [hli]
ld c, a
ld a, [hl]
- ld [$d3d1], a
+ ld [wd3d1], a
ld b, $0
ld hl, $d3d2
add hl, bc
@@ -1364,14 +1364,14 @@ INCBIN "baserom.gbc",$cb37,$cc42 - $cb37
RST20: ; cc42 (3:4c42)
pop hl
ld a, l
- ld [$d413], a
+ ld [wd413], a
ld a, h
- ld [$d414], a
+ ld [wd414], a
xor a
- ld [$d412], a
+ ld [wd412], a
.asm_cc4f
call Func_3aed
- ld a, [$d412]
+ ld a, [wd412]
or a
jr z, .asm_cc4f
ld hl, $d413
@@ -1404,7 +1404,7 @@ DeckMachine_d336: ; d336 (3:5336)
or a
jr z, .asm_d360
dec a
- ld [$d0a9], a
+ ld [wd0a9], a
farcallx $2, $7a04
jr .asm_d364
.asm_d360
@@ -1418,7 +1418,7 @@ DeckMachine_d336: ; d336 (3:5336)
INCBIN "baserom.gbc",$d36d,$fc2b - $d36d
Func_fc2b: ; fc2b (3:7c2b)
- ld a, [$d0c3]
+ ld a, [wd0c3]
cp $2
jr c, .asm_fc34
ld a, $2
@@ -1432,9 +1432,9 @@ Func_fc2b: ; fc2b (3:7c2b)
inc hl
ld b, [hl]
ld a, $b0
- ld [$d0c8], a
+ ld [wd0c8], a
ld a, $3
- ld [$d0c9], a
+ ld [wd0c9], a
jp Func_c935
PointerTable_fc4c: ; fc4c (3:7c4c)
diff --git a/src/engine/bank4.asm b/src/engine/bank4.asm
index 6dfb9ac..36aa471 100755
--- a/src/engine/bank4.asm
+++ b/src/engine/bank4.asm
@@ -9,8 +9,8 @@ INCBIN "baserom.gbc",$100a2,$1029e - $100a2
Medal_1029e: ; 1029e (4:429e)
sub $8
ld c, a
- ld [$d115], a
- ld a, [$d291]
+ ld [wd115], a
+ ld a, [wd291]
push af
push bc
call Func_379b
@@ -20,7 +20,7 @@ Medal_1029e: ; 1029e (4:429e)
call DisableLCD
call $4000
ld a, $fa
- ld [$d114], a
+ ld [wd114], a
call $410c
pop bc
ld a, c
@@ -30,23 +30,23 @@ Medal_1029e: ; 1029e (4:429e)
ld hl, Unknown_1030b
add hl, bc
ld a, [hli]
- ld [$ce3f], a
+ ld [wce3f], a
ld a, [hl]
- ld [$ce40], a
+ ld [wce40], a
call $4031
ld a, MUSIC_MEDAL
call PlaySong
ld a, $ff
- ld [$d116], a
+ ld [wd116], a
.asm_102e2
call DoFrameIfLCDEnabled
- ld a, [$d116]
+ ld a, [wd116]
inc a
- ld [$d116], a
+ ld [wd116], a
and $f
jr nz, .asm_102e2
call $4197
- ld a, [$d116]
+ ld a, [wd116]
cp $e0
jr nz, .asm_102e2
text_hl WonTheMedalText
@@ -54,7 +54,7 @@ Medal_1029e: ; 1029e (4:429e)
call Func_3c96
call Func_37a0
pop af
- ld [$d291], a
+ ld [wd291], a
ret
Unknown_1030b: ; 1030b (4:430b)
@@ -62,7 +62,7 @@ INCBIN "baserom.gbc",$1030b,$1031b - $1030b
BoosterPack_1031b: ; 1031b (4:431b)
ld c, a
- ld a, [$d291]
+ ld a, [wd291]
push af
push bc
call DisableLCD
@@ -87,13 +87,13 @@ BoosterPack_1031b: ; 1031b (4:431b)
call $70ca
pop hl
ld a, [hli]
- ld [$ce43], a
+ ld [wce43], a
xor a
- ld [$ce44], a
+ ld [wce44], a
ld a, [hli]
- ld [$ce3f], a
+ ld [wce3f], a
ld a, [hl]
- ld [$ce40], a
+ ld [wce40], a
call $4031
call Func_379b
ld a, MUSIC_BOOSTERPACK
@@ -102,7 +102,7 @@ BoosterPack_1031b: ; 1031b (4:431b)
ld a, c
farcall GenerateBoosterPack
text_hl ReceivedBoosterPackText
- ld a, [$d117]
+ ld a, [wd117]
cp $1
jr nz, .asm_10373
text_hl AndAnotherBoosterPackText
@@ -116,14 +116,14 @@ BoosterPack_1031b: ; 1031b (4:431b)
call Func_1288c
call Func_099c
ld a, $1
- ld [$cac0], a
+ ld [wVBlankOAMCopyToggle], a
ld a, $4
ld [wFrameType], a
farcallx $1, $7599
farcall Func_c1a4
call DoFrameIfLCDEnabled
pop af
- ld [$d291], a
+ ld [wd291], a
ret
; 0x103a5
@@ -133,7 +133,7 @@ Func_103d2: ; 103d2 (4:43d2)
INCBIN "baserom.gbc",$103d2,$103d3 - $103d2
Duel_Init: ; 103d3 (4:43d3)
- ld a, [$d291]
+ ld a, [wd291]
push af
call DisableLCD
call $4000
@@ -142,7 +142,7 @@ Duel_Init: ; 103d3 (4:43d3)
ld de, $000c
ld bc, $1406
call DrawRegularTextBox
- ld a, [$cc19]
+ ld a, [wcc19]
add a
add a
ld c, a
@@ -150,22 +150,22 @@ Duel_Init: ; 103d3 (4:43d3)
ld hl, $445b
add hl, bc
ld a, [hli]
- ld [$ce3f], a
+ ld [wce3f], a
ld a, [hli]
- ld [$ce40], a
+ ld [wce40], a
push hl
- ld a, [$cc16]
- ld [$ce41], a
- ld a, [$cc17]
- ld [$ce42], a
+ ld a, [wcc16]
+ ld [wce41], a
+ ld a, [wcc17]
+ ld [wce42], a
ld hl, $4451
call $51b3 ; LoadDuelistName
pop hl
ld a, [hli]
- ld [$ce3f], a
+ ld [wce3f], a
ld c, a
ld a, [hli]
- ld [$ce40], a
+ ld [wce40], a
or c
jr z, .asm_10425
ld hl, $4456
@@ -173,7 +173,7 @@ Duel_Init: ; 103d3 (4:43d3)
.asm_10425
ld bc, $0703
- ld a, [$cc15]
+ ld a, [wcc15]
call Func_3e2a ; LoadDuelistPortrait
ld a, [wMatchStartTheme]
call PlaySong
@@ -186,7 +186,7 @@ Duel_Init: ; 103d3 (4:43d3)
call Func_3c96
call Func_10ab4 ; fade out
pop af
- ld [$d291], a
+ ld [wd291], a
ret
; 0x10451
@@ -211,9 +211,9 @@ Func_10e28: ; 10e28 (4:4e28)
INCBIN "baserom.gbc",$10e28,$10e55 - $10e28
Func_10e55: ; 10e55 (4:4e55)
- ld a, [$d336]
- ld [$d4cf], a
- ld a, [$d33e]
+ ld a, [wd336]
+ ld [wd4cf], a
+ ld a, [wd33e]
or a
jr nz, .asm_10e65
call Func_10e71
@@ -232,7 +232,7 @@ Func_10e71: ; 10e71 (4:4e71)
and D_PAD
jr z, .asm_10e83
farcall Func_c5d5
- ld [$d334], a
+ ld [wd334], a
call Func_10e97
jr .asm_10e96
.asm_10e83
@@ -250,11 +250,11 @@ Func_10e71: ; 10e71 (4:4e71)
Func_10e97: ; 10e97 (4:4e97)
push hl
pop hl
- ld a, [$d32e]
+ ld a, [wd32e]
rlca
rlca
ld c, a
- ld a, [$d334]
+ ld a, [wd334]
add c
ld c, a
ld b, $0
@@ -263,7 +263,7 @@ Func_10e97: ; 10e97 (4:4e97)
ld a, [hl]
or a
jr z, .asm_10eb9
- ld [$d32e], a
+ ld [wd32e], a
call Func_10f2e
ld a, $1
call Func_3796
@@ -319,7 +319,7 @@ Func_10f2e: ; 10f2e (4:4f2e)
Func_10f4a: ; 10f4a (4:4f4a)
push bc
- ld a, [$d32e]
+ ld a, [wd32e]
cp $2
jr nz, .asm_10f5f
ld c, a
@@ -336,7 +336,7 @@ Func_10f4a: ; 10f4a (4:4f4a)
LoadOverworldMapSelection: ; 10f61 (4:4f61)
push hl
push bc
- ld a, [$d32e]
+ ld a, [wd32e]
rlca
rlca
ld c, a
@@ -344,13 +344,13 @@ LoadOverworldMapSelection: ; 10f61 (4:4f61)
ld hl, OverworldMapIndexes
add hl, bc
ld a, [hli]
- ld [$d0bb], a
+ ld [wd0bb], a
ld a, [hli]
- ld [$d0bc], a
+ ld [wd0bc], a
ld a, [hli]
- ld [$d0bd], a
+ ld [wd0bd], a
ld a, $0
- ld [$d0be], a
+ ld [wd0be], a
ld hl, $d0b4
set 4, [hl]
pop bc
@@ -369,7 +369,7 @@ Func_10fbc: ; 10fbc (4:4fbc)
ld a, $10
ld [hl], a
ld b, $34
- ld a, [$cab4]
+ ld a, [wConsole]
cp $2
jr nz, .asm_10fd8
ld b, $37
@@ -379,22 +379,22 @@ Func_10fbc: ; 10fbc (4:4fbc)
ret
Func_10fde: ; 10fde (4:4fde)
- ld a, [$d32e]
- ld [$d33d], a
+ ld a, [wd32e]
+ ld [wd33d], a
xor a
- ld [$d33e], a
+ ld [wd33e], a
ld a, $25
call Func_1299f
- ld a, [$d4cf]
- ld [$d33b], a
+ ld a, [wd4cf]
+ ld [wd33b], a
ld b, $35
- ld a, [$cab4]
+ ld a, [wConsole]
cp $2
jr nz, .asm_10ffe
ld b, $38
.asm_10ffe
ld a, b
- ld [$d33c], a
+ ld [wd33c], a
call Func_12ab5
ld a, $3e
farcall Func_ca6c
@@ -407,9 +407,9 @@ Func_10fde: ; 10fde (4:4fde)
ret
Func_11016: ; 11016 (4:5016)
- ld a, [$d33b]
- ld [$d4cf], a
- ld a, [$d33c]
+ ld a, [wd33b]
+ ld [wd4cf], a
+ ld a, [wd33c]
inc a
call Func_12ab5
ret
@@ -417,13 +417,13 @@ Func_11016: ; 11016 (4:5016)
Func_11024: ; 11024 (4:5024)
ld a, $57
call Func_3796
- ld a, [$d336]
- ld [$d4cf], a
+ ld a, [wd336]
+ ld [wd4cf], a
ld c, $f
call Func_3dbf
set 2, [hl]
ld hl, Unknown_1229f
- ld a, [$d33d]
+ ld a, [wd33d]
dec a
add a
ld c, a
@@ -432,31 +432,31 @@ Func_11024: ; 11024 (4:5024)
ld a, [hli]
ld h, [hl]
ld l, a
- ld a, [$d32e]
+ ld a, [wd32e]
dec a
add a
ld c, a
ld b, $0
add hl, bc
ld a, [hli]
- ld [$d33f], a
+ ld [wd33f], a
ld a, [hl]
- ld [$d340], a
+ ld [wd340], a
ld a, $1
- ld [$d33e], a
+ ld [wd33e], a
xor a
- ld [$d341], a
+ ld [wd341], a
ret
Func_11060: ; 11060 (4:5060)
- ld a, [$d336]
- ld [$d4cf], a
- ld a, [$d341]
+ ld a, [wd336]
+ ld [wd4cf], a
+ ld a, [wd341]
or a
jp nz, Func_11184
- ld a, [$d33f]
+ ld a, [wd33f]
ld l, a
- ld a, [$d340]
+ ld a, [wd340]
ld h, a
ld a, [hli]
ld b, a
@@ -468,9 +468,9 @@ Func_11060: ; 11060 (4:5060)
ld a, c
or b
jr nz, .asm_11094
- ld a, [$d33d]
+ ld a, [wd33d]
ld e, a
- ld a, [$d32e]
+ ld a, [wd32e]
cp e
jr z, .asm_110a0
ld de, $0000
@@ -479,14 +479,14 @@ Func_11060: ; 11060 (4:5060)
ld c, e
.asm_11094
ld a, l
- ld [$d33f], a
+ ld [wd33f], a
ld a, h
- ld [$d340], a
+ ld [wd340], a
call Func_110a6
ret
.asm_110a0
ld a, $2
- ld [$d33e], a
+ ld [wd33e], a
ret
Func_110a6: ; 110a6 (4:50a6)
@@ -497,33 +497,33 @@ Func_110a6: ; 110a6 (4:50a6)
pop bc
ld a, b
sub [hl]
- ld [$d343], a
+ ld [wd343], a
ld a, $0
sbc $0
- ld [$d344], a
+ ld [wd344], a
inc hl
ld a, c
sub [hl]
- ld [$d345], a
+ ld [wd345], a
ld a, $0
sbc $0
- ld [$d346], a
- ld a, [$d343]
+ ld [wd346], a
+ ld a, [wd343]
ld b, a
- ld a, [$d344]
+ ld a, [wd344]
bit 7, a
jr z, .asm_110d8
- ld a, [$d343]
+ ld a, [wd343]
cpl
inc a
ld b, a
.asm_110d8
- ld a, [$d345]
+ ld a, [wd345]
ld c, a
- ld a, [$d346]
+ ld a, [wd346]
bit 7, a
jr z, .asm_110e9
- ld a, [$d345]
+ ld a, [wd345]
cpl
inc a
ld c, a
@@ -537,15 +537,15 @@ Func_110a6: ; 110a6 (4:50a6)
call Func_1113e
.asm_110f5
xor a
- ld [$d347], a
- ld [$d348], a
+ ld [wd347], a
+ ld [wd348], a
farcall Func_c5e9
pop hl
ret
Func_11102: ; 11102 (4:5102)
ld a, b
- ld [$d341], a
+ ld [wd341], a
ld e, a
ld d, $0
ld hl, $d343
@@ -562,27 +562,27 @@ Func_11102: ; 11102 (4:5102)
ld b, c
ld c, $0
call DivideBCbyDE
- ld a, [$d346]
+ ld a, [wd346]
bit 7, a
jr z, .asm_11127
call Func_11179
.asm_11127
ld a, c
- ld [$d345], a
+ ld [wd345], a
ld a, b
- ld [$d346], a
+ ld [wd346], a
ld hl, $d344
ld a, $1
bit 7, [hl]
jr z, .asm_1113a
ld a, $3
.asm_1113a
- ld [$d334], a
+ ld [wd334], a
ret
Func_1113e: ; 1113e (4:513e)
ld a, c
- ld [$d341], a
+ ld [wd341], a
ld e, a
ld d, $0
ld hl, $d345
@@ -598,22 +598,22 @@ Func_1113e: ; 1113e (4:513e)
ld [hl], a
ld c, $0
call DivideBCbyDE
- ld a, [$d344]
+ ld a, [wd344]
bit 7, a
jr z, .asm_11162
call Func_11179
.asm_11162
ld a, c
- ld [$d343], a
+ ld [wd343], a
ld a, b
- ld [$d344], a
+ ld [wd344], a
ld hl, $d346
ld a, $2
bit 7, [hl]
jr z, .asm_11175
ld a, $0
.asm_11175
- ld [$d334], a
+ ld [wd334], a
ret
Func_11179: ; 11179 (4:5179)
@@ -628,29 +628,29 @@ Func_11179: ; 11179 (4:5179)
ret
Func_11184: ; 11184 (4:5184)
- ld a, [$d347]
+ ld a, [wd347]
ld d, a
- ld a, [$d348]
+ ld a, [wd348]
ld e, a
ld c, $2
call Func_3dbf
- ld a, [$d343]
+ ld a, [wd343]
add d
ld d, a
- ld a, [$d344]
+ ld a, [wd344]
adc [hl]
ld [hl], a
inc hl
- ld a, [$d345]
+ ld a, [wd345]
add e
ld e, a
- ld a, [$d346]
+ ld a, [wd346]
adc [hl]
ld [hl], a
ld a, d
- ld [$d347], a
+ ld [wd347], a
ld a, e
- ld [$d348], a
+ ld [wd348], a
ld hl, $d341
dec [hl]
ret
@@ -688,17 +688,17 @@ INCBIN "baserom.gbc",$1229f,$126d1 - $1229f
Func_126d1: ; 126d1 (4:66d1)
call Func_099c
- ld hl, $cac0
+ ld hl, wVBlankOAMCopyToggle
inc [hl]
farcall Func_70018
ld a, $ff
- ld [$d627], a
+ ld [wd627], a
.asm_126e1
ld a, PLAYER_TURN
ldh [hWhoseTurn], a
farcall Func_c1f8
farcall Func_1d078
- ld a, [$d628]
+ ld a, [wd628]
ld hl, PointerTable_126fc
call JumpToFunctionInTable
jr c, .asm_126e1
@@ -719,19 +719,19 @@ Func_12704: ; 12704 (4:6704)
farcall Func_1996e
call EnableExtRAM
ld a, [$a007]
- ld [$d421], a
+ ld [wd421], a
ld a, [$a006]
- ld [$ce47], a
+ ld [wTextSpeed], a
call DisableExtRAM
ld a, MUSIC_STOP
call PlaySong
farcall Func_70000
ld a, $9
- ld [$d111], a
+ ld [wd111], a
call Func_39fc
farcall Func_1d306
ld a, $0
- ld [$d0b5], a
+ ld [wd0b5], a
farcallx $03, Func_383d
or a
ret
@@ -748,7 +748,7 @@ Func_12741: ; 12741 (4:6741)
ld [$ba44], a
call DisableExtRAM
ld a, $0
- ld [$d0b5], a
+ ld [wd0b5], a
farcallx $03, Func_383d
or a
ret
@@ -771,7 +771,7 @@ Func_1277e: ; 1277e (4:677e)
farcallx $04, Func_3a40
farcall Func_70000
ld a, $5
- ld [$d0b5], a
+ ld [wd0b5], a
farcallx $03, Func_383d
or a
ret
@@ -793,7 +793,7 @@ INCBIN "baserom.gbc",$1296e,$1299f - $1296e
Func_1299f: ; 1299f (4:699f)
push af
- ld a, [$d5d7]
+ ld a, [wd5d7]
or a
jr z, .asm_129a8
pop af
@@ -803,9 +803,9 @@ Func_1299f: ; 1299f (4:699f)
push bc
push hl
call Func_12c05
- ld [$d5d3], a
+ ld [wd5d3], a
xor a
- ld [$d4cf], a
+ ld [wd4cf], a
call Func_3db7
ld bc, $0010
.asm_129bb
@@ -813,9 +813,9 @@ Func_1299f: ; 1299f (4:699f)
or a
jr z, .asm_129cf
add hl, bc
- ld a, [$d4cf]
+ ld a, [wd4cf]
inc a
- ld [$d4cf], a
+ ld [wd4cf], a
cp $10
jr nz, .asm_129bb
rst $38
@@ -845,7 +845,7 @@ Func_129d9: ; 129d9 (4:69d9)
pop hl
ld bc, $0004
add hl, bc
- ld a, [$d5d3]
+ ld a, [wd5d3]
ld [hli], a
ld a, $ff
ld [hl], a
@@ -895,12 +895,12 @@ Func_12ae2: ; 12ae2 (4:6ae2)
farcall Func_8020f
farcall Func_80229
pop hl
- ld a, [$d4c6]
+ ld a, [wd4c6]
ld [hli], a
- ld a, [$d4c4]
+ ld a, [wd4c4]
ld [hli], a
ld c, a
- ld a, [$d4c5]
+ ld a, [wd4c5]
ld [hli], a
ld b, a
ld a, $3
@@ -922,15 +922,15 @@ Func_12b13: ; 12b13 (4:6b13)
ld bc, $0006
add hl, bc
ld a, [hli]
- ld [$d4c6], a
+ ld [wd4c6], a
inc hl
inc hl
ld a, [hl]
- ld [$d4c4], a
+ ld [wd4c4], a
add $4
ld [hli], a
ld a, [hl]
- ld [$d4c5], a
+ ld [wd4c5], a
adc $0
ld [hl], a
ld de, $d23e
@@ -975,7 +975,7 @@ Func_12b13: ; 12b13 (4:6b13)
ret
Func_12b6a: ; 12b6a (4:6b6a)
- ld [$d4ca], a
+ ld [wd4ca], a
push hl
push bc
push de
@@ -983,11 +983,11 @@ Func_12b6a: ; 12b6a (4:6b6a)
ld bc, $0006
add hl, bc
ld a, [hli]
- ld [$d4c6], a
+ ld [wd4c6], a
ld a, [hli]
- ld [$d4c4], a
+ ld [wd4c4], a
ld a, [hli]
- ld [$d4c5], a
+ ld [wd4c5], a
pop hl
call Func_3d72
pop de
@@ -1033,7 +1033,7 @@ Func_12c05: ; 12c05 (4:6c05)
push de
ld b, a
ld d, $0
- ld a, [$d618]
+ ld a, [wd618]
ld c, a
ld hl, $d5d8
or a
@@ -1051,11 +1051,11 @@ Func_12c05: ; 12c05 (4:6c05)
dec c
jr nz, .asm_12c15
.asm_12c22
- ld a, [$d618]
+ ld a, [wd618]
cp $10
jr nc, .asm_12c48
inc a
- ld [$d618], a
+ ld [wd618], a
inc hl
push hl
ld a, b
@@ -1092,9 +1092,9 @@ Func_12c05: ; 12c05 (4:6c05)
Func_12c4f: ; 12c4f (4:6c4f)
push af
xor a
- ld [$d4cb], a
+ ld [wd4cb], a
ld a, d
- ld [$d4ca], a
+ ld [wd4ca], a
pop af
farcall Func_8025b
ret
@@ -1130,9 +1130,9 @@ Func_13485: ; 13485 (4:7485)
or a
ret z
ld a, [$ba56]
- ld [$ce43], a
+ ld [wce43], a
ld a, [$ba57]
- ld [$ce44], a
+ ld [wce44], a
call DisableExtRAM
call Func_379b
ld a, MUSIC_MEDAL
diff --git a/src/engine/bank6.asm b/src/engine/bank6.asm
index 63497e7..c66e669 100755
--- a/src/engine/bank6.asm
+++ b/src/engine/bank6.asm
@@ -50,7 +50,7 @@ Func_1996e: ; 1996e (6:596e)
ld [$a003], a
ld a, $2
ld [$a006], a
- ld [$ce47], a
+ ld [wTextSpeed], a
xor a
ld [$a007], a
ld [$a009], a
diff --git a/src/engine/bank7.asm b/src/engine/bank7.asm
index e8d9743..f43258e 100755
--- a/src/engine/bank7.asm
+++ b/src/engine/bank7.asm
@@ -35,13 +35,13 @@ Func_1c056: ; 1c056 (7:4056)
inc hl
inc hl
ld a, [hli]
- ld [$d0bb], a
+ ld [wd0bb], a
ld a, [hli]
- ld [$d0bc], a
+ ld [wd0bc], a
ld a, [hli]
- ld [$d0bd], a
- ld a, [$d334]
- ld [$d0be], a
+ ld [wd0bd], a
+ ld a, [wd334]
+ ld [wd0be], a
.asm_1c095
pop de
pop bc
@@ -64,24 +64,24 @@ Func_1c33b: ; 1c33b (7:433b)
ld hl, MapSongs
add hl, bc
ld a, [hli]
- ld [$d131], a
+ ld [wd131], a
ld a, [hli]
ld c, a
ld a, [hli]
- ld [$d28f], a
+ ld [wd28f], a
ld a, [hli]
- ld [$d132], a
+ ld [wd132], a
ld a, [hli]
- ld [$d290], a
+ ld [wd290], a
ld a, [hli]
- ld [$d111], a
- ld a, [$cab4]
+ ld [wd111], a
+ ld a, [wConsole]
cp $2
jr nz, .asm_1c370
ld a, c
or a
jr z, .asm_1c370
- ld [$d131], a
+ ld [wd131], a
.asm_1c370
pop de
pop bc
@@ -118,7 +118,7 @@ Func_1c82e: ; 1c82e (7:482e)
INCBIN "baserom.gbc",$1c82e,$1d078 - $1c82e
Func_1d078: ; 1d078 (7:5078)
- ld a, [$d627]
+ ld a, [wd627]
or a
jr z, .asm_1d0c7
.asm_1d07e
@@ -128,9 +128,9 @@ Func_1d078: ; 1d078 (7:5078)
call $5335
call $53ce
xor a
- ld [$d635], a
+ ld [wd635], a
ld a, $3c
- ld [$d626], a
+ ld [wd626], a
.asm_1d095
call DoFrameIfLCDEnabled
call UpdateRNGSources
@@ -160,20 +160,20 @@ Func_1d078: ; 1d078 (7:5078)
.asm_1d0c7
call $50fa
call $511c
- ld a, [$d628]
+ ld a, [wd628]
cp $2
jr nz, .asm_1d0db
call $5289
jr c, Func_1d078
jr .asm_1d0e7
.asm_1d0db
- ld a, [$d628]
+ ld a, [wd628]
cp $1
jr nz, .asm_1d0e7
call $52b8
jr c, Func_1d078
.asm_1d0e7
- ld a, [$d628]
+ ld a, [wd628]
cp $0
jr nz, .asm_1d0f3
call $52dd
@@ -195,15 +195,15 @@ Func_1d11c: ; 1d11c (7:511c)
call Func_2275
call Func_3ca0
xor a
- ld [$cd08], a
+ ld [wcd08], a
call $51e1
call $517f
ld a, $ff
- ld [$d626], a
- ld a, [$d627]
+ ld [wd626], a
+ ld a, [wd627]
cp $4
jr c, .asm_1d14f
- ld a, [$d624]
+ ld a, [wd624]
or a
jr z, .asm_1d14f
ld a, $1
@@ -222,15 +222,15 @@ Func_1d11c: ; 1d11c (7:511c)
ldh a, [hCurrentMenuItem]
cp e
jr nz, .asm_1d15a
- ld [$d627], a
- ld a, [$d624]
+ ld [wd627], a
+ ld a, [wd624]
or a
jr nz, .asm_1d17a
inc e
inc e
.asm_1d17a
ld a, e
- ld [$d628], a
+ ld [wd628], a
ret
; 0x1d17f
@@ -281,7 +281,7 @@ Credits_1d6ad: ; 1d6ad (7:56ad)
call $5705
call $4858
xor a
- ld [$d324], a
+ ld [wd324], a
ld a, MUSIC_CREDITS
call PlaySong
farcallx $4, $4031
@@ -290,7 +290,7 @@ Credits_1d6ad: ; 1d6ad (7:56ad)
call DoFrameIfLCDEnabled
call $5765
call $580b
- ld a, [$d633]
+ ld a, [wd633]
cp $ff
jr nz, .asm_1d6c8
call Func_3c96
@@ -305,7 +305,7 @@ Credits_1d6ad: ; 1d6ad (7:56ad)
call EnableLCD
call DoFrameIfLCDEnabled
call DisableLCD
- ld hl, $cabb
+ ld hl, wLCDC
set 1, [hl]
call ResetDoFrameFunction
ret
diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm
index a749bd8..d3d4eb1 100644
--- a/src/engine/effect_functions.asm
+++ b/src/engine/effect_functions.asm
@@ -34,7 +34,7 @@ SleepEffect: ; 2c030 (b:4030)
applyEffect
ldh a, [hWhoseTurn]
- ld hl, $cc05
+ ld hl, wcc05
cp [hl]
jr nz, .canInduceStatus
ld a, [wTempNonTurnDuelistCardId]
@@ -64,7 +64,7 @@ applyEffect
push hl
ld e, [hl]
ld d, $0
- ld hl, $ccce
+ ld hl, wccce
add hl, de
call SwapTurn
ldh a, [hWhoseTurn]
diff --git a/src/engine/home.asm b/src/engine/home.asm
index e35bc18..5d1938b 100755
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -2586,7 +2586,7 @@ CopyMoveDataAndDamageToBuffer: ; 16c0 (0:16c0)
ld a, d
ld [$ff9f], a
call LoadDeckCardToBuffer1
- ld a, [$cc2b]
+ ld a, [wCardBuffer1ID]
ld [wTempCardId], a
ld hl, wCardBuffer1Move1
dec e
diff --git a/src/wram.asm b/src/wram.asm
index b63291a..dce68e1 100755
--- a/src/wram.asm
+++ b/src/wram.asm
@@ -395,7 +395,10 @@ wCurrentDuelMenuItem:: ; cbc6
; For Trainer cards, $d or $e (two pages for trainer card descriptions)
wCardPageNumber:: ; cbc7
ds $1
- ds $3
+ ds $1
+
+wcbc9:: ; cbc9
+ ds $2
wBenchSelectedPokemon:: ; cbcb
ds $1
@@ -411,7 +414,26 @@ wSelectedDuelSubMenuItem:: ; cbcf
wSelectedDuelSubMenuScrollOffset:: ; cbd0
ds $1
- ds $35
+
+ ds $14
+
+wcbe5:: ; cbe5
+ ds $1
+
+wcbe6:: ; cbe6
+ ds $1
+
+wcbe7:: ; cbe7
+ ds $12
+
+wcbf9:: ; cbf9
+ ds $b
+
+wcc04:: ; cc04
+ ds $1
+
+wcc05:: ; cc05
+ ds $1
wcc06:: ; cc06
ds $1
@@ -422,6 +444,8 @@ wcc06:: ; cc06
; 3 = duel ended in a draw
wDuelFinished:: ; cc07
ds $1
+
+wcc08:: ; cc08
ds $1
wcc09:: ; cc09
@@ -431,7 +455,13 @@ wcc0a:: ; cc0a
ds $1
wDuelHasPlayedEnergy:: ; cc0b
- ds $3
+ ds $1
+
+wcc0c:: ; cc0c
+ ds $1
+
+wcc0d:: ; cc0d
+ ds $1
; this seems to hold the current opponent's deck id - 2,
; perhaps to account for the two unused pointers at the
@@ -451,7 +481,22 @@ wcc12:: ; cc12
wIsPracticeDuel:: ; cc13
ds $1
- ds $6
+ ds $1
+
+wcc15:: ; cc15
+ ds $1
+
+wcc16:: ; cc16
+ ds $1
+
+wcc17:: ; cc17
+ ds $1
+
+wcc18:: ; cc18
+ ds $1
+
+wcc19:: ; cc19
+ ds $1
wDuelTheme:: ; cc1a
ds $1
@@ -510,7 +555,10 @@ wccc9:: ; ccc9
ds $4
wcccd:: ; cccd
- ds $19
+ ds $1
+
+wccce:: ; ccce
+ ds $18
wcce6:: ; cce6
ds $5
@@ -531,7 +579,10 @@ wccf0:: ; ccf0
ds $1
wccf1:: ; ccf1
- ds $2
+ ds $1
+
+wccf2:: ; ccf2
+ ds $1
; color/pattern of the text box border. Values between 0-7?. Interpreted differently depending on console type
; Note that this doesn't appear to be a selectable option, just changes with the situation.
@@ -601,7 +652,19 @@ wcd99:: ; cd99
ds $1
wcd9a:: ; cd9a
- ds $88
+ ds $2
+
+wcd9c:: ; cd9c
+ ds $1
+
+wcd9d:: ; cd9d
+ ds $1
+
+wcd9e:: ; cd9e
+ ds $1
+
+wcd9f:: ; cd9f
+ ds $83
; During a duel, this is always $b after the first attack.
; $b is the bank where the functions associated to card or effect commands are.
@@ -613,7 +676,13 @@ wce3f:: ; cd3f
ds $1
wce40:: ; ce40
- ds $3
+ ds $1
+
+wce41:: ; ce41
+ ds $1
+
+wce42:: ; ce42
+ ds $1
wce43:: ; ce43
ds $1
@@ -668,16 +737,88 @@ wce6f:: ; ce6f
ds $d
wce7c:: ; ce7c
+ ds $27
+
+wcea3:: ; cea3
+ ds $c
+
+wceaf:: ; ceaf
+ ds $1
+
+wceb0:: ; ceb0
+ ds $1
+
+wceb1:: ; ceb1
+ ds $1
+
+wceb2:: ; ceb2
+ ds $1
+
+wceb3:: ; ceb3
+ ds $1
+
+wceb4:: ; ceb4
+ ds $1
+
+wceb5:: ; ceb5
+ ds $17
+
+wcecc:: ; cecc
+ ds $ed
+
+wcfb9:: ; cfb9
+ ds $2a
+
+wcfe3:: ; cfe3
;----------------------------------------------------------
;--- Bank 1: $Dxxx ----------------------------------------
;----------------------------------------------------------
SECTION "WRAM1", WRAMX, BANK[1]
- ds $b5
+ ds $a9
+
+wd0a9:: ; d0a9
+ ds $b
+
+wd0b4:: ; d0b4
+ ds $1
wd0b5:: ; d0b5
- ds $c
+ ds $1
+
+wd0b6:: ; d0b6
+ ds $1
+
+wd0b7:: ; d0b7
+ ds $1
+
+wd0b8:: ; d0b8
+ ds $1
+
+wd0b9:: ; d0b9
+ ds $1
+
+wd0ba:: ; d0ba
+ ds $1
+
+wd0bb:: ; d0bb
+ ds $1
+
+wd0bc:: ; d0bc
+ ds $1
+
+wd0bd:: ; d0bd
+ ds $1
+
+wd0be:: ; d0be
+ ds $1
+
+wd0bf:: ; d0bf
+ ds $1
+
+wd0c0:: ; d0c0
+ ds $1
wd0c1:: ; d0c1
ds $1
@@ -686,7 +827,13 @@ wd0c2:: ; d0c2
ds $1
wd0c3:: ; d0c3
- ds $3
+ ds $1
+
+wd0c4:: ; d0c4
+ ds $1
+
+wd0c5:: ; d0c5
+ ds $1
wd0c6:: ; d0c6
ds $1
@@ -704,10 +851,22 @@ wd0ca:: ; d0ca
ds $1
wd0cb:: ; d0cb
- ds $43
+ ds $41
+
+wd10c:: ; d10c
+ ds $1
+
+wd10d:: ; d10d
+ ds $1
wd10e:: ; d10e
- ds $3
+ ds $1
+
+wd10f:: ; d10f
+ ds $1
+
+wd110:: ; d110
+ ds $1
wd111:: ; d111
ds $1
@@ -719,7 +878,21 @@ wd112:: ; d112
wMatchStartTheme:: ; d113
ds $1
- ds $9
+
+wd114:: ; d114
+ ds $1
+
+wd115:: ; d115
+ ds $1
+
+wd116:: ; d116
+ ds $1
+
+wd117:: ; d117
+ ds $4
+
+wd11b:: ; d11b
+ ds $2
wPCPackSelection:: ; d11d
ds $1
@@ -734,10 +907,46 @@ wPCLastDirectionPressed:: ; d12d
ds $3
wd131:: ; d131
- ds $2
+ ds $1
+
+wd132:: ; d132
+ ds $1
wBoosterViableCardList:: ; d133
- ds $1fb
+ ds $100
+
+wd233:: ; d233
+ ds $1
+
+wd234:: ; d234
+ ds $1
+
+wd235:: ; d235
+ ds $1
+
+wd236:: ; d236
+ ds $1
+
+wd237:: ; d237
+ ds $1
+
+wd238:: ; d238
+ ds $57
+
+wd28f:: ; d28f
+ ds $1
+
+wd290:: ; d290
+ ds $1
+
+wd291:: ; d291
+ ds $92
+
+wd323:: ; d323
+ ds $1
+
+wd324:: ; d324
+ ds $a
wd32e:: ; d32e
ds $1
@@ -750,19 +959,123 @@ wPlayerXCoord:: ; d330
wPlayerYCoord:: ; d331
ds $1
- ds $2
+
+wd332:: ; d332
+ ds $1
+
+wd333:: ; d333
+ ds $1
wd334:: ; d334
- ds $76
+ ds $1
+
+wd335:: ; d335
+ ds $1
+
+wd336:: ; d336
+ ds $1
+
+wd337:: ; d337
+ ds $1
+
+wd338:: ; d338
+ ds $3
+
+wd33b:: ; d33b
+ ds $1
+
+wd33c:: ; d33c
+ ds $1
+
+wd33d:: ; d33d
+ ds $1
+
+wd33e:: ; d33e
+ ds $1
+
+wd33f:: ; d33f
+ ds $1
+
+wd340:: ; d340
+ ds $1
+
+wd341:: ; d341
+ ds $2
+
+wd343:: ; d343
+ ds $1
+
+wd344:: ; d344
+ ds $1
+
+wd345:: ; d345
+ ds $1
+
+wd346:: ; d346
+ ds $1
+
+wd347:: ; d347
+ ds $1
+
+wd348:: ; d348
+ ds $62
wd3aa:: ; d3aa
ds $1
wd3ab:: ; d3ab
- ds $d
+ ds $4
+
+wd3af:: ; d3af
+ ds $1
+
+wd3b0:: ; d3b0
+ ds $1
+
+wd3b1:: ; d3b1
+ ds $1
+
+wd3b2:: ; d3b2
+ ds $4
+
+wd3b6:: ; d3b6
+ ds $2
wd3b8:: ; d3b8
- ds $6a
+ ds $18
+
+wd3d0:: ; d3d0
+ ds $1
+
+wd3d1:: ; d3d1
+ ds $40
+
+wd411:: ; d411
+ ds $1
+
+wd412:: ; d412
+ ds $1
+
+wd413:: ; d413
+ ds $1
+
+wd414:: ; d414
+ ds $9
+
+wd41d:: ; d41d
+ ds $1
+
+wd41e:: ; d41e
+ ds $1
+
+wd41f:: ; d41f
+ ds $1
+
+wd420:: ; d420
+ ds $1
+
+wd421:: ; d421
+ ds $1
wd422:: ; d422
ds $8
@@ -774,7 +1087,13 @@ wd4ac:: ; d4ac
ds $12
wd4be:: ; d4be
- ds $6
+ ds $4
+
+wd4c2:: ; d4c2
+ ds $1
+
+wd4c3:: ; d4c3
+ ds $1
wd4c4:: ; d4c4
ds $1
@@ -783,22 +1102,55 @@ wd4c5:: ; d4c5
ds $1
wd4c6:: ; d4c6
- ds $4
+ ds $1
+
+wd4c7:: ; d4c7
+ ds $1
+
+wd4c8:: ; d4c8
+ ds $2
wd4ca:: ; d4ca
- ds $5
+ ds $1
+
+wd4cb:: ; d4cb
+ ds $4
wd4cf:: ; d4cf
- ds $108
+ ds $104
+
+wd5d3:: ; d5d3
+ ds $4
wd5d7:: ; d5d7
- ds $44
+ ds $41
+
+wd618:: ; d618
+ ds $3
wd61b:: ; d61b
ds $3
wd61e:: ; d61e
- ds $4b
+ ds $6
+
+wd624:: ; d624
+ ds $2
+
+wd626:: ; d626
+ ds $1
+
+wd627:: ; d627
+ ds $1
+
+wd628:: ; d628
+ ds $b
+
+wd633:: ; d633
+ ds $2
+
+wd635:: ; d635
+ ds $34
wBoosterDataIndex:: ; d669
ds $1
@@ -847,34 +1199,99 @@ wBoosterDataEnergyFunctionPointer:: ; d687
wBoosterDataTypeChanceData:: ; d689
ds $9
- ds $6f2
+ ds $6ee
+
+wdd80:: ; dd80
+ ds $1
+
+wdd81:: ; dd81
+ ds $1
+
+wdd82:: ; dd82
+ ds $1
+
+wdd83:: ; dd83
+ ds $1
wMusicDC:: ; dd84
ds $2
-wMusicDuty:: ; dd86
- ds $4
+wMusicDuty1:: ; dd86
+ ds $1
+
+wMusicDuty2:: ; dd87
+ ds $3
wMusicWave:: ; dd8a
ds $1
wMusicWaveChange:: ; dd8b
- ds $2
+ ds $1
+
+wdd8c:: ; dd8c
+ ds $1
wMusicIsPlaying:: ; dd8d
ds $4
wMusicTie:: ; dd91
- ds $c
+ ds $4
-wMusicMainLoop:: ; dd9d
- ds $12
+; 4 pointers to the current music commands being executed
+wMusicChannelPointers:: ; dd95
+ ds $8
+
+; 4 pointers to the addresses of the beginning of the main loop for each channel
+wMusicMainLoopStart:: ; dd9d
+ ds $8
+
+wMusicCh1CurPitch:: ; dda5
+ ds $1
+
+wMusicCh1CurOctave:: ; dda6
+ ds $1
+
+wMusicCh2CurPitch:: ; dda7
+ ds $1
+
+wMusicCh2CurOctave:: ; dda8
+ ds $1
+
+wMusicCh3CurPitch:: ; dda9
+ ds $1
+
+wMusicCh3CurOctave:: ; ddaa
+ ds $1
+
+wddab:: ; ddab
+ ds $1
+
+wddac:: ; ddac
+ ds $3
wMusicOctave:: ; ddaf
- ds $10
+ ds $8
+
+wddb7:: ; ddb7
+ ds $1
+
+wddb8:: ; ddb8
+ ds $1
+
+wddb9:: ; ddb9
+ ds $1
+
+wddba:: ; ddba
+ ds $1
+
+wddbb:: ; ddbb
+ ds $4
wMusicE8:: ; ddbf
- ds $8
+ ds $4
+
+wddc3:: ; ddc3
+ ds $4
wMusicE9:: ; ddc7
ds $4
@@ -889,18 +1306,68 @@ wMusicVibratoType:: ; ddd3
ds $4
wMusicVibratoType2:: ; ddd7
- ds $8
+ ds $4
+
+wdddb:: ; dddb
+ ds $4
wMusicVibratoDelay:: ; dddf
- ds $8
+ ds $4
+
+wdde3:: ; dde3
+ ds $4
wMusicVolume:: ; dde7
ds $3
wMusicE4:: ; ddea
- ds $9
+ ds $5
+
+wddef:: ; ddef
+ ds $1
+wddf0:: ; ddf0
+ ds $1
+
+wMusicPanning:: ; ddf1
+ ds $1
+
+wddf2:: ; ddf2
+ ds $1
+
+; 4 pointers to the addresses of the return point of the sub branch
wMusicReturnAddress:: ; ddf3
ds $8
+ ds $58
+
+wde53:: ; de53
+ ds $1
+
+wde54:: ; de54
+ ds $1
+
+wde55:: ; de55
+ ds $1
+
+wde56:: ; de56
+ ds $1
+
+wde57:: ; de57
+ ds $5
+
+wde5c:: ; de5c
+ ds $1
+
+wde5d:: ; de5d
+ ds $19
+
+wde76:: ; de76
+ ds $1
+
+wde77:: ; de77
+ ds $35
+
+wdeac:: ; deac
+
INCLUDE "sram.asm"
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 22:41:06 +0000