aboutsummaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-17 15:58:06 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-17 15:58:06 -0400
commit76289dfda0b7405944e10a78b7381c723475bea4 (patch)
treeb3041f6324c7a5b6065a84d94af66ddb098dee2c /audio
parentDefine constants for subanimations' base coords and frame block modes (diff)
downloadpokeyellow-76289dfda0b7405944e10a78b7381c723475bea4.tar.gz
pokeyellow-76289dfda0b7405944e10a78b7381c723475bea4.tar.xz
pokeyellow-76289dfda0b7405944e10a78b7381c723475bea4.zip
Port dbsprite macro for OAM y,x,tile,attr data from pokecrystal
Diffstat (limited to 'audio')
-rw-r--r--audio/low_health_alarm.asm15
1 files changed, 10 insertions, 5 deletions
diff --git a/audio/low_health_alarm.asm b/audio/low_health_alarm.asm
index 514db55f..a550cf70 100644
--- a/audio/low_health_alarm.asm
+++ b/audio/low_health_alarm.asm
@@ -61,15 +61,20 @@ Music_DoLowHealthAlarm::
jr nz, .copyLoop
ret
+alarm_tone: MACRO
+ db \1 ; length
+ db \2 ; envelope
+ dw \3 ; frequency
+ENDM
+
;bytes to write to sound channel 1 registers for health alarm.
-;starting at FF11 (FF10 is always zeroed), so these bytes are:
-;length, envelope, freq lo, freq hi
+;starting at FF11 (FF10 is always zeroed).
.toneDataHi
- db $A0,$E2,$50,$87
+ alarm_tone $A0, $E2, $8750
.toneDataLo
- db $B0,$E2,$EE,$86
+ alarm_tone $B0, $E2, $86EE
;written to stop the alarm
.toneDataSilence
- db $00,$00,$00,$80
+ alarm_tone $00, $00, $8000