Merge pull request #330 from PikalaxALT/scriptmacrorenaming

Scriptmacrorenaming

1 files changed, 98 insertions, 63 deletions

diff --git a/macros/sound.asm b/macros/sound.asm
index ae1c192fb..b5a33994b 100644
--- a/macros/sound.asm
+++ b/macros/sound.asm
@@ -3,227 +3,262 @@ note: MACRO
 	ENDM
 
 sound: macro
-	db \1 ; duration
-	db \2 ; intensity
-	dw \3 ; frequency
+	note \1, \2
+	db \3 ; intensity
+	dw \4 ; frequency
 	endm
 
 noise: macro
-	db \1 ; duration
-	db \2 ; intensity
-	db \3 ; frequency
+	note \1, \2 ; duration
+	db \3 ; intensity
+	db \4 ; frequency
 	endm
 
-; pitch
-__ EQU 0
-C_ EQU 1
-C# EQU 2
-D_ EQU 3
-D# EQU 4
-E_ EQU 5
-F_ EQU 6
-F# EQU 7
-G_ EQU 8
-G# EQU 9
-A_ EQU 10
-A# EQU 11
-B_ EQU 12
+musicheader: macro
+	; number of tracks, ??, address
+	dbw ((\1 - 1) << 6) + (\2 - 1), \3
+	endm
 
+cry_header: macro
+	dw \1, \2, \3
+	endm
 
+	enum_start $d8
+	enum notetype_cmd
 octave: macro
-	db $d8 - (\1)
+	db notetype_cmd - (\1)
 	endm
 
 notetype: macro
-	db $d8
+	db notetype_cmd
 	db \1 ; note_length
 	if _NARG >= 2
 	db \2 ; intensity
 	endc
 	endm
 
+	enum forceoctave_cmd
 forceoctave: macro
-	db $d9
+	db forceoctave_cmd
 	db \1 ; octave
 	endm
 
+	enum tempo_cmd
 tempo: macro
-	db $da
+	db tempo_cmd
 	bigdw \1 ; tempo
 	endm
 
+	enum dutycycle_cmd
 dutycycle: macro
-	db $db
+	db dutycycle_cmd
 	db \1 ; duty_cycle
 	endm
 
+	enum intensity_cmd
 intensity: macro
-	db $dc
+	db intensity_cmd
 	db \1 ; intensity
 	endm
 
+	enum soundinput_cmd
 soundinput: macro
-	db $dd
+	db soundinput_cmd
 	db \1 ; input
 	endm
 
+	enum unknownmusic0xde_cmd
 unknownmusic0xde: macro
-	db $de
+	db unknownmusic0xde_cmd
 	db \1 ; unknown
 	endm
 
+	enum togglesfx_cmd
 togglesfx: macro
-	db $df
+	db togglesfx_cmd
 	endm
 
+	enum unknownmusic0xe0_cmd
 unknownmusic0xe0: macro
-	db $e0
+	db unknownmusic0xe0_cmd
 	db \1 ; unknown
-	db \2 ; unknown
+	; db \2 ; unknown
+	dn \2, \3 ; octave, pitch
 	endm
 
+	enum vibrato_cmd
 vibrato: macro
-	db $e1
+	db vibrato_cmd
 	db \1 ; delay
 	db \2 ; extent
 	endm
 
+	enum unknownmusic0xe2_cmd
 unknownmusic0xe2: macro
-	db $e2
+	db unknownmusic0xe2_cmd
 	db \1 ; unknown
 	endm
 
+	enum togglenoise_cmd
 togglenoise: macro
-	db $e3
+	db togglenoise_cmd
 	db \1 ; id
 	endm
 
+	enum panning_cmd
 panning: macro
-	db $e4
+	db panning_cmd
 	db \1 ; tracks
 	endm
 
+	enum volume_cmd
 volume: macro
-	db $e5
+	db volume_cmd
 	db \1 ; volume
 	endm
 
+	enum tone_cmd
 tone: macro
