diff options
Diffstat (limited to 'macros')
| -rwxr-xr-x | macros/enum.asm | 10 | ||||
| -rw-r--r-- | macros/scripts/battle_commands.asm (renamed from macros/move_effect.asm) | 26 |
2 files changed, 14 insertions, 22 deletions
diff --git a/macros/enum.asm b/macros/enum.asm index 003445be..8fe5b534 100755 --- a/macros/enum.asm +++ b/macros/enum.asm @@ -9,7 +9,7 @@ endc if _NARG >= 2 __enumdir__ = \2 else -__enumdir__ = +1 +__enumdir__ = 1 endc ENDM @@ -41,11 +41,3 @@ shift_const: MACRO \1 EQU (1 << const_value) const_value = const_value + 1 ENDM - -; Enumerate strings - -define: MACRO -if !DEF(\1) -\1 EQUS \2 -endc -ENDM diff --git a/macros/move_effect.asm b/macros/scripts/battle_commands.asm index d3761c9a..919d6e00 100644 --- a/macros/move_effect.asm +++ b/macros/scripts/battle_commands.asm @@ -1,10 +1,10 @@ -command: macro +command: MACRO enum \1_command -\1 equs "db \1_command" -endm +\1 EQUS "db \1_command" +ENDM +; BattleCommandPointers indexes (see data/battle/effect_command_pointers.asm) enum_start 1 - command checkturn ; 01 command checkobedience ; 02 command usedmovetext ; 03 @@ -15,13 +15,13 @@ endm command damagevariation ; 08 command checkhit ; 09 command lowersub ; 0a - command hittargetnosub ; 0b + command moveanimnosub ; 0b command raisesub ; 0c command failuretext ; 0d - command checkfaint ; 0e + command applydamage ; 0e command criticaltext ; 0f command supereffectivetext ; 10 - command checkdestinybond ; 11 + command checkfaint ; 11 command buildopponentrage ; 12 command poisontarget ; 13 command sleeptarget ; 14 @@ -169,18 +169,18 @@ endm command ragedamage ; a2 command resettypematchup ; a3 command allstatsup ; a4 - command effect0xa5 ; a5 + command bidefailtext ; a5 command raisesubnoanim ; a6 command lowersubnoanim ; a7 - command effect0xa8 ; a8 + command beatupfailtext ; a8 command clearmissdamage ; a9 command movedelay ; aa - command hittarget ; ab + command moveanim ; ab command tristatuschance ; ac command supereffectivelooptext ; ad command startloop ; ae command curl ; af - enum_start -1, -1 - command endmove - command endturn + enum_start $fe + command endturn ; fe + command endmove ; ff |