summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-03 22:11:35 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-03 22:22:09 -0400
commit6ef36800b0dcb86100a7c716172015667e60dc99 (patch)
tree7e381171a7f42cadb6e619c839bfc4d3eb88e7d1 /audio
parent35deb771130a9012ee4494b1db097761f2fe2919 (diff)
Replace raw hex values with HRAM constants
To do: turn constants into labels and use ldh
Diffstat (limited to 'audio')
-rw-r--r--audio/engine_1.asm2
-rw-r--r--audio/engine_2.asm2
-rw-r--r--audio/engine_3.asm2
-rw-r--r--audio/pokedex_rating_sfx.asm2
-rw-r--r--audio/wave_instruments.asm2
5 files changed, 5 insertions, 5 deletions
diff --git a/audio/engine_1.asm b/audio/engine_1.asm
index 0f76f576..20b992aa 100644
--- a/audio/engine_1.asm
+++ b/audio/engine_1.asm
@@ -925,7 +925,7 @@ Audio1_ApplyWavePatternAndFrequency:
ld e, [hl]
inc hl
ld d, [hl]
- ld hl, $ff30 ; wave pattern RAM
+ ld hl, rWave_0
ld b, $f
ld a, $0 ; stop hardware channel 3
ld [rNR30], a
diff --git a/audio/engine_2.asm b/audio/engine_2.asm
index 2e0aad0d..864a8c21 100644
--- a/audio/engine_2.asm
+++ b/audio/engine_2.asm
@@ -936,7 +936,7 @@ Audio2_ApplyWavePatternAndFrequency:
ld e, [hl]
inc hl
ld d, [hl]
- ld hl, $ff30 ; wave pattern RAM
+ ld hl, rWave_0
ld b, $f
ld a, $0 ; stop hardware channel 3
ld [rNR30], a
diff --git a/audio/engine_3.asm b/audio/engine_3.asm
index 771b44df..c0aaeaf8 100644
--- a/audio/engine_3.asm
+++ b/audio/engine_3.asm
@@ -925,7 +925,7 @@ Audio3_ApplyWavePatternAndFrequency:
ld e, [hl]
inc hl
ld d, [hl]
- ld hl, $ff30 ; wave pattern RAM
+ ld hl, rWave_0
ld b, $f
ld a, $0 ; stop hardware channel 3
ld [rNR30], a
diff --git a/audio/pokedex_rating_sfx.asm b/audio/pokedex_rating_sfx.asm
index f3aace8a..1b5dc4f0 100644
--- a/audio/pokedex_rating_sfx.asm
+++ b/audio/pokedex_rating_sfx.asm
@@ -1,5 +1,5 @@
PlayPokedexRatingSfx::
- ld a, [$ffdc]
+ ld a, [hDexRatingNumMonsOwned]
ld c, $0
ld hl, OwnedMonValues
.getSfxPointer
diff --git a/audio/wave_instruments.asm b/audio/wave_instruments.asm
index c915f18a..4a830f4b 100644
--- a/audio/wave_instruments.asm
+++ b/audio/wave_instruments.asm
@@ -13,7 +13,7 @@
; these are the definitions for the channel 3 instruments
; each instrument definition is made up of 32 points (nibbles) that form
; the graph of the wave
-; the current instrument is copied to $FF30
+; the current instrument is copied to rWave_0--rWave_f
.wave0
db $02,$46,$8A,$CE,$FF,$FE,$ED,$DC,$CB,$A9,$87,$65,$44,$33,$22,$11