ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-27 05:43:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Substitute typo

Browse Source
This commit is contained in:
Flametix 2021-05-06 20:49:04 -04:00
parent de3b32f76b
commit a8fab62c89
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/battle_scripts_1.s
View File

@ -1120,7 +1120,7 @@ BattleScript_SubstituteAnim::
healthbarupdate BS_ATTACKER healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER datahpupdate BS_ATTACKER
BattleScript_SubstituteString:: BattleScript_SubstituteString::
printfromtable gSubsituteUsedStringIds printfromtable gSubstituteUsedStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_AlreadyHasSubstitute:: BattleScript_AlreadyHasSubstitute::

2
include/constants/battle_string_ids.h
View File

@ -502,7 +502,7 @@
#define B_MSG_TRANSFORMED 0 #define B_MSG_TRANSFORMED 0
#define B_MSG_TRANSFORM_FAILED 1 #define B_MSG_TRANSFORM_FAILED 1
// gSubsituteUsedStringIds // gSubstituteUsedStringIds
#define B_MSG_SET_SUBSTITUTE 0 #define B_MSG_SET_SUBSTITUTE 0
#define B_MSG_SUBSTITUTE_FAILED 1 #define B_MSG_SUBSTITUTE_FAILED 1

6
src/battle_gfx_sfx_util.c
View File

@ -40,7 +40,7 @@ extern const struct SpriteTemplate gSpriteTemplate_EnemyShadow;
static u8 GetBattlePalaceMoveGroup(u16 move); static u8 GetBattlePalaceMoveGroup(u16 move);
static u16 GetBattlePalaceTarget(void); static u16 GetBattlePalaceTarget(void);
static void SpriteCB_TrainerSlideVertical(struct Sprite *sprite); static void SpriteCB_TrainerSlideVertical(struct Sprite *sprite);
static bool8 ShouldAnimBeDoneRegardlessOfSubsitute(u8 animId); static bool8 ShouldAnimBeDoneRegardlessOfSubstitute(u8 animId);
static void Task_ClearBitWhenBattleTableAnimDone(u8 taskId); static void Task_ClearBitWhenBattleTableAnimDone(u8 taskId);
static void Task_ClearBitWhenSpecialAnimDone(u8 taskId); static void Task_ClearBitWhenSpecialAnimDone(u8 taskId);
static void ClearSpritesBattlerHealthboxAnimData(void); static void ClearSpritesBattlerHealthboxAnimData(void);
@ -444,7 +444,7 @@ bool8 TryHandleLaunchBattleTableAnimation(u8 activeBattler, u8 atkBattler, u8 de
return TRUE; return TRUE;
} }
if (gBattleSpritesDataPtr->battlerData[activeBattler].behindSubstitute if (gBattleSpritesDataPtr->battlerData[activeBattler].behindSubstitute
&& !ShouldAnimBeDoneRegardlessOfSubsitute(tableId)) && !ShouldAnimBeDoneRegardlessOfSubstitute(tableId))
{ {
return TRUE; return TRUE;
} }
@ -480,7 +480,7 @@ static void Task_ClearBitWhenBattleTableAnimDone(u8 taskId)
#undef tBattlerId #undef tBattlerId
static bool8 ShouldAnimBeDoneRegardlessOfSubsitute(u8 animId) static bool8 ShouldAnimBeDoneRegardlessOfSubstitute(u8 animId)
{ {
switch (animId) switch (animId)
{ {

2
src/battle_message.c
View File

@ -1067,7 +1067,7 @@ const u16 gTransformUsedStringIds[] =
[B_MSG_TRANSFORM_FAILED] = STRINGID_BUTITFAILED [B_MSG_TRANSFORM_FAILED] = STRINGID_BUTITFAILED
}; };
const u16 gSubsituteUsedStringIds[] = const u16 gSubstituteUsedStringIds[] =
{ {
[B_MSG_SET_SUBSTITUTE] = STRINGID_PKMNMADESUBSTITUTE, [B_MSG_SET_SUBSTITUTE] = STRINGID_PKMNMADESUBSTITUTE,
[B_MSG_SUBSTITUTE_FAILED] = STRINGID_TOOWEAKFORSUBSTITUTE [B_MSG_SUBSTITUTE_FAILED] = STRINGID_TOOWEAKFORSUBSTITUTE