From 4e3ed078f9c8c486015d5c00e8d158671d3f740d Mon Sep 17 00:00:00 2001 From: mid-kid Date: Tue, 20 Nov 2018 21:53:45 +0100 Subject: Cosmetic fixes --- macros/scripts/audio.asm | 6 +++--- macros/scripts/battle_anims.asm | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'macros/scripts') diff --git a/macros/scripts/audio.asm b/macros/scripts/audio.asm index f6969d046..cb411fc8b 100644 --- a/macros/scripts/audio.asm +++ b/macros/scripts/audio.asm @@ -68,11 +68,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 diff --git a/macros/scripts/battle_anims.asm b/macros/scripts/battle_anims.asm index 76300e78f..ab04dfe51 100644 --- a/macros/scripts/battle_anims.asm +++ b/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 -- cgit v1.2.3 From 725cee7371f1b1862225e940e5c7271dc9444a1c Mon Sep 17 00:00:00 2001 From: mid-kid Date: Wed, 21 Nov 2018 12:12:22 +0100 Subject: Define first_music_cmd This replaces the uses of $d0 in the audio engine with proper constants. --- macros/scripts/audio.asm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'macros/scripts') diff --git a/macros/scripts/audio.asm b/macros/scripts/audio.asm index cb411fc8b..d4a3f7bb5 100644 --- a/macros/scripts/audio.asm +++ b/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 -- cgit v1.2.3 From c4979d9770bb9b7b01da9aef151dfb83224647a4 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Sun, 25 Nov 2018 23:57:38 +0100 Subject: Rename "feet and head follow" commands The lot of these were rather misnamed, since they're used to replace part of the player or enemy with objects for several background effects. https://github.com/pret/pokecrystal/pull/578#issuecomment-440996244 --- macros/scripts/battle_anims.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'macros/scripts') diff --git a/macros/scripts/battle_anims.asm b/macros/scripts/battle_anims.asm index ab04dfe51..01db12010 100644 --- a/macros/scripts/battle_anims.asm +++ b/macros/scripts/battle_anims.asm @@ -85,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 -- cgit v1.2.3