From 6e1d4b44095f2b32af7c23a645a312639f659562 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 15 Oct 2023 08:32:25 -0300 Subject: [PATCH] Fixed compile on modern + tests --- data/battle_scripts_1.s | 3 +-- src/battle_dynamax.c | 24 ++++++++++-------------- test/dynamax.c | 5 ----- 3 files changed, 11 insertions(+), 21 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index dab321a2d8..5a0bb8ffb6 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -437,11 +437,10 @@ gBattleScriptsForMoveEffects:: .4byte BattleScript_EffectMortalSpin @ EFFECT_MORTAL_SPIN .4byte BattleScript_EffectHit @ EFFECT_GIGATON_HAMMER .4byte BattleScript_EffectSaltCure @ EFFECT_SALT_CURE - .4byte BattleScript_EffectMaxMove @ EFFECT_MAX_MOVE - .4byte BattleScript_EffectMatchaGotcha @ EFFECT_MATCHA_GOTCHA .4byte BattleScript_EffectSyrupBomb @ EFFECT_SYRUP_BOMB .4byte BattleScript_EffectHit @ EFFECT_IVY_CUDGEL + .4byte BattleScript_EffectMaxMove @ EFFECT_MAX_MOVE BattleScript_EffectSyrupBomb:: setmoveeffect MOVE_EFFECT_SYRUP_BOMB diff --git a/src/battle_dynamax.c b/src/battle_dynamax.c index 38cde59bfb..73d7bedc1d 100644 --- a/src/battle_dynamax.c +++ b/src/battle_dynamax.c @@ -98,7 +98,6 @@ static void SpriteCb_DynamaxIndicator(struct Sprite *); // Returns whether a battler is Dynamaxed. bool32 IsDynamaxed(u16 battlerId) { - u8 side = GetBattlerSide(battlerId); if (gBattleStruct->dynamax.dynamaxed[battlerId] /*|| IsRaidBoss(battlerId)*/) return TRUE; @@ -201,7 +200,6 @@ u16 GetNonDynamaxMaxHP(u16 battlerId) void PrepareBattlerForDynamax(u16 battlerId) { u8 side = GetBattlerSide(battlerId); - u16 newSpecies; gBattleStruct->dynamax.alreadyDynamaxed[side] = TRUE; gBattleStruct->dynamax.dynamaxed[battlerId] = TRUE; @@ -305,12 +303,11 @@ static u16 GetTypeBasedMaxMove(u16 battlerId, u16 type) return sGMaxMoveTable[i].gmaxMove; } } - else // Regular Max Move - { - if (sMaxMoveTable[type] == MOVE_NONE) // failsafe - return sMaxMoveTable[0]; - return sMaxMoveTable[type]; - } + + // Regular Max Move + if (sMaxMoveTable[type] == MOVE_NONE) // failsafe + return sMaxMoveTable[0]; + return sMaxMoveTable[type]; } // Returns the appropriate Max Move or G-Max Move for a battler to use. @@ -550,6 +547,8 @@ static u32 GetMaxMoveStatusEffect(u16 move) return STATUS2_ESCAPE_PREVENTION; case MAX_EFFECT_TORMENT_FOES: return STATUS2_TORMENT; + default: + return STATUS1_NONE; } } @@ -1300,12 +1299,12 @@ static const struct SpritePalette sSpritePalette_DynamaxIndicator = static const struct SpriteSheet sDynamaxIndicator_SpriteSheet[] = { - sDynamaxIndicatorGfx, sizeof(sDynamaxIndicatorGfx), TAG_DYNAMAX_INDICATOR_TILE + {sDynamaxIndicatorGfx, sizeof(sDynamaxIndicatorGfx), TAG_DYNAMAX_INDICATOR_TILE} }; static const struct SpritePalette sDynamaxIndicator_SpritePalette[] = { - sDynamaxIndicatorPal, TAG_MISC_INDICATOR_PAL + {sDynamaxIndicatorPal, TAG_MISC_INDICATOR_PAL} }; static const struct OamData sOamData_DynamaxIndicator = @@ -1371,7 +1370,6 @@ u8 DynamaxIndicator_GetSpriteId(u32 healthboxSpriteId) void DynamaxIndicator_SetVisibilities(u32 healthboxId, bool32 invisible) { - u32 i; u8 spriteId = DynamaxIndicator_GetSpriteId(healthboxId); u32 battlerId = gSprites[healthboxId].hMain_Battler; @@ -1383,14 +1381,12 @@ void DynamaxIndicator_SetVisibilities(u32 healthboxId, bool32 invisible) void DynamaxIndicator_UpdateOamPriority(u32 healthboxId, u32 oamPriority) { - u32 i; u8 spriteId = DynamaxIndicator_GetSpriteId(healthboxId); gSprites[spriteId].oam.priority = oamPriority; } void DynamaxIndicator_UpdateLevel(u32 healthboxId, u32 level) { - u32 i; s16 xDelta = 0; u8 spriteId = DynamaxIndicator_GetSpriteId(healthboxId); @@ -1404,7 +1400,7 @@ void DynamaxIndicator_UpdateLevel(u32 healthboxId, u32 level) void DynamaxIndicator_CreateSprite(u32 battlerId, u32 healthboxSpriteId) { - u32 position, level; + u32 position; u8 spriteId; s16 xHealthbox = 0, y = 0; s32 x = 0; diff --git a/test/dynamax.c b/test/dynamax.c index db7176a550..27a689153e 100644 --- a/test/dynamax.c +++ b/test/dynamax.c @@ -945,7 +945,6 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Volt Crash paralyzes both opponents") DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Stun Shock paralyzes or poisons both opponents") { u8 statusAnim; - u16 species; u32 rng; PARAMETRIZE { statusAnim = B_ANIM_STATUS_PRZ; rng = STATUS1_PARALYSIS; } PARAMETRIZE { statusAnim = B_ANIM_STATUS_PSN; rng = STATUS1_POISON; } @@ -1017,7 +1016,6 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Stun Shock chooses statuses before consideri DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Befuddle paralyzes, poisons, or sleeps both opponents") { u8 statusAnim; - u16 species; u32 rng; PARAMETRIZE { statusAnim = B_ANIM_STATUS_PRZ; rng = STATUS1_PARALYSIS; } PARAMETRIZE { statusAnim = B_ANIM_STATUS_PSN; rng = STATUS1_POISON; } @@ -1303,7 +1301,6 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Finale heals allies by 1/6 of their health") DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Sweetness cures allies' status conditions") { - s16 damage1, damage2; GIVEN { ASSUME(P_GEN_8_POKEMON == TRUE); ASSUME(gBattleMoves[MOVE_G_MAX_SWEETNESS].argument == MAX_EFFECT_AROMATHERAPY); @@ -1325,7 +1322,6 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Sweetness cures allies' status conditions") // This test applies to G-Max Sandblast, too. DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Centiferno traps both opponents in Fire Spin") { - s16 damage1, damage2; GIVEN { ASSUME(P_GEN_8_POKEMON == TRUE); ASSUME(gBattleMoves[MOVE_G_MAX_CENTIFERNO].argument == MAX_EFFECT_FIRE_SPIN_FOES); @@ -1354,7 +1350,6 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Centiferno traps both opponents in Fire Spin DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Chi Strike boosts allies' crit chance") { - s16 damage1, damage2; u32 j; GIVEN { ASSUME(B_CRIT_CHANCE >= GEN_6);