Merge pull request #578 from mid-kid/master

Fixes in the animation subsystem.

macros/scripts/audio.asm

@@ -21,12 +21,13 @@ ENDM
 
 ; MusicCommands indexes (see audio/engine.asm)
 	enum_start $d8
+first_music_cmd EQU __enum__ + -8
 
-	enum notetype_cmd ; $d8
 octave: MACRO
-	db notetype_cmd - (\1)
+	db first_music_cmd + 8 - (\1)
 ENDM
 
+	enum notetype_cmd ; $d8
 notetype: MACRO
 	db notetype_cmd
 	db \1 ; note_length
@@ -68,11 +69,11 @@ ENDM
 	enum sound_duty_cmd ; $de
 sound_duty: MACRO
 	db sound_duty_cmd
-	if _NARG == 4
+if _NARG == 4
 	db \1 | (\2 << 2) | (\3 << 4) | (\4 << 6) ; duty sequence
-	else
+else
 	db \1 ; LEGACY: Support for one-byte duty value
-	endc
+endc
 ENDM
 
 	enum togglesfx_cmd ; $df

macros/scripts/battle_anims.asm

@@ -17,6 +17,7 @@ if _NARG <= 4
 	db \3 ; y
 	db \4 ; param
 else
+; LEGACY: Support the tile+offset format
 	db \1 ; object
 	db (\2) * 8 + (\3) ; x_tile, x
 	db (\4) * 8 + (\5) ; y_tile, y
@@ -84,12 +85,12 @@ anim_incbgeffect: MACRO
 ENDM
 
 	enum anim_enemyfeetobj_command ; $d9
-anim_enemyfeetobj: MACRO
+anim_battlergfx_2row: MACRO
 	db anim_enemyfeetobj_command
 ENDM
 
 	enum anim_playerheadobj_command ; $da
-anim_playerheadobj: MACRO
+anim_battlergfx_1row: MACRO
 	db anim_playerheadobj_command
 ENDM