Rip some data... kinda

5 files changed, 1121 insertions, 361 deletions

diff --git a/audio/engine_0f.asm b/audio/engine_0f.asm
index 573d540..16b293a 100755
--- a/audio/engine_0f.asm
+++ b/audio/engine_0f.asm
@@ -1187,7 +1187,7 @@ Func_3c750: ; 0x3c750
 	ld a, [wdea1]
 	ld e, a
 	ld d, $0
-	ld hl, $4ba2
+	ld hl, Data_3cba2
 	add hl, de
 	add hl, de
 	ld a, [hli]
@@ -1687,7 +1687,7 @@ Func_3ca2b: ; 0x3ca2b
 	ld h, d
 	add hl, de
 	add hl, hl
-	ld de, $4b20 
+	ld de, Data_3cb20 
 	add hl, de
 	ld e, [hl]
 	inc hl
@@ -1836,6 +1836,7 @@ Func_3cb1b: ; 0x3cb1b
 	ld [wdd00], a
 	ret
 
+Data_3cb20:
 	dr $3cb20, $3cb52
 
 WavePatterns_BankF:
@@ -1850,6 +1851,7 @@ WavePattern3_BankF: ; 0x3cb82
 WavePattern4_BankF: ; 0x3cb92
 	db $00, $11, $22, $33, $44, $33, $22, $11, $FF, $EE, $CC, $AA, $88, $AA, $CC, $EE
 
+Data_3cba2:
 	dr $3cba2, $3cc8e
 
 Data_3cc8e: ; 0x3cc8e
@@ -1884,86 +1886,318 @@ INCLUDE "audio/music/haunterinthegraveyard.asm"
 INCLUDE "audio/music/gengarinthegraveyard.asm"
 
 PointerTable_3e3ce: ; 0x3e3ce
-	dw $646A
-	dw $6480
-	dw $649A
-	dw $64BA
-	dw $64D0
-	dw $64E0
-	dw $64F0
-	dw $6500
-	dw $651A
-	dw $652E
-	dw $6544
-	dw $6554
-	dw $657C
-	dw $6589
-	dw $659F
-	dw $65B5
-	dw $65C5
-	dw $65E2
-	dw $65F4
-	dw $6606
-	dw $6618
-	dw $662A
-	dw $663C
-	dw $664E
-	dw $6660
-	dw $6672
-	dw $6684
-	dw $6696
-	dw $66A8
-	dw $66BA
-	dw $66CC
-	dw $66DE
-	dw $66F0
-	dw $6702
-	dw $671A
-	dw $675D
-	dw $6810
-	dw $68AE
-	dw $696D
-	dw $6A25
-	dw $6A68
-	dw $6A82
-	dw $6B17
-	dw $6BF9
-	dw $6C17
-	dw $6C31
-	dw $6C4B
-	dw $6C7D
-	dw $6C8F
-	dw $6CA7
-	dw $6CB7
-	dw $6CD1
-	dw $6CE9
-	dw $6CFF
-	dw $6D15
-	dw $6D31
-	dw $6D4D
-	dw $6D65
-	dw $6D78
-	dw $6D98
-	dw $6DB0
-	dw $6DC0
-	dw $6DD0
-	dw $6DE3
-	dw $6DF3
-	dw $6E1C
-	dw $6E32
-	dw $6E48
-	dw $6E5E
-	dw $6E78
-	dw $6E92
-	dw $6EAA
-	dw $6EC4
-	dw $6ED4
-	dw $6EEA
-	dw $6F00
-	dw $6F16
-	dw $6F27
-
-	dr $3e46a, $3ef63
+	dw Data_3e46a
+	dw Data_3e480
+	dw Data_3e49a
+	dw Data_3e4ba
+	dw Data_3e4d0
+	dw Data_3e4e0
+	dw Data_3e4f0
+	dw Data_3e500
+	dw Data_3e51a
+	dw Data_3e52e
+	dw Data_3e544
+	dw Data_3e554
+	dw Data_3e57c
+	dw Data_3e589
+	dw Data_3e59f
+	dw Data_3e5b5
+	dw Data_3e5c5
+	dw Data_3e5e2
+	dw Data_3e5f4
+	dw Data_3e606
+	dw Data_3e618
+	dw Data_3e62a
+	dw Data_3e63c
+	dw Data_3e64e
+	dw Data_3e660
+	dw Data_3e672
+	dw Data_3e684
+	dw Data_3e696
+	dw Data_3e6a8
+	dw Data_3e6ba
+	dw Data_3e6cc
+	dw Data_3e6de
+	dw Data_3e6f0
+	dw Data_3e702
+	dw Data_3e71a
+	dw Data_3e75d
+	dw Data_3e810
+	dw Data_3e8ae
+	dw Data_3e96d
+	dw Data_3ea25
+	dw Data_3ea68
+	dw Data_3ea82
+	dw Data_3eb17
+	dw Data_3ebf9
+	dw Data_3ec17
+	dw Data_3ec31
+	dw Data_3ec4b
+	dw Data_3ec7d
+	dw Data_3ec8f
+	dw Data_3eca7
+	dw Data_3ecb7
+	dw Data_3ecd1
+	dw Data_3ece9
+	dw Data_3ecff
+	dw Data_3ed15
+	dw Data_3ed31
+	dw Data_3ed4d
+	dw Data_3ed65
+	dw Data_3ed78
+	dw Data_3ed98
+	dw Data_3edb0
+	dw Data_3edc0
+	dw Data_3edd0
+	dw Data_3ede3
+	dw Data_3edf3
+	dw Data_3ee1c
+	dw Data_3ee32
+	dw Data_3ee48
+	dw Data_3ee5e
+	dw Data_3ee78
+	dw Data_3ee92
+	dw Data_3eeaa
+	dw Data_3eec4
+	dw Data_3eed4
+	dw Data_3eeea
+	dw Data_3ef00
+	dw Data_3ef16
+	dw Data_3ef27
+
+Data_3e46a:
+	dr $3e46a, $3e480
+
+Data_3e480:
+	dr $3e480, $3e49a
+
+Data_3e49a:
+	dr $3e49a, $3e4ba
+
+Data_3e4ba:
+	dr $3e4ba, $3e4d0
+
+Data_3e4d0:
+	dr $3e4d0, $3e4e0
+
+Data_3e4e0:
+	dr $3e4e0, $3e4f0
+
+Data_3e4f0:
+	dr $3e4f0, $3e500
+
+Data_3e500:
+	dr $3e500, $3e51a
+
+Data_3e51a:
+	dr $3e51a, $3e52e
+
+Data_3e52e:
+	dr $3e52e, $3e544
+
+Data_3e544:
+	dr $3e544, $3e554
+
+Data_3e554:
+	dr $3e554, $3e57c
+
+Data_3e57c:
+	dr $3e57c, $3e589
+
+Data_3e589:
+	dr $3e589, $3e59f
+
+Data_3e59f:
+	dr $3e59f, $3e5b5
+
+Data_3e5b5:
+	dr $3e5b5, $3e5c5
+
+Data_3e5c5:
+	dr $3e5c5, $3e5e2
+
+Data_3e5e2:
+	dr $3e5e2, $3e5f4
+
+Data_3e5f4:
+	dr $3e5f4, $3e606
+
+Data_3e606:
+	dr $3e606, $3e618
+
+Data_3e618:
+	dr $3e618, $3e62a
+
+Data_3e62a:
+	dr $3e62a, $3e63c
+
+Data_3e63c:
+	dr $3e63c, $3e64e
+
+Data_3e64e:
+	dr $3e64e, $3e660
+
+Data_3e660:
+	dr $3e660, $3e672
+
+Data_3e672:
+	dr $3e672, $3e684
+
+Data_3e684:
+	dr $3e684, $3e696
+
+Data_3e696:
+	dr $3e696, $3e6a8
+
+Data_3e6a8:
+	dr $3e6a8, $3e6ba
+
+Data_3e6ba:
+	dr $3e6ba, $3e6cc
+
+Data_3e6cc:
+	dr $3e6cc, $3e6de
+
+Data_3e6de:
+	dr $3e6de, $3e6f0
+
+Data_3e6f0:
+	dr $3e6f0, $3e702
+
+Data_3e702:
+	dr $3e702, $3e71a
+
+Data_3e71a:
+	dr $3e71a, $3e75d
+
+Data_3e75d:
+	dr $3e75d, $3e810
+
+Data_3e810:
+	dr $3e810, $3e8ae
+
+Data_3e8ae:
+	dr $3e8ae, $3e96d
+
+Data_3e96d:
+	dr $3e96d, $3ea25
+
+Data_3ea25:
+	dr $3ea25, $3ea68
+
+Data_3ea68:
+	dr $3ea68, $3ea82
+
+Data_3ea82:
+	dr $3ea82, $3eb17
+
+Data_3eb17:
+	dr $3eb17, $3ebf9
+
+Data_3ebf9:
+	dr $3ebf9, $3ec17
+
+Data_3ec17:
+	dr $3ec17, $3ec31
+
+Data_3ec31:
+	dr $3ec31, $3ec4b
+
+Data_3ec4b:
+	dr $3ec4b, $3ec7d
+
+Data_3ec7d:
+	dr $3ec7d, $3ec8f
+
+Data_3ec8f:
+	dr $3ec8f, $3eca7
+
+Data_3eca7:
+	dr $3eca7, $3ecb7
+
+Data_3ecb7:
+	dr $3ecb7, $3ecd1
+
+Data_3ecd1:
+	dr $3ecd1, $3ece9
+
+Data_3ece9:
+	dr $3ece9, $3ecff
+
+Data_3ecff:
+	dr $3ecff, $3ed15
+
+Data_3ed15:
+	dr $3ed15, $3ed31
+
+Data_3ed31:
+	dr $3ed31, $3ed4d
+
+Data_3ed4d:
+	dr $3ed4d, $3ed65
+
+Data_3ed65:
+	dr $3ed65, $3ed78
+
+Data_3ed78:
+	dr $3ed78, $3ed98
+
+Data_3ed98:
+	dr $3ed98, $3edb0
+
+Data_3edb0:
+	dr $3edb0, $3edc0
+
+Data_3edc0:
+	dr $3edc0, $3edd0
+
+Data_3edd0:
+	dr $3edd0, $3ede3
+
+Data_3ede3:
+	dr $3ede3, $3edf3
+
+Data_3edf3:
+	dr $3edf3, $3ee1c
+
+Data_3ee1c:
+	dr $3ee1c, $3ee32
+
+Data_3ee32:
+	dr $3ee32, $3ee48
+
+Data_3ee48:
+	dr $3ee48, $3ee5e
+
+Data_3ee5e:
+	dr $3ee5e, $3ee78
+
+Data_3ee78:
+	dr $3ee78, $3ee92
+
+Data_3ee92:
+	dr $3ee92, $3eeaa
+
+Data_3eeaa:
+	dr $3eeaa, $3eec4
+
+Data_3eec4:
+	dr $3eec4, $3eed4
+
+Data_3eed4:
+	dr $3eed4, $3eeea
+
+Data_3eeea:
+	dr $3eeea, $3ef00
+
+Data_3ef00:
+	dr $3ef00, $3ef16
+
+Data_3ef16:
+	dr $3ef16, $3ef27
+
+Data_3ef27:
+	dr $3ef27, $3ef63
 
 CryBasePointers: ; 0x3ef63
 	dw Cry_00_Header_BankF
