From 7beb497d3aba7cd1bb34f2b1394bde80c1cd9807 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Thu, 28 Dec 2017 13:23:44 +0100 Subject: Uppercase MACRO and EQU(S) according to the style guide --- macros/scripts/battle_anims.asm | 98 ++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 49 deletions(-) (limited to 'macros/scripts/battle_anims.asm') diff --git a/macros/scripts/battle_anims.asm b/macros/scripts/battle_anims.asm index 3c054d460..baa45503e 100644 --- a/macros/scripts/battle_anims.asm +++ b/macros/scripts/battle_anims.asm @@ -1,4 +1,4 @@ -anim_wait: macro +anim_wait: MACRO if \1 >= $d0 flip out endc @@ -9,7 +9,7 @@ endc enum_start $d0 enum anim_obj_command ; $d0 -anim_obj: macro +anim_obj: MACRO db anim_obj_command db \1 ; obj db (\2 << 3) + \3 ; x @@ -18,20 +18,20 @@ anim_obj: macro endm enum anim_1gfx_command ; $d1 -anim_1gfx: macro +anim_1gfx: MACRO db anim_1gfx_command db \1 ; gfx1 endm enum anim_2gfx_command ; $d2 -anim_2gfx: macro +anim_2gfx: MACRO db anim_2gfx_command db \1 ; gfx1 db \2 ; gfx2 endm enum anim_3gfx_command ; $d3 -anim_3gfx: macro +anim_3gfx: MACRO db anim_3gfx_command db \1 ; gfx1 db \2 ; gfx2 @@ -39,7 +39,7 @@ anim_3gfx: macro endm enum anim_4gfx_command ; $d4 -anim_4gfx: macro +anim_4gfx: MACRO db anim_4gfx_command db \1 ; gfx1 db \2 ; gfx2 @@ -48,7 +48,7 @@ anim_4gfx: macro endm enum anim_5gfx_command ; $d5 -anim_5gfx: macro +anim_5gfx: MACRO db anim_5gfx_command db \1 ; gfx1 db \2 ; gfx2 @@ -58,147 +58,147 @@ anim_5gfx: macro endm enum anim_incobj_command ; $d6 -anim_incobj: macro +anim_incobj: MACRO db anim_incobj_command db \1 ; id endm enum anim_setobj_command ; $d7 -anim_setobj: macro +anim_setobj: MACRO db anim_setobj_command db \1 ; id db \2 ; obj endm enum anim_incbgeffect_command ; $d8 -anim_incbgeffect: macro +anim_incbgeffect: MACRO db anim_incbgeffect_command db \1 ; effect endm enum anim_enemyfeetobj_command ; $d9 -anim_enemyfeetobj: macro +anim_enemyfeetobj: MACRO db anim_enemyfeetobj_command endm enum anim_playerheadobj_command ; $da -anim_playerheadobj: macro +anim_playerheadobj: MACRO db anim_playerheadobj_command endm enum anim_checkpokeball_command ; $db -anim_checkpokeball: macro +anim_checkpokeball: MACRO db anim_checkpokeball_command endm enum anim_transform_command ; $dc -anim_transform: macro +anim_transform: MACRO db anim_transform_command endm enum anim_raisesub_command ; $dd -anim_raisesub: macro +anim_raisesub: MACRO db anim_raisesub_command endm enum anim_dropsub_command ; $de -anim_dropsub: macro +anim_dropsub: MACRO db anim_dropsub_command endm enum anim_resetobp0_command ; $df -anim_resetobp0: macro +anim_resetobp0: MACRO db anim_resetobp0_command endm enum anim_sound_command ; $e0 -anim_sound: macro +anim_sound: MACRO db anim_sound_command db (\1 << 2) | \2 ; duration, tracks db \3 ; id endm enum anim_cry_command ; $e1 -anim_cry: macro +anim_cry: MACRO db anim_cry_command db \1 ; pitch endm enum anim_minimizeopp_command ; $e2 -anim_minimizeopp: macro +anim_minimizeopp: MACRO db anim_minimizeopp_command endm enum anim_oamon_command ; $e3 -anim_oamon: macro +anim_oamon: MACRO db anim_oamon_command endm enum anim_oamoff_command ; $e4 -anim_oamoff: macro +anim_oamoff: MACRO db anim_oamoff_command endm enum anim_clearobjs_command ; $e5 -anim_clearobjs: macro +anim_clearobjs: MACRO db anim_clearobjs_command endm enum anim_beatup_command ; $e6 -anim_beatup: macro +anim_beatup: MACRO db anim_beatup_command endm enum anim_0xe7_command ; $e7 -anim_0xe7: macro +anim_0xe7: MACRO db anim_0xe7_command endm enum anim_updateactorpic_command ; $e8 -anim_updateactorpic: macro +anim_updateactorpic: MACRO db anim_updateactorpic_command endm enum anim_minimize_command ; $e9 -anim_minimize: macro +anim_minimize: MACRO db anim_minimize_command endm enum anim_0xea_command ; $ea -anim_0xea: macro +anim_0xea: MACRO db anim_0xea_command endm enum anim_0xeb_command ; $eb -anim_0xeb: macro +anim_0xeb: MACRO db anim_0xeb_command endm enum anim_0xec_command ; $ec -anim_0xec: macro +anim_0xec: MACRO db anim_0xec_command endm enum anim_0xed_command ; $ed -anim_0xed: macro +anim_0xed: MACRO db anim_0xed_command endm enum anim_if_param_and_command ; $ee -anim_if_param_and: macro +anim_if_param_and: MACRO db anim_if_param_and_command db \1 ; value dw \2 ; address endm enum anim_jumpuntil_command ; $ef -anim_jumpuntil: macro +anim_jumpuntil: MACRO db anim_jumpuntil_command dw \1 ; address endm enum anim_bgeffect_command ; $f0 -anim_bgeffect: macro +anim_bgeffect: MACRO db anim_bgeffect_command db \1 ; effect db \2 ; unknown @@ -207,88 +207,88 @@ anim_bgeffect: macro endm enum anim_bgp_command ; $f1 -anim_bgp: macro +anim_bgp: MACRO db anim_bgp_command db \1 ; colors endm enum anim_obp0_command ; $f2 -anim_obp0: macro +anim_obp0: MACRO db anim_obp0_command db \1 ; colors endm enum anim_obp1_command ; $f3 -anim_obp1: macro +anim_obp1: MACRO db anim_obp1_command db \1 ; colors endm enum anim_clearsprites_command ; $f4 -anim_clearsprites: macro +anim_clearsprites: MACRO db anim_clearsprites_command endm enum anim_0xf5_command ; $f5 -anim_0xf5: macro +anim_0xf5: MACRO db anim_0xf5_command endm enum anim_0xf6_command ; $f6 -anim_0xf6: macro +anim_0xf6: MACRO db anim_0xf6_command endm enum anim_0xf7_command ; $f7 -anim_0xf7: macro +anim_0xf7: MACRO db anim_0xf7_command endm enum anim_if_param_equal_command ; $f8 -anim_if_param_equal: macro +anim_if_param_equal: MACRO db anim_if_param_equal_command db \1 ; value dw \2 ; address endm enum anim_setvar_command ; $f9 -anim_setvar: macro +anim_setvar: MACRO db anim_setvar_command db \1 ; value endm enum anim_incvar_command ; $fa -anim_incvar: macro +anim_incvar: MACRO db anim_incvar_command endm enum anim_if_var_equal_command ; $fb -anim_if_var_equal: macro +anim_if_var_equal: MACRO db anim_if_var_equal_command db \1 ; value dw \2 ; address endm enum anim_jump_command ; $fc -anim_jump: macro +anim_jump: MACRO db anim_jump_command dw \1 ; address endm enum anim_loop_command ; $fd -anim_loop: macro +anim_loop: MACRO db anim_loop_command db \1 ; count dw \2 ; address endm enum anim_call_command ; $fe -anim_call: macro +anim_call: MACRO db anim_call_command dw \1 ; address endm enum anim_ret_command ; $ff -anim_ret: macro +anim_ret: MACRO db anim_ret_command endm -- cgit v1.2.3 From 50fc9c3389ae8130d3670683f22f3e49555c57a3 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Thu, 28 Dec 2017 22:31:16 +0100 Subject: endm -> ENDM --- macros/scripts/battle_anims.asm | 98 ++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 49 deletions(-) (limited to 'macros/scripts/battle_anims.asm') diff --git a/macros/scripts/battle_anims.asm b/macros/scripts/battle_anims.asm index baa45503e..7b379e7d2 100644 --- a/macros/scripts/battle_anims.asm +++ b/macros/scripts/battle_anims.asm @@ -3,7 +3,7 @@ if \1 >= $d0 flip out endc db \1 - endm +ENDM ; BattleAnimCommands indexes (see engine/battle_anims/anim_commands.asm) enum_start $d0 @@ -15,20 +15,20 @@ anim_obj: MACRO db (\2 << 3) + \3 ; x db (\4 << 3) + \5 ; y db \6 ; param - endm +ENDM enum anim_1gfx_command ; $d1 anim_1gfx: MACRO db anim_1gfx_command db \1 ; gfx1 - endm +ENDM enum anim_2gfx_command ; $d2 anim_2gfx: MACRO db anim_2gfx_command db \1 ; gfx1 db \2 ; gfx2 - endm +ENDM enum anim_3gfx_command ; $d3 anim_3gfx: MACRO @@ -36,7 +36,7 @@ anim_3gfx: MACRO db \1 ; gfx1 db \2 ; gfx2 db \3 ; gfx3 - endm +ENDM enum anim_4gfx_command ; $d4 anim_4gfx: MACRO @@ -45,7 +45,7 @@ anim_4gfx: MACRO db \2 ; gfx2 db \3 ; gfx3 db \4 ; gfx4 - endm +ENDM enum anim_5gfx_command ; $d5 anim_5gfx: MACRO @@ -55,147 +55,147 @@ anim_5gfx: MACRO db \3 ; gfx3 db \4 ; gfx4 db \5 ; gfx5 - endm +ENDM enum anim_incobj_command ; $d6 anim_incobj: MACRO db anim_incobj_command db \1 ; id - endm +ENDM enum anim_setobj_command ; $d7 anim_setobj: MACRO db anim_setobj_command db \1 ; id db \2 ; obj - endm +ENDM enum anim_incbgeffect_command ; $d8 anim_incbgeffect: MACRO db anim_incbgeffect_command db \1 ; effect - endm +ENDM enum anim_enemyfeetobj_command ; $d9 anim_enemyfeetobj: MACRO db anim_enemyfeetobj_command - endm +ENDM enum anim_playerheadobj_command ; $da anim_playerheadobj: MACRO db anim_playerheadobj_command - endm +ENDM enum anim_checkpokeball_command ; $db anim_checkpokeball: MACRO db anim_checkpokeball_command - endm +ENDM enum anim_transform_command ; $dc anim_transform: MACRO db anim_transform_command - endm +ENDM enum anim_raisesub_command ; $dd anim_raisesub: MACRO db anim_raisesub_command - endm +ENDM enum anim_dropsub_command ; $de anim_dropsub: MACRO db anim_dropsub_command - endm +ENDM enum anim_resetobp0_command ; $df anim_resetobp0: MACRO db anim_resetobp0_command - endm +ENDM enum anim_sound_command ; $e0 anim_sound: MACRO db anim_sound_command db (\1 << 2) | \2 ; duration, tracks db \3 ; id - endm +ENDM enum anim_cry_command ; $e1 anim_cry: MACRO db anim_cry_command db \1 ; pitch - endm +ENDM enum anim_minimizeopp_command ; $e2 anim_minimizeopp: MACRO db anim_minimizeopp_command - endm +ENDM enum anim_oamon_command ; $e3 anim_oamon: MACRO db anim_oamon_command - endm +ENDM enum anim_oamoff_command ; $e4 anim_oamoff: MACRO db anim_oamoff_command - endm +ENDM enum anim_clearobjs_command ; $e5 anim_clearobjs: MACRO db anim_clearobjs_command - endm +ENDM enum anim_beatup_command ; $e6 anim_beatup: MACRO db anim_beatup_command - endm +ENDM enum anim_0xe7_command ; $e7 anim_0xe7: MACRO db anim_0xe7_command - endm +ENDM enum anim_updateactorpic_command ; $e8 anim_updateactorpic: MACRO db anim_updateactorpic_command - endm +ENDM enum anim_minimize_command ; $e9 anim_minimize: MACRO db anim_minimize_command - endm +ENDM enum anim_0xea_command ; $ea anim_0xea: MACRO db anim_0xea_command - endm +ENDM enum anim_0xeb_command ; $eb anim_0xeb: MACRO db anim_0xeb_command - endm +ENDM enum anim_0xec_command ; $ec anim_0xec: MACRO db anim_0xec_command - endm +ENDM enum anim_0xed_command ; $ed anim_0xed: MACRO db anim_0xed_command - endm +ENDM enum anim_if_param_and_command ; $ee anim_if_param_and: MACRO db anim_if_param_and_command db \1 ; value dw \2 ; address - endm +ENDM enum anim_jumpuntil_command ; $ef anim_jumpuntil: MACRO db anim_jumpuntil_command dw \1 ; address - endm +ENDM enum anim_bgeffect_command ; $f0 anim_bgeffect: MACRO @@ -204,91 +204,91 @@ anim_bgeffect: MACRO db \2 ; unknown db \3 ; unknown db \4 ; unknown - endm +ENDM enum anim_bgp_command ; $f1 anim_bgp: MACRO db anim_bgp_command db \1 ; colors - endm +ENDM enum anim_obp0_command ; $f2 anim_obp0: MACRO db anim_obp0_command db \1 ; colors - endm +ENDM enum anim_obp1_command ; $f3 anim_obp1: MACRO db anim_obp1_command db \1 ; colors - endm +ENDM enum anim_clearsprites_command ; $f4 anim_clearsprites: MACRO db anim_clearsprites_command - endm +ENDM enum anim_0xf5_command ; $f5 anim_0xf5: MACRO db anim_0xf5_command - endm +ENDM enum anim_0xf6_command ; $f6 anim_0xf6: MACRO db anim_0xf6_command - endm +ENDM enum anim_0xf7_command ; $f7 anim_0xf7: MACRO db anim_0xf7_command - endm +ENDM enum anim_if_param_equal_command ; $f8 anim_if_param_equal: MACRO db anim_if_param_equal_command db \1 ; value dw \2 ; address - endm +ENDM enum anim_setvar_command ; $f9 anim_setvar: MACRO db anim_setvar_command db \1 ; value - endm +ENDM enum anim_incvar_command ; $fa anim_incvar: MACRO db anim_incvar_command - endm +ENDM enum anim_if_var_equal_command ; $fb anim_if_var_equal: MACRO db anim_if_var_equal_command db \1 ; value dw \2 ; address - endm +ENDM enum anim_jump_command ; $fc anim_jump: MACRO db anim_jump_command dw \1 ; address - endm +ENDM enum anim_loop_command ; $fd anim_loop: MACRO db anim_loop_command db \1 ; count dw \2 ; address - endm +ENDM enum anim_call_command ; $fe anim_call: MACRO db anim_call_command dw \1 ; address - endm +ENDM enum anim_ret_command ; $ff anim_ret: MACRO db anim_ret_command - endm +ENDM -- cgit v1.2.3