From fe16a2cdee053e708839e483548a1754f3be0de7 Mon Sep 17 00:00:00 2001 From: psf <77138753+pkmnsnfrn@users.noreply.github.com> Date: Sun, 26 Nov 2023 09:58:43 -0800 Subject: [PATCH 01/14] Port pokefirered's Vs. Seeker to pokeemerald (#3256) * First version of Vs. Seeker * Update movement.inc https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files/98f7e9978d8cd16083ea1bc7857f4f0235a9f1af#r1306721924 * Update field_effect_scripts.s https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722004 * Update field_effect_scripts.s https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722024 * Update item_use.h https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722401 * Update movement_action_func_tables.h https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722828 * Update event_object_movement.c https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722887 * Update overworld.c https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306723396 * Update vs_seeker.h https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306724158 * Update vs_seeker.c Addressed some cleanup comments from SBird * Update UpdateRandomTrainerRematches Fixed typo in ClearAllTrainerRematchStates Fixed types in GetRematchableTrainerLocalId * Updated UseVsSeekerEffect_2 * Updated UseVsSeekerEffect_3 * Updated UseVsSeekerEffect_4 * Fixed bug that allowed Vs Seeker to be used indoors in correct places Moved VsSeeker function declarations into header * Refactored FieldUseFunc_VsSeeker * Added curly braces to else case in FieldUseFunc_VsSeeker * renamed data[x] in Task_ResetObjectsRematchWantedState * Refactored Task_ResetObjectsRematchWantedState * Refactored VsSeekerResetObjectMovementAfterChargeComplete * Refactored ResetMovementOfRematchableTrainers * Refactored GatherNearbyTrainerInfo * Refactored Task_VsSeeker_3 * CanUseVsSeeker * Refactored GetVsSeekerResponseInArea * GetCurVsSeekerResponse refactored * Cleaned up GetTrainerFlagFromScript * Gave sensible names to Task_VsSeeker * Fixed two bugs where player would not have the right gfx state after using VsSeeker on a Bike or Underwater * Renamed UseVsSeeker Functions * Added I_VS_SEEKER_CHARGING to make Vs. Seeker broken until flag is assigned Removed extra VsSeeker animation code * Addressed PR feedback * Fixed issue with building non-modern * Refactored GetRunningBehaviorFromGraphicsId and renamed to GetResponseMovementTypeFromTrainerGraphicsId * Addresses Lunos's PR feedback: https://github.com/rh-hideout/pokeemerald-expansion/pull/3256\#pullrequestreview-1623547850 Removed the check to see if a map was not indoors to improve readability Made IsValidLocationForVsSeeker into a static function * Added changes in response to Jasper's feedback https://github.com/rh-hideout/pokeemerald-expansion/pull/3256\#pullrequestreview-1725276522 * Updated with Edu's discord feedback https://discord.com/channels/419213663107416084/1135040810082123907/1176872015085453392 * Removed ifdef tags around the repo unless needed https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files/b5dc744cedc8e14c88d461afbbdc693c4f54e950 --- asm/macros/movement.inc | 2 + data/event_scripts.s | 7 + data/field_effect_scripts.s | 16 + data/specials.inc | 2 + data/text/trainers.inc | 15 + graphics/field_effects/pics/emote_x.png | Bin 0 -> 190 bytes .../pics/emotion_double_exclamation.png | Bin 0 -> 173 bytes include/battle_setup.h | 3 + include/config/item.h | 3 + include/constants/event_object_movement.h | 3 + include/constants/field_effects.h | 3 + include/event_object_movement.h | 3 + include/event_scripts.h | 5 + include/global.fieldmap.h | 1 + include/item_use.h | 2 + include/trainer_see.h | 2 + include/vs_seeker.h | 14 + src/battle_setup.c | 60 +- src/data/items.h | 4 + .../movement_action_func_tables.h | 14 + src/event_object_movement.c | 16 + src/field_control_avatar.c | 6 + src/field_effect.c | 72 ++ src/field_player_avatar.c | 4 +- src/item_use.c | 71 +- src/overworld.c | 9 + src/trainer_see.c | 48 +- src/vs_seeker.c | 793 ++++++++++++++++++ 28 files changed, 1155 insertions(+), 23 deletions(-) create mode 100644 graphics/field_effects/pics/emote_x.png create mode 100644 graphics/field_effects/pics/emotion_double_exclamation.png create mode 100644 include/vs_seeker.h create mode 100644 src/vs_seeker.c diff --git a/asm/macros/movement.inc b/asm/macros/movement.inc index a43dc07ac5..b0bb1f35ee 100644 --- a/asm/macros/movement.inc +++ b/asm/macros/movement.inc @@ -162,5 +162,7 @@ create_movement_action figure_8, MOVEMENT_ACTION_FIGURE_8 create_movement_action fly_up, MOVEMENT_ACTION_FLY_UP create_movement_action fly_down, MOVEMENT_ACTION_FLY_DOWN + create_movement_action emote_double_exclamation_mark, MOVEMENT_ACTION_EMOTE_DOUBLE_EXCL_MARK + create_movement_action emote_x, MOVEMENT_ACTION_EMOTE_X create_movement_action step_end, MOVEMENT_ACTION_STEP_END diff --git a/data/event_scripts.s b/data/event_scripts.s index a376866181..7ce6f60485 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1005,6 +1005,13 @@ Common_EventScript_LegendaryFlewAway:: release end +EventScript_VsSeekerChargingDone:: + special VsSeekerFreezeObjectsAfterChargeComplete + waitstate + special VsSeekerResetObjectMovementAfterChargeComplete + releaseall + end + .include "data/scripts/pc_transfer.inc" .include "data/scripts/questionnaire.inc" .include "data/scripts/abnormal_weather.inc" diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 49fcf798b6..43f4222596 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -1,3 +1,4 @@ +#include "config/item.h" .include "asm/macros.inc" .include "constants/constants.inc" @@ -72,6 +73,9 @@ gFieldEffectScriptPointers:: .4byte gFieldEffectScript_RayquazaSpotlight @ FLDEFF_RAYQUAZA_SPOTLIGHT .4byte gFieldEffectScript_DestroyDeoxysRock @ FLDEFF_DESTROY_DEOXYS_ROCK .4byte gFieldEffectScript_MoveDeoxysRock @ FLDEFF_MOVE_DEOXYS_ROCK + .4byte gFldEffScript_UseVsSeeker @ FLDEFF_USE_VS_SEEKER + .4byte gFldEffScript_XIcon @ FLDEFF_X_ICON + .4byte gFldEffScript_DoubleExclMarkIcon @ FLDEFF_DOUBLE_EXCL_MARK_ICON gFieldEffectScript_ExclamationMarkIcon1:: field_eff_callnative FldEff_ExclamationMarkIcon @@ -343,3 +347,15 @@ gFieldEffectScript_DestroyDeoxysRock:: gFieldEffectScript_MoveDeoxysRock:: field_eff_callnative FldEff_MoveDeoxysRock field_eff_end + +gFldEffScript_UseVsSeeker:: + field_eff_callnative FldEff_UseVsSeeker + field_eff_end + +gFldEffScript_XIcon:: + field_eff_callnative FldEff_XIcon + field_eff_end + +gFldEffScript_DoubleExclMarkIcon:: + field_eff_callnative FldEff_DoubleExclMarkIcon + field_eff_end diff --git a/data/specials.inc b/data/specials.inc index 34e86cad29..f05655cbd3 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -540,3 +540,5 @@ gSpecials:: def_special GetSprayId def_special GetLastUsedSprayType def_special TrySkyBattle + def_special VsSeekerResetObjectMovementAfterChargeComplete + def_special VsSeekerFreezeObjectsAfterChargeComplete \ No newline at end of file diff --git a/data/text/trainers.inc b/data/text/trainers.inc index c3e85ef504..ac3747f805 100644 --- a/data/text/trainers.inc +++ b/data/text/trainers.inc @@ -4779,3 +4779,18 @@ Route134_Text_HudsonPostBattle: .string "Our boat drifted out to sea.\p" .string "My buddy's a timid fellow, so I'm\n" .string "worried about him.$" + +VSSeeker_Text_BatteryNotChargedNeedXSteps:: + .string "The battery isn't charged enough.\p" + .string "No. of steps required to fully\n" + .string "charge the battery: {STR_VAR_1}{PAUSE_UNTIL_PRESS}$" + +VSSeeker_Text_NoTrainersWithinRange:: + .string "There are no Trainers within range\n" + .string "who can battle…\p" + .string "The VS Seeker was turned off.{PAUSE_UNTIL_PRESS}$" + +VSSeeker_Text_TrainersNotReady:: + .string "The other Trainers don't appear\n" + .string "to be ready for battle.\p" + .string "Let's wait till later.{PAUSE_UNTIL_PRESS}$" diff --git a/graphics/field_effects/pics/emote_x.png b/graphics/field_effects/pics/emote_x.png new file mode 100644 index 0000000000000000000000000000000000000000..6d0206e1d406137c517bded08a0aafc5e0fd7b4f GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~g8-ip*W#l~ z{$Jhl|LBx^Q;Mq{9se)cay6^E+c9X$(Qi@Rdj$-Gwk%1iE_SrEl=%PuKTwlw?!4nb z%Er^hF+^f&a>44wy? literal 0 HcmV?d00001 diff --git a/include/battle_setup.h b/include/battle_setup.h index 96aeb4b761..a2009eea41 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -70,5 +70,8 @@ u16 CountBattledRematchTeams(u16 trainerId); void DoStandardWildBattle_Debug(void); void BattleSetup_StartTrainerBattle_Debug(void); +s32 TrainerIdToRematchTableId(const struct RematchTrainer *table, u16 trainerId); +s32 FirstBattleTrainerIdToRematchTableId(const struct RematchTrainer *table, u16 trainerId); +u16 GetRematchTrainerIdFromTable(const struct RematchTrainer *table, u16 firstBattleTrainerId); #endif // GUARD_BATTLE_SETUP_H diff --git a/include/config/item.h b/include/config/item.h index 55de3fdb60..868afae1a7 100644 --- a/include/config/item.h +++ b/include/config/item.h @@ -29,4 +29,7 @@ #define VAR_LAST_REPEL_LURE_USED 0 // If this var has been assigned, last Repel/Lure used will be saved and the player will get prompted with the vanilla repel YES/NO option, unless I_REPEL_LURE_MENU is set to TRUE. #define I_REPEL_LURE_MENU TRUE // If TRUE, the player is able to choose which Repel/Lure to use once the previous one runs out. Cursor position is saved by VAR_LAST_REPEL_LURE_USED if not 0. +// Vs. Seeker +#define I_VS_SEEKER_CHARGING 0 // If this flag is assigned, the Vs Seeker will functionlity will be enabled. When the player has the Vs. Seeker, Match Call rematch functions will stop working. + #endif // GUARD_CONFIG_ITEM_H diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h index af5af53403..cd971efddf 100755 --- a/include/constants/event_object_movement.h +++ b/include/constants/event_object_movement.h @@ -242,6 +242,8 @@ #define MOVEMENT_ACTION_FIGURE_8 0x9B #define MOVEMENT_ACTION_FLY_UP 0x9C #define MOVEMENT_ACTION_FLY_DOWN 0x9D +#define MOVEMENT_ACTION_EMOTE_X 0x9E +#define MOVEMENT_ACTION_EMOTE_DOUBLE_EXCL_MARK 0x9F #define MOVEMENT_ACTION_STEP_END 0xFE #define MOVEMENT_ACTION_NONE 0xFF @@ -300,6 +302,7 @@ #define ANIM_GET_ON_OFF_POKEMON_EAST (ANIM_STD_COUNT + 3) #define ANIM_NURSE_BOW (ANIM_STD_COUNT + 0) +#define ANIM_RAISE_HAND (ANIM_STD_COUNT + 0) #define ANIM_FIELD_MOVE 0 diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h index a620409479..f8efeb9b81 100644 --- a/include/constants/field_effects.h +++ b/include/constants/field_effects.h @@ -68,6 +68,9 @@ #define FLDEFF_RAYQUAZA_SPOTLIGHT 64 #define FLDEFF_DESTROY_DEOXYS_ROCK 65 #define FLDEFF_MOVE_DEOXYS_ROCK 66 +#define FLDEFF_USE_VS_SEEKER 67 +#define FLDEFF_X_ICON 68 +#define FLDEFF_DOUBLE_EXCL_MARK_ICON 69 #define FLDEFFOBJ_SHADOW_S 0 #define FLDEFFOBJ_SHADOW_M 1 diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 01269cdb5e..b48522ebc8 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -440,4 +440,7 @@ bool32 IsVirtualObjectInvisible(u8 virtualObjId); void SetVirtualObjectSpriteAnim(u8 virtualObjId, u8 animNum); bool32 IsVirtualObjectAnimating(u8 virtualObjId); +bool8 MovementAction_EmoteX_Step0(struct ObjectEvent *, struct Sprite *); +bool8 MovementAction_EmoteDoubleExclamationMark_Step0(struct ObjectEvent *, struct Sprite *); + #endif //GUARD_EVENT_OBJECT_MOVEMENT_H diff --git a/include/event_scripts.h b/include/event_scripts.h index 4e0a88f82a..00b06165cf 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -612,4 +612,9 @@ extern const u8 EventScript_TradeCenter_Chair0[]; extern const u8 EventScript_ConfirmLeaveCableClubRoom[]; extern const u8 EventScript_TerminateLink[]; +extern const u8 VSSeeker_Text_BatteryNotChargedNeedXSteps[]; +extern const u8 VSSeeker_Text_NoTrainersWithinRange[]; +extern const u8 VSSeeker_Text_TrainersNotReady[]; +extern const u8 EventScript_VsSeekerChargingDone[]; + #endif // GUARD_EVENT_SCRIPTS_H diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 7461929c3a..b5bf29ca88 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -254,6 +254,7 @@ enum { PLAYER_AVATAR_STATE_FIELD_MOVE, PLAYER_AVATAR_STATE_FISHING, PLAYER_AVATAR_STATE_WATERING, + PLAYER_AVATAR_STATE_VSSEEKER, }; #define PLAYER_AVATAR_FLAG_ON_FOOT (1 << 0) diff --git a/include/item_use.h b/include/item_use.h index 5abe87f057..90d671bd42 100644 --- a/include/item_use.h +++ b/include/item_use.h @@ -41,6 +41,8 @@ void ItemUseInBattle_PartyMenuChooseMove(u8 taskId); void Task_UseDigEscapeRopeOnField(u8 taskId); u8 CanUseDigOrEscapeRopeOnCurMap(void); u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId); +void FieldUseFunc_VsSeeker(u8 taskId); +void Task_ItemUse_CloseMessageBoxAndReturnToField_VsSeeker(u8 taskId); enum { BALL_THROW_UNABLE_TWO_MONS, diff --git a/include/trainer_see.h b/include/trainer_see.h index ab808c720c..5518a91761 100644 --- a/include/trainer_see.h +++ b/include/trainer_see.h @@ -26,5 +26,7 @@ u8 FldEff_HeartIcon(void); u8 GetCurrentApproachingTrainerObjectEventId(void); u8 GetChosenApproachingTrainerObjectEventId(u8 arrayId); void PlayerFaceTrainerAfterBattle(void); +u8 FldEff_DoubleExclMarkIcon(void); +u8 FldEff_XIcon(void); #endif // GUARD_TRAINER_SEE_H diff --git a/include/vs_seeker.h b/include/vs_seeker.h new file mode 100644 index 0000000000..723e73bf37 --- /dev/null +++ b/include/vs_seeker.h @@ -0,0 +1,14 @@ +#ifndef GUARD_VS_SEEKER_H +#define GUARD_VS_SEEKER_H + +#include "global.h" + +void Task_InitVsSeekerAndCheckForTrainersOnScreen(u8 taskId); +bool8 UpdateVsSeekerStepCounter(void); +void MapResetTrainerRematches(u16 mapGroup, u16 mapNum); +void ClearRematchMovementByTrainerId(void); +u16 GetRematchTrainerIdVSSeeker(u16 trainerId); + +#define VSSEEKER_RECHARGE_STEPS 100 + +#endif //GUARD_VS_SEEKER_H diff --git a/src/battle_setup.c b/src/battle_setup.c index 72a41aca9c..5459c04925 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -38,6 +38,8 @@ #include "mirage_tower.h" #include "field_screen_effect.h" #include "data.h" +#include "vs_seeker.h" +#include "item.h" #include "constants/battle_frontier.h" #include "constants/battle_setup.h" #include "constants/game_stat.h" @@ -1627,7 +1629,7 @@ static const u8 *GetTrainerCantBattleSpeech(void) return ReturnEmptyStringIfNull(sTrainerCannotBattleSpeech); } -static s32 FirstBattleTrainerIdToRematchTableId(const struct RematchTrainer *table, u16 trainerId) +s32 FirstBattleTrainerIdToRematchTableId(const struct RematchTrainer *table, u16 trainerId) { s32 i; @@ -1640,7 +1642,7 @@ static s32 FirstBattleTrainerIdToRematchTableId(const struct RematchTrainer *tab return -1; } -static s32 TrainerIdToRematchTableId(const struct RematchTrainer *table, u16 trainerId) +s32 TrainerIdToRematchTableId(const struct RematchTrainer *table, u16 trainerId) { s32 i, j; @@ -1686,30 +1688,42 @@ static void SetRematchIdForTrainer(const struct RematchTrainer *table, u32 table gSaveBlock1Ptr->trainerRematches[tableId] = i; } +static bool32 DoesCurrentMapMatchRematchTrainerMap(s32 i, const struct RematchTrainer *table, u16 mapGroup, u16 mapNum) +{ + return table[i].mapGroup == mapGroup && table[i].mapNum == mapNum; +} + +bool32 TrainerIsMatchCallRegistered(s32 i) +{ + return FlagGet(FLAG_MATCH_CALL_REGISTERED + i); +} + static bool32 UpdateRandomTrainerRematches(const struct RematchTrainer *table, u16 mapGroup, u16 mapNum) { s32 i; - bool32 ret = FALSE; + + if (CheckBagHasItem(ITEM_VS_SEEKER, 1) && I_VS_SEEKER_CHARGING != 0) + return FALSE; for (i = 0; i <= REMATCH_SPECIAL_TRAINER_START; i++) { - if (table[i].mapGroup == mapGroup && table[i].mapNum == mapNum && !IsRematchForbidden(i)) + if (DoesCurrentMapMatchRematchTrainerMap(i,table,mapGroup,mapNum) && !IsRematchForbidden(i)) + continue; + + if (gSaveBlock1Ptr->trainerRematches[i] != 0) { - if (gSaveBlock1Ptr->trainerRematches[i] != 0) - { - // Trainer already wants a rematch. Don't bother updating it. - ret = TRUE; - } - else if (FlagGet(FLAG_MATCH_CALL_REGISTERED + i) - && (Random() % 100) <= 30) // 31% chance of getting a rematch. - { - SetRematchIdForTrainer(table, i); - ret = TRUE; - } + // Trainer already wants a rematch. Don't bother updating it. + return TRUE; + } + else if (TrainerIsMatchCallRegistered(i) && ((Random() % 100) <= 30)) + // 31% chance of getting a rematch. + { + SetRematchIdForTrainer(table, i); + return TRUE; } } - return ret; + return FALSE; } void UpdateRematchIfDefeated(s32 rematchTableId) @@ -1772,7 +1786,7 @@ static bool8 IsTrainerReadyForRematch_(const struct RematchTrainer *table, u16 t return TRUE; } -static u16 GetRematchTrainerIdFromTable(const struct RematchTrainer *table, u16 firstBattleTrainerId) +u16 GetRematchTrainerIdFromTable(const struct RematchTrainer *table, u16 firstBattleTrainerId) { const struct RematchTrainer *trainerEntry; s32 i; @@ -1877,7 +1891,9 @@ static bool32 HasAtLeastFiveBadges(void) void IncrementRematchStepCounter(void) { - if (HasAtLeastFiveBadges()) + if (HasAtLeastFiveBadges() + && (I_VS_SEEKER_CHARGING != 0) + && (!CheckBagHasItem(ITEM_VS_SEEKER, 1))) { if (gSaveBlock1Ptr->trainerRematchStepCounter >= STEP_COUNTER_MAX) gSaveBlock1Ptr->trainerRematchStepCounter = STEP_COUNTER_MAX; @@ -1912,7 +1928,10 @@ bool32 IsRematchTrainerIn(u16 mapGroup, u16 mapNum) static u16 GetRematchTrainerId(u16 trainerId) { - return GetRematchTrainerIdFromTable(gRematchTable, trainerId); + if (FlagGet(I_VS_SEEKER_CHARGING) && (I_VS_SEEKER_CHARGING != 0)) + return GetRematchTrainerIdVSSeeker(trainerId); + else + return GetRematchTrainerIdFromTable(gRematchTable, trainerId); } u16 GetLastBeatenRematchTrainerId(u16 trainerId) @@ -1935,6 +1954,9 @@ bool8 IsTrainerReadyForRematch(void) static void HandleRematchVarsOnBattleEnd(void) { + if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) && (I_VS_SEEKER_CHARGING != 0)) + ClearRematchMovementByTrainerId(); + ClearTrainerWantRematchState(gRematchTable, gTrainerBattleOpponent_A); SetBattledTrainersFlags(); } diff --git a/src/data/items.h b/src/data/items.h index 670d7dd2e5..85fa2dc893 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -8723,7 +8723,11 @@ const struct Item gItems[] = .importance = 1, .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_FIELD, +#if I_VS_SEEKER_CHARGING != 0 + .fieldUseFunc = FieldUseFunc_VsSeeker, +#else .fieldUseFunc = ItemUseOutOfBattle_CannotUse, +#endif }, [ITEM_TM_CASE] = diff --git a/src/data/object_events/movement_action_func_tables.h b/src/data/object_events/movement_action_func_tables.h index 2e1b6b3b31..e16cae74fc 100755 --- a/src/data/object_events/movement_action_func_tables.h +++ b/src/data/object_events/movement_action_func_tables.h @@ -420,6 +420,8 @@ u8 (*const gMovementActionFuncs_StopLevitateAtTop[])(struct ObjectEvent *, struc u8 (*const gMovementActionFuncs_Figure8[])(struct ObjectEvent *, struct Sprite *); u8 (*const gMovementActionFuncs_FlyUp[])(struct ObjectEvent *, struct Sprite *); u8 (*const gMovementActionFuncs_FlyDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_EmoteX[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_EmoteDoubleExclMark[])(struct ObjectEvent *, struct Sprite *); u8 (*const *const gMovementActionFuncs[])(struct ObjectEvent *, struct Sprite *) = { [MOVEMENT_ACTION_FACE_DOWN] = gMovementActionFuncs_FaceDown, @@ -580,6 +582,8 @@ u8 (*const *const gMovementActionFuncs[])(struct ObjectEvent *, struct Sprite *) [MOVEMENT_ACTION_FIGURE_8] = gMovementActionFuncs_Figure8, [MOVEMENT_ACTION_FLY_UP] = gMovementActionFuncs_FlyUp, [MOVEMENT_ACTION_FLY_DOWN] = gMovementActionFuncs_FlyDown, + [MOVEMENT_ACTION_EMOTE_X] = gMovementActionFuncs_EmoteX, + [MOVEMENT_ACTION_EMOTE_DOUBLE_EXCL_MARK] = gMovementActionFuncs_EmoteDoubleExclMark, }; u8 (*const gMovementActionFuncs_FaceDown[])(struct ObjectEvent *, struct Sprite *) = { @@ -1519,3 +1523,13 @@ u8 (*const gMovementActionFuncs_StopLevitateAtTop[])(struct ObjectEvent *, struc MovementAction_StopLevitateAtTop_Step0, MovementAction_Finish, }; + +u8 (*const gMovementActionFuncs_EmoteX[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_EmoteX_Step0, + MovementAction_Finish, +}; + +u8 (*const gMovementActionFuncs_EmoteDoubleExclMark[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_EmoteDoubleExclamationMark_Step0, + MovementAction_Finish, +}; diff --git a/src/event_object_movement.c b/src/event_object_movement.c index cdd72d668c..6cd6955031 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -8965,3 +8965,19 @@ u8 MovementAction_Fly_Finish(struct ObjectEvent *objectEvent, struct Sprite *spr { return TRUE; } + +bool8 MovementAction_EmoteX_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +{ + ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + FieldEffectStart(FLDEFF_X_ICON); + sprite->sActionFuncId = 1; + return TRUE; +} + +bool8 MovementAction_EmoteDoubleExclamationMark_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +{ + ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + FieldEffectStart(FLDEFF_DOUBLE_EXCL_MARK_ICON); + sprite->sActionFuncId = 1; + return TRUE; +} diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 6a5422046e..d5c252415d 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -28,6 +28,7 @@ #include "start_menu.h" #include "trainer_see.h" #include "trainer_hill.h" +#include "vs_seeker.h" #include "wild_encounter.h" #include "constants/event_bg.h" #include "constants/event_objects.h" @@ -615,6 +616,11 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior) ScriptContext_SetupScript(MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall); return TRUE; } + if (UpdateVsSeekerStepCounter()) + { + ScriptContext_SetupScript(EventScript_VsSeekerChargingDone); + return TRUE; + } } if (SafariZoneTakeStep() == TRUE) diff --git a/src/field_effect.c b/src/field_effect.c index cfb5021550..2d2aa174ff 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -31,6 +31,7 @@ #include "constants/metatile_behaviors.h" #include "constants/rgb.h" #include "constants/songs.h" +#include "constants/map_types.h" #define subsprite_table(ptr) {.subsprites = ptr, .subspriteCount = (sizeof ptr) / (sizeof(struct Subsprite))} @@ -231,6 +232,12 @@ static void SpriteCB_DeoxysRockFragment(struct Sprite *sprite); static void Task_MoveDeoxysRock(u8 taskId); +static void Task_FldEffUseVsSeeker(u8 taskId); +static void UseVsSeeker_StopPlayerMovement(struct Task *task); +static void UseVsSeeker_DoPlayerAnimation(struct Task *task); +static void UseVsSeeker_ResetPlayerGraphics(struct Task *task); +static void UseVsSeeker_CleanUpFieldEffect(struct Task *task); + // Static RAM declarations static u8 sActiveList[32]; @@ -3911,3 +3918,68 @@ static void Task_MoveDeoxysRock(u8 taskId) #undef tVelocityY #undef tMoveSteps #undef tObjEventId + +static void (*const sUseVsSeekerEffectFuncs[])(struct Task *task) = { + UseVsSeeker_StopPlayerMovement, + UseVsSeeker_DoPlayerAnimation, + UseVsSeeker_ResetPlayerGraphics, + UseVsSeeker_CleanUpFieldEffect +}; + +u32 FldEff_UseVsSeeker(void) +{ + CreateTask(Task_FldEffUseVsSeeker, 0xFF); + return 0; +} + +static void Task_FldEffUseVsSeeker(u8 taskId) +{ + sUseVsSeekerEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId]); +} + +static void UseVsSeeker_StopPlayerMovement(struct Task *task) +{ + LockPlayerFieldControls(); + FreezeObjectEvents(); + gPlayerAvatar.preventStep = TRUE; + task->data[0]++; +} + +static void UseVsSeeker_DoPlayerAnimation(struct Task *task) +{ + struct ObjectEvent * playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + if ((ObjectEventIsMovementOverridden(playerObj) && (!(ObjectEventClearHeldMovementIfFinished(playerObj))))) + return; + + if (gMapHeader.mapType != MAP_TYPE_UNDERWATER) + { + SetPlayerAvatarFieldMove(); + ObjectEventSetHeldMovement(playerObj, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); + } + task->data[0]++; +} + +static void UseVsSeeker_ResetPlayerGraphics(struct Task *task) { + struct ObjectEvent* playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + + if (!ObjectEventClearHeldMovementIfFinished(playerObj)) + return; + + if (gMapHeader.mapType != MAP_TYPE_UNDERWATER) + { + ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByCurrentState()); + ObjectEventForceSetHeldMovement(playerObj, GetFaceDirectionMovementAction(playerObj->facingDirection)); + } + task->data[0]++; +} + +static void UseVsSeeker_CleanUpFieldEffect(struct Task *task) +{ + struct ObjectEvent * playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventClearHeldMovementIfFinished(playerObj)) + return; + + gPlayerAvatar.preventStep = FALSE; + FieldEffectActiveListRemove(FLDEFF_USE_VS_SEEKER); + DestroyTask(FindTaskIdByFunc(Task_FldEffUseVsSeeker)); +} diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 0f087799e3..99cab7fd77 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -241,7 +241,8 @@ static const u8 sRivalAvatarGfxIds[][2] = [PLAYER_AVATAR_STATE_UNDERWATER] = {OBJ_EVENT_GFX_BRENDAN_UNDERWATER, OBJ_EVENT_GFX_MAY_UNDERWATER}, [PLAYER_AVATAR_STATE_FIELD_MOVE] = {OBJ_EVENT_GFX_RIVAL_BRENDAN_FIELD_MOVE, OBJ_EVENT_GFX_RIVAL_MAY_FIELD_MOVE}, [PLAYER_AVATAR_STATE_FISHING] = {OBJ_EVENT_GFX_BRENDAN_FISHING, OBJ_EVENT_GFX_MAY_FISHING}, - [PLAYER_AVATAR_STATE_WATERING] = {OBJ_EVENT_GFX_BRENDAN_WATERING, OBJ_EVENT_GFX_MAY_WATERING} + [PLAYER_AVATAR_STATE_WATERING] = {OBJ_EVENT_GFX_BRENDAN_WATERING, OBJ_EVENT_GFX_MAY_WATERING}, + [PLAYER_AVATAR_STATE_VSSEEKER] = {OBJ_EVENT_GFX_RIVAL_BRENDAN_FIELD_MOVE, OBJ_EVENT_GFX_RIVAL_MAY_FIELD_MOVE}, }; static const u8 sPlayerAvatarGfxIds[][2] = @@ -254,6 +255,7 @@ static const u8 sPlayerAvatarGfxIds[][2] = [PLAYER_AVATAR_STATE_FIELD_MOVE] = {OBJ_EVENT_GFX_BRENDAN_FIELD_MOVE, OBJ_EVENT_GFX_MAY_FIELD_MOVE}, [PLAYER_AVATAR_STATE_FISHING] = {OBJ_EVENT_GFX_BRENDAN_FISHING, OBJ_EVENT_GFX_MAY_FISHING}, [PLAYER_AVATAR_STATE_WATERING] = {OBJ_EVENT_GFX_BRENDAN_WATERING, OBJ_EVENT_GFX_MAY_WATERING}, + [PLAYER_AVATAR_STATE_VSSEEKER] = {OBJ_EVENT_GFX_BRENDAN_FIELD_MOVE, OBJ_EVENT_GFX_MAY_FIELD_MOVE}, }; static const u8 sFRLGAvatarGfxIds[GENDER_COUNT] = diff --git a/src/item_use.c b/src/item_use.c index 11d92e7427..1b87cc0e36 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -38,11 +38,13 @@ #include "string_util.h" #include "task.h" #include "text.h" +#include "vs_seeker.h" #include "constants/event_bg.h" #include "constants/event_objects.h" #include "constants/item_effects.h" #include "constants/items.h" #include "constants/songs.h" +#include "constants/map_types.h" static void SetUpItemUseCallback(u8); static void FieldCB_UseItemOnField(void); @@ -75,6 +77,7 @@ static void Task_CloseCantUseKeyItemMessage(u8); static void SetDistanceOfClosestHiddenItem(u8, s16, s16); static void CB2_OpenPokeblockFromBag(void); static void ItemUseOnFieldCB_Honey(u8 taskId); +static bool32 IsValidLocationForVsSeeker(void); static bool32 CannotUseBagBattleItem(u16 itemId); // EWRAM variables @@ -1315,7 +1318,7 @@ void ItemUseOutOfBattle_FormChange_ConsumedOnUse(u8 taskId) } void ItemUseOutOfBattle_RotomCatalog(u8 taskId) -{ +{ if (!gTasks[taskId].tUsingRegisteredKeyItem) { gItemUseCB = ItemUseCB_RotomCatalog; @@ -1330,7 +1333,7 @@ void ItemUseOutOfBattle_RotomCatalog(u8 taskId) } void ItemUseOutOfBattle_ZygardeCube(u8 taskId) -{ +{ if (!gTasks[taskId].tUsingRegisteredKeyItem) { gItemUseCB = ItemUseCB_ZygardeCube; @@ -1379,4 +1382,68 @@ void ItemUseOutOfBattle_CannotUse(u8 taskId) DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].tUsingRegisteredKeyItem); } +static bool32 IsValidLocationForVsSeeker(void) +{ + u16 mapGroup = gSaveBlock1Ptr->location.mapGroup; + u16 mapNum = gSaveBlock1Ptr->location.mapNum; + u16 mapType = gMapHeader.mapType; + + typedef struct { + u16 mapGroup; + u16 mapNum; + } Location; + + u32 i; + Location validIndoorLocations[] = + { + { MAP_GROUP(MT_PYRE_SUMMIT), MAP_NUM(MT_PYRE_SUMMIT) }, + { MAP_GROUP(SAFARI_ZONE_NORTH), MAP_NUM(SAFARI_ZONE_NORTH) }, + { MAP_GROUP(SAFARI_ZONE_NORTHEAST), MAP_NUM(SAFARI_ZONE_NORTHEAST) }, + { MAP_GROUP(SAFARI_ZONE_NORTHWEST), MAP_NUM(SAFARI_ZONE_NORTHWEST) }, + { MAP_GROUP(SAFARI_ZONE_SOUTH), MAP_NUM(SAFARI_ZONE_SOUTH) }, + { MAP_GROUP(SAFARI_ZONE_SOUTHEAST), MAP_NUM(SAFARI_ZONE_SOUTHEAST) }, + { MAP_GROUP(SAFARI_ZONE_SOUTHWEST), MAP_NUM(SAFARI_ZONE_SOUTHWEST) }, + { MAP_GROUP(SKY_PILLAR_TOP), MAP_NUM(SKY_PILLAR_TOP) }, + { MAP_GROUP(SOUTHERN_ISLAND_EXTERIOR), MAP_NUM(SOUTHERN_ISLAND_EXTERIOR) }, + { MAP_GROUP(SOUTHERN_ISLAND_INTERIOR), MAP_NUM(SOUTHERN_ISLAND_INTERIOR) }, + { MAP_GROUP(RUSTBORO_CITY_GYM), MAP_NUM(RUSTBORO_CITY_GYM) }, + { MAP_GROUP(DEWFORD_TOWN_GYM), MAP_NUM(DEWFORD_TOWN_GYM) }, + { MAP_GROUP(MAUVILLE_CITY_GYM), MAP_NUM(MAUVILLE_CITY_GYM) }, + { MAP_GROUP(LAVARIDGE_TOWN_GYM_1F), MAP_NUM(LAVARIDGE_TOWN_GYM_1F) }, + { MAP_GROUP(LAVARIDGE_TOWN_GYM_B1F), MAP_NUM(LAVARIDGE_TOWN_GYM_B1F) }, + { MAP_GROUP(PETALBURG_CITY_GYM), MAP_NUM(PETALBURG_CITY_GYM) }, + { MAP_GROUP(FORTREE_CITY_GYM), MAP_NUM(FORTREE_CITY_GYM) }, + { MAP_GROUP(MOSSDEEP_CITY_GYM), MAP_NUM(MOSSDEEP_CITY_GYM) }, + { MAP_GROUP(SOOTOPOLIS_CITY_GYM_1F), MAP_NUM(SOOTOPOLIS_CITY_GYM_1F) }, + { MAP_GROUP(SOOTOPOLIS_CITY_GYM_B1F), MAP_NUM(SOOTOPOLIS_CITY_GYM_B1F) }, + }; + + if (IsMapTypeOutdoors(mapType)) + return TRUE; + + for (i = 0; i < ARRAY_COUNT(validIndoorLocations); i++) + { + if (mapNum == validIndoorLocations[i].mapNum && mapGroup == validIndoorLocations[i].mapGroup) + return TRUE; + } + + return FALSE; +} + +void FieldUseFunc_VsSeeker(u8 taskId) +{ + if (IsValidLocationForVsSeeker()) + { + sItemUseOnFieldCB = Task_InitVsSeekerAndCheckForTrainersOnScreen; + SetUpItemUseOnFieldCallback(taskId); + } + else + DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].data[3]); +} + +void Task_ItemUse_CloseMessageBoxAndReturnToField_VsSeeker(u8 taskId) +{ + Task_CloseCantUseKeyItemMessage(taskId); +} + #undef tUsingRegisteredKeyItem diff --git a/src/overworld.c b/src/overworld.c index bf2bcf5ace..09e242b217 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -58,6 +58,7 @@ #include "tv.h" #include "scanline_effect.h" #include "wild_encounter.h" +#include "vs_seeker.h" #include "frontier_util.h" #include "constants/abilities.h" #include "constants/layouts.h" @@ -818,6 +819,10 @@ void LoadMapFromCameraTransition(u8 mapGroup, u8 mapNum) ResetCyclingRoadChallengeData(); RestartWildEncounterImmunitySteps(); TryUpdateRandomTrainerRematches(mapGroup, mapNum); + +if (I_VS_SEEKER_CHARGING != 0) + MapResetTrainerRematches(mapGroup, mapNum); + DoTimeBasedEvents(); SetSavedWeatherFromCurrMapHeader(); ChooseAmbientCrySpecies(); @@ -868,6 +873,10 @@ static void LoadMapFromWarp(bool32 a1) ResetCyclingRoadChallengeData(); RestartWildEncounterImmunitySteps(); TryUpdateRandomTrainerRematches(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum); + +if (I_VS_SEEKER_CHARGING != 0) + MapResetTrainerRematches(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum); + if (a1 != TRUE) DoTimeBasedEvents(); SetSavedWeatherFromCurrMapHeader(); diff --git a/src/trainer_see.c b/src/trainer_see.c index 718afb19d1..ee10747cdf 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -62,6 +62,8 @@ EWRAM_DATA u8 gApproachingTrainerId = 0; static const u8 sEmotion_ExclamationMarkGfx[] = INCBIN_U8("graphics/field_effects/pics/emotion_exclamation.4bpp"); static const u8 sEmotion_QuestionMarkGfx[] = INCBIN_U8("graphics/field_effects/pics/emotion_question.4bpp"); static const u8 sEmotion_HeartGfx[] = INCBIN_U8("graphics/field_effects/pics/emotion_heart.4bpp"); +static const u8 sEmotion_DoubleExclamationMarkGfx[] = INCBIN_U8("graphics/field_effects/pics/emotion_double_exclamation.4bpp"); +static const u8 sEmotion_XGfx[] = INCBIN_U8("graphics/field_effects/pics/emote_x.4bpp"); static u8 (*const sDirectionalApproachDistanceFuncs[])(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y) = { @@ -136,6 +138,14 @@ static const struct SpriteFrameImage sSpriteImageTable_ExclamationQuestionMark[] { .data = sEmotion_QuestionMarkGfx, .size = sizeof(sEmotion_QuestionMarkGfx) + }, + { + .data = sEmotion_DoubleExclamationMarkGfx, + .size = sizeof(sEmotion_DoubleExclamationMarkGfx) + }, + { + .data = sEmotion_XGfx, + .size = sizeof(sEmotion_XGfx) } }; @@ -159,10 +169,25 @@ static const union AnimCmd sSpriteAnim_Icons2[] = ANIMCMD_END }; + +static const union AnimCmd sSpriteAnim_Icons3[] = +{ + ANIMCMD_FRAME(2, 60), + ANIMCMD_END +}; + +static const union AnimCmd sSpriteAnim_Icons4[] = +{ + ANIMCMD_FRAME(3, 60), + ANIMCMD_END +}; + static const union AnimCmd *const sSpriteAnimTable_Icons[] = { sSpriteAnim_Icons1, - sSpriteAnim_Icons2 + sSpriteAnim_Icons2, + sSpriteAnim_Icons3, + sSpriteAnim_Icons4 }; static const struct SpriteTemplate sSpriteTemplate_ExclamationQuestionMark = @@ -731,6 +756,27 @@ u8 FldEff_HeartIcon(void) return 0; } + +u8 FldEff_DoubleExclMarkIcon(void) +{ + u8 spriteId = CreateSpriteAtEnd(&sSpriteTemplate_ExclamationQuestionMark, 0, 0, 0x53); + + if (spriteId != MAX_SPRITES) + SetIconSpriteData(&gSprites[spriteId], FLDEFF_EXCLAMATION_MARK_ICON, 2); + + return 0; +} + +u8 FldEff_XIcon(void) +{ + u8 spriteId = CreateSpriteAtEnd(&sSpriteTemplate_ExclamationQuestionMark, 0, 0, 0x53); + + if (spriteId != MAX_SPRITES) + SetIconSpriteData(&gSprites[spriteId], FLDEFF_EXCLAMATION_MARK_ICON, 3); + + return 0; +} + static void SetIconSpriteData(struct Sprite *sprite, u16 fldEffId, u8 spriteAnimNum) { sprite->oam.priority = 1; diff --git a/src/vs_seeker.c b/src/vs_seeker.c new file mode 100644 index 0000000000..0b58b9bac3 --- /dev/null +++ b/src/vs_seeker.c @@ -0,0 +1,793 @@ +#include "global.h" +#include "task.h" +#include "event_object_movement.h" +#include "item_use.h" +#include "event_scripts.h" +#include "event_data.h" +#include "script.h" +#include "event_object_lock.h" +#include "field_specials.h" +#include "item.h" +#include "item_menu.h" +#include "field_effect.h" +#include "script_movement.h" +#include "battle.h" +#include "battle_setup.h" +#include "random.h" +#include "field_player_avatar.h" +#include "vs_seeker.h" +#include "menu.h" +#include "string_util.h" +#include "tv.h" +#include "malloc.h" +#include "field_screen_effect.h" +#include "gym_leader_rematch.h" +#include "sound.h" +#include "constants/event_object_movement.h" +#include "constants/event_objects.h" +#include "constants/items.h" +#include "constants/maps.h" +#include "constants/songs.h" +#include "constants/trainer_types.h" +#include "constants/field_effects.h" + +enum +{ + VSSEEKER_NOT_CHARGED, + VSSEEKER_NO_ONE_IN_RANGE, + VSSEEKER_CAN_USE, +}; + +typedef enum +{ + VSSEEKER_SINGLE_RESP_RAND, + VSSEEKER_SINGLE_RESP_NO, + VSSEEKER_SINGLE_RESP_YES +} VsSeekerSingleRespCode; + +typedef enum +{ + VSSEEKER_RESPONSE_NO_RESPONSE, + VSSEEKER_RESPONSE_UNFOUGHT_TRAINERS, + VSSEEKER_RESPONSE_FOUND_REMATCHES +} VsSeekerResponseCode; + +struct VsSeekerTrainerInfo +{ + const u8 *script; + u16 trainerIdx; + u8 localId; + u8 objectEventId; + s16 xCoord; + s16 yCoord; + u8 graphicsId; +}; + +struct VsSeekerStruct +{ + struct VsSeekerTrainerInfo trainerInfo[OBJECT_EVENTS_COUNT]; + u16 trainerIdxArray[OBJECT_EVENTS_COUNT]; + u8 runningBehaviourEtcArray[OBJECT_EVENTS_COUNT]; + u8 numRematchableTrainers; + u8 trainerHasNotYetBeenFought:1; + u8 trainerDoesNotWantRematch:1; + u8 trainerWantsRematch:1; + u8 responseCode:5; +}; + +// static declarations +static EWRAM_DATA struct VsSeekerStruct *sVsSeeker = NULL; + +static void VsSeekerResetInBagStepCounter(void); +static void VsSeekerResetChargingStepCounter(void); +static void Task_ResetObjectsRematchWantedState(u8 taskId); +static void ResetMovementOfRematchableTrainers(void); +static void Task_VsSeekerFrameCountdown(u8 taskId); +static void Task_VsSeeker_PlaySoundAndGetResponseCode(u8 taskId); +static void GatherNearbyTrainerInfo(void); +static void Task_VsSeeker_ShowResponseToPlayer(u8 taskId); +static bool8 CanUseVsSeeker(void); +static u8 GetVsSeekerResponseInArea(void); +static u8 GetResponseMovementTypeFromTrainerGraphicsId(u8 graphicsId); +static u16 GetTrainerFlagFromScript(const u8 * script); +static void ClearAllTrainerRematchStates(void); +static bool8 IsTrainerVisibleOnScreen(struct VsSeekerTrainerInfo * trainerInfo); +static u32 GetRematchableTrainerLocalId(void); +static void StartTrainerObjectMovementScript(struct VsSeekerTrainerInfo * trainerInfo, const u8 * script); +static u8 GetCurVsSeekerResponse(s32 vsSeekerIdx, u16 trainerIdx); +static void StartAllRespondantIdleMovements(void); +static bool8 ObjectEventIdIsSane(u8 objectEventId); +static u8 GetRandomFaceDirectionMovementType(); + +static const u8 sMovementScript_Wait48[] = { + MOVEMENT_ACTION_DELAY_16, + MOVEMENT_ACTION_DELAY_16, + MOVEMENT_ACTION_DELAY_16, + MOVEMENT_ACTION_STEP_END +}; + +static const u8 sMovementScript_TrainerUnfought[] = { + MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK, + MOVEMENT_ACTION_STEP_END +}; + +static const u8 sMovementScript_TrainerNoRematch[] = { + MOVEMENT_ACTION_EMOTE_X, + MOVEMENT_ACTION_STEP_END +}; + +static const u8 sMovementScript_TrainerRematch[] = { + MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_DOWN, + MOVEMENT_ACTION_EMOTE_DOUBLE_EXCL_MARK, + MOVEMENT_ACTION_STEP_END +}; + +static const u8 sFaceDirectionMovementTypeByFacingDirection[] = { + MOVEMENT_TYPE_FACE_DOWN, + MOVEMENT_TYPE_FACE_DOWN, + MOVEMENT_TYPE_FACE_UP, + MOVEMENT_TYPE_FACE_LEFT, + MOVEMENT_TYPE_FACE_RIGHT +}; + +void VsSeekerFreezeObjectsAfterChargeComplete(void) +{ + CreateTask(Task_ResetObjectsRematchWantedState, 80); +} + +#define tIsPlayerFrozen data[0] +#define tAreObjectsFrozen data[1] + +static void Task_ResetObjectsRematchWantedState(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + u32 i; + + if ((!task->tIsPlayerFrozen) && IsPlayerStandingStill()) + { + PlayerFreeze(); + task->tIsPlayerFrozen = TRUE; + } + + if (!task->tAreObjectsFrozen) + { + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) + { + if (!ObjectEventIdIsSane(i)) + continue; + + if (gObjectEvents[i].singleMovementActive) + return; + + FreezeObjectEvent(&gObjectEvents[i]); + } + } + + task->tAreObjectsFrozen = TRUE; + if (task->tIsPlayerFrozen) + { + DestroyTask(taskId); + StopPlayerAvatar(); + ScriptContext_Enable(); + } +} +#undef tIsPlayerFrozen +#undef tAreObjectsFrozen + +u16 VsSeekerConvertLocalIdToTableId(u16 localId) +{ + u32 localIdIndex = 0; + u32 trainerId = 0; + + for (localIdIndex = 0; localIdIndex < OBJECT_EVENTS_COUNT ; localIdIndex++) + { + if (sVsSeeker->trainerInfo[localIdIndex].localId == localId) + { + trainerId = sVsSeeker->trainerInfo[localIdIndex].trainerIdx; + return TrainerIdToRematchTableId(gRematchTable,trainerId); + } + } + return -1; +} + +void VsSeekerResetObjectMovementAfterChargeComplete(void) +{ + struct ObjectEventTemplate * templates = gSaveBlock1Ptr->objectEventTemplates; + u32 i; + u32 movementType; + u8 objEventId; + struct ObjectEvent * objectEvent; + + for (i = 0; i < gMapHeader.events->objectEventCount; i++) + { + if (templates[i].trainerType != TRAINER_TYPE_NORMAL + && templates[i].trainerType != TRAINER_TYPE_BURIED) + continue; + + if (templates[i].movementType != MOVEMENT_TYPE_ROTATE_CLOCKWISE) + continue; + + movementType = GetRandomFaceDirectionMovementType(); + TryGetObjectEventIdByLocalIdAndMap(templates[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objEventId); + objectEvent = &gObjectEvents[objEventId]; + + if (!ObjectEventIdIsSane(objEventId)) + continue; + + SetTrainerMovementType(objectEvent, movementType); + templates[i].movementType = movementType; + } +} + +bool8 UpdateVsSeekerStepCounter(void) +{ + u8 x = 0; + + if (!I_VS_SEEKER_CHARGING) return FALSE; + + if (CheckBagHasItem(ITEM_VS_SEEKER, 1)) + { + if ((gSaveBlock1Ptr->trainerRematchStepCounter & 0xFF) < VSSEEKER_RECHARGE_STEPS) + gSaveBlock1Ptr->trainerRematchStepCounter++; + } + + if (FlagGet(I_VS_SEEKER_CHARGING)) + { + if (((gSaveBlock1Ptr->trainerRematchStepCounter >> 8) & 0xFF) < VSSEEKER_RECHARGE_STEPS) + { + x = (((gSaveBlock1Ptr->trainerRematchStepCounter >> 8) & 0xFF) + 1); + gSaveBlock1Ptr->trainerRematchStepCounter = (gSaveBlock1Ptr->trainerRematchStepCounter & 0xFF) | (x << 8); + } + if (((gSaveBlock1Ptr->trainerRematchStepCounter >> 8) & 0xFF) == VSSEEKER_RECHARGE_STEPS) + { + FlagClear(I_VS_SEEKER_CHARGING); + VsSeekerResetChargingStepCounter(); + ClearAllTrainerRematchStates(); + return TRUE; + } + } + + return FALSE; +} + +void MapResetTrainerRematches(u16 mapGroup, u16 mapNum) +{ + if (!I_VS_SEEKER_CHARGING) return; + + FlagClear(I_VS_SEEKER_CHARGING); + VsSeekerResetChargingStepCounter(); + ClearAllTrainerRematchStates(); + ResetMovementOfRematchableTrainers(); +} + +static void ResetMovementOfRematchableTrainers(void) +{ + u32 i; + u8 movementType = 0; + + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) + { + struct ObjectEvent * objectEvent = &gObjectEvents[i]; + if (objectEvent->movementType != MOVEMENT_TYPE_ROTATE_CLOCKWISE) + continue; + + movementType = GetRandomFaceDirectionMovementType(); + + if (!objectEvent->active || gSprites[objectEvent->spriteId].data[0] != i) + continue; + + gSprites[objectEvent->spriteId].x2 = 0; + gSprites[objectEvent->spriteId].y2 = 0; + SetTrainerMovementType(objectEvent, movementType); + } +} + +static void VsSeekerResetInBagStepCounter(void) +{ + gSaveBlock1Ptr->trainerRematchStepCounter &= 0xFF00; +} + +static void VsSeekerResetChargingStepCounter(void) +{ + gSaveBlock1Ptr->trainerRematchStepCounter &= 0x00FF; +} + +void Task_InitVsSeekerAndCheckForTrainersOnScreen(u8 taskId) +{ + u32 i; + u32 respval; + + if (!I_VS_SEEKER_CHARGING) return; + + for (i = 0; i < 16; i++) + gTasks[taskId].data[i] = 0; + + sVsSeeker = AllocZeroed(sizeof(struct VsSeekerStruct)); + GatherNearbyTrainerInfo(); + respval = CanUseVsSeeker(); + if (respval == VSSEEKER_NOT_CHARGED) + { + Free(sVsSeeker); + DisplayItemMessageOnField(taskId, VSSeeker_Text_BatteryNotChargedNeedXSteps, Task_ItemUse_CloseMessageBoxAndReturnToField_VsSeeker); + } + else if (respval == VSSEEKER_NO_ONE_IN_RANGE) + { + Free(sVsSeeker); + DisplayItemMessageOnField(taskId, VSSeeker_Text_NoTrainersWithinRange, Task_ItemUse_CloseMessageBoxAndReturnToField_VsSeeker); + } + else if (respval == VSSEEKER_CAN_USE) + { + FieldEffectStart(FLDEFF_USE_VS_SEEKER); + gTasks[taskId].func = Task_VsSeekerFrameCountdown; + gTasks[taskId].data[0] = 15; + } +} + +static void Task_VsSeekerFrameCountdown(u8 taskId) +{ + if (--gTasks[taskId].data[0] == 0) + { + gTasks[taskId].func = Task_VsSeeker_PlaySoundAndGetResponseCode; + gTasks[taskId].data[1] = 16; + } +} + +static void Task_VsSeeker_PlaySoundAndGetResponseCode(u8 taskId) +{ + s16 * data = gTasks[taskId].data; + + if (data[2] != 2 && --data[1] == 0) + { + PlaySE(SE_CONTEST_MONS_TURN); + data[1] = 11; + data[2]++; + } + + if (!FieldEffectActiveListContains(FLDEFF_USE_VS_SEEKER)) + { + data[1] = 0; + data[2] = 0; + VsSeekerResetInBagStepCounter(); + sVsSeeker->responseCode = GetVsSeekerResponseInArea(); + ScriptMovement_StartObjectMovementScript(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, sMovementScript_Wait48); + gTasks[taskId].func = Task_VsSeeker_ShowResponseToPlayer; + } +} + +static void GatherNearbyTrainerInfo(void) +{ + struct ObjectEventTemplate *templates = gSaveBlock1Ptr->objectEventTemplates; + u8 objectEventId = 0; + u8 vsSeekerObjectIdx = 0; + s32 objectEventIdx; + + for (objectEventIdx = 0; objectEventIdx < gMapHeader.events->objectEventCount; objectEventIdx++) + { + if (templates[objectEventIdx].trainerType != TRAINER_TYPE_NORMAL && templates[objectEventIdx].trainerType != TRAINER_TYPE_BURIED) + continue; + + sVsSeeker->trainerInfo[vsSeekerObjectIdx].script = templates[objectEventIdx].script; + sVsSeeker->trainerInfo[vsSeekerObjectIdx].trainerIdx = GetTrainerFlagFromScript(templates[objectEventIdx].script); + sVsSeeker->trainerInfo[vsSeekerObjectIdx].localId = templates[objectEventIdx].localId; + TryGetObjectEventIdByLocalIdAndMap(templates[objectEventIdx].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId); + sVsSeeker->trainerInfo[vsSeekerObjectIdx].objectEventId = objectEventId; + sVsSeeker->trainerInfo[vsSeekerObjectIdx].xCoord = gObjectEvents[objectEventId].currentCoords.x - 7; + sVsSeeker->trainerInfo[vsSeekerObjectIdx].yCoord = gObjectEvents[objectEventId].currentCoords.y - 7; + sVsSeeker->trainerInfo[vsSeekerObjectIdx].graphicsId = templates[objectEventIdx].graphicsId; + vsSeekerObjectIdx++; + } + sVsSeeker->trainerInfo[vsSeekerObjectIdx].localId = 0xFF; +} + +static void Task_VsSeeker_ShowResponseToPlayer(u8 taskId) +{ + if (!ScriptMovement_IsObjectMovementFinished(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup)) + return; + + if (sVsSeeker->responseCode == VSSEEKER_RESPONSE_NO_RESPONSE) + { + DisplayItemMessageOnField(taskId, VSSeeker_Text_TrainersNotReady, Task_ItemUse_CloseMessageBoxAndReturnToField_VsSeeker); + } + else + { + if (sVsSeeker->responseCode == VSSEEKER_RESPONSE_FOUND_REMATCHES) + StartAllRespondantIdleMovements(); + + ClearDialogWindowAndFrame(0, TRUE); + ScriptUnfreezeObjectEvents(); + UnlockPlayerFieldControls(); + DestroyTask(taskId); + } + Free(sVsSeeker); +} + +static u8 CanUseVsSeeker(void) +{ + u8 vsSeekerChargeSteps = gSaveBlock1Ptr->trainerRematchStepCounter; + + if ((vsSeekerChargeSteps == VSSEEKER_RECHARGE_STEPS) && (GetRematchableTrainerLocalId() == 0xFF)) + return VSSEEKER_NO_ONE_IN_RANGE; + + if (vsSeekerChargeSteps == VSSEEKER_RECHARGE_STEPS) + return VSSEEKER_CAN_USE; + + ConvertIntToDecimalStringN(gStringVar1, (VSSEEKER_RECHARGE_STEPS - vsSeekerChargeSteps), STR_CONV_MODE_LEFT_ALIGN, 3); + return VSSEEKER_NOT_CHARGED; +} + +static u8 GetVsSeekerResponseInArea(void) +{ + u16 trainerIdx = 0; + u8 response = 0, rematchTrainerIdx; + s32 vsSeekerIdx = 0, randomValue = 0; + + while (sVsSeeker->trainerInfo[vsSeekerIdx].localId != 0xFF) + { + if (!IsTrainerVisibleOnScreen(&sVsSeeker->trainerInfo[vsSeekerIdx])) + { + vsSeekerIdx++; + continue; + } + + trainerIdx = sVsSeeker->trainerInfo[vsSeekerIdx].trainerIdx; + if (!HasTrainerBeenFought(trainerIdx)) + { + StartTrainerObjectMovementScript(&sVsSeeker->trainerInfo[vsSeekerIdx], sMovementScript_TrainerUnfought); + sVsSeeker->trainerHasNotYetBeenFought = 1; + vsSeekerIdx++; + continue; + } + + rematchTrainerIdx = GetRematchTrainerIdFromTable(gRematchTable, trainerIdx); + if (rematchTrainerIdx == 0) + { + StartTrainerObjectMovementScript(&sVsSeeker->trainerInfo[vsSeekerIdx], sMovementScript_TrainerNoRematch); + sVsSeeker->trainerDoesNotWantRematch = 1; + } + else + { + randomValue = Random() % 100; // Even if it's overwritten below, it progresses the RNG. + response = GetCurVsSeekerResponse(vsSeekerIdx, trainerIdx); + + if (response == VSSEEKER_SINGLE_RESP_YES) + { + randomValue = 100; // Definitely yes + } + else if (response == VSSEEKER_SINGLE_RESP_NO) + { + randomValue = 0; // Definitely no + } + else if (randomValue < 30) + { + StartTrainerObjectMovementScript(&sVsSeeker->trainerInfo[vsSeekerIdx], sMovementScript_TrainerNoRematch); + sVsSeeker->trainerDoesNotWantRematch = 1; + } + else + { + gSaveBlock1Ptr->trainerRematches[VsSeekerConvertLocalIdToTableId(sVsSeeker->trainerInfo[vsSeekerIdx].localId)] = rematchTrainerIdx; + ShiftStillObjectEventCoords(&gObjectEvents[sVsSeeker->trainerInfo[vsSeekerIdx].objectEventId]); + StartTrainerObjectMovementScript(&sVsSeeker->trainerInfo[vsSeekerIdx], sMovementScript_TrainerRematch); + sVsSeeker->trainerIdxArray[sVsSeeker->numRematchableTrainers] = trainerIdx; + sVsSeeker->runningBehaviourEtcArray[sVsSeeker->numRematchableTrainers] = GetResponseMovementTypeFromTrainerGraphicsId(sVsSeeker->trainerInfo[vsSeekerIdx].graphicsId); + sVsSeeker->numRematchableTrainers++; + sVsSeeker->trainerWantsRematch = 1; + } + } + vsSeekerIdx++; + } + + if (sVsSeeker->trainerWantsRematch) + { + PlaySE(SE_PIN); + FlagSet(I_VS_SEEKER_CHARGING); + VsSeekerResetChargingStepCounter(); + return VSSEEKER_RESPONSE_FOUND_REMATCHES; + } + + if (sVsSeeker->trainerHasNotYetBeenFought) + return VSSEEKER_RESPONSE_UNFOUGHT_TRAINERS; + + return VSSEEKER_RESPONSE_NO_RESPONSE; +} + +void ClearRematchMovementByTrainerId(void) +{ + s32 i; + u8 objEventId = 0; + struct ObjectEventTemplate *objectEventTemplates = gSaveBlock1Ptr->objectEventTemplates; + struct ObjectEvent *objectEvent; + + int vsSeekerDataIdx = TrainerIdToRematchTableId(gRematchTable, gTrainerBattleOpponent_A); + + if (!I_VS_SEEKER_CHARGING) return; + + if (vsSeekerDataIdx == -1) + return; + + for (i = 0; i < gMapHeader.events->objectEventCount; i++) + { + if ((objectEventTemplates[i].trainerType != TRAINER_TYPE_NORMAL + && objectEventTemplates[i].trainerType != TRAINER_TYPE_BURIED) + || vsSeekerDataIdx != TrainerIdToRematchTableId(gRematchTable, GetTrainerFlagFromScript(objectEventTemplates[i].script))) + continue; + + TryGetObjectEventIdByLocalIdAndMap(objectEventTemplates[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objEventId); + objectEvent = &gObjectEvents[objEventId]; + GetRandomFaceDirectionMovementType(&objectEventTemplates[i]); + TryOverrideTemplateCoordsForObjectEvent(objectEvent, sFaceDirectionMovementTypeByFacingDirection[objectEvent->facingDirection]); + + if (gSelectedObjectEvent == objEventId) + objectEvent->movementType = sFaceDirectionMovementTypeByFacingDirection[objectEvent->facingDirection]; + else + objectEvent->movementType = MOVEMENT_TYPE_FACE_DOWN; + } +} + +static u32 GetGameProgressFlags() +{ + const u32 gameProgressFlags[] = { + FLAG_VISITED_LAVARIDGE_TOWN, + FLAG_VISITED_FORTREE_CITY, + FLAG_SYS_GAME_CLEAR, + FLAG_DEFEATED_METEOR_FALLS_STEVEN + }; + u32 i = 0, numGameProgressFlags = 0; + u32 maxGameProgressFlags = ARRAY_COUNT(gameProgressFlags); + + for (i = 0; i < maxGameProgressFlags; i++) + { + if (FlagGet(gameProgressFlags[i])) + numGameProgressFlags++; + } + + return numGameProgressFlags; +} + +u16 GetRematchTrainerIdVSSeeker(u16 trainerId) +{ + u32 tableId = FirstBattleTrainerIdToRematchTableId(gRematchTable, trainerId); + u32 rematchTrainerIdx = GetGameProgressFlags(); + + if (!I_VS_SEEKER_CHARGING) return 0; + + while (!HasTrainerBeenFought(gRematchTable[tableId].trainerIds[rematchTrainerIdx-1])) + { + if (rematchTrainerIdx== 0) + break; + + rematchTrainerIdx--; + } + + return gRematchTable[tableId].trainerIds[rematchTrainerIdx]; +} + +static bool8 ObjectEventIdIsSane(u8 objectEventId) +{ + struct ObjectEvent *objectEvent = &gObjectEvents[objectEventId]; + + if (objectEvent->active && gMapHeader.events->objectEventCount >= objectEvent->localId && gSprites[objectEvent->spriteId].data[0] == objectEventId) + return TRUE; + return FALSE; +} + +static u8 GetRandomFaceDirectionMovementType() +{ + u16 randomFacingDirection = Random() % 4; + + switch (randomFacingDirection) + { + case 0: + return MOVEMENT_TYPE_FACE_UP; + case 1: + return MOVEMENT_TYPE_FACE_DOWN; + case 2: + return MOVEMENT_TYPE_FACE_LEFT; + case 3: + return MOVEMENT_TYPE_FACE_RIGHT; + default: + return MOVEMENT_TYPE_FACE_DOWN; + } +} + +static bool32 IsRegularLandTrainer(u8 graphicsId) +{ + u32 i; + u16 regularTrainersOnLand[] = + { + OBJ_EVENT_GFX_AQUA_MEMBER_F, + OBJ_EVENT_GFX_AQUA_MEMBER_M, + OBJ_EVENT_GFX_BEAUTY, + OBJ_EVENT_GFX_BLACK_BELT, + OBJ_EVENT_GFX_BOY_1, + OBJ_EVENT_GFX_BOY_2, + OBJ_EVENT_GFX_BOY_3, + OBJ_EVENT_GFX_BUG_CATCHER, + OBJ_EVENT_GFX_CAMPER, + OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F, + OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M, + OBJ_EVENT_GFX_EXPERT_F, + OBJ_EVENT_GFX_EXPERT_M, + OBJ_EVENT_GFX_FAT_MAN, + OBJ_EVENT_GFX_FISHERMAN, + OBJ_EVENT_GFX_GENTLEMAN, + OBJ_EVENT_GFX_GIRL_1, + OBJ_EVENT_GFX_GIRL_2, + OBJ_EVENT_GFX_GIRL_3, + OBJ_EVENT_GFX_HEX_MANIAC, + OBJ_EVENT_GFX_HIKER, + OBJ_EVENT_GFX_LASS, + OBJ_EVENT_GFX_LITTLE_BOY, + OBJ_EVENT_GFX_LITTLE_GIRL, + OBJ_EVENT_GFX_MAGMA_MEMBER_F, + OBJ_EVENT_GFX_MAGMA_MEMBER_M, + OBJ_EVENT_GFX_MAN_3, + OBJ_EVENT_GFX_MAN_4, + OBJ_EVENT_GFX_MAN_5, + OBJ_EVENT_GFX_MANIAC, + OBJ_EVENT_GFX_NINJA_BOY, + OBJ_EVENT_GFX_PICNICKER, + OBJ_EVENT_GFX_POKEFAN_F, + OBJ_EVENT_GFX_POKEFAN_M, + OBJ_EVENT_GFX_PSYCHIC_M, + OBJ_EVENT_GFX_RICH_BOY, + OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F, + OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M, + OBJ_EVENT_GFX_SAILOR, + OBJ_EVENT_GFX_SCHOOL_KID_M, + OBJ_EVENT_GFX_TUBER_F, + OBJ_EVENT_GFX_TUBER_M, + OBJ_EVENT_GFX_TWIN, + OBJ_EVENT_GFX_WOMAN_1, + OBJ_EVENT_GFX_WOMAN_2, + OBJ_EVENT_GFX_WOMAN_4, + OBJ_EVENT_GFX_WOMAN_5, + OBJ_EVENT_GFX_YOUNGSTER + }; + + for (i = 0; i < ARRAY_COUNT(regularTrainersOnLand); i++) + { + if (graphicsId == regularTrainersOnLand[i]) + return TRUE; + } + return FALSE; +} + +static bool32 IsRegularWaterTrainer(u8 graphicsId) +{ + u32 i; + u16 regularTrainersInWater[] = + { + OBJ_EVENT_GFX_SWIMMER_F, + OBJ_EVENT_GFX_SWIMMER_M, + OBJ_EVENT_GFX_TUBER_M_SWIMMING + }; + + for (i = 0; i < ARRAY_COUNT(regularTrainersInWater); i++) + { + if (graphicsId == regularTrainersInWater[i]) + return TRUE; + } + return FALSE; +} + +static u8 GetResponseMovementTypeFromTrainerGraphicsId(u8 graphicsId) +{ + if (IsRegularLandTrainer(graphicsId) || IsRegularWaterTrainer(graphicsId)) + return MOVEMENT_TYPE_ROTATE_CLOCKWISE; + + return MOVEMENT_TYPE_FACE_DOWN; +} + +static u16 GetTrainerFlagFromScript(const u8 *script) + /* + * The trainer flag is a little-endian short located +2 from + * the script pointer, assuming the trainerbattle command is + * first in the script. Because scripts are unaligned, and + * because the ARM processor requires shorts to be 16-bit + * aligned, this function needs to perform explicit bitwise + * operations to get the correct flag. + * + * 5c XX YY ZZ ... + * -- -- + */ +{ + u16 trainerFlag; + + script += 2; + trainerFlag = script[0]; + trainerFlag |= script[1] << 8; + return trainerFlag; +} + +static void ClearAllTrainerRematchStates(void) +{ + u32 i; + + if (!CheckBagHasItem(ITEM_VS_SEEKER, 1)) + return; + + for (i = 0; i < ARRAY_COUNT(gSaveBlock1Ptr->trainerRematches); i++) + gSaveBlock1Ptr->trainerRematches[i] = 0; +} + +static bool8 IsTrainerVisibleOnScreen(struct VsSeekerTrainerInfo * trainerInfo) +{ + s16 x; + s16 y; + + PlayerGetDestCoords(&x, &y); + x -= 7; + y -= 7; + + if ( x - 7 <= trainerInfo->xCoord + && x + 7 >= trainerInfo->xCoord + && y - 5 <= trainerInfo->yCoord + && y + 5 >= trainerInfo->yCoord + && ObjectEventIdIsSane(trainerInfo->objectEventId) == 1) + return TRUE; + return FALSE; +} + +static u32 GetRematchableTrainerLocalId(void) +{ + u32 i; + + for (i = 0; sVsSeeker->trainerInfo[i].localId != 0xFF; i++) + { + if (IsTrainerVisibleOnScreen(&sVsSeeker->trainerInfo[i]) == 1) + { + if (HasTrainerBeenFought(sVsSeeker->trainerInfo[i].trainerIdx) != 1 || GetRematchTrainerIdFromTable(gRematchTable, sVsSeeker->trainerInfo[i].trainerIdx)) + return sVsSeeker->trainerInfo[i].localId; + } + } + + return 0xFF; +} + +static void StartTrainerObjectMovementScript(struct VsSeekerTrainerInfo * trainerInfo, const u8 * script) +{ + UnfreezeObjectEvent(&gObjectEvents[trainerInfo->objectEventId]); + ScriptMovement_StartObjectMovementScript(trainerInfo->localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, script); +} + +static u8 GetCurVsSeekerResponse(s32 vsSeekerIdx, u16 trainerIdx) +{ + s32 i; + s32 j; + + for (i = 0; i < vsSeekerIdx; i++) + { + if (IsTrainerVisibleOnScreen(&sVsSeeker->trainerInfo[i]) != 1 || sVsSeeker->trainerInfo[i].trainerIdx != trainerIdx) + continue; + + for (j = 0; j < sVsSeeker->numRematchableTrainers; j++) + { + if (sVsSeeker->trainerIdxArray[j] == sVsSeeker->trainerInfo[i].trainerIdx) + return VSSEEKER_SINGLE_RESP_YES; + } + return VSSEEKER_SINGLE_RESP_NO; + } + return VSSEEKER_SINGLE_RESP_RAND; +} + +static void StartAllRespondantIdleMovements(void) +{ + s32 i; + s32 j; + + for (i = 0; i < sVsSeeker->numRematchableTrainers; i++) + { + for (j = 0; sVsSeeker->trainerInfo[j].localId != 0xFF; j++) + { + if (sVsSeeker->trainerInfo[j].trainerIdx == sVsSeeker->trainerIdxArray[i]) + { + struct ObjectEvent *objectEvent = &gObjectEvents[sVsSeeker->trainerInfo[j].objectEventId]; + + if (ObjectEventIdIsSane(sVsSeeker->trainerInfo[j].objectEventId) == 1) + SetTrainerMovementType(objectEvent, sVsSeeker->runningBehaviourEtcArray[i]); + TryOverrideTemplateCoordsForObjectEvent(objectEvent, sVsSeeker->runningBehaviourEtcArray[i]); + gSaveBlock1Ptr->trainerRematches[VsSeekerConvertLocalIdToTableId(sVsSeeker->trainerInfo[j].localId)] = GetRematchTrainerIdFromTable(gRematchTable, sVsSeeker->trainerInfo[j].trainerIdx); + } + } + } +} From b72581985cc3d62165dab03b86271a84592e9a43 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Mon, 27 Nov 2023 12:42:53 +0100 Subject: [PATCH 02/14] Add bad poison downgrade config (#3605) Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --- include/config/battle.h | 1 + src/battle_setup.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/include/config/battle.h b/include/config/battle.h index 622054ab28..503ce9328e 100644 --- a/include/config/battle.h +++ b/include/config/battle.h @@ -219,6 +219,7 @@ #define B_OBEDIENCE_MECHANICS GEN_LATEST // In PLA+ (here Gen8+), obedience restrictions also apply to non-outsider Pokémon, albeit based on their level met rather than actual level #define B_USE_FROSTBITE FALSE // In PLA, Frostbite replaces Freeze. Enabling this flag does the same here. Moves can still be cherry-picked to either Freeze or Frostbite. Freeze-Dry, Secret Power & Tri Attack depend on this config. #define B_OVERWORLD_SNOW GEN_LATEST // In Gen9+, overworld Snow will summon snow instead of hail. +#define B_TOXIC_REVERSAL GEN_LATEST // In Gen5+, bad poison will change to regular poison at the end of battles. // Animation Settings #define B_NEW_SWORD_PARTICLE TRUE // If set to TRUE, it updates Swords Dance's particle. diff --git a/src/battle_setup.c b/src/battle_setup.c index 5459c04925..750191d74f 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -677,6 +677,19 @@ void StartRegiBattle(void) TryUpdateGymLeaderRematchFromWild(); } +static void DowngradeBadPoison(void) +{ + u8 i; + u32 status = STATUS1_POISON; + if (B_TOXIC_REVERSAL < GEN_5) + return; + for(i = 0; i < PARTY_SIZE; i++) + { + if (GetMonData(&gPlayerParty[i], MON_DATA_SANITY_HAS_SPECIES) && GetMonData(&gPlayerParty[i], MON_DATA_STATUS) == STATUS1_TOXIC_POISON) + SetMonData(&gPlayerParty[i], MON_DATA_STATUS, &status); + } +} + static void CB2_EndWildBattle(void) { CpuFill16(0, (void *)(BG_PLTT), BG_PLTT_SIZE); @@ -689,6 +702,7 @@ static void CB2_EndWildBattle(void) else { SetMainCallback2(CB2_ReturnToField); + DowngradeBadPoison(); gFieldCallback = FieldCB_ReturnToFieldNoScriptCheckMusic; } } @@ -707,6 +721,7 @@ static void CB2_EndScriptedWildBattle(void) } else { + DowngradeBadPoison(); SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } } @@ -997,6 +1012,7 @@ static void CB2_StartFirstBattle(void) static void CB2_EndFirstBattle(void) { Overworld_ClearSavedMusic(); + DowngradeBadPoison(); SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } @@ -1414,6 +1430,7 @@ static void CB2_EndTrainerBattle(void) if (gTrainerBattleOpponent_A == TRAINER_SECRET_BASE) { + DowngradeBadPoison(); SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } else if (IsPlayerDefeated(gBattleOutcome) == TRUE) @@ -1426,6 +1443,7 @@ static void CB2_EndTrainerBattle(void) else { SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); + DowngradeBadPoison(); if (!InBattlePyramid() && !InTrainerHillChallenge()) { RegisterTrainerInMatchCall(); @@ -1438,6 +1456,7 @@ static void CB2_EndRematchBattle(void) { if (gTrainerBattleOpponent_A == TRAINER_SECRET_BASE) { + DowngradeBadPoison(); SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } else if (IsPlayerDefeated(gBattleOutcome) == TRUE) @@ -1450,6 +1469,7 @@ static void CB2_EndRematchBattle(void) RegisterTrainerInMatchCall(); SetBattledTrainersFlags(); HandleRematchVarsOnBattleEnd(); + DowngradeBadPoison(); } } From 8c4058c7a85345a9c580b706e32b12765fd5286d Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Tue, 28 Nov 2023 12:57:11 -0500 Subject: [PATCH 03/14] add HITMARKER_DISABLE_ANIMATION for bug bite consumeberry (#3607) Co-authored-by: ghoulslash Co-authored-by: Bassoonian --- data/battle_scripts_1.s | 16 ++++++++-------- include/constants/battle.h | 3 ++- src/battle_script_commands.c | 12 ++++++------ 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 355c7ad53e..79c363ec4c 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -749,10 +749,10 @@ BattleScript_TeatimeLoop: jumpifabsorbaffected BS_TARGET, BattleScript_Teatimesorb jumpifmotoraffected BS_TARGET, BattleScript_Teatimemotor jumpifteainvulnerable BS_TARGET, BattleScript_Teatimevul @ in semi-invulnerable state OR held item is not a Berry - orword gHitMarker, HITMARKER_NO_ANIMATIONS | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_IGNORE_DISGUISE + orword gHitMarker, HITMARKER_DISABLE_ANIMATION | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_IGNORE_DISGUISE setbyte sBERRY_OVERRIDE, TRUE @ override the requirements for eating berries consumeberry BS_TARGET, TRUE @ consume the berry, then restore the item from changedItems - bicword gHitMarker, HITMARKER_NO_ANIMATIONS | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_IGNORE_DISGUISE + bicword gHitMarker, HITMARKER_DISABLE_ANIMATION | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_IGNORE_DISGUISE setbyte sBERRY_OVERRIDE, FALSE removeitem BS_TARGET moveendto MOVEEND_NEXT_TARGET @@ -1052,9 +1052,9 @@ BattleScript_EffectFlingConsumeBerry: savebattleritem BS_TARGET battleritemtolastuseditem BS_TARGET setbyte sBERRY_OVERRIDE, 1 @ override the requirements for eating berries - orword gHitMarker, HITMARKER_NO_ANIMATIONS + orword gHitMarker, HITMARKER_DISABLE_ANIMATION consumeberry BS_TARGET, TRUE - bicword gHitMarker, HITMARKER_NO_ANIMATIONS + bicword gHitMarker, HITMARKER_DISABLE_ANIMATION setbyte sBERRY_OVERRIDE, 0 restorebattleritem BS_TARGET BattleScript_FlingEnd: @@ -1327,9 +1327,9 @@ BattleScript_EffectStuffCheeks:: waitanimation BattleScript_StuffCheeksEatBerry: setbyte sBERRY_OVERRIDE, 1 - orword gHitMarker, HITMARKER_NO_ANIMATIONS + orword gHitMarker, HITMARKER_DISABLE_ANIMATION consumeberry BS_ATTACKER, TRUE - bicword gHitMarker, HITMARKER_NO_ANIMATIONS + bicword gHitMarker, HITMARKER_DISABLE_ANIMATION setbyte sBERRY_OVERRIDE, 0 removeitem BS_ATTACKER setstatchanger STAT_DEF, 2, FALSE @@ -1593,11 +1593,11 @@ BattleScript_MoveEffectIncinerate:: BattleScript_MoveEffectBugBite:: printstring STRINGID_BUGBITE waitmessage B_WAIT_TIME_LONG - orword gHitMarker, HITMARKER_NO_ANIMATIONS + orword gHitMarker, HITMARKER_DISABLE_ANIMATION setbyte sBERRY_OVERRIDE, 1 @ override the requirements for eating berries savetarget consumeberry BS_ATTACKER, FALSE - bicword gHitMarker, HITMARKER_NO_ANIMATIONS + bicword gHitMarker, HITMARKER_DISABLE_ANIMATION setbyte sBERRY_OVERRIDE, 0 trysymbiosis restoretarget diff --git a/include/constants/battle.h b/include/constants/battle.h index ecc823ee8b..1897763799 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -193,7 +193,7 @@ #define HITMARKER_WAKE_UP_CLEAR (1 << 4) // Cleared when waking up. Never set or checked. #define HITMARKER_SKIP_DMG_TRACK (1 << 5) #define HITMARKER_DESTINYBOND (1 << 6) -#define HITMARKER_NO_ANIMATIONS (1 << 7) +#define HITMARKER_NO_ANIMATIONS (1 << 7) // set from battleSceneOff. Never changed during battle #define HITMARKER_IGNORE_SUBSTITUTE (1 << 8) #define HITMARKER_NO_ATTACKSTRING (1 << 9) #define HITMARKER_ATTACKSTRING_PRINTED (1 << 10) @@ -203,6 +203,7 @@ #define HITMARKER_SYNCHRONISE_EFFECT (1 << 14) #define HITMARKER_RUN (1 << 15) #define HITMARKER_IGNORE_DISGUISE (1 << 16) +#define HITMARKER_DISABLE_ANIMATION (1 << 17) // disable animations during battle scripts, e.g. for Bug Bite // 3 free spots because of change in handling of UNDERGROUND/UNDERWATER/ON AIR #define HITMARKER_UNABLE_TO_USE_MOVE (1 << 19) #define HITMARKER_PASSIVE_DAMAGE (1 << 20) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 9fd43a3d1e..6d8769f747 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -2159,7 +2159,7 @@ static void Cmd_attackanimation(void) if (gBattleControllerExecFlags) return; - if ((gHitMarker & HITMARKER_NO_ANIMATIONS) + if ((gHitMarker & (HITMARKER_NO_ANIMATIONS | HITMARKER_DISABLE_ANIMATION)) && gCurrentMove != MOVE_TRANSFORM && gCurrentMove != MOVE_SUBSTITUTE // In a wild double battle gotta use the teleport animation if two wild pokemon are alive. @@ -4920,7 +4920,7 @@ static void PlayAnimation(u32 battler, u8 animId, const u16 *argPtr, const u8 *n MarkBattlerForControllerExec(battler); gBattlescriptCurrInstr = nextInstr; } - else if (gHitMarker & HITMARKER_NO_ANIMATIONS && animId != B_ANIM_RESTORE_BG) + else if (gHitMarker & (HITMARKER_NO_ANIMATIONS | HITMARKER_DISABLE_ANIMATION) && animId != B_ANIM_RESTORE_BG) { BattleScriptPush(nextInstr); gBattlescriptCurrInstr = BattleScript_Pausex20; @@ -5502,7 +5502,7 @@ static void Cmd_moveend(void) break; case MOVEEND_ATTACKER_INVISIBLE: // make attacker sprite invisible if (gStatuses3[gBattlerAttacker] & (STATUS3_SEMI_INVULNERABLE) - && gHitMarker & HITMARKER_NO_ANIMATIONS) + && gHitMarker & (HITMARKER_NO_ANIMATIONS | HITMARKER_DISABLE_ANIMATION)) { BtlController_EmitSpriteInvisibility(gBattlerAttacker, BUFFER_A, TRUE); MarkBattlerForControllerExec(gBattlerAttacker); @@ -7446,7 +7446,7 @@ static void Cmd_statusanimation(void) u32 battler = GetBattlerForBattleScript(cmd->battler); if (!(gStatuses3[battler] & STATUS3_SEMI_INVULNERABLE) && gDisableStructs[battler].substituteHP == 0 - && !(gHitMarker & HITMARKER_NO_ANIMATIONS)) + && !(gHitMarker & (HITMARKER_NO_ANIMATIONS | HITMARKER_DISABLE_ANIMATION))) { BtlController_EmitStatusAnimation(battler, BUFFER_A, FALSE, gBattleMons[battler].status1); MarkBattlerForControllerExec(battler); @@ -7465,7 +7465,7 @@ static void Cmd_status2animation(void) u32 status2ToAnim = cmd->status2; if (!(gStatuses3[battler] & STATUS3_SEMI_INVULNERABLE) && gDisableStructs[battler].substituteHP == 0 - && !(gHitMarker & HITMARKER_NO_ANIMATIONS)) + && !(gHitMarker & (HITMARKER_NO_ANIMATIONS | HITMARKER_DISABLE_ANIMATION))) { BtlController_EmitStatusAnimation(battler, BUFFER_A, TRUE, gBattleMons[battler].status2 & status2ToAnim); MarkBattlerForControllerExec(battler); @@ -7484,7 +7484,7 @@ static void Cmd_chosenstatusanimation(void) u32 wantedStatus = cmd->status; if (!(gStatuses3[battler] & STATUS3_SEMI_INVULNERABLE) && gDisableStructs[battler].substituteHP == 0 - && !(gHitMarker & HITMARKER_NO_ANIMATIONS)) + && !(gHitMarker & (HITMARKER_NO_ANIMATIONS | HITMARKER_DISABLE_ANIMATION))) { BtlController_EmitStatusAnimation(battler, BUFFER_A, cmd->isStatus2, wantedStatus); MarkBattlerForControllerExec(battler); From 913bc6c9d0602dbb61c096520b5424af4599fd89 Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Wed, 29 Nov 2023 11:05:06 +0100 Subject: [PATCH 04/14] Adds White Herb tests (#3611) --- test/battle/hold_effect/white_herb.c | 176 +++++++++++++++++++++++++++ 1 file changed, 176 insertions(+) diff --git a/test/battle/hold_effect/white_herb.c b/test/battle/hold_effect/white_herb.c index a34bb6a347..734091552b 100644 --- a/test/battle/hold_effect/white_herb.c +++ b/test/battle/hold_effect/white_herb.c @@ -68,3 +68,179 @@ DOUBLE_BATTLE_TEST("White Herb restores stats after Attack was lowered by Intimi EXPECT(opponentRight->statStages[STAT_DEF] = DEFAULT_STAT_STAGE); } } + +SINGLE_BATTLE_TEST("White Herb restores stats after Attack was lowered by Intimidate while switching in") +{ + KNOWN_FAILING; + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_WHITE_HERB); } + OPPONENT(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_ARBOK) { Ability(ABILITY_INTIMIDATE); } + } WHEN { + TURN { SWITCH(opponent, 1); MOVE(player, MOVE_CLOSE_COMBAT); } + } SCENE { + ABILITY_POPUP(opponent, ABILITY_INTIMIDATE); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); + MESSAGE("Wobbuffet's White Herb restored its status!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_CLOSE_COMBAT, player); + NONE_OF { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); + MESSAGE("Wobbuffet's White Herb restored its status!"); + } + } THEN { + EXPECT(player->item == ITEM_NONE); + EXPECT(player->statStages[STAT_DEF] = DEFAULT_STAT_STAGE - 1); + EXPECT(player->statStages[STAT_SPDEF] = DEFAULT_STAT_STAGE - 1); + } +} + + +SINGLE_BATTLE_TEST("White Herb restores stats after all hits of a multi hit move happened") +{ + u16 species; + u16 ability; + + PARAMETRIZE { species = SPECIES_SLIGGOO_HISUIAN; ability = ABILITY_GOOEY; } + PARAMETRIZE { species = SPECIES_DUGTRIO_ALOLAN; ability = ABILITY_TANGLING_HAIR; } + + KNOWN_FAILING; + GIVEN { + ASSUME(gBattleMoves[MOVE_DUAL_WINGBEAT].strikeCount == 2); + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_WHITE_HERB); } + OPPONENT(species) { Ability(ability); } + } WHEN { + TURN { MOVE(player, MOVE_DUAL_WINGBEAT); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_DUAL_WINGBEAT, player); + ABILITY_POPUP(opponent, ability); + MESSAGE("Wobbuffet's Speed fell!"); + ABILITY_POPUP(opponent, ability); + MESSAGE("Wobbuffet's Speed fell!"); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); + MESSAGE("Wobbuffet's White Herb restored its status!"); + } THEN { + EXPECT(player->item == ITEM_NONE); + EXPECT(player->statStages[STAT_SPEED] = DEFAULT_STAT_STAGE); + } +} + +SINGLE_BATTLE_TEST("White Herb wont have time to activate if it is knocked off or stolen by Thief") +{ + u16 move; + + PARAMETRIZE { move = MOVE_THIEF; } + PARAMETRIZE { move = MOVE_KNOCK_OFF; } + + KNOWN_FAILING; // Knock off fails, Thief is fine + GIVEN { + ASSUME(gBattleMoves[MOVE_THIEF].effect == EFFECT_THIEF); + ASSUME(gBattleMoves[MOVE_KNOCK_OFF].effect == EFFECT_KNOCK_OFF); + PLAYER(SPECIES_SLUGMA) { Ability(ABILITY_WEAK_ARMOR); Item(ITEM_WHITE_HERB); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(opponent, move); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, move, opponent); + if (move == MOVE_THIEF) + MESSAGE("Foe Wobbuffet stole Slugma's White Herb!"); + else + MESSAGE("Foe Wobbuffet knocked off Slugma's White Herb!"); + ABILITY_POPUP(player, ABILITY_WEAK_ARMOR); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); + MESSAGE("Slugma's Weak Armor lowered its Defense!"); + MESSAGE("Slugma's Weak Armor raised its Speed!"); + NONE_OF { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); + MESSAGE("Wobbuffet's White Herb restored its status!"); + } + } THEN { + EXPECT(player->statStages[STAT_DEF] = DEFAULT_STAT_STAGE - 1); + EXPECT(player->statStages[STAT_SPEED] = DEFAULT_STAT_STAGE + 1); + } +} + +SINGLE_BATTLE_TEST("White Herb wont have time to activate if Magician steals it") +{ + KNOWN_FAILING; // White Herb is activated + GIVEN { + ASSUME(P_GEN_6_POKEMON == TRUE); + PLAYER(SPECIES_SLUGMA) { Ability(ABILITY_WEAK_ARMOR); Item(ITEM_WHITE_HERB); } + OPPONENT(SPECIES_FENNEKIN) { Ability(ABILITY_MAGICIAN); } + } WHEN { + TURN { MOVE(opponent, MOVE_TACKLE); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponent); + ABILITY_POPUP(opponent, ABILITY_MAGICIAN); + ABILITY_POPUP(player, ABILITY_WEAK_ARMOR); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); + MESSAGE("Slugma's Weak Armor lowered its Defense!"); + MESSAGE("Slugma's Weak Armor raised its Speed!"); + NONE_OF { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); + MESSAGE("Wobbuffet's White Herb restored its status!"); + } + } THEN { + EXPECT(player->statStages[STAT_DEF] = DEFAULT_STAT_STAGE - 1); + EXPECT(player->statStages[STAT_SPEED] = DEFAULT_STAT_STAGE + 1); + } +} + +SINGLE_BATTLE_TEST("White Herb wont have time to activate if Pickpocket steals it") +{ + KNOWN_FAILING; // White Herb is activated + GIVEN { + ASSUME(gBattleMoves[MOVE_LEAF_STORM].effect == EFFECT_OVERHEAT); + PLAYER(SPECIES_SLUGMA) { Ability(ABILITY_WEAK_ARMOR); Item(ITEM_WHITE_HERB); } + OPPONENT(SPECIES_SNEASEL) { Ability(ABILITY_PICKPOCKET); } + } WHEN { + TURN { MOVE(player, MOVE_LEAF_STORM); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_LEAF_STORM, player); + ABILITY_POPUP(player, ABILITY_PICKPOCKET); + ABILITY_POPUP(player, ABILITY_WEAK_ARMOR); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); + MESSAGE("Slugma's Weak Armor lowered its Defense!"); + MESSAGE("Slugma's Weak Armor raised its Speed!"); + NONE_OF { + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); + MESSAGE("Wobbuffet's White Herb restored its status!"); + } + } THEN { + EXPECT(player->statStages[STAT_DEF] = DEFAULT_STAT_STAGE - 1); + EXPECT(player->statStages[STAT_SPEED] = DEFAULT_STAT_STAGE + 1); + } +} + +SINGLE_BATTLE_TEST("White Herb restores stats after Defiant or Competitive were triggered") +{ + u16 species; + u16 ability; + + PARAMETRIZE { species = SPECIES_IGGLYBUFF; ability = ABILITY_COMPETITIVE; } + PARAMETRIZE { species = SPECIES_MANKEY; ability = ABILITY_DEFIANT; } + + KNOWN_FAILING; + GIVEN { + PLAYER(species) { Ability(ability); Item(ITEM_WHITE_HERB); } + OPPONENT(SPECIES_ARBOK) { Ability(ABILITY_INTIMIDATE); } + } WHEN { + TURN { ; } + } SCENE { + ABILITY_POPUP(opponent, ABILITY_INTIMIDATE); + ABILITY_POPUP(player, ability); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); + MESSAGE("Wobbuffet's White Herb restored its status!"); + } THEN { + EXPECT(player->item == ITEM_NONE); + if (species == SPECIES_IGGLYBUFF) + { + EXPECT(player->statStages[STAT_ATK] = DEFAULT_STAT_STAGE); + EXPECT(player->statStages[STAT_SPATK] = DEFAULT_STAT_STAGE + 2); + } + else + EXPECT(player->statStages[STAT_ATK] = DEFAULT_STAT_STAGE + 3); + } +} From 4bde378c0d13704ecdc46d26304eaecdc9ba8e23 Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Wed, 29 Nov 2023 13:57:29 +0100 Subject: [PATCH 05/14] Fixes Floral Healing + Tests (#3604) --- asm/macros/battle_script.inc | 10 +- data/battle_scripts_1.s | 2 +- include/constants/battle.h | 3 +- include/constants/battle_script_commands.h | 234 ++++++++++----------- src/battle_script_commands.c | 43 ++-- src/data/battle_moves.h | 1 + test/battle/move_effect/heal_pulse.c | 102 +++++++++ 7 files changed, 250 insertions(+), 145 deletions(-) create mode 100644 test/battle/move_effect/heal_pulse.c diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index c875729b85..8002df68ab 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -1461,6 +1461,11 @@ .4byte \failInstr .endm + .macro tryhealpulse failInstr:req + callnative BS_TryHealPulse + .4byte \failInstr + .endm + @ various command changed to more readable macros .macro cancelmultiturnmoves battler:req various \battler, VARIOUS_CANCEL_MULTI_TURN_MOVES @@ -1652,11 +1657,6 @@ various \battler, VARIOUS_SET_LAST_USED_ABILITY .endm - .macro tryhealpulse battler:req, failInstr:req - various \battler, VARIOUS_TRY_HEAL_PULSE - .4byte \failInstr - .endm - .macro tryquash failInstr:req various BS_ATTACKER, VARIOUS_TRY_QUASH .4byte \failInstr diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 07e0bf065a..6124f72fa8 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2607,7 +2607,7 @@ BattleScript_EffectHealPulse: jumpifstatus3 BS_TARGET, STATUS3_HEAL_BLOCK, BattleScript_MoveUsedHealBlockPrevents accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON jumpifsubstituteblocks BattleScript_ButItFailed - tryhealpulse BS_TARGET, BattleScript_AlreadyAtFullHp + tryhealpulse BattleScript_AlreadyAtFullHp attackanimation waitanimation healthbarupdate BS_TARGET diff --git a/include/constants/battle.h b/include/constants/battle.h index 5e94f27fe9..f21452310e 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -384,8 +384,9 @@ #define MOVE_EFFECT_STEALTH_ROCK 76 #define MOVE_EFFECT_SPIKES 77 #define MOVE_EFFECT_TRIPLE_ARROWS 78 +#define MOVE_EFFECT_FLORAL_HEALING 79 -#define NUM_MOVE_EFFECTS 79 +#define NUM_MOVE_EFFECTS 80 #define MOVE_EFFECT_AFFECTS_USER 0x4000 #define MOVE_EFFECT_CERTAIN 0x8000 diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h index ea74a4d1e9..e7d0f8f4be 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -131,124 +131,122 @@ #define VARIOUS_SET_SIMPLE_BEAM 39 #define VARIOUS_TRY_ENTRAINMENT 40 #define VARIOUS_SET_LAST_USED_ABILITY 41 -#define VARIOUS_TRY_HEAL_PULSE 42 -#define VARIOUS_TRY_QUASH 43 -#define VARIOUS_INVERT_STAT_STAGES 44 -#define VARIOUS_TRY_ME_FIRST 45 -#define VARIOUS_JUMP_IF_BATTLE_END 46 -#define VARIOUS_TRY_ELECTRIFY 47 -#define VARIOUS_TRY_REFLECT_TYPE 48 -#define VARIOUS_TRY_SOAK 49 -#define VARIOUS_HANDLE_MEGA_EVO 50 -#define VARIOUS_TRY_LAST_RESORT 51 -#define VARIOUS_ARGUMENT_STATUS_EFFECT 52 -#define VARIOUS_TRY_HIT_SWITCH_TARGET 53 -#define VARIOUS_TRY_AUTOTOMIZE 54 -#define VARIOUS_TRY_COPYCAT 55 -#define VARIOUS_ABILITY_POPUP 56 -#define VARIOUS_DEFOG 57 -#define VARIOUS_JUMP_IF_TARGET_ALLY 58 -#define VARIOUS_TRY_SYNCHRONOISE 59 -#define VARIOUS_PSYCHO_SHIFT 60 -#define VARIOUS_CURE_STATUS 61 -#define VARIOUS_POWER_TRICK 62 -#define VARIOUS_AFTER_YOU 63 -#define VARIOUS_BESTOW 64 -#define VARIOUS_ARGUMENT_TO_MOVE_EFFECT 65 -#define VARIOUS_JUMP_IF_NOT_GROUNDED 66 -#define VARIOUS_HANDLE_TRAINER_SLIDE_MSG 67 -#define VARIOUS_TRY_TRAINER_SLIDE_MSG_FIRST_OFF 68 -#define VARIOUS_TRY_TRAINER_SLIDE_MSG_LAST_ON 69 -#define VARIOUS_SET_AURORA_VEIL 70 -#define VARIOUS_TRY_THIRD_TYPE 71 -#define VARIOUS_ACUPRESSURE 72 -#define VARIOUS_SET_POWDER 73 -#define VARIOUS_SPECTRAL_THIEF 74 -#define VARIOUS_GRAVITY_ON_AIRBORNE_MONS 75 -#define VARIOUS_CHECK_IF_GRASSY_TERRAIN_HEALS 76 -#define VARIOUS_JUMP_IF_ROAR_FAILS 77 -#define VARIOUS_TRY_INSTRUCT 78 -#define VARIOUS_JUMP_IF_NOT_BERRY 79 -#define VARIOUS_TRACE_ABILITY 80 -#define VARIOUS_UPDATE_NICK 81 -#define VARIOUS_TRY_ILLUSION_OFF 82 -#define VARIOUS_SET_SPRITEIGNORE0HP 83 -#define VARIOUS_HANDLE_FORM_CHANGE 84 -#define VARIOUS_GET_STAT_VALUE 85 -#define VARIOUS_JUMP_IF_FULL_HP 86 -#define VARIOUS_LOSE_TYPE 87 -#define VARIOUS_TRY_ACTIVATE_SOULHEART 88 -#define VARIOUS_TRY_ACTIVATE_RECEIVER 89 -#define VARIOUS_TRY_ACTIVATE_BEAST_BOOST 90 -#define VARIOUS_TRY_FRISK 91 -#define VARIOUS_JUMP_IF_SHIELDS_DOWN_PROTECTED 92 -#define VARIOUS_TRY_FAIRY_LOCK 93 -#define VARIOUS_JUMP_IF_NO_ALLY 94 -#define VARIOUS_POISON_TYPE_IMMUNITY 95 -#define VARIOUS_JUMP_IF_NO_HOLD_EFFECT 96 -#define VARIOUS_INFATUATE_WITH_BATTLER 97 -#define VARIOUS_SET_LAST_USED_ITEM 98 -#define VARIOUS_PARALYZE_TYPE_IMMUNITY 99 -#define VARIOUS_JUMP_IF_ABSENT 100 -#define VARIOUS_DESTROY_ABILITY_POPUP 101 -#define VARIOUS_TOTEM_BOOST 102 -#define VARIOUS_TRY_ACTIVATE_GRIM_NEIGH 103 -#define VARIOUS_MOVEEND_ITEM_EFFECTS 104 -#define VARIOUS_TERRAIN_SEED 105 -#define VARIOUS_MAKE_INVISIBLE 106 -#define VARIOUS_ROOM_SERVICE 107 - -#define VARIOUS_EERIE_SPELL_PP_REDUCE 108 -#define VARIOUS_JUMP_IF_TEAM_HEALTHY 109 -#define VARIOUS_TRY_HEAL_QUARTER_HP 110 -#define VARIOUS_REMOVE_TERRAIN 111 -#define VARIOUS_JUMP_IF_PRANKSTER_BLOCKED 112 -#define VARIOUS_TRY_TO_CLEAR_PRIMAL_WEATHER 113 -#define VARIOUS_GET_ROTOTILLER_TARGETS 114 -#define VARIOUS_JUMP_IF_NOT_ROTOTILLER_AFFECTED 115 -#define VARIOUS_TRY_ACTIVATE_BATTLE_BOND 116 -#define VARIOUS_CONSUME_BERRY 117 -#define VARIOUS_JUMP_IF_CANT_REVERT_TO_PRIMAL 118 -#define VARIOUS_APPLY_PLASMA_FISTS 119 -#define VARIOUS_JUMP_IF_SPECIES 120 -#define VARIOUS_UPDATE_ABILITY_POPUP 121 -#define VARIOUS_JUMP_IF_WEATHER_AFFECTED 122 -#define VARIOUS_JUMP_IF_LEAF_GUARD_PROTECTED 123 -#define VARIOUS_SET_ATTACKER_STICKY_WEB_USER 124 -#define VARIOUS_PHOTON_GEYSER_CHECK 125 -#define VARIOUS_SHELL_SIDE_ARM_CHECK 126 -#define VARIOUS_TRY_NO_RETREAT 127 -#define VARIOUS_TRY_TAR_SHOT 128 -#define VARIOUS_CAN_TAR_SHOT_WORK 129 -#define VARIOUS_CHECK_POLTERGEIST 130 -#define VARIOUS_SET_OCTOLOCK 131 -#define VARIOUS_CUT_1_3_HP_RAISE_STATS 132 -#define VARIOUS_TRY_END_NEUTRALIZING_GAS 133 -#define VARIOUS_JUMP_IF_UNDER_200 134 -#define VARIOUS_SET_SKY_DROP 135 -#define VARIOUS_CLEAR_SKY_DROP 136 -#define VARIOUS_SKY_DROP_YAWN 137 -#define VARIOUS_JUMP_IF_HOLD_EFFECT 138 -#define VARIOUS_CURE_CERTAIN_STATUSES 139 -#define VARIOUS_TRY_RESET_NEGATIVE_STAT_STAGES 140 -#define VARIOUS_JUMP_IF_LAST_USED_ITEM_BERRY 141 -#define VARIOUS_JUMP_IF_LAST_USED_ITEM_HOLD_EFFECT 142 -#define VARIOUS_SAVE_BATTLER_ITEM 143 -#define VARIOUS_RESTORE_BATTLER_ITEM 144 -#define VARIOUS_BATTLER_ITEM_TO_LAST_USED_ITEM 145 -#define VARIOUS_SET_BEAK_BLAST 146 -#define VARIOUS_SWAP_SIDE_STATUSES 147 -#define VARIOUS_SWAP_STATS 148 -#define VARIOUS_TEATIME_INVUL 149 -#define VARIOUS_TEATIME_TARGETS 150 -#define VARIOUS_TRY_WIND_RIDER_POWER 151 -#define VARIOUS_ACTIVATE_WEATHER_CHANGE_ABILITIES 152 -#define VARIOUS_ACTIVATE_TERRAIN_CHANGE_ABILITIES 153 -#define VARIOUS_STORE_HEALING_WISH 154 -#define VARIOUS_HIT_SWITCH_TARGET_FAILED 155 -#define VARIOUS_TRY_REVIVAL_BLESSING 156 -#define VARIOUS_TRY_TRAINER_SLIDE_MSG_Z_MOVE 157 -#define VARIOUS_TRY_TRAINER_SLIDE_MSG_MEGA_EVOLUTION 158 +#define VARIOUS_TRY_QUASH 42 +#define VARIOUS_INVERT_STAT_STAGES 43 +#define VARIOUS_TRY_ME_FIRST 44 +#define VARIOUS_JUMP_IF_BATTLE_END 45 +#define VARIOUS_TRY_ELECTRIFY 46 +#define VARIOUS_TRY_REFLECT_TYPE 47 +#define VARIOUS_TRY_SOAK 48 +#define VARIOUS_HANDLE_MEGA_EVO 49 +#define VARIOUS_TRY_LAST_RESORT 50 +#define VARIOUS_ARGUMENT_STATUS_EFFECT 51 +#define VARIOUS_TRY_HIT_SWITCH_TARGET 52 +#define VARIOUS_TRY_AUTOTOMIZE 53 +#define VARIOUS_TRY_COPYCAT 54 +#define VARIOUS_ABILITY_POPUP 55 +#define VARIOUS_DEFOG 56 +#define VARIOUS_JUMP_IF_TARGET_ALLY 57 +#define VARIOUS_TRY_SYNCHRONOISE 58 +#define VARIOUS_PSYCHO_SHIFT 59 +#define VARIOUS_CURE_STATUS 60 +#define VARIOUS_POWER_TRICK 61 +#define VARIOUS_AFTER_YOU 62 +#define VARIOUS_BESTOW 63 +#define VARIOUS_ARGUMENT_TO_MOVE_EFFECT 64 +#define VARIOUS_JUMP_IF_NOT_GROUNDED 65 +#define VARIOUS_HANDLE_TRAINER_SLIDE_MSG 66 +#define VARIOUS_TRY_TRAINER_SLIDE_MSG_FIRST_OFF 67 +#define VARIOUS_TRY_TRAINER_SLIDE_MSG_LAST_ON 68 +#define VARIOUS_SET_AURORA_VEIL 69 +#define VARIOUS_TRY_THIRD_TYPE 70 +#define VARIOUS_ACUPRESSURE 71 +#define VARIOUS_SET_POWDER 72 +#define VARIOUS_SPECTRAL_THIEF 73 +#define VARIOUS_GRAVITY_ON_AIRBORNE_MONS 74 +#define VARIOUS_CHECK_IF_GRASSY_TERRAIN_HEALS 75 +#define VARIOUS_JUMP_IF_ROAR_FAILS 76 +#define VARIOUS_TRY_INSTRUCT 77 +#define VARIOUS_JUMP_IF_NOT_BERRY 78 +#define VARIOUS_TRACE_ABILITY 79 +#define VARIOUS_UPDATE_NICK 80 +#define VARIOUS_TRY_ILLUSION_OFF 81 +#define VARIOUS_SET_SPRITEIGNORE0HP 82 +#define VARIOUS_HANDLE_FORM_CHANGE 83 +#define VARIOUS_GET_STAT_VALUE 84 +#define VARIOUS_JUMP_IF_FULL_HP 85 +#define VARIOUS_LOSE_TYPE 86 +#define VARIOUS_TRY_ACTIVATE_SOULHEART 87 +#define VARIOUS_TRY_ACTIVATE_RECEIVER 88 +#define VARIOUS_TRY_ACTIVATE_BEAST_BOOST 89 +#define VARIOUS_TRY_FRISK 90 +#define VARIOUS_JUMP_IF_SHIELDS_DOWN_PROTECTED 91 +#define VARIOUS_TRY_FAIRY_LOCK 92 +#define VARIOUS_JUMP_IF_NO_ALLY 93 +#define VARIOUS_POISON_TYPE_IMMUNITY 94 +#define VARIOUS_JUMP_IF_NO_HOLD_EFFECT 95 +#define VARIOUS_INFATUATE_WITH_BATTLER 96 +#define VARIOUS_SET_LAST_USED_ITEM 97 +#define VARIOUS_PARALYZE_TYPE_IMMUNITY 98 +#define VARIOUS_JUMP_IF_ABSENT 99 +#define VARIOUS_DESTROY_ABILITY_POPUP 100 +#define VARIOUS_TOTEM_BOOST 101 +#define VARIOUS_TRY_ACTIVATE_GRIM_NEIGH 102 +#define VARIOUS_MOVEEND_ITEM_EFFECTS 103 +#define VARIOUS_TERRAIN_SEED 104 +#define VARIOUS_MAKE_INVISIBLE 105 +#define VARIOUS_ROOM_SERVICE 106 +#define VARIOUS_EERIE_SPELL_PP_REDUCE 107 +#define VARIOUS_JUMP_IF_TEAM_HEALTHY 108 +#define VARIOUS_TRY_HEAL_QUARTER_HP 109 +#define VARIOUS_REMOVE_TERRAIN 110 +#define VARIOUS_JUMP_IF_PRANKSTER_BLOCKED 111 +#define VARIOUS_TRY_TO_CLEAR_PRIMAL_WEATHER 112 +#define VARIOUS_GET_ROTOTILLER_TARGETS 113 +#define VARIOUS_JUMP_IF_NOT_ROTOTILLER_AFFECTED 114 +#define VARIOUS_TRY_ACTIVATE_BATTLE_BOND 115 +#define VARIOUS_CONSUME_BERRY 116 +#define VARIOUS_JUMP_IF_CANT_REVERT_TO_PRIMAL 117 +#define VARIOUS_APPLY_PLASMA_FISTS 118 +#define VARIOUS_JUMP_IF_SPECIES 119 +#define VARIOUS_UPDATE_ABILITY_POPUP 120 +#define VARIOUS_JUMP_IF_WEATHER_AFFECTED 121 +#define VARIOUS_JUMP_IF_LEAF_GUARD_PROTECTED 122 +#define VARIOUS_SET_ATTACKER_STICKY_WEB_USER 123 +#define VARIOUS_PHOTON_GEYSER_CHECK 124 +#define VARIOUS_SHELL_SIDE_ARM_CHECK 125 +#define VARIOUS_TRY_NO_RETREAT 126 +#define VARIOUS_TRY_TAR_SHOT 127 +#define VARIOUS_CAN_TAR_SHOT_WORK 128 +#define VARIOUS_CHECK_POLTERGEIST 129 +#define VARIOUS_SET_OCTOLOCK 130 +#define VARIOUS_CUT_1_3_HP_RAISE_STATS 131 +#define VARIOUS_TRY_END_NEUTRALIZING_GAS 132 +#define VARIOUS_JUMP_IF_UNDER_200 133 +#define VARIOUS_SET_SKY_DROP 134 +#define VARIOUS_CLEAR_SKY_DROP 135 +#define VARIOUS_SKY_DROP_YAWN 136 +#define VARIOUS_JUMP_IF_HOLD_EFFECT 137 +#define VARIOUS_CURE_CERTAIN_STATUSES 138 +#define VARIOUS_TRY_RESET_NEGATIVE_STAT_STAGES 139 +#define VARIOUS_JUMP_IF_LAST_USED_ITEM_BERRY 140 +#define VARIOUS_JUMP_IF_LAST_USED_ITEM_HOLD_EFFECT 141 +#define VARIOUS_SAVE_BATTLER_ITEM 142 +#define VARIOUS_RESTORE_BATTLER_ITEM 143 +#define VARIOUS_BATTLER_ITEM_TO_LAST_USED_ITEM 144 +#define VARIOUS_SET_BEAK_BLAST 145 +#define VARIOUS_SWAP_SIDE_STATUSES 146 +#define VARIOUS_SWAP_STATS 147 +#define VARIOUS_TEATIME_INVUL 148 +#define VARIOUS_TEATIME_TARGETS 149 +#define VARIOUS_TRY_WIND_RIDER_POWER 150 +#define VARIOUS_ACTIVATE_WEATHER_CHANGE_ABILITIES 151 +#define VARIOUS_ACTIVATE_TERRAIN_CHANGE_ABILITIES 152 +#define VARIOUS_STORE_HEALING_WISH 153 +#define VARIOUS_HIT_SWITCH_TARGET_FAILED 154 +#define VARIOUS_TRY_REVIVAL_BLESSING 155 +#define VARIOUS_TRY_TRAINER_SLIDE_MSG_Z_MOVE 156 +#define VARIOUS_TRY_TRAINER_SLIDE_MSG_MEGA_EVOLUTION 157 // Cmd_manipulatedamage #define DMG_CHANGE_SIGN 0 diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 32f61423af..2395a65e1f 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -9324,26 +9324,6 @@ static void Cmd_various(void) gLastUsedAbility = gBattleMons[battler].ability; break; } - case VARIOUS_TRY_HEAL_PULSE: - { - VARIOUS_ARGS(const u8 *failInstr); - if (BATTLER_MAX_HP(battler)) - { - gBattlescriptCurrInstr = cmd->failInstr; - } - else - { - if (GetBattlerAbility(gBattlerAttacker) == ABILITY_MEGA_LAUNCHER && gBattleMoves[gCurrentMove].pulseMove) - gBattleMoveDamage = -(gBattleMons[battler].maxHP * 75 / 100); - else - gBattleMoveDamage = -(gBattleMons[battler].maxHP / 2); - - if (gBattleMoveDamage == 0) - gBattleMoveDamage = -1; - gBattlescriptCurrInstr = cmd->nextInstr; - } - return; - } case VARIOUS_TRY_QUASH: { VARIOUS_ARGS(const u8 *failInstr); @@ -16349,3 +16329,26 @@ void BS_TryReflectType(void) gBattlescriptCurrInstr = cmd->nextInstr; } } + +void BS_TryHealPulse(void) +{ + NATIVE_ARGS(const u8 *failInstr); + + if (BATTLER_MAX_HP(gBattlerTarget)) + { + gBattlescriptCurrInstr = cmd->failInstr; + } + else + { + if (GetBattlerAbility(gBattlerAttacker) == ABILITY_MEGA_LAUNCHER && gBattleMoves[gCurrentMove].pulseMove) + gBattleMoveDamage = -(gBattleMons[gBattlerTarget].maxHP * 75 / 100); + else if (gFieldStatuses & STATUS_FIELD_GRASSY_TERRAIN && gBattleMoves[gCurrentMove].argument == MOVE_EFFECT_FLORAL_HEALING) + gBattleMoveDamage = -(gBattleMons[gBattlerTarget].maxHP * 2 / 3); + else + gBattleMoveDamage = -(gBattleMons[gBattlerTarget].maxHP / 2); + + if (gBattleMoveDamage == 0) + gBattleMoveDamage = -1; + gBattlescriptCurrInstr = cmd->nextInstr; + } +} diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 80ac9f9458..fed757cdc5 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -10532,6 +10532,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .priority = 0, .split = SPLIT_STATUS, .zMoveEffect = Z_EFFECT_RESET_STATS, + .argument = MOVE_EFFECT_FLORAL_HEALING, .magicCoatAffected = TRUE, }, diff --git a/test/battle/move_effect/heal_pulse.c b/test/battle/move_effect/heal_pulse.c new file mode 100644 index 0000000000..ecd1cfe294 --- /dev/null +++ b/test/battle/move_effect/heal_pulse.c @@ -0,0 +1,102 @@ +#include "global.h" +#include "test/battle.h" + +ASSUMPTIONS +{ + ASSUME(gBattleMoves[MOVE_HEAL_PULSE].effect == EFFECT_HEAL_PULSE); +} + +SINGLE_BATTLE_TEST("Heal Pulse heals the target by 1/2 of it's maxHP") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { MaxHP(100); HP(1); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(opponent, MOVE_HEAL_PULSE); } + } SCENE { + s32 maxHP = GetMonData(&PLAYER_PARTY[0], MON_DATA_MAX_HP); + ANIMATION(ANIM_TYPE_MOVE, MOVE_HEAL_PULSE, opponent); + HP_BAR(player, damage: -maxHP / 2); + } +} + +DOUBLE_BATTLE_TEST("Heal Pulse can heal partner") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) { MaxHP(100); HP(1); } + PLAYER(SPECIES_WYNAUT); + OPPONENT(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WYNAUT); + } WHEN { + TURN { MOVE(playerRight, MOVE_HEAL_PULSE, target: playerLeft); } + } SCENE { + s32 maxHP = GetMonData(&PLAYER_PARTY[0], MON_DATA_MAX_HP); + ANIMATION(ANIM_TYPE_MOVE, MOVE_HEAL_PULSE, playerRight); + HP_BAR(playerLeft, damage: -maxHP / 2); + } +} + +SINGLE_BATTLE_TEST("Heal Pulse is boosted by Mega Launcher") +{ + GIVEN { + ASSUME(P_GEN_6_POKEMON == TRUE); + PLAYER(SPECIES_WOBBUFFET) { MaxHP(100); HP(1); } + OPPONENT(SPECIES_CLAWITZER); + } WHEN { + TURN { MOVE(opponent, MOVE_HEAL_PULSE); } + } SCENE { + s32 maxHP = GetMonData(&PLAYER_PARTY[0], MON_DATA_MAX_HP); + ANIMATION(ANIM_TYPE_MOVE, MOVE_HEAL_PULSE, opponent); + HP_BAR(player, damage: -maxHP * 75 / 100); + } +} + +SINGLE_BATTLE_TEST("Heal Pulse ignores accurace checks") +{ + GIVEN { + PASSES_RANDOMLY(100, 100, RNG_ACCURACY); + PLAYER(SPECIES_WOBBUFFET) { MaxHP(100); HP(1); Item(ITEM_BRIGHT_POWDER); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(opponent, MOVE_HEAL_PULSE); } + } SCENE { + s32 maxHP = GetMonData(&PLAYER_PARTY[0], MON_DATA_MAX_HP); + ANIMATION(ANIM_TYPE_MOVE, MOVE_HEAL_PULSE, opponent); + HP_BAR(player, damage: -maxHP / 2); + } +} + +SINGLE_BATTLE_TEST("Heal Pulse is blocked by Substitute") +{ + GIVEN { + ASSUME(gBattleMoves[MOVE_SUBSTITUTE].effect == EFFECT_SUBSTITUTE); + PLAYER(SPECIES_WOBBUFFET) { MaxHP(100); HP(50); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_SUBSTITUTE); MOVE(opponent, MOVE_HEAL_PULSE); } + } SCENE { + s32 maxHP = GetMonData(&PLAYER_PARTY[0], MON_DATA_MAX_HP); + ANIMATION(ANIM_TYPE_MOVE, MOVE_SUBSTITUTE, player); + NONE_OF { + ANIMATION(ANIM_TYPE_MOVE, MOVE_HEAL_PULSE, opponent); + HP_BAR(player, damage: -maxHP / 2); + } + } +} + +SINGLE_BATTLE_TEST("Floral Healing heals the target by 2/3rd of it's maxHP if Grassy Terrain is on the field") +{ + GIVEN { + ASSUME(gBattleMoves[MOVE_FLORAL_HEALING].argument == MOVE_EFFECT_FLORAL_HEALING); + ASSUME(gBattleMoves[MOVE_GRASSY_TERRAIN].effect == EFFECT_GRASSY_TERRAIN); + PLAYER(SPECIES_WOBBUFFET) { MaxHP(100); HP(1); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_GRASSY_TERRAIN); MOVE(opponent, MOVE_FLORAL_HEALING); } + } SCENE { + s32 maxHP = GetMonData(&PLAYER_PARTY[0], MON_DATA_MAX_HP); + ANIMATION(ANIM_TYPE_MOVE, MOVE_GRASSY_TERRAIN, player); + ANIMATION(ANIM_TYPE_MOVE, MOVE_FLORAL_HEALING, opponent); + HP_BAR(player, damage: -maxHP * 2 / 3); + } +} From 2b1d36db46ec59ab3934580be295db91870c5603 Mon Sep 17 00:00:00 2001 From: psf <77138753+pkmnsnfrn@users.noreply.github.com> Date: Wed, 29 Nov 2023 14:08:36 -0800 Subject: [PATCH 06/14] Fix issue where Sky Battles cause upcoming not to compile when debug menu is turned off (#3617) * Moved Sky Battle error message outside of debug.inc https://github.com/rh-hideout/pokeemerald-expansion/issues/3615\#issue-2015546179 * Update data/scripts/debug.inc Made changes from Jasper's review https://github.com/rh-hideout/pokeemerald-expansion/pull/3617/files/625f0077416c5fa919b4999fc4be9c715d031875 Co-authored-by: Bassoonian --------- Co-authored-by: Bassoonian --- data/scripts/debug.inc | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/data/scripts/debug.inc b/data/scripts/debug.inc index 573b60d457..4d14a2a2a6 100644 --- a/data/scripts/debug.inc +++ b/data/scripts/debug.inc @@ -95,19 +95,6 @@ Debug_BoxFilledMessage:: Debug_BoxFilledMessage_Text: .string "Storage boxes filled!$" -Debug_FlagsAndVarNotSetBattleConfigMessage:: - lockall - message Debug_FlagsAndVarNotSetBattleConfigMessage_Text - waitmessage - waitbuttonpress - releaseall - end - -Debug_FlagsAndVarNotSetBattleConfigMessage_Text: - .string "Feature unavailable! Please define a\n" - .string "usable flag and a usable var in:\l" - .string "'include/config/battle.h'!$" - Debug_EventScript_Script_1:: end @@ -229,3 +216,17 @@ Debug_ExpansionVersion: .string "pokeemerald-expansion {STR_VAR_1}$" .endif + +Debug_FlagsAndVarNotSetBattleConfigMessage:: + lockall + message Debug_FlagsAndVarNotSetBattleConfigMessage_Text + waitmessage + waitbuttonpress + releaseall + end + +Debug_FlagsAndVarNotSetBattleConfigMessage_Text: + .string "Feature unavailable! Please define a\n" + .string "usable flag and a usable var in:\l" + .string "'include/config/battle.h'!$" + From 131bb94d7385e71838171ef3513782c61882bfe6 Mon Sep 17 00:00:00 2001 From: Pawkkie <61265402+Pawkkie@users.noreply.github.com> Date: Thu, 30 Nov 2023 06:37:19 -0500 Subject: [PATCH 07/14] Extend AI_FLAG_SMART_SWITCHING for Encore / hazards / lowered attacking stats (#3557) * Consider Encore / lowered stats / hazards * Fix poorly thought out Return FALSE * Incorporate Egg's feedback * Tests for hazards and stats, and some fixes --------- Co-authored-by: Bassoonian --- src/battle_ai_switch_items.c | 156 ++++++++++++++++++++++++++++++++++- test/battle/ai.c | 39 +++++++++ 2 files changed, 194 insertions(+), 1 deletion(-) diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index 4a35e824c0..f4ea291767 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -28,6 +28,7 @@ static bool8 ShouldUseItem(u32 battler); static bool32 AiExpectsToFaintPlayer(u32 battler); static bool32 AI_ShouldHeal(u32 battler, u32 healAmount); static bool32 AI_OpponentCanFaintAiWithMod(u32 battler, u32 healAmount); +static u32 GetSwitchinHazardsDamage(u32 battler, struct BattlePokemon *battleMon); static void InitializeSwitchinCandidate(struct Pokemon *mon) { @@ -774,6 +775,153 @@ static bool8 FindMonWithFlagsAndSuperEffective(u32 battler, u16 flags, u8 modulo return FALSE; } +static bool32 CanMonSurviveHazardSwitchin(u32 battler) +{ + u32 battlerIn1, battlerIn2; + u32 hazardDamage = 0, battlerHp = gBattleMons[battler].hp; + u32 ability = GetBattlerAbility(battler), aiMove; + s32 firstId, lastId, i, j; + struct Pokemon *party; + + if (ability == ABILITY_REGENERATOR) + battlerHp = (battlerHp * 133) / 100; // Account for Regenerator healing + + hazardDamage = GetSwitchinHazardsDamage(battler, &gBattleMons[battler]); + + // Battler will faint to hazards, check to see if another mon can clear them + if (hazardDamage > battlerHp) + { + if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) + { + battlerIn1 = battler; + if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(battler)))]) + battlerIn2 = battler; + else + battlerIn2 = GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(battler))); + } + else + { + battlerIn1 = battler; + battlerIn2 = battler; + } + + GetAIPartyIndexes(battler, &firstId, &lastId); + party = GetBattlerParty(battler); + + for (i = firstId; i < lastId; i++) + { + if (!IsValidForBattle(&party[i])) + continue; + if (i == gBattlerPartyIndexes[battlerIn1]) + continue; + if (i == gBattlerPartyIndexes[battlerIn2]) + continue; + if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn1)) + continue; + if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn2)) + continue; + if (IsAceMon(battler, i)) + continue; + + for (j = 0; j < MAX_MON_MOVES; j++) + { + aiMove = GetMonData(&party[i], MON_DATA_MOVE1 + j, NULL); + if (aiMove == MOVE_RAPID_SPIN || aiMove == MOVE_DEFOG || aiMove == MOVE_MORTAL_SPIN || aiMove == MOVE_TIDY_UP) + { + // Have a mon that can clear the hazards, so switching out is okay + return TRUE; + } + } + } + // Faints to hazards and party can't clear them, don't switch out + return FALSE; + } + return TRUE; +} + +static bool32 ShouldSwitchIfEncored(u32 battler) +{ + // Only use this if AI_FLAG_SMART_SWITCHING is set for the trainer + if (!(AI_THINKING_STRUCT->aiFlags & AI_FLAG_SMART_SWITCHING)) + return FALSE; + + // If not Encored or if no good switchin, don't switch + if (gDisableStructs[battler].encoredMove == MOVE_NONE || AI_DATA->mostSuitableMonId == PARTY_SIZE) + return FALSE; + + // Otherwise 50% chance to switch out + if (Random() & 1) + { + *(gBattleStruct->AI_monToSwitchIntoId + battler) = PARTY_SIZE; + BtlController_EmitTwoReturnValues(battler, 1, B_ACTION_SWITCH, 0); + return TRUE; + } + + return FALSE; +} + +// AI should switch if it's become setup fodder and has something better to switch to +static bool8 AreAttackingStatsLowered(u32 battler) +{ + s8 attackingStage = gBattleMons[battler].statStages[STAT_ATK]; + s8 spAttackingStage = gBattleMons[battler].statStages[STAT_SPATK]; + + // Only use this if AI_FLAG_SMART_SWITCHING is set for the trainer + if (!(AI_THINKING_STRUCT->aiFlags & AI_FLAG_SMART_SWITCHING)) + return FALSE; + + // Physical attacker + if (gBattleMons[battler].attack > gBattleMons[battler].spAttack) + { + // Don't switch if attack isn't below -1 + if (attackingStage > DEFAULT_STAT_STAGE - 2) + return FALSE; + // 50% chance if attack at -2 and have a good candidate mon + else if (attackingStage == DEFAULT_STAT_STAGE - 2) + { + if (AI_DATA->mostSuitableMonId != PARTY_SIZE && (Random() & 1)) + { + *(gBattleStruct->AI_monToSwitchIntoId + battler) = PARTY_SIZE; + BtlController_EmitTwoReturnValues(battler, 1, B_ACTION_SWITCH, 0); + return TRUE; + } + } + // If at -3 or worse, switch out regardless + else if (attackingStage < DEFAULT_STAT_STAGE - 2) + { + *(gBattleStruct->AI_monToSwitchIntoId + battler) = PARTY_SIZE; + BtlController_EmitTwoReturnValues(battler, 1, B_ACTION_SWITCH, 0); + return TRUE; + } + } + + // Special attacker + else + { + // Don't switch if attack isn't below -1 + if (spAttackingStage > DEFAULT_STAT_STAGE - 2) + return FALSE; + // 50% chance if attack at -2 and have a good candidate mon + else if (spAttackingStage == DEFAULT_STAT_STAGE - 2) + { + if (AI_DATA->mostSuitableMonId != PARTY_SIZE && (Random() & 1)) + { + *(gBattleStruct->AI_monToSwitchIntoId + battler) = PARTY_SIZE; + BtlController_EmitTwoReturnValues(battler, 1, B_ACTION_SWITCH, 0); + return TRUE; + } + } + // If at -3 or worse, switch out regardless + else if (spAttackingStage < DEFAULT_STAT_STAGE - 2) + { + *(gBattleStruct->AI_monToSwitchIntoId + battler) = PARTY_SIZE; + BtlController_EmitTwoReturnValues(battler, 1, B_ACTION_SWITCH, 0); + return TRUE; + } + } + return FALSE; +} + bool32 ShouldSwitch(u32 battler) { u8 battlerIn1, battlerIn2; @@ -857,12 +1005,18 @@ bool32 ShouldSwitch(u32 battler) return TRUE; //These Functions can prompt switch to generic pary members + if ((AI_THINKING_STRUCT->aiFlags & AI_FLAG_SMART_SWITCHING) && (CanMonSurviveHazardSwitchin(battler) == FALSE)) + return FALSE; if (ShouldSwitchIfAllBadMoves(battler)) return TRUE; if (ShouldSwitchIfAbilityBenefit(battler)) return TRUE; if (HasBadOdds(battler)) return TRUE; + if (ShouldSwitchIfEncored(battler)) + return TRUE; + if (AreAttackingStatsLowered(battler)) + return TRUE; //Removing switch capabilites under specific conditions //These Functions prevent the "FindMonWithFlagsAndSuperEffective" from getting out of hand. @@ -1108,7 +1262,7 @@ static u32 GetSwitchinHazardsDamage(u32 battler, struct BattlePokemon *battleMon { // Stealth Rock if ((hazardFlags & SIDE_STATUS_STEALTH_ROCK) && heldItemEffect != HOLD_EFFECT_HEAVY_DUTY_BOOTS) - hazardDamage += GetStealthHazardDamageByTypesAndHP(gBattleMoves[MOVE_STEALTH_ROCK].type, defType1, defType2, battleMon->hp); + hazardDamage += GetStealthHazardDamageByTypesAndHP(gBattleMoves[MOVE_STEALTH_ROCK].type, defType1, defType2, battleMon->maxHP); // Spikes if ((hazardFlags & SIDE_STATUS_SPIKES) && IsMonGrounded(heldItemEffect, ability, defType1, defType2)) { diff --git a/test/battle/ai.c b/test/battle/ai.c index 42fa32760f..d8f382961a 100644 --- a/test/battle/ai.c +++ b/test/battle/ai.c @@ -608,3 +608,42 @@ AI_SINGLE_BATTLE_TEST("AI_FLAG_SMART_MON_CHOICES: Post-KO switches prioritize of TURN { MOVE(player, MOVE_WING_ATTACK) ; EXPECT_SEND_OUT(opponent, 2); } } } + +AI_SINGLE_BATTLE_TEST("AI_FLAG_SMART_SWITCHING: AI switches out after sufficient stat drops") +{ + GIVEN { + AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SMART_SWITCHING); + PLAYER(SPECIES_HITMONTOP) { Level(30); Moves(MOVE_CHARM, MOVE_TACKLE); Ability(ABILITY_INTIMIDATE); Speed(5); } + OPPONENT(SPECIES_GRIMER) { Level(30); Moves(MOVE_TACKLE); Speed(4); } + OPPONENT(SPECIES_PONYTA) { Level(30); Moves(MOVE_HEADBUTT); Speed(4); } + } WHEN { + TURN { MOVE(player, MOVE_CHARM) ;} + TURN { MOVE(player, MOVE_TACKLE) ; EXPECT_SWITCH(opponent, 1); } + } +} + +AI_SINGLE_BATTLE_TEST("AI_FLAG_SMART_SWITCHING: AI will not switch out if Pokemon would faint to hazards unless party member can clear them") +{ + u32 move1; + + PARAMETRIZE{move1 = MOVE_TACKLE; } + PARAMETRIZE{move1 = MOVE_RAPID_SPIN; } + + GIVEN { + AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SMART_SWITCHING); + PLAYER(SPECIES_HITMONTOP) { Level(30); Moves(MOVE_CHARM, MOVE_TACKLE, MOVE_STEALTH_ROCK, MOVE_EARTHQUAKE); Ability(ABILITY_INTIMIDATE); Speed(5); } + OPPONENT(SPECIES_GRIMER) { Level(30); Moves(MOVE_TACKLE); Item(ITEM_FOCUS_SASH); Speed(4); } + OPPONENT(SPECIES_PONYTA) { Level(30); Moves(MOVE_HEADBUTT, move1); Speed(4); } + } WHEN { + TURN { MOVE(player, MOVE_STEALTH_ROCK) ;} + TURN { MOVE(player, MOVE_EARTHQUAKE) ;} + TURN { MOVE(player, MOVE_CHARM) ;} + TURN { // If the AI has a mon that can remove hazards, don't prevent them switching out + MOVE(player, MOVE_CHARM); + if (move1 == MOVE_RAPID_SPIN) + EXPECT_SWITCH(opponent, 1); + else if (move1 == MOVE_TACKLE) + EXPECT_MOVE(opponent, MOVE_TACKLE); + } + } +} From d1a69d7e044af3feb79199690bc04479ac2b31f7 Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Fri, 1 Dec 2023 00:01:21 +0100 Subject: [PATCH 08/14] fix new line (#3621) --- data/specials.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/specials.inc b/data/specials.inc index f05655cbd3..152210c176 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -540,5 +540,5 @@ gSpecials:: def_special GetSprayId def_special GetLastUsedSprayType def_special TrySkyBattle - def_special VsSeekerResetObjectMovementAfterChargeComplete - def_special VsSeekerFreezeObjectsAfterChargeComplete \ No newline at end of file + def_special VsSeekerResetObjectMovementAfterChargeComplete + def_special VsSeekerFreezeObjectsAfterChargeComplete From ff0351ca702cc304b8a97414f8072733aeafc64b Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Fri, 1 Dec 2023 12:41:33 -0300 Subject: [PATCH 09/14] Ask users for credits in README.md (#3619) * Ask users for credits in README.md * Consistently refer to the repo as pokeemerald-expansion --------- Co-authored-by: Bassoonian --- README.md | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 19d4f23f5a..91a8bc12dd 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,14 @@ -# pokeemerald Expansion +# pokeemerald-expansion -## What is the pokeemerald Expansion? +## What is pokeemerald-expansion? -The pokeemerald Expansion is a decomp hack base project based off pret's [pokeemerald](https://github.com/pret/pokeemerald) decompilation project. It's recommended that any new projects that plan on using it, to clone this repository instead of pret's vanilla repository, as we regurlarly incorporate pret's documentation changes. This is ***NOT*** a standalone romhack, and as such, most features will be unavailable and/or unbalanced if played as is. +pokeemerald-expansion is a decomp hack base project based off pret's [pokeemerald](https://github.com/pret/pokeemerald) decompilation project. It's recommended that any new projects that plan on using it, to clone this repository instead of pret's vanilla repository, as we regurlarly incorporate pret's documentation changes. This is ***NOT*** a standalone romhack, and as such, most features will be unavailable and/or unbalanced if played as is. + +If you use pokeemerald-expansion in your hack, please add RHH (Rom Hacking Hideout) to your credits list. Optionally, you can list the version used, so it can help players know what features to expect. +You can phrase it as the following: +``` +Based off RHH's pokeemerald-expansion v1.6.2 https://github.com/rh-hideout/pokeemerald-expansion/ +``` ## What features are included? - ***IMPORTANT*❗❗ Read through these to learn what features you can toggle**: @@ -130,14 +136,14 @@ There are some mechanics, moves and abilities that are missing and being develop ### [Documentation on features can be found here](https://github.com/rh-hideout/pokeemerald-expansion/wiki) -## If I already have a project based on regular pokeemerald, can I use the pokeemerald Expansion +## If I already have a project based on regular pokeemerald, can I use pokeemerald-expansion? Yes! Keep in mind that we keep up with pret's documentation of pokeemerald, which means that if your project a bit old, you might get merge conflicts that you need to solve manually. - If you haven't set up a remote, run the command `git remote add RHH https://github.com/rh-hideout/pokeemerald-expansion`. - Once you have your remote set up, run the command `git pull RHH master`. -With this, you'll get the latest version of the Expansion, plus a couple of bugfixes that haven't been released into the next patch version :) +With this, you'll get the latest version of pokeemerald-expansion, plus a couple of bugfixes that haven't been released into the next patch version :) -## **How do I update my version of the pokeemerald Expansion?** +## **How do I update my version of pokeemerald-expansion?** - If you haven't set up a remote, run the command `git remote add RHH https://github.com/rh-hideout/pokeemerald-expansion`. - Once you have your remote set up, run the command `git pull RHH expansion/1.6.2`. @@ -156,7 +162,7 @@ The project was originally started by DizzyEgg alongside other contributors. The project has now gotten larger and DizzyEgg is now maintaining the project as part of the ROM Hacking Hideout community. Some members of this community are taking on larger roles to help maintain the project. -## What is ROM Hacking Hideout? +## What is the ROM Hacking Hideout? A Discord-based ROM hacking community that has many members who hack using the disassembly and decompilation projects for Pokémon. Quite a few contributors to the original feature branches by DizzyEgg were members of ROM Hacking Hideout. You can call it RHH for short! From 6b1ea33be8cf533f343ad938a43edfd13d03a67b Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Sat, 2 Dec 2023 19:09:09 -0300 Subject: [PATCH 10/14] Fixed Trace (#3623) * Applied Alex's fix for ABILITYEFFECT_TRACE * Added Trace tests written by Alex/Rainonline * Updated Trace's target-choosing capabilities and added a double battle test for it Credits to Alex/Rainonline. * Removed 2 of the 3 'Trace on opponent's switch-in' tests * Added another Trace test --- include/random.h | 1 + src/battle_util.c | 12 +----- test/battle/ability/trace.c | 82 +++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 10 deletions(-) create mode 100644 test/battle/ability/trace.c diff --git a/include/random.h b/include/random.h index af3d7c75e5..4500d77403 100644 --- a/include/random.h +++ b/include/random.h @@ -93,6 +93,7 @@ enum RandomTag RNG_TRIPLE_ARROWS_DEFENSE_DOWN, RNG_TRIPLE_ARROWS_FLINCH, RNG_QUICK_DRAW, + RNG_TRACE, }; #define RandomWeighted(tag, ...) \ diff --git a/src/battle_util.c b/src/battle_util.c index bdce8fbc9d..0a89e7e70e 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -5955,7 +5955,7 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 { if (!sAbilitiesNotTraced[gBattleMons[target1].ability] && gBattleMons[target1].hp != 0 && !sAbilitiesNotTraced[gBattleMons[target2].ability] && gBattleMons[target2].hp != 0) - chosenTarget = GetBattlerAtPosition(((Random() & 1) * 2) | side), effect++; + chosenTarget = GetBattlerAtPosition((RandomPercentage(RNG_TRACE, 50) * 2) | side), effect++; else if (!sAbilitiesNotTraced[gBattleMons[target1].ability] && gBattleMons[target1].hp != 0) chosenTarget = target1, effect++; else if (!sAbilitiesNotTraced[gBattleMons[target2].ability] && gBattleMons[target2].hp != 0) @@ -5969,15 +5969,7 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 if (effect != 0) { - if (caseID == ABILITYEFFECT_TRACE1) - { - BattleScriptPushCursorAndCallback(BattleScript_TraceActivatesEnd3); - } - else - { - BattleScriptPushCursor(); - gBattlescriptCurrInstr = BattleScript_TraceActivates; - } + BattleScriptPushCursorAndCallback(BattleScript_TraceActivatesEnd3); gBattleResources->flags->flags[i] &= ~RESOURCE_FLAG_TRACED; gBattleStruct->tracedAbility[i] = gLastUsedAbility = gBattleMons[chosenTarget].ability; RecordAbilityBattle(chosenTarget, gLastUsedAbility); // Record the opposing battler has this ability diff --git a/test/battle/ability/trace.c b/test/battle/ability/trace.c new file mode 100644 index 0000000000..0e4448424b --- /dev/null +++ b/test/battle/ability/trace.c @@ -0,0 +1,82 @@ +#include "global.h" +#include "test/battle.h" + +SINGLE_BATTLE_TEST("Trace copies opponents ability") +{ + GIVEN { + PLAYER(SPECIES_RALTS) { Ability(ABILITY_TRACE); } + OPPONENT(SPECIES_TORCHIC) { Ability(ABILITY_BLAZE); } + } WHEN { + TURN { } + } SCENE { + ABILITY_POPUP(player, ABILITY_TRACE); + MESSAGE("Ralts TRACED Foe Torchic's Blaze!"); + } +} + +SINGLE_BATTLE_TEST("Trace copies opponents ability on switch-in") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) + PLAYER(SPECIES_RALTS) { Ability(ABILITY_TRACE); } + OPPONENT(SPECIES_TORCHIC) { Ability(ABILITY_BLAZE); } + } WHEN { + TURN { SWITCH(player, 1); } + } SCENE { + ABILITY_POPUP(player, ABILITY_TRACE); + MESSAGE("Ralts TRACED Foe Torchic's Blaze!"); + } +} + +SINGLE_BATTLE_TEST("Trace copies opponents ability on switch-in even if opponent switched in at the same time") +{ + GIVEN { + PLAYER(SPECIES_WOBBUFFET) + PLAYER(SPECIES_RALTS) { Ability(ABILITY_TRACE); } + OPPONENT(SPECIES_TREECKO) { HP(1); } + OPPONENT(SPECIES_TORCHIC) { Ability(ABILITY_BLAZE); } + } WHEN { + TURN { MOVE(player, MOVE_MISTY_EXPLOSION); SEND_OUT(opponent, 1); SEND_OUT(player, 1); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_MISTY_EXPLOSION); + ABILITY_POPUP(player, ABILITY_TRACE); + MESSAGE("Ralts TRACED Foe Torchic's Blaze!"); + } +} + +DOUBLE_BATTLE_TEST("Trace copies opponents ability randomly") +{ + u16 ability1, ability2; + + PARAMETRIZE { ability1 = ABILITY_SPEED_BOOST; ability2 = ABILITY_BLAZE;} + PARAMETRIZE { ability1 = ABILITY_BLAZE; ability2 = ABILITY_SPEED_BOOST; } + + PASSES_RANDOMLY(1, 2, RNG_TRACE); + GIVEN { + PLAYER(SPECIES_RALTS) { Ability(ABILITY_TRACE); } + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_TORCHIC) { Ability(ability1); } + OPPONENT(SPECIES_TORCHIC) { Ability(ability2); } + } WHEN { + TURN { } + } SCENE { + ABILITY_POPUP(playerLeft, ABILITY_TRACE); + MESSAGE("Ralts TRACED Foe Torchic's Blaze!"); + } +} + +SINGLE_BATTLE_TEST("Trace will copy an opponent's ability whenever it has the chance but only once") +{ + GIVEN { + ASSUME(P_GEN_4_POKEMON == TRUE); + PLAYER(SPECIES_RALTS) { Ability(ABILITY_TRACE); } + OPPONENT(SPECIES_CHERRIM) { Ability(ABILITY_FLOWER_GIFT); } + OPPONENT(SPECIES_TORCHIC) { Ability(ABILITY_BLAZE); } + } WHEN { + TURN { SWITCH(opponent, 1); } + } SCENE { + // TURN 2 + ABILITY_POPUP(player, ABILITY_TRACE); + MESSAGE("Ralts TRACED Foe Torchic's Blaze!"); + } +} From e6a6ea497711f547e205a7eeaa5a2bca6f8cb755 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Wed, 6 Dec 2023 16:52:01 +0100 Subject: [PATCH 11/14] Start gen defines at Gen I (#3628) * Start gen defines at Gen I * Refactor Shuckle config * Oops --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --- include/config.h | 16 +++++++++------- include/config/pokemon.h | 2 +- src/battle_script_commands.c | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/include/config.h b/include/config.h index 49559e78e8..8a6e990a5d 100644 --- a/include/config.h +++ b/include/config.h @@ -64,13 +64,15 @@ #define ITEM_EXPANSION // Generation constants used in configs to define behavior -#define GEN_3 0 -#define GEN_4 1 -#define GEN_5 2 -#define GEN_6 3 -#define GEN_7 4 -#define GEN_8 5 -#define GEN_9 6 +#define GEN_1 0 +#define GEN_2 1 +#define GEN_3 2 +#define GEN_4 3 +#define GEN_5 4 +#define GEN_6 5 +#define GEN_7 6 +#define GEN_8 7 +#define GEN_9 8 #define GEN_LATEST GEN_9 // General settings diff --git a/include/config/pokemon.h b/include/config/pokemon.h index 900c66bb40..b7496c8687 100644 --- a/include/config/pokemon.h +++ b/include/config/pokemon.h @@ -25,7 +25,7 @@ // Species-specific settings #define P_SHEDINJA_BALL GEN_LATEST // Since Gen 4, Shedinja requires a Poké Ball for its evolution. In Gen 3, Shedinja inherits Nincada's Ball. #define P_KADABRA_EVERSTONE GEN_LATEST // Since Gen 4, Kadabra can evolve even when holding an Everstone. -#define P_SHUCKLE_BERRY_JUICE TRUE // In Gen 2, Shuckle had a 1/16 chance of converting Berry that it's holding into Berry Juice. Setting this to TRUE will allow to do this with an Oran Berry, which is the spiritual succesor of the Berry item. +#define P_SHUCKLE_BERRY_JUICE GEN_LATEST // In Gen 2, Shuckle had a 1/16 chance of converting Berry that it's holding into Berry Juice. Enabling this will allow Shuckle to do this with an Oran Berry, which is the spiritual succesor of the Berry item. // Other settings #define P_CUSTOM_GENDER_DIFF_ICONS TRUE // If TRUE, will give more Pokémon custom icons for their female forms, i.e. Hippopotas and Hippowdon diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 0da9b1e925..141271db63 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -14479,7 +14479,7 @@ static void Cmd_pickup(void) SetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM, &heldItem); } } - #if P_SHUCKLE_BERRY_JUICE == TRUE + #if P_SHUCKLE_BERRY_JUICE == GEN_2 else if (species == SPECIES_SHUCKLE && heldItem == ITEM_ORAN_BERRY && (Random() % 16) == 0) From f7ca839f23d969303ff9f90ded4f5f750996b2c8 Mon Sep 17 00:00:00 2001 From: Patrick Curran Date: Wed, 6 Dec 2023 11:11:13 -0500 Subject: [PATCH 12/14] EFFECT_CHILLY_RECEPTION (#3379) * Chilly Reception Effect * Wrap Chilling Reception Message Better * Animation & Some Testing * Remove Wimp Out cases from Chilly Reception tests * Animation tweaks * Battle Script Updates * Created CheckPrimalWeather macro for Weather Effects * Updated Chilly Reception logic to switch even if weather doesn't change Testing Updates * Fixed test: Move does not animate if weather fails to change * Remove snow animation check during failure path test * * Fix indentation * Move Chilly Reception animation to always play (even when weather change fails) * Updates to MoveSwitch and PartingShot to get closer to original logic * Update BattleScript_EffectChillyReception logic * * Move CHILLY_RECEPTION animation * Test updates * Fix Chilly Reception MESSAGE checks --------- Co-authored-by: Patrick Curran Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --- data/battle_anim_scripts.s | 72 ++++++++++- data/battle_scripts_1.s | 134 +++++++++++++-------- include/constants/battle_move_effects.h | 15 +-- include/constants/battle_string_ids.h | 3 +- src/battle_message.c | 2 + src/data/battle_moves.h | 2 +- test/battle/move_effect/chilly_reception.c | 90 ++++++++++++++ 7 files changed, 256 insertions(+), 62 deletions(-) create mode 100644 test/battle/move_effect/chilly_reception.c diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 3a1cd720c3..d13cb5f219 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -16835,6 +16835,77 @@ SyrupBombSpeedDropYellow: waitforvisualfinish end +Move_CHILLY_RECEPTION:: + loadspritegfx ANIM_TAG_CONFETTI + loadspritegfx ANIM_TAG_PINK_CLOUD + loadspritegfx ANIM_TAG_ICE_CRYSTALS + createvisualtask AnimTask_RotateMonSpriteToSide, 2, 16, 96, ANIM_ATTACKER, 1 + createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 0, 1, 0, 13, RGB_BLACK + delay 60 + waitforvisualfinish + createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 0, 1, 13, 0, RGB_BLACK + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7 + waitforvisualfinish + createvisualtask SoundTask_PlayDoubleCry, 2, ANIM_ATTACKER, DOUBLE_CRY_ROAR + setalpha 12, 4 + monbg ANIM_ATTACKER + playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET + createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 122, 3, -14, 18, 24 + createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 121, 3, 14, 6, 24 + createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 120, 3, -12, 12, 24 + createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 119, 3, 14, 18, 24 + createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 118, 3, 0, 0, 24 + call CreateFlatterConfetti + call CreateFlatterConfetti + call CreateFlatterConfetti + call CreateFlatterConfetti + call CreateFlatterConfetti + call CreateFlatterConfetti + call CreateFlatterConfetti + call CreateFlatterConfetti + call CreateFlatterConfetti + call CreateFlatterConfetti + call CreateFlatterConfetti + call CreateFlatterConfetti + call CreateFlatterConfetti + call CreateFlatterConfetti + call CreateFlatterConfetti + call CreateFlatterConfetti + call CreateFlatterConfetti + call CreateFlatterConfetti + call CreateFlatterConfetti + call CreateFlatterConfetti + waitforvisualfinish + clearmonbg ANIM_ATTACKER + delay 10 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG | F_PAL_BATTLERS, 1, 0, 3, RGB_WHITE + playsewithpan SE_M_GUST, SOUND_PAN_ATTACKER + call ChillyReceptionSnowballs + call ChillyReceptionSnowballs + call ChillyReceptionSnowballs + call ChillyReceptionSnowballs + playsewithpan SE_M_GUST2, SOUND_PAN_TARGET + waitforvisualfinish + waitsound + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG | F_PAL_BATTLERS, 1, 3, 0, RGB_WHITE + end +ChillyReceptionSnowballs: + createsprite gPowderSnowSnowballSpriteTemplate, ANIM_ATTACKER, 40, 200, -150, 24, 0, 56, 4, 4, 0 + delay 3 + createsprite gPowderSnowSnowballSpriteTemplate, ANIM_ATTACKER, 40, 200, -100, 24, -10, 56, 4, 4, 0 + delay 3 + createsprite gPowderSnowSnowballSpriteTemplate, ANIM_ATTACKER, 40, 200, -100, 24, 10, 56, -4, 3, 0 + delay 3 + createsprite gPowderSnowSnowballSpriteTemplate, ANIM_ATTACKER, 40, 200, -200, 24, -20, 56, -4, 5, 0 + delay 3 + createsprite gPowderSnowSnowballSpriteTemplate, ANIM_ATTACKER, 40, 200, -150, 24, 15, 56, 4, 4, 0 + delay 3 + createsprite gPowderSnowSnowballSpriteTemplate, ANIM_ATTACKER, 40, 200, -200, 24, -20, 56, 4, 4, 0 + delay 3 + createsprite gPowderSnowSnowballSpriteTemplate, ANIM_ATTACKER, 40, 200, -200, 24, 20, 56, 4, 4, 0 + delay 3 + return + Move_TERA_BLAST:: Move_AXE_KICK:: Move_LAST_RESPECTS:: @@ -16862,7 +16933,6 @@ Move_RUINATION:: Move_COLLISION_COURSE:: Move_ELECTRO_DRIFT:: Move_SHED_TAIL:: -Move_CHILLY_RECEPTION:: Move_TIDY_UP:: Move_POUNCE:: Move_TRAILBLAZE:: diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index a88d270ef7..bed903cab2 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -436,6 +436,7 @@ gBattleScriptsForMoveEffects:: .4byte BattleScript_EffectHit @ EFFECT_POPULATION_BOMB .4byte BattleScript_EffectMortalSpin @ EFFECT_MORTAL_SPIN .4byte BattleScript_EffectSaltCure @ EFFECT_SALT_CURE + .4byte BattleScript_EffectChillyReception @ EFFECT_CHILLY_RECEPTION .4byte BattleScript_EffectMatchaGotcha @ EFFECT_MATCHA_GOTCHA .4byte BattleScript_EffectSyrupBomb @ EFFECT_SYRUP_BOMB .4byte BattleScript_EffectHit @ EFFECT_IVY_CUDGEL @@ -471,6 +472,71 @@ BattleScript_SyrupBombTurnDmgEnd: BattleScript_EffectMatchaGotcha:: setmoveeffect MOVE_EFFECT_BURN goto BattleScript_EffectAbsorb + end + +BattleScript_EffectChillyReception:: + printstring STRINGID_PKMNTELLCHILLINGRECEPTIONJOKE + waitmessage B_WAIT_TIME_LONG + attackcanceler + ppreduce + jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN_PRIMAL, BattleScript_EffectChillyReceptionBlockedByPrimalSun + jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_RAIN_PRIMAL, BattleScript_EffectChillyReceptionBlockedByPrimalRain + jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_STRONG_WINDS, BattleScript_EffectChillyReceptionBlockedByStrongWinds + call BattleScript_EffectChillyReceptionPlayAnimation + setsnow + call BattleScript_MoveWeatherChangeRet + goto BattleScript_MoveSwitch +BattleScript_EffectChillyReceptionPlayAnimation: + attackstring + attackanimation + waitanimation + return +BattleScript_EffectChillyReceptionBlockedByPrimalSun: + call BattleScript_EffectChillyReceptionTrySwitchWeatherFailed + call BattleScript_ExtremelyHarshSunlightWasNotLessenedRet + goto BattleScript_MoveSwitch +BattleScript_EffectChillyReceptionBlockedByPrimalRain: + call BattleScript_EffectChillyReceptionTrySwitchWeatherFailed + call BattleScript_NoReliefFromHeavyRainRet + goto BattleScript_MoveSwitch +BattleScript_EffectChillyReceptionBlockedByStrongWinds: + call BattleScript_EffectChillyReceptionTrySwitchWeatherFailed + call BattleScript_MysteriousAirCurrentBlowsOnRet + goto BattleScript_MoveSwitch +BattleScript_EffectChillyReceptionTrySwitchWeatherFailed: + jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_FailedFromAtkString + jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_FailedFromAtkString + call BattleScript_EffectChillyReceptionPlayAnimation + return + +BattleScript_CheckPrimalWeather: + jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN_PRIMAL, BattleScript_ExtremelyHarshSunlightWasNotLessened + jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_RAIN_PRIMAL, BattleScript_NoReliefFromHeavyRain + jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_STRONG_WINDS, BattleScript_MysteriousAirCurrentBlowsOn + return + +BattleScript_MoveSwitch: + jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_MoveSwitchEnd + jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_MoveSwitchEnd + printstring STRINGID_PKMNWENTBACK + waitmessage B_WAIT_TIME_SHORT + openpartyscreen BS_ATTACKER, BattleScript_MoveSwitchEnd + switchoutabilities BS_ATTACKER + waitstate + switchhandleorder BS_ATTACKER, 2 + returntoball BS_ATTACKER + getswitchedmondata BS_ATTACKER + switchindataupdate BS_ATTACKER + hpthresholds BS_ATTACKER + trytoclearprimalweather + printstring STRINGID_EMPTYSTRING3 + waitmessage 1 + printstring STRINGID_SWITCHINMON + switchinanim BS_ATTACKER, TRUE + waitstate + switchineffects BS_ATTACKER +BattleScript_MoveSwitchEnd: + end BattleScript_EffectPledge:: attackcanceler @@ -661,14 +727,14 @@ BattleScript_EffectRevivalBlessing:: waitanimation printstring STRINGID_PKMNREVIVEDREADYTOFIGHT waitmessage B_WAIT_TIME_LONG - jumpifbyte CMP_EQUAL, gBattleCommunication, TRUE, BattleScript_EffectRevivalBlessingSendOut + jumpifbyte CMP_EQUAL, gBattleCommunication, TRUE, BattleScript_EffectRevivalBlessingSendOut goto BattleScript_MoveEnd BattleScript_EffectRevivalBlessingSendOut: - switchinanim BS_SCRIPTING, FALSE + switchinanim BS_SCRIPTING, FALSE waitstate switchineffects BS_SCRIPTING - goto BattleScript_MoveEnd + goto BattleScript_MoveEnd BattleScript_StealthRockActivates:: setstealthrock BattleScript_MoveEnd @@ -1696,22 +1762,7 @@ BattleScript_EffectPartingShotTrySpAtk: waitmessage B_WAIT_TIME_LONG BattleScript_EffectPartingShotSwitch: moveendall - jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_PartingShotEnd - jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_PartingShotEnd - openpartyscreen BS_ATTACKER, BattleScript_PartingShotEnd - switchoutabilities BS_ATTACKER - waitstate - switchhandleorder BS_ATTACKER, 2 - returntoball BS_ATTACKER - getswitchedmondata BS_ATTACKER - switchindataupdate BS_ATTACKER - hpthresholds BS_ATTACKER - trytoclearprimalweather - flushtextbox - printstring STRINGID_SWITCHINMON - switchinanim BS_ATTACKER, TRUE - waitstate - switchineffects BS_ATTACKER + goto BattleScript_MoveSwitch BattleScript_PartingShotEnd: end @@ -3173,23 +3224,8 @@ BattleScript_EffectHitEscape: moveendfrom MOVEEND_TARGET_VISIBLE jumpifbattleend BattleScript_HitEscapeEnd 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 - openpartyscreen BS_ATTACKER, BattleScript_HitEscapeEnd - switchoutabilities BS_ATTACKER - waitstate - switchhandleorder BS_ATTACKER, 2 - returntoball BS_ATTACKER - getswitchedmondata BS_ATTACKER - switchindataupdate BS_ATTACKER - hpthresholds BS_ATTACKER - trytoclearprimalweather - flushtextbox - printstring STRINGID_SWITCHINMON - switchinanim BS_ATTACKER, TRUE - waitstate - switchineffects BS_ATTACKER + goto BattleScript_MoveSwitch BattleScript_HitEscapeEnd: end @@ -4971,9 +5007,7 @@ BattleScript_EffectSandstorm:: attackcanceler attackstring ppreduce - jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN_PRIMAL, BattleScript_ExtremelyHarshSunlightWasNotLessened - jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_RAIN_PRIMAL, BattleScript_NoReliefFromHeavyRain - jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_STRONG_WINDS, BattleScript_MysteriousAirCurrentBlowsOn + call BattleScript_CheckPrimalWeather setsandstorm goto BattleScript_MoveWeatherChange @@ -5162,25 +5196,25 @@ BattleScript_EffectRainDance:: attackcanceler attackstring ppreduce - jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN_PRIMAL, BattleScript_ExtremelyHarshSunlightWasNotLessened - jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_RAIN_PRIMAL, BattleScript_NoReliefFromHeavyRain - jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_STRONG_WINDS, BattleScript_MysteriousAirCurrentBlowsOn + call BattleScript_CheckPrimalWeather setrain BattleScript_MoveWeatherChange:: attackanimation waitanimation + call BattleScript_MoveWeatherChangeRet + goto BattleScript_MoveEnd + +BattleScript_MoveWeatherChangeRet:: printfromtable gMoveWeatherChangeStringIds waitmessage B_WAIT_TIME_LONG call BattleScript_ActivateWeatherAbilities - goto BattleScript_MoveEnd + return BattleScript_EffectSunnyDay:: attackcanceler attackstring ppreduce - jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN_PRIMAL, BattleScript_ExtremelyHarshSunlightWasNotLessened - jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_RAIN_PRIMAL, BattleScript_NoReliefFromHeavyRain - jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_STRONG_WINDS, BattleScript_MysteriousAirCurrentBlowsOn + call BattleScript_CheckPrimalWeather setsunny goto BattleScript_MoveWeatherChange @@ -5644,9 +5678,7 @@ BattleScript_EffectHail:: attackcanceler attackstring ppreduce - jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN_PRIMAL, BattleScript_ExtremelyHarshSunlightWasNotLessened - jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_RAIN_PRIMAL, BattleScript_NoReliefFromHeavyRain - jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_STRONG_WINDS, BattleScript_MysteriousAirCurrentBlowsOn + call BattleScript_CheckPrimalWeather sethail goto BattleScript_MoveWeatherChange @@ -10771,9 +10803,7 @@ BattleScript_BerserkGeneRet_End: BattleScript_EffectSnow:: attackcanceler attackstring - ppreduce - jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN_PRIMAL, BattleScript_ExtremelyHarshSunlightWasNotLessened - jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_RAIN_PRIMAL, BattleScript_NoReliefFromHeavyRain - jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_STRONG_WINDS, BattleScript_MysteriousAirCurrentBlowsOn + ppreduce + call BattleScript_CheckPrimalWeather setsnow goto BattleScript_MoveWeatherChange diff --git a/include/constants/battle_move_effects.h b/include/constants/battle_move_effects.h index 1fb300347e..19118ca4e9 100644 --- a/include/constants/battle_move_effects.h +++ b/include/constants/battle_move_effects.h @@ -413,13 +413,14 @@ #define EFFECT_POPULATION_BOMB 407 #define EFFECT_MORTAL_SPIN 408 #define EFFECT_SALT_CURE 409 -#define EFFECT_MATCHA_GOTCHA 410 -#define EFFECT_SYRUP_BOMB 411 -#define EFFECT_IVY_CUDGEL 412 -#define EFFECT_MAX_MOVE 413 -#define EFFECT_GLAIVE_RUSH 414 -#define EFFECT_RAGING_BULL 415 +#define EFFECT_CHILLY_RECEPTION 410 +#define EFFECT_MATCHA_GOTCHA 411 +#define EFFECT_SYRUP_BOMB 412 +#define EFFECT_IVY_CUDGEL 413 +#define EFFECT_MAX_MOVE 414 +#define EFFECT_GLAIVE_RUSH 415 +#define EFFECT_RAGING_BULL 416 -#define NUM_BATTLE_MOVE_EFFECTS 416 +#define NUM_BATTLE_MOVE_EFFECTS 417 #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H diff --git a/include/constants/battle_string_ids.h b/include/constants/battle_string_ids.h index 354b3d20b5..6263f87a38 100644 --- a/include/constants/battle_string_ids.h +++ b/include/constants/battle_string_ids.h @@ -695,8 +695,9 @@ #define STRINGID_THESEAOFFIREDISAPPEARED 693 #define STRINGID_SWAMPENVELOPEDSIDE 694 #define STRINGID_THESWAMPDISAPPEARED 695 +#define STRINGID_PKMNTELLCHILLINGRECEPTIONJOKE 696 -#define BATTLESTRINGS_COUNT 696 +#define BATTLESTRINGS_COUNT 697 // 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_message.c b/src/battle_message.c index fa2df70688..d8dbceab24 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -822,6 +822,7 @@ static const u8 sText_TargetIsBeingSaltCured[] = _("{B_DEF_NAME_WITH_PREFIX} is static const u8 sText_TargetIsHurtBySaltCure[] = _("{B_DEF_NAME_WITH_PREFIX} is hurt by {B_BUFF1}!"); static const u8 sText_OpportunistCopied[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} copied its\nopponent's stat changes!"); static const u8 sText_TargetCoveredInStickyCandySyrup[] = _("{B_DEF_NAME_WITH_PREFIX} got covered\nin sticky syrup!"); +static const u8 sText_PkmnTellChillingReceptionJoke[] = _("{B_ATK_NAME_WITH_PREFIX} is preparing to tell a\nchillingly bad joke!"); static const u8 sText_ZeroToHeroTransformation[] = _("{B_ATK_NAME_WITH_PREFIX} underwent a heroic\ntransformation!"); static const u8 sText_TheTwoMovesBecomeOne[] = _("The two moves become one!\nIt's a combined move!{PAUSE 16}"); static const u8 sText_ARainbowAppearedOnSide[] = _("A rainbow appeared in the sky\non {B_ATK_TEAM2} team's side!"); @@ -845,6 +846,7 @@ const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] = [STRINGID_ARAINBOWAPPEAREDONSIDE - BATTLESTRINGS_TABLE_START] = sText_ARainbowAppearedOnSide, [STRINGID_THETWOMOVESBECOMEONE - BATTLESTRINGS_TABLE_START] = sText_TheTwoMovesBecomeOne, [STRINGID_ZEROTOHEROTRANSFORMATION - BATTLESTRINGS_TABLE_START] = sText_ZeroToHeroTransformation, + [STRINGID_PKMNTELLCHILLINGRECEPTIONJOKE - BATTLESTRINGS_TABLE_START] = sText_PkmnTellChillingReceptionJoke, [STRINGID_MOVEBLOCKEDBYDYNAMAX - BATTLESTRINGS_TABLE_START] = sText_MoveBlockedByDynamax, [STRINGID_OPPORTUNISTCOPIED - BATTLESTRINGS_TABLE_START] = sText_OpportunistCopied, [STRINGID_TARGETISHURTBYSALTCURE - BATTLESTRINGS_TABLE_START] = sText_TargetIsHurtBySaltCure, diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index f3cf0fa76b..078f32f5ac 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -14004,7 +14004,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_CHILLY_RECEPTION] = { - .effect = EFFECT_PLACEHOLDER, // EFFECT_CHILLY_RECEPTION + .effect = EFFECT_CHILLY_RECEPTION, .power = 0, .type = TYPE_ICE, .accuracy = 0, diff --git a/test/battle/move_effect/chilly_reception.c b/test/battle/move_effect/chilly_reception.c new file mode 100644 index 0000000000..6f731f4b6f --- /dev/null +++ b/test/battle/move_effect/chilly_reception.c @@ -0,0 +1,90 @@ +#include "global.h" +#include "test/battle.h" + +ASSUMPTIONS +{ + ASSUME(gBattleMoves[MOVE_CHILLY_RECEPTION].effect == EFFECT_CHILLY_RECEPTION); +} + +SINGLE_BATTLE_TEST("Chilly Reception sets up snow and switches the user out") +{ + GIVEN { + PLAYER(SPECIES_SLOWKING_GALARIAN); + PLAYER(SPECIES_SLOWPOKE_GALARIAN); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_CHILLY_RECEPTION); SEND_OUT(player, 1); } + } SCENE { + MESSAGE("Slowking is preparing to tell a chillingly bad joke!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_CHILLY_RECEPTION, player); + MESSAGE("It started to snow!"); + MESSAGE("Slowking went back to 1"); + MESSAGE("Go! Slowpoke!"); + ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_SNOW_CONTINUES); + } +} + +SINGLE_BATTLE_TEST("Chilly Reception switches the user out, even if the weather does not change") +{ + GIVEN { + PLAYER(SPECIES_SLOWKING_GALARIAN); + PLAYER(SPECIES_SLOWPOKE_GALARIAN); + OPPONENT(SPECIES_KYOGRE) { Item(ITEM_BLUE_ORB); } + } WHEN { + TURN { MOVE(player, MOVE_CHILLY_RECEPTION); SEND_OUT(player, 1); } + } SCENE { + MESSAGE("Slowking is preparing to tell a chillingly bad joke!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_CHILLY_RECEPTION, player); + MESSAGE("There is no relief from this heavy rain!"); + MESSAGE("Slowking went back to 1"); + MESSAGE("Go! Slowpoke!"); + MESSAGE("Rain continues to fall."); + } +} + +SINGLE_BATTLE_TEST("Chilly Reception does not switch the user out if no replacements") +{ + GIVEN { + PLAYER(SPECIES_SLOWKING_GALARIAN); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_CHILLY_RECEPTION); } + } SCENE { + MESSAGE("Slowking is preparing to tell a chillingly bad joke!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_CHILLY_RECEPTION, player); + MESSAGE("It started to snow!"); + NOT MESSAGE("Slowking went back to 1"); + } +} + +SINGLE_BATTLE_TEST("Chilly Reception does not switch the user out if replacements fainted") +{ + GIVEN { + PLAYER(SPECIES_SLOWKING_GALARIAN); + PLAYER(SPECIES_SLOWPOKE_GALARIAN) { HP(0); } + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_CHILLY_RECEPTION); } + } SCENE { + MESSAGE("Slowking is preparing to tell a chillingly bad joke!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_CHILLY_RECEPTION, player); + MESSAGE("It started to snow!"); + NOT MESSAGE("Slowking went back to 1"); + } +} + +SINGLE_BATTLE_TEST("Chilly Reception changes the weather, even if the user cannot switch out") +{ + GIVEN { + PLAYER(SPECIES_SLOWKING_GALARIAN); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_CHILLY_RECEPTION); } + } SCENE { + MESSAGE("Slowking is preparing to tell a chillingly bad joke!"); + ANIMATION(ANIM_TYPE_MOVE, MOVE_CHILLY_RECEPTION, player); + MESSAGE("It started to snow!"); + NOT MESSAGE("Slowking went back to 1"); + } +} + From 7f0b1da56160f79cb4b82edb2f1d255ffcc2fd8e Mon Sep 17 00:00:00 2001 From: Zimmermann Gyula Date: Wed, 6 Dec 2023 18:05:04 +0100 Subject: [PATCH 13/14] =?UTF-8?q?Fix=20HGSS=20Pok=C3=A9dex=20teachable=20m?= =?UTF-8?q?oves=20list.=20(#3624)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --- src/pokedex_plus_hgss.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/src/pokedex_plus_hgss.c b/src/pokedex_plus_hgss.c index 294d42b26e..18ea0824e1 100644 --- a/src/pokedex_plus_hgss.c +++ b/src/pokedex_plus_hgss.c @@ -5276,14 +5276,30 @@ static bool8 CalculateMoves(void) { sStatsMovesTMHM_ID[numTMHMMoves] = (ITEM_TM01 + j); numTMHMMoves++; + + sStatsMoves[movesTotal] = move; + movesTotal++; break; } } - if (j >= NUM_TECHNICAL_MACHINES + NUM_HIDDEN_MACHINES) - numTutorMoves++; + } - sStatsMoves[movesTotal] = move; - movesTotal++; + for (i = 0; gTeachableLearnsets[species][i] != MOVE_UNAVAILABLE; i++) + { + move = gTeachableLearnsets[species][i]; + for (j = 0; j < NUM_TECHNICAL_MACHINES + NUM_HIDDEN_MACHINES; j++) + { + if (ItemIdToBattleMoveId(ITEM_TM01 + j) == move) + break; + } + + if (j >= NUM_TECHNICAL_MACHINES + NUM_HIDDEN_MACHINES) + { + numTutorMoves++; + + sStatsMoves[movesTotal] = move; + movesTotal++; + } } sPokedexView->numEggMoves = numEggMoves; From 8ac66cdc763d8ef0335b861e7905b76dfc4d7a6d Mon Sep 17 00:00:00 2001 From: CyanSMP64 <48017633+CyanSMP64@users.noreply.github.com> Date: Thu, 7 Dec 2023 06:18:04 +1300 Subject: [PATCH 14/14] Pokemon sprite review part 2 (#3612) * sprite review part 2 * fix hisuian sliggoo back coordinate * fix muk anim --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --- graphics/pokemon/chansey/anim_front.png | Bin 1026 -> 1128 bytes graphics/pokemon/chansey/back.png | Bin 591 -> 654 bytes graphics/pokemon/chansey/normal.pal | 26 +- graphics/pokemon/chansey/shiny.pal | 30 +- graphics/pokemon/cloyster/anim_front.png | Bin 1429 -> 1560 bytes graphics/pokemon/cloyster/back.png | Bin 752 -> 803 bytes graphics/pokemon/cloyster/normal.pal | 20 +- graphics/pokemon/cloyster/shiny.pal | 28 +- graphics/pokemon/cubone/anim_front.png | Bin 835 -> 924 bytes graphics/pokemon/cubone/back.png | Bin 693 -> 756 bytes graphics/pokemon/cubone/normal.pal | 26 +- graphics/pokemon/cubone/shiny.pal | 32 +- graphics/pokemon/dewgong/anim_front.png | Bin 1167 -> 1255 bytes graphics/pokemon/dewgong/back.png | Bin 497 -> 572 bytes graphics/pokemon/dewgong/normal.pal | 24 +- graphics/pokemon/dewgong/shiny.pal | 24 +- graphics/pokemon/dodrio/anim_front.png | Bin 1581 -> 1715 bytes graphics/pokemon/dodrio/anim_frontf.png | Bin 1584 -> 1714 bytes graphics/pokemon/dodrio/back.png | Bin 790 -> 889 bytes graphics/pokemon/dodrio/backf.png | Bin 860 -> 904 bytes graphics/pokemon/dodrio/normal.pal | 20 +- graphics/pokemon/dodrio/shiny.pal | 32 +- graphics/pokemon/doduo/anim_front.png | Bin 912 -> 1015 bytes graphics/pokemon/doduo/anim_frontf.png | Bin 910 -> 1028 bytes graphics/pokemon/doduo/back.png | Bin 546 -> 655 bytes graphics/pokemon/doduo/backf.png | Bin 563 -> 671 bytes graphics/pokemon/doduo/normal.pal | 28 +- graphics/pokemon/doduo/shiny.pal | 30 +- graphics/pokemon/drowzee/anim_front.png | Bin 1028 -> 1129 bytes graphics/pokemon/drowzee/back.png | Bin 593 -> 647 bytes graphics/pokemon/drowzee/normal.pal | 26 +- graphics/pokemon/drowzee/shiny.pal | 28 +- graphics/pokemon/electrode/anim_front.png | Bin 790 -> 861 bytes graphics/pokemon/electrode/back.png | Bin 523 -> 567 bytes graphics/pokemon/electrode/normal.pal | 22 +- graphics/pokemon/electrode/shiny.pal | 28 +- graphics/pokemon/exeggcute/anim_front.png | Bin 1064 -> 1128 bytes graphics/pokemon/exeggcute/back.png | Bin 513 -> 558 bytes graphics/pokemon/exeggcute/normal.pal | 24 +- graphics/pokemon/exeggcute/shiny.pal | 28 +- graphics/pokemon/exeggutor/anim_front.png | Bin 1700 -> 1793 bytes graphics/pokemon/exeggutor/back.png | Bin 770 -> 831 bytes graphics/pokemon/exeggutor/normal.pal | 28 +- graphics/pokemon/exeggutor/shiny.pal | 30 +- graphics/pokemon/farfetchd/anim_front.png | Bin 1219 -> 1159 bytes graphics/pokemon/farfetchd/back.png | Bin 688 -> 741 bytes graphics/pokemon/farfetchd/normal.pal | 30 +- graphics/pokemon/farfetchd/shiny.pal | 26 +- graphics/pokemon/gastly/anim_front.png | Bin 1010 -> 1089 bytes graphics/pokemon/gastly/back.png | Bin 705 -> 759 bytes graphics/pokemon/gastly/normal.pal | 22 +- graphics/pokemon/gastly/shiny.pal | 28 +- graphics/pokemon/gengar/anim_front.png | Bin 1200 -> 1275 bytes graphics/pokemon/gengar/back.png | Bin 729 -> 775 bytes graphics/pokemon/gengar/normal.pal | 26 +- graphics/pokemon/gengar/shiny.pal | 28 +- graphics/pokemon/grimer/anim_front.png | Bin 1116 -> 1194 bytes graphics/pokemon/grimer/back.png | Bin 617 -> 671 bytes graphics/pokemon/grimer/normal.pal | 26 +- graphics/pokemon/grimer/shiny.pal | 30 +- graphics/pokemon/haunter/anim_front.png | Bin 999 -> 1108 bytes graphics/pokemon/haunter/back.png | Bin 755 -> 810 bytes graphics/pokemon/haunter/normal.pal | 28 +- graphics/pokemon/haunter/shiny.pal | 28 +- graphics/pokemon/hitmonchan/anim_front.png | Bin 1431 -> 1365 bytes graphics/pokemon/hitmonchan/back.png | Bin 766 -> 824 bytes graphics/pokemon/hitmonchan/normal.pal | 18 +- graphics/pokemon/hitmonchan/shiny.pal | 30 +- graphics/pokemon/hitmonlee/anim_front.png | Bin 1220 -> 1225 bytes graphics/pokemon/hitmonlee/back.png | Bin 723 -> 773 bytes graphics/pokemon/hitmonlee/normal.pal | 22 +- graphics/pokemon/hitmonlee/shiny.pal | 32 +- graphics/pokemon/hitmontop/anim_front.png | Bin 1213 -> 1438 bytes graphics/pokemon/hitmontop/back.png | Bin 795 -> 847 bytes graphics/pokemon/hitmontop/normal.pal | 28 +- graphics/pokemon/hitmontop/shiny.pal | 28 +- graphics/pokemon/hypno/anim_front.png | Bin 1304 -> 1414 bytes graphics/pokemon/hypno/anim_frontf.png | Bin 1317 -> 1442 bytes graphics/pokemon/hypno/back.png | Bin 793 -> 844 bytes graphics/pokemon/hypno/backf.png | Bin 763 -> 866 bytes graphics/pokemon/hypno/normal.pal | 26 +- graphics/pokemon/hypno/shiny.pal | 26 +- graphics/pokemon/jellicent/anim_front.png | Bin 1230 -> 1311 bytes graphics/pokemon/jellicent/anim_frontf.png | Bin 1030 -> 1134 bytes graphics/pokemon/kingler/anim_front.png | Bin 1384 -> 1459 bytes graphics/pokemon/kingler/back.png | Bin 729 -> 786 bytes graphics/pokemon/kingler/normal.pal | 20 +- graphics/pokemon/kingler/shiny.pal | 30 +- graphics/pokemon/koffing/anim_front.png | Bin 1167 -> 1247 bytes graphics/pokemon/koffing/back.png | Bin 765 -> 818 bytes graphics/pokemon/koffing/normal.pal | 18 +- graphics/pokemon/koffing/shiny.pal | 26 +- graphics/pokemon/krabby/anim_front.png | Bin 1093 -> 1165 bytes graphics/pokemon/krabby/back.png | Bin 600 -> 653 bytes graphics/pokemon/krabby/normal.pal | 24 +- graphics/pokemon/krabby/shiny.pal | 28 +- graphics/pokemon/lickitung/anim_front.png | Bin 1313 -> 1405 bytes graphics/pokemon/lickitung/back.png | Bin 624 -> 679 bytes graphics/pokemon/lickitung/normal.pal | 28 +- graphics/pokemon/lickitung/shiny.pal | 28 +- graphics/pokemon/magnemite/anim_front.png | Bin 602 -> 668 bytes graphics/pokemon/magnemite/back.png | Bin 477 -> 576 bytes graphics/pokemon/magnemite/normal.pal | 18 +- graphics/pokemon/magnemite/shiny.pal | 28 +- graphics/pokemon/magneton/anim_front.png | Bin 1315 -> 1387 bytes graphics/pokemon/magneton/back.png | Bin 747 -> 850 bytes graphics/pokemon/magneton/normal.pal | 16 +- graphics/pokemon/magneton/shiny.pal | 28 +- graphics/pokemon/marowak/anim_front.png | Bin 1087 -> 1164 bytes graphics/pokemon/marowak/back.png | Bin 691 -> 745 bytes graphics/pokemon/marowak/normal.pal | 20 +- graphics/pokemon/marowak/shiny.pal | 30 +- graphics/pokemon/muk/anim_front.png | Bin 1282 -> 1359 bytes graphics/pokemon/muk/back.png | Bin 727 -> 783 bytes graphics/pokemon/muk/normal.pal | 20 +- graphics/pokemon/muk/shiny.pal | 30 +- graphics/pokemon/nidoking/anim_front.png | Bin 1880 -> 1728 bytes graphics/pokemon/nidoking/back.png | Bin 835 -> 839 bytes graphics/pokemon/onix/anim_front.png | Bin 1433 -> 1518 bytes graphics/pokemon/onix/back.png | Bin 880 -> 929 bytes graphics/pokemon/onix/normal.pal | 26 +- graphics/pokemon/onix/shiny.pal | 30 +- graphics/pokemon/rhydon/anim_front.png | Bin 1650 -> 1541 bytes graphics/pokemon/rhydon/anim_frontf.png | Bin 1595 -> 1528 bytes graphics/pokemon/rhydon/back.png | Bin 836 -> 886 bytes graphics/pokemon/rhydon/backf.png | Bin 764 -> 871 bytes graphics/pokemon/rhydon/normal.pal | 24 +- graphics/pokemon/rhydon/shiny.pal | 28 +- graphics/pokemon/rhyhorn/anim_front.png | Bin 1125 -> 1211 bytes graphics/pokemon/rhyhorn/anim_frontf.png | Bin 1081 -> 1207 bytes graphics/pokemon/rhyhorn/back.png | Bin 732 -> 785 bytes graphics/pokemon/rhyhorn/backf.png | Bin 664 -> 768 bytes graphics/pokemon/rhyhorn/normal.pal | 22 +- graphics/pokemon/rhyhorn/shiny.pal | 28 +- graphics/pokemon/seel/anim_front.png | Bin 1019 -> 1084 bytes graphics/pokemon/seel/back.png | Bin 558 -> 609 bytes graphics/pokemon/seel/normal.pal | 24 +- graphics/pokemon/seel/shiny.pal | 28 +- graphics/pokemon/shellder/anim_front.png | Bin 804 -> 906 bytes graphics/pokemon/shellder/back.png | Bin 427 -> 480 bytes graphics/pokemon/shellder/normal.pal | 28 +- graphics/pokemon/shellder/shiny.pal | 28 +- graphics/pokemon/tangela/anim_front.png | Bin 1125 -> 1205 bytes graphics/pokemon/tangela/back.png | Bin 720 -> 776 bytes graphics/pokemon/tangela/normal.pal | 20 +- graphics/pokemon/tangela/shiny.pal | 30 +- graphics/pokemon/voltorb/anim_front.png | Bin 624 -> 705 bytes graphics/pokemon/voltorb/back.png | Bin 454 -> 510 bytes graphics/pokemon/voltorb/normal.pal | 26 +- graphics/pokemon/voltorb/shiny.pal | 28 +- graphics/pokemon/weezing/anim_front.png | Bin 1809 -> 1903 bytes graphics/pokemon/weezing/back.png | Bin 741 -> 792 bytes graphics/pokemon/weezing/normal.pal | 24 +- graphics/pokemon/weezing/shiny.pal | 30 +- .../pokemon_graphics/back_pic_coordinates.h | 4 +- .../pokemon_graphics/enemy_mon_elevation.h | 74 ++-- src/data/pokemon_graphics/front_pic_anims.h | 142 +++---- .../pokemon_graphics/front_pic_coordinates.h | 376 +++++++++--------- src/pokemon.c | 39 +- 159 files changed, 1230 insertions(+), 1237 deletions(-) diff --git a/graphics/pokemon/chansey/anim_front.png b/graphics/pokemon/chansey/anim_front.png index 2e4e2f573f14f8ad440cdc7ca9af0c4352440892..f2eec2ca77b4da1061a89745707b51878ddfa77d 100644 GIT binary patch delta 1107 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 diff --git a/graphics/pokemon/chansey/normal.pal b/graphics/pokemon/chansey/normal.pal index 698af3b616..0e50f85c24 100644 --- a/graphics/pokemon/chansey/normal.pal +++ b/graphics/pokemon/chansey/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -230 123 131 -139 65 65 -255 230 230 -255 213 222 -139 65 65 -238 123 123 -246 164 156 -248 248 248 -16 16 16 -139 65 65 -246 164 180 +255 255 255 +230 222 189 172 164 115 115 106 74 -230 222 189 -0 0 0 +238 123 123 +225 96 96 +16 16 16 +139 65 65 +246 164 156 +238 123 123 +255 230 230 +255 213 222 +246 164 180 +230 123 131 +139 65 65 diff --git a/graphics/pokemon/chansey/shiny.pal b/graphics/pokemon/chansey/shiny.pal index 219c13d1d0..a919547a79 100644 --- a/graphics/pokemon/chansey/shiny.pal +++ b/graphics/pokemon/chansey/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -192 160 88 -112 88 56 -248 240 224 -248 232 200 -80 112 56 -128 176 64 -152 216 72 -248 248 248 +152 160 208 +255 255 255 +230 222 189 +172 164 115 +115 106 74 +141 215 40 +106 164 32 16 16 16 -80 112 56 -232 200 144 -168 160 112 -112 104 72 -224 216 184 -0 0 0 +88 128 64 +148 222 49 +106 164 32 +255 246 230 +255 238 205 +238 205 148 +213 172 90 +139 106 65 diff --git a/graphics/pokemon/cloyster/anim_front.png b/graphics/pokemon/cloyster/anim_front.png index bce084388f96ec4e533d3076372ad442903f8702..6e1ed035083cb3ee1e424fb8eb0aae76abec9408 100644 GIT binary patch delta 1555 zcmV+u2JHEj3z!U$7=Hu<0000OV1ZP1_ zK>z@;j|==^1poj5Fi=cXMVQc_)xGYld%cumw0ly6N+43Cdw;!yTBK@0gHkD4#l^*x zl$2s(VnIPc5D*am|Now!K@I=_00Cl4M??UK1szBL00lfrL_t(|oXwW8ZsSG}hKYk% zq%p7rRj9ZFG*}ic;%6`y%fbOHh{SH|K0pwc$s;)3*+6_@io42KZCUZ`lI#!U~K@& z)(0T}x&Y`8U~9GCCqGOZKh=E;Ky!c=6Va4_<^Yla%H4;?04=7y6kU6s5{&^`OzJcQ z;2L;i1_($407QFEfDDXr10hrXN(7qQ2TQ?v`b*-mbjS|cvsej$cIX%(AO_MA~2eq zzGH$x1{rs&>6fjvEz9%K=8GsrF zrU8q-`zD3)D+2CLGi+GbOm6g$MvB1X;_B7+dH&|^^c@1g!0~&jh!FUiQrN#cEwa!I z$)n%%!$=N`djjt728F%oR_RnS1cd++Z$5oHD1UIWcm^}KQi_26yU!Hky1;7lq^y=w zAaG3nV+8OBE@u@0vgoUeEA)SJpI@J*f`Fb=YG4-FzrFpOzdpgClCsxx{h?`Qeti3P zjsV`W0z6{@M*vH0jZ#RI1K{7vO|!0y|A#*XS2Ed?k2z51GHmx4iJuNiOd(Xs%mJv~ z8GqowjIRz3%1fNNAnM5)AmGcv`(j*{;}Z*1BjCsZpCC~bf1QB=HcGDogi7w7kIsMj zb##$&U{Q5s>5MiJZ%5-{fdEeZv_{0Njl~(9TR=;>6axPYDX)iP90wd9wA!lmxd|~G zUsJQuFKWx$2b^p?V|GoI?p?~IZJlw3Cx7FZ5HR&Fp}y~ZT3^a;GP=U$(u1HCeq;f2 z1HJSh2rXP-$yxvjUX_4)k>)@U`2?h^fSC1ZO-$2p#cLC{%^H~cL304FMOnwV5z1!2 zwT%^D|3B?Xd9hwSJSi_)_(rYu$Lr+?h#Mg-P z+V1edJaAlgG&66JkV!R!0`}a;EYz_!0>j2eBYPx2E>Ox7k?}D@ZC^TilCrxKv7HqkXj&A@ERvX5qI~5=e z9KgsAfJ?0_0Bq()oERW5ekVeUf!JJx=mvIgJC*PefIROSfZ~+03ScGa41aS`Ky^{d zI)Iy6EPx*RQ9x7xJOP33e5A;F+7*0&RTlY?ohWVr^iLoCj4EYMc!=P;EsAGWQ5gonY3mDDjM#9U4G1 zZdwv#!2{5=YB3237RZ*wgE8#E9Oz}u+geMpX|!arku|S#m093rWxY5i61v7t-smKY zqqGz9ot6F;3)2qcFV_Iue&=v=rQh?g0s4#80sbTV2j6C0e#HtI{tN&B002ovPDHLk FV1la9zDEE6 delta 1423 zcmV;A1#tS943!Iz7=H)@0001tU!Pb20004VQb$4nuFf3k0000mP)t-sn9!hmQiIjK z?yP&gN+41Y5D>-1#X&(q`1tsgl$2s(Vp1tugIc6&L4%}wy?9`-CIR_=000FONkln?Q5E1jhB=?mr^L3S zK2nT8fD`ufv)O+$A=CH#_i_IPK!^aSAy~S4cg_}6KoE2*M%kkQt_wDRB)%JAz(D$S z)yoGJaJvcIwtp{Aa=1a{eBUfXzz(4z2=Hjv6V*l70R)0WwLv`Zh@b@IXv#kHHv>Id z8^rT|d%ZLqgh4R^N0tbJevhd*<4FJ~$PQ=uf>B0su5k1ybBXbk#RN0K034!mPO`)F zk^AlbBF2jrI}s-<8(|9I4={jMp;b*#JpuT~dwK?xvVY2wlmgdh-78%)16*zdJ5#0v z%e+rR>=>{CB>(fL0^(HWChdP6aBK}Ay#XGDcEJf%Tnk?46Vwo}0dLhafC*q0szh2*43|JRI;~KqRz>z%l*f+%tU>`3$|#jE0Bm>| zv8oRW0DnsONiKo`$o1F+1(*x09iIkqQ3#$zKe8J|(pgKa0Qy_NA!-5S#*6-_57huB z^z@P=n?xYO>+!QXzzrAxw4ymcQn_7W0OA0k@!jNdUGKGM2<3f&{V4h=!)(XdkK_CO zE=3JUjKFCWwQ^cPA;eqc#p|k+lUYsk+QlZ^t$!qym&d>WGYc9M48fG=Q_rFSmT^T> z6J)FIT$SmIsw(~a3Ia|FsuL0hf(eE9!^^?EBnLraNuMM)HUPAr?+{=^cv&?7d#6Y$ zOaYi%0_VdmjY1T?q5DM9_!pgVw_FSv76P$%pi0_}Cncdy_c zfPc@0T^BZh()@m^U!=4l3<3K~iw9aT3~;7V0BOtufM)@c2#de0%OWP6GazAn!>-fo z{amLL$qIG{m>l4pbzS)%USH1+zG(fwo*gXO{Qq0ChvmE3L(DGz!Qn&O{a@dyC4?^xFq0O>bB0MdQ#0l-tB34;v|P#9eTn0~FjvOZA7nzGWo z_O}5mAVvm`X-5Ym09xDCWX-U;Wr>>FUB)H6gv++xmHri zgtXnmPeAAK8tFbD^pXJmEYJcFr>Ow|Hpf{90Fx0w2cS)F^lBBo7fg5d;S=( zv?jCzG&cc@CB(F-rOk=d`%wTEZUZK-TT~Ooi{?B9U?^+>T0fZJh3#PLEq?&t#{fhR zdr039>WLOTSF&R_MGO;C1CWh4q>r&w{slNl&~)T8-2i;9e2iePpN$1aMh72=AXxkk zj1D$_;0CZN_r!%=1^`N+7yf!!7yvrLLf~R_UM@Y3nUJsOWvs?kicWRDqW2j9ZQ2F* d|6eE8Ur*XK=sTb7TmS$700>D%PDHLkV1m(}g{1%h diff --git a/graphics/pokemon/cloyster/back.png b/graphics/pokemon/cloyster/back.png index 8c038d83c89320fba10a0d76f2e37e4a2a8f2354..965be563b169071592db660d7d25950a087b7480 100644 GIT binary patch delta 756 zcmV(FV~( zhf^@YuK-S=ihrapdEEi5uO3)p!7dc%TX3;oUk+ydW1mEzf(*BuuZFyHNs}=As9OXEeOqz!^cuI|Ath@K z57)ftT5W=b#@c~_)eA7F&tRcvKo(%0qNB147AymeY{^SBVGILjumZf+&|yp+d$7b~ z%zpruBmle2j8dw60!oM&QA4yls;3@ zxlNgYX{?zXHzXF8+5-*GU^CT6{)vSb$idXh48~SfF5d(Ek6gI{*Lx32;bRa{vGi!vFvd!vV){sAK>D0!c|k zK~zY`?UOx|;xG(`!%XN=i0d5`wq_Ei2QNtt9&pY7FZtM7Cpk7axjpU&+-W9!y^p1T zSF*_dM-uQCeTIwoK;CTL6ZsA6_rM+T`j$8#RzDV@@P4@={$zuq`wQ2IHUJVGcfkaI zMDz;W_(%AVk5|O)aRBDjunW!kW?by^!^5m^9$5r#SkayH6}ajON!J4(p=Y@RArX~4 z)0F}A_4uLdE&><26J1qSR7Mq1-_qlM>9^za52I#SD;xC<(K7*?AkyuzsFafgYw^q} zUlYj>bk}IGc0R#g42Y*!Txj2PF#&#wfwY3uIO#70w-kMS69e=}fy}vc)UmvYPIi1d zd9xZiz`7(KUt?h3DChMG;2`>Ayd$};2ZOA4X90R#je*wdHNX;ECi(;F=<>{e#SYu^ zaGZe(lyl2g>v-A4YLOF}Mvf0*8Pod+n2ztb`-UV8Kl&5_t4?cf9;R^$9&&Kb@NmsU zSGo-rO6M#C>j_}>cd*biAPX=~(Lvn>3yy(Owqz1z7=z^uPJn3*6~@%D2M0XH)gOR4 zcj16tRz_=GCndrda^pO(C9B7OL`=aht$go!yjmxHa6|xjj-7>(XykGiVUl1<19oIl z`|aUQbIVFZ+`#)02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(DOV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_-o0wYoJy2xT2eU>|NsBy=I+JC)r*5_Qc^kp-hZ_A)wIp5i~j)s{{a6G z5D-f=4>|w<00Cl4M@0Xn2lB-L00O{CL_t(|ob8suYTG~%h6T+*Iq4nNzLXRUUV{k@ z$XMyAg+O4Ca?(pAjC@iqM!Gp97{#Z)L~jZ7(xV`+Vk`?Qr_HRShDO#n*S7cvW`~U#4Vu&ynZKOTWG)+BEXQ{Ccs^9HH?sHqJh=fdBOsE6Ki#z+;fZ2K;};ZjM@R+ z!3|ZB?C3B<(mfA&3IQ?VPHGCix&oC1GiHqugatx&tba!BzHvzXpF=6-fFlxoKE9JX z2n#c9OGkFwfq@c2o}}_jiqke<3eg=OJ*MeE^?NP;2knao(vM|sx9njt?mFU=1|F5Q zY&cTc0YkH>n3~=bt6H&j|gfV?5VVG5ZaM=K% z3-}wvo5ug^MVm1J7dk&Q0292|&%><{!{+F&fqycf!0niTunE9*_2w0@?yiz((kKzb zg}Yjdq&fb{K_ci)6?iE=1_@q{{sbbu_lp}F+!<|=Vp4$lo4Fa`Oi}-Cj-@7u z-{qURY0)EENO{ z0uVY{NK*~~00O2-L_t(o!|j&OZks?5#<5T$z`ga!`O`a0BgAp$r1{%r3`uG(!kAX za%b|01}0DE34aNwMNHv5x#sj%v%ro+Zn|UzCju|&sW9Rg*EC=OXPlcR3D|JSAPGmr z98DH^oCWu=B{uQ{*1w2^5E(@z{Nnyb^bk4^R9fU>(+y-GrFbaBlaS9{c_HOy_xMs2 z87x;F`Hw0u_ZWX%KkZnrY||XK;d@aOEkK)Be`mFi3dmc4@4NyT=AT6i z7*`!K#0V46x%rL(rT1u}k1|5KC2yl-V^)Zg|z8wY?bE_f@3Y;^`Fi!AJ zvnffj@P9^B59u&Y-*6a%%0D=9pTV%loX;BH*OML?2%IVZFl!EM{c|w4Qrw z!ftm6M6IcvR4>b8)6FC?29&Kd$f(0YqVxxp!O(^%oDW4t4xoTN+5>U`rOhb3J-|{v zD((LH7VvvZSEzuD9H1^it+NIS3cy9mRne*bHL#THv=>n4&}|R2SMe8sA^L#QskHq= q9VK;b+CS7zh4v3R9B<+G9e)9j6Yx6QhU~%s0000T z7)eAyRCt{2l)rA{xv|+F$Y1Q^!;@A@kq)r-r^r(^NMcLuUCMH-zIf7 z8GvmmR-=&bTf*-xfJ6*`tWi$Fjnz`%_V!$uRNW0Iy24Mt6R0k-RT0}#IeK3Kt^f5GGl0J3hPsKCI|cC5bu$iS^# zcbNlsDbVwhsMd)bh*RLg`_=|b(^)PrhDlU2Q2>jygh-;=JUbeYDd6|SbS!EMmiA#r zp+MY#YmMvO&VacPAug?W?9Ho1v*f}&cK6x>pVY}Ibdcl@&YySpY@)M5KC7qyG_wFc?ARsi z49rU1OfrkmectU&)@iFsy4lMtLig-SasEIV<;Xlh0_WYcBht@(ML*;PYzMl$b+(PV sUP&Iwnrf%Y zOBn(RE%Fjf5mbj)V7(eB0RI)pWaJosijXIO6jo;k0yg13`U`*rd<)wtE8rprV$=4P z9e|$$*XGwQz|Eg>b8Xq4)ddXm7R>fq&)F*gkpo%G+!<@VuzU`4=rhDXCef@t?GhL; z*2hic&&+|L3LzZNVwm~B%rBM-nEQ^$Mwrc*$+t^I4{$kk83`DD=F=viUlfFYaE5<` zZ_wIl&5HYZg;0PU35PDVmN>YVQifd0;1{Siq0aYGCXy6$f8KOICU-pdyutuZX>T_+H!?q|d7wF)4vqKKw3zd+DscDykCU5tssG z=82yqRfPM)V-bON>f#izs{}W4SBFOm(c2>J)zfd9egu9TC?)v>%xlxM%ZPG!br|d9 z!ZO diff --git a/graphics/pokemon/cubone/normal.pal b/graphics/pokemon/cubone/normal.pal index 8613b94a22..68797e7115 100644 --- a/graphics/pokemon/cubone/normal.pal +++ b/graphics/pokemon/cubone/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -139 131 106 -248 248 248 -41 41 41 -197 197 213 -82 82 57 -148 106 90 +222 189 106 197 156 74 +148 106 90 82 57 16 -200 168 136 -240 208 176 -224 224 232 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +255 255 255 +230 230 238 +197 197 213 +139 131 106 +82 82 57 +255 222 180 +246 213 180 +205 172 139 +255 0 255 +255 0 255 +16 16 16 diff --git a/graphics/pokemon/cubone/shiny.pal b/graphics/pokemon/cubone/shiny.pal index 710bbdf527..dfc82f90bd 100644 --- a/graphics/pokemon/cubone/shiny.pal +++ b/graphics/pokemon/cubone/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -128 128 112 -248 248 248 -16 16 16 -200 184 184 -72 80 72 -80 104 48 -112 144 80 -32 56 8 -184 160 136 -224 208 176 -224 216 216 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +152 160 208 +156 172 106 +106 139 74 +74 98 49 +32 65 0 +255 255 255 +230 222 222 +205 189 189 +131 131 115 +74 82 74 +238 222 180 +230 213 180 +189 164 139 +255 0 255 +255 0 255 +41 41 41 diff --git a/graphics/pokemon/dewgong/anim_front.png b/graphics/pokemon/dewgong/anim_front.png index a1594dbd3348653a1c97a20501fd85839db0a1d1..c2f3d4f7753a330d287b9c26693f1d5ad19c1902 100644 GIT binary patch delta 1235 zcmV;^1T6cH3FirrB!35VNliru=Li)9HyZj*oMZq102g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(DOV1ZP1_K>z@;j|==^1poj5 zFi=cXMVZp1=H~X*&F-9}y=r@;K~iGXDIlBx0RI60{{a900Du4g0RPp^&4YV;5D*am z|NqHe=QIES00Cl4M??UK1szBL00aw3L_t(|ob8vvZqzUkhJ%t`BTb!%6RFCIYlYYB zHEq=NS{kLjwl{bI1kc$QC<#m9)JRC2yNvDF9NEUY z&6<;Q$f5-DS%07cfSU%gVa@@_aSRN)C4m10kS$KZ0g4$QRsaJyn*q21W+Z3_2+T|hZ1Bu&?SOH(3{5fLB^9SjD7<@qHMPbllI|6PFmHdVK3h2~n#HfCASwWcVgCNbPtHym-d17dI7zLjwoT7$fmKVK`Q%K=yx1HCLXJ`$w0XotWhs3 zW+Hkh#OlNWhoUzCtE7vS5Mq600esXVGI>AZHJsnH=)oojK8R8rD}c$rxGx31vTNKT zAX>3L)*{qEz{WXB(Y{fXXw*Vb)0Q}pz@{w~uzyi=;1agP0Zt(`DHo-V1$rP3w1#pR z=g=w&;vh;}G?0&uQYs+b2PGBk^T zWF&DrC6W?Lb~VqU{r{jtb~;PuI;`#q{VvZ>l=!_;MSQ9wF3%vb$MAL!0Kdd|trZ`y z3x9GtVom^I?i1cw`zhA7mPk|pvzezWC%f_hyiF{?k5uK%J&DYnpLo0$Mi&mSGnjj0 zA21s4)iZZRh}8-(4)h)OnpuExuhEG?RZh;#90?SIsGNdC7e)s}mtAzT@c=oVoJu)b za=f(aS5F?0atBcT_ymLU>hXBTpq;dK^h(zqUOGV(K^6tWvTNP$v?gQ3t z!XvkE8i3l&Kmo5d%agD6CIC$CX0_hC0LZ`}Bq;AD0T=f~G*duFfZk|e(*RRI<$nWj zoW{xmnVW|8Fcte20 zvP;J(Yv7V7h_KLNi_wpOQdyow`%EJ>&4~o2YWoOqyugOX(2PTc2`|gp&LNe($7((M xZ=yaMLM*fn61aU_>MeS>#Wl~{vGWMu{Q>WrPV41G5mW#G002ovPDHLkV1hR6EH(fD delta 1146 zcmV-=1cm$O36BYoB!4haOjJdg(xhs8q(M?*oTRO{ z0xvgwCk2lH00Z(#L_t(o!|j*BZqzUkhLeWe8#Wc!ZIh~3h<}~soOsgGTWAtgII@L1 z64kx{6=#m+4d_!cw&U22od`H%snsU_c03-BXZ{U>e;LU!{%seh!wpnH2=yY60>D`g z)v#m$__zZG?HWM;0H}g>0Gb6L5@UI3^9+BE|RRI4kX6U|DP{s@5WGC&dzw2NUN zl2`(Q9O@f#>VE=9>O)_*!I0&S54m~~^RLFelMku=jd%t`ub|$}Trtlgdi@0|n+VNV zN3RbD+*myex!wmo9KJfiqk4@9t_~u)g&opHdpwTX1|}z7eDfU;)lLi?XnGq6^>IW3 z_#RLNG@qqqC7u?Fc8-AQDjk zOyD$u3g1);Ni;8kXZQH=`B@6?kigMB#)#a*A`lF53iTR*2*$xPZ^X?v4e&_=y>I@q zG;W0t*sHK&Xij|d`&OMxvS~n7CQ$L%?+WAKST0_sOhxpPko_kOT#{Y^EafKlgpl2K z0`O5fQGfCJh-J7w%h1A<9QZ&=awh=B|Kqtd_-fi?hXBdQ?oK)(1_JtG#W-IGisWJ= z=u>AH;6Ra;0w}~9xP{IzfJ<%n}u6INeIFlO|?0EFSpd z(YOYqOJ(wg6a7edEAfyC697v9u9a~wmI00o`F|?F8BUzH!8*~d_HJA!_&@$e>8wpB zZg&r7Dg&jEt(DT_SqJBL&}vdI-4XX031@CY zREr8DeB}jn+(VN4fYtzdhe^!^DjHHir*#{lLII#_nS1+*40kg|=(C`;hPk_AJ65~Cjh;brNzlURup4)}We2v96w z!;QBKi7;WYTvQHmCsZUX|77QPgOC;Jz=89dHEq$uIqrE?dARR>0}k diff --git a/graphics/pokemon/dewgong/back.png b/graphics/pokemon/dewgong/back.png index bcb7242e35991c0c3f3e10de9baca3609c3781fb..8b58e9fce073a7b203b6edcd1049ff54faf0aeaf 100644 GIT binary patch delta 547 zcmV+;0^I%a1H1%~B!35VNliru=Lir42sl742aW&$02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(DOV1ZP1_K>z@;j|==^1poj5 zFi=cXMVZp1_V(u0)y1^5q?D9%Vq!|wDIlBx0RI60{{a900Du4g0RPp^&4YV;5D*am z|NkCebIt$&00Cl4M@0Xn2lB-L00Cf0L_t(|oYj=EQiDJchEu=;9KkjYzoeze132DE zdXGt+clH6C(M-w=jx$>0ff8+hbw1`qx(-$y4>P4A=;es$v;<%NBwC zu||>4#!0OdP=DOa=DN@ExS7qnt_Re925|XDhMstm3n(>oa1vi~fiVXvJIf?$0-#t&0RF~lz-SV1qukcbM%0U<-rh4fNrb^ z*chNA0CfcacoPcnDX4+~Pz99XvIGj;Qb&M9(GF~ku)r>`^a|{TyP-g0rvl~|BV!yq zgJ!tr#M1p+Cj$XEDz89khBk$n0FtBnsp5cf&X(joV0s`Q$7n4*qC@|D=_H!!nv-Qe lxeo$W;~f6x!rK1L>l>lqk!vZ=zd8T_002ovPDHLkV1gop?#%!I delta 471 zcmdnP@{xIhO1(jVPl)TxOG~CqDNaiA+OlQIw{On`1O%>LJ^KIu|K{rI#R>|ygZ&s# zL86u|NPx4zBeIx*K~EWk87r3BmjMOYOFVsD*`KqqGwEBrnIR#^z`z*d>EamTas293 z!=h#b0oQ}-94!lv85@~*R43KX+)|;Yl$pEuzWQWIy$MRk`&<+}(ju=eTky00?*DLZ zmy5CSo(}gqI7e37w4#Nu?@{RkleMFnn#eeO%9u!>(`OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_?!|M>oKmEFT3SIM?%u4lq@gF!(-00030 z|Np}x=!F0P00Cl4M@0Xn2lB-L00q}cL_t(|oUNC=j@w2M$5{|ZAOQCvmTIknE8yTF zvLF%&g1~Y`vr{Kuk>p?`CI!TZ++LM3h^`3S_~Tq$yH>)Wgq5rqAt7lY}~Tlk`r^HV$?0% zuW)vvm!Nl4)Yjif#;1VrP$)jh$k{Nuy_G<0!p3s>$zpMMCb*eQ8sV2k)}D{{yrz9 z&4FlUs{PS%!xoOw>NNmj8{!#K%kSdvY-|yRuY5ul;;nevD**eZiwOs=`i?8?y7#7e z0kr<=T7TR!3bKVL9v3$!`9ke*Yhhy^8|tGZlWy^Ptui0@KNFaT8I;ATj2nQ2N(+Gp zq45y3Vr5{VnYP8X;rUC4^u*d!Tn+=|f&+i))3q=S9{5Auv9U83TV{BHpJ@UxqlMe( zz?U&6uIos*fq%uqH@^nH%UjR=<*!hGlew`ASXIthRdp?hMDA#31iB9e2g7he9fl*2ZkL8}o zkw-}a+hdWIh`twiy8wzK3T1)qmMod05}+a4V3lR5Z8yB9y8ufNv!DQNPy!IIU8k@B zJAbeXXkF$4YLdvz9ra6q)3jI$329x6N;oY8ZDIr9wAQQfCG#>W0s7bTb~~ZzI=LQ? z&%p>P1MB&Eoy3zQSzV0B<9AwRAetlzu9n91LyC~&a$eLb&}8+V*C?=xTMv20Dn?ep7iBcv~C)r_)*pGo`Ig6YM;s*xHH02 zEi9*?3>f7?*#(|f3uSv4PvGsr0UrSiuu>>n2DtS~wQlAIzQFbX#z2M_)B?jHoW){) zgSus$oD3cZ;rHy_;j(5K#@&n4E00nJJYV`%6UOK!dm(+(z#G=&l4>{NsR6NgVSinm z@~s;>4E!&*bqgstV{}_zFBNOsQHKBVit(5)O=^d#f`BCZOj|?|uSnMO3fUpY(EHVd zQ%LL;Z=0p!HI_fXyu5*yR>+P5xa?1;-I8~470`b1D0Xp20+UT^D1c?(z3WPO0YT(h zd7+oy4Ky#8-#m;KHNe1ygRa4@^?z+0Unu4aHFk` z>_P&fS4vzU(sEsSy(IxrUw5S6(Sy79q}3~85E2k&nkzGm$Y*l=Sp~Tz0e{u`g&cAm zJXgS$1T26B0ZAZ$a9aY#3P|VhDf1#Vyc2yR0aXc@Q$2Vi4h#6qPJSvRpaP&=f{QDD zj!^hgeI)^T1Lwap0J1=w0_aLez@FTbj`#`Q6i3mV1}x2N=gkQh7|f8-FOH)5^`(-4 zJ*FQTJ*asO7y@vv&rgK}RDS}4hpM&-f@q(gip*>YjO_scp#7gN#V2IwmJFo2s4AK3|VLa0SJgJPY&n$gRV?V&v!6Aha3i(o2ni~UB2M7Cn zC}pt^2$gs_s+S<4r=HhE3I7D)e_pm1I0{4W#DDTZ+zo@WSk+#9`5R6NRcSQ>Vn}a| tFGcKi0s>{|Ryp1yARJKfK~002ovPDHLkV1f@94?+L{ delta 1564 zcmV+%2IKj&4Xq52B!4haOjJdf(4av7L_t(o!>yOiZrer>$CnEbAl!?Vd;xMPMON&K z#3!h*WPHfM5lE$nULsKY07d`@J-J3xi_A?YGPkOS+BpS2<$uFKfgURXeV4v~yUX3B zBz`ED@*+z6NaON)n_Abo^&6g%WEe>c1)c{j+9s`gys@c&-TL5{(x*u~?y3m@| zHMb-0+>tfvp4R}&QV&5idO~M)51s;a=Lw~;T?=ujZl|vT>IYH9i8fR*>M@C*@RW3gD|+1rrD=iDq`>L_4J=>()Xzm}BJF}K?( zQ{%d9ol-l=^J|PTjf-tqLzx=3c>$a!7>DC8-8l9|=p_I!UysKSfbhq^yM&BIUOJjO zADzwv;TWENVSqRWs{_^cr}Sk&W5V&%jF6sq${I~dAb;pjDJg*CWf%#&(W{YL0{-PR zE-b^u?up`w=xpfr)Cv2&fEKaAB}BG#OC3jLKFNL|Y@Mw@+cIU`3_w^~NOBfh5dtW8 z#w^UtvA8$#Y!H%(*qe$g@~T*5C%ltJiSxu zn8B>ro=!-b3E)cB)sS!AF$r7eM;4ytSrP9-m9B?$9L#!Tf{D+JVsiI>zj$2_A$B}5 z@kR8LB;N<1k6QM-yM$;HXU@b*{qonSOuJ} z;~;B@(CNcwv-w(Ymk=X_Sgy^@`eF0WW1WBqnV9uK^I^08^YQWVV~yYz9B+8a46MIC zK7TeeW(Of`u^9hiLEK}|1em-$@yG8lZtUvtH&wqa7yPgSPge&3kgh@8#Go&JHCQZp+7zdJs*e{*_U5AfG%RSVouAnUVy+t)8}VpZD4Dii$5Uyj}xv7k{xv zH!ph0)WTjB_~Gk-kAAyYr>;4ws-5uUz6AKhGS!ZNG!;Jog5x+I%bABvyQ1*)=X|pJ zSdGoDy{qu}uO~|)8@(QIz~51Lg#;{sBC?3k`B=5=QUb!yN?btVN0GeWk$`Zihtlu$ zv&+}SpHw6uv_T{@3`w7y_3gR@RDb;ohU6@{X^?;=&?8I|2q4{+fR+NxE_;=)L@&72 zw-Qj5fHu;TPoi0{*X;J!QUWS~l}qw)T=Wsl-qcJjRP z5}DZ%7<(gNyk>dEU{7G|&pMW8%+7EtFe(!Ve#V84(n^7GDrQ!hEw*3B>S&f(3Jfvz z{#5|m5%h+Z*HZ%Hluy>p7O)F}@8MEl@WIK(_x@nTcq=f(?5+*o9f2XHKWG&gQa^xJ zfzdK{w*sSO;%o&*+ssk|qkkQc0;3h+@&VyP0Az&iq67MXXB8d-Qj;w{JupmCra%q~ zh?Ea^V|iE|98wtRs!?g~j3ucw+k7Zx(FUYSyc}gM>scv8>QSRK+T|dGizN5~|V~1jGVg7;nnhn*;>3;e~SCA|PP-%l|7N{uKizmF5W&9n32L O0000OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_?!|M>oKmEFT3SIM?%u4lq@gF!(-00030 z|Np}x=!F0P00Cl4M@0Xn2lB-L00q`bL_t(|oUNC?Z`(!`$8R7^pn&d=IBJaso&Y05 z6+t8r6h)PZ=B7>d&{i?1tOAc$dS%lGZe6U zza^2By7U&2ynhehdw2Kv-d6x@jY06_V?(|`bY-~2ws zxFLYyRYmWQg{rP}3>R-0Ah#j8f_nKa^sS2=%<)Bt@l3vzjN1lq?^*~8;HKmG(ysq# zyfi@luYZ;!EJKpbdU77sM$4Jr;rh%)A~x88$C+}ARx5q-B>Wk(c{T$x(o=CWAf?Iz z30P<%1Yif54jk1c4S8(`;oQS*$#&FB9tYHdNjMMbwKUBLCiE+TH9W$Ud5Bk~k$p_s3 zC=FyP5+3?>&#he_v*lSBN1+5xW!UqOFaElR**xDe?=T2OyfM&=jjg_0o8dOab!L>} z?vdIPHReHl%(lnDbs2q|1ls^40cB}{+`3AcgB$=Lt@6xr*4uu%4e$fv7Bm35IRJ{> z^?!^7vGT3a;x1TDVs&x{ogCoR9Dalt*KcJe^zuLhyA1H^tHt1wd+Fx@>+5Nwkls|$zVCNHM8#pZ{%I2{7=h5BcLwx;(MALx_wga%cDm+pO#4)SI za(_wLGEPpqMmSI1haw|+&oi<^jX3zV zk_@TbE73M{$!pJlVDsvRwKO9;3~<>QQMaz{k|F?p2`KVWQvoB86o7fhe`qOr!Gc(3 z`GsBvcdU8&;^w>ItOV%#tk6~YwSU!0=r9jFeLv@|KNIt4IT<%|fOmUo0N$}CdPP8) z@*cmTj^pq;&3j%t(Jr*YvmW!#UZ+5{&8Y^oO0aG_SQUE9<$!V_RRWiQ0uYh;7*!j( zWE%+xUu$szaozXT^@aq59m`XG`%fM|;CkD{ASEEofUl|##GmouXC35*1b@`!33~XD zywJdg1T?@5Gf5zUXj1|b4fLk$Qx-{T2Pf8A0%~<&cP#Q&77O;7o&01ZpaxhGA{RHJ zj!^cchFSue>ck2JxyTd_Z=?il16h2U@`t=NrD#eCKW4u3_K^@6+>qTdrD%G4sU={W z>xXKa$Ik&<0^aR;Pf9>7Fn@$^y-h5L#(7Vk%!a_&91LLROu?4G*a9d!XUg_)EiiH& z2fn64N7+VTEM(6zr^VKL-95EQ&j<|J^?uVpheII=W?En@cxN4~0dA_#>aYqwTH*M%n9NQ()`>jDNt`4Jd)J6X5b8 zrTYNLh-{he(Fc@?2e=Q2CT#M0Pcw;_0@*7dBK~pOy8)pN_9=`=e%*Pcxi+A5Fxln9 ze7ie0%q`DJKiB6pc{Ge{|bnI0UF#MiRx#8g#Z8m07*qoM6N<$f-uJu^Z)<= delta 1567 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 delta 766 zcmV<a0s;N`29^epB!4haOjJdf(4as-KoAfRfPjE-h!{Xv5TLj)`1tskXc+kLh}fV& zuuxF&fS|BYQ1F1D_{iXN{Fx^J00N;&L_t(Y$F-HQZrd;rh6w@!vc`S^=^__~yD2Z= z3MUPj1VdDSjDbvaZilW$CnsYktD~mGW1p~hq$p8R>I`kUP=CJrc=z+jqlNfa10cK% z$m`@C0+xS4NK!ykv`qd4gpxIq3}?AIdT#P8C<GDFvdeMx+8n&xv@|pX&z=9fCx@3N zTnK<@VJuJ0(U;o+hFGveHm7!6LlNB?2ZexgD>lvZXupy~Saqrd)b+7_X~&x+b+!Uk ziMiIF+sUy=Cx0T)H6nhk?qGJ1Mns@A`SHHGi^4fTB5VN6^d2T9ryLAOv_tRZawdW+ z6n8+L@0PP1*B!vcLM)<W2GEj#fKN=UL^Kn@CAKLR=G1067KLykQzE7SK%8y+T@Vp= z$LicVEj13?;21veLF*K?E;)o^pb${5JRmR?&g*TA8Gn?BI}ucvqX(D@=XwjcBOoKc zrk?|$Y=L#bcZz}t#fOsDeE@d^WVrz-M3C2JK{f$!FXS!XgmPG5M(F@uNWPk?Gt`vR z2QsCE0r~~imOJdwr}zdIa0SILsW`qiKRm+>I5y3RmbsXP1$xo<>G`$gLvu&4rfnvk z27Epnzkh(v^wR>$`LoXNLS)qOH;K26)cM8Am>$+AA(L=Oi60#xS8<B4K0h6}$pp9* zJpd4dRAYEKNq(z>)B+Ffuc5Q-{B+<?X+vb27KY}vV{@|aEpH?S`68x(T-)y;hIALo zb2tUeBQs2!!^jvEV#jxCkR{s@Q0>)Ykiq&eym$TJ{Szofk58>om8)Ws)&kTVG|c@r z58h2U>RnJ3xzRL8D&7D%zFm&^7<#pHIZEo2ynA1?DyBd{m8<(}qIEdYINZW6#9qQB wfI`3|LpcX71z<hnJ?wBc(h(592mJT(8)_l@MKT~`_5c6?07*qoM6N<$g0%}^`2YX_ diff --git a/graphics/pokemon/dodrio/backf.png b/graphics/pokemon/dodrio/backf.png index ad1f5bcf51de9dff7ba8d98d29ae15a975181279..89fd4aa370c64a2d271c346ca3156f80a6f09705 100644 GIT binary patch delta 860 zcmV-i1Ec)h28aicBu58yNliru=Lir3IvwK`kv#wa02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<ACWE@f1uFC-dd!+F>{L$N@@WA z_KV)6IizX;|JCO9gQT=ULDkL8gM))XK|ufj0RR90zSMm000001VoOIv0Eh)0NB{r= ztVu*cRCt`Vl)sMJKoG{aScz_>6-epL)hF;+>0%jnbtP9By6Z5VMZ?kMk@75gfgmeJ zMvBBfL6l@>f7k1OBwUeX8_djazxj4{Y{vf8GN!l>2y=RaFxS5z1UhiUpMXM;N3`K1 zqhlvc8I(Z6T<aR6ZMyH&Mxd~SsE>;Ij~zRdJy9cQ*~lS1cJ0=HBPb!#P2M{mI{0D} zM5r07(%0U3(V}qfv@#&a$9&flAdA9vV5uOK@?Ac-e-`0Q@L&o6-xu%Apii|4t^>@& zGXljefF_&(L~>#VEyo%J2yjbI#I?8quxwca^Kdl)m}?;c^aPL$Yq$<_1U?XPX168? za3xOm)^2Mg%$tmn7y`zW(X2TI5`{6nbPy{E?J?r!-rf2d1TjddNJ0~kFr&^LfZGnw z$FmY5f1?0aj4xmg9l&;YE@uW-nSu!O692Y@b`6%OT;(Xjw49P+BjB$9BZnN%%fqSN z5DfsBuu)2*q}mO3DG$hGlom91?(Z0Dc7aH1W`SnIVn%P+zA5q3IKVd)e#Gp!O<y{J z8{n9x8ytDBnK+;^{Tyf8oG#5@!3B@`((wSVf0@lQQ-{_L&^{m4c`p&+8-G}LjuHDj zJKNCHWy416qAdyEJRr_x4Cay@_9DZW@g*9d%6WkUVs;ymVXt}YfT#RZ1Jt8+*wdqM z5>b`cV`X(6xvA_k9i%j3$A*BoxMyCPcvUoUk+okmYXW~NQm^(tXtj94R?IlS*%Eng zf7kLsKk_KMezt&>_p@JN4Xwi<m}=1Kob-Ho9A6GxcD^Ykww*66)zC{!gMC3__8Wlo z-FARSQmA&UyDAk15W0LA=wt|R?A){&lOQMt9@{CbB_2d|4?u}3>wSy48UiN2CqRDs m-{RE}sC&_@@-5)MuV3efow!|e-ktye3IG5}MNUMnLSTY|f`e`V delta 816 zcmV-01JC@32iyjbBnkm@Qb$4nuFf3kk!u-$(4as-KoAfRfPjE-h!{Xv5TLj)`1tsk zXc+kLh}fV&uuxF&fS|BYQ1F1D_{iXN{Fx^J000SaNLh0L01m?d01m?e$8V@)0008D zNkl<ZNXNC5zi!(w5XK1t1iadQ0f~?cL*3jLaD|hGOoBivK*m5OI=4etqm!L6la*0_ zldZ8&*dr-Ql+-#yTP~LGe*Es^@elcDgY)1%K$p9B2)_Ocf}#Wb3D>(n0Rhz>(T0mG zPF@-_E0jPYTz54VxBBSS#;JiJ=rVBmAD$gOb*CG_dAKr>bA9sdc7P#PIzj78Gg=-e z;U|+o2`=^|u3tv$rD(#slY)b)PR+G{87~su*$$KfGNryWlWn2S1XC3Nd@CRLq)(j* zCKcx4v3v-FIe;dt0Ho@`CoRVs8lYf@I?(mZgziw(0a;e8XEl}`pqmAdhr1boQy2oD zHL)S#%!F>SEwM7YHmkA9i8GlXF$Fk}(tW=QB!X^RU0NkV!LSUi;R7F(N<b-pp(UgS za>B*N1DNS>R_!B5xd12#D<K09Fdfd+o<q?JNHMSQ??6b~V1>$YgCa!gP06ZWz-<9W z&JE8A%PKP=od9qki&`HgF-$N+I6&o#I?(6N{;ja452R8O1N0Nhy}n_`zQlKK0oPFY znvm12e)R$~;8fQaJn~L6w?J=y`Y~y5jovi31zTL^tLFh;T9YTd3%yxDx_sK@okWT^ z{`}@GBXN1MF`=jJg)H8Jp(K2C0Nq3h@NIiO(iUUfmFR)EVFBJYe!b8Zd(9FHJT*Ui zpgUUUqyD5;B8{8wjv8G{USjjD7ZP!LB~yTI?Kg{fQUraRw!@2NOyEy{tkvVA3mPq! zlY(#ySX;Ci%_<M_nWgR4OtW6xLlR>RDe>{CBuKHzN4^}6mjj16-{!%)c`vQ5Axlhy zxgZJo4WRYybbx2A5MPNuVuAN0v-wQPd<rn^T-6^FrGkma;S_cf2O8f4P$F(eZ!r^7 ufH(I9@J_+_EiPa-k`WLay$Af~LC7x~?HEuCJ5Ln=0000<MNUMnLSTY$*l!a6 diff --git a/graphics/pokemon/dodrio/normal.pal b/graphics/pokemon/dodrio/normal.pal index 1569ba019d..d05aac145a 100644 --- a/graphics/pokemon/dodrio/normal.pal +++ b/graphics/pokemon/dodrio/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -65 65 65 -16 16 16 -131 131 131 +238 197 115 +205 156 82 164 123 90 90 65 32 -205 156 82 -248 248 248 -98 90 65 238 222 172 180 164 123 -180 65 65 -246 131 164 -180 65 65 -246 131 164 +98 90 65 255 213 230 +246 131 164 +180 65 65 +213 205 205 +131 131 131 +65 65 65 +0 0 0 +255 255 255 diff --git a/graphics/pokemon/dodrio/shiny.pal b/graphics/pokemon/dodrio/shiny.pal index f6278a269b..28e67a6f71 100644 --- a/graphics/pokemon/dodrio/shiny.pal +++ b/graphics/pokemon/dodrio/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -64 64 64 -16 16 16 -128 128 128 -112 136 24 -64 88 16 -160 184 48 -248 248 248 -152 104 24 -248 240 136 -216 160 64 -176 80 80 -240 128 160 -176 80 80 -240 128 160 -248 200 224 +152 160 208 +197 222 90 +164 189 49 +115 139 16 +74 106 0 +255 246 139 +222 164 57 +164 106 0 +255 213 230 +246 131 164 +180 65 65 +213 205 205 +131 131 131 +65 65 65 +0 0 0 +255 255 255 diff --git a/graphics/pokemon/doduo/anim_front.png b/graphics/pokemon/doduo/anim_front.png index bda88f3de1ac654b381591aee06f5689dc2b1e05..cfaffadcd74537fe4b018df090ea8f04f6990442 100644 GIT binary patch delta 993 zcmV<710MX42loe%B!35VNliru=Li)BJ1~yK&d>k=02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_{{a900RR60|Nj90-mG)Ii&B(oT2eU}?%u54y?=|OgGypj5Mp9t5D*am z|Nm7T@OS_K00Cl4M?{!*(FQ&M00SFIL_t(|ob8ssZ`wc<$8R$d&h@WL{)3(wDz{7Q z43))XSd#q|#NScNE@HK?=-Q!RPdE|y&6TR6ygNez=evvAt!mz2A-@mr*V+C)Lf*`5 zL%Z9#8CVG?V1LX?IG0yQyauq!3|tF88=HZcF~4TM8Q3%S5twJr0n3g5J&26{e!-`M zI8=dQ?^F9DO*rRu7%CZhgZO4B{hUt#x<L5;N;cN#OMoJ;I~lHVIHEBMc-iK4qy%s- z#q^FhcbKFLyi9kvn-Wkm#KM0Vp7SA@Qx*7$$5+eYg?~=qCzYCkfShg!K!TY053uS0 z!2Gor!3spG+tpg}lh3^NYYfn=HjH_<>spE6CVU!-;ZY35Jii`As-HtBhj#}f%n^>x zBjmhD+v)cP5aT23olkm!exS8zJ!WH3B|8Hae2VQ6DhI||^G*PlFJBV&4!~&y_jIa< z2%h>hynjRpn5?n$I6MPk5Hg%ds2<j{)xsMFfhh$633!&brj`NBF9oRu;qS}<j<k*- zHP(Rk@TDSK8$j{z+nEIrUTOsvuK+Hla4mql$nY{Td5dC^E-{M<NGA7riYfBB-hc5s z&r;aJ?lEf&z^@Vr<qOWgRXTt+`?4ZsmfR<uw}10MRQRNnWzy^oMM{GbF06p~dgv3p z*&o`_?*7Mhw?{_As=M*n8{2f(2`;fegYLHFqi}8Yy4#kI02p-l09^Terq^BB1B$Z` zn@Z}g?nC<y2XGg#Nb0T*peSei4GIP7E^Rb5VE?Sygy1G~LOZ(I?i~SObu>X|H^Oo6 zh<_>}+rvgx*5|!LmgfvW0s6u%`-i4NdG~w;pyGS7%^|8Tnl;Kh8>}^L>?Rf7r9!>g z?fOOoOxt!r0^QRP{kQ4FE~3i2a3t-2^zu#)3lg50uaox^)5`lf(3STy)5*Io!v7-g zW<Q?mL(i_=ZuW|H7j~d1(oC)hCV!e{b6R5BFw(5xvmN>kK%b*_r!xJc7ASw*FJ>Tt zTo06A_mz}PH_-x69wphdU;wS`z>(WMPW1ajYnJ`tP^)EsXo0u=;cx5-Hfco|ihI?y P00000NkvXXu0mjfK6}+x delta 889 zcmV-<1BU$f2apGlB!4haOjJdf(4bH_7?5aKxQI~LsBjPv5cv4`U{DZXU|^ttNa)z8 z*tm!Q00000000000002YK<@?s00SFIL_t(oh3%HXZrVT)hSx|Nha1G=P^pJt#}9zF z^abDnT%%DS;?e_Ba?1r-_NkZBCqUG`TNe8QeFAPgRA<+50)K1oQuWwo4hVTZ&+hzQ z`yWEyLmSqGyzBJMdB&KLxSJx;y9A8&`Hsl5k-mh5Y4BL61+Hd{t!B*E0`wl({3g&> z*rj~d4_pPX$W8U9n{mzy*Hu?=`hnD@n{&PfXaF5=S~ZrJ0QWIgP*&(nv3YR~@Q3~? zTu@fH6F@B<O@DEb1~7RAESiQ??cviz$Xi|Yl2Wd88dnZu15b$8xpmp1py~=#svGza zc1HLh2FrsAz>LjjE-Vi-@gR>!Rp(Axc;NZ~#{&YxBd9tioJUeTz*5YEp`sJ!i%5!R z!55FQV0d1^=4G<2)OQA70$k)=X*<V!2)-!5Mvf5V?0;d~IR~MOxFk-Sj8h;jPgHTL z{8@$d$^W`S<G8%W4XgI39)~x;4ZHyJz7C+Sj6nNd(MaSyPk-iRiNNquP+wGlXFY(D zy0F-40Yp9w2sHr&Z>O1l6GUbgCcwS~B)EaZ0K^&gnCkkB<2c)ect$ipm#4dZwk39{ zDX{smPk*+sh4p^@tsU6>T!rMJ%z3$L1z<B@k?W^~XNCH9)&#!y*N;!d#;D|c6&eA2 zqJ*0A@A0SckNa-Vx;6T)HFAbMlkd9dOMQ*+zHEQO#v0$Pwm+SWAKHDl2H3;C-FIa; zC;-5?^4&JzE6NkGAe6q_1^{E90gVEEmw;-Eq<@+_#@_=!MBgP1-z0MGh{h4_Zc!lJ z0P48|#{yj6qN=mL%^h-k-e9Q!Ii_X*00&|3o(hP00{f4E9F7s%JNwx3fx-U8S7CXO z_8v7)jOd?KgMa{<Pa}ExHVS|>>>We&PjvP!@2qZdpvB%#qSfBdffjo|i#B_2tMH%L zyK>Pl*1dtzyGinV!Mn|X9Vh6``U%5MvMeUL38S0E=^ikz1M)pjGuZ$w+Va<r=`I7g zKU)JlZJ@Huq!mERtsPf0V4%vx2-F;`xn_Q-!Z1Hndo|4u5_q2<{wjV0Z@?c9Pk#^c P00000NkvXXu0mjfjoh(# diff --git a/graphics/pokemon/doduo/anim_frontf.png b/graphics/pokemon/doduo/anim_frontf.png index 51d0d982e9545c978f030cdf262e895ff9955e0f..490a771ada08b8d7cfbb30ba1f85a39b4107b672 100644 GIT binary patch delta 1006 zcmV<K0}=d=2ZRWaB!35VNliru=Li)BJ2Z)@3dsNf02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_{{a900RR60|Nj90-mG)Ii&B(oT2eU}?%u54y?=|OgGypj5Mp9t5D*am z|Nm7T@OS_K00Cl4M?{!*(FQ&M00SsVL_t(|ob8s+Zks?5#`lIL6Z&+?8+7p@qP+xi zsE|+Ck*eNTK|Dth)bgnkGIFmyRE3j?WjyCfRjtl0II;H+QG2VJIXG6npLb@5WxpZh zCCo7$maW^#Ab(-`lnxTs<rNao0kk#)H(aN4GZ0bgHPkZ$2TI=nb<H_oz45;Kp-~@~ zESW@s3`|FFyDwSF7;Az+$}pNlw^N}r76Yh2@cK$@Y|PdGWzi@ZZm>CgV-DcQu4qDO z0qc@?@A%I)hMfvLb$8k(WFcjUxZXF<x=xq24E(^y*MErS1(xrnb+MEH5Zw)+Bz{D_ z2Ve>S)cfv+87q0JI~GeidB+;B37{?5hEn$~X{1fqDN6$0JbSl5z-wlqtTPBi^FCxV z%n{7aS14GSb=@CLvIvi?d*104>fkiI$q}9ND(M-pVhNz=h=$QF+!MfN>!*aH9yndW zhLhF$6@Og$G(4@~Q&FRG93Fwd4=8pd00Tf8t_HquN<lyX?!a5qhy~0q1!*|pwPpZY z+Jul9YruH;SQGioo`r)y-^pk4EKqd@fz>mBjVY94f2yx?{7_EqQ7y|=w#F<bAdT;f z3{xmCP9GP)iadiIwA*}d0De|L9JXTYORWQ({ePjVNtLJfDQE%W)Ob>=D%~FpMT&q5 zE(QUDtLPKF#2?0VSpLU-cSL4n(08M`J0J30%fH0^8GN@ZAB}6L_ua011i;|CJ#gi* zh2D3?9?+aU*wn&zbr<a`Y`_PfhQfDs_lJXacG#d%pzk{AQU!4TbiWC}M$u7xvzt47 zz<=tT6nCIrAji2QtoeX2E#xccaqbZ1SrZu;b6M;k(k0rvdo2MDzfX1rgtfhm(cbAK zsnu<?ab0s0{LJk=xzzxP_*3KpP@jg~H^=6HV(+|;wENBbTxaj3ACT~wUFRBmKMAe9 zp98ABpM}oebu0WY_HNekc|MGWz1z;8@n`OG7%0mu7bAj6&$4_;OcO?ymu%6ZZUDv% zy*m@>w_2e3cE4JH017=&eLB>_GVN3gKy|ca(|`d^Jq#SVb{p&Ghb{)@hrZT<`Jn?| c=7+zD-_;>JP33T)761SM07*qoM6N<$f|PX6RsaA1 delta 887 zcmV--1Bm>D2#yDkB!4haOjJdf(4bH_7?5aKxQI~LsBjPv5cv4`U{DZXU|^ttNa)z8 z*tm!Q00000000000002YK<@?s00S9GL_t(o!|j&AZrVT)h8HBq;RaZ!N>9PA9{_LZ z3nUL<8I6Lu^?;PzNF&QytA}1n&p9A!-z|%MfjmNAtFvoDf`7fcNWGRlAjJHPcm5sk zH-wy*c6Cm~U1wm9Q%a4BPq(P(pAt;<@vex|i9SUK!{E_SE4Y|Zx|~s8E3oc>&WC|M z!#3lyLEwf>?}qi4Ud}l$UAOrJXAnqldIjeRKugf|ZtKE|3g9lq3}Lf&EMEKu_+h=2 zF0{<MeKXI>5`WmV1UCmk$I8N9vxd(%!ruB<k5z;<1Q!maBTtyuy>@9_+Evp$>2Bcv zS#>9P5Tiv)05dwDxp7fFiG$>P)jZ*>^uYBY<s}Nn9GX5d&Le4FlH<cX7&m;vco|9a zI`OkdX)r#{VDpM?YWJP1=Kvpa?6h5AJOp1Ppc6+Ja({H#cELfMK)CNVx!w!1>fOOO zb^Itp5+3)fOrUMZA+7i5>N;}h23~-1Unj6!xdQEbWkn+HdHSB0DFVYwVfi8htn>o3 z)P;Csc=@fX5wT1Hf`7O2(3AqBu}NT`5-{8VGYHZgYs_?YrfHgQL+lZapvSZAF5i&W zi}SkHzkhaY0~<(o$q%(){d*abMOE->sT9C^z9g3qjOQh&p8-}#F7F@8wb9A>GBgVC zM2U4~=9#-Ex!dnt8@bz=IOD#FyDoBRpyBQTY*P()_vpNtF4WvTuywIhbGN?7(ExyH z&0Uq?E7}v$AQaqHUQs~l7eG)TcS&5S=Z@*mz<&>syJS%*=Z<I^;qKy+C@zrKxdX=n z++fFUlJ#xwklXV<GzA5QW&IFW0`Fe)mIIJ;M+D?M|Au&{9~Bo2)^AA&O1wvXg+RJv z@1CTfeHv_E8WR&j3-5vgW!*OHQGs`|ACSbEvBx&vk9t;t_hwVK@P6DD3cRZ_{3m!f z@^B*QkBsalY;}U&W`UhDWV3$4uvwm`L^omd@-*8)O0<Gv$Fp1(V3n%)<$bozLGI7i z2p-l@Ba@XH<h~MDGhm?0#3(pS*$LOo5A`z45A|M6^TWQF^Zf7+>n~(UB7WyPlD_}| N002ovPDHLkV1hF4uNeRU diff --git a/graphics/pokemon/doduo/back.png b/graphics/pokemon/doduo/back.png index dc2b09bc9e5009854f13d4fcd200f571d0af1a2d..6bac7e57ef3de21bf111adaa9b8a690cda92b77c 100644 GIT binary patch delta 630 zcmV-+0*U>i1dj!fB!35VNliru=Lir3G$B&?z%&2=02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVO$_{{a900RR60|Nj90#pYtH#X)nFAX;+(?&hrC&3}ueoJwM15Mp9t5D*am z|Nk3!)GPo100Cl4M??UK1szBL00FZ}L_t(|oaK|TPQx$|hP@?HE5DtU4Y81P%#vQF zs!M2SrR))?4*;lQMP0g5P#ytgDX9=W-T>h?ablBeBUZSfsq%mN&OXPC{m1G(bO4VX zKyTh9SRG5O!+-Dc=2(0l0m?khj{uP;#3%OBIqQ=>Y#~H&hSU3;uPKKWNC1QwWc~Gm z7C6EK5DvcIk&CeRu`DrLX5<nB0cFiHa)~TbKu9)_fKvf5CUg6u21c}D<Ea+3fxWc^ zmT&feA8P>1@j(N)%GEBSP&k1m;b;mhu`feWz=6p%z<)7_VuS?%R)9P^2q18DMIr%} z%cwjWeJh9w)?=wAALItmY+6)6_@x64%|$i&kq+!M-9`aO1NGRTSdl<c1EAfK-78@T z(`B>B251yl>Gg}c%UlC6tdQj6DOFv#wg|-P@TRwm=X7-f2<5-}x;LYgZ;NIQnFdT$ z&Pszmr*Hj7lVAD_<Ws)qTN#^QxE(|6df=&6@{t?yL@Hfb3FeHba(F`+x`Twu*|wgp z7n26<e8}5}6AhpYx&Y!10l4GS0&oW{z!1RD^E-f64{o+-_u%kb0NEd`Zw-Q4>Z4KG QZvX%Q07*qoM6N<$g2V$2<p2Nx delta 521 zcmV+k0`~on1)>CyB!4haOjJdf(4bIY5O9znsK7wL;9w9C5cv4`U|<knU|^t_Na*0G z*vN<g00000000000000UbrXaD00FH@L_t(Y$K{o=Pr^VH#!Hh6VYAo{$kIN_F0Fq- zbM8mw84_oAmWC)ZyDRR**xeB0Kj%q%?Hzrkan(0a((jk=-G6;|FSV@ySc8`i;I#u7 z?7IwBZHj&T-MzKR*Dj#cbI}605$E?f$oE#C?9t<#hqpLB2)3a->`(&0`7G;iK4^o4 zM*uv*hfhHRQkKO>yNq07$f2lFM#tbPAZXd8o0I@tkb3W?0;aUXB2q1A2kWk3VEbkd zI9UVOi4PjU;D2NnZordJGht{N*!-sqixiHG(164s(kZ3@C{(f>LI@Mx!jpi~rBob^ zz7<3dt60k9Lty~=?J4*4r~@_4c$xfE2bP-MLIFqvRcw&1NFc2M(57U$B^-i$S1)pF zH7&04_qCd3rU4j~h_imqRTri$0<k>2@z>!gU!4I0`G2n(_c}`XHm!5WG+?N7t8hT$ z+A$QDz6J6r-?O=t%^Tixz=<P>R4e%qhCGy(u`CbC;VQzLz$Bh|<Y3IJbR&m!(9VaP zJ{)R*=r91M!vNxo^9B&l8h~K{lgRG?8a<fVqS=GNZvp&^U(#>Qnu6z^k_e;#0000< LMNUMnLIPldMAGz> diff --git a/graphics/pokemon/doduo/backf.png b/graphics/pokemon/doduo/backf.png index 3e0ad49e509a02afbe7c9e60f359ed7dbce5f7f2..0a208d630057e688d739e104d6ec73c41edfe9c2 100644 GIT binary patch delta 646 zcmV;10(t$j1fK<vB!35VNliru=Lir3G%Z_Cj2{3102g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVO$_{{a900RR60|Nj90#pYtH#X)nFAX;+(?&hrC&3}ueoJwM15Mp9t5D*am z|Nk3!)GPo100Cl4M??UK1szBL00F~EL_t(|oaL0kPQpMChWAzyn!eqpH{->YBbPEg z5iST~(tD%f0hAE0QbV{3rq9p|mH-*wz_`$EcUJ}*uR4bw`hWTV+1XAR`;XOpssWyB zfabW)U~x{dj(^YO{+xW-2NZgoodNnj=O5UN$IK=(8l3as0!Nd~SyCQWAOPUJmD<ZG zZQybrfV;STB%5d)WKsM!Ny!!i4n^IjWQ(jXfshOkfLj94BlX5r1$1eLwJ#%R2ljqq zV71K*_|^khZW}bfk-9uZKjdzpnK)<~So~0iMGi+M(|-WhAo6aK17Hb=yMq7%SGR}+ zAax-XSEC<gH;=FyOF8)<GXQmHUIO8#4lGn0FDKvCfvp1AS^`J|)z~0kkU(Ampl!)^ zLO6tRQoUU%Kv~?xcW-i+9Sy*+M56s`EK{6WrhsH#0HcTLDlVI|XR6Dc1VTit)?JNq zpQO2(Lw~ghyB9W)IxD^peNN)ng4uPO0kaRw<!pp(e&LNF3_Txw8HLC)LmmiAPgJza z7*WOWI?(Z25v8+DHC=y5I%xMpZXXUbfO60cU|3@SUhiiE@LDH;VE`S!T?3qCIA+9Y gh6BF^kp02>0!#H(<;L!W6#xJL07*qoM6N<$f^Jj|d;kCd delta 538 zcmV+#0_FXm1+xT@B!4haOjJdf(4bIY5O9znsK7wL;9w9C5cv4`U|<knU|^t_Na*0G z*vN<g00000000000000UbrXaD00F*9L_t(Y$K{o=Zo)7ShD{_3u@M>u%0iB?m!wY+ zxx1Tkts>^`ED@r-L>E-0%&2Pi3RQi%8WJZqF^#&mH)P2F>3=`_w=W^&KUU|t0eEcy zI=d!=#W}?~KGU~z@|6Q9^o*YY9G|g!>|{IAHuh*S#=ILG?m1nXJS<NDz}PftuRqKN zA@c!Pi1SZw281k%4bsH8M2|sUgTx$zBLVl!E}gIdplj4y*CjA9JIs99!t6lqY6jLw z?*S)k04p4U0)J3A*@fe>&{Iq(>IN1&lx7jZk>LsuYD6?iBLL(wSq2_>p=!|=fYgPQ zAC0<|c+<x+mLhqNYk+!tiakB5Ky{3i70FLjV6L3=Oaf>I%Ge-U7=fq+K$(*H-r(S7 zY58`wCv}U<?0qR`nJNIf1!6CsGTDW0t5h)E<iPN2zkkY##kIH9Dq{(_h**w$73D*k zL{$#uAjB`ECv}qF57a*`$S+0&Nc%8c^j66F4R6_C2R`_+6(Zr9+!L08sD5l5t~|Uk zjDu<4I2gBOy1s36P|n9Veb`d~-e3TBg8>BHpA8_G)&R`_#{Q@QsP&+Fi+T?VzXk9w c{z<<96cfmZ{j(};<NyEw07*qoM6N<$f=rX|Qvd(} diff --git a/graphics/pokemon/doduo/normal.pal b/graphics/pokemon/doduo/normal.pal index 594e033255..86151f0ed8 100644 --- a/graphics/pokemon/doduo/normal.pal +++ b/graphics/pokemon/doduo/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -80 56 24 -144 104 88 -184 136 80 -216 168 112 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +222 172 115 +189 139 82 +148 106 90 +82 57 24 +238 222 172 +222 189 139 +164 131 74 +98 82 16 +98 98 98 16 16 16 -248 248 248 -96 80 16 -96 96 96 -160 128 72 -232 216 168 -216 184 136 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +255 255 255 diff --git a/graphics/pokemon/doduo/shiny.pal b/graphics/pokemon/doduo/shiny.pal index 40d0d1146b..4b19c908e2 100644 --- a/graphics/pokemon/doduo/shiny.pal +++ b/graphics/pokemon/doduo/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -80 96 16 -112 144 32 -168 192 64 -192 224 96 +152 160 208 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +197 230 98 +172 197 65 +115 148 32 +90 115 0 +238 230 172 +222 205 139 +164 156 74 +98 98 16 +98 98 98 16 16 16 -248 248 248 -96 96 16 -96 96 96 -160 152 72 -232 224 168 -216 200 136 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +255 255 255 diff --git a/graphics/pokemon/drowzee/anim_front.png b/graphics/pokemon/drowzee/anim_front.png index 3bab742240454a70d19568e2f9e14bffe06cda44..6c4f25288b7b5f1fc62618d305b75719cbb0f043 100644 GIT binary patch delta 1108 zcmV-a1gram2<ZrrB!35VNliru=LixEC=R{~FNOdB02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_0000|IUs6ML5p)*w48f$S^%tz0L7#r)vQYP?tcLP?sNbD|BE0w?m0OC z006p#E+GH_00Cl4M@0Xn2lB-L00WIlL_t(|ob8q|PuoBg$L$P`x^bjJN?IgJvcN`; zrEDd~!b}&YWHE{(Rh_U%`z5kOI;2(#1zUbhT|kOIKqbV|wNe<_$|va1cjqM7cP|WG z%R`AG|9^h>zkhSW`#a8aSyc`{;=AYj3jv6H-wPmeoMV~@`vAe&#+p<9PU~qpj?U^k zYhLeaiPqB;>U^i&OJ5N{S?OcoJZis4dj!x2rNcKKjl48%6I%d4j|tk0yvuP!0WlmO z!6||Pz{mpdVjSJx_7?&^_W%6nCPp1<1mGzF!Vo>c2!ANx2<8>3mu(@`A}$17d=<7? z4z)+<035><C>)fRhK_#(qe*8)>9IUD0H-$&)z0o7Y8fC;lLFv(eYN%O-EVE<L`pd< zHn>WmJE(TP{L&2)1O~<#_%Nyts?}jf5jNm-(3QGc&CUTowu^wXqVDTTm;=_=p$o}S z?GC1ESbu;Uz;LFM0NMy19|i?Dehx@1lUOClRWcxe{i%2%4yiAcQxX8@N)rM<y|aOa zIJ`jZy~xUT*${=Y52C1xwI_gW^=6qU&GnWbfyQp3f!H;HiUDxbWrgRr(c%P9=Z`9< zfUP>umkGGsAP9hOEi0u?1GokjW1Kg&-Zb^B#eb4hVodkhvVh9Gt*aJUqZ-WCEm0P# zLpg6-S#Q=Y54D;c%<igeY)H$4%h<fD3!5YAfAwSK;OBa-f37eLpVl!O`0d3BCA>rc zGfH5OOkHaD0}`MT3RV5-P*n+q($(mW0Yi>TC={S(e;nWb=&OW60YR+N!Ry-_l~5LS zP=D#5PbC9wA=U)MR5F-)jBqwyYmE3|dbq^ugoRm#pa8tQI+-vX4~pSp4n*!`^&y*l zgiBAdf&24eG2k$VxnJ+^VIhE3`%v?B(LgywAd1u)LuQI0$|tfKRb`+}B<4Op;Rz>l zfPWBB`wV;6Iufv&9Fi`BXslM214U7Qmw)K^B}a^{WQ6&+x~J28hG}g@+9o`ZSpw9> z0_$<P>MlQ@FRbU;VQlkB0IM<64)zuRm{7!?3L#=2&g}qFLh(R|y#qnd{#-g(0K7B; zh-Kn&^tVXB3@BEFDTzj*fiQ<&WxEKpEPyxj7VX)N0N<XgL^{C9y<Es21Yi*6K24cH zm>w9<@`tXvoiB8F*qZ%bbOb3bp~6G%rV3wgt``6m9&!WUeJeNK6qhja0K)*`JX!x; afcOie%vnv@>eQeB0000<MNUMnLSTY={p%e7 delta 1006 zcmV<K0}=e`2!sfbB!4haOjJdf(4eS@0B~3U@aO<gI3UodNciY*0001JP(b+j_=q4l z=r}lta9FUIcxX^S0002>$%`2P00WOnL_t(oh3%HHPuoBg#vLn_*P4h*-GZ$oLnr%T z(t%2m0F@!i5Oj*vP7ujmQ9^nus<N=KR!o^YR0<no8A0lDuz#@9Efov$-_UpGB-nQ^ z8M>B-5=H)g_wGA8;eD3%Tt*e#m-udb-a-IE&$E39Eo+4)+!BDlzSFP@pJ+XfyW#ro zNyDxl9MXCm!|v%xxf*{afP&P!aC#b+U&K`cD1p@B?P*xI<G4&50RTNlXfw1ox*-Jw zu(Aew2>JkZ1AoAaK{y(f76KmjfBoewKppx7U`qj97d=27C}0id70Q=s!Brw|1QmSc zj#+S(N2md;z!b>cC_8p7Zw>0>T2JZ$+tUE6+I8j0&M*5Z!1kgX;8i?%^vd~9Wn+~w z*3LILh@sLM)INMy4I%_O+CA`~KIjYv?V2P^z^b7ud4F|~-Us|x&I49YuB$MZ1IE{( z0#RF@4yJn;fa61Zrjr2L@Sh$A1z27NhzyfhMaWdtA%Lr?_)gqWUnr|605+v21b+Hu z0!?xE4z=GREz@OF<jTAed0jM?0FUy`Fj1WAw}J$k*SQAbS_g(2kmxRlN%k1G2?4Z{ zCpDpfhksU*Egf(YjUa&J;Ycbi8o)iUI8Ty^(kHr}wm7tkoU1+$1~8nrb>t=us=;jE zB4uIFX7jeg?Mch<(C@R(Y}IgQhZ!Cm&gWen*s4?itDh<ZKi6~pbGfd&T*qwSl@})z zcLM>;D84x|RmtHGNPtWzRF$SfRVEZlm!mrX41YN?p-_OF{XsDLR+0&Y0{lRwgVC8x zD2qDCbWoy_fwB-N0s<--Og)A;8}}7P{4j0Y;&{y6G(%7TUOpa=xrzt*a4`o$XMB8_ zPCmk=&3MQ8ak&_<xW%217Z<P)!0Ny0d#Y%l;35!)a*sCGMHl5&HV6mIS0*C;oUiZ> zM}Mq?f8bN+bgTO+67W82lP>+RD|cocNl}0usrbd}ocB^fe_R!rJt}H#t;b9gHn21S zs^Y%!xE#64%jOH?dDb}JS_)t_XWISE0ss?=xRD`5T*0OpK#C~d3vqKV=-Ho12Md6& zS^zOjJdOTa63_#R5n+m=nQI{Qp*MWY1827ekW8``&DoAX@;FzCbbyolD3?D7KqK^X za*fbE@FdM2s#<2gP~qWW_IptgB)^3W51B>7WP7rm17vu}41DJg+j*bgLdydj1BA7- c{<{G27n}=rU_ztswg3PC07*qoM6N<$g7r+yKL7v# diff --git a/graphics/pokemon/drowzee/back.png b/graphics/pokemon/drowzee/back.png index 3489ea9c354101c3be20a836e0c78ede2605b2cf..91ced85866f20b7f05412385feca16bdea1e7d97 100644 GIT binary patch delta 599 zcmV-d0;v7b1cwEXBu58yNliru=LixEB`P<kwHg2b02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<ACWE_e*gdga}XeuDN3|bV$EuM zb4pT+Vrry&gT0iT=CsA`&EEh2|BE0w?m0OC004<b7;pdp00Cl4M@0Xn2lB-L00FB> zL_t(|ob8moZi6rsg>i;t#S0ZxU!Y^;E}7G%Zvl%D&C-b|$y1<KjxOnvg$Q@AlzPhE zhw3$u9}K4Lf1V=+B+i#}j~x@oxylshz4kELsH7KwjY48Hw^BYRrJ|Km^8lxHj3XGq zKM?v#BBdZ`12J$Z5y)3+58!sph@{q9`+|0q@Jhc}V1CLw0?4ugV6z7=?I?Lu`Vvqg z4tK4R1d5{%p}3W~3B-_PwGVOXOKC(50g9sb0XSrGe`f|<hy%#y+ze<aoqaZE#0GG8 z$mQi$3>Qsbd>`^`+cN>??;N&06SUSd*E*rnMG4aSw!S2ReS#>j=MugNq}0P}Xk7z< zN27I;S}WjzBN&ldE1>6kkZ@}SO<+P`1E~HGD(oGp9#5#fqe~ly+5}?VKH)FceH5WH z;!ByFe~8v11TEjO#0r$>8(*Qo3PAM=9e47+J0bLIV9*A1!WP1Mt%C=A!X_p`Prn3V zlQ+iL6F#1@$J0vA$BD2~nDdIaI!Snr39!;<;|jR^gE;}y@<#Q>hE4}?6cP=;1u#mP l+Y6w61;+mZuKJ690CQr~!Iro+761SM07*qo1w^hwV1n1=0CoTX delta 545 zcmV++0^a?H1<?eMBnkm@Qb$4nuFf3kk!u@&h+t@FKuF-Qz+fOSxR99m*ys=t5O_#f z`1tsUC_v~?P_S5N$asj5I8Xop0KJA8;s5{u32;bRa{vGi!vFvd!vV){sAK>D0jfzv zK~zY`?UX@k!ax*;qX^mRh^~_<F>5oVo}dSC!ZQ>~7cI^@O$kF!B0W%d#aoD*GH2+2 zn;12jWKz2K2PcsK^MCJ+Gdef5L}{-*^f!X^0<aNC3?^2p03n1w7h>XJwT^NwM$mhN zUWqRRcx@m6$`}ICTx<cdjv7AGT5F%njwbTbk7t;l(vARkdIDgxg*@$O@~!k4pm-22 zz4j3C*@uw7v&aMjNRrBjAT1a(B8C8eaa{QT6cV;H18SlG>@G3`8cG*0%^HCLeC#4t z--_X^>GRKBl&pFxz~qs_s;7e1dXZTxoK$PVZGBrW#Isl6<$7(RFo9I&xQ5ml0CMTC zNos8Y51fk;Y0r>pmII;I7Bqngo(+)t<4SJtQR?!pwD*|F#-TQWKzC2**t(B@Jah(h z%E;I{1efI<Blaov`Nk{c*|*_zh0Z(q(47z#6)<W8I$;H2HS6dH->8F0$jdL`s>72~ z>I+}*)%RtR>v3|?MPbe}KB^?1J0_q?UmZ_C{SW2>?8}GL8yh+uz*$H%{1%|3R9P>8 j`V%<*3%KcTInFQnbaZ=@SsxV)00000NkvXXu0mjfOg;3- diff --git a/graphics/pokemon/drowzee/normal.pal b/graphics/pokemon/drowzee/normal.pal index 0ea8f35c4c..3293e401fd 100644 --- a/graphics/pokemon/drowzee/normal.pal +++ b/graphics/pokemon/drowzee/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -168 136 0 -112 88 0 -240 232 0 -80 56 32 -208 168 72 -248 232 112 0 0 0 -104 80 64 -248 248 248 -136 32 56 -232 56 56 -136 112 88 -176 152 120 -104 80 64 +82 57 32 +106 82 65 +139 115 90 +180 156 123 +115 90 0 +172 139 0 +197 164 32 +213 172 74 +246 238 0 +255 238 115 +255 255 255 +139 32 57 +238 57 57 0 0 0 diff --git a/graphics/pokemon/drowzee/shiny.pal b/graphics/pokemon/drowzee/shiny.pal index 5c3e3c9d9d..5615fd6c31 100644 --- a/graphics/pokemon/drowzee/shiny.pal +++ b/graphics/pokemon/drowzee/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 96 104 -104 64 72 -224 176 192 -96 32 48 -184 144 152 -248 216 232 -16 16 16 -120 72 88 -248 248 248 -136 40 64 -232 80 80 -176 88 104 -200 120 136 -144 56 80 +0 0 0 +115 16 32 +148 41 74 +180 82 98 +205 106 123 +115 74 82 +139 98 106 +164 123 131 +189 148 156 +230 180 197 +238 205 222 +255 255 255 +139 32 57 +238 57 57 0 0 0 diff --git a/graphics/pokemon/electrode/anim_front.png b/graphics/pokemon/electrode/anim_front.png index bf91ac0eb8e6efee3355bda8c53e1ae2bdbdc176..739501732b86248fa0d2e013c14f034312572e34 100644 GIT binary patch delta 838 zcmV-M1G)T`2HggbB!35VNliru=Li)AEdwvgq(}e&02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_|NsB)?(WUa-lUwIT2fN~0RQlyh|qwL|E!$<gMV88QXuX@G1W0agAfo9 z5D*RzT3-MF00Cl4M@0Xn2lB-L00MzYL_t(|ob8r9PuoxwhCL)}D$`%UNxXDGBBl#f zs4&i2m1||?$FZ}tTP?Q|E2w{f-ZYKaz!qYyP<rl{V;>*8YAdxJ{GuR~_sO}}cEo)= zug`y)1*W4OEPnvgjtq`{1whzBVDImA5hp%I190$`8{lt&@k<6ct^g1=N0<R6&>Ud~ z>{wvj7%|u<z?=ZX+6oA~CV<$j_PB}gfdH^@{hR}a5P&d!pox&IF@%ZvBtQZRZ2|%j zJzxszFA4~Vz%Ys1WPKBl>dgoNHJ}v;@F#KifdlaKZhrs^2(bI?0PrQ;7I*-*z^n#* zFCT)iD;&xiaQ6<XQN3JMfl*rR$EufJ9r#e~FR=ew2d*lFswv>z-=*ofYG0&S=J+CC znEZ2*rx<LOMS;IF0*vHsjE%}|{6^l~kQESE!a=Mvg<NLYM*?`cT!VS$uqScC0|juz zRMi6ZaDR*0C)%qKg??D7X9jrQGbxL;fHQT8k{RH6Px=aVPj7-9@g!X~TwfttdL%ab zA++|G4QAER_vzE8nLqW5$o?Ph@QY63WP5Zoa`5;3!U4bU7h9m=7j*$){Ng79G6dMI z_KZG|{4#*Y?ScUG=q?=x=7I$#V80CkOauoAY=3kT#W4C1SwJgD#2bn*E0|l|3MB3# zSWD8Uq6O*#vR3b+;fP7(R+z1-z{mkXxdQPEyM-ty2N1uw1c=Qwn7b5SP`_{&7?}Q$ z9<BG6_DMv#M~R_+acw<mtos=?7;p4N6Q&L`DH*@GzA|n2O6IIzpf$W#Em}g(`bBO} z_CKPCdB0c|Mv>zEqZYqVmK4X~=~3S17t3$HfBGC9rQI)-XSMddU;OL*0KiPAFWOc* QH2?qr07*qoM6N<$f*}ld4gdfE delta 766 zcmV<a0s;Nq29^epB!4haOjJdf(4bmUQly-m?(XjR`1sAu-VhKF)iFW;QXv0>T7wV} z?m;mC00000000000001l&STdA000SaNLh0L04^f{04^f|c%?sf00007bV*G`2j>O{ z0yR6uyt97*00MbQL_t(o!|j$aPuoBg$DIrrn6Qp4-QuH5H-G1mp{#K~00cu}id4z; z6ZEQNL{;6n11lnx4w(^&Aoy~9cjt5L%ezEXtE!d!P@;(cFYlgniSHK#ZT+JaVr_`K zAz=BD?tY>GNJDR)j5iUl6D$qD@h;UMSplOX0@$wsknVaKRKSs^!MFrQYc0Ab4lr<l zPGbcGP91<9)PHjvBAq$_gf<^gKnG%ACXY3dI%{-bXx<6X2ZgQ!3=!R60_v3uFyLUA zz8$hT#0T|Hj(}?51!DZ`+s}al@cp&{2{0(<+yLN%*%4>}R=`;U_*iWMD_1xd4dCty z>ZNjVQwMhPdOlLQ2%5mRdVY=hrzY@JBUJ1H!TnvHe}7l$+Z;oQ59bRbp9`5|VKOTU zd|o=hj<}65QFR-=5%amT0s=EQj&w~xiskaz{ar}00JG<CD6qpcSZ^^=F@r-KarwCZ z+mxcvo27E1K@jwWC>9J}sY?`()cxU7U!l&$lmdE}!d6D#gDN8P-NkyD-h^z!jWENy zX^)Gx+JE|^{=i|YKfpGB7<&)@zvmChZ~Md8?+;DEApBvAU~~Wu>N%kYPW>`~$7$#Q z?$KO13=9|v41rt888QlBm{`e)DLvpNpcRAD2Exn=ennyB3O>P5Q*xhRER5s;8*;nC zS<@dZ5LYWW{!os<<Enw<4-Wv5xd!torPr=M*mnzzO@8hko%avrPH>&0q`3a@a<y_W zoItGk!(0<4PQMC4_`}PSNz?a2lKvpX=PxQn3y`Eg$nxYaiiq}ySz#0?I=S%pgR-C~ wO7||L&mU$#l4S24I*8vNlt;<dAO6?+34@Mw&U{*e#{d8T07*qoM6N<$f*=N2Z2$lO diff --git a/graphics/pokemon/electrode/back.png b/graphics/pokemon/electrode/back.png index 86d20c029e3805dcbc20e8777e90a40c4fc1d289..90cd9957c8c4a5669b84dffccc7dfc64ea01f1cf 100644 GIT binary patch delta 518 zcmV+h0{Q)m1h)i`Bu58yNliru=Li)AEH4BJ`RV`w02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<ACWE_fB*mg?(Xi*&EBM(oLW*+ z{{a7xsOW%**qqJ(TBQFVbN?}7?m0@;5HW)g5D@*R1P=fJ00Cl4M@0Xn2lB-L00CP` zL_t(|ob8i6Z-X!phFMsPsKVF*ldhG*!B|Bq=^7zEer?tN(7iE<L{^|`=Fs{K#2DFO zZKb>e!#$7hf6fRD<Cedf924ttMlef_V&-JXW3J)}8Rd0`6MHiivJnNJki}#V6YCd& z8SX+Bk`X5!8g@Ks0FnT{+#+E`UlM@a$CCy^Kn}jWlp9P1aK#p8SCb}Si%`4+ZzS{_ zz;?uht|D_-4KvIaQIv8Kh>C_exX!SGf(I#Nt6un4e@zIPlk_u`!Um;IFcZ}ZDUONw zo3NBSru@M_EK7OGh%e&k1rS1}<*?=-UV25~*Es2ga83y94<@vF0UqXrPZZ9jmeV&b z6gs}$bpmbF8`gC9eqcgHX%i`qvwBf|F`=fEwo@ah8Q&kDv4h0~+8kw!r}m})WDEi= ze%j$SG+T~oQ~G2r1eUr_#SgUjs}(5Rov9)x{7bxpam#<oFUGSFAPws|&;S4c07*qo IM6N<$f+$hm{r~^~ delta 474 zcmV<00VV#o1d9ZaBnkm@Qb$4nuFf3kk!u@&SWr-)n3(A3==k{f$jI0b5D+*>&>(R5 zkf`VwFmNzn=l}o!00000000000MiX8xBvhE32;bRa{vGi!vFvd!vV){sAK>D0c1%; zK~zY`?UTQ5gD?=rVad>mKjHzJiX~fPSh|rSbtcZGYo#iU#MCLS$OE*G5k&$dp0YlF z12Lv{Sz9UJz;NI1?mk<_y6TV0MLA~MBdDbTv0c*Z-qra&8R&MxC+U0)cmo$GA*)di z8|xQ<6VXZq{DDtmBvNNI02BbII>P5gssKP9ozVaZpbs=%ssqLVL^6dKATz|!jmYF3 z!~>x70n$WnXe+7@n|_CVCyR<MKsP{tRpvsJ^bs`vIsk9e0k66Z8E5=%hZdM4)B?7z z3mD*<P~5~!n=ud{@vvsvLxv(qVg^70p3#S`czD4tfH=m^3}jQlI(_FrZU*3K3iv=^ zUmAV(C4j;NERHR}Dt*F+9Y0STs2Qt5O*^j_^$Q0Y##kQyXy^Xn{EQQ39AMQ&S+%k2 zP|^ph2Uziz_orD1n^h$xTM2MAoodmL<F8gAaI^1;p?3I}#3$>j|0B!#2BdE=*goJ? Qp8x;=07*qoM6N<$g81Faw*UYD diff --git a/graphics/pokemon/electrode/normal.pal b/graphics/pokemon/electrode/normal.pal index 293f41bffb..3710a6a0b7 100644 --- a/graphics/pokemon/electrode/normal.pal +++ b/graphics/pokemon/electrode/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -90 82 82 -164 156 156 +255 255 255 238 238 238 -248 248 248 205 205 222 -16 16 16 -213 49 65 -255 82 32 +164 156 156 +90 82 82 +255 0 255 +240 160 136 +208 128 144 +255 172 156 255 131 90 -131 16 16 +255 82 32 238 65 49 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +213 49 65 +131 16 16 +16 16 16 diff --git a/graphics/pokemon/electrode/shiny.pal b/graphics/pokemon/electrode/shiny.pal index cdfc50be22..4ad72a8909 100644 --- a/graphics/pokemon/electrode/shiny.pal +++ b/graphics/pokemon/electrode/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -88 80 80 -160 152 152 -232 232 232 -248 248 248 -200 200 216 -16 16 16 -56 72 208 -32 112 248 +255 255 255 +238 238 238 +205 205 222 +164 156 156 +90 82 82 +255 0 255 144 168 232 -24 48 112 -48 96 232 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +128 136 216 +156 205 255 +90 164 255 +32 115 255 +49 98 238 +57 74 213 +16 49 131 +16 16 16 diff --git a/graphics/pokemon/exeggcute/anim_front.png b/graphics/pokemon/exeggcute/anim_front.png index 429248b6eb17f51f0009bb1000d7cae5058a4df6..890f981467f4569a0b2b1da35bd0e1043a1afdeb 100644 GIT binary patch delta 1107 zcmV-Z1g!h02<QlqB!35VNliru=Li)AH5$pfl+geH02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_|NsBq-roQ2i_MD&5D*am0RR60|Nj90{{a900Du4g?(YB9-sZHu#dDO4 zARxi?f*b$<00Cl4M@0Xn2lB-L00WFkL_t(|ob8soZrd;vhP`;Tput;U0|ByjX&=Fv z6Qj^3$Pbz>Dd4FG<TI#%HsUZYqNxPgpQNapYiDj@0znd<Pv=I7|5+?<>px%Gy<N34 zkvJo=VP{2Ha(`}bpL;}kfMzaqQ51&>Fm<t__VZ(fhnN=`NoUB-f%o0cYM-9Ys9xXE z(M<p&<@=Lh`vTvVM6T%jr%4h<kbD&U`{f&g`y8B^7HY6pvi{)#xFFFUroF-*88+lY z&=HwPLvl=5zo%uW&q-!BvqCNQSib@z&Z%M@(B}bIdVj#2ayZVnWP=058Ufll0P8KC z_FK{&Fp803$C1#AgjLiag3m|vF;=iEDk(1Efmi%+Uxz<nMbWQ!RFqWbmbgs-dMA(* ztPUN~M#!?x53Gxn0fm^yc+SXB&{5=f_UFS0Fp4C5!uLS1EK!zDAx=I=#IAfdxb*p` zBjL{`0e@RW-y|U9DkNKNyDGA}LIXF%0cc{WR9VYiA2Ok+-X}nJzyT*R%8^)!2vo6K z3J#hvfXulFK<t=&(A;<0NbBu-QP==z<AI@%3lwH!QOlyJnCgw8Uk^oZUu2=Y?r17j zHQtG)8SL?O;VvZpsrPq7le(vdwgJ%2&VVI0bbrb@zMppb@gljtrr^%<^WxHq88sK} zor}v3Vn*#1JNnY!CAW23x0Tk)x$AaZxcVBP{vzEI2Y-=nzuXi!bK#1FK-e90a|Wzh z%m;DLh<s0Um;p+D{Zb%x+@`p=H$?Yx4(xVM{N~34UxakCEHg50XVQ4!73B<2^j>!3 z0e^=o^bCNei8LNSyTq*9nfEDd7!TYLmz=}z2~haCrjF__JJ}f*dVm9~lloUt*v8@? zy04P@+o)Tk`5}msFiHJ205gdZb-#O#sDTxtL(L3O5N$8+0)Rj&VrWGi41^)w7Dl?Z z0<cEJl*CeDYCx9Tz!_2?YE;{ffEo#$wtp(l378I)ge=|n0F)3dXf`&)AxL!vA!auQ zpxr{*DE>+tw7ac%0KltoOrgp0q$D>7+gAaViVc7md09STT&$YINVlvfTH_~-3iYo6 zK>UX(DaaUxC+)=_*$V&W>9Me7K}uNzEZ1=sYS@jGu@mn%=$&EG&bNDz;uIr}2TXp5 z3gcQaQO-fU<FU}0^7i6wqn$5){~3pI=CU+*)5sO=u09g~<p&P%3GheakDKDE{kHzy Z^#}7+59((v?e72p002ovPDHLkV1f$#4N?FA delta 1043 zcmV+u1nm3h2&f2<B!4haOjJdf(4fV0l#3uB|JB|Q5D@?Fi_MD&`1tt$?(W{+-r%sf z=)k}L00000000000000#m+i*@000SaNLh0L04^f{04^f|c%?sf00007bV*G`2j>O{ z0yq@g!|-bW00WCjL_t(o!|j&OZsRr(#udRYFhc=CdooEOZh!Yij)84&maQUB&_2Lo z;kz9Jet=%~S|FFb=D1JUkECQ#a^l<<CSW)rf0}=k=bNIqub+IeS>8M+5qCwD<IaO% z`T2RXxgaV4GBd$l*KH@j)Wm}{e}8T95K&QzH&)CXc--$bhw!+R`t&SoGXbpkk6#?= zZ?LV!ot6Cg-+v?s>%@O`^xL<8;XK4(>@-n}y&dr%0e}f{pI)c6!k$>N5?sg{k$5XU zCv@0jAM-Pwi0mv;jXmPez=Y1y5=V410*e6H)ftA*N72y$d}RO|1K@O&)zeY92QnWe zc8oYy;<S<q9zs0s;^P75N_LW#3&3Z5XqjKIl4Lg+>VI}ppS4g^jQ8gd6HW~(!q)j+ zeclpxLj)3iuG2juLMLl?e%8OdWPnxTDG;Fsj{FX3@!(<=VubHDRD*UQ9<>(ySq;Du z-VXy1V|AW1>pqLJZc)I4Pz0)!s<c{DUx(5ush<Xbdti$j$zl{zE&*+-mV$vQ2M{@R z5l9vDFMmv%@r~5soQqCJfNcQAIu=Mwr=%8L*OJr+E5E;V*<Hr;`m1S4)p#eWs+hel z)Vst#_0#iMr2eU~YyjBk8L+?xZzk`jp8j|d+-71<)8^gwks_*YG?;db_#G37qPf|l z%1bY~ulu^MOY1h~_Bk3Z-vZPd(mhq-x75EV%zqTPGGV#_fv_9s<_vgfFdr;?nLa;> zY-fP-fBn-TbaYcR?t{p8KL_^vFSHEfK}f=zS(K$%v$w-|5ESJKQ1ZCz#{-I4@C<;a zxnVqjcDY%#%V5*#I3Acanw-J+v~7jCrcUbbd)dho-NJz8LH*k#Y`OTy>Z?Khb<(YD zet(Ff<m{mS48Tr&B;D_y6RB_t(UEEfD2R3tcL%^B6vvY(Dfp0IfBdlCG%bJ=JPtuD z6s875d5oMD1)@f_O$O8mV0Bb!PQY}aJY?zn1%MKw1l2)DKLV+4A;e^I0NU-8PU5fF zqTEeOBLH5-Yl=noE9HqlY0gwC6#!xsWPf>uak1ssOt*9(8XG2z7Wtn5K>WukDau&& ziU|w=qIKcT<6PLvD5b;zcc(N9Rb;9w@m@mjED4)X?oo<!@m_Rch>GJ{w|QH<)3wNz z@?OMSr*nGu_g_*RXWp0Qej2%<-R(!>zo3uAe@h>UKRU&|)BmLFe=<qsaisX?#S8!d N002ovPDHLkV1l=#^*sOp diff --git a/graphics/pokemon/exeggcute/back.png b/graphics/pokemon/exeggcute/back.png index 8ae6d8f2147cf846393c0893a9c8c41578532047..fa0204c49b9aded7d4625688269dded93676a7ad 100644 GIT binary patch delta 509 zcmV<Z0RsMk1g->-Bu58yNliru=Li)AH62&p0dfEU02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<ACWE_fB*mg-rnB-%}VB+01yxm z{{a900RR60|Nj90{{a90|Goe25cbUw?yLZ`djRx;CHDXT00Cl4M@0Xn2lB-L00B}- zL_t(|ob8e^a>6hWMcugOFeE34(^H_*(m~A)h||%rPMWP4ttdiiZM2eQj2UP$>HHgw z=fC;d{c=$(e_Hg9V*Y;apLXv2#9y777M>CPz6AjHIKToB0X&RYi64l=BfvvPk=V=~ z=6KXGfXL$9hmSZ|odSqvcZ92tLah1>%r@;I5hW0_kHqZ|H3;#!DS`Jp7YQyd=5G6g z;(gP!P5>;lQyD0S?ZE_p2Otq>6wze_;%pZBV<Sx;f5L|f8VNsak1$9_z?(d4u198- zAV9h(RcSIqgihOImu9i><xsu7gdCG1Y8wHzb||_tsMfDx8&7VMpu5~7Xt!PKV0(&> zqEow`vMkcJ5+LY20!UXmkCmda^Lv289hDvdLr!_(8-V%eJ%ve=tO>oI0!CgY1q+bM zzx9EfE6zZ&@VW&~4gm&7T_>2F^S^V^qQB}F7n<pGtN80B00000NkvXXu0mjfQKaJt delta 464 zcmV;>0Wbcp1c3yQBnkm@Qb$4nuFf3kk!u@&;HW5wU>Nx5SP&2p_{d1$m;m_r`1tss z*x1<6P(bj|KmY&$000000000002-51o&W#<32;bRa{vGi!vFvd!vV){sAK>D0a{5! zK~zY`?UFre!$1&)h429~%M^xfyn{)jDx@)}@h*!SwQ)|6=pt@(9mVSAa@k)=ma&_E zkWQ~z#QS(VZ&t;sRsSiXm*@WWB6d&wa@*DXjHnJZGmFOok{N*cVMOVDM+}bu#XSV# zxO9lZ(S!g1iA$f~!(dGe02uDBzIvjpGO%b`xoV!+Fc7Ig+z!z=fUj@I4b$Nw0zt*z zOgE(VgQY{))xrZ<Xkjz3N$uG<|HABlBhXlY{Ro8FBv;qYZ+dVa)@dYEYLA?x1E5Tv zHLu6d>Vp_zZ*8l=qzE0`V;^Uc{3FnQf4UqKBN`b3NXoS6-k?2yxHbyJEJ62qkF3S% zteveOJc^FnRgfhSPOS%=b|Zi=NhoYBj61&vz}?a65ilUE0=fZ+UcX|P-y~@}K&9t^ z@h=mDJrI|F>oW+QfoS2>0%wN@l4GX{X6N$nT(#<NDvDoK<#@qSVXf@|0000<MNUMn GLSTZ-?bJ2^ diff --git a/graphics/pokemon/exeggcute/normal.pal b/graphics/pokemon/exeggcute/normal.pal index 5b12b18d4d..632ee1137d 100644 --- a/graphics/pokemon/exeggcute/normal.pal +++ b/graphics/pokemon/exeggcute/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -197 115 148 -139 32 32 -255 213 222 -16 16 16 +255 255 255 +222 222 222 255 238 139 205 139 8 -248 248 248 +16 16 16 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 255 238 238 -222 222 222 -224 176 184 -232 192 192 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +255 213 222 +230 180 189 +197 115 148 +139 32 32 diff --git a/graphics/pokemon/exeggcute/shiny.pal b/graphics/pokemon/exeggcute/shiny.pal index 967472bdca..e59673d22c 100644 --- a/graphics/pokemon/exeggcute/shiny.pal +++ b/graphics/pokemon/exeggcute/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -224 168 40 -136 96 24 -248 232 88 +255 255 255 +222 222 222 +255 205 74 +230 156 0 16 16 16 -248 200 72 -224 152 0 -248 248 248 -248 248 160 -216 216 216 -208 80 64 -240 208 64 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 255 189 +255 238 16 +246 205 16 +238 172 0 +180 123 0 diff --git a/graphics/pokemon/exeggutor/anim_front.png b/graphics/pokemon/exeggutor/anim_front.png index a7fa012b1772059d802fe3ec529888410a671fd2..8d32dffb8dd41a10f2d7ada4425c96f2ac4c7713 100644 GIT binary patch delta 1777 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 T;KZ4O00000NkvXXu0mjfJ0Vj4 delta 1684 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 diff --git a/graphics/pokemon/exeggutor/back.png b/graphics/pokemon/exeggutor/back.png index 8bf0106564fa93143c02f4a93fc1a49c6cb84e88..ea1c3fa38fbc7658d72906a34756fdc5080ea2ab 100644 GIT binary patch delta 787 zcmV+u1MK{Q2EPW7Bu58yNliru=Li)B3m%PB_3Quu02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<ACWE?f0)pq|L&y!-fHHoTBK?q zb3qX9=1R@10F-k8|GjGFgG$9>Ih;8V|NsADVqy>w5O-*PvH$=80b)x>ME|7+^2GoE z0%J);K~#90?UTW3+%OP^{Qw5PL!mFwZEuCVLf&TgQ0SqD^p>-nK+lpF_FRuZzHTJY zt1KiXjV+kYe@M30_R{pwYXsJcnNRbNW@d}xZT)?@fB3C_-CsiYzX4W&Tcz~St`saR zh*GK3D&&#?CDu8XFjqa+_ZMkdP?;!&_%Tbbn`Gtw5^y%B^PsZuQHc97wOT1ZU90QS z%s@oTpW^I~=Fu*N<gg`MW{)G~Bwb1sfnz;Mjq63!f8vz#-FK`h#j+fg5b}`H<)2<j zxhlttjBn~AP$_j$PqMWx0w(UcbT~GX05DO)6jh_n9qUz->PZJUk*hJq07^9zP|_XE zLHeeFu7U;_Xjo_>9N|P%0ATV4XMmbQims?Ebv**eK$yQ^Ao-301F+BV0TxqLwfurG z0hYJ0f0#qhS2#Q$OjKy4n^$U>5~NSFpVE?gMpRRH`bdG*sMvSiGK5XH2i`qmFU8$5 zgiW6XtApdU==i`_<7YLn9}5ignF%RAN72SPkI^^_QRNK52In6?UB_PMmLZNBTny)* zHXq(EN*Ppx$Pe{_6`tr3@2(eq8W$bF8_<Iee;!E*e`SBkehNVy8EBwPz@(J>6`-YI zM}iEKnEU{TF6XbPay+PUJ0y3j+I=n&80uxC4&JG@9RX^F>ZT&oco5bidIdo5K@1Re z#}d-CFs7e(*m8E?x7#lmGw())QySUr_A8`cI$beAA$V3z!aQA!y?7?zcJsMU09jlD zLD(Lv&4=Hc4MvTS6*S(A0BPLrzI{CP{0Ah9o>JJ|OaP_%c*XzML-Dra`U6^9W@2kd R7`Olc002ovPDHLkV1kx*Xc7Pb delta 746 zcmV<G0u}wg27(5VB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP0000mP)t-s0I=wY zI2aHR5Wr|a=(u>`kYIRV7~rT__~3~6=%D!c_@HPYplBe-uqfcDSn%jz>jt+Q00009 za7bBm000id000id0mpBsWB>pHTS-JgR7l6|ld*E!FbswzJ%52HI=cu($<WI{qI!Td z)C0sK_FRT`%FqmTpP<**O9yXymja|DOZHtlbPexB^MH@|K>*G^);ml6!>{f8{v6By z4R8jivy`s7GX;$sA}6ZPLT(8pUtWl=Rd@aUMOqqZA#(4(tkNrI+3<J?D7~a}MT_vx z`}--io~W9y^?&_j79gVeXMgfX^JEV`NZ4E~tH-f&lFkD~VAs!5)4KM(uT#E{rDz7f zEl1&f*r#;mr=<|i%5fdyo7xBzL>KjBTc;x6;=Ys)re-pLE=stp80gfomWEVMK48tR z!DS5+4KtAQ9V<cFVZgG$0R<RDXeJcnOcaRdmJQu1KYu1jWrgOhM*svc>lZXEUvgkX z@i{r*W~z!#USMWG%VsunSjiO$F9#PDx}esTYUTv_v*PDM1iK=NIXr)?AZlFfhjJT2 zr`wI}6+j#O!#0FYpGIwslC|l0BUj_6Es7s9FzcByDZWIpPN@o_aTTIiGDK}ub^GH< ztgy5UV1Lq(VzB@4^Vg=7h6Vt6Xk|p<6F=hj)5g!^VhvUfZDUOZtOPfUKNmlT;Epsr zP|iS7s!tE-c-Vm<CnO|4;=Ww+C$5|fYTWk8-BI_rln5R7a-e;ssOu(xn?dDVWF8O3 zI)I80`8@yzqwZ8fo)*FE-4Qy;ZXCxqh?$p@LSvmqb{zj;`sLHB5FA2g)g_E?zQtbL zG4Oo&-X?%8Dgk1T)t1A};Q&#?ED9E0CV(}bkKYb;D}O+?*g1vc%M5%S$J<x=zwWb- c#VgDH0>)ay-o(bIJOBUy07*qoM6N<$g3y#)00000 diff --git a/graphics/pokemon/exeggutor/normal.pal b/graphics/pokemon/exeggutor/normal.pal index 7430557a4c..64a0df017a 100644 --- a/graphics/pokemon/exeggutor/normal.pal +++ b/graphics/pokemon/exeggutor/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 176 232 -82 98 41 -16 16 16 -115 172 49 +152 160 208 +255 255 205 +255 246 139 +230 172 90 +164 106 32 +123 82 16 +180 156 74 +139 115 65 +82 65 16 189 255 115 156 213 74 -82 65 16 -230 172 90 -255 246 139 -248 248 168 -248 248 248 -123 82 16 -164 106 32 -139 115 65 -230 172 90 -180 156 74 +115 172 49 +82 98 41 +255 255 255 +98 98 98 +16 16 16 diff --git a/graphics/pokemon/exeggutor/shiny.pal b/graphics/pokemon/exeggutor/shiny.pal index 2490dbbb59..81c3a61fea 100644 --- a/graphics/pokemon/exeggutor/shiny.pal +++ b/graphics/pokemon/exeggutor/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 176 232 -136 56 24 +152 208 160 +255 238 164 +255 222 106 +230 172 90 +164 106 32 +115 65 16 +238 230 74 +205 172 0 +148 115 0 +255 189 106 +230 131 74 +197 98 57 +156 57 16 +255 255 255 +98 98 98 16 16 16 -192 104 64 -232 184 120 -224 144 96 -120 96 24 -224 168 88 -248 224 136 -248 232 160 -248 248 248 -160 104 32 -160 104 32 -200 176 40 -224 168 88 -240 232 96 diff --git a/graphics/pokemon/farfetchd/anim_front.png b/graphics/pokemon/farfetchd/anim_front.png index ac702abdd4eb4e31f961819bc3248bdf8d0d0a76..527e64c53638792e87126587a92f5eb803d5ce78 100644 GIT binary patch delta 1138 zcmV-&1daQ{35N-gB!35VNliru=Lir3Gaua9OIQE^02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVO$_|NsBh)z#+aq{YpH|K4i$v_ZXd7|s8SLEb?CoPQwLxNx+TQiEzBS~&m^ z5D?1fhmimP00Cl4M??UK1szBL00XN@L_t(|ob8q|PuoBgfW09h#TI`6)L+oywhB1| znPCe31$8!<sJCQAUAi_bw4G>Gsp=1C7q;qRT6L^17zM?PeF+K$fk>|Je70ks?-F(D z!W)v4-skt;*?-P`F^tDp5Ej#AYCn>%`;TJ{;Csse9HfAziI2wu_^hl^3o@Xq27C`% zP*|*XkB<~U4ST+4@)}n6sH>_F;pi+{1eh3mm~YhTcGW<Hd-zNMN9s*Nj0JG4+9k%l z2#@&kgA(u|i+ksMdDnfb0;u=k#f0~`d!v}q#OKVv_<u$MSf40?-*k$<Y!Ke#<Q05S z8Tk2ty{i;>Z5S~MWMDlyTU$>7Ge$^mbMfc-=;~_<3{Vvao4YMa#E_p(5voghx4G*$ z4s6q8_lFb6O9fVVeiX)i7L)IX6UyWUrsM3*+zyEeIekWHGD<OO{)mO{Xi6Y&Q%q!_ z#-HSfA%C<<5Q=aWNS-vtFuRRxc&dbyN2uj_4p4~F@1jN`0bl^ouWE;yhkLw7kLS@K z0s0b<%-{*Y_A4VqUecg10Ax>z^wW%>s*iga5T7$?lN93^wl>Is%3XNyDBpSl*w(;~ zr4bAZu7SZD9H<*6W0ljvnnC`u(by7i$@`}=V1F2lK^|fU)~io8s(>*|^4q+?>Y55L zc!}+#`8zdWwi&za@YR(DaK}d2p#hA%raT4B*4T7kw%S0b&%hO@ZLpy;+*4*D4jeZy ztl_@yoL*_ZXmu8y<JPRHy*TTkJHhiB%Yes_L;pb1(0lVA0Ckg8-CD6`>eh-iQ@2j6 zxqrHK-ptjl19Ek1#5z~EPOQ1Qbz;rctrKgmZmn1|b(h7O+p(bTqF7CooyrAu7sYBK z)DHwOS9ejY0Bm}JQC4?Jtb>#&svCglGy|YSLKM|q6st+WVhDRdLER;>LI*+6@Ia^= zE-8wYpYT9z;;<>y4eBh3b%I3L%~ah}Nq?+X3T#r400VUsB8hdD0vO*?8pbjCC5x2_ z6JZ=u+TjH%V&ylD6C6OjSXQ@52WgYDb_gS<z+9}^HV_g3xVtRYIZ$tR61huawFYIN zDprfl#FTY+q86)})nJ*sC9%$@NC8=_2|yZKwg4!V#R_BE6r4E}?pBD^V!<^BE^D_E zcPqteHMXg<M;pnDs1z&Pfwy5_xLYk&cH=nL!rdCNazMCSBUa1VPu;DHo3R-#16*g( z8Eo<Yl<h?&jA6@h7arq7=8P5s%or}S?^58=-~TQC0x!fJTJCcvl>h($07*qoM6N<$ Ef_xhZ?f?J) delta 1199 zcmV;g1W@~j3Bw7HB!4haOjJdf(4d5CAzC^BwUkm25D);IA?D_#Lf%5f&V<(1*5<`~ z`1ttF|BV0MYxlK6y>l65;$9s9000SaNLh0L04^f{04^f|c%?sf00007bV*G`2j>O{ z0yznx-mUWh00bsUL_t(o!|j$mY}-Z@fKLQHyGIg+Mv+tlEq`r6Jwj+bk<`gn5W@xv zt47dFiE$u0yU>zFDk0ofv}lHO4h%H2m)5I;E}Dw2@=$oKv}l#tca)S$;?XWT6@?Gb z4|pHm-MgRnk&uV>Z<=vWe+eq`hXutz9l!O?aY4VMfsg%61(ZG@M1u${LR!ZvVCT66 zET}kYpu`a%u73{^4GMr4IR9qdvuU7rT4x1-4nQrUclYyv#yJ9p30}1T81OnNxnKYd z$jONWN|m)FAH_Z~L$4{v*zbOg&&>K-l6%4@u2prbb0EM)^;ZF26TRqrKdOJ`(O|3F z4T!mWx&l1n76KP$v;O2e%o70{&R2mNe_sB^x-eYpGJgYpjm!o=UCS~q3+v*e-z*t{ zJR3G4%lm!PcjBJ#qS1Bq1m{2whRt&xuO13&3nBWm(RgfQ7TSlyJ<gN05&CWM?d^Cx z{sYt0ZGZR$7s2{M_sg=MeKMsqgg3)0k!&n<EIuCJL}_YM3cIH-uf+PXtPNt(uO6kT z^Oa}r@_+c*yQH!P=rx?ANEqWUpuvSWcxP{10HcgRjbp?75U{DSaUAfe*x^~je-6cL z*8zOm<4eGSO@Ksy1F?wk<k8K`#cHCz01^|xvvRjoXU+;x4;9x~TMiLo|K=PP$40hZ zEs1O}R2RH9PoiI?V1z0Fw?vL0JQmsNN>UqS3x6goYE+egCbE_U?C~pg1&QRA$oV~e zt*%1)lrd+Df4=-#38Y8ZDL?w93fNA^=@R(mCk1dj9!=691Gaut0Y{_B^)%2^gvc>d z&5+H056EnCJ1s1<hXL6hjmFo7g%;z^CZp@w%^lU6u|IDZyR)Dl2KQ8a{XvTVk;d-X zs()hX{xhItu}%laC^-dy+3K_;pf!R*AhWL4NR)TG;`*JAbf$T(1YF<sS|?{{yduDB zdexK6cw7X^2vE0M-R@Ztkh$N&5Md)$0(w?~x4J_FlyjK7pX?8>)WFjH`pc_xp#qlf z#}Iq!Bo^+MAw;BD$EEv;y+8b%R`S5o{eL7p9d0UX4lLZSmE!|jVFP{X{;(WJ9<_2~ zl;-ZYEIJS_&@cyRbN5qP=6!TlPD$Gf_ftBE5vb>8`QH7Xa$y4)IV~>S573ZO^X!}! zwYmG>zQy-|ggR8=B%QIrT#JHHgXW!NLwgB?R%pD+?UxDdg;+%r(#NlV*qnq3{(sz? zy&Ar1JiROi(5wO3%1Nn&O5d9U?LZ|ZdjZ5OxnUA`L-K$e<8*R(D+~T{pa5iuB%P!a z)seI*0{$RQ(lk{{E2Q87w1qgzw5J5X1z!Sc>y@YpApjGJIsnnA>H4M|q(Eu9VY)Je zUsS+!179S4y7o4`QDdnA5Yl2mqbL^cmvcucc7hP@snlBa!Dj#O_7@6ap7!ZB_V)k) N002ovPDHLkV1lHVJIeq7 diff --git a/graphics/pokemon/farfetchd/back.png b/graphics/pokemon/farfetchd/back.png index 50978b424cd0746993a885f3c2dff9008ef16b71..1f87dd2fcb98096b749bddfc78802db1e18a580c 100644 GIT binary patch delta 695 zcmV;o0!aO^1?2^hBu58yNliru=Lir3GdtkguZaKv02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<ACWE@f1uF+|Nqt1)$Zn`#l?I7 z)pP%}O2u;^=Kqwe=1OpwAlSHY=7@O6Xjo`CFc1(B{zy9p00001VoOIv0Eh)0NB{r= z2}wjjRCt{2lRa+ZFc5`R8(0!<7mMTuxsBm&yEt8tW5_ACHq|7p*ytjZWTfVhu67$r zauuuv{VYjIe|99%*$ZSU!tdj}HzV5fzG_w||BtTN;Zq=k9-v1Lw+^5NZh?g#9ZT|h z9SD6Il_YQjIQJIB4<brlrgDBj8mKixcFzs~LxC-@$Kh@p(Qpn(4eT==<3zT!45uM6 zKm!69pd>^C$9cqKElms$(}0$A24o;>?ULwYNnHR2e^JYJ03rvFK_+TQ&5?#tFax}{ z23>_Yp2C;e6dtlVh`sS3<TTv_YOD@CHXaV3*FiAd0*54+04VDLXpF~+1e33c2OZL^ z^C06f@-v_s&w5ONdeFsPYCX1N;1c2OwmMi~`|OVJcKgEs3*Wy6+}IA-_rG5QlrhIU zfBEVJe_(m{)BN)HSDQNlvHY`oGMlX!%bgvv_xrU@(J);H$Cw~Do7MUW8J#tbMM1OD zwXR~$Sp1>IW!3M7C>Q`^oF$GBzaN_Wg2nn}B)Z4N;~YY49<2_d`WO=r4+dmgSsg}m zpmxv;eXk1(`~n~~IOM#$4*CW^XZWTVhfxXJW%0aA#rn2G<=t9Xnsx>(>HAKKtF&*R z+<@#Bg?Ox(ONXi(0yE*(1;qB@s#rR8nL%PZRBk})-CrFs$Q^oXR(I?oKs}RlyC^w& d`Cs*E{R8Cp$Q!dkz&`*0002ovPDHLkV1jRAGtK}2 delta 642 zcmV-|0)74E1+WE>Bnkm@Qb$4nuFf3kk!u-$(4fd@SZFvf;D~q-5D<W<An@q0sNhJz zz<AKm(Ac<e`1ttX_>lO}aQLuDz<4lt7kIn?000SaNLh0L01m?d01m?e$8V@)0006B zNkl<ZNXPAyKW^JF6vkD8-u);o*(_0W3W+*^L`m>c1Rg}_A`!Uw6gf(pPTmRxUNm)o zHw<)-n<JE@{y388^a6Pkq3_4{eeZ#CK5JPh_>WH6=0m`T9uTR63k#5eYk*Z-rKQ~6 z2I^K+rEKf~4xE*2n@Y&Xxg2be0y4$O{fh;_5Ml$YalJoQqFw@?0@l8Yv6V+r*1H7& z90<}tDWw9^WyCb|bPNZJMwDU!_~2!K$|Y9EQrG|tB=d>^s4RdFKFJ`_M^RVJ0&t29 zRE7GutsfUtILPQg*4jhL?R*c28y(z8dsu*82f|bfT+3z#AioEIYmcpLn)#4JC4T22 zr(*;oK)GW)W<WOR<S8*8$0=})aQB>V3~+q0N4R_bp@CJ~-U7ax4!CW9-U6t9Hplz+ zu(JYic>1lseEU@dR)8G7p5D|Ko--C$JNOT;XO)68RU6Bg;9V}K^BdAS<CaAMKdCzB zk;_>0uEllL51I%W0AntTEg|mz^4E|>>Se^L$JJvDK`wuc4kUjc6Z0`-ksBQ*bD(0- zLv^nU3+@#_bZ`jV?mDO&?wH|i3uP`$ikOb$E-CBV4i$83VM)>%u(<C#E0-pH18N7n zZc)gMD6{F1cSB%C>^gzSJX{)iR^9U<HXU+1p!DunM+^dsUg*`OT?EJ$a$pwaO<w+I ceNc|`55^RktpKel!2kdN07*qoM6N<$f;Y({MF0Q* diff --git a/graphics/pokemon/farfetchd/normal.pal b/graphics/pokemon/farfetchd/normal.pal index 8e8af67119..786c6d0244 100644 --- a/graphics/pokemon/farfetchd/normal.pal +++ b/graphics/pokemon/farfetchd/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -132 107 33 -90 58 0 -181 148 82 +152 160 208 +255 255 255 +213 213 213 +230 230 164 +197 205 131 +255 222 106 +246 180 65 +189 115 24 +205 255 139 +65 222 65 +0 156 32 +216 184 112 +180 148 82 +131 106 32 +90 57 0 16 16 16 -0 156 33 -230 230 165 -66 222 66 -197 206 132 -214 214 214 -230 197 123 -248 248 248 -206 255 140 -255 222 107 -247 181 66 -189 115 25 diff --git a/graphics/pokemon/farfetchd/shiny.pal b/graphics/pokemon/farfetchd/shiny.pal index 631533ca3c..874a87bda2 100644 --- a/graphics/pokemon/farfetchd/shiny.pal +++ b/graphics/pokemon/farfetchd/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 +152 160 208 +255 255 255 +213 213 213 +238 230 164 +197 197 123 +255 213 115 +255 180 74 +197 115 32 +230 255 148 +172 230 74 +112 152 32 +216 184 112 +230 136 120 200 104 88 104 56 48 -224 136 120 16 16 16 -128 168 32 -240 232 176 -168 224 72 -192 192 120 -208 208 208 -216 184 112 -248 248 248 -224 248 144 -248 208 112 -248 176 72 -192 120 48 diff --git a/graphics/pokemon/gastly/anim_front.png b/graphics/pokemon/gastly/anim_front.png index 6bb1447c32f3d7ea1a2a8339b07ca2821d999e60..e16ebb069e0f8c78f18c42a297ea805379e9cf68 100644 GIT binary patch delta 1068 zcmV+{1k?NS2f+xCB!35VNliru=Lir4J0?y_U)=xz02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_|NsBq-rn9)IkYJd{{a8Jl(dUtgL6u1IVm~StbfhDl(dUtgZ}{k{{a6G z5D@R9C2#-$00Cl4M@0Xn2lB-L00U)7L_t(|ob8ssYui8+$8VOpT<K6}3H=+~y_9Hi zm;5=-+AU54MMU6SC`cJ|GQ?~21n%nI1N|+940UU8-~F&Hous4`Iu!f}8GIjq-_z-Q z-!Ef_`m2)9tbYeGdqzM5@+nGc71`4$kSt>s=#~JG4%`Ak<^yH|)(3=8WTt^$4<z#+ zIs_<~H07Sh8wIEenHNSu&*5*120#KT>0~^BI+O^2h~K1iDw!vMu6A>@1aO(I39w_d zCn!;zPs9ez6f~mr0lXfM&jb;wuz)|pa!fT5VvTy!{eL$S08AYqDg}`F?^MFWWNcdK zCbVTm(GZX_f4G>A&$NKJMv}<$MgsywJUBP&>FpP#C7=nQh`F%EFVXCKqs44Vz`(5k z<O76x*aDK6TZxz-6Ts-N-eXo>5il?#@MG2Zwv{lzkx0adcLKqEa>F^lOT>H5KPly( z$1GTg4}Sz4jZ*r*F7-|}_aTH8X>&eG2mCcEB|89dOH-`UJARKP6wMYIco4A$#P_2$ zZFS+zm@`-iam(*U^sY3J`M?~ghoGlSuU_f{;RE43EEnSO&1jRH#sm~Tz#s(Nq_2j< zw`sL*k6=zU;)c4Us87SZ1rR~UzS_{C22yLUYk$K2Y*g3RO_dht)UN|!-#QDC(R$yi zEByKlaHvE5U-gICAn4^R;5$vLMUVG~yDOy!fZe52Yatte3lFSjhn;}AVVy?M1dIg* za&MVUXP%pMVDdv|V~%Xa3zHwV<pXxTq-fx%%rgwL4)&4**|8T+z!I_}YPn^TAC$~n zcYnFdA1*%>1o%D7MZC)oW>8<E#9e-<%oueEIwN_B7gLuXe$aKCHvqyzTz(wb{6Oxn z;{$5~GhD`eYV!lXBn1zUGaU~G6X*WQ4+j(<G_Z4j4b(6FU<>Ts-;-bxO@7$Af7t<4 zS9|yWtjM;SzM=!hP2K&O?`yLv*}MO*mVY$|84WqAyTA7;Bmt|2`)3_MQg?rE0!jy1 zCDGpfeQN|d5Q{Y0x_{ezNfB@ry?Yf!(P_1YmUq(!Wx0ABo(!WX)$Z&AWXGYZ9#1Gf z7@+OW6hKPcXkygy47Q6-4@ne>juCAaoiB6(>5T^=ngrs%=UTaV(YwxGm>*{EvL#V? ma-9Ixn@(JdCzlWPkLx##o&eiOZC>{P0000<MNUMnLSTaQY2a}H delta 988 zcmV<210(#w2=WJzB!4haOjJdf(4f_<&ApVgi(-R0DLD`j5OYdui(-RtNNE56|FkI( z-cmWxsKD6R*t97S-cmUY7^ai}000SaNLh0L04^f{04^f|c%?sf00007bV*G`2j>O{ z0|yHa*S(bh00UJ?L_t(o!|j%_Zrd;rhAHI*baFamlTPv8@_(%CfvKWay0o@|Hd_EA zKwqOlA0U7OlmR*vaE2;#m-<QiHa$|ZY*CU8bm>qNL5AFy|4tOe{}<x8{%XO2x(C4l z0RzB33XBRspS}o033N*!LIrLBFK_`nf#?H#j04-i)IDfDw2v4Iu&a6=a62#oVQdx5 z99{>2fFz-kaen~rkPspfy#lCI0!M(VRnO59piwqupd6z;K|<<wq2^?#;1R(E=rz%W zVnW6x;Epgd{TE72$!xm&Mm)rE1*lXa2JSlrJYSG)VVdxk#c|L)DdG9em@bTfdP6J` zhRve@p_(jjZ9O|1OCy0zfYd~*a_Kv=``&0V7%{N4^?!GINf`MpAfM<`Vxk`y5d5>- zV~}1ku(TuS2Z`<DY=L`~tCj8qychYU*7`J8KeYZVrF$L&Z>YXAaKFm<_cSp(+1v*o zXRNLDDqHHWBqekJ>WrtDWvBWDB^Wnb7~ot@44^*VPkF0jXU0(AP^mM0y5e_b0Qchy zBjg^6pMNrY`^_8(7w{uL8LI2wt9kx3VIXdOzUU*(v&Z%NSC&rOBiK_-H0LfEnbQ!7 z4uX$;I_E=;tk!is_|=CayZ+s-qy+E~;P=&qPlD?QE=qcNG?U}{AG3i6`vGrHI)Ks` zIsw1FQhETaFP)th(DXE@0kIFTH*BThH34fu9)D~tv+2x{O$RnV1ZB*DR=lwJVY6JI ztS1}|Dk^Xc!`899<PbXcq7o<x=!jZX+2#icAqE`)*Q@*xGvM~H7jc~*?4YhhLUn#f z?HEBb=7kB}jH~?cfv@AR0Wj{<=+m;y5A6OXJ~%mZK%<Esm-#{8v4R7@z{G>)qH=%f zhJOQ&4+f~+-vE)5FD$Tie@8+9+5E6^|D*#*ueR?0MY3%*eZ>Tf%U$;uuCEQ!eCz)2 zTh{CaJmhNE{he0<49pttA9MiuuKTys0i}7db${0ykq^W$D>m*gI{=oL6+a(~qIgQD z*z#`vLz2v{*U#&s$c#I;zWzw~GQEE0_*GzmwmWkGNoa0}RmU@wT}*n&i$YC%@_}#i zg-Ia2@xUjWKoGIl`OA3GTNfwx!`zo04%8Wt(cY{0gpPLgFV`PG`4Dnvmi2Q00000< KMNUMnLSTY6zs=78 diff --git a/graphics/pokemon/gastly/back.png b/graphics/pokemon/gastly/back.png index 07971e3c49c77c62273d2aa3b2759d40ad874a8d..1d869be915d0516563ad56cbace84debe9537598 100644 GIT binary patch delta 711 zcmV;&0yzD_1@{GzBu58yNliru=Lir4I}!Hx`qBUZ02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<ACWE_fB*mg-rnBcQaQ9K5dQ%G z&7}XVd(C@FoMISzq~`y7#qL_1)&Bth{{a6G5D+EtHx2**00Cl4M@0Xn2lB-L00J9H zL_t(|ob8l5Zrm^shE+3_wo4gRcIDcA5WvT9PT?(6S#q~Y;An&emi2H?KyH!NHi11$ z(%4S3`9~Bff04O?k!kdpPyal{s`_tl-n9DXP4=Xe);fDuD&37Zb0(pM*Xa%%+d_fm z6D<N(G_<jtDX=lDMIIh49GhH$t+nuiF`}T6L#9v}<3<H|jQ^=6Vxi!ik*~bpd;cT} zsk{o~tYvlZlUdH&5ELMujB^1fKw<<QhzJ*x7g1Ggf9&B2;i+%ij<)_0W#)Yd`qYjF zA}do>O7lMW5dlQEwE$uo(tds?@kc+1zU}<1fbLHL@E!?>y|i1_X#))Aa0mkJ1nk=G zF@?Y!+#v|GQw&Jl4y>mj$~cz<Cjb5W_GYdFfQcoB2((%CYnj*7B<C!Emj!TLU)<hB z04rcHf5is?T@3M|UOf*<L1SCIKcae~1k^un5`gVM8;@PzMgJ9mi}egBX#*uU(dBhr zpRea$YNX&_X#sqxSIzU?+-&Le61e(WH%&jx^ORXGfp7Os)0_=h|5#`NeD49g0*GnI zHZK9X`rI_X1&F=e7XV2N<S?zSGQI@pQ*)VqbsjaYTLI9=4vTE33}o6zDvjBN97lfv zY={Q@@it`uAd9g%!!U7(EPy<T%{ep2V~7KAS^~dBAQcgSEQ!-FpAa!bQRreN<Ed~e tfskWNp{Qerzs;!}SW4{v%nEP9{sK~KYUd0{IB);}002ovPDHLkV1geNKal_c delta 657 zcmV;C0&e~H1;GW7Bnkm@Qb$4nuFf3kk!u@&py2p;!01?*&|nyN5D*Y}NSLU2$Z$w# z`1ts+C=l3CIM`4)*x1;xC=l3CIIp9ymjD0&32;bRa{vGi!vFvd!vV){sAK>D0vbs~ zK~zY`?UXxi+%OP^#hie{tz42@r3et4y9bbWEMpV62;dEn(tsety|D)g(x`9|V5`)B zKFT6M3f(3DNFqftH!w1d9`os+r&#^Bw{Keg^Co*zN^6}xD;4iXoG6pf!s~bkj%=Yo z@`)A!D;nBZ$`r^L(jpI!7LH7=K-OA#!5C4{$RSgxjB%p^JjQ?260uNl&d68Zue`sK zgj8OIan_Pr``IkzZI~1w9*uGVC_rL=1UAf!i^+?qDl&F`h49>TUCTRvi8Av(O#0l7 z1|lm{RZ7!p@*@I>c4q;EG^G9XPU4S#5KY(mMFHKP1K>Rp5No;}>9_#~b68IT-3)No zUd9lZgIiAm-5diFk2UEzh%#;jHi`fGM|WK60ANCibA<g%^DOh4o8+7Y@HGK{-uLIn zhX7y&45qjN(1s9y`tL|0C}?bp_ghrY9D)A!7y)bt+PH0-Huz5f&d&>=qzxS1%&!*{ zu#5^h-g5#x^)JKi!_sUSWeS|``eA5lN~XQafY0?X496Pl9||piPYnPD5YmusP60lB z7=}9mLN8YZz}JvK4)f|N8AT3!@Xz5j{yb`2w*uf_Ef(3%8OS<pxilg-<v98aV9#9R zkGC-c09lOvZwwQMNCM<Z?9W6Ljv<<WLkfHofmp-@WJw(A<%9?!ib9i>45z}O1g0EA r3Pl|^_}iSyfmGt=%cAfGtg8M3+;81vCUScv00000NkvXXu0mjf;%p^S diff --git a/graphics/pokemon/gastly/normal.pal b/graphics/pokemon/gastly/normal.pal index 7541f17517..16672b45dc 100644 --- a/graphics/pokemon/gastly/normal.pal +++ b/graphics/pokemon/gastly/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 +255 255 255 +222 222 222 +222 82 57 +180 41 16 +255 0 255 +189 148 180 +139 98 131 +115 74 106 +57 41 57 213 172 205 189 148 180 139 98 131 -57 41 57 +255 0 255 +255 0 255 16 16 16 -115 74 106 -139 98 131 -112 72 104 -255 255 255 -180 41 16 -222 82 57 -208 168 192 -216 216 216 -180 41 16 -222 82 57 diff --git a/graphics/pokemon/gastly/shiny.pal b/graphics/pokemon/gastly/shiny.pal index 5984138176..c586f2bf98 100644 --- a/graphics/pokemon/gastly/shiny.pal +++ b/graphics/pokemon/gastly/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -160 224 248 -120 192 232 -88 152 208 -96 24 120 +255 255 255 +222 222 222 +222 82 57 +180 41 16 +255 0 255 +205 164 255 +172 123 205 +123 74 156 +98 24 123 +164 230 255 +123 197 238 +90 156 213 +255 0 255 +255 0 255 16 16 16 -120 72 152 -168 120 200 -112 72 104 -248 248 248 -176 40 16 -216 80 56 -216 80 56 -216 216 216 -176 40 16 -216 80 56 diff --git a/graphics/pokemon/gengar/anim_front.png b/graphics/pokemon/gengar/anim_front.png index 4b1e614ab32251fa81d70c449bc62e5d458a27eb..140fa8d81c83f2d4b8a2825431362886a69c81cd 100644 GIT binary patch delta 1255 zcmV<D1Q`3U3Hu3<B!35VNliru=Lir577fE5mPG&n02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_|Mvgh)!u4id;h}1|B#UQSXjNRz5f9J{{a7ZV1J;nh`5k&v|37-N-0VZ z5D?oo)hPe~00Cl4M@0Xn2lB-L00bXNL_t(|ob8rRZrer_#&rRaAhhVNL2`k@K0td4 zW!HL_U0OKjl8^%oBk!^h-;5j-PyuU(Bv2FqDw58s3!4o4&5#s_L&^cVt)Bo%!28Xc z|MPvb+5bA`-+#&<zB~;a!m~iEzZBb^1Li`1v5*ge`K@V-)>6#k`GL{<VY`eg^qU^i zIf=PAFh+?3L`>ZtHwPg}NWoaRbpVeT`)~|1P6*B-;trrouq>2hA`EHmP9md_Wz<GQ zTjc^CMG-{|ZB49407@W_&YMsMNQVFh-&NSE1W8{E`+s=UKvRG#Ou{dFK-bGGV69Z@ zKZaCvt#9z}9z$Ss0`4E#hISpmSTXad%S((g#<Y*wX(~q+7G=9gROm^_NUvN6cv%!~ zOS4W<DBehPAyI+dSZhFQ5(eOZ0pI|@c0)h~%$)YQ2I}Q&$+zlGuSUO`9*WZb3YFsD z00;~Md4GFDa}4|A)vs8h<?=0M09M2O@>Ih4@@LfDzmcK@pw#e0<cXkta~#BH10=)! z^b$S)CLd@ZuAB|Or#}o){29E!oDk^{@QE)9#PtFIp8#<37r{la2)=t+P6H+V9=t<3 z_{r?%6d=$(xcELJGs_X+VSoUB%%~Y->;k@?LVr<Y=EP|rc7WOGS~Nq5RpHcl=<=oq zmAi{Q^H+8O4ct3`TG<^ab2scjle@M)ek*skG?1$%^l{pa^7_!U1h$>+#*dgDc4dH- zzUO1WL-$FI{8u^y=mDm6U1QN{3cymf2U))rG*Lmy_VLptCIDYh{iUmQy4ZHqb>A81 z6Mul!TTS;*0;u*4xp<D}=)wp+e$+WYrY3*58K>qc41%H*zi<f7xz>f}8+?dznJPBA zTE`E!v*Si?AUBe7HnJeIjB(ZZ13E;^F%ZQq{J};mViSy1QdoJPVpxpL=^c#1bsP_r z`vGd9?Lnu_TUC}eP&^b6MR=Pi>eN5VQh&RL_e7ax57q$4eypqY1Bu5@+_iT94b(0H zRix77TkX!!nFZj5TkUM^j-~U2R7&m|?cPDVIoEHgT>!#*SMGI*=pQZ3c<xq1C*`Bp z{V!TIwRUT1R*s(J3fisJ>T3D6k!D9Ms+hPIcdgx!=CyL2mLHRBwY#|1!Wp}-SbssE zj5LelI?zDk+QF~%$w>3(i@*T63wQutUB0?}*#hH10DyL1K%QUFG{74`tG^MpbP{+6 z;D<)M9bjM&CV|EtK;AFQNe5zpMe83X4Tfj=2Y$vLbpC-R?SU^({-H4#<7rs_VI}g| zJrTBlFycO5s@^}WDBO+DjO8Cz5nvNz2V(gL+)}C%SJ-<0kmGvLSoeDWkWWi<?;m2h zOUftwL!D$*HFhYyf56{rbf9!(y%EmcDVho=|9~}_(r(K?oQd8)JjZ{Ce*r0qtGa)+ Rya@mR002ovPDHLkV1kgnO%MP8 delta 1180 zcmV;N1Y`UA39t!}B!4haOjJdf(4bmMoV1I*5D*ZQbF@k+N_%3Y|5{rAl$5=!z5n+A zYGQld)!wKO5J)IU000192mKlV000SaNLh0L04^f{04^f|c%?sf00007bV*G`2j>O{ z0|*C!`R#E400a|BL_t(o!|j&8j@w2M#w8H!wc^r3E|vGF{(pF+FZGhMN=r&h!$vB? zd;uc}TnC3BdWM5LBSomvNOQO@o#BVd%#xJIB_#()nHvEjf&K05U(WZ<X8-G$f2)0Y za~W6$X91u7nAn^H=8FDAAcw$wVftcku4evxDd63(pOy^A&6e35)Lbov0M7yv!4})~ zQgKjR2@z~8z<&iHUTy;|0Yi!eqy<n4p#u&kf&fZ;5gG!ap^XGK%m!RY5=aF0HBpWL zOo8n<coWP3*$}|VcNsR!!$wC9$G9b+Ngx?6!ii4+<<mW&WGr)T11P%Q*Z8)>DF`?M zyIZk_v;%}FW)5`i9OvlcvbXxUl&uJgxZNZuXc0W2oqy{9S0}+HHv5zW>I26iIA##n zy*+>ulmX-$1SA5;rpF~}Tsf?A0;2uzTyEG4+KrpuCX@)=V<!J+1QbpJ+xrKa<FtRg z{{^>bzkd%JfogbOF7u?^|B886AGnGUU~G6Ja!<jkxen^B0leXPx*n~+X|D<JL+ikI z@SP!wpMUC4xF(Ej2sj`Q1;)bx0XYHS%|FzS^`ZXrOFRw4@O}Leo9oZ!G^YTC{p-g+ zG?-P602e2Sz+W1gIr=u>&=QJ5n;S=fKXI>57YYGZSUK*xb~6IY?aiJ!RX+g%I}2b{ ze*k8_jlp>_x+W$+K12Jo2*_Czbe+;sJ6)QVz<*;G>9~l|v_k__^qr3Z7l-#EY<~r3 z0GePHMG<Z~OaZu+?M0?q0TUTGZ;KzLm;f9F(arH#(upb@MW?}}yjbhq2zKAli|A(d z9MAFZyvL$>uyX*<8Vhng(Kkbbz#zjXI)rqbc)rFTK+ZEJMxWO9<zlv7^EJv1hg^&- z$bU==$vS@k%S2cPqFA6mSd$_)A%J<spho&=G1kXAm;|Not6>Q&fb2o1%^McSeW182 zP!!SIBuS_KiO%{XyaUiZdr%?({bC)Kcc5-NaVPD5jc7jwsv^Xuz141wgJpvXSEYUJ z_PJF;LdMfZyHnI|DXEqY3bD&x#4AdX{C_~wjODHxIw=Q7UHwL?N!m@)%zV4dqIQ#7 z-S6Kw(rk%E=z}D2C+$XQE}8AL93ObA-Nge5r*BuW0<MfStKy+1z_ab(E4VV!{PwXn zK<<r7`PJd;)7PgjEij%00;t`OD9@i@8juY@>TiTCn*=^0@OLBLm+S$Yw+ATiPk-^G z12Mp%^$&8|9-RDxJYx?!{{WNrz~M*#&=`#IGJ5`@Qn_#6h`xU?;y&K0lYginNXK`k z=O3y>sIdd-`3L+;A@povJNbtkKM#m5_=kL2nos`0=cyN8@DGuv!_d3nAMiC~?2><= u;k?-e|A2ckrQJRMa8B`~XC?a&@f8nx*mTi$a(Dg!0000<MNUMnLSTZoVkLzD diff --git a/graphics/pokemon/gengar/back.png b/graphics/pokemon/gengar/back.png index de0fa6599e0022e447e62999327021a20ea8df55..04b627f9ac0d5718a728f79c4de94faa22511185 100644 GIT binary patch delta 728 zcmV;}0w?|11&0QZBu58yNliru=Lir57a73cb9n#&02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<ACWE_fB*mg-rnA7VtfD1&F+wp zxN2&>tiAsL|Nj90XlRI(l(c($oLX9YIXPkw5D?4%0M!5h00Cl4M@0Xn2lB-L00JvX zL_t(|ob6M~b=xoyWCJ2!><;1r?4$<2RFL@UQ?5>du;c;+M!pNXkn>)05dbkhi&A#+ zAplwFz<Uw2e={7+e$X`Uk;9%nQp}FwcMnr)`&{B`6%ONaV%T|!OC1SHB!(3%;s2qM zy^C2`5`(j?U6aJDr=wF+!Vm}!ln`Ku(bDO;QGGLGyibG<NJ3b0($Z<s%2jJ61>j~P zkOYzwCI}<>a~6mm>1NI^h~=322+{{kgl44ta&AGPe<uXI2XF-eWKTLA%f}>;JaQQn zi6Etlc=G67=1@HZJX;`wqbN8YpDeTl`nH@#ve2bF|3_%XvoPR9=+s;J$|FgfBOGFt z&YhRQ?U1&?xiJwi7mEUOmyYocXN$|kA`&cU*oV(m(T%MTn=~p5$f>dF)_R^K4upDw zuDZE?f7*)h2s&zYnB=}H_vs-J2u+==CG;0FXIRO6wJ9a^tywf}2~(M+gueapliF0K zTs2kw^?t=0ol|%+_3!r^?;%T=dT77DZFpTPiE3zn?vNKgOQ0>T7^%Gvng?NRBsg1H zWO3S=16Wi6SGC1g>zAq{sUTra7W?%&Y~7CTfARpTx(0o<^Dm<XG$CVa0{*(%4gT4f zs2sga@%QrMz<9Q1>eY3hFNUTqt+|?@KV95VtBcyu)`Sn2Y_XhhBw+mea?Qik?#;8( z$>j|%oYvD@Ne3O34qRn-;IRZeN#PiYVd-I)@MK0GOTv3l`~&m57BMr#@9O{n002ov K22Mn-LSTZEE>FS$ delta 682 zcmV;b0#*Ho2H6FWBnkm@Qb$4nuFf3kk!u@&SXg+FkgyOC5O{c)I5=QvXo$FIXy}lT zxTv`J@c3w8c-YX`h&VV%C`bSR01DGG)Bpeg32;bRa{vGi!vFvd!vV){sAK>D0y0TN zK~zY`?NhsM8!-^1aJb$pl5GIdR(}WSn!wFTOfO0#0tEI~xJa7xZt^3s3)ew9mrfUd z82O#-@^K`U%O7|fQ9E<P*$3HM6k%qM7>iB#-NKYQUX-}lheN-c7-m)Cnn!|AiD48; z_<!$&9$n1B4jGhf%@QRRBOaa58oEGmAd~`&j22H9OpI(n_?QR{poB8$q{Y*^)%(_H z43LM3fD#g&5J6c@pOZlJh&NMyjVwoh)GN?FU?Q*{^ShM+Aw41BBY-Oiphwi9*j*)o z<dMq2NCd4##FIzwGKUx;;MoEa97e(M_++6)(6{A0l7%MS`9A{dXJL>Np%LR8A$vrL zIl>UDbZ%Zk9=o&+&h?2PbFos%+@(#t!<phTwT=V>9Jb+eQFP;|)FF+^fTUD^Uv+D_ zN)iL2p1`YaE-#NNJc0&W9VWT0%DsFI1VmFOYYG0%t_Y?{q`WO9_`O}TwuG_FQi9+A z{(x;NQ?8mS|8lpdjm{}~HuXPu2k#-P+InaoKObmaD~W1ow_hbKe3p==xT44QzH%Cb zF_GX*Ws$^jX9h4*1YFb>uZ>@Sss^QkggsmA>*ug_C%nr8Qq(o@my>@PEl3+OrY6Xn zms97Tjg89D%M|Y)eszRrYqnlp_w%u1ZE4Nb1pedk30qy%CQVKF{y-MX2}gpAe?L9b zFuD8ZS@GoZi58AiPosxKh)M%h*$gz6fF~*0M`BodI3+xp;hU217L2hKzqsJ1e~eYQ QxBvhE07*qoM6N<$f*v?HW&i*H diff --git a/graphics/pokemon/gengar/normal.pal b/graphics/pokemon/gengar/normal.pal index 16892bb23c..1eb1965ad6 100644 --- a/graphics/pokemon/gengar/normal.pal +++ b/graphics/pokemon/gengar/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -90 74 156 -180 139 189 -16 16 16 -148 115 180 -74 41 74 -123 98 164 -255 90 90 -255 148 148 -189 172 189 255 246 255 -106 98 123 222 213 222 -168 16 16 -72 40 72 -0 0 0 +106 98 123 +255 194 194 +255 144 144 +248 88 88 +189 172 189 +255 0 255 +255 0 255 +120 96 160 +176 136 184 +144 112 180 +90 74 152 +74 41 74 +16 16 16 diff --git a/graphics/pokemon/gengar/shiny.pal b/graphics/pokemon/gengar/shiny.pal index 175c4681e3..8721d43483 100644 --- a/graphics/pokemon/gengar/shiny.pal +++ b/graphics/pokemon/gengar/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -88 88 120 -144 144 176 -16 16 16 -120 120 152 -56 56 96 +255 255 255 +222 222 222 +106 98 123 +255 205 205 +238 144 144 +184 106 106 +189 172 189 +255 0 255 +255 0 255 104 104 136 -184 104 104 -232 144 144 -184 168 184 -248 240 248 -104 96 120 -216 208 216 -136 56 56 -72 40 72 -0 0 0 +148 148 180 +123 123 156 +90 90 123 +57 57 98 +16 16 16 diff --git a/graphics/pokemon/grimer/anim_front.png b/graphics/pokemon/grimer/anim_front.png index a2363840e719ac5154dfb96616eb99011cf17bbd..312a64aa5ad4ce8b0acf798ab982c2835cd24d6c 100644 GIT binary patch delta 1174 zcmV;H1Zn%+2&xH?B!35VNliru=Lir45FLpzOOOBn02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_|NsBh)!wYMy@QLKK}uTg-tOM4-n5IfoNAnVN`Hf5IeY&A|Nj90{{a6G z5D-?E)Fc1^00Cl4M@0Xn2lB-L00YiRL_t(|ob8vfj@w2MhPRbj5CR+<$ZIHmf+$Uz z6t>}XK^h6j3k)e0f(wU3vY@Moq#Jcw%@yY=+=zu<NkDv%A{Cq2rH&_3l#w=o1~}lL z`EPc1hT{L75P!G$e@8FNzAl&pd}@7^WgnXY_}r{H8vAFTII1mh#sJg$aHqslCCwws z!u(CfwL>BP949c1n=K&5#WWj@`0$0;K>~p1XY|I11^A=U*c<ux!rkKmaeFQRj|G4H zK8E-G-)Jiw#Ihj}Ws32-9{>x!<=QS{vw{#Rfap0u{(nvXrI!d-B1TPt<CA;=8U5M^ zWC5ipn*tZ|C4z}5(smyaHLuA6D60IL<aUpgwgx2%n6YB2HLWmF+~a*qaG+qOO>i!W zQl!sq!IHbv4{v`l0wkhsOTe>{$-`SKIHV!nwemb0!p*~Q_(O=O_?GP+`3xB+e-FO< zF~%7A5`XO$%o*xoFc|zCBVG>LhOz>wZ2s~DE-_)jE8JfzAe@>0e()|vet0mxY=Q4F z(_emqgiHYycL{=fy@aX-#7&1{$Gh^X7BGrBy4bK_M!YP<P<GtIQCf}HyamFXFl=v= z1;jJt6RaepOF_YZXO_)L-ZsV;O%#xuE5_y?gn#SHCLF$l>Ci4C?wYo;52eT78C!<h zqj0b+PKwgxskIQNlz0~0XiHE`NQT@)Zc<&(gbH%9fppr2ZnofZk7NfOfX7W<Ucy!8 zyXVDv&qH!`#}nZm%>cHdGg-w(U(em*7Pq*?e~czqT}BVU|LVJ@2NhRck21I>s920& z)_;N5<(-zrGU1Foej|1@QLz}g{5~zQ!#jHwi^+w?9d!BkiN$0j)XwV=JbTV8_JLUp z7yG2kIiK~J#rn)*xHzyY)y9}TB5uuM7#&s^Jyu{`HI&Km#A5esS@Q9k4m*gkl7*;Q zj0Mr^$&pI-nhao4CMOo7)G$Ep|7?@A^nd3tk!({Hiy0KF-JRhw8G)ZcE@RYhhC^vl z?8)6-ZWkb0dHJ16-WbebUor++x1bdskz_;)_3Oc_ch*)Lq{L<xNsR7b_J#8vhABoZ z!r17e5okT+9ffHH5lzC_qxuv~^nnS%8ZVb<I<xUiLqTxn?~P@-#M|338W;m-oPT78 zj~XQ$PNd1P^um+H6O+;zu$g}-{FRxIY0o%3^GtMh$QmMP>7zV>n5=&4L;hmYwhFM2 z#Iv-RQVSS>z^8dmbKd|4WhcU@5yJ_*O#!yIrJ)>Cp*e@mQMmt@{^#a_*qfv-MJrrw o9w)suzv*`JaV0mtxElWg;<3LyuMg>(k^lez07*qoM6N<$f=QGqjsO4v delta 1095 zcmV-N1i1UE3ET*fB!4haOjJdf(4d@ZoZhV7VmW*6-tM%Ev=9&wdrE`&`1pg1oIy%j zthBw*(AWR~0000000020$2va%000SaNLh0L04^f{04^f|c%?sf00007bV*G`2j>O{ z0~7`jiGaEQ00X~CL_t(o!|j*LuHr@zhWp5pXB#uIymleOmVekW>=9D3wVkq~tO$rk zbFu-Bn%YN^!sG!mBH4|Uk!I!zGQ3=>+m^wXlgly^B_Sc|r@OkU@&6&jJ^tVE;5dIT z7y!I%edIWwH3cwfuDO`|H=kH>TVTxrhV|xFgi)L~w}?Xh9f#LWg!pov!!T=>fS83t zXR+YTcVY!O0Ds=@@i0dW!Cx%q!NNZZdxKlV<*fh$7JUBA9KJn$MN45JMh$_8T+C*t z6j<;xuWchXR}dmjp?D48{c`#-$c3#Ci>AQxN&N&4eSHFC0lBD}0vo&of{r25a#IjB zkI4cE%lwSga)acy8YMy)v0^AC?J<wJ#$!vcrF0~9aDOf@T%<``aNz3X<A--zfJC%x z3Ai^ZfBawsTQ{Mn_8qa2aQb*Y|CS)ee9F9Yi?%Auf4KblCc_N*5R;C;!uauWx%`nK zb{k!G+Xz%_@_ElqwZ<&?gq!CU5Y|ZketDZAUmnaRJpy|qU;PR>=>_7fPmmtv0m>2( zr#*@l&wnZ?OTeP&sbb245%I7P6V-DLE0*zm##12l2$N%1K-@##!AKJ73PS##9yTX= z+L(2U2*J}w%=9@3XWb$!K7+2%3?u97c5E(Xz`q%@3{5-ZjKWG0={&UtVnqsXf(va4 z!ZE3YYw&cc?@q+2M<$S}X~@>BxJELKP9fkTyMKqUWBuC;GP&U<*|O(G*lXQ@rRYso z^OVo$?s1QM+~Z$HldF1I4ZxrLgTQdr^AV-b2}%~@hjkh(dy8WhbA+`B_=(t8M9E@g z^Yb*q9`Af8SxoIDuAtAqD;86Qh*v?6;KgfZvG170aJR|(ob$zrS?t6thPy4h((&5X z3V(5H7Q<q@$0EPts-{eiD~lc3vecwDv(#A0PSh;Mf?|Jlq=>!70T@Sl#bV@Y2B`g? zZITZD0LF@Ks$?;ZVzs+7T;>b#9q?3!^8NX&42oUd-R5!uihbZc#rb=UIqXZ?AnOuj zjB6xSP>k~9<<nbZs|`|OGb<DpPcVAL`F{Wt7mF5QOyyb&q&)MC61RkiCShzaewmKt zmI=WaFE7z_X6>1pg5bvA8^f}Rr?+A>&<4&p$qrvMmasVC=Iba(DvKv3r5j+=e<=LD z?vO4|J3RADakI$`3T5acsz6MYuX>X&n6!-o3?y+c4W`rr1|aZh;L*U>fI&`07(g{* zSZOc~!PIupl%rQ@_F=jf_V>E}fxZwMos?0BFQmRsa;e|RJ74_g_zR)Jb3Mr%76bqQ N002ovPDHLkV1hU~4nF_@ diff --git a/graphics/pokemon/grimer/back.png b/graphics/pokemon/grimer/back.png index 280c733fc5912ce15bc52c5c1d2e809b187ae7f7..030242885ef180e75355f11ae9812bc56ddc3a6d 100644 GIT binary patch delta 625 zcmV-%0*?LZ1fK<vBu58yNliru=Lir44?C7-!1DkA02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<ACWE@f1uF+|Nqt1-mJ8}gNvL& zN?OhKq`l^poXvxSv|?hEK}vfm{{a900RR60{}2!mE4zZP00001VoOIv|D^}=#Q*>S z!%0LzRCt{2lRZwuFcinLQV$gp7wF6-I0C0AH^6l}Ft**8NS-r*kPyUK3QKW1<Vsx- zYBQMkY$weZf1N?<Uy2mz|MT<vauA&KUj=Y~%svCog*xItjBhyS@`#VX@^=Ep<1rTi z5r69S2e;@?02NJp0gcylu$pgsd<LOAj|yLUfDIfZ&#$_`t`3YYx;NATc>n4E!=xVJ zqkBiLYJ^Hh*KMFsj!;VBmpos#fxSe>`XrEVtyVA%e?&;<V=TUE<yf9h>?PRDyJi4G zxx2HVY%`lcmU^HnqzSNTLf*m83n=Qqdg7ydnJqJoBsG_=N*5%~+f86|;gYvKfGlnU z!-y|^3oOwAa_~j?K3Ra(ve>&B`e`IC!g>=7GUuCm1y*>N@!3GT{m#Jw(PB{oIH_-u zzKW3ce|xCGju@Z;WFb8=x~vdBKZusD*c3K+j(nw70b7f54XSm}kC-?{m>IRD9ze57 zrFQX(W%y1+ZZO+VdXE)BQDh25E<uKnQZIIM|DvjK$9YmfC}_hl8GKR;zJzL0Zk!U| zp`;bW5Jp3fLT-CXN$ObF&X$r10dcks%5C(>AK`}pW7=~)=`ZUCiVDZmj9W`&00000 LNkvXXu0mjf>*W=S delta 571 zcmV-B0>u5F1?dEkBnkm@Qb$4nuFf3kk!u-$(4c^@V7TCrNO&m7@SvE;fDjN6V30ug z`1pW`m_SHasIa)u(AWR~000000000>-#w@R000SaNLh0L01m?d01m?e$8V@)0005P zNkl<ZNXPAy&q~8U5XK`5?bS()d(PI{Ytv%l!IR_#Qs_N3umw-XAPeFH=*>s)UA**v zv7Fi6{ExjC`avM@{dRU{cE&mDWCd_}%)S620(Hc{N*;v}{D_Z0`ac0ll86An7cZm! z^alMop!~%s5aRU$v^Lp@&%ib3QSSQ)u!ctb^Lq&F+Q8v!ctab2`{w~LDcTVphId4& zMX2)d(+6^82&EK$#m8?S*mHEWPXhjb)@ua|fe3DVj3t)69IMlXz66_j+YKNocXJk$ zZe|yVOAFM6bOE*~$ZPy4hrA7}<~F*O%$V#X847NyG(o(m-vqV^O!B%15PN-K;)~R_ zKobKX0$YUblLlBTi@kY6`x=Fbuv$CQ*!Z$tffgQSVm1xUd`EPMhIzZK0DP%`r=WZd zT$=AmNX1cZ9UyjT$>_2?u=#<Xnqo^><2mw`S~_fn%T(28%LuPAaf~pNDx)6Q8XE1q zC5v%Sf=FVvceIZ+K~Z=KdBlOcP*N{;8@o~Ub9+&dgB#F<VKTT<TaiNjQsy~1?jffU z#1Jy<b;%5j&^@IjLr*uNCteUH;Ki9!O`}Dc9|ELw&N>-6&L7ScnL;x1Ei?cC002ov JPDHLkV1gwz1a<%b diff --git a/graphics/pokemon/grimer/normal.pal b/graphics/pokemon/grimer/normal.pal index b7c371b486..5d2c17fd75 100644 --- a/graphics/pokemon/grimer/normal.pal +++ b/graphics/pokemon/grimer/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -156 106 156 -222 172 222 -98 57 123 -238 222 238 -180 139 180 -16 16 16 -123 74 131 -248 248 248 +255 255 255 +213 213 222 +172 180 189 131 139 156 65 74 90 -172 180 189 -208 208 216 -0 0 0 -0 0 0 -0 0 0 +238 222 238 +222 172 222 +180 139 180 +156 106 156 +123 74 131 +98 57 123 +255 0 255 +255 0 255 +255 0 255 +16 16 16 diff --git a/graphics/pokemon/grimer/shiny.pal b/graphics/pokemon/grimer/shiny.pal index 96ae46dcbe..c5fa29f3f9 100644 --- a/graphics/pokemon/grimer/shiny.pal +++ b/graphics/pokemon/grimer/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -128 176 96 -184 224 144 -72 120 40 -200 240 160 -152 200 128 +152 160 208 +255 255 255 +213 213 222 +172 180 189 +131 139 156 +65 74 90 +205 246 164 +189 230 148 +156 205 131 +131 180 98 +98 148 65 +74 123 41 +255 0 255 +255 0 255 +255 0 255 16 16 16 -96 144 64 -248 248 248 -128 136 152 -64 72 88 -168 176 184 -208 208 216 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/pokemon/haunter/anim_front.png b/graphics/pokemon/haunter/anim_front.png index 03156dfa4c42f847b8094be4cb72922c79d7b0ad..63415497c97512584d55f1feb3b68a60b5690604 100644 GIT binary patch delta 1087 zcmV-F1i<^}2h<3VB!35VNliru=Lir52ML#|aZCUJ02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_)ui6VoXxC*#e-UlQbA(>0RR60|Nj90-dd!z7=L1F007n1)pK)m5D*am z|Np}$G-v<-00Cl4M@0Xn2lB-L00VeQL_t(|ob8uAa^gS`g%wDt4lzKwfm=#dE<8$A zlr@tOh*LRWgUvRu0#4%ts0tB4Fq@dvY<KH_5W-uVxjYVRc%R<%{6IfD&iDA&@pwmf z=l=^V#hp1m0e>u}OAunZ2m}Umc)GX-!tRw^1{Uxv#0<1v@e8>WLE?-600AOWK8Tqd z8puZkfJYz!#FfEv(E>pF+%iBwbO25!?F!sQRYIi;X&X3R2cRBY8MKQ4cp&}CfPqGz z%MpVHc%TBM%xni&h84gC%2>w63;{SZzy(UFB)JTbr+;?>1Q*bb{yg60S&%NYYW0Bw z0jz(tdNwR`vt<49(bHYobJ)DI-U6gQLEHhf4Ad{@dI?nc6M*i3Q2hAwak;!PpyQRJ zAOujW8t@MwAk4IuNi{{{;kN7{Yyig(s@s$p*5e{&AZn}d4<-dun$wP-FPt<?BY=dD zO+Hc;(SI(=O`iYe=kW<3pd>&-fHQd}KW>lPpIBq8Xb~ngX;7|6r_1g*@$R_Aq1t0e zi!>?=hpN>8IH^f~9k(ylF%V!7F}wpA5a8qc$%~R2fqHR#TpH9KfF?cA?5xXfiwQ9M zpgK9D=q4%aDyV%?HkO`Q(T>y$ZGfckty@ke-G3xLZbdl+(5ZiC@lW3ZzQ_0YLL<JT zyVK2?I@cY8JMH~5{a>u6faM*43}#aR8NdX<2AB_S0?(pqt?>=S6K!|rZ_1kn&8WXj zhd?K@-EBZ{e;&48C+x=qYQI*0_s%sSs>i9NTme0KB!N)xCV8Q*+cE=nYhGkszZeW% z0e^bKo!4ADq}03Tz1D1dq}01NmkzL(kz(&&T(C8t<8gv|_w0~uE^kR2AO>57y?e$- zl$^@(IsAZHvoxoCH>y)l@gqOU^BS;q9)*8GATMv}Sn9e4Zs?9)-*M1+1B}HzoFUGe zBJEJ!0<YVj2;8{(o?5?RfGDZOj~mE!lYcPmv#c_i7Z}tzVOSs0I+J-(i77>m08jLh z#P>>!AX>Hoqs@9QK$t>=Nr5-Olof!!bz;;(j3EU9zvS}p7XmWHEN80K%LF~BZm)_B z7<X1Kr1-=CV<3=0FOoP^OyPzQAi%{-W#sTX7&A-CK*&d;%A&N+req)i#l}9y95@T` zF)gN{f%@}f>de(29_%A$U)XQ=fXIuc!%ya96Y7^6e*uR`#}!XwykGzT002ovPDHLk FV1iCn=mY=& delta 977 zcmV;?11|j32<HcoB!4haOjJdf(4c@=h`^Z0P(WZ15D=(<!1(z1aBy(27+}~~pwQ6J zXaE2J00000000000000;Z{&{v00VMKL_t(oh3%J3a-%R1g>k_FB7+ZLdAzqGaCr%3 zdCFN5=mVsjVxKdN7i67TjBh*L&A*Isre>FlvPkUr@zg?set&VC@A0qW;f_9A{x2|> zcjov6u$nGG%IP8y7|h}7_!`K%Phy^0z@wCF(0aok#9XF<GXemlhzRj4*J5ZO9uNQ? zsQ{2y2J=-50O?E100G$nIGM03n60W3DqRZOz;QbO_4LZ1T?D{0=~o5}H2PAE7&O2$ z6(~e#JIq8@0e@Ve@P%*85P%Z{T%Zt2kjnsBybvI{fOhofaf?Suy40%G2Mz?V{@Uu{ zu*~h8_2RXs&qU8*`@(t)kiG!F185nj7pHm&RQLiwcR(h8{Cq8nHwLu7aTH_#YEuK= z9wcO;)*`5;2wc1^2gn-0@zUxv1%`D$ju^<>D!jdkz<(s>c;@S4C(5E6AmD8i^gOuv zIWJ9F{^INL3LqdMKtPH!xu$%&JYD`^jlQBqn8-wFvLT%gyW{xhrwb0%ZbKADc@jHR ztp>nJP4N5a@=<LA0R|DncOV1;Jp4ZRP(mY6FOIiMgE|1vq<fm3b<y2o0?Z+;cFrg| zNy<73>VFU?jiqZgbVuriHb4-2)+r~GZW0e~MKT1?sefkiPtO9r$M^U`!@r}?rkgW$ zt~&;I+WTkvzuZg#^E&_;tfv4nfC+#NFdy6m9%a>9{TqlY+wRV9%9{qws9&Z-pp)6| zHXyk_4_mL3_2U7xU#q{nry7ve<<wHHfSx>(K!2!rle|*bZJB|(HLt?1Ukrw>0KMhT zYpxw4>fOs;YqmWi>fPI-1MFo)*t=H+w&s&RPEhY&@562J7PJ9kaI3I)uX&4tV=_L6 zmr`pM=2)Ibb?PZz?geF81Gdg1_KpaY$t@jA-POPi-O;-{4!UfBvABmb_+?Y19jaU4 z{eSWYfg4BPRl9c#5DB&TaRaey5{A8(RVH&&gE}V+>k+LpnVTn=Qq%~rphptFOE7|H z(FTk*>&*bN2y#pcd;?5U0q9#NMxFW?QV{SGE)RbpAR^3irdquS(1YrBtJr{XXETEc zfB1h41VZRV5{HV3XBngjaPdMJF?<JOW=e?|$aqUs5+~N)Bn$+g*x19EV*wtf#V9jS zKR>3<T>as~A$Jb3{dEt>-F!Oygibi2e!1}%184=RCFpd500000NkvXXu0mjfX}iCm diff --git a/graphics/pokemon/haunter/back.png b/graphics/pokemon/haunter/back.png index dccfa74425ebb128e528e3cd6b1be3a1705bfc02..babc9f43c536d9b82706ce61d293aa7e7d574a9a 100644 GIT binary patch delta 763 zcmV<X0tEf@1*!&+Bu58yNliru=Lir52Mc+m5MTfR02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<ACWE_f7PVs#f#OfYSn{Ub5cQS z{{a900RR60|5}v)DPq+KF{IVi)pK)m5D*am|NjFD=c51s00Cl4M@0Xn2lB-L00K@) zL_t(|oXwOmkJB(5#WRrQhI|Nzt_*duB9#0+oP?~1*ux=|&&0xT$HLO#TIs}mm6*5< z@fl8vvlJ;Ce;cCw?bwOq6v}v(s;17b?>#>|iK3@Bp1nE)#Mv1jS)Y;k58(M3AUg|? ze|scA!ga)Q4iuqBOl9T$f@0y((tHw801H4-nn@oBJrbaFv_YUq1BqB5L0B~cOApY* zO4{pF9)=)NMu|8D#KID^>GkDF4=_o|3w>2C%1q2Oe-&f^fP@mp11L#>TOdrKi~<E< z1}GL1=)tH4hEbl9Xt8hyKnkRq1CrN1kU_BuJUATyDJ>I9bUK2RHE}w{EN0xd8fXb2 zX*LkPN8H!6E%C1%#;2vejYiWtV$4TtJ<SD{VHCLVLL@rh(1G4~qre|vJ*8AYtuc4& z<VWF!e@M*A&FDwqXPNsw3JdVg0Y~8hiBO|<=YZd(S5-FxW-wp~Ja|B20VZA6*T-Mq z{ReIUWIb$o1Mu$KSFx~=)YgPYm*HmuB-H@J8cj`XKL}RS{ahGlTQuK)F@Kou)1kr6 z7R~p2g)`g*#BJpBmhN||7wmEB(d~h2X?xp0f2!W=5!^Ym#Qp8{XS{#?-V%*yXGOwc z`*9aV7xHQ(0)TIS?E0GxSzS4o0Ki>WH~9FZ`6qYiARL!KR`}+5>ki!l_<*mAT$O(X zE=4X$+9(Tj*#b~+2=2hfW@s0{p<5GDzua1fIs}>vfzMFRtw0k-XsV6=8i95Wu)d1! tDX@#KJh(N?9QqFD?(o<h)FFBr;}2LxP0sI#U%~(Y002ovPDHLkV1h_iST_Iw delta 708 zcmV;#0z3Vx2J;1wBnkm@Qb$4nuFf3kk!u@&fLL(Ah|o|#Xb=z(sA$mm`1o*ea42BV zSdjS8(9j4lpa1{>00000000000NF0Tp#T5?32;bRa{vGi!vFvd!vV){sAK>D0!&Fn zK~zY`&6GcHoG=*1sbI)>FE&HEov-Y;2C3;33y_dHanzq6)eZd=l`g|Yw^Ztqs8f}H zPMtb*h;(1BufYcMr@5g^ES(PQAMf+{c`@D#9IsYq0KYy11l!er1M4$DeHLKPYXrci z`|!mW2&Wpp5{YvM;Y_1c%}_)F%mArWEnHwd^QBZTgFqNhO86WJMv@+wYk(#;!dx$D zv;-5v3-}U%8Xck1LIaB$&^l#r^i?!}3o~e^6=xj)jI9<lK(QF80oDr|kx~Gp1;SYg z)F4U&-H4V-lo+@LAO@C<0YNhts3F`;G^pwTAq+Duk!uS=WX#qHM>hSU)IiA?i|dYX zHT)t|WrUCBXkSHo8HI*@_~=h%dYW<!qpd)>V<OQ0x(syV+Y0m%wuuvhGQ!k<?vw7g zV?y`JcrSY3CTiRqxdCWyfgN{%fXlviZh=pc6II>=?I1u9cyxfk07O`?uXmq+x(BWU zMAo%D1$h7K2cJm@Wn#itm*8&zgwg=P7~7c0sVkTa>kV&}P0;l8r+r{pS6za+37Vcx z5@)D2h;5|fl%9^V;N*J9(e}W9rgXR~u4Uom2x6S$)7`^wTz~j#h?JM3AfY;ZKYHGU zxax@sKo1{|#r>XbuB^%gz^==CJU(&r#cU*l>9_>8!7tA{V^ht5Z}_=rWb{wqk~f0I zsWd=d&j9(BVF&icLpcMge9Kt&@n96PDUe=pJVOmN1=6X7G}-IF9w^5z04Wmh7PH8s q%I;yLP~<pwi?3ZJEAJ%?&-)7>jGXL{U`itZ0000<MNUMnLSTX%LOm7$ diff --git a/graphics/pokemon/haunter/normal.pal b/graphics/pokemon/haunter/normal.pal index 79ac421466..8458b3532d 100644 --- a/graphics/pokemon/haunter/normal.pal +++ b/graphics/pokemon/haunter/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -128 88 136 -192 152 200 -80 64 96 +213 164 222 +197 156 205 +172 131 197 +131 90 139 +82 65 98 +255 0 255 +255 0 255 +255 0 255 +222 90 164 +180 24 98 +106 0 0 +213 213 213 +115 115 115 16 16 16 -168 128 192 -248 248 248 -112 112 112 -176 24 96 -216 88 160 -208 208 208 -104 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +255 255 255 diff --git a/graphics/pokemon/haunter/shiny.pal b/graphics/pokemon/haunter/shiny.pal index 8c2ce31bcf..b935601171 100644 --- a/graphics/pokemon/haunter/shiny.pal +++ b/graphics/pokemon/haunter/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -128 88 112 -192 136 208 -80 64 104 +213 164 230 +197 139 213 +172 106 213 +131 90 115 +82 65 106 +255 0 255 +255 0 255 +255 0 255 +90 148 255 +41 98 213 +8 49 164 +213 213 213 +115 115 115 16 16 16 -168 104 208 -248 248 248 -112 112 112 -40 96 208 -88 144 248 -208 208 208 -8 48 160 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +255 255 255 diff --git a/graphics/pokemon/hitmonchan/anim_front.png b/graphics/pokemon/hitmonchan/anim_front.png index ee3725e0ee1abfc262cbbd16f7330078f0f89bc6..d615ae6a72259c39ca31a854083f335818210afd 100644 GIT binary patch delta 1346 zcmV-I1-<&03)KpcB!35VNliru=Li-FA~xktDlPy302g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_|Mvgh&ECbd#iX31VoGzpF-rfGTIOO(y)jCQAb$Yv)tt?=d!&nVT0syH z5D*%2A$$M;00Cl4M??UK1szBL00enSL_t(|ob8rBZ`(!`z_|#p9GFDEK>H!CnmveG z69JO8rrk2OBjtPnQ&R~Pg>)Li0-2~K-RUGBz(*;IJGeg5MS>13k5*uJP;Kh^?nLV! z?_?BRGW4Lq=70O?-V^WL-On&S#gSd^j+<n%Gn@$^(*x-k0F&smq!A<IU0G6+k|@;! znE>E3)s;vnk%MaplZ;PAe4Hj)AUqL3qyeBt2@tvi5b=oWs!YeJoIneh(dQ6Pa$N?) zioW=YOg=I_5Pz1F-#)TSW%Pj3n4LYP@KKad#m1jucz=>pF_P?EDc<i6v-I?2LSxQo zei3iC#K3WSqdEM>oY5?y7i5GtfxhEBcV5j2nLvV^l2PCBHZnK>9KGTx89(7SjGkl1 zIobxk$MY)yY};lu2o!+N=kc6;KsI_zXES)<Z30I=p0auR9w8NA^t*V5rzVR9V6$X) zyafap&wu=J7R5F~U)qnaeE3;EtpgVJu@BvPb<^Oy{dIz8$4480!Ds#*Nhd~y!!X#) zpZQzwl25HWGOe^boHvd9D)1ExX7NfL*`0QyX;F3KL%b!5Y&5wlY#7(5fyB?WpQz); zb*)}QB8#nQTC0U>kfd#QbO20`+Nh>YVel5rQGY{i-L^1T(n5!Sp)A(K&4^y3!^$Dm zok1pv;6+>ff{fKbN)}rxCz{Qf7SBzl2265aT&@A`&kaj+faLUYH?YiXssU?xuxLtH zP5e-eMt;^&0hP{K@kgVLR7Be@R?)KUx`OCHGcExe9hMS^UMy<kZADv(uYI%phnL&l z(tr1IF%)0=fBd_Fv9~)8r!3wPufmz?xNF3=qKI?c>GqaHNgnzVaPfjrD2f1F*DWel zC`w<(0gzKD6h#1d(8G%<6pB)XxGQRen^UPMRgB$%$lz5ywW45GP9R8)qO4x^i~pi1 zkHVjg-HJj5p;45otb&GGMS&OD^NfRE-+yE}MUh1KnueKDQTAN97zbg<!)&1_a|O}! z($lxMA(M(i$sd8Yo<L5)?oRkAi!)FZdLC@(!5*v!0B{xDz4`sww+W>|f9-PLb9=4} z3;rSjV*Jaq?_h#qf8+KS0QSt}mcLynN+NFmRSvn@@UoZyq=9S!)uLlrc#E+#5P!<S zo1T}J<I!tyn;+n~%rfC9+kj_;=P+>(jzf?bf3T@2q9b7fkr@o6nJ1XzwH1ZMgirV` z7)V{>MxOnR*9-x>V!1=1IudA#t79z=+qWm%azDU*r~9Kckd4N_-&gxXjE{R|0~uhk zbAZ^#BP?FT_NhH^j~!R;y#S9!!+)}Y4CE04KLm;#IxouxB7v@G-2GtKe_1w=fh!Lo zQRZkgQW!{e(NLbe7z+cr+yDk{v42xi7|6w@V2FMbaS)JL8c0sI9HrRba6BxYTY03s zo>=t2<;@=Ohm{^^{K2HLu@lH2@`sfh<(;Mq=sYbRR~q%2!XGMjqgW%j#yb%z%~5F~ zdj-_XKnq&!ew8`wjS_HU+l^)ILcSHiZauIRU;0$WKhJA%=o0|A0{{R307*qoM6N<$ Ef`86$y8r+H delta 1412 zcmV-~1$+9{3YQCzB!4haOjJdf(4bmD5Y4oE5D*Zgi*xSPod5R!VoGyjN^`w2O8=Bv z=3+{VAONJCq{Xzw=zw_4JxPQB000SaNLh0L04^f{04^f|c%?sf00007bV*G`2j>O{ z1OgQL=Te{m00jC;L_t(o!`+w9YvV=~$0gKYL~^hc?cTDB#(&P;_GmZwkWg8Z-OEC| zZFMN*5&}J&Zowz}Z}3)>GPc>fmA}BzrLZT1SO_`zBtyx;rwo+-0oylY$ChM`duUHP z_+T_2y?Jl^etfMc|NByne*sKX`%i#T20$&#9Y7o~?Hz#I5{w+M5pt0fPz?^)s3MJ^ z+CqF)urx&TJAV!s)tU@=;&Z?xHJOjc0;ui)#1X`kMrkY!c+xOlnXr$E^r9NCP7uPE za=>|d)v~WH-NMbU2q6aP5cm|hK>NxQ-}fs-th(`aem|Uy3=?8>$YGs$q~&H4PrnJT zX<Ua0DlTy?hqO>kGe8)Iqwr%L?!X}g6N2JF*iQii4u6b4VlZ)p@hu@S4a0F3xDIIj zkON6_OWx4w7BCKQ-K`^g{xE;AJlX`C{R}_@TC?h=%@`{H^l(C(w5D3_5eIGwZr)^o z14?N#u#Kvl%o$4(qZxqFKT=LK;e-I0+(o{uW<YPoX+Xoxpn=Sab~?lOWafYqbd<ep zT+<p*4u2&KtERfmpc!oaU>a6R-Pt>QqG-gM21PkhnzM&lC+R2-!IJ$R<56_9;>tN= zGsf>BNhB$Ewg3|ka7y>C7|`H=-hwTX**ggU=I3CgD?38L@ILGH7I(6&w>$uF?@vq8 zq|_?GjMaKh%a)a9wFVcB9fZn~_OPrNt%Ym}uzz~dL50<+t{<yJ0z4M2R@@+*^<zf{ zl-J)1uhLpSwh94l?U}@d&0`6mrhrbnDB(J<SKqpw`J#a6Cf$_}r%A%Li4NrA2AH#a z93`I3k5QZ?+j*<OvrQ&Kc`4h#-R^mbaZUN67qqzD`_MCY5ikm%Q`3xwQ1YW7yq?fh z_J3z*`#=EE#*ZT4I*J}WRSgapxmghjKs0aD20%?$HvrLOIH4;OX4OJ=<`g}Q=#cxk zGyxI<Rm}`QX*3ir=s+19Kv|VTqeukFy?_oNGz!XO&&oai1ys;6-?z<Tfk59Q+vgI) zu1XXHHIXmTAbT*{!D9eqB8CX!SKAZ@a({r%{Uql<_|Qu)Vc&DIC+x#jPk``^vR1wN z8C70dc^5eGn@`T)8tzXHdipZgtRu1Lx&Qr(x7O=l2z=_sHZggReC!)SqksmnHxgq% zTAA>UD-GXr4U2%xc$1MB`|yiJG=Qo<HlBa}%gad&Fds!cB>-sH-+cbt*^(F>pnrV} z;};G44xd^is~~id53oD{j#$EOa{#}|Wv4v!@iQ2$Aan8(W7VV2f21Gya5lCj#xmzG z2I2Sv^ut@SB{BHwE8u!KNw`ufkQfS8E_fl2G48e<BP}s>x)g+a7nD~r+!voY8;PM0 z;kSm2-TU@{4g}EV!()@!L#Y0~uzwO$IOF>F?yQ{|8AGTGafm*h(qTA(C}!<cVdxXe zZ<62EbTozg<ZV6Omh~vQ;r*en_YdeOjz@ErbkfaUk3@^%v4CWohM#(%Fgkev)E+Ou zm`(?ux*$?Aoqu>EniTi*AdX|USg>xUEU3sxQNb2D>#_S2X1M9JhID{@>wPa3hIhv9 zOZNoX<&25t`y4217;6svld-eS_)%dj1p+6$;y*zv!&<RGP+RMwE*1zXakrF!M1rWr z^WR!akYXTZSLVX{HAf;K9)Z$qzUb@{5HQFY+a(}0E+E=F1cZX2c-mi*fcOV#WPg~) SZO?ZA0000<MNUMnLSTaOj+es# diff --git a/graphics/pokemon/hitmonchan/back.png b/graphics/pokemon/hitmonchan/back.png index 8f5bd8ded7f391bc7180cd669441bd72e91a62b2..e30cbba5fd6d81fb58db3c81f69f778c36e36824 100644 GIT binary patch delta 801 zcmV++1K#}p1-J%~B!35VNliru=Li-ED=oh(GQ0o)02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMbMa__V)kP&ECDV#hjd^T1s<s-v2?g{}_YS09v#FF@Kci_KU^UVw9voYI_I} z5D>#9+J^uD00Cl4M@0Xn2lB-L00LY|L_t(|oYj-DZrd;rhP8OeQ0igiy+fGQD$r>5 zW4Lb+CsRkWOR{$Ai%@QtZaT_9JG6jEd9Vi;k=Q#*lx<n^o<lqY|EK>y9*;rr2FsZ1 zI+Ide2OyK1Yk&GiL-u1_e^;zEz<M0eGGz#`u@ENHtOQVO%p-h-44Y6a8@6DZ3O~o6 z8R@gwga}xGdbm%P8U&ym1qx7<;h4c`zM@hoYc=GMv!Mw5w#GRr{N=^KIj8|m32Fog zG)dsFd~gz#2NbA5fHesYfFU4+B5gDD#W|TFAd?=*`+s_oB2mdvKxYz(4glS20cV87 z<_N&H-yRX`P^MP^B+Bdv+z8PJAp5Spp5Lq<7LT7#d!YK6BrRZ!d03nh%_aScB1af4 zr8J9A%VUaL6x5MWPR9E4xOzGRR1{4)pJ_U)!M#yJEMGiOI|Gj8!cebGF2u?MVNL+) zGuKRMt$#5G1bjw;fSR5fSW^nD7GRQ=h<ktxYBK16LP7<*E`bbcXV3vD*v24s2Bl9B z&rOSXNBQp#Fg02j`|kwE@I~HtKxqsnET5=}7k^b%lR$t%psWvK`HaA}yUP}sxda64 zU-9K@n?Q5S+X${ri8C^`SPOCZ=GTVVZLqU@0)J}MYokjE2Vu|FDoiZ7#CX8k;LC!; z^ZD9^$-E)Vo}Rb{YtPqmPJqP_JGTVnJ$*9Wqi%8D@iwFj>A#$ilL1=9wppLv-UoPu zh9GCM*k0(I-&wnl-M?l3Z6*=-)qHtAf?yI&?>z867^sgC-?jSvZE~qkA|7-4qwBnl fJ{k;py!HAINdc7&U0szG00000NkvXXu0mjf;R0da delta 742 zcmV<C0vY|d2L1(*B!4haOjJdf(4bgg7{JhA5D*ZMpg`d8i1_gMSV(YSV5lHyuz0xO zP?*RNFmRBNn7FXO%uP)y!ZXGI000SaNLh0L04^f{04^f|c%?sf00007bV*G`2j>O{ z1OgR};9@oa00Lo2L_t(Y$K8~%irYXCh9wj**J-6~LP)?HJ%508D=>x}WTk<;PQZn# z%QFOAEzT1-PjF`!2dPpT6<6&wsjX+o%u1`XWXXLpScUmN{WCi=E6@7}gR$$nFNC@d zKrX^-ddMOFJgvWp<{V%?4RDe82>9V-g-IR*D1XW$xP=^xP<|dxRG8uG_^^pOqcA`~ z0;J=0`Uyh-;(tjX0!2A2Guq8tR5B$chXM+Jw99CYeNy-o(a1Td08Say1mJO!z+%N{ zCo%^pP@{m~WUv5?0Rcown}c7R(`N+a!U4rlj}jy@F$wToAkhK9!;2mv5xxSjxa?6b z=7C7A07%67D{!Or5P<w6cY1NNecU~K@68G0OIfx6V}I;%cTO}z`cT)FU|a~nc0c#} zYz!EvBcZH}@$O-J=mDy(PsSWMot5F<D6RKT4oIzm!LZ3tPg$Y$)&W650O?0tOe`g1 zD+FAQ2my6EH;^pW7zcOdXo-vi$RH(y4u}L~aMxuZgVY*yKmxKcsH{QkGU!cHBF?CI z-vKN|3x6g*odG%C$ome68N&?w0~PV)MwK-g2v7*b=}PZ62rRl;w!qP5KtR6LKYq6v zsE<XP!f+O2kC=?+TCaY&wejV`yOT=-Qq)t%V*x8IdutVxl3Xf0V9M}j!D`cAyP#Y* z1Y6P-=OAT&E!PA{Od{8kfMTG}PD|7!_PbgHG+&V6%?S({phYE{^%?BFhev1#awdz# zg>KBVl*`KgjfZ!$tc{E2&3+5KS$%qTz@M=X;J4b`wfg-_d8yB8QyKcvIA7|o-hUW> Y0sjm<?M8TB*Z=?k07*qoM6N<$g65=2<NyEw diff --git a/graphics/pokemon/hitmonchan/normal.pal b/graphics/pokemon/hitmonchan/normal.pal index 2124609315..aee2892bf1 100644 --- a/graphics/pokemon/hitmonchan/normal.pal +++ b/graphics/pokemon/hitmonchan/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -90 65 16 -205 180 123 -16 16 16 -164 139 115 -238 213 156 255 246 255 -98 74 115 +222 205 222 +197 180 197 +164 156 164 98 74 115 189 49 74 255 148 90 230 98 74 +189 49 74 139 32 0 -164 156 164 -197 180 197 -232 128 120 +238 213 156 +205 180 123 +164 139 115 +90 65 16 +16 16 16 diff --git a/graphics/pokemon/hitmonchan/shiny.pal b/graphics/pokemon/hitmonchan/shiny.pal index 87ff42e4b6..6a2f264915 100644 --- a/graphics/pokemon/hitmonchan/shiny.pal +++ b/graphics/pokemon/hitmonchan/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -88 96 24 -192 208 96 +208 152 160 +246 246 255 +213 205 222 +189 180 197 +156 156 164 +90 74 115 +189 49 74 +65 180 255 +24 131 213 +0 90 180 +0 49 148 +230 246 139 +197 213 98 +148 164 65 +106 123 8 16 16 16 -144 160 64 -224 240 136 -248 240 248 -88 72 112 -96 96 168 -32 104 176 -120 184 224 -80 152 200 -16 48 112 -144 144 152 -184 176 192 -204 77 77 diff --git a/graphics/pokemon/hitmonlee/anim_front.png b/graphics/pokemon/hitmonlee/anim_front.png index 305a858f83453b3aafdd26ba6bbeb404a09ec3d2..0062524a88036d2886f08eebe12cba0699923b22 100644 GIT binary patch delta 1205 zcmV;m1WNnF3CRhNB!35VNliru=Li-D4g-KvsHp$|02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_?!~0dq=Te;bAwtrVmTQ9|Nqs^&2wU6?&h?;w0~+^N-6IDl*P?+b9*2u zDJieVo7DgS00Cl4M??UK1szBL00ZqwL_t(|ob8ssZ`(!`#|czI185-Rp}QZYz(58e zJZs88m!_r;4k!}^l0mHtu-@FIsW$^gD`)eRf##5<9eNxRSjj+g@V`Wel59)E>+wiQ zmV7*QEP}p4B7gAx==~t6dtXKQGNWQymQ1&F0FV#_c)TprzuK<XGoV=pJg?_KX^Q8C zUItX4(93F60R9#5b_k9bFfX}&GK99c2@{V2cHEPpM#O}P?m6@)m**NGZ9$caiDyS} zi3qKf5c2qjo8~1BVF%A!b}QX|{rHiXjUD7;*lf;M(SJ20>lK>$m@Q~SGYA6GUIq5| z=YW1_Lk5gj^q7!N4vfZ@tzk6iEt6Y&O6=jRS^x(f=qZQ`oxMd`9L_w7PF^A%t~?9= zyYRi|QPy}C8cB^+z&W(T_i;p7Ul~A%u{t1Hj{WT3^P?PK_jx6OqKpmzlKU%~O~zho zT?F)$DSxFw6c7TMrmX{N!X~Q4G0q0;8R;y;+C9!GN<Y8EF5w{tg1}JJaVen0QIM4$ zmjV$T9Aw|@U1^JS)+KqB$N(mApt?_bQlR#i^FgGmq)1((v=lIkZa<2E+jiICKrM)c zQ{MJZ-~3UOC;?6;T&P820Q-r`g)oRkIwOkj@PA4;#3E|`CcqO9v4}7f_qYW78+nBn z8(IjvpSx0E+AVpXmH>bu1FGzgEKQ;6?O#vNWGT}A@y{316nNZ6`K>}#uKyqZm9W@m zkm>*p8DUAy1KT`&`D>;AL-}@#FBI`9$P-8bYp+t+3nHvhfu_k4++`a_1XwoT$Ss71 zC4U0Gdj}3%$uL1MMPpRL>!xKJ%v`V%jgGVT7)YB|XEfZI-0?OW>o>gCq-M(+4WHf( z3mX)#9mnxaYFItJ#S+*JW+I;Xe#}<-yg=p<)sfZBEtEr$0bcY;hh1K&Vrs<Yu~n?@ zWDHTn7dd}$=2O>YCa?ZYfn)~=BF>=Mv41n*_e{<+{8-P3`5|RD4-eSYTX&oN){Fhn z$GpsZr&Xb4CCU@`s9yhx+<T$#g$S(7)?#zp8K6v#>a58rje@^@4~LA<<^bR6Ph5AG zRh`i|pbQCM+jUot!M=L}1PvNw=74=(>$>~HLjdtEHE4oJBaRF-vPLKu=?mm!hJVn^ zK_u=&UH$DWnJ1e@f09T3M1625_At%8!Pkm7s>De1&HjrRVC&gHu~bC5SQg?G%ozm5 zrML^V#2GB(!P*wrn8hFDz;szc+{BdL$bnkCXrgos`L<z(Zo`~$i9cDU@HVBGMS&c+ zzZwW_)*`B}+rGRB(v~-oZU8dN*DjR}dVBGGS7sm7(>MKNnE~1C4fr4W%Zq;irr*U$ TG6iWW00000NkvXXu0mjf2Bk3y delta 1200 zcmV;h1W)_P3B(DIB!4haOjJdf(4d1_Ii!1Y&7^~3IT-H6q;q0oDJd!V`1sJs$XZG% zy|ilX=Cr-EYVhEw0000dc3y7)000SaNLh0L04^f{04^f|c%?sf00007bV*G`2j>O{ z1OpFgnW_x{00bvVL_t(o!|j&OYvV=~$K?_-yFRVrl$1R+V}Db_-mK?X%bxs0G&F%; zieS&p(r9mrwPYN}hq57#dh4NNx3`cK3X(2`z=Gxv2srvP`iJz5B*%6<8W(z6=onx0 zK7McJjr_h}P5T^|uItYf;nD^GG>VBYsvuUgT?ABZ`-hY$N?_*zv<rbOUIbKj@_12= z3c$YsT8AE3@_#0@JP~)82Q}#?O6K4I!0{2FHEEa4!5CT>V|HLrDk)NGm?r~hF~$G^ z2~lcb5a1_v0IZM1(xp`zaOkDycn4;GdvEE|Dv<Y~DZcyR4Va4+D$vUSYy&joIHq*r zup1jwpx@McAb|Qj5a6ydz})KSJ%feUHTU5y!+64mT7M4cY!h}h#@yLkwjD&ngflB6 z81?2aD}5N<B?%9MY!8(7>+?X<+C(4-dCafHJBe+qyK?|J+O*)+D4B#gfK8lFpb_1J zraQXlF#;457|TG@)lNB&Lj<Z&tv&)YMzG>3kJ%7=N2$o*F5h)I2(O5^!*odi!ucO< z@=gWBF@IKO-6B8>LIG%`TLj<{w$fA>m%g#(fbP3008fwtT8GkIB@kNHCrNykIpn+u z$QoSc{7M3x)Vfv%gh3!X<%x6o@y)b^9Jm-{&jUHY9G9fe%lAPb9S&^Tuta)@*@~i7 zKpb4DfqQj=@?;f|NZT}9*AZ6&<-cE8U#kFe`+xXPu>@4XP}b<;f3v0{`o?!}E<dPh zeB+OQd8<mn24jaQcR})d|9|~=gQ1S&EY?@V3$<Tphn)hoLg35H9vJPy1S+7UPb+{? zlbeU#3MM!fk|F_0n;1a(GEu$tjb)$|^-yk2fB}Ps>=@4{fO1=hmM==^%hureUA3ui z9)EeQfdIf-GHbo?7CKD#ULI!#q4BugYkPVRCAn%I=RWDx(x_woy1rY@?8BA^QG}!F z;bJond8Bu<Ut8U}7e$j;i2Aea3JvO~D|c$NPWI40Of6XnFl380MZ^qY>;^hk4}tZs z{PQ%1>)iIwg}SFhW(};)maDBh{*L|HPk#dZ{5cR10`1&5n7XSu{+VsRr=uiHqRAb+ zM#9Ktk@N&W24{A~pr<_Kh%j%*_s^!fNn9N9>%PB@mSM;PMDT2YN#4&72*>xJ&gy7C z1QPQb!+7a0bdVilewQ(U2mtNFBC-B~*02;|Xd#4+5%Txs=XtgIJ)c<u2~)t;o_{RV zc-RtQ{I6X6e=V4^jO7CRR1U0B%JNApPay<aJw^L7HISw#-&*@q&6Dl|y^vawP}ygi zC#^9ILRSf#&Xss72VymVmhO|b;uvaW#$$x)bC!b@jnGD`YK-nz)F1&@I}nn@FVr=x z>+jVm`nfACEJ4+P@U%6R#W;EU?I~|64?-?KI{uG}5`>MN3-;NWgMR??2B9OvNn#ZM O0000<MNUMnLSTZaM>y{Q diff --git a/graphics/pokemon/hitmonlee/back.png b/graphics/pokemon/hitmonlee/back.png index 303f139f590f54bef1f9b162bc4c1e3797304306..10a59d797e032c51e5976c9b2f45c39c463c437a 100644 GIT binary patch delta 728 zcmV;}0w?{`1%(EXBu58yNliru=Li)C2r`vpp!)y-02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<ACWE@f1uF4%}SK4DPnsFL0SMQ zK>+{%|JBXSb7Erd-n6}>YFard=Kqwv&2wsdASo#+Zl|su00001VoOIv|D^}=#Q*>T zDM>^@RCt{2l)aLhFc8Nna+M2)o4mk@b9F`LSX0Z%=>a^!)P64PI>m`XX)Ov~i8&1o zE|isog)wk#e~M%a57z#q{qKhq1pn<Hv@eW(>d${XMQpq5-xCr=(bq+S5wxde;(<7e zqV+uRlaLq^%j^~o0AmJd=YTiow*;My5cdE^SvPYL0Q?d0OpJ%v19(I_1+oD!Dz;Mq zM!+=DTL5D`Pb9z?m=rVYeQZfYc<Y}N;ed2mgafhxf4CPh24+NrF2ddedN%`5>))6d z`^UZ=tLpbqsMIUXBSH>lxjGlMYpt>p5&{{bIfjS<gH*-oy(}%z+O61WrO^MJ6AewU zIv0g3dDDx?%+7BVQbN8z9@fyT&L>$^CD%Qm_Jk3t-~%TcCFlV6m+wN>?g*8d>?;K| zG2@%We@&oeapFQ>9H1!zFUP7f<4-jvos$=SL<w9vKp}8G6;fdY4J}XvJKohDcZs6< z1c9SeN&HGPP!w~P{KCsl7$8)p5_q5xwx}63|0&m!SHfjM&4R48)|RkUrGl4I_%w0l zfIp~E_hm<b_k}XD6=-FbjYju%k(}%1+6(IZf39Qp6D3M6e6t$w2e3k*<6QVk1MET= z8|7%-wO5c@B_rUMZu>Hsfk}gVqH7`ToCKpG+1?SRBbccJ@b1|`4hLdmlS&&uwQkY} z;t&F3Z*YBWG$igeg?+NRQ5%MYf3P&HZ!ZznPcdUK`zZbe`vVHRJaH6)P#6FJ002ov K22Mn-LSTZ2r8_qO delta 678 zcmV;X0$Kfq2Ga$QBnkm@Qb$4nuFf3kk!u-$(4atA0AP3!n5Z})I0(4NSa4uq5D*af z`1sJs$XGZixS(k0*s!>uXz19m0000F>p`Ia000SaNLh0L01m?d01m?e$8V@)0006k zNkl<ZNXPAz&5GMF5XW6uFyyq_(g(=cMd!7$6!w(3hMddd_b{qqAby$N3|5W>gSAh8 zkociGBRTeFWACw-b`Hj9e$xEsLkj-ezi6L?_|Ttye#*uDvVW&kp65Rn38BcImWey% zEzdXez;~q*h#a$BH~`ofDCd9&?{|cpjgWXhN7)o}5e7dWk<7%nyBy$-h;M;(0$9au zDbmsHfbE9>#dy4t0N21xF~h+pmPCYqZ~b#3JP<F7@IbmO;u@F{5&8(b5y0&XAf12B zF?KIQJ66rFsZjB#G|QFR^Kx_SYu{S!Bt!~QLNf}H00n9K(`(l`pmbZQ(^`}NF;fUd zusZg=>1;8GNO|Ws39(XNUiKR(R>za+o6h0@=$#TuYWPW$O%gDm{oQM8YJY@(jyd~A zL#=pxqofGX^e5Zm!2>7>cs@4`kH17pI#bW~OcJc|fF|I0>W!ud2qj1YD_hl-^@)=D zh=8-vQSw!$pe5yO?7?<b%Roo~03F!2uBfTx%1DdGHm%P>@`9-m(GjkyvbCLQ$24hW zPajf<L)i(iL!nr<2GnkuHTu7QgRvHiOE0AN`;NI^l4xu@HmlInXgeWLS=)}42H1vh zZPJoemtH~alw1M7u^h_80}}`DiK>LS@)B4>bpMXvj!>o^pu6V=Ih=^KODZnLsr8dS z5&IB?c!0}mgAn=K6b{K^q1S?l@xemayuCzJKP}i`_EG%n76g9)i7x9A?Pq$(1^@s6 M07*qoM6N<$g6vL4`v3p{ diff --git a/graphics/pokemon/hitmonlee/normal.pal b/graphics/pokemon/hitmonlee/normal.pal index ef9db09638..5543d83814 100644 --- a/graphics/pokemon/hitmonlee/normal.pal +++ b/graphics/pokemon/hitmonlee/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -131 90 57 -164 123 115 -205 164 131 -98 57 24 238 197 164 +205 164 131 +164 123 115 +131 90 57 +98 57 24 +255 255 255 +213 205 205 115 98 98 -41 41 41 -248 248 248 -208 200 200 -90 74 41 -189 180 106 238 230 180 189 180 106 -240 224 168 -0 0 0 +90 74 41 +238 255 148 +197 205 115 +115 123 32 +41 41 41 diff --git a/graphics/pokemon/hitmonlee/shiny.pal b/graphics/pokemon/hitmonlee/shiny.pal index f50482897d..e3aa7e63a6 100644 --- a/graphics/pokemon/hitmonlee/shiny.pal +++ b/graphics/pokemon/hitmonlee/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -64 88 0 -96 120 16 -152 168 56 -32 56 8 -184 200 88 -112 96 96 -16 16 16 -248 248 248 -208 200 200 -88 56 40 -184 160 104 -232 216 176 -184 160 104 -232 216 176 -0 0 0 +152 160 208 +189 205 74 +148 172 41 +98 123 8 +65 90 0 +41 65 0 +255 255 255 +213 205 205 +115 98 98 +238 222 180 +189 164 106 +90 57 41 +230 255 148 +189 205 115 +106 123 32 +41 41 41 diff --git a/graphics/pokemon/hitmontop/anim_front.png b/graphics/pokemon/hitmontop/anim_front.png index 65ef049e1090e319e8bb97fc3f4faff156e95c09..b664f90c39512e99f6d3903fe4470c0bf5bbc703 100644 GIT binary patch delta 1420 zcmV;71#|kn37!j(B!35VNliru=Li=9ASVeS;MxEH02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_|NsC0-kjdOgS3lUgIXzzz3yV1-b!=DQd*S7N`EnXAQ;Wf&6Jd!Vq$6# z5D)~chZ_I@00Cl4M??UK1szBL00hEGL_t(|ob8s+Ya2%t$LF$8LE}ZVITRcOa{UkJ z?Vk6b+4IWTotPGiPF|<C_F#?olwKUmP_RRr$P0m-a&gbSR3}q<2nf5P^i~=ddI<zs zLfWbY+tW9@vVWbO-Ia6csTqvC();XtZ{GZPUqb$0<JQRyK>r5d)?oq+3hZs(i-Cos z0=w_u|5-kSL9YEhpWXAn!iQ3e5A%SBYhe3d;6uk>e~{;(<$~$o$ERtFCqOAoN07kh zIDsiofYOuo_Tcm?+P3e(JwLd^h#pMw*TLW~-wzJUm49nsjrr?4iyt(IaPa%<;}!zt z@*5s-@Tb51XcFC)#W?2vIzK!;nc4Lh9POLp&pI?T+Q464@sMxs^p0o1=$PZ!C4|*Y z;z^*iRqnLEKAMHl%fC;9PFx^XZ^QtJ27m8dTt-+BC#65`i1^vF!*CD(Yvq6T-Ymqz z;bMa8bbplxXku|H*W>;2ET58SaUKu`G`%GK<JtF)oF9J-Ml-z_S4Hjk68J{7UyTwL zWCOFv+BMdYAD{5n`i9AKHqG57i!qN<T+Izw4Jc!ZgK8B<eSk{<z-VNEvtMXaV99Z7 z?1D+{G*DZDrmW@uHg^p>Vq)}D8bF^z4dd$VEq_Yo9L`^+lNf_TJjygrY*8n|`29+{ zl)4ydHl-5)Atuyr5av1ROg-v3^(x?0D7Ce^p)41X4xHM@OGp@$GW-~39MEyCS_d%E z*sN0(aH&nlP+bPo#VC$P9VLW|j>py*m@Ct;qvj-CDl7#8BLNU6VN<5mGIrqz2?#_T zoPP>aV(1tdLx5G8P)rzIs270;n57GrtkeYUbrsNEaB%)0D8)ZYA#;`Jasq(wOFPC= z?MOrjSP>?G^>T9Wq6lWg61jGw$#=mJ1!f$Wz7V3w8Ur-55z={rx(~8IVfbW>)iuf_ zQFLyvV%!kn-FS-;hV!gq&~Ev22)(?Bw|}gEF*qS)C)d@e+-YIc><tE|4}ENTnQeFa zO17QgXrVWi4eU`_SyjFFVw(q@-645BMNj<8it6E_*WP|~dsre19qH;pRwfMg+vmTM zr+Z`{8`$PqFS~I{;pjH$ghXHYXtRBGnm1S1(p!9weD<=vlYe$x3*|vTRw~a5Hh-pO z#PYy3^Ud-ii{*ivb2D55k(39;0C62D58UG8i_>t>Px0AtEtChEQ4DBw=%IwT37B`j zy+#;*JMW6|LfjM2<^b5dd0uC}8cFw`b45J40VuWnwbhwgD@tL_oDaz6UkqqWHh)wg z`FE+tTw^NL0pB%q(qwF<Z!{$UtA7!-GlW)!b5vtGssoe<O`2&ZcdJX5V2ud7krNTp z?5igW0TbJCA`eh$jQY*=&UdR|V)L$kdT{WZVn@(FRIYu@&7w|yxf=tv{2|?0blDG` z+H&`YgYT(yF)@_ZBLqf3pxecFC7|}ESRRPlcU=~De~|%Vc~BXfY$gw!tbYWN?~SkZ zL#8>R3tP$uln9A_u+=3)dElA=BP^!vNr90k4_sMFTn(BhFcNuCx3C@)Y0o)edR$N1 zoW%OV%Gnf>5K=!#fsuQ_G)Tl;p}<J=Lo6W*4#y;}g;OjcFh4Oze_)y!9jOBE^uvEP a{snnOFJ)A$x|IL`002ovP6b4+LSTZb(3;l( delta 1193 zcmV;a1XlZ=3%v=DB!4haOjJdf(4dfzm|$RN`1tt9$jC@=z+jlzh`8ubSdf5NC=d`3 z*tmeOh*<d8m;e9(0001rA<_8&00c-$L_t(oh3%HXZrer>hBpEVh`iNl56vl6jKUCl zai~M<o^0!o>eLpXV)-1eXx}Twx4?E)x$Qxh$X<yB*r-;jrGFlv)G!Y~a$lfG^)8*I zEXSg_^re>o83@9X|Hqk~SxPg6yic}vhkozz9l$5oKq*`PsQzpxSrm4%^{2M|eX{CU znZVOyX8$M`#U^#L9N2^4q9s>tyLFTS)Q<r!?C)?jYSKAS?7UctAOU%2MCU;9XZzrX z5?@4U9>>1jI)8ach;EH=52ey;+ism1hPwc4c44<pKkE|0BfPO*Ya(!JY~6UU(GGTZ z{VvfZP^eMcrq3QP5-Q@Q-Lkf;;1eyBcQz>6!O5bkf3}-;i|+F;W9Vw4D<7$MC^gTj za~FDLBze4Gu}>Tckg?G=&1!k>V7OVPoq2XF?#=<Nbbn?3vWQTAMNW(db8k-ANh+in ze|2t`a^1K-L|yc#g#=5s^3HZE*BKRglTwQ?5bkaLUS(0#HpP7CIRyPB2Ze=>rzwG7 zQ~EoTB|F4jsC4a;Hd}{2&3LOALzy`OOLho7OUUb`M`ti*1Aqkp5G<$p`|Ry>^Bd9U zSn~n+`+wkz6~N!-NtzNEGd>BIfWZv>B-NklbP$9t9?-YT06>JB#8R6LA!L$&JXivB z2wcq(OmlccL}QG9f6HAWILCt&VgkVVM1)<!oG4u+A)F|l0p==1sKr4l58^mNL~s6m zi$ov<!!I}G03&#BW-)+|Vm}sXAP|o5VD=CAvVWqHBckPMYcjMq^*~k}L^$q`Q=1rI zWN*j;l1+qyi4-7RL|g(~u4F2y6P;jW3<1-v31*CXx)Ry|aF+v^%1YtK5z|zu^Z`Ve zKX4)NBSf4AB!PwxOC1a1rU9al5txphL=O0hjy8sC3wWlE6_4j?wk(qsEJsZMk$w?U z`+tP=d$0<)xd8FPe4R{GKir!bcSQJL|D%0=7w~91UoWjc>E!8!olhx!kpq;iI?ejC zz6nsHvc)M}nAquRt)sRIFlEDjO^?1(#K0cU?C042Hxxi!jv3Fb(eMid9%eegDWb)r z2-7&rn04lWeI8z!b$V*7x@g;S%s_yf9e?wcu{w8QN0ej6c}RG5L-y;G=}(d|!wN&9 zS8EwL3~Lk#x`zO|a94EQShKK#)^ADo=c_=0Z#>$hd;F3n-9O9Lb}O74J*qs*b)$y= zVSTDR%lkE#=niltP{xfFk7MZPy)T!P#nT)>`@2V3FBkCT9_gMEh!9}Z+*j_w@qc=U z;-%>-0nG~=xd72a(+SlP(D=(nnBzcW{i{Yr4PfI7BL1-&NV;<WYo=-lnrv1An>SMc zx*QEc7zB<Yh{y10FL1=lc(MRwgnWQw1d#(whm$BD;FCUtI9(_J9eC&kIRNo|o<vY~ zMm?6Jjz~{Pw~WvAoaQ`9bfp71nIh)}xOS1>n?H;P@3s90Ewh9Bk8D1L00000NkvXX Hu0mjf4iq!S diff --git a/graphics/pokemon/hitmontop/back.png b/graphics/pokemon/hitmontop/back.png index ca3daf80bcc6d15d0656edf9d4a922e0ea22b231..bf440a3bb28135576706fb878d52b1503a13580b 100644 GIT binary patch delta 800 zcmV+*1K<3c2G0hNBu58yNliru=Li-FI5JWW6zl*102g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<ACWE_fB*mg?(XK*)y1r&oO5bY z_MG0;d(EU$w2Lu&#Y!=IAQ;Wf&6Jd!Vq$6#5D>XN+;ac`00Cl4M@0Xn2lB-L00MJK zL_t(|oZZtgi`y_10AMeLW{Jt3UZF?l4$ji4%kz-QP!hN;oAB1L-H!%kaw*|(ru?3O zi0MB#!;Ph}e~Hp_AoTS~mSsChFGIJ}U@Lx~-g}ZA$9c}9dw&6>7eKf7zaYH;7Wva4 zX3>+N!$OYdz{cF~LeBZO(|Gr_nM^ryK05`e0i7`VQJewYUSa^xU!4P~1z&&lPC;kc z>l@&XuQw+>bmFK6AFn?ggU*!ky+|^eE|%Lj-p%nge`ChJa4aG{`?U3nBhX=tsl(wJ z#Tko`BeoLUF~(yB_7wiid9?EeldP41d+!y9R4E$U0f1kNmn`%=h&9l0E&~LpbHoG& zCAiUX9vwD2@NFZ%*{uf}EZ!P%xOXM8(1=HN3nj?EzpH?QYGb;J%fmUqP(PnTQP!Zm zVR<Jof1MgITR{VG3wSt#q3&@7f$7q5nVw`CP<Q&AqWPq-AZ&qhAXc+~09jPCrGARB z2K6$qAamT9M`Ev=%&W&z#%4C7g#|x|L;<&#&=V{a7}^#bXHQ_QDs=lRu0AKK5DZN@ zb;NEF386sV7iubs9RQYHEcFRve9#~j0u?|Qf5`w;iluo+hzhuUfesRo5P$@Uh!S)O zx*QY`8+8%ukpcmfgSIK@lX4Y6twiFha0LPvm9hhWibRemx2ynl3=<o7;UFFYys`<v z*UEwy1Y~g4d#DnWsLmka&l(_4u^ESP&;UU~r__j3i7~VQC6|o?0mU0&rx)2nQ0d!E zPP*kHe`J9?0_rz)V1cINdKV6kU?R=#p~NsAHBORVTvoT}>v;3;UDr_&+?kym0S8;> e2!PJ>8Gix#@cG*@K=pS30000<MNUMnLSTaJnqubw delta 748 zcmV<I0u%ku2Ac+uBnkm@Qb$4nuFf3kk!u@&kdT;QU}*UG_{hk}kVv4=c*yXW*l;jl zaA;5v5D?JNz^I^@=;+{(keC1f07M3T3jhEB32;bRa{vGi!vFvd!vV){sAK>D0(414 zK~zY`-P65}+CUHhU<)Y{*)}h53aQXFIa8%XTOju<h_6oGz*;F)8tV`u<rN@DvI0(j zVAuzUVjcjjd4bC*?~>W|dToAk6zOgYym&s(%#Oi()~j`O0dy{amjAz?a{-JOPlH&7 zPlC3L1e^n1d%cT<5T8%ut#@`a6d=Ut6m%?TN8zjN3~2d*1!D2`9OyXk{<VJ!+7rKL z0h>K`PkLy_VGX`M{yGNjp%g0~q_iD>Pd0z@`{QHAQhpGSg=Y6@lV?YuEv3}M5h=x` z3_$=KB)F4O#2Tz9{85N-op0yqK?0Hg)F9NQXl=HL`&zt^QJ!OLfQbuL0AigZCa^8R zy@`u(*<It_HS$B==4in9!HVS-Qy?QNzRO!I!Q#vB3V5IoW~wj|O%ZqI{uHx+vIgai z$}554(1Otb8$dW9q7m*)j{_`hmmZU5lNvzXnK^~idFDWL0LleW?fwB&R_!L{F2n}Z zkD&vp$6^ukm1%NO-Bv2L@ew_ki6sv-V17V%Ak$#yTJXFTfxfQL>J5bcIZ=gTXUpjk zvn=FXgGG<)Ezj17P<Amf6NY$yX+Vc_&;T$|1?m(N`;GuKU_A~V5Kvg4LInT{O$qu~ zYQX6~%Q){R8WdPAI;NtZ6w?5V;=x{rD^M`d$}M=q1C>y2RRQW4=Pu50$*&8zaS3p5 zlmjmbsN%-It`d}}&Y<vHA92xvW*lcl0~7&GsS&3VGduv4Tr~<56mNi6wRy-5L8m`# zl9dnb69?20(BG*82MnFf8-q%4uI%Zt#5hYDlcX1y)-CQ$y!rR8>*xrq?MaS+2M2RR e1n;>l&-)8fbqsO={{F%M0000<MNUMnLSTY<7*Kiu diff --git a/graphics/pokemon/hitmontop/normal.pal b/graphics/pokemon/hitmontop/normal.pal index c8cb22d510..c600d5c24d 100644 --- a/graphics/pokemon/hitmontop/normal.pal +++ b/graphics/pokemon/hitmontop/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -144 144 152 -96 96 104 -248 248 248 -200 200 200 -72 112 192 -96 152 216 -136 184 232 -80 88 144 -128 88 40 +255 255 255 +255 222 156 +222 189 131 +180 139 90 +131 90 41 +139 189 238 +98 156 222 +74 115 197 +82 90 148 +197 74 49 +123 32 24 +205 205 205 +148 148 156 +98 98 106 16 16 16 -216 184 128 -176 136 88 -248 216 152 -0 0 0 -0 0 0 diff --git a/graphics/pokemon/hitmontop/shiny.pal b/graphics/pokemon/hitmontop/shiny.pal index 2928758f4e..8e26aff7f2 100644 --- a/graphics/pokemon/hitmontop/shiny.pal +++ b/graphics/pokemon/hitmontop/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -144 144 152 -96 96 104 -248 248 248 -200 200 200 -144 72 160 -208 120 200 -240 152 216 -112 48 96 -112 104 80 +255 255 255 +238 238 230 +213 213 197 +172 164 156 +115 106 82 +246 156 222 +213 123 205 +164 82 180 +139 49 123 +197 74 49 +123 32 24 +205 205 205 +148 148 156 +98 98 106 16 16 16 -208 208 192 -168 160 152 -232 232 224 -144 144 152 -0 0 0 diff --git a/graphics/pokemon/hypno/anim_front.png b/graphics/pokemon/hypno/anim_front.png index d96bd7613db4222d5c676fda1039d54d7e59e732..73a791256ac3467b5fcaef23c88b64581a21ce99 100644 GIT binary patch delta 1395 zcmV-(1&sQb3Wf`iB!35VNliru=LixEFeQ+!PM-h(02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_0001LQUJ7+Al|(}_TB*h?sHl}DT`t;q=Q;gT7PPTl%$-jz0Kb4|Ns90 z008VsAuRv^00Cl4M@0Xn2lB-L00gQ@L_t(|ob8suYuk1d$K~`OlQOVygG*;dM+v*e z`^6-uLdY+;WH3mg7pV!`Va3|j#!}V84jGM7{{ibgCM^TE3FNSgO<}tlliM!I5(r~B z45Ghb@BMy~EPqF`3xkdg_I$AUy^p@{`ROP9zKZgnjO_h!nWp^m*2d(gU`Gf*0$^-T z0LHoy2!QNPl;5*9<^<q8Ab|kz%%J3yQQfni%+Ze*8~2;dP{9LFYTPovty<O-0-DYv z08=)JN;9SaW<9g&ZCd!>cAGC?(+Wz&0LK9j0D;+OO@Gg_s!$gdY?v`bjk4ppZU_JY zYZBm&AtW*dgMkE^fPgHK1-pVoO%QGf;MZmqz#zb|m-wCMInhN%a~)WhfCyYxVO!Jg z27sd2oB$`tuhX)(-C(7X5(B39X9D11t*t0p;U|457Xd2>{E5KlWdas@B=;-SqT7`v zz@Gu#AAcZ_FA3ml?4{e5fJ%Sk2-iOGu@SS>-^W`41LgKvcRvL5PmczmGxiu@0|C0^ ztDoO>-gH8MuL^mZx`8DKsNL3b)5ih8`H}B?5-=BfnkxqSX8)t(@PG2Q?_VLXgha8& zm;^d!0dR+73Eyv`5)#D&0&ob^-EJ_7jAmmA-+y;G=XIe_raPjvv}hEWd%hrCx3Bg4 z2W&pEx2Js>*T41q?UJU|62Q>~<u9(!`@L4~W>yfV{)K;WjzB9djlk<80#480_R;~x zIc)pahwan1`{RHuXdkxutJTyF6uF~TU*ROi0k~~+&L;sph|1ptvOJ2!6eWPWW}*ZF z5r46h2GD-eClw)JQjsh@x1bf+{1}OB@Ny|ImOiXqdg|ypBv>jiZ-7`<8%UHAd6m!G zvbFpI0!aat3NO(QmMS0tY9Yf?1>~K`g~0bo!j7iXU@o(lQUSS|XWXtNfT%~T(Lms4 z3DtoJzz0=JwBSHfZ}Mc}Az*+3`UF5NAb((t+sz`hl*0eV2aXTnK$KgIDG3J>&o5e4 zmT(}kn0;zm78`LOLjyxm-g~-fS#xm*5*ZlLoC$j-Sl>*UO(%39k%19_VStH8Ix2() zW9UyrkA`WGKS01EVB;pBXilR{3Z^F=NG)byWE3O-fdi?<3{0p|a07tCh#Qz7RDZs* zu7<#8BL*e}V5=46HwHHhi~s<(E;09jfZubY1||l4N&aGu-TMWd!rI7_i0dzZ1h^C) z;(4+E2Y{=L0*}|wqAauWO8{0pc`fZ$9Qa|C<Z0&6D4wVZKt~61C4lYD!FQ(#Kspc{ zwSM<qx6?l@c}V~r$d#w_FV5QC!+!&|cmp5@a^m{~o3D028#<5?gxtfxt#{z8hz=wH zgbw7gd)O_u@pYZFD1ig{xO?1d<<m}tz=2$9#a8Oe_Fv{e-fJ+%_=gxUM#3AqgPpW| z++d9L5Bh{6BrpV0Bs_X7hd@%o!#4v|G_BrX!!tBqVVSNMr@KoABL!HoWo+d<p53gJ z7<YELA`1)ukg^-HVe9#He=+nA<X{%H34qEL8Vf0R+#WiR`3kou07?OYdLr+NA<FCU z7*FI?d__On9lO^EaPTt$Q0fFEE5{;}R{0-_zX0O9QXdL?)-M16002ovPDHLkV1ms- Bc5nay delta 1284 zcmV+f1^fDj3z!O!B!4haOjJdf(4dH5FlbN!@YnzV006L%AXq>s_~>xhxIloApio$7 z`1tsksJO`3=%9dD0001xgF2W100g5+L_t(oh3%KYYvWcB#^vA@Y@iUK?k2}Ty1grt zC`wAfOJuX%`jFIqA<&D9Y^@GG)ogWMk~OdCvANi=5Ll<|I)9r(XzD{npog9u-+D^Y z{4bq(Pm<+Gc448Vg-#AOnxDQIkDlK9qA35#$SqFFX!1i}nUJ4>IUxWkfUzwBn9D*S z1afn6e%@c*5`goF1VTVJ!jdy)bKZZxMPDASE^1n&po1<o?it@Ueg8QDn)3p{kWHe} zrXheO-Dv7-K7anU1??fM`C*9!;5eWIAh7h6ru%*q>Y{=No2IByadg*>03cvR0^Bi$ zM80G)kbnjV$Pzj5T1eCc;YI*{tTh2l0!(k8KY36PUF2=ofn^DZz{@JE+xFuSP!x|7 z;Dq^Qx~#7^ShcDofZ3zX5csmzQxv=OgSB6XfjtC%L4V+j3IRI<lKUNM@#D%75Nv`K z^bsgl1@H;>((Xw>rJr$v*FF!h5u-Xh!bbsp<^EOsC<3gHPWoUmW&x}sK(~DQ>#NS& zP6Y4+Ax~2`u>=9N`*vaWFa$V12?AXL#?HWY#X#R4eQ+54PTmWGGX(aLC=VEuK<6q1 zo^UJ?1b-STAyGai0EaN!Zil1D+a8t(0+(}M7YY@6B1+eeN0EOT2*P!T_HcO2c2jG6 zHjr`g$8gxI+IB4koZL|U=HhlZ=oao~1#unR1UI(`bhFY3ygnh|`u5!*8&I6nUT|^R zyMA{x3D|(%X^+1-$m~FoE9&44PGS;(%f{k-8h^mUXuT(p<8joo0bDgxB@l>-xh#Oz zlQpdf0n>`)=)DEI#C9i0<igFR#8~#Q7U->``;cInz^)16vf4nRn#!wu*ORRkcMwPm zs8o2LzOYOI2~Z1pmMI{gL?Hq`OcP!_od$E6x1R~ft3}4WRtkuF#2O6*?v_v;hyi?2 z?SE7Y4rrFf(}hQX2_{%m0JVgGnG#Nhol*Gz_?siQI4Se~4n(=fn38fJ$^5q8WGM%d zh^1$S@3S!nk{jD%D)Z0Qe19wHKw<+UnloVD0RNjALvtbr5*ru+m?ju_q@zM)Fh>4F z^k^C;`2z%W0#@$=itRKiq+saMfz%QPMt??00uVZoTEf6Y8YMRbD9ogR2}9+3%W4FC zJZ4}b05-Z|ezkwczz6_f;~aC32>7`$ZeS9?_v9~D*wf$8DXb&~=(y5<1UMHS;z4=% z6M(CX1I7wkl$Wfs2f)gguch5e0t*KuPcw%``BF^*7CMkK0jzh9zrIcZ(t+Tpt$)X_ z+MVHbRZj!xK+bfFe|ObupB}UAI{-P5%OL1`{GbE&$bpO@<R1ENy#rTebRa1pav<mJ z({{Os+jZKagbw7h_Tivg%sLT52XbzgyP2Eqzs!OBrNNls9}>U>34P=aGW|o+U`+H6 z)|4V7Fak0pbb2jEKw3h_odH_5U43t`(HWYo@RIH)Vf=rCWdeJitX#yin^g;Gpd||n z|B$g7a#8EWY=1HG59DCB?J0oDb{abwPuv?hklhydrT|I_fqE+MiXqDT@EA|!RotRq uEKFQ$1UUFN1yJe)q$?*PpH=xEia!CV21zK)ulTV50000<MNUMnLSTaYOj14o diff --git a/graphics/pokemon/hypno/anim_frontf.png b/graphics/pokemon/hypno/anim_frontf.png index 692bb8933b3ccbfefd61edbe78d8e176d6da55b2..05e99f7645b6725623f4e7eca9acbf9d8aa975a5 100644 GIT binary patch delta 1424 zcmV;B1#kML3Ze^;B!35VNliru=LixEEgUe!s*3;s02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_0001LQUJ7+Al|(}_TB*h?sHl}DT`t;q=Q;gT7PPTl%$-jz0Kb4|Ns90 z008VsAuRv^00Cl4M@0Xn2lB-L00hQKL_t(|ob8s+YvV=~faUB#CQBj08@!}$*|LOQ z<4#O+DugI_aiNgJFVZ@64_&NYZ7i)y=^<sKtp0%Z)`LTwOSTT=(2LDNm)?TOtrw+U z2&E*4M1Moy%zsF-l96=VLZL4Nn|Yt!8$bQ}B<VjH`A2CPmw!0xDfubbVFf?{2w7l& zw!sPnKz=96?-`p546q*40s-LYLCYzvxo13IpkH2XK62f#f&&h(aZmrIX&BEb;95@r zbiPTfG^;aU-qD-RmVv)**L?+BM$jS#SQa<{2+V)$I)8@Igf{D7!mP%6R4m7~LjWkS z&H>fZSczOwBftR{5a2EHU{;Z6F~SZ3{Mc#&XcW-Q74^Z(8Mcd@Vq37m0T#F{!?vP4 z3;;<oRSH-^euFMM+Z|FaOL1U&HUK{V4wsbTul1Fg2v|el7=h0!6j<uga(_T8I$iky zsQZ@)6o1MLc!ql!9&tdXKjRG7KK5}Vdij)|3b>T+pAWksQ2zvvt`qVUU=sm)$XCC; z8N42ZfLdea>D0CIs7ry?ePw3)Bmh*kcIG=A(3eL0HXG>c?guB~?^KU{{|bQ>Buc*= z5DpB^1K<Gzd>1PrQ931r&2xG<3`UVt%o+l|t$(U&n*kMiMx=cu8bxmInh~}=Rz?Uc ziWfiafpIhbb97Kvl$Howb7DL`-JcP%7}FCVDUEUTj`!&ArvO&pKl5)8=%xXU@v(pH zd$q(JFu-g0Uf)yG0CVlIG4^U10FJTWQ+sMP1E}GD8jx3`5U0ohylR3-E`dNq>?8s7 zdVi{CHK9OOlRUj|K`D~OloI*i;Zh`o0^+cC>0L*ULxLm%iyE+Hxr0Pm$jj=Y$+uQm zLO?7a)5a_G3rQ@%0lI}8Ni4w6#7qeMAQEOYoer^yxsnL*)dEq?ssKcL#2y_4?zWIE zhyc7%6=4e&xOG<*8&3cYG^l3)auES7?SE=!p(Hf^Ki+e^4+D|z5h4i&63;IiO(Gab zEaqS6hCyx_$V6ahRQ6tM8OB1~Kq7%*o6})W2jlB0-L*mki3ElLng%+)(y>A)7!yBX zd(?D|`T+tC1vc*jl45l#w1Vz%18KzshDVVD5Ew`+CNN=*q8$J<w79?oA**W}a(@VX zdP`tJ02=#2e)IB<z%T%yae=wV6!>fIw!p-IFR5RwlhRu>h4ou^BCh|8ix<oxUY16G z1K84S;OR3wdX-du0wATcL#|tK;Kv#*PiGFD(wQs(bu^GG25b)wzV`%x8wifN{_xFk zF!IVyB5>u@)i2JEhW!Jwd<O^&<bTpsYXeY92cdz)5oRElc6$Kli9lc=Hy6YHaPD_} zTqh_B7mN>wC#Omw>5UK=$c6IJ+r)=0H4sGJp`vuf91E-O`RE{C25@+Mb9Cc*=>`J* zaj)O&r5gw|JZcbGg3-(H2L@#M1KyC49qc6K<ARau5A}>Dw7>*NDB;lCa(@DdB^-P* zKvhxN9Wr@`#yhOi<JsHYrh<_GteL!X0pH!EEQ~w9TIG$IKO|fY`EcunWWSjB12vds zB?FMjQfDbag3O75ELK%B1CWXcw1vFQhRBb@*SL_E@e%!GH&tdSVBuc|AhjtVc8*0Z esq?=S{{Z1HUfIIGQ0M>v00{s|MNUMnLSTY3+;1uX delta 1298 zcmV+t1?~Ex3#AH>B!4haOjJdf(4dH5FlbN!@YnzV006L%AXq>s_~>xhxIloApio$7 z`1tsksJO`3=%9dD0001xgF2W100gi}L_t(o!|j*PYvV=~faTydY@iUK?k0ylETr4J z@)AYyvY;ih*`_WewI>96agnVROHVahotJpc)IByA8x{gdz<-<6htSj)CD6n6lK9qB zwDteeH#3r>L_dy&g-!@IGoRjj8fj)eOVTIVa*xwSWbvUar;N|Q91j37fRIfNXiGdm z0OaPT<MZyyCI_r1EI<G#YLIe9Yt6f_H`$kmE01M4jG%xbV%$@IYPs%f2FTVM096!; zk=9iXEGlYCS$}o$-WKGCu<8aWB7kLq0)W8c_p;);Eokrz4y<cDN7YhnI|P6M%L1U5 z#zW-G8UX>wfPhGm1E+&TofCEl;KynUKx2UBwCRfn2CpJ-+7>JcfH&+ez?x}34**GW zC<Clue2H}{YfVzCNl{>SJpjIYg<WR(SG{dafn5Yn5P$f#%7E>C7VdAT-@F0=pnD?( zN;M8V#aepD0w}QCxWc}#JuF16U9v|3BkBHiZ$AX|FYs!e5FKCz0d~o=Ki~D=_d|eo zd3ZMKT5Y_~fckyYnB5BiO1oE{A^>%Jd}#9teZT+NUU;AM#Pd!OXd_Yi?T84Ve;oiX zIN-?`34e*oB_Vu1XM4S1D)Oe&MZmKur40^L*%Oft&FNI+H_ka>+Y@t)z)t+-XF0H4 zO#T@k)l9P<2hIgCnOq(kNegH821r?2#~($G;b9734ZSPx0)hQBpg1}4&ON_tqym1? z^M^i71DxH1;>7P}062}q0Ugjz2GGU-G$2Q(t$&^j;9C>4P8u*J=8^#RKIvIW7?71D z$JQ;FWwMhJA{T5fWkMJbpR5J8>ezKikVIfd1KwR|B2kNt7wC>7N-J$6U?c$8+UyHS z3?KkjLY^cB5KqDgfzOS^M=55fNo?Y@69Lg%BGl=$Q)|Q=O$6?yC|EEBaG{#95-gB) znSZv^4>C&w4fG74P)0yAvJOKtA@Tq16EqO%9wBi9iH>i%EfO=3NLzfVx-Pk8Ah}yx zOm+U{s_Sk>4P+`Xyf_u+Rd9ctQDrMMkg323%h5o^BON1zf^p*~yhcscm>(dZFks~_ zAemOP$|9(WFpzpgU_>hm00IN4M+7E}QGd1rfHf^DFw?cWyHp5)FK-D<2te^L7+)FP z5t!ikFP`Dp69)XTaa&*_z%R@%mPzFUn!>Vid-=m7>^$QR@t`vP9l*Y`Kd4Xf>bIo2 z3qUGY2ST@^z(SXWXLAnC%2go-=x89P99Zig{ouy{VIVlw`tx_a{@AZ6iNL9%(|@0@ zk9)%-vULXt3}occZXe9bQD`7hgd51nZuH?g5eN+A;;c99ZTyAX^>UhleAU~#G)qY* zLSP_g<~JV_H(O>Ph<rpvNfnHt@1cYE8Nk8G#qovjryB?iCxhW&kZvGQ^qE0q3C1A9 zA2^WZ54a%pOn-<9MyfyPS^fY~Ab%l*!j`3;QKy1C19VKY(Ihu#Xf(rHc70v^-XMv< zt|Ky+@a!fvBMx*#V(t$KZ$mCDy_D=1H~zp3X3NX~3S_&vO_K#9Fp!-Nbus{{j6fqc zZu3br!ecys`r{V;W`U+3?**{%F9VPo3}|E>W%;Dc|55uF9Ux5~hPx!>01E&B07*qo IM6N<$g7Ke5#Q*>R diff --git a/graphics/pokemon/hypno/back.png b/graphics/pokemon/hypno/back.png index 8a7987d1ea5aae2be0e7163fc83378e76221c761..118eba568edf94c6c65a24e3d499861def91a64c 100644 GIT binary patch delta 797 zcmV+&1LFLd2FwPKBu58yNliru=LixEFcGmCx+(ww02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<ACWE_e*gdgi!oBHQgh8}r0$fo z|E$egK`DShD2PZfYFbjHl!LvjobKMu|Ns90003V(btM1*00Cl4M@0Xn2lB-L00MAH zL_t(|oYj<1a-u*K#)Ty-2$hW!t0L$D>?a#%rQ!u*`UF$uMdk=|fmrO?V9jik%3{`o z3%5A!0nEr5f9AcmfaXu!=UIU8ethriM|XERpC`O4cPfVW+KtKWCh(x&EStc9ml7s# z0eoIc4EekbSmqKY=g<NyiW)wDYy*O##*i;t0CSwzFatgZ+pM?31dcU4&r=rQCeTKu z!hkVn{%W;iWC3nDusQ%<z&R2)9s<fy<t{0Y#5Y*Xe-%(CoFV1;BLj+CR0$p`fQ#8V z<l)k(;?rD^w<3J_ff70}sN@m&-giL*Ojs_pJevV?M~(&<L7)q;DURCJTX6%`2z@$_ zv@z5H^`QSTFvc3pDZi=V*8rG8->H6yI^fv$RRH~62ka_fwFp!JA@HdXQ9EEgS=&rR zBFj!<e-afXtOD2`wpo_F;E}y=PZt8`tWhdtdYq^lFk1sQm&`dwNP}UUp9+EV@r-Gi zBUFV=OP7|AXPHSUk93d`B-qR@UG}6FBy&n(5TXf7sC-w?qfCZsk)R!5o4rt*Wi5_p zDMgB%u>K{Ij5={0!B}H2<KIb=wn-=eEA$d4f7#LXAnEs}=hHpDdAD0X@34l`P2+uh z*vMGEmDTXg=bf+;viYT-cBL5YCkN4$aS2#SDw1Dhq8m-{1GtkEAQn;;qY_rK`}=2& zfBN|>z!t|*FFue7>d;-1yxO%nKY`KLG?i-n9b@yl{@F6;qquib=oo5gc+Dy8NTE$g zOSb`xXFYAknvGQj;k>e{ssQa#VR--Xq8TYb-z2>zFb=00P}@70PrytwSs%oWs-f*2 bpCSGO@%^YX7*a%+00000NkvXXu0mjf#r|W8 delta 746 zcmV<G0u}wt2AKwsBnkm@Qb$4nuFf3kk!u@&h+r^?Fi_}_un-Uss8DcNKq&aI(8zG8 zppbxQSWx)*__(N;=-9{r000000GM_ZLjV8(32;bRa{vGi!vFvd!vV){sAK>D0&+=2 zK~zY`)s($%;y@6`k>$!yfee<YvqDN~5xY1Pnl&SFyvK>256R^f*CbM;6u4lCAK>tR z(Oq+r>1c4W?{YJXY_C5;eK(d3_Wb<+&yIJu^B;wM<4#4dtKAsPZ31`t&9Dg!SXUEh z0UTCJ^w_2i7<LN*1}(s<@Nn3D8xRy8JvM9sj9Kns1Z)GYQE!C-3_WbyRwckFVBIQU z!i;feu~={_0Uj9eIskUS7!o)h0?JW;<yBH1iEpslD4<SwJ<79t4ipcl65Le)AF~_C z!>3E7PGd#272)6kfes8Rc>?-AboDk2hgzO5f%{WW1I!@M1^60A?dz==K{Y~$u2XFc zbwEAne-6yhgL~ySHJus&Yv_B`FHr|P*S!f~eYXL(3Ro=yRX_-QDn!%{Sg+Q9J`s^f zl7pB>g@siB`^!E_l4m@VpZmj=z&UG{3Y041KyJWY4cJ{X#~dLIj%|J|1di`VOv@Z0 z7rrj5w1hm$L`wNiCl!JOU%F+L6HF9AGKUNXAr@f?l^^SQlu1x660`&ClV@tPti}6L zN|9kFtY4|5LcO?-U~I9M@$WQ$&DtasfDV(?OHcHBk#xN1`Rt5uKAyI3C-m^fS$vK! zI~mKD(hc8yI|(bLGQae*u@uwu{36COE&(geMEZk@7)Nvb0RB7!h=o*UWMQSJk3U=d z)6ZuCwm6O^@r8<@4n3ynlUtkfbC`b3GO5PjF?Ubf?=5paiYHfvj;WSahTWXfo)p@I z^c%ozInidU(O6XwZYry)3eX-EhWg%8TQpMz=$oY71ZLq{18RE*cL-RzpATZBJhZ*z c-;Yk`FBHP(u~0GO!2kdN07*qoM6N<$f|zwmA^-pY diff --git a/graphics/pokemon/hypno/backf.png b/graphics/pokemon/hypno/backf.png index a92c0b9917e965282ce8aa6f368664cd5345ea73..746fdcb5da4b7a08eb64134a574300e9c90afdd2 100644 GIT binary patch delta 843 zcmV-R1GN161>y#fB!35VNliru=LixEF&9B$E?xit02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_0001sF;c8jbIod`?v%9utj$_MDS$vIh)6JMT7Occl!LvjobKMu|Ns90 z003V(btM1*00Cl4M@0Xn2lB-L00M?dL_t(|oYj=Sj@m#F#<5FRHr6%aECmc@3h&^C zjz9MT$L$kD;zjZZc>xgJaz;tZi6V7OVWl(KdjJyr44GMCdu@F5H^`Rk`RzB~4zq5x z-cR&yJgFFb)PEjKZeIhB`osJh=<`y-<PCt&ONjxWHUaZo!sHwpfQO=n&!3uru&6QM z^9H~i<~7WaPr)|ptuTROjb5*(EI>QdcBR6AA!q(#v0!8Y?l`bI0KJfNByc|jl)K7Z zQXYxV@Gw<Cop1(}=T8hM?ocIstN<=%r;vwBw~9~mfq%Re;lo#y(1Cs>kHD9%3mRa; ze6Ho$1ehB*8eoK>F2KgPYgcbY8>%t$=^ki%r~~Rn_ibQ^HJDTWr-okxU<_TS`cKpW z$F^?*=<haQR{^U*pb7|qZ-rPl1J=^oW@0U}>?B6(qJ&id+v7INvK?O8pY7>F;LIAO zLZ-)ws(%5qHDGheoO6UU7`Ay?2%KNfn3g$0RoJ+6X^H(=W>U&my2uC;Y+{!#J*frB zoKon|(1ax}ZPfE9lcCyL&=+8v?XCet&QgjLJ7N8eB^mu78)AjMjDEy%TDMRDSiy^( z_+U2!X@V>753A?H@(l%vE1wU-ig!71yauc|6@T$}0`?@DLl-hpz~T4L6#)^w`F|lv z2zhAT$MFk-9R&6&>3RxCQ&j;ww0T*5qds`DBUf0*4RCdWzs*IVWvHWJq|q^uYfmN+ z;CeT5J!hY21L-8uag;&_0q~LpA~$GzvYbe>`)icqD2`+bm~=qEY^no>@8Wtu0Ov#i zeMF;Xvrjre15aZZsc{Vyz%&oN{45B_f#Gbd0kv-j^9h(}$I7jpy0)sJeLLPm`~&2) V=7#fumgfKf002ovPDHLkV1k^ocESJv delta 739 zcmV<90v!F~2Kxn&B!4haOjJdf(4dH5Fo-Zv=#a1w5D=(Pa9BVn_^{B(aHyb=fM{4y z`1ts^sF>*3$N&HU0001(b`(PZ00M?dL_t(Y$JLa-ZlgdD#w|oef4yZJDa|!mSxSi< zC~^wT!bq0iBXaLQ66F=wB$A~Rc9C^>fHUXrnv-zH6(+aky?@8etPfZ)PM<*_!Tk1{ zZ)cb7bUse>-g#5e?`kgwbIyTl{bhI#T(Pbu&;r=3lIXK#8!+sa0t{M!d0E3|H*G*r z*66cg3t)_k8b-jD;26zT7{IVbuh&x+U=*-!9WY_cxILXtIaz>P2D}MCFJKG_oDTuj ztO}QuN8$nIOMeA43AayqcEf?<7FB}l8sK4e2}OAHsQEPJ<gE-F{-Q*;wpe-|flmVu zx_TRiLoLr|z`fAb05b@50lvUldwMHIP>;x_XQ<7g38)W)%fJ|GaJO1h({2E;fPq_I zi6-DW&bt8mdmnJ>fYl;U2ZX?{LTuUr>)F~SVk44dCx0fJvV>Iv+v7G#k|(^A@7vvp zz&&eL3W**&p;p7ufR|HdUm&ExvCYq=!2WHIX;~mtg)b_XmRRj&BBgwzn~WgAXHMnP zms*g_E{CfKO<3a8Mm>)*394-bodDb9=^Q|0FQv$_6V{JZlF=`+CDz!>_-C5tO$#M} z75vmq4}VTOkY_mZ{;+;MJYP_dIP&!%tn{e>j^}`t<|6$@z=}i*=tO1;IQ;pwCLpFS z|8FD-ArGDVG<`(y4uO?QdcFekTvfmhy*#eJQXhPIC)ZfV3vqOY*UL$vW2#@n%;RGy zH@?gu#PMG2`R*#y&z3AcPI9<I0Q@Y2*b7I#tXy`aG59^naVt(_4w!U7K(y2W)An#Y zAb|Ts0G&}$^jQaJ!_zj5)piXPz%>uO;$IL@0OM$pT|7IuO~A~#d^C(yjX~!_#Xqdu V9V?a6GI{_2002ovPDHLkV1l8<S?&M; diff --git a/graphics/pokemon/hypno/normal.pal b/graphics/pokemon/hypno/normal.pal index be159251d4..1a211d4f6d 100644 --- a/graphics/pokemon/hypno/normal.pal +++ b/graphics/pokemon/hypno/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 96 48 -104 80 0 -240 216 0 0 0 0 -176 144 32 -88 64 40 -248 232 112 -216 184 64 -128 144 160 -80 88 104 -248 248 248 -152 168 184 -200 216 232 -160 128 88 +106 82 0 +180 148 32 +222 189 65 +246 222 0 +255 238 115 +90 65 41 +139 98 49 +164 131 90 +82 90 106 +131 148 164 +156 172 189 +205 222 238 +255 255 255 0 0 0 diff --git a/graphics/pokemon/hypno/shiny.pal b/graphics/pokemon/hypno/shiny.pal index ffcdb1df7a..b325ea1da4 100644 --- a/graphics/pokemon/hypno/shiny.pal +++ b/graphics/pokemon/hypno/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 96 48 -136 48 80 -232 144 176 -16 16 16 -168 80 112 -88 64 40 -248 176 208 -200 112 168 -160 144 128 -104 88 80 -248 248 248 -184 168 152 -232 216 200 0 0 0 +139 49 82 +172 82 115 +205 106 164 +238 148 180 +255 172 205 +90 65 41 +128 64 40 +136 72 48 +106 90 82 +164 148 131 +189 172 156 +238 222 205 +255 255 255 0 0 0 diff --git a/graphics/pokemon/jellicent/anim_front.png b/graphics/pokemon/jellicent/anim_front.png index 4e08f51dd7db1c487149d87710c384ea78aaa057..894a95327bc4351212c74ba58dd2e117999b1345 100644 GIT binary patch delta 1173 zcmV;G1Zw-v37-m(Bv%J?Nliru=L;MOB`e_+N`wFa02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1(6{? z6aivOM@0Xn2lB-L00cuxL_t(|oRNG!e{_z42aXtUew<lKyYqdP^`nJtS@lYw*|K|X zMcx_sgLV~QU-@28*`n?9R{;JB;Ba2G1gkdT+^ZnMX~20q@Q&sm`3=XoIYNZ6eZ;hQ z<Vzz_`}`*$a06Sh1k*aAFJEBGZ<at28w!8~R36~s;5VxQwg8dlA-*aT5x}Yoe|dcT ztMm#HtcL$!Vv|xI6Rkw;XT0~*fB5n1L=kbKm3a7y_g4Sn$8Udw0kD%O>-|SJ1ByMG z$t9FxqXF-!f)GXEAxXaG9nO;%5Xp}Eh|mNiNfP3}7tG`TBGn<;?SGL$l18+p&zA_c z4`$%ycX|01Qr-l7ONzmA;5@yxe>(y==ZPV9{ry`w>{Y;2g5`iUP{gjt?U-8xh+vEr z^F_d6S>z3h9b^fLW=7!iOxya-9w3C$dI8Jw=w5HOZ^ioMvx7vhBU(rDb_0n<M~I9l zKi}r>sE8l}*V|8L1U)A&Hot~DBD|3h3ojcXcAMALrF|X2=FSR5bArs1e^9%%h6C#g zuT7i@a+8JI1*0bO`zI<_i#7^C?mFG+ZFaU0g7ueAA?9JDCYq0vPXWJhCRzwEJS1}G zh7!QZ$K|n^L>%JzNUT|q9iyon0#srIFm$621OV`H?4?cRA{^Ny=9q%Uya(`n3w1@r zT)wE|;rR4}69U8;9^PAUfBhi=zIqSYg%hx{Is!|40N25VZ}7ns7;t){M+6!KJjb~7 zOL{(=?YIn_o%36qew}%j0Lu@Cl+R|nL$mdS0DInnXE*KYmBfK2tSuU_uB)Q1RT}*^ zjo`+mnzN2+V7KVwGOkue%c<0yHxX~b9=tjAZyW-;`j5-Rf%@<Cf1lN${+hUl2K6sW zbM4%q{<^rE)IaZm+HF$*0+1NhKXLO8M)l8u_lZ&clT37S;nmgO0O;y(0Ce@=YjZB$ zJ2Q~`hmv?7`iG-{*&Y-O1~aIC(H@X6m(^ca_kl_MP4+-j|0DKbul^-_Fes}(E1fPP zit1m^({R_+-*`F?f7Jhw(AEDSYP$LtqaknIqxvtT`j_)IzY4LyHdX&apv~_gtVJ`< zpfy5!Ank|-jBz6)gQ7hckv%|%5#D7M2Ct{;EDYBGgC0EdKH3rdQx=9ijB+3woGvSd z%FIC>#HkYQX68U91k430GsN=7Ck4>-m6OR`t^vR8F08?me<eaSmPw>NG#88DWQ@Ss z4E=+rYEI=>>PQm+F*=M>z;~D}A#j2y2P}{G$$>}%anU)eccJGf+vBH`-*bKC6iy(< zEdguSp^}+{k!?;nr!ClxJ2M9^Xkp$Ii|zqz6Hq_fwd<CbuAJ{3jB2BO`3@g@ry5WW n&r6+8MJVS}8%ey9|K9i?7OVH{+gga-00000NkvXXu0mjf&R{Mu delta 1094 zcmV-M1iAa43eE|TB$0kR90_npS#tmY4#WTe4#WYKD-Ig~00cxyL_t(og^|uafAl5D z!2?GOI6uxTrQP{H%lg4#TUNaiXtwO0TakAL{-9k2*jK(6RJLgQ{1t$|0yvykEy1cy zIQJ@ua2jyl4!ooJM}EUGZjKNkY#%W#9{JKp)IR?S2;9I{EWxyn=*t(_@|z`4#D)SO z0hI^1IQY$KfGt3zd5EvdL<F$ve?lG~|0=yg1gqgcnAoJ$$3!bp`x)>3^dElwI#EQN zXeA!L;=R?s`0?A{U;ykS%6k9N&46N$W^xIo*l56esvtxWcu113d581l1w^u=J|Z*$ zNs@&4?*;StzesgRcKcsskfaf9>GLIm?SmP3`CVSVg_Jh|-;!dm95_#Jf9;L{&Us>p zU4Q=;4to_am0&qw4HU5}ay#Z00U{V<#e5NPSQdGMVh34*qL~r+Jkz$mvj+&Fv|hln zJi6DL?OU;a`RpLk>xkBoyxl;e(Geme%Fnm?J1QcG!1eai89~p<i_Nd$jtFlg#KOx) zh~4IOb!lHmu(`8B(VQUje<ajyt>M7B!fO*}g4|@`cEPC0{Qil`)uN38kh@NIdYhds zgkb&UQ;2!ksEOv|<Ws;eoQW0!3=fIixuFDb@^N`=CJ~2tJ`!sdWXEVKhX9or0Sw*f z0|5Yh9D8X~xd=x#i8-dAG4BC9-$GpxF_$mucsM@&;Di8ihKKhSe_Ve^fUn*|cHso9 ztd77EAHa2R;TwD~1qPhn=n;Vi0nafm{gR%~W;-qeXXpGDr(b8@CBX87A?35#?$B&K zA;6w@;Mq;PdL?n732Tc6tm~?%Yn4X7O(VE*sphO>8rUuRxQwfn(Q+y^=S{?$um^8W z{TqjXuKwdPaiIP?fBk1QsJ|xep+WtN(p)<?sJ|}mCiTyIpmv+ozW^jg^-tWqgHio+ z;C*6L|0ENgTzGZ$Hvqc&8vtGX_u8CG_s$ID{-Gq^hyLLxV73PZgTV~yU$h4#%w_f0 z)qP-6f0I4X)c=S**sFiZ9t_Ir&q}9@h@$$J^EBKw^*5f*e*^VDBy{yZh?=hc#c0S| z_o)60ss81>&96c%uuawf5NPvz2y4-dGiZ&_9!NW)0b|_A$e?HsMr04rVT5;?g~98o zIt#-!z@P`uypMJS|CEIx52GB&2B*u4p)zw&2XU%|yO}wV2?29~$_%l*@ks$RedT0w zmutXpy9;aZe`JYJjb##P56#6QI2j{wHbej5shU&yl{(S{K#UIK6!0BpO9-4G$^pyc zeR3euKwNar>RsqL%J%r_<o8@(IfWC5aZAA3b*N<KU}T$9&S?vF<Ic>13tE^r#iDxv z+XU3lcI~?5r7P!q2cz0(U%tb~-l+zZ!}C(-QxVGf98?mo<iA_|4-MA$?D(esrT_o{ M07*qoM6N<$f>RM8%m4rY diff --git a/graphics/pokemon/jellicent/anim_frontf.png b/graphics/pokemon/jellicent/anim_frontf.png index d94a329aa6ce63bea837cab5713d8d79fed15659..9ac8ad03205448b1f3cf45d603289826a240becd 100644 GIT binary patch delta 1054 zcmV+(1mXLJ2<`}wBv%J?Nliru=L;MOB`FUYE2sbf02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1(6{> ze*ghuOGiZir3doG000A$Nkl<Zc%1E)P0rdd5Qej{_g(Y?NSpwD-w7N9yXY&<&n_z9 zkOL5lZAFj|&;-r0i{7&{c0xiRsk*3CRal6>d3a~+4D-hG{$w%xn22X#8inZuP#3k% zCjc)AVP8+?s34gV@HhZW0$vW289a%Ae;Suy5^~H@tFd@|Uat{=)d&%rGe*T4RwiXn zj*A%!tj@xi3)b>L#KxF4d^fbtSj%ub%v>-aRu(YJhXY~KoOc`3E|CuamS6^djv+}( z2wY{+2NFQw<EJs@EZz}-Il^9?LuJh2<Fhf}K9S6sfPR%30n4wb^6kgm7Q0ODe~Pex zk$x=8S-2y>hrR^YCprc5F`vcKZbF~{T+;_&HnXqiF`%5y-9g$6aP2l46&5hky$A>B z4#+^6ZZ#Qt06zg7IzTif+yhlV?n>x@41sHWOW@1!L>csL7n#P-@hy(}isA#HDy3Yt z`60u2Zxb3NYYfOulOGE>b^>@%e;VAXHco(mUT-6CBlhmKpTOqOl!aE^0_hNFH4>NM z9-thNlenIqWUvx;EA&(QGz5623w^gzZ$Kz@7as_8l~OSjzZZ})Xey=HUhBaS!9FdC zut|#DQYpXr-7SuU446Pd?Su%pknVdc&7~!bA77YK8)_GCCuH+&nc`prfA{{9ZiHV6 zoB#oD8?cl$0TAN*FlEM%0DHptEm0=;_u@nx45G|WDl50HFfnzQn-WCS3g0E}S_(m5 z=T&S}^Z&FOC;%0x9G~nb4mGw$Gs^6UW|&Xu0{gXsD)4M=w^64+VS*%Ocn}5Pye)=< zU10($L*iNH;A+d^e&Q;Qe+5NH0$g!?IFWhkfCBbv)D>8SS6k^|+!LZ>q=P6J3!_B9 zbTH|i9s-kbj~%Du*eJgP{_greZVz7W|8jp?FZXW_>gE1}N}s!bSLt*2Z&&C3WAnas z|J?|{e5ERCm!1C{*!V)i1}8xH9FQjV(R9iE#bXXeHx!$sK3VsFf6T$C;Yz%gxpn{A z$Y*hM@2qfF^DrQ6!%FN`+-FAazi)1ES^@jVgsQfuj6HKzRx;=bNSV}mjm}KK3F<fd zo11`?i$%E2Q*v$uGJvhk+DP#I!Y*aaU*|=UH$Wr7U3`%`^DoqqtL;19Lm87cz`Ii0 z#k=Rs|48P{7wXGGJjNF%L6@J~9<b)`1+D5^e^#~?H|D=>(~beyr0OZqH-BUv<NxIP Y1+q4*5Scd>LI3~&07*qoM6N<$g477#GXMYp delta 952 zcmV;p14sPs2!;rdB$0kQe*=+8L_t(oh3%G2uG%mV$Fs5bUGxG-oB+Ld0tdk^dd2zJ zMFkvk0AjJN2=W1%pjmd&dv?Z7NC+fdy)G&&#Mk`z&)6B}AJ6-@i`mCSJPXq(OecW4 zsC7O8cu5HRdNM}^$&`S{0bmmFa+u8ENd(lm1e1_sj#`by<MVore*mmTh}fJlD%P+v zDSL8U%vfM`7RFq#mIop>#;oC|p>@VuhTCE0f&sCzfLT5q2$SZ#+n9EVd;qWnGx&21 zNm4@KDvLgl00JMsjVWjGjsVON_Tn5WV-6o*jrs9~WX=TitIP;ken*ubzvi~sWpY=9 z1&s7#S<b>80Y3C4f4Dx;DVUG>ES7c?0tMijJ^-_seLar><!tT_(q@2bx6!DufRXM+ zI6!wm2Fi4+$<PD%3E<EHqAB4XsQPhNLI-3BT;p2;Uxp{jpl`d#G=7e6anx579{^P; z<*LmO8OD2?&?s4BKyI4+SirFpz=P7@R<&^g1oV0vfg7=Rf3N)nHixDxwCWZ}hd`^5 zxD59I<%pcb_4Fizm9Sf(pW3G(z%yOwyOnwaLaDp>K%lFXilO+ufRsT~DaH0$4~7W# zX-R}lQtXyW`OWWcaU^8G1QKc|M8Jh~-&<)eEn)ol!j#%jyLdYxn{Ue$2OGHemvkfi zO5g+tc-w%bf2;|B5Z{L>Gkyfv6UJ|eGQqzWC*oibWqwjwxpjq!sl(iqAfi_IE^*gV z2>Lp&VxyY>r`13Ks6gfTWIu7Ju{D}eW=Ax`d`cJCuN72*XKTBSIt2<7Bq_s#C;;be zF&yj)6Hplv&oT#BTMqXVS8*&TIuhWD<HL!}QwJ2Ve^;Zfz#_cbN(bYf5FH~OM8Q}X zB?6{{N$>O!n2dYuI334E`5W-L>;Jetc)9<}{b{}2zd5Lv`wuF8?*3h+&)vUWo%@f? z`_}z;BLMT2s;FId{&QgC3ke&X0O4~$n%GCvCHEJPIT+ngY?At9-TyHMqlPQ-TISaM zYa^e<f6=|O!d=b7fUpfKu~%`Q8M*(yxxr}#>>m@V+MY7@%vD**peG<@Qs*@~GXW>4 z-|TO00#Ys(;Wkgnxe>?!wl-@c!S@Thlr?{y7e(FxjRbe`Me5AIP)Dw|?|2VoOxghN zN^KYKo-_X=nKNIgZwnb;oCIBdZhOF*zZbNsE^qx=*;d?`|F%s#24It_r$FEQk$H@N a!ukVK#H<i<@B?N50000<MNUMnLSTYq+{tJF diff --git a/graphics/pokemon/kingler/anim_front.png b/graphics/pokemon/kingler/anim_front.png index d60fedc19037e4dea87bc25b55eb05ca1051e6d8..fff0a1cb4eff28d41a769ab4d44fd4e564ebf851 100644 GIT binary patch delta 1441 zcmV;S1z!5-3bPB4B!35VNliru=LixF4-*Cpn+*T}02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc__Qi|;i&C^&N`ol~|MuSAtem83L32_N{}BILL4PqyF(CgC|GmBD5D*am z|Nm>m_O<{300Cl4M@0Xn2lB-L00h@bL_t(|ob8q|kK#rYfJefGD@)4{h?FtKRcP_J z*viLYiYQXJA~B(&yIEJGt(L10ie%%;zhbK`uG%U{`%@ANA71NLnk$kz<jst2unFEG zNw*^*5c4tb&3~IQ??dQy{QpB6z5tAR?eiT>+Ly3Q;*=~QmnZWCn}j6l^8n+Ma0DNK z&IQJ}5v~JYVN%2xbTOVJZ2-)lWGH|#hK2h{8=ztAIR6L~F*IzZq`8Cw%mN^3vu2$O z>j*H3OYAx@xG*snF(d$yNFxagoBc;@VpD{62_dNjG=F%>Se>o}u+;$G4UzVZBuxuH zZ?@Q!kpZwF#2A1}0l+;m2vLAj01j*uehxRJ(?@Pn01%@DTmf97PERlZz;~7eWO)pi zq;M86tC?st)I?2EVn1&lw#D8Icg#d$Lk$l{iRK_J2cWmPbISS}bS3r<fMX3^2f6uA z#O>YRkAJJWgvnT3Voj7TO#qlnz^x7-OWxUVM@G2E;e;VbY!mDI`%l#oW-IN&hTr!F zT~2HW5^`cq?za^X`e<a1@YwpcOC|y^Xi6~eRTnJ`Z?vm<Z*M~q_WM7bmA;4xvCQfS z4f^xVck{RVJyiFH{r+mMd$0sKx<<J-3+8YC+JFCs&G%mc2m@x2>JI493gy$l`?}x% zfqTF2?PyMS4CU1VK`;X%@KS613&w9!zMFEMM2Mpb@O`9z@aAux<``f7xC^EUiez<F zgxNHvtB^t(*&Lf!^T3<3XbD>{0e`yASV*bo1+yp$JkO(S8HUvoVc_da%BUdZm{Q6^ zwtu9vVgVX3w9aT4-719AkNz!7o_5}<DD!lM^ri3LUIPIG-quUFc1uq#p@$4|Mp5R& z6eL1@z+zE>_0G%19zX76x&{|Nh8I9gR!EP%bp#wQv*jVZ<{UV`sGuHa*9qc!Slv7> zK5>3HqBw)kAw%bfksy8Qw*Z1+$qT>>^M9|Sb!g-9xD^<|zc6nD#6LATX(9~(pR|A` zV4ep$_}>C5g_bPKj&*Jc6`^GtRsop9mw=OQSqx~!7@n~$J_CrJ*xzh6kK1!V*Mxqv zc}&hd5(RL+3Xp=;3XGtcZQ6jX0?zGG0+SlhX*dvcmgi%jV>KMez$O3>6)<Qzkbi;g z$>zZ>jR89Sgx3J%+WlYeDsAa>C%kdPQ&#{<72$J3qI9<H-`^cl=($Hb7O`|%11zT$ z7!VNY7XVmast_7Z%e$up1pFdQtuLRp6#)JK3o8Lpei5dmzb!AlW;(L}DFIP_p+i@# zdLmd<Dgh-R(l2xd^GO3x0<u+p!G8|(pjoy|QVGab`UUjOLuE8jAh`=EAj&Uxi{r|< zu97GzAj&V+^yU~4u2>2P_=S@?!D4j;XwEo6m4HaU2<El3`7HWQAt1^x;yPf2C_<%x zD8Hx!D9fR>mI5OEf}H@dUI>Wti#niZ0S&`KK$Kr3b$|sd%Sr(${GtZ<(|;(-3jrzo z0-E{i7|1iG1f=u}l>2@~=t3}<5|Gj_a_ZBH&^?A?nw0_~{9-{F=O1Q~nvaEGWU&;G z!Y>xfBwFx5`U47f6q3$L0TF(&7S|zKEQ2Sp##;K2Q3{Cg3-zGsk@N?Y$FgopK#u(a v7AgEeeIW&;?iUSzFlti=<{H%>{+sbPp3God?M)$(00000NkvXXu0mjf*mr+F delta 1365 zcmV-b1*-b93+M`vB!4haOjJdf(4d1U2>**xv|36K5D@moi%Kyd-mIK+QV?1}G5_}7 zq-sI`|Np(c<^TWy0001=fyBiC000SaNLh0L04^f{04^f|c%?sf00007bV*G`2j>O{ z1qlb7Z=iwz00hfPL_t(o!|j&8YvV{1fJaz`O55_n9qbhz`F~)`NTWcCEoP-5(mGq2 z%O4O3hU*7LY#MV2B;+cvP0Hg8Ho7K-Aq%dK-O}Zi_s86u8A<+;jZ!SzMG#^#pXa@K z^P=}5^z!`p$LKx-^oQ;19ZcG{@EqdTEFmY4)(Lh9q5AVF#>2<!JD_ukG438G01v5R zoK7$v&^7?pAAe;ifjWkVN3;zvF!ud#0#ytHJ0YRp1e^*W;c?A6m);)W5SzG%!0Dxf znT(+Th(!G32+rslJJ^w-Z9+(>00Vwhtj<IM*gFDVb&>I#A{`H(PXp|z$N;zyq6ff< z1fWk$LNwr4fDgxnuS17)M#!cW05NL7mcR+>3?%~q{C~|;fGUq^lMwC#Rt*RByN0Yu zNZj-3RZyMHw0m48)-`aqPYoX#F#yBqtzXyI6f=2t0DP}&`^b*}B=+#`uGiEhqdnQg zhAdr30az%&ZZ06AuUzPnJ{~f-VF;4C#QXW~Q*(vU%(!&n`@_=-BQ6BV81V*oK?7t7 z>N|bh^M8JwkbwkD5faRXO`~Pmy>Ye}Ze2*ief^I=vo<Lqp3_{RDgM6yY4LWuh3fvY z-JUJ161E_FZ4{TQV)6Ft_FwG0{s2H$aFaAWVC6FuFN^ZScKZbn|J%CxLX0_zn+=L$ z1w>JXUhfZ#--K+uWQ^vBp$142WPL0bZ!Q)XpMU)|E|wJKs=7MDYMF{zCLoPyft|BO zQ7(DDhNIU&vYbae6QV4ORh}1RSqi?+vSy2{NUXKsLK5m(3c)hI7OQFlQE)VmM3z5j zM2OGH1E&|`a#odjIYZVuNgi&1fCqlf*U)zBQf*;n9CAi^l)w@sA`-w-S%LYujO7_W zkAGFVCX-)=AAq>3kd>D695_~I%QA7p7;s5dK`V`JC}LLDbRLtR7~5S@8o}p`x4a5X zimYYQ{ysH1eFmT}Q|o&MUa!|{A9(N<W~~EFzJ>?S0GQBc0Ef2B)b9m!3N2aI6N|P+ zXgP*g0Z#Whz<&aOQH<e#EWl3yawd+Z(|_r8@Dwm{VBSox=~Mp_74UQwAO)`#=)*9Z zwgG_#{5D{40CbKV2qw$<KG5-w9LU5D09XEg-MWW>JD6U%ZgXlpV28J2yQAN48*S-K z2JEQALt6s0iSX`7qAVVa?rwJ}4DG!Wch%eb0Py@;U_d~WUjX2}Z$cP2tb0!j2!HrR z7JBbL1q}fH02^xo(SDJIWE9j*Z#cf1e_BAaUsy0zo0$j}6)Hdri1G`I!#X_zw15QK zFZga9G|N><Y5@t9U%=elRmK1XQm0S?qWxmL*{_^!Yl%_<qWxkn?)L%dinV}%U-+S4 zY-aoI;rA$N1Vs5ou{gM!cXIAj0)L|YB0U7m4CSa65bYO-0E%K5t+jwCzu=F6)T#tT z`^6z(MTN++N<g$<95+zGqo@{;$}bLpWSK{CB_Newz%ZZf198N)fYg40;w0HAiWCg4 z1*G<iSR|q$tdgTtM74lOzt{-Q*vC~~&3GvoQK|%_@{7%y<{MThe?Y}pKu*$8Eg;e_ z=CU2~&APadd(4#&nYDmOzhIT1DStq5s_Lc%WZy4flgc0HPCyR*;>aINMqm8l2R{D; XfzQy*^>f_M00000NkvXXu0mjfB}#WJ diff --git a/graphics/pokemon/kingler/back.png b/graphics/pokemon/kingler/back.png index 94feeee730bb19fb016df2e46632b287f43b1ee3..65b5d137e5aabfc9529dc0e6f2d606fc7fd8214f 100644 GIT binary patch delta 741 zcmV<B0vi3<1(F7kBu58yNliru=LixF4-#<<tD67-02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<ACWE@f1uE`#dC|CN@{a4N?HKs z_QlQBbCioYYGMfg5dT_1F-kEY{}BJ)-u4g>5dZ)GYb<vS00001VoOIv|D^}=#Q*>T zHc3Q5RCt`#l(BBxFc5|{aOgxpX<k5-XQSY0=wzs(W^eWr1dJz-8M_2=Gx-?>(=jsf z8G1+RWJjVrf42lA$i9#N{X8C-W&hb|+xzje&a1m|P(@zP$Atl<^2d2Vf>x^dK5wH% z0hE}x;WPooEFnz*@`ob-krpsP;DLN3*8ssn7)c2OdH_-qD4@#_Em0{^49XC50Ojfu z8KBgCyaKgK2tY7V(uaXGz;TpVkAWsA=orT_@eqJ=e~4FOK!lLyc*4Rk7hvsD83thG zy`Qtti+k@TfVgJwGU?sag1P~)^(Gk%1Fff@ejLAg)H5B+0B%N|iVH5WnggI@0hR1% z2`mtbEGCO!AQY+=ezJ;Npu$q$1pwo2oI~6K#-FEKVc_^W090==DwzBEvU|ODLzOk7 zv*ixff9|5k;*plx6!lk^FV<QYR;d=WqfN9S7?V41?a}uDw!DtOFFu0u&*t6kbJSSD zV%<@T5+I5t10S2`!$}z|6D&|xMxap)WFK35IjN<`npLrKl)Zsr>)y7{mvgzyz5tkr zO@7<hz4fK8dq6P2C4Jx6-yW|?226P0WIziYe-(Vui@P4+_LpzlC#okb>DBc>%)=H8 z&kI1fKtw!&v~3srM6s6sAwY!AGXZGn`oA1MNlr2#2@tfanWXzn?r5j#XplZc51`D6 zmMRasPs%SSwZq5IWPGiu=19rQ!S17c6#&-*^iME)w00k718unv#~7blCN86Ybo>S6 X6WsP#oOF<X00000NkvXXu0mjf^<YhI delta 684 zcmV;d0#p5x2H6FWBnkm@Qb$4nuFf3kk!u-$(4at20En1KXmBtP5D>7ya5yL!$k1?T zU<g=1IN<QWkcc?=`1rWE-~a#s0001h#jZ~P000SaNLh0L01m?d01m?e$8V@)0006q zNkl<ZNXONb&uZf^5XLRgVUM<zK0xI7zSiW>qZ0{IdP^5SNFg9Yj}4@BA0&|TLSJux zXY|KyV=3odfsK>->6=e8l8XOrRMqYHMh)G~ILLM=^Km9X%3+@eI4CLGUwIo93ZO*Z zhE@c$S%M1(3{UOwGc6#Tz!UjM#ThsYZX_iHs0m0(pnz&zv_YkPI)l#vl&eo<fJTLQ z2XdVd0B5414*_W)#!+H%4b)CS`8bY$J_$5ayt@XN3#k}SSeWJlEOaWv1gwoQISWDD z7(D~nXZF6}M$au!{igNtc?J=I%Fs_!WId|Pj*S2|BY7-XEV0Z1;8RdHlRKIR2ecV* zg{;p3u23a2<`&Rlsc!;+aXqW_S3sD}ycGhDuM<G^W>*E%_aEcy=WghV`s!?d>65ji z_t@@fsdf9kVEn^ctKBN)k~&&@8!TdcG}azX0C3AI58TBg$bVnn>|sESH7plBZBYVP zyNbZ$<>j=M0?PzTl;s|%Wdw@Hv)ygw%3#epUpdNN!_>O>^UH42tcq^{CW<D1T<pP` zMwJ0z5r`#yyVySlugM4q_x_T90WI`Y@MRF!0f^h5zn`C}p0J`<9{`^xS`cxb1Kb6| z{0XGC?d&tfD*A^2=60TNKt<R8?)X4*JOZ2mMqMp9-DiBHPL<vueXsza%$AnQPvZmS zXOvpwBWN<d7F2Vj`0iv6UcPgH4gme*j2^8$_}M@$H|`kYQ}V=R^iPf#qWB9r`K`-h SeMk)e0000<MNUMnLSTX`^ER^p diff --git a/graphics/pokemon/kingler/normal.pal b/graphics/pokemon/kingler/normal.pal index d05177eee1..78dcded55c 100644 --- a/graphics/pokemon/kingler/normal.pal +++ b/graphics/pokemon/kingler/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -131 41 8 +246 197 139 255 139 82 180 90 74 -16 16 16 -246 197 139 -74 49 32 -222 172 156 -115 82 16 -90 65 49 +131 41 8 255 246 222 +222 172 156 164 106 65 -255 255 255 +115 82 16 +255 16 255 +90 65 49 +74 49 32 +255 16 255 189 189 230 -0 0 0 -0 0 0 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/kingler/shiny.pal b/graphics/pokemon/kingler/shiny.pal index 5c9922a8e8..628e75ebf2 100644 --- a/graphics/pokemon/kingler/shiny.pal +++ b/graphics/pokemon/kingler/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -64 80 0 -136 152 72 -104 112 48 +152 160 208 +180 197 115 +139 156 74 +106 115 49 +74 90 0 +230 246 197 +205 213 115 +148 139 57 +106 98 8 +255 16 255 +90 65 49 +74 49 32 +255 16 255 +222 222 246 16 16 16 -176 192 112 -56 40 24 -200 208 112 -104 96 8 -88 64 56 -224 240 192 -144 136 56 -248 248 248 -184 184 224 -0 0 0 -0 0 0 +255 255 255 diff --git a/graphics/pokemon/koffing/anim_front.png b/graphics/pokemon/koffing/anim_front.png index 891ee864d6a3f3200c2d7e087a281e1a0280b1e6..2b70b2cf5312d45c9cfba93d86c091735c6bdecd 100644 GIT binary patch delta 1227 zcmV;+1T_1P3Ev5jB!35VNliru=Li@BIUrT!rT_o{02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_|NsBq-rn}^&CSiM?sJQ@T6_Nh|Mu>b?$v6=w0|khz3!}(&2w6uN-0_p z5D<kZaMJ()00Cl4M@0Xn2lB-L00aX`L_t(|ob6Vza@$4_y)wWIs9_)LC#X`c#8N8h z&Y4MJcJX%rsa)bXV-HFKGx-8CZp8AykrPd3GQ@(i3pXZ@`T$eN?i~o=4iMF(Nk&^y z*mt{cS9iOQv43a#H_hSijsrqJI3B?F{YH#-I0Do$9RJsL2K4)fb8Z+!R)Ek)67|=Z zTL3)5eXhTHaMJ<cWE1s!B~s=lI&ei60r4TgY%cD~T0(zv2$3Xi8NkcZOanL(uTzx( zFB2k_b>$5%i5tNU`O&tj^3Vh@_S-C7&4tJ}BE2gRfPXp6YF4uuGF<k5+@uojxgUhV zr1oM(t1SN}#Fu{mQ~><ls9aMDSiVG;_;lLO1>|d%aNfv3CHMa5_cM_KU?KTEHN25w zI*C~J>GZ`$RgtA&16&N2(OI-yZWO?^|0C3cG?!n0ev5gin~CZ7@TmMc9*=+7U=?fD zGEa!le}9cfqmjf`0<p9V2`sm7Mz4v;lIpYr{7w|4RR4`-M-ER^mST!Fpr?EngENW) z9Vr-c6N@u(eJQXZux^uN*u}-UxVVHA+kMyev+v^i98=t0VF2g|fGn;D*MGv003B^$ z>;%N(O8dJbusy(HI2=9>=mDUY5L*Ip)9Y}y-+wBC2-xQwFPS+6LjT=92W@$A?{Isj zAm9TO+D`<gzBMKAn)8AcAYuJLe@_Do;Bb}m;n2i5@FxZ!)FDp}72;!!i~v3X@a`4` zD*=X|hKwJvxDnO5vP?~oc)}hvH6YyRaR5t>IiKzSYt9o}I1Z0*VfU#u?V4-4BZIxH z+J6*qOP8<8zWO>vi~zliTJydPK^rwX0>BUlM`w!ikughWxV-sWF>s82Oq&x)KQbH$ z^*49w2Uc@_z;@IeaUumJGk_8h7=WNsATx2JJ~=_NpK);5!!U<sNtHLMbYl(hXk+Df z`j9bA9KESwM*3i>5au+&+T-^Cr9RLI(|?l4UCmKkD1DI1&V@4jSm}d~orZvUtq(ev zmba<&fk?L<IlPV17E(&+03>Sn%AEH9XVgJ92f906DqoD>j7G2CX59e%jN2dWCnTA- z+Mrb0lKiib=(b~Vu1FY2^h>1=b}fLGaae;E5bZiu2Nr|DB{CoZ(E{`cad9cmM1M*G z!UQ;Ur%7U5kc7xcK$s~)y1xh*V2Z0D=?5r`0P3-xWMXjs^5w1C?q(klK-X_8#1ORK z(m16!Me5nG)DJrgpdJM-RScjJ6rp~Nv3?Z2EucQQRfsin-TLLl`U&i}q#X#9gQR2C zcE?u{;U%y11MKL=#bNz0P|V}I=|qu!kV<7y7tHyhX2Jt2FvzYbn`q3J!&KQlB7iDD pB@b+K`H{u16Gl$}p6x$i{{R%h8F}L<lrsPT002ovPDHLkV1l>zGx7ic delta 1146 zcmV-=1cm$G36BYoB!4haOjJdf(4g+sYWD7w#k47NTAa<j?yQu}N-0_p5D@tI_}JLk zv|4-abBoQ*toH8B0000Ktu}iA000SaNLh0L04^f{04^f|c%?sf00007bV*G`2j>O{ z1r!&4wA}gt00Z(#L_t(o!|hkSZrex@UWEdb(xeW!n)C~hW`7>Q2aLE%0;h_U7a*3E z3>A!4xil(-Gan#0L+^1w5GdsVS45@ZPObuX)-z;gmz2omT4}Dj^Hw(J<NR@UzE6xj zoqzLm+>_$~FYu2$2!f#IqwS6W2Opi_v>gHMLG_;F`Jv&!3owbp)5tXd_=+32`e_%= zEdZBJU;RB0DSvZfqjm&Dm4ne(Ov_rlpkKL&W2bb`P0~aITuMBwMd@q15UD&=UdttR zLO3Too?KP#H35vh7^Q=;5PT-mX@LNY(X3`L8exXn>d#p!Vc`b8=l5B?{ey(R7vlHT z>RJH&R;yg6<TIY3NxZyXaRGeDV%M!jpptv9R;xs$0Do8rUr@tq5zhJ{OI}`onyD(1 z6ik4F&JubT50^6qaLg}4JxICy_~kRkp>D=adlz4oAJ^;kUo)&?*dDvC5FcKzH=B*b zRsv;d984g~zi$4fL^7(=bnuo^kWzh(%o3w3_9w*<Z9q@i?sgC42P`2N<|ZZ&;__Bt zLtxlWl7C?rC->s+7E)~Y)N;N45SRBD;^GD!fW-l3ak;yE16u-c8{j#J$&I$#J+LLf zWV_uy4(I`(l@K`rTyur6Wv&uLz>>Q-WGBW2KUs3nhZl>EYwi>T{0fD(Qvzp!u_bWK z-GUV$VR)s6&^G`bSH--lni%;(-&``Msu^X4cz;<#b4#7l>=s3Jn?rNS1R;xRUX77u zYJ)`m$5*9V5Keexna1H0BmF;V_$MqJdB<7U`58?+O`5huFv+T&0<v^@t72=22mzXm zTKm4bAxJOb5dgZV4Dlmblw{SY#c`R*!ktDx&gvUUUou<>hiA@N;2X_(hV2Mz4sZkM ze}4f=fZqW4dj&EQ=lYxa^?pWv#ltX$tWq6uy><=g5@YdljrE&LPKAIG>4R)qk!_>) z=of%eA7oS8f^i086c<V#q|!<#qj!6KVBs_bj1T(2N?P67ULS}wU)TUjTSzIv0*Dp& zN>2R$0d>%@wMIkMP35Qc*UjeJ=fn=c$A8HFc>cj8d8-XdrDbIQhKc4D;vA4LkZ6}m zAIw_-E#t5TEg;%;st!zcyIahF1VjtaBgEaUcn~QGh$f)pmJ;KRBt$|2q8Y-Y`9;7E zL)>ghKR{tH8cxsiMC|Urf4@-d&P`!X<ChDu1#LGpPAN_?^<-P>hq?LNfCdst6>}YE z1bJ|4OGQm=F9*~I7YZ?Cj&rzqk-h@UoU{XhI7oW!w00{(9P+(>fH_TE<Q*;sig~;@ zJ<<<SsjQ;4U(`;xVg)*x7YoaNskX}e5dpLZ?B#)#+mD_nZvQWwAD3=zv*OXe7ytkO M07*qoM6N<$f-%t&xBvhE diff --git a/graphics/pokemon/koffing/back.png b/graphics/pokemon/koffing/back.png index 53938fdeb289953afef869e204da4be03ad3f59e..e97a5ba3e6ce19af2f0db83747eddc08cf21c6b4 100644 GIT binary patch delta 774 zcmV+h1Nr>@1+oT^Bu58yNliru=Li@BITD>S_kaKZ02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<ACWE?f1uEq|NsBq-rn}^l-12@ z|6)qjIUxT4|K6O{w0pFRN{h7S?uf9sV1R%)P*@NU5cGNcTmS$70b)x>ME|7+^2GoE z0#->xK~#90#g(yc+b|G@Idia|AVZ#@gXf})_dG-2hRV=%lr*FsB@XQa7zwhQbX%k& zPYSvfuw=~ze^m8IiWDWm>ed`!!!kepcmL^pCggR3^X2oLu|<M1jE@UImc)!j3j#@k z#6N(9vE4$AMuJ}^3~<Y$iv%?(7`t7Nh!+7=h@vRDYy@kF<0T`yNL}Yp<)ra6>B9jz zOUcMJ9|QPoqI~Sy5@~;xp`&bKDo-Z>LtpxHQ8^$_f6^fXo}(|kUMcxvxL-T!t1>`e zQl-QZzgmgMZ-J>Ez>F(ULKJm<5{HMNpbVR8fi-~8A=L;ljZ1X~1T1lQsArAS-K;#Y ze+*6Ygd5Mb1YLxV{T@a{o?4F{IPCW?Awjk0laMZjCPn};<^_NyB)%QrOpfbXDX@eQ zI$l4Ge}I#yq=X@qyuJ$0Kc57QLwvsqs-PdBm;g$uz-cxIbe)4h#@cEQd>sTbcGvn7 zDU6yb8!x~j#=L@3O5(-2?#KuT6*N%1_X0Tf_#+trM6}$`#!Kjdxc4cl{spyg8hRi; z`P+-Ox2!yX1Cb8^oV#9aGgQHo`)L~ho&$g;f3rTJz}o>JU*_kqfdFV>F0m=eGVuH^ z09Me>0JsT&b^B*}ybVhrr0ZtDwi)f6^{j}Sh6Z~KlT3k<xV=NomUB6r(vQw8hMgHW z9!NM~+hqMePlj6;xz;{IKfL8{W*0Wa?U8cbD|3780Gk0<sQm}x*ekrbaE}_Q5+^Ov zG&anFiP;X<OJJnbKx9^%UENqk3ujN1UDp`xl>CSI3pH*fH8?!9N&o-=07*qoM6N<$ Ef;RS8_W%F@ delta 741 zcmV<B0vi3Y2K@z)B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP0000mP)t-sn9!iG zfUwZ0(1=)wV1R(I;OL03xHwQ)5D*af`1sh^*uYRg_<(TG$Y}8BkN^MxL-a9B00009 za7bBm000id000id0mpBsWB>pHR!KxbR7l6gmA`J=Fc8KGXn(NBN*dBt%+QYdGqhue z1Emhl6eDW~n(mkaf@O3PPyy8g<RO|z=$mBm)}fQ1p+{1rNU33`q6gTp%%8ry?{q$s z{}fdfJ})Q@5)s9C5dg|Kp)?B!#4!?o0b)w?=ZQi|RCyS<rdb}!A&p!IB$6P23R#xL z&l|xSk|bnA7Jn)0oU2?kK8mL>KtWUDxvqQwpG{Wyt~HTPS0y?s7p97I0Z{ZMKi91R zia4D!;5quj>kZ@giu;^LwkicoCACZ(@T-lud*_&%0L-`nCPdwJN3p+k3M#Rw8rT8| z8Ju~5YFsKaAfSo;ZMSNi>}G3$-5v4TQYp_J2U&!S-G2@|qDZwz3+#8hdzXl$=cC{z zg(N(HDDwh96CB?T-xtSS#~5fr2^}6kdcaY%oWmT9KR&qUZ;k@|5bqzHDxz0VF961w z<Fs4@vd&qcq(i#~KFtCpeLdI{E|eN;dMiLPO05E8jN`?r8;J+F3KFP)SOFY+{E-Y! zdI`Xn-hWESfw;0M+UW(IFdA|oUfSF1VY19DfCEv?0G!52?J`$U#aFP38wZHub`4y9 z&H#A}e*nM%23Sj68WIL>emTGfhINi72iOkZmd9te1VYAf1)O_t?`&5^JoS;Y$1uqf zXo%T6k=k-5hf(@4s>P72fvX$|1DyME`sXQe>s}%^=x1n$xA{u-!j5ozq?PQIy1g@i z&VVaa{{vOnE4;Zjj~dzrCoPjU)PhN9j_buS(nugvt4*(NtYUzZC7N;Um3B)0c@Xj& XdXEt<XTmmQ00000NkvXXu0mjfZyiQA diff --git a/graphics/pokemon/koffing/normal.pal b/graphics/pokemon/koffing/normal.pal index 3bc7ed3d86..255edac9cc 100644 --- a/graphics/pokemon/koffing/normal.pal +++ b/graphics/pokemon/koffing/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -238 213 106 +255 255 255 +222 222 222 +246 238 205 +205 205 172 +238 115 139 +180 90 123 +255 0 255 246 238 148 +238 213 106 197 180 41 -115 90 156 205 189 238 172 148 205 +115 90 156 74 41 90 16 16 16 -248 248 248 -216 216 216 -180 90 123 -238 115 139 -205 205 172 -246 238 205 -0 0 0 diff --git a/graphics/pokemon/koffing/shiny.pal b/graphics/pokemon/koffing/shiny.pal index 169eb24a04..672d7d4acd 100644 --- a/graphics/pokemon/koffing/shiny.pal +++ b/graphics/pokemon/koffing/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -176 128 176 -208 168 208 -136 88 136 -96 128 128 -176 224 232 +160 208 152 +255 255 255 +222 222 222 +246 238 148 +213 205 106 +255 98 74 +213 57 32 +255 0 255 +222 156 213 +180 123 180 +139 74 139 +180 230 238 136 176 184 +96 128 128 56 80 88 16 16 16 -248 248 248 -216 216 216 -192 80 64 -248 128 112 -208 200 104 -240 232 144 -0 0 0 diff --git a/graphics/pokemon/krabby/anim_front.png b/graphics/pokemon/krabby/anim_front.png index 69d4f372d17ae422d9dd05edf1c1e71b968902ba..afd1ef7216e2f2ab3e164191e4d1b8900ceddd52 100644 GIT binary patch delta 1144 zcmV-;1c&>@2#pDlB!35VNliru=LixF1`#>OL1+K~02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_|NsBq-roNJ|NrL2&8&;8gGzH!5L!VX{{a900Du4gq+<VbG2S^joGAzp z5D;z(ZZQA=00Cl4M@0Xn2lB-L00Xf}L_t(|ob8q|bDKyMfT=_pU`TsOJn8c@*3mT= zHD2RR4YJC(fT8jzg>$3gX81uk&JWPaimMdz3N@a|Or(U&NP)t5@9hH8f*5?&C52vv zc0bs+ZxP>9lz)BvpF!!T#(9kd*Nwm}p>*CbZ%~L?6Tlb{Q4=vtDGi&FNc{f*G$oO( zF|Uql+v*5lC(CJYm0#(#fEENF^2<e12TU(VLAI<u=1EooEg&TLlmlT6@RblUy2=5{ zOIhB9PI%;5E-6i`byyHGVPq5)KuGVRDv%8CNjAujGk?J)K&NCf9I_lxV1f7e9lwHw zw7CFoCqrNPCkKp&JA5Mc23bub0no`XQjFrUDn1@mfp91<%HDTH^{y1{QjDL|S>nrC zU5F*7!CbrKIjDcpv<x^LSO&qj1-XVtsL1DQeBT1<VWceo2!czf-vkKf4W*1puUX&f z>ZUmg#(y_Y$r#4}Mo>QaJ+#-@H-Ee$H>UYwJX2bTElUU3LT^tFZp>%nmp{xGFwsI0 z)K^NO_1aAi$j!5B(|qo8pnaw=CT*hcsV5z8%>RV+BAt0o$5Kk+^v+y_JlKNgIq6-` zssJtITJ8}-=bt@<?DM-Gj<F{LHe%TGj!@e{2!9<~pBb}`+_UZdeKb%8Yuv{$i!BfT z#4K91tqtL{JG_<{yBK4uhut-t+zM7LR#^>1L1On<%;P?T->c);LV2Nz{Tgh|AJP@W z2IRHc`8%o%B43(0k<s*30phH2dLR4P$FB~J(q`axBtG!f*xaU(ah>|X%=v98-H|4b zX@8J=7rwZ4{RfzNBmX*cgWAcckbhlspmVVlN!0Zp3vTXFF}T~paJ930@=*f9Dgfdo zlkC@g7Z7Uq?=wILwibw<WWXZaZNxa>7vJawO}0R8|78Z`G!4^Y7lqu_Tk?J5b}ss& z4h7)QNhkv}oeBAG?C<=U(!|#{{Ra)R?tg$%A$RWfB@J0x^dFRd5e-No_egnSzoF6z zvTs;)FooPFk==PHsolkWSVG^(J+wQ#@!6iRk+{$$`GwraGp7v#E4=~g;b0?o@ORu+ zs^Q_2gIw-#GV5JkIc%88UD&@Dd0u(G<+xyfE_Y%7Q?H9l4{6x|fc=Hs!Tw!vv~dia z+Q^Q%{Y8NN*DQ9W2BHPih)MR3-$Fhz(1}$P$@a$<bEN)3WpFx?Y=0=ys$I(RlsAKA z`y&}J+EM<jt^J*j4Ak@iEA)u|jn_w=MnGZlBLH+Yj{*Dmz2aYDbEC`OLAu!h0000< KMNUMnLSTZt<RG2^ delta 1072 zcmV-01kd}83B?GIB!4haOjJdf(4gKqIsbDp|D<A^DF_e{5L!VX&8&-aQV^_zO8@4? z`1ttV-rfKJ000000002g^V*#N000SaNLh0L04^f{04^f|c%?sf00007bV*G`2j>O{ z1sM~}cV?~t00XE=L_t(o!|j&6kJ~mBz-7P=<So3jfB-j{K7aoKv97!ACb^Y5gtF=^ zMFBZzcAL7J?gm4G_P{=E1)`qAEgv_jQ`i1eeWX52S&GuBXaRGQ#h>*aA0_^trX9z> zIS_i<IN!qNc_VOw5gIqlcMyzT6F?~tq={Hq2pLUD*zP|7nvzIkRMyejS4RSsEKkjg z?5bT0v`q7Pc7Hjw>wweIz)Zuo`y$Chpk-ogKFt852KW(UJh;dJBuZIcMH`EeWjR5} zI;_JK;~~WZk^=_1B!_^#xWc5^PMej0Hp0Wjf@XjQ0p7Bo#T5i<jU{k0T)5gV8PIus z$yRc0kku)X02(fc*2y2Mv+MOCU@X+2^zBks??P*h<bVA;)U#bRt9Pq(f5xqm$U*-N zS!Ey;z{E6POz}B9Lg%iC@p2F74@8@MG0hRwZwN&A0U=72*KF%8+etDo`)7aPKHUG6 zL;2MAFq$zpdGjYeOOmhsp4R1bQrf^Sf4_P>OFsAidXs#Gi7qElUnPa^N8f(LXP?iL z<dZ9a-G8k{sj`S|ps(VfFFr!_&gunW?3H&n+}!${2e5=72(8PFcK~#`@A)^J-#rUB zkM1rv%wd5FM4Yl9xZ%5ybN=8xqtv_cZ}<P-^0l^}u`PpH<^}90M#+5V6-2m;<&H9+ zG3ITUKZBi{L)1LVd@T#&_}6ltZ7KYoUppSp3V%h5gJLEgvXr+wkk`EOIqDQf7Mg~n zLmH1RdV4(okK;K0)1!q@GjK8(jcXg5qJ!zzsUOTd&V_~QT9{Ka^DdmYb^QmJxsZRI zxk2rC@VudWXbZ9AN!0ZpQ(^AG_?s<^P&>WCKYX(Z0szE|hv~0z6_9FouTr25Y%M^Z zq<_HFs5W8(aPu>IitIg**?*D(8I24pUqvo={RF=(+%80)*C7W&G&EEIS-qvE+CTi= zLbls3`VVBJ-2p;U?!xU8WKfF~9qB9CfaG!~+LP!5Qg)EOV6ubB<vt`){JNxepKT#T zyO6sP#iH@q?{LTVp-Xaex%YeF4g^+u1Ap{~bs=}~x3jCff&p7SW^#v}nN@Wa(nTtF zY5xrgg7SPf^uhi@?$ZAE!IG68(v1KB`%Afl{g>cq6}XRh<OuuA0rsC!$M@9kA#ylX z?C-pXd{iKIbWT+JGmnN!|DaRY9irMFiZtJqvb<kc?9Wx8vm+Jzhp`IO^Z|4J9Vz{H qKHkL5Cl7Vv@10)G@c{pSjlTgTBTTi5zPOtJ0000<MNUMnLSTZY><p6t diff --git a/graphics/pokemon/krabby/back.png b/graphics/pokemon/krabby/back.png index ef6d9fee571ad2d3a468b23aed572d7ac728cbb2..5cfafa395fc162c2b1fd061e795e1315db7d416e 100644 GIT binary patch delta 605 zcmV-j0;2uc1dRodBu58yNliru=LixF1vAHrQ%?W@02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<ACWE_fB*mg-rnB-0RR8?-sa7u zy_{-;b3tliO8)@={{a90<{;k10JNMblyd+O5D<nJ=x6`{00Cl4M@0Xn2lB-L00FT{ zL_t(|ob8f5Qo}G1h215Ue7X!}I+-q187`2727Dj~H~=zfnTc0UkN+A7MP#unJCfya z1M)iSebQU+e{K+5b=BWu)xmvK)rDW}lV?kmNg_u+9trX8K9Z#I@1vbUe~aytt$2I& zd_g`ym%)(6??Fkd_n~{X1R!Dngc<p@)*Vo{kO@~2CD83!y9)|@KoQ{lAkd=>0^|?~ z6=m2T4Y4Z72mj3u3bHh{y$YcN?2~1y0kSOj0j;G2f4ZX)pw0&jbn5}k)X>@kCUxln z)H<j^QVkSSUI6r937;=C2BefU2?IdW18~|Qux$uXBjCG5UkU^YnxTR*u#WL07r17{ z&NSAP0It;=zEDtLYnf?IMS*tssA<IcLZ4CugfxAT9xz$+NFSL%pfCf%*~s|uynw-U z!=oc@e^n~0eu4@f_&wA;aL+mUg%GqyIaStvaL%9lgvpXGI$xMA*&z{P=rTS}it{E2 z$?rv-(9troqr8pDH%pxvf_CwTp6!9vJZOz=gg}PjQwIcJGYvzfX-&Y*0BFG%b#pbl rvl;Vp1jvQ}x6?6<<pWp!8~p;gl*v1#XPa373jhEBNkvXXu0mjfQ!NM; delta 552 zcmV+@0@wYG1=s|TBnkm@Qb$4nuFf3kk!u@&u$U;=$SC;eaCl%C5D*YpKrrCQpnz~d zxR_}8@YwkH_}JLk00000000000Hk~`^#A|>32;bRa{vGi!vFvd!vV){sAK>D0kKI$ zK~zY`?UJ!h!!QtrGdNY(OC9zY`T#VrHzC<$6hp;^L}=B$I3rX0B$ZH~k~=4j?NmH} z0sXi5|Lp&AcfnOx{UKH??MG2u_{A)}ABZeX`N+p3A@1x)npXaOv=iuWv01thw~wAL z$Oq^$7}EIdl*D=;x@R*0A{-!$$S;-ZfU<^2*or8DZkNhlkl+K70Oi!AMi~Tf7YHR~ z3_luTRS-M>&6X0PBpG@YLI>DJ)(Rkhieev7id&#N8UgZrz(Ca=z)TJGaKO0AJb+pU zC2*>NVzLW>9?anBfyRK8<R-xZ6g>dXa|9L@0dfSq*64GAKu$B1Fb38Qp2PyzET5ak zni9aadZTv|a%?R#%_%5w7(Qy!YQ0m>2?BzfzHkqiu63(cOdyb(0pV<T^L}1`z+ke` z?TWT4;YB||37>ioWe@DNCO;Q~_9&*x>Km=~N1re~=w0Uvvn6vRLJU1L=SgW@1tIyp zs1vF^w8JRB8uHCjM~0wXe4%H1V0#Q|V;dn5Vfe%X!P`lJt0XB2_;G+5d{H;Ir|%)- qn2i8l5ny+^fw6qxs(+#&_yqwIZf0hiM@MM@0000<MNUMnLSTZ{Rq&|* diff --git a/graphics/pokemon/krabby/normal.pal b/graphics/pokemon/krabby/normal.pal index 04c1672e79..d8bf9fd9a0 100644 --- a/graphics/pokemon/krabby/normal.pal +++ b/graphics/pokemon/krabby/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -222 57 57 -255 115 49 +255 255 255 +222 222 222 +255 0 255 +255 230 197 +205 172 139 +172 131 74 +115 82 16 +90 65 32 +255 0 255 +255 0 255 255 164 98 +255 115 49 +222 57 57 156 41 8 16 16 16 -90 65 32 -205 172 139 -115 82 16 -172 131 74 -255 230 197 -248 248 248 -222 222 222 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/pokemon/krabby/shiny.pal b/graphics/pokemon/krabby/shiny.pal index 7128e1de0f..07ac355421 100644 --- a/graphics/pokemon/krabby/shiny.pal +++ b/graphics/pokemon/krabby/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -176 152 40 -216 200 40 -248 232 112 -120 96 24 +255 255 255 +222 222 222 +255 0 255 +255 246 222 +230 205 164 +189 156 106 +131 115 65 +106 98 74 +255 0 255 +255 0 255 +255 230 32 +222 197 0 +180 156 41 +148 115 0 16 16 16 -88 64 48 -224 200 160 -128 112 64 -184 152 104 -248 240 216 -248 248 248 -216 216 216 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/pokemon/lickitung/anim_front.png b/graphics/pokemon/lickitung/anim_front.png index 1a6c1aa9cf6588f6b102ff69784d0ee1a15bbf25..c8b1a27945d0892af0c5757d51101aef1793274e 100644 GIT binary patch delta 1386 zcmV-w1(o`t3jGR@B!35VNliru=Li@BBqK9{o2CE&02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_|NsBR#l`>swC2@wgL@$V(eeMi-qnk&oJwN<&41PZoUHD1i?l&fdl(Q9 z5D+N8c{>0A00Cl4M@0Xn2lB-L00f~)L_t(|ob8vtZz4w&$7xbnI<umWWhr%X&8D+E zwhNauF7tmZu3UPkXihpTokZ^|ecdcX5mdKt2V07pz!;z9RJSag<igPboA+jRVFnDR z6sh77URiuUynpxR2lKuZ3eV#|7`yTkpT%U84xG1c3&j|2H|j)u+yn8X{^I-{5$(Id z2H;N(@KG0@%&|K~p#6pOzE^?Csw!n+_uF&Mf1mLde*)O$LE?PE@Vyal^Y_6T(C1fs ziJC(n0Up3it^nPu8{Y2|5(v%#zHqf<OTc^8Rx=pRL4Sk@V7k_&6(MX#ecnowWGcb{ zp)lkvt4I!UnxdX0&<~&oK@f5yL=itFdn6}ghyj5RAT&b^03w(t7()U0!VwzliSGzV z(=%2dlQgBr0E`?CzL7rG8jMXBKxFON6jDaI0wSS-$N-#7Z^C^JU=E{*nqSqr@JNgG zV_C$`sega$Ggbp}Zvx9A-uOPgSTnu%JRRMxa>vI2_y^#5l@8FH)g!V4_{W}S19_EM z0RJ@s&^cHF*}-9$J_jmLKHx!Q16hWXuBy<bgE2LMJVQ+_kLPkcTJZ`%0erOsUiqMf z5q>j)#T+VtNy-OwyxR!KC7?2#cxsd>0}rNZIe#tSwFWBc_y#d;y2wj7RV8QuA_DN# zA<)x1t$~xjK<N;2e&He@41h-cx&mq)DxACSp&0aL*-C4mI+I6w9RMzV?79%&I$4bl zC8)BQyw>v^K<5x#NDIy&186H)T}pYRs*IsS5l~FC&8D-40i+xr(PrTUu?F)7ctpKk zOn-==E%+Ir<AMn|kE}i^PzX7kb-iCyt=1jlq?3Y*ASVU<3ab;lcG2B^H<EI!{>5#G z2EBFQ<xN(#GZj~Rx2r%gO&9Muccs$WMQGEd{jEAK(e?n(<9YmxA>~&21zry~U(vS` zAI?>Sz1*blo@=1B2^dm@@fP6f!#f`A_kTC%n9~(GM<BU<QZLdi%q8B$JX$BDy!_N^ zsTw&>cI|>dn<7+z@f@uH23Z9#F^n<~5$$0qt2xl7{BYAtm5UJHdwk7H4M~GJI)LU_ z{DFY5H|?xJ_icJc9UMKxPv}#)N$i|vSGslps%2Tr^~SGi;*mPI>YF`t#q*}(SAT1a zy%ib=4WE+($E?n3y?fQ%hv<abs~H-s#+nbx06-i@u*lKS06Sw1_JB7&nFH#33nSEE zRcacn)?{^017l?|a$tus)irQDsKyl~wo`HzKoj+@Zo8HTdBp0pj`7R6#V`QpZ!8c! z42AEw!NOt~r$X%&DE)xbhiw-_Lw}`(u8TmR?V7L+^pU6hgX^}))~*BJ=;n?Aa(`gB z7z<eVgB76I)c{u~JLs(g${u)}_ZL8H0i$2Zs6qI?&uOAU8&4C^_Mq#97p|KF=GSL* z?J2#&-AegTsjv#D@hWu5L6C(3FdJ|&^A7^@2;+DKxTc9>;EwB30nub?FJpBwn(M;| z=r0f$lbfDcA>^E@)V^HMudUPu&_bkGhjtjc{?yPj3qcMe!tccsw-i|j^((IUaW5XO s>q`salu9qRxBt)kU$F<y|Ia@B1Kz8`Q4;1rmH+?%07*qoM6N<$f@*4ikpKVy delta 1294 zcmV+p1@Zd*3ZV*+B!4haOjJdf(4eqDP<R*+=x~Vmn5g*p`1r`s$iT?p&~OkC5SU0{ z(1@t`xY+pkuz+|V0002TPy>+w00gW_L_t(oh3%HTZsSG}$0?<vi{Mt01E?`1(t)ie z067dG6)GfdkrXbBKscli?g6fG?V}5(5MYT8U|PU6*W6iGrGJywFJOzERit5+#*dMi zT~Z>c4<JRVcp(!8=ck$3nbpo;(_YtquuAL=KFh`~J8<4>Xk`-`JMBb#e-8Fm`#0}? zBcgv&-2r^30N!lF))=J#f&LBWHQ$5lqLneN^vgTWe;n~1-vX4lYv{-5zSHD={*$`_ z)cE1KA@@*2fPcF%Vg;amSmCuAA+F6izzvrrTLb=OU+$nj2HQaZ!}Z?eJUD%;#(SY* z1h(TM<T$*SOOk^bhG;hosJYMq*L8TtMH#=vI%GClU;+XTfRlAm1+ZXjpbrV)2bYtn zC%&;E4DZFPMW%orRmjB9@kKb9PlX6pfR*c60HGke1b-}B0agak6Z;o9O#zINNn#!? zl->5pW~#?JiGzpeDH381_GuPaC-F6k@FTv2r@pVe=d(PB&;kAd_`cT#+OvFEc?Z#x z@8^Lu%fvzSnE>c6*FbV`1cpxm4~9$bT6rLe@Yt3a#&j@(ERaT+%kua!$D?Hy0CEt? z4*0`m4}U%UoCQ{U@Bo7hmvp@Q2(UFEBRu+Y4JiV516j@-@L2(#Jie|;O}En&9%Kp% z0E+-TbqI7+rxoz{14uhKoS(%A*cpJ<?8pOI2aoeOezvQfQBr9IEJo}_)dAq_uXYS( zLr-$lDZoOE*pb?26}rz5L#XN11fW)k8Ds24W`Aiympq^`Oqxw+4IMC6f1zgK1~G^1 z4KP9btZWcLE%*S?jUfx@6EVBi$OWs9+Wzk{*W4YVhu50)z^*m?3Ck0^anYSzG#P8j zf3Xc#wX+GluOwOPfqi)1C<5g$T)opz27`@@Fi#JD-D}4Z?RW6HUe~`^rTj$PSV~0f zwSVs=5)skc38W%oR~jo3u@gu{#LgJ0h~WJlQYjS?{MfB*x@WAMhzRcDr%?oI9HfJO zc<iEx;6<QB>VuKSzyW`Vj*53o$-R8bNJNBV!#rtUxf=l4f==shIv)p3|H_4Ct{4aR zbm7kKruRbp8Q5(SGC3JDRag4rjxJ3#7JrYk<w}P}^oYPGHN0~b{~9fn3o*qJZ%QC= zGcHnKDkkF7*rUN}-8ir+MjGKsi0M4U8(mICx9X%ZP(R42F`v%GOeqAY6Vp!t@$i5{ zMTq-}xK#j-ECg27!qkLXGharin0cKuNrCw-+C93?^EyYz>=HXb`#F^{86gx-QGX`Q z!&`D6FV{L}-E^ILCDV^%)TB!1WR(*3Q@(>C0-O|KK`Ck4x0HU{kK<)c4euhL#wI!- zg~1b`vjva}gWH>cseq+a7+h+`0?;PlipvNRKrb1fd<0S_@k`VXxKXKX^MI%Hfrt8G znF5Urz+Q;(eMjmCvYJIeshH{+>3;{MVsazAd8A~J*-bpy;{w3`_LYDj{eVDS&ky;s zQCEXs>Idl9*IJOP1G*r>|DXhf(V#h>0}LcSVieVNnZKURp?vY4u?qdXN#|u%_X@aZ z8uEL_pki$s@2zmG{`q6@wzb8+Uiu*1YhO#O|Ihjdy+o98)9I7X00000Ne4wvM6N<$ Eg8$ZQAOHXW diff --git a/graphics/pokemon/lickitung/back.png b/graphics/pokemon/lickitung/back.png index ab93fb8842a46eef3254e472d1a803ad305817bf..b3406dc822f6c206866fe3b211855a3d4ea0009e 100644 GIT binary patch delta 631 zcmV--0*L+a1g8a%Bu58yNliru=Li@BBq~Z>BLV;b02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<ACWE_fB*mg-qqg!|D@*CbAx*z z|E#3{gL~d$Vv9LB|Nors?pnpYDWseTdvgE~5D?!vkT(DT00Cl4M@0Xn2lB-L00GNM zL_t(|ob8i6Zo)tig=td&$^~+TT!MR~i^K)O5ilJkXCOI2#*ikdcGjlHKcquqV<?g0 z;LOf??X?rpe<Lx4W%0g!^E^9rI@h}JisRKexf{*rFYy^&yw0iQf10Foy)^(4&+rd{ z06(1_=t6q`lcP(*XX4Y-M=Dsf0rK`kC4|w5*!(r{1N4oYAc|!Z=;_vhIh<v;3b6(3 zbZ=#Jfb5<uHf;b65RjKF=%oSlko1rZ*egfOS4}{lf3*f02<{po*gV&dSf`Z=!=mw_ z45+dL=w<}0T7ZmPK%U%5a0Jd6=!x>Hk`B<XGYT-1)F)bis;F{eEg-`h;P1ghrN>D| z-u$DifxVTx5x^o_>secKg>rwYbirGc@g`M3TG@Bkti$39>I+Ss{-sU?kEqNqi)utr z)zSgNe~Be_H2``iq7v{X)3yP?8$h{qVd{;CO~6O`m~X!X(!?7*PTdZAnT4;)Ibj-a zM^9{_YMt-XWW=9%J2n=%aCE!&8c3<fkoQ2C5t|`K6;OEGqmNE0dy9JCj^6l*dNhFC z-UI=MzQ-Z*7GOhs9ByVD!UaOKe;vg4ht82hCAh%820jLZqL_`%B(8NK^$WOuj(?%v Rzn1_2002ovPDHLkV1iWoBX$4) delta 576 zcmV-G0>AyI1@HurBnkm@Qb$4nuFf3kk!u@&kcc2)U=YB#DCp=|`1ttv_^8Oh$mrN` z5D*ZEI5^N)Sony5`1r7Zcpv}(0GBEj^Z)<=32;bRa{vGi!vFvd!vV){sAK>D0m(^3 zK~zY`?UOxj!axv(Z8}n6o5mgSk^)h!$3@&Afk%<jM#>2iafjT15^x%ehMpT>P7rZ_ zk=!D)v%CHSrAJ~4Yqjs&H?y;2=N`8no;UbUc7x^e!}~{1UX~Q{nkMO7Z-_|5Cte`{ zapR0p1<?AU4wr-{KcjC36gck!<ejA=NwiMH=+YpIA=9!CkSy9jPo<9a;V60+03Beg zato~^Mqgwx>H?sFn7m{`ix$uW(o;5nV6Pk?AG85=)*2`verpxM=DGTKs#+-^Em{|4 zK$r}uk`XZI05WI-a@*_#m%uf~s-wIVvH|q#8WYr=R3|!ss3_C14iG^N@O@xi>7E~v zH*d-sm{{2j5a-cQ_1c;XkdtktCp<+FPf`VhmAyM;9p{f&KWNy<Z*(HKMW%j#SyU}D zGR2|+q(@8WG1j4GA}~OC+;<HSUlGmFrD1vcX#*M1Wxg{5gnoHG@0%IaFejNXeS*-N zp3iI{YMtLx*9aSLdeRm-cgg5>>=h7}Y(aBCgxRIjK?M{V=tCofeML2IyOMLXfZV<W z0qed7@(y5&n5`cUoTCY(V1FGefahOlcL7XlV76Kn#o?qoagUn_$N2-e@7ZMi+(tqG O0000<MNUMnLSTYsUjD!U diff --git a/graphics/pokemon/lickitung/normal.pal b/graphics/pokemon/lickitung/normal.pal index 520baee770..2b8242a67f 100644 --- a/graphics/pokemon/lickitung/normal.pal +++ b/graphics/pokemon/lickitung/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -176 64 80 -120 24 16 -232 112 136 -248 152 168 -248 248 248 -248 200 208 -200 192 200 -224 208 112 +255 255 255 +197 197 197 +255 255 180 +230 213 115 +131 123 32 +255 209 241 +255 189 222 +213 139 172 +156 74 98 +255 205 213 +255 156 172 +238 115 139 +180 65 82 +123 24 16 16 16 16 -152 72 96 -208 136 168 -248 184 216 -248 248 176 -128 120 32 -0 0 0 diff --git a/graphics/pokemon/lickitung/shiny.pal b/graphics/pokemon/lickitung/shiny.pal index 29ccdfb690..9af533e830 100644 --- a/graphics/pokemon/lickitung/shiny.pal +++ b/graphics/pokemon/lickitung/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -144 136 32 -96 96 16 -192 184 40 -232 232 88 -248 248 248 -248 248 168 -200 192 200 -232 216 112 +255 255 255 +222 213 222 +255 255 164 +230 213 115 +131 123 32 +255 172 164 +255 131 123 +222 98 98 +139 57 57 +255 255 156 +238 238 90 +197 189 41 +164 156 8 +123 115 0 16 16 16 -136 56 56 -208 88 88 -248 136 128 -248 248 176 -128 120 32 -0 0 0 diff --git a/graphics/pokemon/magnemite/anim_front.png b/graphics/pokemon/magnemite/anim_front.png index d240d64bca45d62a1c046b6c4b8a0df032345124..5b60a52772fb27b2b1ab76aca62257cdd3b744de 100644 GIT binary patch delta 643 zcmV-}0(|}21e^tsB!35VNliru=Lir3F+0-i%?khk02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVO$_|NsBh)z!4Lw2O<2Qc6lWF){y(O70i{QqA@$gMX~v|K_ySy^FM@T7zN` z5D?~4RpbBw00Cl4M??UK1szBL00F>BL_t(|ob8sePQx$|hCQ@wkrhx^rgpA)01!y- z9EN(N?toe`vGxUci1q>c60kDiz|;v{J229eAhj^i$~bm5?vfE9@-G?g%lR&f{Qrzq zs`RU>iPPfxS%0fpNYwY0Y@?OEfq$xw=%T=IB>fr2q&RRRG6H7JbNq1rAw<eR--{kG zo+VUptF@e?M-2LmucI#uX#Iq}KAtkRj$ZFFAVym7i5S$^k&agh4lp~S5k3799xOF1 zh$X}}J_^HQ9B@l)AHy&_jA6kIh8W`kfW=1QpVI>G4u6nRMp%>1g`MF9z&5xPlb=0m zjh5Xav4FZZR~R7We3fJ)sFY!I)>{$4T<siyN~H#7jdse3B{IEjlwq7$!il%-FKN1B zMD}pq%_j}yjmRS^RjO3!52)-CE4u~@E>ZwsMOQIc+gvgFG7p^drlcLPXK&4vp|Ie= zTQg-zEPT*Tq^YrG4iL5|jR#`FSf#aQ-vGB}nVGw9fSP+A4_qAs@_+%Z4p;&iPy05a zBme}Ehn$_Oqxr%o3~tLrOv;0nwPvC41~#f?%bN`q)rKSgamcV&8W(fXfiqWWWGxN7 dl`8!QeFOQ~FWPw=X1o9Z002ovPDHLkV1n{m7mWY_ delta 577 zcmV-H0>1s61=<9VB!4haOjJdf(4dQpi{Ag{)z#HfN=gtA5IHe1|BFiQ7yyg3q_ow& zT7zOz&GspStf;7{|NsA%W@w%O000SaNLh0L04^f{04^f|c%?sf00007bV*G`2j>O{ z2Nf9flq5s|00F&8L_t(o!|j%_N&`U<h9{5{(z%eU1xvd?(tjJ+EhNoFvPx`>g-PQB z<N<sF$rVF7(c;!lut)+vfoXjQv9K_m;JLSZoilfKBHrIzG2hMZ9LM}WK&48*s+!m? zuJ5#4g+%>b$qrfB8vCbeiY^IErqZ9GbwmS~A|r6t+NTc>j)aH+&5h^*OQ^=KF>+2G zF&;tC4-YM1%zrKQ`qMK&KfK?|fP`ofti`zA4^6UK&;ZygYSA-~>F3g5%nTt;lD9N{ zp#e9<$z7VJ9|^{RrVy<?fEW)X{W&dg>HsNaNHu95*gL!;+6HH0{k=zR)3#GAETGQy z1qDbsUoEmLs0gTg*4rWCTn!ySN<|uHn@$ukLu7gwD1QwBGlc(O9s5h_u9&htTz7rU z19>A|t%ypMD*a)VEwQpSSg=SD5sFqZTH9O!zswuXc_Y>i;L2MwXDHCP_SVc<5;Tkx zYih8}0mc@k_CUfItF+ea8_?D)GjsP1NORBQfvZzM9x%|=F(M<%$VQX}A_L?hXXxrN zACm%GW;$Y09<;1A3k6(M%ZAqjE~-tYx;X5W#>LXW`P0Z+8hR^L`Vaa7cb3sF8)VxF P00000NkvXXu0mjf8pZyP diff --git a/graphics/pokemon/magnemite/back.png b/graphics/pokemon/magnemite/back.png index e1b35043bb12a85afcfaf1dfc9a93faa7651749c..0ddc6b9b86abbcc58f4c85ffa9399b88d6ccb24c 100644 GIT binary patch delta 551 zcmV+?0@(fC1Hc53B!35VNliru=Lir3G6+Ty|K0!q02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_|NsBh)z!4Lw2O<2Qc6lWF)>(JSRf!ESXfvfAb%kL|IOy!ti`mHl#5aj z5D>Fj0-FE;00Cl4M??UK1szBL00Cr4L_t(|obAyuPr^_T2k<V;?=z_J6CC1bqIESS z^f4Gin&9i&O-3h#&B2MU;8%E5KL8;*x!?;fP9(r!F~R70ZKWi<!_`6l(@XEy-u0g2 zY_iGUMoRv1et+<GI8o?SvxC?=c-t=9;Iwn2GEnp+FkpTQaGnAej@>B-JSh6fDRy0C zW)O4fL5U9L6}dVIMZ$N+`p)}effFiu<d1dtVfSOqlnZ5NCcP8gHN(R*{b+;tOLSs6 z(vdM}dXYUrs{t6-wC)?qvwpEayLklhNNba(XDxz&bbr+-`+zZnd#eXFrL6tDPd#iP zkU)0<Ok^*cL@mmJW^O}Z*w2AIWh(Nz8HDIFVhI#LHTVTQ0i|RK@wotX;6)B9RHQB! zt8?J8Lx6$WZ(OYzf<P!xwHnuJh8R}%ru5hC)+$)^7}lZcC&IqeOiX4pL?W17C1Nt2 pRZ_u4ARr?34`>bcCO7#9`3At50);U8;W_{S002ovPDHLkV1i2)>gxai delta 451 zcmV;!0X+V|1l<FWB!4haOjJdf(4dHji2wi1(9qCONJtP65I8U}w6wHRN=n7Fl;+;7 zl#5cdw6s!6O0=}J==k^`THF=@00C%8L_t(YiS5xbOT$1E2k;EN4-j+{IvhBpj&*MX zM+SqXN?t{z5aE)so8}8t+ffP?&avRoO^TiR6^h@$L6Eu~IDfeNlGqe_udWXEKOK3$ z<h{JJtZlaW+Xz8FE)H&u5~aD9A6V_{q*gb<@%%;R;L{aV0<>SXzRZAK-L;z(aP?c5 zo&wtjVg}Y0u3q3lJp)xoAyI_Zj32lcB(NeW%HfPx9uH4vM7dPATEgAq6*b&B;&&!E zy8<f^6YeMlYJcRI6C{a-z~_9dFc1960R3)R2NTX!mXWat1j3e+`~yl2_KhCU6~g~{ zAA6X90fNdBD92nj3g0OJCvJm5G%kQSWhRQc8blBhVg;nuUi=HV*O-MN*!dE4G%X6y zz#?|JUY`S29b$;(M{>Ji2m}!W*-LIV3^8oHH}S9gy*zcW>@n<UFHD7bskxZ8aEMe8 tyGq5h*=l5h3IhP_ALAO#O>XlK@(mI1#KkUpgBkz;002ovPDHLkV1mJt%x3@q diff --git a/graphics/pokemon/magnemite/normal.pal b/graphics/pokemon/magnemite/normal.pal index 50084032ff..ec9d62291b 100644 --- a/graphics/pokemon/magnemite/normal.pal +++ b/graphics/pokemon/magnemite/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -139 139 139 -222 255 230 +152 160 208 +255 255 255 213 213 213 +180 180 180 +139 139 139 82 74 74 -16 16 16 57 49 49 255 139 74 238 24 0 -139 180 164 -180 213 189 -90 131 98 82 205 246 41 131 172 -168 168 168 -255 255 255 +222 255 230 +180 213 189 +139 180 164 +90 131 98 +16 16 16 diff --git a/graphics/pokemon/magnemite/shiny.pal b/graphics/pokemon/magnemite/shiny.pal index 906f25a0a2..644ce56eee 100644 --- a/graphics/pokemon/magnemite/shiny.pal +++ b/graphics/pokemon/magnemite/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 136 136 -248 248 248 -208 208 208 -80 72 72 +255 255 255 +213 213 213 +180 180 180 +139 139 139 +82 74 74 +57 49 49 +88 88 88 +32 32 32 +88 88 88 +32 32 32 +255 255 205 +230 222 172 +197 180 148 +148 139 82 16 16 16 -56 48 48 -176 176 176 -80 72 72 -192 176 144 -224 216 168 -144 136 80 -176 176 176 -80 72 72 -176 176 176 -248 248 200 diff --git a/graphics/pokemon/magneton/anim_front.png b/graphics/pokemon/magneton/anim_front.png index 72a8aa907e661a5978530aec6ee13e673d76db28..e9a57fcf72bde9bfe636b9b75e79db64fc26284e 100644 GIT binary patch delta 1368 zcmV-e1*iI>3hN4xB!35VNliru=Lir3G9&7(2A%)_02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVO$_|NsBh)z!4Lw2O<2Qc6lWF){y(O70i{QqA@$gMX~m_TIGBy@Q;bN@7Y7 z5D>DdY4ZR800Cl4M?}?rygL&B00fUoL_t(|ob8sqZ`(!`z;B_@ji85Ybr7KS)TD#a zrtQ}D#K4Q?+M<*gNF>DcH3=efv14!D8gE&WL7BQVfVKD!aFzmTm!4b%Xf^pHyFjy4 zk~v812dZ4(JAYadd8Cx?^&3oB@5j4$AH4e!avpjZ&h&hyxHUEJm=CFs&q?_wq>q4M zEvfF7bYQjW2Q){>GJRil_do~kQQyo1;Nl;nx4okSCe4{H^}F5Qa*(Inj}m~JgCe?| zA0Cq)rPpN=pnkAe?{MDCP@0v5=>(M6Z=YCgUUyW!T7OOe^wyzeUFLNcM#C1W-zNK5 z{LZpw5ul7NJk<dr-S)`^1RRP{^L2noD8YK0i$)&uPGT4k?U$DI9v7mYPtTL~Av91I zqUC7$)$n25=bfV$HUOsf{*7=_zL-1W{L{}Wq80v}8P0@Jr3HLC@80Jk&nn_L%-<aW zkEtRu*?)=<x7|wEfcaPLo8c6};$(5utRqB&2`SZ&c5R<T2#=8N=|Did=KK`%taer^ z>@G7;ZNKxJA4-+y{5Y@~8xG~IEk;~wzdktNynZU5Bk)sC<wNAlZ7QLKHUhl$JO1U( zfI*+~D+T<qiEC46|A_Cl6vjosd?K&yss)n@*nc?U>eU0p>Y~MbNm&RG=z!WA%{J$> z(#8hrT>wgST&CBj-r!{R=*2s8|6nsOt&RxR$9b3t=?^Yho$qaiKpplK6v5&vHn6NK zjX4{DdK0z{0NRQUF2ZZ9GT=WjVOcZbe2>Fe8eqFZbYQh^TNh`Awj-Cbi<hh`05lt( zQ-1-r8P5~PE}hK0VgRhs-UfUfEe%+<&E_lDt^n}KzW8;fqwjgxU4d&ePxvbz?~7(f zZvX@G%sVA3clU*mh2%kGJZ2C+0x&}MK?1n(jCr_(D<$l{=OuvEnkNegI0%@@57XH9 zVH*PQVKNs2zDaQx86PE1r(sB20aqsh#(y>rVhT{)VXE}vB;fk)BUN6?0KzbLQ_qZO zk#ESK$Nwsl*SQwOtv3+G&1@N;6E);dxD(1Fe@F?lPsjd{5)R%PwjcTfo&@^kUM+w^ zP*3>-UcJ|L%CUT=`UJk-&>sw%0+>~r>(S63@@WA18-ES`0dN0g4S2CF4*kJS9e-w? zZVdgQkUkOe%paf&Pilv`n&8ZtKdfUp3r}Om0ITA^Xa3Mg0-3!kuE5YAm<~8*4VPi$ z4-G6KQiHPvj+9OM!zhZ|AcCNZnm>%=&Zdu|rujp30+a}r;{Ff^>@vz`)F0x}qiCZs ze~1HtTI!fT5Gf<`VB!vl`-21}9Dfrg%>KIW56q1alCgw8Ks<{O!7be%yx`v0lOPiQ z;G02ADHHzSYsY)SA3W{e(ER~CDM}>$0S5MU1Q_|lFD14f`h&c)8{Jdr51od`e(rtl zp811}-frj*U9m<7t=c>r`a^8jmI*91$c5aSzd6Al%z*&8F!$DOruzeaSyA8)0F=`G z0RsRcSMUo-@dpKzB<U+)!u5-C5zJ3HE<rBL-SpnW0J$(9P6e+17hvj%4RSHv0Vc}D adHf5`Um!bdMZ^UF0000<MNUMnLSTaYS%%~Q delta 1296 zcmV+r1@HRn3Zn{;B!4haOjJdf(4bOEN;xqx|BFfx5D@Md0E>%@QqA_&)zvA3tkBTV zN@7a1)xCq9ocQ?osHmvcad$re000SaNLh0L04^f{04^f|c%?sf00007bV*G`2j>O{ z2NxW{&w}3o00f3fL_t(o!|j&OYa2%tfJb6`*RLqGL$E#FY=1}`VO-ZfkG4~llIqe} ze}Fb-T<Sx~B_jVo@gavc2#k(3y`>Fq@S#+ap{0a^M}-Q}i#$1$oNT&~hERHP-<y>z z?d(c!uf=n)LGRn0H}l@ke1u#Kb0pH!<H_vu)OgyuBN+al6u(D`2qd;sdb*Se%+#1G zHVBy&U+L-IHh+N|f?0V09Q>0gt*n}WB{nQaux9hy4Ty`C^$6f>KoU(U5BEq(h)X;Q z2<C2e+EVtDLR2}SCIKlHTL*qicG5atn~wnE%AxOnBRdYPhHlorh|aO~i|?NxAgI`U zU;>0Yt%KhYNDCYd7THV=DfoX#)y+dZ&11H^_1yQrmVZhW^YL-gI)oQ=l<K98_{^Xm zZprr1GY<gEc>Z#*DR1r`N%`?71=Slg$Z#hTHIdO3|MHepd0J3=LHzm|a9?O5SuH4a z(<uZmu-<QcKHMTGP8C;8+e&q*;#~jeHR@!HunB4ImlcfLQto4%HU_CecUgJivGzlG z$aP%GJ%87ubhwl^mML+BcYAwV%FaH2h`>)J9S@MVRs@GPv=ETJ@9?keyA<Z+?`YuN zHLOjh^)o)()0k8)WrW|Y=z?(#EFMYy=r&><)uW6H8UO?)5Z+?HC8a2|@CBVF068&A z(=H0Td~kB~?6chu@iou=wsIFnao7mX%1`|E4}Ts-paXpcNzib`%D(@&yXyha=|kH9 zU{tjH0v@A<viy-M-#-rad+caPmGQkwwV_%!{TC<7=*ZdX))W6R0R66=E&$s%KYlNF zaQu`4up~;0@OAVIVAiwxPaUrSz~6QC{c+pudFU?J@u;oX++TIoZ}(za8sgO6Cv(^9 zN`LW8^dL&yr!W`-utNGW0$hGXZ7ktj4yP~K5n!fa^9%xM1gz+XnW!^pLje9{6OLJC z3GAZ8>-9+|Dfcw+Y7&rG!9`2~va3|5o}C0-s;ukutO-dHtHRH@F8IZbc`^QrUZl<e zvdiZX*|n;^Kqh+1dvIyYp9w}>R~N-dFn{6{1+Nv41%iP`g?aneGT<1()`Ed|^WD|( z?VqgOgU>q<jD&~*teV&;i9j&&aRB)Me+>i!^&px9-h5j_!SG_2nHP&g!N|mK1Rn?n zOks25wAUM)90<k&rnC7VbWYG38wo}?3M6-GsWHKzCXluoScWsf=wb?EIi#0CqJOGU z!5DSI3Ya3eq#+oiaczyE$r*wXF~wY1Fv5U0k2X3k7~xS8sH-8th?pXjIwTl`a~7%- zlsY6B9Gr1PSg`vGreIKKjNp_;1OvvSF~YrK3Wn|87>N|#{-$6s%MCeaL@=0f{znAE zX43@&M2bxn3|QDlaf0z{jxGd(!GEt+m?0SLu1$X{ed-JZgRdKc(Ns&K+-scDp<uAE zU_hzCKKRb*)d_-Ol@-{BwX<|JUNG>>0=WPn7cUq%03duW6)zYX$Z=BCz=Zo5?ZZ8t za$JIaSe2L4PUF|>)}5)qtA7JbJ+Z+)rc1&^`}p6Fe*pOrp$x7f^6vlu00{s|MNUMn GLSTYuU}uN` diff --git a/graphics/pokemon/magneton/back.png b/graphics/pokemon/magneton/back.png index 7a45ee78ddca83e9bc23ecc0b8ff22e3239b01ec..038cd4b1eb04f0ccc8b31fd255a3cd7617061047 100644 GIT binary patch delta 827 zcmV-B1H}C61=0qPB!35VNliru=Lir3GAw!$8xH^g02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_|NsBh)z!4Lw2O<2Qc6lWF)>(JSRf!ESXfvfAb%kL|IOy!ti`mHl#5aj z5D>Fj0-FE;00Cl4M??UK1szBL00MSNL_t(|oYmE_j@mF70N@M_BT=8>-k{LE6;7p_ zIH?5nDz%(ca9akLs`Lel@&H|6>BLFL(g!f~9)OEjN*Cg!(=CXQ<<fzIYddz5LkSF> z&SU)P|NZ~|4S$OA0GDxOUp3GE6TC7%9R?qOei+o7<%2oYZ>`c104pp<IWN)ctMKJh zMS1kNk<*X%Fl^C7sFjl^*_jH%1_X5L4xCgofp$qj$M@I7Xk_OI>+tOop_)O08~{5@ zWMgmpJEsf{F3|*IJpGXeI*0=Y<%OUJuqnWc>zoJ<8h>NHa&i<WH+BT3*=78t+cz96 zvcblt=i@OP-(YLM;~Oj^%nbm5`T0u*h*k}7(Az(Q+@AvutcyLcO@TUumbHJ>ZIYo% z*rMN5<5>bU37SAB;@f#&k7_9r62zbdfG(;$zxv9BzeHn?$Q-{|6{r0n%`g}lpc*JX zzXW$D0e_^TKe(h>2P4=5)t$H`ZzV(sYp4AItCF-K6G&``5H1Pf$Nq>{sSzgL2yo3p zta*v;(Ra2_p9mAW05h_}WHqG+4hWxI)il_w!iE3~`khUUgJw||Rns)iR0z8QIDxX| z2X>Gb0n4N<smB0c7g1D^GvOiLTfG+0A&hTfCV%G^PkD$xRu8fj0~bl)@X6Lf4&n@W zHI{>oqZ|rt3GBuJ@Wz&djggoJjgVv?v#FbkLnPyp0FTAz&yV)Ri@`1dlO#gw{b~1s z>}m?EVqj;2B*z+O0w6=U-87iR;Q2ekg?oDsBvq)*fC+c4C7^NVBz-8n2o$pOZ@XH2 zDKth27^!!~e-|~FfS;8z&{Lp5BoH~~CHgRq{QW$f^$!UGpn+E!gy{eP002ovPDHLk FV1i{(WEKDb delta 723 zcmV;^0xbQ~2I~coB!4haOjJdf(4bIANH{Psh=_;~5D+*pFo=kVh=_>z`1m+5FwoG@ zfOtUQ*r>p;kofrcu&}T>^k%0300MSNL_t(YiPhCHiyA=`0N`C&(%9UJ@dzO#PK-e; zLRix8ZKe>6MTG6MLFUrggowSxK(z1(9R7+6hlQ}%Sy-HfVSfq2?)-=}7HQ1P?97fQ zyIQ2WDR(~JoA>68YT5%_=81jXI{Q!X*m`>$yh7e_P^fN?=Fq>EcP9YovK-s2L{F}r z=YKTq5iVx*qc(QR^bmUY=5KnY+_(r3-MT<Gom604QBe2&DKv}eIh+D`I>WeRLOTP1 z`V6l~(E6EChJOKOcti+Ue$N7R%t3^+LeK-OC?K0bMuZ3t311mG@}s*|43_C-e4yKR z9Bk4-V@1!$LFAik9d^7yWQ4Ve5VGEVOabvKAr9JyXOR1A#DV+b0JQc%0RY!MJZej2 z=s>pUH{JZCfFVH@c~E>i?|E@8c?j(Ulo9eomFL&rxPS0xco;yL;}@&qvNxs~`V$j% zY|ZDF5H=+MRP_2+G;4nX%Ba&6mlVu}a6sv@*JoA28ejs84G|)Q4tU+0@G1?+#4`Z~ zEX0(TSeyJ{`}B!0;R&#Sa{}i}dSDy!$<-~B%_=Agu%X}C)I@j@cTu-2^GpYzB0ywo zEq>q#2Y)eeE!vVo0>~hb<BFmY5Ao7%myriRatjMNw`9pfym#AxtptQvf{0JH;c$>- zAoHOdY!c_tXiGpP2|yYvIoJe?X)qvE`-Dy1QXE2!ivj_Q&z~RdNsxf10wWb+@BJC~ zf$ZuYm?vPB3RI3MNd-uT2rK(wk$^96AQ$27Jxrjg(5p5R;nYx|coC^S<UZRPZ2Gqq zBe@iFhfD=D{<~-Z1%7w8$lC)sD1pea-qD9~;_v6-tbZdhF=}0G0!aV>002ovPDHLk FV1jNXR6_s& diff --git a/graphics/pokemon/magneton/normal.pal b/graphics/pokemon/magneton/normal.pal index 55f2f9d992..35aff4d063 100644 --- a/graphics/pokemon/magneton/normal.pal +++ b/graphics/pokemon/magneton/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 +152 160 208 +255 255 255 +213 213 213 +180 180 180 +139 139 139 82 74 74 57 49 49 255 139 74 -16 16 16 238 24 0 -139 139 139 82 205 246 -213 213 213 41 131 172 -208 208 208 -74 98 74 +213 246 222 180 213 189 131 156 156 -248 248 248 -168 168 168 +74 98 74 +16 16 16 diff --git a/graphics/pokemon/magneton/shiny.pal b/graphics/pokemon/magneton/shiny.pal index 36ca0b6263..644ce56eee 100644 --- a/graphics/pokemon/magneton/shiny.pal +++ b/graphics/pokemon/magneton/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -80 72 72 -56 48 48 -136 136 136 +255 255 255 +213 213 213 +180 180 180 +139 139 139 +82 74 74 +57 49 49 +88 88 88 +32 32 32 +88 88 88 +32 32 32 +255 255 205 +230 222 172 +197 180 148 +148 139 82 16 16 16 -56 48 48 -136 136 136 -136 136 136 -248 248 248 -56 48 48 -208 208 208 -128 120 64 -224 216 168 -192 176 144 -248 248 248 -176 176 176 diff --git a/graphics/pokemon/marowak/anim_front.png b/graphics/pokemon/marowak/anim_front.png index 696a9633a9870ff52783aa7bc671a2f584dc6941..bbfaad3734ab1540d841d04ac2fc0bc5bf3ce024 100644 GIT binary patch delta 1143 zcmV--1c>{;2#g7kB!35VNliru=Li)BF*O81($xR}02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_|NsBy=H|u4&5Mg_Qc5`x5D=7VQpKD~_QjOulz&pab2;9<YQ>yNlxk91 zK@e4rW90w<00Cl4M??UK1szBL00Xc|L_t(|ob8t}Yui8+#}#60>7ZQgxLZF%jBKy5 ziMy5t$7_*MdTkw~e4BzPT?3UN-8$GqKS5SQp=S-H9!z}>1Pq19>bsL{pQMviXqQ6X zVw3mtd+*-6+<*N~QNY@5CDRHB8Gi*7+Brb0oCmZJs%HWSp+*i+$^jnhdR7s|uAU7j z3J{q&IFTJf>Ewkdp5%on<b_a7-S9I3RX--#S<D8-?6aFvLsM-~3L(x?Cfh1EZ3djB zjlP4*&wq5g;6Ie7=u}bn6ruFVcdBLXMx_@iMe2bc1%DmY5<Mx_!T>c6+~35BVk-<# zV>M{s2)T`~ll#lT-tmaPhyleQzzGL5;?lJt11jL}7!ZKYaJ&W%JTrB@&H_|siB)jm z)MP0<;wJmefpYI0089zRa^Ov`qqlV!S|UNP%qOp3=`{$z$DS~l)EVXp<N*L+P10f4 z`~eU&Nq@VI0j!I-f6aiUqO24zT1g9lI(8feP#A=F8QtVXmf=O;afS>a6KHo5s4ExF zaK!w?g~d!F8Psa|q^|VGBj<WSz}AVim~76E9OvVJ$N?3@fYkxm2L`zEcCHvO@KOQo z<}LW&Ghn)wwe$Yw0{o+N;3t`lVI6A@$TE;AWq+;u0t=N6Ok;!W4@aNUCaQ4<%wwH4 za@cHe%0Nfb0KED8r5sRodl}Ylf0rE-5Zl;%MHN{JF`JPCJlKQ%Q`7PQFMi)7fJq+U z<^efMK=TuqUer`Vr2o7-v+@9yOmm7z2f7;|nxoJRzk~|KivyrgLjMMc9WkI#n#G+$ z(SP6^j2^{Ng`#;9Ku{<?JBy=$E-DnCT?bP-7l8eepiq3``hE<k9tjGC5Xb;0W)u(< ziseEL)E0q#bR;MgtM}Ah(;0OHpd>03tG9p)X-2Pv3?)&a5IeZ^WB^wv)`WLqekGP5 zDimu1tBBVqDin)gGPT7Ts{jZJ1%AH5bblTPwhD!iukYZ(8AWT{36KSu4hGkBKKd+_ zAOeK^8o<psbZjFIaD`$K*8v-iF^vI%LRo^0#3N@sgkh~B09Pn4DFooxBD){AKy?Gu z=?td8HLZ&2vJnBeLV*d9yYLx-%?NP76p9U-V7Yy&s74fE_c2}rP}_BI2kafdr*L)* zmEB36LoE(Kgmb9fl)R`~sM4$8UI~6Xr5MYAV8gRML;K7G&<;1ej`4y?skmNd?^Uov zrn3@0ZhI_8H|5d5YXBhS;j=9=(+@z(t7cbZGaFEHp6&mG{RRLXCF<YRyZQhC002ov JPDHLkV1m9%@oE47 delta 1066 zcmV+_1l9YD3BL%CB!4haOjJdf(4dQpYWVp05D*Z>#m!PmIpE;vT0s!SoJy2xQsA(7 zu#kv&SWxDaQoVCI_QjN&Qi_29000SaNLh0L04^f{04^f|c%?sf00007bV*G`2j>O{ z2RjJjBs~lO00W{)L_t(o!|j(bZ__{&$6egW8%m-wur-$y34e(p%^5Woq%?`6u5FbJ ze2Yq{WTy*5247eh3`!0ud%sTy)WKn3U~(j2VIsUcJMGyy`;cHk>P=POFYn&HcYg1G zng**>(sI`pLiN7_wn_@1Tu}jKgnGFELa3_%Y6{?qZRZ717})uMrUB8_R7AcDt*>%X z*ipIIQn}DfyMONF0=j)n@^>-26!Q~h#8A|`l!A-XjLMcPMT-HaS*7oz%Ht1%0oeC4 zGSxwYGla4$-|tko8P!g*5*67|lu=_NCxv$Gpv{5Ht29w4#}3*o2IDOu=aQR=P$jxM zE^%flpb$CO;ebIrI;zWnD%ksVa6o;m$$&?uZTFais(-IZfishB;Sz5%-yEnk_5r|@ zP%H;tH2QYQhNAiM@9Wvi=XM($@Um|#sMIOu8^|31z>;Lct@#5WN|JG&0$3Jt>xKbS zO&e-%Jr(4R-NQk^01Ab050aO>z;-xk1;K&=WDM!v1bW(Gun3u*cyO3;^1JC&c6wTC z83s2q0)K0?aTb%+`C$-zUJ*H<V<@n`g7uRDo;;mH2CUpnz_@w^_FoK`jAZG&ygCGX zm<@a+{u0hH;(%-iGNCM0U*VwAf*Guktws1LtD*)sKs`oTC5OufT?R6e1>p7n59EMu zThlmp>%FW^fbaF$bW~NeO{{3V_v?QB+hwQ#_kUakj8%ZA0u)NXa7ca-Iw5}k7EKkP zlZhgTY+$ek{FFk8|A-Zen+8Ck#P&6iYB8WtiiJCcVn82Ew&J8hF<c2CC=`eF;v`^; z3dLdLU_$2tuw4@ribFidNdcWBL7@-=J3z-w0)j$mdJqG(L|_{o2@0jzc<PO)PXhs{ ziGK>E*_gpV^69m(LrqjD#EOQV4B!f-Ip$fIUyC7#3Z*%QQ>0@Q6-tv}GO@%MI{*j@ z1%5unbe;xo6$&Bme!##9lQG^2kQte*RyTAWei1?t0YcuaU@|TOtDXk9LTM5&fE6w= zO#zWYnSzYOVX$04v4#nNE0ot19PqKo=6~bx?hrB1qdruDYg!%CX*U6Ig#r~K7x6O! zn+af-DHIDX!Swd2qSuoEo5y$rKzrkp1K`0fyX(gg*@fgeROSG9*oW9n$&0Fts*Ngc z)Zn)him?ocE<DRKq|e*{O7VraF`h9gmDbDJH*Vi!ItxoX#&@>I;3WS&I#4_}b0h5l k?5SSeMMYmO{r}_bH=jnQe&C%6_y7O^07*qoM6N<$f&}p1H2?qr diff --git a/graphics/pokemon/marowak/back.png b/graphics/pokemon/marowak/back.png index 76acb2c82329356738f7dda76e4b7994b39ffb87..82a9c2da996c314d84bfcb6a0f9c1a1e7d6837c6 100644 GIT binary patch delta 699 zcmV;s0!00@1?dHlBu58yNliru=Li=9H~=m%&FBCC02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<ACWE@f1uF+|NrLR-o?GWdy8{H zN=gtA5QJVxy_7=k)s)_(QnZ6P#qM*Q#Y$?NK{;vwxLoxS00001VoOIvn0C<yJ^%m$ z4M{{nRCt{2ls|9OKoG@Uz_w^Fj-Wjs(EG-|mPGcY#%DWq6yI%^y^4=Q5gNJ_Zt_K_ z>DHwSq+26Je?$s}!~U@->{(rn#I*0{H*aQl?Ro!Vl}GfK@bMUMdJOQLlJPEpx_V^3 zR&t<c4q!w5O9Qw<<RSIhHi6I;g1}oE`T*g~5rV)ur4hh#w#Erk%;^kNE$JG!D3$@3 zqK--P`2u1MMED>iQCe(FLezq2DWe8MEi_P4-=xSKe?SarVp_!5p&KAK2IsFU1h`f} zo><^bHC+YK`O66GoS))}MP-z-Fdpe?IJui!`|;p`tb(kK5J&S9yYI=Q%$Vm1g(1fz z#nu3}ktQY<_ArbF2?h*J$|OpdcDtAWUTF!n(Ri1`Y6^Ia6);o`R|r6Oy94&1^c7=> z?hz>^f2;2wE*SQ?s=Wf_@A}dC!np>z`m0MPy#a1-f4Tsvh+aN@aRK{IHj>My-qnM* z2hsJa$LI761^QlyPKU_oJ3PXT5IW~CO0hkAq!Z%1o+Do_VhniIT0oyT`ZwgQX!xK9 zScqOZaH~V`9_b+Whi|;pCt1N_1iVPqo|S=UX_d}@+*RY-u%RWFOo*mUnTk>0jc-Fn zgG=^7G_qxCjK}ACWZ-RrU;%I=<@HL+L&NUJ$F<W>m+`jK4GyZ)NM}+#7$#e;8<@Hp h>9T^q8Up+;?+^M<1m=RG>eT=M002ovPDHLkV1h9DL&5+6 delta 645 zcmV;00($-F1+xW^Bnkm@Qb$4nuFf3kk!u-$(4csTaQOK65D*Z+xVS(_NZ{DmKwuc4 z$Vh0INWkcDpvXvQm`K>DXsCcd=+KbPR2KvQ000SaNLh0L01m?d01m?e$8V@)0006E zNkl<ZNXO-rv2N5r5QdE`M2i#O19(MF(B-suxom0Q?9s-KeLctF8Yw}@1xkUC*0qs; zd{giOyiST#ehfr~!tVN@uxE8OV%q=n|If_s+WRM~IHEs=t7E{~F(7hE);k5}%E%(4 z<iMUgfDMbTE#PV*PgulfAtbIQe0al>2q2kWxquVKVu1B@LKA+vWmC|#W)s>XU6){s zIVR1wJCFv5=|TKZYtot|q=j#!j9H9-v@k%yBHKmg03-yVjgZu#TOhXvCojJez=a0# z@DDIvg>U*VVhhBtzQ~cq+$u$CJ%Y1jbT?=H#|IB$75>BuGTy%E_dS}FTk||*y+u6U z=F9?pkRe7E{b5)QLJBy96k!~4<90d%yrL)cM&%-h)fn(NPvKA!&I!O5%>wv;t=3nZ zdlZ0(ynDDk<<#f8mKwlM-Hr2w3j?&>PnYgj7I=Jo?*dR072f@F0m~L^6nIy;GDNdi zZKX4Q1oS_ks+4L?6B&C)w{WSH>GK0)D-vjx`fTRN*E>l8&zc@ECr<tiMWbqQ&`YX` zN;`;Nhw?3vfXn@NQJ9mQ!)^d@JPGukwSj81F23E*hqqzF3V~dyx(T>$qq`s8hK!Zh z{I#mF;d+dlkKOP-Y|3&6aEW-aLfqH<VR&2%^K`jrS`)C>NdujuelQ#xVFGNO4|JTv fUyT6%`|`ZsI=<Nitiu9+00000NkvXXu0mjfx5hK5 diff --git a/graphics/pokemon/marowak/normal.pal b/graphics/pokemon/marowak/normal.pal index 6aa7063f20..a82b6c9a83 100644 --- a/graphics/pokemon/marowak/normal.pal +++ b/graphics/pokemon/marowak/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -139 139 106 -248 248 248 -16 16 16 +255 255 255 +230 230 230 197 197 205 +139 139 106 82 74 57 -224 224 232 -90 65 16 -197 156 74 +16 16 16 148 106 82 -224 176 120 -176 144 136 -120 88 80 +197 156 74 +246 197 148 230 148 82 189 115 57 -246 197 148 +222 189 106 +197 156 74 +148 106 82 +90 65 16 diff --git a/graphics/pokemon/marowak/shiny.pal b/graphics/pokemon/marowak/shiny.pal index b074efb1b5..7c45006bb1 100644 --- a/graphics/pokemon/marowak/shiny.pal +++ b/graphics/pokemon/marowak/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -120 136 112 -248 248 248 +152 160 208 +255 255 255 +230 222 222 +197 189 189 +123 139 115 +65 74 74 16 16 16 -192 184 184 -64 72 72 -224 216 216 -64 96 24 -160 200 72 -104 152 72 -192 232 112 -160 200 72 -104 152 72 -216 168 104 -168 128 64 -232 208 144 +132 94 72 +189 148 66 +238 213 148 +222 164 82 +180 131 57 +197 238 115 +156 197 74 +106 156 65 +57 106 0 diff --git a/graphics/pokemon/muk/anim_front.png b/graphics/pokemon/muk/anim_front.png index 0f9c23f51b913ddf767a3db31106144afcc3b2bd..dad71c460e1eb5bbd1e45a0536e80c2a357342eb 100644 GIT binary patch delta 1340 zcmV-C1;hG+3eO6VB!35VNliru=Lir48aJqAYRmut02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_|NsBh)!wYMy@QLKK}uTg-tOkT?!~0dq<gG;N`He|F>{b$nEwF({{a6G z5D?z>A~pa300Cl4M@0Xn2lB-L00eVML_t(|ob6XVkK0BNWh=5E+@|r5U^*8mEY(2} z_4hO6&SjRm!s(7f7BpZOC$0)!5x_^X;9pXZ6CjesW@dJm)W`Btxd`CF36O3cXJ=<; z_C0#u|Ji)`ihone&)(x^9^r33fUN$2r+EMXWcW85qCfytFdrfyKvv8Hyh<bH*WeJZ zC1C)wYxvdc0H1e}#It}MxrGprmNS5u{qZcoHvvG-Z9@%+K)-~;48l`Aq*7kh65!A2 zM<B@$`MFz&?dR!tP5!Bt3lQ-J6Q2;en5ju(@v!;uO@D}Uga$~R#Nu%ypi0#<t}?Ar zP@X!80yiZ-{r%=`CB&F_Eh$e1_<}3*<+ry|CifQb%==`(j#tM8OMwsB5WDF-J1T3- z<wL~Y03-trHsMyG)soJjVZYCHs2C6y+E0iA*J8veC4>fejqxjmIp7&J2XCNmfIPH2 zvWNi)0)P3i#mCdi9z|X5Z3x}X*pmoTmEBQ&s4c*@E7Vw{&bCA2_2fJ*mv=oUkDsi& z0j!tH<*Mf#Qbb$=YVyC2qE*M822|w3C1Aab(0+l@&^ZFCr{>81=pAiSQt9*j9MGs2 z_D6WeiAeDici2p(j-DUqch=7*iwB*6Jb0##*nbblmG%p32$54q``f?Pw0=!%gMpm4 zyxgvTkKQ#HJ*Fxo>`&!5m;tsx!)`iZZnTt7%mTv11Wk1lNvWsG4$UIp={0#!ni}-; zX;HP>|FG%!Ij|5uP&|!FckJUv(VnD<jiL95$ZEW5_5JbKnrHPf5+ZFl3Vx?b7N@P$ z{(k~)i~vE$WjpipK1=E?on;G*pjI?Jhd<kc7pTGPv*lf&S5FZ)w|8OuzxkW}hyAec zWQz;hyEPj7Gg7;Kd_%OiokQRVi*EvNsO^kj)83n(gm8x-+DktDL$v1%VQ4RA+H*}% zVQ3E|j_KY3=<x2N;jA!D>;i<1p*>>8*nhP~-;A7<xB(-pbuRrCJk_$aAqt0js`pZj zv?pBv$(&@#_jZi{x!5m9fLlF<7SN@WLU04{l6w_^<ea*SskxV|m{FpdoYyPbr&CAv z>?ih~2|-C1_I8Irz{^qth%>I;!BbGGCDQxPs}67b+nrWfP#%f?qhB@sUyD@)w14aO zn%*^IU1`xEs}=hrtx=4Ko6LvuE*b+6;tH^X<BQ>cy+T@CuCcpE`lbLxUOlmvya4#( z>&j$+h?+?HQgnv~&`|tR^Y9hmen|>}rVBcjS)<<7b|QuF91|lBybGL=3qa3mUttD= zW!UZl(Bb?-9#=4Ejz#Owj$@J2)_>(b&W40#2#)G7Nff+)K0<*{o>+(=0w<jUDGPY` z*a4n!@oc1u+-u1vTN41^707ZaS@g!KIWYTrp$z%=ED{LNTfL$+aiRqT$^`m?vN*#< zSU%_^Lb|`wa@dj>LZ!6>)&i4!@MxIS>3(Nboa4ntDG}2afKzn6J9UubD>X`n1&^!D y^=1^(GTEVn7}~ivCz3E>H&xGV;eYtQkNpcoV{13a?A$5<0000<MNUMnLSTaGS%}I2 delta 1262 zcmV<K1QGks3W5rdB!4haOjJdf(4c!tgXX>N#iY%od#qY9a}W>^`1ts&w7o$}T7!$6 z;Lzv*00000000000002w*Zyw+000SaNLh0L04^f{04^f|c%?sf00007bV*G`2j>O{ z3I!J?F}T+N00d=8L_t(o!|hkWj+;mj#ggGXJ;o?|b)?+A&41*)#06)Q0S<dIGIZ8+ z+e`8VSy}mj*_A(F74wy;s_q7CH*-uBDXp<&Pd%!us;l}vJnv^-Gx35^h&%6oHI109 zUV|uphwU@~08;#$bP*x|3Yd1`6Ce$z0bZdI(|fRsmx3^W$vtMp%YYeYv56-E3o=V7 zA&DjcG27!wz<<m*05O$@Y7v2U0lTR@RSk&{SG5HAV^j%2cF4wNDc5(y@0{#IE$1NP z6$XBHRm{W$F@Lvu{a(s3LIZ>jVt&7pP$cRRcNz8wDNY?kh)Kz}A3l97q}&ccP@D{y zNv_PRe?JPbd9Z*-&XWNP-W@lLBtEnqorpQEhRRxT`F{|xw7t)Ooej8BxN<>fP@2J^ zIur~DLTx8Rh<h<&pAbR=ywcc}!Wi(3%AMCzH$WEHj4YxBf<V@;@$savN0CQM>q2)k z_9VhoVKd5ixdqsEg&b?t*mfwrnv938d#*Wn{G`nd;M8^9x#k!WL|g)LvVT1u&kc7P zP?2|+fPYhW#PtvK3ynRX*p>&jA3sx?f=ZudV?e2%*nY$_-pB+$af8id>gdhl?AhA+ zWbvRkAa-702Spyv+Ai%vh!{G0w*K=(`{%Sb7|6Kg#rpK$@pFmZW2(Z2?TP3I)5jJl z*-R(Qjh66<SwOHcP7~ckLg=ZoLo?47dQTpdGJgmCd=eIwotcK80}J5;#nUKs$KJ0L z<s^)6biG7Gn&VZg?~nV+Jgbk95J|~i@H<s9+^>bUhj6n9;5S^hk)895sJC>K6)=KY z(exbttahHST9aqRS)f%<5jXeM#Y_L&dcW4M^_|!Jg7$6~js1w!ZXaI}?X9N}IKuM1 z#D5!VJz>|h_vvpb-7bjsHgEqT+H<-vv==k&xh5zyv<Cvmbm;&zc=yq87U(B-0fN%d z9x-F=+M_Oe&f2&EJ*zb?{pD|S5m^_ZLp|k7p?caAE`VT8vgCWahmTx5i+X@tJp~rf zB!fb51Mrf25rE{JxQeN{msU8TL^U~|&VQ7rQ%BZpC-$CjK|vVycDq2pQ>OvM8Mnvb zN2)`5|8j2dw!h7^Nd4$Q^nd(c(|>des7_xsy=%t0(xQHvE4ClCMlm98taGF1WAA_v z*|n5DJQ@DiJ0#)d9*YO0Z*oB7RTFE8-R0!`b~X_pA}5l*6y1RVl;l6sJbVRs=zmBd z&~!n=GOO3SdhJOeJjTR`EoXrfasjAW?JJC+wG7)_02-WM$l?N8&9S)Z(Q(W(N?k1D zwB4`_!BK4oiGugf8wl~qJqr;;;G~lyWdZNrG=L`@J{qYamRj<O$~eGx1zMR9EPCU_ z9GHE*P=@?#76}BX#YjJp2x0+&GG~Flpe#;t6P6D;h=A^|Bx=_rhEQoOfVIFNA3Pc+ zwSQPx73X-dQA);?0&s|t^P0=>6(z-j$3^OTGYV*%bk{%()zq64NtmD+s^?yT`Vma_ Y4Lcy&OVERrC;$Ke07*qoM6N<$g6(Zk&j0`b diff --git a/graphics/pokemon/muk/back.png b/graphics/pokemon/muk/back.png index 1a197e4695d3239046dbfe922b3e65cbf37a9f2a..d0fc344d681a2f77d269c67e86a4987093999d53 100644 GIT binary patch delta 738 zcmV<80v-L=1&;=hBu58yNliru=Lir49xAU7!w~=g02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<ACWE@f1uF+|Nqt1-mJ8}gNvL& zN?OI{oV4DHl*M~{tXf)&IYDzEXqZU<0RR60{}2!m2LFA^00001VoOIv|D^}=#Q*>T zGf6~2RCt{2Qn9YnKoE2bE-Y%khfjF*>&zc;Bovfbq<B<Bb1se!Ze2KCo_&RXDM%om z<HGFS*^c9!e-SMbD<zRL<JsBSjiP_Go&kTv@i|RF>$nzan!Xlt9T$RevBr2VfW3H| zWkQ6zd<7TdS@uB`Apt;aK#V`~=X6Vm!QHp?Ez5RomK|;hHREDKR$}+G3$!>|0;HA5 z9-2T0;RtXNK?|+}ARG4h5bD4)vH)_`KkfnoQN^ItfBe-%O&7rJklddMp|`mb7XoRR zFm8w3@Ql=~2t>cwU}20|!xN6kq$%%_K85hOg*?7V-7#!+0PnP{_*hbxrnnJ_J5UP@ zQF2`J%Qe9O%0}dIklt^vwjJ}I#-{9&<WULY-JDQssMao$lXS&2Gm}Up72V#Mn{dpV zw4mOefAc5-SK|H5L9el>+#Dx@fg0Z$i=Urfo=;PU*0-JEMBiT&10k;SimoK=6BQrz zu=j+NAAQia4=yaI3t=?xex`l{!N|_1cPSo%542K~M=Th8w>|Q9FxjdK6GOuXc}S|f zABL#Z%)EDp+`cz1LU+p)oxOM@oar1SBm<$5e+}I%0;)eGxyRAeV~X+;XK9K)_Xb?d zG%jGImVI63_8!jK`1v%Z2&`23^S)OHyC<raDUw^rkGp$S*fkXMjAkdPUUlg0F&0xs zdb$KFqV8HdtHI5PqYqBcxNDtVidT`-J10w!m)T}#=b4T$7+m1~k23mSe_6i)S}San U5aBT*xc~qF07*qoM6N<$g2(t%kpKVy delta 682 zcmV;b0#*Hw2G<3UBnkm@Qb$4nuFf3kk!u-$(4bg|II!4=kid9&s8~R7AP^7``1ts! zu(&`-Sb&I_(CDxL00000000000002~tG6xy000SaNLh0L01m?d01m?e$8V@)0006o zNkl<ZNXP9`v5wO~5H%8Z&2a1VS;93}ft9P-=y@BOB<FRVaJCWjh(9^$K7p3jKgaBU zuGewm&50I?k&?)H&u`|vndG0X*T9Q7KKDK7Ixb}2_rImOj!Vh7yvBGXfsK4u6jH{! zyagBIMe$MQF#$lXK#V`|=P)Ov;O<MhDT;Md6x%sr$GBXPl~_NnBQ5rp0A(eL`#RD= zIs%+TbOhG{P&LnZAM3y#SpcQ(9@Y_mfuv$k3I3{+x{cu0B==`R>}{^hg+Kx(j$4x} z_DJ;=f#eGhm>XlR;TcC{`kwblpJI60K<)2(cMMAr!CRp!K9=64DQ6;S3u=HNN{&mt zIVTuE+lV|45}W1Owp0Go*pyw8Y?UD2PYF8#-PlEPlCGF$CK8#Vyxq9rMjX?BCJm^w z=Nu&9O5RQ;=majRH2d3=1s&cB#m|pFj)$>B<J(SfqOU*mfspRXiq0hL6XhSou=k9# zw?1gw2NxFfi4cZ&KV!dvU{veVI~AMY1FiHpBQ6+xw;jr67_!k7Muvb7a+_6UH<+mO zWOzRvO8Z_|glI7<2Gc+|(lJVZ$Ob~KY7%oox6MkAquzxS)hW(}$-B}I;9{n*fIwYz zyG3d5;V6vvCoo1}r54|wI=!`fBF^AEMRE)I{`{nKyM}z4(c~ocuNIv>Mn}L9-^gGa z&yDqJFtZru;Pi~U*2$%K6*azdumsnBiX*H8$`OVEFL3|IBKco`RY~#{2lHpx!jmBj Q3jhEB07*qoM6N<$f;^f*sQ>@~ diff --git a/graphics/pokemon/muk/normal.pal b/graphics/pokemon/muk/normal.pal index f35af64a4e..3737ca4aa4 100644 --- a/graphics/pokemon/muk/normal.pal +++ b/graphics/pokemon/muk/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -123 74 131 +255 255 255 +213 213 222 +172 180 189 +131 139 156 +65 74 90 +238 222 238 230 189 238 197 164 205 164 123 172 +123 74 131 90 49 115 +144 96 152 +255 0 255 +255 0 255 16 16 16 -248 248 248 -172 180 189 -65 74 90 -131 139 156 -224 208 232 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/pokemon/muk/shiny.pal b/graphics/pokemon/muk/shiny.pal index 082d96af73..7a972bc544 100644 --- a/graphics/pokemon/muk/shiny.pal +++ b/graphics/pokemon/muk/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -88 136 56 -176 216 136 -144 192 120 -120 168 88 -64 112 32 +152 160 208 +255 255 255 +213 213 222 +172 180 189 +131 139 156 +65 74 90 +197 230 156 +180 222 139 +148 197 123 +123 172 90 +90 139 57 +65 115 32 +104 152 72 +255 0 255 +255 0 255 16 16 16 -248 248 248 -168 176 184 -64 72 88 -128 136 152 -208 232 176 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/pokemon/nidoking/anim_front.png b/graphics/pokemon/nidoking/anim_front.png index a08514474997b854565d1bff75c411f980df77f0..22ab26b320e9813f62c9be7a567a28b95c87c090 100644 GIT binary patch delta 1569 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 ThFuM100000NkvXXu0mjfTM*g^ delta 1722 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 Q?f?J)07*qoM6N<$f*$ZaG5`Po diff --git a/graphics/pokemon/nidoking/back.png b/graphics/pokemon/nidoking/back.png index 6291e963e107956d57787bb65c310dd8b1239587..08c067f7f099e630c13024bb3b56c67c82db9144 100644 GIT binary patch delta 673 zcmV;S0$%;Y2FC`FD+vo61T`=zYXWMKG>d<jcF_ht0007ONkl<Zc$}S8%Z?K<5X=uG zBLsIo1^!^aFPG)Kkx+i5XA<u2_N?FnT6-2P7Z9GI+pp<KMnvGlu9YrVRae`|X7hi` z->C1f|2x3Z^9=%fgJ4ZT+1eqku!5`mu%@s>z`Sh`#}(bNA_CHCm(H~3$mP(k0$6{9 zd{P*~d8G@Fa57x*h+jjyavsr~OcyQe@2>%k06J`Allu?X0R9{eIOv(m?(faD388>s z&f@W5|8xxy6L7+ALY$8K-vyvTXAL}Yh={)q4+XG2EddrW2;gVv(uYO?xPSB+a0sce zh3dtNJE=y%F~oUpP1_fX(0Lis43K|{11wjM2LUuWtP++d?xC$sG!heH0(=ud+fM-M z<^;@(ebV9Z(L(nGtr~k%0NklP9FbU(ck1?s89)ceM1XE_Hw%SzF-`evQ9qwuq2T{R z1iZKfpla}OikruA`8=lCgq%nG^fKsrZA0RUY%~;)-t%n^uH-;j0x7?7xhj8*sX3|j zyd-Dod=`h~s9*Z0)I;R4{!R=p{khzwAnlL0t^zUz)g0vPtGj8$VbS8CVc%a*(=^su zgq(5F;hf)XHp5t=ZX`VlB}ZAGmt&A(;-<_%@AV*^5SPjnUDBJYF}M;}RG}{lFe>-e z%wy5md43S}bkvCR@Wmz9NKb!AuAFzuM8L(8x{(Wgkz!qfHvmrE_;5)e0Gj&sCX*Y0 zPNxu5lZnniI}>c&Fas#-8Bl;gvqDYF%#SX;D5p|J`Jzw&sgVY-4uu)e)b0vEMq}v$ zpkhcq=KJF3_EVb)JU`2^uwvdM@Wq!?jhi*n{>D%5zpOuN=-PYmkbMo300000NkvXX Hu0mjf0yjl= delta 669 zcmV;O0%HBg2EzuBD+ve?0R|l8WehrzG>d-#hy@);0007KNkl<Zc$}S8%Wm5+5cCh& zLebv)DeWKR`;<d+&Y^#@lHEIZsi3_C2&ojwB|s^4moKesp+?I?LU@NWv$LeV+x_42 zSLz2G{tj^Ta)rQNA=pw-whl-etl;WCY$+TNFmD^gX+w9ah=8=&r8C_rayhh{02Y5C zpA^P$+UUX~91Ryd;#250&Lf(m>7#}A?h?=lpvNvY+1_6Q_;WPiU|=fS-kD1iLIJ^? z#N$Kzd<hT}aKwH_oNwFT1)xG_4Lov)i0|z~0ql=!fJF=u5c>3?Q2_2AeFofyRM<oH z;>Dd*Ga$}$Z@Qsagx<@L7JyV7V7Y&KJP4rK6+jy-PuxRSn`k5^!~}Q}KsU?)>gEK@ zi+xhtezVX&L#M{x6o8ee?~z!Nck1?s1wgH1B0#sgn}x!<n5O)-sGrZFQ1JgT0$$w; zP&N2C#m(ciejf8;Le3+8e;swbwjpsvHX4gZ@A)<dS8|{%ft264TouODoYa4MS(CGL zK8s^=G_3to>LK!2e<Oz1{#@=-koN7ftAI>FH3vES;bxw2T(vlA*sqWCJWq8NA!l54 zIOi|B-8hw~8%d8s$x+si^%$g>xG6KxS3O84#HBJvm-Ojk46ei#Rp_SzOv-&V^H?+v zo*zU#9W~-Sd~wM&(i4&^=be8t5pcDnZsbCrrC68X4S-WOKAaN>faYPl$>av0*C_<m zWTG?BEd)C^E&$4U1{5IBqEOQ^%cDy#%Bhr5z9<wxYNP?ILtz0lwYvh4(O5bIs2Gxu z<-Yi({nTaxFVAu+te7_meD>v3<7SPtzw*=jFY6EUe%R=|pYD4A000R9NkvXXu0mjf DJ}o@< diff --git a/graphics/pokemon/onix/anim_front.png b/graphics/pokemon/onix/anim_front.png index 6aab94e97fbb106fd1bbeb8d9b4fc2d0399b46a1..933b71d66b45edadfbd37791f67deb17f4e3bd5f 100644 GIT binary patch delta 1500 zcmV<21ta>I3+@Y$B!35VNliru=LixE9wG(K(hvXu02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_|NsC00RR60|Nj90{{a900RR60|Nj90C?FvA?tkvy)z!VUw1azlQc6k? z5D@=#6J`Ja00Cl4M@0Xn2lB-L00k0BL_t(|ob8vvj^j2AhVuYBGUfp~?+?~?9$;Ib z=Tvskt82=$S3#1~YY<!gDLaXsIPGN%?4ibBCS!e~NQ%<W>~`Pd3I8(wR{r-u{<(DM z*`o<~W5#dgiGR#C&|u_K#)&?+fHxT_EP*TPCjf6)04i-k)auhSpbDA@V%GZj3|NAR zq5;rq0O0}9CtGNywj#Cy)N4Nh^dV@?@>3T8ye(C@Gb-0dqM$3S+jaun!BTl6l-BM{ z<itd)4OZZb_RQu+xCE3!R966hw3);G;<T(mHQoX6n16k#1gPe453bh7L&5rjm+ip8 zo0hvoClg-?fYU7~c{woqjuW8U1T<u8Ol}bbOc;iDYk&b@ZY!SX&<QZiK;0z^jjb<| z0!c9ozyQP_%?UU(`%Cf&K$^^vxtA!k7vOE$NBw&xz?g9t2kzMfhkTsUPD~s9=dS=T zBc66+V1MI*_z567U_5*kU`kzvNX6I5g<YWLK;c7xIr$j}PC%bF`x}Vx{*wkU=U%08 zm>J|n^KBsW{uhGeTd}$-0fEJ2Q*aKKB&zOK029$ACmJdWLsH9&S`|XVO?jXLjsp%u zSXR4=(IXN86g2|0u8zw>m3<3g1}ZV|a2PJShJOW#Q#D9K(H^f!n4cj?uF|6RK-}uM zK5tptwJ9urC@_9muaIHmW&`+K#~9uEz`{qooD&oK!PvEd0Ki|D03K|<GN9O{Ag+L- zyk8lxmD3*izvVuTt8q*)*iaK5E|LX6{mAzfo}P>_A3?k_u<KL7q+#{BwL&r60QY#~ zrGFSoIXzQc?&(%d0FKr)uELh1wm>yaAHCUf)Q0Oe?fhmc6pqbFiH*$k8{+^>_bJCN zi(wPk`EKkvRrQNprQ_XU`lgF%4GuAeF~se0ITRQT<F*6hJO;<mzuqj|Abs|-7?KH0 zezpGp&yV*klzI7F6<dXcGB2m$UjCHHIDb0}Wxh{u0vZ`iR&sM!^<&9cD%`oy?m#xR z8SO(Of_sJB&_X;9rQQIT(EvFSNL<qis8#^9tq9Z#;B@7lfkvd!<P*ToC0$*3`IdlE zfZ9|%nn%Dc0TFMfXW_j@P)LuKmXPjYNXoppevp}}fs6T=fNoOe1%TAHXmQT@5Pxc@ z;W#Pt;&7$@tI{?{2g6;@{0MlRgq3pXVESPK%)&_tJA{4$PO~!i_x)6rG<bBjxinx` zWgg63tI;G`0m?}Pgy<tL0gdrJGBsapSsbyXUjTK<0Ge_?d7i-~EOx)7oGq!@6MoN9 zY3`Ddo}LQy!`7Diw>j?AKipG^ZhsNmb+$K&SCWh221rxgG_(gWzf(tO)_n~Dq~AhI zHUTQgZa)J=`P2k>6pZu-3!wOUYRHmCD>5)({0jJ*YU+^U#0io4i#*`SeGOJ(O<zXP zGe-eVE8ve0bpB<!qR%CS9bw$Yr6zx=-akAQB@z)*MXdxeLzhx@??Y1*M}N?%EnNet z<k&Z8hv0!9Rt`+Nr={+jLMNc(N4dI$fOe}y>7PWJpXDy2+`$AV!29RkLeYK{69Oo2 zHkuE+@9`aF0;ICHfQ$H9oupbe1kdh6yi_eAPpXR>lB;O!(XdHHVTtZpQx(NNcB%7$ z@Q(e~8u40#(A5p#g0^ygn^lE=d<Ky1>Iy*IH-!1V|F96!KiLcYhWf{zPw_OoY7j=W z4`akt^$I|DBOOF|-9cny4<j3~E^Nf?A3Bil`}_^59kY%^cp3!&0000<MNUMnLSTaM C?!8O^ delta 1414 zcmV;11$p}J3z-X$B!4haOjJdf(4bOEN`rfQ_U`Vzw6qWq5Z=|*`1ttv`1k+-00000 z0000000000000000002|9cFX@000SaNLh0L04^f{04^f|c%?sf00007bV*G`2j>O{ z3l{*~)F<=+00jI=L_t(o!|j(%bE`HKhONwHZ+*>OBcNTQgMYg&Sne8#HQjeQ+23yR z_xm1!ZLr~X({`paB^f6{kEHV@y(fpm-|@)57=Nq(d7wEi4U#*+n{)USiYVU(3XB|i zoand(yzz+F1kSfF0NywTsMemS4E-x0JWT{S7sBNg(1ay?0iX;3<P#8j?SrGTBc~Z? z*LDK1QikC8yMOfnl&*z*Fro<;A{n|6%5nnCSyO!{L<r`c$nX+n$gzXF2IX9SCrkor zCb}DdA0eOJ{bB;|K`q_^P?&w~80cnq&!!ERvv=W&m*wcB%1c)zIxX>q0GLpM;+Lay zs&WYkWdaJ)Ehd+60!!o$)~x{t0CP*WB*=<^aR%Bdt$$GH_R1mP5IY7O0JbN%1e}Z0 zHCY58O?J^a%U%S<z}u9^@Jq+Qkhv<3&bnM0#G_A{m=gWNZvZeO_J={bTmexNKy=2q z{9s@TT?S9t*2#o}q~c8S8v}FjGbddFY)bZ55c2bn0AP;2NaI*$<QK))k@C-9;iS74 ztLYLTU4JTf?;4oIURC!3n20JFQIPjJaV;-ul?iq?#evQ^4mb>QS?wZ51y2|dR4`DQ zHZBX5^CsmCbiBaRVYr4CE3luUKp1>^3F{L%N{&_9RG-O}A+FC`ma;avrOqDX*Yyq= z5;re^-`g0Y>7PspcsU0q+A-Jb1tb7<+XA@M&3|eE;Y@Pk1_)~GY60Dupb-Ci?BlQ+ z$AlaS&1JuH?Fk|~xW^7JPezyzC-xRN*i<lSSRA)@@Z%jY?FOK0K0T9PCf@{bwCr4+ zTZU?nYMOpk`Iezt-qLhXo1qXmHob@`>2@<txFC*v?6N2~frF|B>rz$k#3~){3e)qQ zSbqu}su<-U<6g4Ts2uEWvM@MEyPquFAU2czcXTkr<aqf1`L8_kxLqpqdm$Ifyqt!6 z`N)%Tb{5L~m|jRUGMFs*=I+|(lF{VNyAS3}I<*<)<>g)>GnNp~a~(DS=g<Hd7D!yv z3FuY;w9QK@88D$UuRy`lm^TyPj7hq>uz&I`0W||{-nk)v2J{kO@it)=-kS%Wd$hC# zcMoGy=4$C;*%dIc84^%U%3Q6kr4lX9do#)wYB)^Fyf|E`|LTHn(80LMI`<5ykc5>Q z?qKXV0r|p6c3Vn20sXAZ_K{D~af3(iy5R=wrp#mh&}uYEnt^%}0VZs8OCVtUgnvlQ z7h4twY^fGNTRQ+neTuUZ29})1C1rF?#fk7aOJ)9$j7dVsqaW6~4nNO+r~cs)N_2}z z*So$;yx>@j)uLLcDCh)WekU%_tj8V<aKD9?teOj)v;7JXHB%FyP%zvdECB!0)Q}~O z7L;RwT&;kQR8!~VCr${@U&H}N?tepS_O+glP#qcQSHO?o(D~Qtihi#l>~LdQa{l-3 z^P3`HBM>rG)JhODbSYi+ITqeuK&Q5J4WyEDsz5sg3)HwWV9H+Lx-Wc4K;@q0>MAAL zts14@voycTT}F+;5-tHsz4jJ@P6IE&fKd5H^Px``|D#L*SN0ZgWjni`tA8bK0Ww~@ zk`O0R#SO_7G*~ojTv6DfvKv6Ou}Yl}gm<u8d&FA}LRU9{E85EbCe3zu1rY7-20+|5 zg!z$wtRT}LS--3P(YikNquo`1d_`PUc31sV2O;-6h-|P}#P;9oAYvB#e@XuS1l+Gt UWE%oW>Hq)$07*qoM6N<$g6~s|f&c&j diff --git a/graphics/pokemon/onix/back.png b/graphics/pokemon/onix/back.png index 4a9e34afd31786bb30e567a87b72e43db1062644..c199fa228d8641a695655027b83d94ec138ecb77 100644 GIT binary patch delta 885 zcmV-*1B(3c2B8O#Bu58yNliru=LixE9wTze;)VbK02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<ACWE@f1uF+|Ns90|Nj90{{a90 z0RR60|Nj90{{a6eARzAcgU!`qth7>tlsRg17!VK;E&%6R00001VoOIv|D^}=#Q*>T z#Ysd#RCt`Vl}&QnFbsut0%@|(Oz+S51cfc{V@T<`5h!;Xi=_9d$O0tw<JwhL<%~Te z<Kx2v2wFw)e_xmTB3|yU+rY=}ZCgO$Ht?~-{tE%z^uPj}K>32$Yyp=&Zh9;Mw*e8j zDWbIYym~bHH{N)(?*NDMgce4<v}>R=AS)8(PX$_W54xp@@&Ygs9Djj>Vh6+Gaf$=f z=MM$Y&;|biH0|deNhxjiwwsHnnmK*~gY;ePI)o$5e;zA5Wee=}*aN5r5n!Bw5u*gB z<yzqrVBaC{Inn}PN4yDTAJlNrsIbv6PozO4Op7IIqCu%0(tABwAZ&A7ayhcE(x+yC z^9(c-ppAAGm10HCktIsaT}_KfTi4}``jRC|Jqa{K#6V+{nuZ_ABbix%0qfJ_-b^+P z4T}H+e`9(AGIY2F%nfkRM@lB<6t_U#KacMjaIp$4aqSo2snypEc%B{?1n8X|BYryc zPcEHCN#5GPAD@cI0Cc~;x!g&cmSX|=?$W6Y?Q=-L=rdtOi?Iw~u<5|PcXA1=w~nDO z3eeJN;IeFz2>G-{$@!Rr$PCzaZ3K8v%KIi6e*&A8rfbcE-Nr`vQ3{k!961B0i5&~N z<2ezavJs%JX+Q*m5Pb-80$l>)4k4fpm1n|*z{QD#+?~o%UVMShMGRZMGb1q}t@3N2 zE~12C``mgxNV6A!1P}?^HD|8gQy&34#WhF{mhdR{E3Q8*MG*5w0RF{AfW^Xf0eBF2 ze{|vuc^(iwU8@P;afx2)^wa7OuCgIp=pz_=>jr&Y056R)QDg%6)E2;5XJRk{ecH4F z1P@Vu0i+kj8sIaOm<(l}vT(fxVixYP(V@6oA&#ThA<mP(2dXsEnH$gdK+2Iv{{fIp z<k1hL?}4xaMtbm~tHK1x{e1K$WWvR6Bgm=P2LKaJwtF65{kO?KVYdm`;0M>B00000 LNkvXXu0mjfU=EOM delta 836 zcmV-K1H1g82k-`vBnkm@Qb$4nuFf3kk!u-$(4bgg7=Va4=;(-`s8A3P5Xi`I`1ttn z=;#0d000000000000000000000001Gazji2000SaNLh0L01m?d01m?e$8V@)0008X zNkl<ZNXNC6!EW0y42JE4@0Mx>J5HS47f{f<JvQgan0j}b@JTwLk3CY7?HEmy(*z`c zfWuEee^OLj{NH6B#LNBhKJc`Ey)WSK^??9(4+QY|K;SM=z90_wfZZAIdMpX=10t{~ zqExEBdert0Zak`IqEkJig?2CfHBf4j6^ZhfBkQ;a?OH^+Bbo`0ztG9CgJ$(O$BCx; z$q@~(!*770e>)>MXZ2aNOA*zu#1Eu@5#HUtMY_P^vBE>Pz+NvMksA<+#swHLN^n}P zmEMTXE%KfVtN^yan^5-AL???52TRLDYDB=aSYiTboZBNjPqPKUKF1}O0rgw@G&EE% zz%T<=Tcgl9R^%L6qO{!Av;eF!ZO&+SS)#PFzyJUY3@WKv`k6ceyUYR%D4!mG&w940 zp;-kO7}FDhhSL_%8{lLwkW4How!qYVjL#Vm<7`Ue)~~>4Z;u)9JUu1|&>1zh5<i@} zPm@lg1g})!k55HpfZ88_P41*h%dmiax9L=x{v#w{<lSkB7GoK}pwfYRZ{!jvuM9(B z6rhJg!)2)?5%Ot^lJPMIfNrpVZ~F-Fo|N}hG6Xg&O}CZ@yN`|VqZBBexNrte6FU}c z%X1<?r6K_BFpvlYA-WLc1lk0|9YW9)D$j%ofr}FfxjPjXmKI;2x`<)LcV+}8q*eYJ zn2IQ&**>@4Hqz`B00BfowL{I-d*~vd=C~!v!4e+De#P~NwFqEd3&6jBm<X^~IIaK> z0*_9dA<qM1=W8_sJTB48lzzJUgR4}W6d9HX#@?F79#_CiqjVIR0Y0@AFv{o{j6jz* zT>*lJD8B;Ii{cvKGnAMNWuCHd+yXHR_gLFdd|4rmqqiZ>lm7}-X{0kZ)?a~?Bai+K zAeqRcAHaTNA_F7bc+piaVFu)W-g*-<VPZGrR8(=3FtXkA_}Z<>qWA}u@AgTVhY{}p O0000<MNUMnLSTaWUv=&P diff --git a/graphics/pokemon/onix/normal.pal b/graphics/pokemon/onix/normal.pal index 3391776633..c57e5be585 100644 --- a/graphics/pokemon/onix/normal.pal +++ b/graphics/pokemon/onix/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -82 74 74 -131 123 123 +255 255 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +40 32 32 246 238 238 -189 180 180 -16 16 16 222 213 213 -248 248 248 -248 248 248 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +189 180 180 +131 123 123 +82 74 74 +16 16 16 diff --git a/graphics/pokemon/onix/shiny.pal b/graphics/pokemon/onix/shiny.pal index 8cad51aca7..bc6d63ea51 100644 --- a/graphics/pokemon/onix/shiny.pal +++ b/graphics/pokemon/onix/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -88 96 24 -128 136 56 -232 232 136 -160 168 80 +152 160 208 +255 255 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +40 32 32 +238 246 131 +205 213 98 +172 180 82 +131 148 57 +106 115 24 16 16 16 -200 200 112 -248 248 248 -240 232 232 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/pokemon/rhydon/anim_front.png b/graphics/pokemon/rhydon/anim_front.png index 758a245b58917b56b0507bae1804b1384c584d97..e3af357623ad416216b4238d67ad2cc3acc52dcb 100644 GIT binary patch delta 1523 zcmV<P1q}M~422AkB!35VNliru=Lj4P8xbaST1Nl?02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_|NsC0|HbCjthA(ab6PRxQaPkC5OW|9{{a900Du49=H|7%&3l8BK}uQ> z5D;Zrc60y$00Cl4M??UK1szBL00k*YL_t(|ob8vfa@$4_hS9jxaad&B#MDD5dVq|e zmWoG2ml;hORjKVRelV#?;YtTkse?U`GwF19Aji_U2oINk4<LmDO~sWfV>GZv`(bbQ zZg2N@l6=FbUVnvu>_I?R{1&u22n3Th2LVBFA&SEugtd0@0wAoEve4!ruz_9D3&2R{ zL=5<3w8vywAS6+#$gDQ=Auv11enA3K=2(R)>HPqB_4DOv_V=v}PoWD6dsg>dyd7U= zzp?{qjpRT@BKixxO3&W@FqLIqO6e3kST;I}<njFM^nXN`n_SM3i&}~0vFb08jArS1 zs^`D`D3!HDE1?XjIMZ~N>g5_sz=uslUXocvE}qh<q~F=@RJ{^Xs^e(Cgz^Sf<)kAc zi<Oqk0gw~i7oY!-b5+V*X?Pj{*hsa0{b4g#_{HFr$47$GtUteh?J9?*904eLR%A5t z{`&g;hku+yzzYjjTdPUL1jRV7uCK2**e6p~#LsSp<^6K95CGm?TR6uv1SW;HMoV2c zVWT@>w?ZN`!X{N9jUqT8^7whq0lSuyQH89%AwtFAUH3~y=p2Pcnu`{}=UAa~{c{*i z3d8jp4wAi*cdqIKW42eDg1m1SP>$klZbDKUQ-7uD6r~M&NP(USl!#46_Av!vlxKf7 zIg-6NLY+TmX?i}pcuaXkw<u*)b9gRKvTOz?DQ|{DMU?drI5}Z^IwfVQl`RH@U?31z zN*AW`4X#K(86AM1(lonxxW(R+Wk)>+Hy<wpkfqa`8<`v4a@8yShue>*AWo5r1|V^w zIDf(CGslU|VGU^nfKYaDvI8^&Z44Lk1{a;e8WCVVwOIh*gRLTfZxU54a3$|{K>Zv7 zulNM}c{UAwBt*~yLLF64AxbVCR0SGEujLsAoaK$I8!oE=^a{@f4+O$f(^jrC{lXk| z)y(a~nHGq9oeLp_k1N&EksVPgz6#!NFMn3tlP$N|_A+@e>>_GWVq!S(?csV}DJmAd zoODZULoVa~;m5~4Gj9v_D!Mz~$Nk0>S{<H${Ka~*p1cI$!j6t#1QMSNhsO8kE1vK2 zB$g-c|Ky4JYIzd5*pnwi7klz#_zdOAev$)uvhQLbPxhZko_xU`$rDvKi+!M#Cx1?1 z1?ZFc9uee8v3^rQJ-}725;0&{o;Z2~d4d6*TPt)C6KF6b^O|=7%7m2mk$_2B3BmRb zn2$FD7kch(+dV1gW!9Tz69ZC*1|M29QmU)*04UlK!BYc+8E5MIJ0>g_4EJK5GcL?S z-ER5OeH)?K$`7I@wEC(Y%10$<Lx0leTlv8anUk??;gwQ_6vnQTACM;vrb^Wv`B6^y zeB<)9tLj#MRQ$c)Y9OSB-^8B=6Xc&xeq3+>-6a-O5(9r7<BvP}fst>!vfIcaBwM=x zbn1fTq76ZK%naKe1isp;i*%|W9;~XpMV(U{3{<KO0EqJ|h1m~zfwPg@et$4(77w!) zKpg)v5GH$1K8TxncGAj^^dYE+ATORvT;I--MRv(C+y(W}0=vnlWpUP}adCIMQxCMQ z8kU@&x-2f_mjSBJS`jsC)kBaMyNfJJXwt_sB#9`SPG0l@$P2ZVA1UO8Y~@Aoq6aZt z2c=g#)9DY@YepluFs@-cb!^JnMZy@HiEB%?Mmf|$8&Eu}g^{h?#;Xn*tXlN#$r4A0 z-U4lb4_yEvyC_&WZ`TYeDF#OCaWAHk-22}N>z1BBi()u9IYLCo%a^6Wa<yE%2z+bl Z@E<;P!m^=!(lG!4002ovPDHLkV1oU7u{Qt! delta 1633 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 diff --git a/graphics/pokemon/rhydon/anim_frontf.png b/graphics/pokemon/rhydon/anim_frontf.png index 31fdb1e04f6b8396853a756606db86a9d0423e8f..b0e58b0e1d59cc4df09749d55b7c147581205339 100644 GIT binary patch delta 1510 zcmV<C1sVFg4EPI>B!35VNliru=Lj4P8xbaST1Nl?02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_|NsC0|HbCjthA(ab6PRxQaPkC5OW|9{{a900Du49=H|7%&3l8BK}uQ> z5D;Zrc60y$00Cl4M??UK1szBL00kULL_t(|ob6XVbKEu%Ws_3iT#<1TpMHemUm&WL z#v@&8O&V3H<1YSTQj@}!K%P^F3*OD769C?g<#CY%k+%TvMBG<WxiUvXYqXF1g@@he zEc=E}y9oc-gMR?s@LSO0ARw5uIS3F07os}sL0D^NM*zY~DJyLb0#>j~Is(XbNyGr3 z<@+(YmPEB8vsg{{Cs9dRA__Iq`+b1F9%OhbT~X*+J23t*nM~f*>_A#0IZ=^`VW9l% z?T=^gWL?%$I>ip=olY|OQoI>m>v~nnDQZy*F+Wwq5Pw--+?>DF(_em)%37j@P=-{N zy0|Fxe2Eb7VKY(IWM+wr=bKAOzp~w_b|Iuxr%Atr@&;Drq$4A%g_iRzKuK_4ef?cd z73x(Qp0)sJq*}iEu$n6TV(=={Bf)95U*ErSjYB9$08|4jD$2dTyL<nk<P`8iz-DbV znHYnN(|_jf?rw!XnYtl<HWB8Z=Hr<F;I}&q=XkaO<4RkjrEa^>=pL|%kO_^nNmVGL z3J!=oeqL%o*Ge*~lC3vHU<}^vkTOD-AR1{VEs`%0p>e}=$j6mozJ`NjZ{(e8hJX>< zn^i^LcMMRD(l&RYsFi7o;u6$`J(NH%2vEdkxqp2wfH2ClKbxJ%K^}qU&y%9KxVd^R zIHH@?GT|Ja>$Az^22KiYh65w&b{lYZ#`fZplxY^W+Cm5h1jMb<m1%s3D>5ub2f)uo zF}ZqrK<~-2qk)6_kJkY(DK78tWofwOYC!#`hmUW7c!N?j01_vP6MQ*yoY)lBP(}a{ zXnzMM8-Qj&%;8Gj<DyfDkpRr+SOoxluuTHsn?y|n+{(udpnXY!BYuJXVsaVgNXTFS z2s~=Oge;jlU<C%nVB{GFILnP}JEm0t42b7~2Li%V7n$qKkeGSTW*#5TL_j+0Tu3Q= z+^C37?8s8_Rq%d&vC^4rdCbPk<bh!q$$y9vW5bEB57%>~ge-bK?nA6ouG9J9N2dcb zw*|dQ?vD5AyfKwlhxZ?Uu^cbQ#{jsn`RP$W=Ci#^<NI^``7Te^h$v6of5{W`zvapB z*_9{T@pt6O_OmTdc1zfjC;MC^@?`f(<jLMH4CIMwyV))v$`hv$0s3URg9!4ZT7SN7 zpdR3=RGHYqusm_}8uA1Sy0lj4Dn($xkSts70+b0U?Gpi$MG3+79xxrPwp{3`w{dz> z$zhhOd6xpD4g)@nXq418qb)!cR|IbjEM}akA9hSwCJfJF-ZL)jLmgXw@+oF$*7Ad> z3!}b?OZlYcYDoHWEkAf5b1^m&uYZ;*lrVC={D3^^uvMD=$WKc8#Dp!Eu4$wEX!v`- z)<7r?zllE#Hpt(-{J7!-`b#XRCI<X@ia&1T2UfoAX}6M9D7JM0(5nlUi#8<TL3JAs z0$;7wMRBPh9;|A;1<xra1C?q60EmlQh20N%fwPh8d60Lrr<({s9{(^PY=8EFd=U53 z$yt;i#ZyoZL0-I2Tt7@v#pIfEcns<x0ydjZ%j&!@<LdEYqaJ9@8kU@&`zo&FegL)S zQAFKD^$_I6<|2z4n)LY`MIy_tmls0-<b_(xj{@>SMtL!~=s^s(LFu*5^!h^$hEWa| z#&v9`UOBr&7^9iEwq#q-p<fN!fYMzpjEr&{uQq6~W;V2Ea~vIJ3$z73bODgqMa9Z_ z9W$t;6p$}RgPd}?^S=|;EdzfRWH`7vLPn?a<I-Thn9q&^zO{7t7Y+r!?6crHoB#j- M07*qoM6N<$f?F5BM*si- delta 1578 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 diff --git a/graphics/pokemon/rhydon/back.png b/graphics/pokemon/rhydon/back.png index 8d810fca7958b1aedf2e3a9b3054073403c0e17c..394072ea20dca00234942337cd4c3832806b613f 100644 GIT binary patch delta 839 zcmV-N1GxOe2KEM!Bu58yNliru=Lj4P8xT=*YS91y02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<ACWE_fB*mg|L(=+)vUCnb8}iT z=2AJNF%WYg5dQ%G{{a90_SN3iw4|JSb81Qu5D*0j3_Sn<00Cl4M??UK1szBL00Npx zL_t(|oYj=Sa@#Nr#<g^n&U-F>2-kCmII{;w&yfdoFE0?v$sU1pE^A2ouJu%tD8PTA zY-dk7$Ufo6e-9r(P)+ltR%^<i-9^9&9ez74wx0kZ?9|d<2J{$qw%|Vj+EEP8lmX1~ z`6AFk$f1>a-;vRCr({k@W1O_~90i=0;>O`+GiYy>5CYVNGW6qS^90@y0I)v?ybzmT z0Mbb@fW2Unga_dDz6CWEXxY#)$6*xqB!QNO1qP`De;`s%D*(V!4Wylk)XQ&uO7FsZ za$hupM8E!-BrpPU%q|`Y===F1d+9*&dl&c9dVJ{no5js4#f^)A(O@I+_hB(#&+n2z z%bP<Etzr(j-Mp<AKd?CgJOG9)>gwh9dbKRwaKP>r(l8|tv-`K(Rd&E-swkqe$=7?i zx~<yTe<h$OfZ0|8q+l43^hj0EdHksaT=1wOmI!fZP64V?M;nSViTyc1M3lf8>hY-p zx>!AgBheu3mA2z#rn=Za#uOjgcYtH9(0Buox<L6=Xi4qCi0Iq_B1jB|u!^@ljX@qu zBPQ2^F5Lj!B@+gg<I}0_iUDrWKu3qWX0lube~dz*pN8YimT40Mp2Qop)fv!47r?~N zR;#JSWfC|?d~I=dojp3~YQTE_){)e6wy25&&OvGx-{}GhZ=zHk1{hShp1fW;hk=td zXwDOsddl~5qTwJDiW=6*0whW$uXI9O5Au}6B4iB^F#s!IIDAB1npLG!*Ic9u5$lss zb#3~%4<5t43YUfmi<JPzqfTvNf<{Jt5c}9?lar?JPa(owdm2(%B%{YeB;r(gUHf)i zD=z2g%hX|RU6zpQZh5ol5YtpTH>uo#IrMkS{PknN!iNWzu*+rNSHS<U{sG36-z49! RS(yL;002ovPDHLkV1g{ogNFbB delta 790 zcmV+x1L^$s2E+!CBnkm@Qb$4nuFf3kk!u@&n2>N_SU}jws1Ohk`0&v9`1s)9*l<`d z;LxbBpm3l_FyMG#phz&_cwlfK5IroAV*mgE32;bRa{vGi!vFvd!vV){sAK>D0-Z@j zK~zY`)s(SP<1i40JsuZVva;xr&@e-31brly8SYB%@&e4kvpCcg$<-+!&%uM;u2vR* zauWJG6@jrn|NHOimz#fUwYL0ob`%KSq`#f<S6=`=y=hcD4wyc@*+TpRXnQ}LPzA8J zCr5z}QVpZ+`575KbV}yDvNkA3zrBaURzg3VE(a5x_TGa&(uTQNF0Ub40st0=K=gk3 z6F>#!2XIGBlJEe$&aXhv1zI+AJMBY%@7-Pjqbv&y$|S(&nN|RRqaH|mBJwQ1jk$bC z&&hq!ND|}fHA|oXs-Ilk5HOCL_2i`k&Ci3pPwVDk9N*XP+q`ds0M>vL;O=3)S#4gj zK+7+u8b(VE^|-uTt^Z)N2Sfl&RrJ&8_tkb+rV)VMYost`56>T$Z`<wXl!F$35j~l_ z_)y!oYMfmLiUQcHN`MqB1B!lf7jzy!DuIwZYQZw$@0)#qx-?=#QzgGR1c(p`d`8n> zS3oD-Lpl-z$~_s^&ob4?{20@GXukn&YlS9SfIJ1NuhU3s57vwG0EnP48NzD6<uoRF zEQ8Q<2L$kxYzi#z&r{nK13aLAfsPLMLK`Ze_Zs7TTQXbH<_Fx{Z_rg|K#4AZmCsgd zXv8H6Ttgl^e14of1{G?+MgG>2)X8K~7YAH})Eu7E1@zI1RJ{!_=yW}KU2u(b3^TxR zowW3?>0Zt>0!)Oafpt7%0WzhtS2`i?2RS9ugsK4|24DqDhmUB=u&Q!@`jMNYH)zMj zEL5AmTO^O^UZqPzgu_Yz<*4(Rn4rk$Phuf+rmupm{QW6J%5|iWsv;>K?}d<5MN|9c z`wO_+U@WOaDD8=a(l5LBb%&T!8D?oB)ZULTyVoj?4n94wgxl@L@wNGnR@3|i09&Av UmbAs300000NkvXXu0mh|f`&P9xc~qF diff --git a/graphics/pokemon/rhydon/backf.png b/graphics/pokemon/rhydon/backf.png index 4e40dc7798cfcfa5b9abbd63c71625d6fc545a86..7c7a06553831a3ff360bbb9af5a528dcd963f072 100644 GIT binary patch delta 848 zcmV-W1F!u21?L8kB!35VNliru=Lj4P8xT=*YS91y02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_|NsC0?#1TSthA(ab6PRxQaPkC5OW|9{{a900Du4g_SN3iw4|JSb81Qu z5D*0j3_Sn<00Cl4M??UK1szBL00N6iL_t(|oYj=Ej^Z#7hH0)%M8Dd5h!yn}$JU$# zd5(QRPWu8lK))HA)wbA1I#C_=+>9L?C$RmVi-0np|M_P;&SdhXR%P;^!(G4$9e!&q zwx0kZ?9|fV2Y+-Ic2?j&0jf^4d&&UjvcC(|5OQc`jt4S&>y*q1X^fMWo}GZ(Qe4-* zty}G_5<-BwQ-<EG*E{fr0D#ji;DuQK29QpQ7VI69B-{e8;}+CVpkhOp6o*dOQ35Ru z3$#)PK=eH=002uhkai+Qy{uh$PwunENCG1uyX0a+z<;;q*Hr=(zjtvzt<7uGtd>7g z+_(rB4K@OQUuRFt*&<cRn?nw*Vh*`oe=KLur!n9GFl12=Z-17HMYiC8-7BPF>OD+f zKAsoXZq-gj5tU57zsN#>h#traV77$-DHsMMJ^Cu>JkEuH3m#R(dP1CT0IE_)8_M4Y zh=>w6MStDxN{_L62uGqp+6QgB!A#Y$e~c+UwC@0yQeol^K;H$*uR=>o4@N}i4iG_N zFoZ?C;%N->m>V&;7If)a;4YakupA#wZJiBpgIYQ|JWK}56+kBx`e8WEY@RmJ;wU~r zTbuz+bOucPY*m_CoF{>E#Mc(5kIAExt^};-Z+{(0?UO~79dHg(vv{NnD7=YMWf-7U z;d=6V=Ntw`tJRz*EVWDba-iWL5sDgC%MA3C>b=qlaXrXW5{r-}Ktv0yfZ^~Fb#7LX zPCaswDnzXBg-X+xQ}7t>Rk$=nSS$oE9(CU)CTL{Tl{m#do0PQw{$wJ|wWlGKSu%P& zM@b@1mDi<j$F<`834NYAOsz{2Qmy7cXEkC!mCg++cVN!VYM#Gd1X#FwU<o^)H%$Tj a59=SH^4a;2E#W@^0000<MNUMnLSTXc5^eba delta 740 zcmV<A0vrA32K)t(B!4haOjJdf(4d%*a9~(K*vP055D@tA(D?ZH;NaMBSTNwwsIZ`L zphz&_cwnGNFyMG#a3BypERbUW00M_eL_t(Y$JLavavCuZh8cz;C97Name6>{<ss;i zSkI8w2`|9JJV#2ProcUg!*lq-vMb#Qah&@^1@@f2`}g0~uYVg1{;4%I`JcyLz&joP zj<lP80l4_4R-qrzReW;@;R|3`xq8eMz%0kTzzAXujb`%5M(>@nIj4;A%JOgJ;Jy`K z)eq}h2aC=*z@9ere7&AQFbn`J?t$Rk`UimW%GF?dOtNqdvL;i&TY;e%TDJR8Iom0q zl@Wnj=?J)Hrhf$hV7Uj@Zi&t;M?OAh_gSMOK?zV*>tfEpx83hz%qY)&dY{+)b+<e0 zkL|wk2{0OL0$yHE@B7oa?NVNjH8iFgYO{XcpFS2{AOKLTf^QGs_viEV6hPb~ahMtp z+t25Z^P*@IlL)pZpFUL~z(fON1u)Y>fEA1Yihr6e_<uZBWfG!COjtv>#T~$1>SO~$ zKfpwipe^ZYR(ed`Lp%}<%D!n^+1tp+`3Z({XuklKvzs^?fMyC@ALB?$55^_u9*96u zG(=@2C5=&@@*uEt>1vQEnHX5vzfJ8Z8;}9je00=FoG*aNA%#ItW^>wHP2D?1wm1V$ zbOucNY<~?kk2ohmYNW@Owwu<YSH1*nkZ&DJja!SD9Y_sUvozrg=z>X7<u*W#@p{U7 zk{Sj&tJYE{F8tZv%Nq?3ErC3+k;*_rVdIrgNctg3Noqos024Kc0>#58(s@`#IowE- z7<X)Fgi6ydi|8@lt9WUcuv7?8I_hRjLU3g8N?k0{oK0J_`Tk@g<~ndlRhCR1SBXfe z3cB<y_ZR5$P9dj`pv(eGC_G&LoJK@VD*a8G7&WWi;c_hEXyNKXB<$s~+Z_l0)%puz WE1FE$zG>M20000<MNUMnLSTXr@L+iW diff --git a/graphics/pokemon/rhydon/normal.pal b/graphics/pokemon/rhydon/normal.pal index 2658775bce..94daed457b 100644 --- a/graphics/pokemon/rhydon/normal.pal +++ b/graphics/pokemon/rhydon/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -139 139 148 -82 82 90 -197 197 189 -16 16 16 -230 230 222 -248 248 248 -224 224 216 -115 90 49 -255 238 197 +255 255 255 +255 255 197 +230 213 172 180 164 115 +115 90 49 +230 82 57 164 49 16 -230 82 57 -160 48 16 -230 82 57 115 32 16 +255 0 255 +255 0 255 +222 230 230 +181 189 205 +123 131 147 +65 74 90 +16 16 16 diff --git a/graphics/pokemon/rhydon/shiny.pal b/graphics/pokemon/rhydon/shiny.pal index 4f48df440c..6ff4a62c6b 100644 --- a/graphics/pokemon/rhydon/shiny.pal +++ b/graphics/pokemon/rhydon/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -152 144 112 -96 88 64 -216 200 168 +255 255 255 +255 238 197 +230 213 172 +180 164 115 +115 90 49 +230 82 57 +164 49 16 +115 32 16 +255 0 255 +255 0 255 +255 246 213 +222 213 180 +164 156 123 +115 106 74 16 16 16 -248 240 208 -248 248 248 -224 224 216 -112 88 48 -224 208 168 -176 160 112 -160 72 48 -224 120 96 -160 72 48 -224 120 96 -112 32 16 diff --git a/graphics/pokemon/rhyhorn/anim_front.png b/graphics/pokemon/rhyhorn/anim_front.png index 589b7c2f98d527cad192155b5f814abfb0b65c19..94bbb6e3e41afecfdba48d4ed145809fab96e16e 100644 GIT binary patch delta 1191 zcmV;Y1X%m!2)hZ8B!35VNliru=Li`E2r}F;%Pjx^02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_-sa|{y~T@^oMK{wIXP0SIVoBQ0B~@S{{a900Du4g0RR60|Nj905D*am z|Nq`L|LFh#00Cl4M??UK1szBL00ZAiL_t(|ob8ssZ|gP?fCboI1ISL-0Pk$A0_-DK zy%*`&Zi=5pzR}$}cJ05LICMv5Xy(`6(Z57L+iOuYhX4-DPsh`V)_qy_5&zK`Al(M$ z_qfcm8`Qi(oqrA9uM<1q9wpDk67q)E=FM$DTf7Qzjr-8o0i&IB{Bd!IpDYr%DWdyv zlObO+d@3wJ!2lCq&a<m!RzE?pf~g`dwNq&?2IEHC;t}cs)nl$Y)GqB7187!r2(^8j zET+n0*CoV!#v7|Kgw5B<0sxicEd4qJfY}&4bPFh78Gmjxw$BLw@CZ;FzWn7udS%yX z37mKiFw-!ta^MuY(J273LxCFcWg>t=>h)?Ml}*RcNdxjl$xq#eJ}{pxVhIeaIYCK! z9de%lASD!BTZJ`v;~sO|_S<kM0Z9=;=<*4cy$3oN*Ia_^K!{wRCE_&noC5sUQQQNy zdBp@6@_#B<F_pt60InV+%@OcJz!@hf;%VFRtxS0%-5wLX5Xd^TF@ZJm;rWJ-z$PbN zhVnb&480Mc;zLs%fxA!nm@D}CFNCHdw0xifQ6B&Sp8i|_C*Usg#T2ONJ?zb=DUip7 zB#`rnTcQwpjcj4Y2d3I8Uf}||%2?{RA=|i`FMoV%*1@c|T>jP=E}{pFKob1jC`%px zBrNe3Ney>(iMqookldoH!qBEbww1~%zr1tr(uAxo>RFZbBe*hnmt}A7zs~e?7Ce;C z36PEWH!Waz`z|YY;cUH^>*~r!e8m4VP<^?%&V!dnz~DNyo9dsNtHch725>oKGHao3 z0e|S4t3Z^4U0k*U0aVBDi4N68f&o<*E0ovO#ZBh-ieKp~(Th%90<_~f1ITY_9*&d_ z|7Z`N3(JFo@(I5ST{_yMJq+0%`0E^DY8tJR(JuC|ti>K=owqTaNk)6L2OI5y*QF7J z>tu(cJ#;+VU!y0Pb6{r=tD_tw-8|U?4}Y5|2iT}&@E+}fL=Jf3xz?w^!5&EDfEpKG z9{Rw^9&D5YWAjP%qdlDD;A@VHYxba64y+<h)AoRqJ?!NG7k%K|9<-6^dJgpLf#rbz zvnNAI?IFs6q&NbpJ@}m*aEjw?r1s!=wDR!h6fy*3r1n7ayQqBYD>}6D%pO=Jaer&6 z^>i??#2(^-t&FiP&*noBJ$n%O&|Iip``+;0+e1+31;90#ktJ)o1F*M;Ht_IodCXh0 z%tp3Ym4`;`?co=1`8l&bIJt6Do`7f%-~I^b#4pfk0m9NBc8K=y?YH0gA&p#Y_i5!2 zVh^wA__m^8T>9-xYWY42#)Wn9iy&RDy<psk55f4?;vW~-p&mpG$k6}*002ovPDHLk FV1m?kIL!b6 delta 1104 zcmV-W1h4zM3FQcoB!4haOjJdf(4dQyoMK{w-sa{xIa2ue_@uqX5D*ZoIVo5O00000 z00000000000000000029<EW(o000SaNLh0L04^f{04^f|c%?sf00007bV*G`2j>O{ z4k;dC)x!Y*00YQLL_t(o!|j&Aj^a2FKm$VRa~Ti0P6~Ijdw*oIqOZi`g}H7^qdA9( zDpxw4#`_1mzp#J1RiTHDA>q1OO<PDH{8Fw|?9_{*_whd+6TsWR{1a@V=ms@UKu43u zapDAg0*N!2LZ0y4Jh=^M3!?z%_&W4BV6=0NzXn(M%>t4u0o?T>Q@&(+Us<Ax0VY0P zMpv6Cy{BqRrGG+BwNPO#ChJ7oYDsAYYMHA7v<s`n0GREZd}^1gMX4+lML^8=ys%o6 zKYm^<h(I}x($7Nx+OMghVnOv2!-<CM5CB9=qSWx^&ks^7y9-m`z;mL#rZUcnL+C_@ z0Lcm!Xn^OH01B{ItBGV*uBng$<cpf0y7hfvzF%}HFn_S)05$5J&zk@sNulE0Vo0em zZka<H?4;Ke02KoHB40sm`Z=bYf~<f5oS;SIFn9<7{uJ1)0opu408Dw7vnXY=2>{y% z33CRTDZ!otRNZcC`Bq9^NN48&&qy*)Sr@<>`D*xv&%iN9o~HU6z#bYSK+KyaJ_C2( z^EGGi%YPq0NsM55LwUqLKmy$VxgZX}RpyJ)W72!r$L}R!0}BZt`w?11?|X&JXwMra zZWYgP0!3^r_RA0*UCI}}Bs*_*EvMfa!%6gj8A*VziLzMmk+8^11UcNLHRu9jk8+DH z_EQ@IQ7f6n&F0QMN)e*8O80SaaJ;L1<D%&0@qhQdK19Bu`Vbzy8J}qZ{mVC*x$}py zx6t^^`*<He=K%HbwjAWr0w&|ssjGiTMu`*98NhgF)<WF^z$K$VCkLmo83k0q?}-A` zW&}`awFP-y>ERR<ztXp&7lj%EwBtTQz;9`8j)>Rx@S(EYC@^2~yU>NLy|afY+XMfd z1Amn!(K=}DVh@{C>_O&v8B>^`wRiSlJA2@HDFnhU8nlOkd;3%8N#+tb*~9iM2SGL8 z?17t2CkK!yGiVPea=;zWWsMoM2NXHL#QEn3GiVRClLKS(ReWs^Z*uTChsBsZD3$}O zki%qy_V6kPu;>Gq_MnY)*Gr&h4=e}#%YU{b_Rz_JglLEDp*hI`hdAFxXb+BCD>r`* zAx&_=9#GCj++<CRX4oEBC84#LHTc8C0(<B-Y;26pxHoUE?Lp*2bE0<F^qTjpJ$MC; z0I)+dvuI6m2<;*B-25|c^VV#lnXR_<g+2V*Sbol|4^FN;)^9*(4`2TA;KVP$X-NV6 zraAQO;mhBD@k5%quH4t{UF_ir9N$(a7(-`YLd*Z1U<{q?nLAbfhhW?o?}G84jeh|@ W&@_kVuI^F*0000<MNUMnLSTZ}qXbp} diff --git a/graphics/pokemon/rhyhorn/anim_frontf.png b/graphics/pokemon/rhyhorn/anim_frontf.png index c086ed4d96f21df5bc12dab713b83d0632dd5ba4..a85f23ff9ed29ea8c06413993415d65a3c1b10e7 100644 GIT binary patch delta 1187 zcmV;U1YG;M2)7B4B!35VNliru=Li`E2`oP)#}5Di02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_-sa|{y~T@^oMK{wIXP0SIVoBQ0B~@S{{a900Du4g0RR60|Nj905D*am z|Nq`L|LFh#00Cl4M??UK1szBL00Y}eL_t(|ob8r9kK;BFh6Q-tE+Bi;E^xHf3b2N3 zb!Ul8I<3zluXMVUY4dmYLr%#pvh^kJ(Ds`2*=~a%ODy1p=h1L9qBT#JeXRfJ8j-#Z zEbeHPWml+0OMfaGy<H}Dz#Va(vnAv$VvF`Vpe$VkP~(27%YaeNIeeVm;U`O4xEYcA zag!Tda`RAFAqoH>zMN*4tE_nt#ahgyMyb6_doh}{$`(t}6eO3q>`A$_TL8$c7s5Ao zIjv^WQr{=UVvddFMEK{g(@F@E4q4(l7!dP`7(`!*@_z+ztEhWS03nt_GzOPH-E*(( zCM^Mp7edUHnAN#J3e~C<5WGV{is)&|fFvFDYQ&YzCZgvC<W-5MZhZ_a=2a*Gzy=9Q ztu{U%5<qYX1!}9Q5rc8doVIZr4keJ5nuPE3DV5O!9ZedPz&mIn6lk?Z8vU38`0I7p zgOqup1b?_e6jjXlurWaEdrlJrG)ICWoVG1)WrmGZmqh@_MHdoS!yf}~_y~B7uqeM1 z&1o<U)HpQtd;IoOK0yUP|3#v$HCY@euXPLv1|I&b1QMXjxLAALMi2Y>(@f}rDo()X zk+xcUA2qV8Bo0iym588#zBX3JZOEQog9~5Vjej?rEy~{-gCZheEI7g6t+cwwPr_<! zk<@V8l%#s9z2;kVwZE|`kZrlLdRX1MH*P}K6wSQO;^kfG2bX29Z@<pfW9A1@J|;jm z#&4QI|N5OHxBes^<+>R8SRd>Exk!Gw8pq(p2pC<ac2oUxdy&`y!2r%Lp3I7=YXG_S zB7YF%V7JcO0Rytfd!i?KmH;4|Vom(II=ji@PU4lmX1(a;IY2qg89{hUV>s$`_y>FV zTv!YWolo&Dbm?dh_HYAxz}Gp6nQ4_uMmyWXs$qNJIJPmpNk)6H2OI1Gac+c;=S^%6 zJ!bn$@Fa5z?CfFvE(b|BkM@9J6XbwenSTu4cYDw*2bg%S8&cq451Qpbx6VJ^$H37Z zY>)$E^J)E~JsjoWYfjZAdytR=D>c$YlR2`7y&O;#1E=<&3{TfnAhHL@0sgZ`LrLu+ z$N{H_fyf?)og5&=@ir2Ba2Tx^{z$<?aJLeB(EPiohi<6#p_M200F|Vz)!m>ECV!UL zLpZRtF}A~OJ`@qz1Ivd(p>{Jw!+UQJUedq-ZL}F%ZB2gw_V&<u4F3*e-kMc5w#B+U z+{NA=ei<yDGxWjnmCxl72=?&p4^NK$f}CQ&uZF`8!5+T-_B$TZ*oAf<Bk!$(J-m>^ zZ3V$N_uJ>x{CyCNGjaBdU9P=gTpU>+g7L4de*m0Sol0T|+<gE5002ovPDHLkV1ibs BB|88B delta 1060 zcmV+<1l#+!3AqT6B!4haOjJdf(4dQyoMK{w-sa{xIa2ue_@uqX5D*ZoIVo5O00000 z00000000000000000029<EW(o00YEHL_t(o!|j&AZsRr(KxM-~&O>vh>uStM?a`~k zxmsM--fIICdzM!iT^&UU`v>hW^lv*OXV;=F`C1eWVZes@G=Ch8NX?6)_wgScGr-%x z@)K;M=mxb+K}WO4Y2pNY0*N!4LXq;^GQACG3zGon_%`%3V6=0NzeZR1#R8J60NnK= zbG~GLUt6M@0VY0PMpxS?yQg|bl|oLnRADV<n^fC+MOh7MRj3lQ3#-KdnB9_mW>@RD zQWnZGAeIMSSbuHEzkXiFM4%i;8Rj7X9X8Zb8B_DbaH=6c1_05DC^LNd^MlmN?!y!~ z@RI1DsY(js5IWT%K(ay&8sK>?fC3!UY9^Ug8!Dv$McnXHw|)pL4{@IY1A7k8px*nU z4FHl9YR)Zzj9TMX1$4nqdP@ONA&@VNH8f_JW5y}S3V#T|30g!BgU1lyPl^2+pv@Bm zz?^3}i%K?|0I++IFhc+i9H8!ZTgSIj@j^Nu>=u%F%KHG;$XClZd<H!7G&NrV4$v9_ z65ce)kNLZA#fCHZ={KM>L9o1`JmL@_0q*~Zi34zz`C{~#4j%UFw~DZZSOUm?gbvaB zK_T;4@qdO%I>j@bK$#ee!!ks#F5?Sd(!DqPj??dq;UosYf+WE2sj^t|k+8^11UcMg z4d@aQk8+DH@pBsjQ74%t?e@++N)e*0&JIa%aJ*}L>!Rr8@z;YsM!u!y7#_U^pJ@U8 z%U7AX^T(;T(Dcmvcpv}I0qWyzIVhwB%%-VRSAYMIP7)`eH-PERtcAJ-fJ-NVUJg!U zI|-<g-xDRM?F68*dI$2l(&H&8ex>h3FG@8AXvckqfZx*G91*YW;X`e?QDCv=ccBYg zdv6bOwg>*Z0IE!?b<o<y9=4g-gUs_XrZhoo@9n|%_Q3N}2psmCp*@t`+n;(*GMB)~ z9)ET}<RGZ#*&evr^l|{HGNbl@A_v^@T;7^ddq9x`Or3vzFr)ThdpR(+SSQ!^aF&D5 z1;kVKpjZy9LJpIU+QXY1Ks*F4?Liyqu9v{T9#{_em+dC(p_c;*(T&?fdy)eValVbf z9vrt;ZvGrXn&5~%pqz`O&D#XcxIM5+LVss5Z}Gc{1@_Qy*u)r{b8p^W+k?o5=0xqj z9W?JZd+-Wc0bq}2VbPlM7}`Vbx%ubZ=B?RA3tR7+3w!vvwfvk}ADmqI+MI#j9=`nT z!HHjh(*pQydmP%sm%skxhqQ2gxv$&1*uxVzzO7y`#?HQkmj8Rf7(3YucdGn%!5z3U e-UZ`d8~*?RZZO%nw~|c&0000<MNUMnLSTX<W&Z*I diff --git a/graphics/pokemon/rhyhorn/back.png b/graphics/pokemon/rhyhorn/back.png index dfa96100e056eea0ca1375ae692e021c75338fb9..d32c204aa60f83fcb64611a7b55b864ecf203cf4 100644 GIT binary patch delta 738 zcmV<80v-L_1(61jBu58yNliru=Li@I4-y;xU3vfj02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<ACWE_fA+<s&6IPbVoG~4AW9ej ztT`!K2mt>8|Nj90{{a900RR60|Nj905D*am|NjD-7`y-g00Cl4M@0Xn2lB-L00K2h zL_t(|ob8jpZreZ%#tkH14M=_h^W@b<McsO6BxN;RpKsOJF^|w^4Se>>t!vwlRAM+u zV^0|h<N!&QfA}N$@sB5y&+~trbj5yCZms}xe;N3C6>!bP95)5?<3*sn0Q7zT?QZ@q z(04^qRCn$jz|2Ka67#=As<})Z*BT(aw%(fea>qE|%eO$^E{eh>HM3s;Sidk&cZB03 zb4|o8P#-t1>{U{C<*LPE;bJ_iVmh>xG<mIdYRht-f4DmXwnUcP%+%mY4=?(#9ge$a zcWUrle)(|*$UWS{xt-FVUnfAMU1|6@Ca7Ay(S2mUF{|K1u-enfP9B}MM%|7<*ZfQ* zv$N+XV1{SkGk_qO8IABL$V;z)sDOj{at_EPV;owFbo%4B4JeO*kRtZ7CCL!X!2k>4 zlOVCAf5C!yT5+tM1WU1o6DG7Lj8RfDBD#htklJSlC=QVWIh6$>sRR4k?cIPrO^KYx zr%a7W0WqkehydMyGN;x+=6&6b6^ue-bi0ZrBZRPe9NlsZ05}|VEWEFp2L&eT5Tv%w z9c$fGZz8r`_-VsZ)yKdp(bojP>()g`2w8_Ue>2g+g!op0?7cP?fX%|n=43!T=m?|7 zOHK-;F+kIC#)ag900RPMunu7#b(qMcVYPTIXwZO2vafKrD)%b^>#g5xYk<CnpuhkL z5R=gmm0(MiZB-h{09Y3;XZ<dE)2$C%a?#dP0XYGjpRQ1o)x%zaH-GNW^MU6tT|EtO U5G&YI761SM07*qoM6N<$f~?I?ng9R* delta 685 zcmV;e0#f~v2HXXZBnkm@Qb$4nuFf3kk!u@&pkPRNFd*>2pg0%^`1tt9kZ=$X5U4mP zSO@?B000000000000000000000IJ<F7XSbN32;bRa{vGi!vFvd!vV){sAK>D0yRlQ zK~zY`?UT=L+CUJ-Nrc3C+?DrQJCQjfOFpx7g<qgm&ui##%_77+Liz@M-F`Dp5J?(; zIOR|&E7``L-^_gThso#pPfomIzv-4&fQ7pZe7Opw;$n`QmgwOk&|LuPy8e2%co(Rv zwrz*I^bTO=w(XecUn14q#fnM|;9pyB&3n5doNwJ*pl&v8o1&V@Z2-()n5Qeoae=60 zrUs}B%UAXxs=IQ-X0u5loK-RH8;+WPyi_|kUAKr-odIiROKxT^aK*<LeOUL0)w4Sn zcy53FJ_F<)?*81)@yGWQAkyqKd>9i9jo$b^kXxEn@WET{@nmO*PFtgH$Dnh1CZgHN z(GxJkv#tq%mrR64I27chRzOt1-h3&0<dQKCZ$&Eo@zVwbKLvypv6nSVhG6o423QCe z1&Jm07R2$6LYc%{iaDGxp(A6A5~C3z6~vy^KHEdF59B$iED%v0$d&1sdh}_^oE$!7 zE=(YZUKIrdsCtw+wFVL$%WAA(6dFQW4I~*Mgw*4ZwqpRm{-9%_<4`;*Fi{6DrFHI5 z>ZUpqv9A0d8<wg*cv6Y3WB^Wow=O_}&pND`iS{PMH40?sw6Oqe7FISz1HxWM7#v=5 zR3MH4ii$EWBo_qe5io;I2>YPJL?#WZ#cM&m21JtMfV)+B+zD7!ZZa&R_g;Y>5+Ej{ zAu7R^D%+|Qk^zt|T+aGk^rl<y*PMc_rvh>UC_i1kWUGgq0&o7@pXb9E&Sdfzuvfc3 TYB!fU00000NkvXXu0mjftHCW( diff --git a/graphics/pokemon/rhyhorn/backf.png b/graphics/pokemon/rhyhorn/backf.png index c5a253b3bec976c848889f03576a47c6973a3fbd..c58b014f865a7c38909e01b3638dfbc60a9ce737 100644 GIT binary patch delta 744 zcmV<E0vG+51%L*SB!35VNliru=Li@I4<BVuA;$m!02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc__Qj;llyjtFN_#ONN*DmFIVoBQ0RI60{{a900Du4g0RR60|Nj905D*am z|NjD-7`y-g00Cl4M@0Xn2lB-L00JaQL_t(|ob8mqZreZ%#y!}p0Vz))p1iuKs9O(- zq^w5j^Q{^?<`Md=fzDpJb#42RN({HD+a;q9kYtHJk{|!Ti^c8S&PSc){eOVZ;ks=Y zhWlmNzFaf+MSoG$4|n``z|2KalH=VKbD4T>9vt&K5li#l92n<I`5qX$swiAiGy4j_ z?<rOX!ts&0A>t0Gk57Nt>!j|=)m2rw7%$3LjU6RT-l(0rvb;;&UjTa|OKxUraiwRz zY{Y&%9p2oj#dGuN>jfZ>a1WPuN<Y7!0g-O2;p3d3?tk<~kCFY8Sp^@0)t=6F^2Bqa zmUGY@zY)po?D-W~<2eirAV_9LBRmT7GAJM_;Ap;_19Hh6hc+U;{`g@7$}=FOh`sDd zG6Zulz(V*WNGxfzAfC1y8z;e1?BIk6O@uK@N=8K2G6hom`Uu4#av-O&KqPfw-?+(* z=+lbGd4GJ$)S46!qbiCB(2po{WesGWntrZe78;{F)GQexgw^BZHgf>L;iO~XscxSY zSg1pg#yWRubW^>F*!SU^4NFy@0;@#dVAa{{)<sANS%<YY(ZPiHPJ!&bHWq-*!pi1k zKs@RQqsL253Zywe+jGW+<bnVr0%oudVPABZ$YG>mwRkOP)PP7b)wo-g(^kNG>o?mP zpsyh)FhT;vWHdx2*ivO%l~ytU)`iPizl+{<>%*R0wDnX#&H(4vD>P*Fuvg$8|1h`n a;pZ2EqzE4@WoO9%0000<MNUMnLSTYY%T)FN delta 639 zcmV-_0)YL12ABnqB!4haOjJdf(4e4TNO&+H@W7xr7zp_I_{flO5D*ZkI4D>M00000 z00000000000000000020-7yyc00JXPL_t(Y$L*BQirYX8#zP3?EO+o+*WSfBF9x4? z(jk6<mY&B>m1`yh>k+nZ(AVuJc{ik8LNBGK4A_pXpQKNJ$bVvSKlk&m&hp_ez$bs( zR@e2zvMY|a%vIaA!{aj@Z=2h;<3yVq<}OxLJ|?0MB9`X8-xAK}?juk)W80>vW^yBd z-&3r%jN<}P$xIDU7he9b4^iEf8^&==AzYQQ>Kl%lyi_|kUH2TRx&n60mfXx-;EJzw z-H2U(-oCqYfq&=z`;RL?p5X4U?Hs>;xd0-~LBoeR!O-Z9p8~lTvkE?Vt36)q?3m_8 zE$5&cdMBdU$<Z6I#<Q*ofR{{!MmQAYq*g#wz{z|md*qTi4(~-O{qfBPlxIL#5qsIO zWC$j2fQ4{TkXT}GK^z|_lu5j$*uV)Bniyl07>x+2Ab<9(_Vo#heIU<CWr2w5K(0(v z>d~hab8`5UxiBdpdQ}t<pz2ZP${I*CmDOCqEHs3)9Y``l2&u<8?dJf1{aMFC(@?xB zuuumtrFHIH>ZUpqv8((~8<wg*ds2z6#Hy3itqYLgvkq%*qP+=mjRM&@Z7cwrg_TXw zfN;_g26%^;92JOjfTE&|3&{lmdIZd16T%*Kn8>7IwRkP4*MLYe4Y*sC(?P&G>o?gN zps(I5&_e>mWHdx2*ivO%l|nKA(uK=ezl+{<>-~;Xu=P|xE&%1X%a?5RkW;|l|AznL Z`2}Acx0P#@))oK&002ovPDHLkV1m{1EbagR diff --git a/graphics/pokemon/rhyhorn/normal.pal b/graphics/pokemon/rhyhorn/normal.pal index 19493646a0..01b9d75955 100644 --- a/graphics/pokemon/rhyhorn/normal.pal +++ b/graphics/pokemon/rhyhorn/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 +222 230 230 +164 189 197 139 148 156 98 98 131 -222 230 230 57 57 82 -248 248 248 -164 189 197 -16 16 16 172 57 41 -88 8 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +90 8 0 +112 112 144 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/rhyhorn/shiny.pal b/graphics/pokemon/rhyhorn/shiny.pal index e207060d75..8fb03a0257 100644 --- a/graphics/pokemon/rhyhorn/shiny.pal +++ b/graphics/pokemon/rhyhorn/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -160 96 72 -120 48 32 -240 192 160 -56 24 8 -248 248 248 -200 144 112 +246 197 164 +205 148 115 +164 98 74 +123 49 32 +74 24 0 +172 57 41 +90 8 0 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 16 16 16 -168 56 40 -88 8 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +255 255 255 diff --git a/graphics/pokemon/seel/anim_front.png b/graphics/pokemon/seel/anim_front.png index 9626b88941e7ea6ff98e5b83951ada9994d4972f..5e1923a644d9a276e710aff162937291e08176e7 100644 GIT binary patch delta 1063 zcmV+?1larg2fPT7B!35VNliru=Li)9HwAY_k&yrZ02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_=H~X*&F++(v_VpX_U66b#dEZjL26nM|E#RlbAMWkF(Cf{|0%4b5D*am z|Noh7yGQ^400Cl4M??UK1szBL00Ur2L_t(|ob8vtYui8+#}BN*P!K$yhD?TBJe!=K z3Y}ERR+ko>ArUF`ujrJyghHY84{!qAOXot<{x8LjG_(|MY4-HJlVr>C*%`VOKO8&g zef;i+{O<de5P$plmq^pCsSZ+Z0uXM?Yo$^TD7Mtl&{Jy60L0D$QiD>576{xU0F|&n zpj{<2r|JrGM*(0$DFl$va{-d_IKs#PjFbcL5&&Zm=OTfDa?K%usStTYs2UpADw4ja zfZouR7ao@#^EOW%GgvOgIeK#*?p<CL*s{xY=m!AYet##I1MC7ix&->WCa?>r2G~B! zx&X+zGw;=TKsS&iRlbMrW$1bciO#n0U{H^MkqZdns7T5JPN0+aR3Z~wzzKNN5%lc@ zj<x{QvD^@S8o&v7+!F!)<qSAhVb`dsG5QS5*OPcGQu&AL^L^L^P|Gw3sGHz~79l6? z5jxa}5Pt+e2r##_&3V|GBl7467jNkO!!2z>j?@(1>X@PeM7+&jzk`eO^GgOWO_f?U zuf53!S@zOgWb}?mbD*>en}B?B`Z(hVv&#^1#DH3MX98$`p5DFsnq{YV*<}=30LM$f zGe-Dl_s>7S&z=&Hqp`$by}yh5o9nCZCwJM@6o0}@h#0PKmS4<1%{~^-&g^C1j8*%9 z@EOR?>aY2xbvuOkJ-arWSDRttUD<u?V;}!>cn<+dT>XP#>;&|2mG7xROowrsBGt2> z9rjwGr$M%elvIx|X(aU;vLy`S^#ZJVap^JC;BZ6aC#CAe)&f+Pu<0~d)U4`t&;m9; zX@8WkqQ<JX;M0Fp0_@!C0#?+l>XD%{s90q*tj=T4ikekD$-WrTEI_Iz@S|2eUW!k; zM#~xxmO$5vnpM38t<GoV9IM9JO`=w-9?dddu!~6=rnF0PR;%8E9WC#G*YKQO617_O z*h1*Gckhy%)vBjmUW-KS#g|I;w9{)9_kZ7N)hmIcd8<S*yD3$Vbd~cPUdz9lS=F-! z#Njc-BL=cnegjB<vFfezZ4*Mq$4syh(R$k2uhhOA09FQ$e1&s_@~Hx3R5Zp2n}Fn- zgVDGwQ^r)ZfGAq<M>!Lmu0J~%a$nJWp=l_IsiA0XfiQFW>EsFhW+%?ajxzk53?R~u hJbMa%XMP{M;xC3YBr1!J(_a7p002ovPDHLkV1knV`uYF> delta 997 zcmV<B0~-9i2>S<+B!4haOjJdf(4aw5gOr@K=H~X*&F&Bo5cv4`DXgSwS`f69LH6do zh%g|~a9H@LsK~H@0001`2ulk9000SaNLh0L04^f{04^f|c%?sf00007bV*G`2j>O{ z4ly5;$!pF400Ul0L_t(o!|j$mZ_`i|hV4j}DzVsc5~Ls`e1BYbV9Py@RK~csyW{i@ zRO%3hEX@4_sSprG7TT?u(z`Jrp_cxFvNF;97tXzIzU-S+f{`3mt(x=XocrP9_qD8T z{6pBDyEX@bYuO>Pbp*t`<NAo$G7}X<&N~OF2qO>z#+;)LV+lZ2Lg%Y3a|fgnd4;;E z1JghfB8GTq0)HsOAOX=s#!Y~S*cKT?mW^?(V>&@>rIrJ!W!1PyjR1YB0iUPFbMO?E z&<WUL{Y`~&XY)<2JLP$Sb*H?1m>Ymfxc(;R4K@Lg-xH>r7O)8jXMp=i0gTLmKg%;S zV7F#K5|}%%8315hgdacjU;w6VRQx#d9ts$Nz~>zd@_zzGz(-Ca6<`czfF?Fp^?R@e z@YNow^jK@aHSdwpykJK8!a-HQvi&`E5j|C<1XKV6->*}$)h8e*bqG~q|7lN+)d40E zR9Dwn(ND?8FZ65w^ngJG0S$$>cuj>!#J;@RKYMj?@rC*W1YV6VhF4#}NXmDwFQk-1 zpf&7r&VQ5oG5{lxD#pzTtpK==bUsQf5~IE54OQ7AAgd}M2^Qm9r%69<^nZT89uJz6 z2%=1vsI6?pX}q1@-hCZ3FNJWOt|AKaEuP;`r^1u@(nOb+UJxe)9LxFAMd=0M+)lp< zv1#s|?pEfuv5o)N<2?rW?vmp(3h#?0$7k@2Hh*>&jxR8HMh}y&J9B)8wUTEfbH#o2 zCGGeOp0TQJ9&;ZY-$Bs^*d#0J!?xCsxa=8~(Zg1l>lWKBc}APPq5qX%Z2MRjz*)gF z+AX2#t165P8;M52Guo|FN;XJcnA(a{@{Bv@X9S2NlI|YuuIw2{@-qSNkH{O)D%~C{ zcz?znDJLKB{OW3`0j5u2*)#5pUrKRKvNi!wDi>nG#_WvyTJ{1t401QsE{MhD;Mq0F zVqXp;v!Ck@e%yVMdjw=TkfcSuncm*tH2Shm!mIKn6XKAl{pvO^GkAz1@I(P}kuL$> z$@I4ni+ll4wnS86DWcW1wpX71F#s?#XkMOY>`=ilH<8_?9znWdq3CiTs^w+!s9Oaf zihAl#z7nXfint(u7NtF9ml$|Llr>(Y^yp+hJ+svf`tM|r!DfFT9I<^#{%!mLdtwb^ Td)Ia$00000NkvXXu0mjf5oFUL diff --git a/graphics/pokemon/seel/back.png b/graphics/pokemon/seel/back.png index 0521176e36cfb15363063a0f1e07fd74a7083c38..2c7f8706a3d70262114b6b44687d8cdb7dde0ae1 100644 GIT binary patch delta 560 zcmV-00?+-f1mOgbBu58yNliru=Lir3Fb<tWIB5U?02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<ACWE_f9~$))z!_ktfYf`bN1%F z)xB!8ltF4*5dW;K)pJ^lF(Cf{|D%zB5D*am|NqV%jV%BG00Cl4M@0Xn2lB-L00D(b zL_t(|ob8jnZo)7S$1UMGk_~e!Um}&sg1}56@th5{Pr%rX&V5vbGF$2sq&|Pd4y9!1 z)QbO-v+w8of3ic!UH?Ga5kH-c0S_ZUH5<vX<EPsh#2CQ1x?KVT8CS}~R4KLaMwtLB z#@3cwGRClY_1txzF$Fc-tR<wzFN5Nw9=on{s7p|rlewl#>j!9-4E-GZENRWA#vv8@ zxl$l)Bn}{4h}tiA?mQ^8I9gCxVCVdW@Bp08;3Zv&f2Jd(!TX`<0l*xYa(314%4p)W zGjH24uvQqW*9My$001?tBOpzPn9!?AcIMZBO=2Hk5y+c11=1787c8<NncFOMTV4SB z4?^_Gw~}j;wdH1&0Pp+otne5PmNr_qRq#I@4gsKMY42ZG=5YjK9s$f@?1{ZnHtm5o zG5{v-Ud@C{`3?lXzim@P$UtxsTPoNv0_gtTVi&Ty^cTr*fB=XzK0xyDGe2a(jo?SX ygb_j{gN!MtTbD3YzDP^BroPMbuYtS%guVc0NS9S_0uzM*0000<MNUMnLSTX@K>a8H delta 509 zcmV<Z0RsNv1g->-Bnkm@Qb$4nuFf3kk!u@&fOv4QsG#WR;Ly;>5D*af`1tq$_-I%V zu#iCT;JAn|Akc7F_^7DZz;FNn0PYcy5&!@I32;bRa{vGi!vFvd!vV){sAK>D0f$LM zK~zY`?UTK7!ypXDA$Q(`WAFKJx+l=?HsUVb;=Aw!z4LSQIWlx^^Il!^3`Kwer)fNY zbZRgEAra_@B!o=v`VX3p_~~X0cpL$W%}9=!*x$||#{e$a?GiYsxMCirjIp^lssvba zzOdYibB@Kchpu~xDX7`zEg?DnbEx<1sp~q2x&*m7*=V}5et>et(J#RFlIDDC9Ezb| zFb2v-5&+VL$o+EW&I3bBpar!BW)81^r3c_}059cAG&e#TydTN{0OrV;vx~5+qKVzk zyj|Jf1;bcDYrNzD0LWnx0cAqOgkD9mv%3bY6Z`m%KvT9Uke)bxV38%s+-9xY>H;{u z5~58WdzD6$tgY6|1b933V}-}Cv9#2>4Sje%pL>9srG0;0nBnM&T?8<Pu_yLuN%=Ma zpJV_`+|2Zk@*U{?{<TdFVf3*RQ!4o|0_ZTecneir`s?H~KmcSKA0Qe0%r{vIBlr<8 zVWgBvBV!8c))frZ%+nICX`f!=cfehLK!kh&i$}t1%A&Tf00000NkvXXu0mjf1Z(s< diff --git a/graphics/pokemon/seel/normal.pal b/graphics/pokemon/seel/normal.pal index 2868415702..d4b4a1c4f0 100644 --- a/graphics/pokemon/seel/normal.pal +++ b/graphics/pokemon/seel/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -65 82 131 -148 156 180 230 230 246 213 205 238 -16 16 16 -248 248 248 -41 172 164 -106 90 16 -180 148 65 +148 156 180 +65 82 131 246 230 189 -136 48 32 -208 112 88 -248 168 168 -200 176 128 -0 0 0 +222 197 115 +180 148 65 +106 90 16 +255 172 172 +213 115 90 +139 49 32 +255 0 255 +41 172 164 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/seel/shiny.pal b/graphics/pokemon/seel/shiny.pal index 43d60b7753..5b3f96c960 100644 --- a/graphics/pokemon/seel/shiny.pal +++ b/graphics/pokemon/seel/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -128 120 112 -176 168 160 -232 232 224 -208 208 200 +238 238 230 +213 213 205 +180 172 164 +131 123 115 +246 230 189 +213 189 106 +180 148 65 +106 90 16 +255 172 172 +213 115 90 +139 49 32 +255 0 255 +163 145 128 16 16 16 -248 248 248 -248 0 248 -104 88 16 -176 144 64 -240 224 184 -136 48 32 -208 112 88 -248 168 168 -216 192 112 -0 0 0 +255 255 255 diff --git a/graphics/pokemon/shellder/anim_front.png b/graphics/pokemon/shellder/anim_front.png index ec58b85d150a3d322c39e3cca2db33a184eb4198..110cc99bb8dc3092b415ec15448a3e49feaf60a1 100644 GIT binary patch delta 883 zcmV-(1C0En28sueB!35VNliru=Lir4B@VB?$oK#N02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_-rn}bz3!Zg#dBJVN;zWgthB{qYI_hd{{a900Du4g0RR60|AT{+5D*am z|Nmj=dpZCB00Cl4M@0Xn2lB-L00OQ_L_t(|ob8seZreZ%hBYW?CjpN00zIp1frfXh zkmzV2lTlmJSdB`ij<v@Qg`+8NnADB!!b|8ku*#F|3_T|3(y96f%K$(BJo*Ii4}wme z{*`e52oX`NhkyNx_K_+TuOuMqYxkH;7=Q~20KkCl*}*~~Sy(2NQi#f${wD!gg0|<1 z88l-M0e$dzKkg^e6tSxV18ENu@_{r}1MTXu0?2)fFm}IH?t`6{K9Hup)410fSTN<n zH|Qbe`0kWlVodxYF3%7k155|pW&pmySq3H1dOzpDKYu}F%i^9`nPCU;fh8<HHxG`; zHFqd|APKfD@M8xln33ON!N88_scDuP@}UQ?wp#|aO|ydnGwH6LT#N0l*=1&EjbA^Z zhV~AWtx>q{Y($%ysA*`Gtyk6?^dv^Qy`9n11MvwW^nfVFtJ!pVM}#>1;HLT$06o91 z7{I~-f`4dJeXXt$3&>Fff;j^>MFwPK;7!H40Ykx~@($qi)&XCL=Z}OJ_6U3vO9%a8 zK=eK;npbzP)wzk>yHlr5|BYUZ2gkaL2l*?&%kdz*cm^zJ0r;t1>o!2V0Pso-c`2qb zf{`{(2mtPYN@*BN@qi-=*ml2j0FmMW0~)|(0Dn7%m1JRE0&z`DPl^XY=<52MfpOoA z76K6SPPQ%veFP)aT|{vsv<W1U3<m5DhXms12R`C4!^E6GB;Yy2fEX~28RpVu7!f#R z7>z9;+=YG4FnryRdD}mNq--<H8g!~4_qKlo6j4jiQV$IJ+n<86E#KcifHfoxdZLNy zyKL6N<cpQ{fC-K^GZznN=mM+%K0IF4)7$BcXoW@Q{hYO#S9Ntgqt!6Si3H56Deva* zILr*DGQg^f0+MAe0&e@){N9#}NXZGLuIqsRN&ZHXL8nfCqu-HVH9Vi4li&aV002ov JPDHLkV1k$nk@5fl delta 781 zcmV+o1M>We2c!m&B!4haOjJdf(4cTwh}hWhn25l@xabfN5J)&+fPj$r`1p7bFu-7F z=%}y&00000000000002vsK7)300OT`L_t(oh3%HHa@s%;hD9OIB$d}Em~m<F3tZN^ zUg44&1uuq4V<DtGfya3PW>hAH3z;W?)G3T!E_(u8<kobl!hc^NX7=OXTcpwcL2%MZ z|4OjCbO1oCcLwL}C9*b2B_JGVcUdeLz;g*egn;eYL18IbC?>4609Kj7y#S0+s~gJ< zm^q4o-g|tW4`OMG#MP03sE;xEKor@bcJ;&}X1+xyalf_hgPq1c5Jmm#q~97SG{wj_ z=mTW%@tR!{h=2VdF0KGEM~H^pW{AGQRgMMGWH;x~KS8L9@{w4%VF&bqF^;}f501z* zcPM-y4yG;eeTfm8uHRzBz>?^$s>T|#o(Hg|QwFA0wZsx~f6O4bb1kOJYMGm!GJgGx zD%v?vJ^|r&=UtlBL{&v;K1r1~=ve~v{Jf^S2jUZi;C}&O0+;K}=7|WP_sLE5H-LJz zZ5V*k0fK1O{A#uUC1xN3!HR*GGDk8p@V;TaprPQ_dIxZN=YZdI&&LrS*aPrGEbaA` z0nz)QaMe5=t8){%_em$6^xx>scyOq@c#s_d-i`;I^H)Hj7Jx6>wQd8%8vw7w4ll(h z0W|kg3x7m(2eek>T#5%AQBbw}odbvz4;avhE(54Jrjmtn3B)xqeJLIU9aq;k49o|n zE4-9BVGP|NEPOyCy|km<2yFt1C4(Wm<354-`GJpk$S?^f5D9qAFenC$Lx#C<8Ab&5 z8Ad}32=_w0W*ENRn0wnl#JFfP%mj60G4r;6h<_APOVC&k4fxxif}$-yK0cr_Bn*0{ ziR!1;!epaVdB6g?v$cx{)N_H=e;#fx>&^3KO_V~JOZRHFYU*aYrnHyALIPIJhIjK% z=;a0?8DQ0AiSalS0k{2Yer}6VXypV_*LA@EB!8o$A>gEwj_42d58|kPs{6D60000< LMFvhpu0mjfMUHFQ diff --git a/graphics/pokemon/shellder/back.png b/graphics/pokemon/shellder/back.png index 6a402e9ea12a5de4274d9b9ca8efbb5d3117310d..072f553407242138a21b2ea1ddc6f39d059c3344 100644 GIT binary patch delta 430 zcmV;f0a5;|1K<OYBu58yNliru=Lir4BryQP)Pw*402g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<ACWE_fB(%X|D*ukdjQ2+0HiSh z|9e5rN+5e65dQ%G{{a900RR60|7vP#5D*am|NrVbxR?L{00Cl4M@0Xn2lB-L009I^ zL_t(|ob8c8YQr!PMZK`M1tm8aDcjQOYqp{BDBDmf`~C$d+n%9g%Py4(WL@fy!Jzm2 zHIl1p%a(tdfBNl#(7FeL&|Fc+81J<u?_S1tJefU0%!~1t&<KTb$(a4CF=j&b(mGer z<+||QWVeOTz?0jNIgMBob*z;DYKa`>xUVbWP>zY9pw0YQoVR!{gaIEv1wqsVmj~_G zF9i@p0zOw)#UQH=Swye^p(}W!%V2A*5+DIM+oIx0TziqcS0dAcM13iw{2>@qE;t;^ zEz-2}YzYrR3Sq#Izs&`lf^adzz<oTYr9dZ5d@Jv%(-ZcBqul3JpMQbeW{wr#vgHru Y8wHk2qD62scmMzZ07*qoM6N<$f)wn%f&c&j delta 377 zcmV-<0fzqI1FHj&Bnkm@Qb$4nuFf3kk!u@&uwWqg*l^H*DEP225D*Y}Fc^S<kofrc zcpwnSNFexlKmY&$00000000000M&KGz5oCK32;bRa{vGi!vFvd!vV){sAK>D0R%}z zK~zY`?U6xl!yphv?M1x~87BuIIY8;h>=Dzf8(Gad7M1URgkrF(juk2Es{TSkn*aEJ z%s{ni(|=XHdjhon2|zqY)JmyGY0>)EX;*uFf>EWYegO@!nMzup-n7=)s(B|O_;6kP zbEaDXG_dT?toM_hq*7Ze0NgTrF7lsO#znRXlZ>|b@8oU3T>w44egX_75>5^}IJ*RZ zpcwdAJ(UB8#BhLuBft#8Z&Dd9gpeF$AObiB5%H385v@%Q<%P(j1Y$V|hpYoGoxCFE zn`eq#Z>W<~_T_8|aM6$xJ@jr=$G8NfPNTcYcN)@!BcY?mel?aapxf+Y<!{>bXH-?+ XdFe)bztKe800000NkvXXu0mjfdEul^ diff --git a/graphics/pokemon/shellder/normal.pal b/graphics/pokemon/shellder/normal.pal index 462bd5ee49..519374444d 100644 --- a/graphics/pokemon/shellder/normal.pal +++ b/graphics/pokemon/shellder/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 88 136 -216 216 240 -152 136 192 -192 184 232 +222 222 246 +197 189 238 +156 139 197 +115 90 139 +74 57 98 +238 172 180 +197 98 106 +123 16 49 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +131 131 148 16 16 16 -72 56 96 -128 128 144 -248 248 248 -120 16 48 -192 96 104 -232 168 176 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +255 255 255 diff --git a/graphics/pokemon/shellder/shiny.pal b/graphics/pokemon/shellder/shiny.pal index 4ec99543dd..a653db1e00 100644 --- a/graphics/pokemon/shellder/shiny.pal +++ b/graphics/pokemon/shellder/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -176 96 32 -248 216 112 -208 128 40 -248 176 48 +255 205 41 +255 164 0 +222 123 0 +197 90 0 +164 49 0 +255 123 65 +205 74 32 +123 32 16 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +106 106 106 16 16 16 -120 48 24 -128 128 144 -248 248 248 -120 32 16 -200 72 32 -248 120 64 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +255 255 255 diff --git a/graphics/pokemon/tangela/anim_front.png b/graphics/pokemon/tangela/anim_front.png index a42e81c244f92e925e9a8beca9dfd0b044b8d146..b9b542e28fc5a55a1033ed8d4bdb5369fff61a8b 100644 GIT binary patch delta 1185 zcmV;S1YY~)2(<~2B!35VNliru=Lj4PDlZ{OKwba<02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_l-2fHq|HHllpsM;|AT|xN@}brL31f7{{a900Du4g0RObKv{F)15D*am z|Nr5RXzTz000Cl4M@0Xn2lB-L00Y@cL_t(|ob8ssZrnx?#tD!`DgwNy4xqU$ToDpy zYvQy!ZP?k!6P(|`Oywq#pvq5`*1i`opaV%*jkIo3%4WWyV)*z+N*Nfq1r9jee4Ibu z5;wmnI-Vc&Fn^ytAJ1sLc_tp8u87PN3dW}(5r>Z~J)Ge|CrIFlXhD&zHWA}-<BZ5s zBMBMKR;F;8LCib_1g9AakXBfGo-3R?6)DJFtWd}oG%Mnru_R=&6SidWWnRNO3eKFK zaPXGgGzAN_PS_bTB||W+!I`C2m_5TNwoZkIad>PETz^_y2nbycf`ds4OmLwNc4`(4 zcA13t-vuVRfD00WQ~{YV1c^ToB%2sE%Kh#`z!A|Yn9IX1ip)s(*gu4@dkEfB<+<FC z1mtbF>HBck_kWQuxeTLtRIGhbso-<p|E+>*Y9tJ<KHoe%3QQ~IM3BP0u0oS{Hz;Am z@_u}wDSz&#Eir&L=?pv-8a0ukM5AU(R|T~jU&meIE*n$8MQ1{%R#84~qIEegK;KHL zx<>6DC&2rVBVJlp!lcs8;t(JKm26AOnPK=O9-UKz3uyfysMt?^h_heP&f*rhqCBv* z(+Y96$EZc#aYLTDn#Q9@Yht`S5VdyJz~lL;#((sxnLqv*zpmd6IqG-Ig3DL0>wO6O zw63og1y|c`t;uiem)pf65Dd9*-)xr!>A&u!S5F9L%Huhn<N1+J%>NNTUp=oVu>79n zoPkoX5}p#o*;y3RCUUdI|4jf&i4}27BC=T!BzQV8y1R>ISOTTQcG$}bOLifJ^XD0P zqkkEUn-yWjm~5pxOE;HgJ67lj37v>1W3a{nO+y>scW1mh8!!e<US!~qwXV0J?{BAA zN6JBYM=tYaH_*&TfWBRB%>Y2Y1*)u#+qi?>nV`MgdPa8uJ{E&+r8r!!LQeTb8Huz@ za%(<-6jg}gX65a$m|z#y=V(ySAmX8u(0?g5lArwP7vNR-^`lY_M2dDivMSc}_q!g5 z(SPVHTJc`S0^_UuFT1Z{*FQJ_og&13B)~8C{rj(>e}5xXDT0g<19a7e9wol)dQ2%} z#E8!#m=NSnNvnUT6zE0>asIPDkTd$P(4-DJMhv_ulsEZ+C>5BmvodxeDJV2l4S!4w zhzTBqF-D9uBy?Ts1?i;)TxUCFkmSY7KY-n>tegDuH_z>UB8V=xzdKsD?3)*_wr$BX z!Kb?ZlX95ce5&7sSp~&{`fY_<u+3Fnx09E8=(EP}6nvS#uIp|dA5wtPLX#uaQanm; z-zMs@3YOwffTf@axAkm-0}(7vj~amSznp&n5%HMz0j1)700000NkvXXu0mjfSjQqs delta 1104 zcmV-W1h4zG3FQcoB!4haOjJdf(4awkl$6!>TBOY&K~fM95K>Z7w6wJN`1o@vDXb|$ z|AT|xN@@TA000000000rQdzSA000SaNLh0L04^f{04^f|c%?sf00007bV*G`2j>O{ z4=Es_cC?)U00YQLL_t(o!|j((Zrer_#wCDSbmwOd4^YZIfPegki|jO>H(iq;#}16_ z;{!B-4$ws07HAfRz0IOTE>I*V2z01?k1Y`KkKAnvcmM%{=i~eH%~0>>#o~GWPZ!bI z)B8DZwomLYFW1cWgo5x%S;XTba}Vcu&<g@MW}Z<b>+OQ@xb;?Ku8@Q+<!hUIjUZO$ z1eZAyux8jentv+1zZ6N?U#*eIr94UEyfrLr^9wR;@MW6Ad5+#*UQl#~{Wt^(S6;|l zwi!V%&Oy21N{Af6C^BA!Bae-ROB(|Lqsm@z)JcjCuGGOs&EnoJn^5^(U>8?#L1L5; z5eZGOxFbQbUBX7W-o1%fBH9H}c3ef8TZymReT=((bbpS6qpTbV*qM0Ow(+KIe`A+X z76<!_bmP*Xf|qUky9&bCNEjSm-tGSp*h;dIU<LP@fFf`1kiv?ga(JLCoKKaZ0WH#7 zcq%+7Vucj7nkh|)YB#=?qvM7kg^S+CMy=vvSVZLu9Dv?R4o$6gm*e|TU_UcHgGrg6 z>_dP6oPUwYxFCYz;~RC(H4dP1y&#awCNIt}tH$6IC~y(Um~tX0(P~;WRI?)r<>cCH zPPA7<=E}tR_xGm`-K(ZNv47uv=woyr<^>O5zIJ7d<*MuMX9bUkL#M%SyU&O6grJXo z`{^(*SpDnX>hXkNqI_P@>v{b+Yf1mHf4+WNk$+;eourtaLGXirO0dk&7E26dZ%+xp zAWH=pn~2PTPJ*WstCKmMM<FoC()3eTQOL}M@a{ZkXElQLlO&{&lCO0l>0B~owv!eT zz7WUOVn_pt`ZDCGg|i+~P~=q(%Gl`e>g)bKnionrMZ-RKS<|!1K!Cb^VQh~#t^$Z` ztbgD7;<!nMz!9ng&XHJDE9vp*6!uCdN<getvfmI5ezHXrCWABm*nwRbj>DS*7i@@) z#73cz-RLJh1&zwDua#jSQgEYzRZ9(jy=wsw?VHA+6z60pur6G`-@S{wcJF~}3JB#u zfWKU~Z{NlC?VWH?z!(Aq*r|yvQoP@_=zmg%0I@t<z=S9_%2Dk;D6S0v;rwTPpdi#A zP^30G1PI&|F6yEOkN~1<j0{~!QjRr;o_K*M(SaYb(IiaxKGOrzLyI`hYD^f(i_d=m zsw>&l#lzo@s>y79IQ->#Q<1A*d^uDZO$4vH?oTdYa{a3N6ek&U=yx9jPQlcVT}fA& z>6-&==qipbE53GJGxzQx1PCnF1wzgK6SBJfn5f4pIDrKqB`D%;S3b=St7m-pLDx6( W{U@M}Lwm>o0000<MNUMnLSTXybPS9D diff --git a/graphics/pokemon/tangela/back.png b/graphics/pokemon/tangela/back.png index 0cec14c7da0692f64e43568c09e38b6c8a1fdc43..7a491bd9fdf8921ae6fc1c6952d71d0520a34cff 100644 GIT binary patch delta 731 zcmV<10wn#=1&9WaBu58yNliru=Lj4PDkCWV40Qki02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<ACWE@f1uEa|5#Ya2q2^&5LgiZ zl!M+{YOE+hb15nR0RR60|Nj90w6wHRQc@5Q5dZ)GjHN^700001VoOIv|D^}=#Q*>T zEJ;K`RCt{2Q!$R?FboW^t^;`29|+~zxD#0mIgz#gUj~+Hzu|`VS_m%tfGa{520WwT zXh>f!?|RqIe<gOjKg@ppgzGrU0BHC<j$ijz{A2v2IggV@qH&yF34ee`x{VW|Zl5m_ z!_9F(W2T}M{v`}X1YDGE)5ax-2RuJp)s<$)d8IF9wsf)hY<1vOpi!6;k#Qs&c0W%9 ziJ4|L6(Y4=%l&kT%$YLjZUV0i8I8tI1Q^%}B+v>ef8VB15b1&PWpIa;W-x*#<|?;| z<{lx5AD$a=^X|1Y78-Nt20c1Z;EOk-P#KlSmAZjQON#-pYzngp%#zWu6NYVr3E*ge z92O9(lE!WVb;V}}PF&!Yr3y)0I&5X5#l&Z^*-B`X5=Pevjd5;qfvp(`RaCrFI^}&f zv_#|pe;ZC<*-x}@!b%bZiYxgTcS2HEc%1$af`qa;LIRVpAdQx-UjQ*{sO}Cn3x&)T zaa6va9hx_1&D0vE2!1#S>0qo&_7Sp56w7`)5M)nw?u4Q$oWg84&(*V}dE<DD>-qqp zae@e&_gF!|aBJf;>+JW#I$}oX-422(+r1O!f7C#zcr-WxV(Ovvg;)@=!<*)am7S5L z;KZqM^;OylwZKX8sA^)vUVpnlbY{iynM>jZPYI?|izlJ_uG#JaM{$kWZ<U6=RG6nT zFeCg~RuYMMzsvQUr*DMcGQkL!-3*?`^TzqcLcWya?H<$RUH@7A1#idf5|%VrUjP6A N2>?k&PDHLkV1gcjNap|m delta 675 zcmV;U0$lxw2G9kNBnkm@Qb$4nuFf3kk!u-$(4a_=NQm%QXuv2aP$&=(5KvH1u&}WB z`1o)rD5yYC_>hp;P;dYM000000002W=tqSB000SaNLh0L01m?d01m?e$8V@)0006h zNkl<ZNXP9{L5|xn4D<rdy{xDQtT!J}DBr`1x<|15|F3jtZw#Yp?>&S*81RgSqai(i zyz5>6D7O9mVfN#1xK0y~fX1KG^m%{9Kc+9qWx8q*nWpP2;TP~Ax9KXV+t-W4cyk=k zRHUk;KMA9W0B4okb){O;1D?-Tb&>2iE%K>E76%Jwt0OH8jY<?njDpy>`8g3d6v<@D zB5IqK`#B^E6)B>d3A_qqG#H%-Ft8DSgrSvUxm{C5q&rH(=nk7?Fp@^1#<#2FBSK+6 zoV!r>?yYuWnMyhgdUT+`7p*3#5voj!90r2SJtV-qD$GVOYeC0@Fs>_107nDlFoW1s zG~`o|7knn*LKSX_8w-c|fUT}F8~ZF)TLg__#OMw}C!CvIVC@D%V`c9YpYlF`8<_)g zfDI=QZzuXUVG&LY#YKFK8zHJIJf8j#0;jq<A`FwTz+L9`xBz0-)Z86xR!M~#;%Ib# zcIe)mv`FumBKT=1#GSFs#YafWfvx!MK;SLed=RQCQ%u=#o|<PVd8M$A>+%4hQ-lba z_gFx{a9gKm)|e!sBEpQ&yYB>lRkHg*$gzXa@Mv-Z#MDDM7Gg%k4zF4QRyHF`#)+rK z#aC$~v<fHDqiT^1d;RSK(V11lXR47pJVls}Jv<4`cg;2zIErgzzf~NMrNTU&ff?b? zvKocW`wf?V+6cd8gb}Kn89a~k#`(rVzSjNi9^>$?|Eh-JH;DF`>T@3s#f$&|002ov JPDHLkV1f`OHHrWL diff --git a/graphics/pokemon/tangela/normal.pal b/graphics/pokemon/tangela/normal.pal index 03893711c1..fff4b5b407 100644 --- a/graphics/pokemon/tangela/normal.pal +++ b/graphics/pokemon/tangela/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -65 123 148 148 213 246 90 164 205 +65 123 148 32 65 82 -16 16 16 -82 82 82 -180 180 180 -248 248 248 -115 41 41 -172 41 65 255 131 131 222 74 106 -0 0 0 -0 0 0 -0 0 0 +172 41 65 +115 41 41 +255 0 255 +255 0 255 +255 0 255 +180 180 180 +82 82 82 +16 16 16 +255 255 255 diff --git a/graphics/pokemon/tangela/shiny.pal b/graphics/pokemon/tangela/shiny.pal index 66c10f1fc9..fa3d79d32a 100644 --- a/graphics/pokemon/tangela/shiny.pal +++ b/graphics/pokemon/tangela/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -72 144 72 -136 240 88 -104 192 40 -40 80 40 +152 160 208 +136 255 88 +88 200 8 +32 164 32 +16 88 16 +255 148 131 +222 90 106 +172 40 65 +115 41 41 +255 0 255 +255 0 255 +255 0 255 +180 180 180 +82 82 82 16 16 16 -80 80 80 -176 176 176 -248 248 248 -112 40 40 -168 64 80 -248 144 144 -216 80 112 -0 0 0 -0 0 0 -0 0 0 +255 255 255 diff --git a/graphics/pokemon/voltorb/anim_front.png b/graphics/pokemon/voltorb/anim_front.png index 28c443a3a353ebffb29b57f6d18170211aca3d41..166824d054ccc3b7a47926ad02aaf30e45683e38 100644 GIT binary patch delta 681 zcmV;a0#^O-1i=N6B!35VNliru=Li@8Is`zBuS);`02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5 zFi=cXMVQc_|NsBq)z!4Dy^Di`T2fN~0RR60|Nj90|E!$<gMV88QXuX@G1W0agAfo9 z5D-MZ`Rf1x00Cl4M??UK1szBL00HGmL_t(|ob8q|PQx%5g}roaDpMAaXonsEDN$#{ z%tFNhI1^*x1f&9qv9)5(fXWsH$Qr8=1+h?}^4m^Bq&~L;LM(YwruX^%c9#D!R;$*3 zD$nyxwl@<(Jb%5oeI>M{lTcx330J`QG8`Gg5ut{|0=UNklM;wtVZh{iH9|aNAS^CP zPel_10Y!jFzzk0a8$drJLO`}UEj6(I&}KQ`0PDB30L4rC5&(GmC>@sR0s|~pQA|k6 zO~TPS(CjEBMap?hSC}Gzca)S}3j_dYJ<OFzcliNLn12SR2sqZiFrk2H5P%=ml1cF+ z$VUKMSbN+izYlyi*wZ%W<fA(>*5F3Hz%hX$3cuGoguag0q0_$a;{e9q10z=ez4Xig zeOCYxALO6AebREd++^3PRjbxtYHNQ;Hur}tifL=P`$HC*hM}DOA-o|V&y}M;c(chZ z`F!T6Ab(z_H)pPw8txA&jOc#c0I)w~;V6#NuHJgMKPZ{UQT&+1&i-JQvK8zP9{&_S z0C?yZKhfR=UGoa{2llmZmZIH!2w2$DMnM39(&uoqF2<$b#=zYcpusB>V1K9v!2VDT zfZKgg34r}!UI~Exp|!O?yp{a{2ABxj9~=Rz{vzNkAVq)h{klKY`h~s$e_d@+gAD2$ P00000NkvXXu0mjf$`dHo delta 599 zcmV-d0;v7L1@HurB!4haOjJdf(4Y_y5Q7j9)iFW;QXuX@G5>>F|E!$VF+twd)wHa= z`1tr(P*8|~fB*mh0001&6}JZf000SaNLh0L04^f{04^f|c%?sf00007bV*G`2j>O{ z4>mfHPD6PB00GlUL_t(o!|j%_PQx%1MU#9%BPPgF+<+7@wSUgkPQ*?TbHji-QiUHt z>UYpB=>(nPtwJ5Be~#xQq#2$)fDnuCdQb0jUAgx;j+NDa%Juz$$tNSu$G*YOIEZNp zul9k^O}XN&#^wNRL>Him@UnSsjPUsLdi6~V&<Q;Nn-TVa6bITfgm8wj=}RU6&;fGB z9<a~==^Y$`#DAPq4Z!9rP6`D~5g=nKJSk+%Qxu330Fp}y0HXrADMCU<?)Oq=d@+4P z?jd@8=QNV?111Oz7=Z;Ig#dv9-a~s;sSpDFHRF?y0#0yH{$nZd3GgPiQp%##1~|@n zQ54G71VDsnrF~p};~Soqe*yXaZyv9em6g>W$|GcG+<zZvY}gLKUr|+y`u$=3)U=-N zkM4Rs0h<ths~HgIAy1-BjCVU60LCXbs&~+C_vSA#59`jt_XjV}8JlbasfvdUv2uqc zin23WZy?wVQf#_@UtmDA@AeN)CrA;@_I2k$ZynI~cV}?ArL6V2!+_?~wT@zk0i6$k zz<^~3pisr<o&s>d3HlSTY7P1UM&PIc++F}$&TcP2vp+PqD9rl<_*JE=e~3`)MOm8n lhpMW~`$JjU{lV(z`T`^L6YT1b$!-7u002ovPDHLkV1nUd4zK_K diff --git a/graphics/pokemon/voltorb/back.png b/graphics/pokemon/voltorb/back.png index 6010acc3b7fc30d85a562858934961add89883ce..cf0cf334ea3176a46c71e3d60e45eaccab33db14 100644 GIT binary patch delta 460 zcmV;-0W<!_1O5Y$Bu58yNliru=Li)B4-16l)B^wj02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<ACWE_fB*mg-qqE#ti6kagIZEj z{{a900RR60|D3G<T7&-pQvWeQ?kO0(0046k5D-M1o4No100Cl4M??UK1szBL00AON zL_t(|ob8i6PQySDM%~cjDhG%o4q!&Kh7$l1r=y`~Q7({)xj>W((ZtLKnKJSkfl?t8 z)_+JdwzU-vfAUxQJ%2m9YkS_9F@G3SW*8rvjk3{0N}gdErRKVy@3787DeCKQ_?m3V zL(eJ(TY(b0OlOt00EtRtar-(@5L0d3-wELh<D@OHL7ejnKe1?q%Z6){;X4<a?l#*f z=R$$Rh1t0nfftYtCal5Vt+_y{5E8-ZV|u}ar4-WXdNn)8SPD8|Le>$sLCkh3Inno{ zLwI?12z25SCJrHW2s&g!*5OYfo54u_1|hpnzmObGub2=Of&;Ll_8~g_a#L|&*L`#Y zkRPg1jj1r4u?Fw6e0FJn?fPvS@yYE$X77#pcliN-Cc8o7FD@Sd0000<MNUMnLSTYo Cal~T) delta 404 zcmV;F0c-yL1I7c8Bnkm@Qb$4nuFf3kk!u@&5D*X`AaFP+xG-?|NLc7_koc&$_&6xI z*wE0hsJQs}_*hU-h=70q000000JiA~3jhEB32;bRa{vGi!vFvd!vV){sAK>D0Ut?3 zK~zY`?UTP!gFq064{Hk}HaaQfNP}H&(ZaEkO<o|rL7YpU#%ICUNax}sq_DP9pUC5X zUuJfJp|WxKN`4=|+q(lbGV+(`g8ukO-&lv~Q-Tl+tX-S#e1;WEYoV*Z&R5_{9y?ai z*a#52WlUcI0u;vb>9VIFfy&ryg>Z&R+!Qzv*Sx}uUG#v9IyXAR6E4)<4f8DEf{(z3 z=T|WTF94J7S%WuQaRDMB#3G0D-4_#o7E*|IAM6|xDVUTAVM~~&3EL&KIK3YbuI~l} zco`D*141+)n4Ae=E5FUz3|i(_l(Xyfe3{eRHxn{n<V5VKJ<2ABT$eeq>puP@3MS>K yT9+}svj%lhJo|CKcJ;PHd~#EgOx4IgL#ba}&YqlBrR-Gz0000<MNUMnLSTY<QnU>K diff --git a/graphics/pokemon/voltorb/normal.pal b/graphics/pokemon/voltorb/normal.pal index 79af1efd7f..981ab31a35 100644 --- a/graphics/pokemon/voltorb/normal.pal +++ b/graphics/pokemon/voltorb/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -16 16 16 -131 16 16 -213 49 65 -255 82 32 -238 65 49 -255 131 90 -255 172 156 -213 49 65 +255 255 255 222 213 213 180 172 189 -248 248 248 -88 80 80 -136 128 128 -0 0 0 -0 0 0 +139 131 131 +90 82 82 +255 0 255 +255 0 255 +255 0 255 +255 172 156 +255 131 90 +255 82 32 +238 65 49 +213 49 65 +131 16 16 +16 16 16 diff --git a/graphics/pokemon/voltorb/shiny.pal b/graphics/pokemon/voltorb/shiny.pal index 6b46ff5d7e..06e1879254 100644 --- a/graphics/pokemon/voltorb/shiny.pal +++ b/graphics/pokemon/voltorb/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 +255 255 255 +222 213 213 +180 172 189 +139 131 131 +90 82 82 +255 0 255 +255 0 255 +255 0 255 +156 172 255 +90 131 255 +0 82 255 +49 65 238 +41 24 189 +0 0 115 16 16 16 -32 32 112 -56 40 184 -48 112 248 -72 88 232 -112 144 248 -168 184 248 -56 40 184 -216 208 208 -176 168 184 -248 248 248 -88 80 80 -136 128 128 -0 0 0 -0 0 0 diff --git a/graphics/pokemon/weezing/anim_front.png b/graphics/pokemon/weezing/anim_front.png index 3bc2cb26f6147084c9bed8830ac65092be461304..bda98b3f4b5d0082a00c16ad06c4dbadf77248a6 100644 GIT binary patch delta 1888 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 a&;A1@Sm}@OWi>hg0000<MNUMnLSTY1c4|`q delta 1793 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 diff --git a/graphics/pokemon/weezing/back.png b/graphics/pokemon/weezing/back.png index 92fd4020bb8bcf5c004847fbde2d75d1423d3dc4..0a5876baf1695450600b95745b6d51bcf1ba1b85 100644 GIT binary patch delta 748 zcmV<I0u%k^1(*hqBu58yNliru=Li@C3>@9{4zvIO02g#cSaefwW^{L9a%BKVOhiyl zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<ACWE?f1uEq|NsBq-rlU75Y^3U z-eMr6AOPN+)wFxGi%N@})x~?XtWt}EF=}cMN=gtA5Vb_*$^ZZW0b)x>ME|7+^2GoE z0z64XK~#90?US)?+b|G@HHJg&SMEp+MLd#2(FdXJJU}QbYZ0F0F@Z%}Yf(t*e<Wo& ziV!q=4v;M2e?I;9-|?JfU-9`^`H%D8PUa~+-hE#bFlLwXQZ51Bm?WX3oJp*X+3M_| zK;c#ExkOX;o*toKh&6;(`C9=xq&!5Ph$S{Nz!RAiJ989z?w^R<2pIby^qhde^A+%} z)%mQ%8(>fE-K@<u-2$f0<gCpE6bU$r0Enr~Ihsr&f7@2@D7Bns(E%W{1Hi*5YJns~ zu10hKo_83<2?A6dwN?xy2_XYO6_~%s6SW$Ix&kTzH7*~Xj+x$|ii$3Ux{m<$5Q%8e zO$P$U@iWBGQH3i2N~U?ER7cmSPv#*4C@}$}L^bs2vx7<GRrDzE@GD7FP0?Aiy$qUH z3ZWAaf9F8w#ulEeEzS9N7=x7T65FMRkayM=Xaj($Ugh~E6~S_B_^>XV2L=K@_PyD| zWw41mfZ7*D5v@2TwvXl|pH{P@j+{%qScKVHbC6n%z`CAB;cSX>I<9QpeGIGzx{3F| zsyX-tV!)&#;H|9|h%%k0(2cb;i(uqWm;=@!e@tirsRN+od*IRsqKt=?-#4>-?Jc+E z$~Fin)xFJ=hdi4u0+8o<zfhmI(*-~)-T65IgQEgYdt4|479~m)47j0>z-?a2AK{Td zDk|IZI!r)ZG{T7EdjLdSxSH=O>?;4~65&dA!D@9!1HF#h4B%%3>Ji{R1_rcb2)}7& e8rfI;U;G2EOi51g0;!1r0000<MNUMnLSTaUK2ae6 delta 717 zcmV;;0y6!W2IU2iB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP0000mP)t-s0I=w= zfUwZ0(1=)wIA~~qu&5Y7Kv;-?sMyF55D@tI__(;Z(8zG0kT9S?FxYrVWVlu600009 za7bBm000id000id0mpBsWB>pHK1oDDR7l6|lh117Fc8LFw0{J0Tj9O*Eh4m+y%lz9 z;d_+OTS}Ff+|>xbg<-u0zwLhd<2Y4KS$gh(6Pfwtn{P&w;wwH8EAw&w+fhHH<K6c~ z0j;+w&-oHyv`!L&^GsrOC{`y01q!cH<`PXi7<z?*Ca=MyDBlXuCFLRVKwe^#0ftDY z*y;n5xql*36MvxH6O%asfyXOgR42=<#2a8o-Cfq^nr;DI7d&e-0X6{#763MvIYpC6 zWZyAAO3CM0^Z-b20r+9qnjs01s}UK1$1O&2gaB0sDTN1;1mgjq3d~>Ri8={FTmg}Q z8jlI5Lm@Y)BBDzs?jt}0L?Rk=(}los{25~GslpQg!GF`dQL3kF)JOdk0hE}5NunAD z^x4BC@*;X<IQ&WyRbzXn_vcail|sk_#5vHZan_J?tv>w@W8mDo#CFLs<dt(4Z2-{K z3qL)lB3O=%zpS&*0|NmcyFu^ZGT6i?fZAAVqZQ?e{i}X1=hf_~C#6y^4x#r>U$_(# zu&(D(D1Votov*7{_a6i6k#6EWuxc)5ffzBV2pH$81)@#&$z<akWf6@033I?Ygb6Jm zbpQl^51fZUwDGda`zFiR#`(5X+XVq3`b^zG-kY`oD9dtKsPDH^1wabfo1B2bNddP# zEffNa5+$q$)Hp=oHqZHwaP+=x<vPC(GY}VzFh=6|9sm{>uJ(<Iu&e$*mk8B*7hbLI zX{48Fn*sccKs^DzkI@5?dkEiYX2n<hPZY&J#4$7?tk5j800000NkvXXu0mjf+m}H^ diff --git a/graphics/pokemon/weezing/normal.pal b/graphics/pokemon/weezing/normal.pal index 715cd4c89a..ded0142be1 100644 --- a/graphics/pokemon/weezing/normal.pal +++ b/graphics/pokemon/weezing/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 176 232 -197 213 139 -246 238 148 -197 180 41 -131 90 139 -189 139 205 -98 49 123 -164 106 180 -213 164 222 -16 16 16 +152 200 208 255 255 255 189 189 189 172 164 82 -172 164 82 -156 82 98 +213 213 180 213 115 131 +156 82 98 +246 238 148 +197 213 139 +197 180 41 +213 164 222 +189 139 205 +164 106 180 +131 90 139 +98 49 123 +16 16 16 diff --git a/graphics/pokemon/weezing/shiny.pal b/graphics/pokemon/weezing/shiny.pal index 11a7a0793d..16175411c0 100644 --- a/graphics/pokemon/weezing/shiny.pal +++ b/graphics/pokemon/weezing/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 176 232 -176 128 176 -208 168 208 -136 88 136 -56 104 104 -128 176 168 -24 64 64 -88 136 128 -168 216 200 +160 208 152 +255 255 255 +222 222 222 +172 156 16 +213 205 106 +222 98 32 +164 32 0 +222 156 213 +180 123 180 +139 74 139 +156 213 197 +123 180 172 +82 139 131 +49 106 106 +16 74 74 16 16 16 -248 248 248 -184 184 184 -208 200 112 -160 144 48 -160 64 48 -216 120 72 diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index a7d03e09e1..4aa4273535 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -1243,7 +1243,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_VOLTORB_HISUIAN] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 10 }, [SPECIES_ELECTRODE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 7 }, [SPECIES_TYPHLOSION_HISUIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 2 }, - [SPECIES_QWILFISH_HISUIAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, + [SPECIES_QWILFISH_HISUIAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 8 }, [SPECIES_SNEASEL_HISUIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, #if P_GEN_5_POKEMON == TRUE [SPECIES_SAMUROTT_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, @@ -1253,7 +1253,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_BRAVIARY_HISUIAN] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, #endif #if P_GEN_6_POKEMON == TRUE - [SPECIES_SLIGGOO_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_SLIGGOO_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_GOODRA_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_AVALUGG_HISUIAN] = { .size = MON_COORDS_SIZE(64, 32), .y_offset = 16 }, #endif diff --git a/src/data/pokemon_graphics/enemy_mon_elevation.h b/src/data/pokemon_graphics/enemy_mon_elevation.h index 004e1be917..4ef339a9a0 100644 --- a/src/data/pokemon_graphics/enemy_mon_elevation.h +++ b/src/data/pokemon_graphics/enemy_mon_elevation.h @@ -2,7 +2,7 @@ // is during battle. Species that float or fly have nonzero values. const u8 gEnemyMonElevation[NUM_SPECIES + 1] = { - [SPECIES_BUTTERFREE] = 10, + [SPECIES_BUTTERFREE] = 12, [SPECIES_BEEDRILL] = 9, [SPECIES_PIDGEOT] = 5, [SPECIES_FEAROW] = 6, @@ -12,10 +12,10 @@ const u8 gEnemyMonElevation[NUM_SPECIES + 1] = [SPECIES_GEODUDE] = 10, [SPECIES_MAGNEMITE] = 17, [SPECIES_MAGNETON] = 9, - [SPECIES_GASTLY] = 10, - [SPECIES_HAUNTER] = 11, + [SPECIES_GASTLY] = 13, + [SPECIES_HAUNTER] = 14, [SPECIES_KOFFING] = 14, - [SPECIES_WEEZING] = 6, + [SPECIES_WEEZING] = 3, [SPECIES_AERODACTYL] = 9, [SPECIES_ZAPDOS] = 8, [SPECIES_MEW] = 11, @@ -41,16 +41,15 @@ const u8 gEnemyMonElevation[NUM_SPECIES + 1] = [SPECIES_WINGULL] = 15, [SPECIES_PELIPPER] = 8, [SPECIES_MASQUERAIN] = 10, - [SPECIES_BALTOY] = 5, + [SPECIES_BALTOY] = 8, [SPECIES_CLAYDOL] = 10, [SPECIES_FLYGON] = 7, [SPECIES_GLALIE] = 12, [SPECIES_LUNATONE] = 13, [SPECIES_SOLROCK] = 4, - [SPECIES_ALTARIA] = 8, + [SPECIES_BARBOACH] = 7, [SPECIES_DUSKULL] = 13, [SPECIES_SHUPPET] = 14, - [SPECIES_BANETTE] = 8, [SPECIES_CASTFORM_NORMAL] = 16, [SPECIES_BELDUM] = 8, [SPECIES_RAYQUAZA] = 6, @@ -59,44 +58,58 @@ const u8 gEnemyMonElevation[NUM_SPECIES + 1] = [SPECIES_JIRACHI] = 14, [SPECIES_CHIMECHO] = 16, // Gen 4 + [SPECIES_BURMY] = 10, + [SPECIES_WORMADAM] = 8, [SPECIES_MOTHIM] = 10, - [SPECIES_COMBEE] = 8, + [SPECIES_COMBEE] = 15, [SPECIES_VESPIQUEN] = 4, [SPECIES_DRIFLOON] = 5, [SPECIES_DRIFBLIM] = 7, [SPECIES_MISMAGIUS] = 3, - [SPECIES_CHINGLING] = 5, - [SPECIES_BRONZONG] = 4, + [SPECIES_BRONZOR] = 9, + [SPECIES_BRONZONG] = 7, + [SPECIES_CARNIVINE] = 8, [SPECIES_MAGNEZONE] = 4, [SPECIES_TOGEKISS] = 14, [SPECIES_YANMEGA] = 6, [SPECIES_GLISCOR] = 9, [SPECIES_PORYGON_Z] = 12, [SPECIES_PROBOPASS] = 6, + [SPECIES_DUSKNOIR] = 6, + [SPECIES_FROSLASS] = 7, [SPECIES_ROTOM] = 10, [SPECIES_UXIE] = 6, [SPECIES_MESPRIT] = 6, [SPECIES_AZELF] = 6, [SPECIES_CRESSELIA] = 3, + [SPECIES_PHIONE] = 8, + [SPECIES_MANAPHY] = 10, [SPECIES_DARKRAI] = 4, // Gen 5 [SPECIES_MUNNA] = 7, [SPECIES_MUSHARNA] = 5, [SPECIES_WOOBAT] = 19, - [SPECIES_SWOOBAT] = 12, + [SPECIES_SWOOBAT] = 10, [SPECIES_PETILIL] = 7, + [SPECIES_BASCULIN] = 6, [SPECIES_SIGILYPH] = 7, [SPECIES_YAMASK] = 10, - [SPECIES_ARCHEOPS] = 8, + [SPECIES_ARCHEOPS] = 11, [SPECIES_SOLOSIS] = 14, [SPECIES_DUOSION] = 7, [SPECIES_REUNICLUS] = 8, [SPECIES_EMOLGA] = 19, + [SPECIES_FERROTHORN] = 10, + [SPECIES_KLINK] = 12, + [SPECIES_KLANG] = 8, + [SPECIES_KLINKLANG] = 4, [SPECIES_TYNAMO] = 16, [SPECIES_EELEKTRIK] = 8, [SPECIES_EELEKTROSS] = 8, + [SPECIES_LAMPENT] = 6, + [SPECIES_CHANDELURE] = 6, [SPECIES_CRYOGONAL] = 3, - [SPECIES_BRAVIARY] = 8, + [SPECIES_BRAVIARY] = 6, [SPECIES_HYDREIGON] = 3, [SPECIES_VOLCARONA] = 6, [SPECIES_TORNADUS_INCARNATE] = 7, @@ -124,6 +137,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES + 1] = [SPECIES_VIKAVOLT] = 8, [SPECIES_CUTIEFLY] = 10, [SPECIES_RIBOMBEE] = 6, + [SPECIES_WISHIWASHI_SOLO] = 12, [SPECIES_COMFEY] = 8, [SPECIES_MINIOR_METEOR_RED] = 17, [SPECIES_DHELMISE] = 2, @@ -154,6 +168,8 @@ const u8 gEnemyMonElevation[NUM_SPECIES + 1] = [SPECIES_ETERNATUS] = 4, [SPECIES_REGIELEKI] = 8, [SPECIES_REGIDRAGO] = 5, + [SPECIES_BASCULEGION] = 5, + [SPECIES_ENAMORUS] = 7, // Megas [SPECIES_BEEDRILL_MEGA] = 5, [SPECIES_PIDGEOT_MEGA] = 8, @@ -178,8 +194,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES + 1] = [SPECIES_ARTICUNO_GALARIAN] = 10, [SPECIES_YAMASK_GALARIAN] = 4, // Hisuian Forms - [SPECIES_VOLTORB_HISUIAN] = 1, - [SPECIES_ELECTRODE_HISUIAN] = 4, + [SPECIES_QWILFISH_HISUIAN] = 9, [SPECIES_BRAVIARY_HISUIAN] = 3, // Other Forms [SPECIES_UNOWN_B] = 8, @@ -212,12 +227,18 @@ const u8 gEnemyMonElevation[NUM_SPECIES + 1] = [SPECIES_CASTFORM_SUNNY] = 5, [SPECIES_CASTFORM_RAINY] = 5, [SPECIES_CASTFORM_SNOWY] = 5, + [SPECIES_BURMY_SANDY_CLOAK] = 10, + [SPECIES_BURMY_TRASH_CLOAK] = 10, + [SPECIES_WORMADAM_SANDY_CLOAK] = 8, + [SPECIES_WORMADAM_TRASH_CLOAK] = 8, [SPECIES_ROTOM_HEAT] = 6, [SPECIES_ROTOM_WASH] = 6, [SPECIES_ROTOM_FROST] = 6, [SPECIES_ROTOM_FAN] = 6, [SPECIES_ROTOM_MOW] = 6, [SPECIES_GIRATINA_ORIGIN] = 7, + [SPECIES_BASCULIN_BLUE_STRIPED] = 6, + [SPECIES_BASCULIN_WHITE_STRIPED] = 6, [SPECIES_THUNDURUS_THERIAN] = 7, [SPECIES_MELOETTA_PIROUETTE] = 5, [SPECIES_VIVILLON_POLAR] = 9, @@ -268,20 +289,23 @@ const u8 gEnemyMonElevation[NUM_SPECIES + 1] = [SPECIES_SINISTEA_ANTIQUE] = 10, [SPECIES_POLTEAGEIST_ANTIQUE] = 12, [SPECIES_ETERNATUS_ETERNAMAX] = 13, + [SPECIES_BASCULEGION_FEMALE] = 5, #if P_GEN_9_POKEMON == TRUE [SPECIES_TADBULB] = 12, - [SPECIES_BRAMBLIN] = 1, - [SPECIES_BRAMBLEGHAST] = 1, - [SPECIES_BOMBIRDIER] = 11, - [SPECIES_GLIMMET] = 1, - [SPECIES_GLIMMORA] = 10, - [SPECIES_VELUZA] = 1, + [SPECIES_BOMBIRDIER] = 8, + [SPECIES_GLIMMET] = 11, + [SPECIES_GLIMMORA] = 8, + [SPECIES_VELUZA] = 5, [SPECIES_DONDOZO] = 1, [SPECIES_FLUTTER_MANE] = 5, [SPECIES_IRON_JUGULIS] = 7, - [SPECIES_IRON_MOTH] = 4, - [SPECIES_CHI_YU] = 2, - [SPECIES_ROARING_MOON] = 20, + [SPECIES_IRON_MOTH] = 8, + [SPECIES_CHI_YU] = 9, + [SPECIES_ROARING_MOON] = 6, + [SPECIES_POLTCHAGEIST_COUNTERFEIT] = 10, + [SPECIES_POLTCHAGEIST_ARTISAN] = 10, + [SPECIES_SINISTCHA_UNREMARKABLE] = 10, + [SPECIES_SINISTCHA_MASTERPIECE] = 10, #endif - [SPECIES_BUTTERFREE_GIGANTAMAX] = 10, + [SPECIES_BUTTERFREE_GIGANTAMAX] = 7, }; diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index f82bcc5e26..ba03f71bbb 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -195,8 +195,6 @@ static const union AnimCmd sAnim_Pidgeot_1[] = { ANIMCMD_FRAME(1, 20), ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -995,16 +993,16 @@ static const union AnimCmd sAnim_Dodrio_1[] = ANIMCMD_FRAME(1, 12), ANIMCMD_FRAME(0, 12), ANIMCMD_FRAME(1, 12), - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 12), ANIMCMD_FRAME(0, 8), ANIMCMD_END, }; static const union AnimCmd sAnim_Seel_1[] = { - ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -1065,30 +1063,22 @@ static const union AnimCmd sAnim_Shellder_1[] = static const union AnimCmd sAnim_Cloyster_1[] = { - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 25), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(0, 14), + ANIMCMD_FRAME(1, 18), + ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_Gastly_1[] = { - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 18), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -1113,7 +1103,6 @@ static const union AnimCmd sAnim_Gengar_1[] = static const union AnimCmd sAnim_Onix_1[] = { ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 30), ANIMCMD_END, }; @@ -1143,26 +1132,19 @@ static const union AnimCmd sAnim_Hypno_1[] = static const union AnimCmd sAnim_Krabby_1[] = { - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), ANIMCMD_FRAME(0, 8), ANIMCMD_END, }; static const union AnimCmd sAnim_Kingler_1[] = { - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 25), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(0, 14), ANIMCMD_END, }; @@ -1178,11 +1160,10 @@ static const union AnimCmd sAnim_Voltorb_1[] = static const union AnimCmd sAnim_Electrode_1[] = { - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(0, 14), + ANIMCMD_FRAME(1, 34), + ANIMCMD_FRAME(1, 34), + ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -1209,12 +1190,12 @@ static const union AnimCmd sAnim_Exeggutor_1[] = static const union AnimCmd sAnim_Cubone_1[] = { - ANIMCMD_FRAME(1, 14), - ANIMCMD_FRAME(0, 14), - ANIMCMD_FRAME(1, 14), - ANIMCMD_FRAME(0, 14), - ANIMCMD_FRAME(1, 14), - ANIMCMD_FRAME(0, 14), + ANIMCMD_FRAME(1, 6), + ANIMCMD_FRAME(0, 6), + ANIMCMD_LOOP(1), + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -1231,28 +1212,31 @@ static const union AnimCmd sAnim_Marowak_1[] = static const union AnimCmd sAnim_Hitmonlee_1[] = { - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 18), + ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_Hitmonchan_1[] = { - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(0, 17), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), ANIMCMD_END, }; static const union AnimCmd sAnim_Lickitung_1[] = { - ANIMCMD_FRAME(0, 28), - ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(1, 16), ANIMCMD_FRAME(0, 15), ANIMCMD_END, }; @@ -1316,11 +1300,8 @@ static const union AnimCmd sAnim_Rhyhorn_2[] = static const union AnimCmd sAnim_Rhydon_1[] = { - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 48), - ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 15), ANIMCMD_END, }; @@ -1343,16 +1324,9 @@ static const union AnimCmd sAnim_Chansey_1[] = static const union AnimCmd sAnim_Tangela_1[] = { - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 9), + ANIMCMD_FRAME(0, 40), + ANIMCMD_FRAME(1, 24), + ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -2707,17 +2681,11 @@ static const union AnimCmd sAnim_Tyrogue_1[] = static const union AnimCmd sAnim_Hitmontop_1[] = { - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 26), + ANIMCMD_FRAME(0, 14), + ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index 9daab74fe8..80506717c7 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -38,7 +38,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_NIDOQUEEN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_NIDORAN_M] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, [SPECIES_NIDORINO] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, - [SPECIES_NIDOKING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_NIDOKING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_CLEFAIRY] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, [SPECIES_CLEFABLE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, [SPECIES_VULPIX] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 }, @@ -104,19 +104,19 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_HYPNO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_KRABBY] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 14 }, [SPECIES_KINGLER] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, - [SPECIES_VOLTORB] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 11 }, - [SPECIES_ELECTRODE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 8 }, + [SPECIES_VOLTORB] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 15 }, + [SPECIES_ELECTRODE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, [SPECIES_EXEGGCUTE] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 12 }, [SPECIES_EXEGGUTOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CUBONE] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 13 }, [SPECIES_MAROWAK] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 8 }, - [SPECIES_HITMONLEE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_HITMONCHAN] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, + [SPECIES_HITMONLEE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_HITMONCHAN] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 4 }, [SPECIES_LICKITUNG] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_KOFFING] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 10 }, [SPECIES_WEEZING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_RHYHORN] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 12 }, - [SPECIES_RHYDON] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, + [SPECIES_RHYDON] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 3 }, [SPECIES_CHANSEY] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 9 }, [SPECIES_TANGELA] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_KANGASKHAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, @@ -202,7 +202,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_SUNFLORA] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 8 }, [SPECIES_YANMA] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 14 }, [SPECIES_WOOPER] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 16 }, - [SPECIES_WOOPER_PALDEAN] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 12 }, + [SPECIES_WOOPER_PALDEAN] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 16 }, [SPECIES_QUAGSIRE] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_ESPEON] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 9 }, [SPECIES_UMBREON] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 9 }, @@ -255,7 +255,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_ENTEI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_SUICUNE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_LARVITAR] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 10 }, - [SPECIES_PUPITAR] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 9 }, + [SPECIES_PUPITAR] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, [SPECIES_TYRANITAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_LUGIA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_HO_OH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -291,7 +291,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_SWELLOW] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_SHROOMISH] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, [SPECIES_BRELOOM] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 3 }, - [SPECIES_SPINDA] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 1 }, + [SPECIES_SPINDA] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 8 }, [SPECIES_WINGULL] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 11 }, [SPECIES_PELIPPER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_SURSKIT] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 8 }, @@ -301,14 +301,14 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_SKITTY] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 12 }, [SPECIES_DELCATTY] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 4 }, [SPECIES_KECLEON] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 5 }, - [SPECIES_BALTOY] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 11 }, + [SPECIES_BALTOY] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, [SPECIES_CLAYDOL] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, [SPECIES_NOSEPASS] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 10 }, [SPECIES_TORKOAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_SABLEYE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, - [SPECIES_BARBOACH] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 11 }, + [SPECIES_BARBOACH] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 15 }, [SPECIES_WHISCASH] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 9 }, - [SPECIES_LUVDISC] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 11 }, + [SPECIES_LUVDISC] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 14 }, [SPECIES_CORPHISH] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_CRAWDAUNT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_FEEBAS] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 10 }, @@ -341,7 +341,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_MAWILE] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 }, [SPECIES_MEDITITE] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, [SPECIES_MEDICHAM] = { .size = MON_COORDS_SIZE(40, 64), .y_offset = 0 }, - [SPECIES_SWABLU] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, + [SPECIES_SWABLU] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, [SPECIES_ALTARIA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_WYNAUT] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_DUSKULL] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 12 }, @@ -364,7 +364,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_BANETTE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, [SPECIES_SEVIPER] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_ZANGOOSE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, - [SPECIES_RELICANTH] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 10 }, + [SPECIES_RELICANTH] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 8 }, [SPECIES_ARON] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 14 }, [SPECIES_LAIRON] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_AGGRON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -442,7 +442,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_HONCHKROW] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_GLAMEOW] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 8 }, [SPECIES_PURUGLY] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, - [SPECIES_CHINGLING] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, + [SPECIES_CHINGLING] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 15 }, [SPECIES_STUNKY] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 13 }, [SPECIES_SKUNTANK] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_BRONZOR] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 14 }, @@ -486,7 +486,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_PORYGON_Z] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 6 }, [SPECIES_GALLADE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, [SPECIES_PROBOPASS] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 4 }, - [SPECIES_DUSKNOIR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_DUSKNOIR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_FROSLASS] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 8 }, [SPECIES_ROTOM] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 }, [SPECIES_UXIE] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, @@ -498,8 +498,8 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_REGIGIGAS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_GIRATINA_ALTERED] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CRESSELIA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_PHIONE] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 8 }, - [SPECIES_MANAPHY] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 10 }, + [SPECIES_PHIONE] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 12 }, + [SPECIES_MANAPHY] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 }, [SPECIES_DARKRAI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_SHAYMIN_LAND] = { .size = MON_COORDS_SIZE(40, 32), .y_offset = 16 }, [SPECIES_ARCEUS_NORMAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -528,7 +528,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_SIMISEAR] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, [SPECIES_PANPOUR] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, [SPECIES_SIMIPOUR] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 6 }, - [SPECIES_MUNNA] = { .size = MON_COORDS_SIZE(32, 32), .y_offset = 14 }, + [SPECIES_MUNNA] = { .size = MON_COORDS_SIZE(32, 32), .y_offset = 16 }, [SPECIES_MUSHARNA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, [SPECIES_PIDOVE] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, [SPECIES_TRANQUILL] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 7 }, @@ -543,7 +543,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_DRILBUR] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, [SPECIES_EXCADRILL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_AUDINO] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 8 }, - [SPECIES_TIMBURR] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 13 }, + [SPECIES_TIMBURR] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_GURDURR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CONKELDURR] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, [SPECIES_TYMPOLE] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, @@ -604,7 +604,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_FOONGUS] = { .size = MON_COORDS_SIZE(32, 32), .y_offset = 16 }, [SPECIES_AMOONGUSS] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 8 }, [SPECIES_FRILLISH] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, - [SPECIES_JELLICENT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_JELLICENT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_ALOMOMOLA] = { .size = MON_COORDS_SIZE(32, 64), .y_offset = 0 }, [SPECIES_JOLTIK] = { .size = MON_COORDS_SIZE(32, 32), .y_offset = 17 }, [SPECIES_GALVANTULA] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 10 }, @@ -650,7 +650,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_LARVESTA] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 13 }, [SPECIES_VOLCARONA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_COBALION] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, - [SPECIES_TERRAKION] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, + [SPECIES_TERRAKION] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_VIRIZION] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, [SPECIES_TORNADUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_THUNDURUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, @@ -663,7 +663,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_GENESECT] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, #endif #if P_GEN_6_POKEMON == TRUE - [SPECIES_CHESPIN] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 5 }, + [SPECIES_CHESPIN] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, [SPECIES_QUILLADIN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 }, [SPECIES_CHESNAUGHT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_FENNEKIN] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 10 }, @@ -674,7 +674,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_GRENINJA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_BUNNELBY] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 5 }, [SPECIES_DIGGERSBY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, - [SPECIES_FLETCHLING] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, + [SPECIES_FLETCHLING] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 13 }, [SPECIES_FLETCHINDER] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_TALONFLAME] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_SCATTERBUG] = { .size = MON_COORDS_SIZE(32, 48), .y_offset = 13 }, @@ -711,7 +711,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_HELIOLISK] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 }, [SPECIES_TYRUNT] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, [SPECIES_TYRANTRUM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_AMAURA] = { .size = MON_COORDS_SIZE(32, 56), .y_offset = 0 }, + [SPECIES_AMAURA] = { .size = MON_COORDS_SIZE(32, 56), .y_offset = 5 }, [SPECIES_AURORUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_SYLVEON] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 4 }, [SPECIES_HAWLUCHA] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 8 }, @@ -753,15 +753,15 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_GUMSHOOS] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 5 }, [SPECIES_GRUBBIN] = { .size = MON_COORDS_SIZE(48, 32), .y_offset = 17 }, [SPECIES_CHARJABUG] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, - [SPECIES_VIKAVOLT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 6 }, + [SPECIES_VIKAVOLT] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 3 }, [SPECIES_CRABRAWLER] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 }, [SPECIES_CRABOMINABLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_ORICORIO_BAILE] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, [SPECIES_CUTIEFLY] = { .size = MON_COORDS_SIZE(33, 35), .y_offset = 16 }, [SPECIES_RIBOMBEE] = { .size = MON_COORDS_SIZE(32, 47), .y_offset = 5 }, [SPECIES_ROCKRUFF] = { .size = MON_COORDS_SIZE(37, 39), .y_offset = 11 }, - [SPECIES_LYCANROC_MIDDAY] = { .size = MON_COORDS_SIZE(57, 53), .y_offset = 6 }, - [SPECIES_WISHIWASHI_SOLO] = { .size = MON_COORDS_SIZE(40, 24), .y_offset = 15 }, + [SPECIES_LYCANROC_MIDDAY] = { .size = MON_COORDS_SIZE(57, 53), .y_offset = 5 }, + [SPECIES_WISHIWASHI_SOLO] = { .size = MON_COORDS_SIZE(40, 24), .y_offset = 20 }, [SPECIES_MAREANIE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, [SPECIES_TOXAPEX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, [SPECIES_MUDBRAY] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 7 }, @@ -792,12 +792,12 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_MINIOR_METEOR_RED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, [SPECIES_KOMALA] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_TURTONATOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TOGEDEMARU] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 5 }, + [SPECIES_TOGEDEMARU] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 9 }, [SPECIES_MIMIKYU_DISGUISED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, [SPECIES_BRUXISH] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 15 }, [SPECIES_DRAMPA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_DHELMISE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 1 }, - [SPECIES_JANGMO_O] = { .size = MON_COORDS_SIZE(36, 43), .y_offset = 5 }, + [SPECIES_JANGMO_O] = { .size = MON_COORDS_SIZE(36, 43), .y_offset = 9 }, [SPECIES_HAKAMO_O] = { .size = MON_COORDS_SIZE(53, 61), .y_offset = 1 }, [SPECIES_KOMMO_O] = { .size = MON_COORDS_SIZE(63, 63), .y_offset = 0 }, [SPECIES_TAPU_KOKO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, @@ -863,7 +863,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_SILICOBRA] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, [SPECIES_SANDACONDA] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 12 }, [SPECIES_CRAMORANT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_ARROKUDA] = { .size = MON_COORDS_SIZE(56, 32), .y_offset = 13 }, + [SPECIES_ARROKUDA] = { .size = MON_COORDS_SIZE(56, 32), .y_offset = 17 }, [SPECIES_BARRASKEWDA] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 8 }, [SPECIES_TOXEL] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, [SPECIES_TOXTRICITY_AMPED] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 1 }, @@ -979,123 +979,123 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_SPECTRIER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CALYREX] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, [SPECIES_WYRDEER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_KLEAVOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_URSALUNA] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 4 }, - [SPECIES_BASCULEGION_MALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SNEASLER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_OVERQWIL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_ENAMORUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_KLEAVOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_URSALUNA] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 2 }, + [SPECIES_BASCULEGION_MALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, + [SPECIES_SNEASLER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_OVERQWIL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_ENAMORUS_INCARNATE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, #endif #if P_GEN_9_POKEMON == TRUE - [SPECIES_SPRIGATITO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, - [SPECIES_FLORAGATO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_SPRIGATITO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, + [SPECIES_FLORAGATO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_MEOWSCARADA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_FUECOCO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, [SPECIES_CROCALOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, [SPECIES_SKELEDIRGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, - [SPECIES_QUAXLY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, - [SPECIES_QUAXWELL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_QUAXLY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, + [SPECIES_QUAXWELL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_QUAQUAVAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_LECHONK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, + [SPECIES_LECHONK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, [SPECIES_OINKOLOGNE_MALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, [SPECIES_OINKOLOGNE_FEMALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, - [SPECIES_TAROUNTULA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, + [SPECIES_TAROUNTULA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_SPIDOPS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_NYMBLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_LOKIX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_PAWMI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, - [SPECIES_PAWMO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_PAWMOT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TANDEMAUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, - [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, - [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, - [SPECIES_FIDOUGH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, + [SPECIES_NYMBLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, + [SPECIES_LOKIX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_PAWMI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, + [SPECIES_PAWMO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_PAWMOT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_TANDEMAUS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, + [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, + [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, + [SPECIES_FIDOUGH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, [SPECIES_DACHSBUN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, - [SPECIES_SMOLIV] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, - [SPECIES_DOLLIV] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_SMOLIV] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 16 }, + [SPECIES_DOLLIV] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, [SPECIES_ARBOLIVA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SQUAWKABILLY_GREEN_PLUMAGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_NACLI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, + [SPECIES_SQUAWKABILLY_GREEN_PLUMAGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_NACLI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, [SPECIES_NACLSTACK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_GARGANACL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_CHARCADET] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_GARGANACL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_CHARCADET] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_ARMAROUGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CERULEDGE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TADBULB] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_TADBULB] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, [SPECIES_BELLIBOLT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, - [SPECIES_WATTREL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, - [SPECIES_KILOWATTREL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_MASCHIFF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, - [SPECIES_MABOSSTIFF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SHROODLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 15 }, + [SPECIES_WATTREL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, + [SPECIES_KILOWATTREL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, + [SPECIES_MASCHIFF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, + [SPECIES_MABOSSTIFF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_SHROODLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 17 }, [SPECIES_GRAFAIAI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, - [SPECIES_BRAMBLIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, + [SPECIES_BRAMBLIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, [SPECIES_BRAMBLEGHAST] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, - [SPECIES_TOEDSCOOL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TOEDSCRUEL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_KLAWF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, - [SPECIES_CAPSAKID] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, + [SPECIES_TOEDSCOOL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_TOEDSCRUEL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_KLAWF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, + [SPECIES_CAPSAKID] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, [SPECIES_SCOVILLAIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_RELLOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, - [SPECIES_RABSCA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_FLITTLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, + [SPECIES_RELLOR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, + [SPECIES_RABSCA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_FLITTLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, [SPECIES_ESPATHRA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TINKATINK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TINKATUFF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TINKATON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_WIGLETT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 17 }, - [SPECIES_WUGTRIO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_BOMBIRDIER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_FINIZEN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, - [SPECIES_PALAFIN_ZERO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, - [SPECIES_PALAFIN_HERO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, - [SPECIES_VAROOM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 13 }, + [SPECIES_TINKATINK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, + [SPECIES_TINKATUFF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_TINKATON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_WIGLETT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 19 }, + [SPECIES_WUGTRIO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_BOMBIRDIER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_FINIZEN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, + [SPECIES_PALAFIN_ZERO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, + [SPECIES_PALAFIN_HERO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VAROOM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, [SPECIES_REVAVROOM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, - [SPECIES_CYCLIZAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_ORTHWORM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_GLIMMET] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_GLIMMORA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_GREAVARD] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, - [SPECIES_HOUNDSTONE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_FLAMIGO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_CETODDLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, + [SPECIES_CYCLIZAR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_ORTHWORM] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_GLIMMET] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 16 }, + [SPECIES_GLIMMORA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_GREAVARD] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, + [SPECIES_HOUNDSTONE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_FLAMIGO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_CETODDLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, [SPECIES_CETITAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_VELUZA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_DONDOZO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TATSUGIRI_CURLY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, - [SPECIES_TATSUGIRI_DROOPY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, - [SPECIES_TATSUGIRI_STRETCHY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 12 }, + [SPECIES_VELUZA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, + [SPECIES_DONDOZO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_TATSUGIRI_CURLY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, + [SPECIES_TATSUGIRI_DROOPY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, + [SPECIES_TATSUGIRI_STRETCHY] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 14 }, [SPECIES_ANNIHILAPE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_CLODSIRE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, [SPECIES_FARIGIRAF] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_DUDUNSPARCE_TWO_SEGMENT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_KINGAMBIT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_GREAT_TUSK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, + [SPECIES_GREAT_TUSK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_SCREAM_TAIL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, [SPECIES_BRUTE_BONNET] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_FLUTTER_MANE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_FLUTTER_MANE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_SLITHER_WING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SANDY_SHOCKS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_IRON_TREADS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_IRON_BUNDLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_SANDY_SHOCKS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_IRON_TREADS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_IRON_BUNDLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, [SPECIES_IRON_HANDS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_IRON_JUGULIS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_IRON_MOTH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_IRON_JUGULIS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_IRON_MOTH] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, [SPECIES_IRON_THORNS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_FRIGIBAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_ARCTIBAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_BAXCALIBUR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_GIMMIGHOUL_CHEST] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_GIMMIGHOUL_ROAMING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, + [SPECIES_FRIGIBAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, + [SPECIES_ARCTIBAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_BAXCALIBUR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_GIMMIGHOUL_CHEST] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_GIMMIGHOUL_ROAMING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, [SPECIES_GHOLDENGO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_WO_CHIEN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_CHIEN_PAO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TING_LU] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_CHI_YU] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_CHIEN_PAO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_TING_LU] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_CHI_YU] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, [SPECIES_ROARING_MOON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_IRON_VALIANT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_KORAIDON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -1103,21 +1103,21 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_WALKING_WAKE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_IRON_LEAVES] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_DIPPLIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_POLTCHAGEIST_COUNTERFEIT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_POLTCHAGEIST_ARTISAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SINISTCHA_UNREMARKABLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_SINISTCHA_MASTERPIECE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_OKIDOGI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_MUNKIDORI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_FEZANDIPITI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_OGERPON_TEAL_MASK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_OGERPON_WELLSPRING_MASK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_OGERPON_HEARTHFLAME_MASK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_OGERPON_CORNERSTONE_MASK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_OGERPON_TEAL_MASK_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_OGERPON_WELLSPRING_MASK_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_OGERPON_HEARTHFLAME_MASK_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_OGERPON_CORNERSTONE_MASK_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_POLTCHAGEIST_COUNTERFEIT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, + [SPECIES_POLTCHAGEIST_ARTISAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, + [SPECIES_SINISTCHA_UNREMARKABLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, + [SPECIES_SINISTCHA_MASTERPIECE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, + [SPECIES_OKIDOGI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_MUNKIDORI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_FEZANDIPITI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_OGERPON_TEAL_MASK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_OGERPON_WELLSPRING_MASK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_OGERPON_HEARTHFLAME_MASK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_OGERPON_CORNERSTONE_MASK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_OGERPON_TEAL_MASK_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_OGERPON_WELLSPRING_MASK_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_OGERPON_HEARTHFLAME_MASK_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_OGERPON_CORNERSTONE_MASK_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, #endif // Megas [SPECIES_VENUSAUR_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, @@ -1194,7 +1194,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_GOLEM_ALOLAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, [SPECIES_GRIMER_ALOLAN] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 }, [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_EXEGGUTOR_ALOLAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_MAROWAK_ALOLAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, // Galarian Forms [SPECIES_MEOWTH_GALARIAN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, @@ -1219,24 +1219,24 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_STUNFISK_GALARIAN] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, #endif // Hisuian Forms - [SPECIES_GROWLITHE_HISUIAN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 6 }, - [SPECIES_ARCANINE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_VOLTORB_HISUIAN] = { .size = MON_COORDS_SIZE(32, 32), .y_offset = 0 }, - [SPECIES_ELECTRODE_HISUIAN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 0 }, + [SPECIES_GROWLITHE_HISUIAN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 }, + [SPECIES_ARCANINE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VOLTORB_HISUIAN] = { .size = MON_COORDS_SIZE(32, 32), .y_offset = 17 }, + [SPECIES_ELECTRODE_HISUIAN] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 9 }, [SPECIES_TYPHLOSION_HISUIAN] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 0 }, - [SPECIES_QWILFISH_HISUIAN] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 8 }, - [SPECIES_SNEASEL_HISUIAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 7 }, + [SPECIES_QWILFISH_HISUIAN] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 16 }, + [SPECIES_SNEASEL_HISUIAN] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 8 }, #if P_GEN_5_POKEMON == TRUE [SPECIES_SAMUROTT_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_LILLIGANT_HISUIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 1 }, - [SPECIES_ZORUA_HISUIAN] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, - [SPECIES_ZOROARK_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_LILLIGANT_HISUIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, + [SPECIES_ZORUA_HISUIAN] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 1 }, + [SPECIES_ZOROARK_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_BRAVIARY_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, #endif #if P_GEN_6_POKEMON == TRUE - [SPECIES_SLIGGOO_HISUIAN] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 6 }, - [SPECIES_GOODRA_HISUIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, - [SPECIES_AVALUGG_HISUIAN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 5 }, + [SPECIES_SLIGGOO_HISUIAN] = { .size = MON_COORDS_SIZE(48, 56), .y_offset = 7 }, + [SPECIES_GOODRA_HISUIAN] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 2 }, + [SPECIES_AVALUGG_HISUIAN] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 6 }, #endif #if P_GEN_7_POKEMON == TRUE [SPECIES_DECIDUEYE_HISUIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, @@ -1259,7 +1259,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [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 - [SPECIES_PICHU_SPIKY_EARED] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 14 }, + [SPECIES_PICHU_SPIKY_EARED] = { .size = MON_COORDS_SIZE(32, 40), .y_offset = 13 }, // 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 }, @@ -1314,7 +1314,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [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 }, + [SPECIES_ROTOM_MOW] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, // 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 }, @@ -1343,7 +1343,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = #if P_GEN_5_POKEMON == TRUE // 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 }, + [SPECIES_BASCULIN_WHITE_STRIPED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, // Darmanitan [SPECIES_DARMANITAN_ZEN_MODE] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 }, [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 2 }, @@ -1453,7 +1453,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_ROCKRUFF_OWN_TEMPO] = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 }, // Lycanroc [SPECIES_LYCANROC_MIDNIGHT] = { .size = MON_COORDS_SIZE(56, 61), .y_offset = 0 }, - [SPECIES_LYCANROC_DUSK] = { .size = MON_COORDS_SIZE(57, 58), .y_offset = 6 }, + [SPECIES_LYCANROC_DUSK] = { .size = MON_COORDS_SIZE(57, 58), .y_offset = 5 }, // Wishiwashi [SPECIES_WISHIWASHI_SCHOOL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, // Silvally @@ -1481,13 +1481,13 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_MINIOR_METEOR_BLUE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, [SPECIES_MINIOR_METEOR_INDIGO] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, [SPECIES_MINIOR_METEOR_VIOLET] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, - [SPECIES_MINIOR_CORE_RED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, - [SPECIES_MINIOR_CORE_ORANGE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, - [SPECIES_MINIOR_CORE_YELLOW] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, - [SPECIES_MINIOR_CORE_GREEN] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 }, - [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 }, + [SPECIES_MINIOR_CORE_RED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 16 }, + [SPECIES_MINIOR_CORE_ORANGE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 16 }, + [SPECIES_MINIOR_CORE_YELLOW] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 16 }, + [SPECIES_MINIOR_CORE_GREEN] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 16 }, + [SPECIES_MINIOR_CORE_BLUE] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 16 }, + [SPECIES_MINIOR_CORE_INDIGO] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 16 }, + [SPECIES_MINIOR_CORE_VIOLET] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 16 }, // Mimikyu [SPECIES_MIMIKYU_BUSTED] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 12 }, // Necrozma @@ -1528,44 +1528,44 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [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 }, // Enamorus - [SPECIES_ENAMORUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_ENAMORUS_THERIAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, // Basculegion - [SPECIES_BASCULEGION_FEMALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_BASCULEGION_FEMALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 9 }, // Gigantamax Forms - [SPECIES_VENUSAUR_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_CHARIZARD_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_BLASTOISE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 }, - [SPECIES_BUTTERFREE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, - [SPECIES_PIKACHU_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, - [SPECIES_MEOWTH_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_MACHAMP_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_GENGAR_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, - [SPECIES_KINGLER_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_LAPRAS_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_EEVEE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 }, - [SPECIES_SNORLAX_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_GARBODOR_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_MELMETAL_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_RILLABOOM_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_CINDERACE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_INTELEON_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_CORVIKNIGHT_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, - [SPECIES_ORBEETLE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_DREDNAW_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_COALOSSAL_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_FLAPPLE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_APPLETUN_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, - [SPECIES_SANDACONDA_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TOXTRICITY_AMPED_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_TOXTRICITY_LOW_KEY_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_CENTISKORCH_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_HATTERENE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_GRIMMSNARL_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_ALCREMIE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_COPPERAJAH_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_DURALUDON_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_VENUSAUR_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_CHARIZARD_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_BLASTOISE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_BUTTERFREE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_PIKACHU_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_MEOWTH_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_MACHAMP_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_GENGAR_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, + [SPECIES_KINGLER_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_LAPRAS_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_EEVEE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, + [SPECIES_SNORLAX_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_GARBODOR_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_MELMETAL_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_RILLABOOM_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_CINDERACE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_INTELEON_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_CORVIKNIGHT_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_ORBEETLE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_DREDNAW_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_COALOSSAL_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_FLAPPLE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_APPLETUN_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_SANDACONDA_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_TOXTRICITY_AMPED_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_TOXTRICITY_LOW_KEY_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_CENTISKORCH_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, + [SPECIES_HATTERENE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_GRIMMSNARL_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, + [SPECIES_ALCREMIE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_COPPERAJAH_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 }, + [SPECIES_DURALUDON_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, #endif // Egg [SPECIES_EGG] = { .size = MON_COORDS_SIZE(24, 24), .y_offset = 20 }, diff --git a/src/pokemon.c b/src/pokemon.c index a9c22ae8e7..d4585d8e90 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2207,13 +2207,13 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_BLASTOISE - 1] = ANIM_V_SHAKE_TWICE, [SPECIES_CATERPIE - 1] = ANIM_SWING_CONCAVE, [SPECIES_METAPOD - 1] = ANIM_SWING_CONCAVE, - [SPECIES_BUTTERFREE - 1] = ANIM_H_SLIDE_WOBBLE, + [SPECIES_BUTTERFREE - 1] = ANIM_V_SLIDE_WOBBLE, [SPECIES_WEEDLE - 1] = ANIM_H_SLIDE_SLOW, [SPECIES_KAKUNA - 1] = ANIM_GLOW_ORANGE, [SPECIES_BEEDRILL - 1] = ANIM_ZIGZAG_SLOW, [SPECIES_PIDGEY - 1] = ANIM_V_STRETCH, [SPECIES_PIDGEOTTO - 1] = ANIM_V_STRETCH, - [SPECIES_PIDGEOT - 1] = ANIM_FRONT_FLIP, + [SPECIES_PIDGEOT - 1] = ANIM_GROW_VIBRATE, [SPECIES_RATTATA - 1] = ANIM_H_JUMPS, [SPECIES_RATICATE - 1] = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL, [SPECIES_SPEAROW - 1] = ANIM_V_JUMPS_SMALL, @@ -2268,7 +2268,7 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_WEEPINBELL - 1] = ANIM_SWING_CONVEX, [SPECIES_VICTREEBEL - 1] = ANIM_H_JUMPS_V_STRETCH, [SPECIES_TENTACOOL - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_TENTACRUEL - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_TENTACRUEL - 1] = ANIM_V_SLIDE_WOBBLE, [SPECIES_GEODUDE - 1] = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL, [SPECIES_GRAVELER - 1] = ANIM_V_SHAKE, [SPECIES_GOLEM - 1] = ANIM_ROTATE_UP_SLAM_DOWN, @@ -2281,35 +2281,35 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_FARFETCHD - 1] = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL, [SPECIES_DODUO - 1] = ANIM_H_SHAKE_SLOW, [SPECIES_DODRIO - 1] = ANIM_V_STRETCH, - [SPECIES_SEEL - 1] = ANIM_H_STRETCH, + [SPECIES_SEEL - 1] = ANIM_H_SLIDE_SLOW, [SPECIES_DEWGONG - 1] = ANIM_V_SQUISH_AND_BOUNCE_SLOW, [SPECIES_GRIMER - 1] = ANIM_H_SLIDE_SLOW, - [SPECIES_MUK - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_MUK - 1] = ANIM_DEEP_V_SQUISH_AND_BOUNCE, [SPECIES_SHELLDER - 1] = ANIM_TWIST, - [SPECIES_CLOYSTER - 1] = ANIM_H_SLIDE_WOBBLE, - [SPECIES_GASTLY - 1] = ANIM_CIRCLE_C_CLOCKWISE_SLOW, + [SPECIES_CLOYSTER - 1] = ANIM_V_SHAKE_TWICE, + [SPECIES_GASTLY - 1] = ANIM_SHRINK_GROW, [SPECIES_HAUNTER - 1] = ANIM_FLICKER_INCREASING, [SPECIES_GENGAR - 1] = ANIM_GROW_IN_STAGES, [SPECIES_ONIX - 1] = ANIM_H_SHAKE, [SPECIES_DROWZEE - 1] = ANIM_V_STRETCH, - [SPECIES_HYPNO - 1] = ANIM_H_SLIDE_SLOW, - [SPECIES_KRABBY - 1] = ANIM_H_SLIDE, - [SPECIES_KINGLER - 1] = ANIM_H_SLIDE_SLOW, - [SPECIES_VOLTORB - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_ELECTRODE - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_HYPNO - 1] = ANIM_GROW_VIBRATE, + [SPECIES_KRABBY - 1] = ANIM_H_SLIDE_SLOW, + [SPECIES_KINGLER - 1] = ANIM_V_SHAKE_TWICE, + [SPECIES_VOLTORB - 1] = ANIM_SWING_CONCAVE, + [SPECIES_ELECTRODE - 1] = ANIM_SHRINK_GROW_VIBRATE_SLOW, [SPECIES_EXEGGCUTE - 1] = ANIM_H_SLIDE_SLOW, [SPECIES_EXEGGUTOR - 1] = ANIM_H_JUMPS_V_STRETCH, - [SPECIES_CUBONE - 1] = ANIM_V_JUMPS_SMALL, + [SPECIES_CUBONE - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_MAROWAK - 1] = ANIM_BOUNCE_ROTATE_TO_SIDES, - [SPECIES_HITMONLEE - 1] = ANIM_H_STRETCH, + [SPECIES_HITMONLEE - 1] = ANIM_H_JUMPS_V_STRETCH, [SPECIES_HITMONCHAN - 1] = ANIM_GROW_VIBRATE, - [SPECIES_LICKITUNG - 1] = ANIM_V_SQUISH_AND_BOUNCE_SLOW, + [SPECIES_LICKITUNG - 1] = ANIM_V_STRETCH, [SPECIES_KOFFING - 1] = ANIM_V_SLIDE_WOBBLE_SMALL, [SPECIES_WEEZING - 1] = ANIM_V_SLIDE, [SPECIES_RHYHORN - 1] = ANIM_V_SHAKE, - [SPECIES_RHYDON - 1] = ANIM_H_SHAKE, + [SPECIES_RHYDON - 1] = ANIM_V_STRETCH, [SPECIES_CHANSEY - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_TANGELA - 1] = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL, + [SPECIES_TANGELA - 1] = ANIM_H_JUMPS_V_STRETCH, [SPECIES_KANGASKHAN - 1] = ANIM_V_STRETCH, [SPECIES_HORSEA - 1] = ANIM_V_JUMPS_SMALL, [SPECIES_SEADRA - 1] = ANIM_V_SLIDE, @@ -2435,7 +2435,7 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_STANTLER - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_SMEARGLE - 1] = ANIM_H_JUMPS_V_STRETCH, [SPECIES_TYROGUE - 1] = ANIM_BACK_AND_LUNGE, - [SPECIES_HITMONTOP - 1] = ANIM_H_VIBRATE, + [SPECIES_HITMONTOP - 1] = ANIM_SWING_CONCAVE, [SPECIES_SMOOCHUM - 1] = ANIM_GROW_VIBRATE, [SPECIES_ELEKID - 1] = ANIM_FLASH_YELLOW, [SPECIES_MAGBY - 1] = ANIM_V_SQUISH_AND_BOUNCE, @@ -3653,7 +3653,8 @@ static const u8 sMonAnimationDelayTable[NUM_SPECIES - 1] = [SPECIES_HAUNTER - 1] = 23, [SPECIES_DROWZEE - 1] = 48, [SPECIES_HYPNO - 1] = 40, - [SPECIES_HITMONCHAN - 1] = 25, + [SPECIES_KINGLER - 1] = 4, + [SPECIES_CUBONE - 1] = 30, [SPECIES_SCYTHER - 1] = 10, [SPECIES_TAUROS - 1] = 10, [SPECIES_TYPHLOSION - 1] = 20,