-	db $e6
+	db tone_cmd
 	bigdw \1 ; tone
 	endm
 
+	enum unknownmusic0xe7_cmd
 unknownmusic0xe7: macro
-	db $e7
+	db unknownmusic0xe7_cmd
 	db \1 ; unknown
 	endm
 
+	enum unknownmusic0xe8_cmd
 unknownmusic0xe8: macro
-	db $e8
+	db unknownmusic0xe8_cmd
 	db \1 ; unknown
 	endm
 
-globaltempo: macro
-	db $e9
+	enum tempo_relative_cmd
+tempo_relative: macro
+	db tempo_relative_cmd
 	bigdw \1 ; value
 	endm
 
+	enum restartchannel_cmd
 restartchannel: macro
-	db $ea
+	db restartchannel_cmd
 	dw \1 ; address
 	endm
 
+	enum newsong_cmd
 newsong: macro
-	db $eb
+	db newsong_cmd
 	bigdw \1 ; id
 	endm
 
+	enum sfxpriorityon_cmd
 sfxpriorityon: macro
-	db $ec
+	db sfxpriorityon_cmd
 	endm
 
+	enum sfxpriorityoff_cmd
 sfxpriorityoff: macro
-	db $ed
+	db sfxpriorityoff_cmd
 	endm
 
+	enum unknownmusic0xee_cmd
 unknownmusic0xee: macro
-	db $ee
+	db unknownmusic0xee_cmd
 	dw \1 ; address
 	endm
 
+	enum stereopanning_cmd
 stereopanning: macro
-	db $ef
+	db stereopanning_cmd
 	db \1 ; tracks
 	endm
 
+	enum sfxtogglenoise_cmd
 sfxtogglenoise: macro
-	db $f0
+	db sfxtogglenoise_cmd
 	db \1 ; id
 	endm
 
+	enum music0xf1_cmd
 music0xf1: macro
-	db $f1
+	db music0xf1_cmd
 	endm
 
+	enum music0xf2_cmd
 music0xf2: macro
-	db $f2
+	db music0xf2_cmd
 	endm
 
+	enum music0xf3_cmd
 music0xf3: macro
-	db $f3
+	db music0xf3_cmd
 	endm
 
+	enum music0xf4_cmd
 music0xf4: macro
-	db $f4
+	db music0xf4_cmd
 	endm
 
+	enum music0xf5_cmd
 music0xf5: macro
-	db $f5
+	db music0xf5_cmd
 	endm
 
+	enum music0xf6_cmd
 music0xf6: macro
-	db $f6
+	db music0xf6_cmd
 	endm
 
+	enum music0xf7_cmd
 music0xf7: macro
-	db $f7
+	db music0xf7_cmd
 	endm
 
+	enum music0xf8_cmd
 music0xf8: macro
-	db $f8
+	db music0xf8_cmd
 	endm
 
+	enum unknownmusic0xf9_cmd
 unknownmusic0xf9: macro
-	db $f9
+	db unknownmusic0xf9_cmd
 	endm
 
+	enum setcondition_cmd
 setcondition: macro
-	db $fa
+	db setcondition_cmd
 	db \1 ; condition
 	endm
 
+	enum jumpif_cmd
 jumpif: macro
-	db $fb
+	db jumpif_cmd
 	db \1 ; condition
 	dw \2 ; address
 	endm
 
+	enum jumpchannel_cmd
 jumpchannel: macro
-	db $fc
+	db jumpchannel_cmd
 	dw \1 ; address
 	endm
 
+	enum loopchannel_cmd
 loopchannel: macro
-	db $fd
+	db loopchannel_cmd
 	db \1 ; count
 	dw \2 ; address
 	endm
 
+	enum callchannel_cmd
 callchannel: macro
-	db $fe
+	db callchannel_cmd
 	dw \1 ; address
 	endm
 
+	enum endchannel_cmd
 endchannel: macro
-	db $ff
+	db endchannel_cmd
 	endm