From 2d6b3cba9b9172b8c8ab404e987bfd083b1912e4 Mon Sep 17 00:00:00 2001
From: quinnyo <3379314+quinnyo@users.noreply.github.com>
Date: Sat, 13 Jan 2024 12:26:55 +1000
Subject: [PATCH] non-deprecated DEF/EQU syntax

- rgbasm 0.7.0 deprecated constant variable definitions without the 'DEF'
- 'DEF' has been valid syntax since rgbasm 0.5.0
---
 hUGEDriver.asm   |   4 +-
 include/hUGE.inc | 150 +++++++++++++++++++++++------------------------
 player.asm       |   2 +-
 3 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/hUGEDriver.asm b/hUGEDriver.asm
index 1d1fa77..896de6f 100644
--- a/hUGEDriver.asm
+++ b/hUGEDriver.asm
@@ -31,7 +31,7 @@ MACRO checkMute
 ENDM
 
 ;; Maximum pattern length
-PATTERN_LENGTH EQU 64
+DEF PATTERN_LENGTH EQU 64
 
 SECTION "Playback variables", WRAM0
 ;; Active song descriptor
@@ -66,7 +66,7 @@ _hUGE_current_wave::
 hUGE_current_wave::
 ;; ID of the wave currently loaded into wave RAM
 current_wave: db
-hUGE_NO_WAVE equ 100
+def hUGE_NO_WAVE equ 100
     EXPORT hUGE_NO_WAVE
 
 ;; Everything between this and `end_zero` is zero-initialized by `hUGE_init`
diff --git a/include/hUGE.inc b/include/hUGE.inc
index 4eda5ad..9fbd0f0 100644
--- a/include/hUGE.inc
+++ b/include/hUGE.inc
@@ -4,78 +4,78 @@ MACRO dn ;; (note, instr, effect)
     db LOW(\3)
 ENDM
 
-C_3 EQU 0
-C#3 EQU 1
-D_3 EQU 2
-D#3 EQU 3
-E_3 EQU 4
-F_3 EQU 5
-F#3 EQU 6
-G_3 EQU 7
-G#3 EQU 8
-A_3 EQU 9
-A#3 EQU 10
-B_3 EQU 11
-C_4 EQU 12
-C#4 EQU 13
-D_4 EQU 14
-D#4 EQU 15
-E_4 EQU 16
-F_4 EQU 17
-F#4 EQU 18
-G_4 EQU 19
-G#4 EQU 20
-A_4 EQU 21
-A#4 EQU 22
-B_4 EQU 23
-C_5 EQU 24
-C#5 EQU 25
-D_5 EQU 26
-D#5 EQU 27
-E_5 EQU 28
-F_5 EQU 29
-F#5 EQU 30
-G_5 EQU 31
-G#5 EQU 32
-A_5 EQU 33
-A#5 EQU 34
-B_5 EQU 35
-C_6 EQU 36
-C#6 EQU 37
-D_6 EQU 38
-D#6 EQU 39
-E_6 EQU 40
-F_6 EQU 41
-F#6 EQU 42
-G_6 EQU 43
-G#6 EQU 44
-A_6 EQU 45
-A#6 EQU 46
-B_6 EQU 47
-C_7 EQU 48
-C#7 EQU 49
-D_7 EQU 50
-D#7 EQU 51
-E_7 EQU 52
-F_7 EQU 53
-F#7 EQU 54
-G_7 EQU 55
-G#7 EQU 56
-A_7 EQU 57
-A#7 EQU 58
-B_7 EQU 59
-C_8 EQU 60
-C#8 EQU 61
-D_8 EQU 62
-D#8 EQU 63
-E_8 EQU 64
-F_8 EQU 65
-F#8 EQU 66
-G_8 EQU 67
-G#8 EQU 68
-A_8 EQU 69
-A#8 EQU 70
-B_8 EQU 71
-LAST_NOTE EQU 72
-___ EQU 90 ; the default "no note" value
-NO_NOTE EQU ___
\ No newline at end of file
+DEF C_3 EQU 0
+DEF C#3 EQU 1
+DEF D_3 EQU 2
+DEF D#3 EQU 3
+DEF E_3 EQU 4
+DEF F_3 EQU 5
+DEF F#3 EQU 6
+DEF G_3 EQU 7
+DEF G#3 EQU 8
+DEF A_3 EQU 9
+DEF A#3 EQU 10
+DEF B_3 EQU 11
+DEF C_4 EQU 12
+DEF C#4 EQU 13
+DEF D_4 EQU 14
+DEF D#4 EQU 15
+DEF E_4 EQU 16
+DEF F_4 EQU 17
+DEF F#4 EQU 18
+DEF G_4 EQU 19
+DEF G#4 EQU 20
+DEF A_4 EQU 21
+DEF A#4 EQU 22
+DEF B_4 EQU 23
+DEF C_5 EQU 24
+DEF C#5 EQU 25
+DEF D_5 EQU 26
+DEF D#5 EQU 27
+DEF E_5 EQU 28
+DEF F_5 EQU 29
+DEF F#5 EQU 30
+DEF G_5 EQU 31
+DEF G#5 EQU 32
+DEF A_5 EQU 33
+DEF A#5 EQU 34
+DEF B_5 EQU 35
+DEF C_6 EQU 36
+DEF C#6 EQU 37
+DEF D_6 EQU 38
+DEF D#6 EQU 39
+DEF E_6 EQU 40
+DEF F_6 EQU 41
+DEF F#6 EQU 42
+DEF G_6 EQU 43
+DEF G#6 EQU 44
+DEF A_6 EQU 45
+DEF A#6 EQU 46
+DEF B_6 EQU 47
+DEF C_7 EQU 48
+DEF C#7 EQU 49
+DEF D_7 EQU 50
+DEF D#7 EQU 51
+DEF E_7 EQU 52
+DEF F_7 EQU 53
+DEF F#7 EQU 54
+DEF G_7 EQU 55
+DEF G#7 EQU 56
+DEF A_7 EQU 57
+DEF A#7 EQU 58
+DEF B_7 EQU 59
+DEF C_8 EQU 60
+DEF C#8 EQU 61
+DEF D_8 EQU 62
+DEF D#8 EQU 63
+DEF E_8 EQU 64
+DEF F_8 EQU 65
+DEF F#8 EQU 66
+DEF G_8 EQU 67
+DEF G#8 EQU 68
+DEF A_8 EQU 69
+DEF A#8 EQU 70
+DEF B_8 EQU 71
+DEF LAST_NOTE EQU 72
+DEF ___ EQU 90 ; the default "no note" value
+DEF NO_NOTE EQU ___
\ No newline at end of file
diff --git a/player.asm b/player.asm
index 5fd4db9..474c556 100644
--- a/player.asm
+++ b/player.asm
@@ -1,7 +1,7 @@
 include "include/hardware.inc"
 
 ; Constants
-STACK_SIZE EQU $7A
+DEF STACK_SIZE EQU $7A
 ;; Stack starts at $FFFE
 
 ; $0000 - $003F: RST handlers.