diff --git a/data/unknown_17679.asm b/data/unknown_17679.asm
new file mode 100755
index 0000000..58f549f
--- /dev/null
+++ b/data/unknown_17679.asm
@@ -0,0 +1,525 @@
+	dw Data_177a1
+	dw Data_177a4
+	dw Data_177a7
+	dw Data_177aa
+	dw Data_177ad
+	dw Data_177b0
+	dw Data_177b3
+	dw Data_177b6
+	dw Data_177b9
+	dw Data_177bc
+	dw $0000
+	dw $0000
+	dw $0000
+	dw $0000
+	dw $0000
+	dw $0000
+	dw Data_177bf
+	dw Data_177c2
+	dw Data_177c5
+	dw Data_177c8
+	dw Data_177cb
+	dw Data_177ce
+	dw Data_177d1
+	dw Data_177d4
+	dw Data_177d7
+	dw Data_177da
+	dw $0000
+	dw $0000
+	dw $0000
+	dw $0000
+	dw $0000
+	dw $0000
+	dw Data_177dd
+	dw Data_177e0
+	dw Data_177e3
+	dw Data_177e6
+	dw Data_177e9
+	dw Data_177ec
+	dw Data_177ef
+	dw Data_177f2
+	dw Data_177f5
+	dw Data_177f8
+	dw $0000
+	dw $0000
+	dw $0000
+	dw $0000
+	dw $0000
+	dw $0000
+	dw Data_177fb
+	dw Data_177fe
+	dw Data_17801
+	dw Data_17804
+	dw Data_17807
+	dw Data_1780a
+	dw Data_1780d
+	dw Data_17810
+	dw Data_17813
+	dw Data_17816
+	dw $0000
+	dw $0000
+	dw $0000
+	dw $0000
+	dw $0000
+	dw $0000
+	dw Data_17819
+	dw Data_1781c
+	dw Data_1781f
+	dw Data_17822
+	dw Data_17825
+	dw Data_17828
+	dw Data_1782b
+	dw Data_1782e
+	dw Data_17831
+	dw Data_17834
+	dw $0000
+	dw $0000
+	dw $0000
+	dw $0000
+	dw $0000
+	dw $0000
+	dw Data_17837
+	dw Data_1783a
+	dw Data_1783d
+	dw Data_17840
+	dw Data_17843
+	dw Data_17846
+	dw Data_17849
+	dw Data_1784c
+	dw Data_1784f
+	dw Data_17852
+	dw $0000
+	dw $0000
+	dw $0000
+	dw $0000
+	dw $0000
+	dw $0000
+	dw Data_17855
+	dw Data_17858
+	dw Data_1785b
+	dw Data_1785e
+	dw Data_17861
+	dw Data_17864
+	dw Data_17867
+	dw Data_1786a
+	dw Data_1786d
+	dw Data_17870
+	dw $0000
+	dw $0000
+	dw $0000
+	dw $0000
+	dw $0000
+	dw $0000
+	dw Data_17873
+	dw Data_17876
+	dw Data_17879
+	dw Data_1787c
+	dw Data_1787f
+	dw Data_17882
+	dw Data_17885
+	dw Data_17888
+	dw Data_1788b
+	dw Data_1788e
+	dw $0000
+	dw $0000
+	dw $0000
+	dw $0000
+	dw $0000
+	dw $0000
+	dw Data_17891
+	dw Data_17894
+	dw Data_17897
+	dw Data_1789a
+	dw Data_1789d
+	dw Data_178a0
+	dw Data_178a3
+	dw Data_178a6
+	dw Data_178a9
+	dw Data_178ac
+	dw $0000
+	dw $0000
+	dw $0000
+	dw $0000
+	dw $0000
+	dw $0000
+	dw Data_178af
+	dw Data_178b2
+	dw Data_178b5
+	dw Data_178b8
+
+Data_177a1: dbw 1, Data_178bb
+Data_177a4: dbw 1, Data_178c5
+Data_177a7: dbw 1, Data_178cf
+Data_177aa: dbw 1, Data_178d9
+Data_177ad: dbw 1, Data_178e3
+Data_177b0: dbw 1, Data_178ed
+Data_177b3: dbw 1, Data_178f7
+Data_177b6: dbw 1, Data_17901
+Data_177b9: dbw 1, Data_1790b
+Data_177bc: dbw 1, Data_17915
+Data_177bf: dbw 1, Data_1791f
+Data_177c2: dbw 1, Data_17929
+Data_177c5: dbw 1, Data_17933
+Data_177c8: dbw 1, Data_1793d
+Data_177cb: dbw 1, Data_17947
+Data_177ce: dbw 1, Data_17951
+Data_177d1: dbw 1, Data_1795b
+Data_177d4: dbw 1, Data_17965
+Data_177d7: dbw 1, Data_1796f
+Data_177da: dbw 1, Data_17979
+Data_177dd: dbw 1, Data_17983
+Data_177e0: dbw 1, Data_1798d
+Data_177e3: dbw 1, Data_17997
+Data_177e6: dbw 1, Data_179a1
+Data_177e9: dbw 1, Data_179ab
+Data_177ec: dbw 1, Data_179b5
+Data_177ef: dbw 1, Data_179bf
+Data_177f2: dbw 1, Data_179c9
+Data_177f5: dbw 1, Data_179d3
+Data_177f8: dbw 1, Data_179dd
+Data_177fb: dbw 1, Data_179e7
+Data_177fe: dbw 1, Data_179f1
+Data_17801: dbw 1, Data_179fb
+Data_17804: dbw 1, Data_17a05
+Data_17807: dbw 1, Data_17a0f
+Data_1780a: dbw 1, Data_17a19
+Data_1780d: dbw 1, Data_17a23
+Data_17810: dbw 1, Data_17a2d
+Data_17813: dbw 1, Data_17a37
+Data_17816: dbw 1, Data_17a41
+Data_17819: dbw 1, Data_17a4b
+Data_1781c: dbw 1, Data_17a55
+Data_1781f: dbw 1, Data_17a5f
+Data_17822: dbw 1, Data_17a69
+Data_17825: dbw 1, Data_17a73
+Data_17828: dbw 1, Data_17a7d
+Data_1782b: dbw 1, Data_17a87
+Data_1782e: dbw 1, Data_17a91
+Data_17831: dbw 1, Data_17a9b
+Data_17834: dbw 1, Data_17aa5
+Data_17837: dbw 1, Data_17aaf
+Data_1783a: dbw 1, Data_17ab9
+Data_1783d: dbw 1, Data_17ac3
+Data_17840: dbw 1, Data_17acd
+Data_17843: dbw 1, Data_17ad7
+Data_17846: dbw 1, Data_17ae1
+Data_17849: dbw 1, Data_17aeb
+Data_1784c: dbw 1, Data_17af5
+Data_1784f: dbw 1, Data_17aff
+Data_17852: dbw 1, Data_17b09
+Data_17855: dbw 1, Data_17b13
+Data_17858: dbw 1, Data_17b1d
+Data_1785b: dbw 1, Data_17b27
+Data_1785e: dbw 1, Data_17b31
+Data_17861: dbw 1, Data_17b3b
+Data_17864: dbw 1, Data_17b45
+Data_17867: dbw 1, Data_17b4f
+Data_1786a: dbw 1, Data_17b59
+Data_1786d: dbw 1, Data_17b63
+Data_17870: dbw 1, Data_17b6d
+Data_17873: dbw 1, Data_17b77
+Data_17876: dbw 1, Data_17b81
+Data_17879: dbw 1, Data_17b8b
+Data_1787c: dbw 1, Data_17b95
+Data_1787f: dbw 1, Data_17b9f
+Data_17882: dbw 1, Data_17ba9
+Data_17885: dbw 1, Data_17bb3
+Data_17888: dbw 1, Data_17bbd
+Data_1788b: dbw 1, Data_17bc7
+Data_1788e: dbw 1, Data_17bd1
+Data_17891: dbw 1, Data_17bdb
+Data_17894: dbw 1, Data_17be5
+Data_17897: dbw 1, Data_17bef
+Data_1789a: dbw 1, Data_17bf9
+Data_1789d: dbw 1, Data_17c03
+Data_178a0: dbw 1, Data_17c0d
+Data_178a3: dbw 1, Data_17c17
+Data_178a6: dbw 1, Data_17c21
+Data_178a9: dbw 1, Data_17c2b
+Data_178ac: dbw 1, Data_17c35
+Data_178af: dbw 1, Data_17c3f
+Data_178b2: dbw 1, Data_17c49
+Data_178b5: dbw 1, Data_17c53
+Data_178b8: dbw 1, Data_17c5d
+
+Data_178bb:
+	dr $178bb, $178c5
+
+Data_178c5:
+	dr $178c5, $178cf
+
+Data_178cf:
+	dr $178cf, $178d9
+
+Data_178d9:
+	dr $178d9, $178e3
+
+Data_178e3:
+	dr $178e3, $178ed
+
+Data_178ed:
+	dr $178ed, $178f7
+
+Data_178f7:
+	dr $178f7, $17901
+
+Data_17901:
+	dr $17901, $1790b
+
+Data_1790b:
+	dr $1790b, $17915
+
+Data_17915:
+	dr $17915, $1791f
+
+Data_1791f:
+	dr $1791f, $17929
+
+Data_17929:
+	dr $17929, $17933
+
+Data_17933:
+	dr $17933, $1793d
+
+Data_1793d:
+	dr $1793d, $17947
+
+Data_17947:
+	dr $17947, $17951
+
+Data_17951:
+	dr $17951, $1795b
+
+Data_1795b:
+	dr $1795b, $17965
+
+Data_17965:
+	dr $17965, $1796f
+
+Data_1796f:
+	dr $1796f, $17979
+
+Data_17979:
+	dr $17979, $17983
+
+Data_17983:
+	dr $17983, $1798d
+
+Data_1798d:
+	dr $1798d, $17997
+
+Data_17997:
+	dr $17997, $179a1
+
+Data_179a1:
+	dr $179a1, $179ab
+
+Data_179ab:
+	dr $179ab, $179b5
+
+Data_179b5:
+	dr $179b5, $179bf
+
+Data_179bf:
+	dr $179bf, $179c9
+
+Data_179c9:
+	dr $179c9, $179d3
+
+Data_179d3:
+	dr $179d3, $179dd
+
+Data_179dd:
+	dr $179dd, $179e7
+
+Data_179e7:
+	dr $179e7, $179f1
+
+Data_179f1:
+	dr $179f1, $179fb
+
+Data_179fb:
+	dr $179fb, $17a05
+
+Data_17a05:
+	dr $17a05, $17a0f
+
+Data_17a0f:
+	dr $17a0f, $17a19
+
+Data_17a19:
+	dr $17a19, $17a23
+
+Data_17a23:
+	dr $17a23, $17a2d
+
+Data_17a2d:
+	dr $17a2d, $17a37
+
+Data_17a37:
+	dr $17a37, $17a41
+
+Data_17a41:
+	dr $17a41, $17a4b
+
+Data_17a4b:
+	dr $17a4b, $17a55
+
+Data_17a55:
+	dr $17a55, $17a5f
+
+Data_17a5f:
+	dr $17a5f, $17a69
+
+Data_17a69:
+	dr $17a69, $17a73
+
+Data_17a73:
+	dr $17a73, $17a7d
+
+Data_17a7d:
+	dr $17a7d, $17a87
+
+Data_17a87:
+	dr $17a87, $17a91
+
+Data_17a91:
+	dr $17a91, $17a9b
+
+Data_17a9b:
+	dr $17a9b, $17aa5
+
+Data_17aa5:
+	dr $17aa5, $17aaf
+
+Data_17aaf:
+	dr $17aaf, $17ab9
+
+Data_17ab9:
+	dr $17ab9, $17ac3
+
+Data_17ac3:
+	dr $17ac3, $17acd
+
+Data_17acd:
+	dr $17acd, $17ad7
+
+Data_17ad7:
+	dr $17ad7, $17ae1
+
+Data_17ae1:
+	dr $17ae1, $17aeb
+
+Data_17aeb:
+	dr $17aeb, $17af5
+
+Data_17af5:
+	dr $17af5, $17aff
+
+Data_17aff:
+	dr $17aff, $17b09
+
+Data_17b09:
+	dr $17b09, $17b13
+
+Data_17b13:
+	dr $17b13, $17b1d
+
+Data_17b1d:
+	dr $17b1d, $17b27
+
+Data_17b27:
+	dr $17b27, $17b31
+
+Data_17b31:
+	dr $17b31, $17b3b
+
+Data_17b3b:
+	dr $17b3b, $17b45
+
+Data_17b45:
+	dr $17b45, $17b4f
+
+Data_17b4f:
+	dr $17b4f, $17b59
+
+Data_17b59:
+	dr $17b59, $17b63
+
+Data_17b63:
+	dr $17b63, $17b6d
+
+Data_17b6d:
+	dr $17b6d, $17b77
+
+Data_17b77:
+	dr $17b77, $17b81
+
+Data_17b81:
+	dr $17b81, $17b8b
+
+Data_17b8b:
+	dr $17b8b, $17b95
+
+Data_17b95:
+	dr $17b95, $17b9f
+
+Data_17b9f:
+	dr $17b9f, $17ba9
+
+Data_17ba9:
+	dr $17ba9, $17bb3
+
+Data_17bb3:
+	dr $17bb3, $17bbd
+
+Data_17bbd:
+	dr $17bbd, $17bc7
+
+Data_17bc7:
+	dr $17bc7, $17bd1
+
+Data_17bd1:
+	dr $17bd1, $17bdb
+
+Data_17bdb:
+	dr $17bdb, $17be5
+
+Data_17be5:
+	dr $17be5, $17bef
+
+Data_17bef:
+	dr $17bef, $17bf9
+
+Data_17bf9:
+	dr $17bf9, $17c03
+
+Data_17c03:
+	dr $17c03, $17c0d
+
+Data_17c0d:
+	dr $17c0d, $17c17
+
+Data_17c17:
+	dr $17c17, $17c21
+
+Data_17c21:
+	dr $17c21, $17c2b
+
+Data_17c2b:
+	dr $17c2b, $17c35
+
+Data_17c35:
+	dr $17c35, $17c3f
+
+Data_17c3f:
+	dr $17c3f, $17c49
+
+Data_17c49:
+	dr $17c49, $17c53
+
+Data_17c53:
+	dr $17c53, $17c5d
+
+Data_17c5d:
+	dr $17c5d, $17c67
diff --git a/home.asm b/home.asm
index c6a3de1..6a63be8 100755
--- a/home.asm
+++ b/home.asm
@@ -552,7 +552,7 @@ PlaySoundEffect: ; 0x4af
 	ld a, [wdead]
 	and a
 	ret nz
