From 76289dfda0b7405944e10a78b7381c723475bea4 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Fri, 17 Jul 2020 15:58:06 -0400
Subject: Port dbsprite macro for OAM y,x,tile,attr data from pokecrystal

---
 audio/low_health_alarm.asm | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'audio')

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
-- 
cgit v1.3.1-sl0p