From 5840b1f0ede5d9c82cf545b5ff2c175d6b826dd3 Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Mon, 24 May 2021 09:52:45 -0600 Subject: [PATCH 01/26] utility umbrella effect --- asm/macros/battle_script.inc | 6 +++ data/battle_scripts_1.s | 8 ++- include/battle_util.h | 1 + include/constants/battle_script_commands.h | 1 + src/battle_main.c | 13 ++--- src/battle_script_commands.c | 34 ++++++++----- src/battle_util.c | 57 ++++++++++++++-------- 7 files changed, 76 insertions(+), 44 deletions(-) diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 9fa3fe0c3..649afc834 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -1768,6 +1768,12 @@ .macro tryactivategrimneigh, battler:req various \battler, VARIOUS_TRY_ACTIVATE_GRIM_NEIGH .endm + + .macro jumpifweatheraffected battler:req, weather:req, ptr:req + various \battler, VARIOUS_JUMP_IF_WEATHER_AFFECTED + .4byte \weather + .4byte \ptr + .endm @ helpful macros .macro setstatchanger stat:req, stages:req, down:req diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 77eddc8ab..f73c59590 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -1288,7 +1288,7 @@ BattleScript_GrowthDoMoveAnim:: waitanimation setbyte sSTAT_ANIM_PLAYED, FALSE playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_SPATK, 0 - jumpifhalfword CMP_COMMON_BITS, gBattleWeather, WEATHER_SUN_ANY, BattleScript_GrowthAtk2 + jumpifweatheraffected BS_ATTACKER, WEATHER_SUN_ANY, BattleScript_GrowthAtk2 setstatchanger STAT_ATK, 1, FALSE goto BattleScript_GrowthAtk BattleScript_GrowthAtk2: @@ -1299,7 +1299,7 @@ BattleScript_GrowthAtk: printfromtable gStatUpStringIds waitmessage B_WAIT_TIME_LONG BattleScript_GrowthTrySpAtk:: - jumpifhalfword CMP_COMMON_BITS, gBattleWeather, WEATHER_SUN_ANY, BattleScript_GrowthSpAtk2 + jumpifweatheraffected BS_ATTACKER, WEATHER_SUN_ANY, BattleScript_GrowthSpAtk2 setstatchanger STAT_SPATK, 1, FALSE goto BattleScript_GrowthSpAtk BattleScript_GrowthSpAtk2: @@ -4015,9 +4015,7 @@ BattleScript_EffectGust:: goto BattleScript_EffectHit BattleScript_EffectSolarbeam:: - jumpifabilitypresent ABILITY_CLOUD_NINE, BattleScript_SolarbeamDecideTurn - jumpifabilitypresent ABILITY_AIR_LOCK, BattleScript_SolarbeamDecideTurn - jumpifhalfword CMP_COMMON_BITS, gBattleWeather, WEATHER_SUN_TEMPORARY | WEATHER_SUN_PERMANENT, BattleScript_SolarbeamOnFirstTurn + jumpifweatheraffected BS_ATTACKER, WEATHER_SUN_ANY, BattleScript_SolarbeamOnFirstTurn BattleScript_SolarbeamDecideTurn:: jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn diff --git a/include/battle_util.h b/include/battle_util.h index f06a58938..98439e4e1 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -138,6 +138,7 @@ bool32 IsTelekinesisBannedSpecies(u16 species); bool32 IsHealBlockPreventingMove(u32 battler, u32 move); bool32 IsThawingMove(u8 battlerId, u16 move); bool32 HasEnoughHpToEatBerry(u32 battlerId, u32 hpFraction, u32 itemId); +bool32 IsBattlerWeatherAffected(u8 battlerId, u32 weatherFlags); // ability checks bool32 IsRolePlayBannedAbilityAtk(u16 ability); diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h index faaf8f17e..a738fd9e0 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -173,6 +173,7 @@ #define VARIOUS_DESTROY_ABILITY_POPUP 102 #define VARIOUS_TOTEM_BOOST 103 #define VARIOUS_TRY_ACTIVATE_GRIM_NEIGH 104 +#define VARIOUS_JUMP_IF_WEATHER_AFFECTED 105 // Cmd_manipulatedamage #define DMG_CHANGE_SIGN 0 diff --git a/src/battle_main.c b/src/battle_main.c index 814bcb66c..9825f1680 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -4229,9 +4229,9 @@ u32 GetBattlerTotalSpeedStat(u8 battlerId) // weather abilities if (WEATHER_HAS_EFFECT) { - if (ability == ABILITY_SWIFT_SWIM && gBattleWeather & WEATHER_RAIN_ANY) + if (ability == ABILITY_SWIFT_SWIM && holdEffect != HOLD_EFFECT_UTILITY_UMBRELLA && gBattleWeather & WEATHER_RAIN_ANY) speed *= 2; - else if (ability == ABILITY_CHLOROPHYLL && gBattleWeather & WEATHER_SUN_ANY) + else if (ability == ABILITY_CHLOROPHYLL && holdEffect != HOLD_EFFECT_UTILITY_UMBRELLA && gBattleWeather & WEATHER_SUN_ANY) speed *= 2; else if (ability == ABILITY_SAND_RUSH && gBattleWeather & WEATHER_SANDSTORM_ANY) speed *= 2; @@ -5002,6 +5002,7 @@ void RunBattleScriptCommands(void) void SetTypeBeforeUsingMove(u16 move, u8 battlerAtk) { u32 moveType, ateType, attackerAbility; + u16 holdEffect = GetBattlerHoldEffect(battlerAtk, TRUE); if (move == MOVE_STRUGGLE) return; @@ -5014,11 +5015,11 @@ void SetTypeBeforeUsingMove(u16 move, u8 battlerAtk) { if (WEATHER_HAS_EFFECT) { - if (gBattleWeather & WEATHER_RAIN_ANY) + if (gBattleWeather & WEATHER_RAIN_ANY && holdEffect != HOLD_EFFECT_UTILITY_UMBRELLA) gBattleStruct->dynamicMoveType = TYPE_WATER | 0x80; else if (gBattleWeather & WEATHER_SANDSTORM_ANY) gBattleStruct->dynamicMoveType = TYPE_ROCK | 0x80; - else if (gBattleWeather & WEATHER_SUN_ANY) + else if (gBattleWeather & WEATHER_SUN_ANY && holdEffect != HOLD_EFFECT_UTILITY_UMBRELLA) gBattleStruct->dynamicMoveType = TYPE_FIRE | 0x80; else if (gBattleWeather & WEATHER_HAIL_ANY) gBattleStruct->dynamicMoveType = TYPE_ICE | 0x80; @@ -5042,7 +5043,7 @@ void SetTypeBeforeUsingMove(u16 move, u8 battlerAtk) } else if (gBattleMoves[move].effect == EFFECT_CHANGE_TYPE_ON_ITEM) { - if (GetBattlerHoldEffect(battlerAtk, TRUE) == gBattleMoves[move].argument) + if (holdEffect == gBattleMoves[move].argument) gBattleStruct->dynamicMoveType = ItemId_GetSecondaryId(gBattleMons[battlerAtk].item) | 0x80; } else if (gBattleMoves[move].effect == EFFECT_REVELATION_DANCE) @@ -5098,7 +5099,7 @@ void SetTypeBeforeUsingMove(u16 move, u8 battlerAtk) // Check if a gem should activate. GET_MOVE_TYPE(move, moveType); - if (GetBattlerHoldEffect(battlerAtk, TRUE) == HOLD_EFFECT_GEMS + if (holdEffect == HOLD_EFFECT_GEMS && moveType == ItemId_GetSecondaryId(gBattleMons[battlerAtk].item)) { gSpecialStatuses[battlerAtk].gemParam = GetBattlerHoldEffectParam(battlerAtk); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 2c6bc25bf..ae8f22075 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -1474,13 +1474,13 @@ static bool32 AccuracyCalcHelper(u16 move) return TRUE; } - if ((WEATHER_HAS_EFFECT && - (((gBattleWeather & WEATHER_RAIN_ANY) && (gBattleMoves[move].effect == EFFECT_THUNDER || gBattleMoves[move].effect == EFFECT_HURRICANE)) - || (((gBattleWeather & WEATHER_HAIL_ANY) && move == MOVE_BLIZZARD)))) - || (gBattleMoves[move].effect == EFFECT_VITAL_THROW) - || (gBattleMoves[move].accuracy == 0) - || ((B_MINIMIZE_DMG_ACC >= GEN_6) && (gStatuses3[gBattlerTarget] & STATUS3_MINIMIZED) && (gBattleMoves[move].flags & FLAG_DMG_MINIMIZE))) + if (gBattleMoves[move].effect == EFFECT_VITAL_THROW + || gBattleMoves[move].accuracy == 0 + || ((B_MINIMIZE_DMG_ACC >= GEN_6) && (gStatuses3[gBattlerTarget] & STATUS3_MINIMIZED) && (gBattleMoves[move].flags & FLAG_DMG_MINIMIZE)) + || (IsBattlerWeatherAffected(gBattlerTarget, WEATHER_RAIN_ANY) && (gBattleMoves[move].effect == EFFECT_THUNDER || gBattleMoves[move].effect == EFFECT_HURRICANE)) + || (gBattleWeather & WEATHER_HAIL_ANY && move == MOVE_BLIZZARD)) { + // thunder/hurricane ignore acc checks in rain unless target is holding utility umbrella JumpIfMoveFailed(7, move); return TRUE; } @@ -1523,8 +1523,8 @@ u32 GetTotalAccuracy(u32 battlerAtk, u32 battlerDef, u32 move) moveAcc = gBattleMoves[move].accuracy; // Check Thunder and Hurricane on sunny weather. - if (WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_SUN_ANY - && (gBattleMoves[move].effect == EFFECT_THUNDER || gBattleMoves[move].effect == EFFECT_HURRICANE)) + if (IsBattlerWeatherAffected(battlerDef, WEATHER_SUN_ANY) + && (gBattleMoves[move].effect == EFFECT_THUNDER || gBattleMoves[move].effect == EFFECT_HURRICANE)) moveAcc = 50; // Check Wonder Skin. if (defAbility == ABILITY_WONDER_SKIN && gBattleMoves[move].power == 0) @@ -2552,7 +2552,7 @@ void SetMoveEffect(bool32 primary, u32 certain) statusChanged = TRUE; break; case STATUS1_FREEZE: - if (WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_SUN_ANY) + if (IsBattlerWeatherAffected(gEffectBattler, WEATHER_SUN_ANY)) noSunCanFreeze = FALSE; if (IS_BATTLER_OF_TYPE(gEffectBattler, TYPE_ICE)) break; @@ -7056,7 +7056,7 @@ u32 IsFlowerVeilProtected(u32 battler) u32 IsLeafGuardProtected(u32 battler) { - if (WEATHER_HAS_EFFECT && (gBattleWeather & WEATHER_SUN_ANY)) + if (IsBattlerWeatherAffected(battler, WEATHER_SUN_ANY)) return GetBattlerAbility(battler) == ABILITY_LEAF_GUARD; else return 0; @@ -8349,6 +8349,15 @@ static void Cmd_various(void) gBattlescriptCurrInstr += 7; // exit if loop failed (failsafe) } return; + case VARIOUS_JUMP_IF_WEATHER_AFFECTED: + { + u32 weatherFlags = T1_READ_32(gBattlescriptCurrInstr + 3); + if (IsBattlerWeatherAffected(gActiveBattler, weatherFlags)) + gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 7); + else + gBattlescriptCurrInstr += 11; + } + return; } gBattlescriptCurrInstr += 3; @@ -10154,11 +10163,12 @@ static bool8 IsTwoTurnsMove(u16 move) return FALSE; } +// unused static u8 AttacksThisTurn(u8 battlerId, u16 move) // Note: returns 1 if it's a charging turn, otherwise 2 { // first argument is unused if (gBattleMoves[move].effect == EFFECT_SOLARBEAM - && (gBattleWeather & WEATHER_SUN_ANY)) + && IsBattlerWeatherAffected(battlerId, WEATHER_SUN_ANY)) return 2; if (gBattleMoves[move].effect == EFFECT_SKULL_BASH @@ -10816,7 +10826,7 @@ static void Cmd_recoverbasedonsunlight(void) { if (!(gBattleWeather & WEATHER_ANY) || !WEATHER_HAS_EFFECT) gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 2; - else if (gBattleWeather & WEATHER_SUN_ANY) + else if (IsBattlerWeatherAffected(gBattlerAttacker, WEATHER_SUN_ANY)) gBattleMoveDamage = 20 * gBattleMons[gBattlerAttacker].maxHP / 30; else // not sunny weather gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 4; diff --git a/src/battle_util.c b/src/battle_util.c index 4c3f795de..b8c6a4168 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -3608,7 +3608,8 @@ u8 TryWeatherFormChange(u8 battler) { u8 ret = 0; bool32 weatherEffect = WEATHER_HAS_EFFECT; - + u16 holdEffect = GetBattlerHoldEffect(battler, TRUE); + if (gBattleMons[battler].species == SPECIES_CASTFORM) { if (gBattleMons[battler].ability != ABILITY_FORECAST || gBattleMons[battler].hp == 0) @@ -3624,17 +3625,17 @@ u8 TryWeatherFormChange(u8 battler) { ret = 0; } - else if (!(gBattleWeather & (WEATHER_RAIN_ANY | WEATHER_SUN_ANY | WEATHER_HAIL_ANY)) && !IS_BATTLER_OF_TYPE(battler, TYPE_NORMAL)) + else if (holdEffect == HOLD_EFFECT_UTILITY_UMBRELLA || (!(gBattleWeather & (WEATHER_RAIN_ANY | WEATHER_SUN_ANY | WEATHER_HAIL_ANY)) && !IS_BATTLER_OF_TYPE(battler, TYPE_NORMAL))) { SET_BATTLER_TYPE(battler, TYPE_NORMAL); ret = 1; } - else if (gBattleWeather & WEATHER_SUN_ANY && !IS_BATTLER_OF_TYPE(battler, TYPE_FIRE)) + else if (gBattleWeather & WEATHER_SUN_ANY && holdEffect != HOLD_EFFECT_UTILITY_UMBRELLA && !IS_BATTLER_OF_TYPE(battler, TYPE_FIRE)) { SET_BATTLER_TYPE(battler, TYPE_FIRE); ret = 2; } - else if (gBattleWeather & WEATHER_RAIN_ANY && !IS_BATTLER_OF_TYPE(battler, TYPE_WATER)) + else if (gBattleWeather & WEATHER_RAIN_ANY && holdEffect != HOLD_EFFECT_UTILITY_UMBRELLA && !IS_BATTLER_OF_TYPE(battler, TYPE_WATER)) { SET_BATTLER_TYPE(battler, TYPE_WATER); ret = 3; @@ -3649,9 +3650,9 @@ u8 TryWeatherFormChange(u8 battler) { if (gBattleMons[battler].ability != ABILITY_FLOWER_GIFT || gBattleMons[battler].hp == 0) ret = 0; - else if (gBattleMonForms[battler] == 0 && weatherEffect && gBattleWeather & WEATHER_SUN_ANY) + else if (gBattleMonForms[battler] == 0 && weatherEffect && holdEffect != HOLD_EFFECT_UTILITY_UMBRELLA && gBattleWeather & WEATHER_SUN_ANY) ret = 2; - else if (gBattleMonForms[battler] != 0 && (!weatherEffect || !(gBattleWeather & WEATHER_SUN_ANY))) + else if (gBattleMonForms[battler] != 0 && (!weatherEffect || holdEffect != HOLD_EFFECT_UTILITY_UMBRELLA || !(gBattleWeather & WEATHER_SUN_ANY))) ret = 1; } @@ -4258,7 +4259,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move switch (gLastUsedAbility) { case ABILITY_HARVEST: - if (((WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_SUN_ANY) || Random() % 2 == 0) + if ((IsBattlerWeatherAffected(battler, WEATHER_SUN_ANY) || Random() % 2 == 0) && gBattleMons[battler].item == ITEM_NONE && gBattleStruct->changedItems[battler] == ITEM_NONE && ItemId_GetPocket(gBattleStruct->usedHeldItems[battler]) == POCKET_BERRIES) @@ -4270,12 +4271,11 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move } break; case ABILITY_DRY_SKIN: - if (gBattleWeather & WEATHER_SUN_ANY) + if (IsBattlerWeatherAffected(battler, WEATHER_SUN_ANY)) goto SOLAR_POWER_HP_DROP; // Dry Skin works similarly to Rain Dish in Rain case ABILITY_RAIN_DISH: - if (WEATHER_HAS_EFFECT - && (gBattleWeather & WEATHER_RAIN_ANY) + if (IsBattlerWeatherAffected(battler, WEATHER_RAIN_ANY) && !BATTLER_MAX_HP(battler) && !(gStatuses3[battler] & STATUS3_HEAL_BLOCK)) { @@ -4288,8 +4288,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move } break; case ABILITY_HYDRATION: - if (WEATHER_HAS_EFFECT - && (gBattleWeather & WEATHER_RAIN_ANY) + if (IsBattlerWeatherAffected(battler, WEATHER_RAIN_ANY) && gBattleMons[battler].status1 & STATUS1_ANY) { goto ABILITY_HEAL_MON_STATUS; @@ -4384,7 +4383,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move break; SOLAR_POWER_HP_DROP: case ABILITY_SOLAR_POWER: - if (WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_SUN_ANY) + if (IsBattlerWeatherAffected(battler, WEATHER_SUN_ANY)) { BattleScriptPushCursorAndCallback(BattleScript_SolarPowerActivates); gBattleMoveDamage = gBattleMons[battler].maxHP / 8; @@ -7467,7 +7466,7 @@ static u32 CalcMoveBasePowerAfterModifiers(u16 move, u8 battlerAtk, u8 battlerDe // todo break; case EFFECT_SOLARBEAM: - if (WEATHER_HAS_EFFECT && gBattleWeather & (WEATHER_HAIL_ANY | WEATHER_SANDSTORM_ANY | WEATHER_RAIN_ANY)) + if (IsBattlerWeatherAffected(battlerAtk, (WEATHER_HAIL_ANY | WEATHER_SANDSTORM_ANY | WEATHER_RAIN_ANY))) MulModifier(&modifier, UQ_4_12(0.5)); break; case EFFECT_STOMPING_TANTRUM: @@ -7564,7 +7563,7 @@ static u32 CalcAttackStat(u16 move, u8 battlerAtk, u8 battlerDef, u8 moveType, b MulModifier(&modifier, UQ_4_12(0.5)); break; case ABILITY_SOLAR_POWER: - if (IS_MOVE_SPECIAL(move) && WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_SUN_ANY) + if (IS_MOVE_SPECIAL(move) && IsBattlerWeatherAffected(battlerAtk, WEATHER_SUN_ANY)) MulModifier(&modifier, UQ_4_12(1.5)); break; case ABILITY_DEFEATIST: @@ -7601,7 +7600,7 @@ static u32 CalcAttackStat(u16 move, u8 battlerAtk, u8 battlerDef, u8 moveType, b } break; case ABILITY_FLOWER_GIFT: - if (gBattleMons[battlerAtk].species == SPECIES_CHERRIM && WEATHER_HAS_EFFECT && (gBattleWeather & WEATHER_SUN_ANY) && IS_MOVE_PHYSICAL(move)) + if (gBattleMons[battlerAtk].species == SPECIES_CHERRIM && IsBattlerWeatherAffected(battlerAtk, WEATHER_SUN_ANY) && IS_MOVE_PHYSICAL(move)) MulModifier(&modifier, UQ_4_12(1.5)); break; case ABILITY_HUSTLE: @@ -7641,7 +7640,7 @@ static u32 CalcAttackStat(u16 move, u8 battlerAtk, u8 battlerDef, u8 moveType, b switch (GetBattlerAbility(BATTLE_PARTNER(battlerAtk))) { case ABILITY_FLOWER_GIFT: - if (gBattleMons[BATTLE_PARTNER(battlerAtk)].species == SPECIES_CHERRIM && IS_MOVE_PHYSICAL(move)) + if (gBattleMons[BATTLE_PARTNER(battlerAtk)].species == SPECIES_CHERRIM && IsBattlerWeatherAffected(BATTLE_PARTNER(battlerAtk), WEATHER_SUN_ANY) && IS_MOVE_PHYSICAL(move)) MulModifier(&modifier, UQ_4_12(1.5)); break; } @@ -7771,7 +7770,7 @@ static u32 CalcDefenseStat(u16 move, u8 battlerAtk, u8 battlerDef, u8 moveType, } break; case ABILITY_FLOWER_GIFT: - if (gBattleMons[battlerDef].species == SPECIES_CHERRIM && WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_SUN_ANY && !usesDefStat) + if (gBattleMons[battlerDef].species == SPECIES_CHERRIM && IsBattlerWeatherAffected(battlerDef, WEATHER_SUN_ANY) && !usesDefStat) MulModifier(&modifier, UQ_4_12(1.5)); break; case ABILITY_PUNK_ROCK: @@ -7786,7 +7785,7 @@ static u32 CalcDefenseStat(u16 move, u8 battlerAtk, u8 battlerDef, u8 moveType, switch (GetBattlerAbility(BATTLE_PARTNER(battlerDef))) { case ABILITY_FLOWER_GIFT: - if (gBattleMons[BATTLE_PARTNER(battlerDef)].species == SPECIES_CHERRIM && !usesDefStat) + if (gBattleMons[BATTLE_PARTNER(battlerDef)].species == SPECIES_CHERRIM && IsBattlerWeatherAffected(BATTLE_PARTNER(battlerDef), WEATHER_SUN_ANY) && !usesDefStat) MulModifier(&modifier, UQ_4_12(1.5)); break; } @@ -7852,14 +7851,14 @@ static u32 CalcFinalDmg(u32 dmg, u16 move, u8 battlerAtk, u8 battlerDef, u8 move dmg = ApplyModifier(UQ_4_12(0.5), dmg); // check sunny/rain weather - if (WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_RAIN_ANY) + if (IsBattlerWeatherAffected(battlerAtk, WEATHER_RAIN_ANY)) { if (moveType == TYPE_FIRE) dmg = ApplyModifier(UQ_4_12(0.5), dmg); else if (moveType == TYPE_WATER) dmg = ApplyModifier(UQ_4_12(1.5), dmg); } - else if (WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_SUN_ANY) + else if (IsBattlerWeatherAffected(battlerAtk, WEATHER_SUN_ANY)) { if (moveType == TYPE_FIRE) dmg = ApplyModifier(UQ_4_12(1.5), dmg); @@ -8657,3 +8656,19 @@ bool32 IsEntrainmentTargetOrSimpleBeamBannedAbility(u16 ability) return FALSE; } +bool32 IsBattlerWeatherAffected(u8 battlerId, u32 weatherFlags) +{ + if (!WEATHER_HAS_EFFECT) + return FALSE; + + if (gBattleWeather & weatherFlags) + { + // given weather is active -> check if its sun, rain against utility umbrella ( since only 1 weather can be active at once) + if (gBattleWeather & (WEATHER_SUN_ANY | WEATHER_RAIN_ANY) && GetBattlerHoldEffect(battlerId, TRUE) == HOLD_EFFECT_UTILITY_UMBRELLA) + return FALSE; // utility umbrella blocks sun, rain effects + + return TRUE; + } + return FALSE; +} + From bbd09fdcf7ad721542fd3d4b7eca93de0f9a8b14 Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Tue, 12 Oct 2021 10:32:51 -0400 Subject: [PATCH 02/26] add wandering spirit --- asm/macros/battle_script.inc | 8 +++++ data/battle_scripts_1.s | 26 +++++++++++++++++ include/battle_interface.h | 1 + include/battle_scripts.h | 1 + include/constants/battle_script_commands.h | 1 + include/constants/battle_string_ids.h | 3 +- src/battle_interface.c | 14 +++++++-- src/battle_message.c | 2 ++ src/battle_script_commands.c | 3 ++ src/battle_util.c | 34 ++++++++++++++++++++++ 10 files changed, 90 insertions(+), 3 deletions(-) diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 4d8fe0365..651c59624 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -1580,6 +1580,10 @@ .macro showabilitypopup battler:req various \battler, VARIOUS_ABILITY_POPUP .endm + + .macro updateabilitypopup battler:req + various \battler, VARIOUS_UPDATE_ABILITY_POPUP + .endm .macro defogclear battler:req, clear:req, ptr:req various \battler, VARIOUS_DEFOG @@ -1825,6 +1829,10 @@ various BS_ATTACKER, VARIOUS_TRY_TO_CLEAR_PRIMAL_WEATHER .endm + .macro swapabilities + various BS_ATTACKER, VARIOUS_SWAP_ABILITIES + .endm + @ helpful macros .macro setstatchanger stat:req, stages:req, down:req setbyte sSTATCHANGER \stat | \stages << 3 | \down << 7 diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index e1fb47930..f52493c49 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -7676,6 +7676,32 @@ BattleScript_MummyActivates:: waitmessage B_WAIT_TIME_LONG return +BattleScript_WanderingSpiritActivates:: +.if B_ABILITY_POP_UP == TRUE + setbyte sFIXED_ABILITY_POPUP, TRUE + sethword sABILITY_OVERWRITE, ABILITY_WANDERING_SPIRIT + showabilitypopup BS_TARGET + pause 60 + sethword sABILITY_OVERWRITE, 0 + updateabilitypopup BS_TARGET + pause 20 + destroyabilitypopup + pause 40 + + setbyte sFIXED_ABILITY_POPUP, TRUE + copyhword sABILITY_OVERWRITE, gLastUsedAbility + showabilitypopup BS_ATTACKER + pause 60 + sethword sABILITY_OVERWRITE, 0 + updateabilitypopup BS_ATTACKER + pause 20 + destroyabilitypopup + pause 40 +.endif + printstring STRINGID_SWAPPEDABILITIES + waitmessage B_WAIT_TIME_LONG + return + BattleScript_TargetsStatWasMaxedOut:: call BattleScript_AbilityPopUp statbuffchange STAT_BUFF_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL diff --git a/include/battle_interface.h b/include/battle_interface.h index c852b776a..69bac05f3 100644 --- a/include/battle_interface.h +++ b/include/battle_interface.h @@ -97,5 +97,6 @@ bool32 CanThrowLastUsedBall(void); void TryHideLastUsedBall(void); void TryRestoreLastUsedBall(void); void TryAddLastUsedBallItemSprites(void); +void UpdateAbilityPopup(u8 battlerId); #endif // GUARD_BATTLE_INTERFACE_H diff --git a/include/battle_scripts.h b/include/battle_scripts.h index cd4600543..d7e8dd3b8 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -398,5 +398,6 @@ extern const u8 BattleScript_MysteriousAirCurrentBlowsOn[]; extern const u8 BattleScript_AttackWeakenedByStrongWinds[]; extern const u8 BattleScript_BlockedByPrimalWeatherEnd3[]; extern const u8 BattleScript_BlockedByPrimalWeatherRet[]; +extern const u8 BattleScript_WanderingSpiritActivates[]; #endif // GUARD_BATTLE_SCRIPTS_H diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h index d61eabbf8..5f5c1d0a2 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -185,6 +185,7 @@ #define VARIOUS_REMOVE_TERRAIN 113 #define VARIOUS_JUMP_IF_PRANKSTER_BLOCKED 114 #define VARIOUS_TRY_TO_CLEAR_PRIMAL_WEATHER 115 +#define VARIOUS_UPDATE_ABILITY_POPUP 116 // Cmd_manipulatedamage #define DMG_CHANGE_SIGN 0 diff --git a/include/constants/battle_string_ids.h b/include/constants/battle_string_ids.h index e8fe7e359..bc8023035 100644 --- a/include/constants/battle_string_ids.h +++ b/include/constants/battle_string_ids.h @@ -592,8 +592,9 @@ #define STRINGID_STRONGWINDSDISSIPATED 588 #define STRINGID_MYSTERIOUSAIRCURRENTBLOWSON 589 #define STRINGID_ATTACKWEAKENEDBSTRONGWINDS 590 +#define STRINGID_SWAPPEDABILITIES 591 -#define BATTLESTRINGS_COUNT 591 +#define BATTLESTRINGS_COUNT 592 // The below IDs are all indexes into battle message tables, // used to determine which of a set of messages to print. diff --git a/src/battle_interface.c b/src/battle_interface.c index 0e33455ac..35db3293e 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -3065,8 +3065,8 @@ void CreateAbilityPopUp(u8 battlerId, u32 ability, bool32 isDoubleBattle) gSprites[spriteId2].tRightToLeft = FALSE; } - gBattleStruct->abilityPopUpSpriteIds[gBattleAnimAttacker][0] = spriteId1; - gBattleStruct->abilityPopUpSpriteIds[gBattleAnimAttacker][1] = spriteId2; + gBattleStruct->abilityPopUpSpriteIds[battlerId][0] = spriteId1; + gBattleStruct->abilityPopUpSpriteIds[battlerId][1] = spriteId2; taskId = CreateTask(Task_FreeAbilityPopUpGfx, 5); gTasks[taskId].tSpriteId1 = spriteId1; @@ -3084,6 +3084,16 @@ void CreateAbilityPopUp(u8 battlerId, u32 ability, bool32 isDoubleBattle) RestoreOverwrittenPixels((void*)(OBJ_VRAM0) + (gSprites[spriteId1].oam.tileNum * 32)); } +void UpdateAbilityPopup(u8 battlerId) +{ + u8 spriteId1 = gBattleStruct->abilityPopUpSpriteIds[battlerId][0]; + u8 spriteId2 = gBattleStruct->abilityPopUpSpriteIds[battlerId][1]; + u16 ability = (gBattleScripting.abilityPopupOverwrite != 0) ? gBattleScripting.abilityPopupOverwrite : gBattleMons[battlerId].ability; + + PrintAbilityOnAbilityPopUp(ability, spriteId1, spriteId2); + RestoreOverwrittenPixels((void*)(OBJ_VRAM0) + (gSprites[spriteId1].oam.tileNum * 32)); +} + #define FRAMES_TO_WAIT 48 static void SpriteCb_AbilityPopUp(struct Sprite *sprite) diff --git a/src/battle_message.c b/src/battle_message.c index 69463ce69..15ae916c1 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -718,9 +718,11 @@ static const u8 sText_MysteriousAirCurrent[] = _("A mysterious air current is\np static const u8 sText_StrongWindsDissipated[] = _("The mysterious strong winds\nhave dissipated!{PAUSE 64}"); static const u8 sText_MysteriousAirCurrentBlowsOn[] = _("The mysterious air current\nblows on regardless!"); static const u8 sText_AttackWeakenedByStrongWinds[] = _("The mysterious strong winds\nweakened the attack!"); +static const u8 sText_SwappedAbilities[] = _("{B_DEF_NAME_WITH_PREFIX} swapped Abilities\nwith its target!"); const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] = { + [STRINGID_SWAPPEDABILITIES - 12] = sText_SwappedAbilities, [STRINGID_ATTACKWEAKENEDBSTRONGWINDS - 12] = sText_AttackWeakenedByStrongWinds, [STRINGID_MYSTERIOUSAIRCURRENTBLOWSON - 12] = sText_MysteriousAirCurrentBlowsOn, [STRINGID_STRONGWINDSDISSIPATED - 12] = sText_StrongWindsDissipated, diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 2c017b2df..4d767efc0 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -8317,6 +8317,9 @@ static void Cmd_various(void) case VARIOUS_ABILITY_POPUP: CreateAbilityPopUp(gActiveBattler, gBattleMons[gActiveBattler].ability, (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) != 0); break; + case VARIOUS_UPDATE_ABILITY_POPUP: + UpdateAbilityPopup(gActiveBattler); + break; case VARIOUS_DEFOG: if (T1_READ_8(gBattlescriptCurrInstr + 3)) // Clear { diff --git a/src/battle_util.c b/src/battle_util.c index 68e787698..bd655a5a1 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -4803,6 +4803,40 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move } } break; + case ABILITY_WANDERING_SPIRIT: + if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) + && IsBattlerAlive(gBattlerAttacker) + && TARGET_TURN_DAMAGED + && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)) + { + switch (gBattleMons[gBattlerAttacker].ability) + { + case ABILITY_DISGUISE: + case ABILITY_FLOWER_GIFT: + case ABILITY_GULP_MISSILE: + case ABILITY_ICE_FACE: + case ABILITY_ILLUSION: + case ABILITY_IMPOSTER: + case ABILITY_RECEIVER: + case ABILITY_RKS_SYSTEM: + case ABILITY_SCHOOLING: + case ABILITY_STANCE_CHANGE: + case ABILITY_WONDER_GUARD: + case ABILITY_ZEN_MODE: + break; + default: + gLastUsedAbility = gBattleMons[gBattlerAttacker].ability; + + gBattleMons[gBattlerAttacker].ability = gBattleMons[gBattlerTarget].ability; + gBattleMons[gBattlerTarget].ability = gLastUsedAbility; + + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_WanderingSpiritActivates; + effect++; + break; + } + } + break; case ABILITY_ANGER_POINT: if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && gIsCriticalHit From 25a4da71fe003a1f068f5d87c4cc12d59097420e Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Tue, 12 Oct 2021 10:37:59 -0400 Subject: [PATCH 03/26] remove unused macro --- asm/macros/battle_script.inc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 651c59624..2c629d51b 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -1828,11 +1828,7 @@ .macro trytoclearprimalweather various BS_ATTACKER, VARIOUS_TRY_TO_CLEAR_PRIMAL_WEATHER .endm - - .macro swapabilities - various BS_ATTACKER, VARIOUS_SWAP_ABILITIES - .endm - + @ helpful macros .macro setstatchanger stat:req, stages:req, down:req setbyte sSTATCHANGER \stat | \stages << 3 | \down << 7 From c0f3b7c3b4ef754ed190e8af169876f6512f4e65 Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Tue, 12 Oct 2021 11:58:37 -0400 Subject: [PATCH 04/26] record abilities from wandering spirit --- src/battle_util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/battle_util.c b/src/battle_util.c index bd655a5a1..9e3c5ff8b 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -4826,10 +4826,10 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move break; default: gLastUsedAbility = gBattleMons[gBattlerAttacker].ability; - gBattleMons[gBattlerAttacker].ability = gBattleMons[gBattlerTarget].ability; gBattleMons[gBattlerTarget].ability = gLastUsedAbility; - + RecordAbilityBattle(gBattlerAttacker, gBattleMons[gBattlerAttacker].ability); + RecordAbilityBattle(gBattlerTarget, gBattleMons[gBattlerTarget].ability); BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_WanderingSpiritActivates; effect++; From 47bfeaeecd5bed4342227e257d8b52c510d011b6 Mon Sep 17 00:00:00 2001 From: BuffelSaft Date: Sat, 30 Oct 2021 18:31:44 +1300 Subject: [PATCH 05/26] Implement Gorilla Tactics It's Choice Band but as an ability. --- data/battle_scripts_1.s | 4 ++++ include/battle_scripts.h | 1 + include/constants/battle_string_ids.h | 3 ++- src/battle_message.c | 2 ++ src/battle_script_commands.c | 2 +- src/battle_util.c | 21 +++++++++++++++++++++ 6 files changed, 31 insertions(+), 2 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index dd6af61e5..072563e39 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -8502,6 +8502,10 @@ BattleScript_SelectingNotAllowedMoveChoiceItem:: printselectionstring STRINGID_ITEMALLOWSONLYYMOVE endselectionscript +BattleScript_SelectingNotAllowedMoveGorillaTactics:: + printselectionstring STRINGID_ABILITYALLOWSONLYMOVE + endselectionscript + BattleScript_SelectingNotAllowedMoveAssaultVest:: printselectionstring STRINGID_ASSAULTVESTDOESNTALLOW endselectionscript diff --git a/include/battle_scripts.h b/include/battle_scripts.h index ec95a4549..0bc09156e 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -402,5 +402,6 @@ extern const u8 BattleScript_BlockedByPrimalWeatherEnd3[]; extern const u8 BattleScript_BlockedByPrimalWeatherRet[]; extern const u8 BattleScript_PrimalReversion[]; extern const u8 BattleScript_HyperspaceFuryRemoveProtect[]; +extern const u8 BattleScript_SelectingNotAllowedMoveGorillaTactics[]; #endif // GUARD_BATTLE_SCRIPTS_H diff --git a/include/constants/battle_string_ids.h b/include/constants/battle_string_ids.h index 1d461e2a0..638306971 100644 --- a/include/constants/battle_string_ids.h +++ b/include/constants/battle_string_ids.h @@ -597,8 +597,9 @@ #define STRINGID_BUTPOKEMONCANTUSETHEMOVE 594 #define STRINGID_BUTHOOPACANTUSEIT 595 #define STRINGID_BROKETHROUGHPROTECTION 596 +#define STRINGID_ABILITYALLOWSONLYMOVE 597 -#define BATTLESTRINGS_COUNT 597 +#define BATTLESTRINGS_COUNT 598 // The below IDs are all indexes into battle message tables, // used to determine which of a set of messages to print. diff --git a/src/battle_message.c b/src/battle_message.c index f26726a69..94a30ea5d 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -723,9 +723,11 @@ static const u8 sText_PkmnRevertedToPrimal[] = _("{B_ATK_NAME_WITH_PREFIX}'s Pri static const u8 sText_ButPokemonCantUseTheMove[] = _("But {B_ATK_NAME_WITH_PREFIX} can't\nuse the move!"); static const u8 sText_ButHoopaCantUseIt[] = _("But Hoopa can't use it\nthe way it is now!"); static const u8 sText_BrokeThroughProtection[] = _("It broke through the\n{B_DEF_NAME_WITH_PREFIX}'s protection!"); +static const u8 sText_AbilityAllowsOnlyMove[] = _("{B_ATK_ABILITY} allows the\nuse of only {B_CURRENT_MOVE}!\p"); const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] = { + [STRINGID_ABILITYALLOWSONLYMOVE - 12] = sText_AbilityAllowsOnlyMove, [STRINGID_BROKETHROUGHPROTECTION - 12] = sText_BrokeThroughProtection, [STRINGID_BUTPOKEMONCANTUSETHEMOVE - 12] = sText_ButPokemonCantUseTheMove, [STRINGID_BUTHOOPACANTUSEIT - 12] = sText_ButHoopaCantUseIt, diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index c5c922d8e..b2dcb3958 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -4942,7 +4942,7 @@ static void Cmd_moveend(void) break; case MOVEEND_CHOICE_MOVE: // update choice band move if (gHitMarker & HITMARKER_OBEYS - && HOLD_EFFECT_CHOICE(holdEffectAtk) + && (HOLD_EFFECT_CHOICE(holdEffectAtk) || GetBattlerAbility(gBattlerAttacker)) && gChosenMove != MOVE_STRUGGLE && (*choicedMoveAtk == 0 || *choicedMoveAtk == 0xFFFF)) { diff --git a/src/battle_util.c b/src/battle_util.c index fe957e464..c7f6af960 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -1776,6 +1776,21 @@ u8 TrySetCantSelectMoveBattleScript(void) limitations++; } } + if ((GetBattlerAbility(gActiveBattler) == ABILITY_GORILLA_TACTICS) && *choicedMove != 0 + && *choicedMove != 0xFFFF && *choicedMove != move) + { + gCurrentMove = *choicedMove; + gLastUsedItem = gBattleMons[gActiveBattler].item; + if (gBattleTypeFlags & BATTLE_TYPE_PALACE) + { + gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1; + } + else + { + gSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingNotAllowedMoveGorillaTactics; + limitations++; + } + } if (gBattleMons[gActiveBattler].pp[moveId] == 0) { @@ -1831,6 +1846,8 @@ u8 CheckMoveLimitations(u8 battlerId, u8 unusableMoves, u8 check) unusableMoves |= gBitTable[i]; else if (gBattleMons[battlerId].moves[i] == MOVE_STUFF_CHEEKS && ItemId_GetPocket(gBattleMons[gActiveBattler].item) != POCKET_BERRIES) unusableMoves |= gBitTable[i]; + else if (GetBattlerAbility(battlerId) == ABILITY_GORILLA_TACTICS && *choicedMove != 0 && *choicedMove != 0xFFFF && *choicedMove != gBattleMons[battlerId].moves[i]) + unusableMoves |= gBitTable[i]; } return unusableMoves; } @@ -7837,6 +7854,10 @@ static u32 CalcMoveBasePowerAfterModifiers(u16 move, u8 battlerAtk, u8 battlerDe if (moveType == TYPE_DRAGON) MulModifier(&modifier, UQ_4_12(1.5)); break; + case ABILITY_GORILLA_TACTICS: + if (IS_MOVE_PHYSICAL(move)) + MulModifier(&modifier, UQ_4_12(1.5)); + break; } // field abilities From da30f023e8aac23fc19529300d4151df20b92aa6 Mon Sep 17 00:00:00 2001 From: BuffelSaft Date: Sat, 30 Oct 2021 19:32:37 +1300 Subject: [PATCH 06/26] Revert "Ex fix move bg tilemaps" --- .../battle_anims/backgrounds/dark_void.bin | Bin 2048 -> 1236 bytes .../backgrounds/new/aeroblast_map.bin | Bin 896 -> 804 bytes .../backgrounds/new/blackhole_eclipse.bin | Bin 896 -> 892 bytes .../backgrounds/new/bloom_doom.bin | Bin 896 -> 564 bytes .../backgrounds/new/bolt_strike.bin | Bin 896 -> 780 bytes .../backgrounds/new/clangorous_soulblaze.bin | Bin 2048 -> 700 bytes .../backgrounds/new/dark_void.bin | Bin 2048 -> 1236 bytes .../backgrounds/new/electric_terrain.bin | Bin 4096 -> 2020 bytes .../battle_anims/backgrounds/new/fire1.bin | Bin 896 -> 684 bytes .../backgrounds/new/focus_blast.bin | Bin 896 -> 952 bytes .../backgrounds/new/giga_impact_opponent.bin | Bin 896 -> 704 bytes .../backgrounds/new/giga_impact_player.bin | Bin 896 -> 744 bytes .../backgrounds/new/grassy_terrain.bin | Bin 4096 -> 2244 bytes .../backgrounds/new/high_speed.bin | Bin 896 -> 496 bytes .../backgrounds/new/hydro_cannon.bin | Bin 4096 -> 880 bytes .../backgrounds/new/hydro_pump.bin | Bin 896 -> 224 bytes .../backgrounds/new/inferno_overdrive.bin | Bin 896 -> 556 bytes .../backgrounds/new/leaf_storm.bin | Bin 896 -> 924 bytes .../backgrounds/new/malicious_moonsault.bin | Bin 896 -> 544 bytes .../backgrounds/new/max_lightning.bin | Bin 896 -> 744 bytes .../backgrounds/new/misty_terrain.bin | Bin 4096 -> 2180 bytes .../backgrounds/new/neverending_nightmare.bin | Bin 896 -> 744 bytes .../backgrounds/new/nightmare.bin | Bin 896 -> 756 bytes .../backgrounds/new/psychic_terrain.bin | Bin 4096 -> 1904 bytes .../backgrounds/new/rock_wrecker.bin | Bin 896 -> 676 bytes .../backgrounds/new/shattered_psyche.bin | Bin 896 -> 808 bytes .../battle_anims/backgrounds/new/sky_day.bin | Bin 896 -> 1052 bytes .../backgrounds/new/snuggle_forever.bin | Bin 896 -> 988 bytes .../new/soulstealing_7star_strike.bin | Bin 896 -> 968 bytes .../backgrounds/new/spacial_rend_opponent.bin | Bin 896 -> 1000 bytes .../backgrounds/new/spacial_rend_player.bin | Bin 896 -> 996 bytes .../backgrounds/new/trick_room.bin | Bin 896 -> 844 bytes .../backgrounds/new/twinkle_tackle.bin | Bin 896 -> 784 bytes .../backgrounds/new/water_pulse.bin | Bin 896 -> 600 bytes .../backgrounds/new/waterfall.bin | Bin 2048 -> 2128 bytes .../backgrounds/new/zmove_activate.bin | Bin 896 -> 520 bytes .../backgrounds/new/zmove_mountain.bin | Bin 896 -> 760 bytes .../backgrounds/spacial_rend_opponent.bin | Bin 896 -> 1000 bytes .../backgrounds/spacial_rend_player.bin | Bin 896 -> 996 bytes 39 files changed, 0 insertions(+), 0 deletions(-) diff --git a/graphics/battle_anims/backgrounds/dark_void.bin b/graphics/battle_anims/backgrounds/dark_void.bin index 97b879f01ba8ebc08c92d30497c894a1a7b186c8..922b72bc74d7f5c773331b1af537d54c2e939038 100644 GIT binary patch literal 1236 zcmb`DQ*a�EG8%o2G73rS7+FiquMtziyh^wr$(CZQHhOoNf1v=K6Sd&o{d-JM+!# z?1m|k6d)b};-dtFkdRQ6h{PlzDQS|CToEahDJ2RcoK&PHK^oGMP6Z+eOHT$xXCxEK zOct_|4S~r{4irgFa*-S5A&R`@L-{E{K?P#29(hYT|2R-S9deeu#^h5m_z(59}!3<$2!_aU>Fp^PdG-DXcI5eIKOk@(8%oL_F z4NYeTGns{EGl#j%L-Sd{LKdOLEMY0j2rOp>D_IrD@cQJ{tYIy|b%B@w>)C)dvWd-X zq3YH^t8Hv2Vh7sEE_SmA?PVYPIe-pwh{GH~M>)oEPN0*V;xuQ_St#dB$^Ipf`Avw|E=9!@Io4`{)BcMs-jiR)m_6itr*vGtZO@1M=^C>&-EQ_Kx{)da$^UZs9jSxb8`ng_)6>wZ>$5AZ+_vIcvIhkBSb+#@{FqpZ;$ zKhm)_x!GK_9XX`-qSFn04GIeA1^Ja@uEn zwo>kMfr@G!b>0_z(YoZzzT&IaHDC7)-?VP|w(t0^bdrjO3&sC8Q3JlqG_4l&1m}sYGR}P?c&_rv^2t zMQ!R(mwMEv0S#$HW17&EW;CY-Eont-+7L-w+R>g4bfgoV=|We!(VZUjq!+#ELtpyQ zp8*VH5Q7=QP=+y_5sYLMqZz|k#xb4=Ok@(1nZi`2F`XIAWEQiT!(8Sup9L&r5sO*E zQkJot6|7_xQNhoISj`&NvMx{|*0X_)Y+^H8*c#N^*#64j!A^Fun?3AhANx7LK@M@4 zBOK)z$2q}CPH~zuoaG$nxxhs(ahWSz$y!A)*)n>*a)9`|{`Lmu&%Cp_gD&w0V? zyuq8i#oN5YyS&Hye87i%#K(NXr+miee8HD|#n*hpw|vL<{J@X=#LxV~ul&aE{K236 z#ozqHYle(rOk)|_IL0-e@l9Yt6Pef~CN-JKO<_t?nc6g_HJ$0rU`8{U*(_!iHJjND zGlx0NWp2aGV_x%_-vSo2kcBN`QHxpJ5|%VXDN9=>V2HATddZh3!g7|kLQq$^Beaj3%_?g&RZ%F&K-tm7Q-1SdMl$xd;q z)12-MXFAK-&T+2uobLh`y2!;YajDB(?h04B$|zU6#JKX6m zce}^E?sLBfJm?`0d&Hw2^SCEG=_yZp#3~?@CWcYb6c+pE<_KH`%=5=p)(_7y5 ij(5H1eINMHM?Ut6PkrWdUj%c}`H#+jbpHRZ`TrM_mOTvs diff --git a/graphics/battle_anims/backgrounds/new/aeroblast_map.bin b/graphics/battle_anims/backgrounds/new/aeroblast_map.bin index 369abe63ab8c68f368ae87be668cc5f0a81e363c..a7275a0747da421e5290f61115deb0f4fbc84aa9 100644 GIT binary patch literal 804 zcmWN~iJy#h9KiAK@7aeP*73})#X3LVF_>jt>prIES(cnxM9CdRheWw;GppQG?xW=B zK(0uoShF2+)RwC|Ay;yio3`Z-c)#9GG)^3YB_<9VDMC@=@gc=1P68#6l9Zw}4xV3< z6G@^Bl1y33Q65PlC9MJ#@l~QSj$4JQ7N7*gttJGiP7P`bAyTPD?WpvKCyhGP73xu+ z2BZrOX+&e1_-INq+~&0K(UMk@9p(YS#Uq2(LK`w^OS{Q3|3TW*A!<4bo#;##9)hk! zvgk&4=pnfe)01BCh~z&?ZypQKM-KL-pM?9v0ErA_5RXTt(_n`11W$$-N^F=EJjK&d zDR_ow8P0RU2%cvoqe8r3{4dJH(PVmQSvg}EOJ>N7V>}a>IMDS^BHM&tA|kHXM9Ec3Uq=8^qnnri_TanGe`v3bx{W z$TlnCBR)nxVLPAFE|~dQUTgxxznI>|d_pU9ZSDzNs;+`h1PtX!tQl*rZR!99RiJGKkG+FbU=1#b*mecYoDOy1*Y9-C6 z?73C6s@idur;-uSY8q6jt~Io#hE!6ume$rZb?RtcG4-^*N&`*ThT2G_u{P1BdJk%x B*LVN` literal 896 zcmZA0bx;;z5XW(85R?)SB)%&zB_V=hHwJchcXxMpcXxMpcPn;xcX#c30}kWtA2+x2 z`|PvN%$)_6T2@$NgDrO0<3MU0aUu-nn#)T*@>76<6rwQk z6rregi&30}6jg$fl%h0cC~Np~l&1m}HCc(uRH3TgrW)0$K~3$|qPE&P)YbFrQJ)6- z){sUtrU^|A-%Rt(X`$Jcw4ya_XiGcV(}9lK>!kV4#787=(1otVhjyboJ?Qz*_oBCE z`_NatHT~$%00uIM!3;^Uxp~G=hB2HGjARs}4L^pljAOj|2~0HnBqpn$!c?X){Xd_; z3}!Nm+00?C;pZ`*1uRs*h{Y^1pC7uEWxD@zR?xweym|6-rS?{-U(FiB=VUGGSg(Eq z8`-3OGh5ioHnvmLwBx_?cd|?Gw3|KbWuM{qb3n~O^>!TMFh@AbF^+SBlbqr-XHrZ! z%Q+G`&jl`WiOYt!zTLQ|TN zh>~bd3tFO9v?dvlX+sKaQ9Ig`N*a+4bfi;Nn2s{&Ocydy7G3E^chrNP^rAP)rVlyv zC7Me=<%YzFwO zlu|}e&PA+ay$%K!a|s*Rs2$2-6PI!sx|}PxlB>|wRB#Q~qU*Sx8@Q3!O$u-37H&ni zv6(I0jw-o>JGqPK-Q1%S_p%k;$2PWeKZy_UpmL+ZLp&@VVF!=$80=KIi^q9FJjqi$ z%`;**dw7=T(x?iu_A1=U^Wp_w)td7JuEAI4vM7lHFS?=OYXSu7~ z&E4I@J>_2R?QHi+agMV4I#*#rp^`KDIdsfPdG1e`86T!a3nBwN(1TPo*c#%Y&i62@ zz{5SlBb_+PqqQNSqR?aHu^#6lkFP2VGxH~Sq9<9CJ;hU9Y)$iY&+trZmS=m8=Q=iz X^7&ri5^JFsd9jx`vee7GoPB2iycXQs literal 896 zcmZ9~Wl$DC6op~26$AwZ1(o+$fP#sFqJpAg2cdupDi#*l-QC^Y-QC^Y-QC@}ANoU` zJ9BqtXP$e{?5q`uNkUSRk(?ByBo(Q##)dT5Vn2%L{pFYG$4kCG@>z0Xi6;2 zXif{Wvn8#FBc9f@p)KubPX{{E$!zXS7rN4o?)0E1z35FJ`qIzj>(2lNGRSB@1~Y`A z3}ZMW7|AF`GlsE@V>}a>$Ry(@Gli*4V>&aK$t-3whq=sSzR?R<$RZZAgrzKFxzUzd z!Ae%Knl-Fto$>40z(zK)nJsK(8{65zPIei;+xUg-VK4jG&jAi5_(L4#2uC@_aZYfO zQ=H}uXF11tE^yJfOI+rPIjwW%XhmwK4`Bm`1vpzPF!G*T#N8b^JuDR7M!XyW=^Q>gMZ(*6~8ep3;k z8O>=STGEQvv=MD-M|(PmAnA0Zljuwry3$Q_Cxae@y!51({`4m75Feored!lRe+Dp6 zW>Ap9O0rERLr@k&$z~Y#a7IK-4kOVhMl*)7SmVfLyh0PuL?$trDQGHDrZFAOU?#Je zjpi_ydCW%(SjZw4V=W<%rID;VgaqUJGr!c(5{9KE1|m%PHfrjj?j)i0;SyyHC|`1m{G i&kN^eeyT{1g+G(~#mV{VhE?{B@0D&wr054fozlNxSdwS} literal 896 zcmc)FRdbX<5QX6i1Wj=Fhp@Q2ySux)ySux)ySqzpcmG9vfn|47l>+Xl_oC1A^yxDb zC+@$IPWm*nyx{-0}n}uY3Xd6$mJ(kirr|MHCG( zizyy>e^DZ$es}&{Dfy3%BuSyPca;)SS{Y@PQ(grXRZ>|MRaH}64K>wLTOD=PQ(prO zHPSdpZKCPV+DvmTwA4y#Z35bA7o1XPuY-;{>8y*cx`pYkhn{-rt&hI?=^soEFwh`_ z4KdU(!;LV~D5H%r);Qx$FwrEFO)=Fp)5Du)m}!>T=9p`q`4(7ck;Rr+YMJF$SZS5j z)>vzu^)}dOlg+l+YMbqL*lCyD_SkEm{SG+jki(8R>X_qBIO&wr&N%Cw^DemPlFP2R z>YD2TH{5i~ZFk&tPjZC&9(d@H$DVlVnde@3>6O>PA7gprt#{ssdr^N>eMmJQ>rK%g ZeTupN9LbORlYQ|uW+wH9Z@$Oe{Q$aEw|oEq diff --git a/graphics/battle_anims/backgrounds/new/bolt_strike.bin b/graphics/battle_anims/backgrounds/new/bolt_strike.bin index 32f51b6fe04f6622fa11ef209a5411354fc50e17..7a42421cfe5d80048db9e21a752d08d0c2f72e86 100644 GIT binary patch literal 780 zcmV~$31AHb0LS6~+rc*1vpMGe{p~Q<%rV38Hc^erR7y!rOj6m3BDH$uTIisaZqMCC zhsY5&Dp#qfbW@bGoaxm1zF;_73J^s!F({TA)I=zbcoL|EYEy^0)I&k)lSmS3KtmeQ znB-)dD6KTmlxCtiEoezA0j4!6B9%1KX(KXdOFP<&4s;}wP9lrWbfIfF66!`a-N_L> z=t(bfMQ{4hmypOKpMG2<`ZIuwxkOw_0RtHXmqp6Nx z%;QNa#8W)Ye4Y`{@*L0eLbx*YA}_Ikh*-!X7PF*0uzV@Ys^XXPvUr78d5zb@m1QNY zU?p#eH+hSmGV9x9LP;f(uZtg zJ39#OWLKp6BR)pE`GimTjQl-CEB5j^Uo0A=FWJXed`-+Ze9Lzu%f3fHu%83`h<@TA zhxi%&!eNeZl;AOrN2*WoEBcL-oZ>V(!&%PpJ37xF{K;SFZ~oz5E};LYMh;j}j&_V= zEm6ZY9cRTm!L?l5s^hw@=b%;JiB56@tDzgYv6HPPZt7-kZnbbrw=!07s<2yIDNc2o z)2%kna9g*t+Pi~0I@9XpEO&MntE;;?+ua?=aS!)&FO?|Qz1_!st&oeU$UyoZ00k*T zVTw?cVic!@nKn?8Qk13)WhqB_Do~M1RHh15sYZ2b5JgRDQJXr{r5^RobTkcO?+s}b z+Z)q_rZl5DEr>F<oy7p2^K;LEI*P z{vw8jEMhTBSZbkLvW(@dU?r|!^2OlmLt z{#bMv|RM2bU1Q4fRqh>Zr=abS1SkVaZ*B@q%vW5S8Rj1<*` zrZhvE6GaPJVztr%-Q75VJ`EK`7B@|i?A(b2}?ySL&?*X1irB4ednk6XSA2PtNX|ZC zKL}z#tGphr#Q_S7iXzH$9a`{LAb~zE^|e=$~CTYL%7K;%DFAv z;VxzI_k{aA;31EM$2_5er@}Ly^Ma6rN?xjhSG*S9P{mu`3Gey9M?MMFeC7*ZYk!vh g`9mGGb^6!-OZfF~#d6k|>RUM9`JrR93K=550f)Za#Q*>R literal 2048 zcmeIy({mnS7(nr4lk3d6*^52r-RGHk zH=Xn{$S9M{vdAi%>>^S~4mstLTb_Wt^2x7&f(j|DNSH!V#S{-Hp=3bFO-w1JQAXJ? zg$U(DD*sPE)T*GON-Bpfgl4RwYLc@Pz9ULC)zwh*zl{VZ=~FGW)loOqeyCPYeGS4E z8fv7mCYr|4EYUp8wa`+lFn()owAD^~9dy)5XI*p+=%#x>4?Xn?3cZsR`sk~l{stIm zkimwC79Ba%u)t5sa3hQ~%IMg_7-Nky-UJg(GT9VU1E$3?-3&9$GTR(;%`-o~w7^1( z0)Me3mRe?ctQ9iG-rsCXFvC{cY!B>Zb_Cu|yX>~dUi<8K zz`=k+4vTTbQO6v2!pYdeDW?PbjI+);?}Cdix$KIouDR}pn{J7Ty6uj;?z!)QhaP$C ziKm`P#29(hYT|2R-S9deeu#^h5m_z(59}!3<$2!_aU>Fp^PdG-DXcI5eIKOk@(8%oL_F z4NYeTGns{EGl#j%L-Sd{LKdOLEMY0j2rOp>D_IrD@cQJ{tYIy|b%B@w>)C)dvWd-X zq3YH^t8Hv2Vh7sEE_SmA?PVYPIe-pwh{GH~M>)oEPN0*V;xuQ_St#dB$^Ipf`Avw|E=9!@Io4`{)BcMs-jiR)m_6itr*vGtZO@1M=^C>&-EQ_Kx{)da$^UZs9jSxb8`ng_)6>wZ>$5AZ+_vIcvIhkBSb+#@{FqpZ;$ zKhm)_x!GK_9XX`-qSFn04GIeA1^Ja@uEn zwo>kMfr@G!b>0_z(YoZzzT&IaHDC7)-?VP|w(t0^bdrjO3&sC8Q3JlqG_4l&1m}sYGR}P?c&_rv^2t zMQ!R(mwMEv0S#$HW17&EW;CY-Eont-+7L-w+R>g4bfgoV=|We!(VZUjq!+#ELtpyQ zp8*VH5Q7=QP=+y_5sYLMqZz|k#xb4=Ok@(1nZi`2F`XIAWEQiT!(8Sup9L&r5sO*E zQkJot6|7_xQNhoISj`&NvMx{|*0X_)Y+^H8*c#N^*#64j!A^Fun?3AhANx7LK@M@4 zBOK)z$2q}CPH~zuoaG$nxxhs(ahWSz$y!A)*)n>*a)9`|{`Lmu&%Cp_gD&w0V? zyuq8i#oN5YyS&Hye87i%#K(NXr+miee8HD|#n*hpw|vL<{J@X=#LxV~ul&aE{K236 z#ozqHYle(rOk)|_IL0-e@l9Yt6Pef~CN-JKO<_t?nc6g_HJ$0rU`8{U*(_!iHJjND zGlx0NWp2aGV_x%_-vSo2kcBN`QHxpJ5|%VXDN9=>V2HATddZh3!g7|kLQq$^Beaj3%_?g&RZ%F&K-tm7Q-1SdMl$xd;q z)12-MXFAK-&T+2uobLh`y2!;YajDB(?h04B$|zU6#JKX6m zce}^E?sLBfJm?`0d&Hw2^SCEG=_yZp#3~?@CWcYb6c+pE<_KH`%=5=p)(_7y5 ij(5H1eINMHM?Ut6PkrWdUj%c}`H#+jbpHRZ`TrM_mOTvs diff --git a/graphics/battle_anims/backgrounds/new/electric_terrain.bin b/graphics/battle_anims/backgrounds/new/electric_terrain.bin index 4404121c7c4c104963cd8f966eb82b914bd73fb0..2c3c757cd2cda17154c139ea993ef4d50c768846 100644 GIT binary patch literal 2020 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 literal 896 zcmZ9IRdbY45JW2k3vP=AIl#r;-5r8EK|^o|?iw6|TX1&`zPLkhcL?tK6KJNksIAo2 zOn0B2`#o#`2?&h$OGu)4Br!?ik$-QJ65xVJW=(RxJ_RXB<(E^FhP0&fBk9d&Ajo;h zXg(8}eSH?P5==I~>+IyfL(cyMa+%L9>LHJLM_yl_k6?W@|NrYi3fNsi3i()JikK^E zycoqPK}kv(D@_@rW&PflGg6)kK30)RRHh15jaQ>OHRNjg+FC|yTdHHbu1GyieM=3j zZ%88=%Y|r~&{Vq_&8=@iOQlxkTib4<+*Z@hQhPZM9q6bX;zH>}XS&c;shj%lgwca= zdfII-+r8EG(e$;{Pp&@$7$^;O5!!M#&xwfxXCSUbBDW1Uhe7kzVw0gA&-nb<_S-E w#&cfql2>YCT^z4@W9?hs@tzOny?o>opXI;sm2W=gC#|B*`=?DyT#{$qXthwF*^HHL6pCnkbW6)CQua z4s{i)M_LxyN-_17Py=#kNF&skCNw1%HKRE#$Rpa4RP2t*&=>WiKLZ$u3K_&;hM=JoF^u781S1*6Xf%egjAJ~Sz(gi78BJj- z)0mECFq2u#Mst|UJm#YXEMyUj(Gr%jjOAzrD=B6bTFn~PvJRE7o(*gy*u-YGuvL-5 zZHjLvWd}RaE_Snry=Wi%Ilw`5h{GJ=C_2VPT+DHFf=jrR%h2Uq!IfNvuI3u9@A zbzIL4=tgehW^O^ZavQgE2fCBHxSM+@x|iU-Fn&L&4}=-vgUWn}hk1mwM|n&+kMo3b z3!fzRlnS2a8T2gA@jNe}7dg!tUP3SP3a|1SdYw0TleY-pR&bVcyo285J>KU7!VeYu zh>!UMeadHi&KD%V1UBjyBOxJR43)^*E z*U@^;a<&rLR(&^cjvHEy+}KUr)XH@;H+Ksw&n?}`t*v~wae>=f?cClS+|laf(4F1I z>gsOp?jBZ8_i}IdanRTO+}{HfNe*Sfk)ukcD2TdTa&-Bomp*LRPX7L3VPGlU(E`Pf#Rz$w&Th7oZ@8C`=KGQjFr1 z0Hh?PLPk-V=)h7YP+7`Ro(fc?5|yb!RjN^)8q}l~wZov8qknNG^PnnX-0Ee z5JN02X+>+=5Jy|u(Vh-;q!XQqrwd)_Mt6G9lV0?u4}IxJe+Dp+K@4UHLm9?!Mlh05 zjAjgDNnjk~nZQIQF_|e$Wg63&!AugF#cbvmXSEO(fD_KP{ zt69TZ*0G)qY-AIg*}_(~@i33@D37t79qeQmkMjgi@)S?=47=IGvpmQ1yue=e@ggs= zp937^5HIrzucqj=)P6ms-$=dQ4E+{|Il@tn1%8`%LLN`a6M;^0iqo9oUEbq;KHx0p z_>hnIm{0hW&p6KoJ`ehWi(KMMzT#`X;d00;T;&?qxxu%5$M^h@+CTCWH@U^n{KBvN z7IZt%9e(Ez{^T$I<{$2IkAL}(|GCdYrZKJQOm7A=n#s&&F{{~(FuOU-X)be{$4K*< z&-@m!poJ`K5sO;P;+7D#q@|3qw9$d0En`{BS>6g(w33yrVpXeI-5S=kmbI;8UF%uj z1~#;jjcsC6o7vnJ#u#f$TiMz+#@W_(wzorYM>~b=Y`k6UYB#&v!=CoCw|(quKl=v_ zaG--6>=1`K%;Ao3q@x_|7{{96ILAA|iB58|Q=IBFr#r)$COXU6&T+2uobLh`y2!;Y fajDB(?h2D!=_-@MYIRs82CZ?e>s;@K@VC(i6Oa3q diff --git a/graphics/battle_anims/backgrounds/new/giga_impact_opponent.bin b/graphics/battle_anims/backgrounds/new/giga_impact_opponent.bin index a55ff2f56d9a53ef07152d362167283f90593bd6..8eb8e48cd2022588546d9c8335f35ea7b345dca6 100644 GIT binary patch literal 704 zcmWN|WmuD87=Y2|`?d*4I0O;Gwgm;)&tJ+KT`q%7qqPX(kRK~y3b zsZ0n}upxFrsY)33YGMedIuU3!s7WnqlOT1dOFimiZ$MH*8qpYOLQ|U29BDyITG1Nc zHnbI6I|&Oz+T)-D9Wi&JGpSwZigcqpJ?M$K7ri^U^r0`(k4XA60LMUrA`OEW%#c8a zjlmULn;0T7jAJ|#uupW_n8ajaU75mE(WWuogBipnMg_*s z#6O-{PTLC8Z02|{mwC<*t@eBz3$zsP)P*c!v9N@tEMvLO3Rbep;=Wo~!&=s{9yTPV zZ)6jjUD?7`i**~@g&pi<7YVT2626DM>=X8LfP);;Im{7`CfSY|NF<5l&IHQ@?F1(| z#c4g>enuaBmUEoPe1VIh<1TR-zhtiHaVgH=m{V7UYh33BH-%f=<_>p-d)(&%4|N{# zm?wJj(-=$YGoJIpk{%?5U-F9Ayb<2=j`w`f`N$`ndfI2<3#okNoA8|<{3K217r*%v zU`>a=hTwmQ(nRUXpp42SDwA?it{H-x%BvLEZQHhO+qP}nwrwZ9JzKM>UqAKgP4~RM=k~2O zaKafE469sm!yOMi@xmJ)eDT8{8vz8WZ;LI@>h6cLNq#33&6h))7NO9*Ne5|NlB zBqbTi2_pq5NkwYXkd}0$CxdmPK}Ir>nJi=_8`%jb2RX?_Zt{?qeB`G95foHih{6=1 zD8(pF3C)+J6s0LcS^Zaz@>HNAm8eV=s#1;W)SxD{6kA($1a+uOJ?hhdhMH(ZW17&E zW;CY-Ev-zgXiXd1(vJ3Y&}1ZSR!2I~nJ$(#`t7>XjqdcIC%x#cUaAj$>1S~!-Jbyr zWDtWL@Ix5NForWi)ksD$nlW~?=`ogZjCa6CCo!17L?$uWAwPwwDqW;{8q=A$VHwL=!Ae$X-D=jbmUXOW0~_^Z6Pww>R<^O79qeQmyX_qI zu$O)8*Xn;0oBIPCWRIIB+1{f9SQ&U1l_T;eiUxXLxI zbAy}Q;x>1<%RR;4*Zcz>@<{K(!yfa5r#$01FL=o-Uh{^xO8JiWeBdLW_{jSxan z1`eEri88_|CZ6I%U@yT3L`u_=SfyzBAs-Qi0b070CYqEo^eHRua+JsMF%>W?Qb|(9 z#V1sz3P~|CC6=nps)jv|>eOIaO^jN^OIB?X@YInAH=knS6&n#Q3lFL;i6oIMr;K{k z=RyM-Vl<+$+-yQqtY&h*IVrS2S+37$Nh^7i6Jr_$pVOK)$QQJw9qlo`q=V#kq!W(L zbWu@V>88p?cBh9&#rpTOyuF~eO6;UVNkqX?)LE#tGw@Ksp%#Ok|Q?KA9=$I%_J^ly^Ea3?{oA-kHoo zW;2Jm%)^>5?lcy#5Lv`xmar82GBR1NZm&RAvWhs@YSbFmvW_g3Z>`ta8`#JX$R;+k zg{{bsY-2k+ulN5_aKLSvg0sEILa~MI43yC zDd99{ILoYm?|K&g4Wtu)C z<2?n4R))6e=xA-%exeI&e;uHU*ma;Ts+|QvT7q>NAv#q1&bm)vXoq%&=rA3QnWw_c F{{glD(u@EA literal 896 zcmY+C1CU%n5I}SPY$g}qo8;n+FV@AjZQIty$;P&A+qP}ncKXlm)n#j{TGOw)r)yj= z|Y(r7*{=_GC;JsHSICb2VxQ;1T)NBJs~_f!7LN`MMf_P+niAQh}aRHzEmeC*sYmdXDE+`ibE diff --git a/graphics/battle_anims/backgrounds/new/grassy_terrain.bin b/graphics/battle_anims/backgrounds/new/grassy_terrain.bin index e955c23199355ec8e14ae9287f1d5b0d0df94635..be2421aaf18efd07a9667f6774effb4c68e6f46a 100644 GIT binary patch literal 2244 zcmchX<#W|{7sSu+LP*eDG&sAkUlIsz!9p(X1b26LcXxMpFYd0zrLMSJC2g@nTbe%4 ztNsI>o!K*U=FGl1J0HLK%{=&!01071NQ7X7z!D<~k|G%_IZ_}Legsllwp2)sH1MZI zI*SZLdRPWzL?&d0WkFVC17JjUjWj51W9An1so&DVU0Bm=2qPnV5yyusN8Ed6*AdfQ49u z#jqtg5~pCNaRz7cG3*@9;{q^ppq8@LI(h1j|X@NdxXb$f~T-&c#aqN0p5@J2|pw5u4ljCSNw*T zuvd7EH+T#C9q;fSf587I{_=%>h=06!^f3VwGJOye#d#JQ%n%B(N(N;Du^D#dQ z7z?rx3$sWFi?Wz`Q7mpO!ICV+(#B|(VGIMtvMk5)tYECjO03K(#;UBw>a1a`$y$tM z?GV;sU0YR;_2a`Eupt|<@o4j!uqm6dxv>RXvK3n!+psO$vAwYaJF*iyhp-E~2E1CHoX^8Va#CiYLf3et=Am9rgHG@9Pq<hB~wx*ktJ4$ zf{{oTq=ZVKt?}hk8AYqKtdvTsgo?|eR7^!xL{?aZR8R$E`IS$3l}8q-+{&d0S-5h_ zNwOTuE()@2YN-}#E^DTyYNE!nMrx=AsxPajx~ikvvRKtpP1TT9S2a~t6!qIRq3*J7>Z&g4EbF9>>Y(Jqt&uix}}@C5r4yN+|C`eo!rIU+(X;TecaCjw1d2^Yq~1CqRYCZi?RzkuXBp0 z)mfd!50qE4)X|)@)+$nPw*s9(N6OW&+=p1IiBYWJ(oSxQ$5jR*&{vF z1KpS1(_P)sZTXY9#K9L5^8)Q6+vdH*%k*F2)$qt`yiWUspYk*MTtd&8`{2v;m+Vjd zq4#>Hc!Isv8@-m7(>eD!zX;!CU-Bz{&2MPm@;iRd8?>9e#oJ8hEUio9QoB^nQaZm2 zbtzm(awc<)qbj)a=E}LUF5qI!m2uIov@2z?8xY8zu+ zEmzakFjw7Gb5&gxbCq2sSJ4eTjr>u!2DtvNUm(=q*Y&YccX*d}kN5e24{4A1m{0hW z-ZMVu3;y7B^4ht!obINDG_k2}iks{vIh*JvxbbcrQ~t=Gyr7>M7je>l;jjFSFB$ZT muldHy@-|{x@b7%b_iz5kqW=O&|Ki}A5C7=x|HnU0v%dkz!kLo* literal 4096 zcmeH}WpofZ9K@k$ad(-4`Qyc1i@RHKDDLj=UWyfWcXxMpcXxL`F7$ezj_>z@zIn;Z zCi!J|XZK|i5*`SJ&b93@Z^rBE7WP!{D-9u-g#l~5T~P!-is9X_amny7`^sDrwwhx%v$Uo=D` zG)5CNMKd%<3$#Qlv_>1WMLV=d2XsUybVe6+MK^Ru5A;MY^hO`_ML+b%01U(+48{-) z#V`!V2#mxijD{b^z#n5V4&yNa6A^$(n2afyifNdR8JLM#n2kA@i+Pxj1z3nhSd1lD zie*@i6Ld=%YEaY2*Hr_U?_%W7>50=!ZAEO8G#Xl6p4`; zg;5!e(HVm=8H=$QhjAH?@tJ@LnTUy3GB}?HkRW!-tC4HT>nH@0yxRllR3rJ9vEl-oa*LI<8;p8 zOxHKdm4Eo@oK1hn2iTk-ey$q}pr3hQ9_PFE0{U?w7X|W*xr9lSSc#Mn2^3%P6jvUI zqu7e2n2O=r(G^Wm6-AL1Nf8x6o(ivU2&*s(tx#IZkjk%o%Bwuetz62f9Llb2%Bn2N ztW3(N3`#FArBhm^QEH`9N~MrVO0Hz0prop+I;yQ&s;L_CQFT>QRaH@CRZ>M&PzbBvIahEcS8+Aha4pwyJvVS8H}RxS=(vvQsE+8c4(Xr{Xg~I8 zul8uScIkuOyBy!lE!@g&+|C``$z9ydJ>1KE+|L6%$Y*-0Cwi<$dZ-7wuY02lJOhj^I2UPpM8$9Oz2;ZE=*Pw_O*(8EGn2>a>&hrjeg-}Oyj^#z~xNgtKM z%+B&$U{0Us1zzMOUgi~Ew`N?HjkZpEyqbqSpRi}7J+>tr2+ zt~*$J$KT>@-r-%|<9$BhLq6hTKH*b7<8$Y8L-XY*8|laqHr$5UP#a={ZIBJ*3%+zN ryyELXU*7O7-|;;^@FPFD{?CDT`@*mM7M%aV=bvB){$L0G@BIH8EQrX# diff --git a/graphics/battle_anims/backgrounds/new/high_speed.bin b/graphics/battle_anims/backgrounds/new/high_speed.bin index ca049478cca1889c44ad706ffadbc7110464f9c0..52f7a9c51adec65bb3246326a8062aa05e32fca7 100644 GIT binary patch literal 496 zcmXAm*HRQ=6ok*&b(|en+yNIsSK(6!1S6Oe@?%cGnzN2sF|CSX0>*%1023f)#P|?i z=$m-$)jWbbWp#B`cUAXASGz%6>Xc9;WSv;3eQW1zw4N>;Ht#v0bL zPVDu+{Svo)0~^^ywQi=7CYr@cHb}$tmG9Eu7)3aE|j_ASYbp5|?QeTD&V@NRM|&~`e6P6BRoN4U#9y7KhyOYsA`d6?i4kHvmMPq)~;JaujF8D-CT@&6%{ vR8y7Hm-Nw(4DgCU20VF9pEt-G051{oX-F%-iLH$r5jQAR5;##rNwH^D@cOjc-$sVz)1-3&8>BD2gk$6WKw zw?MIlX^Skj#8S&F54oawAKzD6Wp#41Mv1l7g;`>Ka+WH!!A6^Gw#C-aTC>e|JM8?+ zE-Ab1Nw?pdOu1LeKKmVTF#Hasl{u^|*^fBtm~zLRaMCHKopIJV70xSgb*-HST-hp+_MfdlK@gXK_Z)z3?(CiGn{~sa2=mYYpn7 dH)^8>Z@p6&z4yUKpM3VkSKoa1!%vNVX#$JCrpf>S diff --git a/graphics/battle_anims/backgrounds/new/hydro_cannon.bin b/graphics/battle_anims/backgrounds/new/hydro_cannon.bin index dcfd45407609c01a85438a45a9c2f10f3280d67e..0d5168cd782d06959b63ca86b2c6bf4c53a4868c 100644 GIT binary patch literal 880 zcmc(dSx-|z0EK5Lcqz4|f~aVb4=PsWqD94m6fcXoi@5JnSH!h$sJOI<3%FI>cX2^P zO^lDm7ypRKRsX;cHAaoWd!O_lka?M$e94(P=Xixz1SLuaT}e0)$)qp{4J{QXX-bN8 z6^eV^E(YVqBS^=~5Hd^^QbuKMCPT>*3}ZMW$S!51Dpp1$HVU60htcGMhdlCCk&>0~ z{em$RFqVLWag1kz3Md(m#0t?VVxnLYL5i7dD!-*`QYGxDKk~Bk{=w?DJNV( zh00dae%*||z!&?5+n`cqS%|IX>s3?}t+6RnmgzH*waj8Rb5xE6bfskIbD4*n&jJ=w zm-Nn5c}hmLMbxv{!4j6Ttopn1TWrv^oE5AjWfiMg(^f2$?6(d7KLa3`@>@@Py|Y4J zoBU=S>%(mL@hRd|A+Ngu5n&^n*ovfV=yNvd2K@tPfio$O*a zd&2B3_-K8}XwHtJ?PEU&EJT`yILINIIgIZJM^%B9U91IhjN_c(B+;0iTU?9Nia13Z zr#VCPtX)+{<2l+99h~O^7x7&pv#-fofvZjzmq~DiPDWqln%36WZAJg~y5I&kxy9`; zcjO=2y(MuMagX~v;31_A`cEt8mc%2v1dn;bQ=Wb9ZB&K75?OSoC7yfe;f2k#27IaX d@-i*)ir4+Wt8jnq{8!filx3S+Q?iyR{sJutMDG9q literal 4096 zcmeH}XIIof6oy$uX%^T;1Svj(*ccVXhBP}Mur^SzfDHsuL9w7zv5P2z6#>PHz>hRB za+1x4WV2uRk~8Pz%srFm-kEo1?pznHSz0Lb2xC4A2q%I_q70ic9nC@(v6v;q5R2Q8 zRQ&0A4{kB z6IpC#iw#!xkj+-Mv7H_4B*!Kz^Sj6;kNhA=W&Q;L>ZJVb`z>U5&~ekm9`>>?C_YE* z=Ku#OqS!X?79|{_lrqZkO1tm7A}i}KM>xtcj#KgfDdI%Q?<-fs0%sUFaFD?axPwI_kMh1C4~5 zva%mv{t8W8#%{+Hdgk&OE)?-niG;3lmBv)cH#xXm5z(#Aa#wfyHG$G=ZI9dyz~ zw=LF14-e?&A&+>>6I-l@r#$01FX-bX{dg>uR_E>&uXxP>Zy01qdV{TZNo9L@%RAol zfscHW)*d)3*Q3LHW`t43s1?f2sh-Vx(R|@6<9y>gKYZ#eGfEy)>d~K4J^G8^Oz6(r iO#Nu=#VeBe!=zM?PBA@81wA*n-ihic;3(iI5W-*d{ZKLh diff --git a/graphics/battle_anims/backgrounds/new/hydro_pump.bin b/graphics/battle_anims/backgrounds/new/hydro_pump.bin index 917b5c6c966b2c7a2e4851293923ffa014bc4307..0f7e6a5d913d4051a8fc58c1029c3ff3092c61f2 100644 GIT binary patch literal 224 zcmXw!xe}~CHm{*?Pc`S!`;p3tBbRf(MJb+JEONY)>cL@EzHe~p8V$nFkx2# diff --git a/graphics/battle_anims/backgrounds/new/inferno_overdrive.bin b/graphics/battle_anims/backgrounds/new/inferno_overdrive.bin index 01cb5610350eb2f55db2aadcf9a6dcb3da67dec9..d9a955d592dcb2e694b917854a5065810ceee32a 100644 GIT binary patch literal 556 zcmWmB_n*%N9Ki86#~B^2tRwn9rLs9CvdJz&vezk+kr~Roj7rK3S=oC_MujhBuk2+0 z3HK-T`27BSyncCQ=VwF|Qdou}qNq&86c;6w^nxr=N@-wDyS%O zR8rZ?qKc|sk&>q%l}=Ujs_Nl2uX{s{P*W|n)d_XgQ(uEzxe06NP4SjS-qu(&@s6gN ziRM~psg<18+9a&4cSAevbyfaY;zPZBq_^m!uYUTA0R|dm zu*@Nb%1hX=@Uc$}HzIs$q|b~Bqm41v=NZNsZ$iRiqDdzELQFB$G+&CZOgFCuj}}{EX*$U*v)l^tla*FkEq=DfTITa7o9%Yk8FtxikG)}^{SG*o>rlcDJ0gB{)NhW7<4!o~ckzcmopM^vndDYF zb=JA?m%p8NAzXCHWmm#g*Iaia%T50z?3TFgj=S!O`yTk$L-C(S9(yA5sb`)iOvL{k Clbi4W literal 896 zcmajU(|QnK007W$wX9{=*_M`VtgW_e+qSv1v~1h9ZQEG&C_Tb|Zcl^^GK!Q*W?5vF zO?EltluK@TM2QG|Uisu#KtY8RRzy+76jwq?rIbeKqs53-Mp@;QS3#VLDygiBs;a3j z^flB}OKo-3RZo2lG}K6AO*GX^ywEq7AW;h~B}vvwYi+dEPJ116)Jf<&>!Pb}y6d5* zUV7`JuYUR)V4y)lKiCjM4Kv&bBaJfJ7-Nky-UJg(68g!em};8oW|(P~+2)vQp7~NN zuu$k1S!{_^OD(h93M-{qWwkZdT4%k`Z?MrOn{BbxHrws6(=NO1vDZHPh5mqp4ms?I zqmDW5gp*D=?ToX|IWP1VTy)80S6p??bvN8}%WZeubRj>N<3t z#!@%ke15|diN;C+F~kyw;weXY5>N#yQi;l_3ROuYf~rxS8YH1)YEp~Z#MPlL^`hzZ zQ3Dzh0y2$AAr+<3m~@(;rZl5DEl^8Z(V7g@hPJe$J&_J{EC@T%8Fis6nRG+l=|NAj zP%nDZhrXyE{mCW=4PYRH7>tH6l$_LI1i1`n1S1tHk9e^ zD$~$(W-yakL}oKb;aujSLgur8g{X){EM^HRri7&|L(5sgN>-uOtYIzdP?S>2SdTWa zkxgtyTiD7rwxbDlf`*?|$c?G@7YrM{W zA_q8F5FX+U^d^Tn!dvKV-r-%|L+^8xV|;)<}dr>iDw9Y<9Ghx&#V;v#owIe9QucUInM?3 z-^B=lW2{)mIo{<=d1r(PuHcGtC0BM8SH+16Bd+G^at$Xr*)`=_uI)OmE7x;Zs}HXYiGEP+sf_S-W}Xg?&Qwy;;wS0yScl2#JH!k z+)H6^xsUt0pZg~`+c^rd(+0=`J;;MSL>}s4&h>D4ghx8h`SK`__85y&C@+Yp6OYh?K$#X&vT*Y%L}~FMP4K?_7WGnL|*D;UhWn0O0V*2uaVb! Zoue+5%e>wjyiwld&EDdz@-}a`{s$53-NXO@ literal 896 zcmYky1$2-F6oz48FuJ?n7dE=P8#ZEecXxMpBaMOqN+_wM(%1n?Dq(<<%4maB;b$sm z=R5bF@7(9cAub`rBR-)dAR&oJOcIikjO3&sC8hL}7|hlwuU81SKg&>E~XCvXrAd6{tuhDpQ53RHHgIs7Wnq z6G0?(s7pQS6Ga0e!y3|v#x$X6;LT`G3tG~O*0iB5?PyO2I?{>GbfGKV=uQuM(u>}K z_n|NS=+6KKGKj$pVJO2G&Im>_iqVW=EaMo@1ST?x$xLA?)0oZ-W-^P}%waAsGLQKz zU?GcG%o3LJ5-+oi<-EeHyvFOSU?p$xCaYM@8rJd_Z?lf|Y+xgs*vvb;%NDk>jqU7U zC-3n-yV%Vh_Og%t9N-`y@F5@ZF`w`$pYb_g@FjJ9qnZ2AYJTgH@n-zp7yf0ee7#L`#Zpa4sx(V9O^KKJHnBUao~_d!HG_C TvQwPuG^abmna*;ybDZl_wrT!$ diff --git a/graphics/battle_anims/backgrounds/new/malicious_moonsault.bin b/graphics/battle_anims/backgrounds/new/malicious_moonsault.bin index 03bdeabc7f25c1b93996e63783c1fb1f42fe58d2..37874dd0bfe49071e27547deb84976adcb9b6a3f 100644 GIT binary patch literal 544 zcmWmCX;(~f9KiA4zcJNVGSndJcW#rVEL|D9y4EC7wq(5_WF1R(`ZJd7QX=bQ-y-`? z*?Zs|FQIe1f&0u;;|+Wte9qUaU1BO66^e_&<@j{O-3B+Y#0l|uXiGbxJsn7(qk)(7 zPIM+SQAol^7rF}FNTxeIgr4-GH+^CNKZaFgNFap(sq_{4(VqdN3F!=E5QBvwWMDEh zflP*3;ZX3mB5WrH8P14|V(tFpC`T1|Ml#CrMcgu)F^pv#l0`Nayeg;2^$ zR6Y^7!Tsn*RkoD*s}&jsp)i(KL| zSG1+Ba*YV}!gX$NlUs0G|GmRq?g{sKz(X2ZZ8NHt_lU#cSaW lZ+XXi;R7G}L{l`|%xAvvRrtnte(*Dk79ISrAAO=+{s92=kXrx% literal 896 zcmbW!W0Rv%5QgE(+BUCbvo>aJ+qP}nwr$(C@vk;{CzIKl+0BQou2X&b^mBLjsSXLH zupDxx$i~TBa?2yHeDW)xph5~OqNrj4S6qp}msCn=Wt3G;c@Z+%{1{!Llu_l^ome6KWS?8BfgrsS%MG&QT$mo-m_;=h=t7Nsmt6FQL zt#;b$prcMY>!Pb}y6d5*UV7`JuYUR)V4y(;8)B$oh8tm|Q7Nl4+8AR~YO+o>&Uh0{ zG|6OBOf}7PGt4y0Y;(-bR%@R57FcMJ#g71LsxP_W1Nw2^4UZhP#t&wd9SbSO~8Hxthvj-5CWb|iRD|HDzo9CyM= zr<``iS?3aV-USz3a@iGEU32{p>V}(cx$Ta-?j?x~GP}R;frlP>?1`tId7iWvUV7!V eH{N>Zy$?Pn?32&F`0AVQe)#EElF6k1_x2mV$hNrv diff --git a/graphics/battle_anims/backgrounds/new/max_lightning.bin b/graphics/battle_anims/backgrounds/new/max_lightning.bin index af4c39c1c0bc0ea0260ddccddc8ca26d7dbe7069..43511aa7249cd273fa4affd23208c11ec2f72fda 100644 GIT binary patch literal 744 zcmWN<34GRb0LSs~Z_oaF_U!4|^WPq`&1j$B{F70ZBT~wCB`~7_uLIzNNlbW32=jdIB45c1HW97a#_5m*X1oVX{`izDcbj--&II2!e#FUL@X z`f)7BaXdPK{+!53XaFZOkU{7a1~Y_HQJi9iG7Ob)8mDsxI+NjyU?dvFXwKqnRLVJ= z%NTSXV>zF3=mIWeJQtyhnZPAniZ0`FCUOP3lB>9yN$47`dg07jy?d|bUsWUyEdxr||Y{_dXEi6mK5~kD4P}yB!?&cmjej-0%e1GY^%w!g` z)0o3t1ko&lw2gHLsL?u;X5fAeSi$#@J=`CTYSjM9~#&YpE zPf*R11+0*Hil-H<@fE4z8CFs&o~4de)Qbk5<9S{Xt7-7+y*1)R*07eBD&)LOqr#26 z(kA1E)++Z^nv|csj`eJi*@&8H;Wb`IZ}289UbE-E#oIFP(2CyWJ>KU7oDcbkj}>i| z<8GoY9{Pk&(Py;N!Diy0EB_0=WV5FZZwp)a3TG={^Nm8CiWGOr`IhhaUZ&O!cVT{z z`H^j6J3q05pWzn;cCw3KA)&x;>}HQI=Xdt9k8WSlKlqcs*k7ycZpHq8fWK4uhkq52 uHL^)IV3VzrYEx`5Zc=S%mcnT^YMG=>_b5u3o#lySux)3%gtF0J{ql3`DWP#%@rtP_et#)^~B4K}LT# zXU=&~-0w4BgDr+XU?<5Qhj^V4N1SlR1y_u?#arAl;ejV!Bqj+-Nk(!~kdjoSCJkvx zM|wb!fsANDCNh(StYjlQImk&aa+8O=V9W$hFJ4Zxx*4{ac_qIqmSGFen-exBN@eL(J}w| zhp~)fJQJA6B)LAq$-*hZslsWJe3;G*W-^P}%)u8w<}#1@EWl6u>V+&~F-us=GM2M~ zm8@d5U=3?U{U!Ocj`eI{Bb(Sv0D){_E8EykpbpSM>>!9>c8cyIL^Oom0*eb4?qRR! zKK64!aF9^KIK*L&aFj3|s*iD8aDs47a*ETO;VkDkFF9QF0vE0B5|_EcRU(Mwnk?73 zL8Ok*QABZ*TioW3xVyq=(Ra*cJCK4Ir3jk_`_ L57|u0Q+cUhGC~MW diff --git a/graphics/battle_anims/backgrounds/new/misty_terrain.bin b/graphics/battle_anims/backgrounds/new/misty_terrain.bin index 26e3cfae3d9c9143977021d1a36cd2d36e23aea3..6276967546d3f3459fd0509cd33037dba178e1b7 100644 GIT binary patch literal 2180 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 M2f}#S|9|HHU&mRtwEzGB diff --git a/graphics/battle_anims/backgrounds/new/neverending_nightmare.bin b/graphics/battle_anims/backgrounds/new/neverending_nightmare.bin index 647896804cda780d923488d5816e2f666fd06f3c..e450f144151475420a9615aa3835806d3c934f27 100644 GIT binary patch literal 744 zcmWO4RX~#g6oAqDkBKNEnMCn$nEstZiXub4yy$ z8k^9DwzQ*tva~L0bf6=hFgnwPu5=?sy3>Q6^g?>mhrYxh{pimC1|owP%n*iR9>#D+ z*uqC5c48UDXe?tGD+%Kmk7WWAC210qkts}N8q+amFq2u#7Q>jsT;?&~Hc}R_kT@10 zivr@P7T}32W(iAKhQyP=auSghtYj6dku|Jk9qWnQV0dq2lPzg8#um1+jqPH{4tBDO z-N+vHvXA}90S+oJ;)_DWn>a TTY~*HKm*k)j|Mry(}2i-F5t-B literal 896 zcma*kRZtvJ5QX6^?#|-yH!Kh%?g?=r?(XjHO5EME#NCZJad&rjh`Z~}klhzjRO(dq zJWPN0o|@62`x^@^vBDY~Y_Y>02OM$285dk}!(GJ#PrUF(j}N~1;ZFd81QARKAcPWz zfp8*-R5C5;NKXb$W+aMCWF`w)$wqc^kds{GCJ%YFQGm^ubwvR(}0FFqA^WqN;7qSa+=eE zmb9WZZD^})wxc~A=tw6z(}k{dqdPt5NiTZShraZqKLgA@mVpdnFhdy1Fx783BN)jj z^?o#C7|S@uGl7XrVlq=yrZSD`%rN_z%)&?+$uH7~sdvh!5uI3wrC5oz z*odvziM=?8qr~H+l(V>qYbrV#H*psa@f0t$M-WhshA0QpP9v=>JNuxare#@L zY19>B!+}(^j6jQqMO3sk$!;XXy$`BkFVT2Pwq!>mNLy5*o zgt&;o%`g&Ti6g1d7EgkZ$Z(QKw!|}n6jJ#=D{10QXQYrpCRt=#Ql3LDdE`4NV3g$@ zO`+i76pA?2l7=yy#_5cOaRkobOwJOD8IP9|!AB_*I2+Ef0+F1{L}3z>nZkLNw3kuN z`BZdEk+ZXsDlWjdkf}^#y7b8mF5+S?K`vz`)y$$~Hl7;%)KXIyoK`q6hk7m(F6Roa zVs?iG|p2<`x$DJ+~qO7IPaGu11=C z6L04Zf0f+HT`XZKmCO8fcL$G!upHM4?lGG0Wu?&~_i;a~cmRsCU2PAtnl-{hJj^4k zZSu9Q<58L$+aD7iC&&{#DYUSjRyLSC#nU|F>wi|*$R;+k1=`Y#t+ex;gXej{KiI*G z!b`l&E4(Uf<25>Y-9Z=KrS9$Q5Z>TTdU(r9^S#YGyvt5_&#ZW#UOuplF@1c{c&O}=9v`)dQ=3kNvJAr1#?R~|7tj`9OP z3di_~pE+)sJ%jwhuly$b&I$hDPX~YTcWu`{{0sk;_KF&6+SR6ZHR?4~bci}MOvAe+ z${iM=ks77OP>oinx^VkqNObEkjTMi?X}l(AqB@6bl6aGKgc>QDs;HKDB~8Z+Ok-g`YWHC9+-gDrO0 zMAdnz}2~iYE7~y~rp(v6lqKP4vI7RU! zkVq2Aq*e64(vhAFWF!-rm6nC9WFtE{bU!D#$W01)$V)!*Q-FdLqOduuol%6M6r(sL zD5)rwQk15Qn$f(nl%qTqs7NI$E3QISs!^R9)T9=*siRNSr5^QZpilgN)xW(Vjc800 zn$nEsrr&~=w4ya_NKMjmZE0tE7TVK+j&!24u63a+-RMpaGtrY?^rjDe=|_J<9l$`- zAH-mWFqC1YGTiL6+w2&@NJgn{G-K2{mT`<{0x5BtJCR9DW(rf8#&pG6&0r?8j9%l} z%waC`n9l+hvWUejVJXXu#Bx@!l2xo`jjpU^9qZY^M)QPCY-S5v*~WHuu#;WvW)FJ} ze;@lfz(EdiSXYj4lw%y{grbw2;S|U zJKW_S_j$lW9+}z4JmD$Ncy1~$RQHlsyygvWdB=OjANa^8KJ$gIeB(Pm_-W>U@tZ#e zr4cK!78|h@^~+)}4&o?I;;cw37qN(|xQV-Xh^MZ3>8rQ+h_CAW#9sm=P=X{_QHX>} en1l-=ddfnCL`sxION_)yoWx6lBubJb>+WB&5yRO4 diff --git a/graphics/battle_anims/backgrounds/new/psychic_terrain.bin b/graphics/battle_anims/backgrounds/new/psychic_terrain.bin index 0ef28b6debc484d34812e071beccd9105151a70b..a661ab77aac267a72774a3e31d116c10cc79211b 100644 GIT binary patch literal 1904 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 X{h#vxlajzEoIv8%{8)egU;Y0l8x2FS diff --git a/graphics/battle_anims/backgrounds/new/rock_wrecker.bin b/graphics/battle_anims/backgrounds/new/rock_wrecker.bin index 8aaa57b01be4c25426a35dc0040bbdfd1fa205f2..58410f9bdc8ff4b9d25909161517b50400474230 100644 GIT binary patch literal 676 zcmWNLWpI=S7zW=b9B@G4?!${NM}Pna4aKc|L4yZ(IINUX+@<9R7Tn!}ySqbihvG$w zy9DcR@^5E$c4qzI6ebZt3OvY@l2iz#CbO3`rnIgv9kD+oiS$-113vJF}C}S#1Im#Oqs7NI$hfTjw1(z73D%Ge?4XA0VMJ%^D zX%bRX^EC_5+?*D)G_^8X(}uRR3y0L64ut5KTz8@~UFhoNSGtAt8{HFJ{Z0?lAM}i% z7rp5dQr~0dM5`bD8GsFB5Q7g0 z(KLz4#7uEDm1#_Om2w6%nPr-7j?G~%^O%nou#iP8cI7N#sc9LBVZ|&b(+XCyDpAgA z)|l3^&Xuia0~^_dXER&aYTAaoJyAQ@$u9i6*<;$vgkVCn_OU;#100Ot5QjMu($NTx zah$(RC!#oMIz_tEoJqbvOaI`2sB>^0U7%<1qL)itMpsCtt6X#S57)&FZqg+fC*9&U zcerbg|6lHz?(+aWyylJRb!6;YbKc?Cdp>yi YNK#mz_#BVE@Re_g`rl8fU>{-j9a=N1jsO4v literal 896 zcmZw6WmJ=K7>4l!ip^#h#-&c3`r6ptt<3J6m{?#JwqSR67Z{*mf*ljPyPXNvXCMB& zzHaC2{JuQb{dnO`DpD&xq`^x`OFGhv40>lIlLx-?HDM;R!E7;+g{))~*~vjpa*>-n z|%@B zwz7@wZg#L!>|(cW4}00iehv^pq&UbSH-|Yw6ww?N#|YC>#1QM^I43yCDNY;C5Jx;` z#W~K43+leeCFL@~T8Q-uSCwl7X%4QFpxnU0O>XIKbBDX!!>;{vp9ehTkt~mSBA)V$ z=e*!0uawuk@#rn@crQK>pe6f=lTX5F`7Fy9l6~bH-$`_l#1G{szxeIu5B}PJe*vVk B6bJwS diff --git a/graphics/battle_anims/backgrounds/new/shattered_psyche.bin b/graphics/battle_anims/backgrounds/new/shattered_psyche.bin index 233f54c10477c49c18eb12233c141defcf7094ce..225d8e95f306009a6aab40fd1a56d2f9e74400f8 100644 GIT binary patch literal 808 zcmWO4iDS-n9Ki9<_xJ4Ceslh2#%zxFXOA)S#2n>ne$VV#5*0pi3H@uvXN5o*^Aq>Y$I3@y{V5FEL6ctkpDNYGW;vi9! zBAU`j3}q-wEKWJ%#KdEe@>HNAm1qTNN@^qtxSg|PO z^CoZcHetPahdz?umyCYm_Gdt*J5UP6&maaf1Q|*W?=lSMJ%*c%_sPYC7{N$J8DIEl z@)#q-95WWiW#$I?fbkwaWC9aSx?|)cCNY^Q$W%UN8q@L4;1gzQk546EK4TWM`5gNT zGW;opUoyvLF7w39=PO|WU-J#$hD_7%SjhJ*N@B5@^@CZkgry;Qu#DxbVC8s|vx?Q~ zT_f(=5biwIF*s?xO+FjU*g9-XW|N67Fh@3!7(+*krSNc6sL(g z!&$4-Km2QD#h&AQsF8E&0vCl#T;>W_g=<{r1~-LU+~y8Dn%Es+cPln_Cw6ytcPn;xcXxMpcf0O^VVrN~{5WSn z-(GvqF=0h&tVx575nJrA*Ery)NsANCxZsK#?xe#5PrUHP2VeX&=`oQ3e*y>u!;7Kq z2{OE;!;xSz5<)0pgcCs|QJBd@X7yRrXC)iii6#d*$whARXhUA|k>9WdC`cg+t1m)P zicy>xVktpMN>N%HOq8K4CTvrkZ9nH_p(4mb9WZZD>n7+UwpO=%~IEol|@lJ%gF9B+!lS^q?ob=uIE>ed$Mk z1~8C8I^ST1FjTE2!x*08V;I3mMlqT(I)f!+8OL}gFp)`2W(rf8#&m7)V}{z9%wjfk zm`kiV=>+qb&jJ=|7O|KmEM*zX^&VG{$VyhRT07UMUduZ5>)F6YHtEcp*uu@f`);vkNa zRuc8bEO8P~wVpVOi@1uLxJw-A#6vujJG{gXZwbLie8o@FO9t_mcmfO`D2Nz7NP=~Z ZB^lL+NT}`7L6l?5aZDVCNhc1XbMxA#&k4;RAw>@&1MdBNkj9P&jJ>rMJ#3sOVKixvx1dq z6{}f8I$Fy**0TX^WD}d&g0`}a?d(81*~M=55Vn_n?B{^ObdU@VaTp!pD91RCPH>V_ zoJN_P;VkFSc`k5~OXxCJxXLwjof|yH!UMeadHi&KKxQzT#`XLEmzR@Aw}5z+LX~Bl?M- z`GsH6eSYJ2{y=~77k~2)`j`KB@Tgs3&f;)qwX!+8b2z6J;atw`JXT)kbAAV`0xsx6 zE^HNXQAfI%Roo?9(xt4@F5|Msvdg)=D_9j>$(3Ejs_JTvaY1Kp&GsD6b(%HL^S!_etwmn!C0=SR^K!57N^6x@dyUhrwO;4--e7I?CU5o@ zYpb_;yLVVSz0143$J*!Z1k6R~v(x-gd%JdnZ^*QUjFZiM_ xS(kmqSAEU8?i-c@=zpo9xKLzB_mgiYXC|d5DJ2*aj82RS>P~z_;;n>?*oPEd4TAsx literal 896 zcmWO10}>bj0Kl->w%5+KZQHhO+qP}nwr$(Cy~_&{kU#_`2tf%(a6%B0P=qE7VF^cg zA`p>CL?#MRiAHo{5R+KMCJu3lM|?mMkdQ@0trU*qTMsZ3|l2VkW3}q=tc`8tmN>ru_RjEdGYEY9} z)TRz~sYiVp(2zznrU^}HMsr%wl2){)4Q**hdpgjOPIRUVUFk-5deDELd)dc+4seh|9Oei|ImU5LaFSD; z<_u>!$9XPrkxN|W3Rk(tb#8EzTioUjce%%X9`KMyJmv{cdB$^I@RC=&<_&Lo$9q2T zkxzW)3t#!hcYg4bU;O3|e+ghf0~y#L1~r($4Pi(_8QL(0HJss%U_>Js*(gRen$eA6 zOk)|_IL0-e@kLEwLKB(TBqlYP$xUHOQ<>T{rZt`E&0t0|nb|C6HJjPZVNP?I+dSqq zpZP6dK?_;fA{Mon#Vuh;OIg}7mbIMatzbnfS=lO9wVKtfVNGjU+d9^@p7m{DLmS!H zCN{O1&23>zTiMz+wzZw@?O;bc+1W03wVU1TVNZM6+dlTSpZy)+KnFS4Ar5tz!yVyB zM>*Otj&+>lo!~?#IoT;rb(+(i;Y?>a+d0m4p7UMcLKnH%CI1IYUFLFExYAXwc8zOY Z=Xy7|(M@i4i(B31c6YebUG8>|{{R5J02=@R diff --git a/graphics/battle_anims/backgrounds/new/snuggle_forever.bin b/graphics/battle_anims/backgrounds/new/snuggle_forever.bin index 3abd4431783972300e5c4d0ca3c7a872b26b0aee..a4bcc4440d2d31ceb954cbd82d167f0607304af4 100644 GIT binary patch literal 988 zcmV~$1z-&b0LS6~v+-t(H!(5e_vek_jp>dt-QC^YUDMs&F?AhWaKRndo#KM);7;C& z3%)Ou86^eCMikK~J2?mvgK`o}E^-ryBM*5ADX6$`Jo(6v3Q&*)3XxG*@kJ;~VpLd( z6eEe^s03h2qEdtjMUqiz%8)`zB)Tl+D6galN~Ho7Nh3X3fe4kT911F2g{oAex~M@- zYEfI%p)U2PFB;I0bQ+1qWYC1Bq8ZI;K}*q!*0iCmXh(YzQaXr^bfPm|L|3}eogShm zz35FJ(U*SoXMh;UAO91@2)!ciWHx=d%5UO#u5gt<#GhQ_Iyb~kZgHEx#NXWEF89QJ{^4K#6aVu7IUr|ql%t(p z&f%bAoKucv_)fe0hNvdXX2)OT5&}yj))4 zm0so5@*1!8IEc%wIYbEX1Yyw%&hUEblH-sRo$9`E%&?@#jql0we%LB||&R&pp6 F=^@Y~?;-#I literal 896 zcmW-X1#lDw6a|6c5C|3=cHsg64tIBVcXxMpcXyYdElve(k-DNS(n4LJg0#3@GCT9$ zpT93Y2?!%0iAYQml9G(%q#z~Xq#`vDp$-qEAuZ`hPX;2%NT$#yGg;zXSRgCe$W9J& z0+Nf|1c(Smk%zoQ6CKP)ehP$akb)GVFhz(85u_-^VmnZr5|pGAr71&M%2A#QRHPD> zsX|q%QJospq!zWQLtW}op9VCf5shg=WOP%S(VP~vq!q1cLtEO>o(^=R6P@WoSGv)i z9`vLaz3D?=`q7^O3}g_48NyJ8F`N;MWE7(r!&t^Ko(W835|f$2RHiYV8O&rBvzfzO z<}sfIEMyUjS;A75v78mGWEHDf!&=s{o(*hd6Pww>R<;qtc6P9nUF>ELZ}4Uud*gB+ z`#Hct4snPD zLmu&%Cp_gD&w0U1UJ=juCNRu|CNi-}OlmTdo5GZao66Kin8viGGrbv%G^3f!Y!MEiZNMn=nAd3Ynco5iEodPNTg0Lkv$!QJX(>xv#Od)vpp z_OrhO9OxhiJH(+5bGRcM=_p4##<7lbyc3-0Bquw?sZMjcGo0xxXFJEa&U3yCT<9Vf ryTqj~bGa*A8Df>IUE^BUx!w(Kbd#Ii;#RlC+1N#l+udPIRP6m4$fWka diff --git a/graphics/battle_anims/backgrounds/new/soulstealing_7star_strike.bin b/graphics/battle_anims/backgrounds/new/soulstealing_7star_strike.bin index 9bbee7ab43894b318dcfee60baefe1ca5cfdd132..44eb2f82d37873ec3d8612aa44f9cd175742750e 100644 GIT binary patch literal 968 zcmWO31!I*30EW@`V|Tz9uuC^QFWsX%HoCjJyBS@hySp2cMhSyZP*709E-X^%HaUOc zgcBpAfFwi^LXjjT8Oc!;DTpQ|N=0g72%|KlB^~Ke1~QU~%qR<4$wqdRgPi07WO9>- zyeJ>}DL_F~h{6=1C@MyAVkv=2Qi{@)L1igNc`BfaRH8CfP*ti?oj4Rv4Qf&g)us-0 zsfX&*fQB?ejcGztnxW>jpe3zPYueD3cBnla=tw8jnJ#pt8|qFEdeRH^rVoAThx#*s zfeb=}8NyJ85e#PpBS|38C`L1ev1lCQnZQIeiOEbM5lv+p)0u&0GK<;FL35eMd={XE zEMhTB2rXq9%N49ZD_O;A)}XblV?7(tMmDjTEodv-*v<~LlU=;RtLQae=MCOOyV=8D z_M!b8;2?+4TfEI-j-aC);~m~b@9{pzIYHz}PVoW3hlq~I$0nP2#o-_Y+|<2pA8ZgPv;{GmX9a)-Oz zL-%>WLmr{WJmD$N2tDToe-ZqR{^4K#dzr7mNgUyj73ri-=HynCQ#jfwtyE6!7>BJi zPV00|Z)I>sXL4pMi?ceLvs*cw)47ag=XM_FwemT?3%Hsj^PzzyBVYV0O%>Sk7R zw{T0hvRb>1+q#|A-W}Z0ovhC8;;!yyb$1W5Lh3mcm literal 896 zcmZY5XLJq*0EJAD-q(n|#ol`p#NM&@2(dSbnb>;&@4cwnF4Bp>lHpYSQ4@j0hB%^A+}1z++NU-J#$a*p#{ z;3D7gJ(sx54*@^&6F+l>tNg;RT;n>w@jExT8E}i++~F>N@F#!qH~095fBBF9xzB@S z4|&96o{++nrZTl@OlvyRo53J6n#s&&F{|0kZVrPDF{ioAZK!$7Yd-TEW&sOYNYug> zv8crix40!NX(>xv#(MndfiV;?|n$@jgO>0@(I@YzG^=)878`;<zTiMz+wzZw@jkJRu?PQdl?P6EE+1(!Yw3of@V_*B(-)ILo&_T%tJH(+5bGRcM z=_p4##<7lbyfIF2qOneLvQwPuH17ren(ho|2G%TRJ13C2&U3yCj5FSafnMZdm$=kr jCYb1QSGdwuu6B)UUFUi?xY12+c8gox=5}|OWDHLM_?`P! diff --git a/graphics/battle_anims/backgrounds/new/spacial_rend_opponent.bin b/graphics/battle_anims/backgrounds/new/spacial_rend_opponent.bin index 44fab7fee209711e834a46e3c57c69bf169bee9e..e6227db9c9d8e449155452362f88ca325272b8be 100644 GIT binary patch literal 1000 zcmWO4heODD0LJ0BK~$(v*`Js1k5E#Ptz=X7UPYnoO&K|E@9hR|@4a#R+}?NG-h1D1 zd!Kv$h9_lvoD@SWam1qrG$esWs4}igIv^;Jn|_(1tCA=g&j-mQu=4Stt$T7>_0}k&$5%@spXtR2`g# zrZa(x9Q(^|iqJ->IIgQiN8Jx*k zoQ=-mT+ZWsbO9H#i;K|3T*9U7Mtj)H-moWVcesqpxdL6uu5cAsqieX9>$o1>z>VC* z&FB_x!y5cUV{3-|K?50df_4^#gLkD|vo$m2YLp5!T> z<{9)X&+$Ajpci?GmwAPlS2@ICUQ>(?heP3Y-av2i7H{(odYAWjpAXQ7e8k6mf(_lp`Fa=x8_+^dmpJV=I+jR&i`wp)cPLIbx%3Z`7UrTxwi}5$9?5~?(YE} zC=c>r7r9s-;t~(_P(>xtFc0?#d89{qU^H4DpE+*w|J|!S#?ouv?;2$HbmPUq+@J@?P34` literal 896 zcmW-dbyyZ=97QLnAYdT^_PO|b1@uD%6a!QQ6$9)pP>`?_0RwE;p_>b9vt743UFfEp zZn~KZW7DM_3v(O#+`sR0&b{UE!kh9`pdvo_QVBo&37|4ns7f`e6G#n$s7Wv(gc52Y z7HqW$vf2b%9qLk#`ZNGU7!5HTjR+@#NE*`w4^cEFnr6fhOB`_)YcbZGXlp@~c`Tlm zw4ya_NFb56w4*&qbRd}&I?{>Gq|$}1bfY_Iq?2xG)`On(qBp75hraZqf7yls3}g_4 z8NyJ8F`N-(kjY3!kwrG6$sw0K^2xV6%e5REL$+nvSjI7)2~1=XlbOO)rZJrYW>82G z#mr^OVs9AJ0QP%p*L?V?53iJjqimWf@QN49j_z z=XjnMSiwqGvC3B33R}$@UgRZ~+gjGKo(*hd6Pww>%e=y?yvFOi!JE9r+q}cOyvO@& zWgFYsZrg0DeZUTO@*yAH=YPy6>|!^c@)>*B%jbN-KKAn^UvYqge9bo;;xI=zT9zYr z*p6|WZ~2bz`GFIh`D zzlryF@een+$t`Ykhr9gCe>|Xa@{+g8tAZ-ZN4}~gKlv*_0nXp~xyq`ds;Z{y3RDdR zsiuMzqEOXRZPig-)l+>n5R$^wP$s8F3Ri?873m^exNEE?@+eAS?%w}R6|H89QLN(B zTrCu@mTINeYNG@ts;%0oy^_>H$x2a*OLiUANu8CdE=qJ=)lJ=%rgZgCPxVr7^-*8- zQ-2N6Kn>Dh4be~y({PPYhBB4uGTcawQkJqcS~<$qJ%c>uYmCNfoW^T{CTfxFwuX}0F5*cG`#SE2$}s{a90+wKkk diff --git a/graphics/battle_anims/backgrounds/new/spacial_rend_player.bin b/graphics/battle_anims/backgrounds/new/spacial_rend_player.bin index 7b479c88d672f56c52b5a2633d6b41aec8cdedca..cae5112e003a1b2d5924c329d59bd2231481a186 100644 GIT binary patch literal 996 zcmWO41!ENi7>3bz$>>XO+v?$fOooC@X43W@LoYBP~)RB~+U_)TJJ(PXii~K#gcj6PluC zG^YjGD2JA`qBUwmTiO94+C|%F6KWl;qGjZSOnW*IC`m^;(V6rvbfudLyQ3cTq!+zW zA9CqS9?GYHe)J0!M1JH&-%xJ!iQds44PYRJ3_^n$LJ>pJForXNkt9YjT5F0aL8Xjg zEaT94CNLq!hsMR&7!#$Tk|>UeOhRQ$W(rf$G^R6ynIvX0Ticp52hF9Nc~qeJR8mDX zTEK#+j;c^)%#Vtg7b=g1EaEV9I7e_KN1>xRhGRJn9nT4z$VupA7PEw zRk1QwgqFv$SQ<-0i{lhda4R=uFPyY|bJ5T+ZYClwlX3wXEYp)}xEqz(zKq zO|daH#KmZRT*A6o8@iOsxST7{m0ZQuT!XIVIx}OJlkcZI2Ji? zJ9fph>KU7^dTSdG5gSd_Q$^X z1bxb9e9jl>OTOZ3zCqve9pCc<`jMabnP1Sa{KoJ6f&SzGfAKf^hkvQzAUedMI2bh{ zImM|?vkpYMGn{GFa+Yhmj#bz7T;C0x)zAqy+TO^GGY5pe3znO&i+Mj`nn*Bb|sNo&*v}BAFCY zNh6(*obEKII>pIOa-v0Nx?lpj(v9x)peMaTY;XF|mwsfBNfz1UkV_u<>mwC)*0Sj5gA}{m;&-Xmf^&HRk`CPzaF61IE<`ORDGA`!|u4D;I zLk*U(oE5BO6{}gpTGp}7YrV$nS>+9^@N#ct6Pww>R<7b|uHjm)<9cr3MsDI}ZsAt8 zaT~XD2Y0fa9qjOS-^JbB!@X?tecaCjJjg>l%p*L?V?53iJjqi$%`?Y0c$S^);yHG+ zhrR4$pZ9u?cl&vEd8c3CMPA}%_H%$&c$L?9oi})sw?gdOyu-V^$NPN1hkV4x9OMv( ze9)ipDWCBZ)$)t{&>CUh1tr>Z^XrP^Pk!tsLblFXY@HC&*WS4bVUh(qIkIPz}>? zjnGJq(rAs*SQV&HMJiSmB`Q^!$~8_EsyxnD1{J}0P0&P5(qvU>il%CsrfY_(Rij$f Osa_3gRFh_Emi_~I!0bK% diff --git a/graphics/battle_anims/backgrounds/new/trick_room.bin b/graphics/battle_anims/backgrounds/new/trick_room.bin index 46060d16872da113592443a101f7bdd0175e4848..197f57922a016298c3dc72a88ef4bdd23d6c7fb7 100644 GIT binary patch literal 844 zcmWlUXLwU(07l;=y-h+>zNGDKIw(0`dVvU6t)nX92#7Mpf{F}Lac_$o7qJQ!91LY6 zqAYRCt`?Q$9#wGRR-6b9h7+{>de4vZJm-1ixsVhfNQgYLj+}hLI9|_)Oq4cq3&@KR z^9q$}i=tkLh!-Pa$XC?y@?^4c)g~ySn0N`UoKljMxLz5iTy6!bq|&SKiYaPGiJUSo zZb~P~xUE~{xu}XrCgevm`^)VK`HtUEZz6sy6U&-tyJkI9=aUmCRF_(x-xs1!XLR`sJ)H6z4%{5%hb>ez%;6_G^o4A=g6=E4(UR<8|KPP4O0Q^A0T$-sL?xo7mi_g7^7Ai55Q0;e5o$Y~d5} zDWCB$a-tP!TS=mwt)jg3XM3BX8f)ie I6KQq(A2#90!T;g6Rzv*sxbkY9lW5ljenVJKnP zwQ$1|3nPdmQj5@ni6TT8uEl$(G`kk>L7JT;SR5wZ>M#qFV$#j}f4As1hwZOhb(8LP z_mtbsj%Yv;L#$Af6RZ7qv}o<$dyJ-VyL&3$lgY2-q`*N+Qjr>+G^8aR>B&GwGLe}q zWF;Hf$w5wXk()f^B_H`IKtT#om?9LV7{w_;NlH=yOIp#IHngQ3?dd>AI?r62tn zz(Co`AUT5>!cc}WoDqy<6r&l#SjI7)2~1=XlbOO)rZJrv%#@wXVm5P_D{UV0g$r27 zA{MiRr7UAPD_F@YR>&DV<%2_v0Lb54}00iehzSuLmcJ^ zM>)oEPH>V_oaPKJ&T>w8o(sZ@ToSstZ14(KxyE&FaFbiy<_=E%F87GjuW_FTVh?#F zbn1_JV&qeU&vFsuVelAcx~1E@jN5965qn9LZ70(Nu5@$0EmZJhPdD9pVJp zcp@j^p4`xBaSEp*mCWTd<{?$gr<&6-3#efswPNH9&SVj1VV%u6oGYW}VV}uEz)a|1VW6Q-S;xrJNBk=y9tb~>@|;LgVCySN*<`v{sUgLG%z*$=vI7e6u}#Uni2Vh zA%0~KWy3Z9KYQ6{Dy$KH<9AQrANWW4Q-}UyKaOvJzxl`1{p*<~qDDRHRT;)opGK%e zYLxaeMy;_LtsbvGMv2vg{958PUUUFk{hA<}sN*zA$BRzTFv&VGpef>{YRIIiKV35j iW-4w_RI@Z&1M22TX`<$8o?7ip(#hgXQ9EA?B>W!;y3VWs literal 896 zcmY+?V{jc&7=Ym>xoK?s{bJR&ZCj~rBXv`^scqY~ackRc>ZW$jZg1~2^Udt+p0m&U zWA|8Ki4_Jl)}+TqUA22#?6AiHN1SlR1y|f~$3x%K_6>OAg*QI<;-{Yc2_TRlf(ZeH zP{If&f=Hr>CWctzh$jOX$wX$dkd3nETGXZvb*V>v8qknNG^Pm&YMRoF=Cq(C zt!S;@ZbMtzrSa|QKu0>6);iOLu5_b2J?Kd0$E~s;LkxN|W3Rk(tb#8D|FWgdAo7>#s zE=JSbO{}&qz`8oEN-Qg;&bH<_&LoN2=KydCvz`_{b+dEBl47 zeAE4Re&{}hpZrq(xAN)4LM+8fQZb0Nq!$~p6(e?HFAidVb0EW@`V`4IxVhu$fY%EknW{cfow_7eD2ST~QHa7s zQbZI5q9`VcQ-YF|5~V3aG-X9O%2R=gB8Ey-rizHADsfa3@p!0C4N;R?)TWN8OFa^( zFB;I0Ml=>pXi77hix#w`6|F@Z5@}02(Vh-;q?71O7rN3-bf*VB=_PuTL?8N!e)MMm z1H~W)GlZdH7{eLCNHL1hjA5)8$9N`?EG9CE$xIPbnZ|Txh!nicWR{rC9Og1l%x3`$ zStJ&-grzJK%UQunR*BWDVJ+*#dN#0;O(K=eY+|;L%JfvkN z;5^8oP!4m%x~<7DN5wIYbApo|PT5Fne8HzVBhGS;^IQPGOd1!tBrX%+3Rgq8#&sL3 zup8(mx46w6BJOgJ_(aEjpVJ@210M3om+)9T;VI8}?%)M4Ne{$WBR{Wr%^UQVcf98V s`bY+!_)PK_8*NQe>Q}|N%r^($`N2;cWsTRD{)^xI;cvjY1OJfz13JB^$^ZZW literal 896 zcmbWvV{aG$6h`69w*AbuZQHhO+qP|XHagq3%^$IL$+C7?vTivaZf^3P6Hd7QBz%w; zK}3;67DZIiL>EI$vBVZfT=B%0KthQmmPAs?B$q-;sic+$X{D211{r0NSr%DklU)uu z<&s+-dF7K|0Rb=6Z}0}VCO zSQAY((_9NJwbEJ}ZMD;02OV|NSr=V((_Ife_0n4(ef87d00Rv&*bqYvGu#LxjWXI8 zV~sQ31QSg%*%VVvGu;d`%`)2@bImi~0t+p&*b+-Ev)l?Rt+Lu0Ypt{11{-a%*%n)E z6A)&$+hM0&Vcv%<@3zNY`|Nk%pZ$XlIqZm|jtLARz;P#>bjoRGoOSMx#q%z>=#tB> zxcb8jc7wSV>I-z;4L3tIZn^D_yY9K~frr2Ce|AFNM;?3Psb`*h;iXqzd*f{w%wLsv YK~^yDeeltze{zE>pMCMwx4(Md0VT#JbN~PV diff --git a/graphics/battle_anims/backgrounds/new/waterfall.bin b/graphics/battle_anims/backgrounds/new/waterfall.bin index 076beeff2fe1ba44277bad014102fbcc7c3180bc..0fbe00ac638522361e182ee6aa56cbdf876bec29 100644 GIT binary patch literal 2128 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 Hx;NlI69yLt diff --git a/graphics/battle_anims/backgrounds/new/zmove_activate.bin b/graphics/battle_anims/backgrounds/new/zmove_activate.bin index 45bca27ec42a025931df57a2b2f6d9f6995de56c..b089a822d3e50c5ffda895b665d2b2eecc041067 100644 GIT binary patch literal 520 zcmYL^$5#^p7zckJn_y6*8?a*;B_g6I*ek3JtQfKPwPQ!@l?bT8f{48#V(-E3jX#Nt zXXQN(ygAHV$BjEGGTN<+e_h#Ge>>F>Op!SRoAaFjSwT|imQ-G-y`arWqdRU7ddkA| z!tITVMMy^(^r0{Pu>K5SAcJJeWH3V*iiQEh89^Y6C?kE#CN>JoQO0O;(HO>($2c^e zdP%KJV$RZYtB`jqbrMWEk zEGAn)uq?z%R>>)g#>8sYu$FaVJsa4_Cb5|W)I~F-}bW4xBVOt z2RX!HD&p7?DyfVf6~{Qv2~H+tr#OwB;jB2vc`i`ZCa1#UT%;P+P|GDQqbnq+<0`tw zb#73P-K2qAGv0#`pL|JQ`fWJb@qM- zdvMaE{r3+)kS<+~kl$)Xw`!@aPMGTc^>RJ+HPA3gwC-px<ZP|n`s$~@0R|dmupx#TX1EbX$~8(}WVC!^6jW0f znkr+1af%chZ-R*?nQV%wrllk$O%F*bF~iJ|l0?!hv&}KrJo7EE&?1X1vD7llBP*=5 z%4%z@jjgjjw!uc5Y_`SL$Tp=)6Wi^u(=NM%J@!V*?6Y6F0}h7#amZmu9CgfbC!BQ3 zX=j{u&UqJHbjf8`f~%2ht_L?#+fBFJcE?@!-1opkk39CoQ_np2!b`8b_QqT9ypMhG dF{MJKibU1+$!A|ezJ{hUOy7JD?+-s?zW_AAo!0;W diff --git a/graphics/battle_anims/backgrounds/new/zmove_mountain.bin b/graphics/battle_anims/backgrounds/new/zmove_mountain.bin index 86ad39727be021279c7f1520b2ef376f464e3619..74f6bdbae5098967cea09a85266fde638285afcd 100644 GIT binary patch literal 760 zcmWO4g?|)u9LM3$?{>HCw!vAd-T?(E}vJ0F-Vp zXhf+IN@IY95`uIcNUEUw7oOJ>2t`N^4-t3?`f!m%5sm!B5K9~?LQ&!gpahDMNO6=z z2}+WTH-%D^mMeqGQjYR~j8rO+hSI4>B`V`Gs6r-La^7qnpsM`UP<3ihlLt`_wWv)U zRF`_xrvWaPhiFJpPK{_x6PlujX~rWo$NMOc@p#ZZfm+a#RTxYuA)RkxGMjm>W=jcuk)RSI3&kML0d5M>KC0Ms0>{|PK(}!14UtXgh{m}ph zGKj$>zs`_w<_R~HH^iH~#oG)MA%-)8kzy318N*l)`HW+HUd;*O9VRk~$@y|qcvo&J z?}_*MfDf4_2Bb}A1|Nx!naM0>i#g0?9`j>Zz(U&l8)vRGH>+r4T3pP;y%R<_(*vKZi&1ef-DPS9s+u6a+VD1#(*YFMPcCnj1 z9`>@2{kQ|-Am8#G--{nO#9@AfpF+7m^9#R*m~ez6X}|G%Do2@djN@u}Lj1u=PVr|9 zr#T~cR%g$}ah?m|VPVHbaf!=Z;i?F8jqCgsa_Kj?$t`Y+JKW`O{uxn_^Dp7$RbwM;^j|h6TlLbSj-ZwxGc#^SV@ag wMzWCvSiuzKccR{%m4rY literal 896 zcmaiu18|*D5Juw{+dP}RIH_&hOl`YO>Nd4)rncSGw%ydW?cV%(lX>lQrgLWY?(V(k zn`??0=2&2+=(AHq4`Twfz zXio<^(uvM=A)W-f(v9x)_^%m9PkPatKJ+D#e)MMm0~y3%hA@<23}-}o#z;mnnlX%3 zjAOiF0u!0UWTr5cc>Oe{GlQATVm3+4VJ`ES&jJ>zghk3(Y{U|ls%aU^S;0zHv053a ztYIzdv~E2c*vKX}vxTjinM^X<*v<~cPIj@IJ?v#4`#E5+(=yWPK@Mr#!yMr#$2iUj zjgy?>G-o)=InHx|i(E3YFLQ;f+MGg){u|>;V$>M&jTJR9;v&>JmINP zg7F{z?4R+R7rf*ZuX)2;-YM%nANa^8KJ$gIeETcsJ3sho*!{vpOvOxLu2l=M6f4n* zwV1@FZf(R?>?8?$aS%swQe7&};-WfNaT9m(5Kr+EU8J}8h_CpGzXXVh1WJ$~BEb?O ZdI^;@KZ^I=*%ZQXHiIy0NmEYoV0a*Y5 diff --git a/graphics/battle_anims/backgrounds/spacial_rend_opponent.bin b/graphics/battle_anims/backgrounds/spacial_rend_opponent.bin index 44fab7fee209711e834a46e3c57c69bf169bee9e..e6227db9c9d8e449155452362f88ca325272b8be 100644 GIT binary patch literal 1000 zcmWO4heODD0LJ0BK~$(v*`Js1k5E#Ptz=X7UPYnoO&K|E@9hR|@4a#R+}?NG-h1D1 zd!Kv$h9_lvoD@SWam1qrG$esWs4}igIv^;Jn|_(1tCA=g&j-mQu=4Stt$T7>_0}k&$5%@spXtR2`g# zrZa(x9Q(^|iqJ->IIgQiN8Jx*k zoQ=-mT+ZWsbO9H#i;K|3T*9U7Mtj)H-moWVcesqpxdL6uu5cAsqieX9>$o1>z>VC* z&FB_x!y5cUV{3-|K?50df_4^#gLkD|vo$m2YLp5!T> z<{9)X&+$Ajpci?GmwAPlS2@ICUQ>(?heP3Y-av2i7H{(odYAWjpAXQ7e8k6mf(_lp`Fa=x8_+^dmpJV=I+jR&i`wp)cPLIbx%3Z`7UrTxwi}5$9?5~?(YE} zC=c>r7r9s-;t~(_P(>xtFc0?#d89{qU^H4DpE+*w|J|!S#?ouv?;2$HbmPUq+@J@?P34` literal 896 zcmW-dbyyZ=97QLnAYdT^_PO|b1@uD%6a!QQ6$9)pP>`?_0RwE;p_>b9vt743UFfEp zZn~KZW7DM_3v(O#+`sR0&b{UE!kh9`pdvo_QVBo&37|4ns7f`e6G#n$s7Wv(gc52Y z7HqW$vf2b%9qLk#`ZNGU7!5HTjR+@#NE*`w4^cEFnr6fhOB`_)YcbZGXlp@~c`Tlm zw4ya_NFb56w4*&qbRd}&I?{>Gq|$}1bfY_Iq?2xG)`On(qBp75hraZqf7yls3}g_4 z8NyJ8F`N-(kjY3!kwrG6$sw0K^2xV6%e5REL$+nvSjI7)2~1=XlbOO)rZJrYW>82G z#mr^OVs9AJ0QP%p*L?V?53iJjqimWf@QN49j_z z=XjnMSiwqGvC3B33R}$@UgRZ~+gjGKo(*hd6Pww>%e=y?yvFOi!JE9r+q}cOyvO@& zWgFYsZrg0DeZUTO@*yAH=YPy6>|!^c@)>*B%jbN-KKAn^UvYqge9bo;;xI=zT9zYr z*p6|WZ~2bz`GFIh`D zzlryF@een+$t`Ykhr9gCe>|Xa@{+g8tAZ-ZN4}~gKlv*_0nXp~xyq`ds;Z{y3RDdR zsiuMzqEOXRZPig-)l+>n5R$^wP$s8F3Ri?873m^exNEE?@+eAS?%w}R6|H89QLN(B zTrCu@mTINeYNG@ts;%0oy^_>H$x2a*OLiUANu8CdE=qJ=)lJ=%rgZgCPxVr7^-*8- zQ-2N6Kn>Dh4be~y({PPYhBB4uGTcawQkJqcS~<$qJ%c>uYmCNfoW^T{CTfxFwuX}0F5*cG`#SE2$}s{a90+wKkk diff --git a/graphics/battle_anims/backgrounds/spacial_rend_player.bin b/graphics/battle_anims/backgrounds/spacial_rend_player.bin index 7b479c88d672f56c52b5a2633d6b41aec8cdedca..cae5112e003a1b2d5924c329d59bd2231481a186 100644 GIT binary patch literal 996 zcmWO41!ENi7>3bz$>>XO+v?$fOooC@X43W@LoYBP~)RB~+U_)TJJ(PXii~K#gcj6PluC zG^YjGD2JA`qBUwmTiO94+C|%F6KWl;qGjZSOnW*IC`m^;(V6rvbfudLyQ3cTq!+zW zA9CqS9?GYHe)J0!M1JH&-%xJ!iQds44PYRJ3_^n$LJ>pJForXNkt9YjT5F0aL8Xjg zEaT94CNLq!hsMR&7!#$Tk|>UeOhRQ$W(rf$G^R6ynIvX0Ticp52hF9Nc~qeJR8mDX zTEK#+j;c^)%#Vtg7b=g1EaEV9I7e_KN1>xRhGRJn9nT4z$VupA7PEw zRk1QwgqFv$SQ<-0i{lhda4R=uFPyY|bJ5T+ZYClwlX3wXEYp)}xEqz(zKq zO|daH#KmZRT*A6o8@iOsxST7{m0ZQuT!XIVIx}OJlkcZI2Ji? zJ9fph>KU7^dTSdG5gSd_Q$^X z1bxb9e9jl>OTOZ3zCqve9pCc<`jMabnP1Sa{KoJ6f&SzGfAKf^hkvQzAUedMI2bh{ zImM|?vkpYMGn{GFa+Yhmj#bz7T;C0x)zAqy+TO^GGY5pe3znO&i+Mj`nn*Bb|sNo&*v}BAFCY zNh6(*obEKII>pIOa-v0Nx?lpj(v9x)peMaTY;XF|mwsfBNfz1UkV_u<>mwC)*0Sj5gA}{m;&-Xmf^&HRk`CPzaF61IE<`ORDGA`!|u4D;I zLk*U(oE5BO6{}gpTGp}7YrV$nS>+9^@N#ct6Pww>R<7b|uHjm)<9cr3MsDI}ZsAt8 zaT~XD2Y0fa9qjOS-^JbB!@X?tecaCjJjg>l%p*L?V?53iJjqi$%`?Y0c$S^);yHG+ zhrR4$pZ9u?cl&vEd8c3CMPA}%_H%$&c$L?9oi})sw?gdOyu-V^$NPN1hkV4x9OMv( ze9)ipDWCBZ)$)t{&>CUh1tr>Z^XrP^Pk!tsLblFXY@HC&*WS4bVUh(qIkIPz}>? zjnGJq(rAs*SQV&HMJiSmB`Q^!$~8_EsyxnD1{J}0P0&P5(qvU>il%CsrfY_(Rij$f Osa_3gRFh_Emi_~I!0bK% From 799852ea772fa605ee3bc82e1431484592829070 Mon Sep 17 00:00:00 2001 From: Blackforest92 Date: Sat, 30 Oct 2021 17:00:55 +0700 Subject: [PATCH 07/26] Introduce alternate Steel Beam --- data/battle_anim_scripts.s | 87 +++++++++++-------- .../backgrounds/new/steel_beam_bg.pal | 19 ++++ .../battle_anims/sprites/new/steel_beam.pal | 19 ++++ include/constants/battle_anim.h | 3 + include/graphics.h | 3 +- src/battle_anim.c | 4 + src/battle_anim_effects_1.c | 39 +++++++++ src/graphics.c | 2 + 8 files changed, 139 insertions(+), 37 deletions(-) create mode 100644 graphics/battle_anims/backgrounds/new/steel_beam_bg.pal create mode 100644 graphics/battle_anims/sprites/new/steel_beam.pal diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 994bc5cc1..ada08afc5 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -13940,47 +13940,62 @@ Move_ETERNA_BEAM:: goto Move_HYPER_BEAM Move_STEEL_BEAM:: + loadspritegfx ANIM_TAG_CLAW_SLASH + loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 + createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 + delay 48 loadspritegfx ANIM_TAG_ELECTRIC_ORBS loadspritegfx ANIM_TAG_GUST - loadspritegfx ANIM_TAG_SPIKES - launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_BG 0x0 0x0 0x10 0x6B59 @To gray launchtask AnimTask_ElectricChargingParticles 0x2 0x4 0x0 0x14 0x0 0x2 - playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER - delay 0x14 - loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 0x9, 15 - launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_ATTACKER 0x0 0x4 72 0x1 - call SteelBeamShards - call SteelBeamShards - launchtemplate gSlideMonToOffsetSpriteTemplate 0x2 0x5 ANIM_TARGET, -30, 0x0 TRUE 145 - call SteelBeamShards - call SteelBeamShards - call SteelBeamShards - call SteelBeamShards - call SteelBeamShards - call SteelBeamShards - call SteelBeamShards - call SteelBeamShards - call SteelBeamShards - call SteelBeamShards - call SteelBeamShards - call SteelBeamShards - call SteelBeamShards - call SteelBeamShards - call SteelBeamShards - call SteelBeamShards - waitforvisualfinish - launchtemplate gSlideMonToOriginalPosSpriteTemplate 0x2 0x3 ANIM_TARGET 0x0 0x6 - launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_BG 0x1 0xE 0x0 0x6B59 @From gray + loadspritegfx ANIM_TAG_STEEL_BEAM + call SetSteelBeamBackground + panse_1B SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + createvisualtask AnimTask_CreateSmallSteelBeamOrbs, 5 + createsprite gSteelBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0 + delay 4 + createsprite gSteelBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1 + delay 4 + createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 1, 0, 10, RGB(24, 24, 48) + createsprite gSteelBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 2 + delay 4 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 65, 1 + createsprite gSteelBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 3 + delay 4 + createsprite gSteelBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 4 + delay 4 + createsprite gSteelBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 5 + delay 4 + createsprite gSteelBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 6 + delay 4 + call SteelBeam_Continuity + call SteelBeam_Continuity waitforvisualfinish + createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 1, 10, 0, RGB(24, 24, 48) + call UnsetHighSpeedBg end -SteelBeamShards: - launchtemplate gSteelBeamSpikeShardTemplate 0x80, 0x5 0xf 0xf 0x14 0x0 0x0 - launchtemplate gSteelBeamSpikeShardTemplate 0x80, 0x5 0xf 0xf 0x14 0xa 0x5 - launchtemplate gSteelBeamSpikeShardTemplate 0x80, 0x5 0xf 0xf 0x14 0xfff6 0xfffb - delay 0x2 - launchtemplate gSteelBeamSpikeShardTemplate 0x80, 0x5 0xf 0xf 0x14 0x14 0xa - launchtemplate gSteelBeamSpikeShardTemplate 0x80, 0x5 0xf 0xf 0x14 0xffec 0xfff6 - delay 0x2 +SteelBeam_Continuity: + createsprite gSteelBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0 + delay 4 + createsprite gSteelBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1 + delay 4 + createsprite gSteelBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 2 + delay 4 + createsprite gSteelBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 3 + delay 4 + createsprite gSteelBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 4 + delay 4 + createsprite gSteelBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 5 + delay 4 + createsprite gSteelBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 6 + delay 4 + return +SetSteelBeamBackground: + createvisualtask AnimTask_GetAttackerSide, 2 + jumprettrue SetSteelBeamBgPlayer + fadetobg BG_STEEL_BEAM_OPPONENT + goto SetHighSpeedBgFade +SetSteelBeamBgPlayer: + fadetobg BG_STEEL_BEAM_PLAYER Move_EXPANDING_FORCE:: end @to do: diff --git a/graphics/battle_anims/backgrounds/new/steel_beam_bg.pal b/graphics/battle_anims/backgrounds/new/steel_beam_bg.pal new file mode 100644 index 000000000..428e564c2 --- /dev/null +++ b/graphics/battle_anims/backgrounds/new/steel_beam_bg.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +184 192 224 +168 176 208 +144 152 192 +112 120 168 +96 104 160 +88 96 144 +80 88 136 +72 80 120 +64 72 112 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/sprites/new/steel_beam.pal b/graphics/battle_anims/sprites/new/steel_beam.pal new file mode 100644 index 000000000..f9448fcdd --- /dev/null +++ b/graphics/battle_anims/sprites/new/steel_beam.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +112 120 208 +128 136 216 +144 152 224 +160 168 232 +176 184 240 +192 200 248 +208 216 248 +248 248 248 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +248 192 216 +248 248 168 +0 0 0 diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 7fd515bdf..e67e63e5e 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -394,6 +394,7 @@ #define ANIM_TAG_ALPHA_SYMBOL (ANIM_SPRITES_START + 382) #define ANIM_TAG_OMEGA_SYMBOL (ANIM_SPRITES_START + 383) #define ANIM_TAG_PRIMAL_PARTICLES (ANIM_SPRITES_START + 384) +#define ANIM_TAG_STEEL_BEAM (ANIM_SPRITES_START + 385) // battlers #define ANIM_ATTACKER 0 @@ -495,6 +496,8 @@ #define BG_HYPER_BEAM 75 #define BG_DYNAMAX_CANNON 76 #define BG_AURA_SPHERE 77 +#define BG_STEEL_BEAM_OPPONENT 78 +#define BG_STEEL_BEAM_PLAYER 79 // table ids for general animations (gBattleAnims_General) #define B_ANIM_CASTFORM_CHANGE 0 diff --git a/include/graphics.h b/include/graphics.h index 5c2150f4a..e99dc0979 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -5089,7 +5089,8 @@ extern const u32 gBattleAnimBgTilemap_ZMoveActivate[]; extern const u32 gBattleAnimBgImage_ZMoveMountain[]; extern const u32 gBattleAnimBgPalette_ZMoveMountain[]; extern const u32 gBattleAnimBgTilemap_ZMoveMountain[]; - +extern const u32 gBattleAnimSpritePal_SteelBeam[]; +extern const u32 gBattleAnimBgPalette_SteelBeam[]; extern const u32 gMetalShineGfx[]; extern const u32 gMetalShinePalette[]; diff --git a/src/battle_anim.c b/src/battle_anim.c index 551979e70..1a41a8d32 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1567,6 +1567,7 @@ const struct CompressedSpriteSheet gBattleAnimPicTable[] = {gBattleAnimSpriteGfx_AlphaSymbol, 0x0200, ANIM_TAG_ALPHA_SYMBOL}, {gBattleAnimSpriteGfx_OmegaSymbol, 0x0200, ANIM_TAG_OMEGA_SYMBOL}, {gBattleAnimSpriteGfx_PrimalParticles, 0x0180, ANIM_TAG_PRIMAL_PARTICLES}, + {gBattleAnimSpriteGfx_Orbs, 0x0180, ANIM_TAG_STEEL_BEAM}, }; const struct CompressedSpritePalette gBattleAnimPaletteTable[] = @@ -2017,6 +2018,7 @@ const struct CompressedSpritePalette gBattleAnimPaletteTable[] = {gBattleAnimSpritePal_AlphaSymbol, ANIM_TAG_ALPHA_SYMBOL}, {gBattleAnimSpritePal_OmegaSymbol, ANIM_TAG_OMEGA_SYMBOL}, {gBattleAnimSpritePal_PrimalParticles, ANIM_TAG_PRIMAL_PARTICLES}, + {gBattleAnimSpritePal_SteelBeam, ANIM_TAG_STEEL_BEAM}, }; const struct BattleAnimBackground gBattleAnimBackgroundTable[] = @@ -2100,6 +2102,8 @@ const struct BattleAnimBackground gBattleAnimBackgroundTable[] = [BG_HYPER_BEAM] = {gBattleAnimBgImage_HydroCannon, gBattleAnimBgPalette_HyperBeam, gBattleAnimBgTilemap_HydroCannon}, [BG_DYNAMAX_CANNON] = {gBattleAnimBgImage_HydroCannon, gBattleAnimBgPalette_DynamaxCannon, gBattleAnimBgTilemap_HydroCannon}, [BG_AURA_SPHERE] = {gBattleAnimBgImage_FocusBlast, gBattleAnimBgPalette_AuraSphere, gBattleAnimBgTilemap_FocusBlast}, + [BG_STEEL_BEAM_OPPONENT] = {gBattleAnimBgImage_Highspeed, gBattleAnimBgPalette_SteelBeam, gBattleAnimBgTilemap_HighspeedOpponent}, + [BG_STEEL_BEAM_PLAYER] = {gBattleAnimBgImage_Highspeed, gBattleAnimBgPalette_SteelBeam, gBattleAnimBgTilemap_HighspeedPlayer}, }; static void (* const sScriptCmdTable[])(void) = diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index 24b873ac7..3498346f2 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -6803,3 +6803,42 @@ void AnimTask_CompressTargetHorizontally(u8 taskId) PrepareAffineAnimInTaskData(task, spriteId, sCompressTargetHorizontallyAffineAnimCmds); task->func = AnimTask_CompressTargetStep; } + +const struct SpriteTemplate gSteelBeamBigOrbSpriteTemplate = +{ + .tileTag = ANIM_TAG_STEEL_BEAM, + .paletteTag = ANIM_TAG_STEEL_BEAM, + .oam = &gOamData_AffineOff_ObjNormal_8x8, + .anims = gSolarbeamBigOrbAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = AnimSolarbeamBigOrb, +}; + +const struct SpriteTemplate gSteelBeamSmallOrbSpriteTemplate = +{ + .tileTag = ANIM_TAG_STEEL_BEAM, + .paletteTag = ANIM_TAG_STEEL_BEAM, + .oam = &gOamData_AffineOff_ObjNormal_8x8, + .anims = gSolarbeamSmallOrbAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = AnimSolarbeamSmallOrb, +}; + +void AnimTask_CreateSmallSteelBeamOrbs(u8 taskId) +{ + if (--gTasks[taskId].data[0] == -1) + { + gTasks[taskId].data[1]++; + gTasks[taskId].data[0] = 6; + gBattleAnimArgs[0] = 15; + gBattleAnimArgs[1] = 0; + gBattleAnimArgs[2] = 80; + gBattleAnimArgs[3] = 0; + CreateSpriteAndAnimate(&gSteelBeamSmallOrbSpriteTemplate, 0, 0, GetBattlerSpriteSubpriority(gBattleAnimTarget) + 1); + } + + if (gTasks[taskId].data[1] == 15) + DestroyAnimVisualTask(taskId); +} diff --git a/src/graphics.c b/src/graphics.c index 4cbc4b334..2d0ff9a5c 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1591,6 +1591,8 @@ const u32 gBattleAnimBgImage_ZMoveMountain[] = INCBIN_U32("graphics/battle_anims const u32 gBattleAnimBgPalette_ZMoveMountain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/zmove_mountain.gbapal.lz"); const u32 gBattleAnimBgTilemap_ZMoveMountain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/zmove_mountain.bin"); +const u32 gBattleAnimSpritePal_SteelBeam[] = INCBIN_U32("graphics/battle_anims/sprites/new/steel_beam.gbapal.lz"); +const u32 gBattleAnimBgPalette_SteelBeam[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/steel_beam_bg.gbapal.lz"); // misc const u32 gUnknown_E6BC04[] = INCBIN_U32("graphics/unknown/unknown_E6BC04.bin.lz"); From 3e364b4870603efca32bc9a1bd48475b0ae89a9b Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Sat, 30 Oct 2021 09:16:33 -0400 Subject: [PATCH 08/26] switchin abilities activate after wandering spirit --- data/battle_scripts_1.s | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 146c05c23..1211f9da9 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -8001,6 +8001,8 @@ BattleScript_WanderingSpiritActivates:: .endif printstring STRINGID_SWAPPEDABILITIES waitmessage B_WAIT_TIME_LONG + switchinabilities BS_ATTACKER + switchinabilities BS_TARGET return BattleScript_TargetsStatWasMaxedOut:: From a461823cbf557706e5a8767e2b4f3279532e7300 Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Sat, 30 Oct 2021 09:48:23 -0400 Subject: [PATCH 09/26] weather ball anim checks utility umbrella --- src/battle_anim_effects_3.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index 11e350535..6ec577388 100755 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -22,6 +22,7 @@ #include "constants/rgb.h" #include "constants/songs.h" #include "constants/weather.h" +#include "constants/hold_effects.h" extern const struct SpriteTemplate gThoughtBubbleSpriteTemplate; @@ -5526,10 +5527,12 @@ static void AnimRecycle_Step(struct Sprite *sprite) void AnimTask_GetWeather(u8 taskId) { + bool32 utilityUmbrellaAffected = GetBattlerHoldEffect(gBattleAnimAttacker, TRUE) == HOLD_EFFECT_UTILITY_UMBRELLA; + gBattleAnimArgs[ARG_RET_ID] = ANIM_WEATHER_NONE; - if (gWeatherMoveAnim & WEATHER_SUN_ANY) + if (gWeatherMoveAnim & WEATHER_SUN_ANY && !utilityUmbrellaAffected) gBattleAnimArgs[ARG_RET_ID] = ANIM_WEATHER_SUN; - else if (gWeatherMoveAnim & WEATHER_RAIN_ANY) + else if (gWeatherMoveAnim & WEATHER_RAIN_ANY && !utilityUmbrellaAffected) gBattleAnimArgs[ARG_RET_ID] = ANIM_WEATHER_RAIN; else if (gWeatherMoveAnim & WEATHER_SANDSTORM_ANY) gBattleAnimArgs[ARG_RET_ID] = ANIM_WEATHER_SANDSTORM; From de23b3b04d54caeda416e080f6fe372eda383244 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 13 Oct 2021 21:01:47 -0400 Subject: [PATCH 10/26] New move tilemap bins are easier to edit --- .../battle_anims/backgrounds/dark_void.bin | Bin 1236 -> 2048 bytes .../backgrounds/new/aeroblast_map.bin | Bin 804 -> 896 bytes .../backgrounds/new/blackhole_eclipse.bin | Bin 892 -> 896 bytes .../backgrounds/new/bloom_doom.bin | Bin 564 -> 896 bytes .../backgrounds/new/bolt_strike.bin | Bin 780 -> 896 bytes .../backgrounds/new/clangorous_soulblaze.bin | Bin 700 -> 2048 bytes .../backgrounds/new/dark_void.bin | Bin 1236 -> 2048 bytes .../backgrounds/new/electric_terrain.bin | Bin 2020 -> 4096 bytes .../battle_anims/backgrounds/new/fire1.bin | Bin 684 -> 896 bytes .../backgrounds/new/focus_blast.bin | Bin 952 -> 896 bytes .../backgrounds/new/giga_impact_opponent.bin | Bin 704 -> 896 bytes .../backgrounds/new/giga_impact_player.bin | Bin 744 -> 896 bytes .../backgrounds/new/grassy_terrain.bin | Bin 2244 -> 4096 bytes .../backgrounds/new/high_speed.bin | Bin 496 -> 896 bytes .../backgrounds/new/hydro_cannon.bin | Bin 880 -> 4096 bytes .../backgrounds/new/hydro_pump.bin | Bin 224 -> 896 bytes .../backgrounds/new/inferno_overdrive.bin | Bin 556 -> 896 bytes .../backgrounds/new/leaf_storm.bin | Bin 924 -> 896 bytes .../backgrounds/new/malicious_moonsault.bin | Bin 544 -> 896 bytes .../backgrounds/new/max_lightning.bin | Bin 744 -> 896 bytes .../backgrounds/new/misty_terrain.bin | Bin 2180 -> 4096 bytes .../backgrounds/new/neverending_nightmare.bin | Bin 744 -> 896 bytes .../backgrounds/new/nightmare.bin | Bin 756 -> 896 bytes .../backgrounds/new/psychic_terrain.bin | Bin 1904 -> 4096 bytes .../backgrounds/new/rock_wrecker.bin | Bin 676 -> 896 bytes .../backgrounds/new/shattered_psyche.bin | Bin 808 -> 896 bytes .../battle_anims/backgrounds/new/sky_day.bin | Bin 1052 -> 896 bytes .../backgrounds/new/snuggle_forever.bin | Bin 988 -> 896 bytes .../new/soulstealing_7star_strike.bin | Bin 968 -> 896 bytes .../backgrounds/new/spacial_rend_opponent.bin | Bin 1000 -> 896 bytes .../backgrounds/new/spacial_rend_player.bin | Bin 996 -> 896 bytes .../backgrounds/new/trick_room.bin | Bin 844 -> 896 bytes .../backgrounds/new/twinkle_tackle.bin | Bin 784 -> 896 bytes .../backgrounds/new/water_pulse.bin | Bin 600 -> 896 bytes .../backgrounds/new/waterfall.bin | Bin 2128 -> 2048 bytes .../backgrounds/new/zmove_activate.bin | Bin 520 -> 896 bytes .../backgrounds/new/zmove_mountain.bin | Bin 760 -> 896 bytes .../backgrounds/spacial_rend_opponent.bin | Bin 1000 -> 896 bytes .../backgrounds/spacial_rend_player.bin | Bin 996 -> 896 bytes 39 files changed, 0 insertions(+), 0 deletions(-) diff --git a/graphics/battle_anims/backgrounds/dark_void.bin b/graphics/battle_anims/backgrounds/dark_void.bin index 922b72bc74d7f5c773331b1af537d54c2e939038..97b879f01ba8ebc08c92d30497c894a1a7b186c8 100644 GIT binary patch literal 2048 zcmeH`W0Rg)6h-HaZF8-pgO1IPZM$RJwr!_l+qP|IY}=lBlA3=pUAJznefB-)!?{&E zL<~a2Bo?uWLtNq!p9CZ%5s3poNpO>rjO3&sC8Q3JlqG_4l&1m}sYGR}P?c&_rv^2t zMQ!R(mwMEv0S#$HW17&EW;CY-Eont-+7L-w+R>g4bfgoV=|We!(VZUjq!+#ELtpyQ zp8*VH5Q7=QP=+y_5sYLMqZz|k#xb4=Ok@(1nZi`2F`XIAWEQiT!(8Sup9L&r5sO*E zQkJot6|7_xQNhoISj`&NvMx{|*0X_)Y+^H8*c#N^*#64j!A^Fun?3AhANx7LK@M@4 zBOK)z$2q}CPH~zuoaG$nxxhs(ahWSz$y!A)*)n>*a)9`|{`Lmu&%Cp_gD&w0V? zyuq8i#oN5YyS&Hye87i%#K(NXr+miee8HD|#n*hpw|vL<{J@X=#LxV~ul&aE{K236 z#ozqHYle(rOk)|_IL0-e@l9Yt6Pef~CN-JKO<_t?nc6g_HJ$0rU`8{U*(_!iHJjND zGlx0NWp2aGV_x%_-vSo2kcBN`QHxpJ5|%VXDN9=>V2HATddZh3!g7|kLQq$^Beaj3%_?g&RZ%F&K-tm7Q-1SdMl$xd;q z)12-MXFAK-&T+2uobLh`y2!;YajDB(?h04B$|zU6#JKX6m zce}^E?sLBfJm?`0d&Hw2^SCEG=_yZp#3~?@CWcYb6c+pE<_KH`%=5=p)(_7y5 ij(5H1eINMHM?Ut6PkrWdUj%c}`H#+jbpHRZ`TrM_mOTvs literal 1236 zcmb`DQ*a�EG8%o2G73rS7+FiquMtziyh^wr$(CZQHhOoNf1v=K6Sd&o{d-JM+!# z?1m|k6d)b};-dtFkdRQ6h{PlzDQS|CToEahDJ2RcoK&PHK^oGMP6Z+eOHT$xXCxEK zOct_|4S~r{4irgFa*-S5A&R`@L-{E{K?P#29(hYT|2R-S9deeu#^h5m_z(59}!3<$2!_aU>Fp^PdG-DXcI5eIKOk@(8%oL_F z4NYeTGns{EGl#j%L-Sd{LKdOLEMY0j2rOp>D_IrD@cQJ{tYIy|b%B@w>)C)dvWd-X zq3YH^t8Hv2Vh7sEE_SmA?PVYPIe-pwh{GH~M>)oEPN0*V;xuQ_St#dB$^Ipf`Avw|E=9!@Io4`{)BcMs-jiR)m_6itr*vGtZO@1M=^C>&-EQ_Kx{)da$^UZs9jSxb8`ng_)6>wZ>$5AZ+_vIcvIhkBSb+#@{FqpZ;$ zKhm)_x!GK_9XX`-qSFn04GIeA1^Ja@uEn zwo>kMfr@G!b>0_z(YoZzzT&IaHDC7)-?VP|w(t0^bd-nn#)T*@>76<6rwQk z6rregi&30}6jg$fl%h0cC~Np~l&1m}HCc(uRH3TgrW)0$K~3$|qPE&P)YbFrQJ)6- z){sUtrU^|A-%Rt(X`$Jcw4ya_XiGcV(}9lK>!kV4#787=(1otVhjyboJ?Qz*_oBCE z`_NatHT~$%00uIM!3;^Uxp~G=hB2HGjARs}4L^pljAOj|2~0HnBqpn$!c?X){Xd_; z3}!Nm+00?C;pZ`*1uRs*h{Y^1pC7uEWxD@zR?xweym|6-rS?{-U(FiB=VUGGSg(Eq z8`-3OGh5ioHnvmLwBx_?cd|?Gw3|KbWuM{qb3n~O^>!TMFh@AbF^+SBlbqr-XHrZ! z%Q+G`&jl`WiOYt!jt>prIES(cnxM9CdRheWw;GppQG?xW=B zK(0uoShF2+)RwC|Ay;yio3`Z-c)#9GG)^3YB_<9VDMC@=@gc=1P68#6l9Zw}4xV3< z6G@^Bl1y33Q65PlC9MJ#@l~QSj$4JQ7N7*gttJGiP7P`bAyTPD?WpvKCyhGP73xu+ z2BZrOX+&e1_-INq+~&0K(UMk@9p(YS#Uq2(LK`w^OS{Q3|3TW*A!<4bo#;##9)hk! zvgk&4=pnfe)01BCh~z&?ZypQKM-KL-pM?9v0ErA_5RXTt(_n`11W$$-N^F=EJjK&d zDR_ow8P0RU2%cvoqe8r3{4dJH(PVmQSvg}EOJ>N7V>}a>IMDS^BHM&tA|kHXM9Ec3Uq=8^qnnri_TanGe`v3bx{W z$TlnCBR)nxVLPAFE|~dQUTgxxznI>|d_pU9ZSDzNs;+`h1PtX!tQl*rZR!99RiJGKkG+FbU=1#b*mecYoDOy1*Y9-C6 z?73C6s@idur;-uSY8q6jt~Io#hE!6ume$rZb?RtcG4-^*N&`*ThT2G_u{P1BdJk%x B*LVN` diff --git a/graphics/battle_anims/backgrounds/new/blackhole_eclipse.bin b/graphics/battle_anims/backgrounds/new/blackhole_eclipse.bin index 27457c9a1651b819f7523b850c7d82f049f802ba..54c73addcf4edf828bf0826820bd8a5f61b947db 100644 GIT binary patch literal 896 zcmZ9~Wl$DC6op~26$AwZ1(o+$fP#sFqJpAg2cdupDi#*l-QC^Y-QC^Y-QC@}ANoU` zJ9BqtXP$e{?5q`uNkUSRk(?ByBo(Q##)dT5Vn2%L{pFYG$4kCG@>z0Xi6;2 zXif{Wvn8#FBc9f@p)KubPX{{E$!zXS7rN4o?)0E1z35FJ`qIzj>(2lNGRSB@1~Y`A z3}ZMW7|AF`GlsE@V>}a>$Ry(@Gli*4V>&aK$t-3whq=sSzR?R<$RZZAgrzKFxzUzd z!Ae%Knl-Fto$>40z(zK)nJsK(8{65zPIei;+xUg-VK4jG&jAi5_(L4#2uC@_aZYfO zQ=H}uXF11tE^yJfOI+rPIjzTLQ|TN zh>~bd3tFO9v?dvlX+sKaQ9Ig`N*a+4bfi;Nn2s{&Ocydy7G3E^chrNP^rAP)rVlyv zC7Me=<%YzFwO zlu|}e&PA+ay$%K!a|s*Rs2$2-6PI!sx|}PxlB>|wRB#Q~qU*Sx8@Q3!O$u-37H&ni zv6(I0jw-o>JGqPK-Q1%S_p%k;$2PWeKZy_UpmL+ZLp&@VVF!=$80=KIi^q9FJjqi$ z%`;**dw7=T(x?iu_A1=U^Wp_w)td7JuEAI4vM7lHFS?=OYXSu7~ z&E4I@J>_2R?QHi+agMV4I#*#rp^`KDIdsfPdG1e`86T!a3nBwN(1TPo*c#%Y&i62@ zz{5SlBb_+PqqQNSqR?aHu^#6lkFP2VGxH~Sq9<9CJ;hU9Y)$iY&+trZmS=m8=Q=iz X^7&ri5^JFsd9jx`vee7GoPB2iycXQs diff --git a/graphics/battle_anims/backgrounds/new/bloom_doom.bin b/graphics/battle_anims/backgrounds/new/bloom_doom.bin index 3d27e562722661103aa46eb75c10c7e79aa9e6a6..9ea250a3406697b9016ffbcfeb24a4239fc64e8d 100644 GIT binary patch literal 896 zcmc)FRdbX<5QX6i1Wj=Fhp@Q2ySux)ySux)ySqzpcmG9vfn|47l>+Xl_oC1A^yxDb zC+@$IPWm*nyx{-0}n}uY3Xd6$mJ(kirr|MHCG( zizyy>e^DZ$es}&{Dfy3%BuSyPca;)SS{Y@PQ(grXRZ>|MRaH}64K>wLTOD=PQ(prO zHPSdpZKCPV+DvmTwA4y#Z35bA7o1XPuY-;{>8y*cx`pYkhn{-rt&hI?=^soEFwh`_ z4KdU(!;LV~D5H%r);Qx$FwrEFO)=Fp)5Du)m}!>T=9p`q`4(7ck;Rr+YMJF$SZS5j z)>vzu^)}dOlg+l+YMbqL*lCyD_SkEm{SG+jki(8R>X_qBIO&wr&N%Cw^DemPlFP2R z>YD2TH{5i~ZFk&tPjZC&9(d@H$DVlVnde@3>6O>PA7gprt#{ssdr^N>eMmJQ>rK%g ZeTupN9LbORlYQ|uW+wH9Z@$Oe{Q$aEw|oEq literal 564 zcmYMtXM0O=0LJ0x-yE7~tEY%nwW%XhmwK4`Bm`1vpzPF!G*T#N8b^JuDR7M!XyW=^Q>gMZ(*6~8ep3;k z8O>=STGEQvv=MD-M|(PmAnA0Zljuwry3$Q_Cxae@y!51({`4m75Feored!lRe+Dp6 zW>Ap9O0rERLr@k&$z~Y#a7IK-4kOVhMl*)7SmVfLyh0PuL?$trDQGHDrZFAOU?#Je zjpi_ydCW%(SjZw4V=W<%rID;VgaqUJGr!c(5{9KE1|m%PHfrjj?j)i0;SyyHC|`1m{G i&kN^eeyT{1g+G(~#mV{VhE?{B@0D&wr054fozlNxSdwS} diff --git a/graphics/battle_anims/backgrounds/new/bolt_strike.bin b/graphics/battle_anims/backgrounds/new/bolt_strike.bin index 7a42421cfe5d80048db9e21a752d08d0c2f72e86..32f51b6fe04f6622fa11ef209a5411354fc50e17 100644 GIT binary patch literal 896 zcmZY6Wl$7Q6o%nNKtNOwF(`RISP&2lFc7i3yT!)t?(XjH!tU00k*T zVTw?cVic!@nKn?8Qk13)WhqB_Do~M1RHh15sYZ2b5JgRDQJXr{r5^RobTkcO?+s}b z+Z)q_rZl5DEr>F<oy7p2^K;LEI*P z{vw8jEMhTBSZbkLvW(@dU?r|!^2OlmLt z{ z=t(bfMQ{4hmypOKpMG2<`ZIuwxkOw_0RtHXmqp6Nx z%;QNa#8W)Ye4Y`{@*L0eLbx*YA}_Ikh*-!X7PF*0uzV@Ys^XXPvUr78d5zb@m1QNY zU?p#eH+hSmGV9x9LP;f(uZtg zJ39#OWLKp6BR)pE`GimTjQl-CEB5j^Uo0A=FWJXed`-+Ze9Lzu%f3fHu%83`h<@TA zhxi%&!eNeZl;AOrN2*WoEBcL-oZ>V(!&%PpJ37xF{K;SFZ~oz5E};LYMh;j}j&_V= zEm6ZY9cRTm!L?l5s^hw@=b%;JiB56@tDzgYv6HPPZt7-kZnbbrw=!07s<2yIDNc2o z)2%kna9g*t+Pi~0I@9XpEO&MntE;;?+ua?=aS!)&FO?|Qz1_!st&oeU$UyoZ4lk3d6*^52r-RGHk zH=Xn{$S9M{vdAi%>>^S~4mstLTb_Wt^2x7&f(j|DNSH!V#S{-Hp=3bFO-w1JQAXJ? zg$U(DD*sPE)T*GON-Bpfgl4RwYLc@Pz9ULC)zwh*zl{VZ=~FGW)loOqeyCPYeGS4E z8fv7mCYr|4EYUp8wa`+lFn()owAD^~9dy)5XI*p+=%#x>4?Xn?3cZsR`sk~l{stIm zkimwC79Ba%u)t5sa3hQ~%IMg_7-Nky-UJg(GT9VU1E$3?-3&9$GTR(;%`-o~w7^1( z0)Me3mRe?ctQ9iG-rsCXFvC{cY!B>Zb_Cu|yX>~dUi<8K zz`=k+4vTTbQO6v2!pYdeDW?PbjI+);?}Cdix$KIouDR}pn{J7Ty6uj;?z!)QhaP$C ziKm`#bMv|RM2bU1Q4fRqh>Zr=abS1SkVaZ*B@q%vW5S8Rj1<*` zrZhvE6GaPJVztr%-Q75VJ`EK`7B@|i?A(b2}?ySL&?*X1irB4ednk6XSA2PtNX|ZC zKL}z#tGphr#Q_S7iXzH$9a`{LAb~zE^|e=$~CTYL%7K;%DFAv z;VxzI_k{aA;31EM$2_5er@}Ly^Ma6rN?xjhSG*S9P{mu`3Gey9M?MMFeC7*ZYk!vh g`9mGGb^6!-OZfF~#d6k|>RUM9`JrR93K=550f)Za#Q*>R diff --git a/graphics/battle_anims/backgrounds/new/dark_void.bin b/graphics/battle_anims/backgrounds/new/dark_void.bin index 922b72bc74d7f5c773331b1af537d54c2e939038..97b879f01ba8ebc08c92d30497c894a1a7b186c8 100644 GIT binary patch literal 2048 zcmeH`W0Rg)6h-HaZF8-pgO1IPZM$RJwr!_l+qP|IY}=lBlA3=pUAJznefB-)!?{&E zL<~a2Bo?uWLtNq!p9CZ%5s3poNpO>rjO3&sC8Q3JlqG_4l&1m}sYGR}P?c&_rv^2t zMQ!R(mwMEv0S#$HW17&EW;CY-Eont-+7L-w+R>g4bfgoV=|We!(VZUjq!+#ELtpyQ zp8*VH5Q7=QP=+y_5sYLMqZz|k#xb4=Ok@(1nZi`2F`XIAWEQiT!(8Sup9L&r5sO*E zQkJot6|7_xQNhoISj`&NvMx{|*0X_)Y+^H8*c#N^*#64j!A^Fun?3AhANx7LK@M@4 zBOK)z$2q}CPH~zuoaG$nxxhs(ahWSz$y!A)*)n>*a)9`|{`Lmu&%Cp_gD&w0V? zyuq8i#oN5YyS&Hye87i%#K(NXr+miee8HD|#n*hpw|vL<{J@X=#LxV~ul&aE{K236 z#ozqHYle(rOk)|_IL0-e@l9Yt6Pef~CN-JKO<_t?nc6g_HJ$0rU`8{U*(_!iHJjND zGlx0NWp2aGV_x%_-vSo2kcBN`QHxpJ5|%VXDN9=>V2HATddZh3!g7|kLQq$^Beaj3%_?g&RZ%F&K-tm7Q-1SdMl$xd;q z)12-MXFAK-&T+2uobLh`y2!;YajDB(?h04B$|zU6#JKX6m zce}^E?sLBfJm?`0d&Hw2^SCEG=_yZp#3~?@CWcYb6c+pE<_KH`%=5=p)(_7y5 ij(5H1eINMHM?Ut6PkrWdUj%c}`H#+jbpHRZ`TrM_mOTvs literal 1236 zcmb`DQ*a�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 diff --git a/graphics/battle_anims/backgrounds/new/focus_blast.bin b/graphics/battle_anims/backgrounds/new/focus_blast.bin index 42bed6c96f9587588b049a0372527027aecfc6fa..98e3e8e16b63fe73c0fb8cc7adc2cc1630bd3359 100644 GIT binary patch literal 896 zcmXYo1#}Q(7)7OPBomp*LRPX7L3VPGlU(E`Pf#Rz$w&Th7oZ@8C`=KGQjFr1 z0Hh?PLPk-V=)h7YP+7`Ro(fc?5|yb!RjN^)8q}l~wZov8qknNG^PnnX-0Ee z5JN02X+>+=5Jy|u(Vh-;q!XQqrwd)_Mt6G9lV0?u4}IxJe+Dp+K@4UHLm9?!Mlh05 zjAjgDNnjk~nZQIQF_|e$Wg63&!AugF#cbvmXSEO(fD_KP{ zt69TZ*0G)qY-AIg*}_(~@i33@D37t79qeQmkMjgi@)S?=47=IGvpmQ1yue=e@ggs= zp937^5HIrzucqj=)P6ms-$=dQ4E+{|Il@tn1%8`%LLN`a6M;^0iqo9oUEbq;KHx0p z_>hnIm{0hW&p6KoJ`ehWi(KMMzT#`X;d00;T;&?qxxu%5$M^h@+CTCWH@U^n{KBvN z7IZt%9e(Ez{^T$I<{$2IkAL}(|GCdYrZKJQOm7A=n#s&&F{{~(FuOU-X)be{$4K*< z&-@m!poJ`K5sO;P;+7D#q@|3qw9$d0En`{BS>6g(w33yrVpXeI-5S=kmbI;8UF%uj z1~#;jjcsC6o7vnJ#u#f$TiMz+#@W_(wzorYM>~b=Y`k6UYB#&v!=CoCw|(quKl=v_ zaG--6>=1`K%;Ao3q@x_|7{{96ILAA|iB58|Q=IBFr#r)$COXU6&T+2uobLh`y2!;Y fajDB(?h2D!=_-@MYIRs82CZ?e>s;@K@VC(i6Oa3q literal 952 zcmV~$1z?Q}0EXf3cg}Gf!_L_Bct31R4Z}?Sx|x{n?#`*{?!1@V!R_wuC#|B*`=?DyT#{$qXthwF*^HHL6pCnkbW6)CQua z4s{i)M_LxyN-_17Py=#kNF&skCNw1%HKRE#$Rpa4RP2t*&=>WiKLZ$u3K_&;hM=JoF^u781S1*6Xf%egjAJ~Sz(gi78BJj- z)0mECFq2u#Mst|UJm#YXEMyUj(Gr%jjOAzrD=B6bTFn~PvJRE7o(*gy*u-YGuvL-5 zZHjLvWd}RaE_Snry=Wi%Ilw`5h{GJ=C_2VPT+DHFf=jrR%h2Uq!IfNvuI3u9@A zbzIL4=tgehW^O^ZavQgE2fCBHxSM+@x|iU-Fn&L&4}=-vgUWn}hk1mwM|n&+kMo3b z3!fzRlnS2a8T2gA@jNe}7dg!tUP3SP3a|1SdYw0TleY-pR&bVcyo285J>KU7!VeYu zh>!UMeadHi&KD%V1UBjyBOxJR43)^*E z*U@^;a<&rLR(&^cjvHEy+}KUr)XH@;H+Ksw&n?}`t*v~wae>=f?cClS+|laf(4F1I z>gsOp?jBZ8_i}IdanRTO+}{HfNe*Sfk)ukcD2TdTa&-vLEZQHhO+qP}nwrwZ9JzKM>UqAKgP4~RM=k~2O zaKafE469sm!yOMi@xmJ)eDT8{8vz8WZ;LI@>h6cLNq#33&6h))7NO9*Ne5|NlB zBqbTi2_pq5NkwYXkd}0$CxdmPK}Ir>nJi=_8`%jb2RX?_Zt{?qeB`G95foHih{6=1 zD8(pF3C)+J6s0LcS^Zaz@>HNAm8eV=s#1;W)SxD{6kA($1a+uOJ?hhdhMH(ZW17&E zW;CY-Ev-zgXiXd1(vJ3Y&}1ZSR!2I~nJ$(#`t7>XjqdcIC%x#cUaAj$>1S~!-Jbyr zWDtWL@Ix5NForWi)ksD$nlW~?=`ogZjCa6CCo!17L?$uWAwPwwDqW;{8q=A$VHwL=!Ae$X-D=jbmUXOW0~_^Z6Pww>R<^O79qeQmyX_qI zu$O)8*Xn;0oBIPCWRIIB+1{f9SQ&U1l_T;eiUxXLxI zbAy}Q;x>1<%RR;4*Zcz>@<{K(!yfa5r#$01FL=o-Uh{^xO8JiWeBdLW_{Gwgm;)&tJ+KT`q%7qqPX(kRK~y3b zsZ0n}upxFrsY)33YGMedIuU3!s7WnqlOT1dOFimiZ$MH*8qpYOLQ|U29BDyITG1Nc zHnbI6I|&Oz+T)-D9Wi&JGpSwZigcqpJ?M$K7ri^U^r0`(k4XA60LMUrA`OEW%#c8a zjlmULn;0T7jAJ|#uupW_n8ajaU75mE(WWuogBipnMg_*s z#6O-{PTLC8Z02|{mwC<*t@eBz3$zsP)P*c!v9N@tEMvLO3Rbep;=Wo~!&=s{9yTPV zZ)6jjUD?7`i**~@g&pi<7YVT2626DM>=X8LfP);;Im{7`CfSY|NF<5l&IHQ@?F1(| z#c4g>enuaBmUEoPe1VIh<1TR-zhtiHaVgH=m{V7UYh33BH-%f=<_>p-d)(&%4|N{# zm?wJj(-=$YGoJIpk{%?5U-F9Ayb<2=j`w`f`N$`ndfI2<3#okNoA8|<{3K217r*%v zU`>a=hTwmQ(nRUXpp42SDwA?it{H-x%B|Y(r7*{=_GC;JsHSICb2VxQ;1T)NBJs~_f!7LN`MMf_P+niAQh}aRHzEmeC*sYmdXDE+`ibE literal 744 zcmV~$2SAi%9KhlKdme(w`0hY4wD`T^NWByk2jca8C*U5Krm4Aiu5zZPcaQ_zdk@^A z=Eyw?%Ds1~IMdt%Q#323=P`VRBwS$=RR}*jNq!Ps7=OY7NGU?eK+#1B!V0E>jSxan z1`eEri88_|CZ6I%U@yT3L`u_=SfyzBAs-Qi0b070CYqEo^eHRua+JsMF%>W?Qb|(9 z#V1sz3P~|CC6=nps)jv|>eOIaO^jN^OIB?X@YInAH=knS6&n#Q3lFL;i6oIMr;K{k z=RyM-Vl<+$+-yQqtY&h*IVrS2S+37$Nh^7i6Jr_$pVOK)$QQJw9qlo`q=V#kq!W(L zbWu@V>88p?cBh9&#rpTOyuF~eO6;UVNkqX?)LE#tGw@Ksp%#Ok|Q?KA9=$I%_J^ly^Ea3?{oA-kHoo zW;2Jm%)^>5?lcy#5Lv`xmar82GBR1NZm&RAvWhs@YSbFmvW_g3Z>`ta8`#JX$R;+k zg{{bsY-2k+ulN5_aKLSvg0sEILa~MI43yC zDd99{ILoYm?|K&g4Wtu)C z<2?n4R))6e=xA-%exeI&e;uHU*ma;Ts+|QvT7q>NAv#q1&bm)vXoq%&=rA3QnWw_c F{{glD(u@EA diff --git a/graphics/battle_anims/backgrounds/new/grassy_terrain.bin b/graphics/battle_anims/backgrounds/new/grassy_terrain.bin index be2421aaf18efd07a9667f6774effb4c68e6f46a..e955c23199355ec8e14ae9287f1d5b0d0df94635 100644 GIT binary patch literal 4096 zcmeH}WpofZ9K@k$ad(-4`Qyc1i@RHKDDLj=UWyfWcXxMpcXxL`F7$ezj_>z@zIn;Z zCi!J|XZK|i5*`SJ&b93@Z^rBE7WP!{D-9u-g#l~5T~P!-is9X_amny7`^sDrwwhx%v$Uo=D` zG)5CNMKd%<3$#Qlv_>1WMLV=d2XsUybVe6+MK^Ru5A;MY^hO`_ML+b%01U(+48{-) z#V`!V2#mxijD{b^z#n5V4&yNa6A^$(n2afyifNdR8JLM#n2kA@i+Pxj1z3nhSd1lD zie*@i6Ld=%YEaY2*Hr_U?_%W7>50=!ZAEO8G#Xl6p4`; zg;5!e(HVm=8H=$QhjAH?@tJ@LnTUy3GB}?HkRW!-tC4HT>nH@0yxRllR3rJ9vEl-oa*LI<8;p8 zOxHKdm4Eo@oK1hn2iTk-ey$q}pr3hQ9_PFE0{U?w7X|W*xr9lSSc#Mn2^3%P6jvUI zqu7e2n2O=r(G^Wm6-AL1Nf8x6o(ivU2&*s(tx#IZkjk%o%Bwuetz62f9Llb2%Bn2N ztW3(N3`#FArBhm^QEH`9N~MrVO0Hz0prop+I;yQ&s;L_CQFT>QRaH@CRZ>M&PzbBvIahEcS8+Aha4pwyJvVS8H}RxS=(vvQsE+8c4(Xr{Xg~I8 zul8uScIkuOyBy!lE!@g&+|C``$z9ydJ>1KE+|L6%$Y*-0Cwi<$dZ-7wuY02lJOhj^I2UPpM8$9Oz2;ZE=*Pw_O*(8EGn2>a>&hrjeg-}Oyj^#z~xNgtKM z%+B&$U{0Us1zzMOUgi~Ew`N?HjkZpEyqbqSpRi}7J+>tr2+ zt~*$J$KT>@-r-%|<9$BhLq6hTKH*b7<8$Y8L-XY*8|laqHr$5UP#a={ZIBJ*3%+zN ryyELXU*7O7-|;;^@FPFD{?CDT`@*mM7M%aV=bvB){$L0G@BIH8EQrX# literal 2244 zcmchX<#W|{7sSu+LP*eDG&sAkUlIsz!9p(X1b26LcXxMpFYd0zrLMSJC2g@nTbe%4 ztNsI>o!K*U=FGl1J0HLK%{=&!01071NQ7X7z!D<~k|G%_IZ_}Legsllwp2)sH1MZI zI*SZLdRPWzL?&d0WkFVC17JjUjWj51W9An1so&DVU0Bm=2qPnV5yyusN8Ed6*AdfQ49u z#jqtg5~pCNaRz7cG3*@9;{q^ppq8@LI(h1j|X@NdxXb$f~T-&c#aqN0p5@J2|pw5u4ljCSNw*T zuvd7EH+T#C9q;fSf587I{_=%>h=06!^f3VwGJOye#d#JQ%n%B(N(N;Du^D#dQ z7z?rx3$sWFi?Wz`Q7mpO!ICV+(#B|(VGIMtvMk5)tYECjO03K(#;UBw>a1a`$y$tM z?GV;sU0YR;_2a`Eupt|<@o4j!uqm6dxv>RXvK3n!+psO$vAwYaJF*iyhp-E~2E1CHoX^8Va#CiYLf3et=Am9rgHG@9Pq<hB~wx*ktJ4$ zf{{oTq=ZVKt?}hk8AYqKtdvTsgo?|eR7^!xL{?aZR8R$E`IS$3l}8q-+{&d0S-5h_ zNwOTuE()@2YN-}#E^DTyYNE!nMrx=AsxPajx~ikvvRKtpP1TT9S2a~t6!qIRq3*J7>Z&g4EbF9>>Y(Jqt&uix}}@C5r4yN+|C`eo!rIU+(X;TecaCjw1d2^Yq~1CqRYCZi?RzkuXBp0 z)mfd!50qE4)X|)@)+$nPw*s9(N6OW&+=p1IiBYWJ(oSxQ$5jR*&{vF z1KpS1(_P)sZTXY9#K9L5^8)Q6+vdH*%k*F2)$qt`yiWUspYk*MTtd&8`{2v;m+Vjd zq4#>Hc!Isv8@-m7(>eD!zX;!CU-Bz{&2MPm@;iRd8?>9e#oJ8hEUio9QoB^nQaZm2 zbtzm(awc<)qbj)a=E}LUF5qI!m2uIov@2z?8xY8zu+ zEmzakFjw7Gb5&gxbCq2sSJ4eTjr>u!2DtvNUm(=q*Y&YccX*d}kN5e24{4A1m{0hW z-ZMVu3;y7B^4ht!obINDG_k2}iks{vIh*JvxbbcrQ~t=Gyr7>M7je>l;jjFSFB$ZT muldHy@-|{x@b7%b_iz5kqW=O&|Ki}A5C7=x|HnU0v%dkz!kLo* diff --git a/graphics/battle_anims/backgrounds/new/high_speed.bin b/graphics/battle_anims/backgrounds/new/high_speed.bin index 52f7a9c51adec65bb3246326a8062aa05e32fca7..ca049478cca1889c44ad706ffadbc7110464f9c0 100644 GIT binary patch literal 896 zcmbu!1yht!6b9f~#THw{e$-FJ784sgQL(!*utmkfM6nYPyTzZ${dQMmoMm)o=b3xn z_nwoG$Vwa8X)7g1j&}d4y$(9+q_Zx%rsX!b)FxN!y6LV*cyad3sF&VBAAK{(OWxvp zte^aU=x>051{oX-F%-iLH$r5jQAR5;##rNwH^D@cOjc-$sVz)1-3&8>BD2gk$6WKw zw?MIlX^Skj#8S&F54oawAKzD6Wp#41Mv1l7g;`>Ka+WH!!A6^Gw#C-aTC>e|JM8?+ zE-Ab1Nw?pdOu1LeKKmVTF#Hasl{u^|*^fBtm~zLRaMCHKopIJV70xSgb*-HST-hp+_MfdlK@gXK_Z)z3?(CiGn{~sa2=mYYpn7 dH)^8>Z@p6&z4yUKpM3VkSKoa1!%vNVX#$JCrpf>S literal 496 zcmXAm*HRQ=6ok*&b(|en+yNIsSK(6!1S6Oe@?%cGnzN2sF|CSX0>*%1023f)#P|?i z=$m-$)jWbbWp#B`cUAXASGz%6>Xc9;WSv;3eQW1zw4N>;Ht#v0bL zPVDu+{Svo)0~^^ywQi=7CYr@cHb}$tmG9Eu7)3aE|j_ASYbp5|?QeTD&V@NRM|&~`e6P6BRoN4U#9y7KhyOYsA`d6?i4kHvmMPq)~;JaujF8D-CT@&6%{ vR8y7Hm-Nw(4DgCU20VF9pEt-GPHz>hRB za+1x4WV2uRk~8Pz%srFm-kEo1?pznHSz0Lb2xC4A2q%I_q70ic9nC@(v6v;q5R2Q8 zRQ&0A4{kB z6IpC#iw#!xkj+-Mv7H_4B*!Kz^Sj6;kNhA=W&Q;L>ZJVb`z>U5&~ekm9`>>?C_YE* z=Ku#OqS!X?79|{_lrqZkO1tm7A}i}KM>xtcj#KgfDdI%Q?<-fs0%sUFaFD?axPwI_kMh1C4~5 zva%mv{t8W8#%{+Hdgk&OE)?-niG;3lmBv)cH#xXm5z(#Aa#wfyHG$G=ZI9dyz~ zw=LF14-e?&A&+>>6I-l@r#$01FX-bX{dg>uR_E>&uXxP>Zy01qdV{TZNo9L@%RAol zfscHW)*d)3*Q3LHW`t43s1?f2sh-Vx(R|@6<9y>gKYZ#eGfEy)>d~K4J^G8^Oz6(r iO#Nu=#VeBe!=zM?PBA@81wA*n-ihic;3(iI5W-*d{ZKLh literal 880 zcmc(dSx-|z0EK5Lcqz4|f~aVb4=PsWqD94m6fcXoi@5JnSH!h$sJOI<3%FI>cX2^P zO^lDm7ypRKRsX;cHAaoWd!O_lka?M$e94(P=Xixz1SLuaT}e0)$)qp{4J{QXX-bN8 z6^eV^E(YVqBS^=~5Hd^^QbuKMCPT>*3}ZMW$S!51Dpp1$HVU60htcGMhdlCCk&>0~ z{em$RFqVLWag1kz3Md(m#0t?VVxnLYL5i7dD!-*`QYGxDKk~Bk{=w?DJNV( zh00dae%*||z!&?5+n`cqS%|IX>s3?}t+6RnmgzH*waj8Rb5xE6bfskIbD4*n&jJ=w zm-Nn5c}hmLMbxv{!4j6Ttopn1TWrv^oE5AjWfiMg(^f2$?6(d7KLa3`@>@@Py|Y4J zoBU=S>%(mL@hRd|A+Ngu5n&^n*ovfV=yNvd2K@tPfio$O*a zd&2B3_-K8}XwHtJ?PEU&EJT`yILINIIgIZJM^%B9U91IhjN_c(B+;0iTU?9Nia13Z zr#VCPtX)+{<2l+99h~O^7x7&pv#-fofvZjzmq~DiPDWqln%36WZAJg~y5I&kxy9`; zcjO=2y(MuMagX~v;31_A`cEt8mc%2v1dn;bQ=Wb9ZB&K75?OSoC7yfe;f2k#27IaX d@-i*)ir4+Wt8jnq{8!filx3S+Q?iyR{sJutMDG9q diff --git a/graphics/battle_anims/backgrounds/new/hydro_pump.bin b/graphics/battle_anims/backgrounds/new/hydro_pump.bin index 0f7e6a5d913d4051a8fc58c1029c3ff3092c61f2..917b5c6c966b2c7a2e4851293923ffa014bc4307 100644 GIT binary patch literal 896 zcmbuww++BR5Wq0JbI!5T0NQ^(?{EeSCekk%IRz!rD{2~AqIdKRj6|Q9Sy+j_v2$<| r{o>}~CHm{*?Pc`S!`;p3tBbRf(MJb+JEONY)>cL@EzHe~p8V$nFkx2# literal 224 zcmXw!xe!Pb}y6d5* zUV7`JuYUR)V4y)lKiCjM4Kv&bBaJfJ7-Nky-UJg(68g!em};8oW|(P~+2)vQp7~NN zuu$k1S!{_^OD(h93M-{qWwkZdT4%k`Z?MrOn{BbxHrws6(=NO1vDZHPh5mqp4ms?I zqmDW5gp*D=?ToX|IWP1VTy)80S6p??bvN8}%WZeubwDyS%O zR8rZ?qKc|sk&>q%l}=Ujs_Nl2uX{s{P*W|n)d_XgQ(uEzxe06NP4SjS-qu(&@s6gN ziRM~psg<18+9a&4cSAevbyfaY;zPZBq_^m!uYUTA0R|dm zu*@Nb%1hX=@Uc$}HzIs$q|b~Bqm41v=NZNsZ$iRiqDdzELQFB$G+&CZOgFCuj}}{EX*$U*v)l^tla*FkEq=DfTITa7o9%Yk8FtxikG)}^{SG*o>rlcDJ0gB{)NhW7<4!o~ckzcmopM^vndDYF zb=JA?m%p8NAzXCHWmm#g*Iaia%T50z?3TFgj=S!O`yTk$L-C(S9(yA5sb`)iOvL{k Clbi4W diff --git a/graphics/battle_anims/backgrounds/new/leaf_storm.bin b/graphics/battle_anims/backgrounds/new/leaf_storm.bin index 02a43683a67dcfbd4f907d696bd64d30a05bcf67..81fa3d3beb21f7374caa0163c6fd92789210fb75 100644 GIT binary patch literal 896 zcmYky1$2-F6oz48FuJ?n7dE=P8#ZEecXxMpBaMOqN+_wM(%1n?Dq(<<%4maB;b$sm z=R5bF@7(9cAub`rBR-)dAR&oJOcIikjO3&sC8hL}7|hlwuU81SKg&>E~XCvXrAd6{tuhDpQ53RHHgIs7Wnq z6G0?(s7pQS6Ga0e!y3|v#x$X6;LT`G3tG~O*0iB5?PyO2I?{>GbfGKV=uQuM(u>}K z_n|NS=+6KKGKj$pVJO2G&Im>_iqVW=EaMo@1ST?x$xLA?)0oZ-W-^P}%waAsGLQKz zU?GcG%o3LJ5-+oi<-EeHyvFOSU?p$xCaYM@8rJd_Z?lf|Y+xgs*vvb;%NDk>jqU7U zC-3n-yV%Vh_Og%t9N-`y@F5@ZF`w`$pYb_g@FjJ9qnZ2AYJTgH@n-zp7yf0ee7#L`#Zpa4sx(V9O^KKJHnBUao~_d!HG_C TvQwPuG^abmna*;ybDZl_wrT!$ literal 924 zcmWO41w)kw0EOZ65sJxG!Pf6R0%D6D7?@zAf*sg}iVAjIuw&D8cXv;hx->Rj>N<3t z#!@%ke15|diN;C+F~kyw;weXY5>N#yQi;l_3ROuYf~rxS8YH1)YEp~Z#MPlL^`hzZ zQ3Dzh0y2$AAr+<3m~@(;rZl5DEl^8Z(V7g@hPJe$J&_J{EC@T%8Fis6nRG+l=|NAj zP%nDZhrXyE{mCW=4PYRH7>tH6l$_LI1i1`n1S1tHk9e^ zD$~$(W-yakL}oKb;aujSLgur8g{X){EM^HRri7&|L(5sgN>-uOtYIzdP?S>2SdTWa zkxgtyTiD7rwxbDlf`*?|$c?G@7YrM{W zA_q8F5FX+U^d^Tn!dvKV-r-%|L+^8xV|;)<}dr>iDw9Y<9Ghx&#V;v#owIe9QucUInM?3 z-^B=lW2{)mIo{<=d1r(PuHcGtC0BM8SH+16Bd+G^at$Xr*)`=_uI)OmE7x;Zs}HXYiGEP+sf_S-W}Xg?&Qwy;;wS0yScl2#JH!k z+)H6^xsUt0pZg~`+c^rd(+0=`J;;MSL>}s4&h>D4ghx8h`SK`__85y&C@+Yp6OYh?K$#X&vT*Y%L}~FMP4K?_7WGnL|*D;UhWn0O0V*2uaVb! Zoue+5%e>wjyiwld&EDdz@-}a`{s$53-NXO@ diff --git a/graphics/battle_anims/backgrounds/new/malicious_moonsault.bin b/graphics/battle_anims/backgrounds/new/malicious_moonsault.bin index 37874dd0bfe49071e27547deb84976adcb9b6a3f..03bdeabc7f25c1b93996e63783c1fb1f42fe58d2 100644 GIT binary patch literal 896 zcmbW!W0Rv%5QgE(+BUCbvo>aJ+qP}nwr$(C@vk;{CzIKl+0BQou2X&b^mBLjsSXLH zupDxx$i~TBa?2yHeDW)xph5~OqNrj4S6qp}msCn=Wt3G;c@Z+%{1{!Llu_l^ome6KWS?8BfgrsS%MG&QT$mo-m_;=h=t7Nsmt6FQL zt#;b$prcMY>!Pb}y6d5*UV7`JuYUR)V4y(;8)B$oh8tm|Q7Nl4+8AR~YO+o>&Uh0{ zG|6OBOf}7PGt4y0Y;(-bR%@R57FcMJ#g71LsxP_W1Nw2^4UZhP#t&wd9SbSO~8Hxthvj-5CWb|iRD|HDzo9CyM= zr<``iS?3aV-USz3a@iGEU32{p>V}(cx$Ta-?j?x~GP}R;frlP>?1`tId7iWvUV7!V eH{N>Zy$?Pn?32&F`0AVQe)#EElF6k1_x2mV$hNrv literal 544 zcmWmCX;(~f9KiA4zcJNVGSndJcW#rVEL|D9y4EC7wq(5_WF1R(`ZJd7QX=bQ-y-`? z*?Zs|FQIe1f&0u;;|+Wte9qUaU1BO66^e_&<@j{O-3B+Y#0l|uXiGbxJsn7(qk)(7 zPIM+SQAol^7rF}FNTxeIgr4-GH+^CNKZaFgNFap(sq_{4(VqdN3F!=E5QBvwWMDEh zflP*3;ZX3mB5WrH8P14|V(tFpC`T1|Ml#CrMcgu)F^pv#l0`Nayeg;2^$ zR6Y^7!Tsn*RkoD*s}&jsp)i(KL| zSG1+Ba*YV}!gX$NlUs0G|GmRq?g{sKz(X2ZZ8NHt_lU#cSaW lZ+XXi;R7G}L{l`|%xAvvRrtnte(*Dk79ISrAAO=+{s92=kXrx% diff --git a/graphics/battle_anims/backgrounds/new/max_lightning.bin b/graphics/battle_anims/backgrounds/new/max_lightning.bin index 43511aa7249cd273fa4affd23208c11ec2f72fda..af4c39c1c0bc0ea0260ddccddc8ca26d7dbe7069 100644 GIT binary patch literal 896 zcmb7+Wl)q+7=>MG=>_b5u3o#lySux)3%gtF0J{ql3`DWP#%@rtP_et#)^~B4K}LT# zXU=&~-0w4BgDr+XU?<5Qhj^V4N1SlR1y_u?#arAl;ejV!Bqj+-Nk(!~kdjoSCJkvx zM|wb!fsANDCNh(StYjlQImk&aa+8O=V9W$hFJ4Zxx*4{ac_qIqmSGFen-exBN@eL(J}w| zhp~)fJQJA6B)LAq$-*hZslsWJe3;G*W-^P}%)u8w<}#1@EWl6u>V+&~F-us=GM2M~ zm8@d5U=3?U{U!Ocj`eI{Bb(Sv0D){_E8EykpbpSM>>!9>c8cyIL^Oom0*eb4?qRR! zKK64!aF9^KIK*L&aFj3|s*iD8aDs47a*ETO;VkDkFF9QF0vE0B5|_EcRU(Mwnk?73 zL8Ok*QABZ*TioW3xVyq=(Ra*cJCK4Ir3jk_`_ L57|u0Q+cUhGC~MW literal 744 zcmWN<34GRb0LSs~Z_oaF_U!4|^WPq`&1j$B{F70ZBT~wCB`~7_uLIzNNlbW32=jdIB45c1HW97a#_5m*X1oVX{`izDcbj--&II2!e#FUL@X z`f)7BaXdPK{+!53XaFZOkU{7a1~Y_HQJi9iG7Ob)8mDsxI+NjyU?dvFXwKqnRLVJ= z%NTSXV>zF3=mIWeJQtyhnZPAniZ0`FCUOP3lB>9yN$47`dg07jy?d|bUsWUyEdxr||Y{_dXEi6mK5~kD4P}yB!?&cmjej-0%e1GY^%w!g` z)0o3t1ko&lw2gHLsL?u;X5fAeSi$#@J=`CTYSjM9~#&YpE zPf*R11+0*Hil-H<@fE4z8CFs&o~4de)Qbk5<9S{Xt7-7+y*1)R*07eBD&)LOqr#26 z(kA1E)++Z^nv|csj`eJi*@&8H;Wb`IZ}289UbE-E#oIFP(2CyWJ>KU7oDcbkj}>i| z<8GoY9{Pk&(Py;N!Diy0EB_0=WV5FZZwp)a3TG={^Nm8CiWGOr`IhhaUZ&O!cVT{z z`H^j6J3q05pWzn;cCw3KA)&x;>}HQI=Xdt9k8WSlKlqcs*k7ycZpHq8fWK4uhkq52 uHL^)IV3VzrYEx`5Zc=S%mcnT^YArwXt6h$!< zM+uZfDU?PTltno=MtM{~MN~p%R6$i#Lv_?ZP1Hhd)InX;Lwz(rLo`BTG(l4|Lvyr1 zOSD33v_V_6Lwj^UM|47G1fmPNq8qxS2YR9xdZQ155RAT#2}D2i#{dk(APmM348<@E z#|VtXD2(>_F&K++7>@~iF zz)GybYOKLptiyV2z(#DsW^BP$Y{Pc!z)tMKZtTHc?8AOn;Q$We5Dw#rd-mZdj^Q{? z;3Q7rG|u2G&fz>R;36*JGOpk%t~p%C4cx>n+{PW;#Xa1|13bhx_!i&cd;IVPe#B4s z8ISN7Pw*7a@Z4MH3%tZDyv7^6#XG#mFZdO|;rIW`rQT>3K}<1+yhG7%Fq36nAzlQRWV5+qYGHAQ0@re!*& zX9i|;TqXuEv#XtjSzVir*_nemnTxsU^C%DVG9UA^01L7Z3$uvpQuiso#= zmTbk=Y{Rx}$M)>Nj;_y_=)}$pWEXa2w-9}I_HgLQUhK_23}P6BBGiFU2fkJZ{9JPS z5X`=eihl0$p}%(@z+evKAP(jb`n&w~$51A~Fb;R@2*-`&DE^}#&3+aYV>s4Rj{8?X z-l_dDgcH09f9oeYcA^Dyl2a#FG9^_KB~~IOR073UJozK8;wZLaDW+m5y1WyC*G5rf zMN&jXkRQS;oWiQ03MjwwDX;P4uMkXmWQaLpR zrBn(uP<_=?UDZ)-)lyB>Ky_79RaH@CRZ>M&Po~sS+x#Vk)X4Dy%~4 zt6&AGk9w<@da8%ItDCy2ivrPEozzhs)L!k>R&CT;t<+L2)LhNfR87=ajnq&xHAB-i zO;a^RlQl^bH9_MwPGdF3)d<9BjnYVs&~OdYPz}*w4bngjP=EFF_#N7=ZQ80W+N@35 zs0~`Lby}-6TCG)DsTEqTWm>8wTC7D{s0Esjd77&^PCZ+*a7CAONs~E+Q#p;(IfFAf zi?cb0b2-mTCtt!H(P16ZK^<`F{o1F!+N0gtrJZ`LN1D$CT*yUS%q3jPWn9h`T**aR z#noKHwS1@ty03e>t2?@_Te_(mx~^*uSM^aJw2te!fg8Dro4JKsxsBVogFCs4yBQF$ zhwt@HZ}kSR^-3@G!dv%qJ=0S?QDRGEd%2JMd4LCbh=+NEM|sSh0FLtnPx2I_SY(T2 z5gEaJe)?H>3uj?1jD6N8S1GsUvYeK~vRgLCXSFP@&1?b8WGR@@GFW;`XK5{snaNUH zDx<+tIxe{-v!s^9s##U5VwJ6uRkR9L-pYBSl(jNe+DchTE5YJc%!<0NMXazDvVvB? z@>@R3YkAD)Y#VEBt*oWBu;%W)nWqj!Q#V2rJIyoh1aa2o`Z=Bt$?rg1;6+~IWnS@i zC&>C(Z|h|}&6n%lL-bd9jn{dDH+hSr1G9tj8v@Huc0cX^NZL-zJ-{qKdYJJf+t M2f}#S|9|HHU&mRtwEzGB literal 2180 zcmcJPRdm(o7R2{IIY|x_IUzt20%Qi}gCM~jLQZfC?jGEOOOOP2cXxMptvga2YS-$e zExo-`O6j@}yxiBWS!?#Jd6Jw!u_%Bz6oeH*VZ;Ln(o%|`C3CO71j;i(E~kUY3POC=mYDEe&~+@uz?ta!59J?ieX5{aM%cp z#3+o0jlo!q!+7{6AOjOEHXSwzlQ9LEuq;f)G)#xhz)Z}-Yy{?DF5>55K5PLNVi6X@ zmS8ECVL5CCR$>)aBd`W*t=l@Rhi$+{Y{F*P7Hq{fY=`Z@PVB;N*dFY~KJ14bz(E|s zVb~EI#W5U*oxn+)!fDtUoW(huN8kc3TFNC{M)(z6#WhO}c&{2>!|QkhZyMgh+js}> z8s5YE_y8XouHy!7;ui3cdAD%~cMbP&9}n=*@Cc9bF+MSTiqG&l{sR20=B#wg}xKIS(@GlsD&V2ooy7GhyzJVCOE zu_#5yV#eZ3Ur$5GEUi2%7%Q?8E3-Y2E9(S&g{aj z?8dy^*~2#W#Qk&x(`-a9_GTYiU-n~v4xl%XgE*K&>}u8%ZzzW`ox}Yc!I8n_Q5>CR z-WZPMIF66t1ipBw_lKVU@4WOsrFiyo|467W=y@5O$n2P8pQvt=AVic|X%4f=}DCAM3DWKfSrJOO!p@c|;Ws~0&p>T!CX9!h@Jk>JQ zR1H;EHB(hpQDs#!Ra6C)M>$hjl~JNfn@XvqN+`ipT*c%hzlx%WCGiD?6tBYQqRysH z>ZlHCZ)&HuYJ=9MR%)phYHmtZGc{F{EL-1Ljnq&LO!ZYybydfdqM(vh+mxh<%FqPU zc#YFojWLbZD2>zz({QC@n1-5$Xs`xpplN{mtDpLs`lz>hDb3VVJ=9&@OkK5FtF+Rz zLd&&GOHE6(Sc|kUL<=-u^Q>;VVXo$Awq}`TYKEq3nrW)Cl&L9xP1YpDpVCRw2_4rl z9W@=%VI9&z(*f<*KJ7K_(QfV1PSXx;*EVf6ZP8|J(#8;M(0Z-2t!qtda8oyQ-L#a; zxST7DE4hlRxyHDb>$sj9t`vJ56LC#fbwz>8x@1WgbwPGs=X6$QWT*9|zR*V6CT`{y zZl!JGcJAO#+Ai+q7VV+!bAA^R;ldf_Vh8)og}M;uIrF>c`pw%}#Z@*}$yIa} zT=_W`U(S^^SH>k8OS{4>;SyYNSInGqaz$N{5Jv|WZ*hgp6?Ac~fNN#0rEB4u zyHs<{TvOM?HO@lcMy{c2;Od*J=jyVKOMwg8#AH|7C7G+`YPuS(y3bW}Rb6aae`oz% zU)RU=cCC6@?lf#qM^Bp^*2BHccl;^u`qu~E9AM!eH@Mgk9o8ZQ~ac-02OM$285dk}!(GJ#PrUF(j}N~1;ZFd81QARKAcPWz zfp8*-R5C5;NKXb$W+aMCWF`w)$wqc^kds{GCJ%YFQGm^ubwvR(}0FFqA^WqN;7qSa+=eE zmb9WZZD^})wxc~A=tw6z(}k{dqdPt5NiTZShraZqKLgA@mVpdnFhdy1Fx783BN)jj z^?o#C7|S@uGl7XrVlq=yrZSD`%rN_z%)&?+$uH7~sdvh!5uI3wrC5oz z*odvziM=?8qr~H+l(V>qYbrV#H*psa@f0t$MCn$nEstZiXub4yy$ z8k^9DwzQ*tva~L0bf6=hFgnwPu5=?sy3>Q6^g?>mhrYxh{pimC1|owP%n*iR9>#D+ z*uqC5c48UDXe?tGD+%Kmk7WWAC210qkts}N8q+amFq2u#7Q>jsT;?&~Hc}R_kT@10 zivr@P7T}32W(iAKhQyP=auSghtYj6dku|Jk9qWnQV0dq2lPzg8#um1+jqPH{4tBDO z-N+vHvXA}90S+oJ;)_DWn>a TTY~*HKm*k)j|Mry(}2i-F5t-B diff --git a/graphics/battle_anims/backgrounds/new/nightmare.bin b/graphics/battle_anims/backgrounds/new/nightmare.bin index c4b8b45a7c22538e8b445fdbc73ac41ada5fa8e6..11e1bb939b77c7965123d23d1e066263c447d688 100644 GIT binary patch literal 896 zcmX|-1CSm;5QTHrf409qGj?*ZbFppPwr$(CZQHhOb9S@Y>Z+Ok-g`YWHC9+-gDrO0 zMAdnz}2~iYE7~y~rp(v6lqKP4vI7RU! zkVq2Aq*e64(vhAFWF!-rm6nC9WFtE{bU!D#$W01)$V)!*Q-FdLqOduuol%6M6r(sL zD5)rwQk15Qn$f(nl%qTqs7NI$E3QISs!^R9)T9=*siRNSr5^QZpilgN)xW(Vjc800 zn$nEsrr&~=w4ya_NKMjmZE0tE7TVK+j&!24u63a+-RMpaGtrY?^rjDe=|_J<9l$`- zAH-mWFqC1YGTiL6+w2&@NJgn{G-K2{mT`<{0x5BtJCR9DW(rf8#&pG6&0r?8j9%l} z%waC`n9l+hvWUejVJXXu#Bx@!l2xo`jjpU^9qZY^M)QPCY-S5v*~WHuu#;WvW)FJ} ze;@lfz(EdiSXYj4lw%y{grbw2;S|U zJKW_S_j$lW9+}z4JmD$Ncy1~$RQHlsyygvWdB=OjANa^8KJ$gIeB(Pm_-W>U@tZ#e zr4cK!78|h@^~+)}4&o?I;;cw37qN(|xQV-Xh^MZ3>8rQ+h_CAW#9sm=P=X{_QHX>} en1l-=ddfnCL`sxION_)yoWx6lBubJb>+WB&5yRO4 literal 756 zcmWN|cR-W{7{KB8`|iMF$sH$45PmPn2IV44D?AP>M-WhshA0QpP9v=>JNuxare#@L zY19>B!+}(^j6jQqMO3sk$!;XXy$`BkFVT2Pwq!>mNLy5*o zgt&;o%`g&Ti6g1d7EgkZ$Z(QKw!|}n6jJ#=D{10QXQYrpCRt=#Ql3LDdE`4NV3g$@ zO`+i76pA?2l7=yy#_5cOaRkobOwJOD8IP9|!AB_*I2+Ef0+F1{L}3z>nZkLNw3kuN z`BZdEk+ZXsDlWjdkf}^#y7b8mF5+S?K`vz`)y$$~Hl7;%)KXIyoK`q6hk7m(F6Roa zVs?iG|p2<`x$DJ+~qO7IPaGu11=C z6L04Zf0f+HT`XZKmCO8fcL$G!upHM4?lGG0Wu?&~_i;a~cmRsCU2PAtnl-{hJj^4k zZSu9Q<58L$+aD7iC&&{#DYUSjRyLSC#nU|F>wi|*$R;+k1=`Y#t+ex;gXej{KiI*G z!b`l&E4(Uf<25>Y-9Z=KrS9$Q5Z>TTdU(r9^S#YGyvt5_&#ZW#UOuplF@1c{c&O}=9v`)dQ=3kNvJAr1#?R~|7tj`9OP z3di_~pE+)sJ%jwhuly$b&I$hDPX~YTcWu`{{0sk;_KF&6+SR6ZHR?4~bci}MOvAe+ z${iM=ks77OP>oinx^VkqNObEkjTMi?X}l(AqB@6bl6aGKgc>QDs;HKDB~8=U;B+5hn5kc3VLN2Is%PH_HD-UY63 zgL{I92RyB`9Wo%}zxYh>Lgqx%EXay%79u-xASZGGpq0;U@yui06b!uK17G+dFZ_`Y z0SH8X1R)q9D1d?}gu*C-q9}&qD1nkFh0-X4vIs>vgdrReh(virAsR7=MFmtuB~(Tg zR7EvZM-9|OE!0LG)I~kiM*}oOBQ!=6G(|HsM+>w>E3`%%v_(6#M+bC7Cv-*^bVWCG zM-TKwFZ4zq^hH1P#{dk(APmM348<@E#|VtXD2&D!jKw&NM;s<#A|_!nreG?jVLE1D zCT3wa=3p-7VLldM;lH#9i?IYtu?)+x0xPi!tFZ=a5s!6Pj}6#}P1uaj@HxJ)+$5(j z@fEgUE4E=fc3>xVVK??*FZNkH_TvB!;t&qwYkY%m@g2U$5BSldpYSt&!LRrYzvB-a z!BHH;ah$+OoWg0G!C9Qcd0fCnT*75s!Bt$tb=<&B+`?_#!ClhTim{Fa4O8{>;Y!1~NZ`7|akBU_lmQVHROg7E4COS%M{5ilteG zWf{tH3}ZMW7|HUCVl-oz3MooSASHoMHG#w(8p{v+w*ueyZ$(yO;?3mGALC<9@=Wqm zd!^O;mu>aoH>FncOya4toUD9hIx1Zf4~HatW_c-7lF45_8I{4xSD~jo5_osH$yF|i z_WhMte)5%%ykR8kO&$x8+v-3;xs+2ml-)APrmV`6h>ul_q7|j`id2Nc6{d0uRauo$ zX_Zn*l~8dNQ&AOBVHHwA6;OzR6{P$MRDklSz1pd*+NiZ!sij(|xtgh|ny9fFsUaGu zzUry2>ZrDAsitbEx~i$Fs;IImsiG=qyvAv)s#`o}vjH2jzxt`K z`lz>hsi%6VySk~Xx~Q`{siQh*nU<;%8?yLOsx9isPVCGs?8jpTCa7A z$6Bq?YOK;qtLNDuWu_jONqbw{^#OE+~x*L6)-bw!tTNf&iN=XFkJbw;OkN+)$f z$8}7ZOh%Kzcp4AmZrqHkaWT%u$)q=qCY^CG_9m^dGqxs;No{OQD)UZn^+vDtN-y<7 z&-F|NOo$0KK_8tGJqLxR&uL X{h#vxlajzEoIv8%{8)egU;Y0l8x2FS literal 1904 zcmchW*LN0V8pP*I0)!q2z0QPr2|a`sdOipNLg>Bs4$?bff>Ym2}wwaa9$*i@#i85^;nFN;w+J$8jI|2 zo}IWqvm{HgbU`$;49mvS&c&BwLU|^!!uT~6*(Eu;su(M=^5yh|Dy+(C`Ddy#sRnD} zR4vwKqz>znRP;>$6kMzqy=n%cK2zC%4T(l<%qDC~G-Dc@Go5I`mTbk=L>p$XE!z?8 z*?}F|iRjEsM%jhv$}DzcHqo6u*poR#FXpm0`w)HEkNr7-7|1~!%pt^34&!i+AVzW& zM{^7@mg6{{6NrhN#L1jOOyx9A=L}*dXK^-fAm(r`=W#xapxsF)R4J_bBViPxW3%3&6xScz=li0=G+{3-Z9o)w| zc^9L1Uyj_v{k)erz=J%*!^9CD(+f|H+s5 zFYsl)!i&5FzRK75I^O`_=dl~)o}K^2v( zN>F80QB_rgs;h=-s#ct8tB&eMBZQ4yCJwTB;S) zT5Xh}wp6=VMD5i<=%`NWtV|)QF6yc*p_{VRT|I=J%26+Y*JF|Y*8eAX@pSy|yj)$( z>#dBu@_p1-h3OX}vCMgyZF55`EfyJGwuFo4IOAG^FD1u0mbUgnq^!$CGyADj1DD*N zRm5sFS50x1%L6LAQZ%oBqLN*4{F(|*N_2Ub%U|8tjo^lE;8fQy#b8JG)x#qx`O)(- zUDtIIUE8(rQcc&OtLLB3buZ_@J>A3Ioeg($mbif=m%U%WDq&($oHFUGq=oZ}y-KN{MR_mbk+MpNwe4L;2vwj90&co+? z)=&Ek{FI;c6Mh{2&foeQe+_@-FCFt2@aO)_pZXK{V}IlieHH$|@B2N!3%}zlzU;T* zxBRBx@aynve$|(J5v~#{he{zCp<<{Il0tcea-nP}6G|hL3ME5gD1lHs6blI<9w9D7 z0>X9p7ys;^{3HB>ulaiy!YxCKkRF;Nq=jaoX=sAbI5Y|ki=Yjup?)Y(0klz@v{_r$ zMsl}mTZt>%wFBCzUD~ZZP_4l!ip^#h#-&c3`r6ptt<3J6m{?#JwqSR67Z{*mf*ljPyPXNvXCMB& zzHaC2{JuQb{dnO`DpD&xq`^x`OFGhv40>lIlLx-?HDM;R!E7;+g{))~*~vjpa*>-n z|%@B zwz7@wZg#L!>|(cW4}00iehv^pq&UbSH-|Yw6ww?N#|YC>#1QM^I43yCDNY;C5Jx;` z#W~K43+leeCFL@~T8Q-uSCwl7X%4QFpxnU0O>XIKbBDX!!>;{vp9ehTkt~mSBA)V$ z=e*!0uawuk@#rn@crQK>pe6f=lTX5F`7Fy9l6~bH-$`_l#1G{szxeIu5B}PJe*vVk B6bJwS literal 676 zcmWNLWpI=S7zW=b9B@G4?!${NM}Pna4aKc|L4yZ(IINUX+@<9R7Tn!}ySqbihvG$w zy9DcR@^5E$c4qzI6ebZt3OvY@l2iz#CbO3`rnIgv9kD+oiS$-113vJF}C}S#1Im#Oqs7NI$hfTjw1(z73D%Ge?4XA0VMJ%^D zX%bRX^EC_5+?*D)G_^8X(}uRR3y0L64ut5KTz8@~UFhoNSGtAt8{HFJ{Z0?lAM}i% z7rp5dQr~0dM5`bD8GsFB5Q7g0 z(KLz4#7uEDm1#_Om2w6%nPr-7j?G~%^O%nou#iP8cI7N#sc9LBVZ|&b(+XCyDpAgA z)|l3^&Xuia0~^_dXER&aYTAaoJyAQ@$u9i6*<;$vgkVCn_OU;#100Ot5QjMu($NTx zah$(RC!#oMIz_tEoJqbvOaI`2sB>^0U7%<1qL)itMpsCtt6X#S57)&FZqg+fC*9&U zcerbg|6lHz?(+aWyylJRb!6;YbKc?Cdp>yi YNK#mz_#BVE@Re_g`rl8fU>{-j9a=N1jsO4v diff --git a/graphics/battle_anims/backgrounds/new/shattered_psyche.bin b/graphics/battle_anims/backgrounds/new/shattered_psyche.bin index 225d8e95f306009a6aab40fd1a56d2f9e74400f8..233f54c10477c49c18eb12233c141defcf7094ce 100644 GIT binary patch literal 896 zcmYk)Wl&X76oz3hA}J}Yz`H>Dn%Es+cPln_Cw6ytcPn;xcXxMpcf0O^VVrN~{5WSn z-(GvqF=0h&tVx575nJrA*Ery)NsANCxZsK#?xe#5PrUHP2VeX&=`oQ3e*y>u!;7Kq z2{OE;!;xSz5<)0pgcCs|QJBd@X7yRrXC)iii6#d*$whARXhUA|k>9WdC`cg+t1m)P zicy>xVktpMN>N%HOq8K4CTvrkZ9nH_p(4mb9WZZD>n7+UwpO=%~IEol|@lJ%gF9B+!lS^q?ob=uIE>ed$Mk z1~8C8I^ST1FjTE2!x*08V;I3mMlqT(I)f!+8OL}gFp)`2W(rf8#&m7)V}{z9%wjfk zm`kiV=>+qb&jJ=|7O|KmEM*zX^&VG{$VyhRT07UMUduZ5>)F6YHtEcp*uu@f`);vkNa zRuc8bEO8P~wVpVOi@1uLxJw-A#6vujJG{gXZwbLie8o@FO9t_mcmfO`D2Nz7NP=~Z ZB^lL+NT}`ne$VV#5*0pi3H@uvXN5o*^Aq>Y$I3@y{V5FEL6ctkpDNYGW;vi9! zBAU`j3}q-wEKWJ%#KdEe@>HNAm1qTNN@^qtxSg|PO z^CoZcHetPahdz?umyCYm_Gdt*J5UP6&maaf1Q|*W?=lSMJ%*c%_sPYC7{N$J8DIEl z@)#q-95WWiW#$I?fbkwaWC9aSx?|)cCNY^Q$W%UN8q@L4;1gzQk546EK4TWM`5gNT zGW;opUoyvLF7w39=PO|WU-J#$hD_7%SjhJ*N@B5@^@CZkgry;Qu#DxbVC8s|vx?Q~ zT_f(=5biwIF*s?xO+FjU*g9-XW|N67Fh@3!7(+*krSNc6sL(g z!&$4-Km2QD#h&AQsF8E&0vCl#T;>W_g=<{r1~-LU+~y8bj0Kl->w%5+KZQHhO+qP}nwr$(Cy~_&{kU#_`2tf%(a6%B0P=qE7VF^cg zA`p>CL?#MRiAHo{5R+KMCJu3lM|?mMkdQ@0trU*qTMsZ3|l2VkW3}q=tc`8tmN>ru_RjEdGYEY9} z)TRz~sYiVp(2zznrU^}HMsr%wl2){)4Q**hdpgjOPIRUVUFk-5deDELd)dc+4seh|9Oei|ImU5LaFSD; z<_u>!$9XPrkxN|W3Rk(tb#8EzTioUjce%%X9`KMyJmv{cdB$^I@RC=&<_&Lo$9q2T zkxzW)3t#!hcYg4bU;O3|e+ghf0~y#L1~r($4Pi(_8QL(0HJss%U_>Js*(gRen$eA6 zOk)|_IL0-e@kLEwLKB(TBqlYP$xUHOQ<>T{rZt`E&0t0|nb|C6HJjPZVNP?I+dSqq zpZP6dK?_;fA{Mon#Vuh;OIg}7mbIMatzbnfS=lO9wVKtfVNGjU+d9^@p7m{DLmS!H zCN{O1&23>zTiMz+wzZw@?O;bc+1W03wVU1TVNZM6+dlTSpZy)+KnFS4Ar5tz!yVyB zM>*Otj&+>lo!~?#IoT;rb(+(i;Y?>a+d0m4p7UMcLKnH%CI1IYUFLFExYAXwc8zOY Z=Xy7|(M@i4i(B31c6YebUG8>|{{R5J02=@R literal 1052 zcmWmBg<}o~0LI~WrY1i*?e}Un-Q8_^Y}oK&820Iynr^1MnU3kcbLF~RcZa*<%Jm)Y z`4^r*TDTNO7Q)GjvXPw}7L6l?5aZDVCNhc1XbMxA#&k4;RAw>@&1MdBNkj9P&jJ>rMJ#3sOVKixvx1dq z6{}f8I$Fy**0TX^WD}d&g0`}a?d(81*~M=55Vn_n?B{^ObdU@VaTp!pD91RCPH>V_ zoJN_P;VkFSc`k5~OXxCJxXLwjof|yH!UMeadHi&KKxQzT#`XLEmzR@Aw}5z+LX~Bl?M- z`GsH6eSYJ2{y=~77k~2)`j`KB@Tgs3&f;)qwX!+8b2z6J;atw`JXT)kbAAV`0xsx6 zE^HNXQAfI%Roo?9(xt4@F5|Msvdg)=D_9j>$(3Ejs_JTvaY1Kp&GsD6b(%HL^S!_etwmn!C0=SR^K!57N^6x@dyUhrwO;4--e7I?CU5o@ zYpb_;yLVVSz0143$J*!Z1k6R~v(x-gd%JdnZ^*QUjFZiM_ xS(kmqSAEU8?i-c@=zpo9xKLzB_mgiYXC|d5DJ2*aj82RS>P~z_;;n>?*oPEd4TAsx diff --git a/graphics/battle_anims/backgrounds/new/snuggle_forever.bin b/graphics/battle_anims/backgrounds/new/snuggle_forever.bin index a4bcc4440d2d31ceb954cbd82d167f0607304af4..3abd4431783972300e5c4d0ca3c7a872b26b0aee 100644 GIT binary patch literal 896 zcmW-X1#lDw6a|6c5C|3=cHsg64tIBVcXxMpcXyYdElve(k-DNS(n4LJg0#3@GCT9$ zpT93Y2?!%0iAYQml9G(%q#z~Xq#`vDp$-qEAuZ`hPX;2%NT$#yGg;zXSRgCe$W9J& z0+Nf|1c(Smk%zoQ6CKP)ehP$akb)GVFhz(85u_-^VmnZr5|pGAr71&M%2A#QRHPD> zsX|q%QJospq!zWQLtW}op9VCf5shg=WOP%S(VP~vq!q1cLtEO>o(^=R6P@WoSGv)i z9`vLaz3D?=`q7^O3}g_48NyJ8F`N;MWE7(r!&t^Ko(W835|f$2RHiYV8O&rBvzfzO z<}sfIEMyUjS;A75v78mGWEHDf!&=s{o(*hd6Pww>R<;qtc6P9nUF>ELZ}4Uud*gB+ z`#Hct4snPD zLmu&%Cp_gD&w0U1UJ=juCNRu|CNi-}OlmTdo5GZao66Kin8viGGrbv%G^3f!Y!MEiZNMn=nAd3Ynco5iEodPNTg0Lkv$!QJX(>xv#Od)vpp z_OrhO9OxhiJH(+5bGRcM=_p4##<7lbyc3-0Bquw?sZMjcGo0xxXFJEa&U3yCT<9Vf ryTqj~bGa*A8Df>IUE^BUx!w(Kbd#Ii;#RlC+1N#l+udPIRP6m4$fWka literal 988 zcmV~$1z-&b0LS6~v+-t(H!(5e_vek_jp>dt-QC^YUDMs&F?AhWaKRndo#KM);7;C& z3%)Ou86^eCMikK~J2?mvgK`o}E^-ryBM*5ADX6$`Jo(6v3Q&*)3XxG*@kJ;~VpLd( z6eEe^s03h2qEdtjMUqiz%8)`zB)Tl+D6galN~Ho7Nh3X3fe4kT911F2g{oAex~M@- zYEfI%p)U2PFB;I0bQ+1qWYC1Bq8ZI;K}*q!*0iCmXh(YzQaXr^bfPm|L|3}eogShm zz35FJ(U*SoXMh;UAO91@2)!ciWHx=d%5UO#u5gt<#GhQ_Iyb~kZgHEx#NXWEF89QJ{^4K#6aVu7IUr|ql%t(p z&f%bAoKucv_)fe0hNvdXX2)OT5&}yj))4 zm0so5@*1!8IEc%wIYbEX1Yyw%&hUEblH-sRo$9`E%&?@#jql0we%LB||&R&pp6 F=^@Y~?;-#I diff --git a/graphics/battle_anims/backgrounds/new/soulstealing_7star_strike.bin b/graphics/battle_anims/backgrounds/new/soulstealing_7star_strike.bin index 44eb2f82d37873ec3d8612aa44f9cd175742750e..9bbee7ab43894b318dcfee60baefe1ca5cfdd132 100644 GIT binary patch literal 896 zcmZY5XLJq*0EJAD-q(n|#ol`p#NM&@2(dSbnb>;&@4cwnF4Bp>lHpYSQ4@j0hB%^A+}1z++NU-J#$a*p#{ z;3D7gJ(sx54*@^&6F+l>tNg;RT;n>w@jExT8E}i++~F>N@F#!qH~095fBBF9xzB@S z4|&96o{++nrZTl@OlvyRo53J6n#s&&F{|0kZVrPDF{ioAZK!$7Yd-TEW&sOYNYug> zv8crix40!NX(>xv#(MndfiV;?|n$@jgO>0@(I@YzG^=)878`;<zTiMz+wzZw@jkJRu?PQdl?P6EE+1(!Yw3of@V_*B(-)ILo&_T%tJH(+5bGRcM z=_p4##<7lbyfIF2qOneLvQwPuH17ren(ho|2G%TRJ13C2&U3yCj5FSafnMZdm$=kr jCYb1QSGdwuu6B)UUFUi?xY12+c8gox=5}|OWDHLM_?`P! literal 968 zcmWO31!I*30EW@`V|Tz9uuC^QFWsX%HoCjJyBS@hySp2cMhSyZP*709E-X^%HaUOc zgcBpAfFwi^LXjjT8Oc!;DTpQ|N=0g72%|KlB^~Ke1~QU~%qR<4$wqdRgPi07WO9>- zyeJ>}DL_F~h{6=1C@MyAVkv=2Qi{@)L1igNc`BfaRH8CfP*ti?oj4Rv4Qf&g)us-0 zsfX&*fQB?ejcGztnxW>jpe3zPYueD3cBnla=tw8jnJ#pt8|qFEdeRH^rVoAThx#*s zfeb=}8NyJ85e#PpBS|38C`L1ev1lCQnZQIeiOEbM5lv+p)0u&0GK<;FL35eMd={XE zEMhTB2rXq9%N49ZD_O;A)}XblV?7(tMmDjTEodv-*v<~LlU=;RtLQae=MCOOyV=8D z_M!b8;2?+4TfEI-j-aC);~m~b@9{pzIYHz}PVoW3hlq~I$0nP2#o-_Y+|<2pA8ZgPv;{GmX9a)-Oz zL-%>WLmr{WJmD$N2tDToe-ZqR{^4K#dzr7mNgUyj73ri-=HynCQ#jfwtyE6!7>BJi zPV00|Z)I>sXL4pMi?ceLvs*cw)47ag=XM_FwemT?3%Hsj^PzzyBVYV0O%>Sk7R zw{T0hvRb>1+q#|A-W}Z0ovhC8;;!yyb$1W5Lh3mcm diff --git a/graphics/battle_anims/backgrounds/new/spacial_rend_opponent.bin b/graphics/battle_anims/backgrounds/new/spacial_rend_opponent.bin index e6227db9c9d8e449155452362f88ca325272b8be..44fab7fee209711e834a46e3c57c69bf169bee9e 100644 GIT binary patch literal 896 zcmW-dbyyZ=97QLnAYdT^_PO|b1@uD%6a!QQ6$9)pP>`?_0RwE;p_>b9vt743UFfEp zZn~KZW7DM_3v(O#+`sR0&b{UE!kh9`pdvo_QVBo&37|4ns7f`e6G#n$s7Wv(gc52Y z7HqW$vf2b%9qLk#`ZNGU7!5HTjR+@#NE*`w4^cEFnr6fhOB`_)YcbZGXlp@~c`Tlm zw4ya_NFb56w4*&qbRd}&I?{>Gq|$}1bfY_Iq?2xG)`On(qBp75hraZqf7yls3}g_4 z8NyJ8F`N-(kjY3!kwrG6$sw0K^2xV6%e5REL$+nvSjI7)2~1=XlbOO)rZJrYW>82G z#mr^OVs9AJ0QP%p*L?V?53iJjqimWf@QN49j_z z=XjnMSiwqGvC3B33R}$@UgRZ~+gjGKo(*hd6Pww>%e=y?yvFOi!JE9r+q}cOyvO@& zWgFYsZrg0DeZUTO@*yAH=YPy6>|!^c@)>*B%jbN-KKAn^UvYqge9bo;;xI=zT9zYr z*p6|WZ~2bz`GFIh`D zzlryF@een+$t`Ykhr9gCe>|Xa@{+g8tAZ-ZN4}~gKlv*_0nXp~xyq`ds;Z{y3RDdR zsiuMzqEOXRZPig-)l+>n5R$^wP$s8F3Ri?873m^exNEE?@+eAS?%w}R6|H89QLN(B zTrCu@mTINeYNG@ts;%0oy^_>H$x2a*OLiUANu8CdE=qJ=)lJ=%rgZgCPxVr7^-*8- zQ-2N6Kn>Dh4be~y({PPYhBB4uGTcawQkJqcS~<$qJ%c>uYmCNfoW^T{CTfxFwuX}0F5*cG`#SE2$}s{a90+wKkk literal 1000 zcmWO4heODD0LJ0BK~$(v*`Js1k5E#Ptz=X7UPYnoO&K|E@9hR|@4a#R+}?NG-h1D1 zd!Kv$h9_lvoD@SWam1qrG$esWs4}igIv^;Jn|_(1tCA=g&j-mQu=4Stt$T7>_0}k&$5%@spXtR2`g# zrZa(x9Q(^|iqJ->IIgQiN8Jx*k zoQ=-mT+ZWsbO9H#i;K|3T*9U7Mtj)H-moWVcesqpxdL6uu5cAsqieX9>$o1>z>VC* z&FB_x!y5cUV{3-|K?50df_4^#gLkD|vo$m2YLp5!T> z<{9)X&+$Ajpci?GmwAPlS2@ICUQ>(?heP3Y-av2i7H{(odYAWjpAXQ7e8k6mf(_lp`Fa=x8_+^dmpJV=I+jR&i`wp)cPLIbx%3Z`7UrTxwi}5$9?5~?(YE} zC=c>r7r9s-;t~(_P(>xtFc0?#d89{qU^H4DpE+*w|J|!S#?ouv?;2$HbmPUq+@J@?P34` diff --git a/graphics/battle_anims/backgrounds/new/spacial_rend_player.bin b/graphics/battle_anims/backgrounds/new/spacial_rend_player.bin index cae5112e003a1b2d5924c329d59bd2231481a186..7b479c88d672f56c52b5a2633d6b41aec8cdedca 100644 GIT binary patch literal 896 zcmW-eb$FKr0EAtS?sdEe_tCK)-LM`THEKPuTN=eyy3GY5pe3znO&i+Mj`nn*Bb|sNo&*v}BAFCY zNh6(*obEKII>pIOa-v0Nx?lpj(v9x)peMaTY;XF|mwsfBNfz1UkV_u<>mwC)*0Sj5gA}{m;&-Xmf^&HRk`CPzaF61IE<`ORDGA`!|u4D;I zLk*U(oE5BO6{}gpTGp}7YrV$nS>+9^@N#ct6Pww>R<7b|uHjm)<9cr3MsDI}ZsAt8 zaT~XD2Y0fa9qjOS-^JbB!@X?tecaCjJjg>l%p*L?V?53iJjqi$%`?Y0c$S^);yHG+ zhrR4$pZ9u?cl&vEd8c3CMPA}%_H%$&c$L?9oi})sw?gdOyu-V^$NPN1hkV4x9OMv( ze9)ipDWCBZ)$)t{&>CUh1tr>Z^XrP^Pk!tsLblFXY@HC&*WS4bVUh(qIkIPz}>? zjnGJq(rAs*SQV&HMJiSmB`Q^!$~8_EsyxnD1{J}0P0&P5(qvU>il%CsrfY_(Rij$f Osa_3gRFh_Emi_~I!0bK% literal 996 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 diff --git a/graphics/battle_anims/backgrounds/new/water_pulse.bin b/graphics/battle_anims/backgrounds/new/water_pulse.bin index 0982424c63433ea0fc13a7591f3f6d68f7ae4b97..f6cc14657fac5dbae19f34921823a3d2b08cdc1f 100644 GIT binary patch literal 896 zcmbWvV{aG$6h`69w*AbuZQHhO+qP|XHagq3%^$IL$+C7?vTivaZf^3P6Hd7QBz%w; zK}3;67DZIiL>EI$vBVZfT=B%0KthQmmPAs?B$q-;sic+$X{D211{r0NSr%DklU)uu z<&s+-dF7K|0Rb=6Z}0}VCO zSQAY((_9NJwbEJ}ZMD;02OV|NSr=V((_Ife_0n4(ef87d00Rv&*bqYvGu#LxjWXI8 zV~sQ31QSg%*%VVvGu;d`%`)2@bImi~0t+p&*b+-Ev)l?Rt+Lu0Ypt{11{-a%*%n)E z6A)&$+hM0&Vcv%<@3zNY`|Nk%pZ$XlIqZm|jtLARz;P#>bjoRGoOSMx#q%z>=#tB> zxcb8jc7wSV>I-z;4L3tIZn^D_yY9K~frr2Ce|AFNM;?3Psb`*h;iXqzd*f{w%wLsv YK~^yDeeltze{zE>pMCMwx4(Md0VT#JbN~PV literal 600 zcmWmB1y>Vb0EW@`V`4IxVhu$fY%EknW{cfow_7eD2ST~QHa7s zQbZI5q9`VcQ-YF|5~V3aG-X9O%2R=gB8Ey-rizHADsfa3@p!0C4N;R?)TWN8OFa^( zFB;I0Ml=>pXi77hix#w`6|F@Z5@}02(Vh-;q?71O7rN3-bf*VB=_PuTL?8N!e)MMm z1H~W)GlZdH7{eLCNHL1hjA5)8$9N`?EG9CE$xIPbnZ|Txh!nicWR{rC9Og1l%x3`$ zStJ&-grzJK%UQunR*BWDVJ+*#dN#0;O(K=eY+|;L%JfvkN z;5^8oP!4m%x~<7DN5wIYbApo|PT5Fne8HzVBhGS;^IQPGOd1!tBrX%+3Rgq8#&sL3 zup8(mx46w6BJOgJ_(aEjpVJ@210M3om+)9T;VI8}?%)M4Ne{$WBR{Wr%^UQVcf98V s`bY+!_)PK_8*NQe>Q}|N%r^($`N2;cWsTRD{)^xI;cvjY1OJfz13JB^$^ZZW diff --git a/graphics/battle_anims/backgrounds/new/waterfall.bin b/graphics/battle_anims/backgrounds/new/waterfall.bin index 0fbe00ac638522361e182ee6aa56cbdf876bec29..076beeff2fe1ba44277bad014102fbcc7c3180bc 100644 GIT binary patch literal 2048 zcmXw21(a1s6yxK%xG#`Ef-dgv?(XjH?(E|3&f@NFEmWZH?nUbEUOIf}nUmZkcix;g zb7mrlgpoAL$&ef=kP@koI`}k5i*!hj42TIXMi~QVLgv6(kQLdG9XXIQxCn9~ci=q8 zi&*4CeiQ&e6ht8iMqv~|Q4~XQlt3Ixq7+J_49cP$%A*1*q7o{j3aX+Ss-p&Kq84hS z4(g&F>Z1V~q7fRS37VoAnxh3;q7_=B4cej|+M@$Hq7yo!3%a5kx}yhrq8ECj5Bj1X z`eOhFVh{#n2!>)9hGPUqViZPW48~#{#$y5|ViG1}3Z`Njreg+XVism&4(4JW;*o&) zSb&9C6!y0mORyBnf?AFhfmdP`R$~p;Vjb3F12$q4HitZdE!c`}*dEp4112^#$p2jnH7SG{%ynq++5?;nDconbVb-aN$ z@fP03J9roG;eC975AhK`#x2~&9o)qy_!OVvb9{j>@fE(tH~1Fc;d}gmAMq1@#xM94 zzu|ZMfj{vV{>DG}7x$2a5hi6aCT9w!WGbd+8m47Bre_AmFe5WDGqW(953?~lBgny= z%*EWy!@P`TKIRWu0fJ;f7NY3jV_ldwOE^VSU2c;tj`8)$VP0;CTz-PY|a*J$yRL5Hf+mwY|jqt$WH9c zF6_!~?9LwS$zJTuKJ3eW?9Txl$Uz*;AsotK9L^CO$x$55F&xWr9M1`y$Vr^cDV)k_ zoX#1X$yuDuIh@ORjAsJpa{(7}5f^g_mvR}Ga|Ks&6<2c&*K!@#a|1VW6E|}Uw{jb| za|aW-le@T^d%`aE2JGX09tiay5AiUM@FpYn4`pKUtyWftP8imS}NMi?mP+G+zmd z*F4SD9L?4&&D0D{*ECJl6iwD7O$;;l1l%9HLrv5!?Nnk=JHm;^JnU@OHf`0GsN1Yf z+Ncd$uXS3hH6c6oaMpuW!Yhxi_Q0Lg2_4rl9Sw8hqw|jFuny^<4rssjX|G<<%X&#K z>IFTo=k%Iprr$8=rS^r#-uRbA0#UD8Ee(0QHHS)I{o{h;sloxasK z`dVMJeZl8_&S!nbr+q5qCj(CSxR3d$kNB_;`Cv#6c)$0B Hx;NlI69yLt literal 2128 zcmWN|Wk8k(8wKF=yntdMcI&y}+=_{c*h<*lVqswyb~grgcVTyTt=#6yO}Dvj*X`Qn z_g(+5Xhb3|U~~{-L>R-t2DfI~Qx!#Erq!I2!r(cl=41{3@;v64!uhxsL0(0o=$<+{`VJ z+{$g%VLNw3aVK|K@1Q|YefPp(=pN>9FCv0C?n^GUKbUoZ2f;%;%p*LSm&bVAR%Hbn zPJkzQil=!dnnkMB+8=O{?sm>o>*Cqq`Z=B_F7P5R@iK9RS9y)si5tAh$M`t$1fS$n zyhS|CXZS2{6VLH^zQ7lWmw1OS^A+MQ@9|Z>M!e4Ze1mTiZ}Dxu!*_}I_&z`2hr~zx zn4jM#>!eb zD~}?mU^KHB3y(FKBetvu6|IuRS!KkdidD60R^5Uc7H>7J7E;0k*0u!Zu4BoG=u+3} zS$&IWU=6Ji1~f(nnpjgyvSdq6L1wBov*v~t*3w#8YeO4rYwfJPp@Vg_PS)Ab#kyKI z>u%^_JuS_88G2hE>udcC>DJ!{*g(S|8*CXi#4yx`*>D?S7-^$yw2d*0wQ-hd;|&vR zqD`{NhAB4HrrC7E44Y}QY_?&J&9!+p->|?IT9z#`EVd=K)UplBY`Lwlm4;Qe+Sb@w z!#Z1U8*HOtlWn#ww$-rBw%ZQdY1n1EZI9(x#9rHH`-8*-L4)vvcE}C~DMt)P?U)_6 z6BcpOPTA?8+nFE@XYHJww+n`gcF8W=6^poP*X(+bc_WyF5-P4@Dyl+7R5+AgNYSAT z7F5E+0?My^k;*$6idPM&x~i$Fsz8+$r%I{_ zxujUdKqjh!%0uN;R%KK=J9N90O2*vju5M6Qbx~(^f;y^$+N&MZR&CT;t)P}_q2_7^ zr7A_qN`jiIi5jaB)KCpnU-h86O4MXcf+lK$#w!yVr?DEN(aI zf#yT=G*@#p8=9q=nxW|-P196O30t>6r`e``VY~KduX3trPuStzL6@jzr+0<4Q#-Uh z_U1NdtF~yfHifiN8?-*`-r1a6_ZMY7IHS`#l~*TqBJ5FC>_5k$V>+rMIt(4sK^@RN z=&oMT%en)-q!;yqo`;^(Z9S`Jpr>_9Pw7eM2|cdIbQ8Lv>$;|^&=pst1r+@Vi^tb-fpLzuSq2KkJeuaL~ z&-zJK;Z;0fWseJaC9mjZ!z2EmjUT@}}Md?HbQVr$*k;8+iRlujh4`V9DVpXO723VgCp@`*kHKHf8ZoR5W%@zFlYN5V(= za3AJF;X{1C@AJLz9N*)+eHVPE@9^!u4ZhX4_-5Y(-{>2By|06>^)v0#`pL|JQ`fWJb@qM- zdvMaE{r3+)kS<+~kl$)Xw`!@aPMGTc^>RJ+HPA3gwC-px<ZP|n`s$~@0R|dmupx#TX1EbX$~8(}WVC!^6jW0f znkr+1af%chZ-R*?nQV%wrllk$O%F*bF~iJ|l0?!hv&}KrJo7EE&?1X1vD7llBP*=5 z%4%z@jjgjjw!uc5Y_`SL$Tp=)6Wi^u(=NM%J@!V*?6Y6F0}h7#amZmu9CgfbC!BQ3 zX=j{u&UqJHbjf8`f~%2ht_L?#+fBFJcE?@!-1opkk39CoQ_np2!b`8b_QqT9ypMhG dF{MJKibU1+$!A|ezJ{hUOy7JD?+-s?zW_AAo!0;W literal 520 zcmYL^$5#^p7zckJn_y6*8?a*;B_g6I*ek3JtQfKPwPQ!@l?bT8f{48#V(-E3jX#Nt zXXQN(ygAHV$BjEGGTN<+e_h#Ge>>F>Op!SRoAaFjSwT|imQ-G-y`arWqdRU7ddkA| z!tITVMMy^(^r0{Pu>K5SAcJJeWH3V*iiQEh89^Y6C?kE#CN>JoQO0O;(HO>($2c^e zdP%KJV$RZYtB`jqbrMWEk zEGAn)uq?z%R>>)g#>8sYu$FaVJsa4_Cb5|W)I~F-}bW4xBVOt z2RX!HD&p7?DyfVf6~{Qv2~H+tr#OwB;jB2vc`i`ZCa1#UT%;P+P|GDQqbnq+<0`tw zb#73P-K2qAGNd4)rncSGw%ydW?cV%(lX>lQrgLWY?(V(k zn`??0=2&2+=(AHq4`Twfz zXio<^(uvM=A)W-f(v9x)_^%m9PkPatKJ+D#e)MMm0~y3%hA@<23}-}o#z;mnnlX%3 zjAOiF0u!0UWTr5cc>Oe{GlQATVm3+4VJ`ES&jJ>zghk3(Y{U|ls%aU^S;0zHv053a ztYIzdv~E2c*vKX}vxTjinM^X<*v<~cPIj@IJ?v#4`#E5+(=yWPK@Mr#!yMr#$2iUj zjgy?>G-o)=InHx|i(E3YFLQ;f+MGg){u|>;V$>M&jTJR9;v&>JmINP zg7F{z?4R+R7rf*ZuX)2;-YM%nANa^8KJ$gIeETcsJ3sho*!{vpOvOxLu2l=M6f4n* zwV1@FZf(R?>?8?$aS%swQe7&};-WfNaT9m(5Kr+EU8J}8h_CpGzXXVh1WJ$~BEb?O ZdI^;@KZ^I=*%ZQXHiIy0NmEYoV0a*Y5 literal 760 zcmWO4g?|)u9LM3$?{>HCw!vAd-T?(E}vJ0F-Vp zXhf+IN@IY95`uIcNUEUw7oOJ>2t`N^4-t3?`f!m%5sm!B5K9~?LQ&!gpahDMNO6=z z2}+WTH-%D^mMeqGQjYR~j8rO+hSI4>B`V`Gs6r-La^7qnpsM`UP<3ihlLt`_wWv)U zRF`_xrvWaPhiFJpPK{_x6PlujX~rWo$NMOc@p#ZZfm+a#RTxYuA)RkxGMjm>W=jcuk)RSI3&kML0d5M>KC0Ms0>{|PK(}!14UtXgh{m}ph zGKj$>zs`_w<_R~HH^iH~#oG)MA%-)8kzy318N*l)`HW+HUd;*O9VRk~$@y|qcvo&J z?}_*MfDf4_2Bb}A1|Nx!naM0>i#g0?9`j>Zz(U&l8)vRGH>+r4T3pP;y%R<_(*vKZi&1ef-DPS9s+u6a+VD1#(*YFMPcCnj1 z9`>@2{kQ|-Am8#G--{nO#9@AfpF+7m^9#R*m~ez6X}|G%Do2@djN@u}Lj1u=PVr|9 zr#T~cR%g$}ah?m|VPVHbaf!=Z;i?F8jqCgsa_Kj?$t`Y+JKW`O{uxn_^Dp7$RbwM;^j|h6TlLbSj-ZwxGc#^SV@ag wMzWCvSiuzKccR{%m4rY diff --git a/graphics/battle_anims/backgrounds/spacial_rend_opponent.bin b/graphics/battle_anims/backgrounds/spacial_rend_opponent.bin index e6227db9c9d8e449155452362f88ca325272b8be..44fab7fee209711e834a46e3c57c69bf169bee9e 100644 GIT binary patch literal 896 zcmW-dbyyZ=97QLnAYdT^_PO|b1@uD%6a!QQ6$9)pP>`?_0RwE;p_>b9vt743UFfEp zZn~KZW7DM_3v(O#+`sR0&b{UE!kh9`pdvo_QVBo&37|4ns7f`e6G#n$s7Wv(gc52Y z7HqW$vf2b%9qLk#`ZNGU7!5HTjR+@#NE*`w4^cEFnr6fhOB`_)YcbZGXlp@~c`Tlm zw4ya_NFb56w4*&qbRd}&I?{>Gq|$}1bfY_Iq?2xG)`On(qBp75hraZqf7yls3}g_4 z8NyJ8F`N-(kjY3!kwrG6$sw0K^2xV6%e5REL$+nvSjI7)2~1=XlbOO)rZJrYW>82G z#mr^OVs9AJ0QP%p*L?V?53iJjqimWf@QN49j_z z=XjnMSiwqGvC3B33R}$@UgRZ~+gjGKo(*hd6Pww>%e=y?yvFOi!JE9r+q}cOyvO@& zWgFYsZrg0DeZUTO@*yAH=YPy6>|!^c@)>*B%jbN-KKAn^UvYqge9bo;;xI=zT9zYr z*p6|WZ~2bz`GFIh`D zzlryF@een+$t`Ykhr9gCe>|Xa@{+g8tAZ-ZN4}~gKlv*_0nXp~xyq`ds;Z{y3RDdR zsiuMzqEOXRZPig-)l+>n5R$^wP$s8F3Ri?873m^exNEE?@+eAS?%w}R6|H89QLN(B zTrCu@mTINeYNG@ts;%0oy^_>H$x2a*OLiUANu8CdE=qJ=)lJ=%rgZgCPxVr7^-*8- zQ-2N6Kn>Dh4be~y({PPYhBB4uGTcawQkJqcS~<$qJ%c>uYmCNfoW^T{CTfxFwuX}0F5*cG`#SE2$}s{a90+wKkk literal 1000 zcmWO4heODD0LJ0BK~$(v*`Js1k5E#Ptz=X7UPYnoO&K|E@9hR|@4a#R+}?NG-h1D1 zd!Kv$h9_lvoD@SWam1qrG$esWs4}igIv^;Jn|_(1tCA=g&j-mQu=4Stt$T7>_0}k&$5%@spXtR2`g# zrZa(x9Q(^|iqJ->IIgQiN8Jx*k zoQ=-mT+ZWsbO9H#i;K|3T*9U7Mtj)H-moWVcesqpxdL6uu5cAsqieX9>$o1>z>VC* z&FB_x!y5cUV{3-|K?50df_4^#gLkD|vo$m2YLp5!T> z<{9)X&+$Ajpci?GmwAPlS2@ICUQ>(?heP3Y-av2i7H{(odYAWjpAXQ7e8k6mf(_lp`Fa=x8_+^dmpJV=I+jR&i`wp)cPLIbx%3Z`7UrTxwi}5$9?5~?(YE} zC=c>r7r9s-;t~(_P(>xtFc0?#d89{qU^H4DpE+*w|J|!S#?ouv?;2$HbmPUq+@J@?P34` diff --git a/graphics/battle_anims/backgrounds/spacial_rend_player.bin b/graphics/battle_anims/backgrounds/spacial_rend_player.bin index cae5112e003a1b2d5924c329d59bd2231481a186..7b479c88d672f56c52b5a2633d6b41aec8cdedca 100644 GIT binary patch literal 896 zcmW-eb$FKr0EAtS?sdEe_tCK)-LM`THEKPuTN=eyy3GY5pe3znO&i+Mj`nn*Bb|sNo&*v}BAFCY zNh6(*obEKII>pIOa-v0Nx?lpj(v9x)peMaTY;XF|mwsfBNfz1UkV_u<>mwC)*0Sj5gA}{m;&-Xmf^&HRk`CPzaF61IE<`ORDGA`!|u4D;I zLk*U(oE5BO6{}gpTGp}7YrV$nS>+9^@N#ct6Pww>R<7b|uHjm)<9cr3MsDI}ZsAt8 zaT~XD2Y0fa9qjOS-^JbB!@X?tecaCjJjg>l%p*L?V?53iJjqi$%`?Y0c$S^);yHG+ zhrR4$pZ9u?cl&vEd8c3CMPA}%_H%$&c$L?9oi})sw?gdOyu-V^$NPN1hkV4x9OMv( ze9)ipDWCBZ)$)t{&>CUh1tr>Z^XrP^Pk!tsLblFXY@HC&*WS4bVUh(qIkIPz}>? zjnGJq(rAs*SQV&HMJiSmB`Q^!$~8_EsyxnD1{J}0P0&P5(qvU>il%CsrfY_(Rij$f Osa_3gRFh_Emi_~I!0bK% literal 996 zcmWO41!ENi7>3bz$>>XO+v?$fOooC@X43W@LoYBP~)RB~+U_)TJJ(PXii~K#gcj6PluC zG^YjGD2JA`qBUwmTiO94+C|%F6KWl;qGjZSOnW*IC`m^;(V6rvbfudLyQ3cTq!+zW zA9CqS9?GYHe)J0!M1JH&-%xJ!iQds44PYRJ3_^n$LJ>pJForXNkt9YjT5F0aL8Xjg zEaT94CNLq!hsMR&7!#$Tk|>UeOhRQ$W(rf$G^R6ynIvX0Ticp52hF9Nc~qeJR8mDX zTEK#+j;c^)%#Vtg7b=g1EaEV9I7e_KN1>xRhGRJn9nT4z$VupA7PEw zRk1QwgqFv$SQ<-0i{lhda4R=uFPyY|bJ5T+ZYClwlX3wXEYp)}xEqz(zKq zO|daH#KmZRT*A6o8@iOsxST7{m0ZQuT!XIVIx}OJlkcZI2Ji? zJ9fph>KU7^dTSdG5gSd_Q$^X z1bxb9e9jl>OTOZ3zCqve9pCc<`jMabnP1Sa{KoJ6f&SzGfAKf^hkvQzAUedMI2bh{ zImM|?vkpYMGn{GFa+Yhmj#bz7T;C0x)zAqy+TO^G Date: Sat, 30 Oct 2021 10:02:25 -0300 Subject: [PATCH 11/26] Fixed Pikalax's PR --- src/graphics.c | 78 +++++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/src/graphics.c b/src/graphics.c index 2d0ff9a5c..70b50eadf 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1407,88 +1407,88 @@ const u32 gBattleAnimBgTilemap_RockWrecker[] = INCBIN_U32("graphics/battle_anims const u32 gBattleAnimBgImage_SpacialRendOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/spacial_rend_opponent.4bpp.lz"); const u32 gBattleAnimBgPalette_SpacialRendOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/spacial_rend_opponent.gbapal.lz"); -const u32 gBattleAnimBgTilemap_SpacialRendOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/spacial_rend_opponent.bin"); +const u32 gBattleAnimBgTilemap_SpacialRendOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/spacial_rend_opponent.bin.lz"); const u32 gBattleAnimBgImage_SpacialRendPlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/spacial_rend_player.4bpp.lz"); const u32 gBattleAnimBgPalette_SpacialRendPlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/spacial_rend_player.gbapal.lz"); -const u32 gBattleAnimBgTilemap_SpacialRendPlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/spacial_rend_player.bin"); +const u32 gBattleAnimBgTilemap_SpacialRendPlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/spacial_rend_player.bin.lz"); const u32 gBattleAnimBgImage_DarkVoid[] = INCBIN_U32("graphics/battle_anims/backgrounds/dark_void.4bpp.lz"); const u32 gBattleAnimBgPalette_DarkVoid[] = INCBIN_U32("graphics/battle_anims/backgrounds/dark_void.gbapal.lz"); -const u32 gBattleAnimBgTilemap_DarkVoid[] = INCBIN_U32("graphics/battle_anims/backgrounds/dark_void.bin"); +const u32 gBattleAnimBgTilemap_DarkVoid[] = INCBIN_U32("graphics/battle_anims/backgrounds/dark_void.bin.lz"); const u32 gBattleAnimBgPalette_SludgeWave[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/sludge_wave.gbapal.lz"); const u32 gBattleAnimBgImage_Aeroblast[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/aeroblast_tiles.4bpp.lz"); const u32 gBattleAnimBgPalette_Aeroblast[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/aeroblast.gbapal.lz"); -const u32 gBattleAnimBgTilemap_Aeroblast[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/aeroblast_map.bin"); +const u32 gBattleAnimBgTilemap_Aeroblast[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/aeroblast_map.bin.lz"); const u32 gBattleAnimBgPalette_AuraSphere[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/aura_sphere.gbapal.lz"); const u32 gBattleAnimBgImage_BlackholeEclipse[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/blackhole_eclipse.4bpp.lz"); const u32 gBattleAnimBgPalette_BlackholeEclipse[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/blackhole_eclipse.gbapal.lz"); -const u32 gBattleAnimBgTilemap_BlackholeEclipse[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/blackhole_eclipse.bin"); +const u32 gBattleAnimBgTilemap_BlackholeEclipse[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/blackhole_eclipse.bin.lz"); const u32 gBattleAnimBgImage_BloomDoom[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/bloom_doom.4bpp.lz"); const u32 gBattleAnimBgPalette_BloomDoom[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/bloom_doom.gbapal.lz"); -const u32 gBattleAnimBgTilemap_BloomDoom[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/bloom_doom.bin"); +const u32 gBattleAnimBgTilemap_BloomDoom[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/bloom_doom.bin.lz"); const u32 gBattleAnimBgImage_BoltStrike[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/bolt_strike.4bpp.lz"); const u32 gBattleAnimBgPalette_BoltStrike[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/bolt_strike.gbapal.lz"); -const u32 gBattleAnimBgTilemap_BoltStrike[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/bolt_strike.bin"); +const u32 gBattleAnimBgTilemap_BoltStrike[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/bolt_strike.bin.lz"); const u32 gBattleAnimBgImage_ClangorousSoulblaze[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/clangorous_soulblaze.4bpp.lz"); const u32 gBattleAnimBgPalette_ClangorousSoulblaze[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/clangorous_soulblaze.gbapal.lz"); -const u32 gBattleAnimBgTilemap_ClangorousSoulblaze[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/clangorous_soulblaze.bin"); +const u32 gBattleAnimBgTilemap_ClangorousSoulblaze[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/clangorous_soulblaze.bin.lz"); //const u32 gBattleAnimBgImage_DarkVoid[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/dark_void.4bpp.lz"); //const u32 gBattleAnimBgPalette_DarkVoid[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/dark_void.gbapal.lz"); -//const u32 gBattleAnimBgTilemap_DarkVoid[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/dark_void.bin"); +//const u32 gBattleAnimBgTilemap_DarkVoid[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/dark_void.bin.lz"); const u32 gBattleAnimBgPalette_DynamaxCannon[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/dynamax_cannon.gbapal.lz"); const u32 gBattleAnimBgImage_ElectricTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/electric_terrain.4bpp.lz"); const u32 gBattleAnimBgPalette_ElectricTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/electric_terrain.gbapal.lz"); -const u32 gBattleAnimBgTilemap_ElectricTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/electric_terrain.bin"); +const u32 gBattleAnimBgTilemap_ElectricTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/electric_terrain.bin.lz"); const u32 gBattleAnimBgImage_Fire1[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/fire1.4bpp.lz"); const u32 gBattleAnimBgPalette_Fire1[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/fire1.gbapal.lz"); -const u32 gBattleAnimBgTilemap_Fire1[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/fire1.bin"); +const u32 gBattleAnimBgTilemap_Fire1[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/fire1.bin.lz"); const u32 gBattleAnimBgPalette_Fire2[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/fire2.gbapal.lz"); const u32 gBattleAnimBgImage_FocusBlast[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/focus_blast.4bpp.lz"); const u32 gBattleAnimBgPalette_FocusBlast[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/focus_blast.gbapal.lz"); -const u32 gBattleAnimBgTilemap_FocusBlast[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/focus_blast.bin"); +const u32 gBattleAnimBgTilemap_FocusBlast[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/focus_blast.bin.lz"); const u32 gBattleAnimBgPalette_GarbageFalls[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/garbage_falls.gbapal.lz"); const u32 gBattleAnimBgImage_GigaImpactOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/giga_impact_opponent.4bpp.lz"); const u32 gBattleAnimBgPalette_GigaImpactOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/giga_impact_opponent.gbapal.lz"); -const u32 gBattleAnimBgTilemap_GigaImpactOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/giga_impact_opponent.bin"); +const u32 gBattleAnimBgTilemap_GigaImpactOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/giga_impact_opponent.bin.lz"); const u32 gBattleAnimBgImage_GigaImpactPlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/giga_impact_player.4bpp.lz"); const u32 gBattleAnimBgPalette_GigaImpactPlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/giga_impact_player.gbapal.lz"); -const u32 gBattleAnimBgTilemap_GigaImpactPlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/giga_impact_player.bin"); +const u32 gBattleAnimBgTilemap_GigaImpactPlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/giga_impact_player.bin.lz"); const u32 gBattleAnimBgImage_GrassyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/grassy_terrain.4bpp.lz"); const u32 gBattleAnimBgPalette_GrassyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/grassy_terrain.gbapal.lz"); -const u32 gBattleAnimBgTilemap_GrassyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/grassy_terrain.bin"); +const u32 gBattleAnimBgTilemap_GrassyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/grassy_terrain.bin.lz"); const u32 gBattleAnimBgPalette_GunkShot[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/gunk_shot.gbapal.lz"); const u32 gBattleAnimBgImage_HighSpeed[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/high_speed.4bpp.lz"); const u32 gBattleAnimBgPalette_HighSpeed[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/high_speed.gbapal.lz"); -const u32 gBattleAnimBgTilemap_HighSpeed[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/high_speed.bin"); +const u32 gBattleAnimBgTilemap_HighSpeed[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/high_speed.bin.lz"); const u32 gBattleAnimBgImage_HydroCannon[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/hydro_cannon.4bpp.lz"); const u32 gBattleAnimBgPalette_HydroCannon[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/hydro_cannon.gbapal.lz"); -const u32 gBattleAnimBgTilemap_HydroCannon[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/hydro_cannon.bin"); +const u32 gBattleAnimBgTilemap_HydroCannon[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/hydro_cannon.bin.lz"); const u32 gBattleAnimBgImage_HydroPump[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/hydro_pump.4bpp.lz"); const u32 gBattleAnimBgPalette_HydroPump[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/hydro_pump.gbapal.lz"); -const u32 gBattleAnimBgTilemap_HydroPump[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/hydro_pump.bin"); +const u32 gBattleAnimBgTilemap_HydroPump[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/hydro_pump.bin.lz"); const u32 gBattleAnimBgPalette_HyperBeam[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/hyper_beam.gbapal.lz"); @@ -1496,33 +1496,33 @@ const u32 gBattleAnimBgPalette_HyperspaceFury[] = INCBIN_U32("graphics/battle_an const u32 gBattleAnimBgImage_InfernoOverdrive[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/inferno_overdrive.4bpp.lz"); const u32 gBattleAnimBgPalette_InfernoOverdrive[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/inferno_overdrive.gbapal.lz"); -const u32 gBattleAnimBgTilemap_InfernoOverdrive[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/inferno_overdrive.bin"); +const u32 gBattleAnimBgTilemap_InfernoOverdrive[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/inferno_overdrive.bin.lz"); const u32 gBattleAnimBgImage_LeafStorm[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/leaf_storm.4bpp.lz"); const u32 gBattleAnimBgPalette_LeafStorm[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/leaf_storm.gbapal.lz"); -const u32 gBattleAnimBgTilemap_LeafStorm[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/leaf_storm.bin"); +const u32 gBattleAnimBgTilemap_LeafStorm[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/leaf_storm.bin.lz"); const u32 gBattleAnimBgPalette_MagicRoom[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/magic_room.gbapal.lz"); const u32 gBattleAnimBgImage_MaliciousMoonsault[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/malicious_moonsault.4bpp.lz"); const u32 gBattleAnimBgPalette_MaliciousMoonsault[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/malicious_moonsault.gbapal.lz"); -const u32 gBattleAnimBgTilemap_MaliciousMoonsault[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/malicious_moonsault.bin"); +const u32 gBattleAnimBgTilemap_MaliciousMoonsault[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/malicious_moonsault.bin.lz"); const u32 gBattleAnimBgImage_MaxLightning[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/max_lightning.4bpp.lz"); const u32 gBattleAnimBgPalette_MaxLightning[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/max_lightning.gbapal.lz"); -const u32 gBattleAnimBgTilemap_MaxLightning[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/max_lightning.bin"); +const u32 gBattleAnimBgTilemap_MaxLightning[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/max_lightning.bin.lz"); const u32 gBattleAnimBgImage_MistyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/misty_terrain.4bpp.lz"); const u32 gBattleAnimBgPalette_MistyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/misty_terrain.gbapal.lz"); -const u32 gBattleAnimBgTilemap_MistyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/misty_terrain.bin"); +const u32 gBattleAnimBgTilemap_MistyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/misty_terrain.bin.lz"); const u32 gBattleAnimBgImage_NeverendingNightmare[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/neverending_nightmare.4bpp.lz"); const u32 gBattleAnimBgPalette_NeverendingNightmare[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/neverending_nightmare.gbapal.lz"); -const u32 gBattleAnimBgTilemap_NeverendingNightmare[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/neverending_nightmare.bin"); +const u32 gBattleAnimBgTilemap_NeverendingNightmare[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/neverending_nightmare.bin.lz"); const u32 gBattleAnimBgImage_Nightmare[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/nightmare.4bpp.lz"); const u32 gBattleAnimBgPalette_Nightmare[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/nightmare.gbapal.lz"); -const u32 gBattleAnimBgTilemap_Nightmare[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/nightmare.bin"); +const u32 gBattleAnimBgTilemap_Nightmare[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/nightmare.bin.lz"); const u32 gBattleAnimBgPalette_PoisonFalls[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/poison_falls.gbapal.lz"); @@ -1530,19 +1530,19 @@ const u32 gBattleAnimBgPalette_PsychicNew[] = INCBIN_U32("graphics/battle_anims/ const u32 gBattleAnimBgImage_PsychicTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/psychic_terrain.4bpp.lz"); const u32 gBattleAnimBgPalette_PsychicTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/psychic_terrain.gbapal.lz"); -const u32 gBattleAnimBgTilemap_PsychicTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/psychic_terrain.bin"); +const u32 gBattleAnimBgTilemap_PsychicTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/psychic_terrain.bin.lz"); //const u32 gBattleAnimBgImage_RockWrecker[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/rock_wrecker.4bpp.lz"); //const u32 gBattleAnimBgPalette_RockWrecker[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/rock_wrecker.gbapal.lz"); -//const u32 gBattleAnimBgTilemap_RockWrecker[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/rock_wrecker.bin"); +//const u32 gBattleAnimBgTilemap_RockWrecker[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/rock_wrecker.bin.lz"); const u32 gBattleAnimBgImage_ShatteredPsyche[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/shattered_psyche.4bpp.lz"); const u32 gBattleAnimBgPalette_ShatteredPsyche[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/shattered_psyche.gbapal.lz"); -const u32 gBattleAnimBgTilemap_ShatteredPsyche[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/shattered_psyche.bin"); +const u32 gBattleAnimBgTilemap_ShatteredPsyche[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/shattered_psyche.bin.lz"); const u32 gBattleAnimBgImage_SkyDay[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/sky_day.4bpp.lz"); const u32 gBattleAnimBgPalette_SkyDay[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/sky_day.gbapal.lz"); -const u32 gBattleAnimBgTilemap_SkyDay[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/sky_day.bin"); +const u32 gBattleAnimBgTilemap_SkyDay[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/sky_day.bin.lz"); const u32 gBattleAnimBgPalette_SkyAfternoon[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/sky_afternoon.gbapal.lz"); @@ -1550,46 +1550,46 @@ const u32 gBattleAnimBgPalette_SkyNight[] = INCBIN_U32("graphics/battle_anims/ba const u32 gBattleAnimBgImage_SnuggleForever[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/snuggle_forever.4bpp.lz"); const u32 gBattleAnimBgPalette_SnuggleForever[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/snuggle_forever.gbapal.lz"); -const u32 gBattleAnimBgTilemap_SnuggleForever[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/snuggle_forever.bin"); +const u32 gBattleAnimBgTilemap_SnuggleForever[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/snuggle_forever.bin.lz"); const u32 gBattleAnimBgImage_SoulStealing7StarStrike[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/soulstealing_7star_strike.4bpp.lz"); const u32 gBattleAnimBgPalette_SoulStealing7StarStrike[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/soulstealing_7star_strike.gbapal.lz"); -const u32 gBattleAnimBgTilemap_SoulStealing7StarStrike[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/soulstealing_7star_strike.bin"); +const u32 gBattleAnimBgTilemap_SoulStealing7StarStrike[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/soulstealing_7star_strike.bin.lz"); //const u32 gBattleAnimBgImage_SpacialRendOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/spacial_rend_opponent.4bpp.lz"); //const u32 gBattleAnimBgPalette_SpacialRendOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/spacial_rend_opponent.gbapal.lz"); -//const u32 gBattleAnimBgTilemap_SpacialRendOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/spacial_rend_opponent.bin"); +//const u32 gBattleAnimBgTilemap_SpacialRendOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/spacial_rend_opponent.bin.lz"); //const u32 gBattleAnimBgImage_SpacialRendPlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/spacial_rend_player.4bpp.lz"); //const u32 gBattleAnimBgPalette_SpacialRendPlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/spacial_rend_player.gbapal.lz"); -//const u32 gBattleAnimBgTilemap_SpacialRendPlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/spacial_rend_player.bin"); +//const u32 gBattleAnimBgTilemap_SpacialRendPlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/spacial_rend_player.bin.lz"); const u32 gBattleAnimBgPalette_TectonicRage[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/tectonic_rage.gbapal.lz"); const u32 gBattleAnimBgImage_TrickRoom[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/trick_room.4bpp.lz"); const u32 gBattleAnimBgPalette_TrickRoom[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/trick_room.gbapal.lz"); -const u32 gBattleAnimBgTilemap_TrickRoom[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/trick_room.bin"); +const u32 gBattleAnimBgTilemap_TrickRoom[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/trick_room.bin.lz"); const u32 gBattleAnimBgImage_TwinkleTackle[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/twinkle_tackle.4bpp.lz"); const u32 gBattleAnimBgPalette_TwinkleTackle[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/twinkle_tackle.gbapal.lz"); -const u32 gBattleAnimBgTilemap_TwinkleTackle[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/twinkle_tackle.bin"); +const u32 gBattleAnimBgTilemap_TwinkleTackle[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/twinkle_tackle.bin.lz"); const u32 gBattleAnimBgImage_WaterPulse[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/water_pulse.4bpp.lz"); const u32 gBattleAnimBgPalette_WaterPulse[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/water_pulse.gbapal.lz"); -const u32 gBattleAnimBgTilemap_WaterPulse[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/water_pulse.bin"); +const u32 gBattleAnimBgTilemap_WaterPulse[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/water_pulse.bin.lz"); const u32 gBattleAnimBgImage_Waterfall[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/waterfall.4bpp.lz"); const u32 gBattleAnimBgPalette_Waterfall[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/waterfall.gbapal.lz"); -const u32 gBattleAnimBgTilemap_Waterfall[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/waterfall.bin"); +const u32 gBattleAnimBgTilemap_Waterfall[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/waterfall.bin.lz"); const u32 gBattleAnimBgPalette_WonderRoom[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/wonder_room.gbapal.lz"); const u32 gBattleAnimBgImage_ZMoveActivate[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/zmove_activate.4bpp.lz"); const u32 gBattleAnimBgPalette_ZMoveActivate[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/zmove_activate.gbapal.lz"); -const u32 gBattleAnimBgTilemap_ZMoveActivate[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/zmove_activate.bin"); +const u32 gBattleAnimBgTilemap_ZMoveActivate[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/zmove_activate.bin.lz"); const u32 gBattleAnimBgImage_ZMoveMountain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/zmove_mountain.4bpp.lz"); const u32 gBattleAnimBgPalette_ZMoveMountain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/zmove_mountain.gbapal.lz"); -const u32 gBattleAnimBgTilemap_ZMoveMountain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/zmove_mountain.bin"); +const u32 gBattleAnimBgTilemap_ZMoveMountain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/zmove_mountain.bin.lz"); const u32 gBattleAnimSpritePal_SteelBeam[] = INCBIN_U32("graphics/battle_anims/sprites/new/steel_beam.gbapal.lz"); const u32 gBattleAnimBgPalette_SteelBeam[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/steel_beam_bg.gbapal.lz"); From 468ee66cd877b175244eb204a1b5cd24cd379d78 Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Sat, 30 Oct 2021 11:04:50 -0400 Subject: [PATCH 12/26] fix synthesis and leaf guard w utility umbrella --- asm/macros/battle_script.inc | 7 +++---- data/battle_scripts_1.s | 12 ++++++------ include/constants/battle_script_commands.h | 1 + src/battle_script_commands.c | 10 ++++++++-- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 3de14f586..7e35f6ab2 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -1989,10 +1989,9 @@ goto \jumpptr .endm - .macro jumpifleafguard jumpptr:req - jumpifhalfword CMP_NO_COMMON_BITS, gBattleWeather, WEATHER_SUN_ANY, 1f - jumpifability BS_TARGET, ABILITY_LEAF_GUARD, \jumpptr - 1: + .macro jumpifleafguardprotected battler:req, jumpptr:req + various \battler, VARIOUS_JUMP_IF_LEAF_GUARD_PROTECTED + .4byte \jumpptr .endm .macro jumpifsafeguard jumpptr:req diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 180c74eed..c050fb4be 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2512,7 +2512,7 @@ BattleScript_EffectSleep:: jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_LeafGuardProtects jumpifflowerveil BattleScript_FlowerVeilProtects jumpifability BS_TARGET_SIDE, ABILITY_SWEET_VEIL, BattleScript_SweetVeilProtects - jumpifleafguard BattleScript_LeafGuardProtects + jumpifleafguardprotected BS_TARGET, BattleScript_LeafGuardProtects jumpifshieldsdown BS_TARGET, BattleScript_LeafGuardProtects jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_ButItFailed jumpifterrainaffected BS_TARGET, STATUS_FIELD_ELECTRIC_TERRAIN, BattleScript_ElectricTerrainPrevents @@ -3054,7 +3054,7 @@ BattleScript_EffectToxic:: jumpifability BS_TARGET, ABILITY_IMMUNITY, BattleScript_ImmunityProtected jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_LeafGuardProtects jumpifflowerveil BattleScript_FlowerVeilProtects - jumpifleafguard BattleScript_LeafGuardProtects + jumpifleafguardprotected BS_TARGET, BattleScript_LeafGuardProtects jumpifshieldsdown BS_TARGET, BattleScript_LeafGuardProtects jumpifsubstituteblocks BattleScript_ButItFailed jumpifstatus BS_TARGET, STATUS1_POISON | STATUS1_TOXIC_POISON, BattleScript_AlreadyPoisoned @@ -3409,7 +3409,7 @@ BattleScript_EffectPoison:: jumpifability BS_TARGET, ABILITY_IMMUNITY, BattleScript_ImmunityProtected jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_LeafGuardProtects jumpifflowerveil BattleScript_FlowerVeilProtects - jumpifleafguard BattleScript_LeafGuardProtects + jumpifleafguardprotected BS_TARGET, BattleScript_LeafGuardProtects jumpifshieldsdown BS_TARGET, BattleScript_LeafGuardProtects jumpifsubstituteblocks BattleScript_ButItFailed jumpifstatus BS_TARGET, STATUS1_POISON, BattleScript_AlreadyPoisoned @@ -3434,7 +3434,7 @@ BattleScript_EffectParalyze: jumpifability BS_TARGET, ABILITY_LIMBER, BattleScript_LimberProtected jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_LeafGuardProtects jumpifflowerveil BattleScript_FlowerVeilProtects - jumpifleafguard BattleScript_LeafGuardProtects + jumpifleafguardprotected BS_TARGET, BattleScript_LeafGuardProtects jumpifshieldsdown BS_TARGET, BattleScript_LeafGuardProtects jumpifsubstituteblocks BattleScript_ButItFailed .if B_GLARE_GHOST >= GEN_4 @@ -4874,7 +4874,7 @@ BattleScript_EffectWillOWisp:: jumpifability BS_TARGET, ABILITY_WATER_BUBBLE, BattleScript_WaterVeilPrevents jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_LeafGuardProtects jumpifflowerveil BattleScript_FlowerVeilProtects - jumpifleafguard BattleScript_LeafGuardProtects + jumpifleafguardprotected BS_TARGET, BattleScript_LeafGuardProtects jumpifshieldsdown BS_TARGET, BattleScript_LeafGuardProtects jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_ButItFailed jumpifterrainaffected BS_TARGET, STATUS_FIELD_MISTY_TERRAIN, BattleScript_MistyTerrainPrevents @@ -5152,7 +5152,7 @@ BattleScript_EffectYawn:: jumpifability BS_TARGET, ABILITY_INSOMNIA, BattleScript_PrintBankAbilityMadeIneffective jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_PrintBankAbilityMadeIneffective jumpifflowerveil BattleScript_FlowerVeilProtects - jumpifleafguard BattleScript_LeafGuardProtects + jumpifleafguardprotected BS_TARGET, BattleScript_LeafGuardProtects jumpifshieldsdown BS_TARGET, BattleScript_LeafGuardProtects jumpifsubstituteblocks BattleScript_ButItFailed jumpifsafeguard BattleScript_SafeguardProtected diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h index 74c2a3f59..18ae63179 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -195,6 +195,7 @@ #define VARIOUS_APPLY_PLASMA_FISTS 122 #define VARIOUS_JUMP_IF_SPECIES 123 #define VARIOUS_JUMP_IF_WEATHER_AFFECTED 124 +#define VARIOUS_JUMP_IF_LEAF_GUARD_PROTECTED 125 // Cmd_manipulatedamage #define DMG_CHANGE_SIGN 0 diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index dbcd3ad95..44ae0e33e 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -8990,6 +8990,12 @@ static void Cmd_various(void) else gBattlescriptCurrInstr += 9; return; + case VARIOUS_JUMP_IF_LEAF_GUARD_PROTECTED: + if (IsLeafGuardProtected(gActiveBattler)) + gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 5); + else + gBattlescriptCurrInstr += 7; + return; } gBattlescriptCurrInstr += 3; @@ -11514,9 +11520,9 @@ static void Cmd_recoverbasedonsunlight(void) } else { - if (!(gBattleWeather & WEATHER_ANY) || !WEATHER_HAS_EFFECT) + if (!(gBattleWeather & WEATHER_ANY) || !WEATHER_HAS_EFFECT || GetBattlerHoldEffect(gBattlerAttacker, TRUE) == HOLD_EFFECT_UTILITY_UMBRELLA) gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 2; - else if (IsBattlerWeatherAffected(gBattlerAttacker, WEATHER_SUN_ANY)) + else if (gBattleWeather & WEATHER_SUN_ANY) gBattleMoveDamage = 20 * gBattleMons[gBattlerAttacker].maxHP / 30; else // not sunny weather gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 4; From 0ddcb69c65a5f9387d3b7e6434d0d95a3671a377 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Sat, 30 Oct 2021 12:14:28 -0300 Subject: [PATCH 13/26] Fixed Move_SPECIAL_REND typo --- data/battle_anim_scripts.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index ada08afc5..48f180e06 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -478,7 +478,7 @@ gBattleAnims_Moves:: .4byte Move_HEAD_SMASH .4byte Move_DOUBLE_HIT .4byte Move_ROAR_OF_TIME - .4byte Move_SPECIAL_REND + .4byte Move_SPACIAL_REND .4byte Move_LUNAR_DANCE .4byte Move_CRUSH_GRIP .4byte Move_MAGMA_STORM @@ -4166,7 +4166,7 @@ Move_ROAR_OF_TIME: waitforvisualfinish end -Move_SPECIAL_REND: +Move_SPACIAL_REND: loadspritegfx ANIM_TAG_PUNISHMENT_BLADES loadspritegfx ANIM_TAG_PINK_HEART_2 @ANIM_TAG_BERRY_EATEN monbg ANIM_ATK_PARTNER From 1925874d355a3911c14e856a16eb7da92a1911a8 Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Sat, 30 Oct 2021 11:18:50 -0400 Subject: [PATCH 14/26] hunger switch unaffected by wandering spirit --- src/battle_util.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/battle_util.c b/src/battle_util.c index 07b7cd7e7..3453aac15 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -4846,6 +4846,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move case ABILITY_DISGUISE: case ABILITY_FLOWER_GIFT: case ABILITY_GULP_MISSILE: + case ABILITY_HUNGER_SWITCH: case ABILITY_ICE_FACE: case ABILITY_ILLUSION: case ABILITY_IMPOSTER: From 2282c4fb5c687267a8f10ae727327bd706da3f77 Mon Sep 17 00:00:00 2001 From: BuffelSaft Date: Sun, 31 Oct 2021 12:09:40 +1300 Subject: [PATCH 15/26] Fix MOVEEND_CHOICE_MOVE Oops --- src/battle_script_commands.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index b2dcb3958..ab1e2b531 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -4942,7 +4942,7 @@ static void Cmd_moveend(void) break; case MOVEEND_CHOICE_MOVE: // update choice band move if (gHitMarker & HITMARKER_OBEYS - && (HOLD_EFFECT_CHOICE(holdEffectAtk) || GetBattlerAbility(gBattlerAttacker)) + && (HOLD_EFFECT_CHOICE(holdEffectAtk) || GetBattlerAbility(gBattlerAttacker) == ABILITY_GORILLA_TACTICS) && gChosenMove != MOVE_STRUGGLE && (*choicedMoveAtk == 0 || *choicedMoveAtk == 0xFFFF)) { From c87e2433a7294376b83467010e362d703cd1a883 Mon Sep 17 00:00:00 2001 From: Blackforest92 Date: Sun, 31 Oct 2021 21:41:39 +0700 Subject: [PATCH 16/26] Minor fix to Steel Beam --- data/battle_anim_scripts.s | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 48f180e06..73aeb9259 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -13947,6 +13947,8 @@ Move_STEEL_BEAM:: loadspritegfx ANIM_TAG_ELECTRIC_ORBS loadspritegfx ANIM_TAG_GUST launchtask AnimTask_ElectricChargingParticles 0x2 0x4 0x0 0x14 0x0 0x2 + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER + delay 20 loadspritegfx ANIM_TAG_STEEL_BEAM call SetSteelBeamBackground panse_1B SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 From dfb92fa74e4c13021f0764fa3b09d0ff3ca06a7d Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Sun, 31 Oct 2021 11:12:17 -0400 Subject: [PATCH 17/26] fix VARIOUS_JUMP_IF_LEAF_GUARD_PROTECTED --- src/battle_script_commands.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 44ae0e33e..ee46c4c35 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -8992,7 +8992,7 @@ static void Cmd_various(void) return; case VARIOUS_JUMP_IF_LEAF_GUARD_PROTECTED: if (IsLeafGuardProtected(gActiveBattler)) - gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 5); + gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3); else gBattlescriptCurrInstr += 7; return; From e59d0dd5cfdb63457d4f89bbc385a1785c911115 Mon Sep 17 00:00:00 2001 From: Blackforest92 Date: Sun, 31 Oct 2021 22:58:43 +0700 Subject: [PATCH 18/26] clean Spacial Rend background --- .../backgrounds/new/spacial_rend.pal | 19 ++++++++++++++++++ .../backgrounds/new/spacial_rend.png | Bin 0 -> 6531 bytes .../backgrounds/new/spacial_rend_opponent.bin | Bin 896 -> 896 bytes .../backgrounds/new/spacial_rend_opponent.pal | 19 ------------------ .../backgrounds/new/spacial_rend_opponent.png | Bin 5861 -> 0 bytes .../backgrounds/new/spacial_rend_player.bin | Bin 896 -> 896 bytes .../backgrounds/new/spacial_rend_player.pal | 19 ------------------ .../backgrounds/new/spacial_rend_player.png | Bin 6948 -> 0 bytes .../backgrounds/spacial_rend_opponent.bin | Bin 896 -> 0 bytes .../backgrounds/spacial_rend_opponent.pal | 19 ------------------ .../backgrounds/spacial_rend_opponent.png | Bin 5861 -> 0 bytes .../backgrounds/spacial_rend_player.bin | Bin 896 -> 0 bytes .../backgrounds/spacial_rend_player.pal | 19 ------------------ .../backgrounds/spacial_rend_player.png | Bin 6948 -> 0 bytes include/graphics.h | 6 ++---- src/battle_anim.c | 4 ++-- src/graphics.c | 11 ++++------ 17 files changed, 27 insertions(+), 89 deletions(-) create mode 100644 graphics/battle_anims/backgrounds/new/spacial_rend.pal create mode 100644 graphics/battle_anims/backgrounds/new/spacial_rend.png delete mode 100644 graphics/battle_anims/backgrounds/new/spacial_rend_opponent.pal delete mode 100644 graphics/battle_anims/backgrounds/new/spacial_rend_opponent.png delete mode 100644 graphics/battle_anims/backgrounds/new/spacial_rend_player.pal delete mode 100644 graphics/battle_anims/backgrounds/new/spacial_rend_player.png delete mode 100644 graphics/battle_anims/backgrounds/spacial_rend_opponent.bin delete mode 100644 graphics/battle_anims/backgrounds/spacial_rend_opponent.pal delete mode 100644 graphics/battle_anims/backgrounds/spacial_rend_opponent.png delete mode 100644 graphics/battle_anims/backgrounds/spacial_rend_player.bin delete mode 100644 graphics/battle_anims/backgrounds/spacial_rend_player.pal delete mode 100644 graphics/battle_anims/backgrounds/spacial_rend_player.png diff --git a/graphics/battle_anims/backgrounds/new/spacial_rend.pal b/graphics/battle_anims/backgrounds/new/spacial_rend.pal new file mode 100644 index 000000000..afc2b31fc --- /dev/null +++ b/graphics/battle_anims/backgrounds/new/spacial_rend.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +208 112 200 +216 184 249 +216 160 232 +211 107 195 +208 104 192 +217 129 209 +216 135 215 +209 120 208 +218 153 226 +216 168 232 +217 176 241 +220 188 252 +203 115 203 +223 182 246 +216 192 248 diff --git a/graphics/battle_anims/backgrounds/new/spacial_rend.png b/graphics/battle_anims/backgrounds/new/spacial_rend.png new file mode 100644 index 0000000000000000000000000000000000000000..ea98198c4c0ad4c8f5aa27d39fc9937aeeeacad1 GIT binary patch literal 6531 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 diff --git a/graphics/battle_anims/backgrounds/new/spacial_rend_opponent.pal b/graphics/battle_anims/backgrounds/new/spacial_rend_opponent.pal deleted file mode 100644 index 7f1f61789..000000000 --- a/graphics/battle_anims/backgrounds/new/spacial_rend_opponent.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 0 -222 156 230 -222 180 246 -213 123 205 -213 189 246 -205 115 205 -213 164 230 -213 131 213 -222 197 255 -222 189 255 -213 139 222 -213 172 238 -213 106 197 -222 131 213 -213 115 205 -205 106 197 diff --git a/graphics/battle_anims/backgrounds/new/spacial_rend_opponent.png b/graphics/battle_anims/backgrounds/new/spacial_rend_opponent.png deleted file mode 100644 index 637b9cf5a93f05f59639b81ff9a52ca6009dc9a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5861 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 vbRUphQp*g@dHO5200000NkvXXu0mjfv_DB9 diff --git a/graphics/battle_anims/backgrounds/new/spacial_rend_player.bin b/graphics/battle_anims/backgrounds/new/spacial_rend_player.bin index 7b479c88d672f56c52b5a2633d6b41aec8cdedca..3b89218e0e6cbba254e78a9f11abe717002cba8a 100644 GIT binary patch literal 896 zcmWN@WnfSR0EJP(KuNpfyW8FN9z0+@n)P5wV@qR8V@qRzG}zME(%912(%7y?V|Sik zC&BTKvmNUg%NRrqvHvHIcoGN*X-*3wTGEQvG^7!YX+l$)QIGm$INfPZb&8Xnp7n7S)S>c%wjfkn9Drovw+8VoF{mar+AuYc$Po-lfU?zfB2Ul_>mP}?qy!; zC0^`BUg(7^Vlhit$}*O-g6DXi7kH7Ec$rstm4<4h#%iLbYNq-+SsT3G>%7)$yxOb0 z(kofTYSyrpb*yItukku>@Fs8ZHt+B*7wZyTs>^h_uF%;!M?1XT+q~6VyxE()(Hq&s zX11`EZER-;@9{n#@F5@ZF`w`$&DBDYTB?;=D@L(8;Qij`z24*9-sPR%$u4%YhrR4$ zKL_}X&-sEc`HHXkhHq)7_UfRH>ZHy}R*LFe>l#GY5pe3znO&i+Mj`nn*Bb|sNo&*v}BAFCY zNh6(*obEKII>pIOa-v0Nx?lpj(v9x)peMaTY;XF|mwsfBNfz1UkV_u<>mwC)*0Sj5gA}{m;&-Xmf^&HRk`CPzaF61IE<`ORDGA`!|u4D;I zLk*U(oE5BO6{}gpTGp}7YrV$nS>+9^@N#ct6Pww>R<7b|uHjm)<9cr3MsDI}ZsAt8 zaT~XD2Y0fa9qjOS-^JbB!@X?tecaCjJjg>l%p*L?V?53iJjqi$%`?Y0c$S^);yHG+ zhrR4$pZ9u?cl&vEd8c3CMPA}%_H%$&c$L?9oi})sw?gdOyu-V^$NPN1hkV4x9OMv( ze9)ipDWCBZ)$)t{&>CUh1tr>Z^XrP^Pk!tsLblFXY@HC&*WS4bVUh(qIkIPz}>? zjnGJq(rAs*SQV&HMJiSmB`Q^!$~8_EsyxnD1{J}0P0&P5(qvU>il%CsrfY_(Rij$f Osa_3gRFh_Emi_~I!0bK% diff --git a/graphics/battle_anims/backgrounds/new/spacial_rend_player.pal b/graphics/battle_anims/backgrounds/new/spacial_rend_player.pal deleted file mode 100644 index 846d3e703..000000000 --- a/graphics/battle_anims/backgrounds/new/spacial_rend_player.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 0 -213 156 230 -222 180 246 -213 123 205 -213 189 246 -213 131 213 -205 115 205 -213 164 230 -222 197 255 -213 139 222 -222 189 255 -213 172 238 -213 106 197 -213 115 205 -222 156 230 -205 106 197 diff --git a/graphics/battle_anims/backgrounds/new/spacial_rend_player.png b/graphics/battle_anims/backgrounds/new/spacial_rend_player.png deleted file mode 100644 index 993b3d8a69827d2c1e87eb1a0cfc33cfa3c96cb9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6948 zcmV+<8{6cGP)0058#0{{R3eVcu=0000mP)t-s{{R5h zoaWxN_SJjM)xGxBgVoJ*&DEsl-o^jbi{9S7|JAJS)oR7nbIsnI=FMuw#EaV9000`V zNklp4ba0m_Z2Bhjwibd>{eomRrTt;`|dsW-1|zBBpi&fOl26KEaAb&vGn*E_VMjw ze`OzckABNOU%zH^{w;32lZ(e5(=cYV>&whNjDE+ftfuQ{OsWGKOT%={@Jy!Jok(Ju z-RNEUj(xnkwaPxfeaEqiS8%hdsQG?JqasH8LIdF~?)a=L>{US4J|-qHQ%~9TvzZv1 zT;1wq*B{1;?4PC=ox)Ar``A(fIT|zA4n@AmKv0Z34Z1^QezQ>WRD?(9t3 zcoM|9#%;^tw6;4PO+0oLfM=Qpt_Z-0SZsO{W0y01j487-zhgeHoi;2V zXLncQ)Aupp26y<^^iW{kG!u1%$pOy4ZWx$miKqY+0XEF}EA0Bs%s`rb);I94tiNEl zF<_+c7F`Cs1zUba1{R0S)|+*VMVnhs>)#*TH`W}h+h?w@e<=q3$bN9_ zr;OXY?QU*U+<(Tog)ig2?&0?GeHUYV%8i%sW_Q|@Jrd2qA2z*82Tfo^%v6vu@7S}` z>~2o^n*E){PqQx0m+x94ev>}V-^b4{bF+H+{rZ!w0Vy*8qqh&>F`4K+?a54~+12S8 z@Z0j`*j;Y_D*q@fn3~e)!8_bh>WN~cDSxEO@~e1>C6k$pZH5wzVd^do!Ny8Y8$SLXyI~j8H*6Yp zEPk6@d6hek)h3=>NfY0tAK@8^g{;SXaGG5$#=72Pzb$tCioHYG@QnYGUGuG`ulZ=y zQiawz-VgWwQam?zlTrRiudH?(1ZQ)%J;xp+wwmux?DJgLAK7&qfNwje*m$5D$w5fE zAp4wc)iZhAyDWZ6im;p!uWlOqa+J+?iW}ED$Cd`#Cb{Ax@7aH0<1+xB^POVGR4*nV zAB~AMkHFL4FloAuXUwcFo9TUcg>`Xe1g7SJKou;uR%8lLH@yB#jU_uW|VIucW*Ld%eZa0 zjkx_CNb(TgiuEETc93WIH+ub3L-@%U zRg~M!pp5rheVa>LpYGv-|FI5t&HV+f>pcSwdQ5qi#-ni4F(_mPaar1kxCUm*+HATB zc$F9WfUt+h3tGMKTwz~9sJ~{v<$N`5%oISDRsg2J>T%SS*2f+*Lj+1~%?bv(fb-n) z_5})U_4s_oEo8XM(C^rFUhwhzH{kL#TP#4bGdh%Xfhrol2R(^VCU_}$R0q5YK*ero z4$1`BRcE}CrZU9eGoCrc`|O4SuZ%<9$Z_;9aa(>s6<~a+E~*0XYIn2hOyY6J{$-Ot zLgiij{?num2+o`jWp#Y&Cg}li=vkUzQ=e%gz`4S7c4@u7+z~28dsV`{0*i%$Op%ho zmn1b<ℑ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 diff --git a/graphics/battle_anims/backgrounds/spacial_rend_opponent.pal b/graphics/battle_anims/backgrounds/spacial_rend_opponent.pal deleted file mode 100644 index 7f1f61789..000000000 --- a/graphics/battle_anims/backgrounds/spacial_rend_opponent.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 0 -222 156 230 -222 180 246 -213 123 205 -213 189 246 -205 115 205 -213 164 230 -213 131 213 -222 197 255 -222 189 255 -213 139 222 -213 172 238 -213 106 197 -222 131 213 -213 115 205 -205 106 197 diff --git a/graphics/battle_anims/backgrounds/spacial_rend_opponent.png b/graphics/battle_anims/backgrounds/spacial_rend_opponent.png deleted file mode 100644 index 637b9cf5a93f05f59639b81ff9a52ca6009dc9a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5861 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 vbRUphQp*g@dHO5200000NkvXXu0mjfv_DB9 diff --git a/graphics/battle_anims/backgrounds/spacial_rend_player.bin b/graphics/battle_anims/backgrounds/spacial_rend_player.bin deleted file mode 100644 index 7b479c88d672f56c52b5a2633d6b41aec8cdedca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 896 zcmW-eb$FKr0EAtS?sdEe_tCK)-LM`THEKPuTN=eyy3GY5pe3znO&i+Mj`nn*Bb|sNo&*v}BAFCY zNh6(*obEKII>pIOa-v0Nx?lpj(v9x)peMaTY;XF|mwsfBNfz1UkV_u<>mwC)*0Sj5gA}{m;&-Xmf^&HRk`CPzaF61IE<`ORDGA`!|u4D;I zLk*U(oE5BO6{}gpTGp}7YrV$nS>+9^@N#ct6Pww>R<7b|uHjm)<9cr3MsDI}ZsAt8 zaT~XD2Y0fa9qjOS-^JbB!@X?tecaCjJjg>l%p*L?V?53iJjqi$%`?Y0c$S^);yHG+ zhrR4$pZ9u?cl&vEd8c3CMPA}%_H%$&c$L?9oi})sw?gdOyu-V^$NPN1hkV4x9OMv( ze9)ipDWCBZ)$)t{&>CUh1tr>Z^XrP^Pk!tsLblFXY@HC&*WS4bVUh(qIkIPz}>? zjnGJq(rAs*SQV&HMJiSmB`Q^!$~8_EsyxnD1{J}0P0&P5(qvU>il%CsrfY_(Rij$f Osa_3gRFh_Emi_~I!0bK% diff --git a/graphics/battle_anims/backgrounds/spacial_rend_player.pal b/graphics/battle_anims/backgrounds/spacial_rend_player.pal deleted file mode 100644 index 846d3e703..000000000 --- a/graphics/battle_anims/backgrounds/spacial_rend_player.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 0 -213 156 230 -222 180 246 -213 123 205 -213 189 246 -213 131 213 -205 115 205 -213 164 230 -222 197 255 -213 139 222 -222 189 255 -213 172 238 -213 106 197 -213 115 205 -222 156 230 -205 106 197 diff --git a/graphics/battle_anims/backgrounds/spacial_rend_player.png b/graphics/battle_anims/backgrounds/spacial_rend_player.png deleted file mode 100644 index 993b3d8a69827d2c1e87eb1a0cfc33cfa3c96cb9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6948 zcmV+<8{6cGP)0058#0{{R3eVcu=0000mP)t-s{{R5h zoaWxN_SJjM)xGxBgVoJ*&DEsl-o^jbi{9S7|JAJS)oR7nbIsnI=FMuw#EaV9000`V zNklp4ba0m_Z2Bhjwibd>{eomRrTt;`|dsW-1|zBBpi&fOl26KEaAb&vGn*E_VMjw ze`OzckABNOU%zH^{w;32lZ(e5(=cYV>&whNjDE+ftfuQ{OsWGKOT%={@Jy!Jok(Ju z-RNEUj(xnkwaPxfeaEqiS8%hdsQG?JqasH8LIdF~?)a=L>{US4J|-qHQ%~9TvzZv1 zT;1wq*B{1;?4PC=ox)Ar``A(fIT|zA4n@AmKv0Z34Z1^QezQ>WRD?(9t3 zcoM|9#%;^tw6;4PO+0oLfM=Qpt_Z-0SZsO{W0y01j487-zhgeHoi;2V zXLncQ)Aupp26y<^^iW{kG!u1%$pOy4ZWx$miKqY+0XEF}EA0Bs%s`rb);I94tiNEl zF<_+c7F`Cs1zUba1{R0S)|+*VMVnhs>)#*TH`W}h+h?w@e<=q3$bN9_ zr;OXY?QU*U+<(Tog)ig2?&0?GeHUYV%8i%sW_Q|@Jrd2qA2z*82Tfo^%v6vu@7S}` z>~2o^n*E){PqQx0m+x94ev>}V-^b4{bF+H+{rZ!w0Vy*8qqh&>F`4K+?a54~+12S8 z@Z0j`*j;Y_D*q@fn3~e)!8_bh>WN~cDSxEO@~e1>C6k$pZH5wzVd^do!Ny8Y8$SLXyI~j8H*6Yp zEPk6@d6hek)h3=>NfY0tAK@8^g{;SXaGG5$#=72Pzb$tCioHYG@QnYGUGuG`ulZ=y zQiawz-VgWwQam?zlTrRiudH?(1ZQ)%J;xp+wwmux?DJgLAK7&qfNwje*m$5D$w5fE zAp4wc)iZhAyDWZ6im;p!uWlOqa+J+?iW}ED$Cd`#Cb{Ax@7aH0<1+xB^POVGR4*nV zAB~AMkHFL4FloAuXUwcFo9TUcg>`Xe1g7SJKou;uR%8lLH@yB#jU_uW|VIucW*Ld%eZa0 zjkx_CNb(TgiuEETc93WIH+ub3L-@%U zRg~M!pp5rheVa>LpYGv-|FI5t&HV+f>pcSwdQ5qi#-ni4F(_mPaar1kxCUm*+HATB zc$F9WfUt+h3tGMKTwz~9sJ~{v<$N`5%oISDRsg2J>T%SS*2f+*Lj+1~%?bv(fb-n) z_5})U_4s_oEo8XM(C^rFUhwhzH{kL#TP#4bGdh%Xfhrol2R(^VCU_}$R0q5YK*ero z4$1`BRcE}CrZU9eGoCrc`|O4SuZ%<9$Z_;9aa(>s6<~a+E~*0XYIn2hOyY6J{$-Ot zLgiij{?num2+o`jWp#Y&Cg}li=vkUzQ=e%gz`4S7c4@u7+z~28dsV`{0*i%$Op%ho zmn1b<ℑ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 Date: Mon, 1 Nov 2021 01:06:39 +0700 Subject: [PATCH 19/26] Optimized Rock Wrecker and Hurricane --- data/battle_anim_scripts.s | 2 +- .../backgrounds/new/high_speed.bin | 2 -- .../backgrounds/new/high_speed.png | Bin 855 -> 0 bytes .../hurricane.bin} | Bin .../new/{high_speed.pal => hurricane.pal} | 0 .../backgrounds/new/hurricane.png | Bin 0 -> 519 bytes .../backgrounds/new/rock_wrecker.bin | 2 -- .../backgrounds/new/rock_wrecker.pal | 32 +++++++++--------- .../backgrounds/new/rock_wrecker.png | Bin 1511 -> 0 bytes .../battle_anims/backgrounds/rock_wrecker.png | Bin 1249 -> 0 bytes include/constants/battle_anim.h | 2 +- include/graphics.h | 10 +++--- src/battle_anim.c | 4 +-- src/graphics.c | 23 +++---------- 14 files changed, 29 insertions(+), 48 deletions(-) delete mode 100644 graphics/battle_anims/backgrounds/new/high_speed.bin delete mode 100644 graphics/battle_anims/backgrounds/new/high_speed.png rename graphics/battle_anims/backgrounds/{rock_wrecker_map.bin => new/hurricane.bin} (100%) rename graphics/battle_anims/backgrounds/new/{high_speed.pal => hurricane.pal} (100%) create mode 100644 graphics/battle_anims/backgrounds/new/hurricane.png delete mode 100644 graphics/battle_anims/backgrounds/new/rock_wrecker.bin delete mode 100644 graphics/battle_anims/backgrounds/new/rock_wrecker.png delete mode 100644 graphics/battle_anims/backgrounds/rock_wrecker.png diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 73aeb9259..03d72f3ea 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -6636,7 +6636,7 @@ Move_HURRICANE: monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 - fadetobg BG_HIGH_SPEED + fadetobg BG_HURRICANE waitbgfadeout launchtask AnimTask_StartSlidingBg 0x5 0x4 0x1000 0x0 0x1 0xffff waitbgfadein diff --git a/graphics/battle_anims/backgrounds/new/high_speed.bin b/graphics/battle_anims/backgrounds/new/high_speed.bin deleted file mode 100644 index ca049478c..000000000 --- a/graphics/battle_anims/backgrounds/new/high_speed.bin +++ /dev/null @@ -1,2 +0,0 @@ -                                                                                             -                                                                ! " # $ % & ' ( ) * + , - . / 0 1 2 3 3 3 3 3 3 4 5 6 7 7 8 9 : ; < = > ? @ A A A A B C D E F G D H A A A A A A I J K A A L M N O M M P M M Q Q R S T U V W S S S S S S S S S S S S S X Y Z [ [ [ [ [ [ [ [ \ \ \ \ ] ^ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ _ _ _ _ ` a b c _ d d d d e f e d d g h i j k l m n o p q r s t j$u v w x y z w${ | | | | | | } ~  $ } $ (((((( $ $ $ \ No newline at end of file diff --git a/graphics/battle_anims/backgrounds/new/high_speed.png b/graphics/battle_anims/backgrounds/new/high_speed.png deleted file mode 100644 index 08bb2b0de3dd768a622a8a586061d9afb9b879a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 855 zcmV-d1E~CoP)002k?0{{R3gZAU`0000mP)t-s0002R z|No2L_H)($YR&&*#s6Bg_DZDgL7eU}l;$am<|%X4AcNi@V$C30#VJa(skcN40008w zNklMN6{;~q+ zO!^7CC*?*xU@=3)u({PJ@b?Uz1Ij(Mz_IUVs71gxPZ;}#3B3>PETC$XBH+6x3wa$v zX8~(y?k#`Mr^SAB8=r^>|jLH5O{h1(C|p3;Gjip2CuOe?n|yIzr^Z(0eb!KPa=n`dzLSmVGm-SsCVpVcSL&xq$f)Nn7^zAKI*VkJ>W?T zg|aA5#fc35N0951t}R`A+p(~{Vc5B}2W8aiGWwrP#i?y6+-bVBb!FijuXn*hhwvEn zze60jzr}1dwA*Yx!_9$n{@*RpT^w!!EL|K?6h;GkF^4#e1`fZ}Xy7o87LJz>XDB0e z2h=Yx=oJVhX_D0MF)F%9^D5&aslqg0t81mpx^NeV<`oO|1XU;5fvWC86_vaa+3|EC z7}yu9roO5Ac57TxwM{7N7B~$qwYn*1CV}YQsK%<+i3)&_RkjwTT3bc#^bA)h2y{!m z8Suku6)+S_Q9!rmX4&B(4x@l3Dz9CHLQz2F$B`dUCcu#Enk^B9k1|nY1525JYHO5Q h2%K>npTPec_y?2488ib@x4=6h=47d=eI-vi3x1d{4^D8Z>-y7!6C9a$4=urmhemKX9yXbw z*jct&<^Co0Z7`DgexSDyST%I=dcJsN-24t zQc**A4c$xaax@J<^V#shg6VANq^^0fhM)@-fXp~XdRl7qXF`z~AdN#U;Pti#Gf6hn z=RiL!cx~>vQCDISdJe-am_C7i<=_ ? @ A B C D E F F G H I I J K L M N N N O P P P P P Q R S S S S S T Q U V S W X X Y Z [ \ ] ] ] ] ] ^ _ ` a a b c d e f g g g g g h i i i i j k k l m n o p p p p p q m m m m r s t u v w x y z { { | } ~ ~  ~ ~ ,,,, s,t( m, d,d,d,d,d, d, P,P,P, $ P, 4,4,4,4,4,4, \ No newline at end of file diff --git a/graphics/battle_anims/backgrounds/new/rock_wrecker.pal b/graphics/battle_anims/backgrounds/new/rock_wrecker.pal index f17343c31..198e7f034 100644 --- a/graphics/battle_anims/backgrounds/new/rock_wrecker.pal +++ b/graphics/battle_anims/backgrounds/new/rock_wrecker.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 0 0 -255 246 0 -255 238 0 -255 222 0 -255 205 0 -255 189 0 -255 172 0 -255 156 8 -255 139 8 -255 123 8 -255 106 8 -255 90 8 -255 74 8 -255 49 8 -255 41 8 -246 24 0 +96 192 24 +248 248 216 +248 248 176 +248 240 144 +248 232 120 +248 232 112 +248 216 96 +240 200 88 +232 192 72 +232 184 64 +232 176 56 +224 160 32 +216 152 32 +208 136 40 +192 120 40 +176 88 40 diff --git a/graphics/battle_anims/backgrounds/new/rock_wrecker.png b/graphics/battle_anims/backgrounds/new/rock_wrecker.png deleted file mode 100644 index 97cf4b73af4c1d66ced0caa1cf28a539f506a897..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1511 zcmV003wN0{{R3gj(ju0000mP)t-s00030 z_5lCx0RP?q|IGmZy#W8L0RNl_|BDF!dkFt(2>)6L|4In|F$n)D2=*8NZ#0u{000GY zNklvbAO6vw9poC<_ofmykL07?M@lmdXo-yJ{=@NxmbCg0713a}TYfe57m z2~}XB26C*-d*;q#cUk$I z>EGB?sE5_S2C~{r(`#P%u;Y59j|cKK>AnHni)uRXeld`m{+Z!?6DU-8gk9EA3yT7E zNTOUd`4Pa|c*z~VTrLqY`O&U_;JtZ#&SBwJ6QTofF!l7;k}0~wPcG=KAnc$BaCT<_ z@8>M~x>xo)rmaT^L+|Xte-H-jjB&i%X8|?HcC&S`$r~}R2E&=Ck!B&5FHDKPwrjl` zP;wv33AGUoBz(#vS|06EwCdD9K;VOVDZ3SUOvA|U7fWdE6gDo3*HIit%Q$jZp@t-D*aI&xx8_aeUFxgW6%LzM z0<~ob&-6&l6s96T*yA+>zCy~+NFUCA*zMy4uGd^lpr$^g5Nevb)W2Eq;B1LD!z>~V zY|^wyp#y2g1o+zxvdx#kVgj?XIV3>h$ilpFLkFG@anUP*1K^g401kW_9^XbfFo(=G zX<#1%ka;L{zdsh(Z&a9qRtm7|lx0G<*{s!RoOj_1md(Q~V3w5CY`M9nYYScIivg7w zkmYp;kWbffejs%!%dt%g1j(WGiEb}$KX+tFE+Cf!cm?uI9swZns_~w-+HroG6WCDe zOd*w}PS22vSbO84HPXmxj{|>|o2Ab#U^7f@P8T;Z5L=OCDNp-P%$^{QT2hu&)(0dy+p(Uo`^v%lqtw)P6(*$^yzi*^M79eJ{Ukxn$c zSAjr%<8x8Y(y6x<3Di7XeV4|9-&<8F?M=CYeBY}es#4SHAis2~?haf|P)V2e>Vt4Z z{2O_G|2x?8Cm)@_x2*vLD!uK=#r)y~_vQTzYztSU5ckk_u@9)#J)yQ6E<7mgzylAQz@F!#TRdWL0`~nX#$;XpY#VZyQeCn0mz%#fQb>5Xqfg@e$Vh8YXyX-_d zqBkpzu_d7Ij#C{ZjLrn|F6UMz&>f!r@-D^ioYtZblHq9tyjJ1UL=3Rws6A`og} zLvC@a^V!u+kBo}dOy+yFHZ4klp4aDX4hlFqN%ztb94;?v;3W0i;FK^oYw~Df71taKrgSfM$h6(8(2Y5mAcz$>4S__A2;jTL?&v z(SagM%x-ptfHYjM^~u9^vnvK97W#hECL%7XzmKUiQBL{tF^ewGqXX^Gg5# N002ovPDHLkV1iC@&gTFC diff --git a/graphics/battle_anims/backgrounds/rock_wrecker.png b/graphics/battle_anims/backgrounds/rock_wrecker.png deleted file mode 100644 index ca50da7b76be898616327410ffb07c75e5fbd5d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1249 zcmeAS@N?(olHy`uVBq!ia0vp^4nSA|DI)Syc>J@v}D!U2f;;5(uYEnls5>bt>tc- z_apt{(;3T)1-`f>W;#h}F*^DS=rAo~VX^%prR3`|v0uUH$iH7FW_tVjK36#LW@Fag zGfzE!X*bPVxB0NngVI9=0$;9pyM5SqV9wb_mDwUwjJ7qY+*J9}uW=J$fGx$b>8~F_Q|7-yzszdsevT`AKvLUisrHiuh8&({pNF8P~ds*JMR{r*ZE-eLi6C_sSW)mFFH>?QEK%)!qWa| z->PeZHsx!|g-hgDEx#K0_1yC9#ow2&)mmMm^mL#1-}BF9*;w-W&YB6SWHZlZcjodw z^V-2EoIyv>$8tUM_euW0 Date: Sun, 31 Oct 2021 19:50:31 -0300 Subject: [PATCH 20/26] Fixed Plasma Fists target --- src/data/battle_moves.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 714349eb2..97d61202a 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -10446,7 +10446,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .accuracy = 100, .pp = 15, .secondaryEffectChance = 0, - .target = MOVE_TARGET_FOES_AND_ALLY, + .target = MOVE_TARGET_SELECTED, .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_IRON_FIST_BOOST, .split = SPLIT_PHYSICAL, From 30a8281d32fe104bda94d56434a0519c7815cb30 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Mon, 1 Nov 2021 11:56:25 -0300 Subject: [PATCH 21/26] Fixed battlerId in Poison Touch's confusionSeldDmg check --- src/battle_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_util.c b/src/battle_util.c index 5e45798ab..70ea2ee0b 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -5199,7 +5199,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move case ABILITY_POISON_TOUCH: if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && gBattleMons[gBattlerTarget].hp != 0 - && !gProtectStructs[gBattlerTarget].confusionSelfDmg + && !gProtectStructs[gBattlerAttacker].confusionSelfDmg && CanBePoisoned(gBattlerTarget) && IsMoveMakingContact(move, gBattlerAttacker) && (Random() % 3) == 0) From 6357b2120258906fbf5ef987f50cf5f0e23695ae Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Mon, 1 Nov 2021 11:32:13 -0400 Subject: [PATCH 22/26] fix leaf guard ability pop up --- src/battle_script_commands.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index f2311f198..e51b426a0 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -8992,9 +8992,14 @@ static void Cmd_various(void) return; case VARIOUS_JUMP_IF_LEAF_GUARD_PROTECTED: if (IsLeafGuardProtected(gActiveBattler)) + { + gBattlerAbility = gActiveBattler; gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3); + } else + { gBattlescriptCurrInstr += 7; + } return; } From c4aa2a1e924c0f1b7a517ac5a13dcfd1e01efd31 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Mon, 1 Nov 2021 21:36:08 -0300 Subject: [PATCH 23/26] Added Gen 8 contest data (minus combos), also fixed Bubble's category --- src/data/contest_moves.h | 522 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 521 insertions(+), 1 deletion(-) diff --git a/src/data/contest_moves.h b/src/data/contest_moves.h index 2e8fd8089..160a05407 100644 --- a/src/data/contest_moves.h +++ b/src/data/contest_moves.h @@ -1158,7 +1158,7 @@ const struct ContestMove gContestMoves[MOVES_COUNT] = [MOVE_BUBBLE] = { .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_COOL, + .contestCategory = CONTEST_CATEGORY_CUTE, .comboStarterId = 0, .comboMoves = {COMBO_STARTER_RAIN_DANCE}, }, @@ -5398,6 +5398,526 @@ const struct ContestMove gContestMoves[MOVES_COUNT] = .comboStarterId = 0, .comboMoves = {0} }, + + [MOVE_DYNAMAX_CANNON] = + { + .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SNIPE_SHOT] = + { + .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_JAW_LOCK] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_STUFF_CHEEKS] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_NO_RETREAT] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_TAR_SHOT] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_MAGIC_POWDER] = + { + .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_DRAGON_DARTS] = + { + .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_TEATIME] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_OCTOLOCK] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_BOLT_BEAK] = + { + .effect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_FISHIOUS_REND] = + { + .effect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_COURT_CHANGE] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_CLANGOROUS_SOUL] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_BODY_PRESS] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_DECORATE] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_DRUM_BEATING] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_SNAP_TRAP] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_PYRO_BALL] = + { + .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_BEHEMOTH_BLADE] = + { + .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_BEHEMOTH_BASH] = + { + .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_AURA_WHEEL] = + { + .effect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_BREAKING_SWIPE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_BRANCH_POKE] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_OVERDRIVE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_APPLE_ACID] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_GRAV_APPLE] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SPIRIT_BREAK] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_STRANGE_STEAM] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_LIFE_DEW] = + { + .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_OBSTRUCT] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_FALSE_SURRENDER] = + { + .effect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_METEOR_ASSAULT] = + { + .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_ETERNABEAM] = + { + .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_STEEL_BEAM] = + { + .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_EXPANDING_FORCE] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_VENOM_DRENCH] = + { + .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SCALE_SHOT] = + { + .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_METEOR_BEAM] = + { + .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SHELL_SIDE_ARM] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_MISTY_EXPLOSION] = + { + .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_GRASSY_GLIDE] = + { + .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_RISING_VOLTAGE] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_TERRAIN_PULSE] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SKITTER_SMACK] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_BURNING_JEALOUSY] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_LASH_OUT] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_POLTERGEIST] = + { + .effect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_CORROSIVE_GAS] = + { + .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_COACHING] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_FLIP_TURN] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_TRIPLE_AXEL] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_DUAL_WINGBEAT] = + { + .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SCORCHING_SANDS] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_JUNGLE_HEALING] = + { + .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_WICKED_BLOW] = + { + .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_SURGING_STRIKES] = + { + .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_THUNDER_CAGE] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_DRAGON_ENERGY] = + { + .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_FREEZING_GLARE] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0} + }, + + [MOVE_FIERY_WRATH] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_THUNDEROUS_KICK] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_GLACIAL_LANCE] = + { + .effect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_ASTRAL_BARRAGE] = + { + .effect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_EERIE_SPELL] = + { + .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0} + }, }; const struct ContestEffect gContestEffects[] = From 8332bfae4682c9b4a778386c944d01253a1a81cd Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Mon, 1 Nov 2021 21:59:34 -0300 Subject: [PATCH 24/26] Gen 8 combo moves --- include/constants/contest.h | 4 ++++ src/data/contest_moves.h | 18 +++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/include/constants/contest.h b/include/constants/contest.h index cefcbeebd..f7b858c4a 100644 --- a/include/constants/contest.h +++ b/include/constants/contest.h @@ -238,5 +238,9 @@ #define COMBO_STARTER_THOUSAND_WAVES 82 #define COMBO_STARTER_HYPERSPACE_FURY 83 #define COMBO_STARTER_SHADOW_BONE 84 +#define COMBO_STARTER_ELECTRIC_TERRAIN 85 +#define COMBO_STARTER_MISTY_TERRAIN 86 +#define COMBO_STARTER_GRASSY_TERRAIN 87 +#define COMBO_STARTER_PSYCHIC_TERRAIN 88 #endif // GUARD_CONSTANTS_CONTEST_H diff --git a/src/data/contest_moves.h b/src/data/contest_moves.h index 160a05407..8600dcbc6 100644 --- a/src/data/contest_moves.h +++ b/src/data/contest_moves.h @@ -4633,7 +4633,7 @@ const struct ContestMove gContestMoves[MOVES_COUNT] = { .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, + .comboStarterId = COMBO_STARTER_GRASSY_TERRAIN, .comboMoves = {0} }, @@ -4641,7 +4641,7 @@ const struct ContestMove gContestMoves[MOVES_COUNT] = { .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, + .comboStarterId = COMBO_STARTER_MISTY_TERRAIN, .comboMoves = {0} }, @@ -4825,7 +4825,7 @@ const struct ContestMove gContestMoves[MOVES_COUNT] = { .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, + .comboStarterId = COMBO_STARTER_ELECTRIC_TERRAIN, .comboMoves = {0} }, @@ -5115,7 +5115,7 @@ const struct ContestMove gContestMoves[MOVES_COUNT] = { .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, + .comboStarterId = COMBO_STARTER_PSYCHIC_TERRAIN, .comboMoves = {0} }, @@ -5684,7 +5684,7 @@ const struct ContestMove gContestMoves[MOVES_COUNT] = .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestCategory = CONTEST_CATEGORY_SMART, .comboStarterId = 0, - .comboMoves = {0} + .comboMoves = {COMBO_STARTER_PSYCHIC_TERRAIN} }, [MOVE_VENOM_DRENCH] = @@ -5724,7 +5724,7 @@ const struct ContestMove gContestMoves[MOVES_COUNT] = .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, .contestCategory = CONTEST_CATEGORY_CUTE, .comboStarterId = 0, - .comboMoves = {0} + .comboMoves = {COMBO_STARTER_MISTY_TERRAIN} }, [MOVE_GRASSY_GLIDE] = @@ -5732,7 +5732,7 @@ const struct ContestMove gContestMoves[MOVES_COUNT] = .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestCategory = CONTEST_CATEGORY_SMART, .comboStarterId = 0, - .comboMoves = {0} + .comboMoves = {COMBO_STARTER_GRASSY_TERRAIN} }, [MOVE_RISING_VOLTAGE] = @@ -5740,7 +5740,7 @@ const struct ContestMove gContestMoves[MOVES_COUNT] = .effect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_BEAUTY, .comboStarterId = 0, - .comboMoves = {0} + .comboMoves = {COMBO_STARTER_ELECTRIC_TERRAIN} }, [MOVE_TERRAIN_PULSE] = @@ -5748,7 +5748,7 @@ const struct ContestMove gContestMoves[MOVES_COUNT] = .effect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestCategory = CONTEST_CATEGORY_CUTE, .comboStarterId = 0, - .comboMoves = {0}, + .comboMoves = {COMBO_STARTER_ELECTRIC_TERRAIN, COMBO_STARTER_MISTY_TERRAIN, COMBO_STARTER_GRASSY_TERRAIN, COMBO_STARTER_PSYCHIC_TERRAIN}, }, [MOVE_SKITTER_SMACK] = From 10306d046cd4262741ca47415cc261ac3e3c7319 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Mon, 1 Nov 2021 22:07:54 -0300 Subject: [PATCH 25/26] Fixed Steam Roller's define --- src/data/contest_moves.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/contest_moves.h b/src/data/contest_moves.h index 8600dcbc6..169e55991 100644 --- a/src/data/contest_moves.h +++ b/src/data/contest_moves.h @@ -5687,7 +5687,7 @@ const struct ContestMove gContestMoves[MOVES_COUNT] = .comboMoves = {COMBO_STARTER_PSYCHIC_TERRAIN} }, - [MOVE_VENOM_DRENCH] = + [MOVE_STEEL_ROLLER] = { .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestCategory = CONTEST_CATEGORY_TOUGH, From 5bfb3096adba05e14938b3c1416aa0d9ad38d4ac Mon Sep 17 00:00:00 2001 From: sbird Date: Tue, 2 Nov 2021 23:53:03 +0000 Subject: [PATCH 26/26] [battle_debug] fix charbase overflow --- src/battle_debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_debug.c b/src/battle_debug.c index b34afe484..c967cfe00 100644 --- a/src/battle_debug.c +++ b/src/battle_debug.c @@ -559,7 +559,7 @@ static const struct BgTemplate sBgTemplates[] = }, { .bg = 1, - .charBaseIndex = 10, + .charBaseIndex = 2, .mapBaseIndex = 20, .screenSize = 0, .paletteMode = 0,