-	ld a, [wd800]
+	ld a, [wSFXTimer]
 	and a
 	jr z, .asm_4bd
 	ld a, d
@@ -560,7 +560,7 @@ PlaySoundEffect: ; 0x4af
 	ret z
 .asm_4bd
 	ld a, d
-	ld [wd800], a
+	ld [wSFXTimer], a
 	ld d, $0
 	ld a, [hLoadedROMBank]
 	push af
@@ -609,7 +609,7 @@ Func_504: ; 0x504
 	ld a, [wCurrentSongBank]
 	ld [hLoadedROMBank], a
 	ld [MBC5RomBank], a
-	call $4180 
+	call Func_3c180 
 	pop af
 	ld [hLoadedROMBank], a
 	ld [MBC5RomBank], a
@@ -618,11 +618,11 @@ Func_504: ; 0x504
 	ld [wd801], a
 	and $3
 	ret nz
-	ld a, [wd800]
+	ld a, [wSFXTimer]
 	and a
 	ret z
 	dec a
-	ld [wd800], a
+	ld [wSFXTimer], a
 	ret
 
 SetSongBank: ; 0x52c
@@ -2316,7 +2316,7 @@ Func_e69: ; 0xe69
 .asm_e77
 	dec a
 	jr nz, .asm_e77
-	ld hl, wcBottomMessageText + $140
+	ld hl, wBottomMessageText + $140
 	call Func_eef
 	push hl
 	ld hl, $9c00
@@ -2342,7 +2342,7 @@ Func_e69: ; 0xe69
 	ld hl, $9c10
 	call Func_ef8
 	pop hl
-	ld hl, wcBottomMessageText + $1c0
+	ld hl, wBottomMessageText + $1c0
 	call Func_eef
 	push hl
 	ld hl, $9c20
@@ -2731,7 +2731,7 @@ Func_10aa: ; 0x10aa
 	ld c, a
 	ld a, [hli]
 	ld b, a
-.asm_10ad
+.loop
 	push bc
 	ld a, c
 	ld c, [hl]
@@ -2751,19 +2751,19 @@ Func_10aa: ; 0x10aa
 	pop hl
 	pop bc
 	dec b
-	jr nz, .asm_10ad
+	jr nz, .loop
 	ret
 
 Func_10c5: ; 0x10c5
 	push af
 	ld a, [rLCDC]
 	bit 7, a
-	jr z, .asm_10d2
-.asm_10cc
+	jr z, .skip_wait_ly
+.wait_ly
 	ld a, [rLY]
 	cp $88
-	jr nc, .asm_10cc
-.asm_10d2
+	jr nc, .wait_ly
+.skip_wait_ly
 	pop af
 	ld hl, wd7fb
 	ld l, [hl]
@@ -2790,10 +2790,10 @@ Func_10c5: ; 0x10c5
 	ld hl, wd7fa
 	add [hl]
 	cp $30
-	jr c, .asm_10fe
+	jr c, .size_okay
 	ld a, [bc]
 	ld e, $0
-.asm_10fe
+.size_okay
 	add $4
 	ld [hl], a
 	pop af
@@ -3387,7 +3387,7 @@ Data_1bcf:
 	dr $1bcf, $1bd3
 
 Func_1bd3: ; 0x1bd3
-	ld de, $0001
+	lb de, $00, $01
 	call PlaySoundEffect
 	ld a, $5
 	ld [wd86d], a
@@ -5454,7 +5454,7 @@ Func_30db: ; 0x30db
 
 Func_30e8: ; 0x30e8
 	ld a, $81
-	ld hl, wcBottomMessageText + $100
+	ld hl, wBottomMessageText + $100
 	ld b, $40
 .asm_30ef
 	ld [hli], a
@@ -5744,7 +5744,7 @@ LoadTextHeader: ; 0x32aa
 	inc de
 	pop af
 	ld l, a
-	ld h, wcBottomMessageText / $100
+	ld h, wBottomMessageText / $100
 .asm_32c5
 	ld a, [de]
 	ld [hli], a
@@ -5778,7 +5778,7 @@ Func_32cc: ; 0x32cc
 	inc de
 	pop af
 	ld e, a
-	ld d, wcBottomMessageText / $100
+	ld d, wBottomMessageText / $100
 	ld hl, [sp+$5]
 	lb bc, 8, 1
 .asm_32ec
@@ -5856,7 +5856,7 @@ Func_3325: ; 0x3325
 	inc hl
 	push hl
 	ld l, [hl]
-	ld h, wcBottomMessageText / $100
+	ld h, wBottomMessageText / $100
 	call Func_3129
 	pop hl
 	inc hl
@@ -5891,7 +5891,7 @@ Func_3357: ; 0x3357
 	inc de
 	pop af
 	ld l, a
-	ld h, wcBottomMessageText / $100
+	ld h, wBottomMessageText / $100
 .asm_336b
 	ld a, [de]
 	ld [hli], a
@@ -5917,7 +5917,7 @@ Func_3372: ; 0x3372
 	ld [hli], a
 	pop af
 	ld e, a
-	ld d, wcBottomMessageText / $100
+	ld d, wBottomMessageText / $100
 	ld hl, [sp+$5]
 	lb bc, 8, 1
 .asm_338a
@@ -5974,7 +5974,7 @@ Func_33c3: ; 0x33c3
 	ld d, wc600 / $100
 	push hl
 	ld l, [hl]
-	ld h, wcBottomMessageText / $100
+	ld h, wBottomMessageText / $100
 	call Func_3129
 	pop hl
 	inc hl
@@ -6258,7 +6258,7 @@ HandleLeftTilt: ; 0x358c
 	ld [wLeftTiltCounter], a
 	cp $1
 	jr nz, .skipSoundEffect
-	ld de, $003f
+	lb de, $00, $3f
 	call PlaySoundEffect
 .skipSoundEffect
 	ld a, [wd548]
@@ -6314,7 +6314,7 @@ HandleRightTilt: ; 0x35f3
 	ld [wRightTiltCounter], a
 	cp $1
 	jr nz, .skipSoundEffect
-	ld de, $003f
+	lb de, $00, $3f
 	call PlaySoundEffect
 .skipSoundEffect
 	ld a, [wd548]
@@ -6370,7 +6370,7 @@ HandleUpperTilt: ; 0x365a
 	ld [wUpperTiltCounter], a
 	cp $1
 	jr nz, .skipSoundEffect
-	ld de, $003f
+	lb de, $00, $3f
 	call PlaySoundEffect
 .skipSoundEffect
 	ld a, [wd548]
diff --git a/main.asm b/main.asm
index 86d2fbd..5865a4d 100755
--- a/main.asm
+++ b/main.asm
@@ -4399,7 +4399,7 @@ SetMaxScore: ; 0x8637
 Func_8645: ; 0x8645
 	xor a
 	ld [wd49f], a
-	ld de, wcBottomMessageText + $147
+	ld de, wBottomMessageText + $147
 	call Func_8524
 	ret
 
@@ -4503,7 +4503,7 @@ HandleInGameMenu: ; 0x86d7
 	call Func_30e8
 	xor a
 	ld [wd4aa], a
-	ld hl, wcBottomMessageText
+	ld hl, wBottomMessageText
 	ld a, $81
 	ld b, $30
 .clearLoop
@@ -4513,10 +4513,10 @@ HandleInGameMenu: ; 0x86d7
 	ld [hli], a
 	dec b
 	jr nz, .clearLoop
-	ld de, wcBottomMessageText + $24
+	ld de, wBottomMessageText + $24
 	ld hl, SaveText
 	call Func_8797
-	ld de, wcBottomMessageText + $64
+	ld de, wBottomMessageText + $64
 	ld hl, CancelText
 	call Func_8797
 	ld a, Bank(InGameMenuSymbolsGfx)
@@ -4525,7 +4525,7 @@ HandleInGameMenu: ; 0x86d7
 	ld bc, $0010
 	call LoadVRAMData
 	ld a, $0
-	ld hl, wcBottomMessageText
+	ld hl, wBottomMessageText
 	ld de, vBGMap1
 	ld bc, $00c0
 	call LoadVRAMData
@@ -4609,7 +4609,7 @@ HandleInGameMenuSelection: ; 0x87ac
 	ld a, [hNewlyPressedButtons]
 	bit BIT_A_BUTTON, a
 	jr z, .waitForAButton
-	ld de, $0001
+	lb de, $00, $01
 	call PlaySoundEffect
 	ret
 
@@ -4624,7 +4624,7 @@ MoveInGameMenuCursor: ; 0x87c5
 	ret z
 	dec a
 	ld [wInGameMenuIndex], a
-	ld de, $0003
+	lb de, $00, $03
 	call PlaySoundEffect
 	ret
 
@@ -4635,26 +4635,26 @@ MoveInGameMenuCursor: ; 0x87c5
 	ret z
 	inc a
 	ld [wInGameMenuIndex], a
-	ld de, $0003
+	lb de, $00, $03
 	call PlaySoundEffect
 	ret
 
 DrawInGameMenu: ; 0x87ed
 	ld a, $81
-	ld [wcBottomMessageText + $23], a
-	ld [wcBottomMessageText + $63], a
+	ld [wBottomMessageText + $23], a
+	ld [wBottomMessageText + $63], a
 	ld a, [wInGameMenuIndex]
 	ld c, a
 	swap c
 	sla c
 	sla c
 	ld b, $0
-	ld hl, wcBottomMessageText + $23
+	ld hl, wBottomMessageText + $23
 	add hl, bc
 	ld a, $86
 	ld [hl], a
 	ld a, $0
-	ld hl, wcBottomMessageText
+	ld hl, wBottomMessageText
 	ld de, vBGMap1
 	ld bc, $00c0
 	call LoadVRAMData
@@ -5882,7 +5882,7 @@ TitlescreenLoop: ; 0xc089
 	ld a, [wd7c2]  ; if this is non-zero, the main menu will prompt for "continue or new game?".
 	and a
 	jr z, .noPreviouslySavedGame
-	ld de, $0001
+	lb de, $00, $01
 	call PlaySoundEffect
 	xor a
 	ld [wd910], a
@@ -5898,7 +5898,7 @@ TitlescreenLoop: ; 0xc089
 	ld de, $0000
 	call PlaySong
 	rst AdvanceFrame
-	ld de, $0027
+	lb de, $00, $27
 	call PlaySoundEffect
 	ld bc, $0037
 	call AdvanceFrames
@@ -5907,7 +5907,7 @@ TitlescreenLoop: ; 0xc089
 	ret
 
 .asm_c0d3
-	ld de, $0001
+	lb de, $00, $01
 	call PlaySoundEffect
 	ld a, $3
 	ld [wScreenState], a
@@ -5916,7 +5916,7 @@ TitlescreenLoop: ; 0xc089
 .AButtonNotPressed
 	bit BIT_B_BUTTON, a  ; was B button pressed?
 	ret z
-	ld de, $0001
+	lb de, $00, $01
 	call PlaySoundEffect
 	ld a, $4
 	ld [wScreenState], a
@@ -5953,7 +5953,7 @@ Func_c10e: ; 0xc10e
 	ld de, $0000
 	call PlaySong
 	rst AdvanceFrame
-	ld de, $0027
+	lb de, $00, $27
 	call PlaySoundEffect
 	ld bc, $0041
 	call AdvanceFrames
@@ -5995,7 +5995,7 @@ Func_c10e: ; 0xc10e
 .asm_c17c
 	bit 1, a
 	ret z
-	ld de, $0001
+	lb de, $00, $01
 	call PlaySoundEffect
 	ld a, $8
 	ld [wd910], a
@@ -6073,7 +6073,7 @@ Func_c1fc: ; 0xc1fc
 	ret z
 	dec a
 	ld [hl], a
-	ld de, $0003
+	lb de, $00, $03
 	call PlaySoundEffect
 	ret
 
@@ -6084,7 +6084,7 @@ Func_c1fc: ; 0xc1fc
 	ret z
 	inc a
 	ld [hl], a
-	ld de, $0003
+	lb de, $00, $03
 	call PlaySoundEffect
 	ret
 
@@ -6354,7 +6354,7 @@ Func_c400: ; 0xc400
 	ld a, [hNewlyPressedButtons]
 	bit 1, a
 	ret z
-	ld de, $0001
+	lb de, $00, $01
 	call PlaySoundEffect
 	ld a, $2
 	ld [wScreenState], a
