From 3c09e43a201b37478a217bd292e66334e2cfc949 Mon Sep 17 00:00:00 2001 From: AlexOn1ine Date: Wed, 12 Feb 2025 18:51:50 +0100 Subject: [PATCH] minor reviews --- include/battle.h | 2 +- include/battle_util.h | 2 +- src/battle_end_turn.c | 2 +- src/battle_util.c | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/battle.h b/include/battle.h index 7121b7d5bd..bf7db148a3 100644 --- a/include/battle.h +++ b/include/battle.h @@ -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; }; diff --git a/include/battle_util.h b/include/battle_util.h index 3daacfe44a..d701b4e94c 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -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); diff --git a/src/battle_end_turn.c b/src/battle_end_turn.c index 04bc121b00..ed958aa184 100644 --- a/src/battle_end_turn.c +++ b/src/battle_end_turn.c @@ -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) diff --git a/src/battle_util.c b/src/battle_util.c index 32a3e2069f..7deeb58afa 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -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;