From 682ca7e93c635b21b7ac3db709ba6296c53fa080 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Thu, 29 Mar 2018 10:57:55 +0200 Subject: Label bidefailtext This "unknown" battle command is actually used to give the proper fail message to bide. --- macros/scripts/battle_commands.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'macros/scripts/battle_commands.asm') diff --git a/macros/scripts/battle_commands.asm b/macros/scripts/battle_commands.asm index 33d7dc611..7802d0329 100644 --- a/macros/scripts/battle_commands.asm +++ b/macros/scripts/battle_commands.asm @@ -169,7 +169,7 @@ 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 -- cgit v1.2.3 From 800f9489145dc7c82edb3fa86fc24a5ff7411533 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Tue, 3 Apr 2018 12:00:24 +0200 Subject: Label BattleCommand_BeatUpFailText --- macros/scripts/battle_commands.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'macros/scripts/battle_commands.asm') diff --git a/macros/scripts/battle_commands.asm b/macros/scripts/battle_commands.asm index 7802d0329..db446d9ff 100644 --- a/macros/scripts/battle_commands.asm +++ b/macros/scripts/battle_commands.asm @@ -172,7 +172,7 @@ ENDM command bidefailtext ; a5 command raisesubnoanim ; a6 command lowersubnoanim ; a7 - command effect0xa8 ; a8 + command beatupfailtext ; a8 command clearmissdamage ; a9 command movedelay ; aa command hittarget ; ab -- cgit v1.2.3 From d4025863cf56466b79827bace6d6b3e48ffd05e9 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Wed, 4 Apr 2018 23:27:40 +0200 Subject: Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly. --- macros/scripts/battle_commands.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'macros/scripts/battle_commands.asm') diff --git a/macros/scripts/battle_commands.asm b/macros/scripts/battle_commands.asm index db446d9ff..48e034bdf 100644 --- a/macros/scripts/battle_commands.asm +++ b/macros/scripts/battle_commands.asm @@ -15,10 +15,10 @@ 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 @@ -175,7 +175,7 @@ ENDM command beatupfailtext ; a8 command clearmissdamage ; a9 command movedelay ; aa - command hittarget ; ab + command moveanim ; ab command tristatuschance ; ac command supereffectivelooptext ; ad command startloop ; ae -- cgit v1.2.3