@@ -6379,7 +6379,7 @@ Func_c41a: ; 0xc41a
 	inc a
 .asm_c430
 	ld [wd916], a
-	ld de, $0003
+	lb de, $00, $03
 	call PlaySoundEffect
 	ret
 
@@ -6394,7 +6394,7 @@ Func_c447: ; 0xc447
 	ld a, [hNewlyPressedButtons]
 	bit BIT_A_BUTTON, a
 	ret z
-	ld de, $0001
+	lb de, $00, $01
 	call PlaySoundEffect
 	ld a, [wd916]
 	and a
@@ -6440,7 +6440,7 @@ Func_c493: ; 0xc493
 	ld a, [hNewlyPressedButtons]
 	bit BIT_B_BUTTON, a
 	ret z
-	ld de, $0001
+	lb de, $00, $01
 	call PlaySoundEffect
 	xor a
 	ld [wd803], a
@@ -6460,7 +6460,7 @@ Func_c4b4: ; 0xc4b4
 	dec a
 	ld [wd917], a
 	call Func_c4f4
-	ld de, $0003
+	lb de, $00, $03
 	call PlaySoundEffect
 	ret
 
@@ -6474,7 +6474,7 @@ Func_c4b4: ; 0xc4b4
 	xor a
 	ld [wd803], a
 	ld [wd804], a
-	ld de, $0003
+	lb de, $00, $03
 	call PlaySoundEffect
 	ret
 
@@ -6503,7 +6503,7 @@ Func_c506: ; 0xc506
 	ld a, [hNewlyPressedButtons]
 	bit BIT_B_BUTTON, a
 	ret z
-	ld de, $0001
+	lb de, $00, $01
 	call PlaySoundEffect
 	call ClearOAMBuffer
 	ld hl, hLCDC
@@ -6535,7 +6535,7 @@ Func_c534: ; 0xc534
 	inc a
 .asm_c54a
 	ld [wd918], a
-	ld de, $0003
+	lb de, $00, $03
 	call PlaySoundEffect
 	ret
 
@@ -6551,7 +6551,7 @@ Func_c55a: ; 0xc55a
 	ld a, [hNewlyPressedButtons]
 	bit BIT_A_BUTTON, a
 	ret z
-	ld de, $0001
+	lb de, $00, $01
 	call PlaySoundEffect
 	call SaveDefaultKeyConfigs
 	call Func_c948
@@ -6561,7 +6561,7 @@ Func_c55a: ; 0xc55a
 	ld a, [hNewlyPressedButtons]
 	bit BIT_A_BUTTON, a
 	ret z
-	ld de, $0001
+	lb de, $00, $01
 	call PlaySoundEffect
 	ld bc, $001e
 	call AdvanceFrames
@@ -6745,7 +6745,7 @@ Func_c691: ; 0xc91
 	call SetSongBank
 	ld de, $0002
 	call PlaySong
-	ld de, $0001
+	lb de, $00, $01
 	call PlaySoundEffect
 	ld a, $1
 	ld [wScreenState], a
@@ -7648,7 +7648,7 @@ Func_ccb6: ; 0xccb6
 	ld a, [hNewlyPressedButtons]
 	bit BIT_A_BUTTON, a
 	jr z, .asm_ccd1
-	ld de, $0001
+	lb de, $00, $01
 	call PlaySoundEffect
 	ld hl, wScreenState
 	inc [hl]
@@ -7659,7 +7659,7 @@ Func_ccb6: ; 0xccb6
 .asm_ccd1
 	bit 1, a
 	jr z, .asm_cce4
-	ld de, $0001
+	lb de, $00, $01
 	call PlaySoundEffect
 	ld hl, wScreenState
 	inc [hl]
@@ -7673,7 +7673,7 @@ Func_ccb6: ; 0xccb6
 	call Func_1a43
 	ld a, [hGameBoyColorFlag]
 	ld [wd8f0], a
-	ld de, $0001
+	lb de, $00, $01
 	call PlaySoundEffect
 	ld hl, wScreenState
 	inc [hl]
@@ -7686,7 +7686,7 @@ Func_ccb6: ; 0xccb6
 	ld a, [hNewlyPressedButtons]
 	and (SELECT | D_UP)
 	ret z
-	ld de, $0001
+	lb de, $00, $01
 	call PlaySoundEffect
 	call ClearOAMBuffer
 	ld bc, $473b
@@ -7697,14 +7697,14 @@ Func_ccb6: ; 0xccb6
 	ld a, [hNewlyPressedButtons]
 	bit BIT_B_BUTTON, a
 	jr z, .asm_cd24
-	ld de, $0001
+	lb de, $00, $01
 	call PlaySoundEffect
 	ret
 
 .asm_cd24
 	bit 0, a
 	jr z, .asm_cd16
-	ld de, $0001
+	lb de, $00, $01
 	call PlaySoundEffect
 	call CopyInitialHighScores
 	ld a, BANK(HighScoresTilemap)
@@ -7738,7 +7738,7 @@ Func_cd6c: ; 0xcd6c
 	ld a, [hNewlyPressedButtons]
 	bit BIT_A_BUTTON, a
 	jr z, .asm_cdbb
-	ld de, $0001
+	lb de, $00, $01
 	call PlaySoundEffect
 	ld a, [wda85]
 	and a
@@ -7770,7 +7770,7 @@ Func_cd6c: ; 0xcd6c
 	ld a, [hNewlyPressedButtons]
 	bit BIT_B_BUTTON, a
 	ret z
-	ld de, $0001
+	lb de, $00, $01
 	call PlaySoundEffect
 .asm_cdc6
 	xor a
@@ -7865,7 +7865,7 @@ Func_cdce: ; 0xcdce
 	ld a, $7
 	ld [$abf6], a
 	pop af
-	ld hl, wcBottomMessageText + $0d
+	ld hl, wBottomMessageText + $0d
 	ld b, $5
 .asm_ce7c
 	push bc
@@ -7995,7 +7995,7 @@ Func_cf58: ; 0xcf58
 	cp $5
 	ret z
 	push af
-	ld de, $0002
+	lb de, $00, $02
 	call PlaySoundEffect
 	call ClearOAMBuffer
 	rst AdvanceFrame
@@ -8008,7 +8008,7 @@ Func_cf58: ; 0xcf58
 	ld a, [hNewlyPressedButtons]
 	bit BIT_A_BUTTON, a
 	jr z, .asm_cf6f
-	ld de, $0001
+	lb de, $00, $01
 	call PlaySoundEffect
 	ret
 
@@ -8022,7 +8022,7 @@ Func_cf7d: ; 0xcf7d
 	ret z
 	dec a
 	ld [wda85], a
-	ld de, $0003
+	lb de, $00, $03
 	call PlaySoundEffect
 	ret
 
@@ -8033,7 +8033,7 @@ Func_cf7d: ; 0xcf7d
 	ret z
 	inc a
 	ld [wda85], a
-	ld de, $0003
+	lb de, $00, $03
 	call PlaySoundEffect
 	ret
 
@@ -8364,7 +8364,7 @@ Func_d18b: ; 0xd18b
 .asm_d1c7
 	ld [hl], a
 	call Func_d46f
-	ld de, $0003
+	lb de, $00, $03
 	call PlaySoundEffect
 	ret
 
@@ -8377,7 +8377,7 @@ Func_d1d2: ; 0xd1d2
 	inc a
 	cp $3
 	jr nz, .asm_d202
-	ld de, $0745
+	lb de, $07, $45
 	call PlaySoundEffect
 	xor a
 	ld [wda7f], a
@@ -8399,7 +8399,7 @@ Func_d1d2: ; 0xd1d2
 	ld [wda80], a
 	ld a, $20
 	ld [wda82], a
-	ld de, $0001
+	lb de, $00, $01
 	call PlaySoundEffect
 	ret
 
@@ -8837,7 +8837,7 @@ Func_d4cf: ; 0xd4cf
 	jr z, .asm_d4e3
 	and a
 	ret nz
-	ld de, $0003
+	lb de, $00, $03
 	call PlaySoundEffect
 	jr .asm_d4f0
 
@@ -8846,7 +8846,7 @@ Func_d4cf: ; 0xd4cf
 	ret z
 	and a
 	ret z
-	ld de, $0003
+	lb de, $00, $03
 	call PlaySoundEffect
 	jr .asm_d537
 
@@ -9181,7 +9181,7 @@ ChooseFieldToPlay: ; 0xd74e
 	ld [wFieldSelectBlinkingBorderTimer], a
 	ld a, $1
 	ld [wFieldSelectBlinkingBorderFrame], a
-	ld de, $0001
+	lb de, $00, $01
 	call PlaySoundEffect
 	ld hl, wScreenState
 	inc [hl]
@@ -9253,7 +9253,7 @@ MoveFieldSelectCursor: ; 0xd7d3
 	ret z  ; if cursor is already hovering over Red stage, don't do anything
 	dec a  ; move cursor over Red stage
 	ld [wSelectedFieldIndex], a
-	ld de, $003c
+	lb de, $00, $3c
 	call PlaySoundEffect
 	ret
 
@@ -9264,7 +9264,7 @@ MoveFieldSelectCursor: ; 0xd7d3
 	ret z  ; if cursor is already hovering over Blue stage, don't do anything
 	inc a  ; move cursor over Red stage
 	ld [wSelectedFieldIndex], a
-	ld de, $003d
+	lb de, $00, $3d
 	call PlaySoundEffect
 	ret
 
@@ -9428,7 +9428,7 @@ Func_d909: ; 0xd909
 	ld hl, wKeyConfigMenu
 	call IsKeyPressed
 	jr z, .didntPressMenuKey
-	ld de, $034c
+	lb de, $03, $4c
 	call PlaySoundEffect
 	ld [hFarCallTempA], a
 	callba HandleInGameMenu
@@ -9710,12 +9710,12 @@ HighScoresStageMapping: ; 0xdb99
 
 Func_dba9: ; 0xdba9
 	ld a, $85
-	ld [wcBottomMessageText + $144], a
+	ld [wBottomMessageText + $144], a
 	ld a, [wd49d]
 	xor $3
 	inc a
 	add $86
-	ld [wcBottomMessageText + $145], a
+	ld [wBottomMessageText + $145], a
 	ret
 
 Func_dbba: ; 0xdbba
@@ -9829,7 +9829,7 @@ Func_dc6d: ; 0xdc6d
 	ret
 
 Func_dc7c: ; 0xdc7c
-	ld hl, wcBottomMessageText + $140
+	ld hl, wBottomMessageText + $140
 	ld a, $83
 	ld [hli], a
 	ld a, $81
@@ -9838,7 +9838,7 @@ Func_dc7c: ; 0xdc7c
 	ld [hl], a
 	ld a, [wNumPartyMons]
 	call ConvertHexByteToDecWord
-	ld hl, wcBottomMessageText + $141
+	ld hl, wBottomMessageText + $141
 	ld c, $1
 	ld a, d
 	call .asm_dca0
@@ -9870,7 +9870,7 @@ Func_dcb4: ; 0xdcb4
 	jr nz, .asm_dcbf
 	ld a, $84
 .asm_dcbf
-	ld [wcBottomMessageText + $146], a
+	ld [wBottomMessageText + $146], a
 	ret
 
 LoadBallGfx: ; 0xdcc3
@@ -9984,7 +9984,7 @@ Func_dd76: ; 0xdd76
 	ld [wBallSaverTimerFrames], a
 	ld [wBallSaverTimerSeconds], a
 .asm_dd9c
-	ld de, $1502
+	lb de, $15, $02
 	call PlaySoundEffect
 	ret
 
@@ -9993,7 +9993,7 @@ Func_dd76: ; 0xdd76
 	call PlaySong
 	ld bc, $001e
 	call AdvanceFrames
-	ld de, $2524
+	lb de, $25, $24
 	call PlaySoundEffect
 	call Func_dbba
 	ld a, $1
@@ -10091,7 +10091,7 @@ Func_de4f: ; 0xde4f
 	ld [wBallSaverTimerFrames], a
 	ld [wBallSaverTimerSeconds], a
 .asm_de75
-	ld de, $1502
+	lb de, $15, $02
 	call PlaySoundEffect
 	ret
 
@@ -10100,7 +10100,7 @@ Func_de4f: ; 0xde4f
 	call PlaySong
 	ld bc, $001e
 	call AdvanceFrames
-	ld de, $2524
+	lb de, $25, $24
 	call PlaySoundEffect
 	call Func_dbba
 	ld a, $1
@@ -10197,7 +10197,7 @@ Func_df1a: ; 0xdf1a
 	ld a, $1
 	ld [wd6a7], a
 .asm_df50
-	ld de, $0002
+	lb de, $00, $02
 	call PlaySoundEffect
 	ret
 
@@ -10248,7 +10248,7 @@ Func_df7e: ; 0xdf7e
 	ld a, $1
 	ld [wd6b2], a
 .asm_dfb4
