Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor reviews

Browse Source
This commit is contained in:
AlexOn1ine 2025-02-12 18:51:50 +01:00
parent b4f17c7506
commit 3c09e43a20
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/battle.h
View File

@ -570,7 +570,7 @@ struct ZMoveData
struct DynamaxData
{
u8 dynamaxTurns[MAX_BATTLERS_COUNT];
u16 dynamaxTurns[MAX_BATTLERS_COUNT];
u16 baseMoves[MAX_BATTLERS_COUNT]; // base move of Max Move
u16 lastUsedBaseMove;
};

2
include/battle_util.h
View File

@ -173,7 +173,7 @@ enum SleepClauseBlock
void HandleAction_ThrowBall(void);
u32 GetCurrentBattleWeather(void);
u32 EndOrConinueWeather(void);
u32 EndOrContinueWeather(void);
bool32 IsAffectedByFollowMe(u32 battlerAtk, u32 defSide, u32 move);
void HandleAction_UseMove(void);
void HandleAction_Switch(void);

2
src/battle_end_turn.c
View File

@ -162,7 +162,7 @@ static void HandleEndTurnVarious(u32 battler, u32 *effect)
static void HandleEndTurnWeather(u32 battler, u32 *effect)
{
gBattleStruct->endTurnEventsCounter++;
*effect = EndOrConinueWeather();
*effect = EndOrContinueWeather();
}
static void HandleEndTurnWeatherDamage(u32 battler, u32 *effect)

8
src/battle_util.c
View File

@ -215,7 +215,7 @@ u32 GetCurrentBattleWeather(void)
return currBattleWeather;
}
u32 EndOrConinueWeather(void)
u32 EndOrContinueWeather(void)
{
u32 currBattleWeather = GetCurrentBattleWeather();
@ -4088,9 +4088,9 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32
}
break;
case ABILITY_ICE_BODY:
if (!IsBattlerAtMaxHp(battler)
&& !(gStatuses3[battler] & (STATUS3_UNDERGROUND | STATUS3_UNDERWATER))
&& !(gStatuses3[battler] & STATUS3_HEAL_BLOCK))
if (!IsBattlerAtMaxHp(battler)
&& !(gStatuses3[battler] & (STATUS3_UNDERGROUND | STATUS3_UNDERWATER))
&& !(gStatuses3[battler] & STATUS3_HEAL_BLOCK))
{
BattleScriptPushCursorAndCallback(BattleScript_IceBodyHeal);
gBattleStruct->moveDamage[battler] = GetNonDynamaxMaxHP(battler) / 16;