diff options
| author | mid-kid <esteve.varela@gmail.com> | 2018-03-29 10:57:55 +0200 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2018-04-04 22:40:21 +0200 |
| commit | 682ca7e93c635b21b7ac3db709ba6296c53fa080 (patch) | |
| tree | 8c9810e88634778e3b1f9a9515cefbe0a39871ee | |
| parent | e1da37e03303b1a6dd6531d8a044339f337731a1 (diff) | |
Label bidefailtext
This "unknown" battle command is actually used to give the proper fail
message to bide.
| -rw-r--r-- | data/battle/effect_command_pointers.asm | 2 | ||||
| -rw-r--r-- | data/moves/effects.asm | 2 | ||||
| -rw-r--r-- | engine/battle/effect_commands.asm | 2 | ||||
| -rw-r--r-- | macros/scripts/battle_commands.asm | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/data/battle/effect_command_pointers.asm b/data/battle/effect_command_pointers.asm index b3eeea273..ae780dca6 100644 --- a/data/battle/effect_command_pointers.asm +++ b/data/battle/effect_command_pointers.asm @@ -168,7 +168,7 @@ BattleCommandPointers: ; 3fd28 dw BattleCommand_RageDamage ; 3527b dw BattleCommand_ResetTypeMatchup ; 34833 dw BattleCommand_AllStatsUp ; 36500 - dw BattleCommanda5 ; 35165 + dw BattleCommand_BideFailText ; 35165 dw BattleCommand_RaiseSubNoAnim ; 365af dw BattleCommand_LowerSubNoAnim ; 365c3 dw BattleCommanda8 ; 355b5 diff --git a/data/moves/effects.asm b/data/moves/effects.asm index c56ff2560..0a52319fb 100644 --- a/data/moves/effects.asm +++ b/data/moves/effects.asm @@ -797,7 +797,7 @@ Bide: resettypematchup checkhit hittarget - effect0xa5 + bidefailtext checkfaint checkdestinybond buildopponentrage diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 9e304df72..9433c33b4 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -2437,7 +2437,7 @@ FailText_CheckOpponentProtect: ; 35157 ; 35165 -BattleCommanda5: ; 35165 +BattleCommand_BideFailText: ; 35165 ld a, [wAttackMissed] and a ret z 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 |