-	ld de, $000b
+	lb de, $00, $0b
 	call PlaySoundEffect
 	ret
 
@@ -10303,7 +10303,7 @@ Func_dfe2: ; 0xdfe2
 	ld a, [wd712]
 	cp $0
 	jr nz, .asm_e025
-	ld de, $0002
+	lb de, $00, $02
 	call PlaySoundEffect
 	ret
 
@@ -10335,7 +10335,7 @@ Func_e056: ; 0xe056
 	ld hl, wCurrentStage
 	cp [hl]
 	ret z
-	ld de, $000b
+	lb de, $00, $0b
 	call PlaySoundEffect
 	xor a
 	ld [wd495], a
@@ -10390,7 +10390,7 @@ Func_e08b: ; 0xe08b
 	ret
 
 .asm_e0c8
-	ld de, $0002
+	lb de, $00, $02
 	call PlaySoundEffect
 	xor a
 	ld [wd57d], a
@@ -10533,7 +10533,7 @@ PlayFlipperSoundIfPressed: ; 0xe1ce
 	ld hl, wKeyConfigLeftFlipper
 	call IsKeyPressed
 	jr z, .asm_e1e2
-	ld de, $000c
+	lb de, $00, $0c
 	call PlaySoundEffect
 	ret
 
@@ -10541,7 +10541,7 @@ PlayFlipperSoundIfPressed: ; 0xe1ce
 	ld hl, wKeyConfigRightFlipper
 	call IsKeyPressed
 	ret z
-	ld de, $000c
+	lb de, $00, $0c
 	call PlaySoundEffect
 	ret
 
@@ -11873,7 +11873,7 @@ Func_ed8e: ; 0xed8e
 	call Func_eef9
 	ld [wd61d], a
 	push af
-	ld de, $0009
+	lb de, $00, $09
 	call PlaySoundEffect
 	pop af
 	call LoadBillboardOffPicture
@@ -11894,7 +11894,7 @@ Func_ed8e: ; 0xed8e
 	ld [wd61e], a
 	ld a, $32
 	ld [wd61b], a
-	ld de, $0728
+	lb de, $07, $28
 	call PlaySoundEffect
 .asm_ee47
 	pop bc
@@ -11920,12 +11920,12 @@ Func_ed8e: ; 0xed8e
 	ld a, [wd61d]
 	cp $5
 	jr nz, .asm_ee78
-	ld de, $0c42
+	lb de, $0c, $42
 	call PlaySoundEffect
 	jr .asm_ee7e
 
 .asm_ee78
-	ld de, $0c43
+	lb de, $0c, $43
 	call PlaySoundEffect
 .asm_ee7e
 	ld b, $28
@@ -12213,7 +12213,7 @@ UpgradeBallBlueField: ; 0xf040
 	ld a, [wBallType]
 	cp MASTER_BALL
 	jr z, .masterBall
-	ld de, $063a
+	lb de, $06, $3a
 	call PlaySoundEffect
 	call Func_30e8
 	call Func_30db
@@ -12229,11 +12229,11 @@ UpgradeBallBlueField: ; 0xf040
 	ld a, [hl]
 	ld [wBallType], a
 	add $30
-	ld [wcBottomMessageText + $12], a
+	ld [wBottomMessageText + $12], a
 	jr .asm_f0b0
 
 .masterBall
-	ld de, $0f4d
+	lb de, $0f, $4d
 	call PlaySoundEffect
 	ld bc, OneMillionPoints
 	ld [hFarCallTempA], a
@@ -12633,7 +12633,7 @@ Func_f55c: ; 0xf55c
 Func_f57f: ; 0xf57f
 	xor a
 	ld [wd4aa], a
-	ld hl, wcBottomMessageText
+	ld hl, wBottomMessageText
 	ld a, $81
 	ld b, $40
 .clearLoop
@@ -12644,17 +12644,17 @@ Func_f57f: ; 0xf57f
 	dec b
 	jr nz, .clearLoop
 	ld a, $0
-	ld hl, wcBottomMessageText
+	ld hl, wBottomMessageText
 	ld de, vBGMap1
 	ld bc, $00c0
 	call LoadVRAMData
 	ret
 
 Func_f5a0: ; 0xf5a0
-	ld de, wcBottomMessageText + $40
+	ld de, wBottomMessageText + $40
 	ld hl, Data_3069
 	call PrintTextNoHeader
-	ld de, wcBottomMessageText + $80
+	ld de, wBottomMessageText + $80
 	ld hl, Data_3070
 	call PrintTextNoHeader
 	ld hl, wd489
@@ -12677,10 +12677,10 @@ Func_f5a0: ; 0xf5a0
 	call SetSongBank
 	ld de, $0005
 	call PlaySong
-	ld hl, wcBottomMessageText
+	ld hl, wBottomMessageText
 	ld bc, $0040
 	call Func_f81b
-	ld de, wcBottomMessageText + $20
+	ld de, wBottomMessageText + $20
 	ld hl, Data_3094
 	call PrintTextNoHeader
 	ld bc, $0040
@@ -12721,10 +12721,10 @@ CallTable_f60d: ; 0xf60d
 	dw Func_faf8
 
 Func_f626: ; 0xf626
-	ld de, wcBottomMessageText + $01
+	ld de, wBottomMessageText + $01
 	ld hl, Data_3006
 	call PrintTextNoHeader
-	ld hl, wcBottomMessageText + $01
+	ld hl, wBottomMessageText + $01
 	ld a, [wd628]
 	call Func_f78e
 	ld bc, $0040
@@ -12737,10 +12737,10 @@ Func_f626: ; 0xf626
 	ret
 
 Func_f64e: ; 0xf64e
-	ld de, wcBottomMessageText
+	ld de, wBottomMessageText
 	ld hl, Data_3019
 	call PrintTextNoHeader
-	ld hl, wcBottomMessageText
+	ld hl, wBottomMessageText
 	ld a, [wd629]
 	call Func_f78e
 	ld bc, $0040
@@ -12756,8 +12756,8 @@ Func_f676: ; 0xf676
 	ld b, $4
 .asm_f678
 	push bc
-	ld hl, wcBottomMessageText + $20
-	ld de, wcBottomMessageText
+	ld hl, wBottomMessageText + $20
+	ld de, wBottomMessageText
 	ld bc, $00e0
 	call LocalCopyData
 	ld bc, $00c0
@@ -12776,13 +12776,13 @@ Func_f676: ; 0xf676
 	pop bc
 	dec b
 	jr nz, .asm_f678
-	ld de, wcBottomMessageText + $40
+	ld de, wBottomMessageText + $40
 	ld hl, Data_307a
 	call PrintTextNoHeader
-	ld de, wcBottomMessageText + $80
+	ld de, wBottomMessageText + $80
 	ld hl, Data_3086
 	call PrintTextNoHeader
-	ld hl, wcBottomMessageText + $50
+	ld hl, wBottomMessageText + $50
 	ld a, [wd482]
 	call Func_f78e
 	ld bc, $0040
@@ -12792,12 +12792,12 @@ Func_f676: ; 0xf676
 	push de
 	push hl
 	ld hl, wd494
-	ld de, wcBottomMessageText + $86
+	ld de, wBottomMessageText + $86
 	call Func_f8bd
 	ld bc, $0040
 	ld de, $0080
 	call Func_f80d
-	ld de, $003e
+	lb de, $00, $3e
 	call PlaySoundEffect
 	ld a, [wd4ab]
 	and a
@@ -12829,8 +12829,8 @@ Func_f70d: ; 0xf70d
 	ld b, $4
 .asm_f70f
 	push bc
-	ld hl, wcBottomMessageText + $20
-	ld de, wcBottomMessageText
+	ld hl, wBottomMessageText + $20
+	ld de, wBottomMessageText
 	ld bc, $00e0
 	call LocalCopyData
 	ld bc, $00c0
@@ -12849,16 +12849,16 @@ Func_f70d: ; 0xf70d
 	pop bc
 	dec b
 	jr nz, .asm_f70f
-	ld de, wcBottomMessageText + $60
+	ld de, wBottomMessageText + $60
 	ld hl, Data_308d
 	call PrintTextNoHeader
 	ld hl, wd46f
-	ld de, wcBottomMessageText + $66
+	ld de, wBottomMessageText + $66
 	call Func_f8bd
 	ld bc, $0040
 	ld de, $0060
 	call Func_f80d
-	ld de, $003e
+	lb de, $00, $3e
 	call PlaySoundEffect
 	ld a, [wd4ab]
 	and a
@@ -12874,7 +12874,7 @@ Func_f70d: ; 0xf70d
 	ld de, wd48f
 	call AddBigBCD6
 	ld hl, wd46f
-	ld de, wcBottomMessageText + $66
+	ld de, wBottomMessageText + $66
 	call Func_f8bd
 	ld bc, $0040
 	ld de, $0060
@@ -12984,7 +12984,7 @@ Func_f80d: ; 0xf80d
 	hlCoord 0, 0, vBGMap1
 	add hl, de
 	push hl
-	ld hl, wcBottomMessageText
+	ld hl, wBottomMessageText
 	add hl, de
 	pop de
 	call LoadVRAMData
@@ -13001,10 +13001,10 @@ Func_f81b: ; 0xf81b
 
 Func_f824: ; 0xf824
 	call Func_f83a
-	ld hl, wcBottomMessageText
+	ld hl, wBottomMessageText
 	ld bc, $0040
 	call Func_f81b
-	ld hl, wcBottomMessageText + $48
+	ld hl, wBottomMessageText + $48
 	ld bc, $0038
 	call Func_f81b
 	ret
@@ -13039,12 +13039,12 @@ Func_f853: ; 0xf853
 	push de
 	push hl
 	ld hl, wd488
-	ld de, wcBottomMessageText + $46
+	ld de, wBottomMessageText + $46
 	call Func_f8bd
 	ld bc, $0040
 	ld de, $0040
 	call Func_f80d
-	ld de, $003e
+	lb de, $00, $3e
 	call PlaySoundEffect
 	ld a, [wd4ab]
 	and a
@@ -13075,7 +13075,7 @@ Func_f853: ; 0xf853
 	ld de, wd483
 	call AddBigBCD6
 	ld hl, wd48e
-	ld de, wcBottomMessageText + $86
+	ld de, wBottomMessageText + $86
 	call Func_f8bd
 	ld bc, $0040
 	ld de, $0080
@@ -13181,10 +13181,10 @@ Func_f945: ; 0xf945
 	ret
 
 Func_f952: ; 0xf952
-	ld de, wcBottomMessageText + $03
+	ld de, wBottomMessageText + $03
 	ld hl, BellsproutCounterText
 	call PrintTextNoHeader
-	ld hl, wcBottomMessageText + $03
+	ld hl, wBottomMessageText + $03
 	ld a, [wd62a]
 	call Func_f78e
 	ld bc, $0040
@@ -13197,10 +13197,10 @@ Func_f952: ; 0xf952
 	ret
 
 Func_f97a: ; 0xf97a
-	ld de, wcBottomMessageText + $04
+	ld de, wBottomMessageText + $04
 	ld hl, DugtrioCounterText
 	call PrintTextNoHeader
-	ld hl, wcBottomMessageText + $04
+	ld hl, wBottomMessageText + $04
 	ld a, [wd62b]
 	call Func_f78e
 	ld bc, $0040
@@ -13213,10 +13213,10 @@ Func_f97a: ; 0xf97a
 	ret
 
 Func_f9a2: ; 0xf9a2
-	ld de, wcBottomMessageText + $03
+	ld de, wBottomMessageText + $03
 	ld hl, CaveShotCounterText
 	call PrintTextNoHeader
-	ld hl, wcBottomMessageText + $03
+	ld hl, wBottomMessageText + $03
 	ld a, [wd62c]
 	call Func_f78e
 	ld bc, $0040
@@ -13229,10 +13229,10 @@ Func_f9a2: ; 0xf9a2
 	ret
 
 Func_f9ca: ; 0xf9ca
-	ld de, wcBottomMessageText + $01
+	ld de, wBottomMessageText + $01
 	ld hl, SpinnerTurnsCounterText
 	call PrintTextNoHeader
-	ld hl, wcBottomMessageText + $01
+	ld hl, wBottomMessageText + $01
 	ld a, [wd62d]
 	call Func_f78e
 	ld bc, $0040
@@ -13257,10 +13257,10 @@ Func_f9f3: ; 0xf9f3
 	ret
 
 Func_fa06: ; 0xfa06
-	ld de, wcBottomMessageText + $04
+	ld de, wBottomMessageText + $04
 	ld hl, CloysterCounterText
 	call PrintTextNoHeader
-	ld hl, wcBottomMessageText + $04
+	ld hl, wBottomMessageText + $04
 	ld a, [wd63b]
 	call Func_f78e
 	ld bc, $0040
