pokecrystal using hardware.inc

audio/engine.asm

@@ -353,7 +353,7 @@ UpdateChannels:
 	ldh a, [rNR52]
 	and %10001101 ; ch2 off
 	ldh [rNR52], a
-	ld hl, rNR20
+	ld hl, $ff15 ; rNR20 (imaginary)
 	call ClearChannel
 	ret
 
@@ -434,37 +434,37 @@ endr
 	add hl, de
 	; load wavepattern into rWave_0-rWave_f
 	ld a, [hli]
-	ldh [rWave_0], a
+	ldh [_AUD3WAVERAM], a ; rWave_0
 	ld a, [hli]
-	ldh [rWave_1], a
+	ldh [$ff31], a ; rWave_1
 	ld a, [hli]
-	ldh [rWave_2], a
+	ldh [$ff32], a ; rWave_2
 	ld a, [hli]
-	ldh [rWave_3], a
+	ldh [$ff33], a ; rWave_3
 	ld a, [hli]
-	ldh [rWave_4], a
+	ldh [$ff34], a ; rWave_4
 	ld a, [hli]
-	ldh [rWave_5], a
+	ldh [$ff35], a ; rWave_5
 	ld a, [hli]
-	ldh [rWave_6], a
+	ldh [$ff36], a ; rWave_6
 	ld a, [hli]
-	ldh [rWave_7], a
+	ldh [$ff37], a ; rWave_7
 	ld a, [hli]
-	ldh [rWave_8], a
+	ldh [$ff38], a ; rWave_8
 	ld a, [hli]
-	ldh [rWave_9], a
+	ldh [$ff39], a ; rWave_9
 	ld a, [hli]
-	ldh [rWave_a], a
+	ldh [$ff3a], a ; rWave_a
 	ld a, [hli]
-	ldh [rWave_b], a
+	ldh [$ff3b], a ; rWave_b
 	ld a, [hli]
-	ldh [rWave_c], a
+	ldh [$ff3c], a ; rWave_c
 	ld a, [hli]
-	ldh [rWave_d], a
+	ldh [$ff3d], a ; rWave_d
 	ld a, [hli]
-	ldh [rWave_e], a
+	ldh [$ff3e], a ; rWave_e
 	ld a, [hli]
-	ldh [rWave_f], a
+	ldh [$ff3f], a ; rWave_f
 	pop hl
 	ld a, [wCurTrackVolumeEnvelope]
 	and $f0
@@ -491,7 +491,7 @@ endr
 	ldh a, [rNR52]
 	and %10000111 ; ch4 off
 	ldh [rNR52], a
-	ld hl, rNR40
+	ld hl, $ff1f ; rNR40 (imaginary)
 	call ClearChannel
 	ret
 

constants.asm

@@ -2,7 +2,7 @@ INCLUDE "charmap.asm"
 
 INCLUDE "macros.asm"
 
-INCLUDE "constants/hardware_constants.asm"
+INCLUDE "constants/hardware.inc"
 INCLUDE "constants/deco_constants.asm"
 INCLUDE "constants/wram_constants.asm"
 INCLUDE "constants/misc_constants.asm"