From 896b575c07171c76c3a146f369447f836f47cca2 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 8 Feb 2023 12:42:38 +0100 Subject: [PATCH 01/32] Fix volt switch breaking ace pokemon --- data/battle_scripts_1.s | 2 +- include/battle.h | 1 + src/battle_ai_switch_items.c | 90 +++++++++++++++++++++++------------- src/battle_script_commands.c | 3 ++ src/data/trainer_parties.h | 32 +++++++++++-- src/data/trainers.h | 4 +- 6 files changed, 92 insertions(+), 40 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 25386dbf0..a707d7bce 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -3055,7 +3055,7 @@ BattleScript_EffectHitEscape: jumpifbyte CMP_NOT_EQUAL gBattleOutcome 0, BattleScript_HitEscapeEnd jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_HitEscapeEnd jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_HitEscapeEnd - jumpifemergencyexited BS_TARGET, BattleScript_HitEscapeEnd + jumpifemergencyexited BS_TARGET, BattleScript_HitEscapeEnd openpartyscreen BS_ATTACKER, BattleScript_HitEscapeEnd switchoutabilities BS_ATTACKER waitstate diff --git a/include/battle.h b/include/battle.h index 79413441c..cfeec4663 100644 --- a/include/battle.h +++ b/include/battle.h @@ -643,6 +643,7 @@ struct BattleStruct struct StolenItem itemStolen[PARTY_SIZE]; // Player's team that had items stolen (two bytes per party member) u8 blunderPolicy:1; // should blunder policy activate u8 swapDamageCategory:1; // Photon Geyser, Shell Side Arm, Light That Burns the Sky + u8 forcedSwitch:4; // For each battler u8 ballSpriteIds[2]; // item gfx, window gfx u8 stickyWebUser; u8 appearedInBattle; // Bitfield to track which Pokemon appeared in battle. Used for Burmy's form change diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index 5bcd17716..f976b47e3 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -27,6 +27,15 @@ static bool32 AiExpectsToFaintPlayer(void); static bool32 AI_ShouldHeal(u32 healAmount); static bool32 AI_OpponentCanFaintAiWithMod(u32 healAmount); +static bool32 isAceMon(u32 battlerId, u32 monPartyId) +{ + if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_ACE_POKEMON + && !(gBattleStruct->forcedSwitch) + && monPartyId == CalculateEnemyPartyCount()-1) + return TRUE; + return FALSE; +} + void GetAIPartyIndexes(u32 battlerId, s32 *firstId, s32 *lastId) { if (BATTLE_TWO_VS_ONE_OPPONENT && (battlerId & BIT_SIDE) == B_SIDE_OPPONENT) @@ -109,8 +118,7 @@ static bool8 ShouldSwitchIfWonderGuard(void) continue; if (i == gBattlerPartyIndexes[gActiveBattler]) continue; - if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_ACE_POKEMON - && i == (CalculateEnemyPartyCount()-1)) + if (isAceMon(gActiveBattler, i)) continue; for (opposingBattler = GetBattlerAtPosition(opposingPosition), j = 0; j < MAX_MON_MOVES; j++) @@ -202,10 +210,9 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void) continue; if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn2)) continue; - if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_ACE_POKEMON - && i == (CalculateEnemyPartyCount()-1)) + if (isAceMon(gActiveBattler, i)) continue; - + species = GetMonData(&party[i], MON_DATA_SPECIES); if (GetMonData(&party[i], MON_DATA_ABILITY_NUM) != 0) @@ -267,7 +274,7 @@ static bool8 ShouldSwitchIfGameStatePrompt(void) ) switchMon = FALSE; - if (IsBattlerAlive(BATTLE_PARTNER(gActiveBattler)) + if (IsBattlerAlive(BATTLE_PARTNER(gActiveBattler)) && (gBattleMoves[AI_DATA->partnerMove].effect == EFFECT_MISTY_TERRAIN || gBattleMoves[AI_DATA->partnerMove].effect == EFFECT_ELECTRIC_TERRAIN) && IsBattlerGrounded(gActiveBattler) @@ -277,15 +284,14 @@ static bool8 ShouldSwitchIfGameStatePrompt(void) if (*(gBattleStruct->AI_monToSwitchIntoId + BATTLE_PARTNER(gActiveBattler)) != PARTY_SIZE) //Partner is switching { GetAIPartyIndexes(gActiveBattler, &firstId, &lastId); - + if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) party = gPlayerParty; - + for (i = firstId; i < lastId; i++) { - if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_ACE_POKEMON - && i == (CalculateEnemyPartyCount()-1)) - break; + if (isAceMon(gActiveBattler, i)) + continue; //Look for mon in party that is able to be switched into and has ability that sets terrain if (GetMonData(&party[i], MON_DATA_HP) != 0 @@ -305,7 +311,7 @@ static bool8 ShouldSwitchIfGameStatePrompt(void) } } } - + //Check if Active Pokemon can KO opponent instead of switching //Will still fall asleep, but take out opposing Pokemon first if (AiExpectsToFaintPlayer()) @@ -328,7 +334,7 @@ static bool8 ShouldSwitchIfGameStatePrompt(void) && AI_DATA->abilities[opposingBattler] != ABILITY_UNAWARE && AI_DATA->abilities[opposingBattler] != ABILITY_KEEN_EYE && !(gBattleMons[gActiveBattler].status2 & STATUS2_FORESIGHT) - && !(gStatuses3[gActiveBattler] & STATUS3_MIRACLE_EYED)) + && !(gStatuses3[gActiveBattler] & STATUS3_MIRACLE_EYED)) switchMon = FALSE; } @@ -343,7 +349,7 @@ static bool8 ShouldSwitchIfGameStatePrompt(void) && gBattleMons[gActiveBattler].hp >= (gBattleMons[gActiveBattler].maxHP / 3) && (Random() % (moduloChance*chanceReducer)) == 0) switchMon = TRUE; - + //Cursed moduloChance = 2; //50% if (gBattleMons[gActiveBattler].status2 & STATUS2_CURSED @@ -370,7 +376,7 @@ static bool8 ShouldSwitchIfGameStatePrompt(void) //Todo //Pass Wish Heal - + //Semi-Invulnerable if (gStatuses3[opposingBattler] & STATUS3_SEMI_INVULNERABLE) { @@ -416,7 +422,7 @@ static bool8 ShouldSwitchIfAbilityBenefit(void) switch(AI_DATA->abilities[gActiveBattler]) { case ABILITY_NATURAL_CURE: moduloChance = 4; //25% - //Attempt to cure bad ailment + //Attempt to cure bad ailment if (gBattleMons[gActiveBattler].status1 & (STATUS1_SLEEP | STATUS1_FREEZE | STATUS1_TOXIC_POISON) && GetMostSuitableMonToSwitchInto() != PARTY_SIZE) break; @@ -432,17 +438,17 @@ static bool8 ShouldSwitchIfAbilityBenefit(void) case ABILITY_REGENERATOR: moduloChance = 2; //50% //Don't switch if ailment - if (gBattleMons[gActiveBattler].status1 & STATUS1_ANY) - return FALSE; + if (gBattleMons[gActiveBattler].status1 & STATUS1_ANY) + return FALSE; if ((gBattleMons[gActiveBattler].hp <= ((gBattleMons[gActiveBattler].maxHP * 2) / 3)) && GetMostSuitableMonToSwitchInto() != PARTY_SIZE && Random() % (moduloChance*chanceReducer) == 0) break; - + return FALSE; default: - return FALSE; + return FALSE; } *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = PARTY_SIZE; @@ -576,8 +582,7 @@ static bool8 FindMonWithFlagsAndSuperEffective(u16 flags, u8 moduloPercent) continue; if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn2)) continue; - if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_ACE_POKEMON - && i == (CalculateEnemyPartyCount()-1)) + if (isAceMon(gActiveBattler, i)) continue; @@ -619,6 +624,7 @@ bool32 ShouldSwitch(void) struct Pokemon *party; s32 i; s32 availableToSwitch; + bool32 hasAceMon = FALSE; if (gBattleMons[gActiveBattler].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION)) return FALSE; @@ -668,15 +674,22 @@ bool32 ShouldSwitch(void) continue; if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn2)) continue; - if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_ACE_POKEMON - && i == (CalculateEnemyPartyCount()-1)) + if (isAceMon(gActiveBattler, i)) + { + hasAceMon = TRUE; continue; + } availableToSwitch++; } if (availableToSwitch == 0) - return FALSE; + { + if (hasAceMon) // If the ace mon is the only available mon, use it + availableToSwitch++; + else + return FALSE; + } //NOTE: The sequence of the below functions matter! Do not change unless you have carefully considered the outcome. //Since the order is sequencial, and some of these functions prompt switch to specific party members. @@ -694,14 +707,14 @@ bool32 ShouldSwitch(void) return TRUE; if (ShouldSwitchIfAbilityBenefit()) return TRUE; - + //Removing switch capabilites under specific conditions //These Functions prevent the "FindMonWithFlagsAndSuperEffective" from getting out of hand. if (HasSuperEffectiveMoveAgainstOpponents(FALSE)) return FALSE; if (AreStatsRaised()) return FALSE; - + //Default Function //Can prompt switch if AI has a pokemon in party that resists current opponent & has super effective move if (FindMonWithFlagsAndSuperEffective(MOVE_RESULT_DOESNT_AFFECT_FOE, 2) @@ -758,8 +771,7 @@ void AI_TrySwitchOrUseItem(void) continue; if (monToSwitchId == *(gBattleStruct->monToSwitchIntoId + battlerIn2)) continue; - if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_ACE_POKEMON - && monToSwitchId == (CalculateEnemyPartyCount()-1)) + if (isAceMon(gActiveBattler, monToSwitchId)) continue; break; @@ -916,7 +928,7 @@ u8 GetMostSuitableMonToSwitchInto(void) s32 lastId = 0; // + 1 struct Pokemon *party; s32 i, j, aliveCount = 0; - u8 invalidMons = 0; + u32 invalidMons = 0, aceMonId = PARTY_SIZE; if (*(gBattleStruct->monToSwitchIntoId + gActiveBattler) != PARTY_SIZE) return *(gBattleStruct->monToSwitchIntoId + gActiveBattler); @@ -958,12 +970,19 @@ u8 GetMostSuitableMonToSwitchInto(void) || gBattlerPartyIndexes[battlerIn2] == i || i == *(gBattleStruct->monToSwitchIntoId + battlerIn1) || i == *(gBattleStruct->monToSwitchIntoId + battlerIn2) - || (GetMonAbility(&party[i]) == ABILITY_TRUANT && IsTruantMonVulnerable(gActiveBattler, opposingBattler)) // While not really invalid per say, not really wise to switch into this mon. - || ((AI_THINKING_STRUCT->aiFlags & AI_FLAG_ACE_POKEMON) - && i == (CalculateEnemyPartyCount() - 1))) //Save Ace Pokemon for last + || (GetMonAbility(&party[i]) == ABILITY_TRUANT && IsTruantMonVulnerable(gActiveBattler, opposingBattler))) // While not really invalid per say, not really wise to switch into this mon.) + { invalidMons |= gBitTable[i]; + } + else if (isAceMon(gActiveBattler, i))// Save Ace Pokemon for last. + { + aceMonId = i; + invalidMons |= gBitTable[i]; + } else + { aliveCount++; + } } bestMonId = GetBestMonBatonPass(party, firstId, lastId, invalidMons, aliveCount); @@ -978,6 +997,11 @@ u8 GetMostSuitableMonToSwitchInto(void) if (bestMonId != PARTY_SIZE) return bestMonId; + // If ace mon is the last available Pokemon and U-Turn/Volt Switch was used - switch to the mon. + if (aceMonId != PARTY_SIZE + && (gBattleMoves[gLastUsedMove].effect == EFFECT_HIT_ESCAPE || gBattleMoves[gLastUsedMove].effect == EFFECT_PARTING_SHOT)) + return aceMonId; + return PARTY_SIZE; } diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index be5e2ee21..0e447bbfc 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -6844,6 +6844,7 @@ static void Cmd_switchineffects(void) gBattlerFainted++; } } + gBattleStruct->forcedSwitch &= ~(gBitTable[gActiveBattler]); gBattlescriptCurrInstr += 2; } } @@ -11410,6 +11411,8 @@ static void Cmd_forcerandomswitch(void) *(gBattleStruct->battlerPartyIndexes + gBattlerTarget) = gBattlerPartyIndexes[gBattlerTarget]; gBattlescriptCurrInstr = BattleScript_RoarSuccessSwitch; + gBattleStruct->forcedSwitch |= gBitTable[gBattlerTarget]; + do { i = Random() % monsCount; diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h index 1759120b7..d04d25009 100644 --- a/src/data/trainer_parties.h +++ b/src/data/trainer_parties.h @@ -1706,12 +1706,36 @@ static const struct TrainerMonNoItemCustomMoves sParty_Jessica5[] = { } }; -static const struct TrainerMonItemDefaultMoves sParty_Winston1[] = { +static const struct TrainerMonItemCustomMoves sParty_Winston1[] = { { .iv = 0, - .lvl = 7, - .species = SPECIES_ZIGZAGOON, - .heldItem = ITEM_NUGGET + .lvl = 10, + .species = SPECIES_EMOLGA, + .heldItem = ITEM_NONE, + .moves = {MOVE_VOLT_SWITCH, MOVE_NONE, MOVE_NONE, MOVE_NONE}, + }, + /* + { + .iv = 0, + .lvl = 4, + .species = SPECIES_ABRA, + .heldItem = ITEM_NONE, + .moves = {MOVE_VOLT_SWITCH, MOVE_NONE, MOVE_NONE, MOVE_NONE}, + }, + { + .iv = 0, + .lvl = 8, + .species = SPECIES_KADABRA, + .heldItem = ITEM_NONE, + .moves = {MOVE_VOLT_SWITCH, MOVE_NONE, MOVE_NONE, MOVE_NONE}, + }, + */ + { + .iv = 250, + .lvl = 24, + .species = SPECIES_ZEBSTRIKA, + .heldItem = ITEM_SITRUS_BERRY, + .moves = {MOVE_VOLT_SWITCH, MOVE_VOLT_SWITCH, MOVE_VOLT_SWITCH, MOVE_VOLT_SWITCH}, } }; diff --git a/src/data/trainers.h b/src/data/trainers.h index 75f7edc8b..6ffdee13a 100644 --- a/src/data/trainers.h +++ b/src/data/trainers.h @@ -1641,8 +1641,8 @@ const struct Trainer gTrainers[] = { .trainerName = _("WINSTON"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, - .aiFlags = AI_FLAG_CHECK_BAD_MOVE, - .party = ITEM_DEFAULT_MOVES(sParty_Winston1), + .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_ACE_POKEMON, + .party = ITEM_CUSTOM_MOVES(sParty_Winston1), }, [TRAINER_MOLLIE] = From 84d7024add9a0e7e21896dea61b87ad9a3768f95 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 8 Feb 2023 12:48:48 +0100 Subject: [PATCH 02/32] cleanup --- src/data/trainer_parties.h | 32 ++++---------------------------- src/data/trainers.h | 4 ++-- 2 files changed, 6 insertions(+), 30 deletions(-) diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h index d04d25009..1759120b7 100644 --- a/src/data/trainer_parties.h +++ b/src/data/trainer_parties.h @@ -1706,36 +1706,12 @@ static const struct TrainerMonNoItemCustomMoves sParty_Jessica5[] = { } }; -static const struct TrainerMonItemCustomMoves sParty_Winston1[] = { +static const struct TrainerMonItemDefaultMoves sParty_Winston1[] = { { .iv = 0, - .lvl = 10, - .species = SPECIES_EMOLGA, - .heldItem = ITEM_NONE, - .moves = {MOVE_VOLT_SWITCH, MOVE_NONE, MOVE_NONE, MOVE_NONE}, - }, - /* - { - .iv = 0, - .lvl = 4, - .species = SPECIES_ABRA, - .heldItem = ITEM_NONE, - .moves = {MOVE_VOLT_SWITCH, MOVE_NONE, MOVE_NONE, MOVE_NONE}, - }, - { - .iv = 0, - .lvl = 8, - .species = SPECIES_KADABRA, - .heldItem = ITEM_NONE, - .moves = {MOVE_VOLT_SWITCH, MOVE_NONE, MOVE_NONE, MOVE_NONE}, - }, - */ - { - .iv = 250, - .lvl = 24, - .species = SPECIES_ZEBSTRIKA, - .heldItem = ITEM_SITRUS_BERRY, - .moves = {MOVE_VOLT_SWITCH, MOVE_VOLT_SWITCH, MOVE_VOLT_SWITCH, MOVE_VOLT_SWITCH}, + .lvl = 7, + .species = SPECIES_ZIGZAGOON, + .heldItem = ITEM_NUGGET } }; diff --git a/src/data/trainers.h b/src/data/trainers.h index 6ffdee13a..75f7edc8b 100644 --- a/src/data/trainers.h +++ b/src/data/trainers.h @@ -1641,8 +1641,8 @@ const struct Trainer gTrainers[] = { .trainerName = _("WINSTON"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, - .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_ACE_POKEMON, - .party = ITEM_CUSTOM_MOVES(sParty_Winston1), + .aiFlags = AI_FLAG_CHECK_BAD_MOVE, + .party = ITEM_DEFAULT_MOVES(sParty_Winston1), }, [TRAINER_MOLLIE] = From d7f68a3893045acff68bf37a892af0e7225ab7b4 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 16 Feb 2023 15:57:15 +0100 Subject: [PATCH 03/32] IsAceMon - not isAceMon --- src/battle_ai_switch_items.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index f976b47e3..a8c09c40b 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -27,7 +27,7 @@ static bool32 AiExpectsToFaintPlayer(void); static bool32 AI_ShouldHeal(u32 healAmount); static bool32 AI_OpponentCanFaintAiWithMod(u32 healAmount); -static bool32 isAceMon(u32 battlerId, u32 monPartyId) +static bool32 IsAceMon(u32 battlerId, u32 monPartyId) { if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_ACE_POKEMON && !(gBattleStruct->forcedSwitch) @@ -118,7 +118,7 @@ static bool8 ShouldSwitchIfWonderGuard(void) continue; if (i == gBattlerPartyIndexes[gActiveBattler]) continue; - if (isAceMon(gActiveBattler, i)) + if (IsAceMon(gActiveBattler, i)) continue; for (opposingBattler = GetBattlerAtPosition(opposingPosition), j = 0; j < MAX_MON_MOVES; j++) @@ -210,7 +210,7 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void) continue; if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn2)) continue; - if (isAceMon(gActiveBattler, i)) + if (IsAceMon(gActiveBattler, i)) continue; @@ -290,7 +290,7 @@ static bool8 ShouldSwitchIfGameStatePrompt(void) for (i = firstId; i < lastId; i++) { - if (isAceMon(gActiveBattler, i)) + if (IsAceMon(gActiveBattler, i)) continue; //Look for mon in party that is able to be switched into and has ability that sets terrain @@ -582,7 +582,7 @@ static bool8 FindMonWithFlagsAndSuperEffective(u16 flags, u8 moduloPercent) continue; if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn2)) continue; - if (isAceMon(gActiveBattler, i)) + if (IsAceMon(gActiveBattler, i)) continue; @@ -674,7 +674,7 @@ bool32 ShouldSwitch(void) continue; if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn2)) continue; - if (isAceMon(gActiveBattler, i)) + if (IsAceMon(gActiveBattler, i)) { hasAceMon = TRUE; continue; @@ -771,7 +771,7 @@ void AI_TrySwitchOrUseItem(void) continue; if (monToSwitchId == *(gBattleStruct->monToSwitchIntoId + battlerIn2)) continue; - if (isAceMon(gActiveBattler, monToSwitchId)) + if (IsAceMon(gActiveBattler, monToSwitchId)) continue; break; @@ -974,7 +974,7 @@ u8 GetMostSuitableMonToSwitchInto(void) { invalidMons |= gBitTable[i]; } - else if (isAceMon(gActiveBattler, i))// Save Ace Pokemon for last. + else if (IsAceMon(gActiveBattler, i))// Save Ace Pokemon for last. { aceMonId = i; invalidMons |= gBitTable[i]; From 6cdca24c31c0a8f216c176b01b86aeeb5038b535 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 16 Feb 2023 21:58:00 +0100 Subject: [PATCH 04/32] use forced switch battler bit --- src/battle_ai_switch_items.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index a8c09c40b..b43927819 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -30,7 +30,7 @@ static bool32 AI_OpponentCanFaintAiWithMod(u32 healAmount); static bool32 IsAceMon(u32 battlerId, u32 monPartyId) { if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_ACE_POKEMON - && !(gBattleStruct->forcedSwitch) + && !(gBattleStruct->forcedSwitch & gBitTable[battlerId]) && monPartyId == CalculateEnemyPartyCount()-1) return TRUE; return FALSE; From 03915524c5912c1c1d4e68406dcac01252ab5291 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 20 Feb 2023 12:42:06 +0100 Subject: [PATCH 05/32] Fix switch-in abilities activating on empty field --- include/battle.h | 1 + include/battle_script_commands.h | 1 + src/battle_script_commands.c | 72 +++++++++++++++++++++++--------- src/battle_util.c | 17 +++++++- src/data/trainer_parties.h | 12 +++--- test/ability_intimidate.c | 50 ++++++++++++++++++++-- test/test_runner.c | 2 +- 7 files changed, 124 insertions(+), 31 deletions(-) diff --git a/include/battle.h b/include/battle.h index 8be922384..46c934082 100644 --- a/include/battle.h +++ b/include/battle.h @@ -644,6 +644,7 @@ struct BattleStruct struct StolenItem itemStolen[PARTY_SIZE]; // Player's team that had items stolen (two bytes per party member) u8 blunderPolicy:1; // should blunder policy activate u8 swapDamageCategory:1; // Photon Geyser, Shell Side Arm, Light That Burns the Sky + u8 switchInAbilityPostponed:4; // To not activate against an empty field, each bit for battler u8 ballSpriteIds[2]; // item gfx, window gfx u8 stickyWebUser; u8 appearedInBattle; // Bitfield to track which Pokemon appeared in battle. Used for Burmy's form change diff --git a/include/battle_script_commands.h b/include/battle_script_commands.h index 60fd9b156..c3d6831e9 100644 --- a/include/battle_script_commands.h +++ b/include/battle_script_commands.h @@ -44,6 +44,7 @@ u16 GetSecretPowerMoveEffect(void); void StealTargetItem(u8 battlerStealer, u8 battlerItem); u8 GetCatchingBattler(void); u32 GetHighestStatId(u32 battlerId); +bool32 DoSwitchInAbilitiesItems(u32 battlerId); extern void (* const gBattleScriptingCommandsTable[])(void); extern const u8 gBattlePalaceNatureToMoveGroupLikelihood[NUM_NATURES][4]; diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 8b8d4f1e9..9555111b4 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -6900,6 +6900,35 @@ static void SetDmgHazardsBattlescript(u8 battlerId, u8 multistringId) gBattlescriptCurrInstr = BattleScript_DmgHazardsOnFaintedBattler; } +bool32 DoSwitchInAbilitiesItems(u32 battlerId) +{ + return (AbilityBattleEffects(ABILITYEFFECT_ON_SWITCHIN, battlerId, 0, 0, 0) + || (gBattleWeather & B_WEATHER_ANY && WEATHER_HAS_EFFECT && AbilityBattleEffects(ABILITYEFFECT_ON_WEATHER, battlerId, 0, 0, 0)) + || (gFieldStatuses & STATUS_FIELD_TERRAIN_ANY && AbilityBattleEffects(ABILITYEFFECT_ON_TERRAIN, battlerId, 0, 0, 0)) + || ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, battlerId, FALSE) + || AbilityBattleEffects(ABILITYEFFECT_TRACE2, 0, 0, 0, 0)); +} + +bool32 ShouldPostponeSwitchInAbilities(u32 battlerId) +{ + bool32 aliveOpposing1 = IsBattlerAlive(BATTLE_OPPOSITE(battlerId)); + bool32 aliveOpposing2 = IsBattlerAlive(BATTLE_PARTNER(BATTLE_OPPOSITE(battlerId))); + // No pokemon on opposing side - postopone. + if (!aliveOpposing1 && !aliveOpposing2) + return TRUE; + + // Checks for double battle, so abilities like Intimidate wait until all battlers are switched-in before activating. + if (IsDoubleBattle()) + { + if (aliveOpposing1 && !aliveOpposing2 && !HasNoMonsToSwitch(BATTLE_OPPOSITE(battlerId), PARTY_SIZE, PARTY_SIZE)) + return TRUE; + if (!aliveOpposing1 && aliveOpposing2 && !HasNoMonsToSwitch(BATTLE_PARTNER(BATTLE_OPPOSITE(battlerId)), PARTY_SIZE, PARTY_SIZE)) + return TRUE; + } + + return FALSE; +} + static void Cmd_switchineffects(void) { CMD_ARGS(u8 battler); @@ -7016,12 +7045,17 @@ static void Cmd_switchineffects(void) gDisableStructs[gActiveBattler].truantSwitchInHack = 0; - if (AbilityBattleEffects(ABILITYEFFECT_ON_SWITCHIN, gActiveBattler, 0, 0, 0) - || (gBattleWeather & B_WEATHER_ANY && WEATHER_HAS_EFFECT && AbilityBattleEffects(ABILITYEFFECT_ON_WEATHER, gActiveBattler, 0, 0, 0)) - || (gFieldStatuses & STATUS_FIELD_TERRAIN_ANY && AbilityBattleEffects(ABILITYEFFECT_ON_TERRAIN, gActiveBattler, 0, 0, 0)) - || ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gActiveBattler, FALSE) - || AbilityBattleEffects(ABILITYEFFECT_TRACE2, 0, 0, 0, 0)) - return; + // Don't activate switch-in abilities if the opposing field is empty. + // This could happen when a mon uses explosion and causes everyone to faint. + if (ShouldPostponeSwitchInAbilities(gActiveBattler) || gBattleStruct->switchInAbilityPostponed) + { + gBattleStruct->switchInAbilityPostponed |= gBitTable[gActiveBattler]; + } + else + { + if (DoSwitchInAbilitiesItems(gActiveBattler)) + return; + } gSideStatuses[GetBattlerSide(gActiveBattler)] &= ~(SIDE_STATUS_SPIKES_DAMAGED | SIDE_STATUS_TOXIC_SPIKES_DAMAGED | SIDE_STATUS_STEALTH_ROCK_DAMAGED | SIDE_STATUS_STICKY_WEB_DAMAGED); @@ -11016,21 +11050,21 @@ static void Cmd_various(void) return; } case VARIOUS_JUMP_IF_NO_VALID_TARGETS: - { - VARIOUS_ARGS(const u8 *jumpInstr); - u32 count = 0; + { + VARIOUS_ARGS(const u8 *jumpInstr); + u32 count = 0; - for (i = 0; i < gBattlersCount; i++) - { - if (GetBattlerSide(i) != GetBattlerSide(gBattlerAttacker) && IsBattlerAlive(i)) - count++; - } - if (count == 0) - gBattlescriptCurrInstr = cmd->jumpInstr; - else - gBattlescriptCurrInstr = cmd->nextInstr; - return; + for (i = 0; i < gBattlersCount; i++) + { + if (GetBattlerSide(i) != GetBattlerSide(gBattlerAttacker) && IsBattlerAlive(i)) + count++; } + if (count == 0) + gBattlescriptCurrInstr = cmd->jumpInstr; + else + gBattlescriptCurrInstr = cmd->nextInstr; + return; + } case VARIOUS_JUMP_IF_EMERGENCY_EXITED: { VARIOUS_ARGS(const u8 *jumpInstr); diff --git a/src/battle_util.c b/src/battle_util.c index 25ba83093..185575411 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -3301,7 +3301,7 @@ bool8 HandleWishPerishSongOnTurnEnd(void) return FALSE; } -#define FAINTED_ACTIONS_MAX_CASE 7 +#define FAINTED_ACTIONS_MAX_CASE 8 bool8 HandleFaintedMonActions(void) { @@ -3386,7 +3386,19 @@ bool8 HandleFaintedMonActions(void) else gBattleStruct->faintedActionsState = 4; break; - case 6: + case 6: // All battlers switch-in abilities happen here to prevent them happening against an empty field. + for (i = 0; i < gBattlersCount; i++) + { + if (gBattleStruct->switchInAbilityPostponed & gBitTable[i]) + { + if (DoSwitchInAbilitiesItems(i)) + return TRUE; + gBattleStruct->switchInAbilityPostponed &= ~(gBitTable[i]); + } + } + gBattleStruct->faintedActionsState++; + break; + case 7: if (ItemBattleEffects(ITEMEFFECT_NORMAL, 0, TRUE)) return TRUE; gBattleStruct->faintedActionsState++; @@ -4749,6 +4761,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move case ABILITY_INTIMIDATE: if (!gSpecialStatuses[battler].switchInAbilityDone) { + gBattlerAttacker = battler; gSpecialStatuses[battler].switchInAbilityDone = TRUE; SET_STATCHANGER(STAT_ATK, 1, TRUE); BattleScriptPushCursorAndCallback(BattleScript_IntimidateActivates); diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h index 1759120b7..de2d1e897 100644 --- a/src/data/trainer_parties.h +++ b/src/data/trainer_parties.h @@ -400,17 +400,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Rose1[] = { { .iv = 0, .lvl = 14, - .species = SPECIES_ROSELIA, + .species = SPECIES_PORYGON, }, { .iv = 0, .lvl = 14, - .species = SPECIES_SHROOMISH, + .species = SPECIES_PORYGON, }, { .iv = 0, .lvl = 14, - .species = SPECIES_ROSELIA, + .species = SPECIES_PORYGON, } }; @@ -9631,17 +9631,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Deandre[] = { { .iv = 0, .lvl = 14, - .species = SPECIES_ZIGZAGOON, + .species = SPECIES_PORYGON, }, { .iv = 0, .lvl = 14, - .species = SPECIES_ARON, + .species = SPECIES_PORYGON, }, { .iv = 0, .lvl = 14, - .species = SPECIES_ELECTRIKE, + .species = SPECIES_PORYGON, } }; diff --git a/test/ability_intimidate.c b/test/ability_intimidate.c index 450ca6402..a0f48776c 100644 --- a/test/ability_intimidate.c +++ b/test/ability_intimidate.c @@ -30,13 +30,12 @@ SINGLE_BATTLE_TEST("Intimidate (opponent) lowers player's attack after switch ou SINGLE_BATTLE_TEST("Intimidate (opponent) lowers player's attack after KO", s16 damage) { u32 ability; - KNOWN_FAILING; PARAMETRIZE { ability = ABILITY_INTIMIDATE; } PARAMETRIZE { ability = ABILITY_RECKLESS; } GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Speed(2); }; + PLAYER(SPECIES_WOBBUFFET) { Speed(2); Attack(120) ; }; OPPONENT(SPECIES_WOBBUFFET) { HP(1); Speed(1); }; - OPPONENT(SPECIES_STARAPTOR) { Ability(ABILITY_INTIMIDATE); Speed(1); }; + OPPONENT(SPECIES_STARAPTOR) { Ability(ability); Speed(1); }; } WHEN { TURN { MOVE(player, MOVE_TACKLE); SEND_OUT(opponent, 1); } TURN { MOVE(player, MOVE_TACKLE); } @@ -48,3 +47,48 @@ SINGLE_BATTLE_TEST("Intimidate (opponent) lowers player's attack after KO", s16 EXPECT_MUL_EQ(results[0].damage, Q_4_12(1.5), results[1].damage); } } + +DOUBLE_BATTLE_TEST("Intimidate doesn't activate on an empty field in a double battle") +{ + GIVEN { + ASSUME(gBattleMoves[MOVE_EXPLOSION].effect == EFFECT_EXPLOSION); + PLAYER(SPECIES_WOBBUFFET) { }; + PLAYER(SPECIES_WOBBUFFET) { HP(1); }; + PLAYER(SPECIES_STARAVIA) { Ability(ABILITY_INTIMIDATE); }; + PLAYER(SPECIES_ABRA); + OPPONENT(SPECIES_WOBBUFFET) { HP(1); }; + OPPONENT(SPECIES_WOBBUFFET) { HP(1); }; + OPPONENT(SPECIES_STARAPTOR) { Ability(ABILITY_INTIMIDATE); }; + OPPONENT(SPECIES_WYNAUT); + } WHEN { + TURN { MOVE(playerLeft, MOVE_EXPLOSION); SEND_OUT(playerLeft, 2); SEND_OUT(opponentLeft, 2); SEND_OUT(playerRight, 3); SEND_OUT(opponentRight, 3); } + TURN { MOVE(playerLeft, MOVE_CELEBRATE);} + } SCENE { + HP_BAR(playerLeft, hp: 0); + ANIMATION(ANIM_TYPE_MOVE, MOVE_EXPLOSION, playerLeft); + // Leaving these messages as they're not that important to the test, to not exceed MAX_QUEUED_EVENTS. + /* + MESSAGE("Foe Wobbuffet fainted!"); + MESSAGE("Wobbuffet fainted!"); + MESSAGE("Foe Wobbuffet fainted!"); + MESSAGE("Wobbuffet fainted!"); + */ + + MESSAGE("Go! Staravia!"); + MESSAGE("2 sent out Staraptor!"); + MESSAGE("Go! Abra!"); + MESSAGE("2 sent out Wynaut!"); + + ABILITY_POPUP(playerLeft, ABILITY_INTIMIDATE); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponentLeft); + MESSAGE("Staravia's Intimidate cuts Foe Staraptor's ATTACK!"); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponentRight); + MESSAGE("Staravia's Intimidate cuts Foe Wynaut's ATTACK!"); + + ABILITY_POPUP(opponentLeft, ABILITY_INTIMIDATE); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, playerLeft); + MESSAGE("Foe Staraptor's Intimidate cuts Staravia's ATTACK!"); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, playerRight); + MESSAGE("Foe Staraptor's Intimidate cuts Abra's ATTACK!"); + } +} diff --git a/test/test_runner.c b/test/test_runner.c index 3cb1f7c21..c4befb35f 100644 --- a/test/test_runner.c +++ b/test/test_runner.c @@ -7,7 +7,7 @@ #include "test.h" #include "test_runner.h" -#define TIMEOUT_SECONDS 30 +#define TIMEOUT_SECONDS 49 void CB2_TestRunner(void); From a8c0e1ebeb13de3bb037942d21b8a8c151b90d6c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 20 Feb 2023 13:15:08 +0100 Subject: [PATCH 06/32] fix intimidate --- src/data/trainer_parties.h | 12 ++++++------ test/ability_download.c | 29 +++++++++++++++++++++++++++++ test/ability_intimidate.c | 11 ++++++++++- 3 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 test/ability_download.c diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h index de2d1e897..1759120b7 100644 --- a/src/data/trainer_parties.h +++ b/src/data/trainer_parties.h @@ -400,17 +400,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Rose1[] = { { .iv = 0, .lvl = 14, - .species = SPECIES_PORYGON, + .species = SPECIES_ROSELIA, }, { .iv = 0, .lvl = 14, - .species = SPECIES_PORYGON, + .species = SPECIES_SHROOMISH, }, { .iv = 0, .lvl = 14, - .species = SPECIES_PORYGON, + .species = SPECIES_ROSELIA, } }; @@ -9631,17 +9631,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Deandre[] = { { .iv = 0, .lvl = 14, - .species = SPECIES_PORYGON, + .species = SPECIES_ZIGZAGOON, }, { .iv = 0, .lvl = 14, - .species = SPECIES_PORYGON, + .species = SPECIES_ARON, }, { .iv = 0, .lvl = 14, - .species = SPECIES_PORYGON, + .species = SPECIES_ELECTRIKE, } }; diff --git a/test/ability_download.c b/test/ability_download.c new file mode 100644 index 000000000..8380487ce --- /dev/null +++ b/test/ability_download.c @@ -0,0 +1,29 @@ +#include "global.h" +#include "test_battle.h" + +ASSUMPTIONS +{ + ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); +} + +SINGLE_BATTLE_TEST("Download raises Attack if enemy has greater Atk than Sp.Atk", s16 damage) +{ + u32 ability; + PARAMETRIZE { ability = ABILITY_TRACE; } + PARAMETRIZE { ability = ABILITY_DOWNLOAD; } + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_PORYGON) { Ability(ability); }; + } WHEN { + TURN { MOVE(opponent, MOVE_TACKLE); } + } SCENE { + if (ability == ABILITY_DOWNLOAD) + { + ABILITY_POPUP(opponent, ABILITY_DOWNLOAD); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent); + } + HP_BAR(opponent, captureDamage: &results[i].damage); + } FINALLY { + EXPECT_MUL_EQ(results[0].damage, Q_4_12(1.5), results[1].damage); + } +} diff --git a/test/ability_intimidate.c b/test/ability_intimidate.c index a0f48776c..29acfe6f9 100644 --- a/test/ability_intimidate.c +++ b/test/ability_intimidate.c @@ -20,7 +20,11 @@ SINGLE_BATTLE_TEST("Intimidate (opponent) lowers player's attack after switch ou TURN { MOVE(player, MOVE_TACKLE); } } SCENE { if (ability == ABILITY_INTIMIDATE) + { ABILITY_POPUP(opponent, ABILITY_INTIMIDATE); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); + MESSAGE("Foe Staraptor's Intimidate cuts Wobbuffet's ATTACK!"); + } HP_BAR(opponent, captureDamage: &results[i].damage); } FINALLY { EXPECT_MUL_EQ(results[0].damage, Q_4_12(1.5), results[1].damage); @@ -33,15 +37,20 @@ SINGLE_BATTLE_TEST("Intimidate (opponent) lowers player's attack after KO", s16 PARAMETRIZE { ability = ABILITY_INTIMIDATE; } PARAMETRIZE { ability = ABILITY_RECKLESS; } GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Speed(2); Attack(120) ; }; + PLAYER(SPECIES_WOBBUFFET) { Speed(2); }; OPPONENT(SPECIES_WOBBUFFET) { HP(1); Speed(1); }; OPPONENT(SPECIES_STARAPTOR) { Ability(ability); Speed(1); }; } WHEN { TURN { MOVE(player, MOVE_TACKLE); SEND_OUT(opponent, 1); } TURN { MOVE(player, MOVE_TACKLE); } } SCENE { + HP_BAR(opponent); if (ability == ABILITY_INTIMIDATE) + { ABILITY_POPUP(opponent, ABILITY_INTIMIDATE); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); + MESSAGE("Foe Staraptor's Intimidate cuts Wobbuffet's ATTACK!"); + } HP_BAR(opponent, captureDamage: &results[i].damage); } FINALLY { EXPECT_MUL_EQ(results[0].damage, Q_4_12(1.5), results[1].damage); From a6f6c205c9fce128b76bcd56c03317c490ee8456 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 20 Feb 2023 15:41:22 +0100 Subject: [PATCH 07/32] add tests for download --- test/ability_download.c | 72 +++++++++++++++++++++++++++++++++++++-- test/ability_intimidate.c | 8 +---- 2 files changed, 70 insertions(+), 10 deletions(-) diff --git a/test/ability_download.c b/test/ability_download.c index 8380487ce..77d090a30 100644 --- a/test/ability_download.c +++ b/test/ability_download.c @@ -4,16 +4,17 @@ ASSUMPTIONS { ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); + ASSUME(gBattleMoves[MOVE_TRI_ATTACK].split == SPLIT_PHYSICAL); } -SINGLE_BATTLE_TEST("Download raises Attack if enemy has greater Atk than Sp.Atk", s16 damage) +SINGLE_BATTLE_TEST("Download raises Attack if player has lower Def than Sp.Def", s16 damage) { u32 ability; PARAMETRIZE { ability = ABILITY_TRACE; } PARAMETRIZE { ability = ABILITY_DOWNLOAD; } GIVEN { - PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_PORYGON) { Ability(ability); }; + PLAYER(SPECIES_WOBBUFFET) {Defense(100); SpDefense(200); }; + OPPONENT(SPECIES_PORYGON) { Ability(ability); Attack(100); }; } WHEN { TURN { MOVE(opponent, MOVE_TACKLE); } } SCENE { @@ -21,9 +22,74 @@ SINGLE_BATTLE_TEST("Download raises Attack if enemy has greater Atk than Sp.Atk" { ABILITY_POPUP(opponent, ABILITY_DOWNLOAD); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent); + MESSAGE("Foe Porygon's Download raised its attack!"); + } + HP_BAR(player, captureDamage: &results[i].damage); + } FINALLY { + EXPECT_MUL_EQ(results[0].damage, Q_4_12(1.5), results[1].damage); + } +} + +SINGLE_BATTLE_TEST("Download raises Sp.Attack if enemy has lower Sp.Def than Def", s16 damage) +{ + u32 ability; + PARAMETRIZE { ability = ABILITY_TRACE; } + PARAMETRIZE { ability = ABILITY_DOWNLOAD; } + GIVEN { + PLAYER(SPECIES_PORYGON) { Ability(ability); SpAttack(100); }; + OPPONENT(SPECIES_WOBBUFFET) {Defense(200); SpDefense(100); }; + } WHEN { + TURN { MOVE(player, MOVE_TRI_ATTACK); } + } SCENE { + if (ability == ABILITY_DOWNLOAD) + { + ABILITY_POPUP(player, ABILITY_DOWNLOAD); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); + MESSAGE("Porygon's Download raised its sp. attack!"); } HP_BAR(opponent, captureDamage: &results[i].damage); } FINALLY { EXPECT_MUL_EQ(results[0].damage, Q_4_12(1.5), results[1].damage); } } + +SINGLE_BATTLE_TEST("Download doesn't activate if target hasn't been sent out yet", s16 damagePhysical, s16 damageSpecial) +{ + u32 ability; + PARAMETRIZE { ability = ABILITY_TRACE; } + PARAMETRIZE { ability = ABILITY_DOWNLOAD; } + GIVEN { + ASSUME(gBattleMoves[MOVE_EXPLOSION].effect == EFFECT_EXPLOSION); + PLAYER(SPECIES_WOBBUFFET) { Speed(100); }; + PLAYER(SPECIES_PORYGON) { Ability(ability); Defense(400); SpDefense(300); Speed(300); Attack(100); }; + OPPONENT(SPECIES_WOBBUFFET) { HP(1); Speed(100); }; + OPPONENT(SPECIES_PORYGON2) { Ability(ability); Defense(100); SpDefense(200); Speed(200); }; + } WHEN { + TURN { MOVE(player, MOVE_EXPLOSION); SEND_OUT(player, 1); SEND_OUT(opponent, 1); } + TURN { MOVE(player, MOVE_TACKLE); MOVE(opponent, MOVE_TRI_ATTACK);} + } SCENE { + HP_BAR(player, hp: 0); + ANIMATION(ANIM_TYPE_MOVE, MOVE_EXPLOSION, player); + // Everyone faints. + + MESSAGE("Go! Porygon!"); + MESSAGE("2 sent out Porygon2!"); + + if (ability == ABILITY_DOWNLOAD) + { + ABILITY_POPUP(player, ABILITY_DOWNLOAD); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); + MESSAGE("Porygon's Download raised its attack!"); + ABILITY_POPUP(opponent, ABILITY_DOWNLOAD); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent); + MESSAGE("Foe Porygon2's Download raised its sp. attack!"); + } + ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, player); + HP_BAR(opponent, captureDamage: &results[i].damagePhysical); + ANIMATION(ANIM_TYPE_MOVE, MOVE_TRI_ATTACK, opponent); + HP_BAR(player, captureDamage: &results[i].damageSpecial); + } FINALLY { + EXPECT_MUL_EQ(results[0].damagePhysical, Q_4_12(1.5), results[1].damagePhysical); + EXPECT_MUL_EQ(results[0].damageSpecial, Q_4_12(1.5), results[1].damageSpecial); + } +} diff --git a/test/ability_intimidate.c b/test/ability_intimidate.c index 29acfe6f9..f978b80ab 100644 --- a/test/ability_intimidate.c +++ b/test/ability_intimidate.c @@ -75,13 +75,7 @@ DOUBLE_BATTLE_TEST("Intimidate doesn't activate on an empty field in a double ba } SCENE { HP_BAR(playerLeft, hp: 0); ANIMATION(ANIM_TYPE_MOVE, MOVE_EXPLOSION, playerLeft); - // Leaving these messages as they're not that important to the test, to not exceed MAX_QUEUED_EVENTS. - /* - MESSAGE("Foe Wobbuffet fainted!"); - MESSAGE("Wobbuffet fainted!"); - MESSAGE("Foe Wobbuffet fainted!"); - MESSAGE("Wobbuffet fainted!"); - */ + // Everyone faints. MESSAGE("Go! Staravia!"); MESSAGE("2 sent out Staraptor!"); From 7d23d5433b68e104621073021afae493f632511f Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 20 Feb 2023 16:38:37 +0100 Subject: [PATCH 08/32] try fix tests failing --- test/test_runner.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_runner.c b/test/test_runner.c index c4befb35f..f64dffacb 100644 --- a/test/test_runner.c +++ b/test/test_runner.c @@ -7,7 +7,7 @@ #include "test.h" #include "test_runner.h" -#define TIMEOUT_SECONDS 49 +#define TIMEOUT_SECONDS 55 void CB2_TestRunner(void); From 2eb6401d52ab0853aa71e28f090ef8e1b1504f99 Mon Sep 17 00:00:00 2001 From: Martin Griffin Date: Sun, 19 Feb 2023 14:48:51 +0000 Subject: [PATCH 09/32] Test Overgrow, Swarm and Torrent --- test/ability_blaze.c | 2 +- test/ability_overgrow.c | 20 ++++++++++++++++++++ test/ability_swarm.c | 20 ++++++++++++++++++++ test/ability_torrent.c | 20 ++++++++++++++++++++ 4 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 test/ability_overgrow.c create mode 100644 test/ability_swarm.c create mode 100644 test/ability_torrent.c diff --git a/test/ability_blaze.c b/test/ability_blaze.c index 259b863ec..1e12c6b29 100644 --- a/test/ability_blaze.c +++ b/test/ability_blaze.c @@ -15,6 +15,6 @@ SINGLE_BATTLE_TEST("Blaze boosts Fire-type moves in a pinch", s16 damage) } SCENE { HP_BAR(opponent, captureDamage: &results[i].damage); } FINALLY { - EXPECT_GT(results[1].damage, results[0].damage); + EXPECT_MUL_EQ(results[0].damage, Q_4_12(1.5), results[1].damage); } } diff --git a/test/ability_overgrow.c b/test/ability_overgrow.c new file mode 100644 index 000000000..82d8dd467 --- /dev/null +++ b/test/ability_overgrow.c @@ -0,0 +1,20 @@ +#include "global.h" +#include "test_battle.h" + +SINGLE_BATTLE_TEST("Overgrow boosts Grass-type moves in a pinch", s16 damage) +{ + u16 hp; + PARAMETRIZE { hp = 99; } + PARAMETRIZE { hp = 33; } + GIVEN { + ASSUME(gBattleMoves[MOVE_VINE_WHIP].type == TYPE_GRASS); + PLAYER(SPECIES_BULBASAUR) { Ability(ABILITY_OVERGROW); MaxHP(99); HP(hp); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_VINE_WHIP); } + } SCENE { + HP_BAR(opponent, captureDamage: &results[i].damage); + } FINALLY { + EXPECT_MUL_EQ(results[0].damage, Q_4_12(1.5), results[1].damage); + } +} diff --git a/test/ability_swarm.c b/test/ability_swarm.c new file mode 100644 index 000000000..7709e976e --- /dev/null +++ b/test/ability_swarm.c @@ -0,0 +1,20 @@ +#include "global.h" +#include "test_battle.h" + +SINGLE_BATTLE_TEST("Swarm boosts Bug-type moves in a pinch", s16 damage) +{ + u16 hp; + PARAMETRIZE { hp = 99; } + PARAMETRIZE { hp = 33; } + GIVEN { + ASSUME(gBattleMoves[MOVE_BUG_BITE].type == TYPE_BUG); + PLAYER(SPECIES_LEDYBA) { Ability(ABILITY_SWARM); MaxHP(99); HP(hp); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_BUG_BITE); } + } SCENE { + HP_BAR(opponent, captureDamage: &results[i].damage); + } FINALLY { + EXPECT_MUL_EQ(results[0].damage, Q_4_12(1.5), results[1].damage); + } +} diff --git a/test/ability_torrent.c b/test/ability_torrent.c new file mode 100644 index 000000000..e5c701775 --- /dev/null +++ b/test/ability_torrent.c @@ -0,0 +1,20 @@ +#include "global.h" +#include "test_battle.h" + +SINGLE_BATTLE_TEST("Torrent boosts Water-type moves in a pinch", s16 damage) +{ + u16 hp; + PARAMETRIZE { hp = 99; } + PARAMETRIZE { hp = 33; } + GIVEN { + ASSUME(gBattleMoves[MOVE_BUBBLE].type == TYPE_WATER); + PLAYER(SPECIES_SQUIRTLE) { Ability(ABILITY_TORRENT); MaxHP(99); HP(hp); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_BUBBLE); } + } SCENE { + HP_BAR(opponent, captureDamage: &results[i].damage); + } FINALLY { + EXPECT_MUL_EQ(results[0].damage, Q_4_12(1.5), results[1].damage); + } +} From 666e59b37f2a3a79554589c8b7667928219a75e1 Mon Sep 17 00:00:00 2001 From: Martin Griffin Date: Sun, 19 Feb 2023 15:36:16 +0000 Subject: [PATCH 10/32] Test Roar The original implementation of forcerandomswitch was biased towards certain party members. --- src/battle_script_commands.c | 33 +++++------------ test/move_effect_roar.c | 70 ++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 25 deletions(-) create mode 100644 test/move_effect_roar.c diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 21dbf59e4..b4bafd215 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -12089,8 +12089,8 @@ static void Cmd_forcerandomswitch(void) s32 lastMonId = 0; // + 1 s32 monsCount; struct Pokemon *party = NULL; - s32 validMons = 0; - s32 minNeeded; + u8 validMons[PARTY_SIZE]; + s32 validMonsCount = 0; bool32 redCardForcedSwitch = FALSE; @@ -12147,7 +12147,6 @@ static void Cmd_forcerandomswitch(void) firstMonId = 0; lastMonId = 6; monsCount = 6; - minNeeded = 2; battler2PartyId = gBattlerPartyIndexes[gBattlerTarget]; battler1PartyId = gBattlerPartyIndexes[BATTLE_PARTNER(gBattlerTarget)]; } @@ -12166,7 +12165,6 @@ static void Cmd_forcerandomswitch(void) lastMonId = PARTY_SIZE / 2; } monsCount = PARTY_SIZE / 2; - minNeeded = 1; battler2PartyId = gBattlerPartyIndexes[gBattlerTarget]; battler1PartyId = gBattlerPartyIndexes[BATTLE_PARTNER(gBattlerTarget)]; } @@ -12184,7 +12182,6 @@ static void Cmd_forcerandomswitch(void) lastMonId = PARTY_SIZE / 2; } monsCount = PARTY_SIZE / 2; - minNeeded = 1; battler2PartyId = gBattlerPartyIndexes[gBattlerTarget]; battler1PartyId = gBattlerPartyIndexes[BATTLE_PARTNER(gBattlerTarget)]; } @@ -12195,7 +12192,6 @@ static void Cmd_forcerandomswitch(void) firstMonId = 0; lastMonId = PARTY_SIZE; monsCount = PARTY_SIZE; - minNeeded = 2; // since there are two opponents, it has to be a double battle } else { @@ -12210,7 +12206,6 @@ static void Cmd_forcerandomswitch(void) lastMonId = PARTY_SIZE / 2; } monsCount = PARTY_SIZE / 2; - minNeeded = 1; } battler2PartyId = gBattlerPartyIndexes[gBattlerTarget]; battler1PartyId = gBattlerPartyIndexes[BATTLE_PARTNER(gBattlerTarget)]; @@ -12220,7 +12215,6 @@ static void Cmd_forcerandomswitch(void) firstMonId = 0; lastMonId = PARTY_SIZE; monsCount = PARTY_SIZE; - minNeeded = 2; battler2PartyId = gBattlerPartyIndexes[gBattlerTarget]; battler1PartyId = gBattlerPartyIndexes[BATTLE_PARTNER(gBattlerTarget)]; } @@ -12229,7 +12223,6 @@ static void Cmd_forcerandomswitch(void) firstMonId = 0; lastMonId = PARTY_SIZE; monsCount = PARTY_SIZE; - minNeeded = 1; battler2PartyId = gBattlerPartyIndexes[gBattlerTarget]; // there is only one pokemon out in single battles battler1PartyId = gBattlerPartyIndexes[gBattlerTarget]; } @@ -12238,13 +12231,15 @@ static void Cmd_forcerandomswitch(void) { if (GetMonData(&party[i], MON_DATA_SPECIES) != SPECIES_NONE && !GetMonData(&party[i], MON_DATA_IS_EGG) - && GetMonData(&party[i], MON_DATA_HP) != 0) + && GetMonData(&party[i], MON_DATA_HP) != 0 + && i != battler1PartyId + && i != battler2PartyId) { - validMons++; + validMons[validMonsCount++] = i; } } - if (!redCardForcedSwitch && validMons <= minNeeded) + if (validMonsCount == 0) { gBattlescriptCurrInstr = cmd->failInstr; } @@ -12252,19 +12247,7 @@ static void Cmd_forcerandomswitch(void) { *(gBattleStruct->battlerPartyIndexes + gBattlerTarget) = gBattlerPartyIndexes[gBattlerTarget]; gBattlescriptCurrInstr = BattleScript_RoarSuccessSwitch; - - do - { - i = Random() % monsCount; - i += firstMonId; - } - while (i == battler2PartyId - || i == battler1PartyId - || GetMonData(&party[i], MON_DATA_SPECIES) == SPECIES_NONE - || GetMonData(&party[i], MON_DATA_IS_EGG) == TRUE - || GetMonData(&party[i], MON_DATA_HP) == 0); - - *(gBattleStruct->monToSwitchIntoId + gBattlerTarget) = i; + *(gBattleStruct->monToSwitchIntoId + gBattlerTarget) = validMons[Random() % validMonsCount]; if (!IsMultiBattle()) SwitchPartyOrder(gBattlerTarget); diff --git a/test/move_effect_roar.c b/test/move_effect_roar.c new file mode 100644 index 000000000..2d4eadda8 --- /dev/null +++ b/test/move_effect_roar.c @@ -0,0 +1,70 @@ +#include "global.h" +#include "test_battle.h" + +ASSUMPTIONS +{ + ASSUME(gBattleMoves[MOVE_ROAR].effect == EFFECT_ROAR); +} + +SINGLE_BATTLE_TEST("Roar switches the target with a random non-fainted replacement") +{ + PASSES_RANDOMLY(1, 2); + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_BULBASAUR); + OPPONENT(SPECIES_CHARMANDER); + OPPONENT(SPECIES_SQUIRTLE) { HP(0); } + } WHEN { + TURN { MOVE(player, MOVE_ROAR); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_ROAR, player); + MESSAGE("Foe Bulbasaur was dragged out!"); + } +} + +DOUBLE_BATTLE_TEST("Roar switches the target with a random non-battler, non-fainted replacement") +{ + PASSES_RANDOMLY(1, 2); + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + PLAYER(SPECIES_WYNAUT); + OPPONENT(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WYNAUT); + OPPONENT(SPECIES_BULBASAUR); + OPPONENT(SPECIES_CHARMANDER); + OPPONENT(SPECIES_SQUIRTLE) { HP(0); } + } WHEN { + TURN { MOVE(playerLeft, MOVE_ROAR, target: opponentRight); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_ROAR, playerLeft); + MESSAGE("Foe Bulbasaur was dragged out!"); + } +} + +SINGLE_BATTLE_TEST("Roar fails if no replacements") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_ROAR); } + } SCENE { + MESSAGE("Wobbuffet used Roar!"); + MESSAGE("But it failed!"); + } +} + +SINGLE_BATTLE_TEST("Roar fails if replacements fainted") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WYNAUT) { HP(0); } + } WHEN { + TURN { MOVE(player, MOVE_ROAR); } + } SCENE { + MESSAGE("Wobbuffet used Roar!"); + MESSAGE("But it failed!"); + } +} From afe09e96532165c044848ace9a3a3ed034567041 Mon Sep 17 00:00:00 2001 From: Martin Griffin Date: Sun, 19 Feb 2023 21:08:30 +0000 Subject: [PATCH 11/32] Test Dragon Tail Remove the "But it failed!" message if the foe cannot be switched. --- data/battle_scripts_1.s | 7 ++- include/battle_scripts.h | 1 - src/battle_script_commands.c | 2 +- test/move_effect_hit_switch_target.c | 72 ++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+), 6 deletions(-) create mode 100644 test/move_effect_hit_switch_target.c diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 6fa0cd7ad..53925b578 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2128,9 +2128,9 @@ BattleScript_EffectHitSwitchTarget: moveendall jumpifability BS_TARGET, ABILITY_SUCTION_CUPS, BattleScript_AbilityPreventsPhasingOut jumpifstatus3 BS_TARGET, STATUS3_ROOTED, BattleScript_PrintMonIsRooted - tryhitswitchtarget BattleScript_EffectHitSwitchTargetMoveEnd -BattleScript_EffectHitSwitchTargetMoveEnd: - end + tryhitswitchtarget BattleScript_MoveEnd + forcerandomswitch BattleScript_MoveEnd + goto BattleScript_MoveEnd BattleScript_EffectClearSmog: setmoveeffect MOVE_EFFECT_CLEAR_SMOG @@ -3708,7 +3708,6 @@ BattleScript_EffectRoar:: accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_ButItFailed -BattleScript_ForceRandomSwitch:: forcerandomswitch BattleScript_ButItFailed BattleScript_EffectMultiHit:: diff --git a/include/battle_scripts.h b/include/battle_scripts.h index 70d398e2a..d4e4d4b3c 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -293,7 +293,6 @@ extern const u8 BattleScript_WishMegaEvolution[]; extern const u8 BattleScript_MoveEffectRecoilWithStatus[]; extern const u8 BattleScript_EffectWithChance[]; extern const u8 BattleScript_MoveEffectClearSmog[]; -extern const u8 BattleScript_ForceRandomSwitch[]; extern const u8 BattleScript_SideStatusWoreOffReturn[]; extern const u8 BattleScript_MoveEffectSmackDown[]; extern const u8 BattleScript_MoveEffectFlameBurst[]; diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index b4bafd215..fdd3d4f07 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -9792,7 +9792,7 @@ static void Cmd_various(void) && GetBattlerAbility(gBattlerTarget) != ABILITY_GUARD_DOG) { gBattleScripting.switchCase = B_SWITCH_HIT; - gBattlescriptCurrInstr = BattleScript_ForceRandomSwitch; + gBattlescriptCurrInstr = cmd->nextInstr; } else { diff --git a/test/move_effect_hit_switch_target.c b/test/move_effect_hit_switch_target.c new file mode 100644 index 000000000..9c50a4e4c --- /dev/null +++ b/test/move_effect_hit_switch_target.c @@ -0,0 +1,72 @@ +#include "global.h" +#include "test_battle.h" + +ASSUMPTIONS +{ + ASSUME(gBattleMoves[MOVE_DRAGON_TAIL].effect == EFFECT_HIT_SWITCH_TARGET); + ASSUME(gBattleMoves[MOVE_LOCK_ON].effect == EFFECT_LOCK_ON); +} + +SINGLE_BATTLE_TEST("Dragon Tail switches the target with a random non-fainted replacement") +{ + KNOWN_FAILING; // Only 18/50. Waiting for an improved PASSES_RANDOMLY. + PASSES_RANDOMLY(90 * 1, 100 * 2); + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_BULBASAUR); + OPPONENT(SPECIES_CHARMANDER); + OPPONENT(SPECIES_SQUIRTLE) { HP(0); } + } WHEN { + TURN { MOVE(player, MOVE_DRAGON_TAIL); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_DRAGON_TAIL, player); + MESSAGE("Foe Bulbasaur was dragged out!"); + } +} + +DOUBLE_BATTLE_TEST("Dragon Tail switches the target with a random non-battler, non-fainted replacement") +{ + PASSES_RANDOMLY(90 * 1, 100 * 2); + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + PLAYER(SPECIES_WYNAUT); + OPPONENT(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WYNAUT); + OPPONENT(SPECIES_BULBASAUR); + OPPONENT(SPECIES_CHARMANDER); + OPPONENT(SPECIES_SQUIRTLE) { HP(0); } + } WHEN { + TURN { MOVE(playerLeft, MOVE_DRAGON_TAIL, target: opponentRight); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_DRAGON_TAIL, playerLeft); + MESSAGE("Foe Bulbasaur was dragged out!"); + } +} + +SINGLE_BATTLE_TEST("Dragon Tail does not fail if no replacements") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_DRAGON_TAIL); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_DRAGON_TAIL, player); + NOT MESSAGE("But it failed!"); + } +} + +SINGLE_BATTLE_TEST("Dragon Tail does not fail if replacements fainted") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WYNAUT) { HP(0); } + } WHEN { + TURN { MOVE(player, MOVE_DRAGON_TAIL); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_DRAGON_TAIL, player); + NOT MESSAGE("But it failed!"); + } +} From 29c64c82f329c45131c7e31e7e48ad69ae3fdb97 Mon Sep 17 00:00:00 2001 From: Martin Griffin Date: Tue, 21 Feb 2023 10:44:58 +0000 Subject: [PATCH 12/32] Test Red Card Dragon Tail activates Red Card if the target does not switch. --- asm/macros/battle_script.inc | 4 + data/battle_scripts_1.s | 7 +- include/battle.h | 1 + include/constants/battle_script_commands.h | 1 + src/battle_script_commands.c | 10 +- test/hold_effect_red_card.c | 378 +++++++++++++++++++++ 6 files changed, 399 insertions(+), 2 deletions(-) create mode 100644 test/hold_effect_red_card.c diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 6c985e3cd..7c94f06ff 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -2247,3 +2247,7 @@ various \battler, VARIOUS_JUMP_IF_EMERGENCY_EXITED .4byte \jumpInstr .endm + + .macro hitswitchtargetfailed + various 0, VARIOUS_HIT_SWITCH_TARGET_FAILED + .endm diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 53925b578..239d22109 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2129,7 +2129,12 @@ BattleScript_EffectHitSwitchTarget: jumpifability BS_TARGET, ABILITY_SUCTION_CUPS, BattleScript_AbilityPreventsPhasingOut jumpifstatus3 BS_TARGET, STATUS3_ROOTED, BattleScript_PrintMonIsRooted tryhitswitchtarget BattleScript_MoveEnd - forcerandomswitch BattleScript_MoveEnd + forcerandomswitch BattleScript_HitSwitchTargetForceRandomSwitchFailed + goto BattleScript_MoveEnd + +BattleScript_HitSwitchTargetForceRandomSwitchFailed: + hitswitchtargetfailed + setbyte sSWITCH_CASE, B_SWITCH_NORMAL goto BattleScript_MoveEnd BattleScript_EffectClearSmog: diff --git a/include/battle.h b/include/battle.h index 2c16887bf..c3281174d 100644 --- a/include/battle.h +++ b/include/battle.h @@ -651,6 +651,7 @@ struct BattleStruct // When using a move which hits multiple opponents which is then bounced by a target, we need to make sure, the move hits both opponents, the one with bounce, and the one without. u8 attackerBeforeBounce:2; u8 beatUpSlot:3; + bool8 hitSwitchTargetFailed:1; u8 targetsDone[MAX_BATTLERS_COUNT]; // Each battler as a bit. u16 overwrittenAbilities[MAX_BATTLERS_COUNT]; // abilities overwritten during battle (keep separate from battle history in case of switching) bool8 allowedToChangeFormInWeather[PARTY_SIZE][2]; // For each party member and side, used by Ice Face. diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h index 9f18455a8..0b71c22db 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -258,6 +258,7 @@ #define VARIOUS_JUMP_IF_NO_VALID_TARGETS 166 #define VARIOUS_JUMP_IF_EMERGENCY_EXITED 167 #define VARIOUS_STORE_HEALING_WISH 168 +#define VARIOUS_HIT_SWITCH_TARGET_FAILED 169 // Cmd_manipulatedamage #define DMG_CHANGE_SIGN 0 diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index fdd3d4f07..5667beb4a 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -5968,7 +5968,7 @@ static void Cmd_moveend(void) gBattleScripting.moveendState++; break; case MOVEEND_RED_CARD: - if (gBattleMoves[gCurrentMove].effect != EFFECT_HIT_SWITCH_TARGET + if ((gBattleMoves[gCurrentMove].effect != EFFECT_HIT_SWITCH_TARGET || gBattleStruct->hitSwitchTargetFailed) && IsBattlerAlive(gBattlerAttacker) && !TestSheerForceFlag(gBattlerAttacker, gCurrentMove) && GetBattlerAbility(gBattlerAttacker) != ABILITY_GUARD_DOG) @@ -6199,6 +6199,7 @@ static void Cmd_moveend(void) gBattleStruct->zmove.active = FALSE; gBattleStruct->zmove.toBeUsed[gBattlerAttacker] = MOVE_NONE; gBattleStruct->zmove.effect = EFFECT_HIT; + gBattleStruct->hitSwitchTargetFailed = FALSE; gBattleScripting.moveendState++; break; case MOVEEND_COUNT: @@ -11067,6 +11068,13 @@ static void Cmd_various(void) gBattleStruct->storedHealingWish |= gBitTable[gActiveBattler]; break; } + case VARIOUS_HIT_SWITCH_TARGET_FAILED: + { + VARIOUS_ARGS(); + gBattleStruct->hitSwitchTargetFailed = TRUE; + gBattlescriptCurrInstr = cmd->nextInstr; + return; + } } // End of switch (cmd->id) gBattlescriptCurrInstr = cmd->nextInstr; diff --git a/test/hold_effect_red_card.c b/test/hold_effect_red_card.c new file mode 100644 index 000000000..c32c489d5 --- /dev/null +++ b/test/hold_effect_red_card.c @@ -0,0 +1,378 @@ +#include "global.h" +#include "test_battle.h" + +ASSUMPTIONS +{ + ASSUME(gItems[ITEM_RED_CARD].holdEffect == HOLD_EFFECT_RED_CARD); +} + +SINGLE_BATTLE_TEST("Red Card switches the attacker with a random non-fainted replacement") +{ + PASSES_RANDOMLY(1, 2); + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_RED_CARD); } + OPPONENT(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_BULBASAUR); + OPPONENT(SPECIES_CHARMANDER); + OPPONENT(SPECIES_SQUIRTLE) { HP(0); } + } WHEN { + TURN { MOVE(opponent, MOVE_TACKLE); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponent); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); + MESSAGE("Wobbuffet held up its Red Card against Foe Wobbuffet!"); + MESSAGE("Foe Bulbasaur was dragged out!"); + } +} + +DOUBLE_BATTLE_TEST("Red Card switches the target with a random non-battler, non-fainted replacement") +{ + PASSES_RANDOMLY(1, 2); + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_RED_CARD); } + PLAYER(SPECIES_WYNAUT); + OPPONENT(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WYNAUT); + OPPONENT(SPECIES_BULBASAUR); + OPPONENT(SPECIES_CHARMANDER); + OPPONENT(SPECIES_SQUIRTLE) { HP(0); } + } WHEN { + TURN { MOVE(opponentLeft, MOVE_TACKLE, target: playerLeft); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponentLeft); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, playerLeft); + MESSAGE("Wobbuffet held up its Red Card against Foe Wobbuffet!"); + MESSAGE("Foe Bulbasaur was dragged out!"); + } +} + +SINGLE_BATTLE_TEST("Red Card does not activate if holder faints") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { HP(1); Item(ITEM_RED_CARD); } + PLAYER(SPECIES_WYNAUT); + OPPONENT(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WYNAUT); + } WHEN { + TURN { MOVE(opponent, MOVE_TACKLE); SEND_OUT(player, 1); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponent); + NONE_OF { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); + MESSAGE("Wobbuffet held up its Red Card against Foe Wobbuffet!"); + } + } +} + +SINGLE_BATTLE_TEST("Red Card does not activate if target is behind a Substitute") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_RED_CARD); } + OPPONENT(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WYNAUT); + } WHEN { + TURN { MOVE(player, MOVE_SUBSTITUTE); MOVE(opponent, MOVE_TACKLE); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponent); + NONE_OF { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); + MESSAGE("Wobbuffet held up its Red Card against Foe Wobbuffet!"); + } + } +} + +SINGLE_BATTLE_TEST("Red Card activates after the last hit of a multi-hit move") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_RED_CARD); } + OPPONENT(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WYNAUT); + } WHEN { + TURN { MOVE(opponent, MOVE_DOUBLE_KICK); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_DOUBLE_KICK, opponent); + HP_BAR(player); + HP_BAR(player); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); + MESSAGE("Wobbuffet held up its Red Card against Foe Wobbuffet!"); + } +} + +SINGLE_BATTLE_TEST("Red Card does not activate if no replacements") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_RED_CARD); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(opponent, MOVE_TACKLE); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponent); + NONE_OF { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); + MESSAGE("Wobbuffet held up its Red Card against Foe Wobbuffet!"); + } + } +} + +SINGLE_BATTLE_TEST("Red Card does not activate if replacements fainted") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_RED_CARD); } + OPPONENT(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WYNAUT) { HP(0); } + } WHEN { + TURN { MOVE(opponent, MOVE_TACKLE); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponent); + NONE_OF { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); + MESSAGE("Wobbuffet held up its Red Card against Foe Wobbuffet!"); + } + } +} + +SINGLE_BATTLE_TEST("Red Card does not activate if knocked off") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_RED_CARD); } + OPPONENT(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WYNAUT); + } WHEN { + TURN { MOVE(opponent, MOVE_KNOCK_OFF); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_KNOCK_OFF, opponent); + NONE_OF { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); + MESSAGE("Wobbuffet held up its Red Card against Foe Wobbuffet!"); + } + } +} + +SINGLE_BATTLE_TEST("Red Card does not activate if stolen by a move") +{ + u32 item; + bool32 activate; + PARAMETRIZE { item = ITEM_NONE; activate = FALSE; } + PARAMETRIZE { item = ITEM_POTION; activate = TRUE; } + ASSUME(gBattleMoves[MOVE_THIEF].effect == EFFECT_THIEF); + + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_RED_CARD); } + OPPONENT(SPECIES_WOBBUFFET) { Item(item); } + OPPONENT(SPECIES_WYNAUT); + } WHEN { + TURN { MOVE(opponent, MOVE_THIEF); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_THIEF, opponent); + if (activate) { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); + MESSAGE("Wobbuffet held up its Red Card against Foe Wobbuffet!"); + } else { + NONE_OF { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); + MESSAGE("Wobbuffet held up its Red Card against Foe Wobbuffet!"); + } + } + } +} + +SINGLE_BATTLE_TEST("Red Card does not activate if stolen by Magician") +{ + u32 item; + bool32 activate; + PARAMETRIZE { item = ITEM_NONE; activate = FALSE; } + PARAMETRIZE { item = ITEM_POTION; activate = TRUE; } + + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_RED_CARD); } + OPPONENT(SPECIES_FENNEKIN) { Ability(ABILITY_MAGICIAN); Item(item); } + OPPONENT(SPECIES_WYNAUT); + } WHEN { + TURN { MOVE(opponent, MOVE_TACKLE); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponent); + if (activate) { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); + MESSAGE("Wobbuffet held up its Red Card against Foe Fennekin!"); + } else { + NONE_OF { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); + MESSAGE("Wobbuffet held up its Red Card against Foe Fennekin!"); + } + } + } +} + +DOUBLE_BATTLE_TEST("Red Card activates for only the fastest target") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { Speed(3); Item(ITEM_RED_CARD); } + PLAYER(SPECIES_WYNAUT) { Speed(2); Item(ITEM_RED_CARD); } + OPPONENT(SPECIES_WOBBUFFET) { Speed(5); } + OPPONENT(SPECIES_WYNAUT) { Speed(4); } + OPPONENT(SPECIES_UNOWN) { Speed(1); } + } WHEN { + TURN { + MOVE(opponentLeft, MOVE_ROCK_SLIDE); + MOVE(opponentRight, MOVE_TACKLE, target: playerRight); + } + } SCENE { + // Fastest target's Red Card activates. + ANIMATION(ANIM_TYPE_MOVE, MOVE_ROCK_SLIDE, opponentLeft); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, playerLeft); + MESSAGE("Wobbuffet held up its Red Card against Foe Wobbuffet!"); + MESSAGE("Foe Unown was dragged out!"); + + // Slower target's Red Card still able to activate on other battler. + ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponentRight); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, playerRight); + MESSAGE("Wynaut held up its Red Card against Foe Wynaut!"); + MESSAGE("Foe Wobbuffet was dragged out!"); + } +} + +DOUBLE_BATTLE_TEST("Red Card activates but fails if the attacker is rooted") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_RED_CARD); } + PLAYER(SPECIES_WYNAUT); + OPPONENT(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WYNAUT); + OPPONENT(SPECIES_UNOWN); + } WHEN { + TURN { MOVE(opponentLeft, MOVE_INGRAIN); } + TURN { + MOVE(opponentLeft, MOVE_TACKLE, target: playerLeft); + MOVE(opponentRight, MOVE_TACKLE, target: playerLeft); + } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponentLeft); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, playerLeft); + MESSAGE("Wobbuffet held up its Red Card against Foe Wobbuffet!"); + MESSAGE("Foe Wobbuffet anchored itself with its roots!"); + + // Red Card already consumed so cannot activate. + ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponentRight); + NONE_OF { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, playerRight); + MESSAGE("Wynaut held up its Red Card against Foe Wynaut!"); + } + } +} + +DOUBLE_BATTLE_TEST("Red Card activates but fails if the attacker has Suction Cups") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_RED_CARD); } + PLAYER(SPECIES_WYNAUT); + OPPONENT(SPECIES_OCTILLERY) { Ability(ABILITY_SUCTION_CUPS); } + OPPONENT(SPECIES_WYNAUT); + OPPONENT(SPECIES_UNOWN); + } WHEN { + TURN { + MOVE(opponentLeft, MOVE_TACKLE, target: playerLeft); + MOVE(opponentRight, MOVE_TACKLE, target: playerLeft); + } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponentLeft); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, playerLeft); + MESSAGE("Wobbuffet held up its Red Card against Foe Octillery!"); + MESSAGE("Foe Octillery anchors itself with Suction Cups!"); + + // Red Card already consumed so cannot activate. + ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponentRight); + NONE_OF { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, playerRight); + MESSAGE("Wynaut held up its Red Card against Foe Wynaut!"); + } + } +} + +SINGLE_BATTLE_TEST("Red Card does not activate if switched by Dragon Tail") +{ + bool32 hasWynaut, activate; + PARAMETRIZE { hasWynaut = TRUE; activate = FALSE; } + PARAMETRIZE { hasWynaut = FALSE; activate = TRUE; } + + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_RED_CARD); } + if (hasWynaut) PLAYER(SPECIES_WYNAUT); + OPPONENT(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WYNAUT); + } WHEN { + TURN { MOVE(opponent, MOVE_DRAGON_TAIL); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_DRAGON_TAIL, opponent); + if (activate) { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); + MESSAGE("Wobbuffet held up its Red Card against Foe Wobbuffet!"); + } else { + NONE_OF { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); + MESSAGE("Wobbuffet held up its Red Card against Foe Wobbuffet!"); + } + } + } +} + +SINGLE_BATTLE_TEST("Red Card activates and overrides U-turn") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_RED_CARD); } + OPPONENT(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WYNAUT); + } WHEN { + TURN { MOVE(opponent, MOVE_U_TURN); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_U_TURN, opponent); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); + MESSAGE("Wobbuffet held up its Red Card against Foe Wobbuffet!"); + } +} + +SINGLE_BATTLE_TEST("Red Card does not activate if attacker's Sheer Force applied") +{ + u32 move; + bool32 activate; + PARAMETRIZE { move = MOVE_TACKLE; activate = TRUE; } + PARAMETRIZE { move = MOVE_STOMP; activate = FALSE; } + + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_RED_CARD); } + OPPONENT(SPECIES_TAUROS) { Ability(ABILITY_SHEER_FORCE); } + OPPONENT(SPECIES_WYNAUT); + } WHEN { + TURN { MOVE(opponent, move); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, move, opponent); + if (activate) { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); + MESSAGE("Wobbuffet held up its Red Card against Foe Tauros!"); + } else { + NONE_OF { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); + MESSAGE("Wobbuffet held up its Red Card against Foe Tauros!"); + } + } + } +} + +SINGLE_BATTLE_TEST("Red Card activates before Emergency Exit") +{ + GIVEN { + PLAYER(SPECIES_GOLISOPOD) { MaxHP(100); HP(51); Item(ITEM_RED_CARD); } + PLAYER(SPECIES_WIMPOD); + OPPONENT(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WYNAUT); + } WHEN { + TURN { MOVE(opponent, MOVE_TACKLE); SEND_OUT(player, 1); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponent); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); + MESSAGE("Golisopod held up its Red Card against Foe Wobbuffet!"); + ABILITY_POPUP(player, ABILITY_EMERGENCY_EXIT); + MESSAGE("Go! Wimpod!"); + } +} + +// SINGLE_BATTLE_TEST("Red Card activates but fails if the attacker has Dynamaxed") From 1e2eeb4d797aaba2324dfbaa41a283fa6ac9fa86 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 21 Feb 2023 16:26:49 +0100 Subject: [PATCH 13/32] fix wrong assumption --- test/ability_download.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ability_download.c b/test/ability_download.c index 77d090a30..132c0eb5b 100644 --- a/test/ability_download.c +++ b/test/ability_download.c @@ -4,7 +4,7 @@ ASSUMPTIONS { ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); - ASSUME(gBattleMoves[MOVE_TRI_ATTACK].split == SPLIT_PHYSICAL); + ASSUME(gBattleMoves[MOVE_TRI_ATTACK].split == SPLIT_SPECIAL); } SINGLE_BATTLE_TEST("Download raises Attack if player has lower Def than Sp.Def", s16 damage) From f3c6b647c089d75c53dbb26cf5cfccd5fade73ee Mon Sep 17 00:00:00 2001 From: Martin Griffin Date: Tue, 21 Feb 2023 15:30:42 +0000 Subject: [PATCH 14/32] Hydra fixes and improvements (#2718) * Build tools for check * Display PASSes when Hydra exits * Print buffered output at exit * Remove unused test summaries * Show SKIP if ASSUMPTIONS fails --- Makefile | 2 +- test/test.h | 1 - test/test_runner.c | 27 +++++++++------------------ tools/mgba-rom-test-hydra/main.c | 16 +++++++++++++++- 4 files changed, 25 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 8e3ff2975..2b997fee5 100644 --- a/Makefile +++ b/Makefile @@ -464,7 +464,7 @@ LD_SCRIPT_TEST := ld_script_test.txt $(OBJ_DIR)/ld_script_test.ld: $(LD_SCRIPT_TEST) $(LD_SCRIPT_DEPS) cd $(OBJ_DIR) && sed "s#tools/#../../tools/#g" ../../$(LD_SCRIPT_TEST) > ld_script_test.ld -$(TESTELF): $(OBJ_DIR)/ld_script_test.ld $(OBJS) $(TEST_OBJS) libagbsyscall check-tools +$(TESTELF): $(OBJ_DIR)/ld_script_test.ld $(OBJS) $(TEST_OBJS) libagbsyscall tools check-tools @echo "cd $(OBJ_DIR) && $(LD) -T ld_script_test.ld -o ../../$@ " @cd $(OBJ_DIR) && $(LD) $(TESTLDFLAGS) -T ld_script_test.ld -o ../../$@ $(OBJS_REL) $(TEST_OBJS_REL) $(LIB) $(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent diff --git a/test/test.h b/test/test.h index cbcf11717..c69a4fa92 100644 --- a/test/test.h +++ b/test/test.h @@ -39,7 +39,6 @@ struct TestRunnerState u8 exitCode; s32 tests; s32 passes; - s32 skips; const char *skipFilename; const struct Test *test; u32 processCosts[MAX_PROCESSES]; diff --git a/test/test_runner.c b/test/test_runner.c index 3cb1f7c21..0be163431 100644 --- a/test/test_runner.c +++ b/test/test_runner.c @@ -60,7 +60,6 @@ void CB2_TestRunner(void) gTestRunnerState.exitCode = 0; gTestRunnerState.tests = 0; gTestRunnerState.passes = 0; - gTestRunnerState.skips = 0; gTestRunnerState.skipFilename = NULL; gTestRunnerState.test = __start_tests - 1; break; @@ -70,20 +69,15 @@ void CB2_TestRunner(void) if (gTestRunnerState.test == __stop_tests) { - MgbaPrintf_("%s%d/%d PASSED\e[0m", gTestRunnerState.exitCode == 0 ? "\e[32m" : "\e[31m", gTestRunnerState.passes, gTestRunnerState.tests); - if (gTestRunnerState.skips) - { - if (gTestRunnerSkipIsFail) - MgbaPrintf_("\e[31m%d SKIPPED\e[0m", gTestRunnerState.skips); - else - MgbaPrintf_("%d SKIPPED", gTestRunnerState.skips); - } gTestRunnerState.state = STATE_EXIT; return; } - if (!PrefixMatch(gTestRunnerArgv, gTestRunnerState.test->name)) + if (gTestRunnerState.test->runner != &gAssumptionsRunner + && !PrefixMatch(gTestRunnerArgv, gTestRunnerState.test->name)) + { return; + } // Greedily assign tests to processes based on estimated cost. // TODO: Make processCosts a min heap. @@ -111,6 +105,7 @@ void CB2_TestRunner(void) return; } + MgbaPrintf_(":N%s", gTestRunnerState.test->name); gTestRunnerState.state = STATE_REPORT_RESULT; gTestRunnerState.result = TEST_RESULT_PASS; gTestRunnerState.expectedResult = TEST_RESULT_PASS; @@ -130,7 +125,6 @@ void CB2_TestRunner(void) } else { - MgbaPrintf_(":N%s", gTestRunnerState.test->name); if (gTestRunnerState.test->runner->setUp) gTestRunnerState.test->runner->setUp(gTestRunnerState.test->data); gTestRunnerState.test->runner->run(gTestRunnerState.test->data); @@ -150,12 +144,6 @@ void CB2_TestRunner(void) if (gTestRunnerState.result != TEST_RESULT_PASS) gTestRunnerState.skipFilename = gTestRunnerState.test->filename; } - else if (gTestRunnerState.result == TEST_RESULT_SKIP) - { - gTestRunnerState.skips++; - if (gTestRunnerSkipIsFail) - gTestRunnerState.exitCode = 1; - } else { const char *color; @@ -206,7 +194,10 @@ void CB2_TestRunner(void) default: result = "UNKNOWN"; break; } - MgbaPrintf_(":R%s%s\e[0m", color, result); + if (gTestRunnerState.expectedResult == gTestRunnerState.result) + MgbaPrintf_(":P%s%s\e[0m", color, result); + else + MgbaPrintf_(":F%s%s\e[0m", color, result); } break; diff --git a/tools/mgba-rom-test-hydra/main.c b/tools/mgba-rom-test-hydra/main.c index 5dfc99517..4ce9b09bd 100644 --- a/tools/mgba-rom-test-hydra/main.c +++ b/tools/mgba-rom-test-hydra/main.c @@ -38,6 +38,8 @@ struct Runner size_t output_buffer_size; size_t output_buffer_capacity; char *output_buffer; + int passes; + int results; }; static unsigned nrunners = 0; @@ -72,7 +74,11 @@ static void handle_read(struct Runner *runner) runner->test_name[eol - soc - 1] = '\0'; break; - case 'R': + case 'P': + case 'F': + if (soc[1] == 'P') + runner->passes++; + runner->results++; soc += 2; fprintf(stdout, "%s: ", runner->test_name); fwrite(soc, 1, eol - soc, stdout); @@ -404,6 +410,8 @@ int main(int argc, char *argv[]) // Reap test runners and collate exit codes. int exit_code = 0; + int passes = 0; + int results = 0; for (int i = 0; i < nrunners; i++) { int wstatus; @@ -412,8 +420,14 @@ int main(int argc, char *argv[]) perror("waitpid runners[i] failed"); exit(2); } + if (runners[i].output_buffer_size > 0) + fwrite(runners[i].output_buffer, 1, runners[i].output_buffer_size, stdout); if (WIFEXITED(wstatus) && WEXITSTATUS(wstatus) > exit_code) exit_code = WEXITSTATUS(wstatus); + passes += runners[i].passes; + results += runners[i].results; } + fprintf(stdout, "%d/%d \e[32mPASS\e[0med\n", passes, results); + fflush(stdout); return exit_code; } From d73ab0246f0e0ccb24861dae1d3c9ec5a71b9f51 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 21 Feb 2023 23:50:29 +0100 Subject: [PATCH 15/32] Fix Explosion + Galvanize + Volt Absorb and Mind Blown (#2688) * Fix Explosion and Mind Blown * Use battler ability in jumpifabilitypresent --- asm/macros/battle_script.inc | 6 ++ data/battle_scripts_1.s | 69 ++++++++++++--------- src/battle_script_commands.c | 33 ++++++---- test/ability_damp.c | 20 +++++++ test/ability_volt_absorb.c | 28 ++++++++- test/move_effect_explosion.c | 46 +++++++++++++- test/move_effect_mind_blown.c | 109 ++++++++++++++++++++++++++++++++++ 7 files changed, 268 insertions(+), 43 deletions(-) create mode 100644 test/move_effect_mind_blown.c diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 7c94f06ff..573ffff26 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -1317,6 +1317,12 @@ .2byte \holdEffect .4byte \jumpInstr .endm + + .macro jumpifmorethanhalfHP battler:req, jumpInstr:req + callnative BS_JumpIfMoreThanHalfHP + .byte \battler + .4byte \jumpInstr + .endm @ various command changed to more readable macros .macro cancelmultiturnmoves battler:req diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 239d22109..95d774b20 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -3417,27 +3417,20 @@ BattleScript_EffectFreezeHit:: BattleScript_EffectParalyzeHit:: setmoveeffect MOVE_EFFECT_PARALYSIS goto BattleScript_EffectHit - -BattleScript_EffectExplosion:: - attackcanceler - attackstring - ppreduce -@ Below jumps to BattleScript_DampStopsExplosion if it fails (only way it can) - tryexplosion - setatkhptozero - waitstate - jumpifbyte CMP_NO_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_MISSED, BattleScript_ExplosionDoAnimStartLoop + +BattleScript_EffectExplosion_AnimDmgRet: + jumpifbyte CMP_NO_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_MISSED, BattleScript_ExplosionAnimRet call BattleScript_PreserveMissedBitDoMoveAnim - goto BattleScript_ExplosionLoop -BattleScript_ExplosionDoAnimStartLoop: + goto BattleScript_ExplosionDmgRet +BattleScript_ExplosionAnimRet: attackanimation waitanimation -BattleScript_ExplosionLoop: +BattleScript_ExplosionDmgRet: movevaluescleanup critcalc damagecalc adjustdamage - accuracycheck BattleScript_ExplosionMissed, ACC_CURR_MOVE + accuracycheck BattleScript_ExplosionMissedRet, ACC_CURR_MOVE effectivenesssound hitanimation BS_TARGET waitstate @@ -3448,17 +3441,25 @@ BattleScript_ExplosionLoop: resultmessage waitmessage B_WAIT_TIME_LONG tryfaintmon BS_TARGET - moveendto MOVEEND_NEXT_TARGET - jumpifnexttargetvalid BattleScript_ExplosionLoop - tryfaintmon BS_ATTACKER - moveendcase MOVEEND_CLEAR_BITS - end -BattleScript_ExplosionMissed: +BattleScript_ExplosionAnimEndRet_Return: + return +BattleScript_ExplosionMissedRet: effectivenesssound resultmessage waitmessage B_WAIT_TIME_LONG - moveendto MOVEEND_NEXT_TARGET - jumpifnexttargetvalid BattleScript_ExplosionLoop + goto BattleScript_ExplosionAnimEndRet_Return + +BattleScript_EffectExplosion:: + attackcanceler + attackstring + ppreduce +@ Below jumps to BattleScript_DampStopsExplosion if it fails (only way it can) + tryexplosion + waitstate +BattleScript_EffectExplosion_AnimDmgFaintAttacker: + call BattleScript_EffectExplosion_AnimDmgRet + moveendall + setatkhptozero tryfaintmon BS_ATTACKER end @@ -3466,14 +3467,28 @@ BattleScript_EffectMindBlown:: attackcanceler attackstring ppreduce - tryexplosion + jumpifbyte CMP_GREATER_THAN, sB_ANIM_TARGETS_HIT, 0, BattleScript_EffectMindBlown_NoHpLoss + jumpifabilitypresent ABILITY_DAMP, BattleScript_MindBlownDamp + jumpifmorethanhalfHP BS_ATTACKER, BattleScript_EffectMindBlown_HpDown + setbyte sMULTIHIT_EFFECT, 0 @ Note to faint the attacker + instanthpdrop BS_ATTACKER + waitstate + goto BattleScript_EffectExplosion_AnimDmgFaintAttacker +BattleScript_EffectMindBlown_NoHpLoss: + jumpifbyte CMP_EQUAL, sMULTIHIT_EFFECT, 0, BattleScript_EffectExplosion_AnimDmgFaintAttacker + goto BattleScript_EffectMindBlown_AnimDmgNoFaint +BattleScript_MindBlownDamp: + copybyte gBattlerTarget, gBattlerAbility + goto BattleScript_DampStopsExplosion +BattleScript_EffectMindBlown_HpDown: + setbyte sMULTIHIT_EFFECT, 1 @ Note to not faint the attacker dmg_1_2_attackerhp healthbarupdate BS_ATTACKER datahpupdate BS_ATTACKER waitstate - jumpifbyte CMP_NO_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_MISSED, BattleScript_ExplosionDoAnimStartLoop - call BattleScript_PreserveMissedBitDoMoveAnim - goto BattleScript_ExplosionLoop +BattleScript_EffectMindBlown_AnimDmgNoFaint: + call BattleScript_EffectExplosion_AnimDmgRet + goto BattleScript_MoveEnd BattleScript_PreserveMissedBitDoMoveAnim: bichalfword gMoveResultFlags, MOVE_RESULT_MISSED @@ -8360,9 +8375,9 @@ BattleScript_AbilityRaisesDefenderStat:: BattleScript_AbilityPopUp: .if B_ABILITY_POP_UP == TRUE showabilitypopup BS_ABILITY_BATTLER - recordability BS_ABILITY_BATTLER pause 40 .endif + recordability BS_ABILITY_BATTLER sethword sABILITY_OVERWRITE, 0 return diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 5667beb4a..19d0b3afb 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -5017,10 +5017,17 @@ static void Cmd_jumpifabilitypresent(void) { CMD_ARGS(u16 ability, const u8 *jumpInstr); - if (IsAbilityOnField(cmd->ability)) + u16 ability = cmd->ability; + u32 abilityBattler = IsAbilityOnField(ability); + if (abilityBattler) + { + gBattlerAbility = abilityBattler - 1; gBattlescriptCurrInstr = cmd->jumpInstr; + } else + { gBattlescriptCurrInstr = cmd->nextInstr; + } } static void Cmd_endselectionscript(void) @@ -11183,14 +11190,15 @@ static void Cmd_tryexplosion(void) { CMD_ARGS(); + u32 dampBattler; if (gBattleControllerExecFlags) return; - if ((gBattlerTarget = IsAbilityOnField(ABILITY_DAMP))) + if ((dampBattler = IsAbilityOnField(ABILITY_DAMP))) { // Failed, a battler has Damp gLastUsedAbility = ABILITY_DAMP; - RecordAbilityBattle(--gBattlerTarget, ABILITY_DAMP); + gBattlerTarget = --dampBattler; gBattlescriptCurrInstr = BattleScript_DampStopsExplosion; return; } @@ -11200,14 +11208,6 @@ static void Cmd_tryexplosion(void) BtlController_EmitHealthBarUpdate(BUFFER_A, INSTANT_HP_BAR_DROP); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr = cmd->nextInstr; - - for (gBattlerTarget = 0; gBattlerTarget < gBattlersCount; gBattlerTarget++) - { - if (gBattlerTarget == gBattlerAttacker) - continue; - if (IsBattlerAlive(gBattlerTarget)) - break; - } } static void Cmd_setatkhptozero(void) @@ -16033,6 +16033,17 @@ void BS_CalcMetalBurstDmg(void) } } +void BS_JumpIfMoreThanHalfHP(void) +{ + NATIVE_ARGS(u8 battler, const u8 *jumpInstr); + + u8 battler = GetBattlerForBattleScript(cmd->battler); + if (gBattleMons[battler].hp > (gBattleMons[battler].maxHP + 1) / 2) + gBattlescriptCurrInstr = cmd->jumpInstr; + else + gBattlescriptCurrInstr = cmd->nextInstr; +} + void BS_JumpIfHoldEffect(void) { u8 battler = gBattlescriptCurrInstr[5]; diff --git a/test/ability_damp.c b/test/ability_damp.c index 33d1ae466..c473660f5 100644 --- a/test/ability_damp.c +++ b/test/ability_damp.c @@ -19,6 +19,26 @@ SINGLE_BATTLE_TEST("Damp prevents explosion-like moves from enemies") } } +DOUBLE_BATTLE_TEST("Damp prevents explosion-like moves from enemies in a double battle") +{ + u32 move; + PARAMETRIZE { move = MOVE_EXPLOSION; } + PARAMETRIZE { move = MOVE_SELF_DESTRUCT; } + PARAMETRIZE { move = MOVE_MIND_BLOWN; } + PARAMETRIZE { move = MOVE_MISTY_EXPLOSION; } + GIVEN { + PLAYER(SPECIES_PARAS) { Ability(ABILITY_DAMP); } + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(opponentLeft, move); } + } SCENE { + ABILITY_POPUP(playerLeft, ABILITY_DAMP); + NONE_OF { HP_BAR(playerLeft); HP_BAR(opponentLeft); HP_BAR(playerRight); HP_BAR(opponentRight); } + } +} + SINGLE_BATTLE_TEST("Damp prevents explosion-like moves from self") { u32 move; diff --git a/test/ability_volt_absorb.c b/test/ability_volt_absorb.c index f485f6557..bef35e2b4 100644 --- a/test/ability_volt_absorb.c +++ b/test/ability_volt_absorb.c @@ -63,6 +63,30 @@ SINGLE_BATTLE_TEST("Volt Absorb is only triggered once on multi strike moves") } } +DOUBLE_BATTLE_TEST("Volt Absorb does not stop Electric Typed Explosion from damaging other pokemon", s16 damage1, s16 damage2) // Fixed issue #1961 +{ + GIVEN { + ASSUME(gBattleMoves[MOVE_EXPLOSION].effect == EFFECT_EXPLOSION); + ASSUME(gBattleMoves[MOVE_EXPLOSION].type == TYPE_NORMAL); + PLAYER(SPECIES_JOLTEON) { Ability(ABILITY_VOLT_ABSORB); HP(1); MaxHP(TEST_MAX_HP); } + PLAYER(SPECIES_ABRA); + OPPONENT(SPECIES_GRAVELER_ALOLAN) { Ability(ABILITY_GALVANIZE); } + OPPONENT(SPECIES_WYNAUT); + } WHEN { + TURN { MOVE(opponentLeft, MOVE_EXPLOSION); } + } SCENE { + ABILITY_POPUP(playerLeft, ABILITY_VOLT_ABSORB); + HP_BAR(playerLeft, hp: TEST_MAX_HP / 4 + 1); + MESSAGE("Jolteon restored HP using its Volt Absorb!"); + HP_BAR(playerRight, captureDamage: &results->damage1); + HP_BAR(opponentRight, captureDamage: &results->damage2); + } + FINALLY { + EXPECT_NE(results[0].damage1, 0); + EXPECT_NE(results[0].damage2, 0); + } +} + SINGLE_BATTLE_TEST("Volt Absorb prevents Cell Battery from activating") { GIVEN { @@ -75,11 +99,11 @@ SINGLE_BATTLE_TEST("Volt Absorb prevents Cell Battery from activating") ABILITY_POPUP(player, ABILITY_VOLT_ABSORB); HP_BAR(player, hp: TEST_MAX_HP / 4 + 1); MESSAGE("Jolteon restored HP using its Volt Absorb!"); - NONE_OF { + NONE_OF { ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); MESSAGE("Using Cell Battery, the attack of Jolteon rose!"); } - + } } diff --git a/test/move_effect_explosion.c b/test/move_effect_explosion.c index 872f3f709..41e74044b 100644 --- a/test/move_effect_explosion.c +++ b/test/move_effect_explosion.c @@ -8,7 +8,6 @@ ASSUMPTIONS SINGLE_BATTLE_TEST("Explosion causes the user to faint") { - u16 remainingHP; GIVEN { PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); @@ -17,12 +16,29 @@ SINGLE_BATTLE_TEST("Explosion causes the user to faint") } SCENE { HP_BAR(player, hp: 0); ANIMATION(ANIM_TYPE_MOVE, MOVE_EXPLOSION, player); + MESSAGE("Wobbuffet fainted!"); + } +} + +SINGLE_BATTLE_TEST("Explosion causes the user & the target to faint") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET) { HP(1); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_EXPLOSION); } + } SCENE { + HP_BAR(player, hp: 0); + ANIMATION(ANIM_TYPE_MOVE, MOVE_EXPLOSION, player); + HP_BAR(opponent, hp: 0); + MESSAGE("Foe Wobbuffet fainted!"); + MESSAGE("Wobbuffet fainted!"); } } SINGLE_BATTLE_TEST("Explosion causes the user to faint even if it misses") { - u16 remainingHP; GIVEN { PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); @@ -31,12 +47,12 @@ SINGLE_BATTLE_TEST("Explosion causes the user to faint even if it misses") } SCENE { HP_BAR(player, hp: 0); ANIMATION(ANIM_TYPE_MOVE, MOVE_EXPLOSION, player); + MESSAGE("Wobbuffet fainted!"); } } SINGLE_BATTLE_TEST("Explosion causes the user to faint even if it has no effect") { - u16 remainingHP; GIVEN { ASSUME(gBattleMoves[MOVE_EXPLOSION].type == TYPE_NORMAL); ASSUME(gSpeciesInfo[SPECIES_GASTLY].types[0] == TYPE_GHOST); @@ -49,5 +65,29 @@ SINGLE_BATTLE_TEST("Explosion causes the user to faint even if it has no effect" ANIMATION(ANIM_TYPE_MOVE, MOVE_EXPLOSION, player); MESSAGE("It doesn't affect Foe Gastly…"); NOT HP_BAR(opponent); + MESSAGE("Wobbuffet fainted!"); + } +} + +DOUBLE_BATTLE_TEST("Explosion causes everyone to faint in a double battle") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + PLAYER(SPECIES_WYNAUT) { HP(1); } + OPPONENT(SPECIES_ABRA) { HP(1); } + OPPONENT(SPECIES_KADABRA) { HP(1); } + OPPONENT(SPECIES_KADABRA); + } WHEN { + TURN { MOVE(playerLeft, MOVE_EXPLOSION); } + } SCENE { + HP_BAR(playerLeft, hp: 0); + ANIMATION(ANIM_TYPE_MOVE, MOVE_EXPLOSION, playerLeft); + HP_BAR(opponentLeft, hp: 0); + MESSAGE("Foe Abra fainted!"); + HP_BAR(playerRight, hp: 0); + MESSAGE("Wynaut fainted!"); + HP_BAR(opponentRight, hp: 0); + MESSAGE("Foe Kadabra fainted!"); + MESSAGE("Wobbuffet fainted!"); } } diff --git a/test/move_effect_mind_blown.c b/test/move_effect_mind_blown.c new file mode 100644 index 000000000..6b053cfb5 --- /dev/null +++ b/test/move_effect_mind_blown.c @@ -0,0 +1,109 @@ +#include "global.h" +#include "test_battle.h" + +ASSUMPTIONS +{ + ASSUME(gBattleMoves[MOVE_MIND_BLOWN].effect == EFFECT_MIND_BLOWN); +} + +#define HP_TEST (400) + +SINGLE_BATTLE_TEST("Mind Blown makes the user lose 1/2 of its HP") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { HP(HP_TEST); MaxHP(HP_TEST); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_MIND_BLOWN); } + } SCENE { + HP_BAR(player, hp: HP_TEST / 2); + ANIMATION(ANIM_TYPE_MOVE, MOVE_MIND_BLOWN, player); + NOT MESSAGE("Wobbuffet fainted!"); // Wobb had more than 1/2 of its HP, so it can't faint. + } +} + +DOUBLE_BATTLE_TEST("Mind Blown makes the user lose 1/2 of its HP in a double battle") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { HP(HP_TEST); MaxHP(HP_TEST); } + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(playerLeft, MOVE_MIND_BLOWN); } + } SCENE { + HP_BAR(playerLeft, hp: HP_TEST / 2); + ANIMATION(ANIM_TYPE_MOVE, MOVE_MIND_BLOWN, playerLeft); + NOT MESSAGE("Wobbuffet fainted!"); // Wobb had more than 1/2 of its HP, so it can't faint. + } +} + +SINGLE_BATTLE_TEST("Mind Blown causes the user to faint when below 1/2 of its HP") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { HP(HP_TEST / 2); MaxHP(HP_TEST); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_MIND_BLOWN); } + } SCENE { + HP_BAR(player, hp: 0); + ANIMATION(ANIM_TYPE_MOVE, MOVE_MIND_BLOWN, player); + MESSAGE("Wobbuffet fainted!"); + } +} + +DOUBLE_BATTLE_TEST("Mind Blown causes the user to faint when below 1/2 of its HP in a double battle") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { HP(HP_TEST / 2); MaxHP(HP_TEST); } + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(playerLeft, MOVE_MIND_BLOWN);} + } SCENE { + HP_BAR(playerLeft, hp: 0); + ANIMATION(ANIM_TYPE_MOVE, MOVE_MIND_BLOWN, playerLeft); + MESSAGE("Wobbuffet fainted!"); + } +} + +SINGLE_BATTLE_TEST("Mind Blown causes the user & the target to faint when below 1/2 of its HP") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { HP(HP_TEST / 2) ; MaxHP(HP_TEST); } + OPPONENT(SPECIES_WOBBUFFET) { HP(1); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_MIND_BLOWN);} + } SCENE { + HP_BAR(player, hp: 0); + ANIMATION(ANIM_TYPE_MOVE, MOVE_MIND_BLOWN, player); + HP_BAR(opponent, hp: 0); + MESSAGE("Foe Wobbuffet fainted!"); + MESSAGE("Wobbuffet fainted!"); + } +} + +DOUBLE_BATTLE_TEST("Mind Blown causes everyone to faint in a double battle") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { HP(HP_TEST / 2); MaxHP(HP_TEST); } + PLAYER(SPECIES_WYNAUT) { HP(1); } + OPPONENT(SPECIES_ABRA) { HP(1); } + OPPONENT(SPECIES_KADABRA) { HP(1); } + OPPONENT(SPECIES_KADABRA); + } WHEN { + TURN { MOVE(playerLeft, MOVE_MIND_BLOWN, criticalHit: FALSE); } + } SCENE { + HP_BAR(playerLeft, hp: 0); + ANIMATION(ANIM_TYPE_MOVE, MOVE_MIND_BLOWN, playerLeft); + HP_BAR(opponentLeft, hp: 0); + MESSAGE("Foe Abra fainted!"); + HP_BAR(playerRight, hp: 0); + MESSAGE("Wynaut fainted!"); + HP_BAR(opponentRight, hp: 0); + MESSAGE("Foe Kadabra fainted!"); + MESSAGE("Wobbuffet fainted!"); + } +} From bca47a0891a7e69781425cb7b30d3573dee88aeb Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 22 Feb 2023 09:17:23 +0100 Subject: [PATCH 16/32] Update src/battle_script_commands.c Co-authored-by: LOuroboros --- 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 ce9ea50f7..344c5091b 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -6914,7 +6914,7 @@ bool32 ShouldPostponeSwitchInAbilities(u32 battlerId) { bool32 aliveOpposing1 = IsBattlerAlive(BATTLE_OPPOSITE(battlerId)); bool32 aliveOpposing2 = IsBattlerAlive(BATTLE_PARTNER(BATTLE_OPPOSITE(battlerId))); - // No pokemon on opposing side - postopone. + // No pokemon on opposing side - postpone. if (!aliveOpposing1 && !aliveOpposing2) return TRUE; From 31138455ded2fd6d711777b4ee19cadd5245e1b2 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 22 Feb 2023 09:28:12 +0100 Subject: [PATCH 17/32] remove unneeded VARIOUS_JUMP_IF_NO_VALID_TARGETS --- asm/macros/battle_script.inc | 5 ----- data/battle_scripts_1.s | 1 - include/constants/battle_script_commands.h | 7 +++---- src/battle_script_commands.c | 16 ---------------- 4 files changed, 3 insertions(+), 26 deletions(-) diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 7c94f06ff..03a4d6222 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -2049,11 +2049,6 @@ various \battler, VARIOUS_ACTIVATE_TERRAIN_CHANGE_ABILITIES .endm - .macro jumpifnovalidtargets jumpInstr:req - various BS_ATTACKER, VARIOUS_JUMP_IF_NO_VALID_TARGETS - .4byte \jumpInstr - .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 239d22109..036d662e8 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -8573,7 +8573,6 @@ BattleScript_TryAdrenalineOrbRet: return BattleScript_IntimidateActivates:: - jumpifnovalidtargets BattleScript_IntimidateEnd showabilitypopup BS_ATTACKER pause B_WAIT_TIME_LONG destroyabilitypopup diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h index 0b71c22db..9699a2921 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -255,10 +255,9 @@ #define VARIOUS_TRY_WIND_RIDER_POWER 163 #define VARIOUS_ACTIVATE_WEATHER_CHANGE_ABILITIES 164 #define VARIOUS_ACTIVATE_TERRAIN_CHANGE_ABILITIES 165 -#define VARIOUS_JUMP_IF_NO_VALID_TARGETS 166 -#define VARIOUS_JUMP_IF_EMERGENCY_EXITED 167 -#define VARIOUS_STORE_HEALING_WISH 168 -#define VARIOUS_HIT_SWITCH_TARGET_FAILED 169 +#define VARIOUS_JUMP_IF_EMERGENCY_EXITED 166 +#define VARIOUS_STORE_HEALING_WISH 167 +#define VARIOUS_HIT_SWITCH_TARGET_FAILED 168 // Cmd_manipulatedamage #define DMG_CHANGE_SIGN 0 diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 344c5091b..e0f0116ff 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -11068,22 +11068,6 @@ static void Cmd_various(void) AbilityBattleEffects(ABILITYEFFECT_ON_TERRAIN, gActiveBattler, 0, 0, 0); return; } - case VARIOUS_JUMP_IF_NO_VALID_TARGETS: - { - VARIOUS_ARGS(const u8 *jumpInstr); - u32 count = 0; - - for (i = 0; i < gBattlersCount; i++) - { - if (GetBattlerSide(i) != GetBattlerSide(gBattlerAttacker) && IsBattlerAlive(i)) - count++; - } - if (count == 0) - gBattlescriptCurrInstr = cmd->jumpInstr; - else - gBattlescriptCurrInstr = cmd->nextInstr; - return; - } case VARIOUS_JUMP_IF_EMERGENCY_EXITED: { VARIOUS_ARGS(const u8 *jumpInstr); From e0b76e98ff319901d1316ad9305620dbd57d56ed Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 22 Feb 2023 14:55:34 +0100 Subject: [PATCH 18/32] Add MOVE_SHELL_TRAP Effect (#2716) * implemented Shell Trap Co-authored-by: AgustinGDLV --- asm/macros/battle_script.inc | 5 + data/battle_anim_scripts.s | 144 +++++++++--------- data/battle_scripts_1.s | 18 +++ include/battle.h | 1 + include/battle_scripts.h | 1 + include/constants/battle_move_effects.h | 3 +- include/constants/battle_script_commands.h | 1 + include/constants/battle_string_ids.h | 4 +- src/battle_main.c | 3 + src/battle_message.c | 4 + src/battle_script_commands.c | 87 ++++++++--- src/battle_util.c | 3 +- src/data/battle_moves.h | 2 +- test/move_effect_shell_trap.c | 168 +++++++++++++++++++++ 14 files changed, 344 insertions(+), 100 deletions(-) create mode 100644 test/move_effect_shell_trap.c diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 5c71cef70..66c60a7cf 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -2249,6 +2249,11 @@ .4byte \jumpInstr .endm + .macro jumpifshelltrap battler:req, ptr:req + various \battler, VARIOUS_JUMP_IF_SHELL_TRAP + .4byte \ptr + .endm + .macro hitswitchtargetfailed various 0, VARIOUS_HIT_SWITCH_TARGET_FAILED .endm diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 71bd93d70..75a831a33 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -12036,168 +12036,168 @@ ShellTrapUnleash: monbg ANIM_TARGET waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 0x10 delay 0x6 - launchtemplate gShellTrapYellowImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2 + createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - launchtemplate gShellTrapYellowImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2 + createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - launchtemplate gShellTrapYellowImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2 + createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - launchtemplate gShellTrapYellowImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2 + createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - launchtemplate gShellTrapYellowImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2 + createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - launchtemplate gShellTrapYellowImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2 + createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - launchtemplate gShellTrapYellowImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2 + createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - launchtemplate gShellTrapYellowImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2 + createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - launchtemplate gShellTrapYellowImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2 + createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - launchtemplate gFireSpiralOutwardSpriteTemplate 0x3 0x4 0x0 0x0 0x38 0x0 - launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2 + createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x0 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 0x2 - launchtemplate gFireSpiralOutwardSpriteTemplate 0x3 0x4 0x0 0x0 0x38 0x4 - launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2 + createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x4 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 0x2 - launchtemplate gFireSpiralOutwardSpriteTemplate 0x3 0x4 0x0 0x0 0x38 0x8 - launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2 + createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x8 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 0x2 - launchtemplate gFireSpiralOutwardSpriteTemplate 0x3 0x4 0x0 0x0 0x38 0xc - launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2 + createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0xc + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 0x2 - launchtemplate gFireSpiralOutwardSpriteTemplate 0x3 0x4 0x0 0x0 0x38 0x10 - launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2 + createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x10 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 0x2 - launchtemplate gFireSpiralOutwardSpriteTemplate 0x3 0x4 0x0 0x0 0x38 0x14 - launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2 + createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x14 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 0x2 - launchtemplate gFireSpiralOutwardSpriteTemplate 0x3 0x4 0x0 0x0 0x38 0x18 - launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2 + createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x18 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER - launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 waitforvisualfinish call ShellTrapFireLaunch1 - launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0x0 0x0 0x0 0x38 0x4 0x4 0x1 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0, 0x38, 0x4, 0x4, 0x1 delay 0x3 - launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0xfff6 0x0 0xfff6 0x38 0x4 0x4 0x1 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xfff6, 0x0, 0xfff6, 0x38, 0x4, 0x4, 0x1 delay 0x3 - launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0xa 0x0 0xa 0x38 0xfffc 0x3 0x1 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xa, 0x0, 0xa, 0x38, 0xfffc, 0x3, 0x1 delay 0x3 - launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0xffec 0x0 0xffec 0x38 0xfffc 0x5 0x1 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xffec, 0x0, 0xffec, 0x38, 0xfffc, 0x5, 0x1 delay 0x3 call ShellTrapFireLaunch2 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER - launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 delay 0x3 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER - launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 delay 0x3 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER - launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 delay 0x3 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER - launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 delay 0x3 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER - launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 delay 0x3 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER - launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 delay 0x3 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER - launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 delay 0x3 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER - launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 delay 0x3 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER - launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 delay 0x3 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER - launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 delay 0x3 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER - launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 delay 0x3 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER - launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 delay 0x3 waitforvisualfinish clearmonbg ANIM_TARGET end ShellTrapFireLaunch1: - launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0x0 0x0 0x0 0x38 0x4 0x4 0x1 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0, 0x38, 0x4, 0x4, 0x1 delay 0x3 - launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0xfff6 0x0 0xfff6 0x38 0x4 0x4 0x1 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xfff6, 0x0, 0xfff6, 0x38, 0x4, 0x4, 0x1 delay 0x3 - launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0xa 0x0 0xa 0x38 0xfffc 0x3 0x1 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xa, 0x0, 0xa, 0x38, 0xfffc, 0x3, 0x1 delay 0x3 - launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0xffec 0x0 0xffec 0x38 0xfffc 0x5 0x1 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xffec, 0x0, 0xffec, 0x38, 0xfffc, 0x5, 0x1 delay 0x3 - launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0xf 0x0 0xf 0x38 0x4 0x4 0x1 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xf, 0x0, 0xf, 0x38, 0x4, 0x4, 0x1 delay 0x3 - launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0xffec 0x0 0xffec 0x38 0x4 0x4 0x1 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xffec, 0x0, 0xffec, 0x38, 0x4, 0x4, 0x1 delay 0x3 - launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0x14 0x0 0x14 0x38 0x4 0x4 0x1 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0x14, 0x0, 0x14, 0x38, 0x4, 0x4, 0x1 delay 0x3 return ShellTrapFireLaunch2: - launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0x0 0x0 0x0 0x38 0x4 0x4 0x1 - launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0, 0x38, 0x4, 0x4, 0x1 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 0x3 - launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0xfff6 0x0 0xfff6 0x38 0x4 0x4 0x1 - launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xfff6, 0x0, 0xfff6, 0x38, 0x4, 0x4, 0x1 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 0x3 - launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0xa 0x0 0xa 0x38 0xfffc 0x3 0x1 - launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xa, 0x0, 0xa, 0x38, 0xfffc, 0x3, 0x1 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 0x3 - launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0xffec 0x0 0xffec 0x38 0xfffc 0x5 0x1 - launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xffec, 0x0, 0xffec, 0x38, 0xfffc, 0x5, 0x1 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 0x3 - launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0xf 0x0 0xf 0x38 0x4 0x4 0x1 - launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xf, 0x0, 0xf, 0x38, 0x4, 0x4, 0x1 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 0x3 - launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0xffec 0x0 0xffec 0x38 0x4 0x4 0x1 - launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xffec, 0x0, 0xffec, 0x38, 0x4, 0x4, 0x1 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 0x3 - launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0x14 0x0 0x14 0x38 0x4 0x4 0x1 - launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0x14, 0x0, 0x14, 0x38, 0x4, 0x4, 0x1 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 0x3 return diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 8ed23a922..5bf5f52b0 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -417,6 +417,7 @@ gBattleScriptsForMoveEffects:: .4byte BattleScript_EffectVictoryDance @ EFFECT_VICTORY_DANCE .4byte BattleScript_EffectTeatime @ EFFECT_TEATIME .4byte BattleScript_EffectAttackUpUserAlly @ EFFECT_ATTACK_UP_USER_ALLY + .4byte BattleScript_EffectShellTrap @ EFFECT_SHELL_TRAP BattleScript_EffectAttackUpUserAlly: jumpifnoally BS_ATTACKER, BattleScript_EffectAttackUp @@ -557,6 +558,23 @@ BattleScript_AffectionBasedStatusHeal_Continue: waitstate end2 +BattleScript_ShellTrapSetUp:: + printstring STRINGID_EMPTYSTRING3 + waitmessage 0x1 + playanimation BS_ATTACKER, B_ANIM_SHELL_TRAP_SETUP, NULL + printstring STRINGID_PREPARESHELLTRAP + waitmessage B_WAIT_TIME_LONG + end2 + +BattleScript_EffectShellTrap:: + attackcanceler + jumpifshelltrap BS_ATTACKER, BattleScript_HitFromAccCheck + jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING | HITMARKER_NO_PPDEDUCT, BattleScript_MoveEnd + ppreduce + printstring STRINGID_SHELLTRAPDIDNTWORK + waitmessage B_WAIT_TIME_LONG + goto BattleScript_MoveEnd + BattleScript_EffectSteelBeam:: attackcanceler attackstring diff --git a/include/battle.h b/include/battle.h index e17733823..48c283ab4 100644 --- a/include/battle.h +++ b/include/battle.h @@ -143,6 +143,7 @@ struct ProtectStruct u16 quickDraw:1; u16 beakBlastCharge:1; u16 quash:1; + u16 shellTrap:1; u16 silkTrapped:1; u32 physicalDmg; u32 specialDmg; diff --git a/include/battle_scripts.h b/include/battle_scripts.h index d4e4d4b3c..7904f5dc1 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -453,6 +453,7 @@ extern const u8 BattleScript_BattlerFormChangeWithStringEnd3[]; extern const u8 BattleScript_DampPreventsAftermath[]; extern const u8 BattleScript_HealingWishActivates[]; extern const u8 BattleScript_LunarDanceActivates[]; +extern const u8 BattleScript_ShellTrapSetUp[]; // zmoves extern const u8 BattleScript_ZMoveActivateDamaging[]; diff --git a/include/constants/battle_move_effects.h b/include/constants/battle_move_effects.h index beab88151..061271dd5 100644 --- a/include/constants/battle_move_effects.h +++ b/include/constants/battle_move_effects.h @@ -398,7 +398,8 @@ #define EFFECT_VICTORY_DANCE 392 #define EFFECT_TEATIME 393 #define EFFECT_ATTACK_UP_USER_ALLY 394 // Howl 8th Gen +#define EFFECT_SHELL_TRAP 395 -#define NUM_BATTLE_MOVE_EFFECTS 395 +#define NUM_BATTLE_MOVE_EFFECTS 396 #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h index 9699a2921..26064bcfb 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -258,6 +258,7 @@ #define VARIOUS_JUMP_IF_EMERGENCY_EXITED 166 #define VARIOUS_STORE_HEALING_WISH 167 #define VARIOUS_HIT_SWITCH_TARGET_FAILED 168 +#define VARIOUS_JUMP_IF_SHELL_TRAP 169 // Cmd_manipulatedamage #define DMG_CHANGE_SIGN 0 diff --git a/include/constants/battle_string_ids.h b/include/constants/battle_string_ids.h index 3f8853024..e561a9cb9 100644 --- a/include/constants/battle_string_ids.h +++ b/include/constants/battle_string_ids.h @@ -639,8 +639,10 @@ #define STRINGID_ABILITYWEAKENEDFSURROUNDINGMONSSTAT 637 #define STRINGID_ATTACKERGAINEDSTRENGTHFROMTHEFALLEN 638 #define STRINGID_PKMNSABILITYPREVENTSABILITY 639 +#define STRINGID_PREPARESHELLTRAP 640 +#define STRINGID_SHELLTRAPDIDNTWORK 641 -#define BATTLESTRINGS_COUNT 640 +#define BATTLESTRINGS_COUNT 642 // This is the string id that gBattleStringsTable starts with. // String ids before this (e.g. STRINGID_INTROMSG) are not in the table, diff --git a/src/battle_main.c b/src/battle_main.c index b23d8af55..6588d3c5e 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -4954,6 +4954,9 @@ static void CheckChosenMoveForEffectsBeforeTurnStarts(void) case MOVE_BEAK_BLAST: BattleScriptExecute(BattleScript_BeakBlastSetUp); return; + case MOVE_SHELL_TRAP: + BattleScriptExecute(BattleScript_ShellTrapSetUp); + return; } } } diff --git a/src/battle_message.c b/src/battle_message.c index 2b8005f64..ec2527d84 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -774,6 +774,8 @@ static const u8 sText_StatWasHeightened[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s static const u8 sText_ElectricTerrainActivatedAbility[] = _("The Electric Terrain activated\n{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ABILITY}!"); static const u8 sText_AbilityWeakenedSurroundingMonsStat[] = _("{B_ATK_NAME_WITH_PREFIX}'s {B_ATK_ABILITY}\nweakened the {B_BUFF1} of\lall surrounding Pokémon!\p"); static const u8 sText_AttackerGainedStrengthFromTheFallen[] = _("{B_ATK_NAME_WITH_PREFIX} gained strength\nfrom the fallen!"); +static const u8 sText_PrepareShellTrap[] = _("{B_ATK_NAME_WITH_PREFIX} set a shell trap!"); +static const u8 sText_ShellTrapDidntWork[] = _("{B_ATK_NAME_WITH_PREFIX}'s shell trap didn't work!"); const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] = { @@ -800,6 +802,8 @@ const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] = [STRINGID_ZMOVEHPTRAP - BATTLESTRINGS_TABLE_START] = sText_ZMoveHpSwitchInTrap, [STRINGID_PLAYERLOSTTOENEMYTRAINER - BATTLESTRINGS_TABLE_START] = sText_PlayerLostToEnemyTrainer, [STRINGID_PLAYERPAIDPRIZEMONEY - BATTLESTRINGS_TABLE_START] = sText_PlayerPaidPrizeMoney, + [STRINGID_SHELLTRAPDIDNTWORK - BATTLESTRINGS_TABLE_START] = sText_ShellTrapDidntWork, + [STRINGID_PREPARESHELLTRAP - BATTLESTRINGS_TABLE_START] = sText_PrepareShellTrap, [STRINGID_COURTCHANGE - BATTLESTRINGS_TABLE_START] = sText_CourtChange, [STRINGID_HEATUPBEAK - BATTLESTRINGS_TABLE_START] = sText_HeatingUpBeak, [STRINGID_METEORBEAMCHARGING - BATTLESTRINGS_TABLE_START] = sText_MeteorBeamCharging, diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 1d6ab5fae..3826a4751 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -350,6 +350,7 @@ static bool32 CriticalCapture(u32 odds); static void BestowItem(u32 battlerAtk, u32 battlerDef); static bool8 IsFinalStrikeEffect(u16 move); static void TryUpdateRoundTurnOrder(void); +static bool32 ChangeOrderTargetAfterAttacker(void); static void Cmd_attackcanceler(void); static void Cmd_accuracycheck(void); @@ -5732,6 +5733,22 @@ static void Cmd_moveend(void) else gBattleStruct->lastMoveFailed &= ~(gBitTable[gBattlerAttacker]); + // Set ShellTrap to activate after the attacker's turn if target was hit by a physical move. + if (gBattleMoves[gChosenMoveByBattler[gBattlerTarget]].effect == EFFECT_SHELL_TRAP + && gBattlerTarget != gBattlerAttacker + && GetBattlerSide(gBattlerTarget) != GetBattlerSide(gBattlerAttacker) + && gProtectStructs[gBattlerTarget].physicalDmg + && gProtectStructs[gBattlerTarget].physicalBattlerId == gBattlerAttacker + && !TestSheerForceFlag(gBattlerAttacker, gCurrentMove)) + { + gProtectStructs[gBattlerTarget].shellTrap = TRUE; + // Change move order in double battles, so the hit mon with shell trap moves immediately after being hit. + if (IsDoubleBattle()) + { + ChangeOrderTargetAfterAttacker(); + } + } + if (gHitMarker & HITMARKER_SWAP_ATTACKER_TARGET) { gActiveBattler = gBattlerAttacker; @@ -6196,6 +6213,7 @@ static void Cmd_moveend(void) gBattleStruct->targetsDone[gBattlerAttacker] = 0; gProtectStructs[gBattlerAttacker].usesBouncedMove = FALSE; gProtectStructs[gBattlerAttacker].targetAffected = FALSE; + gProtectStructs[gBattlerAttacker].shellTrap = FALSE; gBattleStruct->ateBoost[gBattlerAttacker] = 0; gStatuses3[gBattlerAttacker] &= ~STATUS3_ME_FIRST; gSpecialStatuses[gBattlerAttacker].gemBoost = FALSE; @@ -8643,6 +8661,38 @@ static bool32 CanTeleport(u8 battlerId) return TRUE; } +// Return True if the order was changed, and false if the order was not changed(for example because the target would move after the attacker anyway). +static bool32 ChangeOrderTargetAfterAttacker(void) +{ + u32 i; + u8 data[MAX_BATTLERS_COUNT]; + + if (GetBattlerTurnOrderNum(gBattlerAttacker) > GetBattlerTurnOrderNum(gBattlerTarget) + || GetBattlerTurnOrderNum(gBattlerAttacker) + 1 == GetBattlerTurnOrderNum(gBattlerTarget)) + return FALSE; + + for (i = 0; i < gBattlersCount; i++) + data[i] = gBattlerByTurnOrder[i]; + if (GetBattlerTurnOrderNum(gBattlerAttacker) == 0 && GetBattlerTurnOrderNum(gBattlerTarget) == 2) + { + gBattlerByTurnOrder[1] = gBattlerTarget; + gBattlerByTurnOrder[2] = data[1]; + gBattlerByTurnOrder[3] = data[3]; + } + else if (GetBattlerTurnOrderNum(gBattlerAttacker) == 0 && GetBattlerTurnOrderNum(gBattlerTarget) == 3) + { + gBattlerByTurnOrder[1] = gBattlerTarget; + gBattlerByTurnOrder[2] = data[1]; + gBattlerByTurnOrder[3] = data[2]; + } + else // Attacker == 1, Target == 3 + { + gBattlerByTurnOrder[2] = gBattlerTarget; + gBattlerByTurnOrder[3] = data[2]; + } + return TRUE; +} + static void Cmd_various(void) { CMD_ARGS(u8 battler, u8 id); @@ -10010,34 +10060,14 @@ static void Cmd_various(void) case VARIOUS_AFTER_YOU: { VARIOUS_ARGS(const u8 *failInstr); - if (GetBattlerTurnOrderNum(gBattlerAttacker) > GetBattlerTurnOrderNum(gBattlerTarget) - || GetBattlerTurnOrderNum(gBattlerAttacker) + 1 == GetBattlerTurnOrderNum(gBattlerTarget)) + if (ChangeOrderTargetAfterAttacker()) { - gBattlescriptCurrInstr = cmd->failInstr; + gSpecialStatuses[gBattlerTarget].afterYou = 1; + gBattlescriptCurrInstr = cmd->nextInstr; } else { - for (i = 0; i < gBattlersCount; i++) - data[i] = gBattlerByTurnOrder[i]; - if (GetBattlerTurnOrderNum(gBattlerAttacker) == 0 && GetBattlerTurnOrderNum(gBattlerTarget) == 2) - { - gBattlerByTurnOrder[1] = gBattlerTarget; - gBattlerByTurnOrder[2] = data[1]; - gBattlerByTurnOrder[3] = data[3]; - } - else if (GetBattlerTurnOrderNum(gBattlerAttacker) == 0 && GetBattlerTurnOrderNum(gBattlerTarget) == 3) - { - gBattlerByTurnOrder[1] = gBattlerTarget; - gBattlerByTurnOrder[2] = data[1]; - gBattlerByTurnOrder[3] = data[2]; - } - else - { - gBattlerByTurnOrder[2] = gBattlerTarget; - gBattlerByTurnOrder[3] = data[2]; - } - gSpecialStatuses[gBattlerTarget].afterYou = 1; - gBattlescriptCurrInstr = cmd->nextInstr; + gBattlescriptCurrInstr = cmd->failInstr; } return; } @@ -11068,6 +11098,15 @@ static void Cmd_various(void) AbilityBattleEffects(ABILITYEFFECT_ON_WEATHER, gActiveBattler, 0, 0, 0); return; } + case VARIOUS_JUMP_IF_SHELL_TRAP: + { + VARIOUS_ARGS(const u8 *jumpInstr); + if (gProtectStructs[gActiveBattler].shellTrap) + gBattlescriptCurrInstr = cmd->jumpInstr; + else + gBattlescriptCurrInstr = cmd->nextInstr; + return; + } case VARIOUS_ACTIVATE_TERRAIN_CHANGE_ABILITIES: { VARIOUS_ARGS(); diff --git a/src/battle_util.c b/src/battle_util.c index 185575411..ccc7445b5 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -948,7 +948,8 @@ void HandleAction_ActionFinished(void) u8 battler1 = gBattlerByTurnOrder[i]; u8 battler2 = gBattlerByTurnOrder[j]; - if (gProtectStructs[battler1].quash || gProtectStructs[battler2].quash) + if (gProtectStructs[battler1].quash || gProtectStructs[battler2].quash + || gProtectStructs[battler1].shellTrap || gProtectStructs[battler2].shellTrap) continue; // We recalculate order only for action of the same priority. If any action other than switch/move has been taken, they should diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index bf5414276..82883fb8c 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -11613,7 +11613,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = [MOVE_SHELL_TRAP] = { - .effect = EFFECT_PLACEHOLDER, // EFFECT_SHELL_TRAP, + .effect = EFFECT_SHELL_TRAP, .power = 150, .type = TYPE_FIRE, .accuracy = 100, diff --git a/test/move_effect_shell_trap.c b/test/move_effect_shell_trap.c new file mode 100644 index 000000000..27dc4b7f6 --- /dev/null +++ b/test/move_effect_shell_trap.c @@ -0,0 +1,168 @@ +#include "global.h" +#include "test_battle.h" + +ASSUMPTIONS +{ + ASSUME(gBattleMoves[MOVE_SHELL_TRAP].effect == EFFECT_SHELL_TRAP); + ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); + ASSUME(gBattleMoves[MOVE_WATER_GUN].split == SPLIT_SPECIAL); + ASSUME(gBattleMoves[MOVE_LEER].split == SPLIT_STATUS); +} + +SINGLE_BATTLE_TEST("Shell Trap activates only if hit by a physical move") +{ + u32 move; + bool32 activate; + PARAMETRIZE { move = MOVE_TACKLE; activate = TRUE; } + PARAMETRIZE { move = MOVE_WATER_GUN; activate = FALSE; } + PARAMETRIZE { move = MOVE_LEER; activate = FALSE; } + + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_SHELL_TRAP); MOVE(opponent, move); } + } SCENE { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_SHELL_TRAP_SETUP, player); + MESSAGE("Wobbuffet set a shell trap!"); + ANIMATION(ANIM_TYPE_MOVE, move, opponent); + + if (activate) { + MESSAGE("Wobbuffet used Shell Trap!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_SHELL_TRAP, player); + HP_BAR(opponent); + } else { + MESSAGE("Wobbuffet's shell trap didn't work!"); + NONE_OF { + MESSAGE("Wobbuffet used Shell Trap!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_SHELL_TRAP, player); + HP_BAR(opponent); + } + } + } +} + +SINGLE_BATTLE_TEST("Shell Trap does not activate if attacker's Sheer Force applied") +{ + u32 move; + bool32 activate; + PARAMETRIZE { move = MOVE_TACKLE; activate = TRUE; } + PARAMETRIZE { move = MOVE_STOMP; activate = FALSE; } + + GIVEN { + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_TAUROS) { Ability(ABILITY_SHEER_FORCE); } + } WHEN { + TURN { MOVE(player, MOVE_SHELL_TRAP); MOVE(opponent, move); } + } SCENE { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_SHELL_TRAP_SETUP, player); + MESSAGE("Wobbuffet set a shell trap!"); + ANIMATION(ANIM_TYPE_MOVE, move, opponent); + if (activate) { + MESSAGE("Wobbuffet used Shell Trap!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_SHELL_TRAP, player); + HP_BAR(opponent); + } else { + MESSAGE("Wobbuffet's shell trap didn't work!"); + NONE_OF { + MESSAGE("Wobbuffet used Shell Trap!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_SHELL_TRAP, player); + HP_BAR(opponent); + } + } + } +} + +SINGLE_BATTLE_TEST("Shell Trap does not activate if battler faints before being able to activate it") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { HP(1); } + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_SHELL_TRAP); MOVE(opponent, MOVE_TACKLE); SEND_OUT(player, 1); } + } SCENE { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_SHELL_TRAP_SETUP, player); + MESSAGE("Wobbuffet set a shell trap!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponent); + MESSAGE("Wobbuffet fainted!"); + MESSAGE("Go! Wobbuffet!"); + NONE_OF { + MESSAGE("Wobbuffet used Shell Trap!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_SHELL_TRAP, player); + HP_BAR(opponent); + } + } +} + +DOUBLE_BATTLE_TEST("Shell Trap activates immediately after being hit on turn 1 and attacks both opponents") +{ + GIVEN { + ASSUME(gBattleMoves[MOVE_SHELL_TRAP].target == MOVE_TARGET_BOTH); + PLAYER(SPECIES_WOBBUFFET) { Speed(1); } + PLAYER(SPECIES_WOBBUFFET) { Speed(2); } + OPPONENT(SPECIES_WOBBUFFET) { Speed(5); } + OPPONENT(SPECIES_WYNAUT) { Speed(1); } + } WHEN { + TURN { MOVE(playerLeft, MOVE_SHELL_TRAP); MOVE(opponentLeft, MOVE_TACKLE, target:playerLeft); MOVE(playerRight, MOVE_CELEBRATE); MOVE(opponentRight, MOVE_CELEBRATE); } + } SCENE { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_SHELL_TRAP_SETUP, playerLeft); + MESSAGE("Wobbuffet set a shell trap!"); + MESSAGE("Foe Wobbuffet used Tackle!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponentLeft); + MESSAGE("Wobbuffet used Shell Trap!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_SHELL_TRAP, playerLeft); + HP_BAR(opponentLeft); + HP_BAR(opponentRight); + MESSAGE("Wobbuffet used Celebrate!"); + MESSAGE("Foe Wynaut used Celebrate!"); + } +} + +DOUBLE_BATTLE_TEST("Shell Trap activates immediately after being hit on turn 2 and attacks both opponents") +{ + GIVEN { + ASSUME(gBattleMoves[MOVE_SHELL_TRAP].target == MOVE_TARGET_BOTH); + PLAYER(SPECIES_WOBBUFFET) { Speed(1); } + PLAYER(SPECIES_WOBBUFFET) { Speed(2); } + OPPONENT(SPECIES_WOBBUFFET) { Speed(5); } + OPPONENT(SPECIES_WYNAUT) { Speed(6); } + } WHEN { + TURN { MOVE(playerLeft, MOVE_SHELL_TRAP); MOVE(opponentLeft, MOVE_TACKLE, target:playerLeft); MOVE(playerRight, MOVE_CELEBRATE); MOVE(opponentRight, MOVE_CELEBRATE); } + } SCENE { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_SHELL_TRAP_SETUP, playerLeft); + MESSAGE("Wobbuffet set a shell trap!"); + MESSAGE("Foe Wynaut used Celebrate!"); + MESSAGE("Foe Wobbuffet used Tackle!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponentLeft); + MESSAGE("Wobbuffet used Shell Trap!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_SHELL_TRAP, playerLeft); + HP_BAR(opponentLeft); + HP_BAR(opponentRight); + MESSAGE("Wobbuffet used Celebrate!"); + } +} + +DOUBLE_BATTLE_TEST("Shell Trap activates immediately after being hit on turn 3 and attacks both opponents") +{ + GIVEN { + ASSUME(gBattleMoves[MOVE_SHELL_TRAP].target == MOVE_TARGET_BOTH); + PLAYER(SPECIES_WOBBUFFET) { Speed(1); } + PLAYER(SPECIES_WOBBUFFET) { Speed(7); } + OPPONENT(SPECIES_WOBBUFFET) { Speed(5); } + OPPONENT(SPECIES_WYNAUT) { Speed(6); } + } WHEN { + TURN { MOVE(playerLeft, MOVE_SHELL_TRAP); MOVE(opponentLeft, MOVE_TACKLE, target:playerLeft); MOVE(playerRight, MOVE_CELEBRATE); MOVE(opponentRight, MOVE_CELEBRATE); } + } SCENE { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_SHELL_TRAP_SETUP, playerLeft); + MESSAGE("Wobbuffet set a shell trap!"); + MESSAGE("Wobbuffet used Celebrate!"); + MESSAGE("Foe Wynaut used Celebrate!"); + MESSAGE("Foe Wobbuffet used Tackle!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponentLeft); + MESSAGE("Wobbuffet used Shell Trap!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_SHELL_TRAP, playerLeft); + HP_BAR(opponentLeft); + HP_BAR(opponentRight); + } +} From dc83708443b1def89264d0c63f5ac710769b7003 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 22 Feb 2023 22:51:59 +0100 Subject: [PATCH 19/32] Remove unused script BattleScript_TargetAbilityStatRaiseOnMoveEnd --- data/battle_scripts_1.s | 10 ---------- include/battle_scripts.h | 1 - 2 files changed, 11 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 5bf5f52b0..04b709f82 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -9164,16 +9164,6 @@ BattleScript_BattlerAbilityStatRaiseOnSwitchIn:: waitmessage B_WAIT_TIME_LONG end3 -BattleScript_TargetAbilityStatRaiseOnMoveEnd:: - call BattleScript_AbilityPopUp - statbuffchange STAT_CHANGE_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL - setgraphicalstatchangevalues - playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1 - waitanimation - printstring STRINGID_ABILITYRAISEDSTATDRASTICALLY - waitmessage B_WAIT_TIME_LONG - return - BattleScript_ScriptingAbilityStatRaise:: copybyte gBattlerAbility, sBATTLER call BattleScript_AbilityPopUp diff --git a/include/battle_scripts.h b/include/battle_scripts.h index 7904f5dc1..8c6b074c1 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -256,7 +256,6 @@ extern const u8 BattleScript_SturdiedMsg[]; extern const u8 BattleScript_GravityEnds[]; extern const u8 BattleScript_MoveStatDrain[]; extern const u8 BattleScript_MoveStatDrain_PPLoss[]; -extern const u8 BattleScript_TargetAbilityStatRaiseOnMoveEnd[]; extern const u8 BattleScript_TargetsStatWasMaxedOut[]; extern const u8 BattleScript_AttackerAbilityStatRaise[]; extern const u8 BattleScript_AttackerAbilityStatRaiseEnd3[]; From 23272074bf18017142b733445e650c59ad77d378 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 23 Feb 2023 09:53:57 +0100 Subject: [PATCH 20/32] fix uninitialized ai modifier variable in ai calc damage --- src/battle_ai_util.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index 531a4aa6b..4641ba2cd 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -802,6 +802,7 @@ s32 AI_CalcDamage(u16 move, u8 battlerAtk, u8 battlerDef, u8 *typeEffectiveness, } else { + effectivenessMultiplier = CalcTypeEffectivenessMultiplier(move, moveType, battlerAtk, battlerDef, FALSE); dmg = 0; } @@ -1166,7 +1167,7 @@ s32 AI_GetAbility(u32 battlerId) // We've had ability overwritten by e.g. Worry Seed. It is not part of AI_PARTY in case of switching if (gBattleStruct->overwrittenAbilities[battlerId]) return gBattleStruct->overwrittenAbilities[battlerId]; - + // The AI knows its own ability. if (IsBattlerAIControlled(battlerId)) return knownAbility; From db02cd05f6f68397ec37eed11433aeaa8ddd7b62 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Fri, 24 Feb 2023 00:09:13 -0300 Subject: [PATCH 21/32] Purged the bKGD warning once and for all --- graphics/battle_anims/sprites/new/teapot.png | Bin 881 -> 761 bytes .../battle_anims/sprites/omega_symbol.png | Bin 349 -> 273 bytes graphics/battle_interface/alpha_indicator.png | Bin 266 -> 199 bytes graphics/battle_interface/omega_indicator.png | Bin 271 -> 198 bytes graphics/battle_interface/z_move_trigger.png | Bin 351 -> 275 bytes graphics/berries/babiri.png | Bin 483 -> 399 bytes graphics/berries/charti.png | Bin 430 -> 364 bytes graphics/berries/chilan.png | Bin 469 -> 365 bytes graphics/berries/chople.png | Bin 498 -> 406 bytes graphics/berries/coba.png | Bin 402 -> 315 bytes graphics/berries/colbur.png | Bin 435 -> 382 bytes graphics/berries/haban.png | Bin 466 -> 373 bytes graphics/berries/kasib.png | Bin 459 -> 364 bytes graphics/berries/kebia.png | Bin 500 -> 398 bytes graphics/berries/kee.png | Bin 589 -> 479 bytes graphics/berries/micle.png | Bin 383 -> 291 bytes graphics/berries/occa.png | Bin 434 -> 345 bytes graphics/berries/passho.png | Bin 543 -> 444 bytes graphics/berries/rindo.png | Bin 440 -> 356 bytes graphics/berries/roseli.png | Bin 576 -> 489 bytes graphics/berries/rowap.png | Bin 565 -> 471 bytes graphics/berries/shuca.png | Bin 412 -> 326 bytes graphics/berries/tanga.png | Bin 506 -> 419 bytes graphics/berries/wacan.png | Bin 457 -> 376 bytes graphics/berries/yache.png | Bin 514 -> 430 bytes graphics/expansion_intro/powered_by.png | Bin 336 -> 250 bytes graphics/items/icons/ability_capsule.png | Bin 349 -> 254 bytes graphics/items/icons/ability_patch.png | Bin 312 -> 243 bytes graphics/items/icons/absorb_bulb.png | Bin 365 -> 271 bytes graphics/items/icons/air_balloon.png | Bin 343 -> 248 bytes graphics/items/icons/armor_fossil.png | Bin 457 -> 361 bytes graphics/items/icons/babiri_berry.png | Bin 391 -> 288 bytes graphics/items/icons/big_malasada.png | Bin 393 -> 298 bytes graphics/items/icons/big_root.png | Bin 415 -> 334 bytes graphics/items/icons/black_apricorn.png | Bin 368 -> 271 bytes graphics/items/icons/black_sludge.png | Bin 364 -> 279 bytes graphics/items/icons/blue_apricorn.png | Bin 368 -> 271 bytes graphics/items/icons/bug_gem.png | Bin 353 -> 252 bytes graphics/items/icons/bug_memory.png | Bin 423 -> 324 bytes graphics/items/icons/burn_drive.png | Bin 342 -> 258 bytes graphics/items/icons/cell_battery.png | Bin 289 -> 207 bytes graphics/items/icons/charti_berry.png | Bin 359 -> 264 bytes graphics/items/icons/chilan_berry.png | Bin 377 -> 271 bytes graphics/items/icons/chill_drive.png | Bin 342 -> 258 bytes graphics/items/icons/choice_scarf.png | Bin 447 -> 347 bytes graphics/items/icons/choice_specs.png | Bin 369 -> 277 bytes graphics/items/icons/chople_berry.png | Bin 388 -> 287 bytes graphics/items/icons/coba_berry.png | Bin 370 -> 271 bytes graphics/items/icons/colbur_berry.png | Bin 376 -> 295 bytes graphics/items/icons/cover_fossil.png | Bin 418 -> 317 bytes graphics/items/icons/custap_berry.png | Bin 406 -> 304 bytes graphics/items/icons/damp_rock.png | Bin 429 -> 329 bytes graphics/items/icons/dark_gem.png | Bin 353 -> 251 bytes graphics/items/icons/dark_memory.png | Bin 419 -> 322 bytes graphics/items/icons/dawn_stone.png | Bin 375 -> 276 bytes graphics/items/icons/destiny_knot.png | Bin 396 -> 299 bytes graphics/items/icons/douse_drive.png | Bin 342 -> 258 bytes graphics/items/icons/draco_plate.png | Bin 355 -> 244 bytes graphics/items/icons/dragon_gem.png | Bin 353 -> 252 bytes graphics/items/icons/dragon_memory.png | Bin 420 -> 321 bytes graphics/items/icons/dread_plate.png | Bin 355 -> 244 bytes graphics/items/icons/dubious_disc.png | Bin 377 -> 279 bytes graphics/items/icons/dusk_stone.png | Bin 376 -> 272 bytes graphics/items/icons/earth_plate.png | Bin 355 -> 244 bytes graphics/items/icons/eject_button.png | Bin 370 -> 266 bytes graphics/items/icons/electirizer.png | Bin 371 -> 271 bytes graphics/items/icons/electric_gem.png | Bin 353 -> 252 bytes graphics/items/icons/electric_memory.png | Bin 421 -> 327 bytes graphics/items/icons/eviolite.png | Bin 317 -> 228 bytes graphics/items/icons/expert_belt.png | Bin 383 -> 292 bytes graphics/items/icons/fairy_gem.png | Bin 353 -> 252 bytes graphics/items/icons/fairy_memory.png | Bin 422 -> 326 bytes graphics/items/icons/fighting_gem.png | Bin 353 -> 252 bytes graphics/items/icons/fighting_memory.png | Bin 419 -> 321 bytes graphics/items/icons/fire_gem.png | Bin 353 -> 252 bytes graphics/items/icons/fire_memory.png | Bin 422 -> 321 bytes graphics/items/icons/fist_plate.png | Bin 355 -> 244 bytes graphics/items/icons/flame_plate.png | Bin 355 -> 244 bytes graphics/items/icons/float_stone.png | Bin 345 -> 251 bytes graphics/items/icons/flying_gem.png | Bin 353 -> 252 bytes graphics/items/icons/flying_memory.png | Bin 420 -> 324 bytes graphics/items/icons/focus_sash.png | Bin 392 -> 288 bytes graphics/items/icons/full_incense.png | Bin 409 -> 312 bytes graphics/items/icons/ghost_gem.png | Bin 353 -> 252 bytes graphics/items/icons/ghost_memory.png | Bin 421 -> 322 bytes graphics/items/icons/gracidea.png | Bin 446 -> 348 bytes graphics/items/icons/grass_gem.png | Bin 353 -> 252 bytes graphics/items/icons/grass_memory.png | Bin 421 -> 327 bytes graphics/items/icons/green_apricorn.png | Bin 368 -> 271 bytes graphics/items/icons/grip_claw.png | Bin 413 -> 304 bytes graphics/items/icons/griseous_orb.png | Bin 426 -> 322 bytes graphics/items/icons/ground_gem.png | Bin 353 -> 252 bytes graphics/items/icons/ground_memory.png | Bin 420 -> 321 bytes graphics/items/icons/haban_berry.png | Bin 401 -> 298 bytes graphics/items/icons/heat_rock.png | Bin 434 -> 324 bytes graphics/items/icons/ice_gem.png | Bin 353 -> 252 bytes graphics/items/icons/ice_memory.png | Bin 415 -> 316 bytes graphics/items/icons/ice_stone.png | Bin 422 -> 319 bytes graphics/items/icons/icicle_plate.png | Bin 355 -> 244 bytes graphics/items/icons/icy_rock.png | Bin 411 -> 315 bytes graphics/items/icons/insect_plate.png | Bin 355 -> 244 bytes graphics/items/icons/iron_ball.png | Bin 352 -> 252 bytes graphics/items/icons/iron_plate.png | Bin 355 -> 244 bytes graphics/items/icons/jaboca_berry.png | Bin 395 -> 298 bytes graphics/items/icons/jaw_fossil.png | Bin 444 -> 352 bytes graphics/items/icons/kasib_berry.png | Bin 403 -> 297 bytes graphics/items/icons/kebia_berry.png | Bin 393 -> 286 bytes graphics/items/icons/kee_berry.png | Bin 447 -> 339 bytes graphics/items/icons/lagging_tail.png | Bin 400 -> 296 bytes graphics/items/icons/life_orb.png | Bin 330 -> 239 bytes graphics/items/icons/light_clay.png | Bin 362 -> 268 bytes graphics/items/icons/lucarionite.png | Bin 333 -> 246 bytes graphics/items/icons/luck_incense.png | Bin 404 -> 307 bytes graphics/items/icons/luminous_moss.png | Bin 385 -> 288 bytes graphics/items/icons/lustrous_orb.png | Bin 458 -> 332 bytes graphics/items/icons/magmarizer.png | Bin 376 -> 279 bytes graphics/items/icons/maranga_berry.png | Bin 401 -> 294 bytes graphics/items/icons/meadow_plate.png | Bin 355 -> 244 bytes graphics/items/icons/metronome.png | Bin 356 -> 262 bytes graphics/items/icons/micle_berry.png | Bin 340 -> 235 bytes graphics/items/icons/mind_plate.png | Bin 355 -> 244 bytes graphics/items/icons/muscle_band.png | Bin 418 -> 318 bytes graphics/items/icons/normal_gem.png | Bin 353 -> 252 bytes graphics/items/icons/occa_berry.png | Bin 366 -> 262 bytes graphics/items/icons/odd_incense.png | Bin 402 -> 304 bytes graphics/items/icons/odd_keystone.png | Bin 395 -> 289 bytes graphics/items/icons/old_gateau.png | Bin 330 -> 228 bytes graphics/items/icons/oval_stone.png | Bin 364 -> 267 bytes graphics/items/icons/passho_berry.png | Bin 383 -> 289 bytes graphics/items/icons/payapa_berry.png | Bin 390 -> 293 bytes graphics/items/icons/pink_apricorn.png | Bin 368 -> 271 bytes graphics/items/icons/pink_nectar.png | Bin 379 -> 286 bytes graphics/items/icons/plume_fossil.png | Bin 393 -> 301 bytes graphics/items/icons/poison_gem.png | Bin 353 -> 252 bytes graphics/items/icons/poison_memory.png | Bin 419 -> 322 bytes graphics/items/icons/poke_radar.png | Bin 395 -> 299 bytes graphics/items/icons/power_anklet.png | Bin 415 -> 311 bytes graphics/items/icons/power_band.png | Bin 417 -> 309 bytes graphics/items/icons/power_belt.png | Bin 412 -> 308 bytes graphics/items/icons/power_bracer.png | Bin 401 -> 301 bytes graphics/items/icons/power_herb.png | Bin 353 -> 256 bytes graphics/items/icons/power_lens.png | Bin 428 -> 319 bytes graphics/items/icons/power_weight.png | Bin 404 -> 303 bytes graphics/items/icons/prism_scale.png | Bin 325 -> 228 bytes graphics/items/icons/protector.png | Bin 381 -> 277 bytes graphics/items/icons/psychic_gem.png | Bin 353 -> 252 bytes graphics/items/icons/psychic_memory.png | Bin 420 -> 325 bytes graphics/items/icons/pure_incense.png | Bin 401 -> 308 bytes graphics/items/icons/purple_nectar.png | Bin 379 -> 286 bytes graphics/items/icons/quick_powder.png | Bin 392 -> 296 bytes graphics/items/icons/rare_bone.png | Bin 331 -> 242 bytes graphics/items/icons/razor_claw.png | Bin 360 -> 264 bytes graphics/items/icons/razor_fang.png | Bin 342 -> 244 bytes graphics/items/icons/reaper_cloth.png | Bin 401 -> 306 bytes graphics/items/icons/red_apricorn.png | Bin 368 -> 271 bytes graphics/items/icons/red_card.png | Bin 311 -> 211 bytes graphics/items/icons/red_nectar.png | Bin 380 -> 288 bytes graphics/items/icons/rindo_berry.png | Bin 353 -> 260 bytes graphics/items/icons/ring_target.png | Bin 330 -> 245 bytes graphics/items/icons/rock_gem.png | Bin 353 -> 252 bytes graphics/items/icons/rock_incense.png | Bin 407 -> 310 bytes graphics/items/icons/rock_memory.png | Bin 414 -> 316 bytes graphics/items/icons/rocky_helmet.png | Bin 385 -> 289 bytes graphics/items/icons/rose_incense.png | Bin 408 -> 311 bytes graphics/items/icons/roseli_berry.png | Bin 400 -> 298 bytes graphics/items/icons/rowap_berry.png | Bin 440 -> 332 bytes graphics/items/icons/sachet.png | Bin 369 -> 275 bytes graphics/items/icons/safety_goggles.png | Bin 386 -> 288 bytes graphics/items/icons/sail_fossil.png | Bin 438 -> 332 bytes graphics/items/icons/shed_shell.png | Bin 393 -> 285 bytes graphics/items/icons/shiny_charm.png | Bin 356 -> 274 bytes graphics/items/icons/shiny_stone.png | Bin 390 -> 294 bytes graphics/items/icons/shock_drive.png | Bin 342 -> 258 bytes graphics/items/icons/shuca_berry.png | Bin 369 -> 275 bytes graphics/items/icons/skull_fossil.png | Bin 450 -> 347 bytes graphics/items/icons/sky_plate.png | Bin 355 -> 244 bytes graphics/items/icons/smooth_rock.png | Bin 427 -> 323 bytes graphics/items/icons/snowball.png | Bin 333 -> 242 bytes graphics/items/icons/splash_plate.png | Bin 352 -> 243 bytes graphics/items/icons/spooky_plate.png | Bin 355 -> 244 bytes graphics/items/icons/steel_gem.png | Bin 353 -> 251 bytes graphics/items/icons/steel_memory.png | Bin 419 -> 323 bytes graphics/items/icons/sticky_barb.png | Bin 332 -> 247 bytes graphics/items/icons/stone_plate.png | Bin 355 -> 244 bytes graphics/items/icons/sweet_heart.png | Bin 328 -> 235 bytes graphics/items/icons/tanga_berry.png | Bin 416 -> 310 bytes graphics/items/icons/toxic_orb.png | Bin 347 -> 259 bytes graphics/items/icons/toxic_plate.png | Bin 355 -> 244 bytes graphics/items/icons/wacan_berry.png | Bin 386 -> 283 bytes graphics/items/icons/water_gem.png | Bin 353 -> 252 bytes graphics/items/icons/water_memory.png | Bin 417 -> 320 bytes graphics/items/icons/wave_incense.png | Bin 400 -> 304 bytes graphics/items/icons/weakness_policy.png | Bin 316 -> 228 bytes graphics/items/icons/whipped_dream.png | Bin 392 -> 292 bytes graphics/items/icons/white_apricorn.png | Bin 367 -> 265 bytes graphics/items/icons/wide_lens.png | Bin 370 -> 260 bytes graphics/items/icons/wise_glasses.png | Bin 333 -> 248 bytes graphics/items/icons/x_special_defense.png | Bin 410 -> 308 bytes graphics/items/icons/yache_berry.png | Bin 395 -> 298 bytes graphics/items/icons/yellow_apricorn.png | Bin 368 -> 271 bytes graphics/items/icons/yellow_nectar.png | Bin 379 -> 286 bytes graphics/items/icons/zap_plate.png | Bin 355 -> 244 bytes graphics/items/icons/zoom_lens.png | Bin 385 -> 280 bytes .../object_events/pics/berry_trees/chople.png | Bin 697 -> 637 bytes .../object_events/pics/berry_trees/custap.png | Bin 669 -> 588 bytes .../object_events/pics/berry_trees/jaboca.png | Bin 693 -> 593 bytes .../object_events/pics/berry_trees/kasib.png | Bin 606 -> 532 bytes .../object_events/pics/berry_trees/kebia.png | Bin 600 -> 521 bytes .../object_events/pics/berry_trees/micle.png | Bin 627 -> 571 bytes .../object_events/pics/berry_trees/occa.png | Bin 618 -> 566 bytes .../object_events/pics/berry_trees/payapa.png | Bin 589 -> 521 bytes .../object_events/pics/berry_trees/roseli.png | Bin 593 -> 521 bytes .../object_events/pics/berry_trees/shuca.png | Bin 638 -> 552 bytes .../object_events/pics/berry_trees/tanga.png | Bin 697 -> 599 bytes .../pokemon/alcremie/caramel_swirl/front.png | Bin 805 -> 729 bytes .../pokemon/alcremie/lemon_cream/front.png | Bin 805 -> 729 bytes .../pokemon/alcremie/matcha_cream/back.png | Bin 747 -> 657 bytes .../pokemon/alcremie/matcha_cream/front.png | Bin 805 -> 729 bytes .../pokemon/alcremie/mint_cream/front.png | Bin 806 -> 729 bytes .../pokemon/alcremie/rainbow_swirl/back.png | Bin 755 -> 660 bytes .../pokemon/alcremie/ruby_cream/front.png | Bin 809 -> 730 bytes .../pokemon/alcremie/salted_cream/front.png | Bin 804 -> 729 bytes graphics/pokemon/altaria/back.png | Bin 703 -> 603 bytes graphics/pokemon/ampharos/back.png | Bin 640 -> 563 bytes graphics/pokemon/bagon/back.png | Bin 646 -> 552 bytes .../pokemon/basculin/blue_striped/back.png | Bin 741 -> 629 bytes .../pokemon/basculin/blue_striped/icon.png | Bin 462 -> 362 bytes graphics/pokemon/beartic/back.png | Bin 628 -> 526 bytes graphics/pokemon/bidoof/anim_frontf.png | Bin 852 -> 781 bytes graphics/pokemon/bidoof/backf.png | Bin 570 -> 487 bytes graphics/pokemon/breloom/back.png | Bin 811 -> 705 bytes graphics/pokemon/budew/back.png | Bin 580 -> 484 bytes graphics/pokemon/carvanha/back.png | Bin 716 -> 605 bytes graphics/pokemon/castform/rainy/icon.png | Bin 375 -> 296 bytes graphics/pokemon/castform/snowy/icon.png | Bin 395 -> 321 bytes graphics/pokemon/castform/sunny/icon.png | Bin 386 -> 312 bytes graphics/pokemon/celebi/back.png | Bin 732 -> 641 bytes graphics/pokemon/cherrim/sunshine/icon.png | Bin 405 -> 334 bytes graphics/pokemon/chespin/anim_front.png | Bin 923 -> 797 bytes graphics/pokemon/cinccino/back.png | Bin 686 -> 578 bytes graphics/pokemon/cinderace/back.png | Bin 761 -> 649 bytes graphics/pokemon/cinderace/front.png | Bin 840 -> 726 bytes graphics/pokemon/corsola/galarian/front.png | Bin 684 -> 582 bytes graphics/pokemon/cranidos/back.png | Bin 832 -> 731 bytes graphics/pokemon/cursola/front.png | Bin 970 -> 878 bytes graphics/pokemon/darmanitan/zen_mode/icon.png | Bin 414 -> 323 bytes graphics/pokemon/deerling/autumn/icon.png | Bin 498 -> 379 bytes graphics/pokemon/deerling/summer/icon.png | Bin 507 -> 378 bytes graphics/pokemon/deerling/winter/icon.png | Bin 503 -> 377 bytes graphics/pokemon/dewgong/back.png | Bin 568 -> 502 bytes graphics/pokemon/ditto/back.png | Bin 434 -> 360 bytes graphics/pokemon/dunsparce/back.png | Bin 664 -> 569 bytes graphics/pokemon/eevee/backf.png | Bin 696 -> 615 bytes graphics/pokemon/elekid/back.png | Bin 741 -> 652 bytes graphics/pokemon/espeon/back.png | Bin 677 -> 617 bytes graphics/pokemon/flabebe/back.png | Bin 642 -> 526 bytes graphics/pokemon/flabebe/blue_flower/icon.png | Bin 374 -> 301 bytes .../pokemon/flabebe/orange_flower/icon.png | Bin 374 -> 301 bytes .../pokemon/flabebe/white_flower/icon.png | Bin 375 -> 302 bytes .../pokemon/flabebe/yellow_flower/icon.png | Bin 377 -> 302 bytes graphics/pokemon/flareon/icon.png | Bin 496 -> 404 bytes graphics/pokemon/floette/blue_flower/icon.png | Bin 431 -> 352 bytes .../pokemon/floette/eternal_flower/back.png | Bin 783 -> 668 bytes .../pokemon/floette/eternal_flower/front.png | Bin 807 -> 710 bytes .../pokemon/floette/eternal_flower/icon.png | Bin 449 -> 376 bytes .../pokemon/floette/orange_flower/icon.png | Bin 431 -> 352 bytes .../pokemon/floette/white_flower/icon.png | Bin 429 -> 352 bytes .../pokemon/floette/yellow_flower/icon.png | Bin 436 -> 353 bytes graphics/pokemon/florges/back.png | Bin 768 -> 673 bytes graphics/pokemon/florges/blue_flower/icon.png | Bin 651 -> 480 bytes .../pokemon/florges/orange_flower/icon.png | Bin 648 -> 479 bytes .../pokemon/florges/white_flower/icon.png | Bin 619 -> 470 bytes .../pokemon/florges/yellow_flower/icon.png | Bin 650 -> 480 bytes graphics/pokemon/furfrou/dandy_trim/icon.png | Bin 598 -> 455 bytes .../pokemon/furfrou/debutante_trim/icon.png | Bin 594 -> 458 bytes .../pokemon/furfrou/diamond_trim/icon.png | Bin 624 -> 492 bytes graphics/pokemon/furfrou/heart_trim/icon.png | Bin 602 -> 477 bytes graphics/pokemon/furfrou/kabuki_trim/icon.png | Bin 573 -> 451 bytes .../pokemon/furfrou/la_reine_trim/icon.png | Bin 580 -> 444 bytes graphics/pokemon/furfrou/matron_trim/icon.png | Bin 581 -> 455 bytes .../pokemon/furfrou/pharaoh_trim/icon.png | Bin 579 -> 443 bytes graphics/pokemon/furfrou/star_trim/icon.png | Bin 639 -> 496 bytes graphics/pokemon/galvantula/back.png | Bin 575 -> 492 bytes graphics/pokemon/gastrodon/east_sea/icon.png | Bin 565 -> 403 bytes graphics/pokemon/geodude/back.png | Bin 652 -> 593 bytes graphics/pokemon/glaceon/back.png | Bin 647 -> 541 bytes graphics/pokemon/golett/back.png | Bin 933 -> 788 bytes graphics/pokemon/gourgeist/back.png | Bin 653 -> 536 bytes graphics/pokemon/gourgeist/large/back.png | Bin 673 -> 546 bytes graphics/pokemon/gourgeist/small/back.png | Bin 639 -> 522 bytes graphics/pokemon/gourgeist/super/back.png | Bin 681 -> 560 bytes graphics/pokemon/greninja/ash/icon.png | Bin 681 -> 491 bytes graphics/pokemon/gurdurr/back.png | Bin 683 -> 564 bytes graphics/pokemon/hippowdon/back.png | Bin 740 -> 663 bytes graphics/pokemon/hitmonchan/back.png | Bin 830 -> 713 bytes graphics/pokemon/hoopa/back.png | Bin 860 -> 718 bytes graphics/pokemon/hoopa/footprint.png | Bin 190 -> 102 bytes graphics/pokemon/hoopa/unbound/icon.png | Bin 623 -> 521 bytes graphics/pokemon/jellicent/backf.png | Bin 617 -> 521 bytes graphics/pokemon/jellicent/icon.png | Bin 489 -> 418 bytes graphics/pokemon/jellicent/iconf.png | Bin 499 -> 430 bytes graphics/pokemon/jigglypuff/back.png | Bin 518 -> 447 bytes graphics/pokemon/keldeo/resolute/back.png | Bin 857 -> 742 bytes graphics/pokemon/keldeo/resolute/icon.png | Bin 558 -> 482 bytes graphics/pokemon/kricketot/anim_frontf.png | Bin 1048 -> 976 bytes graphics/pokemon/kricketot/backf.png | Bin 625 -> 540 bytes graphics/pokemon/lapras/back.png | Bin 786 -> 682 bytes graphics/pokemon/larvitar/back.png | Bin 594 -> 527 bytes graphics/pokemon/lucario/back.png | Bin 906 -> 800 bytes graphics/pokemon/luxio/back.png | Bin 784 -> 707 bytes graphics/pokemon/luxray/back.png | Bin 890 -> 792 bytes graphics/pokemon/lycanroc/dusk/front.png | Bin 1001 -> 894 bytes graphics/pokemon/lycanroc/midnight/front.png | Bin 920 -> 841 bytes graphics/pokemon/magearna/back.png | Bin 782 -> 661 bytes graphics/pokemon/magearna/front.png | Bin 938 -> 828 bytes .../pokemon/magearna/original_color/back.png | Bin 797 -> 667 bytes .../pokemon/magearna/original_color/front.png | Bin 966 -> 834 bytes .../pokemon/magearna/original_color/icon.png | Bin 519 -> 444 bytes graphics/pokemon/marshtomp/back.png | Bin 748 -> 641 bytes graphics/pokemon/mimikyu/busted/back.png | Bin 505 -> 425 bytes graphics/pokemon/mimikyu/busted/front.png | Bin 554 -> 488 bytes graphics/pokemon/mimikyu/busted/icon.png | Bin 426 -> 327 bytes graphics/pokemon/minccino/back.png | Bin 601 -> 519 bytes graphics/pokemon/minior/core/back.png | Bin 493 -> 412 bytes graphics/pokemon/minior/core/blue/icon.png | Bin 447 -> 356 bytes graphics/pokemon/minior/core/front.png | Bin 532 -> 455 bytes graphics/pokemon/minior/core/green/icon.png | Bin 440 -> 355 bytes graphics/pokemon/minior/core/indigo/icon.png | Bin 443 -> 356 bytes graphics/pokemon/minior/core/orange/icon.png | Bin 443 -> 355 bytes graphics/pokemon/minior/core/violet/icon.png | Bin 442 -> 355 bytes graphics/pokemon/minior/core/yellow/icon.png | Bin 438 -> 355 bytes graphics/pokemon/minun/back.png | Bin 673 -> 574 bytes graphics/pokemon/mr_mime/back.png | Bin 868 -> 747 bytes graphics/pokemon/necrozma/dawn_wings/back.png | Bin 951 -> 847 bytes .../pokemon/necrozma/dawn_wings/front.png | Bin 1413 -> 1294 bytes graphics/pokemon/necrozma/dawn_wings/icon.png | Bin 709 -> 595 bytes graphics/pokemon/necrozma/dusk_mane/back.png | Bin 1187 -> 1033 bytes graphics/pokemon/necrozma/dusk_mane/front.png | Bin 1311 -> 1217 bytes graphics/pokemon/necrozma/dusk_mane/icon.png | Bin 559 -> 485 bytes graphics/pokemon/necrozma/ultra/back.png | Bin 863 -> 760 bytes graphics/pokemon/necrozma/ultra/front.png | Bin 1312 -> 1268 bytes graphics/pokemon/necrozma/ultra/icon.png | Bin 626 -> 561 bytes graphics/pokemon/nidoqueen/back.png | Bin 785 -> 698 bytes graphics/pokemon/nidorino/back.png | Bin 794 -> 740 bytes graphics/pokemon/ninetales/back.png | Bin 699 -> 628 bytes graphics/pokemon/oddish/back.png | Bin 656 -> 552 bytes graphics/pokemon/oricorio/pau/back.png | Bin 884 -> 761 bytes graphics/pokemon/oricorio/pau/front.png | Bin 828 -> 706 bytes graphics/pokemon/oricorio/pau/icon.png | Bin 452 -> 341 bytes graphics/pokemon/oricorio/pom_pom/back.png | Bin 836 -> 721 bytes graphics/pokemon/oricorio/pom_pom/front.png | Bin 733 -> 617 bytes graphics/pokemon/oricorio/pom_pom/icon.png | Bin 462 -> 361 bytes graphics/pokemon/oricorio/sensu/back.png | Bin 750 -> 667 bytes graphics/pokemon/oricorio/sensu/front.png | Bin 883 -> 784 bytes graphics/pokemon/oricorio/sensu/icon.png | Bin 481 -> 350 bytes graphics/pokemon/persian/back.png | Bin 731 -> 665 bytes graphics/pokemon/phanpy/back.png | Bin 525 -> 454 bytes graphics/pokemon/pichu/spiky_eared/icon.png | Bin 375 -> 312 bytes graphics/pokemon/pikachu/alola_cap/back.png | Bin 749 -> 633 bytes graphics/pokemon/pikachu/alola_cap/front.png | Bin 717 -> 624 bytes graphics/pokemon/pikachu/alola_cap/icon.png | Bin 499 -> 384 bytes graphics/pokemon/pikachu/belle/back.png | Bin 953 -> 837 bytes graphics/pokemon/pikachu/belle/front.png | Bin 900 -> 808 bytes graphics/pokemon/pikachu/belle/icon.png | Bin 586 -> 453 bytes graphics/pokemon/pikachu/cosplay/back.png | Bin 740 -> 634 bytes graphics/pokemon/pikachu/cosplay/front.png | Bin 708 -> 611 bytes graphics/pokemon/pikachu/cosplay/icon.png | Bin 444 -> 367 bytes graphics/pokemon/pikachu/hoenn_cap/back.png | Bin 742 -> 631 bytes graphics/pokemon/pikachu/hoenn_cap/front.png | Bin 723 -> 638 bytes graphics/pokemon/pikachu/hoenn_cap/icon.png | Bin 497 -> 383 bytes graphics/pokemon/pikachu/kalos_cap/back.png | Bin 750 -> 633 bytes graphics/pokemon/pikachu/kalos_cap/front.png | Bin 726 -> 632 bytes graphics/pokemon/pikachu/kalos_cap/icon.png | Bin 506 -> 388 bytes graphics/pokemon/pikachu/libre/back.png | Bin 837 -> 717 bytes graphics/pokemon/pikachu/libre/front.png | Bin 751 -> 657 bytes graphics/pokemon/pikachu/libre/icon.png | Bin 487 -> 380 bytes .../pokemon/pikachu/original_cap/back.png | Bin 760 -> 636 bytes .../pokemon/pikachu/original_cap/front.png | Bin 737 -> 635 bytes .../pokemon/pikachu/original_cap/icon.png | Bin 498 -> 385 bytes graphics/pokemon/pikachu/partner_cap/icon.png | Bin 507 -> 389 bytes graphics/pokemon/pikachu/ph_d/back.png | Bin 853 -> 747 bytes graphics/pokemon/pikachu/ph_d/front.png | Bin 846 -> 758 bytes graphics/pokemon/pikachu/ph_d/icon.png | Bin 498 -> 405 bytes graphics/pokemon/pikachu/pop_star/back.png | Bin 978 -> 841 bytes graphics/pokemon/pikachu/pop_star/front.png | Bin 831 -> 732 bytes graphics/pokemon/pikachu/pop_star/icon.png | Bin 524 -> 411 bytes graphics/pokemon/pikachu/rock_star/back.png | Bin 876 -> 764 bytes graphics/pokemon/pikachu/rock_star/front.png | Bin 803 -> 692 bytes graphics/pokemon/pikachu/rock_star/icon.png | Bin 499 -> 394 bytes graphics/pokemon/pikachu/sinnoh_cap/back.png | Bin 742 -> 631 bytes graphics/pokemon/pikachu/sinnoh_cap/front.png | Bin 723 -> 638 bytes graphics/pokemon/pikachu/sinnoh_cap/icon.png | Bin 498 -> 384 bytes graphics/pokemon/pikachu/unova_cap/back.png | Bin 760 -> 636 bytes graphics/pokemon/pikachu/unova_cap/front.png | Bin 737 -> 638 bytes graphics/pokemon/pikachu/unova_cap/icon.png | Bin 503 -> 384 bytes graphics/pokemon/pumpkaboo/back.png | Bin 591 -> 515 bytes graphics/pokemon/pumpkaboo/large/back.png | Bin 619 -> 547 bytes graphics/pokemon/pumpkaboo/small/back.png | Bin 591 -> 510 bytes graphics/pokemon/pumpkaboo/super/back.png | Bin 634 -> 562 bytes graphics/pokemon/pyroar/icon.png | Bin 555 -> 492 bytes graphics/pokemon/relicanth/back.png | Bin 745 -> 612 bytes graphics/pokemon/reshiram/back.png | Bin 747 -> 670 bytes graphics/pokemon/riolu/back.png | Bin 803 -> 713 bytes graphics/pokemon/sawsbuck/autumn/back.png | Bin 901 -> 801 bytes graphics/pokemon/sawsbuck/autumn/icon.png | Bin 498 -> 426 bytes graphics/pokemon/sawsbuck/summer/back.png | Bin 825 -> 716 bytes graphics/pokemon/sawsbuck/summer/icon.png | Bin 468 -> 389 bytes graphics/pokemon/sawsbuck/winter/icon.png | Bin 464 -> 390 bytes graphics/pokemon/sealeo/back.png | Bin 584 -> 486 bytes graphics/pokemon/shellos/east_sea/back.png | Bin 689 -> 577 bytes graphics/pokemon/shellos/east_sea/icon.png | Bin 518 -> 359 bytes graphics/pokemon/shinx/anim_frontf.png | Bin 981 -> 917 bytes graphics/pokemon/shinx/backf.png | Bin 728 -> 634 bytes graphics/pokemon/shuppet/back.png | Bin 576 -> 494 bytes graphics/pokemon/silvally/back.png | Bin 718 -> 640 bytes graphics/pokemon/silvally/front.png | Bin 957 -> 837 bytes graphics/pokemon/sirfetchd/front.png | Bin 1032 -> 907 bytes graphics/pokemon/snubbull/back.png | Bin 561 -> 477 bytes graphics/pokemon/spheal/back.png | Bin 473 -> 393 bytes graphics/pokemon/staravia/back.png | Bin 779 -> 689 bytes graphics/pokemon/swablu/back.png | Bin 711 -> 621 bytes graphics/pokemon/swalot/back.png | Bin 698 -> 589 bytes graphics/pokemon/togetic/back.png | Bin 618 -> 545 bytes graphics/pokemon/tornadus/therian/icon.png | Bin 647 -> 479 bytes graphics/pokemon/unfezant/backf.png | Bin 827 -> 725 bytes graphics/pokemon/unfezant/icon.png | Bin 466 -> 397 bytes .../pokemon/vivillon/continental/icon.png | Bin 562 -> 492 bytes graphics/pokemon/vivillon/elegant/icon.png | Bin 559 -> 482 bytes graphics/pokemon/vivillon/fancy/icon.png | Bin 583 -> 508 bytes graphics/pokemon/vivillon/garden/icon.png | Bin 552 -> 482 bytes graphics/pokemon/vivillon/jungle/icon.png | Bin 539 -> 470 bytes graphics/pokemon/vivillon/marine/icon.png | Bin 558 -> 494 bytes graphics/pokemon/vivillon/modern/icon.png | Bin 564 -> 492 bytes graphics/pokemon/vivillon/monsoon/icon.png | Bin 546 -> 493 bytes graphics/pokemon/vivillon/ocean/icon.png | Bin 582 -> 510 bytes graphics/pokemon/vivillon/poke_ball/icon.png | Bin 562 -> 496 bytes graphics/pokemon/vivillon/polar/icon.png | Bin 569 -> 493 bytes graphics/pokemon/vivillon/river/icon.png | Bin 549 -> 483 bytes graphics/pokemon/vivillon/sandstorm/icon.png | Bin 548 -> 478 bytes graphics/pokemon/vivillon/savanna/icon.png | Bin 563 -> 486 bytes graphics/pokemon/vivillon/sun/icon.png | Bin 557 -> 484 bytes graphics/pokemon/vivillon/tundra/icon.png | Bin 568 -> 491 bytes graphics/pokemon/whiscash/back.png | Bin 724 -> 609 bytes graphics/pokemon/wingull/back.png | Bin 647 -> 561 bytes graphics/pokemon/xerneas/back.png | Bin 838 -> 740 bytes graphics/pokemon/xerneas/front.png | Bin 910 -> 799 bytes graphics/pokemon/xerneas/icon.png | Bin 597 -> 435 bytes graphics/pokemon/zapdos/back.png | Bin 586 -> 497 bytes graphics/pokemon/zygarde/10_percent/icon.png | Bin 446 -> 381 bytes graphics/pokemon/zygarde/complete/icon.png | Bin 592 -> 537 bytes 450 files changed, 0 insertions(+), 0 deletions(-) diff --git a/graphics/battle_anims/sprites/new/teapot.png b/graphics/battle_anims/sprites/new/teapot.png index 6be0680dfce165621cf650c7b94fb1f8d456f83e..0e26606418919a0f8b49d83ce7792fedfdc2f2af 100644 GIT binary patch delta 690 zcmV;j0!{t#2Kfb$7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0007LNklvXS?Bns(SN}l3 z`p7>`)BFKJ{H*XkU=}}q0Kj?17~cmlAx3!DPbmbD0GV~)O*AbC^E^i;#PZC5m&t#q zPE$qX8ps)PjHQq#fE4#K7}RB27=Y0I4DbZ*k7m2@BL`@N5VH6y`^h{W@Rk1o5pj_T zSdbH_UHq^=pY&`Oexf3T&fp+o=aWEQH~+He+5FG;wV_gL<R#K(a`Pt6hRRs6gNAQF-HGmDUtvvP89|6@xI09OL-a#S6UjXR{ z*aL6}0uR_Tpt>`pLkS#U3TOW32s=PqU;v{DuK<4EXykZJOOY6AnG2R_%{GA$N>Uq_%raN+NaOtuKxzhVLaTn2E(;HS;_ZEK`s{Mv5_QuJuPH2?Jr-4m?8eIo_@ z!OsL}9@AJIz`y$C?Z61yrb26f$FCudBC+52r^R!1&@FpIeE_NBjT)02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00NasL_t(|ob8mqPuoBg$1hSO=unA+5E=;< zQY4{Y$~^xY4G zlY)n??Hlj=$@kv(y>kfpUw>5@x|9wq8{6pyhGFcd0z1Z5e>zYtK`KC2A(tk%%@ym! z{qmB$z>9~wdocXz#uv`Hb&cS#YB|HEuRWHxDl-jEive4O0yM`Rb+EGs$?H~s86#G! z3?cMS<@v!ToFpCc?Aj0&G}nWn@T zTgMK)2ulKJ@ml#v1Iw(l8ZKG_kpg=6oVV}vI81`X0RkfdgzAoS&Q%K;qlRlJGj^l_ zX~Fq@46JM(6LNN2x8{I{7+4lhs5>p6JOZI?;^CYRf0Dr4uR28x^fZ7WC4eF3fPPy6 zN7g>cOs3ay2-SqoJN>>&S;Y_;JMs)~7AV9369BV4tSAA{7|1eAxqzE~G7x}6H~K1s z1Qr9vc6XW9@zH=odofVQFJ*Cp#A8_kz!Yj#q%1zA%P5!yIR7vpF>ow^Tj8w=TWBJn z4M-Nif82k6Teju>w(7CL`O|wX100)W_$2heR)cKt_7i{>qShtA)G{gWBp!Svk9xt@ zfZPP-g9Jd_D<}-*6d1FG!3|xzO9JGT`wc(=O#!s%n^{11I-W!UjzHYdq8oF%=oEkZ z10=vHt;_>xfq+QU#8uPWpZ_x1JV*lopSPYdJRro(H-t>-+Oq~&@2IX;&V5cN*((ja opd;Z5#B^WMi5QrhCjZOz8+s?4P36)aUjP6A07*qoM6N<$f{LYJWB>pF diff --git a/graphics/battle_anims/sprites/omega_symbol.png b/graphics/battle_anims/sprites/omega_symbol.png index a821d5e40aa7b4fab4b28d545b787e47508920b9..150501367aa7aa0a870a2ad8ef72813e9bf7fdee 100644 GIT binary patch delta 198 zcmcc1G?8h71SbbG0|SH0lCEPDtL^IrN`m}?|D%DkikqeY)iijzIEGmCo(=LAYf#{r zvgiL?Z;8r=j@?;hpA~Bi*Z$=_qVcACV<*pU<4+y8I@Z|9JV|o;^YQIYO%;oVt1Od# zNOK+KlGJat*r1`$dT#x?A0OQ(+6x@5zG!12-^?Q#&APHt)2NNd{I$K}rI$zf3|SNs#-!Fbl2>1Eevp5;KtFnGH9xvX&pI=LyAp>Z+b}14xo^DiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}9o-U3d6?4`G+?70Fz>>n8)4-eb|E^Z(%lpy$t32NIO~fi8ynK^HBIgSIVm&0W8+MaVs=$-t@GmT{*|{&rgTe~DWM4fdN5@o diff --git a/graphics/battle_interface/alpha_indicator.png b/graphics/battle_interface/alpha_indicator.png index 0e302576b6aced8d385e93eee3a2919ea2e4d1c3..66f37f1d3353444663abadfb73b5801d24158d07 100644 GIT binary patch delta 123 zcmeBTI?gyjf|G-pfq_9omp^!7wSBrkNswRge>8Abanlr_8Z%E9#}J9BXM1+?G8k|$ zf86~4jG^cfPgxc5a<_HAo-uq%;{0Hc>VDQgONIa7ge~beceo|*_{}W$n<01Ro?d03 O2@IaDelF{r5}E*SM>cc- delta 190 zcmX@k*u^wKBAJDmfq~)e-A6${ioL|s*OmP#hZLid(zlr#BY;BUC9V-A!TD(=<%vb9 z4DLQI0e diff --git a/graphics/battle_interface/omega_indicator.png b/graphics/battle_interface/omega_indicator.png index c56d51c151e6c578e4a8935a7cf6bd4efaceb009..f321fc8263fd4ba43bac4e7039a1a86731282272 100644 GIT binary patch delta 122 zcmeBYI>tCbf|G-pfq_9omp^!7wSAgENswRge>8Abanlr_8dFaf#}J9BXV2^uWH8`h zcKq@sezPk}NkZy&;u#y~cMSA(WJkYY)9^mSxl*x1kgCy{lc zqJ1c1lDE6d|E27ojsj(kJzX3_D&{07ED#e2YP-;*<;0fIHnCg5<%Ea8DT5FZAvWVV nBCR0@c*K&E**naVlMPrIIx?8=Ez0_J8f1y5tDnm{r-UW|^XEH` diff --git a/graphics/battle_interface/z_move_trigger.png b/graphics/battle_interface/z_move_trigger.png index 5e27dbabbe83560938b5871700ea63f0a8158dd5..d719494d9f0a64b59552862bed58adfc2c8056b5 100644 GIT binary patch delta 200 zcmcc5G?{6F1SbbG0|SH0lCEPDtL^IrN`m}?|D%DkikqeY)iim!IEGmCzMbeT)S$rQ zymG7S`})MoUGaxlW$w4R-s4f3QgoPgilN@=MOJ1L{1Y;^)MUKb=^^z*b*A?uw$o2r z?l!emZQ8VHV`J7@#Sf+lGnO8DUUWpPZPrDxvZoDOW-#|mcy97X?9=phdv+g+{u_08 t!n=v?d`>T0qVH93>9K6Oe4hOVgMcm5g-01Jw}H-K@O1TaS?83{1OOTIVoLx3 delta 276 zcmbQtbf0O0L^2CA0|P^2NcwRg#a`m+>&pI&U5Hni<4No1X< zXkX8mn z?p*j<-p0i=C(uQ_CnVqq%Z8-bGZsb%BM$9yYv1_HwX?H*WBrrT+P*7sKC8D(6FzRj zbFy{O?2Bs_HTg7tc2tz<-C+>@;$K+wt3w6_>YDM+4-6jMD9vF}tFL-8jjQ#QcXx$t z@xlTL8=l;2W^P}1Hy=vjS2@|@Bs7^lA~SpG$JXHHIWmGtahJsYlz16NyjoLvC&oU3 zr|X~ZPxHjRbLFI*-tronHKl7D<-Nu7O)iIlhkyUWbnT8WmiAk!|LotlLrznb{Y6GQ SM;91LFgb7-Iwj0001`EabER000McNliru;{yc%9V2mZQ~&?~02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L009R{L_t(|ob8Z7YQsPbMdg$pKrx z;BmRtpquijg7Z>ISn@~|pKlgWU?J-Ah|B3WI7o8QXRY?>e`I|G*SSipKvLxEN+MV% zLb*;wVE~}xR{8?I%x4;6X{DPB=&Y3}SiK~hqXq@6k~wp}R3Lc~4ftw6b5t)U#qiAl zcu`5zloIuoX8UmvLQd#pHUPXvBt&+4K{81Y*Bws%LiH41068*(@?KwV<`%+TP#Klw z;x!CyfbM{gD?$7QfD7<&)B_USDGJR-@WXcIf3Us*&D28&%TK_W00000NkvXXu0mjf DZ04v0 diff --git a/graphics/berries/charti.png b/graphics/berries/charti.png index 9f119ebac0e9d1d9883bf3b3a92d57e18c57fe3f..399cd626efa83c80a69c4de5143c382c0f866630 100644 GIT binary patch delta 290 zcmZ3-{Dx_Q1SbbG0|P_C9nP&2tL^IrN`m}?|D%DkikqeY)!g=UaSZY3d^`Cp-(dre zW^RiwfA3fPS(01UD6@R!wI#8C66dHL|M=?a`>q4OOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L007cSL_t(|ob8b@4#F@DMGN8pAXUs@gvRi*(%3C42oPbHs_jSEl?&~hUninYtJTnvsvo-(#002ovPDHLkV1gZ0 BiW2|; diff --git a/graphics/berries/chilan.png b/graphics/berries/chilan.png index 8f717bb82cfe103413e8dd976fca23cf26519e51..286ed5c3fae40a05c224dbd6b632c57120a6330b 100644 GIT binary patch delta 291 zcmcc0{FZ5g1SbbG0|P_C9nP&2tL^IrN`m}?|D%DkikqeY)!gxPaSZY3e0%vKU$X)a zYrvMR4gdcioE9YLqw!&z&bQRaBL3|;ukM)tH!O@lb9~1X`$rqEZJ1TQx^lZXgA0p^ zZbQ?VDK{+mEp*M~?zIJ+40y7Gr>ntn-uC>~SVk7j%N(nl{Oj94>-KQj&HcbLb;9g& z?G$OAwGzxi5Aq-M&h_xC3ze{TJeTPz@t$Q@S6IvQTVfNs!oKJSYDpcuU)AtVWYYS) zzHjHJxK{3J{r*3@Dk$Q$9>c1#^DbJu9*D(x8ok`i|KsVJP6_D^0m1XsjvVx!&XHi+ jT(h(!?bH1~zhbu3^C~~(-}6fd=u-wyS3j3^P6OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L008+(L_t(|oaK?RN(3sc6XU#MGkA)TSJIkny;bN+;LGj}IQ>TpbM zyHIhuqbMQPqm<>+{GRo<#gsZP`t6e48R*2Cy6u>0T-F|=whJ3R{!mps(rxhZSyxQU z&S|zr2L@$l&!#Wy1b-OXk1 z|1CbUDSTl{!Gk%$8XMlFS_tis&s%fgm)UoNsKd6F9})|~?c#bC%|Cg%{lf#vPlwOn c|LHp~rkZ!_=BX=Gfx*V$>FVdQ&MBb@0F`5)rT_o{ delta 424 zcmV;Z0ayN(1M&lq7-Iwj0001`EabER000McNliru;{ya19VgZcD82vy02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L009G0;G_d zUgf|c04UIbu7B#)Hd8w3ugW-JO=yYZh{&pN3)!b4X1Z~Uw3Spuwu*(&N)*W>WvrPIKt8? zp!1M_qK4qzBbR-TfBPTxYr9hHmE|4>V+~Z>F2p`La72kmW0UB@14?1ddlcPlURaB^ j?9X=dd-p)tUR2+76H7yhvf?_Rvl%>H{an^LB{Ts5IAw8E delta 327 zcmdnZG>LhFL^2CA0|UcSohMs>6nlxMuPggwW)?9W-qUZN-2w`Um$*ih1m~xflqVLY zGPwJ=1o*itl%*Ca80(o7wk~-HRKihG;O7pMF$S_3yc#s+ffP%+qpu?a!^VE@KZ&dp z747R8lf2zs{x4_W6marJ&aA90>AqY zm^RIyXP#mAIc0uw>MXzdbstNomGU`W(Gd}Szi@@giPm?Mql({aH)m|#uk5){ zX?5L&9xt&2+FmEu=JPMPlI)q6_dDUM+sg_zw#~|s3bGe=1?u0ePRw|+3N)kb;3><8I2^{rP6^s8Uo-f(Q WU8H6hlB~TBowWK`+Y z;IgEFD=Ila&@oi}@#F`yelaZg%w4cPGooZu*84w4IXhO>YuEoc%;LcObnPC~C-y`sA70<;_Ez{W z-`dU3w>0`x7)$)S6}L)FmEl`EOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L007rXL_t(|ob8dpbps&`MA>x;u$L`h0T*C2 z2pN>M-P3;g+?N}NP2;91CN6h8P&v<` z^qP&f9gj}sT)XFQ%+&6)-cH!kq?RwWddSem5)9dO=%5q zw3NtYDB~1y%24)xpjXggSaw)w2}4O-Pe53aYJg$JCs)p6lKM8>b`_UA^?qt`_|NUn z;r=yMPYY*-vY6`}53+f}DX1E|q%&eaztL>gTe~DWM4f(>aO^ delta 392 zcmV;30eAlO0@4GJ7-Iwj0001`EabER000McNliru;{yc%7Yn{C6mS3l02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L008z$L_t(|oaK^1YQr!TL=8?4;HDRd+XJ-7 z?mFSm&pKdzye-6tT%f2oNRHjF5GeXmpxe?}crlL|NqCy(pQ#O}JN~gA81MMbz1C`2 zymOV7If@7s{%Vf#Q%M0NUd}0UF#f~*b%_bs2y4@|%0ya`f158;ezg4PcVM_$K_!ws z9-RCIi5v{@AuMhm0&h!j?4Iq3(_sZ3 z=gb<0|NjqfEz{yc-9 zu~~CE>#`)-&sWs0e{C^ue(CsaMdcy+IZ_7i{vU1b*Jtee%e>~(!haqSPs{Ir5S}Ad iv&W=ZD(`Qkzepp;Y%d?aW^JHH89ZJ6T-G@yGywqZZ;FWk delta 385 zcmV-{0e=4M0?PxC7-Iwj0001`EabER000McNliru;{yc%6Etig{7C=+02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L008evL_t(|oYjyqZo@DPMTx>mPtXf=$r^yM zW&>nAXAq4ZpdvIDU5Z{n@YuDt4c&N%Bx~pxjqmyCLk4*C^Zn5fzd!#iUK{-Bvmu^a zHyvuxon-*{s=2Co#Cm(wAjotq`95hN5w1i`fu|t86#H5If4HoaBBpm%6NE*e%Hyo+ zPd*pM-E8wLxtNqNF2NXl$!~#%%N^g@B;A4(hWi3>U5H8YZKk+9+}UF?-dSKA-%>UK z;K`nbh-NdszJluVXYWdYHk7dx*Z(d)1#*3sH$S`NtX_TQLt6OF9l8Dg9M2Tw&r`am#1J~Mqd@XPrczp5(t%^C z|12twvZYptPh=FC-Y{pg5|DhDmmm7jte85LPd4G-;2tzopr0IPeFO#lD@ delta 426 zcmV;b0agBv1M~xs7-Iwj0001`EabER000McNliru;{ya1BM>ihmdpSE02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L009_DL_t(|oaNH7YQr!P24EZ0rBj3H3urJ- zr-X}_PK9F9Jw6N`JqWtj)U$`m>6oF!Yl9&uZ{WUM&kiZ*q&`5YMt%HuC;L3_pB#PT zzQ4|vZtwwCxN$;?sQZNtbYGkXv?Rd%wIawI(5gx!J}|h#fBbE)DzpZ;#k>)%LPYkS zgrJODikR*F5u$R8m=6sIwox}mz=RcM_57pUzhq!E2>`JcvW(RuEKEqT-pOvRzy$h+ z=~F|s^u`1a0M^?`mhT5xa=6#g^X{$(;E?F1lNN*|`cukSGYANZW7G)_{<#*7#b9g# zg%&o1Q{*THJT~rBiz25l;J-aQ%K&`yrU)cGYjKGHZ}AhcDqY0A+q2m(JO78zH-Y?I U_n5kgH2?qr07*qoM6N<$g1XbRApigX diff --git a/graphics/berries/kee.png b/graphics/berries/kee.png index 1c83b65b1943a2fc373ad1b59dd70662352c3394..37e1dc087c015edc35962a71b10bab437738bf75 100644 GIT binary patch delta 406 zcmV;H0crlt1m6RY7zqdi0001B+zGXjdp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0003_Nkl{YyEf~)HMl?B47vfBa6&G5ghQo&dAbo#O zQVkp6@+J|uOG-(J_-)09kn?UhedQG6lE35CSn<2@c0mUC!uWU*sD`Ix)O5HCPFEQZ zNfGO_Vf<0#`%*}NnKAIJm_Q{ar!^aIq8Tjkfq_W@*|F@PGd#i8bwoG_=flXl%moHR zE1XY(7O555g3c6g!bzW}fNiF&M0S5F(6PX7sMrgMH$7Gu1T#J$x**ebaRKgedO`&3N%_SV&8r4Z-&O(j>hN z{(B&0jdoM{0E_nqy~MOi!`X28>Ts6KKcDgjO|28Fq*!t&00000NkvXXu0jG}g2@ZU As{jB1 delta 516 zcmV+f0{i{n1I+}G7-Iwj0001`EabER000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00D7HL_t(|oYj&sZi6rshMfp@Ks`Wh#!QJv z77~#g;3Pc&Mm<1y^aOS<(3H-dGA1LJ>w9hsCdvWYCt0%o&)>5#X6%2~T!{PmqVMC# zO~s=RFz>HRN7AJ)^cNwd@5Oo4H2~-6%y<_4nv?EZ#N`?plt|984aBbya2RL@xcLC;z!g!Ad|nn z4o24}?9x&%e>AQGXzKQ4fD{5*HiDK8)ljd>H^SPT)_j9PW;ej1Xp~x~!{+QX08r&j z498_pUDr8a41sh2s->$!&>mIpgJAD^HDHb_{;cfXXL;ZShORi6-y@Uf*6yfY7_Rl@>{6nlxMuPggg7C|N{8G{Q)0)ax}C9V-A!TD(=<%vb9 z4DLQI0e%sbNXzXnee9fdrA2;Mzg<>_ulK?{@EZ_Xm_#a;)l#wwI1`U^VgL=>|oKGo5kMD z(3n*_iOu$dfdhAl($gTe~DWM4f DUd?p@ diff --git a/graphics/berries/occa.png b/graphics/berries/occa.png index 1ad829e5f1a65fc9cdc66a0c61f044cb2e0834d2..1d2af365f926b6a656173da503485ca0134dcf3a 100644 GIT binary patch delta 270 zcmdnQe3NN{1SbbG0|P_C9nP&2tL^IrN`m}?|D%DkikqeY)tvBjaSZY3e0%9MUyA|{ zYd}__#{d6^FS9Eg^I6?}^J1^W`K79pF0G6Gzjn>l_`b(KT=tkUDD)cWFLjyI-NCTK zm$Sl%@6g)Q%I9SQpDp^Vu`mCGDx;El!N-i|Kna2PKzAkEwyO7zwQCnQiqDV}muEfp z=h@R6AB-m)6!`YDQj(P?c8~ChUt72STt3_M15^2Xe-~wgusmkY4}H(9`}f2K)cVPr zHb}nKe!l+Z(V6p@<{PcOUH&fq?Nb5%iu}Sy9o|a&4=8_PdVg!{HF4F=oNHrL<^%&h O#o+1c=d#Wzp$PzMMuCO^ delta 359 zcmV-t0hs>T0OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L007oWL_t(|ob8b@4#F@DMLpyKmKfX>2`-QU zbt_VkU}Nb?Ixt)6V8*BmzAX-AAPy5Vf2s7IzQ3XZ{PRmfN`rm2d(ST!=K;36(Q{Sd zO&T2sFNrq4~~j+Y74T&9%XI|_ZWL(YJ@CPR6-iuc_q3ZZZV4!L9;A}$u2db zELfpKuEfz$v;|f#48`7Tu0=rVw7gt1VJ+CW6%=VxZ4<8rn{Wa<&4t&O;3$YFs5b2c z7ygpfr6Pn2cLg{jy}A1vp>S$B1YWV{0O>m}<~#o9BTr}IQ=dSJ$(R5D002ovPDHLk FV1iVPhvxtQ diff --git a/graphics/berries/passho.png b/graphics/berries/passho.png index c5414754505f3307821ecdc3ecae7fd633ab60cd..156dc18d18253e28f0fd1c219dc9466ebd5f1f8b 100644 GIT binary patch delta 370 zcmV-&0ge8j1iS-~7zqdi0001B+zGXjdp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0003iNklUL(7nLe??k0GcN{9P?F};xL740V z+y&@Qg&YO>W(wE}MS`scL%H?teQnW&7}0&2<$Imhn$Q%$l|un4G;g~LVl8!{*4W6I zdF+Uo0k|-XyP&A8Dg6kVwZDW^Z$e%+)VmmBFERL(YQzJ)$g6PcM#J_GtM6&-_{3Oo zV}5qe(=SV|_@3Q!o=2bS)u}n}-~Ty(wPZ^TuIUq1C;pL;{-O{)&3AqwpW+Y@$*+#X QOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00BcuL_t(|obAy)Pr^VL2k?RkGRh*lUdhGL zP-7%)<|KXqS)53kU>g=(JV#yNxlPlgxqp~l_y!GM&bx!O$BUbTga7gQ<$1X_2>uh) z84C~9Sw{%LF8Axg=9b;i&YZj9gM$$7ThJLUhYnazZ#9U=f92O2F7UPs_mN=cGWFrX zl`x|Q=vwG~`YVK4K2Vv3)LU}oZWXC*>E|BQ*N;e$v9LhmLC0Ohp`$)9F6+%Yj|7hm zAWorYC8(HZjO%WwFiSxdAWn3b7g?ABYE0xoikPp8$N)Vh73g?^{CZVn%7A>K@|)C7 zC+3#L3S?j|XOjwGX5?xC?clhCbL4~ywiAq|4)rfIQNBI00000 LNkvXXu0mjf!2ry- diff --git a/graphics/berries/rindo.png b/graphics/berries/rindo.png index 91e895d04311e573be0436d3a2b2a91fc07b1b2d..74107789382335a7c622ac38ecf16b243454728b 100644 GIT binary patch delta 282 zcmdnN{Df(O1SbbG0|P_C9nP&2tL^IrN`m}?|D%DkikqeY)m-*;aSZY3d^=?)-w_2K zmxIR+{ICCbOQum|!orBm@KYiy|9mi9Z1Mfoc~zxfyo~G4TXwfNuzxjlvy}9>Z?8D# ztbU;QM>QUW*H1cUaw?tLcjVxa2>$0aYuh>f7jnGbc6y=={07plTv2hP9k(j%-ZIh7&EdeRaH$-Mp-zO%EdLf1ZDE^x15TCsHg&Pxny zRxO|4tDRIeHNE2QqTe=*(ebm+raskfjSjD|U$*@8BzE!Lv3EZ+U%y?zzVlFh=K8ug ac^^$y=LC_-kAePU@N{MKb6Mw<&;$Vdwt@%% delta 365 zcmV-z0h0dY0=NT^7-Iwj0001`EabER000McNliru;{ya16b!3%YPSFY02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L007)cL_t(|oaK^14uUWcMW+V#P%l6SFJR#S zMn>J@g2W5x2~4fF9VG_@ZbK&p5)7|LizjvGJ6@8U z?rolD02Jx9tlS!Gh)R(LNXXP8vIoHGy&QogfC7R3`5iE|e*zD7n4Rum;EHT59!w(2 znW2CzGYU?o6c4&0+GTb>PCp1U!#TR@Gc&rnhCl zb9Y9k_yD3jnvWeTXm}aNj83&L)kTKKY-4m(L(+I_ZFbC^bpxTwlm=*P7ZhmNJ`uGtv_1**Yj4D z)Ykh%D}`9OPn6Q&P#gcNAJ;&yEsOen-{oBGzV+VP7_Id%=vB}4suloR9{{cmTs?mx zdVs)hh=RY;7gTS9CgEa!X;1+)HZev7{Lb{IDv;!e20uu5x(yYP3dSf8>1SD8)( z&_ww1FnKl%gSQ^*@bzsl0Ol{f8Na6M(<-xp$7EBlC-MZKI_99>Y! delta 503 zcmVOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00Cr4L_t(|oZXPIQo=wKMRx|l89LA(U{`yG zO=xJ4ywKQCY-ns4g%qZ-!@vg!+R!;Kq_8x^!Wj`H@dq-)N10G--@uQh?G+ zGw>qU+aXG!60gw<&6=U>;?kD_#RPOVw&P*s%k_nNl_||<+mB!1$l#t*4$Y~*3Y;y< zSJi7&flj#Mf59aD7|Wo_72u`<)}$9cNuXWjf>Q=yz4nN_W1BU!I0bOyo2j3oT-Rz$ z0cfmSGAL4YkOT}cL|+C4rfQTay3irz$G~Va4nxpW4G9o+t{R%&OZ%kM6)Y}*E;*2h tYY*o4Aolw?J}HV}&OJ#>?)XvbAI@fV3sjPSV*mgE2>?k&PDHLkV1m2+*dPD^ diff --git a/graphics/berries/rowap.png b/graphics/berries/rowap.png index bbeee3f3b4608f8daae62c16537a0c0da84bbb7b..decb5a2a99884fad677ac9b53c0717681f42260b 100644 GIT binary patch delta 397 zcmV;80doGe1lI$Q7zqdi0001B+zGXjdp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0003-Nkl~fQqG{fpGR|ld`kPMvVt? zMY+udf?n8eiVUWj+K!|Pq?;_5b1ZqZMfnbpfvDDDhQ!o(?>$Sk7z=8U<894y^5LFg zAYg&VfCp>7NOF0T^5|W?8uG_@;Jx=tAHla12xj;f^n`aq?BBu13*M&Nl;Z`iadOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00CJ^L_t(|oXya^PQx$|2XG?=DM$=tgeIFL$NY3b@ zKR+4Y^uy)&Y5=Y$12FJF-2Nv_0N^kUAbK7tN%~%d>sD?Ue-cZi!_D`q0ZC-kC^1B& zT>auq1U4-&x=Rc{S*rTFbD-lAwE~cqa8^T>uboU$gEWSVH4wh%Sxl(85wXmh*6S>b z3*@{kNZMrs@Zi!yTT0847RCd)*`~z6LMR&utmYPm3Pgz{BMKl&nTZgWgx| z$?U$0{LkH2<1W?I?Mf9$v+FXSbwNV{aG38#){*+{^~MKPG1yvmW0HZ>^Ge z#+rFhq-Ca#jlMwm&LiUMYEq9!uzqXZB{qX;>woR{T=V&!);dm|To%6L`0i^m_2xEp trZxYP0$Sedn>6#QHm;s@X#O9C{1{J8W&SDWQ-D5T@O1TaS?83{1OSjea>oDw delta 337 zcmV-X0j~bW0-OVo7-Iwj0001`EabER000McNliru;{ya1C<&OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L006*AL_t(|oaKIGLbyf?K+WTeBV()@ATUJSDnA~+IBAE+`OD$!@BM(>&55^%uD73 zX9O){n}0pIu1g@)#rf0Exs!fqe&YIiLU}jihs{5>^Kwkh+EiS>uZCN3Ry>E=@p6WY z32YgMSQdKGJAmV11}~Aj(O@VY2syU74KMu5vc4ow&9x&8ONW z-y>Q)G o!G}L09a{F6{y$XrdU+L7_jc|{CiRNez%XR+boFyt=akR{07e3uRR910 delta 432 zcmV;h0Z;y;1NsAy7-Iwj0001`EabER000McNliru;{ya1G85&a02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00ACJL_t(|oZZkdZo@DP1yBkIP_$F!7|0wg zo&)IufvFpazCkkwUL0r2*0sn|C>JQ2Q-_R@t$AC2+rSXt98Y~X1zytX_jcKp+**$fu()J5Gu(M9ic@2JckwEGo0XB zjY(F3upXh-DRks4uNOv4oVB6{@JI|IK#1b3^)5c0JJa5rB@?g?@d3$(VYy#O20$Rr z|IlFyJYuj2LIU-4JYogeNQ*3dhfM~eHS^CMG61P3*u3Weu;#uTE=vF@<*5h&&8gh~ a!}SBNT4B=s&!1EP0000cE*d3E55u4-}tg`?{~dTz8gHIFT170u&~p_SA=QD z8yAKL*H&=qJSo#sbKN8p(IZi&Ze$b?3 zkf?MmR&3{#3uaFH@9OSkaJ>A^{L!oXtasKMA9_D=O|xict>>hPRi`)Q)$DS!x_tBF vjsuRfT(|K5Z#!qY>+7kzQdJ`Ie<#Q7uH~rK^jvlq=xGK|S3j3^P6OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L008YtL_t(|ob8e^Qp7L}MLhvrW0sk1gM9%K z`2vf@4U*ooMbd9!?Fqo#Ah|7$Q(0?L3M_ZcC6ydBa~Yb*J(mnj1jdQa*hxc11oTaC47P@HOz` dfBA>?4b}8W5gnWA)Vu%y002ovPDHLkV1gDrnZp18 diff --git a/graphics/berries/yache.png b/graphics/berries/yache.png index 3f397827701679cf57db19244f171ec6afdcb507..43ebf0768281b97f3da8d52e8722bda3607e1266 100644 GIT binary patch delta 356 zcmV-q0h|7U1g-;+7zqdi0001B+zGXjdp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0003UNkl{hYNT`G8 C{jW*@ delta 440 zcmV;p0Z0C>1A+vQ7-Iwj0001`EabER000McNliru;{ya18WC3TE8qYC02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00AaRL_t(|oaN9#O2t472H>Ge*Op$O1{B}U zN8bTl^a2V&T>2J|x^*)ru#E1DX50xvC*I(BIg^4g)Ak)e%%<>vB$L#be^$p=hhS~$ z15h@X%dnY2wyTUeS~qo(=I5>Jwx%d+8J6TuYb#JTO`3ZSf3CYPicKBum6LmBsSc#& zBx-o@gID-~(<07u;^6lqK(bRN^WVQm!0Q-R0$&PGh&M6F!-4n215Ti2CLid{S&LZ3 zKZ6G%ViK@1BR^owzV1SbbG0|SHMLoVBi)%NuQB|(0{|Ixr%#Z6OyYBD`t978lF?hT0MJD|W( zZ1k@Fso_DTBWG)8m>&6*aqGyTwxkDV8y?Dq ze+h7&HWt|$EB4~x?5pB)xgMIe7#&=j$gw9e;~sNSK+c)X=cNNaU2n+U!Lai<_ltkt S!XZFg89ZJ6T-G@yGywpM=u>3? delta 261 zcmeyxc!6nxL^2CA0|Ubs!RIzWioL|s*OmP#3mdZ>w{&u2Gf+sp#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8mgWiLOx74>Jrb!k=_1>rp24?QwLQh{Z5>7=yz*&*^xI{B{6fD zHlOckuxOb&bG1VV-%g>C~X*ci-LsIn&eC&t;uc GLK6VH31OcA diff --git a/graphics/items/icons/ability_capsule.png b/graphics/items/icons/ability_capsule.png index 4cb366137fb5c1c6e016792d615d891835589d6c..49a70ffa56c3c5e85712427e041cd301abdcc8c6 100755 GIT binary patch delta 179 zcmcc1^pA0Z1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J&eux;TbtOguXwn(u%D z2aBs?cJ1B&+m1SPo7p-%FILxKeEyGHCud_glh8~i`DCFFCuUyN72=jYDU#Ar9Tc^@ z;~a-lkAT<8C-)b9)$|IyIB&=530mxXGuJpxw_dST+gScEU!uIKLeZZ4|9(#TU&we( XlBIU~B;%Jrn;AS^{an^LB{Ts5T*^>- delta 274 zcmeyzc$aB{L^2CA0|SFlq{3++#a`m+>&pI^m5EVTGj_YqVW5zBiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyaf4o-U3d6?2jk78oUnurM-mM0CZUuCigNQTn+#mXH1iG90$N!oqO$z1kyt TmIYgY4q)(f^>bP0l+XkKmI+>R diff --git a/graphics/items/icons/ability_patch.png b/graphics/items/icons/ability_patch.png index acbef74623f7ea65a994931b036e3f79009be211..8f14ab7eeee8d2b392bb5b876846e2a49b44dd9f 100644 GIT binary patch delta 168 zcmdnN^qFyj1SbbG0|UeLm1j>)thTQgC<*cl{*MOEDsGwrRFmZC;uxYa@os;hP=f-8 z%WW5tDSQ6sI@e!%#q>4p$4&Fo2e$p?Sm6JB+GfVm4OS+`N8TKHm=?_Aeo1T6<}0Tc zRHXZ_(po2Wcx}s!N#dJ4=1ec#C~zWp;a9VUnamd-Kl$#y?=YuGt|-$7{Zgq7K&pI=Nsxnw^RUxXX`qmJiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y}r`$=ls!LIqbJ4^TG7)5S5QVoq|x0%?I10TGdwO_If|=jT`|YcM?gvsdEc#j0lt zE$aKj*S&hubFMj|@5_Df(A8<@W-w1nI&)tp?&d{H(M5ha>o*=hqZz;~dGwNxOk$g{ f0hg2SGFb+OmuDpUkG-Af404U9tDnm{r-UW|#a2*M diff --git a/graphics/items/icons/absorb_bulb.png b/graphics/items/icons/absorb_bulb.png index d958ab368400806acaa18f633728fb51d7cb556b..a63f7a8bcc4a57df0b9ecc18498672109bbb684c 100755 GIT binary patch delta 196 zcmaFM)Xy|Qf|G-pfq~)r%Cn~?R@>JLlmz(&GyF#d2LigCfokeJT^vI+CN7=W%XL_R zr=@!O{Gb2)_sm##W{V)3wc`^zeYYZ+{~R}dOqu4Oc}p;YUtx&}OO{EcPz9S)-|YXt z8oU<7ZxCx%-yp0bxFT!M#EBMR0&vUz1?vrf(T5@j| pTs@Q1qGEqt>kjFM$NmTAzq-w|_fW%*PM}j5JYD@<);T3K0RX{UTGapm delta 290 zcmeBYddoCHBAJDmfq_9NQsFd^VlVOZb!C6d%ET+r+Rggb6euKK;u=vBoS#-wo>-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+Tbkr;B4q#hm1X1N;)K6D*wCJcRtzI5dwb zsPt`^v{5N%&t7czH7@kFf&%z^5Ul9r_8ym`d& zbcdGYZU@UGJv~P~Jw1Wco=m-UdU}}wmv3D%3A%g9Xu&qGC5(>BXDk;93N{u@H_FOT i_~{oQIDPv@MusmR#f5Afi#7or#Ng@b=d#Wzp$PyZw_j%f diff --git a/graphics/items/icons/air_balloon.png b/graphics/items/icons/air_balloon.png index 6ed3a9ad214d26512c6cdac550934aa244e69a89..dbcff6d13bad5c6b20af3c7947465d1bd0e2cdc3 100755 GIT binary patch delta 173 zcmcc4^n-DN1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J$H^x;TbtOl<9Q&pI^m5Eo*JnCfc7od=MiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyag3o-U3d6?2jk9GIJ$m^ijgnxxosJmb-l zB{^J=S6DDET`(s>Rl$Joz%j$1prE$mp57_Ff-(XPMG=lUGcK+<>ENezhIOGsC&P~F zLuUkX+7wh(__8%N$unKBSXjUqX3#QQu3@E^Tw;o*5&O{^1qKFI0bzE5@Yat&s~J39 L{an^LB{Ts592iyp diff --git a/graphics/items/icons/armor_fossil.png b/graphics/items/icons/armor_fossil.png index a24d2ec4da2ea92769d904e4094a51fdb2bb7184..7647f9db555bf089b299e48011b468231053156b 100755 GIT binary patch delta 287 zcmX@f{E}&c1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J&H{ba4#PnAke$b|14L zhqHH+;gkRN6~2?Uy^7mXCy`lW#CFI=?*Hj+bsvwHFx;PcbHZCgw!cTM5`7wqnwKoU zee!|M`E5%%-286u6FzZcTSLGnrWd@W41ZZGlJvOv_cLtXWVWh)f=xko!wWxY&5%>K zVk3LsC@8Xau87{_Sp7nAQ-6#@@3zy6j(hxIZRAWXwU%9?a!=o&ERZ)~zopr0H<+@p8x;= delta 383 zcmV-_0f7GL0?7lA7-Iwj0000ISs=>*000McNliru;{^f@9w$eBosa+k02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L0004WQchCv2MaZ z3eG7$G!tqzaJiFodV%9HFXeJ^7Pm$-f=v zUvbWVdiJa|cOSi{f|=~oka4dU34>W~XWpVL1R|KN>#*)}e=JLlmz(&GyF#d2LigCfol3aT^vI+Ca%5cE!1Mb z!4e=XaqxG1#e(Dffy+;|zL}KHuCwgrTc(0~{VaykKTJw#vsi1=dKNrevy=OdYmB7V zO~#4o`U|!=T-kYRicEuQ(*lujo(!uDsp%A-|XZHTQ`*EV=DokNyGO#^CAd=d#Wz Gp$Pznv0-Qc delta 316 zcmZ3$)XqFXBAJDmfq_9NQsFd^VlVOZb!C6d%ET)tB`-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+X|APZ!6KiaEXKt@#ca@GxBX!e+{y+B@-3 zm(0oHQ13H3Z+K)HI3~{3JIU#l?>)t3DKqoDKTrIVmj2_**k9Rf+t9?N>r#-Zz2^JB zva>g=lG&@~6(^?Tx9-qY*gkz>g7}Gr9P-)`e$kexCGRJi>Q!Ve-?+uJa9)pbf85lC z9d80Z?K-QNbgPk7kxgm&>D7sRjqkqRzM!gWzEo;WUhGr*$INBZRD3OFvho0(%HZkh K=d#Wzp$Py@@NtI# diff --git a/graphics/items/icons/big_malasada.png b/graphics/items/icons/big_malasada.png index d24cd9e00d3121ae551fc82c594a5391e3d29981..a651027774bb3307dc4f6bedef00129b9becc707 100755 GIT binary patch delta 223 zcmeBVUd1#)f|G-pfq~)r%Cn~?R@>JLlmz(&GyF#d2LigCfof)Yx;TbtOguW_BHv*J z4p;33JS*=0|NmAmYnR^L&t;x97VZj(x9etXDmr}RjEj+LrFjFHyDV)SCg#Pp z2XNOM4RJ%i3_41t>3;k_Pc#0BkM)hUWe$Q R=|ER9c)I$ztaD0e0syLKWzzrv delta 318 zcmZ3*)X6+SBAJDmfq_9NQsFd^VlVOZb!C6d%ET+jJLhPK8&F8R#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8mq*GFdponv&D>re@6SF< zcizsb=QDTL$FJ96iHw@Gv+C=*SZ!9;1Lrg^-q~BURAJI$R>>8N3=7QlLq2StVFh$7 NgQu&X%Q~loCIJ2Fbs7Kw diff --git a/graphics/items/icons/big_root.png b/graphics/items/icons/big_root.png index e857cc5f301e74dc95dbcdeb839ac9e802f63ab0..ef20e8ea541239af49916673741a17bf2875258d 100644 GIT binary patch delta 259 zcmbQwe2!^?1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J&&Hba4#PnAjWW$#>X+ zLwfVy|0lQ3+_pfg-A~B%0qdMOpN}`n$^FheTv6>}AtowzPI%%THp2-Ln!D~jlsDg? zQND4l(PwQ#%iW=;J$^8}h$>UrUD-EzDzoU8#QW2Qk1pdhd2%ZMbfFDTYmuT0 zC%t^-r_>ZV&9teDEvLaiQ^euGlRUuxlKtgH}Mc*$EJbs%*000McNliru;{qHFA}pb~!CL?T02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L0004WQchCoM?cKq`A;?^d7yrX)m5ez?v}UX5f|%zyaSiS(;l9?k`g# z;UY(}GocdN0c^~t5SsCUgeoR~fJLlmz(&GyF#d2LigCfokeJT^vI+Ca#@$k?)8C z2g^~`jbH!&-!AlyYpY$EaD17O+lDFq&MC(?ec39Ml{)d8!{%_+Q02YqPG?pHgifoI z(JyKiV_|v!R!cC7wc~l1+Jh_YPBU08vS%>(-DEt?$HTnvNVP%i&xOWkAD*&T?w@xs p`S8P@($9UzekrH^54`_`>D&vJKOe0WNo1X< zXkX8m_b7?W~xX?V{ZBI4Cdf-7QOICDli9e2-L`EZd$vRb42!wlN^}>CuG?7bY?#^i}WF zoFL5gY{m|W_CuB@k9iBu*|H^sB|SPSOydlLIon1P0e!Bd{t_vPoR%HzhZ=W9ODQr= kVftit$mU4H6U!u^V~e!n7N5!A19TIEr>mdKI;Vst0A#*mkN^Mx diff --git a/graphics/items/icons/black_sludge.png b/graphics/items/icons/black_sludge.png index 2e1fac755f6e1ebd387828cdb667b0172769013b..9987ef73b6ba849f882e592e71330535f7ad732d 100644 GIT binary patch delta 204 zcmaFEG@WUJ1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J$&7x;TbtOx!!+Am3pF z9;fUL|Nl>K&z!t8H*fMWRUv)GpB?%H8l!`E(BmQ!@t9eX-S=5uO`q*44$rjF6*2UngAC#Ub_GQ delta 289 zcmbQv^oD7IL^2CA0|SFlq{3++#a`m+>&pI^NrqQR-7H(;GEhjo#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8m$U< ks&wA?Q?opC-rweXJS<|3Z&-pC0o}vk>FVdQ&MBb@001&;9{>OV diff --git a/graphics/items/icons/blue_apricorn.png b/graphics/items/icons/blue_apricorn.png index 35d0ed23b24bd46ac022e2fa3b8e65abc9c2ad5b..9e1b19fb30b2ca86eb7382dc3d80002fa7b42610 100755 GIT binary patch delta 196 zcmeys)Xy|Qf|G-pfq~)r%Cn~?R@>JLlmz(&GyF#d2LigCfokeJT^vI+Ca#@$k?)8C z2g^~`jbH!&-!AlyYpY$EaD17O+lDFq&MC(?ec39Ml{)d8!{%_+Q02YqPG?pHgifoI z(JyKiV_|v!R!cC7wc~l1+Jh_YPBU08vS%>(-DEt?$HTnvNVP%i&xOWkAD*&T?w@xs p`S8P@($9UzekrH^54`_`>D&vJKOe0W-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+Tc9r;B4q#hl~>1u+9I11>Hu2TP|eH?4)8 z0&)thTQgC<*clX84Z^4g_>N1Jz`Ex;TbtOguZmo9}=E zhfAu&i@*6XF3DGS8>DW8|U+qb9g#~J(6yt5uN V>DI^n$OhWW;OXk;vd$@?2>?cgRgC}u delta 278 zcmeyv_>gIWL^2CA0|SFlq{3++#a`m+>&pI^nN?g!ZT>6Htw16164!{5;QX|b^2DN4 z26rEq06%wyveY64V?C3?)+G;tN;pai{M>;u#y~cMSA(WJkYY)9^mSxl*x1kgCy{lc zqJ2GMlDE6d|E27ojsj&FOM?7@862M7NCR>zJY5_^D&{07EMQ6yVPRs_aQC=*Yd%Q*qf#AI=W05cYE329d5sg}~sOC;uoI`{TY4e>c3Gx@@W1Z7p#4z)thTQgC<*clX84Z^4g_>N1J!Kyba4#Pn7DM}ZJ}lZ z4i{Axr{d55|8Mg)@!L}Sa?0^ywsO_m-_Bo{p>I*pBP7@5;oQ{0wDps~m9_`78SPms zyrwS*muQ>WSgdzBV6A{!64RZi_IR~mx<#sxn-b%bPtxDn%0zW@qNDEPF?POkM69Wm|wFvXZeOr sMKd0Con8N>hF9jXu>7mnoBtW*n~1Sz_CDVn2y{P#r>mdKI;Vst0Fp;@NB{r; delta 348 zcmX@Yw48Z@L^2CA0|SFlq{3++#a`m+>&pI^m5GmC$MaQiBv44a#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8my#J3-DHCetft5yLb~%URV%!%7neu-{ns*Y~0e9aBz3|`~6Ik zx>o{kNp1Xg@9$NGK9}kZ?ze93PSE9XTI#Spv+K(8=(y85}Sb4q9e0AwwKHUIzs diff --git a/graphics/items/icons/burn_drive.png b/graphics/items/icons/burn_drive.png index c83fbd335896fb69b0d5bec7e57d911034dbdc17..9486eff484acf45f61232638f9f31f690154d7b9 100644 GIT binary patch delta 183 zcmcb{)WkGFf|G-pfq~)r%Cn~?R@>JLlmz(&GyF#d2LigCfocjpT^vI+CZ3%TDAb_9 z;lg@t@BfL;7iOHYo1MA;i>>39t@B-6wngxM3+b~B*t_b;vWY>$>8-DB2K-qO`Tkr@ z>qFh13D*v0Y|)xtU~_1mgzAG;AA}NeEZ#AB{pdDjIoX+=;901Ac(c~gXTiq=^zZLD ce*Y=M)iS1e?Ems718ryUboFyt=akR{0Pfvc=>Px# delta 267 zcmZo-y2dm?BAJDmfq_9NQsFd^VlVOZb!C6dBqPqN=OeXm4^T+F#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8mN2q-XQlQD6bfbEn7SgY@c->#-TqQ_L)mwnsryPk9pA|qd{p$yxqF#$K${sn MUHx3vIVCg!0EWt6_W%F@ diff --git a/graphics/items/icons/cell_battery.png b/graphics/items/icons/cell_battery.png index 6183bdb085b331e37b8df0e501c0a7f616f4d2fe..23fde6a299b8d0f1da5b80d2b0c664d65aaaf17a 100755 GIT binary patch delta 131 zcmZ3;be?g71SbbG0|UeLm1j>)thUb=C<*clX84Z^4g_>N1J&4hx;TbtOuTzhQH()> z!^JV7^|$=Zt1Bj`{8awDK;hGbO(l5^s*4QTqD7i(8QFVdQ&MBb@0Q<)~sQ>@~ delta 213 zcmX@lxR7arL^2CA0|SFlq{3++#a`m+>&pI^m5EozO#a9H2S6e564!{5;QX|b^2DN4 z26rEq06%wyveY64V?C3?)+G;tN;pai{M>;u#y~cMSA(WJkYY)9^mSxl*x1kgCy{lc zqJ27JlDE6d|E27ojsj&FOM?7@862M7NCR>#JY5_^D&{079N=eR70huJLlmz(&GyF#d2LigCfojSOTB4YTH{*ETksudFsPUl7xl hth@F7q4>Vbyh6*F)-tIqx(9RvgQu&X%Q~loCIEr{Qy>5U delta 284 zcmeBRdd@UKBAJDmfq_9NQsFd^VlVOZb!C6d%ET+9I@@iY9Z*QT#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8m}6~ad%3? zs;>-=6^*y-xkEnvQ{E!_g(ZE9I^utk&msF)BGG5(i`B>1hw_8hop5FUYr;3g16DBsSS#+|$(p|;1y({3) dr&IY~nM!YqZGYz9@CfJ>22WQ%mvv4FO#lK5Yb^i( diff --git a/graphics/items/icons/chilan_berry.png b/graphics/items/icons/chilan_berry.png index d1516f7323dc1f2d41d6b928dfeec32d3e960690..c78465aa2183784fb25dae9019d59d3ec89c2ac7 100755 GIT binary patch delta 196 zcmey#)Xy|Qf|G-pfq~)r%Cn~?R@>JLlmz(&GyF#d2LigCfokeJT^vI+Ca#?rDAu6B z!4fOJ>Gyn#3qe<|hrgX~+_XaTufT)W=RKA8_ZEvWxNgysIW7>eQgMzrOP$rW1yh8$ z=1k5yc;xENYX*GX2UowE<9x&Ou!GX~mD~MtpT#996-Dbf&1*7n&AG$kT;H}brbOm_ o;#{exHN_iJYbShjFTd0tQ}CEYy&=Yv9q1GWPgg&ebxsLQ0B1*A3jhEB delta 302 zcmeBY`pGmwBAJDmfq_9NQsFd^VlVOZb!C6d%ET)pa%#pr7NC%LiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyae-JY5_^D(19KFyuRIz~Oq9w`o$?%xdQD zBBtb(*-s)~ao*Y)tT&ZsGI)>mB$W?)k93{dR%PBmNKb3=f=U2%BgUbDwQ` zyGqyX<1v@#?a-UOd)}d~V)J>bSFP>RT-^91L(rjgYh(AJH3~}4W>4lkBpWr~dPRWE x;b{+EY{+_Ftv1c4CdNQ0aK9Qu*4#fQ#hoWBC0AT2um?Jh!PC{xWt~$(695I_ad7|u diff --git a/graphics/items/icons/chill_drive.png b/graphics/items/icons/chill_drive.png index a2c7e98a6893275c11b47a829d37be8a4e0668c6..d3d5e019c2469a4d3fac90b9d18e55ff276e5329 100644 GIT binary patch delta 183 zcmcb{)WkGFf|G-pfq~)r%Cn~?R@>JLlmz(&GyF#d2LigCfocjpT^vI+CZ3%TDAb_9 z;lg@t@BfL;7iOHYo1MA;i>>39t@B-6wngxM3+b~B*t_b;vWY>$>8-DB2K-qO`Tkr@ z>qFh13D*v0Y|)xtU~_1mgzAG;AA}NeEZ#AB{pdDjIoX+=;901Ac(c~gXTiq=^zZLD ce*Y=M)iS1e?Ems718ryUboFyt=akR{0Pfvc=>Px# delta 267 zcmZo-y2dm?BAJDmfq_9NQsFd^VlVOZb!C6dBqPozve4S(EKo?i#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8mN2q-XQlQD6bfbEn7SgY@c->#-TqQ_L)mwnsryPk9pA|qd{p$yxqF#$K${sn MUHx3vIVCg!0BxdQ+W-In diff --git a/graphics/items/icons/choice_scarf.png b/graphics/items/icons/choice_scarf.png index 51157fcc22f097f39c733412520d48ece1571f84..99e126453ec9f13f3ff2097901cfb07913860046 100644 GIT binary patch delta 272 zcmdnbe4A;41SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J#`Jba4#PnAkhXTj+=a zhfDJxm*W4Q{gPD!jW+sa#pQe(Q#;-#BB=;d%8NN zPhI_>I61Up+sWD+v#VLevnF?keRwC76|=10W9_N36%f`d^jcy3mbj34m4P0UwSTsL+iH%xQ{riovs|x)@7}r%h_q|%7 z{yVS1V8fc}XW2Mx19n*jcHc>Spu3PYZ>nBIvG*~P9Y>|_OD7%w9{*vpo$ht^()_P8 R?f|{T;OXk;vd$@?2>_64hO__x delta 373 zcmV-*0gC?H0>1;07-Iwj0000ISs=>*000McNliru;{qHFA|o*d+{yp|02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L0004WQchC)thTQgC<*clX84Z^4g_>N1J$&6x;TbtOx!!cQH)uU z!&#MQ!M*&pI^NrqQRE;Db!ZJ>~NiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyae{o-U3d6?2jk6vR0cH}@v!sIe&~t4g@L zo`{&pc`Pv0FR7t$#vyOf1y-UGGnAIG8)`5tZRrw~kXSv<+K_dn28XCNQ|hW|?5n3u z*Amq>Vz8Y0_UY5u%if}r4Ki(CKB;^TeH)N%F?F)&mEF^JLlmz(&GyF#d2LigCfol3ZT^vI+CN7=mD0D=D zgXM5T)Bpbk2Yf}mzi-%j=S^9|k=MVLcf9C1XrXaj=}p#dy`WQR9CiDz3HW47d#p6A z(iQwvY{E59{KG#xi&fn-6~$ESj<-BG;@&dvbNlgDMFyXFEFliQhCc-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+X|wPZ!6KiaE9Z8wC#;@bs7+Sg4@e_kP93 zEsalkZJgOWrfxB5oTm11TVRg-4#v>`zpi^{&HB%}>d@N1o2JdN6wKWv zFw)*Y?7n1e!3^aC0-GnOFiNH!ku!eD&loJ{;T_CUbP0 Hl+XkKA%kz# diff --git a/graphics/items/icons/coba_berry.png b/graphics/items/icons/coba_berry.png index 5ac21683e07f5d7342f009cfc8aa83e9c029e1f7..05f117f4bfa48bf6783c1256a2a57a2ff3dbe983 100755 GIT binary patch delta 196 zcmeyw)Xy|Qf|G-pfq~)r%Cn~?R@>JLlmz(&GyF#d2LigCfokeJT^vI+CT^W*D0V=B z!`YST-v48+E9?TN^PT+>+{C-|j|$h^Ek)r=d#qbKD^0D~TwE+Aza#~Q>KuE}7AkhQ zsA>DMNj>|n?3Df-YR7Q8Q13Rw4e>di-%d?`uJS+ic5|-64t0ZThY#Fqmt;;}pIkSu pYw3e~<$5(S56c#wzH9fIQO<^W!q!!vLV-?U@O1TaS?83{1OP~WT`>Rv delta 295 zcmeBY`ouIrBAJDmfq_9NQsFd^VlVOZb!C6d%EYT=cpx&+4k#pE;u=vBoS#-wo>-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+Tb=r;B4q#hj`Arv(oy@USjqHV`#fcc9LP ztHXtTn)C?=s|~mLpFIvP>hRmGym#V~EA~s*Zf$q&lb5%yc z!z(FTz26mmWsd)~d6JnmC)sYYj;YX$qG`Dta+aPaw%afkN>?fvtlw^M`O>%GhlMkD pw>=0ISNl=-|7(|N{JcMr@)thTQgC<*clX84Z^4g_>N1Jz9Pba4#Pm^gQ$qfn~> zhcj=>@A#kUA6Yy(DWk+tS0f zD>J{>NKLu?MW1rZyZ`SKQ)*!IpAnk>^g^2H<=XUv-WvxU7`1+Gtt1jk^A=R z8-H%eD)N5&6Z&9_{j2x8E#G8JoZI$w+t&T}D?Wc#v6lE=-86l2U9Y^2EYn8j3o_zB PCo*`t`njxgN@xNA7s6?+ delta 301 zcmZ3^^n+=FL^2CA0|SFlq{3++#a`m+>&pI^m5EnL-K6(PK2S)!#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8mU$IbewQj=fI{{F3={m#QXix(6Z9DWgZmv!>=v*rQIN^=z2GFKYhIHHlteIiZd zq}UHfp`^kGe=koF*{uKbLh*2~7Yu5^V1P diff --git a/graphics/items/icons/cover_fossil.png b/graphics/items/icons/cover_fossil.png index bc8bbe69b5ee1c2d6db9c3e2fc959044e527a49e..1202bb4556982ea61cfc26c09ec2429455055754 100755 GIT binary patch delta 242 zcmZ3)yq9T$1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J$hYba4#Pn7DKzH{THj z4wr78rtkYd@NF@jRW{jIY;w}`kHP(q^@S&v@7($=Ws0cR;l3lg4#}4Aawm!&vwpl$ zkn{DG#A!#j+;@;zA(1D^pKF_vX<%c$ShHAvLMz9W7g_5#B@V}RMsO79@oFoW^1OO% zw_~T{4()!2ttEWs(N7jlQ(w}}s`4n=^Oy4L`41Wc%KB m^P`3H&px^>z3-I$E%vQJtlAUf?#lrk&fw|l=d#Wzp$PzWUU9Mj delta 343 zcmdnXw1|0vL^2CA0|SFlq{3++#a`m+>&pI^m5EnL^6Q(QM}R`&C9V-A!TD(=<%vb9 z4DLQI0ed_&uf(2v|N zj9+9#t?6+&u#Szbe3nTMkMA!=iTZFZ4+)<=mu)M*@7?p-qW;NF?)|r`HuGyVb_OtN z>3vTw61^a$_pnmpg;rO7i;d12$vvC7Tl{B#&OE(DO=m^lI^U@$7b>u@t#C-~DPC25 zL%^+ZWnaVrtw}MaASi9Nbkcr(WRg4M(ru4>8GcT$#5HxQffTw1p!Z@K$MGo}A# nPWudB#_-K7i!6Ou|B`u)jMno%tKND6eZk=A>gTe~DWM4fIvaz1 diff --git a/graphics/items/icons/custap_berry.png b/graphics/items/icons/custap_berry.png index 3fa594667d46ec342b5b3c790038481f9e289182..56f1492c3cf70c2d6f73d0f5ca814058bc1ab836 100755 GIT binary patch delta 229 zcmbQnyn$(g1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J%s;ba4#Pn7DM}L%zcb z94)7xT=?{le~}wy$3G%G$pR>^!%7Yi_z)cJYa`STy5`D4q#D z9WNOgN|mPbU%3`_Rc=usYs0m3nbGNJ) zW#BFdKT~^k1&f)T(ybk9*H(0Fd~mzCY(m_Nzy#?T_Zn`m_x(`jtF-yov%V*%m;PI) ZJ}Z*000McNliru;{^f@A`byLOqBot02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L0004WQchCv5HykE%AfDay2seR!$oo4 z%l3MpY;Rq$M}+7^mB25km0;C9q6XBmFL(r>2K$jPvKZrNU6=V4Mky6w-}p>u(9Qvm zH9-!u)u7h=8A#O7=gFoef}$~DLeR=nj?spaywBShXB@d5o(vf`=JlJ1b??UO@P70R dea_Cm&lfqeEgWxo4iNwV002ovPDHLkV1g@Vfw}+y diff --git a/graphics/items/icons/damp_rock.png b/graphics/items/icons/damp_rock.png index fe908739e5bda6005cd8e8c4399d9739359e2aa6..97c75b08fda4ccbcd38956a4add92cab3be8d073 100644 GIT binary patch delta 254 zcmZ3>e3EH`1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J&&Cba4#PnAke;wh*%- zhqE?I%m4om*{)wL-DP}s@?pgjPe1=$UG~ykYr0=ZpsbK<^|7zhW<*wZuHJF;lSyo= z%bo2@HNX6td1m|4##dkS-^*^)w*%y1AC>s_&@CFId<=D<>|*w&%fS(>>Yown)RY{xb7XGCm1|k{an^LB{Ts56$yM^ delta 354 zcmV-o0iFKI0<8m(7-Iwj0000ISs=>*000McNliru;{qHFA{qAz1$Y1e02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L0004WQchCG{iF44r@)#=^Hd5IYATg?31QFIr3;-!?*dfqt*rSyNM0b}eC zVKD#~zC!>ucy)J)*r6>kML6DKUF9G+vsGP{T0}B~SdB}IbVX5FC{WYVzAVBdQ)4zP z{p{mo52cE&-@ytsHQzNyu>95yAAlJlj2_lEfJw29G0XM@QQM{@G17F6(%6P1C6)EO z>C_?hsJzM@I0&U;$Hfg5YWL}VLUK%cEaJSSA0+cKS=}nPmjD0&07*qoM6N<$f&x~F Ag8%>k diff --git a/graphics/items/icons/dark_gem.png b/graphics/items/icons/dark_gem.png index 947f04167490568a9a072b7bf8aa17e1d602a135..8999ca25acccf81ef6e86cf9334c51d3023326e3 100644 GIT binary patch delta 176 zcmaFJ^qX;l1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1Jz`Cx;TbtOguZmo9}=E zhfC^@JO588NvxihJNeuvTjPece-*YA6*edzNbFEg7h5*hdd5fbEyXX^2-Wd)7GITl z=r%1Oke9jT=B`UB)0212wEQ?D=C_snp@R4oiyxo89AdLhzw(Vt*r$(&P5gIWL^2CA0|SFlq{3++#a`m+>&pI^nN?g!p{#RF15il3#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8mLLPLYkF%s-<-E5{bE?&b_@;LwpX%Ould-L0MI`LoM<8g#cAm zQTL9_v`oFGCe48Emf#qcqaulV97TdYO*=Ij979<37>k&lm{yz?ym{9{NQH@^?X^Iq USdaN*pd%POUHx3vIVCg!0GmHlJ^%m! diff --git a/graphics/items/icons/dark_memory.png b/graphics/items/icons/dark_memory.png index 258bd309bf404e482f3adcdb1677fe43265cc681..3cb69c7a5f67d70f4d6ce1e016f279f2b67d8259 100755 GIT binary patch delta 247 zcmZ3?e28g+1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J!Kwba4#Pn7DM}X}-e> zJS?x-4b>F?{@?#r%Ecj5FZBDAGaff|)?c?@IF0?xBCVR>13H<`Q^J|gTywc}mE}EC z%p0L8#e9>4f&{-C@w~O}SviYI-hFBJ;RrRY#(XB3c+oFHhKkAQo$^d;j=wYsPg;6x z;^t|ZXG|_WuydO+Gvkd2_rnF>MHXcmKihU`#)Xz|Mn{^bR~BZ!UC0~H$MtYctVg7! rPovZ7i&pI^m5GmC`DUo!380X8iEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyag*JY5_^D&{079N?E=Wo3PkqbQv2$|w0m-b0j866+bv?}y{>02gL{(NS-UQ@{1dw1_? zn11Hz306E%@myzy^2LjZCk|9Rd$+SQp?RuImSoDgIhDHw&S;j4+7v&#<2&Kvqo-=B z?~2dOo6Y}BWcM=dvzE-)4k^Sjm2^LyIX%Hz();oyCmY385)$e=m$q80|HDzZ<%){< o@|oO;_a@HbOkZ3j#m>MmZMtpS+s*YQKyNU3y85}Sb4q9e0B{g~k^lez diff --git a/graphics/items/icons/dawn_stone.png b/graphics/items/icons/dawn_stone.png index 0465d18bad46738f1dd93e637b31e98e411e6bf0..a0db015327fd01fadfefeef7d0106676ae799439 100755 GIT binary patch delta 201 zcmey)G=*t`1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1JyKpx;TbtOx!y0B43LE z2TLpK&;Ryz)3TUuO|LGvY*MJ^u;KVe*Cm?{MpbGhMW|hU;_}UCQC`)&)EcfkOkxx6 zaXb)EsqdVc;bihgOHp2FPRv!~Yb{U9Lsj01UTrvKdn`vJex~Um&2`QD&pI^m5Eo;WVYP5BA}3XiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyag7o-U3d6?3MZcjP;yAix^1gYgBYOjbvj@$PAuv~%AL#RnfXH@x|RM6Koj*BQ6HMk+nP7H_zg@;m26c6-$y*PIW#>Ej{JLlmz(&GyF#d2LigCfof)Xx;TbtOl+OV$ahqM z!`W5iyZtAwysp{y^Ic48O%`qWrmylyrTpqWdk>Q@F7_qPs+V*fRX#f%S$42$W6Qxy z2kvgrNm87U_AOQL3%g`#J+qo#Nc(S=hUwdmG_p(ylovYSeA*|sI`LF9hux9jeEmaw zkK#`1ZJ!_Wc}BvNnX8i27p=KkawGOjM96#P{k;No1X< zXkX8m*>^ylKa1Xi|Mn`Nfp2g~Xg=3w8A~Ir!{P#7?xVEZizwo7n!3>{N{eo6EKAAJ=O8uD`lb5`S;#Qhe zb|dP#`#tN+ORV~vOg9{P6d0dho!$P)Wd6^ME(x#G&ITBN-rFAZWaCo%(k9t+6I!;+ Q0=k#M)78&qol`;+0M{pdv;Y7A diff --git a/graphics/items/icons/douse_drive.png b/graphics/items/icons/douse_drive.png index eee5ae35f1efa90dfee9e4e1dc3eec5082c23847..f59616159aed0435f89fdba79504a4ba226ceaa5 100644 GIT binary patch delta 183 zcmcb{)WkGFf|G-pfq~)r%Cn~?R@>JLlmz(&GyF#d2LigCfocjpT^vI+CZ3%TDAb_9 z;lg@t@BfL;7iOHYo1MA;i>>39t@B-6wngxM3+b~B*t_b;vWY>$>8-DB2K-qO`Tkr@ z>qFh13D*v0Y|)xtU~_1mgzAG;AA}NeEZ#AB{pdDjIoX+=;901Ac(c~gXTiq=^zZLD ce*Y=M)iS1e?Ems718ryUboFyt=akR{0Pfvc=>Px# delta 267 zcmZo-y2dm?BAJDmfq_9NQsFd^VlVOZb!C6dBqPqp7ZZ7QJ5Wfx#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8mN2q-XQlQD6bfbEn7SgY@c->#-TqQ_L)mwnsryPk9pA|qd{p$yxqF#$K${sn MUHx3vIVCg!0K3*;F#rGn diff --git a/graphics/items/icons/draco_plate.png b/graphics/items/icons/draco_plate.png index 9b08c31c8df7bbd046af83623c1f118db34a6118..21339c048226491da1259b88645a08855672c49b 100644 GIT binary patch delta 169 zcmaFN^o4PP1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1JxvZx;TbtOx!xjk?(*4 z2g_8^KmYr)`PVGkVq3b$P;s(^SLO1&0=*3Fg5ZTl^O)Dh%($$;zR delta 280 zcmeyu_?T&eL^2CA0|SFlq{3++#a`m+>&pI^NrqR6pZVSfO`wo?iEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyafqo-U3d6?0NAoaJp$;9*U;abUh62cN)thTQgC<*clX84Z^4g_>N1Jz`Ex;TbtOguZmo9}=E zhfAu&i@*6XF3DGS8>DW8|U+qb9g#~J(6yt5uN V>DI^n$OhWW;OXk;vd$@?2>?cgRgC}u delta 278 zcmeyv_>gIWL^2CA0|SFlq{3++#a`m+>&pI^nN?g!Ci2+@cA$`WiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyaegRB@%N(oqKzyhWH$inS9|wg0iY=hg#zG3jwOC zqV64;X_mdKI;Vst0O&AQCIA2c diff --git a/graphics/items/icons/dragon_memory.png b/graphics/items/icons/dragon_memory.png index d073dace311d1b6d64b92c6985d07dc34d537c6a..3888b3f3af5f63efb9886471b44175cc25857d91 100755 GIT binary patch delta 246 zcmZ3&e2{5^1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J!Ksba4#Pn7DM}L7`>^ z9+$fgCM*a4|G%vlawSTC?z_&)`~>5~S^qezLPfKUw>JI=uxpK&VS3E&Qbxw2kNbG^r*oUk-Jbh{eg1>rypwC5n%q44 p?85ev|GavSrT1Tby#3!K@x7nePfcU`zYOSj22WQ%mvv4FO#nVHbh7{e delta 345 zcmX@ew1jzrL^2CA0|SFlq{3++#a`m+>&pI^m5GmCCf_*uD^N(h#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8m}$F_ezAaio2v8bfP`+d9j3#1fOW_v0(zqz~nzXMyxjutcSdwZ+@i=N21 z7|`2sZR_`U>)DE%W(CJyyT_WHC~%cwm+R|y`Wxoixmjv>CtX5^4)FbB%`}` p#o3IjZZpc4gde=QV%{-E2J21EL7YB^e1ZO8@O1TaS?83{1OS8Rf)oG% diff --git a/graphics/items/icons/dread_plate.png b/graphics/items/icons/dread_plate.png index f93493f97bbbe7afe74486d13afc8e0344776473..8679df524d240940861934bff3e5fac51c37170e 100644 GIT binary patch delta 169 zcmaFN^o4PP1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1JxvZx;TbtOx!xjk?(*4 z2g_8^KmYr)`PVGkVq3b$P;s(^SLO1&0=*3Fg5ZTl^O)Dh%($$;zR delta 280 zcmeyu_?T&eL^2CA0|SFlq{3++#a`m+>&pI^NrqR6t9XmcGN6!niEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyafqo-U3d6?0NAoaJp$;9*U;abUh62cN)thTQgC<*clX84Z^4g_>N1J$&7x;TbtOx%0^pwM9j z4%dquQ34uAXq&!n9&m&pI^m5EnT-h2_i5l~3H#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8mpRhM~5X;Aw-rnA;mzu7`N;S%yJbCPxn^%;oUzfr;p9NOQ$=a$M>EF|m zlRp=6q+fbxtR6n!ax=%7oh8fm)O??3tnDD)thTQgC<*clX84Z^4g_>N1J%@fx;TbtOx!xrQS7h+ z2dn86{+<6@yB#hytnb$QHQjg-Q}Q2W<4unbJNru3Rd!^A`JI&HH|DqAv4g{SF_%So z@pKDw#a-MCMe|m9-|2U0EHsW);SbFJ#UY}&NxbF4>zB9YaT@mSw__Iy-zpYVuwv60G>yv6?@8wrAyF6vtRg%hW26PL9r>mdKI;Vst0MrRpbN~PV delta 301 zcmbQh^n+=FL^2CA0|SFlq{3++#a`m+>&pI^m5EnT*iOV*5-22I;u=vBoS#-wo>-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+TcDr;B4q#hl~>1x5}oF0KPNy}Z2I0^}A? z>hA8|sMw;s9SHHW!_VxpUgv`QWRTp35;>4`eoPIVJgaX=0l| z=u6}DLzbCS75p|Z2&qdR@?1a1a)thTQgC<*clX84Z^4g_>N1JxvZx;TbtOx!xjk?(*4 z2g_8^KmYr)`PVGkVq3b$P;s(^SLO1&0=*3Fg5ZTl^O)Dh%($$;zR delta 280 zcmeyu_?T&eL^2CA0|SFlq{3++#a`m+>&pI^NrqR6WeQK`LZFa%iEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyafqo-U3d6?0NAoaJp$;9*U;abUh62cNJLlmz(&GyF#d2LigCfodu}T^vI+CT^YR&38b7 zgOzpbqVM(vj$4l2U!{3^rbT7vxxYmW>^(aS8RQIg+6?8}PHL=6Tj9u~@#B$nmICMd z$sH-#4wEttU2E`QOEuHHovY)KH8cN)np1Xdw8^4tvow!#UDD2NQeU{WYkuTkUcMip i-0!lQLuKt=eZK4ahQ-KKGvYVU6%3xPelF{r5}E)^3RP$T delta 295 zcmeBT`ouIrBAJDmfq_9NQsFd^VlVOZb!C6d%EYV4v8AxNo1X< zXkX8mOJSEv$draTO6nV?xJ>R!i~N<+(I_OV zdKkG*rTAS%OQQ{b<;-2 lJ?mOI_zk&~D*Fr=7;^q7U0<0wLm%iW22WQ%mvv4FO#ryqU@rgw diff --git a/graphics/items/icons/electirizer.png b/graphics/items/icons/electirizer.png index 73f6f8f26ed76c28f4a505f5109b779f1b216af4..f0351e64d61c52dc1df31aeac65d21507b88b63c 100755 GIT binary patch delta 196 zcmey&)Xy|Qf|G-pfq~)r%Cn~?R@>JLlmz(&GyF#d2LigCfokeJT^vI+CN91Bkn4Z~ zhug)-tk-|zD}HZr5^p~Er;>l-mBK#~i>AkLy=}{xocYv8(|yq?9YL2Ek8G8R*VsbN zC_LeDo5wt7?|iqnjIzud&oFLz+_UK^PnYr?i>60?45~S%dLIpJ^!MLSdH1xkF*r7Q pskqsuwcG3&KhB#QSNHvPj9DPd3sd&1SAkAp@O1TaS?83{1OW08T!R1r delta 296 zcmeBY`ph&zBAJDmfq_9NQsFd^VlVOZb!C6d%EYT+(Y?7_0w^S2;u=vBoS#-wo>-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+Tbwr;B4q#hm1X1NCBZJ^OM*azWvm`pH;E$C(v08p00i_>zopr0J}J2TmS$7 diff --git a/graphics/items/icons/electric_gem.png b/graphics/items/icons/electric_gem.png index 88e604f182f83899b0039f7a423433e74b0fe9be..e17e3f4d139a34708c5b6f56c960ffa8d59fd030 100644 GIT binary patch delta 177 zcmaFJ^oMbR1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1Jz`Ex;TbtOguZmo9}=E zhfAu&i@*6XF3DGS8>DW8|U+qb9g#~J(6yt5uN V>DI^n$OhWW;OXk;vd$@?2>?cgRgC}u delta 278 zcmeyv_>gIWL^2CA0|SFlq{3++#a`m+>&pI^nN?g!{G17AKTt@##5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8mLLPLYkF%s-<-E5{bE?&b_@;LwpX%Ould-L0MI`LoM<8g#cAm zQTL9_v`oFHPc;L&TY_Uwofb*d<0#VfZ`!HR;26TH$5_Pd#I)kH;LW=pLMluQ3ttIc UtkCMp2Reem)78&qol`;+0Bl@Ur2qf` diff --git a/graphics/items/icons/electric_memory.png b/graphics/items/icons/electric_memory.png index ce9a8f362472756d183dc3b583780ae0966271b4..0ab5da3770d42219d4038eea35ee7be3e027254d 100755 GIT binary patch delta 252 zcmZ3=e4J^51SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J!Kvba4#Pn7DM}ZLt;w z4p(OffzAK^=d|1h=YvF~2H*ZMyh_H1Q8tJ+}L4)g+pr>mdKI;Vst03EV*bN~PV delta 346 zcmV-g0j2)O0;L0x7-Iwj0000ISs=>*000McNliru;{^f^2Nf3Y+fe`j02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L0004WQchCo+QjC){Ox;q-L%|%$nM%zr?xCwTf;ciKCz%(Q zuDbgWr0UF>$rGhl-Gy;11sLDn19K#2&J1K=y!-C{LXg2qY#N0OvUl(P0~sLEVO%13 z_wM~yAftti!_AA=-n+jV%rPxV?pS*ltc5|w9O#y)yT8D8GMc2NxmQ6{F)%I$%9QTf s2ywLZim-@P8)4p&UIk~PdKw1+0POuj&NrELoB#j-07*qoM6N<$f~Dex{{R30 diff --git a/graphics/items/icons/eviolite.png b/graphics/items/icons/eviolite.png index c08cc595068054e99a5c95b9de191a2550df20cb..b8bc613f8f507cd73443e043adfe9af177c1eff5 100644 GIT binary patch delta 153 zcmdnX^n`JO1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1Jwk3x;TbtOg!7~$aTPg zgJp5v*Z=nKW;rdq=$wCY!sVU~DLsb;C*E6~75?I^$lU!`vM1V@uXoi@|2CJg*2T_T vM^Wxy+x9i{RNXBC?U~fvzZ!3?VmFs`W#Sg_wp9Td&*16m$Lg}qDWM4fRun@` delta 242 zcmaFDxR+^yL^2CA0|SFlq{3++#a`m+>&pI^Nk*KHW2;q06HrLJ#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8m})Ul2=c4&a`RMcubp)>g-)(bC%_proO)Z;bVyfe){_UZITBjg~d%{+I~e< kmo-mwLi>?rEDQ{Oyn@Y1`T6=l^BFu{{ajeqIVCg!0CjgrwEzGB diff --git a/graphics/items/icons/expert_belt.png b/graphics/items/icons/expert_belt.png index bc00454907e3e76c93b63311c592c4440205824e..62d4b8bc2605d8dd6e0ea5ab9ddd261b0f1eb4c3 100644 GIT binary patch delta 217 zcmey*w1jDb1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1Jz9Sba4#Pm^e2uQ0%Y) z2iJqY=WW)yUEa4={GOYZMUR!xFM@*AF=o3u0St8MfB4;h<|R5m}Y{P|9-)@z4sn7i*hjD6}s@M5$HY! MPgg&ebxsLQ03}XrLjV8( delta 308 zcmZ3&^q*;hL^2CA0|SFlq{3++#a`m+>&pI^NrqR^^0{YOF;Gan#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8mE{Yye;9yo4IL$D%xG_w8 z!><26>=kccU;ik0kfn*~Pv?(wM-5W;FLq|!{_6Nm(crx0hNY`HHG{@cVrbKksK8>Dj+vXO!()z8!!OpT7`&9JXs^#CtF+K>+ zbw42F8(nJ_C(G2oFDIhI`~S=&p_AtyPkixLPgTe~DWM4f Dn>=<2 diff --git a/graphics/items/icons/fairy_gem.png b/graphics/items/icons/fairy_gem.png index 871f74426d8ea309c3738acf32c8ecdc47c5760e..5fe8f6ed99e3d8510df4847063e953ab6615a5ce 100644 GIT binary patch delta 177 zcmaFJ^oMbR1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1Jz`Ex;TbtOguZmo9}=E zhfAu&i@*6XF3DGS8>DW8|U+qb9g#~J(6yt5uN V>DI^n$OhWW;OXk;vd$@?2>?cgRgC}u delta 278 zcmeyv_>gIWL^2CA0|SFlq{3++#a`m+>&pI^nN?g!_+;eSX+R;u#y~cMSA(WJkYY)9^mSxl*x1kgCy{lc zqJ2GMlDE6d|E27ojsj&FOM?7@862M7NCR>zJY5_^D&{07EMQ6yVPRs_aQC=*Yd%Q*qf#AI=W05cYE329d5sg}~sOC;uoI`{TY4e>c3Gx@@W1Z7p#4z)thTQgC<*clX84Z^4g_>N1J!Kxba4#Pn7DM}X}%T% z4p&yLFK_?TUEBD>r+yq;UR8T7{u#sd8SE#F*6cY1^Z|pXtDnm{r-UW|t_XOp delta 347 zcmX@cw2XOzL^2CA0|SFlq{3++#a`m+>&pI^m5Gm?Z%&ucUZ9Y8iEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyag5JzX3_D&{079N?E=Wo3PkqbPjcg;BzK z=aHkff`=w%Fco>7JrL9*D|=G)-NIuDeMiplZT)oVL8!E&%*@HgL5G{d@78hzT`f+# z&CDrx6TQWEz3e)rEwAb0s<%?Xa*-rcQNU~ZXm=@9Gtdwc(L zrEH0qm6>(pR`vJrW(%j25A(dT-#2YF@R-4LH>vcy_zgd|QgH?LMO}@Bh5>37*WEf6 rFBP9YW!)`~&wXFCETpeqwqRgTS94)0P<*5f^a+EftDnm{r-UW|einl` diff --git a/graphics/items/icons/fighting_gem.png b/graphics/items/icons/fighting_gem.png index 7f4fc8b97d31d9a170ad6352ca32435e7d0ebc63..2293767794857c1e718e7b9e19411afc05feca50 100644 GIT binary patch delta 177 zcmaFJ^oMbR1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1Jz`Ex;TbtOguZmo9}=E zhfAu&i@*6XF3DGS8>DW8|U+qb9g#~J(6yt5uN V>DI^n$OhWW;OXk;vd$@?2>?cgRgC}u delta 278 zcmeyv_>gIWL^2CA0|SFlq{3++#a`m+>&pI^nN?hfZ&mz4f1r?fiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyaegRB@%N(oqKzyhWH$inS9|wg0iY=hg#zG3jwOC zqV64;X_mdKI;Vst0KT$S`v3p{ diff --git a/graphics/items/icons/fighting_memory.png b/graphics/items/icons/fighting_memory.png index ad21a2d078c4e665c575d9cb0dd5d7c5f7702240..f46e89d7333512312a6cebdb0249e2d792970dbf 100755 GIT binary patch delta 246 zcmZ3?e2{5^1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J!Ksba4#Pn7DM}MWMqA z94yTo#}+;N|9@M1=e1?EFQ=%dhugAkdpmzoTztU;3Dr9y8;X21cSil(H=ij#%(;?F z@R{a|iMu;@oX-i%;4;@*#1xag_++Aqu;_7f#=c(2 p@Qce!?z6Rh?DYRyx_18+;p3w0*UvD;T?IOx!PC{xWt~$(699AeaHs$P delta 344 zcmX@ew3vB&pI^m5Gm?qx9wW4xo^DiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyag*JY5_^D&{079N?E=Wo3PkqbMBi$|zxd zbMKu{!9x=>yvp)rbgmKn88nZDc2ImFN)kFBW5U%tg6Ds8j( nhj+~e?@zpG+Z<@y3kgTe~DWM4fldgZo diff --git a/graphics/items/icons/fire_gem.png b/graphics/items/icons/fire_gem.png index deb8979bd8eb153df3014897ff566b1e58280782..d6caa7d3d17b4867a275ef66772da51ddc13467d 100644 GIT binary patch delta 177 zcmaFJ^oMbR1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1Jz`Ex;TbtOguZmo9}=E zhfAu&i@*6XF3DGS8>DW8|U+qb9g#~J(6yt5uN V>DI^n$OhWW;OXk;vd$@?2>?cgRgC}u delta 278 zcmeyv_>gIWL^2CA0|SFlq{3++#a`m+>&pI^nN?hf!`X(V3MeFA;u=vBoS#-wo>-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+Tber;B4q#hm1X1xyJdEKH0V?jAR9-0%?8 zN=)HlIVYf*m@KXkV8-GtA)l#~7iNxGc=ic6_AwCCWCSSOapscFep_X|4LV&8O zsC!3dTBhF9rFVdQ&MBb@0LF_{`2YX_ diff --git a/graphics/items/icons/fire_memory.png b/graphics/items/icons/fire_memory.png index 33116aed1223ea6b9bd195ec18e47bc5fa1bf0cb..bc62b02c15e99a4cfdf38772b0e511d93d67084e 100755 GIT binary patch delta 246 zcmZ3+e2{5^1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J!Ksba4#Pn7DM}X`yBV z9%jR1d5>&<{NKM;hGU85bidL&vJ>1Rr`0>@@>e{~6`m_{F`HK)pwQ$%mhXlhwm%{d z6fc}jE;)SWfM)8h7HMHaM!lt%jwb2|r5>Mbuzm?w6=#0OM$;sr1l?+@qg^Wk9-oLi zUlbH-ocPM-E0;0%BlDk*KLYo;3f%MAI`@k7o|q>R%1exD7%uNvKhf@o)5`PWpH3uh p(iV%)tmEzZ*vtR*$C~|5c%S`c{~Y;xbt};E44$rjF6*2UngGdGb4LIG delta 347 zcmX@ew2XOzL^2CA0|SFlq{3++#a`m+>&pI^m5Gm?k;jx@2Ph<7;u=vBoS#-wo>-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+X|iPZ!6KiaE&%2lypeSy>b(70ZRRPUPZ&I1{an^LB{Ts5Z9;;T diff --git a/graphics/items/icons/fist_plate.png b/graphics/items/icons/fist_plate.png index 0142938d511cdc336851632b141a898d8c86f63a..7e6cb2b92d31e79e81e58c9989899f03676de6e2 100644 GIT binary patch delta 169 zcmaFN^o4PP1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1JxvZx;TbtOx!xjk?(*4 z2g_8^KmYr)`PVGkVq3b$P;s(^SLO1&0=*3Fg5ZTl^O)Dh%($$;zR delta 280 zcmeyu_?T&eL^2CA0|SFlq{3++#a`m+>&pI^NrqR^Waba9b3h^S64!{5;QX|b^2DN4 z26rEq06%wyveY64V?C3?)+G;tN;pai{M>;u#y~cMSA(WJkYY)9^mSxl*x1kgCy{lc zqJ2GMlDE6d|E27ojsj&FOM?7@862M7NCR@JJY5_^D(0kKILq6hz{8qw9!2~f1l)HLwkI&}^2fh^f~5f0{U0T-i>#55E~NZ2@N zIk8AMF)thTQgC<*clX84Z^4g_>N1JxvZx;TbtOx!xjk?(*4 z2g_8^KmYr)`PVGkVq3b$P;s(^SLO1&0=*3Fg5ZTl^O)Dh%($$;zR delta 280 zcmeyu_?T&eL^2CA0|SFlq{3++#a`m+>&pI^NrqQZUDnN804OA0;u=vBoS#-wo>-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+Tbur;B4q#hla&XL%bGcvur|9GEZ2!Kbi@ z`2~x>A-1Ati(Y4E9(B9F^8Ug-0g85+ng-rmr>@~WkR|&r!oj>P;9~TVn1sCC^uuI>? Y5M^cgtTQrE8R!fKPgg&ebxsLQ0PDA4>;M1& diff --git a/graphics/items/icons/float_stone.png b/graphics/items/icons/float_stone.png index 61f096fc368efcfd43f7c49a83cf057e7637fdc0..a421d553fbc9c2f5d7fc0b1e3de247d9ef9febe1 100644 GIT binary patch delta 176 zcmcb~^qX;l1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1Jz`Cx;TbtOguZmldr*m zhuM41)BpCz+Pq>P@U5$wc~WWV*8R^D;x;l?Xe2fFtbOM2eD=;$sdr>&2b?&poL$gv z)$`TJG=GO&<|qEZ9pbwy{A8c*sC0R&pI^Nk*KHDfE5g9H5YRiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyaevo-U3d6?2jk7T6_-h&XI$?crs8kdvC4 z?5g1&aq`5C8yreUSEMXi^X3uHV-3xjJ9aH=wp4O+^U~8(d?=uM>eQ)qdF$RK_!$Q5 z_V$u+S$5>cjU%QeYZ=aH`f?U>dN#jEPw+1;Rp8auZ-|QGW4ZECnc;t=2+NQ6Aq_yw O89ZJ6T-G@yGywptmt61w diff --git a/graphics/items/icons/flying_gem.png b/graphics/items/icons/flying_gem.png index 563e80f3bf057503429cc7386637f4e6b889de96..eb328c85ee90b3246583fbe29f5a0b31a080575f 100644 GIT binary patch delta 177 zcmaFJ^oMbR1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1Jz`Ex;TbtOguZmo9}=E zhfAu&i@*6XF3DGS8>DW8|U+qb9g#~J(6yt5uN V>DI^n$OhWW;OXk;vd$@?2>?cgRgC}u delta 278 zcmeyv_>gIWL^2CA0|SFlq{3++#a`m+>&pI^nN?g^sd3Jqw?HBB64!{5;QX|b^2DN4 z26rEq06%wyveY64V?C3?)+G;tN;pai{M>;u#y~cMSA(WJkYY)9^mSxl*x1kgCy{lc zqJ2GMlDE6d|E27ojsj&FOM?7@862M7NCR>zJY5_^D&{07EMQ6yVPRs_aQC=*Yd%Q*qf#AI=W05cYE329d5sg}~sOC;uoI`{TY4e>c3Gx@@W1Z7p#4z)thTQgC<*clX84Z^4g_>N1J!Kyba4#Pn7DM}L7~G6 z94^cm9Y<&U|9@LgC2ID!OPa^OyG@Ur_H_Qj8TvC+RZp6`ZqZuKJNZ*iM(k8P*C(iZN7;`PtyEXKh&-$uWaOVys4fl#JS;ZdtkiiNvDH` z?z<1IoU%x((`vii!c{u^ChNEKzw%zN)YrRnYE@JF&*~K` u&&e!{x^pOcS3GlS&7P^S=Jw5KOpgS?g60t89ZJ6T-G@yGywo7H+P!= delta 345 zcmV-f0jB=M0;B_w7-Iwj0000ISs=>*000McNliru;{^f^1~#pen_>U}02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L0004WQchCyTl-Ye3#witGe0vYf5e*GhWMI7e?*2xQ!D*R>YYeh?@BRZBAUU(#MDXt2 z`>#PpiMSC;Xy*~V_V%s00000NkvXXu0mjf@N$PW diff --git a/graphics/items/icons/focus_sash.png b/graphics/items/icons/focus_sash.png index e0df9798ef492f7d6b2e785b44f7aab2c8710365..a09d2d26bd5be2e67c45cebc6010d333fb81d775 100644 GIT binary patch delta 213 zcmeBRUcfX#f|G-pfq~)r%Cn~?R@>JLlmz(&GyF#d2LigCfol3aT^vI+CeEE0DAb_9 z;S$U9@Si%Lnu^Zy{vVUJFW!)yUC*_^_Py*)0Y+&?i#3~G%eeP6DhU_|e_-tJ2sEf% z%@i@UN#Ch?)vw>@+C3ugP2Y2^r~3RN+3((;o~5uId2aXPsfDA{>cg&lceVwz=6HM! z>q@xe^R&aTb?S0mrsAi@5r?Ne-(?W<>Ral2n}(U!%jYJnW#*OMxBn~9Z492SelF{r G5}E+~t7Po} delta 317 zcmZ3$)WJMKBAJDmfq_9NQsFd^VlVOZb!C6dB*Uwy_(k=dDo{wg#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8mDe0WR%Is++ZK}mHi*hE-U=g#4sQdZtKi7f(hYs`0Jiqhu4DW{Bx~x7~w>W*u zSiax(p`AaNaZMAA4=asvM7jtRG_BtrFsM`DM z1Z-OT^N{Mhr_R#piqp2vasRukd-k_g+n+t|y%qm_7W0ab+0lC$OHw6`nfCAS1G<&L M)78&qol`;+09UehPyhe` diff --git a/graphics/items/icons/full_incense.png b/graphics/items/icons/full_incense.png index 230927e085dcf775935ffc1a76478a1b5567d958..a44f6bffa8e9a17946003c42493ff1975492fe6c 100755 GIT binary patch delta 237 zcmbQqyn|_i1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1Jx||ba4#Pn7DPKx6ok) z9%t?A4o~j<-zVCpwq)|Tl3-n)#qIV79)A>P+`jGM%MH@I55zuH=H9w>SFUYbN9cm3 z4O3@mX}AZlADG<0y0zNYsKCr%nh}GibysAj;GC|ERKDCL%Q_=Dj9JevT@rY5X2uHf z&w5@1a|z$98FNoObBP}3 g>*uvUkI8>w($r^Tk(|@%26Qunr>mdKI;Vst0Q0SGK>z>% delta 334 zcmdnNG?RIPL^2CA0|SFlq{3++#a`m+>&pI^m5Engci#rr^FSf-64!{5;QX|b^2DN4 z26rEq06%wyveY64V?C3?)+G;tN;pai{M>;u#y~cMSA(WJkYY)9^mSxl*x1kgCy{lc zqJ2GMlDE6d|E27ojsj&FOM?7@862M7NCR>MHUV4D~uDxxjoFEWSYnFrf4POfF1dMwhjO-y|P42qXYdB_I; zST)mO!zz)KUC*|B3hmw!HZ|RksmLYGPn*3d;mpiFhrTZ&{u4H7&XabO5f@j;Ue?Xs zv3P5>`2^GA@9$g{7Kgu&+FJd6)z#ex`~)sBZ3@#3YN>Dw;N)OY%u5atVqsEUA)thTQgC<*clX84Z^4g_>N1Jz`Ex;TbtOguZmo9}=E zhfAu&i@*6XF3DGS8>DW8|U+qb9g#~J(6yt5uN V>DI^n$OhWW;OXk;vd$@?2>?cgRgC}u delta 278 zcmeyv_>gIWL^2CA0|SFlq{3++#a`m+>&pI^nN?g^Zr$gGETE8hiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyaegRB@%N(oqKzyhWH$inS9|wg0iY=hg#zG3jwOC zqV64;X_mdKI;Vst09$odo&W#< diff --git a/graphics/items/icons/ghost_memory.png b/graphics/items/icons/ghost_memory.png index 3041643aaae310df75027b50b583157979b80f50..2a9b4f65997b2cb8d01fc6e2ceca5070ad64b9ee 100755 GIT binary patch delta 247 zcmZ3=e28g+1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J!Kwba4#Pn7DM}UB1H# z9B$l7Qx|^wd%x^Ke9ZOPsrRQ^sxvh{{-J*1Q-h%Z>mJR96ODe{NAEgx-C*^+(eqKU zr+ov78=iC*z|a|LEieT5>AhK*94P!t`)r$xY)$h8@MddeM^6v=1AV(vHJMtf0N9gPvKy6*)l%|=z0cES3j3^P6*000McNliru;{^f^1}?t;12g~t02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L0004WQchC+>nTD7XJQD*mD7$-x3@$Ee@N1~&{kb&{;yZak~9MRCAY>5oAckliK86c#THbwC6 z-TSXWMvJ9cW=`9C@BSVTM>Kg#nbO|7U@Z(1nLxK#-~A1?lQE^d+;cWW6$9fopp4P! sgAhl{?DRC+eGujyncZ+Us;6-P015y_0FdujE&u=k07*qoM6N<$f{l!YKL7v# diff --git a/graphics/items/icons/gracidea.png b/graphics/items/icons/gracidea.png index 31bac3846cde562c1b5467f1b810c03f27d4dc78..fdbd8c8af00a677566419fd3ad0b182205879579 100755 GIT binary patch delta 273 zcmdnTe1~a*1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J#`Nba4#PnAjT>&39OV zXZB>X35EZEpKEiHzkS?@Gqfz}`Nr$7=QDh8VarLYNO@Ige0;6Isb$Tjh4c9ZoXWpH^C3}XU)t1FU z9YOt*000McNliru;{^f@9}$t?IYOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L0004WQchC8}|yK;;uq5y+M!Q?MzY?!CB4Bo4ij5`7cJ_ z4Y*#4&z1lxN`QGl5ROP8&fO^>9nTUH=WB;>rRSA^H1izMe@s+HusHPtFL$fMhJrFGI;c(V*>UE-hZ*JCzY~w7cMRT?N zrC`nuAf7tgR*H_iSr)k?i3x->yeu?R??iwFB|*jyG8qDgntVbB==&c(^#T$`E0+JV Ss=WXJ002ov22Mn-LSTYuo{kCt diff --git a/graphics/items/icons/grass_gem.png b/graphics/items/icons/grass_gem.png index df57119b27d3b6fe0d0d0049edfab9c492580b62..756a769cab2254c00ffe27353a6451c3ff4aaf4d 100644 GIT binary patch delta 177 zcmaFJ^oMbR1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1Jz`Ex;TbtOguZmo9}=E zhfAu&i@*6XF3DGS8>DW8|U+qb9g#~J(6yt5uN V>DI^n$OhWW;OXk;vd$@?2>?cgRgC}u delta 278 zcmeyv_>gIWL^2CA0|SFlq{3++#a`m+>&pI^nN?g^(qOviNuZE;iEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyaegRB@%N(oqKzyhWH$inS9|wg0iY=hg#zG3jwOC zqV64;X_mdKI;Vst0C>4ovj6}9 diff --git a/graphics/items/icons/grass_memory.png b/graphics/items/icons/grass_memory.png index 646568c412748023460c2d11430a035cb28fad9a..4ef16802d7f304a775ac8fd992021e4e96550863 100755 GIT binary patch delta 252 zcmZ3=e4J^51SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J!Kvba4#Pn7DM}MWGf2 z4p(L#mdpSC=Zoj)ZhxDaUYT{yP`@~KT0Pq@n}j7(IP$p?Tpvvl;y%ZAO|*T%Ne8(m z*Nz8|EPIT8R~l&_KCo?PprGjSt!5TGrOz^`e(<&UzW&)4k%<`-iv3yI*S=#*4vqI* zP&|L{-ouQ7p{JHujdV#^y)z4*}Q$iB}_Gfd) delta 346 zcmX@kw3K;*L^2CA0|SFlq{3++#a`m+>&pI^m5Gl{B~I&=7EnmM#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8m%t!rmY4ZKJ2@WzIvy>VQx>Zp5Dt)fl!{FZl9P--Q~G07Ex6j oJwL7LHF)o_zG-uyZ7(qB1P?mb7uY6T1A2tP)78&qol`;+0P+-tegFUf diff --git a/graphics/items/icons/green_apricorn.png b/graphics/items/icons/green_apricorn.png index dc821541bc81faf4287b45d7b1aa2307f0ad6ef0..da60f8544acb1172ca5f5a5fea44a82a524df734 100755 GIT binary patch delta 196 zcmeys)Xy|Qf|G-pfq~)r%Cn~?R@>JLlmz(&GyF#d2LigCfokeJT^vI+Ca#@$k?)8C z2g^~`jbH!&-!AlyYpY$EaD17O+lDFq&MC(?ec39Ml{)d8!{%_+Q02YqPG?pHgifoI z(JyKiV_|v!R!cC7wc~l1+Jh_YPBU08vS%>(-DEt?$HTnvNVP%i&xOWkAD*&T?w@xs p`S8P@($9UzekrH^54`_`>D&vJKOe0W}R;u=vBoS#-wo>-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+Tc9r;B4q#hl~>1u+9I11>Hu2TP|eH?4)8 z0&)thTQgC<*clX84Z^4g_>N1J%s;ba4#PnAkeeQRs*Q z2aBw-z>ojU;x3aVg16pzlg4s7=%0w&-a^|wQiAKbbPXqR*z+u!`@+V#BjIJa&C#hV z&EF@vU3ky`&ikculi-WrOCnulw8|Xo7>p0cC4F$+A`)7w6%-gF_-VGlq9qTklxmw+ zZJ%{?SMkGZ?j5rt`Cru7{Mt0(Nlo{p%M5aJw%2#A+VydY)_kUKvIYBU|IGQ+D*u)F YM;2?tg3{^Bfo^5+boFyt=akR{06fiW&;S4c delta 338 zcmdnMG?#gTL^2CA0|SFlq{3++#a`m+>&pI^NrqQZ+DOxUI#5Ww#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8mSZZ8U!18FP3k*TcKd_6cu%-}zydTGsI&3%ECZesWTU!ARgrD(}DNyJw%>k=I;v ir2fOh+x|D}FN?cx)3^Bjj%78_0}P(7elF{r5}E*P`GRTy diff --git a/graphics/items/icons/griseous_orb.png b/graphics/items/icons/griseous_orb.png index 5140ea3acde5081d0359d061c75956a6582af9da..e306e58661944a524c1f84d7ef2ce6bf26441690 100644 GIT binary patch delta 247 zcmZ3*e28g+1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J!Kwba4#PnAkfpn(wdz z4@>d~?%)5uzh&xW^3=LoKl5bL7MbJwon6*%x$;Y3!5O70@grxnvbMfyli8nbymlWa z*Y$JJSA7FqSj|{;#GMyTHWxg{!~(jD`!EA`1FYot8f%OkI~VRwv7x?%rgg)_A;SACyuo3e>*S;nb(JR41?K9HEP rX}VvqLP>qkn+Y#|KFEJ_yoTYdDm&-fn3O7@>lr*<{an^LB{Ts5R0?xn delta 351 zcmX@aw2FCxL^2CA0|SFlq{3++#a`m+>&pI^NrqQZ^y);Z2|yw764!{5;QX|b^2DN4 z26rEq06%wyveY64V?C3?)+G;tN;pai{M>;u#y~cMSA(WJkYY)9^mSxl*x1kgCy{lc zqJ2GMlDE6d|E27ojsj&FOM?7@862M7NCR>Xdb&7Ztbv^B9)j!%hb)CRKu2}h0Sub4C*#Mefms!gQ=mO@$5J|(6E4;tF9WK4sPCESf0;Pv}AYr`zTSVRaY1%C4RZJx4JxY zh8z10hUx3>?w&p?vq3lY&ZE0~t5;UCAIVkHvkuGWeI+nleM u-4xW9a=tP@maEy@)KuWF%*w{Zz@WOpdYke`n^{2LFnGH9xvX)thTQgC<*clX84Z^4g_>N1Jz`Ex;TbtOguZmo9}=E zhfAu&i@*6XF3DGS8>DW8|U+qb9g#~J(6yt5uN V>DI^n$OhWW;OXk;vd$@?2>?cgRgC}u delta 278 zcmeyv_>gIWL^2CA0|SFlq{3++#a`m+>&pI^nN?g^#7`}=1Slk4;u=vBoS#-wo>-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+Tber;B4q#hm1X1xyJdEKH0V?jAR9-0%?8 zN=)HlIVYf*m@KXkV8-GtA)l#~7iNxGc=ic6_AwCCWCSSOapscFep_X|4LV&8O zsC!3dTBhF9rFVdQ&MBb@03)4MS^xk5 diff --git a/graphics/items/icons/ground_memory.png b/graphics/items/icons/ground_memory.png index 0f9f31734df68fa62e50018d8e213aca67c17b7b..45ac4379ef3e5877d123d4b908b1336dc0029106 100755 GIT binary patch delta 246 zcmZ3&e2{5^1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J!Ksba4#Pn7DMJBi~^K z9+qStHgS)C|8KAJbu@Xq^p#xtlr>vrj@v7q7niX(HX)BI!s7UgtmleT6gRy})9__H zw}-`c((F0L1#5e!87Qw>bYSoNEfzfw=B52mJEHZHCAMkOQEASk4{ySkR%*?fI!F2X zPp#!aT^(t&_MGEN2-|&juY5=|-@)AH r2E1ODH@v=IKOix`V#WINzr5$|O=W-Xv`I1>=y(QCS3j3^P6*000McNliru;{^f^1{>&1#}@zq02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L0004WQchCVV2)I%Qd@bY@$Q3Q&eEXFX_I%~ zeF##uYE@XE%LsT&^Zkpm!Ir;QK rh@)jT%{1D55au13-EcOlr*QxPxl2Um+3b9*00000NkvXXu0mjf4LgXS diff --git a/graphics/items/icons/haban_berry.png b/graphics/items/icons/haban_berry.png index f413ea9e146a63b70d72f16e30dd4251358ed775..7171d2b07e04665177f7b9108da94f9d678f9b38 100755 GIT binary patch delta 223 zcmbQpyozap1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J%s*ba4#Pn7DT0X}-e> zJS>K56q(nozsa+Bd%#xjmmBrYoRe3yFXv75%up^>D^hUHy)0pi^lkhoSBfi=Nb{ S^Y4JJWbkzLb6Mw<&;$TX!D-I` delta 326 zcmZ3*G?96NL^2CA0|SFlq{3++#a`m+>&pI^m5Enfb@`Vyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyafAJY5_^D(19KaO7(;5OBRM9nrk$zsasJ zKL*JXU#Ctz(?|DOJF|s^cQWo>o4RaG=BzLK{g(gT@1@J1{Oqd6Tv?at8`LzzCSOaP zc35pqXp@coqJ*{5EnHfbuBr^)JhOupyhDmlN7UX@f3!^G#m4TbTmSanaQCpk_dPb) zFlYU}{`}{8HD6sF?!9EQ-?px|Y}Lc+vaL51tJ-#UCG29~t1{C}agN1oWBorT<@eht WPy2pn%^jel89ZJ6T-G@yGywp!<$Lo0 diff --git a/graphics/items/icons/heat_rock.png b/graphics/items/icons/heat_rock.png index 60eae816964f8b2eceee832da2ca518c10e11b5e..cbfa5985829daa9e757b23a6a5d2b277d2f9621c 100644 GIT binary patch delta 249 zcmdnQe1vI&1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J!Kyba4#Pn7DM}O|fPL z9v9x50-yfhzs)J5bL-p6&kaV`bDmlJ6LpOL8^o0x|JE*l``3AOg1$|j5CcwjggWzlh&(rV36it#h s8?-&oRsSg-Aj>Owv3U3XZGW$DKi&pI^NrqREU*q%RS3n{064!{5;QX|b^2DN4 z26rEq06%wyveY64V?C3?)+G;tN;pai{M>;u#y~cMSA(WJkYY)9^mSxl*x1kgCy{lc zqJ2GMlDE6d|E27ojsj&FOM?7@862M7NCR?Cdb&7 zY_@c2OW+h`oWbO#x>Ufx-NjQ-W5E-qXB}3WoLt%~t(wjX@_ObQ^9D5*X<036ZHuzx z;$pH)l9j#e>|8F(mX(??;l&FbKHj^VZ?IIRI6XTvbLqm1)zcb!lGiX4mdRT)88vRS zNltq;&p0#vz&b7c)i%X@be>O9oDn=PE^c0NRk(nMf7Q>8Tec|gE^lq>5z}TaD%vx> zt!ZgWQPHJy9c)thTQgC<*clX84Z^4g_>N1Jz`Ex;TbtOguZmo9}=E zhfAu&i@*6XF3DGS8>DW8|U+qb9g#~J(6yt5uN V>DI^n$OhWW;OXk;vd$@?2>?cgRgC}u delta 278 zcmeyv_>gIWL^2CA0|SFlq{3++#a`m+>&pI^nN?g^z|(teE>K9k#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8mLLPLYkF%s-<-E5{bE?&b_@;LwpX%Ould-L0MI`LoM<8g#cAm zQTL9_v`oFHPc;L&TY_Uwofb*d<0#VfZ`!HR;26TH$5_Pd#I)kH;LW=pLMluQ3ttIc UtkCMp2Reem)78&qol`;+0C?b4vj6}9 diff --git a/graphics/items/icons/ice_memory.png b/graphics/items/icons/ice_memory.png index c0f7cd76e8527420ce18cb2f1b452f3f3b174cca..5dad66f879b8442bd95a183292cec461cb7473b6 100755 GIT binary patch delta 241 zcmbQwyoYIm1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J$hdba4#Pn7DMJBi~^K z9+u77!oeJW{}*Rpb_ks1ebsiM9|O-$*Uny+EQ`ufz}D^8)QdoF!7 k|6{oCWAxp+*ZP%=XBV@5SpKe44(M(MPgg&ebxsLQ04L{h0RR91 delta 340 zcmdnPG@p5bL^2CA0|SFlq{3++#a`m+>&pI^m5Gl{q~i0fHlUDriEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyahGJY5_^D&{079N?E=Wo3PkqnIr0s?i^4 za`eWH7{Nn=-l2>|T?c}Cauxh`a?en{IZ-Sn=iR0(J=V(VcM7$?M%K z*X(oiqIsXK5Rq!xO9}r#i}XXt5o0b?Cdiu2;a_Tfe9)thTQgC<*clX84Z^4g_>N1J$haba4#Pn7DMJBU6h3 z2Xm{#!GHe`O0Nprz1!UKoJaEI+-g&!XZ&FfXZKA#AkC{(Y`Ey&tck%75>wRk*M&(} zad$o{ouuoeq$y$J;^XMI@L66!TY_NLTY=6A-NqLKxtGm5p_wparK;aOf5nAQ&czg| z{3>;f>%EhmyZ-!do6LfCzI(}LO6TMbi3ILBpRvu6v8+*HKD#W_*3fRj{&{6Qa-mm0 mNgVQfJ)g%uzvS$&pI^m5Eo!?7+U4!ayPM64!{5;QX|b^2DN4 z26rEq06%wyveY64V?C3?)+G;tN;pai{M>;u#y~cMSA(WJkYY)9^mSxl*x1kgCy{lc zqJ2GMlDE6d|E27ojsj&FOM?7@862M7NCR^Adb&7( pCz}H+l5*BCr8e)?;YfbW#PB&sr!SS?E(+)q22WQ%mvv4FO#ppjcqsq? diff --git a/graphics/items/icons/icicle_plate.png b/graphics/items/icons/icicle_plate.png index 2d3e27bbbac5016a69a9cd102859d359d225f5b6..7a74d45a55b764643a05ea7fa29567af6fb38c02 100644 GIT binary patch delta 169 zcmaFN^o4PP1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1JxvZx;TbtOx!xjk?(*4 z2g_8^KmYr)`PVGkVq3b$P;s(^SLO1&0=*3Fg5ZTl^O)Dh%($$;zR delta 280 zcmeyu_?T&eL^2CA0|SFlq{3++#a`m+>&pI^NrqRED`KX2Do{wg#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8mzopr0C>S+egFUf diff --git a/graphics/items/icons/icy_rock.png b/graphics/items/icons/icy_rock.png index 800b12ec87ab5935870339f21f7d634aa55bc100..56fe8cf4112941a8eb54204f209977f5a49a3f83 100644 GIT binary patch delta 240 zcmbQuyqjr)1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J$hZba4#PnAmzTTBzB8 zgEgR%MOfwc{k;67w@aq={i)>FXuka|!lk}wT1ZEvvE#WYA;r|IlQ>qcn&RTo%0A=5 z_cDfuN!#9UHQUAfh;tu@;XVER4(#qNXKWf3_pWzvmv4A?&o(BhvFgjrMfE;$4oVXy zCON1qy1>5d%DZ>F4Ng}w$i(b0ZRwl3LGlIDvE;+yH4P6qolhN2Q@8+Z! iYet>l55FH&pI^NrqRE@x1rBw?HBB64!{5;QX|b^2DN4 z26rEq06%wyveY64V?C3?)+G;tN;pai{M>;u#y~cMSA(WJkYY)9^mSxl*x1kgCy{lc zqJ2GMlDE6d|E27ojsj&FOM?7@862M7NCR>)thTQgC<*clX84Z^4g_>N1JxvZx;TbtOx!xjk?(*4 z2g_8^KmYr)`PVGkVq3b$P;s(^SLO1&0=*3Fg5ZTl^O)Dh%($$;zR delta 280 zcmeyu_?T&eL^2CA0|SFlq{3++#a`m+>&pI^NrqR!T=G?xDNsnf#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8mzopr0M_1N-v9sr diff --git a/graphics/items/icons/iron_ball.png b/graphics/items/icons/iron_ball.png index e1f82bde1d5f98b751a6fcea99e6425b145d3221..994641c8d320279f130a976edba412d07c964c3e 100644 GIT binary patch delta 177 zcmaFB^oMbR1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1Jz`Ex;TbtOx!!cQ|N#K z2TQ8p&;Q-c8A1zps1?5{6UlsgzG3+R53w_+49mkiyEz0?nN^&Rn+b5Q(t5pZG1C{5 zGcF(Z9d!KRF!jb7|2nQa8~pncb@sh?2KWb!3 Uc%oW2186UUr>mdKI;Vst0J9)cng9R* delta 277 zcmeyv_<(7GL^2CA0|SFlq{3++#a`m+>&pI^NrqR!@I&W$pa_F_iEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV~~2U22FV&#ggvm>&U>cv7h@-BI`s& z`+CMCZ+DmfOW8ji1`CTc_;1fE+pnj;Udq1wXUfKHd(+u3xbi7BUU@NHQesu=v0T=GgT2T3 zF791tp{TharK#!35#CA>mrKS>oG}M~)thTQgC<*clX84Z^4g_>N1JxvZx;TbtOx!xjk?(*4 z2g_8^KmYr)`PVGkVq3b$P;s(^SLO1&0=*3Fg5ZTl^O)Dh%($$;zR delta 280 zcmeyu_?T&eL^2CA0|SFlq{3++#a`m+>&pI^NrqQJ_esZOf1r?fiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyafqo-U3d6?0NAoaJp$;9*U;abUh62cNJLlmz(&GyF#d2LigCfof)Yx;TbtOk6tAo9~DM zk8|OPd?)WbkzLb6Mw<&;$T)m1(B{ delta 320 zcmZ3*)Xh9WBAJDmfq_9NQsFd^VlVOZb!C6d%EYUqV|zy+6DTBJ;u=vBoS#-wo>-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+X{*PZ!6KiaD+Q8@ZYtc-qcNS8NjtXSPlM zD7vIX>|M#)8CN1VoNJP^EBpFts@|pgQ`0}F*W0{bf8c+kf*r$&pm47LQ!M!t<~+4_ z=rB5d{N2rF}Z{2;T2CH4C)thTQgC<*clX84Z^4g_>N1J#`Oba4#Pn3y_=v9Be7 z!=IE)2R8lYo5W;ufop+IsT`zDX87KpYqA(T|;fCirmaP_x9>X z0=B2Nt!}^0@L|&~XgCan4_VtNHf0uHBlZn&b{oKiOmy@dc_xcNc=5+hd)b>Pk#`^%K2m_(~ z=V5#ao+s0NY<4XvwpR>fF0tklc-gn?mhR1YQ=8cJ_Fma+ulI`e&HZCn|Ns5{hjI00 Xwr2jhs}}(M#^CAd=d#X;DWM4f@Oyzb delta 370 zcmV-&0ge9P0=xr|7-Iwj0000ISs=>*000McNliru;{^f@EFnW}Y}5b%02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L0004WQchCb>! z3Kk-hw|g7BLtO=sa zI*-+@Fd&YMbmr<;=rJ$4cue99e2-o))|}>}Vo`9BGM@~5Ef>eNNOo^9UyIb67XyQ$ zO1b&iFtTKEZju#Xpe(xLd2Hx-y5FbgLsrwkTiQ5n?;qG5|L?Iws{5;6HsCh+{zjvW Q00000NkvXX1g=70g6O=Hm;e9( diff --git a/graphics/items/icons/kasib_berry.png b/graphics/items/icons/kasib_berry.png index c09fa20dec70f94d3dbbd8cb4645678a3c5539a0..a62c3e95cbc52b758b7b913a17307208e65cb6ca 100755 GIT binary patch delta 222 zcmbQtypm~x1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J%s%ba4#Pm^gKkqfn~> zhjTCMlYi>d8m?}O7oXpIdAfka?cCqX8~FFVpHb_feM^O5(JHa1?A#}djxW?o`*(=B z{TcW2xtU5cc6!|SS;;cxVwTsFQdXOLHcS_#Uwo2suH!s-cCnn-z1D`C6Yi}1sxkYg z?IBGOKRXizsgAR3=jNYcW%_+Y-|%zJQ_&yiij#lty?pDz(^bXI{puU8aIUpy&pI^m5EnJ?DvI}w}C?9C9V-A!TD(=<%vb9 z4DLQI0eH!I7)kK)`jfv`Wa4()<9M z#t*!<4s6$*WQrOe>=IBtzV70Z9WT~AJNw&s0>{VwU)E0d4{eL;bZ4}^wC4A9QHgM) zefwRESvTMC7d&XS$yxAPz<~nJLz{#w-g`97Y>H|9c6v{<1$MBcSpr% X&(h9(!LTj~=xhd0S3j3^P6JLlmz(&GyF#d2LigCfogg^T^vI+CT^YRD0D=D zgM~R+f{)(xcmV4f`J&vEST6p)O>*s6F@=p_FIk479YAVoW44$rjF6*2U FngFq^WI_M{ delta 318 zcmbQo)X6+SBAJDmfq_9NQsFd^VlVOZb!C6d%EYU~_ALG8exQ(eiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyae#JY5_^D&|b>-^hE&K*04eZ&EZ*!<`*R z(*<;Y9AR41aEOWH`$`|T4@@eNjZZh6?+XenxLW;d`Q`n~ekMyi@6p#;bK4^ZwCuLo_iW?# zr?aj&^KcbJr@mqIl3wY|bzlO=T*Z+f N;OXk;vd$@?2>@fQcH{s6 diff --git a/graphics/items/icons/kee_berry.png b/graphics/items/icons/kee_berry.png index 83749d1b834290f251a24847a7328cef4a855f3e..bbd6c53cf2eaf05e499b1ce50e9b8ad1ee93576f 100755 GIT binary patch delta 264 zcmdnbe3@y21SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1JxYzba4#Pm^gLfL%zcb z94+2UH6DEX*T0*2b?ju-+dmQy)y~n#xxIZshyN!z!waDki!@aQHrWLGTk@r;Evd1T z_+*70dk*h3t*SMA7w*=+@Vr*C*hyUYJEtFiWgN>a zmz6x+u6)jGn>9XeXgPRxQAJbYLcNPtM=iu|cd=BFEUfPxIXF1bT1;07-Iwj0000ISs=>*000McNliru;{^f^1`GB3*K+^>02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L0004WQchCmfS)rMgSEo!ZP-|lh{RGReE^*(Ya2F>;TF1kBob=%zPwcG zy<+Tl0K`{I83@K9*I``-%nOX>GK^%SExe|4T6KUvgyORwf6t)Tahm%$TPCI4@Nu!k z>DI0A17$H{(zTXP=M!15Ruva3(l{@eJDhM7r-buj&7{z&LbMPWxKT!!Y6q-*%}A#@ z0SgtC-3@G>7WnwG#>s8-bg3t#c8|R%1}@HEs1z_y)thTQgC<*clX84Z^4g_>N1Jz9Tba4#Pm^gQ$qu3Dz z4rgwsclA#cJ6`z2`iAYRQCwL&Z@adqm9>GhiLPw##AuKqRi>Iux571Mfw QPGn&4boFyt=akR{03af2IsgCw delta 325 zcmZ3%G=X`7L^2CA0|SFlq{3++#a`m+>&pI^NrqS6*e$X}04OA0;u=vBoS#-wo>-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+X|$PZ!6KiaE6te1)0}cv>e*2e93k{fbeg zieX{td7hVYKX?8Y^jXZzo&HAY?e*!EwVDU!KaJTqf8vWR&L{7rolHGwyxHqSRkLm3 z?-K?YoVKwg?WYu23}^5xVhm!mXxriYY?VT?Quunmr?K9;`se&Y&)i%2nQhYiJf~_o zhU*6p^*-DwnmUWeC2e2T>mU!=v)lO{<~Hekw?b diff --git a/graphics/items/icons/life_orb.png b/graphics/items/icons/life_orb.png index 9a9ed7c68272db9e6913f34583fa65b677706101..68aaa8e51adf602bcfdc39a1af3268fb49fbe7a6 100644 GIT binary patch delta 164 zcmX@b^qz5o1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J%TNx;TbtOx!!cP^iIx zgT%MX1XpAW~^ZVw2Hyg)z4*} HQ$iB}_|!{J delta 255 zcmaFQc#3I)L^2CA0|SFlq{3++#a`m+>&pI^NrqQmJJeLh4JagD;u=vBoS#-wo>-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+Tb*r;B4q#hl~>1z`g&F0KPNoxHrd4CYPP zv~lA^r4T38BRXeqa3~#JAvJ5-G`6Q4Gh1eeFPC(_!YQdfed%mfXUnvgnVG3KEHzGD y5@0jXTCUiW7Gmbz9NqOuCZv5)MPmp9L%p@Q;Da{vV|ReIF?hQAxvXJLlmz(&GyF#d2LigCfoiHfT^vI+ChiUJ6guL- z(Y52x|C5(9^p_c3Z<(#IDDHaugidx|)r4}@%yKRB%MbQ0$hziZbW2%@^+AttbYBnS z67@42FEpmPo(R!D$h&RvtEVc-oiQzhSPPd(GUJZZ0>%uRihGw~n0 m{^>1j+4Jk?{r&m%qW1P3Oh=V>6s-cfgTd3)&t;ucLK6TPo?d?d delta 287 zcmeBSdc`zBBAJDmfq_9NQsFd^VlVOZb!C6dB*QDOx~bRD5hx^H;u=vBoS#-wo>-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zCi68`?>!lvQAXA zuV+m1c6a%|l>O6Dpe$oakY6x^!?PP{Ku)8li(^Q|oVor71rHhUc$;N#aW5!gdOgYB z((FWKQ{1lq96R{fYaI1YPC8%2QLiL<&t~#%qslWOUbC`vSDiY3_vlg?XHNcOX@1KS zW@;}LK4dJeX~tGj%pU1?y|r+|3z4&7RkCu1+}dyZ%08~X9^-yDRjljmF2?n%Rx;jR f{_Q&V{zsh7_r*)zu8Ii*x`x5i)z4*}Q$iB}2yA6< diff --git a/graphics/items/icons/lucarionite.png b/graphics/items/icons/lucarionite.png index ea4955c8a0ce049d135b42f8f9e92691c877fc72..b429914872883fa1b29c5097578050b42cc242ff 100644 GIT binary patch delta 171 zcmX@h^o?)thTQgC<*clX84Z^4g_>N1J$H@x;TbtOgwwRo3BBE zhb7>b^U-_%_xO261Qe{@JZC!Rt)PE`PTNeoPkE($4X{0%@p65(I&pI^nTeT4H6$wJC{Ree#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8mLxJ3H(RYwcXU0e{lI;Lj9u}-F?J_*ZC zwy>==vg6qN#pi{R^o*rEP3co6%C;X_#=^iLa#>cA-DOVBbfAR{p00i_>zopr04oDk A!vFvP diff --git a/graphics/items/icons/luck_incense.png b/graphics/items/icons/luck_incense.png index 396ab2f613214054432e0b2c30cd9a8cc6643679..6a14050cf92518cd4b1c12a676a3e09ad87c2860 100755 GIT binary patch delta 232 zcmbQjyqRf&1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1Jx|@ba4#Pn7DP~ZN9?_ zJkGCs1Sb9a|Nq>S?B#y9PX7^T;Xf!Sb3C5K=2la9lg*8;DG_$NCY&wO+SVodwi}a?a@9I(zbq%nvzRMgvInSrmx&LD{rM5 z7c!_{@+n+7n{&~^wBrmx!gs^1*saq}FS~dlc-h{cDnhy~>?!rGOPbbA$~(V%-^0`9 b{}!05)Uz3=6&%?BbS{IZtDnm{r-UW|*C=ht delta 329 zcmdnYG=+JBL^2CA0|SFlq{3++#a`m+>&pI^m5Endr)X~5I-rnviEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyagrJzX3_D&{07C@>muDctZm)W=n@ZAC}2 zf{))Co5gEw1hpn=#KpyFuuTjS710*)7n#HH%!6$iC)YAhJr?QNCZ;|C2F1&yJY<7^ zteWYtVU9&j Wn9N{v6lwsvo59o7&t;ucLK6Tud2K2H diff --git a/graphics/items/icons/luminous_moss.png b/graphics/items/icons/luminous_moss.png index 6ee31c5e1b2e25f0bee21f6fcc51c3edf680537d..b15ba36d8e3cb40a002b264ba3823991aca7ed2b 100755 GIT binary patch delta 213 zcmZoJLlmz(&GyF#d2LigCfol3aT^vI+CeH1<$ah46 zgN2nvBw8z}x#uJZom0%=39!{h;@8H)EB^2cxUy^QK$1&fCp!LZ&>}p{M6W z<$q?DsR0)wcZi8O9y!xmq8Y-Y*kd|<=c15bULsn$qN=N8!X2&Vw^|0QY;L}-GRwMm z$9B&a%NUoKKM@s1wzp5L?EW!(?sr2|<6LY0-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+X{lPZ!6KiaE&%2e>6BS~@X#$Rw)tF-$UY zb4{^j;%RCsXk}_zx314XZt==hK^=-c!b_H|dd2ZHq(xP8rdnVBL@ybeLHFIZ+7-`+KvM7mnO$B})`DSKj_iDM44$QipdGltun1jXX`*SRd zpIJ^h99sVD%ucNtkFSNST@}gjxIi}{qSe+Rfq_9dLsi#9-#Q2ANCr<=KbLh*2~7YM CWoUu` diff --git a/graphics/items/icons/lustrous_orb.png b/graphics/items/icons/lustrous_orb.png index 08b452aba90db20f9785705e6bf8636b4bdec194..ab931ff4684920d676abcd03a3b0f9f6c6d098d7 100644 GIT binary patch delta 257 zcmX@be1>U)1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J&&Iba4#PnAke$qR?Rl z4wh~S!H)m`ciUbGnO(B%`;ONOFYbx^?=(eVk+t6(ewE^1L7n|E5)*3*ZdnwZ56CQh zdAdDuCy(K=l%Dk-GtO+`y0N2smzKtftOFfAT&(@AQ@t(1B&2dDSLo>N3^8tevDxX2 zV#bV>zhV{2gtzTjxud-C?A4r08V++z`d5GR{P4`gzF=mc$MvZ@R`Bf+U35uiX$On_ z_Sd<5s*UA*kJYD?zme`=&gwL4`SI2N|4GiPWcDcH{1CRPMhWN-22WQ%mvv4FO#n-= Bd!YaT delta 384 zcmV-`0e}9?0?GrB7-Iwj0000ISs=>*000McNliru;{qHF9~kQ8eNX@Z02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L0004WQchCOla0;NjEze{Qo?Q~Ar>9Y#wLa! zRb{5379AbN=0J6fCS@R*j^=V_0R~3*)V3nr2eD3IwL_zAXT>w0stjy>j~Q zLm=mPSI%0sa%T13jUb1{Zm*m%yZHHzN=0000)thTQgC<*clX84Z^4g_>N1J$&7x;TbtOk8@=o3Fuu zgC$^LK-ByC1lcIwACVF_XPk*Pn3np}&_&F@KK;vSv0 w+%oIQexpY}4*A`CRVMtYtUrB8J9pg-UP(5VLz|C$0y&$()78&qol`;+01v)kPyhe` delta 301 zcmbQv^n+=FL^2CA0|SFlq{3++#a`m+>&pI^m5EndQbo_H7bqlN;u=vBoS#-wo>-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+TcDr;B4q#hm1X1NVQX=A6`gsv6+;bInmTRe`=4t<_Ic6qa)&+0XLcx!KcG@CJihBKP#P$x0oW4)Zn| uUfAN)vAc1Ph=lYJ{uKbLh*2~7a@Txj3` diff --git a/graphics/items/icons/maranga_berry.png b/graphics/items/icons/maranga_berry.png index 2551c0167b24e40e13af93973161ad854d86142b..d56ce9643c4cf1fe3ac0032b969fc0f9f5b01649 100755 GIT binary patch delta 219 zcmbQpyo_mr1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1Jz9Rba4#PnAkfpn(wdz z56k8s8}Ix-vei*wLC7mB`!fk5hd=+3e{g7%*FkYnjWcD<35x>r(z+R3w;VTrH+l8F z@9)`^x&`;#5m#P*F)!)(>6=!YH0|fJom;8YXE^KlhGUKH&Ubv>`5*U$eOB0TZIQ7pJN`)vvr1W-`wMqR3H9x$rV3W9)0WGqn}65*D!QyGGAk9bXpE{ OA%mx@pUXO@geCySOKJ%K delta 326 zcmZ3+G?96NL^2CA0|SFlq{3++#a`m+>&pI^m5Gmy`L{y6BTz`Z#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eSz9H_H+M9WSyvJ zU(cB2?e6k_Df_3RKv~9;AirP+hi5m^fSeVcE{-7;b8;taog9&$h@s+OXVu@8p`YNpt*ug)!9`@|oki}C+*}qFF?7a6=qhO`c21dHu3_uRey=)rF5|njt=FVp zefsyIPG-5KPVKv|KW;hAUUd6)rt!k!Yw!ARvM`87^K?&V^xkxTqKJ)@MfC;o6e-20 UBF0NpfsSVIboFyt=akR{07#>E0RR91 diff --git a/graphics/items/icons/meadow_plate.png b/graphics/items/icons/meadow_plate.png index 5cec7fc16726e4e8acd23eda2d9134c1bd299d39..6571446bb5ff15f15491ff4a118dfc3a489e31f0 100644 GIT binary patch delta 169 zcmaFN^o4PP1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1JxvZx;TbtOx!xjk?(*4 z2g_8^KmYr)`PVGkVq3b$P;s(^SLO1&0=*3Fg5ZTl^O)Dh%($$;zR delta 280 zcmeyu_?T&eL^2CA0|SFlq{3++#a`m+>&pI^NrqQmh|6G#A5ciV#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8mzopr0567NGXMYp diff --git a/graphics/items/icons/metronome.png b/graphics/items/icons/metronome.png index 4aa57f95e0c3d5e8523f2bce2a25557b981cf0f8..4270fcaedaa7b76ef06feef2fa6647d1ea0a6979 100644 GIT binary patch delta 187 zcmaFD)W$SHf|G-pfq~)r%Cn~?R@>JLlmz(&GyF#d2LigCfoe)UT^vI+CN90;$#+13 zgEe43$BOUv1s87|X)L?=ua!GK#h^u=QQ&U%q9c6{A;OP2Wg1s)V*aMk{r$*-Jq+`Y zu5tZ%Yx_*LHM`F=$mXot+_`muPrB{~j-@I})&cuApJQF6T;iavZhdWi{)Nj72X#ZI f|5aMn(!Z0T)sdxXiG{u<&;<;hu6{1-oD!M2ZN`ppUXO@geCxr1zkn} diff --git a/graphics/items/icons/micle_berry.png b/graphics/items/icons/micle_berry.png index 74e011d0e84687d3fab85fb3ad8bf46b85a03dac..5e108e5a19bd028cbfda322e7d2bae73a8c3d4fb 100755 GIT binary patch delta 160 zcmcb@^qO&k1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1Jy)%x;TbtOx!xrk?(*4 z2MgoV|MBZCP0`^nw?2L|AwuOBrx}-SvSQ7P%q2&*ta{fnIo!7Sfnq~>kioL%?AqUZ z_Q`bEmg!$FWSFRS;MScAo=-Dlo*(vFx$^GbP0l+XkK DGeJtT delta 265 zcmaFOc!g<#L^2CA0|SFlq{3++#a`m+>&pI^m5EoI{hng|JD`wwiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyahEo-U3d6?3Nc-xX|7;Awuz)+Ai9qhSg! zhxCbmt2wq5{8(1`t7zw!<1_4)vbUe?`#FP0A>+ve?nx3>#WRmBoFcu)v*Fa?BT?>? z7;{5-*TvnmJ}viY)thTQgC<*clX84Z^4g_>N1JxvZx;TbtOx!xjk?(*4 z2g_8^KmYr)`PVGkVq3b$P;s(^SLO1&0=*3Fg5ZTl^O)Dh%($$;zR delta 280 zcmeyu_?T&eL^2CA0|SFlq{3++#a`m+>&pI^NrqRRNxZ#93n(OB;u=vBoS#-wo>-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+Tbur;B4q#hla&XL%bGcvur|9GEZ2!Kbi@ z`2~x>A-1Ati(Y4E9(B9F^8Ug-0g85+ng-rmr>@~WkR|&r!oj>P;9~TVn1sCC^uuI>? Y5M^cgtTQrE8R!fKPgg&ebxsLQ08YzcQvd(} diff --git a/graphics/items/icons/muscle_band.png b/graphics/items/icons/muscle_band.png index b374760a7121253f34a3ed229a554c914cabcdbb..1954f8a56bda97b2e9694d760c4ea2cedceaf765 100644 GIT binary patch delta 243 zcmZ3)ypL&u1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J$hcba4#PnAke$Hs4_d z9_QC8a%=wl|F6fHqsy9Ew?a#P4)@!_KjJab@iEd&riwd{E$}k+eT_oAyxnU3~e`MrmETiRi}^nj@C-kt@!)lXkeWsDb^`l{yX mffsSp*Pq*W;#+#f3+DQZELT45zd04?at2RVKbLh*2~7Yz_i%Lp delta 343 zcmdnTw1|0vL^2CA0|SFlq{3++#a`m+>&pI^NrqR>JVL+F11Kb3;u=vBoS#-wo>-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+X|SPZ!6KiaDtl9Qm3I1Xu%hz1SE0g7H8B zg99Ifrswpq+sqYgz7ac;L)RZ*HQC!Vy?BX;@0_c9Qa)MFRr#sikni8slSD6YQ95`za`**x`cM{S8qP zZU!q4MJA+ps!cy1XTrV1j3MEd=&Ff9zKn~D&Yfla(mLaBm-M&A^ABB`Ia^-3V^{V6 nIoJ3Z*mk_-kgDSsdd)thTQgC<*clX84Z^4g_>N1Jz`Ex;TbtOguZmo9}=E zhfAu&i@*6XF3DGS8>DW8|U+qb9g#~J(6yt5uN V>DI^n$OhWW;OXk;vd$@?2>?cgRgC}u delta 278 zcmeyv_>gIWL^2CA0|SFlq{3++#a`m+>&pI^nN?hv{nQMNRX`!}64!{5;QX|b^2DN4 z26rEq06%wyveY64V?C3?)+G;tN;pai{M>;u#y~cMSA(WJkYY)9^mSxl*x1kgCy{lc zqJ2GMlDE6d|E27ojsj&FOM?7@862M7NCR>zJY5_^D&{07EMQ6yVPRs_aQC=*Yd%Q*qf#AI=W05cYE329d5sg}~sOC;uoI`{TY4e>c3Gx@@W1Z7p#4zJLlmz(&GyF#d2LigCfoe)UT^vI+CLX^pTR`vLPW%VLF3ALY)7$9jMG`bRq@oL7BWb|JshqC!jEywKf0 fYCoORzsml-ih0h~tkuteE@1F<^>bP0l+XkK>x5SO delta 291 zcmZo;ddD$rc^V0u&N2ag8Vm&QB{TPb^Ah zaQATu@N-uvOD$3`)-x$=UGfm9grlUu&mAaZ3}iESHE7BMDVB6cUq=Rpjs4tz5?LoI z+SfBCdAqy(U&{XJC{UKMB*-tA!Qt7BG$5zd)5S5QV$RZjN3KH-Jg(~I1*aTro1*&z ze$3*YA^3gUqfHYMugM*9&0no5d6()thTQgC<*clX84Z^4g_>N1J%s;ba4#Pn7DP~LB7KZ zJkHs|v!48~ukdV`>Nj`G=^Bnn@@kBIkM)`4au=C?I5>^v(@dxQwe!=jNhi9$@n^JN zsMKSSY`;Lfk+Z5Q@@k>!f=-?VSvB%*neUdV7Uv(j>XeJ_KQ WIIDt{zEc6vtqh*7elF{r5}E*~(qzj3 delta 327 zcmdnMG>LhFL^2CA0|SFlq{3++#a`m+>&pI^m5Eo&kfY(Y8Bj>P#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8mt3!SSL0$PF^IXO8RToZ%DMNCEbM08k+Rb-r5S)GrnH}&#n6^e@RtPfyanOrpQ zW?WpH;boSTT~#YTp7ESz+%GT!kf;!W?RvPBzLbSXi0_wi{}3GBpZa;cqHnQfFXD?bR;g TxfJpQ=xPQ}S3j3^P6k$ diff --git a/graphics/items/icons/odd_keystone.png b/graphics/items/icons/odd_keystone.png index 8ef2d3cdb53688d349b5bfd6ec041ef49cac5b7b..8da9f26aa9f011bac82e6f0457a3b5ce8613049c 100755 GIT binary patch delta 214 zcmeBXUdS{-f|G-pfq~)r%Cn~?R@>JLlmz(&GyF#d2LigCfodjrx;TbtOk6whG~ZDL z4wt8fC;rzLvS+U?tt?ibc+^tKaLc#v9LBFsP8AHB+`QXbW!LZP9GpUHY|9ka-4(uA zy}hBPB`d9<#dXdhq3spXC%8YUXgm_=RQxurnx$Z$>CWm4Q!1Q%IE!SX$^%ut2)>VY zs`&g#B*Ixu?%uZj+=p^j?b`oWz>xXP9-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+X{*PZ!6KiaEU(y!j3(2(UdUV!pMYntgE& zuP6V7E61mWNo~({vTg9SIr!yHA5Tv2=11IrCQEibdM~t8B-M>|x7X>Cjrn&s+p6lM z$E;I!md!u>TlB|Vrp--rjZK7NdQ3PnepUJy1l{{m%G1gA;bJD+)A!<6N_jL7u=yNc zk-*Bd{q`Z3896_kE=ckv?7W@eY4yY6P};Ij_dZ@(@*p;D#ga+(_K%spC#a;doN}=T PI+wxI)z4*}Q$iB}Fza{O diff --git a/graphics/items/icons/old_gateau.png b/graphics/items/icons/old_gateau.png index 064c997a53bd06883611d753ec8e1dfa7e0e68a7..93edb8f97e3ee61b5275d0611c881dca609b9da0 100755 GIT binary patch delta 153 zcmX@b^n`JO1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1Jwk3x;TbtOguZmn(u%C z$5929mw)r`v>qy6(l_LIT{@gWb vt7W5On9~JmlLr}`e}dR6r2ppsZjv_gV3BV4w;>g1JcFmJAFIncr-UW|WhF*? delta 255 zcmaFDc#3I)L^2CA0|SFlq{3++#a`m+>&pI^m5EnN`m(jq1E7$2iEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyagJo-U3d6?2jk7H}nqurMiVxZjZA;8`fN zZsEd(2RjA&I3~zuP3usZ2*ivJ9aI%$RJLlmz(&GyF#d2LigCfoiHeT^vI+Chnc+DRw}C z!^ z$%ffyl|T1XYsKzeM{_Q9UE{c>@gs4HUz4S3T7$z1wh#U3r8=LUZ<-djRTpfeaeUHx3vIVCg!08%VgmH+?% delta 289 zcmeBXdc!n9BAJDmfq_9NQsFd^VlVOZb!C6d%EYTBwCedP7od=MiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyah2o-U3d6?2jk6vPdrLp>@aXP#RhXg7c)thTQgC<*clX84Z^4g_>N1Jz9Mba4#Pn7DPKr`TZw z4rg7q*}vyoH0|+Oa(8RgE9u13$$uO@YCpN2ebdS?Klq5x#lG`fJ=RS8blq!zqh00`)lQ zCI!6-Nda3+OFcJjR;aX@b9v^Zhx`Zfij@}|-rHLLb6I=_vk4FL3TxZNQ-F?R@O1Ta JS?83{1OR$QXhr}4 delta 308 zcmZ3;^q*;hL^2CA0|SFlq{3++#a`m+>&pI^m5Eo2Q=ut&1yD%5#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8mdsx+nE{@CR^i-kh@T(1m2@+W`{4x2xAimj$lrSNyfGB*G>4_*u2-eSwn8W2%m* z@4Jy1vVZ!@^r+Ca2K+M@+)`Z3BDL&Bf(`>SgOOD-?Nmo*)iT|sQo@hRArM%bP0l+XkK DhM95F diff --git a/graphics/items/icons/payapa_berry.png b/graphics/items/icons/payapa_berry.png index fe021c473ec4a2cd04b29db04798f2ec2b5038a5..fd9ac891aa3e000e1028076ada347ca9840cd91c 100755 GIT binary patch delta 218 zcmZo;Udl8JLlmz(&GyF#d2LigCfoi6Bx;TbtOzfQ$$ah46 z!^Jv__3hvHyBA$pwDshqFYVK3GQKJN6Mn$mzQxwDgELw*$t(XV=aV^)xEnfV78^(Z zj`0!{iuLkt`7(8eq=MQRu7rdc9{zT1Yj6JET6U@H9fRTe>#1%ne)eaX_c#dc3T3Xl zWY~Lb_tOLB4<#o|)O1u0yF9ZbH;%RM!Y_fxVOy%LcD_4azu_AHnQFG4vjNqYfDUBv MboFyt=akR{05JDwxBvhE delta 315 zcmZ3=)W$qPBAJDmfq_9NQsFd^VlVOZb!C6d%EYT_wWU6=7APcM;u=vBoS#-wo>-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+X|gPZ!6KiaEIx_VO|r^0f9h*@?NXNMxSz zfQ5MjlU1i(?5*q*r`gP;70hz`C#FjtlinGb6*x_ zCfF`3eEZ?h`Ql8aE~OcMC*9=&cBlvR7o^Nc@!kCKtC+%*4SQ?E5?i7@PdzBoamlrr z&80Q(w8IMlN7nUAZ!OC7SQUNi3t!sZpo3dK+unJfvFIK1tbMVb7Soo^Id>80QU*^~ KKbLh*2~7Z75P4_- diff --git a/graphics/items/icons/pink_apricorn.png b/graphics/items/icons/pink_apricorn.png index abcedcba49d70b5045f309260ee632dbd94e059a..817e0140c395634872a1188fd559564bb226a159 100755 GIT binary patch delta 196 zcmeys)Xy|Qf|G-pfq~)r%Cn~?R@>JLlmz(&GyF#d2LigCfokeJT^vI+Ca#@$k?)8C z2g^~`jbH!&-!AlyYpY$EaD17O+lDFq&MC(?ec39Ml{)d8!{%_+Q02YqPG?pHgifoI z(JyKiV_|v!R!cC7wc~l1+Jh_YPBU08vS%>(-DEt?$HTnvNVP%i&xOWkAD*&T?w@xs p`S8P@($9UzekrH^54`_`>D&vJKOe0WNo1X< zXkX8m_b7?W~xX?V{ZBI4Cdf-7QOICDli9e2-L`EZd$vRb42!wlN^}>CuG?7bY?#^i}WF zoFL5gY{m|W_CuB@k9iBu*|H^sB|SPSOydlLIon1P0e!Bd{t_vPoR%HzhZ=W9ODQr= kVftit$mU4H6U!u^V~e!n7N5!A19TIEr>mdKI;Vst0Caw0pa1{> diff --git a/graphics/items/icons/pink_nectar.png b/graphics/items/icons/pink_nectar.png index 21e88d3023f524f4db91aad886bfa76e86f7bb81..9fbe0f76b34f750ed9aa14d5de1f8ce4e5b7d6cf 100755 GIT binary patch delta 211 zcmey(G>>V51SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J(3;x;TbtOx!#1B;R2L z9@c}>0@MEgzhk#pCZcMMRgj*sg0gyxy->WKzsgTe~DWM4f DGZkAN delta 304 zcmbQo^qXmdL^2CA0|SFlq{3++#a`m+>&pI^m5EnV{d%SC5}=THiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyagTJY5_^D&{07CfG4`BYk&~07!tj(s zT3b_7`;bacOw5#pK|QP7yu6M%2J{tg*jTuNbIRltDXA=$=Mt7PSIuy=Nb*#Bx-KiL zQ^0SRoBQS{sTSqPdlxUhnQA6@W}@BYix)4MIu$D)Y1pk^4nNx@mRa^OVnA<>_f^DlijdV9@!gdQ32@aShOU44$rjF6*2UngB67Z2JLlmz(&GyF#d2LigCfokS>x;TbtOx!v#n(wdz z56k1D{ZIdizmwAB_5FM^ilbBVwnDMYf6mtxha?*A&o#KCyy=Icj-|_9wd9;*b7q!= zCB8Xy=dx$vDuzlaZBdi-;(qT9l`BKd52<-2OFVdQ&MBb@0MdhLtpET3 delta 318 zcmZ3>)X6+SBAJDmfq_9NQsFd^VlVOZb!C6d%EYTFlU8)40VpJ1;u=vBoS#-wo>-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+X{bPZ!6KiaE&%3alJlTnaZ%dG$3JY@6hr zQKj5+c1EJqGdpF8MFC564=;|9Jd{}C`7&dDhN%}z;SpOSD=n+0*n={i+xocppC*KM z_(Z3>yRQzE=s0|1is9ZxN;hnHQWzEoFWD6ouzF&Y)Qrn9Qc_Y^bP0l+XkKif?P{ diff --git a/graphics/items/icons/poison_gem.png b/graphics/items/icons/poison_gem.png index ab339eb718deafb709cadd530e61f3cad86dc403..8e78855276e955c7c10d03a7ab250c36c3c43e03 100644 GIT binary patch delta 177 zcmaFJ^oMbR1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1Jz`Ex;TbtOguZmo9}=E zhfAu&i@*6XF3DGS8>DW8|U+qb9g#~J(6yt5uN V>DI^n$OhWW;OXk;vd$@?2>?cgRgC}u delta 278 zcmeyv_>gIWL^2CA0|SFlq{3++#a`m+>&pI^nN?hvQTcc8e4vnciEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyaegRB@%N(oqKzyhWH$inS9|wg0iY=hg#zG3jwOC zqV64;X_mdKI;Vst0RPrjKmY&$ diff --git a/graphics/items/icons/poison_memory.png b/graphics/items/icons/poison_memory.png index e665d8176263237afa0dccbb8159920f8257edf4..270c8697dd9121f17659d8feadffd59aeed54fb3 100755 GIT binary patch delta 247 zcmZ3?e28g+1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J!Kwba4#Pn7DM}L7`>^ z9+%i89+4ye|KH9F(Ac`SWS9E$y$5*{BmZ$m?R%i`TB|DfK$_l)M>!jEKZ-1}l3b#9 z!dZf;|4L7X!1EY`7U^J9)qCH&4rb~w9{uP$;q&TAe2q^sdliz`{GNExJ$3VPfAY!{X=PLOx5!PgpN3b?Qte rm+1E=(YyAuP5;>G|MhER{Yl{+0qlp>MP&~IUC-d@>gTe~DWM4fH6?hW delta 344 zcmV-e0jK`L0;2*000McNliru;{^f^1vMYHnHvBA02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L0004WQchC+>nTD5BWM48=pVVp_<#<%yt9Lbq86&V=szPrB>WN=zWY9NE`-Mjxl21s<22MgZ4 zd;c}aXz_B@((t|a?(YF}ih|uc_TB|+VGvgZx<&i$Z?K(=!7eVQ(GXP(j9Y;+L8lKw q94)ie*mUJLlmz(&|3?F76*o-*s+r~K;uxYavGr15+a(#IF9h4)H&x2u_^;nEy-w!CiUtqZHzv%ArsO5)t zk@jS#o~+H`y>!e!p#GC6CeVF&e`mdKI;Vst0Oc%Yi~s-t delta 320 zcmZ3@)Xh9WBAJDmfq_9NQsFd^VlVOZb!C6bBQMOxSn-M>0VpJ1;u=vBoS#-wo>-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQK0O4PZ!6KiaE&%2N;?>a@2I$WL$T`ubA$yj;(%-pjN6NDXv zHv6A9(A6(xDYQv@XURQw6$&L-Ct4IRF!1D>?p708p8@ir Mr>mdKI;Vst00KU4f&c&j diff --git a/graphics/items/icons/power_anklet.png b/graphics/items/icons/power_anklet.png index 3a2091c8ee862346c780002b5a414f3a992016a7..be1982645b982242180700d53c7d6862a13cbe13 100755 GIT binary patch delta 236 zcmbQwyq#%+1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1Jx|^ba4#Pn7DM}L7^iG z9L`e%4*dWBP&G^TZrQg@KCcz^9ghb6Td5WKRk7P)z4ymfjoCLHs)ct2`z(aDefhZ$n$%omUx?RXjx3p4{`J=SkzmgEA+(0@CN3RxI3je{SB*WqwAlCj74c gG5gQsz45P@_l2_Q)&|^f0Xmt%)78&qol`;+02-=vjsO4v delta 340 zcmV-a0jvJE0-pnr7-Iwj0000ISs=>*000McNliru;{^f@DF^Hq9c%yq02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L0004WQchC(y~=nURc$#k6?5HR)j$m%(|@)1XvX2_tyGY?5~iIF(!QHe~) zIPUH+zzQNbvjL$2Sm2SM*9$~NsBN7K8D88YnC+7Jf=5f!A_*@ m_*q(1n)UTUR-6C*flY7sh&4&xqKgLr0000)thTQgC<*clX84Z^4g_>N1Jx|?ba4#Pn7DMJx6ok& z4(D8#o}K?&wV6HVF1zfz_0tQ*pVx2MzjFH8uFGW0ca(im?Gm;W{euxvf_FP+tc#Ro zcJ^FzYmrTd+Dec1eN$DG4^6aOzVL)(BE#hsnT|?I8=0r&UYZo<@`NvH+rm|569mKV zAFyeB%y-V$LE!jXHhrf9neE=Odz5TGe7gJEbDhVJn0S7D6PtH_GjrDKCEC9E(f|C* d`~UwIiJyPKX4+Jj{}t$922WQ%mvv4FO#peyZ(0BV delta 342 zcmdnWw2*m%L^2CA0|SFlq{3++#a`m+>&pI^m5Eow!a0jk04OA0;u=vBoS#-wo>-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+X{nPZ!6KiaE6tHu4=(5OI~CD>K_-$E0gZ zcK2^F`W#ii;0JT=u4tbR{4a9YAK&K+%Zb@@+4dm=Kf}NF)JUo7N!Q;h_Qqz{+UfY& z@$6mJ$F7lemrvDnx&o(u;Pv1S+e9u+Df#67CgbW8mO%F|W?}bi*@>?@otv)p&DJ(m zVvxtNzOlc9=};~KP8~=A#dlz$<8wO mot+zhygksh_5Z&Ev&6IcO;2XU1k3|^g2B_(&t;ucLK6UBnSi$d diff --git a/graphics/items/icons/power_belt.png b/graphics/items/icons/power_belt.png index e4273f85c649f5718c320ca4e86ef05514036ee4..456793fb99032e3298b6c562641cc25fea7c419f 100755 GIT binary patch delta 233 zcmbQkyoG6k1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1Jx|{ba4#Pn7DMJqu3Dz z4rkF7C;sZ&G%mW@mv1)NH~zD4h|W{_(56?@eUB8y9@1yo?O4QlAxg;X$R?qnDGQbv zvMjnO_Vh#Qgr1Oi6P62ZEgx=IUw`nnQ{h1D!gc;FN$h3OD_KH!DqCyZD`OEXJfQtT zSRy|mCn-(l_}Wv`SQuV2YUs}sl(DEeJ@HJ(Zw4!N|9uAU`qp1EDplWZW_{1u|6Bie byBExRD%orm9t9f!-OJ$V>gTe~DWM4f4gP5N delta 337 zcmV-X0j~bE0-OVo7-Iwj0000ISs=>*000McNliru;{^f@C@aU*K+XUF02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L0004WQchCa- zNEhGtH6G>+`@Tb$36yo)bYSoa2AFbN6gjwEc*Nd~V`R8wxJjE+2!sen%v1s) z44Vgbuz>R4Ks>?C@D#8xL&ylPu}YQpFV2y(QI-}Jmk45%b9R=SJj6lXka#;1*kL+a jmB9LVrOVa-{=lj?$RRa5U6?NE00000NkvXXu0mjf1Av0! diff --git a/graphics/items/icons/power_bracer.png b/graphics/items/icons/power_bracer.png index 54aa34844bd5283d773bcac0014076c6814cfe82..9d3d37781bfde21a49b2dffaf6445bd8007ed78a 100755 GIT binary patch delta 226 zcmbQpyq0N#1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J%s&ba4#Pn7DM}K|U5m z4rfu3XaDzCL@OM-cs6d^bkDfut{b=3UtxVEE_RXeWul7UCLgA5bBP4Dt{P4#5E!dv9WHRrMG)Ei4Kde%vt{nX{R>al@@qMZKW%!GTU z%55RjKkm5uMN^%pm73;VSRPrbsH>{xr0`+#sc|DN2~RgVsQl>2^v|NYG?96NL^2CA0|SFlq{3++#a`m+>&pI^m5EnF{#nA7YM_vKiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyafAJY5_^D(2KqFyw1C;Bl3mw$5X!m3zQO z@#rbG&zMAI7A*0~7sxxX^EY#E!1SuB__}R#1pev=ho(MT6qbAXO!KQ7@BD0gtbETc zyO5D|HF}auDT64zkR_K_P`hV V>*cf3J%Ns9@O1TaS?83{1ONkFdR+hj diff --git a/graphics/items/icons/power_herb.png b/graphics/items/icons/power_herb.png index 947996c4cdd69bff960934aced314188fc0dd52a..68225447fbc626274f583a5cecc3506828f9ce78 100644 GIT binary patch delta 181 zcmaFJ)W9@Bf|G-pfq~)r%Cn~?R@>JLlmz(&GyF#d2LigCfok$ST^vI+Chnc!&DUVS z!TR+2wBPX&3od%Bv{pX-aIfM+i#mCRFPajaGnYPO>n=Ri?XlV8{Z7NjHnXy_e0Eoc zh|a6~w4=Jpu5tTv5xxF(te>|ib#X6#_PFUO_jlJPoYT@5%r{lsReA5-(sSCgmx=$o aI%i1>vtYmF)&D@d89ZJ6T-G@yGywpy?^ryn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyaec``X~mu(c)hT#J{%3I3YJU~y7RH8AaKITBh^w|3_m0# V_uZ=2l><70!PC{xWt~$(69Bj_UO@l= diff --git a/graphics/items/icons/power_lens.png b/graphics/items/icons/power_lens.png index b18d9118603721027c2f2de4dec3010d3d6f5e47..742db4b4dfaa30c8830d59f29c94d7d49609f760 100755 GIT binary patch delta 244 zcmZ3(yq{@;1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J$haba4#PnAkcgQs}S( zk8`rj%?bDZ@7sF7;d0utU#DKUK4^XXL;qz}L3i6J+16^mTBTcD2k!WEZj&!t>nG@| z^zixz_Kyli%wd}Tk!~*jY_BxFv!982!X~oY<@lc1M`rAo+&pI^m5J9#;u#y~cMSA(WJkYY)9^mSxl*x1kgCy{lc zqJ2GMlDE6d|E27ojsj&FOM?7@862M7NCR>Xd%8G=RLn`eu$SwQfdIpUk|JNNEf3VV z-uY&w-+r~m!{>TXM!KNw{R4ZPcE5fg-J$<{?qA0b%YN^8TqJ(%pA*N$<$W_wE|~my znM9$sId5s`su{tFa%tubLB5=xY3msR)~v`*)-4Wu;8go~>sE^@2HsE6D%P_sZwcF! z-c#DrWl=m!sdvjYtw@D9eotwYM#Vd-t_&@+0ZuX-ydT~d?wbG^XJB!CAk?K1qBC#r>mdKI;Vst0P`k=U;qFB diff --git a/graphics/items/icons/power_weight.png b/graphics/items/icons/power_weight.png index 149679c387039ebf447780311c16a6602f172bca..221416007cf7e3238113e7ff7591677c9dd820a9 100755 GIT binary patch delta 228 zcmbQjyq;--1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J%s)ba4#Pn7DMJw^*wJ zkMly!rN84hE)3y&Rqc1CXZAnMr`@XpzBalp5XrlCfFUZPdSWO0eObd??(gfSU6r_Z z>yX3snL&$R9tv5;v3l3;i~e@I4H)yL%+5;iTExs|rg_*iwl^u@NAeua19?9(KU5lS z;*^)E>WSvHm6hsInjT{lY+-Qxsb1xzsX}uqWaBuh-pEz#-gV}Jb>IIAxBdUW^UFHv Wv2JWr+av&VDubu1pUXO@geCwgrD)** delta 329 zcmV-P0k;0H0+a)g7-Iwj0000ISs=>*000McNliru;{^f@G73A8s!IR>02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L0004WQchCs}}VDb(Am@LoYxN06~Gh2yS5Y*w~a(Sn%|o@*VvI;QyGi%qPw&q9&g> z;DMSkBis>%LZ#j*x3{B)Y^U7&t;mu{8F4RHti!;zMYOVHTkIw!CbUEaWSG)van|fx zAbtxA<0w}Z7e`42le_den0S{Q2lvo&m6Ibzk6LHtWho+_^bJ|`0}H=OLyh=hF!jv8 bKQPY|tidqR*N%Cq00000NkvXXu0mjf=plVv diff --git a/graphics/items/icons/prism_scale.png b/graphics/items/icons/prism_scale.png index 335816ddbcc430a99e947268e3d57f34c46ed87c..f992c3bd84fda8d5d85b254968ee2d816768dc10 100755 GIT binary patch delta 153 zcmX@g^n`JO1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1Jwk3x;TbtOgwwmT#P}H z!!=Np^LPA50WGKZe?Hx9UibBL?%f;xc?xeC+}1X)KiRh0_+-O9-*X3WRvrWDYG@ilJ)sNL>ol`;+0Md*}cK`qY delta 250 zcmaFDc$8^^L^2CA0|SFlq{3++#a`m+>&pI^m5JAg$<$k^5-22I;u=vBoS#-wo>-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+Tblr;B4q#hm1X1$F`=E*m7LP7$zCOjTB8 zoYAsr#WnQM+?9`OW=U1OXQnA%Wy sDkfo-M8xHo9_NR89K5a@G?^G;7YH$(YI)thTQgC<*clX84Z^4g_>N1J$&6x;TbtOq_c$l8;4^ zgXMyr=!D<#6&j{`opXI=*}vAzJO6oa!*rXc+KR5RE1rrwNltJncRaUr@=OlC7b$61 zbGRPd(~1ZD?+GTVWXKdd$hwW1@;ds<{#j1 v@LObP0l+XkKb^ct4 delta 306 zcmbQr^p|OZL^2CA0|SFlq{3++#a`m+>&pI^m5JBT%>GgNo1X< zXkX8m%mdOq> yo*e8ag7sN;F&|14&|$yS(-h#(p;Rrc&A^bZrndN%cUK?KfefCmelF{r5}E*Nmt&j& diff --git a/graphics/items/icons/psychic_gem.png b/graphics/items/icons/psychic_gem.png index 6b84f38daba8f5abc1199bdb7610e6a1b0287906..b73184955efb97dc67bdd20bfcd587f2028d2f3d 100644 GIT binary patch delta 177 zcmaFJ^oMbR1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1Jz`Ex;TbtOguZmo9}=E zhfAu&i@*6XF3DGS8>DW8|U+qb9g#~J(6yt5uN V>DI^n$OhWW;OXk;vd$@?2>?cgRgC}u delta 278 zcmeyv_>gIWL^2CA0|SFlq{3++#a`m+>&pI^nN?iKBK4`sHK34qiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyaegRB@%N(oqKzyhWH$inS9|wg0iY=hg#zG3jwOC zqV64;X_mdKI;Vst06qOyfB*mh diff --git a/graphics/items/icons/psychic_memory.png b/graphics/items/icons/psychic_memory.png index beda2c22df19697b1682d33e6ebb667f3f0edfc6..6a5aea79a7621d897c757a9d670fb72b0ac0efa1 100755 GIT binary patch delta 250 zcmZ3&e3WT|1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J!Ktba4#Pn7DM}MWMqA z94y6-${n-*|G(YTdu>_m%PH#V*000McNliru;{^f^2oG!(KI8xZ02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L0004WQchCg^jzPrB>WN=z)Ya@f~-Mjxl28f2vY!|$H z_x@{;(ULPQW_0eocYhC$O!Mi3 r5J$^wacSLs5au13-EcOlr*QxP@L5LIy-&$}00000NkvXXu0mjfRt|)? diff --git a/graphics/items/icons/pure_incense.png b/graphics/items/icons/pure_incense.png index 8657683b188233d2e360da0208f3e390d350ecf4..eb5345f014c98b99453ae88088bc33b9ede836f4 100755 GIT binary patch delta 233 zcmbQpyoG6k1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1Jx|{ba4#Pn7DPKw@`}$ z4{PngBTowd|MqhT*)nI63hsla2Tf=re~$oZkAPkSidjRQ#RZk(-@@b{z})mVVx07#iA(!X=+!MFGxKs4Z{O?bt b>mM+`mt=k8ZqMKbbT5OatDnm{r-UW|Vk2qJ delta 326 zcmdnOG?96NL^2CA0|SFlq{3++#a`m+>&pI^m5J9-aStQI380X8iEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyafAJY5_^D&{07C@>muDctZm)W=n@ZAC}2 zf{))Bi@j$o1hpn=#9FWJTO3b3%5-^In^uS_2&FI>#+0`d?e|psvyv^qc_k~fMd#nI)N5p3q}U51f#H; TIqvI#j%M(5^>bP0l+XkKdo5|J diff --git a/graphics/items/icons/purple_nectar.png b/graphics/items/icons/purple_nectar.png index 59111f1e4e40ea28ac8eee58cd0820e915a972e2..f792b5ff558e38a3f5f4b1438b5794f470508b5f 100755 GIT binary patch delta 211 zcmey(G>>V51SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J(3;x;TbtOx!#1B;R2L z9@c}>0@MEgzhk#pCZcMMRgj*sg0gyxy->WKzsgTe~DWM4f DGZkAN delta 304 zcmbQo^qXmdL^2CA0|SFlq{3++#a`m+>&pI^m5JBf@cWzXT0kN364!{5;QX|b^2DN4 z26rEq06%wyveY64V?C3?)+G;tN;pai{M>;u#y~cMSA(WJkYY)9^mSxl*x1kgCy{lc zqJ2GMlDE6d|E27ojsj&FOM?7@862M7NCR>vdAc};RLn_EP!Q%|V(dA)A}1$Dh2bfO zw6>siNbX`_f zr-0usH}}m^QZ34n_by(1Gu2G+%tX7(7cX8ibt+aq(y&{-%CBT!^Q>*(&)u~C9Oo>n yUiep diff --git a/graphics/items/icons/quick_powder.png b/graphics/items/icons/quick_powder.png index d83b0b506257bad81e85f36d7743592b50f943c2..fa56dcca7c26cfa6e86c5edabd62cdf9b04a0912 100644 GIT binary patch delta 221 zcmeBRUcod$f|G-pfq~)r%Cn~?R@>JLlmz(&GyF#d2LigCfoi6Ex;TbtOx!y0w2-qR zhjVL!!@vK{+~roX?-%bj%bO$9(Utti^HSBOt)hJx%YGu^W^4fTj+falbv|_ruqE?8;xFnoSx~v@=xL9nx6~gU$Tanu}CgAQ@jUs OBZH@_pUXO@geCy0uw(uJ delta 317 zcmZ3%)WJMKBAJDmfq_9NQsFd^VlVOZb!C6dB*QDGWvwYY5hx^H;u=vBoS#-wo>-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+X|=PZ!6KiaE&%3akcPTuL{byu1qLZRpxO zaS}twp%X`sMtBMy5;Q8}Euchxv0hPdumcFVQo+l;NtV+7J%H(N^e{#ptNwKTLRMnks^t^oRt8U3 KKbLh*2~7aG1Z-pg diff --git a/graphics/items/icons/rare_bone.png b/graphics/items/icons/rare_bone.png index 80b4af9d58c1da065daf944ab4f7c186a4593288..eb5665a351afee7a1cb598eb646d5231a107a867 100755 GIT binary patch delta 167 zcmX@j^oenT1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1JxvYx;TbtOk6wBQRsjH z2a~eLzyD7rZT@m0(?U;j(T;2Rp`p(hCMWZi736fJusdJl(M~j$c*bICXLx+!LtCdm zs_*KIzHdrDb?|O~S(LcC`$GA^!Udscb1Zu9d@T4{c0s?2;i9lL&pI^m5J9}sW|A{7od=MiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyafeo-U3d6?2jk6gXH|1#;X}omt#HPO>Pf zF3HMideG8#=&B)`sPC06>x?MJML%++Q8t{u60N(MySa{sOO;DvI0)Ur3Nj0 y3l**kv;;2mcxGg^TB-V|h2Y7_C+vJLlmz(&GyF#d2LigCfojSv9pqKY(9=%) hFeSb^e*YtF*#maW)>BIM76RSC;OXk;vd$@?2>?`_RM!9i delta 285 zcmeBRdcib7BAJDmfq_9NQsFd^VlVOZb!C6d%EW6f6&>K01r!o5ag8Vm&QB{TPb^Ah zaQATu@N-uvOD$3`)-x$=UGfm9grlUu&mAaZ3}iESHE7BMDVB6cUq=Rpjs4tz5?LoI z+SfBCdAqy(U&{XJC{UKMB*-tA!Qt7BG$5zm)5S5QVoq{`f-nac7uSIsJzieN+6?AR z=q}1wp%~(HRMXVNB!WR}p_mlcRHj!Rtc6U9GN}U6i~24e)thTQgC<*clX84Z^4g_>N1JxvZx;TbtOk8`>Td2W+ zgZYA!;D>+W+vH4f z;f^^1C%YIbTtCE$9$a^wW8G4gUGL1&XUDjlGTWFfcJgq4t%ay~Iwv!iM8?%tpnVLU Lu6{1-oD!M&pI^m5J9}D75=n1W-u4#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8mLC{cV?z7EQ_1o*_yyl_~-{OQs}*}p0p9d{oCee}^ua{C7BUa(_5UHx3v IIVCg!0I1VfssI20 diff --git a/graphics/items/icons/reaper_cloth.png b/graphics/items/icons/reaper_cloth.png index 73f0874426a2e9cef6d5497f6f95ebd7421aeb2c..f4f0bfdb487561474914bb47562d72b5a0aebf2e 100755 GIT binary patch delta 231 zcmbQpyoqUo1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1Jx|_ba4#Pm^gQ$qtFor z4wh7jPyf~5Hylftx_qhD^t>4h`aYIRHb}ScE?#*rLGGQP51UzYg^ybMf#3oun^kF7 z)C48J&53SMvvKFkI~qE3Yj5Mu;G*?wrgNwNGs$IP^*WjOKPH%Yqf1@xRj2&02}dnQ`tI09YE;OXk;vd$@?2>?SmYIpzu delta 326 zcmdnQG?96NL^2CA0|SFlq{3++#a`m+>&pI^m5JA!^Zq;jEkGgh64!{5;QX|b^2DN4 z26rEq06%wyveY64V?C3?)+G;tN;pai{M>;u#y~cMSA(WJkYY)9^mSxl*x1kgCy{lc zqJ2GMlDE6d|E27ojsj&FOM?7@862M7NCR?Kc)B=-RLrUEcN99Lz~eem*kb8j<)wG0 z&tT@*RxNGO5L@tH*`wKbhtcZ)&(!TZ1?pED`+DyXpCl@hc;!%5+e_XjXFqe#cACC9 zeZy?8LbIzA`&~@rO&^%4G+1uF%&NjrKc|3mLPXc&PY1OZ3Rv>J*vPPS?(yR;GdSW( zQ+;*_3AFoiKVo3K`!(mYHt&L8A1wMW25%{h;c@RSobFc@Xuri*>^%3~fBz<~wflWh W{>}xSmRCSWGkCiCxvXJLlmz(&GyF#d2LigCfokeJT^vI+Ca#@$k?)8C z2g^~`jbH!&-!AlyYpY$EaD17O+lDFq&MC(?ec39Ml{)d8!{%_+Q02YqPG?pHgifoI z(JyKiV_|v!R!cC7wc~l1+Jh_YPBU08vS%>(-DEt?$HTnvNVP%i&xOWkAD*&T?w@xs p`S8P@($9UzekrH^54`_`>D&vJKOe0WS(>TLm&bHA+K%XnAzeGwRr)3BGp~hX&Qi_aI km_C^uvN_W5#4-u!*dndC#b@&O0Nupk>FVdQ&MBb@08Rv9egFUf diff --git a/graphics/items/icons/red_card.png b/graphics/items/icons/red_card.png index 1d07d827fa80c2cf0d01dbc995375355ff3609ad..88c8bf0c171c3db52d2f8470152315e0386d21ec 100755 GIT binary patch delta 135 zcmdnabeVC21SbbG0|UeLm1j>)thO%}C<*clX84Z^4g_>N1JyWrx;TbtOx%0gkdHxu z$LV6&j{h^)x-GwCA(8q=f5zXr)fb~LizsA%lTc_heB$S|;N21yncu6OIk;|2`K`p+ dT(Uogoymsr<;=w&Qh}y1c)I$ztaD0e0st^qJ;DG0 delta 235 zcmcc2xSeT&L^2CA0|SFlq{3++#a`m+>&pI^m5JBPnBnJhcc74XiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y}^3$=luK|5El(M}e}8B|(0{3=Yq3qyag8o-U3d6?2jk6vPd<6bf5JCRR9kamX#6 zG-=W%#-_!O9`S@Pebn@T;ig_dYL9|h&taaV!yz*h3MPamUOkl1bB6IFkHmxu4;i-P dq#9mkh8s2l!QS49tAQpnc)I$ztaD0e0sy5MN~8b) diff --git a/graphics/items/icons/red_nectar.png b/graphics/items/icons/red_nectar.png index 1d2058dca1bb622d2c97a70e3b7ab59c096caebd..73710370e494c3f922bdac292f213323268e5fc6 100755 GIT binary patch delta 213 zcmeyvw18=X1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J(3iQ78&+;^|$R7>-;E*EM1b5=HTYXQLnO3W?qFubmzM{YkyP@pA8hOx{D8 zJszE@oHHLVT$bcu))P8c_>Ci|D`twOKkLE(R-U~qx=Z^M${o*Hu~yF$Tyk%f8Gk14 z(beDf?Ku@7SMy=pyCYIHuXk16-}Uv~@&3K-@Ap3zuVF~~$8tiLp*9uhHU>{uKbLh* G2~7ZQfno;$ delta 305 zcmZ3$^oMDJL^2CA0|SFlq{3++#a`m+>&pI^m5J9(r}yKlO+X>>64!{5;QX|b^2DN4 z26rEq06%wyveY64V?C3?)+G;tN;pai{M>;u#y~cMSA(WJkYY)9^mSxl*x1kgCy{lc zqJ2GMlDE6d|E27ojsj&FOM?7@862M7NCR>vd%8G=RLn_EP!Q%|V(dA)A}1$Dh2bfO zw6>sf+`z|Z1 zQ^2q7*_o4BnF4(w$Ir~1y!WzLlciC4`nfqq&ec~PI~d>Ro!e{q+WyLx;{5k}WB;?i zvY5I3{k`?}9K~DD{Qu9MxGpV0M5JYNCj*1JLlmz(&GyF#d2LigCfoh69T^vI+CN7=e$ag@2 zgC+LBqyOU_vF`rFHnU};wZ<8vhd#&J6e^-#x2f*F;Id+^^iKYL0@vcb cE_}CU41C1YY`0p%9B4m-r>mdKI;Vst0FRSW_W%F@ delta 278 zcmZo+ddM_EBAJDmfq_9NQsFd^VlVOZb!C6d%EW7?`b9TL3@9XC;u=vBoS#-wo>-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+Tber;B4q#hl~>1r7<;2^LOW9EFamEj=4L zwVDoVEX(M)pfoF@XM&KZKufVi>;xY%Grbm$rVXx}EhD^Q7-j}*FkE>Q!}oB8I2VWX z^aB>h+8jdr5}1$lTKCv4h&mvXo~+Tn@rH!P3C;H6Ge=KzFWkl)*;CN27_ozqVcjl~ V;DbGVc0flkc)I$ztaD0e0sw7sT73Wj diff --git a/graphics/items/icons/ring_target.png b/graphics/items/icons/ring_target.png index fae2b944bee351a510f90ce982908f1f5741e460..08b044df7667837eb804d118d611de763edf2987 100755 GIT binary patch delta 170 zcmX@b^p$af1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J$H>x;TbtOxzn7&DWs7 zlYGAFzp!PZI0FE*;loHPwL+U3=@{O+Om{~wDn&+*&A^iyKK;|!pM N44$rjF6*2UngBCwPO$(0 delta 255 zcmey$c#3I)L^2CA0|SFlq{3++#a`m+>&pI^m5J9(_KyCm4xo^DiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyagJo-U3d6?2jk6ofgL7<r_@vYbVP^PoFM5)fNz%wRBagL21uJN3VyD#{&Fz1x>0F>Iq&KwJOeK2J^MYO*v9M x%-fDTGdyGxol)$N7o6!*Wa=ZjsvhWxmNZF0`JTVxx)thTQgC<*clX84Z^4g_>N1Jz`Ex;TbtOguZmo9}=E zhfAu&i@*6XF3DGS8>DW8|U+qb9g#~J(6yt5uN V>DI^n$OhWW;OXk;vd$@?2>?cgRgC}u delta 278 zcmeyv_>gIWL^2CA0|SFlq{3++#a`m+>&pI^nN?iKBqzAyFHlIl#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8mLLPLYkF%s-<-E5{bE?&b_@;LwpX%Ould-L0MI`LoM<8g#cAm zQTL9_v`oFHPc;L&TY_Uwofb*d<0#VfZ`!HR;26TH$5_Pd#I)kH;LW=pLMluQ3ttIc UtkCMp2Reem)78&qol`;+02)thTQgC<*clX84Z^4g_>N1Jx|`ba4#Pn7B32k?*hq z&uZU{KmWzgFWj&#SpBV0I9FEBTZY@;#2NZ?7ny!oDC>G;IoIB;``(A<^H}fM&k!Sd z>!8%+dkr>{DGS2aXK|%77(Y@lnw)Q(Ho3?t>)_St%O|?*s?ZDXPHR%Cp8Y~no0Y5H z@=i!x6wC4bpAUC;R|p*5^`=X&Z`R8d3B3GaPb&qwS6GTy?i7~q72a`I-!1up+77#W d)6@Sj>aRG$(x&pI^m5J9(^wO84T|go664!{5;QX|b^2DN4 z26rEq06%wyveY64V?C3?)+G;tN;pai{M>;u#y~cMSA(WJkYY)9^mSxl*x1kgCy{lc zqJ2GMlDE6d|E27ojsj&FOM?7@862M7NCR@#dAc};RLq&$@5|R@Akf+)thTQgC<*clX84Z^4g_>N1J$hdba4#Pn7DM}ZK1;o z94^foLHa-cpMTqQ(JC{}>hAI4kQrYs{&7~y6+DozyeqQdNr%CebIunOm7bpsh-$KY zuKHr?ogY7Ayq2n-;n-|YkUdwdUGPmX@BNk=9Ont%A!3hVZj%Och; l{hhy{C*S7E>_LL^2CA0|SFlq{3++#a`m+>&pI^m5Gmo<5S^kcc74XiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyafwJzX3_D&{079N?E=Wo3PkqbU5`fldbD1P~-GAR$1o2k~6es0cgR--7LwH7yX z&fY9ueQ-{R@b*5_^aD{6M3jK4f6&1fWgz%&t;ucLK6VEU3r86 diff --git a/graphics/items/icons/rocky_helmet.png b/graphics/items/icons/rocky_helmet.png index 006a9f8aa4a1236a4117423c53524aece23dd9a5..72613a206e40be44b33c1add6c2a81ce1dfd97f7 100755 GIT binary patch delta 214 zcmZoJLlmz(&GyF#d2LigCfodjrx;TbtOxzpjEp$|Y zLz`>L@A*GeZz-*Ryl8b=OorVA$^OT|92=fSXV)%wc;Vk_e1iGY2Q$GBt4h}RUQ(Q~ zYSvEPaIV<74bP&qJAPF*9WQg;#NpN$=W;fTac1)gX+2YinAc8)C!bchwFo{?4&vzk zP?#j)wMa?$kNo1X< zXkX8m{J zr$*_0m!9a!MpaDt4#vmV@fem}487lVKK)+Hq95Xl=ZvrH`ooo5yhn4X+1bKa&&Mnu zB(_|AP&1)aiutngu6t?6Q*XxoGP`3LGyUumdKI;Vst E0L+eZ!2kdN diff --git a/graphics/items/icons/rose_incense.png b/graphics/items/icons/rose_incense.png index c6b6abcc360702f66e2e91dc8f8e50cbd30b8283..95bfc77e1f8e5b003f15054323de5d136e43a5f3 100755 GIT binary patch delta 236 zcmbQiyq#%+1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1Jx|^ba4#Pn7DPKx6ly< z4wuU;ydB@|-#08=7O5&&d($-#;3Uk@~ zhSk(KjqgFTe+lEgyXzDgGv6CEep$EEx@5)fb2)J-bKL#sXH*LBms(m-9nX{eB5Xt5 ez3KUX9Od11vDx=|RfGVY%;4$j=d#Wzp$P!M(`o1c delta 333 zcmdnaG=q79L^2CA0|SFlq{3++#a`m+>&pI^m5JAkVZUZuAW%rW#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8mM+yBEpOtcZsY2RFKhOhaA)t))T>(J@9zp9oFgl{yS%)l z*>YC8mBXAq)thTQgC<*clX84Z^4g_>N1J%s*ba4#Pn7DO>*pnr-W*?5brd9NU&$x5#-}eqrWV7oHkKD4pYMh+d=XuoSl;PX3BL|!P zgLAZeuVk9pbI(w+yFBCR9nTpL9Usnn&#x;gD6%s(c@9@u#S-s__k_xY5_L+i-tqL9 zdd@cXZ=s@>apdJdmQRyc{5jZq@_LuYQ{Ln?^JbjaW?#qs!|XOwh2Z|V{L?d7GA1;w RTmy6^gQu&X%Q~loCIB8HXD$E$ delta 325 zcmV-L0lNOG0+0ic7-Iwj0000ISs=>*000McNliru;{^f@H5V7xP*nf`02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L0004WQchC_Frv^FIMHs z(5j`yOK73JCO&`yb4fDuP3hwsvtr+a?ixGK@Ufae8y$t^S0Mm4wu_Qcs3+}=n7JYv zf_5>ClPBuIo?@~jq=1lwRp{y7pOb8B^r%GS%+^Sc-Lj^WU)1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J&&Iba4#Pm^gRhL7~G6 z94_3gJ3joEzvH^taAqd|(+51iQyeSz{^Ob$U9@!3rO!f7&dzZ0Iof}C?w+l@8(eY) zn(lI)6=7}qb&c<4Nkh*KwT1Q1G#Yj%Z}qz+AN&5f%A?5dGuT(>@@;v>%_1RqvvjkW z7fZtFH49XA5`*000McNliru;{^f@H4g;4$O8ZX02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L0004WQchC(Ew~M+NoWecMTI00000 LNkvXXu0mjfC{B@c diff --git a/graphics/items/icons/sachet.png b/graphics/items/icons/sachet.png index 32c566a91da29c1cc4e8dbb233428baef9659504..e1b2774086c6e69b4ec720b0a88a4fdd6d8dc192 100755 GIT binary patch delta 200 zcmey!G?{6F1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1JyKnx;TbtOq?1J&DCJQ z6FqC&=YQ&ET8HHRUI;qo5h0iT_A$eXLgUpE5!u#?6DKi5KKN8}X=7#c#1uC3xhVm& zTZ`RN0-4(G1(pbu$*?wxtcbOJ(z}{Hto*{%u*%wVtBc-=FEqJq$aVLHv0aDa=cO^% sU!FAB?7634O{KinD*J=~p8tQwk`%*Km6Q;973drWPgg&ebxsLQ07~Uu0{{R3 delta 294 zcmbQt^pR&pI^m5JAsoh!k?5GW*G;u=vBoS#-wo>-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+Tbgr;B4q#hly;j(mp{1Y9Nk9~^JnTET35 zqt^Knx5Q0z(RB|*ZMGdXI)YkJp)78&qol`;+07I&5uK)l5 diff --git a/graphics/items/icons/safety_goggles.png b/graphics/items/icons/safety_goggles.png index 7a1efab67adffd72893d7ab8383ab500014ac898..2381790f2a3b530bdeff0ae13f2fe4bd261e1865 100644 GIT binary patch delta 213 zcmZo-UcfX#f|G-pfq~)r%Cn~?R@>JLlmz(&GyF#d2LigCfol3aT^vI+ChnbhQs}S( zkMqWyoJs%w|G&m;- z9odC%XRi|V67XN~XQA*#@c`L#lXmQH%$oF&#Uk&44ZHKM1iz(@hL>3;gqH_B=s3G$ zmx9{ly$YsIVa65J53^%_9`SaIn{VjmX1q3jrTy>q?N!Y4ZnE&iO2*Csx{blp)z4*} HQ$iB}_CRDg delta 311 zcmZ3$)WkeNBAJDmfq_9NQsFd^VlVOZb!C6d%+9aN-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+X|QPZ!6KiaB%pH*zr<^0du1-*LgYU>!%F z>hZVp%8IOZ>}ha%wI-pQ_2uRtQ;xlwyZN8@zkY`wNoVdm9?5#ucS4-W<+hg=ME>SIRqXGV$!0&7^d^=0%vWOU)1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J&&Iba4#Pn3y{$TC7EZ z$9d_OiGSBuTsly3VP;LoGc%FK*T1rEd<{3d`)2ygqhHok8Lysmv7t)fFq6YG&ll|u z*XE?VF*ePS>AT6(Q8ufH!E7Nv>#e>$j=wqi^?%Of7YL{n*u<5)EIxtN-gaNVtYQ1L zD}r-;;}+a`l~eCJE$H&Iy>HXhD`eiOncV-Ls3UuhecB9;KkJUmFarI-;OXk;vd$@?2>{T# Bc;Em4 delta 363 zcmV-x0hIpC0=5H?7-Iwj0000ISs=>*000McNliru;{^f|1}dzsojCvi02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L0004WQchCv z42E5vpqzF^bP~KkwENUW+*?D=pgKKoBF=eY!H+$su=V%FpT0y+44^qw@XYDG{_pFH z<$9MzFqZjqhh%I_epBtu*zonXsdhp;nSrw^JLlmz(&GyF#d2LigCfogg@T^vI+CeFR+D0W1F zgZV-m)5m}6asturw~y{QY4m?9m)!CDj!z@IPe|V6xcV*O<$AOIhZj#5T%)jw+2yRy z;*0a53uaADTg*T6fRDDK==b%T%JpXkJc@IgKjHIB2D4AuE?fNUuD;$hRpsKh7r{z} zx$n5$_D983#s6zKmKv?yn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyae#JY5_^D(2MoJMuLdh`7AuU9zj-^>Xn8 z^BSJbu44Scc0{+$Am^o%%{JZKtF47$pFiDx;v4wKH*(tS^5tIFJ6SU4TQ%{_UG-H( zYi++viHATHOJx?Xp>b>ZZSJV22iFv^%50Wp3h?OuxJ-znbzQN|x&V)-2lZ-A3RVRR z&wBFs#U7r>(*HFJ&fl_TD2{uWxXWGsf2ZN5%uhCKzs}!S|8V~&CLSSG*2VJN@j%Bi Nc)I$ztaD0e0s!p+cO(D+ diff --git a/graphics/items/icons/shiny_charm.png b/graphics/items/icons/shiny_charm.png index 3829154cd5a3e2702d4039e89e8e4b59d205cdd4..fd2c97ac8361d12210aef41fb4167bdd51143d96 100644 GIT binary patch delta 199 zcmaFDG>K_~1SbbG0|UeLm1j>)thTQgC<*cl{*MOEDsGwrRMY6`;uxYav3HW85UV1G zbF1hqkvspl$^V!-Y3@xCu}U_P*w>Q-lJ-4O65e`0qal2f5Zk{135Rf%eT$V?Bn0@m zXFQ(CV14HM4*3Uyo_~}gkLj#=vP1Z&+oBWSUKvI`xBRPj`M2@sIhFmFS3kUJ{eZ_I s)OE}AlCX(eruJFoKGXll9QTDeWd+OaiTvDKfv#cjboFyt=akR{0D6U8@&Et; delta 281 zcmbQl^n_`GL^2CA0|SFlq{3++#a`m+>&pIwiJL)2G(BtHW1x_DiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e{(o-U3d6?0P0>k1z-;9+}EZnbQ#YvWv(M~1>Hj`=J&@aBAK zLAdb2{zn&*n^g8HFS`ExQjN$D{vckR7co;B{CFy@%cceSHuh>NM66*m32uH_`YC+s ze7;>DUL?QzwevRH))?=^jc3+YuvI;~`1=0T+AcZm(oglNOMkW>-X|Wh`VRlbKgkms b%)YDbvkg%JLlmz(&GyF#d2LigCfoi6Dx;TbtOx!xrk*V2$ zgC$k5;s5^v@zrK4Y`+BLo#V)vl={=(^Qv&$s$0ICIU$<61Y7&ro$ERbGVi>x)pA-| zsHev_za`@1nMa!i8k973wsJ03*j{?~$V4v#3$3X&!WOPeH@eS#zPxdwmhV}m`BHud z_f&Gees|D5@|~6Z?E8X_Z!eVjw+UTcGJW>aM{Mi%+D<+({rc~ParHY`v}WFyxejz8 NgQu&X%Q~loCIIeTWxfCa delta 315 zcmZ3+)W$qPBAJDmfq_9NQsFd^VlVOZb!C6d%EW78No1X< zXkX8mEHo!Mhtb$l*VfZh z^Q^!liLGBgZ81q*aeB_B)2FBKB+e@|G7DFVdQ I&MBb@0CJLOc>n+a diff --git a/graphics/items/icons/shock_drive.png b/graphics/items/icons/shock_drive.png index 2ac62f6cee29bb4137e30a8f4e05f5332049b938..99f8e512c412fae4d2aa5e2df0b4aa29586074ca 100644 GIT binary patch delta 183 zcmcb{)WkGFf|G-pfq~)r%Cn~?R@>JLlmz(&GyF#d2LigCfocjpT^vI+CZ3%TDAb_9 z;lg@t@BfL;7iOHYo1MA;i>>39t@B-6wngxM3+b~B*t_b;vWY>$>8-DB2K-qO`Tkr@ z>qFh13D*v0Y|)xtU~_1mgzAG;AA}NeEZ#AB{pdDjIoX+=;901Ac(c~gXTiq=^zZLD ce*Y=M)iS1e?Ems718ryUboFyt=akR{0Pfvc=>Px# delta 267 zcmZo-y2dm?BAJDmfq_9NQsFd^VlVOZb!C6dBqPpi6?P!&AW%rW#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8mN2q-XQlQD6bfbEn7SgY@c->#-TqQ_L)mwnsryPk9pA|qd{p$yxqF#$K${sn MUHx3vIVCg!0P96yWB>pF diff --git a/graphics/items/icons/shuca_berry.png b/graphics/items/icons/shuca_berry.png index cc99671876d928848bea243aef7f464857717cd4..f26a80f7ac0131e67f9c41972c0a8567c9a7101f 100755 GIT binary patch delta 200 zcmey!G?{6F1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1JyKnx;TbtOk6rKkngYp zk8`$H!KL5w6^^T&7KF?)ssAO&ex~q`HbeFPInSppm=-kuNO9J6uYj&Cx6&T8E6!6^ zl4J;3TKdR3iebj9Qp-uHth?k@cnumnvo9Yo_ww}Ce=nUk(Z?kGt*3s&;dq9_+j)AN tgMB6To&Br$#(n*^t?!Gz*Z&pI^m5J9xD{P4_D^N(h#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8m+=6D^#MF>&;DOj4es ztMTX&)8wQOuHxn*30Bv+Ax5tnzQ)thTQgC<*clX84Z^4g_>N1J#`Jba4#Pm^gQ$r`TZw z4(ILzY&HLx!yl;BzTB{K&t>z^k3a5T^7Ux*Dyck=V=d0d6#`G3?f)eGLfb>_!8Jx! zoj!%Y9qrrJ$nhy%ZvXX7dvauj@WT8=>jjOg%_WY#xS}k1w28N->C=HsX&a}qk3mav z6`6Ot_4zn0zwp0tu2%6B`K!#6#Vi|}H%qgZJWH8u_+4SynIP{>f$MK3?J|nI)aHLC z;q&orDx4MtAGWVMYIR-8bV|Nwv@Ls SixvUB#o+1c=d#Wzp$PzhwT6!X delta 376 zcmV-;0f+wE0>T537-Iwj0000ISs=>*000McNliru;{^f@G$Fxu^o;-j02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L0004WQchC@ z5C-t<8)W6YLpwKtO`X{gurnDj{i@fe(e|Q}v__HD&O&hW2Io`W82?m)thTQgC<*clX84Z^4g_>N1JxvZx;TbtOx!xjk?(*4 z2g_8^KmYr)`PVGkVq3b$P;s(^SLO1&0=*3Fg5ZTl^O)Dh%($$;zR delta 280 zcmeyu_?T&eL^2CA0|SFlq{3++#a`m+>&pI^NrqQW=F8*`4xo^DiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyafqo-U3d6?0NAoaJp$;9*U;abUh62cN)thTQgC<*clX84Z^4g_>N1J!Kuba4#PnAm%%o3B}c zhxNi&NAK1D{=Z+hHepWkNspchVry2bLxn_i@ByIU+N&irwLLFxB1 z(UXP0MNQB2O_N)cCB<)?JT*rAnvk`DMqc$+mYM^a+ru2+iWCSucISV5T36fY$;CSg rU!7Uz7nF&&>`&BK|M2_%f?o4a``C)hw?+m5ozLLu>gTe~DWM4f5X^Mh delta 352 zcmX@iw3>N>L^2CA0|SFlq{3++#a`m+>&pI^NrqQWI7MgbOrVf>iEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyagHJY5_^D&{079AJ}RooM0IZRCI$u^xv45}#85avB!B)QDJ_Pu2^#kT14X1v1&?@!-M@J8o?Y=%p9Lb1 z4ZCH5Ak;XWlc_T4s)OI}Q!`J;ILvvvyL@}m`Y20nQ=StOBQ1-su8K5HZ&hpZ(U>1+ zchoienbC%uPp3XD4vh(GiaonS=ETk?k5n1Trl(Xsy|Y_QOMq|jk1spR^_O!v%+-l2 u)#W_KxGTzl^&BIUqqquRvw{&j3qwzw+1x`edZ&QiVeoYIb6Mw<&;$UYntap% diff --git a/graphics/items/icons/snowball.png b/graphics/items/icons/snowball.png index 3ba834ae342a54ae3e9d55fe99740372fdff4a79..516b1cbd86e9e96a34c08d4a5e5a6cd944a8fd21 100755 GIT binary patch delta 167 zcmX@h^oenT1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1JxvYx;TbtOg!5cDAb_9 z;c}F<>s|c=j;)d_{zs+%sW{IX{k!tTDdBP^37@@12RlTZZCF2TS=a3xoO(FphuGc8 z5tAh*9X;!PSY<)HR@k;;o9n+~tz8}m=~Zk22WQ% Jmvv4FO#qH?OmzSN delta 258 zcmeywc$R5`L^2CA0|SFlq{3++#a`m+>&pI^m5J9x@@0vSFi=Rm#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8me}W_Rf_RU68XZ zAvyW6f=2sA$rFYxMOPYfl8smFN?OpfIhwg8m}!cEVQW!W@5Gd4Qr6b9m-sbE%}q+0 z#AZCJI5R72mC6}b)thTQgC<*clX84Z^4g_>N1JxvXx;TbtOx!xjk?(*4 z2TN)ApZ}Ay`PVGkVq3b$P;s(^SLO1&48ComyH=X?Jio9??3oG2rKW}!*NerD;>v=p zJ1vBSs+Gj|tACgv5x-Mq+RMF$!n%uCsu+Gb=G1gO7AWDg6c&pI^NrqRBbEaR;W1x_DiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyahQo-U3d6?0NA9OP|K;9(88$xzD7$;0r7 z$%v8VT}8rw!7TwB57xi3o+5AM>zu}O#%IT@$;@k}eC%Y^u{zdw)$B!=+3{uth8Yej z4UQTN@7kRbjIJo;EHj;Xt>(iPx2`XC&-Uh)thTQgC<*clX84Z^4g_>N1JxvZx;TbtOx!xjk?(*4 z2g_8^KmYr)`PVGkVq3b$P;s(^SLO1&0=*3Fg5ZTl^O)Dh%($$;zR delta 280 zcmeyu_?T&eL^2CA0|SFlq{3++#a`m+>&pI^NrqQh_GQfn1)z|4iEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyafqo-U3d6?0NAoaJp$;9*U;abUh62cN)thTQgC<*clX84Z^4g_>N1Jz`Cx;TbtOguZmo9}=E zhfC^@JO588NvxihJNeuvTjPece-*YA6*edzNbFEg7h5*hdd5fbEyXX^2-Wd)7GITl z=r%1Oke9jT=B`UB)0212wEQ?D=C_snp@R4oiyxo89AdLhzw(Vt*r$(&P5gIWL^2CA0|SFlq{3++#a`m+>&pI^nN?iKAlq)w6QGcIiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyaegRB@%N(oqKzyhWH$inS9|wg0iY=hg#zG3jwOC zqV64;X_)thTQgC<*clX84Z^4g_>N1J!Kuba4#Pn7DM}ZK1;o z94^h=F0WPp|KHArhmBB_V} zV8bhsFCBLcZdab&c|jzPML=TR){9TlRD?v2nFVdQ&MBb@0IzX&x&QzG delta 344 zcmX@iw3vB&pI^m5Gmo;m<1NQlOA{iEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyag*JY5_^D&{079N?E=Wo3PkqbMBg$|zxd zX73&s!9x=-uoTUid?2XD*TJu|P-=$q)rBTkk6Pw_cQini-NW7iHwUE zo+Mn}`~BT}#^OUhUg_`la$h^7Fp;Ok``g|73D%Onr%umZtGG%+!kjtvjGugqMO516 o-Jjnz8@xa9rfqYeZ7(q3VwN~n%>Ap-3-ktqr>mdKI;Vst0QBmHT>t<8 diff --git a/graphics/items/icons/sticky_barb.png b/graphics/items/icons/sticky_barb.png index 735d3a051f3575e680187ad33835449a4ce6944c..8147e8de74d12bde693981b3535185ebc5af3ed7 100644 GIT binary patch delta 172 zcmX@Z^qp~n1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J$H?x;TbtOx!!cn~y<} z$BFgT-}N?Y=liVLHAk_H_57s_&Hr56=dd&RG)#43kXUBI#+g#_Zj#F_MwW?ZPH#B2 zBqDR+^a^X~6`v~RGW=PkoMWByg5lW7N^Nd$efQ delta 257 zcmey)c!p_$L^2CA0|SFlq{3++#a`m+>&pI^NrqQhVx}0&dZ3VaiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyag}o-U3d6?5kHUF1EWz~NHJ93Z~pC6kl5 zLSm!Y%YUo4EED_tt@bXrWf8;bmPnrweDbUd_yx-?xkG z<9{oD>e%w~H>nmdKI;Vst0CB%q A4FCWD diff --git a/graphics/items/icons/stone_plate.png b/graphics/items/icons/stone_plate.png index 8af90a8a655d0a479dd16e4e9f414bf371dd5834..4aa9ba284898638a9231576d2bd67d1a85e2272f 100644 GIT binary patch delta 169 zcmaFN^o4PP1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1JxvZx;TbtOx!xjk?(*4 z2g_8^KmYr)`PVGkVq3b$P;s(^SLO1&0=*3Fg5ZTl^O)Dh%($$;zR delta 280 zcmeyu_?T&eL^2CA0|SFlq{3++#a`m+>&pI^NrqQhWWoZE7NC%LiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyafqo-U3d6?0NAoaJp$;9*U;abUh62cN)thTQgC<*clX84Z^4g_>N1Jy)%x;TbtOgwwRk*~pk z!zD09&pI^m5JAc^UL9wa-fiSiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyahco-U3d6?2jk7MLZ7h$I9AH5IkQ&Y98E zD|#SDO;}t!H91*X;`mL8&g7m4Gpv*ggPI)YsB~mzt#jBWdBlXRbV7*Ll*1uuNjYIG v#Z6T+BX=_O99|N~SIpbdeqbP0l+XkKkC;-G diff --git a/graphics/items/icons/tanga_berry.png b/graphics/items/icons/tanga_berry.png index 37f8e2465647f01a9a0419795c50ebef6ef45551..1c552fb6d6f578cfe702c276222c14cb925667c0 100755 GIT binary patch delta 235 zcmZ3$yp3ss1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1Jx|`ba4#Pn7DM}X}-e> zJS-oXeg6EHzhf#;u*l1{L_aVsf~ipRe|yKh_l_MiW*Uiwu4Ojfo~!1jqme7PC+zLs z)r@M4>u#-o-Q>yC`oOv5s9*Gos1Ct72mBdpIM*1~i!3{M_(=G-<+^^=$6F>@EITEb zw9QJXY3{kbbEUnM%eVx3Yo$zr7YbN!_MKBX&pI^m5JAcDOs@fKTt@##5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8mJLlmz(&GyF#d2LigCfoh68T^vI+ChnbJDRjVq zgE_aQ=E;A4zO*2gV|v0 zK(|D}>7|Sn<6bG5>}ERR{%gldp!E!%u6{1-oD!M<7`au5 delta 272 zcmZo>y3I5}BAJDmfq_9NQsFd^VlVOZb!C6dB*UxBFLksr11Kb3;u=vBoS#-wo>-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+Tbqr;B4q#hl~>1z`g&F0KPNoxHrd4CYPP zR2(r$Da2{-U5lJ30hg}8#fL3*cuxr$<(r%FnzpSFX4=%#>$_mihRlQK&Kb-+G4-I@ zv4tK+%Vu)esx8~BAmf(0pzgBD3R^8T2g?<)thTQgC<*clX84Z^4g_>N1JxvZx;TbtOx!xjk?(*4 z2g_8^KmYr)`PVGkVq3b$P;s(^SLO1&0=*3Fg5ZTl^O)Dh%($$;zR delta 280 zcmeyu_?T&eL^2CA0|SFlq{3++#a`m+>&pI^NrqRMTXuzOAy7!X#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8mzopr0Eob0j{pDw diff --git a/graphics/items/icons/wacan_berry.png b/graphics/items/icons/wacan_berry.png index af113c9b58ae3c126b0d02334e893ebd40b4659b..61e94c642749a4138325b56438b3f1de0fd55b42 100755 GIT binary patch delta 208 zcmZo-p3O8tf|G-pfq~)r%Cn~?R@>JLlmz(&GyF#d2LigCfoi%uT^vI+CN7;A$k(92 z_P?(pfWH_P^oxj1P0Wx$QpFhj-hr#d|ijy09GE*mHnGnomyIpxBsatpdx* zxuOR|=Skk3ETS+mMBq~BWC=#w&OqTKwL9x3_-NPN$Q3xHnPl_pciaJ)4Av8;-QN0n z1)SKiD84RN_HU4l+xdTf*0)-(9edx>|Ni%K=Gr=Dl_!kJeL!b1c)I$ztaD0e0suT7 BUT6RS delta 311 zcmbQu)WkeNBAJDmfq_9NQsFd^VlVOZb!C6d%EW7I#MP-h1t=t5;u=vBoS#-wo>-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+X|QPZ!6KiaD(lZ26iEcv>e*A6a5w9kHwF zDC2}l%nB~X;fqT8t{kiOzxQCt7U_BSmOoFwDVDU|;qMlcv-Sxamjp4rVrpL~?)2O) z^SN9C^XN7u0Ngk@XxGyc~wssj|=WCJ>tob+k5v7)A8u!4c&DSj`8<+?t~g% z=zToZP}6y$>|B#y3~w@Aax|t)og5~x&wQQxp?~_@eleU2k}kD;VOb4yC4;A{pUXO@ GgeCx1rgeS* diff --git a/graphics/items/icons/water_gem.png b/graphics/items/icons/water_gem.png index 79e0ca07f310c44b903e9bb08ac672581602f733..555d92ccca9b26a03b5981747b136c2fc568091d 100644 GIT binary patch delta 177 zcmaFJ^oMbR1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1Jz`Ex;TbtOguZmo9}=E zhfAu&i@*6XF3DGS8>DW8|U+qb9g#~J(6yt5uN V>DI^n$OhWW;OXk;vd$@?2>?cgRgC}u delta 278 zcmeyv_>gIWL^2CA0|SFlq{3++#a`m+>&pI^nN?g!r{4a-YM_vKiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyaegRB@%N(oqKzyhWH$inS9|wg0iY=hg#zG3jwOC zqV64;X_mdKI;Vst04I-DX#fBK diff --git a/graphics/items/icons/water_memory.png b/graphics/items/icons/water_memory.png index d7096f57cc1b3a5e23ca67229f934183d5a0bbc5..054c05d116189f0484d7a34c52fd61361052e9db 100755 GIT binary patch delta 245 zcmZ3;e1K_!1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J$heba4#Pn7DM}X}-e> zJS>|Hj|Is6{J;OL6O(JEUTCe8@uBRSx4-!>yv}^@sO494)(T;9r;MzpzwM4@3A8JS z&tzJEqc^$D!%H&QBze`cBTGYk{E`Jv@ZM*!jGtP{qV# z@ArIU+5D9copHJCldE8MN?!3*Q{{bkDbBT`zrUn531ONa4 delta 342 zcmV-c0jd7L0-*zt7-Iwj0000ISs=>*000McNliru;{^f^2Q@8$`OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L0004WQchCpQo4()@$Q3Q&dN!p;laD_ zJ_M;+wQBlAnca6`oJs-4xA(vt$(b_^85r-ryT1`+u##FJXoKwCyZ=B2h^3W>2;RMW z|24>H@p9AB@V)o$?*Vg)L)z2!-UVx65Gw_`#rp1Vu$_z{9Y7956$9f|piJ=TgAhl{ oY;|$neGujyncZ+Us;6-P0M*w-nHc$%DF6Tf07*qoM6N<$f;4f7Qvd(} diff --git a/graphics/items/icons/wave_incense.png b/graphics/items/icons/wave_incense.png index aec3fd05efd0cb8fd4a25429af26f80b1100e4f2..5fc560eb86b7eb4d93217076c0aa10a90958206f 100755 GIT binary patch delta 229 zcmbQhyn$(g1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J%s;ba4#Pn7DOfAm3pH z9_RGqoO}OwrfbONUiJKab8<(>ZbQbn_4^rYPPuT@Oc0)QdM)?WsNCrF;_a+k7z@f? zuzbJqg}>veg3#5iakhtUHB8(oEqKshVzH;;#HbG!E?@RginR$0_hXj~ysGwe%bm>& zdLEXpaeHMj#Vh*vr{gA7n>Lz+rN8658^NwP-D}>vBkqq`rvE-Fz&5?@^W)meWAYWu Yh8@h8tkoN)0Nu*q>FVdQ&MBb@0Ap}#s{jB1 delta 325 zcmdnMG=X`7L^2CA0|SFlq{3++#a`m+>&pI^m5J9_;io~+9iWhSiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyah0JzX3_D&|b>x8*xzz|(qr9>eARqF#yZ z8V2e`d;+Sk?uEIm5pB*tu+#HWkQ&>*gH`_Lt2Rx3!hh*(c>2y8Yj^3i{7VtFjk}`n z7%%L5RYrEmdKI;Vst0HZT}LI3~& diff --git a/graphics/items/icons/weakness_policy.png b/graphics/items/icons/weakness_policy.png index d8f0b45531de71a01ce8ead3c4921103ed38dbda..76d26e7e493c3990d69acdca886529b5c9782739 100755 GIT binary patch delta 153 zcmdnP^n`JO1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1Jwk3x;TbtOx!!sk?Vi~ z2a9m|*Z=-`Oi8?E7o0C2oZQTno&Em;_r2*(<%|ImtaqA>mRvVb+@beKdtu2rzn1!0 v28OGhN>}M@xaV+AYvQI`OLqS~9v+jT#?0lYp=$v&p25@AkJV+JQ$iB}r=mm( delta 241 zcmaFDxQA(iL^2CA0|SFlq{3++#a`m+>&pI^m5J9_+_CrjWuTCFiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyag>o-U3d6?2jk6xa>8oEjM>C@*1Q?NaF5 zIJuikK(g6V&Fk1Hw_{%C68eN)rgDk(t>PA#ptHCsD=J88&SI%0EKemIzi2q$dB(&h juw8Mt)KPmEMurPtC1)xZRg?pbXYh3Ob6Lmil+XkK>8MJB diff --git a/graphics/items/icons/whipped_dream.png b/graphics/items/icons/whipped_dream.png index 9cf9c959a708a05977703674671c5d0f84d567f8..0d3b4249844d480db9239bb8c1ed446ff9157d0d 100755 GIT binary patch delta 217 zcmeBRUcxj%f|G-pfq~)r%Cn~?R@>JLlmz(&GyF#d2LigCfodjux;TbtOq@C)P^ejf z$K`Iy*;9Y@@33rj?KaM}bGSd7w=wnS!Upy{GjoG_fnq+1+#;?!tM)l9Seq?*&&O{| z_w58pi`PPq7x>@x9CVQ0JH^^O@j;em)y9{(0$GaFl$7nyr@5*w$x!Lu=J=$4%i&v( zFKaKf3UO_}tQ~LU8*|L}*6*)>s}8HM7Vq54d4V^LzhCn2;<)P%Su|L*l{10vWAJqK Kb6Mw<&;$S-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+X|=PZ!6KiaE&%2N-&oJY*DIQ~DHz+$B6` zF6dI4b39|o5|(iFMN&(aFijR>Dw?uD#!X#Sp`fMU$ehNURP&B072O*rZSu69aX7;6 z=#3jUQmPaqLQ{8jZ|uCi#fZ^hxy|LH#qv_hElzBG7JVym!-{O?z^bj=Xp| z^X1damlfQ)eZ6PLnem=VJmWKa+O(M*pBp36W+@!vZ)%$Hu!)HwpIu3#@QIZx(5(!f Lu6{1-oD!M<_nmQ= diff --git a/graphics/items/icons/white_apricorn.png b/graphics/items/icons/white_apricorn.png index c2ea5617423746fbfb79a815b4c5e97dea5af256..976779af701941c3796abf24d07df566b74c503c 100755 GIT binary patch delta 190 zcmaFQ)X6kKf|G-pfq~)r%Cn~?R@>JLlmz(&GyF#d2LigCfodu|T^vI+Ca%30$k(92 z!yMoyIrVpZgxU+WPnp8?zb?5bES;~MG(YuavDlNCkk{Q+{#==hq+Gld9X~bo+XTca ze6aI*$EapAnNRhLonT4hcRtYr3#~W2Ss?l2$p3O5HQ9$U$y!Crk1lqvxVs_$R@LX` iTfdYt{|Eek!cy~zWnb!cy$wJ|FnGH9xvXyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyaf?o-U3d6?2jk6vPa;47j+s94wu>+_V;U z3dk)E+F3C%J42!6aZp~|J1Hryi9&_??1e%HWt=~Mnsgzc!)n2%Pe}^uJ`86H_03s} z4$PA9jp=cII49+C7>l~DuIRy;)20b>88F^%uZn&X5lZ{PS@m*uVf_KwgJQ$WX j?CCV%H&m$XlVD)*{;LtU@2JLlmz(&GyF#d2LigCfoh69T^vI+CN7=m$ag@2 zgQa^>(*OStxP-c0{q8>YG0S_h>mQ541I^|m#X3S3A5Puu`Q+wuR_ZBp@Iqf5Ij(1Z zFSwURO}w@&Xt!vRiu8W>4d*1zWg9D%bUqDYD2QLm`hV@_2NkL@4>Xr6Gxon%|0w%& d)?wSnHe&Nw?Bbm7yn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyagdo-U3d6?2jk4)9B`POxxlYicsETf8Yd zBSXRGkcx?}ZYYDAVA#b#F^qIBEHnRjN&v4h*F|8@caXbkObN*w3)_fMrr diff --git a/graphics/items/icons/wise_glasses.png b/graphics/items/icons/wise_glasses.png index a3982f18162821a55af23532574fcbdf4086c633..5500baa320f30db93b7bee3ec28f6bd19e1ac5f3 100644 GIT binary patch delta 173 zcmX@h^n-DN1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J$H^x;TbtOguZmo9}=E zhl^}L)qm;f_uX1kC+{-)tma?PV=p6MTFCm~CF_Kz!V9KEOq{uHRr5|WrX-dL#~q}U z{S>Og7iwwVW}H@G6gqQ~jKH^DOu_Gxf0XI0TJ!8!7DHoW+GWXS?E9?seeW{5th;M< Q6=)}er>mdKI;Vst0A#^UJpcdz delta 258 zcmeytc$R5`L^2CA0|SFlq{3++#a`m+>&pI^NrqRMEm_j?3{XhC#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8mDkl-4t>i%!DUQPFsqzpN0y4z!TL)78&qol`;+01U-X A4FCWD diff --git a/graphics/items/icons/x_special_defense.png b/graphics/items/icons/x_special_defense.png index 54a3e00fdfc4a7552ac0baeed26766786478932d..18dd6d5cc8ae220c01f04c905c25c17af36c8d02 100755 GIT binary patch delta 233 zcmbQmyoG6k1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1Jx|{ba4#Pn7DMpX`yBV z9_HkkNBaN&e{gE4iOS)n!FO+nN)=@PcV)0C)cCw$L3@_`F6pAp_jc#C-I;smjh@P( z;BM=qCXc3R8djYzIk}$Wo34A(52Z(MrW=YITiP+zXq+FVdQ&MBb@07r3cZU6uP delta 335 zcmdnOG>dtHL^2CA0|SFlq{3++#a`m+>&pI^m5JBLOyvKyGe9Bn64!{5;QX|b^2DN4 z26rEq06%wyveY64V?C3?)+G;tN;pai{M>;u#y~cMSA(WJkYY)9^mSxl*x1kgCy{lc zqJ2GMlDE6d|E27ojsj&FOM?7@862M7NCR>atbvx(BR_o3u>us3-+8G cu)+WsTwMA#0>>3Xfv#upboFyt=akR{0OHYatpET3 diff --git a/graphics/items/icons/yache_berry.png b/graphics/items/icons/yache_berry.png index 08bb40fcfbdf1599583ddc61db2e86a91e2ddcc3..1d53ed6338493c494e6f77d6b67fb95294275149 100755 GIT binary patch delta 223 zcmeBXUd1#)f|G-pfq~)r%Cn~?R@>JLlmz(&GyF#d2LigCfof)Yx;TbtOk6s#m+OcE zPjmQI`+fhp<1ZZw$!l)r<}tiKORPHfzvq*q`LS}62N-?}a=7mAxAk>7>vKH8H``pW zzo0yL0pH2D)n_;tU3jtSx1D1^yn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyagLJY5_^D(19aIL&*=fQRitS~Hu=LoT0y zt=s`>D?*;1Q?!q4u!>#qmF+_ALeG{eheO-_>rRwS`^!0X{RYjiTwg8!v##ClTiSVv zEjD<5U*e?sH_EQBirMhp*nWlfbfcq}|7v^lldb`d)IBI?Tgh#w*R_p49gTe~DWM4fgCuyw diff --git a/graphics/items/icons/yellow_apricorn.png b/graphics/items/icons/yellow_apricorn.png index 4dd12c5eb664d66cb2d48b1261561bb0cc5ae3f5..293b4054f216ddc444c2933a50c98efc2096fd31 100755 GIT binary patch delta 196 zcmeys)Xy|Qf|G-pfq~)r%Cn~?R@>JLlmz(&GyF#d2LigCfokeJT^vI+Ca#@$k?)8C z2g^~`jbH!&-!AlyYpY$EaD17O+lDFq&MC(?ec39Ml{)d8!{%_+Q02YqPG?pHgifoI z(JyKiV_|v!R!cC7wc~l1+Jh_YPBU08vS%>(-DEt?$HTnvNVP%i&xOWkAD*&T?w@xs p`S8P@($9UzekrH^54`_`>D&vJKOe0WE9Z*QT#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8m_b7?W~xX?V{ZBI4Cdf-7QOICDli9e2-L`EZd$vRb42!wlN^}>CuG?7bY?#^i}WF zoFL5gY{m|W_CuB@k9iBu*|H^sB|SPSOydlLIon1P0e!Bd{t_vPoR%HzhZ=W9ODQr= kVftit$mU4H6U!u^V~e!n7N5!A19TIEr>mdKI;Vst0Q~u4DF6Tf diff --git a/graphics/items/icons/yellow_nectar.png b/graphics/items/icons/yellow_nectar.png index fff8ae6977c5533c2c9cce09d1d608990bf6a6f6..c097f4092645398c6ecb3763af1efe9d7b286c61 100755 GIT binary patch delta 211 zcmey(G>>V51SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1J(3;x;TbtOx!#1B;R2L z9@c}>0@MEgzhk#pCZcMMRgj*sg0gyxy->WKzsgTe~DWM4f DGZkAN delta 304 zcmbQo^qXmdL^2CA0|SFlq{3++#a`m+>&pI^m5J9#=Ddr%6i`UK#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8m1Nw?LY%E;CIc0K+lvEbWa|z3tt7bS_BzdYmU6+;B zDd4xu&3$u}REu)ty^9y$Of?fcGtuty#fz6ror;x@H0)Nd@+;ZbJZszcb2qI&$2rTY x*FJx@w^BNB-L$&zdCF(5^7J${6_^P!FzEbLJtmmdxCZDv22WQ%mvv4FO#nRWY#IOn diff --git a/graphics/items/icons/zap_plate.png b/graphics/items/icons/zap_plate.png index 80fed9a1e587e1b1dd7e13c78c74229019756f4c..3e355ca99592f43a5ae1f681ca22b359ab3ee3ad 100644 GIT binary patch delta 169 zcmaFN^o4PP1SbbG0|UeLm1j>)thTQgC<*clX84Z^4g_>N1JxvZx;TbtOx!xjk?(*4 z2g_8^KmYr)`PVGkVq3b$P;s(^SLO1&0=*3Fg5ZTl^O)Dh%($$;zR delta 280 zcmeyu_?T&eL^2CA0|SFlq{3++#a`m+>&pI^NrqRMDW&A^RiKb~iEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}8B|(0{3=Yq3qyafqo-U3d6?0NAoaJp$;9*U;abUh62cNJLlmz(&GyF#d2LigCfoj@4T^vI+CT^W*$kd|1 z!_t|f^y@$SZWfnCBG>PTi5NRLdA#JGIFJ9{j598eZ&ZpjGfz+r-@3Bv$-GlL9pw&6 zv)wP0{!}DlGSU2rr_555-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hFa zw6AAO@^*Lmzm)ycQJ^eiNswPKgTu2MX+X{lPZ!6KiaE&%3UUTqKycuOlh>(ZZ2^4~ zCQUNzIlO{pNHuaM-Z4>DaNRpwkOv*c=_% zE{3jDG$=PVSm#yhR^SqoP{*({CX(SGYe1kx#A?2I7xo6R(H-vVak4Z0(*e-b#dbEMiYO9 zREUlnOGy}6h%5nhNSSaxrP~6AOGzjnxoDN^tB4wP%ghNrsOukx06}1I#Z_R)apm$X z;+8`(3FkGfCRrR41^I*pDfP3E6{rSOwY7k`n}81aKw74MRZI zey{PAtb^ZpqVHV~gazkItJ6COvLs&bAk-6R$q;N_ZMTGqTG-OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00G@eL_t(|ob8fJYU4ltZanoEe< z82Ua+Al^$LFc^a@kk2A08e&0dJp__7uyMgIV=~MS#@1ppB{_d3X^+Rv- zkCS4)R-SM2cmK+)xG7nfGH){zPq#v*Sk(fbWd(sc4^PG%f0rgFC3JNiOeu^fE}&YF zMB=4+%KXwC?S)pXS;v;FR6_3&a-pz5AP{t!Umnx!p`%xmBFEV;e(iL&eCU00Zu`ua z);y!QSV5pETJDLXuDfGQT+<4nu?jn1)T)OELUCmkm5{q|p!JmrR?fR4Y&}uPY}RUl zhk7on8XsCne@(KLK&5DPcHx86QaNVP=L+8zN&k&+W>pC75 zie^GstUGwb|KD$1BVsXKoQLK)bD@;3AM68LUx@-DpATw-*)&aWJT&d32OqH{^H7wS zur*;pp(wuG#vm?u?48?wJcKOpkmzTMHuA(|-9pzwe?q3kr5z{Zams8vLN+*ID9ysL zEsLhwA1veY@R@x8E(mCcrKb4u$+PBd{mMldF5To8C-EG|Nk_YYST^IGfB zHFq^2vNjT10;- zzEU6Y`wlEH7{T1X#50$m(M^?l&OMM_b9V7y06k`+-!lnt>W2nA1d~ZS0v>z@^HDKT z%`v_+5bBr_pVG|03IGHCPN8-%kOs(L5kU?M7|fTrV1ceD(O?oR2Oai}b{r2M5w*yO zv0T+R@KjVV06R2jm3+*r`tFG-!VyFp0I@I$vur zaH1PQIc#1p4Fk;QW!`D|_{}lh@>kX=~AtfOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00F^CL_t(|oVAoYa)U4shSg~%_d}e(QmbaQ zi3@7m7f8lcs@UOTbezHa5;0)oDr){+vEM!H2G}UJ@{CGSTaliJ>-j<`F0Oj>S@Ic0W;qP^@#!~r$A{XN{4iaoS}qn zKn~i44v~FLe@uOACFxa%qKWAs2pEe5jNL$Y7xLT1fL?)UKp=n)A|eV96Ltg58TZ#u z1^R;~rip=jq=^dy+L9}2L}2j!)CWm$?0@(r48?#%6Vp(o8>BJ=68LdFUc^5i&J0ju zIW3?{MKW_ItT>|R^-zJ6Tml_VD;o-~fnTf8f1TyFW|9KFYD6w1)2r@#^ZRcDKsT~a z`XJ=Ts(%0ql#Dch3`-g8MR}qQ&G5;C!kN;E=Pi|S?-gQ9TgqQ?zE}EEHudj^ iSruOBYWWxX&+7)>RvE$&yoz`L0000&+!1 zFE@7fEk7~Ki;bQAjRZszRq12d*xNVkqVB|^A0uPod1GS_mM7Y(p3R?&VBXl-Q?q|H zLv0|ymlE*2WNS~BlFUW)jS+xinBX81m^SvcDJfZqSQ^{UL1&{OgVCWD@nl!Nu&;bP zZE$Tgq1GxwzQzKyGZ-OHjB>pmZl9YnNhYg?jg--TBLR^^Brw9V1Hs}inPNf!)WcmIwtobYRVoT_dnhn}$CN6T)bY4`pooTSTNlwULm z7!kMOp9G)bAJ>vkBSiiC1Aessg14)WhpS}eE0000< KMNUMnLSTaQOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00G%aL_t(|ob8i8YAZ1i#?=`_nn#Y1Be?TD zMh~`drwPmfY)Ij=YzUgbKzs(*!MQ-N%V2P!GrVuKHayl&AYF>6@VDQ3{`^MLhVZ+7 z>au>&XxIIC#U#T+;r^PxOrXwdSzoC4;$wdSR4A3yN0LlJe{$iyfHNLt z>>Hb$;Tr(^>SGg@v2O{DF+Ti1ixf07M>Vg{Yg%->@MG;+oWVlYl>U99S{k9Bch>w_SWA8)Z4rh;5)C-01y zp)|(zL05F>!?Qhq%oRhcKHfsr40PC~k|aw@P~Rs6@~R&EpwIzB7vraCaWB&uJWhcd zo3Q}ZJn_CRdNk(MkvsSJqj}8I`GNW7NKhR#TBfDXex~$y;hO=U1`qYSfCd7#=nb4P zD)}7=F`us5$m0OASBR(c2(Q?`4c@=nNk`s$whHJeNW6KU-pzKOYrEFNw}&f$-<$o@ z-OKKC{r^)NzNfc$+iy?0xuO?qyWj6NU+9&L?dD7U-uegd0&ZT|;#j=^0000r@S3KxJED>RmnnUnDP}d96b_Fq{SZ7ph4g~*Ex+}O{A+>g;Uz>k{ zf;EGrr_mj$;4PzpTYqULC|Q=%$$o>J??r$gU9Th#^{D z>bE5d>IzcOv}|~#uOi6LBCKH?Zq1Vp+FYVMwA(0L4Q6_*9;*muhEeasgRT$yDgya# z7()WgQM>Cpfpr92PaBRAF7#CdG=2#Wd9p;;rn^Wx#XO=A3ZnYluN^N zmODfJa-VX3=H&|R5Abn002ovPDHLkV1g>( B+;ac` delta 533 zcmV+w0_y#g1l|OY7-Iwj0000V?qFvC000McNliru;{yZ%1vtQQ2OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00DwYL_t(|oXt})Zo@DP)E0#Qa{}Z81u|tZ zf_5)J>jSkl1X_ZK9Q?2P6_rTEb!<7!ST2VP@5~En8?!9-0>Fh{so;AM>@WUBM^@gA zFHP|3195In!p+%0d1ilMtH$6GulFwTP4%w4FrjUH@)0K7e_oHmVW)giq3;96NAWOV zT2x?e6L(BFE-o9l>49k75H|~!`qbaria7DlgB$gdG4_Is4MdmxEt2%X?zrAZem&l* zlRg$&%|?jP(5Wz>l^>yFuHPitZ6}6cA2YJvfn29|;QA03Yv`-uvkXA&BqKICBgpcA zhrGnihj4%Uf6(@rxe@)AAqy4fe3Dsw5xMm$6#V6iF{3)kk^V`fphCqtA4h^G9qEXy z3I!K@9wD773$2}VDvgY%a(AQ|M_(8@6^dZOxflT&R$;^Z$h|2?2%a;V5?@5OVe^_f6-;M0d7`W^F6Ex!oCz=t!$!oZV%Yr;{4VUHrz<*Xh XYt}d-?>x4w00000NkvXXu0mjfj78;t diff --git a/graphics/object_events/pics/berry_trees/kebia.png b/graphics/object_events/pics/berry_trees/kebia.png index 03efc73c1f5c69caac24335cac1abb1958e730fe..413ef9b4b43dc1db32a518b5b872d86358eb7469 100644 GIT binary patch delta 448 zcmV;x0YCoO1c?NY7zqdi0002m9*t&^dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0004aNkl6A^{i+8kwrxM z{W*UrkAS3~UGdxewE=<&EQO(%8drR~sA%J?8UVC5O5_3G^CQChib@hQ1E(Om123nn`c41Eblu#27%RD0@=30al= zS=9zOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00DeSL_t(|ob8gaj)O1^hBI9x-p>Tx9tSb8 z#0l($lqWcK>QavODKAbqskGHe47Z#vi}Q)t|8E;1{?A`I(#iHGetJ)(HR(6WLo$>ip81%e7SThV|xa)G%CmzCMH z1ck)btVtDU2!oDRB*I{HRFm^AOaQiq#?w5I) z*c&3IUI@@&e=FQbH4UvO!Z_$~;0kj$M=M2`mT*bq$_kvB=8j?Ho|aD>c)r)8OB@rf z$2l#;>Z9k<-wmT*6yUfC_31p2NYkcJHwqDdWO0#|V$U>@iSLAhY}c7iQ?-lP#8MO;F6L!>+pcx3YrVV7 zUR%!e)A&U8%5tWk#)rENu+;#Q>MMPF($F;c29wqV|6t~oed+D4i>^BK=M7DR2{V5; z)yBkPVUR}-UGH~&)RD0BuLPsT&Iss>Yrpps-1oaqsFh(^8v zBXNIEYD`8u^NxJcLFn%PpnHah-z)GQy~>f%g1sWfenxNv5H#TtTHA?s2jAyKg|F)> zh=UC2&8b(9RY7ma5lJ{&Zi)kdwFSQL4ijN>L?5d>l$^bq)J9;>kYrsy8_Ev5i~8n2Gcm z9XZdW;uW{H@V?$#J474}MDzk7WZbY!t^4@0rHawee2R^zdFl#G(6$ zf_Ze1cXpN(Y>4}g9@kRxn-TF`Y5L=t3U4d-g3k1f^HmIw0|(OQ92UuY@Ra#W?k2bW o!Q3Clhn%(rkIY~4wf=Se0P5^1ZOV1ZP1_ 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 KMNUMnLSTZ!<=mG5 diff --git a/graphics/object_events/pics/berry_trees/shuca.png b/graphics/object_events/pics/berry_trees/shuca.png index 4e95bb4f6acfee44d6fb020108d23815aede5d6f..dec160ae674056aefcdf22b5c9d5a346d65d86f6 100644 GIT binary patch delta 479 zcmV<50U-YV1gHd%7zqdi0002m9*t&^dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0004(NklD=M3JeUv~ef|e{{e`E)>Ll|2Fi9>6V9TX=FPNQs0(g?aw zo6UGAkdYw9wnd5KGdsxQ)>s0)N$NnhDQ`y5FOAO{`)-7hVhqCg%noKkN+=_eFL@|( zM~7xNN4U<^QUQM!75%OW>+4mYvvde=7%J3#?>7-xD{{TcRIzr4J6$~^>?up(5_rN~ zF{Pv>7e=fJJ9@_AsZ#;Rg!}%O$4KfjBF9WiLpNC8YIw(7aM~re_=4Ts_Xqx>{Q-7m VH+u8^tZ@JU002ovPDHLkV1naL;!*$r delta 565 zcmV-50?PfU1pWk&7-Iwj0000V?qFvC000McNliru;{yW~FgcUI$OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00E*&L_t(|ob6LRPs1<}^^nPPCkB2?kh-vR zgN<&C`3dZ{X9mXuGMjx;@^4zCN*<8tK!*MX?%9Qwrp?U2Mat{beZ0%vRfvE4nuX72y`Qkh?pf=8QfWY31KA2zzQC)$* z*5U?y#>3eMe~O^8WWR)CJIL)2UBC2;0lfdHb`%}$YD_arVv~U-x>Pz##5I=2S4#m{l!|FWm00000NkvXXu0mjf DOo8|4 diff --git a/graphics/object_events/pics/berry_trees/tanga.png b/graphics/object_events/pics/berry_trees/tanga.png index 28e86f6f4d98a5248ce093f7745594e8ee66deb6..0bba806bc4667b0b24b790f14ce81be9e76906ae 100644 GIT binary patch delta 526 zcmV+p0`dL11=j?S7zqdi0002m9*t&^dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0005TNkl#(ChZ@VHaK5$j?Zb?woiQG6E6lc zKTWLorG6#iCy5pRLV;S@PbD8yV$CnqS(aB~`BO1s8WRiNRUTyX^rY)41;)gR56^$* z3YowL3lX3(c*%!KT4p9%qHn-qsA2)LXf?beLX+-h$+6#ZOLh_+#JMN(lI6Z_Xgb!d*1|$l(nt*+ec3hB z3*jDbo13lwq9Ca?Z2cOfnmlF@yz~WLkLY&>Q;&Ou9)%an^0@(|IZHzTM$_{ujKA)_2@e|84wIi8d{N7yn~?18?Fcg4>v! Q_W%F@07*qoM6N<$f)ZB%;{X5v delta 625 zcmV-%0*?LH1i1x}7-Iwj0000V?qFvC000McNliru;{yW~IS3P@a-jeK02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00G@eL_t(|ob8i6P9s4Og*!lM32_R@NfwC% z?52d>lWo>jlA{i`yCi~%;Rtq)&CV$t5PCC0J0Y<|FlX3THMWGt28oP-4*cd>_48H# zIQPB2>XJODm*alCeB|MyP(J1l6GEf4B$tr2_}Cu+l@LqJe?D*u9QeR%$$gqweF`yY z0403#*c%(~;SGRvWp6?}_Lg9bUc54TLcIi5QEf(EXTUJZ=t`^ub1b2W>??i&e^L;g4Wrp+z{kNu^)8?RgUxFL zWjv`t?}+nhchyE72avRa-<^khx)xdD|0j_@rX#OCtpa*763?E0TwJZ+SG(53+rt&W z@7d<(#m)MCef!jg_w?`i*JicT6>+ zZ}r=-w+y0`I)X`FIuQs}<=+rg(^~@KkRUb!zabE_KOJA`g$qR5S_gpe*ac#3dRl)< zIp;+wW+L@^HT=(|>}v$fEIBJ*5Y(FK_qww+#Nrv7-xWjVNg;ZppiOfqx-#y{Ph^?*wNONXiIgb#IrL6S?Md_e!jwA?&D;Qh> zFk9JO^hSW(2A8T)48Z~bA0Hcok*t4YfmB5BEJih2HTeZVALV-j_2pVMo0jc@t1rPq zx~PYaiv^Q<9%5ry0JKOKf>>H{Ndcstgn1k>HS`7$2Y@3T&=vr`g{p@f{o?>B(zk@x zwyoX(>^Lwz64^@;9O-3d6fE&tbDwd$4NH@$j}22%@ft5QU{^V0lrEyJt1qY_3*=y1d$M02Zo$!>@DV?+;_BfvN=F~YoNijHeEZOFwY;)o`tSl6?dbt z{@z0A>B;DgbI9%IGXk|s0|$NT;R3$vAHN{brsK_EIB?g;-wh?boetRVc?OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00K!#L_t(|ob8l7Z`wc@$MIlg?SZ+0Og&2s z-r!nCVzYdv9ovetDmHTGN0C?>RSHO5TLS6_2p%D2xiu24#Fy)HmNL{Ybg%lX|DXQP z>s_n$KPur6jB`MnVUQPR96CcJqIYKqf5`ffoJ+zPg!+s{f7=g1>1GQ@00Lnn;LsBS zz(rFIZw@xp)uK*a+>%0u8Ch;VRrQPY{asW5mp|9}Z4I#9+&@v&b-3Ja?yBRwSg#)n zV8EB_ycWp6@DwYg>MGAaXH_77;9&}iQ;6RzR286$G3YU-uxY}Yeb5keVw=duz(Y|5 zy!e$!i#8{me~X$~x?Y^58pawDPl#@{3n!CeLNuMxD3MY`)fyDngc2Rih~{DpWedkv zM&E*_*apW+D!?%Wk$ztRe5FT)J1-A{K7khLw-wy{N)b3#fOa2&XoJ83ECrqi|zygS=EtvKZb}%$YiZ-d$kqdo>bG*q{l)B^|}GLEcT2p4S+K* zE(L*xZ!gB_Lt&tJP!G7wx4^YOEDz}!*!%XMWISj9NY5^b`6IKd{cat$>);9uH>Ahv zep{EZUC%u7kuj{kO1Wp&!R*To!(R P00000NkvXXu0mjf)0R0h diff --git a/graphics/pokemon/alcremie/lemon_cream/front.png b/graphics/pokemon/alcremie/lemon_cream/front.png index b913e40be83ce0205be8e477426443efeb12128f..4fff85bc541af0d638890a80a876e4a600ff9295 100644 GIT binary patch delta 657 zcmV;C0&e}K2H6FW7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0006=Nkl6>+ zZ}r=-w+y0`I)X`FIuQs}<=+rg(^~@KkRUb!zabE_KOJA`g$qR5S_gpe*ac#3dRl)< zIp;+wW+L@^HT=(|>}v$fEIBJ*5Y(FK_qww+#Nrv7-xWjVNg;ZppiOfqx-#y{Ph^?*wNONXiIgb#IrL6S?Md_e!jwA?&D;Qh> zFk9JO^hSW(2A8T)48Z~bA0Hcok*t4YfmB5BEJih2HTeZVALV-j_2pVMo0jc@t1rPq zx~PYaiv^Q<9%5ry0JKOKf>>H{Ndcstgn1k>HS`7$2Y@3T&=vr`g{p@f{o?>B(zk@x zwyoX(>^Lwz64^@;9O-3d6fE&tbDwd$4NH@$j}22%@ft5QU{^V0lrEyJt1qY_3*=y1d$M02Zo$!>@DV?+;_BfvN=F~YoNijHeEZOFwY;)o`tSl6?dbt z{@z0A>B;DgbI9%IGXk|s0|$NT;R3$vAHN{brsK_EIB?g;-wh?boetRVc?OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00K!#L_t(|ob8l7Z`wc@$MIlg?SZ+0Og&2s z-r!nCVzYdv9ovetDmHTGN0C?>RSHO5TLS6_2p%D2xiu24#Fy)HmNL{Ybg%lX|DXQP z>s_n$KPur6jB`MnVUQPR96CcJqIYKqf5`ffoJ+zPg!+s{f7=g1>1GQ@00Lnn;LsBS zz(rFIZw@xp)uK*a+>%0u8Ch;VRrQPY{asW5mp|9}Z4I#9+&@v&b-3Ja?yBRwSg#)n zV8EB_ycWp6@DwYg>MGAaXH_77;9&}iQ;6RzR286$G3YU-uxY}Yeb5keVw=duz(Y|5 zy!e$!i#8{me~X$~x?Y^58pawDPl#@{3n!CeLNuMxD3MY`)fyDngc2Rih~{DpWedkv zM&E*_*apW+D!?%Wk$ztRe5FT)J1-A{K7khLw-wy{N)b3#fOa2&XoJ83ECrqi|zygS=EtvKZb}%$YiZ-d$kqdo>bG*q{l)B^|}GLEcT2p4S+K* zE(L*xZ!gB_Lt&tJP!G7wx4^YOEDz}!*!%XMWISj9NY5^b`6IKd{cat$>);9uH>Ahv zep{EZUC%u7kuj{kO1Wp&!R*To!(R P00000NkvXXu0mjf)`B_i diff --git a/graphics/pokemon/alcremie/matcha_cream/back.png b/graphics/pokemon/alcremie/matcha_cream/back.png index 8f93ef92ef5658067c721151d77c9f08554ee387..2ef7e2d3bdf0c7c38a5c600a65984c71c7499975 100644 GIT binary patch delta 585 zcmV-P0=E6@1(5}i7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z00062Nkl#rG5RAkOTl}3t)eG zCnVEL;06F7wPjX+eAf~+BL%o3p(0o=2fq`Yh+<>pi5@BM%Gq8sEa|VU5U?IxD z3F&?!%rj^N$ajbUkZTU=;?P(EVE1AO*%fj*&+9xR0*(5Y&@m+hiJ-MR07d{ITuXq7 zUN*LsLb3<|&sCfnC;)^jtYRY!di#ICXBFmnMAjSz1Aebx8z9n$fO1Rz-KVaGX$H6s zpgAD*0DTi0$S?u4gb2z_1dv7{m;joA3=WIhK-vsx0JI9|Xn`95q7hzJp;gezClTpM z4WN~(2bA}sQ-JR2Xev-HKPKo2*qX@Z^M?^lPq)+qssV3-4+QFpCy2p7J0gD~0x=^q zR|1t4H2_d`Q;+Q#09XT+VPc>b6@cyBo~;B`0P`?jyB^p7P3dO}fC`}Z0|MJVP0aqM zZCXYpAdUvGIw%H(FmEO&2;ew+IhLYu7g09~LM)JsenA|1L0bo{qCfqH@bIc%I=V>@ zfVzy;+%3Q<$8}xDDHkeoNrE*?fffLi6ky?oe1|vz?*aNab#PP%r4=dxZ!`GDH}>Nf Xzs(>#8w|Fp00000NkvXXu0mjf1eO7m delta 675 zcmV;U0$lx(1?vTn7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00Iw5L_t(|ob8mqj?+L8#*-rbS!^O9rMcAC zpmkEEz<9h8(iMqVUx8>GE&Ci46y|y)eEmt_w;;jYJ`^+S*xvOY=n*5uk@EfY?Kk7u z%x3>y%>$~NNj*4ksBWi-tB%CDe$@J8_2pqyUkGi9y9s?Je>K(V?&pMV4Y165%Af`y zswNBoNEg5+00|(pQVL)@s?Ql<2>}rAMl&p+DK19m7_>mBvxx|G#i7wpBTRPp265C~hJm3~_k zhdvOyfO;AMe_9=w)-Ru2fYl>#fmh$%40AUEI^lZlmi%TS?|xA+k< zLJnqc&Kn0ni+z<}Usl4v*m7r?u6b4DkbjOjMDl)b0q@@m)0ahBe5E#z6uA%JF^}b! z@)>oRH5kK30Qp#!<#U=!NU$kB02c7R%*lZk3N5%F@_+rUegg>V6*utjDO>;m002ov JPDHLkV1hzCAZY*q diff --git a/graphics/pokemon/alcremie/matcha_cream/front.png b/graphics/pokemon/alcremie/matcha_cream/front.png index 39c3ab855a7ebbc1c07ab2a63f8df455198fff58..7dfe1b3073b5a6509fb70c9bd8295f78c3117996 100644 GIT binary patch delta 657 zcmV;C0&e}K2H6FW7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0006=Nkl%6WuvEM=`HC`t!)b0k4HT*2T9 zfZ59KqBjEMHn>!cVh9!h`1sfujAVZ$3#1}~XECbLs>v?^`Y7KMs4v&5*|cmITzv@^ z(nURVTrHT?^AH=u0w71a5X73RODZ7wB+TQ8si8N3H~<{!fV=?kEmS?^=pP42mA)n9 zylw3UV8?;!k;q<(;7Bh++-q&V#rtv6ngPh3TO%Iq0Nj9n>O$AIhNPh$ybFIoLRBFG zaY*6zgg{;2QuBO5VCCbrJWjePK!zTGXr8DZl{N@%4)9fy=?PiOxrZN)Bqun276cGP zqjqWR2hcP7LEmomAc%y}Ixyr+V{b7B<-Vh>lg$C@TLTTIwdvaNgn9mW_AGSes<<1C z_4gJ^Pftc~oI`FupAjfu8aRDW4;S!V|M&%gHXUyU!-2a#{%$Dg?R3C?&s*SsK!fOb zQ4IYPfK~0;e$YpYEWdA}sjZn>H`5yu+rjDrylta*>`ZgacDo&33DQREwp0D6l*JWe r4|?1P?u6J^$RBEdaDF5I*k7@KdD|I|5I*Ww00000NkvXXu0mjf$<#eX delta 733 zcmV<30wVp{1*Ha%7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00K!#L_t(|ob8mmj@m#JhH+tO%M6&=h9+Z) z$_-3nZ9!vsjFK*i7)z08*cl(R^-7R*Sw-4FpOA$oSo{{Sp__-w8B1Hl7t%*L?f>aN z*O^x9e^kOD80UaC!yqrtICO?cMDNZJ{*d({IhTYp2=y6@f3_cj(#;l*00hEDz@bY7 zfQzOa-W+VGt5u!4x+8@QGqT=&sp=Qohx@1iEd$^^j>u|l_-B-tXvE4ov zz<{r}c`cBC<0)21)m5H<&8k5D$ioyArx3qcsVYEMW6)zvVbg>)`=BA{#5R$Qfrp|B zc=0Qd7Hv*Ae-|~gbiFu9HHIC2_-t35zWOI$`+2T zjJ^d;u?>!uRDeYYBK^4m_)ZrJcU~R@y#+1O9~-#&oFcHO0PQ{k(GG!+*eqYNQwbof zFXBW1-0V{Yngxf_B-$+a6-Oy-Kui=|8`Jv}a2PX&e@7Vw-IXe2FG+AJ0f8|iss==g zEVl2f1h{DMH0p#xU>Q@6fGGjS5Ps;)mv}LQE*~OaYGZl=LL++*+=~b?#+15nC5nlM zdW1<}YGkV%60}DI7u^X0vZ^ETehd+jkjYxv_G&A@J*lRrNf(6<>U9HfS?n2I8USZr zTnYjWZ(oelhr&SdpdN6UZ-HxnSRT?daP;jz$#~EJke*!<^GD`T``tS1(7_cLZb*;S z{kAS+hn{)jBV$;7mGa1}gE_KO!>B(5(w>r(O`~>YOQPPOKIi$1{;$Sw5$DxPj%KPQ P00000NkvXXu0mjfpawPD diff --git a/graphics/pokemon/alcremie/mint_cream/front.png b/graphics/pokemon/alcremie/mint_cream/front.png index 68d3b5a4c0287c9dc69a4bb1580b216ad44ca860..e019cb098ac39083c6be6f3cc7bfc8b35a87db71 100644 GIT binary patch delta 657 zcmV;C0&e}L2H6FW7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0006=Nkl!cVh9!h`1sfujAVZ$3#1}~XECbLs>v?^`Y7KMs4v&5*|cmITzv@^ z(nURVTr8N>^AH=u0-!~@5X91oO9~+EB+TQ8si8N3H~<{!fVKeeEmS?^=pP42k-jCg zwr%wWV8?;!k;q<(;7Bh++^coI#rttms{zQKTOuCp0Nj9n>O$Aoilm_)ybFIoLRBFG zaY*6zgg{+iQ}uj8VCCbrJWjePK!zTGXr8DZl{yG@4)9fy=?PhDt%o0uBqun276cGP zqjqWR2hcP7L0@n6Ac%y}Ixyr+V{b7B<-Vh>lg$C@TLTTIwdvaNgn9mW_AGSes<<1C z_4gJ^Pftc~oI`FupAo2C8aRDW4;S!V|M&%gHXUyU!-2a#{%$Dg?R3C?&s*SsK!xad zQ4IYPfK~0;e$YpYEWdA}sjZo6H`5yu+rjDrylta*>`ZgacDo&32~tPv)>Hkcl*JWe r4|?1P?u6J^$RBEdaDF5I*k7@Kpl}%2_jc6000000NkvXXu0mjf?EXKu delta 734 zcmV<40wMj`1*Qg&7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00K%$L_t(|ob8l7Z`wc@$MIlg?SZ)gW$9UB z@CMg95}V~S?bueFRk4vfKgz(+s8V3)*b;I?! z^Lp26{f|mG1mhggW*Fqf8HdggiRj%K!XL6eB@Fb|?Xa z^+lWrfSYZqK(k<1nnargKjJ8b6^My~Yh!wU0uE!wfAA=ypu19q>?H{fB_J?nMAd*u zk;V3Xl>iqF9!H%}2rOgD5iljd7{Yg*`3Wy((B(tqOKnUKKxky|fqM}l#+XtUu0%2M zP>(PPOpR=nLxT2*;G#Q0Kvs1m-j5+75;9pU+g@!2xF^;0H0iO>LA`DOE{i>*O9SA{ zi%UVEaN&z_`cN1s9@GOa^DS`g56eS(2KK)FCm9bK0MfHdV*beNYQI~D?K-#u!wu=N zy5H7iY}Yf7d}Iu(uTt)rbufE&Xc+Z}K-yE1vT4+=Y)RA`)aN{Z(f`%>4UNRm5$PC7 Q-~a#s07*qoM6N<$g5r=x1poj5 diff --git a/graphics/pokemon/alcremie/rainbow_swirl/back.png b/graphics/pokemon/alcremie/rainbow_swirl/back.png index e7f558454d9320a913d5757a44a270badd02f476..06abc68128d00a8a6f38ca5c9fe5b4a160f84f8e 100644 GIT binary patch delta 588 zcmV-S0<-<|1(XGl7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z00065Nkl`g!r@l25;}jqeqpl;qdy``4xIsemY)^i>0Lm6B>U}MSHmy^ zoCnYt5L$rTxCSB&05u_k{NMq&Q3wWrY9NBayf)xAL+Svv0y0|Q27su9msO}0)beq7 zdJ+SurD_5Bo^=9{J?%{eiuun3Edgs2>3n`OqUq_DT0k*iE%1gwP4O7f8K{3pgh!y1 zFr`!olvh*%K*dctwnqR+5-1E61Jx)1tmpPc(r+y#Xu^vOy+{o5=_a*tS-VxhSa#uNxV`7KlebBR099u7gz3-hM-PSk(_1 z-6RJoL02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00I|DL_t(|ob8jbj?+L8hLa-wS!^O9orK^8 zPH3G}DX=`Ygt#IW>njkAPs=vE1O4vySaudksC}mtsqq zPyhZio}JD9JH6aPMBNym zem$BpXaIcDFN2r`kVnOO#$MKH^Ty2@zguVpaVixOhjlDhe~-Y zng|BKW;_;sgc!#mpZzH#jbnUi>dU7w z5OzK*^}MQfe?uU)0eR~Ix;ikW9^TpjYerxLPe0ok=5_>h!u8rLhm-6g;9G#&oJ|1~ zMd04JpN#bxxfc*U5Hj3;E>4VS#<|-B~KoMT1#Sq}@whMeF zm@r`WAg?3`(E#)e;*DB4D{+N?CyciMvMO~}SJ3%6e?Mi67;q(>%`^byVUsbT>!qCS ze|^y3u#jg4ST?sq$sWkGK4_dyl#>Vu>8kgAEC|r;<|d}uxBC|saE`#Sy?$%TdU?P9 zy0gzXY>(}}kb~ap`@IFA#r9a9K32j&8`-nW&-t+`p?n{6h{WaA07v_KV*0wutB=%X zMv;dAJsxvYf2i-UE)uP|2M{-PUEk%ofCQW3BVYlq>XIC2q0oZ6A^+=d`VBQ!7~-Yp RNG|{Y002ovPDHLkV1jaVCn^8{ diff --git a/graphics/pokemon/alcremie/ruby_cream/front.png b/graphics/pokemon/alcremie/ruby_cream/front.png index 7196c7054bf2a69d073957e04cb1f239c94b7f90..3f59ec810787d6d577f0a389118594b5c63cf7fe 100644 GIT binary patch delta 658 zcmV;D0&V@N2HFLX7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0006>Nkl@9;RrH){dmreviRrxmr)%2EtI3$RTz;6h|>`%v6df@_*=G*}wJa&Otvz~vJ zQYmFoikV2gUJd_Ct@|1QGixcz7X;;O`n@bwRM|1NmYfa(CoR=Ri>?sN1I#@E2_<7&aAo`={N763WYg&@{kT~YzbCt)5(ObxvO!~x()2jm5SZ=vcTNB=lLs`M=( z=WS~@06Pv$k3{xT1V?%q;$Ca>E#8ll)(k-Q+#2y<2jB+uQy03vH6#u7;9Y+J5~>Oj zh(ijuCj{#HmYU}i0xKV{<#EzY0W$OeMDs-TsI)<7bAYdsOi##K&OQ8aBsszHvmk&V z8nsJfKY*Uu5Bhei2SFr+)`1~s8heX5DEA$0ooo(J-x_EztxeaCC(QH5vuB|zSH<0E ztiQKVdU`T?;~aAP`HVpM(!hR!dboh^`o}K_wCQ*=7!KU^@pnT>Z>IzHd)@;70~$of zi(=@X0IX`y_JclJWchs)O>NE8x|!aP*bY_~;B6bdV`rLUw%hISN{}{Mx1H)or7W%( sd(h)Xa3{pRLjF+ugYz5t$Nq}_0|Wpgcs`nPfB*mh07*qoM6N<$f{-{j@&Et; delta 737 zcmV<70v`R^1*ry*7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00K=(L_t(|ob8mmirYXGhOI(uo3Z6>%oG`w z!i7BvTNo8WBa%jt1P=s^ss$&FAxj{3vt5$43)gEuhP`n$PvM=B+2*`U&Iq=ME>0hE z+W+G}*O^x9e^kOD80UaC!yqrtICO?cMDNZJ{*d({IhTYpe+bPPi?$zvHq91}00hED zz@bwFfQzOa-U)2zt9hL|zafPTN3vLbsp=QYyW6M$EN-t#a6%_+oh=DG^dc?u@Q6gEv*vkw}ANo*5& z3Op25z>8mrf2?S8%(W*{|?ctUimT{yWEV`Au$Mv0Uns@9;nA(WWtNDLP# zlr0=v8GQ?eVjCPQsQ|MOMD}wH@SV;y?z}t*dJRToKi2T{IYVGp0or{8q7?!ku~|N4 zhY~W)gBWXgRI2wUf8a2t6pwNWrYm*GUXtKY0s^H* zR1b(0d2HWT32@QiVblqQz%nKr0aXH&B7E05P4Qv|T|Pv<)W+lhghuurxEB$klqz-M zN)!_h^$3%|M9Ee;Bp8nfF1lj`WK~DveF_ngkjq-x_G&A@J?W;WNoR!)`gH?vS?n2I z8UW{1b6g4n4PT7Yhr&SfpdN6UZ-GaDSRT?du=njh$#~EJke*!<^G9k|``tQh*TEGi zu1Js7{kAS+yPkUBBc)hB(5(w>r(O`~>YOQPPOKIi$1{;$Sw4wof_ Tk!PFg00000NkvXXu0mjfDy%lc diff --git a/graphics/pokemon/alcremie/salted_cream/front.png b/graphics/pokemon/alcremie/salted_cream/front.png index 08a75d2e8eb33146d4343a1a43edd6fea7a301e0..13cc028c444ad4c694e404c78b52bbebbc3f1ead 100644 GIT binary patch delta 657 zcmV;C0&e}J2H6FW7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0006=Nkl6>+ zZ}r=-w+y0`I)X`FIuQs}<=+rg(^~@KkRUb!zabE_KOJA`g$qR5S_gpe*ac#3dRl)< zIp;+wW+L@^HT=(|>}v$fEIBJ*5Y(FK_qww+#Nrv7-xWjVNg;ZppiOfqx-#y{Ph^?*wNONXiIgb#IrL6S?Md_e!jwA?&D;Qh> zFk9JO^hSW(2A8T)48Z~bA0Hcok*t4YfmB5BEJih2HTeZVALV-j_2pVMo0jc@t1rPq zx~PYaiv^Q<9%5ry0JKOKf>>H{Ndcstgn1k>HS`7$2Y@3T&=vr`g{p@f{o?>B(zk@x zwyoX(>^Lwz64^@;9O-3d6fE&tbDwd$4NH@$j}22%@ft5QU{^V0lrEyJt1qY_3*=y1d$M02Zo$!>@DV?+;_BfvN=F~YoNijHeEZOFwY;)o`tSl6?dbt z{@z0A>B;DgbI9%IGXk|s0|$NT;R3$vAHN{brsK_EIB?g;-wh?boetRVc?OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00Kx!L_t(|ob8moZ`wc@#_>Sr9+-j4)bnIE zxHb~rET3D+Q(JMW@YJXhNa@-JMEBqoQidDJofYY2jMPf-&-Fb^8R`$ZSAEy#r|12= zYqkDIB^-ir4(Kop^5Tp`cZ5Xv?hN6L*Z|^lNjQVRoU!P5e*tLIY~ct%AZP>}dO`rW zXv*Opz=pn>)v2>HdVdettRT#5-XbWg)rN)c9T(A*G8Ot>e8iv-FRj;)No z1w*k7j+In^V*n!kz5@74j~aJg9t3>?Bhqgxc>I+jaI65G0RrI?fsfcMKe1g2AZ#F_ zSO7e(Qw@gso6;mY%>NOEDXc(DG(0HP{}XT+Q;LTP)}LLwoTwX*HiR)BlbO;3{^3mx?92H>*TGrBYY&Y`#z z1RA~=Zf5|6f#!Za&}N#$81SD?5eeOC9| zwi(;>)jc08#pJ931p1cYq94ySB-h~>R-uaUH%Vo zatPqumUYQM=MWVI#9ZB30OtfTBnXI#7i-R#(+Cy>^2*hg%G+)t zm=Hqw82$4A#GOwgTiR@MNdW8W~x&t89DIS8T z1oeD}`99qO)L6n5K>Je`eM|Yx<+Izf>fr#;gc?O5rFUmSc=-{^>7*C0Uj3(^b07*qoM6N<$f)vR8*8l(j delta 631 zcmV--0*L+F1iuB47-Iwj00013M{Ml?000McNliru02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00HAkL_t(|ob8l7Z^AGTh7&3Vm)9r0KA9?Y;gte5?~^;ZZ4%m5~K z5Bp+4yIVqFzlO3B-Rum#`?3Ja*ZQ*Gg%I`FugQr(A;cWoYM}!XV7ZH|AAr+St7|!z zn=yG!#}DEJe=#tymMI{ZgOiLx0gko&J*GHcPs;*#to;8gpX>EQ+LRr}fqfx#JHmv`BeS$)!NsoKFWo)aX52*|h`V=3&e_?EYq@0=4OcNS}3Y(A@M#%GF zv-y%;Oa%xzk0c;I_J{9&ZcNdh^8-=mAY{eWRd{3xu-?k&PDHLkV1lrs4IBUf diff --git a/graphics/pokemon/ampharos/back.png b/graphics/pokemon/ampharos/back.png index 80fdc1f23d26a47ed0157ca797782ec58d7b8626..7cba18fe4780a7f8b8598a3e2ce2a690c67274bc 100644 GIT binary patch delta 490 zcmVt!QbYKU_mR?Y zO#p~Uz15qP?$eZl0I=%gI1*VqS=o9CRV97ES<6ojI8Ib2s2L2kG1i z=9Um}L=badJ+yF1-dMQM)msY=aRGmb%Xw?TtzQ6M{l@_2R(t@+<&XAO+yF|LXY%I( z^K>D15$3(DL)vLU4M-V?ZUFjw0_Er&dBhVs{>-PXbUm1Zl zz(K(CoI@T9>tj+b<7L98CtDXHX&eGX%6VJl_8>CXJyIPERNcV_((`Nczv@4d4mcO=>N`kV+K7EBz|4Gw^l5E`>@M@;Vsxn=)n# gCCmo=L-+5+FWc%9&=?erX8-^I07*qoM6N<$f~LOZ@&Et; delta 567 zcmV-70?7Td1b_vQ7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00E>)L_t(|oXwQKPQx$|#_NHlQ?DdaDHEYD z5FCk>;LDDMz3>1Ps>B8l&;?mMMW?FDEASp{c^91KPhE0xD#XAIS?=fDcfR{P8vVl< zZ+j9f)b^{NcEv^l1x!DA1d1my=qQ>H04zita4y8uf+T>Ef6ZeOM;vG%1Hln7jULmG z0$2)V9#aSq$u4A&lmG&#l zMgi&o$hQF?ODL6rQ{$Er;R1pJLI*%sW?}2)5bF<2~W*u|^XhbfTOEc*Lek1=~d;=DisCRqlXuJRb002ovPDHLk FV1fzrcIpY5*Phi~&TFH;)n1)>$T0fLjGun2#y zc(vg!z>J{h*{~@L7Xm^%SWpS57ZAMnjx2(X2lL(~15F4L&H_LcAl{=+PvR<NW)G z7l?(Gv^~^qOak{r>zbN)7Vujl4^V#z;MN@BNkENnf)Gc5^tf=6@kuC8S=T|}+IQ!6 z7L0h*m+%yzR^$hQinmX2;=?{{0C{I^9Us3W4t{)?~k9fX3>L>k@SMQ)Gxa7Th58ebQZA?oAAlrF* z7ZBxdfTtyJ(*d>re!fIk0V=P3iS7kz18#VWATPa>K>M7c?ahuiL=dZYO7N?1)gRj3 VAd3|+ypsR`002ovPDHLkV1mzj*iirg delta 573 zcmV-D0>b^M1cn8W7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00F8=L_t(|oZXbaZi6ro#u1X=BcciHUAj}s z9MKwfEBFCW&|0a{YkNbM@8`Sk{*Wm8pAjd?W>w!7MZQAB z+fpCa2-Go(Jfv4v#~gtaBC)y-`m9r@>qEjP(5chW1)HK)f26ChO$Vewo5DU;;Xa%N z=aa2b{|aywutw?ESO6ud(>>F~1=ztc#cg1b5yRpw^cu1^_%*E$x(h<_>HM zDcuku07Py{;S95mZL)-D7GPxmJFW@%Q;Mz$_-hnDPXXpsA~9>7ZPvFr16_u@${1kw zn9*}@QCE*0{cs=54Zv7jfGi9QW?BHQ23^_YD)1%*o#C_s{Pp+-F;x}~U=+3k00000 LNkvXXu0mjfCwT0q diff --git a/graphics/pokemon/basculin/blue_striped/back.png b/graphics/pokemon/basculin/blue_striped/back.png index fbe338ab816e7ad8dae30d92c4c7c87f7bdff413..9578c6665f90c7c46e20147d7119da6fc039b652 100644 GIT binary patch delta 557 zcmV+|0@D5E1@#1w7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0005xNklg|?o)UXLFAB{_H3 z2~hn0HbAY;d$P@7~u#2af>0I`;|}v;NB+nGlBh47-=Ak03qZV5JCrtGXMrZ z6B@uy!TvnJvbSb80B>x!i#6LBD4@FeSNRGsC}O(=v8!2bWc{kT%PRnO*Uel3hRB_N v2E>@pHQl%bV7}1ck9Ys+dGs0R(LdEMnztjjHrpGb00000NkvXXu0mjfG9vy) delta 669 zcmV;O0%HC31my*g7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00Id~L_t(|obA#-Z__{&0Pu4p1~xm6MSz7| zs07`T%NJ-kb~0QNDGMEPuree*m8k>Rf`txMMKWcoe4eTbRmuBu+&jm?F*qAr-e609 zKfQl4A;k-mE2u!x!IS4p{n)~l8HK6OT4ry0_e+DIO)?%#Qs~CfF>az}G zl~XvJ`wXKJyyV=1e$@^Q&fg%Yn30e==lsO;8kNA|Z-tcd-1{p*DYfsDp|s(>D*@9P ziDU8~R2)e;EeX3FC4rP-j1kFcsf69GHIyoj!_bQT5>DIRM}CaM3$3*wQK>`&_ixEK z)EG&s;(4irf4L#0uOht#OqELDm3`Kw8AwysiRZiIqk(I$e1@B3VsjrhzwUYr<+)3| zdSBqO^c2D3UR_4-^8#~;q85ltT&0U*k*X(ZmV*e-PaHA&=I3IQ#?9uJ9N5#kff!$` z*jA)k#h-F;gU6o^giw$H*42r=jXG*O<-!~;nuPU+uuN)l;3={9}7tc$kd<#J~d1`>SMSKL02H z2q!t<79=@vYzKe`1QXxpJ#V40v+d!4%>x*4z4XlhXWsMmrU|!-h*_;G00000NkvXXu0mjf D?E)(7 diff --git a/graphics/pokemon/basculin/blue_striped/icon.png b/graphics/pokemon/basculin/blue_striped/icon.png index f0450849a15c7b66345cd0a3f6fd08fda6801e8d..d84ec283fc60f82e19fd59f8faf4f0ba5222b797 100644 GIT binary patch delta 288 zcmX@d{EBIU1SbbG0|SFkK@2~-f zi|@<{4Zr{I*R{x8WFoNDc`2Xe>9}_r9H-rr*#0l1!}M8RO`qwrb+rb?atu>BH!N3j z2x6b(^p1Z$^McTa*@6+Zf(w-xbiQ}bSS9gBxKQ7*x`uz9`&dnd0O%u!N zTH;yw{#YOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L008nyL_t(|ob8gaP6IIvhVurN#gu{e4Op@# z&scSe)IJO&lF1WXbUM0T-9(v?=!Ik8;!H3j{>`7P*p5D>{$5g2N!H*TI1r#3S6mi7 zh56#N01F~N2>`feIyI0HwZ{!Wolu|YeBXdYJkHN!8(UEyf3M*t)|%WYTugg&3Bw$W zYaJiNA&f}^iZ^*1+~e5Yx^B|f|M@Wh3OZ0qD%~#^Q%w>*V3|!42El~8x2iioaF_iC zz6A0Iy$MrS!~F1apl?uCfh;}ln?V`99axOb5AVd%k7Xv30;z>9U8~&F&MayLM6Y9a idyKIcrq-%{7N1YKpo9Un4Dv<*0000lr;kr2?UomsCs>+ z%B#p0n|Y29dLXX?=P6`!2>{pvDbc({cAx-6-YtR(EVN|B1&}tMg%TrJ;1{Sxf&s2W zIG(6zfD_pFZ1|R_1z>;)&%7F-0{a>caP817$N&$3PJja#3%vkYSX}`1ft`gd7C-`7 znCF2&Ca|p|pbgLn+cXl|0PQ)fS+IWqx+iF!ge(|;IfQ}6H^UOL!&>M*F=wxjWtps1e_(OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00EduL_t(|oXyp-PQx%11<+cu)U|Odp^Uk% z*j*!Luqyrl#Lf?N>A=P>bU>q{it?fgC6F2XS3f@I2m+BkH22XcE970D6?!257CPz`1D?&FoIsub+Hj98J0`k&IWF__t5Ksls6u2e>h+i2J zLS-emloA}sb_fclH5{rO3}3ReL**?QAPWFh?2srxJ(;qa0pkt_a!!bmbq+|&l+uhD tIgmm~l%N^D$eRIF6vUKz`QPtfT|W^tqL8^*nw$Ut002ovPDHLkV1go$;En(Q diff --git a/graphics/pokemon/bidoof/anim_frontf.png b/graphics/pokemon/bidoof/anim_frontf.png index 9585a6015c3b703883e8ed77a6a9ea81c569483a..a62f24b7d2473b079e0d4f535456498c7b3b5790 100644 GIT binary patch delta 710 zcmV;%0y+KE28{-g7zqdi0001tU!Pc!dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0007fNklTaf-`qAI|bW&kVy z-U4|4U=ie9Cm}8{W-z{L)EA)e8%=*8_A2z(>t!mi89;0cfb$plDlT*pA*Vx2K#Y>{ zN)e(|P z*W0 z69G3%oY`H0rqKRDRah)8QV~$8$o_%zH7=SJ=CRlm-9OkQ1{z8bm+UfGo=K2@ti`iu sxP=EJUQ1E?EJxSNo})WDI{qd80Itj%s+Wh2GjOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00MYPL_t(|ob8seZrd;rhABYWO*tNncBm*Q zo#l(;wTRu_rb8DViz3P#1hx7C1=_6{jDTa;zD0*@et-^rnBGZo9Pua*?b1R2A|Utc z?kBC_J0UuC`d3MLydI>`J62En0LhVh3@Jd~K151v0R6Thf8h*Zl)?yL?5|H@FK(E< z5d!P8X^SC*Tm%4Tkhd7{#U93+Qb53i%v}Ti`D8YuDj9Oa^T8RWA1q-+2HrqKkKsm( z>X9=82D~mmP^tE@i;BzhvfNB=Vcho{UKb^5b6tl7<%YPJd?mxDdw{qyIKO8I6GMiN z?=S=Ynj@9De-Y2i8*A^&O&!x?fSaL3-O?@N1lJ%m4DFBa*4|YggJOmt&8>YwJ^C=f zdg2-)7~|VCV+o1!8Pc(>r9o+>V&z_xR%>f<#1N}m6`EaC5KFW8Y0O*fuZt_i43SD+ z?shvFWBvpi@P7=gvfb|os_TIX*fro~Uu0i?ea3hhf8|?mnE_iEgRPCm?$LV9KdDQl zdNCc5#+%6V&DlE<$dKpX%hYXs)AtT)>z&SRojP^;k3?KNJh;LdL!pO8wTO#{hetIR z>CwjZCoc8^?{aY9BCZfV$AOE|2fYRt`#$nM=OXSGlC@}ZF=w~oa4}_vb-4)eik;y( z7jtHCf4B%sHlo2roZ=#AT7X7tz43vcW~ZKQy_h_UVVQ?wZH)u<>i=E}1_kk)oCR%ply&;CFi%=Vkm zr&o66+aD^&d`^hpZjEn$*qiKjZiH`tcoY)6ABuB~;G!dVr@z-9MXKp?ZCSVs00000 LNkvXXu0mjfBnx2c diff --git a/graphics/pokemon/bidoof/backf.png b/graphics/pokemon/bidoof/backf.png index 5f6bc7e8bc22d9ec4ea62fb4854f23dc90db43c8..a76560fe473c67e036868c20719a5b93a3de6802 100644 GIT binary patch delta 414 zcmV;P0b%~S1m^>g7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z00042Nkl+QFASCyqp(kfmAwFEiKTzDxuNGLau)X zoLqn*5`3m==1}C(Kxda;za{@2UwxMa2-*C#X&iD<^+_wVo)3k}PuK9`bBJ}2Dxw@6 z5PQdY6sRr5ZCpl8M`x-vh#hndxcb1mRzV$4vGq7R1!=P_1<91+EN~4#bP8B%NiC^0 zaFt_on*#wG8o$miOe?woM68Vf*b9G6u*MFprHUg5SKV2#3ZAisOrOl%jd6VIXtJZw2Hh7M;N^Y7r>p1N<=} zi5>&>9byAYSBZN8T0ZQw@&kqbPlNUNwu=b?U%!Kcga5)CmsJjm)dAh_000UA07*qo IM6N<$g6TK7+5i9m delta 497 zcmV1G)r|7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00CY}L_t(|ob8i4Zo@DPhULL~B*WcFK?kUa z+#^=N19Zv#k5KCEhuW?kLLdP`ex!c>Qj~hfJCxG5Kk5X(c1=Y7G3ffN$;lF~7hoa3 zs!40DltDyyuFn<`cp(D5g&`1=Pm;iO2uzX;Xr(Si`CK&^e`dxWmn|li?vB72m_s~X z7AXK9%gjk$B+O`lYzL9>-V@{r2aWR*XA5Ahtr`wnZgF{+Ck#X~8?hc?Vczy@*1OYm zFQ+aZLI-&H%)qk(TQs=?fwEV#A(u0_0c7b`t|BWNJ2t=QpvxUggF9S-+lb~5rMBA nAjh;Pxs3of_~*Uj-^VwICVL&|Hp2h_0000 diff --git a/graphics/pokemon/breloom/back.png b/graphics/pokemon/breloom/back.png index e8a71c9139e039411b464de33de11a78a73b752f..9616b079568c0069d0816b70faff015f73a06761 100644 GIT binary patch delta 633 zcmV-<0*3vo2Ehf87zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0006oNklAo_vL!~l)&E88u=VbS%6ZN-0C z03P)}YD$;@G!7*FEC7#LOUt7YuB*@hR@Ea!z(f^WKs441;C=+}0Y;eA4*~1?7~l{! z2!5g`dO@Hzf%ne<#@V(@7tR0}-T^R#@CFd|ZvdhX;j)e+K+-=2faxCsFzShB^gV(t zA29;}A7U^9WbY{+v;(;uTG%0Q2h)F9@Uk$tbb@69qN(FgB~S+-D>K8%(OquU>PA2# z2fz+o-lQ8h`CzltFoF!=J@y2EE&)LFegLo>wghzP_y#d@y?YR4eQ0)3s+QhkoaPcL z1d$JgHFZz|~q4eZ(?P6lW(KagmklLFA{HPrLfD3=iE*#_> z5mU=Zq<`!-fr(?UIxfVNRs`CL#!orX*XXr54urU|JQn&5Vc&I%u{S+E6UszNqOj)x zwd?y%JH=&qN`MMc|7rjdKVbpr?CSK@$97)Pi7^9AE&!CLGE{)kjEXF9I{8fQ`++lz>49;K22aqu?vsQUC_S z*42Rh$Fi;mK+grVwrcbaBVj3$*mdCqAor!J4ET{1y8JxyvUD T^77P%00000NkvXXu0mjf2!$#w delta 739 zcmV<90v!Fp1*-;-7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00K`*L_t(|oXwQIZrd;r$E`)EH`4+XbhHFy zmk6+Hx4uAxtajMasXYdkULk0g0s(?r-VKY{gCu;p-s$u~N3z_h=nVv<`|<97;%Dr+QQx}PU+%cK`i=!X&eWfe=MB!1qj314>suwz%A>F za40?JpR&7tpz@1NaxMFSn=1CVBuUafVA=xLeSll}1^87ayHzy6CP~$Wj5-+_Aj{Il zh3uZB{9Ax8vuu&}6k!9|ARv}mD#fo;8j(g zFbG7eGl0@Xf3D~6f%YVQ*sqQN#%uun#mF8#7KEzFAyf{4wVh3zI0(wSgB##5_+tn# zw|381e5vSi>0ub#72vcAu`>@=|KuHDZB7FcfXJ8^3xEukND1Q}G4@e3uhJNc&`mpm z?g*-6Uf>h4{ek|r45&SVDnodgeE9ruZ!}r4Z2)|he?nMLMQ&<9KW!<9;;54g&<0002ovPDHLkV1kcYJO=;( diff --git a/graphics/pokemon/budew/back.png b/graphics/pokemon/budew/back.png index 4c8478e2a8ffd18c4080c86107da1069bcf65bd2..33a92ba75c2ecc5578e9a233923fb5030300f61c 100644 GIT binary patch delta 411 zcmV;M0c8Hf1mpvd7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0003~Nkl6MTBBU26=0zCX1TwIh!DE2gZUI~%16zC)a7urH z3v5UN905)XSmGoJ!I#0wSSjB4k2e zU`o5dc!4OC{7``@?;_@TFSqh?lYn{F<@ZNm(_M5}R0O|7C10*HEla-u3B>;Pcp+Hm zJx)*pkdQ+33rH){@f<{;?sG`_N|1k(ke3pj6_5|UE>VQJL)cI4RD^+7C-6~t*|w1H z;9Efh>;%;V>wP!yc6?}7XaQ@h!Zoml&;)Ri_aWTd!#9An4P5NOufZ#B!g;W^cW_z3 zcC3FTbpM6_B=mnGj_*o+0GdyXwWk(#@Za8Np7|T|1NOcP265yp0000007(Z$PDHLk FV1k)T!e;;g delta 507 zcmVOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00C%8L_t(|obA&wPlPZO2XGAi06u7AOkA#E zbdbQ}c16fJur&I1C%=G+=f^N{baXO|PR8xR$cM6p+$qr4i-VKCwZHt|pN0m(-y3!4 zKWEXxE0~gUvGjmQMN%g8`GG7_KrC;Gb7sFGMZ^^$Dq9iEW$X2gGXOR4tOS90bms!f z00lfZLa$wye^DVq{~3V7)qm)Q)M zYZPA*ZqN%DcAP)Dz_)pxm6(FpJ)n7?f_!v-{P8vg;ZMQK45$%ko}3r48{W+CdekzW x2aI<(Ur)Xdgyrs>csFRY7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0005ZNklvriZvdJAAX4cdJ|uR*ZZ*loZ^L*Mr;V9{_h8DO^o#Wpun0CzHwmGZjqp$2dEcQe%B#+VF{+5oU`v3(Z+&GtROtICE9J6%L*gkM;2 z&Rtme4IrfnQ7pt5Q7+dG(u_csh2scF7cOEfyNJ&DGXhzCgrVXJ0LD7ci0-#|O!^Rx zumI4693$MNo=wH21#5dk)=vP$6#;*2Ayh!n0wBI)xUxWmVnH>)fP?`r0mXu9AVhro z6t4hG;QOc=$W5S{x9tFM6)@{*44wcIE02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00HnxL_t(|obA-HZlgdD08kK$qSG}-hW{{G zp+uL;%F?@FM3JAcCbz>5O+Iol0@{^cagt$J9m)&<+E6gCIZ zg!8@804{VuB1N`e=>Q8=ZN(phw6V!klZBXy1m_>RL*#JuBOL2I^9C?@2~-f zOYiQ6mWTiUZxc}WVw0ac`-#f3YPK^4Yi&c7f^H}C_;jq8_V342<6=e*e?_I5t6dh1 zaZJY;u#y~cMSA(WJkYY)9^mSxl*x1kgCy{lc zqJ2GMlDE6d|E27ojsj(8d%8G=RLn_EkVr5nW|I2<&Nt-W%-tGV7Vqb{h8k>NEbiK{ zdGX@K;*qC&<_XKnnqOqK3M^gl;-L+rn4?g|#lmMST?b~$9X39}#8Z6k#C%7yDT!{KbLh*2~7ag>25^; diff --git a/graphics/pokemon/castform/snowy/icon.png b/graphics/pokemon/castform/snowy/icon.png index 6ab5a1549150e1309d4ac2235e4dc175b7c34920..e8651ef4172f5295f0bfa2f858c6da06490c6f7c 100644 GIT binary patch delta 246 zcmeBXKFBmdf|G-pfq}s%pmol~YWsSDk|4j}|7hT>;-)D;H5)u#978-h-%dHmb=ZK% zIlHXWvG3pi{Pf+6Wv`q(#@D>@Ma13}hdA$T`!9TQC-04x1-o~v?VI79rNXfJUC}Zn ziTj#*ZYLT}h^3{5&q`yyogGuVaT&kM7QTjgT0%a%vzRY1X(V|CFdp@t;F!v(uHfUa zj-jzopr0O0j?1^@s6 delta 320 zcmV-G0l)si0*eEX7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L006H^L_t(|ob8e^3d1lAMSTO~0~DR1$L#2> zf{y~xUQ9}_dg8t^o6 zm6}Y7Z=Qjrj00jVJ%^b4?nNF928 z143@=L}@x^^iGSVcdrUqcYQEa5hDU_{b^}4mqo_x0~5F4clE!Z4_wgB!8`${&coAk Sy3Ex80000;-)D;HOoC+978-h-%j!6V^!p6 zX6M{7``-U;>n)zGUBzxN>BO@64fZcT-w|MZ6Z&PJ;)TuCC2Lk4;B+x~sl{O0wMMD) zR(z2v>x0#{ogxP=wAl%`rtqwtHizkF+T5gVK@Ki$(wprvzD9N!_|48bQ79PSJ%#rl z$Bz1+av!R6H*Y;>U>q;_;hC{X&^bW_SNP$^>=$GKe9Tb$>+>GlW()} ggrXVDyieGF&g7F@e&Xp$pqm*yUHx3vIVCg!0HG9dq5uE@ delta 311 zcmdnN)WkeNBAJDmfq|iOLB?Dl#a`m+>&pIwgI$P;bz?+gJWxoy#5JNMI6tkVJh3R1 z!QICtz|UQwEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4&eH|GXHuiJ>No1X< zXkX8mY1;3DH-c3dVe|9)+Z({pJ1gd-2utOC@G4 zkUe=^qFS}4=F3HcZMUz@?pV;!`zEP)DcjP`j@t|t{>)6|o4BR)Q$2gR706?ru6{1- HoD!M=H^1%U;S7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0005-Nklym>Y429KHgB14tA9oWjk&A`2`)g;KPIbo4`8WxYbXmUfjbR+e z@umWx2JHJIBUCWh8UkDhC}6JvD{jy{0%H)gmf0PttSY9TzGSWp3oKnT1jq9Y5V93aV8PGs9QhcOnA zg~t|B4VXZ8w3M+sDX1t}1`|NE5WWla5f3S z&H*`rXrm!a0Tsd4u>u3SRxbl%4dZ{sc7ZbkIR_^6a<(urAUV7u08I3f!)mKdxa947 z_R<1p+_-=c6a5l9S&}YGN$P#7=Y1mkcli_G`A`5t?zbf*z@Y%}R@=K0ssWK;`$qEc ze5wG6&>=h+uhI*lx1cj11n;{lXaRxXjj0K=$QIH&gyXr`6Ab($2fRM6lfhaOej-6~K$-{cEkZ=VRYu^Eq6Z`dcW==~ zS+Cqsu3hNH{ARi}?gI{|TZPDLr}Kfzz!OX6oLW!EIbcRO8c~zsASvYaxebJ26-RRd zU@Bdn?Et!iSqvaVdH>H(Y2YP_zXCqemxK=iLikkwjsFzCtaBjpKP?Gt00000NkvXX Hu0mjf>EZzt delta 660 zcmV;F0&D$&1>6OY7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00IC>L_t(|ob8jbYTQ5&h6P)w-ndv$>Ab)> z!yzH^7!GOOB(>Hm1{-&VpcJZ77?noF!J_LznpDBXafb@SHO7$s9wW2T>Wt17P5wD8?P%v41qaNLZ4`_Xf4p`B0!vN|O(Hh4+_0LxUpd`LI zT_K{dz(5^mkXqt(*Edc1o;2YDN=YT9G~K#skO72JWFTc?%)03*t=RYgb)Xi;)`mo3 z0>E}48v?qne+>aL&^E(Z_cO6L24bzPg_)|z+v9VfeM+hKx;e>9AE575vIpAKn`VRr zBzVxl2W-m3pz{C#Pp6bagZnWj%zXnIUvhoO2;V~h&Ek*|euRK9244iC+?f4AZGSQV zS?q~z9qNO{RLfwO&SLpIh2Q|Pc&bNz!9=hY`BODofB2Ic>-VF`MxbO3L{&d#RXyl& z!2(siC7`82UU5K_Rn_gTwg%e&b)Chos)i6{-`}w*VOQM_DWOkUfQUL9wgI*Uw^xAW z^TPfas)*tT1{mg%(!J<^;mwLkYA4#B0Nt&=-{j13fi-{#QhQw7z(@e3aDuKicibY) u0g<27CJ3OdR{{PmxD2lW;^hwia{U3@)Evl$gw_850000`+Oz`m3brC-7wJ9)d?gEjN+rKU=8!i7G zI=%Dd-L=;5^q(Hvyn+3MoWg#!`!6@jDDcnam;b6Ge%gAIRTR)C44$rjF6*2UngC49 Bbb9~* delta 330 zcmV-Q0k!_l0+j=h7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L006m3L_t(|ob6IE4#F@D%n$rrv(T)b+V3D) z&>0bl7gQNKbfKkNB2j9ngc6sT0U>Vl**=}EGv>Y5zCp# zYNGW-qk$v?y~k1@rY*2D4wpb>8krA6>mz01$lUvS(Rty{TwLF3%AynRn9td3u+5&G z@(#9f?ikbrigSY7qzR!DDG;-JKA_WAwPVN31L2ME9atwNn;$yoZfL*7ApnfhR8vK7R z38@ue^hy*ApOk?|(-S~`a#9J4N)ns_OQ90jT=?QGA*5VB#JSYFvxI;Pe89S{3*S2f z%KCghSGog_hIbHX4uGbQJBQ5E;U0g*3hqJKJN# z(-){eCF}7l=Z6fS3V^L({|v5NZd`um?n7;GY$!yWks@+NI?!RB5zSsUBkx4aBG4y_ zuw~TOY3fmDfELu=WQm}6wR>puzyqjl^kWF%cgZoe03LgdKtq6xH4pZ&5Oja?xOsK% zr@D-?a~sq`a<2A0U|qcdO|%O_SfBj?nRmj|7jW@QfO8;T0(`$$UIYB|&=Pn@bWI~< zL|IhGyTR!$rR3JJ)KZGezm;vf1WF`_ev(dM}cU1Ux`1gdj@a>@Qcku0@@3-*n;l2Ui z1HPvpg72(I&b|WcrMQTo3rhM!yDsC0Bvh9lrMlJGstR z_->JAa;>DX!}lS>7#y`6@ZF~ieBbfk4jAzLGw@B!R&K$!6Fjd8NLxa}37&gGg>Q}W z!E>zuPQ|$S{cQ4XL&pEDqtlb0@x9}}9%ugzd(S5i4gC-L0&=M(*~=eIx&QzG07*qo IM6N<$f}NgqxBvhE delta 852 zcmV-a1FQU<2AcOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00O^BL_t(|ob8ssZ__{&fPEf1WXkorAThWX zE6}t8C0DxVhhSnt-Kz?@$!eh(Gl0|~9BWi5y-pPyMautyRQ>~4x*%m>Weo4m5sB>g zOc_8z%2Ohp@;<+J&rb54=dI%}1q*%yh%$gx9l(L%)m)A{f1p`qD&Ptjl`mAY1XE3T zsTSmmfU-4(;!3C%Qvl_{S4~%<3qT->1pt5&Y^&GZ@1g~4k0uj`&y-Satbi*a9vwm+ zcBv$G6KYM>=A3USw1F)l4qj@V#x>PJ8rTqnbN$wsxYxr0c92fAF=i5yz=e5dE{q9# z9UOS_@q;n&e;!l7V0Z7@?Cz8Rjn7{{HFhSa1mF$Eu{7gUlfWJ0;{24D!rL$dV_(#m z9yentQ@9VEPX7Cr<<-EohQtxXW9U*!6T-RZSxDJa^k?4=KKDJ|weIWXyeb0T81i;7bX&(gCpE zL#N1qgm_Xm?xm2oz%>OVHah(7mr~$G_>=(rWC2i*`xk)z@KyjSpY36o#AM!+!(%B= zVqyng|uEFng)C;cc8B53V~}x?9r=aDM=kLD$}yFg=dckH&pGcz^pt^ eokG{~@8Tz)TRn9cLIiaH0000Z)n0e6BFpmud_MS-rg2#=t34SiM!U<5x4h7d+k z4+6>e%~lcA8C1bj;u45Z1!w&Cf}jaZFQ6kqSp<*x?qz42BOt*dPG>k2q_WVE1pZ8b zw;~A`tsxJoHG?V`BluVhrdS9>1gd|B71&L_mtYh;5$HbshL$Sec48A}u7 zff7OR!wC7ocK{$r5xmm`g=a4Wz|isF_s(qvVT5R)H6I1?gLm*Ynbpg9mE#pb3M?T_OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00GiTL_t(|oZXeXYQr!Xg&j=s+IA@!D-R`` zL51Qu3SI+^34MzcD+s-YO%VUvR`;9Zq-(1ov2;G4|45OPqWIelH+OWhT_j43o01T+ zUC>w02-Q>qq_KRauaRtZ01hN2)}R3N?rN0s2^ZLBUV#B>e+N9shi;Gq*cli=Sva8M zqZ-jf2@a@j2rPBb0D6+$$^&l}I1ui~BoR8Qh6Xx0WG&F625d(z#m)nE@U?%| z#5vV716756#=02tYqrEK#0GME-jG3XRWaz93>UTfBWk^#${_T*Ahc-~bp7k8lT+W& z&GA(hWu`N`XyzW1Ko+0z3uE9fnLB?=|EB!_fVMXy(FDQA00000NkvXXu0mjf_2ByD diff --git a/graphics/pokemon/cinderace/back.png b/graphics/pokemon/cinderace/back.png index 701208e6729dd25a6ce2ade047ebe744f8a2ff7d..6af38da2b409fe38bd8c115a964c3cc5a5508755 100644 GIT binary patch delta 577 zcmV-H0>1tE1&IZa7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0005_NkllWHl&bV*MFNg0H9w1 zNJL%)U=$2-3_24+IL?D3#(NV2ou$D6wcmX|f)L?^(0MDsXB5JFA<{iS0XjhmdP{#o zduM@x??P}3cO%e&V4ba40fazkg_kPIx@k8PKKGLXou)uG<5~E4gl5@*CIFqLU~@iA z;Sew)3(Y)w1a61`?i8BQ^gAQHaP%-e@zMZV0CUIXud8-$qFMoSc$HQ{KN|x8VI5zD z4ruOBhYvIbz;-~}Psfl#Ed0mw@d`OyCIQ zBHrRzm@Pt1B41j^`n4uKGHM8{y!TL_=U+#QOnNk(@#r1+8?%4e;dXLR(}V-x~V1?cSG%O7iBIV2i*%U?q6 P00000NkvXXu0mjfMjHiq delta 689 zcmV;i0#5yj1^ES#7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00JFJL_t(|oXwT7j+`(QMS&*ON@Jjjw2{Wd zV*?5xVzZxky zy$@ufjUmL`m;fXQu$`3SxPmAc}%0w4izDhr?o<-&CU33iK*qlBN>lT{xo7tl!vU-zNf0L3~b5LA>-y@i%K z)s(;}+1kThuk1FiA)iP?{2buvwf9`;{D>Z^fZ~ z)4&q~c@RkG69BdUmUoF-z9A5+*9idNl1J)E{c@11Q`JkPp48V#s)IVjfq9a0lG8hY zq@Sdm)k7@gJPI+%tD2$!tkFh5K_47^_F)kZOwb?P5}Jq1d!)ZB&v)Bm@pugo7(sZI6xR6TZr z=RH!44F*h~0Z?^x7*GPH#|m1`&D1_Q4sOECxv74fs6gb2qQ)R=YxNm;SnzEGimV3O zTA$D-MYtS*z=%SuPXJWwTfneTE9QS)ncaD0CxjbIe~LVO`!PFS;v=+44^4=p5kK+dwn7{AiNtYy^Ad1LaHKhLW!zqA2#*_HU+xPIF z0Zzg}Id=gL2kSlKN5Dl3rIf=f1&aM83q=#rAAnNMJs^qU_?Bb6vd;iW$3@Tn_aD$J o{G9ODwHWCUaQBt@ll}GMKPtKy9ENbve*gdg07*qoM6N<$g06c$zyJUM delta 769 zcmV+c1OEKh1;_@F7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00L}DL_t(|oQ0InYZ^fm$7h#vm&)3*hg^d9(u;fOC4tcA4|2#QdTlGD{ueQU<}gAcJ!%huKncXZ zp|hsdVCN<8u)@5L-}h$beTT7?&|*>fjjt{*BE}t4QaLgYe^8crP5~N#6wo+O0MA2- zu|%E%G^jy2qP?g=lmPNo#|(JA3MNsZUUeGCy=@Zkwi~!3E08_b8i+gjYPeNp*zdZC zydG{<8OhYky(8pOAQn>#B!U6r0GtG5)j%P5k1Zcu$g0mlFC6(T?;B8g7Ju#geV>C9 zw}?$7JkM`Ge|7XZPR82%0%a=nJigzk#e!2rR{*#DwyPp>&GC%Ne z70`oVck!=G(CvO$B`j;Hs;7gGiZ<`+E$Khj6D!J=)(c>e00000NkvXXu0mjfw47H` diff --git a/graphics/pokemon/corsola/galarian/front.png b/graphics/pokemon/corsola/galarian/front.png index e9b4a7ded55f4b98d796ba362e5091133775c112..19d22f3b89ed6dbefa7dae171dc7245e9d9d6d1a 100644 GIT binary patch delta 509 zcmV(4m?<(&v(j6n5h`+%dw zAFIF9!jcz$126*i)@jLX0Ny1@sQ`NM3*e>|nU8?z^5=Y4!0o9K12`_j8a&>2qyk`bveR#+3S>sq z@LuBvAYobMJG>*I)pSj+ALb*%=>c52^hfmtZWI{iFaa1d00000NkvXXu0mjfiRa~! delta 611 zcmV-p0-XKE1gr&+7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00GcRL_t(|ob8dlPQx%1g>7Z&R5c+L6GKcM zpe3!KW2ouY0a3G4L3Tu?@UM=kL}#!>AAv_;Vq!#8N;{a9iFe>Sp$OTg9S}^MAyITb zpL=|R(7*m%_5vT1(vJb}>z84mGmF6Rc0AR__U8;~8UW%Df3GADgIO{ZvK&H)=Qi^; zdH_N}6#)7HkX6GqAi}3I89UztVI}K8NMHbibPJ2SC=Q?1*i+j#Dub zHJ>iY^B@BNJ6fYO3^KsfvA$ih+_rey%zdn_vfc^p6(Pp0ZdTFpY-Nna82Cc8qHYG* zT8}D|31S>Yf6{VDr~)qAZOe!#>Po;@{o+$O5}8_im)Q10wd9*PZ0EpuId1UbE zFTMd%$%G>1BNKpK@%kcv#LARkr~F(CDDT7Zi*ab0A^;`*1;D?4P4Cg6(r5sOL>d49002ovPDHLkV1jXe1w{Y= diff --git a/graphics/pokemon/cranidos/back.png b/graphics/pokemon/cranidos/back.png index 54947660c0ce521ffb068b928aa62dc2b6183604..39aacf0bad4e2bf263285a7f16daa87b332d7224 100644 GIT binary patch delta 659 zcmV;E0&M-j2HORY7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0006?Nkl_IAvb^M? z|K}EVMxf{rV`_xmkX`O1O>_f;zHN);{v#mrPcw2*=p00RrStRGll0Ih!{kO>#o zm%hM&z-m5x(Z9%1AJUHu7_u%eW2sXw9u8RNG9;ZGywE#mHAvhx4V(uAixIqQr{A|7 z=2JQx__haB!Z>q;=Cr9hz>I+L#|qQ*X?{!y*e?#}(`A5wPQ)Xu5YExJKo}6Dv4;fc zuHP{r=$uLO_EX$dFy0c5n0J4NGXbGogmR;<>yRIfvitNDEGva{@l8L~X9v=;B?Fni z^$Kk|oQ|=D0%-LU0=08>Uzk`B15o!lP!Acv0}OT0U80Zt%CIn t*7pl>pl<{Q)K#tk`uA`3HTsL+jQ^8mHSNyoZ&LsO002ovPDHLkV1hTvH5dQ@ delta 761 zcmVOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00Lx5L_t(|oYj;uYuiu|$2C~cRfIsjsu)^I z7G)}Q$ngBKXpqyspqe*yke|LlTMb#-A>afp#Tb&0(Bi2>J81O-VeTumLqAFHo~%@Q zPsyGGd%2(g_kZWR^SnnKO1*z5&G<$2lRc1EMfKxlk=>uqe~YTBisEEAKjH{nRKJSi z!(jfBE2RpIPx&C=mk4AW^N86s0{oP~RTgg*MQ%OBj{@%rAP~bI_-FxFVNfE#fPf53 zS%5c-!X*Ia37|4X(g)I2GyxC@0M7`@Ex;ciPe30?0*nvG<(Jz-&|_4A#z(%eO#~9s zAVi6nR1~*?e-wdPKt_xY<^Vn#{0}g20B=sf>KWM-_;n9(@CtJ}L>-_V%f8;*nx(8f3K*t0~sGUajOvu`; zK#OxHKkx=4(WGlp$^i$SCwSbxKnw{8T)cgw1`K*5L8~2WA=2fL{PZoR8H@YoN9}S< z#VKtpS?H;sD|TYIQ*#r@g6;t*n=uS?RQ3|03&{55U=Zs_NOLUmqAkF1EqCh<-~(5k zXxem}e{_MZ1!#b8>n=cRyic1xBCzX9%we0gA`3=9*>`~>LieZvggK&feTxkP`lc zRRC@nz`x!g=qUm~$_;^ky93ZuWH08t2i!3r04#rEfDuUcZX@9OuYuH)NH^EL^1y$; z6S#$62(rf=!Nx5BxEBZj+5te#x)%o|)F7l4K)m-(Y)sI~K(9<}Dh$*w{m?mpRsaqWEeP{XwNSl8 z(Ob^R(J27PFF8iFO(HwyF;x=~%>aKdfkn^8@%bw!0Gz+BF_ACiQ~{{Y?P6&NHQ3)_ zat~HZw0Ya&3&J*$I{891y8z@=$`Rn8o~#G?ShNI`QY1f6a;bWZ8ME(5eib%Amd6af z7*n(ZvZcWFEkLFpg~z5Z^IU=;He|?6=36~UUbDwR0J)U+EK49o!a#YEgady7tLC%x z1fb0CKhZNqLXnzAasy!19T?s*g2V#`{1g4(TaCymGy$MmT-#(|Ho*KIMy9;S;$zHb zTFqC@`WaxD$AMkg1H5ikepFLflfa*O)F7A(VSqL!H{^EgSAqsfVpnF*g!ijjVZPJx z=}VNgj*9EEX|ztSj1Rr~XoP=K9oY2Mxw?*jw?XyP$}eVf)4*9Nty%x2M>0de68DC;&C;7>{^)OJfUI zSN!sbm$hI3*B_73%Y`ezWz~Hn!2X|7AK{t(4dLV-xdYG=dKQ2n&~tzL6(E=RZ-B>y zX&CH(Kz`=K#Itl7{4OR`T(^GW+fwAy#9!yB3&9GOkt|iq8hZ%C$82Ez9Bb?$44;pR z_;`PM2$)&#k7E~r346fQp?~qUTmj)gUnYk!5TWn#KnT+)s~+DM0y9AwUPR9TuYnf> mMA}=-i()Xq59|Bc{{a;F-W@xw;nD5@0000OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00QnwL_t(|oQ0IlZrVT;g~##|Rbqypy)T9} z@xZbR8?)?!;OU-7VVmdZkCaE~BQ$%`<^kd;m6}}}XP z4w8U`-v=NlJU9a0xZ{ADrX5XTg!TX^x@rpd5sn$r5S(0BmE-VEv>&z9@p0zd3f%ZZJ{_)O!oArbPShk?-!>6Ec zjvWyye>pb}>nM&L7sweB5QwsMzcAQN_Hx3{&Gf8e_i6y}?KX3zP=Sccy~`!z(C&(j zxjczFcD{CRxI8fecHqp&;~~Y~cLx7GT)r&(pl?f40D=t2%J168UM0*#3mW%XMYtB& zt6w4D!KqQbZY0Q`9s!I*_b4#H1*%NZdc@U7f5?C&`46DRqw3XH3w#rjBRM|3{J^D7 zUN5Qy^xgNdN*t^nAVG`+|ABCP_hZ-1sJQ|$;)Tioa?R#j_O!_Jzn+MdV3 a7WRLptN9|#%mbqU0000~ diff --git a/graphics/pokemon/darmanitan/zen_mode/icon.png b/graphics/pokemon/darmanitan/zen_mode/icon.png index f9e8674785abe52d7588315cc2598e5e5c709762..b563d4f2ad130b8e70444e4333d01f3275c11c70 100644 GIT binary patch delta 248 zcmbQoe3)s11SbbG0|SFkKK3WkWTC0HbgsOMZTH5Cw2nzJl0v7JpYU`tcIt1Q z*B9dea|MBI ziwancj_aNlt5Lky#&M;u?0WUP=qvs!WE1Zx&g-|{BK7{wotsQQ`y6)3A7k42*Fe>_LL^2CA0|P_nf{eL9ioL|s*OmPVBO`}_^!&HNZa^XN64!{5;QX|b^2DN4 z26rEq06%wyveY64V?C3?)+G;tN;pai{M>;u#y~cMSA(WJkYY)9^mSxl*x1kgCy{lc zqJ2GMlDE6d|E27ojsj&FOM?7@862M7NCR@Vdb&7)+R0+0EEfJANC4TcPQ1voCu(#>?w?(FT zqBd=p^-Od>TFmHO=`dGU;>U#ZE1KD3d3W+GN#$;7xGA#Xd81q~W0O-gTe~DWM4fA`pQw diff --git a/graphics/pokemon/deerling/autumn/icon.png b/graphics/pokemon/deerling/autumn/icon.png index 7c14c05cb299a9dd6822788dc768658c2e244a00..4181194e1da1ea9c926c5e0cc99066168de2f24a 100644 GIT binary patch delta 305 zcmeyw{F`Zl1SbbG0|SFkKG|IEHw1zMXQB>yQDD z>-A-x_a^=SADzFu^QxM#W5B@;?HlK8+nzWl_xJVer{{mYdcHuLWBvgKgLL^ACJyP% z8Q$k79Lu?NW3ob@8N)M`j_#RK=RWE(hD=?de)qmOll;okL;dyI_TM^BtenKPEb$^| zF2mOETZ6S5ZC7=E2`uzraE$-{s3NLwtAxwZ$qb9bSB7ko(CF|CnV^1q(SvP!pGyX; zy)a{|YD408#uWS3<=N@a;^o)f|Lo4;^RHvmy`RdbtbQwt9C_2f!T!(1Hv3%;Vo9Hl z>rF6y@~~gH@yx%9c88=#YO)jV@P{|nOqbWI))$bC|G0h^(BBN6u6{1-oD!M<-GP?+ delta 424 zcmV;Z0ayO}0`dcp7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L0096f zfDY7Y3wUps#?kYn9n zX2EtAmCOkPIy|06lC@STn8o3JXOy&|hCi%*Va#FkH(`hlgD}SPqZj7i{P+eqLxnF* Szd^bH0000J}IEHw1zMXQBtJ#3Z zRad)FP4(yh{daRqb!K-a8{A-HlRr{@>zGD*!svYLv7P-O9Y*H8Z0x9tkTjvw^5a`!y~0+*S+@~HhZ=>*5CMc>io`*8%w!EeVi8y z-(vZ7A~T?xsk&rsX-}6k6Gu^0_v1{-Ye@pK;Y?@Nc)wg^7{Ibo;J<(+$g9 zpRF-v6xr>s@LN+S_Vvuo`(pk-?-wZe*HKmb!TrkW@9r8L@B0nP|4A_26g(%t+TojT w-aiY0j_=3SS%m!m=uMEh!*AaBXPW%F>8`?RAt&EC0=>=P>FVdQ&MBb@0AAyZivR!s delta 433 zcmV;i0Z#t<0{a7y7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00AFKL_t(|oYj)CYQr!PhV=&b02%Teg^VGP z4An!_9K;3teUhO|ClPGA7=j93IyI)xkU;Q|p;k#SBnGRt6Qq-;4jtOt^hx|W=|0B( za;e@L!X5-vs)H63ap?dr5|bwya#}?5n1KbCDDq=gnq0WgfAg8503VY;0frXbNo;^Q zQOV=RQ?*I83Gw>3xbPA2h0x7bH}l%$QKR}hg>Kk;^{N+ z;+vh<43t>3LzfxwuuMW`g#nq463%L)6fD!xTVoVAp;~^7U19Wo@-tzG4xKRC@uL;y b*ZlYf`QDzXE_dPE00000NkvXXu0mjf{^YRa diff --git a/graphics/pokemon/deerling/winter/icon.png b/graphics/pokemon/deerling/winter/icon.png index a7259c67e0c4a94168748f4aac414febcf3cc039..6528ea9711756c567f28352f32ca89afbb17a238 100644 GIT binary patch delta 303 zcmey){F7;d1SbbG0|SFkKD{IEHw1zMXQB>yQDD z>vgtS&s2Z@-~V;nY>8YWK^9S-YKhaC)zZgqZmZuL_HE7iGCrwh19rBCSvQ^tE$Hkr zdG}IsZMR1GMwO0*ybdayNxoA>pWm3qaK^`E(!2NEjr~{H6YGypmH+LM64EKXY~e-D zTBg!3l>yp~wyU<8xv45Lvee%5ev~PBElEJspXp58(jd>|1qy0`j`MQ5n{M~bOLe&F zRD5j~L)TsP34cYVt^0arzg^7!=luc&|2j6^`>A~D)n7rbL%)^ZSl9D3>a=`5t~bH- w$-{o(#)|qq&I*Qw!XEFW+gCg6JIybC>Wsi|f5z%hKwmR>y85}Sb4q9e0KUPF@c;k- delta 429 zcmV;e0aE_?0`~)u7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00A3GL_t(|oYj)CPQx$|hW!RN@Bm1ugv0_O z9>SKlY3WiAm2%CJ44pbv>VV`Wc{NxXb!iNi8oI?=gd# zfYx+?ewy*NhuHB)|I>mo=x6A`CI>Ru9%N^O9+)3qSDs@pvf6k+9xADbh^J$gl)rZV zWFW`7zs!Q=KRU{p69#x3MuN3gDOkthU1yZAp@u(9ePPUgc9}3lhd~(Q`Oyn=H9x)q XcPWe|#$w+p00000NkvXXu0mjfyknG``7t38aF#1RWpzbPYXyz3_ix z*zyM4aamj500n|09{ZL0)21lZ3rgmRUkub6rBXO1#%9;ljNKN5y&qi zu=uveH>*EH&IK?96nDTAWbn>gk79p}y8&`9Ci^y<2(Tj1-v@bt7ocTcu3msl1UEoN z;0K6n2m*u=puN#21TpW|5b-65pz`IqyDI>x`{Pq))j&pmy8N$p1n6H>Spl)~L3dX0 zDgncA6FB&BhhLH$f{!M!ho1rr!7Tzad3Ym?-On26Dj2vOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00CS{L_t(|oYj=EQiDJch67I^@rF8?x$p+2 z$6T;AGlI4t{JoAdynuy|?ST?*+2yWP3Y!08_uJ)Qv-#Io63An7;|FvAh)wGUo(eCp zJtS!J)i_Fw0owc3Tn#yH&#QUg4}jUO05<<9Fc3SrfH7kSe=G4W7npLO7fYyXj)yn7 z!<5TCB2&zOq^TSLX93W22jDpbygYIRQA5&Ywge<;AGpb7#&6;SW|3fxi!fXL7eY>Z`r4cO1CUQ+l$x$+KRjPsiLATk?uMGm leh}y~`!^Sk?ccn<0l*3xpeBI(=l}o!07*qoM6N<$0fM!?%z*#^ diff --git a/graphics/pokemon/ditto/back.png b/graphics/pokemon/ditto/back.png index 9768f89a15b16edb29e1fa21d8e5fc6d57569087..5bea88a4aee69edcc02c04297dfa46dedb7ea2c1 100644 GIT binary patch delta 286 zcmdnQ{DNtM1SbbG0|Ud{?Tv3HR@>JLlmz(&|3?F76*o-*s=4mz;usRq`gY1ep~DIs zF3OWt|NlSk>M^;@jd6B#d-U&j)^e?0~Z5>r>mdKI;Vst0QupGB>(^b delta 359 zcmV-t0hs>i0OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L007oWL_t(|ob8f93d0}}MWvwok)~bGfVoE@ z2S@^D-3mECbN@w6AVg;jS$5;!{^$44s8Ur`f78wPN@?#;eSEoIA=tj`>+#;%b_O6< z_B}vniNKx!(T|5Cun?8*@CfjXK7DBgJZDVw7uw~fp<#sCdEyU3G!4o5RU%aVj33;BnY*X7b0Z{IiEtH595Co z@54*J5RKPDgnSAzca~S&;tJ5VZ9^gD>;TC}7Lw@-#F1b?X3JyNF|AKv8}4ZGfUH_1 zedPoI%)eoqM3@s%9 z2vdDlpMxuvIBK=~FGAZ`4z7EtG5}aZI<%GvXdoQx*QPhfS63z&0Kw%44P5d@h>#w@ zUH5qcBlF2T^Fv@C m@erOZ)VKVsS+i#SN&Nt%5*?gSGkwqi0000OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00F#7L_t(|obA)UPQpMO2k@GBojp@t;0&9K zX&D&|hl^csS6)oZBxzH`V ze!6BioQHCM-)a%3VuP0p*3ZR^EAY6xY5}3aH5;U2Zopj!hzT|rjXoN%wOhC~2!bFM z83JBCZf9MPIUXh_uz%TYt$evSfd{csAl&b4@UebIK)42G5_}h0AkT1`5yci!tO2hi zFI(Gy6){G~f61l>p_JwCX1Y3;lKF%5vj!YGAj4dihe0k3;P7o7$Gdp_V(hkrLu@7q z__NPz<@-MV4*+nzQ_Ly}P}yJxScu?=8|C2|)PPn_0BSK*;67BjEG+N_CjpDq2^?*J z-Tk2w!`_^m5v(DIPbpP1fP=3Nj#u4_$oAzZ|eX6002ovPDHLkV1m%#|HS|R diff --git a/graphics/pokemon/eevee/backf.png b/graphics/pokemon/eevee/backf.png index 7689d995b607d6faed2de20b80c8932cb78726dd..6c265361f5fb1e4d927f0c42fba9561239eaca1a 100644 GIT binary patch delta 543 zcmV+)0^t3)1?L2i7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0005jNkl9#K2|Mdrv?(=!$jsH3j z@egW1NQomftk5P;5CK@OO%X*7F~F|J2rP04YhZwsqRUw1v4Iay373Ad2n0`pBm{pj z>SF^27zuEq9Co&&*BlDL?ka0`o+yXb6`OwEMQQ<>1vueMNg0CJGEglT0%c9kR0Gpx zfTsFtq1-8TaaCZYzX^3kZ^Wj)5t!|^_0YW-DAxYVZDi z9z)Pd-_M!4nh(N4p7RZG49o#I>V1E}q=qEw++Y4BK=gUg2Y@IEweJF$AH@s+YT(G@ zE+v&4w?hPtz-r()j)w)4Yv7InB@7n$(whm(C8}WqbQTbg+=qIMM>&=sfp}6yF)`k~n^Z{-Teb;|h0*3_8 z!r1m@0@B?E+yn4%dWjLn5CSu?N##U8@uIm!_|of0l|q!QWNmocS>{l?-uB|Xi)toj zYMsLz_IWEumLy#e4H6hUtdYOD0(z_PmxCn6tMVbGXv;1 h+I=v-@y5T7AIFsuxh25ziU11$002ovPDHLkV1j}N{J8)C delta 624 zcmV-$0+0RY1h@r|7-Iwj00013M{Ml?000McNliruE98ZQOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00G=dL_t(|ob8m)Zlf>|#+?Z69SrJ9T!3gr zrJh`C?~AmnTtgen`xpfk4d-gB&GYoyms=Y{{3ocFNzzCqCdm#t7@fyTBd?5&~|IZS4R;Tmlh}eKC(I5Djs3fO{NIre&0& zQVGFP?GaCAIbx}Sp%tz7q&4s|g}K2=JSWP5%5l17q(3 z9im#;DjqG+JzoHveIL>4+ra_gx&ysuvbMmrjcJxZe=noxEzrFLfFfurbV-^~|JpIj z`Fz-qqm(H2QX36}O*x+-rO;%9fGpES10F&^se$RFvOxpZ;{FUQJ9$(Yp6uS*T~3!D z5^Lu;qcQ|qiPAmqHUyfqk6fS$fUHTKA>9z^@|6ZJk1u^({{gizmCF(Zu%Q3|002ov KPDHLk0$_sQe*?4t diff --git a/graphics/pokemon/elekid/back.png b/graphics/pokemon/elekid/back.png index 09028a7d9ffd3129fc0814b11fb2488c56c29e4e..c0b5f8cb79f573e2dd7ea1c7049b0b84e6d079ef 100644 GIT binary patch delta 580 zcmV-K0=xa?1&jrd7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0005|NklyCsV423PUQQ`gHciTd_C^)*4P4=WqIR`zYKsc z<=%fm5V`kA=@-#sJ*xv^0uXusl)wOl1Q2=kavu;_DgbJ|JON+@0R0jG2m&xKkHUX> zlp070ikD{wB<%`-=KyQ~z2S_!%36Qnx93+DCO$PS> zfU@4aQxD*O0SG=3U^zA+Cv(d{CX^Zi!O#Hl_M~o$5{6wu_E7Z=o^S-9bzSva@5H$0 zPylD(xcebY02@zF+jao3e+EQafE<78lZPmolyM(CDX@9y}m>Nkd!)}?#3t+f#|~! zP%H>QW`YC2hD{8Vv3f>AO1A~rsF{HVpaT?v^}$1=({tNq1}q1gN~_lNCM|z@n(OT$ zW7#XA+YN#MYtJPhBOso)7+&ZTz`Cs#PJ5i@>I~3Ql@>e$5S0{fo=A-Z^D zqGtRtZatol@=er#Xh}bY{FUod7IK<5tjApmq>H8qE?H)2&cW=D$zv2fhq#V97 So{GW%0000OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00Id~L_t(|obA-HZrd;r08qOChin!sAwWDC z?H8Er;*HK}u@@O4fdu}JAajNQ&6Xks0>Y~@bPQk*Eq|_eBqg!3)Sy7d++Yjh)A4wu zG#Y)x|3~uHIG?;R&U5_JL*rw<1O%EFgFqtCK20xJj#SQkf0}+E9LW9!(u`4>0q{vk zD3}-q(+V6&2LU*cK-L{Odo+(VC!Smhug9oxGs~+%ux|m~%&wvXop$DX#FCMUw zgW!U5KF3A|AiH3EiC{4qV|jU&LeofHXiwSNm?tq|2;^620K2`py>VB&U&fdp6IQK~ z^-Bcq_0@dux>1|eL>i3G)h}e4@lddJ?eHF zN%(I{BoK>@R&_%gfE6{f%Oq{QqAb#U}<$GIw!j(ex&5Qb$k_KcBDtX9NCG9~uDo z6{`avAq0Rg

=RioHRIih2l@AbhwmqE3tSZ%H)5SeYAnob<{_qiKwY;l>G-r|Ex1 zmXOIj29dm?dq(v&+vTG~K&Hg7XPop($SxFw%cy!Uf(G~~p)q9nVA6X4AdOO*B}VfT zYF!_Ey>+1?G&hRpEW20cH-KIY3K%XZf^32n2)KOFDQgzdqB@$wYKq0%Ne zw@z?>a$$|ml_wWArOHcqJ1=5%5nT1yuceE?S|Q>9^5Oyoadlui*`cZL5K6)E8n2B& z<*p0D$hyW0V2&W^qk3yAvjFycfQgkBi78lgj67R}a>H5lenUODaF9O&q~m5%=ieKE5~j@?dOQSdk8wWQ1x=+*OFW+? j6JTdk}# delta 604 zcmV-i0;B!u1f>O#7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00GHKL_t(|ob8lLa^xTkhD~vS#wG`7#opTu z*$>U{1EkCMKTE{JHaMhaHH)c=R!!^U*8|C2_y3!?{RQX)Ak@!T1T@`;AN+~}&=XOc za1;T-z&JP3aZf`0*RX~c_lAFS>8I2amY1si;z=WXK1hoNe^gh)vVhx95(8Gc7b2Y5 z2%J}}*Gv>5Ebs*80uTURbpMkjSzs&y-8vuFnf2SIxNmT~iHUxIl;V5#0|pd;0B$6 zs!yp17L@r-{iTtj9N!F7OQMVE%s{z24dJ8}J_@#lfEHAX%F&SwAA1|%MpzXAAH%wXHv0QVr?!Nujs7{po!oaoFzxDh4tV+^(> z?!S(&>xxazzP6XZOK{ZqgOvTEK!VdWq*9A~ShuvC;ig+g37pf@w|7trZs|UQzJMkKOKg*lfhO|VqRu;BR{QYgft17c+IYq=nd=(9&WGvd zc&GPf6}H!V1FUpmw{?f(=SF^X1G0ZSIO(b5kgJb-X)I~5v z1u?6F<2)NjYe>HYs|Gqet)qA}73vgVXe39dJ{x?EzK|tDwzRhuj+*`9b~x%M2gb+RmJU00000NkvXXu0mjfGj8CL delta 569 zcmV-90>=H01cC*S7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00E{+L_t(|ob8jnZo)7Wg^kR_M6z^_7uHCo zu@DOqE>F<(1qj|DgCC?*Hlz-f(r%3D6VNy$7=&N(FITr%am0OA6Gr`(EaUvwo9rd){P z;=dHyUpoPrS}1nb*S4Um01%oG7i~kp(@hUIKo$T9=8}ocH9Yf6n3Sw54~g3p`NB?h zchFw1J>fw_f8S=?YB0h+V!ayn$GJCRUyo|igDpb922QH@rAPA@n_+;PlL&z8Wy+}f z3mR;M%Va)iRneX^7!gvMuSEsK;xziUQ^o?nPL^2CA0|P_nf{eL9ioL|s*OmPV2d999xZrfpi9jLo64!{5;QX|b^2DN4 z26rEq06%wyveY64V?C3?)+G;tN;pai{M>;u#y~cMSA(WJkYY)9^mSxl*x1kgCy{lc zqJ2GMlDE6d|E27ojsj(8dAc};RLn_Eka+aKUTXgRABXEhHlF`>aGCssPzhUJ-d^{x z&;FJsS58WJ^6sCzapOkYP4kYH9qXSEYETmvwWdGk7<*l~tw{7E`yD5aD(`;mKL2yH zi0FH(N5AeVYrm+F`n8DJ^W^@0eSQ1vQp*3^o?nPL^2CA0|P_nf{eL9ioL|s*OmPV2d982+qq70J)n?yiEBhjaDG}zd16s2 zgS(GQfSyn2+B^)IMe(pdSV<4Nst3gv9NU@|l`Z_W&Z0zU$lgK(z z(Y~HB$=luK|5El(M}e}lJY5_^D&{07NIZIAFE#)EkHhsL8_$0`xJ-URsDv#qZ?AjU zXManRD<>s9dH2uVxN)QHrg=xpj`dFnHK+-TTGO9%jJ+=0RwVk7{f-kym3Kd`p8Gjk zMD+cs$FJ@wYira?{n{hrd2;`*PoH*KrIi1zkNd}Gd$qh?|DO9p;}8G;9%xW&(le+z ukkDDn_Rn2oI%$dP))$^7!$TOa?Ca(|w>u)>1y`Xp_dg?*-{5=OA{&4C0xBiT8tSP7N2Bny*)=Hue^-t~AlMGnS zWBO*F`wRE8Q}%3`kYPQAH>T?vbHC-HyG`$o=D6%v7g%O^yUL&CL1RYRhw8W~lNs_j zFvk<^Q!dl VDCLRGxBzr1gQu&X%Q~loCIBvFaf<)| delta 300 zcmV+{0n`4j0`~%t7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L005gwL_t(|oMT`Z;^03TpWpbye^jy0_KU4P zAgeHXwR`t^WHtYkSFM_4jHHI&&e+)49$8PZo$(`N6%3!1iuIAr_`p9)55<=CA7=Wk zM|Q_2y~)o|RJ>DKr}rLNfzqp0kCc#<{L@oX(nB_t|NkSUK6j|T`<9ZA!e`+B_JILS y1YKbGfWZ>`4E&E!VxQpy!z@4al0-+9xmMeR5r)QCcrz;yW~T?OU^5$iAz}5N~k5tDz_xAZzy z-(1amg57uejwKoyqNmv653OyF$?7TVD)C>%{CCc~fP*=&{Tp^4y!hqB=e|9yDL-|U zKdlij%2!e9nkXxF-t>8fZC&WK(p&#$HK#vV^832m{C8dUD|>VQJnyu(HTjpHc#-$m U)0$3Gpi3D%UHx3vIVCg!00fb4KmY&$ delta 302 zcmV+}0nz@h0{H@v7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L005myL_t(|oMT`Z;^03TpWpbye^jy0_KU4P zAgeHXwR`t^WHtYkSFM_4jHHI&&e+)49$8PZo$(`N6%3!1iuIAr_`p9)55<=CA7=Wk zM|Q`bbCaK;sCai~-MRP33eLP*_2vwcl7HvUoH=(6*bq|#`6zq_{%;=` z&_vJ$h7TAlvCqK&2qpFzJ}}JkLr)HF!!S7j02ZlsnT__4tN;K207*qoM6N<$f}+lR AYXATM diff --git a/graphics/pokemon/flareon/icon.png b/graphics/pokemon/flareon/icon.png index 96092e7eef01f9d6d04a8a5d863fc28a283b2f86..92f4dad5324497142193bd7794e9238098e7703f 100644 GIT binary patch delta 330 zcmeysJcW6J1SbbG0|SFkK*=~jLnwhreE8vP0qy^I8}@NEcj zN^4rln4-C)L*;tw&b5Y>tzinMH?+Uiyff{v*@VFOTjpYGf7Rb=w8>duuy+gFnVVk( zJy;E7S=TgNy>T$i*>~!%-D?_J#vbZ^*f z%=9Wed;RTFSN`S;8-5yaO?hlCYP)!MT~Pei`jX=6-{#tC?lGI~Cs!P}X~KcCna|G$Z~80Gg}?njZ^hpGtS;N@cb~FQxTRSjA#nWXhvN+u Z49(l6x&lQ$x&i}@!PC{xWt~$(698=OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L009(9L_t(|oYj-fN&_(vfb$0PFg-5XYacBl z?H)WW1@|F5$w2ot_7Zaq2(qv}q=a-#-AodLRgXHi`IyPi>9l;q~Sf_p!t^11V||F;+Mne_r%4fae8(L9g`Yw8t)j z8>!T`J#}3l*Ys*P(m{4TZ=%Na=!~RvE_>PHAX5&vMj}4SbVFE$6ChnmDCj@}3IopOvOxYF!q$F(-&RvCKGV QF8}}l07*qoM6N<$f^WU48~^|S diff --git a/graphics/pokemon/floette/blue_flower/icon.png b/graphics/pokemon/floette/blue_flower/icon.png index 734c6eb4aa8c2822c9c902a76d85901c725c82fa..aa2227c430a1c7dcd0a2ddc87c9cd40de76555db 100644 GIT binary patch delta 278 zcmZ3_{D5hK1SbbG0|SFkK|U`%VX44(J382_FJ$I2^cl8l7xlf1Udf{F!hK=kmIepU2L%E$Tem&h zFk$%>_n1HH%4>JMV>rp{$CTnf!_Fa2Xc^Ch?JX<6)_Y3$#HjG-38npxI%LE6yGK~t VCuiCppx+ogUHx3vIWZ+P0RR9(d`|!X delta 356 zcmV-q0h|8d0OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L007fTL_t(|oYj)Q4uUWc#`^|+2zE`Vj>2F_ z*jQi`UdG`jd=Tcm2NR$Jj?}?EO10D_^mQl{YY? zX+~POs`Ff(oG`$#C;(iGg=>)`5jaAvK$ABb00nNxc#w#Vc79FpZ6tQGa~n()ibkx7 zt0)$d3TzBSu*sW#z diff --git a/graphics/pokemon/floette/eternal_flower/back.png b/graphics/pokemon/floette/eternal_flower/back.png index edcf0ef2cc59d01e86d3dddf00ac2d794a3ef3e7..450120721173f75eafbfe064afe7f0ac7d75e33a 100644 GIT binary patch delta 596 zcmV-a0;~Ox2Al z0q{|Nf|+;9PcZYd@@%m3W8}Nm&x>vOK0z9LZ1}zoL_-W<;gbOyzFRP{0rmjVpc8Br zsG$n_cxcJ+nF8?P;c|{0Sj^6Mrcwx}RBOQNtZNs+&`hh|2ygWLQ7hjy7hCn_o$XB^PR3Tef zrmq>{Fr+0$+W)25g!4WlmHfPXzwbA4TMRBmU@7B*LR5q|{Hw>^ zg&+7f^Jo4T;kJc7$c1)c(Cam=djGcJGfd%9px3LzOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00J{fL_t(|oRyTnZrd;r#&tsxz<>eKHZxS{ zAgO%-MSTG?M27+$1c)61c#AZ*kCRNzDyxImFpJlSgNJtM)AT4=wnd8sa+B=)@w>Z^ ze>~3;;Dc|=b+HH+P5|;{;uN5axCK6~o$Ike=mscrkKoZ;e>b2jIEi;G0q2x7@^cqJ z@|fN`N|1tu-yK~-nMcXJqr$adapDpvc$B8ZA&^ILnobMoBLW3O0UHo%6SaT^@bC~} z1GS?2F zfZ%Ad36O9>^!Y-9bL}Arqlw|6Aj`D#=%)!BpCZ6QzIXL7IcFbN4?i?;ImQWitg7nC z0X%MBm1@i;&Vaf`U?)E8Ex=6G?Tcz@wy_YklB(8#f7sZ7R|K#LD*jc~R0RZ-Zek@i zs=Y*Jst>Heze%a2No)^*qGGiUB*yp=nAZc)h}9lCV&uqQ4Yd02oyhhc=&!~EWFOsj zm=bewH{>PNZo?(e4nVgZu$52ecVM1>l_#LDG3xO*=i4JdGh7R!DJ%Ks1o%`0#zQ!h z2&|6)S!8NwxQMp#-ab7&0x!NH(0Ig$g8%}Ci^1VH3Hluf$k;?&`TVQ@B0=*W0b|7K t%=JJ%`_Kf9Sz*|F-9`hAbli?N#(#>v2xHa>hJ^qC002ovPDHLkV1jLBF=7A! diff --git a/graphics/pokemon/floette/eternal_flower/front.png b/graphics/pokemon/floette/eternal_flower/front.png index 56d9a71669ec351c8832a2ef1d21b6012be3673b..5d0a8c7df71be00da6213d0ebc7b3212012bcae9 100644 GIT binary patch delta 638 zcmV-^0)hRf2F3-D7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0006tNkl+jfK?3`L28DB%D9ZgT;YaV$X}x|)Y+r{(N9xe!}pZUQjwe%B8$ zFiq3^oB%MPf%z4|p#BZPP!jJ50J06~YN%!E*F5*-S=M02P%&$+!@TUKj%aNkf{#V(pGPWuH5fCxpKlBfxTQ zrwo;bky`+GD?R{(P>cnSwfDv@U@m_IvC&8PbtMDF`zry*wU6){0zx28E0%gr-4*3G z2q7loK+~5}r4GSw8>E;J05Kd@Jw$xPe@P?*_)7|TSu`j33g6rCn->EFKo4Jnvbfdn zzGjdTTlhx!E)N*HYXLWe?`k@K0qna{o+NggK$HU5ozoDCJObF1-!NyV+pK?>UerX^ zV0{uq&YeM8fTSP~(*$fGM4}P^tD{Ro^Z=2QhX66g-8#Z)5Yk$-AE49#0W^iuO%xw+JO)Nx(QW2MzE02Q6*Zgj)0qtk5L0Y08s<5xXI`o>CXTnsG7;E6p!L9 zz5@F40-#TeEkOCV9%aCzv~6nZ2S68OfC85hF4S>-1K1uJI04=m;Jy4ne*oyw@)v+w z0s)Nw-*gzDXA6wi;go?#3oiipTwl?{FrfjgejIRAjR_BjDHHrl0NGjJ0r*zG(*KM2 Y0T5*vLdh!0^Z)<=07*qoM6N<$f@~lfpa1{> delta 735 zcmV<50wDdy1*Zm(7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00K)%L_t(|oVC?4Z`x200O0o|BqSyu4pag! z81)C3NA@5AQx;2cD|JJv7&^5RVa!yjPD~9OTP1J@*1*CP)f`fXMxFX!dhZ!G0iT_r z>P?pKd-v`hwh`h<0EoPh(rsF~pbWN`TLPp~xg~^jRelKqe{Cuu*)nGaG?gzznFZA@ zWe9YHbR~_%I9_f080kG0X_Q^fB@Hh=|jbDH3^)b z{vgtZ1}NnQzONJqgrxHYovPRdq+8HSwD1gQpLM$z%n&;1Y2XDxaMeu%sgqh&0v%~# z0Br(5=??d3f0+h6>V*!)_81YD7^paUzzjqAY64WxXT*#5ealWnn-SMHLu-@()oP@~ z_~zZ$$)SV?&}yVWZFzqS@i?>^S|=rnGiP%@y^|#38EotL`PE=N#kovgLFtu`b}4?@ zA%VNcJN9v(zorBnj2`bi-J!Jj_BsYQPt8xU2yvf)f8Sgl5%-sX_}#&M@FSHkQGN%P zA>!7-hrnmR20=J=#4uz5ZLt-?sUa@I-9xZQw^>3g%6xFiHzLyLvF zUKt@IMsgFa*F*_MED*5NdAj6ItKiToSea|KL}3t7uL;a$4uI{oW*XL z0A>mTakyB=Krru3VQ5L1eO{$Ae|yx=+->%!I0mz9&^KV3nWr8#$obf7AjbayXi5Vz z|F!fG1U_VTVL)*-%?H<$@i=SH1NfK;%v)HTO!AJ3V)Psk@aY*Kn9t*Xk3U}=&GoUZ R+NJ;i002ovPDHLkV1obDIgbCA_%wbH_um0Iu&}XSwaXR=1VmL#6U;%_J@dU7d+Z&kfp-3QfKD z!mGGjVL_U!aEI^qfPI&qaD4os^Ul9V?YQ5=)!OC98Ft=y-B7RHGo7oJbFMe|E3o6Dvu`SsL(SVgf0cxp^zPnN zT-MOKULstt^UCp>17Y3_$@S}Q-170y55OkZU~4(I2DE`~}qpDB!+yk{6W ulyM5P7EEn<*ly=3F-Jwp=Xb=RJB%HNMARQ?MK1z+n!(f6&t;ucLK6VsL5-6D delta 375 zcmV--0f_$i0>J~27-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L008AlL_t(|oZXVK3c@fHMe_$4+`DvFFi>={ zA0rs2X7g=v?o_ZKPCEEwPAM)i7*M)27HyknS3$uy1l~!)y~82o$K#B9-$7jPPI&>s z-xB9!ureK}97rATbw_9cx=QprEKU^-7ID~8{yg^3nPI5xrUZYg8)4;KF7fBhL=H%KsnwRi^2Vz5zG7^Di4NO zi$Iyx2gOBj!avRrgsJqqFttHiAz_{d?U67qgS1a=3_AH<-!X{FzCl&bAo7_(4-rtV VZs&k7JOBUy2>?k&PDHLkV1g$xkoo`s diff --git a/graphics/pokemon/floette/orange_flower/icon.png b/graphics/pokemon/floette/orange_flower/icon.png index 3c839277cd875207825aff982a98ac50b9086e88..07b6d9a09a4f32651032eaf3b46cd951803620c2 100644 GIT binary patch delta 278 zcmZ3_{D5hK1SbbG0|SFkK|U`%VX44(J382_FJ$I2^cl8l7xlf1Udf{F!hK=kmIepU2L%E$Tem&h zFk$%>_n1HH%4>JMV>rp{$CTnf!_Fa2Xc^Ch?JX<6)_Y3$#HjG-38npxI%LCmu}J9U VlOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L007fTL_t(|oYj)Q3WG2Z#`6Yw2=^9DJ64Ax zjxIV@U!riEeVD$NLQ}}(MVi5>u@<4ZxEA{7hCn{_b5 zW~7CyI?vU~2?HF90>HIcxE47Qfg{ukGoMq(#Bx4}fAXvCVh ziee$Dz{WrXn~XZY1tuwJIDQt%o(iU0X&KY-;iWfJxMRzVAW@z!jUj?{D5hK1SbbG0|SFkK#zfd zi+F6%mj{3T-!Hopl;LQ;UF?>G2h-=I5}~x7`8o{McMq3yD4n)$dVBO!MwNogp|ic$ zyBao}iL4A3SnbFp7TYcIq;S>OnX_E}vK>gz(5rM2iFSx}t`8NqTE#eZlTPgGpAHFu zyc0T>tjM}1rF%%tWYL{MLGy15F5hC1Nxr03(DyD{)7L5Q3PVXo(%KlI3M-DjsOXLJ z&hNfxx$%GO`d=lnjFY5un4U~DsBPGz;v=b$&l&vs|0Dy80wDIB@o{U*PUhzILShpx TJy{6!8-u5-pUXNYri3N{x=es6 delta 354 zcmV-o0iFKf0<8m(7-Iwj0001qplF={000McNliruwJ^02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L007ZRL_t(|oYj&&4uUWgfO~`9;W4>jLS1x# z8^BF;@Fuviu(-egcWRA^%PXOYV=IQlzOtJ5)1gVfyx-B#dQQ zlMpWBrjct8Mp(5ifDf^7Ya1khBg7Ik>5&6S@HO07A@21nbc63wu~AoF!K8`E1!?Ni zOehMNi$t`o>EvT%s*WzlkD@wJU@oy%8C^b+gQ4J#1v7%I@|@Bb0&Fo|oDQ=1;XgmW zAq#zYw zi!+a`*N1!mbIX_Um|ggCpY68Jme$`{U!&G-U9ZDXefLfohs`Oirnk$F1%7Eb|8m)~ zJ!vdz-o2vcoExQB7Q}7kNSwDkMt-61`TGnv3OZH!zo&3_bk=u!IJlcF2zci`ecnEK z7O_x<#xDY{A>NCt(}krbzT43uU40=_lcCShD*TDe)$Nns%@I&_XlJ{2O0%)O`N4{v zqOX7M$et?v`~KJX_v`8#jOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L007uYL_t(|oYj&|3c@fDg>!=(qI-qLjV{_7 zv^UX(M{!pQ-MDEN?Ky;@-oc0;wlJ*qyp0@(LQLJXN0>$+{*s>d4O0G|K=r3(AETjZ<|AIE=r zi)ecWFyak>DAiv@2>|dZAluh01>n9H0t^VnuT_hk0fs>Gvj~pM`{U>dNlMafs0c@W;40;R@5!H_laNnXweWP(sd;5{ynXC?yP zbFl!Xx>x`_E58U(Er&9trU6QTvMMI0vMyi)n2CUKbLB^bS(o^6h5}g3s-Q;%Z%4lM z54J{WX=5Y(@D~ePKnm{-0UJLhH|y>)nFRjjM-eF7GvMF|IzmDl0ADtO68L{2Dnj=A z^YGrwzX-<9fF=U3O_Zlk@q3X1gzyHiq=3A`Xt~HqfXGXm_&tMP4Iyt)!op?AgE>R` zf(Ygj-2=?@j2xygKna*P;e6WrcYsJ?fTH>f`Us}L4LGsBpaGc6?GP)#kuR{Xj6*=@ z4?ctgs|wXRzy>ht0fsBEj^jlE@U90K!sUY^27r#x0oWfdjc}e4qJ3?~%Z#D(A4dqh nqP$lEhu|)L{o?-9PXqk}OyeAvmRD4<00000NkvXXu0mjfgO>{f delta 696 zcmV;p0!RI!1%L*S7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00JaQL_t(|ob8moZrd;vg;@^;(N2VyfRiDx zi?_mCCxf_y;IXK8PimKTOfo8gQWGlt5Ge{n;FP^+Um)??#nqa2sh**iKl%l&C&-0i zLpq<%Jti+j$Wx6}G#ghVkR$p8qyU&f|EBYN#_)qGR~i0Hk4nHxW`D1PbYAK@l2uxVFG66D8P#XJ)M@ z>+}@BGFb!R77m~pISrWor12Pl7Qz58PAoOZr31nt&v08wahUCmWC&oML#mYDCcL^huYvlNK_4vI0GIBz=m1}cJ(9BlP`B89 zJf?QsO5ILuFNYa+|H|WC2N-6c&n`d! diff --git a/graphics/pokemon/florges/blue_flower/icon.png b/graphics/pokemon/florges/blue_flower/icon.png index d0dc98cb1f2f446f57492d90c7c43d35e6aff372..8a4743f4f56d416c7997d4a9ea6d3b8634445232 100644 GIT binary patch delta 407 zcmV;I0cie<1>gga7zqdi0000?P=%b4dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0003`NklZ6ctt8IW^^0iI?iYS({L zN>_lYP|x|Pqhw4eG-ahuEGbJ}Lx9oMej=nSL{&^cgfUr>6aNvTBFr^J24w|_=LCso z{Bfa-XO&TI4z%7FIRGwr8~U(jlsE&_c@Xr$gzN?+IGAzO4G;@siF_W`0gr#d+Z0FNbPrOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00FN_L_t(|oVAj{irX*{hW!RZZ!MGt;(G$t z-F~*E7ahX-EC}}N#85WSJ4(D^Z(c0Dl_Ue-S5G9b3k#CF{)+sP~LW z|DB&V04nWL^?PWTDQ}?5yPRhQV?zKdNAk;toPOxAUThm*W33<>N-pDjt>Bjek4i*EEJxvl<*~uf zh?aA{kQRjFfA}D^wU5e!u=){bE0W}?=L!7d-sczSC*Tc2y`XrY=rt}Q0s308Ju|y9 zf?Y4C{aZ~VFsf>Clq2rKjQj5Mk^49V^AljQ%hpR!Ns{J1K&A*IA9IcSBChp{RK27D5TogBZrhg_ia$3irrd_I=aesVtk0&h-7kz00( Q7XSbN07*qoM6N<$g6eGiEC2ui diff --git a/graphics/pokemon/florges/orange_flower/icon.png b/graphics/pokemon/florges/orange_flower/icon.png index 5bcb76de35a1b90fe80377ac2fbcf9fb2121277d..a8239748c4d6ad5aac802b374c42de93bb4e1f5c 100644 GIT binary patch delta 406 zcmV;H0crk-1>XaZ7zqdi0000?P=%b4dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0003_NklEJ7d zZUA?qUh6}LR!k{es#7N>&QjM9V04e48L0@-h+Tn#V5*}E|51wLm}@8u$_j+%1c^ud z(NM;V$|!3B(g$NFz>OS3Uoi|VGeDgOL0?SBY4E{D8Qc_Zu?g8?Fo3c1^E~*1Srm{F zsoOeHI|*J6W?c0EEW$*hd_LBNjKP0yTB0v{28s7AkFsA;=)2nun-0GLkY{;A9M}H7 z3G>D4oBYE+$UpE$|2R8#;~(RG?)_r`d;ho?#PAPyfBMJOAi94zCjVFr0{LxscL@LR z7lT0m=t)Ez-xx%9jo}~Ldu3rghI@nfxBl=0L|-GhP5kN_00000NkvXXu0jG}f-_#d A?*IS* delta 575 zcmV-F0>J&>1BeBX7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00FE?L_t(|oVAj{YU3~vhW!S^7D{g$hzY&f zVBPI!Xo|?KeuqNQ&3eb}Sr%I#e3Gm<2%n^>;#k4SUbk})=woJV{r{gN|Eciq4%7gy zD2%k87}6`TwC~w7r#llt*2u%Qw{!vU)~f*<$!)%Xzt5^8e_k>kTc)NZ+iVT=XF*i> z&g%t$PPBbU0PJI&o(J zJ7l4_rJDuR{tFS!k>)7p9cIkE%oBKVZG4S$k{GCkitlw&oGQ$B>O92WBvV5%#&YtSf?mLWj4T1LLgqEwl^M#>XS)Mq+{ zmJ2vyM~0%SehqNZ4W4*fASdUYv$9Y##1Br!bArxbQ4Glsh4jVX?2bj9qaNUKk7Ahr z1Ge6cCb1jQF6N+K+P-DjX}(qz?I5OZ&t5_y$iUFGCqLJcR%N N002ovPDHLkV1hv={7wJ> diff --git a/graphics/pokemon/florges/white_flower/icon.png b/graphics/pokemon/florges/white_flower/icon.png index 06cccec6c513add045bfdadd1f765822ac69fb07..11b04c54e01956833135e209d72082540ef3f205 100644 GIT binary patch delta 396 zcmV;70dxNA1l9wP7zqdi0000?P=%b4dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0003+NklJkzBsOA@Y0000OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00EClL_t(|oVAj%Zo?oDhW!So#CxpbwKB4A zhj-5-v@=GvXE27fa3zk3oOEq(K;qNg+5G=sRex0UatCxk2MQ}n&j=qR;54x_$J!Ne z>Gbt91>6CM$t=`q9-19|oz09%GhSMJHzMnfzY_+gq?3-SG~^jQDy0t6f=-H_q>k}fdC<{40~d8wz4W|* zU+(>XfqMbje;{%PN;Oi}SQY{(I`+mwFAL}=^Zj<=SU|AdNZxqr_nCCc`4Bk{yZIF` zGY{+tI)kmq0SbH{nZzJW_x*@eLW}0J^||E^R+@1cW_eoRt{a?rI}pd)&P`d6jOd-? zdP~p^tU39)2zy7HJAo`GyFlHOTDJcHmZEo6Xwh($ diff --git a/graphics/pokemon/florges/yellow_flower/icon.png b/graphics/pokemon/florges/yellow_flower/icon.png index c3a5716077b795d49389b0734484f9afcd7216af..8fab7804fce094ed707c41cafa7b6eda3523df16 100644 GIT binary patch delta 407 zcmV;I0cie;1>gga7zqdi0000?P=%b4dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0003`NklWg?)l7?5*@0iI?iTGxM5 zN>_lYP|x|Pqh?GgG-ahuEGbJ}Lx9oMej=nSL{m&agfUr>6aNvTBFr^J24w|_=LCso z{Bfa-XO&Sd4wT*)IRGwr8~U(j)Hnmwc@Xr$gzN?+IGAzO4G;@siF_W`0gr#d+Z0FNbPr1s=1BwNZ7-Iwj0001qplF={000McNliru>K`Eqed}02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00FK^L_t(|oVAj{irX*{hW!RZuWe}{z9(Sa z?RV&+tMz`3*|78$!TKJA^$cC3n~{|ST`Z%i;#k2+uiZHa^f5EG{{K&s|5W&N2W|it z6b4?80{NXd-gTmqd}ktfZCLfIb9@Hy-l-lNCf$Ape=5}yf6s)BEn`!X^=1k5OGZ@q z&hHxlowlj|*;m5VH_+y7PP0OYeg-Q~^2>&tewca3Nu0@cycA(4OvsHA$Ldn->cn0F z>`;V~j<04=`wv7kC%#8E?J(!9XWIncY#Co;Eh7eMs^WVsqn85rnngt{Mdq2Mu_4T` zl2W>m7MQ2_e;~EBkIDnH<`EdnlH{r93H;;U=NFhK5DY@Ipt$20G_E57{@#eAaECgA zL#Kx0tK<{~GdXtt(TxtB+WyBTrrP)wLm;dGF%gMQw2jvekkN`1}AqM>MiOXz8#SE z(|^F)+p|gBik7oEXjzDdvpNO_LK27_JiWVzl%Wd8LNumBK9VZ2)^FMqsZq6&7Boy8yRTueI+g(R$P|=X|or z^ty3qcep-A>5wtOhh7@2I}!0!4;xEA9BVC{=dySO$54yvgtLb*^L3c??waN&(>X5D*(3zh zP+o~TG%DBZlUm3!o!u};(ZUVP7*hifnv|CiuwJNsR1?~B@~FULzyc_O^zaBBntoz%sT_((BYS)%h4+zHd7$ho@;a5Bg2-|5bmF9}y3k9}y1~KjOPc{K$BS{KyY$ z=SRXrOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00DYQL_t(|oW+u{Zi6rohIxXXNcSMYUR18> z2n*@hC{oM_Qqy=$9=1=A&@dVkVz%NM0tUKAy^Wvy&*$HtVce~xoPI-!Qw0!_j}0}V z=Z^k68KONBN+gkIHx_yG6}TYbyP67btD9wpFJY`&fF5q1f5LRyAru9@`e6>u1{rk4QFQ^Nc+Xg@fVp zW9{fo^@zfZkjjFl({K0q>dLB*9`zmQ3c zE*tS-kytS{@NpGnj{yvPTt&2Z)Z1!4;DKVcoA8m@ALnGkM{Kd`o_zcQW)Re?K}7Eh P00000NkvXXu0mjfs~_LP diff --git a/graphics/pokemon/furfrou/debutante_trim/icon.png b/graphics/pokemon/furfrou/debutante_trim/icon.png index 05d1c448a521ea20739779db636f7c4f47582867..04860b16d25e3e42f5910582a57e8ca2e129cf61 100644 GIT binary patch delta 384 zcmV-`0e}9|1j+-D7zqdi0000?P=%b4dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0003wNklj(i`A=V-3mP^POz+WB9OLX>)gHPiOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00DMML_t(|oXwK4PQx$|hW!RNu!EFHj6}*w zh%U_=z&n71$O3N>IZHDjp?YZto~-SXE*H0{ki+1^sEOmUgSgF~e0RUCPl&%O;2-Bb zGK64{n07hZaf26x3Xc3W!A{L#}{f)>~ zBS0O2n{oKe&a?x|ev2h+FaxWqe#x;pV=8+LB_H~shmy|D6bJ(vd)00000 LNkvXXu0mjffv@CK diff --git a/graphics/pokemon/furfrou/diamond_trim/icon.png b/graphics/pokemon/furfrou/diamond_trim/icon.png index 50934adad7d499bde34256b70b77f7f3dd870617..f5ce645e4ee9c73436ee0e12601bf5d582a8ccb0 100644 GIT binary patch delta 419 zcmeys@`ibW1SbbG0|SFkK%!2P2i1gs$sVs4`_Mh_^Xk?rzn^6h`m-8K*Dg+& z9(<3-;`C071xCD@iDnwv+yU2@y?%4?%T>o_G1)4iFPy1!83XJ8UAygYeCNExHvt!2 zY9+p0IeQ`f(n9C_=x@i@T*+Rml-ZNeZL68F(!zN9dObBkcU)!(G|Cy-Y^RS)$ z$T@yyj^jXl9!zs{9Pd9IV|AV%%wRb5`7pzQ&xe@~eNcXI_*8!bzqWmnUCtklpBp|Y zKLH9%;5WB_(g-Bx{Q!zQJN)FhwEPa~^)&~!e|pHiut097D*rl8OJHm;c)I$ztaD0e F0syTc&Nl!6 delta 551 zcmV+?0@(fR1Mmcp7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00ERqL_t(|oVAm`PQx$|#{CATwmVhL-l*K( zJPcCV+N~A~yaNmB0?*b&YPPdUq*N?t&e-|WvLT2n<^0Qcw(st%Qonrs)f(`MG&pnN z?K(k&n1}asT7O^!?LJC)Az&i$*+fv!N?eNsjEOn*%@dY5e|7L+b`ezjG62YwR* z{xi#k!t0KfdA_2{_XOPC5Vd57)eON%`LHPQS=@8pEMvO8QO6mzfGg0KjB&Rf}5HQ5*0@uKi~9dvgz$?ZbR|L zz4o^!aqp76vOIUI`P$g&ob`7!ubB3y$~`vU`hTiwU5bNBod^(zIJf|@N?i|6$C>_# zjDbH4g%q^x-I!dSx-&UEb!T&V2bKjz2Gc2>iJCQSrm#$A^#gOWVc# v+40!bP0l+XkK$5Xwz delta 529 zcmV+s0`C3Y1KI?T7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00DkUL_t(|oW+wpZo@DPg>?fW$pH-5dkmX< zeVE>;Tb35+Xafy8CK_^&O(qi z8#4Kvfg%{5yW$Yj+5$}iBzY`8y5rQdI=&fs!ez>Mi`l4-CZR2jyu;0B@Tcu63vMw6 z2;G~dxqh@_f7Sno^QOTD^A5AYS9b|G$f$QkKhnx~1UwD>jJ3GQHxY)t5F~vX zcz|rT@d9{YpenT-oA$-N2LjtGX8k&hztyKhd{5N`3{)?VT&D{@=;MK}3qHPyh|Piz zaCBwE3qIH-OuXQO4Hi-~^TCY>OFrZW%H4{O8sj)!Bk>XM_iH|Gsax|wzstuD=++d4 Ti_>C~00000NkvXXu0mjfUY^~Y diff --git a/graphics/pokemon/furfrou/kabuki_trim/icon.png b/graphics/pokemon/furfrou/kabuki_trim/icon.png index da2a254b630f8bbf82f31e90812ee45dcab4081a..bc81044fb0343c887fc9863bdfdd097060b5ad60 100644 GIT binary patch delta 377 zcmV-<0fzp)1j7T67zqdi0000?P=%b4dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0003pNkl2+O0-M-{%?!jf>?jHGXk;`i|eND__poK3aYzyQC&(9 z@sh0j1>te6U_k8yap*K_nOalIn)0qJ06SXKv2||*$g=c@} zakRb`YJ>A08`y_)5+s_XcYO(TlA4Ahb@%=h2e$xMXSTd@Oq7dK8akw+u$-de8j~nW zF5|?$!*)89Y!;(JQ|?^Ib{4y`;A_s8!1CHTgQ?wag2$W{?)mh_5W{PV^sFnD{N$kU zTv58B%v>3$#XG1oEIuo}tlz}Vm%U}xySV9Jc>k-b59CJ&keMGnKxTdn0GatQ0%YRH z1dxdzBR~dzh!5RAr{{-NKJ;;%`C-erMt)3u==rhW!e)HOkMiLG X>Z%>ix&A&y00000NkvXXu0mjfGOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00Ci1L_t(|oXwIwZo@DPg>?g>=mCNzdkloT zeV79A77qc;QO78{w0BE@1X(D>0z`BX>%@O?573qyA08=^`i%L#Q1$a1v3OK~ZpwoY zqzs6Y1u)hcZWic7D2U1mmmb94g+`QWYL;H4drYf}h?=z*f0DZZJANm-R3nzUCg~Cj z>kP!Q>tT{ZB?aA9{VN}=j%`3UjG~DhCB*eOnQId7kJI$<)GR1J;$|oTzG6BaSJOJz z1%}*(=>*WM@`Hz1jSI(J+Yz=pI{0*|OytoKx0TdhdF+u+K9(NF3IhsM&+iUw%{+d5 z%s&ZGo#!nKe=|kw438Fv+Rg|HMOo?H(gPEO>N;#P(*pyU6)NpAGd(a6qfpC-GXpS@ zFK^Ujegp>i^Hq{JIsgM43b9_%^}u|wOX;jDT>D`YX0eBd*^*{_&T-=7x_FU2`3w0v>m1Kx^Ld`Gybj(+)^g}!281F1fCu11b%FPz9+9<*WPiAU6-B~D>lX%g=sibU5rIF6_8a@6g;X={#Y6J{c zOc7gq)bdQy?N32Fndcwzm}IZr$`N<3u=Xg=M2lpJf^%vQ`0gBPcWv1ut#E0vg5JiO z>c{8b3USZ=x9bP0l+XkKryZ}H delta 507 zcmVR02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00C%8L_t(|oXwK4PQx$|hVuqDup+89dn0-i z5^5fXH-V)CQU@j$9tKvo9atEWRy0c&&c>EdkQyIO<2p$n0J!ab-~B$HzbN{>09O6n zVA4|zA|`Fh>~c)odLe27T@N=xp2aSos0gygXfIx!Fj7$^e^yP&tnSzYc0SD?qv5%Nu_xE&U0R8bJh+1#LF3LbW+%(VjUEFHw+ zWbd?!`f>6xfBz+zPjZ~}6lgv_q-;DMaHQeI6I3-XuJUI*Fb0`8l(^m09!bqs(^K9# zVOk4*YZ~zpr;d+%zjcVy8{<67++Pi3QZrN>`1mGiZNYKi1DMEMZaXkrPUwBv8Nb>L x_kytH!^*Ri)=A3;%yg1dmk-us`eQzR0C`L4%g3KK4S)au002ovPDHLkV1hv~(^UWf diff --git a/graphics/pokemon/furfrou/matron_trim/icon.png b/graphics/pokemon/furfrou/matron_trim/icon.png index b579007510fd7d197da2ad5bdd52714a7b19a1f3..6d379a8cae667df9e6b41cbc93c711be13c77e40 100644 GIT binary patch delta 381 zcmV-@0fPR;1jhrA7zqdi0000?P=%b4dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0003tNkl5ki&UiX{P2_ZE3p6RaXwQ*_lX(vt$1b7Ft2 zO`D1c$4-i=U!<=UOu$i~fR%^ZkUju9b7-LxE8NWGD6*mU{Su)2Am^fHrmi(~eH2#s zX@m> z$Ped3W>nzEdYN(0z>kU#fgh;&5cqM&hc`b;K78_{ReT8iXeA#4KWaW){J71)3f delta 508 zcmVOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00C)9L_t(|oXwK4Zi6rohIxY%Sz85_>_O$m zMzCZ~AF@vnbvy*BG6p5jkdTe&Frrh5?3xxE=-#T{{OSI?ll?i)-yKk5dT%h8pf*7~ z2cvo-#HDXbBy}K~Sy0c3lIS#wxJ*<$`a&rK+%iRcQ1@?rf2!v7W)UjL_dS5iN35qp zPCbx}RaAkz+kOMsFjp8iSoKXEB|C6JI~csSEl^@?H>umC1EH`Ld0t?%z)Fn4v3V+w zrt5Wg$TLWi%CmGngenhZ&gE*N2M=9q& zo}X(e3?~R^e}~bahof40#c(hPO40zeAAJm5O?EsJV05VGC8anEtPZt1rvgLI>Hzc0 z`iy~q{nq&L{33k;(ld^65j8BdAN|~SW^Paoet_zL_R9KEt1QKs$9~X3J2v=H>wm`> y20y;QN{sxF`Rcl#_;L2j%o+QUdR+acAD_|U3O}Oo4ki@<0000VPi-*q<6Ru0}Z(&);?}9f$NTl$d}G$f+Ow-n8#!w&HzLZSq3ZyldGiblo5Zk z;cy)-e6f;UJ4?whJlI1l16DmZT=bish8v3Px~iI~sd9`|Hv=9D3-hT_Rm&_1!R|VT zwyy-IO3XqtVt3$KXL*>VghmIfeksli#I(~F` z_<|oD9~OQTKCJwph7U78s2%yvkHUwQ9}OR7eo)7Ug&!>+@MA*NALYXno--X~^pO>| P00000NkvXXu0mjf>87hN delta 506 zcmVOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00C!7L_t(|oW+tcZo@DPMRfzNomwPWI@PGT zq)T*|-lSQSB?junTCB4*p0db-1r*|9R&gBJ&R&F*_#u8#SXG3$B=fA$MJF8P9>NC94GNQFU}frhyKYhfsi+DD{7sX+iq1}{i~x^5pfktl`h zNYE%`RW!}l6Aq*bt#_H23!h$QV&bFn(ytsRKFGFx-|!~!0c>0Uewwx4G4(%3ocJK4 wgR(gBL6IO^XA>W+NoqUe102=%!F>Dyl#BdHc&>@U3;+NC07*qoM6N<$fia*_JQ+fxS^Tgw1Gg%&Ldd?AOXw%MUH$yvf24vwOx= zriO+Z@fpD%R64gk>T&T@sJ}kLh^0Ga-K;BuF*{GoC%jD#t?~c-;{WIJzs%j{J?E`H zC^IU3P-am2oXqa>#GT3I$#Fr3i9f-ZapI3c7KfBN8AgVg@{9r#O^WHeg=M4 z{J8kXzeah@qo?}2_@(W=?C$*eaio2!y!?*`e<~g{e|kKV|I6B%AFQ^*CzUo%Se~Q` Pj1dM;S3j3^P6OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00E;(L_t(|oV}92Zo)7S#`6XiuovMhorvOF zIyDc|M`2+=>d=X$eI1aDvUUhWr8BnWNL4E(cF)c~ml@Sd@WKE2st88-68GyJ#3>5A zZmTx@u!1zfM`SBtu^qs~Mpm}35YD$RDa8=k`8e#qGPzKZ>7AMrNP!u>KwgEALRr-M z-i(+Fi|W{|&O|AM7`i=HP;(OqB|vk)#9>SpAhF66gFs?NT`%QORnxOX$N3O(qDDrw z7=-31v2!~Xe>E3Xb43QH5wWD5-gwBE-&?ub-G7|kBkAuIv@Yt-Oa<)DuYL3E?>MiC zV~XICT`pMwLqe2WsUHzRe3(ZHBV4AAA66`73D(U04D@=lVlZ`r@y{Sh?*LQ$NsRY{ z#W@l*N2ObT&G%cFQZ)cm7jI8S&jUU#pN~cceEc8?NJa*H5Gy{6G$9{0HkVLnO2~LF zM?RVgvZ4(5zyUF$Y~CqgtPfYjsTEg%uHJp)c<(hxvQv7&bC>=0n)05XJ4 z?dp%8pwv!-VN;R;)E^0o&`Jk@_cs7T1Y0Rp8i2D6Lid;mj1iz_K%!Ycj6fj*m`?y- z6)FMF`5S;l(5uZ|gb*;yFs``DP_};|ni2xFUw?=z-gkdZqHJTNH&#ZQKv%6>+Es7~ z!R43gojf180-TFFjsWm7i4ddd!p(Dnsy`6IHguY8QyGY<6@p(0$itMNbzgsMSv->9 zi*?qPmjGMdhkA@t09OI>eV88Fh`9(Lf4KfCJPMEi4Pa?$Y3V=c2Z$*S;6M-D?qvV~ N002ovPDHLkV1k~!w-*2a delta 502 zcmV1HS~27-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00Co3L_t(|obAv(YQr!T2XLc?LPyy?fFppp1etvqMcg=qeItSwD zuK}VLf^QtrbhOUTfoxhLz8LtE(ZzJ!C4if5gPa05>L*hWfB8-gK#T4p92NGbw^A0A zycmGuRSRa=&kT?UAqq+ffE2}a1awV(u7OSpeGCAe(|b7Qya#jwg7EIZb~_>RfVPPS z0OQq~G0vIT;!doa0SIu(OrBujK(%oK&0#ZH^uQIV#HO1RBxLzg1Fdb5N{D6v{4(>k zFbf<6G=)oVe+B@T8P>usk|bHdrEA&rU;!_mbQOY-@w$H9H?B!IG)Ke&s1Y(%*Ka~f zI|oQMctV!X>a(r{-+S#AG0%AmN~IJ4Xq4o3C&Z&X0yut{tImD~+|I&vIR-g^wVOqT sPlYH|0@!-pKc;y&9vrylnqSNp^fP~r7x*3(000002uVdwM6N<$g3DjZ-~a#s diff --git a/graphics/pokemon/gastrodon/east_sea/icon.png b/graphics/pokemon/gastrodon/east_sea/icon.png index 4eec76873c861cf6d13517ce86a7d3a44bddafa8..33ba3c5c51be388b68d91e5ec3fa81e0d16f3a06 100644 GIT binary patch delta 329 zcmdnWGMRaT1SbbG0|SFkKa zU;G)td!_%wIulVV-VZyz9J)}jMB$cs)$GZ#wbvIo?r4*jlb&1OXUNuUaPs=9Zp9Y? zsq#zK?6TU_?!z4762`8Zc4$VifbP{zYNw{mnKtdz0SUdGE4{wHHqx+Oac+Zad(TY1 zIj83V(N!PC{xWt~$(69A?)n>_#k delta 491 zcmVOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00CJ^L_t(|oZXYLYQr!PhV=wJ1nKDbNm4K< zV_gFAnD%8dXtJNF&}_;O+Kgupb-_cd*t7u;ajtQxCD~6ywF&shb$I*GYSfoAPxsKtY=yI$d8s~thD?r|U3&KI@XM+bUnnETz^mmZk`ilu472bA6K4XtKoqM~vP9BojJKZ3FT`s!e0pN%7C0hV#w7`Gw z03x!hKhOa74K#WL4|@jM5d;&*!Tx0L>cbp0O-Asj?;A*ZOO$WL0=Do1l!u~~$E#%@ zrh2K*-ZT6F#d~H=q$}xmvusAaqy$K8Nk>RwLr}UTLjtPjlU?G$NQ^MdM(jHp$od{) z21WouF%SUuQSxNH^8I%Cl3w&uO@M#GNFpnOx!W^6A&np#D4Fud0Uae%LueyaMNp3q zT_&0BEVB4wA2<7K z8l>)fX2F}_2uOMD7&+0`?c7wjdc#CVhQx!L6EIzuP=o?vtj6rTizhR^z4@DVp36-gW;_6tI{8}*V}N}8$&tLB#tyDY?8=|BUOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00FQ`L_t(|ob8jrZi6rkh8fa0*AZkp5>&Fj z230P*m5S^PNX>if9rnPp34tV9y3=;5RaHp-uz&wHS@wwkj;8~_-F(@pb8{zuRH{36 zbrNV51xuF5+hHM8szk1V(j6p$9$-)az)})m4W0ldn{Ivqf4G4$0SF6-6p-5vf}2Ev z!fBi{-QUrOQwnuHWSPGF*n!4Cx6CuBF3gj}hOK$r8U7u7Kw1ZcG&em!SuT`sDJtM( z!icSO4`m0)bakMh!Jl)30)gF;9J^zYkw~!tYzGQ~(-DAWW*Sw!f8pX`(`gn7kQHn( zo3+~B&NeE(e@!WCCo@9p(h?WnW@+lxPK|?5dT?Ik_7JpOfvP8sC_aBLNs9zPk~N6Z=nzAufvf^fe%C1!s{ns} zTwRes*0eB$rc5n-9>Pz760r#A6)K?uUI~Rz0S8P3bRrf(vznGB20;yJ?uoexBAO9G z#7jk>%p*msLC-I|F4c96!gc|`EXQ@iT|Hm-CrTRy`qUApaa={v131sK0!gzXwg3w$ zp&D570TLBHZy+EG>iiB!{LQ)m%wKvU6WA%9&FMwf45M}w6FZv@76aO>=N2Bh@{W}0000< KMNUMnLSTXjyv#5F delta 574 zcmV-E0>S;A1cwEX7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00FB>L_t(|oYmCLZi6rk0AMDi_p&#r0jcM@ zNIjyGwj8H+Eqj2CCm3UAHmTWL&k27Wm~g8!U-Mx*A+h7!GsM#bh{FjHV{o>Yz!jWr zNi=}KCSnA;h;d^VF@~j82*ej7Y(SM3plc{CqW;2zJMVyEf50OwT(_w~Df~XzQfJ`0 z^9raT5MW~A)-?v8Nha%^}v2K;XM`QzjkzF`2 zg9c>TGv7iTf5ARuD|FyhvfJ#y+s_nG{6TG7u$%%APJuNGnrjhc$KlQGfrtfdjms#Y zr%8hb_WaLuoTLQL^XPYu0HGiEiiVjL=m{|fk_tr5VdPF$z#j!dj}OqVdjurPTv-B1 z@y@L4N2SLt0l@*Yu2WDCq9~$%eOWdD4CtkhiTb()P}jdeNSaL^);$oQZQRzN&nd74 zvIpcwwFwZKeO}ud5|=dEuuEXJ@u{wL3L2m7=T!pJCFT6)4)b5eFJA7T;x)mswg3PC M07*qoM6N<$g1EBo+5i9m diff --git a/graphics/pokemon/golett/back.png b/graphics/pokemon/golett/back.png index d3b7ad67e39258e22b1fccbc4a6a023bc9e8582c..5a2ae220887b83ad8691c3801703188ef8a9a8f6 100644 GIT binary patch delta 717 zcmV;;0y6!j2b2bo7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0007mNklb`#3`Jwvj$9}C|KF`PuY}gnm(H|efWUB%t{ur@+y3J>M+o6( z^633f5FrvE`S%IIr<6RIfVTl;fK2%PJp%85kIC;8@D3s*;62ziUM2vh1hfaR7s7u_ z2tW}hj(vaKgvd=_Ev%bh_YKflSTun}XzzmsT+pX90-6Q-;(GuB%zCxJpZ7%r0MG-H zCa3qf0NBdP0os*f;*x%woLhEM$3?(qZXk~E zE1{D992W6};2Z;F$W1?_Pkf+V*9U*abpe@h zlK}w~LViroO-XXf&k%IpJ2x1p0G#xeo&hA+lNGhgTyKB?h0y6+dQs|y$$hK@2Dl37 z^)0=gOrqz%4Wh3e1Q3ic>JhuqHURh~7(oDK4Wk~qxuju=HYlC~oZQBK z35}o(nN+e8U4v|5w}x^P#y!9~Xw>pw4k|`U?r1`iAVHT9!hFE~#~+PPv@<*~$Rktj00000NkvXXu0mjf|8Y$L delta 862 zcmV-k1EKts2Bim(7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00PNLL_t(|ob8jbYui8+#@!GIWNM&ZG8MIU z)S-hpn`A7chSJgY5%4I;MPnT*B+^a}$d8O!iU&i}smR(3It|?f&P`cL{+qt{&T;C< zare>_czHj6-*@l5t5p8Ev-$Qf^|n|~Y)WzdW-V|4qWOFse;^LJ!dnBhMeAHC=W*a& zO~gv6M@{y?g*pP>BgCGI04O3>*0)?30t^XQ8Dk>?0w88$g~=&cpw1q9WdoQ49Ks!y z1u!3Fq!7Lve<%SFID83I@Bog>zy_8ahklScK3Z`JmJnFOw%jbAs}7U^^g1dlYV9b1~5QQ#RN}& z?@?s{Eigci{#k+{P55&mAX5Z7HUQOAQ-oodoGkCCYVS!x&SbzfXRw)&9h3K+GAfHWhov;7} zxCdIIf7xK5iojgpG`0Yo$gb#F2?Dg{HNvP2-~$>-DGu>NiGi&4Es&WA;y6}50o4Vt zC9Cg~WNHP#_kG1rFt7l6Y+*<{VCpw2(DPdYs=L}+qy=r2?>kPcU?96aj7cd6*r<7i z5NJ+q>D2v^>^4PHaEMR2&Suny6itS0d_k{naO#+{Nea}7Db0c!L6dqZ2^dctd`NA1 zXaW3h#KXi^*DNp|F9BHrcA7Y>JK&3yJ=tSmn*qBIsrgt2Dv3tGZWP8qqJzN1dNl0Q oB*5+@#%MDz{>2iF%KyXXH$^!C9^qHB8vpC*2u0Nx7@GM1zdNYaN^3{Om(B7zxhDtcBxuaPE^oOu^45nC zHV8JPQWMTR6LtZCRCx-XXba%I1KI+Bb9(^C0IvsF%K&Tj07Kk@rwu?PB!D(=3?P3O zZ&MwI4;O0lInD*3%ezl0ROVeQH33~M6`;vS#QGd1z~QO`fCRWzg`2>#LL)#bg+_pI z7eI<0+6j&_*1+fA;a9QC7SXPkV00UMP9)O}S36OcjV^yI7pa`rfTmlW?RG1oL z1)#eCc0oY`a{jRM3iW>o&;rb~Lbrbd223k-J7B=H0`>$VU{axuKnO&@q=FDgU*TP0 zK)|kmQ25;h_VWoaqfkbGw|oN3DBxQ@0VWhKfXE+|ubi<0zUA|sG*&nPB=f%BibI9G z{t%9bKqd?o;_m=f=B>SM_K`vw|3lyjcvXnwGdBSW_1!R5z-OKt=m6dnh)g?Yf_V%1 z@l*isi+D5;gYyb^f&5&!USDGcDR6GEeSHkF${A#@2+!TA6H002ovPDHLk FV1fOV1ZP1_ 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 Eg6DqaasU7T diff --git a/graphics/pokemon/gourgeist/super/back.png b/graphics/pokemon/gourgeist/super/back.png index f669c4987f5bbbdfe7224049daa066ea52343dcb..3d6a97ef5fc37f03fb13d1e600a300e4b48aa80e 100644 GIT binary patch delta 487 zcmVNkl58z^1~ag8|kf0DAAf0*SCtc&?A`^3Qwu-h6&5L;ygaca&Eb+5uD0pn+=n z`u!&p$FF*UKrGACN&yG?IDi6JDG;gQ38Z683I#AZ$w332q3{uSR;G7@Tq$${OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00GTOL_t(|oR!tVO2aT1!0`^m(u1(dPQorZ zw99LV2p;why2G}k^kA6}Fng>+6bCyL1Zm!8(2GLe#pKJ^b!+pbm}`FI`=?{A=lyG) zg(Ei@$tra152Td)p#zK+kiFoC-VdtJ9&i)w+~Ah=fNS>Fe+NP*7+kVDC-C0;KrmAv zcK~mZK2$W8Yt9S+>5X!93IJkv?Do;KgwOV-puhm|j^%UE_QPfK5^=f#Kp* zLJeZ#9!U)t5dnbHz%+8r?3JdGZ^%jnA7rIzJkdrBH*WtnE`<%0vc=JTOt6= zp-~i`CBknmp@1b~Zh)SkfF&X^38@BRXo*0uHNX;)G!r!FM8IQ6@Bjrm5k5@71B#*7 zi7)^UDAjAO9ic&j2Z)_|&$S~oSm6O*Q}w27M<@_Way+0^Uxd6Jp+I_tK)tPH*pBd7 z^nm-~6}~AQzz-Al@L_BHeSDVJ6LuQNyjAJ*0qz%L0AX74%Jjg062bBhY3=S uZ4np0c)-*EnQu-b>ID4|8bH17PS+nZElV5uDV>}E0000Oo2I|E{5M_T z@b29T>EmwU`Kcaiu-v-Y3t9 zUuI#7gVEF|hGRA_3x-b7;&~RQj(vao!D5~%{3v)FJj?X~;tyUi1HWvThW6Nre|l+$ zJ^$;S>r?r0H2aDlm#a7Oqrd0ZtC#sPBkFqf27VBy*EsXz;R@XOF(4@OLleX@KVZ=0 zxbp*iP|a0>AAIs5<01GEe?IeJ*R6A6dg6m8VC5lYevC7EGe5on=jk0Zp`8v!vj6}9 M07*qoM6N<$f{aMe>;M1& delta 608 zcmV-m0-ycs1E~d&7-Iwj0001qplF={000McNliruZ02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00GTOL_t(|oYj-hi_<_9$LE^UBY02$11~A1 zfnr$|{{s(tlfsaLuz!OKE>jSvP=$^JbDu(UTUZNw5f%zz`!`fUx)HKd10`w8j`=au zP5Tdsj~w#8^YVRDtxv^De+yEe%)@VQOl1T-K-o3^ zu*d~ACtmLf1@r7wQcg`$8(w3f~m$}-!X~6@l`5QD)JqqKB=0f??>ekh`l3iA1--+ z^gjk13t6#l5OrZK(5f!Xv4lMz`SRE`4i_4r4Hw{H_r`1>gH=KxT}(cj!Whm9W7tf7 z<~R^57>0g%m9Tn*vCX~)U71!_3BNFQl9T99n^sr3a{7(Qu=m1BsM6Bm5T}PD|Y##H;l61Y9Hj!s%1s@sHrul1)j{+d5 u^C1;#8Ui4%`iFQ(lF-8yOE~^Z58^L%O86X?t-x3S0000nCtp5LlFNhi<*`4XNeKhwhD7I~%K7IQ1Qi=4+9%Fn# zNFlOdxd{c?nj$ni&0e!2R;0atud z_So+VN5XW6PWNR=&7vt`efSc86>yvr0RM=;3OLTg{t@9hUNztW@G-vpkI2ma8Bj}b z?!GP6KP`EEKq0jFkgUD=$$K6?U<2>&!{{&Nvpm4ueJAqqwg1&|Mu|W&av5b)SZK1K>*>{PXE`yTluSEnq6&RBr*cfcyB+ h?E?X(6a4h)y?zKDBLk2}hqnL#002ovPDHLkV1hXA@k{^! delta 610 zcmV-o0-gP|1giy*7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00GZQL_t(|ob8mcZo)7ShRFakK@<=h7Jd-W z!Avc((tY`hRlH?B^R+~q9 zcMj0Me$-1teG9O>26}rH5CQ;R12s)|nNsD>H$$BVA)`Wle<-Y@)iV_jx!?^jR&{;G zrX4mr=7I&lL@6l^g1LIdaj#T1V5}K)QcA3XdY~V^Uz9QrfOIdVB@pPwN@kJ(moie) zl`8u<;h2sHh>c57I-rnw0@r(`wK8J-JGSqR!D?v|Q@Kgg)767>7 zrC=lK;6KJVe{jG6kT6CbLx8wFgV8xdfX0N`&5#suB@kd3B46~|Gf+Sh#YR9oPr`+Gv|?wmtVyA;4zk6cy9v?FVl99KaUlgxex60ME|}d7T7E8q|Oc%$U$hA{og)&o3K-iG>Eh zgq@W=71qQ-OP{4x2IDkBJ;%5RVW{~XTabj2KjUIhEQ2r_11@=F6l)xTW-mnD@w{E`){Zg z(esqqQ`^aYW*`T|C1+3j`U-IArT?U-lRne{a9ym&3BdLiKy(}{7_dA66g7XWUF`_5 zLUzUa_U?B8fk093BVeL0yGXLIN)8vl*y)X0wV_b9>l$~F9n1i?Hb$|Ft9}{QK%Ibd z8NkCLYWL9^H#R_7v;lT-4ye32I*_h~Qk|L(YDfprl&cY74xsi`o)9zvpgVm+-1S*U z8c(mOy_&&Cg|zMG)jZNudYe0l1n_AL$C37Z!(6W!2=6mlLt+9O*c33)>q}ipU?c;! d2>8W6h(BPtEfvj%g%1D#002ovPDHLkV1oZ@5v~9L delta 668 zcmV;N0%QG`1>^;g7-Iwj00013M{Ml?000McNliru

1~AQgPDqE7$-02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00Ia}L_t(|ob8n{j@vL0MI{K^n^Y5Ju?5MB zoyfrk2?8A=#g;DPPF0E&xqz{qrAno@TI2#Qd*+@uSTUl@k}^Kkfw zl%nXr{!VNaMKMFI?)Xg|v8+MW`I4WY!@S+>Ou9s%nW9@&f0aRUfv~#fQa4(wOhGoU zk;t3U3IKNX98g!l)(CJ-w~|O30$H}BB|wIN=4RI900;n6rIxHQHpz4fx-xJVP!iJ+ zoK_fCkX^S*>Kz4ypHo+YOJ$`J1Q1US#kh|O41SPp*v@zE#QR1#kP3-&A(7gYO@Wsi z;J$ePxFF*ye+J;(wIStQ!1Y}aAQ^pkS^|n0phBCaE)=H#tDY~L%@j~UPDvv+UXHPG z4cL#sm*&a)CDYZFU=m(~VOrrF0w)}^>;peT9ORft(fw+ruB7U|K2IaK{;fL^J&-Q} zt@j1@fwc564S-00dEoOsKs+A47Udl1=YYWD@p$;Oe>u1NXbHe35%_UIfZn?G4G_nJ za^?5g#a<5q|CEKhoGI{dn-QLQaIP#VFdhYfg_xp;wId=x!a4=O%fye_^-hmSJMsB& zXTdB0fsaYU42XkE?+HTzBc~F@Z5RECN~ShG9lG<9qxs>@4`jN44-%txZTou_eSFVp z0f8+@F58tb`}lR6(*hiyepdMs?quTacJY<)59$x_m4HZd69#?&0000lc<3)%St&^C$y%b+6c9*%9_(DjSK zDq{6n1#<#>_gM>^l`$$nCD5NHHWQV+3C3T9le1VDM))|u5C%ylKo4Ja52|6E7my1S zQA?nT9`B-}Dd+`=TYuFliUvO@2y=f}BD4gXte!v=pbBSx+xGqSdhJceo$#`XCh8Kw zH;Vl5&|6kg5b2bb;z;1uLgm(eu zyb7S3@Hk4|b|H!q*buXufe(VR+ktYp$lrwzNZs}@0pXHmRIa@ecW6QDPf z3LbD3sNqsD@8dmfbw2U_5&&&6gpdCt=*{qmFaCWZ^2v}+diQQ(Ch=;pCt{G-!gIwH z*fKl{vP}^CnEgGWb2oaQ23fY7^9MY)Uk9Nt1@BJL1&;z}9}o6H{*3%>q?~d$42Jk$ bf49B>AburL+Gsv%00000NkvXXu0mjfHJmfG delta 759 zcmVOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00Lr3L_t(|oYj-DirYXChP5bQuJcOUgphzY zdI0NIU<^6PN&|VFfD2WZX9&1joF{Oe;LcYZq)KU2T(#Gvww@s~E3ItHlKUIZ#qodo z|Jm8uAb5kt`E{L1sjmZ&%jq?JDj@$luD^?B0$?@{2$?Vhf7n8Xv%QR;52Vh$+S`e3Mkl61b&<1oHYK5 zXy6>wfS?3D0tA92a9A-oiOd5U^dP{R1P8zn5JHr+8RFucj1!Pc4-|bpN|4CpC?Il) zLC;D*zI4egtle=>w2|7G5uIHjmqfpQk-geJjfr;G92h zPl@J|KGn4&xR6rv?eE<&#VrczNN6WxeR$YBodLS857zDlot5L>Xk&KI9!Q;m#d2Y& zr@Sy`r*4HSivo920g=)WoyDs;o&MKqC;ROS4-e zFz@cN1@3LfK(xQb@REdThmVQL=SsRaQk>M0kogr!kuYZaD? zTq-{vEY39-$$~nJnfPy0tG#Eh_hK+<%*8ZGAOgo{u1y)Q1-j{0j!^M{Vy~{r?k&PDHLkV1oCGKfM3| diff --git a/graphics/pokemon/hoopa/back.png b/graphics/pokemon/hoopa/back.png index a3d76883c79d83054641860b7c511bf785cb5d8a..64912b3236171b5067403cac4e0ec022fced7c3f 100644 GIT binary patch delta 646 zcmV;10(t%12F?YL7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0006#NklF940M7gl$aLTR9RQ%)z=_`h>k$BL z`o^yx16TvVf{p0tZvboPubg$IXW)NV31D4c0eIF$K-`RY88A5xc+xe%>_pQ^5dk^? z@APK?C2*p+Ax;1o5lSA}ZL>}QOHfFA2+OIzjLk#Hd?4gJ2RPxR7*%usVvB^iWCGGF zzY$~();p!1^dS3ZhgvK<_{rBm++4{KFWx)IZOe4oUo{~Y}iwH<2g2J;)iHv)`p zgu|P`M(lAU%fm*yD!^t5VFdVyXPXJ67m&*sd@U8gV+43)GRXj~-5D|lTMYpYehbq8 z;?Gr%P(UGc0O6L3GXk~#!sv1cJ)qimfHebI<2nL7K?>-;K%7#!m0-PKyI&cVpjqkw zsE3pVA^`1J-ZfKYJmtQTRpNe9zx9x|Bh^lpRTaSmi!*+lnbk#&-(ohx6BnES1|iga gJrJ(=fBJ9w1IidG9bJB1fB*mh07*qoM6N<$f)gty2mk;8 delta 789 zcmV+w1M2+F1>6RZ7-Iwj00013M{Ml?000McNliru1702g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00MwXL_t(|oaL20kJ>;GhP?#^9cxP<+_6+C z&5DBj3NFY}4y8udx>|`I$?1ZkJH;ovuudn${EHMZx!RbcNMUO7+oW{z#3f%5MwDP;EmE|2>C8`o|GC})1}9~P TnNh0`00000NkvXXu0mjfM@mWy diff --git a/graphics/pokemon/hoopa/footprint.png b/graphics/pokemon/hoopa/footprint.png index b7c5cea6a78372d9d46a5f262fb1781a88fa4cff..90b2344967656ce2128ad6ff82d7ac0c743b7fba 100644 GIT binary patch delta 84 zcmdnTm^MMekAs;2$2dVEnUR@+fkD+aR|!b5mw5WRvOnbz=hVNStlxr x>MmrcF;OXk;vd$@?2>{duC?Eg; diff --git a/graphics/pokemon/hoopa/unbound/icon.png b/graphics/pokemon/hoopa/unbound/icon.png index ca3bd77644fb3c3a98e1712d97c1b70961206563..4c77ca1e2cc946804dd08876602e745a567f7d81 100644 GIT binary patch delta 448 zcmV;x0YCol1c?NY7zqdi0000?P=%b4dp~~=bW%=J0RR90|NsC0|NsC0|NsC0z)*`r z0004aNklzS#HBH3`8whECiY0-2b*6vPx|&_D9j8tqcT7X2dPT%eMW>0neje zkE4#3&(GL!_^Gvbz|d~#Bbx z9MDt~Rd?A{PY45znlwq|vo3>DMe?t;3SXtuqr@$A>!1TFr^8zZuk*55s%}70l`e!=s?|!dN=FuUrk4l?+jVa`Kb6AXuK|2MJ|Url z^>QX!x>m!%_UT{<_{g*~@RmiT(n5dfFpKyFBvOP!rdh!)BA&`@UYN*I<3V(>&{HvQ zK;5z0Y8nd1#|EdBJ{|C_*4j_tT4pn*8^g<&)1%()^FKa+6Cij7NbutUAdMe#2auB= zcK~VpcmPPu?Mnc;5@ZFCjvy<5^aL3JQU`)e02v7~0;Em^82~a9WCVyz1X(NqWLl~p q2T1VY5g;Fb3yz07fV_O)%!hZs{VPaclLkEi00000@?kE1n&fp7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM?_*Pxg9(J0004WQchCe?#jaqHrXfur(0m4~RFE z7NoI|GSK%D@QxDQ2r6}RkvxN>S~P~Fa&yII6Vx2dp$zw$XG^{mh3!e^{E#o}&Ru9N zo(@NpUR^YyHS?8>CS{?#W|u^~#^`NRVz4zyXpY%#4c@KGj6=M?M*ar~e-)Y@6ad{d zS1h#$gN(3Te}kIMtiUzJQUXB*~3nf!Sbg2hai2 oM!Nu*nvW4M^)EuM(o6aH0{BF5J}9phQ~&?~07*qoM6N<$g0P9_B>(^b diff --git a/graphics/pokemon/jellicent/backf.png b/graphics/pokemon/jellicent/backf.png index 6471d3bacb0148bfa7e456bff33a6e36be0622e5..f6f0b060582a1863caca2cc7eb6bffa942df6ca4 100644 GIT binary patch delta 448 zcmV;x0YCof1c?NY7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0004aNklbEpdqQt7j2_?;JbTPC zL<Dw$via{YgeX9!4p0r&~T#P!+*z?E>5fLrz$;8(FDoc*i> zCLO~_r_nh8R=_a96=!bYmf$2~c&)>qiy#DzFr_ZRR0JdB8n6LoBdE$#6)+j0@k1Bh zJHp^n8(@WCoyW?5Lx5AF(FFhy|u@?$x$Qy{wZoJ&{{9Rs#N+8>Mb=tnFvH@B-~ qZO3tEyF`<%{Bl{Eo&D3N|I-i9!8GX)m&)4!0000OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00E6jL_t(|ob8mcZi6rohP~kD>OiE93^kN3 z1Duryuutrb#0w;r-?nEPjO_xI+BGKyMY%8E{Wv)od(|JRVw^Q6edrrGK2HdFd*V%= z09-#2)X4~r66G1dBqE-L{2kzkrxQ3JYB=r#P3RCo?6)iEe^7}FU1qVDqZ;aq_^9df zInVbUf_h8MRQIwi0ANUfIagGI?w|4x8;~ig4nt{hzC+bwI9AGDAI(E80|`!@mj=q8(s)GcFlDu})ELGJ)NbMuDWSwbykyI5~0000zio9lY4*Rg5a^+E=*2HaV`sMQudifp%J#4& zVgy%1uY}2d(#Gx2v9q2x}vE?_3Xmq89Fu#H$q5Lr# zB4(Ai1kzOLa1G$wrh6f^^K$(P_G9?1LX?Eg}({MRq&<^ZuHKxW9T0g{Zh z2#~P$I0IrJ9NZMRIxXuT2gDP_O%+3+gr8af0000$p`8E#02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L009k2L_t(|oYj&sj>8}jML7W+W*QfWJBIV^9&Ad{YTI2ufZD2$Iri#1^jBSA7;A>zA8(>IM4GgCY%>8Je+XRe@?TZ9V zZeMKsmV31iG0PK}qJ62)-WTl$9PB7faog~`R>q!UjcjW~Jpeoaw{xWP1&#m!002ov JPDHLkV1mTbtKt9v diff --git a/graphics/pokemon/jellicent/iconf.png b/graphics/pokemon/jellicent/iconf.png index a6abfa5ce5b425db7a686c8e11cb37bb858bb490..f9caf9f13f12b73915c21475a7ce9a3e5df51c10 100644 GIT binary patch delta 356 zcmV-q0h|8w1Fi#*7zqdi0000?P=%b4dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0003UNkl@o3b_d0QocHBW$-uL%0P|Js#Epx@Hd3u|*P5UmWiN+UKk1I>R1 zz4yw{gta~sfqbCSx-eR@*%1gk0X~&8TJv7<UR9TJd00maGKMGy(ShgzkN zhyjTMq09`;YMn7Qe-qGJJ5LT{CL(*ZmgNKoOaBP44hzkeI02R%(<}0|L7--|{Ih~r zV)KW%U~}%T{fYf=0f`p^lIy<}klav}y?}5JwgSSP+6qWbX%>*n_Fxc@g**hMqXa~; zkOzjOP=SZ|LLRu)_w9GVN*=iUkL{1OJUqA$Z~qUqf)d%T+6rU<0000v delta 425 zcmV;a0apI51M>rr7-Iwj0001qplF={000McNliru

4?H7A-o{RjX602g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM?_*Pxg9(J009?CL_t(|oZXVKPQx$|hW!L*(F|m(NCq~l z`XA~kd8STuK^Y>%ElHmai3Q2jy9s2kNlDx^nHVc>yH9sI`|cCs%0tfc);Ck2qAB=Z ztaCG_^jQMB7(u%$HTdP+BsUeGq8Py|R~;)t$=7|w&u`38e;!7t_`R#x0(}X!xOJ%!0YRC=59FxQ+x3xw1kM#c0`yH3r z06uu5Ytb?WKqwEkY$USK;z+LyC3k$ zx7=5Ac-FcjyCe4WNp;5eUllUHZ2YWsV6EJe5;?8<_3cfeajf+p-a9{aKAini$sy{C z(gx)x8|4p_zHHmB%j$clf;F+A>>>c-edY%1d#!XMobIiXzfwknr%?q+CwkH6s|0R5KGjqEG z+a9hO#*`xE9oijjz6Twx5`Vs2dQUVVxWVBg=P~_KoB1)D!x~B^l(Bqybhvm0o0aV6 z`n36pVhY+ej2RL#f(iDQPID-n{hlf6SZUpq+409KK~iX)ZPXuNC}i(tm?147b9(v9 RQ^4?L@O1TaS?83{1OWNzu#*4) delta 444 zcmV;t0Ym=31BL{U7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00AmVL_t(|ob8lBl7k==M6u)m8n^)8Ilw@B zfFyALGYyzT;X`nhs#)Y)uKL;CAS%RnJ~zYE*GFah00>=+kqBK2M`YK&0j)iUfoNIP zyApu7B*0(a=#FdxtZzFY#+!Hpw`Pf$PITFTxw(v_rCAWCe~~e`O?3}|wH)y)=IwFB zjZRaRi0zlzJoM+-NgOe${SvQC2ecyd@~78iI!tt(vUXrP=)S*o87oA-)In-5DpRND z@-x6--z^U)ZUASFrAFY+4N}In0JsjCcR<3r8d$VAfVEC2UWY#e43I(f7a?TrVGCe8G^|1>fht3@ug~*@z&!F5TG$Zc&*nS-Z2kZxiiveCszF@<0000=Mq3`8?_SORhK|9@Kvu^7h)r%yen%0nBsa~TOCe7pVESQhoq zb`H2}1gL#K8A z1K<*r_Rak}EdCx~^A;L0z!m_zk6C{XBu{#m9Uzq-mk~C}S#RnItO-`PJ~;}+b(zyL4^AUJn!U`hxSR@18h z634i%0Zs!b1R6#XaABm^Eg-T3iV%i+y$DQT1~hpmn2J#PV+v{!ZTlIe!AX%CAf%Mx(2A)I0?s7#3h@4k^Gl2BZ5uuIf zeGwBNMFOyX3=naaqbG0|qAH?7_KOa|LDF6!q002ovPDHLk FV1oX?FT(%; delta 786 zcmV+t1MU3g1=$9W7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00MnUL_t(|oW+zeYa1~X$EAQXWIEw+xz-en z<9>idTRH?6e}N9h>xshSXamKAxvpM>=4{^Tsl{1Zyj4TKK%is|T*l6wx&`_qU1CY+ z>s06)Y@grn{{Q!$-W?(TH3rdj9s|REa7ja8uTO@rgMYFRf1sxgK;p+f0Mr2Q568X- zRR}<#lmaWY7Xw169Fz@dMUGF$BOgc$B@0!DA-X5y(WPHPVQzgS@*RLwUPuc(TY4Uu zDtsc}0{gBp>Xl$6x`#DDl@jJF^GYxh-NVsx*`HW(#S)S-Q~g#%9wTtsnGqZv{<~l* z3ds#HotgUsfAgmhrUV42>AwwlS-v5J?Yv(p<3Oj088Q|R(7;l3=*$tIECm~JmCFH{ zmIhFa?IPrWOv<@EN8@0k2y7tfl;zA0nSpRNQf~W^kkE+(u#tq&TH{FsK#-$J;w_A` zk**)}Qyi3K6YxSjH)Gl^ZIoWG#pij_3cOouzA8f?fAA0-<7h?v2#e@x&d)ym1rSEP0#O?bB_bdyg2h1SAvUkB&T`T&(c|a0A_6>#LUs}ODIIB)jIIv9}`_rE`cKw2*f0s;qBRmH`xpa+u|4tUSl zbydlme;>X9zN0{-HJ~*D7a;&{w^Q4N-keueb&~`ZETKgR+(vC;nIMGo;QXOV^BBM} zqz;f9{*V?)l*jj&s67;H@IaaXFbCjafP1%vKqm0W>rr4n7O>A~-6#@_HS+a1R)!F4 zhk$EU=x=5(+VX_1wbl%$){-X#9|*0#x2DO#Bo#go(IXRtap3%GJMi!04;Vzo7Gkmc QZ~y=R07*qoM6N<$g6nEdOaK4? diff --git a/graphics/pokemon/keldeo/resolute/icon.png b/graphics/pokemon/keldeo/resolute/icon.png index 71709729027a31c7c4338ed387306cfe72f5758d..8da8ea26c8743a7733db62374d9a8f0a6d5a106a 100644 GIT binary patch delta 409 zcmV;K0cQTL1mXjb7zqdi0000?P=%b4dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0003|Nkl!)t%Jyq7-lXAw_50t8{b0zeD^Zvb-e;Vv)&BzOFn z0VMVH2Y?KGhyWS+&;z9MprSm8<{&02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00B}-L_t(|oYm5?YQr!P24KCxZCU#a#bgWk z4Z3(YcoE(F2&F?q22&3K<1We2NAcoQKk9%l4e}er_t-Tz+S7tL>Kw5=47Mx7z3( z{K{X_mYdtBf;QMqMJATXarlsK_EMSxl=c|7J{24pf@m5OoPzZ-Wgt`~D0q%%DJoGd zDtj>CeXCj*=?n&c2=rdDb}5C?{xEGz(73P_QVrU z{H-V&U&;5^Yrl`6eFtFQ?-BseB<>RwQ0(g_fEg+5bQ8c_YbCNF&`mi4!?^VE^;my$ z=!xqj(CZZ>TzUi4I*dSA)7WShfE(>ae-0zql!gf8@+Q4^DmsJ#!mNrop!IHm;~)hv zSyhx!3I<^5PB@HEu%J;uv+3&-aB83)N+BOb0AMxLg)j<%-qf@OtGWppppj*vO3`m$ z2#U;M>tu64a~?GdX`_bgSyf_VXe572FEWcMrth8tKAfjuE=0l^c-A^+1%z`Pr_x${ z2%a_eZ~@^&5$Gfe4~`|^tFPO}HW6DD=?s(+oPt?BeiB(d)2T~PMiMZGU==-D8)5wd zbgjE$d%ED^8Ngim-nlA(3mbr`#q@6i9?vxPp;N&mVf}_FpZcomp#c0T4lsX$v;*fD z0E~km2e1boI&kQB1?YNY^hE(pkAMjnD2ezKZgz4Q;B>tMG6~@5F@Oc@;XZVln|HJ?hw#J`PdxF&6aQM=F)uzfC2wAo z&!(#2ZqD7#`pDP&mC764%o~4}>Oakb<$r`z(3H*ZxCFHS{QI8)?sr%M%VI|%|qR?%uJVCv&d zuX!gR9ETYO)D|I}f_qP=I|kapHP?p$&<}xULEd~x%VofBy$D@>fAfC~qLW~qA}y`J zH)xrz6M(kN7hQx45MBjBv%TD(Y7HQz07@8g4y>XyYI(h-0MEfZ1I^zD&~pUT0lnp_ zPXe^p*2b?bxm!s&0_;EEM5`dO0J6EmW|&Ko=$+xi5ln*$^KKa$@f5UiR(aj4mVw?2 z3lQ#J@zk>d!1R$py#02yr#e875xVqo0G>Jlwf3~$4rUn(Ak)apHSi=bfLJLN-T`Ix zAh>zKdMv?FqpX3T8)3Q+(}+&D&u>DB8qvSTbU?(s;5@;ugc;^0C-v@IthbE3ek(uS g>5l{P#QzXK0N0fy$${^HfdBvi07*qoM6N<$f*UffaR2}S delta 978 zcmV;@11OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00TTpL_t(|ob8ssZxcxr$0yQSX(*UwiB3>? zSh;YA{SWM}hRxcfxJb?d5#{*wSeEO1$Gh<)&V|e5#2KpfhbBy41saEm@0CUEYZs-8+BpYBNmI$H}5B(!O3vx5J;~;?t zTFn#NceU2H&-!m-p90nadI)S)=P?fwvE1l-4!!Y#eo@6-Mm}+5qZE4k zJw20SIcJ_+f9~=ig}dniCQ*k4F$A`*pFy!d)%sXHpHskrp21M-YC0YrQ4!X)ei>}s zd;QPXbVR1ewB~{jU!R>ywfiRl;0TgV2!pdz^%M_d$vmtczb1hFFOzF708;=A|2i~O z6Bc+WuL5vmXaEPGUkzb<+nB*a0Iv+%+q=OZ z4j@xcOj(w@J||0HaW<*GAutyq33xo1R8_m(Mu5)1gUt%<<48Jgzl@kf;IkUj{spx4 zSdF6^0KY_8>t}fPgIYj}PTlijiJzoc*~(V-TZ}uk!`j6TTkAF*#M)ws`5l)wxYE6N zyKp0me~1jw<^KYlRxtie;ai8-T>LHrLL?Du>=AIdZ_KJP!1s zd21-30ejP}b6ji_M}!9Io3UMd6O0g%z&0-Lf8)`yIy4U85dyQo0%R8+SnV+@l$x@55A*vP!r5BBLNTRkXgU!xqzYEe2jjnwIc_BJt#SK14ZAw2}U?9 zdUrp9eh9p2VxbBhOFrx!7cK!nO1zvB*)ne>YhQNDDaQ|1uR#lBT zr!|iC$AOd*CAAAc@ex@yu$p!3afNK}RstPS&O7|Zp zzynS^g3tu<$0!`Z4&dY+R6)8TKLrlu2&(W12m=srYi<5RpyyYh?;r}|ZLzPn-V?$A zHg*u#`xx+(;KvS5NKbmG%fOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00EUrL_t(|obA-HYQr!P24ENb068OQSBpM~ z73A7@HW@M}9=a6@4VeR0_ADI>X$C)Kb+T3UP9~vap*I=y`ShQRl_dZ5`?}MM=?NCI zKuIyJ%Y06xQp&=0vJd$TSms#{9*mSV006hg57f>0c!UH3e=!X^M(u?(we+191oDkxG-8-#Tf z8$LnuGz>&&KH_?yV#`KM2UcB6LBj!W5rLtjGpr+UA$v>_TKgqR4>l3_)Ofr?PlAMS zK#yMtbQ6a_e{cq0qKQHv_<$hxJOlz20K8%glCq(|wIC@u=y}TWM@9t3wz$wS80a}z z6Hpo3f`FtUppHSQ80Z;DZ-InNxih%O6<`pYlL)9Q0RKkeL4}}iV{ix=Ehr*T-30x( z$2|^VPQZcajS3mfNiJgW7QpdDZ%X@ay)%a}#5LeDIv(Gb-oB0000(c7 zi2xt#f%P#ia|8fO$@+N$z(OGi41oyriqQ`M76?N0AprZBumGYG4+5ai;)!@JhU$Nb zKq|EBz@y-KcnF6`vf>LsFJB`}1FTsP3?_^iJSE^OC-omuVe}_DC!tA?PB6l*BN_4l z)Ix1v4IZQufM)|WqPGMlz-T}K&Kk@F^neATdtYAwXo%?E)v|i~J}e1Sa9Y4?z>3}` zTvVVIyjyYr=;BIibk;CT(YAzpkUf83-RzKv&OzcS?HLfJ0IxZ$+g2?&#{dlg39#v= z^a8LcK>&)FSO`rIHJ)_)BY+W}PjH?HJ>Uyhmah{}*%q*&hF9GKzSjB2JGKU<^$)lS zXt(0s3cRELQ-JO`yW4{Mfcc+zJz&-Xx1i}l1(ckf2D(FC#1wl<9>Vxo!BT&6N?0-x z%5((<%g&LgfV}U&1G-g2X(fv4>HR>IH!N)Bnih|%or+Ne)aYUFr3u weJ3w?WuRv6N6^RK5%4hZv+S(zJ^bhR2B?uCw(+4L=>Px#07*qoM6N<$f~El+LI3~& delta 714 zcmV;*0yX`r1(F7k7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00K5iL_t(|oVC<3Z`wc<0AS-a3nrHxTc^ko z6ESqR@1dyaQ~`e=Lpr2WHnxf(Itee$<{?XeLBwRqObk&Z-_kDqJAG&SY$`v84(XFP z3BB*$duI+?*1Lx19m$KS^H$zw!E)ZGb3F$Wt`O7Zn9iRDf8)NzVFJ_7Bw!E(V;dlJ z1>J)I1mgh!3r~Z-OLPDL;auVhJn%%j1{Me0%QcwrB@G5bxX4%}7VQ>xv2_x07(lor z&S5hM^#BppfW;+o3JwueA?5=Dc)$#pQ7tUnoA<=e(h=L=EtfeOVAw+GamCI-|~Mz}0u`v7|w00Ca%j7^?)=DFN`( z72qOyWH6%uFI!wBC3;5?tTY*&2K# zs~5qJfL;l%IzjbgQFrORfO8D+e+1!CFzm?pSXc@Te@p6OAZTVN!m+Ug~LKyiN1sK<1NNas_DtCC-z?fAAS zVHYF#RbIv_f609rHxI?e*UP7oTzj&LSnY9bfD$bEjH_y7O^07*qoM6N<$f~2@G1poj5 diff --git a/graphics/pokemon/larvitar/back.png b/graphics/pokemon/larvitar/back.png index 1a05a964ad688d1bcbe6a00842e267b4b7c5d2c0..2facd5cb5e2f791bad917ea1622d177705749ea0 100644 GIT binary patch delta 454 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 VGMBsl-E{x}002ovPDHLkV1nVQC;k8c delta 712 zcmV;(0yq7`1&{`i7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00J~gL_t(|oW+!}j@vK{hCL`nAFBhc2AOWK zeL$xS7KL_pEOhG_WX^E%bc1m?>nTgpK1Y_FW+;jZ2yBF(`IFQyW!XPl>LKv-*MNBd z=tsbF{^$74>g^&vUtZ-|wFE#|mv-?T6QA4(pTPUq6xfHsfB&MVC7|%$cPVfP!M~7z za}|CIYd{47O6wdNeor+R7&`5oYXunf;vV=+4xkd?{0R7x0(uFo6e6JBOt4!5 zuu2dCxDT+he@mt#pa!uMA2gJuzO+XVES0qVGk z9M~glTG$Dot15PaB7@YGxJV>u+Hd-%Kqe|^YqbEZ!6(0uO3-M?17`F)1H4~-RD#ND u_Okgn^dQ&iq6B?A4K?2h3`9--|MeT@d9QOiFdsYs00008^yeAh30Sa~P%wcCbuJ-@PjfC6n|1G=>xJrO@ z5y60Ti2!(!0ECGWT?6p?od9%^Pym+*3ivsa4)~S8fWH$^*8m{+dRKkjAOa|auK|BI z08~T*UKOw)^e2YvM-gf`d|`qJsQrS_eMdYuK~5dp8UaC<3Ty%3Gso|XtP-da^4j+W zfs$>RqmLo{?!mTA2@njHz-jb50_$I|ZAu7H6IVun>K6c%Ot>D+hd>|$yyi}jDfEvG zDF3$xoC9nj1F$6+;C^2uA^@O9p_G3Bss8y~)j|irNXQ1P01cr~EG7kTe>_%zp5Rd+ z_23JD6S%D0g#69M>-7-8vcG~M_$j3rEczCZ2~w7|o*l3;0OlPY%P~UIc0lVMrub`(A(T2!5r&W4#>Ch%b{U>}LpQ#$(VA2Ij#V4bD?h zNo@>qtiK+R38=-0*d?LAfna~Vz*Q5hhd>@m7!%naAn~(Ye(F!5HyvPvM zJ3x~|cMisM*U81dLQP$6qZW-*06IZBxT=%ha<;8EU?3n;Y+MA;X&gk`8Y9)wen?WD^XaWBKbQv%TrYBz400000NkvXXu0mjf D2X;Vq delta 819 zcmV-31I+xG2Kok&7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00N##L_t(|oSl`ws@pIW#tph}Q0UYtlsg9` zqYNDkmhsXp7VgmP4qXe9IO$e;p(r%V?UvF9D1C)4fi8uYk_K}6SG2V~>kF95o~4p^^FR6~e$hC2^xv zH2~((vsznKF`yXRN7Z?w?UqXd^g7c{5t(hY(?+^Ez-${oNK1Q&&0~}egyu<5B;UC? zAiAc9Pyx_sT5nHTjJ9iZhZVG;Mp~Og1_WhoumXttTYvm`PRJI2?0Xo2%{~W&MZ$p< z5M%TRe9vM4e?Z^&#z2(72$uk^+O$yufrl4ap)vrHlIRhT`{VPwyb}qaBwWaG24Dxm zGL#De533wV5)hJb+ubEV5=K!J!o2^wx|`i?-r{i%;z@uBFcvsZz^7H20eBsmGSGre zz~|c>sHIh{Z6PLM{&@c^w+}ON*u=+fy#L$e{*rV&e`H89ul(Ulle>ovT?kp!{`IeS zGkb*wq;?VU^LCvBq1mP#2>^uQQIiEIs0)jEh`M_cWp!g{ip9U8Bn^i+Muw0&+K#mFrZH3PS@KG_1BL)_Y zsfwGpe{a`wfQ(-WP^nHkY*#e%!aKp8T1v37&fzsNOCv3OyTJ`^QU&8QXHb*V)=`2R znIh;3pfhew1u{+-N?iaHaw|>2OAWjG*l0Jl7Xwq>b!#|Qp+10`bcuu_yq0b4244^fyZj!|8=VyGB~zlZ-2GS&g8P3k0T+0^LqVf1AP1( zfYrudFpz6!s3CkLHuJ~>0_r0Inrb7+hsw_gDut4O3iXMF@-qMBUFtCITM%J+znOmz z0e7-lM6c$BQg#5ilT2IQ^)vvOQRFvLAvztB0$Li40I=8ZfD$2yeqCtO%hxwkN$Xk) zGcD_y7FYwrS%2Cs0$53g0Gz6e)AgM_GhXvJ}2l?MA zLGl6Fsd%h!^^}07&%x01i7{UPj zPQXTx$y%f205HTMpjE&TkOZVm3Ala-h$PDTs;`;DjnJzrv+x0sBsS|H-35QkU(W=htLZgEtf(-#=%gSkDXro@Rei^G?t>9Kb_?9|5ofPyt#XQBn=PN4G6&M+D`-a3QGW90Jb%(%ab4#Yo*Hj zI-CKVVWRd)Q$P}4c;&tWF#0$EqXmEW1%SXtuxZ@_IncQPtO5mxA$KF`XDd^NFTrM0!r`3!A+s5bm1zA z`p8`6FQ$0#w9PLC;HsEKuMgef*d8*cOQ={h7XU1BguTPDxtZ=k(UT)iWAFcB delta 931 zcmV;U16=(62I&Wo7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00Rw4L_t(|oW0b&PTNov0ANRU9>9jckcp^t zVWBeeVj&rELy)WvE^!mVgpyv6ygFP=iDD#)Be|?+qV5GFgWM-;cLQ2F*wwYHiT{403{r+e;S-|+nsFuuoH~3BSgqEJm4qpc* zmiUzZ_(&C=%&I;wzc!~2-w8ZfZ}@yFN{e&(7={mzBOZa(I*SPCHqP1-)W0R;^l=3I zXR8Z<6?E(*e=4k9J&{t1aR@N=fl@ovZy`fZ&JPrH*!s$()-je6NUw6?@Q4?N+n0&F zqbhPV2as`Ex@?hPEG54wrtl{OhKmG!nQ~r8!N7$AV75y`832gIHnu<1^Z_&V2oW3au72bGd_L>s(m6v)az zJ<^x4MrUT@#1-S34jBdNBGwG*&WDxHl@6U)e*xhsV61`66+YhU2~Tq==&u07bDv`Z z&jh@6plR;2hxdCJbSY+(2C0C$qhoLr$mYFZzbfQz0=oMb(98$83T&Q(pjipF@^{hA z8uKaE%T3nyc1!}e1YPxi%Pmi(Wtn^Uh>71?^Mb002ovPDHLk FV1jXppIiU{ diff --git a/graphics/pokemon/lycanroc/midnight/front.png b/graphics/pokemon/lycanroc/midnight/front.png index 1c4059d90327e505c82df2494ae9bfd2e5255fd2..2a792d2afbfcc47224428f54bdfa322315498bfc 100644 GIT binary patch delta 770 zcmV+d1O5D%2gwGI7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0008GNklAL>Ud^Udy zf@t5#$1|Oc!f%cT=6n4lVW6K&=NUj$7Mb56SxJPDAT*#}Wl zJ=Y#c3j*|GCsdVr)%@#8No&Vr;PHPT5<3F`^s>@w0O9g`0_f`uK)-(l0s22i3hM)5 z3|RGJR8!Ttr~p={$swI^4L~+3|Ng0-ew2mN5Ofhk*CU-#P7;8M$a*Lz44__)Kd`y( zh&m)Fz&~td1MlTXxIi=yG!5D0CX$ZO{OWtwo>zcuv4;lLY4se$yL3V44ByhIZv5sS-;219omEG z14hPs&>5hi>i}waziU7&hNYY$kT9We;S60M+cWV*d0NhFQWtLAUIT)q3J;{0 zyP1v5@l8)Y0dq?4mOEd@1_V{-60dnKlDekOWzmJdSAO27)WHDmxhX4Qo07*qoM6N<$f_V&J AEC2ui delta 849 zcmV-X1FrnZ2ABts7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00O*8L_t(|oUPT*YTGav0B{BC0Typ7yE?49 z^fE}$VZOM_7ti2aTG|IF^*#pbZLbi9pna7dHX9RAkD(Nz^PXp)lxB_PKf6q{P$$2B zf21!8WB+SSr~d!~XUQN45UXJ!NB|5}KtKxY6GF}?2VSG>e-Q!7IRO-?dkPU)2?u1= z2c&R0dO`%T{ci_4I|+nDtPyu*bO?bji#ll~3Gi@Hy+Z*yTYU!bNWUrl;pYgjh^fLt zZ4i_LUXGxc+YT~y2Wo{~Ah9`QrW6r?HrRDh(c469j1KUDUc9?}XJb$iI`*m*ziQM! z&m)%uJ3u_4e>pgv96i}GA(f@}a)gtwV9faXhAN<+TzglQmZBi32?jF zUvh1%FseCJ;d|yl1-YgW27D1x35#>AmIkyH3s`0|3MsA!icmQr&eJ&*wlfLC1GRx+Bszq|Ej7r>@vJmFhg zC>0^6`x@9GfXsrY6-|~m+^(}gtd*f0*-G8!x((sx8Ing%$- z4!}`re|)guR^^x_9(X=6>QPres7nvT7St$9IxK*CEzlbZv8Lx-ms11wY`+OiizcvL za~f!O(5Y+#_h^NUoMI1Pd&#U;jGid53&Hr?MHke3iQPcy|>W1qfUa2%Kis5*#_4u&MCvAGfO`8bRY zKDGAZYJ_0?l&*o7mr}es8ndQod=sQs<7o1V^{+IHCSf!H_#!%wh5+Mdi>UW|)Ggq{ b??10UpfPL&sY=}y00000NkvXXu0mjfa#?Ej diff --git a/graphics/pokemon/magearna/back.png b/graphics/pokemon/magearna/back.png index c66e5f3a8f33493fd99866ba35018b0c7434b240..e29c4ad6c5720e3d15eb45f184e8edb0f8f46b55 100644 GIT binary patch delta 589 zcmV-T0&vtjJtRzn zd(kjSB@DtG^hJXlov?4)-iMXDFd9Uc;I?gT{r;+5-Q|+toF)wYgjnYZnlSTM!Z3e9 z5iaxZ2{XX{R6qjYJfW7L;=oc#Knb`v@xFvrh1;X|C^cd;UcxSyPyy=B(D*X}`fvx( zmCHr-GXeT=p2N^jm!SNK0M{Gv9KsBM&^CJ-7y^zAxcHZgMucsRBf!YsA?^S(dxMw* z?(B>Z#smQPU@wfijupV`W^uEE)S-U>$&4``!RAk?F(MTLa)LaPbl7Sr=`jYbKGbU? zpb$cu1htc^2=hb0Y!^Qr-}wn3)&gKcus*~kT>UhQH-O+804?MTLP`a%{JD>efRMz? zR{*t>gQ=77IF1m@?%BMZKmgM1VsHxt82AYg57ILLhJeyeh6;K>nUNI`{9k_n^cHr2 zdb9vYAiIaKS^y6|`3ZoKb=E@<@%iQgsCHqTkH83M{e;K>qkl#)&tQ>_xhK3RfV!ba z;JX53TW$!!)B(z$k`dKv8hc2@9$^uKn+N$FDdYDA$cNEqgfA!gYvrF1SU!xDiSqjd zC-;$1|8-JodiI~Bbbj_D?Q%J{1gyJ=cli1IBqfAX|4{b;<@d;TMtD8$?OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00J^eL_t(|oaL0UZrd;rhUum97$Z+$_bkahq@Z?1%DxgI>73j-JARz415d45$Cw6K7mLd%PXn~_o(O>;?}z~CHiwH2>RBMg^ev`TB1E05*fAm{LaA6)co6eh-<{+ERDa_+` z+XHrI0H=Al2w<5-3|Rjg&{}#x#sNa4%(Y&5V6XdoM&@v0l@;REk6s#1hq8u;M3@+` zQl0>y-vGfA=&j)MC_r>0v4~ZGQPe~c?Gg8+Cq6}nKi~rXzMR0G+?r<*;41>pQQ$T01u20R&}n*aa+07*qoM6N<$g1G@N5dZ)H diff --git a/graphics/pokemon/magearna/front.png b/graphics/pokemon/magearna/front.png index 18e73e31a0e181ea333781fc91e3c7b1d320d831..20db67ab6ed5ad71c820303e1b0c44c686c436c4 100644 GIT binary patch delta 757 zcmVK_H?Cw z0B-k)x-!OoWe71sa#O^O9_mU|#PL~-m=3!p1lZRh?t~Dr(_a(b`ZwXM|1*I2Dg=L~ zGvTDamVZZ}xM2slmph^{P;$md>A?aS!Ey&lpAYm4lmLw56f_%z zrEtw)`m6+;&cdGo%mVAn61cur1yFyMxjr->V1*BLVRZ-Q%eV+>1lCEar};)S7qk&q zp9-WK;(iRN7{*IgLtS1t^Dou<58i@IUL5H=d7kO6-4DLtr*% z2oL;kVVm3aK&l%@q$W{k$$nBKTXB(3XP}3x!&tk=-ii-s&#J|8w=2!_8jvdwE9_l8 z+E49h!&0zWN)0`s_nh_zGY-_U>Y*M8Cp`=kC<4IlKs@w%%^Cw}05QHJsMj+)9wLmn z@J|M!U;FA`1AzU4a!$c;9xs0YV`(HvT@hlhA4&q%kW)}aupD;!p)|G{1pf(XuY#8$ z*=1n>VBc-aRTK6q)G~~02j6x_@x!SIv~9Nln;hnVZK3AETfJ?!7Y*JvA_rK+F|j2wfDmJ?X*!XAwtz774${4^1rNnl&$56_oeqp zU_nG?)hCZgFL@JsClm>sLa-C5YU{raqlY}(wQ?Wv%rfJDBiKqMc;E8j#q1@4>&9Vs nV`8ZP1bAluAF%MZ$8Yup;B_I`?|mC&00000NkvXXu0mjfSFUIR delta 867 zcmV-p1DyQ42C4^;7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00PcQL_t(|oUN3R6>N?D9P&Y-;ke(84>U(InkHnSugy z3NrYY*y9~|_|->D2DD)A^Yt&m4&-xC!Z5^{Wd6c?e`o;B0ZNF294fT2wD5toSQuse zIST+sod!`9VTgzYjg&tRsBOG%438+rB;%-^UP2hHC2FuGqTJ^PY=!qXJz)O$iK^}v2}ENPP$y|e6KJ< z%}Ifpe+jNps|aG8rBKri2WnSDHT=#oZB+g|MgT#UScHo}ZMXvMJP_ErQ-%wWRso_c zv52ZuwE(LC-GO=@04O=GQN}9t8$elZ&$R$>$?N4|l639IIMDX024!_C^ZSEAZizho ze%GK-w{Y6l27^H_cfHnMeanDBYP}@M0Z;fAbpo!HjZ7i{RG!%2xmJ>n6au+MsWC4( zU|-@%=FbCUop0TIG(FFG+!IAWiKD}d)iUiQ$zdG#L_^uxRB`y#P9hdSi6&{|xVKUb t*$Pqdh+54^JoSG7nfJc{1fA;GtDn(^AFPJo=HdVV002ovPDHLkV1l|_i|7CV diff --git a/graphics/pokemon/magearna/original_color/back.png b/graphics/pokemon/magearna/original_color/back.png index 7472bcbace6cdba176d4c6526324c88131e3e339..cf9c0e3236ea05912ee45e60ff7f9cc91cf92960 100644 GIT binary patch delta 595 zcmV-Z0<8U=2Ac(t7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0006CNklvDu3423tkOAwsC|Km0Z7XyOE>Cf$%PF0fg5g_aMdj0Fm1VuLq z)8JY(Oi~GhumnFvgB+c(F3Z}7mAfz+M3?Yh7HIvSvsN|BDdGLrgrT1iFi+5gnZJJ$ zh6##rT7OTN0oJ<$2!Qj1T7rr@kxFu$fNK-)O8^yaub&U58nGEK;dd^f0@Tc|@n?eT z!yQ0Zo*t@S2(Az3H4Ody=#-xb?mU64!OsBb+GeMLAz;gZlmB(nh_FBy0Y>%?aRr#! z8^j!NWfw$ZOaKmV?1fR!u>$1WEN*|1Pjx5&nK6XT+x(Oo0&*cP-Jpz+Hd_rPJp> z_^1Hxh8}^>3P`WzhTu&dp!}4Ks7}+^LrKRcw=kr6P<|s9U+Ss=IrlwgL@YNlzL)Vk zf6hcXK$$jkZwXKumr`l(xoAJSKl+j1a+d_GZ;`mu`hQ4-*x`7)TmzIpqSyry^?1Bm hL<9J#0yE$%^$VMgF9Sz3*j4}l002ovPDHLkV1kLA5rY5# delta 725 zcmV;`0xJER1)TOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00KctL_t(|oaL0UlG-p3hDBvcYp&o1Rm{CW zE(|Yl<2ML)+B7yZsi4Sd0yCLQ6=JGXIZ7%xrE=n2*c(e!fro(sZsNEm zoWS@&zt9=QXCib0(ZEdrcJBmCis2=IDK3FmZUq3QP5^5dKg%*5NeBrrkQhI@vk5c% zi>FZY1L&#oBWMDFM86Hex7c-{m-;cbKx)#P1dt-BeCQHeNNh{##7r*8tRIh~!RHHL z^3LwXBs~M)e@0b>IGNVF`B>G62AdkV&@JHtj&2ACXy}CS)Bz?<9lqr;t$-xqEg7r} zNi>k~`OA|Bn2RmX-V4s>LWu8P0Bj{?F0KFp>Z(*nB-%ad6f1R9N*#sR`gAh?p){a= zim$#VyP{N30igXAV5bZqi+uO&0rE|$D@e)u9-zC-e^(L#DGRw5ZQ$cNXQ)Yh6ykZg zY<%fl>;Pa0FaTcG>lUy%131myRRGKMeZcDP0O!mC%nuO4Sda6W1-86>W>^oeHl0Z3 zUs^IDTBo#!;}AYzMlAtAy8*Dk0(2qwUV!jAMc-EeMo|$9Z;yB;Eph7^0@2$w<=ANt z&bKc`X9w@|fK$!`v2pKuQ-R5{fIkU0BWF?-O#p^m9>ZWEixAi97`l1~C#((&O638E zS*k;$0v;9li=Ixjq_`{_z(NDF6BsjV8G3+E2>kW}|I+>dwQG%q)ENmq00000NkvXX Hu0mjfc(*VD diff --git a/graphics/pokemon/magearna/original_color/front.png b/graphics/pokemon/magearna/original_color/front.png index 4cc57d909e9b409770f39b82c95aa7bfe8750a97..afeb78daed2f647ad839d3932ae25c437377dd76 100644 GIT binary patch delta 763 zcmVYXb3Wo%b&SIe*e$6At}Bc-Q|K5afR< z1PSkiH~qEzJHkgZe*)ag4bd4srj+stFedMA#4{k8dR(p+Qw$vtJ#MDd(5Dn*Dy0xb zyP4A)fvId87vcm*COud<6;}Pmn_fTAFPuA|D1)Z;F}m#7X$tUSZbkDECu@)#KNuc7 z^ipUx2&C|l82Y4yGM$A#14JTxFNl8tS4weiAHoOC!L#K+9hfiU5=kS#PEtM1Z$!AD z8}XrafIiOyG>w^x8GW*o@%|)1H;{HSPiU=$iZtAG5=o<{rFW>oj&?TL5(v-dvrvak z0*dK32Ekw>G0@Rf1r?y}i8|t3*~&dYrJEVS>7oQtfO5nRHj$h54s~e+eYAg=wGc$$ z43!=KTi9^h^rgKxF}5V?S)zaI>~fh;V-yQF1nfoJWjmlPtBB?9t%T>$Yg>VGw=A}+ zNB2{2Z62Ry>)O#1`qlT((X9sw0Yd`+(DN`MIL4sV0B+aom^B8_0GvA_Xyci-2mLnY z!jB9%8~fU~0l;fOc~8M`9xs0YV`&V$o{Hek`k^F*7V-*50&;lL52dl!AlN6YuPRs> z)FmDP;MuIxp=!db3at#fr*DTP@lE4vt<0yf(-IqMy#*j}b)e$q=`I}VT5kspsWk)x z=))Aytu~AKw!=t{iZ}puHxWri=kV$U0$F5EPK}q<&`+Or~(5R>#4V zhkOK}SwIj@MD?3Rq(k0>-UwNz>n#Lyq^52EI*c}X!C3h^;zi<&|DAx9O0Z*Gb}wd! t1Zf>r%#Ddd{a=93?EeE6`F8ouz5pwWCtV2=PecF!002ovPDHLkV1l{BX{rDK delta 896 zcmV-`1AqL&2F3@F7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00QbsL_t(|oUN44PZL2D$9Flfdt~8+ZA{p$ z8Ur<9E%jnzLTBq8y6Vk@l%k0VEk?Fd6Eyx{+lvVY=l~v!2Vps_7lP9ZJ?Nn$hhCMx zK;nS|9M`v7LAyJX7~}M^neV6H_ukCBCkTwCC`xowRFuBce=k*4BZSzmYNG)m4(JFW zwJ!wpClHz(^}hzjkiUjP2B0Hj68IHX^Bj7%0cebz;~B`$-)ZE7dVSYk;-#RsY4c#j<;9S3a+xOIw8=jM zQaRafBoEqdopX?ayxcx)9t`ht%M_lCw5Uo3pK^g}>7EFT5^kBZ^<;yd|KS4011fayfAGrp_y&#UAO`JRBJTb-8l$ZU zAS#qnMQp`(_P>$}QLJ$L$7zGoR@|~I2w{DBYrrq)^4lzf1WM#k zr}q;kf5W0zS3%CD{NbV-3?QFL`9LOt#Du^crp$Hkg%hBi$`h4e^LNM4ob4|)D2I+kDWk|0>T1bx%TklXN>I{D*{+-ZO(jp z&?-C5rft_)kFvZZ!Q+?84%+}Mib4sVd&T$QjSy)Edc0_{U;S@@r~Vf}08t8U{R9C? W5>7P+eHhjN0000dPHC>(09Sxoz)_h!=UY zQ4ub(6wy@*cZpS~s}zo4Uhb6&i=oQAXZ%)#Xh0PLc%+$!*8ZJjzqD|2uGDANZ}BWILDo zalL{+MVq+;^POieZ=VAc_f_LN Qv;Y7A07*qoM6N<$g4Vdbh5!Hn delta 445 zcmV;u0Yd(~1BV2V7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00ApWL_t(|oXwIkPQ)+}MSTKB)+&_Y42!jG zQf)&KDO$OqFiJBLP4+xAbX#&0E`c0dRK_SIWy~%}>#-{ekeJS2U*F%J$Jh@Cd?rkH znV~B@3)D4t9wc=^?kBAe_6{?R3u`t@U%N5!iU)%bcp9LH8<*oWXk5%nI;O;*4;l3Di(*ut{xtTH*yJfqLP+` zAY#9zf-SmU^|YxnmzHF(Q5olIBEWSkM6!vn5`iTXc(y9YHpN)J%U_tR#PQFvOJ;to z0mKGadNvUoPt0QtEst$aI4l>*Y=%Ss&vEz!&`P+i3#COX00000NkvXXu0mjf-`}nO diff --git a/graphics/pokemon/marshtomp/back.png b/graphics/pokemon/marshtomp/back.png index b04c6cc5cb6d34a3c5d5a6b430eca289d64ccb06..baa4e481b4c8145615246d5c8c23fe59bce9d0df 100644 GIT binary patch delta 569 zcmV-90>=I91%U;S7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0005-Nkl)#XsAfhki z2iG2fSWVFZcJxV3+W;i_HUJ{u1*kp(HucyyfRf%GfRg`x05txs2xCOwFF#j_42`euv@No_^`L_tGUVYg0Cdc2^dS?tev;N|Q$BWlDd5OT% zCcuZTLd_6MMsHu$5rN_)sS%4r^x-dAAG(Sg0a6=;%CrACW`Wb-#?%dh4xN7`%L^bJ zI*0)d@6_3PtxYC*LAcfc_{#$55a{5gD?;J$l#?u+BLW@b-Vg*JV-f@0IU>-Z!?Y08 z0MAK@`5qC-L?{Ha0|lsshEMlGyI~#x00000NkvXX Hu0mjfeRv5w delta 676 zcmV;V0$cro1?&Zo7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM?|Pl2sV-c00Iz6L_t(|oW+!}Zrd;rh9k}ya+Dt+qLjg- z!xyN8bAX^-3Zw!u1}HT3X$&t!`x5QS46Qc-eyAQ#luX$aJryNj*zo`9zyD4oZ*Km} z%2WYqU2A=p&`Z53;C>k(9a4ZGJqeVgrvRbB0Wx7A0VFH}e`Jsb^34^XgaKH}nCWW( ztBEdi8ZybtU6ybakVzoZ1Aw@&9|XUr0ui_I{UG@HiuCR+0gyr4bx{jJvRo1H(ti6B z0}c*A7h(JTXGFi8w>b%o6Vlx5epf1`J zdmPvES^W#(lQHN1ZdDV2aX_4a=SYRQMa+OKsUmNhNs+cQBA-QVzdyzga?2D4l!B`fWJD(NV#!wh_Ayq zg(?P%HW8pN`4rYDhEeg!R*Jd1hp1SbbG0|Ud{?Tv3HR@>JLlmz(&|3?F76*o;`U|^K+ba4!cXni~7Vc!u2 zj+W^gS!(}_#|5rF)|LML{?j>2W^a34!|Gx;e=!LBSKjqC+I+W;+Jn7+%fydKvs_Gg zzQp%XhTc2drn*~}hxa*3oNfN=?)3HZl|M`l#`)J4DMx+tsaFy^z}J{{jpbvV*9EC) zmaMX`(k(2J3>Mqh{CH41L)he?BvbgiFkXXShr1r6O+9jSoruP)=9Vwn43Erw8Lo$( zn#?3%$Z4Z$!mx))=#bKiV`m+B87vuHUu@-Hkv~CLqjJIR1FQ>K1>P(2UKGC8@Qp{T zr7MHQ;C4%0%u6Sam5$!ZHheQKUfy`~Yy837{hY}RY>lrX#TM`<79E=3U~_(#=+XX6 s27ZT`?01`D+$AJ){9gjSx__bm`N=|-5}PkB2Zkhrr>mdKI;Vst0GSD-ApigX delta 431 zcmV;g0Z{&_1Nj4x7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00A9IL_t(|ob8fLZi6rog~6L{<3{W&s}{;K z8gYR(J%EWuxksf6I6+{WjWf6H*lDm`oC~zP1wy=!H_tysv1--7mt<`o+oe1LfKdGe`fdsri+23glo{4di)7}gCmAZ4)9U>lN{kAbUNd9 z!8F#~f#@;^L8J#FHJ)lBAJJwGy@U$!q;4~+B_OxpzwCH~o+|`E-tTHhq(aC1?OyeV Z^$m{ln)|UL@$3Kq002ovPDHLkV1kNgv5f!# diff --git a/graphics/pokemon/mimikyu/busted/front.png b/graphics/pokemon/mimikyu/busted/front.png index c9c36c1f4eda069a6acc380acd062b7c52739582..09e78fac909396e7acd4d1b81f23d284b3fb5f7f 100644 GIT binary patch delta 415 zcmV;Q0bu^B1n2{h7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z00043Nkl$CX02NWT zMufS?0pC3!lg3g+5Kz}13SwP-uG~Yz9R50TutVg3`G^5V{Hoiu05&Ma&cke=DgoNz zKMvL*MC==#1JHF<48H<`VVVcQ39f&3#P0)IcEH#40^)$hZ(XbXXdJ$fXg$SBV7Q@7 z0mW0`O=$ntN65}>57}}V*bWAZS3o_>KaWE&J(KV?L$4v2ANQ9Z0M0|EgAwByWs7s} zMbYTe97JU&q(;E@hOzsLP9!sd$?ya1sN9S8i@9lj_3GdB0sC4B%1QM$7XS+Y002ov JPDHLkV1gh`!h!$* delta 480 zcmV<60U!S81F8g&7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00B-(L_t(|ob8jba)U4ohA~T55+9j419xQv z**rk(7XV849u0G^OPV*x%+lj+E76RyGj?eHRiE@rvK&PZ{d0-kow$T72uOe?6yHG* z5ESpU*Fzj8=gi(6eZXOQciJX}^OO+NtijqOE<7dVY{9vqe~x110l)$&@wEt;e+K{q zfjtmF9xeo6k6PP|2jZcZZG z*k-`gxLSE&a*LyRwSE_zgMh7s$*NDq0(4Gv4eF9b+{GygIj$K!RxTaaNCpj=?0F!T zaMQ>G#SJiKVdJ!DS~cLu^Yk$8M+9={JfB7>r*MR$G<<=GzFQ7RDIf65gu)N~t$qNe WQc{p8o+l#!0000;}i$wYh&c&x!h(wRf>!3;zsH%cmR;E>|xd`QR*d zYMFt;GKU$4kF^Emm(D&SQlFX{6Y1#sAZU(5uj&rxSBIwvx@Xk!pW9mKkl)R6{IK$L zcDwS1CHE^itnYl#RIpvDS`MI_i&I`Bv|K6qWMcpwf=-5{!k6rdZ4LB$LYUcND v;;{>1+4&OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L007QOL_t(|ob8gq4uUWYhIxa=vkLEjXQ*U3qg3HyWoM#oAxIDo-^l`HN+UmG}mLohhZgf x2z)4;^D#<8Q}jvc>;%)yvgH- z#|xt6UBa)h=PP04eI6+#SD@rpSo0^LtvPp~Yy+uSwyP1)N`O8OzUIc5^0&ab zpaOg~15$u7k9J*_fx2L8=~jZs6U~5mldS|D7zC}x4v+@SB`5&VAv^)<=zuy|w?G77 zK?iDOHvsKj{0b;_JO((M^)?6rK;D1HGvJ7uK)C{Hx5o<*CERcC12`(MCyQ=DTozgvH3WKmRQNJH8VR08Wb+ zzcg$>zSP$M<*QhY=Q~&s0QD-Bjv&$E oB#$xLhS-wgHKBgqe#gHVzm<0sRa!{givR!s07*qoM6N<$f{I$t*Z=?k delta 528 zcmV+r0`L8Y1la_T7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00DhTL_t(|oYmAzQo}F|2H==Q)`_94Yk{+e zzy;cHfM!tFX$E}%BM>`LBfruaR-m2xe^ONUQ51i*?qI(S?%UT*A=)+&0Kot&_#@la z6AzsgY{YZx3DI?(Kf-lr4|E*N9q;?qPjzI^5c9dG^H=9af4q5M8u3EsZwHPaCqDA< z)M7OsOVC{ppBgzh0H6b+nt&^f)KN&A!`!hu5da33jtL0e@5c;qF9?klf$I{2bqK(7 z7HFKVTjCk02$Z}-Y6g}iO5P!11v&y?muT_;92nOlsu&cK0cb)nb&NNFF`J+M(CSpzNmuK3KjmhCo;Z=C>hZU~Ykdz!+zI z$Lrh3J%P5&56C=Y9pFYpJDP!k(u6>HxfLEzkC!4WZw-Blavxvs&;g$ybrs&{a)Wp^~wv*B^eJ&KufNBB!pQ2KsAJpi?*fzv~BV9jdQj SsY?<70000JLlmz(&|3?F76*o;`U|{6-ba4!cXni~NAYY3D z4{Pm~2`~QFe+au08+^N~=vIrR^<<{5%O(;$vly)YPFZn$`IMmZJQEmqxka$Q(0o%@ z{~)(<#?D`V%qIMNP|3)Uy6}~yJx_;j9`75QD)CioHLuJvDCMjd*`j;++EMW+u8H@9 zI{t2G@S5jruW@DiG(+jeqGPsxxBhxB&{!n6jxpDrb&|f@pPf@2`os%aY8nby+;(!V z;bhq@uv_}fhwBUG#rn+un;pd}X1yV{Fs*5dJnNb0NmK5NM!aLX7C7P4UtgaTIaSU3 z`~i7ZZo)esbXv@0{lvXL)9%T_U%NMQJ0^Iqk!L>eGxWg>C$95J+5OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L009w6L_t(|obA#vZo)ti1yEML0F%f_DKkJ% z>?KmlI7?5#(p!)zd>=>R0x5jTED^yovv^4vDNOsH{$E)hjc)g653b|}7imyny29My zGzl`q^hWU;klM&xh4_{N8y9YH!@$x9;fDa^e(8@l@Fl?if86#do%?NlVZ`*gC)&jz zX9YwQRmcKeVF2=06sU>||-HLOB{Ab?<%0LKoya%`hi;FD@Q-|$C7kG!we9Ng}o+!qWy%X9TFgNXnD N002ovPDHLkV1kVwr}h8< diff --git a/graphics/pokemon/minior/core/blue/icon.png b/graphics/pokemon/minior/core/blue/icon.png index bda398288b55a912dd1e252310dbc5e3b3704a18..0dbb8fe0e71defefe344c7374e6e101dea9b67d3 100644 GIT binary patch delta 282 zcmdnb{Df(O1SbbG0|SFkK#zZb zYxh14kN5xozrB)@ym(gcA-Q8&iu&JGT)fY1i!EK%U~YMN5`$s3H$#B(CO(GlsE~4& zl=Bh3UP{GNE8Q9!N^|%Z?Z~`iZ*+3%PG*-$5B_pwFg)U}tTzu;zPGeKj;|y)f@z+4 z!*;=zEsL2}{>sZ=Bx|<8I_bDv{EVyr_ZXl4v+DoK_pg#?|H|m(|NHR${Uz6$pD*n9 zwe#6rAvVW<=hs8`g a8HE!0zMW~W_yzPIgQqK-pUXO@geCxSMTxHf delta 373 zcmV-*0gC?Q0>1;07-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L0084jL_t(|ob8f5YQsPfMs5P{Im)5u8EZU z$Ib$h0XSQ51Y$Cg+a>D~sbn7VpcvOC>IF$KzE}{vj$bQyf0x9s63q^2{v(*4(35BoxkFXyJ=0Aw4vT@Z1oU#4T$1k^F)^57M` zf{8T+!QKKdz1BT<4$OV1fJB%jRX<4KS&cB{kV2#K6c@FvFjT%z8)4{oh4}$C0DVht T&YBMZ0000<2SrXqu0mjfp0=9u diff --git a/graphics/pokemon/minior/core/front.png b/graphics/pokemon/minior/core/front.png index e9dba883a1ea69f5a43138b327e1b604d7a7202d..ab7e8961565a3b26418ef1106f30530a2c94d93c 100644 GIT binary patch delta 381 zcmbQja-4aB1SbbG0|Ud{?Tv3HR@>JLlmz(&|3?F76*o;`U|=-!ba4!cXni~NcHdzI z9v4G1y`TT(w_qr-BBPL}rO{qL(zdRrxVm4@oAe_j7x>GOSt$o;G{>X-v= z#Xs1kS2}Bcl77#GFXrF3+cjA?1qCmy&AYz$|Fl@nIUkra-uk@N&T#Z#IPm$}j+8I= zIJi6n0<@SN53i4ZtII6FRJm91*awRR=?txV{%|j_XOH0j#nfQOxL9?ioJiNayR&x~ zus1K*{r+L5Uy@z}6J1cVmq=MR&l${$TL)W#u@cW?)ndDafbWc_cz!xoZPh-2;zS+ YHgI$Ey82E?0fsY!r>mdKI;Vst00CsMWdHyG delta 458 zcmV;*0X6=|1C#`i7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00B5jL_t(|ob8iAPQx$|MIE^Zz=%|0JDu)J zeFEGuVhi%5bY0{dR6RkZT!00)Wt<>^$TV3ad{(E6>Ie`4D*pF2S5re@;y!g~RN zIAbp(ge9fe@T4~W+8)!;vdQ+vkJ%< z0`_mABuIvMT+2e7WSWiocP!+%Y)b*&N!xAvl%;kSAgix!EagIQle4}r79W?nlfME0 z?H;6j^v0_zX<@ao-uqJWI`HeG*8s2N&YJZ{Ux^1?yT9UOp8x;=07*qoM6N<$f(U)O ArT_o{ diff --git a/graphics/pokemon/minior/core/green/icon.png b/graphics/pokemon/minior/core/green/icon.png index 529e6052025d649b51f16f09966532dba9fa8379..dc36402deb0af8d08658cb0974b10bafd0528bd4 100644 GIT binary patch delta 281 zcmdnN{FrHi1SbbG0|SFkK^f9I8t6M{B}d*T|w(_KMt+=_k3>Tv+%$Ewc+x&uef{Hyx_0@zig|V4S#J( z)rofTUl!}xt1da0p8s;(ncutqh~rdw10J(aLLA(;E;!q+zHnS3Rb9ZRUWc_wUi1X- Zf_K~;U)|Sf0KLcH>FUSovd$@?2>@5pg7E+V delta 365 zcmV-z0h0dX0=NT^7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L007)cL_t(|ob8gkZo@DPMg0f-2m@UMl;YY9 zRlNqNB8~|VOZUr*tPSjBt?J35ymcthp&Sn`A0STG{qdsP2F$xnpm$BA+%HcSkPN`V zf)n7gi9D`Jmq;b^kOsxLHc>Cgf^ly_3_5&-)z?=7v5<15L{V47#% zuwAfa>tZJ1pLzL z{69Z9$v^*kz`tt6yP5wgUL?Nkw^;Fsx$U4^98;pBY}JZ%(O(ja->@{j>|g5eVKLKA a#>_gNBx`%_$w2=xc)GIrxvX@Vz02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L007@fL_t(|ob8gUa>FnXMg0dmnh+NSn1pqd zMN8UmQ%$a5DzYN!x0Qu8u~A4>BWq<=(3yfPJahLkJE!aZdC_$P=I2dd@J*!L-VPR! z^uXSNGvK0$+%G|wNF{S0dd0Xl(IAL|@zsKybo^SuP9ndHe={>u;-h?+wVIf-1wOJg zmrX7!n%m1~9@__$*>65VrF+y`zxIU|U-nJI2?#cFzrf*Czf9+#5vXIxhdwEI1ruw` zf)@*t3|jZxI5Q8q0uo`CSp6VHVl~2$N6d}NlUvlb!ch5s+6Y5`E6fjp^JtA)LN4F{ P0000#zZb z>*}U`U;q8T@8@e~w(6$Fo5VF@pNjmQwmiwX9lD&WVluZr=LU|gEDT0zuNgWfxt6*+ zeD68AMa4*cZn_9Z%du|?U9*q26~Ud)76jFWt~$(69DTmhj{=1 delta 369 zcmV-%0gnFT0=ol{7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L007@fL_t(|ob8f5Yr`-QhW!r?5s1eO9x@j7 z;Kug1qypWRq8jx6-cA{t*pRWRC+p;`Lm@+Ne0cAJ5P{Im%SzKN9E$I$|k z9ynNV23$6g`z7fTsbua`uNc=R8U$G|zFH82j$bR-N#-|ke`ZDq{4DQgtp?_3fzK?> zWs{4F=JxU#$Mykb_M4AT>Hcf2U;9FfFNdb#1SA`|U*K@6U#4@?4Ae2?Qy&z(f{8Up z!HWe!2CaK;9GQn$0f{h6u6~druo_{=BgaPN$t`MIVW@oXH^R{03iAUqx?SfX4?xlY P0000#zZb z>uNi#z5oAj51!oHn`OpTEwQ?F&z;Evx|X-guC8Rd_vDZ_la7-vV?)nPD~3fWfp-Nj z*d`n4cAoKkF3HNYaHDOI zaL-NPRv(wolihne%WfQa*CAV7lNk2@^EsW*tN$(Ex4J*~)nZkOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L007=eL_t(|ob8f5Yr`-QhW!r?kuio0UIRtF z@u2<9sYV?ssz<$lqI;l;JqD_JvQFMQ6f*S2hxa}>p00cFqU#3CPn*Etn@G8R94#Q} zfrABSz-1G;Uy?47O6ETGig9hCL68OGs|7LW__czaWPTH8e`bWh&+=~8YG95Q_{`E= zHo2&1ZZDs4Y#&f&zxfE2?!VUhwJ)^za%dV(K(dkh1rDeBWjZI#KpjIq^+CZam{@ZZ zyjT!q(7NZwk$H#}kO;Hn>IW$Ts}Y7ga%@zd+@iJ>hRXMTBMkkmFh8O&dJ!?0ed+)J O002ovPDHLk0$_p-3YC`t diff --git a/graphics/pokemon/minior/core/yellow/icon.png b/graphics/pokemon/minior/core/yellow/icon.png index 270115f6807b85284596a9f7fb53c775eebbbba1..b0cfaa1c3985f5d6014157fceda8787e255a6898 100644 GIT binary patch delta 281 zcmdnS{FrHi1SbbG0|SFkK- aIs887-L8dMYk=Nk@O1TKby??>&;$Ua_lKeY delta 363 zcmV-x0hIpZ0=5H?7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L007!aL_t(|ob8gkZo@DPMg0eaka*5uWG+;4 zZjnk{Q>fPce{{&)#LisRlSO&!P#{A&9$Y>^oUVKDqU#3CPn*Etn@G8R94#Q}frABS zz-1G;Uy?47O6ETGig9hCL68OGs|7LW__czaWPTH8W`w}cee!PBYG95Q_{`E=Ho2&1 zZZDs4Y#&f&zxfE2?!VUhwJ)^za%dV(K(dkh1rDeBWjZI#KpjIq^+CZam{@ZZyjT!q z(7NZwk$H#}kO;Hn>IW$Ts}Y7ga%@zd+@iJ>hRXMTBMkkmFh4rGQlqdCqmlps002ov JPDHLkV1lZemK*>8 diff --git a/graphics/pokemon/minun/back.png b/graphics/pokemon/minun/back.png index 1e9d01ea3cd8039a67e104c792fa50e555301df2..f8b11aba90b7755feb790c7471b60c8af16b0802 100644 GIT binary patch delta 501 zcmV;Sri1~4Mvlz_0b&;SzQxfbg=JP3aQz>I*)op2{~vT(h^5nxWJFUNp8VPpX& zfGGjj1{y*L;Q_$Y1jvM_5B>>I0xkdtVg-;!`kTmyu*yIofB=ZtYa|5u2nfpw6a;&xV-vi8q z{{pNFX$~+{;sxj}qotH*7C4otp%jM}q{i)A@td&hhAV=l7u5hjeB^<5^r`*P1F=(! z(tzWb*vtcW^xD&^n0ZqkkC2#yrli^22rfX%d6NK7dkB;@Zvo!#+_dFzy02lPpI?)E z1^})F)NN!ZBmUc{p7Ziv9W}O7@>VGUg2!$N_F#QC;00000NkvXXu0mjfx4G_A delta 600 zcmV-e0;m1H1fd0x7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00G5GL_t(|oW+#8Zo)7Wh8mEBZ%}wHA6KpaYICA zNqhyUc4h%Lgqf)qcxlGF^(zH15!|+prSe!Si zLxcpeh#lbB2eicu3VHr;Tpd+OuL@xIA2ufK5AisqWlB^cc=%9)G zB#fj0XmrpTe+jVwIEXnY0I8FeTB&q60qigXYU@g;B~~XLD0TS6fOQ4H90Oi&0ni?| z0DJ5pU7&fFS|i5*1!xI;&HhjzFFVY3*fy&kjR#q`Xg(*SAk5AgGSpy@EDHj^OfulG zF)?e0*Y5=b*U~Esi?Iuz_T}xFz mwsasg4c9-a$EKxzKm7ycI`&+>>(0pl0000vHQL41_HZV;h9u|8b8bh`AW3JN)s1W*9*V|;(*ch3M!;CY4Mes+%os6u#2SOMP5;7R@4%D?kG8$xPe!Vr+EA`+{40&)ifgiy9#?`MLk0A(6?fEan( zoVN@x1Fst&t_#(wIn14cg4ESt+t1T`&$}=bd<-aFqj0Wg0LGB)v9X_C2&jJpr?QA6 z7)$|t0c63`@9$y(oIDO7kN;T%?EK>Mr@s?C0I93&EUHVs(;QHJ40H$R?Q?)EaJvXN zva_i1H`DYUst7Rlmk21Yz!x_kQ=e6E$N|Rwo4|Y2vA-@<-(rV2^K&C5Ki{);SJ}z> z4T7m(vQqk*IX<}MZ5tr@R{(!6myR5l{Aihr-pM}5jOTmm$}JyzqFhni=(hM1QuA9&r*lQf-00zRxi_Zn*4 zZKNrHNDrG2VRl3ERvw2Zxl{B!T3#%?-G_kePX`*U2w(l*`UeiyJlPQU0H(|U0000< KMNUMnLSTZSc02a~ delta 797 zcmV+&1LFMa1>^>h7-Iwj00013M{Ml?000McNliruZQTc1r*N02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00M|fL_t(|ob8mqj}k!?#}{r(ieshWDj3#8 zu7p@%#o-wDPB56<#*2T4W@$0EVG^zAb~_OZCf8aa#^O3SlQY}hjsE~<{|4Xu0A|2= ze}H}~-ur&$y|=q>u&n?3i?Ssn%;dNH%)OdHF}hNj&6!5WoXS z0F^f*2;!;m-zdL)gj@x*+!oKcL5~au1BD}OJF5zVaff7`|Az5(nP%y*A%(E(NdOYF zWCK8$rr#RFHIRdN#=N)u4L*PZ+)sa11%MQ=WX!2Xf1sg5o^$>tJ&sC^VOG?br^^}p zA^a$&e@!F^KN&>Pe{UCc3H$LSfB^`Dk ziej<)f2WC7K=km!YZ-{oYKNHWYO{od1@UuKlB>`+fN>kXT(?Ex*jTM=-TA=N&FUGJux0an~_2<(mV_O%eqXF$H2X1$- b-oLKj0rUjKAuBXB00000NkvXXu0mjfPwr;0 diff --git a/graphics/pokemon/necrozma/dawn_wings/back.png b/graphics/pokemon/necrozma/dawn_wings/back.png index 2c3fcb4002651f85f863294d6eabf37649089e4e..be258fb089c24503b54d36857cb82b0b9016054a 100644 GIT binary patch delta 776 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 Ef`MOZrT_o{ diff --git a/graphics/pokemon/necrozma/dawn_wings/icon.png b/graphics/pokemon/necrozma/dawn_wings/icon.png index 558ff60884d57e48f890db1701dce135b4e0cced..c5fde92c441b1124f506bf155fb9d0880ec434cc 100644 GIT binary patch delta 522 zcmV+l0`>jH1=9qO7zqdi0000?P=%b4dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0005PNklu$p^2u4F9O(Dwo-v4dK#g4(A+WnZesA?l|3dS~P+kW%_Z{p|q zf&euBiU5(E%oRW`YQ!4TL~|V8McGUv?i&&J1Y;wdK(x>jus)DNXz(KYh{rXVwl|&nMb||l zwgBybkxv|L$1DNc|Mf7RCa`()`l5d+bVoIMTL({E``f)VVwe0XY<~6wa6%l>94AX& z9Ck!`tFHOcO*AND)jM-Xajxx$?m)0?C32#Y_Upf{B5d1X6bW(G-&f zG6AbVCc(7nuL8+}Sp_l+W);XRm{lNEFfmC*AiA~O1T*w71QG`6<2Ll*0s*=~wgGfK z#4^zg((5NZNE3wD9~bV?gRRsBQ4R9wAqiqJ$T-*##A1-VU%xGgFBDlQ_-rr^SpWb4 M07*qoM6N<$f~}P7hyVZp delta 637 zcmV-@0)qY11jPlA7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00HSqL_t(|oTZdOs@pIShJAx!vTGI+$pyR! z6ujv>OK&4Xd0up5fvNEcdW{zdQ9EG&F^720LefYH0j~x(`BA&jNmk0(lpN`Qqu7^skTVU4Zheub(xt8|*Q*=36BE zj^u`eeF$5^3m+^;0ZP&*QkoA1p)^m(sPtg%6gvwe*`DJMrYhF3N+W+@j*MlW68GEy2id5MyS^>ODichI% z^#)9lgaph`v_3r|0do+N-+{4hWIeos1(=in7T5+r7GUftK9^{xn7fXDzno)DqCNIK zF=`WrFjvS!yqjph3l-uODi1|~HaOOT5UX$ixz>3_?%@;QeF_}?We^juegW(KWBmcX X<6sN754r6E00000NkvXXu0mjfvepr> diff --git a/graphics/pokemon/necrozma/dusk_mane/back.png b/graphics/pokemon/necrozma/dusk_mane/back.png index 1a1b9e07e124b9f9077afe0a3b117fc426458bf2..96621697c5d444e83d7512bd070ee4db9eb0669f 100644 GIT binary patch delta 964 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 diff --git a/graphics/pokemon/necrozma/dusk_mane/icon.png b/graphics/pokemon/necrozma/dusk_mane/icon.png index 90c74736eacfe8ba6c8e61a6fe7f6d8a00397b69..e0e4ef479e9e6ed81b8be8ff08ca391991ffd1c7 100644 GIT binary patch delta 412 zcmV;N0b~BJ1my#e7zqdi0000?P=%b4dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z00040NklOCkrsO$~qY z-~fk4w$^~l(8vIRxEpZfayJl|V&uav+i)jU1Pa>`0#q9~&q*8+TfzL5<~ifB?H>fG zstlnPXc=M`_|gyVzxT6q93v<)Dr_$lmdTN$K^=i^wH@`VvRT9qyPp|lTkP3hKiS)nbki{ z#}|y>&xEXVVXholTAUU5ioIbucwXH7?C;RlY0PV+n8j1vWjWndqJNFIfxHdm&kW@7 z@4he)`N2RIe>fY+>JJA4x%7vFfn55-WFU|HAz#)Xz5xs#A!)N_;@SWJ000O{MNUMn GLSTaZYRSw1 delta 485 zcmV%ss402g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00C1;L_t(|ob8f3Zo@DPhIIo$2r||}nj3^l zS0jp^EYQ zboXXh&?f!Zw7@@oC!Ag$6B2-g+&wF@OfTiohJ=-agCyv`Q~&2vYS#Nqum zh;e{sb3Ede-Q;w?-x`Kjzm9)kegw>X{Rc3+FTmXSSb%x(F#&@QK5znN#m5ND>zWVu bw|sm8pe-Q7dAjRq00000NkvXXu0mjf=Ag{O diff --git a/graphics/pokemon/necrozma/ultra/back.png b/graphics/pokemon/necrozma/ultra/back.png index 798e1290f4be040a6e2a3513d472a72a761a1f92..1dcdc3835c094fcf1a5c78700af88858cfda9a80 100644 GIT binary patch delta 689 zcmV;i0#5zk2KWV#7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0007KNklyGUp2!)G+miYefJD}BCwQ4h&oE-k`ZrA4m@p2r09q_LK#*PWF z3w{B>3wH#-U+HD&008z2pdZ_P1C4zE`0g9Xw=u+^ZF2yRg9H>|2ap~h`Vl~fBKCg} z1w4kU-jDND!VSse(f5G2CAbI)av=bl96iOv6bsHX zWI=G3h4kAPvj(V!55^|}qI^<boXph^N(s*8w_Y{uDu7y$e^)1w$sr=50!Rd2 z8>m5n-4k#M;KMCp#K03Eglz){%L=#%xC$9Q0)kV$V`dj>3m*WIfYU6(qYB#qA)GpA z(aQpY5gfi^E(F*HFr5*gWw;5WgMS#HdY^Kr)-oO0ONbiPzB^+E8u)*R1evI< z_0qKsCCLF8y0`N=|*ji?8bqq~oD7%j_kB_o6T z{N=M_+2JdFV(_Ddl0M2^*a1i*HT9DUQ0(kYy>w!`03@+3*YluBK;*nBkB!Q$fv`Kf z^pcl8Yb&^IUF15tzUK?TZ0vtSeF5oUgCoHDOa>h5Ghp?=)r&`mwh71$p9s@yIRa9e zoq=m=v4Equd!;|d`urkTSTIGehmLOvc)h9TWl()Qvs#3=7~f3O2U5%fY>9?ofygW` z_)0$@oL-uNXjd#3q|x>pOR7MPfIWA7OlSV))lw!R&;5COaA!haJ# X)uXjc7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00M(aL_t(|oVCFDHs-)bEij^YC+yD;x?;fZHhX}4%zT~+w`LWUI2((DI2K?wc7{qE zAhz656bnc19A5Uq1EPZ*+2;jC}YKNU9w+7T(7?KVsE0CZI4CU+t=$lmq z!tOsKAWDTUs49qy;hj{6j33 zOo3nB4x=Wp3(%J-PB-WwtH)mi1&}oYZ*#SaDxTUEFfJ#JDcx%-luZx@bnnFfS-$}U WRN~?VhO2V`0000=y#Kz2Y1s&_NwJY8H>mkZtq z6i=%4TnQn`DQ7K3GelyXDx@9Y1g*75(L;wGF+zh{(hn4j_tQDN0n7}yK@ID>dR8e( z{$!f4rGbEgRN)Pv3V>?qfS{5JT!3Ykx)G|U=nH@Z zT*$-H!C>1O~8(RDAj{YikK`1*eakeSZG ztxc^AMi{9e{2D$2iVOfk&N3W?)h`I-GYY9Yfw`o9s)$G-L72&tfrR-CKspu%|6t6K zR``{qs{3J78T^!Yz$H%|xT2raf-*o?QSXb~=nCXLmr?C#KrZho5?jP77tBz~BdrR1 z3-+IY2FVRD9DV`R8(MJts_KTNDACyqg!V-q~V!Qoicg z4Z}yT0D3-N@{A!qXy|m|?5EvJblEKk0X51LT2Ia z7tTcV=6P@a$9NfS=_TDL0&Y(NRmfKN_oF2{I@RVCMnShyK!IARRd;`R0`3Yh44#5+ zb@1o*XwR}CI<^B+uywPCK{|l7)RQ5)v2fRzbFM0|&4+BTaurBQ%b-Gcg|H?^Yb7^8 zNJcGYku6~Z+eRkMGGr^cwKHr?!niJUf{kMExg(EGaO!wkJ>Z@LDR(dUOA%X<%w+bh zQOPZE6X5bg$L2>?^I3mpHS`%Sj#l8UM2gGjcS zd1R#{V|)d4S45uxuIA_;w;tn~d)_bdyozsawOLSN^Jg}i#UFn@dvt&`gZE*x6I_AP z3FfNd|3Z0dPUf~7{0eXna3*q(_S(R-=X-f9YwhgOR-63kLlwj@26);c!F_gG0mml= z_-?S73PvIH6Os0^xB^@&;Y9(SXBVNtxV53Awf8pqbcD^o-Nf+*XnPLq#K$OJol~yi zb0O^Vd_szMGIf7_`>5LhbM}fK0IYpn&UVL{fLCH1qdI-iu-^c9bE$Wu;2Qw?!3XfV z0FL+y;G2(ovOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00cxyL_t(|oOP8uZ{tP~fR_YZ5NyQIR~*t1 zlu`s&Q9}n1u9Cznj5IMEE-k3Z1EfT-N@2ss)s!i?kxv%Qh1--Vh@4N3z&1ZDv&*F( zPQpf`osaY0At6L*k%MRZ_bd6UIR672TT(C&Oeo#0G-${Je-k@{iYH7cEd};XD1gU? z(J~qzien7rONxP~ru*gx18na2xb|T>W@FU`F-yOR?c8wiS zt>fY&irO_jfBBm&jT&$yzwDLe-B5bBRW#<3(Yu(3;Brhw>v(9jv5?xV$`63vf4r6~6S^ukPrDg$Nk=tuxVz{{b^EL&Po_flU?F-E6Ooi*{{)zm}TY|Mgz0FK?i8UnA49yifW z=THMmcbzSoIy?GU>aT+(*0iMh`6W6=PPgr4x5qX2Iuo8Y+cOG=mM z0B@erB`g=U#--Nb!!Vr-AO;6bI0k&nZeszM7EuxK*r%hPOc*W&-~!9Jp7)yrI1HX= ze+9n*E+Y`*1;va#;A;r*ecR^aL{?`2$2D+r-eVXFG!xVAcD#X>qN-m5lcgiR8292c332%;}Lnc&3H1+q=TWbmC7CFI?PFgBqQ*nSX% zfhmpr>LvBFETvIZJtI->J}KnrBBg%xLXq-m7?nhS=78E5I12pSkH%NywSN&t5nrjg z@X1PZU&f_IH!QiL`D>uk(z2jcNwh@wpJ)S=TYzuPf=|9)k}oe| zHL8Q$15i=Ozxqq!bJpH3gK*ObFBSUY5tQV=pPJMwss9IhN_c?IZ5{Ri0000IR5p)r+9f( z0G|XFLTSI)sXzs4p#r6Be4r>*r4*5E{D3GZ5HZo_JQ%aDTD&WQ4CbuRlW{YEpSgdE zMQM3?Twj#>s^_|Ho(2l}OSFoCol{3TkPFM>k!v`GlO>{6yfv#osirozJA zA7jF70@t9>y75@+)&*XKT2hD~oMWKE;-{7F$2^EBVD9rY57sc|Gj1P#h0H+*mQcqe z#=Z7JVL4ju>;|)uu|_mx5@~T&^=p3_7JVhOYPC)Q88eN`fht0CyVqWKTdqrB>tIX4 zfj5O$h9F?o7O`0&Od{-;-GT2xTBf{!%_a(tl>uDlUwfX@|BdeV{|^Q4@VD)FkH6FX zgum0h;J=|e;(w=G68;;yGyV^B2mCYL8~iifzVr$IM0e*u;h*Tf@DBJ#x?NPT;6H&n zI^GNZX_(mJk9qmd|APOdfAGKHpZ=A-pNxN?fApI1ztJD@-_f7(-_XC{zoUPP|BZti e{x<}^ga0pL5hYQAt-(bA0000Hlc} delta 553 zcmV+^0@nSp1o8xs7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00EXsL_t(|oTZXMYQr!PMRkKY%s`gWJ-QVL zys2+dnhS`i8y_wZ@Wu!R4BBKm(#TP5N(s~}`!gDU{r`-4@kxhou)D8x6s#d@xSs;z z8#4BxOtU*V>=WxW`@!`A4r3Ss$^_^J^wTwZWCOV_CWmYMe~P2*8itYOgrzyYg)(ui z2Tg)GdRJbvLod6*Ji_&cqin}IL2Q-<&xxZ$%U1p}a4}}1x0K}CB0ORkTv{nrBZQ|p zUM`~nFx46%o)GM(Tl)ur z(jJF=#6jBM;UMid9D4hTLvMdn9D4f=ho9|N9JcnKI6!M(T2LIawlB7m;t;fbL#Ih` zaN52I4F^_d(oe&o#R44%s3`#QhC`-&ut$(fI|K(paqgf4#*`NRr1OG}eG8_3J1W|I2=9e{Y%(jDPyA^-5? zRX-uytj*9>LBBr_UN%%A%>BSwPfz?TEey@nbp+?eNB~?cwAM^>R7%%Op!*(<19KVM zcCL0Y>RTd8cwPXy>ryGeZE%=!0MGq%6Eh&)IdA7HL|=%xiiHq-c@Ho;A@6@BD?qG% z44G!Dm2wj=^sgLg#lh&sn;F2X1}wSNf;Qmy*I5a;nZzT@J-r-4D-+PW+xEpkx@u(t zX&MekzSG5~nwfe7cCduG5wZ?1ml4;U);NyP?%^6wFH!#;V?n4Vk*VJ!m^09Z1!0}3 z%j!>q_T%P?Fq^WE6rXS%vG-ncm(T_nveP;TLRkWrDwfI3@9ZARLa^p>JW~8q9ogYE z2OhxgGrzwM(D&%#$;br^TSR>Xzh>YAXaG2mCO4bmki*_T4WHPKKUnb)A2mNqXaE2J M07*qoM6N<$g1?R)M*si- delta 713 zcmV;)0yh1+1(61j7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00K2hL_t(|oXwTLj?^#^#)F&(xUntzOjd~U z94|t28zn$->@iQ5;-oVVaKJPzir3)rWAHfPqIh-d08o>m7s+ERzdyP|opRVo(43<3Ccv6LnC!3JI&26*)lyW}me07kdw z0G?MrMSz@iRVGAu;nGe|6Mjke+|oS$$?FX9x~wN!#MN_5Ofy6 z*Lj|Q!)}u@o59XujfvFz0&q^P7_up;#QBe~(#j%t^EoX*QbiwPjW6Tp%<8O(51Y#_ zv>>A1d%HdCz-LZ*Qq6C#$`BJy(cZ_`r|+`7O$d5Iu}+5D6Gb-lbBa zSS&d;TOx&x7wN(6bHI!Pq{nJZGKZZPe!Xy_hfT`$)EEKmw-Z4q!#e%eQKHL5R{44o vbB_FpX_L~+Wl&7~%y;b4LtFSxd9Ld(#f^!yKw>+b00000NkvXXu0mjfs3$l% diff --git a/graphics/pokemon/nidorino/back.png b/graphics/pokemon/nidorino/back.png index e5868c58e183f48a2175b7c85c90852bed76745c..a7078074e43c63e1853f424b2481b43c890494e9 100644 GIT binary patch delta 669 zcmV;O0%HA|2IK{h7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z00070Nklj}G=f^PsN{t-dXzzKIr02KiQqYM+^ zCWPWZcfSyzqcENTC42;kH(c2^jg?El#}usmC5VoY0nZ2}2q%cuV+4HO2X6uMy?GZh zZ-e&2Z70-I5C-jH?k8cH!g+*s+A;*|bN!1G!7AyiEwyD1 zL{#sE31BV78o!P`2JKfc5u{4dDg-0MUo65<%#TVc!)z4>e+YsLgQM7IF)nZ6AWm5I z5`;ma1_Ba5qAA-e3c$1-RlhI>;0UyAjKFbyi7!dPoXs#bNsD#ty!48IQJjC6!s}O# z1GhKY7DAJ`^1W&cn}73&p7z#Szm|<13P;(N?(n4lm(7SFi{o9UxNN~xudN>J&}d0J ziKA%?CqNr-j%e4b-V*8NzzWbOV1#_xuz#u@bZrTsWD5aRGa`gFKwsC>v!xz}XTbMS zm(ccc*}L_P+TcEIPdr$6o)>>Ykmr~H_O%f+g3yBnpl^iM<wQ#YEJUa-e%YttBt?w-B%~-d-*s@3k;O4A%=2()-I`Kh@sUHBbbwtEtX5IBNd;;R zIRKa|Ssv?kqxaXOL@m`Gkn~he!BD{6ch;Z%M*9a`_aL3zX;?M@000R9NkvXXu0mjf Ds#7{v delta 722 zcmV;@0xkXI1)2ts7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00KTqL_t(|oaK~DisLX8MQu#YqX-pL&n)A) z74aH+7bS_;&^;>x-cT)}N4?9s`r2^5QQLSw+eq}q-QIA zmSA32rKh6>th3J&zt{EZk3eTDLHxR|>*Z)eL_)y-*(HGVa%(}Wj+{n>91?K#2f)v# zA?T4d;9!FE_)ZrsE3ncbSA*9M60>c- zft-d(2wke$?8kCI!o7arqeo6MNuurx%p7rw*rPVJvrOK13E)6%<5w%$BF*XmvKz1x zC8io`Pf)F9fYoX18pE5L$&*6X_8*d9SyUw!jKAj?e`IgF{qZJ`@#9yBdCnf+43k&h ztjkFX;`Xd59{>5LmU1JS?>f%#aWSF%mRgr8z$tra2iGH{zo!i-7WABVrt$&M>YRp8 zfZ&Nu?2z#m5G-gm(TGIn{g2v9*Sp<*EEGjA9Z~qiLjhoD`yu}(fF)tVD(r!hV2T~X z!Qh4jWNVR!W`feSL7EiGHDfDoYJj5(q&R4afsNpivR!s07*qoM6N<$ Ef_Dx}zvjLFV?kLyiYPGEh zHy6ghX{4kt2GG~x48We}HQ${!g|u}OT>waHWOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00G}gL_t(|oZXX4lB*yThP{*v=veJMO<(~^ zm?vIbK#;Tlt=w~zr;r}>tS^;PB>-^#g;&dkSwVf2fG}nxkqElOe>PPGh=n9i$SMS-F@$iB zY;&b!j=`%0s7I|AOY;(tCmm*2%z~YDkR^a8fURa>9Jr#)aWHt0A{Da2-yC3{UH6BN zsSO8kD*){2D=WY*I8B!UJ^sMNBCH&!h_cV8=)%0kb8n;QqU%48TqeeOmZR*$U&eha zrwnPW;WVy4e+2q?p0y)RK;?)s13IFaBRkfH>%6@K(8`f?3ETa<1g<@*6o4#lPP_4| z6M?V~Je5bG^P8HlaR_B}`e2#DHLp#8<5qSfK*bvJ259em=xS~Oq|Jw}CRqb}a_Ipb zfVmw&p_l!buQ9-u0s3{hj3+bf8GMP#;)A7D$7BYXe*vT`El^+G)F?q8rRo*r;$jgA z&~`gOX`OY!vJB!*2$kHi*Cl-0eD?-!)er)xJH6uvz^HHEyM@pTP0Q543P%VH)TlXX zkTM5$Lhn!3nbYH{xJ@AtBLexOCD>!_7biZf)1I3g6MNs;^kN^Mx N07*qo1w^hwV1ker6VF|LfLNcE!RFD;gr*I$w02`83%r%Z(grCFJ{KS+ZZaXYP+Y7VC;-YkrXRD2i%&xh z(Joj6P5qz%o;oPbq0S%FBS;%<8fAa_HYOBB)nc002ovPDHLkV1mcI-sb=S delta 583 zcmV-N0=WIC1ds)g7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L000hjQchF<|NsC0|NsC0|NsC007byu$N&HV znn^@KRCt{2l)p~HFc8MwN?9^-jHDpmdc`rX~e0|#3N*;VR1qMRxg@Z6ZbV$X$2A}y zPC&FrK5S9n@erSJ0Eyj@1pX=xh}RPl4|{(C;{QU~QJ=Yt>}c^G)rELVcevF*>lcI# Ve73Zmd!GOR002ovPDHLkV1gLr_YeR8 diff --git a/graphics/pokemon/oricorio/pau/back.png b/graphics/pokemon/oricorio/pau/back.png index f2771b8b5147fe9efd7aa66266cd6b6c50dd01ff..7969b5019f8d571f2185f597bc8e101aa9d14ea9 100644 GIT binary patch delta 690 zcmV;j0!{t&2Kfb$7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0007LNkl0C$FrAa%k#0aSeW;G4EXC_E*^1!yLGKGPJUR{E}P@8mClV(=->ES z>kHBWK!?P4gg_BPmUmQ}XrBPbF(iLrW9@T~_L}VRK-kE@tz~hLh9E-wLB!9DKw1Mp zG`_t3fuSFC_RArN@2H3<%AJF~AvSjwC50~zQ|JTO9(_2By~1%HD`!s=d*@KL^tUm9 ziq5f?L%c&=BNB&WlL=Q1qUBRc@(eHuwqv1pX1#CQrFV7#5R#BBw|=AF(8YfTW-I+t z1st{!z65N43+R0~)V<4_NK{I?9}Xjcb(VCwN|MZAO=4pJf=soBIFF#$0!U{ICCIGD zFB!k3-j$CSK=JJE;dxGKpzxLlfR-7w2RH`|Yr`0eW64)A0(2oKw?QJcFjioS2Vvcr zMFlvyjQbJHDi{(Nkr-D3?*M;+At6m^^>cu$ZlW>uM15P`DDF$i*@G8zq{zd=0(6vf0W1Zwz zhhyvH!(b6W7#2i*?~GuKAP~t>Gx-#9!nhdwbusPy8fn6U$JfRP(rF$=?1sOmh1w(h Y0^FWAceyU8>P-Lu02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00NjvL_t(|ob8h_Yui8+$0e{K&?P5>Gj!64 zkhRvO5a^PWbM4d}T(BhQ7V4bV1}uqo%8(SN_RzIU_jo8BR1nBZXKU;S=-MTpq3@)N zeHWdV&V7Ty_y7Ihd-qPyF#bm^%v}?iyIWOe`D-o>^#u|-0a{ov^C7q zyd5yn20+KU0#$Yb(Q)g5@RKqSt^=jtsq~IbY5=mpFLcs!YJgc@Uie!UIjrB%sp=n1 zr!Wl-AQBwqXyxJ-X}{C72>P>m3nRxRq#Zs4$^@OqKV59|HsXf>0RXiu8##nmYRByT zXSD|#b#SNUf7;bOV#Ypv`=SufF(S}hr9%StX0iAq11H2Lu9$PeSjd5eT%~a$rik`H zW#{Lg0JxP?G%t8^vhA8UYVE`<)*`9}b4E-C|;&0(dOn?;s^Ec3;JzQ%`I zAVuzhH-uL{!%v605?A;jU}M7w&agigzpO~uX(FFpek6b zdXxL9=PDrnW>@Q1nLhyXvSaDf6M#G|_1R@$ww}0A1IqJM5LZ%yM@zYdlz*HVm2{(_ zwvfX5DSKlyyjO)s3r~Fa^~LG3vBwzv&b+=3KNv9d$K9Jm(PF2P{@Xp9gK3@V{Y(%NhT*^c+ZKXd z->O55c74SVr4If0?(s>7T<#c5eOmIy5MpbITmagid!!JP7m!rVjG=Sj1t14Vc^rRb zFhlR1MM{uPqZmB90~nZ1ZN}`@>w|^C5(7_@lVGWf&ooZt2Ox!cSr+EJu0$*O0fXq5 z8EWVS@{OLT6#9V&z^eyfgB&K55WWGJzAzVTj2qx_d(MgezLDp3*G~Y@*Z>;l8+pM3I0Ao2vX)BDRexjNqhGTb7ElT_ksrhUQE{! z5!F9{!3Xn00;jy(>|p*bM=g--*G&4UqO1IqvJ&AfJ`l5dzo8UIC86xR-zOmlUvo zyWeAwXgLaDGAFMfb+l z@jTk3#!Cn~5g!pm^>A|q=r;k-a~|#SDmH|tO}U>7TWvgYc^ziwsW)H{j6w3jb331HHHz Um$T?V{r~^~07*qoM6N<$g41s?r2qf` delta 757 zcmVOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00Ll1L_t(|oaL0ij@m#F#%&3t(1nFOfM?AE zV4EKBhLZw0Mcl1H3MH&xfIn@DNU@X@DXuvprMf0AuA+#-+J|j2Vw*{fAM-<1b-X0gsnvfH**aIA(uB!2{1Re_7b5s-Pwd8?vBnJy1eP zr2yXqcpl}gq34(Yi?q0iX1vxkbrD9f5V5!lOaNaB72K4eES9mDiFh3^(=jMx)(UiFF zjwRbrDCPh_e=t?w%c29Xb9(Y1cVZ5`4CvC{xkd80MW7qRg9PuQxa*2D;Ke>kl27yI z1(P!QU`12fJAYzWfRr1?n7TeDqp&`27l6$`X0b;y*F<0LKlYV$)bkzU#NprYpu|MV zpBfz-8*fkUg(q~-Bfi~DB$vDKwNA&z#rtTs6O(ARf6_VNz~Q`!NS#)?ktqu`(MaKG zrL!o<;yFgz99;eU7}tg(;?Xfh9BLoKtJR{hL}oFX`?{CUrhG_8i`MF@(eeG_4zYcBGq;QOpl#%Y5cmy{o{e5be{ zPqK$qe+Grui%@c?l4d})ov*S9=;0`UfQu>e4p^l_pos|7zzsEP%7%bI9UKqpo?FT% zP!_aJC_{=~hHg>DU{*IkDs;c=XBOk;@|Ibp_S&T1rs@4xb-B~)mGnuy5S1VIsotV= nOkHAkZ%jEdu&rzIpT-{`W7yY!<>MLv0000<2SrXqu0mjfFbrJO diff --git a/graphics/pokemon/oricorio/pau/icon.png b/graphics/pokemon/oricorio/pau/icon.png index a4ba46d2bafda8fd3f158f422d0100a0cb5a651b..c3353a92493b2fe4c14e911702fb41cca20510fe 100644 GIT binary patch delta 266 zcmX@Ye3fZ}1SbbG0|SFkK8f*;|(2~puW?0oV%|3(e zz?%HaqT3!XW)n${PTC+|aASt@fg7Gv6ZGzh&U>TvaW-dqaG5A`{NxL5+bwMbc{V?q zSj=`ZE9Tg=M-CCCo}ISGKZ>t*Te|N8SIWh!4Bm>K-rp7X7=D%8@;AtP)8gPw%k%$m zY_GTRZmBQn+FozMR`jX=mcye*x7iL&Zu~J>l=DlbLj6mA{-rj&{T`J)2|y1qc)I$z JtaD0e0suq*d-DJQ delta 378 zcmV-=0fqk60>lH57-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L008JoL_t(|oYj)C5`r)chIs;WkpU*XE4#h6 zyFL?Bo#dFzr0=K$n^$0vt%3t>*qqdC|9?rEzxO4{FBJfA-F2Ohjs7OY-9<*LwN|kK zXw;VNAk439>pX3CI`DLUp_62(|F@i5WR+4f8umi$ z;{SoPC1R#xf^`?-@Apg!$gWqEK`rr&jFvW;!!U4{B4G4cV z1jvP%z#1{WBw!Gc?1J*XAi}OU1YI?b0FtBWBPf(yj>t^6+wFe9s051K^acm z6u|T$sQ#xCZZ8NJy=bY39Y88zO~49Bi6=lxL4J^~`n(k|TB!#xrXOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00L-9L_t(|obA&+Zrd;v0ALw*(baNMXb#gr zt6f@A+9_>FCtV5zBI&I_5sPz7%ix+ZKrc`uV=mCKK(1iq5?zCwp^v0~D948PqHmF5 ze||sIV-Wn0e=s`zJz#LK51>6MG}@D*gLb9pgpql?R_K6`e{CQ_ad;gBy$Bsi$xdG; zPza&<^{dI11|ahn0%{vUrA(E`xtMK&Zmc24JNWZ=EjZ`m;`XKuGz6L$5Eqy=!8OKgwOak&0q7LrkI5GhHybsMxqv1eSQ_xtPk{}9001S@`wM*1P7&aU z8W2Jc>JZo#9Tq>C0{up+J98EH)&2*05Z#5zOL;+ z&Fd6CV4rJI-z5()&fhnn8f20;g7UPS0yTrcQhR`y3Ca}18q{RQGlgQMe9#jH$h-pP zs>CfIU05I~JJ(C1cY_&EmsF-|7Z5p3sLUNWbUpGGkPNOm+!A}(-Vhcr1BmGtZX_JT zumxa>e+*KXd&;3vh&RC|V6aj)l^sm>TdT7R+sl9-%GZ7Tf}Do9v35jA?n0 zq4T=C~WFunUL^((k86Y>1C9&^b^-9(ijwkLV^?PWfD00000NkvXXu0mjfY$ipk diff --git a/graphics/pokemon/oricorio/pom_pom/front.png b/graphics/pokemon/oricorio/pom_pom/front.png index 44deb56e8ed026a4dfccd54503b04ea825b5d22f..5ed6c71b5611f10070cd21cdd26a648510b8d109 100644 GIT binary patch delta 545 zcmV++0^a@I1?dEk7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0005lNkleK*#QL}^$AaXXG)hq3717nr|T3c`OZl?7cM0qd<&?KPH`wS*ihyX-OWEX#m zpsjOG^oWX9QqXSScW3d30ViPwAo{-mM9Iaush3L*DOh$Kn_* zJLv-fJ~ddcO^=`+5b~K|l$R-R9|6 z-gc_M?`}Y-*&PD5A)M)0-_&6Mkp6$MbPG`DFM0+jB2qm-Q-mHtQt-jcdmt17S?JNr z9J+b|NEy2N8qmbZ(iEnt1q5daAeA~H>{|?tAE(@z2$fy{QtuE*!MI^D0h05?LwgFz zE&|7(xd_R9Ix7N{0WpRLlCwz84Bw7ZzRVSZ#>lJGLr*UN$kb_K5g+`yLic~hSwce` zmI>nX`FK?Hp8VVfZq))pzyZCNMd!y~9MW%@JG{oNXaiu!j5BTgJj9$ct*1Ep3zs}E zOAim2zu+VQ2;c-w8(&foBbc%c@~@tR3N jtu;c1T5aX8eXOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00IF?L_t(|ob8moZrd;r$0g8%MoUKRS(gA@ zS+liTpe;H$M%Sis_QW+ciw1mar@}@@FEKjy5i$iC^BV2D^himR?3C)54m}tac=zM~ z?)Vi1|Ltik?AuS=_W?<2q3s#>f8r>*xxLEjJfhwx%~?e?ROI;uT6?aMcUPmzE7yie7*b_ zAIC$x`q8dzQziU(w-Nx-h+dTOD}drqBPKwTM(@%BF#w0QhS@%{e$bm&0&uugNeRUL zsZ}V4scZx)e*lUyK{e#A)r407AG!p_>Mdo?14EafT}2x}mHz?IwI>~F)D7THP3Bx_ zPL(!-b(Lf1;SqkrlpbwmV>w#+BmRpAR^~b_G=uAxlN}>%nMbczEzxqxViwv^PM6-WSLKDTu`T0+B@OTF$|Nkg%2;GeVK+bFXTu3N-700000NkvXXu0mjf5St-C diff --git a/graphics/pokemon/oricorio/pom_pom/icon.png b/graphics/pokemon/oricorio/pom_pom/icon.png index ead80b6a2385a6d3d1d6e543100faf5b733cddc6..9f83917ba16f8f41264ac54e3a4d235a7345b60a 100644 GIT binary patch delta 287 zcmX@d{E}&c1SbbG0|SFkKBaE-+ z_N(bOy!sa;rDt7GlRZ^<65ECh-D}PtB&J*OKKy4mXY!>4!TP(q`c-_Ywye>uGH5<= zBC%<)qvOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L008nyL_t(|oaK@|io#G7h2IV?*6G~CEW{#> zf?0-w3(!hPsR6-a3SSWsNg=1mS}eqf5HrP~Brw-lINtke1;N|BkMn-cdB>Qy9&*8N zVW?1mi*hN!57NY!k_r*p0?-*>5DMbapi0CUWj6KzA+XsIe>LC-h!2YuQu|NJcowZZ zwCDF-rJn;0-+tc#wYt?NwDxf^GfhI<3Z&hiN%HYNQ7Pta)|C_xgfCZTV0000(xZiX#ePs z5MqoWel19TN=c9}1-W!mASDx~m5`GyWFJDB6*7Q`Cd>n1m&Ro=B0x-&f&!Aeh_HX) zmw;Zr0wf^J1B(@b35dNw?K~5ZCC~tN77*mrF$;1AY=N53&IJe%36b?96o6qSUmA~y zq;4&uRN&7yK>j@wSOoOv??4GL${M`+QgsfjMu9Y@W&@rbT@=MQ*Nt@nd!&hW#$z^O zuEh(;Qc;hgBwO`_LO20yrIHSi(=&ge0D6G^B(-q*g#4ZYjfEXRcp)A0OGWsWa0r0s zeA>5!ab4G~XD9&Ddq{lA*B=GUcoYDvb&tTIFRQTj7xJL1`+YJ3lcrjHef5fotDB$U{C1+@9r%65yf-D&R)x+UBIQBPNaJRaoJB#?hfFV*=n z3)H9s3Ob|81@z)_2#0Xol3l@<-&uomM*j>vufe&5P6>aw31zOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00I(8L_t(|oSoD$YvV8!2XJ|@>DJWHJr3ON z6C`90^lRiec!_&UAi=VG;|-CwLLjoXn+x{^YPxpre9-T5l47@(^_0N9AD=OqT>ME61Um7wXy1yuJ--RBjgdlcl6>2p2l;pz8a2Rc7)iVlcU zG%rsBFkME~DM39iA)2Q7YYAAA6R6AsEq^L8NFi%koBlyfFyPq%r#ehl@cIDv&WN%D z$rpGP@9+1`o7E3xS9A&>0RH@V_JD~5Q1>PTADGKyf2J>1=mWaU&4Ww8uE+wy1s}&W z<^JG=WPPyw9}r!Nu#SN(X#wmF`~>;x0+3=QkR|#NB14W*RG*;UV?bZ%4sax*INkXc zxbIF>ceh>_uO1!1yZ6QbH^T-<#zi0pz{w~qfGp91>H`cj2B3BhT38A05?8eioQ%*; za1R>xI0gvp9AVuXkhK~8HN*D*#T0AT6pww-zp^dh!UMVt&YAB01Am+3X@9jlD*ylh M07*qoM6N<$g34_w)&Kwi diff --git a/graphics/pokemon/oricorio/sensu/front.png b/graphics/pokemon/oricorio/sensu/front.png index 470f684713af6c76e0985709bd731c2071a42529..5abc5e547ef17bbc42fd13e25574c2ccc40d1a89 100644 GIT binary patch delta 713 zcmV;)0yh2g29O4j7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0007iNklXwcJ6cQJOhxrYzsdE%jH>ThWD*sVL!cLt9EyL% z^tDz93gK4~j060wAp)zlYKUsqSp3H=5QI?#5En{Uhm?bfv~Hq22@7rcTF{U>qS*`Wu)@)}*zJ>gps;eO`vM9`!z%K|;#In~=W z1YlX$b%6tLJwE}c9svHw{Kx~XVBXit!twwx zTN~_;jkMc@Ip>7-u>;yofIS2wV34-}!2O3cBgiQSE#QJSa`aDaM5?cH)_(+;1I79% z2xoooiJt)=Y~5!7crfx2kTdomI#e>s5y1yQkDzT1J7dSdfhd44OYjaLk@bI^w*U?R zykm(x18j{@YJCQnj+-+*0?4tKmiK@k2t&E_y7vIB!&?Nz)DF1@c00000NkvXXu0mjfAjU|M delta 812 zcmV+{1JnGF2J;4x7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00NguL_t(|oXylRZ`wc<0ARD&5>qghqKe?QrX!a2WV~+l^TGvS1d{ZUI$>W5ZLur&}(&of9Y?p?38>z2>f0{)~dN3 zUR`_-JR-~r9mo|@f*QtQ4=4Uf7~wcyh{<_^afCQKL!5KYHC6DlBu2c(8P``yD-^UY zd8iFmD!U;HA_-#nRolgDoP~%n)qz4^koWLTygr{`lmDACp|A24e}7q_Xg<#{o%W#_-5 zLQsPG5q*s^peds2`0pf03IL5$22^~O2R3-#@r7Y!HO%rw*!AEPFN`PyNe)nnK^J2y zR&n~A=K%O}jufE5jdQ?lc``=xt_FMhH?YA!m6_?qe~<=8Ixs!M_0oVkXVw!K=0JlR zR=5Sw1X@wN1<)%M;j~)}RQmb*Cm`7Kuxw3ig3)|Kgx}@2~-f zOKv%1&yN59Z$H{H(dx;Gpsk^zPkJ9SvFyF}Pk%z-v%|J4l(HYjX*_7?d3a9O$tk75 zlxez$qn)LhqgBT;?+<#LDl9`PeO))0EnH+?nt1xq9L3YESL<(YF?Hmc;h6JtUcb-E zk0&gTe~DWM4fH}Zq{ delta 407 zcmV;I0cif-0^tLY7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L009L_L_t(|oYj)CPQy?PMc*G--C$v0VyMK- z=QY!fRJ{ycS_$O?T8Zu;b?y+6->^{h$e5NWCS~C|D+q}<`d!=C_6gw+pIGYyL-p?d z+rD~biPYU~<#L9IdoxlT6BIQC29zQVuDP-719us{?Iv3m z3;*=l#JMyMk8$|Q6VzKauU&>}W_;T|YQ&NkIG!cBA{`<;KsgdumG$bea5x+aFk-TM zf&)el>VXl{Dc=CbCcwznJTMnNJTMnN{9b>;$0r*mvoRcuN8bPd002ovPDHLkV1nh2 Bq(T4y diff --git a/graphics/pokemon/persian/back.png b/graphics/pokemon/persian/back.png index ad7a9d4a65570554df47847bd50aa43238807490..1ec5e999399fa298052aa875930cf58b8de380ba 100644 GIT binary patch delta 593 zcmV-X0atDDqr8teH64#@QL`K{l2u>b(~ z9cF~D^st?0E=365A^?d<7DAPa?!6^6y$Fsh+T-axpz13?!0F!tfQ$gF3vuf4D*%5n zOX8o(DR&`_5pfwxuYCJv0;`qyP-q`5?R7?9|zQ=UNULJJ^n#oA+~IK&QMZUJ18 zUY$0x*49U&BLui20BeS&es%(oCoti4NvQXP>c|1Gf_SSwD06AG8h~p9hI*ocxO-)K ztxx~f2({V?pdDIEW-@&!;{@n-2B?3XpckW%3!sCw-_YukMo=4J=_g$DLaN8UnMN@0 z_Z9${i&|;3;Ov7t1Uwudpf0Cnie@1+A1A^x7>94Yj^8W+%e-0}AP6A@@C10m z8A1$@3~+`J0r&wBzq~v^GCwjN=OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00I9=L_t(|ob8moj+;Ob$6*Un@AO}$Rf1+Ci69#(L&X4Xj6MMGH)!9OA4ygdGrdcC)rIqyTM!5JO!Pz?}orpFnW{+@ya4kO6>OTxx#jPdze`5uha-{GmPo zYA>S>farOK?Jft5L5zz2cLsE!@oZJ>`yq~aE2BFChj9)*6|;c>qW%j&uV;HDdJc4a ti*onSB^)$D#YDPJG{+23voik)`vnKo`|KT}G&KMK002ovPDHLkV1l_}4(2Y9G)kz;y&<44~UV{s0E=`T`Z_B~(hjeque=H@;c}J~RIo8uz;% z%MWN4;BJD$knSxjU<&U1G4-@OVlZd~_X!+=ynX3W9P8kGfI@!P4b1}b`adb5T>ua8 zsi4hMRl#Tnr$Gd;)>!EvcL9@L8V_QnkXKV+@rUIlKfJ{k@^1v485)WQ1w_HmOTo;{ af6p&YZ3_Nu7+s+N0000OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00A*cL_t(|obA%lO~XJ82H+FY4dBvyCqWqi zxeJ`SK%MFckFWtR(J=vG4L0SRRFQ2$!XrYpR7KJMC3c;2?ppu0>bhRf5plPXuL;g0 z?0*zDw}`-XY?eXA&rj9l*9CAt=KxQ`vvXiN;KQ6l_;`1Ke|HKr2oeklG05DX4-&i$ zFL+RZ&QSp9a(|2x_^_W68eag9xi1$5Vw|Fh1qN~-)J|`>fG~oS1O%(V1Bns%n#hb$ z833?5DF7Oj`=qweegi6Zi3~8gOQ1j?^%uE?23>D}uja2bKHgmL7`$L|uTIAxXe9K+=nBC4iJuvU?;gz%E*~7~AOF t(*`g({Q{W7pj+_aGc)?n4REc$QD0B2UT%>xK>Ppz002ovPDHLkV1gGcu}A;_ diff --git a/graphics/pokemon/pichu/spiky_eared/icon.png b/graphics/pokemon/pichu/spiky_eared/icon.png index 93107b1d3a267fd815290910b14b5837dd9285c9..3a407bc6cb2d65825bb03b833d36d51ace2b4d4a 100644 GIT binary patch delta 237 zcmey)w1a7a1SbbG0|SFkK#zZj zGq!WXbFJNE2bB%!;i{;Bi^|A}wbZesz@MH)x3 zy9$rX`cGE(lqC!mulLIN{aDHP=9=mfhBjZfZ+)+{X?v5-QJfU?7jXFsRt epIH01$M3-{f%~yJxl4d;u#y~cMSA(WJkYY)9^mSxl*x1kgCy{lc zqJ2GMlDE6d|E27ojsj(8d%8G=RLprg$(oPJkjJH#@d+5cQbsde&C8gjkAv)eZHdOCulHxV^9nC-$>Oe*SO7U`3_AS z``9NeJv>|aw7~6D8H1eNjmI4yNUATkIE~c9fMk`k42OLjZdkLxbRq{vQ>LHj>?3Q%dGpf_&rY>gTe~DWM4f)qHSH diff --git a/graphics/pokemon/pikachu/alola_cap/back.png b/graphics/pokemon/pikachu/alola_cap/back.png index eb78995e333aaf29168c6e84ba0a5b0ead838c23..110eab45bfba7dfd36fd9921fe9535d41d4239c0 100644 GIT binary patch delta 561 zcmV-10?z&I1^EP!7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0005#Nkli*z^-75f0r`@po(XvgF{Mht)!u(A zcM)O~BCjCKWe9|W5Tg*ZK?nddq5+~v)C7pJ5Cma|9obL_D1fil5kRpL4Dgolf3N~_ z{~%D!zAgN4XCdQjUo)Yqt15IEePytwh==AFiL83Ou3}E@_ z_iw}OPoNqnAOUFA-$GFB7b63*#Pgley*YFOsQvP%7SsUpk zpW-0gw&ws8^)6h%O?m;iyluR{egQn;LH}BK0s!xl3wS4B0P=-A!97C?AaH@Z$4R{t zjh9Ukmd~>*f?E#~SZ}(n?gJex1)>Mr@M-lAiY7kKPY;rM00000NkvXXu0mjfNM{9- delta 677 zcmV;W0$Tm~1nmWo7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00I$7L_t(|ob8jpik(0d#wS=TSj8l;b!4kl zH;f^mP24Nw4e|^rFKjWaHv1Y2DFllPW2!YEco{)GZj;kEbHAV8`Ob`& zkpK09RVGRD?qB+Cnx;3&m%r(+q>fdF1Y`R7CN))V^{dB6f7VI^2c)kzK*a8UT#$&; zo2sf*oA+UhSs)QfUDgix%m4|JRJLwikNBi}01|C>{OAY^@JXg46p*-NZ?CC!IT+xl zP(;*ABD=0(*aEQ-3zv%y0mx{v1D4qkvdNH@lxp3cRJ;I)HO4@zQUgaD0Rbe`n#vs3 z;rL(x*%}sQe?e-s(a5LoJ}_&GMr~lCvc5g&Az-z*>h-3F0)7*Euo<023@ad7bB*RD z0Q|wMCqQ66nJID$Oabu0ehG!Mh+PB(p1zWh7}p30{Bpob)DD<>A8^E|9|MB{;E9nv z(HNjX08YdwbiA7P3Sb=V$fooFHRoIbg*ui^$>TV4e_8#&?g|)N!h9yicP5M=iH_Z= zh48z`4ri4^0y6U~M7sqhd)J(*r+~oW3}N|$V#ZM=^z<$~h*}Nd^kF-wwQxjt*yz%N zfgV#26X^K0jg1*o=9ogAC!%MJpFiBxNYQ00000 LNkvXXu0mjfUtKF< diff --git a/graphics/pokemon/pikachu/alola_cap/front.png b/graphics/pokemon/pikachu/alola_cap/front.png index 658157930e7862a5bc44dc0fa02ba4a61456dc40..2de876f500765d70c1a0dabcaa27b0b7256fbe20 100644 GIT binary patch delta 552 zcmV+@0@wY`1@Hur7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0005sNkl1z0DGM4#Lw zj~%%dte9Q$!WRmd|HyX?D={rnGT)8@<2xxZZ@L1Ox`h3GE_-riVBt_-)EGzIgcE-y zP~Ki)$^1A8o%kz*3P#a6d79u597ul?wEW+KAi|Rfo@&s)Rgg343briJL`DeIAP}VS zFX!rAun`{w2pY<;gM-(eBQsQ9tFVu+dn%-!B{@Z`DfC)0q@JgE;$z-~en;CIXr%)m ztqjs@z6oM2je7;W^LUoS;kp;Cg{uJDAY^|h!?l7T zUF3X702hO}Ka%z(Amm+m90B&_pSFM_lSw46LZ^2d(zN+n=EA28Zfs#25^V$7`Dr4N zGao%|)C%^i10&=8HE3GD4R0R}zuX2l6F^VryMu^7;q@xxS~3*R+X98xV;z0000OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00HqyL_t(|ob8mqj?+L8#uvE=+KLNLz$!<< zHI`f;+3r|f!Ig*?K#GM#c|{b_5ed;-0=ctDfw0|$h8TqMUC)7~S}S5! zI^I-ORdT@7Vy*PqXqw95%NT3^;- z7ng-|Ctq|!06Z*qWF9g!&X*VhA9oo6pP%E=-FApUj@|wp0m&B+NSp!kdp`6w#V`d3 zbF|+&SE3qge;*(Kq@jOW#9!(v_5p$%(p-#UK@bwvh zhFAhvKe<)Iwro8B5YsOR{Y6zq0LEHSyU*J`0dWMAj&kmcMJb}u`~6Y0Ghalph|m)> zYYBA-SOy(|_Apw*01|0_gBx)K9FYG3FwTI>kz2R3e^*KkGh3N?VC=^X3|C}Iz+jV% z39wHvJrMb^qZn{V_iUHlo)B6KI7AH-g4UR}exM>K0taM%2XGw0G_y%tp!Y!E&riw& zZc9d>2z(O~{)(G3b@2~4uz*O&Nm93StS{TfHkUTQO^MWXCh@g!2W4wWYX6;gcfU&~ f^0a?17hb;sJ9;-)D;HSaxL978-h-%h#6b=ZKz z^>EL#r7!;ff7`>GE4J}%F`}NWrzw!%~R)5?p^!GN` zqLwKg7s~erX9?7~te-_or_l1t>F58<3^gM&7tDnm{r-UW| D6k(C` delta 425 zcmV;a0apHi1M>rr7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L009?CL_t(|oZXVKZi6rohW!Tj7I}a$Fm|X} zlZC${3{_#v5(#h3!*xY{3cOw-#grw&HEC?Xd!?#gto!ua@|`~+{`9h!sBTUxLQ2)A zY4>zURIOam?>$gy;{fII5xFWgfnIv>l{jFnl#e5{t?K5zf8fpsZXd~pb;&*;sQu&& zdn3bJMx8&Qq>vCM!w6hV00g|ep`4GHZUVay5M(7Z&@CD?JLvqp=+|WIZe0#Q0>uj0 z9_4yyq@yVc7XNgSjq0IZli~jPvoLgYdQ1j+VMrbCN(Esk{c$V^L$9d=3t_ICO4XV< z1lnYKV2oYRJK@%HhuqG>5aYRrorR$srFK6#3)2G?B4G}QgwaJTjK)fs-}d7hz+9le T5&`gl00000NkvXXu0mjfR)nxa diff --git a/graphics/pokemon/pikachu/belle/back.png b/graphics/pokemon/pikachu/belle/back.png index d90d9ba3b450eafd9a388a0d14d59114b769c7dd..b9b18756583ab813959c8d11798dfcf9324ea7f0 100644 GIT binary patch delta 766 zcmV;#uP)||8chyKvDdevv*s2`a(y?{zyVVr|DO}`ZpCB zia)Z*CR}g~P~@Mub52zv9Ks5P@Fl_AyFaBYYx%K$M-caR00dFbUjgJ`JrdSH@BV*1 z^6tl90a_jXgxjjf;T5p^Q&y{GmQqk55j_JGy3fD?M0G}pM}S(JoDe+#Zt@v5f&-2< zPzM|dlskXM73C^o)>9F+wkm56$eY~&AZSMj2LQEZ584Ad*%hj%nc4gZ_TZ;Rh$0HiGitd(t@iJSqR5>|gB6a0y~@pUI`E0r>x{S^QLW-*bk?izq@h}Z}K z$Q57(fz?}@j)1~I4uwE5?gU(f0)a7LJWg|RA;C>tt?IplMxc0Xal6Ni5 z^L)jaZG(N81hOv~12|&{fZnH(V)Gl~;9uzJ#frVo2)6n+|NQ9)XsHMLq|L8M5NolU zZ6E&0K4H!H1Yicq2!kG@cfeB0hr(SEUdFcoJ`MoEV>s1c-#$y!ny+dQ%!-$~bPQXK z-vE$j1$=Dzrt;|kA-s8cA=LJ#3NXa}VL>)6F9d3}>XN4_??JT0GoTokc)f^>@K^@S wL2I`=0RDOaEUo44{GQTl1zz<2jr*VJ4@lcamV~%Jp#T5?07*qoM6N<$f_E}xvH$=8 delta 883 zcmV-(1C0E|2Dt~27-Iwj00013M{Ml?000McNliruz02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00P}fL_t(|ob8l9Yui8=#x>N0ECw&h&`ctb zDg6v3oDf}13cd;xTXbkNC6ERw!VofaX`qVYe_yM{Rkj8@GJp3B$W@(m)(T`X+;t24}cF{^clIipWQA1H&H^!d506f z-c5nBc+3Ml_++ zt$Nst0|YebU2H-`vl#)+2-s=OdY%MKA&EjY@qEswdE1r-i@1#gb;d0f5^tThLC|&r^;?m*W)qG6sV$i zmnag(NDCi6CqT(YiJro7%;*Sd)r-^hc7f1Bei@Dd0l-C}Zu`k8mud-7=UqOA81o6$ zP+b+I<$s<>K6l)uwl6F2fFt? z0VV}snb4u@p3oulq8UW70ss^PKr#2dt`NcCV*x0^YsQIeF8cFm4Azza`%(H3W89#F zjY32T%ul(4qLsoJ4LImg9@wzvfdkm@D1RB~aG`~Q=7E2z-<}j&yp_WIqW}N^07*qo J1w^hwV1hk+gP{Nb diff --git a/graphics/pokemon/pikachu/belle/front.png b/graphics/pokemon/pikachu/belle/front.png index 7f521f287375056bb43e69858025b58fad6bedef..27e11f42eb53f9ade86693d7cd8c40bf8044e4a7 100644 GIT binary patch delta 737 zcmV<70v`Q@2dD;+7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0007)NklyGL$41{UwOGA?G`@ij(aY7f4R7m$XmVhF4zSxfK;VedDTI^4y?rv7fDnKm`ry4cPYEnJ zaiNTcfObt?4-oY70l=ogvSk2N^PYbOfW_#kdvKlwx*(phoXZiy@W7!T4xGDi(~SM! zk0ikEcj_ydX*fVTYYqg_)$TI%1XSgO*;D=mU=sW;N!-_!3|ZIJY9&CBkB=TO2fpHE z0bq6fc0B=%oaFZr902kAodD?$AUOeGX3-+2;~|ERzW}-(wV@9}dNW@7^wNJ$_|+32 z!oh@GzMoFY>BqH#!MLI7E_C}e+?3PP&=f)7REOMZRPltI1ij(?Qj(d)Fj2;^bb^1B z(<17|>M_hFtq;I7!Rmrc(1SP;lyyh|Q#%FF-g}rUQki)E#XuTcGYM!`WlLfhFri;8 zig_l9+yhQ!6V{xeHv+J*n$Ld=@I}9%ql&piNz#X|uan0cQs`O?{k+9cv4SjcCt8^! zU=vaI@Lu9j;7ro4FFF$f+y?+M3sdEvkRy~S0AEGB#OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00O8hmjCSTTmFJ64;36GZnVmqN(W{Okq&DToCr0LF@NGsO!CZTsW-<0P$%ZAmHI-i&8hr zUB*ExGKJtufJda>5=WjHa5d09CA)8_@8v-4Pk`bMb$$OmrA0|7fC5l4P!Ck^AcD@F zf4~uiGX)@Dzrvt?m8Q^{Y$1^?+81(#MHQ0fhd_1jPf87zqdi0000?P=%b4dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0003rNkldBngCR9;!JL$R`E&xz#!bJDiVok-zTz2 zQRi9BgBTJ}F+mBlDuQN5&rhPrqJ;Wlr|#PSA`U|f<1ismPEbdL=ShF&@)!Zu0;D02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00C}EL_t(|oXwKKO2a@9hWiF{@ByUt;wi=M zC4wY}MDWyJI)ayY6Z#l72wNx=Y=!1hAEp<54NYZxnTDh}^pZ7!W|NI)#l7v%{QvCE ze67}R9@)IJNV@}Lwk9M$gkEy0IXX5(^<3!Wkw9gxjAD|7e{d{;a6o?Ebx+3<=!aK) zZPx@M$K*D+G&p8tVaWJex^5W?=((mJx&ze|k#79$Lj5Mip)FS4L{+5MnBBd2{Izsg zh_|C13YFOt-d7;9k8Wv+r*ms=&JLxe1&0pxgufiCHXt5pe#!kxXt!Cg22AE=qF_+* zu_xzkS|=!@91lOLfC1_|=G3kMlVa#_D_B%GpcitBPb#9&$tD|7@iD~v%?brCUz%(X zA6BV1E_a(4Pc&jP3Y6vioqZZya>a*yHfZ~|e0&2q6aUMSr#{fy00000NkvXXu0mjf DO|sQH diff --git a/graphics/pokemon/pikachu/cosplay/back.png b/graphics/pokemon/pikachu/cosplay/back.png index d01bdd1f0825f70c5375ad5ede81b62c0ac9d173..524417f1cba32181e44b21388f398d2aaa143aa0 100644 GIT binary patch delta 562 zcmV-20?qy81^NV#7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0005$NklgA%$9P90(x%NeXqcd&QF!WaoOlco(1xHqbkF3W%L(0#OL8nl(TLgh0qdo{&N+ z^+fPfXz_Wkvk*83Oo3t_7+m1!z&oCe048dD|6T=3I{sim`b=O)iaL<1sS-?<42bw`q3U)k3aDaO1$Q;Z9^nShxt?%st z)j}tQn;`q-B#?p6cwFd5vk>eKf+$n`@U z&wSYe9nS_z!EI#&g1>^ZrRaMa%=XEY+@%-=+XxR^K?@^6PvI=^u1<;|n%&ldh`*3C zetOx<36T09oxsASxfbs&<9z;d5qJ=mE~`(%3IGYf1(xo4sciyNSh*=e?Uf76juYOA z_ItSq3+rfyc3_^tOJ6I*aLyi~Wg*eRUH7kzZ=?Djo0qb;C;$Ke07*qoM6N<$g2Vj; AQvd(} delta 668 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 Q00000NkvXX1g=70g0sJn(f|Me diff --git a/graphics/pokemon/pikachu/hoenn_cap/back.png b/graphics/pokemon/pikachu/hoenn_cap/back.png index a00abae9209f668edfd9c283f8e15e894a2740e4..a257b1e99425a0b63dc42da7712aeff3b9739153 100644 GIT binary patch delta 559 zcmV+~0?_^D1@{Dy7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0005zNklX8E|eVAP4w-Vx&S~x@4($LRvzIu@czYN9BJM zA%sk%75KRffj|f$WP&dA9&tuAKop3&fFTru(BF6i8wx=M@YMzaDO7?1-V*)~cR=bF z0@V!MhdIyz$U_@LR06s4W<&yd1hFjHoJ4NEw*g|CTId23)D4*cZwZ7}Lb!nXHzR^_ zA4fn65JVBS8il?BEsOzDf69@50cn4EXa^92?C(GvmpR@x{imz`2Y4d95!QesC7>nH zJb?l@uOe6km;o~2XTTu90&*%7m?axL6@)DnS#_;CQ39$C(Keez1$RGLq*bAu(pkaa)Xd{1)<(a<$ zNFQVthAn!|?=FGvw`z4Okk|m4&sm9tcE2H*25z>}5cH|Q<>k9j-j87>Xq|qTBaBlN z!m&LCprCi50f+P%;970t`T7M|2`~Eh!W#g2mzKcl1PCBqXeBJqkOByo!0B;P??mHe xQ-tmFtVLMXiv-r2Zm4sBtw0;}VjF&~{s1|5JN;t$euw}7002ovPDHLkV1i*H1P}lK delta 670 zcmV;P0%8641m*>h7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00Ih0L_t(|ob8i8kDM?N#eI<|=+=s^fGW32 zr1V#&J5gM^O(aXer%BMQM9CHu<|?E^3PY80@t4c^FSfa)y(ZIOct75}v4N2P^@i0P zkH^pd(w~Z=cs&02oBmGfSWQe&s;?glQ%$Jf+~3nq8aSZ%e-Ho(egEZ(L{dDqZL8Wm z#4Q$qL?U%rJK!4yB*?L~_2hb_2i*gZ=*shVM_7Q*G96)n#I^i%$E?fA0M9}Z$smdH zE`uoqQXy6@7d-+{vU&%siy>r_scab2y4|UC1rS?|iM5Re&Nc!9NT@ZFIjqCkOz|vR z!>TMurfxJ+e?IuYqAhZD12dDQHzF0VS=8AUbo5<|P1pVAeAr zupG=3l?CPq_-em|+F7J70s=2TNlc7e1O$FLU?VaI%!3a&V$_$3!UXU_$)3m!kRt#G z;uAVv#s>vZj&>v{JwV1eS3s?{B`CQa7cOg<=xq&Se@Cd#r1;K^5hT&mTeT2=7un&W za!5dCUWDjEV76z?nYs#y94-)-KPYA#RYFhinlL- z1MAKLFn6-rT7WpjKoTD0-XR$RV2pL|A5|O0_rROgAA@=Tk#Pz^G5`Po07*qoM6N<$ Ef{Zg7U;qFB diff --git a/graphics/pokemon/pikachu/hoenn_cap/front.png b/graphics/pokemon/pikachu/hoenn_cap/front.png index 19bbcdfe60c649eb8f3e02c886c769eca1d5cd44..2c9749ee2e350d6e398b99433d648843289b5a23 100644 GIT binary patch delta 566 zcmV-60?GZ;1^xt(7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0005)Nkll(+U1Bdg7m(V zj`D>onh>N3MNI(2PwbMHj+_I$>`tZdH#pgU)K3UJHh5FbJd6ORsWf5kXk8&z8uUrWKr#0w8?=QX7rA0^EP~@~nr$ zbT6uf8$jAXpeMsr!ICd>91@U=fy^IC{StuWUG;JV(3XF00VV{6P^p5qHxu%<%^`_&r_0>|fOqtKm0=s1 z49{wTs^?=w{m9U4q7st%_&*{eZ~WXGk$=)Z@x(lS0Hb~+RoE-NQUCw|07*qoM6N<$ Ef`L8?q5uE@ delta 651 zcmV;60(AZU1k(kO7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00H+&L_t(|ob8mqj?+L8#y3bVwlqE@M1_L= z0LRK#T@`H+s7&F)_5<7lAmJM6PBK^JbfmCdqDbtx1Q+(c0Z+y3ZUEhSaxKk`qA1Dt z(>H$|#-8FoL>Pw8Uq7Y`APHz}HtI4FHspU}xVS>Ih^39Ao55ovl(9%uXLh)-7}v zWGv8*z*%$fcWoJM32m0qDFWac=Qr6A2S5SUA3$d%e^5CpqxR-iV8g^!mJXPQxdcTO zSs*Z(By$er6O0c;HTLKMhhk55+3yj-vw%a;5*B#Ic=Zz&fesWznDg5`8I{Uv>hE~|_@Ov4=X~FJ)fU@G z9=(Z*_j%Q>8U5*KTw!Xe6j#b9`Xu>-N>#PeUw$s$yUeRXj`Ul(C9IX4UnweCqqv78I#?D`fJ6^X(e!SIhz`wk%g>mB6 z{yGJo6FcQS9cJ};Fex^LPEb+EK5};TzdZT4o;4y>WmkGu1O3k6>FVdQ&MBb@0Po_9 A2mk;8 delta 423 zcmV;Y0a*V30`UWo7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L009+AL_t(|oZXT=Zp0uEM!CV9AZJMt-0n91 zQrcD6ZnyJv$w^}=l98*-y0GPHAs`w5&_{|wgXZZQ1jAG6PcJ`YwcHPcMEZ}oC;DiG zITX`*0q&`ffJ(hY9^XBiK}~uA;RtSw_gXJ4b7Q!aAt$A~>x9MP9=K-R^P3RW6LhL73n6;|Er~y|9OW&qatWdZ(DA*o|Z4a7?W-L*0(;X!k#O< z*&dEu;T@y4XJbJiSJ!{&3j4JG#f3dYva_0@5XOJrmLr;&~PV?)HCH zSw)CZh_r$*mLU*!LX1Mt1|a~9hz5uvQ57J@Ob~<}c4R{#pa8yFLjc7>Fu+^F|G^AM z{hdH11NVUhS^zS%HbfzSJ9kEUK#$g*HIyPdR_mFEA|+>;Rq6_gCO-m)YJn^`~C{1zZuH2tII- z62KB@oInPSpdwfVngIj|BVZ6{0g}oDMxwt7erW`chOxJP{E zXZ{2reUMpbw&*&)vjn=|D(_aHZUbmMXE_qs{f1x~Fxg5&(5C|2%U2=4ALB@npT3zR zwo~kcWqS%hQSZVHEYb_W`rHF5sPj4oDaB1osRnfWQS-kCSpI z8ZVnHOrK|W1h*a}u-Mr@M-lAYXv}gv}P^^00000NkvXXu0mjfU%mLb delta 678 zcmV;X0$Kg}1nvcp7-Iwj00013M{Ml?000McNliru`XB%R02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00I(8L_t(|ob8h_j-4EVm1^_eZ!rrbBB{#?fX@t&AW3EF&i05;x(6W9X2*|~FaV!qIzj=7OZN7f8kfTg z{1l3adP!v0H4J+o7GmLY(IEgCEdpSfS3))!vXWA*o0Ezc0I|gwXjN+9Xd)nhgj!RX z!#EsoS3tIge??i4T5UA)>D~oqZPBO=OjOpFTRjA97FWIA^iaTWLJuaRwTNK@M7zGm z^&tSfv92dTU_Px=claxdIAxEW47&e{trr`hh(ZFt&ubOpMP=7(o&p zdr%AEc99*WaJcl#*zFdfTwn<-@FerC1&C7+a{nSjhp68Hqpv&vs5&Sf0xwp70CoT+&b_fzG5`Po M07*qoM6N<$f@g{u^8f$< diff --git a/graphics/pokemon/pikachu/kalos_cap/front.png b/graphics/pokemon/pikachu/kalos_cap/front.png index e03175dc41a6511498424a048777c723fe0abd00..b8d995d8794c64466511dafb165051512aea1a5a 100644 GIT binary patch delta 560 zcmV-00?+-{1^5Jz7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0005!Nkl1LNKW4(A6!jL|G`fiqx37Gwj{`@Tm@Hj+R_*^qe_WLm-~a3O!M zK7?)KIshWw;6+fU-gp%bFmc#<6=XPMK4~y+EXPYG7ua(^<s3Dm3V(n+%|EL97q-P{O^KDgd34O*}#9Bpky=^>_xzd ztRi3oi6D(dmZfs#6 zlyn2p_-O*7GoLJN)C-QQLq^KmYtXfRAJ#rvKHLU36Of)RcLxAI;rS}VRx&A`wFN5A y$B6opp}C1lNao}JtbFiub5tDuiT}no=J5mBV<$lHJ}ub*0000OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00H_*L_t(|ob8mqZ__{&#}8RZ(M>e`1)NHe z%3{e2vb~Y2I|18ASrRdN0B;sq!1fjiiF=;#gnfTh-`xdJ&#zfo`jwT$ z`F`|%-Lo0H(|^zr>cJsjpdQ5s{KeS|A>Q2P-xDvDI`hD6e@z1Ci}RHbGG^;d`Ed%& zAFsr*5+^cVmt|QH!10w3N*+C|eTGrhUiGT|b0H5?FX!#Z# z&=9}|0r+|fAR*=e)=zHKuqhf30L1tULVs2k5rDQ9RPOVpk3by3UOk`sY*w&n^nTZ~ zX5zCbW|8p(&YD9N0+un3F!nGSO#s~B{02AT2q+-`e*>5}11d*u-PT?yHcV_~=7F&r zGtg9#DFTB{GA2Mi!T3PreTy+*mu|@}+btrv7O;zIA_T56ZvB8oU<3-t{0^9L1YJ)i zZGp}MT{k@`54bHE0VB{&aQG`~&e+92U`GNhK_^Mw&XGQEYTH~|12rX7+v>#ELLHQ? oA*uX#Al}~oF5Q!d{X5aR1|jcE3o^UYm;e9(07*qoM6N<$g1@*J*8l(j diff --git a/graphics/pokemon/pikachu/kalos_cap/icon.png b/graphics/pokemon/pikachu/kalos_cap/icon.png index 1d224061e13183d42b86ad989168ba6f0d0e692b..0e93d93b74cb348ffe9967003679bd8519f65f4d 100644 GIT binary patch delta 314 zcmeyx+`>FTf|G-pfq}s%pmol~YWsSDk|4j}|7hT>;-)D;HJ?3Q978-h-%dHm)ndTo z!kzob(c|C${Boh)NwXs&ZXDLLP%oTkxb%Zp<)_S$(pclqOc&1{nmzB&o$I^eIhL9U zMSZ{9!M7k^IkEnRHp8`Ydj_qX&l7pmFN*z&T0OO6f`Vs$Vtt5Z_MiT{q8534(reLs0`6})u)OtB2B za~@-g>4S!pyVI36y_^5XY2TavNQKSzO%7`HE{#3^I+$ku5oDS4Gx=S5y^nU^KaZ~k zAKkSC*3|xT4r+|~yHP-m<9A1^!xHHf#R+zgo`wCt&adAvRp?Ip^1t!G0ATQR^>bP0 Hl+XkK{BM>5 delta 432 zcmV;h0Z;yf1NsAy7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00ACJL_t(|oZXVKZi6rsMg0fwV=ScuQajYF z$-?ajQ_YqPmGDrh`KSyT@;kVriv*Mn7g}tC_exd0SnufC@_Rmv{pn?!sFtSza1e(qR0-l~xgd<%&gS`(hvH}{YR}FT1=< zi0`CQ+87sTLMLI424n4Xpq85&nGM2_!D9~_grN+Do_;b2(*qKbFh@kf=sXriV(DV9B{7g{LV162R=I5eeZAJPdNSL?F09K4e184+s&D=yQ-fQ3SwTf}!2k z#sfL;(VLUNb|?VE-b*z!gbke6addx#II5UyXf<>KBA_EAKxA+Y6(I;f>=hh10SH45 zst`iHQg9&wQxhkG7*?VNyt@kn6d)3uD;;UArviDuzIq?4g(rd3Q!mFV`5)a2YB6k@ z8d{qH9}TERun>j-Zp8^eBOpZwGF$=<0Sb}L?I28maenUwd?YgDd}HSMTjPIy1Zc+1 z#afn?{E9*0d^WknW|({#kvK3w0EOV88-J^F0aV(v1)wb0`#WC)ihk_Egx9>ky;RWD z-vCaFCx08sLKu|a0BCxYh0s{omB4*I%WnuLq>(^y*-4R*=Aidb2y^w7k5Iayr`+rw z1(0o~iYmx`{uWwIO>%-P f^08e2{IU23J_sIn7C%8000000NkvXXu0mjf)NmXB delta 766 zcmVOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00L=AL_t(|oYj-dZqq;%hR2E2HDfo3O{L_- zpil`Z#&Qr#5?7UAgA=CdGOH*RJE|yaE{Z1ViY}^JeF3DF2cQqY17yK2@4}gzZ-ej> z@vrQe&;R+)84n@(^MgP-EdjjRgXue;NRmZ~q230Mov`43Gnl zr{~swBaWeO0LE;<0sr`16A@!8y9O3sX`;p0A40gmkdTi}1d25p(AJfw%Grs^A^dnK z2+H(_>v^jLG<Nf6Zl&qoR{_J|W@oVxr&y?+pd8USt3T3>hCURn3RoXk%*N;UaOgQWlRs zed%f7DhB}K(NbDC3l7HNvIv0Brov*6XAV4_nUGT0AzCcfbJRitH|>%I0%$Q8(`2Uu zf!zNzeac0le$zaj4*130FH$9vCd)Lq_?`j8Y3Wrje+St60+102rPM%g?w$~v5P>!F z?*0KO5-P{RZYL1=@`{wC8bDyT1?YHcEG3DxU?+tp9!u~?FEUL`F>xUyXc&g8aRCq& z0x?nzbnzE2-5vxc2Wn612yYjwIH&|$1<1_p0)QElX9Yr*tPVnF-0BiZxlv)EGD@J! zg3=_Ve+8a|YeGU;*~crLh*40g_B+*m;!P5DV1Yzvb)R@)fF&Z0*airMZU`N9*nw?8 zoG=X7bMrqWHsDeO#xfwK;mer~biJ@O);->47q1A=960=OZCOx=JZ7fke@m@49GtE( wfY;o1a9o&V2Dkj9-3EnRhwHfw{4@Oq>U;u{5G^)R1ONa407*qoM6N<$f{ngGEC2ui diff --git a/graphics/pokemon/pikachu/libre/front.png b/graphics/pokemon/pikachu/libre/front.png index b83d135ace0c82412a3cc1568548a148a0003d1a..234ad40f955eabe6f1daa2cc6d1d7da6b38188a3 100644 GIT binary patch delta 585 zcmV-P0=E6{1(5}i7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z00062NklsoSUO-Gg0C2|`eU(v6>4{)&l@E}f0LV>L*?dpPElSm~ zB?>8F=T9yG!Fj_A^A-cX-T_=j1qZW`Bc&*U@)J>N?UwKUH4tx0$P!re*O$^Tm&>ve z5C~oY?=q2_G+fF_R}cQBH=6zuU4VZ@N@DI^8PXvGSRj2BbkQvLMH9ILSVbTorg{Ky zrG6@*B^voQgfjSjs&h*_wU%%_&!eYUzYwJdF>L@K9Gi*)@9owi*E6m?NeBwBgNNB; z*=;v~l+c&O;x}e-ERBDQpa6t+ z^^X$RzXllV0buJmTD7yS5}S=^7NBm%+uN0?k`0VMEd>V{yaMMf06m$oV{Gt}6qag5 zPw^7$jzUyT^S|C;=x`J60ZnF*q|F;t&Fsu^9wQEdtadHNW!E``b`{hq_nmS4>PguA ze!wJDB}n~)9|W2!K$QRD$38XECkvV|`+m}|PgC@8;?#2=Di4pxC!TIzA}{$r`si5S X_q7!mcqgQ$00000NkvXXu0mjf27nfH delta 679 zcmV;Y0$BZ#1@8rr7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00I+9L_t(|ob8mqYuiu|$DbnbtRGgLF;V;n z)F{HxE#`F*WH8DR=#a$+K~21108oGCSagLrztmL%-uxl)RNzQyjOHlF6{su->GrrfCl z`SeU(M=B}(_oeJqfVa_kaT(Q%3;kgptphJ7MKQ5EQ3 zs|_Il0)Q8bPnHRQI0#zRIzSmWu@!{{hj!zc>=H2PL7h8Jk(s%Un4`T+X(_uaQfqeoDf8YQIoAUM>B2AbF+!_w1hx0Z8 zzRPYxcuOF4c0Gu>Q|n@CyHr3MTEOYX5V4&eV`BhAx7r3BwQ(axY;M~IEHw1zMXQCui1dd z#js*$>c9W_+0&LS?5Tdu$T?qWZ=gcir)4i!+KUv#&aH5cH=Sm|zK(N6(tWvGQa72k zA_|qH4t!&sp?ba{?njcKN8ZU$&huRpy538#Xyb6$nej>Wf4#B6Miw6zk+Uiye-Auw znK`5SM3vW}t(j_fCRZ0bP0l+XkKFffu= delta 413 zcmV;O0b>6A0_Ove7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L009e0L_t(|oZXVKPQx$|hW!SoNG;vy#>f&O zMigPSTcZr7TPqgWiXuhIMqjq=cs9gg%;C1+JF_#u4IX}dC;7KOrT*AZJkA65c%b_k zFyhOw;E@qORfHmd!GW_JMd8z9NMXK$h(P!wkitOWV6Y+}tNInOFhK`0YavXR-`0kNFx|45XO4w|QG4$v z#KJ(8mHUYnFT(U@{8VEiOciuUgqa0j5@C*hT*=@4Z9hH%c;cRE)N#;-00000NkvXX Hu0mjfN8GLQ diff --git a/graphics/pokemon/pikachu/original_cap/back.png b/graphics/pokemon/pikachu/original_cap/back.png index c60155b42dade6524f37b64930b8d43e6c5360c0..4f5d09e274c853c6f0bcf70281342ff953f1638e 100644 GIT binary patch delta 564 zcmV-40?YmQ1^fh%7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0005&Nkl21r+Zl~qTFUI6Je)X$wD(`an z58M5j%YS0D_H1kjNCX|=J;02N08t=n0)&tW0`I^f8xncJ0Pxj10w@%M0p1e+ z4^}|z7XpEN3vSpiV6`feC7cOaM*-p_UL1 zr1njZfIpo9NCAT=f?B=MRxk>EfY^T@bHra@Tps8FgdqDHaP`aVZ=3d0tN#Y>2u}nX zIB5_-6KI}522MXj&r9b^C1tmcG$md62NLhaXbrUQ= z9r2Z)`3r!?gUmv=Mfdq#B^dj)vTg+u8$k0p%aK6uR|M67#a1f9cq+iWd=v8fG0X(n z>AN{%KSd#I+hYI<<1SQSlRg1l);8|1p8-pF(7zU*0KmIs0@eu-K)jG8m}h7J2uxu2 zI4O6c^0LXo@_AMxnDrom_NE}~Y9C-J5Ixw2Z>xU=bWbwF+A<0N0000OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00JCIL_t(|ob8i8Zk<37##bpQEDm8IC5l`| zIYEvP2gyZ>rxYs`!5t!!_k?naSGm~02`oia6iGW!pf#c}J#)9fzu zk^6dizvXe}i*!j&sRnZEaRLyFjgA(% z1`gH&0!XMmf0aJ0!ohTLFH6IuBuJ?a8c9C7z^ElEb%24&*k9@a5&9`MsUQ;7D9T+bemi0LD>{tU@nqcy^fCB(k`BH7veeJv=Sj-lHn#!@@M;0NO`ZhY zm3Rb5La7Uk^#;fwb!v>~M}Wo!ri}znGF?i5IBra?FLJ98v@4+Z^Ugo22F16)v&BCd WkfWdPaL$wf0000K2HpW|i` z!l(Fs*0{$2pWsYBs$sco(Agi)V%P*JC8t37xx{@@1JmoeCQmk+z>^gv2N5VO;Szsn z0?)g_Ap}6A3%m+=a!!3&V&wTTbNG1`%nC>4vjyYMa@+(LI7s@H&l`?7G6>$Gdwk** z4GckW;|PHGiCyxtBj8~AS%l#GUg zwFo$oC;~Q+2z31BT)hfbz@0z>raBzp!gJ4o85+-3*v98Qm9%Gp4v||5qn1qC^NHn+xx2Chc?FPP1i6*Qy#m~LdDef!;kp;C zg_}UOfxu3NYXy^D;02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00IR`L_t(|ob8gmZqz^!#}^70r)>`I0Z=6F z34(ZlTa-}HM6yHy(pD~z?TRK3kZ221frNMgiaXIE7r1f56=1tOA+h5QH`x0O%rMH73fvWskKUn$lIyZ8iz%=Wr>{{ySk~VWAWB_`w=1P$l^R1DAaJbW z`02SZ=4U||u*LCNd~&eN5$LVXtFVi+*r|J+wL<{hj+ZFzGNYZ&O$gjyW(a(IVS4x4 z8WZGLZl55Ke|+))Hxqz=&4dGasaC*mulD)jRycEK0&C@$|3^LR)Wg?Ue*zi z5$vPqQ=QEU7L8u-de%&I7D*NvPvERMR3Ts);|OC9f1}X^zzxoCa3hX@0`lL0kr_}q za;vuXO0i)%1u_qe-I#%G1cIlSvvfUzrYXQ5cCM diff --git a/graphics/pokemon/pikachu/original_cap/icon.png b/graphics/pokemon/pikachu/original_cap/icon.png index 68179437b49d024652ff17d2fcaac6b91a61ec6e..6a356991e95aeeb213f16f84791837cbc90729b8 100644 GIT binary patch delta 311 zcmeyw+{ipZf|G-pfq}s%pmol~YWsSDk|4j}|7hT>;-)D;H6J`(978-h-%h#6by$JN zHFegHlz0FCzfF4OWxCSf#$mS8!7pun^R?$p`SB|AHNJB9EADnDFAqABoID=B(Y8 zqR}WKShYUgi}%p_7lMY;f=`cfNi3LtaN>>Y!Z)ooRMxah1gY3v+2`bTwxZAfqU!dB zb9o0DPulr=rp*8UT>9DJe-W&kejVma`PeRg;tjw4gro9)3KQ+8-T9fk(&D%BmBUBn z7dmYD_L85Iwdm_{H-#K+Gi9cUi4%Gqj&;or{u^s=!+7_Q(4nb3i#&k7XYh3Ob6Mw< G&;$UiQOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L009p>RBL5ykvbiK$zJEzpLWokcUf6><5hk*9Qrr{6}PPbfQ zZ&kd@Y^o+N}fO-Sm zh-N!9GT9Ubi+@_=vVJ;l$?ZpvC=AKPpdbuAdV@TO!qB@1ok+sWm$TGe5{5KOsSR@o zOx~B4G50|SI+`^1s9X|;7|$bI5{4=?#{XmzW&|`cVOnIum^v56U?a?L`|%B&S)iRw SR#X@O0000;-)D;HD5ek978-h-%h#6by$JN z_2`T*C!hTPUuL)~$XAQ!+Xlz?!8dKY1s^W?^5k;IiGAlLn0GKZ*!4O4)xFF<%TOZJ z%}L84m*M2@`3w*5oL9KC+oRA{aI>sq&zg_5{qhtMP?r~2%8iW7<02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00AFKL_t(|oZXVKPQx$|hW!Tj5FMBhQcuc; z7;x5h$D)KV7a_^_#l|A>JNe zhc(daiOZvJ+WiPF%!vn-$uV-}bMn%NR*rz)-!_SIPRemhe^-5QQst%&0p-i+!i0cu zsxm3|R!(>6b@qUQri8F5dZ4irAmHg4MciWR0qmxLASa=LdiFrOgU&u@@3pD%r_Ki; zfqVg6i()x6(yJ*7BmQZTTlHVtCAsj;pvNQ(`Op6`C$K6 bzwO62AIG2-S4|+E00000NkvXXu0mjf+)1%# diff --git a/graphics/pokemon/pikachu/ph_d/back.png b/graphics/pokemon/pikachu/ph_d/back.png index 568fbf91e726c61d36c3adf2dff04ab498a85e29..83ee2a559694773123d5b924f808cf058a935e90 100644 GIT binary patch delta 676 zcmV;V0$csn2I~co7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z00077Nklu%&A428!Ayd-4${*PPR+yVqLyOH)sRZCT+DCgrGbIZJ5zxCe= z@tGcsc}4(yNC13DV8Ani03Hz%fSv)+Tl{TmB97$Y)(AHmwfxpOJ6RRYG6EGrACbD5C*G6G^@ zwLtE2eA5!hW<>F@Bw&h4nLyctg#-X}jw0aCNGQ$rwGj~k&Y@;-Qqhe0h) za7}5n(E?zOV947uq0@^QCQ!H3A+CSDl%W#DeGgz0LfA}a01Lua0ys#bQWOEcCDeI} z84>~5u;{50&~h`G;LQXe3>iQPtmd$!nWLPvsi5omDnqO|`y@~6a$=IA5`Zl;|pgkp4dV0pz6U1o@oeP<8tPMDjZ zPM;XtwhN%SIa&uW*OxRzyy>ok02`or09d7$;!g?UngX`Fogghxf|&uf z_2(uJy&xDN+yXe~6d(_m0Hb4QA9&+(T@aQ4l#m-AJQ>h2%+*(D15gQHa8UFO1NpOQ znIP+}Z2%d;_y6KR&3XlN`h?({Z)G6sc`=WAC7`8$|IP4Y>l@O1Dc2CwWVEsX0000< KMNUMnLSTX+MK@Fc delta 782 zcmV+p1M&Rp1=R+S7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00MbQL_t(|oYj;;kJ3OC$EV%Ivr}jj4;pwN z2Tr)NAqywLXG5|VOVT|9cB_5>KY&U|&vGg^c9V_t6PSP=Jb2o(AHYxIOzV`H*4V55 z6B07-*WY{dNFn4ujoGLGYNr)|#VQn5t3qKxg~Eag1qb>Se*i3>{tYkyCbRM}z!7Lq zR;9Yh7^IIGRud4*fB~)Z)r?R+A!{Q>E5CAkep!P7Kk@n!n z(HsDpw5<=(VyA+j$ccB9QUKm#_2MXKajQ@Sf)I+d$CY|P))$I72arDxmLK5cRjx3^ z;O|M+WaKxgf93m^h|k|jfQrepYf-fQG+ux!2^b&@uif-J&FcP?qAOQV`RW)uUkZgi zm4IKzH$Ax^L7YWGVcUL&TykKw&H(_{Uvh;pwf)Xx0kka-Kd1n-aN-ifUv$vrLnFqA+6f17EPsn(0Wf#*dMfTk3|BSO9}KC)%TuAYgqf1!9hNNdBGt0`oRx*Od4Wwg3PC M07*qoM6N<$f>s$;0ssI2 diff --git a/graphics/pokemon/pikachu/ph_d/front.png b/graphics/pokemon/pikachu/ph_d/front.png index 0022376076b9fa7578ebf360ccc3fed39d19a4b3..75034ed9ded325a4cca2dedaaca6c605af0e1678 100644 GIT binary patch delta 687 zcmV;g0#Nym>Y424aAAc(&IUKxPcJ`l{U0XYx56BIM;jzd5$>>`> ze@SQnf_(}Afylu=LO{xQ96W$%zvHzR;5=2m64(f~8rSDta^8EQU{-%U zX=?LH7XW$*A;yUR0Evjdqc=c^4Sr@zo2(u&%Cp^NbLp%gHr;N{KPQx}xo_1HcJF8->rj2TU^76`Xk? z1jYgq!v{)w0YVt2GOY=5w1jDb2e^O9MkOSk=TY+#2moXS9OMLs#3-yA7eN9cV)HyN z9@QP=R7#<90ESE<$jppn);~mGf%!?zlHw9T7`S-T*GC2Dxec9|p9jTquee!{=eYN3qPiuNR`*srCx%{oWt1kTa`;FVpA@Un5{bP?^+Yb;Y V83TCM>DK@N002ovPDHLkV1jBVOAP=3 delta 775 zcmV+i1Ni**1OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00MGJL_t(|ob8moZ__{+#_gbHsf2t#>Mpl zR<$a;=dcLS>MF*#peYj8h$;X!OyoEYLJ}r~R0V)(Io(dzmf8&f1d+(*!wvx5ZAyh3 zNRs=UPxlVn6yH0UD$8%8NeWnuzHA@gwoI2kI-8D0M+jwr)uXBDnwAN`I4arH z+MR2NjO@wOOmt?hMkS|A586BbCQ-7ZC37YP)opWDf6%`>I5x`9{6^^30q)H=4B61{ zbJfBat*0BR#3L1paIUynKR(6>qCxrq(a^Jh_XLCuqw8T;1~>o*Qr+I?}F-EIH?002ovPDHLk FV1jy%P2m6l diff --git a/graphics/pokemon/pikachu/ph_d/icon.png b/graphics/pokemon/pikachu/ph_d/icon.png index b6bff421642c756eafe3bb33c0065ddc4b2a0ff7..50357beb5b1f2434835443e6a67a5b0c5b6dc80c 100644 GIT binary patch delta 331 zcmeywJe7HZ1SbbG0|SFkKRa$8sH*nYjVO3b5U?u?cLIk)%Q#S6aL^rYjnP?LfHYeYxKwWxc2 z9L&??B)4}O1UYQW?Vb5qCBb{%Vx>ECEwfKrKdWU=v16QJ{kVR@&clWVj2cRJ-Zeab z&=D-lAkwKi{BQ#`@m&_rT3bW`v=96&qU;<3-P$0 zc(3^UAa5f7%z3A;F7}?i{p0?9OJ3Q%dcTsxjdRHlXRal`oPRz%Du2shx&0D{E-+rl z`uW50R=F;FGslqn5>4|7%k6*22yOfIP;Y|rSBH8H`zNnouWbL~zW_E8q>}&u delta 424 zcmV;Z0ayN&1M&lq7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L009|G*Fa)3ZGg+QP85gJ}m{H=juJvj&S z8UPJB;7gDYI4dqVQbNv3DJBsBsn7(Z{Z}PYm~2E$z!tF~f5Zg9)-(=d0*a~cdWRts zQ`7a9hL|hX9bbLOmFVs9rP}$B2*$Fj9!Tfkjpoo%t92@k_f(cz5OAtneJAz-JX4vs zaebPL@ALEikB7y%4qWyvgn@81C?Tvi0|;SY@ntgyAI z-dk_7FyLIZIs}jicv=G23SlPOzZr9j$&W>t_tMwd58%hXIvFkfsJn`O(~nQSl*3o~ SBMN8$0000!kE|NrgS1`;5*9z~j$89!91!d`5fi`&=hfBdyz zex}E1dPYEgNI-r_5Wq8n0v-_x0Gs#J@Ik*Iq2m4$!2 zVlr1h7MuaTvS8UR0|K49S zgzE`B=x03Gjs=hzl0!o{HsBUM0Vu<&RtckiCOA4$9if!_K)+_Nv(OP-L)ZbR0zP9M zhoPAO`wR-;^Rv6N_6R=6paOpOfM)NmgaLqf4cH?%=;jY$1wkG0IcwGfg7tsYke-}| zQt~^Ct`S)q7As3w4^0^&vyg!GJ^&jR0$O5PN^CUw6&zf?$x!AluSMzae@;xfwQugMtX*)O}OOe95k- z2yA~E;#RH(WVg*4R>YPhZRt)g26a9KB$-bdc}(-XGH&J%y7UGBPAQW2Ue`XUo6NYG zAEWeLUkIdq4AIjZlOdAuak?RR|5lX(Jiav)AtofErE^V~L~JT0ytQu8=og>Q0lg)o zl&rER+ek`hvoZ+5E>*!O!Rv1d?=joC*vPEaH|2V_aZbalyx5WIoF^f+$IIE$D7h)& z?QcpsHW^F9Vp5o*=IehByEc^(6PJwc^#5A?0g_rL(t*AR+W-In07*qoM6N<$f;wty A=>Px# delta 908 zcmV;719SYz2GR$R7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00Q<&L_t(|oYj@FPuoBg#$8m&6-#;+QYF&L zu@xy53>grL$kf6~rCBS3I<+vk0|SrKh`<_w)CC@7oeO!J|9BLnV+2paJEJL3X|Hs|WNsu-UPsZWU~_?3@`c2;0OmgSw*vsi?Bz}< zk&za2#|WJc0xUpTO$<47m^te2ml^^vXKos0oZe{P00OTm@ftyTU@!4=V;X3JG?ME|RnuMf1ID(^ zXYM)4bzC)z?mpQjO_%G8B?RtcQZ>zAXRRqpf6m=q8$C*VuWr+lX%<_KQ#)y%yZiXX z+XPXYb{w-&atejdCLN8vFwqZSLI8L@xXeJbaq i9_ZG3o%ZMV&+0cwoKNLwmj+b;0000V%wGXnI_0Xz&L{P-O|_W}~}5ORJ`1L~AgUuKes2>NpT+tn6*05ZT^2F!nS zM-Kpppi#3hv&k!>Ump;X#iEp2$>mOvK7Gy^1g7Fq_c-L|)d(dA4ODl%{2{k$oMxa= zwrL3qso0Yvd2YLTN)Q#Hb>Ri)0`nhwx&j2-0V%XCJiY20fNRU(WEYSC(!{JxZ3*_` zUB5NNuPKBw0`THv_vu$LhXH_@@jd{a5y+Qa-2lYXWB?Gz06wlOgU`E~zX2>{*oHs)^0##~!mdXZj`6j8 z1013GNTKUYic+9vEB2x8E!-^!UQP=)$V4WyiMQV1di~wb0ND2+|#2I$a}z7ZEXNgxur+tG`wwD vP?*{s0%i{1zgr{U0Q?pCNdJjXT*nu%?i<9uNv3ZA0000OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00Lu4L_t(|ob8l9Xxl&(#t&oASe^(GjVZ($ z+`)woE_ki!6)W!Snv5N)U^+ySqnsT>vKXXz2$Yc8qEm1}gbM|mVi#U1v~!kp_twEv zC>`9)Z1goC}i!<%9Y#c#N$s0vctn zIl#6t1k&7Le?Ej}r0V?yDkk;=gC6h2T!{Fw@h}~Pz{}n`H|XmN?TjB=i2Wqur^_pY z#BdM+TGp4II#Lt&MjS|E#DN&GE09OuAOyIRoLXEE4#0!203$GB0Ej*H{z9{pGXTKg zcW~3tzl*Q897wPpo+Ekygtg}IAwY>PsC1g+-wdqye-0l_pcCo)BT6$n?_Gz)U_GjH zprbwM?q81`9#|Ft`wf>>-RkwY!Q+U4Dzc|}hDYOuVS;FkI%*r*GyL4lS$x8Rkmf+M zwcS@A-+>9TD5O4k48?S?0SJjAiU%Ns!UrWHqmnsd*kNmIMaG zE_=nz7UQRrk|ofIR6F6D+iNkqXeuIrNDRO(TA+yA#2b;LlrgeHAurTPp?el)i=VEE q9VGU6cHQeP`Q=KYN#54d`VEig?>n+Y+Nl5l3IG5}MNUMnLSTZH$62@l diff --git a/graphics/pokemon/pikachu/pop_star/icon.png b/graphics/pokemon/pikachu/pop_star/icon.png index 04a399165b4aed8944166b15305d5a7f802f1ef4..c22ef85a4c1ccb8cbf74e7af0e73a0770c8c4fa8 100644 GIT binary patch delta 337 zcmV-X0j~ax1e*hp7zqdi0000?P=%b4dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0003BNklH{i09Lk zdwf6nlK^I5C1A+F)jqQO*u$N9tw1#}X0!ruX9H_cl){`q9*^+C0eS=Gg*j^;f&G7& z043|ZO-7)_B}eRY>n9{dM1MQH9n=ZkqP$)l#AKcw9l&7*vF8-1+@!hLQR^v)Xj`b9 z!MQC{9ZqmlTq$Ffli=BC%eJgWXhfW65X(j9>H3T~%QnBMPyK@$E>hmayMFirkg^oYwYGDP00000NkvXXu0mjf&&Hx3 delta 450 zcmV;z0X_bk1B?Wa7-Iwj0001qplF={000McNliruG#xh%%M1Vj02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00A&bL_t(|oaK_SPQx%1MLlPz2S)yY0ffTj zB?HdFK$g4?8JYRvxR>mc;U zWb82tH>X3j(>*9h!$#PK4~0&Rk;O+K`EG5LHMTV&vV?}Je`G9F{8$hT9i`_-7Y$@@ zaZYJshXTZqbkt7OkVcSWm(VfvkhPs(Sw8W|Rk|9MFBhb7n-m-Nc`L75XOMT;i^wIe zxKJXr0fY{OOZMm)`0M6ym-`=vTU@kgE`$D!@Xzkv!u`qcfZ=CjiUj0gjj#nqp+Xb{ z_swL~im^iIRF#>4S!5;Om5@7Nlm?!H@qiilfV6eM3^d$pFb)`;LS6y$fYAWYuWSy? sHoTNRFuYnxF$ZQZLI(^w@?YlT8?o1~wztV(e*gdg07*qoM6N<$f*G{A(EtDd diff --git a/graphics/pokemon/pikachu/rock_star/back.png b/graphics/pokemon/pikachu/rock_star/back.png index 982fd0ba3e70b4b66fec3316d062b580de33e36f..fd86f4d59ce7f92f0bb577c4d356fa1d678c4bee 100644 GIT binary patch delta 693 zcmV;m0!sbt2K)t(7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0007ONklyE7;423N%L4&;i>rO9ptH4$!CiCZQCse;R<&YzC zfCKWnwrvUuI1w<$BWFa-XLCYca|a*`^dHbY$g{T^5x)YU0%$u5;Rx0Hx&7&y0N{l4 zOmT#(oxm0v0}wm~LiTwEV{Ae$V5@((xmRK zZ~~ARP$}#?DTb7_g)abMXw^{EuoIe;2N~s@2kMs8g;2AE9ZKQ*%f5pQg@jT-&Zv7i zLI;Rgs1!YR8IM6pw6=BZi;ZOv3?TMUWZo=K2pAD8B%2+U76H=)bI}5N1k`^jj9v8l z9s!)}uk>v#c#?N6=w83*>*E99wz>rd&+YgL6;t?fe~TOLLBSEgoA2ftPdd*`ufT7MLyBS be=dFiZdxdxND4Uu00000NkvXXu0mjfYF|1l delta 805 zcmV+=1KRxj1?&cp7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00NLnL_t(|oYj>*Yui8=$4~Z0k-$ z#|oia6rmxMLTsN2p*2)hZ}7KBOF@)u?NZ3p2oL%eeWAFZW(Z`ohk&6&qVLk@B%LHn zZZ($vjnA^4pa0Lx=`bPxsT#c+pgpPqR90i58Z{Ow)L5uce`A5bxCVgvi@yO1!0fPk z8z2YvXMQE#U9ej1~j0T zW}cz*&LvT7QA7?HY$OQE;~zG@TNdW|w z9BPvw+uT^_Y2HM)`jS4ZhRc<*!$}f32ptthL(@vQOC>e;P@xqvxx; z_DPv=qN23rjhv;@NeR6Opa&@v4tf`~M=FF)3-R0_uY>lb$8^I0)r<)hga-yA8cjC= z(h{Qr=!1TzBhsb%9u%MbCRX8gLk|(mL!++eeG6U|0Fl8AQHTumE)B!??>0`49UH`Y zGjPPmf6vFfg2%QC%Z;r$nyr~;_e zGF>VVd|fZjs{pjD&Jj?0>YaLT+ruq@X>~x#HyBmgq+qw)4A}CIpum71a`?a;dXn+JN_u> zDxWSI{)6C}0sM6Vzj%(vvw|$Y1fX-ybCppRSq;ns&pqY@zz4_+-&B?53?Bl3$j*PV zu$pNp>F!YXpQ1blW{xv0_4_PbEPXaEzf`d`uOeo(S5?y!*xU36ezXVQPwlITd@S}i( zHPLBi8NAgl;B`G63QREYT&p{zBE)|y?(;GwsN%Z`AmeYXx#s3OJSu|ufX^8%!eHhC z$t|~*TJq~M9K4g?+hH1{3q#Z&zIIPE z_`^Lp3{Qf{&r^8k{TCxixO5u%3H#vpQTakZ-u~Wez-A=e09VgEXFv@U3<-aKCaq8q zmITF7HziO4M4CQ>$3k|#>KMccg9hb-l+^sXs+TY~2QIL{U;uA^NfsrD>@C1=ypi+j z%O8gux?n>vd8(VI#94|d!2VI(cpVs*-5sz6IY8Jk(Pf+^76NpB-T(&Epy&X`-Yddw z@(Lye3GX1Pt>P#UFCCHmlYv+#UrlHo8~PEc$LyQU1ugxg&wR8{ORwU@M-N>U-1?xU z$MBuyRr}Bn8ErR{{MdX?5A<9Qo)gkI4=%*HF1+I%{}Nx6U>5({r9(sj0000OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00KuzL_t(|ob8lBYZ^fqhG)BiS7$|35}`X0 za%qcp)x=9dJ6?(xStlSKL({Vf?HW9V&^q8rjL`W3{Q*lO3e%J9aXlpG-AnUFI%|j} zyVFYPH7_j8?)&i0_sx7P08jcyDcb-o@!x>Hr3ADU*xRh1e<2x=Hy@TLk0ohJgA@Qz z#e*=$H3>irVO9#(Sz7>-jucWUsK(I&J!jGYV129@N5?1qA!AoH*^%^zmCDKS`{6lb z-oM8)nNKUg8r@N zHcXg%siza5Y(@Z(({5qv&Ay%6;R%IEfSwIc?|u%b&3R808QsHLj85-Re=(YKThfG> z$^K&aYM+j1hR;)G)Q{60YN0)g+Ef6NsgBc&AuA?3{R|!1$zl{xGBj%vl5J5sf{G!D zfSHT*ZJE_eQwsH@4A5%u$BcJv2oXxcs1LNf6HF1VBZOo=&|c&N9|e;Bt#;8y@_&)C z4FIAzJ*e;xJAn8ALg7FmdBA|r*G`;-)D;H9tLF978-h-%fGlYcb$( zJzB`j`RDijvW)C4x+P_s4JJ;V{NKwu>HfC8U)z};U7jGlPW^NTw*#Zvq539CUAEc2 zwhJs8cUdu?xIQ)JNHKfG9i}BZN(BKn>Cb*n2srO)Ykum}rTSe@eXMnh9{L~s*3)oB zIpXwmU6-v4_Y|My#4y?)wEKV5&Eck?vc7L8Z@X+ATku)+r;DvlaqG!m+VjTg$?K_~ z*mxah1l@U2zVFwKdsQ)|%|7W>zmq?PmNa!TN&Xf5Yw%N+N{nMF$tDU;3%Ie?I@W!{QSvM5n|YDBA}N O1_n=8KbLh*2~7aPo0|au delta 425 zcmV;a0apHs1M>rr7-Iwj0001qplF={000McNliruF97{MY)=3H02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L009?CL_t(|oaK^1YQr!PMRkM0+Bx7B`vAQ{ zZ{WL?u9S`O(gU&2;$;JN31pLiC3h))uX+SjLKcsapD%38P7ASJ3P()Ze>xV0e*?>I_mO%7o3MJv zGK;-q+T)BojmZcejy#L~h`!*VP2aqMff0C$k_(BF=Q#9=ggr|cCBfi=MML*O1!iZd z*i+Hpd3e~rDOj_U!1E%|FIj~E%m{9+5P*SiC%~+N(At7cwe`S2vPauC1Q@gMaS{QT z$pKXHI1q*SJ2^Q%yaOt1u4NW!GJ;*15yl)aJ?BGME|~mUM?D2*<%4ebxB0jM@7=eE TX8E|eVAP4w-Vx&S~x@4($LRvzIu@czYN9BJM zA%sk%75KRffj|f$WP&dA9&tuAKop3&fFTru(BF6i8wx=M@YMzaDO7?1-V*)~cR=bF z0@V!MhdIyz$U_@LR06s4W<&yd1hFjHoJ4NEw*g|CTId23)D4*cZwZ7}Lb!nXHzR^_ zA4fn65JVBS8il?BEsOzDf69@50cn4EXa^92?C(GvmpR@x{imz`2Y4d95!QesC7>nH zJb?l@uOe6km;o~2XTTu90&*%7m?axL6@)DnS#_;CQ39$C(Keez1$RGLq*bAu(pkaa)Xd{1)<(a<$ zNFQVthAn!|?=FGvw`z4Okk|m4&sm9tcE2H*25z>}5cH|Q<>k9j-j87>Xq|qTBaBlN z!m&LCprCi50f+P%;970t`T7M|2`~Eh!W#g2mzKcl1PCBqXeBJqkOByo!0B;P??mHe xQ-tmFtVLMXiv-r2Zm4sBtw0;}VjF&~{s1|5JN;t$euw}7002ovPDHLkV1i*H1P}lK delta 670 zcmV;P0%8641m*>h7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00Ih0L_t(|ob8i8kDM?N#eI<|=+=s^fGW32 zr1V#&J5gM^O(aXer%BMQM9CHu<|?E^3PY80@t4c^FSfa)y(ZIOct75}v4N2P^@i0P zkH^pd(w~Z=cs&02oBmGfSWQe&s;?glQ%$Jf+~3nq8aSZ%e-Ho(egEZ(L{dDqZL8Wm z#4Q$qL?U%rJK!4yB*?L~_2hb_2i*gZ=*shVM_7Q*G96)n#I^i%$E?fA0M9}Z$smdH zE`uoqQXy6@7d-+{vU&%siy>r_scab2y4|UC1rS?|iM5Re&Nc!9NT@ZFIjqCkOz|vR z!>TMurfxJ+e?IuYqAhZD12dDQHzF0VS=8AUbo5<|P1pVAeAr zupG=3l?CPq_-em|+F7J70s=2TNlc7e1O$FLU?VaI%!3a&V$_$3!UXU_$)3m!kRt#G z;uAVv#s>vZj&>v{JwV1eS3s?{B`CQa7cOg<=xq&Se@Cd#r1;K^5hT&mTeT2=7un&W za!5dCUWDjEV76z?nYs#y94-)-KPYA#RYFhinlL- z1MAKLFn6-rT7WpjKoTD0-XR$RV2pL|A5|O0_rROgAA@=Tk#Pz^G5`Po07*qoM6N<$ Ef>bdZegFUf diff --git a/graphics/pokemon/pikachu/sinnoh_cap/front.png b/graphics/pokemon/pikachu/sinnoh_cap/front.png index dc2712fdfa83bcb55b49357f8538635ec0cb4cac..91d91acc28c36e79858d2d9dfcd2ddafb94e328e 100644 GIT binary patch delta 566 zcmV-60?GZ;1^xt(7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0005)Nkll(+U1Bdg7m(V zj`D>onh>N3MNI(2PwbMHj+_I$>`tZdH#pgU)K3UJHh5FbJd6ORsWf5kXk8&z8uUrWKr#0w8?=QX7rA0^EP~@~nr$ zbT6uf8$jAXpeMsr!ICd>91@U=fy^IC{StuWUG;JV(3XF00VV{6P^p5qHxu%<%^`_&r_0>|fOqtKm0=s1 z49{wTs^?=w{m9U4q7st%_&*{eZ~WXGk$=)Z@x(lS0Hb~+RoE-NQUCw|07*qoM6N<$ Ef`L8?q5uE@ delta 651 zcmV;60(AZU1k(kO7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00H+&L_t(|ob8mqj?+L8#y3bVwlqE@M1_L= z0LRK#T@`H+s7&F)_5<7lAmJM6PBK^JbfmCdqDbtx1Q+(c0Z+y3ZUEhSaxKk`qA1Dt z(>H$|#-8FoL>Pw8Uq7Y`APHz}HtI4FHspU}xVS>Ih^39Ao55ovl(9%uXLh)-7}v zWGv8*z*%$fcWoJM32m0qDFWac=Qr6A2S5SUA3$d%e^5CpqxR-iV8g^!mJXPQxdcTO zSs*Z(By$er6O0c;HTLKMhhk55+3yj-vw%a;5*B#Ic=Zz&fesW;-)D;HSaxL978-h-%h#6b;y9n zmD^0#Y3I-X`%Qg!Z&ZzR_~3ZZuJgG>FxT=a|0};66!$TzoH}q|+sB8}_jZ4}o3JW} z&1Ux}O^)^9&DJ3qz2$X+6?zJLPR8!ATIa!fp}_XO8f(XmkM)J>49(ou1hHDp5n!O1V)c7CzfFe%|*5hQ5;N}_RVTFtZ2loM+e z)TIqnpX?D)c>e!0@AJcdH!yDeTfk`e_XFe3Z-?2Bd^yaj@~ZveI{CDt+4hHQ=KK<5 zbGc^stI5=WThq=q$u=Iej$uB~8Pt|8K}W80aBK+iLHy85}Sb4q9e E02j%W{Qv*} delta 424 zcmV;Z0ayNj1M&lq7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L0090^R0;?gU%jH}7?Y#8bBe&_J~VVMM(j z8rj1Xm8gHZC>&}pd*b77&(lc4(5Lh~821r+Zl~qTFUI6Je)X$wDu3qk zAGUj!%YS0D_H1kj1 zd#7w8gpi210za1$flvq`B!Uj`9$-dBfG7|(0Ybr9b^C1tmcG$md62NLhaXbrUQ= z9r2Z)`3r!?gUmv=Mfdq#B^dj)vTg+u8$k0p%aK6uR|M67#a1f9cq+iWd=v8fG0X(n z>AN{%KSd#I+hYI<<1SQSlRg1l);8|1p8-pF(7zU*0KmIs0@eu-K)jG8m}h7J2uxu2 zI4O6c^0LXo@_AMxnDrom_NE}~Y9C-J5Ixw2Z>xU}OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00JCIL_t(|ob8i8Zk<37##bpQEDm8IC5l|; z2+0lNAh}5KlwySn`!YXA~;a`XMlU5h@h23a#cdN20|ewE;kJVkkD)cOrs%WkuJ$8)j)1NP5@%D(a|E; zz`7_~&D4lqy|`%B#fED{&3KD3a*UqW}* z<17)v0*KmNqj?DcADI0B2#iP5MQVY;13ud?A)6(_*#ZI&KZ#HDiv3I~QUIT-@YfjZFz*9JZA8w=Qu~!bAeB%$IR87qJ zZr!Mrn2Bb$o&!oS&~55wygYtweP!B|J_bKe(xJCsmijsTJW09R=2id!UM)bk$&-M) z5|02WLUn<$-T)b-PL1*W2++8|w2{C`rb`JB$BoJLMQ#;>b_Mi)-uXw>p!gPew)h7i WS)-r`;1SmV0000Alp`L(d3q!6-!>2+PBB^yqFCtsGbhFO0E znU*jKgerRwf^!ZK=>k910t624d45bBc3uS;_L)x_j2p}G5L{p<=~q5&IO514c!%!s ziB~i*IKh=80OBWh$;*zM3!KbOW#KbKnSaj@3|uytsb;?J1VcgOBhP2X-Pg({VHFDEvD{kAS-C#FJ%a?L@We2hfAiW7vD~)*txbc7TtcSyN zFKP=nfoubTo($6prhJj(E&;h1$o!GiF9As2m6s!cw*2!JU_wv{l~wTcW<#E~T+3Mb zoWX@H?1PeSAR0eSKy>7jrHy*Qc6G=|d3z1I*6+jGN7IMf;9>&O)8*~}z&ku&W!Oq4 z#k00R<@p#|34xtZ~WZcEC0lQ;~V4n0kG#Uh{)%iiU0rr07*qoM6N<$ Eg3|d4+W-In delta 665 zcmV;K0%raG1mOjc7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00IR`L_t(|ob8gmZqz^!#}^70r)@6B1E5IU z3oH?#phCPrBuf+^ZRG;lZYWMXK%y;3MS=1H6nCORa)BE+TmiPr6H<2E;Rbu3f!W>T zBkM_8nv71qJO6+CpN}2JZsR}1d_F(8f0HhRcz7bO*B`B3e+%*K>^l9<)78aeA&x9C zTT_5|vwDv?lw|8o`C$s&6YnloScQ`7vMh@!un@Keb-1iA5g>(j zpPw0HeinoQTO6OpCx^=%f!^x83cEOsox0aqI|RVpc!}aJGur9ggusJkhQOy+rgwi^ zV}cyZ?Gpr&f6pG^W&-eU`Ow)E!`>jw(R^)PiSbx@g8<+f-!#Vjh|i@r2y$@!a;#O| zeOCxLg8=xb&q1rV;DCkzHVD9%7XS(*2e5i_rG`z>cmP1+F9`KnSwsNZN>I7yRUH8t z!9IFE)!D3I(dhNAXU#-skz|qa1kRd66#|wqjxhEze;Q2y+~E8MH{u8=ApZ>*nE{m} zw`yxYDK;#pK<0t58#B;UktqU$O)@4xoVS3<`xZT5mu|@}+btrv7O;zI!UESAw|>AP z(18LnzXN6*LD!Q>TcGnm*G+HA18z%3KnJ=B4u680Gj{P8*pUEBP)Sm^bEM9j+BTQg zKurmwD{Xb+YoRX6){s>GJ8x;=AM$4XHt6^T<@k~Ye|bEW00000NkvXXu0mjf53w3a diff --git a/graphics/pokemon/pikachu/unova_cap/icon.png b/graphics/pokemon/pikachu/unova_cap/icon.png index 6d448092847230603facae126acd1b177055b160..1dbc18cfae63e36b50e6899f3ff7bb8de9c38a5e 100644 GIT binary patch delta 310 zcmey)+`v3Rf|G-pfq}s%pmol~YWsSDk|4j}|7hT>;-)D;HSaxL978-h-%h#6by$JN zwRKj9!pZ;t-zH62H_OD}#$mR-{!71`^m3>#RiEEB^Rd)M77lqKomT(4*V(z@O^WMT zwwrOztBvcld&rxypP^^#wT-QFS~tJ+c64Fo@JRYCxRT+K?n-Ok5`x7pqoPG5lrU(elo*E9H~^*8T-Mm(4E}ku2i& zSj5P@Xor8N#=H4{oc6uxk5$-h-{W9bAJMqx-v*|ee-c?9{Y-w{Yrjo2ynaX3jvt3b zJJ!_xYL01)`76l5QtG0hBruDOlf}sW&Yf5Pe?4S9lrQwfQla8B(DMwQu6{1-oD!M< Dc)OD} delta 429 zcmV;e0aE^e1NQ@v7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00A3GL_t(|oZXVKYQr!PhV=&bFoLWdDzC}n zzoR{r+GNRCZ^=V+GW2aS74jI?dNovz2^6bJV#&7lLg_8yK7I-5^a=5&%eGNp92SJ6 zEDzV!)62VDRj%naBl!L}%CZ%ds@5lNpi?8DZS4-RR;h7IfB#xYxy!imfyx!@oP9vp zYR?HaMuoc!I(7grWL)H^>V^CufiYK^Uq}HxPt5*KZC?!cbK_ z%avyKf!_JDKW7Y$*Ma(q8>Ds;h8T|>>?91O$hG^)Ntg~O5DBwGB#h2tVKf%P{I(xI Xbfcn1$3*z0 zB#r2`j}rj0BV=2^Fbn{jU-Vl@1TzLC4u23P0G9Z$m;*qqA0Gp#3K$1qI>iYvHb}rN zKt_?4^it33aYo<{zUoZ^_h!qwq4eX|8= zB=YHySABrbe`NrY3F;4~?jCY$AOn9&a<2q!zx`^xtZgkA725Nu?Z-l&eLyBe54P~f zfwnILigbCj5W<&AlXZ&FCWItnu`rAf85o{_Do7@x=7i8aS$m$&iB3ZvY}77pD2RDk zRsvW_AZm-RJMB?+`sR)fX@kmAx&(0H<=yS%d%#d@sz2ZR3)U<|+a=(P?;a)qdYwiC k6(AXK;~$wFJ9fN@Kgc-}Lv%`2GXMYp07*qoM6N<$f-1SkCjbBd delta 518 zcmV+h0{Q)e1kVJJ7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00DDJL_t(|ob8iAZo)7SMUzO~*HOHv#3Hfc z6BrHB*o6Ms>DcGNb~sr&)6i%v;M3Oe5HTfm9c(y z6c7cp0MId@1^^l9zjV+=fee7J0Ftc%axH@_Vt}2ZE`npGf2G|+TNh;zKP>bDn+Z@qq(mWiDNN1t&m9H~AH84WbksOm&=JadPtQGrqi6ixy+CN07B#DikS zmN?~{aQo-5r+U4oBp9Ljph%reMabq;>uS0O{IN2GYH~Kl+)l>Os+_IbMtd{nLJZc; ze#oqk54PPHb2TIIy|^t3&3OR6@Y@ndZG-{9^Lk0181?V!2eQ|i=lne~X8-^I07*qo IM6N<$g2a;FEdT%j diff --git a/graphics/pokemon/pumpkaboo/large/back.png b/graphics/pokemon/pumpkaboo/large/back.png index 571144ecf9008fb639ec4c2c30bba23fe551e57e..e5deba0d7d62d0c148a8fbb691aa545ba9e58c87 100644 GIT binary patch delta 474 zcmV<00VV$H1fv9y7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0004!NklNXv49F<^=l<;gsDu0Qkbyu0y)BCWjX+L62H3LtAH6`4w|cA)w*=GUg+7&W zt%s2wq9IBI>BD$)a`y;Yy@%>*U#Wlb@nCvrI*?~7fo#ABfSA8CKrP9h`u<7v)EPJd zz8p{NnjrntU!&(&M+7dl-r?dOOZ{o27;H#Y=&OwbX-vgvT;XZesUE&}N3>Z;woAZ~OSuK;ahwcPfYU&j|4i-JvExDf0S?C$6Rb2qv`+v02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00EClL_t(|ob8iAZi6roMFFY%7{Q`a7r`KR`cns86vzPT2Y}*_0QJa&Dq;X_A&TIde<|HW0)j!Mq+|wo7=Sv- zIA|UMIJBIWY=RyO0D2S9gmeO=lo22kI~nbe4imybrZ83r;2x+0777ov-H$-td0@A} z?Y&+hOeJM|M^yC;pmp0@12y^yVjyl_IY$(OuKbXNp4Mo_1|^-2TD)$v^%W?w92-C} z9Qwb+6-ZI*f6;;xBSfjM=M8*}jRW~j@~ diff --git a/graphics/pokemon/pumpkaboo/small/back.png b/graphics/pokemon/pumpkaboo/small/back.png index 23283b1b30431015edb77358ebcf3eac98cb5515..5d7c21e3465d5cc220350e31899fad7acf675774 100644 GIT binary patch delta 437 zcmV;m0ZRVQ1pWh%7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0004PNklqD@6OyBmqC4H{SS_V1OUV z**V6vUgggFX#lgg;Mq+;v__b;pa#GX0Ac{ZLx6t*upENs0nq}@RDqBQ1{gO$Nuz%$ zWSRnaJpr)@5IMK{R1*IULgc&$#K&CJTRk82s7<&Vg6YxKXT~MrsQ0-ZTnPL*JzAotMh`R~ z=Va;xVEU#5$|Kd8=>y{WI05WlbOC>&m!D|cg4@Ehy#hMNlgRY>doJH@gyKQH_VTau z$GvN3C0InjymlPed^S)UrUDU!jgJP>Cbo5#%wk%W5EP;jbb0QjAekrzLLloZB9Tk1 zVOeY>sk*pga}ELfR+mh%<^f&a(8)JbqpF7M^#vO(L<2P-+SjQYfL(^!Km{S#41|e) f#2atC@h|ZQU{(>BE4zRu00000NkvXXu0mjf9+b?v delta 518 zcmV+h0{Q*^1J4AI7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00DDJL_t(|ob8mcZi6roh5;#ijqp$@16XG3 zR402N=e;=i#ky7EWzwyZ^9Jd=)Q6pvkk}ckN;%11?&H7zj)Nq5#Gi$#@8oyuGM3MF z0-}Hh038Fk1ZX4qMc?*OAOptl06Y#XdZ?m6!rLa?MOxY#e-Skla_<%mtJaXb?h;byi*oP~QXd(Ds#20orxGg8~6( zr@Rng6QJdDe}JmG@Bqb&j1#YZ1t{xK6%WI!L5W76-#gW`JJ-)~V0P>+Rp%Nh(P%+B zWr9dm<+_`gq~pWyR#`p|pM;QQrPXw^2m+lUT9d(;T-9{JTrz6W8-Mgezx1z zgIpSOFel(JTiw+D6<$2>WviI)`ED21f(ORy82&mQ81aAO2gQVyBjODpN&o-=07*qo IM6N<$f+v;VkN^Mx diff --git a/graphics/pokemon/pumpkaboo/super/back.png b/graphics/pokemon/pumpkaboo/super/back.png index f14291657eff9d422c2ea65b69849c1e3f02b425..85cc83e2c0cf730ee55dc22bc5779cb7dfafe145 100644 GIT binary patch delta 489 zcmV7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0004@NklFHjk1~X_yw=mg9rBzLRg_Q zhiwBd@HYixk`Loc5|aWJKPY%E34{|<7Nmd@dqKbqfY$^7EC@(&gav_=1JObk%mRN+ z7$9T|Yy!gu=m-hn2c}^IT6tX{;hVtlDv(Vtatmp=1tzfNJqR?)*T7psnt_Q7YQ7X< zT%bx|A_oc$2FCzs1;*w8#7;rUi9N?TYzqBKdFlxuskx5ww5NcjKQ1@?TNV9qkBcd~*DArkdIC0vev!jnMhx zI-UN2(fSkn87_(!ZC3+`fBCs3ss$92?vJ;h6;d0RT-d9Z f;fwCUga3d(TN4$G@g6X100000NkvXXu0mjfMjYkI delta 561 zcmV-10?z%i1o{M!7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00Ev!L_t(|ob8jbZi6roh5@yEj9{qLp|SAR zsZRFdocBVx7wZ;@mr1uu&Ku-mdNzhYiruwCPYOc$KmY#kY?9=^*6R-9`h6!w6hJBW zPZ2$Pmph07NIGBysDMhvB0?7hG63-lpm-eUl!^irvM!=se+a0G;2csCGF=t=EdZ3ecRItV0n9IM|b@LwZ&nq?9y;kV6WjlY`y_0k;D{81NMuBp-pm z9I|o*4%MojcN4I~*A*RMDk=33BF7m(^U${)lsN8C4aCj&wMDE3z4jja#hIr9TW?^S z?Q9H4_?iI}fBq+5xSAO>qk*zuc{{KY%W+C|=eMDnE>2oDZ8Zn#p`$4SN8Z2!aDKYn zOa{XaR#U>hvEh}E2{;zxh`=35ZJ%3gMhE5q?G`KHR_C1(xVeUOe=?VXxns*2!*;q_ zxy#smkcDQ)Pe#?Bu+6V$?bbdRCXn^UT#iR$PBVSDLyr20fYSn?K{dt$-ew8>*B_{FGitW#VF-It00000NkvXXu0mjfXI$(d diff --git a/graphics/pokemon/pyroar/icon.png b/graphics/pokemon/pyroar/icon.png index cd0b94401f9d5bba8e353d66b28b6847b960a580..e00595a15955b41156c947af7d7382c083a3c8b8 100644 GIT binary patch delta 419 zcmV;U0bKs81ndKl7zqdi0000?P=%b4dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z00047NklVhf+Ih(N-)HpW|z#UbHG;{*Vc(zCu z!XK3H?mbgsOaSU~w&a0zx@z6O0;nvaHE&pfvX2%{1SZjUXQiI!bOnqDlU17E2uoWD zRO(>^KnD?X6=);w&WqJCBB3csMe2W$RI`KuEIS1AD?&^61;`mD$|dT2V$<7r3}jW# zP4aXu{n;^TpMh=bZ!n_b7;ZA2J2_8vGmv2r=fu@O>gANf5UvI?{Goj|kkUUG$n*7o zYamB@?+oM#d=2CveqkVsel?J*KWql_${$t(*@CAt{g1qk_%na_0fvz%q`42KYQg{j N002ovPDHLkV1nh#!6pCz delta 481 zcmV<70UrMB1FHm(7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00B=)L_t(|oYj)Oa>6hSfc*w~qw+R%BU`hD z)nR~@cwhz%&MS53k&?mI&?A_^uK&U%o!W)FYO(H%B1g){*s}u0#JO}Df|xm_5;Co6 zL!oj*RWL?Se+mi(nn6hnTG(*(C$pXoK0zZI)a*{af?bIje>~L!rNht}d<%oJ779_2 zzXAMPMs$s=JkXBPSM9sHEAK~PHDs{Zl!e(Jlp0cr`6!E*OCy!)B7jzxUyGXif()>A z%k$-+?66Lw-KDKove#CP0Eenae7DtGzW21%=m9L33EZ0gbU;b$x=Ky?7LRaKHS8&k1lzhfx@?T@@!Dg|XVD znMPqW1sx{BP}E^2OweH_Ow?g2Ozb!nCW3z;Ow!>Y%)^gSn28@*m`6D0g_-L>fAZrS Xq3m0`$`o_K00000NkvXXu0mjf9zD)3 diff --git a/graphics/pokemon/relicanth/back.png b/graphics/pokemon/relicanth/back.png index cf4886a6b77dbdd67b83a1c6d0779ccc31d94627..678602343ae778bf2d80518731078f8ee9627e57 100644 GIT binary patch delta 540 zcmV+%0^|MZ1>^*f7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0005gNkl`(zIC1G?3l7tt4*@JK#t_K?gkR0m~t{&aPk3$L8Lo^BJ*9}3b z)n@{F09*lt4UtX(_%#N=m4IsJeZ81~9Uxo)iny;ogUS^37i4guAn2|%my>@DfiE^b zhn1JN7F=7HQEz|%KLw<+{`Y|20@?*Km>WO@6Of;u+{04Y-LiuEF`Y079l+K14`Y9U zlKa0~A}_$-R_yEh+vp^8OK=BB{$rNdByb&pnwb1M$JhII@|RA6)vJc?mBC-5c+?0E e@WvZ&EFXJTCfdH##h?HH000O{MNUMnLSTZM#rgUG delta 673 zcmV;S0$%;(1nC8k7-Iwj00013M{Ml?000McNlirui02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00Iq3L_t(|ob8jnYTHm0$K63tG}VZ7N$ER? zgFQrg2n%D=&!GgL!Nz@tLYBTj1InaQT8OEk!5|8k45k!9dxuUMVzOq;GxU61$+n~i z$dLbXuXTU-f4;6eod?}FJ^om2yRE>9{pog(>_r>!##-m$f5ojt62$g{0ub9LO<))X z@s$Dr#Oo&T0>YKE7y`6dcmNl0RRVD<00Cr@4sDw;yc2*h%1X8+2{MNMv;iG zre(ANqbPt#05MxPn&m+VfYS!MEfVxG}$5lSHb~Hl73BO)uP@Wf${eH{IUl0$}*i~ zOpHk%p$7+IFfZh`$!9!;joFxD5-2c`6pa{fjErfn!_qc|0%-ST%(QdUOe6yDG$3k(wzesyskes;H!MV9~Yb( zAeC)jAfFKk#xIBhIW+(~qAa-JECtP91!gc7fWx5ySRoe16r4{}P#RUBIi%qB$$Wn# zhz1pi8xB*j0(_{!1!o2Tz$9S%(b7K5;huI!@$LX$riK9nWd)DUB)mOPsg%mc zCi4BMhAs|pYDEbg_te8y7zAVL%94L=v0K5wRqL--R#?T9hhe6f>dJ);{b)^7) z6hLfYGRQ*F6Eq5_381@8<~lk8U=UEVm9&kBGF^2YLDwW`&b93|q$h#Bl40Nxhb}(} zXv(Pa2sSjxi2!Mg5A$u`=4^j%e^CRcl3X}j_rdi zm^y#kgdv4k!u8D0HPi=5up3PZX_d0UmT}K_MGp_YNl;5j71SfCn?MifRuK9GsNajb z91zM&n67wY{C^yIs|NHdIo~LdE>(fdt6*__db->KQ18UT>l^Jp1Hdvp@*#xo$)>oZ@b!-8hNX4VF~WTcs{D?igourk0nae9#Xn~gZm khqXZW$r~r(fBe$%0cE5anJXoQBLDyZ07*qoM6N<$f;+Jm5dZ)H delta 675 zcmV;U0$lx`1?vTn7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00Iw5L_t(|oZXbcj-xOPhN1HUn4z43QqHs; zX|5AuxDUd;7eQZO-(T7|3ABWwk#-L&Z4QLSpa0(uay{=~E&nHApZqn@Zkh*NfIn^n zz30V&KVG*y{3h|@Z-1l>0Q{!+VuG4BJR-m$iK%TifeP<^e?*j1_w^dUyy>Hn+N~l0 z5u0=*Dqed)r~m|I@EU-E<0(I|uGb!Lq(Q|Cx-!wNfZdT4APOStsw~6G1vrAJS|F-& zta2CFaV83mcbT%N(DB$4d#g(#s&ifE5>VfVYumFxr{hi$(fzK@gbLR+2bD{|5HLxi zCi9Yu5ZhP4eB6u&coV*x%|8p$r|`D8_EnnFZ(ue9cCcRQ2shmKND{@aRN^I zdA#-x02Yw?rkXapIY2o9nXZY3!x9hy7~q_xmRtgIQaZCj1rUkXKy|hPBADBZ%x|;H z>|zp5kBc(Zm1dWjCN6=u2EYObyga4PfGvUn=`9yne?S+ZfU1`EPhCuacmg0@eTx5m{RVpx*^S-Czxe5jrM41_z*fePxr|KqOh9CeNrY5B<-iHf%KW$Yvl+xBHa^qC&s z<5R#L3)MG~zhi;wux#KCKxCxjJAaEH07q;;=`RDoDL4*a1J?=(=Nq{sbjbvI`PF|k zkmbVRPvE#lK#^CyB9;kiz@^}8D1lW1s$4>ZA$_d_oCSz7gyX@8MFL!FK*krqW0BD4 z8$bwgp$=gN2sj=O0mS%@fY}yod!-a zkOia+qHrb#NIRCV2rwYDRTMqnjCz0fr_sBl)@4t|Kxix^K-ALwSb!tDV^4qHsp9mHJj5(MYfa~-EAUgG0 z5$bZVbBNkF^FSnZfziu5Ai^Jjj4(l**8$VI@OnLYrRAmE)?hnFFaU0V2jqWddiLUY za@5N7`mS}5miE~9-3i3une~9ps}1T1yu6rD%Ae%H<)%8(_ZCXw^%qGtbrY++-MLdj zM(B%mO7f!^+1zlt41`SwmTR=@8j$Mj`*_NZgz}&QHk~WpX@?$J1A(T5ytBCkp^lPP z-PqKuiL*Hs0|GEUr?X*AWWsH!PeZ14i@(m5HVsm}YXGUZbM*uvdRO%Cj)FpHDt2RYalXUcH{Aj|GN8`d-U bkMD_J)$11CID@v&00000NkvXXu0mjf-I+K- delta 731 zcmV<10wn#(1)~O#7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00KuzL_t(|oaK}~ZreZ*g}DUMYe}sFBrrfN zl>?ANwE-+{Yd{P=>QboSULjRZ;WR4UDmSoC5d?vdG8f1hGW$b{W=Oeo;Q<6edY|6R z?mRIFUaG?68DM_>9I%VN{p>8%*Ci2DHU|0CXX+gscOk zbRG032XMqjf7Fn9Ih0Bnf-RcL0Rr`|f{)%HU(tffgaF-O+5*iU{yHEp>~<}H7`K4d z@gL{!bd?7IZ)ih3AhEzob$~ECj2*Dk+J%mJy=;LhZGq|u0FZcq6Ob9e-*fB?2natI zU>5L{0PFx}Vro*5tgej#eZwX10fw-Z&u@f{+4~2%f26C{-KOXl7KqCqJfcsJkH@1K zXFEtq&eYA}jz`(|hvPlB)3g=39!XUEzN7bd$9s`cXnQg60E^6< z0M4{`Z4!F`kiG+@kuEsv>1`7kENTbPz)wT(iDg57{d1oC#oZVwtO+QR3&a{>90<5y zd`++MM;LP^rpAV#3VGBL1Kgf>V#rrp{{T_6!W7Teauomo N002ovPDHLkV1ngdH~atq diff --git a/graphics/pokemon/sawsbuck/autumn/back.png b/graphics/pokemon/sawsbuck/autumn/back.png index 029ddf1d6f18d29dd1749d9875e00e816fee1e89..3d32c819b4b69f291dd0314e91f082d1c63ec279 100644 GIT binary patch delta 730 zcmV<00ww*02cZU#7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0007zNkluByK{0$F6-{J^S>qc3mW1xGv3%|pbqia4=$8@W*Zk); z2O5B?Y6Lo(4t>*-VD$VX>kK`y37~%+2^!4xT~WU9YkfMqlO&)4Hhcu()0uFCz7V(; zm9fAy1(2Xe=Zp&>AaCMY2E0r@AaW$a=YwWaLo!+GT}{f#L5K_>+6V})rmE(|B?ovsl9pu%j(T+X;VpaD8KG157A@>&*L62CW4p7lOqaGz-^RN`Ne7ElKDX zfM;-=mheTbATpxltpe^1(6K^yA(H_Eu-CN#9G0Ie3(6~`)!P|F3qVQy;>G$G17#ZP z*Yan8o7eg$fV-asCI!bFa1+)*#PLcWPitU*2e1YRa9uADLk0-2zwt&e7!bg73!{O^ zfX5a_y%^vuP(0BeM=#HS{gI0plSIo2a6QwOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00OB=L_t(|oXwRzZrd;v$7yr)V#+#ztoQ(u z$reSD4x)I2ASVbQbnqbxcoAac6kZIqo0q`agP`cvwV85&UZL;tk@~RZdMziK|DPZK z?}IjDZgF;Dsp%ykbDQy5KnS}@BRYtW0G=6Rku+d2Fk{^ne`Ul{V@znKjL(C>=!h-4 zz)}RUvC9IXF?wuz5#}NwAmeIow{z3WYB?7R0+i7fSeT&eaumk|fDJ>p>4oVK%D5#% zzr#(`c<`rrqg$Gt0IDNrt!`^@0+==rZo)ypcc-;z^d%r)baml$*`DP=Cymgh$(zsF zkp~AT5Nt#ve^cd9Z^;D+=~P17`#^?+!K84f3D8R$$}ebgn}kAueOMX|{h%0H2od2p zVf%7UfRvJrL=$0#b;e=Q2~#(9&G_AYg0|?IT;jC?W+lT&*Hu*`Q12TbGdr+o9s9zo zs@mV(*VPujOU80r2;nkDU?XoJ5Exc%skqGycZX^xe;>DiZF4s21KOrAIe_{NfOX;; zpj*J+#-FQ-bT-DmYCE<(#A&y{g!IozQ@+>@+?3k^JXm1&_6r_@%QT{Py2&8m>Gz)m z5A74tHcOEZaP5G13BYs&#FeCcs32sadV6{QE>#wBs*f@uwVEo07G8>?P?9-7roPoZ zV4K+3e^}uWOaK9g4)6dcAr*pygIUsgtez0~k>HP#wgY3XST_mC0(6PLT49DWN27#E zJXXF?66>bmouvq92areTrKAHDI3QQvP$+4=cMLERc<2TMc9{SN)?j7ur)&_~3rVy~M(?-m*6k&-Mp-Y9MNY5I!$)6dRB3x$d)i$@w#lT_c z;~=&ta$m>Ay9Dg`2rfGywm2g%Z}?0$vS#_%oqYu44+}_LW)%=$`4^2LgP?0)~V yfGogSKsG;j5s)46CLlNZFst9_!xWHT)Q4|(s2>-6mTbQO0000OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L009rV?>;Q`-1^SsZJ+>uM!5D982 zcP$@JM0B5VpV<~Pl<^a}6r9o{g^BEnBkeY6m|OSKQDxG~1Bk))n+4b?y9S`38rIq5 zXJ1_p`-gRlI>NZe_QLen!Z=^NFyVhEVZu~KVbUMM1RX|U%(XB}KL%lb>Bl$q#Rd_5 SFMzZF0000&B*}k- zr+OM=8GR}5+C8uZrt^ycz*7{%0MY5IZUpy5eK{@DYqPQ;WxFP_0Bgb>aQnnu8O{KB zQMiVdP)%d_WE7e?xeGHnFV!A??#DWY=buZN5XqT0(ICk%hyYgi=(@XZk3dfNK)GO+9!D7rp*(a)>RdRbx- zqW5j?Lf|=GXSymSuXo7~OqktgJR|p<_`b3Xl8b%kW05;GBLK_k*kP$fve6TdEIcmP zFuhVG5ujWnUVlmMg9uEq1Yd`3gYf5|&yNvMMdaAn{viggzf6H=4w|n3lJb8)b}K?S zBLh_Z4j@EoX~cCsmCSm?Kr)qwwO(f5+KRXI6d1#KMd%N}?*{JHvHYGv-@lMz9CCk_U73A7xCX$1;6O(uvCo&a_WU?_nI1&}NU zV!n(jH?^_fM!J#43*8Q|Yn5;iIs>aGvF}3s5b(xT@V^0F55uQDq`Nt+88~|b`x>A( zK!B7M5JLwDu&;O+3^2fMVKfjkz-(dEvw_?N3X493R<3~EOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00Lb}L_t(|oXwKEZrd;vhAD2|bbA1abWkeG}n zSqDgbG!jE!l5p95BzA-ZNjD^-n8UEj~pF2QVY~(pjWz+9hB*Lkc3*4e-mHMX?w(;ldmPV`gu#xNqK$07uth z{ppnm>(%|=BdklmMH>Nu)n^~zHhNd@%hCsQ9qKpb>b^cl4z<$}C_NqxDps$rP=6V7 kqIFj{S3gEl{>SwUKqDn|X*o9{00000NkvXX1g=70f{UL%8~^|S diff --git a/graphics/pokemon/sawsbuck/summer/icon.png b/graphics/pokemon/sawsbuck/summer/icon.png index e699823cd691476598d98400f98287cd97876be8..6d46101dd17c933d89d6b51b1c5003fffb05340c 100644 GIT binary patch delta 315 zcmcb@+{!#bf|G-pfq}s%pmol~YWsSDk|4j}|7hT>;-)D;HD5ek978-h-%h#Bb=ZN! zMR{UFf>Y#xH(*>2F+e}?y-*I z44*}w?6S{Y!?Txf-mrd$so6oRjE!3tR$t~hLY zXyv|M^uVLfo@WBDF?_9^lT*a*u)UhiWZItlr-T1(D*rjZ|9ma;k{Q1Q6s~&z6;g1u zkzsb}wom7pkaB_DmdK II;Vst0A*N^aR2}S delta 394 zcmV;50d@X`1JnbM7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L008(&L_t(|oXwK4N(3*%ZJcn8f3YT%#%QhTw-#)V zSQw##L8HBC2A)!{fON>c{jh`Tt9$!j>(at-jeH9e8<2&GagmX;Fj0P#2vbHx7}@cc o!ZbRZh2fvV9Q1x+{QdXf|G-pfq}s%pmol~YWsSDk|4j}|7hT>;-)D;HD5hl978-h--bByH5>3K zpVZ_y`v3piJ7Ox=mKEIKo9xCSI%)0|-xbrJ_A@=G_B8mgGF~M;2%q3Dct8x2)x)tyhMYZg&~Bv6U)h zs~@>~qi53ur75=pz52Oglx-||yWd;9uJGtT+;`zxkE8bS8(J<0H|H^4EXit+JuM-n z8r_im%l2H1x$E4zLk$^{;fxHOYgn?)XZw3-4G!|)?PxvS?Uz+3ZLxTz2^*4B*Z2$9+^>wH4>$*GaCxJo0;OXk; Jvd$@?2>@?@l1Bgl delta 390 zcmV;10eSw01JDDI7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L008t!L_t(|oYj)CZp0uAhIxWor%sV7MGbqT z!&8^=j8P{q$-v5ox+@mmWV+z8q`0T7bn zqu^(qSuhH5Cr7OT$2`c>XHXxx@Or$MkUbI0(KgiQ7HVG(e{LsGTjr%L^mZED?uCE1 z+HqVcq%tUV(Qk@x3?eoiXL_&_QJJn_N4!UQCjKzU=opAnqF}JD#>Z4F)B}~yrbju{Pg7!e}DZyU{Yz{zyuyP14B2!w47)Ih7)bTq|x37 kW?q2_J3dxm7=Db8D|k?@su_npq5uE@07*qoM6N<$f^qqrSO5S3 diff --git a/graphics/pokemon/sealeo/back.png b/graphics/pokemon/sealeo/back.png index 162838a2c8b929c5b54f8b2afad1db7aa8b51ceb..84a89788b3f7e684c0e027859d78932991012797 100644 GIT binary patch delta 413 zcmX@X@{DJLlmz(&|3?F76*o;`U| z|LA+)7tVS{y^hazo$Pvv6&zdK*MBZ())c?MB6g1@DKJ#&Ce68zopr E0M~QBn*aa+ delta 511 zcmVOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00C@CL_t(|obA%VYQjJe2H?}(PPz4YYdIN#1cn zb*Z`nfcx6M5aOjqbcLuDED}d?4s^t+p3V$_hG`BU62nsOe_GDX0DuPP<{lMWFjVtk z45xZ5XD~#yfV>1$0Ngqd4Uf6f0lCDn16hWYE8LO^ACdqV^d)9PX#`0yHO0Sz{)Q$z zltA#jrT}_qmXdNrfS-`q0Z2gC11$sO#se&-pc$Lv>m^wsa38{giBe{Z1?h(#I7}3- zyh{Y3x8otif0goA=#+qY9JuQ68w&Jn`i{yagk#R_uS5V%V6U9}!U8wo?bs(NdS;f$ z2lV)FREkgvpxAl+*M7%zZ5XiY(zg6#aRm4Uc&0Jj&g zV01RYf?EgLg}woxcXwY^E1d4QgY=U-aH;>QALCog5oy(cK!yMS002ovPDHLkV1jDN B*C7A^ diff --git a/graphics/pokemon/shellos/east_sea/back.png b/graphics/pokemon/shellos/east_sea/back.png index 0613c7a58a6294b863a40e01c99ce639ea55eb56..2cb650a28c567ed3ec4d7cc99f4fa2d9f2a1555b 100644 GIT binary patch delta 504 zcmV53`Gr;PJ#db-@Pp`x@tlhUpCq4!;CSUV}Takwr_mnZwDhj zpy-V!L{}`hC=hp?Nfm;7ba2fDfvFL2=|6Fduhd;GK?o6{f*4uxI1DuBw@pGoR3dV3_ z=o8))H0I6YA}#gC;4KT*`KR=972{RVBP|)OJPailw}8`CP;$=onV?3mfYXhj=1TdQ zfXF)sx)Wdxp9$2Ez3m{khFY`RaJzp9x{(i30AH%Rqi#~b^Gk785>hyCqT+7;k^=a; zf}7#YFX0gIkuUDm+aI*IbS)mF8t&O3$*X z00i&63R)eh#goDS@KGb_D4_H(suS*+%v?v;MjALeokhHDJ^c u;jsc*Nz+my3qJ9?z;_ltNZ=d)JbnNGbRa;1gC}nQ000041hEB>7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00GrWL_t(|obA&wYui8+2XGC-1pFsi#iO4I2D@e*Y)k zo#%b5f3QaS{@vP~>I=9-p*06466<#nB%T1^#N?BRAijt|e}>-y9vBduhu87>jSR!j z0I>_s0u*r&(gJ{62lxT5tDiv+l8nnhKo10oVF0zb%BW9Z3Lzb~abT1T;L%nmK=p+K zivuXC=?PFyf1eo;9V6B!fN7dr1}HdyqAMBTAHmkLARjV{<~J8{9OBWo+>oBygTl72 zT>UUaSMhbs*f)5u?#aGE&DF*<)o#O!)_sH5=W$mJVCyy*+p4o`{NKn3#evRRyZVM8 z&1}sjbSrJsW$o#BYD)%;?EPMJ;cg@W{Dul;-)D;HP<{{978-h-%h#6b=ZKz zb+*gF_7{Ku@1L7iB0KkMZjYn>my^N06XxXZ{ydkVRCF(s!rpKOmnG6k9(EcGn=RQ5 zj2O6Q%ro5ND4_q=;a0-FN%I)?{OeWwDcA8#W=6v4YYftYmh}pJ3}-kWDt7xGGj+d&K0`b?0RCE{O`Y)#-b(`cR3W&y^yF`7K#-@!wf}ubzr#y)ymX zIr*pGj-QlIe|1OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00AmVL_t(|oZXVaO2a@9hVur4kgEuN00q4Y zMM$BCVlN4J2=-li+CxYmsx9R3Q}NK_76gSJs!7#_95iEcNOm^h1L%L7kNszsncwsN zny7GVes=-Q2QDbpITzAZsy7TjETB>yu)MUOL{@{Lb$p@Le}izuSRxfI>3~_B6&`os zKA6U;;HZ0KqHv$);i?1lIU1*%7&F_Y^0C5tYWp7j#2u{lU9u5_E3LQTjR4=TTI(~p z4?gO=w<7NC@L!AFlK8>}<-i4`<~d6jsr0a95eHT&aAjSTpaJ4cO(Uf mpdZEknfY|r+Y$Hb-}M8I%d6WKin`PQ0000^;aIFg`5HtXZ>W z&HAC3i283&^28~5lG77_=23_;rzZqLIwL7W2?Xi?XNtk}vRraPBS0xZ_Qpa4YoLD= z8;1|ZnxH^8wCDyxs$#S)cjvf|ti$0}R#`S?h z^Y}--&mM)ame{S7Fm~;K2q2a9!l?na>zVroz@jtQCR1mBC~i*%=Dr=aae#kbo|ycB zq7BqRg7_9NK;3*k#{k&B*#X7YbC5vAH@x0@E2iI;WCS1>zute+pX}m)4-kCW1^2T* zjYqe^(F#2a&YCrA)~s2x{&fXS^T*sXb9O_eh7ha&r)$!_l>!GK8dTjck1dJI&Tu6<=x#oy_xGh;Uw?w-fphplQvG}ySz8| z=EHnLgwqQQYe3D>4(?Hg?;Hqlb8jX)>Pu7`shRuN7g-$oXU-hfPIZ58HUjnGL)z3_ zs}CX|&u|n`#nJXFSJOr%h}mntd4I9^banYQdA1f@|M3$RmIG}x`L0!G!~yEl=CJxA zCeQ{ye_B)DXU+PL Z>JOjO8F+Xhks|;A002ovPDHLkV1n!(pSl15 delta 911 zcmV;A191G62h|6V7-Iwj0000OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM?{!*(FQ&M00Q|*L_t(|ob8q|Z`wc<$Il3N>HxOr)DFJG zv{JHgFGN&XqF^~4&yY(8SlSYkxk}>Bv`W82*M5YG=@_b1p72-bcj-HmRKh;fwXJwU z47?xre|K2?j*wmL>hCPCso$#m7UK<4>sA8}K$lQxR01vxf4Y&&dU=`wt1&+9GM9tY zX@(>V4q^rz00b^(NV3@BTgahpe}vOuc3l|L)g$&94FgOd_V_#&MS$TJfMOpzV|5;1Y({Y4O+0OieOqKI zoyyG>EbIdI{gxnOsTN`BtZI>?zfWCZtMNhv#Xhkbk5f6hYmIoel;2D3ye3(ejsVn3 zm4A!8TlWQ@d6+q#nlOCl{_d%)Ue_|o)#R~{drsbYV*i%a4D>*A)08sAP z4>(dv$dyWyq%?}WquDnNquS+3X?mi%}OiBG>T)gCv-0rwpUz<0KgK2rI7Ij>F zZYSvOdJr1`)c*rOND!A!0*9ao;5{Ty4-LQ>^`I;7)m=VILeAsqED>AO9Z{*Tz13w) lA)B#3*ga}(@9*mWu3sd^+7ZP+E5ZN(002ovPDHLkV1g>~lh^P&`+^^uz_#-q3$% zK?ng#g!sqBZwT~R5GueCWMA>u%II1U5&*UE`nPf-YV{*_tx@IL<{~Dm`I}rhd)jkKT{IYN{0A_cq3{XGObSWtLapuo};P>9o zwiCq)=Kcf-`S*a8;y92>{bLKX3mbnwmPI%O!1LWmI{*{_O8`2j319OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00I0-L_t(|ob8mcZrd;rhN*#>I@mJ&06Inw zAQIV)!bw+E4&6asBfUTny_W$_)aowsL-k0?5-G_E(6v3okfHzc-G6rk3Hcv?7ty-^ zvAP2sxKpBRS*J`mCB6g1AcRe^$;f)W02IJ15Q%s#gd_I8e?>sx37?ycZ-j7ue(gL9 z0DvYU6cd4wSm1pEh@Yqn^L2)g%`N~~#!%uLj@3kNJk;;xVZR#yu>VcCO=bXEHT#!l z1X82(#GtGP>ZbV^OB@UU0Z>)-ZU9o_0DRzxz^#!ehLj6a-h}~Z^(O0~(*h2RK>!@9 zQjfDLpx`_Jf6&1M057r?p;Bs94?vXqIy_nD`u8|X8UkDM?wgiB#thp4FkO| zDU$yENnc#8oaVu-`UE&@M^Hs=L%2Uwaj!RkbVx{Je@3=Ww*hhhXsIpIDV4Ed<35H%kT&YZ}EfR!uNbCj{qaDg4lU6^I3o`Fkr$U z03iYcWDtPJIs}L;>uSD`Vjp7$W*e}VkbuPo$R0d^DWoPYB_7i^=Nf$@C?du5a{C4q*=F5v!jsqkMN6Zstn`za> zES}TX9i+YM)rEYb#3t$fe95HzS*nio>K<-s{Kljs~ zM-O2C9C3kU9zBJ-$3`L(CMqz(GnVNl$o~`C2arWDK=c#!|55vuyZ!*nw+#`E9X!75 P00000NkvXXu0mjfAU(yl delta 503 zcmVOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00Cr4L_t(|oXyn1YJ@Nl24E3N&Jn5Cby(QG z#xA2?d$12sNcUXDHBV6bB&E=&Y@(6sA2o+wb}k;~V=_scMA5y5cn*NR2o$*f7xV!j zu0f#oK_38Sg&^Qv&wh-9iVUOr7Sj^6q>oHf7RO-5FHP()x(rGp;tl2 zrL>`#tM|16E-&Tdy6C3-P^4M`QqF}}LY(J7`X$67FH=4M$d^EJ8vt1dwED0QC;&40 z-UrFk4_wFz!508R@BttWf@KpKed19<6GRB&W_eH)VNfHp`5GRGh-@E;>k?P6iws-M z#%@;%L^S?XfB9MgVKyBfd2G+-u|UTc8^%S*Q`5!9f5xYW@xGBO1u93?zFzp z-(~s0%ycpX5*N^Bd&zi6W5CP^o1+P|=5twsm|VCWG_u+NCwoH{;!qJpgM%9b$Wt6# t6sb4+AR6z1!7enu4hZPzKQQ+kzgR(WR+kDV&j0`b2>?k&PDHLkV1hNo$}#`| diff --git a/graphics/pokemon/silvally/back.png b/graphics/pokemon/silvally/back.png index 3994f8bf209196cfe33c18d39d80b85c5bb80094..94c3826cbd699e2a83c48e877e26a50125604a3e 100644 GIT binary patch delta 568 zcmV-80>}N%1%L&R7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0005+NklXNtVMf2t7@439M0`aM#Qq2Y4Pt+Z5WqWxl;J4?4FNkzB}oyq3fOmPzVwz#jsX^?=<@?4@p z5xXfk0k{@<*oBG!>t#ux5pl5Dhbez{50DWUs=8n(u2A($06K+v6vx5>Ku5m&)aK7ZZdZToUCz^%S@B(s1` z2>d%s;Ck2&50L}}u+0&!bDWM;LeR0&qZR{-9CsL3=DmcIUL@Gne;S|!&OK}AVTDk#=cb>}P6F3{t{f$*PQniW^^SCe zg*J$?LF9_g1N8r?HPoEMETAOOQ%yn`lK|6qfNaaROYjF8Z5vSX5yRX70000OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00HtzL_t(|oQ;&hZsQ;jhKX|ETGI3Z;!4T2 z6;Pj7#@h#QM!qMKv&TrRjq>&#u(4wdN#~Z#rw`@_L&)!ny*vRnJN6h@W!V$SCd(d6 zP=ONu@lb(8ktSA-*ghk+>Iv~G9uc3LY+LbTAya_(!<4O(e=p?Br6iQEkXYH2UhaSe zVF%c;H-M3l3xz}A=z(w_%n=!rqoRlt@1vq<;>4tAnjkT@nJd1Ub2uy#@0`mdK-N>& z0pS{?ow}-o8Gu}uRz_0-j>N^fd7z7D`v|g~dlS66DM{^tI zH4adthr>t!({Uw$wZE^49Q>Cf{$5n{3#R@)pY|pS^f#)kntgWDF@gK?FsCLv-3}4O z5EBBY{q3-vV>}7yn#=i+Cj|ht(G6b!P9P`Azi%1p6ag4UjRL4>p_cs!QGg-< zd7nl6y>~lkT^8{h>9VXjB!SjGOrVp%TDYgHPA);!(GhtH5Dq{>$APsfv5gEKl#BsF gK@XJu7z;Mm4>rc<&ZO-;-v9sr07*qoM6N<$g5FgZ3IG5A diff --git a/graphics/pokemon/silvally/front.png b/graphics/pokemon/silvally/front.png index a0caf35b63e594f523bbb930b7e5390fc6e5edcd..01d9f14a9c39fbce7b507806004f79965f0d7ac8 100644 GIT binary patch delta 766 zcmVv#muEp6L@<6BQCSI@C-I8nd zJP!j*J*-daAw5x1kLZbPVR;0M%e@AT$QO464ajRf98~d0z8qr2T*ZGa z0P+m@qkWdl8eoWn@^F-tz#5GlJW(5f@y4l&164@tIXA*U8x%mEg@KDiQ>TPg5wD*z zcmP%hfVczk+ceWE2CyXlR)vEAfQ*!(0&M?7Q2n}Y9^E+cC;+=_XVVoRgdSkEVO-|< ziV(uP4bUsa^DK)3^w9-`cSo-Pk_dl*1#(RSk?PwSrgceSIdDw?dH)XW60ryfWWx|I z*l$9Be(nL5b%{co=+@n;$5;KlbO`Ih`C50dVYAr+^xBN=USb9y6BNPU`Yu7&GWiT} z}lwUD5;?#8XTG2<9dM05$`NP8Jd%CD8K0l*4-wc?3v=_}AyVTC0D&Z5#6) z0GF^HvBK*M(&*39Oz(83I5E0fePbr~t8?09j>C z|M`3Z-{pV{0NYzO&|L+vT@rNZRDDTu%%a+l83+LuLVq42#8m_V0u?YqvhWUwJ3Zz4 zTLGoE@V4k(S)9kHbdWwZ5uy5EhjGEE}(0^b=La-0r1SA8v(URQsg_EO; z;CvT&bRxDi!!Uj(NT0yAdu;x+Fhl_J1Awpre9T#17jSg8K4A_q4{f>ZI0R$(YyBrw zis+|FQ2mZ>_WHiFRQuO}scS)YeW35{kRWh-$Frj|00+hXyLqr&;UeFdh2RYF7P|UUGLg#K_%Ao)9OS9eonp>-q;$^z>(q$R76= wd*1xS`kv(|+quLw;5*PY`|q;a(=;ak2TK?zP|cZ%`~Uy|07*qoM6N<$g6t?~ivR!s delta 887 zcmV--1Bm>^2E7N67-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00QAjL_t(|oQ0FWYuiu|$5lKClcnx|5D^U7 zl0N^)u5;Zz79xpGqg-~~IA1?)O#pGovDWxQe=MMINU@{vo`Wt#ra-t{2 zau2-R_oMIKy*nF5CQ7ffnN++gSsQ`U8*6*>=hg-TMxR?7e+(GBReG)g1F-+26R=r# zoc(;g3o7<<^M0}jI$a%uT=r)Oz()ZtJHGTpY4?xzpG62Ms86-Q7;RodO=FdXpW#+v!=I zW|CsFUm9@Gqp0;N2~cpR+SI1F?6HbXr~6#v_wlU`e7hvkQD^hi;cRMkwP*QwqR!ri z3a|vw-_1Nh^c<+z04%EVFuUDJJv|y990H&kx518Qf4A?-9YYVV+5#Jzp3_$&98YQW z-PCTp3bhE}GK%VvSOXkJKtmn4ehDQ!4L(1UT*{lt{Cqb1n*!_zXbN8lsxg^!L`+q%)w&x< z0Qcqf_dB7>3ZP{VNav(;5k-pd2xxdH1;D~g-HxYw79Vm`G@Who=xyc<@DKg>-AVSYQe+m~OGKc{(N`T^WiLMYMpKD*PoL0cX z@WU`%a3iU`r8QApqA`j9Q$0kSB&(!LG>S^^qe*WNr!fdpbB>g*@_uZftTaG~l}7}{M!8ztPJe^`4^{VAi24Df>;M1& N2>?k&PDHLkV1jwygpmLM diff --git a/graphics/pokemon/sirfetchd/front.png b/graphics/pokemon/sirfetchd/front.png index a7ac2a974a3a32186422085a782c0260a5798856..3ae79de6e60402d54fc9dfa9ae834eae100b47e2 100644 GIT binary patch delta 837 zcmV-L1G@Z(2#W`h7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0008|Nklz3jm5QGD10)!;K|J!a=a|t+Z#^|p-+m7*!S|8OHh|}~*7-K%t zRk@w5d?)`-Z@<&e^LPILd;ORF|A+O?eO^Cm-Lklk_0aON$f>`zj|re2fTo{s5LADg z0nPtCfUf{|>hA#5g7zfA*bq2)sn&4Eb^6VtWn!}rb5JadBzUYfUkis1C z?|MlHZb^?VrL-u0-43F``ind3_bEE!)O4?(0F`z`>$LLsa+&L)6mh^(ScLJtTkhf&HmS58CU0J7GwxdbSNGyoP2@a=f^;PsIK z?%dG;#8?5=vJSEDBT!&??+U=xbx(w}E<(sMkT7(C0PnE6Yz3fqm5wj~;%wspK>l1G zl{^9U#`I(X1+-el*aNs2*T;Vpq93QO97{Tj1t6?LlyR7O0DIMQezv}R93m}mwqV4p zcvvw*A6c-hX9ye8)V=^jBIFbrq_M^UFgelueGTXPaD@xGscDeZPtrE%Mf{JzTe%7` z15lJ_eU)*I!>klrZS2AasjZLjQswvx+uW06XPfsLdfT@6_r`P8JFmGL_ldTl!N znp>ig<7JVrqqHF3=Jqk;g@@k&MbA`txlbq<+~SV?+#w%9K3u#bTzvKil+Z2K!p(5* P00000NkvXXu0mjfHJXr& delta 962 zcmV;z13mnU2Z#ue7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00S&ZL_t(|oW+yBPuoBg$BpDjsaTqZB^ezS z*odcW=juTONd%P=r%SiwT-4R%7`qfaL`wOw#9L67ct)s_3sWj}K+3{anSTH!6Q~_5 zx$n*f8k&Tu>Kp7R-_L#Dk9(G+sWF$Bt_eM}_>8WQnZPUMe;ETcJKG?s{&$1tW{~~2 z29=pD#I|De&8!ymdW_bD!OLlYPHWs?Ze?-?N)g}&(|`s7bzVVoG9c-cQD$;Lom>Q? zby^ibW-<_?b%T)^fQ}__0|X`(QK1+W0c0lu*aW5T>6XOrV-oOok5a?huj5ZSi*3Ak z3REphcdZ7ue~?uK?9WeI*xlQ;(4{SfgZK-uz_Ru!-R8n;HP?1}|WGHycPVif}n4fJkNuMe__ zgqGqKe@Cinhbg3Ho|XOL9p5INgVrM8Xek0(M0P%#sltqGt&3STb!_p7yv^}Q2T+5!T6UkazL z3*;Us0mvQ)OpVC00A%;nebA*6kpv(U86Rn}afMU3m*-tC0>X;Y-SD;_K8$m39B>}3 zRK8vRJfJWFX@2P45NS%tcosjv>#L~%L4%9YkKt4c kWS}$zm;r=&X2S)#6y$Act@MUN&dglbp)l(w@34RHSOmEOK+OKemN6kf&aSvqw{=ROB~(Lh1T?V( zIYc+;+GUX7+KmZb6=G0G3<;7S;v9bXk83^qMmOIQ&=*v<=QSpExCh091F-~<7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00C7=L_t(|ob8gaZi6rohE0_R;D9X2(p;qO zXPy(6I*aHgv2l7FydeV=^xot1jz5l@~FNBhMaKD+y1 zSrqwczl-HdwXpjOVV_L| z7>`QFKQN<7r@0RZ;ULIa<55J+mD5Owg7u5zD<>%t8N&U=y*q1$PkaVzAFTEFWkAps_skpgJ^e)jFgwy dFFf+!`39@Zi(f5c3gQ3&002ovPDHLkV1fo((iH#z diff --git a/graphics/pokemon/spheal/back.png b/graphics/pokemon/spheal/back.png index e859b980fd92e846f88df4fd4026307cd008b777..5c23636edef66c297f717948d6d993bcde060205 100644 GIT binary patch delta 319 zcmcb~+{rvaf|G-pfq`M}_Qp38tL^IrN`m}?|D%DkikqeY)%@^uaSVxQeLLy2P_qJ$ zYj2Cs)BpB6_V8vHTyPh^^9&!jYK!G+ItwoZnu zcA8t-0xZhdA`T08J8CZ2U~#zTdiaMXuVThyK~i!IT75e8aR~x?sz>VYb6hg}@XD?8 z^InH!iBFjdpJcgf;*>cLrOR-fx^l9nN8~jDB02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L008|-L_t(|obAvt5`sVs1yF6MT|h4&9DoTI z(2W+BjOk^@gLn!@kKmrtEDO596$=Xs`2`H*k+7Le#*F!Krs_jIfj2_A_bCF*f?w)# z#_bg%LJ=R1H@r)Jw5ADj2}Q205@+&b}$2t^CXn#BMA!DSH=T9Vqz^r185q0>6KM;9cJ`}OsQ0suaf zBO=hg9yPWJq+4`xEuI|2MQoGbvW?w0^KhzGE`uT!K3 zl`}QZ=m1dXa&p5QGBr^>)#G#n3@IofG@%iQVqe3M1pnRX)k6p9%h}r?SUVnre8T=0+8K13P5)c6@X1IHJIiJNw{sU8M4l=1YZ4(eo2TI3rSae@Q>Sn{91ei07w!%S&mBW00000NkvXXu0mjf D!ip9t delta 707 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 MNkvXX1g=70g5NFq2mk;8 diff --git a/graphics/pokemon/togetic/back.png b/graphics/pokemon/togetic/back.png index 755fcf5950429d8772919e69a78e35c2122c63f3..76312f9b82573b9f5f4f4b69fda3c5553ae36df2 100644 GIT binary patch delta 472 zcmV;}0Vn?I1fc|w7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0004yNklG^5!}dl4apdKAVuxvp>grvMK1-k%`? zARrFR1b}mq02I<5z-hp&d_YJ5XL=d{4I6cO?}S`7uBHsJNODI5VDkZ|14-(b3>JS7 zXPXr%a@Ils)Qvkqqh|q1$U15Dd=eC}(9=l>XOMK#=}CgRPZc0;2)Yu0Lx7#cq~EDU z8~`FAq+!-?0Ce)_fP4*qAHcVi8v<)Uo606&>bZ*qPI^=oQVV(^^Z@v(lGMhY38Mk) z7{;*1=Q_klm=aKWO^}I0y!wy@!R~*>B7t=YNPe{Ir1zrqW&RtFQlB!u4vqb;fG_}( z*$nV6XWv@rx102qqsQti7W#oSfamIM(l`=?`H30>(|$q>xR_R>cB9w?R>c8~}{b5K3-0{tiR=VXj1rXo0~X z|KAN66?^qwlKF2^yJVluSe37r!WTdnMtcX`>2t7v8+ib1oaQ(FD1HDryA(ixwl+)v O0000OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00E9kL_t(|oaK~lZo?o9hOu&ipu#;e0S7>M z2Z)OAf0db!q*-v1-_uZ4srAF_*I=X6|6Tea4)j0((ahiT4S=fxyIunsakf?F8i*tV zpxGZFA`4Iw0RCUklXH&aC<2ypG(>?)8WBL$MDG$uTm--re|!0h@CsPb^5&4Q0AK(y zH31ar9ffg%Tdi_3Mc<^dps32%Y*9stV5-vgL#0cG&B9s#jq-~b3m&49T8 z_9osf?iQd0J;g+=1yoOz2&IoNWJEI9TgDU z+4*!2sL9o{Dw(4EM7ni9k41Wk`SB`5b+Ukc50&!MGnk|9{TOHf%G=tX9@GX0pa{@m j?7k%ckAOIse|7x;zh$ea(f+#}00000NkvXXu0mjfD{|)v diff --git a/graphics/pokemon/tornadus/therian/icon.png b/graphics/pokemon/tornadus/therian/icon.png index dd6db6b5c04ac4ab1ce991b9a293abcd71ef6977..fea79288d249339e894faa064f1e41b2deb6215d 100644 GIT binary patch delta 406 zcmV;H0crk+1>XaZ7zqdi0000?P=%b4dp~~=bW%=J0RR90|NsC0|NsC0|NsC0z)*`r z0003_NklpgDV+e)Lg`F!?m}dp;9*Sdj_uF7XunQs9BYff`5NV zhTfFA#*|^8K3x>@XidBFGe)?l227~EH`aYyVFOp9Yt(Xj4;% z$9-ZW^3}xAS}a1HQ=qZ3Dl&&K#G2L3!oh&GV%?Le-Fg@}37%g<;{lyV7#eDNOU9(G zid&8jB^MBDV!YQfQaKmnPm5yLi_?E$@zJsDlcV_4cGPFvyZ%MJ-uVEKnI9*B%=|b4 zWah^SAPYZE09pC517zbz2FS*b1dz;+4Iqgh10YMpg&$=AWVz(dj}S;?1BV5W7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L0004WQchCENtuyBPWVjDpU?QJZr z3xp?k?SYz;0O8dcqrzJ0P3qH8JcmEJSQmCN)-8bFi?GvqQF@LVQo(H_a)q0cv zU@1-|t&e`3RHRhCKdD~M3srFPs{jB1 M07*qoM6N<$f;PxnZrb%|xdNox^S0X*t?ouCMYftYhjs{}!yv_K=Lunu^2Idcf~1>t`H zJVj&Q=ZCfN901a)+S{WW72C%e}#~3sNO9hOJ zAb>^nVBwE5=ZV1PT^kxz0p$dQ81L*P6z@3HD&GBw1IUj>~O=I^Km2S=~s3hku zpZpPu+Qz|KkYAsY(Q zu=%{EPZI*FS~D7;-s$lA)M8vKaDR|=P}o*Q+ecoUDM!(TJiqglvV_^nHSg)PiVwN5xL)U!wr1%842x nPYjHN1At5}l=02~KJ)km4s$p@5P;Dc00000NkvXXu0mjfW5F{t delta 756 zcmVOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00Li0L_t(|ob8mqi`y_1$1}#f9BUWo)89LY%YW+gaxiwo(s_cXG{oR z8)i_9dGE7rgU!1Wc!1glD9?#@lnzkEUxCb?^7Gd<1VnZAx(wjF0z9bgMIbqQpeKNe zlaml9z#cIfe};fTk)u6Ql0k^#1V~QT!~lH`vqy5%>tm_)-iH=3##cF1qqN=wL5+w? zcBd{1cqo5|Yqhv<10Z&d2Jr_P zC1f@3*2nN(5wjlxoO7CPrsm;PnG{Xc0$r6sAqN&0OCgnG%_9n z;u~XZ24X=e)N!pEAW>(jx;6r)?KTUkLbaHxBGrA-XV){xbpRlMN~9)>2Xf|!2e-dD zy9EP;f7Iu+kpw)_7dgP}I{+0qU4&sCL5x86Djg6wK-<28Gy;)DZ+_wBX6O8}>002ov22Mn-LSTZnRYmXs diff --git a/graphics/pokemon/unfezant/icon.png b/graphics/pokemon/unfezant/icon.png index 8b61d1bfba1bb4a21b9ba9bdedea73de74eaf50d..785bd89a9b4c4a0f4394f951285fad83c605640c 100644 GIT binary patch delta 323 zcmcb_+{-*cf|G-pfq}s%pmol~YWsSDk|4j}|7hT>;-)D;HGe!^978-h-%j!5Yc}9< z%@)>F6#Db~{x-Q5iAODZw|rg8zS!HieAyd!ey7X>HT_hN1y6KXc9jNjuxL(BcH(L% z+9)g(b-<}4&2eIbrM6JtB8Kym&ua1nGGEzwCH2xPrUK>#_1AWt;9!xT9^H^O?YoCL zFV_p(YQLz4oo9`0#2K=?igH*N{9PaY%6QwH&Wq;~96rriq&U@sb60}7x?;~l(=%H) zDrG;PJR!a`NTKHM4UHX3ia#meS*XdRw2n}Dif|5us43;DHiZZnGvgS z#hj-$MOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L008z$L_t(|oYj&sP6IIzMSX+Oq)TOaFOW;P z&K`&DB4}dKOp#NB>(FouyrW35C^9%3F&SG_6bRh;>HB+ZJ?H+?l5P(vx1c-_G@;^s z*_#mT=P4yJ;ISkU(*u--iAt8N;OQ{sBBc9zRhW@lVPd_*2m_}m mjW8^oFan)08dt_Y_u~^g?xPf{Y7GDY0000#Fw!qB91Uu{Pk32YoUX}v6eY5`vfNO_K- z7zB+NaL^G{O(m8I;X)U*TJiDK2jfWqwLZm8LURJ)`X(4`gzm)Pw;R}U0z~RQ;<|tG zrz8+RC{bSp%IeE;)nk8IV5?SsPYp&~w4Aag2n~1bw6LhfZhE0o7p$!7YD1{{q zr$RvBE=eic$Z|ZGDsWoRu}QysVI!=>o($EE(Bxi|V^ORK_C2uJzlR?@B)FeBBl*}u zkEhCfeZ&9PZ1sG|d&n7AOa}zJt37{VGDb1RWKJ$2g8O-N0ba@L{g7nlk|o-4z8`|h z2^45($Ov{HuB}3bL+=tjK|ElBbYZI=2{K+A;E^D4m_8EZhzNKjh=v5c6C_r!UV4H^ ztZ>ep>B4+TvcbA!2~vYy-W)TM#fw$x36dq$(u-i40Uev3tsG0%58#3tyU`EL2B`o5 N002ovPDHLkV1lwf!X5ws delta 488 zcmVOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00CA>L_t(|oXwL>PQx$|g?)pOFW`zCAiY7k zjS-td(3dCk6txdQ0XOhA?XEJpwycpHhMe-RKV1NvbUFek*(3|lG3 zj62R}pz*!X#h|w95x5E$)lqNc1o+{zZq+KhTIZN=w4MN?Iy+*!E<(kGVztA# zK8s4f7NJSZWvyC90OmM*3Z7nItm%umX&wPZ7H17h1K90{pK!WCuA#InB54x%NKtOMF9GAGBH4Pet4Ls;F_|kIyQv;X)Nd51O?EXW7S2g z3n&gK-U6UX+%NJb0OvBS+eqO$m*u-A_9$K3?xG5bAaB;m4?=amjDf3N%kLC{%shZzxx#xQd+o7#Vz@%`QJ0(@!L|DBWRE{o{spYGB=Sp#TJ`WXQ_ z4_B+`AHAl??jW!P5%6-5?&$Z_z};UGr@;Nc*9G?+Y_+d+;Ps9y&OM_bL~a*%;H z=qb5_4BW#QbC40h0`4Fqhg!S{rXJwh^lgo`L3{v-9UG)GrK-sQ0000OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00C1;L_t(|oXwL>YQr!Ph35u?E}&2!z_~$s zoKkv$KrWC_sCTVJz&S|3cd@e)hOw${A`DWMq_U)zZcE?B=+m1K^J9QNlluV_pqfwU zKr67(ge?lU3PAGia1_M~mr82LN zB1GIVwm|VvzkG%0cTU`hdL4l6Xw^yK6#zSZ^d7`l`;tnL0C0UFN$%TNv7<&bl-8$7 zh`NnU0$WJ&oB&+XVk?>mtkP;~)24ZZE=h6mKrV#;FF)aYgY4k)vYb2W44^huUaB*7 zb^Xps#`DF3cVie69S_3aVjIEE7?lDNmxrf$3U;WvZiFfB&!8D&%FJUyw`A0f$?78U z6Y+HfuH*Ns@+ksq3+m-20i!L-W=L}!tdz;@eFw0V`|JmCeVGB<+s@_=Tw)5Y`|+)9 b@S8pXJ38$wI&vi400000NkvXXu0mjfsEW`k diff --git a/graphics/pokemon/vivillon/fancy/icon.png b/graphics/pokemon/vivillon/fancy/icon.png index 22fe6f1a0161bc2d18082de80cca10bfcddb8a3f..10d9a2e9b246969bada468eb7c8083bf5de23682 100644 GIT binary patch delta 435 zcmV;k0ZjhK1pEV#7zqdi0000?P=%b4dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0004NNkl+7AqeG=?tBn&9;^X*J3;0REl4ls4 zLXa5)1{#7OONnDcXejaE@!0iXD8UC*ILK4%K_DD@g2D$X9%Ar4t}#&vNb!mzE-!yR zLIP3>aS(ue*)lxF+^4`&y||wmkQh_Ga!*i9PJPEjiOioJfdVH^aTK7$d7XU@;v6?Q z6JVC-Z78iWn=VOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00C=BL_t(|oXwLvZo)tihW7>|Utm#u0Mn;% z8fc*iD5=aPh@eV`a6>o+N|nD#?_Gdvq zfM6iZ35ZF-lvRNg`ns;X1RpS90K@({`y2vbFw*B5g$tk_e>MOBy4vQh*BAj&SHS$S z5irI1t2oTYCgUOqT98iG$ybVeA%h?gN23602bfiRI~G8`LB6(tGJX|DD+`ngG2gy8pi*IUU$`E9RhF?+ zArVBy%KJemk7h1VxyqEUfHt_`v>)Hv#(s+r>j~j~5HGp-IsgCw07*qoM6N<$f>aFH Ar2qf` diff --git a/graphics/pokemon/vivillon/garden/icon.png b/graphics/pokemon/vivillon/garden/icon.png index 03032ba4d85b8862e5c5169d01c1a55fca7fd1f2..868f8c7fe31af20ecc5bb0ed5ec1290d0d5a6d60 100644 GIT binary patch delta 409 zcmV;K0cQTF1mXjb7zqdi0000?P=%b4dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0003|NklO0# zDju9FDa3OzYnycLg%qV&JBR9pP=C#xYq4p!Xq#}ZhhIE&aKCdR`LTsHepSZt3;&N% zRDbCAP!|cq1F9pp4I~JXF*qleCyH$rû}r?0000U$7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00B%%L_t(|oXwLlQp7L}MSTN}FW?<=fN+DQ zQA&~~p@VI9D7n&JilKLK3L3>MPLW2&yGvplhL%B%C(mDBBTEtD&%*xzR)AfC=m zjw+aKxOQWfkOKh%0GmtpCF})&Bbx$nxBv(s*dQ%N;5}OCe^!BDrHq|A#3kcO$_;e4 z`}!;8_^wDz__6}lwAH4&M_hn>{pbg*V%5H+vh9*8zAp@QZ5=!IR98f4e@DXZu8xl+ zxEOGs065U*F?t4povo|WM+*piVsX-lJV5;a2ougXh>g$N3S*oz0JCfIR=uls=W{g~ zr(KZ1xQvOgaKUg3^$M!iIhz8)Q{icy0-HwbQA}}v%uz~dqXPW3Bt0gp3#492?IZA7 z-E7O}2$&1%heW|67v+OVJsLK{Q_`XLP?|RTL403kfZteiu7Cri;JhE-o=yA~pU*$p U*CwEZZU6uP07*qoM6N<$f`b{!9RL6T diff --git a/graphics/pokemon/vivillon/jungle/icon.png b/graphics/pokemon/vivillon/jungle/icon.png index 8d83dd4291218cfd3d5965b3cadd85dc832f3c7b..1a3249596c47875e141358689a23f8a7a28812ba 100644 GIT binary patch delta 396 zcmV;70dxMF1l9wP7zqdi0000?P=%b4dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0003+NklqPitHW5Nnyn`aE@VQ3OPDAglC$IS*0iEcAT$gVA{@rtruzx4mLTJ8_|8G-|} zydXX~afitWPRh!~EJUk#e$Q3V5$<^ZCnsZ-RZwqYGAh_(sk+ex)BxyO?VYSA+(BRg zBH-&FG^%NIfzClmYQX2$07?q7)=fSi50>a=ln{kjy>&Qt2QW qpb6YTGKVUj1WONaZ8=-HmaGq5w;jEk4OKJ%0000OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00BQqL_t(|oXwNLQo|q+hIxaXyZ{~Z0O=dl zi|6{}(Mykon)DieD0(!zVrvNKcy-(h!^girv&*8?pN0GYK~cy%5*35uRYftRdh+MMiu^5qv3v|o^#ag?Ne-d)WUDIq%2F8A+#EXWW zVKU$Wy8%aw#gv=#>j=E`*<zYmcd`c2pbcD(G>6B~+ z?#QWO^ppXvV;9dhj|==Tc=f){4`S0afwO{S+hFj;=o0i9dRl=D`hM3HkI&p7hqCyes+@bm)GIkZrXnpV5+=ees5fRv zPvI6ZKY!@StzX*~fh?hMGBH6=aZw5hXn!$S+ z1W|`XUPJ2yAwY6Ac$b18X_1$w6J!M-vrdo|p<*_JAR7jBZ97|QZ4p1@r5X`-n(6WS P00000NkvXXu0mjfgN(=9 delta 484 zcmVOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00B}-L_t(|oXwLva>F1HhPlBGr5ilf0hGc` z(l|%(wM1i&JJU#Klbk{{D`cw>4I69+0m-DzWE%}1`(Sr}G4^LhKY(FimJ<-040F*7 zCgZQ|kOky`0RvF$XY|tyz^U0Q_?6`r;g`b|sc_n^d8$(Adj5c1&2G5196MMO8@= zhs0dbt5X7Ck88y-0%s;Oigaim0VOH!J}ft2|KI$Ea|Jm~d0Rwk$^cBZ$y+6RK0dxn zl3_l27Z}2tc2G6S-$EThWvy4LSOBVf;d$AD(@onBY>xWTSMJ3#haCRxFC5z;kuIRP zppX$zE8chICIaUQ?E1F^46Y~-I?d5I-5-(;iJ;Un`$4EHGvGd4>v9j+Lkb@H_%=57 an|%WN`s1Cx1a|ZQ0000lLSDyU zg3vq$I@l3d3njJ%;X*eQOZeFJ!4M%CuC(n_>?D*?E6m;m!6I}#nWZlY7B3ulpo)Q`=r z@l;vIH~c?VG5jH(A}6z;gG3IsjU-rlz`&MwE5?HO0qv(5Jo^v2ri}mq N002ovPDHLkV1g53#LfT! delta 490 zcmVOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00CG@L_t(|oXwLvZo@DPhIIo%7f?_gK)ykW z7+rddb}$z6(`AP6#eNX}#h@Zf<~RKP$zkad#Ul3H{v%0tko0#{3X6+LI z-fz-U*_X%bd^rc{hT|xKZWwbJ|oA}K>0aWeV0o~;M1& diff --git a/graphics/pokemon/vivillon/monsoon/icon.png b/graphics/pokemon/vivillon/monsoon/icon.png index 6430f1f1b7a9fad31ec8da751dc1b3d151fe9dbf..2eb6221ef4cb427ef2d392c005b7cbcd329607cc 100644 GIT binary patch delta 420 zcmV;V0bBl}1nmQm7zqdi0000?P=%b4dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z00048Nkl1i?QeI$q z34+fU2rv+srzy4t;X;X9!6WLy5TO`OxcW2MgFv|U1i>3loN(!J)kGr*AL4lfg@1oe z0=!nUL8Fy8(&42HDPSm!XAUymcdOPBgn89xG4q3|&=HuRvUlY#W%pxf(iupN{NkAq z*rhNP67`r(6}Tk$5PtWNJ1I?~pUDSPlr<)#fl6<0XH_Vos654WIu<6?*m8?}L*`B}>qKPIsxpR(Vw5 z0wW<%1fTQSDy%0c1s5S41YrfeN)f&s#D@&(^Wz{$w&r$_>Du7iL1trNBe#R>v&}v4 zQp+73O*I^n#|nwz$1ODn$^1o}5R%x7sx${#WoQnv@PLLb-&T$#=M4w-837QuRyIEX O0000OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00BlxL_t(|oXwLxa>O7Eg>?fBTcyHd(xk$L zd;17`r*yf*=4`Mj;znk%YborH4J4B`6Ez+_o&-`N`Onh0Yp3mSbDt`LXktjeis01f9(VJMz)MrsRpg;het}h zXwp%CKHCRiM}u=_QnCScUc6IJ(|)SAWQ}>*0f;w_ygg;dLi%8-^cSf$uczE3VB=K@ z@JNkOlmUk|L|Zm3A(W!TRReV({QpQ3u3r$JrM4x~uNA;`8EdPu4BhR!7n!+B5}da& zQ9rh67l#adYP^I3%;K&G$6% z2;wndpdpB|OmS=oZJf#_zlaGHA zkWyl^V}Wp55YIWrl!hJ=aB@9!z~HF|C?+p`$DCP#B?bZ$yzr7B1es!L5)uLz1xdBm zQtEh2x=T`mG_pvk-mStKX#{0j{<{}0Z>6SIe1){2pvF z1^wFG9_=f+-F1kOg&yaVVvAusFs8$g-DF~Llb1|k+J>&kKy8tEo{y#Yxaf*%h zbN#2e%mgYPnU8&sLl2$eSl(Mjo>ZYHQM!Ye!8qOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00C-AL_t(|oXwN5PQx$|hW!Soynrk60O1YF zV#G$4MwF#Yl&y?`rCktem(H-1XGn37DlS)gQntqP~W1q>K~C=S(!kO1dleJ)Yj0Lq&Ne*i!xSrv~PAt1^m#8H#L zH0PPzM#5Aad0q#GA{u>_Y~DHYQba~WC)iE0VNYNKyyZuliBlsAX@Eh08b6v>DD~Hv zPv>pNg#2lac7Ge3-Cd5`Au;Xei|2(kwGcaf#1?3&WVNt|RwE!wVwc0*0QUc*-mvQ+ zy&|_QqM>pCf2iu#ZI!Bcvi};9VtZAmK+&uTd!eXrVPrtmE6ducV*~JP_i$;}qF0k7 zDOlC|C*OFUC)J<ip7zqdi0000?P=%b4dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0004BNklbC)}WC(*coO07=u!n(idmBt<6QPeWCf#xZS`hk}buEAV zX+^x>rW$MUMZHrVqd!BSqVRpjfNJv)FN0|+cI72fybKH=5UpB7n4(WjYOPE`oqx@{ zq{VcvMYFF8FQioU9hv0lC8`vu`A79a7({Ar;M_0*M68T#uoOOcuzvEn3e&Ny@r<%x z-}L{rTfv9*9@?OOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00CA>L_t(|oXwL>YQr!Pg>{2LIe(cC5hZ*nHt;6N86)dd^0(9}t4{j_vjIvb-;@69lyF=Kxg^aEH1Hk^Ri zWSNgDnCyH#n#_;`1`I%%yZas%psMHdh&BZmPg?u}PD%2KQ3&hwlp;#G8 z=QN-ww=xci`PuWB065@!%P|6PCp*Y=XfpyzQd~7G4`Ba4<`>R4$oG`DMYNkT0MmHR zTcvS#zI{UydgHDVFv~OHzJ8u>p$b4L=WGg4T?@M^tjnd=+AtUQryn@yb_@!j4M%NU zd=@~_q1Z=2T0E6fMc{pbZGTFD@rA7VG{?sGx=cDG0@KO ed>b44Ej|Hr=H!eSDi{6$0000Kv zeq=yn_)uWqGE#RRTELEt?=uIQR2vM^!u0D@nZoY|CNNm+(F+W#MC?0DNVit#S|u%e zFmtd4uTB-{EohG>M+R151IJ-jJF=0(-6jUk4U51`TT%@cA8NMfsC&rC4D@3wdpxtO z2e2^47}2C z^eVW|G;~w+{zOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00CV|L_t(|oXwLxZi6rs$9;n*tGlCe06Ju0 zB1g!fvKXmK1{S=K!*uT*ARVw&J=}!BEOwow_@h zWKzTg6->%q&tsC10s;g;jQ8w&D1i3p&Kgw=VCD+|0O@Qve=bH~tyEC#76CDgNu_z^ zGae~j0T<2wE9LybkZHk-1(*)YPVOqvE`Xjc{U92?D4@?VuL|xzgV;WkIPBU`u|?MG zF|O~7;`yZvO(G_H7wZVX7FTPE0T?x@OBpxKA+V9fRYTGM^8dq4INcy4ZCaMKVoCr^ z^D!;e&h_E;fAl7!J~#=C%cxOoYIh5*2Te6=x2dHESYKbPTfZ)+W7myDhy9UfN~yYd z1=uHw-KfJ@0NDvy5rFO3rp$Q&#$?zJbp%F}<*kf8jz$izQH9n*K0G8pi0$)r49uJ9 mOsaq_#Nf6c-`Ylgi%&G==cz2mv#kIC002ovPDHLk0$_s8@zNOp diff --git a/graphics/pokemon/vivillon/river/icon.png b/graphics/pokemon/vivillon/river/icon.png index a7427d685e854d2e91d25e6d665bff8f5eeb5759..d33d8271c3751a739b961bfa0e0247bb377bf2f7 100644 GIT binary patch delta 410 zcmV;L0cHNB1mgpc7zqdi0000?P=%b4dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0003}NklPtkoYwMHvfOo z?V;yn!*mgPye*KCIG-Nq@>m0^wM~EJs2~GCgAH5DO*LOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00Bu!L_t(|oXwN5Zo?oDhIxY%FF;g3fcpli zB4zK=IV0ZU4L18(aa6pWi7T0nD@kett-4md1^MH@JKgb{u|Es?0UQIjeE~7=SV$`H zE?zHFkx&8#3_!Mz>_@l<0FN#Q;Pnb10>`{QuZ4g}I#8Q{e+40|^IFO^u##$?#y3kNr995SlCKSyH^Z8~}Z%2`q#6tDX z4;g?ScSnv11n1pV RBl`dV002ovPDHLkV1g3^z$E|x diff --git a/graphics/pokemon/vivillon/sandstorm/icon.png b/graphics/pokemon/vivillon/sandstorm/icon.png index e90306872fe1cd403559b466f595d622bf0aa560..e5e0b987ebea774b762e8a73cedd061e034fe151 100644 GIT binary patch delta 405 zcmV;G0c!rF1l|LX7zqdi0000?P=%b4dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0003^NklHBJ_R4JOn7;~B9_)`P;3ZUd% zgO~)(2)O79x|SBl2KZH}cfl}gAPkU>x7>9!8vx3E225rvp;MMwx0(pRe3tp#fs=nf z?TGmtQ-OB+h)#qaqXimH&Zh@Lo@>A~z3gA2fXD>U;KHR%DfO&LZH*|#4EgV!WUv~zH)%~hJA9QsAmALn_oN>y5Bj2{MgbpzFqd?oBls` zBl4l%L)dfK9uVxULN*o@No>x^EqZ^)^S!PDA0A7R*(xdD#1d2ikU&()0KSL2Rle^v zJZKRK;sKMS3%BY?5Lq0o&nH2!>c@~EJxg1BBuEbEogj1g+!dY#sn#HoAW{Ur?~)}* znI6t~f>eN4u>`3S%I~Hp$R-0q+up5OE5;AUNF2-65PQ@B0000OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00BrzL_t(|oXwL>YQr!Pg>{2L7jUQ#;NBqJ zbe;PNOnjMa41;|JIV*!0t8O;}p{bJ8mekU1>1>QXy?J7OEX1D${{U8i-A};6SrL*7 zoQ>ChDH2K`KmcI($bN(c=*M{WWOD!>Hvj-_w88Uc1kA04e|{H;P*uiyRBFq3lJWqk z`r#{OeXFSQs>clkO-DV)47CAyeV=B9>D8&B2HOM#PqiV_52<3NGY*v3w^Fn?r6!3` z8+FM5bacR1N+4KgKTdhmA_C4VZW>Vri2omP!sP}9!(~~_=n4SNk7cRsalC(bljSaf zWg8RWi18MNYy{AIn*(ZZ5Bu}JE@sqv5kBpYS*4WL?F!&$NqTWS=7 z5JF9HgEFv$x*6u&qYLvqWEC<)V=l!H!c$X#Fb5q<1$2;u`+j_DoA@n00gT!A4tiES Q3IG5A07*qoM6N<$f=J)J=>Px# diff --git a/graphics/pokemon/vivillon/savanna/icon.png b/graphics/pokemon/vivillon/savanna/icon.png index 2665f3456ddaf9b4eb7e9441b008969ab1432b30..37fc6570df34d5ac7bca82f81ab88202b96a363c 100644 GIT binary patch delta 413 zcmV;O0b>5M1m**f7zqdi0000?P=%b4dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z00041Nkl8A;XPG9V0>k8v= zWl+uGp-o1Dc)$ed!mYX!MCNA$d?W~Z{A#WQnJu`)oggtmuLP-qg<~&0L4<}A56u#! zYpqE(*e+RuNI2r;n2{`AY|2QGETOhB1j`H<*z#`WSW<6|f*X<^VjCj>000R9NkvXX Hu0mjf%ig}m delta 489 zcmV7-Iwj0001qplF={000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00CD?L_t(|oXwLvZi7G&hUW$&F0fWO0KS29 z3JN4Y&P9VyLxB_}6@?|c0LulE88#bHAd#J5TkIoI+9=bY{q~=KH4gy(EcgeIfYO|h zK}pb7g-TA>L+2&<01yz9{UiGk@&RxlX~1Sbozod0Vkx0df3n#KnM;XrF$+KoagqJ{ zU^1S9V1e<;q^Ng6Vm!qL=!#ZVn{N&@gW&v8x2L0hwT>uyiDLtR>#(J3k=crw#Bob* zeTvFF$!wEAhu3xC09?`{x1N(gDmi3s(4yEXm{a8eRKw0M zm4|$H{~D8Sd%Q`oo5w`yE}w2Ov!EP%=>j_59`4N)bn{kK9rSj88WjYA9E}2b8Bo=I z+OZ&sGl|3kuEg^ya)8z$)tABnoerbd#`W0i_Of*q`3yT%rr^ f`|+)9@LPNV+!pO+x$cg)00000NkvXXu0mjf)jrRF diff --git a/graphics/pokemon/vivillon/sun/icon.png b/graphics/pokemon/vivillon/sun/icon.png index 7b7974210f5df659b5131604942b88a27e62082a..0a8af5e68ffd56e6fd40c2166260c993111e1617 100644 GIT binary patch delta 411 zcmV;M0c8HI1mpvd7zqdi0000?P=%b4dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0003~NklsvF}<0IJ@_ZUn;hNidie8ZH5DJ<$k|QUY9eel)}JoQHn~ zY4>F~jSLbzs-5-J0IOx}0mJmL?_5lREgl3495^&7!LfreQesh3s#}9-m!zE zt-_7eBC13AdoOAh#5#lwH)4C35O^4Dg3w~ChYubmxX+xC{Mtf~r^OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00B`+L_t(|oXwLva>6hWhW7?LzJQqc0Okgy zQ9?-rl%xW8p~IaytBe_UYem7h)5gG9k7UwjvW>@|{{7{B7~s!>e*g`r-5W9(4c4pB z=;8R%MhP(h1jOayk^Kn$0N9fb0rtfR5K(IAigGkUW~p(Ve~$vNLe#q3Ntf}IBokc8 z-I!uN1c|F$IbapdRJ~nF8bNaUtZMn{OtH!+TW@#nGk~kKrt_-w6*Gy$hQj&`$(OwJ zO#+*qm-7JNlqP}aAkaqlW!SU646LukCFr28y1O!N^5Z4V(}p3AkHQm6k|(!JhQCh zoBkiGX#OxiL(aHjIUq)@&0%K5$BBQ%oFYXPJkMhn_?2UDGVfCKAy9`~Wqy|+sLd<; zord3(BG;!f)o30}(HsO(Ap>3xGOR9hKMn%TZ_Vu>GA4+deLF}=0lOVUHM_ZSmY0KM z8JrMzkdjx}&Kv6vGIft&ypbuu0?k2Y4i&o@4zloorY(1Cu1(?x)(;!suFeihO8@`> M07*qoM6N<$f?lM$ivR!s delta 495 zcmVOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00CS{L_t(|oXwLhd0IZai z>GWQW5f4JlP^)eJ6>@%;Bs-;(5!iy#;*{-`8i6=o%35vRt7S~_KG72ZE~AR-EO!+% z$>o~-`p%@5tJF0KY*eYt1Gu1>R^)&+t+}Lr(|UyLrMPJzG=%?e{e;5}vNeZgG3zz} z*mj4oRPOYAe>kTk%^<;M91~?b-QQw90j)1xzp3d2=;`)wmrv_bABv)Z&h1Zq7D5=O zKzqkBzYv6IKYLRr}4@GYa=R8uO4V@6t8PP$J|y`?p4T)ag_xhgv&Sp_RSVH lRNw-AFzm;-w!v@q3FvR{ut8XfUH||907*qoM6N<$0fJwo(}4g0 diff --git a/graphics/pokemon/whiscash/back.png b/graphics/pokemon/whiscash/back.png index 8741f6e9ac109ae6820f40920cc05232b64331d6..07e3fb0f68647426aad382e7d614e73beb00c760 100644 GIT binary patch delta 537 zcmV+!0_OeH1>ppc7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0005dNkl!^7z|gem3h$H)CN)2zTz>X@rnp z=mGgs;WUjF`|}O&w0|_k=LQ-UIxB{;|J7zTLPWk1tboWgO;8jD@m%n<@Nx1;Sf_tr z=)?2UvGPHtXju&7PG32;0#i(!V1S^eJ%cnyvllR)-5}D!k+GpT2-qv66Q36AX&(h2 zV-{G2CT>Y*!zKWkd<$oR?3thPLJ(7OiS%&riOc)3@mY{tuyk;d=Tqg0`_va;5VB4& zi5vwME)2R0Qr-d%!x6LiyMk;BU4egB$U}^6d^OA*cS9*iUcbRRj$3RWWS&L1DL{n; z!I8(6F&6`A@D;yGEx_Z43K+tf&-iXA1!HN5jRAn){$V29(O3x93ba-@3MxJuh#=5< z5B?5PJ@HiY5ReO4mpSG=jN}5=gTRVad^X^@vy1Hp{3ehFJ&s?{_PB(BGOK?EUT>vB zF=}WCi1;MP>-c&xNK5Dl+B~jjH?4lM-!6bN>A*XJR)H)5QS%=O>^;FDTo>pH@WS9X z1YI5_OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00H<(L_t(|obA%TPvbBY2XL1(QpP&HO003| z9?HTKOZ-sH^y|{%5G2Rg^opg_eMl;ZjBZQP;;})&He<>EF-vov{SD_h*K)nbc zfn0)H1Bd+o%OD6`F$8#Vd2Sn+TwO-E8N+GVtQ824=N`x}Xm8 zp~wm8n{_~0FwOG^fcUO5!X@Ki?#Udcv0DZ<+c*+{sH@*qu-I-Kuav{f)N+dvIACl; zy;2Ul)gQkKe`XXO)BY*g{R)yTz6s#)77HiOU`$Bwr2^V)<}g;uiE*`ip8FDPXOvyb zoKk)86HX;S_JS505Q74Y1^_m5Ghpx`o^o(bcn%Xi2TOhrd!05bI*b(W42+F*1Ky*@Zr0))ORO8= zsUU)Y|cJ?YX*+BwI5n8_nP%4VF?A1hX zgLslZ%r|Eg5A);|u*v{D_X9A!&1P%@a9cZs1QY86F#et__q9{XW8(dY+q1AXV;P_* mio*Jg9z~Ba4$)`*7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0004?NklNRbT43A=xtpqA+`WY8{mLYdZ2$a80>u)KmgVe4YL9|9;mjI`O6uomr>1V4!9nW zN1z_P4UiB*j79*Apj+H*E2M#38zRxVJY$Fk(5MvvYWt!F*Z`a%u2HJ6u}}a>=QOPy zX&-S;U1cwEX7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00FB>L_t(|obA%FN&`U<2H<7EHqUUZO9F~b zX0Z`0_J$xtQyE{tcPQ)rQce_8ziaoib|TDEt&1T#VG zq-j)KQ3BZIJRNNtOk;rEj?y5`(*nqh#Q@x}1bQt7VUI?Ps1e+$4k35I$|5if(DHH( zpu{2KioqEDRosjzMZ_qBoH~IDV1OII<1knwoFfU1Jt10@(|?p73>okq5|KdMMg~nR zfhYhj0(7luv#ubRO-F;z3V%u=c=1NhblrV1ib8pj`l=leYYl z9r&CscnGU_2)pj*Brp4`>rA%y2m#Bh0Vhjh+V}UFKC$? zCh~x$3c0^wslv-vLPh~>s_-!uN`BP?rMJ1Qh^5->Q2$GVX3}SIwWL0(A{Wj6tyv(R z9L=h8p_1f`-of(WxjL8W`0g6ZB(EtDd diff --git a/graphics/pokemon/xerneas/back.png b/graphics/pokemon/xerneas/back.png index 30654685a9aa68df660096ea723b76225466e367..5f38d48dd36b1254066a07ff5e00277c72cb8209 100644 GIT binary patch delta 669 zcmV;O0%HBf2IK{h7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z00070Nkl^IC%2VRT|9| zxMwxo3&Sc&&|Ja00~FmY09vQ?Wd&G*1z0@{ZmQ1V0syaS?79GOnxO$K^}u=5g3W)R z0C>?Y^hpBMLIZFUK&MaDS%kADSb(mY-H;0=l*-Tm5IR+(*WE}l#ta6a3A7m&M$RWq z7y(8@OB<#VY!d(~0A^X5-Ec(-V;8M~fu#55Gc?JN0UUbL3k8S;o52ED{^HmRb8p%U z)6WJ#lLr()Z-5>pY=IG|1OX)H*y?{rK(c@tQBM^J05iaC^t=t|3Zk(<0QOb$r!hb8rsh9{p16aWyi+WkUSZ)Xmz>+}ZxGZ1$ zAT3J-1IYE)_B#tifDi-#)y2NNT9954K>(WIByTOC1&E8Yz5rqlj8RUg%nN@#|0+rB ze9R#KDS)~_;sS`?iwT(*>c{{ed9t1jm?<~yKvbDBP}vNim7SswTR?~zkb=-(nX31} zZ;v7oiY|$~nc2VrKm^|j^S>Cyz!tz3LRLkSfIkUQ3?$IjLMg2yaTpL!1`?r^Zb#%1 zt^l*aS|0w8KrM87T^`RPpZ|Zki%S4mSOenmi6R!p3?jafCqi!_CVBH3yC=AgKpW^i z;yq!pnfUfE$;%O^UGVr`n^#YTOA$HdXsRx{X zen-GZW&ahR+k`&=m~-??{g;I3OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00L@BL_t(|oV}CFj-xOTMGMKJY+G3Dmwry2Cy52eMA*_!NjytCO404 z36yadh@2{9v7;s+`Y`*fQ`6V1@PO>&wd;^tzV-qAX;eCae+(YNl811DAhpX zfT(QTu(iX?3_`}XiA=;^r;LlKPnjDaDQ6!RAbsfpNqOMjEXi6eVrg6&;PZgEohE94 zRF)#uy=Wjie@Mh!`A%;bf1>g(%#W2v0tQbb1VFn09%~B#$KFdf?|ER4$)kGI@q3;Qyq%g5all%$-o52p@NL#QCTcZNjga$PMeK_?3-cRYj0xWz} x{sGvizqDzu?fN?V!1Zb-`D29>{U6rAAKMYd5wj-Y1XTb4002ovPDHLkV1hL=PFnx~ diff --git a/graphics/pokemon/xerneas/front.png b/graphics/pokemon/xerneas/front.png index d219e463b93701b4354211829bc84210b9308993..357f3b4294afcae027cab5710590b6abdfe3e65a 100644 GIT binary patch delta 728 zcmV;}0w?{B2cHIz7zqdi0001;w}I@Ddp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0007xNklPY+YxU>{)#u!8nKLT0^B&K_%+|+xpoW@x4PeM&<%HdEjTH>hadzOOi)=|frV}b znv}G)5PS$B;%~!|c92w~%{q=jhSyWh<=&vdbu7mLCIq#}1)spD z9|XW_fbuxJ5-$Y^Q1X`o3s5Hb8$ta{1Q-ZJ8h;%ioCR$f?6UzABU`y{Uv_^%UCtIk zq<_`$ay^RZct2?Z!HRel_hnOqh1(Mt3;d*iACxSV6Qh{jc zLpT3)Ems^Ly*$4APW%dd;wk-JE8T#mDG6VHGw0WZpD{WHwI-{ zU~|Q(01qF`0A3boRS1Bt3$P_Ip1d=G8j>xeNdd8KJav1#8~Aw@96c~Wt^%N?Ed-v7 zz+KR`R$ST!mDBxB_05pm8^Xb@3CgEn&G3t05YA73Cjcy&OEcZj)O80000< KMNUMnLSTZ%%v^^6 delta 839 zcmV-N1GxO3295`i7-Iwj00013M{Ml?000McNliruOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00Oc}L_t(|oQ>7LPuoBg2k>{ul7(1eyQoqp z;-pk`OH7w$Ii;3R$^ryCRY!^si3wHsuHvug4=+x(776887+6UDxxRBq{5$PaVwC%S z{9b$)2>?|lzR3bK& z`i6nIL7^n9cW2%VxT>xO(#`e(j{Uh&0#df=p12OH_f$#es`=VmE*Z_rL_{W}q zY#X*)5hoR%f0!@(O}ky1|6D>pF?rt{xo&k1p$G-*hrH%~1RiInwm7fLK_B{F{|#RQ zy1_ToXSEZ++P(g?%Tlme$ce+8F1t=2Ve@+dv>0O-r|H7D0KjAiqwp#N?h8P3b^^V`yh92m=}f0*lR1%#YRnVWEwfDvBRR*271 z<{Rh=aEAM!Unzu-J|Ajsi)db*jLJOxwzTDq7WD@E5k9@n-m` R^`-y-002ovPDHLkV1hU+cg_F+ diff --git a/graphics/pokemon/xerneas/icon.png b/graphics/pokemon/xerneas/icon.png index f59ee416fa95623291e0229eef19fef615a5b3d7..31036c9ee11e4e1e55ecb75adbeb05630153bc3f 100644 GIT binary patch delta 361 zcmV-v0ha#N1hWH>7zqdi0000?P=%b4dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0003ZNkl7F)ZQd${)(RV`BxU=9z_bMVyX(Z&U9_D+vSSAx-bj8E56kw}#p;~LMcbi-m^^v&% zNJxJ+HiQHsBJl|3tCWIg)gx&DR;>hbx=c?R9;z_fPVrIKDw{BON+5CISKT`~mp=%N zdvHAmc-!hGuJs3CD2>2|C1B{ip(IuB-BYv|fOZABPN3Zbo}xe2Lca<9HL$(X|80He z$5iFh=0`d}runfNAY*>q3=q%p9U$)=Agh0PA0X@XhxzaWA^RkSCYaLj00000NkvXX Hu0mjf`>n28 delta 524 zcmV+n0`vW|1JwkO7-Iwj0001qplF={000McNliru`02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00DVPL_t(|oYj)QYQr!P#`OkA_O^MEKA;T6 zUL|njXXzG!V$reSCS=PX%PL)BkgcBo%b|rrr)rVz<9v7D`A5hv4p;)+ZSm2Epsd3u zC^rbIEtEUqBR>(}DNY)B6qdMBdDW+&BAA7DZ3;USEjZ(ee~%AZjcpv`5#Q%V+NrOI zcpjxv&66~|&=}iUfc(PcZixwK_L*M-!HG!HBy=Mvtt|0Nj%N`%tf0=DeMX^2#Dq|AI`(sgPN?o<`wYGGO~Eehi)OM{)xUc$d;2FvXPvQy_DF z&>8;D!VklERCq#~V_uGC8o?vxulhLgfp{>UKA9Pyj-V8Im;oa2_M8hTePGo@si=Zk zTai4PfDe!?-P3R(j?ow^EObCkGqM5(YMgxqOilk49x$Qb4w&`%nU62IsxmsNs@!@2 O0000<%0l}1qVIkQEUNX zD=5*C*J7`Dcfi`zd_MD5wRwKLt3Z!JuoTDpir0f&93&>AfXsfEp*A z=n1^$Pk%rEZgvkndgkutc)QNf`M7+yZwwdXATO;_gbBF9Yf-zZCr|!iegG8c!4rvk S>OAKF0000OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00C}EL_t(|ob8lNYQr!Pg&mXwRJbPBh!~qd zx=HYaEV`^k&S7fM6?%_$rFC~bMlaE0bVl;8l-RpMA#eM>d3qx`Ns_z%k;KCiP%ja? zB|?}bVz)$y%^U%cB+ASXg-$_aGlVF$hEmTEYm_oAE>l84e@IZoh=Bcjm{BkxyK!p| zlSLFz1QT07ZY_>mf+PWCRO1zBZ9DZ7Ql#(56}eVZ>6;m z`A6S@S~fr57Cys^a=w%&O~L}c4k55cl6=%&PfAa zbOmBG-iz1ner77R(S71|3+0iGrdKVO{^0KVL;V6q6ECI(W@KJe00000NkvXXu0mjf DX7JH0 diff --git a/graphics/pokemon/zygarde/10_percent/icon.png b/graphics/pokemon/zygarde/10_percent/icon.png index 3d968a6b698f72dc28537462de56151147e500b4..222eb1b80a5a53ad9d015506ba4482133819abd1 100644 GIT binary patch delta 307 zcmdnT{FiBh1SbbG0|SFkKGU*&q{r<(KE<{%+Mwa3B z5+)hth%?G_@|9n5`oEo|;h3^TBvVv{dGl7Kjs4X;6^d_YC>m&@PlUm_LXR`enP=yL{7S3j3^P6OV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L0081iL_t(|ob8e^4#OY}MY)0HAuAlBC#aOJ zMUk30m+0KPMrv0e5?OIgLP}ujP-Uto{Pe#u#zK4-ROL{E;265n0l}7zV0H>HB*IcA z`6fh?u?)?_g0YjRV(oTV6wnw{@#O952=X)%+rh6nAS*c2e_p4quP9w&!w1GKh69e%99qTa<0LESsU>*_J zMvH~7UszPcmsHQ;65p1 SX7K<3002ov22Mn-LSTX>JeG3+ diff --git a/graphics/pokemon/zygarde/complete/icon.png b/graphics/pokemon/zygarde/complete/icon.png index 8575e8d58d804fa5e6a345881dd1fbcb9268c4bf..663b98fd74fc782251a0cd6b406460310e1104f5 100644 GIT binary patch delta 464 zcmV;>0Wbd01epYo7zqdi0000?P=%b4dp~~=bW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs z0004qNkl+qNHH_?9aM zwMHF?4_OjWh6L~cK!qVGadHhPGy9TN2?CCt!i>5kCPcMRd0&76gCn zG4oQ^fEPHlRvArP2y3y2z0nz94*xqbj{|l7DfpI z9NCXR-rzmAQb&#XUrqp`nM6LEp%1W)^LQhW243X9c>N1x`!fPT7RY6g$g@CV(vv`_ zha`}0kR%WSlR)~yo&qs{41vU!INPxE=l)232!kYnxIdB~xl02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(DOV1ZP1_ zK>z@;j|==^1(6{?e*t1kM@0Xn2lB-L00DGKL_t(|oaK@+YQ!)QMRkKg5Zq-#-Mz_El|4;MYkb_e@3h_0Fn+pN~M+zVBtUg z*aa9qw^X!>WSJ7$w6d3oDPv05$)c5mRFcC6p2nS&ui9eB_{4M=t7rDZL&iw=)DV%M z6vx^U9!d2rYSUcQNzdhsP8AZ%t~;LIW*{6;-x7N8em~4WSYnGa;L9Mu_g$0rt&JnG z8Ny*F@}*bff0tvMPVa%O7=R%H>l=seMXUf^+$A(*O;flT-=5EfyJzqDxAm`taZwnx z3ge Date: Fri, 24 Feb 2023 15:22:58 -0300 Subject: [PATCH 22/32] Use proper symbol styles for Hakamo-O and Kommo-O --- include/graphics.h | 20 +++++++++---------- sound/cry_tables.inc | 8 ++++---- sound/direct_sound_data.inc | 4 ++-- src/data/graphics/pokemon.h | 20 +++++++++---------- src/data/pokemon/level_up_learnset_pointers.h | 4 ++-- src/data/pokemon/level_up_learnsets.h | 4 ++-- src/data/pokemon/pokedex_entries.h | 4 ++-- src/data/pokemon/pokedex_text.h | 4 ++-- .../pokemon/teachable_learnset_pointers.h | 4 ++-- src/data/pokemon/teachable_learnsets.h | 4 ++-- src/data/pokemon_graphics/back_pic_table.h | 4 ++-- src/data/pokemon_graphics/front_pic_table.h | 4 ++-- src/data/pokemon_graphics/palette_table.h | 4 ++-- .../pokemon_graphics/shiny_palette_table.h | 4 ++-- src/pokemon_icon.c | 4 ++-- 15 files changed, 48 insertions(+), 48 deletions(-) diff --git a/include/graphics.h b/include/graphics.h index 55174442c..49ce74b2e 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -868,8 +868,8 @@ extern const u32 gMonFrontPic_Bruxish[]; extern const u32 gMonFrontPic_Drampa[]; extern const u32 gMonFrontPic_Dhelmise[]; extern const u32 gMonFrontPic_Jangmoo[]; -extern const u32 gMonFrontPic_Hakamoo[]; -extern const u32 gMonFrontPic_Kommoo[]; +extern const u32 gMonFrontPic_HakamoO[]; +extern const u32 gMonFrontPic_KommoO[]; extern const u32 gMonFrontPic_TapuKoko[]; extern const u32 gMonFrontPic_TapuLele[]; extern const u32 gMonFrontPic_TapuBulu[]; @@ -2082,8 +2082,8 @@ extern const u32 gMonBackPic_Bruxish[]; extern const u32 gMonBackPic_Drampa[]; extern const u32 gMonBackPic_Dhelmise[]; extern const u32 gMonBackPic_Jangmoo[]; -extern const u32 gMonBackPic_Hakamoo[]; -extern const u32 gMonBackPic_Kommoo[]; +extern const u32 gMonBackPic_HakamoO[]; +extern const u32 gMonBackPic_KommoO[]; extern const u32 gMonBackPic_TapuKoko[]; extern const u32 gMonBackPic_TapuLele[]; extern const u32 gMonBackPic_TapuBulu[]; @@ -3288,8 +3288,8 @@ extern const u32 gMonPalette_Bruxish[]; extern const u32 gMonPalette_Drampa[]; extern const u32 gMonPalette_Dhelmise[]; extern const u32 gMonPalette_Jangmoo[]; -extern const u32 gMonPalette_Hakamoo[]; -extern const u32 gMonPalette_Kommoo[]; +extern const u32 gMonPalette_HakamoO[]; +extern const u32 gMonPalette_KommoO[]; extern const u32 gMonPalette_TapuKoko[]; extern const u32 gMonPalette_TapuLele[]; extern const u32 gMonPalette_TapuBulu[]; @@ -4521,8 +4521,8 @@ extern const u32 gMonShinyPalette_Bruxish[]; extern const u32 gMonShinyPalette_Drampa[]; extern const u32 gMonShinyPalette_Dhelmise[]; extern const u32 gMonShinyPalette_Jangmoo[]; -extern const u32 gMonShinyPalette_Hakamoo[]; -extern const u32 gMonShinyPalette_Kommoo[]; +extern const u32 gMonShinyPalette_HakamoO[]; +extern const u32 gMonShinyPalette_KommoO[]; extern const u32 gMonShinyPalette_TapuKoko[]; extern const u32 gMonShinyPalette_TapuLele[]; extern const u32 gMonShinyPalette_TapuBulu[]; @@ -5748,8 +5748,8 @@ extern const u8 gMonIcon_Bruxish[]; extern const u8 gMonIcon_Drampa[]; extern const u8 gMonIcon_Dhelmise[]; extern const u8 gMonIcon_Jangmoo[]; -extern const u8 gMonIcon_Hakamoo[]; -extern const u8 gMonIcon_Kommoo[]; +extern const u8 gMonIcon_HakamoO[]; +extern const u8 gMonIcon_KommoO[]; extern const u8 gMonIcon_TapuKoko[]; extern const u8 gMonIcon_TapuLele[]; extern const u8 gMonIcon_TapuBulu[]; diff --git a/sound/cry_tables.inc b/sound/cry_tables.inc index 7714cd00e..7b5947506 100644 --- a/sound/cry_tables.inc +++ b/sound/cry_tables.inc @@ -1127,8 +1127,8 @@ gCryTable:: cry Cry_Drampa cry Cry_Dhelmise cry Cry_Jangmoo - cry Cry_Hakamoo - cry Cry_Kommoo + cry Cry_HakamoO + cry Cry_KommoO cry Cry_TapuKoko cry Cry_TapuLele cry Cry_TapuBulu @@ -3249,8 +3249,8 @@ gCryTable_Reverse:: cry_reverse Cry_Drampa cry_reverse Cry_Dhelmise cry_reverse Cry_Jangmoo - cry_reverse Cry_Hakamoo - cry_reverse Cry_Kommoo + cry_reverse Cry_HakamoO + cry_reverse Cry_KommoO cry_reverse Cry_TapuKoko cry_reverse Cry_TapuLele cry_reverse Cry_TapuBulu diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc index fb4c6b44f..74f5529d7 100644 --- a/sound/direct_sound_data.inc +++ b/sound/direct_sound_data.inc @@ -3522,11 +3522,11 @@ Cry_Jangmoo:: .incbin "sound/direct_sound_samples/cries/jangmo_o.bin" .align 2 -Cry_Hakamoo:: +Cry_HakamoO:: .incbin "sound/direct_sound_samples/cries/hakamo_o.bin" .align 2 -Cry_Kommoo:: +Cry_KommoO:: .incbin "sound/direct_sound_samples/cries/kommo_o.bin" .align 2 diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 385460228..a39f6f35e 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -801,8 +801,8 @@ const u32 gMonFrontPic_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/front.4b const u32 gMonFrontPic_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/front.4bpp.lz"); const u32 gMonFrontPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/front.4bpp.lz"); const u32 gMonFrontPic_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/front.4bpp.lz"); -const u32 gMonFrontPic_Hakamoo[] = INCBIN_U32("graphics/pokemon/hakamo_o/front.4bpp.lz"); -const u32 gMonFrontPic_Kommoo[] = INCBIN_U32("graphics/pokemon/kommo_o/front.4bpp.lz"); +const u32 gMonFrontPic_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/front.4bpp.lz"); +const u32 gMonFrontPic_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/front.4bpp.lz"); const u32 gMonFrontPic_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/anim_front.4bpp.lz"); const u32 gMonFrontPic_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/anim_front.4bpp.lz"); const u32 gMonFrontPic_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/anim_front.4bpp.lz"); @@ -2013,8 +2013,8 @@ const u32 gMonBackPic_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/back.4bpp const u32 gMonBackPic_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/back.4bpp.lz"); const u32 gMonBackPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/back.4bpp.lz"); const u32 gMonBackPic_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/back.4bpp.lz"); -const u32 gMonBackPic_Hakamoo[] = INCBIN_U32("graphics/pokemon/hakamo_o/back.4bpp.lz"); -const u32 gMonBackPic_Kommoo[] = INCBIN_U32("graphics/pokemon/kommo_o/back.4bpp.lz"); +const u32 gMonBackPic_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/back.4bpp.lz"); +const u32 gMonBackPic_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/back.4bpp.lz"); const u32 gMonBackPic_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/back.4bpp.lz"); const u32 gMonBackPic_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/back.4bpp.lz"); const u32 gMonBackPic_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/back.4bpp.lz"); @@ -3219,8 +3219,8 @@ const u32 gMonPalette_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/normal.gb const u32 gMonPalette_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/normal.gbapal.lz"); const u32 gMonPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/normal.gbapal.lz"); const u32 gMonPalette_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/normal.gbapal.lz"); -const u32 gMonPalette_Hakamoo[] = INCBIN_U32("graphics/pokemon/hakamo_o/normal.gbapal.lz"); -const u32 gMonPalette_Kommoo[] = INCBIN_U32("graphics/pokemon/kommo_o/normal.gbapal.lz"); +const u32 gMonPalette_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/normal.gbapal.lz"); +const u32 gMonPalette_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/normal.gbapal.lz"); const u32 gMonPalette_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/normal.gbapal.lz"); const u32 gMonPalette_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/normal.gbapal.lz"); const u32 gMonPalette_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/normal.gbapal.lz"); @@ -4452,8 +4452,8 @@ const u32 gMonShinyPalette_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/shin const u32 gMonShinyPalette_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/shiny.gbapal.lz"); const u32 gMonShinyPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/shiny.gbapal.lz"); const u32 gMonShinyPalette_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Hakamoo[] = INCBIN_U32("graphics/pokemon/hakamo_o/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Kommoo[] = INCBIN_U32("graphics/pokemon/kommo_o/shiny.gbapal.lz"); +const u32 gMonShinyPalette_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/shiny.gbapal.lz"); +const u32 gMonShinyPalette_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/shiny.gbapal.lz"); const u32 gMonShinyPalette_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/shiny.gbapal.lz"); const u32 gMonShinyPalette_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/shiny.gbapal.lz"); const u32 gMonShinyPalette_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/shiny.gbapal.lz"); @@ -5679,8 +5679,8 @@ const u8 gMonIcon_Bruxish[] = INCBIN_U8("graphics/pokemon/bruxish/icon.4bpp"); const u8 gMonIcon_Drampa[] = INCBIN_U8("graphics/pokemon/drampa/icon.4bpp"); const u8 gMonIcon_Dhelmise[] = INCBIN_U8("graphics/pokemon/dhelmise/icon.4bpp"); const u8 gMonIcon_Jangmoo[] = INCBIN_U8("graphics/pokemon/jangmo_o/icon.4bpp"); -const u8 gMonIcon_Hakamoo[] = INCBIN_U8("graphics/pokemon/hakamo_o/icon.4bpp"); -const u8 gMonIcon_Kommoo[] = INCBIN_U8("graphics/pokemon/kommo_o/icon.4bpp"); +const u8 gMonIcon_HakamoO[] = INCBIN_U8("graphics/pokemon/hakamo_o/icon.4bpp"); +const u8 gMonIcon_KommoO[] = INCBIN_U8("graphics/pokemon/kommo_o/icon.4bpp"); const u8 gMonIcon_TapuKoko[] = INCBIN_U8("graphics/pokemon/tapu_koko/icon.4bpp"); const u8 gMonIcon_TapuLele[] = INCBIN_U8("graphics/pokemon/tapu_lele/icon.4bpp"); const u8 gMonIcon_TapuBulu[] = INCBIN_U8("graphics/pokemon/tapu_bulu/icon.4bpp"); diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index 0ecfa59cc..d27399d32 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -790,8 +790,8 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_DRAMPA] = sDrampaLevelUpLearnset, [SPECIES_DHELMISE] = sDhelmiseLevelUpLearnset, [SPECIES_JANGMO_O] = sJangmooLevelUpLearnset, - [SPECIES_HAKAMO_O] = sHakamooLevelUpLearnset, - [SPECIES_KOMMO_O] = sKommooLevelUpLearnset, + [SPECIES_HAKAMO_O] = sHakamoOLevelUpLearnset, + [SPECIES_KOMMO_O] = sKommoOLevelUpLearnset, [SPECIES_TAPU_KOKO] = sTapuKokoLevelUpLearnset, [SPECIES_TAPU_LELE] = sTapuLeleLevelUpLearnset, [SPECIES_TAPU_BULU] = sTapuBuluLevelUpLearnset, diff --git a/src/data/pokemon/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h index f4ad3b566..bb6d97be9 100644 --- a/src/data/pokemon/level_up_learnsets.h +++ b/src/data/pokemon/level_up_learnsets.h @@ -15978,7 +15978,7 @@ static const struct LevelUpMove sJangmooLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sHakamooLevelUpLearnset[] = { +static const struct LevelUpMove sHakamoOLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SKY_UPPERCUT), LEVEL_UP_MOVE( 1, MOVE_SKY_UPPERCUT), LEVEL_UP_MOVE( 1, MOVE_AUTOTOMIZE), @@ -16003,7 +16003,7 @@ static const struct LevelUpMove sHakamooLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sKommooLevelUpLearnset[] = { +static const struct LevelUpMove sKommoOLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_CLANGING_SCALES), LEVEL_UP_MOVE( 1, MOVE_CLANGING_SCALES), LEVEL_UP_MOVE( 1, MOVE_SKY_UPPERCUT), diff --git a/src/data/pokemon/pokedex_entries.h b/src/data/pokemon/pokedex_entries.h index 492538260..7952f44a3 100644 --- a/src/data/pokemon/pokedex_entries.h +++ b/src/data/pokemon/pokedex_entries.h @@ -9408,7 +9408,7 @@ const struct PokedexEntry gPokedexEntries[] = .categoryName = _("Scaly"), .height = 12, .weight = 470, - .description = gHakamooPokedexText, + .description = gHakamoOPokedexText, .pokemonScale = 356, .pokemonOffset = 17, .trainerScale = 256, @@ -9420,7 +9420,7 @@ const struct PokedexEntry gPokedexEntries[] = .categoryName = _("Scaly"), .height = 16, .weight = 782, - .description = gKommooPokedexText, + .description = gKommoOPokedexText, .pokemonScale = 356, .pokemonOffset = 17, .trainerScale = 256, diff --git a/src/data/pokemon/pokedex_text.h b/src/data/pokemon/pokedex_text.h index 6048d2121..a28bd184e 100644 --- a/src/data/pokemon/pokedex_text.h +++ b/src/data/pokemon/pokedex_text.h @@ -4703,13 +4703,13 @@ const u8 gJangmooPokedexText[] = _( "tall mountains where Jangmo-o live. They\n" "grow little by little battling one another."); -const u8 gHakamooPokedexText[] = _( +const u8 gHakamoOPokedexText[] = _( "It sheds and regrows its scales on a\n" "continuous basis. The scales become\n" "harder each time they're regrown. Its\n" "scaly punches tear its foes to shreds."); -const u8 gKommooPokedexText[] = _( +const u8 gKommoOPokedexText[] = _( "Its rigid scales function as offense and\n" "defense. In the past, its scales were\n" "processed and used to make weapons\n" diff --git a/src/data/pokemon/teachable_learnset_pointers.h b/src/data/pokemon/teachable_learnset_pointers.h index 28998aae1..c8adc8668 100644 --- a/src/data/pokemon/teachable_learnset_pointers.h +++ b/src/data/pokemon/teachable_learnset_pointers.h @@ -790,8 +790,8 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_DRAMPA] = sDrampaTeachableLearnset, [SPECIES_DHELMISE] = sDhelmiseTeachableLearnset, [SPECIES_JANGMO_O] = sJangmooTeachableLearnset, - [SPECIES_HAKAMO_O] = sHakamooTeachableLearnset, - [SPECIES_KOMMO_O] = sKommooTeachableLearnset, + [SPECIES_HAKAMO_O] = sHakamoOTeachableLearnset, + [SPECIES_KOMMO_O] = sKommoOTeachableLearnset, [SPECIES_TAPU_KOKO] = sTapuKokoTeachableLearnset, [SPECIES_TAPU_LELE] = sTapuLeleTeachableLearnset, [SPECIES_TAPU_BULU] = sTapuBuluTeachableLearnset, diff --git a/src/data/pokemon/teachable_learnsets.h b/src/data/pokemon/teachable_learnsets.h index 19b22d9b3..2130b18a2 100644 --- a/src/data/pokemon/teachable_learnsets.h +++ b/src/data/pokemon/teachable_learnsets.h @@ -29445,7 +29445,7 @@ static const u16 sJangmooTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sHakamooTeachableLearnset[] = { +static const u16 sHakamoOTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_ATTRACT, MOVE_BRICK_BREAK, @@ -29475,7 +29475,7 @@ static const u16 sHakamooTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sKommooTeachableLearnset[] = { +static const u16 sKommoOTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_ATTRACT, MOVE_BRICK_BREAK, diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index ebe0c316f..c018d8987 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -790,8 +790,8 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(DRAMPA, gMonBackPic_Drampa), SPECIES_SPRITE(DHELMISE, gMonBackPic_Dhelmise), SPECIES_SPRITE(JANGMO_O, gMonBackPic_Jangmoo), - SPECIES_SPRITE(HAKAMO_O, gMonBackPic_Hakamoo), - SPECIES_SPRITE(KOMMO_O, gMonBackPic_Kommoo), + SPECIES_SPRITE(HAKAMO_O, gMonBackPic_HakamoO), + SPECIES_SPRITE(KOMMO_O, gMonBackPic_KommoO), SPECIES_SPRITE(TAPU_KOKO, gMonBackPic_TapuKoko), SPECIES_SPRITE(TAPU_LELE, gMonBackPic_TapuLele), SPECIES_SPRITE(TAPU_BULU, gMonBackPic_TapuBulu), diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index 24ebc78f3..e346dd4a2 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -790,8 +790,8 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(DRAMPA, gMonFrontPic_Drampa), SPECIES_SPRITE(DHELMISE, gMonFrontPic_Dhelmise), SPECIES_SPRITE(JANGMO_O, gMonFrontPic_Jangmoo), - SPECIES_SPRITE(HAKAMO_O, gMonFrontPic_Hakamoo), - SPECIES_SPRITE(KOMMO_O, gMonFrontPic_Kommoo), + SPECIES_SPRITE(HAKAMO_O, gMonFrontPic_HakamoO), + SPECIES_SPRITE(KOMMO_O, gMonFrontPic_KommoO), SPECIES_SPRITE(TAPU_KOKO, gMonFrontPic_TapuKoko), SPECIES_SPRITE(TAPU_LELE, gMonFrontPic_TapuLele), SPECIES_SPRITE(TAPU_BULU, gMonFrontPic_TapuBulu), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index a8c986d79..49551333c 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -790,8 +790,8 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(DRAMPA, gMonPalette_Drampa), SPECIES_PAL(DHELMISE, gMonPalette_Dhelmise), SPECIES_PAL(JANGMO_O, gMonPalette_Jangmoo), - SPECIES_PAL(HAKAMO_O, gMonPalette_Hakamoo), - SPECIES_PAL(KOMMO_O, gMonPalette_Kommoo), + SPECIES_PAL(HAKAMO_O, gMonPalette_HakamoO), + SPECIES_PAL(KOMMO_O, gMonPalette_KommoO), SPECIES_PAL(TAPU_KOKO, gMonPalette_TapuKoko), SPECIES_PAL(TAPU_LELE, gMonPalette_TapuLele), SPECIES_PAL(TAPU_BULU, gMonPalette_TapuBulu), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 012a95cf1..0a327b37e 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -790,8 +790,8 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(DRAMPA, gMonShinyPalette_Drampa), SPECIES_SHINY_PAL(DHELMISE, gMonShinyPalette_Dhelmise), SPECIES_SHINY_PAL(JANGMO_O, gMonShinyPalette_Jangmoo), - SPECIES_SHINY_PAL(HAKAMO_O, gMonShinyPalette_Hakamoo), - SPECIES_SHINY_PAL(KOMMO_O, gMonShinyPalette_Kommoo), + SPECIES_SHINY_PAL(HAKAMO_O, gMonShinyPalette_HakamoO), + SPECIES_SHINY_PAL(KOMMO_O, gMonShinyPalette_KommoO), SPECIES_SHINY_PAL(TAPU_KOKO, gMonShinyPalette_TapuKoko), SPECIES_SHINY_PAL(TAPU_LELE, gMonShinyPalette_TapuLele), SPECIES_SHINY_PAL(TAPU_BULU, gMonShinyPalette_TapuBulu), diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 0758ea37d..85a69fa93 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -816,8 +816,8 @@ const u8 *const gMonIconTable[] = [SPECIES_DRAMPA] = gMonIcon_Drampa, [SPECIES_DHELMISE] = gMonIcon_Dhelmise, [SPECIES_JANGMO_O] = gMonIcon_Jangmoo, - [SPECIES_HAKAMO_O] = gMonIcon_Hakamoo, - [SPECIES_KOMMO_O] = gMonIcon_Kommoo, + [SPECIES_HAKAMO_O] = gMonIcon_HakamoO, + [SPECIES_KOMMO_O] = gMonIcon_KommoO, [SPECIES_TAPU_KOKO] = gMonIcon_TapuKoko, [SPECIES_TAPU_LELE] = gMonIcon_TapuLele, [SPECIES_TAPU_BULU] = gMonIcon_TapuBulu, From 1e1686b69a7dfbac4480bdd62867d6c0ccc81548 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 24 Feb 2023 23:38:23 +0100 Subject: [PATCH 23/32] Fixes #2414 --- src/battle_ai_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_ai_main.c b/src/battle_ai_main.c index a626ef49a..2d4d07528 100644 --- a/src/battle_ai_main.c +++ b/src/battle_ai_main.c @@ -2632,7 +2632,7 @@ static s16 AI_TryToFaint(u8 battlerAtk, u8 battlerDef, u16 move, s16 score) if (CanIndexMoveFaintTarget(battlerAtk, battlerDef, AI_THINKING_STRUCT->movesetIndex, 0) && gBattleMoves[move].effect != EFFECT_EXPLOSION) { // this move can faint the target - if (!WillAIStrikeFirst() || GetMovePriority(battlerAtk, move) > 0) + if (WillAIStrikeFirst() || GetMovePriority(battlerAtk, move) > 0) score += 4; // we go first or we're using priority move else score += 2; From ca81d7a0f921e52419f2309b6b452b53a62e31bd Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 24 Feb 2023 21:58:09 -0300 Subject: [PATCH 24/32] Forgot about Jangmo-o --- include/graphics.h | 10 +++++----- sound/cry_tables.inc | 4 ++-- sound/direct_sound_data.inc | 2 +- src/data/graphics/pokemon.h | 10 +++++----- src/data/pokemon/level_up_learnset_pointers.h | 2 +- src/data/pokemon/level_up_learnsets.h | 2 +- src/data/pokemon/pokedex_entries.h | 2 +- src/data/pokemon/pokedex_text.h | 2 +- src/data/pokemon/teachable_learnset_pointers.h | 2 +- src/data/pokemon/teachable_learnsets.h | 2 +- src/data/pokemon_graphics/back_pic_table.h | 2 +- src/data/pokemon_graphics/front_pic_table.h | 2 +- src/data/pokemon_graphics/palette_table.h | 2 +- src/data/pokemon_graphics/shiny_palette_table.h | 2 +- src/pokemon_icon.c | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/include/graphics.h b/include/graphics.h index 49ce74b2e..443dc4ade 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -867,7 +867,7 @@ extern const u32 gMonFrontPic_Mimikyu[]; extern const u32 gMonFrontPic_Bruxish[]; extern const u32 gMonFrontPic_Drampa[]; extern const u32 gMonFrontPic_Dhelmise[]; -extern const u32 gMonFrontPic_Jangmoo[]; +extern const u32 gMonFrontPic_JangmoO[]; extern const u32 gMonFrontPic_HakamoO[]; extern const u32 gMonFrontPic_KommoO[]; extern const u32 gMonFrontPic_TapuKoko[]; @@ -2081,7 +2081,7 @@ extern const u32 gMonBackPic_Mimikyu[]; extern const u32 gMonBackPic_Bruxish[]; extern const u32 gMonBackPic_Drampa[]; extern const u32 gMonBackPic_Dhelmise[]; -extern const u32 gMonBackPic_Jangmoo[]; +extern const u32 gMonBackPic_JangmoO[]; extern const u32 gMonBackPic_HakamoO[]; extern const u32 gMonBackPic_KommoO[]; extern const u32 gMonBackPic_TapuKoko[]; @@ -3287,7 +3287,7 @@ extern const u32 gMonPalette_Mimikyu[]; extern const u32 gMonPalette_Bruxish[]; extern const u32 gMonPalette_Drampa[]; extern const u32 gMonPalette_Dhelmise[]; -extern const u32 gMonPalette_Jangmoo[]; +extern const u32 gMonPalette_JangmoO[]; extern const u32 gMonPalette_HakamoO[]; extern const u32 gMonPalette_KommoO[]; extern const u32 gMonPalette_TapuKoko[]; @@ -4520,7 +4520,7 @@ extern const u32 gMonShinyPalette_Mimikyu[]; extern const u32 gMonShinyPalette_Bruxish[]; extern const u32 gMonShinyPalette_Drampa[]; extern const u32 gMonShinyPalette_Dhelmise[]; -extern const u32 gMonShinyPalette_Jangmoo[]; +extern const u32 gMonShinyPalette_JangmoO[]; extern const u32 gMonShinyPalette_HakamoO[]; extern const u32 gMonShinyPalette_KommoO[]; extern const u32 gMonShinyPalette_TapuKoko[]; @@ -5747,7 +5747,7 @@ extern const u8 gMonIcon_Mimikyu[]; extern const u8 gMonIcon_Bruxish[]; extern const u8 gMonIcon_Drampa[]; extern const u8 gMonIcon_Dhelmise[]; -extern const u8 gMonIcon_Jangmoo[]; +extern const u8 gMonIcon_JangmoO[]; extern const u8 gMonIcon_HakamoO[]; extern const u8 gMonIcon_KommoO[]; extern const u8 gMonIcon_TapuKoko[]; diff --git a/sound/cry_tables.inc b/sound/cry_tables.inc index 7b5947506..c9da7e679 100644 --- a/sound/cry_tables.inc +++ b/sound/cry_tables.inc @@ -1126,7 +1126,7 @@ gCryTable:: cry Cry_Bruxish cry Cry_Drampa cry Cry_Dhelmise - cry Cry_Jangmoo + cry Cry_JangmoO cry Cry_HakamoO cry Cry_KommoO cry Cry_TapuKoko @@ -3248,7 +3248,7 @@ gCryTable_Reverse:: cry_reverse Cry_Bruxish cry_reverse Cry_Drampa cry_reverse Cry_Dhelmise - cry_reverse Cry_Jangmoo + cry_reverse Cry_JangmoO cry_reverse Cry_HakamoO cry_reverse Cry_KommoO cry_reverse Cry_TapuKoko diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc index 74f5529d7..611808d23 100644 --- a/sound/direct_sound_data.inc +++ b/sound/direct_sound_data.inc @@ -3518,7 +3518,7 @@ Cry_Dhelmise:: .incbin "sound/direct_sound_samples/cries/dhelmise.bin" .align 2 -Cry_Jangmoo:: +Cry_JangmoO:: .incbin "sound/direct_sound_samples/cries/jangmo_o.bin" .align 2 diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index a39f6f35e..314d081ea 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -800,7 +800,7 @@ const u32 gMonFrontPic_Mimikyu[] = INCBIN_U32("graphics/pokemon/mimikyu/front.4b const u32 gMonFrontPic_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/front.4bpp.lz"); const u32 gMonFrontPic_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/front.4bpp.lz"); const u32 gMonFrontPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/front.4bpp.lz"); -const u32 gMonFrontPic_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/front.4bpp.lz"); +const u32 gMonFrontPic_JangmoO[] = INCBIN_U32("graphics/pokemon/jangmo_o/front.4bpp.lz"); const u32 gMonFrontPic_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/front.4bpp.lz"); const u32 gMonFrontPic_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/front.4bpp.lz"); const u32 gMonFrontPic_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/anim_front.4bpp.lz"); @@ -2012,7 +2012,7 @@ const u32 gMonBackPic_Mimikyu[] = INCBIN_U32("graphics/pokemon/mimikyu/back.4bpp const u32 gMonBackPic_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/back.4bpp.lz"); const u32 gMonBackPic_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/back.4bpp.lz"); const u32 gMonBackPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/back.4bpp.lz"); -const u32 gMonBackPic_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/back.4bpp.lz"); +const u32 gMonBackPic_JangmoO[] = INCBIN_U32("graphics/pokemon/jangmo_o/back.4bpp.lz"); const u32 gMonBackPic_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/back.4bpp.lz"); const u32 gMonBackPic_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/back.4bpp.lz"); const u32 gMonBackPic_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/back.4bpp.lz"); @@ -3218,7 +3218,7 @@ const u32 gMonPalette_Mimikyu[] = INCBIN_U32("graphics/pokemon/mimikyu/normal.gb const u32 gMonPalette_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/normal.gbapal.lz"); const u32 gMonPalette_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/normal.gbapal.lz"); const u32 gMonPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/normal.gbapal.lz"); -const u32 gMonPalette_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/normal.gbapal.lz"); +const u32 gMonPalette_JangmoO[] = INCBIN_U32("graphics/pokemon/jangmo_o/normal.gbapal.lz"); const u32 gMonPalette_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/normal.gbapal.lz"); const u32 gMonPalette_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/normal.gbapal.lz"); const u32 gMonPalette_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/normal.gbapal.lz"); @@ -4451,7 +4451,7 @@ const u32 gMonShinyPalette_Mimikyu[] = INCBIN_U32("graphics/pokemon/mimikyu/shin const u32 gMonShinyPalette_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/shiny.gbapal.lz"); const u32 gMonShinyPalette_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/shiny.gbapal.lz"); const u32 gMonShinyPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/shiny.gbapal.lz"); +const u32 gMonShinyPalette_JangmoO[] = INCBIN_U32("graphics/pokemon/jangmo_o/shiny.gbapal.lz"); const u32 gMonShinyPalette_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/shiny.gbapal.lz"); const u32 gMonShinyPalette_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/shiny.gbapal.lz"); const u32 gMonShinyPalette_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/shiny.gbapal.lz"); @@ -5678,7 +5678,7 @@ const u8 gMonIcon_Mimikyu[] = INCBIN_U8("graphics/pokemon/mimikyu/icon.4bpp"); const u8 gMonIcon_Bruxish[] = INCBIN_U8("graphics/pokemon/bruxish/icon.4bpp"); const u8 gMonIcon_Drampa[] = INCBIN_U8("graphics/pokemon/drampa/icon.4bpp"); const u8 gMonIcon_Dhelmise[] = INCBIN_U8("graphics/pokemon/dhelmise/icon.4bpp"); -const u8 gMonIcon_Jangmoo[] = INCBIN_U8("graphics/pokemon/jangmo_o/icon.4bpp"); +const u8 gMonIcon_JangmoO[] = INCBIN_U8("graphics/pokemon/jangmo_o/icon.4bpp"); const u8 gMonIcon_HakamoO[] = INCBIN_U8("graphics/pokemon/hakamo_o/icon.4bpp"); const u8 gMonIcon_KommoO[] = INCBIN_U8("graphics/pokemon/kommo_o/icon.4bpp"); const u8 gMonIcon_TapuKoko[] = INCBIN_U8("graphics/pokemon/tapu_koko/icon.4bpp"); diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index d27399d32..9fa91ee23 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -789,7 +789,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_BRUXISH] = sBruxishLevelUpLearnset, [SPECIES_DRAMPA] = sDrampaLevelUpLearnset, [SPECIES_DHELMISE] = sDhelmiseLevelUpLearnset, - [SPECIES_JANGMO_O] = sJangmooLevelUpLearnset, + [SPECIES_JANGMO_O] = sJangmoOLevelUpLearnset, [SPECIES_HAKAMO_O] = sHakamoOLevelUpLearnset, [SPECIES_KOMMO_O] = sKommoOLevelUpLearnset, [SPECIES_TAPU_KOKO] = sTapuKokoLevelUpLearnset, diff --git a/src/data/pokemon/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h index bb6d97be9..17af6b888 100644 --- a/src/data/pokemon/level_up_learnsets.h +++ b/src/data/pokemon/level_up_learnsets.h @@ -15960,7 +15960,7 @@ static const struct LevelUpMove sDhelmiseLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sJangmooLevelUpLearnset[] = { +static const struct LevelUpMove sJangmoOLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_LEER), LEVEL_UP_MOVE( 9, MOVE_BIDE), diff --git a/src/data/pokemon/pokedex_entries.h b/src/data/pokemon/pokedex_entries.h index 7952f44a3..83b58c1d1 100644 --- a/src/data/pokemon/pokedex_entries.h +++ b/src/data/pokemon/pokedex_entries.h @@ -9396,7 +9396,7 @@ const struct PokedexEntry gPokedexEntries[] = .categoryName = _("Scaly"), .height = 6, .weight = 297, - .description = gJangmooPokedexText, + .description = gJangmoOPokedexText, .pokemonScale = 356, .pokemonOffset = 17, .trainerScale = 256, diff --git a/src/data/pokemon/pokedex_text.h b/src/data/pokemon/pokedex_text.h index a28bd184e..5e28a204b 100644 --- a/src/data/pokemon/pokedex_text.h +++ b/src/data/pokemon/pokedex_text.h @@ -4697,7 +4697,7 @@ const u8 gDhelmisePokedexText[] = _( "It maintains itself with new infusions of\n" "seabed detritus and seaweed."); -const u8 gJangmooPokedexText[] = _( +const u8 gJangmoOPokedexText[] = _( "It expresses its feelings by smacking its\n" "scales. Metallic sounds echo through the\n" "tall mountains where Jangmo-o live. They\n" diff --git a/src/data/pokemon/teachable_learnset_pointers.h b/src/data/pokemon/teachable_learnset_pointers.h index c8adc8668..31a39d516 100644 --- a/src/data/pokemon/teachable_learnset_pointers.h +++ b/src/data/pokemon/teachable_learnset_pointers.h @@ -789,7 +789,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_BRUXISH] = sBruxishTeachableLearnset, [SPECIES_DRAMPA] = sDrampaTeachableLearnset, [SPECIES_DHELMISE] = sDhelmiseTeachableLearnset, - [SPECIES_JANGMO_O] = sJangmooTeachableLearnset, + [SPECIES_JANGMO_O] = sJangmoOTeachableLearnset, [SPECIES_HAKAMO_O] = sHakamoOTeachableLearnset, [SPECIES_KOMMO_O] = sKommoOTeachableLearnset, [SPECIES_TAPU_KOKO] = sTapuKokoTeachableLearnset, diff --git a/src/data/pokemon/teachable_learnsets.h b/src/data/pokemon/teachable_learnsets.h index 2130b18a2..6365af3b9 100644 --- a/src/data/pokemon/teachable_learnsets.h +++ b/src/data/pokemon/teachable_learnsets.h @@ -29414,7 +29414,7 @@ static const u16 sDhelmiseTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sJangmooTeachableLearnset[] = { +static const u16 sJangmoOTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_ATTRACT, MOVE_BRICK_BREAK, diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index c018d8987..29eaeceed 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -789,7 +789,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(BRUXISH, gMonBackPic_Bruxish), SPECIES_SPRITE(DRAMPA, gMonBackPic_Drampa), SPECIES_SPRITE(DHELMISE, gMonBackPic_Dhelmise), - SPECIES_SPRITE(JANGMO_O, gMonBackPic_Jangmoo), + SPECIES_SPRITE(JANGMO_O, gMonBackPic_JangmoO), SPECIES_SPRITE(HAKAMO_O, gMonBackPic_HakamoO), SPECIES_SPRITE(KOMMO_O, gMonBackPic_KommoO), SPECIES_SPRITE(TAPU_KOKO, gMonBackPic_TapuKoko), diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index e346dd4a2..4530963af 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -789,7 +789,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(BRUXISH, gMonFrontPic_Bruxish), SPECIES_SPRITE(DRAMPA, gMonFrontPic_Drampa), SPECIES_SPRITE(DHELMISE, gMonFrontPic_Dhelmise), - SPECIES_SPRITE(JANGMO_O, gMonFrontPic_Jangmoo), + SPECIES_SPRITE(JANGMO_O, gMonFrontPic_JangmoO), SPECIES_SPRITE(HAKAMO_O, gMonFrontPic_HakamoO), SPECIES_SPRITE(KOMMO_O, gMonFrontPic_KommoO), SPECIES_SPRITE(TAPU_KOKO, gMonFrontPic_TapuKoko), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 49551333c..7311dfd0b 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -789,7 +789,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(BRUXISH, gMonPalette_Bruxish), SPECIES_PAL(DRAMPA, gMonPalette_Drampa), SPECIES_PAL(DHELMISE, gMonPalette_Dhelmise), - SPECIES_PAL(JANGMO_O, gMonPalette_Jangmoo), + SPECIES_PAL(JANGMO_O, gMonPalette_JangmoO), SPECIES_PAL(HAKAMO_O, gMonPalette_HakamoO), SPECIES_PAL(KOMMO_O, gMonPalette_KommoO), SPECIES_PAL(TAPU_KOKO, gMonPalette_TapuKoko), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 0a327b37e..81bc45d4d 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -789,7 +789,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(BRUXISH, gMonShinyPalette_Bruxish), SPECIES_SHINY_PAL(DRAMPA, gMonShinyPalette_Drampa), SPECIES_SHINY_PAL(DHELMISE, gMonShinyPalette_Dhelmise), - SPECIES_SHINY_PAL(JANGMO_O, gMonShinyPalette_Jangmoo), + SPECIES_SHINY_PAL(JANGMO_O, gMonShinyPalette_JangmoO), SPECIES_SHINY_PAL(HAKAMO_O, gMonShinyPalette_HakamoO), SPECIES_SHINY_PAL(KOMMO_O, gMonShinyPalette_KommoO), SPECIES_SHINY_PAL(TAPU_KOKO, gMonShinyPalette_TapuKoko), diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 85a69fa93..5e2e8a656 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -815,7 +815,7 @@ const u8 *const gMonIconTable[] = [SPECIES_BRUXISH] = gMonIcon_Bruxish, [SPECIES_DRAMPA] = gMonIcon_Drampa, [SPECIES_DHELMISE] = gMonIcon_Dhelmise, - [SPECIES_JANGMO_O] = gMonIcon_Jangmoo, + [SPECIES_JANGMO_O] = gMonIcon_JangmoO, [SPECIES_HAKAMO_O] = gMonIcon_HakamoO, [SPECIES_KOMMO_O] = gMonIcon_KommoO, [SPECIES_TAPU_KOKO] = gMonIcon_TapuKoko, From fc5c93fd83efaf64129a32f52646d7922177e0a8 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 25 Feb 2023 12:15:40 +0100 Subject: [PATCH 25/32] exclude status move type check --- src/battle_ai_util.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index 4641ba2cd..8cb3d4660 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -802,7 +802,16 @@ s32 AI_CalcDamage(u16 move, u8 battlerAtk, u8 battlerDef, u8 *typeEffectiveness, } else { - effectivenessMultiplier = CalcTypeEffectivenessMultiplier(move, moveType, battlerAtk, battlerDef, FALSE); + #if B_GLARE_GHOST == GEN_3 + else if (move == MOVE_GLARE || move == MOVE_THUNDER_WAVE) + effectivenessMultiplier = CalcTypeEffectivenessMultiplier(move, moveType, battlerAtk, battlerDef, FALSE); + else +# endif + if (move == MOVE_THUNDER_WAVE) + effectivenessMultiplier = CalcTypeEffectivenessMultiplier(move, moveType, battlerAtk, battlerDef, FALSE); + else + effectivenessMultiplier = UQ_4_12(1.0); + dmg = 0; } From df47312e329b9f9576036b4c7604f40e1c70d33a Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 25 Feb 2023 12:38:57 +0100 Subject: [PATCH 26/32] Fix move to battle_util.c --- src/battle_ai_util.c | 11 +---------- src/battle_util.c | 18 +++++++++++------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index 8cb3d4660..4641ba2cd 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -802,16 +802,7 @@ s32 AI_CalcDamage(u16 move, u8 battlerAtk, u8 battlerDef, u8 *typeEffectiveness, } else { - #if B_GLARE_GHOST == GEN_3 - else if (move == MOVE_GLARE || move == MOVE_THUNDER_WAVE) - effectivenessMultiplier = CalcTypeEffectivenessMultiplier(move, moveType, battlerAtk, battlerDef, FALSE); - else -# endif - if (move == MOVE_THUNDER_WAVE) - effectivenessMultiplier = CalcTypeEffectivenessMultiplier(move, moveType, battlerAtk, battlerDef, FALSE); - else - effectivenessMultiplier = UQ_4_12(1.0); - + effectivenessMultiplier = CalcTypeEffectivenessMultiplier(move, moveType, battlerAtk, battlerDef, FALSE); dmg = 0; } diff --git a/src/battle_util.c b/src/battle_util.c index ccc7445b5..0a00372c0 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -9851,7 +9851,17 @@ static u16 CalcTypeEffectivenessMultiplierInternal(u16 move, u8 moveType, u8 bat && gBattleMons[battlerDef].type3 != gBattleMons[battlerDef].type1) MulByTypeEffectiveness(&modifier, move, moveType, battlerDef, gBattleMons[battlerDef].type3, battlerAtk, recordAbilities); - if (moveType == TYPE_GROUND && !IsBattlerGrounded2(battlerDef, TRUE) && !(gBattleMoves[move].flags & FLAG_DMG_UNGROUNDED_IGNORE_TYPE_IF_FLYING)) + if (gBattleMoves[move].split == SPLIT_STATUS && move != MOVE_THUNDER_WAVE) + { + modifier = UQ_4_12(1.0); + #if B_GLARE_GHOST <= GEN_3 + if (move == MOVE_GLARE && IS_BATTLER_OF_TYPE(battlerDef, TYPE_GHOST)) + { + modifier = UQ_4_12(0.0); + } + #endif + } + else if (moveType == TYPE_GROUND && !IsBattlerGrounded2(battlerDef, TRUE) && !(gBattleMoves[move].flags & FLAG_DMG_UNGROUNDED_IGNORE_TYPE_IF_FLYING)) { modifier = UQ_4_12(0.0); if (recordAbilities && defAbility == ABILITY_LEVITATE) @@ -9869,12 +9879,6 @@ static u16 CalcTypeEffectivenessMultiplierInternal(u16 move, u8 moveType, u8 bat modifier = UQ_4_12(0.0); } #endif -#if B_GLARE_GHOST >= GEN_4 - else if (move == MOVE_GLARE && IS_BATTLER_OF_TYPE(battlerDef, TYPE_GHOST)) - { - modifier = UQ_4_12(1.0); - } -#endif // Thousand Arrows ignores type modifiers for flying mons if (!IsBattlerGrounded(battlerDef) && (gBattleMoves[move].flags & FLAG_DMG_UNGROUNDED_IGNORE_TYPE_IF_FLYING) From 31ab56bceb00c12a54f02c520b057911de7c94ae Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sat, 25 Feb 2023 09:23:34 -0300 Subject: [PATCH 27/32] Fixed footprint symbol names. --- include/graphics.h | 6 +++--- src/data/graphics/pokemon.h | 6 +++--- src/data/pokemon_graphics/footprint_table.h | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/graphics.h b/include/graphics.h index 443dc4ade..f00c72788 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -6960,9 +6960,9 @@ extern const u8 gMonFootprint_Mimikyu[]; extern const u8 gMonFootprint_Bruxish[]; extern const u8 gMonFootprint_Drampa[]; extern const u8 gMonFootprint_Dhelmise[]; -extern const u8 gMonFootprint_Jangmo_o[]; -extern const u8 gMonFootprint_Hakamo_o[]; -extern const u8 gMonFootprint_Kommo_o[]; +extern const u8 gMonFootprint_JangmoO[]; +extern const u8 gMonFootprint_HakamoO[]; +extern const u8 gMonFootprint_KommoO[]; extern const u8 gMonFootprint_Tapu_Koko[]; extern const u8 gMonFootprint_Tapu_Lele[]; extern const u8 gMonFootprint_Tapu_Bulu[]; diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 314d081ea..1d6704416 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -6891,9 +6891,9 @@ const u8 gMonFootprint_Mimikyu[] = INCBIN_U8("graphics/pokemon/mimikyu/footprint const u8 gMonFootprint_Bruxish[] = INCBIN_U8("graphics/pokemon/bruxish/footprint.1bpp"); const u8 gMonFootprint_Drampa[] = INCBIN_U8("graphics/pokemon/drampa/footprint.1bpp"); const u8 gMonFootprint_Dhelmise[] = INCBIN_U8("graphics/pokemon/dhelmise/footprint.1bpp"); -const u8 gMonFootprint_Jangmo_o[] = INCBIN_U8("graphics/pokemon/jangmo_o/footprint.1bpp"); -const u8 gMonFootprint_Hakamo_o[] = INCBIN_U8("graphics/pokemon/hakamo_o/footprint.1bpp"); -const u8 gMonFootprint_Kommo_o[] = INCBIN_U8("graphics/pokemon/kommo_o/footprint.1bpp"); +const u8 gMonFootprint_JangmoO[] = INCBIN_U8("graphics/pokemon/jangmo_o/footprint.1bpp"); +const u8 gMonFootprint_HakamoO[] = INCBIN_U8("graphics/pokemon/hakamo_o/footprint.1bpp"); +const u8 gMonFootprint_KommoO[] = INCBIN_U8("graphics/pokemon/kommo_o/footprint.1bpp"); const u8 gMonFootprint_Tapu_Koko[] = INCBIN_U8("graphics/pokemon/tapu_koko/footprint.1bpp"); const u8 gMonFootprint_Tapu_Lele[] = INCBIN_U8("graphics/pokemon/tapu_lele/footprint.1bpp"); const u8 gMonFootprint_Tapu_Bulu[] = INCBIN_U8("graphics/pokemon/tapu_bulu/footprint.1bpp"); diff --git a/src/data/pokemon_graphics/footprint_table.h b/src/data/pokemon_graphics/footprint_table.h index 2b0dd0a4f..8e21b0604 100644 --- a/src/data/pokemon_graphics/footprint_table.h +++ b/src/data/pokemon_graphics/footprint_table.h @@ -789,9 +789,9 @@ const u8 *const gMonFootprintTable[] = [SPECIES_BRUXISH] = gMonFootprint_Bruxish, [SPECIES_DRAMPA] = gMonFootprint_Drampa, [SPECIES_DHELMISE] = gMonFootprint_Dhelmise, - [SPECIES_JANGMO_O] = gMonFootprint_Jangmo_o, - [SPECIES_HAKAMO_O] = gMonFootprint_Hakamo_o, - [SPECIES_KOMMO_O] = gMonFootprint_Kommo_o, + [SPECIES_JANGMO_O] = gMonFootprint_JangmoO, + [SPECIES_HAKAMO_O] = gMonFootprint_HakamoO, + [SPECIES_KOMMO_O] = gMonFootprint_KommoO, [SPECIES_TAPU_KOKO] = gMonFootprint_Tapu_Koko, [SPECIES_TAPU_LELE] = gMonFootprint_Tapu_Lele, [SPECIES_TAPU_BULU] = gMonFootprint_Tapu_Bulu, From 7ea82820ec66bfb91a4171a51c1a94fc8721964e Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 25 Feb 2023 15:07:45 +0100 Subject: [PATCH 28/32] Consider nature power in AI_CalcDamage --- src/battle_ai_util.c | 4 ++++ src/data/battle_moves.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index 4641ba2cd..a48c051ac 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -744,6 +744,10 @@ s32 AI_CalcDamage(u16 move, u8 battlerAtk, u8 battlerDef, u8 *typeEffectiveness, SetBattlerData(battlerDef); gBattleStruct->dynamicMoveType = 0; + + if (move == MOVE_NATURE_POWER) + move = GetNaturePowerMove(); + SetTypeBeforeUsingMove(move, battlerAtk); GET_MOVE_TYPE(move, moveType); diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 82883fb8c..50e10d414 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -4847,7 +4847,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = [MOVE_NATURE_POWER] = { .effect = EFFECT_NATURE_POWER, - .power = 0, + .power = 1, .type = TYPE_NORMAL, .accuracy = 0, .pp = 20, From f249b58c01862fdf55a95dbb866a14d3c9b28388 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 25 Feb 2023 15:24:31 +0100 Subject: [PATCH 29/32] fix style --- src/battle_ai_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index a48c051ac..22e88aac4 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -746,7 +746,7 @@ s32 AI_CalcDamage(u16 move, u8 battlerAtk, u8 battlerDef, u8 *typeEffectiveness, gBattleStruct->dynamicMoveType = 0; if (move == MOVE_NATURE_POWER) - move = GetNaturePowerMove(); + move = GetNaturePowerMove(); SetTypeBeforeUsingMove(move, battlerAtk); GET_MOVE_TYPE(move, moveType); From 8143f57eb9d487e3e2285ce6ec839739451b4722 Mon Sep 17 00:00:00 2001 From: Jaizu Date: Sun, 26 Feb 2023 14:06:32 +0100 Subject: [PATCH 30/32] Fix sprite palettes up to Ampharos included --- graphics/pokemon/ampharos/anim_front.png | Bin 1115 -> 1128 bytes graphics/pokemon/ampharos/front.png | Bin 699 -> 684 bytes graphics/pokemon/ampharos/normal.pal | 28 +++++++++---------- graphics/pokemon/ariados/anim_front.png | Bin 1369 -> 1308 bytes graphics/pokemon/ariados/front.png | Bin 806 -> 794 bytes graphics/pokemon/ariados/normal.pal | 28 +++++++++---------- graphics/pokemon/bayleef/anim_front.png | Bin 1123 -> 1112 bytes graphics/pokemon/bayleef/front.png | Bin 700 -> 710 bytes graphics/pokemon/bayleef/normal.pal | 28 +++++++++---------- graphics/pokemon/chikorita/anim_front.png | Bin 880 -> 871 bytes graphics/pokemon/chikorita/front.png | Bin 517 -> 503 bytes graphics/pokemon/chikorita/normal.pal | 28 +++++++++---------- graphics/pokemon/chinchou/anim_front.png | Bin 1117 -> 1120 bytes graphics/pokemon/chinchou/front.png | Bin 656 -> 644 bytes graphics/pokemon/chinchou/normal.pal | 26 +++++++++--------- graphics/pokemon/cleffa/anim_front.png | Bin 600 -> 592 bytes graphics/pokemon/cleffa/front.png | Bin 415 -> 398 bytes graphics/pokemon/cleffa/normal.pal | 20 +++++++------- graphics/pokemon/crobat/anim_front.png | Bin 1121 -> 1125 bytes graphics/pokemon/crobat/front.png | Bin 690 -> 677 bytes graphics/pokemon/crobat/normal.pal | 26 +++++++++--------- graphics/pokemon/croconaw/anim_front.png | Bin 1152 -> 1054 bytes graphics/pokemon/croconaw/front.png | Bin 681 -> 668 bytes graphics/pokemon/croconaw/normal.pal | 28 +++++++++---------- graphics/pokemon/cyndaquil/anim_front.png | Bin 936 -> 887 bytes graphics/pokemon/cyndaquil/front.png | Bin 572 -> 540 bytes graphics/pokemon/cyndaquil/normal.pal | 26 +++++++++--------- graphics/pokemon/feraligatr/anim_front.png | Bin 1680 -> 1688 bytes graphics/pokemon/feraligatr/front.png | Bin 975 -> 982 bytes graphics/pokemon/feraligatr/normal.pal | 26 +++++++++--------- graphics/pokemon/flaaffy/anim_front.png | Bin 1125 -> 1127 bytes graphics/pokemon/flaaffy/front.png | Bin 669 -> 655 bytes graphics/pokemon/flaaffy/normal.pal | 28 +++++++++---------- graphics/pokemon/furret/anim_front.png | Bin 1058 -> 1124 bytes graphics/pokemon/furret/front.png | Bin 634 -> 658 bytes graphics/pokemon/furret/normal.pal | 26 +++++++++--------- graphics/pokemon/hoothoot/anim_front.png | Bin 825 -> 830 bytes graphics/pokemon/hoothoot/front.png | Bin 557 -> 548 bytes graphics/pokemon/hoothoot/normal.pal | 28 +++++++++---------- graphics/pokemon/igglybuff/anim_front.png | Bin 553 -> 579 bytes graphics/pokemon/igglybuff/front.png | Bin 392 -> 407 bytes graphics/pokemon/igglybuff/normal.pal | 20 +++++++------- graphics/pokemon/lanturn/anim_front.png | Bin 1145 -> 1097 bytes graphics/pokemon/lanturn/front.png | Bin 740 -> 680 bytes graphics/pokemon/lanturn/normal.pal | 30 ++++++++++----------- graphics/pokemon/ledian/anim_front.png | Bin 1291 -> 1326 bytes graphics/pokemon/ledian/front.png | Bin 736 -> 738 bytes graphics/pokemon/ledian/normal.pal | 24 ++++++++--------- graphics/pokemon/ledyba/anim_front.png | Bin 1222 -> 1218 bytes graphics/pokemon/ledyba/front.png | Bin 683 -> 674 bytes graphics/pokemon/ledyba/normal.pal | 28 +++++++++---------- graphics/pokemon/mareep/anim_front.png | Bin 975 -> 931 bytes graphics/pokemon/mareep/back.png | Bin 577 -> 520 bytes graphics/pokemon/mareep/front.png | Bin 619 -> 593 bytes graphics/pokemon/mareep/normal.pal | 28 +++++++++---------- graphics/pokemon/mareep/shiny.pal | 14 +++++----- graphics/pokemon/meganium/anim_front.png | Bin 1511 -> 1424 bytes graphics/pokemon/meganium/front.png | Bin 887 -> 852 bytes graphics/pokemon/meganium/normal.pal | 28 +++++++++---------- graphics/pokemon/natu/anim_front.png | Bin 610 -> 570 bytes graphics/pokemon/natu/front.png | Bin 412 -> 381 bytes graphics/pokemon/natu/normal.pal | 30 ++++++++++----------- graphics/pokemon/noctowl/anim_front.png | Bin 1159 -> 1143 bytes graphics/pokemon/noctowl/front.png | Bin 727 -> 702 bytes graphics/pokemon/noctowl/normal.pal | 28 +++++++++---------- graphics/pokemon/quilava/anim_front.png | Bin 1033 -> 984 bytes graphics/pokemon/quilava/back.png | Bin 775 -> 715 bytes graphics/pokemon/quilava/front.png | Bin 649 -> 599 bytes graphics/pokemon/quilava/normal.pal | 22 +++++++-------- graphics/pokemon/sentret/anim_front.png | Bin 948 -> 929 bytes graphics/pokemon/sentret/front.png | Bin 634 -> 597 bytes graphics/pokemon/sentret/normal.pal | 24 ++++++++--------- graphics/pokemon/spinarak/anim_front.png | Bin 727 -> 704 bytes graphics/pokemon/spinarak/front.png | Bin 536 -> 508 bytes graphics/pokemon/spinarak/normal.pal | 16 +++++------ graphics/pokemon/spinarak/shiny.pal | 2 +- graphics/pokemon/togepi/anim_front.png | Bin 672 -> 683 bytes graphics/pokemon/togepi/front.png | Bin 421 -> 421 bytes graphics/pokemon/togepi/normal.pal | 28 +++++++++---------- graphics/pokemon/togetic/anim_front.png | Bin 771 -> 720 bytes graphics/pokemon/togetic/front.png | Bin 464 -> 478 bytes graphics/pokemon/togetic/normal.pal | 20 +++++++------- graphics/pokemon/totodile/anim_front.png | Bin 790 -> 795 bytes graphics/pokemon/totodile/front.png | Bin 556 -> 538 bytes graphics/pokemon/totodile/normal.pal | 26 +++++++++--------- graphics/pokemon/totodile/shiny.pal | 2 +- graphics/pokemon/typhlosion/anim_front.png | Bin 1408 -> 1365 bytes graphics/pokemon/typhlosion/back.png | Bin 858 -> 817 bytes graphics/pokemon/typhlosion/normal.pal | 28 +++++++++---------- graphics/pokemon/xatu/anim_front.png | Bin 1059 -> 1042 bytes graphics/pokemon/xatu/front.png | Bin 610 -> 589 bytes graphics/pokemon/xatu/normal.pal | 28 +++++++++---------- 92 files changed, 386 insertions(+), 386 deletions(-) diff --git a/graphics/pokemon/ampharos/anim_front.png b/graphics/pokemon/ampharos/anim_front.png index 1b3930f64a134c42f1a17bb59405adff5039642d..4e71838b007865af7fa9ed4b3bf1d842546dc141 100644 GIT binary patch delta 1119 zcmV-l1fcud2lo1dVFz4bV%gt_L{%jCoS`WX0BM=Lb!rz%w z>Asvs`Tg-Mh<^-6aX~!0Ss3yNfHNm4S^g#%&*T)qALBs?A%X`0QhpaFQYq^7Y%Zn% zW2Xt6i`Fflk2DTJf0~R3*f)l=QHQt+P?PhuzyY|WWH)M%*S6V`fGD?01ia;Fh2vG| z*VX2Ps5Th&M+oPy;sNWnR^+~}9RT`%(;~4-Kyo7{dVgzSA*iRN+k@>@(Yvyk1DXq7 zhdy4Y+RHP5Y6F%eEC?S@Zbg#-_Nx%mXZ}s&hS^@gsR20y_91}ivp3i;Ho*b%zu z0@$zmB-e(d`5AW7V5Z;I#c>3rw2_k9hM9g>SNA)Ba>*`f=K89fAo^>7%NtN~i<=Cv zhviDdHGcuUo(~JA0FnCuE&*;EIEoBF`?25-z{M0X1!yYtH&v1WZn-)j%>@X+pn14FaqFt2l5MaEChEp zi`GsOq_;YfFNqleV$0X5=QKVA)lJ~je0m9gPk&q638*%>)ZZ+DJH-#j)~AE>-wG?; z$C*t{3<#PU{|^HKCddD1K+KN+q%0c{v*W)vAiV#;!~4Ye?^?HYjf3~h_%F@g^!Ok3 zGX9UxuI2bY4fsyrg8(e#lLmy=pUCo10qH6_$LNL zKOxEDV{&`rkbwaS+IH$(}@ z43IWpp*Yl22jD!u^X$#mK=}@-0a5_E41b8!0J#X@!hooq)*%C;0*I$FHz1ntaDGxZ zAX>L8oSL|X0nwaX&kjh#fM|w*g#*$uAet3I91!s@E)0lf2*Cjf2F8^E(GEczkdWzZ z1EO8!*a0aF41LyLlu33#n*KwN0RRa=4(&WyFI34GRpbt{FD@$d&1d$7$el&he+sg5US?G l@$|mi2|4hjGyLDohhI&(HHg4n5`h2!002ovPDHLkV1fjF1p5F0 delta 1106 zcmV-Y1g-n%2-^sd7=Hu<0000~l79t5rwVnf*wTf}{ukZb zp?m4OJ3FzRyNfzh;v`U{`||Gj-TB=Y%lfB5=n|m5T{8prR#U{$Vtv<*b{*H%0(-|t zZ0x&DEwKOoE$jI`eX6%#-?1QUYk|t^3&yq@(XI~YFdV0Js7(QZ^9~DWSGNLw|K%#i z&_&?Dc*K}zOn(6bv~<8o&Vv?MY0HjP1-O6u-#i0!F;r<%|@uL6d!$4DJ9^4)NUt^3P2pgaHs`3r+yq?htSR=$A`0z z5o0@X9B*JEb7bY>DvOWv0=NS{GUE0)mLV$qNQF2be}51__B6N0uMTJP%oe~9r#)&F z0Wm-3E5vcFN9Vh~a&ajF@cDB)1qzS$>@)w*kE~~d1l9`x5xm1#3+wzw0QU;O>QSCr ztOAg8)|gAPo?d0Up9m0Sr)HffEh~#0r~=0Gwz90Bhfqq)EzE zNJo`|H<^5+yosoL2mvaODp4+hdzLjoCj{loIe&t2Mk-rC6$_oNg%we>0OGT34cg!N zq{?yLg?q|w`ZQK2KM%2_2|tn{1;dc65R9rp4}@T>8uWk*Mqtu|y{jXm9$5PqC#+@A z1MAC)Sq~~p^nkZgt_RwyH`4DVg31|ePie+qfExlmitL?Mxu0b$tPMmf1g26ov*m+Ga7?KzdxnQVw zLlENLyKZX;u@yovJdLB!P~OdVkZ+VZL*dVm35LQ@1mMpMWWi7@ae2$Dx1lhU0#Fc6!ykO+pI?1|TUN8zb zZ#_MwdBG^$drl~;niq@$K-w-ps71jjBtczpo3tnxh0BN9Ew?Nf1%NnpEWv>HpMyl{ z2M+2(H1M%M9VALWAOe6?4|o8D!$d&_+^Y-(i6AqSb)`TMil($S;ex@NgzDH6XiH3_ zU|`ltM`@8%Fff8bAkYbFxzCI5XZ6&dXXYpb0=H`ZC9)_GIlYh%Ren(HK}&wN|2Mt( Y3%)DKK1$T4$p8QV07*qoM6N<$f*>gEod5s; diff --git a/graphics/pokemon/ampharos/front.png b/graphics/pokemon/ampharos/front.png index cc9711f87d9def90a2dc62fd6ab60e82bfbc47be..244dfecde3aec8bbaaf5d7c9101280dddc8501ef 100644 GIT binary patch delta 672 zcmV;R0$=^R1*`>-7=H)@0001;w}I>c0004VQb$4nuFf3k0000mP)t-sn9!gQ5D;2g zTK~lm&5IC&S~0~z0RQev|6&0D|No010IaO6=H}-AVgOnI0L4K7CHK{^0006iNkl5au#1hCeaLVyW( zi1o%G;sPlD#sS7Thu(XzUi9Mt7h-VU69Z@_plevyzz!gwMH&a7cR}>t8X$?pu>NBf zfM~)2H9|cEBPR6`iWhSL50vzi4t%08>;Sd$aR4-GJA48rkP4B~?@U$l%~{OvAJ2lq zUClx!4kl+GEilE}U;g z04}%-xy-c#K%YD95~~MP9kJ5K2n)e=T5=4+dZFjB*na|kHCPXQX{c7@4Z!>kSSq(5 zU0&{rz5?ubF4WKDq$ObSDd4n#oB{g~AnThG>^DJRK$~0|iOzxjZcpMhq|VP2NsoXB#&9-Q4we0K>_i(~S43mXP)L0L~jQxr_S-uqWdYaZfU?T5iPfDTi{8epl@f0>dBVBQ0ZR1{`;8D1n2=z^@=zE zAH8|5R|F*jY+I5;#y-<8+7RUZn^?(j7y;<_4zvw)%muE^Znet^@^m_qjKqcjW#xOQ z*EBvk^_Za5d^&{m=@=gZE*D&SzAOP(@ypNFw;3PK|7Sl8>>6STt$Hp10000kicTbdDz+l z2@Gw(Oy|)G9Dm6?BHDU%*aR`7$39WkACZ9F1`2?SseRa51upggY2FSz@S)!h;3(gx z(0;YMem}7~C1cWNr3Rue)^SpF5QV_$)C!E3kr3Y!%>G2?m-nwJ=chu50X4Ei4%S~Q zeab7~C(5XZ&0J`Sj=WL{<;7VV2GWCbA(bJ$J&VEsu6 z$o$GJf!fg?UCUp2WkVM=@T3MX#e19&$>(!p|CA@RBwiqvgqS(gu8oj}ge02$UqXdfM1_0O#0A?DX zeBq__CVwCf1{jVNAoJU_0k9ZQ1FJ&DT@#>>Hq}6=0Pin=L7HX>t&gx2$ec!iM*unf zvJ{A$fRu1cfCQQqB;iRwRX8>XNTMGjKK@k{K5M#AMi(%=z5M}liI{f?L(o^18B5U2 zss-pJX#6;5xTr|u3h0v2Wi4{VumV`bs~Rvly(lvExZA?HahpCA=H_=2dzSEj#&2Tt V;W2-!`>Ox|002ovPDHLkV1iE&I=}z` diff --git a/graphics/pokemon/ampharos/normal.pal b/graphics/pokemon/ampharos/normal.pal index dd9818d6b..af1e4ae87 100644 --- a/graphics/pokemon/ampharos/normal.pal +++ b/graphics/pokemon/ampharos/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -88 80 88 -248 192 16 -200 136 16 -128 88 48 -192 0 0 -248 232 72 -248 32 32 -248 248 248 -168 0 0 -176 176 176 -224 224 224 -248 176 160 -127 63 75 -198 121 121 +90 90 90 +255 197 16 +205 139 16 +131 90 49 +197 65 0 +255 238 74 +255 98 0 +255 255 255 +139 32 0 +172 172 172 +230 230 230 +255 98 0 +90 0 0 +197 65 0 diff --git a/graphics/pokemon/ariados/anim_front.png b/graphics/pokemon/ariados/anim_front.png index c579c4c01492c742a68b81840bb08cea41c441ac..024aa0bebf9e98b4c1e72e8d2397ee354c54a71d 100644 GIT binary patch delta 1301 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 N00>D%PDHLkV1gjBX^a2> delta 795 zcmV+$1LXXg2Brp(7=Hu<00013M{Ml?001yhOjJdf(4c5g82H#g0002Mut=C#z_@_m zU@(}7AOOfHIPget@Q9dbXlS^&xcK<^Pyhf&4~obD00OZ|L_t(YiS3jzZ__{&$1l2} zMd}ce46Hpn1Dl&?w{=^PV!IM64R&S}<+@g)VPPp`amLDvuYZhLuvexgEU0XaI(Hx} zl^8(kXW%(@l1pPLVnw{c^4S}X%F`#tPheV;7{l0b89Dr=|$Jc95){Lx-`FPlb!RUQ!G8d3za}JEJ{nm} zfk=S)eo??XEs}%l;qc29SPGaTG(Rj{@(w>Ou3slPM1L?bA;N`A-f?w%Jw`v)DFCg^ zQG-bmYi^U)p8)jY!~hiD5}_lNn;JW$0_ZZ)9|bkVLqNU}+bx9@J`UmtiAV_D_P80! z0=#7v_mcp+7@YtI3~mOpK>I|05#upo1x-=r0EXL;YE9cNCboNl`+ovB#|XQ|QB~TZ zR&D&azkeSmDPR?J#X|{8>I=%$6F}k?B?Lg}slglINNuJw%oxVwTY(wiTGMb}f-ZGV zO|4_8VB8a7Pe8>M!I4_tvSzJAJqLl#FJFjGLx63Hz+rW8s%>qS0~X!*eJO&U2w))) z*d)5gPcp!LgI{BRAcDJAn4Gk)TdatUnDtq$sees?OVNc^KmjzOJ1Dv{117=Hcai8C zS$*jtw(*+bP4=K^Ive{!^n}ndz&lRrGa1n|o9BCYO8)dJ8!kqeEu8|l=pRpOLnrcj z3Z#=acfIi0c>YFt%_%UQxm!QG`97cN;FYCBHXs}K2lJtx^Kes;2YGK4`5S=1D&U{8 ZKNQ5$@ov96lzRXG002ovPDHLkV1lC)Y^eYM diff --git a/graphics/pokemon/ariados/normal.pal b/graphics/pokemon/ariados/normal.pal index 5939c4fcb..66aaa7bdb 100644 --- a/graphics/pokemon/ariados/normal.pal +++ b/graphics/pokemon/ariados/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -104 80 24 -248 216 64 +106 82 24 +255 222 65 0 0 0 -192 176 72 -152 88 192 -184 128 224 -96 48 152 -136 32 0 -200 40 56 -240 72 112 -240 136 152 -104 104 104 -184 184 184 -248 248 248 -80 0 0 +197 180 74 +156 90 197 +189 131 230 +98 49 156 +139 32 0 +197 65 65 +255 90 74 +255 139 115 +106 106 106 +189 189 189 +255 255 255 +139 32 0 diff --git a/graphics/pokemon/bayleef/anim_front.png b/graphics/pokemon/bayleef/anim_front.png index 3b5b90f511e14e66622bbd863e9e024381f33986..05f44e73b544892b06fe09fada1bef2560e52d28 100644 GIT binary patch delta 1103 zcmV-V1hD(#2-paa7=H)@0001tU!Pb20004VQb$4nuFf3k0000mP)t-sn9!gpQV3Fe z2#dWjYMc-d5D=t;7-~`g_U207y($0y|NsAstT6!9i&A1@V#US9bt#JC000BlNklFz~?(#kZEVyIZdW*F4;v75PxX7Tz>-H!8n5IkzI<$qpK#?jK}lTs z&H^VqtwetZM9eVeF+nu|#$$+NI8^n<;2s!@O)-FE@MjEE?;rROC=EWwkbon>8G;1} z7;#0MaUsO7?0^6Ey~2zOMDQgwTsI*|qb^_}fPGtWCXGap(+}Gkrs`03(GK5}g(QNI zp*Xn{Af?1-DWuu01c*s&dN)IdpV*4o2UG`Ut^?Z4)d8nHZHz$Ik3cPLBn#ZSiJ;;m zooym8Uu)cu+2hud7!Ta2ZEpC5uLP)gCXm+bt#NqqA%ArQu*hfTJWyL-ngev0W%-dj z!jXU(My_OeM^rf9sfjKY<8Gu_`HMSZ!7sA9^@@@7@t5leq$r0Y@jjgV>l6etNE}Y^ z7!fOo}t zklxw|l7IYpnNRVV!`F3%0t6p&m$}B*Do6!=Ehw)nZ7y8bQ!?oCb)v~DaACmPEh*k& z>m&_M0o=pcu%1LAD~k((?Lc5ksgJzjuj|+2OTk0x3~vk26JV$q&E9Yi zY=I*Ia6Kvml&i{=#p*2Rx|}>n)+9b^wi*F{hky3I1R-Q!VaG-Q`@Y-u0j%p@HasM` zV)Me*$9i^F|G5&|@GI@$4%ip|*vCHhhwLM~{HwwX>mGB$3wsLPkTER0Jjot&lVUG> zOfVGLV_x^jvd6scQDqO+JthdEFsSY^8iUFn)4GSs9`m|~ZlY=3g9%jk=w%0cLy~88 z)_*^tjnJ=m^}{=uac&wrxC>X$;PrXYR~^M6e~$B$T1w-kJGXwe#vB=Ozw&tV(`xbJb`djjci{ZDV?#jGE6aK0O2 z_fE%4f|GvG1cWm2;ibTN)(?&X!tLyS(0>ok0z&M@k9Q1BKX@e|#B@LRRQ=$UfDkQ% zm+A+v1cYcAysCb177(Ikes21~lYpQT?A<=h`hgy$L-NW9dqcpdsXvUWom7H5d_TQs z0in+R#_5^Paynb6B=-a{zG6TnxQhXE&Ja%o`pJz8m~_L+(Ay-0!ytampuZ;9gh;}w zf-pkBH%-5=Q9=L=b>0VrVF^Ko|D^v_2fa&12?3wx^{gR`N(cu=))0Oq0sQw8!fz>F VJ9y?**0cZs002ovPDHLkV1jc?2w(sJ delta 1114 zcmV-g1f~1f2;&Hl7=Hu<0000c~G1~3!P8r&CL5TU&j7Ub9^+r+xJ6pi}Qn#+0D5?yTLh+OvIjc3lSs0 z4-EdW_7D8AagAU8edh9Lzny#-AKWGYT|H92i6R+t)aJ4e<1H3P)DpEx_aR z6e=5#BXIvbw`ZBZ0g&g1cEH0LzkKSb(}P2RWmhAn>R~qP0^Cd~)wvr}rB1-!2MSRj zaNB$w$bu=ZunY!vfC7|aX!df>t}5DYK6FeMZ%>5#)PE`%hq5OOJGvK(VXlEF5TR+y zxd=}*FySIH<>16O$q$u?O)H>{Yd}rt0vT5DeLAw>A5_xROCE<|ivER&rRnxyk+JA& zAQWkRvUe785by`!!y*jsQ=~NhpSZ+rHW~ z+91R=jDJ6bazcOt)j0l6h)L3)p_J)rjc2P-NissskLhP@mkPcmJ(Kq0K;~9O7FHJn<>L~6m%!n+OLXcjWw{DQT9r0@Y4vW zO;H0=8&J6tKk>^5c=T(6e^y5b7?Sj;xf&R;xqtCc-IThv2xaZ%xGKSE_-R1f(4eITH;sR!n& zYD)8BGPI}%CMN~$co|sK1J+logL1rGq4n6h*P$kAkGpCtg!)1I7k;XrdanUo>Ia;y zQM$w+`7ZEFKR`h98|Ka7zts;5oX(+$Q-3`?cbCxm0fIq)5sGj~~-=SOA&Lbp_LQ4lJ2f%>9u_4R|tXHR|kZMWbCy6(qm3BFwi>C@P2}%X_*_=IqsP g1cEfmk3VTY0g{gUKIWa5umAu607*qoM6N<$fc0004VQb$4nuFf3k0000mP)t-sn9!gpQV3Fe z2#dWjYMc-d5D=t;7-~`g_U207y($0y|NsAstT6!9i&A1@V#US9bt#JC0006+NklcE+!``cG;kq5kr~ z6|bK3Gc$96fyV`H0RYc=Q{$L_Ef!JGv`BA{f?+<$q{v7UwiJl*~AP{@M&8KNb z_|30TkbmKGnKJkIUInXQ>;;8q8*}--o|eH-)=5iVg&PCEZAnwhW0DNG2JjvZ<9-s2 ztU5OW-+^EeIY&P5_w_sDYr(UejNcaEOu)HgTK3*o@S;Gl6;1@?Xn`vMp&p%q>Z)>O zv5TeV7s(^>Ch^g;H3;yF{d0+OE?Vi}K|sfG_%r%|_Wh_0Phu;!IQCxFi`e#cSGMU} g+C>ie9sjrX4Yzq6HIOAH9{>OV07*qoM6N<$f*veAS^xk5 delta 688 zcmV;h0#E(M1-u227=Hu<00013M{Ml?001yhOjJdf(4Z(#2vB$kh`2Clm=F*U5U7AC zXixz7=%CoRaQOK6`0&WkH~`RyP+(wSz`($(swKGq00KuzL_t(YiPe?8irYXC$0dVK ztz}{2_IA+&NE?$rPvEoJSZ=Nhu{$@1rF1TY#*o(5%@YK!2!Estt!*|1>`$bIVbr&1D_e zjPX|=dVxxYm&xmFe8&JuBPoM8vz})ON$Do&ewKJQyRB!fz4YD!Y8I}cc9hRH8WsRh zxq;x;PKdbTVt=kCS6$qU6l|7IyMZ{b>yL#y#`-hBhwnLToxoRs_s=;TT|hy={d3{Y zviJgEpVw|6q#A#GyHaNeYk>M%BUbosx48xcJ4C!XjTPb}xck5^N&@cWcLC_){l zZh#$BW-6;nc`uO1t){-Tcmtz{+$xxBJ2JvV2bq}`Eq{>2MoS}CMnAT|LYYL$!Ovc? z4o8zo5y<8pfD2wAAwm@Kk%ee{v{ElsrgcvG-egwV9x5_3lNQh>?@snvAfJFJg$VYU zF$o;V#S+i_L^?I;-b65>B64W#63zk7#)<%yR|{>XKx02Ny*3zgOa7-&Ef_$+-tqS} zCCM*CWqd2>I!fUdAl} zLXsgjw*_Y2gLtUkY-V2Ys|D_V3w;Qle$vy`t|@G|t%3vc%YmLgIlpq9S?O2tkL?d8 Wd-<|t)QNEb0000a#3*ylTuh(>u&Ls zss|F)q@==286wDA3nGMS)UnWq;u7?9R)>0P!y};nLQSQO;Q_A1sTc&BE`z1tmvv7t zD&3=z^9i`01_T(J?NmR0Ho;J0Lc|Fe4E0a*70Sdjo@fPJ+cli&})76CKs-Ma>aA&3F6 z&5qV!-nY%Uj)kOQZyUHdmyyjQ4I9tGqMtbD#|hAsvb2=ea(#RN!W$vklTa(Cce()n zax@lH^%om3sngSw2Q~no8nmjN4#!>$`=N~h_I7|zF@NbD+rlNl4Fa45fa7-;asdGE zg|i-n07pkMWId4HvH=kM;>YpWL0D*k|56em+#LzwgJ?W^C!)^#c(aLscr7^<^34XP zLV6~)q;(ZIzxFbwf9k1!vO;tkQDbW8O@Nq{Vr0_vTV0GuYE^QJh!Ewf1RqKag11~3 z`4l6E?0=Xb->OPp(gTL#=X+2;{hnTn4@fmN!k_$+{!pL-FI133RTa$R)`K%T$T^9cYw$+0pJ6MRn# zAPpcTc(Db)r}3u*F9w_wd_Q38Yyl*|763i#;D2}gg>CjdCwM8qZ4RHk9|Mt(fm}BL zsf7e6xku6h07yY28^9Q=*m36t>uRmdv6(KEXeXHP`jDo{&-_=~IF~|Wo1gi~I|I@J zf^->71pvqkAvl&oTnrGL(6W;JE)1o;=%O+ZVl1CvQ&aXdACh6rg^*o{j%RZ;hVv*W zeN_tpNNC(k+6M>0 delta 869 zcmV-r1DgEj2Ji-u7=Hu<0000yMG zPAc*ODKfKnMTmrIZaGDN0##T~{_4q9_}H z0JKFD8`5L|Yq}*0*ec4*T6H2suCefUI&DP&f8A)^SH1kr47&fIe$E@&-$j8x>8-?)b0U==sghsym0O{`Z0>M*8Sz?vH<4>IAeiF5v1^R zzyjCjkq$ole2y;=fAaf=2fhRF?$@^!!2GLz!vQk@#sHjJ0Z73DZ$lkS?qa^rVQ@Fn zXgv2>&q75Bi*nw~r5YxagT=;3=F!s{~Qx2H=0S1_k;(ZD@h-1|Q;7IL_ z$nTIJU6?IX!nvk_8+iTF>;rMRpy6xBW6xw_&h3#M5Q>1+{_me_`TY;=#i%0$^{r!9cd z=1!dpu+c~oY_b_J!1fdVXjid-Ht$DyZ`Cb-jT~fP>q`NvUu>=L!+>D-n*qTNC{ijG z=7D41Wj^0QH}3brvQ1&jOkLTY<4{KmcGo zo?G;PcBfI-S_!6fNQzY4E9s%spX8^Hh0MBPfMrWumb#QCccR*JW0^pfEJ{{u#f~S=*Nx*X$ zqh5UL4c0004VQb$4nuFf3k0000mP)t-sz`*!oizz{3 z7=z|9YP2Z;002Q+7=x5j)%J_-|HZV;YQ@FH|NsADL0ZKrDeilFp`(M)0004XNkl5ju741@~_m~f=;|F&xbO>?k`O{A4p%KV}g^D#C@UVpDgkN$}iN^9M19;$jE z#Z68U4rPdJ-$oE2)W%(eITV+mhrK&%)P_euf5T1E#_#|wa}|R??J_7mHg!!fs?O2K zIRdWRfB<8cIIARed=UY_k*xjxrE^84e~35-z%)&+AbtyYT7#daOTy{;ZUyKeECF&S zKhR^|sa|J{sz&*emZATNr2apQDvF=_QkV_B)AURKa;O3OP z@7PExJ0mNAp#}2TOvb2@fa&sI2`9?_2B&?moSO>u0j!gu$`o#te zYPWjLzy{!|*{ing@a)a72X6tej{_Xd7wY_Jv5H*rgfQINcy f<(~i1qrcJ*XCW5~JXLB+00000NkvXXu0mjfrcvJs delta 503 zcmVT7=Hu<00013M{Ml?001yhOjJd{!1z#zAV6RkkkDXgut)#^0AOG^ zn3!1L=&11U(74EWz`(%x`1oKzSimSK=y-Ux70(?200EFmL_t(YiS5*}PQpMK2k?`m zkhm2S;%EvyKsla(VB(00M~qV!wQ+JGG))|cksggQ+Xo=Tdw&52)KM4X8}JJH0uFw6 zrPa{y%Ay6+n>0~=J7^}6@>}S9stSQuw641&5=Ez2>N(-K=J^Gvv z9krJ_V;y4DR)0V#x(D%Vz*srxLlkk&o$TR~0wV>6TCg2Ki#`vuU^a?)@aXA#JVE{O z*IWw400000JX)YJ000BtNklHc3N0e=GN=jXA<{!t5T0Pwvy zntj7aDd%Ar0wNMB0N{0Y^d)NuY3%;10RZsYPE+VID*(3CJ5Uplmleer(E-Ylegj|# z^A&&T;v+do-m4h^z;h=n`DOA1wrJ>7s7ruad6h+3=nqsTL3_Y?EQOP zCm^7+9e)iNbHC{t3u>rGuG3PB8GkOi=-BQp8(6< z_D2Akj@$+@hu~CDHChR5h0~G7vIA%ZEPe%37dC|Eqi_iII=qA+CCmpHVPOQRc6#C0 zPA0Vj{eMbm3>?5w4U_%Q6R07Kr+T^C9YQU55gi7g1}%bb=`an4b=M672$n#AA1s_t zKHhlwxxi{E=F9=RPbf}87_Jk{U0h#0q$O&&_}*9zx3?M}Ro34HSSYgr-qx?7JoeaQ zk3II-|7@^c>R(v^d!K!YkmsFv05W^{0ui>!3x83(I=-m%L;WBmxJwXy{WIMJgt+e} zuZ~cT^t+xNJ`A^{Y1;$p7ZSwt;nrB3c6f6Ebp8>Khg&j7IRSv}3dHGvAU%ZBPA`CM zK@SMp#d!U=B>}2r;^YGI0YF`-^$c(b)<$`aWDjs%&`!_*yGfS-TD=FbS=_rMXESi? z(SHFtg0-UWcM^RM*zf1wg=G47VZgGVwNumi1$+V6+D7iRVE zCpEuY&Zbx}$Ot7h`eCSD;Ddh(C^EAs3x6Rc1q?0VbPQH9_vQYWe8j@>7K)KLEg zp~=AcFf7ORGeDjP1j__uJxg~0;srybCT;iO0ytlVj#H1(ZaCnY6^>gDbcD5Xd`tM9 d{ISP;`wJozBS8h~8pZ$s002ovPDHLkV1gCV?wJ4p delta 1108 zcmV-a1grbt2;B&f7=Hu<0000}@jIJm&* z2q;(p004ksP*5ls_~?MxxG<2Q;IIGy0001fzMgvk00ZbrL_t(oh3(frZ`(!`0PrJ0 zfKsNMDM&8h05S!X9-4u=LiQp+MySF`v>4$5cJ0M=ap_P4vVRNox)_k`7?ulkC=df4 zG>)@(i&&w+q<8S$8LF?v#wu5)C!|Q$yQ2umo z1SnJ{L2<{q8GmJg4(|&v#14K8(m+SeyJ`%u{Y3Df35qB^z7xR3)^!S~kg^{SqawE z+|J}A2rEEci7EiaPUj)=$U%k1pq&7a-5u9%k^}Fbet$1o0OOWeoIv#peDRm(dE>P_ zAQP|R4$d~4-WZ{%L>uEbqV?uMA8%c4B4k>~>i*Vc$5U-5V9ta*%?7t4gT=LvYsUJ{t{s<2(Xa^;7EuQ-qlO1 zmjY@(0*gHH>Q|5sgNsG&!4Ex<7e_0)-vK>E@BrK!Ghx{g>*u zkK}o74Zn>4HKx`God#GL7BbEICK6@lF^_rtkAETiZ~lysY6z{)5Rz8c_5KW@)vN5) zK3$!2_@(tI%C6wU(QZ#WdZnCR1MWrqWE5%^M`&D zwN;8z6W0)@fXr?O9VeDh-1rptL9o~3#1b7G1Gx+2pi%Yj7_<|BZDTpO7pf;}u+z() z1b^T-20M-&oc|oi;k}AM$8lb_Boc1KIEjF0qU|_Nt1Lh?p~PK2W#CQO|1{u&L06Wi z0?9vF;b0|dR~$M)327fb2+n3Sm;g%9;&3})C@Hujr8PvYII2$qW^*4m@$7`4w)Rwkh z`k=E*c#Wc)0i~@C21+0Bdmrd}5ods8-Lf7w{=o0Zepe@CH~~uQY>XNWE}xM-mj9lO zIIXl;hHQ-LytsHo?lcIOc5ZM6$Pj))rQvOv)M10L4=4-x3}dY~_6=RvUB|h}0!=`D zfl#Fvd_Fk<3{IFZSbiD+bZ}0C_tpoma{vpK&mQbCvvc!NwAp_xGl7Eb{0bth&*bNk aiGKkr6DrRT0143m0000c0004VQb$4nuFf3k0000mP)t-sn9!hFbHyoA zlxn2r#gqX5%~F)j<_IZT0001kVp38m82|2r=Cmn$z2>w400000JX)YJ00064Nklg|DU@jpjHH1z5B8co|$%9JLhW>LVw`r=h378R0J{e@6AKe zZx|tnjN?eEYML3h?IJLjubFX!Q0x+?-7}->gkl$&s;406RsZV+dzuci{UU0qhBiWmOjt4IrKQ-vA|AT12@a zgp>kg9{{@AbAK*JLUeoV`B#8e#iXH0!mMjw3CGpcv9lJR0Cd3L0=oms7U#S5o!k&%9128G$oqs~`ckKW=At(<3paMuDQSsvo zKIy@q2Vk#^jFLM+%K1Ww#DcS|0+a#R-TtWIupCc#kp#0Op&riP0PETI#{sz$Ke-EIZ{002ovPDHLkV1j*)B-8)^ delta 643 zcmV-}0(||11&{@h7=Hu<00013M{Ml?001yhOjJdf(4bgwz$j3Vc$nC@m>}@jIJm&* z2q;(p004ksP*5ls_~?MxxG<2Q;IIGy0001fzMgvk00J9HL_t(YiS5)eYui8+0N{%; zNY0e23U(m@qYlc_L3z+-5j1dyCU`OELEL&t2c?TacA?j$V1FeIaS9y@4S49_v40?w zmISOR?GOT`i>CgOo-FGurRQ|%&>?RShu+6~Psg1Ixr=`tl$!Nh(*UqxF3dCZ_W0Y^ zut+dO?h~RNgSv~zx5v{}u%XJA5%GDt)D2$&8XXf=c^FZi&(=(blsLr0f>+ z6k@Mi<#W);0V;MUaviT5{|p9M0mP@WxJR`Ic=A1tzLF|c5?Zo#4PSf@GK8VUy6fts?Tgt09ufNTAKL!ffU0^Ma@`yH6W_! zubasP{1CkTx(XavF`Qxu5D*Z>iz)c{_|1cZ|D>dx0000000000A@I%!0005bNkl3{R>Rw|WBr86R;Ykp?A z65)PE#Kiz^sx$817j<(Juc4VMYro$YA#RL$kiOjSnGD$7FBk*9@Iz-K49|DL@Z&QA zmSySZ5^TYk6Y(V#Cg`dI=*iZVA(Cx*~;x|IcfDhg;mh&S40a1k=C8S!x zgdd*@uYNv8D}SZ>QMV@ERuLt%*0KSlEbEF+R`ODwTd!KY;&y9shYYq0@kOo`1rB=WhfAdr#nh(0>q545O#< zKVV%B>dWK58+xpOyaY_)|Dg9t{6FA(7XJ_UPUHWecjf)E1)N_7RRX>8~SC!XO9Bzd3gB<=p0|vW#4T*!jpw(~w zzo&Q2(mcDp6`)yq9|`*@K$`xM(2fMMMiVYU7{zagmW=iWM~9rGAnMZGRJypd5q~;rVxfbRLfXz^L$_*U z%^TFLK0+Ts@Bzfxck!nFnZB=C1VwTPcR9Z#-@RNoM~G6T{<13d0zlfEi3(tE6#zIs z;r-|uzH9f=8RutLvLo%o=|jr+OC=#O%(9FkjA?cW2b~;jDOZX+EK&;d%z=hH9&6E7-1KluBv4VGYWr;xsD1&xZUK-m zfG|INFHtiZm@89xp&nsC`@--BX?mynH;gYt`n{AYRe!3~zf^HOKw&+=rg~75P8SWn z9@NItvB1}Z+IShj0wS&+jI*Vu!=JAQadv^ai-LN9&Gld%?wjhtI^5ZMpwnLmYmnE2 z5xLR6x&I`sgO!!i2T_FwyuAU^rn9}8?_lR8Uzuz-wPi`YG?;o&4L@3tWBOb@SOYqG zTYi%Ultd=%A4&f+F8$}9>3_zhzoAq!AA$RT5Q)+Sp_y#6*U|{vH|n&{**P&Q+d-+{ Z);mLijbH)s@B;t<002ovPDHLkV1lBt3oHNt diff --git a/graphics/pokemon/cleffa/front.png b/graphics/pokemon/cleffa/front.png index a8d989f263c27bb07603e6760ac8a9c935f5da57..5b28503ac2ae9ff943ae30ed7f2d8ca5203e847d 100644 GIT binary patch delta 383 zcmV-_0f7FW1C9fb7=H)@0001;w}I>c0004VQb$4nuFf3k0000mP)t-sn9!i8P*DHX z&HtpN&4YttAQ*E>F`Qxu5D*Z>iz)c{_|1cZ|D>dx0000000000A@I%!0003DNkln7ok)NE_{C&y!N;s zrBtd%+lzQVMR-I|)hd9D<@rP<8$~gymLeFcaF2nGGzebFV8SneprZs7-Ubta3I4ni zXyaxUB82-S4?y7{?d*>g$Rz**Q~>8SR0E(EW8czhM*u6nY93Zk1;NbgkMsNTRA1Cq dtJV51{Q?XE2zS&8C1C&n002ovPDHLkV1h_es0;uA delta 401 zcmV;C0dD?|1D^ws7=Hu<00013M{Ml?001yhOjJdf(4eSLQ25Zu_@JQ3fPhdiC|EEc za7Z{15D=JvaQOK6_;678n0UZIKmY&$0001Kmk~%EFQwsedC%gw%lvBsV*vR<}aa z;2S_zj=&u_0T;sM-}ISGNDO(3vb>+2&sG@g)8{`Y8gu|IeisoS_B#O1&cnUAg-*rH ztwVi#!*ec9R!=U_KS~acMccNNh*#}3M#y)-E{U(i)?NVv;K5pJD6m+j*roA(Ma|Gu zA3ZW-g5VH%#(&rY@}O~rF>nvj82XrObMy*azWAF8TxJ2}BR_=FAuudX-!S1)Z)s5S z1HZl)PE}2BQNjaJAW=2_SCnazLLU1^Pe>5SuVgwS!QMBRO*=px04(|JRV~*v*vLex v(vL8wdlsv?b6a_F7w8#tKd(N0{wnX+yhq)H*SrJ(015yANkvXXu0mjfWkjgU diff --git a/graphics/pokemon/cleffa/normal.pal b/graphics/pokemon/cleffa/normal.pal index d6dafd798..c4944c7c6 100644 --- a/graphics/pokemon/cleffa/normal.pal +++ b/graphics/pokemon/cleffa/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 168 80 80 -248 208 200 -248 160 160 -200 128 128 -80 48 40 -88 48 32 -112 72 56 +255 213 205 +255 164 164 +205 131 131 +98 32 24 +115 74 49 +156 98 8 16 16 16 -152 128 112 +197 139 41 248 248 248 -248 112 80 -248 152 120 -192 64 64 +205 131 131 +255 164 164 +156 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/crobat/anim_front.png b/graphics/pokemon/crobat/anim_front.png index abf3b22be46eb2945cc395ee1587e422dc0951e8..9275d830942664f0889805238c7dbc8bdbf96d01 100644 GIT binary patch delta 1116 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 delta 678 zcmV;X0$Kf~1+oQ@7=Hu<00013M{Ml?001yhOjJdf(4b%#cz8&duz1K25D*AJXdq~i zpjgOAn7Gi80Qk@VumAvPXlS6Ip!oRs0002_3l9$f00KQpL_t(YiQSX2Zrd;rhL3`p zqMJn75ZWoC6lg0Tvw(*#a-bk<3z*&wBt%xJ0yuT>VtDS@F@G=7N61^`37R}ZkF+a` zlDHSW#iITX|NT6j0si?4LtvL~nNVIpv~Ut$%8L?6v~cU;4B*X{Pg{83cqmGMi~Y2P z(bxLvVK-%A^!w5Phbar}FXWwhyf}<3yi1Q4Ldx|CI7G?@$Rgr%DP?&)J{;)6n^{D} zi;a}`9kAokr+>cg*T&!uIv`c01?2Un2VjV}&a4)>HaKN809CCOvJsneMh)!j79P7@z0MLQS)*NfE)V$@#*J}Caxz9u*uiv`Gu)kwbKRwtM9L`PfDqYgvTNupI?3} zd$nw!$$uNB)XWViT}=|W058`7W3G(g#oC}|p$ni0G&!T0Lnka@x)N6p%2o!*=rllB z28JjdJtzX#6=O3XZov1eik5^;4V$33{`EFN+8hr`qMx! z+4X$XLr>vcJ{wt(E`X`k)zD%9ATh8QO|Ke!kstARXM-N)5ctpP5ArLTAtXf4_5c6? M07*qoM6N<$f|4jZ{Qv*} diff --git a/graphics/pokemon/crobat/normal.pal b/graphics/pokemon/crobat/normal.pal index c8b289770..5db72c9cf 100644 --- a/graphics/pokemon/crobat/normal.pal +++ b/graphics/pokemon/crobat/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -96 24 120 -120 72 152 -176 120 200 +90 41 115 +131 74 205 +205 139 246 16 16 16 -8 64 104 -32 104 144 -160 88 200 -72 152 184 -208 144 0 -248 208 0 -176 0 0 -104 104 104 -160 160 160 -248 248 248 +8 65 106 +32 106 148 +172 90 255 +74 156 189 +213 148 0 +255 213 0 +180 0 0 +106 106 106 +164 164 164 +255 255 255 0 0 0 diff --git a/graphics/pokemon/croconaw/anim_front.png b/graphics/pokemon/croconaw/anim_front.png index bdd5340fd5ed0cc33fbebc7fdbb627a874c59070..3fc9ff81f28730f3aedbf0549c0b431078ae8b48 100644 GIT binary patch delta 1045 zcmV+w1nT>M37!a$7=H)@0001tU!Pb20004VQb$4nuFf3k0000mP)t-sn9!h{5Fr1o zS`ZKr|4K^L7!V+0dmxLwYR%1y?&kmh|9b!c=0PBfVgT;6O8@_2=^P;y000A=NklwYa2%vEjfGCfYvyOq{(H>CrAhMp`PJ|4yBEEnGB>nRV zGr+YH30O~r%z)tcAb$g(XAYKBK=e-@L8?pY8bbr90~O#IK`QC-#Q_Z^>)y`d0+itZ z?Mx1A{$>F{DfGr!A1S)U4)h`LcMOn9A$@|eDZm84J%1o-E&`b39q^uj(6dowAIi|T zF}$Be(gzF^U?K!|0gt8-c5E&bwFby=u!bugAG~igBZY|~`g{}ud>%^zob;0)1UT@X zjuQ5vW}*)2fM5jhJWvRYu{V7<9Ky27b%dfQ(kAKzJAmeR1LQ^IuZ|FX4h(p|hLSpE z1#}rIp?}IVeWs%z93eM{A{oEEZmaiWfbgnU0DEr(EV_4I03=jEvZMk@7!434p>=>U zmk^>3g&)t2pnBU83vJ(rl!t*KmkdPJ<0O|q+0S^8+@T{#d_}P2l5Z|RwLUDQWM?A) zKl^3GgrN1c0f3*3-;!5%$LN6nc6sJqmtFRoc7L@Ht`@@8LbzH8Z2zH!fc5r#x`n_6 zI3&Knx?GUkcHu>&`n#0GO$678+b*f(2>+V63Bf%GH=vo!qO<&-Ei1q=26)j60DT(* zCV5UZD1A+kH1t`^Z)Y0?n!Gmvyqg;2u9{SjC-$_~-wYsm^j`fq71e5i-QPKy&G&WD zOMgm0_PiBB*1K}kYf{-e!0f_G)^{{g4Fg(8S!xbM%EojgbpWR(h#-ZK0YExE4VA!o z0kY&)Q`Lj2Uy?e#*V3g_f?)))Ue!}gCvqfY0a(iSrM56Q4{AE$K$6Ny3TVp`w8lf4 zdN@+Zb4Z!iu+RQzA@ma36v|qHYYU+RB!8yCl-fZ%5aLCtdTt=(aMVEPfKh)-6GGg# z)&Gq!4yHDJF2FLvIKou_n;Hn!+7xIDVKfjtwR4 z4B)ka;Q1GUq=DW*aP|-S7^cTP{ez{o5MG~l)%4mzus;4T!qr0fJ^KXWvquBRxDJ?9 P00000NkvXXu0mjf%xmHE delta 1143 zcmV--1c>{d2!IKY7=Hu<00006JA5D*aXP*}()I3Qqn zAc(kV$jFH3;Q09XcmM$4Kp<#P0LZvt_~3~37Ae{Q00aw3L_t(oh3%I?YvWcB$0Y>v zDUkK{3$*nIaCsZcO*Rf8&fb@jp0}7t>Y=3|@KXzGD1zr%Xn);9A=%KQVG9fU1?t># zYu!_zxg`f3eDd>Q58X?w&Pdr7q&H4!E_>*M5Xk&AGkS0I{{L9kySUbGiQ6CE6{zps z39v1@v1i?1@%TCd&L^w#*Sot9RsmfE_E!S9ZUqh=uL2(V{y~$C_v?>BfF28c{roV5 zqy-#MI{|>?n|~-wIN(_T@bH&$TQNW!#{g%)j@w)f>D z8HcdFiNIqc;f%M&lgVY;0(D^Ctfsp)*?gr_fDPt2T9ebW0$|?bd@`MObQ-f6(zn2& zxrepar_<@BzK9_)XCUBAYYzc)4{O(_)8F-60_~J*+JB10)^taw1jxvfhAca;#gZz3 zl2S&cVC^f*jjl3%F6qp?D&QXbI8H+3aRSOEdNfaPmA%P<05g<;kB@^K$Z{Z({c?}a z(Q^!BSwW=b(Y|N30Viq*@I!`GMrrx^`nsS8*%NOXKH_HG~jNDi-*L8cx4|Q-9j=lrjMAFnl{_jxd$*g1~(B{9VHM z*#GOlFZ(v2&a2+P1MJ4#fOS;grp+Vv`vh=uk>~%Y(Y?RF3fOIQ-&-N?b|W_kw*dPG zycckM)d3Lsd2fDVI{;Ah@q#7C%Szr7Tk{MUwfnSb{X0j5TN z8Gk|_FKxzyxXMRC+I+R`$4nDDS?0s$)%D9zmN?0egPY1%SZsNHf%8JUc{Ge z&L21hpxbcBcZu;iaQ?vBrUH6~05cNK4#snTz@50$(Q|YlinokHcrsSKAvY4fk8%OY zQ7|;8a8E$_g4D@$SL6Ep1V`pa0^+LVpnt;OBUMtKP-Gjcl(p zfG<0ccvV$%zs3Ix{=nSFkzRnPik6#*<{Him^g4Pm98~wg!D*z45}wwJ<)HeO4(V=g zf<}u>n`DvR0Ao=21H)FM@Tz#UAYeI@tt#Ne3O&x~4P?uKerl-U$Ufv2BSY~{O>j+k zVF75#08S2c^bCOuqq>us8x}ytffO|)3`yS21|tV>U6MgC`qjcf^eHYF|3C%;J<7QV z82@0kf(Q)+>mTwa^1n0w!E%(kxttgyfEL8~cKc0004VQb$4nuFf3k0000mP)t-sn9!h{5Fr1o zS`ZKr|4K^L7!V+0dmxLwYR%1y?&kmh|9b!c=0PBfVgT;6O8@_2=^P;y0006SNklu&5I41~i@V&?|D|JxqhTtd6j2GS$-Pu=cTsxlvAY=2Cq=`T9M{Z#+L?*iOw z{yl(8dIh*A5chHgfaMurhU#aB`6*ydfO&Zg$njIavMf*9(Ez0J$N-Z7h*k~4Fo3sh zrN!ic{22wPJ_UH^2LxU>V$+|;z5|lQpk9A8PMiraW`Wik%&<)uvp}oVj=4Z+C)><^ z6To&H$8IabV}DP8#q}c~c?&=&hYum=ApO|iQ1T$DURD=EfK_CyAwi-)PqcucN_ePV z2tffn?jXDYXk-s2A7T1aGw`XTLpc;cHjn@#8TjarZw7KJ^`7lu77#B3ax%5C^{WSf z7-hv)ze;yo+~}G0n;1Su(R*Bn0$l*wm?+O8ppjR=XMX~rPNP*l#7kdt_`HjvXW|CX z5LhkH-4sd^a}8~DS_N_$5+TWh{QA2l zyjrepMSlrhJsqphIe@?FGeF(<0j7L*z5qm+0lsGx*uW?Nwt-dwowGy`DHVM@6hhYb zU9l+Vo_)9i9kb*@Bt129`&a)R51So11Fx?LJ+tJ^0#ekpNQPY>0s8E>j0GX}?E^rc qT;GOQwbN-}{O$6|T7U6B;vbrmC2|t<8^8bn00{s|MNUMnLSTZOcP6m_ delta 669 zcmV;O0%HA~1*rv)7=Hu<00013M{Ml?001yhOjJdf(4c?-2>6JA5D*aXP*}()I3Qqn zAc(kV$jFH3;Q09XcmM$4Kp<#P0LZvt_~3~37Ae{Q00J~gL_t(YiPh9GZ__{&2XIH0 z(y3BvJ_3AzNLS*}K&z^udxf%BifVg8NS6Ez5?w4gkAbq$B7a6p-S`4HTeiwf9lEu{ z4ViKsI>18AJG*7D@7$paSc)>d-@X6k?m33>FFu`n>aE8Q1=h}kK+9-7*)bk9EbkC7 zUp4i&hTH2+U`XI)BcSJAFxqPZyN)yJYU_cu>miP{;O)tQhfxo8VC4%UM(=zt(t!^y z;`8rGKh}US41W=4XGvd|LHk3T_{_t74RBm)f$=FuObOW6H1Y7o27x`LFq1)&rkA{j z@ko7G-S!~e_$D~wQ_Xes(&?-On%{ArX4$6Tp|%6R0|)9otlmts>{48W7^yo*FcZQi zpx(pk?`if!ECA(6wN*!PJ;=5MmjHYl6kWD%*it5741WNArMU9OX!}>WI0t!Wb{({j z9U3Rbin;{Vh_Rd}yvlzSz@-iq@a)(vKwbbJg6ba4&nHyK^HT8YXs;Q4q=}j!e#$B3 zh*#HJ9VQosw@r?C^#rVKgJ!Wn5=>OUFjmg67ol?!FavrqKi@xm;)bI zjuB%IV}I&@ozouX;_$++0{KGF=OgX#C(uk(Z^EXcSAr#|fJv8Jf~6p^sNE$AkiZv0 z0$v9sC29kq5QXsqL%byK|F)gQ3#2XBj_#Ez`6x~LgYz*Sn|~;0mSt*c>iqgZh+#pk@*1V=%ivTVorY5vlG-frHh|Bp&9`OC2Kzc z8vVxDbzQA7b@2!PJ;1CYYfUxlZEG!{`mF`F(reo@;I58`wb_m(5Mig=@4G(gqK=16 za?Tk7(7n;W^?&+3$r+%VCLRUi^kg0Ox%Gd~>iTfKcx21>il| zQ9wSM?JY+^2;K!*1DJge_I&#*djUZ5<5q^%)*2cPlC(eyh#;q8wbIAy4LDSg_P|31 ztn1d$zygr|;VHnwlnK@}9AgHo;&%bvF5*Ad9{jf*cz@u~BLLh_@xbeqQG){b z$UZeSHGefV^)ECU+dl@B!9hwn-2;T2juN1IfKYF&^}-=~6u=R-`kPmhEF6C;pd-Mu z<&ggg&>Y}%Dy52TMp@3}f?y_W{BX;4nZKiSKY8AoKz# z{^PeI9S9hj9~?qE4-h`e|F75cvjM;yAWTjD34HBjE6vw3|AW}3){sy|i1iHi(Axk%3uzyKbt4lWz#$#whWNd{j z#c1f*EL~$Toa`agV9;}x(qfRExe&KsAs-?1-N{2E-6^G8zz-x0{~zz(Jq!MSP21FS zE(;&K7_fAwK-V4JDLn-cOC@4|os@_guxzcA0=ksZZQDYbIQUC(zU>eWAemRU+&!JF z0qm61-9xWhA%8+AwglMnJg-p|a=B?sPS{6)()XlHnr#kbo9s}o(*v?gTA}De9&d98 zRm!doNW0nYr@-SWKBImNaCO%1hka6R@j-I{0DL`bhhe{sjGY-2fg_klaR&jcW>)9G z@iYSHgde%?rgSf_Ym4cLWhWq-E0<+|=ZxBu5@?gGd(Sb*0+V?-wi zTWH))8X*1#Vi=%~hScHipU(#`xoN_k4}(s)jt7~5fi?j*Xlj$%Iv$XW`5FksfQD5| z^3<2Z)xFU1Zwgb_Ihj2c-Fc69HqZn2LZQ(~%g1hzGPH{~(u1v^?htqbmPm zO<=$H!Y2qw%Y>K%5lHg`FFzOuw}tt^?5?l z825>9F1tnXz{gjRr~y$I4^QL+!!Oo1^%som4{{G+UPy1Vf&c&j07*qoM6N<$f>45= AH2?qr diff --git a/graphics/pokemon/cyndaquil/front.png b/graphics/pokemon/cyndaquil/front.png index 448a51f8a91ce20152aaa0f05603df43fd0a9f49..b8b7e71aca85e21c3b6fe01c6fa111d6a792850d 100644 GIT binary patch delta 527 zcmV+q0`UF31e^qr7=H)@0001;w}I>c0004VQb$4nuFf3k0000mP)t-sn9!i!00945 z04Y*ZIbwTagPi}I01yxm|K0!?IZDN(YX9z}dtxBw&1$TytoZo&y#l1x0004+NklSZ3>n~~oeTKw z=9>Zm`R(Q}1>?M{w-SuM;W`DLV|V`$bn@Oq z2m!p`FMr^#1wL2+{0`4C_7<@70H~ zag@&z@+gP%OMeA1#@5VBLAIDcV&8F_#ea$_pqvZx2VtrLvs~euAZNijC>%7rXBEtl zsn{LRr&Qqc_%nPHVC8v~CBR-o$0At^tbi45D*{*_&j)a*pw1v;6NC^u8n_9pf4l{} zOw9nkV~tf1jHkjht^5bTfxqm)!Ve3MsJOJE?WXVgPk*u~k2p=jS}PmhCy@FX7rx|T z4pKo6uACe{O}q$LvMv;v0{aZuo0g3^!6uim5UZoDSlsf{Rr!n|`H`UD`euY1I^5j?f1EgpaH#I=I R&;S4c00>D%PDHLkV1iOD>~sJC delta 559 zcmV+~0?_@O1iS>07=Hu<00013M{Ml?001yhOjJdf(4g1=0Qfin5I9gUXnAs=6vq=BL~uy_2Dw2xDpFj!<)ol%(to8}2FWNb7^x{;O2`MO zOIHQqqEicjJi8SF#?FO)h<=39m)J$`&d!1l5)OVp{_ovO6y;RMTpB+5VL?-k16(y! zqxPRbG#SKvmDGq_&~&A?6;z?4>bi!Q7jX!5kwYN+H-z$A{hI=0y)1t+>d zDA~4cnFX#px__XpXWj^jsQmCW6llkqBvx4fjw@+ zckIFQLKp+Y^uj74_(f3~WdNVJ4l4}%2Dj=;aS8BHuz#=k5p$u7e9C4WjA(L;M!||8 zS+gaeVT!)h#D>IU%N4xh#!SKQHn|2*$pGg>p(zlaAy%r8Wh+Q1ZSY*l;(<~I9~KZL z^im*{2lyKMFkS)7L_$&NhX)Mct1aPGwqE9ACURlH*gd?lfvm-vZP*=Sa=~YFKV@t# xw_Bo5qi`D=C|Nq6s#sB7uYEl6I=8Mg}VgLXDD8((_000ISNklC)OT3`|fIkq~(Q$E_}3iH}fb`lFu0@X_pAl5JU9rhlnE=EnDT$NYfb2$sih zCd`lJXM&~X!+e)^i39~?zUA0#1}MR7!E_e>`bKDF7A2S!uMi7J%dZ;2B7@-uv5-cy zh6Ib@mtcnxDBDc}8({B~hSaRNwYE+GxFSRY+?+cGxU0CzK!Dt)`vj<9p>PkrAfV?g zc%m&Z%n>f39Dh5r}e zFL?Q9W>^Ek2>)EOfm<+PrNq!Bkf{LFXo1Bh8dK3@rF+xYPASl}l)8wK3|s1hLHo{V?A6M*Iu3=yi} z)p1@nz|4FJj3wo5lXX=VkcV;tOVRvD2)xG5;b^Ilb4#!RqHPL}brfug&S~8D;K!CgGV&4N2~V0VblI`y029b|;@6R14{xwML42tBpo
X?*iEic zUc)aqU{}1xfh#+(Fnl3yp}7E7rOL)kVYp=oSP(P}R$hf#K=#yq0$B;rt3C8;wz0<^ z>|g{tNPVUZXw%0H-Sq@zD~SQS^?$&J?#U?%IkTRvo+Ui>EJna~yc2`%YCBqeQ4Bte zw;(10+ts|K9z#Kh50Y5`ju(O;gtW@Ll3-W!IR?=HEgiM3x^c2TU<6xc!0OFAH(nzd zfm?WA#2`Z$o(%uQ#>HC@WC7$7iQE7*1t6$oEj)60t5>X*cn~CjC?Rx30Dp-!ofLpV zL%^;GU=6SqXNFD0=!pQA2Dl8Le$x{HE)6h1*8dwGGZEkt!Ak?2uE>bD&rla3Dh+T!klWKJ^3M%$ z?m-~}KtshTOE)Y+P>2A{B7ZCUTDDVRKqdlkN*rC3Q4q=)k_a#)z!DllA4P!CuMAo1 z{XB6fPyEfHk1w15sOt)k{CdzyNJD}Zq-SrZBY)~BJUEiLJ0QS}AcN<O=5r*nCf}9fZ6b)d!z{ z*!`cigIp$sv3yX`4!qs>ZoKb7OFPJ`5$Na#W9?uH8*Qx$2xIMFiuyxKKp1ET(S)A_ e1o$rngg>kOVw3#6JA5D*aXP*@0PkU-Gr zD44j2==k{f_`txx__%O@SOECoh{(8L0002WpEgkd00tXLL_t(og{_ypZsSG}$0;zv zwWjPBIL8k_V=U4%&H-#O{UP*{x*(|tt`3Nc3kYiOf@^}nHh+7;2$WVxf^*UxQYE!r zL`ri=C%JJe=ovDzONk$%bxqc`ENlLpncbb;`B~HQ(a=6JTINRtr(2utjlGWwI{EuL z?I$G2EUk4xLug|s(G0Yl;2&V9&K6fl{@b!2$B}XAtQh(3{XD@!94rVyWMK`Sq^k_Dn z%qE$jm$DElo7J8z2MVGK-o5ZDieqKIpUWhp)aOxIp_Af%v9RTIqYKvOVI_@!7C1mC z58X7W3Zw!=pH?b9Ow-gV3z|&x0E83>amc!<^}J}u4_J@cf+F+;upsidS$v#FJPMLn z3PhZySATvng=Qaj5FiPJEhAX$b^1fWLDLU$^Wgj|M}Ndo=L0Mv9bxAZcEK{xP1qg4j;n!Vx^gEskfmW2$|hwk+`y0cUxH!z&Sp z$$wPVwiN~9^_306PV)27#LW`NO99rTAOY=QHgpoam4bzxi1bR>Hi&{i3s4Z_@x$V` zW2zo{UhRn*xT!*XMyF$LOW#tE@4BW-hx5f^eAgCnkYF5jtoK%ju zM|Ba)>Xp$eW;`3RFii;L^M&-4JrJt2v41cDOdTVX96Wh5Oz6<9vO+&4g)6oxdps$Mg{~QT>MZb*4 z7yxgggzVTEjare_^Lwu}WA~)7v%6a>z+!*i*maFoZR5p>al8$`kWI0sbK^K-j(>$c zkJa~Gba1mjyrv^}_J{)=z6I=T0Ic2tPBS(Piy!@IojtY^fnjX_^3C6av(u+Wt>DNo zoNL~O$aO!h6?ldLc+Uoyrdhk<_CCg-8;ouRqh>KtunpnNqK4PlU0=-R2nD0_*#{mW zZ_#Qu%DFag_6>M;;R%WpehBKk&OALa0R^c`MVH=a2sQwHC3Irh%3-@U-@QznG3CIH8?#RCBXL&Av4gwSNYXT%2&wonAY%7lPtB7cZc0XFr2 zhPSySgcSf}-5LA0>i-FNk`PuoEW5KU0!bKn8xkR`BCNWz0th0AG9j$GbC#i~62h`O z$Fd(%1SSa~--WC@n|kIz5kkI9tL~f$l%rxNSaxSiv4bRput-7Kh36@OA_TK|iK+K2 zR9vbELEEVwVPYi}LK4E7fPeAjP=rwZ7en>-OC>=n3wP{sSjn WM9kuFe69ch002ovP6b4+LSTXffg)P~ diff --git a/graphics/pokemon/feraligatr/front.png b/graphics/pokemon/feraligatr/front.png index dda82ea749535a0385fb313f01d0f1d50abfe8b3..ed0e53f63ec55d212dbe773d435257c93dca9bb8 100644 GIT binary patch delta 972 zcmV;-12g>32i6CW7=H)@0001;w}I>c0004VQb$4nuFf3k0000mP)t-sn9!hu00{q! zgAfo9_EK6YN{d>w_Bo5qi`D=C|Nq6s#sB7uYEl6I=8Mg}VgLXDD8((_000A2NklEr&)+Nz z&+%u#*c-!e7dsZfPBPpY*x&{XFnE|jk*{w=tGyUtFuh4UkfU++0HZdMyTl_cwk`pq z>&NWF0Yv;PBum!9xP6@PqwKW?cb3t^0*sI^~wSNgw^}a#Q2&iId;C5c6f8xAB zjuGoSH-Ncypg}TS0SZFp#Q-xfd&4P!Y(Hq)DlY)Ng^s`gbfTVZx>&;g&;u3#(V+p~ zb9NCkF)F~ipK}0xy`@XBVp$Q4#sHLh5`cCNUum41*P|flzGQNJ2f#_bUns)zCeM|6 zfKny&{(l?5DaqztXs3VZ-q^|Gmo9)nOEn+*0Kn=A<%BwV8@NmxsIjlXcu`JC=hZ0C zhgyJ_Xn7#`JqmWG_8?Xv1oPk+NQ583x77Bdg3d0KfkHueF_;KmKFBZ~p*S>@nV=gZ|_I00006JA5D*aXP*@0PkU-Gr zD44j2==k{f_`txx__%O@SOECoh{(8L0002WpEgkd00UY{L_t(YiG`HGZrer>hF4$( zUu`u{5cmNYj7eGrTtLz09)MX=DbN$Kqa1Q0s7Zoeioh}Nf`1V(S0jfu#~`tp_KuIy)Y zdk+kZlUN_}%YW!tkM{xN1TprVtNlQNF`};??*|Tke}Z%wV%8H~AO3h7NbIL7M0}); zd8QwATo{!Y%>Vk#Sy+RZ>62ZcU-G{QpTF=E69GEsFe%a5^MD^y{+@IJi-0z(%uJn3g7kPO*a3cVobw z=?YWs@)=A@^H5*XvVNw=dz!5+*IjQ`#EX!~g z=o=LSkOPQL&7=&Uwsro)Oie@*VM<_98>8P|juvfNh23z2uvVSI1(R1Z(bS|iAfXm>@ zttVfA3};qSinkFUDx$yzP>S1rc$v(m2zd?k*w1ht8J1(#jb#AXMJDdtjUYg32ms`? z5MN++RSoBJa>p?61@L}Jq24a%R=&$%p3MPe#DCOa?Cue`s*~Y%Ps(?)MbR+_z7dXn zUhMh10KQzgjZ(m43{7)Ngyez^CUmQLRQ zc~t1u2%d6@^VQdd^nM~GE8>FSSrg&(f>OF(y50_LO0O;=pr~l(qtC^nv+n@+BncoD z+<%xSz;6y%M+KD^6h%NSK&1@iJbv8#Q7+vh>+71-#ziIiS*GJAa=snVR9$(_;mvxz z_&cCHEjSJppxP!~0gHt!raYp&=!|$QeUZEFb}2^$d)c|HpOsH(WVC%#B1ZM%@b?U)hS4{xs2|C?7q n1$O~z=ns9k3-Gqhe4qUX0KTXU?VT3;00000NkvXXu0mjfxOB~f diff --git a/graphics/pokemon/feraligatr/normal.pal b/graphics/pokemon/feraligatr/normal.pal index 166ae9add..3322ac24e 100644 --- a/graphics/pokemon/feraligatr/normal.pal +++ b/graphics/pokemon/feraligatr/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -128 0 8 -248 136 128 +131 0 8 +255 139 131 16 16 16 -240 80 88 -8 104 144 -64 208 232 -40 152 184 -136 232 248 -248 248 248 -192 192 192 -248 184 112 -128 88 0 -248 224 136 -200 184 96 +246 82 90 +41 74 139 +90 180 246 +57 139 205 +139 213 255 +255 255 255 +197 197 197 +255 230 139 +106 82 0 +255 230 139 +205 189 98 0 0 0 diff --git a/graphics/pokemon/flaaffy/anim_front.png b/graphics/pokemon/flaaffy/anim_front.png index 0cc7d0439e647ec2a552f3c86ae2cdf1ab2bdb12..c09ccf4922e56a2824ee152d9e0f8af917cbc624 100644 GIT binary patch delta 1118 zcmV-k1fl!o2e#_R_~000B!Nkl0|T)LNqDiPqbXfN$3EwzlKW0PCX2MwD}Dtp(pfxC#F#V2Rus2qkBB0-EU;{%H**DeNl24p3_=!py;W zmTx5001bM*6q5HS21}u$dP5)f=iq+7{{~1&niik+P$rA*Qn|;+XL=xL z>f`->OrZD{T7q>A_Xn2nIH-sSk9+8q5O#og01z#H_nz2+r6laynCL3H1W7N3{}f#+y`r7nzF#_uidrA*Ld(rDp05SmQE~ZjTT^BGwSONeiFE*)F7mmc&1hjgN z%e^R}Z{7+J&$j_7G!bP;8TvCXz&-_&*u`io(Gs`-H$60_;kg!{9R%#jlkfZkn!`j3&jAI}_BJ}=vc>giW z@PsxZ=!RwnZbBKY!PfUX2MBHHh}FhBEfdtEKbZvbSm&)tgncF3$w)5uz5;$2-5InL zk`u7@cmP!N+u1iiK!4L_qp8hVMt6`s1B@(cSf{>0ulC;q0HG+Mw>Ikk$!Gs9h0z&l zdw&W0Pd@XVWoyv`O6Z>-z*h{1fVUajz~m{S28AG|Ht+uC-cRXM>My~nzcR|&TX&Eg zgctih5^$wJ={1Ew`vJrWeTZ)<;C;HXf{@l4TmdB0j}kh2RgQD)Vb1^q?Qq1@)ayL%q)9afOmGj%kSLjrI1eYkfulX^7pt#}>{<gqvL~?!}4dtZH6l(YXwGDs{X!XJTJRHiEH~(Mz45dqlCp{d>X$pJ)KUeHO zzr2-)L%GfWE1+I*->S8dFqe8o5BonSKG)nkbYW`v5`g3SMYa)yKY?9|_51348DAsE k^pXCyn`VCF8~<1Q2T9^E{+*&yz5oCK07*qoM6N<$fLD%daJ2vfKQ1l%s7Z7<*=^x++PkJA}cRwEQ`_;6Y$j934kK~E1Y32%OlMvG+ z_UCAU1|gdOmGKS@+a`om&<-}KR7itVupR(ZE5s&F4eQ{z#BNlG<9(q7)}g&a${w*W zKyCscVp~lmpnqQj`*cqUJn)F^LEhSbi~t>4ehyW(jsx{R_0H}-8+sm`asdE96Bnn;E9sSp>*Z>H5$Z&TZziE}?ZI4PYrzo$($pEFrN0T|s-)LNW#nb%tVA|N0j&*lH>JFg2sNdgxc zV7yVx)qk^VfHO8bJu2kktgeB#hde=nLiFPeqgrciKU*Kq-d&`FJ4C zlcC>Mj9uwuAUgoW17EQM&4|J%;xL#oM<%~_0vq^R0u%LIPvd#W-$4gnJj84foX;7H zVxAx$hIYsUO%FLAB6*$4^M~tHoIwUKIc2)Pi+^><;uhIonb$P7y1-4`#Q%=9+iT{k zyhZApWQBiNBcu-RXc;9yyqf@2Z44-N!&6y-U?t!U<5l@sy9h7>qMGW3`oky*cwl~( z7KLH}=<365VpkCLm%y(NBd=*;z(Br&(R1b_fDy}wG)|8BW3@ea!u#?CJmX?V4fwO} zC4W5BXYEtO9^9HG@I3LL-Eolz;z_C{TR!R^v^faHJ+sC<%&TpG%1jXdh58p`-D(i0 zZqYh&4w{$gE{MOWUPN^PSQNP}FVk*XrfN^RzPYdubbCt;NF&&gYrp}=O4o=zwfCht zp9XN7BI!{; z-KF{;b9eXb>9XN7qF8N8jcQU+?5a6obKt`CG^`xU-z$n?_Q%B~>tC z*^TB5pAn7U0RZ*@`!GV@XRH^a>aQJkgO%#9>35*Ez5=)}ziV(9sJdrMf6&I}VG-Zm iU7gq1M+)48I{pQvJDnI^wD)2F0000l diff --git a/graphics/pokemon/flaaffy/front.png b/graphics/pokemon/flaaffy/front.png index 373ff986f2920767332d5f33faeb46faacda9b0b..6bb2dc324a7812b07301a045d9643e3495c7925d 100644 GIT binary patch delta 642 zcmV-|0)73R1&;-g7=H)@0001;w}I>c0004VQb$4nuFf3k0000mP)t-sn9!iTz19E! z|ATXj-sbiY5D-dATHZlo|D>e#_R_~0006FNklQx z1v0%7wCn@o`f>nr2Zaf$E2lo^C?I8*f_`Q90ztw70RMJW0SxL@;^J~Z3X})|dgm4c zfIXvtF@syBR7xNQdJ%*#R+H^ zc1o`RetXc{rvj=1<_;4zYPSYDNLx_AguWAFA3vIdACQ&RhCV ceQKiq0gDzG8R2J%H2?qr07*qoM6N<$g38n-ApigX delta 657 zcmV;C0&e|}1)T+u7=Hu<00013M{Ml?001yhOjJdf(4ere(D?ZHfN+S&*zgb#5J*T^ z&|rA@u*mp`nE1%hh#)XPaHvp#z<|K`C_sqUe+KCQ00JmUL_t(YiS3iIZqrZ{hA*m2 z1}g$L;Q@SXb|7w~j@UO@SU}W31Y2n$X5<9Zk)d`rR0VUI4SxwKxhzE}kdP-}?Vgd5 z!V@6QO$burd&3L#$dmss=RfE84`Ua#UYD-^M+ciRYXh_mU|C?_&^GV^wh1cf9empc z07vU!gX4e?j?ROCTMpRZ?&uuc3fR5_u6I`nY>~YSB@fCvKrTTL*yTV87)zkeYf9jO z2ewCgx&BlGw10W&6?M7xEK=`jw0FCr0&YW8)kCt!*M&$c%@|7>zvLd`9)|Y(ot&ou!47WX(!S^P2kzPiJR!hbX`H@H0q&Q^i1;`I`!9m_Eyg}|H~YCu89aE-gK#9|B6fwNu5=&>qo!g4W+rixAO$l; zP4ZtH(E^VoFjD7woK9o>LJpWe;$jHIX&5FcW|}_++sB9*F=9`n8(iL>KBwXa3m}v! rGn%_Phech6`bM3xaC3u;($pV7?8{b$%JOpn015yANkvXXu0mjfj*u*Z diff --git a/graphics/pokemon/flaaffy/normal.pal b/graphics/pokemon/flaaffy/normal.pal index 9b6781342..5dd45e400 100644 --- a/graphics/pokemon/flaaffy/normal.pal +++ b/graphics/pokemon/flaaffy/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -176 176 208 -248 248 248 -128 112 136 -200 216 240 +189 189 213 +255 255 255 +131 115 139 +222 230 246 16 16 16 -72 72 88 -208 96 120 -248 176 200 -248 136 152 -248 200 208 -136 32 48 -64 112 168 -80 128 192 -128 192 248 -40 64 136 +74 74 90 +222 65 98 +255 164 164 +255 115 115 +255 189 189 +164 0 16 +82 131 197 +82 131 197 +131 197 255 +41 65 139 diff --git a/graphics/pokemon/furret/anim_front.png b/graphics/pokemon/furret/anim_front.png index bd0119c5684b6bc8201f0e1f0d8236bd14e8bba2..6e84d7410355a84dcc717919a421f2c1366a4539 100644 GIT binary patch delta 1115 zcmV-h1f=_-2;>Nm7=H)@0001tU!Pb20004VQb$4nuFf3k0000mP)t-sn9!h7DIn&> zN_#;$ARsBloI(HYl$>Hptb-~4|Hc3R|8sM5oB#m-lwx>5H~;_u`8TpK000BxNkl2^#<@wJ%;9e zN@)+-09cI};|>6b3LqsSmT&0=kO?9uM5Mi#1Xh7qk|(h}y*d#5pM5<8T$nBG=?`f2 zu&Y0^9wm4Zj9vXfk!baaWHBM)F(BXyK)Q4=mO)_e!eR_8XaE-0Ai()c!!bMq z6#ZThz_uJw1%M9F-BdlmPrvXYfPMm?0}ba#eGDdmqJL-euR*^QtMJ?b@^^d?0E8Qa z4Defo&F+M#TP%lQ4yg40#8*o6(>;@h1SqOP;zJB|9zp@|=theX&;i900VF$*^AKi- zJMeH@|K$ZSQ3XhRVGp+hVCR6os3s(zAWoFVQN-SXd>^ru>78yS)J!B^LeV4%696X^ zLO69EwSUTRvJwrDFMtAQ2{;EB0n2Pq#GIYDe4#G@zRH3>wzj%nH45@Y1K9J1-UyWo zE#gs<6L_whae_^n&PZZ+qL@{wMqC#?-c+zJCpvW$SATZ7uPAfcB_1^j6W7QbKOv zX>0A$_p!!SzAItYngbGd`@fcCEtFDXly-9Y1{XR}tPs<*m6LAK^APH+kV*+s632m_ z(3${kc|%~y|5-K+^;R17>B#JaCF(^~_pEso$L*P!0ln)rWL-%<1$*85sB2X5*^ z{eN8BQs{lLTSABvfHr8n^jQM>yxyx?4dAf1r~N9ttxU?;v=|(@5UL`n|Cxyg>okSX0d6J% z#DP*I%F^{O@l&TC0$d+$Nr9P+=n3FFZGYlfHs`WEJ_A(0f36Atq_Nw*#8+Rd_lJu- z-dA9`gK!RDs2>67z6J4AU$r0_2QJ;LF~Caa-hoR$Y*K?l-GL}W!CpTpVj&mrEdX2j zysM}LjYSy?m5yBQBuujm2;P9`)>GYzm;nxLAe0`8qI4^JBVzquZqh)o_JMaI6jT8A z4jwgQfOKbRD?$J|FV;-3EwjvxKyP^Rfaq~4fFmEBYk*uJxq~6!r$FU=(KjoA<#3Q+ hpv~y^vb%rZ{sR3!Ix!Iq>}3D|002ovPDHLkV1jig`6~bb delta 1049 zcmV+!1m^qX2%-p(7=Hu<00005GLG0)Pe&(WvoYZOJ10DoQFJCbrFT8uljK#?1y zAorPfCsKF6isFAXe!`u7wmfuXoLSI<1ZHI6v91ZGAN2tV}YRiEMRp5_qKD}9Prcu{Cb9L5m#RT z;3opPDy}{vuz#_jb3pmDUm?^n1#AZm#V`@jX`Lnl!xB2Jv!Z_z&|Cn9G`pk>1__YX>4C!- zNcMB3owFWTMPQu(bP#V}0qV;D9s&Z`kV8Ms(cvD!Cx7~@8J<)E(EeZyR*PXb4kK*tcn;6+%V4b#&Y2#_By(yZVU0lFXWC#L3{UqzZH?Vd2i^yD)^Pm&;Q zHqHaj?c_vMIz+JAZTcPo{dkj8WzA|O*h-334d zze#{%seg7XY^T?YSrgW+OhBoRk*o@2=4Sv2?Pcl~A_D4u)y$ghi=W3HE99kZ@Cd$WIS ze=4}LR$m1A*Zqq)JuU)_XOgW0z^g>_mHY%Ke1AvzRP(XJ!bZNNPPgTW=3{y_@J@Ro z(R|e&G!O03(qxfILoS;RL>NTnN*f$*a=L(p2AVL3*yk|2R7om`@TsS&uvHgpa+i3+53b&CxOKMc>mw(zuI<3sb&dG>?uZ`*H9j}q@| T4b;md00000NkvXXu0mjfd>+=u diff --git a/graphics/pokemon/furret/front.png b/graphics/pokemon/furret/front.png index bab4d95b6bcba4c421d01f93c445ed66ca1bffa7..4d7361e08b3487221742f694e1f356894eb4e869 100644 GIT binary patch delta 645 zcmV;00($-W1d;`i7=H)@0001;w}I>c0004VQb$4nuFf3k0000mP)t-sn9!h7DIn&> zN_#;$ARsBloI(HYl$>Hptb-~4|Hc3R|8sM5oB#m-lwx>5H~;_u`8TpK0006INklYXKXJVPTxiBI{Q;vMqWZ)1 zsL9i0MD+({s-+W?M1%n(vLa_0;Tr@NS<&B>5U&B>sd~>h0|cwUHv=G3%|Z}B5&}TB z945^|EC!ht9)AxbU@C--3ow*g{iYAn2U5Zk#15c7A4ENYngjZ_O9H6dvV2a!Xge3Q zSVG8nEC{#*P+2;dTM#(Au!%tg1K`PrT_M3|T)7Yi%r0z_0Ow507+wQ3eJlx3w;WLi zfC(_&R5QR&zw{=6egaSeP3K>84lV#qFXo@YycE0ie18S7Z#)P9!T`Ylev63JJ0X`X zW+}J^bb24jm6H8*H`0;-P1Q(ph+(NiY5<9DwHN^%&^%E9*YnsyxH{ZH!X5qB2O?7k zV7aiD+W~NLpgf8uu@^`hrF9l@cEIimnuH60G!#lWb)L1(@M0xa zfL#C$Fn$v78c+$?szDj8J8}6&-vDxzB_EEqyIxBc^ur3M2`WEZ-xt>OBa@htLY|>OBJE`_Pz*pOF fLEtw;f73nzN0}cF3JCJ*00000NkvXXu0mjfW`Pj; delta 621 zcmV-z0+Rib1^NV#7=Hu<00013M{Ml?001yhOjJdf(4bH#AkeUActAKHASl3?K;jtRJDz5ig96o0ULw%;WSq_9^x?N+}8S;(yLac3CS{b1ZZYQpo>V z^N&W75dUMy8+x&i^J>VDBQX4^56eL1f{r!ZWdOWq-Ky7&hYqFOb%>Z*pg`B5COx-6 z;V{Pc9MDC5m(j&15|zT&i~}J`Lj{6yS-_hbUVM)aIpEv_{JKE4h}Aa$_(?#niq%&F zS`Q`%l;^{i5P#R_HnN1zZv^b0np2__as?w_a(@(+n!0gJ0lsgtLRAB2=@WpD zA*G=~dEkbbc@6?tr=hW1cxJ%3kNqTTh+&n+o(-NU#r)(Kig%JBV_OWsrJJ3IwTT(L z!PYqf%xRd_xgIStGz>f@w{xwdg-~sXq??8A0zj8y1ez4kPZ3a2w+SFN`jIQaUIoIc z;{woVt!C8}>7gYPN)gbF`WKPLhCX(Gi01kYDk#TZb6C>#!uud&ju?xNn6%10Y@)vW zz)02FhKa#mdyGCVs(v9IUAqj3i)&8uPV9! zRiR`K3H0)tj{)1ir^EZtGG^Znf?nSsOKSb-0ciifumanpt5^M+P*(y5 zz%coF_B2IRmVY36VUlr10)ldYE1yci*kwWi2$0kSQxm|}=tA_U!28@pt-zKhh$HR4 z_ana2JesO8h|>jNoF-rqs@<9D099PXT25?1=|p1tCVRL+AuMT5q+~;gU=?B?y4zFR zh|hNP8VOrJ@zJO_Qz zlrRjQu&ME(f)lo|`Nx299K9c^y1()x_8AX9wng~+j6-qMvwfT&EddX@KeUOD zJASs5fPXpg>FMe{UsqRGSJ!`5r}y7L?-9O-Exk9ux3PAG?`k{H%cQ&Oh)dP%t^SBf zF2i?q0w3YKmfjP5ds^YUj@}b|D?2yA_mJQ_qVEddHT0g~8{oTz?*j5&ZfI?SZ?Cth zRq)M;>)2)Zo~CgN-;^)%eo8sR)w<;K%R8PPWfEX1@>?}D!9eT?v({YUmL{1*WB|2ujw;rAHvj^2y8=LdRs zmTR!-h2EVWZsq=;>Ak}Lj^5i7Tm!cr=v^AnbES724}jQ@Sm>Yzdm>T@9O#!`Ud;wB<5O)!!7^-002ovPDHLkV1gMfl@tH~ delta 814 zcmV+}1JV4x2Dt{17=Hu<0000CaaRE(U15o%fNO3bDF=}IbK>VE(YMk<}a;iUszsur(7 z%3zc)0P=)X7H{1^Oh^$ESv!SKkfH4tsCxD_5#W1G#|rUVjP!f-p6>uZCghm^F?1gw zNB5wz%CFMH2OpqCd9OvqfTpRO+Y2BoxWGxaRMk*Gl27xd*+f@hM80F1D#g#Eoa&gL zX!!!`Pg*Ll0e>1)5Fjth(4v&4+Q@)(?QL9DoNC+t(aq0-ol3l4p1Bi+ z-?-udH|UR=kaKUq84e^Dt7Lak#79u&CbpopfDsXD(Qv600E~v0$PRd{(a^$Mx1ZUA z03vd4&ws9`_D>x6^@Cc!>1Du(1R?!^gFNP#gUeyqUy`HT{{6(6V#PEW`8F4c|SnzPhyj2^Qk9yF_2cq?=3F(w6AoZzInA_ zjVwg&<#r|1Vsdwep4=Ir*R}y@dvbTadU7|SOn+KiK!|CP$^F79a=9xV^Tigx%${Su z?H1p7a<75eD{S9H-EaX{S?tmVFn14&$(;>w#R@#WqX<_w?eEt=BR1_X=m~kWKV*eH zd9=TgEeL@P`wROm`-`(_e{ufWU%}1l*`Mk~6yWwR)llHy>`$Zsb9(j<%0Bx?_Sl~c s>?fH$8wL!xx4-RsJ%~n*uLlR5KM>zMugXjW8vpa!X*Z=?k diff --git a/graphics/pokemon/hoothoot/front.png b/graphics/pokemon/hoothoot/front.png index 0cc0353801b46a3b5561242631a2a2ff14160725..8a89546b76fc5104f8ef9e89c1e6ae87abc30359 100644 GIT binary patch delta 535 zcmV+y0_gp%1f&Fz7=H)@0001;w}I>c0004VQb$4nuFf3k0000mP)t-sn9!gQ5D-B@ zL7Zwab4nOeF#x@bLCvIlYB3nSS}FEoG48CC-o2dv=EeX2|9g9Tpp~1+0004^NklCzh!eG3SG30+VM zCj$NX<|APLdpcczRtS3s9WMs~eP!JM%rS}#1Sq2>X1zf=5TGDfi~knL)$NZODgged z8hib$NbLl_e*jB*{ip$KTJuvcfte%6EQB!JLtuez_U?7R6Z#@x01+lz7NfbS zGlKYyNzwuWKz|!R+ow`6c9{_X0I5X?J%Gr;8_|%!Y%8KC;8ubtdHu~2UUeQr*BC^- z0fIUKP3U$F-2hiDWCw^t&syQ%`wtN?igKW!6h{bHgo5xf`^gYtnvAfh@le4I+gSWF zAf;qBbyff1uK*kIZuSL-r7?s(7Ho>i_x7}`BY>42s~2&7;C&&yTE delta 544 zcmV+*0^j|l1g!*+7=Hu<00013M{Ml?001yhOjJdf(4Y_y5I{gcm}oF~SWr+f0Jw-i z$e?&=Fc`R4DDYq~=%|p`xS06h!1(z1czAfs1Wl6w000SaNLh0L01m_e01m_fl`9S# z0004_Nkl9G!P``k&<>CT&Wz>PUw8{JBfA?N1NvHac1;>CKJ3?i`o}u5D z1E9rNUyJd9rV-|j0>KGB2wxTqO$b7AT&J`yJi!xslTrfWeH7D8`UJ&0Q9s-u=mlt4 z5&&J6u>k<-dw)SdrgEba#W7Ti9}za4u?96~A`8yY6O-h;>o^WzjtdNBd^?{`&OK1) zf-0%?=ToER9l-@>7eIP*+q)#7#oJ}1t`d7N@D@o_b# zufN`IR=zW@4*TVdj$6N&IOtcctopbETjYr@8>F84ozCOVIhE704 iQj)p>iy1uCpVkk7jGD8Ert(Sv0000{#R#E(azP=6@=6%f(S;#=c91CcZk zFsbI^tq~*Mlv_%LHWmhilX%9D>2t0 z084~G_zEJk&_0n};>{77B)u@q_~1g5n4QBz6<9QgT@Zf|yn8z`4~kRBntk$BM>rP2 zJD5no1wgsC&UNG@Y|1s6LZMJ76bgkx;X9N8@xKiS+<%-G10tHj;vbw0h~R(xUj3^9 z5j+3IU4z4bh&vF3oBd=!#2pAHI1Grm1F;?U?7Ov*9^DYAo><7UPKKn)VqXv1BWK*a1Ra#A-2(C8%5SZm`D2w zi5Eq86E8z3XF!m+_aGw4>wh&6^7g@IAe4PjC=`ARpAUu(_XF!iga7~l07*qoM6N<$ Ef|bSY7ytkO delta 540 zcmV+%0^|L|1gQj&7=Hu<00002v5kR0lMNbKJzy{^LR+*Oy378-P9A ztf1892I*HvgW0*?n^ng$;@WL=V2AAcTIKq!X%mA_Ug&o@nDp337={D52dXOvQ8j!Vo6cNDXl(+cD3Ofpml?3o!ts zc~s1h!ph3Z>YvLR3>l}b!9b6KUJV8|vs}0u49p&6m47lAa`Yi{b5JXTQBlmJ3~FUC zwg<$cxU)+6hX$DIYkWVCgIQIbA<-5wmt&buih2uaqTR+EZsJ-XEpEV63%ILm_z9-^ zcJV797}sAJSNs|b#G;T)D1(9<2q$a}2DX5l{_7^}8K!%$WKWrC`t!WIMlFuYu_PVS eyRovmrxhPoRDa+x@;0gf0000c0004VQb$4nuFf3k0000mP)t-sn9!h{7*hYu z)&H!$v{G{r5D?~roaQMIivR%s|Np%J0E++s000000000000000yUrHY0003MNkl*K?8 zWR4Rsn83MD@qc{;=k#<8ny^Ue!5iU)CR|rIehwBt+~*uhfVD={am0HWNT~o!?*bx9 z`-HgpW2$tM{6<**;zGkBKJBFroEa=`sy_&GdT(_el!>sb`sS-nI~QS2uu;Gaz~pmu nGeZd?(#`qQipqJ6&|dTL2QHP7Zop0o9)GX1Sfd+wgGo7W-9TU_0MUI+ z7V@!PAX4*AajFv$Y>OR^BB#mpSa0YD!?f*Ddg{Th(~-x4g&5f&9)MjxmG)T7nsrNm XX?Z{X9*zp)00000NkvXXu0mjf=U=5( diff --git a/graphics/pokemon/igglybuff/normal.pal b/graphics/pokemon/igglybuff/normal.pal index 4bf00fcd7..c0e93f53e 100644 --- a/graphics/pokemon/igglybuff/normal.pal +++ b/graphics/pokemon/igglybuff/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -136 64 64 -248 200 208 -248 168 184 -200 104 96 +156 24 82 +255 205 213 +255 172 189 +180 82 115 16 16 16 -240 120 144 -224 40 16 -136 0 0 -248 248 248 -184 0 0 -128 0 0 +230 131 156 +230 41 16 +139 0 0 +255 255 255 +189 0 0 +139 0 0 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/lanturn/anim_front.png b/graphics/pokemon/lanturn/anim_front.png index 69166b66bc60f5aa0d7fbb583dadc1ea8ef7b994..b84c0a77fdddfbcb6fc80656a46ec76950d80724 100644 GIT binary patch delta 1088 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 KMNUMnLSTaB6G+7X diff --git a/graphics/pokemon/lanturn/normal.pal b/graphics/pokemon/lanturn/normal.pal index 792d90f29..377916306 100644 --- a/graphics/pokemon/lanturn/normal.pal +++ b/graphics/pokemon/lanturn/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 120 88 -248 216 96 -224 184 48 -88 112 192 -144 160 224 -176 136 32 -48 56 96 -120 152 216 -16 16 16 -248 248 248 -80 64 40 -184 192 232 -160 48 72 -232 96 88 -168 0 0 +123 98 74 +255 222 98 +230 180 82 +74 123 205 +123 172 238 +172 148 65 +41 49 115 +98 148 230 +0 0 0 +255 255 255 +65 49 16 +164 205 255 +164 49 74 +238 98 90 +164 49 74 diff --git a/graphics/pokemon/ledian/anim_front.png b/graphics/pokemon/ledian/anim_front.png index 57d90f93be59369c6608ef99074290869be8bce3..c866d2769f9d5680379729ddbdd52bf46e4c73cb 100644 GIT binary patch delta 1319 zcmV+?1=#wF3a$!}7=H)@0001tU!Pb20004VQb$4nuFf3k0000mP)t-sn9!gQ5D-#Q zQpGu1|AT{bAQ1mbK>!e1`1tq$YTmT8w4{3g&9pi8=5y86)lg7SN$_JA000E6Nklyn!=422_Wg~5h>|HrM4Bna7V42J2C&cxGcvm4HbY=6s_qdp#=_D>tpO?kQn zptRHX$3lDkg;-Rcwzs~-a!r2)a8n<0X5O>T16;!V^#vA5FTiI_2jpo|MCLvK(=<7NCvBPf^tJ|n1qj-)UK3aBBVhO(~o0P0-1K6D+x2YrC<;k}{ehkiJ77QdvPu0EpCD0l+Vc1;=k!C)qQ_P6PdCS?aQgugyef z09c9o4Ef<^dL`J89#ztDsSUkt>Gb_w@W#+DP9p=;w|#!EPv73~^a@xo6*eZtzDw`r z3h)RJ!+)mNPUuXW1X#L(K)(PYx)ysd^(nz13Tr++IY&&D=@Z9A3qqKMgG`<+DvdHaYE zwx)#VMVFt1<}%s?l<))4T*3PmkMGYi`s+7m2-g7*`s*;IKEQU>eI?wrKlk*X_GzDX zvE5#KH)|KSiyv1i4rc&o+=36@uX@3$ceF7^*Zp?-@;bPU6Yg;b7+#Ep$rX73SVMoB zUVnM&;bZ25E(Cygu30vHSdSAu;MMeQ1ljbpeLIQ(Q1{quzxEpDz~s1c90Pb)IoSbl zOS9Woy9WV?%13tB4Z{+bztX;A(gqmFZ0ne_1N8N7#o8Bb5ai1<#+<+Uc6NYY5KB6| zs%u+2pr&>-NZ-4S3z#!5QfaO_!QGh#llGU-L0|1P_B>;K# zV>0V*04Gp;76c2%iXVPCMe!h;b4C)8xvn-~fV&*imP6U}2B^twV|xUoy1~sGVPLCfmB!-glMyJh5241ZRF zLHz>nPnZ(?ZI^dT$>w^9UbE{hyWyDps_7Zowj5^A+$Ea@M=3-t42WW;(JBZHfSO;t z0wbpVu21L6>=l4?;8`BAaLt?Sy{}N%&vZs#JpLzOk*H7~nwAtrn0*1l+^3GfsT;dy zO4Kl@yaF%?CoT>?OuD^duOrKDwbU*dJ%D&`9)rZe^x-3 z^FcOX4TDhqRO$lwF07j%RS%*v^|&{;>3-IsqJ|lG^n^g3PGz<6adqhclvV$7;pwn{ zUJ-lz{6Crw`?qG@ohzS}f#otFHb&H9uf5(97j=V+u319g>DyljHvtd&r68Emji6I| d$fy1P?GN%qIe)C}HoO1;002ovPDHLkV1jaSZ(aZZ delta 1283 zcmV+e1^oK13X2Mm7=Hu<0000m=G(!N^b5#8pQZ0hO^U$$?D*f<(YBtswV_o5&OcxI;Vx>SaI$D!ZNsKwp*u)o0!dpwus|QS-bP z^-Vy-^Ck^SOMh$VxH%bZ0;qf7(+$9g8nOV&lmI6QaClM%Xm2Sr=<(~Hs9OSr_zZM* zS`IwH^3&Pra#{u~4=6o8pUp@K;GQG!_4%?!iqD&PPd@>}VXhauo_~>+5UxJ-yl;mJ zF!09_p_I&oa0lKIzOX`!deCYS65k0?_k8G_HL@MoX@8RiQ7rePkw0#B*x4v^?D~YU zc?*PS-PFlAVj(+wmytkV;j{$oT|mDpBDPp9TBA%2lPwl|wrv?e#v)p=4sT^^n5#|* zoQDPsFRvobok0ANIaM>{ferkN5AleCVdeoXz7J5WlxA z-~bO+_J4})tk>(m0tv)W=bW$C57|!cpu#%93UPc(UKIe^oVC~R5kS55egE&Ur+2bOiZ5qv8=(DjX|)m{8O4th z+l;Anod3T*pSAT6x5baG`9v$t1$jWv+XehPn&_jPuW7i6Gd8sdeQ=bs&J>`ji42bX zp??ZUdE?RebozxmgU_z(A%n&d-Y~EHzIl#a}{o~Umsddp47hfrZ z7ztV7@D#1T+nh6=11d1J8}x8CtGQ#7*?+vP0^KCx9KK#65Xq^m0K^;7Ne#V!`Nka! zlLyLM=tuq&I&IMD`BFqFumPR%w$~@U_PV1uN@a%y+_v@-=OtiqM+NYyOb*iA<9-jl zH4Ib%<^b3UaEloozalEIaMFMg$D&uuUsG*`5d_kFAo{NQ|I&G#uD}MYZSy* z(}Bv)eJj3}VT=}pPH7`HfROGTO?*kA>+G=5Xo*X_S0w;`n}ho+adqPsJ0G@UZdJ6s z-`#4X5YVt!f&8UYEwM&zHOKy^lc?AlO%!u;3c<-$Tr=XU@A002ovPDHLkV1o5|S$6;c diff --git a/graphics/pokemon/ledian/front.png b/graphics/pokemon/ledian/front.png index a51f2884e99b8fa29062792c998c641d05ceb518..cf066921cb6d1d2b0182c28a8aaba57fd342482f 100644 GIT binary patch delta 726 zcmV;{0xA9A1>yye7=H)@0001;w}I>c0004VQb$4nuFf3k0000mP)t-sn9!gQ5D-#Q zQpGu1|AT{bAQ1mbK>!e1`1tq$YTmT8w4{3g&9pi8=5y86)lg7SN$_JA0007DNkl77cFMkTQ#4bqN21VjE0n@g*fHy>R4%!GpE#c;yh_ zQY&t18L;9iklq@)wNr&e(MLd~ioChCrhHXiFNB<3G2tWSoC^%C9eCB2LSB?1fI=n) zF+S%20~uTEPQt9yf>;eyCk7XkP?W}0_FW%|##g&iEPp+Do&psehCzD>b~xb2`D&K} z9McpC_rM@vMI)#{WZ!oc=oiJ3($pmzk?i5NqExET+F{pnc+ ztjj*(?U7FRd(k^~zPXJ|On3YIoDX*o9eoIzZiTH$v1{Qu4uNN&IXrkw0z2`hz{*Vx z^n;*hH-9sb?RBPc33L(21wFf00xhI43i=ihX_3=ha8x1cAcJv&Trwg_IZ1-GH< z0@RJLy>xX!o<85aV1sQpI??-C*N{|g{8WIEa+LBzfR8Lz<;ItZzz$Op>hD%=AnOG$ z@)!I~jWWk5f5b6m>V)zE88P6rUdv!WJ-mzUcC&VcJHc0EYhr z(+(b^4k+6pa1{> delta 724 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 diff --git a/graphics/pokemon/ledyba/front.png b/graphics/pokemon/ledyba/front.png index 10e52bbc70c46ac677f73c31c836c7a0de690b4d..a34bf944a9993029d172aedde4bcec4a87bf95dc 100644 GIT binary patch delta 662 zcmV;H0%`rL1)>Fz7=H)@0001;w}I>c0004VQb$4nuFf3k0000mP)t-sn9!gQ5D;2Y zQfes}v_UcUS{VPFAl1#y|NsB2q@>lfd;jK~|Np(DdjM);v`R5^CHT6E0006YNklu&5I41{B2mdkF!`@iiOn}ki(iV#-k-&(yYoiFxyK!079Z+)vglWAg9cmUJ;vbKP_g>r-K)mXW;Qf69 z^RBM|@9yeDl-7X682Kh4MNZ9vn3&_eEGCW=q&5$Ij6{*-1|lK5Zvcg$09ZMU06<4L z0D2gL0Y(WJ`G07@dyIpA*ol|nTY;16HHA(IAq0j6XkqwVL+A1nm4OgALZSc}8G=y& zIF-L%FCe6rHZyRr7^w-oh^u-Kp3V^XT3hHN5J4k2YI+n-rCvTw{A5EGvd4WBDJ6@FuA*25cXcTUqZ_yq>R(`A zh*NQmpccw#jP(8JG*MZc({q4NN45ltV+e)~b(F=`LTeQ;MnD6*7w6$X4gDCM2*35V w;uzAP4S%_N3w>TH+_7B6oR{#J207*qoM6N<$f?nb!D*ylh delta 671 zcmV;Q0$}~31*-*+7=Hu<00013M{Ml?001yhOjJdf(4Y_y5Li%9Xeb!4KrrxF82FeV z(8$R6`1q)xpwO^*_~4lM__&~W0BB&aNHB2N4`mww00K5iL_t(YiS3j>Z`wc@#%+@& z8)raZP=f8K!gMM!EMzh{q^<=n-=OS{Dj7zjN?b>>5XLCmMSrNOvT@-P#ABwQDB=S& z72VVJ&TUoUe~~)pS?_o6^S;k}Izf0*Sm2p+QG14x`I(pmq(9;8>tKG2N=DjykudU*6E z1~{v>S%J5wMt@9{yGFi^Q1254t`!YvKHxgQMUkWKYE>VQH5)~yDUCiLCIjRT+E!E> z(zM+*P1JEtvblGWZ=%t?qzkjB0hsHBJtSRi9MWrVQHKyVPo_BLqhevf} z1qo?@#|Ncr&!hB9#)54HkGD-EJj$z0>fKOE>RH%2!++Qg0EVlkE-9sp3k$;5q!0ug z4iwpaQro+Qt-@%$4G7hVyv|xhLcl$l-@=0HOtt~Bym?&TUjT4N2$@?OWf+bMJeKI3 zaDno7AcvC_K#4AWV1J$Kgt8Q6HM^qA1qaTvs1lfhMQO{a*L2C}AavQ0@mLK7p?{@x zMY$d}*nhy=9^#;4|5&en1B?CjGz2)dyvY=~2Xi?u>%nD+Q^!sVdxVwXeOihWY*Lw} z1zmh1Jc-XwuofN@u$_Z%O~Rsl*jQ0H3A&?{Q_cC^y!Nx;jv{~xU^Xe!G=*}(#cBjF zoc%Et?ff_bkY;~ZEINZ>1R(tDTnRphpc4PO7a0AYegWKd$|rv>#kK$d002ovPDHLk FV1geCF)#oC diff --git a/graphics/pokemon/ledyba/normal.pal b/graphics/pokemon/ledyba/normal.pal index eb13383da..cb287fc01 100644 --- a/graphics/pokemon/ledyba/normal.pal +++ b/graphics/pokemon/ledyba/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -88 80 80 -104 40 24 -176 64 48 -240 88 24 -248 152 32 -208 200 200 -248 248 248 -168 160 160 -208 176 120 -248 224 152 -248 248 184 -160 120 0 -104 96 176 -72 48 112 +90 82 82 +106 41 24 +180 65 49 +246 90 24 +255 156 32 +213 205 205 +255 255 255 +172 164 164 +213 180 123 +255 230 156 +255 255 189 +164 123 0 +106 98 180 +74 49 115 diff --git a/graphics/pokemon/mareep/anim_front.png b/graphics/pokemon/mareep/anim_front.png index 5c67de5094474dde0d3cbcce0331fcca58f21ae2..47961b201aa02804d11f34e5b7b99976d50ddb83 100644 GIT binary patch delta 921 zcmV;K17`fs2crj&7=H)@0001tU!Pb20004VQb$4nuFf3k0000mP)t-sn9!i+tN_iN zQvd(||K0$cVjvI@5dZ(Z?#**jQc|R(q_legQiHt!N|bY?_F|OY2Dknq0009aNkl2i$|9@MFmr3Fnk*qqyU36NHbtQ!CntyY&1XOK^v)>7^4ASN-&F48I4 z$Z?}%!`J}$FQnW;o7C$8@m2?tWaNXm{kY_i)qkU+ap9MEySyj2Ez7n=2dgYV*5LME z(ar{3fpgg)wm>rmMEC5#20v^-5DQ=fK%mff2ow$OvxS6S%C5CeS)-Y)d+_E zA<8Hc$A17|?cPW<$M5?dLf|206G`41y_5JnZ8FJ<*?p4CT76(b@WTd@w}#LM@h|0k z@kw=4jQ-Tr)YR0})PEE_bCA*CbY}a=0$L2QwiY^|RU=;<6hP|~Ak_Fi&^jjwPz`!O z>kUCDFsBQ&P6M`t$D%L4P<5dOWKo2v2K>i@*-gat%SSX9n(a z4~grm1i{)SHXVP^(RPKi1R5L!p(2QbKp5KS3TH(GQ3=9yAMG)0MVAS;{a)L?_DuPHWh$lhnVT=cY;4mVDCcaOzT7n=1qC$kM-WleU zAb%VOS?GeCcLbpr^y1$Vgmj`t1N;{U?Lc3*9L+p`V6e6b0=u z79r&<>2pOve-1`&Knhzc1sXd?hX@Y}!H5hcc=ZZyi6T(6pa?XCp@c9N&kiC%2;)ca vum|BF@mK#5LkP9rv8A7BB7~_ao&EspLlQH)LmG-w00000NkvXXu0mjf&6}Qu delta 965 zcmV;$13LVp2hRtP7=Hu<0000zF^)J2v000SaNLh0L01m_e01m_fl`9S# z0009;NklVF+4{QYQ=XdW(!taOB zI{t3d?ySyNwjZtrHn%r-R|B=pgO$MJT1^dTZeCe?a9f?X=<}TL)CKC4QiER&RDkAM z4CuIUJ$j`88h^CI01F6hqL@;nMRa!2#wP_(p9Ay+4ZbP>*Zp0>JtA_GTAdnmqWMt) zzzOqHyfKjrz=$V2ZPCd0)H9rP`F9waa*rB~4BE@jsCOf|g+8^S1|}S6*jNJEKBZx+ z030j<`sl1ndo6S1QQ8eL#$pfpR0c4rwQ1fPd6N^Yq%^Pu_g~HlR?zkbw5v zEc=-Z$HM{b7#O=!llqfcmLm`o+$*=&|3m{O?Wcu0C5>S2(kEt|bf z@Ox=U)_+6CBm`SIpvWT)N*92s$Rp%%g7si13$R;>i!kKZkw=wa2kwBW{yjo*dUfGB z*gG!CS5vrmgap$PK%er*bCs3>i16Bh^pJ!I;<6s+CzZ^&j&-c#KM2irSEm~^TtR5u zF~WRfRc^{agKusy3>LTUiM!F|4g&$1%Kf{7u752E1e{UXsXbZ-76bxhO53R|%hrNG z&@PmCymPP&{1FH?2$T^15*G!61EP#+Tp$h$4>FJ@%2*!+!mx87GSP-0V{HNg;n>iG z9opvJ(YvL*KKcLxLBKF*gd_9pOMe-daDf<(-yZ^i{mDQWqR9n<8wLX$V=Qjh_G>N> zV1F0@U|)1noq#~J$3wpx+6*v77b^s!PaHdnKrzH;oeM-lT#RkluhM?Dwm={*_=a{= z3!V$a)Zqf*s62@agpc|9XFFQqlMxdL2c8p1j4$PLKVa`n7=gs7Hh3!sK;-b2s5tx# zmaw_VVJB7r$b}p)KvHQ)h^k-Q1T$7|@IGpqu;gV6ACzqHI86yTj+4^;9>mEx($jK- n(8)PBk+OUdDotC*zY)Ix2ilIakHnta00000NkvXXu0mjfV%fJf diff --git a/graphics/pokemon/mareep/back.png b/graphics/pokemon/mareep/back.png index 027ad17ce9a04f577704bd21c77cd29ad8bae22e..c0d26a07b66d3bc2361f03f53cd6bc8648dd9814 100644 GIT binary patch delta 506 zcmVc0004VQb$4nuFf3k0000mP)t-sn9!iur~uGl zxcK<^@Yn#T7>E!M5ctUW=$P10P*9+tps08NFo?JiNRWWQ@KC7WX`O5{0004oNkluWq#*x2zno6$qbVha-J^0jq@3K&JGXXnWpTJ<;73_v{~92jSSZV3awM8GlN7-8s- wg9yg}y0%0AA({(_F5G3v+gJV4($e47FGI5)1b=3XvH$=807*qoM6N<$g46irt^fc4 delta 564 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 YJds^4sk3;)00000NkvXXt^-0~f{p);s{jB1 delta 1505 zcmV<71s?j43+D@v7=Hu<0000Wq)gACk=(DXe|-Yq2P{V z$kFRfkAcWp9RrD@JqG$G^X!SV$&vb2(knOAASb%oTG*_|i*y0&!`fc-b^plq(7ndNBt0beYoimHBHx zXj(1;lyb{-qkl>7Kng{_qLm`R7bQy9DwJ-|Lo?=Mrue)`>C!_=TZ+E46unX^E&_ewPY01Aoyoa4I&8w8Z5@bXDTQeU zfGZ9e0Ds@Q?&&lHWawt2w(q(2*&%MIJ@MFfLr;-u!pzqG_-ynEuJ&E6;Mw6KJCK+; zp3pQ{ik7B{<7v1LCS#Q??_7+uj~J_I+Vx}qc?eKpt8NX?#iCZ=Txg4V`6-l60{~y- zM+G4skHqLp8Bi?-3pEm=a4H;85WYW_dK~~h+<%S$^vRd1%&-9P&tC&@264I90BqrE z`QuY@6#NLc5&-K07@Qx!83u7%27(PS9pIvSo)23p1i+DWh7-8&PXON7wkK~&IFnoM z&>Q!$(kb7UmI4o@5o~52q-hf_pPf#fbS!q#sdtC|xK9W%B%n>m4sM0I;dlf1L*(NL z*MAHINY$`0o(yo#V}T3+l}e>v-rg~5aexW{sn?;l86X#_lIpE0T(2pr$q|UWBC5Sd z2ta@M-|dSZ;nD5CeSe*|%hg&0P`7!zTD`cjUG4SX$p9d4d%cU&)NcP#-{Mdh2%5(^AUAURq~1IUk8!Gxp$^fmx@(tsSLX(|j@A!vdQh8JP4FPC7=Hi`2()AEpC9izmUQvniL^UI|#InTz@%5hOGbqCZ&Tle)rUNW$|t{_)~B(fh%Tv1@It> z1Z=YJCvRLA``FTikhB{d1Z7*$snN$59z{g_0ow$RG69ofvD!$>gOie;(_%NFNU$-7 zT#WMCb=e<)a-w95V4M|1J_s#Vq2w z!~kF@0b3AX_+ z;fL=K!$yx13k2HCXC5O87+N!JR!uW7Arer%Ri0_{3@C?-Z1*00&1c%YQ{zz&0{-Eb z_c_%E?}%BJ4lgLX`maAbH`X46YmkO&cmGNS6t1SnKa76>6}uZifKC4f00000NkvXX Hu0mjfkzK5w diff --git a/graphics/pokemon/meganium/front.png b/graphics/pokemon/meganium/front.png index 2a813e11888ce778d4973a253000eac4cb6248b1..8d2d25f6c19d8617b843fc297877998dbcd61c16 100644 GIT binary patch delta 841 zcmV-P1GfD42Gjc0004VQb$4nuFf3k0000mP)t-s_`vx8-XLO1 z0OqU!YOFyJb1A+5dyC#N5D*am|Ns9vT6+*V_N1K6AUVy=&1!0DK8Rlp+2D&hTO{knD+ zj~L5pYPeXRAOxUl=Ohh5+^q)mmV;}E^&Y~n$RQ8{2oH=Q)*U&<(KzKjYQT`B4!F8)oau53jjjkoC`C@7WXVTQD%*&05FQ^3q1!oS90C; zPXJu10>a}IDnU51{fPS0MZMR8hEt~a#q5m1vH}~?dT{0My@@yd$a*cv3}M|fMZbdc2Pyk zmWa_ua1!ddA!2>(V!1F7TfQWRrb50f+ujUtCubaliz0Hf8zZ(7`eos>9yPey2JK&H zfRch15q~NjBL#RX;-v*^ps1qgy)MgoLx>!N(Me$Iplu&TpuSPQj30|19wpxOn@Z%L z-YzL;E5Yz29RNE^xpqL)4=hkT0l<)tM*+3V2No!P5vl_6Y2@lGDu6x!sccyL7{OT@ z0gjFU1N*04F={>O;xrqe5$di7Az^sX7291{ihnIAUXNnPy5;gqKeG0l!6UPpmbvdp1JTwAbN$Av67Tn@;*=?527o5qKp0!(!I0{~mh0vs72MEt>k zybsVSc^1%$5R_mg`veS%2ml58qc)o`ozZ8ze)vkDkSOf{TaNktp4&xCmXiO`_jE0z zyh6Qcd^I~ft7JN115fK=M7;5P>VY60WHNpDWq3<}6Bc?RDSaiZ-lpVz^33diO{+0) T`K0F>00000NkvXXu0mjfxe#@g delta 876 zcmV-y1C#vJ2KNS#7=Hu<00013M{Ml?001yhOjJeq!1(ysAYe!U;HUtYs8CR77|`g5 zxX@@25D@tI`1m+jcn~=7pqR)YILOGzXlQ8a+23{m00RO^L_t(YiG|cZYui8+0Pu5K zgTRv6iT6+5_`-bMQ(>q$)z8__8Gi5;6!rV41a|htXKp*6x?$R87r$D z1GSO&#_^5$4&B;!a$C^f-eURQ@9v)N-U%Up6GfERL`f=#XQ3~eRj2GEd zRzgyKGcJ+TMs@>!q`VX(9&K(sR@Hs9g}9J5BEYjfj1TwMwn2zuHU#q7J$zKd?_dff zZHf61c#+5Wb$=1#<{E6qTEr61YZw1^}BMO_r>cl*o@ zSK1bv_GDQu1wc!dPkAX+O19gFKXUMTLSKmkSt*%39uEw|hy-Z>#bU9t+dNgvQ9uA7 zS7j=Y+aC~2QjnFm3iOwepc)*6J`qayiUZgm<5z3-;BW2T!{2_RwX2jvKxi5*MOh7O zDc#=BAOP~v?XFT2+P$mL=fPXWEd84ZU|6wtj~*gniVsE{Qp&kJ z9R|*jO3sIaM-2Wj=)aqoPlK>k+`ecXiNF=0a||prLt%$6#EmAPBUOj|M)f+7MJd>3 z_n!1*;Ex1xWS!Jnke01c2dex;#zw@1=?-4ycRbxOy@3@Ht?Ajs7WZRWD;F?3NH4MWr z48!>4%q4fy&m{MzpECHk-nm)5x_LMaKB?#a0)nPJ5P!IWkp98z{JG1mXmc7=Hu<0000FnjF%a^_@LoZ~pTa{apsp5RyY^LTHeyM8(9HuV^ozZY}O#`@si@^y#K{Ba$W!)<%#1%lR!6z*CbQTVd z0Kzcg)6XueXmjp|Qi+(d*Z{Z+xDmquQI|pLQUY~hJZD6+*VQJ>RH)#&Yc^PU_t$*0 zz2nULDJyNgnE|}JO_}#aSghdf7a{>j6DmTkT)A@ny?-p-?-c0ncO1(&kOrH-G+-73 zpIIXMCzz9RCoE1Tw<$gf2+volDI4Jkc0N$m~aj;>EsNO() jr8bb1OV5j3xor9dE-0+xU7CV=00000NkvXXu0mjfvSJV; diff --git a/graphics/pokemon/natu/front.png b/graphics/pokemon/natu/front.png index c77e0f9bd7a5780f4ca098c22811ccf77ac5e580..ebf3bee930bad2d31cea062a4faa02d22d485b99 100644 GIT binary patch delta 366 zcmV-!0g?Wk1N{P!7=H)@0001;w}I>c0004VQb$4nuFf3k0000mP)t-s0I=wTDFF6b zTGc69N|Zq>5CbINY3TkFtG>FaS9Y!6 zn*N2PqjxQ>`NK|5|0BIU%_Gp#2WnT);Vq$(dN>c@)x(`#EEbDt9xzyJUM delta 398 zcmV;90dfBQ0-OVo7=Hu<00013M{Ml?001yhOjJbxu;_p&0Qgu~*eF;?kU%JCC~&wy zkk~*F5D^TJLIaHr@tDuz zmS!x7Pu{(}%q1-qw*t5F^76E_v<5;7GH}VWrlpsc0Ttk~gR?UY3Iedp&sseVssOtq zX0KYcGcBbf1gM}9Ye;p06vW&(7nV75hN1)(1suCq?Vgs`aU^ZlS_?rXY_@dl-rbg# zmg2c;t#Pv;Hh&`+I%cM&xwy<)wc~E1u?1FlhPVL1tlc||n{g=M04eC+J;Si01DhLw zpcSaVV>eD|h>Fn8MyxJ`07i?B1`gZ?@Lm*_5XNmh1H=8^8^%H!7jP@+=2Bm85QGghP0N0X`;Kg~q!-R@#;(ilWr#;(stu%(DEgs_~^hy#Z9# zzX8+)nE~^Jn%KaLHn3Xsp8!A?Af?CuORu~EXro2}O&_0s6To02zA*s$7Z~(VzcZlv zF~Dg6q;3XAJE0i>C{loUG7~ufSk6M90V70vx)H!-z*>x|GXUnCJqDHql>n_B09neR zHv;Q3bOTbO4S$d}WNUM-$kp^71NA`FKgwl*R{Q{<$AADf6n%wO7#s!|aBLW)`Rlq9 z<{;$(EHx7kUBGqQR*Jd00Z?V=OF-I=$PFpQ3E=qy8Ra8`SY2@D|>qZ1%w5gLQ+`RD|6gv>!T!NcI%WVs@d$}t*( ze~@Eg;o@_F%!dUaiNU)fKlL+9!UGT| zp3kOF@x;@4ImX#Xo1WLSp28=_PqO3M0gQ0#3+;D+n*f1ulRmWbof`lp^gh%%B&U8S z0Dm=b+x$Uy8(6;)hbFvrg3AJ6*3*9Cy*a@JsC95z(csEmh%2|m4y@9Zb@+wUP74V+ zyvy-G#CDI9uFI{T36*$az!|(fwPQ=l#J9 zKrayN{$TFz%Uq?006+iz>rutpnzz48jSw{000SaNLh0L01m_e01m_fl`9S# z000C1NklPiq@T7{&*)2%Vg-5Ee=GStE&_jIl<$K7ZLzc~o8O3Tr(Q4(POK za$1b5ZWcq^FA+jWFujx>+C#oWAi>8FDUMH*(t|01Lf_eylajpeh#q?A9QFM6{Ua^& zJYwwMoYyP#^}1VsHFpE+jc)y}6WHW)Cot!mdsC6)~y}rbOk%lvEe;DS|8S3yn5EeK^0FSqH z+=2?Si;lq9kdN8`2r0W*2gXXU-M-exQcA1?V;$&ys1)cuRA=voyeae3M|H3NXbJT2 z5xoA>p*$3DCin>6H@{q|lZ*7w7#v`4X7cLkuV*x{+kcVC_*wN(Q@|+h#XTk8>if9P zyy<8(=SJ&m0w`$}CZH!o2gWA$*VaiEP(biD*CR0?X1LKtC+1p+8Uf@ll%5Hn=&|?3 z5~vV8f?S_Q+d`mwtldNwxGwmBJlkh zx(3UPFu}F(k0_w@gE0$p=GTr0fR!i4m>npf2*45xk@>!#4hUjnCbAe-LpD(^cd!HFrf5O{ybrMFHXW1rSrfZu;}EAw)<4Uef8=B||+RfT`@k7pcf0!g~)A1vv#w1qXt! zm1=bwIbg7NCRFk8$it;Uv#>h3-LMO>7;e&^l+5F%DvXhqwo5z>*l1Fk&Hw-a diff --git a/graphics/pokemon/noctowl/front.png b/graphics/pokemon/noctowl/front.png index 6665234c049e535e1cdf21c8254b7062e5b05416..c646747b44a09fe7f1a239131143bafbd8081bd6 100644 GIT binary patch delta 690 zcmV;j0!{tb1-=E47=H)@0001;w}I>c0004VQb$4nuFf3k0000mP)t-sn9!iCdrD$K zG5_|ods<4~&00YzAk~y&5D*YzVq*XQ|HUyFoB#mD#l@6bIi!PX;F@LK0006!Nkl0;2HC8|}m^B8B`B!AQNTUGNz{rm(_p??CX zvlIaC6Y2~D4|;%_`fq?}2r$nd|Ibx<0`R6r0f#<+en-Gy6F(Rb|3(Hq)SnEvehlz3 zAgqgl(M326h%78oeKBVX0Cahk#td{q?r-k|2^r`etLr*IODPcp)1*$2qYsh73g|ll z`XZ+R)@TFlp?~zAOI6gNj~J*;UH?%b1GefHKqCeS*p&JzM`;Qe0HAG}*#5firX{f= zfTFw21sS}OH$ifMkC7-1YmxoC?AGcISe5^EG(*vF8om>*T)RF1yzh; zt!cTV2O+(G&5+ypj((JAy~vf55YsoMf6AF4M=6I0a(~&67V2{jS&){$0kI}N3?L5I z%XkvGd4^vG0t5muN5{Tyr#=i&`p~z5@kQtW`3o>?0f(^oF!SRMfGG%%6}bzro+B4g zu7Kf1uu#`mb zDE9+sqkn)&%@33Wh`CsU0A`U6hV}Pr5O5+mgKh#bgbrC$Hgmb=j=+ZnHWn1_1)PUT zskGk87@|>J@ZfMmqUa|3-kb+_=(a;mx!Nf?)kqZ|m+3?7X13M2EB;fcNc? z;iAT?4xTaHrw8a~rMQM}nHLZ14!}O+vRC%-`77)unrU09wRQ`@6$7RJeFHE(Q~tmD Y1JB|apKcbBZ2$lO07*qoM6N<$g0h%0CjbBd delta 715 zcmV;+0yO=;1=j_T7=Hu<00013M{Ml?001yhOjJdf(4eq*P+&kX@ZhL;SV-8okU%IP z$dGUl5D;KsVEFj>z%Uq?006+iz>rutpnzz48jSw{000SaNLh0L01m_e01m_fl`9S# z0006_NklljA6bJBAWks37S3s5>I_H{*DXNl}OMfPi2xnz!h!S&-7(7|I zP7w;mvO2)GV5urL1{S^pQV}B}AJ+9br4N z2o``of!?IO4S$@jlx&pkx{rfE>YBB0!rabK)Bo2Z1J4m)(T0o~dIImG5eS*kpsfLL z-p4i&QqtEwmhvg*9NR!hNADgAq5B@%C*LQu&bKu{`_|x14m>=9H8`K}A?OP62-cH# zYw_$N87hSX@-61;^Y;rgc+lbV=?8ZxO(2N8$P@fZo`2$fV$FhJNtKiv11L$+o$LPG zuz`>;d)jiIG814|+rAGYLxyXqAg@5`A5rf~tCy+Q~{yGB=K0%LI`76-_X4_Tt43a8PYyqPB(ziv1{kNEVW(XTJj4{<)?qH)p` xC)oI1mER`6K9ko4ASGu%NZAasHAT(;tKV+j^4uJA>WKgV002ovPDHLkV1jdfLW2MR diff --git a/graphics/pokemon/noctowl/normal.pal b/graphics/pokemon/noctowl/normal.pal index cf763b733..0e4e0b077 100644 --- a/graphics/pokemon/noctowl/normal.pal +++ b/graphics/pokemon/noctowl/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -176 120 80 -96 64 48 -240 224 168 -120 88 72 -216 184 144 -64 40 32 -200 144 112 +172 123 74 +98 65 49 +255 246 180 +123 90 74 +222 205 90 +65 41 32 +213 148 98 16 16 16 -96 96 96 -248 248 248 -192 48 24 -152 0 0 -192 192 192 -144 88 56 -160 128 104 +98 98 98 +255 255 255 +197 49 24 +156 0 0 +197 197 197 +148 90 57 +164 131 106 diff --git a/graphics/pokemon/quilava/anim_front.png b/graphics/pokemon/quilava/anim_front.png index 1c2709eb4fa1be8d3d810c929e6ce19bee38a4df..e65df16880e20c1a5699d66bad855c8b9e2be742 100644 GIT binary patch delta 974 zcmV;<12O!G2-pXZ7=H)@0001tU!Pb20004VQb$4nuFf3k0000mP)t-sn9!i!00945 z0RPnh|C|6AVuLY3YC)W=5D*Zk008*-__Ul-|L&yb&1#EcAP_J(9L-F=000A4NklT0Kzf_z|2l(lxI1bLezTzA(laU0LofpdA7j%T#V3K z2S9?Tbdq~L6QW*g!iJ$Uv-faBXb1o_`18{M5KVO@+kY7x5ZWZY=mC*{rm-+ShDGzO zG{6tpbzNOFx%xpb#JV!JX>sxSs}OEZKe8`-Oaehv^WC1QZ{#cJo~^x?92Ay1W( zr9hn1M}Nn(v;elXS~sN+JyZU1t;a?*)4p4M=jlq@8kjA&QuetsFk8i_yJesO+1Si& zeE_(rshty^$=`bGt+(F#y}G+b$g;azfST!^064+j0YC~^mm&8Q0GtfvP5qLhr3&f$ zK7f;x&z@LQ({}_;1bue=2EYa|Ca*gH&Ymgy-G3pd8vWYr_=Sa}=j?a~piG+`?-07^ zcmuGDj=Fh6Cmt>|`{=0i4rJ~H#Tp$;_RVit*}i<@V2zF;z-53)ugL<3?aP4BL`Sxe zH&na`x@d$oyRV22$jw@=MvN%&kCTcrSrB0*I>odPjv3!+WduFqciZnH5GGcwI45Hy~gAyK`$7 w-|5>l?cAgI&kKZyfSIMuC&IfxcZWT!xsF~+ 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 diff --git a/graphics/pokemon/quilava/front.png b/graphics/pokemon/quilava/front.png index 061f319982b80c36d2c45c9e24433d121e596235..65c45aedd235d390f444350dd9d0795fa0fdb45d 100644 GIT binary patch delta 527 zcmV+q0`UEb1=j?S7#0Wv0001;w}I>c0004VQb$4nuFf3kks&^R0o6%FK~z|U?UKQA z!ypVqEkK|NnE(IWA^|owIH7fW>3C1cn0>5PEX$)u|5R|-e;1%`0^m0QO5O1*Q2Gx6 zZ|8#yP{v#W-mfT4FaGNQ9~v$It<|VS_y~~kIe;FP0D_+Y=%hgjpeo?92X+_0D1ZV! z0Q(p%25e*|Fq2`XI@<`fH@>ws+oeSrFH6O>`Pgk}ezwIhIO zD1!!dX~3X!NC!B#BMVmfrS^}k0H^b!!#>g0~E&|Is=Ln930vEeB!!gPu z)H>N60uXL309JO{QSEZng7_1F5Vs-|0QIi1y++9Xs*JFI)-s?#Oxfhwp9$i(mat*i z$~zaKyV*Yn;G;wt5RFoGayd2c1^fvfAr`(`T{b!89)<| RiZK8H002ovPDHLkV1lIk=i>kX delta 578 zcmV-I0=@m$1c?QZ7zqRe00013M{MnpE2$Wzu3H1Po`Qf-;kopWdJxqO92?3!yl_IpB6f+VT;Q7n}kwKd82P**Z zPJFN%1+X(?v0D``A?AFNN(;nCJYs+GAtQu%wgUp*h_6>!gR_`Nt^_^==R$nEIyR>R zxDpOa8Q*h5yanJgF=HOQ;znW1H>pCT2?&VU8Gj8x#C-Q3V>S_Dc4>&?nGi{0BN}2v zCu#bl1d?f)#mgBQVss&z|1gajwy4aiS|(;zX$owSh#}Dr=P50`|dKEYq}W&S|GdI=9p0HOSL)eq1MNL}l@ zYMh>r*2N9HTj-mn@;nCzH7lW^1-;E99mxaz62&<9~7dMgTxeHa`*|Qb3Og zLzWOA2AG5-T?h~emyS|S5dfq#bd+;Wfj)>XSqhYIIWhq)eo2ss20oeBx& zM<4;zzRTq#Um*a(34mB1$n?^>eZ_*VYU|$sK+d)n8o>pSyP&of28;_@a)=Q?`;RS{ zf^L8r><5UtY4T0=l86(q+BSri%+7Uqrml!O2p&L}+CYb%HF+67^aJWFu2k7tbLvTI zlL=rWFn@aidKZl9P62YH`L==quDVD7&b{;w@a{!A%Oe{D|7m!oU`r@)C6LvKqy6Yv z2s6TGA5+K-fS? zh*&_#pn$l5Sorw(pm0by7!b(FzyJUM0002I*f2!^00TcsL_t(oh3%F>YZE~f$7kDt zUUKj?kv4d-)gB5ST(**ide}AF#6@~&r3H^dn|n!Nva}aZ?tiAI&`2`r2QXdmAQdVU zPaX=oJqt>|i*Gi`$$3-tAP9YsT>ig(Z)bMq{U2k09&pQ`;cp_pMCz7PK)@~-0NZ5~ z04@b^8w!js%+bK~JOY~=B*0cTz~x)(G~m_OU0#1l14=Xkth$3GOaQMISaqA$k?^2u zNWj=sGu|};Q-94Ul1Bz$Hi}{?>Cb8Pp2i(1J2W5zX#gBnl3~|0oJiSMHFOmi%hePh)t@#25`V415D?k~2=uXjFL^771dM(C zK9H?ObfNjHUai(+O}l9|&=f(jA2Hy)^Yp2B0FAc%jswYt%|E zhnhnJl^F%(X@L98b9|qE2SoA?-Q|7@$jej1Dlv-D@duM`;q^Xs4SL>LiO*>u{p>hS zi3D=#$A9S1abSf2a`^aibO=Cgq)P8B$M30bpMz%9b>R4v1d6!AHrzP}Vkf;2fiA$= zE(OS5gv|v6)kwXpEg)cD2T&iAhpKM?kOz_%5okl6zBOK`5}3}T2LJ`rdE~zD)6f6I zuxM)^#&y?%)HUs<)kFW64{4x?{*FhFP#tE4Lx0!TK=%fGdXWUm zag1j_^LPD(P(BiJr`s%F8TaTd0v*8n1Lf`~*#x1x=DdHRyg38(=J;i7|6QRy_qlX1%pmkS zyC_`>bobYSa_5Rz`_{a=IwRegi>1unX`s=#%o32DtkzglI_>}baSdf+30e5L3!D$g z1X+@_VsL*20L}=PamH+?% diff --git a/graphics/pokemon/sentret/front.png b/graphics/pokemon/sentret/front.png index 6505891305bda2599251b2511082a2c025447952..bdc69648941c47262c1557b30932bea69cb23499 100644 GIT binary patch delta 584 zcmV-O0=ND81l0tP7=H)@0001;w}I>c0004VQb$4nuFf3k0000mP)t-sn9!g~F(5ez z0AfKg5D*ZwAVJ106a5wEHM!# z7=~me00!a7Ny-TkP)ePXoO1$dFfK(3lFy7Rg3#GPInNUjED#nrnR^MK;1HQ9V0|bmB4v}ZO;j0#WdA(lc)A3Buy5QBLYzuq?c<~aNt|)8bF3>&xxYoqJ2&%ih8QME? zF#g>jfwuPyg#T@55O0RAfb#Dl>2g@F>q1(L_@9iuM1NQzfpHEBjRBAVd+qi(*$5Ia zEdgOQNboj$jIfZq+xi~?+1=Kl6`TTl3uD W6&P$@hKD`?00005+K-fS? zh*&_#pn$l5Sorw(pm0by7!b(FzyJUM0002I*f2!^00IR`L_t(YiJjEHZ_`i^2k=Y# zq%IjaY^jZyKw>~*v0jlIb+J{GU@^4_Bt|6YUQx-h%EI=XPJak)44&`^A5eo329M>OMT!GY1AvWDb>ssZ zBV*`=2W%Nr5r4^#vopI>O^K#5pqxBFLysmmh$~rlO<5mdNw@A-tcEy`Vl%fPBd%i? z80O7uqPd;nngGxpT0r*8*?`4(@e>rz1`Osrf7ZMzgntGApT8_<{N`K+pFVu!Dx?WK zOcgfW=XYYJ@hyUKo#FGblx4Mu)`%!Bhi=f-SH>X0k?bNKl9|K>`)#l?FuLGD^wZ3C$D0006$Nkl1JU?!Jy06TwrbK2=l)2VkW34fA~zG*U-ALflo%$Ezr1?sMjt$++TC@e?*KRlfU?m^8eKwNQ z7?H!l1PFmBa6qJ@oZ+|xKX9V#mkvC}4b@i?oO9?odhI2!d0qM3Ibe&W_#A**8~I)l zkXE9k0S~!GM}G(xz~SUm3e5yaiT&)0+v5>scBpoTA#we{Wwa9@1(Fk3BKtAdE`HCx z+yF;363Pta{G*mHcKO2KJxK$;{qB-q28fVvkX#=CNkBdrIh-H~?HO{P8wV8e4-XK# zcAgX3Gvq#D1AGaH8o(2fE6|z11U|`|zxrpCp0olgmw%`;Lv67(pw|cF5^HIs&ejZb zrxWb^aeGu)e7@a&EcP`#1kkOeT}bWHOmdzg+(*KgeC*<_E|6f0rNB_5UV6 zkfn?R{C_Dw7;E4&KNtcKQ-dE20*DSj=l}@C2Tgv^0T8ky_xM38q2PlPe!z3B{GhSB z!AE`|E2D1z9RQ&jXZ%3de_5Y<%PZgGQ+`m^{|-JV0OEun)b)P=K%Db~y8gE(AOPY6 zKN#A*^CJ}>WPnil!NB^jPaOE50))5xb^^TOgDn$)Ftq+dHT?|`uHb`HfN)I)5KJc1 aHT?h_Cm3ylTUh@90000sF5HLs(C}3cS;4rB0U{J7V zV3?qASRlZ#7)VG+`1ttv;7G{8z>qK~_*h7_NalzD000SaNLh0L01m_e01m_fl`9S# z0006_NklljA6vywFm?A&7YGSZb#j-5OfD|1{K!0KZE*_Zcg{_z9MkLfv z(5;rTL|w3yg_bV>BNao`fmq7Y6^X$WbMg&bo@157XUB|4)c^6`|K7Xz?kxWZsZ{BI z7X>JdgJrQY2iV?$VA}TltnYaPr?b^ybv@5xPhS_O0Jt~geeYl}bPEk|}gav z0%=@!bd2*?00K^NOf<-LVa~Lq0?ugfknFJM8p*yaid{EJAa^m%MVz*lphj2DC36}9+dHe5wH(yekiJt;fDgipc#HB0t|&8PLy%cIm_~c zsr=Sx$P|7sv%gMcoHakdiXXB+KG@`k$ryYUFz}k!{1En_F<1MnZ}0=+fl3DnVEo|+ zEy064U~KS1f(KMNf;rpZhXOpnm0Ijzbm1iYkVMA=1dL^@OKB~mRpvY%09i&j47iEX x4Fz~WlMs!g+YNaoYt3l;i%v~{iC4Pw`VGg%&$VZ&?2!Nf002ovPDHLkV1nQ*NG1RP diff --git a/graphics/pokemon/spinarak/front.png b/graphics/pokemon/spinarak/front.png index 36c6e8f60d4b4a33635a1a1b1ef8f90ccdb5654b..7af7440985f29889d6015110b5256cb7cada0c6f 100644 GIT binary patch delta 494 zcmVc0004VQb$4nuFf3k0000mP)t-s0I=u~5D+j( z5D*X$h~O}&@L*7|XkeJ2gK80k?bNKl9|K>`)#l?FuLGD^wZ3C$D0004cNklXL7=-&KJKw94+*x1;wkh2Pc$Nn~eXp<08A4c(pQF*>e zpcq9W07;rE!y`htu~GQ7LEyBr`5M7{&jILdM1XnQuy+9V)WTN)TQ&)!5R^BOY=A@0 z=z<^s;1Y6(>DK zlyVl^y)XKkuNS1j3E6Y1|14y?2kAL44K{E|ZMEuYk6s&&Ma@QM`30~$y#uICbe6C4 ke(&S`n=h29si}XdAGb^lLxd8GQ2+n{07*qoM6N<$g3P+(EdT%j delta 523 zcmV+m0`&d-1DFJm7=Hu<00013M{Ml?001yhOjJbxu;>sF5HLs(C}3cS;4rB0U{J7V zV3?qASRlZ#7)VG+`1ttv;7G{8z>qK~_*h7_NalzD000SaNLh0L01m_e01m_fl`9S# z0004wNkl|N?c?6G^|in*K!x8~Ovt?0zoG3B_=8|DcH*2f z8xlf56Izp|He?c><7!8zyHf$Z4o>w3S_oQvw0?nG0e|B%!P*EYH7rI|ot*&)=&Chg z*PkLiB1;FgqeKnG=rKY5mxWd8%%`d=<dEq2mO{h@l2eh4L%6-lkrvLx| N07*qoLmvXF diff --git a/graphics/pokemon/spinarak/normal.pal b/graphics/pokemon/spinarak/normal.pal index 22db1c2ce..ccdc73a40 100644 --- a/graphics/pokemon/spinarak/normal.pal +++ b/graphics/pokemon/spinarak/normal.pal @@ -4,16 +4,16 @@ JASC-PAL 0 176 232 16 16 16 48 72 16 -40 96 96 +16 16 16 136 224 48 168 240 96 80 176 104 96 152 160 -112 88 32 -192 176 24 -72 72 72 +131 106 41 +197 180 24 +106 106 115 248 248 248 -248 224 72 -200 192 192 -144 48 40 -248 88 72 +255 230 74 +189 197 197 +123 49 65 +238 90 90 diff --git a/graphics/pokemon/spinarak/shiny.pal b/graphics/pokemon/spinarak/shiny.pal index 970ece98d..9c966c9e6 100644 --- a/graphics/pokemon/spinarak/shiny.pal +++ b/graphics/pokemon/spinarak/shiny.pal @@ -4,7 +4,7 @@ JASC-PAL 168 224 24 16 16 16 40 56 104 -32 56 96 +16 16 16 136 176 232 176 216 248 104 128 184 diff --git a/graphics/pokemon/togepi/anim_front.png b/graphics/pokemon/togepi/anim_front.png index 07d7f05b89cf35d9cf06b55e00767d79941f5244..9fc22b9f843f554675efb964b4e4e90c6393301b 100644 GIT binary patch delta 671 zcmV;Q0$}~11*-*+7=H)@0001tU!Pb20004VQb$4nuFf3k0000mP)t-sn9!h%#W7;6C}2`0Fb?~jT9Z>T@?N) z%7%eIa**ETOMm1K4b8ySt*zPfysoR-NsItsaexu7QtG85kzM5Ogi+c6-~^!KGX1-M z5)AMm0ML6F(CesejN0+{83jy2AEWhK!MlWQydH0BaR3O9f3y+z+l74meJuD76?O*v zp;P?$@i`>MfJEbd+(*s!#&(8fjqsV9IqT|I%O9w%t$(ept*x!Ct^XqaVTFL;t5zZK z($731>mD*8_J?!xL5#dF?9p8)9=tvJtKQ|o8o=6v>G$}*)?SDQe~Dk)vA-aF-|phyjB20HK5Q zt`DKKQ7!yN`-6H~hfzkyn|D@7t0UE8yiItPb!sQ8_tdI!J* z@H(`N1mG;3PJdVm4bR}3ylNxKD1{)?J+6{EhKM`N68nh#PxwB1a2ep$1NJ}TB@SID z-J%*@5Bg7+_rtF(W*5up0LM5R#tROZ-`%c1E@vD-9`Sk3pUw}23?tj5m^$<{Y~|47R68y3(SU2~)9H-A__B!5u`SvThol`B`ST>qw| z&;|dH(o1O{JKGu0puS^!tqKclx1C)Z4%yL8;h?Q-;Ag)msv4ySiU%eGQ2wZSK=DB5 zfV#4}XFVs=qj}Z?FW^q1ND;^HL5T}FWI;{p9yU2ZDIIjw(PaXLJh3P}AVweFrmmnt zP)gFnc0004VQb$4nuFf3k0000mP)t-sn9!h%#W7;6C{0hk)&kgO;!X#Di9=AH4AUW1u}VbFip{&fLEbgpuWTeit-pEc)IX~0s_f- zCWgXGgajDB%o#wCG`;}_W!VkqRewQ{G{Zpj;iFr?7Y_mXgE3OH!Ydp2E0kOVK5~#= z`CDi%7V5xdqJOpe`fjZiKZy|mkSTCO%egdDjZBgIG>lva1aAmBF4O<{%ix0B0736z zK`*1!F-ph#J1V#geT>>a3Em})u{~_9aRCeuKkA6{ejy*ej|KiP<>>$)I>ir<-ywAe zq88_IA1(O@`x(|X!`+)X+3H`*57o}j&d%@o0*n|8_YiIOdRqVh002ovPDHLkV1f-9 Bw0i&m delta 407 zcmV;I0cifE1Em9y7=Hu<00013M{Ml?001yhOjJdf(4dfTSO5S3@aVwEuyAllNbu00 zs30Kt`1p8;kkHuJNPxiDaA?3lK(MgDFkq;1gAIoO00A&bL_t(YiS3gyOT$1IhA+YH zm1^i1j_M#-NUvnKNyJfWgsut6_X~v1**=J+Ykz_u(Nz%Q>VHotrRh*`lEzgiv|a|c ze3>2ctnb6U?{OSsH8uYjMOT`tUM2L7E^hrQLGT+hJZx47hGjy>8B#Th5CR}{ff8DM zLka;D<+TH+pn7T_u}v_haN>`~N?G*6>O z&hAj6wIkr=9e=YT#|ZJ5IN}U3e#M7u;S$360^>KFVB*^472WJ{8vjf_lFuP=i_LtB z@3>6zH6^TGp7zh1B_+s?e4pl$@(FTfR-|7kDX6PL*zTwX#<iBx&GH^(N6|cy{s-N>`)zlFD0(UrW(GV*n(QE(!002ovPDHLkV1iR{ BzuW)- diff --git a/graphics/pokemon/togepi/normal.pal b/graphics/pokemon/togepi/normal.pal index 0fb20049a..3d6967dca 100644 --- a/graphics/pokemon/togepi/normal.pal +++ b/graphics/pokemon/togepi/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -144 112 88 +148 115 90 0 0 0 -240 232 192 -200 176 112 -112 72 72 -240 208 160 -168 32 32 -248 248 248 -120 136 144 -208 216 216 -72 128 192 -216 112 104 -192 64 64 -176 176 192 -48 96 168 +246 238 197 +205 156 115 +115 74 74 +246 213 164 +172 32 32 +255 255 255 +123 139 148 +213 222 222 +74 131 197 +222 115 106 +197 65 65 +180 180 197 +49 98 172 diff --git a/graphics/pokemon/togetic/anim_front.png b/graphics/pokemon/togetic/anim_front.png index 1079c2b014888720125726ee8bd7fef75f37be3f..c88c0e4d61ee613687dee1eb16870f3c32ad1ff2 100644 GIT binary patch delta 708 zcmV;#0z3VK2G9kN7=H)@0001tU!Pb20004VQb$4nuFf3k0000mP)t-sn9!hedxQV~ z{{R30ti`?6?(W_}IlUMNDU{|AV!hr$IlUMN000000000000000W3d{Q0006`NklgaHuL_?XI+k8Ne|Fe}ARy*zsc!Ey^oyz+9-- z%JAToO%EHW*!5~-|MIDzDm4t6s`C?x(JhE8vXa}NVtSE9gOE*|^rIkJn?UKABUC>O z;SqLMbdok8Vroz3)+&$@P;yn{NSJT zf^F!=L!PVPPx|AGEe$wygL?Y-c>~RR7^p)`A$hFWgCkqQX^Uw3NpB-6d|mS~%5mfm zHr>nSU|%`p1P(@)w^pw=UH&1Efgfwvr9YYq?3&<5l79z$PYDZPCygK#^E{XHa;*nF z(jkZ+5qQ9k9=!9%;KA(uL3r>mfVKq9 zV?mHzt%)B8Qzgnfc+FI&4+B2r4LW@o@F5EiXwnCcDo(e)6aeKs#oz-54+ecO_<;2O zoj%kHh6hF;3_sxTfG2){yMG?=0PgLcJ^d0J%hR$t)?@*%|H?kQY;8rrOr9glM4D-&1EiT~3Z5~2sV1YPue%GRW{9HsW zK5HZMNTu?_Y2luzuB{d@Ju7?7cR%?}%qCfgoCm|Ue=xzzz##AUzKegS5W|ojZ@D-PCHuwEFSu6T;pqDwEtAhI~A}sz96S? zjq>Kk`s5;DpyZfRF1RLj+S5<8*4;pT`VB7ul4H#cj9bu?_}DnjJ|ZB$9R?@@m2$aA z{V;w$6n}H)c~9Jb-qPvZXS3Y@<;yKBx|GiJ((u0vkW!h=_R@an2~iIo_b%#(bekhP z$RtIiY=g0E+CHbkYkf2i{%u0?mXE zj$Wc(U|>VfzeF$4P#7_o=i3eW5lxLu-OG8{cW^)9SlPEpFP`v0@hjbpM+_w0pZz7lKqh?0**`UL@rmU4}m_z!00Wbd01KtCW7=H)@0001;w}I>c0004VQb$4nuFf3k0000mP)t-sn9!hedxQV~ z{{R30ti`?6?(W_}IlUMNDU{|AV!hr$IlUMN000000000000000W3d{Q00048NklPxlo!B9$n_hX?Vzo#t=J#NV77^>8tq(d z=xG4NsRw4f^-Ce@T7ZDMA4qv0CZK|4V2vecb|TB?&GCC`vL1vRr3K*}A=UO`6?89;h> ziRji-s)iMP^ndjQnEqM4W1&FH>Cr_V89U4f|FfY-@r)j*LFhaG(mOZMVVAtu!C(6Q zsF5ZJ6QD=>?*mZx0)S8?Nk3cAZ;ZU)8Ca`T_cObkO08jMDL>>ijW%Al@f?FdOmXUe@(DuL4mw)6xHs-&Us=TKMRqid; znr>^*0SJh7Vah@Tb_`4seh>B21#sSi6)=+asxQ+LrQ5QHprRtQ!nZHxe$B#)|T^#jq=`}fhK?) z+9R$nHHSuOk%5N*GT<4&%N9Y(jGthAz0~uQ_)^95M_%)A7E?F8;v+WacS$$yZT@Nx zBm*3}PkOn^xi)SfqA2S(A}S4dlh_aPW3lc}o4p1=dpopAn*ku&bW|Kd(|J??7o*X? s%D&4k3c$4m^$vXP>JH%K(EsWB1{oqdE)waMqyPW_07*qoM6N<$g2NoedjJ3c diff --git a/graphics/pokemon/togetic/normal.pal b/graphics/pokemon/togetic/normal.pal index 0b1731459..951bc0f04 100644 --- a/graphics/pokemon/togetic/normal.pal +++ b/graphics/pokemon/togetic/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -112 120 128 -248 248 248 +115 123 131 +255 255 255 0 0 0 -168 192 184 -208 232 232 -216 64 56 -184 24 8 -40 144 224 -16 96 184 -192 48 32 -136 16 16 +172 197 189 +213 238 238 +222 65 57 +189 24 8 +41 148 230 +16 98 189 +222 65 57 +189 24 8 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/totodile/anim_front.png b/graphics/pokemon/totodile/anim_front.png index 49e4fee75ad7f0ce5fcc5477e38bd98c3ab94b51..25e0a234e6d0854573fa83f9cf7ecfcbed86101d 100644 GIT binary patch delta 784 zcmV+r1MmEn2Ac+u7=H)@0001tU!Pb20004VQb$4nuFf3k0000mP)t-s(3rR}gT*mg zgKD(ql-2(b5D@?W|1nyFw6wH)7yz_NQq4gi=6idrgDL;TQn+YnIVFyW0007+Nkl5dmM*FUx}Dc8NftS0}DS0Sl=fp*6VVf_|?2tgW^CO1!C60jj_6LRbMGVtD}3 z4PDP|KLj8yl=PB5)DYH{58lfFSQbCL0gxOJ797CPOYWKPd^Af37XW_tpG*_NkMt?9 zE0CiOk?mcNA%BTrQ>icP=J5!DbDh;h(-gq>ZQu8eM?!GHB~z28wKtLPP4w22_KWGF z26bRRj$^l+^hj&U1Jlb@z@}FZu%A$DY^^443fQ!#&eK~v?SK-v-H&542hIT~v^8kj z_pLQ|;ItTAzhy91e0Fq}0X0N654K0j4@4v{MK*o!T7Tg}*d956nbl$MLvDme1%RSf z2YM6|f+8fYq+SvU3h2?1L9j@Y04LBzfSrW>|IiOY(gD<@x#AZ0^!91py0r}1;Cb^o!>41va|D>1psk= zcIKh7XG?r~k)54=0YLOe7}VE^^<3Hv%II5Sbjp2Qa|Fz3m0a8r; zIsO*`(l{Uh>|^|wYQjno3b3hHWAI|u>ds%S0}#`{-tPM1^wrAb1RR8z!-bHH0UZ#8 z@rUzQtHj_F``8}@r_#^f)6v<(kISau&{U-0GLo%$Uq?IczBS2Ao$>jxM*n3%@h*=000SaNLh0L01m_e01m_fl`9S# z0007vNkl!U-;?b=Ea8R>R%Wq%65^!G<=C3ai{2`dE+ zN)es`QP2b_&|4x(OM(0ZAU6oPJWD(P_YBNlKsNI1wFq=$SKi;vH#f8Le4f|De;RzJ zwOe-%eGXCLKEKm{1ORazpdb?34YW1rd#B*m5E}L-XXnRPS1thb%jx9B{_GQZ3_if# z;AV0W&)(1#N`Ij*PKHjP{TRRkXXlz$=wJ)L9G#p39Fu^G1XQ75M7~9iO~~-P3$Q<< z2nIUwy2co6_UxnF1n!za;vK!azC^%uI-Bie9!tF8^)!zFKbq|K4tq8KlIugP_J9Jm z9tJn_X|9*TG4ri{{CxgF=@N(jgaW+w;PvNc@W2A}$bW?yzI}?ocdM|y$@mb*M(Jf) z$~5ub6G@~}0OPVOfCt+%QiT~)*z<^wXuuyYmOrpjnsbwpWu}YeH=HMgoO3FLi0_Y~ z2Eg~=9Pc(*jesg4;`pcqV&0+@e0(nCft`h+dnqjuZ~;_)j5L)zU?!#C03#QbGz(jX z2AHZ!V}C*jM+$cPd#+T?-w1|p91=}5(ZpYhf5{(^%iCM?2Q;wq2lRGd^9M9=u<{4A z!n!}WBzE^7{(#!u>;51ncQ^Wj9J(f}a!|V){Xq`DMW}f&7XLbq0O;La*$vk0gkol zi*8(4d*A|C6vRDi545B;Sj2g@KmnEK=lW%YgG1`UmSS%#6}dXgk6R z;)cApd5~8A!E$t!2{ZULHc9R7#yq5hS!Kc`wE%|0!ZgvuPn#putVM$&YybcN07*qo JLc0004VQb$4nuFf3k0000mP)t-s(3rR}gT*mg zgKD(ql-2(b5D@?W|1nyFw6wH)7yz_NQq4gi=6idrgDL;TQn+YnIVFyW0004)Nklsx90aQ*2yg;z0_-I0`_n%O!2qaDbH_J8f#HQ3ck|B8U0`0AM*KlAtUqUE?!XXi z^RQC<0FX`2tXOm4N`AG_N5iBG`dWL;{<au&{U-0GLo%$Uq?IczBS2Ao$>jxM*n3%@h*=000SaNLh0L01m_e01m_fl`9S# z0004^Nkler5uJ~um`R@78{ZEMF{OgZOmdZ=h>S#y=QE`2? zu?ZlY251Dz6ay6lvv7c74`opA9-r;q-4y{a7rpN3O8U%};R5yMpnD#s*ZhROGUxlP zLZGq*Gmza?%*!fH&JQ+S} zlhM+*Il!qjuU?L@ngjgGm2KS~67ZQj%ug~d!q93n%6~FHj+_UkiLW)#$+8bfZ$4#R zgtZ@eJ&=pItiw~gGx<3 diff --git a/graphics/pokemon/totodile/normal.pal b/graphics/pokemon/totodile/normal.pal index bf7ef18af..ce70fb252 100644 --- a/graphics/pokemon/totodile/normal.pal +++ b/graphics/pokemon/totodile/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 208 152 184 -32 136 184 -40 88 128 -80 192 216 -152 224 248 +49 131 197 +49 90 131 +106 180 230 +148 213 255 16 16 16 -248 248 248 -64 64 72 -176 176 176 -120 24 0 -152 80 88 -200 64 32 -232 120 120 -144 128 32 -248 224 136 +255 255 255 +49 90 131 +180 180 180 +123 24 0 +180 74 82 +205 65 32 +230 123 123 +172 131 41 +255 197 82 184 104 104 diff --git a/graphics/pokemon/totodile/shiny.pal b/graphics/pokemon/totodile/shiny.pal index 6c3f51204..3bc0bc64c 100644 --- a/graphics/pokemon/totodile/shiny.pal +++ b/graphics/pokemon/totodile/shiny.pal @@ -8,7 +8,7 @@ JASC-PAL 168 248 216 16 16 16 248 248 248 -56 56 56 +24 104 72 176 176 176 24 72 128 136 64 64 diff --git a/graphics/pokemon/typhlosion/anim_front.png b/graphics/pokemon/typhlosion/anim_front.png index a4f46ae24aad76de64828e89b401310bdc5d6cc0..bc4b7c45cccb7b1e341e1e6429808cb640a11c3f 100644 GIT binary patch delta 1358 zcmV-U1+n^o3)Kpc7=H)@0001tU!Pb20004VQb$4nuFf3k0000mP)t-sn9!i!0094D z0RP?q|C|6pT9gPNT0w)Pq>D=b?v!d$DG(44|NsBh#d81v03bnXTV6U&000EjNkl{I|9|@c_avaH8EdwBlY6|NF~aAg4S#d{fw}!i)teq;jD4qH zOoPF{m*tf{0n)6-tnc+CFqQx;pVylVuo$&nO_VQ&#}t6)vZ(xVIx@cxFVYoHlmy*-?-qv*>{ zl2b_bz1z*{{f%JyApnZ;D`I?zJ2@5IS^vVdb^CvYm7EdWs;E&P5{Tj5EbElkCb zqQ@}EN+HZ!Ktu@b!SLDw2hv93tA(jFlHPX!M!bmuu4f|=Uc})19pGQYaMN~#2@6kv z=zk6%7;w`B0pNWm4D=xB3nAzpL_kdgB4ma;C4WG%5Q3HmC4#vibU;a@Owa(QPy1O- zLLtx*-@lYZ_zgESxFn9FJsHmON~yak6mj}Ur09EcB!v1ZM7{jqOaP6brw0juAG_(p{c!^P?#?}$D&Th& z_kX9h3u4*+vSrXt$x^k@8v^X77MisUF^q|4PTH)`s;LG50qkNMKvqpQ5Gd>fuq$7) zW05eZ+Ij#M+k8pqaxuBkYQ`(T5&&mkmlVbeIqO#}vPc}8Ah}wZl4k=9px((^tDQmF z)c{z?zZycr7&=IRGMKUE>Tx23q&w2@jDMNg1Wl=WEWKV8-}^WFaV$q8*UPqt{>?^+ zj-lkxJ@#)B;%?%Ka8Byq)c#Aq3wj2A2*v&lBjO?|{;?#J`!}hLq^=-@LH{Q0MUenr z>E9q>9lcGU_HTfPUi&Nkn|wcs3<>ejzhOpyVFeJoCy)J`har8>w&(uMJfZe)XnzDr zEfe+_A$`>`hHDq6ACF&k?%y0C7=z;QaL;V+dCwN8e?#{sB+wKW0tCL7Y8K)k3&1yz zZZX^m>1wOxkpTy8gxCXW0kvEVp0<@naQSNIo(UeWM|uqTa&;?u^W7HCL9vs^)k3K_ zC-rv=FAMj}N)`(*E{E<)aBnLAYk%*cuEcBxZoLEl$^un9Qt3b4!?_?G_pzL-d{n$Y*{vSga80dm{v@iqkFH%7D z`$f&|gI!DkxL!@ogDcdZ1ds@U`!DCU^2e9C>d}H+ncn&a>Bn5|`qDno4o7CVspHSv z?!hm}ovdi#afXH=0%G4lKDpcW!PC(C20cRD1zO)AKc%z}27QA<_}}e=KmF8s1H`>C QbpQYW07*qoM6N<$f~Tv9c>n+a delta 1401 zcmV-<1%~?73V;ic7=Hu<0000^sfSHnukCs~c1%5d-+$$9 zne!Wj)ctO^dw>3Ok*`rI0w+iH4&=LM2ge9(5^B3rk&}Z?_x!Zm^?f8-lu|igKRfB3 zcMc#A1eS1=Ro2ga|JSnfJ;3{%-`>6#%#m zGEw(g|EGHnFaWYm5Q+LBR%dw$SRw3!E1uN`B%)ac^r?&CNN2gx?~gyu`Y{53@Vu+6 zBD%F`5RWHFP<&nf7%)D6Sd!*~Hvs|9e^m3tN~YG$B$KgkfA1e@MAW?L<-pax?N2oT z^1X{}v42B<|G5SaAi_i0k8-I z(5MP{m#w||P0e*&C-W}`e_(HJIUK-u4YxH|4*=Y@LmeF5jxNP^JeVUb z2R({w$P?T3?DlpGnwax7ciY=;fk(l4V}Dv|4a~=OYY$9{>uOUi1NOYVUC-OiMwY$| z4se6ghGw3lEwhIH=LP&=ywtY|M>1x=8ca}WfllvU@O(>ASXv6c8;?83PeGk;Aw8V^PT39x#XRRTp_|dmrH>6Fax>D z5Zr@daFfzK@O79Zj0^XG!{$iOHv`ce7)?+KgeDQvRO}l>1acll{AO5UMXbr6>!%7Z zKDpyGj-M*PvdJy#P$xS#F=7j?0(S>Oi;)Vb?m!3L$t`jq>=moIUpz{Cb#lX>E_%Ij zfrgJ#1?zWi9>6+V^W+{YByUBHm3M%cCkfipm3$g={(2TMw-2koBmlfa^#-(okO1%w z(jNj6OX2^rcgP75P`m>M=(rXZ5o;e%^I^GEpUDwNS%v=q3k?MsD);c000000NkvXX Hu0mjfo?VG_ diff --git a/graphics/pokemon/typhlosion/back.png b/graphics/pokemon/typhlosion/back.png index 3252c26e906c07fc71b9d726ec69b149ed3b09b9..81bcbd42b6d14f5aaf013c92cc2613fba8c4ae0e 100644 GIT binary patch delta 746 zcmVc0004VQb$4nuFf3kks&{SuSrBfR9J=G*4wtD zAPffJ1_H8-EZ+ZZCkbbz>Y857VOEFcgrX)00Z7}q8XG0mzDqyKo(@2J_)g9f&qQC ztpses0GPZ8Ns*L)Ea#2BdyFfO71r~^>|@>!LrJkLnnsT^Ge z(_1K$)PdjtK+s3v(@3-j?EuQwlQ(Ry4yaffD1QUx+I0yk=MRiPX&&{T?XsNmbmS2X z?{xr8j#@l_pIPmn?@sioKof9m0ZkvOttUkDLGqt$d`1B$VSZui1uF9=(~_egdHmKv zU4@>%8Gu~cOnzJcHvp#!7f0ynGd;4Cr#o_f^>ibR7FC&ZS3xPrlv&z0K=j8d_Yo0A150J075A zi=gYkng@-?7-(^Dl8>MAxon>va9(!evVU5IwP32#@+(2#^A}?ABkJbx<#rBF#&Y$w zTnLZEZ43Dpc(;W6yqkbU`dtIPg;oA`1ZQ9&yjcP7f$s}=ZeS1LvIAc>P*$+t0QU{l z5zq}uaGP&4jC9^cFM&El*~oEaJgi`7A+C*w28LfoF*f7xfR0QfeF9uqRwtf-bw1o) cS^rY~0a;y2C;7b&_y7O^07*qoM6N<$f<0kRJOBUy delta 787 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 diff --git a/graphics/pokemon/xatu/front.png b/graphics/pokemon/xatu/front.png index 93c7947632917c03109708c89b8efe36b6a13592..e90c44fadf83ad6e80182169700b909ca0bab413 100644 GIT binary patch delta 576 zcmV-G0>Ay@1kD7H7=H)@0001;w}I>c0004VQb$4nuFf3k0000mP)t-s0I=vvltGl$ zK`Ck}w2L5fy+QxIF^gIN5D*am|NoSflu}YsgDC*CF#yfY&F(n>0ir$x0005YNkl6YOcXzLcVmAb{OqMxV1D z5WM#h+sT;dORj{p@BIV;pa~8aIWIYL1TBCGyaKQsfNp~LL6Eha1Vs%8pe{uSx(E*d z6I6i1Ujan`TtYwL82|(_nh4<$fFH#Z&_#F&u!E z|8V*X@!y4`3H0|F6MdB1hf*+jGC*ob9d^D=!andN79KoFcf0|BO3MRKo1g%kgQxUB z0f-cT0yHH6a1B|w1Bw$~4wD;zH1?BmJK9E+ay8P>(Vn0zx26F=Oz3>B#{u!{2sDiy z4JZ1mXmc7=Hu<00013M{Ml?001yhOjJbxu;@sTK#hp0P*6~SC;+f90LaM5=r{mYM@p#x00HeuL_t(YiQUt&OT$1E2JjOL z2HU~23K?9Cbhn7mRXNn9gOx7M5*?*~!D$CiYU_M0b~Xq_2Y;cpqK*#ME)E?`T?5hs zaS@EfOIqpBdvz5bA1Y zKq+l;n@HfPZj5uzuQ=~KC20f%7U#kyRP$6fen9650Do2h%A#XabqNWITmsS3hXEmk z;{(NwK8PY^i9W#UmI06z#GVfZOZZ<|>@Fb6&j`!?MSp=q$UHj!paY=9t)i%iibIxk zbU%UMaU*UV;OEm^@39A_)&S6ykJtPlL=CF9KVV6HqFT?%N4~H=*w7!A>j9?D zdw(VaV@`h>GR)tBapa-FkOqV6=9k^31^f9yo!85r*J70AU%a|14|DDW{WRurmC*Y2 jS)qIm7VY6*z+anhmK7jnEFVYx00000NkvXXu0mjfxeW=o diff --git a/graphics/pokemon/xatu/normal.pal b/graphics/pokemon/xatu/normal.pal index eb20bf6ae..05aeca9fc 100644 --- a/graphics/pokemon/xatu/normal.pal +++ b/graphics/pokemon/xatu/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 0 176 232 -72 144 64 -144 208 64 -40 104 40 -176 136 32 -112 184 64 -248 184 48 -136 88 0 +74 148 65 +148 213 65 +41 106 41 +180 139 32 +115 189 65 +255 189 49 +139 90 0 16 16 16 -248 248 248 -144 144 144 -80 80 80 -128 40 0 -176 48 0 -200 200 200 -232 56 0 +255 255 255 +148 148 148 +82 82 82 +131 41 0 +180 49 0 +205 205 205 +238 57 0 From 8ccffa617aa0b335aca2a18225fa95bd5243033e Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 26 Feb 2023 19:47:44 +0100 Subject: [PATCH 31/32] fix createspriteontargets on electricy anim --- data/battle_anim_scripts.s | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 75a831a33..46c7d3fbc 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -24206,21 +24206,21 @@ WaterBubblesEffectLong: ElectricityEffect: playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET ElectricityEffectNoSound: - createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, 5, 0, 5, 0, ANIM_TARGET + createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 5, 0, 5, 0, ANIM_TARGET delay 2 - createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, -5, 10, 5, 1, ANIM_TARGET + createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -5, 10, 5, 1, ANIM_TARGET delay 2 - createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, 15, 20, 5, 2, ANIM_TARGET + createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 15, 20, 5, 2, ANIM_TARGET delay 2 - createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, -15, -10, 5, 0, ANIM_TARGET + createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -15, -10, 5, 0, ANIM_TARGET delay 2 - createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, 25, 0, 5, 1, ANIM_TARGET + createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 25, 0, 5, 1, ANIM_TARGET delay 2 - createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, -8, 8, 5, 2, ANIM_TARGET + createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -8, 8, 5, 2, ANIM_TARGET delay 2 - createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, 2, -8, 5, 0, ANIM_TARGET + createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 2, -8, 5, 0, ANIM_TARGET delay 2 - createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, -20, 15, 5, 1, ANIM_TARGET + createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -20, 15, 5, 1, ANIM_TARGET return ElectricityEffect_OnTargets: From 41bf9ea63ce4ea5b348ab573fefbcd24d38517e2 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 26 Feb 2023 18:43:15 -0300 Subject: [PATCH 32/32] Removed trailing whitespaces --- asm/macros/battle_anim_script.inc | 6 +- asm/macros/battle_script.inc | 8 +- data/battle_anim_scripts.s | 152 +++++++++--------- data/battle_scripts_1.s | 18 +-- src/battle_anim.c | 42 ++--- src/battle_anim_ice.c | 2 +- .../pokemon_graphics/back_pic_coordinates.h | 2 +- .../pokemon_graphics/front_pic_coordinates.h | 132 +++++++-------- .../pokemon_graphics/shiny_palette_table.h | 2 +- src/debug.c | 2 +- src/easy_chat.c | 4 +- src/event_object_movement.c | 2 +- src/expansion_intro.c | 4 +- src/field_specials.c | 4 +- src/frontier_util.c | 2 +- src/mini_printf.c | 16 +- src/rom_header_gf.c | 4 +- src/trade.c | 4 +- test/ability_insomnia.c | 6 +- test/ability_water_absorb.c | 4 +- 20 files changed, 208 insertions(+), 208 deletions(-) diff --git a/asm/macros/battle_anim_script.inc b/asm/macros/battle_anim_script.inc index 6ff387690..85320bd3b 100644 --- a/asm/macros/battle_anim_script.inc +++ b/asm/macros/battle_anim_script.inc @@ -270,7 +270,7 @@ .macro stopsound .byte 0x2f .endm - + @ same as createvisualtask except takes in battlerargindex, which is the battle anim arg index of the battler to loop through .macro createvisualtaskontargets addr:req, priority:req, battlerargindex:req, argv:vararg .byte 0x30 @@ -282,7 +282,7 @@ .2byte \argv .Lcreatetask_\@_2: .endm - + @ same as createsprite except takes in battlerargindex, which is the battle anim arg index of the battler to loop through .macro createspriteontargets template:req, anim_battler:req, subpriority_offset:req, battlerargindex:req, argv:vararg .byte 0x31 @@ -298,7 +298,7 @@ .2byte \argv .Lsprite_\@_2: .endm - + @ does not overwrite gBattleAnimArgs[battlerargindex], some sprite templates are too dependent on the value (e.g. heal block) .macro createspriteontargets_onpos template:req, anim_battler:req, subpriority_offset:req, battlerargindex:req, argv:vararg .byte 0x32 diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 66c60a7cf..c96b5fdd2 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -1299,7 +1299,7 @@ .byte 0xfe .4byte \failInstr .endm - + .macro callnative func:req .byte 0xff .4byte \func @@ -1317,7 +1317,7 @@ .2byte \holdEffect .4byte \jumpInstr .endm - + .macro jumpifmorethanhalfHP battler:req, jumpInstr:req callnative BS_JumpIfMoreThanHalfHP .byte \battler @@ -1328,7 +1328,7 @@ .macro cancelmultiturnmoves battler:req various \battler, VARIOUS_CANCEL_MULTI_TURN_MOVES .endm - + @ Stores Healing Wish effect. .macro storehealingwish battler:req various \battler, VARIOUS_STORE_HEALING_WISH @@ -1954,7 +1954,7 @@ .macro shellsidearmcheck various BS_ATTACKER, VARIOUS_SHELL_SIDE_ARM_CHECK .endm - + .macro jumpifrodaffected battler:req, jumpInstr:req various \battler, VARIOUS_JUMP_IF_ROD .4byte \jumpInstr diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 46c7d3fbc..cd011c0f4 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -12036,168 +12036,168 @@ ShellTrapUnleash: monbg ANIM_TARGET waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 0x10 delay 0x6 - createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 + createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 + createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 + createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 + createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 + createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 + createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 + createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 + createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 + createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x0 - createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 + createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x0 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 0x2 - createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x4 - createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 + createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x4 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 0x2 - createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x8 - createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 + createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x8 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 0x2 - createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0xc - createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 + createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0xc + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 0x2 - createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x10 - createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 + createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x10 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 0x2 - createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x14 - createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 + createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x14 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 0x2 - createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x18 - createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 + createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x18 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER - createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 - createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 + createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2 delay 0x5 waitforvisualfinish call ShellTrapFireLaunch1 - createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0, 0x38, 0x4, 0x4, 0x1 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0, 0x38, 0x4, 0x4, 0x1 delay 0x3 - createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xfff6, 0x0, 0xfff6, 0x38, 0x4, 0x4, 0x1 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xfff6, 0x0, 0xfff6, 0x38, 0x4, 0x4, 0x1 delay 0x3 - createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xa, 0x0, 0xa, 0x38, 0xfffc, 0x3, 0x1 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xa, 0x0, 0xa, 0x38, 0xfffc, 0x3, 0x1 delay 0x3 - createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xffec, 0x0, 0xffec, 0x38, 0xfffc, 0x5, 0x1 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xffec, 0x0, 0xffec, 0x38, 0xfffc, 0x5, 0x1 delay 0x3 call ShellTrapFireLaunch2 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER - createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 delay 0x3 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER - createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 delay 0x3 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER - createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 delay 0x3 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER - createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 delay 0x3 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER - createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 delay 0x3 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER - createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 delay 0x3 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER - createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 delay 0x3 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER - createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 delay 0x3 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER - createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 delay 0x3 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER - createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 delay 0x3 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER - createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 delay 0x3 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER - createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 delay 0x3 waitforvisualfinish clearmonbg ANIM_TARGET end ShellTrapFireLaunch1: - createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0, 0x38, 0x4, 0x4, 0x1 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0, 0x38, 0x4, 0x4, 0x1 delay 0x3 - createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xfff6, 0x0, 0xfff6, 0x38, 0x4, 0x4, 0x1 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xfff6, 0x0, 0xfff6, 0x38, 0x4, 0x4, 0x1 delay 0x3 - createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xa, 0x0, 0xa, 0x38, 0xfffc, 0x3, 0x1 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xa, 0x0, 0xa, 0x38, 0xfffc, 0x3, 0x1 delay 0x3 - createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xffec, 0x0, 0xffec, 0x38, 0xfffc, 0x5, 0x1 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xffec, 0x0, 0xffec, 0x38, 0xfffc, 0x5, 0x1 delay 0x3 - createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xf, 0x0, 0xf, 0x38, 0x4, 0x4, 0x1 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xf, 0x0, 0xf, 0x38, 0x4, 0x4, 0x1 delay 0x3 - createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xffec, 0x0, 0xffec, 0x38, 0x4, 0x4, 0x1 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xffec, 0x0, 0xffec, 0x38, 0x4, 0x4, 0x1 delay 0x3 - createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0x14, 0x0, 0x14, 0x38, 0x4, 0x4, 0x1 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0x14, 0x0, 0x14, 0x38, 0x4, 0x4, 0x1 delay 0x3 return ShellTrapFireLaunch2: - createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0, 0x38, 0x4, 0x4, 0x1 - createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0, 0x38, 0x4, 0x4, 0x1 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 0x3 - createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xfff6, 0x0, 0xfff6, 0x38, 0x4, 0x4, 0x1 - createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xfff6, 0x0, 0xfff6, 0x38, 0x4, 0x4, 0x1 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 0x3 - createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xa, 0x0, 0xa, 0x38, 0xfffc, 0x3, 0x1 - createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xa, 0x0, 0xa, 0x38, 0xfffc, 0x3, 0x1 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 0x3 - createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xffec, 0x0, 0xffec, 0x38, 0xfffc, 0x5, 0x1 - createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xffec, 0x0, 0xffec, 0x38, 0xfffc, 0x5, 0x1 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 0x3 - createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xf, 0x0, 0xf, 0x38, 0x4, 0x4, 0x1 - createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xf, 0x0, 0xf, 0x38, 0x4, 0x4, 0x1 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 0x3 - createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xffec, 0x0, 0xffec, 0x38, 0x4, 0x4, 0x1 - createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xffec, 0x0, 0xffec, 0x38, 0x4, 0x4, 0x1 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 0x3 - createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0x14, 0x0, 0x14, 0x38, 0x4, 0x4, 0x1 - createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 + createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0x14, 0x0, 0x14, 0x38, 0x4, 0x4, 0x1 + createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001 playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 0x3 return @@ -14367,7 +14367,7 @@ Move_SCORCHING_SANDS:: Move_JUNGLE_HEALING:: goto Move_AROMATHERAPY - + Move_SILK_TRAP:: loadspritegfx ANIM_TAG_PROTECT loadspritegfx ANIM_TAG_SPIDER_WEB @@ -14376,11 +14376,11 @@ Move_SILK_TRAP:: createsprite gSpiderWebSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, FALSE waitforvisualfinish createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_PROTECT, 0, 10, 10, RGB_LIME_GREEN - monbg ANIM_ATK_PARTNER - waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 0x10 + monbg ANIM_ATK_PARTNER + waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 0x10 createsprite gProtectSpriteTemplate, ANIM_ATTACKER, 2, 24, 0, 90 waitforvisualfinish - clearmonbg ANIM_ATK_PARTNER + clearmonbg ANIM_ATK_PARTNER end Move_WICKED_BLOW:: diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 0d8f80f77..35d8db8dd 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -418,7 +418,7 @@ gBattleScriptsForMoveEffects:: .4byte BattleScript_EffectTeatime @ EFFECT_TEATIME .4byte BattleScript_EffectAttackUpUserAlly @ EFFECT_ATTACK_UP_USER_ALLY .4byte BattleScript_EffectShellTrap @ EFFECT_SHELL_TRAP - + BattleScript_EffectAttackUpUserAlly: jumpifnoally BS_ATTACKER, BattleScript_EffectAttackUp attackcanceler @@ -461,7 +461,7 @@ BattleScript_EffectTeatime:: attackstring ppreduce jumpifteanoberry BattleScript_ButItFailed -@ at least one battler is affected +@ at least one battler is affected attackanimation waitanimation BattleScript_TeatimeLoop: @@ -561,7 +561,7 @@ BattleScript_AffectionBasedStatusHeal_Continue: BattleScript_ShellTrapSetUp:: printstring STRINGID_EMPTYSTRING3 waitmessage 0x1 - playanimation BS_ATTACKER, B_ANIM_SHELL_TRAP_SETUP, NULL + playanimation BS_ATTACKER, B_ANIM_SHELL_TRAP_SETUP, NULL printstring STRINGID_PREPARESHELLTRAP waitmessage B_WAIT_TIME_LONG end2 @@ -1428,7 +1428,7 @@ BattleScript_DoubleShockRemoveType:: printstring STRINGID_ATTACKERLOSTELECTRICTYPE waitmessage B_WAIT_TIME_LONG return - + BattleScript_EffectPurify: attackcanceler attackstring @@ -3342,7 +3342,7 @@ BattleScript_AbilityProtectsDoesntAffect: call BattleScript_AbilityProtectsDoesntAffectRet orhalfword gMoveResultFlags, MOVE_RESULT_FAILED goto BattleScript_MoveEnd - + BattleScript_InsomniaProtects: pause B_WAIT_TIME_SHORT call BattleScript_AbilityPopUp @@ -3435,7 +3435,7 @@ BattleScript_EffectFreezeHit:: BattleScript_EffectParalyzeHit:: setmoveeffect MOVE_EFFECT_PARALYSIS goto BattleScript_EffectHit - + BattleScript_EffectExplosion_AnimDmgRet: jumpifbyte CMP_NO_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_MISSED, BattleScript_ExplosionAnimRet call BattleScript_PreserveMissedBitDoMoveAnim @@ -4255,7 +4255,7 @@ BattleScript_BattleScript_EffectParalyzeNoTypeCalc: resultmessage waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd - + BattleScript_VoltAbsorbHeal: copybyte gBattlerAbility, gBattlerTarget tryhealquarterhealth BS_TARGET BattleScript_MonMadeMoveUseless @ Check if max hp @@ -7727,7 +7727,7 @@ BattleScript_GrudgeTakesPp:: printstring STRINGID_PKMNLOSTPPGRUDGE waitmessage B_WAIT_TIME_LONG return - + BattleScript_MagicCoatBounce:: attackstring ppreduce @@ -8009,7 +8009,7 @@ BattleScript_AftermathDmg:: waitmessage B_WAIT_TIME_LONG tryfaintmon BS_ATTACKER return - + BattleScript_DampPreventsAftermath:: pause B_WAIT_TIME_SHORT call BattleScript_AbilityPopUp diff --git a/src/battle_anim.c b/src/battle_anim.c index a7faec1fd..724587588 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -447,14 +447,14 @@ static u8 GetBattleAnimMoveTargets(u8 battlerArgIndex, u8 *targets) case MOVE_TARGET_FOES_AND_ALLY: targets[0] = gBattleAnimArgs[battlerArgIndex]; numTargets = 1; - + if (IsBattlerAlive(targets[0] ^ BIT_FLANK)) { targets[1] = targets[0] ^ BIT_FLANK; numTargets++; } - + if (IsBattlerAlive(gBattleAnimAttacker ^ BIT_FLANK)) { - targets[2] = gBattleAnimAttacker ^ BIT_FLANK; + targets[2] = gBattleAnimAttacker ^ BIT_FLANK; numTargets++; } break; @@ -463,14 +463,14 @@ static u8 GetBattleAnimMoveTargets(u8 battlerArgIndex, u8 *targets) numTargets = 1; break; } - + return numTargets; } static s16 GetSubpriorityForMoveAnim(u8 argVar) { s16 subpriority; - + if (argVar & ANIMSPRITE_IS_TARGET) { argVar ^= ANIMSPRITE_IS_TARGET; @@ -493,7 +493,7 @@ static s16 GetSubpriorityForMoveAnim(u8 argVar) if (subpriority < 3) subpriority = 3; - + return subpriority; } @@ -519,7 +519,7 @@ static void Cmd_createsprite(void) gBattleAnimArgs[i] = T1_READ_16(sBattleAnimScriptPtr); sBattleAnimScriptPtr += 2; } - + subpriority = GetSubpriorityForMoveAnim(argVar); CreateSpriteAndAnimate( @@ -536,22 +536,22 @@ static void CreateSpriteOnTargets(const struct SpriteTemplate *template, u8 argV u8 targets[MAX_BATTLERS_COUNT]; int ntargets; s16 subpriority; - + for (i = 0; i < argsCount; i++) { gBattleAnimArgs[i] = T1_READ_16(sBattleAnimScriptPtr); sBattleAnimScriptPtr += 2; } - + subpriority = GetSubpriorityForMoveAnim(argVar); - + ntargets = GetBattleAnimMoveTargets(battlerArgIndex, targets); - + for (i = 0; i < ntargets; i++) { - + if (overwriteAnimTgt) gBattleAnimArgs[battlerArgIndex] = targets[i]; - + CreateSpriteAndAnimate( template, GetBattlerSpriteCoord(targets[i], BATTLER_COORD_X_2), @@ -575,13 +575,13 @@ static void Cmd_createspriteontargets_onpos(void) argVar = sBattleAnimScriptPtr[0]; sBattleAnimScriptPtr++; - + battlerArgIndex = sBattleAnimScriptPtr[0]; sBattleAnimScriptPtr++; argsCount = sBattleAnimScriptPtr[0]; sBattleAnimScriptPtr++; - + CreateSpriteOnTargets(template, argVar, battlerArgIndex, argsCount, FALSE); } @@ -599,13 +599,13 @@ static void Cmd_createspriteontargets(void) argVar = sBattleAnimScriptPtr[0]; sBattleAnimScriptPtr++; - + battlerArgIndex = sBattleAnimScriptPtr[0]; sBattleAnimScriptPtr++; argsCount = sBattleAnimScriptPtr[0]; sBattleAnimScriptPtr++; - + CreateSpriteOnTargets(template, argVar, battlerArgIndex, argsCount, TRUE); } @@ -656,21 +656,21 @@ static void Cmd_createvisualtaskontargets(void) taskPriority = sBattleAnimScriptPtr[0]; sBattleAnimScriptPtr++; - + battlerArgIndex = sBattleAnimScriptPtr[0]; sBattleAnimScriptPtr++; numArgs = sBattleAnimScriptPtr[0]; sBattleAnimScriptPtr++; - + // copy task arguments for (i = 0; i < numArgs; i++) { gBattleAnimArgs[i] = T1_READ_16(sBattleAnimScriptPtr); sBattleAnimScriptPtr += 2; } - + numArgs = GetBattleAnimMoveTargets(battlerArgIndex, targets); - + for (i = 0; i < numArgs; i++) { gBattleAnimArgs[battlerArgIndex] = targets[i]; diff --git a/src/battle_anim_ice.c b/src/battle_anim_ice.c index 44c1a4f22..e6a5607b5 100644 --- a/src/battle_anim_ice.c +++ b/src/battle_anim_ice.c @@ -1289,7 +1289,7 @@ static void InitPoisonGasCloudAnim(struct Sprite *sprite) sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2); sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET); - + #if B_UPDATED_MOVE_DATA >= GEN_5 { s16 x, y; diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 8dbc2d2a9..5593e10a7 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -518,7 +518,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_DARKRAI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SHAYMIN] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, [SPECIES_ARCEUS] = ARCEUS_BACK_PIC_COORDS, -#endif +#endif #if P_GEN_5_POKEMON == TRUE [SPECIES_VICTINI] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 7 }, [SPECIES_SNIVY] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 }, diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index a484b8596..ca880e7ef 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -920,7 +920,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_OVERQWIL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_ENAMORUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, #endif - // Megas + // Megas [SPECIES_VENUSAUR_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_CHARIZARD_MEGA_X] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CHARIZARD_MEGA_Y] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -974,11 +974,11 @@ const struct MonCoords gMonFrontPicCoords[] = #if P_GEN_6_POKEMON == TRUE [SPECIES_DIANCIE_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, #endif - // Special Mega + Primals + // Special Mega + Primals [SPECIES_RAYQUAZA_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_KYOGRE_PRIMAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_GROUDON_PRIMAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - // Alolan Forms + // Alolan Forms [SPECIES_RATTATA_ALOLAN] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, [SPECIES_RATICATE_ALOLAN] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_RAICHU_ALOLAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -997,7 +997,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_MUK_ALOLAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_EXEGGUTOR_ALOLAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_MAROWAK_ALOLAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - // Galarian Forms + // Galarian Forms [SPECIES_MEOWTH_GALARIAN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, [SPECIES_PONYTA_GALARIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, [SPECIES_RAPIDASH_GALARIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -1042,15 +1042,15 @@ const struct MonCoords gMonFrontPicCoords[] = #if P_GEN_7_POKEMON == TRUE [SPECIES_DECIDUEYE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, #endif - // Misc Forms - // Cosplay Pikachu + // Misc Forms + // Cosplay Pikachu [SPECIES_PIKACHU_COSPLAY] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, [SPECIES_PIKACHU_ROCK_STAR] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, [SPECIES_PIKACHU_BELLE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, [SPECIES_PIKACHU_POP_STAR] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, [SPECIES_PIKACHU_PH_D] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, [SPECIES_PIKACHU_LIBRE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, - // Cap Pikachu + // Cap Pikachu [SPECIES_PIKACHU_ORIGINAL_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, [SPECIES_PIKACHU_HOENN_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, [SPECIES_PIKACHU_SINNOH_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, @@ -1059,9 +1059,9 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_PIKACHU_ALOLA_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, [SPECIES_PIKACHU_PARTNER_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, [SPECIES_PIKACHU_WORLD_CAP] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, - // Pichu + // Pichu [SPECIES_PICHU_SPIKY_EARED] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 14 }, - // Unown + // Unown [SPECIES_UNOWN_B] = { .size = MON_COORDS_SIZE(24, 32), .y_offset = 16 }, [SPECIES_UNOWN_C] = { .size = MON_COORDS_SIZE(32, 32), .y_offset = 16 }, [SPECIES_UNOWN_D] = { .size = MON_COORDS_SIZE(32, 32), .y_offset = 16 }, @@ -1089,40 +1089,40 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_UNOWN_Z] = { .size = MON_COORDS_SIZE(24, 32), .y_offset = 16 }, [SPECIES_UNOWN_EMARK] = { .size = MON_COORDS_SIZE(24, 40), .y_offset = 15 }, [SPECIES_UNOWN_QMARK] = { .size = MON_COORDS_SIZE(24, 40), .y_offset = 13 }, - // Castform + // Castform [SPECIES_CASTFORM_SUNNY] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 9 }, [SPECIES_CASTFORM_RAINY] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 9 }, [SPECIES_CASTFORM_SNOWY] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 8 }, - // Deoxys + // Deoxys [SPECIES_DEOXYS_ATTACK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_DEOXYS_DEFENSE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_DEOXYS_SPEED] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, #if P_GEN_4_POKEMON == TRUE - // Burmy + // Burmy [SPECIES_BURMY_SANDY_CLOAK] = { .size = MON_COORDS_SIZE(32, 56), .y_offset = 12 }, [SPECIES_BURMY_TRASH_CLOAK] = { .size = MON_COORDS_SIZE(32, 56), .y_offset = 8 }, - // Wormadam + // Wormadam [SPECIES_WORMADAM_SANDY_CLOAK] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 10 }, [SPECIES_WORMADAM_TRASH_CLOAK] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 10 }, - // Cherrim + // Cherrim [SPECIES_CHERRIM_SUNSHINE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, - // Shellos + // Shellos [SPECIES_SHELLOS_EAST_SEA] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, - // Gastrodon + // Gastrodon [SPECIES_GASTRODON_EAST_SEA] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, - // Rotom + // Rotom [SPECIES_ROTOM_HEAT] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 10 }, [SPECIES_ROTOM_WASH] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_ROTOM_FROST] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_ROTOM_FAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, [SPECIES_ROTOM_MOW] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 12 }, - // Origin Forme + // Origin Forme [SPECIES_DIALGA_ORIGIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_PALKIA_ORIGIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_GIRATINA_ORIGIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - // Shaymin + // Shaymin [SPECIES_SHAYMIN_SKY] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, - // Arceus + // Arceus [SPECIES_ARCEUS_FIGHTING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_ARCEUS_FLYING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_ARCEUS_POISON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -1142,42 +1142,42 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_ARCEUS_FAIRY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, #endif #if P_GEN_5_POKEMON == TRUE - // Basculin + // Basculin [SPECIES_BASCULIN_BLUE_STRIPED] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 16 }, [SPECIES_BASCULIN_WHITE_STRIPED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 10 }, - // Darmanitan + // Darmanitan [SPECIES_DARMANITAN_ZEN_MODE] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, - // Deerling + // Deerling [SPECIES_DEERLING_SUMMER] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 11 }, [SPECIES_DEERLING_AUTUMN] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 11 }, [SPECIES_DEERLING_WINTER] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 11 }, - // Sawsbuck + // Sawsbuck [SPECIES_SAWSBUCK_SUMMER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SAWSBUCK_AUTUMN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SAWSBUCK_WINTER] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - // Therian Forms + // Therian Forms [SPECIES_TORNADUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_THUNDURUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_LANDORUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - // Kyurem + // Kyurem [SPECIES_KYUREM_WHITE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_KYUREM_BLACK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - // Keldeo + // Keldeo [SPECIES_KELDEO_RESOLUTE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - // Meloetta + // Meloetta [SPECIES_MELOETTA_PIROUETTE] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 2 }, - // Genesect + // Genesect [SPECIES_GENESECT_DOUSE_DRIVE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_GENESECT_SHOCK_DRIVE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_GENESECT_BURN_DRIVE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_GENESECT_CHILL_DRIVE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, #endif #if P_GEN_6_POKEMON == TRUE - // Greninja + // Greninja [SPECIES_GRENINJA_BATTLE_BOND] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_GRENINJA_ASH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - // Vivillon + // Vivillon [SPECIES_VIVILLON_POLAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_VIVILLON_TUNDRA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_VIVILLON_CONTINENTAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -1197,23 +1197,23 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_VIVILLON_JUNGLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_VIVILLON_FANCY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_VIVILLON_POKE_BALL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - // Flabébé + // Flabébé [SPECIES_FLABEBE_YELLOW_FLOWER] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, [SPECIES_FLABEBE_ORANGE_FLOWER] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, [SPECIES_FLABEBE_BLUE_FLOWER] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, [SPECIES_FLABEBE_WHITE_FLOWER] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, - // Floette + // Floette [SPECIES_FLOETTE_YELLOW_FLOWER] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, [SPECIES_FLOETTE_ORANGE_FLOWER] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, [SPECIES_FLOETTE_BLUE_FLOWER] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, [SPECIES_FLOETTE_WHITE_FLOWER] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, [SPECIES_FLOETTE_ETERNAL_FLOWER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - // Florges + // Florges [SPECIES_FLORGES_YELLOW_FLOWER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_FLORGES_ORANGE_FLOWER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_FLORGES_BLUE_FLOWER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_FLORGES_WHITE_FLOWER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - // Furfrou + // Furfrou [SPECIES_FURFROU_HEART_TRIM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, [SPECIES_FURFROU_STAR_TRIM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, [SPECIES_FURFROU_DIAMOND_TRIM] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, @@ -1223,41 +1223,41 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_FURFROU_LA_REINE_TRIM] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, [SPECIES_FURFROU_KABUKI_TRIM] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, [SPECIES_FURFROU_PHARAOH_TRIM] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, - // Meowstic + // Meowstic [SPECIES_MEOWSTIC_FEMALE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, - // Aegislash + // Aegislash [SPECIES_AEGISLASH_BLADE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - // Pumpkaboo + // Pumpkaboo [SPECIES_PUMPKABOO_SMALL] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 15 }, [SPECIES_PUMPKABOO_LARGE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 12 }, [SPECIES_PUMPKABOO_SUPER] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, - // Gourgeist + // Gourgeist [SPECIES_GOURGEIST_SMALL] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 5 }, [SPECIES_GOURGEIST_LARGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_GOURGEIST_SUPER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - // Xerneas + // Xerneas [SPECIES_XERNEAS_ACTIVE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - // Zygarde + // Zygarde [SPECIES_ZYGARDE_10] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_ZYGARDE_COMPLETE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - // Hoopa + // Hoopa [SPECIES_HOOPA_UNBOUND] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, #endif #if P_GEN_7_POKEMON == TRUE - // Oricorio + // Oricorio [SPECIES_ORICORIO_POM_POM] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, [SPECIES_ORICORIO_PAU] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, [SPECIES_ORICORIO_SENSU] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, - // Rockruff + // Rockruff [SPECIES_ROCKRUFF_OWN_TEMPO] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, - // Lycanroc + // Lycanroc [SPECIES_LYCANROC_MIDNIGHT] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, [SPECIES_LYCANROC_DUSK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - // Wishiwashi + // Wishiwashi [SPECIES_WISHIWASHI_SCHOOL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, - // Silvally + // Silvally [SPECIES_SILVALLY_FIGHTING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SILVALLY_FLYING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SILVALLY_POISON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -1275,7 +1275,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_SILVALLY_DRAGON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SILVALLY_DARK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SILVALLY_FAIRY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - // Minior + // Minior [SPECIES_MINIOR_METEOR_ORANGE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, [SPECIES_MINIOR_METEOR_YELLOW] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, [SPECIES_MINIOR_METEOR_GREEN] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, @@ -1289,26 +1289,26 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_MINIOR_CORE_BLUE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, [SPECIES_MINIOR_CORE_INDIGO] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, [SPECIES_MINIOR_CORE_VIOLET] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, - // Mimikyu + // Mimikyu [SPECIES_MIMIKYU_BUSTED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, - // Necrozma + // Necrozma [SPECIES_NECROZMA_DUSK_MANE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_NECROZMA_DAWN_WINGS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_NECROZMA_ULTRA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - // Magearna + // Magearna [SPECIES_MAGEARNA_ORIGINAL_COLOR] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, #endif #if P_GEN_8_POKEMON == TRUE - // Cramorant + // Cramorant [SPECIES_CRAMORANT_GULPING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CRAMORANT_GORGING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - // Toxtricity + // Toxtricity [SPECIES_TOXTRICITY_LOW_KEY] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, - // Sinistea + // Sinistea [SPECIES_SINISTEA_ANTIQUE] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 17 }, - // Polteageist + // Polteageist [SPECIES_POLTEAGEIST_ANTIQUE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, - // Alcremie + // Alcremie [SPECIES_ALCREMIE_RUBY_CREAM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, [SPECIES_ALCREMIE_MATCHA_CREAM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, [SPECIES_ALCREMIE_MINT_CREAM] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, @@ -1317,28 +1317,28 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_ALCREMIE_RUBY_SWIRL] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, [SPECIES_ALCREMIE_CARAMEL_SWIRL] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, [SPECIES_ALCREMIE_RAINBOW_SWIRL] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, - // Eiscue + // Eiscue [SPECIES_EISCUE_NOICE_FACE] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 0 }, - // Indeedee + // Indeedee [SPECIES_INDEEDEE_FEMALE] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 9 }, - // Morpeko + // Morpeko [SPECIES_MORPEKO_HANGRY] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 14 }, - // Zacian + // Zacian [SPECIES_ZACIAN_CROWNED_SWORD] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - // Zamazenta + // Zamazenta [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - // Eternatus + // Eternatus [SPECIES_ETERNATUS_ETERNAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - // Urshifu + // Urshifu [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - // Zarude + // Zarude [SPECIES_ZARUDE_DADA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - // Calyrex + // Calyrex [SPECIES_CALYREX_ICE_RIDER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CALYREX_SHADOW_RIDER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_ENAMORUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, #endif - // Egg + // Egg [SPECIES_EGG] = { .size = MON_COORDS_SIZE(24, 24), .y_offset = 20 }, }; diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 81bc45d4d..5ad52f6dc 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -1328,7 +1328,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(CALYREX_ICE_RIDER, gMonShinyPalette_CalyrexIceRider), SPECIES_SHINY_PAL(CALYREX_SHADOW_RIDER, gMonShinyPalette_CalyrexShadowRider), - + SPECIES_SHINY_PAL(ENAMORUS_THERIAN, gMonShinyPalette_CircledQuestionMark), //gMonShinyPalette_EnamorusTherian), #endif SPECIES_SHINY_PAL(EGG, gMonPalette_Egg), diff --git a/src/debug.c b/src/debug.c index 90081eb61..301bae51d 100644 --- a/src/debug.c +++ b/src/debug.c @@ -1255,7 +1255,7 @@ static void DebugAction_Util_Weather_SelectId(u8 taskId) if (gTasks[taskId].data[3] <= 15 || gTasks[taskId].data[3] >= 20) StringCopyPadded(gStringVar1, sWeatherNames[gTasks[taskId].data[3]], CHAR_SPACE, 30); else - StringCopyPadded(gStringVar1, sText_WeatherNotDefined, CHAR_SPACE, 30); + StringCopyPadded(gStringVar1, sText_WeatherNotDefined, CHAR_SPACE, 30); StringExpandPlaceholders(gStringVar4, sDebugText_Util_Weather_ID); AddTextPrinterParameterized(gTasks[taskId].data[2], 1, gStringVar4, 1, 1, 0, NULL); diff --git a/src/easy_chat.c b/src/easy_chat.c index d08ea4b33..6595e0a10 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -230,7 +230,7 @@ enum { PALTAG_TRIANGLE_CURSOR, PALTAG_RECTANGLE_CURSOR, PALTAG_MISC_UI, - PALTAG_RS_INTERVIEW_FRAME, + PALTAG_RS_INTERVIEW_FRAME, }; enum { @@ -240,7 +240,7 @@ enum { GFXTAG_START_SELECT_BUTTONS, GFXTAG_MODE_WINDOW, GFXTAG_RS_INTERVIEW_FRAME, - GFXTAG_BUTTON_WINDOW, + GFXTAG_BUTTON_WINDOW, }; diff --git a/src/event_object_movement.c b/src/event_object_movement.c index ae48223c3..e1a02e3ee 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -499,7 +499,7 @@ static const struct SpritePalette sObjectEventSpritePalettes[] = { {gObjectEventPal_RubySapphireBrendan, OBJ_EVENT_PAL_TAG_RS_BRENDAN}, {gObjectEventPal_RubySapphireMay, OBJ_EVENT_PAL_TAG_RS_MAY}, #ifdef BUGFIX - {NULL, OBJ_EVENT_PAL_TAG_NONE}, + {NULL, OBJ_EVENT_PAL_TAG_NONE}, #else {}, // BUG: FindObjectEventPaletteIndexByTag looks for OBJ_EVENT_PAL_TAG_NONE and not 0x0. // If it's looking for a tag that isn't in this table, the game locks in an infinite loop. diff --git a/src/expansion_intro.c b/src/expansion_intro.c index 8fdb7c1cb..e37ea4b2e 100644 --- a/src/expansion_intro.c +++ b/src/expansion_intro.c @@ -33,10 +33,10 @@ #define DIZZY_ANIM_SPEED 4 #define DIZZY_STARS_SPEED 12 -enum +enum { EXPANSION_INTRO_BG2, - EXPANSION_INTRO_BG3 + EXPANSION_INTRO_BG3 }; enum diff --git a/src/field_specials.c b/src/field_specials.c index 3ae01543c..3996b739a 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1015,7 +1015,7 @@ static void PCTurnOnEffect(struct Task *task) if (task->tTimer == 6) { task->tTimer = 0; - + // Get where the PC should be, depending on where the player is looking. playerDirection = GetPlayerFacingDirection(); switch (playerDirection) @@ -1037,7 +1037,7 @@ static void PCTurnOnEffect(struct Task *task) // Update map PCTurnOnEffect_SetMetatile(task->tIsScreenOn, dx, dy); DrawWholeMapView(); - + // Screen flickers 5 times. Odd number and starting with the // screen off means the animation ends with the screen on. task->tIsScreenOn ^= 1; diff --git a/src/frontier_util.c b/src/frontier_util.c index 1863aa622..0fe2c94ea 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -497,7 +497,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][FRONTIER_PARTY_SIZ }, }; -static const u8 sBattlePointAwards[NUM_FRONTIER_FACILITIES][FRONTIER_MODE_COUNT][30] = +static const u8 sBattlePointAwards[NUM_FRONTIER_FACILITIES][FRONTIER_MODE_COUNT][30] = { /* facility, mode, tier */ [FRONTIER_FACILITY_TOWER] = /* Tier: 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30 */ diff --git a/src/mini_printf.c b/src/mini_printf.c index d96a9379a..9fb4ecfac 100644 --- a/src/mini_printf.c +++ b/src/mini_printf.c @@ -41,7 +41,7 @@ #ifndef NDEBUG -struct mini_buff +struct mini_buff { char *buffer, *pbuffer; u32 buffer_len; @@ -95,9 +95,9 @@ static s32 _putsAscii(char *s, s32 len, void *buf) s32 i; struct mini_buff *b; - if (!buf) + if (!buf) return len; - + b = buf; p0 = b->buffer; @@ -118,9 +118,9 @@ static s32 _putsEncoded(char *s, s32 len, void *buf) s32 i; struct mini_buff *b; - if (!buf) + if (!buf) return len; - + b = buf; p0 = b->buffer; @@ -159,7 +159,7 @@ static s32 mini_itoa(s32 value, u32 radix, s32 uppercase, bool32 unsig, char *bu } /* This builds the string back to front ... */ - do + do { s32 digit = value % radix; *(pbuffer++) = (digit < 10 ? '0' + digit : (uppercase ? 'A' : 'a') + digit - 10); @@ -243,7 +243,7 @@ s32 mini_vpprintf(void* buf, const char *fmt, va_list va) { len = 1; len = _putsAscii(&ch, len, buf); - } else + } else { char pad_char = ' '; s32 pad_to = 0; @@ -270,7 +270,7 @@ s32 mini_vpprintf(void* buf, const char *fmt, va_list va) ch=*(fmt++); } - switch (ch) + switch (ch) { case 0: goto end; diff --git a/src/rom_header_gf.c b/src/rom_header_gf.c index 118cc5e27..7b8822acc 100644 --- a/src/rom_header_gf.c +++ b/src/rom_header_gf.c @@ -9,8 +9,8 @@ // The purpose of this struct is for outside applications to be // able to access parts of the ROM or its save file, like a public API. // In vanilla, it was used by Colosseum and XD to access pokemon graphics. -// -// If this struct is rearranged in any way, it defeats the purpose of +// +// If this struct is rearranged in any way, it defeats the purpose of // having it at all. Applications like PKHex or streaming HUDs may find // these values useful, so there's some potential benefit to keeping it. // If there's a compilation problem below, just comment out the assignment diff --git a/src/trade.c b/src/trade.c index 9186864fb..1f9e68886 100644 --- a/src/trade.c +++ b/src/trade.c @@ -1281,7 +1281,7 @@ static void Leader_HandleCommunication(void) if (sTradeMenu->playerSelectStatus == STATUS_READY && sTradeMenu->partnerSelectStatus == STATUS_READY) { - // Both players have selected a pokemon to trade + // Both players have selected a pokemon to trade sTradeMenu->callbackId = CB_SET_SELECTED_MONS; sTradeMenu->linkData[0] = LINKCMD_SET_MONS_TO_TRADE; sTradeMenu->linkData[1] = sTradeMenu->cursorPosition; @@ -1900,7 +1900,7 @@ static void DrawSelectedMonScreen(u8 whichParty) StoreSpriteCallbackInData6(&gSprites[sTradeMenu->partySpriteIds[selectedMonParty][partyIdx]], SpriteCB_MonIcon); sTradeMenu->drawSelectedMonState[whichParty]++; Trade_MoveSelectedMonToTarget(&gSprites[sTradeMenu->partySpriteIds[selectedMonParty][partyIdx]]); - + CopyToBgTilemapBufferRect_ChangePalette(1, sTradePartyBoxTilemap, whichParty * 15, 0, 15, 17, 0); CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(0); diff --git a/test/ability_insomnia.c b/test/ability_insomnia.c index b9fe38753..9398bd30a 100644 --- a/test/ability_insomnia.c +++ b/test/ability_insomnia.c @@ -11,7 +11,7 @@ SINGLE_BATTLE_TEST("Insomnia prevents sleep") TURN { MOVE(opponent, MOVE_SPORE); } } SCENE { ABILITY_POPUP(player, ABILITY_INSOMNIA); - NONE_OF { + NONE_OF { ANIMATION(ANIM_TYPE_MOVE, MOVE_SPORE, opponent); ANIMATION(ANIM_TYPE_STATUS, B_ANIM_STATUS_SLP, player); STATUS_ICON(player, sleep: TRUE); @@ -31,7 +31,7 @@ SINGLE_BATTLE_TEST("Insomnia prevents yawn") TURN { } } SCENE { ABILITY_POPUP(player, ABILITY_INSOMNIA); - NONE_OF { + NONE_OF { ANIMATION(ANIM_TYPE_MOVE, MOVE_YAWN, opponent); ANIMATION(ANIM_TYPE_STATUS, B_ANIM_STATUS_SLP, player); STATUS_ICON(player, sleep: TRUE); @@ -49,7 +49,7 @@ SINGLE_BATTLE_TEST("Insomnia prevents rest") TURN { MOVE(player, MOVE_REST); } } SCENE { ABILITY_POPUP(player, ABILITY_INSOMNIA); - NONE_OF { + NONE_OF { ANIMATION(ANIM_TYPE_MOVE, MOVE_REST, player); ANIMATION(ANIM_TYPE_STATUS, B_ANIM_STATUS_SLP, player); STATUS_ICON(player, sleep: TRUE); diff --git a/test/ability_water_absorb.c b/test/ability_water_absorb.c index 1748ee7ff..aaaa149ac 100644 --- a/test/ability_water_absorb.c +++ b/test/ability_water_absorb.c @@ -78,10 +78,10 @@ SINGLE_BATTLE_TEST("Water Absorb prevents Items from activating") ABILITY_POPUP(player, ABILITY_WATER_ABSORB); HP_BAR(player, hp: TEST_MAX_HP / 4 + 1); MESSAGE("Poliwag restored HP using its Water Absorb!"); - NONE_OF { + NONE_OF { ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); } - + } }