@@ -13273,10 +13273,10 @@ Func_fa06: ; 0xfa06
 	ret
 
 Func_fa2e: ; 0xfa2e
-	ld de, wcBottomMessageText + $04
+	ld de, wBottomMessageText + $04
 	ld hl, SlowpokeCounterText
 	call PrintTextNoHeader
-	ld hl, wcBottomMessageText + $04
+	ld hl, wBottomMessageText + $04
 	ld a, [wd63a]
 	call Func_f78e
 	ld bc, $0040
@@ -13289,10 +13289,10 @@ Func_fa2e: ; 0xfa2e
 	ret
 
 Func_fa56: ; 0xfa56
-	ld de, wcBottomMessageText + $04
+	ld de, wBottomMessageText + $04
 	ld hl, PoliwagCounterText
 	call PrintTextNoHeader
-	ld hl, wcBottomMessageText + $04
+	ld hl, wBottomMessageText + $04
 	ld a, [wd63d]
 	call Func_f78e
 	ld bc, $0040
@@ -13305,10 +13305,10 @@ Func_fa56: ; 0xfa56
 	ret
 
 Func_fa7e: ; 0xfa7e
-	ld de, wcBottomMessageText + $04
+	ld de, wBottomMessageText + $04
 	ld hl, PsyduckCounterText
 	call PrintTextNoHeader
-	ld hl, wcBottomMessageText + $04
+	ld hl, wBottomMessageText + $04
 	ld a, [wd63c]
 	call Func_f78e
 	ld bc, $0040
@@ -13321,10 +13321,10 @@ Func_fa7e: ; 0xfa7e
 	ret
 
 Func_faa6: ; 0xfaa6
-	ld de, wcBottomMessageText + $03
+	ld de, wBottomMessageText + $03
 	ld hl, CaveShotCounterText
 	call PrintTextNoHeader
-	ld hl, wcBottomMessageText + $03
+	ld hl, wBottomMessageText + $03
 	ld a, [wd62c]
 	call Func_f78e
 	ld bc, $0040
@@ -13337,10 +13337,10 @@ Func_faa6: ; 0xfaa6
 	ret
 
 Func_face: ; 0xface  :)
-	ld de, wcBottomMessageText + $01
+	ld de, wBottomMessageText + $01
 	ld hl, SpinnerTurnsCounterText
 	call PrintTextNoHeader
-	ld hl, wcBottomMessageText + $01
+	ld hl, wBottomMessageText + $01
 	ld a, [wd62d]
 	call Func_f78e
 	ld bc, $0040
@@ -14105,7 +14105,7 @@ Func_10496: ; 0x10496
 	xor a
 	ld [wd548], a
 	ld [wd549], a
-	ld de, $000b
+	lb de, $00, $0b
 	call PlaySoundEffect
 	ret
 
@@ -14156,7 +14156,7 @@ CapturePokemon: ; 0x1052d
 	ld a, [wBallCaptureAnimationFrameCounter]
 	cp $1
 	jr nz, .asm_10541
-	ld de, $0041
+	lb de, $00, $41
 	call PlaySoundEffect
 .asm_10541
 	ld hl, BallCaptureAnimationData
@@ -14183,7 +14183,7 @@ CapturePokemon: ; 0x1052d
 	ld de, $0000
 	call PlaySong
 	rst AdvanceFrame
-	ld de, $2329
+	lb de, $23, $29
 	call PlaySoundEffect
 	call Func_10825
 	call Func_3475
@@ -14403,7 +14403,7 @@ Func_106b6: ; 0x106b6
 	pop de
 	call LoadTextHeader
 	pop hl
-	ld de, wcBottomMessageText + $20
+	ld de, wBottomMessageText + $20
 	ld b, $0  ; count the number of letters in mon's name in register b
 .readLetter
 	ld a, [hli]
@@ -14556,21 +14556,21 @@ Func_107f8: ; 0x107f8
 	ld a, [wTimerSeconds]
 	cp $20
 	jr nz, .asm_10810
-	ld de, $0749
+	lb de, $07, $49
 	call PlaySoundEffect
 	ret
 
 .asm_10810
 	cp $10
 	jr nz, .asm_1081b
-	ld de, $0a4a
+	lb de, $0a, $4a
 	call PlaySoundEffect
 	ret
 
 .asm_1081b
 	cp $5
 	ret nz
-	ld de, $0d4b
+	lb de, $0d, $4b
 	call PlaySoundEffect
 	ret
 
@@ -14961,7 +14961,7 @@ Func_10b3f: ; 0x10b3f
 Func_10b59: ; 0x10b59
 	xor a
 	ld [wd4aa], a
-	ld hl, wcBottomMessageText
+	ld hl, wBottomMessageText
 	ld a, $81
 	ld b, $30
 .asm_10b64
@@ -14979,7 +14979,7 @@ Func_10b59: ; 0x10b59
 	ld bc, $0030
 	call LoadVRAMData
 	ld a, $0
-	ld hl, wcBottomMessageText
+	ld hl, wBottomMessageText
 	deCoord 0, 0, vBGMap1
 	ld bc, $00c0
 	call LoadVRAMData
@@ -15007,7 +15007,7 @@ Func_10ba2: ; 0x10ba2
 	swap c
 	sla c
 	ld b, $0
-	ld hl, wcBottomMessageText
+	ld hl, wBottomMessageText
 	add hl, bc
 	ld d, h
 	ld e, l
@@ -15064,7 +15064,7 @@ Func_10bea: ; 0x10bea
 	ld a, [wd809]
 	bit 0, a
 	jr z, .asm_10bf4
-	ld de, $0001
+	lb de, $00, $01
 	call PlaySoundEffect
 	ret
 
@@ -15080,7 +15080,7 @@ Func_10c0c: ; 0x10c0c
 	ret z
 	dec a
 	ld [wd461], a
-	ld de, $0003
+	lb de, $00, $03
 	call PlaySoundEffect
 	ret
 
@@ -15091,7 +15091,7 @@ Func_10c0c: ; 0x10c0c
 	cp c
 	ret z
 	ld [wd461], a
-	ld de, $0003
+	lb de, $00, $03
 	call PlaySoundEffect
 	ret
 
@@ -15132,7 +15132,7 @@ Func_10c38: ; 0x10c38
 	swap c
 	sla c
 	ld b, $0
-	ld hl, wcBottomMessageText + $03
+	ld hl, wBottomMessageText + $03
 	add hl, bc
 	ld a, $88
 	ld [hl], a
@@ -15141,7 +15141,7 @@ Func_10c38: ; 0x10c38
 	and a
 	jr z, .asm_10c83
 	ld a, $8a
-	ld [wcBottomMessageText + $11], a
+	ld [wBottomMessageText + $11], a
 .asm_10c83
 	ld a, [wd462]
 	add $7
@@ -15151,10 +15151,10 @@ Func_10c38: ; 0x10c38
 	cp c
 	jr c, .asm_10c96
 	ld a, $89
-	ld [wcBottomMessageText + $b1], a
+	ld [wBottomMessageText + $b1], a
 .asm_10c96
 	ld a, $0
-	ld hl, wcBottomMessageText
+	ld hl, wBottomMessageText
 	deCoord 0, 0, vBGMap1
 	ld bc, $00c0
 	call LoadVRAMData
@@ -15404,7 +15404,7 @@ Func_10e0a: ; 0x10e0a
 	pop de
 	call LoadTextHeader
 	pop hl
-	ld de, wcBottomMessageText + $20
+	ld de, wBottomMessageText + $20
 	ld b, $0
 .asm_10e67
 	ld a, [hli]
@@ -17338,7 +17338,7 @@ Func_14091: ; 0x14091
 	and $fe
 	or c
 	ld [wStageCollisionState], a
-	ld de, $0007
+	lb de, $00, $07
 	call PlaySoundEffect
 	ld a, [wCurrentStage]
 	bit 0, a
@@ -18198,7 +18198,7 @@ Func_14795: ; 0x14795
 	ld [wd5c7], a
 	ld a, $1
 	ld [wBallHitWildMon], a
-	ld de, $0006
+	lb de, $00, $06
 	call PlaySoundEffect
 	ret
 
@@ -18449,7 +18449,7 @@ Func_1496d: ; 0x1496d
 	ld bc, FiveHundredPoints
 	ld [hFarCallTempA], a
 	callba AddBigBCD6FromQueueWithBallMultiplier
-	ld de, $000f
+	lb de, $00, $0f
 	call PlaySoundEffect
 	ret
 
@@ -18589,7 +18589,7 @@ Func_14dc9: ; 0x14dc9
 	ld [wd7bd], a
 	ld a, $80
 	ld [wFlipperCollision], a
-	ld de, $000e
+	lb de, $00, $0e
 	call PlaySoundEffect
 	ret
 
@@ -18777,7 +18777,7 @@ Func_151cb: ; 0x151cb
 	ld bc, FourHundredPoints
 	ld [hFarCallTempA], a
 	callba AddBigBCD6FromQueueWithBallMultiplier
-	ld de, $0009
+	lb de, $00, $09
 	call PlaySoundEffect
 	ld hl, wd62c
 	call Func_e4a
@@ -18966,7 +18966,7 @@ Func_1535d: ; 0x1535d
 	inc hl
 	and [hl]
 	jr nz, .asm_153c0
-	ld de, $0009
+	lb de, $00, $09
 	call PlaySoundEffect
 	jp Func_15450
 
@@ -18986,7 +18986,7 @@ Func_1535d: ; 0x1535d
 	ld a, [wBallType]
 	cp MASTER_BALL
 	jr z, .masterBall
-	ld de, $063a
+	lb de, $06, $3a
 	call PlaySoundEffect
 	call Func_30e8
 	call Func_30db
@@ -19001,11 +19001,11 @@ Func_1535d: ; 0x1535d
 	ld a, [hl]
 	ld [wBallType], a
 	add $30
-	ld [wcBottomMessageText + $12], a
+	ld [wBottomMessageText + $12], a
 	jr .asm_15447
 
 .masterBall
-	ld de, $0f4d
+	lb de, $0f, $4d
 	call PlaySoundEffect
 	ld bc, OneMillionPoints
 	ld [hFarCallTempA], a
@@ -19508,7 +19508,7 @@ Func_159f4: ; 0x159f4
 	add c
 	cp $2
 	jr z, .asm_15a13
-	ld de, $0000
+	lb de, $00, $00
 	call PlaySoundEffect
 .asm_15a13
 	ld a, [wd7f2]
@@ -19552,7 +19552,7 @@ Func_15e93: ; 0x15e93
 	ld bc, TenThousandPoints
 	ld [hFarCallTempA], a
 	callba AddBigBCD6FromQueueWithBallMultiplier
-	ld de, $0005
+	lb de, $00, $05
 	call PlaySoundEffect
 	ld hl, BellsproutAnimationData
 	ld de, wBellsproutAnimationFrameCounter
@@ -19632,7 +19632,7 @@ Func_15e93: ; 0x15e93
 	ld [wBallXVelocity + 1], a
 	ld a, $2
 	ld [wBallYVelocity + 1], a
-	ld de, $0006
+	lb de, $00, $06
 	call PlaySoundEffect
 	ld a, $5
 	ld [hFarCallTempA], a
@@ -19729,7 +19729,7 @@ Func_15fda: ; 0x15fda
 	ld a, [wd7ea]
 	add [hl]
 	ld [wd7ea], a
-	ld de, $000b
+	lb de, $00, $0b
 	call PlaySoundEffect
 	ret
 
@@ -19751,7 +19751,7 @@ Func_160f0: ; 0x160f0
 	ld bc, TenThousandPoints
 	ld [hFarCallTempA], a
 	callba AddBigBCD6FromQueueWithBallMultiplier
-	ld de, $0021
+	lb de, $00, $21
 	call PlaySoundEffect
 	xor a
 	ld hl, wBallXVelocity
@@ -19959,7 +19959,7 @@ asm_1620f: ; 0x1620f
 	ld [wd803], a
 	ld a, $8
 	ld [wd804], a
-	ld de, $0004
+	lb de, $00, $04
 	call PlaySoundEffect
 	ret
 
@@ -20001,7 +20001,7 @@ Func_16279: ; 0x16279
 	ld a, [wd603]
 	cp $12
 	jr nz, .asm_162d4
-	ld de, $0021
+	lb de, $00, $21
 	call PlaySoundEffect
 	ld [hFarCallTempA], a
 	callba LoadMiniBallGfx
@@ -20160,7 +20160,7 @@ Func_163f2: ; 0x163f2
 	ld de, $0000
 	call PlaySong
 	rst AdvanceFrame
-	ld de, $3c23
+	lb de, $3c, $23
 	call PlaySoundEffect
 	ret
 
@@ -20264,7 +20264,7 @@ Func_1652d: ; 0x1652d
 	ld [wBallYVelocity + 1], a
 	ld a, $1
 	ld [wd549], a
-	ld de, $000a
+	lb de, $00, $0a
 	call PlaySoundEffect
 .asm_16566
 	ld a, $ff
@@ -20311,7 +20311,7 @@ Func_1658f: ; 0x1658f
 	ld a, [hl]
 	ld [wCurrentMap], a
 	push af
-	ld de, $0048
+	lb de, $00, $48
 	call PlaySoundEffect
 	pop af
 	add (PalletTownPic_Pointer - BillboardPicturePointers) / 3 ; map billboard pictures start at the $29th entry in BillboardPicturePointers
@@ -20401,7 +20401,7 @@ Func_1660c: ; 0x1660c
 	call CopyHLToDE
 	ld a, $2
 	ld [wd51c], a
-	ld de, $003b
+	lb de, $00, $3b
 	call PlaySoundEffect
 .asm_1667b
 	ld a, [wd51c]
@@ -20418,7 +20418,7 @@ Func_1660c: ; 0x1660c
 	ld [wd51e], a
 	cp $5a
 	ret nz
-	ld de, $0f22
+	lb de, $0f, $22
 	call PlaySoundEffect
 	ret
 
@@ -20456,7 +20456,7 @@ Func_1669e: ; 0x1669e
 	ld hl, Func_30164
 	call z, BankSwitch
 .asm_166f0
-	ld de, $1610
+	lb de, $16, $10
 	call PlaySoundEffect
 	ret
 
@@ -20586,7 +20586,7 @@ Func_16781: ; 0x16781
 	ld [hFarCallTempA], a
 	callba LoadStageCollisionAttributes
 	call Func_159f4
-	ld de, $0007
+	lb de, $00, $07
 	call PlaySoundEffect
 	ld a, [wStageCollisionState]
 	bit 0, a
@@ -20631,7 +20631,7 @@ Func_167ff: ; 0x167ff
 	and $fe
 	or c
 	ld [wStageCollisionState], a
-	ld de, $0007
+	lb de, $00, $07
 	call PlaySoundEffect
 	ret
 
@@ -20753,7 +20753,7 @@ Func_16d9d: ; 016d9d
 	jp z, Func_16e51
 	xor a
 	ld [wd60a], a
-	ld de, $000d
+	lb de, $00, $0d
 	call PlaySoundEffect
 	ld a, [wd60b]
 	sub $21
@@ -20922,7 +20922,7 @@ Func_16ef5: ; 0x16ef5
 	ld hl, wd5cc
 	ld de, BonusMultiplierText
 	call LoadTextHeader
-	ld hl, wcBottomMessageText + $12
+	ld hl, wBottomMessageText + $12
 	ld a, [wd614]
 	and $7f
 	jr z, .asm_16f1f
@@ -21200,12 +21200,13 @@ DrawTimer: ; 0x175f5
 	ret
 
 Data_17615:
-	dr $17615, $17625
+	db $d7, $da, $d8, $d9
+	db $dc, $df, $dd, $de
+	db $dc, $db, $dd, $de
+	db $f5, $f8, $f6, $f7
 
 DrawTimerDigit: ; 0x17625
 	add $b1  ; the timer digits' OAM ids start at $b1
-	; fall through
-
 Func_17627: ; 0x17627
 	call LoadOAMData
 	ld a, b
@@ -21214,28 +21215,28 @@ Func_17627: ; 0x17627
 	ret
 
 Func_1762f: ; 0x1762f
-	ld de, $600c
+	lb de, $60, $0c
 	ld a, [wCurrentStage]
 	cp $6
 	ret nc
-	ld de, $0000
+	lb de, $00, $00
 	bit 0, a
 	ret z
-	ld de, $3004
+	lb de, $30, $04
 	ld a, [wInSpecialMode]
 	and a
 	ret z
 	ld a, [wSpecialMode]
 	and a
 	ret nz
-	ld de, $3008
+	lb de, $30, $08
 	ret
 
 Func_1764f: ; 0x1764f
 	push bc
 	push de
 	cp [hl]
-	jr z, .asm_1765d
+	jr z, .skip
 	push af
 	push hl
 	add d
@@ -21243,7 +21244,7 @@ Func_1764f: ; 0x1764f
 	pop hl
 	pop af
 	ld [hl], a
-.asm_1765d
+.skip
 	inc hl
 	pop de
 	ld a, d
@@ -21267,7 +21268,7 @@ Func_17665: ; 0x17665
 	ret
 
 Data_17679:
-	dr $17679, $17c67
+INCLUDE "data/unknown_17679.asm"
 
 Func_17c67: ; 0x17c67
 	ld a, [wd5f3]
@@ -22300,7 +22301,7 @@ Func_18464: ; 0x18464
 	ld [wd7bd], a
 	ld a, $80
 	ld [wFlipperCollision], a
-	ld de, $002c
+	lb de, $00, $2c
 	call PlaySoundEffect
 .asm_184d5
 	ld bc, $0830
@@ -22520,7 +22521,7 @@ Func_1860b: ; 0x1860b
 	ld [wd7bd], a
 	ld a, $80
 	ld [wFlipperCollision], a
-	ld de, $002d
+	lb de, $00, $2d
 	call PlaySoundEffect
 .asm_1867c
 	ld bc, $5078
@@ -22729,7 +22730,7 @@ Func_187b1: ; 0x187b1
 	pop de
 	ld a, $2
 	ld [de], a
-	ld de, $0037
+	lb de, $00, $37
 	call PlaySoundEffect
 	jr .asm_18826
 
@@ -22917,7 +22918,7 @@ Func_1894c: ; 0x1894c
 	ret
 
 .asm_18980
-	ld de, $002b
+	lb de, $00, $2b
 	call PlaySoundEffect
 	ld a, $1
 	ld [wd6a6], a
@@ -23014,7 +23015,7 @@ Func_189af: ; 0x189af
 	ld a, [de]
 	cp $1
 	jr nz, .asm_18a14
-	ld de, $002e
+	lb de, $00, $2e
 	call PlaySoundEffect
 	ret
 
@@ -23032,7 +23033,7 @@ Func_189af: ; 0x189af
 	ld hl, wd5dc
 	ld de, Data_2f7b
 	call LoadTextHeader
-	ld de, $4b2a
+	lb de, $4b, $2a
 	call PlaySoundEffect
 	ret
 
@@ -23886,7 +23887,7 @@ Func_19531: ; 0x19531
 	ld a, $2
 	ld de, wd6ae
 	call Func_19679
-	ld de, $0039
+	lb de, $00, $39
 	call PlaySoundEffect
 	jr .asm_195a2
 
@@ -24022,7 +24023,7 @@ Func_19638: ; 0x19638
 	ld a, [de]
 	cp $1
 	jr nz, .asm_19645
-	ld de, $0040
+	lb de, $00, $40
 	call PlaySoundEffect
 	ret
 
@@ -24047,7 +24048,7 @@ Func_19638: ; 0x19638
 .asm_1966b
 	ld de, Data_2f97
 	call LoadTextHeader
-	ld de, $4b2a
+	lb de, $4b, $2a
 	call PlaySoundEffect
 	ret
 
@@ -24103,7 +24104,7 @@ Func_19701: ; 0x19701
 	ld bc, OneHundredThousandPoints
 	ld [hFarCallTempA], a
 	callba AddBigBCD6FromQueue
-	ld de, $0038
+	lb de, $00, $38
 	call PlaySoundEffect
 .asm_19742
 	ld de, wd6bd
@@ -24641,7 +24642,7 @@ Func_19c52: ; 0x19c52
 	ld bc, OneHundredThousandPoints
 	ld [hFarCallTempA], a
 	callba AddBigBCD6FromQueue
-	ld de, $0035
+	lb de, $00, $35
 	call PlaySoundEffect
 	ld hl, $0100
 	ld a, l
@@ -24951,7 +24952,7 @@ Func_1aad4: ; 0x1aad4
 	ld bc, FiveMillionPoints
 	ld [hFarCallTempA], a
 	callba AddBigBCD6FromQueue
-	ld de, $0036
+	lb de, $00, $36
 	call PlaySoundEffect
 	ld a, $33
 	ld [wd803], a
@@ -25087,7 +25088,7 @@ Func_1ab30: ; 0x1ab30
 	ld hl, wd5dc
 	ld de, Data_2fb3
 	call LoadTextHeader
-	ld de, $4b2a
+	lb de, $4b, $2a
 	call PlaySoundEffect
 	ld a, $1
 	ld [wd7be], a
@@ -26130,7 +26131,7 @@ Func_1c7d7: ; 0x1c7d7
 	ld [wBallYVelocity + 1], a
 	ld a, $1
 	ld [wd549], a
-	ld de, $000a
+	lb de, $00, $0a
 	call PlaySoundEffect
 .asm_1c810
 	ld a, $ff
@@ -26177,7 +26178,7 @@ Func_1c839: ; 0x1c839
 	ld a, [hl]
 	ld [wCurrentMap], a
 	push af
-	ld de, $0048
+	lb de, $00, $48
 	call PlaySoundEffect
 	pop af
 	add (PalletTownPic_Pointer - BillboardPicturePointers) / 3  ; map billboard pictures start at the $29th entry in BillboardPicturePointers
@@ -26425,7 +26426,7 @@ Func_1ca29: ; 0x1ca29
 	ld [wd7bd], a
 	ld a, $80
 	ld [wFlipperCollision], a
-	ld de, $000e
+	lb de, $00, $0e
 	call PlaySoundEffect
 	ret
 
@@ -26437,7 +26438,7 @@ Func_1ca4a: ; 1ca4a
 	ld [wd5c7], a
 	ld a, $1
 	ld [wBallHitWildMon], a
-	ld de, $0006
+	lb de, $00, $06
 	call PlaySoundEffect
 	ret
 
@@ -26661,7 +26662,7 @@ Func_1ce94: ; 0x1ce94
 	ld a, [wd7ea]
 	add [hl]
 	ld [wd7ea], a
-	ld de, $000b
+	lb de, $00, $0b
 	call PlaySoundEffect
 	ret
 
@@ -26844,7 +26845,7 @@ Func_1d0a1: ; 0x1d0a1
 	call CopyHLToDE
 	ld a, $2
 	ld [wd51c], a
-	ld de, $003b
+	lb de, $00, $3b
 	call PlaySoundEffect
 .asm_1d110
 	ld a, [wd51c]
@@ -26861,7 +26862,7 @@ Func_1d0a1: ; 0x1d0a1
 	ld [wd51e], a
 	cp $5a
 	ret nz
-	ld de, $0f22
+	lb de, $0f, $22
 	call PlaySoundEffect
 	ret
 
@@ -26899,7 +26900,7 @@ Func_1d133: ; 0x1d133
 	ld hl, Func_30164
 	call z, BankSwitch
 .asm_1d185
-	ld de, $1610
+	lb de, $16, $10
 	call PlaySoundEffect
 	ret
 
@@ -26992,7 +26993,7 @@ Func_1d216: ; 0x1d216
 	ld bc, TenThousandPoints
 	ld [hFarCallTempA], a
 	callba AddBigBCD6FromQueueWithBallMultiplier
-	ld de, $0005
+	lb de, $00, $05
 	call PlaySoundEffect
 	ld hl, Data_1d312
 	ld de, wd632
@@ -27073,7 +27074,7 @@ Func_1d216: ; 0x1d216
 	xor a
 	ld [wBallYVelocity], a
 	ld [wBallYVelocity + 1], a
-	ld de, $0006
+	lb de, $00, $06
 	call PlaySoundEffect
 	ld a, [wd642]
 	cp $0
@@ -27106,7 +27107,7 @@ HandleEnteringCloyster: ; 0x1d32d
 	ld bc, TenThousandPoints
 	ld [hFarCallTempA], a
 	callba AddBigBCD6FromQueueWithBallMultiplier
-	ld de, $0005
+	lb de, $00, $05
 	call PlaySoundEffect
 	ld hl, Data_1d41d
 	ld de, wd637
@@ -27187,7 +27188,7 @@ HandleEnteringCloyster: ; 0x1d32d
 	xor a
 	ld [wBallYVelocity], a
 	ld [wBallYVelocity + 1], a
-	ld de, $0006
+	lb de, $00, $06
 	call PlaySoundEffect
 	ld a, $e
 	ld [hFarCallTempA], a
@@ -27213,7 +27214,7 @@ Func_1d438: ; 0x1d438
 	jp z, Func_1d51b
 	xor a
 	ld [wd60a], a
-	ld de, $000d
+	lb de, $00, $0d
 	call PlaySoundEffect
 	ld a, [wd60b]
 	sub $f
@@ -27408,7 +27409,7 @@ Func_1d5bf: ; 0x1d5bf
 	ld hl, wd5cc
 	ld de, BonusMultiplierText
 	call LoadTextHeader
-	ld hl, wcBottomMessageText + $12
+	ld hl, wBottomMessageText + $12
 	ld a, [wd614]
 	and $7f
 	jr z, .asm_1d5e9
@@ -27884,7 +27885,7 @@ Func_1de22: ; 0x1de22
 	ld bc, FiveHundredPoints
 	ld [hFarCallTempA], a
 	callba AddBigBCD6FromQueueWithBallMultiplier
-	ld de, $000f
+	lb de, $00, $0f
 	call PlaySoundEffect
 	ret
 
@@ -28138,7 +28139,7 @@ Func_1e356: ; 0x1e356
 	inc hl
 	and [hl]
 	jr nz, .asm_1e3de
-	ld de, $0009
+	lb de, $00, $09
 	call PlaySoundEffect
 	jp asm_1e475
 
@@ -28158,7 +28159,7 @@ Func_1e356: ; 0x1e356
 	ld a, [wBallType]
 	cp MASTER_BALL
 	jr z, .masterBall
-	ld de, $063a
+	lb de, $06, $3a
 	call PlaySoundEffect
 	call Func_30e8
 	call Func_30db
@@ -28173,11 +28174,11 @@ Func_1e356: ; 0x1e356
 	ld a, [hl]
 	ld [wBallType], a
 	add $30
-	ld [wcBottomMessageText + $12], a
+	ld [wBottomMessageText + $12], a
 	jr .asm_1e465
 
 .masterBall
-	ld de, $0f4d
+	lb de, $0f, $4d
 	call PlaySoundEffect
 	ld bc, OneMillionPoints
 	ld [hFarCallTempA], a
@@ -28427,7 +28428,7 @@ Func_1e5c5: ; 0x1e5c5
 	ld bc, FourHundredPoints
 	ld [hFarCallTempA], a
 	callba AddBigBCD6FromQueueWithBallMultiplier
-	ld de, $0009
+	lb de, $00, $09
 	call PlaySoundEffect
 	ld hl, wd62c
 	call Func_e4a
@@ -28615,7 +28616,7 @@ Func_1e757: ; 0x1e757
 	ld a, [wd603]
 	cp $12
 	jr nz, .asm_1e7b2
-	ld de, $0021
+	lb de, $00, $21
 	call PlaySoundEffect
 	ld [hFarCallTempA], a
 	callba LoadMiniBallGfx
@@ -28768,7 +28769,7 @@ Func_1e8c3: ; 0x1e8c3
 	ld de, $0000
 	call PlaySong
 	rst AdvanceFrame
-	ld de, $3c23
+	lb de, $3c, $23
 	call PlaySoundEffect
 	ret
 
@@ -28979,7 +28980,7 @@ asm_1ea6a: ; 0x1ea6a
 	ld [wd803], a
 	ld a, $8
 	ld [wd804], a
-	ld de, $0004
+	lb de, $00, $04
 	call PlaySoundEffect
 	ret
 
@@ -30774,21 +30775,21 @@ Func_20651: ; 0x20651
 	ld [wd554], a
 	cp $1
 	jr nz, .asm_20693
-	ld de, $0728
+	lb de, $07, $28
 	call PlaySoundEffect
 	ret
 
 .asm_20693
 	cp $2
 	jr nz, .asm_2069e
-	ld de, $0744
+	lb de, $07, $44
 	call PlaySoundEffect
 	ret
 
 .asm_2069e
 	cp $3
 	ret nz
-	ld de, $0745
+	lb de, $07, $45
 	call PlaySoundEffect
 	ld a, $1
 	ld [wd604], a
@@ -31140,7 +31141,7 @@ Func_2094d: ; 0x2094d
 	ret
 
 Func_20977: ; 0x20977
-	ld de, $0746
+	lb de, $07, $46
 	call PlaySoundEffect
 	call Func_20af5
 	ld a, [wCurrentEvolutionType]
@@ -31191,7 +31192,7 @@ Func_20977: ; 0x20977
 	ret
 
 Func_209eb: ; 0x209eb
-	ld de, $0747
+	lb de, $07, $47
 	call PlaySoundEffect
 	ld a, $1
 	ld [wd551], a
@@ -31399,7 +31400,7 @@ Func_20b02: ; 0x20b02
 	ld de, $0000
 	call PlaySong
 	rst AdvanceFrame
-	ld de, $2d26
+	lb de, $2d, $26
 	call PlaySoundEffect
 	ld [hFarCallTempA], a
 	callba Func_10825
@@ -31533,21 +31534,21 @@ Func_20c76: ; 0x20c76
 	ld [wd554], a
 	cp $1
 	jr nz, .asm_20cb8
-	ld de, $0728
+	lb de, $07, $28
 	call PlaySoundEffect
 	ret
 
 .asm_20cb8
 	cp $2
 	jr nz, .asm_20cc3
-	ld de, $0744
+	lb de, $07, $44
 	call PlaySoundEffect
 	ret
 
 .asm_20cc3
 	cp $3
 	ret nz
-	ld de, $0745
+	lb de, $07, $45
 	call PlaySoundEffect
 	ld a, $1
 	ld [wd604], a
@@ -31877,7 +31878,7 @@ Func_20f4b: ; 0x20f4b
 	ret
 
 Func_20f75: ; 0x20f75
-	ld de, $0746
+	lb de, $07, $46
 	call PlaySoundEffect
 	call Func_2111d
 	ld a, [wCurrentEvolutionType]
@@ -31930,7 +31931,7 @@ Func_20f75: ; 0x20f75
 	ret
 
 Func_20fef: ; 0x20fef
-	ld de, $0747
+	lb de, $07, $47
 	call PlaySoundEffect
 	ld a, $1
 	ld [wd551], a
@@ -32159,7 +32160,7 @@ Func_2112a: ; 0x2112a
 	ld de, $0000
 	call PlaySong
 	rst AdvanceFrame
-	ld de, $2d26
+	lb de, $2d, $26
 	call PlaySoundEffect
 	ld [hFarCallTempA], a
 	callba Func_10825
@@ -32780,13 +32781,13 @@ Func_2442a: ; 0x2442a
 	ld hl, wd5dc
 	ld de, Data_2fd0
 	call LoadTextHeader
-	ld de, $4b2a
+	lb de, $4b, $2a
 	call PlaySoundEffect
 .asm_24498
 	ld a, [wd712]
 	cp $4
 	jr nz, .asm_244b0
-	ld a, [wd800]
+	ld a, [wSFXTimer]
 	and a
 	jr nz, .asm_244b0
 	ld de, $0004
@@ -32890,7 +32891,7 @@ Func_245ab: ; 0x245ab
 	ld [wd803], a
 	ld a, $3
 	ld [wd804], a
-	ld de, $0033
+	lb de, $00, $33
 	call PlaySoundEffect
 	ld bc, OneThousandPoints
 	ld [hFarCallTempA], a
@@ -33289,7 +33290,7 @@ Func_248ac: ; 0x248ac
 	inc [hl]
 	ld a, $2
 	ld [wd717], a
-	ld de, $0034
+	lb de, $00, $34
 	call PlaySoundEffect
 .asm_248d3
 	ld a, [wd718]
@@ -33308,7 +33309,7 @@ Func_248ac: ; 0x248ac
 	inc [hl]
 	ld a, $2
 	ld [wd718], a
-	ld de, $0034
+	lb de, $00, $34
 	call PlaySoundEffect
 .asm_248fa
 	ld a, [wd719]
@@ -33327,7 +33328,7 @@ Func_248ac: ; 0x248ac
 	inc [hl]
 	ld a, $2
 	ld [wd719], a
-	ld de, $0034
+	lb de, $00, $34
 	call PlaySoundEffect
 .asm_24921
 	ld a, [wd717]
@@ -33864,7 +33865,7 @@ Func_24d07: ; 0x24d07
 .asm_24d1f
 	ld a, $2
 	ld [wd721], a
-	ld de, $0034
+	lb de, $00, $34
 	call PlaySoundEffect
 .asm_24d2a
 	ld a, [wd722]
@@ -33881,7 +33882,7 @@ Func_24d07: ; 0x24d07
 .asm_24d42
 	ld a, $2
 	ld [wd722], a
-	ld de, $0034
+	lb de, $00, $34
 	call PlaySoundEffect
 .asm_24d4d
 	ld a, [wd723]
@@ -33898,7 +33899,7 @@ Func_24d07: ; 0x24d07
 .asm_24d65
 	ld a, $2
 	ld [wd723], a
-	ld de, $0034
+	lb de, $00, $34
 	call PlaySoundEffect
 .asm_24d70
 	ld a, [wd721]
@@ -34062,7 +34063,7 @@ Func_24e7f: ; 0x24e7f
 	ld [wd803], a
 	ld a, $3
 	ld [wd804], a
-	ld de, $0032
+	lb de, $00, $32
 	call PlaySoundEffect
 	ld a, [wMeowthStageBonusCounter]
 	dec a
@@ -34769,13 +34770,13 @@ Func_25c5a: ; 0x25c5a
 	call LoadTextHeader
 	ld a, $2
 	ld [wd794], a
-	ld de, $4b2a
+	lb de, $4b, $2a
 	call PlaySoundEffect
 .asm_25c98
 	ld a, [wd794]
 	cp $2
 	jr nz, .asm_25cb0
-	ld a, [wd800]
+	ld a, [wSFXTimer]
 	and a
 	jr nz, .asm_25cb0
 	ld de, $0003
@@ -34907,7 +34908,7 @@ Func_25da3: ; 0x25da3
 	ld [wd803], a
 	ld a, $8
 	ld [wd804], a
-	ld de, $0030
+	lb de, $00, $30
 	call PlaySoundEffect
 	call Func_25e85
 	ld hl, wd792
@@ -35166,7 +35167,7 @@ Func_25f77: ; 0x25f77
 	ld a, $3
 .asm_25fb2
 	push af
-	ld de, $0031
+	lb de, $00, $31
 	call PlaySoundEffect
 	pop af
 	pop de
@@ -35231,21 +35232,21 @@ Func_25ff3: ; 0x25ff3
 	jr nc, .asm_26016
 	ld a, $3
 	ld [de], a
-	ld de, $0031
+	lb de, $00, $31
 	call PlaySoundEffect
 	ret
 
 .asm_26016
 	ld a, $2
 	ld [de], a
-	ld de, $0031
+	lb de, $00, $31
 	call PlaySoundEffect
 	ret
 
 .asm_26020
 	ld a, $1
 	ld [de], a
-	ld de, $0031
+	lb de, $00, $31
 	call PlaySoundEffect
 	ret
 
@@ -35333,21 +35334,21 @@ Func_2607f: ; 0x2607f
 	jr nc, .asm_260a2
 	ld a, $3
 	ld [de], a
-	ld de, $0031
+	lb de, $00, $31
 	call PlaySoundEffect
 	ret
 
 .asm_260a2
 	ld a, $2
 	ld [de], a
-	ld de, $0031
+	lb de, $00, $31
 	call PlaySoundEffect
 	ret
 
 .asm_260ac
 	ld a, $1
 	ld [de], a
-	ld de, $0031
+	lb de, $00, $31
 	call PlaySoundEffect
 	ret
 
@@ -36435,7 +36436,7 @@ Func_28513: ; 0x28513
 	ld a, [wd95f]
 	and a
 	ret z
-	ld de, $0003
+	lb de, $00, $03
 	call PlaySoundEffect
 	call Func_28931
 	call Func_289c8
@@ -40908,7 +40909,7 @@ Func_315d5: ; 0x315d5
 	callba Func_31281
 	ld [hFarCallTempA], a
 	callba Func_30253
-	ld de, $2525
+	lb de, $25, $25
 	call PlaySoundEffect
 	ld bc, Data_2cbf
 	ld [hFarCallTempA], a
@@ -41073,7 +41074,7 @@ Func_3174c: ; 0x3174c
 	callba Func_3140b
 	ld [hFarCallTempA], a
 	callba Func_30253
-	ld de, $2525
+	lb de, $25, $25
 	call PlaySoundEffect
 	ld bc, Data_2cbf
 	ld [hFarCallTempA], a
diff --git a/wram.asm b/wram.asm
index 53f9070..9ca4d64 100755
--- a/wram.asm
+++ b/wram.asm
@@ -34,10 +34,10 @@ wc4c0:: ; 0xc4c0
 wc4cc:: ; 0xc4cc
 	ds $34
 
-wcBottomMessageText:: ; 0xc500
+wBottomMessageText:: ; 0xc500
 	ds $100
 
-wc600::
+wc600:: ; 0xc600
 	ds $100
 
 wStageCollisionMap:: ; 0xc700
@@ -1843,7 +1843,7 @@ wd7fd:: ; 0xd7fd
 wd7fe:: ; 0xd7fe
 	ds $2
 
-wd800:: ; 0xd800
+wSFXTimer:: ; 0xd800
 	ds $1
 
 wd801:: ; 0xd801