diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 61ad67549..66c82f39e 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -1022,7 +1022,7 @@ .4byte \ptr .endm - .macro trydobeatup endPtr:req, failPtr:req + .macro trydobeatup endPtr=NULL, failPtr=NULL .byte 0xc4 .4byte \endPtr .4byte \failPtr @@ -1941,6 +1941,31 @@ .macro shellsidearmcheck various BS_ATTACKER, VARIOUS_SHELL_SIDE_ARM_CHECK .endm + + .macro jumpifrodaffected battler:req, ptr:req + various \battler, VARIOUS_JUMP_IF_ROD + .4byte \ptr + .endm + + .macro jumpifabsorbaffected battler:req, ptr:req + various \battler, VARIOUS_JUMP_IF_ABSORB + .4byte \ptr + .endm + + .macro jumpifmotoraffected battler:req, ptr:req + various \battler, VARIOUS_JUMP_IF_MOTOR + .4byte \ptr + .endm + + .macro jumpifteanoberry ptr:req + various BS_ATTACKER, VARIOUS_TEATIME_TARGETS + .4byte \ptr + .endm + + .macro jumpifteainvulnerable battler:req, ptr:req + various \battler, VARIOUS_TEATIME_INVUL + .4byte \ptr + .endm .macro jumpifcantfling battler:req, ptr:req various \battler, VARIOUS_JUMP_IF_CANT_FLING @@ -2005,6 +2030,19 @@ .byte \stat .endm + .macro trywindriderpower battler:req, ptr:req + various \battler, VARIOUS_TRY_WIND_RIDER_POWER + .4byte \ptr + .endm + + .macro activateweatherchangeabilities battler:req + various \battler, VARIOUS_ACTIVATE_WEATHER_CHANGE_ABILITIES + .endm + + .macro activateterrainchangeabilities battler:req + various \battler, VARIOUS_ACTIVATE_TERRAIN_CHANGE_ABILITIES + .endm + @ helpful macros .macro setstatchanger stat:req, stages:req, down:req setbyte sSTATCHANGER, \stat | \stages << 3 | \down << 7 @@ -2162,3 +2200,34 @@ .macro trysymbiosis various BS_ATTACKER, VARIOUS_TRY_SYMBIOSIS .endm + + @ Tries to increase or decrease a battler's stat's stat stage by a specified amount. If impossible, jumps to \script. + .macro modifybattlerstatstage battler:req, stat:req, mode:req, amount:req, script:req, animation:req, customString + + @ \mode parameters + INCREASE = FALSE + DECREASE = TRUE + + @ \animation parameters + ANIM_OFF = FALSE + ANIM_ON = TRUE + + setstatchanger \stat, \amount, \mode + statbuffchange STAT_CHANGE_ALLOW_PTR, \script + setgraphicalstatchangevalues + .if \animation == TRUE + playanimation \battler, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1 + .endif + .ifnb \customString + printstring \customString + .else + .if \mode == DECREASE + printfromtable gStatDownStringIds + .else + .if \mode == INCREASE + printfromtable gStatUpStringIds + .endif + .endif + .endif + waitmessage B_WAIT_TIME_LONG + .endm diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 1deac0890..100669465 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -13478,7 +13478,18 @@ Move_DRAGON_DARTS:: end Move_TEATIME:: - goto Move_MILK_DRINK + loadspritegfx ANIM_TAG_TEAPOT + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE + createsprite gThoughtBubbleSpriteTemplate, ANIM_ATTACKER, 11, 0, 100 + playsewithpan SE_M_ICY_WIND, SOUND_PAN_ATTACKER + delay 6 + createsprite gTeapotSpriteTemplate, ANIM_ATTACKER, 12, 0 + createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0 + createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATK_PARTNER, 2, 0 + delay 24 + loopsewithpan SE_M_HEAL_BELL, SOUND_PAN_ATTACKER, 22, 3 + waitforvisualfinish + end Move_OCTOLOCK:: loadspritegfx ANIM_TAG_TENDRILS @@ -24938,7 +24949,7 @@ General_StrongWinds:: General_PrimalReversion:: launchtask AnimTask_PrimalReversion 0x5 0x0 jumpargeq 0x0, ITEM_RED_ORB, General_PrimalReversion_Omega - jumpargeq 0x1, ITEM_BLUE_ORB, General_PrimalReversion_Alpha + jumpargeq 0x0, ITEM_BLUE_ORB, General_PrimalReversion_Alpha General_PrimalReversion_Alpha: loadspritegfx ANIM_TAG_ALPHA_STONE loadspritegfx ANIM_TAG_MEGA_PARTICLES diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 8f5a92c49..c498aa3ab 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -409,12 +409,80 @@ gBattleScriptsForMoveEffects:: .4byte BattleScript_EffectCourtChange @ EFFECT_COURT_CHANGE .4byte BattleScript_EffectSteelBeam @ EFFECT_STEEL_BEAM .4byte BattleScript_EffectExtremeEvoboost @ EFFECT_EXTREME_EVOBOOST - .4byte BattleScript_EffectTerrainHit @ EFFECT_DAMAGE_SET_TERRAIN + .4byte BattleScript_EffectHitSetRemoveTerrain @ EFFECT_HIT_SET_REMOVE_TERRAIN .4byte BattleScript_EffectDarkVoid @ EFFECT_DARK_VOID .4byte BattleScript_EffectSleepHit @ EFFECT_SLEEP_HIT .4byte BattleScript_EffectDoubleShock @ EFFECT_DOUBLE_SHOCK .4byte BattleScript_EffectSpecialAttackUpHit @ EFFECT_SPECIAL_ATTACK_UP_HIT .4byte BattleScript_EffectVictoryDance @ EFFECT_VICTORY_DANCE + .4byte BattleScript_EffectTeatime @ EFFECT_TEATIME + +BattleScript_EffectTeatime:: + attackcanceler + attackstring + ppreduce + jumpifteanoberry BattleScript_ButItFailed +@ at least one battler is affected + attackanimation + waitanimation +BattleScript_TeatimeLoop: + jumpifteainvulnerable BS_TARGET, BattleScript_Teatimevul + jumpifrodaffected BS_TARGET, BattleScript_Teatimerod + jumpifabsorbaffected BS_TARGET, BattleScript_Teatimesorb + jumpifmotoraffected BS_TARGET, BattleScript_Teatimemotor + orword gHitMarker, HITMARKER_NO_ANIMATIONS | 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 + setbyte sBERRY_OVERRIDE, FALSE + removeitem BS_TARGET + moveendto MOVEEND_NEXT_TARGET + jumpifnexttargetvalid BattleScript_TeatimeLoop + moveendcase MOVEEND_CLEAR_BITS + goto BattleScript_MoveEnd +BattleScript_Teatimevul: + moveendto MOVEEND_NEXT_TARGET + jumpifnexttargetvalid BattleScript_TeatimeLoop + moveendcase MOVEEND_CLEAR_BITS + goto BattleScript_MoveEnd +BattleScript_Teatimesorb: + copybyte gBattlerAbility, gBattlerTarget + call BattleScript_AbilityPopUp + moveendto MOVEEND_NEXT_TARGET + jumpifnexttargetvalid BattleScript_TeatimeLoop + moveendcase MOVEEND_CLEAR_BITS + goto BattleScript_MoveEnd +BattleScript_Teatimerod: + copybyte gBattlerAbility, gBattlerTarget + call BattleScript_AbilityPopUp + playstatchangeanimation BS_TARGET, BIT_SPATK, STAT_CHANGE_BY_TWO + setstatchanger STAT_SPATK, 1, FALSE + statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_TeatimeBuffer + jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_TeatimeBuffer + printfromtable gStatUpStringIds + waitmessage 0x40 + moveendto MOVEEND_NEXT_TARGET + jumpifnexttargetvalid BattleScript_TeatimeLoop + moveendcase MOVEEND_CLEAR_BITS + goto BattleScript_MoveEnd +BattleScript_Teatimemotor: + copybyte gBattlerAbility, gBattlerTarget + call BattleScript_AbilityPopUp + playstatchangeanimation BS_TARGET, BIT_SPEED, STAT_CHANGE_BY_TWO + setstatchanger STAT_SPEED, 1, FALSE + statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_TeatimeBuffer + jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_TeatimeBuffer + printfromtable gStatUpStringIds + waitmessage 0x40 + moveendto MOVEEND_NEXT_TARGET + jumpifnexttargetvalid BattleScript_TeatimeLoop + moveendcase MOVEEND_CLEAR_BITS + goto BattleScript_MoveEnd +BattleScript_TeatimeBuffer: + moveendto MOVEEND_NEXT_TARGET + jumpifnexttargetvalid BattleScript_TeatimeLoop + moveendcase MOVEEND_CLEAR_BITS + goto BattleScript_MoveEnd BattleScript_AffectionBasedEndurance:: playanimation BS_TARGET, B_ANIM_AFFECTION_HANGED_ON @@ -2455,6 +2523,7 @@ BattleScript_EffectPsychicTerrain: printfromtable gTerrainStringIds waitmessage B_WAIT_TIME_LONG playanimation BS_ATTACKER, B_ANIM_RESTORE_BG + call BattleScript_ActivateTerrainAbilities call BattleScript_TerrainSeedLoop jumpifabilitypresent ABILITY_MIMICRY, BattleScript_ApplyMimicry goto BattleScript_MoveEnd @@ -2875,8 +2944,38 @@ BattleScript_EffectTailwind: waitanimation printstring STRINGID_TAILWINDBLEW waitmessage B_WAIT_TIME_LONG + call BattleScript_TryTailwindAbilitiesLoop goto BattleScript_MoveEnd +BattleScript_TryTailwindAbilitiesLoop: + savetarget + setbyte gBattlerTarget, 0 +BattleScript_TryTailwindAbilitiesLoop_Iter: + trywindriderpower BS_TARGET, BattleScript_TryTailwindAbilitiesLoop_Increment + jumpifability BS_TARGET, ABILITY_WIND_RIDER, BattleScript_TryTailwindAbilitiesLoop_WindRider + jumpifability BS_TARGET, ABILITY_WIND_POWER, BattleScript_TryTailwindAbilitiesLoop_WindPower +BattleScript_TryTailwindAbilitiesLoop_Increment: + addbyte gBattlerTarget, 0x1 + jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_TryTailwindAbilitiesLoop_Iter +BattleScript_TryTailwindAbilitiesLoop_Ret: + restoretarget + return + +BattleScript_TryTailwindAbilitiesLoop_WindRider: + call BattleScript_AbilityPopUp + modifybattlerstatstage BS_TARGET, STAT_ATK, INCREASE, 1, BattleScript_TryTailwindAbilitiesLoop_Increment, ANIM_ON + goto BattleScript_TryTailwindAbilitiesLoop_Increment + +BattleScript_TryTailwindAbilitiesLoop_WindPower: + call BattleScript_AbilityPopUp + copybyte sSAVED_BATTLER, gBattlerAttacker + copybyte gBattlerAttacker, gBattlerTarget + setcharge + printstring STRINGID_BEINGHITCHARGEDPKMNWITHPOWER + waitmessage B_WAIT_TIME_LONG + copybyte gBattlerAttacker, sSAVED_BATTLER + goto BattleScript_TryTailwindAbilitiesLoop_Increment + BattleScript_EffectMircleEye: attackcanceler accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE @@ -2964,6 +3063,7 @@ BattleScript_EffectHitEscape: resultmessage waitmessage B_WAIT_TIME_LONG jumpifmovehadnoeffect BattleScript_MoveEnd + jumpifability BS_TARGET, ABILITY_GUARD_DOG, BattleScript_MoveEnd seteffectwithchance tryfaintmon BS_TARGET moveendto MOVEEND_ATTACKER_VISIBLE @@ -3085,6 +3185,7 @@ BattleScript_EffectSleep:: jumpifstatus BS_TARGET, STATUS1_SLEEP, BattleScript_AlreadyAsleep jumpifcantmakeasleep BattleScript_CantMakeAsleep jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_LeafGuardProtects + jumpifability BS_TARGET, ABILITY_PURIFYING_SALT, BattleScript_LeafGuardProtects jumpifflowerveil BattleScript_FlowerVeilProtects jumpifability BS_TARGET_SIDE, ABILITY_SWEET_VEIL, BattleScript_SweetVeilProtects jumpifleafguardprotected BS_TARGET, BattleScript_LeafGuardProtects @@ -3554,6 +3655,7 @@ BattleScript_EffectRoar:: attackstring ppreduce jumpifroarfails BattleScript_ButItFailed + jumpifability BS_TARGET, ABILITY_GUARD_DOG, BattleScript_ButItFailed jumpifability BS_TARGET, ABILITY_SUCTION_CUPS, BattleScript_AbilityPreventsPhasingOut jumpifstatus3 BS_TARGET, STATUS3_ROOTED, BattleScript_PrintMonIsRooted accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON @@ -3678,6 +3780,7 @@ BattleScript_EffectToxic:: ppreduce jumpifability BS_TARGET, ABILITY_IMMUNITY, BattleScript_ImmunityProtected jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_LeafGuardProtects + jumpifability BS_TARGET, ABILITY_PURIFYING_SALT, BattleScript_LeafGuardProtects jumpifability BS_TARGET_SIDE, ABILITY_PASTEL_VEIL, BattleScript_PastelVeilProtects jumpifflowerveil BattleScript_FlowerVeilProtects jumpifleafguardprotected BS_TARGET, BattleScript_LeafGuardProtects @@ -4016,6 +4119,7 @@ BattleScript_EffectPoison:: ppreduce jumpifability BS_TARGET, ABILITY_IMMUNITY, BattleScript_ImmunityProtected jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_LeafGuardProtects + jumpifability BS_TARGET, ABILITY_PURIFYING_SALT, BattleScript_LeafGuardProtects jumpifability BS_TARGET_SIDE, ABILITY_PASTEL_VEIL, BattleScript_PastelVeilProtects jumpifflowerveil BattleScript_FlowerVeilProtects jumpifleafguardprotected BS_TARGET, BattleScript_LeafGuardProtects @@ -4042,6 +4146,7 @@ BattleScript_EffectParalyze: ppreduce jumpifability BS_TARGET, ABILITY_LIMBER, BattleScript_LimberProtected jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_LeafGuardProtects + jumpifability BS_TARGET, ABILITY_PURIFYING_SALT, BattleScript_LeafGuardProtects jumpifflowerveil BattleScript_FlowerVeilProtects jumpifleafguardprotected BS_TARGET, BattleScript_LeafGuardProtects jumpifshieldsdown BS_TARGET, BattleScript_LeafGuardProtects @@ -5182,10 +5287,18 @@ BattleScript_EffectTeleportNew: BattleScript_EffectTeleportNewEnd: goto BattleScript_MoveEnd -.if B_BEAT_UP < GEN_5 BattleScript_EffectBeatUp:: attackcanceler accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE +.if B_BEAT_UP >= GEN_5 + attackstring + ppreduce + critcalc + damagecalc + adjustdamage + trydobeatup + goto BattleScript_HitFromAtkAnimation +.else attackstring pause B_WAIT_TIME_SHORT ppreduce @@ -5215,12 +5328,6 @@ BattleScript_BeatUpAttack:: goto BattleScript_BeatUpLoop BattleScript_BeatUpEnd:: end -.else -BattleScript_EffectBeatUp:: - attackcanceler - accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE - addbyte gBattleCommunication, 1 - goto BattleScript_HitFromAtkString .endif BattleScript_EffectSemiInvulnerable:: @@ -5469,6 +5576,7 @@ BattleScript_EffectWillOWisp:: jumpifability BS_TARGET, ABILITY_WATER_VEIL, BattleScript_WaterVeilPrevents jumpifability BS_TARGET, ABILITY_WATER_BUBBLE, BattleScript_WaterVeilPrevents jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_LeafGuardProtects + jumpifability BS_TARGET, ABILITY_PURIFYING_SALT, BattleScript_LeafGuardProtects jumpifflowerveil BattleScript_FlowerVeilProtects jumpifleafguardprotected BS_TARGET, BattleScript_LeafGuardProtects jumpifshieldsdown BS_TARGET, BattleScript_LeafGuardProtects @@ -5761,6 +5869,7 @@ BattleScript_EffectYawn:: jumpifability BS_TARGET, ABILITY_VITAL_SPIRIT, BattleScript_PrintBankAbilityMadeIneffective jumpifability BS_TARGET, ABILITY_INSOMNIA, BattleScript_PrintBankAbilityMadeIneffective jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_PrintBankAbilityMadeIneffective + jumpifability BS_TARGET, ABILITY_PURIFYING_SALT, BattleScript_LeafGuardProtects jumpifflowerveil BattleScript_FlowerVeilProtects jumpifleafguardprotected BS_TARGET, BattleScript_LeafGuardProtects jumpifshieldsdown BS_TARGET, BattleScript_LeafGuardProtects @@ -6643,6 +6752,27 @@ BattleScript_TailwindEnds:: waitmessage B_WAIT_TIME_LONG end2 +BattleScript_WindPowerActivatesEnd2:: + setbyte gBattlerAttacker, 0 +BattleScript_WindPowerLoop: + printstring STRINGID_EMPTYSTRING3 + jumpifability BS_ATTACKER, ABILITY_WIND_POWER, BattleScript_WindPowerLoop_Cont + goto BattleScript_WindPowerIncrement +BattleScript_WindPowerLoop_Cont: + jumpifstatus3 BS_ATTACKER, STATUS3_CHARGED_UP, BattleScript_WindPowerIncrement + goto BattleScript_WindPower_Activate +BattleScript_WindPower_Activate: + call BattleScript_AbilityPopUp + setcharge + printstring STRINGID_BEINGHITCHARGEDPKMNWITHPOWER + waitmessage B_WAIT_TIME_LONG +BattleScript_WindPowerIncrement: + addbyte gBattlerAttacker, 1 + jumpifbytenotequal gBattlerAttacker, gBattlersCount, BattleScript_WindPowerLoop +BattleScript_WindPowerEnd: + destroyabilitypopup + end2 + BattleScript_TrickRoomEnds:: printstring STRINGID_TRICKROOMENDS waitmessage B_WAIT_TIME_LONG @@ -7083,6 +7213,70 @@ BattleScript_GulpMissileGorgingTargetDefenseCantGoLower: waitmessage B_WAIT_TIME_LONG return +BattleScript_SeedSowerActivates:: + pause B_WAIT_TIME_SHORT + call BattleScript_AbilityPopUp + printstring STRINGID_TERRAINBECOMESGRASSY + waitmessage B_WAIT_TIME_LONG + playanimation BS_SCRIPTING, B_ANIM_RESTORE_BG + call BattleScript_ActivateTerrainAbilities + call BattleScript_TerrainSeedLoop + return + +BattleScript_AngerShellActivates:: + call BattleScript_AbilityPopUp + jumpifstat BS_TARGET, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_AngerShellTryDef + jumpifstat BS_TARGET, CMP_LESS_THAN, STAT_SPATK, MAX_STAT_STAGE, BattleScript_AngerShellTryDef + jumpifstat BS_TARGET, CMP_LESS_THAN, STAT_SPEED, MAX_STAT_STAGE, BattleScript_AngerShellTryDef + jumpifstat BS_TARGET, CMP_GREATER_THAN, STAT_DEF, MIN_STAT_STAGE, BattleScript_AngerShellTryDef + jumpifstat BS_TARGET, CMP_EQUAL, STAT_SPDEF, MIN_STAT_STAGE, BattleScript_ButItFailed +BattleScript_AngerShellTryDef:: + setbyte sSTAT_ANIM_PLAYED, FALSE + modifybattlerstatstage BS_ATTACKER, STAT_DEF, DECREASE, 1, BattleScript_AngerShellTrySpDef, ANIM_ON +BattleScript_AngerShellTrySpDef: + modifybattlerstatstage BS_ATTACKER, STAT_SPDEF, DECREASE, 1, BattleScript_AngerShellTryAttack, ANIM_ON +BattleScript_AngerShellTryAttack: + setbyte sSTAT_ANIM_PLAYED, FALSE + modifybattlerstatstage BS_ATTACKER, STAT_ATK, INCREASE, 1, BattleScript_AngerShellTrySpAtk, ANIM_ON +BattleScript_AngerShellTrySpAtk: + modifybattlerstatstage BS_ATTACKER, STAT_SPATK, INCREASE, 1, BattleScript_AngerShellTrySpeed, ANIM_ON +BattleScript_AngerShellTrySpeed: + modifybattlerstatstage BS_ATTACKER, STAT_SPEED, INCREASE, 1, BattleScript_AngerShellRet, ANIM_ON +BattleScript_AngerShellRet: + return + +BattleScript_WindPowerActivates:: +.if B_CHECK_IF_CHARGED_UP == TRUE + jumpifstatus3 BS_ATTACKER, STATUS3_CHARGED_UP, BattleScript_WindPowerActivates_Ret +.endif + call BattleScript_AbilityPopUp + setcharge + printstring STRINGID_BEINGHITCHARGEDPKMNWITHPOWER + waitmessage B_WAIT_TIME_LONG +BattleScript_WindPowerActivates_Ret: + return + +BattleScript_ToxicDebrisActivates:: + call BattleScript_AbilityPopUp + pause B_WAIT_TIME_SHORT + settoxicspikes BattleScript_ToxicDebrisRet + printstring STRINGID_POISONSPIKESSCATTERED + waitmessage B_WAIT_TIME_LONG +BattleScript_ToxicDebrisRet: + return + +BattleScript_EarthEaterActivates:: + call BattleScript_AbilityPopUp + pause B_WAIT_TIME_LONG + tryhealquarterhealth BS_TARGET, BattleScript_EarthEaterRet + orword gHitMarker, HITMARKER_SKIP_DMG_TRACK | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE + healthbarupdate BS_TARGET + datahpupdate BS_TARGET + printstring STRINGID_PKMNREGAINEDHEALTH + waitmessage B_WAIT_TIME_LONG +BattleScript_EarthEaterRet: + return + BattleScript_PerishSongCountGoesDown:: printstring STRINGID_PKMNPERISHCOUNTFELL waitmessage B_WAIT_TIME_LONG @@ -7604,6 +7798,17 @@ BattleScript_BallFetch:: waitmessage B_WAIT_TIME_LONG end3 +BattleScript_CudChewActivates:: + pause B_WAIT_TIME_SHORTEST + call BattleScript_AbilityPopUp + setbyte sBERRY_OVERRIDE, 1 @ override the requirements for eating berries + consumeberry BS_TARGET, FALSE + orword gHitMarker, HITMARKER_SKIP_DMG_TRACK | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE + healthbarupdate BS_ATTACKER + datahpupdate BS_ATTACKER + setbyte sBERRY_OVERRIDE, 0 + end3 + BattleScript_TargetFormChange:: pause 5 copybyte gBattlerAbility, gBattlerTarget @@ -8214,6 +8419,7 @@ BattleScript_WeatherFormChanges:: setbyte sBATTLER, 0 BattleScript_WeatherFormChangesLoop:: tryweatherformdatachange + activateweatherchangeabilities BS_SCRIPTING addbyte sBATTLER, 1 jumpifbytenotequal sBATTLER, gBattlersCount, BattleScript_WeatherFormChangesLoop return @@ -8276,13 +8482,15 @@ BattleScript_IntimidateLoop: jumpifability BS_TARGET, ABILITY_OWN_TEMPO, BattleScript_IntimidatePrevented jumpifability BS_TARGET, ABILITY_OBLIVIOUS, BattleScript_IntimidatePrevented .endif + jumpifability BS_TARGET, ABILITY_GUARD_DOG, BattleScript_IntimidateInReverse BattleScript_IntimidateEffect: - copybyte sBATTLER, gBattlerTarget - statbuffchange STAT_CHANGE_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL + copybyte sBATTLER, gBattlerAttacker + statbuffchange STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_ALLOW_PTR, BattleScript_IntimidateLoopIncrement setgraphicalstatchangevalues playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1 printstring STRINGID_PKMNCUTSATTACKWITH waitmessage B_WAIT_TIME_LONG + copybyte sBATTLER, gBattlerTarget call BattleScript_TryAdrenalineOrb BattleScript_IntimidateLoopIncrement: addbyte gBattlerTarget, 1 @@ -8302,6 +8510,15 @@ BattleScript_IntimidatePrevented: call BattleScript_TryAdrenalineOrb goto BattleScript_IntimidateLoopIncrement +BattleScript_IntimidateInReverse: + copybyte sBATTLER, gBattlerTarget + copybyte gBattlerAbility, gBattlerTarget + call BattleScript_AbilityPopUp + pause B_WAIT_TIME_SHORT + modifybattlerstatstage BS_TARGET, STAT_ATK, INCREASE, 1, BattleScript_IntimidateLoopIncrement, ANIM_ON + call BattleScript_TryAdrenalineOrb + goto BattleScript_IntimidateLoopIncrement + BattleScript_DroughtActivates:: pause B_WAIT_TIME_SHORT call BattleScript_AbilityPopUp @@ -8359,6 +8576,42 @@ BattleScript_DeltaStreamActivates:: playanimation BS_ATTACKER, B_ANIM_STRONG_WINDS end3 +BattleScript_ProtosynthesisActivates:: + call BattleScript_AbilityPopUp + printstring STRINGID_SUNLIGHTACTIVATEDABILITY + waitmessage B_WAIT_TIME_MED + printstring STRINGID_STATWASHEIGHTENED + waitmessage B_WAIT_TIME_MED + end3 + +BattleScript_QuarkDriveActivates:: + call BattleScript_AbilityPopUp + printstring STRINGID_ELECTRICTERRAINACTIVATEDABILITY + waitmessage B_WAIT_TIME_MED + printstring STRINGID_STATWASHEIGHTENED + waitmessage B_WAIT_TIME_MED + end3 + +BattleScript_RuinAbilityActivates:: + call BattleScript_AbilityPopUp + printstring STRINGID_ABILITYWEAKENEDFSURROUNDINGMONSSTAT + waitmessage B_WAIT_TIME_LONG + end3 + +BattleScript_SupremeOverlordActivates:: + pause B_WAIT_TIME_SHORT + call BattleScript_AbilityPopUp + printstring STRINGID_ATTACKERGAINEDSTRENGTHFROMTHEFALLEN + waitmessage B_WAIT_TIME_LONG + end3 + +BattleScript_CostarActivates:: + pause B_WAIT_TIME_SHORT + call BattleScript_AbilityPopUp + printstring STRINGID_PKMNCOPIEDSTATCHANGES + waitmessage B_WAIT_TIME_LONG + end3 + BattleScript_AttackWeakenedByStrongWinds:: pause B_WAIT_TIME_SHORT printstring STRINGID_ATTACKWEAKENEDBSTRONGWINDS @@ -8387,12 +8640,35 @@ BattleScript_TerrainSeedLoop_NextBattler: restoretarget return +BattleScript_ActivateSwitchInAbilities: + copybyte sBATTLER, gBattlerAttacker + setbyte gBattlerAttacker, 0 +BattleScript_ActivateSwitchInAbilities_Loop: + switchinabilities BS_ATTACKER +BattleScript_ActivateSwitchInAbilities_Increment: + addbyte gBattlerAttacker, 1 + jumpifbytenotequal gBattlerAttacker, gBattlersCount, BattleScript_ActivateSwitchInAbilities_Loop + copybyte gBattlerAttacker, sBATTLER + return + +BattleScript_ActivateTerrainAbilities: + copybyte sBATTLER, gBattlerAttacker + setbyte gBattlerAttacker, 0 +BattleScript_ActivateTerrainAbilities_Loop: + activateterrainchangeabilities BS_ATTACKER +BattleScript_ActivateTerrainAbilities_Increment: + addbyte gBattlerAttacker, 1 + jumpifbytenotequal gBattlerAttacker, gBattlersCount, BattleScript_ActivateTerrainAbilities_Loop + copybyte gBattlerAttacker, sBATTLER + return + BattleScript_ElectricSurgeActivates:: pause B_WAIT_TIME_SHORT call BattleScript_AbilityPopUp printstring STRINGID_TERRAINBECOMESELECTRIC waitmessage B_WAIT_TIME_LONG playanimation BS_SCRIPTING, B_ANIM_RESTORE_BG + call BattleScript_ActivateTerrainAbilities call BattleScript_TerrainSeedLoop end3 @@ -8402,6 +8678,7 @@ BattleScript_MistySurgeActivates:: printstring STRINGID_TERRAINBECOMESMISTY waitmessage B_WAIT_TIME_LONG playanimation BS_SCRIPTING, B_ANIM_RESTORE_BG + call BattleScript_ActivateTerrainAbilities call BattleScript_TerrainSeedLoop end3 @@ -8411,6 +8688,7 @@ BattleScript_GrassySurgeActivates:: printstring STRINGID_TERRAINBECOMESGRASSY waitmessage B_WAIT_TIME_LONG playanimation BS_SCRIPTING, B_ANIM_RESTORE_BG + call BattleScript_ActivateTerrainAbilities call BattleScript_TerrainSeedLoop end3 @@ -8420,6 +8698,7 @@ BattleScript_PsychicSurgeActivates:: printstring STRINGID_TERRAINBECOMESPSYCHIC waitmessage B_WAIT_TIME_LONG playanimation BS_SCRIPTING, B_ANIM_RESTORE_BG + call BattleScript_ActivateTerrainAbilities call BattleScript_TerrainSeedLoop end3 @@ -8500,8 +8779,15 @@ BattleScript_MoveStatDrain:: setgraphicalstatchangevalues playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1 waitanimation +.if B_ABSORBING_ABILITY_STRING >= GEN_5 + statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_MoveStatDrain_Cont + printfromtable gStatUpStringIds + waitmessage B_WAIT_TIME_LONG +.else printstring STRINGID_TARGETABILITYSTATRAISE waitmessage B_WAIT_TIME_LONG +.endif +BattleScript_MoveStatDrain_Cont: clearsemiinvulnerablebit tryfaintmon BS_ATTACKER goto BattleScript_MoveEnd @@ -9681,7 +9967,7 @@ BattleScript_ExtremeEvoboostSpDef:: BattleScript_ExtremeEvoboostEnd:: goto BattleScript_MoveEnd -BattleScript_EffectTerrainHit: +BattleScript_EffectHitSetRemoveTerrain: attackcanceler accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring @@ -9703,6 +9989,7 @@ BattleScript_EffectTerrainHit: setterrain BattleScript_TryFaint playanimation BS_ATTACKER, B_ANIM_RESTORE_BG printfromtable gTerrainStringIds + call BattleScript_ActivateTerrainAbilities BattleScript_TryFaint: tryfaintmon BS_TARGET goto BattleScript_MoveEnd @@ -9801,6 +10088,35 @@ BattleScript_DarkTypePreventsPrankster:: orhalfword gMoveResultFlags, MOVE_RESULT_NO_EFFECT goto BattleScript_MoveEnd +BattleScript_WellBakedBodyActivates:: + attackstring + ppreduce + pause B_WAIT_TIME_SHORT + showabilitypopup BS_TARGET + orhalfword gMoveResultFlags, MOVE_RESULT_NO_EFFECT + modifybattlerstatstage BS_TARGET, STAT_DEF, INCREASE, 1, BattleScript_WellBakedBodyEnd, ANIM_ON +BattleScript_WellBakedBodyEnd: + goto BattleScript_MoveEnd + +BattleScript_WindRiderActivatesMoveEnd:: + attackstring + ppreduce + pause B_WAIT_TIME_SHORT + showabilitypopup BS_TARGET + orhalfword gMoveResultFlags, MOVE_RESULT_NO_EFFECT + modifybattlerstatstage BS_TARGET, STAT_ATK, INCREASE, 1, BattleScript_WindRiderActivatesMoveEnd_End, ANIM_ON +BattleScript_WindRiderActivatesMoveEnd_End: + goto BattleScript_MoveEnd + +BattleScript_GoodAsGoldActivates:: + attackstring + ppreduce + showabilitypopup BS_TARGET + pause B_WAIT_TIME_SHORT + printstring STRINGID_ITDOESNTAFFECT + waitmessage B_WAIT_TIME_MED + goto BattleScript_MoveEnd + BattleScript_PastelVeilActivates:: setbyte gBattleCommunication, 0 setbyte gBattleCommunication + 1, 0 diff --git a/data/maps/BattleFrontier_Lounge7/scripts.inc b/data/maps/BattleFrontier_Lounge7/scripts.inc index 9528dd11d..467f6ba9a 100644 --- a/data/maps/BattleFrontier_Lounge7/scripts.inc +++ b/data/maps/BattleFrontier_Lounge7/scripts.inc @@ -145,6 +145,7 @@ BattleFrontier_Lounge7_EventScript_ChooseRightTutorMove:: waitmessage special ShowBattlePointsWindow setvar VAR_TEMP_E, 1 + setvar VAR_0x8004, SCROLL_MULTI_BF_MOVE_TUTOR_2 setvar VAR_0x8006, 0 special ShowScrollableMultichoice waitstate @@ -168,6 +169,7 @@ BattleFrontier_Lounge7_EventScript_ChooseNewRightTutorMove:: message BattleFrontier_Lounge7_Text_TeachWhichMove waitmessage setvar VAR_TEMP_E, 1 + setvar VAR_0x8004, SCROLL_MULTI_BF_MOVE_TUTOR_2 setvar VAR_0x8006, 1 special ShowScrollableMultichoice waitstate diff --git a/data/scripts/repel.inc b/data/scripts/repel.inc index fc32df1d9..ab7924bd2 100644 --- a/data/scripts/repel.inc +++ b/data/scripts/repel.inc @@ -19,6 +19,7 @@ EventScript_RepelUseAnother: lock msgbox Text_UseAnotherRepel, MSGBOX_YESNO .if I_REPEL_LURE_MENU == TRUE + goto_if_eq VAR_RESULT, NO, EventScript_RepelWoreOff_End callnative TryDrawRepelMenu goto_if_eq VAR_RESULT, FALSE, EventScript_RepelWoreOff_Chose waitstate @@ -68,6 +69,7 @@ EventScript_LureUseAnother: lock msgbox Text_UseAnotherLure, MSGBOX_YESNO .if I_REPEL_LURE_MENU == TRUE + goto_if_eq VAR_RESULT, NO, EventScript_LureWoreOff_End callnative TryDrawLureMenu goto_if_eq VAR_RESULT, FALSE, EventScript_LureWoreOff_Chose waitstate diff --git a/gflib/bg.c b/gflib/bg.c index f300e4609..968c46272 100644 --- a/gflib/bg.c +++ b/gflib/bg.c @@ -1053,7 +1053,7 @@ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 widt for (x16 = x; x16 < (x + width); x16++) { CopyTileMapEntry(&firstTileNum, &((u16 *)sGpuBgConfigs2[bg].tilemap)[(u16)GetTileMapIndexFromCoords(x16, y16, attribute, mode, mode2)], paletteSlot, 0, 0); - firstTileNum = (firstTileNum & (MAPGRID_COLLISION_MASK | MAPGRID_ELEVATION_MASK)) + ((firstTileNum + tileNumDelta) & MAPGRID_METATILE_ID_MASK); + firstTileNum = (firstTileNum & 0xFC00) + ((firstTileNum + tileNumDelta) & 0x3FF); } } break; @@ -1064,7 +1064,7 @@ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 widt for (x16 = x; x16 < (x + width); x16++) { ((u8 *)sGpuBgConfigs2[bg].tilemap)[(y16 * mode3) + x16] = firstTileNum; - firstTileNum = (firstTileNum & (MAPGRID_COLLISION_MASK | MAPGRID_ELEVATION_MASK)) + ((firstTileNum + tileNumDelta) & MAPGRID_METATILE_ID_MASK); + firstTileNum = (firstTileNum & 0xFC00) + ((firstTileNum + tileNumDelta) & 0x3FF); } } break; diff --git a/graphics/battle_anims/sprites/new/teapot.pal b/graphics/battle_anims/sprites/new/teapot.pal new file mode 100644 index 000000000..f8319ce12 --- /dev/null +++ b/graphics/battle_anims/sprites/new/teapot.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +10 247 12 +144 141 173 +255 255 255 +207 232 255 +106 104 120 +190 211 255 +166 169 214 +214 171 113 +162 119 89 +72 71 81 +251 255 211 +232 207 121 +255 255 153 +124 86 73 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/sprites/new/teapot.png b/graphics/battle_anims/sprites/new/teapot.png new file mode 100644 index 000000000..6be0680df Binary files /dev/null and b/graphics/battle_anims/sprites/new/teapot.png differ diff --git a/graphics/battle_interface/ball_display_unused_extra.png b/graphics/battle_interface/ball_caught_indicator.png similarity index 100% rename from graphics/battle_interface/ball_display_unused_extra.png rename to graphics/battle_interface/ball_caught_indicator.png diff --git a/graphics/pokemon/abomasnow/anim_front.png b/graphics/pokemon/abomasnow/anim_front.png index b7b43b1fd..3ba7033b8 100644 Binary files a/graphics/pokemon/abomasnow/anim_front.png and b/graphics/pokemon/abomasnow/anim_front.png differ diff --git a/graphics/pokemon/abomasnow/front.png b/graphics/pokemon/abomasnow/front.png index 49a9d0649..eec72b647 100644 Binary files a/graphics/pokemon/abomasnow/front.png and b/graphics/pokemon/abomasnow/front.png differ diff --git a/graphics/pokemon/abomasnow/normal.pal b/graphics/pokemon/abomasnow/normal.pal index 4408f90cd..764cb356c 100644 --- a/graphics/pokemon/abomasnow/normal.pal +++ b/graphics/pokemon/abomasnow/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -48 80 88 -112 160 144 -16 16 16 -64 120 112 -88 104 136 +32 96 88 +80 160 144 +32 40 48 +40 128 112 +96 112 128 248 248 248 -200 200 224 -168 168 192 -168 104 192 -128 72 144 -216 168 208 -152 144 176 -16 16 16 +192 208 216 +168 184 200 +152 112 224 +96 64 184 +216 160 240 +144 152 176 +0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/abra/anim_front.png b/graphics/pokemon/abra/anim_front.png index 927be7344..725024737 100644 Binary files a/graphics/pokemon/abra/anim_front.png and b/graphics/pokemon/abra/anim_front.png differ diff --git a/graphics/pokemon/abra/front.png b/graphics/pokemon/abra/front.png index 362022801..4fa83f553 100644 Binary files a/graphics/pokemon/abra/front.png and b/graphics/pokemon/abra/front.png differ diff --git a/graphics/pokemon/abra/normal.pal b/graphics/pokemon/abra/normal.pal index 5b75ffb31..96bbd5db7 100644 --- a/graphics/pokemon/abra/normal.pal +++ b/graphics/pokemon/abra/normal.pal @@ -4,14 +4,14 @@ JASC-PAL 152 208 160 88 56 8 120 96 24 -240 208 80 -64 48 40 -192 160 56 -248 232 168 -152 120 32 -160 128 112 +248 224 40 +72 48 64 +200 184 32 +240 240 160 +168 136 24 +152 120 120 16 16 16 -104 80 72 +104 72 64 208 176 80 176 160 152 0 0 0 diff --git a/graphics/pokemon/absol/anim_front.png b/graphics/pokemon/absol/anim_front.png index 896b8bca9..9a53d575c 100644 Binary files a/graphics/pokemon/absol/anim_front.png and b/graphics/pokemon/absol/anim_front.png differ diff --git a/graphics/pokemon/absol/normal.pal b/graphics/pokemon/absol/normal.pal index 281044a79..ad45e777e 100644 --- a/graphics/pokemon/absol/normal.pal +++ b/graphics/pokemon/absol/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -48 72 112 -24 32 56 -104 120 176 -72 88 128 -16 16 16 -128 144 176 -248 248 248 -88 96 120 -168 176 224 -200 224 248 -120 56 56 -208 56 64 -224 136 144 +65 74 106 +41 57 57 +115 123 172 +82 90 123 +0 0 0 +139 139 172 +255 255 255 +98 98 131 +180 180 213 +213 222 238 +123 41 49 +205 41 32 +255 123 115 0 0 0 0 0 0 diff --git a/graphics/pokemon/accelgor/anim_front.png b/graphics/pokemon/accelgor/anim_front.png index d7a8355ca..353aa67e0 100644 Binary files a/graphics/pokemon/accelgor/anim_front.png and b/graphics/pokemon/accelgor/anim_front.png differ diff --git a/graphics/pokemon/accelgor/front.png b/graphics/pokemon/accelgor/front.png index 5d5fbc1a5..1f55e29ac 100644 Binary files a/graphics/pokemon/accelgor/front.png and b/graphics/pokemon/accelgor/front.png differ diff --git a/graphics/pokemon/accelgor/normal.pal b/graphics/pokemon/accelgor/normal.pal index 8be8b0685..50360984e 100644 --- a/graphics/pokemon/accelgor/normal.pal +++ b/graphics/pokemon/accelgor/normal.pal @@ -3,16 +3,16 @@ JASC-PAL 16 152 208 160 112 40 48 -168 64 80 -248 96 120 +192 56 104 +248 72 120 16 16 16 -168 128 104 -112 200 112 -80 136 72 -32 40 48 -40 56 80 -112 136 184 -88 104 128 +160 128 104 +64 176 88 +80 120 64 +56 40 24 +40 56 104 +104 128 192 +88 96 128 184 184 200 248 248 248 0 0 0 diff --git a/graphics/pokemon/aerodactyl/anim_front.png b/graphics/pokemon/aerodactyl/anim_front.png index 42874a632..4129852f9 100644 Binary files a/graphics/pokemon/aerodactyl/anim_front.png and b/graphics/pokemon/aerodactyl/anim_front.png differ diff --git a/graphics/pokemon/aerodactyl/front.png b/graphics/pokemon/aerodactyl/front.png index 65a1496f4..da85d812a 100644 Binary files a/graphics/pokemon/aerodactyl/front.png and b/graphics/pokemon/aerodactyl/front.png differ diff --git a/graphics/pokemon/aerodactyl/normal.pal b/graphics/pokemon/aerodactyl/normal.pal index 7f67f0390..a88533ce2 100644 --- a/graphics/pokemon/aerodactyl/normal.pal +++ b/graphics/pokemon/aerodactyl/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 120 104 128 -72 56 80 +64 48 96 184 184 224 152 144 160 -128 96 144 -152 120 184 -176 136 208 +112 80 144 +144 96 200 +168 128 216 16 16 16 248 248 248 200 200 200 56 112 80 -104 56 72 -168 112 120 -224 160 160 +128 32 64 +200 56 72 +224 136 152 72 56 80 diff --git a/graphics/pokemon/aggron/anim_front.png b/graphics/pokemon/aggron/anim_front.png index 026740681..08a5913a7 100644 Binary files a/graphics/pokemon/aggron/anim_front.png and b/graphics/pokemon/aggron/anim_front.png differ diff --git a/graphics/pokemon/aggron/front.png b/graphics/pokemon/aggron/front.png index bb07d0a9d..0d59202ca 100644 Binary files a/graphics/pokemon/aggron/front.png and b/graphics/pokemon/aggron/front.png differ diff --git a/graphics/pokemon/aggron/normal.pal b/graphics/pokemon/aggron/normal.pal index 0f22972a7..6c0edcb15 100644 --- a/graphics/pokemon/aggron/normal.pal +++ b/graphics/pokemon/aggron/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 112 128 144 -80 96 104 +88 88 96 16 16 16 248 248 248 -192 200 200 -152 160 176 -160 168 160 -72 168 208 -128 128 136 +200 200 200 +160 160 168 +168 168 168 +104 192 248 +136 136 136 104 104 104 -64 64 80 -160 104 128 -224 168 192 +80 80 72 +160 48 64 +224 80 80 192 200 200 0 0 0 diff --git a/graphics/pokemon/aipom/anim_front.png b/graphics/pokemon/aipom/anim_front.png index 88b55fdd0..c3e884d87 100644 Binary files a/graphics/pokemon/aipom/anim_front.png and b/graphics/pokemon/aipom/anim_front.png differ diff --git a/graphics/pokemon/aipom/front.png b/graphics/pokemon/aipom/front.png index 384ef8565..227584fcb 100644 Binary files a/graphics/pokemon/aipom/front.png and b/graphics/pokemon/aipom/front.png differ diff --git a/graphics/pokemon/aipom/normal.pal b/graphics/pokemon/aipom/normal.pal index a9004ed8f..795f51deb 100644 --- a/graphics/pokemon/aipom/normal.pal +++ b/graphics/pokemon/aipom/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -120 72 128 -88 32 96 -184 128 192 -152 96 184 -16 16 16 -152 136 104 -208 184 128 -248 232 176 +128 64 168 +80 32 104 +184 120 216 +160 88 192 +0 0 0 +184 136 96 +216 176 112 +248 232 160 248 248 248 -80 144 152 -40 104 120 -120 104 72 168 168 160 +88 88 88 +136 104 64 +192 192 192 0 0 0 0 0 0 diff --git a/graphics/pokemon/alakazam/anim_front.png b/graphics/pokemon/alakazam/anim_front.png index 22364b3e7..2a75e717d 100644 Binary files a/graphics/pokemon/alakazam/anim_front.png and b/graphics/pokemon/alakazam/anim_front.png differ diff --git a/graphics/pokemon/alakazam/front.png b/graphics/pokemon/alakazam/front.png index 3fcd5981b..6ba500cdb 100644 Binary files a/graphics/pokemon/alakazam/front.png and b/graphics/pokemon/alakazam/front.png differ diff --git a/graphics/pokemon/alakazam/normal.pal b/graphics/pokemon/alakazam/normal.pal index 611683409..bffaed05e 100644 --- a/graphics/pokemon/alakazam/normal.pal +++ b/graphics/pokemon/alakazam/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -120 96 24 -240 208 88 -192 160 56 +112 88 8 +248 232 24 +200 176 16 16 16 16 -248 232 168 -104 72 80 -56 32 48 +248 240 168 +104 72 64 +72 48 64 200 184 168 -160 128 112 +152 120 120 88 88 88 248 248 248 176 176 168 -216 216 208 +216 216 216 96 96 88 -112 88 8 +80 48 8 diff --git a/graphics/pokemon/alomomola/anim_front.png b/graphics/pokemon/alomomola/anim_front.png index 8fdf9da30..641299c3f 100644 Binary files a/graphics/pokemon/alomomola/anim_front.png and b/graphics/pokemon/alomomola/anim_front.png differ diff --git a/graphics/pokemon/alomomola/front.png b/graphics/pokemon/alomomola/front.png index 80a1cfb33..bbf90238b 100644 Binary files a/graphics/pokemon/alomomola/front.png and b/graphics/pokemon/alomomola/front.png differ diff --git a/graphics/pokemon/alomomola/normal.pal b/graphics/pokemon/alomomola/normal.pal index 932beea0b..19be03879 100644 --- a/graphics/pokemon/alomomola/normal.pal +++ b/graphics/pokemon/alomomola/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 72 96 -248 192 200 -176 96 112 +136 64 96 +248 184 184 +192 88 120 16 16 16 -96 56 72 -232 144 168 -224 120 152 +96 56 64 +248 136 168 +240 112 128 248 232 240 248 208 224 -200 144 152 -16 32 56 -48 72 112 -192 144 88 +224 136 152 +0 40 48 +0 80 96 +152 136 16 248 248 248 -136 64 96 +0 0 0 diff --git a/graphics/pokemon/altaria/anim_front.png b/graphics/pokemon/altaria/anim_front.png index c3d4b0611..56ae85998 100644 Binary files a/graphics/pokemon/altaria/anim_front.png and b/graphics/pokemon/altaria/anim_front.png differ diff --git a/graphics/pokemon/altaria/front.png b/graphics/pokemon/altaria/front.png index f2386c3ae..d22c4b80c 100644 Binary files a/graphics/pokemon/altaria/front.png and b/graphics/pokemon/altaria/front.png differ diff --git a/graphics/pokemon/altaria/normal.pal b/graphics/pokemon/altaria/normal.pal index 5039733ec..040e4b014 100644 --- a/graphics/pokemon/altaria/normal.pal +++ b/graphics/pokemon/altaria/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -40 120 152 -16 16 16 -48 160 200 -112 200 240 -40 88 112 -160 224 248 +72 96 144 +0 0 0 +16 152 200 +88 192 248 +40 56 88 +152 216 248 248 248 248 -120 136 168 -208 224 240 +112 112 152 +216 224 232 168 176 192 -192 200 232 -173 90 140 -239 165 206 +200 200 224 +224 104 120 +168 56 80 0 0 0 0 0 0 diff --git a/graphics/pokemon/ambipom/anim_front.png b/graphics/pokemon/ambipom/anim_front.png index b037e445a..0cfc58439 100644 Binary files a/graphics/pokemon/ambipom/anim_front.png and b/graphics/pokemon/ambipom/anim_front.png differ diff --git a/graphics/pokemon/ambipom/front.png b/graphics/pokemon/ambipom/front.png index fac8c0cad..064cbb4e6 100644 Binary files a/graphics/pokemon/ambipom/front.png and b/graphics/pokemon/ambipom/front.png differ diff --git a/graphics/pokemon/ambipom/normal.pal b/graphics/pokemon/ambipom/normal.pal index 5da71c6f2..86a9c3948 100644 --- a/graphics/pokemon/ambipom/normal.pal +++ b/graphics/pokemon/ambipom/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -128 56 56 -168 72 72 -240 104 104 +112 72 64 +168 80 64 +248 112 88 16 16 16 -208 176 120 -248 224 160 -120 104 64 -56 40 88 -112 72 136 -168 120 184 -136 96 160 +216 184 112 +248 232 160 +136 104 64 +80 32 104 +128 56 168 +176 96 224 +152 72 192 168 144 96 248 248 248 168 168 160 diff --git a/graphics/pokemon/amoonguss/anim_front.png b/graphics/pokemon/amoonguss/anim_front.png index 8f6e3daab..e959d5ce5 100644 Binary files a/graphics/pokemon/amoonguss/anim_front.png and b/graphics/pokemon/amoonguss/anim_front.png differ diff --git a/graphics/pokemon/amoonguss/front.png b/graphics/pokemon/amoonguss/front.png index fc6ffa783..baec9f8dd 100644 Binary files a/graphics/pokemon/amoonguss/front.png and b/graphics/pokemon/amoonguss/front.png differ diff --git a/graphics/pokemon/amoonguss/normal.pal b/graphics/pokemon/amoonguss/normal.pal index fb605cb67..1a27c77ef 100644 --- a/graphics/pokemon/amoonguss/normal.pal +++ b/graphics/pokemon/amoonguss/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 136 112 88 -72 56 48 -16 16 16 -184 200 176 -96 80 64 -144 144 120 -160 56 80 -208 88 120 +64 48 48 +0 0 0 +200 192 192 +96 72 64 +152 144 128 +168 48 96 +216 80 136 184 184 200 -96 40 56 -240 160 200 -176 112 136 -40 32 40 +104 48 72 +248 168 200 +216 136 160 +40 24 24 0 0 0 0 0 0 diff --git a/graphics/pokemon/ampharos/anim_front.png b/graphics/pokemon/ampharos/anim_front.png index 0defd4e3e..1b3930f64 100644 Binary files a/graphics/pokemon/ampharos/anim_front.png and b/graphics/pokemon/ampharos/anim_front.png differ diff --git a/graphics/pokemon/ampharos/front.png b/graphics/pokemon/ampharos/front.png index 21701e861..cc9711f87 100644 Binary files a/graphics/pokemon/ampharos/front.png and b/graphics/pokemon/ampharos/front.png differ diff --git a/graphics/pokemon/ampharos/normal.pal b/graphics/pokemon/ampharos/normal.pal index e883c9689..dd9818d6b 100644 --- a/graphics/pokemon/ampharos/normal.pal +++ b/graphics/pokemon/ampharos/normal.pal @@ -4,16 +4,16 @@ JASC-PAL 152 208 160 16 16 16 88 80 88 -208 160 48 -168 128 40 -112 88 40 -208 48 72 -248 208 72 -224 88 112 +248 192 16 +200 136 16 +128 88 48 +192 0 0 +248 232 72 +248 32 32 248 248 248 -136 24 40 -184 168 176 -232 224 216 +168 0 0 +176 176 176 +224 224 224 248 176 160 127 63 75 198 121 121 diff --git a/graphics/pokemon/anorith/anim_front.png b/graphics/pokemon/anorith/anim_front.png index 0abc0fd60..914970850 100644 Binary files a/graphics/pokemon/anorith/anim_front.png and b/graphics/pokemon/anorith/anim_front.png differ diff --git a/graphics/pokemon/anorith/front.png b/graphics/pokemon/anorith/front.png index bb410b167..e08948a30 100644 Binary files a/graphics/pokemon/anorith/front.png and b/graphics/pokemon/anorith/front.png differ diff --git a/graphics/pokemon/anorith/normal.pal b/graphics/pokemon/anorith/normal.pal index 6129409de..b82fc5775 100644 --- a/graphics/pokemon/anorith/normal.pal +++ b/graphics/pokemon/anorith/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 0 176 232 16 16 16 -168 176 184 -96 96 96 -144 176 152 -120 152 112 -136 56 56 -232 104 112 -208 72 80 -192 216 200 +176 176 184 +104 104 120 +136 168 136 +112 136 112 +112 56 64 +248 80 80 +216 48 72 +168 200 168 216 216 216 248 248 248 -88 112 80 +88 112 88 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/arbok/anim_front.png b/graphics/pokemon/arbok/anim_front.png index 508beb8bd..a9d2c95e7 100644 Binary files a/graphics/pokemon/arbok/anim_front.png and b/graphics/pokemon/arbok/anim_front.png differ diff --git a/graphics/pokemon/arbok/front.png b/graphics/pokemon/arbok/front.png index 2980a8a49..532677a86 100644 Binary files a/graphics/pokemon/arbok/front.png and b/graphics/pokemon/arbok/front.png differ diff --git a/graphics/pokemon/arbok/normal.pal b/graphics/pokemon/arbok/normal.pal index 75cee0e40..d921ec974 100644 --- a/graphics/pokemon/arbok/normal.pal +++ b/graphics/pokemon/arbok/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -160 144 184 -208 184 224 -128 104 136 -88 56 96 +160 128 192 +192 160 232 +120 96 168 +80 56 120 192 192 192 248 248 248 160 56 96 -208 120 152 -128 48 32 -184 64 56 -224 160 176 -192 152 56 -128 104 136 +216 96 112 +192 64 24 +240 112 72 +240 176 200 +232 224 80 +120 96 168 0 0 0 diff --git a/graphics/pokemon/arcanine/anim_front.png b/graphics/pokemon/arcanine/anim_front.png index 9b504f241..1fc6e9806 100644 Binary files a/graphics/pokemon/arcanine/anim_front.png and b/graphics/pokemon/arcanine/anim_front.png differ diff --git a/graphics/pokemon/arcanine/back.png b/graphics/pokemon/arcanine/back.png index a527a59e9..feb3343d7 100644 Binary files a/graphics/pokemon/arcanine/back.png and b/graphics/pokemon/arcanine/back.png differ diff --git a/graphics/pokemon/arcanine/front.png b/graphics/pokemon/arcanine/front.png index 8385425e3..752a55c9c 100644 Binary files a/graphics/pokemon/arcanine/front.png and b/graphics/pokemon/arcanine/front.png differ diff --git a/graphics/pokemon/arcanine/normal.pal b/graphics/pokemon/arcanine/normal.pal index 943342cf9..e00259609 100644 --- a/graphics/pokemon/arcanine/normal.pal +++ b/graphics/pokemon/arcanine/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 80 48 +112 96 32 16 16 16 -240 208 168 -192 160 128 -96 64 48 -240 144 72 -184 112 64 +248 232 152 +216 192 120 +96 48 0 +224 104 16 +184 80 8 216 216 208 248 248 240 88 104 112 -232 160 120 -158 90 117 -0 0 0 +248 136 24 +168 48 16 +184 152 88 0 0 0 0 0 0 diff --git a/graphics/pokemon/arcanine/shiny.pal b/graphics/pokemon/arcanine/shiny.pal index a60089517..e6ce73d7f 100644 --- a/graphics/pokemon/arcanine/shiny.pal +++ b/graphics/pokemon/arcanine/shiny.pal @@ -14,6 +14,6 @@ JASC-PAL 128 104 96 240 240 144 181 78 66 -0 0 0 +176 144 64 0 0 0 0 0 0 diff --git a/graphics/pokemon/arceus/anim_front.png b/graphics/pokemon/arceus/anim_front.png index 8e1f8a538..867c4730c 100644 Binary files a/graphics/pokemon/arceus/anim_front.png and b/graphics/pokemon/arceus/anim_front.png differ diff --git a/graphics/pokemon/arceus/bug/normal.pal b/graphics/pokemon/arceus/bug/normal.pal index c4d61c164..052761abc 100644 --- a/graphics/pokemon/arceus/bug/normal.pal +++ b/graphics/pokemon/arceus/bug/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 112 112 152 -224 224 216 +232 232 240 16 16 16 -160 168 192 +184 184 192 72 72 96 -72 116 40 -136 208 112 -80 72 88 -48 40 56 -40 76 32 -48 100 56 -232 160 232 -192 116 192 -112 164 56 +80 128 48 +144 224 120 +96 96 112 +56 64 80 +48 96 40 +48 112 56 +248 168 248 +200 112 208 +112 168 56 248 248 248 diff --git a/graphics/pokemon/arceus/dark/normal.pal b/graphics/pokemon/arceus/dark/normal.pal index 8adb3fa6f..12401f0ad 100644 --- a/graphics/pokemon/arceus/dark/normal.pal +++ b/graphics/pokemon/arceus/dark/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 112 112 152 -224 224 216 +232 232 240 16 16 16 -160 168 192 +184 184 192 72 72 96 -68 78 92 -160 164 176 -88 72 80 -64 44 56 -32 44 56 -24 28 24 -232 84 64 -160 56 32 -104 112 128 +72 88 104 +144 152 176 +104 80 96 +72 48 64 +56 64 80 +32 40 40 +248 104 0 +200 0 56 +96 104 120 248 248 248 diff --git a/graphics/pokemon/arceus/dragon/normal.pal b/graphics/pokemon/arceus/dragon/normal.pal index 7c0332135..1020ebdbc 100644 --- a/graphics/pokemon/arceus/dragon/normal.pal +++ b/graphics/pokemon/arceus/dragon/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 112 112 152 -224 224 216 +232 232 240 16 16 16 -160 168 192 +184 184 192 72 72 96 -96 6 124 -192 108 232 -56 116 88 -16 84 40 -96 6 124 -160 32 32 -72 192 72 -56 128 56 -152 44 192 +128 16 160 +184 80 224 +64 104 88 +32 80 56 +104 0 144 +200 0 56 +0 224 0 +0 160 0 +144 32 184 248 248 248 diff --git a/graphics/pokemon/arceus/electric/normal.pal b/graphics/pokemon/arceus/electric/normal.pal index 37cec5e5b..396375181 100644 --- a/graphics/pokemon/arceus/electric/normal.pal +++ b/graphics/pokemon/arceus/electric/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 112 112 152 -224 224 216 +232 232 240 16 16 16 -160 168 192 +184 184 192 72 72 96 -160 156 56 -240 236 136 -92 90 40 -56 48 16 -92 90 40 -160 32 32 -224 180 40 -168 120 32 -208 200 80 +184 160 24 +248 240 88 +112 96 56 +80 64 32 +128 112 0 +192 0 0 +240 128 0 +208 96 0 +224 200 56 248 248 248 diff --git a/graphics/pokemon/arceus/fairy/normal.pal b/graphics/pokemon/arceus/fairy/normal.pal index 89bedb760..c81dfb067 100644 --- a/graphics/pokemon/arceus/fairy/normal.pal +++ b/graphics/pokemon/arceus/fairy/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 112 112 152 -224 224 216 +232 232 240 16 16 16 -160 168 192 +184 184 192 72 72 96 -160 92 112 -248 188 208 -136 52 88 -104 16 64 -96 60 72 -32 60 192 -232 160 208 -192 116 160 -216 140 160 +216 112 144 +248 200 248 +184 112 144 +120 72 96 +136 72 104 +96 56 96 +248 64 144 +200 64 120 +240 144 176 248 248 248 diff --git a/graphics/pokemon/arceus/fighting/normal.pal b/graphics/pokemon/arceus/fighting/normal.pal index 37faf20e9..c093262bb 100644 --- a/graphics/pokemon/arceus/fighting/normal.pal +++ b/graphics/pokemon/arceus/fighting/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 112 112 152 -224 224 216 +232 232 240 16 16 16 -160 168 192 +184 184 192 72 72 96 -112 48 32 -192 116 80 -80 72 88 -48 40 56 -80 24 16 -160 32 32 -224 180 40 -168 120 32 -160 72 48 +104 24 8 +184 80 32 +96 96 112 +56 64 80 +88 16 0 +200 0 56 +240 184 0 +176 112 0 +152 56 32 248 248 248 diff --git a/graphics/pokemon/arceus/fire/normal.pal b/graphics/pokemon/arceus/fire/normal.pal index d351203fc..05cba4390 100644 --- a/graphics/pokemon/arceus/fire/normal.pal +++ b/graphics/pokemon/arceus/fire/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 112 112 152 -224 224 216 +232 232 240 16 16 16 -160 168 192 +184 184 192 72 72 96 -172 38 20 -248 148 32 -112 60 56 -80 28 24 -120 16 8 -172 38 20 -224 208 40 -168 136 32 -216 84 8 +216 48 16 +248 144 32 +128 32 32 +80 16 0 +160 24 16 +200 0 0 +248 232 0 +208 120 0 +248 96 16 248 248 248 diff --git a/graphics/pokemon/arceus/flying/normal.pal b/graphics/pokemon/arceus/flying/normal.pal index 233059fe5..3d62c829b 100644 --- a/graphics/pokemon/arceus/flying/normal.pal +++ b/graphics/pokemon/arceus/flying/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 112 112 152 -224 224 216 +232 232 240 16 16 16 -160 168 192 +184 184 192 72 72 96 -104 112 168 -184 196 248 -80 72 88 -48 40 56 -64 72 120 -48 148 176 -208 244 240 -144 144 168 -144 156 208 +104 112 176 +192 200 248 +96 96 112 +56 64 80 +72 80 144 +48 144 184 +232 232 248 +168 168 176 +144 152 216 248 248 248 diff --git a/graphics/pokemon/arceus/front.png b/graphics/pokemon/arceus/front.png index 72349052d..c143e4e69 100644 Binary files a/graphics/pokemon/arceus/front.png and b/graphics/pokemon/arceus/front.png differ diff --git a/graphics/pokemon/arceus/ghost/normal.pal b/graphics/pokemon/arceus/ghost/normal.pal index 307884148..92061f25c 100644 --- a/graphics/pokemon/arceus/ghost/normal.pal +++ b/graphics/pokemon/arceus/ghost/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 112 112 152 -224 224 216 +232 232 240 16 16 16 -160 168 192 +184 184 192 72 72 96 -80 46 128 -176 120 224 -80 46 128 -48 32 80 -48 16 104 -184 188 88 -232 84 64 -160 56 32 -120 80 184 +88 40 144 +168 96 232 +80 48 136 +64 24 120 +72 32 128 +248 248 0 +240 64 0 +168 32 0 +120 80 192 248 248 248 diff --git a/graphics/pokemon/arceus/grass/normal.pal b/graphics/pokemon/arceus/grass/normal.pal index d62d422dd..898495631 100644 --- a/graphics/pokemon/arceus/grass/normal.pal +++ b/graphics/pokemon/arceus/grass/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 112 112 152 -224 224 216 +232 232 240 16 16 16 -160 168 192 +184 184 192 72 72 96 -64 144 40 -160 252 112 -56 120 64 -28 90 32 -28 90 32 -208 40 48 -224 208 40 -168 136 32 -88 196 56 +64 152 48 +120 248 56 +56 112 80 +24 80 48 +40 104 48 +200 0 64 +248 232 0 +200 176 0 +88 208 56 248 248 248 diff --git a/graphics/pokemon/arceus/ground/normal.pal b/graphics/pokemon/arceus/ground/normal.pal index 832180a3a..b0ffc9a02 100644 --- a/graphics/pokemon/arceus/ground/normal.pal +++ b/graphics/pokemon/arceus/ground/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 112 112 152 -224 224 216 +232 232 240 16 16 16 -160 168 192 +184 184 192 72 72 96 -152 104 32 -216 180 88 -88 84 48 -56 48 16 -112 64 16 -160 32 32 -164 172 200 -128 128 160 -192 140 56 +176 104 24 +224 184 88 +104 88 56 +72 64 32 +144 64 0 +192 0 0 +184 184 200 +128 128 144 +200 144 56 248 248 248 diff --git a/graphics/pokemon/arceus/ice/normal.pal b/graphics/pokemon/arceus/ice/normal.pal index 06f187980..f74dbc1fa 100644 --- a/graphics/pokemon/arceus/ice/normal.pal +++ b/graphics/pokemon/arceus/ice/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 112 112 152 -224 224 216 +232 232 240 16 16 16 -160 168 192 +184 184 192 72 72 96 80 144 184 -176 252 248 -88 136 160 -36 76 96 -36 76 96 -160 32 32 -192 192 232 -136 136 168 -112 184 232 +168 248 248 +72 144 168 +40 96 128 +40 80 96 +200 0 56 +232 232 248 +192 192 200 +128 200 248 248 248 248 diff --git a/graphics/pokemon/arceus/normal.pal b/graphics/pokemon/arceus/normal.pal index f602de85c..7c2734893 100644 --- a/graphics/pokemon/arceus/normal.pal +++ b/graphics/pokemon/arceus/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 112 112 152 -224 224 216 +232 232 240 16 16 16 -160 168 192 +184 184 192 72 72 96 -160 144 56 -248 216 144 -80 72 88 -48 40 56 -104 88 32 -160 32 32 -72 192 72 -56 128 56 -208 176 80 +184 160 24 +248 240 88 +96 96 112 +56 64 80 +128 112 0 +200 0 56 +0 224 0 +0 160 0 +224 200 56 248 248 248 diff --git a/graphics/pokemon/arceus/poison/normal.pal b/graphics/pokemon/arceus/poison/normal.pal index 7f7a066cc..ce8edcc00 100644 --- a/graphics/pokemon/arceus/poison/normal.pal +++ b/graphics/pokemon/arceus/poison/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 112 112 152 -224 224 216 +232 232 240 16 16 16 -160 168 192 +184 184 192 72 72 96 -136 60 152 -216 132 224 -80 72 88 -48 40 56 -88 32 112 -160 32 32 -224 156 216 -184 108 192 +128 48 144 +224 128 232 +96 96 112 +56 64 80 +80 24 96 +200 0 56 +248 160 248 +200 96 216 176 96 184 248 248 248 diff --git a/graphics/pokemon/arceus/psychic/normal.pal b/graphics/pokemon/arceus/psychic/normal.pal index fbb92c93b..0c330517a 100644 --- a/graphics/pokemon/arceus/psychic/normal.pal +++ b/graphics/pokemon/arceus/psychic/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 112 112 152 -224 224 216 +232 232 240 16 16 16 -160 168 192 +184 184 192 72 72 96 -192 44 88 -248 132 168 -80 72 88 -48 40 56 -112 20 48 -160 32 32 -72 192 72 -56 128 56 -232 92 128 +200 24 72 +248 128 176 +96 96 112 +56 64 80 +152 0 48 +200 0 56 +0 224 0 +0 160 0 +240 72 112 248 248 248 diff --git a/graphics/pokemon/arceus/rock/normal.pal b/graphics/pokemon/arceus/rock/normal.pal index ec5fd85f4..60f8739e8 100644 --- a/graphics/pokemon/arceus/rock/normal.pal +++ b/graphics/pokemon/arceus/rock/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 112 112 152 -224 224 216 +232 232 240 16 16 16 -160 168 192 +184 184 192 72 72 96 -104 96 56 -176 172 128 -80 72 88 -48 40 56 -72 64 24 -64 108 64 -208 188 136 -160 144 88 -144 140 96 +112 104 64 +184 176 136 +96 96 112 +56 64 80 +96 88 48 +96 96 96 +224 200 120 +184 152 80 +144 144 96 248 248 248 diff --git a/graphics/pokemon/arceus/steel/normal.pal b/graphics/pokemon/arceus/steel/normal.pal index 703f66ffc..b1c145182 100644 --- a/graphics/pokemon/arceus/steel/normal.pal +++ b/graphics/pokemon/arceus/steel/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 112 112 152 -224 224 216 +232 232 240 16 16 16 -160 168 192 +184 184 192 72 72 96 -128 132 136 -224 228 224 -80 72 88 -48 40 56 -72 76 80 -48 100 56 -224 220 40 -160 152 32 -176 180 184 +128 128 136 +232 232 248 +96 96 112 +56 64 80 +88 88 96 +96 96 96 +240 240 0 +168 168 0 +184 184 192 248 248 248 diff --git a/graphics/pokemon/arceus/water/normal.pal b/graphics/pokemon/arceus/water/normal.pal index b3be4a519..61cd5c15b 100644 --- a/graphics/pokemon/arceus/water/normal.pal +++ b/graphics/pokemon/arceus/water/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 112 112 152 -224 224 216 +232 232 240 16 16 16 -160 168 192 +184 184 192 72 72 96 -8 92 176 -72 204 248 -64 80 108 -24 56 88 +8 96 200 +24 176 248 +0 56 168 +0 40 136 16 48 120 -208 40 48 -40 204 216 -32 148 160 -24 144 224 +200 0 56 +0 232 248 +0 168 208 +8 144 248 248 248 248 diff --git a/graphics/pokemon/archen/anim_front.png b/graphics/pokemon/archen/anim_front.png index db62a5558..128c3cf07 100644 Binary files a/graphics/pokemon/archen/anim_front.png and b/graphics/pokemon/archen/anim_front.png differ diff --git a/graphics/pokemon/archen/front.png b/graphics/pokemon/archen/front.png index 35b7f39a6..ebd166254 100644 Binary files a/graphics/pokemon/archen/front.png and b/graphics/pokemon/archen/front.png differ diff --git a/graphics/pokemon/archen/normal.pal b/graphics/pokemon/archen/normal.pal index 103f02d98..5aa6ad2bd 100644 --- a/graphics/pokemon/archen/normal.pal +++ b/graphics/pokemon/archen/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -88 40 48 -24 72 96 -224 88 88 -40 152 216 -160 64 64 -16 16 16 +80 48 48 +16 48 104 +216 80 72 +48 128 240 +144 64 64 +0 0 0 224 224 224 -168 160 152 -32 112 144 -40 40 40 -80 64 48 -168 128 72 -248 192 112 +152 152 168 +48 80 152 +56 56 56 +80 64 40 +184 144 80 +240 200 96 0 0 0 0 0 0 diff --git a/graphics/pokemon/archeops/anim_front.png b/graphics/pokemon/archeops/anim_front.png index 6824ee95b..12b90b0fc 100644 Binary files a/graphics/pokemon/archeops/anim_front.png and b/graphics/pokemon/archeops/anim_front.png differ diff --git a/graphics/pokemon/archeops/front.png b/graphics/pokemon/archeops/front.png index 314c7def7..bbbf6e3a2 100644 Binary files a/graphics/pokemon/archeops/front.png and b/graphics/pokemon/archeops/front.png differ diff --git a/graphics/pokemon/archeops/normal.pal b/graphics/pokemon/archeops/normal.pal index 0b8de41c3..11de57408 100644 --- a/graphics/pokemon/archeops/normal.pal +++ b/graphics/pokemon/archeops/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -24 64 88 -40 112 152 -40 152 224 +16 48 104 +48 80 152 +48 128 240 248 248 248 -152 144 144 -80 64 32 -176 128 80 -248 192 112 -232 96 88 -160 72 64 -0 176 160 -0 112 104 -160 88 96 -96 48 56 +152 152 168 +96 80 40 +184 144 80 +240 200 96 +216 80 72 +152 72 72 +16 160 144 +8 104 88 +128 64 80 +80 48 48 diff --git a/graphics/pokemon/ariados/anim_front.png b/graphics/pokemon/ariados/anim_front.png index 913cbe6e6..c579c4c01 100644 Binary files a/graphics/pokemon/ariados/anim_front.png and b/graphics/pokemon/ariados/anim_front.png differ diff --git a/graphics/pokemon/ariados/front.png b/graphics/pokemon/ariados/front.png index 2c7dde50e..8d11202a2 100644 Binary files a/graphics/pokemon/ariados/front.png and b/graphics/pokemon/ariados/front.png differ diff --git a/graphics/pokemon/ariados/normal.pal b/graphics/pokemon/ariados/normal.pal index 4b2b177a3..5939c4fcb 100644 --- a/graphics/pokemon/ariados/normal.pal +++ b/graphics/pokemon/ariados/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -88 64 24 -248 200 120 -16 16 16 -200 144 72 -128 104 184 -176 152 216 -80 64 120 -120 24 32 -176 56 72 -232 88 104 -248 128 144 +104 80 24 +248 216 64 +0 0 0 +192 176 72 +152 88 192 +184 128 224 +96 48 152 +136 32 0 +200 40 56 +240 72 112 +240 136 152 104 104 104 -176 176 168 +184 184 184 248 248 248 80 0 0 diff --git a/graphics/pokemon/armaldo/anim_front.png b/graphics/pokemon/armaldo/anim_front.png index 1a88f3cd6..372cd2cfe 100644 Binary files a/graphics/pokemon/armaldo/anim_front.png and b/graphics/pokemon/armaldo/anim_front.png differ diff --git a/graphics/pokemon/armaldo/front.png b/graphics/pokemon/armaldo/front.png index 18899c0e2..2ab629340 100644 Binary files a/graphics/pokemon/armaldo/front.png and b/graphics/pokemon/armaldo/front.png differ diff --git a/graphics/pokemon/armaldo/normal.pal b/graphics/pokemon/armaldo/normal.pal index 67cd62655..1de332d93 100644 --- a/graphics/pokemon/armaldo/normal.pal +++ b/graphics/pokemon/armaldo/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -56 104 136 +80 104 144 16 16 16 -176 200 232 -48 48 56 -128 168 216 -96 96 104 -160 160 160 +160 184 216 +56 64 80 +136 168 208 +104 104 120 +176 176 184 248 248 248 -88 128 168 -208 216 232 -160 40 48 -224 80 88 -200 168 96 -248 224 120 -96 96 104 +104 136 176 +216 216 216 +160 24 32 +232 72 96 +216 176 96 +248 216 104 +104 104 120 diff --git a/graphics/pokemon/aron/anim_front.png b/graphics/pokemon/aron/anim_front.png index 921be8f6f..06cd54cf8 100644 Binary files a/graphics/pokemon/aron/anim_front.png and b/graphics/pokemon/aron/anim_front.png differ diff --git a/graphics/pokemon/aron/front.png b/graphics/pokemon/aron/front.png index a676b8334..72b0da8ec 100644 Binary files a/graphics/pokemon/aron/front.png and b/graphics/pokemon/aron/front.png differ diff --git a/graphics/pokemon/aron/normal.pal b/graphics/pokemon/aron/normal.pal index 427e63043..a3a7d4aea 100644 --- a/graphics/pokemon/aron/normal.pal +++ b/graphics/pokemon/aron/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -80 104 104 -200 208 208 -144 160 160 -32 56 64 -240 240 240 +80 88 104 +208 208 216 +136 144 152 +56 56 72 +248 248 248 16 16 16 96 96 96 -40 128 160 -80 192 232 -64 88 104 -96 128 144 +48 104 152 +104 184 248 +80 80 96 +112 120 144 56 56 64 0 0 0 0 0 0 diff --git a/graphics/pokemon/articuno/anim_front.png b/graphics/pokemon/articuno/anim_front.png index 892ad5b5e..25fe5e13b 100644 Binary files a/graphics/pokemon/articuno/anim_front.png and b/graphics/pokemon/articuno/anim_front.png differ diff --git a/graphics/pokemon/articuno/front.png b/graphics/pokemon/articuno/front.png index a54f2dfe1..d24f9a762 100644 Binary files a/graphics/pokemon/articuno/front.png and b/graphics/pokemon/articuno/front.png differ diff --git a/graphics/pokemon/articuno/normal.pal b/graphics/pokemon/articuno/normal.pal index 6b41f9855..cb595f23e 100644 --- a/graphics/pokemon/articuno/normal.pal +++ b/graphics/pokemon/articuno/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -24 80 128 -152 208 248 -80 136 168 -96 176 232 +0 80 112 +144 192 248 +0 120 184 +104 168 240 16 16 16 8 48 80 32 136 176 -168 192 192 +144 192 248 248 248 248 -96 64 48 -80 56 40 -184 160 152 -128 120 112 -200 240 248 +184 40 56 +88 56 24 +176 144 112 +136 104 80 +200 224 248 192 200 200 diff --git a/graphics/pokemon/audino/anim_front.png b/graphics/pokemon/audino/anim_front.png index b62b9882b..cbdbde042 100644 Binary files a/graphics/pokemon/audino/anim_front.png and b/graphics/pokemon/audino/anim_front.png differ diff --git a/graphics/pokemon/audino/front.png b/graphics/pokemon/audino/front.png index 809b56792..5aad0eb99 100644 Binary files a/graphics/pokemon/audino/front.png and b/graphics/pokemon/audino/front.png differ diff --git a/graphics/pokemon/audino/normal.pal b/graphics/pokemon/audino/normal.pal index f9cd2a500..f14fd9a54 100644 --- a/graphics/pokemon/audino/normal.pal +++ b/graphics/pokemon/audino/normal.pal @@ -12,8 +12,8 @@ JASC-PAL 16 16 16 248 248 248 160 136 96 -112 96 88 -200 184 184 -232 224 216 +96 96 104 +208 208 224 +232 232 240 0 0 0 0 0 0 diff --git a/graphics/pokemon/axew/anim_front.png b/graphics/pokemon/axew/anim_front.png index 2eea59fc9..43d4825ee 100644 Binary files a/graphics/pokemon/axew/anim_front.png and b/graphics/pokemon/axew/anim_front.png differ diff --git a/graphics/pokemon/axew/front.png b/graphics/pokemon/axew/front.png index 3d349d3fe..993b44321 100644 Binary files a/graphics/pokemon/axew/front.png and b/graphics/pokemon/axew/front.png differ diff --git a/graphics/pokemon/axew/normal.pal b/graphics/pokemon/axew/normal.pal index 2e00670b8..1b6c96532 100644 --- a/graphics/pokemon/axew/normal.pal +++ b/graphics/pokemon/axew/normal.pal @@ -9,10 +9,10 @@ JASC-PAL 16 16 16 120 160 112 88 104 88 -184 72 72 +200 0 0 248 248 248 -192 184 176 -88 48 48 +176 176 208 +96 0 0 128 208 112 208 232 160 144 144 104 diff --git a/graphics/pokemon/azelf/anim_front.png b/graphics/pokemon/azelf/anim_front.png index 6a1f9aba2..36dc5a992 100644 Binary files a/graphics/pokemon/azelf/anim_front.png and b/graphics/pokemon/azelf/anim_front.png differ diff --git a/graphics/pokemon/azelf/front.png b/graphics/pokemon/azelf/front.png index 82646121b..67d155bbf 100644 Binary files a/graphics/pokemon/azelf/front.png and b/graphics/pokemon/azelf/front.png differ diff --git a/graphics/pokemon/azelf/normal.pal b/graphics/pokemon/azelf/normal.pal index ad64742b0..bee2e3d8b 100644 --- a/graphics/pokemon/azelf/normal.pal +++ b/graphics/pokemon/azelf/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -32 72 88 -56 112 128 -80 160 176 +56 72 112 +64 96 144 +88 144 192 16 16 16 -96 56 56 -224 104 96 +88 56 64 +232 64 64 168 64 64 248 248 248 -112 184 200 -128 160 184 -176 216 248 -240 200 32 -80 112 128 +112 168 224 +144 152 192 +176 200 240 +248 176 32 +120 112 144 168 136 64 -48 64 72 +64 64 64 diff --git a/graphics/pokemon/azumarill/anim_front.png b/graphics/pokemon/azumarill/anim_front.png index b28b18636..eaeaf0c8e 100644 Binary files a/graphics/pokemon/azumarill/anim_front.png and b/graphics/pokemon/azumarill/anim_front.png differ diff --git a/graphics/pokemon/azumarill/front.png b/graphics/pokemon/azumarill/front.png index a21ca7a5a..6513b5f21 100644 Binary files a/graphics/pokemon/azumarill/front.png and b/graphics/pokemon/azumarill/front.png differ diff --git a/graphics/pokemon/azumarill/normal.pal b/graphics/pokemon/azumarill/normal.pal index 4fcf284ef..f67789782 100644 --- a/graphics/pokemon/azumarill/normal.pal +++ b/graphics/pokemon/azumarill/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -24 80 96 -40 120 168 -80 176 216 +48 80 144 +72 144 224 +112 184 248 16 16 16 -120 48 56 -208 72 80 -216 104 104 -32 144 208 +152 0 8 +200 40 0 +232 80 0 +80 176 240 248 248 248 -128 88 104 +168 48 32 120 200 232 -192 136 168 -200 184 184 -208 208 200 +232 128 120 +192 192 208 +216 224 248 80 176 208 diff --git a/graphics/pokemon/azurill/anim_front.png b/graphics/pokemon/azurill/anim_front.png index 79b48f5e1..3c6b62c47 100644 Binary files a/graphics/pokemon/azurill/anim_front.png and b/graphics/pokemon/azurill/anim_front.png differ diff --git a/graphics/pokemon/azurill/front.png b/graphics/pokemon/azurill/front.png index e4e7e7e2f..269e181dc 100644 Binary files a/graphics/pokemon/azurill/front.png and b/graphics/pokemon/azurill/front.png differ diff --git a/graphics/pokemon/azurill/normal.pal b/graphics/pokemon/azurill/normal.pal index aaa7caeca..db48624d1 100644 --- a/graphics/pokemon/azurill/normal.pal +++ b/graphics/pokemon/azurill/normal.pal @@ -1,18 +1,18 @@ JASC-PAL 0100 16 -152 208 160 -40 96 128 -48 144 192 -128 192 232 -72 168 224 +248 248 192 +56 88 184 +64 120 248 +104 176 248 +88 144 248 16 16 16 -168 88 152 -208 128 152 -168 208 232 +192 72 64 +240 120 112 +160 216 248 48 112 176 -216 232 248 -56 56 88 +224 240 248 +48 64 88 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/bagon/anim_front.png b/graphics/pokemon/bagon/anim_front.png index 784d38eec..fd6e28672 100644 Binary files a/graphics/pokemon/bagon/anim_front.png and b/graphics/pokemon/bagon/anim_front.png differ diff --git a/graphics/pokemon/bagon/front.png b/graphics/pokemon/bagon/front.png index 3a84b0fa5..21314fe08 100644 Binary files a/graphics/pokemon/bagon/front.png and b/graphics/pokemon/bagon/front.png differ diff --git a/graphics/pokemon/bagon/normal.pal b/graphics/pokemon/bagon/normal.pal index a2b6e4a4a..3f04b4fe5 100644 --- a/graphics/pokemon/bagon/normal.pal +++ b/graphics/pokemon/bagon/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -136 120 120 -96 88 88 -232 232 224 -200 200 192 +128 144 144 +72 80 96 +240 240 248 +208 200 216 16 16 16 -160 160 152 -88 136 160 +160 152 176 +88 128 168 248 224 144 192 160 96 -120 176 200 -160 208 224 +96 168 224 +144 208 248 128 112 80 232 232 224 124 74 95 diff --git a/graphics/pokemon/baltoy/anim_front.png b/graphics/pokemon/baltoy/anim_front.png index cf4b1a851..0227496d0 100644 Binary files a/graphics/pokemon/baltoy/anim_front.png and b/graphics/pokemon/baltoy/anim_front.png differ diff --git a/graphics/pokemon/baltoy/front.png b/graphics/pokemon/baltoy/front.png index 2529be0cf..c1bdd8e90 100644 Binary files a/graphics/pokemon/baltoy/front.png and b/graphics/pokemon/baltoy/front.png differ diff --git a/graphics/pokemon/baltoy/normal.pal b/graphics/pokemon/baltoy/normal.pal index e8fa0056f..a1c829101 100644 --- a/graphics/pokemon/baltoy/normal.pal +++ b/graphics/pokemon/baltoy/normal.pal @@ -3,14 +3,14 @@ JASC-PAL 16 152 208 160 16 16 16 -96 80 64 -240 224 184 -176 160 112 -208 200 136 -152 128 96 -152 64 72 -216 96 88 -248 128 112 +96 80 80 +224 224 168 +152 144 72 +192 192 96 +128 128 96 +160 32 64 +216 64 96 +240 128 120 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/banette/anim_front.png b/graphics/pokemon/banette/anim_front.png index 4929293c3..8a7618396 100644 Binary files a/graphics/pokemon/banette/anim_front.png and b/graphics/pokemon/banette/anim_front.png differ diff --git a/graphics/pokemon/banette/front.png b/graphics/pokemon/banette/front.png index c80fc20e1..48a48753e 100644 Binary files a/graphics/pokemon/banette/front.png and b/graphics/pokemon/banette/front.png differ diff --git a/graphics/pokemon/banette/normal.pal b/graphics/pokemon/banette/normal.pal index 04008aaf2..0c367bb88 100644 --- a/graphics/pokemon/banette/normal.pal +++ b/graphics/pokemon/banette/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -96 80 80 -48 48 56 -160 152 152 -128 120 120 -16 16 16 -184 176 176 -192 56 96 +88 80 96 +56 48 64 +152 152 160 +120 120 128 +0 0 0 +176 168 184 +168 40 56 192 64 88 248 248 248 -248 128 136 -64 56 32 -160 136 80 -208 168 72 -112 88 48 -240 216 128 +224 96 112 +80 56 0 +160 120 16 +208 152 56 +120 88 40 +232 184 88 diff --git a/graphics/pokemon/barboach/anim_front.png b/graphics/pokemon/barboach/anim_front.png index d6dddc94f..a1805b0a8 100644 Binary files a/graphics/pokemon/barboach/anim_front.png and b/graphics/pokemon/barboach/anim_front.png differ diff --git a/graphics/pokemon/barboach/front.png b/graphics/pokemon/barboach/front.png index 798563000..78f0c69eb 100644 Binary files a/graphics/pokemon/barboach/front.png and b/graphics/pokemon/barboach/front.png differ diff --git a/graphics/pokemon/barboach/normal.pal b/graphics/pokemon/barboach/normal.pal index 9dd20f600..b16d2dabb 100644 --- a/graphics/pokemon/barboach/normal.pal +++ b/graphics/pokemon/barboach/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -40 128 152 -48 104 120 -88 176 208 -16 16 16 -120 200 240 +16 112 168 +48 88 128 +48 176 224 +0 0 0 +96 200 240 40 48 64 -80 80 88 -208 224 224 -176 192 200 -64 152 184 -144 144 168 +80 80 80 +208 208 216 +184 184 192 +32 144 184 +136 144 160 232 240 240 0 0 0 0 0 0 diff --git a/graphics/pokemon/basculin/anim_front.png b/graphics/pokemon/basculin/anim_front.png index 800c4e257..2981cdbdc 100644 Binary files a/graphics/pokemon/basculin/anim_front.png and b/graphics/pokemon/basculin/anim_front.png differ diff --git a/graphics/pokemon/basculin/blue_striped/front.png b/graphics/pokemon/basculin/blue_striped/front.png index 5f3a435b6..cd6e6cda1 100644 Binary files a/graphics/pokemon/basculin/blue_striped/front.png and b/graphics/pokemon/basculin/blue_striped/front.png differ diff --git a/graphics/pokemon/basculin/blue_striped/normal.pal b/graphics/pokemon/basculin/blue_striped/normal.pal index 58da0489d..5eb98ee61 100644 --- a/graphics/pokemon/basculin/blue_striped/normal.pal +++ b/graphics/pokemon/basculin/blue_striped/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 210 164 +152 208 160 16 16 16 -98 117 113 -222 239 222 -172 183 163 -52 49 56 -78 86 76 -0 99 122 -0 143 183 -50 81 59 -83 178 102 -71 130 77 -255 255 255 +96 96 96 +224 224 224 +160 160 160 +32 48 56 +64 80 80 +0 72 152 +32 128 208 +24 72 24 +64 160 80 +40 112 48 +248 248 248 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/basculin/front.png b/graphics/pokemon/basculin/front.png index 81af37ca8..ac3f6ded3 100644 Binary files a/graphics/pokemon/basculin/front.png and b/graphics/pokemon/basculin/front.png differ diff --git a/graphics/pokemon/basculin/normal.pal b/graphics/pokemon/basculin/normal.pal index 6857b1460..d20ada23c 100644 --- a/graphics/pokemon/basculin/normal.pal +++ b/graphics/pokemon/basculin/normal.pal @@ -3,16 +3,16 @@ JASC-PAL 16 152 208 160 16 16 16 -96 112 112 -216 232 216 -168 176 160 -48 48 56 -72 80 72 -144 56 48 -240 80 80 -80 176 96 -48 80 56 -64 128 72 +96 96 96 +224 224 224 +160 160 160 +32 48 56 +64 80 80 +152 32 24 +248 88 72 +64 160 80 +24 72 24 +40 112 48 248 248 248 0 0 0 0 0 0 diff --git a/graphics/pokemon/bastiodon/anim_front.png b/graphics/pokemon/bastiodon/anim_front.png index c887532c0..3a36e62a3 100644 Binary files a/graphics/pokemon/bastiodon/anim_front.png and b/graphics/pokemon/bastiodon/anim_front.png differ diff --git a/graphics/pokemon/bastiodon/front.png b/graphics/pokemon/bastiodon/front.png index 5d78b4080..c662e853c 100644 Binary files a/graphics/pokemon/bastiodon/front.png and b/graphics/pokemon/bastiodon/front.png differ diff --git a/graphics/pokemon/bastiodon/normal.pal b/graphics/pokemon/bastiodon/normal.pal index 9a404744a..cd8635b50 100644 --- a/graphics/pokemon/bastiodon/normal.pal +++ b/graphics/pokemon/bastiodon/normal.pal @@ -12,7 +12,7 @@ JASC-PAL 248 208 120 104 96 64 32 32 32 -168 96 104 +176 56 72 248 248 248 0 0 0 0 0 0 diff --git a/graphics/pokemon/bayleef/anim_front.png b/graphics/pokemon/bayleef/anim_front.png index 0a5158ccf..3b5b90f51 100644 Binary files a/graphics/pokemon/bayleef/anim_front.png and b/graphics/pokemon/bayleef/anim_front.png differ diff --git a/graphics/pokemon/bayleef/front.png b/graphics/pokemon/bayleef/front.png index 3d2e48acf..24cec2bcb 100644 Binary files a/graphics/pokemon/bayleef/front.png and b/graphics/pokemon/bayleef/front.png differ diff --git a/graphics/pokemon/bayleef/normal.pal b/graphics/pokemon/bayleef/normal.pal index dc76e97d7..2602bc257 100644 --- a/graphics/pokemon/bayleef/normal.pal +++ b/graphics/pokemon/bayleef/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -48 56 24 -96 112 64 -144 184 88 -112 152 72 +40 80 8 +80 120 8 +136 184 48 +104 152 16 16 16 16 -152 128 80 -88 72 32 -248 224 128 -208 184 112 +168 128 40 +104 80 0 +248 232 160 +216 184 112 248 248 248 -248 232 184 -152 56 48 -224 120 112 -144 144 144 -0 0 0 +248 240 200 +208 56 0 +208 136 80 +96 96 96 +192 192 192 diff --git a/graphics/pokemon/beartic/anim_front.png b/graphics/pokemon/beartic/anim_front.png index 26444777b..136ca5ec0 100644 Binary files a/graphics/pokemon/beartic/anim_front.png and b/graphics/pokemon/beartic/anim_front.png differ diff --git a/graphics/pokemon/beautifly/anim_front.png b/graphics/pokemon/beautifly/anim_front.png index de198b039..018925f02 100644 Binary files a/graphics/pokemon/beautifly/anim_front.png and b/graphics/pokemon/beautifly/anim_front.png differ diff --git a/graphics/pokemon/beautifly/front.png b/graphics/pokemon/beautifly/front.png index 00f74fd73..41d5bc0ca 100644 Binary files a/graphics/pokemon/beautifly/front.png and b/graphics/pokemon/beautifly/front.png differ diff --git a/graphics/pokemon/beautifly/normal.pal b/graphics/pokemon/beautifly/normal.pal index 55c4b51ae..5ae2f12e5 100644 --- a/graphics/pokemon/beautifly/normal.pal +++ b/graphics/pokemon/beautifly/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -56 56 56 -176 160 160 -72 72 72 -16 16 16 -120 104 104 -96 88 88 -152 120 80 -248 200 72 -224 160 72 -168 48 80 -224 64 64 -232 216 216 -96 208 248 -0 176 240 +56 56 48 +168 168 160 +80 80 80 +0 0 0 +96 96 96 +104 96 96 +160 128 64 +248 208 40 +232 168 88 +160 72 64 +240 40 56 +224 216 216 +136 208 248 +80 160 248 248 248 232 diff --git a/graphics/pokemon/beedrill/anim_front.png b/graphics/pokemon/beedrill/anim_front.png index 2284c252f..26e0ea3cf 100644 Binary files a/graphics/pokemon/beedrill/anim_front.png and b/graphics/pokemon/beedrill/anim_front.png differ diff --git a/graphics/pokemon/beedrill/front.png b/graphics/pokemon/beedrill/front.png index f6828a1f1..b38fb8993 100644 Binary files a/graphics/pokemon/beedrill/front.png and b/graphics/pokemon/beedrill/front.png differ diff --git a/graphics/pokemon/beedrill/normal.pal b/graphics/pokemon/beedrill/normal.pal index 75cf527c6..6499a81c2 100644 --- a/graphics/pokemon/beedrill/normal.pal +++ b/graphics/pokemon/beedrill/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -120 112 152 +136 120 144 184 168 192 248 248 248 24 24 24 216 200 240 -72 64 104 -120 88 32 -200 144 48 -248 224 136 -232 192 56 -120 32 40 -176 48 56 -224 120 104 -160 112 32 +80 88 120 +120 88 0 +200 152 16 +248 240 160 +248 200 72 +152 0 8 +208 24 48 +248 144 104 +152 120 0 232 224 248 diff --git a/graphics/pokemon/beheeyem/anim_front.png b/graphics/pokemon/beheeyem/anim_front.png index 1ff4d1c5c..f61201cbb 100644 Binary files a/graphics/pokemon/beheeyem/anim_front.png and b/graphics/pokemon/beheeyem/anim_front.png differ diff --git a/graphics/pokemon/beheeyem/front.png b/graphics/pokemon/beheeyem/front.png index 0e9579a44..b8817b50b 100644 Binary files a/graphics/pokemon/beheeyem/front.png and b/graphics/pokemon/beheeyem/front.png differ diff --git a/graphics/pokemon/beheeyem/normal.pal b/graphics/pokemon/beheeyem/normal.pal index 3194944af..57d9a9b39 100644 --- a/graphics/pokemon/beheeyem/normal.pal +++ b/graphics/pokemon/beheeyem/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 80 88 -200 144 128 -88 48 56 -160 104 96 +136 80 56 +216 152 120 +96 64 40 +160 96 72 16 16 16 40 40 40 -16 112 72 -64 192 120 -176 128 136 -112 96 112 -224 184 168 -120 40 24 -224 88 80 -248 232 88 -0 0 0 +32 96 40 +32 152 56 +192 160 120 +136 88 56 +224 192 160 +136 40 40 +200 0 0 +56 176 32 +224 200 0 diff --git a/graphics/pokemon/beldum/anim_front.png b/graphics/pokemon/beldum/anim_front.png index 158f4ede2..e8437e440 100644 Binary files a/graphics/pokemon/beldum/anim_front.png and b/graphics/pokemon/beldum/anim_front.png differ diff --git a/graphics/pokemon/beldum/front.png b/graphics/pokemon/beldum/front.png index cebf0961d..065d7a854 100644 Binary files a/graphics/pokemon/beldum/front.png and b/graphics/pokemon/beldum/front.png differ diff --git a/graphics/pokemon/beldum/normal.pal b/graphics/pokemon/beldum/normal.pal index f9dc9c185..a811b8fe9 100644 --- a/graphics/pokemon/beldum/normal.pal +++ b/graphics/pokemon/beldum/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -88 144 176 -40 72 96 -144 184 208 -64 112 144 +88 160 248 +64 72 128 +128 208 248 +56 96 184 16 16 16 -120 168 200 +72 128 216 248 104 104 -152 72 72 +136 72 72 248 248 248 -240 104 112 -216 216 216 -168 168 176 -96 104 112 -144 152 160 +216 72 80 +224 224 224 +200 200 200 +128 128 128 +176 176 176 0 0 0 diff --git a/graphics/pokemon/bellossom/anim_front.png b/graphics/pokemon/bellossom/anim_front.png index dd690aee8..e46c11c0d 100644 Binary files a/graphics/pokemon/bellossom/anim_front.png and b/graphics/pokemon/bellossom/anim_front.png differ diff --git a/graphics/pokemon/bellossom/front.png b/graphics/pokemon/bellossom/front.png index eb57b8189..c0b1a0e3d 100644 Binary files a/graphics/pokemon/bellossom/front.png and b/graphics/pokemon/bellossom/front.png differ diff --git a/graphics/pokemon/bellossom/normal.pal b/graphics/pokemon/bellossom/normal.pal index a31ae17fd..995ebad76 100644 --- a/graphics/pokemon/bellossom/normal.pal +++ b/graphics/pokemon/bellossom/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 0 176 232 -112 32 16 -232 128 72 +128 0 0 +240 104 0 16 16 16 -248 224 120 -192 160 72 -120 96 32 -208 64 32 +248 240 128 +208 168 72 +144 112 16 +208 32 0 80 120 32 -176 216 128 -152 168 96 +184 232 136 +144 192 64 248 248 248 -88 112 48 -24 64 24 -64 120 72 -104 168 96 +96 128 40 +8 96 56 +48 144 64 +72 208 80 diff --git a/graphics/pokemon/bellsprout/anim_front.png b/graphics/pokemon/bellsprout/anim_front.png index db998a093..caf929916 100644 Binary files a/graphics/pokemon/bellsprout/anim_front.png and b/graphics/pokemon/bellsprout/anim_front.png differ diff --git a/graphics/pokemon/bellsprout/front.png b/graphics/pokemon/bellsprout/front.png index e58788796..4a6d8523b 100644 Binary files a/graphics/pokemon/bellsprout/front.png and b/graphics/pokemon/bellsprout/front.png differ diff --git a/graphics/pokemon/bellsprout/normal.pal b/graphics/pokemon/bellsprout/normal.pal index 5091b3e65..a03d87f63 100644 --- a/graphics/pokemon/bellsprout/normal.pal +++ b/graphics/pokemon/bellsprout/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -160 136 104 +168 120 64 248 248 176 240 240 88 -96 80 64 +88 56 0 208 200 72 248 248 248 16 16 16 -128 104 80 -136 64 56 -240 184 184 -48 104 48 -232 160 160 -152 208 112 -184 120 120 -96 168 104 +144 104 64 +152 32 72 +232 168 176 +64 104 16 +232 136 160 +120 192 80 +208 96 136 +96 160 64 diff --git a/graphics/pokemon/bibarel/anim_front.png b/graphics/pokemon/bibarel/anim_front.png index 6b826dfa3..c9a7d4031 100644 Binary files a/graphics/pokemon/bibarel/anim_front.png and b/graphics/pokemon/bibarel/anim_front.png differ diff --git a/graphics/pokemon/bibarel/front.png b/graphics/pokemon/bibarel/front.png index 648ce53af..1963eb81a 100644 Binary files a/graphics/pokemon/bibarel/front.png and b/graphics/pokemon/bibarel/front.png differ diff --git a/graphics/pokemon/bibarel/normal.pal b/graphics/pokemon/bibarel/normal.pal index c8f3547b5..71a5f280a 100644 --- a/graphics/pokemon/bibarel/normal.pal +++ b/graphics/pokemon/bibarel/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -80 56 32 -192 136 64 +88 56 48 +184 128 72 16 16 16 -136 88 40 -240 208 136 -176 160 104 -192 176 176 +136 88 48 +224 208 152 +168 144 120 +192 192 176 248 248 248 -88 72 64 -232 136 128 -240 64 64 56 48 40 +232 64 32 +176 24 16 +64 56 48 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/bidoof/anim_front.png b/graphics/pokemon/bidoof/anim_front.png index 31677a01f..23c318781 100644 Binary files a/graphics/pokemon/bidoof/anim_front.png and b/graphics/pokemon/bidoof/anim_front.png differ diff --git a/graphics/pokemon/bidoof/front.png b/graphics/pokemon/bidoof/front.png index ef0db513d..299e48749 100644 Binary files a/graphics/pokemon/bidoof/front.png and b/graphics/pokemon/bidoof/front.png differ diff --git a/graphics/pokemon/bidoof/normal.pal b/graphics/pokemon/bidoof/normal.pal index df2d84a3e..018af6413 100644 --- a/graphics/pokemon/bidoof/normal.pal +++ b/graphics/pokemon/bidoof/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -64 48 24 -136 88 40 -184 128 80 -112 80 32 +64 48 16 +152 96 48 +192 136 64 +96 72 48 16 16 16 -184 184 120 -248 224 168 +200 184 128 +248 232 184 248 248 248 -80 64 56 -224 80 80 -160 48 48 -192 192 184 +88 64 40 +232 88 72 +200 184 128 +200 192 192 128 128 128 0 0 0 0 0 0 diff --git a/graphics/pokemon/bisharp/anim_front.png b/graphics/pokemon/bisharp/anim_front.png index c96d28350..d75b02373 100644 Binary files a/graphics/pokemon/bisharp/anim_front.png and b/graphics/pokemon/bisharp/anim_front.png differ diff --git a/graphics/pokemon/bisharp/front.png b/graphics/pokemon/bisharp/front.png index 95d12bf26..003da831f 100644 Binary files a/graphics/pokemon/bisharp/front.png and b/graphics/pokemon/bisharp/front.png differ diff --git a/graphics/pokemon/bisharp/normal.pal b/graphics/pokemon/bisharp/normal.pal index 58c6f51a1..c7ec7b468 100644 --- a/graphics/pokemon/bisharp/normal.pal +++ b/graphics/pokemon/bisharp/normal.pal @@ -4,16 +4,16 @@ JASC-PAL 152 208 160 80 64 32 64 64 64 -152 112 56 -248 200 88 +152 112 32 +248 200 64 16 16 16 -224 208 224 -144 128 128 -72 32 40 -168 152 152 -176 80 80 -120 40 48 -64 64 72 +224 224 224 +128 128 128 +104 24 24 +168 168 168 +192 48 48 +144 48 64 +64 64 80 96 96 112 -40 32 48 +40 40 48 248 248 248 diff --git a/graphics/pokemon/blastoise/anim_front.png b/graphics/pokemon/blastoise/anim_front.png index a9203ec43..ed0b15e70 100644 Binary files a/graphics/pokemon/blastoise/anim_front.png and b/graphics/pokemon/blastoise/anim_front.png differ diff --git a/graphics/pokemon/blastoise/back.png b/graphics/pokemon/blastoise/back.png index 7c800350d..af667e7a4 100644 Binary files a/graphics/pokemon/blastoise/back.png and b/graphics/pokemon/blastoise/back.png differ diff --git a/graphics/pokemon/blastoise/front.png b/graphics/pokemon/blastoise/front.png index 0522432ac..6c87e4fd3 100644 Binary files a/graphics/pokemon/blastoise/front.png and b/graphics/pokemon/blastoise/front.png differ diff --git a/graphics/pokemon/blastoise/normal.pal b/graphics/pokemon/blastoise/normal.pal index 1721e21c9..d21a9f013 100644 --- a/graphics/pokemon/blastoise/normal.pal +++ b/graphics/pokemon/blastoise/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -80 120 176 -48 72 112 -168 184 224 -120 160 208 +248 192 248 +88 136 192 +48 88 144 +128 192 248 +96 168 240 72 72 72 16 16 16 200 200 208 -104 80 56 +96 88 56 144 144 144 -160 120 80 +136 104 80 248 248 248 -192 160 120 -248 224 192 -216 184 144 -136 96 64 +208 200 128 +248 240 184 +200 144 96 +156 136 80 diff --git a/graphics/pokemon/blaziken/anim_front.png b/graphics/pokemon/blaziken/anim_front.png index 8a2416fd3..7e2077423 100644 Binary files a/graphics/pokemon/blaziken/anim_front.png and b/graphics/pokemon/blaziken/anim_front.png differ diff --git a/graphics/pokemon/blaziken/front.png b/graphics/pokemon/blaziken/front.png index 21300b80f..5336ff9b3 100644 Binary files a/graphics/pokemon/blaziken/front.png and b/graphics/pokemon/blaziken/front.png differ diff --git a/graphics/pokemon/blaziken/normal.pal b/graphics/pokemon/blaziken/normal.pal index 01614decb..66f80cf62 100644 --- a/graphics/pokemon/blaziken/normal.pal +++ b/graphics/pokemon/blaziken/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -216 64 40 +184 64 64 16 16 16 -216 184 136 -168 144 104 -232 120 96 -248 136 96 -248 240 216 -104 96 80 -112 40 32 -248 216 104 +192 176 144 +144 128 96 +240 96 96 +248 128 96 +224 224 176 +96 80 72 +128 40 40 +248 216 96 40 120 208 -208 168 96 +224 160 80 160 136 120 248 248 248 136 96 56 diff --git a/graphics/pokemon/blissey/anim_front.png b/graphics/pokemon/blissey/anim_front.png index 96a74a308..81bbd243c 100644 Binary files a/graphics/pokemon/blissey/anim_front.png and b/graphics/pokemon/blissey/anim_front.png differ diff --git a/graphics/pokemon/blissey/front.png b/graphics/pokemon/blissey/front.png index 2a0263161..629594beb 100644 Binary files a/graphics/pokemon/blissey/front.png and b/graphics/pokemon/blissey/front.png differ diff --git a/graphics/pokemon/blissey/normal.pal b/graphics/pokemon/blissey/normal.pal index 7fbdbf991..19ff811eb 100644 --- a/graphics/pokemon/blissey/normal.pal +++ b/graphics/pokemon/blissey/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 48 88 -128 80 112 -248 192 208 +136 56 64 +192 88 96 +248 192 200 16 16 16 -248 160 184 -200 120 152 +248 168 192 +216 128 160 248 248 248 56 40 80 -216 112 112 -80 112 112 -176 224 216 -128 176 176 +208 72 96 +104 104 104 +216 208 208 +176 176 176 248 160 184 0 0 0 0 0 0 diff --git a/graphics/pokemon/blitzle/anim_front.png b/graphics/pokemon/blitzle/anim_front.png index 62857f3fe..73f4dcc8b 100644 Binary files a/graphics/pokemon/blitzle/anim_front.png and b/graphics/pokemon/blitzle/anim_front.png differ diff --git a/graphics/pokemon/blitzle/front.png b/graphics/pokemon/blitzle/front.png index 4d4c121f7..8eb3033d2 100644 Binary files a/graphics/pokemon/blitzle/front.png and b/graphics/pokemon/blitzle/front.png differ diff --git a/graphics/pokemon/blitzle/normal.pal b/graphics/pokemon/blitzle/normal.pal index 242e3fa48..543f4b4ad 100644 --- a/graphics/pokemon/blitzle/normal.pal +++ b/graphics/pokemon/blitzle/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -88 88 88 -232 224 216 -40 32 32 -48 176 208 -48 40 40 +80 80 80 +248 248 248 +24 32 32 +0 168 216 +40 40 40 16 16 16 -152 128 48 -240 216 88 -48 120 136 -64 56 64 -136 128 112 -200 192 176 -136 128 112 +136 112 32 +248 224 0 +0 88 152 +56 56 56 +120 120 120 +200 200 200 +120 120 120 0 0 0 0 0 0 diff --git a/graphics/pokemon/boldore/anim_front.png b/graphics/pokemon/boldore/anim_front.png index 5fe8379dc..c0d5ec5e2 100644 Binary files a/graphics/pokemon/boldore/anim_front.png and b/graphics/pokemon/boldore/anim_front.png differ diff --git a/graphics/pokemon/boldore/front.png b/graphics/pokemon/boldore/front.png index 63f20d0b2..d5fef1c2f 100644 Binary files a/graphics/pokemon/boldore/front.png and b/graphics/pokemon/boldore/front.png differ diff --git a/graphics/pokemon/boldore/normal.pal b/graphics/pokemon/boldore/normal.pal index b65f3a774..ef0f4a880 100644 --- a/graphics/pokemon/boldore/normal.pal +++ b/graphics/pokemon/boldore/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -40 56 96 +40 56 104 16 16 16 -64 80 128 -24 32 56 -80 40 32 -224 80 56 -136 56 40 -240 112 80 -128 96 40 -168 120 48 -248 200 96 +64 80 136 +32 40 56 +112 48 32 +200 72 56 +168 40 24 +248 104 80 +88 64 32 +152 120 16 +248 200 64 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/bonsly/anim_front.png b/graphics/pokemon/bonsly/anim_front.png index c44a6eebe..074473680 100644 Binary files a/graphics/pokemon/bonsly/anim_front.png and b/graphics/pokemon/bonsly/anim_front.png differ diff --git a/graphics/pokemon/bonsly/front.png b/graphics/pokemon/bonsly/front.png index e038a994e..328a0b031 100644 Binary files a/graphics/pokemon/bonsly/front.png and b/graphics/pokemon/bonsly/front.png differ diff --git a/graphics/pokemon/bonsly/normal.pal b/graphics/pokemon/bonsly/normal.pal index 26e43311e..86c2976eb 100644 --- a/graphics/pokemon/bonsly/normal.pal +++ b/graphics/pokemon/bonsly/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -56 88 56 -72 128 80 -184 208 128 -72 184 112 +48 88 24 +88 136 88 +152 216 120 +72 192 64 0 0 0 -120 88 72 -64 48 32 -168 120 80 -200 160 104 -240 216 120 -216 184 48 -200 112 120 +128 104 64 +80 64 48 +168 128 88 +192 160 72 +248 232 120 +240 200 56 +160 64 72 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/bouffalant/anim_front.png b/graphics/pokemon/bouffalant/anim_front.png index 7e0fbb9e7..116a6eebe 100644 Binary files a/graphics/pokemon/bouffalant/anim_front.png and b/graphics/pokemon/bouffalant/anim_front.png differ diff --git a/graphics/pokemon/bouffalant/front.png b/graphics/pokemon/bouffalant/front.png index 57e397209..e3562d816 100644 Binary files a/graphics/pokemon/bouffalant/front.png and b/graphics/pokemon/bouffalant/front.png differ diff --git a/graphics/pokemon/bouffalant/normal.pal b/graphics/pokemon/bouffalant/normal.pal index 721ce9202..9dce91e75 100644 --- a/graphics/pokemon/bouffalant/normal.pal +++ b/graphics/pokemon/bouffalant/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -64 56 48 -96 80 72 -16 16 16 -72 48 24 -152 104 56 -104 72 40 -128 104 88 -200 176 128 -232 192 80 -248 240 200 -160 128 56 -56 56 64 -112 96 112 -152 160 168 -200 176 128 +49 41 32 +74 65 49 +0 0 0 +74 49 24 +148 106 49 +106 74 41 +156 131 90 +246 213 156 +255 197 74 +255 246 205 +172 139 41 +57 57 65 +106 106 115 +156 164 164 +189 164 123 diff --git a/graphics/pokemon/braviary/anim_front.png b/graphics/pokemon/braviary/anim_front.png index c6c6194e6..7cfc167a5 100644 Binary files a/graphics/pokemon/braviary/anim_front.png and b/graphics/pokemon/braviary/anim_front.png differ diff --git a/graphics/pokemon/braviary/front.png b/graphics/pokemon/braviary/front.png index 4e37d13a0..8efa81512 100644 Binary files a/graphics/pokemon/braviary/front.png and b/graphics/pokemon/braviary/front.png differ diff --git a/graphics/pokemon/braviary/normal.pal b/graphics/pokemon/braviary/normal.pal index a7c143390..080f4c38e 100644 --- a/graphics/pokemon/braviary/normal.pal +++ b/graphics/pokemon/braviary/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -56 24 24 -104 40 40 -160 56 56 +72 16 0 +112 32 32 +160 48 48 16 16 16 -56 40 56 -80 72 104 -176 168 136 -248 240 224 -240 224 184 -88 64 40 -176 168 152 -64 48 64 -168 128 72 -248 200 104 -32 104 176 +64 48 32 +80 80 112 +160 144 104 +224 224 224 +208 200 168 +96 80 32 +168 168 176 +48 48 72 +184 152 16 +232 208 88 +24 96 168 diff --git a/graphics/pokemon/breloom/anim_front.png b/graphics/pokemon/breloom/anim_front.png index 630ddd030..7dd5f4869 100644 Binary files a/graphics/pokemon/breloom/anim_front.png and b/graphics/pokemon/breloom/anim_front.png differ diff --git a/graphics/pokemon/breloom/front.png b/graphics/pokemon/breloom/front.png index 1556680ca..ebfe14335 100644 Binary files a/graphics/pokemon/breloom/front.png and b/graphics/pokemon/breloom/front.png differ diff --git a/graphics/pokemon/breloom/normal.pal b/graphics/pokemon/breloom/normal.pal index 105e8d9b6..e51660a7a 100644 --- a/graphics/pokemon/breloom/normal.pal +++ b/graphics/pokemon/breloom/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 0 176 232 -48 80 40 -136 184 128 -96 144 88 -128 32 40 -240 120 128 -16 16 16 -200 64 80 +32 80 48 +128 176 112 +96 144 80 +128 32 56 +240 96 104 +0 0 0 +184 48 72 176 152 120 96 72 56 -208 184 144 -232 216 184 +216 184 136 +240 216 168 248 248 248 -153 96 121 -204 148 190 +168 16 0 +232 64 48 0 0 0 diff --git a/graphics/pokemon/bronzong/anim_front.png b/graphics/pokemon/bronzong/anim_front.png index 1eaf22900..6ac7575ed 100644 Binary files a/graphics/pokemon/bronzong/anim_front.png and b/graphics/pokemon/bronzong/anim_front.png differ diff --git a/graphics/pokemon/bronzong/front.png b/graphics/pokemon/bronzong/front.png index 3d27ef4e5..8ede6d683 100644 Binary files a/graphics/pokemon/bronzong/front.png and b/graphics/pokemon/bronzong/front.png differ diff --git a/graphics/pokemon/bronzong/normal.pal b/graphics/pokemon/bronzong/normal.pal index d61b8f8c3..68fd123fb 100644 --- a/graphics/pokemon/bronzong/normal.pal +++ b/graphics/pokemon/bronzong/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -56 120 120 -32 64 72 -136 216 200 -88 184 168 +32 112 128 +32 72 88 +112 208 232 +64 168 200 16 16 16 -80 152 144 -136 168 152 -152 208 192 -192 240 224 -56 96 96 -136 88 88 -224 96 88 +48 144 176 +136 168 176 +160 192 200 +184 208 216 +24 88 112 +152 104 120 +248 72 72 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/bronzor/anim_front.png b/graphics/pokemon/bronzor/anim_front.png index bdefc0d5a..e9d219a38 100644 Binary files a/graphics/pokemon/bronzor/anim_front.png and b/graphics/pokemon/bronzor/anim_front.png differ diff --git a/graphics/pokemon/bronzor/front.png b/graphics/pokemon/bronzor/front.png index 15b9a8372..71a928cc3 100644 Binary files a/graphics/pokemon/bronzor/front.png and b/graphics/pokemon/bronzor/front.png differ diff --git a/graphics/pokemon/bronzor/normal.pal b/graphics/pokemon/bronzor/normal.pal index 770eb182a..3bc74c7f7 100644 --- a/graphics/pokemon/bronzor/normal.pal +++ b/graphics/pokemon/bronzor/normal.pal @@ -2,14 +2,14 @@ JASC-PAL 0100 16 152 208 160 -24 56 64 -48 136 152 -32 88 112 -88 176 184 +16 56 72 +40 128 160 +24 88 120 +64 160 192 16 16 16 -240 184 96 +248 216 112 144 176 136 -128 200 200 +96 192 224 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/budew/anim_front.png b/graphics/pokemon/budew/anim_front.png index 089eddb32..1c8e447f5 100644 Binary files a/graphics/pokemon/budew/anim_front.png and b/graphics/pokemon/budew/anim_front.png differ diff --git a/graphics/pokemon/budew/front.png b/graphics/pokemon/budew/front.png index 3b232c4b1..09a81838a 100644 Binary files a/graphics/pokemon/budew/front.png and b/graphics/pokemon/budew/front.png differ diff --git a/graphics/pokemon/budew/normal.pal b/graphics/pokemon/budew/normal.pal index 8db24b7b6..0e710e61d 100644 --- a/graphics/pokemon/budew/normal.pal +++ b/graphics/pokemon/budew/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -112 160 56 +112 160 72 192 224 144 16 16 16 56 88 40 -128 200 80 -120 120 48 -232 232 104 -152 168 64 -40 72 32 -64 112 48 -80 144 64 +120 208 88 +144 128 0 +248 232 104 +224 184 56 +32 80 72 +48 120 96 +72 144 112 160 200 120 216 120 128 0 0 0 diff --git a/graphics/pokemon/buizel/anim_front.png b/graphics/pokemon/buizel/anim_front.png index 2cca44ba6..3cdc6e327 100644 Binary files a/graphics/pokemon/buizel/anim_front.png and b/graphics/pokemon/buizel/anim_front.png differ diff --git a/graphics/pokemon/buizel/front.png b/graphics/pokemon/buizel/front.png index 4794f1d58..e52b77c57 100644 Binary files a/graphics/pokemon/buizel/front.png and b/graphics/pokemon/buizel/front.png differ diff --git a/graphics/pokemon/buizel/normal.pal b/graphics/pokemon/buizel/normal.pal index dfab66d4b..592c4dd20 100644 --- a/graphics/pokemon/buizel/normal.pal +++ b/graphics/pokemon/buizel/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -168 80 40 -232 128 56 +168 88 32 +232 120 24 96 56 32 24 24 24 -64 112 128 -208 176 104 -104 192 232 -248 232 176 +32 96 160 +216 192 128 +96 184 224 +240 240 176 248 248 248 96 88 88 216 216 232 -248 208 56 -192 152 48 +248 216 0 +224 160 48 200 104 40 0 0 0 diff --git a/graphics/pokemon/bulbasaur/anim_front.png b/graphics/pokemon/bulbasaur/anim_front.png index c0a4f5d8f..ad2a2f4ec 100644 Binary files a/graphics/pokemon/bulbasaur/anim_front.png and b/graphics/pokemon/bulbasaur/anim_front.png differ diff --git a/graphics/pokemon/bulbasaur/back.png b/graphics/pokemon/bulbasaur/back.png index c19e3c171..a16779fc7 100644 Binary files a/graphics/pokemon/bulbasaur/back.png and b/graphics/pokemon/bulbasaur/back.png differ diff --git a/graphics/pokemon/bulbasaur/front.png b/graphics/pokemon/bulbasaur/front.png index 9c43bed4a..cd7a485b9 100644 Binary files a/graphics/pokemon/bulbasaur/front.png and b/graphics/pokemon/bulbasaur/front.png differ diff --git a/graphics/pokemon/bulbasaur/normal.pal b/graphics/pokemon/bulbasaur/normal.pal index dea43adff..2df2358d9 100644 --- a/graphics/pokemon/bulbasaur/normal.pal +++ b/graphics/pokemon/bulbasaur/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -208 248 184 +248 192 248 40 96 48 -112 184 112 +96 192 112 16 16 16 -72 136 72 -152 208 160 -40 80 64 -80 144 128 -160 216 184 -56 120 88 -96 184 144 -160 40 48 +56 144 72 +144 216 144 +24 72 72 +56 144 144 +128 232 192 +48 112 112 +96 208 176 +168 0 48 248 248 248 248 104 96 -104 64 88 -184 120 152 +160 48 16 +200 200 200 diff --git a/graphics/pokemon/bulbasaur/shiny.pal b/graphics/pokemon/bulbasaur/shiny.pal index fa53f927f..30895158b 100644 --- a/graphics/pokemon/bulbasaur/shiny.pal +++ b/graphics/pokemon/bulbasaur/shiny.pal @@ -16,4 +16,4 @@ JASC-PAL 248 248 248 248 128 120 184 56 48 -248 128 120 +200 200 200 diff --git a/graphics/pokemon/buneary/anim_front.png b/graphics/pokemon/buneary/anim_front.png index 927b92507..5d6bb799d 100644 Binary files a/graphics/pokemon/buneary/anim_front.png and b/graphics/pokemon/buneary/anim_front.png differ diff --git a/graphics/pokemon/buneary/front.png b/graphics/pokemon/buneary/front.png index f204cb020..efb01359d 100644 Binary files a/graphics/pokemon/buneary/front.png and b/graphics/pokemon/buneary/front.png differ diff --git a/graphics/pokemon/buneary/normal.pal b/graphics/pokemon/buneary/normal.pal index 3bab71a53..499f3a9ac 100644 --- a/graphics/pokemon/buneary/normal.pal +++ b/graphics/pokemon/buneary/normal.pal @@ -10,8 +10,8 @@ JASC-PAL 16 16 16 136 88 56 112 64 72 -216 144 152 -168 96 112 +248 136 160 +192 88 120 248 248 248 56 40 24 0 0 0 diff --git a/graphics/pokemon/burmy/anim_front.png b/graphics/pokemon/burmy/anim_front.png index 5eaebd47e..8047a7896 100644 Binary files a/graphics/pokemon/burmy/anim_front.png and b/graphics/pokemon/burmy/anim_front.png differ diff --git a/graphics/pokemon/burmy/front.png b/graphics/pokemon/burmy/front.png index 9612600e4..20e449da8 100644 Binary files a/graphics/pokemon/burmy/front.png and b/graphics/pokemon/burmy/front.png differ diff --git a/graphics/pokemon/burmy/normal.pal b/graphics/pokemon/burmy/normal.pal index 6895b8b9c..f7de8d3ec 100644 --- a/graphics/pokemon/burmy/normal.pal +++ b/graphics/pokemon/burmy/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -40 40 48 -136 136 120 -56 56 56 -88 88 96 +41 41 49 +90 90 90 +57 57 65 +131 131 123 16 16 16 -32 64 32 -112 160 80 -72 120 48 -248 200 48 -160 128 24 -152 112 72 -88 64 40 +49 74 57 +123 156 74 +82 115 65 +255 213 74 +156 139 41 +139 106 74 +98 74 57 192 152 104 0 0 0 0 0 0 diff --git a/graphics/pokemon/burmy/sandy_cloak/anim_front.png b/graphics/pokemon/burmy/sandy_cloak/anim_front.png index 0819e2b4c..32c1ceb46 100644 Binary files a/graphics/pokemon/burmy/sandy_cloak/anim_front.png and b/graphics/pokemon/burmy/sandy_cloak/anim_front.png differ diff --git a/graphics/pokemon/burmy/sandy_cloak/front.png b/graphics/pokemon/burmy/sandy_cloak/front.png index 4dadea3df..13f9c353a 100644 Binary files a/graphics/pokemon/burmy/sandy_cloak/front.png and b/graphics/pokemon/burmy/sandy_cloak/front.png differ diff --git a/graphics/pokemon/burmy/sandy_cloak/normal.pal b/graphics/pokemon/burmy/sandy_cloak/normal.pal index 498bc6ef4..e88cc7b0c 100644 --- a/graphics/pokemon/burmy/sandy_cloak/normal.pal +++ b/graphics/pokemon/burmy/sandy_cloak/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -40 40 48 -136 136 120 -56 56 56 -88 88 96 +41 41 49 +132 132 123 +58 58 66 +90 90 90 16 16 16 -136 128 88 -240 216 144 -96 80 80 -176 152 104 -248 200 48 -160 128 24 -96 104 112 -128 152 152 +132 115 99 +214 197 115 +99 82 82 +173 148 115 +255 214 74 +156 140 41 +99 107 107 +132 140 140 240 216 144 0 0 0 diff --git a/graphics/pokemon/burmy/trash_cloak/anim_front.png b/graphics/pokemon/burmy/trash_cloak/anim_front.png index d24fb3427..ec25c45f3 100644 Binary files a/graphics/pokemon/burmy/trash_cloak/anim_front.png and b/graphics/pokemon/burmy/trash_cloak/anim_front.png differ diff --git a/graphics/pokemon/burmy/trash_cloak/front.png b/graphics/pokemon/burmy/trash_cloak/front.png index 585d07238..39004627d 100644 Binary files a/graphics/pokemon/burmy/trash_cloak/front.png and b/graphics/pokemon/burmy/trash_cloak/front.png differ diff --git a/graphics/pokemon/burmy/trash_cloak/normal.pal b/graphics/pokemon/burmy/trash_cloak/normal.pal index 68533a009..3be75e1e9 100644 --- a/graphics/pokemon/burmy/trash_cloak/normal.pal +++ b/graphics/pokemon/burmy/trash_cloak/normal.pal @@ -9,8 +9,8 @@ JASC-PAL 16 16 16 136 80 88 96 64 72 -192 104 112 -232 160 144 +176 104 120 +240 144 152 248 200 48 160 128 24 120 120 128 diff --git a/graphics/pokemon/butterfree/anim_front.png b/graphics/pokemon/butterfree/anim_front.png index 58e1f5e10..ee2ef504a 100644 Binary files a/graphics/pokemon/butterfree/anim_front.png and b/graphics/pokemon/butterfree/anim_front.png differ diff --git a/graphics/pokemon/butterfree/front.png b/graphics/pokemon/butterfree/front.png index fe1b9ceea..fb8f2bc34 100644 Binary files a/graphics/pokemon/butterfree/front.png and b/graphics/pokemon/butterfree/front.png differ diff --git a/graphics/pokemon/butterfree/normal.pal b/graphics/pokemon/butterfree/normal.pal index e3eb5312f..8467d6e81 100644 --- a/graphics/pokemon/butterfree/normal.pal +++ b/graphics/pokemon/butterfree/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -16 16 16 -40 32 56 -72 56 112 -144 128 168 +0 0 0 +48 48 48 +64 48 96 +128 120 144 232 232 248 -96 88 144 +96 80 120 184 184 224 -216 88 80 +224 96 128 96 48 56 -232 168 160 +248 152 176 48 48 80 -184 56 48 -56 128 160 -96 184 208 +216 48 48 +80 120 192 +104 184 200 240 248 248 diff --git a/graphics/pokemon/cacnea/anim_front.png b/graphics/pokemon/cacnea/anim_front.png index ede9c40b8..5d0969d8f 100644 Binary files a/graphics/pokemon/cacnea/anim_front.png and b/graphics/pokemon/cacnea/anim_front.png differ diff --git a/graphics/pokemon/cacnea/front.png b/graphics/pokemon/cacnea/front.png index 5cf6efd8f..2fa30c173 100644 Binary files a/graphics/pokemon/cacnea/front.png and b/graphics/pokemon/cacnea/front.png differ diff --git a/graphics/pokemon/cacnea/normal.pal b/graphics/pokemon/cacnea/normal.pal index d669aeda0..85eb8be5c 100644 --- a/graphics/pokemon/cacnea/normal.pal +++ b/graphics/pokemon/cacnea/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 0 176 232 16 16 16 -128 112 64 -248 224 144 -224 184 88 -48 80 32 -112 184 128 -72 144 88 -72 112 80 -152 192 112 -112 152 80 -184 224 160 -72 112 48 -40 40 40 +136 104 56 +248 224 56 +240 184 24 +32 80 0 +96 184 104 +48 144 72 +24 104 48 +144 192 80 +112 152 56 +184 216 120 +72 112 16 +0 56 16 248 248 248 0 0 0 diff --git a/graphics/pokemon/cacturne/anim_front.png b/graphics/pokemon/cacturne/anim_front.png index 3d391e864..b9ab8625d 100644 Binary files a/graphics/pokemon/cacturne/anim_front.png and b/graphics/pokemon/cacturne/anim_front.png differ diff --git a/graphics/pokemon/cacturne/front.png b/graphics/pokemon/cacturne/front.png index 97a1373a9..0e7587f6f 100644 Binary files a/graphics/pokemon/cacturne/front.png and b/graphics/pokemon/cacturne/front.png differ diff --git a/graphics/pokemon/cacturne/normal.pal b/graphics/pokemon/cacturne/normal.pal index 70cdb6a14..2584eaab4 100644 --- a/graphics/pokemon/cacturne/normal.pal +++ b/graphics/pokemon/cacturne/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 0 176 232 -32 80 32 +32 82 0 16 16 16 -144 176 112 -104 160 104 -56 96 64 -40 120 56 -24 104 32 -64 128 72 -168 208 144 -176 136 56 -80 80 80 -248 200 88 -128 160 104 -192 232 176 +139 189 98 +98 180 106 +74 115 16 +49 148 82 +24 106 32 +74 164 82 +164 213 115 +139 106 57 +82 82 82 +246 205 0 +123 164 98 +189 238 131 104 104 104 diff --git a/graphics/pokemon/camerupt/anim_front.png b/graphics/pokemon/camerupt/anim_front.png index 77f13e14e..394f96e9f 100644 Binary files a/graphics/pokemon/camerupt/anim_front.png and b/graphics/pokemon/camerupt/anim_front.png differ diff --git a/graphics/pokemon/camerupt/front.png b/graphics/pokemon/camerupt/front.png index 631f35416..9baaa98c7 100644 Binary files a/graphics/pokemon/camerupt/front.png and b/graphics/pokemon/camerupt/front.png differ diff --git a/graphics/pokemon/camerupt/normal.pal b/graphics/pokemon/camerupt/normal.pal index d97bf53f3..13fea6106 100644 --- a/graphics/pokemon/camerupt/normal.pal +++ b/graphics/pokemon/camerupt/normal.pal @@ -7,9 +7,9 @@ JASC-PAL 224 200 184 24 24 24 248 248 248 -112 56 40 -216 120 96 -176 88 56 +112 40 56 +232 104 72 +192 56 32 112 192 224 64 144 176 232 160 136 diff --git a/graphics/pokemon/carnivine/anim_front.png b/graphics/pokemon/carnivine/anim_front.png index fabccf9ac..ef9f5a154 100644 Binary files a/graphics/pokemon/carnivine/anim_front.png and b/graphics/pokemon/carnivine/anim_front.png differ diff --git a/graphics/pokemon/carnivine/front.png b/graphics/pokemon/carnivine/front.png index eb977bbaa..2d26ac904 100644 Binary files a/graphics/pokemon/carnivine/front.png and b/graphics/pokemon/carnivine/front.png differ diff --git a/graphics/pokemon/carnivine/normal.pal b/graphics/pokemon/carnivine/normal.pal index b6bd7da6d..6330295d7 100644 --- a/graphics/pokemon/carnivine/normal.pal +++ b/graphics/pokemon/carnivine/normal.pal @@ -8,12 +8,12 @@ JASC-PAL 136 160 88 16 16 16 248 248 248 -128 48 48 +152 32 72 56 24 16 32 56 24 -224 80 80 +224 40 24 64 104 48 -184 152 56 +192 152 48 112 104 40 -240 200 72 +240 200 48 96 104 72 diff --git a/graphics/pokemon/carracosta/anim_front.png b/graphics/pokemon/carracosta/anim_front.png index 42a2e992f..e93c3cb39 100644 Binary files a/graphics/pokemon/carracosta/anim_front.png and b/graphics/pokemon/carracosta/anim_front.png differ diff --git a/graphics/pokemon/carracosta/front.png b/graphics/pokemon/carracosta/front.png index d064205ee..7297c4b24 100644 Binary files a/graphics/pokemon/carracosta/front.png and b/graphics/pokemon/carracosta/front.png differ diff --git a/graphics/pokemon/carracosta/normal.pal b/graphics/pokemon/carracosta/normal.pal index fd2b5d042..8371a3af4 100644 --- a/graphics/pokemon/carracosta/normal.pal +++ b/graphics/pokemon/carracosta/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -40 48 64 -104 112 136 -16 16 16 -72 112 144 -88 152 208 -56 72 96 -72 72 96 -128 184 232 -72 88 120 -144 200 208 +40 48 56 +96 112 128 +0 0 0 +56 112 152 +72 144 208 +40 56 96 +64 72 88 +88 168 224 +80 88 104 +160 200 208 224 224 224 56 96 128 -0 0 0 +40 56 96 0 0 0 0 0 0 diff --git a/graphics/pokemon/carvanha/anim_front.png b/graphics/pokemon/carvanha/anim_front.png index 9f616c400..d2383d127 100644 Binary files a/graphics/pokemon/carvanha/anim_front.png and b/graphics/pokemon/carvanha/anim_front.png differ diff --git a/graphics/pokemon/carvanha/front.png b/graphics/pokemon/carvanha/front.png index f6a33d69a..b5b9ec4d1 100644 Binary files a/graphics/pokemon/carvanha/front.png and b/graphics/pokemon/carvanha/front.png differ diff --git a/graphics/pokemon/carvanha/normal.pal b/graphics/pokemon/carvanha/normal.pal index 6ac96e800..d12d83d8d 100644 --- a/graphics/pokemon/carvanha/normal.pal +++ b/graphics/pokemon/carvanha/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -96 80 56 +96 72 56 248 248 248 16 16 16 -248 232 120 -176 144 88 -224 184 96 -104 48 56 -160 72 72 -24 64 136 -48 112 168 -16 40 80 -224 72 88 -248 120 128 -200 200 232 -211 139 161 +232 200 96 +200 168 40 +216 184 56 +120 56 56 +184 56 64 +56 80 144 +80 112 184 +40 56 80 +240 64 72 +248 128 128 +160 184 208 +224 104 120 diff --git a/graphics/pokemon/cascoon/anim_front.png b/graphics/pokemon/cascoon/anim_front.png index f5165017e..c1eb0e0d8 100644 Binary files a/graphics/pokemon/cascoon/anim_front.png and b/graphics/pokemon/cascoon/anim_front.png differ diff --git a/graphics/pokemon/cascoon/front.png b/graphics/pokemon/cascoon/front.png index 9f5867c09..54081095c 100644 Binary files a/graphics/pokemon/cascoon/front.png and b/graphics/pokemon/cascoon/front.png differ diff --git a/graphics/pokemon/cascoon/normal.pal b/graphics/pokemon/cascoon/normal.pal index 1134f1eef..5dcc0e9e2 100644 --- a/graphics/pokemon/cascoon/normal.pal +++ b/graphics/pokemon/cascoon/normal.pal @@ -9,11 +9,11 @@ JASC-PAL 240 216 240 184 152 184 168 168 176 -168 72 80 -112 40 40 +184 48 80 +136 0 32 232 224 248 -240 128 128 -144 8 40 +248 104 128 +128 0 0 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/caterpie/anim_front.png b/graphics/pokemon/caterpie/anim_front.png index 877ed1ac1..9ac8da377 100644 Binary files a/graphics/pokemon/caterpie/anim_front.png and b/graphics/pokemon/caterpie/anim_front.png differ diff --git a/graphics/pokemon/caterpie/front.png b/graphics/pokemon/caterpie/front.png index 44b30824c..1898998b9 100644 Binary files a/graphics/pokemon/caterpie/front.png and b/graphics/pokemon/caterpie/front.png differ diff --git a/graphics/pokemon/caterpie/normal.pal b/graphics/pokemon/caterpie/normal.pal index 1c8bf2bb0..6120e433b 100644 --- a/graphics/pokemon/caterpie/normal.pal +++ b/graphics/pokemon/caterpie/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -128 56 32 -240 104 64 -248 176 152 -192 80 48 -72 120 56 -168 216 152 +128 56 72 +248 120 64 +248 176 56 +248 64 64 +32 120 72 +168 240 64 16 16 16 -56 88 40 -112 200 88 -96 160 72 -248 224 128 -216 184 72 -136 120 40 -104 184 80 -248 224 128 +24 88 64 +104 208 48 +48 168 64 +240 232 136 +208 184 128 +120 128 72 +72 200 40 +240 232 136 diff --git a/graphics/pokemon/celebi/anim_front.png b/graphics/pokemon/celebi/anim_front.png index d6ffb512f..e6b312384 100644 Binary files a/graphics/pokemon/celebi/anim_front.png and b/graphics/pokemon/celebi/anim_front.png differ diff --git a/graphics/pokemon/celebi/front.png b/graphics/pokemon/celebi/front.png index d88004802..492be76a9 100644 Binary files a/graphics/pokemon/celebi/front.png and b/graphics/pokemon/celebi/front.png differ diff --git a/graphics/pokemon/celebi/normal.pal b/graphics/pokemon/celebi/normal.pal index 9a17d2a1e..a5aef9a6d 100644 --- a/graphics/pokemon/celebi/normal.pal +++ b/graphics/pokemon/celebi/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 248 160 176 -104 152 80 -144 200 112 +112 160 48 +160 216 80 16 16 16 -40 144 192 -104 184 216 -40 104 160 -72 96 56 -200 240 224 -216 248 184 -160 192 152 +80 136 168 +136 176 200 +0 96 176 +72 112 32 +192 216 224 +248 248 216 +176 192 88 248 248 248 -184 224 168 +216 232 144 104 112 128 176 176 184 -163 106 106 +192 0 0 diff --git a/graphics/pokemon/chandelure/anim_front.png b/graphics/pokemon/chandelure/anim_front.png index 97a34c8fd..847bc7815 100644 Binary files a/graphics/pokemon/chandelure/anim_front.png and b/graphics/pokemon/chandelure/anim_front.png differ diff --git a/graphics/pokemon/chandelure/front.png b/graphics/pokemon/chandelure/front.png index 66032c7a9..4dfc4d189 100644 Binary files a/graphics/pokemon/chandelure/front.png and b/graphics/pokemon/chandelure/front.png differ diff --git a/graphics/pokemon/chandelure/normal.pal b/graphics/pokemon/chandelure/normal.pal index ca8912667..aa3fc312f 100644 --- a/graphics/pokemon/chandelure/normal.pal +++ b/graphics/pokemon/chandelure/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -72 56 136 -96 96 176 -136 184 224 +64 40 176 +112 80 224 +168 160 240 16 16 16 -48 40 40 -72 72 72 -184 208 240 +48 48 48 +88 88 88 +192 208 208 248 248 248 120 136 136 -240 200 48 -72 72 72 +248 224 32 +0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/chansey/anim_front.png b/graphics/pokemon/chansey/anim_front.png index d83d55c92..487cdb2b4 100644 Binary files a/graphics/pokemon/chansey/anim_front.png and b/graphics/pokemon/chansey/anim_front.png differ diff --git a/graphics/pokemon/chansey/front.png b/graphics/pokemon/chansey/front.png index 2c2ab8541..c032d0faf 100644 Binary files a/graphics/pokemon/chansey/front.png and b/graphics/pokemon/chansey/front.png differ diff --git a/graphics/pokemon/chansey/normal.pal b/graphics/pokemon/chansey/normal.pal index 9e745b501..384b9e8c5 100644 --- a/graphics/pokemon/chansey/normal.pal +++ b/graphics/pokemon/chansey/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -168 120 160 -112 72 104 -248 216 240 -248 200 232 -136 72 80 -208 128 136 -248 152 176 +224 120 128 +152 64 80 +248 224 232 +248 208 224 +152 48 80 +232 120 136 +240 152 168 248 248 248 16 16 16 56 136 184 -216 168 192 -184 160 144 -112 96 80 -232 216 208 +232 168 184 +168 160 112 +112 104 72 +224 216 184 0 0 0 diff --git a/graphics/pokemon/charizard/anim_front.png b/graphics/pokemon/charizard/anim_front.png index 4c7416350..b3421924f 100644 Binary files a/graphics/pokemon/charizard/anim_front.png and b/graphics/pokemon/charizard/anim_front.png differ diff --git a/graphics/pokemon/charizard/back.png b/graphics/pokemon/charizard/back.png index 60f010405..6782e1e75 100644 Binary files a/graphics/pokemon/charizard/back.png and b/graphics/pokemon/charizard/back.png differ diff --git a/graphics/pokemon/charizard/front.png b/graphics/pokemon/charizard/front.png index afb68a6e0..97a6fd5ef 100644 Binary files a/graphics/pokemon/charizard/front.png and b/graphics/pokemon/charizard/front.png differ diff --git a/graphics/pokemon/charizard/normal.pal b/graphics/pokemon/charizard/normal.pal index f9e888220..87269fdd3 100644 --- a/graphics/pokemon/charizard/normal.pal +++ b/graphics/pokemon/charizard/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 232 64 32 -96 56 32 +128 48 24 240 160 16 -248 184 136 +232 176 88 248 224 104 -184 104 64 +200 80 64 16 16 16 -240 144 64 -0 72 80 -0 112 136 +232 128 40 +8 64 80 +32 112 144 200 200 200 248 248 248 -168 96 104 -248 224 152 -216 184 112 +0 128 248 +232 216 120 +232 176 88 diff --git a/graphics/pokemon/charizard/shiny.pal b/graphics/pokemon/charizard/shiny.pal index 2b40c3c20..dce3f7832 100644 --- a/graphics/pokemon/charizard/shiny.pal +++ b/graphics/pokemon/charizard/shiny.pal @@ -14,6 +14,6 @@ JASC-PAL 184 32 64 200 200 200 248 248 248 -208 80 16 +192 0 0 216 216 184 184 184 168 diff --git a/graphics/pokemon/charmander/anim_front.png b/graphics/pokemon/charmander/anim_front.png index 9788e3d3e..66904b580 100644 Binary files a/graphics/pokemon/charmander/anim_front.png and b/graphics/pokemon/charmander/anim_front.png differ diff --git a/graphics/pokemon/charmander/front.png b/graphics/pokemon/charmander/front.png index f25d50320..eb0a9590d 100644 Binary files a/graphics/pokemon/charmander/front.png and b/graphics/pokemon/charmander/front.png differ diff --git a/graphics/pokemon/charmander/normal.pal b/graphics/pokemon/charmander/normal.pal index c1dfa5299..d365db830 100644 --- a/graphics/pokemon/charmander/normal.pal +++ b/graphics/pokemon/charmander/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -176 112 72 -112 64 40 -240 152 96 -232 192 160 +216 80 56 +136 40 0 +248 144 64 +248 192 96 16 16 16 -32 104 128 -72 136 168 +16 64 136 +48 168 232 248 248 248 248 208 80 232 56 24 240 160 0 -168 88 128 -208 184 152 -248 232 192 +192 96 104 +224 200 136 +248 232 200 176 176 176 diff --git a/graphics/pokemon/charmeleon/anim_front.png b/graphics/pokemon/charmeleon/anim_front.png index 0d1206a9f..570b50669 100644 Binary files a/graphics/pokemon/charmeleon/anim_front.png and b/graphics/pokemon/charmeleon/anim_front.png differ diff --git a/graphics/pokemon/charmeleon/front.png b/graphics/pokemon/charmeleon/front.png index 9e963a684..bdbd577e2 100644 Binary files a/graphics/pokemon/charmeleon/front.png and b/graphics/pokemon/charmeleon/front.png differ diff --git a/graphics/pokemon/charmeleon/normal.pal b/graphics/pokemon/charmeleon/normal.pal index 28e262a7a..c72de3517 100644 --- a/graphics/pokemon/charmeleon/normal.pal +++ b/graphics/pokemon/charmeleon/normal.pal @@ -5,15 +5,15 @@ JASC-PAL 248 208 80 248 160 0 232 56 24 -112 40 32 -184 72 48 -232 104 80 +144 32 16 +208 56 56 +248 80 72 16 16 16 104 104 104 248 248 248 176 176 176 -96 136 160 -232 152 136 -232 200 184 -224 184 160 -192 152 120 +0 88 248 +248 128 104 +232 200 176 +200 168 120 +184 152 104 diff --git a/graphics/pokemon/chatot/anim_front.png b/graphics/pokemon/chatot/anim_front.png index e769ef2d6..a7b9fa5bc 100644 Binary files a/graphics/pokemon/chatot/anim_front.png and b/graphics/pokemon/chatot/anim_front.png differ diff --git a/graphics/pokemon/chatot/front.png b/graphics/pokemon/chatot/front.png index cb40baa3d..41d53718e 100644 Binary files a/graphics/pokemon/chatot/front.png and b/graphics/pokemon/chatot/front.png differ diff --git a/graphics/pokemon/chatot/normal.pal b/graphics/pokemon/chatot/normal.pal index 35758891c..0588ebcb5 100644 --- a/graphics/pokemon/chatot/normal.pal +++ b/graphics/pokemon/chatot/normal.pal @@ -8,12 +8,12 @@ JASC-PAL 0 0 0 224 240 240 160 176 176 -232 120 136 -160 64 72 -40 136 200 -24 64 104 -40 104 144 -168 128 48 -240 200 104 -40 104 56 +224 120 152 +192 24 80 +40 144 200 +32 48 120 +40 96 176 +160 136 32 +240 208 64 +32 96 16 0 0 0 diff --git a/graphics/pokemon/cherrim/normal/anim_front.png b/graphics/pokemon/cherrim/normal/anim_front.png index 5b10c48d1..591396454 100644 Binary files a/graphics/pokemon/cherrim/normal/anim_front.png and b/graphics/pokemon/cherrim/normal/anim_front.png differ diff --git a/graphics/pokemon/cherrim/normal/normal.pal b/graphics/pokemon/cherrim/normal/normal.pal index b04e7c0e6..1a91fdc24 100644 --- a/graphics/pokemon/cherrim/normal/normal.pal +++ b/graphics/pokemon/cherrim/normal/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -96 48 64 -200 88 112 -216 136 136 +120 40 72 +200 80 120 +216 112 144 16 16 16 -152 64 80 +160 56 96 16 80 16 48 120 48 56 168 56 -96 192 96 -96 56 112 -152 120 176 -120 88 152 -56 32 72 +88 192 88 +104 64 120 +152 120 184 +128 88 168 +72 40 64 0 0 0 0 0 0 diff --git a/graphics/pokemon/cherrim/sunshine/front.png b/graphics/pokemon/cherrim/sunshine/front.png index 42c789389..8c65c561c 100644 Binary files a/graphics/pokemon/cherrim/sunshine/front.png and b/graphics/pokemon/cherrim/sunshine/front.png differ diff --git a/graphics/pokemon/cherrim/sunshine/normal.pal b/graphics/pokemon/cherrim/sunshine/normal.pal index 434b8ec78..a90df8210 100644 --- a/graphics/pokemon/cherrim/sunshine/normal.pal +++ b/graphics/pokemon/cherrim/sunshine/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -88 48 56 -152 80 88 -248 192 184 +144 32 64 +200 56 104 +248 192 224 16 16 16 -192 120 128 -248 168 160 +224 128 168 +248 160 200 248 96 128 248 224 240 -120 104 40 -208 176 80 -248 224 136 +152 104 16 +216 176 88 +248 224 112 40 112 48 48 160 56 200 56 104 diff --git a/graphics/pokemon/cherubi/anim_front.png b/graphics/pokemon/cherubi/anim_front.png index ed64f3405..c8908ed77 100644 Binary files a/graphics/pokemon/cherubi/anim_front.png and b/graphics/pokemon/cherubi/anim_front.png differ diff --git a/graphics/pokemon/cherubi/front.png b/graphics/pokemon/cherubi/front.png index 6aaa22267..75b735e57 100644 Binary files a/graphics/pokemon/cherubi/front.png and b/graphics/pokemon/cherubi/front.png differ diff --git a/graphics/pokemon/cherubi/normal.pal b/graphics/pokemon/cherubi/normal.pal index f001b9d03..1fe243b8c 100644 --- a/graphics/pokemon/cherubi/normal.pal +++ b/graphics/pokemon/cherubi/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -48 112 48 -88 200 96 -24 72 32 -56 168 56 -48 136 48 +57 115 74 +115 205 90 +49 65 82 +82 164 74 +65 148 65 16 16 16 -112 16 56 -184 64 88 -232 96 120 -144 32 88 -56 32 32 -248 168 152 -248 248 248 +106 57 74 +172 65 106 +222 98 131 +131 49 82 +65 49 49 +255 139 172 +255 255 255 0 0 0 0 0 0 diff --git a/graphics/pokemon/chikorita/anim_front.png b/graphics/pokemon/chikorita/anim_front.png index 038f845b6..ebba2d94f 100644 Binary files a/graphics/pokemon/chikorita/anim_front.png and b/graphics/pokemon/chikorita/anim_front.png differ diff --git a/graphics/pokemon/chikorita/front.png b/graphics/pokemon/chikorita/front.png index 40200bfa0..687e8ee36 100644 Binary files a/graphics/pokemon/chikorita/front.png and b/graphics/pokemon/chikorita/front.png differ diff --git a/graphics/pokemon/chikorita/normal.pal b/graphics/pokemon/chikorita/normal.pal index 9cc099b62..0cda9b7dd 100644 --- a/graphics/pokemon/chikorita/normal.pal +++ b/graphics/pokemon/chikorita/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 176 232 -72 136 72 -32 88 32 -128 208 112 -88 168 80 -8 8 8 -80 96 56 -128 152 88 -200 232 144 -240 248 168 -176 184 112 +192 192 248 +80 136 32 +64 96 24 +144 208 96 +104 176 72 +0 0 0 +96 96 56 +152 152 88 +224 232 168 +240 240 208 +184 200 120 192 192 192 248 248 248 -96 32 56 -152 56 64 -200 104 112 +96 64 88 +192 40 40 +232 120 120 diff --git a/graphics/pokemon/chimchar/anim_front.png b/graphics/pokemon/chimchar/anim_front.png index 86c266d0d..4e6879f52 100644 Binary files a/graphics/pokemon/chimchar/anim_front.png and b/graphics/pokemon/chimchar/anim_front.png differ diff --git a/graphics/pokemon/chimchar/front.png b/graphics/pokemon/chimchar/front.png index 7d09db465..1a0e606a8 100644 Binary files a/graphics/pokemon/chimchar/front.png and b/graphics/pokemon/chimchar/front.png differ diff --git a/graphics/pokemon/chimchar/normal.pal b/graphics/pokemon/chimchar/normal.pal index 8a65f6fa1..42ac104af 100644 --- a/graphics/pokemon/chimchar/normal.pal +++ b/graphics/pokemon/chimchar/normal.pal @@ -2,10 +2,10 @@ JASC-PAL 0100 16 152 208 160 -152 88 40 -208 120 40 -104 56 8 -240 152 56 +176 104 40 +216 128 0 +120 64 16 +248 168 80 16 16 16 144 120 80 208 176 120 diff --git a/graphics/pokemon/chimecho/anim_front.png b/graphics/pokemon/chimecho/anim_front.png index 01cd83e59..991130d1b 100644 Binary files a/graphics/pokemon/chimecho/anim_front.png and b/graphics/pokemon/chimecho/anim_front.png differ diff --git a/graphics/pokemon/chimecho/front.png b/graphics/pokemon/chimecho/front.png index 19d3b806e..7d9992580 100644 Binary files a/graphics/pokemon/chimecho/front.png and b/graphics/pokemon/chimecho/front.png differ diff --git a/graphics/pokemon/chimecho/normal.pal b/graphics/pokemon/chimecho/normal.pal index 698f769f8..3b3e590f2 100644 --- a/graphics/pokemon/chimecho/normal.pal +++ b/graphics/pokemon/chimecho/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 120 80 +160 112 80 248 248 248 -248 232 168 +248 224 144 16 16 16 -240 208 112 -200 168 120 +248 208 88 +224 160 72 80 104 112 -208 232 248 -160 200 224 -152 72 88 -120 152 168 -232 104 120 -128 40 56 -240 208 112 +192 224 248 +152 192 224 +176 64 88 +104 144 176 +240 80 120 +120 40 64 +248 208 88 0 0 0 diff --git a/graphics/pokemon/chinchou/anim_front.png b/graphics/pokemon/chinchou/anim_front.png index 25d4fd97e..370a5a99d 100644 Binary files a/graphics/pokemon/chinchou/anim_front.png and b/graphics/pokemon/chinchou/anim_front.png differ diff --git a/graphics/pokemon/chinchou/front.png b/graphics/pokemon/chinchou/front.png index ac68315e3..348090d34 100644 Binary files a/graphics/pokemon/chinchou/front.png and b/graphics/pokemon/chinchou/front.png differ diff --git a/graphics/pokemon/chinchou/normal.pal b/graphics/pokemon/chinchou/normal.pal index 12749df0d..a2d9c8aca 100644 --- a/graphics/pokemon/chinchou/normal.pal +++ b/graphics/pokemon/chinchou/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -80 104 184 -64 80 144 -96 136 224 -192 168 88 -240 224 128 -200 208 240 -24 40 80 -16 16 16 -128 120 80 -80 72 40 -248 224 184 -232 200 96 -136 160 232 -184 96 96 +88 112 192 +40 80 144 +120 152 216 +184 152 32 +240 216 56 +184 192 232 +8 40 88 +0 0 0 +128 96 80 +80 40 24 +248 232 128 +216 184 48 +144 160 224 +176 0 0 0 0 0 diff --git a/graphics/pokemon/chingling/anim_front.png b/graphics/pokemon/chingling/anim_front.png index 738e9cb54..d564a3fa2 100644 Binary files a/graphics/pokemon/chingling/anim_front.png and b/graphics/pokemon/chingling/anim_front.png differ diff --git a/graphics/pokemon/chingling/front.png b/graphics/pokemon/chingling/front.png index 89060a363..d8092f393 100644 Binary files a/graphics/pokemon/chingling/front.png and b/graphics/pokemon/chingling/front.png differ diff --git a/graphics/pokemon/chingling/normal.pal b/graphics/pokemon/chingling/normal.pal index 46e51c7f1..06fd1ce75 100644 --- a/graphics/pokemon/chingling/normal.pal +++ b/graphics/pokemon/chingling/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -104 32 24 -168 56 56 -232 88 88 -200 216 232 -144 160 184 -16 16 16 -80 72 40 -232 208 64 -176 152 48 -248 224 120 -128 112 48 -248 248 248 +106 57 49 +172 82 49 +230 98 82 +213 213 246 +164 164 205 +0 0 0 +98 82 74 +255 213 90 +189 156 74 +255 230 148 +131 106 74 +255 255 255 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/cinccino/anim_front.png b/graphics/pokemon/cinccino/anim_front.png index 971054fb0..013385d78 100644 Binary files a/graphics/pokemon/cinccino/anim_front.png and b/graphics/pokemon/cinccino/anim_front.png differ diff --git a/graphics/pokemon/cinccino/front.png b/graphics/pokemon/cinccino/front.png index 9c1b5c697..12d953daf 100644 Binary files a/graphics/pokemon/cinccino/front.png and b/graphics/pokemon/cinccino/front.png differ diff --git a/graphics/pokemon/cinccino/normal.pal b/graphics/pokemon/cinccino/normal.pal index f2cc37dc8..fcc63c5f6 100644 --- a/graphics/pokemon/cinccino/normal.pal +++ b/graphics/pokemon/cinccino/normal.pal @@ -1,17 +1,17 @@ JASC-PAL 0100 16 -153 210 164 -189 180 180 -254 255 255 -125 130 153 -201 185 196 -65 67 81 -173 90 133 +152 208 160 +184 176 176 +248 248 248 +128 120 112 +184 168 152 +80 72 64 +208 80 80 16 16 16 -237 113 132 -184 197 237 -58 45 43 +232 128 128 +216 200 216 +0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/clamperl/anim_front.png b/graphics/pokemon/clamperl/anim_front.png index 54d2e38cb..d857bf65d 100644 Binary files a/graphics/pokemon/clamperl/anim_front.png and b/graphics/pokemon/clamperl/anim_front.png differ diff --git a/graphics/pokemon/clamperl/front.png b/graphics/pokemon/clamperl/front.png index 2c93e5903..dab2d9881 100644 Binary files a/graphics/pokemon/clamperl/front.png and b/graphics/pokemon/clamperl/front.png differ diff --git a/graphics/pokemon/clamperl/normal.pal b/graphics/pokemon/clamperl/normal.pal index eb3fcb764..ee5b68988 100644 --- a/graphics/pokemon/clamperl/normal.pal +++ b/graphics/pokemon/clamperl/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -48 96 160 -24 56 96 -104 144 208 +56 96 184 +56 56 96 +104 128 224 16 16 16 248 248 248 -184 208 248 +192 216 208 128 136 136 -56 96 152 -136 72 80 -112 184 224 -232 136 144 +48 64 120 +112 72 88 +112 152 208 +232 120 152 248 168 168 -200 232 248 -152 216 248 +184 216 248 +144 192 248 0 0 0 diff --git a/graphics/pokemon/claydol/anim_front.png b/graphics/pokemon/claydol/anim_front.png index c327f949f..bada994ff 100644 Binary files a/graphics/pokemon/claydol/anim_front.png and b/graphics/pokemon/claydol/anim_front.png differ diff --git a/graphics/pokemon/claydol/front.png b/graphics/pokemon/claydol/front.png index e4adecf65..cc2f1c16e 100644 Binary files a/graphics/pokemon/claydol/front.png and b/graphics/pokemon/claydol/front.png differ diff --git a/graphics/pokemon/claydol/normal.pal b/graphics/pokemon/claydol/normal.pal index 6583cb9ad..c36497707 100644 --- a/graphics/pokemon/claydol/normal.pal +++ b/graphics/pokemon/claydol/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -56 48 48 -112 96 96 +72 64 56 +112 104 104 16 16 16 88 80 80 -32 32 24 -208 192 200 -168 152 168 +40 40 32 +192 192 208 +152 144 168 248 248 248 -120 48 64 -232 128 136 -224 96 104 -248 160 160 -248 224 144 -176 160 112 -56 48 48 +120 32 72 +248 128 152 +232 88 128 +248 168 200 +248 208 144 +160 144 104 +72 64 56 diff --git a/graphics/pokemon/clefable/anim_front.png b/graphics/pokemon/clefable/anim_front.png index c35163070..e4a6228e1 100644 Binary files a/graphics/pokemon/clefable/anim_front.png and b/graphics/pokemon/clefable/anim_front.png differ diff --git a/graphics/pokemon/clefable/front.png b/graphics/pokemon/clefable/front.png index a4bc1111d..c3c70dc1e 100644 Binary files a/graphics/pokemon/clefable/front.png and b/graphics/pokemon/clefable/front.png differ diff --git a/graphics/pokemon/clefable/normal.pal b/graphics/pokemon/clefable/normal.pal index 6b40f550c..69bf321d7 100644 --- a/graphics/pokemon/clefable/normal.pal +++ b/graphics/pokemon/clefable/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -88 80 64 +80 64 56 16 16 16 -136 120 104 -136 88 80 -168 120 104 -240 208 200 -208 176 168 -184 112 136 +120 104 96 +136 72 80 +216 96 96 +248 192 176 +232 144 144 +184 88 120 104 72 80 -224 144 160 +208 120 160 248 248 248 128 128 128 -184 152 144 +208 120 136 136 72 80 104 72 80 diff --git a/graphics/pokemon/clefairy/anim_front.png b/graphics/pokemon/clefairy/anim_front.png index 20b777edc..ecbe37a1b 100644 Binary files a/graphics/pokemon/clefairy/anim_front.png and b/graphics/pokemon/clefairy/anim_front.png differ diff --git a/graphics/pokemon/clefairy/front.png b/graphics/pokemon/clefairy/front.png index b0606bf7b..613905a3a 100644 Binary files a/graphics/pokemon/clefairy/front.png and b/graphics/pokemon/clefairy/front.png differ diff --git a/graphics/pokemon/clefairy/normal.pal b/graphics/pokemon/clefairy/normal.pal index b8106ff81..6d31bfa49 100644 --- a/graphics/pokemon/clefairy/normal.pal +++ b/graphics/pokemon/clefairy/normal.pal @@ -4,16 +4,16 @@ JASC-PAL 152 208 160 136 80 88 184 128 136 -248 216 224 -136 104 72 -88 56 40 -176 144 112 +248 208 184 +112 72 56 +88 48 32 +152 128 112 16 16 16 -240 176 184 +248 168 168 144 144 144 248 248 248 -216 136 192 +232 64 56 64 120 168 -176 72 136 +176 56 40 0 0 0 0 0 0 diff --git a/graphics/pokemon/cleffa/anim_front.png b/graphics/pokemon/cleffa/anim_front.png index cda348916..2f3e541f7 100644 Binary files a/graphics/pokemon/cleffa/anim_front.png and b/graphics/pokemon/cleffa/anim_front.png differ diff --git a/graphics/pokemon/cleffa/front.png b/graphics/pokemon/cleffa/front.png index 876b912b2..a8d989f26 100644 Binary files a/graphics/pokemon/cleffa/front.png and b/graphics/pokemon/cleffa/front.png differ diff --git a/graphics/pokemon/cleffa/normal.pal b/graphics/pokemon/cleffa/normal.pal index 386cfca65..d6dafd798 100644 --- a/graphics/pokemon/cleffa/normal.pal +++ b/graphics/pokemon/cleffa/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -152 112 112 -248 208 184 -232 176 168 -200 144 144 +168 80 80 +248 208 200 +248 160 160 +200 128 128 80 48 40 -96 72 48 -144 112 72 +88 48 32 +112 72 56 16 16 16 -192 160 120 +152 128 112 248 248 248 248 112 80 248 152 120 -200 96 96 +192 64 64 0 0 0 0 0 0 diff --git a/graphics/pokemon/cloyster/anim_front.png b/graphics/pokemon/cloyster/anim_front.png index aec8a00ee..4ed517f83 100644 Binary files a/graphics/pokemon/cloyster/anim_front.png and b/graphics/pokemon/cloyster/anim_front.png differ diff --git a/graphics/pokemon/cloyster/front.png b/graphics/pokemon/cloyster/front.png index deae322b0..1d9237036 100644 Binary files a/graphics/pokemon/cloyster/front.png and b/graphics/pokemon/cloyster/front.png differ diff --git a/graphics/pokemon/cloyster/normal.pal b/graphics/pokemon/cloyster/normal.pal index c7ee3b969..2e777740f 100644 --- a/graphics/pokemon/cloyster/normal.pal +++ b/graphics/pokemon/cloyster/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -104 96 136 -176 168 216 -144 136 192 -56 48 72 +104 88 144 +184 168 232 +136 120 184 +40 32 72 16 16 16 192 192 192 -48 48 72 +64 64 64 248 248 248 -144 160 176 -88 96 112 -40 32 56 -112 112 168 -64 64 120 -128 112 192 -144 120 168 +144 144 144 +96 96 96 +56 40 104 +112 104 176 +64 56 152 +160 120 184 +120 96 176 diff --git a/graphics/pokemon/cobalion/anim_front.png b/graphics/pokemon/cobalion/anim_front.png index 4ed828e5b..556761a0d 100644 Binary files a/graphics/pokemon/cobalion/anim_front.png and b/graphics/pokemon/cobalion/anim_front.png differ diff --git a/graphics/pokemon/cobalion/front.png b/graphics/pokemon/cobalion/front.png index 4d6ef8f2f..c57b709d3 100644 Binary files a/graphics/pokemon/cobalion/front.png and b/graphics/pokemon/cobalion/front.png differ diff --git a/graphics/pokemon/cobalion/normal.pal b/graphics/pokemon/cobalion/normal.pal index d93596c7c..6d3925587 100644 --- a/graphics/pokemon/cobalion/normal.pal +++ b/graphics/pokemon/cobalion/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -104 72 48 -160 112 80 +153 204 153 +128 104 64 +168 144 56 0 0 0 -224 168 112 -40 32 32 -16 72 80 -56 56 56 -32 160 176 -104 96 88 +224 200 120 +32 32 32 +16 80 88 +80 80 80 +24 168 176 +104 104 104 248 248 248 -112 144 152 -40 112 120 -160 200 216 -88 88 88 -176 168 160 +136 176 192 +48 120 136 +192 216 232 +96 96 96 +184 184 184 diff --git a/graphics/pokemon/cofagrigus/anim_front.png b/graphics/pokemon/cofagrigus/anim_front.png index e473ae317..5724f0e22 100644 Binary files a/graphics/pokemon/cofagrigus/anim_front.png and b/graphics/pokemon/cofagrigus/anim_front.png differ diff --git a/graphics/pokemon/cofagrigus/front.png b/graphics/pokemon/cofagrigus/front.png index 69a27ba08..c48dbdaa4 100644 Binary files a/graphics/pokemon/cofagrigus/front.png and b/graphics/pokemon/cofagrigus/front.png differ diff --git a/graphics/pokemon/cofagrigus/normal.pal b/graphics/pokemon/cofagrigus/normal.pal index 263c7a5d0..e52a4c18c 100644 --- a/graphics/pokemon/cofagrigus/normal.pal +++ b/graphics/pokemon/cofagrigus/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -56 64 56 +56 56 64 16 16 16 -88 144 176 -40 64 80 -72 104 120 +48 144 168 +40 72 72 +32 104 120 248 248 248 -248 208 112 -176 136 80 -112 88 64 -232 120 104 -128 56 56 +248 184 48 +176 128 48 +104 88 32 +248 48 32 +152 32 64 120 120 120 176 184 176 0 0 0 diff --git a/graphics/pokemon/combee/anim_front.png b/graphics/pokemon/combee/anim_front.png index 2c07de339..cc85ef4c9 100644 Binary files a/graphics/pokemon/combee/anim_front.png and b/graphics/pokemon/combee/anim_front.png differ diff --git a/graphics/pokemon/combee/anim_frontf.png b/graphics/pokemon/combee/anim_frontf.png deleted file mode 100644 index 45acd64e3..000000000 Binary files a/graphics/pokemon/combee/anim_frontf.png and /dev/null differ diff --git a/graphics/pokemon/combee/back.png b/graphics/pokemon/combee/back.png index 1366cb1f8..89dfa4f0c 100644 Binary files a/graphics/pokemon/combee/back.png and b/graphics/pokemon/combee/back.png differ diff --git a/graphics/pokemon/combee/front.png b/graphics/pokemon/combee/front.png index ab591053b..4c1368df4 100644 Binary files a/graphics/pokemon/combee/front.png and b/graphics/pokemon/combee/front.png differ diff --git a/graphics/pokemon/combee/normal.pal b/graphics/pokemon/combee/normal.pal index badc68861..ae331aac6 100644 --- a/graphics/pokemon/combee/normal.pal +++ b/graphics/pokemon/combee/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -56 56 56 -96 112 120 -168 192 216 -216 224 232 -232 128 64 -112 80 16 -248 184 64 -160 120 40 -232 72 64 +56 56 64 +80 88 112 +192 192 216 +240 240 248 +240 112 0 +104 88 0 +248 208 8 +168 128 0 +248 208 0 176 88 32 200 144 40 -0 0 0 +248 208 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/combee/normalf.pal b/graphics/pokemon/combee/normalf.pal new file mode 100644 index 000000000..045177137 --- /dev/null +++ b/graphics/pokemon/combee/normalf.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +16 16 16 +56 56 64 +80 88 112 +192 192 216 +240 240 248 +240 112 0 +104 88 0 +248 208 8 +168 128 0 +224 56 56 +176 88 32 +200 144 40 +240 112 136 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/combee/shiny.pal b/graphics/pokemon/combee/shiny.pal index 91e9abeee..8fe9e48ce 100644 --- a/graphics/pokemon/combee/shiny.pal +++ b/graphics/pokemon/combee/shiny.pal @@ -11,9 +11,9 @@ JASC-PAL 104 56 0 248 136 88 160 56 32 -152 40 40 +248 136 88 176 40 16 200 88 48 -0 0 0 +248 136 88 0 0 0 0 0 0 diff --git a/graphics/pokemon/combee/shinyf.pal b/graphics/pokemon/combee/shinyf.pal new file mode 100644 index 000000000..54b0e92cf --- /dev/null +++ b/graphics/pokemon/combee/shinyf.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +16 16 16 +56 56 64 +80 88 112 +184 184 208 +232 232 248 +232 88 32 +104 56 0 +248 136 88 +160 56 32 +248 0 0 +176 40 16 +200 88 48 +192 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/combusken/anim_front.png b/graphics/pokemon/combusken/anim_front.png index c26350450..96cdd9d79 100644 Binary files a/graphics/pokemon/combusken/anim_front.png and b/graphics/pokemon/combusken/anim_front.png differ diff --git a/graphics/pokemon/combusken/front.png b/graphics/pokemon/combusken/front.png index c587f1f2c..2c2b6a5a1 100644 Binary files a/graphics/pokemon/combusken/front.png and b/graphics/pokemon/combusken/front.png differ diff --git a/graphics/pokemon/combusken/normal.pal b/graphics/pokemon/combusken/normal.pal index 2a84f18b0..d97e531d7 100644 --- a/graphics/pokemon/combusken/normal.pal +++ b/graphics/pokemon/combusken/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -216 104 48 +216 88 40 24 24 24 -248 144 88 -144 48 8 -144 112 56 -208 184 96 -248 224 160 -160 80 48 +248 120 72 +152 48 16 +152 112 40 +232 184 72 +232 216 112 +208 48 48 248 248 248 104 104 112 216 216 200 -176 160 144 +152 136 128 88 72 72 -136 120 104 +128 112 104 0 0 0 diff --git a/graphics/pokemon/conkeldurr/anim_front.png b/graphics/pokemon/conkeldurr/anim_front.png index b021370d2..1e15ffd29 100644 Binary files a/graphics/pokemon/conkeldurr/anim_front.png and b/graphics/pokemon/conkeldurr/anim_front.png differ diff --git a/graphics/pokemon/conkeldurr/front.png b/graphics/pokemon/conkeldurr/front.png index 447368c02..bfa9221f9 100644 Binary files a/graphics/pokemon/conkeldurr/front.png and b/graphics/pokemon/conkeldurr/front.png differ diff --git a/graphics/pokemon/conkeldurr/normal.pal b/graphics/pokemon/conkeldurr/normal.pal index 0be98550a..e9986fc14 100644 --- a/graphics/pokemon/conkeldurr/normal.pal +++ b/graphics/pokemon/conkeldurr/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -128 96 72 -72 56 56 -176 144 112 +136 104 88 +88 56 32 +192 152 112 16 16 16 -88 48 64 -184 104 160 -136 72 104 +112 48 80 +192 104 176 +152 72 128 136 144 152 104 104 112 48 48 56 248 248 248 -104 32 48 -168 56 72 +112 40 64 +168 40 64 0 0 0 0 0 0 diff --git a/graphics/pokemon/corphish/anim_front.png b/graphics/pokemon/corphish/anim_front.png index 8ea965910..7cd114961 100644 Binary files a/graphics/pokemon/corphish/anim_front.png and b/graphics/pokemon/corphish/anim_front.png differ diff --git a/graphics/pokemon/corphish/front.png b/graphics/pokemon/corphish/front.png index 13c9c09d8..3a78a7b01 100644 Binary files a/graphics/pokemon/corphish/front.png and b/graphics/pokemon/corphish/front.png differ diff --git a/graphics/pokemon/corphish/normal.pal b/graphics/pokemon/corphish/normal.pal index 4d12bad51..f1e3e9578 100644 --- a/graphics/pokemon/corphish/normal.pal +++ b/graphics/pokemon/corphish/normal.pal @@ -3,14 +3,14 @@ JASC-PAL 16 152 208 160 16 16 16 -160 64 40 -240 184 160 -224 96 56 -112 48 24 -232 136 96 -208 176 144 -176 152 120 -240 224 192 +160 56 32 +248 152 144 +224 80 8 +104 56 64 +240 112 80 +200 176 144 +168 152 128 +224 224 200 248 248 248 128 104 80 200 200 200 diff --git a/graphics/pokemon/corsola/anim_front.png b/graphics/pokemon/corsola/anim_front.png index ef828b5e2..b3b460e69 100644 Binary files a/graphics/pokemon/corsola/anim_front.png and b/graphics/pokemon/corsola/anim_front.png differ diff --git a/graphics/pokemon/corsola/front.png b/graphics/pokemon/corsola/front.png index 30ab14423..b82fbceb5 100644 Binary files a/graphics/pokemon/corsola/front.png and b/graphics/pokemon/corsola/front.png differ diff --git a/graphics/pokemon/corsola/normal.pal b/graphics/pokemon/corsola/normal.pal index 5e2e34345..4f899432f 100644 --- a/graphics/pokemon/corsola/normal.pal +++ b/graphics/pokemon/corsola/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 72 88 -248 192 184 +200 32 72 +248 200 224 16 16 16 -248 152 160 -216 104 120 -248 120 136 -96 56 72 +248 160 192 +224 96 144 +240 120 184 +144 0 32 224 224 232 40 48 96 -176 224 232 -144 80 104 -144 184 200 -96 128 144 +216 224 240 +232 80 104 +168 192 216 +88 120 168 144 80 104 0 0 0 diff --git a/graphics/pokemon/cottonee/anim_front.png b/graphics/pokemon/cottonee/anim_front.png index 9daa48775..d2abe0c67 100644 Binary files a/graphics/pokemon/cottonee/anim_front.png and b/graphics/pokemon/cottonee/anim_front.png differ diff --git a/graphics/pokemon/cottonee/front.png b/graphics/pokemon/cottonee/front.png index b66802def..0e807ff42 100644 Binary files a/graphics/pokemon/cottonee/front.png and b/graphics/pokemon/cottonee/front.png differ diff --git a/graphics/pokemon/cottonee/normal.pal b/graphics/pokemon/cottonee/normal.pal index f42407dfe..3b42ec646 100644 --- a/graphics/pokemon/cottonee/normal.pal +++ b/graphics/pokemon/cottonee/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -152 160 136 -216 232 200 -112 120 104 -80 80 88 +165 173 132 +222 230 197 +123 132 107 +74 90 82 16 16 16 -232 232 240 -192 192 208 -56 120 72 -40 80 64 -80 184 104 -184 96 48 -248 248 248 -224 136 88 +255 255 255 +206 206 214 +66 123 66 +25 74 25 +82 165 74 +173 107 16 +255 255 255 +230 132 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/cradily/anim_front.png b/graphics/pokemon/cradily/anim_front.png index 370899f39..b12899e3e 100644 Binary files a/graphics/pokemon/cradily/anim_front.png and b/graphics/pokemon/cradily/anim_front.png differ diff --git a/graphics/pokemon/cradily/front.png b/graphics/pokemon/cradily/front.png index c2e3e952d..0280dedf9 100644 Binary files a/graphics/pokemon/cradily/front.png and b/graphics/pokemon/cradily/front.png differ diff --git a/graphics/pokemon/cradily/normal.pal b/graphics/pokemon/cradily/normal.pal index b6b3ca660..fb26a4018 100644 --- a/graphics/pokemon/cradily/normal.pal +++ b/graphics/pokemon/cradily/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 0 176 232 -128 56 64 +144 64 96 248 208 232 -232 184 168 -208 112 120 -16 16 16 -192 128 120 -128 192 128 -64 104 48 -168 216 168 -96 152 88 -232 200 104 -240 216 168 -184 152 80 -136 112 48 +248 152 168 +200 96 144 +0 0 0 +232 104 136 +120 192 112 +56 104 80 +160 224 136 +80 152 88 +240 208 64 +248 240 120 +200 160 48 +160 120 16 0 0 0 diff --git a/graphics/pokemon/cranidos/anim_front.png b/graphics/pokemon/cranidos/anim_front.png index 4c40d1e27..4cfea0dd4 100644 Binary files a/graphics/pokemon/cranidos/anim_front.png and b/graphics/pokemon/cranidos/anim_front.png differ diff --git a/graphics/pokemon/cranidos/front.png b/graphics/pokemon/cranidos/front.png index f0d534a60..000533a92 100644 Binary files a/graphics/pokemon/cranidos/front.png and b/graphics/pokemon/cranidos/front.png differ diff --git a/graphics/pokemon/cranidos/normal.pal b/graphics/pokemon/cranidos/normal.pal index 8cac83fe8..73f9d7b45 100644 --- a/graphics/pokemon/cranidos/normal.pal +++ b/graphics/pokemon/cranidos/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -120 136 144 +112 120 136 248 248 248 -208 208 216 -40 72 96 +208 216 224 +40 72 112 16 16 16 -64 104 136 -72 136 184 -64 80 96 -168 184 192 -128 144 160 -120 184 216 -104 112 128 -240 120 112 -176 56 48 -178 103 103 +56 96 152 +72 128 184 +72 88 104 +160 176 184 +128 144 152 +112 168 232 +96 112 128 +200 96 96 +168 64 64 +168 16 0 diff --git a/graphics/pokemon/crawdaunt/anim_front.png b/graphics/pokemon/crawdaunt/anim_front.png index 83573963d..a9a6ce7fb 100644 Binary files a/graphics/pokemon/crawdaunt/anim_front.png and b/graphics/pokemon/crawdaunt/anim_front.png differ diff --git a/graphics/pokemon/crawdaunt/front.png b/graphics/pokemon/crawdaunt/front.png index 127f889b7..ede486992 100644 Binary files a/graphics/pokemon/crawdaunt/front.png and b/graphics/pokemon/crawdaunt/front.png differ diff --git a/graphics/pokemon/crawdaunt/normal.pal b/graphics/pokemon/crawdaunt/normal.pal index 731f1a5cf..114ecd22a 100644 --- a/graphics/pokemon/crawdaunt/normal.pal +++ b/graphics/pokemon/crawdaunt/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -192 160 88 -120 96 48 +240 152 24 +120 88 48 248 248 248 -16 16 16 -248 224 128 -112 32 24 -176 56 48 -232 88 72 -224 152 152 -232 208 192 -184 168 144 -24 72 104 -48 128 176 -112 96 80 -104 168 232 +0 0 0 +248 224 88 +136 40 40 +200 48 48 +232 80 80 +240 136 136 +216 216 216 +176 168 160 +24 64 104 +64 112 168 +96 88 88 +80 152 240 diff --git a/graphics/pokemon/cresselia/anim_front.png b/graphics/pokemon/cresselia/anim_front.png index 8e84b970e..23e1a2ab9 100644 Binary files a/graphics/pokemon/cresselia/anim_front.png and b/graphics/pokemon/cresselia/anim_front.png differ diff --git a/graphics/pokemon/cresselia/front.png b/graphics/pokemon/cresselia/front.png index 88b7dba06..56a6f004f 100644 Binary files a/graphics/pokemon/cresselia/front.png and b/graphics/pokemon/cresselia/front.png differ diff --git a/graphics/pokemon/cresselia/normal.pal b/graphics/pokemon/cresselia/normal.pal index 187fdee2b..190705d9b 100644 --- a/graphics/pokemon/cresselia/normal.pal +++ b/graphics/pokemon/cresselia/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -104 88 64 +104 80 48 16 16 16 -240 224 208 -184 144 88 -240 200 136 -136 72 104 -184 104 144 -216 160 184 -88 48 80 -240 216 208 +248 232 184 +168 144 88 +248 208 112 +136 64 120 +192 88 152 +208 136 200 +80 56 88 +224 192 232 248 248 248 -136 168 208 -104 128 160 -64 88 112 +128 144 240 +80 104 176 +56 64 120 192 176 176 diff --git a/graphics/pokemon/croagunk/anim_front.png b/graphics/pokemon/croagunk/anim_front.png index 3d4d81f7c..84c7edb09 100644 Binary files a/graphics/pokemon/croagunk/anim_front.png and b/graphics/pokemon/croagunk/anim_front.png differ diff --git a/graphics/pokemon/croagunk/front.png b/graphics/pokemon/croagunk/front.png index 1c34d1791..6725ae39e 100644 Binary files a/graphics/pokemon/croagunk/front.png and b/graphics/pokemon/croagunk/front.png differ diff --git a/graphics/pokemon/croagunk/normal.pal b/graphics/pokemon/croagunk/normal.pal index 5ebbaf6e1..99a60ec65 100644 --- a/graphics/pokemon/croagunk/normal.pal +++ b/graphics/pokemon/croagunk/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -56 72 120 +72 72 136 16 16 16 128 152 248 -72 120 192 -88 80 80 -56 48 48 -248 192 72 -168 128 32 -128 72 32 -232 136 80 -232 192 136 +104 112 208 +80 80 80 +48 48 64 +248 208 24 +176 136 24 +152 56 56 +232 128 64 +240 200 160 248 248 248 -184 176 168 -136 120 120 +176 176 192 +120 120 136 56 56 80 diff --git a/graphics/pokemon/crobat/anim_front.png b/graphics/pokemon/crobat/anim_front.png index 653b35170..abf3b22be 100644 Binary files a/graphics/pokemon/crobat/anim_front.png and b/graphics/pokemon/crobat/anim_front.png differ diff --git a/graphics/pokemon/crobat/front.png b/graphics/pokemon/crobat/front.png index 8c7b36bbf..e0b69bad7 100644 Binary files a/graphics/pokemon/crobat/front.png and b/graphics/pokemon/crobat/front.png differ diff --git a/graphics/pokemon/crobat/normal.pal b/graphics/pokemon/crobat/normal.pal index 242717590..c8b289770 100644 --- a/graphics/pokemon/crobat/normal.pal +++ b/graphics/pokemon/crobat/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -72 40 96 -104 72 128 -160 128 192 +96 24 120 +120 72 152 +176 120 200 16 16 16 -40 72 88 -56 112 120 -128 96 168 -80 160 176 -176 152 40 -248 216 88 -184 24 24 +8 64 104 +32 104 144 +160 88 200 +72 152 184 +208 144 0 +248 208 0 +176 0 0 104 104 104 160 160 160 248 248 248 diff --git a/graphics/pokemon/croconaw/anim_front.png b/graphics/pokemon/croconaw/anim_front.png index 27a97b7a1..bdd5340fd 100644 Binary files a/graphics/pokemon/croconaw/anim_front.png and b/graphics/pokemon/croconaw/anim_front.png differ diff --git a/graphics/pokemon/croconaw/front.png b/graphics/pokemon/croconaw/front.png index 9876f80eb..b1cd5b3b6 100644 Binary files a/graphics/pokemon/croconaw/front.png and b/graphics/pokemon/croconaw/front.png differ diff --git a/graphics/pokemon/croconaw/normal.pal b/graphics/pokemon/croconaw/normal.pal index be301424b..95fb4e450 100644 --- a/graphics/pokemon/croconaw/normal.pal +++ b/graphics/pokemon/croconaw/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -96 24 48 -248 168 160 +128 0 8 +248 136 128 16 16 16 -240 72 96 -176 48 72 -48 88 104 -72 144 152 -112 208 216 -176 224 216 +240 80 88 +200 40 56 +32 96 120 +32 136 184 +104 200 200 +136 232 224 248 248 248 -128 40 56 -232 120 120 -88 72 32 -192 168 96 -248 224 128 +120 0 0 +224 64 32 +104 80 0 +200 184 96 +248 224 136 diff --git a/graphics/pokemon/crustle/anim_front.png b/graphics/pokemon/crustle/anim_front.png index 91434933a..8ff103bcf 100644 Binary files a/graphics/pokemon/crustle/anim_front.png and b/graphics/pokemon/crustle/anim_front.png differ diff --git a/graphics/pokemon/crustle/front.png b/graphics/pokemon/crustle/front.png index eb37ec891..44fa563a2 100644 Binary files a/graphics/pokemon/crustle/front.png and b/graphics/pokemon/crustle/front.png differ diff --git a/graphics/pokemon/crustle/normal.pal b/graphics/pokemon/crustle/normal.pal index 8e676bf9e..371a48520 100644 --- a/graphics/pokemon/crustle/normal.pal +++ b/graphics/pokemon/crustle/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 88 72 -160 128 112 -80 64 56 -248 168 80 +136 104 72 +168 152 128 +88 64 48 +240 184 56 16 16 16 -176 120 64 -80 40 32 -184 88 64 -216 128 96 +192 136 24 +104 40 24 +232 128 72 +248 184 120 248 248 248 56 56 56 -136 64 48 -56 40 40 +184 80 48 +56 48 32 0 0 0 0 0 0 diff --git a/graphics/pokemon/cryogonal/anim_front.png b/graphics/pokemon/cryogonal/anim_front.png index 30063cb47..523611731 100644 Binary files a/graphics/pokemon/cryogonal/anim_front.png and b/graphics/pokemon/cryogonal/anim_front.png differ diff --git a/graphics/pokemon/cryogonal/front.png b/graphics/pokemon/cryogonal/front.png index 245b8c270..e3cd4c10f 100644 Binary files a/graphics/pokemon/cryogonal/front.png and b/graphics/pokemon/cryogonal/front.png differ diff --git a/graphics/pokemon/cryogonal/normal.pal b/graphics/pokemon/cryogonal/normal.pal index cd61187d7..10063fa01 100644 --- a/graphics/pokemon/cryogonal/normal.pal +++ b/graphics/pokemon/cryogonal/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -48 88 152 -80 120 184 +48 64 160 +80 96 192 16 16 16 -136 152 208 +120 136 192 248 248 248 -40 56 80 +40 48 88 96 128 208 -184 200 232 -152 192 232 -208 224 248 -88 160 224 -128 208 248 -40 104 184 +160 176 208 +136 168 248 +200 216 248 +96 160 232 +128 208 232 +64 104 240 32 64 160 0 0 0 diff --git a/graphics/pokemon/cubchoo/anim_front.png b/graphics/pokemon/cubchoo/anim_front.png index 51cec3830..3350209b8 100644 Binary files a/graphics/pokemon/cubchoo/anim_front.png and b/graphics/pokemon/cubchoo/anim_front.png differ diff --git a/graphics/pokemon/cubchoo/front.png b/graphics/pokemon/cubchoo/front.png index a0844fd4b..82e5e9194 100644 Binary files a/graphics/pokemon/cubchoo/front.png and b/graphics/pokemon/cubchoo/front.png differ diff --git a/graphics/pokemon/cubchoo/normal.pal b/graphics/pokemon/cubchoo/normal.pal index 8715e5d72..9d187e7ec 100644 --- a/graphics/pokemon/cubchoo/normal.pal +++ b/graphics/pokemon/cubchoo/normal.pal @@ -8,12 +8,12 @@ JASC-PAL 16 16 16 40 56 88 72 112 160 -120 192 240 -56 56 56 +120 168 224 +56 72 72 248 248 248 -72 144 208 -104 96 96 -152 168 224 +96 128 200 +136 144 144 +192 192 200 232 240 248 152 224 248 0 0 0 diff --git a/graphics/pokemon/cubone/anim_front.png b/graphics/pokemon/cubone/anim_front.png index 48605d96d..8294ce638 100644 Binary files a/graphics/pokemon/cubone/anim_front.png and b/graphics/pokemon/cubone/anim_front.png differ diff --git a/graphics/pokemon/cubone/front.png b/graphics/pokemon/cubone/front.png index c321969d1..f26df5792 100644 Binary files a/graphics/pokemon/cubone/front.png and b/graphics/pokemon/cubone/front.png differ diff --git a/graphics/pokemon/cubone/normal.pal b/graphics/pokemon/cubone/normal.pal index 8d8b3ad56..e18a70567 100644 --- a/graphics/pokemon/cubone/normal.pal +++ b/graphics/pokemon/cubone/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -128 136 144 +128 128 128 248 248 248 -16 16 16 -192 200 200 -80 80 96 -152 120 88 -208 168 104 -80 64 48 -192 168 144 -240 224 176 -216 232 232 +0 0 0 +192 192 208 +80 80 56 +144 104 88 +192 152 72 +80 56 16 +200 168 136 +240 208 176 +224 224 232 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/cyndaquil/anim_front.png b/graphics/pokemon/cyndaquil/anim_front.png index a0d3affc4..bfdf5a622 100644 Binary files a/graphics/pokemon/cyndaquil/anim_front.png and b/graphics/pokemon/cyndaquil/anim_front.png differ diff --git a/graphics/pokemon/cyndaquil/front.png b/graphics/pokemon/cyndaquil/front.png index 8ca05c4ff..448a51f8a 100644 Binary files a/graphics/pokemon/cyndaquil/front.png and b/graphics/pokemon/cyndaquil/front.png differ diff --git a/graphics/pokemon/cyndaquil/normal.pal b/graphics/pokemon/cyndaquil/normal.pal index bd9296ca7..f5182e5ee 100644 --- a/graphics/pokemon/cyndaquil/normal.pal +++ b/graphics/pokemon/cyndaquil/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 56 40 -232 88 48 -32 64 72 -48 112 120 -104 144 144 -240 152 40 +216 0 0 +248 56 0 +16 56 80 +48 104 128 +96 168 184 +248 152 0 16 16 16 -248 200 56 +248 216 16 16 40 48 -168 144 96 -248 216 152 -112 88 48 +200 168 80 +248 240 160 +120 96 32 216 176 120 168 168 168 248 248 248 diff --git a/graphics/pokemon/darkrai/anim_front.png b/graphics/pokemon/darkrai/anim_front.png index 81cf1e35b..741c69af0 100644 Binary files a/graphics/pokemon/darkrai/anim_front.png and b/graphics/pokemon/darkrai/anim_front.png differ diff --git a/graphics/pokemon/darkrai/front.png b/graphics/pokemon/darkrai/front.png index 29f627df0..e3f284abd 100644 Binary files a/graphics/pokemon/darkrai/front.png and b/graphics/pokemon/darkrai/front.png differ diff --git a/graphics/pokemon/darkrai/normal.pal b/graphics/pokemon/darkrai/normal.pal index 66020cc4b..7edcd825d 100644 --- a/graphics/pokemon/darkrai/normal.pal +++ b/graphics/pokemon/darkrai/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -120 112 112 -192 176 176 -88 80 80 +128 128 128 +192 200 208 +64 64 88 16 16 16 -48 40 48 -224 224 216 -80 24 24 -152 56 48 -40 112 120 -40 200 192 +48 40 56 +224 232 240 +96 0 0 +144 40 64 +16 136 168 +40 232 248 248 248 248 -208 104 96 +232 16 24 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/darmanitan/anim_front.png b/graphics/pokemon/darmanitan/anim_front.png index ddfe2a62a..7fa8675a3 100644 Binary files a/graphics/pokemon/darmanitan/anim_front.png and b/graphics/pokemon/darmanitan/anim_front.png differ diff --git a/graphics/pokemon/darmanitan/front.png b/graphics/pokemon/darmanitan/front.png index 502461632..137b407ba 100644 Binary files a/graphics/pokemon/darmanitan/front.png and b/graphics/pokemon/darmanitan/front.png differ diff --git a/graphics/pokemon/darmanitan/normal.pal b/graphics/pokemon/darmanitan/normal.pal index 42af84755..04d244d4b 100644 --- a/graphics/pokemon/darmanitan/normal.pal +++ b/graphics/pokemon/darmanitan/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -176 48 32 -224 72 64 +184 0 0 +232 16 16 184 144 40 -248 200 56 -120 104 40 -112 40 40 -168 56 48 -64 24 24 -16 16 16 -184 112 72 -168 152 144 -248 152 96 -80 72 72 +232 200 16 +104 88 16 +136 24 40 +168 32 24 +96 24 24 +0 0 0 +176 120 72 +136 136 152 +232 160 104 +72 72 80 240 240 240 -104 56 56 +80 56 32 diff --git a/graphics/pokemon/darmanitan/zen_mode/anim_front.png b/graphics/pokemon/darmanitan/zen_mode/anim_front.png index 0cf859368..6cc10f7ac 100644 Binary files a/graphics/pokemon/darmanitan/zen_mode/anim_front.png and b/graphics/pokemon/darmanitan/zen_mode/anim_front.png differ diff --git a/graphics/pokemon/darmanitan/zen_mode/front.png b/graphics/pokemon/darmanitan/zen_mode/front.png index d4e403d0f..84ace43cf 100644 Binary files a/graphics/pokemon/darmanitan/zen_mode/front.png and b/graphics/pokemon/darmanitan/zen_mode/front.png differ diff --git a/graphics/pokemon/darmanitan/zen_mode/normal.pal b/graphics/pokemon/darmanitan/zen_mode/normal.pal index 393e9ba2b..9695dddf6 100644 --- a/graphics/pokemon/darmanitan/zen_mode/normal.pal +++ b/graphics/pokemon/darmanitan/zen_mode/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -32 80 96 -88 168 192 -96 72 56 -184 112 64 -248 176 104 +32 82 98 +82 156 172 +123 82 41 +172 106 41 +230 164 98 0 0 0 -72 104 120 -168 208 240 -72 72 80 -152 152 160 +65 90 98 +180 213 238 +74 74 82 +156 156 164 240 240 240 -64 120 144 -128 168 200 +57 123 139 +123 164 189 0 0 0 0 0 0 diff --git a/graphics/pokemon/darumaka/anim_front.png b/graphics/pokemon/darumaka/anim_front.png index 1b3a1f874..7d0b10c8c 100644 Binary files a/graphics/pokemon/darumaka/anim_front.png and b/graphics/pokemon/darumaka/anim_front.png differ diff --git a/graphics/pokemon/darumaka/front.png b/graphics/pokemon/darumaka/front.png index fb8c71b50..92a3645d2 100644 Binary files a/graphics/pokemon/darumaka/front.png and b/graphics/pokemon/darumaka/front.png differ diff --git a/graphics/pokemon/darumaka/normal.pal b/graphics/pokemon/darumaka/normal.pal index 73fe3d46b..14fb73ec4 100644 --- a/graphics/pokemon/darumaka/normal.pal +++ b/graphics/pokemon/darumaka/normal.pal @@ -2,16 +2,16 @@ JASC-PAL 0100 16 152 208 160 -144 104 40 +144 112 16 96 64 48 -16 16 16 -240 184 80 -184 136 64 -144 48 48 -192 64 64 -80 24 24 -168 96 40 -232 152 88 +0 0 0 +248 200 32 +200 160 24 +152 40 40 +200 48 48 +88 24 24 +168 88 40 +248 144 80 88 88 88 248 248 248 160 160 168 diff --git a/graphics/pokemon/deerling/anim_front.png b/graphics/pokemon/deerling/anim_front.png index cfc1c74ea..2bf2f1b29 100644 Binary files a/graphics/pokemon/deerling/anim_front.png and b/graphics/pokemon/deerling/anim_front.png differ diff --git a/graphics/pokemon/deerling/autumn/normal.pal b/graphics/pokemon/deerling/autumn/normal.pal index 7c7880a96..32058c780 100644 --- a/graphics/pokemon/deerling/autumn/normal.pal +++ b/graphics/pokemon/deerling/autumn/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 210 164 -109 59 35 +152 208 160 +128 72 16 0 0 0 -173 94 55 -191 157 47 -255 214 50 -122 84 24 -237 129 71 -255 235 193 -145 116 132 -81 66 57 -255 255 255 -186 162 130 -73 68 73 -127 114 108 +160 112 32 +200 152 8 +248 216 80 +120 80 16 +232 128 24 +240 232 192 +152 120 88 +80 64 24 +248 248 248 +184 160 136 +48 48 48 +80 80 80 0 0 0 diff --git a/graphics/pokemon/deerling/front.png b/graphics/pokemon/deerling/front.png index 1b204cc2a..cade6f0db 100644 Binary files a/graphics/pokemon/deerling/front.png and b/graphics/pokemon/deerling/front.png differ diff --git a/graphics/pokemon/deerling/normal.pal b/graphics/pokemon/deerling/normal.pal index cc6ab4a71..e61755715 100644 --- a/graphics/pokemon/deerling/normal.pal +++ b/graphics/pokemon/deerling/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 56 88 +136 64 64 0 0 0 -184 96 112 -184 152 40 -248 208 48 -120 80 24 -232 152 160 -248 232 192 -144 112 128 -80 64 56 +176 104 104 +200 152 8 +248 216 80 +120 80 16 +248 152 168 +240 232 192 +152 120 88 +80 64 24 248 248 248 -184 160 128 -72 64 72 -120 112 104 +184 160 136 +48 48 48 +80 80 80 0 0 0 diff --git a/graphics/pokemon/deerling/summer/normal.pal b/graphics/pokemon/deerling/summer/normal.pal index 3435fd868..240d90f18 100644 --- a/graphics/pokemon/deerling/summer/normal.pal +++ b/graphics/pokemon/deerling/summer/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 210 164 -32 81 32 +152 208 160 +48 80 48 0 0 0 -56 135 54 -191 157 47 -255 214 50 -122 84 24 -72 188 66 -255 235 193 -145 116 132 -81 66 57 -255 255 255 -186 162 130 -73 68 73 -127 114 108 +48 120 64 +200 152 8 +248 216 80 +120 80 16 +64 176 64 +240 232 192 +152 120 88 +80 64 24 +248 248 248 +184 160 136 +48 48 48 +80 80 80 0 0 0 diff --git a/graphics/pokemon/deerling/winter/normal.pal b/graphics/pokemon/deerling/winter/normal.pal index 59d1a46c4..2aa19e299 100644 --- a/graphics/pokemon/deerling/winter/normal.pal +++ b/graphics/pokemon/deerling/winter/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 210 164 -71 60 46 +152 208 160 +88 80 64 0 0 0 -130 89 84 -191 157 47 -255 214 50 -122 84 24 -175 127 119 -255 235 193 -145 116 132 -81 66 57 -255 255 255 -186 162 130 -73 68 73 -127 114 108 +120 80 72 +200 152 8 +248 216 80 +120 80 16 +168 128 96 +240 232 192 +152 120 88 +80 64 24 +248 248 248 +184 160 136 +48 48 48 +80 80 80 0 0 0 diff --git a/graphics/pokemon/deino/anim_front.png b/graphics/pokemon/deino/anim_front.png index 5482bd67a..d0a21c0a2 100644 Binary files a/graphics/pokemon/deino/anim_front.png and b/graphics/pokemon/deino/anim_front.png differ diff --git a/graphics/pokemon/deino/front.png b/graphics/pokemon/deino/front.png index e3f13a0f7..835771003 100644 Binary files a/graphics/pokemon/deino/front.png and b/graphics/pokemon/deino/front.png differ diff --git a/graphics/pokemon/deino/normal.pal b/graphics/pokemon/deino/normal.pal index cc79f1a44..69d66dd53 100644 --- a/graphics/pokemon/deino/normal.pal +++ b/graphics/pokemon/deino/normal.pal @@ -2,13 +2,13 @@ JASC-PAL 0100 16 152 208 160 -48 40 40 -88 80 80 +40 32 40 +80 80 80 16 16 16 64 56 64 -40 56 80 -96 144 200 -80 104 136 +24 48 104 +96 144 216 +56 96 160 112 72 88 184 112 128 112 56 80 diff --git a/graphics/pokemon/delcatty/anim_front.png b/graphics/pokemon/delcatty/anim_front.png index 1e80be259..01ccb1292 100644 Binary files a/graphics/pokemon/delcatty/anim_front.png and b/graphics/pokemon/delcatty/anim_front.png differ diff --git a/graphics/pokemon/delcatty/front.png b/graphics/pokemon/delcatty/front.png index cb049001e..bdb666e03 100644 Binary files a/graphics/pokemon/delcatty/front.png and b/graphics/pokemon/delcatty/front.png differ diff --git a/graphics/pokemon/delcatty/normal.pal b/graphics/pokemon/delcatty/normal.pal index 3a4c87efa..087fc1ccf 100644 --- a/graphics/pokemon/delcatty/normal.pal +++ b/graphics/pokemon/delcatty/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 72 120 -88 48 80 -192 136 192 -16 16 16 -152 96 152 -224 192 120 -120 96 72 -248 240 208 -80 48 48 -248 232 160 +96 72 120 +64 40 96 +160 112 192 +0 0 0 +128 80 160 +224 176 96 +112 80 56 +248 240 184 +80 80 88 +248 216 136 240 240 216 -136 104 104 -216 176 120 +152 152 152 +200 144 72 0 0 0 0 0 0 diff --git a/graphics/pokemon/delibird/anim_front.png b/graphics/pokemon/delibird/anim_front.png index fa64c96ff..c093ee531 100644 Binary files a/graphics/pokemon/delibird/anim_front.png and b/graphics/pokemon/delibird/anim_front.png differ diff --git a/graphics/pokemon/delibird/front.png b/graphics/pokemon/delibird/front.png index cbe357d8a..a0eaf79af 100644 Binary files a/graphics/pokemon/delibird/front.png and b/graphics/pokemon/delibird/front.png differ diff --git a/graphics/pokemon/delibird/normal.pal b/graphics/pokemon/delibird/normal.pal index 0e1996243..e279c6e76 100644 --- a/graphics/pokemon/delibird/normal.pal +++ b/graphics/pokemon/delibird/normal.pal @@ -7,13 +7,13 @@ JASC-PAL 248 248 248 16 16 16 168 168 176 -216 88 80 -160 48 32 -152 136 72 -96 88 32 -248 224 112 -200 192 200 -96 32 16 -200 48 40 +216 48 48 +168 24 0 +200 136 40 +120 64 0 +248 200 64 +208 208 208 +120 24 0 +192 40 24 0 0 0 0 0 0 diff --git a/graphics/pokemon/deoxys/anim_front.png b/graphics/pokemon/deoxys/anim_front.png index 87f6a6fae..d2f3e9938 100644 Binary files a/graphics/pokemon/deoxys/anim_front.png and b/graphics/pokemon/deoxys/anim_front.png differ diff --git a/graphics/pokemon/deoxys/attack/anim_front.png b/graphics/pokemon/deoxys/attack/anim_front.png index f731109ae..0b43a9fe1 100644 Binary files a/graphics/pokemon/deoxys/attack/anim_front.png and b/graphics/pokemon/deoxys/attack/anim_front.png differ diff --git a/graphics/pokemon/deoxys/attack/front.png b/graphics/pokemon/deoxys/attack/front.png index c61f3adb9..5080dd28e 100644 Binary files a/graphics/pokemon/deoxys/attack/front.png and b/graphics/pokemon/deoxys/attack/front.png differ diff --git a/graphics/pokemon/deoxys/attack/normal.pal b/graphics/pokemon/deoxys/attack/normal.pal index a478fcd11..246d4784a 100644 --- a/graphics/pokemon/deoxys/attack/normal.pal +++ b/graphics/pokemon/deoxys/attack/normal.pal @@ -2,15 +2,15 @@ JASC-PAL 0100 16 248 160 176 -64 40 32 -224 112 64 -160 80 56 +96 56 56 +248 112 72 +184 104 104 24 24 24 -128 192 192 -72 144 160 -152 112 144 -48 80 96 -96 64 112 +104 200 224 +80 144 176 +152 96 176 +56 80 96 +112 56 136 248 248 248 192 192 208 88 80 80 diff --git a/graphics/pokemon/deoxys/defense/anim_front.png b/graphics/pokemon/deoxys/defense/anim_front.png index ee4259be5..2ee6e0c52 100644 Binary files a/graphics/pokemon/deoxys/defense/anim_front.png and b/graphics/pokemon/deoxys/defense/anim_front.png differ diff --git a/graphics/pokemon/deoxys/defense/front.png b/graphics/pokemon/deoxys/defense/front.png index 7cd7365bc..2e21b5592 100644 Binary files a/graphics/pokemon/deoxys/defense/front.png and b/graphics/pokemon/deoxys/defense/front.png differ diff --git a/graphics/pokemon/deoxys/defense/normal.pal b/graphics/pokemon/deoxys/defense/normal.pal index b2b609f25..8b37f5111 100644 --- a/graphics/pokemon/deoxys/defense/normal.pal +++ b/graphics/pokemon/deoxys/defense/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 248 160 176 -64 40 32 -160 80 56 -224 112 64 +96 56 56 +192 104 104 +248 112 72 96 64 48 240 176 144 -128 192 192 -72 144 160 -48 80 96 -152 112 144 +104 200 224 +80 144 176 +56 80 96 +152 96 176 24 24 24 248 248 248 192 192 208 -96 64 112 +112 56 136 0 0 0 0 0 0 diff --git a/graphics/pokemon/deoxys/front.png b/graphics/pokemon/deoxys/front.png index 5e02cd1c5..5c2c25314 100644 Binary files a/graphics/pokemon/deoxys/front.png and b/graphics/pokemon/deoxys/front.png differ diff --git a/graphics/pokemon/deoxys/normal.pal b/graphics/pokemon/deoxys/normal.pal index 5948f302e..59124c56a 100644 --- a/graphics/pokemon/deoxys/normal.pal +++ b/graphics/pokemon/deoxys/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 248 160 176 -160 80 56 -240 176 144 -224 112 64 +184 104 104 +248 176 144 +248 112 72 96 56 56 -128 192 192 +104 200 224 88 56 48 56 80 96 -72 144 160 -152 112 144 +80 144 176 +152 96 176 24 24 24 248 248 248 192 192 208 -96 64 112 +112 56 136 88 80 80 120 120 112 diff --git a/graphics/pokemon/deoxys/speed/anim_front.png b/graphics/pokemon/deoxys/speed/anim_front.png index c6f490d2f..947052f81 100644 Binary files a/graphics/pokemon/deoxys/speed/anim_front.png and b/graphics/pokemon/deoxys/speed/anim_front.png differ diff --git a/graphics/pokemon/deoxys/speed/front.png b/graphics/pokemon/deoxys/speed/front.png index 922acc0b2..776d0083b 100644 Binary files a/graphics/pokemon/deoxys/speed/front.png and b/graphics/pokemon/deoxys/speed/front.png differ diff --git a/graphics/pokemon/deoxys/speed/normal.pal b/graphics/pokemon/deoxys/speed/normal.pal index c3dcd2101..dad052e1d 100644 --- a/graphics/pokemon/deoxys/speed/normal.pal +++ b/graphics/pokemon/deoxys/speed/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 248 160 176 -48 80 96 -72 144 160 -128 192 192 -64 40 32 -224 112 64 +56 80 96 +80 144 176 +104 200 224 +96 56 56 +248 112 72 24 24 24 -160 80 56 +192 104 104 192 192 208 -152 112 144 +152 96 176 248 248 248 -96 64 112 +112 56 136 88 80 80 120 120 112 0 0 0 diff --git a/graphics/pokemon/dewgong/anim_front.png b/graphics/pokemon/dewgong/anim_front.png index f42ded8c7..441976782 100644 Binary files a/graphics/pokemon/dewgong/anim_front.png and b/graphics/pokemon/dewgong/anim_front.png differ diff --git a/graphics/pokemon/dewgong/normal.pal b/graphics/pokemon/dewgong/normal.pal index 11622f8d6..ea9cd39ea 100644 --- a/graphics/pokemon/dewgong/normal.pal +++ b/graphics/pokemon/dewgong/normal.pal @@ -10,8 +10,8 @@ JASC-PAL 192 207 226 255 255 255 114 92 75 -137 93 117 -211 139 173 +112 40 40 +232 128 120 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/dewott/anim_front.png b/graphics/pokemon/dewott/anim_front.png index 7410cb4e8..8ea90c880 100644 Binary files a/graphics/pokemon/dewott/anim_front.png and b/graphics/pokemon/dewott/anim_front.png differ diff --git a/graphics/pokemon/dewott/front.png b/graphics/pokemon/dewott/front.png index f30e2f395..d8665e601 100644 Binary files a/graphics/pokemon/dewott/front.png and b/graphics/pokemon/dewott/front.png differ diff --git a/graphics/pokemon/dewott/normal.pal b/graphics/pokemon/dewott/normal.pal index c1c858ea8..3ffe4198c 100644 --- a/graphics/pokemon/dewott/normal.pal +++ b/graphics/pokemon/dewott/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -48 80 88 -16 16 16 -128 216 224 -88 144 152 -72 72 80 -248 248 248 -208 120 112 -136 64 64 -48 48 56 -48 64 104 -56 96 152 -240 224 152 -104 88 48 -160 144 96 +49 90 115 +0 0 0 +82 189 189 +32 139 148 +74 74 74 +255 255 255 +197 82 90 +115 57 57 +49 49 49 +41 57 106 +49 82 139 +238 213 139 +123 90 16 +197 148 41 192 200 216 diff --git a/graphics/pokemon/dialga/anim_front.png b/graphics/pokemon/dialga/anim_front.png index cfb10e9c5..c4234913b 100644 Binary files a/graphics/pokemon/dialga/anim_front.png and b/graphics/pokemon/dialga/anim_front.png differ diff --git a/graphics/pokemon/dialga/front.png b/graphics/pokemon/dialga/front.png index b1c79e98b..e4a6172ac 100644 Binary files a/graphics/pokemon/dialga/front.png and b/graphics/pokemon/dialga/front.png differ diff --git a/graphics/pokemon/dialga/normal.pal b/graphics/pokemon/dialga/normal.pal index 71226dfeb..102e0ff12 100644 --- a/graphics/pokemon/dialga/normal.pal +++ b/graphics/pokemon/dialga/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -128 136 176 -16 16 16 -72 72 96 -176 200 216 -48 56 104 -32 24 72 -232 240 240 -96 160 184 -160 216 224 -56 88 136 -248 88 88 +136 160 176 +8 8 8 +64 64 80 +192 208 224 +32 88 144 +32 64 104 +232 240 248 +96 160 200 +152 216 248 +56 120 176 +248 80 64 88 96 112 -184 96 104 -40 72 160 -80 112 144 +168 16 0 +32 72 248 +64 112 152 diff --git a/graphics/pokemon/diglett/anim_front.png b/graphics/pokemon/diglett/anim_front.png index 973cdf7cc..9bea44acb 100644 Binary files a/graphics/pokemon/diglett/anim_front.png and b/graphics/pokemon/diglett/anim_front.png differ diff --git a/graphics/pokemon/diglett/front.png b/graphics/pokemon/diglett/front.png index c10f9ff07..34bb253af 100644 Binary files a/graphics/pokemon/diglett/front.png and b/graphics/pokemon/diglett/front.png differ diff --git a/graphics/pokemon/diglett/normal.pal b/graphics/pokemon/diglett/normal.pal index b83bc4b5b..b8930cba2 100644 --- a/graphics/pokemon/diglett/normal.pal +++ b/graphics/pokemon/diglett/normal.pal @@ -2,16 +2,16 @@ JASC-PAL 0100 16 152 208 160 -136 104 80 -208 168 144 -176 128 104 -80 56 40 +160 88 88 +216 152 88 +192 112 64 +88 48 24 248 248 248 16 16 16 -168 96 136 -120 56 96 -240 200 224 -216 136 184 +192 32 136 +144 64 112 +248 176 224 +232 120 184 96 96 104 136 136 144 56 56 56 diff --git a/graphics/pokemon/ditto/anim_front.png b/graphics/pokemon/ditto/anim_front.png index 692a080f3..f93a8adc4 100644 Binary files a/graphics/pokemon/ditto/anim_front.png and b/graphics/pokemon/ditto/anim_front.png differ diff --git a/graphics/pokemon/ditto/front.png b/graphics/pokemon/ditto/front.png index 03ce29b08..73603b303 100644 Binary files a/graphics/pokemon/ditto/front.png and b/graphics/pokemon/ditto/front.png differ diff --git a/graphics/pokemon/ditto/normal.pal b/graphics/pokemon/ditto/normal.pal index 3fc5e998e..3709b13ee 100644 --- a/graphics/pokemon/ditto/normal.pal +++ b/graphics/pokemon/ditto/normal.pal @@ -2,14 +2,14 @@ JASC-PAL 0100 16 152 208 160 -184 152 216 -136 112 168 -232 208 248 -200 176 224 -96 56 128 -8 8 8 -152 128 184 -198 119 119 +192 120 224 +152 88 176 +248 200 248 +224 160 240 +88 24 144 +0 0 0 +176 104 200 +192 120 120 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/dodrio/anim_front.png b/graphics/pokemon/dodrio/anim_front.png index 0f09d9b66..a569e5893 100644 Binary files a/graphics/pokemon/dodrio/anim_front.png and b/graphics/pokemon/dodrio/anim_front.png differ diff --git a/graphics/pokemon/dodrio/front.png b/graphics/pokemon/dodrio/front.png index e4617fedd..5edcba27c 100644 Binary files a/graphics/pokemon/dodrio/front.png and b/graphics/pokemon/dodrio/front.png differ diff --git a/graphics/pokemon/dodrio/normal.pal b/graphics/pokemon/dodrio/normal.pal index 0d05314c0..e4205972a 100644 --- a/graphics/pokemon/dodrio/normal.pal +++ b/graphics/pokemon/dodrio/normal.pal @@ -5,15 +5,15 @@ JASC-PAL 64 64 64 16 16 16 104 104 104 -160 104 80 +160 120 88 88 48 32 -224 152 112 +200 152 80 248 248 248 -112 72 56 -240 200 168 -176 136 128 -120 80 112 -200 128 176 -152 64 56 -232 120 112 -240 168 168 +96 88 64 +232 216 168 +176 160 120 +112 40 40 +232 128 120 +176 64 64 +240 128 160 +248 208 224 diff --git a/graphics/pokemon/doduo/anim_front.png b/graphics/pokemon/doduo/anim_front.png index 7039733ed..bda88f3de 100644 Binary files a/graphics/pokemon/doduo/anim_front.png and b/graphics/pokemon/doduo/anim_front.png differ diff --git a/graphics/pokemon/doduo/front.png b/graphics/pokemon/doduo/front.png index 1a626f16f..6222a7e27 100644 Binary files a/graphics/pokemon/doduo/front.png and b/graphics/pokemon/doduo/front.png differ diff --git a/graphics/pokemon/doduo/normal.pal b/graphics/pokemon/doduo/normal.pal index e2b1ed4d7..594e03325 100644 --- a/graphics/pokemon/doduo/normal.pal +++ b/graphics/pokemon/doduo/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -88 48 24 -152 104 64 -208 136 88 -224 168 128 +80 56 24 +144 104 88 +184 136 80 +216 168 112 16 16 16 248 248 248 -96 64 40 +96 80 16 96 96 96 -168 128 104 -240 200 168 -192 128 160 -64 64 64 +160 128 72 +232 216 168 216 184 136 0 0 0 0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/donphan/anim_front.png b/graphics/pokemon/donphan/anim_front.png index 25f7fcf0a..a051ebc2b 100644 Binary files a/graphics/pokemon/donphan/anim_front.png and b/graphics/pokemon/donphan/anim_front.png differ diff --git a/graphics/pokemon/donphan/front.png b/graphics/pokemon/donphan/front.png index 182ab384f..cb344b85b 100644 Binary files a/graphics/pokemon/donphan/front.png and b/graphics/pokemon/donphan/front.png differ diff --git a/graphics/pokemon/donphan/normal.pal b/graphics/pokemon/donphan/normal.pal index df4ceec1b..b397df3f9 100644 --- a/graphics/pokemon/donphan/normal.pal +++ b/graphics/pokemon/donphan/normal.pal @@ -9,9 +9,9 @@ JASC-PAL 16 16 16 128 160 176 192 216 232 -104 32 72 +128 32 40 72 104 120 -184 48 88 +192 64 16 144 168 184 248 248 248 176 184 184 diff --git a/graphics/pokemon/dragonair/anim_front.png b/graphics/pokemon/dragonair/anim_front.png index d7d319d8b..0868dd485 100644 Binary files a/graphics/pokemon/dragonair/anim_front.png and b/graphics/pokemon/dragonair/anim_front.png differ diff --git a/graphics/pokemon/dragonair/front.png b/graphics/pokemon/dragonair/front.png index 73cb21609..91fea694e 100644 Binary files a/graphics/pokemon/dragonair/front.png and b/graphics/pokemon/dragonair/front.png differ diff --git a/graphics/pokemon/dragonair/normal.pal b/graphics/pokemon/dragonair/normal.pal index 8e1301377..1f5a7c704 100644 --- a/graphics/pokemon/dragonair/normal.pal +++ b/graphics/pokemon/dragonair/normal.pal @@ -4,16 +4,16 @@ JASC-PAL 152 208 160 160 152 176 248 248 248 -96 80 96 -200 216 216 -24 48 96 -64 120 160 -104 160 216 +88 80 88 +216 208 216 +24 48 112 +72 104 192 +88 136 232 8 8 8 -152 200 240 -88 144 192 -120 40 88 -184 96 144 +120 168 248 +80 104 200 +128 8 56 +176 8 72 24 40 120 -32 104 176 -96 168 232 +64 88 248 +120 200 248 diff --git a/graphics/pokemon/dragonite/anim_front.png b/graphics/pokemon/dragonite/anim_front.png index 7eaa37393..b0a230528 100644 Binary files a/graphics/pokemon/dragonite/anim_front.png and b/graphics/pokemon/dragonite/anim_front.png differ diff --git a/graphics/pokemon/dragonite/front.png b/graphics/pokemon/dragonite/front.png index 6d1caf8be..0d4314b70 100644 Binary files a/graphics/pokemon/dragonite/front.png and b/graphics/pokemon/dragonite/front.png differ diff --git a/graphics/pokemon/dragonite/normal.pal b/graphics/pokemon/dragonite/normal.pal index e269aad02..493e8a7f7 100644 --- a/graphics/pokemon/dragonite/normal.pal +++ b/graphics/pokemon/dragonite/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -144 96 56 -248 232 192 -200 136 64 -216 192 144 -248 200 136 -240 168 88 +152 88 72 +248 232 184 +208 136 48 +232 184 136 +248 200 104 +232 176 72 88 56 32 248 248 248 -208 208 184 +200 200 200 16 16 16 -112 112 72 -16 88 88 -24 128 128 -56 184 168 +96 96 96 +32 80 64 +24 104 96 +32 160 120 152 128 88 diff --git a/graphics/pokemon/drapion/anim_front.png b/graphics/pokemon/drapion/anim_front.png index edd0a9502..624556e4e 100644 Binary files a/graphics/pokemon/drapion/anim_front.png and b/graphics/pokemon/drapion/anim_front.png differ diff --git a/graphics/pokemon/drapion/front.png b/graphics/pokemon/drapion/front.png index 3f0cc0f4c..57734a284 100644 Binary files a/graphics/pokemon/drapion/front.png and b/graphics/pokemon/drapion/front.png differ diff --git a/graphics/pokemon/drapion/normal.pal b/graphics/pokemon/drapion/normal.pal index b7d47ea42..1b476677c 100644 --- a/graphics/pokemon/drapion/normal.pal +++ b/graphics/pokemon/drapion/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -72 40 104 -112 64 128 +74 49 98 +123 65 123 16 16 16 -40 16 48 -136 88 152 -192 120 192 -224 160 200 -0 144 168 -24 88 96 -136 168 192 -248 248 248 -192 208 224 -136 56 128 +57 24 57 +139 90 156 +197 123 180 +222 148 205 +16 139 172 +41 90 98 +156 172 180 +255 255 255 +213 205 230 +131 49 123 0 0 0 0 0 0 diff --git a/graphics/pokemon/dratini/anim_front.png b/graphics/pokemon/dratini/anim_front.png index f34ac70d8..4b3f1a6c0 100644 Binary files a/graphics/pokemon/dratini/anim_front.png and b/graphics/pokemon/dratini/anim_front.png differ diff --git a/graphics/pokemon/dratini/front.png b/graphics/pokemon/dratini/front.png index 57c8d94b5..ee6f3bc45 100644 Binary files a/graphics/pokemon/dratini/front.png and b/graphics/pokemon/dratini/front.png differ diff --git a/graphics/pokemon/dratini/normal.pal b/graphics/pokemon/dratini/normal.pal index bb6334623..0367cec18 100644 --- a/graphics/pokemon/dratini/normal.pal +++ b/graphics/pokemon/dratini/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 128 144 -240 232 232 -200 192 184 -88 88 88 -88 104 176 -40 48 88 -160 192 232 -112 144 184 +152 144 136 248 248 248 -16 16 16 -120 48 120 -184 120 184 +208 200 208 +88 88 88 +88 96 184 +40 48 128 +160 176 240 +112 128 208 +248 248 248 +0 0 0 +72 24 104 +96 56 120 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/drifblim/anim_front.png b/graphics/pokemon/drifblim/anim_front.png index 177cce55d..9ed62c859 100644 Binary files a/graphics/pokemon/drifblim/anim_front.png and b/graphics/pokemon/drifblim/anim_front.png differ diff --git a/graphics/pokemon/drifblim/front.png b/graphics/pokemon/drifblim/front.png index eb766375e..f6cf9d5f9 100644 Binary files a/graphics/pokemon/drifblim/front.png and b/graphics/pokemon/drifblim/front.png differ diff --git a/graphics/pokemon/drifblim/normal.pal b/graphics/pokemon/drifblim/normal.pal index 8c3533930..fc8ae23dd 100644 --- a/graphics/pokemon/drifblim/normal.pal +++ b/graphics/pokemon/drifblim/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -200 184 176 +192 192 224 248 248 248 -96 88 88 +88 88 96 16 16 16 -88 72 104 -120 96 152 -64 48 72 -160 136 168 -224 80 80 +88 64 120 +128 80 168 +64 56 88 +152 112 216 +224 72 80 96 80 56 -184 152 56 -232 200 96 -168 144 176 -216 192 224 -136 48 48 +184 152 0 +248 216 8 +160 128 192 +208 176 248 +144 56 88 diff --git a/graphics/pokemon/drifloon/anim_front.png b/graphics/pokemon/drifloon/anim_front.png index f7bd5aa4f..feb7b51fa 100644 Binary files a/graphics/pokemon/drifloon/anim_front.png and b/graphics/pokemon/drifloon/anim_front.png differ diff --git a/graphics/pokemon/drifloon/front.png b/graphics/pokemon/drifloon/front.png index 76536179d..dea6e8871 100644 Binary files a/graphics/pokemon/drifloon/front.png and b/graphics/pokemon/drifloon/front.png differ diff --git a/graphics/pokemon/drifloon/normal.pal b/graphics/pokemon/drifloon/normal.pal index 8d6797178..a13591932 100644 --- a/graphics/pokemon/drifloon/normal.pal +++ b/graphics/pokemon/drifloon/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -176 200 216 +192 208 224 248 248 248 -72 96 112 +88 88 96 16 16 16 -112 80 120 -152 112 176 -80 64 96 -200 160 208 -56 40 72 -208 168 64 -128 104 40 -240 208 96 +120 64 160 +144 104 224 +96 48 128 +192 176 248 +72 48 104 +200 176 0 +136 104 32 +248 216 8 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/drilbur/anim_front.png b/graphics/pokemon/drilbur/anim_front.png index e7ff763c5..f6073ae88 100644 Binary files a/graphics/pokemon/drilbur/anim_front.png and b/graphics/pokemon/drilbur/anim_front.png differ diff --git a/graphics/pokemon/drilbur/front.png b/graphics/pokemon/drilbur/front.png index b55412a8e..1bb3bb20d 100644 Binary files a/graphics/pokemon/drilbur/front.png and b/graphics/pokemon/drilbur/front.png differ diff --git a/graphics/pokemon/drilbur/normal.pal b/graphics/pokemon/drilbur/normal.pal index 9d401f41f..75efa8cdb 100644 --- a/graphics/pokemon/drilbur/normal.pal +++ b/graphics/pokemon/drilbur/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 104 96 -56 48 48 +96 96 96 +48 48 48 16 16 16 248 248 248 -176 160 144 -216 200 200 -232 144 136 -192 112 96 -88 72 64 -72 72 96 -96 96 136 -128 64 72 -208 112 112 -128 112 104 +160 160 160 +208 208 208 +232 152 136 +200 120 104 +64 64 64 +72 72 88 +96 104 128 +128 40 64 +168 80 80 +88 88 88 0 0 0 diff --git a/graphics/pokemon/drowzee/anim_front.png b/graphics/pokemon/drowzee/anim_front.png index 22b551c8c..3bab74224 100644 Binary files a/graphics/pokemon/drowzee/anim_front.png and b/graphics/pokemon/drowzee/anim_front.png differ diff --git a/graphics/pokemon/drowzee/front.png b/graphics/pokemon/drowzee/front.png index 2c158d2c4..b1296df0e 100644 Binary files a/graphics/pokemon/drowzee/front.png and b/graphics/pokemon/drowzee/front.png differ diff --git a/graphics/pokemon/drowzee/normal.pal b/graphics/pokemon/drowzee/normal.pal index 145024f56..0ea8f35c4 100644 --- a/graphics/pokemon/drowzee/normal.pal +++ b/graphics/pokemon/drowzee/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -152 128 24 -96 80 16 -240 200 64 -56 48 40 -184 152 48 -248 224 152 -16 16 16 -120 72 88 -248 248 248 -128 72 88 -200 120 144 -120 112 96 -160 152 136 -88 72 64 +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 0 0 0 diff --git a/graphics/pokemon/druddigon/anim_front.png b/graphics/pokemon/druddigon/anim_front.png index 5c4989f1d..25fffae7f 100644 Binary files a/graphics/pokemon/druddigon/anim_front.png and b/graphics/pokemon/druddigon/anim_front.png differ diff --git a/graphics/pokemon/druddigon/front.png b/graphics/pokemon/druddigon/front.png index b0643a418..a522546a2 100644 Binary files a/graphics/pokemon/druddigon/front.png and b/graphics/pokemon/druddigon/front.png differ diff --git a/graphics/pokemon/druddigon/normal.pal b/graphics/pokemon/druddigon/normal.pal index 0e25f8564..3fdd0d60d 100644 --- a/graphics/pokemon/druddigon/normal.pal +++ b/graphics/pokemon/druddigon/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -0 56 80 -0 120 152 -0 88 104 +0 56 72 +0 120 168 +0 88 120 80 16 48 -136 32 56 -192 48 80 +144 0 64 +208 0 64 248 248 248 -232 176 112 -176 168 168 -208 120 136 -152 112 64 -80 64 48 -232 184 136 +232 192 0 +176 176 176 +208 80 112 +136 120 88 +96 80 48 +208 184 104 104 104 104 diff --git a/graphics/pokemon/ducklett/anim_front.png b/graphics/pokemon/ducklett/anim_front.png index 189932769..59d600e5e 100644 Binary files a/graphics/pokemon/ducklett/anim_front.png and b/graphics/pokemon/ducklett/anim_front.png differ diff --git a/graphics/pokemon/ducklett/front.png b/graphics/pokemon/ducklett/front.png index 7f0fd9423..f86b61a3d 100644 Binary files a/graphics/pokemon/ducklett/front.png and b/graphics/pokemon/ducklett/front.png differ diff --git a/graphics/pokemon/ducklett/normal.pal b/graphics/pokemon/ducklett/normal.pal index 7fd752704..d28a791b3 100644 --- a/graphics/pokemon/ducklett/normal.pal +++ b/graphics/pokemon/ducklett/normal.pal @@ -1,18 +1,18 @@ JASC-PAL 0100 16 -152 208 160 -88 128 120 -72 104 96 -152 224 216 -128 176 168 +248 192 248 +64 136 184 +48 72 112 +144 216 240 +96 176 200 16 16 16 -80 152 168 +64 136 184 248 248 248 -184 152 64 -120 104 56 -248 216 112 -80 184 216 +168 160 96 +104 104 64 +248 240 72 +88 176 232 32 104 104 0 0 0 0 0 0 diff --git a/graphics/pokemon/dugtrio/anim_front.png b/graphics/pokemon/dugtrio/anim_front.png index 511ecaeff..80339c70d 100644 Binary files a/graphics/pokemon/dugtrio/anim_front.png and b/graphics/pokemon/dugtrio/anim_front.png differ diff --git a/graphics/pokemon/dugtrio/front.png b/graphics/pokemon/dugtrio/front.png index 0a9afd978..4e1b6c280 100644 Binary files a/graphics/pokemon/dugtrio/front.png and b/graphics/pokemon/dugtrio/front.png differ diff --git a/graphics/pokemon/dugtrio/normal.pal b/graphics/pokemon/dugtrio/normal.pal index 3cc63312f..592302dc8 100644 --- a/graphics/pokemon/dugtrio/normal.pal +++ b/graphics/pokemon/dugtrio/normal.pal @@ -2,16 +2,16 @@ JASC-PAL 0100 16 152 208 160 -136 104 80 -208 168 144 -80 56 40 -176 128 104 +160 88 88 +216 152 88 +88 48 24 +192 112 64 248 248 248 16 16 16 -120 56 96 -240 200 224 -216 136 184 -168 96 136 +144 64 112 +248 176 224 +232 120 184 +192 32 136 96 96 104 136 136 144 56 56 56 diff --git a/graphics/pokemon/dunsparce/anim_front.png b/graphics/pokemon/dunsparce/anim_front.png index 6b29ff012..b2216c6e2 100644 Binary files a/graphics/pokemon/dunsparce/anim_front.png and b/graphics/pokemon/dunsparce/anim_front.png differ diff --git a/graphics/pokemon/dunsparce/front.png b/graphics/pokemon/dunsparce/front.png index d097d92d2..660f5e1a1 100644 Binary files a/graphics/pokemon/dunsparce/front.png and b/graphics/pokemon/dunsparce/front.png differ diff --git a/graphics/pokemon/dunsparce/normal.pal b/graphics/pokemon/dunsparce/normal.pal index 5a2d1aae3..0aadd552d 100644 --- a/graphics/pokemon/dunsparce/normal.pal +++ b/graphics/pokemon/dunsparce/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 112 88 64 -248 224 136 -200 184 80 -160 144 56 +240 224 120 +216 184 56 +184 136 32 16 16 16 -112 104 96 +88 96 112 240 248 248 -192 184 184 -224 216 208 -104 192 192 -248 232 200 -56 152 168 -48 112 120 -163 110 138 +184 200 224 +208 224 240 +104 184 200 +248 240 192 +48 136 160 +32 104 128 +168 32 32 0 0 0 diff --git a/graphics/pokemon/duosion/anim_front.png b/graphics/pokemon/duosion/anim_front.png index edd0ce9fa..e8c48d6c0 100644 Binary files a/graphics/pokemon/duosion/anim_front.png and b/graphics/pokemon/duosion/anim_front.png differ diff --git a/graphics/pokemon/duosion/front.png b/graphics/pokemon/duosion/front.png index 7c463f848..acf0c1c0d 100644 Binary files a/graphics/pokemon/duosion/front.png and b/graphics/pokemon/duosion/front.png differ diff --git a/graphics/pokemon/duosion/normal.pal b/graphics/pokemon/duosion/normal.pal index 990c6486b..9af82073e 100644 --- a/graphics/pokemon/duosion/normal.pal +++ b/graphics/pokemon/duosion/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 0 176 232 -56 136 104 -112 184 136 -96 128 88 -48 104 80 -208 232 168 -168 168 128 +64 152 96 +88 176 120 +96 120 96 +48 120 72 +192 216 176 +152 184 136 16 16 16 -184 232 184 +128 216 160 224 248 216 -160 88 88 -112 56 72 -0 0 0 +112 56 56 +176 64 64 +128 216 160 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/durant/anim_front.png b/graphics/pokemon/durant/anim_front.png index 236346e11..46e975814 100644 Binary files a/graphics/pokemon/durant/anim_front.png and b/graphics/pokemon/durant/anim_front.png differ diff --git a/graphics/pokemon/durant/front.png b/graphics/pokemon/durant/front.png index efd8d0ced..0320e654f 100644 Binary files a/graphics/pokemon/durant/front.png and b/graphics/pokemon/durant/front.png differ diff --git a/graphics/pokemon/durant/normal.pal b/graphics/pokemon/durant/normal.pal index ae4b4bfd4..4b438dc85 100644 --- a/graphics/pokemon/durant/normal.pal +++ b/graphics/pokemon/durant/normal.pal @@ -1,17 +1,17 @@ JASC-PAL 0100 16 -152 208 160 -136 128 144 -168 168 184 -200 200 224 -64 64 72 -24 24 32 -40 40 48 -88 88 96 -128 24 32 -192 64 72 -0 0 0 +153 204 153 +136 136 136 +170 170 187 +204 204 221 +68 68 68 +17 17 34 +34 34 51 +85 85 102 +128 32 0 +208 56 24 +255 255 255 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/dusclops/anim_front.png b/graphics/pokemon/dusclops/anim_front.png index 5fe60bbed..fee45d14a 100644 Binary files a/graphics/pokemon/dusclops/anim_front.png and b/graphics/pokemon/dusclops/anim_front.png differ diff --git a/graphics/pokemon/dusclops/front.png b/graphics/pokemon/dusclops/front.png index b2c01d029..58a0d15ab 100644 Binary files a/graphics/pokemon/dusclops/front.png and b/graphics/pokemon/dusclops/front.png differ diff --git a/graphics/pokemon/dusclops/normal.pal b/graphics/pokemon/dusclops/normal.pal index 882f3c79e..481bff7a6 100644 --- a/graphics/pokemon/dusclops/normal.pal +++ b/graphics/pokemon/dusclops/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -88 72 56 -152 136 120 -80 64 48 -224 208 192 -200 184 160 +104 88 72 +152 144 128 +80 56 48 +216 208 192 +184 176 160 16 16 16 -112 112 104 -176 176 160 -144 144 128 -80 80 72 +96 96 88 +160 160 144 +136 136 120 +72 72 72 128 104 104 248 248 248 -240 128 136 -224 80 88 +248 104 120 +216 16 64 24 24 24 diff --git a/graphics/pokemon/dusknoir/anim_front.png b/graphics/pokemon/dusknoir/anim_front.png index 59c490a6d..abbef6aac 100644 Binary files a/graphics/pokemon/dusknoir/anim_front.png and b/graphics/pokemon/dusknoir/anim_front.png differ diff --git a/graphics/pokemon/dusknoir/front.png b/graphics/pokemon/dusknoir/front.png index ad418e102..95a5ccea9 100644 Binary files a/graphics/pokemon/dusknoir/front.png and b/graphics/pokemon/dusknoir/front.png differ diff --git a/graphics/pokemon/dusknoir/normal.pal b/graphics/pokemon/dusknoir/normal.pal index 65731923d..ce4803194 100644 --- a/graphics/pokemon/dusknoir/normal.pal +++ b/graphics/pokemon/dusknoir/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -96 72 40 -160 120 72 -216 184 120 +96 72 48 +152 120 40 +224 176 48 64 56 56 16 16 16 -104 96 88 -168 176 160 -128 128 112 +96 88 96 +168 160 152 +128 112 112 88 88 72 176 144 56 224 192 56 -208 208 184 +200 200 168 232 64 64 40 40 32 0 0 0 diff --git a/graphics/pokemon/duskull/anim_front.png b/graphics/pokemon/duskull/anim_front.png index 89d92ec38..ede00efff 100644 Binary files a/graphics/pokemon/duskull/anim_front.png and b/graphics/pokemon/duskull/anim_front.png differ diff --git a/graphics/pokemon/duskull/front.png b/graphics/pokemon/duskull/front.png index 1e337d3ac..33903c773 100644 Binary files a/graphics/pokemon/duskull/front.png and b/graphics/pokemon/duskull/front.png differ diff --git a/graphics/pokemon/duskull/normal.pal b/graphics/pokemon/duskull/normal.pal index 657950b54..9b027e69f 100644 --- a/graphics/pokemon/duskull/normal.pal +++ b/graphics/pokemon/duskull/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 120 112 -40 56 40 -72 88 80 -160 168 160 -16 16 16 -248 240 224 +104 104 88 +48 48 40 +72 72 64 +128 128 112 +8 8 8 +248 248 224 216 208 168 176 176 144 -152 152 112 +144 136 112 232 224 192 -240 184 184 -232 80 96 -104 88 80 -0 0 0 -0 0 0 +248 72 16 +176 48 80 +248 96 32 +248 248 248 +8 8 8 diff --git a/graphics/pokemon/dustox/anim_front.png b/graphics/pokemon/dustox/anim_front.png index 8ed2b9a20..3a47c01e7 100644 Binary files a/graphics/pokemon/dustox/anim_front.png and b/graphics/pokemon/dustox/anim_front.png differ diff --git a/graphics/pokemon/dustox/front.png b/graphics/pokemon/dustox/front.png index d1d4927b9..356320c18 100644 Binary files a/graphics/pokemon/dustox/front.png and b/graphics/pokemon/dustox/front.png differ diff --git a/graphics/pokemon/dustox/normal.pal b/graphics/pokemon/dustox/normal.pal index e2f17b0e2..cc1a72661 100644 --- a/graphics/pokemon/dustox/normal.pal +++ b/graphics/pokemon/dustox/normal.pal @@ -2,10 +2,10 @@ JASC-PAL 0100 16 144 144 248 -144 112 48 -248 216 112 +152 104 56 +248 232 112 80 64 88 -192 160 88 +208 176 80 16 16 16 144 112 160 248 184 232 diff --git a/graphics/pokemon/dwebble/anim_front.png b/graphics/pokemon/dwebble/anim_front.png index ef81e4864..087dc3ff7 100644 Binary files a/graphics/pokemon/dwebble/anim_front.png and b/graphics/pokemon/dwebble/anim_front.png differ diff --git a/graphics/pokemon/dwebble/front.png b/graphics/pokemon/dwebble/front.png index 6be5250a1..560295f56 100644 Binary files a/graphics/pokemon/dwebble/front.png and b/graphics/pokemon/dwebble/front.png differ diff --git a/graphics/pokemon/dwebble/normal.pal b/graphics/pokemon/dwebble/normal.pal index 1b74d2b54..45efc6c54 100644 --- a/graphics/pokemon/dwebble/normal.pal +++ b/graphics/pokemon/dwebble/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -120 104 96 -72 72 80 -200 184 152 -152 136 128 +120 112 112 +88 80 72 +192 184 128 +160 152 136 16 16 16 248 248 248 -56 56 56 -232 128 72 -168 88 48 -80 56 32 -248 184 152 -128 80 56 +64 64 64 +232 152 72 +192 96 32 +96 64 40 +248 184 120 +144 96 72 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/eelektrik/anim_front.png b/graphics/pokemon/eelektrik/anim_front.png index 5823c55de..567a58c2b 100644 Binary files a/graphics/pokemon/eelektrik/anim_front.png and b/graphics/pokemon/eelektrik/anim_front.png differ diff --git a/graphics/pokemon/eelektrik/front.png b/graphics/pokemon/eelektrik/front.png index 4189c85eb..6bb7cc764 100644 Binary files a/graphics/pokemon/eelektrik/front.png and b/graphics/pokemon/eelektrik/front.png differ diff --git a/graphics/pokemon/eelektrik/normal.pal b/graphics/pokemon/eelektrik/normal.pal index 64a26e74e..4e64a32a9 100644 --- a/graphics/pokemon/eelektrik/normal.pal +++ b/graphics/pokemon/eelektrik/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -176 160 112 -120 104 72 -248 232 176 +192 168 120 +128 112 64 +232 216 160 24 24 32 -48 64 88 -72 96 128 -112 24 16 -160 64 64 -232 112 104 -176 152 40 -240 208 48 +16 56 72 +32 88 96 +112 32 0 +176 72 40 +216 112 80 +216 176 0 +248 208 0 248 248 248 184 184 184 0 0 0 diff --git a/graphics/pokemon/eelektross/anim_front.png b/graphics/pokemon/eelektross/anim_front.png index bb8037f8c..938f781a5 100644 Binary files a/graphics/pokemon/eelektross/anim_front.png and b/graphics/pokemon/eelektross/anim_front.png differ diff --git a/graphics/pokemon/eelektross/front.png b/graphics/pokemon/eelektross/front.png index 3b7931c0b..b1ae70adb 100644 Binary files a/graphics/pokemon/eelektross/front.png and b/graphics/pokemon/eelektross/front.png differ diff --git a/graphics/pokemon/eelektross/normal.pal b/graphics/pokemon/eelektross/normal.pal index 90f3d7bf0..37f8ca946 100644 --- a/graphics/pokemon/eelektross/normal.pal +++ b/graphics/pokemon/eelektross/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 248 120 0 -48 64 80 +16 48 64 0 32 48 -64 96 136 -144 152 184 +32 96 112 +112 176 200 16 16 24 -96 104 80 -176 152 104 -184 160 64 -248 224 88 -240 232 160 -232 88 88 -160 64 64 -152 144 136 +128 112 64 +192 168 120 +216 176 0 +248 208 0 +232 216 160 +216 112 80 +152 48 16 +128 128 128 248 248 248 0 0 0 diff --git a/graphics/pokemon/eevee/anim_front.png b/graphics/pokemon/eevee/anim_front.png index 59d53bacc..d419e87fc 100644 Binary files a/graphics/pokemon/eevee/anim_front.png and b/graphics/pokemon/eevee/anim_front.png differ diff --git a/graphics/pokemon/eevee/anim_frontf.png b/graphics/pokemon/eevee/anim_frontf.png index e923202b4..48cb88317 100644 Binary files a/graphics/pokemon/eevee/anim_frontf.png and b/graphics/pokemon/eevee/anim_frontf.png differ diff --git a/graphics/pokemon/eevee/front.png b/graphics/pokemon/eevee/front.png index 9833109f7..1a2292913 100644 Binary files a/graphics/pokemon/eevee/front.png and b/graphics/pokemon/eevee/front.png differ diff --git a/graphics/pokemon/eevee/frontf.png b/graphics/pokemon/eevee/frontf.png new file mode 100644 index 000000000..f7241f496 Binary files /dev/null and b/graphics/pokemon/eevee/frontf.png differ diff --git a/graphics/pokemon/eevee/normal.pal b/graphics/pokemon/eevee/normal.pal index 6bd8aad58..43bc46c9b 100644 --- a/graphics/pokemon/eevee/normal.pal +++ b/graphics/pokemon/eevee/normal.pal @@ -2,16 +2,16 @@ JASC-PAL 0100 16 152 208 160 -152 96 56 -96 72 56 -208 136 72 +160 96 72 +112 72 72 +208 152 72 16 16 16 56 40 24 -96 48 8 -176 152 112 -224 192 136 +96 48 32 +184 152 120 +224 192 144 248 248 248 -248 216 160 +248 224 168 224 184 120 96 72 56 0 0 0 diff --git a/graphics/pokemon/ekans/anim_front.png b/graphics/pokemon/ekans/anim_front.png index d7d2241ba..abea49e51 100644 Binary files a/graphics/pokemon/ekans/anim_front.png and b/graphics/pokemon/ekans/anim_front.png differ diff --git a/graphics/pokemon/ekans/front.png b/graphics/pokemon/ekans/front.png index 1afc14625..721886da3 100644 Binary files a/graphics/pokemon/ekans/front.png and b/graphics/pokemon/ekans/front.png differ diff --git a/graphics/pokemon/ekans/normal.pal b/graphics/pokemon/ekans/normal.pal index fa10d90fa..10208771e 100644 --- a/graphics/pokemon/ekans/normal.pal +++ b/graphics/pokemon/ekans/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -80 32 64 -144 80 128 -224 160 224 -184 120 184 -96 56 88 -160 128 104 -248 232 176 +88 16 72 +160 72 160 +216 160 232 +192 96 200 +120 48 104 +176 152 48 +248 224 120 16 16 16 -200 176 112 -144 80 88 +208 184 72 +160 56 96 88 72 48 -192 120 128 -240 176 200 +216 96 112 +224 168 192 248 224 152 0 0 0 diff --git a/graphics/pokemon/electabuzz/anim_front.png b/graphics/pokemon/electabuzz/anim_front.png index c718c7648..a1f470a0a 100644 Binary files a/graphics/pokemon/electabuzz/anim_front.png and b/graphics/pokemon/electabuzz/anim_front.png differ diff --git a/graphics/pokemon/electabuzz/front.png b/graphics/pokemon/electabuzz/front.png index 4a77ab9c8..0459ecb3b 100644 Binary files a/graphics/pokemon/electabuzz/front.png and b/graphics/pokemon/electabuzz/front.png differ diff --git a/graphics/pokemon/electabuzz/normal.pal b/graphics/pokemon/electabuzz/normal.pal index 724c755c7..7a072e9d8 100644 --- a/graphics/pokemon/electabuzz/normal.pal +++ b/graphics/pokemon/electabuzz/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -168 136 72 -16 16 16 -248 232 168 -248 208 96 -88 64 48 -72 104 128 -16 48 72 +192 160 16 +0 0 0 +248 240 176 +248 224 56 +104 88 24 +88 104 120 +56 64 80 248 248 248 200 200 216 -160 104 104 -224 144 144 -200 160 72 -0 0 0 +176 56 104 +224 96 144 +224 192 80 +248 240 176 0 0 0 0 0 0 diff --git a/graphics/pokemon/electivire/anim_front.png b/graphics/pokemon/electivire/anim_front.png index 78bc8c048..a5f05a7e8 100644 Binary files a/graphics/pokemon/electivire/anim_front.png and b/graphics/pokemon/electivire/anim_front.png differ diff --git a/graphics/pokemon/electivire/front.png b/graphics/pokemon/electivire/front.png index 42f378b60..41bf884b5 100644 Binary files a/graphics/pokemon/electivire/front.png and b/graphics/pokemon/electivire/front.png differ diff --git a/graphics/pokemon/electivire/normal.pal b/graphics/pokemon/electivire/normal.pal index 03836274f..e751bd37e 100644 --- a/graphics/pokemon/electivire/normal.pal +++ b/graphics/pokemon/electivire/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 24 24 -8 8 8 -200 72 72 -216 120 104 -40 32 40 -128 120 72 -240 200 104 -80 72 64 -248 232 192 -176 144 80 -248 248 248 -80 72 72 -104 104 104 -192 176 184 +112 24 0 +0 0 0 +176 56 24 +240 80 56 +48 40 40 +152 128 72 +248 216 32 +88 72 64 +248 232 144 +192 168 64 +248 248 248 +104 104 104 +176 176 192 +0 0 0 0 0 0 diff --git a/graphics/pokemon/electrike/anim_front.png b/graphics/pokemon/electrike/anim_front.png index 7c25c7c89..b1acce4c9 100644 Binary files a/graphics/pokemon/electrike/anim_front.png and b/graphics/pokemon/electrike/anim_front.png differ diff --git a/graphics/pokemon/electrike/front.png b/graphics/pokemon/electrike/front.png index 74f7cd334..3e2b74a75 100644 Binary files a/graphics/pokemon/electrike/front.png and b/graphics/pokemon/electrike/front.png differ diff --git a/graphics/pokemon/electrike/normal.pal b/graphics/pokemon/electrike/normal.pal index 6d3244c0f..e179c60e9 100644 --- a/graphics/pokemon/electrike/normal.pal +++ b/graphics/pokemon/electrike/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 0 176 232 -136 112 64 -248 216 112 +128 104 64 +248 232 64 16 16 16 -112 152 96 -72 104 64 -176 232 168 -144 208 136 -208 176 88 -136 184 120 -176 184 216 +96 152 96 +56 88 80 +176 232 152 +128 208 120 +200 160 56 +96 184 96 +184 184 192 248 248 248 -136 80 104 -200 128 160 -88 96 112 -176 232 168 +128 72 96 +224 104 160 +96 96 96 +176 232 152 diff --git a/graphics/pokemon/electrode/anim_front.png b/graphics/pokemon/electrode/anim_front.png index 10d09ecb7..e2342827e 100644 Binary files a/graphics/pokemon/electrode/anim_front.png and b/graphics/pokemon/electrode/anim_front.png differ diff --git a/graphics/pokemon/electrode/front.png b/graphics/pokemon/electrode/front.png index 15aecc817..e448ff25d 100644 Binary files a/graphics/pokemon/electrode/front.png and b/graphics/pokemon/electrode/front.png differ diff --git a/graphics/pokemon/electrode/normal.pal b/graphics/pokemon/electrode/normal.pal index a6073872e..187f196ea 100644 --- a/graphics/pokemon/electrode/normal.pal +++ b/graphics/pokemon/electrode/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -80 88 120 -152 160 176 +88 80 80 +160 160 160 232 232 232 248 248 248 -192 200 208 +200 200 224 16 16 16 -168 96 112 -240 120 112 -240 152 144 -112 48 56 -208 112 112 +200 40 64 +248 80 32 +240 160 136 +128 16 16 +232 56 48 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/elekid/anim_front.png b/graphics/pokemon/elekid/anim_front.png index cc05d9068..3b38ebfa2 100644 Binary files a/graphics/pokemon/elekid/anim_front.png and b/graphics/pokemon/elekid/anim_front.png differ diff --git a/graphics/pokemon/elekid/front.png b/graphics/pokemon/elekid/front.png index 7261262a9..dc1c694b2 100644 Binary files a/graphics/pokemon/elekid/front.png and b/graphics/pokemon/elekid/front.png differ diff --git a/graphics/pokemon/elekid/normal.pal b/graphics/pokemon/elekid/normal.pal index 1035472af..0c1a77d4a 100644 --- a/graphics/pokemon/elekid/normal.pal +++ b/graphics/pokemon/elekid/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -96 72 32 -144 112 72 -240 224 144 -192 160 64 +120 80 0 +176 104 0 +248 216 88 +200 136 0 16 16 16 160 160 160 248 248 248 200 200 200 -104 104 96 -216 184 80 -56 56 48 -127 81 77 -193 142 135 +96 96 96 +240 176 0 +48 48 48 +168 16 0 +232 64 48 0 0 0 0 0 0 diff --git a/graphics/pokemon/elgyem/anim_front.png b/graphics/pokemon/elgyem/anim_front.png index 019ce1dfa..2900d3b3e 100644 Binary files a/graphics/pokemon/elgyem/anim_front.png and b/graphics/pokemon/elgyem/anim_front.png differ diff --git a/graphics/pokemon/elgyem/front.png b/graphics/pokemon/elgyem/front.png index b034ed9ed..f1a930f82 100644 Binary files a/graphics/pokemon/elgyem/front.png and b/graphics/pokemon/elgyem/front.png differ diff --git a/graphics/pokemon/elgyem/normal.pal b/graphics/pokemon/elgyem/normal.pal index fcc15c286..29f2d2365 100644 --- a/graphics/pokemon/elgyem/normal.pal +++ b/graphics/pokemon/elgyem/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 248 160 176 -56 96 88 -72 120 104 -96 152 144 -136 216 216 +32 90 82 +57 115 82 +98 148 131 +164 205 189 16 16 16 -64 56 64 -112 104 112 -40 112 72 -248 248 248 -64 184 120 -120 56 48 -208 88 80 -248 232 88 -120 120 56 +65 65 65 +106 106 115 +16 82 41 +255 255 255 +32 156 16 +123 41 41 +205 0 0 +230 205 0 +106 98 16 0 0 0 diff --git a/graphics/pokemon/emboar/anim_front.png b/graphics/pokemon/emboar/anim_front.png index 6040135f8..ad36ed955 100644 Binary files a/graphics/pokemon/emboar/anim_front.png and b/graphics/pokemon/emboar/anim_front.png differ diff --git a/graphics/pokemon/emboar/front.png b/graphics/pokemon/emboar/front.png index 2ae4b79e4..009ecfd4d 100644 Binary files a/graphics/pokemon/emboar/front.png and b/graphics/pokemon/emboar/front.png differ diff --git a/graphics/pokemon/emboar/normal.pal b/graphics/pokemon/emboar/normal.pal index 4058c5649..ebd2efcaa 100644 --- a/graphics/pokemon/emboar/normal.pal +++ b/graphics/pokemon/emboar/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 24 24 -40 32 40 -224 64 64 -56 48 56 -112 48 16 -224 112 56 -160 80 48 +120 24 16 +32 32 32 +224 48 40 +48 48 48 +112 40 0 +232 96 32 +184 80 32 16 16 16 -224 144 16 -168 168 192 -232 192 72 +232 136 8 +168 168 168 +232 184 8 240 240 240 -152 48 48 -112 80 16 -168 136 48 +160 56 48 +120 88 8 +176 136 32 diff --git a/graphics/pokemon/emolga/anim_front.png b/graphics/pokemon/emolga/anim_front.png index 14f44870b..97b86d00b 100644 Binary files a/graphics/pokemon/emolga/anim_front.png and b/graphics/pokemon/emolga/anim_front.png differ diff --git a/graphics/pokemon/emolga/front.png b/graphics/pokemon/emolga/front.png index 8f296f15f..23a5856b4 100644 Binary files a/graphics/pokemon/emolga/front.png and b/graphics/pokemon/emolga/front.png differ diff --git a/graphics/pokemon/emolga/normal.pal b/graphics/pokemon/emolga/normal.pal index 4d72d2e48..92cb1b116 100644 --- a/graphics/pokemon/emolga/normal.pal +++ b/graphics/pokemon/emolga/normal.pal @@ -6,11 +6,11 @@ JASC-PAL 88 80 88 32 32 40 16 16 16 -192 152 48 +208 160 48 192 184 184 -160 120 24 +176 136 8 248 248 248 -248 200 56 +248 208 0 152 152 112 152 144 144 112 64 88 diff --git a/graphics/pokemon/empoleon/anim_front.png b/graphics/pokemon/empoleon/anim_front.png index 85d41c602..697609916 100644 Binary files a/graphics/pokemon/empoleon/anim_front.png and b/graphics/pokemon/empoleon/anim_front.png differ diff --git a/graphics/pokemon/empoleon/front.png b/graphics/pokemon/empoleon/front.png index 8cf43c938..3b3dff0bc 100644 Binary files a/graphics/pokemon/empoleon/front.png and b/graphics/pokemon/empoleon/front.png differ diff --git a/graphics/pokemon/empoleon/normal.pal b/graphics/pokemon/empoleon/normal.pal index 0b49c0a5e..b026b6f74 100644 --- a/graphics/pokemon/empoleon/normal.pal +++ b/graphics/pokemon/empoleon/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -184 128 56 -248 200 128 -96 80 32 -240 176 96 +184 136 104 +248 224 128 +120 80 64 +232 200 96 16 16 16 -56 64 72 -40 72 120 -64 112 184 -32 32 40 -120 176 232 -232 232 232 +40 64 80 +40 88 144 +80 136 224 +32 40 48 +152 200 248 +232 232 248 216 232 248 32 32 40 0 0 0 diff --git a/graphics/pokemon/entei/anim_front.png b/graphics/pokemon/entei/anim_front.png index 10472e133..267cc4cb6 100644 Binary files a/graphics/pokemon/entei/anim_front.png and b/graphics/pokemon/entei/anim_front.png differ diff --git a/graphics/pokemon/entei/front.png b/graphics/pokemon/entei/front.png index bdd6c1f7e..efed934d7 100644 Binary files a/graphics/pokemon/entei/front.png and b/graphics/pokemon/entei/front.png differ diff --git a/graphics/pokemon/entei/normal.pal b/graphics/pokemon/entei/normal.pal index eda697433..5c26ab549 100644 --- a/graphics/pokemon/entei/normal.pal +++ b/graphics/pokemon/entei/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -64 32 8 -248 192 40 -144 72 32 -200 112 56 -248 216 120 +80 40 0 +248 200 0 +128 80 40 +168 112 80 +248 224 144 16 16 16 -176 144 40 -184 24 24 -168 152 144 -128 24 16 -200 80 72 +192 136 0 +216 0 0 +168 168 168 +152 0 0 +232 64 64 248 248 248 -208 208 200 -96 80 96 -104 56 24 +208 208 208 +80 80 88 +104 64 56 diff --git a/graphics/pokemon/escavalier/anim_front.png b/graphics/pokemon/escavalier/anim_front.png index a296de1aa..78d215a42 100644 Binary files a/graphics/pokemon/escavalier/anim_front.png and b/graphics/pokemon/escavalier/anim_front.png differ diff --git a/graphics/pokemon/escavalier/front.png b/graphics/pokemon/escavalier/front.png index 72bb5ca64..eb56edb91 100644 Binary files a/graphics/pokemon/escavalier/front.png and b/graphics/pokemon/escavalier/front.png differ diff --git a/graphics/pokemon/escavalier/normal.pal b/graphics/pokemon/escavalier/normal.pal index ee4897d93..3aa60cf27 100644 --- a/graphics/pokemon/escavalier/normal.pal +++ b/graphics/pokemon/escavalier/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -80 32 48 -224 72 96 -160 48 64 +128 8 8 +232 40 80 +184 32 80 16 16 16 -136 128 120 -192 184 176 -80 72 56 -112 96 88 -176 104 24 -176 128 48 -240 192 80 +144 144 152 +192 192 192 +56 64 72 +104 104 104 +224 88 16 +184 152 24 +248 216 24 248 248 248 -120 96 48 -40 104 152 -32 72 112 +112 96 32 +24 88 184 +40 72 128 diff --git a/graphics/pokemon/espeon/anim_front.png b/graphics/pokemon/espeon/anim_front.png index e9aeb6713..1010130c1 100644 Binary files a/graphics/pokemon/espeon/anim_front.png and b/graphics/pokemon/espeon/anim_front.png differ diff --git a/graphics/pokemon/espeon/front.png b/graphics/pokemon/espeon/front.png index d2cc671fb..9c0cc5bba 100644 Binary files a/graphics/pokemon/espeon/front.png and b/graphics/pokemon/espeon/front.png differ diff --git a/graphics/pokemon/espeon/normal.pal b/graphics/pokemon/espeon/normal.pal index 8c1c52e7e..2c4844e87 100644 --- a/graphics/pokemon/espeon/normal.pal +++ b/graphics/pokemon/espeon/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -96 56 72 -232 184 216 +120 72 120 +232 184 232 16 16 16 -168 120 136 -208 152 184 -56 80 104 -72 120 160 -200 64 64 +176 120 176 +224 160 208 +48 64 112 +72 112 176 +192 32 80 248 248 248 -104 72 168 -160 32 56 -160 144 208 -120 88 112 -155 49 106 -175 91 136 +128 96 176 +136 32 80 +192 192 192 +144 88 136 +168 16 0 +232 64 48 diff --git a/graphics/pokemon/excadrill/anim_front.png b/graphics/pokemon/excadrill/anim_front.png index bf9970785..4a07a4d87 100644 Binary files a/graphics/pokemon/excadrill/anim_front.png and b/graphics/pokemon/excadrill/anim_front.png differ diff --git a/graphics/pokemon/excadrill/front.png b/graphics/pokemon/excadrill/front.png index 437845c11..35cb0a172 100644 Binary files a/graphics/pokemon/excadrill/front.png and b/graphics/pokemon/excadrill/front.png differ diff --git a/graphics/pokemon/excadrill/normal.pal b/graphics/pokemon/excadrill/normal.pal index f393e696d..a193d953e 100644 --- a/graphics/pokemon/excadrill/normal.pal +++ b/graphics/pokemon/excadrill/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -88 80 80 -216 208 208 +96 96 96 +208 208 208 16 16 16 -160 152 152 -56 48 48 +160 160 160 +64 48 40 88 72 64 -40 32 32 -112 56 72 -168 72 80 +40 32 24 +128 64 64 +184 64 64 248 248 248 -176 96 96 -224 136 144 +200 112 104 +232 128 120 128 40 48 0 0 0 0 0 0 diff --git a/graphics/pokemon/exeggcute/anim_front.png b/graphics/pokemon/exeggcute/anim_front.png index 5ce0963fe..502e226db 100644 Binary files a/graphics/pokemon/exeggcute/anim_front.png and b/graphics/pokemon/exeggcute/anim_front.png differ diff --git a/graphics/pokemon/exeggcute/front.png b/graphics/pokemon/exeggcute/front.png index 8257e5bf3..49dc90ad3 100644 Binary files a/graphics/pokemon/exeggcute/front.png and b/graphics/pokemon/exeggcute/front.png differ diff --git a/graphics/pokemon/exeggcute/normal.pal b/graphics/pokemon/exeggcute/normal.pal index b9fa9d86a..b3489a08c 100644 --- a/graphics/pokemon/exeggcute/normal.pal +++ b/graphics/pokemon/exeggcute/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -192 136 152 +192 112 144 136 56 88 -248 200 200 +248 208 216 16 16 16 -248 216 128 -216 184 56 +248 232 136 +200 136 8 248 248 248 248 232 232 216 216 216 -184 120 152 -232 176 176 +224 176 184 +232 192 192 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/exeggutor/anim_front.png b/graphics/pokemon/exeggutor/anim_front.png index 019119288..44351f59b 100644 Binary files a/graphics/pokemon/exeggutor/anim_front.png and b/graphics/pokemon/exeggutor/anim_front.png differ diff --git a/graphics/pokemon/exeggutor/front.png b/graphics/pokemon/exeggutor/front.png index d5aa3ce24..7f825b094 100644 Binary files a/graphics/pokemon/exeggutor/front.png and b/graphics/pokemon/exeggutor/front.png differ diff --git a/graphics/pokemon/exeggutor/normal.pal b/graphics/pokemon/exeggutor/normal.pal index f680838c9..7af14aec0 100644 --- a/graphics/pokemon/exeggutor/normal.pal +++ b/graphics/pokemon/exeggutor/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 0 176 232 -48 96 64 +32 72 16 16 16 16 -72 152 96 -144 208 112 -88 184 120 -80 72 56 -200 192 128 -248 240 176 -248 248 200 +56 128 32 +88 192 64 +72 160 48 +96 72 56 +208 200 112 +240 240 144 +248 248 168 248 248 248 120 120 72 -160 104 120 -136 120 96 -216 144 168 -192 168 144 +112 40 40 +136 104 72 +232 128 120 +192 144 112 diff --git a/graphics/pokemon/exploud/anim_front.png b/graphics/pokemon/exploud/anim_front.png index 0b0fc2aab..c46727542 100644 Binary files a/graphics/pokemon/exploud/anim_front.png and b/graphics/pokemon/exploud/anim_front.png differ diff --git a/graphics/pokemon/exploud/front.png b/graphics/pokemon/exploud/front.png index c5e3bddb2..03eb4fa59 100644 Binary files a/graphics/pokemon/exploud/front.png and b/graphics/pokemon/exploud/front.png differ diff --git a/graphics/pokemon/exploud/normal.pal b/graphics/pokemon/exploud/normal.pal index da7be4205..b36fd399c 100644 --- a/graphics/pokemon/exploud/normal.pal +++ b/graphics/pokemon/exploud/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -152 136 80 -248 216 120 -16 16 16 -208 176 104 -88 80 120 -192 200 232 -152 160 216 -112 120 176 -112 40 80 -136 56 104 -232 128 128 -168 88 128 +160 120 32 +248 224 104 +0 0 0 +224 176 80 +80 72 136 +184 184 232 +160 160 216 +120 112 176 +88 32 88 +120 48 96 +224 112 152 +176 64 120 248 248 248 136 136 136 -200 144 168 +184 192 208 diff --git a/graphics/pokemon/farfetchd/anim_front.png b/graphics/pokemon/farfetchd/anim_front.png index 10073f534..6554a4c9f 100644 Binary files a/graphics/pokemon/farfetchd/anim_front.png and b/graphics/pokemon/farfetchd/anim_front.png differ diff --git a/graphics/pokemon/farfetchd/front.png b/graphics/pokemon/farfetchd/front.png index 6844e8572..ea6aa6637 100644 Binary files a/graphics/pokemon/farfetchd/front.png and b/graphics/pokemon/farfetchd/front.png differ diff --git a/graphics/pokemon/farfetchd/normal.pal b/graphics/pokemon/farfetchd/normal.pal index 901576f95..306a547b1 100644 --- a/graphics/pokemon/farfetchd/normal.pal +++ b/graphics/pokemon/farfetchd/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -144 112 104 -88 72 64 -192 152 136 +144 88 104 +96 64 56 +192 152 144 16 16 16 -88 128 56 -232 224 192 -144 184 40 -192 184 152 -208 216 176 +80 152 0 +232 232 216 +144 208 72 +192 176 152 +208 208 208 200 168 160 248 248 248 -200 216 112 -248 208 120 -248 184 40 -184 136 32 +200 248 136 +248 216 104 +240 176 64 +184 112 24 diff --git a/graphics/pokemon/fearow/anim_front.png b/graphics/pokemon/fearow/anim_front.png index b0b4626d0..d9650bc87 100644 Binary files a/graphics/pokemon/fearow/anim_front.png and b/graphics/pokemon/fearow/anim_front.png differ diff --git a/graphics/pokemon/fearow/back.png b/graphics/pokemon/fearow/back.png index a2999d373..429ab9a4b 100644 Binary files a/graphics/pokemon/fearow/back.png and b/graphics/pokemon/fearow/back.png differ diff --git a/graphics/pokemon/fearow/front.png b/graphics/pokemon/fearow/front.png index ec674d634..6cb779e78 100644 Binary files a/graphics/pokemon/fearow/front.png and b/graphics/pokemon/fearow/front.png differ diff --git a/graphics/pokemon/fearow/normal.pal b/graphics/pokemon/fearow/normal.pal index 48cc7dd7d..555e50474 100644 --- a/graphics/pokemon/fearow/normal.pal +++ b/graphics/pokemon/fearow/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 88 48 -80 48 32 -224 192 152 +160 104 48 +96 64 40 +232 232 152 16 16 16 -176 112 56 -208 144 80 +192 136 48 +176 32 32 112 32 32 -208 80 64 -144 72 56 -224 136 128 -208 184 152 +224 64 64 +160 64 64 +248 128 104 +224 208 176 248 248 248 -168 144 112 -240 184 200 -200 144 144 +168 160 104 +232 168 160 +208 128 128 diff --git a/graphics/pokemon/fearow/shiny.pal b/graphics/pokemon/fearow/shiny.pal index 4d0161920..66bce8b73 100644 --- a/graphics/pokemon/fearow/shiny.pal +++ b/graphics/pokemon/fearow/shiny.pal @@ -7,7 +7,7 @@ JASC-PAL 208 216 88 16 16 16 176 184 32 -208 216 88 +208 120 0 136 48 0 248 160 0 208 120 0 diff --git a/graphics/pokemon/feebas/anim_front.png b/graphics/pokemon/feebas/anim_front.png index 46874f95f..f08426d73 100644 Binary files a/graphics/pokemon/feebas/anim_front.png and b/graphics/pokemon/feebas/anim_front.png differ diff --git a/graphics/pokemon/feebas/front.png b/graphics/pokemon/feebas/front.png index 014124a8e..2b746a493 100644 Binary files a/graphics/pokemon/feebas/front.png and b/graphics/pokemon/feebas/front.png differ diff --git a/graphics/pokemon/feebas/normal.pal b/graphics/pokemon/feebas/normal.pal index 365a9f2a4..13358ec65 100644 --- a/graphics/pokemon/feebas/normal.pal +++ b/graphics/pokemon/feebas/normal.pal @@ -15,5 +15,5 @@ JASC-PAL 144 120 88 216 224 240 248 248 248 -240 160 168 -224 112 120 +248 120 128 +200 80 112 diff --git a/graphics/pokemon/feraligatr/anim_front.png b/graphics/pokemon/feraligatr/anim_front.png index 853c80e2e..d644a30ae 100644 Binary files a/graphics/pokemon/feraligatr/anim_front.png and b/graphics/pokemon/feraligatr/anim_front.png differ diff --git a/graphics/pokemon/feraligatr/front.png b/graphics/pokemon/feraligatr/front.png index 30307772e..dda82ea74 100644 Binary files a/graphics/pokemon/feraligatr/front.png and b/graphics/pokemon/feraligatr/front.png differ diff --git a/graphics/pokemon/feraligatr/normal.pal b/graphics/pokemon/feraligatr/normal.pal index 16320dcd5..166ae9add 100644 --- a/graphics/pokemon/feraligatr/normal.pal +++ b/graphics/pokemon/feraligatr/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -120 40 40 -248 160 136 +128 0 8 +248 136 128 16 16 16 240 80 88 -24 88 120 -96 200 232 -64 152 168 -152 232 240 +8 104 144 +64 208 232 +40 152 184 +136 232 248 248 248 248 192 192 192 248 184 112 -112 88 40 -240 216 152 -192 168 112 +128 88 0 +248 224 136 +200 184 96 0 0 0 diff --git a/graphics/pokemon/ferroseed/anim_front.png b/graphics/pokemon/ferroseed/anim_front.png index 51b2ae0ae..4c5275b5c 100644 Binary files a/graphics/pokemon/ferroseed/anim_front.png and b/graphics/pokemon/ferroseed/anim_front.png differ diff --git a/graphics/pokemon/ferroseed/front.png b/graphics/pokemon/ferroseed/front.png index f7c87b2dd..8242059a0 100644 Binary files a/graphics/pokemon/ferroseed/front.png and b/graphics/pokemon/ferroseed/front.png differ diff --git a/graphics/pokemon/ferroseed/normal.pal b/graphics/pokemon/ferroseed/normal.pal index 58ca62664..db9e02ebe 100644 --- a/graphics/pokemon/ferroseed/normal.pal +++ b/graphics/pokemon/ferroseed/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -48 80 72 -96 176 120 +16 64 32 +0 176 88 16 16 16 88 88 88 -192 192 200 -56 128 80 +176 184 184 +32 104 64 136 136 136 -48 48 56 +64 64 64 232 232 232 200 200 200 -184 120 56 -248 168 80 -0 0 0 +176 136 64 +232 184 72 +176 184 184 0 0 0 0 0 0 diff --git a/graphics/pokemon/ferrothorn/anim_front.png b/graphics/pokemon/ferrothorn/anim_front.png index 7542019e7..ccec2bda8 100644 Binary files a/graphics/pokemon/ferrothorn/anim_front.png and b/graphics/pokemon/ferrothorn/anim_front.png differ diff --git a/graphics/pokemon/ferrothorn/front.png b/graphics/pokemon/ferrothorn/front.png index 2f43f4e9c..eeee76f76 100644 Binary files a/graphics/pokemon/ferrothorn/front.png and b/graphics/pokemon/ferrothorn/front.png differ diff --git a/graphics/pokemon/ferrothorn/normal.pal b/graphics/pokemon/ferrothorn/normal.pal index c02ea55fa..284ef0063 100644 --- a/graphics/pokemon/ferrothorn/normal.pal +++ b/graphics/pokemon/ferrothorn/normal.pal @@ -3,16 +3,16 @@ JASC-PAL 16 152 208 160 88 88 88 -16 16 16 -48 48 56 -136 128 136 -40 72 64 -192 192 200 -56 128 80 -104 176 128 +0 0 0 +48 48 48 +128 128 136 +24 80 48 +176 184 184 +32 136 80 +0 176 88 248 248 248 -184 120 56 -240 152 72 +192 136 40 +232 184 72 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/finneon/anim_front.png b/graphics/pokemon/finneon/anim_front.png index 7e8e99a0e..c18dd41cf 100644 Binary files a/graphics/pokemon/finneon/anim_front.png and b/graphics/pokemon/finneon/anim_front.png differ diff --git a/graphics/pokemon/finneon/front.png b/graphics/pokemon/finneon/front.png index 063d58973..635dcfc7e 100644 Binary files a/graphics/pokemon/finneon/front.png and b/graphics/pokemon/finneon/front.png differ diff --git a/graphics/pokemon/finneon/normal.pal b/graphics/pokemon/finneon/normal.pal index 3cb0afe37..cc4af552a 100644 --- a/graphics/pokemon/finneon/normal.pal +++ b/graphics/pokemon/finneon/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -80 120 120 -144 216 208 -32 40 48 -200 232 224 +80 104 136 +144 208 224 +40 40 56 +192 224 240 16 16 8 112 160 160 -144 64 104 -224 136 152 -200 88 136 -80 112 112 -48 72 80 +112 64 120 +168 136 184 +192 72 144 +64 104 128 +48 64 88 232 248 248 16 16 16 0 0 0 diff --git a/graphics/pokemon/flaaffy/anim_front.png b/graphics/pokemon/flaaffy/anim_front.png index 6cf5bc557..0cc7d0439 100644 Binary files a/graphics/pokemon/flaaffy/anim_front.png and b/graphics/pokemon/flaaffy/anim_front.png differ diff --git a/graphics/pokemon/flaaffy/front.png b/graphics/pokemon/flaaffy/front.png index 0a6382039..373ff986f 100644 Binary files a/graphics/pokemon/flaaffy/front.png and b/graphics/pokemon/flaaffy/front.png differ diff --git a/graphics/pokemon/flaaffy/normal.pal b/graphics/pokemon/flaaffy/normal.pal index 1581a2a70..9b6781342 100644 --- a/graphics/pokemon/flaaffy/normal.pal +++ b/graphics/pokemon/flaaffy/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -160 184 184 -248 248 240 -112 136 136 -208 216 216 +176 176 208 +248 248 248 +128 112 136 +200 216 240 16 16 16 -80 80 80 -144 88 104 -248 144 176 -216 120 152 -248 176 192 -120 56 72 -48 104 144 -72 136 168 -88 192 232 -48 88 120 +72 72 88 +208 96 120 +248 176 200 +248 136 152 +248 200 208 +136 32 48 +64 112 168 +80 128 192 +128 192 248 +40 64 136 diff --git a/graphics/pokemon/flareon/anim_front.png b/graphics/pokemon/flareon/anim_front.png index e76a63044..fcb04af2a 100644 Binary files a/graphics/pokemon/flareon/anim_front.png and b/graphics/pokemon/flareon/anim_front.png differ diff --git a/graphics/pokemon/flareon/front.png b/graphics/pokemon/flareon/front.png index b587918dd..7f233214c 100644 Binary files a/graphics/pokemon/flareon/front.png and b/graphics/pokemon/flareon/front.png differ diff --git a/graphics/pokemon/flareon/normal.pal b/graphics/pokemon/flareon/normal.pal index 6d80e3fed..648c2c51c 100644 --- a/graphics/pokemon/flareon/normal.pal +++ b/graphics/pokemon/flareon/normal.pal @@ -2,16 +2,16 @@ JASC-PAL 0100 16 152 208 160 -104 88 56 -224 200 128 -248 232 152 +112 88 64 +224 192 136 +248 240 160 96 40 32 -176 152 96 +192 160 104 16 16 16 -192 80 32 -136 48 56 -240 120 64 -0 56 80 +216 64 80 +112 32 24 +248 112 72 +32 32 104 248 248 248 0 0 0 0 0 0 diff --git a/graphics/pokemon/floatzel/anim_front.png b/graphics/pokemon/floatzel/anim_front.png index 1b66fe15d..d5dd3a61f 100644 Binary files a/graphics/pokemon/floatzel/anim_front.png and b/graphics/pokemon/floatzel/anim_front.png differ diff --git a/graphics/pokemon/floatzel/front.png b/graphics/pokemon/floatzel/front.png index 64759500b..6ff6ec136 100644 Binary files a/graphics/pokemon/floatzel/front.png and b/graphics/pokemon/floatzel/front.png differ diff --git a/graphics/pokemon/floatzel/normal.pal b/graphics/pokemon/floatzel/normal.pal index 7494e2886..c92f189e8 100644 --- a/graphics/pokemon/floatzel/normal.pal +++ b/graphics/pokemon/floatzel/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -88 48 24 -232 128 80 -168 80 40 +120 64 32 +232 120 24 +168 88 32 24 24 24 -248 224 168 -192 168 112 +240 240 176 +200 184 128 120 104 40 248 248 248 -200 160 40 +224 160 48 96 96 80 -248 216 80 -56 120 152 -96 200 224 -200 96 48 +248 216 0 +32 96 160 +96 184 224 +200 104 24 248 248 248 diff --git a/graphics/pokemon/flygon/anim_front.png b/graphics/pokemon/flygon/anim_front.png index 4a9d71d59..dcc03a1c5 100644 Binary files a/graphics/pokemon/flygon/anim_front.png and b/graphics/pokemon/flygon/anim_front.png differ diff --git a/graphics/pokemon/flygon/front.png b/graphics/pokemon/flygon/front.png index cd2bc9fb3..64b9467a5 100644 Binary files a/graphics/pokemon/flygon/front.png and b/graphics/pokemon/flygon/front.png differ diff --git a/graphics/pokemon/flygon/normal.pal b/graphics/pokemon/flygon/normal.pal index 5c5bf302f..f9b4b8a31 100644 --- a/graphics/pokemon/flygon/normal.pal +++ b/graphics/pokemon/flygon/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 176 176 176 -56 96 56 -88 160 88 +48 88 88 +104 160 112 88 120 80 16 16 16 -136 200 136 -136 48 56 -224 104 112 +144 208 152 +128 40 56 +216 96 112 248 248 248 -176 72 96 -184 208 136 -232 144 160 -128 168 96 +200 56 72 +176 216 112 +248 160 176 +136 160 80 128 184 96 216 248 136 -88 96 64 +80 96 32 diff --git a/graphics/pokemon/foongus/anim_front.png b/graphics/pokemon/foongus/anim_front.png index 8bf943daa..8c7b13ecf 100644 Binary files a/graphics/pokemon/foongus/anim_front.png and b/graphics/pokemon/foongus/anim_front.png differ diff --git a/graphics/pokemon/foongus/front.png b/graphics/pokemon/foongus/front.png index fe85bd399..0d584f1da 100644 Binary files a/graphics/pokemon/foongus/front.png and b/graphics/pokemon/foongus/front.png differ diff --git a/graphics/pokemon/foongus/normal.pal b/graphics/pokemon/foongus/normal.pal index cd7a381b5..78b7900af 100644 --- a/graphics/pokemon/foongus/normal.pal +++ b/graphics/pokemon/foongus/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -128 64 64 -232 96 88 +120 48 48 +216 88 80 16 16 16 -168 72 64 -120 104 88 -80 64 56 -184 160 144 -240 224 208 -160 88 120 +152 56 56 +104 72 48 +64 40 40 +192 176 152 +248 240 224 +152 56 120 128 104 96 -216 120 168 -0 0 0 +208 96 152 +16 16 16 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/forretress/anim_front.png b/graphics/pokemon/forretress/anim_front.png index 77dccba4d..3ddc37f38 100644 Binary files a/graphics/pokemon/forretress/anim_front.png and b/graphics/pokemon/forretress/anim_front.png differ diff --git a/graphics/pokemon/forretress/front.png b/graphics/pokemon/forretress/front.png index 99f779de8..dde5eac09 100644 Binary files a/graphics/pokemon/forretress/front.png and b/graphics/pokemon/forretress/front.png differ diff --git a/graphics/pokemon/forretress/normal.pal b/graphics/pokemon/forretress/normal.pal index 5fe04b703..56fce78f9 100644 --- a/graphics/pokemon/forretress/normal.pal +++ b/graphics/pokemon/forretress/normal.pal @@ -2,16 +2,16 @@ JASC-PAL 0100 16 152 208 160 -168 136 152 -248 224 216 -88 72 96 +152 120 144 +232 216 224 +80 64 96 16 16 16 -224 184 208 +208 184 192 160 24 24 -184 64 64 -104 24 16 +208 64 56 +120 24 24 248 248 248 -208 112 112 +248 96 96 88 80 80 248 224 216 0 0 0 diff --git a/graphics/pokemon/fraxure/anim_front.png b/graphics/pokemon/fraxure/anim_front.png index 70fac2dd2..de1d6b8da 100644 Binary files a/graphics/pokemon/fraxure/anim_front.png and b/graphics/pokemon/fraxure/anim_front.png differ diff --git a/graphics/pokemon/fraxure/front.png b/graphics/pokemon/fraxure/front.png index 8add7891a..5171acb52 100644 Binary files a/graphics/pokemon/fraxure/front.png and b/graphics/pokemon/fraxure/front.png differ diff --git a/graphics/pokemon/fraxure/normal.pal b/graphics/pokemon/fraxure/normal.pal index 67bffd94e..90a3d97bf 100644 --- a/graphics/pokemon/fraxure/normal.pal +++ b/graphics/pokemon/fraxure/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -32 64 40 +48 72 40 16 16 16 -72 144 80 -56 96 56 -112 112 120 -88 80 88 -96 32 32 -192 104 96 -48 48 56 +72 136 72 +64 104 56 +112 112 112 +88 88 80 +96 0 0 +216 64 64 +56 56 56 248 248 248 -128 56 56 -160 144 152 -96 72 80 -120 112 112 -208 120 136 +176 32 32 +152 152 152 +120 40 48 +120 120 120 +232 128 120 diff --git a/graphics/pokemon/frillish/anim_front.png b/graphics/pokemon/frillish/anim_front.png index 908c66ace..161c4bfb1 100644 Binary files a/graphics/pokemon/frillish/anim_front.png and b/graphics/pokemon/frillish/anim_front.png differ diff --git a/graphics/pokemon/frillish/anim_frontf.png b/graphics/pokemon/frillish/anim_frontf.png index ae2c2ecee..b3fa9621b 100644 Binary files a/graphics/pokemon/frillish/anim_frontf.png and b/graphics/pokemon/frillish/anim_frontf.png differ diff --git a/graphics/pokemon/frillish/back.png b/graphics/pokemon/frillish/back.png index 70886b6b5..ee17f90cd 100644 Binary files a/graphics/pokemon/frillish/back.png and b/graphics/pokemon/frillish/back.png differ diff --git a/graphics/pokemon/frillish/backf.png b/graphics/pokemon/frillish/backf.png index ac2074aa6..fcfd88dce 100644 Binary files a/graphics/pokemon/frillish/backf.png and b/graphics/pokemon/frillish/backf.png differ diff --git a/graphics/pokemon/frillish/front.png b/graphics/pokemon/frillish/front.png index 9631e3060..cd48a39ac 100644 Binary files a/graphics/pokemon/frillish/front.png and b/graphics/pokemon/frillish/front.png differ diff --git a/graphics/pokemon/frillish/frontf.png b/graphics/pokemon/frillish/frontf.png new file mode 100644 index 000000000..88713ea3a Binary files /dev/null and b/graphics/pokemon/frillish/frontf.png differ diff --git a/graphics/pokemon/frillish/normal.pal b/graphics/pokemon/frillish/normal.pal index a6fdeb9f9..33cbd2d10 100644 --- a/graphics/pokemon/frillish/normal.pal +++ b/graphics/pokemon/frillish/normal.pal @@ -2,16 +2,16 @@ JASC-PAL 0100 16 152 208 160 -56 104 128 +56 88 104 16 16 16 -136 176 208 -184 240 240 -104 168 208 -144 224 232 +176 192 224 +208 224 248 +88 160 192 +128 208 248 248 248 248 -64 112 184 -232 96 80 -0 0 0 +56 96 192 +216 40 16 +56 88 104 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/frillish/normalf.pal b/graphics/pokemon/frillish/normalf.pal index 252ae04b6..2932ece56 100644 --- a/graphics/pokemon/frillish/normalf.pal +++ b/graphics/pokemon/frillish/normalf.pal @@ -2,15 +2,15 @@ JASC-PAL 0100 16 153 210 164 -132 87 106 +160 64 96 16 16 16 -185 166 216 -252 214 232 -190 139 198 -255 186 215 +216 184 192 +248 224 232 +192 128 160 +248 184 216 255 255 255 -242 112 92 -115 149 209 +168 48 64 +88 160 200 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/froslass/anim_front.png b/graphics/pokemon/froslass/anim_front.png index ea5207baa..b6ef59fd4 100644 Binary files a/graphics/pokemon/froslass/anim_front.png and b/graphics/pokemon/froslass/anim_front.png differ diff --git a/graphics/pokemon/froslass/front.png b/graphics/pokemon/froslass/front.png index 3ad383321..28597b428 100644 Binary files a/graphics/pokemon/froslass/front.png and b/graphics/pokemon/froslass/front.png differ diff --git a/graphics/pokemon/froslass/normal.pal b/graphics/pokemon/froslass/normal.pal index 7d4fd3b87..eba1feb42 100644 --- a/graphics/pokemon/froslass/normal.pal +++ b/graphics/pokemon/froslass/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -104 152 160 -152 200 184 -72 80 88 -160 152 136 -72 104 120 -248 248 240 -216 208 200 -128 80 160 -96 56 112 +80 120 176 +112 176 208 +64 64 104 +136 136 168 +64 80 136 +248 248 248 +192 200 216 +112 48 160 +72 48 112 16 16 16 -192 168 48 -248 224 104 -104 56 48 -176 72 40 -208 128 96 +216 144 56 +248 208 88 +104 48 48 +192 40 32 +224 120 72 diff --git a/graphics/pokemon/furret/anim_front.png b/graphics/pokemon/furret/anim_front.png index 14e651c69..bd0119c56 100644 Binary files a/graphics/pokemon/furret/anim_front.png and b/graphics/pokemon/furret/anim_front.png differ diff --git a/graphics/pokemon/furret/back.png b/graphics/pokemon/furret/back.png index 1c035910c..1f93600ab 100644 Binary files a/graphics/pokemon/furret/back.png and b/graphics/pokemon/furret/back.png differ diff --git a/graphics/pokemon/furret/front.png b/graphics/pokemon/furret/front.png index 5e4fc0364..bab4d95b6 100644 Binary files a/graphics/pokemon/furret/front.png and b/graphics/pokemon/furret/front.png differ diff --git a/graphics/pokemon/furret/normal.pal b/graphics/pokemon/furret/normal.pal index c927ef516..661f34207 100644 --- a/graphics/pokemon/furret/normal.pal +++ b/graphics/pokemon/furret/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -72 40 40 -192 160 128 -112 72 56 -16 16 16 -232 200 152 -152 96 80 -160 128 104 -152 112 80 -248 216 184 +80 40 32 +208 176 104 +120 64 56 +32 32 40 +192 152 64 +232 208 160 +152 96 72 +168 128 40 +248 248 192 248 248 248 -32 96 80 -96 64 88 -224 112 112 -0 0 0 +112 112 112 +152 0 0 +248 144 96 +120 64 56 0 0 0 diff --git a/graphics/pokemon/furret/shiny.pal b/graphics/pokemon/furret/shiny.pal index b221862e5..75a750fca 100644 --- a/graphics/pokemon/furret/shiny.pal +++ b/graphics/pokemon/furret/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -104 16 64 +112 0 56 248 176 184 160 48 104 -16 16 16 -248 224 200 +32 32 40 +232 152 160 +248 232 216 216 88 136 -224 144 152 216 112 120 248 232 240 248 248 248 112 112 112 -152 56 56 +152 0 0 248 144 96 -0 0 0 +120 64 56 0 0 0 diff --git a/graphics/pokemon/gabite/anim_front.png b/graphics/pokemon/gabite/anim_front.png index 64dd7fd42..da2701ab0 100644 Binary files a/graphics/pokemon/gabite/anim_front.png and b/graphics/pokemon/gabite/anim_front.png differ diff --git a/graphics/pokemon/gabite/front.png b/graphics/pokemon/gabite/front.png index 59ab36b06..3495a5f18 100644 Binary files a/graphics/pokemon/gabite/front.png and b/graphics/pokemon/gabite/front.png differ diff --git a/graphics/pokemon/gabite/normal.pal b/graphics/pokemon/gabite/normal.pal index 300521aa6..6e64e91d8 100644 --- a/graphics/pokemon/gabite/normal.pal +++ b/graphics/pokemon/gabite/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -72 80 120 -40 48 80 -88 112 168 -128 120 176 -168 168 232 -128 144 184 -16 16 16 -248 200 56 -160 128 32 -80 24 16 -160 56 40 +56 72 136 +16 40 80 +88 104 184 +136 136 184 +176 184 240 +112 136 200 +16 24 32 +248 248 24 +216 152 24 +88 16 0 +168 48 72 248 248 248 -216 96 72 -136 128 120 -200 192 184 +216 88 40 +112 120 128 +192 200 208 diff --git a/graphics/pokemon/gallade/anim_front.png b/graphics/pokemon/gallade/anim_front.png index dd3d07c4e..b2da036ff 100644 Binary files a/graphics/pokemon/gallade/anim_front.png and b/graphics/pokemon/gallade/anim_front.png differ diff --git a/graphics/pokemon/gallade/front.png b/graphics/pokemon/gallade/front.png index 958215914..93f200159 100644 Binary files a/graphics/pokemon/gallade/front.png and b/graphics/pokemon/gallade/front.png differ diff --git a/graphics/pokemon/gallade/normal.pal b/graphics/pokemon/gallade/normal.pal index 0514a63f3..5f3e73587 100644 --- a/graphics/pokemon/gallade/normal.pal +++ b/graphics/pokemon/gallade/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -40 80 56 +56 80 80 16 16 16 -56 128 72 -96 152 152 -112 200 192 -56 112 104 -80 176 120 -152 128 128 -224 216 216 +64 128 88 +112 144 160 +120 192 176 +80 120 128 +88 176 104 +112 128 168 +200 200 224 248 248 248 -200 184 184 -112 40 64 -248 144 152 -208 72 96 +160 176 200 +128 40 72 +248 120 144 +208 72 112 248 248 248 diff --git a/graphics/pokemon/galvantula/anim_front.png b/graphics/pokemon/galvantula/anim_front.png index 5aa7dca3c..20b458676 100644 Binary files a/graphics/pokemon/galvantula/anim_front.png and b/graphics/pokemon/galvantula/anim_front.png differ diff --git a/graphics/pokemon/galvantula/front.png b/graphics/pokemon/galvantula/front.png index fb0ec3152..980ca86f9 100644 Binary files a/graphics/pokemon/galvantula/front.png and b/graphics/pokemon/galvantula/front.png differ diff --git a/graphics/pokemon/galvantula/normal.pal b/graphics/pokemon/galvantula/normal.pal index 10c8be6f9..e8975e877 100644 --- a/graphics/pokemon/galvantula/normal.pal +++ b/graphics/pokemon/galvantula/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 210 164 -79 85 122 -49 50 81 -102 121 186 +152 208 160 +40 56 120 +24 40 64 +56 80 176 16 16 16 -57 57 65 -178 142 71 -244 200 97 -175 143 186 -96 74 52 -132 110 72 -135 101 127 -255 255 255 -181 181 239 +56 56 64 +200 168 0 +248 216 80 +152 128 152 +104 80 56 +152 128 24 +112 104 104 +248 248 248 +0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/garbodor/anim_front.png b/graphics/pokemon/garbodor/anim_front.png index c8cb7329c..b211c33cb 100644 Binary files a/graphics/pokemon/garbodor/anim_front.png and b/graphics/pokemon/garbodor/anim_front.png differ diff --git a/graphics/pokemon/garbodor/front.png b/graphics/pokemon/garbodor/front.png index 0d6dd06ca..959931034 100644 Binary files a/graphics/pokemon/garbodor/front.png and b/graphics/pokemon/garbodor/front.png differ diff --git a/graphics/pokemon/garbodor/normal.pal b/graphics/pokemon/garbodor/normal.pal index 6770ac733..a6e27fa2a 100644 --- a/graphics/pokemon/garbodor/normal.pal +++ b/graphics/pokemon/garbodor/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -128 112 88 -88 72 72 -16 16 16 -168 144 128 -184 64 120 -224 96 160 -40 128 120 -40 176 176 -24 56 40 -80 112 88 -56 80 64 -168 184 192 -96 104 128 -248 248 248 +120 104 88 +88 72 64 0 0 0 +160 136 112 +184 48 120 +232 80 160 +24 104 128 +0 168 208 +24 56 40 +40 104 72 +24 72 48 +184 184 184 +112 112 112 +248 248 248 +160 136 112 diff --git a/graphics/pokemon/garchomp/anim_front.png b/graphics/pokemon/garchomp/anim_front.png index 240708b95..de7f101ea 100644 Binary files a/graphics/pokemon/garchomp/anim_front.png and b/graphics/pokemon/garchomp/anim_front.png differ diff --git a/graphics/pokemon/garchomp/front.png b/graphics/pokemon/garchomp/front.png index 285c1b42e..e84e0270f 100644 Binary files a/graphics/pokemon/garchomp/front.png and b/graphics/pokemon/garchomp/front.png differ diff --git a/graphics/pokemon/garchomp/normal.pal b/graphics/pokemon/garchomp/normal.pal index 679803423..610ed93b5 100644 --- a/graphics/pokemon/garchomp/normal.pal +++ b/graphics/pokemon/garchomp/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -64 72 104 -184 144 32 -32 40 64 -128 136 168 -248 200 72 -88 104 152 +64 64 136 +192 144 16 +40 40 80 +120 120 200 +248 208 24 +88 96 168 16 16 16 248 248 248 -120 112 112 -200 184 184 -104 64 72 -224 88 64 -184 104 112 -88 24 8 -160 56 32 +112 120 128 +192 200 208 +104 56 88 +224 72 48 +184 112 120 +88 16 0 +184 56 64 diff --git a/graphics/pokemon/gardevoir/anim_front.png b/graphics/pokemon/gardevoir/anim_front.png index f3e85d042..2b539caee 100644 Binary files a/graphics/pokemon/gardevoir/anim_front.png and b/graphics/pokemon/gardevoir/anim_front.png differ diff --git a/graphics/pokemon/gardevoir/front.png b/graphics/pokemon/gardevoir/front.png index f03c7de87..2bfc83879 100644 Binary files a/graphics/pokemon/gardevoir/front.png and b/graphics/pokemon/gardevoir/front.png differ diff --git a/graphics/pokemon/gardevoir/normal.pal b/graphics/pokemon/gardevoir/normal.pal index 94ea8ef6c..e3030295a 100644 --- a/graphics/pokemon/gardevoir/normal.pal +++ b/graphics/pokemon/gardevoir/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 176 232 -48 112 48 -96 168 88 -192 232 176 -128 200 128 +248 128 0 +48 120 64 +112 192 112 +184 240 144 +136 232 136 16 16 16 -120 112 160 -232 232 240 -248 144 152 +120 136 176 +240 240 248 +248 120 144 248 248 248 -192 184 216 -216 80 96 +200 200 232 +216 72 112 160 176 200 -120 48 56 +128 40 72 0 0 0 0 0 0 diff --git a/graphics/pokemon/gastly/anim_front.png b/graphics/pokemon/gastly/anim_front.png index 83037875d..3c5f16339 100644 Binary files a/graphics/pokemon/gastly/anim_front.png and b/graphics/pokemon/gastly/anim_front.png differ diff --git a/graphics/pokemon/gastly/front.png b/graphics/pokemon/gastly/front.png index 63bb5b572..b5131034e 100644 Binary files a/graphics/pokemon/gastly/front.png and b/graphics/pokemon/gastly/front.png differ diff --git a/graphics/pokemon/gastly/normal.pal b/graphics/pokemon/gastly/normal.pal index 19d4c8257..c4bfdcbd8 100644 --- a/graphics/pokemon/gastly/normal.pal +++ b/graphics/pokemon/gastly/normal.pal @@ -2,9 +2,9 @@ JASC-PAL 0100 16 152 208 160 -176 144 176 -136 104 136 -112 64 112 +176 144 184 +136 104 144 +104 72 120 16 8 8 16 16 16 56 40 40 diff --git a/graphics/pokemon/gastrodon/anim_front.png b/graphics/pokemon/gastrodon/anim_front.png index fa48c288c..c47a0e86b 100644 Binary files a/graphics/pokemon/gastrodon/anim_front.png and b/graphics/pokemon/gastrodon/anim_front.png differ diff --git a/graphics/pokemon/gastrodon/back.png b/graphics/pokemon/gastrodon/back.png index d16eab76f..a20c30c77 100644 Binary files a/graphics/pokemon/gastrodon/back.png and b/graphics/pokemon/gastrodon/back.png differ diff --git a/graphics/pokemon/gastrodon/east_sea/anim_front.png b/graphics/pokemon/gastrodon/east_sea/anim_front.png index a71fed66f..6e8ab451b 100644 Binary files a/graphics/pokemon/gastrodon/east_sea/anim_front.png and b/graphics/pokemon/gastrodon/east_sea/anim_front.png differ diff --git a/graphics/pokemon/gastrodon/east_sea/back.png b/graphics/pokemon/gastrodon/east_sea/back.png index 3cf071733..f200a3997 100644 Binary files a/graphics/pokemon/gastrodon/east_sea/back.png and b/graphics/pokemon/gastrodon/east_sea/back.png differ diff --git a/graphics/pokemon/gastrodon/east_sea/front.png b/graphics/pokemon/gastrodon/east_sea/front.png index f156301b6..ca68f56d3 100644 Binary files a/graphics/pokemon/gastrodon/east_sea/front.png and b/graphics/pokemon/gastrodon/east_sea/front.png differ diff --git a/graphics/pokemon/gastrodon/east_sea/normal.pal b/graphics/pokemon/gastrodon/east_sea/normal.pal index 1bf21b13c..2f2405e45 100644 --- a/graphics/pokemon/gastrodon/east_sea/normal.pal +++ b/graphics/pokemon/gastrodon/east_sea/normal.pal @@ -8,12 +8,12 @@ JASC-PAL 51 104 47 115 186 126 49 49 41 -160 140 59 -252 231 95 -84 79 53 +160 144 56 +248 224 112 +80 72 56 115 98 98 255 255 255 -50 145 158 -65 206 219 -35 94 102 -0 0 0 +104 120 168 +104 176 248 +88 80 120 +168 56 80 diff --git a/graphics/pokemon/gastrodon/east_sea/shiny.pal b/graphics/pokemon/gastrodon/east_sea/shiny.pal index 68e4a6d27..e5d9166a7 100644 --- a/graphics/pokemon/gastrodon/east_sea/shiny.pal +++ b/graphics/pokemon/gastrodon/east_sea/shiny.pal @@ -16,4 +16,4 @@ JASC-PAL 101 145 155 131 222 222 81 94 119 -0 0 0 +168 56 80 diff --git a/graphics/pokemon/gastrodon/front.png b/graphics/pokemon/gastrodon/front.png index 97f5c4d69..b28352aed 100644 Binary files a/graphics/pokemon/gastrodon/front.png and b/graphics/pokemon/gastrodon/front.png differ diff --git a/graphics/pokemon/gastrodon/normal.pal b/graphics/pokemon/gastrodon/normal.pal index 13b545944..c9428d8bd 100644 --- a/graphics/pokemon/gastrodon/normal.pal +++ b/graphics/pokemon/gastrodon/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -72 48 32 +72 56 56 16 16 16 -152 112 64 -112 80 40 -184 152 104 +160 104 56 +104 72 56 +192 144 72 48 48 40 -152 136 64 -248 224 88 -80 72 48 +160 136 56 +248 216 112 +80 72 56 112 96 96 248 248 248 -184 96 128 -240 152 192 -96 48 64 -0 0 0 +168 96 144 +248 136 192 +104 56 80 +168 56 80 diff --git a/graphics/pokemon/gastrodon/shiny.pal b/graphics/pokemon/gastrodon/shiny.pal index 8e8be79ea..8b58c4c87 100644 --- a/graphics/pokemon/gastrodon/shiny.pal +++ b/graphics/pokemon/gastrodon/shiny.pal @@ -16,4 +16,4 @@ JASC-PAL 216 112 104 248 168 160 104 48 48 -0 0 0 +168 56 80 diff --git a/graphics/pokemon/genesect/anim_front.png b/graphics/pokemon/genesect/anim_front.png index ebded3024..b83f0d786 100644 Binary files a/graphics/pokemon/genesect/anim_front.png and b/graphics/pokemon/genesect/anim_front.png differ diff --git a/graphics/pokemon/genesect/burn_drive/normal.pal b/graphics/pokemon/genesect/burn_drive/normal.pal index bb265f06e..7c6721d62 100644 --- a/graphics/pokemon/genesect/burn_drive/normal.pal +++ b/graphics/pokemon/genesect/burn_drive/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -72 48 104 -120 72 128 -168 120 184 +80 40 72 +112 64 136 +152 88 192 16 16 16 -224 192 232 -102 21 18 -244 79 53 -168 50 42 -152 120 144 -112 56 48 -232 96 80 -136 80 56 +200 176 248 +72 0 0 +248 0 0 +176 0 0 +160 128 184 +112 48 40 +240 80 32 +176 64 32 248 248 248 112 112 112 0 0 0 diff --git a/graphics/pokemon/genesect/chill_drive/normal.pal b/graphics/pokemon/genesect/chill_drive/normal.pal index 9413f8cf5..555a29e77 100644 --- a/graphics/pokemon/genesect/chill_drive/normal.pal +++ b/graphics/pokemon/genesect/chill_drive/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -72 48 104 -120 72 128 -168 120 184 +80 40 72 +112 64 136 +152 88 192 16 16 16 -224 192 232 -85 87 96 -227 229 239 -150 154 165 -152 120 144 -112 56 48 -232 96 80 -136 80 56 +200 176 248 +72 72 72 +248 248 248 +176 176 176 +160 128 184 +112 48 40 +240 80 32 +176 64 32 248 248 248 112 112 112 0 0 0 diff --git a/graphics/pokemon/genesect/douse_drive/normal.pal b/graphics/pokemon/genesect/douse_drive/normal.pal index 4657de7fe..418458adb 100644 --- a/graphics/pokemon/genesect/douse_drive/normal.pal +++ b/graphics/pokemon/genesect/douse_drive/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -72 48 104 -120 72 128 -168 120 184 +80 40 72 +112 64 136 +152 88 192 16 16 16 -224 192 232 -18 88 102 -53 193 244 -42 143 168 -152 120 144 -112 56 48 -232 96 80 -136 80 56 +200 176 248 +0 64 72 +0 200 248 +0 128 176 +160 128 184 +112 48 40 +240 80 32 +176 64 32 248 248 248 112 112 112 0 0 0 diff --git a/graphics/pokemon/genesect/front.png b/graphics/pokemon/genesect/front.png index 40cc15d05..fff9ce885 100644 Binary files a/graphics/pokemon/genesect/front.png and b/graphics/pokemon/genesect/front.png differ diff --git a/graphics/pokemon/genesect/normal.pal b/graphics/pokemon/genesect/normal.pal index 98b6b9cf1..59230abc5 100644 --- a/graphics/pokemon/genesect/normal.pal +++ b/graphics/pokemon/genesect/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 210 164 -72 48 107 -121 74 135 -169 122 191 +152 208 160 +80 40 72 +112 64 136 +152 88 192 16 16 16 -228 192 234 -104 61 18 -247 170 54 -170 111 42 -155 125 144 -114 57 51 -234 97 82 -140 83 63 -255 255 255 -115 115 115 +200 176 248 +104 72 8 +232 184 0 +192 128 0 +160 128 184 +112 48 40 +240 80 32 +176 64 32 +248 248 248 +112 112 112 0 0 0 diff --git a/graphics/pokemon/genesect/shock_drive/normal.pal b/graphics/pokemon/genesect/shock_drive/normal.pal index 7df38ccbd..e67c671f5 100644 --- a/graphics/pokemon/genesect/shock_drive/normal.pal +++ b/graphics/pokemon/genesect/shock_drive/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -72 48 104 -120 72 128 -168 120 184 +80 40 72 +112 64 136 +152 88 192 16 16 16 -224 192 232 -102 88 18 -244 235 53 -168 151 42 -152 120 144 -112 56 48 -232 96 80 -136 80 56 +200 176 248 +72 64 8 +248 248 0 +176 176 0 +160 128 184 +112 48 40 +240 80 32 +176 64 32 248 248 248 112 112 112 0 0 0 diff --git a/graphics/pokemon/gengar/anim_front.png b/graphics/pokemon/gengar/anim_front.png index 2d646a7bf..8cd8a8667 100644 Binary files a/graphics/pokemon/gengar/anim_front.png and b/graphics/pokemon/gengar/anim_front.png differ diff --git a/graphics/pokemon/gengar/front.png b/graphics/pokemon/gengar/front.png index bf06bd8fa..d9a054a1e 100644 Binary files a/graphics/pokemon/gengar/front.png and b/graphics/pokemon/gengar/front.png differ diff --git a/graphics/pokemon/gengar/normal.pal b/graphics/pokemon/gengar/normal.pal index 851c8f48a..efa15a3b0 100644 --- a/graphics/pokemon/gengar/normal.pal +++ b/graphics/pokemon/gengar/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -80 72 120 -144 136 192 +88 72 152 +176 136 184 16 16 16 -112 104 168 -40 40 64 -80 80 160 -232 104 96 -248 144 144 +144 112 176 +72 40 72 +120 96 160 +248 24 24 +248 96 96 184 168 184 248 240 248 104 96 120 216 208 216 -168 72 56 -40 40 64 +168 16 16 +72 40 72 0 0 0 diff --git a/graphics/pokemon/geodude/anim_front.png b/graphics/pokemon/geodude/anim_front.png index 8c3970a41..2346e37bb 100644 Binary files a/graphics/pokemon/geodude/anim_front.png and b/graphics/pokemon/geodude/anim_front.png differ diff --git a/graphics/pokemon/geodude/front.png b/graphics/pokemon/geodude/front.png index 44aa52516..c01d52995 100644 Binary files a/graphics/pokemon/geodude/front.png and b/graphics/pokemon/geodude/front.png differ diff --git a/graphics/pokemon/geodude/normal.pal b/graphics/pokemon/geodude/normal.pal index 281606f80..9dc93a2b2 100644 --- a/graphics/pokemon/geodude/normal.pal +++ b/graphics/pokemon/geodude/normal.pal @@ -2,8 +2,8 @@ JASC-PAL 0100 16 152 208 160 -112 96 112 -56 40 56 +104 104 80 +64 56 48 200 200 176 184 176 160 152 144 120 @@ -11,8 +11,8 @@ JASC-PAL 200 216 200 248 248 248 56 40 56 -132 72 90 -186 132 156 +136 16 16 +232 128 120 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/gible/anim_front.png b/graphics/pokemon/gible/anim_front.png index 3c268714e..459d543f2 100644 Binary files a/graphics/pokemon/gible/anim_front.png and b/graphics/pokemon/gible/anim_front.png differ diff --git a/graphics/pokemon/gible/front.png b/graphics/pokemon/gible/front.png index eea25b497..d3d5b4873 100644 Binary files a/graphics/pokemon/gible/front.png and b/graphics/pokemon/gible/front.png differ diff --git a/graphics/pokemon/gible/normal.pal b/graphics/pokemon/gible/normal.pal index f5668f01d..602482b45 100644 --- a/graphics/pokemon/gible/normal.pal +++ b/graphics/pokemon/gible/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 40 64 80 -104 152 168 -168 192 192 -80 104 120 +80 144 168 +136 192 208 +64 104 128 16 16 16 -96 192 216 +64 208 216 248 248 248 208 200 192 -80 152 160 -96 56 64 +56 168 192 +120 32 24 112 24 16 -184 120 144 -224 88 64 -160 56 32 +200 104 120 +216 88 40 +168 56 16 96 88 88 diff --git a/graphics/pokemon/gigalith/anim_front.png b/graphics/pokemon/gigalith/anim_front.png index f49973964..67f9a51f2 100644 Binary files a/graphics/pokemon/gigalith/anim_front.png and b/graphics/pokemon/gigalith/anim_front.png differ diff --git a/graphics/pokemon/gigalith/front.png b/graphics/pokemon/gigalith/front.png index 51d57f766..9cf2b0446 100644 Binary files a/graphics/pokemon/gigalith/front.png and b/graphics/pokemon/gigalith/front.png differ diff --git a/graphics/pokemon/gigalith/normal.pal b/graphics/pokemon/gigalith/normal.pal index 939ad60be..96c182254 100644 --- a/graphics/pokemon/gigalith/normal.pal +++ b/graphics/pokemon/gigalith/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -88 32 32 -240 144 112 -16 16 16 -152 56 48 -232 88 80 -32 32 48 -48 48 88 -72 80 128 -160 112 48 -248 192 72 -32 32 40 -144 128 128 -88 80 80 +104 32 32 +232 112 112 +8 8 8 +152 48 48 +224 48 48 +32 40 64 +40 56 104 +64 80 136 +168 128 24 +216 184 88 +24 24 32 +128 128 128 +72 72 72 0 0 0 0 0 0 diff --git a/graphics/pokemon/girafarig/anim_front.png b/graphics/pokemon/girafarig/anim_front.png index 441dbd4db..d39510467 100644 Binary files a/graphics/pokemon/girafarig/anim_front.png and b/graphics/pokemon/girafarig/anim_front.png differ diff --git a/graphics/pokemon/girafarig/front.png b/graphics/pokemon/girafarig/front.png index 76d56b97d..2a43c76e5 100644 Binary files a/graphics/pokemon/girafarig/front.png and b/graphics/pokemon/girafarig/front.png differ diff --git a/graphics/pokemon/girafarig/normal.pal b/graphics/pokemon/girafarig/normal.pal index cead7b5f1..98cf2c5bc 100644 --- a/graphics/pokemon/girafarig/normal.pal +++ b/graphics/pokemon/girafarig/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -80 72 64 +64 72 112 248 248 248 -192 200 168 -160 152 112 -96 64 24 -144 104 40 -208 136 32 -248 192 80 -240 144 152 -184 88 104 -48 24 24 +168 176 208 +104 136 176 +72 56 56 +152 120 64 +208 144 56 +248 200 96 +200 104 144 +152 56 88 +72 56 56 16 16 16 -136 88 88 -80 48 40 -104 72 72 +144 120 104 +96 80 80 +136 112 88 diff --git a/graphics/pokemon/giratina/anim_front.png b/graphics/pokemon/giratina/anim_front.png index 7bf2e97f8..af1332ed5 100644 Binary files a/graphics/pokemon/giratina/anim_front.png and b/graphics/pokemon/giratina/anim_front.png differ diff --git a/graphics/pokemon/giratina/front.png b/graphics/pokemon/giratina/front.png index 33ed6ece9..d0004746a 100644 Binary files a/graphics/pokemon/giratina/front.png and b/graphics/pokemon/giratina/front.png differ diff --git a/graphics/pokemon/giratina/normal.pal b/graphics/pokemon/giratina/normal.pal index be4ff55cd..6aa922c8e 100644 --- a/graphics/pokemon/giratina/normal.pal +++ b/graphics/pokemon/giratina/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -72 24 8 -40 48 56 -80 72 24 -184 80 80 -240 224 176 -136 48 48 -168 136 56 -96 88 104 -224 192 88 -144 136 144 -192 192 184 +80 16 0 +56 56 72 +112 80 0 +248 64 80 +248 248 208 +160 32 56 +200 152 0 +104 104 120 +248 208 0 +144 144 160 +192 200 208 16 16 16 -120 96 48 -64 64 80 +168 120 0 +72 72 88 0 0 0 diff --git a/graphics/pokemon/giratina/origin/anim_front.png b/graphics/pokemon/giratina/origin/anim_front.png index 788853e9d..8dd5d89a0 100644 Binary files a/graphics/pokemon/giratina/origin/anim_front.png and b/graphics/pokemon/giratina/origin/anim_front.png differ diff --git a/graphics/pokemon/giratina/origin/front.png b/graphics/pokemon/giratina/origin/front.png index a86079135..14f631d09 100644 Binary files a/graphics/pokemon/giratina/origin/front.png and b/graphics/pokemon/giratina/origin/front.png differ diff --git a/graphics/pokemon/giratina/origin/normal.pal b/graphics/pokemon/giratina/origin/normal.pal index daf42489b..9285df191 100644 --- a/graphics/pokemon/giratina/origin/normal.pal +++ b/graphics/pokemon/giratina/origin/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -24 24 32 -48 48 56 -184 80 80 -136 48 48 -72 24 8 -80 72 24 -80 72 80 -224 192 88 -120 96 48 -168 144 72 -184 192 200 -136 144 136 -240 224 176 -8 8 8 -104 104 112 +40 40 40 +56 56 72 +248 64 80 +160 32 56 +88 48 16 +112 80 0 +72 72 88 +248 208 0 +168 120 0 +200 152 0 +192 200 208 +144 144 160 +248 232 192 +0 0 0 +104 104 120 diff --git a/graphics/pokemon/glaceon/anim_front.png b/graphics/pokemon/glaceon/anim_front.png index 06e9ac43d..a175e8a43 100644 Binary files a/graphics/pokemon/glaceon/anim_front.png and b/graphics/pokemon/glaceon/anim_front.png differ diff --git a/graphics/pokemon/glaceon/front.png b/graphics/pokemon/glaceon/front.png index 36dd1d595..463bd723d 100644 Binary files a/graphics/pokemon/glaceon/front.png and b/graphics/pokemon/glaceon/front.png differ diff --git a/graphics/pokemon/glaceon/normal.pal b/graphics/pokemon/glaceon/normal.pal index d3e2fcf42..bd4ad34a5 100644 --- a/graphics/pokemon/glaceon/normal.pal +++ b/graphics/pokemon/glaceon/normal.pal @@ -3,16 +3,16 @@ JASC-PAL 16 152 208 160 80 112 120 -120 160 152 -160 224 224 +120 152 176 +144 224 232 16 16 16 -16 56 64 -56 136 152 -88 184 200 -32 104 112 +56 56 80 +80 96 152 +80 152 216 +64 88 104 232 248 248 -112 67 89 -163 107 137 +168 56 80 +224 104 120 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/glalie/anim_front.png b/graphics/pokemon/glalie/anim_front.png index 9d7727bd0..4b05ec51d 100644 Binary files a/graphics/pokemon/glalie/anim_front.png and b/graphics/pokemon/glalie/anim_front.png differ diff --git a/graphics/pokemon/glalie/front.png b/graphics/pokemon/glalie/front.png index 9371d35d2..cb6ecd492 100644 Binary files a/graphics/pokemon/glalie/front.png and b/graphics/pokemon/glalie/front.png differ diff --git a/graphics/pokemon/glalie/normal.pal b/graphics/pokemon/glalie/normal.pal index 81be19c29..539d396c3 100644 --- a/graphics/pokemon/glalie/normal.pal +++ b/graphics/pokemon/glalie/normal.pal @@ -11,9 +11,9 @@ JASC-PAL 200 208 232 168 176 224 80 88 120 -48 136 168 -120 184 208 -176 208 224 +40 128 184 +96 184 232 +160 216 248 248 248 248 0 0 0 0 0 0 diff --git a/graphics/pokemon/glameow/anim_front.png b/graphics/pokemon/glameow/anim_front.png index e2a988684..d03df5738 100644 Binary files a/graphics/pokemon/glameow/anim_front.png and b/graphics/pokemon/glameow/anim_front.png differ diff --git a/graphics/pokemon/glameow/front.png b/graphics/pokemon/glameow/front.png index 38d6b0688..bd72d82c1 100644 Binary files a/graphics/pokemon/glameow/front.png and b/graphics/pokemon/glameow/front.png differ diff --git a/graphics/pokemon/glameow/normal.pal b/graphics/pokemon/glameow/normal.pal index 3b80e4edd..82cb3f86e 100644 --- a/graphics/pokemon/glameow/normal.pal +++ b/graphics/pokemon/glameow/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -56 64 80 +64 64 80 16 16 16 248 248 248 160 160 192 -184 200 216 +200 200 216 88 112 136 -136 152 176 +136 152 184 80 88 96 -168 88 112 -240 120 152 -168 184 192 +208 72 128 +248 120 152 +168 176 200 104 80 112 -56 120 192 -240 192 88 +40 112 208 +248 216 112 192 152 72 diff --git a/graphics/pokemon/gligar/anim_front.png b/graphics/pokemon/gligar/anim_front.png index fea961a08..d3daf460f 100644 Binary files a/graphics/pokemon/gligar/anim_front.png and b/graphics/pokemon/gligar/anim_front.png differ diff --git a/graphics/pokemon/gligar/front.png b/graphics/pokemon/gligar/front.png index c6a1e3f9f..5164cb452 100644 Binary files a/graphics/pokemon/gligar/front.png and b/graphics/pokemon/gligar/front.png differ diff --git a/graphics/pokemon/gligar/normal.pal b/graphics/pokemon/gligar/normal.pal index 7ddd7733d..77bb9f9ef 100644 --- a/graphics/pokemon/gligar/normal.pal +++ b/graphics/pokemon/gligar/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -96 56 96 -240 168 208 +82 41 98 +222 148 197 16 16 16 -224 128 184 -184 96 152 -72 88 112 -248 248 248 -168 184 192 -56 96 160 -32 56 96 -64 136 200 -184 96 104 -120 64 72 -248 152 160 +205 98 164 +164 74 131 +74 90 115 +255 255 255 +172 189 197 +32 115 164 +32 65 115 +49 148 189 +139 41 49 +139 41 49 +197 115 139 0 0 0 diff --git a/graphics/pokemon/gliscor/anim_front.png b/graphics/pokemon/gliscor/anim_front.png index 136265168..8c12ed4ef 100644 Binary files a/graphics/pokemon/gliscor/anim_front.png and b/graphics/pokemon/gliscor/anim_front.png differ diff --git a/graphics/pokemon/gliscor/front.png b/graphics/pokemon/gliscor/front.png index fb9f0d640..24be70580 100644 Binary files a/graphics/pokemon/gliscor/front.png and b/graphics/pokemon/gliscor/front.png differ diff --git a/graphics/pokemon/gliscor/normal.pal b/graphics/pokemon/gliscor/normal.pal index 21465ec01..13b9917f1 100644 --- a/graphics/pokemon/gliscor/normal.pal +++ b/graphics/pokemon/gliscor/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -88 104 136 -144 152 200 -48 56 80 -176 184 208 -120 128 168 +88 96 160 +152 136 232 +40 48 96 +176 160 248 +112 120 192 248 248 248 16 16 16 -80 32 24 -160 48 48 -232 80 80 -152 128 24 -240 208 56 -48 56 64 -176 160 248 -152 80 112 +112 8 0 +168 32 48 +216 56 104 +168 144 0 +248 216 0 +64 64 80 +192 80 144 +104 104 120 diff --git a/graphics/pokemon/gloom/anim_front.png b/graphics/pokemon/gloom/anim_front.png index 9961368e8..3ade71dc7 100644 Binary files a/graphics/pokemon/gloom/anim_front.png and b/graphics/pokemon/gloom/anim_front.png differ diff --git a/graphics/pokemon/gloom/front.png b/graphics/pokemon/gloom/front.png index 9bfaeb2da..d4727f034 100644 Binary files a/graphics/pokemon/gloom/front.png and b/graphics/pokemon/gloom/front.png differ diff --git a/graphics/pokemon/gloom/normal.pal b/graphics/pokemon/gloom/normal.pal index d9b4b2f12..aced223e7 100644 --- a/graphics/pokemon/gloom/normal.pal +++ b/graphics/pokemon/gloom/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -88 24 16 -136 64 48 -224 184 176 -168 88 72 +88 40 0 +128 56 24 +240 128 96 +168 80 56 16 16 16 -224 144 112 -216 104 64 +240 128 96 +224 80 32 240 232 184 -176 72 40 -136 48 16 -48 96 128 -24 48 72 -104 144 168 -136 120 192 -176 168 184 +168 56 32 +136 32 16 +56 96 136 +16 48 72 +112 144 168 +176 88 192 +152 160 200 diff --git a/graphics/pokemon/golbat/anim_front.png b/graphics/pokemon/golbat/anim_front.png index 06f1401f5..eb6f8ad38 100644 Binary files a/graphics/pokemon/golbat/anim_front.png and b/graphics/pokemon/golbat/anim_front.png differ diff --git a/graphics/pokemon/golbat/front.png b/graphics/pokemon/golbat/front.png index 8a5445300..2898946b5 100644 Binary files a/graphics/pokemon/golbat/front.png and b/graphics/pokemon/golbat/front.png differ diff --git a/graphics/pokemon/golbat/normal.pal b/graphics/pokemon/golbat/normal.pal index b230ccfda..93d12fcf4 100644 --- a/graphics/pokemon/golbat/normal.pal +++ b/graphics/pokemon/golbat/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -40 112 144 -16 48 72 -16 16 16 -112 184 216 -56 152 192 -160 80 160 -112 64 112 -88 32 72 -184 120 192 -80 80 80 +40 120 152 +24 56 80 +0 0 0 +136 200 224 +72 160 200 +168 80 168 +144 56 120 +96 16 80 +200 104 176 +96 96 96 208 208 208 248 248 248 -96 96 96 +0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/goldeen/anim_front.png b/graphics/pokemon/goldeen/anim_front.png index 122831905..327ab59c3 100644 Binary files a/graphics/pokemon/goldeen/anim_front.png and b/graphics/pokemon/goldeen/anim_front.png differ diff --git a/graphics/pokemon/goldeen/front.png b/graphics/pokemon/goldeen/front.png index 09bac5324..4f4b6db93 100644 Binary files a/graphics/pokemon/goldeen/front.png and b/graphics/pokemon/goldeen/front.png differ diff --git a/graphics/pokemon/goldeen/normal.pal b/graphics/pokemon/goldeen/normal.pal index 694684b85..ed88a1b59 100644 --- a/graphics/pokemon/goldeen/normal.pal +++ b/graphics/pokemon/goldeen/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -88 80 96 +80 80 88 248 248 248 -152 136 168 -240 232 248 -208 200 232 -248 184 176 +136 136 144 +232 232 232 +208 208 216 +248 192 120 16 16 16 -240 136 104 -208 184 160 -208 72 48 -136 56 40 -32 120 120 -120 192 200 -160 88 104 -232 136 160 +232 120 64 +200 176 120 +208 64 16 +168 16 0 +0 104 96 +64 168 160 +168 80 112 +240 128 136 diff --git a/graphics/pokemon/golduck/anim_front.png b/graphics/pokemon/golduck/anim_front.png index 013adf608..f3c5674a7 100644 Binary files a/graphics/pokemon/golduck/anim_front.png and b/graphics/pokemon/golduck/anim_front.png differ diff --git a/graphics/pokemon/golduck/front.png b/graphics/pokemon/golduck/front.png index 20ba1a104..fe9836e68 100644 Binary files a/graphics/pokemon/golduck/front.png and b/graphics/pokemon/golduck/front.png differ diff --git a/graphics/pokemon/golduck/normal.pal b/graphics/pokemon/golduck/normal.pal index 46418a628..f3b96e83f 100644 --- a/graphics/pokemon/golduck/normal.pal +++ b/graphics/pokemon/golduck/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -32 80 112 -136 184 224 +64 72 112 +104 176 224 16 16 16 -72 136 176 -208 80 48 +72 120 168 +216 24 24 248 248 248 -136 40 24 -248 144 112 +136 0 0 +240 104 104 208 208 208 136 112 56 -248 232 208 -184 168 128 -232 216 152 -120 64 88 +248 240 176 +192 160 72 +240 216 128 +168 48 16 160 216 248 diff --git a/graphics/pokemon/golem/anim_front.png b/graphics/pokemon/golem/anim_front.png index c5dc51991..a551e71dc 100644 Binary files a/graphics/pokemon/golem/anim_front.png and b/graphics/pokemon/golem/anim_front.png differ diff --git a/graphics/pokemon/golem/front.png b/graphics/pokemon/golem/front.png index 46902682a..c03692638 100644 Binary files a/graphics/pokemon/golem/front.png and b/graphics/pokemon/golem/front.png differ diff --git a/graphics/pokemon/golem/normal.pal b/graphics/pokemon/golem/normal.pal index c86f4f465..a1af492ea 100644 --- a/graphics/pokemon/golem/normal.pal +++ b/graphics/pokemon/golem/normal.pal @@ -2,9 +2,9 @@ JASC-PAL 0100 16 152 208 160 -72 64 56 +64 64 56 128 136 128 -112 104 96 +104 104 80 160 168 160 16 16 16 112 112 112 @@ -14,6 +14,6 @@ JASC-PAL 192 168 168 152 128 128 216 192 184 -136 64 56 -208 88 80 -184 112 144 +176 0 0 +248 80 80 +168 32 0 diff --git a/graphics/pokemon/golett/anim_front.png b/graphics/pokemon/golett/anim_front.png index c76316ec8..3f096e4a4 100644 Binary files a/graphics/pokemon/golett/anim_front.png and b/graphics/pokemon/golett/anim_front.png differ diff --git a/graphics/pokemon/golett/front.png b/graphics/pokemon/golett/front.png index 30bf6d41c..f58715bb9 100644 Binary files a/graphics/pokemon/golett/front.png and b/graphics/pokemon/golett/front.png differ diff --git a/graphics/pokemon/golett/normal.pal b/graphics/pokemon/golett/normal.pal index 494d34de4..3e3aa05db 100644 --- a/graphics/pokemon/golett/normal.pal +++ b/graphics/pokemon/golett/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 210 164 -33 89 82 -16 65 81 -106 186 186 -65 109 103 -87 150 147 -45 128 153 +152 208 160 +16 104 96 +0 72 80 +128 200 200 +40 136 136 +88 168 160 +40 128 136 24 24 32 -47 98 109 -255 220 150 -89 61 39 -173 131 90 -130 93 63 -221 194 110 -183 156 82 +16 104 120 +248 232 160 +104 64 0 +192 152 80 +152 112 40 +216 200 144 +216 216 120 0 0 0 diff --git a/graphics/pokemon/golurk/anim_front.png b/graphics/pokemon/golurk/anim_front.png index 1fb78e0ae..fe862d33f 100644 Binary files a/graphics/pokemon/golurk/anim_front.png and b/graphics/pokemon/golurk/anim_front.png differ diff --git a/graphics/pokemon/golurk/front.png b/graphics/pokemon/golurk/front.png index 8edfc59ba..225a6a142 100644 Binary files a/graphics/pokemon/golurk/front.png and b/graphics/pokemon/golurk/front.png differ diff --git a/graphics/pokemon/golurk/normal.pal b/graphics/pokemon/golurk/normal.pal index 94e239cf5..d54b5c862 100644 --- a/graphics/pokemon/golurk/normal.pal +++ b/graphics/pokemon/golurk/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -32 88 104 -32 56 72 -40 120 144 +153 210 164 +24 88 120 +16 80 96 +40 120 136 16 16 16 -56 96 104 -120 176 184 -80 136 128 -248 216 152 +40 120 136 +128 192 200 +88 160 160 +248 232 160 184 168 112 -224 192 120 -96 64 40 -192 152 104 -152 104 64 +216 200 144 +104 64 0 +192 152 80 +152 112 40 0 0 0 0 0 0 diff --git a/graphics/pokemon/gorebyss/anim_front.png b/graphics/pokemon/gorebyss/anim_front.png index a99317bde..b5a4ffcfe 100644 Binary files a/graphics/pokemon/gorebyss/anim_front.png and b/graphics/pokemon/gorebyss/anim_front.png differ diff --git a/graphics/pokemon/gorebyss/front.png b/graphics/pokemon/gorebyss/front.png index 94abd8742..09a8a3587 100644 Binary files a/graphics/pokemon/gorebyss/front.png and b/graphics/pokemon/gorebyss/front.png differ diff --git a/graphics/pokemon/gorebyss/normal.pal b/graphics/pokemon/gorebyss/normal.pal index 50066960a..fd79ddb97 100644 --- a/graphics/pokemon/gorebyss/normal.pal +++ b/graphics/pokemon/gorebyss/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -160 80 112 +144 72 88 248 248 248 224 216 208 -248 184 208 -240 152 184 -16 16 16 -216 112 160 -104 64 112 -216 176 224 -176 128 184 -144 96 152 -248 216 224 +240 168 200 +240 136 192 +0 0 0 +208 96 160 +96 56 104 +216 152 248 +176 112 224 +152 88 184 +248 200 216 200 184 168 -120 104 96 -176 128 184 +200 112 248 +168 104 208 diff --git a/graphics/pokemon/gothita/anim_front.png b/graphics/pokemon/gothita/anim_front.png index 46d451da6..32e68ddf4 100644 Binary files a/graphics/pokemon/gothita/anim_front.png and b/graphics/pokemon/gothita/anim_front.png differ diff --git a/graphics/pokemon/gothita/front.png b/graphics/pokemon/gothita/front.png index e545a3989..e7052bf8d 100644 Binary files a/graphics/pokemon/gothita/front.png and b/graphics/pokemon/gothita/front.png differ diff --git a/graphics/pokemon/gothita/normal.pal b/graphics/pokemon/gothita/normal.pal index 9406c182e..b795c61f8 100644 --- a/graphics/pokemon/gothita/normal.pal +++ b/graphics/pokemon/gothita/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -48 40 40 -80 72 64 +48 48 48 +64 64 64 24 24 24 -112 104 96 -184 176 168 +112 112 112 +176 176 176 248 248 248 -200 144 208 -144 96 136 -72 48 72 -24 80 112 -80 176 216 -120 48 48 -216 88 88 +200 136 184 +144 104 128 +88 48 72 +8 72 136 +56 160 248 +120 72 64 +248 104 72 0 0 0 0 0 0 diff --git a/graphics/pokemon/gothitelle/anim_front.png b/graphics/pokemon/gothitelle/anim_front.png index 4974cf0c3..e4ae46937 100644 Binary files a/graphics/pokemon/gothitelle/anim_front.png and b/graphics/pokemon/gothitelle/anim_front.png differ diff --git a/graphics/pokemon/gothitelle/front.png b/graphics/pokemon/gothitelle/front.png index 728da9edf..7178f82fb 100644 Binary files a/graphics/pokemon/gothitelle/front.png and b/graphics/pokemon/gothitelle/front.png differ diff --git a/graphics/pokemon/gothitelle/normal.pal b/graphics/pokemon/gothitelle/normal.pal index acce41e39..ed07a68ce 100644 --- a/graphics/pokemon/gothitelle/normal.pal +++ b/graphics/pokemon/gothitelle/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -24 24 24 -64 56 64 +48 48 48 +80 80 80 16 16 16 -120 104 96 -40 32 40 -168 160 152 +120 120 120 +56 56 56 +176 176 176 248 248 248 -184 120 168 -144 88 128 -208 160 200 -0 112 152 -8 184 240 -152 48 48 -232 88 88 +184 128 160 +144 88 120 +224 168 216 +8 112 200 +56 160 248 +152 80 64 +248 104 72 0 0 0 diff --git a/graphics/pokemon/gothorita/anim_front.png b/graphics/pokemon/gothorita/anim_front.png index 0cd24f1bd..c58ba1a19 100644 Binary files a/graphics/pokemon/gothorita/anim_front.png and b/graphics/pokemon/gothorita/anim_front.png differ diff --git a/graphics/pokemon/gothorita/front.png b/graphics/pokemon/gothorita/front.png index b6fa0cb50..7f6f07418 100644 Binary files a/graphics/pokemon/gothorita/front.png and b/graphics/pokemon/gothorita/front.png differ diff --git a/graphics/pokemon/gothorita/normal.pal b/graphics/pokemon/gothorita/normal.pal index db3a7cbe8..975e044cd 100644 --- a/graphics/pokemon/gothorita/normal.pal +++ b/graphics/pokemon/gothorita/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 24 24 24 -112 104 104 -184 168 168 +112 112 112 +176 176 176 248 248 248 -40 32 32 -48 48 56 -152 104 136 -192 144 208 -8 112 160 -8 192 240 -120 48 48 -184 72 72 +40 40 40 +64 64 64 +144 104 128 +200 136 184 +8 72 136 +56 160 248 +120 72 64 +248 104 72 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/granbull/anim_front.png b/graphics/pokemon/granbull/anim_front.png index 8b67749d9..492e0031a 100644 Binary files a/graphics/pokemon/granbull/anim_front.png and b/graphics/pokemon/granbull/anim_front.png differ diff --git a/graphics/pokemon/granbull/front.png b/graphics/pokemon/granbull/front.png index 3c3a0d72e..9ad102c74 100644 Binary files a/graphics/pokemon/granbull/front.png and b/graphics/pokemon/granbull/front.png differ diff --git a/graphics/pokemon/granbull/normal.pal b/graphics/pokemon/granbull/normal.pal index 194de62fd..e8999b66a 100644 --- a/graphics/pokemon/granbull/normal.pal +++ b/graphics/pokemon/granbull/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -96 56 72 -240 176 208 -144 96 120 -184 128 160 +96 56 88 +208 168 208 +136 88 128 +168 128 168 16 16 16 208 208 216 248 248 248 -120 112 112 -56 56 56 -128 72 80 -224 112 112 -216 152 200 +120 128 128 +64 72 80 +168 16 0 +248 88 64 +192 136 200 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/graveler/anim_front.png b/graphics/pokemon/graveler/anim_front.png index 52bd60e1b..06680ed00 100644 Binary files a/graphics/pokemon/graveler/anim_front.png and b/graphics/pokemon/graveler/anim_front.png differ diff --git a/graphics/pokemon/graveler/front.png b/graphics/pokemon/graveler/front.png index 61807e94f..359e642c4 100644 Binary files a/graphics/pokemon/graveler/front.png and b/graphics/pokemon/graveler/front.png differ diff --git a/graphics/pokemon/graveler/normal.pal b/graphics/pokemon/graveler/normal.pal index a78a6b5b1..1c31789ba 100644 --- a/graphics/pokemon/graveler/normal.pal +++ b/graphics/pokemon/graveler/normal.pal @@ -2,14 +2,14 @@ JASC-PAL 0100 16 152 208 160 -48 56 56 +72 63 48 216 208 184 176 176 152 136 136 112 -96 96 104 -16 16 16 +104 104 80 +15 15 15 248 248 248 -184 104 128 +224 104 120 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/grimer/anim_front.png b/graphics/pokemon/grimer/anim_front.png index 646e1f80a..33cf98a68 100644 Binary files a/graphics/pokemon/grimer/anim_front.png and b/graphics/pokemon/grimer/anim_front.png differ diff --git a/graphics/pokemon/grimer/front.png b/graphics/pokemon/grimer/front.png index 350c05fbe..d4e6f6b7a 100644 Binary files a/graphics/pokemon/grimer/front.png and b/graphics/pokemon/grimer/front.png differ diff --git a/graphics/pokemon/grimer/normal.pal b/graphics/pokemon/grimer/normal.pal index 9b8dd0a98..9e51961b9 100644 --- a/graphics/pokemon/grimer/normal.pal +++ b/graphics/pokemon/grimer/normal.pal @@ -4,11 +4,11 @@ JASC-PAL 152 208 160 136 112 152 200 168 224 -80 56 96 +96 56 120 232 208 240 168 128 192 16 16 16 -104 80 120 +120 72 128 248 248 248 120 128 160 56 56 56 diff --git a/graphics/pokemon/grotle/anim_front.png b/graphics/pokemon/grotle/anim_front.png index f66f753c3..6a740b732 100644 Binary files a/graphics/pokemon/grotle/anim_front.png and b/graphics/pokemon/grotle/anim_front.png differ diff --git a/graphics/pokemon/grotle/front.png b/graphics/pokemon/grotle/front.png index cabbca1bb..f52ebe6d6 100644 Binary files a/graphics/pokemon/grotle/front.png and b/graphics/pokemon/grotle/front.png differ diff --git a/graphics/pokemon/grotle/normal.pal b/graphics/pokemon/grotle/normal.pal index 454c89615..2b6352a0e 100644 --- a/graphics/pokemon/grotle/normal.pal +++ b/graphics/pokemon/grotle/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -64 128 64 +56 136 64 56 88 40 -88 168 112 -16 16 16 -88 72 48 -168 120 72 -128 96 56 -208 176 56 -224 192 104 -96 128 72 -152 184 120 -120 168 96 +96 176 104 +16 16 24 +96 72 56 +176 128 80 +136 104 64 +216 176 64 +232 208 64 +104 136 72 +168 192 96 +144 168 88 248 248 248 208 208 208 144 144 144 diff --git a/graphics/pokemon/groudon/anim_front.png b/graphics/pokemon/groudon/anim_front.png index eb917bd75..c38e0b206 100644 Binary files a/graphics/pokemon/groudon/anim_front.png and b/graphics/pokemon/groudon/anim_front.png differ diff --git a/graphics/pokemon/groudon/front.png b/graphics/pokemon/groudon/front.png index 983835520..56e10fbcc 100644 Binary files a/graphics/pokemon/groudon/front.png and b/graphics/pokemon/groudon/front.png differ diff --git a/graphics/pokemon/groudon/normal.pal b/graphics/pokemon/groudon/normal.pal index 4a3338b1f..5291f38d9 100644 --- a/graphics/pokemon/groudon/normal.pal +++ b/graphics/pokemon/groudon/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -16 16 16 -104 16 24 -248 152 136 -208 64 56 -248 104 80 -144 32 24 -176 48 32 -248 216 88 -112 88 80 +0 0 0 +120 32 40 +248 184 184 +248 32 40 +248 112 104 +152 40 40 +184 48 48 +248 200 48 +112 96 96 248 248 248 -136 104 48 -184 176 208 -56 48 40 -144 128 120 -168 152 144 +152 104 48 +184 184 208 +56 56 56 +144 128 136 +168 152 160 diff --git a/graphics/pokemon/grovyle/anim_front.png b/graphics/pokemon/grovyle/anim_front.png index ebb3dc0f3..c488a0aff 100644 Binary files a/graphics/pokemon/grovyle/anim_front.png and b/graphics/pokemon/grovyle/anim_front.png differ diff --git a/graphics/pokemon/grovyle/front.png b/graphics/pokemon/grovyle/front.png index eecc7c939..810306218 100644 Binary files a/graphics/pokemon/grovyle/front.png and b/graphics/pokemon/grovyle/front.png differ diff --git a/graphics/pokemon/grovyle/normal.pal b/graphics/pokemon/grovyle/normal.pal index b39fcc3a2..754b62747 100644 --- a/graphics/pokemon/grovyle/normal.pal +++ b/graphics/pokemon/grovyle/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 200 128 216 -40 64 40 -80 152 88 -64 112 64 +48 80 48 +80 152 72 +64 112 72 16 16 16 56 96 48 -88 168 96 -128 208 136 -64 136 64 -192 144 40 -248 224 136 -128 32 32 -208 80 80 +96 168 72 +136 208 120 +80 144 56 +200 144 8 +240 232 104 +120 48 56 +200 56 64 88 112 56 -240 120 120 +240 80 96 0 0 0 diff --git a/graphics/pokemon/growlithe/anim_front.png b/graphics/pokemon/growlithe/anim_front.png index d77fc1b15..eddcd6853 100644 Binary files a/graphics/pokemon/growlithe/anim_front.png and b/graphics/pokemon/growlithe/anim_front.png differ diff --git a/graphics/pokemon/growlithe/front.png b/graphics/pokemon/growlithe/front.png index 84d6e929f..743dfb2f9 100644 Binary files a/graphics/pokemon/growlithe/front.png and b/graphics/pokemon/growlithe/front.png differ diff --git a/graphics/pokemon/growlithe/normal.pal b/graphics/pokemon/growlithe/normal.pal index a19d76585..cd520d3be 100644 --- a/graphics/pokemon/growlithe/normal.pal +++ b/graphics/pokemon/growlithe/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -104 80 56 -240 208 168 +112 96 32 +248 240 160 184 152 120 16 16 16 -208 176 136 -184 112 64 -112 64 32 -232 160 112 -224 136 72 +216 200 128 +192 76 8 +120 64 0 +248 152 48 +248 120 24 136 112 88 48 56 64 88 88 120 248 248 240 216 216 208 -183 123 135 +168 48 16 diff --git a/graphics/pokemon/grumpig/anim_front.png b/graphics/pokemon/grumpig/anim_front.png index 8aaa19b7c..4bc3a84cf 100644 Binary files a/graphics/pokemon/grumpig/anim_front.png and b/graphics/pokemon/grumpig/anim_front.png differ diff --git a/graphics/pokemon/grumpig/front.png b/graphics/pokemon/grumpig/front.png index 9df84fba8..c5b65ca3b 100644 Binary files a/graphics/pokemon/grumpig/front.png and b/graphics/pokemon/grumpig/front.png differ diff --git a/graphics/pokemon/grumpig/normal.pal b/graphics/pokemon/grumpig/normal.pal index c1f82cf81..d4366275d 100644 --- a/graphics/pokemon/grumpig/normal.pal +++ b/graphics/pokemon/grumpig/normal.pal @@ -7,13 +7,13 @@ JASC-PAL 96 96 96 16 16 16 120 120 128 -184 128 184 -152 96 104 -192 160 208 -216 184 224 +184 96 168 +144 56 72 +208 128 200 +224 160 216 112 88 120 -200 120 136 +200 80 104 248 248 248 -232 152 168 +224 112 136 216 192 232 -248 184 192 +248 152 168 diff --git a/graphics/pokemon/gulpin/anim_front.png b/graphics/pokemon/gulpin/anim_front.png index c4974b675..a85959ee7 100644 Binary files a/graphics/pokemon/gulpin/anim_front.png and b/graphics/pokemon/gulpin/anim_front.png differ diff --git a/graphics/pokemon/gulpin/front.png b/graphics/pokemon/gulpin/front.png index f13058f54..d1efac94d 100644 Binary files a/graphics/pokemon/gulpin/front.png and b/graphics/pokemon/gulpin/front.png differ diff --git a/graphics/pokemon/gulpin/normal.pal b/graphics/pokemon/gulpin/normal.pal index 8ffe5b374..377c234f0 100644 --- a/graphics/pokemon/gulpin/normal.pal +++ b/graphics/pokemon/gulpin/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 0 176 232 -160 136 64 -248 224 168 -16 16 16 -240 208 88 -216 176 48 -56 88 56 -88 152 88 -112 176 112 -144 208 144 -168 232 168 -56 56 48 +168 144 72 +240 232 152 +0 0 0 +240 216 64 +200 168 16 +72 104 56 +112 160 96 +136 184 112 +160 216 144 +200 232 176 +64 64 64 104 104 104 0 0 0 0 0 0 diff --git a/graphics/pokemon/gurdurr/anim_front.png b/graphics/pokemon/gurdurr/anim_front.png index 868a94171..1e455d093 100644 Binary files a/graphics/pokemon/gurdurr/anim_front.png and b/graphics/pokemon/gurdurr/anim_front.png differ diff --git a/graphics/pokemon/gurdurr/front.png b/graphics/pokemon/gurdurr/front.png index 73f778d6b..710ec3b85 100644 Binary files a/graphics/pokemon/gurdurr/front.png and b/graphics/pokemon/gurdurr/front.png differ diff --git a/graphics/pokemon/gurdurr/normal.pal b/graphics/pokemon/gurdurr/normal.pal index 1a67fe5be..835ac8aef 100644 --- a/graphics/pokemon/gurdurr/normal.pal +++ b/graphics/pokemon/gurdurr/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 210 164 +152 208 160 16 16 16 -122 36 49 -196 94 101 -173 69 79 -63 24 42 -89 79 66 -158 138 115 -196 183 157 -109 49 84 -165 82 131 -211 110 177 -255 255 255 -115 41 65 -173 55 73 +128 40 56 +216 80 88 +184 56 72 +96 24 48 +88 56 64 +152 136 128 +192 184 168 +112 48 80 +152 72 128 +208 104 176 +248 248 248 +112 40 64 +168 40 64 0 0 0 diff --git a/graphics/pokemon/gyarados/anim_front.png b/graphics/pokemon/gyarados/anim_front.png index 0db69d82a..5d00da42b 100644 Binary files a/graphics/pokemon/gyarados/anim_front.png and b/graphics/pokemon/gyarados/anim_front.png differ diff --git a/graphics/pokemon/gyarados/front.png b/graphics/pokemon/gyarados/front.png index 45009b5c9..f437da767 100644 Binary files a/graphics/pokemon/gyarados/front.png and b/graphics/pokemon/gyarados/front.png differ diff --git a/graphics/pokemon/gyarados/normal.pal b/graphics/pokemon/gyarados/normal.pal index 991d74930..09c401078 100644 --- a/graphics/pokemon/gyarados/normal.pal +++ b/graphics/pokemon/gyarados/normal.pal @@ -4,16 +4,16 @@ JASC-PAL 152 208 160 24 24 24 96 96 128 -40 96 112 +24 96 144 168 184 224 -24 64 80 -40 176 224 -32 128 160 +24 64 112 +0 168 208 +16 128 152 240 240 240 -152 224 248 -248 216 160 -184 160 120 +120 216 232 +240 224 168 +200 168 120 88 72 48 -104 48 48 -160 96 112 -224 144 176 +104 24 32 +184 48 96 +232 96 64 diff --git a/graphics/pokemon/happiny/anim_front.png b/graphics/pokemon/happiny/anim_front.png index 91b987949..7ae898ab1 100644 Binary files a/graphics/pokemon/happiny/anim_front.png and b/graphics/pokemon/happiny/anim_front.png differ diff --git a/graphics/pokemon/happiny/front.png b/graphics/pokemon/happiny/front.png index 0d957955c..547c652ed 100644 Binary files a/graphics/pokemon/happiny/front.png and b/graphics/pokemon/happiny/front.png differ diff --git a/graphics/pokemon/happiny/normal.pal b/graphics/pokemon/happiny/normal.pal index 896e3ecd9..e7bbb9af5 100644 --- a/graphics/pokemon/happiny/normal.pal +++ b/graphics/pokemon/happiny/normal.pal @@ -2,16 +2,16 @@ JASC-PAL 0100 16 152 208 160 -144 112 112 -192 136 144 -248 184 192 +160 88 120 +192 136 160 +248 192 208 16 16 16 -104 72 80 -232 128 152 -160 96 104 +112 64 88 +216 104 152 +160 80 120 248 248 248 -200 184 184 -224 192 192 +200 184 192 +192 192 192 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/hariyama/anim_front.png b/graphics/pokemon/hariyama/anim_front.png index abec77e9e..7b55b728e 100644 Binary files a/graphics/pokemon/hariyama/anim_front.png and b/graphics/pokemon/hariyama/anim_front.png differ diff --git a/graphics/pokemon/hariyama/front.png b/graphics/pokemon/hariyama/front.png index 619abaeb3..4a21a2a0b 100644 Binary files a/graphics/pokemon/hariyama/front.png and b/graphics/pokemon/hariyama/front.png differ diff --git a/graphics/pokemon/hariyama/normal.pal b/graphics/pokemon/hariyama/normal.pal index cb5bef2fc..6ed665912 100644 --- a/graphics/pokemon/hariyama/normal.pal +++ b/graphics/pokemon/hariyama/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -16 16 16 -232 152 120 -120 72 56 -216 128 88 -168 112 88 -192 168 144 -240 224 200 -224 200 176 -56 64 112 -96 104 152 -120 104 80 -248 248 248 -152 112 56 -248 216 112 -216 160 96 +0 0 0 +238 156 98 +131 74 49 +213 131 90 +180 106 82 +213 180 131 +246 230 197 +230 213 164 +57 65 106 +139 106 82 +98 98 148 +255 255 255 +172 123 74 +255 213 123 +213 164 98 diff --git a/graphics/pokemon/haunter/anim_front.png b/graphics/pokemon/haunter/anim_front.png index 62b5431d5..03156dfa4 100644 Binary files a/graphics/pokemon/haunter/anim_front.png and b/graphics/pokemon/haunter/anim_front.png differ diff --git a/graphics/pokemon/haunter/front.png b/graphics/pokemon/haunter/front.png index abf047ebe..f9434ad09 100644 Binary files a/graphics/pokemon/haunter/front.png and b/graphics/pokemon/haunter/front.png differ diff --git a/graphics/pokemon/haunter/normal.pal b/graphics/pokemon/haunter/normal.pal index 38e187f58..79ac42146 100644 --- a/graphics/pokemon/haunter/normal.pal +++ b/graphics/pokemon/haunter/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -88 64 104 -144 128 176 -56 40 56 +128 88 136 +192 152 200 +80 64 96 16 16 16 -104 88 136 +168 128 192 248 248 248 112 112 112 -168 72 120 -224 112 168 +176 24 96 +216 88 160 208 208 208 -104 48 80 +104 0 0 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/haxorus/anim_front.png b/graphics/pokemon/haxorus/anim_front.png index 0ab43ae82..d189fdc67 100644 Binary files a/graphics/pokemon/haxorus/anim_front.png and b/graphics/pokemon/haxorus/anim_front.png differ diff --git a/graphics/pokemon/haxorus/front.png b/graphics/pokemon/haxorus/front.png index 3187fbb4c..e5c216c13 100644 Binary files a/graphics/pokemon/haxorus/front.png and b/graphics/pokemon/haxorus/front.png differ diff --git a/graphics/pokemon/haxorus/normal.pal b/graphics/pokemon/haxorus/normal.pal index c4730d845..0e10e61a6 100644 --- a/graphics/pokemon/haxorus/normal.pal +++ b/graphics/pokemon/haxorus/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -80 16 16 +80 0 0 16 16 16 -144 32 32 -56 48 56 -176 72 48 -56 56 24 -184 168 88 -80 72 80 -152 144 40 -112 104 40 -32 32 40 +136 0 0 +56 56 72 +192 0 0 +64 64 0 +184 192 80 +80 80 96 +160 168 24 +96 104 16 +40 40 56 248 248 248 0 0 0 0 0 0 diff --git a/graphics/pokemon/heatmor/anim_front.png b/graphics/pokemon/heatmor/anim_front.png index 0789d8333..b9c5088ab 100644 Binary files a/graphics/pokemon/heatmor/anim_front.png and b/graphics/pokemon/heatmor/anim_front.png differ diff --git a/graphics/pokemon/heatmor/front.png b/graphics/pokemon/heatmor/front.png index 708dc0d57..0b912da48 100644 Binary files a/graphics/pokemon/heatmor/front.png and b/graphics/pokemon/heatmor/front.png differ diff --git a/graphics/pokemon/heatmor/normal.pal b/graphics/pokemon/heatmor/normal.pal index 70d0fd758..cf4f3678a 100644 --- a/graphics/pokemon/heatmor/normal.pal +++ b/graphics/pokemon/heatmor/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 88 72 -64 64 56 -128 56 48 -160 136 104 -184 80 72 -200 144 48 -232 168 64 +120 96 80 +80 48 32 +136 48 48 +160 136 112 +192 72 64 +224 136 64 +248 192 64 248 248 248 -16 16 16 -96 40 32 -160 112 40 -0 0 0 +0 0 0 +96 24 16 +160 136 72 +96 24 16 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/heatran/anim_front.png b/graphics/pokemon/heatran/anim_front.png index 086fc0460..afc5dbe41 100644 Binary files a/graphics/pokemon/heatran/anim_front.png and b/graphics/pokemon/heatran/anim_front.png differ diff --git a/graphics/pokemon/heatran/front.png b/graphics/pokemon/heatran/front.png index 5bff3348a..e446b445d 100644 Binary files a/graphics/pokemon/heatran/front.png and b/graphics/pokemon/heatran/front.png differ diff --git a/graphics/pokemon/heatran/normal.pal b/graphics/pokemon/heatran/normal.pal index f9a324244..fd73b92b3 100644 --- a/graphics/pokemon/heatran/normal.pal +++ b/graphics/pokemon/heatran/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 56 32 16 -96 48 24 -136 72 40 +128 64 88 +168 88 64 24 24 24 104 112 120 -224 224 200 -192 192 176 -192 104 32 -248 136 40 -152 136 136 +224 224 232 +192 192 192 +200 128 40 +248 160 16 +144 144 144 248 248 248 -80 72 72 -176 80 32 -240 104 32 +80 80 80 +176 64 40 +248 80 56 0 0 0 diff --git a/graphics/pokemon/heracross/anim_front.png b/graphics/pokemon/heracross/anim_front.png index 5e90a642c..426443655 100644 Binary files a/graphics/pokemon/heracross/anim_front.png and b/graphics/pokemon/heracross/anim_front.png differ diff --git a/graphics/pokemon/heracross/front.png b/graphics/pokemon/heracross/front.png index 2ba9232e2..db9b244da 100644 Binary files a/graphics/pokemon/heracross/front.png and b/graphics/pokemon/heracross/front.png differ diff --git a/graphics/pokemon/heracross/normal.pal b/graphics/pokemon/heracross/normal.pal index 51a68f1e0..7f4cde957 100644 --- a/graphics/pokemon/heracross/normal.pal +++ b/graphics/pokemon/heracross/normal.pal @@ -3,13 +3,13 @@ JASC-PAL 16 152 208 160 16 16 16 -136 184 216 -32 56 80 -80 144 176 -40 96 144 -104 80 48 -240 208 152 -224 168 88 +144 184 248 +48 56 96 +104 144 192 +64 96 144 +104 88 32 +248 216 88 +184 152 48 248 248 248 96 96 96 152 152 152 diff --git a/graphics/pokemon/herdier/anim_front.png b/graphics/pokemon/herdier/anim_front.png index a99c03559..e0d73d729 100644 Binary files a/graphics/pokemon/herdier/anim_front.png and b/graphics/pokemon/herdier/anim_front.png differ diff --git a/graphics/pokemon/herdier/front.png b/graphics/pokemon/herdier/front.png index a705795c6..b28db7c31 100644 Binary files a/graphics/pokemon/herdier/front.png and b/graphics/pokemon/herdier/front.png differ diff --git a/graphics/pokemon/herdier/normal.pal b/graphics/pokemon/herdier/normal.pal index c4216fed5..37d84df47 100644 --- a/graphics/pokemon/herdier/normal.pal +++ b/graphics/pokemon/herdier/normal.pal @@ -4,7 +4,7 @@ JASC-PAL 152 208 160 136 80 56 216 136 96 -80 48 40 +72 48 16 16 16 16 248 216 160 24 24 32 @@ -14,6 +14,6 @@ JASC-PAL 160 160 160 248 248 248 192 192 192 +56 56 56 40 48 72 -0 0 0 -0 0 0 +56 72 112 diff --git a/graphics/pokemon/hippopotas/anim_front.png b/graphics/pokemon/hippopotas/anim_front.png index 8de30eae6..74eba5613 100644 Binary files a/graphics/pokemon/hippopotas/anim_front.png and b/graphics/pokemon/hippopotas/anim_front.png differ diff --git a/graphics/pokemon/hippopotas/anim_frontf.png b/graphics/pokemon/hippopotas/anim_frontf.png deleted file mode 100644 index 8a0b675bb..000000000 Binary files a/graphics/pokemon/hippopotas/anim_frontf.png and /dev/null differ diff --git a/graphics/pokemon/hippopotas/back.png b/graphics/pokemon/hippopotas/back.png index 0657cc93c..b34d3d720 100644 Binary files a/graphics/pokemon/hippopotas/back.png and b/graphics/pokemon/hippopotas/back.png differ diff --git a/graphics/pokemon/hippopotas/backf.png b/graphics/pokemon/hippopotas/backf.png deleted file mode 100644 index 1a7413613..000000000 Binary files a/graphics/pokemon/hippopotas/backf.png and /dev/null differ diff --git a/graphics/pokemon/hippopotas/front.png b/graphics/pokemon/hippopotas/front.png index 42a2b0fd4..ea6fc8584 100644 Binary files a/graphics/pokemon/hippopotas/front.png and b/graphics/pokemon/hippopotas/front.png differ diff --git a/graphics/pokemon/hippopotas/iconf.png b/graphics/pokemon/hippopotas/iconf.png new file mode 100644 index 000000000..cfb2b90fd Binary files /dev/null and b/graphics/pokemon/hippopotas/iconf.png differ diff --git a/graphics/pokemon/hippowdon/backf.png b/graphics/pokemon/hippowdon/backf.png deleted file mode 100644 index 1cfc725e9..000000000 Binary files a/graphics/pokemon/hippowdon/backf.png and /dev/null differ diff --git a/graphics/pokemon/hippowdon/iconf.png b/graphics/pokemon/hippowdon/iconf.png new file mode 100644 index 000000000..80460903a Binary files /dev/null and b/graphics/pokemon/hippowdon/iconf.png differ diff --git a/graphics/pokemon/hitmonchan/anim_front.png b/graphics/pokemon/hitmonchan/anim_front.png index 674667d8d..7930fe60a 100644 Binary files a/graphics/pokemon/hitmonchan/anim_front.png and b/graphics/pokemon/hitmonchan/anim_front.png differ diff --git a/graphics/pokemon/hitmonchan/front.png b/graphics/pokemon/hitmonchan/front.png index 2c2d04ad6..0721d04c0 100644 Binary files a/graphics/pokemon/hitmonchan/front.png and b/graphics/pokemon/hitmonchan/front.png differ diff --git a/graphics/pokemon/hitmonchan/normal.pal b/graphics/pokemon/hitmonchan/normal.pal index 14af602a8..52b91591d 100644 --- a/graphics/pokemon/hitmonchan/normal.pal +++ b/graphics/pokemon/hitmonchan/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 96 72 72 -200 168 144 +200 176 120 16 16 16 160 136 112 -224 192 168 +232 208 152 248 240 248 -72 72 112 -64 120 160 -176 72 64 -232 152 144 -224 120 112 -120 24 24 +96 72 112 +64 128 248 +184 48 72 +248 144 88 +224 96 72 +136 32 0 144 136 176 176 168 208 -137 79 86 +232 128 120 diff --git a/graphics/pokemon/hitmonlee/anim_front.png b/graphics/pokemon/hitmonlee/anim_front.png index 97dc31acc..7bcda55b2 100644 Binary files a/graphics/pokemon/hitmonlee/anim_front.png and b/graphics/pokemon/hitmonlee/anim_front.png differ diff --git a/graphics/pokemon/hitmonlee/front.png b/graphics/pokemon/hitmonlee/front.png index 07f4e155f..42d195080 100644 Binary files a/graphics/pokemon/hitmonlee/front.png and b/graphics/pokemon/hitmonlee/front.png differ diff --git a/graphics/pokemon/hitmonlee/normal.pal b/graphics/pokemon/hitmonlee/normal.pal index 1345645b7..ea2f5b7c4 100644 --- a/graphics/pokemon/hitmonlee/normal.pal +++ b/graphics/pokemon/hitmonlee/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -120 80 72 -152 112 104 -192 152 144 -88 48 48 -224 184 176 -88 80 80 +128 88 56 +160 120 112 +200 160 128 +96 56 24 +232 192 160 +112 96 96 16 16 16 248 248 248 208 200 200 88 72 48 -176 168 128 -224 208 160 -216 200 112 +184 176 104 +232 224 176 +184 176 104 240 224 168 0 0 0 diff --git a/graphics/pokemon/hitmontop/anim_front.png b/graphics/pokemon/hitmontop/anim_front.png index af13cbe26..65ef049e1 100644 Binary files a/graphics/pokemon/hitmontop/anim_front.png and b/graphics/pokemon/hitmontop/anim_front.png differ diff --git a/graphics/pokemon/hitmontop/front.png b/graphics/pokemon/hitmontop/front.png index eb63c61b3..28118af28 100644 Binary files a/graphics/pokemon/hitmontop/front.png and b/graphics/pokemon/hitmontop/front.png differ diff --git a/graphics/pokemon/hitmontop/normal.pal b/graphics/pokemon/hitmontop/normal.pal index b19e89198..c8cb22d51 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 128 -104 104 88 -248 248 248 -192 192 208 -56 104 152 -64 136 200 -120 176 224 -24 72 120 -112 72 48 -16 16 16 -216 152 120 -168 120 96 -224 176 144 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 +16 16 16 +216 184 128 +176 136 88 +248 216 152 +0 0 0 0 0 0 diff --git a/graphics/pokemon/ho_oh/anim_front.png b/graphics/pokemon/ho_oh/anim_front.png index 5682e9514..8bc726f79 100644 Binary files a/graphics/pokemon/ho_oh/anim_front.png and b/graphics/pokemon/ho_oh/anim_front.png differ diff --git a/graphics/pokemon/ho_oh/front.png b/graphics/pokemon/ho_oh/front.png index fae8fd146..4c32adca9 100644 Binary files a/graphics/pokemon/ho_oh/front.png and b/graphics/pokemon/ho_oh/front.png differ diff --git a/graphics/pokemon/ho_oh/normal.pal b/graphics/pokemon/ho_oh/normal.pal index af86f06a6..d4c1f1dfa 100644 --- a/graphics/pokemon/ho_oh/normal.pal +++ b/graphics/pokemon/ho_oh/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 0 176 232 -96 112 40 -152 200 96 -176 32 24 -120 24 16 -208 232 184 -248 112 96 +64 104 56 +120 200 72 +176 40 32 +136 32 32 +168 240 168 +248 104 88 16 16 16 -248 64 32 -184 120 32 -240 240 128 -248 152 32 -112 72 32 -192 208 192 +248 48 8 +168 96 32 +248 248 128 +248 176 16 +112 64 32 +208 208 208 248 248 248 -72 80 120 +112 112 128 diff --git a/graphics/pokemon/honchkrow/anim_front.png b/graphics/pokemon/honchkrow/anim_front.png index d9047ae41..b7cff5cf2 100644 Binary files a/graphics/pokemon/honchkrow/anim_front.png and b/graphics/pokemon/honchkrow/anim_front.png differ diff --git a/graphics/pokemon/honchkrow/front.png b/graphics/pokemon/honchkrow/front.png index f86b5a6c5..9681f682f 100644 Binary files a/graphics/pokemon/honchkrow/front.png and b/graphics/pokemon/honchkrow/front.png differ diff --git a/graphics/pokemon/honchkrow/normal.pal b/graphics/pokemon/honchkrow/normal.pal index 03cfdeb00..a4971698b 100644 --- a/graphics/pokemon/honchkrow/normal.pal +++ b/graphics/pokemon/honchkrow/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -56 104 136 -32 64 88 -24 40 48 +64 96 152 +48 64 96 +40 40 64 16 16 16 -72 16 16 -144 32 40 -160 136 64 -184 168 168 +72 32 32 +136 48 56 +168 144 56 +160 160 176 248 248 248 -232 200 80 -208 48 64 -80 80 40 -240 232 224 -96 96 96 -56 56 56 +240 216 56 +216 80 88 +88 88 56 +232 232 240 +80 80 80 +48 48 56 diff --git a/graphics/pokemon/hoothoot/anim_front.png b/graphics/pokemon/hoothoot/anim_front.png index 7f4aab679..585fc6518 100644 Binary files a/graphics/pokemon/hoothoot/anim_front.png and b/graphics/pokemon/hoothoot/anim_front.png differ diff --git a/graphics/pokemon/hoothoot/back.png b/graphics/pokemon/hoothoot/back.png index 9f3a48701..c51927615 100644 Binary files a/graphics/pokemon/hoothoot/back.png and b/graphics/pokemon/hoothoot/back.png differ diff --git a/graphics/pokemon/hoothoot/front.png b/graphics/pokemon/hoothoot/front.png index 5269906bb..0cc035380 100644 Binary files a/graphics/pokemon/hoothoot/front.png and b/graphics/pokemon/hoothoot/front.png differ diff --git a/graphics/pokemon/hoothoot/normal.pal b/graphics/pokemon/hoothoot/normal.pal index 758787e5f..213e6acaa 100644 --- a/graphics/pokemon/hoothoot/normal.pal +++ b/graphics/pokemon/hoothoot/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -56 56 56 -152 112 88 -120 88 72 -72 40 32 -176 136 96 -208 176 128 -240 96 72 -72 56 72 -232 176 192 -152 120 128 -208 176 144 -248 208 176 +64 64 64 +152 104 48 +120 88 80 +80 48 0 +184 136 64 +200 160 120 +104 48 24 +184 88 40 +240 96 48 +232 168 144 +216 184 152 +248 224 192 248 248 248 -136 136 136 +120 120 120 diff --git a/graphics/pokemon/hoothoot/shiny.pal b/graphics/pokemon/hoothoot/shiny.pal index 85bf196e6..44b4e4912 100644 --- a/graphics/pokemon/hoothoot/shiny.pal +++ b/graphics/pokemon/hoothoot/shiny.pal @@ -4,16 +4,16 @@ JASC-PAL 152 208 160 16 16 16 64 64 64 -200 168 64 +216 184 72 192 136 72 120 72 16 232 208 64 -248 240 144 -240 96 48 +248 232 120 104 48 24 +184 88 40 +240 96 48 232 168 144 -216 112 72 -216 224 136 +232 248 128 240 248 192 248 248 248 120 120 120 diff --git a/graphics/pokemon/hoppip/anim_front.png b/graphics/pokemon/hoppip/anim_front.png index 63f77907d..bea636b46 100644 Binary files a/graphics/pokemon/hoppip/anim_front.png and b/graphics/pokemon/hoppip/anim_front.png differ diff --git a/graphics/pokemon/hoppip/front.png b/graphics/pokemon/hoppip/front.png index 32329fcca..42f0e5c8e 100644 Binary files a/graphics/pokemon/hoppip/front.png and b/graphics/pokemon/hoppip/front.png differ diff --git a/graphics/pokemon/hoppip/normal.pal b/graphics/pokemon/hoppip/normal.pal index 7806f8311..76c92f1f5 100644 --- a/graphics/pokemon/hoppip/normal.pal +++ b/graphics/pokemon/hoppip/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 0 176 232 -96 144 56 -120 200 64 -168 232 112 -64 88 32 -16 16 16 -176 88 112 -248 152 176 -112 40 64 -240 112 152 -240 224 112 -248 208 40 +82 131 57 +98 189 90 +156 222 90 +65 90 16 +0 0 0 +180 98 115 +246 156 180 +139 8 57 +255 123 148 +255 255 0 +255 197 0 40 40 40 0 0 0 0 0 0 diff --git a/graphics/pokemon/horsea/anim_front.png b/graphics/pokemon/horsea/anim_front.png index bf91109b1..887708af4 100644 Binary files a/graphics/pokemon/horsea/anim_front.png and b/graphics/pokemon/horsea/anim_front.png differ diff --git a/graphics/pokemon/horsea/front.png b/graphics/pokemon/horsea/front.png index 45cb87cde..42d59bfe3 100644 Binary files a/graphics/pokemon/horsea/front.png and b/graphics/pokemon/horsea/front.png differ diff --git a/graphics/pokemon/horsea/normal.pal b/graphics/pokemon/horsea/normal.pal index e25c6bb05..ba233c7c1 100644 --- a/graphics/pokemon/horsea/normal.pal +++ b/graphics/pokemon/horsea/normal.pal @@ -9,11 +9,11 @@ JASC-PAL 16 16 16 248 248 248 208 208 208 -216 88 72 +248 112 112 144 128 96 248 240 192 208 192 136 -176 56 56 +192 40 40 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/houndoom/anim_front.png b/graphics/pokemon/houndoom/anim_front.png index 8b96b911a..b2cfcd702 100644 Binary files a/graphics/pokemon/houndoom/anim_front.png and b/graphics/pokemon/houndoom/anim_front.png differ diff --git a/graphics/pokemon/houndoom/front.png b/graphics/pokemon/houndoom/front.png index a8abb7999..8ebef8181 100644 Binary files a/graphics/pokemon/houndoom/front.png and b/graphics/pokemon/houndoom/front.png differ diff --git a/graphics/pokemon/houndoom/normal.pal b/graphics/pokemon/houndoom/normal.pal index 8212f9464..55f44c4fd 100644 --- a/graphics/pokemon/houndoom/normal.pal +++ b/graphics/pokemon/houndoom/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 96 88 -224 200 184 -168 152 144 +112 104 112 +208 208 208 +160 160 160 248 248 248 -8 8 8 -32 24 32 -80 72 64 -48 40 40 -176 80 48 -224 136 96 -168 72 80 -96 40 16 -72 16 24 -80 72 64 +0 0 0 +24 32 40 +72 72 80 +48 48 56 +160 88 72 +240 152 128 +152 40 56 +96 40 16 +96 16 16 +72 72 80 0 0 0 diff --git a/graphics/pokemon/houndour/anim_front.png b/graphics/pokemon/houndour/anim_front.png index e737a34c1..2cf035d03 100644 Binary files a/graphics/pokemon/houndour/anim_front.png and b/graphics/pokemon/houndour/anim_front.png differ diff --git a/graphics/pokemon/houndour/back.png b/graphics/pokemon/houndour/back.png index 36af7e431..daf5f91b4 100644 Binary files a/graphics/pokemon/houndour/back.png and b/graphics/pokemon/houndour/back.png differ diff --git a/graphics/pokemon/houndour/front.png b/graphics/pokemon/houndour/front.png index 7a83778a4..39d1ce974 100644 Binary files a/graphics/pokemon/houndour/front.png and b/graphics/pokemon/houndour/front.png differ diff --git a/graphics/pokemon/houndour/normal.pal b/graphics/pokemon/houndour/normal.pal index 228decda8..6d940707f 100644 --- a/graphics/pokemon/houndour/normal.pal +++ b/graphics/pokemon/houndour/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -40 32 40 -72 72 64 -24 16 16 -152 144 152 +40 40 48 +72 72 80 +16 24 32 +160 152 168 248 248 248 8 8 8 -136 56 16 +112 64 40 184 184 200 -240 160 128 -208 104 64 -122 63 71 -0 0 0 -0 0 0 +240 160 120 +168 112 80 +40 40 40 +176 120 88 +168 16 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/houndour/shiny.pal b/graphics/pokemon/houndour/shiny.pal index 1ee0abc0f..38ada23be 100644 --- a/graphics/pokemon/houndour/shiny.pal +++ b/graphics/pokemon/houndour/shiny.pal @@ -13,7 +13,7 @@ JASC-PAL 248 224 112 176 136 56 178 75 44 -0 0 0 +168 16 0 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/huntail/anim_front.png b/graphics/pokemon/huntail/anim_front.png index 6d231eac0..e3aa0efab 100644 Binary files a/graphics/pokemon/huntail/anim_front.png and b/graphics/pokemon/huntail/anim_front.png differ diff --git a/graphics/pokemon/huntail/front.png b/graphics/pokemon/huntail/front.png index e10f98f1d..9a5c28850 100644 Binary files a/graphics/pokemon/huntail/front.png and b/graphics/pokemon/huntail/front.png differ diff --git a/graphics/pokemon/huntail/normal.pal b/graphics/pokemon/huntail/normal.pal index 0651b0740..9987a3b31 100644 --- a/graphics/pokemon/huntail/normal.pal +++ b/graphics/pokemon/huntail/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -40 88 112 -136 200 240 +40 96 120 +136 200 232 16 16 16 -80 152 192 -128 80 56 -200 128 80 -248 184 128 +72 152 184 +160 88 32 +208 128 0 +232 168 96 192 200 224 248 248 248 -184 224 248 +176 232 240 144 136 136 112 72 88 -184 120 136 -216 160 168 +192 112 144 +240 144 176 160 128 144 diff --git a/graphics/pokemon/hydreigon/anim_front.png b/graphics/pokemon/hydreigon/anim_front.png index 4fa0d9681..b4e3432f0 100644 Binary files a/graphics/pokemon/hydreigon/anim_front.png and b/graphics/pokemon/hydreigon/anim_front.png differ diff --git a/graphics/pokemon/hydreigon/front.png b/graphics/pokemon/hydreigon/front.png index 67a7fa51e..68aa66cd8 100644 Binary files a/graphics/pokemon/hydreigon/front.png and b/graphics/pokemon/hydreigon/front.png differ diff --git a/graphics/pokemon/hydreigon/normal.pal b/graphics/pokemon/hydreigon/normal.pal index f40c3ff93..f07d5f03c 100644 --- a/graphics/pokemon/hydreigon/normal.pal +++ b/graphics/pokemon/hydreigon/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -48 40 40 +40 32 40 64 56 64 16 16 16 -88 80 80 -120 48 88 -168 88 128 -56 24 40 -40 56 80 -96 144 200 -80 104 136 -72 56 88 -144 88 96 +80 80 80 +136 40 96 +184 80 120 +96 32 64 +24 48 104 +88 128 200 +56 88 152 +96 56 104 +144 88 120 224 216 216 -48 40 40 +40 32 40 0 0 0 diff --git a/graphics/pokemon/hypno/anim_front.png b/graphics/pokemon/hypno/anim_front.png index 64ba1fb56..d96bd7613 100644 Binary files a/graphics/pokemon/hypno/anim_front.png and b/graphics/pokemon/hypno/anim_front.png differ diff --git a/graphics/pokemon/hypno/front.png b/graphics/pokemon/hypno/front.png index 72c602e06..391eaba23 100644 Binary files a/graphics/pokemon/hypno/front.png and b/graphics/pokemon/hypno/front.png differ diff --git a/graphics/pokemon/hypno/normal.pal b/graphics/pokemon/hypno/normal.pal index 1adb09313..be159251d 100644 --- a/graphics/pokemon/hypno/normal.pal +++ b/graphics/pokemon/hypno/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -120 96 80 +136 96 48 104 80 0 -248 216 56 -16 16 16 -168 136 32 +240 216 0 +0 0 0 +176 144 32 88 64 40 -248 224 128 -208 176 56 +248 232 112 +216 184 64 128 144 160 -64 72 88 +80 88 104 248 248 248 -168 176 200 -208 208 232 -0 0 0 +152 168 184 +200 216 232 +160 128 88 0 0 0 diff --git a/graphics/pokemon/igglybuff/anim_front.png b/graphics/pokemon/igglybuff/anim_front.png index 8e4ec6526..e96608aa1 100644 Binary files a/graphics/pokemon/igglybuff/anim_front.png and b/graphics/pokemon/igglybuff/anim_front.png differ diff --git a/graphics/pokemon/igglybuff/front.png b/graphics/pokemon/igglybuff/front.png index 36b1c62f6..2d0dad2a8 100644 Binary files a/graphics/pokemon/igglybuff/front.png and b/graphics/pokemon/igglybuff/front.png differ diff --git a/graphics/pokemon/igglybuff/normal.pal b/graphics/pokemon/igglybuff/normal.pal index 50244b91b..4bf00fcd7 100644 --- a/graphics/pokemon/igglybuff/normal.pal +++ b/graphics/pokemon/igglybuff/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -136 72 88 -248 240 232 -248 208 208 -176 96 120 +136 64 64 +248 200 208 +248 168 184 +200 104 96 16 16 16 -192 152 168 -224 72 88 -144 64 64 +240 120 144 +224 40 16 +136 0 0 248 248 248 -224 144 168 -168 80 112 +184 0 0 +128 0 0 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/illumise/anim_front.png b/graphics/pokemon/illumise/anim_front.png index 48878163a..8759e9171 100644 Binary files a/graphics/pokemon/illumise/anim_front.png and b/graphics/pokemon/illumise/anim_front.png differ diff --git a/graphics/pokemon/illumise/front.png b/graphics/pokemon/illumise/front.png index ce620bfd1..f91f5c935 100644 Binary files a/graphics/pokemon/illumise/front.png and b/graphics/pokemon/illumise/front.png differ diff --git a/graphics/pokemon/illumise/normal.pal b/graphics/pokemon/illumise/normal.pal index 7f7ab4792..b1f415775 100644 --- a/graphics/pokemon/illumise/normal.pal +++ b/graphics/pokemon/illumise/normal.pal @@ -1,19 +1,259 @@ JASC-PAL 0100 -16 +256 152 208 160 152 128 80 -208 176 104 -240 216 144 +224 176 72 +248 224 112 16 16 16 -160 112 176 -96 72 120 +152 80 184 +104 88 144 248 248 248 -200 152 208 -80 112 120 -112 184 208 -168 216 240 +200 136 216 +88 104 136 +136 168 200 +176 208 240 168 192 232 -0 136 176 +0 88 208 56 56 56 120 120 120 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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/infernape/anim_front.png b/graphics/pokemon/infernape/anim_front.png index 521883ce5..b808e3ab3 100644 Binary files a/graphics/pokemon/infernape/anim_front.png and b/graphics/pokemon/infernape/anim_front.png differ diff --git a/graphics/pokemon/infernape/front.png b/graphics/pokemon/infernape/front.png index 7177880c9..6bb4d332c 100644 Binary files a/graphics/pokemon/infernape/front.png and b/graphics/pokemon/infernape/front.png differ diff --git a/graphics/pokemon/infernape/normal.pal b/graphics/pokemon/infernape/normal.pal index e2f6bad8d..9dad1bf3f 100644 --- a/graphics/pokemon/infernape/normal.pal +++ b/graphics/pokemon/infernape/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -96 56 40 -40 64 96 +104 56 16 +24 64 120 16 16 16 -128 96 24 -192 160 56 -224 72 56 -248 128 48 -64 112 152 -248 224 120 -168 96 64 -216 128 88 -184 184 176 -120 112 112 +128 88 8 +192 152 32 +224 56 64 +240 136 72 +56 112 160 +248 216 80 +160 96 64 +224 136 88 +184 192 216 +112 112 128 248 248 248 128 40 48 diff --git a/graphics/pokemon/ivysaur/anim_front.png b/graphics/pokemon/ivysaur/anim_front.png index 0b31c81a3..35c0596b2 100644 Binary files a/graphics/pokemon/ivysaur/anim_front.png and b/graphics/pokemon/ivysaur/anim_front.png differ diff --git a/graphics/pokemon/ivysaur/back.png b/graphics/pokemon/ivysaur/back.png index 5e74b5e01..4ec8a61a1 100644 Binary files a/graphics/pokemon/ivysaur/back.png and b/graphics/pokemon/ivysaur/back.png differ diff --git a/graphics/pokemon/ivysaur/front.png b/graphics/pokemon/ivysaur/front.png index 6bd7e0519..4259abad0 100644 Binary files a/graphics/pokemon/ivysaur/front.png and b/graphics/pokemon/ivysaur/front.png differ diff --git a/graphics/pokemon/ivysaur/normal.pal b/graphics/pokemon/ivysaur/normal.pal index 7b785bc77..8ce5c7c84 100644 --- a/graphics/pokemon/ivysaur/normal.pal +++ b/graphics/pokemon/ivysaur/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 210 164 -109 57 76 -204 85 103 -255 170 182 -255 122 133 +152 208 160 +120 48 40 +216 64 88 +248 176 168 +248 120 120 16 16 16 -22 63 75 -121 200 145 -71 120 95 -87 164 101 -174 228 230 -111 193 196 -66 143 166 -255 255 255 -163 125 146 -160 104 67 +16 64 72 +120 216 112 +48 128 80 +96 176 88 +128 232 216 +88 208 184 +32 144 128 +248 248 248 +160 48 16 +224 80 56 diff --git a/graphics/pokemon/ivysaur/shiny.pal b/graphics/pokemon/ivysaur/shiny.pal index 09594ff8a..27e7a2bed 100644 --- a/graphics/pokemon/ivysaur/shiny.pal +++ b/graphics/pokemon/ivysaur/shiny.pal @@ -15,5 +15,5 @@ JASC-PAL 164 213 74 123 164 49 255 255 255 -186 144 72 -197 115 57 +160 48 16 +224 80 56 diff --git a/graphics/pokemon/jellicent/anim_front.png b/graphics/pokemon/jellicent/anim_front.png index 68d6543db..4e08f51dd 100644 Binary files a/graphics/pokemon/jellicent/anim_front.png and b/graphics/pokemon/jellicent/anim_front.png differ diff --git a/graphics/pokemon/jellicent/anim_frontf.png b/graphics/pokemon/jellicent/anim_frontf.png index 110df92f5..d94a329aa 100644 Binary files a/graphics/pokemon/jellicent/anim_frontf.png and b/graphics/pokemon/jellicent/anim_frontf.png differ diff --git a/graphics/pokemon/jellicent/front.png b/graphics/pokemon/jellicent/front.png index 7e02040b7..584c7f09b 100644 Binary files a/graphics/pokemon/jellicent/front.png and b/graphics/pokemon/jellicent/front.png differ diff --git a/graphics/pokemon/jellicent/frontf.png b/graphics/pokemon/jellicent/frontf.png new file mode 100644 index 000000000..7c40aad47 Binary files /dev/null and b/graphics/pokemon/jellicent/frontf.png differ diff --git a/graphics/pokemon/jellicent/normal.pal b/graphics/pokemon/jellicent/normal.pal index d3264487d..e7b7da677 100644 --- a/graphics/pokemon/jellicent/normal.pal +++ b/graphics/pokemon/jellicent/normal.pal @@ -7,8 +7,8 @@ JASC-PAL 16 16 16 200 232 248 56 104 176 -56 152 216 -96 200 240 +56 128 200 +56 192 240 168 224 248 208 240 248 232 64 56 diff --git a/graphics/pokemon/jellicent/normalf.pal b/graphics/pokemon/jellicent/normalf.pal index 8acd5fa05..06e1a2895 100644 --- a/graphics/pokemon/jellicent/normalf.pal +++ b/graphics/pokemon/jellicent/normalf.pal @@ -2,15 +2,15 @@ JASC-PAL 0100 16 153 210 164 -105 135 191 -237 103 83 +40 80 160 +224 72 40 255 222 247 -204 140 195 -122 83 97 +216 128 176 +120 56 80 16 16 16 -177 173 206 -255 178 212 -247 220 242 +200 160 192 +248 160 208 +248 224 248 255 255 255 0 0 0 0 0 0 diff --git a/graphics/pokemon/jigglypuff/anim_front.png b/graphics/pokemon/jigglypuff/anim_front.png index a45e4d02f..a10a835b4 100644 Binary files a/graphics/pokemon/jigglypuff/anim_front.png and b/graphics/pokemon/jigglypuff/anim_front.png differ diff --git a/graphics/pokemon/jigglypuff/front.png b/graphics/pokemon/jigglypuff/front.png index 7ebec3b9f..78c30c532 100644 Binary files a/graphics/pokemon/jigglypuff/front.png and b/graphics/pokemon/jigglypuff/front.png differ diff --git a/graphics/pokemon/jigglypuff/normal.pal b/graphics/pokemon/jigglypuff/normal.pal index 2986235fd..4bc2c0fb5 100644 --- a/graphics/pokemon/jigglypuff/normal.pal +++ b/graphics/pokemon/jigglypuff/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 210 164 -122 69 82 -249 194 208 -211 143 156 +152 208 160 +136 64 64 +248 168 184 +240 120 144 16 16 16 -58 68 89 -255 255 255 -3 153 173 -0 109 134 -125 203 216 -212 213 216 -147 88 121 -188 120 163 +112 64 24 +248 248 248 +24 112 192 +16 72 136 +16 176 232 +200 184 248 +168 16 0 +232 64 48 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/jirachi/anim_front.png b/graphics/pokemon/jirachi/anim_front.png index 1a3676c69..bd070398d 100644 Binary files a/graphics/pokemon/jirachi/anim_front.png and b/graphics/pokemon/jirachi/anim_front.png differ diff --git a/graphics/pokemon/jirachi/front.png b/graphics/pokemon/jirachi/front.png index df7a02d42..0d94f9c43 100644 Binary files a/graphics/pokemon/jirachi/front.png and b/graphics/pokemon/jirachi/front.png differ diff --git a/graphics/pokemon/jirachi/normal.pal b/graphics/pokemon/jirachi/normal.pal index 198bafa24..cb3591f00 100644 --- a/graphics/pokemon/jirachi/normal.pal +++ b/graphics/pokemon/jirachi/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -152 136 56 -16 16 16 -248 232 184 -248 232 120 -216 192 96 -80 176 184 -56 112 120 -136 208 200 -192 208 232 -240 240 248 +168 128 48 +0 0 0 +248 248 144 +248 224 88 +224 184 80 +80 168 200 +48 120 136 +96 208 216 +192 200 216 +224 232 240 248 248 248 -88 96 112 -144 152 168 +104 112 112 +152 160 168 0 0 0 0 0 0 diff --git a/graphics/pokemon/jolteon/anim_front.png b/graphics/pokemon/jolteon/anim_front.png index 5c1090a18..b43c1de38 100644 Binary files a/graphics/pokemon/jolteon/anim_front.png and b/graphics/pokemon/jolteon/anim_front.png differ diff --git a/graphics/pokemon/jolteon/front.png b/graphics/pokemon/jolteon/front.png index 18a3cc813..83fae9488 100644 Binary files a/graphics/pokemon/jolteon/front.png and b/graphics/pokemon/jolteon/front.png differ diff --git a/graphics/pokemon/jolteon/normal.pal b/graphics/pokemon/jolteon/normal.pal index 7cf44ca0c..da74dabb8 100644 --- a/graphics/pokemon/jolteon/normal.pal +++ b/graphics/pokemon/jolteon/normal.pal @@ -3,13 +3,13 @@ JASC-PAL 16 152 208 160 16 16 16 -88 72 40 -216 168 64 -168 136 56 +128 104 40 +200 168 72 +128 104 40 152 120 64 -248 224 136 -248 208 88 -56 16 96 +248 248 136 +248 216 80 +72 8 128 248 248 248 72 72 80 192 200 208 diff --git a/graphics/pokemon/joltik/anim_front.png b/graphics/pokemon/joltik/anim_front.png index 1681d6457..f591acb21 100644 Binary files a/graphics/pokemon/joltik/anim_front.png and b/graphics/pokemon/joltik/anim_front.png differ diff --git a/graphics/pokemon/joltik/front.png b/graphics/pokemon/joltik/front.png index 877833842..845a9a104 100644 Binary files a/graphics/pokemon/joltik/front.png and b/graphics/pokemon/joltik/front.png differ diff --git a/graphics/pokemon/joltik/normal.pal b/graphics/pokemon/joltik/normal.pal index 9c746ebb4..1001c4e66 100644 --- a/graphics/pokemon/joltik/normal.pal +++ b/graphics/pokemon/joltik/normal.pal @@ -2,16 +2,16 @@ JASC-PAL 0100 16 152 208 160 -104 88 48 -240 208 88 +112 80 8 +240 216 64 16 16 16 -176 144 64 -16 24 88 +200 168 8 +8 48 96 128 136 80 216 216 232 -56 96 176 -48 72 136 -136 120 64 +96 104 224 +48 88 192 +160 128 8 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/jumpluff/anim_front.png b/graphics/pokemon/jumpluff/anim_front.png index fd3a5c5c4..f78886dc5 100644 Binary files a/graphics/pokemon/jumpluff/anim_front.png and b/graphics/pokemon/jumpluff/anim_front.png differ diff --git a/graphics/pokemon/jumpluff/front.png b/graphics/pokemon/jumpluff/front.png index 537797f73..3a0922741 100644 Binary files a/graphics/pokemon/jumpluff/front.png and b/graphics/pokemon/jumpluff/front.png differ diff --git a/graphics/pokemon/jumpluff/normal.pal b/graphics/pokemon/jumpluff/normal.pal index d73f61924..4ba1e9cc6 100644 --- a/graphics/pokemon/jumpluff/normal.pal +++ b/graphics/pokemon/jumpluff/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -160 120 40 -208 168 88 -248 232 184 -232 208 152 -248 240 224 -72 120 32 +176 136 48 +208 184 88 +248 240 176 +232 224 152 +248 248 216 +40 128 72 16 16 16 -128 200 64 -72 96 168 -96 128 208 -32 48 104 -136 160 224 -224 88 112 -208 56 88 -128 72 88 +128 200 120 +56 112 192 +112 152 248 +24 72 112 +136 176 248 +232 64 80 +192 48 64 +168 0 0 diff --git a/graphics/pokemon/jynx/anim_front.png b/graphics/pokemon/jynx/anim_front.png index 4b8819bda..c5f4b8aba 100644 Binary files a/graphics/pokemon/jynx/anim_front.png and b/graphics/pokemon/jynx/anim_front.png differ diff --git a/graphics/pokemon/jynx/front.png b/graphics/pokemon/jynx/front.png index 967094bb8..df2603da7 100644 Binary files a/graphics/pokemon/jynx/front.png and b/graphics/pokemon/jynx/front.png differ diff --git a/graphics/pokemon/jynx/normal.pal b/graphics/pokemon/jynx/normal.pal index 26614b682..0990038df 100644 --- a/graphics/pokemon/jynx/normal.pal +++ b/graphics/pokemon/jynx/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 120 88 -232 216 144 -200 176 120 -248 240 224 -16 16 16 -80 56 96 -160 128 200 -184 192 208 +144 120 64 +240 224 152 +208 184 104 +248 248 216 +0 0 0 +96 64 128 +176 104 216 +184 184 200 248 248 248 -232 80 80 -248 136 112 -128 96 152 -168 64 64 -112 56 48 +240 48 88 +248 112 112 +144 72 184 +184 48 96 +128 40 72 96 96 120 diff --git a/graphics/pokemon/kabuto/anim_front.png b/graphics/pokemon/kabuto/anim_front.png index f38ca8c30..d738475e9 100644 Binary files a/graphics/pokemon/kabuto/anim_front.png and b/graphics/pokemon/kabuto/anim_front.png differ diff --git a/graphics/pokemon/kabuto/front.png b/graphics/pokemon/kabuto/front.png index 796fecab2..47d4d3df8 100644 Binary files a/graphics/pokemon/kabuto/front.png and b/graphics/pokemon/kabuto/front.png differ diff --git a/graphics/pokemon/kabuto/normal.pal b/graphics/pokemon/kabuto/normal.pal index e4b54c677..827f32924 100644 --- a/graphics/pokemon/kabuto/normal.pal +++ b/graphics/pokemon/kabuto/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -120 80 56 -208 168 128 -184 128 72 -8 16 16 -72 48 24 -160 112 64 -136 136 136 -248 152 160 -248 80 104 -136 96 72 -200 152 72 -248 192 88 -8 48 96 +120 80 40 +208 160 80 +192 128 40 +0 0 0 +72 40 0 +160 104 40 +192 192 200 +248 136 168 +248 72 128 +136 112 0 +184 160 0 +232 192 0 +16 56 104 88 64 0 -248 208 160 +248 232 88 diff --git a/graphics/pokemon/kabutops/anim_front.png b/graphics/pokemon/kabutops/anim_front.png index e02ba3313..5c7a73a85 100644 Binary files a/graphics/pokemon/kabutops/anim_front.png and b/graphics/pokemon/kabutops/anim_front.png differ diff --git a/graphics/pokemon/kabutops/front.png b/graphics/pokemon/kabutops/front.png index 5c4da1600..d89cb33ca 100644 Binary files a/graphics/pokemon/kabutops/front.png and b/graphics/pokemon/kabutops/front.png differ diff --git a/graphics/pokemon/kabutops/normal.pal b/graphics/pokemon/kabutops/normal.pal index d1c6ccac8..cdc54fd4c 100644 --- a/graphics/pokemon/kabutops/normal.pal +++ b/graphics/pokemon/kabutops/normal.pal @@ -3,15 +3,15 @@ JASC-PAL 16 152 208 160 144 144 144 -80 72 96 -216 208 208 +80 80 80 +224 224 208 16 16 16 -176 160 160 -192 152 104 -64 32 24 -176 120 72 -112 72 56 -152 104 64 +176 176 176 +200 160 112 +80 48 24 +184 136 64 +120 80 40 +152 112 48 248 248 248 224 224 208 0 0 0 diff --git a/graphics/pokemon/kadabra/anim_front.png b/graphics/pokemon/kadabra/anim_front.png index ad2375c59..91b225ed6 100644 Binary files a/graphics/pokemon/kadabra/anim_front.png and b/graphics/pokemon/kadabra/anim_front.png differ diff --git a/graphics/pokemon/kadabra/front.png b/graphics/pokemon/kadabra/front.png index 7d9405a15..a3e193116 100644 Binary files a/graphics/pokemon/kadabra/front.png and b/graphics/pokemon/kadabra/front.png differ diff --git a/graphics/pokemon/kadabra/normal.pal b/graphics/pokemon/kadabra/normal.pal index 33f5713b4..8082ea708 100644 --- a/graphics/pokemon/kadabra/normal.pal +++ b/graphics/pokemon/kadabra/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -120 96 24 -88 56 8 -240 208 80 -192 160 56 +136 112 16 +96 72 8 +248 232 40 +208 184 8 16 16 16 -192 104 80 -64 48 40 -160 128 112 -232 232 216 +224 56 40 +72 48 64 +152 120 120 +216 216 216 248 248 248 88 88 88 -104 80 72 -192 192 176 -248 232 168 -176 160 152 +104 72 64 +176 176 176 +248 248 184 +200 168 168 diff --git a/graphics/pokemon/kakuna/anim_front.png b/graphics/pokemon/kakuna/anim_front.png index 5b0537013..586e41597 100644 Binary files a/graphics/pokemon/kakuna/anim_front.png and b/graphics/pokemon/kakuna/anim_front.png differ diff --git a/graphics/pokemon/kakuna/front.png b/graphics/pokemon/kakuna/front.png index eeddca62b..679c4b3e0 100644 Binary files a/graphics/pokemon/kakuna/front.png and b/graphics/pokemon/kakuna/front.png differ diff --git a/graphics/pokemon/kakuna/normal.pal b/graphics/pokemon/kakuna/normal.pal index 36d4ef2e2..0e0f89567 100644 --- a/graphics/pokemon/kakuna/normal.pal +++ b/graphics/pokemon/kakuna/normal.pal @@ -2,12 +2,12 @@ JASC-PAL 0100 16 152 208 160 -208 168 72 -168 136 56 -240 216 96 -248 240 184 -128 104 40 -80 64 24 +200 152 16 +152 120 0 +240 200 48 +248 240 200 +120 88 0 +72 56 0 56 56 56 104 104 104 16 16 16 diff --git a/graphics/pokemon/kangaskhan/anim_front.png b/graphics/pokemon/kangaskhan/anim_front.png index 933606449..fe0ca6cb1 100644 Binary files a/graphics/pokemon/kangaskhan/anim_front.png and b/graphics/pokemon/kangaskhan/anim_front.png differ diff --git a/graphics/pokemon/kangaskhan/front.png b/graphics/pokemon/kangaskhan/front.png index a21da5940..03e477946 100644 Binary files a/graphics/pokemon/kangaskhan/front.png and b/graphics/pokemon/kangaskhan/front.png differ diff --git a/graphics/pokemon/kangaskhan/normal.pal b/graphics/pokemon/kangaskhan/normal.pal index 53a18732f..b59f028cf 100644 --- a/graphics/pokemon/kangaskhan/normal.pal +++ b/graphics/pokemon/kangaskhan/normal.pal @@ -12,7 +12,7 @@ JASC-PAL 200 200 200 192 144 128 136 104 96 -200 56 72 +168 16 0 216 184 168 184 184 248 128 128 168 diff --git a/graphics/pokemon/karrablast/anim_front.png b/graphics/pokemon/karrablast/anim_front.png index 5bd755b9a..218596a3c 100644 Binary files a/graphics/pokemon/karrablast/anim_front.png and b/graphics/pokemon/karrablast/anim_front.png differ diff --git a/graphics/pokemon/karrablast/front.png b/graphics/pokemon/karrablast/front.png index 4809f5367..4d2edf923 100644 Binary files a/graphics/pokemon/karrablast/front.png and b/graphics/pokemon/karrablast/front.png differ diff --git a/graphics/pokemon/karrablast/normal.pal b/graphics/pokemon/karrablast/normal.pal index 90da9068f..8b929294d 100644 --- a/graphics/pokemon/karrablast/normal.pal +++ b/graphics/pokemon/karrablast/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -24 96 144 -16 48 88 -40 128 200 -80 152 232 +56 80 128 +32 56 88 +48 104 248 +80 136 248 16 16 16 112 208 248 40 40 56 80 80 88 -80 144 168 -192 144 56 -248 208 96 -208 112 8 +64 144 168 +176 152 24 +248 216 24 +192 80 0 248 248 248 -104 80 40 +112 96 32 0 0 0 diff --git a/graphics/pokemon/kecleon/anim_front.png b/graphics/pokemon/kecleon/anim_front.png index 55b6430fa..43f947530 100644 Binary files a/graphics/pokemon/kecleon/anim_front.png and b/graphics/pokemon/kecleon/anim_front.png differ diff --git a/graphics/pokemon/kecleon/front.png b/graphics/pokemon/kecleon/front.png index a2d3857b3..2674a0d16 100644 Binary files a/graphics/pokemon/kecleon/front.png and b/graphics/pokemon/kecleon/front.png differ diff --git a/graphics/pokemon/kecleon/normal.pal b/graphics/pokemon/kecleon/normal.pal index 0f2042b43..881dfde03 100644 --- a/graphics/pokemon/kecleon/normal.pal +++ b/graphics/pokemon/kecleon/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 0 176 232 -144 120 80 -72 88 48 -16 16 16 -248 232 176 -192 160 88 -160 192 80 -128 152 56 -240 200 104 -208 224 96 -176 208 136 -208 232 168 -248 248 248 -192 64 104 -224 120 136 +136 120 88 +64 96 64 +0 0 0 +240 232 120 +184 160 80 +120 184 80 +96 144 80 +216 192 88 192 216 120 +160 216 112 +184 232 152 +248 248 248 +160 64 128 +208 96 168 +120 184 80 diff --git a/graphics/pokemon/keldeo/anim_front.png b/graphics/pokemon/keldeo/anim_front.png index 2e0c040d5..02b1af6ca 100644 Binary files a/graphics/pokemon/keldeo/anim_front.png and b/graphics/pokemon/keldeo/anim_front.png differ diff --git a/graphics/pokemon/keldeo/front.png b/graphics/pokemon/keldeo/front.png index c7a14c9d0..ffc17bf57 100644 Binary files a/graphics/pokemon/keldeo/front.png and b/graphics/pokemon/keldeo/front.png differ diff --git a/graphics/pokemon/keldeo/normal.pal b/graphics/pokemon/keldeo/normal.pal index 04f8532d2..bfdaee6f3 100644 --- a/graphics/pokemon/keldeo/normal.pal +++ b/graphics/pokemon/keldeo/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 248 160 176 -96 32 16 +120 48 40 32 32 32 -144 48 32 -232 80 40 -112 104 72 -32 48 88 -248 240 160 -64 104 176 -192 176 104 -48 72 128 -80 144 168 -112 200 248 +168 48 32 +216 64 32 +104 104 80 +24 40 88 +248 240 184 +72 104 200 +176 168 128 +48 72 136 +32 120 160 +96 184 248 80 80 80 248 248 248 -184 224 248 +168 216 248 diff --git a/graphics/pokemon/keldeo/resolute/front.png b/graphics/pokemon/keldeo/resolute/front.png index 3567dd571..8e83b810a 100644 Binary files a/graphics/pokemon/keldeo/resolute/front.png and b/graphics/pokemon/keldeo/resolute/front.png differ diff --git a/graphics/pokemon/keldeo/resolute/normal.pal b/graphics/pokemon/keldeo/resolute/normal.pal index 8755c6d07..ebd6220fc 100644 --- a/graphics/pokemon/keldeo/resolute/normal.pal +++ b/graphics/pokemon/keldeo/resolute/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -255 163 177 +248 160 176 16 16 16 -74 82 82 -112 204 249 -255 159 63 -53 75 132 -147 53 36 -65 99 186 -237 75 35 -109 198 115 -32 49 91 -81 142 163 -255 245 160 -196 178 107 -255 255 255 -112 109 76 +72 80 80 +96 184 248 +248 144 32 +48 72 136 +128 56 40 +72 104 200 +216 72 48 +56 176 56 +24 48 96 +32 128 136 +248 240 168 +176 168 112 +248 248 248 +96 88 40 diff --git a/graphics/pokemon/kingdra/anim_front.png b/graphics/pokemon/kingdra/anim_front.png index 26de28c0f..a44cd577d 100644 Binary files a/graphics/pokemon/kingdra/anim_front.png and b/graphics/pokemon/kingdra/anim_front.png differ diff --git a/graphics/pokemon/kingdra/front.png b/graphics/pokemon/kingdra/front.png index ad460d1d5..bdce13253 100644 Binary files a/graphics/pokemon/kingdra/front.png and b/graphics/pokemon/kingdra/front.png differ diff --git a/graphics/pokemon/kingdra/normal.pal b/graphics/pokemon/kingdra/normal.pal index fc22768bc..363bc2365 100644 --- a/graphics/pokemon/kingdra/normal.pal +++ b/graphics/pokemon/kingdra/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -64 136 168 +64 136 192 16 16 16 144 216 240 -40 80 96 +64 88 136 88 176 216 184 240 248 248 248 248 -176 32 64 -128 128 112 -200 200 184 -248 192 104 -192 144 72 -120 80 24 +176 16 48 +128 128 128 +200 200 200 +248 224 184 +216 168 120 +128 104 96 0 0 0 0 0 0 diff --git a/graphics/pokemon/kingler/anim_front.png b/graphics/pokemon/kingler/anim_front.png index 68b62ea35..faf8692ed 100644 Binary files a/graphics/pokemon/kingler/anim_front.png and b/graphics/pokemon/kingler/anim_front.png differ diff --git a/graphics/pokemon/kingler/front.png b/graphics/pokemon/kingler/front.png index 33b8facfa..7d63b980c 100644 Binary files a/graphics/pokemon/kingler/front.png and b/graphics/pokemon/kingler/front.png differ diff --git a/graphics/pokemon/kingler/normal.pal b/graphics/pokemon/kingler/normal.pal index 5e87e4876..f04446375 100644 --- a/graphics/pokemon/kingler/normal.pal +++ b/graphics/pokemon/kingler/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -112 56 40 -240 136 72 -168 88 64 +128 40 8 +248 136 80 +176 88 72 16 16 16 -248 176 144 -48 40 40 -200 160 176 -88 72 72 -88 80 72 -248 216 208 -144 120 120 +240 192 136 +72 48 32 +216 168 152 +112 80 16 +88 64 48 +248 240 216 +160 104 64 248 248 248 184 184 224 0 0 0 diff --git a/graphics/pokemon/kirlia/anim_front.png b/graphics/pokemon/kirlia/anim_front.png index 5fce4981f..17813ae7f 100644 Binary files a/graphics/pokemon/kirlia/anim_front.png and b/graphics/pokemon/kirlia/anim_front.png differ diff --git a/graphics/pokemon/kirlia/front.png b/graphics/pokemon/kirlia/front.png index bdd17fa07..c1858f769 100644 Binary files a/graphics/pokemon/kirlia/front.png and b/graphics/pokemon/kirlia/front.png differ diff --git a/graphics/pokemon/kirlia/normal.pal b/graphics/pokemon/kirlia/normal.pal index 2e32eebee..fe98a72d6 100644 --- a/graphics/pokemon/kirlia/normal.pal +++ b/graphics/pokemon/kirlia/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 192 160 232 -120 48 56 -64 112 56 -232 152 152 -200 80 96 +128 40 72 +48 120 64 +248 120 144 +208 72 112 16 16 16 -176 224 168 -104 168 96 -128 200 120 +176 240 144 +112 184 112 +136 224 136 248 248 248 -128 112 168 -200 184 224 +112 128 168 +200 200 224 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/klang/anim_front.png b/graphics/pokemon/klang/anim_front.png index 09aca36c7..8bd05ce48 100644 Binary files a/graphics/pokemon/klang/anim_front.png and b/graphics/pokemon/klang/anim_front.png differ diff --git a/graphics/pokemon/klang/front.png b/graphics/pokemon/klang/front.png index c464483b5..6cfd82984 100644 Binary files a/graphics/pokemon/klang/front.png and b/graphics/pokemon/klang/front.png differ diff --git a/graphics/pokemon/klang/normal.pal b/graphics/pokemon/klang/normal.pal index 198a04193..7f77a59c2 100644 --- a/graphics/pokemon/klang/normal.pal +++ b/graphics/pokemon/klang/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -64 64 80 -40 48 48 +72 72 72 +40 40 40 16 16 16 -96 104 112 -192 192 216 -144 152 168 +104 104 112 +208 216 232 +160 160 168 248 248 248 -32 80 72 -24 168 160 -112 120 136 +48 96 96 +40 168 184 +112 112 136 16 56 64 -24 120 104 +40 136 144 144 144 176 0 0 0 0 0 0 diff --git a/graphics/pokemon/klink/anim_front.png b/graphics/pokemon/klink/anim_front.png index fb7fc123f..76c5db96b 100644 Binary files a/graphics/pokemon/klink/anim_front.png and b/graphics/pokemon/klink/anim_front.png differ diff --git a/graphics/pokemon/klink/front.png b/graphics/pokemon/klink/front.png index 9bcdde9fa..3af6a70b0 100644 Binary files a/graphics/pokemon/klink/front.png and b/graphics/pokemon/klink/front.png differ diff --git a/graphics/pokemon/klink/normal.pal b/graphics/pokemon/klink/normal.pal index baafa6967..8116f0a42 100644 --- a/graphics/pokemon/klink/normal.pal +++ b/graphics/pokemon/klink/normal.pal @@ -2,16 +2,16 @@ JASC-PAL 0100 16 152 208 160 -64 64 80 +72 72 72 16 16 16 -96 104 112 -192 192 216 -40 48 48 -144 144 168 +104 104 112 +208 216 232 +40 40 40 +144 144 144 248 248 248 -24 120 104 -24 168 160 -152 152 176 +48 96 96 +40 168 184 +144 144 176 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/klinklang/anim_front.png b/graphics/pokemon/klinklang/anim_front.png index 20d59dbe5..1f0a60ec3 100644 Binary files a/graphics/pokemon/klinklang/anim_front.png and b/graphics/pokemon/klinklang/anim_front.png differ diff --git a/graphics/pokemon/klinklang/front.png b/graphics/pokemon/klinklang/front.png index 6ef6ee846..f49e126ee 100644 Binary files a/graphics/pokemon/klinklang/front.png and b/graphics/pokemon/klinklang/front.png differ diff --git a/graphics/pokemon/klinklang/normal.pal b/graphics/pokemon/klinklang/normal.pal index 1da9eae77..1a053507d 100644 --- a/graphics/pokemon/klinklang/normal.pal +++ b/graphics/pokemon/klinklang/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -64 64 80 -40 48 48 +72 72 72 +40 40 40 16 16 16 -96 104 112 -192 192 216 -144 152 168 +104 104 112 +208 216 232 +160 160 168 248 248 248 -32 80 72 -24 168 160 -112 120 136 +48 96 96 +40 168 184 +112 112 136 16 56 64 -24 120 104 +40 136 144 144 144 176 -136 80 64 -240 112 96 +144 72 72 +216 80 80 diff --git a/graphics/pokemon/koffing/anim_front.png b/graphics/pokemon/koffing/anim_front.png index 7021de3e6..3a5446cf1 100644 Binary files a/graphics/pokemon/koffing/anim_front.png and b/graphics/pokemon/koffing/anim_front.png differ diff --git a/graphics/pokemon/koffing/front.png b/graphics/pokemon/koffing/front.png index f147b1a2a..095559560 100644 Binary files a/graphics/pokemon/koffing/front.png and b/graphics/pokemon/koffing/front.png differ diff --git a/graphics/pokemon/koffing/normal.pal b/graphics/pokemon/koffing/normal.pal index ea5f80596..b1ecd15d4 100644 --- a/graphics/pokemon/koffing/normal.pal +++ b/graphics/pokemon/koffing/normal.pal @@ -5,15 +5,15 @@ JASC-PAL 192 184 128 224 216 152 152 144 88 -96 88 136 -176 176 224 -144 144 208 -48 48 88 +112 88 152 +200 184 232 +168 144 200 +72 40 88 16 16 16 248 248 248 216 216 216 -144 88 104 -208 112 144 -192 176 168 -240 224 200 +176 88 120 +232 112 136 +200 200 168 +240 232 200 0 0 0 diff --git a/graphics/pokemon/krabby/anim_front.png b/graphics/pokemon/krabby/anim_front.png index 023b9cc6e..670f8b537 100644 Binary files a/graphics/pokemon/krabby/anim_front.png and b/graphics/pokemon/krabby/anim_front.png differ diff --git a/graphics/pokemon/krabby/front.png b/graphics/pokemon/krabby/front.png index 9a90c7cdf..7e919a9be 100644 Binary files a/graphics/pokemon/krabby/front.png and b/graphics/pokemon/krabby/front.png differ diff --git a/graphics/pokemon/krabby/normal.pal b/graphics/pokemon/krabby/normal.pal index dd22042ad..e95b7c742 100644 --- a/graphics/pokemon/krabby/normal.pal +++ b/graphics/pokemon/krabby/normal.pal @@ -2,16 +2,16 @@ JASC-PAL 0100 16 152 208 160 -176 96 56 -240 136 72 +176 88 72 +248 136 80 248 176 144 -112 56 40 +128 40 8 16 16 16 -80 64 56 -200 160 176 -96 80 80 -160 128 128 -240 216 200 +88 64 48 +216 168 152 +128 96 32 +168 128 72 +248 240 216 248 248 248 216 216 216 0 0 0 diff --git a/graphics/pokemon/kricketot/anim_front.png b/graphics/pokemon/kricketot/anim_front.png index d8ea9fd56..7bf0fd397 100644 Binary files a/graphics/pokemon/kricketot/anim_front.png and b/graphics/pokemon/kricketot/anim_front.png differ diff --git a/graphics/pokemon/kricketot/front.png b/graphics/pokemon/kricketot/front.png index 5c7b05726..e158a0a79 100644 Binary files a/graphics/pokemon/kricketot/front.png and b/graphics/pokemon/kricketot/front.png differ diff --git a/graphics/pokemon/kricketot/normal.pal b/graphics/pokemon/kricketot/normal.pal index 1d3a0c765..290a5c95c 100644 --- a/graphics/pokemon/kricketot/normal.pal +++ b/graphics/pokemon/kricketot/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -64 64 72 -104 104 112 -136 144 152 +80 72 64 +120 112 96 +152 152 144 16 16 16 -120 120 56 -248 232 176 +136 104 8 +248 232 168 88 32 0 -176 64 40 -224 112 88 -216 184 120 -152 80 40 -128 48 24 +176 72 56 +224 104 96 +224 192 104 +144 80 24 +104 64 32 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/kricketune/anim_front.png b/graphics/pokemon/kricketune/anim_front.png index 1025b4cae..47cefb0a6 100644 Binary files a/graphics/pokemon/kricketune/anim_front.png and b/graphics/pokemon/kricketune/anim_front.png differ diff --git a/graphics/pokemon/kricketune/anim_frontf.png b/graphics/pokemon/kricketune/anim_frontf.png index b05954ee6..530ec9f76 100644 Binary files a/graphics/pokemon/kricketune/anim_frontf.png and b/graphics/pokemon/kricketune/anim_frontf.png differ diff --git a/graphics/pokemon/kricketune/front.png b/graphics/pokemon/kricketune/front.png index 7863c919d..65de302a5 100644 Binary files a/graphics/pokemon/kricketune/front.png and b/graphics/pokemon/kricketune/front.png differ diff --git a/graphics/pokemon/kricketune/normal.pal b/graphics/pokemon/kricketune/normal.pal index 59b3500de..8e79a2a57 100644 --- a/graphics/pokemon/kricketune/normal.pal +++ b/graphics/pokemon/kricketune/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -96 32 16 -232 88 64 -160 56 40 +98 49 0 +222 90 82 +156 65 49 16 16 16 -40 40 48 -56 64 64 -248 248 248 -88 88 104 -152 56 24 -240 208 136 -104 40 16 -184 152 96 -120 96 40 +49 41 57 +82 74 65 +255 255 255 +123 115 98 +148 82 24 +255 213 131 +90 57 32 +189 156 98 +139 106 8 0 0 0 0 0 0 diff --git a/graphics/pokemon/krokorok/anim_front.png b/graphics/pokemon/krokorok/anim_front.png index 1872a7068..43af22d23 100644 Binary files a/graphics/pokemon/krokorok/anim_front.png and b/graphics/pokemon/krokorok/anim_front.png differ diff --git a/graphics/pokemon/krokorok/front.png b/graphics/pokemon/krokorok/front.png index 4a54195b0..ab3c240f1 100644 Binary files a/graphics/pokemon/krokorok/front.png and b/graphics/pokemon/krokorok/front.png differ diff --git a/graphics/pokemon/krokorok/normal.pal b/graphics/pokemon/krokorok/normal.pal index 280c267cc..f330a4382 100644 --- a/graphics/pokemon/krokorok/normal.pal +++ b/graphics/pokemon/krokorok/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -144 104 72 -72 56 32 -192 152 104 -216 184 144 -48 48 56 -176 176 184 +139 115 49 +82 57 16 +197 156 90 +222 189 131 +41 41 49 +180 180 189 24 24 32 16 16 16 -88 88 104 -248 248 248 -152 80 96 -224 120 136 -192 192 192 +90 90 106 +255 255 255 +205 115 123 +238 148 164 +197 197 197 48 48 56 0 0 0 diff --git a/graphics/pokemon/krookodile/anim_front.png b/graphics/pokemon/krookodile/anim_front.png index 6412d21ff..530488b9b 100644 Binary files a/graphics/pokemon/krookodile/anim_front.png and b/graphics/pokemon/krookodile/anim_front.png differ diff --git a/graphics/pokemon/krookodile/front.png b/graphics/pokemon/krookodile/front.png index 084b2c5ce..3654e8360 100644 Binary files a/graphics/pokemon/krookodile/front.png and b/graphics/pokemon/krookodile/front.png differ diff --git a/graphics/pokemon/krookodile/normal.pal b/graphics/pokemon/krookodile/normal.pal index e0e18285b..2c4607a2d 100644 --- a/graphics/pokemon/krookodile/normal.pal +++ b/graphics/pokemon/krookodile/normal.pal @@ -6,8 +6,8 @@ JASC-PAL 80 40 32 136 48 64 24 24 32 -224 120 112 -192 80 80 +232 120 112 +200 80 80 16 16 16 80 80 96 248 248 248 @@ -15,5 +15,5 @@ JASC-PAL 80 80 88 200 112 128 136 144 136 -184 192 200 +192 200 200 0 0 0 diff --git a/graphics/pokemon/kyogre/anim_front.png b/graphics/pokemon/kyogre/anim_front.png index 8a5e88a6b..4cb8355bb 100644 Binary files a/graphics/pokemon/kyogre/anim_front.png and b/graphics/pokemon/kyogre/anim_front.png differ diff --git a/graphics/pokemon/kyogre/front.png b/graphics/pokemon/kyogre/front.png index 3dd7cd90b..59ceadbf7 100644 Binary files a/graphics/pokemon/kyogre/front.png and b/graphics/pokemon/kyogre/front.png differ diff --git a/graphics/pokemon/kyogre/normal.pal b/graphics/pokemon/kyogre/normal.pal index cf30ae76c..989581da2 100644 --- a/graphics/pokemon/kyogre/normal.pal +++ b/graphics/pokemon/kyogre/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -80 96 112 +88 80 104 16 16 16 216 216 216 -128 144 168 -24 40 64 -24 88 160 -48 120 176 -224 32 56 -16 56 112 -160 24 72 +128 144 160 +48 56 112 +56 96 176 +72 128 208 +240 16 16 +40 80 144 +160 48 96 112 40 56 -112 160 216 -168 200 240 -200 216 232 -248 200 80 +88 160 248 +128 200 248 +184 200 208 +248 200 48 diff --git a/graphics/pokemon/kyurem/anim_front.png b/graphics/pokemon/kyurem/anim_front.png index 6cdcb4b74..19f0080b9 100644 Binary files a/graphics/pokemon/kyurem/anim_front.png and b/graphics/pokemon/kyurem/anim_front.png differ diff --git a/graphics/pokemon/kyurem/black/anim_front.png b/graphics/pokemon/kyurem/black/anim_front.png index 71013f7a3..97c8fa214 100644 Binary files a/graphics/pokemon/kyurem/black/anim_front.png and b/graphics/pokemon/kyurem/black/anim_front.png differ diff --git a/graphics/pokemon/kyurem/black/front.png b/graphics/pokemon/kyurem/black/front.png index ccba4d35a..45b31238f 100644 Binary files a/graphics/pokemon/kyurem/black/front.png and b/graphics/pokemon/kyurem/black/front.png differ diff --git a/graphics/pokemon/kyurem/black/normal.pal b/graphics/pokemon/kyurem/black/normal.pal index bdb3fe453..9dcc1bb5a 100644 --- a/graphics/pokemon/kyurem/black/normal.pal +++ b/graphics/pokemon/kyurem/black/normal.pal @@ -3,9 +3,9 @@ JASC-PAL 16 153 210 164 36 39 43 -173 228 247 +184 224 248 16 16 16 -123 157 160 +128 152 184 156 166 173 57 62 66 60 84 96 @@ -13,7 +13,7 @@ JASC-PAL 23 29 33 0 197 255 0 106 189 -255 212 25 -132 99 0 +248 224 0 +136 112 40 71 78 89 230 230 222 diff --git a/graphics/pokemon/kyurem/front.png b/graphics/pokemon/kyurem/front.png index bf93cdbc6..c558f9172 100644 Binary files a/graphics/pokemon/kyurem/front.png and b/graphics/pokemon/kyurem/front.png differ diff --git a/graphics/pokemon/kyurem/normal.pal b/graphics/pokemon/kyurem/normal.pal index 2aa2a657a..f64ed2443 100644 --- a/graphics/pokemon/kyurem/normal.pal +++ b/graphics/pokemon/kyurem/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 128 128 -72 80 104 -144 176 184 -200 232 240 -120 112 120 -240 232 136 -168 224 232 -64 72 88 +104 128 144 +16 56 80 +160 176 200 +216 240 248 +112 112 120 +248 224 0 +184 224 248 +64 64 80 16 16 16 144 152 168 -152 136 80 -200 184 80 +136 112 40 +200 176 0 248 248 248 200 200 200 -0 0 0 +112 112 120 diff --git a/graphics/pokemon/kyurem/white/anim_front.png b/graphics/pokemon/kyurem/white/anim_front.png index b55d6c89a..0f2185688 100644 Binary files a/graphics/pokemon/kyurem/white/anim_front.png and b/graphics/pokemon/kyurem/white/anim_front.png differ diff --git a/graphics/pokemon/kyurem/white/front.png b/graphics/pokemon/kyurem/white/front.png index 7e7314e76..7b587c7d2 100644 Binary files a/graphics/pokemon/kyurem/white/front.png and b/graphics/pokemon/kyurem/white/front.png differ diff --git a/graphics/pokemon/kyurem/white/normal.pal b/graphics/pokemon/kyurem/white/normal.pal index cc136a09e..560f65177 100644 --- a/graphics/pokemon/kyurem/white/normal.pal +++ b/graphics/pokemon/kyurem/white/normal.pal @@ -2,9 +2,9 @@ JASC-PAL 0100 16 153 210 164 -173 228 247 -123 157 160 -255 255 255 +184 224 248 +128 152 184 +248 248 248 16 16 16 156 166 173 71 78 89 @@ -12,8 +12,8 @@ JASC-PAL 60 84 96 230 74 66 148 41 33 -198 181 169 -122 109 101 +184 184 208 +128 128 128 255 173 99 -255 212 25 +248 224 0 255 222 58 diff --git a/graphics/pokemon/lairon/anim_front.png b/graphics/pokemon/lairon/anim_front.png index 3e3a0850a..79c345af4 100644 Binary files a/graphics/pokemon/lairon/anim_front.png and b/graphics/pokemon/lairon/anim_front.png differ diff --git a/graphics/pokemon/lairon/front.png b/graphics/pokemon/lairon/front.png index 0242ce501..de830e306 100644 Binary files a/graphics/pokemon/lairon/front.png and b/graphics/pokemon/lairon/front.png differ diff --git a/graphics/pokemon/lairon/normal.pal b/graphics/pokemon/lairon/normal.pal index 680a9a6ba..8923b7cee 100644 --- a/graphics/pokemon/lairon/normal.pal +++ b/graphics/pokemon/lairon/normal.pal @@ -3,9 +3,9 @@ JASC-PAL 16 152 208 160 104 104 120 -120 120 144 +120 128 144 248 248 248 -192 192 216 +192 208 216 16 16 16 64 72 80 152 152 176 @@ -13,7 +13,7 @@ JASC-PAL 104 104 104 168 168 168 136 136 136 -80 184 224 -152 88 120 -208 152 176 +104 184 248 +168 56 72 +224 104 104 104 104 104 diff --git a/graphics/pokemon/lampent/anim_front.png b/graphics/pokemon/lampent/anim_front.png index 5f4a228ad..766dc2d32 100644 Binary files a/graphics/pokemon/lampent/anim_front.png and b/graphics/pokemon/lampent/anim_front.png differ diff --git a/graphics/pokemon/lampent/front.png b/graphics/pokemon/lampent/front.png index c6c1fdd93..2d249ae93 100644 Binary files a/graphics/pokemon/lampent/front.png and b/graphics/pokemon/lampent/front.png differ diff --git a/graphics/pokemon/lampent/normal.pal b/graphics/pokemon/lampent/normal.pal index ef554b7fe..d7bae894c 100644 --- a/graphics/pokemon/lampent/normal.pal +++ b/graphics/pokemon/lampent/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -16 16 16 -40 40 40 -48 56 64 -168 192 216 -112 112 200 -112 120 136 -136 120 160 -160 168 216 -136 120 48 -240 208 56 -192 224 248 +0 0 0 +48 48 48 +72 72 72 +192 200 208 +128 104 224 +128 128 128 +144 136 168 +192 184 240 +120 104 8 +248 224 32 +216 224 232 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/landorus/anim_front.png b/graphics/pokemon/landorus/anim_front.png index db5da4a39..762c5cd2e 100644 Binary files a/graphics/pokemon/landorus/anim_front.png and b/graphics/pokemon/landorus/anim_front.png differ diff --git a/graphics/pokemon/landorus/back.png b/graphics/pokemon/landorus/back.png index 35216e5fe..f70121ac4 100644 Binary files a/graphics/pokemon/landorus/back.png and b/graphics/pokemon/landorus/back.png differ diff --git a/graphics/pokemon/landorus/front.png b/graphics/pokemon/landorus/front.png index 074644e0d..e16bea46b 100644 Binary files a/graphics/pokemon/landorus/front.png and b/graphics/pokemon/landorus/front.png differ diff --git a/graphics/pokemon/landorus/normal.pal b/graphics/pokemon/landorus/normal.pal index 228b5ffa5..bbacdca83 100644 --- a/graphics/pokemon/landorus/normal.pal +++ b/graphics/pokemon/landorus/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -112 96 88 -16 16 16 -248 248 248 -176 160 160 -80 40 48 -176 80 88 -152 88 56 -240 128 72 -56 48 40 -248 192 136 -56 48 48 -88 64 56 -120 96 80 -112 56 80 +153 204 153 +128 96 72 +17 17 17 +255 255 255 +176 176 184 +85 34 51 +184 72 80 +160 88 56 +240 120 64 +51 51 34 +248 200 96 +51 51 51 +96 64 48 +119 51 85 +128 128 128 0 0 0 diff --git a/graphics/pokemon/landorus/shiny.pal b/graphics/pokemon/landorus/shiny.pal index a1c09aa11..25f3ac5c9 100644 --- a/graphics/pokemon/landorus/shiny.pal +++ b/graphics/pokemon/landorus/shiny.pal @@ -15,5 +15,5 @@ JASC-PAL 56 32 16 72 48 32 120 72 40 -168 80 32 +128 128 128 0 0 0 diff --git a/graphics/pokemon/landorus/therian/anim_front.png b/graphics/pokemon/landorus/therian/anim_front.png index cbe0fa001..2ea9efd8b 100644 Binary files a/graphics/pokemon/landorus/therian/anim_front.png and b/graphics/pokemon/landorus/therian/anim_front.png differ diff --git a/graphics/pokemon/landorus/therian/front.png b/graphics/pokemon/landorus/therian/front.png index 81f5550c2..47f617e4f 100644 Binary files a/graphics/pokemon/landorus/therian/front.png and b/graphics/pokemon/landorus/therian/front.png differ diff --git a/graphics/pokemon/landorus/therian/normal.pal b/graphics/pokemon/landorus/therian/normal.pal index 92f0fccd2..e2e389aba 100644 --- a/graphics/pokemon/landorus/therian/normal.pal +++ b/graphics/pokemon/landorus/therian/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -96 72 56 +96 64 48 16 16 16 -208 88 96 -136 112 88 -56 40 32 -120 112 104 +184 72 80 +128 96 72 +72 40 24 +112 112 112 248 248 248 -192 176 168 -104 40 48 -88 48 32 -248 136 56 -168 88 40 -136 56 64 -240 192 112 +176 176 184 +112 48 56 +96 48 16 +240 120 64 +160 88 56 +144 48 64 +248 200 96 0 0 0 diff --git a/graphics/pokemon/lanturn/anim_front.png b/graphics/pokemon/lanturn/anim_front.png index 339e7f476..69166b66b 100644 Binary files a/graphics/pokemon/lanturn/anim_front.png and b/graphics/pokemon/lanturn/anim_front.png differ diff --git a/graphics/pokemon/lanturn/front.png b/graphics/pokemon/lanturn/front.png index 714ac438c..d17887059 100644 Binary files a/graphics/pokemon/lanturn/front.png and b/graphics/pokemon/lanturn/front.png differ diff --git a/graphics/pokemon/lanturn/normal.pal b/graphics/pokemon/lanturn/normal.pal index be80edb4c..792d90f29 100644 --- a/graphics/pokemon/lanturn/normal.pal +++ b/graphics/pokemon/lanturn/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 136 120 88 -248 224 120 -224 192 96 -88 112 168 -144 176 240 -192 160 80 +248 216 96 +224 184 48 +88 112 192 +144 160 224 +176 136 32 48 56 96 -112 136 216 +120 152 216 16 16 16 248 248 248 80 64 40 -184 200 240 -120 80 88 -224 112 112 -224 64 40 +184 192 232 +160 48 72 +232 96 88 +168 0 0 diff --git a/graphics/pokemon/lapras/anim_front.png b/graphics/pokemon/lapras/anim_front.png index f96adda66..394a3029d 100644 Binary files a/graphics/pokemon/lapras/anim_front.png and b/graphics/pokemon/lapras/anim_front.png differ diff --git a/graphics/pokemon/lapras/front.png b/graphics/pokemon/lapras/front.png index 81cb4f41a..f831c07ba 100644 Binary files a/graphics/pokemon/lapras/front.png and b/graphics/pokemon/lapras/front.png differ diff --git a/graphics/pokemon/lapras/normal.pal b/graphics/pokemon/lapras/normal.pal index ed20b3cfe..cc9c65f46 100644 --- a/graphics/pokemon/lapras/normal.pal +++ b/graphics/pokemon/lapras/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -16 64 96 +24 64 80 8 8 8 -56 168 216 -40 128 160 -104 192 232 +64 160 224 +56 120 160 +112 192 240 232 232 240 104 80 64 144 136 160 -216 184 144 +216 192 128 136 160 144 80 80 104 168 176 200 -248 224 176 -173 117 147 +240 216 168 +232 128 120 0 0 0 diff --git a/graphics/pokemon/larvesta/anim_front.png b/graphics/pokemon/larvesta/anim_front.png index a727183a9..9c3ddea2a 100644 Binary files a/graphics/pokemon/larvesta/anim_front.png and b/graphics/pokemon/larvesta/anim_front.png differ diff --git a/graphics/pokemon/larvesta/front.png b/graphics/pokemon/larvesta/front.png index 98f44e035..b2e83baac 100644 Binary files a/graphics/pokemon/larvesta/front.png and b/graphics/pokemon/larvesta/front.png differ diff --git a/graphics/pokemon/larvesta/normal.pal b/graphics/pokemon/larvesta/normal.pal index 4d561ca5f..9cebf0069 100644 --- a/graphics/pokemon/larvesta/normal.pal +++ b/graphics/pokemon/larvesta/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -104 56 40 -176 80 80 -232 104 72 +104 32 0 +168 40 8 +208 56 24 16 16 24 -112 112 136 +128 128 136 248 248 248 -152 160 176 -80 72 80 -200 208 224 -24 192 240 -0 152 192 -160 120 72 -72 56 40 -128 88 48 -56 48 48 +176 176 176 +80 80 88 +216 216 224 +0 208 248 +0 136 216 +176 120 56 +88 64 16 +136 96 40 +48 48 56 diff --git a/graphics/pokemon/larvitar/anim_front.png b/graphics/pokemon/larvitar/anim_front.png index aa5bc0cf7..5a52aa731 100644 Binary files a/graphics/pokemon/larvitar/anim_front.png and b/graphics/pokemon/larvitar/anim_front.png differ diff --git a/graphics/pokemon/larvitar/front.png b/graphics/pokemon/larvitar/front.png index 1cdc121f5..1974d2843 100644 Binary files a/graphics/pokemon/larvitar/front.png and b/graphics/pokemon/larvitar/front.png differ diff --git a/graphics/pokemon/larvitar/normal.pal b/graphics/pokemon/larvitar/normal.pal index f4c8732de..abd92bbc4 100644 --- a/graphics/pokemon/larvitar/normal.pal +++ b/graphics/pokemon/larvitar/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 0 176 232 -64 80 40 -168 208 136 -128 144 96 +72 88 56 +168 200 152 +120 152 96 16 16 16 248 248 248 -184 56 48 -216 104 104 -80 16 16 -128 40 40 +216 40 40 +232 120 136 +104 0 16 +168 24 24 192 192 192 -130 67 88 -188 103 103 +168 16 0 +232 32 24 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/latias/anim_front.png b/graphics/pokemon/latias/anim_front.png index 8f9576707..658003aea 100644 Binary files a/graphics/pokemon/latias/anim_front.png and b/graphics/pokemon/latias/anim_front.png differ diff --git a/graphics/pokemon/latias/front.png b/graphics/pokemon/latias/front.png index 9f01891c3..cb84e81c0 100644 Binary files a/graphics/pokemon/latias/front.png and b/graphics/pokemon/latias/front.png differ diff --git a/graphics/pokemon/latias/normal.pal b/graphics/pokemon/latias/normal.pal index 684fb2555..daefa4d8a 100644 --- a/graphics/pokemon/latias/normal.pal +++ b/graphics/pokemon/latias/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 120 152 +120 120 160 232 232 248 16 16 16 -192 208 232 +200 200 232 152 168 200 -120 48 64 -232 120 112 -168 72 80 +136 40 72 +248 96 96 +184 64 64 216 144 160 -192 88 88 -200 152 72 +200 72 80 +200 160 72 248 248 248 -240 200 144 -144 200 224 -64 144 176 +248 200 88 +112 168 248 +64 120 200 diff --git a/graphics/pokemon/latios/anim_front.png b/graphics/pokemon/latios/anim_front.png index dcfd19658..5e952f156 100644 Binary files a/graphics/pokemon/latios/anim_front.png and b/graphics/pokemon/latios/anim_front.png differ diff --git a/graphics/pokemon/latios/front.png b/graphics/pokemon/latios/front.png index 9455b9aba..283e968b7 100644 Binary files a/graphics/pokemon/latios/front.png and b/graphics/pokemon/latios/front.png differ diff --git a/graphics/pokemon/latios/normal.pal b/graphics/pokemon/latios/normal.pal index 1486bd38d..6dee309f1 100644 --- a/graphics/pokemon/latios/normal.pal +++ b/graphics/pokemon/latios/normal.pal @@ -4,16 +4,16 @@ JASC-PAL 152 208 160 152 128 144 104 80 104 -224 208 208 -176 168 168 +224 216 208 +176 176 168 232 224 224 -32 104 160 +72 96 176 16 16 16 32 64 96 -112 176 224 +80 168 248 160 216 240 -64 136 192 -200 48 88 +80 112 216 +200 56 88 248 248 248 -248 112 120 +248 88 80 0 0 0 diff --git a/graphics/pokemon/leafeon/anim_front.png b/graphics/pokemon/leafeon/anim_front.png index d6b2958d4..b3e39fc61 100644 Binary files a/graphics/pokemon/leafeon/anim_front.png and b/graphics/pokemon/leafeon/anim_front.png differ diff --git a/graphics/pokemon/leafeon/front.png b/graphics/pokemon/leafeon/front.png index 9d6026250..7ea19f1b5 100644 Binary files a/graphics/pokemon/leafeon/front.png and b/graphics/pokemon/leafeon/front.png differ diff --git a/graphics/pokemon/leafeon/normal.pal b/graphics/pokemon/leafeon/normal.pal index d5c2bf08c..8ebfc35cf 100644 --- a/graphics/pokemon/leafeon/normal.pal +++ b/graphics/pokemon/leafeon/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 0 176 232 -56 112 80 -128 200 152 -80 160 112 +48 96 88 +104 184 136 +48 152 112 16 16 16 -104 64 24 -176 104 32 +88 64 32 +144 96 48 56 40 24 -88 88 64 -128 160 112 -248 224 160 -208 176 120 -128 104 72 -176 152 104 +96 80 64 +136 168 120 +232 208 152 +208 176 112 +128 104 64 +184 144 96 232 248 248 -0 0 0 +64 56 64 diff --git a/graphics/pokemon/leavanny/anim_front.png b/graphics/pokemon/leavanny/anim_front.png index f39280c35..103cdd860 100644 Binary files a/graphics/pokemon/leavanny/anim_front.png and b/graphics/pokemon/leavanny/anim_front.png differ diff --git a/graphics/pokemon/leavanny/front.png b/graphics/pokemon/leavanny/front.png index 109dbfd7f..fe45f277d 100644 Binary files a/graphics/pokemon/leavanny/front.png and b/graphics/pokemon/leavanny/front.png differ diff --git a/graphics/pokemon/leavanny/normal.pal b/graphics/pokemon/leavanny/normal.pal index 2c0b25863..51a8d96f7 100644 --- a/graphics/pokemon/leavanny/normal.pal +++ b/graphics/pokemon/leavanny/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -16 16 16 -128 112 24 -248 224 96 -72 96 48 -136 192 64 -104 144 56 -248 232 160 -128 56 48 -248 248 248 -248 80 72 -192 168 72 -8 56 8 -48 104 48 -64 136 56 +0 0 0 +136 120 16 +248 240 32 +64 96 48 +120 200 8 +88 152 48 +248 248 152 +128 48 64 +248 248 248 +248 48 72 +184 168 16 +16 64 56 +24 112 72 +40 152 80 0 0 0 diff --git a/graphics/pokemon/ledian/anim_front.png b/graphics/pokemon/ledian/anim_front.png index a6121329b..57d90f93b 100644 Binary files a/graphics/pokemon/ledian/anim_front.png and b/graphics/pokemon/ledian/anim_front.png differ diff --git a/graphics/pokemon/ledian/front.png b/graphics/pokemon/ledian/front.png index 0c67c611f..a51f2884e 100644 Binary files a/graphics/pokemon/ledian/front.png and b/graphics/pokemon/ledian/front.png differ diff --git a/graphics/pokemon/ledian/normal.pal b/graphics/pokemon/ledian/normal.pal index 782d0bea6..370e37e2c 100644 --- a/graphics/pokemon/ledian/normal.pal +++ b/graphics/pokemon/ledian/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -64 64 64 -168 32 56 -248 112 136 -104 8 24 -232 56 88 -16 48 88 +80 80 80 +192 56 88 +248 128 128 +112 32 16 +248 72 64 +0 64 112 248 248 248 -32 104 160 -176 184 176 -136 128 88 -192 168 104 -248 224 136 -224 232 224 -64 64 64 +0 128 184 +176 176 176 +160 120 0 +200 176 56 +240 224 112 +208 208 208 +80 80 80 diff --git a/graphics/pokemon/ledyba/anim_front.png b/graphics/pokemon/ledyba/anim_front.png index 8e279aac9..38bdd1df2 100644 Binary files a/graphics/pokemon/ledyba/anim_front.png and b/graphics/pokemon/ledyba/anim_front.png differ diff --git a/graphics/pokemon/ledyba/front.png b/graphics/pokemon/ledyba/front.png index 0f9954371..10e52bbc7 100644 Binary files a/graphics/pokemon/ledyba/front.png and b/graphics/pokemon/ledyba/front.png differ diff --git a/graphics/pokemon/ledyba/normal.pal b/graphics/pokemon/ledyba/normal.pal index 0d2673a79..eb13383da 100644 --- a/graphics/pokemon/ledyba/normal.pal +++ b/graphics/pokemon/ledyba/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -88 88 88 -96 40 24 -176 80 48 -248 112 56 -240 168 112 +88 80 80 +104 40 24 +176 64 48 +240 88 24 +248 152 32 208 200 200 248 248 248 168 160 160 -208 184 120 -248 224 144 -248 240 176 -128 112 72 -96 128 192 -80 80 112 +208 176 120 +248 224 152 +248 248 184 +160 120 0 +104 96 176 +72 48 112 diff --git a/graphics/pokemon/lickilicky/anim_front.png b/graphics/pokemon/lickilicky/anim_front.png index 4583e6786..38f23ec49 100644 Binary files a/graphics/pokemon/lickilicky/anim_front.png and b/graphics/pokemon/lickilicky/anim_front.png differ diff --git a/graphics/pokemon/lickilicky/front.png b/graphics/pokemon/lickilicky/front.png index e13d04878..e9905f1a6 100644 Binary files a/graphics/pokemon/lickilicky/front.png and b/graphics/pokemon/lickilicky/front.png differ diff --git a/graphics/pokemon/lickilicky/normal.pal b/graphics/pokemon/lickilicky/normal.pal index f2b0888bc..b97fcd3ec 100644 --- a/graphics/pokemon/lickilicky/normal.pal +++ b/graphics/pokemon/lickilicky/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 72 96 -176 96 112 +144 64 96 +184 80 112 248 160 176 -224 120 144 +224 112 144 16 16 16 -88 48 56 +96 40 56 248 248 248 -128 64 64 -232 128 128 -176 96 96 -240 176 160 -200 184 176 -152 128 120 -240 208 96 -192 160 56 +144 56 64 +240 120 88 +192 88 88 +248 176 136 +208 200 216 +136 136 168 +248 224 120 +200 168 72 diff --git a/graphics/pokemon/lickitung/anim_front.png b/graphics/pokemon/lickitung/anim_front.png index f9fc845b5..1a6c1aa9c 100644 Binary files a/graphics/pokemon/lickitung/anim_front.png and b/graphics/pokemon/lickitung/anim_front.png differ diff --git a/graphics/pokemon/lickitung/front.png b/graphics/pokemon/lickitung/front.png index 6fe4a06ad..6a7177e79 100644 Binary files a/graphics/pokemon/lickitung/front.png and b/graphics/pokemon/lickitung/front.png differ diff --git a/graphics/pokemon/lickitung/normal.pal b/graphics/pokemon/lickitung/normal.pal index 71caa52c5..520baee77 100644 --- a/graphics/pokemon/lickitung/normal.pal +++ b/graphics/pokemon/lickitung/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -144 88 104 -88 56 72 -208 128 136 -248 160 176 +176 64 80 +120 24 16 +232 112 136 +248 152 168 248 248 248 -248 184 200 +248 200 208 200 192 200 -216 192 144 +224 208 112 16 16 16 -152 88 104 -192 136 152 -240 184 200 -248 232 168 -112 104 80 +152 72 96 +208 136 168 +248 184 216 +248 248 176 +128 120 32 0 0 0 diff --git a/graphics/pokemon/liepard/anim_front.png b/graphics/pokemon/liepard/anim_front.png index e89dd63dc..ce2932e71 100644 Binary files a/graphics/pokemon/liepard/anim_front.png and b/graphics/pokemon/liepard/anim_front.png differ diff --git a/graphics/pokemon/liepard/front.png b/graphics/pokemon/liepard/front.png index 3d3962ead..2a9d2abca 100644 Binary files a/graphics/pokemon/liepard/front.png and b/graphics/pokemon/liepard/front.png differ diff --git a/graphics/pokemon/liepard/normal.pal b/graphics/pokemon/liepard/normal.pal index ef4c0822a..4e448f1b4 100644 --- a/graphics/pokemon/liepard/normal.pal +++ b/graphics/pokemon/liepard/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -80 64 104 +88 64 112 48 32 56 -112 80 144 +128 96 144 16 16 16 -152 64 80 -224 96 128 -200 152 64 +184 56 128 +224 120 152 +200 160 24 136 120 8 -248 200 88 +240 208 64 248 248 248 -40 112 48 +8 120 64 200 200 200 -80 64 24 -72 176 88 +88 80 16 +0 192 88 0 0 0 diff --git a/graphics/pokemon/lileep/anim_front.png b/graphics/pokemon/lileep/anim_front.png index 8845eb190..87ba440c2 100644 Binary files a/graphics/pokemon/lileep/anim_front.png and b/graphics/pokemon/lileep/anim_front.png differ diff --git a/graphics/pokemon/lileep/front.png b/graphics/pokemon/lileep/front.png index d934bde9c..21f36a6ea 100644 Binary files a/graphics/pokemon/lileep/front.png and b/graphics/pokemon/lileep/front.png differ diff --git a/graphics/pokemon/lileep/normal.pal b/graphics/pokemon/lileep/normal.pal index 0d0f54a6c..0de38554e 100644 --- a/graphics/pokemon/lileep/normal.pal +++ b/graphics/pokemon/lileep/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -120 56 72 -240 176 184 -200 136 136 -176 96 112 -72 48 112 -112 96 160 -8 8 8 -64 64 72 -88 72 48 -240 216 128 -184 152 96 -152 128 200 -184 168 216 -120 56 72 +128 56 88 +232 168 176 +200 112 144 +184 80 128 +96 56 128 +112 96 176 0 0 0 +56 56 64 +104 80 32 +232 208 96 +208 160 48 +152 128 200 +176 168 224 +112 112 112 +128 56 88 diff --git a/graphics/pokemon/lilligant/anim_front.png b/graphics/pokemon/lilligant/anim_front.png index 064196051..0c8a907e7 100644 Binary files a/graphics/pokemon/lilligant/anim_front.png and b/graphics/pokemon/lilligant/anim_front.png differ diff --git a/graphics/pokemon/lilligant/front.png b/graphics/pokemon/lilligant/front.png index bceb122ba..170a97c17 100644 Binary files a/graphics/pokemon/lilligant/front.png and b/graphics/pokemon/lilligant/front.png differ diff --git a/graphics/pokemon/lilligant/normal.pal b/graphics/pokemon/lilligant/normal.pal index 07030e321..0f90d8380 100644 --- a/graphics/pokemon/lilligant/normal.pal +++ b/graphics/pokemon/lilligant/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -96 64 16 -224 120 64 -160 88 56 -168 144 64 -232 208 72 -32 64 32 -48 120 48 +112 64 32 +248 104 56 +184 96 56 +184 160 80 +248 216 64 +48 88 48 +72 128 72 248 176 152 248 248 248 -64 176 64 -56 80 32 -176 224 120 -128 160 96 -184 168 168 +56 168 56 +80 96 40 +192 232 120 +152 176 96 +200 192 184 diff --git a/graphics/pokemon/lillipup/anim_front.png b/graphics/pokemon/lillipup/anim_front.png index 5c3be492e..0a68cc533 100644 Binary files a/graphics/pokemon/lillipup/anim_front.png and b/graphics/pokemon/lillipup/anim_front.png differ diff --git a/graphics/pokemon/lillipup/front.png b/graphics/pokemon/lillipup/front.png index 5e7b88b3e..50bf52ed1 100644 Binary files a/graphics/pokemon/lillipup/front.png and b/graphics/pokemon/lillipup/front.png differ diff --git a/graphics/pokemon/lillipup/normal.pal b/graphics/pokemon/lillipup/normal.pal index cc49552dd..37d2ca02b 100644 --- a/graphics/pokemon/lillipup/normal.pal +++ b/graphics/pokemon/lillipup/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -160 96 72 -216 136 96 -80 48 48 -16 16 16 -248 208 136 -96 80 56 -176 144 96 +144 88 64 +216 144 88 +72 48 16 +0 0 0 +232 200 144 +96 72 24 +176 136 72 200 200 200 -56 56 56 -88 88 80 +56 64 72 +80 88 112 248 248 248 -24 24 24 -232 96 88 -56 72 120 -40 48 72 +40 40 40 +216 88 88 +144 88 64 +0 0 0 diff --git a/graphics/pokemon/linoone/anim_front.png b/graphics/pokemon/linoone/anim_front.png index e5d8553a0..f2882dd04 100644 Binary files a/graphics/pokemon/linoone/anim_front.png and b/graphics/pokemon/linoone/anim_front.png differ diff --git a/graphics/pokemon/linoone/front.png b/graphics/pokemon/linoone/front.png index abbcda76a..955510bdd 100644 Binary files a/graphics/pokemon/linoone/front.png and b/graphics/pokemon/linoone/front.png differ diff --git a/graphics/pokemon/linoone/normal.pal b/graphics/pokemon/linoone/normal.pal index b9225a728..4f2dce5d1 100644 --- a/graphics/pokemon/linoone/normal.pal +++ b/graphics/pokemon/linoone/normal.pal @@ -3,11 +3,11 @@ JASC-PAL 16 152 208 160 88 80 72 -136 104 80 -160 128 112 +128 104 88 +160 136 120 184 160 144 216 200 184 -96 72 56 +88 72 56 24 24 24 144 128 120 48 120 152 diff --git a/graphics/pokemon/litwick/anim_front.png b/graphics/pokemon/litwick/anim_front.png index 9fdac284a..10189cd52 100644 Binary files a/graphics/pokemon/litwick/anim_front.png and b/graphics/pokemon/litwick/anim_front.png differ diff --git a/graphics/pokemon/litwick/front.png b/graphics/pokemon/litwick/front.png index 184132b93..e0b19ccb6 100644 Binary files a/graphics/pokemon/litwick/front.png and b/graphics/pokemon/litwick/front.png differ diff --git a/graphics/pokemon/litwick/normal.pal b/graphics/pokemon/litwick/normal.pal index 79059ac37..0169128b2 100644 --- a/graphics/pokemon/litwick/normal.pal +++ b/graphics/pokemon/litwick/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -64 56 112 -104 104 184 +56 40 112 +112 80 224 152 136 224 -168 192 224 -16 16 16 -88 104 128 +192 184 240 +0 0 0 +112 112 112 248 248 248 -168 184 224 -224 232 248 -136 128 56 -248 208 56 -168 184 224 +200 192 200 +224 224 248 +120 104 8 +248 224 32 +0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/lombre/anim_front.png b/graphics/pokemon/lombre/anim_front.png index de10b0b67..cb0fef9c4 100644 Binary files a/graphics/pokemon/lombre/anim_front.png and b/graphics/pokemon/lombre/anim_front.png differ diff --git a/graphics/pokemon/lombre/front.png b/graphics/pokemon/lombre/front.png index ee45798f2..022c1c008 100644 Binary files a/graphics/pokemon/lombre/front.png and b/graphics/pokemon/lombre/front.png differ diff --git a/graphics/pokemon/lombre/normal.pal b/graphics/pokemon/lombre/normal.pal index 8b0be5823..c8271ae00 100644 --- a/graphics/pokemon/lombre/normal.pal +++ b/graphics/pokemon/lombre/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 248 192 8 -48 80 32 -16 16 16 -80 152 40 -120 176 56 -168 208 112 -248 248 248 -128 136 152 -72 136 112 -128 184 160 -152 48 56 -216 96 96 -240 128 136 -176 224 200 +65 82 32 +0 0 0 +106 139 57 +139 172 57 +172 213 98 +255 255 255 +131 139 156 +74 148 98 +123 189 156 +148 49 65 +205 65 98 +255 115 148 +172 222 180 0 0 0 0 0 0 diff --git a/graphics/pokemon/lopunny/anim_front.png b/graphics/pokemon/lopunny/anim_front.png index 96be9f7c1..5bef71243 100644 Binary files a/graphics/pokemon/lopunny/anim_front.png and b/graphics/pokemon/lopunny/anim_front.png differ diff --git a/graphics/pokemon/lopunny/front.png b/graphics/pokemon/lopunny/front.png index d039dceaf..44e188d0f 100644 Binary files a/graphics/pokemon/lopunny/front.png and b/graphics/pokemon/lopunny/front.png differ diff --git a/graphics/pokemon/lopunny/normal.pal b/graphics/pokemon/lopunny/normal.pal index 490c6c38d..712971742 100644 --- a/graphics/pokemon/lopunny/normal.pal +++ b/graphics/pokemon/lopunny/normal.pal @@ -5,15 +5,15 @@ JASC-PAL 120 112 80 248 224 160 16 16 16 -80 56 48 -176 120 88 -136 88 56 +80 56 56 +176 120 72 +136 88 64 120 56 64 192 168 112 -176 96 104 +192 88 120 96 72 64 248 248 248 -224 120 136 +208 120 152 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/lotad/anim_front.png b/graphics/pokemon/lotad/anim_front.png index 1bec5a74a..cadc74768 100644 Binary files a/graphics/pokemon/lotad/anim_front.png and b/graphics/pokemon/lotad/anim_front.png differ diff --git a/graphics/pokemon/lotad/front.png b/graphics/pokemon/lotad/front.png index 2cec3a677..efc92a04b 100644 Binary files a/graphics/pokemon/lotad/front.png and b/graphics/pokemon/lotad/front.png differ diff --git a/graphics/pokemon/lotad/normal.pal b/graphics/pokemon/lotad/normal.pal index ef3049e58..8387dd97a 100644 --- a/graphics/pokemon/lotad/normal.pal +++ b/graphics/pokemon/lotad/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 208 216 216 -32 80 48 -16 16 16 -96 184 128 -64 112 80 -64 152 96 -56 96 120 -48 144 176 -136 208 136 -200 176 104 +48 80 24 +0 0 0 +96 176 104 +48 120 64 +56 144 56 +56 80 104 +48 128 160 +128 200 120 +216 176 56 144 120 64 -120 184 216 +96 152 216 248 248 248 144 176 216 -248 224 128 +248 216 120 0 0 0 diff --git a/graphics/pokemon/loudred/anim_front.png b/graphics/pokemon/loudred/anim_front.png index ca1ecbb14..71912b382 100644 Binary files a/graphics/pokemon/loudred/anim_front.png and b/graphics/pokemon/loudred/anim_front.png differ diff --git a/graphics/pokemon/loudred/front.png b/graphics/pokemon/loudred/front.png index 84e93592d..29c1e1baf 100644 Binary files a/graphics/pokemon/loudred/front.png and b/graphics/pokemon/loudred/front.png differ diff --git a/graphics/pokemon/loudred/normal.pal b/graphics/pokemon/loudred/normal.pal index 44ef7c24a..d45bbf076 100644 --- a/graphics/pokemon/loudred/normal.pal +++ b/graphics/pokemon/loudred/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -88 96 152 -168 168 216 -48 56 88 -128 128 192 -16 16 16 -152 64 112 -184 104 144 -224 152 184 +112 96 144 +176 168 224 +64 64 104 +128 128 184 +0 0 0 +136 48 88 +192 72 128 +208 112 176 248 248 248 200 200 200 -136 112 56 -208 176 96 -248 224 136 -96 40 72 +152 120 48 +208 168 48 +248 216 112 +96 40 64 112 112 112 diff --git a/graphics/pokemon/lucario/anim_front.png b/graphics/pokemon/lucario/anim_front.png index 821008a00..3425fd37b 100644 Binary files a/graphics/pokemon/lucario/anim_front.png and b/graphics/pokemon/lucario/anim_front.png differ diff --git a/graphics/pokemon/lucario/front.png b/graphics/pokemon/lucario/front.png index 464c51971..c4b7a41c2 100644 Binary files a/graphics/pokemon/lucario/front.png and b/graphics/pokemon/lucario/front.png differ diff --git a/graphics/pokemon/lucario/normal.pal b/graphics/pokemon/lucario/normal.pal index b86db220c..87be39f7a 100644 --- a/graphics/pokemon/lucario/normal.pal +++ b/graphics/pokemon/lucario/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -40 64 80 -88 160 192 +16 72 120 +72 152 232 16 16 16 -64 112 136 +40 112 152 56 48 48 -80 80 80 -128 128 120 -200 200 200 -232 64 64 +88 88 88 +128 128 128 +208 208 208 +216 64 64 248 248 248 -160 144 96 +224 224 152 72 64 32 -248 216 144 -178 107 124 +176 176 96 +160 48 48 0 0 0 diff --git a/graphics/pokemon/ludicolo/anim_front.png b/graphics/pokemon/ludicolo/anim_front.png index 9da05f6e9..2796df8df 100644 Binary files a/graphics/pokemon/ludicolo/anim_front.png and b/graphics/pokemon/ludicolo/anim_front.png differ diff --git a/graphics/pokemon/ludicolo/front.png b/graphics/pokemon/ludicolo/front.png index 8adc45edb..98ac42818 100644 Binary files a/graphics/pokemon/ludicolo/front.png and b/graphics/pokemon/ludicolo/front.png differ diff --git a/graphics/pokemon/ludicolo/normal.pal b/graphics/pokemon/ludicolo/normal.pal index d272de6a2..4fa18931a 100644 --- a/graphics/pokemon/ludicolo/normal.pal +++ b/graphics/pokemon/ludicolo/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 192 192 240 -16 16 16 -120 96 80 -248 224 160 -184 160 120 -224 200 128 -128 144 72 -80 96 48 -160 136 112 -200 232 168 -144 192 96 -176 224 120 +0 0 0 +120 104 88 +248 240 144 +200 192 128 +232 224 152 +112 144 88 +72 104 72 +168 136 104 +200 248 136 +152 192 96 +168 224 112 248 248 248 240 168 120 -136 72 88 -208 136 160 +160 72 72 +224 120 160 diff --git a/graphics/pokemon/lugia/anim_front.png b/graphics/pokemon/lugia/anim_front.png index f3432c3fc..fbe467fb6 100644 Binary files a/graphics/pokemon/lugia/anim_front.png and b/graphics/pokemon/lugia/anim_front.png differ diff --git a/graphics/pokemon/lugia/front.png b/graphics/pokemon/lugia/front.png index 5ce94a1d0..124a6f626 100644 Binary files a/graphics/pokemon/lugia/front.png and b/graphics/pokemon/lugia/front.png differ diff --git a/graphics/pokemon/lugia/normal.pal b/graphics/pokemon/lugia/normal.pal index 7611934fb..ff5f67433 100644 --- a/graphics/pokemon/lugia/normal.pal +++ b/graphics/pokemon/lugia/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 160 192 -80 88 112 +152 168 224 +96 112 120 248 248 248 16 16 16 -216 216 248 -40 48 112 -64 88 168 +208 224 240 +40 48 136 +80 88 168 176 192 240 -96 120 192 -176 200 248 -136 152 232 -200 112 112 -104 72 112 -80 112 192 -32 80 128 +128 128 192 +168 184 232 +112 136 232 +232 144 144 +176 64 80 +80 120 184 +0 64 128 diff --git a/graphics/pokemon/lumineon/anim_front.png b/graphics/pokemon/lumineon/anim_front.png index b177ef90e..29ef5dd7b 100644 Binary files a/graphics/pokemon/lumineon/anim_front.png and b/graphics/pokemon/lumineon/anim_front.png differ diff --git a/graphics/pokemon/lumineon/front.png b/graphics/pokemon/lumineon/front.png index 9ba9095e3..3aae9837f 100644 Binary files a/graphics/pokemon/lumineon/front.png and b/graphics/pokemon/lumineon/front.png differ diff --git a/graphics/pokemon/lumineon/normal.pal b/graphics/pokemon/lumineon/normal.pal index cc07c568e..d7dbfc5ca 100644 --- a/graphics/pokemon/lumineon/normal.pal +++ b/graphics/pokemon/lumineon/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -80 120 120 +80 104 136 16 16 16 -216 240 224 -144 224 216 -104 160 160 -48 72 80 -32 48 48 -136 56 96 -208 88 144 +192 224 240 +144 208 224 +112 144 168 +48 64 88 +40 40 56 +112 64 120 +192 72 144 232 248 248 -32 48 48 +40 40 56 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/lunatone/anim_front.png b/graphics/pokemon/lunatone/anim_front.png index fd0a0896d..20b840401 100644 Binary files a/graphics/pokemon/lunatone/anim_front.png and b/graphics/pokemon/lunatone/anim_front.png differ diff --git a/graphics/pokemon/lunatone/front.png b/graphics/pokemon/lunatone/front.png index 0d15a6f5b..279f1578d 100644 Binary files a/graphics/pokemon/lunatone/front.png and b/graphics/pokemon/lunatone/front.png differ diff --git a/graphics/pokemon/lunatone/normal.pal b/graphics/pokemon/lunatone/normal.pal index 669f1764f..e3819cbc3 100644 --- a/graphics/pokemon/lunatone/normal.pal +++ b/graphics/pokemon/lunatone/normal.pal @@ -2,16 +2,16 @@ JASC-PAL 0100 16 152 208 160 -176 160 112 -144 128 88 -232 216 168 -112 104 56 -208 192 128 -72 64 64 +176 160 80 +144 128 56 +232 216 136 +128 104 64 +200 184 104 +56 64 56 16 16 16 -160 56 64 -224 128 136 -200 88 96 +128 16 40 +208 88 112 +176 32 56 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/luvdisc/anim_front.png b/graphics/pokemon/luvdisc/anim_front.png index 0d94cb274..631ab8f09 100644 Binary files a/graphics/pokemon/luvdisc/anim_front.png and b/graphics/pokemon/luvdisc/anim_front.png differ diff --git a/graphics/pokemon/luvdisc/front.png b/graphics/pokemon/luvdisc/front.png index fe0d78bde..24ac5a6f9 100644 Binary files a/graphics/pokemon/luvdisc/front.png and b/graphics/pokemon/luvdisc/front.png differ diff --git a/graphics/pokemon/luvdisc/normal.pal b/graphics/pokemon/luvdisc/normal.pal index 63040db66..cb3de3258 100644 --- a/graphics/pokemon/luvdisc/normal.pal +++ b/graphics/pokemon/luvdisc/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -160 80 88 -112 48 48 -248 184 184 -16 16 16 -248 152 160 -232 120 136 -192 136 136 -24 64 112 +160 104 80 +112 56 48 +248 192 208 +0 0 0 +240 144 176 +224 112 152 +192 112 136 +48 72 168 248 248 248 -40 96 160 -232 192 192 -232 152 152 +40 88 240 +224 168 216 +240 128 192 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/luxio/anim_front.png b/graphics/pokemon/luxio/anim_front.png index 52d080c68..8b9ffd233 100644 Binary files a/graphics/pokemon/luxio/anim_front.png and b/graphics/pokemon/luxio/anim_front.png differ diff --git a/graphics/pokemon/luxio/front.png b/graphics/pokemon/luxio/front.png index 262b34256..f8a883afc 100644 Binary files a/graphics/pokemon/luxio/front.png and b/graphics/pokemon/luxio/front.png differ diff --git a/graphics/pokemon/luxio/normal.pal b/graphics/pokemon/luxio/normal.pal index f9d318695..54698e4f4 100644 --- a/graphics/pokemon/luxio/normal.pal +++ b/graphics/pokemon/luxio/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 88 32 -248 184 48 -184 136 32 +112 96 80 +248 224 88 +176 152 88 16 16 16 -40 40 40 -72 64 72 -96 96 104 -48 80 104 -120 184 208 -80 128 144 +48 48 64 +72 72 96 +96 96 120 +72 72 112 +120 168 240 +96 120 176 248 248 248 -184 56 48 -216 96 88 -165 104 134 +144 56 80 +224 72 80 +168 56 80 0 0 0 diff --git a/graphics/pokemon/luxray/anim_front.png b/graphics/pokemon/luxray/anim_front.png index ba7dd2239..93a073ce4 100644 Binary files a/graphics/pokemon/luxray/anim_front.png and b/graphics/pokemon/luxray/anim_front.png differ diff --git a/graphics/pokemon/luxray/front.png b/graphics/pokemon/luxray/front.png index 7e097b93b..12381ea36 100644 Binary files a/graphics/pokemon/luxray/front.png and b/graphics/pokemon/luxray/front.png differ diff --git a/graphics/pokemon/luxray/normal.pal b/graphics/pokemon/luxray/normal.pal index c45620af9..302dceb37 100644 --- a/graphics/pokemon/luxray/normal.pal +++ b/graphics/pokemon/luxray/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -104 88 32 -248 192 40 +112 96 80 +248 224 88 16 16 16 -48 40 40 -96 96 104 -184 136 24 -72 64 72 -88 136 152 -104 184 208 -216 64 56 -152 48 40 -48 88 96 -117 80 103 -248 248 248 +48 48 64 +96 96 120 +176 152 88 +72 72 96 +96 120 176 +120 168 240 +224 72 80 +144 56 80 +72 72 112 +168 56 80 +0 0 0 0 0 0 diff --git a/graphics/pokemon/machamp/anim_front.png b/graphics/pokemon/machamp/anim_front.png index f14f25261..3bc4a8594 100644 Binary files a/graphics/pokemon/machamp/anim_front.png and b/graphics/pokemon/machamp/anim_front.png differ diff --git a/graphics/pokemon/machamp/front.png b/graphics/pokemon/machamp/front.png index b93e9b299..d0aced4d2 100644 Binary files a/graphics/pokemon/machamp/front.png and b/graphics/pokemon/machamp/front.png differ diff --git a/graphics/pokemon/machamp/normal.pal b/graphics/pokemon/machamp/normal.pal index 819376de5..024d63ca6 100644 --- a/graphics/pokemon/machamp/normal.pal +++ b/graphics/pokemon/machamp/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -64 72 96 -112 128 152 -152 176 208 -8 8 8 -104 96 80 -224 200 192 -160 144 128 -168 64 48 +80 80 104 +120 136 160 +144 176 192 +0 0 0 +112 96 72 +232 208 184 +176 160 128 +184 0 0 248 248 248 -120 104 56 -240 224 152 -88 72 32 -200 184 128 -200 136 160 -160 72 112 +128 112 40 +240 232 152 +80 64 0 +200 192 96 +224 80 56 +168 48 16 diff --git a/graphics/pokemon/machoke/anim_front.png b/graphics/pokemon/machoke/anim_front.png index 19b90e39d..c8c9f731e 100644 Binary files a/graphics/pokemon/machoke/anim_front.png and b/graphics/pokemon/machoke/anim_front.png differ diff --git a/graphics/pokemon/machoke/front.png b/graphics/pokemon/machoke/front.png index d07d6b2e9..0b84d0621 100644 Binary files a/graphics/pokemon/machoke/front.png and b/graphics/pokemon/machoke/front.png differ diff --git a/graphics/pokemon/machoke/normal.pal b/graphics/pokemon/machoke/normal.pal index 969e84c08..ab90d151b 100644 --- a/graphics/pokemon/machoke/normal.pal +++ b/graphics/pokemon/machoke/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -96 88 72 +112 96 72 16 16 16 -216 184 168 -160 144 128 -112 120 152 -152 160 200 -56 64 104 -176 184 224 -192 56 80 +232 208 184 +176 160 128 +120 136 160 +144 176 192 +72 72 96 +168 200 216 +192 16 16 248 248 248 -216 120 136 +224 80 56 240 224 120 72 72 96 200 176 96 diff --git a/graphics/pokemon/machop/anim_front.png b/graphics/pokemon/machop/anim_front.png index 04f4710f1..2c1f083ae 100644 Binary files a/graphics/pokemon/machop/anim_front.png and b/graphics/pokemon/machop/anim_front.png differ diff --git a/graphics/pokemon/machop/front.png b/graphics/pokemon/machop/front.png index 5622c5cda..b94735495 100644 Binary files a/graphics/pokemon/machop/front.png and b/graphics/pokemon/machop/front.png differ diff --git a/graphics/pokemon/machop/normal.pal b/graphics/pokemon/machop/normal.pal index 7b6e3f252..2f6bba75b 100644 --- a/graphics/pokemon/machop/normal.pal +++ b/graphics/pokemon/machop/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -104 96 80 -224 200 192 -160 144 128 -200 176 160 +104 80 32 +240 232 136 +168 152 88 +200 184 96 16 16 16 -144 192 208 +144 192 192 80 120 120 -192 216 224 -40 64 72 +168 216 200 +40 72 80 248 248 248 -248 128 136 -152 56 56 -112 152 168 -200 112 144 -216 152 192 +232 72 72 +176 0 0 +112 160 160 +240 80 80 +248 128 144 diff --git a/graphics/pokemon/magby/anim_front.png b/graphics/pokemon/magby/anim_front.png index 46f2849b7..19c543b8b 100644 Binary files a/graphics/pokemon/magby/anim_front.png and b/graphics/pokemon/magby/anim_front.png differ diff --git a/graphics/pokemon/magby/front.png b/graphics/pokemon/magby/front.png index edfea5d28..389af0d03 100644 Binary files a/graphics/pokemon/magby/front.png and b/graphics/pokemon/magby/front.png differ diff --git a/graphics/pokemon/magby/normal.pal b/graphics/pokemon/magby/normal.pal index dc9714179..2fe14eed8 100644 --- a/graphics/pokemon/magby/normal.pal +++ b/graphics/pokemon/magby/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -192 80 80 -128 56 64 -232 120 120 +216 56 56 +144 48 32 +240 104 104 16 16 16 192 192 192 248 248 248 -112 104 96 +112 112 120 248 248 176 -184 168 80 -240 224 120 -120 104 40 +224 184 48 +248 232 72 +152 112 0 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/magcargo/anim_front.png b/graphics/pokemon/magcargo/anim_front.png index ea7eb07a5..5d7450fab 100644 Binary files a/graphics/pokemon/magcargo/anim_front.png and b/graphics/pokemon/magcargo/anim_front.png differ diff --git a/graphics/pokemon/magcargo/front.png b/graphics/pokemon/magcargo/front.png index ba4a5b0f1..dda50c3f8 100644 Binary files a/graphics/pokemon/magcargo/front.png and b/graphics/pokemon/magcargo/front.png differ diff --git a/graphics/pokemon/magcargo/normal.pal b/graphics/pokemon/magcargo/normal.pal index 077ffed5b..a5b183240 100644 --- a/graphics/pokemon/magcargo/normal.pal +++ b/graphics/pokemon/magcargo/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -176 56 56 -232 72 72 -200 184 88 -248 232 152 -112 24 16 -88 96 136 -48 56 80 +184 48 40 +232 64 64 +232 184 8 +248 232 120 +144 32 0 +96 104 144 +56 64 88 16 16 16 -112 136 176 -144 112 40 -168 184 216 -168 104 56 -248 144 120 -240 104 24 -144 56 32 +120 136 176 +200 104 40 +168 176 200 +160 104 88 +248 128 112 +248 128 112 +144 32 0 diff --git a/graphics/pokemon/magikarp/anim_front.png b/graphics/pokemon/magikarp/anim_front.png index e137bed53..42dc57805 100644 Binary files a/graphics/pokemon/magikarp/anim_front.png and b/graphics/pokemon/magikarp/anim_front.png differ diff --git a/graphics/pokemon/magikarp/front.png b/graphics/pokemon/magikarp/front.png index ecbf65c5b..aea8a95eb 100644 Binary files a/graphics/pokemon/magikarp/front.png and b/graphics/pokemon/magikarp/front.png differ diff --git a/graphics/pokemon/magikarp/normal.pal b/graphics/pokemon/magikarp/normal.pal index 67f48c918..453ba5b1f 100644 --- a/graphics/pokemon/magikarp/normal.pal +++ b/graphics/pokemon/magikarp/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -128 88 56 -248 184 96 -184 64 48 -232 96 72 +120 96 80 +248 216 40 +184 32 80 +240 96 24 248 248 248 -96 80 80 -160 144 144 -128 24 8 -248 144 120 -16 16 16 -208 200 200 -192 128 128 -248 176 176 -136 80 88 -208 144 72 +80 80 96 +136 136 160 +128 0 64 +248 152 96 +0 0 0 +200 200 208 +224 136 160 +248 184 192 +184 56 56 +192 168 112 diff --git a/graphics/pokemon/magmar/anim_front.png b/graphics/pokemon/magmar/anim_front.png index f50d29b1f..4ea85a978 100644 Binary files a/graphics/pokemon/magmar/anim_front.png and b/graphics/pokemon/magmar/anim_front.png differ diff --git a/graphics/pokemon/magmar/front.png b/graphics/pokemon/magmar/front.png index 4b9790260..ec95e3e8f 100644 Binary files a/graphics/pokemon/magmar/front.png and b/graphics/pokemon/magmar/front.png differ diff --git a/graphics/pokemon/magmar/normal.pal b/graphics/pokemon/magmar/normal.pal index af613221e..c81dbd0e3 100644 --- a/graphics/pokemon/magmar/normal.pal +++ b/graphics/pokemon/magmar/normal.pal @@ -2,16 +2,16 @@ JASC-PAL 0100 16 152 208 160 -152 128 72 +192 120 16 120 80 48 -248 208 104 -200 160 80 -248 232 160 -232 88 40 +248 232 72 +224 184 48 +248 240 200 +248 72 48 16 16 16 -80 40 24 -168 72 40 -248 160 64 +104 32 32 +200 16 64 +248 136 96 64 72 88 248 248 248 248 192 152 diff --git a/graphics/pokemon/magmortar/anim_front.png b/graphics/pokemon/magmortar/anim_front.png index d49fea810..3f0531e11 100644 Binary files a/graphics/pokemon/magmortar/anim_front.png and b/graphics/pokemon/magmortar/anim_front.png differ diff --git a/graphics/pokemon/magmortar/front.png b/graphics/pokemon/magmortar/front.png index c367b03c6..38f46e85e 100644 Binary files a/graphics/pokemon/magmortar/front.png and b/graphics/pokemon/magmortar/front.png differ diff --git a/graphics/pokemon/magmortar/normal.pal b/graphics/pokemon/magmortar/normal.pal index ad6821883..3008ddcb6 100644 --- a/graphics/pokemon/magmortar/normal.pal +++ b/graphics/pokemon/magmortar/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 96 40 -248 192 80 -208 152 48 -192 64 40 -152 64 40 -232 112 80 -88 32 16 -216 80 48 +128 96 32 +248 192 56 +200 160 56 +208 48 48 +168 56 80 +240 96 48 +104 48 40 +224 64 48 16 16 16 -248 144 136 -72 64 64 -200 96 88 -216 200 192 -248 248 248 +248 144 160 +72 72 64 +192 88 104 200 208 224 +248 248 248 +0 0 0 diff --git a/graphics/pokemon/magnemite/anim_front.png b/graphics/pokemon/magnemite/anim_front.png index ff31f3a2e..96ddc9bc2 100644 Binary files a/graphics/pokemon/magnemite/anim_front.png and b/graphics/pokemon/magnemite/anim_front.png differ diff --git a/graphics/pokemon/magnemite/front.png b/graphics/pokemon/magnemite/front.png index 2a262e550..9a9148728 100644 Binary files a/graphics/pokemon/magnemite/front.png and b/graphics/pokemon/magnemite/front.png differ diff --git a/graphics/pokemon/magnemite/normal.pal b/graphics/pokemon/magnemite/normal.pal index b0e534a53..f67d59686 100644 --- a/graphics/pokemon/magnemite/normal.pal +++ b/graphics/pokemon/magnemite/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 136 136 136 -255 255 255 +232 248 248 208 208 208 80 72 72 16 16 16 56 48 48 -232 96 80 -136 40 32 +248 64 64 +192 32 32 128 168 184 192 224 232 64 96 112 -96 184 208 -32 112 152 +80 200 240 +40 128 168 168 168 168 -220 244 244 +232 248 248 diff --git a/graphics/pokemon/magneton/anim_front.png b/graphics/pokemon/magneton/anim_front.png index fcae6a5b0..9d36e2396 100644 Binary files a/graphics/pokemon/magneton/anim_front.png and b/graphics/pokemon/magneton/anim_front.png differ diff --git a/graphics/pokemon/magneton/front.png b/graphics/pokemon/magneton/front.png index 26a1f7f98..e0a94e0fb 100644 Binary files a/graphics/pokemon/magneton/front.png and b/graphics/pokemon/magneton/front.png differ diff --git a/graphics/pokemon/magneton/normal.pal b/graphics/pokemon/magneton/normal.pal index 81567fb71..8938cb90a 100644 --- a/graphics/pokemon/magneton/normal.pal +++ b/graphics/pokemon/magneton/normal.pal @@ -4,13 +4,13 @@ JASC-PAL 152 208 160 80 72 72 56 48 48 -232 96 80 +248 64 64 16 16 16 -136 40 32 +192 32 32 136 136 136 -96 184 208 +80 200 240 232 248 248 -32 112 152 +40 128 168 208 208 208 64 96 112 184 208 224 diff --git a/graphics/pokemon/magnezone/anim_front.png b/graphics/pokemon/magnezone/anim_front.png index 5025b27a9..c9230b368 100644 Binary files a/graphics/pokemon/magnezone/anim_front.png and b/graphics/pokemon/magnezone/anim_front.png differ diff --git a/graphics/pokemon/magnezone/front.png b/graphics/pokemon/magnezone/front.png index a39214b39..1a2b3ff38 100644 Binary files a/graphics/pokemon/magnezone/front.png and b/graphics/pokemon/magnezone/front.png differ diff --git a/graphics/pokemon/magnezone/normal.pal b/graphics/pokemon/magnezone/normal.pal index 7c2a64fd5..f90827017 100644 --- a/graphics/pokemon/magnezone/normal.pal +++ b/graphics/pokemon/magnezone/normal.pal @@ -14,6 +14,6 @@ JASC-PAL 128 160 176 208 232 232 72 104 136 -248 120 112 -208 64 64 -72 184 224 +248 64 64 +192 32 32 +80 200 240 diff --git a/graphics/pokemon/makuhita/anim_front.png b/graphics/pokemon/makuhita/anim_front.png index 67ab86958..aca8179e6 100644 Binary files a/graphics/pokemon/makuhita/anim_front.png and b/graphics/pokemon/makuhita/anim_front.png differ diff --git a/graphics/pokemon/makuhita/front.png b/graphics/pokemon/makuhita/front.png index bba80cbf8..438ac8283 100644 Binary files a/graphics/pokemon/makuhita/front.png and b/graphics/pokemon/makuhita/front.png differ diff --git a/graphics/pokemon/makuhita/normal.pal b/graphics/pokemon/makuhita/normal.pal index 3247e3e1a..a12e77f50 100644 --- a/graphics/pokemon/makuhita/normal.pal +++ b/graphics/pokemon/makuhita/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 96 48 -248 216 120 +120 88 56 +248 216 104 16 16 16 -208 176 104 -248 232 168 +216 176 96 +248 232 136 232 192 112 -152 128 72 -224 136 136 -192 104 104 +160 128 64 +216 104 136 +192 72 120 152 80 64 -112 120 128 -72 72 88 -40 48 56 +120 120 120 +80 80 80 +56 64 64 0 0 0 0 0 0 diff --git a/graphics/pokemon/mamoswine/anim_front.png b/graphics/pokemon/mamoswine/anim_front.png index efbfbfd7a..dd42d13b6 100644 Binary files a/graphics/pokemon/mamoswine/anim_front.png and b/graphics/pokemon/mamoswine/anim_front.png differ diff --git a/graphics/pokemon/mamoswine/front.png b/graphics/pokemon/mamoswine/front.png index 95cf6118e..2b7945603 100644 Binary files a/graphics/pokemon/mamoswine/front.png and b/graphics/pokemon/mamoswine/front.png differ diff --git a/graphics/pokemon/mamoswine/normal.pal b/graphics/pokemon/mamoswine/normal.pal index b6f1be665..edd63691f 100644 --- a/graphics/pokemon/mamoswine/normal.pal +++ b/graphics/pokemon/mamoswine/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 72 48 -168 120 72 -64 48 24 -240 232 232 -48 40 40 -48 112 120 -152 136 136 -208 192 184 -80 176 184 +112 72 64 +152 104 72 +64 48 48 +248 248 248 +56 48 48 +64 88 136 +136 136 144 +184 184 192 +80 144 192 8 16 8 96 80 80 -240 208 160 -224 160 168 -160 112 112 -200 160 120 +224 216 168 +224 144 184 +160 96 120 +176 160 128 diff --git a/graphics/pokemon/manaphy/anim_front.png b/graphics/pokemon/manaphy/anim_front.png index 91d1cf799..b9934eee7 100644 Binary files a/graphics/pokemon/manaphy/anim_front.png and b/graphics/pokemon/manaphy/anim_front.png differ diff --git a/graphics/pokemon/manaphy/front.png b/graphics/pokemon/manaphy/front.png index 141d5ac17..ed6a5e4b2 100644 Binary files a/graphics/pokemon/manaphy/front.png and b/graphics/pokemon/manaphy/front.png differ diff --git a/graphics/pokemon/manaphy/normal.pal b/graphics/pokemon/manaphy/normal.pal index d10258796..ff28c82cc 100644 --- a/graphics/pokemon/manaphy/normal.pal +++ b/graphics/pokemon/manaphy/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -64 160 184 -96 200 224 -56 120 136 +24 152 208 +104 192 240 +48 120 168 16 16 16 -176 224 232 -32 88 112 -248 248 232 -248 216 144 -216 176 72 +152 224 248 +40 72 128 +200 232 248 +248 216 80 +224 168 80 248 248 248 -160 32 32 -232 128 136 -208 64 64 -160 32 32 +168 56 40 +216 128 152 +224 64 16 +0 0 0 0 0 0 diff --git a/graphics/pokemon/mandibuzz/anim_front.png b/graphics/pokemon/mandibuzz/anim_front.png index 738ed4116..701457ff3 100644 Binary files a/graphics/pokemon/mandibuzz/anim_front.png and b/graphics/pokemon/mandibuzz/anim_front.png differ diff --git a/graphics/pokemon/mandibuzz/front.png b/graphics/pokemon/mandibuzz/front.png index 257bcfc57..acd99e1e3 100644 Binary files a/graphics/pokemon/mandibuzz/front.png and b/graphics/pokemon/mandibuzz/front.png differ diff --git a/graphics/pokemon/mandibuzz/normal.pal b/graphics/pokemon/mandibuzz/normal.pal index dc3d6922c..4afa2c7f4 100644 --- a/graphics/pokemon/mandibuzz/normal.pal +++ b/graphics/pokemon/mandibuzz/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -96 80 72 +96 72 64 88 80 56 -232 208 168 -168 152 120 -104 56 64 -208 120 136 -152 88 88 +232 232 192 +176 160 128 +128 48 64 +224 128 144 +176 80 96 248 248 248 -216 88 80 -144 128 120 -64 48 48 -144 112 88 -192 160 128 -96 80 72 +208 56 32 +120 120 112 +72 48 48 +144 120 96 +192 168 128 +80 80 80 diff --git a/graphics/pokemon/manectric/anim_front.png b/graphics/pokemon/manectric/anim_front.png index 7938ff8d6..ce1293dad 100644 Binary files a/graphics/pokemon/manectric/anim_front.png and b/graphics/pokemon/manectric/anim_front.png differ diff --git a/graphics/pokemon/manectric/front.png b/graphics/pokemon/manectric/front.png index e90b2e206..c82e63447 100644 Binary files a/graphics/pokemon/manectric/front.png and b/graphics/pokemon/manectric/front.png differ diff --git a/graphics/pokemon/manectric/normal.pal b/graphics/pokemon/manectric/normal.pal index d17ab5520..85745430c 100644 --- a/graphics/pokemon/manectric/normal.pal +++ b/graphics/pokemon/manectric/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -104 96 64 -232 216 128 -176 160 104 -136 128 80 -56 80 88 -120 176 208 -56 128 160 -104 152 176 -176 64 64 +112 96 80 +248 232 96 +192 168 88 +160 120 88 +72 80 88 +112 176 208 +88 128 168 +96 152 192 +200 32 32 248 248 248 -224 120 112 -152 200 232 +248 112 112 +144 200 216 184 184 224 0 0 0 diff --git a/graphics/pokemon/mankey/anim_front.png b/graphics/pokemon/mankey/anim_front.png index cf48e19ad..5ad7a32bf 100644 Binary files a/graphics/pokemon/mankey/anim_front.png and b/graphics/pokemon/mankey/anim_front.png differ diff --git a/graphics/pokemon/mankey/front.png b/graphics/pokemon/mankey/front.png index 3cfb62fb3..fbbe3e1fc 100644 Binary files a/graphics/pokemon/mankey/front.png and b/graphics/pokemon/mankey/front.png differ diff --git a/graphics/pokemon/mankey/normal.pal b/graphics/pokemon/mankey/normal.pal index a4b348bb5..fff90ad75 100644 --- a/graphics/pokemon/mankey/normal.pal +++ b/graphics/pokemon/mankey/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -104 72 48 -200 152 128 +112 64 0 +216 160 112 16 16 16 -168 120 104 -248 216 192 -208 176 152 +192 112 72 +240 216 176 +208 168 152 248 248 248 248 120 104 -192 120 144 +224 120 120 200 88 64 -240 168 192 +248 168 168 240 216 224 248 192 168 248 232 224 diff --git a/graphics/pokemon/mantine/anim_front.png b/graphics/pokemon/mantine/anim_front.png index 44c24dafe..603f1e029 100644 Binary files a/graphics/pokemon/mantine/anim_front.png and b/graphics/pokemon/mantine/anim_front.png differ diff --git a/graphics/pokemon/mantine/front.png b/graphics/pokemon/mantine/front.png index bd793e2bd..ed3bd56b1 100644 Binary files a/graphics/pokemon/mantine/front.png and b/graphics/pokemon/mantine/front.png differ diff --git a/graphics/pokemon/mantine/normal.pal b/graphics/pokemon/mantine/normal.pal index 6d8c28ad5..c4b95fecf 100644 --- a/graphics/pokemon/mantine/normal.pal +++ b/graphics/pokemon/mantine/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -40 48 88 -56 88 128 -48 64 88 -232 200 232 -176 144 168 -104 136 168 -104 80 96 -200 160 192 +48 56 88 +72 96 128 +64 64 96 +208 200 200 +168 152 168 +104 144 152 +80 88 104 +192 176 184 248 248 248 104 88 136 -96 104 136 -184 192 208 136 144 176 +168 176 200 +0 0 0 0 0 0 diff --git a/graphics/pokemon/mantyke/anim_front.png b/graphics/pokemon/mantyke/anim_front.png index 37bfbc816..9a3162211 100644 Binary files a/graphics/pokemon/mantyke/anim_front.png and b/graphics/pokemon/mantyke/anim_front.png differ diff --git a/graphics/pokemon/mantyke/front.png b/graphics/pokemon/mantyke/front.png index bd781d22b..b06a66d0a 100644 Binary files a/graphics/pokemon/mantyke/front.png and b/graphics/pokemon/mantyke/front.png differ diff --git a/graphics/pokemon/mantyke/normal.pal b/graphics/pokemon/mantyke/normal.pal index eb3114cf4..6b91b55cc 100644 --- a/graphics/pokemon/mantyke/normal.pal +++ b/graphics/pokemon/mantyke/normal.pal @@ -13,7 +13,7 @@ JASC-PAL 72 96 112 128 176 192 96 144 160 -120 72 80 -208 136 144 +168 56 80 +224 104 120 8 48 80 208 216 224 diff --git a/graphics/pokemon/maractus/anim_front.png b/graphics/pokemon/maractus/anim_front.png index a6feea12c..da44901b8 100644 Binary files a/graphics/pokemon/maractus/anim_front.png and b/graphics/pokemon/maractus/anim_front.png differ diff --git a/graphics/pokemon/maractus/front.png b/graphics/pokemon/maractus/front.png index 4eb69ffbe..3ba7400be 100644 Binary files a/graphics/pokemon/maractus/front.png and b/graphics/pokemon/maractus/front.png differ diff --git a/graphics/pokemon/maractus/normal.pal b/graphics/pokemon/maractus/normal.pal index b72b1e672..7beb50c61 100644 --- a/graphics/pokemon/maractus/normal.pal +++ b/graphics/pokemon/maractus/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 120 224 248 -152 56 104 -224 112 176 -32 64 32 -112 104 32 -248 208 48 -128 208 104 -88 144 72 +176 48 112 +224 104 160 +32 72 32 +128 112 16 +248 208 0 +88 208 104 +64 152 72 16 16 16 -40 120 120 -40 88 80 -16 48 40 -168 136 40 -208 80 160 +16 136 112 +24 96 80 +8 56 48 +176 152 16 +200 72 136 0 0 0 0 0 0 diff --git a/graphics/pokemon/mareep/anim_front.png b/graphics/pokemon/mareep/anim_front.png index d6800dcc6..5c67de509 100644 Binary files a/graphics/pokemon/mareep/anim_front.png and b/graphics/pokemon/mareep/anim_front.png differ diff --git a/graphics/pokemon/mareep/front.png b/graphics/pokemon/mareep/front.png index 5cc3b2266..703f09066 100644 Binary files a/graphics/pokemon/mareep/front.png and b/graphics/pokemon/mareep/front.png differ diff --git a/graphics/pokemon/mareep/normal.pal b/graphics/pokemon/mareep/normal.pal index dabbcd7b0..eaefbe935 100644 --- a/graphics/pokemon/mareep/normal.pal +++ b/graphics/pokemon/mareep/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -176 112 48 -192 168 120 +224 168 0 +200 176 136 248 248 248 -248 136 48 -128 104 64 +248 216 0 +128 112 80 16 16 16 -248 232 176 -224 200 144 +248 224 184 +224 200 160 56 64 64 -200 152 40 -248 208 80 +224 168 16 +248 216 8 136 144 144 -24 72 120 -56 112 160 -88 152 208 +0 72 144 +80 128 184 +112 160 240 diff --git a/graphics/pokemon/marill/anim_front.png b/graphics/pokemon/marill/anim_front.png index d76e7ef7f..e9815f489 100644 Binary files a/graphics/pokemon/marill/anim_front.png and b/graphics/pokemon/marill/anim_front.png differ diff --git a/graphics/pokemon/marill/front.png b/graphics/pokemon/marill/front.png index 9e4a7d852..d56a82fc4 100644 Binary files a/graphics/pokemon/marill/front.png and b/graphics/pokemon/marill/front.png differ diff --git a/graphics/pokemon/marill/normal.pal b/graphics/pokemon/marill/normal.pal index e2e596fbb..cf71923a6 100644 --- a/graphics/pokemon/marill/normal.pal +++ b/graphics/pokemon/marill/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -24 136 184 -48 176 232 -128 216 248 -16 72 88 -32 160 184 -120 40 24 -168 56 32 -224 72 48 +40 152 240 +112 200 248 +168 232 248 +48 80 184 +72 168 240 +144 24 0 +216 72 0 +240 128 0 16 16 16 248 248 248 -192 224 232 +224 224 232 56 64 64 -176 184 192 +200 200 216 0 0 0 0 0 0 diff --git a/graphics/pokemon/marowak/anim_front.png b/graphics/pokemon/marowak/anim_front.png index b8e5db85f..83117e3b2 100644 Binary files a/graphics/pokemon/marowak/anim_front.png and b/graphics/pokemon/marowak/anim_front.png differ diff --git a/graphics/pokemon/marowak/front.png b/graphics/pokemon/marowak/front.png index 2bbd3fd91..74a26b00f 100644 Binary files a/graphics/pokemon/marowak/front.png and b/graphics/pokemon/marowak/front.png differ diff --git a/graphics/pokemon/marowak/normal.pal b/graphics/pokemon/marowak/normal.pal index 5244888c4..119c76e9b 100644 --- a/graphics/pokemon/marowak/normal.pal +++ b/graphics/pokemon/marowak/normal.pal @@ -8,9 +8,9 @@ JASC-PAL 192 192 200 80 80 96 224 224 232 -88 64 32 -192 144 88 -144 112 72 +88 64 16 +192 152 72 +144 104 80 224 176 120 176 144 136 120 88 80 diff --git a/graphics/pokemon/marshtomp/anim_front.png b/graphics/pokemon/marshtomp/anim_front.png index e22036ac3..384e5aa3e 100644 Binary files a/graphics/pokemon/marshtomp/anim_front.png and b/graphics/pokemon/marshtomp/anim_front.png differ diff --git a/graphics/pokemon/marshtomp/front.png b/graphics/pokemon/marshtomp/front.png index 34e433976..ead3658ed 100644 Binary files a/graphics/pokemon/marshtomp/front.png and b/graphics/pokemon/marshtomp/front.png differ diff --git a/graphics/pokemon/marshtomp/normal.pal b/graphics/pokemon/marshtomp/normal.pal index bc1510d06..fe172506c 100644 --- a/graphics/pokemon/marshtomp/normal.pal +++ b/graphics/pokemon/marshtomp/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -168 224 24 -64 88 112 +248 192 248 +80 80 104 16 16 16 -96 128 152 -64 144 152 -88 168 176 -128 192 200 -176 216 224 -32 88 88 -224 112 56 -192 232 232 -232 144 112 -144 80 40 -144 192 192 -158 104 125 -221 153 181 +128 128 152 +32 144 144 +72 168 168 +144 216 216 +176 240 240 +8 88 88 +232 104 8 +176 208 240 +240 136 48 +144 64 16 +168 176 208 +136 48 80 +192 96 120 diff --git a/graphics/pokemon/masquerain/anim_front.png b/graphics/pokemon/masquerain/anim_front.png index 3099b7361..7508ae76d 100644 Binary files a/graphics/pokemon/masquerain/anim_front.png and b/graphics/pokemon/masquerain/anim_front.png differ diff --git a/graphics/pokemon/masquerain/front.png b/graphics/pokemon/masquerain/front.png index f670562c3..853e08a17 100644 Binary files a/graphics/pokemon/masquerain/front.png and b/graphics/pokemon/masquerain/front.png differ diff --git a/graphics/pokemon/masquerain/normal.pal b/graphics/pokemon/masquerain/normal.pal index 220d0eac4..bd8d9c4c7 100644 --- a/graphics/pokemon/masquerain/normal.pal +++ b/graphics/pokemon/masquerain/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -152 80 48 -208 112 72 -16 16 16 -248 144 104 -208 224 248 -248 248 240 -56 96 128 -176 88 112 -232 240 248 -136 48 72 -136 168 200 -176 208 224 -208 112 72 -248 144 104 +152 72 32 +224 104 40 0 0 0 +248 144 96 +216 216 224 +248 248 240 +32 88 112 +176 72 128 +232 240 248 +136 32 72 +136 160 200 +192 200 224 +16 16 16 +224 104 40 +248 144 96 diff --git a/graphics/pokemon/mawile/anim_front.png b/graphics/pokemon/mawile/anim_front.png index 0f19d84fb..b19c8fceb 100644 Binary files a/graphics/pokemon/mawile/anim_front.png and b/graphics/pokemon/mawile/anim_front.png differ diff --git a/graphics/pokemon/mawile/front.png b/graphics/pokemon/mawile/front.png index 23d1d990b..9f8bddbfd 100644 Binary files a/graphics/pokemon/mawile/front.png and b/graphics/pokemon/mawile/front.png differ diff --git a/graphics/pokemon/mawile/normal.pal b/graphics/pokemon/mawile/normal.pal index 4c8430642..40493d6be 100644 --- a/graphics/pokemon/mawile/normal.pal +++ b/graphics/pokemon/mawile/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -112 112 112 +112 112 120 80 72 72 168 160 160 88 88 88 248 224 160 -240 216 144 -208 168 104 -136 104 56 +240 208 136 +216 160 72 +120 88 40 200 200 200 160 40 64 -144 80 104 +152 72 104 248 104 112 248 248 248 0 0 0 diff --git a/graphics/pokemon/medicham/anim_front.png b/graphics/pokemon/medicham/anim_front.png index 61baf93a4..ca6c35970 100644 Binary files a/graphics/pokemon/medicham/anim_front.png and b/graphics/pokemon/medicham/anim_front.png differ diff --git a/graphics/pokemon/medicham/front.png b/graphics/pokemon/medicham/front.png index 39ea40adf..63734b124 100644 Binary files a/graphics/pokemon/medicham/front.png and b/graphics/pokemon/medicham/front.png differ diff --git a/graphics/pokemon/medicham/normal.pal b/graphics/pokemon/medicham/normal.pal index f6cbfc550..64be81c67 100644 --- a/graphics/pokemon/medicham/normal.pal +++ b/graphics/pokemon/medicham/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -144 40 64 +131 65 74 16 16 16 -200 88 112 -224 104 128 -232 136 160 -80 72 72 -224 232 232 -136 128 136 -176 160 160 -208 200 200 -248 224 176 -248 200 104 -184 64 104 -248 248 248 -168 128 72 +205 90 115 +230 115 139 +238 156 164 +82 65 74 +222 222 222 +139 131 139 +172 164 172 +197 197 197 +246 222 131 +238 189 90 +180 74 90 +255 255 255 +164 115 41 diff --git a/graphics/pokemon/meditite/anim_front.png b/graphics/pokemon/meditite/anim_front.png index 07af59579..2059f18cb 100644 Binary files a/graphics/pokemon/meditite/anim_front.png and b/graphics/pokemon/meditite/anim_front.png differ diff --git a/graphics/pokemon/meditite/front.png b/graphics/pokemon/meditite/front.png index 1704dbf66..c1c0dcd06 100644 Binary files a/graphics/pokemon/meditite/front.png and b/graphics/pokemon/meditite/front.png differ diff --git a/graphics/pokemon/meditite/normal.pal b/graphics/pokemon/meditite/normal.pal index e06e2ec86..d31714ed4 100644 --- a/graphics/pokemon/meditite/normal.pal +++ b/graphics/pokemon/meditite/normal.pal @@ -13,7 +13,7 @@ JASC-PAL 120 208 240 32 136 176 88 176 216 -216 96 104 -152 64 104 -208 144 176 +208 80 80 +128 64 72 +208 80 112 0 0 0 diff --git a/graphics/pokemon/meganium/anim_front.png b/graphics/pokemon/meganium/anim_front.png index fe346e4e4..6352e96e2 100644 Binary files a/graphics/pokemon/meganium/anim_front.png and b/graphics/pokemon/meganium/anim_front.png differ diff --git a/graphics/pokemon/meganium/front.png b/graphics/pokemon/meganium/front.png index f251fa5f0..2a813e118 100644 Binary files a/graphics/pokemon/meganium/front.png and b/graphics/pokemon/meganium/front.png differ diff --git a/graphics/pokemon/meganium/normal.pal b/graphics/pokemon/meganium/normal.pal index 74ae02e57..d594136b8 100644 --- a/graphics/pokemon/meganium/normal.pal +++ b/graphics/pokemon/meganium/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 176 232 -248 216 88 -80 64 32 -192 160 72 -144 168 88 -80 96 32 -208 240 144 -168 216 112 +248 192 248 +248 216 32 +96 72 0 +224 168 0 +152 168 80 +80 104 24 +208 232 136 +184 208 104 16 16 16 248 248 248 -168 56 72 -96 32 56 -248 160 168 -224 88 112 +248 56 88 +120 16 56 +240 160 152 +200 32 56 200 200 200 104 104 104 diff --git a/graphics/pokemon/meloetta/anim_front.png b/graphics/pokemon/meloetta/anim_front.png index cb47885f2..59587eedb 100644 Binary files a/graphics/pokemon/meloetta/anim_front.png and b/graphics/pokemon/meloetta/anim_front.png differ diff --git a/graphics/pokemon/meloetta/front.png b/graphics/pokemon/meloetta/front.png index 8aa81c4eb..fad54a0b0 100644 Binary files a/graphics/pokemon/meloetta/front.png and b/graphics/pokemon/meloetta/front.png differ diff --git a/graphics/pokemon/meloetta/normal.pal b/graphics/pokemon/meloetta/normal.pal index 64a721011..8904e42dc 100644 --- a/graphics/pokemon/meloetta/normal.pal +++ b/graphics/pokemon/meloetta/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -48 48 64 -144 120 128 +64 56 48 +128 128 128 16 16 16 -96 80 96 -104 120 72 -168 184 128 -232 224 184 -40 112 120 -232 240 248 -160 168 192 -88 168 176 -112 128 160 -248 248 248 -232 136 144 -160 96 112 +96 96 96 +72 112 48 +120 176 88 +200 240 152 +64 136 120 +248 248 240 +192 192 192 +48 192 160 +144 144 144 +216 120 136 +176 80 96 +88 80 80 diff --git a/graphics/pokemon/meloetta/pirouette/front.png b/graphics/pokemon/meloetta/pirouette/front.png index aeeed60d3..a3b532860 100644 Binary files a/graphics/pokemon/meloetta/pirouette/front.png and b/graphics/pokemon/meloetta/pirouette/front.png differ diff --git a/graphics/pokemon/meloetta/pirouette/normal.pal b/graphics/pokemon/meloetta/pirouette/normal.pal index c04de22eb..79b38fcd5 100644 --- a/graphics/pokemon/meloetta/pirouette/normal.pal +++ b/graphics/pokemon/meloetta/pirouette/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -64 64 72 +64 64 64 16 16 16 -144 120 120 -104 88 104 -168 80 64 -120 48 40 -232 120 80 +128 128 128 +96 96 96 +168 80 56 +112 64 56 +232 112 80 64 48 48 248 248 240 -168 176 208 -168 64 88 -240 152 136 -224 80 104 +192 192 192 +192 48 88 +248 128 168 +240 80 120 88 80 80 -112 96 104 +144 120 88 diff --git a/graphics/pokemon/meowth/anim_front.png b/graphics/pokemon/meowth/anim_front.png index 7452c00f7..1c699350c 100644 Binary files a/graphics/pokemon/meowth/anim_front.png and b/graphics/pokemon/meowth/anim_front.png differ diff --git a/graphics/pokemon/meowth/front.png b/graphics/pokemon/meowth/front.png index 5f64308be..3f9bc67ad 100644 Binary files a/graphics/pokemon/meowth/front.png and b/graphics/pokemon/meowth/front.png differ diff --git a/graphics/pokemon/meowth/normal.pal b/graphics/pokemon/meowth/normal.pal index aee303ee1..8368723fb 100644 --- a/graphics/pokemon/meowth/normal.pal +++ b/graphics/pokemon/meowth/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 104 56 -240 232 176 +152 104 0 +248 224 128 16 16 16 -112 72 40 +144 88 0 248 248 248 -248 216 144 -192 160 72 -184 128 64 -200 176 128 -224 224 224 +248 208 0 +200 160 0 +192 120 8 +216 184 56 +216 216 216 192 120 144 -216 160 104 +232 152 48 248 248 200 112 72 40 0 0 0 diff --git a/graphics/pokemon/mesprit/anim_front.png b/graphics/pokemon/mesprit/anim_front.png index 90fc9da6d..bd48e34c8 100644 Binary files a/graphics/pokemon/mesprit/anim_front.png and b/graphics/pokemon/mesprit/anim_front.png differ diff --git a/graphics/pokemon/mesprit/front.png b/graphics/pokemon/mesprit/front.png index 00f88ef29..0ca08f734 100644 Binary files a/graphics/pokemon/mesprit/front.png and b/graphics/pokemon/mesprit/front.png differ diff --git a/graphics/pokemon/mesprit/normal.pal b/graphics/pokemon/mesprit/normal.pal index 5e261f0e6..b6d67710a 100644 --- a/graphics/pokemon/mesprit/normal.pal +++ b/graphics/pokemon/mesprit/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -104 56 80 -224 120 160 -248 160 184 -168 96 136 -224 104 96 +128 64 104 +232 112 168 +248 144 200 +176 80 128 +232 64 64 88 56 64 -88 120 144 +120 112 144 248 248 248 -168 208 240 -128 160 184 -176 48 48 -248 208 48 -176 144 24 -48 64 72 +176 200 240 +144 152 192 +168 64 64 +248 176 32 +168 136 64 +64 64 64 diff --git a/graphics/pokemon/metagross/anim_front.png b/graphics/pokemon/metagross/anim_front.png index 7f5e2f0f9..c04a8b3e7 100644 Binary files a/graphics/pokemon/metagross/anim_front.png and b/graphics/pokemon/metagross/anim_front.png differ diff --git a/graphics/pokemon/metagross/front.png b/graphics/pokemon/metagross/front.png index 6d8b543db..43a762538 100644 Binary files a/graphics/pokemon/metagross/front.png and b/graphics/pokemon/metagross/front.png differ diff --git a/graphics/pokemon/metagross/normal.pal b/graphics/pokemon/metagross/normal.pal index cf0c73a96..4ac88a6bd 100644 --- a/graphics/pokemon/metagross/normal.pal +++ b/graphics/pokemon/metagross/normal.pal @@ -2,16 +2,16 @@ JASC-PAL 0100 16 152 208 160 -40 64 88 +48 56 112 16 16 16 -152 200 216 -120 168 192 -80 136 160 -48 96 128 -192 192 192 -160 160 160 -104 96 104 -208 208 216 +128 208 240 +88 160 248 +72 128 216 +56 96 176 +208 208 208 +168 168 168 +112 104 112 +224 224 224 200 216 240 248 72 80 160 24 40 diff --git a/graphics/pokemon/metang/anim_front.png b/graphics/pokemon/metang/anim_front.png index 91f908d52..c70198db7 100644 Binary files a/graphics/pokemon/metang/anim_front.png and b/graphics/pokemon/metang/anim_front.png differ diff --git a/graphics/pokemon/metang/front.png b/graphics/pokemon/metang/front.png index ded638dec..da3998543 100644 Binary files a/graphics/pokemon/metang/front.png and b/graphics/pokemon/metang/front.png differ diff --git a/graphics/pokemon/metang/normal.pal b/graphics/pokemon/metang/normal.pal index 398ac026c..b4949b927 100644 --- a/graphics/pokemon/metang/normal.pal +++ b/graphics/pokemon/metang/normal.pal @@ -6,14 +6,14 @@ JASC-PAL 192 192 200 16 16 16 248 248 248 -32 72 88 +48 56 112 144 152 160 -64 128 152 -136 184 208 -96 152 176 -48 104 128 -192 72 88 -112 48 64 -232 128 136 +72 128 216 +136 208 248 +96 160 248 +56 96 176 +216 72 80 +136 72 72 +248 104 104 200 200 200 0 0 0 diff --git a/graphics/pokemon/metapod/anim_front.png b/graphics/pokemon/metapod/anim_front.png index bb5ffc2b6..ae952f0b0 100644 Binary files a/graphics/pokemon/metapod/anim_front.png and b/graphics/pokemon/metapod/anim_front.png differ diff --git a/graphics/pokemon/metapod/front.png b/graphics/pokemon/metapod/front.png index 049384e47..cde83b1f0 100644 Binary files a/graphics/pokemon/metapod/front.png and b/graphics/pokemon/metapod/front.png differ diff --git a/graphics/pokemon/metapod/normal.pal b/graphics/pokemon/metapod/normal.pal index 017e3f94b..8bdd97c5e 100644 --- a/graphics/pokemon/metapod/normal.pal +++ b/graphics/pokemon/metapod/normal.pal @@ -2,13 +2,13 @@ JASC-PAL 0100 16 152 208 160 -88 112 48 -200 224 168 -56 80 24 -152 208 80 -112 144 72 -16 16 16 -120 160 56 +72 104 80 +176 224 80 +56 80 56 +128 192 72 +104 136 88 +0 0 0 +104 160 72 248 248 248 0 0 0 0 0 0 diff --git a/graphics/pokemon/mew/anim_front.png b/graphics/pokemon/mew/anim_front.png index cb160cc42..a993b8110 100644 Binary files a/graphics/pokemon/mew/anim_front.png and b/graphics/pokemon/mew/anim_front.png differ diff --git a/graphics/pokemon/mew/front.png b/graphics/pokemon/mew/front.png index cae789231..ad13c8ece 100644 Binary files a/graphics/pokemon/mew/front.png and b/graphics/pokemon/mew/front.png differ diff --git a/graphics/pokemon/mew/normal.pal b/graphics/pokemon/mew/normal.pal index 11c00326b..1b2aafb65 100644 --- a/graphics/pokemon/mew/normal.pal +++ b/graphics/pokemon/mew/normal.pal @@ -2,15 +2,15 @@ JASC-PAL 0100 16 152 208 160 -160 104 120 -248 200 208 -208 144 152 -80 40 48 -240 168 184 +176 96 144 +248 208 232 +232 128 176 +88 40 80 +248 176 208 0 0 0 248 240 248 -104 144 184 -56 104 160 +128 168 240 +40 96 224 48 64 96 240 176 128 0 0 0 diff --git a/graphics/pokemon/mewtwo/anim_front.png b/graphics/pokemon/mewtwo/anim_front.png index 63a2ccf07..c787ffa80 100644 Binary files a/graphics/pokemon/mewtwo/anim_front.png and b/graphics/pokemon/mewtwo/anim_front.png differ diff --git a/graphics/pokemon/mewtwo/front.png b/graphics/pokemon/mewtwo/front.png index 4f03a6ba8..9d31937c2 100644 Binary files a/graphics/pokemon/mewtwo/front.png and b/graphics/pokemon/mewtwo/front.png differ diff --git a/graphics/pokemon/mewtwo/normal.pal b/graphics/pokemon/mewtwo/normal.pal index 9e499ccb2..66aa6cac4 100644 --- a/graphics/pokemon/mewtwo/normal.pal +++ b/graphics/pokemon/mewtwo/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -144 120 160 -224 208 232 -64 48 80 -184 168 192 -8 8 8 -232 224 232 -120 80 112 -160 104 152 +128 120 152 +224 224 240 +56 56 80 +184 176 200 +0 0 0 +240 240 248 +120 56 128 +168 80 192 240 240 240 -184 120 184 -80 40 80 +176 104 200 +56 32 80 216 216 216 248 248 248 0 0 0 diff --git a/graphics/pokemon/mienfoo/anim_front.png b/graphics/pokemon/mienfoo/anim_front.png index 504a6a53a..9e772faa4 100644 Binary files a/graphics/pokemon/mienfoo/anim_front.png and b/graphics/pokemon/mienfoo/anim_front.png differ diff --git a/graphics/pokemon/mienfoo/front.png b/graphics/pokemon/mienfoo/front.png index 9df2fe780..51cc46ada 100644 Binary files a/graphics/pokemon/mienfoo/front.png and b/graphics/pokemon/mienfoo/front.png differ diff --git a/graphics/pokemon/mienfoo/normal.pal b/graphics/pokemon/mienfoo/normal.pal index 9a72c936f..2f60aa6c6 100644 --- a/graphics/pokemon/mienfoo/normal.pal +++ b/graphics/pokemon/mienfoo/normal.pal @@ -3,14 +3,14 @@ JASC-PAL 16 152 208 160 144 120 80 -248 232 160 -208 192 120 +240 240 136 +200 184 120 96 72 40 -176 160 88 +176 160 80 128 128 144 160 64 88 16 16 16 -224 96 120 +216 96 120 248 248 248 104 32 56 104 48 72 diff --git a/graphics/pokemon/mienshao/anim_front.png b/graphics/pokemon/mienshao/anim_front.png index 181f6570b..598dad2d0 100644 Binary files a/graphics/pokemon/mienshao/anim_front.png and b/graphics/pokemon/mienshao/anim_front.png differ diff --git a/graphics/pokemon/mienshao/front.png b/graphics/pokemon/mienshao/front.png index f7b7fa0b5..6c1ca33a3 100644 Binary files a/graphics/pokemon/mienshao/front.png and b/graphics/pokemon/mienshao/front.png differ diff --git a/graphics/pokemon/mienshao/normal.pal b/graphics/pokemon/mienshao/normal.pal index e7dc996eb..68a6f4c09 100644 --- a/graphics/pokemon/mienshao/normal.pal +++ b/graphics/pokemon/mienshao/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -120 104 88 -216 152 88 -16 16 16 -112 96 88 -168 144 136 -224 208 200 -72 64 104 -128 104 144 -168 136 208 -136 0 40 -56 24 24 -248 208 160 -248 248 248 -48 48 64 +88 64 48 +200 136 80 +0 0 0 +112 80 96 +184 160 160 +232 216 216 +80 64 96 +128 96 168 +168 136 192 +160 32 32 +72 32 32 +248 168 96 +248 248 248 +64 64 64 0 0 0 diff --git a/graphics/pokemon/mightyena/anim_front.png b/graphics/pokemon/mightyena/anim_front.png index c24c2e6e4..90f55dfdf 100644 Binary files a/graphics/pokemon/mightyena/anim_front.png and b/graphics/pokemon/mightyena/anim_front.png differ diff --git a/graphics/pokemon/mightyena/front.png b/graphics/pokemon/mightyena/front.png index 930edfb6c..e7ddfbcf7 100644 Binary files a/graphics/pokemon/mightyena/front.png and b/graphics/pokemon/mightyena/front.png differ diff --git a/graphics/pokemon/mightyena/normal.pal b/graphics/pokemon/mightyena/normal.pal index 1b7279b44..d531b1dde 100644 --- a/graphics/pokemon/mightyena/normal.pal +++ b/graphics/pokemon/mightyena/normal.pal @@ -4,13 +4,13 @@ JASC-PAL 152 208 160 8 8 8 80 80 80 -144 144 144 -192 192 208 +144 144 152 +184 184 192 56 64 64 32 32 32 208 96 104 -240 232 120 -160 152 56 +240 240 88 +184 136 64 152 56 64 200 112 152 248 248 248 diff --git a/graphics/pokemon/milotic/anim_front.png b/graphics/pokemon/milotic/anim_front.png index 67f9c89d9..ac2450522 100644 Binary files a/graphics/pokemon/milotic/anim_front.png and b/graphics/pokemon/milotic/anim_front.png differ diff --git a/graphics/pokemon/milotic/back.png b/graphics/pokemon/milotic/back.png index 7a701f79d..74525da17 100644 Binary files a/graphics/pokemon/milotic/back.png and b/graphics/pokemon/milotic/back.png differ diff --git a/graphics/pokemon/milotic/front.png b/graphics/pokemon/milotic/front.png index 9ece7373e..08f338984 100644 Binary files a/graphics/pokemon/milotic/front.png and b/graphics/pokemon/milotic/front.png differ diff --git a/graphics/pokemon/milotic/normal.pal b/graphics/pokemon/milotic/normal.pal index 46e53fc41..0fd44096c 100644 --- a/graphics/pokemon/milotic/normal.pal +++ b/graphics/pokemon/milotic/normal.pal @@ -3,13 +3,13 @@ JASC-PAL 16 152 208 160 232 112 120 -56 48 56 +48 48 48 176 56 72 120 104 64 248 224 168 216 192 136 -24 120 160 -88 176 208 +8 120 160 +56 168 216 104 32 40 248 240 224 240 96 112 diff --git a/graphics/pokemon/miltank/anim_front.png b/graphics/pokemon/miltank/anim_front.png index e32aa2e0e..97eb281ed 100644 Binary files a/graphics/pokemon/miltank/anim_front.png and b/graphics/pokemon/miltank/anim_front.png differ diff --git a/graphics/pokemon/miltank/front.png b/graphics/pokemon/miltank/front.png index 7a58f3c09..4ac2687e1 100644 Binary files a/graphics/pokemon/miltank/front.png and b/graphics/pokemon/miltank/front.png differ diff --git a/graphics/pokemon/miltank/normal.pal b/graphics/pokemon/miltank/normal.pal index 53d81ff57..3d87da5b9 100644 --- a/graphics/pokemon/miltank/normal.pal +++ b/graphics/pokemon/miltank/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 +200 200 248 72 88 96 16 16 16 248 248 248 -160 168 144 +112 120 128 40 48 56 152 88 96 -240 152 168 -176 168 120 -184 120 128 +248 176 192 +200 176 96 +224 128 152 104 56 64 -32 104 176 -248 192 192 -240 224 152 +32 88 192 +248 192 208 +232 240 168 88 88 56 -200 184 128 +216 200 120 diff --git a/graphics/pokemon/mime_jr/anim_front.png b/graphics/pokemon/mime_jr/anim_front.png index cbc2640af..bd97d354d 100644 Binary files a/graphics/pokemon/mime_jr/anim_front.png and b/graphics/pokemon/mime_jr/anim_front.png differ diff --git a/graphics/pokemon/mime_jr/front.png b/graphics/pokemon/mime_jr/front.png index 792bb0c50..c3519f6c9 100644 Binary files a/graphics/pokemon/mime_jr/front.png and b/graphics/pokemon/mime_jr/front.png differ diff --git a/graphics/pokemon/mime_jr/normal.pal b/graphics/pokemon/mime_jr/normal.pal index ee536e561..bd513b08b 100644 --- a/graphics/pokemon/mime_jr/normal.pal +++ b/graphics/pokemon/mime_jr/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -104 96 96 +104 96 104 248 248 248 -216 208 200 -176 160 152 +216 208 216 +184 168 184 +0 0 0 +16 48 72 +16 72 112 +64 112 160 +104 56 48 +248 200 200 +216 160 160 +192 96 96 +192 32 72 +232 88 56 0 0 0 -32 40 56 -64 80 96 -104 128 160 -96 64 72 -240 208 224 -208 160 176 -168 120 128 -168 64 48 -224 112 88 -144 80 88 diff --git a/graphics/pokemon/minccino/anim_front.png b/graphics/pokemon/minccino/anim_front.png index 3d99edfab..f2942a2cb 100644 Binary files a/graphics/pokemon/minccino/anim_front.png and b/graphics/pokemon/minccino/anim_front.png differ diff --git a/graphics/pokemon/minccino/front.png b/graphics/pokemon/minccino/front.png index ee86c993c..a9b05cdc0 100644 Binary files a/graphics/pokemon/minccino/front.png and b/graphics/pokemon/minccino/front.png differ diff --git a/graphics/pokemon/minccino/normal.pal b/graphics/pokemon/minccino/normal.pal index f21720de7..3de570e3d 100644 --- a/graphics/pokemon/minccino/normal.pal +++ b/graphics/pokemon/minccino/normal.pal @@ -2,15 +2,15 @@ JASC-PAL 0100 16 153 210 164 -71 59 54 -155 138 140 -254 255 255 -229 225 220 -204 191 185 +80 72 64 +136 128 120 +248 240 248 +216 200 192 +184 176 160 16 16 16 -135 63 68 -175 86 93 -237 106 117 +184 40 40 +208 80 80 +232 128 128 175 86 93 237 106 117 0 0 0 diff --git a/graphics/pokemon/minun/anim_front.png b/graphics/pokemon/minun/anim_front.png index 071d727ef..f309898b2 100644 Binary files a/graphics/pokemon/minun/anim_front.png and b/graphics/pokemon/minun/anim_front.png differ diff --git a/graphics/pokemon/minun/front.png b/graphics/pokemon/minun/front.png index d45777b28..fa72433dc 100644 Binary files a/graphics/pokemon/minun/front.png and b/graphics/pokemon/minun/front.png differ diff --git a/graphics/pokemon/minun/normal.pal b/graphics/pokemon/minun/normal.pal index 3a5593d7a..548dccf17 100644 --- a/graphics/pokemon/minun/normal.pal +++ b/graphics/pokemon/minun/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -40 112 152 -136 200 232 +64 80 216 +112 152 240 16 16 16 -56 152 208 -248 240 184 +88 128 232 +248 232 176 120 112 80 -176 152 104 +176 152 96 248 248 248 -208 192 128 -24 56 96 -160 78 110 -219 149 179 +224 192 112 +0 0 0 +168 56 80 +224 104 120 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/misdreavus/anim_front.png b/graphics/pokemon/misdreavus/anim_front.png index 5227084c8..e59ff75f0 100644 Binary files a/graphics/pokemon/misdreavus/anim_front.png and b/graphics/pokemon/misdreavus/anim_front.png differ diff --git a/graphics/pokemon/misdreavus/front.png b/graphics/pokemon/misdreavus/front.png index ec3d2cbf0..b46d709a9 100644 Binary files a/graphics/pokemon/misdreavus/front.png and b/graphics/pokemon/misdreavus/front.png differ diff --git a/graphics/pokemon/misdreavus/normal.pal b/graphics/pokemon/misdreavus/normal.pal index 65fa9a322..01e0dd52a 100644 --- a/graphics/pokemon/misdreavus/normal.pal +++ b/graphics/pokemon/misdreavus/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 72 104 +152 56 72 16 16 16 -216 112 128 -64 32 48 -72 136 152 -32 40 80 -32 80 104 -48 104 128 -192 144 88 -144 56 64 -248 200 112 -248 72 96 +216 96 160 +96 24 64 +72 128 160 +24 40 64 +48 72 96 +56 96 128 +184 144 48 +160 40 88 +232 224 96 +216 64 128 248 248 248 112 16 48 0 0 0 diff --git a/graphics/pokemon/mismagius/anim_front.png b/graphics/pokemon/mismagius/anim_front.png index 41643309d..4d86748a1 100644 Binary files a/graphics/pokemon/mismagius/anim_front.png and b/graphics/pokemon/mismagius/anim_front.png differ diff --git a/graphics/pokemon/mismagius/front.png b/graphics/pokemon/mismagius/front.png index cd6a67d65..5d68e8b70 100644 Binary files a/graphics/pokemon/mismagius/front.png and b/graphics/pokemon/mismagius/front.png differ diff --git a/graphics/pokemon/mismagius/normal.pal b/graphics/pokemon/mismagius/normal.pal index 9f98866ae..f013bf063 100644 --- a/graphics/pokemon/mismagius/normal.pal +++ b/graphics/pokemon/mismagius/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 40 96 -144 72 128 -208 120 184 -32 24 56 +88 64 96 +128 80 128 +176 96 176 +48 32 56 16 16 16 -120 88 152 -80 56 104 -160 136 48 +104 72 144 +72 56 88 +200 152 0 248 248 248 -152 72 72 -240 216 80 -224 104 96 -32 32 56 -224 104 96 +144 56 88 +240 216 56 +232 56 16 +0 0 0 +0 0 0 0 0 0 diff --git a/graphics/pokemon/moltres/anim_front.png b/graphics/pokemon/moltres/anim_front.png index 3ba2a59da..04e279d07 100644 Binary files a/graphics/pokemon/moltres/anim_front.png and b/graphics/pokemon/moltres/anim_front.png differ diff --git a/graphics/pokemon/moltres/front.png b/graphics/pokemon/moltres/front.png index 27e286589..ac717bb48 100644 Binary files a/graphics/pokemon/moltres/front.png and b/graphics/pokemon/moltres/front.png differ diff --git a/graphics/pokemon/moltres/normal.pal b/graphics/pokemon/moltres/normal.pal index 2114a47a7..6698521da 100644 --- a/graphics/pokemon/moltres/normal.pal +++ b/graphics/pokemon/moltres/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -160 48 24 -216 104 64 -88 64 32 -248 184 88 +208 8 8 +232 96 56 +112 64 16 +248 192 72 16 8 8 -192 144 72 -240 160 112 -248 200 112 -248 208 152 +216 144 16 +248 160 72 +248 208 96 +248 232 96 56 56 112 248 248 248 80 56 56 -144 104 104 -208 160 128 +136 96 72 +176 136 96 96 96 96 diff --git a/graphics/pokemon/monferno/anim_front.png b/graphics/pokemon/monferno/anim_front.png index 2c35e3b4a..7d4167c6b 100644 Binary files a/graphics/pokemon/monferno/anim_front.png and b/graphics/pokemon/monferno/anim_front.png differ diff --git a/graphics/pokemon/monferno/front.png b/graphics/pokemon/monferno/front.png index cff833cd4..08ac29b53 100644 Binary files a/graphics/pokemon/monferno/front.png and b/graphics/pokemon/monferno/front.png differ diff --git a/graphics/pokemon/monferno/normal.pal b/graphics/pokemon/monferno/normal.pal index 3d841fd2f..d6dae19c0 100644 --- a/graphics/pokemon/monferno/normal.pal +++ b/graphics/pokemon/monferno/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -184 56 48 -72 48 8 -120 88 64 -224 184 152 -144 96 32 -184 144 120 -200 120 48 -224 152 80 -24 80 112 -40 136 176 -200 192 184 +216 56 8 +88 48 16 +136 112 64 +232 200 168 +152 96 64 +192 152 120 +208 136 32 +232 160 64 +16 72 152 +8 120 192 +216 224 224 16 16 16 248 248 248 -240 192 48 +248 200 64 96 96 112 diff --git a/graphics/pokemon/mothim/anim_front.png b/graphics/pokemon/mothim/anim_front.png index b634f24fd..591ffd651 100644 Binary files a/graphics/pokemon/mothim/anim_front.png and b/graphics/pokemon/mothim/anim_front.png differ diff --git a/graphics/pokemon/mothim/front.png b/graphics/pokemon/mothim/front.png index 4aa22d601..b18fffe17 100644 Binary files a/graphics/pokemon/mothim/front.png and b/graphics/pokemon/mothim/front.png differ diff --git a/graphics/pokemon/mothim/shiny.pal b/graphics/pokemon/mothim/shiny.pal index 31bd384bd..7c5d2000a 100644 --- a/graphics/pokemon/mothim/shiny.pal +++ b/graphics/pokemon/mothim/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -40 80 104 -80 160 208 -232 232 136 -200 192 64 -136 128 32 +115 65 32 +230 106 41 +246 213 123 +189 156 98 +106 90 74 16 16 16 -40 120 152 -192 200 208 -80 88 104 -128 136 152 -40 48 40 -88 112 88 -56 72 48 +164 74 0 +205 205 205 +98 98 98 +148 148 148 +57 41 41 +106 90 90 +74 57 57 0 0 0 0 0 0 diff --git a/graphics/pokemon/mr_mime/anim_front.png b/graphics/pokemon/mr_mime/anim_front.png index 52a3423c8..afdc8878e 100644 Binary files a/graphics/pokemon/mr_mime/anim_front.png and b/graphics/pokemon/mr_mime/anim_front.png differ diff --git a/graphics/pokemon/mr_mime/front.png b/graphics/pokemon/mr_mime/front.png index 7ee2f715e..13f5a8ff7 100644 Binary files a/graphics/pokemon/mr_mime/front.png and b/graphics/pokemon/mr_mime/front.png differ diff --git a/graphics/pokemon/mr_mime/normal.pal b/graphics/pokemon/mr_mime/normal.pal index 5e5302ea4..32ba22300 100644 --- a/graphics/pokemon/mr_mime/normal.pal +++ b/graphics/pokemon/mr_mime/normal.pal @@ -3,8 +3,8 @@ JASC-PAL 16 152 208 160 16 40 56 -32 72 112 -80 136 168 +16 72 112 +96 136 184 16 16 16 104 64 72 248 224 224 @@ -12,8 +12,8 @@ JASC-PAL 216 168 176 248 248 248 184 192 200 -240 96 136 -112 56 64 -168 88 104 -248 136 168 -158 98 128 +248 88 104 +112 48 56 +184 72 112 +248 168 176 +208 48 32 diff --git a/graphics/pokemon/mudkip/anim_front.png b/graphics/pokemon/mudkip/anim_front.png index cb9228cc6..dbc9857e0 100644 Binary files a/graphics/pokemon/mudkip/anim_front.png and b/graphics/pokemon/mudkip/anim_front.png differ diff --git a/graphics/pokemon/mudkip/front.png b/graphics/pokemon/mudkip/front.png index 7cd675391..7c83c421f 100644 Binary files a/graphics/pokemon/mudkip/front.png and b/graphics/pokemon/mudkip/front.png differ diff --git a/graphics/pokemon/mudkip/normal.pal b/graphics/pokemon/mudkip/normal.pal index 546160fc1..54e0e6ad6 100644 --- a/graphics/pokemon/mudkip/normal.pal +++ b/graphics/pokemon/mudkip/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 88 128 -56 160 208 -104 192 240 -40 120 160 +64 160 216 +120 200 232 +48 104 144 16 16 16 160 176 224 192 208 232 104 128 160 168 224 248 -144 88 24 -208 120 48 -240 152 72 +168 88 32 +232 128 48 +248 168 64 248 248 248 88 72 64 0 0 0 diff --git a/graphics/pokemon/muk/anim_front.png b/graphics/pokemon/muk/anim_front.png index 55923479f..d2da551df 100644 Binary files a/graphics/pokemon/muk/anim_front.png and b/graphics/pokemon/muk/anim_front.png differ diff --git a/graphics/pokemon/muk/front.png b/graphics/pokemon/muk/front.png index b93a15676..3684a6eda 100644 Binary files a/graphics/pokemon/muk/front.png and b/graphics/pokemon/muk/front.png differ diff --git a/graphics/pokemon/muk/normal.pal b/graphics/pokemon/muk/normal.pal index c65ff71c8..43d09a88d 100644 --- a/graphics/pokemon/muk/normal.pal +++ b/graphics/pokemon/muk/normal.pal @@ -2,11 +2,11 @@ JASC-PAL 0100 16 152 208 160 -104 80 112 -200 176 216 -184 152 200 -144 120 168 -72 56 72 +120 72 128 +224 184 232 +192 160 200 +160 120 168 +88 48 112 16 16 16 248 248 248 152 184 208 diff --git a/graphics/pokemon/munchlax/anim_front.png b/graphics/pokemon/munchlax/anim_front.png index 9fd77f96d..1174fb383 100644 Binary files a/graphics/pokemon/munchlax/anim_front.png and b/graphics/pokemon/munchlax/anim_front.png differ diff --git a/graphics/pokemon/munchlax/front.png b/graphics/pokemon/munchlax/front.png index e1115ff57..243df8dd0 100644 Binary files a/graphics/pokemon/munchlax/front.png and b/graphics/pokemon/munchlax/front.png differ diff --git a/graphics/pokemon/munchlax/normal.pal b/graphics/pokemon/munchlax/normal.pal index bb75ff127..be89d69f2 100644 --- a/graphics/pokemon/munchlax/normal.pal +++ b/graphics/pokemon/munchlax/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -56 88 104 +32 88 112 32 56 64 -72 120 152 +48 120 152 16 16 16 -120 152 168 +48 144 176 200 200 200 248 248 248 -248 216 168 -192 160 128 +240 224 184 +216 168 136 88 64 56 112 112 120 128 96 72 160 128 112 -117 76 87 -209 150 171 +168 56 80 +224 104 120 diff --git a/graphics/pokemon/munna/anim_front.png b/graphics/pokemon/munna/anim_front.png index 5dd7796f8..c7d84bd9b 100644 Binary files a/graphics/pokemon/munna/anim_front.png and b/graphics/pokemon/munna/anim_front.png differ diff --git a/graphics/pokemon/munna/front.png b/graphics/pokemon/munna/front.png index 15708a058..3abe09025 100644 Binary files a/graphics/pokemon/munna/front.png and b/graphics/pokemon/munna/front.png differ diff --git a/graphics/pokemon/munna/normal.pal b/graphics/pokemon/munna/normal.pal index 84bdc2b71..f6a7e60ba 100644 --- a/graphics/pokemon/munna/normal.pal +++ b/graphics/pokemon/munna/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 224 224 -192 136 144 -248 192 208 -120 72 88 -136 88 136 -248 224 216 -168 120 184 +200 136 184 +248 192 200 +128 64 96 +128 88 144 +248 208 216 +168 120 200 16 16 16 -248 120 160 -224 112 144 -144 56 64 +240 136 208 +216 120 184 +168 40 64 248 248 248 -240 64 88 -224 160 176 -88 64 96 +216 40 64 +224 168 192 +96 72 104 0 0 0 diff --git a/graphics/pokemon/murkrow/anim_front.png b/graphics/pokemon/murkrow/anim_front.png index 7a5cb8d71..5866a2d55 100644 Binary files a/graphics/pokemon/murkrow/anim_front.png and b/graphics/pokemon/murkrow/anim_front.png differ diff --git a/graphics/pokemon/murkrow/front.png b/graphics/pokemon/murkrow/front.png index b3885b604..de8f7cd5d 100644 Binary files a/graphics/pokemon/murkrow/front.png and b/graphics/pokemon/murkrow/front.png differ diff --git a/graphics/pokemon/murkrow/normal.pal b/graphics/pokemon/murkrow/normal.pal index 809e1d57d..4d1ccb7b6 100644 --- a/graphics/pokemon/murkrow/normal.pal +++ b/graphics/pokemon/murkrow/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -24 40 56 -48 96 136 +40 40 64 +64 96 152 16 16 16 -32 64 88 -152 56 56 -176 144 96 -232 104 72 -72 128 176 -88 64 40 -240 200 128 +48 64 96 +112 40 56 +176 152 32 +208 64 80 +112 136 184 +88 72 32 +232 208 128 248 248 248 -216 176 112 +208 184 80 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/musharna/anim_front.png b/graphics/pokemon/musharna/anim_front.png index 7b00fd511..f75dd3b0c 100644 Binary files a/graphics/pokemon/musharna/anim_front.png and b/graphics/pokemon/musharna/anim_front.png differ diff --git a/graphics/pokemon/musharna/front.png b/graphics/pokemon/musharna/front.png index 6512dddae..75addd095 100644 Binary files a/graphics/pokemon/musharna/front.png and b/graphics/pokemon/musharna/front.png differ diff --git a/graphics/pokemon/musharna/normal.pal b/graphics/pokemon/musharna/normal.pal index eb9ef3496..a59c683c5 100644 --- a/graphics/pokemon/musharna/normal.pal +++ b/graphics/pokemon/musharna/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 80 112 -240 128 152 -56 56 88 -144 128 200 -144 96 96 +168 80 112 +216 120 184 +72 72 96 +144 120 216 +152 88 96 16 16 16 -248 200 192 -112 96 152 -200 152 152 +248 192 200 +104 96 160 +200 152 144 80 80 80 -184 104 120 -96 48 72 +184 112 168 +104 48 72 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/natu/anim_front.png b/graphics/pokemon/natu/anim_front.png index 45e680c82..4ba2a6eee 100644 Binary files a/graphics/pokemon/natu/anim_front.png and b/graphics/pokemon/natu/anim_front.png differ diff --git a/graphics/pokemon/natu/front.png b/graphics/pokemon/natu/front.png index e770f4379..c77e0f9bd 100644 Binary files a/graphics/pokemon/natu/front.png and b/graphics/pokemon/natu/front.png differ diff --git a/graphics/pokemon/natu/normal.pal b/graphics/pokemon/natu/normal.pal index fa49b7d6f..0d9796fa5 100644 --- a/graphics/pokemon/natu/normal.pal +++ b/graphics/pokemon/natu/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 0 176 232 -128 24 40 -232 88 104 -200 56 72 -104 160 48 -72 104 40 -120 200 56 -168 216 128 +128 40 0 +248 88 88 +216 40 88 +72 144 64 +40 104 40 +112 184 64 +144 216 64 16 16 16 128 96 32 -240 208 96 -200 160 48 +248 224 40 +216 168 40 248 248 248 80 80 80 200 200 200 diff --git a/graphics/pokemon/nidoking/anim_front.png b/graphics/pokemon/nidoking/anim_front.png index dc8328aa0..1645f15e0 100644 Binary files a/graphics/pokemon/nidoking/anim_front.png and b/graphics/pokemon/nidoking/anim_front.png differ diff --git a/graphics/pokemon/nidoking/front.png b/graphics/pokemon/nidoking/front.png index 4112f41a5..cc9ad6d08 100644 Binary files a/graphics/pokemon/nidoking/front.png and b/graphics/pokemon/nidoking/front.png differ diff --git a/graphics/pokemon/nidoking/normal.pal b/graphics/pokemon/nidoking/normal.pal index 0f0185141..bbed53d87 100644 --- a/graphics/pokemon/nidoking/normal.pal +++ b/graphics/pokemon/nidoking/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -80 48 88 -208 144 208 +104 48 120 +216 144 240 16 16 16 -192 120 184 -144 88 136 -72 112 112 -40 80 88 -80 152 160 +208 112 232 +160 80 144 +40 120 144 +24 68 96 +64 144 192 248 248 248 -176 176 192 -128 64 88 +192 192 160 +168 16 0 112 112 88 -224 112 152 -240 240 240 -208 200 208 +232 64 48 +240 240 248 +232 232 216 diff --git a/graphics/pokemon/nidoqueen/anim_front.png b/graphics/pokemon/nidoqueen/anim_front.png index 5e55246fa..58950bb34 100644 Binary files a/graphics/pokemon/nidoqueen/anim_front.png and b/graphics/pokemon/nidoqueen/anim_front.png differ diff --git a/graphics/pokemon/nidoqueen/front.png b/graphics/pokemon/nidoqueen/front.png index 3c593c585..b66809612 100644 Binary files a/graphics/pokemon/nidoqueen/front.png and b/graphics/pokemon/nidoqueen/front.png differ diff --git a/graphics/pokemon/nidoqueen/normal.pal b/graphics/pokemon/nidoqueen/normal.pal index 7be03f2aa..b1c43f5f8 100644 --- a/graphics/pokemon/nidoqueen/normal.pal +++ b/graphics/pokemon/nidoqueen/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -80 112 144 -120 168 192 -48 64 80 +72 128 184 +120 184 248 +40 80 128 16 16 16 160 128 104 -96 88 48 -96 72 56 -160 200 232 +128 96 96 +96 72 72 +152 216 248 208 208 208 248 248 248 -184 176 128 -224 208 152 -248 232 192 -130 91 99 -216 153 175 +200 184 144 +232 232 168 +248 248 208 +112 40 40 +232 128 120 diff --git a/graphics/pokemon/nidoran_f/anim_front.png b/graphics/pokemon/nidoran_f/anim_front.png index 1cf3106f6..15d742ab9 100644 Binary files a/graphics/pokemon/nidoran_f/anim_front.png and b/graphics/pokemon/nidoran_f/anim_front.png differ diff --git a/graphics/pokemon/nidoran_f/front.png b/graphics/pokemon/nidoran_f/front.png index 6b6f116aa..1e84b1d99 100644 Binary files a/graphics/pokemon/nidoran_f/front.png and b/graphics/pokemon/nidoran_f/front.png differ diff --git a/graphics/pokemon/nidoran_f/normal.pal b/graphics/pokemon/nidoran_f/normal.pal index 439c5290a..16d475109 100644 --- a/graphics/pokemon/nidoran_f/normal.pal +++ b/graphics/pokemon/nidoran_f/normal.pal @@ -10,9 +10,9 @@ JASC-PAL 32 152 160 16 16 16 248 248 248 -176 48 40 +184 48 72 232 232 248 -248 112 80 +248 80 64 216 216 216 0 0 0 0 0 0 diff --git a/graphics/pokemon/nidoran_m/anim_front.png b/graphics/pokemon/nidoran_m/anim_front.png index e36c4ddd1..dc2eff8a0 100644 Binary files a/graphics/pokemon/nidoran_m/anim_front.png and b/graphics/pokemon/nidoran_m/anim_front.png differ diff --git a/graphics/pokemon/nidoran_m/front.png b/graphics/pokemon/nidoran_m/front.png index 13f935c68..c94dfdc0e 100644 Binary files a/graphics/pokemon/nidoran_m/front.png and b/graphics/pokemon/nidoran_m/front.png differ diff --git a/graphics/pokemon/nidoran_m/normal.pal b/graphics/pokemon/nidoran_m/normal.pal index 8534782ca..fb292bfd0 100644 --- a/graphics/pokemon/nidoran_m/normal.pal +++ b/graphics/pokemon/nidoran_m/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -160 96 160 -200 136 208 -104 56 104 +184 96 192 +224 152 208 +96 64 104 16 16 16 -224 168 232 -24 96 88 -16 136 128 +232 184 232 +0 96 64 +0 160 112 200 200 200 -240 120 96 +248 104 80 248 248 248 -216 40 56 -0 0 0 +216 64 40 +176 24 0 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/nidorina/anim_front.png b/graphics/pokemon/nidorina/anim_front.png index 4d282ca45..9d4f3853b 100644 Binary files a/graphics/pokemon/nidorina/anim_front.png and b/graphics/pokemon/nidorina/anim_front.png differ diff --git a/graphics/pokemon/nidorina/front.png b/graphics/pokemon/nidorina/front.png index da526a47f..c5e3e7b85 100644 Binary files a/graphics/pokemon/nidorina/front.png and b/graphics/pokemon/nidorina/front.png differ diff --git a/graphics/pokemon/nidorina/normal.pal b/graphics/pokemon/nidorina/normal.pal index 6341a73ff..1ad762c66 100644 --- a/graphics/pokemon/nidorina/normal.pal +++ b/graphics/pokemon/nidorina/normal.pal @@ -7,13 +7,13 @@ JASC-PAL 44 76 114 16 16 16 141 190 201 -32 60 102 -51 115 178 -85 150 193 +24 56 112 +16 96 176 +72 128 240 255 255 255 214 214 214 -201 47 30 -255 145 117 +192 32 16 +248 144 112 232 72 56 131 131 131 0 0 0 diff --git a/graphics/pokemon/nidorino/anim_front.png b/graphics/pokemon/nidorino/anim_front.png index 4ab2ddbaa..30369bf7e 100644 Binary files a/graphics/pokemon/nidorino/anim_front.png and b/graphics/pokemon/nidorino/anim_front.png differ diff --git a/graphics/pokemon/nidorino/front.png b/graphics/pokemon/nidorino/front.png index 4c5421919..67cfc4922 100644 Binary files a/graphics/pokemon/nidorino/front.png and b/graphics/pokemon/nidorino/front.png differ diff --git a/graphics/pokemon/nidorino/normal.pal b/graphics/pokemon/nidorino/normal.pal index be5b92892..1c2aee97c 100644 --- a/graphics/pokemon/nidorino/normal.pal +++ b/graphics/pokemon/nidorino/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 88 56 96 -184 136 192 +200 128 216 16 16 16 -208 176 216 +224 168 232 144 96 152 -72 120 120 -80 160 160 +0 144 96 +72 200 160 248 248 248 128 128 128 192 192 192 -88 56 88 -145 82 101 -204 138 162 +144 88 176 +168 40 40 +232 128 120 0 0 0 0 0 0 diff --git a/graphics/pokemon/nincada/anim_front.png b/graphics/pokemon/nincada/anim_front.png index 7852df8d3..261fbc098 100644 Binary files a/graphics/pokemon/nincada/anim_front.png and b/graphics/pokemon/nincada/anim_front.png differ diff --git a/graphics/pokemon/nincada/front.png b/graphics/pokemon/nincada/front.png index b7239dcee..1c408a81d 100644 Binary files a/graphics/pokemon/nincada/front.png and b/graphics/pokemon/nincada/front.png differ diff --git a/graphics/pokemon/nincada/normal.pal b/graphics/pokemon/nincada/normal.pal index cfd79f8ec..e6dd6a53d 100644 --- a/graphics/pokemon/nincada/normal.pal +++ b/graphics/pokemon/nincada/normal.pal @@ -2,11 +2,11 @@ JASC-PAL 0100 16 0 176 232 -112 144 72 +64 120 80 24 24 24 -216 232 168 +176 216 112 104 104 96 -168 200 112 +112 168 88 240 248 248 120 128 144 184 192 208 diff --git a/graphics/pokemon/ninetales/anim_front.png b/graphics/pokemon/ninetales/anim_front.png index a3bcf64b4..643f1ef8c 100644 Binary files a/graphics/pokemon/ninetales/anim_front.png and b/graphics/pokemon/ninetales/anim_front.png differ diff --git a/graphics/pokemon/ninetales/front.png b/graphics/pokemon/ninetales/front.png index bdae540fc..7b33c6f41 100644 Binary files a/graphics/pokemon/ninetales/front.png and b/graphics/pokemon/ninetales/front.png differ diff --git a/graphics/pokemon/ninetales/normal.pal b/graphics/pokemon/ninetales/normal.pal index 64191711a..e0dfb21c5 100644 --- a/graphics/pokemon/ninetales/normal.pal +++ b/graphics/pokemon/ninetales/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -176 160 104 -112 96 56 -248 232 144 +200 152 72 +128 96 24 +240 224 120 16 16 16 -216 192 112 +224 192 80 176 72 48 248 248 248 -224 112 88 -232 184 88 -224 152 48 -175 105 127 +248 104 40 +248 160 56 +232 128 40 +168 16 0 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/ninjask/anim_front.png b/graphics/pokemon/ninjask/anim_front.png index 04bc142f4..bca98030c 100644 Binary files a/graphics/pokemon/ninjask/anim_front.png and b/graphics/pokemon/ninjask/anim_front.png differ diff --git a/graphics/pokemon/ninjask/front.png b/graphics/pokemon/ninjask/front.png index 7f6018900..f7c0d20dc 100644 Binary files a/graphics/pokemon/ninjask/front.png and b/graphics/pokemon/ninjask/front.png differ diff --git a/graphics/pokemon/ninjask/normal.pal b/graphics/pokemon/ninjask/normal.pal index 94fb08586..d8dda49bf 100644 --- a/graphics/pokemon/ninjask/normal.pal +++ b/graphics/pokemon/ninjask/normal.pal @@ -5,15 +5,15 @@ JASC-PAL 144 144 152 96 96 96 248 248 248 -16 16 16 -128 48 48 -200 48 64 -216 72 88 -184 176 208 +0 0 0 +152 32 64 +192 48 80 +216 48 88 +168 176 176 128 56 56 -136 96 56 -216 208 232 -248 216 104 -208 168 96 +128 96 64 +216 216 208 +248 208 96 +224 168 72 56 56 56 -120 112 128 +120 120 120 diff --git a/graphics/pokemon/noctowl/anim_front.png b/graphics/pokemon/noctowl/anim_front.png index 5e052f2a9..e6ff6d210 100644 Binary files a/graphics/pokemon/noctowl/anim_front.png and b/graphics/pokemon/noctowl/anim_front.png differ diff --git a/graphics/pokemon/noctowl/back.png b/graphics/pokemon/noctowl/back.png index 1453fabec..3900e31bb 100644 Binary files a/graphics/pokemon/noctowl/back.png and b/graphics/pokemon/noctowl/back.png differ diff --git a/graphics/pokemon/noctowl/front.png b/graphics/pokemon/noctowl/front.png index 68af918f7..6665234c0 100644 Binary files a/graphics/pokemon/noctowl/front.png and b/graphics/pokemon/noctowl/front.png differ diff --git a/graphics/pokemon/noctowl/normal.pal b/graphics/pokemon/noctowl/normal.pal index 88ca3a743..cf763b733 100644 --- a/graphics/pokemon/noctowl/normal.pal +++ b/graphics/pokemon/noctowl/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -144 104 80 -80 48 40 -240 216 152 -112 72 64 -200 176 120 -48 32 24 -184 128 104 +176 120 80 +96 64 48 +240 224 168 +120 88 72 +216 184 144 +64 40 32 +200 144 112 16 16 16 -152 128 112 +96 96 96 248 248 248 -168 40 48 +192 48 24 +152 0 0 192 192 192 -128 80 56 -224 168 144 +144 88 56 160 128 104 diff --git a/graphics/pokemon/noctowl/shiny.pal b/graphics/pokemon/noctowl/shiny.pal index 0bb0f2890..033b7f62f 100644 --- a/graphics/pokemon/noctowl/shiny.pal +++ b/graphics/pokemon/noctowl/shiny.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 160 168 48 -128 80 16 -240 240 176 -176 104 32 +136 80 16 +240 248 144 +184 104 16 224 224 112 -64 48 8 +80 56 0 200 208 72 16 16 16 -128 128 128 +96 96 96 248 248 248 -144 16 16 +192 48 24 +152 0 0 192 192 192 112 120 0 -224 224 112 208 152 48 diff --git a/graphics/pokemon/nosepass/anim_front.png b/graphics/pokemon/nosepass/anim_front.png index 046b3d532..accd29014 100644 Binary files a/graphics/pokemon/nosepass/anim_front.png and b/graphics/pokemon/nosepass/anim_front.png differ diff --git a/graphics/pokemon/nosepass/front.png b/graphics/pokemon/nosepass/front.png index 9d876776c..695577233 100644 Binary files a/graphics/pokemon/nosepass/front.png and b/graphics/pokemon/nosepass/front.png differ diff --git a/graphics/pokemon/nosepass/normal.pal b/graphics/pokemon/nosepass/normal.pal index 4e626c98f..1cb62baaa 100644 --- a/graphics/pokemon/nosepass/normal.pal +++ b/graphics/pokemon/nosepass/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -64 80 152 -40 48 88 -136 160 216 -88 112 184 -168 192 232 -16 16 16 -160 40 48 -208 72 80 -240 160 160 -240 104 112 -88 24 32 +65 82 156 +49 49 74 +139 164 230 +98 123 189 +172 189 246 +0 0 0 +156 49 74 +222 82 82 +255 148 148 +255 106 123 +90 24 32 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/numel/anim_front.png b/graphics/pokemon/numel/anim_front.png index 3fd2c74f3..b94c34a1a 100644 Binary files a/graphics/pokemon/numel/anim_front.png and b/graphics/pokemon/numel/anim_front.png differ diff --git a/graphics/pokemon/numel/front.png b/graphics/pokemon/numel/front.png index 610bf14a9..2df10f3c7 100644 Binary files a/graphics/pokemon/numel/front.png and b/graphics/pokemon/numel/front.png differ diff --git a/graphics/pokemon/numel/normal.pal b/graphics/pokemon/numel/normal.pal index 4cf321fb0..63829ec54 100644 --- a/graphics/pokemon/numel/normal.pal +++ b/graphics/pokemon/numel/normal.pal @@ -4,16 +4,16 @@ JASC-PAL 0 176 232 24 24 24 112 96 80 -248 216 120 -216 168 96 +240 216 80 +216 176 72 144 120 80 -64 104 64 -144 216 176 -112 184 120 -240 232 200 -208 192 144 +72 104 80 +144 224 152 +112 192 96 +240 240 160 +208 208 144 248 248 248 208 200 216 -96 152 96 +88 144 88 0 0 0 0 0 0 diff --git a/graphics/pokemon/nuzleaf/anim_front.png b/graphics/pokemon/nuzleaf/anim_front.png index ebdd431db..796a50b31 100644 Binary files a/graphics/pokemon/nuzleaf/anim_front.png and b/graphics/pokemon/nuzleaf/anim_front.png differ diff --git a/graphics/pokemon/nuzleaf/front.png b/graphics/pokemon/nuzleaf/front.png index 1cbe64867..173398f52 100644 Binary files a/graphics/pokemon/nuzleaf/front.png and b/graphics/pokemon/nuzleaf/front.png differ diff --git a/graphics/pokemon/nuzleaf/normal.pal b/graphics/pokemon/nuzleaf/normal.pal index b6fdb2223..debc6d0b4 100644 --- a/graphics/pokemon/nuzleaf/normal.pal +++ b/graphics/pokemon/nuzleaf/normal.pal @@ -2,10 +2,10 @@ JASC-PAL 0100 16 0 176 232 -40 112 80 -120 200 160 -88 168 120 -56 136 96 +56 112 56 +136 208 120 +96 176 96 +88 152 72 16 16 16 128 120 104 160 104 80 @@ -16,4 +16,4 @@ JASC-PAL 184 168 152 200 200 232 248 248 248 -176 112 128 +184 88 104 diff --git a/graphics/pokemon/octillery/anim_front.png b/graphics/pokemon/octillery/anim_front.png index de9ffd250..f7e1aec68 100644 Binary files a/graphics/pokemon/octillery/anim_front.png and b/graphics/pokemon/octillery/anim_front.png differ diff --git a/graphics/pokemon/octillery/front.png b/graphics/pokemon/octillery/front.png index eb8a71c03..2fc250c8d 100644 Binary files a/graphics/pokemon/octillery/front.png and b/graphics/pokemon/octillery/front.png differ diff --git a/graphics/pokemon/octillery/normal.pal b/graphics/pokemon/octillery/normal.pal index 7ba40e531..804bec180 100644 --- a/graphics/pokemon/octillery/normal.pal +++ b/graphics/pokemon/octillery/normal.pal @@ -6,7 +6,7 @@ JASC-PAL 96 32 24 208 168 56 248 216 96 -160 48 40 +192 48 40 240 64 56 16 16 16 240 120 104 diff --git a/graphics/pokemon/oddish/anim_front.png b/graphics/pokemon/oddish/anim_front.png index cf28c6f33..cd1f5e16c 100644 Binary files a/graphics/pokemon/oddish/anim_front.png and b/graphics/pokemon/oddish/anim_front.png differ diff --git a/graphics/pokemon/oddish/front.png b/graphics/pokemon/oddish/front.png index a78bfd33e..345e4c509 100644 Binary files a/graphics/pokemon/oddish/front.png and b/graphics/pokemon/oddish/front.png differ diff --git a/graphics/pokemon/oddish/normal.pal b/graphics/pokemon/oddish/normal.pal index 29fd79b9e..0a9d87c1a 100644 --- a/graphics/pokemon/oddish/normal.pal +++ b/graphics/pokemon/oddish/normal.pal @@ -1,17 +1,17 @@ JASC-PAL 0100 16 -153 210 164 -59 145 36 -59 96 40 -68 181 48 -134 198 109 +248 192 192 +48 136 16 +32 88 8 +56 184 32 +136 200 88 16 16 16 -63 109 140 -105 150 173 -126 178 204 -234 72 60 -41 65 89 +56 96 136 +112 144 168 +136 168 192 +232 56 48 +40 56 72 178 92 121 214 149 172 0 0 0 diff --git a/graphics/pokemon/omanyte/anim_front.png b/graphics/pokemon/omanyte/anim_front.png index 95912686b..d6d8d6705 100644 Binary files a/graphics/pokemon/omanyte/anim_front.png and b/graphics/pokemon/omanyte/anim_front.png differ diff --git a/graphics/pokemon/omanyte/front.png b/graphics/pokemon/omanyte/front.png index 0bec6af81..eb805c417 100644 Binary files a/graphics/pokemon/omanyte/front.png and b/graphics/pokemon/omanyte/front.png differ diff --git a/graphics/pokemon/omanyte/normal.pal b/graphics/pokemon/omanyte/normal.pal index 622829ed8..24f024ad2 100644 --- a/graphics/pokemon/omanyte/normal.pal +++ b/graphics/pokemon/omanyte/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -96 88 56 -152 144 104 -232 224 160 -192 184 136 -248 240 200 -16 16 8 -64 136 152 -40 88 96 -136 208 224 -80 176 192 +96 80 48 +152 128 104 +224 216 128 +192 168 112 +248 232 192 +0 0 0 +64 104 168 +56 64 128 +96 184 240 +56 152 200 248 248 248 -184 184 184 -88 88 88 +192 192 192 +104 104 104 152 224 240 0 0 0 diff --git a/graphics/pokemon/omastar/anim_front.png b/graphics/pokemon/omastar/anim_front.png index 7d57973e9..42d693d72 100644 Binary files a/graphics/pokemon/omastar/anim_front.png and b/graphics/pokemon/omastar/anim_front.png differ diff --git a/graphics/pokemon/omastar/front.png b/graphics/pokemon/omastar/front.png index bac3d51bf..87796c37d 100644 Binary files a/graphics/pokemon/omastar/front.png and b/graphics/pokemon/omastar/front.png differ diff --git a/graphics/pokemon/omastar/normal.pal b/graphics/pokemon/omastar/normal.pal index fdc66b01f..1ca4d0965 100644 --- a/graphics/pokemon/omastar/normal.pal +++ b/graphics/pokemon/omastar/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -96 80 72 -232 216 168 -16 16 8 -184 168 120 -144 128 96 -248 240 216 -48 104 128 -48 72 88 -120 200 224 -72 152 168 -248 232 152 -184 168 104 -248 248 248 -88 0 48 +96 80 64 +224 216 128 +0 0 0 +192 168 112 +152 128 104 +248 232 192 +64 104 168 +56 64 128 +96 184 240 +56 152 200 +248 240 152 +248 248 248 +64 64 64 +168 0 0 0 0 0 diff --git a/graphics/pokemon/onix/anim_front.png b/graphics/pokemon/onix/anim_front.png index d9f79fab8..65409126f 100644 Binary files a/graphics/pokemon/onix/anim_front.png and b/graphics/pokemon/onix/anim_front.png differ diff --git a/graphics/pokemon/onix/front.png b/graphics/pokemon/onix/front.png index 806b0c5ac..e28cd8a82 100644 Binary files a/graphics/pokemon/onix/front.png and b/graphics/pokemon/onix/front.png differ diff --git a/graphics/pokemon/onix/normal.pal b/graphics/pokemon/onix/normal.pal index 5bd1b7e4d..871cca5d8 100644 --- a/graphics/pokemon/onix/normal.pal +++ b/graphics/pokemon/onix/normal.pal @@ -2,12 +2,12 @@ JASC-PAL 0100 16 152 208 160 -56 56 72 -104 104 120 -192 192 200 -144 136 152 +72 64 72 +112 104 128 +200 200 208 +152 144 152 16 16 16 -168 176 192 +176 176 184 248 248 248 248 248 248 0 0 0 diff --git a/graphics/pokemon/oshawott/anim_front.png b/graphics/pokemon/oshawott/anim_front.png index 4b8fbcf86..d1fbab7f9 100644 Binary files a/graphics/pokemon/oshawott/anim_front.png and b/graphics/pokemon/oshawott/anim_front.png differ diff --git a/graphics/pokemon/oshawott/front.png b/graphics/pokemon/oshawott/front.png index a244e07d8..4a0a0004a 100644 Binary files a/graphics/pokemon/oshawott/front.png and b/graphics/pokemon/oshawott/front.png differ diff --git a/graphics/pokemon/oshawott/normal.pal b/graphics/pokemon/oshawott/normal.pal index 1c743f619..2839bcc48 100644 --- a/graphics/pokemon/oshawott/normal.pal +++ b/graphics/pokemon/oshawott/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -56 72 88 -112 144 176 -248 248 248 -64 96 144 -112 128 168 -40 64 80 -16 16 16 -136 96 48 -192 144 88 -184 200 232 -40 104 112 -112 200 192 -56 152 160 -120 104 64 +74 74 74 +139 139 156 +255 255 255 +49 65 106 +74 106 172 +41 65 82 +0 0 0 +139 90 49 +197 148 41 +197 197 205 +32 90 98 +41 189 197 +32 148 156 +139 90 49 248 224 144 diff --git a/graphics/pokemon/pachirisu/anim_front.png b/graphics/pokemon/pachirisu/anim_front.png index 45d9f3843..8af3f81c8 100644 Binary files a/graphics/pokemon/pachirisu/anim_front.png and b/graphics/pokemon/pachirisu/anim_front.png differ diff --git a/graphics/pokemon/pachirisu/front.png b/graphics/pokemon/pachirisu/front.png index 0096f3f58..7d60cf8df 100644 Binary files a/graphics/pokemon/pachirisu/front.png and b/graphics/pokemon/pachirisu/front.png differ diff --git a/graphics/pokemon/pachirisu/normal.pal b/graphics/pokemon/pachirisu/normal.pal index 680ae079f..c8c18447f 100644 --- a/graphics/pokemon/pachirisu/normal.pal +++ b/graphics/pokemon/pachirisu/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -40 96 112 -128 208 216 -80 160 176 -112 120 136 -232 240 248 +72 64 88 +120 176 224 +96 120 152 +120 120 128 +240 240 240 16 16 16 -184 200 208 -72 88 96 +200 192 192 +88 80 72 248 208 96 -128 88 120 -176 160 80 -216 152 168 +128 80 56 +192 160 96 +232 128 88 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/palkia/anim_front.png b/graphics/pokemon/palkia/anim_front.png index 3b408c2a6..73c70a694 100644 Binary files a/graphics/pokemon/palkia/anim_front.png and b/graphics/pokemon/palkia/anim_front.png differ diff --git a/graphics/pokemon/palkia/front.png b/graphics/pokemon/palkia/front.png index 16ae684d5..4e2d3f513 100644 Binary files a/graphics/pokemon/palkia/front.png and b/graphics/pokemon/palkia/front.png differ diff --git a/graphics/pokemon/palkia/normal.pal b/graphics/pokemon/palkia/normal.pal index 724a400a5..6dea576dc 100644 --- a/graphics/pokemon/palkia/normal.pal +++ b/graphics/pokemon/palkia/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -88 104 120 -136 120 128 -232 224 224 -184 160 168 +112 112 120 +160 152 176 +240 232 248 +208 184 216 216 224 248 176 184 216 144 144 160 -176 96 176 -120 64 128 -40 48 72 +192 104 216 +136 80 144 +56 56 56 240 232 248 248 248 248 -200 112 136 +248 80 64 16 16 16 248 176 168 diff --git a/graphics/pokemon/palpitoad/anim_front.png b/graphics/pokemon/palpitoad/anim_front.png index 8a7f2e8ad..27fba830e 100644 Binary files a/graphics/pokemon/palpitoad/anim_front.png and b/graphics/pokemon/palpitoad/anim_front.png differ diff --git a/graphics/pokemon/palpitoad/front.png b/graphics/pokemon/palpitoad/front.png index 84d79d36d..05b2a8b24 100644 Binary files a/graphics/pokemon/palpitoad/front.png and b/graphics/pokemon/palpitoad/front.png differ diff --git a/graphics/pokemon/palpitoad/normal.pal b/graphics/pokemon/palpitoad/normal.pal index 3cea44ce6..60ac03fa7 100644 --- a/graphics/pokemon/palpitoad/normal.pal +++ b/graphics/pokemon/palpitoad/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -56 112 104 -16 16 16 -152 224 208 -88 168 168 -64 56 64 -40 32 40 -104 88 88 -40 128 192 -16 64 96 -48 96 136 -192 176 192 +24 96 112 +0 0 0 +128 224 208 +80 160 176 +64 64 64 +40 40 40 +96 96 96 +8 144 208 +16 64 120 +40 104 168 +192 192 192 248 248 248 -128 96 64 -176 144 104 -248 216 152 +144 88 72 +192 152 128 +248 216 184 diff --git a/graphics/pokemon/panpour/anim_front.png b/graphics/pokemon/panpour/anim_front.png index 82852a4c8..84233aa35 100644 Binary files a/graphics/pokemon/panpour/anim_front.png and b/graphics/pokemon/panpour/anim_front.png differ diff --git a/graphics/pokemon/panpour/front.png b/graphics/pokemon/panpour/front.png index aa54ff9ff..bc17b1fbc 100644 Binary files a/graphics/pokemon/panpour/front.png and b/graphics/pokemon/panpour/front.png differ diff --git a/graphics/pokemon/panpour/normal.pal b/graphics/pokemon/panpour/normal.pal index 7800417a2..ffee37021 100644 --- a/graphics/pokemon/panpour/normal.pal +++ b/graphics/pokemon/panpour/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -32 72 96 -16 16 16 -32 112 120 -48 136 152 -56 192 224 -112 208 216 +0 56 112 +0 0 0 +32 112 152 +24 136 168 +40 176 216 +152 224 232 248 248 248 -184 152 88 +200 160 88 80 80 80 -248 208 120 -120 96 48 -160 120 64 +248 200 120 +112 80 32 +160 120 56 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/pansage/anim_front.png b/graphics/pokemon/pansage/anim_front.png index a0ce10916..9eb2397d1 100644 Binary files a/graphics/pokemon/pansage/anim_front.png and b/graphics/pokemon/pansage/anim_front.png differ diff --git a/graphics/pokemon/pansage/front.png b/graphics/pokemon/pansage/front.png index 59962b064..63e3125ca 100644 Binary files a/graphics/pokemon/pansage/front.png and b/graphics/pokemon/pansage/front.png differ diff --git a/graphics/pokemon/pansage/normal.pal b/graphics/pokemon/pansage/normal.pal index 1bfb0afca..130477fb3 100644 --- a/graphics/pokemon/pansage/normal.pal +++ b/graphics/pokemon/pansage/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 0 176 232 -32 80 56 -16 16 16 -48 112 72 -64 160 104 -248 208 112 -192 160 88 -112 208 152 +24 72 40 +0 0 0 +8 112 48 +24 160 80 +248 200 120 +200 160 88 +128 200 152 248 248 248 192 192 192 80 80 80 128 128 128 -128 104 56 -120 72 96 -192 112 128 +112 80 32 +176 96 120 +240 152 168 160 120 56 diff --git a/graphics/pokemon/pansear/anim_front.png b/graphics/pokemon/pansear/anim_front.png index dea9e1dff..0510243a9 100644 Binary files a/graphics/pokemon/pansear/anim_front.png and b/graphics/pokemon/pansear/anim_front.png differ diff --git a/graphics/pokemon/pansear/front.png b/graphics/pokemon/pansear/front.png index d3138f97d..c7dc3a5b8 100644 Binary files a/graphics/pokemon/pansear/front.png and b/graphics/pokemon/pansear/front.png differ diff --git a/graphics/pokemon/pansear/normal.pal b/graphics/pokemon/pansear/normal.pal index 85a73a6dd..90eee6914 100644 --- a/graphics/pokemon/pansear/normal.pal +++ b/graphics/pokemon/pansear/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 48 56 -216 88 80 -16 16 16 -168 64 64 -240 152 40 +120 48 48 +224 80 64 +0 0 0 +184 64 56 +240 144 64 248 248 248 80 80 80 192 192 192 -248 216 136 -176 144 88 +248 200 120 +200 160 88 128 128 128 -104 80 48 +112 80 32 160 120 56 0 0 0 0 0 0 diff --git a/graphics/pokemon/paras/anim_front.png b/graphics/pokemon/paras/anim_front.png index 4d8251989..54a56c933 100644 Binary files a/graphics/pokemon/paras/anim_front.png and b/graphics/pokemon/paras/anim_front.png differ diff --git a/graphics/pokemon/paras/front.png b/graphics/pokemon/paras/front.png index 1724f0b6e..9f89688fd 100644 Binary files a/graphics/pokemon/paras/front.png and b/graphics/pokemon/paras/front.png differ diff --git a/graphics/pokemon/paras/normal.pal b/graphics/pokemon/paras/normal.pal index 0757a91a0..fcf39cf9f 100644 --- a/graphics/pokemon/paras/normal.pal +++ b/graphics/pokemon/paras/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -176 80 112 +192 64 64 96 56 64 -224 112 152 -224 168 88 -248 200 152 +248 104 104 +200 176 32 +248 216 80 16 16 16 -104 56 32 -48 24 8 -232 136 64 +112 72 24 +65 40 16 +232 128 40 168 144 72 -176 96 64 -240 160 112 +176 96 32 +248 168 96 88 88 88 -248 240 248 +248 248 248 200 200 200 diff --git a/graphics/pokemon/parasect/anim_front.png b/graphics/pokemon/parasect/anim_front.png index 98051569e..f424edf0c 100644 Binary files a/graphics/pokemon/parasect/anim_front.png and b/graphics/pokemon/parasect/anim_front.png differ diff --git a/graphics/pokemon/parasect/front.png b/graphics/pokemon/parasect/front.png index 8f9a86b11..5a841ffbc 100644 Binary files a/graphics/pokemon/parasect/front.png and b/graphics/pokemon/parasect/front.png differ diff --git a/graphics/pokemon/parasect/normal.pal b/graphics/pokemon/parasect/normal.pal index 5d22262ca..0d82fc25c 100644 --- a/graphics/pokemon/parasect/normal.pal +++ b/graphics/pokemon/parasect/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -120 32 72 -232 144 176 -208 112 152 -248 192 48 +120 8 8 +248 104 104 +240 48 48 +248 208 80 16 16 16 240 152 152 -232 160 40 -168 72 120 -96 56 24 -160 96 56 +208 200 48 +192 48 64 +96 16 0 +176 64 56 248 240 248 -232 136 64 -224 224 240 -168 176 192 +216 104 48 +208 208 208 +152 136 160 0 0 0 diff --git a/graphics/pokemon/patrat/anim_front.png b/graphics/pokemon/patrat/anim_front.png index dd72e2e5b..68bf54bc4 100644 Binary files a/graphics/pokemon/patrat/anim_front.png and b/graphics/pokemon/patrat/anim_front.png differ diff --git a/graphics/pokemon/patrat/front.png b/graphics/pokemon/patrat/front.png index e4bb97d89..3bc72d582 100644 Binary files a/graphics/pokemon/patrat/front.png and b/graphics/pokemon/patrat/front.png differ diff --git a/graphics/pokemon/patrat/normal.pal b/graphics/pokemon/patrat/normal.pal index d7c871fae..4eed15495 100644 --- a/graphics/pokemon/patrat/normal.pal +++ b/graphics/pokemon/patrat/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -128 88 56 -80 56 32 -168 120 72 -200 152 112 +120 80 72 +80 64 48 +152 104 48 +184 128 64 16 16 16 64 56 48 -232 72 64 +240 72 72 160 48 48 -248 184 40 -144 128 120 +248 152 40 +152 128 112 248 248 248 176 152 128 -216 192 160 -200 184 176 +208 184 144 +184 184 184 144 112 72 diff --git a/graphics/pokemon/pawniard/anim_front.png b/graphics/pokemon/pawniard/anim_front.png index 53ea2cf82..7fc6d3b72 100644 Binary files a/graphics/pokemon/pawniard/anim_front.png and b/graphics/pokemon/pawniard/anim_front.png differ diff --git a/graphics/pokemon/pawniard/front.png b/graphics/pokemon/pawniard/front.png index b6ddd9840..4d5434548 100644 Binary files a/graphics/pokemon/pawniard/front.png and b/graphics/pokemon/pawniard/front.png differ diff --git a/graphics/pokemon/pawniard/normal.pal b/graphics/pokemon/pawniard/normal.pal index b02c73517..b0af3a933 100644 --- a/graphics/pokemon/pawniard/normal.pal +++ b/graphics/pokemon/pawniard/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -72 8 24 -16 16 16 -168 80 80 +96 0 0 +0 0 0 +184 64 64 248 248 248 -104 32 40 +136 32 24 80 80 88 176 192 200 -32 32 40 -96 104 112 -248 160 72 -56 56 72 -168 104 56 +40 40 48 +96 96 96 +224 136 64 +64 64 80 +136 88 56 40 40 40 0 0 0 0 0 0 diff --git a/graphics/pokemon/pelipper/anim_front.png b/graphics/pokemon/pelipper/anim_front.png index 212ee7e96..d99325b03 100644 Binary files a/graphics/pokemon/pelipper/anim_front.png and b/graphics/pokemon/pelipper/anim_front.png differ diff --git a/graphics/pokemon/pelipper/front.png b/graphics/pokemon/pelipper/front.png index c4b09f097..145bb8e25 100644 Binary files a/graphics/pokemon/pelipper/front.png and b/graphics/pokemon/pelipper/front.png differ diff --git a/graphics/pokemon/pelipper/normal.pal b/graphics/pokemon/pelipper/normal.pal index f5dc1e8af..4aff65045 100644 --- a/graphics/pokemon/pelipper/normal.pal +++ b/graphics/pokemon/pelipper/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -48 96 120 +48 96 136 16 16 16 -80 152 192 -184 216 240 -96 192 224 -192 216 232 -96 104 128 +88 160 200 +160 224 248 +120 200 232 +200 208 232 +112 112 128 248 248 248 -120 96 48 -248 224 144 -176 144 88 -224 184 112 -248 232 216 -176 120 136 -160 184 216 +136 64 48 +248 216 72 +192 120 48 +240 176 48 +248 248 168 +200 64 80 +152 176 192 diff --git a/graphics/pokemon/persian/anim_front.png b/graphics/pokemon/persian/anim_front.png index 84e680836..ed960deab 100644 Binary files a/graphics/pokemon/persian/anim_front.png and b/graphics/pokemon/persian/anim_front.png differ diff --git a/graphics/pokemon/persian/front.png b/graphics/pokemon/persian/front.png index 41fd21211..650de8dd7 100644 Binary files a/graphics/pokemon/persian/front.png and b/graphics/pokemon/persian/front.png differ diff --git a/graphics/pokemon/persian/normal.pal b/graphics/pokemon/persian/normal.pal index 143470ddc..073415db2 100644 --- a/graphics/pokemon/persian/normal.pal +++ b/graphics/pokemon/persian/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -96 80 48 -152 120 96 -200 176 136 -208 168 128 -152 128 88 -240 216 160 -224 88 72 +128 80 0 +144 120 32 +216 176 104 +184 160 72 +176 128 40 +248 224 128 +240 80 64 248 248 248 -248 152 136 -168 48 32 +248 184 152 +160 16 0 216 216 216 -248 248 200 -137 93 113 -211 152 169 +248 248 168 +136 0 0 +232 64 48 diff --git a/graphics/pokemon/petilil/anim_front.png b/graphics/pokemon/petilil/anim_front.png index 4c0888055..f39753266 100644 Binary files a/graphics/pokemon/petilil/anim_front.png and b/graphics/pokemon/petilil/anim_front.png differ diff --git a/graphics/pokemon/petilil/front.png b/graphics/pokemon/petilil/front.png index 96c0708ad..735abb0fc 100644 Binary files a/graphics/pokemon/petilil/front.png and b/graphics/pokemon/petilil/front.png differ diff --git a/graphics/pokemon/petilil/normal.pal b/graphics/pokemon/petilil/normal.pal index 017ab544a..075f7727e 100644 --- a/graphics/pokemon/petilil/normal.pal +++ b/graphics/pokemon/petilil/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -40 88 48 -72 184 96 -56 128 64 +48 88 48 +56 168 56 +56 128 72 16 16 16 -160 168 88 -104 112 56 -200 224 128 -184 176 176 +152 184 72 +96 120 48 +192 232 120 +200 200 184 248 248 248 -160 96 80 -112 24 32 -176 192 112 +184 136 144 +120 48 56 +176 208 96 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/phanpy/anim_front.png b/graphics/pokemon/phanpy/anim_front.png index 7f8ab87fc..480c6bf5d 100644 Binary files a/graphics/pokemon/phanpy/anim_front.png and b/graphics/pokemon/phanpy/anim_front.png differ diff --git a/graphics/pokemon/phanpy/front.png b/graphics/pokemon/phanpy/front.png index aedd94523..22ef30963 100644 Binary files a/graphics/pokemon/phanpy/front.png and b/graphics/pokemon/phanpy/front.png differ diff --git a/graphics/pokemon/phanpy/normal.pal b/graphics/pokemon/phanpy/normal.pal index cc8705954..34fc47eff 100644 --- a/graphics/pokemon/phanpy/normal.pal +++ b/graphics/pokemon/phanpy/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 248 160 176 -80 144 144 -48 112 112 -144 224 224 -112 208 208 +64 152 144 +72 120 128 +160 224 224 +136 216 208 16 16 16 -112 40 16 -184 72 40 -232 112 88 +128 0 0 +184 56 48 +240 104 80 248 248 248 -96 184 184 +104 184 184 136 136 136 208 208 208 -127 82 90 -191 105 105 +168 16 0 +232 64 48 0 0 0 diff --git a/graphics/pokemon/phione/anim_front.png b/graphics/pokemon/phione/anim_front.png index e86b7ce3d..a2b680ab0 100644 Binary files a/graphics/pokemon/phione/anim_front.png and b/graphics/pokemon/phione/anim_front.png differ diff --git a/graphics/pokemon/phione/front.png b/graphics/pokemon/phione/front.png index 6241787c0..10f7d01b5 100644 Binary files a/graphics/pokemon/phione/front.png and b/graphics/pokemon/phione/front.png differ diff --git a/graphics/pokemon/phione/normal.pal b/graphics/pokemon/phione/normal.pal index df7697ede..54af1570d 100644 --- a/graphics/pokemon/phione/normal.pal +++ b/graphics/pokemon/phione/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -48 120 136 -40 80 112 -104 192 200 +48 120 168 +56 80 152 +104 192 240 16 16 16 -80 152 168 -168 224 216 -224 232 224 -32 112 160 +24 152 208 +152 224 248 +200 232 248 +24 104 216 248 248 248 72 80 104 -144 136 128 -160 32 32 -232 136 136 -208 64 64 +144 136 152 +168 56 40 +216 128 152 +224 64 16 0 0 0 diff --git a/graphics/pokemon/pichu/anim_front.png b/graphics/pokemon/pichu/anim_front.png index decfbed2e..4421c167d 100644 Binary files a/graphics/pokemon/pichu/anim_front.png and b/graphics/pokemon/pichu/anim_front.png differ diff --git a/graphics/pokemon/pichu/front.png b/graphics/pokemon/pichu/front.png index 8e743945b..f8974c37b 100644 Binary files a/graphics/pokemon/pichu/front.png and b/graphics/pokemon/pichu/front.png differ diff --git a/graphics/pokemon/pichu/normal.pal b/graphics/pokemon/pichu/normal.pal index e837eb8c3..dd2dc02dc 100644 --- a/graphics/pokemon/pichu/normal.pal +++ b/graphics/pokemon/pichu/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -16 16 16 -0 56 96 -144 120 64 -192 176 88 -248 232 112 -120 72 32 -248 232 168 -96 80 40 -144 136 120 -232 224 200 -224 136 136 -136 72 72 -200 96 96 +32 32 49 +82 65 65 +164 123 8 +197 172 16 +246 230 82 +131 90 41 +246 238 148 +98 74 16 +148 139 123 +238 230 205 +230 123 148 +139 32 32 +189 41 41 0 0 0 0 0 0 diff --git a/graphics/pokemon/pichu/spiky_eared/anim_front.png b/graphics/pokemon/pichu/spiky_eared/anim_front.png new file mode 100644 index 000000000..2721dc8bf Binary files /dev/null and b/graphics/pokemon/pichu/spiky_eared/anim_front.png differ diff --git a/graphics/pokemon/pichu/spiky_eared/back.png b/graphics/pokemon/pichu/spiky_eared/back.png index 4198a751e..7ab9bb92f 100644 Binary files a/graphics/pokemon/pichu/spiky_eared/back.png and b/graphics/pokemon/pichu/spiky_eared/back.png differ diff --git a/graphics/pokemon/pichu/spiky_eared/front.png b/graphics/pokemon/pichu/spiky_eared/front.png index 3eeb371a0..c16e4c56f 100644 Binary files a/graphics/pokemon/pichu/spiky_eared/front.png and b/graphics/pokemon/pichu/spiky_eared/front.png differ diff --git a/graphics/pokemon/pichu/spiky_eared/normal.pal b/graphics/pokemon/pichu/spiky_eared/normal.pal index e837eb8c3..e6f3db55b 100644 --- a/graphics/pokemon/pichu/spiky_eared/normal.pal +++ b/graphics/pokemon/pichu/spiky_eared/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -16 16 16 -0 56 96 -144 120 64 -192 176 88 -248 232 112 -120 72 32 -248 232 168 -96 80 40 -144 136 120 -232 224 200 -224 136 136 -136 72 72 -200 96 96 +32 32 49 +65 65 82 +164 123 8 +246 230 82 +197 172 16 0 0 0 +98 74 16 +131 90 41 +246 238 148 +148 139 123 +238 230 205 +230 123 148 +139 32 32 +189 41 41 0 0 0 diff --git a/graphics/pokemon/pichu/spiky_eared/shiny.pal b/graphics/pokemon/pichu/spiky_eared/shiny.pal index 65504fdf9..071dc35d8 100644 --- a/graphics/pokemon/pichu/spiky_eared/shiny.pal +++ b/graphics/pokemon/pichu/spiky_eared/shiny.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -16 16 16 -88 64 64 -184 120 0 -216 152 56 -248 216 24 -112 72 40 -248 232 104 -88 40 16 -144 136 120 -232 224 200 -248 48 64 -136 32 32 -184 40 40 +32 32 49 +82 65 65 +189 123 0 +255 213 0 +222 156 57 0 0 0 +90 32 0 +139 74 0 +255 238 106 +148 139 123 +238 230 205 +255 49 65 +139 32 32 +189 41 41 0 0 0 diff --git a/graphics/pokemon/pidgeot/anim_front.png b/graphics/pokemon/pidgeot/anim_front.png index 634a9f25a..2843c169a 100644 Binary files a/graphics/pokemon/pidgeot/anim_front.png and b/graphics/pokemon/pidgeot/anim_front.png differ diff --git a/graphics/pokemon/pidgeot/back.png b/graphics/pokemon/pidgeot/back.png index 73a389c6d..fabbbefe2 100644 Binary files a/graphics/pokemon/pidgeot/back.png and b/graphics/pokemon/pidgeot/back.png differ diff --git a/graphics/pokemon/pidgeot/normal.pal b/graphics/pokemon/pidgeot/normal.pal index 6af4e4fd0..7231eedde 100644 --- a/graphics/pokemon/pidgeot/normal.pal +++ b/graphics/pokemon/pidgeot/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -80 56 32 +88 64 40 16 16 16 -184 136 56 -120 88 40 -200 184 136 -240 224 152 -248 232 168 -248 192 88 -240 80 40 -112 48 32 -184 56 24 +192 144 80 +152 96 56 +200 192 120 +248 240 176 +248 240 120 +248 152 112 +248 96 64 +120 32 32 +192 56 24 192 176 192 248 248 248 -240 168 184 -192 120 136 +248 176 192 +192 136 128 diff --git a/graphics/pokemon/pidgeot/shiny.pal b/graphics/pokemon/pidgeot/shiny.pal index 38af03ee5..5b47a0d5d 100644 --- a/graphics/pokemon/pidgeot/shiny.pal +++ b/graphics/pokemon/pidgeot/shiny.pal @@ -9,7 +9,7 @@ JASC-PAL 232 200 96 248 248 144 248 248 144 -232 200 96 +248 248 96 248 216 48 192 96 0 240 168 32 diff --git a/graphics/pokemon/pidgeotto/anim_front.png b/graphics/pokemon/pidgeotto/anim_front.png index 4769ba49e..9d28c7568 100644 Binary files a/graphics/pokemon/pidgeotto/anim_front.png and b/graphics/pokemon/pidgeotto/anim_front.png differ diff --git a/graphics/pokemon/pidgeotto/back.png b/graphics/pokemon/pidgeotto/back.png index fa56e6eb6..8f5f1635a 100644 Binary files a/graphics/pokemon/pidgeotto/back.png and b/graphics/pokemon/pidgeotto/back.png differ diff --git a/graphics/pokemon/pidgeotto/front.png b/graphics/pokemon/pidgeotto/front.png index 992de7b99..bc3d85388 100644 Binary files a/graphics/pokemon/pidgeotto/front.png and b/graphics/pokemon/pidgeotto/front.png differ diff --git a/graphics/pokemon/pidgeotto/normal.pal b/graphics/pokemon/pidgeotto/normal.pal index 276a73847..a0ecd9339 100644 --- a/graphics/pokemon/pidgeotto/normal.pal +++ b/graphics/pokemon/pidgeotto/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 40 48 -184 56 72 -232 112 80 +136 40 24 +184 56 32 +232 96 64 16 16 16 -232 160 136 -168 112 48 +144 64 72 +176 104 56 248 248 248 -88 56 32 +104 56 40 120 120 128 -232 192 216 -192 128 152 -192 168 112 -208 192 144 +224 160 160 +192 112 120 +184 160 104 +216 208 144 240 232 176 -208 152 88 +208 144 36 diff --git a/graphics/pokemon/pidgeotto/shiny.pal b/graphics/pokemon/pidgeotto/shiny.pal index ed42ee40b..8281977d4 100644 --- a/graphics/pokemon/pidgeotto/shiny.pal +++ b/graphics/pokemon/pidgeotto/shiny.pal @@ -6,7 +6,7 @@ JASC-PAL 232 152 16 248 216 48 16 16 16 -248 248 120 +112 104 16 112 128 48 248 248 248 48 56 16 diff --git a/graphics/pokemon/pidgey/anim_front.png b/graphics/pokemon/pidgey/anim_front.png index f3c7166b8..351dd0a09 100644 Binary files a/graphics/pokemon/pidgey/anim_front.png and b/graphics/pokemon/pidgey/anim_front.png differ diff --git a/graphics/pokemon/pidgey/back.png b/graphics/pokemon/pidgey/back.png index 8147c1d48..8d18f2a39 100644 Binary files a/graphics/pokemon/pidgey/back.png and b/graphics/pokemon/pidgey/back.png differ diff --git a/graphics/pokemon/pidgey/front.png b/graphics/pokemon/pidgey/front.png index 7392b5480..985ca1286 100644 Binary files a/graphics/pokemon/pidgey/front.png and b/graphics/pokemon/pidgey/front.png differ diff --git a/graphics/pokemon/pidgey/normal.pal b/graphics/pokemon/pidgey/normal.pal index ca4a0c381..4488d161d 100644 --- a/graphics/pokemon/pidgey/normal.pal +++ b/graphics/pokemon/pidgey/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 64 32 -192 136 64 -144 96 40 +128 72 48 +216 152 40 +184 112 64 120 104 48 -216 200 136 +200 184 96 16 16 16 240 232 152 128 128 128 128 56 64 184 184 184 -224 176 184 +224 160 160 248 248 248 -192 120 136 -192 168 104 +192 112 120 +176 152 88 64 32 16 diff --git a/graphics/pokemon/pidove/anim_front.png b/graphics/pokemon/pidove/anim_front.png index 134efb10b..bf1c539f8 100644 Binary files a/graphics/pokemon/pidove/anim_front.png and b/graphics/pokemon/pidove/anim_front.png differ diff --git a/graphics/pokemon/pidove/front.png b/graphics/pokemon/pidove/front.png index 94399e9fa..590619087 100644 Binary files a/graphics/pokemon/pidove/front.png and b/graphics/pokemon/pidove/front.png differ diff --git a/graphics/pokemon/pidove/normal.pal b/graphics/pokemon/pidove/normal.pal index 369d91c42..0c6a21249 100644 --- a/graphics/pokemon/pidove/normal.pal +++ b/graphics/pokemon/pidove/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 128 128 128 -80 72 72 -16 16 16 -200 192 184 +72 72 72 +0 0 0 +192 192 200 160 160 160 -192 96 96 -208 144 40 -224 176 104 -152 104 24 -232 160 144 -112 56 80 +184 96 96 +208 144 24 +248 184 40 +160 104 16 +248 152 152 +104 48 56 248 248 248 -48 40 40 -24 24 32 -224 224 216 +40 40 40 +32 32 40 +216 216 216 diff --git a/graphics/pokemon/pignite/anim_front.png b/graphics/pokemon/pignite/anim_front.png index 74ef4a0d9..78f10f157 100644 Binary files a/graphics/pokemon/pignite/anim_front.png and b/graphics/pokemon/pignite/anim_front.png differ diff --git a/graphics/pokemon/pignite/front.png b/graphics/pokemon/pignite/front.png index b0a7ea374..39c020d57 100644 Binary files a/graphics/pokemon/pignite/front.png and b/graphics/pokemon/pignite/front.png differ diff --git a/graphics/pokemon/pignite/normal.pal b/graphics/pokemon/pignite/normal.pal index d4a19b093..7b1d26924 100644 --- a/graphics/pokemon/pignite/normal.pal +++ b/graphics/pokemon/pignite/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -72 48 48 +80 48 40 248 248 248 -208 184 184 -176 88 48 -232 112 56 -112 56 32 -240 192 48 +192 168 160 +184 88 48 +232 112 40 +120 56 40 +232 192 56 176 136 40 -96 88 32 -200 56 56 -48 32 32 -72 72 80 -48 40 56 -208 184 184 +112 96 16 +200 64 56 +56 32 32 +72 72 72 +56 56 56 +0 0 0 diff --git a/graphics/pokemon/pikachu/anim_front.png b/graphics/pokemon/pikachu/anim_front.png index 8fa27c7a7..494c29e17 100644 Binary files a/graphics/pokemon/pikachu/anim_front.png and b/graphics/pokemon/pikachu/anim_front.png differ diff --git a/graphics/pokemon/pikachu/front.png b/graphics/pokemon/pikachu/front.png index 304cb5b0e..9b1b6b0a0 100644 Binary files a/graphics/pokemon/pikachu/front.png and b/graphics/pokemon/pikachu/front.png differ diff --git a/graphics/pokemon/pikachu/normal.pal b/graphics/pokemon/pikachu/normal.pal index 6f0793caa..3d734a17d 100644 --- a/graphics/pokemon/pikachu/normal.pal +++ b/graphics/pokemon/pikachu/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -48 32 32 +40 40 40 88 56 32 -88 72 72 -200 168 88 -120 88 48 -248 216 120 -160 128 72 -248 232 176 +80 80 80 +248 192 32 +152 80 0 +248 232 80 +224 144 0 +248 248 168 248 248 248 -232 112 80 -208 80 56 -152 88 96 -208 112 144 +232 88 64 +200 32 24 +168 48 16 +224 80 56 0 0 0 diff --git a/graphics/pokemon/piloswine/anim_front.png b/graphics/pokemon/piloswine/anim_front.png index 1e30fabae..b02c23d17 100644 Binary files a/graphics/pokemon/piloswine/anim_front.png and b/graphics/pokemon/piloswine/anim_front.png differ diff --git a/graphics/pokemon/piloswine/front.png b/graphics/pokemon/piloswine/front.png index bd10b2655..1969f28ae 100644 Binary files a/graphics/pokemon/piloswine/front.png and b/graphics/pokemon/piloswine/front.png differ diff --git a/graphics/pokemon/piloswine/normal.pal b/graphics/pokemon/piloswine/normal.pal index 4d412a38a..2e1071439 100644 --- a/graphics/pokemon/piloswine/normal.pal +++ b/graphics/pokemon/piloswine/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 88 64 -56 40 24 -200 152 128 -176 120 96 -168 112 80 +120 96 80 +64 56 48 +192 152 112 +168 128 88 +144 112 88 16 16 16 112 48 64 -232 136 136 -216 208 200 -176 168 160 -176 88 96 +240 144 152 +200 208 208 +184 176 176 +176 96 112 72 72 64 248 248 248 -96 64 56 +96 72 64 0 0 0 diff --git a/graphics/pokemon/pineco/anim_front.png b/graphics/pokemon/pineco/anim_front.png index e72439b44..e2704f189 100644 Binary files a/graphics/pokemon/pineco/anim_front.png and b/graphics/pokemon/pineco/anim_front.png differ diff --git a/graphics/pokemon/pineco/front.png b/graphics/pokemon/pineco/front.png index c30fe4516..eec63a8ec 100644 Binary files a/graphics/pokemon/pineco/front.png and b/graphics/pokemon/pineco/front.png differ diff --git a/graphics/pokemon/pineco/normal.pal b/graphics/pokemon/pineco/normal.pal index 66db8e213..dae14d2d0 100644 --- a/graphics/pokemon/pineco/normal.pal +++ b/graphics/pokemon/pineco/normal.pal @@ -2,15 +2,15 @@ JASC-PAL 0100 16 248 160 176 -40 64 88 -64 112 104 -112 168 160 -80 144 136 +32 72 96 +56 128 160 +112 184 160 +80 168 176 248 248 248 16 16 16 152 160 160 -192 64 56 -184 216 200 +248 72 56 +152 224 192 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/pinsir/anim_front.png b/graphics/pokemon/pinsir/anim_front.png index d2d701911..00a5050da 100644 Binary files a/graphics/pokemon/pinsir/anim_front.png and b/graphics/pokemon/pinsir/anim_front.png differ diff --git a/graphics/pokemon/pinsir/front.png b/graphics/pokemon/pinsir/front.png index 5b5bd29ef..b0543cab8 100644 Binary files a/graphics/pokemon/pinsir/front.png and b/graphics/pokemon/pinsir/front.png differ diff --git a/graphics/pokemon/pinsir/normal.pal b/graphics/pokemon/pinsir/normal.pal index 1a1d2e6c4..118638fc1 100644 --- a/graphics/pokemon/pinsir/normal.pal +++ b/graphics/pokemon/pinsir/normal.pal @@ -8,12 +8,12 @@ JASC-PAL 176 160 144 184 176 184 248 248 248 -16 16 16 -112 88 80 -168 144 136 -224 192 192 -64 48 40 -144 112 112 +0 0 0 +120 96 88 +168 152 136 +200 184 176 +80 56 48 +152 136 112 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/piplup/anim_front.png b/graphics/pokemon/piplup/anim_front.png index f029f576a..1ed77ba1d 100644 Binary files a/graphics/pokemon/piplup/anim_front.png and b/graphics/pokemon/piplup/anim_front.png differ diff --git a/graphics/pokemon/piplup/front.png b/graphics/pokemon/piplup/front.png index ada0b7ac5..c2ce15cdc 100644 Binary files a/graphics/pokemon/piplup/front.png and b/graphics/pokemon/piplup/front.png differ diff --git a/graphics/pokemon/piplup/normal.pal b/graphics/pokemon/piplup/normal.pal index cae959ee2..3f2fc38e2 100644 --- a/graphics/pokemon/piplup/normal.pal +++ b/graphics/pokemon/piplup/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -40 96 144 -32 64 104 -80 152 208 -48 120 184 -144 208 216 +32 96 152 +16 72 112 +104 160 224 +48 136 208 +152 208 240 208 208 216 248 248 248 128 136 152 -112 160 184 +96 160 192 16 16 16 -168 144 40 -248 224 144 -232 192 24 -96 80 24 +168 128 56 +248 224 192 +240 200 64 +96 72 16 56 96 112 diff --git a/graphics/pokemon/plusle/anim_front.png b/graphics/pokemon/plusle/anim_front.png index 5d93d6f47..35b92aca3 100644 Binary files a/graphics/pokemon/plusle/anim_front.png and b/graphics/pokemon/plusle/anim_front.png differ diff --git a/graphics/pokemon/plusle/front.png b/graphics/pokemon/plusle/front.png index e38768d4e..87b761219 100644 Binary files a/graphics/pokemon/plusle/front.png and b/graphics/pokemon/plusle/front.png differ diff --git a/graphics/pokemon/plusle/normal.pal b/graphics/pokemon/plusle/normal.pal index f178cf4c8..95aa41e20 100644 --- a/graphics/pokemon/plusle/normal.pal +++ b/graphics/pokemon/plusle/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -168 48 64 -232 72 80 -240 136 136 +176 48 48 +216 72 64 +232 128 128 16 16 16 -248 240 184 -120 104 80 -208 192 128 -176 152 112 +248 232 176 +120 96 80 +224 192 112 +176 152 96 248 248 248 -88 16 72 -160 72 104 -216 144 176 +168 64 40 +168 56 80 +224 104 120 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/politoed/anim_front.png b/graphics/pokemon/politoed/anim_front.png index c2c5bbe1f..15378c27c 100644 Binary files a/graphics/pokemon/politoed/anim_front.png and b/graphics/pokemon/politoed/anim_front.png differ diff --git a/graphics/pokemon/politoed/front.png b/graphics/pokemon/politoed/front.png index a780e1c66..74d705c10 100644 Binary files a/graphics/pokemon/politoed/front.png and b/graphics/pokemon/politoed/front.png differ diff --git a/graphics/pokemon/politoed/normal.pal b/graphics/pokemon/politoed/normal.pal index 16a5e2efb..8b75ced72 100644 --- a/graphics/pokemon/politoed/normal.pal +++ b/graphics/pokemon/politoed/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -80 112 136 -128 168 192 +56 88 128 +80 128 192 16 16 16 -104 136 56 -64 96 16 -184 224 144 -128 200 64 +104 160 16 +48 112 0 +184 232 112 +136 200 24 248 248 248 200 200 200 -120 56 64 -128 112 48 -248 232 112 -232 112 128 -208 192 88 -248 144 160 +176 24 48 +136 88 0 +248 224 104 +224 104 48 +208 176 96 +248 144 192 diff --git a/graphics/pokemon/poliwag/anim_front.png b/graphics/pokemon/poliwag/anim_front.png index a9ce5d5fe..ab30eaa66 100644 Binary files a/graphics/pokemon/poliwag/anim_front.png and b/graphics/pokemon/poliwag/anim_front.png differ diff --git a/graphics/pokemon/poliwag/front.png b/graphics/pokemon/poliwag/front.png index d848b6841..6ca996b39 100644 Binary files a/graphics/pokemon/poliwag/front.png and b/graphics/pokemon/poliwag/front.png differ diff --git a/graphics/pokemon/poliwag/normal.pal b/graphics/pokemon/poliwag/normal.pal index f3362e8eb..ce4fa2191 100644 --- a/graphics/pokemon/poliwag/normal.pal +++ b/graphics/pokemon/poliwag/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -32 56 104 -144 176 224 -96 144 192 -56 96 144 +24 56 112 +136 160 224 +80 128 192 +56 88 128 248 248 248 16 16 16 -88 104 112 -152 184 208 +96 96 112 +192 192 208 248 208 240 -232 160 200 -200 112 160 -208 224 240 -64 120 176 +248 176 224 +216 120 184 +232 232 248 +56 112 168 0 0 0 0 0 0 diff --git a/graphics/pokemon/poliwhirl/anim_front.png b/graphics/pokemon/poliwhirl/anim_front.png index 9f84a7a50..1f3d22d94 100644 Binary files a/graphics/pokemon/poliwhirl/anim_front.png and b/graphics/pokemon/poliwhirl/anim_front.png differ diff --git a/graphics/pokemon/poliwhirl/front.png b/graphics/pokemon/poliwhirl/front.png index ec5080c2c..f61d52be2 100644 Binary files a/graphics/pokemon/poliwhirl/front.png and b/graphics/pokemon/poliwhirl/front.png differ diff --git a/graphics/pokemon/poliwhirl/normal.pal b/graphics/pokemon/poliwhirl/normal.pal index deb63b851..94840ecf3 100644 --- a/graphics/pokemon/poliwhirl/normal.pal +++ b/graphics/pokemon/poliwhirl/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -32 64 96 -56 88 136 -88 136 192 +24 56 112 +56 88 128 +80 128 192 248 248 248 -64 120 168 +56 112 168 80 80 80 -168 176 200 -16 16 16 -128 168 216 +184 184 192 +15 15 15 +136 160 224 120 120 120 136 152 160 -232 240 240 -192 208 224 +240 240 248 +208 208 216 0 0 0 0 0 0 diff --git a/graphics/pokemon/poliwrath/anim_front.png b/graphics/pokemon/poliwrath/anim_front.png index 38c2f2621..2e320c589 100644 Binary files a/graphics/pokemon/poliwrath/anim_front.png and b/graphics/pokemon/poliwrath/anim_front.png differ diff --git a/graphics/pokemon/poliwrath/front.png b/graphics/pokemon/poliwrath/front.png index f0c129412..98b4814b6 100644 Binary files a/graphics/pokemon/poliwrath/front.png and b/graphics/pokemon/poliwrath/front.png differ diff --git a/graphics/pokemon/poliwrath/normal.pal b/graphics/pokemon/poliwrath/normal.pal index c7fe30cbd..f3ae4d584 100644 --- a/graphics/pokemon/poliwrath/normal.pal +++ b/graphics/pokemon/poliwrath/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -56 96 136 -128 168 216 -32 56 104 -80 136 192 +56 88 128 +136 160 224 +24 56 112 +80 128 192 16 16 16 248 248 248 -200 208 232 -168 176 200 +200 200 216 +176 176 192 72 80 80 120 120 128 -232 240 248 +232 232 248 144 160 168 0 0 0 0 0 0 diff --git a/graphics/pokemon/ponyta/anim_front.png b/graphics/pokemon/ponyta/anim_front.png index 9acfb59e2..d46f4d163 100644 Binary files a/graphics/pokemon/ponyta/anim_front.png and b/graphics/pokemon/ponyta/anim_front.png differ diff --git a/graphics/pokemon/ponyta/front.png b/graphics/pokemon/ponyta/front.png index 164234252..5e60ecaec 100644 Binary files a/graphics/pokemon/ponyta/front.png and b/graphics/pokemon/ponyta/front.png differ diff --git a/graphics/pokemon/ponyta/normal.pal b/graphics/pokemon/ponyta/normal.pal index 83729cebe..d2af3d8c9 100644 --- a/graphics/pokemon/ponyta/normal.pal +++ b/graphics/pokemon/ponyta/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -232 80 40 -240 176 24 -248 216 80 -176 56 56 -136 112 80 -96 80 48 -248 240 200 +230 90 41 +255 156 24 +255 222 82 +238 49 49 +139 82 49 +115 49 49 +255 238 205 16 16 16 160 72 72 -224 208 144 -184 168 112 -248 248 248 -32 64 112 -88 120 168 -152 176 224 +230 205 139 +197 156 106 +255 255 255 +65 74 131 +115 123 164 +197 197 213 diff --git a/graphics/pokemon/poochyena/anim_front.png b/graphics/pokemon/poochyena/anim_front.png index 236e6cd26..46b6da0d1 100644 Binary files a/graphics/pokemon/poochyena/anim_front.png and b/graphics/pokemon/poochyena/anim_front.png differ diff --git a/graphics/pokemon/poochyena/front.png b/graphics/pokemon/poochyena/front.png index 4050b67a4..03cc345b0 100644 Binary files a/graphics/pokemon/poochyena/front.png and b/graphics/pokemon/poochyena/front.png differ diff --git a/graphics/pokemon/poochyena/normal.pal b/graphics/pokemon/poochyena/normal.pal index 46106af3a..39e07462a 100644 --- a/graphics/pokemon/poochyena/normal.pal +++ b/graphics/pokemon/poochyena/normal.pal @@ -7,8 +7,8 @@ JASC-PAL 184 192 192 144 152 160 48 56 56 -184 152 48 -248 208 104 +176 176 32 +240 240 88 104 24 40 248 248 248 184 40 64 diff --git a/graphics/pokemon/porygon/anim_front.png b/graphics/pokemon/porygon/anim_front.png index d3e88d2b3..bd6c33103 100644 Binary files a/graphics/pokemon/porygon/anim_front.png and b/graphics/pokemon/porygon/anim_front.png differ diff --git a/graphics/pokemon/porygon/front.png b/graphics/pokemon/porygon/front.png index ee054bf4f..52d47ce11 100644 Binary files a/graphics/pokemon/porygon/front.png and b/graphics/pokemon/porygon/front.png differ diff --git a/graphics/pokemon/porygon/normal.pal b/graphics/pokemon/porygon/normal.pal index 5dc5232da..6993dda1e 100644 --- a/graphics/pokemon/porygon/normal.pal +++ b/graphics/pokemon/porygon/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -160 64 72 -16 16 8 -232 88 104 -248 208 216 -248 168 184 +184 48 80 +0 0 0 +248 96 96 +240 208 192 +232 168 152 248 248 248 192 192 192 -32 80 88 -56 128 136 -160 224 232 -56 176 184 -104 32 40 +8 88 112 +0 120 144 +136 208 232 +8 168 208 +120 40 64 120 120 128 88 184 224 0 0 0 diff --git a/graphics/pokemon/porygon2/anim_front.png b/graphics/pokemon/porygon2/anim_front.png index e85aa8307..566ebfecb 100644 Binary files a/graphics/pokemon/porygon2/anim_front.png and b/graphics/pokemon/porygon2/anim_front.png differ diff --git a/graphics/pokemon/porygon2/front.png b/graphics/pokemon/porygon2/front.png index cbf576553..84f153fc7 100644 Binary files a/graphics/pokemon/porygon2/front.png and b/graphics/pokemon/porygon2/front.png differ diff --git a/graphics/pokemon/porygon2/normal.pal b/graphics/pokemon/porygon2/normal.pal index ff5557ac9..3b164bd13 100644 --- a/graphics/pokemon/porygon2/normal.pal +++ b/graphics/pokemon/porygon2/normal.pal @@ -3,14 +3,14 @@ JASC-PAL 16 152 208 160 160 56 88 -232 88 120 +232 88 96 88 48 56 -56 112 160 -240 152 168 +48 112 152 +248 144 176 248 248 248 -144 208 240 -72 160 200 -40 72 112 +136 216 248 +72 152 216 +40 56 96 16 16 16 192 208 232 104 104 120 diff --git a/graphics/pokemon/porygon_z/anim_front.png b/graphics/pokemon/porygon_z/anim_front.png index 7d6b66fc3..6ec9f0d12 100644 Binary files a/graphics/pokemon/porygon_z/anim_front.png and b/graphics/pokemon/porygon_z/anim_front.png differ diff --git a/graphics/pokemon/porygon_z/front.png b/graphics/pokemon/porygon_z/front.png index 71280133f..1f39bffa5 100644 Binary files a/graphics/pokemon/porygon_z/front.png and b/graphics/pokemon/porygon_z/front.png differ diff --git a/graphics/pokemon/porygon_z/normal.pal b/graphics/pokemon/porygon_z/normal.pal index a4c031833..1f4f3129c 100644 --- a/graphics/pokemon/porygon_z/normal.pal +++ b/graphics/pokemon/porygon_z/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 32 48 -160 48 72 -224 112 120 +88 56 72 +144 64 104 +232 88 96 16 16 16 -208 80 96 -240 160 152 +184 72 104 +248 144 176 248 248 248 -32 80 104 -48 120 152 -248 208 112 -160 208 208 -104 176 192 -104 88 72 -184 144 64 +48 56 96 +48 112 152 +248 208 96 +136 208 248 +72 152 208 +96 96 64 +176 144 72 0 0 0 diff --git a/graphics/pokemon/primeape/anim_front.png b/graphics/pokemon/primeape/anim_front.png index a06385df1..e07e1e7d7 100644 Binary files a/graphics/pokemon/primeape/anim_front.png and b/graphics/pokemon/primeape/anim_front.png differ diff --git a/graphics/pokemon/primeape/front.png b/graphics/pokemon/primeape/front.png index 77f95f5ee..c764645ef 100644 Binary files a/graphics/pokemon/primeape/front.png and b/graphics/pokemon/primeape/front.png differ diff --git a/graphics/pokemon/primeape/normal.pal b/graphics/pokemon/primeape/normal.pal index 8690860e9..9e19a46d7 100644 --- a/graphics/pokemon/primeape/normal.pal +++ b/graphics/pokemon/primeape/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -96 48 48 -144 96 96 -192 144 104 -16 16 16 -96 64 48 -240 208 192 +88 48 0 +152 104 104 +200 136 88 +0 0 0 +96 72 32 +248 224 176 64 64 64 -208 176 152 -112 112 112 -248 240 224 -200 136 152 +224 184 152 +120 120 120 +248 248 208 +248 144 88 248 248 248 -176 112 136 -240 168 200 +224 120 120 +248 168 168 224 176 136 diff --git a/graphics/pokemon/prinplup/anim_front.png b/graphics/pokemon/prinplup/anim_front.png index fd19649e1..b4180798f 100644 Binary files a/graphics/pokemon/prinplup/anim_front.png and b/graphics/pokemon/prinplup/anim_front.png differ diff --git a/graphics/pokemon/prinplup/front.png b/graphics/pokemon/prinplup/front.png index 9dd05921a..a4b84554d 100644 Binary files a/graphics/pokemon/prinplup/front.png and b/graphics/pokemon/prinplup/front.png differ diff --git a/graphics/pokemon/prinplup/normal.pal b/graphics/pokemon/prinplup/normal.pal index 8148637dd..ce088843c 100644 --- a/graphics/pokemon/prinplup/normal.pal +++ b/graphics/pokemon/prinplup/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -176 136 40 -128 104 32 -248 216 128 -232 184 80 +184 136 104 +120 80 64 +248 224 128 +232 200 96 16 16 16 -32 56 104 -48 88 144 -112 160 168 -144 200 208 +32 64 104 +32 88 144 +96 152 240 +152 200 248 216 232 248 248 248 248 56 120 176 -224 216 208 -120 176 184 -72 104 120 +184 200 216 +128 176 248 +0 0 0 diff --git a/graphics/pokemon/probopass/anim_front.png b/graphics/pokemon/probopass/anim_front.png index b6e8b7b80..bcca97230 100644 Binary files a/graphics/pokemon/probopass/anim_front.png and b/graphics/pokemon/probopass/anim_front.png differ diff --git a/graphics/pokemon/probopass/front.png b/graphics/pokemon/probopass/front.png index 78303af59..21916b376 100644 Binary files a/graphics/pokemon/probopass/front.png and b/graphics/pokemon/probopass/front.png differ diff --git a/graphics/pokemon/probopass/normal.pal b/graphics/pokemon/probopass/normal.pal index fa756aabe..6a4d6d266 100644 --- a/graphics/pokemon/probopass/normal.pal +++ b/graphics/pokemon/probopass/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -88 48 48 +102 48 40 16 16 16 -224 136 136 -200 88 88 -144 64 64 -56 48 48 +232 120 136 +224 88 96 +184 48 80 +40 56 72 192 200 216 248 248 248 -48 72 104 -72 104 136 -144 192 224 -88 136 176 -120 160 184 -80 72 72 +24 72 128 +56 96 168 +128 176 248 +88 120 208 +112 152 232 +56 72 88 0 0 0 diff --git a/graphics/pokemon/psyduck/anim_front.png b/graphics/pokemon/psyduck/anim_front.png index 7512a86cc..4129b5ea9 100644 Binary files a/graphics/pokemon/psyduck/anim_front.png and b/graphics/pokemon/psyduck/anim_front.png differ diff --git a/graphics/pokemon/psyduck/front.png b/graphics/pokemon/psyduck/front.png index f9f2961ae..138c13a95 100644 Binary files a/graphics/pokemon/psyduck/front.png and b/graphics/pokemon/psyduck/front.png differ diff --git a/graphics/pokemon/psyduck/normal.pal b/graphics/pokemon/psyduck/normal.pal index 2add90478..78d95442f 100644 --- a/graphics/pokemon/psyduck/normal.pal +++ b/graphics/pokemon/psyduck/normal.pal @@ -4,16 +4,16 @@ JASC-PAL 152 208 160 120 120 120 16 16 16 -136 96 48 -224 168 96 -248 208 128 -248 224 168 -192 176 144 +144 88 16 +224 160 80 +248 208 72 +248 224 160 +216 176 80 248 248 248 -128 104 72 -248 232 208 -232 208 176 -0 0 0 +128 88 0 +248 232 184 +240 216 136 +248 232 184 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/pupitar/anim_front.png b/graphics/pokemon/pupitar/anim_front.png index cb7cffbfa..c6e09e2d9 100644 Binary files a/graphics/pokemon/pupitar/anim_front.png and b/graphics/pokemon/pupitar/anim_front.png differ diff --git a/graphics/pokemon/pupitar/front.png b/graphics/pokemon/pupitar/front.png index 9cd2257d1..cc7fda715 100644 Binary files a/graphics/pokemon/pupitar/front.png and b/graphics/pokemon/pupitar/front.png differ diff --git a/graphics/pokemon/pupitar/normal.pal b/graphics/pokemon/pupitar/normal.pal index 256d175bf..08f030422 100644 --- a/graphics/pokemon/pupitar/normal.pal +++ b/graphics/pokemon/pupitar/normal.pal @@ -2,14 +2,14 @@ JASC-PAL 0100 16 248 160 176 -56 72 112 +64 88 120 16 16 16 -160 176 216 -192 200 224 -120 136 176 -176 168 168 +168 184 216 +208 216 232 +120 144 184 +168 168 168 248 248 248 -176 32 64 +176 64 0 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/purrloin/anim_front.png b/graphics/pokemon/purrloin/anim_front.png index 466461933..466fc9105 100644 Binary files a/graphics/pokemon/purrloin/anim_front.png and b/graphics/pokemon/purrloin/anim_front.png differ diff --git a/graphics/pokemon/purrloin/front.png b/graphics/pokemon/purrloin/front.png index 4b01c3f96..0d329d15c 100644 Binary files a/graphics/pokemon/purrloin/front.png and b/graphics/pokemon/purrloin/front.png differ diff --git a/graphics/pokemon/purrloin/normal.pal b/graphics/pokemon/purrloin/normal.pal index b897e66e2..312600cf0 100644 --- a/graphics/pokemon/purrloin/normal.pal +++ b/graphics/pokemon/purrloin/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -40 32 56 -112 80 136 +56 24 64 +120 80 120 16 16 16 -96 48 64 -208 88 152 +96 56 64 +216 112 152 240 232 192 -208 200 144 +216 200 136 248 248 248 -56 160 72 -112 208 112 -80 56 88 -160 144 112 -112 88 80 +8 184 96 +144 248 184 +96 56 104 +176 160 120 +120 104 72 0 0 0 0 0 0 diff --git a/graphics/pokemon/purugly/anim_front.png b/graphics/pokemon/purugly/anim_front.png index 12959a417..674df91b8 100644 Binary files a/graphics/pokemon/purugly/anim_front.png and b/graphics/pokemon/purugly/anim_front.png differ diff --git a/graphics/pokemon/purugly/front.png b/graphics/pokemon/purugly/front.png index c611eca72..4d8a5da49 100644 Binary files a/graphics/pokemon/purugly/front.png and b/graphics/pokemon/purugly/front.png differ diff --git a/graphics/pokemon/purugly/normal.pal b/graphics/pokemon/purugly/normal.pal index e7c17667a..4c9f993bd 100644 --- a/graphics/pokemon/purugly/normal.pal +++ b/graphics/pokemon/purugly/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -144 104 168 -96 72 112 -136 152 176 -72 80 96 -184 96 120 -104 112 136 -240 128 160 -168 184 192 -248 240 240 -48 48 80 -176 152 88 -240 200 120 -208 192 192 -176 152 144 +120 88 160 +80 56 104 +128 144 176 +80 88 96 +208 80 136 +104 112 128 +248 120 152 +160 168 192 +232 248 248 +64 64 80 +168 160 112 +248 224 96 +200 200 216 +152 152 184 diff --git a/graphics/pokemon/pyroar/normalf.pal b/graphics/pokemon/pyroar/normalf.pal deleted file mode 100644 index 63998f295..000000000 --- a/graphics/pokemon/pyroar/normalf.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -176 128 32 -120 0 0 -248 208 88 -224 80 64 -176 40 24 -32 24 24 -0 0 0 -88 72 64 -56 40 48 -176 128 80 -96 72 40 -232 176 112 -248 248 248 -0 168 192 -248 216 168 diff --git a/graphics/pokemon/pyroar/shinyf.pal b/graphics/pokemon/pyroar/shinyf.pal deleted file mode 100644 index d39b2ea82..000000000 --- a/graphics/pokemon/pyroar/shinyf.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -152 208 160 -184 96 32 -112 0 0 -248 168 88 -224 64 48 -176 40 0 -56 40 32 -0 0 0 -120 104 80 -72 56 48 -168 136 96 -96 72 56 -224 192 144 -248 248 248 -192 64 40 -248 216 168 diff --git a/graphics/pokemon/quagsire/anim_front.png b/graphics/pokemon/quagsire/anim_front.png index c9d23bfb1..a940e3378 100644 Binary files a/graphics/pokemon/quagsire/anim_front.png and b/graphics/pokemon/quagsire/anim_front.png differ diff --git a/graphics/pokemon/quagsire/back.png b/graphics/pokemon/quagsire/back.png index 249cd0b46..b961bbb22 100644 Binary files a/graphics/pokemon/quagsire/back.png and b/graphics/pokemon/quagsire/back.png differ diff --git a/graphics/pokemon/quagsire/front.png b/graphics/pokemon/quagsire/front.png index ac3c92a83..41b4ad26b 100644 Binary files a/graphics/pokemon/quagsire/front.png and b/graphics/pokemon/quagsire/front.png differ diff --git a/graphics/pokemon/quagsire/normal.pal b/graphics/pokemon/quagsire/normal.pal index 4935b2f88..fe56a925d 100644 --- a/graphics/pokemon/quagsire/normal.pal +++ b/graphics/pokemon/quagsire/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -40 96 112 -104 152 176 -128 208 232 -168 224 240 +64 80 128 +96 152 184 +128 208 240 +168 224 248 240 240 240 16 16 16 -16 40 48 -48 120 136 -40 72 80 -104 88 160 +24 64 56 +48 144 160 +24 88 104 +104 88 136 96 120 160 -135 80 78 -221 128 128 +168 16 0 +232 64 48 0 0 0 0 0 0 diff --git a/graphics/pokemon/quilava/anim_front.png b/graphics/pokemon/quilava/anim_front.png index c986379fc..1c2709eb4 100644 Binary files a/graphics/pokemon/quilava/anim_front.png and b/graphics/pokemon/quilava/anim_front.png differ diff --git a/graphics/pokemon/quilava/front.png b/graphics/pokemon/quilava/front.png index ec04cca18..061f31998 100644 Binary files a/graphics/pokemon/quilava/front.png and b/graphics/pokemon/quilava/front.png differ diff --git a/graphics/pokemon/quilava/normal.pal b/graphics/pokemon/quilava/normal.pal index 7296a78f7..c6f175d1e 100644 --- a/graphics/pokemon/quilava/normal.pal +++ b/graphics/pokemon/quilava/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -168 40 32 -240 104 24 -240 208 32 -248 144 16 -48 104 112 -40 72 80 -96 144 128 +216 0 0 +248 88 0 +248 208 0 +248 152 0 +40 104 104 +40 64 96 +56 136 144 16 16 16 -136 16 32 +168 0 0 248 248 248 -176 144 96 -248 216 160 -216 176 120 -112 88 48 +176 152 80 +248 232 160 +224 200 104 +136 96 32 16 48 56 diff --git a/graphics/pokemon/qwilfish/anim_front.png b/graphics/pokemon/qwilfish/anim_front.png index 6849e809e..3d12f6a11 100644 Binary files a/graphics/pokemon/qwilfish/anim_front.png and b/graphics/pokemon/qwilfish/anim_front.png differ diff --git a/graphics/pokemon/qwilfish/front.png b/graphics/pokemon/qwilfish/front.png index 11cf43c4a..6fd19c134 100644 Binary files a/graphics/pokemon/qwilfish/front.png and b/graphics/pokemon/qwilfish/front.png differ diff --git a/graphics/pokemon/qwilfish/normal.pal b/graphics/pokemon/qwilfish/normal.pal index 09aba772e..ce431cfb9 100644 --- a/graphics/pokemon/qwilfish/normal.pal +++ b/graphics/pokemon/qwilfish/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -24 56 56 -104 168 168 +24 72 80 +112 168 176 16 16 16 -56 128 128 -48 88 88 +64 128 144 +56 96 96 192 200 200 248 248 248 -120 48 56 -248 168 176 -184 104 120 -216 232 152 -192 200 128 +144 0 0 +248 160 144 +208 80 96 +216 216 144 +192 192 120 160 168 104 -80 80 40 +104 80 48 0 0 0 diff --git a/graphics/pokemon/raichu/anim_front.png b/graphics/pokemon/raichu/anim_front.png index 256e22ecc..57ee98c40 100644 Binary files a/graphics/pokemon/raichu/anim_front.png and b/graphics/pokemon/raichu/anim_front.png differ diff --git a/graphics/pokemon/raichu/front.png b/graphics/pokemon/raichu/front.png index 8f0753c3e..e1050a3d4 100644 Binary files a/graphics/pokemon/raichu/front.png and b/graphics/pokemon/raichu/front.png differ diff --git a/graphics/pokemon/raichu/normal.pal b/graphics/pokemon/raichu/normal.pal index c197eb959..2b912d23c 100644 --- a/graphics/pokemon/raichu/normal.pal +++ b/graphics/pokemon/raichu/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -56 32 16 -136 80 32 +88 40 40 +136 96 16 16 16 16 -96 56 32 -208 168 80 +112 64 48 +248 184 0 96 64 32 -248 216 104 -248 168 56 -192 136 48 +248 216 88 +240 168 40 +224 120 48 248 232 208 -144 104 32 -160 88 104 +192 88 48 +168 24 8 224 184 128 96 96 104 56 56 64 diff --git a/graphics/pokemon/raikou/anim_front.png b/graphics/pokemon/raikou/anim_front.png index 301932fa3..070a85266 100644 Binary files a/graphics/pokemon/raikou/anim_front.png and b/graphics/pokemon/raikou/anim_front.png differ diff --git a/graphics/pokemon/raikou/front.png b/graphics/pokemon/raikou/front.png index 20db4c97b..b729a2c37 100644 Binary files a/graphics/pokemon/raikou/front.png and b/graphics/pokemon/raikou/front.png differ diff --git a/graphics/pokemon/raikou/normal.pal b/graphics/pokemon/raikou/normal.pal index ab4065e9b..94fb14e43 100644 --- a/graphics/pokemon/raikou/normal.pal +++ b/graphics/pokemon/raikou/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 96 120 -112 104 104 -192 136 160 -96 48 72 +128 104 160 +104 104 104 +184 136 192 +80 40 104 248 248 248 -168 152 152 +160 160 160 16 16 16 -200 192 216 -136 208 224 -192 64 64 -240 192 56 -184 152 40 -120 96 24 -248 216 120 +208 208 208 +152 208 248 +192 0 0 +248 200 64 +208 152 40 +136 96 16 +248 232 144 88 88 96 diff --git a/graphics/pokemon/ralts/anim_front.png b/graphics/pokemon/ralts/anim_front.png index 241a51338..0e5f893b5 100644 Binary files a/graphics/pokemon/ralts/anim_front.png and b/graphics/pokemon/ralts/anim_front.png differ diff --git a/graphics/pokemon/ralts/front.png b/graphics/pokemon/ralts/front.png index b3e0d845e..6831c3897 100644 Binary files a/graphics/pokemon/ralts/front.png and b/graphics/pokemon/ralts/front.png differ diff --git a/graphics/pokemon/ralts/normal.pal b/graphics/pokemon/ralts/normal.pal index 0074af161..c859137ae 100644 --- a/graphics/pokemon/ralts/normal.pal +++ b/graphics/pokemon/ralts/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 0 176 232 -112 48 56 -248 144 152 -176 96 104 +128 40 72 +248 120 144 +208 72 112 16 16 16 -104 168 88 -56 112 56 -160 224 152 -112 200 112 -184 192 232 -120 128 176 +112 184 112 +48 120 64 +176 240 144 +136 224 136 +200 200 224 +152 144 192 240 240 248 120 136 176 -0 0 0 -0 0 0 -0 0 0 +128 40 72 +248 120 144 +208 72 112 diff --git a/graphics/pokemon/rampardos/anim_front.png b/graphics/pokemon/rampardos/anim_front.png index d00352823..3c912158e 100644 Binary files a/graphics/pokemon/rampardos/anim_front.png and b/graphics/pokemon/rampardos/anim_front.png differ diff --git a/graphics/pokemon/rampardos/front.png b/graphics/pokemon/rampardos/front.png index e81e6f927..09fa06dfb 100644 Binary files a/graphics/pokemon/rampardos/front.png and b/graphics/pokemon/rampardos/front.png differ diff --git a/graphics/pokemon/rampardos/normal.pal b/graphics/pokemon/rampardos/normal.pal index b2a2910d7..285789631 100644 --- a/graphics/pokemon/rampardos/normal.pal +++ b/graphics/pokemon/rampardos/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -160 144 144 +120 128 128 248 248 248 16 16 16 -208 208 192 -56 128 192 +184 208 216 +56 128 208 32 64 96 -56 56 64 -48 96 144 -128 176 200 -120 120 128 -88 80 88 -160 152 152 -232 112 96 -184 56 48 -152 80 80 +64 64 64 +32 88 160 +112 168 232 +128 128 120 +96 96 88 +152 152 144 +240 80 96 +176 40 48 +168 32 32 diff --git a/graphics/pokemon/rapidash/anim_front.png b/graphics/pokemon/rapidash/anim_front.png index ab45abb0f..c4ee2d83f 100644 Binary files a/graphics/pokemon/rapidash/anim_front.png and b/graphics/pokemon/rapidash/anim_front.png differ diff --git a/graphics/pokemon/rapidash/front.png b/graphics/pokemon/rapidash/front.png index 6d66933be..d0fb296f5 100644 Binary files a/graphics/pokemon/rapidash/front.png and b/graphics/pokemon/rapidash/front.png differ diff --git a/graphics/pokemon/rapidash/normal.pal b/graphics/pokemon/rapidash/normal.pal index bdcccb3c0..a55c358ab 100644 --- a/graphics/pokemon/rapidash/normal.pal +++ b/graphics/pokemon/rapidash/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -240 176 24 -224 96 64 -208 40 32 -248 216 80 -96 80 48 -248 240 200 +255 156 24 +230 98 41 +222 16 16 +255 222 82 +139 82 49 +255 230 197 16 16 16 -176 160 120 -224 200 144 +197 148 106 +238 197 139 168 72 64 -152 176 224 -248 248 248 +197 197 197 +255 255 255 248 160 152 -88 120 168 -32 64 112 +115 123 131 +65 74 82 diff --git a/graphics/pokemon/raticate/anim_front.png b/graphics/pokemon/raticate/anim_front.png index 52b2096ed..d612bbad9 100644 Binary files a/graphics/pokemon/raticate/anim_front.png and b/graphics/pokemon/raticate/anim_front.png differ diff --git a/graphics/pokemon/raticate/back.png b/graphics/pokemon/raticate/back.png index e6c252a2e..dadf090ba 100644 Binary files a/graphics/pokemon/raticate/back.png and b/graphics/pokemon/raticate/back.png differ diff --git a/graphics/pokemon/raticate/front.png b/graphics/pokemon/raticate/front.png index b86a81e21..8e9f34722 100644 Binary files a/graphics/pokemon/raticate/front.png and b/graphics/pokemon/raticate/front.png differ diff --git a/graphics/pokemon/raticate/normal.pal b/graphics/pokemon/raticate/normal.pal index 572654b6f..88e7b2244 100644 --- a/graphics/pokemon/raticate/normal.pal +++ b/graphics/pokemon/raticate/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -120 88 56 -176 136 88 -224 176 128 +144 76 8 +192 128 80 +248 200 152 16 16 16 104 56 0 -192 128 48 -152 96 40 -216 160 88 +208 160 64 +176 120 64 +224 184 80 184 192 200 248 248 248 128 88 40 -248 216 168 -208 168 120 +240 224 144 +208 192 104 112 112 112 -176 136 88 +160 128 48 diff --git a/graphics/pokemon/rattata/anim_front.png b/graphics/pokemon/rattata/anim_front.png index 312339af2..08f52ed89 100644 Binary files a/graphics/pokemon/rattata/anim_front.png and b/graphics/pokemon/rattata/anim_front.png differ diff --git a/graphics/pokemon/rattata/front.png b/graphics/pokemon/rattata/front.png index d83960d42..957a686e1 100644 Binary files a/graphics/pokemon/rattata/front.png and b/graphics/pokemon/rattata/front.png differ diff --git a/graphics/pokemon/rattata/normal.pal b/graphics/pokemon/rattata/normal.pal index 0a157b921..87fc380cb 100644 --- a/graphics/pokemon/rattata/normal.pal +++ b/graphics/pokemon/rattata/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -128 80 136 -168 112 184 -184 144 208 -72 48 80 +139 74 139 +180 115 189 +213 148 213 +74 41 65 16 16 16 -208 184 152 -240 216 176 -200 200 200 -152 120 96 -216 88 80 +205 172 98 +238 222 180 +205 205 205 +164 115 8 +230 90 115 248 248 248 -184 48 64 -104 88 64 +164 24 57 +98 74 8 88 88 88 120 80 136 diff --git a/graphics/pokemon/rayquaza/anim_front.png b/graphics/pokemon/rayquaza/anim_front.png index 421846fee..c1c78f9a1 100644 Binary files a/graphics/pokemon/rayquaza/anim_front.png and b/graphics/pokemon/rayquaza/anim_front.png differ diff --git a/graphics/pokemon/rayquaza/front.png b/graphics/pokemon/rayquaza/front.png index 2c6b78b54..57123a773 100644 Binary files a/graphics/pokemon/rayquaza/front.png and b/graphics/pokemon/rayquaza/front.png differ diff --git a/graphics/pokemon/rayquaza/normal.pal b/graphics/pokemon/rayquaza/normal.pal index 8e3925548..550aeed43 100644 --- a/graphics/pokemon/rayquaza/normal.pal +++ b/graphics/pokemon/rayquaza/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 0 176 232 -40 128 80 -16 64 40 -152 208 176 -16 16 16 -104 176 136 -112 40 48 -216 96 104 -248 248 120 -200 160 72 -152 112 120 +72 128 112 +40 80 64 +144 216 176 +0 0 0 +88 184 136 +112 40 56 +224 80 112 +248 240 0 +200 184 0 +152 40 80 248 248 248 -200 144 160 -192 208 232 +184 96 136 +216 208 232 0 0 0 0 0 0 diff --git a/graphics/pokemon/regice/anim_front.png b/graphics/pokemon/regice/anim_front.png index 2b75a7a83..7e28e59c4 100644 Binary files a/graphics/pokemon/regice/anim_front.png and b/graphics/pokemon/regice/anim_front.png differ diff --git a/graphics/pokemon/regice/front.png b/graphics/pokemon/regice/front.png index c569fed4a..e369c6344 100644 Binary files a/graphics/pokemon/regice/front.png and b/graphics/pokemon/regice/front.png differ diff --git a/graphics/pokemon/regice/normal.pal b/graphics/pokemon/regice/normal.pal index 25e85b77d..886f453c7 100644 --- a/graphics/pokemon/regice/normal.pal +++ b/graphics/pokemon/regice/normal.pal @@ -4,15 +4,15 @@ JASC-PAL 152 208 160 104 176 208 56 104 136 -64 136 160 -24 24 24 -192 232 248 -32 72 88 -144 208 232 -232 240 240 -248 240 200 -240 216 120 -208 176 64 +88 128 168 +0 0 0 +184 232 248 +40 56 120 +152 200 248 +248 248 248 +248 248 168 +248 224 0 +200 176 32 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/regigigas/anim_front.png b/graphics/pokemon/regigigas/anim_front.png index e040ff3f3..125b269d1 100644 Binary files a/graphics/pokemon/regigigas/anim_front.png and b/graphics/pokemon/regigigas/anim_front.png differ diff --git a/graphics/pokemon/regigigas/front.png b/graphics/pokemon/regigigas/front.png index d064a5e88..7cb87a1cc 100644 Binary files a/graphics/pokemon/regigigas/front.png and b/graphics/pokemon/regigigas/front.png differ diff --git a/graphics/pokemon/regigigas/normal.pal b/graphics/pokemon/regigigas/normal.pal index 7137dc686..4db68a825 100644 --- a/graphics/pokemon/regigigas/normal.pal +++ b/graphics/pokemon/regigigas/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -104 88 40 -56 128 80 -184 152 64 -240 208 112 +120 96 32 +32 128 104 +200 152 80 +248 216 88 24 24 32 -64 168 112 +72 160 96 32 80 48 -240 240 248 -64 56 56 +248 248 248 +56 72 88 104 120 136 -208 200 208 -168 160 176 +216 200 216 +168 168 200 232 64 40 -32 176 168 -128 120 120 +88 200 248 +104 120 136 diff --git a/graphics/pokemon/regirock/anim_front.png b/graphics/pokemon/regirock/anim_front.png index 341f6ccf9..88bfa4ff0 100644 Binary files a/graphics/pokemon/regirock/anim_front.png and b/graphics/pokemon/regirock/anim_front.png differ diff --git a/graphics/pokemon/regirock/front.png b/graphics/pokemon/regirock/front.png index 95c25b5fa..4ba1f41d8 100644 Binary files a/graphics/pokemon/regirock/front.png and b/graphics/pokemon/regirock/front.png differ diff --git a/graphics/pokemon/regirock/normal.pal b/graphics/pokemon/regirock/normal.pal index 1ffdbb844..a921fc190 100644 --- a/graphics/pokemon/regirock/normal.pal +++ b/graphics/pokemon/regirock/normal.pal @@ -3,16 +3,16 @@ JASC-PAL 16 152 208 160 24 24 24 -120 56 40 -192 120 88 +136 56 32 +216 120 80 232 152 136 -152 88 56 -72 40 40 -224 208 200 -136 104 112 -176 160 152 -168 136 136 -248 160 104 +184 72 48 +56 48 56 +216 200 200 +144 112 128 +168 152 160 +160 144 144 +240 176 144 192 176 168 0 0 0 0 0 0 diff --git a/graphics/pokemon/registeel/anim_front.png b/graphics/pokemon/registeel/anim_front.png index 28169d5ac..acf975f9f 100644 Binary files a/graphics/pokemon/registeel/anim_front.png and b/graphics/pokemon/registeel/anim_front.png differ diff --git a/graphics/pokemon/registeel/front.png b/graphics/pokemon/registeel/front.png index 29bbb7388..844ab20c0 100644 Binary files a/graphics/pokemon/registeel/front.png and b/graphics/pokemon/registeel/front.png differ diff --git a/graphics/pokemon/registeel/normal.pal b/graphics/pokemon/registeel/normal.pal index 80390a06b..e69a7bf26 100644 --- a/graphics/pokemon/registeel/normal.pal +++ b/graphics/pokemon/registeel/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -128 112 136 -64 56 72 +128 128 120 +72 72 72 24 24 24 -176 160 176 -224 216 224 -136 128 128 +176 168 168 +216 216 216 +128 136 128 248 248 248 -168 160 160 -208 192 208 -248 152 152 -224 72 80 -80 72 80 +184 184 184 +208 200 208 +248 152 160 +248 64 64 +72 88 88 56 64 80 0 0 0 0 0 0 diff --git a/graphics/pokemon/relicanth/anim_front.png b/graphics/pokemon/relicanth/anim_front.png index a56d7aeea..575db345c 100644 Binary files a/graphics/pokemon/relicanth/anim_front.png and b/graphics/pokemon/relicanth/anim_front.png differ diff --git a/graphics/pokemon/relicanth/front.png b/graphics/pokemon/relicanth/front.png index 55f47eba2..552b2421d 100644 Binary files a/graphics/pokemon/relicanth/front.png and b/graphics/pokemon/relicanth/front.png differ diff --git a/graphics/pokemon/relicanth/normal.pal b/graphics/pokemon/relicanth/normal.pal index 269e3f960..a8d6118ee 100644 --- a/graphics/pokemon/relicanth/normal.pal +++ b/graphics/pokemon/relicanth/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -96 72 56 -216 184 160 -184 160 136 +104 80 64 +232 200 160 +200 176 144 80 64 56 -16 16 16 +0 0 0 80 64 64 -176 160 136 -144 112 80 -144 120 120 -48 32 40 -160 136 112 -240 208 176 -112 96 96 -216 80 96 -158 101 133 +176 152 152 +136 112 72 +152 128 120 +56 40 40 +176 144 104 +248 232 200 +120 104 96 +232 72 112 +168 32 0 diff --git a/graphics/pokemon/remoraid/anim_front.png b/graphics/pokemon/remoraid/anim_front.png index 440f044bf..daf58f3c3 100644 Binary files a/graphics/pokemon/remoraid/anim_front.png and b/graphics/pokemon/remoraid/anim_front.png differ diff --git a/graphics/pokemon/remoraid/front.png b/graphics/pokemon/remoraid/front.png index f42ae8f12..8cf4b8664 100644 Binary files a/graphics/pokemon/remoraid/front.png and b/graphics/pokemon/remoraid/front.png differ diff --git a/graphics/pokemon/remoraid/normal.pal b/graphics/pokemon/remoraid/normal.pal index aa4a9d29f..45c205c22 100644 --- a/graphics/pokemon/remoraid/normal.pal +++ b/graphics/pokemon/remoraid/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 248 160 176 -72 136 128 -56 96 88 -136 192 168 -216 248 232 -224 232 208 -128 136 152 -168 224 192 +96 136 160 +40 88 128 +128 192 176 +208 240 240 +232 232 248 +128 128 152 +176 216 208 16 16 16 248 248 248 -128 168 144 -184 184 160 +136 168 184 +184 184 200 72 80 96 -104 56 80 +136 16 8 0 0 0 0 0 0 diff --git a/graphics/pokemon/reshiram/anim_front.png b/graphics/pokemon/reshiram/anim_front.png index b9f8df136..f0bbac206 100644 Binary files a/graphics/pokemon/reshiram/anim_front.png and b/graphics/pokemon/reshiram/anim_front.png differ diff --git a/graphics/pokemon/reshiram/front.png b/graphics/pokemon/reshiram/front.png index 4d5be4a8b..22d7be6e5 100644 Binary files a/graphics/pokemon/reshiram/front.png and b/graphics/pokemon/reshiram/front.png differ diff --git a/graphics/pokemon/reshiram/normal.pal b/graphics/pokemon/reshiram/normal.pal index d8fbc1b91..81a266c50 100644 --- a/graphics/pokemon/reshiram/normal.pal +++ b/graphics/pokemon/reshiram/normal.pal @@ -1,17 +1,17 @@ JASC-PAL 0100 16 -152 208 160 +24 24 24 64 72 96 -112 128 168 +112 120 152 0 0 0 -168 192 216 +184 184 216 248 248 248 -208 232 232 -56 176 240 -88 80 96 -168 152 192 -120 104 144 +224 224 232 +56 176 248 +72 72 104 +192 192 216 +120 120 152 208 40 8 248 88 48 248 160 48 diff --git a/graphics/pokemon/reuniclus/anim_front.png b/graphics/pokemon/reuniclus/anim_front.png index d83e33564..9f9f38975 100644 Binary files a/graphics/pokemon/reuniclus/anim_front.png and b/graphics/pokemon/reuniclus/anim_front.png differ diff --git a/graphics/pokemon/reuniclus/front.png b/graphics/pokemon/reuniclus/front.png index b1b8f974a..d189c0bf4 100644 Binary files a/graphics/pokemon/reuniclus/front.png and b/graphics/pokemon/reuniclus/front.png differ diff --git a/graphics/pokemon/reuniclus/normal.pal b/graphics/pokemon/reuniclus/normal.pal index 94fac9f68..17ed37ea8 100644 --- a/graphics/pokemon/reuniclus/normal.pal +++ b/graphics/pokemon/reuniclus/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 0 176 232 -56 136 104 -48 104 80 -112 184 136 -96 128 64 -152 176 128 -208 232 184 +64 136 88 +48 96 64 +88 176 120 +72 136 96 +152 184 136 +208 232 192 16 16 16 248 248 248 -224 120 120 -168 96 88 -224 192 136 -168 152 104 -136 88 88 -216 120 120 -184 232 184 +216 96 96 +160 80 80 +216 184 120 +192 160 96 +112 56 56 +192 80 80 +160 224 168 diff --git a/graphics/pokemon/rhydon/anim_front.png b/graphics/pokemon/rhydon/anim_front.png index bb1bca933..d93763b8d 100644 Binary files a/graphics/pokemon/rhydon/anim_front.png and b/graphics/pokemon/rhydon/anim_front.png differ diff --git a/graphics/pokemon/rhydon/front.png b/graphics/pokemon/rhydon/front.png index 6b21040f2..fbae08b97 100644 Binary files a/graphics/pokemon/rhydon/front.png and b/graphics/pokemon/rhydon/front.png differ diff --git a/graphics/pokemon/rhydon/normal.pal b/graphics/pokemon/rhydon/normal.pal index 5424356f2..235d7f7dc 100644 --- a/graphics/pokemon/rhydon/normal.pal +++ b/graphics/pokemon/rhydon/normal.pal @@ -9,11 +9,11 @@ JASC-PAL 184 200 216 248 248 248 224 224 216 -104 80 56 -232 200 176 -184 160 128 +112 88 48 +224 208 168 +176 160 112 128 48 40 184 88 80 -160 112 128 -216 152 168 +160 48 16 +224 80 56 96 64 104 diff --git a/graphics/pokemon/rhyhorn/anim_front.png b/graphics/pokemon/rhyhorn/anim_front.png index 2f047251c..67f81580e 100644 Binary files a/graphics/pokemon/rhyhorn/anim_front.png and b/graphics/pokemon/rhyhorn/anim_front.png differ diff --git a/graphics/pokemon/rhyhorn/normal.pal b/graphics/pokemon/rhyhorn/normal.pal index 98b99f009..afba6e501 100644 --- a/graphics/pokemon/rhyhorn/normal.pal +++ b/graphics/pokemon/rhyhorn/normal.pal @@ -9,8 +9,8 @@ JASC-PAL 248 248 248 152 176 192 16 16 16 -160 72 64 -88 24 24 +168 56 40 +88 8 0 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/rhyperior/anim_front.png b/graphics/pokemon/rhyperior/anim_front.png index 1e495e593..3d07661e3 100644 Binary files a/graphics/pokemon/rhyperior/anim_front.png and b/graphics/pokemon/rhyperior/anim_front.png differ diff --git a/graphics/pokemon/rhyperior/front.png b/graphics/pokemon/rhyperior/front.png index bebbcbebc..7c20072cf 100644 Binary files a/graphics/pokemon/rhyperior/front.png and b/graphics/pokemon/rhyperior/front.png differ diff --git a/graphics/pokemon/rhyperior/normal.pal b/graphics/pokemon/rhyperior/normal.pal index 180856bd1..7a73748ca 100644 --- a/graphics/pokemon/rhyperior/normal.pal +++ b/graphics/pokemon/rhyperior/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -152 128 120 -176 152 160 -80 56 56 -248 248 232 -216 192 208 -112 80 88 +128 104 120 +144 136 168 +56 56 72 +248 248 248 +200 200 224 +88 72 96 16 16 16 -88 40 16 -184 80 32 -224 120 64 +80 48 0 +192 64 0 +240 80 0 160 40 32 -144 64 24 +144 56 0 48 40 48 -160 112 128 +144 56 0 72 48 56 diff --git a/graphics/pokemon/riolu/anim_front.png b/graphics/pokemon/riolu/anim_front.png index a9a658a6e..091e0dd92 100644 Binary files a/graphics/pokemon/riolu/anim_front.png and b/graphics/pokemon/riolu/anim_front.png differ diff --git a/graphics/pokemon/riolu/front.png b/graphics/pokemon/riolu/front.png index 4b3fd126a..fbba5f54b 100644 Binary files a/graphics/pokemon/riolu/front.png and b/graphics/pokemon/riolu/front.png differ diff --git a/graphics/pokemon/riolu/normal.pal b/graphics/pokemon/riolu/normal.pal index ce1aff2b5..e19d06c53 100644 --- a/graphics/pokemon/riolu/normal.pal +++ b/graphics/pokemon/riolu/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -40 64 88 -56 112 136 -88 160 184 +16 72 120 +40 112 152 +72 152 232 56 56 56 88 88 88 -160 64 24 -232 88 16 +160 48 48 +216 64 64 248 248 248 -128 120 80 -240 208 136 +136 128 56 +216 192 112 128 128 128 176 176 176 -112 72 80 -232 127 127 +224 104 120 +168 56 80 diff --git a/graphics/pokemon/roggenrola/anim_front.png b/graphics/pokemon/roggenrola/anim_front.png index 4269969b1..6094a9110 100644 Binary files a/graphics/pokemon/roggenrola/anim_front.png and b/graphics/pokemon/roggenrola/anim_front.png differ diff --git a/graphics/pokemon/roggenrola/front.png b/graphics/pokemon/roggenrola/front.png index 29b11c739..b63929ad2 100644 Binary files a/graphics/pokemon/roggenrola/front.png and b/graphics/pokemon/roggenrola/front.png differ diff --git a/graphics/pokemon/roggenrola/normal.pal b/graphics/pokemon/roggenrola/normal.pal index 0b7d48cfb..5918cc98e 100644 --- a/graphics/pokemon/roggenrola/normal.pal +++ b/graphics/pokemon/roggenrola/normal.pal @@ -2,16 +2,16 @@ JASC-PAL 0100 16 152 208 160 -64 48 32 -16 16 16 -160 120 80 -112 72 48 -24 40 64 -72 96 128 -40 64 96 -104 72 32 -184 136 56 -248 200 104 +56 32 24 +0 0 0 +120 88 72 +88 64 48 +24 32 56 +64 80 136 +40 56 104 +88 64 32 +152 112 16 +248 184 72 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/roselia/anim_front.png b/graphics/pokemon/roselia/anim_front.png index f88bab17d..270ab0bf0 100644 Binary files a/graphics/pokemon/roselia/anim_front.png and b/graphics/pokemon/roselia/anim_front.png differ diff --git a/graphics/pokemon/roselia/front.png b/graphics/pokemon/roselia/front.png index 71d9f59ef..ea92a4474 100644 Binary files a/graphics/pokemon/roselia/front.png and b/graphics/pokemon/roselia/front.png differ diff --git a/graphics/pokemon/roselia/normal.pal b/graphics/pokemon/roselia/normal.pal index 8aecad98e..e81a669a7 100644 --- a/graphics/pokemon/roselia/normal.pal +++ b/graphics/pokemon/roselia/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -216 216 216 -64 152 72 -144 216 152 -40 80 40 -104 192 104 +128 128 248 +88 144 80 +160 216 112 +56 80 40 +112 192 88 16 16 16 216 240 176 160 192 144 -152 72 80 -248 168 168 -216 120 128 -200 160 88 -16 96 136 -120 200 240 -248 224 120 -48 152 208 +160 48 72 +248 160 184 +240 88 128 +200 160 32 +40 88 144 +96 184 248 +240 224 72 +80 144 208 diff --git a/graphics/pokemon/roserade/anim_front.png b/graphics/pokemon/roserade/anim_front.png index d83256932..b34276d0e 100644 Binary files a/graphics/pokemon/roserade/anim_front.png and b/graphics/pokemon/roserade/anim_front.png differ diff --git a/graphics/pokemon/roserade/front.png b/graphics/pokemon/roserade/front.png index 016046f4e..34c283b96 100644 Binary files a/graphics/pokemon/roserade/front.png and b/graphics/pokemon/roserade/front.png differ diff --git a/graphics/pokemon/roserade/normal.pal b/graphics/pokemon/roserade/normal.pal index 64b594ca5..329cc52ac 100644 --- a/graphics/pokemon/roserade/normal.pal +++ b/graphics/pokemon/roserade/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 120 208 240 -104 160 136 -240 240 248 -184 200 224 -40 72 48 -64 120 80 +112 152 136 +248 248 248 +208 200 216 +40 80 80 +40 120 80 0 0 0 -88 160 104 -224 200 104 -168 64 88 -112 48 64 -240 96 120 -152 216 168 -56 80 120 -104 136 208 -64 96 176 +56 152 96 +240 208 72 +184 64 104 +120 56 88 +248 96 128 +160 224 168 +64 72 128 +80 112 232 +72 88 184 diff --git a/graphics/pokemon/rotom/anim_front.png b/graphics/pokemon/rotom/anim_front.png index 4f680637e..1579cd386 100644 Binary files a/graphics/pokemon/rotom/anim_front.png and b/graphics/pokemon/rotom/anim_front.png differ diff --git a/graphics/pokemon/rotom/fan/anim_front.png b/graphics/pokemon/rotom/fan/anim_front.png index b73f33893..aea9383a6 100644 Binary files a/graphics/pokemon/rotom/fan/anim_front.png and b/graphics/pokemon/rotom/fan/anim_front.png differ diff --git a/graphics/pokemon/rotom/fan/front.png b/graphics/pokemon/rotom/fan/front.png index ddb10b0b8..30f58175e 100644 Binary files a/graphics/pokemon/rotom/fan/front.png and b/graphics/pokemon/rotom/fan/front.png differ diff --git a/graphics/pokemon/rotom/fan/normal.pal b/graphics/pokemon/rotom/fan/normal.pal index 21ca78cf3..dbeac9367 100644 --- a/graphics/pokemon/rotom/fan/normal.pal +++ b/graphics/pokemon/rotom/fan/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -200 152 80 -240 208 112 -248 232 168 +208 168 0 +248 224 88 +248 232 160 248 248 248 -176 88 48 +192 72 24 120 56 32 -248 112 64 -248 160 128 +232 112 40 +248 168 128 16 16 16 -88 80 96 +72 72 80 184 184 184 -248 192 136 -208 136 56 -48 40 40 +248 216 112 +224 112 24 +40 40 40 0 0 0 diff --git a/graphics/pokemon/rotom/front.png b/graphics/pokemon/rotom/front.png index 2c99d4afc..f6141a709 100644 Binary files a/graphics/pokemon/rotom/front.png and b/graphics/pokemon/rotom/front.png differ diff --git a/graphics/pokemon/rotom/frost/anim_front.png b/graphics/pokemon/rotom/frost/anim_front.png index 9b1266cfc..019aa481e 100644 Binary files a/graphics/pokemon/rotom/frost/anim_front.png and b/graphics/pokemon/rotom/frost/anim_front.png differ diff --git a/graphics/pokemon/rotom/frost/front.png b/graphics/pokemon/rotom/frost/front.png index 1e91c6915..d94fd9376 100644 Binary files a/graphics/pokemon/rotom/frost/front.png and b/graphics/pokemon/rotom/frost/front.png differ diff --git a/graphics/pokemon/rotom/frost/normal.pal b/graphics/pokemon/rotom/frost/normal.pal index 6e774c738..9844e99f6 100644 --- a/graphics/pokemon/rotom/frost/normal.pal +++ b/graphics/pokemon/rotom/frost/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -144 104 168 -168 136 192 -176 88 48 +176 80 200 +200 112 248 +192 72 24 120 56 32 -248 160 128 -248 112 64 +248 168 128 +232 112 40 16 16 16 248 248 248 -176 152 192 -120 88 152 +144 128 216 +104 56 168 184 184 184 -80 72 72 +72 72 80 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/rotom/heat/anim_front.png b/graphics/pokemon/rotom/heat/anim_front.png index 6172556cc..5d96fda88 100644 Binary files a/graphics/pokemon/rotom/heat/anim_front.png and b/graphics/pokemon/rotom/heat/anim_front.png differ diff --git a/graphics/pokemon/rotom/heat/front.png b/graphics/pokemon/rotom/heat/front.png index fb519b2e5..59878b8bb 100644 Binary files a/graphics/pokemon/rotom/heat/front.png and b/graphics/pokemon/rotom/heat/front.png differ diff --git a/graphics/pokemon/rotom/heat/normal.pal b/graphics/pokemon/rotom/heat/normal.pal index 09854ef92..f03c9ec60 100644 --- a/graphics/pokemon/rotom/heat/normal.pal +++ b/graphics/pokemon/rotom/heat/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -168 32 64 -224 72 72 -240 136 136 +184 40 40 +248 64 48 +248 152 144 248 248 248 -176 88 48 +192 72 24 120 56 32 -248 112 64 -248 160 128 +232 112 40 +248 168 128 184 184 184 -232 128 128 -200 64 56 +248 112 112 +200 48 56 16 16 16 -56 56 56 -120 120 128 +40 40 40 +72 72 80 0 0 0 diff --git a/graphics/pokemon/rotom/mow/anim_front.png b/graphics/pokemon/rotom/mow/anim_front.png index 93c327839..550ddfc73 100644 Binary files a/graphics/pokemon/rotom/mow/anim_front.png and b/graphics/pokemon/rotom/mow/anim_front.png differ diff --git a/graphics/pokemon/rotom/mow/front.png b/graphics/pokemon/rotom/mow/front.png index 302f1af1d..41031736f 100644 Binary files a/graphics/pokemon/rotom/mow/front.png and b/graphics/pokemon/rotom/mow/front.png differ diff --git a/graphics/pokemon/rotom/mow/normal.pal b/graphics/pokemon/rotom/mow/normal.pal index 7d59d2267..f199d83f9 100644 --- a/graphics/pokemon/rotom/mow/normal.pal +++ b/graphics/pokemon/rotom/mow/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -64 152 56 -144 184 72 -176 88 48 +0 152 0 +0 200 0 +192 72 24 120 56 32 -248 112 64 -248 160 128 +232 112 40 +248 168 128 16 16 16 -80 72 80 +72 72 80 248 248 248 -160 192 104 -192 184 176 -120 160 56 -184 216 144 +32 176 80 +184 184 184 +8 120 64 +136 240 168 40 40 40 0 0 0 diff --git a/graphics/pokemon/rotom/normal.pal b/graphics/pokemon/rotom/normal.pal index 172105d9c..dc8026c5d 100644 --- a/graphics/pokemon/rotom/normal.pal +++ b/graphics/pokemon/rotom/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -104 160 176 -112 200 200 -176 88 48 +40 168 184 +88 192 184 +192 72 24 120 56 32 -248 112 64 -248 160 128 +232 112 40 +248 168 128 16 16 16 248 248 248 184 184 184 -96 152 232 -24 88 160 -176 232 232 +48 120 232 +8 64 168 +184 240 232 72 72 80 0 0 0 0 0 0 diff --git a/graphics/pokemon/rotom/wash/anim_front.png b/graphics/pokemon/rotom/wash/anim_front.png index f526b215e..d0e54071c 100644 Binary files a/graphics/pokemon/rotom/wash/anim_front.png and b/graphics/pokemon/rotom/wash/anim_front.png differ diff --git a/graphics/pokemon/rotom/wash/front.png b/graphics/pokemon/rotom/wash/front.png index 8c01db3c5..5313d0302 100644 Binary files a/graphics/pokemon/rotom/wash/front.png and b/graphics/pokemon/rotom/wash/front.png differ diff --git a/graphics/pokemon/rotom/wash/normal.pal b/graphics/pokemon/rotom/wash/normal.pal index 1070cb148..d7ae28e2b 100644 --- a/graphics/pokemon/rotom/wash/normal.pal +++ b/graphics/pokemon/rotom/wash/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -32 144 168 -48 168 192 -176 88 48 -248 112 64 +8 72 192 +72 120 248 +192 72 24 +232 112 40 120 56 32 -248 160 128 +248 168 128 248 248 248 184 184 184 -104 192 216 +48 120 232 16 16 16 -136 208 224 -80 80 72 -48 48 48 -32 144 168 -0 0 0 +136 184 240 +72 72 80 +8 64 168 +40 40 40 +8 72 192 diff --git a/graphics/pokemon/rufflet/anim_front.png b/graphics/pokemon/rufflet/anim_front.png index 522129e95..4e1e1edc8 100644 Binary files a/graphics/pokemon/rufflet/anim_front.png and b/graphics/pokemon/rufflet/anim_front.png differ diff --git a/graphics/pokemon/rufflet/front.png b/graphics/pokemon/rufflet/front.png index 7a89fcb8e..b3e83329b 100644 Binary files a/graphics/pokemon/rufflet/front.png and b/graphics/pokemon/rufflet/front.png differ diff --git a/graphics/pokemon/rufflet/normal.pal b/graphics/pokemon/rufflet/normal.pal index f4b4c2130..0a9811451 100644 --- a/graphics/pokemon/rufflet/normal.pal +++ b/graphics/pokemon/rufflet/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 120 168 -16 16 16 -128 104 88 +104 128 144 +0 0 0 +128 112 96 248 248 248 -64 64 48 -240 240 208 -184 168 136 -160 64 64 -224 96 88 -88 88 112 -48 56 80 -248 208 144 -168 136 96 +80 72 56 +240 232 208 +184 176 152 +168 72 72 +216 88 88 +72 96 112 +40 64 80 +232 200 88 +184 152 56 168 176 192 0 0 0 diff --git a/graphics/pokemon/sableye/anim_front.png b/graphics/pokemon/sableye/anim_front.png index a67c5172d..827f9c28b 100644 Binary files a/graphics/pokemon/sableye/anim_front.png and b/graphics/pokemon/sableye/anim_front.png differ diff --git a/graphics/pokemon/sableye/front.png b/graphics/pokemon/sableye/front.png index 24c705294..02d95cca0 100644 Binary files a/graphics/pokemon/sableye/front.png and b/graphics/pokemon/sableye/front.png differ diff --git a/graphics/pokemon/sableye/normal.pal b/graphics/pokemon/sableye/normal.pal index cf010347d..471538fa8 100644 --- a/graphics/pokemon/sableye/normal.pal +++ b/graphics/pokemon/sableye/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -72 40 136 -184 160 208 -16 16 16 +56 48 120 +144 136 208 +0 0 0 24 16 56 -128 96 168 -96 64 144 -128 184 216 -176 216 232 +112 96 176 +88 64 160 +128 192 208 +176 224 240 120 136 176 248 248 248 -64 136 168 +64 144 160 192 16 32 -248 168 176 -232 72 80 +248 144 168 +248 72 88 0 0 0 diff --git a/graphics/pokemon/salamence/anim_front.png b/graphics/pokemon/salamence/anim_front.png index 70cc7c0f8..977f43a6f 100644 Binary files a/graphics/pokemon/salamence/anim_front.png and b/graphics/pokemon/salamence/anim_front.png differ diff --git a/graphics/pokemon/salamence/front.png b/graphics/pokemon/salamence/front.png index ccb50e4e5..6f1a13419 100644 Binary files a/graphics/pokemon/salamence/front.png and b/graphics/pokemon/salamence/front.png differ diff --git a/graphics/pokemon/salamence/normal.pal b/graphics/pokemon/salamence/normal.pal index eee5f13af..9da83c827 100644 --- a/graphics/pokemon/salamence/normal.pal +++ b/graphics/pokemon/salamence/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -104 40 48 -216 136 152 -192 88 96 -152 56 72 +96 40 40 +224 128 144 +192 80 104 +160 56 72 24 24 24 -24 96 120 -48 128 152 -128 200 216 -72 160 184 -184 168 168 +40 96 120 +64 128 152 +128 200 232 +72 160 208 +184 184 176 248 248 248 96 56 64 152 88 104 128 144 144 -224 216 224 +240 240 232 diff --git a/graphics/pokemon/samurott/anim_front.png b/graphics/pokemon/samurott/anim_front.png index 3bf85693d..ee43614bf 100644 Binary files a/graphics/pokemon/samurott/anim_front.png and b/graphics/pokemon/samurott/anim_front.png differ diff --git a/graphics/pokemon/samurott/front.png b/graphics/pokemon/samurott/front.png index 769657fcf..ceef8bab9 100644 Binary files a/graphics/pokemon/samurott/front.png and b/graphics/pokemon/samurott/front.png differ diff --git a/graphics/pokemon/samurott/normal.pal b/graphics/pokemon/samurott/normal.pal index 8eacbf6f6..213b132b7 100644 --- a/graphics/pokemon/samurott/normal.pal +++ b/graphics/pokemon/samurott/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -112 96 64 -208 192 120 -240 224 168 -160 144 96 +120 96 64 +216 200 120 +248 232 144 +168 144 88 72 64 80 248 248 248 -128 168 176 -32 64 104 -40 96 168 -224 104 72 -192 184 200 -96 120 120 +128 160 160 +24 56 96 +32 88 152 +208 80 96 +192 192 200 +88 112 112 32 48 72 0 0 0 diff --git a/graphics/pokemon/sandile/anim_front.png b/graphics/pokemon/sandile/anim_front.png index a396e9581..40d559ea2 100644 Binary files a/graphics/pokemon/sandile/anim_front.png and b/graphics/pokemon/sandile/anim_front.png differ diff --git a/graphics/pokemon/sandile/front.png b/graphics/pokemon/sandile/front.png index 14b1f76bf..21ff3c968 100644 Binary files a/graphics/pokemon/sandile/front.png and b/graphics/pokemon/sandile/front.png differ diff --git a/graphics/pokemon/sandile/normal.pal b/graphics/pokemon/sandile/normal.pal index 1c62e6c79..b079c8061 100644 --- a/graphics/pokemon/sandile/normal.pal +++ b/graphics/pokemon/sandile/normal.pal @@ -2,16 +2,16 @@ JASC-PAL 0100 16 152 208 160 -152 112 72 +139 115 49 32 32 32 -240 216 176 -80 56 32 +222 189 131 +82 57 16 16 16 16 -216 160 112 -72 72 80 -176 168 168 -80 80 96 -176 96 104 +197 156 90 +65 65 74 +180 180 189 +82 82 98 +205 115 123 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/sandshrew/anim_front.png b/graphics/pokemon/sandshrew/anim_front.png index 9f8bbf63d..907d47dd2 100644 Binary files a/graphics/pokemon/sandshrew/anim_front.png and b/graphics/pokemon/sandshrew/anim_front.png differ diff --git a/graphics/pokemon/sandshrew/back.png b/graphics/pokemon/sandshrew/back.png index 5375da9d6..f8a0c9ce2 100644 Binary files a/graphics/pokemon/sandshrew/back.png and b/graphics/pokemon/sandshrew/back.png differ diff --git a/graphics/pokemon/sandshrew/front.png b/graphics/pokemon/sandshrew/front.png index 4e6be966e..7d373f122 100644 Binary files a/graphics/pokemon/sandshrew/front.png and b/graphics/pokemon/sandshrew/front.png differ diff --git a/graphics/pokemon/sandshrew/normal.pal b/graphics/pokemon/sandshrew/normal.pal index 9468fd84a..0107394ec 100644 --- a/graphics/pokemon/sandshrew/normal.pal +++ b/graphics/pokemon/sandshrew/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -104 72 32 -232 192 88 -184 176 160 -16 16 16 -192 152 80 -144 112 48 -232 232 200 -8 80 120 -248 248 248 -0 112 184 -216 216 192 -128 128 128 -40 120 200 -16 56 120 128 96 16 +232 216 16 +200 184 176 +16 16 16 +200 176 0 +176 128 16 +232 232 200 +16 56 120 +248 248 248 +40 120 200 +232 216 200 +128 128 128 +200 200 200 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/sandshrew/shiny.pal b/graphics/pokemon/sandshrew/shiny.pal index ac8291fe5..4ee0966b0 100644 --- a/graphics/pokemon/sandshrew/shiny.pal +++ b/graphics/pokemon/sandshrew/shiny.pal @@ -14,6 +14,6 @@ JASC-PAL 48 96 144 216 208 200 128 128 128 -48 96 144 -24 48 88 -64 96 64 +200 200 200 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/sandslash/anim_front.png b/graphics/pokemon/sandslash/anim_front.png index 5409c3aa6..00f895d9a 100644 Binary files a/graphics/pokemon/sandslash/anim_front.png and b/graphics/pokemon/sandslash/anim_front.png differ diff --git a/graphics/pokemon/sandslash/back.png b/graphics/pokemon/sandslash/back.png index 13efe9433..cb4b5697c 100644 Binary files a/graphics/pokemon/sandslash/back.png and b/graphics/pokemon/sandslash/back.png differ diff --git a/graphics/pokemon/sandslash/front.png b/graphics/pokemon/sandslash/front.png index 5c2e6da90..6e8842c62 100644 Binary files a/graphics/pokemon/sandslash/front.png and b/graphics/pokemon/sandslash/front.png differ diff --git a/graphics/pokemon/sandslash/normal.pal b/graphics/pokemon/sandslash/normal.pal index f79c67d10..21eebe9eb 100644 --- a/graphics/pokemon/sandslash/normal.pal +++ b/graphics/pokemon/sandslash/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -64 40 16 -152 104 40 +72 56 16 +168 128 48 16 16 16 128 104 56 -112 72 24 -192 152 72 -80 64 32 -232 184 80 +136 96 24 +208 168 32 +88 72 0 +240 208 32 248 248 248 136 136 136 -216 200 176 +216 200 184 200 200 208 48 48 72 80 80 80 -216 200 176 +0 0 0 diff --git a/graphics/pokemon/sandslash/shiny.pal b/graphics/pokemon/sandslash/shiny.pal index fe701e536..86e888dbb 100644 --- a/graphics/pokemon/sandslash/shiny.pal +++ b/graphics/pokemon/sandslash/shiny.pal @@ -13,7 +13,7 @@ JASC-PAL 248 248 248 136 136 136 216 200 184 -216 200 184 +200 200 208 48 48 72 80 80 80 -216 200 176 +255 0 0 diff --git a/graphics/pokemon/sawk/anim_front.png b/graphics/pokemon/sawk/anim_front.png index 7b16d08ed..9ee074103 100644 Binary files a/graphics/pokemon/sawk/anim_front.png and b/graphics/pokemon/sawk/anim_front.png differ diff --git a/graphics/pokemon/sawk/front.png b/graphics/pokemon/sawk/front.png index c40a99672..a3ab00548 100644 Binary files a/graphics/pokemon/sawk/front.png and b/graphics/pokemon/sawk/front.png differ diff --git a/graphics/pokemon/sawk/normal.pal b/graphics/pokemon/sawk/normal.pal index 4ab8bcb88..fccc99bec 100644 --- a/graphics/pokemon/sawk/normal.pal +++ b/graphics/pokemon/sawk/normal.pal @@ -2,12 +2,12 @@ JASC-PAL 0100 16 152 208 160 -32 64 96 -104 152 208 -56 96 136 +24 72 96 +80 136 232 +24 88 152 16 16 16 40 40 40 -56 128 192 +56 104 192 64 64 64 112 168 160 144 216 216 diff --git a/graphics/pokemon/sawsbuck/anim_front.png b/graphics/pokemon/sawsbuck/anim_front.png index 87f828dbf..fa28352dd 100644 Binary files a/graphics/pokemon/sawsbuck/anim_front.png and b/graphics/pokemon/sawsbuck/anim_front.png differ diff --git a/graphics/pokemon/sawsbuck/autumn/front.png b/graphics/pokemon/sawsbuck/autumn/front.png index 9a3284010..97c43db22 100644 Binary files a/graphics/pokemon/sawsbuck/autumn/front.png and b/graphics/pokemon/sawsbuck/autumn/front.png differ diff --git a/graphics/pokemon/sawsbuck/autumn/normal.pal b/graphics/pokemon/sawsbuck/autumn/normal.pal index 330a22f95..12bcb1a06 100644 --- a/graphics/pokemon/sawsbuck/autumn/normal.pal +++ b/graphics/pokemon/sawsbuck/autumn/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 210 164 -119 50 50 -81 34 46 -0 0 0 -186 79 78 -51 30 15 -247 212 123 -30 20 10 -86 53 36 -65 32 16 -119 77 53 -61 35 34 -158 127 75 -249 159 79 -222 222 222 -172 172 172 +152 208 160 +128 32 48 +88 24 24 +16 16 16 +184 56 56 +72 16 8 +216 192 104 +48 16 16 +96 56 32 +64 32 16 +120 88 48 +64 32 24 +160 120 72 +216 144 40 +216 216 216 +168 168 168 diff --git a/graphics/pokemon/sawsbuck/front.png b/graphics/pokemon/sawsbuck/front.png index eb18835d6..71aed05e3 100644 Binary files a/graphics/pokemon/sawsbuck/front.png and b/graphics/pokemon/sawsbuck/front.png differ diff --git a/graphics/pokemon/sawsbuck/normal.pal b/graphics/pokemon/sawsbuck/normal.pal index 2564dd71c..4120eb595 100644 --- a/graphics/pokemon/sawsbuck/normal.pal +++ b/graphics/pokemon/sawsbuck/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 48 16 16 -0 0 0 -168 88 104 -112 56 64 -48 24 8 -240 208 120 -232 128 144 -80 48 32 -56 32 32 -248 152 72 -112 72 48 -152 120 72 +16 16 16 +200 64 96 +112 24 48 +72 16 8 +216 192 104 +248 112 152 +96 56 32 +64 32 24 +216 144 40 +120 88 48 +160 120 72 216 216 216 168 168 168 -24 16 8 +0 0 0 diff --git a/graphics/pokemon/sawsbuck/summer/front.png b/graphics/pokemon/sawsbuck/summer/front.png index 9e84b66e1..96a0c150c 100644 Binary files a/graphics/pokemon/sawsbuck/summer/front.png and b/graphics/pokemon/sawsbuck/summer/front.png differ diff --git a/graphics/pokemon/sawsbuck/summer/normal.pal b/graphics/pokemon/sawsbuck/summer/normal.pal index 2fa072e32..dd20a7bcc 100644 --- a/graphics/pokemon/sawsbuck/summer/normal.pal +++ b/graphics/pokemon/sawsbuck/summer/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 210 164 -34 58 37 -0 0 0 -46 145 76 -40 96 54 -247 212 123 -51 30 15 -86 53 36 -119 77 53 -61 35 34 -158 127 75 -249 159 79 -222 222 222 -172 172 172 -30 20 10 +152 208 160 +24 56 40 +16 16 16 +8 136 64 +24 88 48 +216 192 104 +72 16 8 +96 56 32 +120 88 48 +64 32 24 +160 120 72 +216 144 40 +216 216 216 +168 168 168 +48 16 16 0 0 0 diff --git a/graphics/pokemon/sawsbuck/winter/back.png b/graphics/pokemon/sawsbuck/winter/back.png index 89fb13912..607a9ee99 100644 Binary files a/graphics/pokemon/sawsbuck/winter/back.png and b/graphics/pokemon/sawsbuck/winter/back.png differ diff --git a/graphics/pokemon/sawsbuck/winter/front.png b/graphics/pokemon/sawsbuck/winter/front.png index 92f7000bb..d97aa2a90 100644 Binary files a/graphics/pokemon/sawsbuck/winter/front.png and b/graphics/pokemon/sawsbuck/winter/front.png differ diff --git a/graphics/pokemon/sawsbuck/winter/normal.pal b/graphics/pokemon/sawsbuck/winter/normal.pal index b0d26c0f1..76ad023bd 100644 --- a/graphics/pokemon/sawsbuck/winter/normal.pal +++ b/graphics/pokemon/sawsbuck/winter/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 210 164 -135 116 121 -76 61 72 -49 16 16 +152 208 160 +104 104 104 +64 72 64 +48 16 16 0 0 0 -255 255 255 -178 160 153 -51 30 15 -247 212 123 -119 77 53 -65 32 16 -86 53 36 -61 35 34 -158 127 75 -249 159 79 -222 222 222 +248 248 248 +168 168 168 +72 16 8 +216 192 104 +120 88 48 +64 32 24 +96 56 32 +160 120 72 +216 144 40 +216 216 216 +96 56 32 diff --git a/graphics/pokemon/sawsbuck/winter/shiny.pal b/graphics/pokemon/sawsbuck/winter/shiny.pal index feb2911d9..32f04a54e 100644 --- a/graphics/pokemon/sawsbuck/winter/shiny.pal +++ b/graphics/pokemon/sawsbuck/winter/shiny.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 210 164 +152 208 160 104 104 104 64 72 64 -49 16 16 +48 16 16 0 0 0 -255 255 255 +248 248 248 168 168 168 -74 16 8 -247 212 123 -178 114 49 -65 32 16 -130 67 23 -84 35 16 -183 167 84 -222 205 41 -222 222 222 +72 16 8 +216 192 104 +176 104 32 +64 32 24 +128 64 16 +160 120 72 +216 200 40 +216 216 216 +96 56 32 diff --git a/graphics/pokemon/sceptile/anim_front.png b/graphics/pokemon/sceptile/anim_front.png index ce0372adc..c297cf729 100644 Binary files a/graphics/pokemon/sceptile/anim_front.png and b/graphics/pokemon/sceptile/anim_front.png differ diff --git a/graphics/pokemon/sceptile/front.png b/graphics/pokemon/sceptile/front.png index 0d038b387..f49aef765 100644 Binary files a/graphics/pokemon/sceptile/front.png and b/graphics/pokemon/sceptile/front.png differ diff --git a/graphics/pokemon/sceptile/normal.pal b/graphics/pokemon/sceptile/normal.pal index 91cd9737d..bc16e8557 100644 --- a/graphics/pokemon/sceptile/normal.pal +++ b/graphics/pokemon/sceptile/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -200 128 216 -40 80 40 -168 216 184 -80 160 80 -80 112 80 -112 200 120 +192 192 248 +32 72 32 +176 232 144 +64 152 64 +56 128 56 +128 200 104 16 16 16 -216 184 96 -248 224 128 -184 88 72 -232 112 96 +200 152 8 +232 224 64 +192 32 32 +232 72 56 112 88 40 -80 152 88 -128 176 128 -40 80 40 -80 112 80 +40 128 48 +72 168 72 +24 96 40 +0 0 0 diff --git a/graphics/pokemon/scizor/anim_front.png b/graphics/pokemon/scizor/anim_front.png index 0b49c6b8d..c5e6b302b 100644 Binary files a/graphics/pokemon/scizor/anim_front.png and b/graphics/pokemon/scizor/anim_front.png differ diff --git a/graphics/pokemon/scizor/front.png b/graphics/pokemon/scizor/front.png index be2df1461..f872c488b 100644 Binary files a/graphics/pokemon/scizor/front.png and b/graphics/pokemon/scizor/front.png differ diff --git a/graphics/pokemon/scizor/normal.pal b/graphics/pokemon/scizor/normal.pal index f67d67b6a..a8c921b19 100644 --- a/graphics/pokemon/scizor/normal.pal +++ b/graphics/pokemon/scizor/normal.pal @@ -2,15 +2,15 @@ JASC-PAL 0100 16 152 208 160 -88 24 32 -224 104 104 +96 40 40 +240 104 104 16 16 16 -152 40 40 -200 64 64 -104 104 112 -176 184 224 +160 40 40 +208 56 56 +112 112 136 +184 184 216 248 248 248 -48 48 56 +56 56 72 248 192 88 144 144 160 152 104 32 diff --git a/graphics/pokemon/scolipede/anim_front.png b/graphics/pokemon/scolipede/anim_front.png index aa4078abc..9ed55dab0 100644 Binary files a/graphics/pokemon/scolipede/anim_front.png and b/graphics/pokemon/scolipede/anim_front.png differ diff --git a/graphics/pokemon/scolipede/front.png b/graphics/pokemon/scolipede/front.png index 5a133202f..7d254636f 100644 Binary files a/graphics/pokemon/scolipede/front.png and b/graphics/pokemon/scolipede/front.png differ diff --git a/graphics/pokemon/scolipede/normal.pal b/graphics/pokemon/scolipede/normal.pal index 857618fda..1eeb0e21e 100644 --- a/graphics/pokemon/scolipede/normal.pal +++ b/graphics/pokemon/scolipede/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -64 32 40 -184 64 96 -112 56 104 -160 80 152 +96 16 16 +192 24 88 +104 32 104 +136 56 152 168 40 120 56 16 32 -112 40 64 -32 40 32 -80 88 80 +152 16 64 +32 40 48 +64 72 96 88 48 88 -240 160 80 -56 64 56 +216 160 80 +56 56 72 0 0 0 -208 136 56 +128 104 24 diff --git a/graphics/pokemon/scrafty/anim_front.png b/graphics/pokemon/scrafty/anim_front.png index 3e0e821e6..d150e4298 100644 Binary files a/graphics/pokemon/scrafty/anim_front.png and b/graphics/pokemon/scrafty/anim_front.png differ diff --git a/graphics/pokemon/scrafty/front.png b/graphics/pokemon/scrafty/front.png index ea1d8f764..642dcb966 100644 Binary files a/graphics/pokemon/scrafty/front.png and b/graphics/pokemon/scrafty/front.png differ diff --git a/graphics/pokemon/scrafty/normal.pal b/graphics/pokemon/scrafty/normal.pal index bfc329bbe..2b1a6c3fa 100644 --- a/graphics/pokemon/scrafty/normal.pal +++ b/graphics/pokemon/scrafty/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -120 32 32 -232 128 112 +120 56 40 +224 96 112 32 32 32 -168 72 64 -176 96 64 -248 136 80 -120 64 40 -72 64 72 +216 40 56 +192 88 24 +240 120 32 +120 56 40 +72 72 72 168 168 168 248 248 248 216 216 216 -88 96 104 -96 72 48 -240 184 96 -176 128 72 +96 96 96 +104 80 40 +240 200 16 +176 144 24 diff --git a/graphics/pokemon/scraggy/anim_front.png b/graphics/pokemon/scraggy/anim_front.png index 33c0a6f4f..fde3828d2 100644 Binary files a/graphics/pokemon/scraggy/anim_front.png and b/graphics/pokemon/scraggy/anim_front.png differ diff --git a/graphics/pokemon/scraggy/front.png b/graphics/pokemon/scraggy/front.png index da995ce5e..1cade69cc 100644 Binary files a/graphics/pokemon/scraggy/front.png and b/graphics/pokemon/scraggy/front.png differ diff --git a/graphics/pokemon/scraggy/normal.pal b/graphics/pokemon/scraggy/normal.pal index c0b65e6c1..d796f276c 100644 --- a/graphics/pokemon/scraggy/normal.pal +++ b/graphics/pokemon/scraggy/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -152 64 56 -104 40 40 -232 96 88 -120 88 64 +176 40 48 +112 32 40 +224 56 64 +120 96 8 32 32 32 -192 144 72 -248 192 96 +184 152 0 +248 200 0 64 64 64 248 248 248 -104 96 88 -176 160 152 +96 96 88 +168 168 160 120 112 80 -192 176 120 -248 232 152 +192 184 128 +248 240 176 0 0 0 diff --git a/graphics/pokemon/scyther/anim_front.png b/graphics/pokemon/scyther/anim_front.png index 673dc2d22..eb115b910 100644 Binary files a/graphics/pokemon/scyther/anim_front.png and b/graphics/pokemon/scyther/anim_front.png differ diff --git a/graphics/pokemon/scyther/front.png b/graphics/pokemon/scyther/front.png index abf81a063..81f2bf619 100644 Binary files a/graphics/pokemon/scyther/front.png and b/graphics/pokemon/scyther/front.png differ diff --git a/graphics/pokemon/scyther/normal.pal b/graphics/pokemon/scyther/normal.pal index 5d2fb2e2b..6030b0486 100644 --- a/graphics/pokemon/scyther/normal.pal +++ b/graphics/pokemon/scyther/normal.pal @@ -2,14 +2,14 @@ JASC-PAL 0100 16 0 176 232 -48 80 56 -192 224 136 +64 88 24 +184 224 112 16 16 16 136 120 80 248 232 208 -136 208 120 +136 200 112 224 208 168 -96 152 96 +88 152 72 208 232 232 248 248 248 160 176 200 diff --git a/graphics/pokemon/seadra/anim_front.png b/graphics/pokemon/seadra/anim_front.png index c882fe365..d141ec042 100644 Binary files a/graphics/pokemon/seadra/anim_front.png and b/graphics/pokemon/seadra/anim_front.png differ diff --git a/graphics/pokemon/seadra/front.png b/graphics/pokemon/seadra/front.png index b22465680..9cf3daf51 100644 Binary files a/graphics/pokemon/seadra/front.png and b/graphics/pokemon/seadra/front.png differ diff --git a/graphics/pokemon/seadra/normal.pal b/graphics/pokemon/seadra/normal.pal index 6a9b23a80..b650994c2 100644 --- a/graphics/pokemon/seadra/normal.pal +++ b/graphics/pokemon/seadra/normal.pal @@ -8,9 +8,9 @@ JASC-PAL 16 16 16 104 200 232 128 104 96 -248 224 176 +248 232 192 248 248 248 -200 184 144 +216 176 128 48 56 96 128 168 200 0 0 0 diff --git a/graphics/pokemon/seaking/anim_front.png b/graphics/pokemon/seaking/anim_front.png index a4261b84d..52407b3b8 100644 Binary files a/graphics/pokemon/seaking/anim_front.png and b/graphics/pokemon/seaking/anim_front.png differ diff --git a/graphics/pokemon/seaking/front.png b/graphics/pokemon/seaking/front.png index f4173bae8..6f728a24b 100644 Binary files a/graphics/pokemon/seaking/front.png and b/graphics/pokemon/seaking/front.png differ diff --git a/graphics/pokemon/seaking/normal.pal b/graphics/pokemon/seaking/normal.pal index 906dd52e3..9fc7fb8a2 100644 --- a/graphics/pokemon/seaking/normal.pal +++ b/graphics/pokemon/seaking/normal.pal @@ -8,11 +8,11 @@ JASC-PAL 80 80 80 16 16 16 224 192 160 -184 72 56 -128 40 16 -240 104 72 -240 144 120 -200 224 224 +192 64 40 +144 48 24 +224 112 64 +240 144 96 +216 216 224 88 88 112 128 72 80 240 168 192 diff --git a/graphics/pokemon/sealeo/anim_front.png b/graphics/pokemon/sealeo/anim_front.png index 84dcfe7ee..027ef6de1 100644 Binary files a/graphics/pokemon/sealeo/anim_front.png and b/graphics/pokemon/sealeo/anim_front.png differ diff --git a/graphics/pokemon/sealeo/front.png b/graphics/pokemon/sealeo/front.png index ff628ded9..87d8fdb2f 100644 Binary files a/graphics/pokemon/sealeo/front.png and b/graphics/pokemon/sealeo/front.png differ diff --git a/graphics/pokemon/sealeo/normal.pal b/graphics/pokemon/sealeo/normal.pal index 32796e4a6..b09e7af8b 100644 --- a/graphics/pokemon/sealeo/normal.pal +++ b/graphics/pokemon/sealeo/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -64 160 200 -24 136 160 -40 88 112 -96 192 232 -152 216 240 +88 144 216 +72 112 176 +72 80 112 +120 192 248 +176 224 248 16 16 16 248 248 248 -128 104 88 -136 144 176 -176 184 216 -216 216 240 -232 208 168 -200 176 152 -248 232 192 -183 119 139 +120 96 80 +120 128 168 +184 184 208 +216 216 248 +232 200 168 +184 152 120 +248 224 184 +224 104 120 diff --git a/graphics/pokemon/seedot/anim_front.png b/graphics/pokemon/seedot/anim_front.png index 5ab60fc69..8f99f3090 100644 Binary files a/graphics/pokemon/seedot/anim_front.png and b/graphics/pokemon/seedot/anim_front.png differ diff --git a/graphics/pokemon/seedot/front.png b/graphics/pokemon/seedot/front.png index 2cde824a5..2ffd8d666 100644 Binary files a/graphics/pokemon/seedot/front.png and b/graphics/pokemon/seedot/front.png differ diff --git a/graphics/pokemon/seedot/normal.pal b/graphics/pokemon/seedot/normal.pal index ac54e53d4..c0cd306d9 100644 --- a/graphics/pokemon/seedot/normal.pal +++ b/graphics/pokemon/seedot/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -88 72 72 -128 112 120 -16 16 16 -176 168 168 -216 208 208 -56 40 40 -120 96 80 -200 176 128 -168 136 112 -224 200 152 -248 232 176 -88 64 48 +82 82 74 +123 115 106 +0 0 0 +172 172 172 +213 213 213 +49 49 41 +131 98 90 +189 172 131 +172 148 115 +222 189 148 +255 238 189 +82 57 49 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/seel/anim_front.png b/graphics/pokemon/seel/anim_front.png index 37f1d1247..1bdfb7aa2 100644 Binary files a/graphics/pokemon/seel/anim_front.png and b/graphics/pokemon/seel/anim_front.png differ diff --git a/graphics/pokemon/seel/front.png b/graphics/pokemon/seel/front.png index 31590d82a..7ca1efc7e 100644 Binary files a/graphics/pokemon/seel/front.png and b/graphics/pokemon/seel/front.png differ diff --git a/graphics/pokemon/seel/normal.pal b/graphics/pokemon/seel/normal.pal index b9de9a39f..f7f97e3fb 100644 --- a/graphics/pokemon/seel/normal.pal +++ b/graphics/pokemon/seel/normal.pal @@ -8,12 +8,12 @@ JASC-PAL 184 208 232 16 16 16 248 248 248 -56 144 128 -104 80 40 -176 144 88 -240 216 176 -120 64 112 -160 120 152 -232 176 224 +40 168 160 +104 88 16 +176 144 64 +240 224 184 +136 48 32 +208 112 88 +248 168 168 200 176 128 0 0 0 diff --git a/graphics/pokemon/seismitoad/anim_front.png b/graphics/pokemon/seismitoad/anim_front.png index 2db9eaf7a..9446c095d 100644 Binary files a/graphics/pokemon/seismitoad/anim_front.png and b/graphics/pokemon/seismitoad/anim_front.png differ diff --git a/graphics/pokemon/seismitoad/front.png b/graphics/pokemon/seismitoad/front.png index e0b386e5c..e87b7a4a0 100644 Binary files a/graphics/pokemon/seismitoad/front.png and b/graphics/pokemon/seismitoad/front.png differ diff --git a/graphics/pokemon/seismitoad/normal.pal b/graphics/pokemon/seismitoad/normal.pal index 27dec4986..22d9ac2a4 100644 --- a/graphics/pokemon/seismitoad/normal.pal +++ b/graphics/pokemon/seismitoad/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -32 104 96 -16 16 16 +24 96 112 +0 0 0 64 64 64 -80 152 136 -104 208 200 -88 88 104 -32 32 40 -24 56 88 -48 136 200 -48 104 144 -128 48 48 +80 160 136 +112 224 200 +96 96 96 +40 40 40 +16 64 120 +8 144 208 +40 104 168 +176 56 32 192 192 192 -200 88 80 +232 88 56 0 0 0 0 0 0 diff --git a/graphics/pokemon/sentret/anim_front.png b/graphics/pokemon/sentret/anim_front.png index e3edb08b8..820a036ac 100644 Binary files a/graphics/pokemon/sentret/anim_front.png and b/graphics/pokemon/sentret/anim_front.png differ diff --git a/graphics/pokemon/sentret/front.png b/graphics/pokemon/sentret/front.png index d83ba97d1..650589130 100644 Binary files a/graphics/pokemon/sentret/front.png and b/graphics/pokemon/sentret/front.png differ diff --git a/graphics/pokemon/sentret/normal.pal b/graphics/pokemon/sentret/normal.pal index 0402183a6..1e09bf2d7 100644 --- a/graphics/pokemon/sentret/normal.pal +++ b/graphics/pokemon/sentret/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -56 48 40 -32 24 16 -104 72 64 +72 48 32 +56 8 0 +96 64 48 16 16 16 -160 72 80 -232 104 120 -128 88 72 -208 152 136 -184 120 96 -248 232 184 -160 104 88 -48 24 16 -192 176 144 +176 32 64 +216 64 72 +136 88 64 +200 160 128 +184 128 88 +248 248 248 +160 112 72 +56 24 16 +200 200 192 0 0 0 0 0 0 diff --git a/graphics/pokemon/serperior/anim_front.png b/graphics/pokemon/serperior/anim_front.png index 30fb8818d..1056e166c 100644 Binary files a/graphics/pokemon/serperior/anim_front.png and b/graphics/pokemon/serperior/anim_front.png differ diff --git a/graphics/pokemon/serperior/front.png b/graphics/pokemon/serperior/front.png index ec2a8e5da..8f26506a6 100644 Binary files a/graphics/pokemon/serperior/front.png and b/graphics/pokemon/serperior/front.png differ diff --git a/graphics/pokemon/serperior/normal.pal b/graphics/pokemon/serperior/normal.pal index e4a3df792..af892b12e 100644 --- a/graphics/pokemon/serperior/normal.pal +++ b/graphics/pokemon/serperior/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 128 208 232 -112 96 48 -232 200 56 -176 144 48 -168 144 136 -24 144 96 -0 104 64 +104 112 56 +248 200 40 +208 152 8 +136 136 168 +24 152 72 +16 112 56 8 16 16 248 248 248 -136 208 160 -200 184 184 -104 152 120 -112 40 24 -224 80 56 -0 72 40 -0 72 40 +152 208 152 +192 192 208 +112 160 112 +144 56 0 +248 128 0 +16 80 40 +24 152 72 diff --git a/graphics/pokemon/servine/anim_front.png b/graphics/pokemon/servine/anim_front.png index f4fda6a37..05e7e6d81 100644 Binary files a/graphics/pokemon/servine/anim_front.png and b/graphics/pokemon/servine/anim_front.png differ diff --git a/graphics/pokemon/servine/front.png b/graphics/pokemon/servine/front.png index fb91132b9..ab5a141b9 100644 Binary files a/graphics/pokemon/servine/front.png and b/graphics/pokemon/servine/front.png differ diff --git a/graphics/pokemon/servine/normal.pal b/graphics/pokemon/servine/normal.pal index fd968a5d3..c3ec729c5 100644 --- a/graphics/pokemon/servine/normal.pal +++ b/graphics/pokemon/servine/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -24 72 32 -96 184 88 +16 80 40 +40 192 72 248 208 48 136 112 48 -56 136 56 -240 240 192 +32 144 56 +248 240 184 16 16 16 248 248 248 -168 160 128 -120 48 48 -192 80 80 -128 112 112 +192 184 96 +112 64 16 +184 72 32 +136 120 48 184 152 40 0 0 0 0 0 0 diff --git a/graphics/pokemon/seviper/anim_front.png b/graphics/pokemon/seviper/anim_front.png index 42fcc1309..364385b87 100644 Binary files a/graphics/pokemon/seviper/anim_front.png and b/graphics/pokemon/seviper/anim_front.png differ diff --git a/graphics/pokemon/seviper/front.png b/graphics/pokemon/seviper/front.png index baf054fa2..c80d9c80f 100644 Binary files a/graphics/pokemon/seviper/front.png and b/graphics/pokemon/seviper/front.png differ diff --git a/graphics/pokemon/seviper/normal.pal b/graphics/pokemon/seviper/normal.pal index 37b994571..a8a6215be 100644 --- a/graphics/pokemon/seviper/normal.pal +++ b/graphics/pokemon/seviper/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -128 112 48 -72 88 112 -48 64 88 -200 160 72 +184 88 56 +72 80 104 +56 64 80 +224 160 72 240 208 136 -96 120 136 -56 48 80 -16 16 16 -112 96 136 -104 48 48 -168 80 72 -152 136 192 -240 136 120 +96 104 136 +72 48 80 +0 0 0 +112 88 144 +96 24 24 +168 64 56 +160 112 224 +208 80 72 248 248 248 80 88 112 diff --git a/graphics/pokemon/sewaddle/anim_front.png b/graphics/pokemon/sewaddle/anim_front.png index 26ad02e8d..3a46aa599 100644 Binary files a/graphics/pokemon/sewaddle/anim_front.png and b/graphics/pokemon/sewaddle/anim_front.png differ diff --git a/graphics/pokemon/sewaddle/front.png b/graphics/pokemon/sewaddle/front.png index a744bffad..7f01fe90c 100644 Binary files a/graphics/pokemon/sewaddle/front.png and b/graphics/pokemon/sewaddle/front.png differ diff --git a/graphics/pokemon/sewaddle/normal.pal b/graphics/pokemon/sewaddle/normal.pal index 23b34cc08..00ac01e7a 100644 --- a/graphics/pokemon/sewaddle/normal.pal +++ b/graphics/pokemon/sewaddle/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -16 16 16 -72 88 40 -104 144 48 -144 200 56 -200 152 64 -136 104 48 -248 216 144 -248 192 88 -248 248 248 -96 80 72 -240 136 24 -144 80 24 -200 184 168 -248 168 88 +0 0 0 +56 96 24 +88 152 48 +144 200 8 +208 168 0 +152 120 8 +248 240 168 +248 216 48 +248 248 248 +72 72 72 +224 128 8 +144 80 24 +200 200 208 +248 168 72 0 0 0 diff --git a/graphics/pokemon/sharpedo/anim_front.png b/graphics/pokemon/sharpedo/anim_front.png index 008c2d6b9..cf261cd4a 100644 Binary files a/graphics/pokemon/sharpedo/anim_front.png and b/graphics/pokemon/sharpedo/anim_front.png differ diff --git a/graphics/pokemon/sharpedo/front.png b/graphics/pokemon/sharpedo/front.png index 14a2a91ca..67db44c34 100644 Binary files a/graphics/pokemon/sharpedo/front.png and b/graphics/pokemon/sharpedo/front.png differ diff --git a/graphics/pokemon/sharpedo/normal.pal b/graphics/pokemon/sharpedo/normal.pal index 7b1655e8f..36e0ce843 100644 --- a/graphics/pokemon/sharpedo/normal.pal +++ b/graphics/pokemon/sharpedo/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -0 64 96 -64 128 176 -8 96 136 -0 40 72 +48 64 112 +80 112 184 +56 80 144 +40 56 80 16 16 16 -192 160 112 -232 200 120 +168 168 144 +248 216 96 248 248 248 -160 64 104 -216 48 96 -208 216 232 -168 168 192 -208 136 160 +168 56 80 +248 0 56 +224 216 240 +168 160 176 +224 104 120 144 120 104 0 0 0 diff --git a/graphics/pokemon/shaymin/anim_front.png b/graphics/pokemon/shaymin/anim_front.png index e59994d74..82ae30626 100644 Binary files a/graphics/pokemon/shaymin/anim_front.png and b/graphics/pokemon/shaymin/anim_front.png differ diff --git a/graphics/pokemon/shaymin/front.png b/graphics/pokemon/shaymin/front.png index 069bee40d..f8e316903 100644 Binary files a/graphics/pokemon/shaymin/front.png and b/graphics/pokemon/shaymin/front.png differ diff --git a/graphics/pokemon/shaymin/normal.pal b/graphics/pokemon/shaymin/normal.pal index 3af83a641..53068c4d6 100644 --- a/graphics/pokemon/shaymin/normal.pal +++ b/graphics/pokemon/shaymin/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -120 152 80 -80 104 56 -168 200 96 +136 168 96 +88 112 64 +168 216 96 248 216 96 -128 72 88 -232 144 136 +128 72 104 +232 136 160 80 80 104 184 192 208 248 248 248 16 16 16 64 152 56 -216 112 128 +200 104 136 32 112 48 32 56 40 144 144 176 diff --git a/graphics/pokemon/shaymin/sky/anim_front.png b/graphics/pokemon/shaymin/sky/anim_front.png index 0cb7a632b..541477651 100644 Binary files a/graphics/pokemon/shaymin/sky/anim_front.png and b/graphics/pokemon/shaymin/sky/anim_front.png differ diff --git a/graphics/pokemon/shaymin/sky/front.png b/graphics/pokemon/shaymin/sky/front.png index 0b544105f..190c4ebf6 100644 Binary files a/graphics/pokemon/shaymin/sky/front.png and b/graphics/pokemon/shaymin/sky/front.png differ diff --git a/graphics/pokemon/shaymin/sky/normal.pal b/graphics/pokemon/shaymin/sky/normal.pal index 07f4e6401..2b71401c1 100644 --- a/graphics/pokemon/shaymin/sky/normal.pal +++ b/graphics/pokemon/shaymin/sky/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 168 80 -88 104 56 -176 200 120 -160 136 160 -72 64 56 +120 168 32 +56 104 16 +152 208 32 +144 144 168 +80 80 88 16 16 16 -248 240 232 -216 192 184 +248 248 248 +200 200 208 248 248 248 56 120 48 120 168 88 -160 64 64 -216 80 80 -112 48 40 +184 72 88 +240 72 64 +120 56 80 0 0 0 diff --git a/graphics/pokemon/shedinja/anim_front.png b/graphics/pokemon/shedinja/anim_front.png index 9560d75a5..897127dff 100644 Binary files a/graphics/pokemon/shedinja/anim_front.png and b/graphics/pokemon/shedinja/anim_front.png differ diff --git a/graphics/pokemon/shedinja/front.png b/graphics/pokemon/shedinja/front.png index 9bf0e8ca4..9c217d773 100644 Binary files a/graphics/pokemon/shedinja/front.png and b/graphics/pokemon/shedinja/front.png differ diff --git a/graphics/pokemon/shedinja/normal.pal b/graphics/pokemon/shedinja/normal.pal index b212ce0f6..78be62b12 100644 --- a/graphics/pokemon/shedinja/normal.pal +++ b/graphics/pokemon/shedinja/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -160 176 224 -120 128 168 +160 160 200 +128 144 168 248 248 248 -208 224 248 -80 64 56 -216 176 104 -176 136 80 -24 24 24 -248 208 128 -144 120 112 -112 88 80 +208 208 224 +88 80 64 +216 176 112 +176 144 88 +16 16 16 +240 208 128 +144 128 120 +112 104 88 184 176 168 -176 160 144 -176 160 144 +168 152 136 +168 152 136 0 0 0 diff --git a/graphics/pokemon/shelgon/anim_front.png b/graphics/pokemon/shelgon/anim_front.png index 551c19906..d3a746fce 100644 Binary files a/graphics/pokemon/shelgon/anim_front.png and b/graphics/pokemon/shelgon/anim_front.png differ diff --git a/graphics/pokemon/shelgon/front.png b/graphics/pokemon/shelgon/front.png index b042523e1..713ba5226 100644 Binary files a/graphics/pokemon/shelgon/front.png and b/graphics/pokemon/shelgon/front.png differ diff --git a/graphics/pokemon/shelgon/normal.pal b/graphics/pokemon/shelgon/normal.pal index 6dc51d422..8d21991d6 100644 --- a/graphics/pokemon/shelgon/normal.pal +++ b/graphics/pokemon/shelgon/normal.pal @@ -7,13 +7,13 @@ JASC-PAL 208 216 224 168 160 176 120 112 136 -96 88 96 +80 88 80 72 56 72 -216 192 128 -248 232 192 -144 136 136 -184 64 80 +232 224 96 +248 248 200 +120 120 112 +168 40 64 96 48 56 -192 112 120 +184 64 80 144 144 160 0 0 0 diff --git a/graphics/pokemon/shellder/anim_front.png b/graphics/pokemon/shellder/anim_front.png index b63e9a48f..ec58b85d1 100644 Binary files a/graphics/pokemon/shellder/anim_front.png and b/graphics/pokemon/shellder/anim_front.png differ diff --git a/graphics/pokemon/shellder/front.png b/graphics/pokemon/shellder/front.png index 5b3e211b1..4c3e7f522 100644 Binary files a/graphics/pokemon/shellder/front.png and b/graphics/pokemon/shellder/front.png differ diff --git a/graphics/pokemon/shellder/normal.pal b/graphics/pokemon/shellder/normal.pal index c05187339..462bd5ee4 100644 --- a/graphics/pokemon/shellder/normal.pal +++ b/graphics/pokemon/shellder/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -96 72 128 -184 176 224 -120 112 192 -152 152 216 +112 88 136 +216 216 240 +152 136 192 +192 184 232 16 16 16 -56 40 88 -104 104 104 +72 56 96 +128 128 144 248 248 248 -104 48 56 -160 112 120 -216 144 160 +120 16 48 +192 96 104 +232 168 176 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/shellos/anim_front.png b/graphics/pokemon/shellos/anim_front.png index 3d39bc795..f548e886c 100644 Binary files a/graphics/pokemon/shellos/anim_front.png and b/graphics/pokemon/shellos/anim_front.png differ diff --git a/graphics/pokemon/shellos/east_sea/anim_front.png b/graphics/pokemon/shellos/east_sea/anim_front.png index db306c3cd..0ba327803 100644 Binary files a/graphics/pokemon/shellos/east_sea/anim_front.png and b/graphics/pokemon/shellos/east_sea/anim_front.png differ diff --git a/graphics/pokemon/shellos/east_sea/front.png b/graphics/pokemon/shellos/east_sea/front.png index 4700dca46..79d1c97cc 100644 Binary files a/graphics/pokemon/shellos/east_sea/front.png and b/graphics/pokemon/shellos/east_sea/front.png differ diff --git a/graphics/pokemon/shellos/east_sea/normal.pal b/graphics/pokemon/shellos/east_sea/normal.pal index 64d5e8fd9..82ebd332f 100644 --- a/graphics/pokemon/shellos/east_sea/normal.pal +++ b/graphics/pokemon/shellos/east_sea/normal.pal @@ -6,14 +6,14 @@ JASC-PAL 206 211 186 255 255 255 16 16 16 -50 185 209 -45 96 114 -123 224 207 -52 137 150 -247 223 118 -168 148 67 +104 176 240 +80 80 120 +128 224 248 +104 120 168 +248 224 112 +160 136 56 89 82 53 131 153 76 76 91 41 -182 209 119 +176 208 120 0 0 0 diff --git a/graphics/pokemon/shellos/front.png b/graphics/pokemon/shellos/front.png index 0eab6cf86..0d1be14f6 100644 Binary files a/graphics/pokemon/shellos/front.png and b/graphics/pokemon/shellos/front.png differ diff --git a/graphics/pokemon/shellos/normal.pal b/graphics/pokemon/shellos/normal.pal index 55212a56b..e5f6ceb50 100644 --- a/graphics/pokemon/shellos/normal.pal +++ b/graphics/pokemon/shellos/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -120 56 96 +112 64 104 16 16 16 -240 136 184 -216 80 144 +248 136 192 +224 80 160 104 56 80 -168 96 128 -240 184 184 -240 216 112 -168 144 64 +168 96 144 +248 176 224 +248 216 112 +160 136 56 248 248 248 -88 80 48 -200 176 176 -128 112 112 +80 72 56 +176 176 192 +112 112 120 232 232 232 -160 64 120 +168 48 136 diff --git a/graphics/pokemon/shelmet/anim_front.png b/graphics/pokemon/shelmet/anim_front.png index 93b0b8b18..a655e54d1 100644 Binary files a/graphics/pokemon/shelmet/anim_front.png and b/graphics/pokemon/shelmet/anim_front.png differ diff --git a/graphics/pokemon/shelmet/front.png b/graphics/pokemon/shelmet/front.png index e3abb63bc..e881e7149 100644 Binary files a/graphics/pokemon/shelmet/front.png and b/graphics/pokemon/shelmet/front.png differ diff --git a/graphics/pokemon/shelmet/normal.pal b/graphics/pokemon/shelmet/normal.pal index c5c862321..cd858c102 100644 --- a/graphics/pokemon/shelmet/normal.pal +++ b/graphics/pokemon/shelmet/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -128 112 96 -216 200 184 -96 80 72 +88 88 120 +192 192 208 +40 48 88 16 16 16 -176 152 144 +144 144 168 56 48 48 96 104 136 56 72 112 -96 24 48 -160 64 72 -208 80 96 -248 96 120 +96 0 32 +176 32 72 +216 48 96 +248 72 120 80 128 72 248 248 248 112 200 112 diff --git a/graphics/pokemon/shieldon/anim_front.png b/graphics/pokemon/shieldon/anim_front.png index 5ce78d198..43e59272e 100644 Binary files a/graphics/pokemon/shieldon/anim_front.png and b/graphics/pokemon/shieldon/anim_front.png differ diff --git a/graphics/pokemon/shiftry/anim_front.png b/graphics/pokemon/shiftry/anim_front.png index 33cbb68fe..f813d71d1 100644 Binary files a/graphics/pokemon/shiftry/anim_front.png and b/graphics/pokemon/shiftry/anim_front.png differ diff --git a/graphics/pokemon/shiftry/front.png b/graphics/pokemon/shiftry/front.png index 82df0118b..15e263cb9 100644 Binary files a/graphics/pokemon/shiftry/front.png and b/graphics/pokemon/shiftry/front.png differ diff --git a/graphics/pokemon/shiftry/normal.pal b/graphics/pokemon/shiftry/normal.pal index 733e980ce..f10000fcb 100644 --- a/graphics/pokemon/shiftry/normal.pal +++ b/graphics/pokemon/shiftry/normal.pal @@ -2,16 +2,16 @@ JASC-PAL 0100 16 0 176 232 -88 64 48 -224 168 128 +96 64 40 +224 176 136 112 104 128 16 16 16 -152 104 56 -16 96 48 -192 136 88 +152 104 72 +56 104 40 +192 136 104 248 248 248 -88 176 112 -24 136 64 +104 200 112 +72 144 88 176 176 208 216 224 248 240 224 128 diff --git a/graphics/pokemon/shinx/anim_front.png b/graphics/pokemon/shinx/anim_front.png index 16221a2a2..c46f6c259 100644 Binary files a/graphics/pokemon/shinx/anim_front.png and b/graphics/pokemon/shinx/anim_front.png differ diff --git a/graphics/pokemon/shinx/front.png b/graphics/pokemon/shinx/front.png index a14872017..f6d437c6e 100644 Binary files a/graphics/pokemon/shinx/front.png and b/graphics/pokemon/shinx/front.png differ diff --git a/graphics/pokemon/shinx/normal.pal b/graphics/pokemon/shinx/normal.pal index 467dbc775..78ad0357e 100644 --- a/graphics/pokemon/shinx/normal.pal +++ b/graphics/pokemon/shinx/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -48 80 88 -80 128 144 -104 184 200 -96 88 48 +64 64 104 +96 120 176 +120 168 240 +112 96 80 16 16 16 -192 144 32 -248 192 48 +176 152 88 +248 224 88 248 248 248 -240 96 96 -144 48 48 -80 80 88 -48 48 48 -147 88 104 +224 72 80 +144 56 80 +72 72 96 +48 48 64 +224 104 120 0 0 0 0 0 0 diff --git a/graphics/pokemon/shroomish/anim_front.png b/graphics/pokemon/shroomish/anim_front.png index 597fe846c..d06679fdb 100644 Binary files a/graphics/pokemon/shroomish/anim_front.png and b/graphics/pokemon/shroomish/anim_front.png differ diff --git a/graphics/pokemon/shroomish/front.png b/graphics/pokemon/shroomish/front.png index 120a7902f..0a4389204 100644 Binary files a/graphics/pokemon/shroomish/front.png and b/graphics/pokemon/shroomish/front.png differ diff --git a/graphics/pokemon/shroomish/normal.pal b/graphics/pokemon/shroomish/normal.pal index e80a8e783..c72c8dfc7 100644 --- a/graphics/pokemon/shroomish/normal.pal +++ b/graphics/pokemon/shroomish/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 0 176 232 112 96 72 -88 72 56 -232 200 168 -16 16 16 -184 160 128 -120 176 144 -160 200 168 -104 152 120 -248 224 200 -56 96 72 -153 96 121 -204 148 190 +88 72 64 +232 208 176 +0 0 0 +192 160 128 +144 176 120 +192 192 144 +128 152 120 +240 232 208 +80 104 64 +168 40 40 +232 128 120 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/shuckle/anim_front.png b/graphics/pokemon/shuckle/anim_front.png index cba7aac76..619f3b978 100644 Binary files a/graphics/pokemon/shuckle/anim_front.png and b/graphics/pokemon/shuckle/anim_front.png differ diff --git a/graphics/pokemon/shuckle/back.png b/graphics/pokemon/shuckle/back.png index 6c74f0e25..235287795 100644 Binary files a/graphics/pokemon/shuckle/back.png and b/graphics/pokemon/shuckle/back.png differ diff --git a/graphics/pokemon/shuckle/front.png b/graphics/pokemon/shuckle/front.png index d8eab34e0..0b00c414d 100644 Binary files a/graphics/pokemon/shuckle/front.png and b/graphics/pokemon/shuckle/front.png differ diff --git a/graphics/pokemon/shuckle/normal.pal b/graphics/pokemon/shuckle/normal.pal index 3fc5a9469..7b9d396be 100644 --- a/graphics/pokemon/shuckle/normal.pal +++ b/graphics/pokemon/shuckle/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -192 152 48 -248 224 160 -248 200 72 -112 96 32 +184 136 40 +248 248 88 +232 192 72 +112 80 16 16 16 16 112 24 16 -104 88 56 +104 104 104 248 248 248 -192 176 128 +192 192 192 176 40 40 -224 104 96 +224 72 64 248 224 160 -0 0 0 +168 168 168 0 0 0 0 0 0 diff --git a/graphics/pokemon/shuckle/shiny.pal b/graphics/pokemon/shuckle/shiny.pal index 24d9d5f19..f831af379 100644 --- a/graphics/pokemon/shuckle/shiny.pal +++ b/graphics/pokemon/shuckle/shiny.pal @@ -14,6 +14,6 @@ JASC-PAL 24 96 208 72 152 248 176 200 240 -0 0 0 +104 136 208 0 0 0 0 0 0 diff --git a/graphics/pokemon/shuppet/anim_front.png b/graphics/pokemon/shuppet/anim_front.png index 196c57e51..fe5e682d3 100644 Binary files a/graphics/pokemon/shuppet/anim_front.png and b/graphics/pokemon/shuppet/anim_front.png differ diff --git a/graphics/pokemon/shuppet/front.png b/graphics/pokemon/shuppet/front.png index 4fda57b31..e2633121a 100644 Binary files a/graphics/pokemon/shuppet/front.png and b/graphics/pokemon/shuppet/front.png differ diff --git a/graphics/pokemon/shuppet/normal.pal b/graphics/pokemon/shuppet/normal.pal index 39015d185..18c342843 100644 --- a/graphics/pokemon/shuppet/normal.pal +++ b/graphics/pokemon/shuppet/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -80 88 128 -16 16 16 -160 160 216 -120 120 176 -64 64 96 -96 104 152 -40 40 72 -96 144 168 -64 112 168 -136 208 232 +99 90 140 +0 0 0 +165 173 214 +132 132 173 +58 74 123 +115 115 156 +25 49 90 +66 140 173 +66 115 173 +115 181 214 184 224 240 -184 160 72 -248 208 80 -142 82 116 -214 130 175 +181 140 0 +230 189 82 +181 49 123 +255 115 189 diff --git a/graphics/pokemon/sigilyph/anim_front.png b/graphics/pokemon/sigilyph/anim_front.png index a9c0736cd..db53519b7 100644 Binary files a/graphics/pokemon/sigilyph/anim_front.png and b/graphics/pokemon/sigilyph/anim_front.png differ diff --git a/graphics/pokemon/sigilyph/back.png b/graphics/pokemon/sigilyph/back.png index 09fe68d39..e1528d211 100644 Binary files a/graphics/pokemon/sigilyph/back.png and b/graphics/pokemon/sigilyph/back.png differ diff --git a/graphics/pokemon/sigilyph/front.png b/graphics/pokemon/sigilyph/front.png index 373f63a04..8ce63b837 100644 Binary files a/graphics/pokemon/sigilyph/front.png and b/graphics/pokemon/sigilyph/front.png differ diff --git a/graphics/pokemon/sigilyph/normal.pal b/graphics/pokemon/sigilyph/normal.pal index 3fdaae47c..aa021fdd1 100644 --- a/graphics/pokemon/sigilyph/normal.pal +++ b/graphics/pokemon/sigilyph/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -56 104 144 +40 120 136 16 16 16 -120 168 208 -216 56 56 -248 184 64 -136 56 72 -168 112 48 -96 72 40 -56 48 48 +72 168 224 +216 0 0 +248 192 8 +144 80 112 +152 120 24 +96 64 16 +48 48 48 248 248 248 -80 176 88 -160 152 144 -40 104 64 -248 184 64 +56 160 72 +144 144 144 +48 112 56 +0 0 0 0 0 0 diff --git a/graphics/pokemon/sigilyph/shiny.pal b/graphics/pokemon/sigilyph/shiny.pal index db05b0891..c747e6c86 100644 --- a/graphics/pokemon/sigilyph/shiny.pal +++ b/graphics/pokemon/sigilyph/shiny.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -152 208 160 +120 192 168 160 104 48 16 16 16 248 168 72 @@ -15,5 +15,5 @@ JASC-PAL 160 136 80 208 192 136 96 80 48 -192 216 104 +0 0 0 0 0 0 diff --git a/graphics/pokemon/silcoon/anim_front.png b/graphics/pokemon/silcoon/anim_front.png index 94b2bf97a..8fb93f1fc 100644 Binary files a/graphics/pokemon/silcoon/anim_front.png and b/graphics/pokemon/silcoon/anim_front.png differ diff --git a/graphics/pokemon/silcoon/front.png b/graphics/pokemon/silcoon/front.png index c26d8efe2..e6f2a614c 100644 Binary files a/graphics/pokemon/silcoon/front.png and b/graphics/pokemon/silcoon/front.png differ diff --git a/graphics/pokemon/silcoon/normal.pal b/graphics/pokemon/silcoon/normal.pal index f43a07f6c..cb6b793aa 100644 --- a/graphics/pokemon/silcoon/normal.pal +++ b/graphics/pokemon/silcoon/normal.pal @@ -8,8 +8,8 @@ JASC-PAL 192 208 224 16 16 16 168 184 176 -152 56 64 -224 88 96 +176 24 56 +248 80 120 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/simipour/anim_front.png b/graphics/pokemon/simipour/anim_front.png index f7a31691c..927aeb1eb 100644 Binary files a/graphics/pokemon/simipour/anim_front.png and b/graphics/pokemon/simipour/anim_front.png differ diff --git a/graphics/pokemon/simipour/front.png b/graphics/pokemon/simipour/front.png index 56a3f7547..3ea50454c 100644 Binary files a/graphics/pokemon/simipour/front.png and b/graphics/pokemon/simipour/front.png differ diff --git a/graphics/pokemon/simipour/normal.pal b/graphics/pokemon/simipour/normal.pal index 0cc05ef5f..846b3976b 100644 --- a/graphics/pokemon/simipour/normal.pal +++ b/graphics/pokemon/simipour/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -24 72 96 -40 104 136 -16 16 16 -48 136 152 -48 184 216 -120 208 224 +0 56 112 +16 104 136 +0 0 0 +32 136 160 +40 176 216 +152 224 232 248 248 248 -192 160 96 -144 128 88 -192 176 168 -248 208 112 +200 160 88 +160 120 56 +192 192 192 +248 200 120 80 80 80 56 56 56 -96 80 64 +112 80 32 152 152 152 diff --git a/graphics/pokemon/simisage/anim_front.png b/graphics/pokemon/simisage/anim_front.png index 1b3a09c14..d9601c955 100644 Binary files a/graphics/pokemon/simisage/anim_front.png and b/graphics/pokemon/simisage/anim_front.png differ diff --git a/graphics/pokemon/simisage/front.png b/graphics/pokemon/simisage/front.png index 44f7b6ada..22e5dff39 100644 Binary files a/graphics/pokemon/simisage/front.png and b/graphics/pokemon/simisage/front.png differ diff --git a/graphics/pokemon/simisage/normal.pal b/graphics/pokemon/simisage/normal.pal index 8e2676bed..953226776 100644 --- a/graphics/pokemon/simisage/normal.pal +++ b/graphics/pokemon/simisage/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 0 176 232 -32 80 56 -16 16 16 -48 168 104 -40 120 72 -248 208 112 -144 128 64 -176 144 96 +24 72 40 +0 0 0 +24 160 80 +8 112 48 +248 200 120 +200 160 88 +160 120 56 248 248 248 -168 152 144 -136 208 160 +152 152 152 +128 200 152 80 80 80 -208 192 192 -104 88 32 +192 192 192 +112 80 32 0 0 0 0 0 0 diff --git a/graphics/pokemon/simisear/anim_front.png b/graphics/pokemon/simisear/anim_front.png index 89bdf1153..7426fffe7 100644 Binary files a/graphics/pokemon/simisear/anim_front.png and b/graphics/pokemon/simisear/anim_front.png differ diff --git a/graphics/pokemon/simisear/front.png b/graphics/pokemon/simisear/front.png index 4259f5f49..c8ce5ef58 100644 Binary files a/graphics/pokemon/simisear/front.png and b/graphics/pokemon/simisear/front.png differ diff --git a/graphics/pokemon/simisear/normal.pal b/graphics/pokemon/simisear/normal.pal index 73ae069ff..42c14f4bd 100644 --- a/graphics/pokemon/simisear/normal.pal +++ b/graphics/pokemon/simisear/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 48 56 -16 16 16 -224 88 88 -168 72 64 -224 144 40 +120 48 48 +8 8 8 +224 80 64 +184 64 56 +240 144 64 248 248 248 -160 144 144 +152 152 152 80 80 80 -192 160 80 -192 176 168 -240 200 120 -152 128 64 -104 88 40 +200 160 88 +192 192 192 +248 200 120 +160 120 56 +112 80 32 0 0 0 0 0 0 diff --git a/graphics/pokemon/skarmory/anim_front.png b/graphics/pokemon/skarmory/anim_front.png index 44b7f8da1..ea1033f3e 100644 Binary files a/graphics/pokemon/skarmory/anim_front.png and b/graphics/pokemon/skarmory/anim_front.png differ diff --git a/graphics/pokemon/skarmory/front.png b/graphics/pokemon/skarmory/front.png index f66f968d4..719acd0f8 100644 Binary files a/graphics/pokemon/skarmory/front.png and b/graphics/pokemon/skarmory/front.png differ diff --git a/graphics/pokemon/skarmory/normal.pal b/graphics/pokemon/skarmory/normal.pal index 53ebc0422..22e83a220 100644 --- a/graphics/pokemon/skarmory/normal.pal +++ b/graphics/pokemon/skarmory/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -128 144 168 -224 224 248 -56 64 104 -184 200 232 -160 176 216 +120 144 184 +216 232 248 +48 80 120 +184 200 224 +152 176 208 16 16 16 -120 24 32 -160 48 48 -232 88 104 -96 104 152 -208 56 72 -176 168 48 -248 248 96 -184 120 136 +144 16 24 +192 48 72 +248 128 144 +96 120 168 +232 88 96 +200 144 0 +248 216 0 +128 24 32 248 248 248 diff --git a/graphics/pokemon/skiploom/anim_front.png b/graphics/pokemon/skiploom/anim_front.png index 710e60deb..873e2c86f 100644 Binary files a/graphics/pokemon/skiploom/anim_front.png and b/graphics/pokemon/skiploom/anim_front.png differ diff --git a/graphics/pokemon/skiploom/front.png b/graphics/pokemon/skiploom/front.png index c8d8cc547..8bbabfd30 100644 Binary files a/graphics/pokemon/skiploom/front.png and b/graphics/pokemon/skiploom/front.png differ diff --git a/graphics/pokemon/skiploom/normal.pal b/graphics/pokemon/skiploom/normal.pal index 545ace0e2..4ead4707f 100644 --- a/graphics/pokemon/skiploom/normal.pal +++ b/graphics/pokemon/skiploom/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 0 176 232 -112 96 40 -16 16 16 -248 232 128 -232 208 88 -184 168 80 -200 208 192 -248 248 248 -64 104 16 -120 200 56 -168 224 120 -112 160 48 -240 72 64 -144 128 64 -176 184 168 +136 80 0 0 0 0 +248 232 0 +248 208 0 +240 160 24 +176 208 216 +248 248 248 +24 104 0 +144 200 48 +176 232 104 +112 168 24 +248 0 64 +200 128 0 +152 80 0 +152 168 184 diff --git a/graphics/pokemon/skitty/anim_front.png b/graphics/pokemon/skitty/anim_front.png index 42c19ca61..7f0c1ab4e 100644 Binary files a/graphics/pokemon/skitty/anim_front.png and b/graphics/pokemon/skitty/anim_front.png differ diff --git a/graphics/pokemon/skitty/front.png b/graphics/pokemon/skitty/front.png index 1242c7a3e..2a7321c26 100644 Binary files a/graphics/pokemon/skitty/front.png and b/graphics/pokemon/skitty/front.png differ diff --git a/graphics/pokemon/skitty/normal.pal b/graphics/pokemon/skitty/normal.pal index d0413c239..482ce24ec 100644 --- a/graphics/pokemon/skitty/normal.pal +++ b/graphics/pokemon/skitty/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -120 104 56 -248 240 176 -232 208 144 +120 96 64 +240 216 168 +232 184 120 16 16 16 -152 72 80 -248 184 176 -232 144 144 -216 120 120 -168 112 176 -104 56 136 -192 168 112 -192 128 152 +152 48 64 +240 152 176 +232 120 144 +208 88 120 +136 56 144 +104 48 112 +200 136 88 +216 96 128 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/skorupi/anim_front.png b/graphics/pokemon/skorupi/anim_front.png index bf20b1b24..2120db4b0 100644 Binary files a/graphics/pokemon/skorupi/anim_front.png and b/graphics/pokemon/skorupi/anim_front.png differ diff --git a/graphics/pokemon/skorupi/front.png b/graphics/pokemon/skorupi/front.png index 0395737ac..480051932 100644 Binary files a/graphics/pokemon/skorupi/front.png and b/graphics/pokemon/skorupi/front.png differ diff --git a/graphics/pokemon/skorupi/normal.pal b/graphics/pokemon/skorupi/normal.pal index 1c98bdc25..4b71afccb 100644 --- a/graphics/pokemon/skorupi/normal.pal +++ b/graphics/pokemon/skorupi/normal.pal @@ -2,16 +2,16 @@ JASC-PAL 0100 16 152 208 160 -136 112 104 -248 248 240 +136 136 136 +248 248 248 16 16 16 -56 64 120 -224 208 200 +64 64 112 +208 208 224 104 120 176 -152 168 216 -200 176 168 -40 32 80 -88 104 152 +144 152 232 +176 176 208 +40 40 48 +104 104 176 40 96 112 48 168 184 40 40 48 diff --git a/graphics/pokemon/skuntank/anim_front.png b/graphics/pokemon/skuntank/anim_front.png index b9172b0f5..52caa25ad 100644 Binary files a/graphics/pokemon/skuntank/anim_front.png and b/graphics/pokemon/skuntank/anim_front.png differ diff --git a/graphics/pokemon/skuntank/front.png b/graphics/pokemon/skuntank/front.png index a6d0f5f8b..d188535e2 100644 Binary files a/graphics/pokemon/skuntank/front.png and b/graphics/pokemon/skuntank/front.png differ diff --git a/graphics/pokemon/skuntank/normal.pal b/graphics/pokemon/skuntank/normal.pal index e42858906..c76b89826 100644 --- a/graphics/pokemon/skuntank/normal.pal +++ b/graphics/pokemon/skuntank/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -72 48 72 -136 112 144 -96 72 112 +72 56 96 +136 112 176 +104 80 136 16 16 16 -48 24 56 -176 152 128 -248 224 168 -88 80 64 +48 40 64 +176 152 120 +232 216 168 +96 88 64 248 248 248 -184 200 208 -160 80 40 -232 120 72 -120 56 24 -152 88 96 -232 136 136 +176 176 208 +176 88 48 +240 136 72 +128 72 48 +104 96 112 +0 0 0 diff --git a/graphics/pokemon/slaking/anim_front.png b/graphics/pokemon/slaking/anim_front.png index c488092fb..1b0ddece3 100644 Binary files a/graphics/pokemon/slaking/anim_front.png and b/graphics/pokemon/slaking/anim_front.png differ diff --git a/graphics/pokemon/slaking/back.png b/graphics/pokemon/slaking/back.png index f64617251..9e541ebc1 100644 Binary files a/graphics/pokemon/slaking/back.png and b/graphics/pokemon/slaking/back.png differ diff --git a/graphics/pokemon/slaking/front.png b/graphics/pokemon/slaking/front.png index b99bc6c6f..bc7ed93b0 100644 Binary files a/graphics/pokemon/slaking/front.png and b/graphics/pokemon/slaking/front.png differ diff --git a/graphics/pokemon/slaking/normal.pal b/graphics/pokemon/slaking/normal.pal index 95c095135..835251a51 100644 --- a/graphics/pokemon/slaking/normal.pal +++ b/graphics/pokemon/slaking/normal.pal @@ -4,16 +4,16 @@ JASC-PAL 152 208 160 16 16 16 88 64 48 -96 104 120 +88 96 120 232 232 248 -168 136 112 -128 96 72 -192 200 224 -232 208 176 -184 168 144 +160 128 104 +120 96 72 +208 208 232 +232 216 184 +184 176 144 248 248 248 -120 56 80 -224 144 160 -184 96 120 -64 48 48 +144 64 88 +216 128 152 +200 88 128 +0 0 0 0 0 0 diff --git a/graphics/pokemon/slakoth/anim_front.png b/graphics/pokemon/slakoth/anim_front.png index b15f5d039..32085285f 100644 Binary files a/graphics/pokemon/slakoth/anim_front.png and b/graphics/pokemon/slakoth/anim_front.png differ diff --git a/graphics/pokemon/slakoth/front.png b/graphics/pokemon/slakoth/front.png index 737b8dbae..e40b34fb2 100644 Binary files a/graphics/pokemon/slakoth/front.png and b/graphics/pokemon/slakoth/front.png differ diff --git a/graphics/pokemon/slakoth/normal.pal b/graphics/pokemon/slakoth/normal.pal index 15dd6bc1c..f9b089f45 100644 --- a/graphics/pokemon/slakoth/normal.pal +++ b/graphics/pokemon/slakoth/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -88 64 48 -16 16 16 -232 216 200 -200 184 160 -176 152 128 -112 80 56 -168 120 96 +80 56 40 +0 0 0 +216 200 184 +192 176 144 +176 152 120 +104 72 32 +136 112 80 200 200 200 152 152 152 248 248 248 -224 144 144 -168 104 104 -120 64 64 +224 136 144 +184 88 104 +120 56 80 64 64 64 0 0 0 diff --git a/graphics/pokemon/slowbro/anim_front.png b/graphics/pokemon/slowbro/anim_front.png index 2e4c70678..f944ffb99 100644 Binary files a/graphics/pokemon/slowbro/anim_front.png and b/graphics/pokemon/slowbro/anim_front.png differ diff --git a/graphics/pokemon/slowbro/front.png b/graphics/pokemon/slowbro/front.png index 9c7144bb8..4ec5e110f 100644 Binary files a/graphics/pokemon/slowbro/front.png and b/graphics/pokemon/slowbro/front.png differ diff --git a/graphics/pokemon/slowbro/normal.pal b/graphics/pokemon/slowbro/normal.pal index cdb6101e6..83a239b6d 100644 --- a/graphics/pokemon/slowbro/normal.pal +++ b/graphics/pokemon/slowbro/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 56 72 -200 120 136 -232 144 168 +120 48 48 +232 104 120 +248 144 144 24 24 24 -248 184 192 +248 192 176 248 248 248 216 216 208 -72 96 128 -120 152 168 -128 104 72 -168 200 216 -248 216 200 -232 200 160 -192 168 120 -184 128 160 +88 88 88 +144 144 144 +128 88 32 +184 184 184 +248 240 176 +240 216 128 +208 160 96 +232 80 40 diff --git a/graphics/pokemon/slowking/anim_front.png b/graphics/pokemon/slowking/anim_front.png index 853d6180c..d9740c007 100644 Binary files a/graphics/pokemon/slowking/anim_front.png and b/graphics/pokemon/slowking/anim_front.png differ diff --git a/graphics/pokemon/slowking/front.png b/graphics/pokemon/slowking/front.png index 928c6925d..d9af555c2 100644 Binary files a/graphics/pokemon/slowking/front.png and b/graphics/pokemon/slowking/front.png differ diff --git a/graphics/pokemon/slowking/normal.pal b/graphics/pokemon/slowking/normal.pal index f0d76fb46..a001414d9 100644 --- a/graphics/pokemon/slowking/normal.pal +++ b/graphics/pokemon/slowking/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -104 96 112 -216 232 224 -168 168 152 -96 48 56 +96 96 104 +208 208 208 +168 160 160 +120 48 48 248 248 248 -224 120 120 -168 80 96 -248 168 168 -112 96 48 -184 168 104 -248 240 160 -184 80 72 -232 120 88 +224 104 120 +168 64 80 +248 144 144 +128 88 32 +200 160 96 +232 208 128 +224 64 32 +248 88 72 176 176 168 diff --git a/graphics/pokemon/slowpoke/anim_front.png b/graphics/pokemon/slowpoke/anim_front.png index 2a4da7d8a..61740747b 100644 Binary files a/graphics/pokemon/slowpoke/anim_front.png and b/graphics/pokemon/slowpoke/anim_front.png differ diff --git a/graphics/pokemon/slowpoke/back.png b/graphics/pokemon/slowpoke/back.png index 96e62c4bf..e2ff691a0 100644 Binary files a/graphics/pokemon/slowpoke/back.png and b/graphics/pokemon/slowpoke/back.png differ diff --git a/graphics/pokemon/slowpoke/front.png b/graphics/pokemon/slowpoke/front.png index 592a56f53..aa53f9c55 100644 Binary files a/graphics/pokemon/slowpoke/front.png and b/graphics/pokemon/slowpoke/front.png differ diff --git a/graphics/pokemon/slowpoke/normal.pal b/graphics/pokemon/slowpoke/normal.pal index 28586dd73..b07163f93 100644 --- a/graphics/pokemon/slowpoke/normal.pal +++ b/graphics/pokemon/slowpoke/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -160 88 104 -200 120 136 -248 184 192 -232 144 168 -104 56 64 +168 64 80 +216 96 120 +248 160 160 +248 128 144 +120 32 48 104 96 96 208 200 200 248 248 248 16 16 16 -208 176 128 -128 104 72 -248 216 200 -232 200 160 -248 232 232 -240 192 208 +216 160 96 +136 88 24 +248 224 176 +232 192 136 +248 224 176 +0 0 0 diff --git a/graphics/pokemon/slugma/anim_front.png b/graphics/pokemon/slugma/anim_front.png index 3ddbf4f6e..98d0bd14c 100644 Binary files a/graphics/pokemon/slugma/anim_front.png and b/graphics/pokemon/slugma/anim_front.png differ diff --git a/graphics/pokemon/slugma/front.png b/graphics/pokemon/slugma/front.png index 643357be0..a64ce0042 100644 Binary files a/graphics/pokemon/slugma/front.png and b/graphics/pokemon/slugma/front.png differ diff --git a/graphics/pokemon/slugma/normal.pal b/graphics/pokemon/slugma/normal.pal index 91d80b1b5..11a0e10c2 100644 --- a/graphics/pokemon/slugma/normal.pal +++ b/graphics/pokemon/slugma/normal.pal @@ -2,16 +2,16 @@ JASC-PAL 0100 16 152 208 160 -184 48 32 -104 32 16 -240 144 104 +200 48 24 +120 24 0 +248 144 112 16 16 16 -232 80 64 +232 72 64 240 112 104 -248 232 136 +248 232 120 248 248 248 -200 184 80 -248 232 136 +232 184 8 +248 232 120 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/smeargle/anim_front.png b/graphics/pokemon/smeargle/anim_front.png index 53c7cd6cb..9a62395cc 100644 Binary files a/graphics/pokemon/smeargle/anim_front.png and b/graphics/pokemon/smeargle/anim_front.png differ diff --git a/graphics/pokemon/smeargle/front.png b/graphics/pokemon/smeargle/front.png index d2eacc4a9..1804f2514 100644 Binary files a/graphics/pokemon/smeargle/front.png and b/graphics/pokemon/smeargle/front.png differ diff --git a/graphics/pokemon/smeargle/normal.pal b/graphics/pokemon/smeargle/normal.pal index e55b273d0..2d9f37a4a 100644 --- a/graphics/pokemon/smeargle/normal.pal +++ b/graphics/pokemon/smeargle/normal.pal @@ -9,11 +9,11 @@ JASC-PAL 184 160 136 16 16 16 248 248 248 -96 128 48 -152 184 112 +24 152 0 +104 216 64 144 144 152 -128 168 88 +64 192 24 144 120 104 -64 96 16 +8 96 0 176 64 64 232 128 128 diff --git a/graphics/pokemon/smoochum/anim_front.png b/graphics/pokemon/smoochum/anim_front.png index 53c16714d..c9d2b13b0 100644 Binary files a/graphics/pokemon/smoochum/anim_front.png and b/graphics/pokemon/smoochum/anim_front.png differ diff --git a/graphics/pokemon/smoochum/front.png b/graphics/pokemon/smoochum/front.png index 6d64ea327..6f4927480 100644 Binary files a/graphics/pokemon/smoochum/front.png and b/graphics/pokemon/smoochum/front.png differ diff --git a/graphics/pokemon/smoochum/normal.pal b/graphics/pokemon/smoochum/normal.pal index b5e84f7c0..162bb5da4 100644 --- a/graphics/pokemon/smoochum/normal.pal +++ b/graphics/pokemon/smoochum/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -128 112 32 -240 216 104 -208 184 96 -16 16 16 -144 40 80 -184 88 128 +144 128 24 +248 224 88 +216 200 48 +0 0 0 +136 16 88 +192 88 144 208 208 208 -240 120 168 +240 128 176 248 248 248 -72 136 128 -248 160 176 -248 224 160 -136 112 72 -208 184 136 -168 160 72 +48 128 104 +248 176 176 +240 224 168 +136 128 72 +216 192 128 +184 168 40 diff --git a/graphics/pokemon/sneasel/anim_front.png b/graphics/pokemon/sneasel/anim_front.png index 2666f8775..72da2a55e 100644 Binary files a/graphics/pokemon/sneasel/anim_front.png and b/graphics/pokemon/sneasel/anim_front.png differ diff --git a/graphics/pokemon/sneasel/front.png b/graphics/pokemon/sneasel/front.png index bd730da20..d422fe52e 100644 Binary files a/graphics/pokemon/sneasel/front.png and b/graphics/pokemon/sneasel/front.png differ diff --git a/graphics/pokemon/sneasel/normal.pal b/graphics/pokemon/sneasel/normal.pal index 78967e7dc..10165115f 100644 --- a/graphics/pokemon/sneasel/normal.pal +++ b/graphics/pokemon/sneasel/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -128 32 48 -184 64 88 -24 56 72 -232 96 96 -40 96 120 -72 152 168 -16 16 16 -56 136 152 -200 152 80 -248 192 96 -168 176 184 -240 240 248 -56 56 72 -248 144 152 +128 32 80 +192 40 112 +32 48 88 +240 80 112 +48 96 112 +56 144 168 0 0 0 +64 128 152 +160 120 56 +216 200 112 +184 184 192 +240 240 248 +72 72 72 +248 88 120 +248 144 160 diff --git a/graphics/pokemon/snivy/anim_front.png b/graphics/pokemon/snivy/anim_front.png index 59b26b7aa..893d974a2 100644 Binary files a/graphics/pokemon/snivy/anim_front.png and b/graphics/pokemon/snivy/anim_front.png differ diff --git a/graphics/pokemon/snivy/front.png b/graphics/pokemon/snivy/front.png index 19a181c0f..040a32f83 100644 Binary files a/graphics/pokemon/snivy/front.png and b/graphics/pokemon/snivy/front.png differ diff --git a/graphics/pokemon/snivy/normal.pal b/graphics/pokemon/snivy/normal.pal index 6c79186ce..1a3499e6a 100644 --- a/graphics/pokemon/snivy/normal.pal +++ b/graphics/pokemon/snivy/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -16 64 24 -80 184 80 +0 80 0 +0 176 0 8 8 8 -248 200 48 -240 248 168 -96 104 80 -176 168 112 -176 144 40 -152 56 56 -88 16 16 +248 216 40 +248 240 184 +136 120 48 +192 184 96 +192 152 0 +144 56 0 +88 32 0 248 248 248 -184 112 80 -56 120 56 -136 112 48 +216 120 64 +8 128 0 +0 0 0 0 0 0 diff --git a/graphics/pokemon/snorlax/anim_front.png b/graphics/pokemon/snorlax/anim_front.png index 87ff8eb73..94d9d4784 100644 Binary files a/graphics/pokemon/snorlax/anim_front.png and b/graphics/pokemon/snorlax/anim_front.png differ diff --git a/graphics/pokemon/snorlax/front.png b/graphics/pokemon/snorlax/front.png index b2d7776d5..eff039d3d 100644 Binary files a/graphics/pokemon/snorlax/front.png and b/graphics/pokemon/snorlax/front.png differ diff --git a/graphics/pokemon/snorlax/normal.pal b/graphics/pokemon/snorlax/normal.pal index 421db579c..5b782626d 100644 --- a/graphics/pokemon/snorlax/normal.pal +++ b/graphics/pokemon/snorlax/normal.pal @@ -4,9 +4,9 @@ JASC-PAL 152 208 160 16 16 8 16 48 56 -72 144 168 -16 88 120 -32 64 80 +80 136 168 +48 88 120 +32 64 96 112 168 192 216 192 176 248 232 208 diff --git a/graphics/pokemon/snorunt/anim_front.png b/graphics/pokemon/snorunt/anim_front.png index ff0a10b76..a3bef621c 100644 Binary files a/graphics/pokemon/snorunt/anim_front.png and b/graphics/pokemon/snorunt/anim_front.png differ diff --git a/graphics/pokemon/snorunt/front.png b/graphics/pokemon/snorunt/front.png index 4950af814..02c956098 100644 Binary files a/graphics/pokemon/snorunt/front.png and b/graphics/pokemon/snorunt/front.png differ diff --git a/graphics/pokemon/snorunt/normal.pal b/graphics/pokemon/snorunt/normal.pal index 7e422617f..28932d73c 100644 --- a/graphics/pokemon/snorunt/normal.pal +++ b/graphics/pokemon/snorunt/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -192 160 80 -120 104 48 -248 232 168 -232 208 120 -16 16 16 -224 120 72 -48 40 40 -80 72 72 -168 96 64 -120 104 104 -96 216 248 -56 152 184 +200 136 88 +144 96 72 +248 232 160 +232 192 104 +0 0 0 +248 112 88 +56 48 48 +72 72 72 +176 88 48 +112 112 112 +136 208 248 +64 144 208 216 216 216 248 248 248 176 168 168 diff --git a/graphics/pokemon/snover/anim_front.png b/graphics/pokemon/snover/anim_front.png index 6b510dcab..f666d58b3 100644 Binary files a/graphics/pokemon/snover/anim_front.png and b/graphics/pokemon/snover/anim_front.png differ diff --git a/graphics/pokemon/snover/front.png b/graphics/pokemon/snover/front.png index e11a3b995..9dff7b2a5 100644 Binary files a/graphics/pokemon/snover/front.png and b/graphics/pokemon/snover/front.png differ diff --git a/graphics/pokemon/snover/normal.pal b/graphics/pokemon/snover/normal.pal index 5a37debe8..ba3cd07ba 100644 --- a/graphics/pokemon/snover/normal.pal +++ b/graphics/pokemon/snover/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 168 224 24 -128 160 184 -88 112 136 +144 160 168 +104 120 128 248 248 248 -16 16 16 -184 208 224 -40 72 80 -96 160 144 -64 120 112 -128 200 176 -80 72 56 -112 104 80 -152 128 104 -64 120 112 +32 32 40 +200 216 216 +40 88 88 +72 152 136 +56 112 120 +136 208 168 +88 72 64 +112 88 72 +136 112 80 +56 112 120 0 0 0 0 0 0 diff --git a/graphics/pokemon/snubbull/anim_front.png b/graphics/pokemon/snubbull/anim_front.png index b4f411269..b74b9d6a5 100644 Binary files a/graphics/pokemon/snubbull/anim_front.png and b/graphics/pokemon/snubbull/anim_front.png differ diff --git a/graphics/pokemon/snubbull/front.png b/graphics/pokemon/snubbull/front.png index 4e3f2c60f..fa6456d89 100644 Binary files a/graphics/pokemon/snubbull/front.png and b/graphics/pokemon/snubbull/front.png differ diff --git a/graphics/pokemon/snubbull/normal.pal b/graphics/pokemon/snubbull/normal.pal index 31f88d4cc..434cbb11c 100644 --- a/graphics/pokemon/snubbull/normal.pal +++ b/graphics/pokemon/snubbull/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -80 72 72 -200 96 112 -144 48 64 -112 112 112 -248 144 160 -248 176 184 +72 88 88 +232 104 120 +168 48 64 +112 128 128 +248 168 176 +248 192 192 216 216 216 248 248 248 -112 152 176 -136 208 240 -88 64 40 -152 128 104 -248 200 144 -132 76 86 +112 168 224 +176 216 240 +88 48 8 +184 104 8 +248 176 80 +168 0 0 diff --git a/graphics/pokemon/solosis/anim_front.png b/graphics/pokemon/solosis/anim_front.png index 250ea1b98..b1130a2bc 100644 Binary files a/graphics/pokemon/solosis/anim_front.png and b/graphics/pokemon/solosis/anim_front.png differ diff --git a/graphics/pokemon/solosis/front.png b/graphics/pokemon/solosis/front.png index 0c233bf78..6be1e5a06 100644 Binary files a/graphics/pokemon/solosis/front.png and b/graphics/pokemon/solosis/front.png differ diff --git a/graphics/pokemon/solosis/normal.pal b/graphics/pokemon/solosis/normal.pal index 94dde5274..d35894cc3 100644 --- a/graphics/pokemon/solosis/normal.pal +++ b/graphics/pokemon/solosis/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 0 176 232 -56 136 104 -112 184 136 -184 232 184 +64 136 88 +88 176 120 +144 224 168 248 248 248 88 128 88 -208 232 168 +200 224 184 16 16 16 -104 96 56 -176 160 104 -232 216 128 -160 168 120 -112 56 72 -48 104 80 -160 88 88 -176 192 136 +104 96 40 +160 152 48 +224 216 112 +152 168 136 +144 48 72 +48 96 64 +192 64 80 +176 200 160 diff --git a/graphics/pokemon/solrock/anim_front.png b/graphics/pokemon/solrock/anim_front.png index 8156f736c..a8ea53f01 100644 Binary files a/graphics/pokemon/solrock/anim_front.png and b/graphics/pokemon/solrock/anim_front.png differ diff --git a/graphics/pokemon/solrock/front.png b/graphics/pokemon/solrock/front.png index e24e84149..24336f16b 100644 Binary files a/graphics/pokemon/solrock/front.png and b/graphics/pokemon/solrock/front.png differ diff --git a/graphics/pokemon/solrock/normal.pal b/graphics/pokemon/solrock/normal.pal index 973515b65..28fde096a 100644 --- a/graphics/pokemon/solrock/normal.pal +++ b/graphics/pokemon/solrock/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -96 72 32 +96 72 24 16 16 16 -240 216 144 -216 192 88 -184 152 72 +240 224 96 +216 176 24 +192 144 64 232 216 104 -144 112 56 -152 80 32 -208 96 56 -136 64 32 -216 120 80 -240 152 96 -216 32 40 +152 104 32 +168 72 32 +208 80 24 +160 80 0 +232 96 32 +240 136 80 +192 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/spearow/anim_front.png b/graphics/pokemon/spearow/anim_front.png index 44dac4526..055e84677 100644 Binary files a/graphics/pokemon/spearow/anim_front.png and b/graphics/pokemon/spearow/anim_front.png differ diff --git a/graphics/pokemon/spearow/back.png b/graphics/pokemon/spearow/back.png index f0a62997a..6d5395837 100644 Binary files a/graphics/pokemon/spearow/back.png and b/graphics/pokemon/spearow/back.png differ diff --git a/graphics/pokemon/spearow/front.png b/graphics/pokemon/spearow/front.png index 3d73670a1..68621040a 100644 Binary files a/graphics/pokemon/spearow/front.png and b/graphics/pokemon/spearow/front.png differ diff --git a/graphics/pokemon/spearow/normal.pal b/graphics/pokemon/spearow/normal.pal index 14354042c..f03dd0e30 100644 --- a/graphics/pokemon/spearow/normal.pal +++ b/graphics/pokemon/spearow/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -120 72 48 -160 104 64 +152 80 24 +192 104 32 64 40 24 -200 144 104 +232 168 80 16 16 16 -216 80 72 -160 56 64 -224 208 176 +232 80 72 +168 64 72 +192 176 152 248 248 248 -224 184 176 -224 144 136 -184 136 128 +248 208 200 +248 160 136 +255 255 0 120 40 40 -184 160 136 -72 64 64 +136 120 96 +96 80 72 diff --git a/graphics/pokemon/spheal/anim_front.png b/graphics/pokemon/spheal/anim_front.png index 5cc50c5c9..31c4d81d1 100644 Binary files a/graphics/pokemon/spheal/anim_front.png and b/graphics/pokemon/spheal/anim_front.png differ diff --git a/graphics/pokemon/spheal/front.png b/graphics/pokemon/spheal/front.png index 40f4ad277..2063a772b 100644 Binary files a/graphics/pokemon/spheal/front.png and b/graphics/pokemon/spheal/front.png differ diff --git a/graphics/pokemon/spheal/normal.pal b/graphics/pokemon/spheal/normal.pal index 2ad58f410..866fa3392 100644 --- a/graphics/pokemon/spheal/normal.pal +++ b/graphics/pokemon/spheal/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 56 72 120 -112 144 200 -136 168 224 -72 112 184 -168 192 232 -32 32 32 +104 136 216 +144 168 240 +72 104 184 +168 192 248 +0 0 0 248 248 248 -102 93 71 -247 232 200 -214 194 145 -178 160 116 -130 93 102 -237 166 181 +104 88 48 +240 224 184 +200 184 128 +160 144 104 +168 56 80 +224 104 120 0 0 0 0 0 0 diff --git a/graphics/pokemon/spinarak/anim_front.png b/graphics/pokemon/spinarak/anim_front.png index 6b8097233..d5837da99 100644 Binary files a/graphics/pokemon/spinarak/anim_front.png and b/graphics/pokemon/spinarak/anim_front.png differ diff --git a/graphics/pokemon/spinarak/front.png b/graphics/pokemon/spinarak/front.png index 7d1f51def..36c6e8f60 100644 Binary files a/graphics/pokemon/spinarak/front.png and b/graphics/pokemon/spinarak/front.png differ diff --git a/graphics/pokemon/spinarak/normal.pal b/graphics/pokemon/spinarak/normal.pal index aad0bb3a3..22db1c2ce 100644 --- a/graphics/pokemon/spinarak/normal.pal +++ b/graphics/pokemon/spinarak/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 0 176 232 16 16 16 -56 80 32 -40 88 96 -160 216 120 -192 232 144 -128 168 88 +48 72 16 +40 96 96 +136 224 48 +168 240 96 +80 176 104 96 152 160 112 88 32 -192 160 72 +192 176 24 72 72 72 248 248 248 -248 208 96 +248 224 72 200 192 192 144 48 40 248 88 72 diff --git a/graphics/pokemon/spiritomb/anim_front.png b/graphics/pokemon/spiritomb/anim_front.png index 6a70d9239..8342c4220 100644 Binary files a/graphics/pokemon/spiritomb/anim_front.png and b/graphics/pokemon/spiritomb/anim_front.png differ diff --git a/graphics/pokemon/spiritomb/front.png b/graphics/pokemon/spiritomb/front.png index e2ad070a8..bcfd704f6 100644 Binary files a/graphics/pokemon/spiritomb/front.png and b/graphics/pokemon/spiritomb/front.png differ diff --git a/graphics/pokemon/spiritomb/normal.pal b/graphics/pokemon/spiritomb/normal.pal index 4f53eb76c..0b612defc 100644 --- a/graphics/pokemon/spiritomb/normal.pal +++ b/graphics/pokemon/spiritomb/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -208 136 168 -160 104 128 -88 184 64 -152 208 128 -240 224 120 -56 96 48 -80 120 56 +192 112 184 +160 80 152 +96 176 64 +184 208 64 +248 216 16 +48 96 72 +72 136 64 16 16 16 48 64 48 -120 72 96 -104 64 80 -80 72 64 -184 160 136 -152 136 112 -136 112 96 +112 72 120 +80 64 104 +80 64 80 +176 152 144 +152 128 104 +128 104 96 diff --git a/graphics/pokemon/spoink/anim_front.png b/graphics/pokemon/spoink/anim_front.png index a1e84f375..0e40632d4 100644 Binary files a/graphics/pokemon/spoink/anim_front.png and b/graphics/pokemon/spoink/anim_front.png differ diff --git a/graphics/pokemon/spoink/front.png b/graphics/pokemon/spoink/front.png index 2f59eb397..4d5e236fe 100644 Binary files a/graphics/pokemon/spoink/front.png and b/graphics/pokemon/spoink/front.png differ diff --git a/graphics/pokemon/spoink/normal.pal b/graphics/pokemon/spoink/normal.pal index 8c3c5fbb8..5b55893ab 100644 --- a/graphics/pokemon/spoink/normal.pal +++ b/graphics/pokemon/spoink/normal.pal @@ -2,9 +2,9 @@ JASC-PAL 0100 16 152 208 160 -208 120 128 -232 144 152 -240 184 184 +192 96 120 +232 128 168 +240 160 184 144 80 80 248 208 224 248 248 248 diff --git a/graphics/pokemon/squirtle/anim_front.png b/graphics/pokemon/squirtle/anim_front.png index a7559113d..b125bbdfb 100644 Binary files a/graphics/pokemon/squirtle/anim_front.png and b/graphics/pokemon/squirtle/anim_front.png differ diff --git a/graphics/pokemon/squirtle/front.png b/graphics/pokemon/squirtle/front.png index 5920ee165..f8854997d 100644 Binary files a/graphics/pokemon/squirtle/front.png and b/graphics/pokemon/squirtle/front.png differ diff --git a/graphics/pokemon/squirtle/normal.pal b/graphics/pokemon/squirtle/normal.pal index bbe75688d..c66f21e48 100644 --- a/graphics/pokemon/squirtle/normal.pal +++ b/graphics/pokemon/squirtle/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -72 152 184 -40 96 112 -176 216 232 -120 192 208 +72 160 200 +40 104 144 +128 216 248 +112 192 240 16 16 16 208 200 200 248 248 248 -184 88 128 +200 40 48 88 64 32 -168 96 72 -136 112 72 -184 160 128 -240 208 152 +176 96 16 +160 128 48 +200 168 88 +240 224 136 80 48 40 -200 144 136 +208 112 16 diff --git a/graphics/pokemon/stantler/anim_front.png b/graphics/pokemon/stantler/anim_front.png index 1e36c8a5c..e0ce71ad7 100644 Binary files a/graphics/pokemon/stantler/anim_front.png and b/graphics/pokemon/stantler/anim_front.png differ diff --git a/graphics/pokemon/stantler/front.png b/graphics/pokemon/stantler/front.png index 0fc22dd19..3c4e0b08f 100644 Binary files a/graphics/pokemon/stantler/front.png and b/graphics/pokemon/stantler/front.png differ diff --git a/graphics/pokemon/stantler/normal.pal b/graphics/pokemon/stantler/normal.pal index 64b959b58..fade238f1 100644 --- a/graphics/pokemon/stantler/normal.pal +++ b/graphics/pokemon/stantler/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -144 104 80 -248 216 112 -88 64 56 -176 152 88 +152 96 80 +248 232 136 +104 64 24 +224 168 24 16 16 16 -72 48 80 -184 160 168 -128 104 136 -176 128 104 -216 160 136 +72 72 72 +176 176 176 +120 120 120 +184 128 96 +232 168 120 248 248 248 -120 72 40 -248 232 184 -184 168 136 +120 64 32 +248 248 168 +248 216 128 0 0 0 diff --git a/graphics/pokemon/staraptor/anim_front.png b/graphics/pokemon/staraptor/anim_front.png index 33c16a688..4620e6cfd 100644 Binary files a/graphics/pokemon/staraptor/anim_front.png and b/graphics/pokemon/staraptor/anim_front.png differ diff --git a/graphics/pokemon/staraptor/front.png b/graphics/pokemon/staraptor/front.png index 5387fee5f..dbb5a2f95 100644 Binary files a/graphics/pokemon/staraptor/front.png and b/graphics/pokemon/staraptor/front.png differ diff --git a/graphics/pokemon/staraptor/normal.pal b/graphics/pokemon/staraptor/normal.pal index bbe481816..0e4196241 100644 --- a/graphics/pokemon/staraptor/normal.pal +++ b/graphics/pokemon/staraptor/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -48 40 40 -112 96 88 +56 56 56 +120 104 120 16 16 16 -80 72 64 -168 56 40 -232 88 64 -64 48 56 -144 112 128 -104 88 88 -184 176 168 -240 232 232 -112 80 40 -248 168 88 -192 120 56 +88 80 88 +152 64 64 +240 80 64 +80 56 72 +152 128 136 +112 88 96 +176 176 176 +248 248 248 +120 64 32 +248 144 40 +184 96 0 0 0 0 diff --git a/graphics/pokemon/staravia/anim_front.png b/graphics/pokemon/staravia/anim_front.png index fc451c052..5f8db161d 100644 Binary files a/graphics/pokemon/staravia/anim_front.png and b/graphics/pokemon/staravia/anim_front.png differ diff --git a/graphics/pokemon/staravia/front.png b/graphics/pokemon/staravia/front.png index ce01062ba..bd7c8ab4f 100644 Binary files a/graphics/pokemon/staravia/front.png and b/graphics/pokemon/staravia/front.png differ diff --git a/graphics/pokemon/staravia/normal.pal b/graphics/pokemon/staravia/normal.pal index ec0bd1984..f57c2fd0b 100644 --- a/graphics/pokemon/staravia/normal.pal +++ b/graphics/pokemon/staravia/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 56 40 40 -88 80 72 +88 80 88 16 16 16 -160 128 128 +152 128 136 240 240 240 -168 184 192 -192 96 32 -224 128 72 -128 64 24 -112 88 88 -56 48 56 -147 99 111 +176 176 176 +184 96 0 +248 144 40 +120 64 32 +112 88 96 +56 56 56 +248 88 64 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/starly/anim_front.png b/graphics/pokemon/starly/anim_front.png index d05ad5d57..1235ff408 100644 Binary files a/graphics/pokemon/starly/anim_front.png and b/graphics/pokemon/starly/anim_front.png differ diff --git a/graphics/pokemon/starly/back.png b/graphics/pokemon/starly/back.png index 96d3309ce..89148bc9f 100644 Binary files a/graphics/pokemon/starly/back.png and b/graphics/pokemon/starly/back.png differ diff --git a/graphics/pokemon/starly/front.png b/graphics/pokemon/starly/front.png index 28aa86e57..c188a7ff5 100644 Binary files a/graphics/pokemon/starly/front.png and b/graphics/pokemon/starly/front.png differ diff --git a/graphics/pokemon/starly/normal.pal b/graphics/pokemon/starly/normal.pal index ae7a09f36..2d0c723a3 100644 --- a/graphics/pokemon/starly/normal.pal +++ b/graphics/pokemon/starly/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -80 64 56 +80 72 72 16 16 16 -112 96 96 +136 112 112 24 24 32 184 176 168 248 248 248 -224 216 208 +208 216 216 120 72 24 240 128 56 176 88 40 -152 128 128 +168 152 152 112 88 88 112 96 96 -144 96 104 +248 80 64 0 0 0 diff --git a/graphics/pokemon/starmie/anim_front.png b/graphics/pokemon/starmie/anim_front.png index bf69ae037..5bc72ff51 100644 Binary files a/graphics/pokemon/starmie/anim_front.png and b/graphics/pokemon/starmie/anim_front.png differ diff --git a/graphics/pokemon/starmie/front.png b/graphics/pokemon/starmie/front.png index ba121899c..ab2abd1a0 100644 Binary files a/graphics/pokemon/starmie/front.png and b/graphics/pokemon/starmie/front.png differ diff --git a/graphics/pokemon/starmie/normal.pal b/graphics/pokemon/starmie/normal.pal index a05b36c5b..82ffa3fa9 100644 --- a/graphics/pokemon/starmie/normal.pal +++ b/graphics/pokemon/starmie/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -96 88 120 -64 48 80 -200 200 240 -128 120 168 -160 160 216 -16 16 16 -80 72 48 -248 216 96 -248 232 176 -184 160 80 -120 104 56 -240 176 176 -184 64 80 -224 112 112 -128 40 56 +88 80 152 +48 56 112 +208 184 240 +144 128 184 +176 152 216 +0 0 0 +88 64 48 +232 216 80 +248 248 152 +176 160 48 +144 112 64 +240 192 216 +200 32 88 +240 80 112 +136 16 80 diff --git a/graphics/pokemon/staryu/anim_front.png b/graphics/pokemon/staryu/anim_front.png index be579253b..ad2250818 100644 Binary files a/graphics/pokemon/staryu/anim_front.png and b/graphics/pokemon/staryu/anim_front.png differ diff --git a/graphics/pokemon/staryu/front.png b/graphics/pokemon/staryu/front.png index 4283d56fb..ffb70b69d 100644 Binary files a/graphics/pokemon/staryu/front.png and b/graphics/pokemon/staryu/front.png differ diff --git a/graphics/pokemon/staryu/normal.pal b/graphics/pokemon/staryu/normal.pal index e410143a5..7d0a10b2a 100644 --- a/graphics/pokemon/staryu/normal.pal +++ b/graphics/pokemon/staryu/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 104 64 -80 48 32 -224 192 112 -16 16 16 -96 72 56 -176 128 72 -112 104 56 -248 240 192 -72 64 40 -248 216 88 -160 152 80 -240 128 120 -248 176 176 -168 48 72 +144 104 56 +96 48 48 +216 176 96 +0 0 0 +120 80 56 +192 144 72 +128 104 64 +248 240 160 +88 64 48 +232 216 48 +200 144 40 +240 136 136 +240 192 184 +192 32 88 248 248 248 diff --git a/graphics/pokemon/steelix/anim_front.png b/graphics/pokemon/steelix/anim_front.png index b60f12fda..206cf665f 100644 Binary files a/graphics/pokemon/steelix/anim_front.png and b/graphics/pokemon/steelix/anim_front.png differ diff --git a/graphics/pokemon/steelix/front.png b/graphics/pokemon/steelix/front.png index d86221a35..a00376baf 100644 Binary files a/graphics/pokemon/steelix/front.png and b/graphics/pokemon/steelix/front.png differ diff --git a/graphics/pokemon/steelix/normal.pal b/graphics/pokemon/steelix/normal.pal index 6eb8c5db3..2986bbeab 100644 --- a/graphics/pokemon/steelix/normal.pal +++ b/graphics/pokemon/steelix/normal.pal @@ -2,15 +2,15 @@ JASC-PAL 0100 16 152 208 160 -112 136 160 -88 88 136 +112 128 168 +72 96 136 16 16 16 -216 216 208 -168 184 208 -40 40 80 +216 216 232 +176 184 208 +56 56 80 248 248 248 -176 40 48 -216 216 208 +192 0 0 +216 216 232 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/stoutland/anim_front.png b/graphics/pokemon/stoutland/anim_front.png index 79aea7daf..256f3911a 100644 Binary files a/graphics/pokemon/stoutland/anim_front.png and b/graphics/pokemon/stoutland/anim_front.png differ diff --git a/graphics/pokemon/stoutland/front.png b/graphics/pokemon/stoutland/front.png index fd1c8fd3b..bd5570182 100644 Binary files a/graphics/pokemon/stoutland/front.png and b/graphics/pokemon/stoutland/front.png differ diff --git a/graphics/pokemon/stoutland/normal.pal b/graphics/pokemon/stoutland/normal.pal index 0b84f2f50..a2ba428ef 100644 --- a/graphics/pokemon/stoutland/normal.pal +++ b/graphics/pokemon/stoutland/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -128 80 48 -184 120 72 -248 216 168 -64 40 32 +144 88 48 +184 128 80 +248 224 168 +72 48 16 16 16 16 -24 24 32 -64 72 96 -176 152 112 -240 232 216 +24 32 56 +72 72 104 +192 168 104 +248 248 248 192 192 192 -184 176 160 -40 40 56 -96 128 136 -72 88 96 +200 184 152 +48 56 72 +120 144 152 +88 104 104 32 48 48 diff --git a/graphics/pokemon/stunfisk/anim_front.png b/graphics/pokemon/stunfisk/anim_front.png index 84a1e28fc..769ce41b7 100644 Binary files a/graphics/pokemon/stunfisk/anim_front.png and b/graphics/pokemon/stunfisk/anim_front.png differ diff --git a/graphics/pokemon/stunfisk/front.png b/graphics/pokemon/stunfisk/front.png index 2444184fd..4e46cfa8f 100644 Binary files a/graphics/pokemon/stunfisk/front.png and b/graphics/pokemon/stunfisk/front.png differ diff --git a/graphics/pokemon/stunfisk/normal.pal b/graphics/pokemon/stunfisk/normal.pal index 5a0f02b42..e9049ed2b 100644 --- a/graphics/pokemon/stunfisk/normal.pal +++ b/graphics/pokemon/stunfisk/normal.pal @@ -2,8 +2,8 @@ JASC-PAL 0100 16 152 208 160 -176 144 56 -248 224 112 +200 184 0 +248 248 0 112 88 32 8 16 24 64 48 40 diff --git a/graphics/pokemon/stunky/anim_front.png b/graphics/pokemon/stunky/anim_front.png index df7adec82..2463e0b8d 100644 Binary files a/graphics/pokemon/stunky/anim_front.png and b/graphics/pokemon/stunky/anim_front.png differ diff --git a/graphics/pokemon/stunky/front.png b/graphics/pokemon/stunky/front.png index cf124ce6a..da228e831 100644 Binary files a/graphics/pokemon/stunky/front.png and b/graphics/pokemon/stunky/front.png differ diff --git a/graphics/pokemon/stunky/normal.pal b/graphics/pokemon/stunky/normal.pal index 0aa39fd8f..f33806dab 100644 --- a/graphics/pokemon/stunky/normal.pal +++ b/graphics/pokemon/stunky/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -80 48 80 +72 56 96 16 16 16 -104 80 120 -160 144 112 -248 216 168 -96 80 56 +104 80 136 +168 136 104 +232 216 176 +96 88 64 40 32 56 112 64 40 -224 120 72 +240 136 72 248 248 248 104 96 112 176 176 208 -168 88 48 +128 72 48 0 0 0 0 0 0 diff --git a/graphics/pokemon/sudowoodo/anim_front.png b/graphics/pokemon/sudowoodo/anim_front.png index d9ca431ab..3eefcba5f 100644 Binary files a/graphics/pokemon/sudowoodo/anim_front.png and b/graphics/pokemon/sudowoodo/anim_front.png differ diff --git a/graphics/pokemon/sudowoodo/front.png b/graphics/pokemon/sudowoodo/front.png index 27ec5d0d4..df699a5c7 100644 Binary files a/graphics/pokemon/sudowoodo/front.png and b/graphics/pokemon/sudowoodo/front.png differ diff --git a/graphics/pokemon/sudowoodo/normal.pal b/graphics/pokemon/sudowoodo/normal.pal index ec032d38c..4f6c86659 100644 --- a/graphics/pokemon/sudowoodo/normal.pal +++ b/graphics/pokemon/sudowoodo/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 0 176 232 -80 56 48 +80 64 48 16 16 16 -208 152 128 -184 128 104 -136 88 72 -48 80 24 -144 216 120 -104 184 80 -96 136 56 -160 104 80 -224 120 120 -232 192 80 -208 160 56 +216 176 144 +200 144 104 +128 104 64 +48 88 24 +152 216 120 +72 192 64 +88 136 88 +168 128 88 +248 128 128 +248 200 0 +224 176 72 136 96 72 -184 152 136 +192 160 72 diff --git a/graphics/pokemon/suicune/anim_front.png b/graphics/pokemon/suicune/anim_front.png index 099146ccb..83c95cc1b 100644 Binary files a/graphics/pokemon/suicune/anim_front.png and b/graphics/pokemon/suicune/anim_front.png differ diff --git a/graphics/pokemon/suicune/front.png b/graphics/pokemon/suicune/front.png index 7620858d7..b1ff2a841 100644 Binary files a/graphics/pokemon/suicune/front.png and b/graphics/pokemon/suicune/front.png differ diff --git a/graphics/pokemon/suicune/normal.pal b/graphics/pokemon/suicune/normal.pal index 659236c75..266bc41ab 100644 --- a/graphics/pokemon/suicune/normal.pal +++ b/graphics/pokemon/suicune/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -48 64 96 +40 72 120 16 16 16 -96 176 176 -104 128 160 -112 80 136 -72 40 96 -160 104 168 -192 136 184 -64 72 80 -120 136 144 +88 184 208 +72 128 176 +120 88 176 +80 56 120 +168 104 208 +192 144 216 +80 80 80 +128 128 128 248 248 248 -176 64 64 -144 216 216 +208 16 16 +152 224 248 216 216 216 -168 184 184 +184 184 184 diff --git a/graphics/pokemon/sunflora/anim_front.png b/graphics/pokemon/sunflora/anim_front.png index 512b85256..ce54002b8 100644 Binary files a/graphics/pokemon/sunflora/anim_front.png and b/graphics/pokemon/sunflora/anim_front.png differ diff --git a/graphics/pokemon/sunflora/front.png b/graphics/pokemon/sunflora/front.png index 5290aa354..ebdac3a02 100644 Binary files a/graphics/pokemon/sunflora/front.png and b/graphics/pokemon/sunflora/front.png differ diff --git a/graphics/pokemon/sunflora/normal.pal b/graphics/pokemon/sunflora/normal.pal index 83fdabdb8..8425c047d 100644 --- a/graphics/pokemon/sunflora/normal.pal +++ b/graphics/pokemon/sunflora/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 0 176 232 -184 152 40 +216 160 24 16 16 16 -248 216 128 -112 80 24 -248 200 56 -216 200 128 -248 240 168 -176 120 48 -144 72 80 -216 112 120 -64 128 64 -40 96 40 -96 168 80 -144 208 128 +248 240 16 +128 88 16 +232 200 8 +224 216 88 +248 248 160 +192 120 32 +152 32 0 +216 56 0 +88 128 64 +80 96 40 +112 168 48 +168 216 88 0 0 0 diff --git a/graphics/pokemon/sunkern/anim_front.png b/graphics/pokemon/sunkern/anim_front.png index fc042e7e2..ec83fa963 100644 Binary files a/graphics/pokemon/sunkern/anim_front.png and b/graphics/pokemon/sunkern/anim_front.png differ diff --git a/graphics/pokemon/sunkern/front.png b/graphics/pokemon/sunkern/front.png index be19820d0..72c2510ce 100644 Binary files a/graphics/pokemon/sunkern/front.png and b/graphics/pokemon/sunkern/front.png differ diff --git a/graphics/pokemon/sunkern/normal.pal b/graphics/pokemon/sunkern/normal.pal index d924c91c7..bd1479ef8 100644 --- a/graphics/pokemon/sunkern/normal.pal +++ b/graphics/pokemon/sunkern/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 176 232 -88 152 64 -144 200 136 -48 96 32 -112 176 96 +248 128 248 +80 160 56 +160 240 56 +32 96 16 +112 208 40 16 16 16 -88 72 56 -240 216 112 -176 152 56 -216 192 72 +96 72 48 +248 248 0 +176 160 48 +208 200 48 248 248 248 -80 80 80 -64 48 32 +88 128 128 +72 56 40 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/surskit/anim_front.png b/graphics/pokemon/surskit/anim_front.png index 74a708929..9745c2eb0 100644 Binary files a/graphics/pokemon/surskit/anim_front.png and b/graphics/pokemon/surskit/anim_front.png differ diff --git a/graphics/pokemon/surskit/front.png b/graphics/pokemon/surskit/front.png index db20a260d..32508e31f 100644 Binary files a/graphics/pokemon/surskit/front.png and b/graphics/pokemon/surskit/front.png differ diff --git a/graphics/pokemon/surskit/normal.pal b/graphics/pokemon/surskit/normal.pal index 71c1ce3a9..bbd156dda 100644 --- a/graphics/pokemon/surskit/normal.pal +++ b/graphics/pokemon/surskit/normal.pal @@ -2,11 +2,11 @@ JASC-PAL 0100 16 152 208 160 -176 136 64 -248 224 160 +176 136 0 +240 208 104 16 16 16 -216 184 88 -112 96 40 +216 160 0 +120 96 48 32 88 104 136 208 232 72 168 208 diff --git a/graphics/pokemon/swablu/anim_front.png b/graphics/pokemon/swablu/anim_front.png index 43b716977..43c738b52 100644 Binary files a/graphics/pokemon/swablu/anim_front.png and b/graphics/pokemon/swablu/anim_front.png differ diff --git a/graphics/pokemon/swablu/front.png b/graphics/pokemon/swablu/front.png index d2ebdd4dd..b7d58d06b 100644 Binary files a/graphics/pokemon/swablu/front.png and b/graphics/pokemon/swablu/front.png differ diff --git a/graphics/pokemon/swablu/normal.pal b/graphics/pokemon/swablu/normal.pal index 93b698a20..4361d9645 100644 --- a/graphics/pokemon/swablu/normal.pal +++ b/graphics/pokemon/swablu/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -40 144 184 -40 96 128 -112 200 240 -80 176 224 +16 152 200 +56 104 128 +120 200 248 +16 176 232 16 16 16 -128 160 176 -112 128 144 +152 152 192 +128 128 144 248 248 248 -184 208 224 +200 200 224 88 88 112 -240 248 248 -163 117 138 +248 248 240 +224 104 120 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/swadloon/anim_front.png b/graphics/pokemon/swadloon/anim_front.png index 4440cdf0e..818802b1f 100644 Binary files a/graphics/pokemon/swadloon/anim_front.png and b/graphics/pokemon/swadloon/anim_front.png differ diff --git a/graphics/pokemon/swadloon/front.png b/graphics/pokemon/swadloon/front.png index 04aec3675..1b7f74db5 100644 Binary files a/graphics/pokemon/swadloon/front.png and b/graphics/pokemon/swadloon/front.png differ diff --git a/graphics/pokemon/swadloon/normal.pal b/graphics/pokemon/swadloon/normal.pal index 3c69b764c..b7eb1862e 100644 --- a/graphics/pokemon/swadloon/normal.pal +++ b/graphics/pokemon/swadloon/normal.pal @@ -3,15 +3,15 @@ JASC-PAL 16 152 208 160 16 16 16 -56 80 24 -144 200 56 -112 152 48 -24 56 24 -56 112 48 -64 144 56 -184 160 72 -248 224 88 -56 48 40 +56 96 24 +144 200 8 +88 152 48 +16 64 56 +24 112 72 +40 152 80 +176 160 40 +248 232 56 +88 88 56 120 112 56 248 248 248 0 0 0 diff --git a/graphics/pokemon/swalot/anim_front.png b/graphics/pokemon/swalot/anim_front.png index c15602412..20e234a6c 100644 Binary files a/graphics/pokemon/swalot/anim_front.png and b/graphics/pokemon/swalot/anim_front.png differ diff --git a/graphics/pokemon/swalot/front.png b/graphics/pokemon/swalot/front.png index a853b13fc..6ae76a4f3 100644 Binary files a/graphics/pokemon/swalot/front.png and b/graphics/pokemon/swalot/front.png differ diff --git a/graphics/pokemon/swalot/normal.pal b/graphics/pokemon/swalot/normal.pal index 28a45315b..cb2b60bb5 100644 --- a/graphics/pokemon/swalot/normal.pal +++ b/graphics/pokemon/swalot/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -72 56 112 -128 104 176 -152 128 208 -184 160 208 -16 16 16 +96 64 112 +136 104 200 +168 128 232 +192 160 248 +0 0 0 248 248 248 -224 112 120 -136 112 64 -200 168 88 -248 216 112 -72 72 72 +224 48 88 +128 120 64 +216 176 64 +248 208 88 +80 80 80 48 48 48 104 104 104 -88 64 136 -173 78 82 +112 72 144 +168 0 0 diff --git a/graphics/pokemon/swampert/anim_front.png b/graphics/pokemon/swampert/anim_front.png index 7ecf488bc..26eedc617 100644 Binary files a/graphics/pokemon/swampert/anim_front.png and b/graphics/pokemon/swampert/anim_front.png differ diff --git a/graphics/pokemon/swampert/front.png b/graphics/pokemon/swampert/front.png index 3966935c4..7a86a418d 100644 Binary files a/graphics/pokemon/swampert/front.png and b/graphics/pokemon/swampert/front.png differ diff --git a/graphics/pokemon/swampert/normal.pal b/graphics/pokemon/swampert/normal.pal index ba7b6e3b6..539768aa6 100644 --- a/graphics/pokemon/swampert/normal.pal +++ b/graphics/pokemon/swampert/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 24 24 24 -48 64 72 -80 96 120 -72 136 176 -48 80 112 -112 168 208 -112 72 48 -192 136 88 -240 168 104 -152 192 232 -200 120 160 -120 56 88 -144 176 184 -104 120 128 -208 232 232 +80 72 80 +104 104 136 +88 128 192 +88 88 136 +128 160 216 +128 72 40 +232 128 64 +240 176 64 +152 192 216 +192 96 120 +104 40 64 +168 184 176 +104 120 112 +216 232 224 diff --git a/graphics/pokemon/swanna/anim_front.png b/graphics/pokemon/swanna/anim_front.png index ae90cb66f..354bebb26 100644 Binary files a/graphics/pokemon/swanna/anim_front.png and b/graphics/pokemon/swanna/anim_front.png differ diff --git a/graphics/pokemon/swanna/front.png b/graphics/pokemon/swanna/front.png index 5f8c04cca..e1b58cf39 100644 Binary files a/graphics/pokemon/swanna/front.png and b/graphics/pokemon/swanna/front.png differ diff --git a/graphics/pokemon/swanna/normal.pal b/graphics/pokemon/swanna/normal.pal index ebc9577d9..ffb9ad30d 100644 --- a/graphics/pokemon/swanna/normal.pal +++ b/graphics/pokemon/swanna/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 128 176 -88 104 128 -240 248 248 -16 16 16 -176 200 224 -104 104 112 -248 248 248 +148 156 172 +90 106 131 +255 255 255 +0 0 0 +180 197 213 +98 98 131 +239 123 156 56 64 88 -248 208 64 -104 104 64 -56 104 152 -80 144 200 -120 184 240 -56 72 104 -152 136 72 +246 246 74 +172 164 98 +65 115 172 +98 148 180 +164 205 238 +57 74 106 +106 106 65 diff --git a/graphics/pokemon/swanna/shiny.pal b/graphics/pokemon/swanna/shiny.pal index c57e468eb..506a9ff09 100644 --- a/graphics/pokemon/swanna/shiny.pal +++ b/graphics/pokemon/swanna/shiny.pal @@ -8,7 +8,7 @@ JASC-PAL 16 16 16 200 184 224 96 96 128 -248 248 248 +239 123 156 56 56 56 248 200 72 136 80 40 diff --git a/graphics/pokemon/swellow/anim_front.png b/graphics/pokemon/swellow/anim_front.png index 33999c5a6..83d0ae8ec 100644 Binary files a/graphics/pokemon/swellow/anim_front.png and b/graphics/pokemon/swellow/anim_front.png differ diff --git a/graphics/pokemon/swellow/front.png b/graphics/pokemon/swellow/front.png index 1f347b480..32345b406 100644 Binary files a/graphics/pokemon/swellow/front.png and b/graphics/pokemon/swellow/front.png differ diff --git a/graphics/pokemon/swellow/normal.pal b/graphics/pokemon/swellow/normal.pal index 58eedc906..8dcf49a85 100644 --- a/graphics/pokemon/swellow/normal.pal +++ b/graphics/pokemon/swellow/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -24 32 56 -216 88 112 -160 56 88 -72 88 128 -48 56 96 -96 32 48 +41 41 82 +197 90 115 +156 49 82 +65 90 123 +41 65 98 +98 32 57 16 16 16 -96 80 56 -248 248 248 -184 184 208 -240 208 120 -248 248 144 -160 136 80 -48 48 56 -72 88 88 +82 65 32 +255 255 255 +180 180 213 +222 164 49 +230 180 98 +148 90 16 +49 49 57 +90 90 90 diff --git a/graphics/pokemon/swinub/anim_front.png b/graphics/pokemon/swinub/anim_front.png index 9ee564c1d..ee4dae253 100644 Binary files a/graphics/pokemon/swinub/anim_front.png and b/graphics/pokemon/swinub/anim_front.png differ diff --git a/graphics/pokemon/swinub/front.png b/graphics/pokemon/swinub/front.png index 8d96e08b6..ec1915009 100644 Binary files a/graphics/pokemon/swinub/front.png and b/graphics/pokemon/swinub/front.png differ diff --git a/graphics/pokemon/swinub/normal.pal b/graphics/pokemon/swinub/normal.pal index 7a67baa29..f62275047 100644 --- a/graphics/pokemon/swinub/normal.pal +++ b/graphics/pokemon/swinub/normal.pal @@ -2,15 +2,15 @@ JASC-PAL 0100 16 152 208 160 -88 48 24 -160 112 96 -112 72 56 +65 49 8 +156 123 106 +115 74 49 16 16 16 -208 152 120 -56 32 16 -240 144 152 -224 104 120 -160 80 88 +205 156 123 +57 41 0 +246 139 156 +180 115 123 +148 90 90 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/swoobat/anim_front.png b/graphics/pokemon/swoobat/anim_front.png index ca8972b27..2b57a2e43 100644 Binary files a/graphics/pokemon/swoobat/anim_front.png and b/graphics/pokemon/swoobat/anim_front.png differ diff --git a/graphics/pokemon/swoobat/front.png b/graphics/pokemon/swoobat/front.png index 4bb05cbc4..7a4ccae93 100644 Binary files a/graphics/pokemon/swoobat/front.png and b/graphics/pokemon/swoobat/front.png differ diff --git a/graphics/pokemon/swoobat/normal.pal b/graphics/pokemon/swoobat/normal.pal index c903f6096..8d4e3b400 100644 --- a/graphics/pokemon/swoobat/normal.pal +++ b/graphics/pokemon/swoobat/normal.pal @@ -2,9 +2,9 @@ JASC-PAL 0100 16 104 48 152 -48 40 40 +48 48 48 16 16 16 -80 64 72 +72 72 80 32 56 80 64 136 208 80 80 104 diff --git a/graphics/pokemon/taillow/anim_front.png b/graphics/pokemon/taillow/anim_front.png index d99d0d783..7e5c54443 100644 Binary files a/graphics/pokemon/taillow/anim_front.png and b/graphics/pokemon/taillow/anim_front.png differ diff --git a/graphics/pokemon/taillow/front.png b/graphics/pokemon/taillow/front.png index 76aa69920..3e4be10ea 100644 Binary files a/graphics/pokemon/taillow/front.png and b/graphics/pokemon/taillow/front.png differ diff --git a/graphics/pokemon/taillow/normal.pal b/graphics/pokemon/taillow/normal.pal index 63cab5336..2277c5f72 100644 --- a/graphics/pokemon/taillow/normal.pal +++ b/graphics/pokemon/taillow/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -48 56 112 -80 88 136 -160 72 80 -224 88 112 -32 32 56 +49 74 123 +90 106 156 +148 57 82 +205 82 115 +32 41 82 16 16 16 -176 184 208 -248 248 248 -64 64 64 -160 128 88 -248 232 176 -224 192 104 -96 80 56 +189 189 205 +255 255 255 +57 57 49 +164 115 49 +238 189 98 +230 148 16 +82 74 41 112 136 176 0 0 0 diff --git a/graphics/pokemon/tangela/anim_front.png b/graphics/pokemon/tangela/anim_front.png index b7d278024..1a768a091 100644 Binary files a/graphics/pokemon/tangela/anim_front.png and b/graphics/pokemon/tangela/anim_front.png differ diff --git a/graphics/pokemon/tangela/front.png b/graphics/pokemon/tangela/front.png index 0904495ee..34f9ff5fb 100644 Binary files a/graphics/pokemon/tangela/front.png and b/graphics/pokemon/tangela/front.png differ diff --git a/graphics/pokemon/tangela/normal.pal b/graphics/pokemon/tangela/normal.pal index 9455b1ee7..d90fcacca 100644 --- a/graphics/pokemon/tangela/normal.pal +++ b/graphics/pokemon/tangela/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -72 96 128 -120 184 216 -80 136 176 -48 48 64 +40 88 128 +80 152 192 +56 112 168 +16 40 72 16 16 16 -80 72 72 -192 176 200 +80 80 80 +176 176 176 248 248 248 112 40 40 -160 80 80 -240 152 136 -232 104 80 +168 40 64 +248 128 128 +216 72 104 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/tangrowth/anim_front.png b/graphics/pokemon/tangrowth/anim_front.png index 170769a92..564dc5626 100644 Binary files a/graphics/pokemon/tangrowth/anim_front.png and b/graphics/pokemon/tangrowth/anim_front.png differ diff --git a/graphics/pokemon/tangrowth/front.png b/graphics/pokemon/tangrowth/front.png index c43652a81..ae389e74a 100644 Binary files a/graphics/pokemon/tangrowth/front.png and b/graphics/pokemon/tangrowth/front.png differ diff --git a/graphics/pokemon/tangrowth/normal.pal b/graphics/pokemon/tangrowth/normal.pal index 451020c4c..10fe2ebbc 100644 --- a/graphics/pokemon/tangrowth/normal.pal +++ b/graphics/pokemon/tangrowth/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -152 56 88 -208 88 128 -80 24 48 -40 56 80 -56 88 112 -112 160 192 -72 120 160 +184 32 104 +208 88 144 +88 24 56 +24 56 96 +40 88 128 +80 152 192 +56 112 168 0 0 0 -80 80 88 +72 72 80 248 248 248 -40 48 56 +48 48 56 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/tauros/anim_front.png b/graphics/pokemon/tauros/anim_front.png index d1051ecc7..1d186f77b 100644 Binary files a/graphics/pokemon/tauros/anim_front.png and b/graphics/pokemon/tauros/anim_front.png differ diff --git a/graphics/pokemon/tauros/front.png b/graphics/pokemon/tauros/front.png index 0f088d59d..587db94cd 100644 Binary files a/graphics/pokemon/tauros/front.png and b/graphics/pokemon/tauros/front.png differ diff --git a/graphics/pokemon/tauros/normal.pal b/graphics/pokemon/tauros/normal.pal index ea90060c1..1bb372aa7 100644 --- a/graphics/pokemon/tauros/normal.pal +++ b/graphics/pokemon/tauros/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -56 56 96 -88 104 152 -16 16 16 -56 40 24 -120 104 88 -80 64 56 -128 88 64 -208 144 80 -160 152 136 -208 216 240 -152 160 184 -56 48 24 -232 184 120 -168 120 64 +56 56 72 +104 104 128 +0 0 0 +72 56 40 +120 104 96 +80 72 64 +136 96 32 +216 160 72 +152 144 136 +200 200 216 +152 152 168 +80 56 16 +224 192 120 +176 128 48 248 248 248 diff --git a/graphics/pokemon/teddiursa/anim_front.png b/graphics/pokemon/teddiursa/anim_front.png index cc6737bc9..2c6e3f3b1 100644 Binary files a/graphics/pokemon/teddiursa/anim_front.png and b/graphics/pokemon/teddiursa/anim_front.png differ diff --git a/graphics/pokemon/teddiursa/front.png b/graphics/pokemon/teddiursa/front.png index 83302972d..9412d0c7f 100644 Binary files a/graphics/pokemon/teddiursa/front.png and b/graphics/pokemon/teddiursa/front.png differ diff --git a/graphics/pokemon/teddiursa/normal.pal b/graphics/pokemon/teddiursa/normal.pal index fea71f114..59d40c386 100644 --- a/graphics/pokemon/teddiursa/normal.pal +++ b/graphics/pokemon/teddiursa/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -96 56 24 -176 96 40 -232 136 64 -200 112 56 +106 65 24 +180 98 32 +255 131 57 +222 115 49 16 16 16 -240 224 168 -208 176 96 +255 255 255 +238 172 82 248 248 248 -248 224 120 -88 88 88 -176 176 168 -216 216 216 +255 230 164 +106 106 123 +180 180 189 +222 222 222 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/tentacool/anim_front.png b/graphics/pokemon/tentacool/anim_front.png index fe0bffbef..4ccacc344 100644 Binary files a/graphics/pokemon/tentacool/anim_front.png and b/graphics/pokemon/tentacool/anim_front.png differ diff --git a/graphics/pokemon/tentacool/front.png b/graphics/pokemon/tentacool/front.png index 67396165b..460479345 100644 Binary files a/graphics/pokemon/tentacool/front.png and b/graphics/pokemon/tentacool/front.png differ diff --git a/graphics/pokemon/tentacool/normal.pal b/graphics/pokemon/tentacool/normal.pal index 69a7e55a5..2f409fd92 100644 --- a/graphics/pokemon/tentacool/normal.pal +++ b/graphics/pokemon/tentacool/normal.pal @@ -6,14 +6,14 @@ JASC-PAL 104 16 40 152 208 240 104 184 224 -168 40 72 +168 32 64 248 248 248 232 184 200 -200 96 144 +216 80 128 48 144 192 16 16 16 208 208 208 -88 80 72 -200 184 176 -120 104 96 -168 152 136 +80 80 88 +184 184 184 +112 104 120 +152 144 160 diff --git a/graphics/pokemon/tentacruel/anim_front.png b/graphics/pokemon/tentacruel/anim_front.png index 3c2ffa461..d401d1eaf 100644 Binary files a/graphics/pokemon/tentacruel/anim_front.png and b/graphics/pokemon/tentacruel/anim_front.png differ diff --git a/graphics/pokemon/tentacruel/front.png b/graphics/pokemon/tentacruel/front.png index 58112bc50..b751ed684 100644 Binary files a/graphics/pokemon/tentacruel/front.png and b/graphics/pokemon/tentacruel/front.png differ diff --git a/graphics/pokemon/tentacruel/normal.pal b/graphics/pokemon/tentacruel/normal.pal index 82ee96b36..c28517e86 100644 --- a/graphics/pokemon/tentacruel/normal.pal +++ b/graphics/pokemon/tentacruel/normal.pal @@ -8,12 +8,12 @@ JASC-PAL 88 176 216 48 144 184 16 16 16 -200 96 144 +216 80 128 232 184 200 248 248 248 -168 40 72 +168 32 64 208 208 208 -64 72 80 -168 168 152 +80 80 88 +152 144 160 104 112 104 -216 200 184 +184 184 184 diff --git a/graphics/pokemon/tepig/anim_front.png b/graphics/pokemon/tepig/anim_front.png index 4c50ebcaf..e2e6da880 100644 Binary files a/graphics/pokemon/tepig/anim_front.png and b/graphics/pokemon/tepig/anim_front.png differ diff --git a/graphics/pokemon/tepig/front.png b/graphics/pokemon/tepig/front.png index ebe16e580..0e706ecad 100644 Binary files a/graphics/pokemon/tepig/front.png and b/graphics/pokemon/tepig/front.png differ diff --git a/graphics/pokemon/tepig/normal.pal b/graphics/pokemon/tepig/normal.pal index f66c90909..6938b34af 100644 --- a/graphics/pokemon/tepig/normal.pal +++ b/graphics/pokemon/tepig/normal.pal @@ -3,12 +3,12 @@ JASC-PAL 16 152 208 160 16 16 16 -72 64 56 -40 32 40 +72 56 48 +48 32 32 104 56 40 176 88 56 -224 120 104 -200 80 72 +224 104 40 +200 64 56 144 120 40 240 128 72 248 200 64 diff --git a/graphics/pokemon/terrakion/anim_front.png b/graphics/pokemon/terrakion/anim_front.png index 5a16f12e5..ec6c37876 100644 Binary files a/graphics/pokemon/terrakion/anim_front.png and b/graphics/pokemon/terrakion/anim_front.png differ diff --git a/graphics/pokemon/terrakion/front.png b/graphics/pokemon/terrakion/front.png index de8a977f6..53b731785 100644 Binary files a/graphics/pokemon/terrakion/front.png and b/graphics/pokemon/terrakion/front.png differ diff --git a/graphics/pokemon/terrakion/normal.pal b/graphics/pokemon/terrakion/normal.pal index 57ca72204..84bbdb56e 100644 --- a/graphics/pokemon/terrakion/normal.pal +++ b/graphics/pokemon/terrakion/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 +153 204 153 +0 0 0 +64 56 48 +34 34 34 +96 80 72 +176 168 168 +51 51 51 +128 128 128 +160 104 56 +248 136 0 +176 160 128 +255 255 255 +216 200 168 +136 120 88 +80 72 72 0 0 0 -64 48 40 -40 32 32 -96 72 64 -160 168 184 -56 56 56 -128 120 120 -176 88 48 -248 144 88 -136 112 88 -248 248 248 -200 168 136 -88 80 88 -80 72 64 -40 32 32 diff --git a/graphics/pokemon/throh/anim_front.png b/graphics/pokemon/throh/anim_front.png index b51d87ad8..d99b04374 100644 Binary files a/graphics/pokemon/throh/anim_front.png and b/graphics/pokemon/throh/anim_front.png differ diff --git a/graphics/pokemon/throh/front.png b/graphics/pokemon/throh/front.png index 9c8fa4fcc..82351e40b 100644 Binary files a/graphics/pokemon/throh/front.png and b/graphics/pokemon/throh/front.png differ diff --git a/graphics/pokemon/throh/normal.pal b/graphics/pokemon/throh/normal.pal index 73c16e875..45da3c8f5 100644 --- a/graphics/pokemon/throh/normal.pal +++ b/graphics/pokemon/throh/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -96 32 32 -208 88 80 +96 24 24 +216 88 88 16 16 16 -64 64 64 -144 56 48 -224 224 208 -40 40 40 -136 120 120 -184 176 152 +56 56 56 +168 48 48 +232 224 208 +40 40 32 +144 136 128 +192 184 168 240 240 240 -0 0 0 +216 88 88 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/thundurus/anim_front.png b/graphics/pokemon/thundurus/anim_front.png index 82089b223..1a16e76c2 100644 Binary files a/graphics/pokemon/thundurus/anim_front.png and b/graphics/pokemon/thundurus/anim_front.png differ diff --git a/graphics/pokemon/thundurus/front.png b/graphics/pokemon/thundurus/front.png index 455723e04..b8ff39958 100644 Binary files a/graphics/pokemon/thundurus/front.png and b/graphics/pokemon/thundurus/front.png differ diff --git a/graphics/pokemon/thundurus/normal.pal b/graphics/pokemon/thundurus/normal.pal index 653b89e32..76ba74a07 100644 --- a/graphics/pokemon/thundurus/normal.pal +++ b/graphics/pokemon/thundurus/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -88 88 112 -248 248 248 -152 152 184 -16 16 16 -32 32 80 -96 88 176 -72 112 144 -56 56 120 -96 192 232 -56 56 64 -248 192 120 -48 48 64 -24 32 32 -88 88 96 -176 128 80 +153 204 153 +112 112 112 +255 255 255 +176 176 184 +17 17 17 +34 34 85 +102 85 170 +80 128 160 +51 51 119 +96 192 248 +48 48 48 +248 192 88 +24 24 24 +72 72 72 +170 136 85 +0 0 0 diff --git a/graphics/pokemon/thundurus/therian/anim_front.png b/graphics/pokemon/thundurus/therian/anim_front.png index 9d09a76b8..e87cf107b 100644 Binary files a/graphics/pokemon/thundurus/therian/anim_front.png and b/graphics/pokemon/thundurus/therian/anim_front.png differ diff --git a/graphics/pokemon/thundurus/therian/front.png b/graphics/pokemon/thundurus/therian/front.png index 04888d1e7..4d1543d59 100644 Binary files a/graphics/pokemon/thundurus/therian/front.png and b/graphics/pokemon/thundurus/therian/front.png differ diff --git a/graphics/pokemon/thundurus/therian/normal.pal b/graphics/pokemon/thundurus/therian/normal.pal index d6415c50f..41ec8e38f 100644 --- a/graphics/pokemon/thundurus/therian/normal.pal +++ b/graphics/pokemon/thundurus/therian/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -104 104 112 +112 112 112 248 248 248 16 16 16 -32 24 80 -192 176 168 -88 72 160 -56 48 112 -80 128 152 -48 80 96 -112 184 232 -168 128 80 -232 200 144 -64 56 56 -32 32 40 -48 104 144 +24 40 80 +176 176 184 +88 72 168 +56 56 128 +80 128 160 +40 64 104 +96 192 248 +208 144 48 +248 192 88 +48 48 48 +32 32 32 +0 0 0 diff --git a/graphics/pokemon/timburr/anim_front.png b/graphics/pokemon/timburr/anim_front.png index caaee7540..4e32b20fd 100644 Binary files a/graphics/pokemon/timburr/anim_front.png and b/graphics/pokemon/timburr/anim_front.png differ diff --git a/graphics/pokemon/timburr/front.png b/graphics/pokemon/timburr/front.png index 8a7d351e4..b79489a86 100644 Binary files a/graphics/pokemon/timburr/front.png and b/graphics/pokemon/timburr/front.png differ diff --git a/graphics/pokemon/timburr/normal.pal b/graphics/pokemon/timburr/normal.pal index 3cdc96b4e..e9d711a76 100644 --- a/graphics/pokemon/timburr/normal.pal +++ b/graphics/pokemon/timburr/normal.pal @@ -4,16 +4,16 @@ JASC-PAL 152 208 160 88 80 72 16 16 16 -192 176 144 +192 184 168 112 48 80 -248 96 128 -152 128 104 -176 72 88 +248 120 136 +152 136 128 +192 88 112 64 72 80 192 192 192 248 248 248 120 112 112 -56 40 24 -96 56 24 -144 88 40 -200 152 96 +88 56 8 +120 80 8 +168 112 8 +216 176 96 diff --git a/graphics/pokemon/tirtouga/anim_front.png b/graphics/pokemon/tirtouga/anim_front.png index dc4a722e4..37cdaff8e 100644 Binary files a/graphics/pokemon/tirtouga/anim_front.png and b/graphics/pokemon/tirtouga/anim_front.png differ diff --git a/graphics/pokemon/tirtouga/front.png b/graphics/pokemon/tirtouga/front.png index 61446de0e..3228a2f66 100644 Binary files a/graphics/pokemon/tirtouga/front.png and b/graphics/pokemon/tirtouga/front.png differ diff --git a/graphics/pokemon/tirtouga/normal.pal b/graphics/pokemon/tirtouga/normal.pal index dac560816..752ec9327 100644 --- a/graphics/pokemon/tirtouga/normal.pal +++ b/graphics/pokemon/tirtouga/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -48 72 104 -104 160 208 +32 80 112 +72 152 216 16 16 16 48 56 72 -72 112 152 -112 120 144 -72 88 120 +48 112 168 +104 120 136 +80 96 112 224 224 224 136 200 216 -128 80 96 -168 112 120 -64 72 88 +192 96 120 +240 120 152 +56 72 80 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/togekiss/anim_front.png b/graphics/pokemon/togekiss/anim_front.png index 10a6c63ba..f902aff3b 100644 Binary files a/graphics/pokemon/togekiss/anim_front.png and b/graphics/pokemon/togekiss/anim_front.png differ diff --git a/graphics/pokemon/togekiss/front.png b/graphics/pokemon/togekiss/front.png index 6509b14ac..0a699e780 100644 Binary files a/graphics/pokemon/togekiss/front.png and b/graphics/pokemon/togekiss/front.png differ diff --git a/graphics/pokemon/togekiss/normal.pal b/graphics/pokemon/togekiss/normal.pal index 0c770d6a4..6cce97f24 100644 --- a/graphics/pokemon/togekiss/normal.pal +++ b/graphics/pokemon/togekiss/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -168 208 200 -136 160 160 -72 96 96 -216 240 240 -16 16 16 -32 144 216 -128 32 32 -200 72 64 -88 192 232 +184 192 216 +128 152 176 +72 88 112 232 232 248 -224 128 128 -24 104 152 +16 16 16 +64 128 232 +112 48 40 +200 72 48 +144 176 248 +248 248 248 +184 128 128 +80 88 168 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/togepi/anim_front.png b/graphics/pokemon/togepi/anim_front.png index e08da7b4b..07d7f05b8 100644 Binary files a/graphics/pokemon/togepi/anim_front.png and b/graphics/pokemon/togepi/anim_front.png differ diff --git a/graphics/pokemon/togepi/front.png b/graphics/pokemon/togepi/front.png index 0c6d162f7..e6520872b 100644 Binary files a/graphics/pokemon/togepi/front.png and b/graphics/pokemon/togepi/front.png differ diff --git a/graphics/pokemon/togepi/normal.pal b/graphics/pokemon/togepi/normal.pal index bbac7b3f8..0fb20049a 100644 --- a/graphics/pokemon/togepi/normal.pal +++ b/graphics/pokemon/togepi/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 112 96 -16 16 16 -248 232 184 -184 176 128 -104 88 64 -240 216 152 -128 88 104 +144 112 88 +0 0 0 +240 232 192 +200 176 112 +112 72 72 +240 208 160 +168 32 32 248 248 248 -144 136 120 -232 224 208 -64 176 216 -240 104 80 -200 80 48 -208 200 176 -56 144 168 +120 136 144 +208 216 216 +72 128 192 +216 112 104 +192 64 64 +176 176 192 +48 96 168 diff --git a/graphics/pokemon/togetic/anim_front.png b/graphics/pokemon/togetic/anim_front.png index 629ea3c50..1079c2b01 100644 Binary files a/graphics/pokemon/togetic/anim_front.png and b/graphics/pokemon/togetic/anim_front.png differ diff --git a/graphics/pokemon/togetic/front.png b/graphics/pokemon/togetic/front.png index 37434e899..0bacb627e 100644 Binary files a/graphics/pokemon/togetic/front.png and b/graphics/pokemon/togetic/front.png differ diff --git a/graphics/pokemon/togetic/normal.pal b/graphics/pokemon/togetic/normal.pal index d49068655..0b1731459 100644 --- a/graphics/pokemon/togetic/normal.pal +++ b/graphics/pokemon/togetic/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -112 120 120 -240 248 240 -16 16 16 -176 192 168 -224 232 216 -248 72 64 -176 56 48 -48 152 200 -48 112 152 -153 103 91 -196 138 129 +112 120 128 +248 248 248 +0 0 0 +168 192 184 +208 232 232 +216 64 56 +184 24 8 +40 144 224 +16 96 184 +192 48 32 +136 16 16 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/torchic/anim_front.png b/graphics/pokemon/torchic/anim_front.png index 241b673ae..f7eb75e3d 100644 Binary files a/graphics/pokemon/torchic/anim_front.png and b/graphics/pokemon/torchic/anim_front.png differ diff --git a/graphics/pokemon/torchic/front.png b/graphics/pokemon/torchic/front.png index 56ab67fd4..b4e2066d1 100644 Binary files a/graphics/pokemon/torchic/front.png and b/graphics/pokemon/torchic/front.png differ diff --git a/graphics/pokemon/torchic/normal.pal b/graphics/pokemon/torchic/normal.pal index 84d058a30..1a2a98caa 100644 --- a/graphics/pokemon/torchic/normal.pal +++ b/graphics/pokemon/torchic/normal.pal @@ -5,15 +5,15 @@ JASC-PAL 168 136 0 232 184 48 240 216 104 -24 24 24 +0 0 0 168 64 16 -248 152 32 -224 104 0 -248 184 112 +248 136 48 +224 88 32 +248 168 80 120 72 24 248 248 248 -168 144 56 -248 232 144 -216 200 96 +168 136 0 +240 216 104 +232 184 48 136 80 32 0 0 0 diff --git a/graphics/pokemon/torkoal/anim_front.png b/graphics/pokemon/torkoal/anim_front.png index 0a0162d48..71f1b97fc 100644 Binary files a/graphics/pokemon/torkoal/anim_front.png and b/graphics/pokemon/torkoal/anim_front.png differ diff --git a/graphics/pokemon/torkoal/front.png b/graphics/pokemon/torkoal/front.png index ff72e1c86..abe45c343 100644 Binary files a/graphics/pokemon/torkoal/front.png and b/graphics/pokemon/torkoal/front.png differ diff --git a/graphics/pokemon/torkoal/normal.pal b/graphics/pokemon/torkoal/normal.pal index 15c05fb0f..4488371de 100644 --- a/graphics/pokemon/torkoal/normal.pal +++ b/graphics/pokemon/torkoal/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -192 168 136 -240 240 216 -232 200 160 -144 136 136 -80 56 40 -240 160 128 -240 136 88 -160 88 48 -192 112 64 +184 168 160 +232 216 208 +208 200 192 +128 128 128 +88 48 56 +248 168 104 +232 128 64 +168 80 56 +200 96 72 56 56 56 -16 16 16 -96 88 88 -224 56 64 -240 152 152 +0 0 0 +96 96 96 +104 40 40 +248 32 32 0 0 0 diff --git a/graphics/pokemon/tornadus/anim_front.png b/graphics/pokemon/tornadus/anim_front.png index 6b9f6e478..675dfa020 100644 Binary files a/graphics/pokemon/tornadus/anim_front.png and b/graphics/pokemon/tornadus/anim_front.png differ diff --git a/graphics/pokemon/tornadus/front.png b/graphics/pokemon/tornadus/front.png index 513895275..b121301dd 100644 Binary files a/graphics/pokemon/tornadus/front.png and b/graphics/pokemon/tornadus/front.png differ diff --git a/graphics/pokemon/tornadus/normal.pal b/graphics/pokemon/tornadus/normal.pal index 4d6c5ff02..c0b2eca35 100644 --- a/graphics/pokemon/tornadus/normal.pal +++ b/graphics/pokemon/tornadus/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -88 80 104 +112 112 112 248 248 248 16 16 16 -160 152 176 -120 80 168 -48 40 80 -64 104 64 -96 168 88 -80 56 112 -56 56 56 -248 208 120 -96 72 64 -176 128 80 -240 192 136 +176 176 184 +128 64 168 +64 32 80 +64 112 56 +72 152 64 +88 48 112 +40 72 48 +248 192 0 +104 64 40 +168 120 72 +216 176 104 0 0 0 diff --git a/graphics/pokemon/tornadus/therian/anim_front.png b/graphics/pokemon/tornadus/therian/anim_front.png index c0eb46fae..574aa1cc7 100644 Binary files a/graphics/pokemon/tornadus/therian/anim_front.png and b/graphics/pokemon/tornadus/therian/anim_front.png differ diff --git a/graphics/pokemon/tornadus/therian/front.png b/graphics/pokemon/tornadus/therian/front.png index 9c47da33e..b168d3bd9 100644 Binary files a/graphics/pokemon/tornadus/therian/front.png and b/graphics/pokemon/tornadus/therian/front.png differ diff --git a/graphics/pokemon/tornadus/therian/normal.pal b/graphics/pokemon/tornadus/therian/normal.pal index d5f0fdfe7..dc8578fa0 100644 --- a/graphics/pokemon/tornadus/therian/normal.pal +++ b/graphics/pokemon/tornadus/therian/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -104 64 120 +88 56 112 64 32 80 -144 96 168 +128 64 168 16 16 16 -112 104 112 +112 112 112 248 248 248 -192 176 168 -48 80 40 -112 160 80 -248 200 120 -72 120 56 -184 136 80 -120 88 56 -232 56 16 +176 176 184 +40 72 48 +72 152 64 +216 176 104 +64 112 56 +168 120 72 +104 64 40 +216 56 40 0 0 0 diff --git a/graphics/pokemon/torterra/anim_front.png b/graphics/pokemon/torterra/anim_front.png index cd41f4e31..cbc7c3e52 100644 Binary files a/graphics/pokemon/torterra/anim_front.png and b/graphics/pokemon/torterra/anim_front.png differ diff --git a/graphics/pokemon/torterra/front.png b/graphics/pokemon/torterra/front.png index ee1e5df76..2ef06d2f0 100644 Binary files a/graphics/pokemon/torterra/front.png and b/graphics/pokemon/torterra/front.png differ diff --git a/graphics/pokemon/torterra/normal.pal b/graphics/pokemon/torterra/normal.pal index 82cf9dd2e..48962babc 100644 --- a/graphics/pokemon/torterra/normal.pal +++ b/graphics/pokemon/torterra/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -48 88 40 -64 136 88 -88 160 96 +24 96 24 +48 136 56 +64 168 64 16 16 16 160 160 160 -120 120 120 -216 216 216 -184 184 176 -80 56 32 -128 96 56 -176 128 72 +104 112 120 +224 224 224 +184 184 184 +96 72 56 +136 104 64 +176 128 80 56 88 40 72 80 88 -176 128 72 +176 128 80 0 0 0 diff --git a/graphics/pokemon/totodile/anim_front.png b/graphics/pokemon/totodile/anim_front.png index e7e0f11cd..49e4fee75 100644 Binary files a/graphics/pokemon/totodile/anim_front.png and b/graphics/pokemon/totodile/anim_front.png differ diff --git a/graphics/pokemon/totodile/front.png b/graphics/pokemon/totodile/front.png index 61c435e95..ba9c9994b 100644 Binary files a/graphics/pokemon/totodile/front.png and b/graphics/pokemon/totodile/front.png differ diff --git a/graphics/pokemon/totodile/normal.pal b/graphics/pokemon/totodile/normal.pal index 665f9c176..bf7ef18af 100644 --- a/graphics/pokemon/totodile/normal.pal +++ b/graphics/pokemon/totodile/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 208 152 184 -64 136 152 -32 72 88 -88 200 208 -144 232 232 +32 136 184 +40 88 128 +80 192 216 +152 224 248 16 16 16 248 248 248 64 64 72 176 176 176 -120 24 32 +120 24 0 152 80 88 -168 48 72 +200 64 32 232 120 120 -160 136 80 -240 208 120 +144 128 32 +248 224 136 184 104 104 diff --git a/graphics/pokemon/toxicroak/anim_front.png b/graphics/pokemon/toxicroak/anim_front.png index 9eaccecbc..105ad18cb 100644 Binary files a/graphics/pokemon/toxicroak/anim_front.png and b/graphics/pokemon/toxicroak/anim_front.png differ diff --git a/graphics/pokemon/toxicroak/front.png b/graphics/pokemon/toxicroak/front.png index d21885a99..27acc59b7 100644 Binary files a/graphics/pokemon/toxicroak/front.png and b/graphics/pokemon/toxicroak/front.png differ diff --git a/graphics/pokemon/toxicroak/normal.pal b/graphics/pokemon/toxicroak/normal.pal index 9b23239b3..b18a334af 100644 --- a/graphics/pokemon/toxicroak/normal.pal +++ b/graphics/pokemon/toxicroak/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -56 96 136 +72 72 136 16 16 16 -88 144 184 -160 200 200 -48 48 40 +104 112 208 +128 152 248 +48 48 64 80 80 80 -168 128 24 -240 184 48 -224 96 88 -160 64 56 -184 176 168 +176 136 24 +248 208 24 +224 80 88 +152 56 56 +176 176 192 248 248 248 56 56 80 -232 168 160 -136 120 120 +248 152 160 +120 120 136 diff --git a/graphics/pokemon/tranquill/anim_front.png b/graphics/pokemon/tranquill/anim_front.png index 8141ed766..a3063146b 100644 Binary files a/graphics/pokemon/tranquill/anim_front.png and b/graphics/pokemon/tranquill/anim_front.png differ diff --git a/graphics/pokemon/tranquill/front.png b/graphics/pokemon/tranquill/front.png index b7b0789e0..2294a1f13 100644 Binary files a/graphics/pokemon/tranquill/front.png and b/graphics/pokemon/tranquill/front.png differ diff --git a/graphics/pokemon/tranquill/normal.pal b/graphics/pokemon/tranquill/normal.pal index 5752e8a42..d85d078ae 100644 --- a/graphics/pokemon/tranquill/normal.pal +++ b/graphics/pokemon/tranquill/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 0 176 232 -40 32 32 -72 64 64 -16 16 16 -120 40 56 -208 72 96 -200 208 224 -120 120 120 +48 48 48 +72 72 72 +8 8 8 +136 32 48 +248 64 120 +216 216 216 +128 128 128 248 248 248 -160 168 176 +160 160 160 184 184 184 -240 176 72 -160 112 48 -144 144 152 -152 88 88 -216 120 128 +248 200 56 +152 120 8 +144 144 144 +184 96 96 +248 152 152 diff --git a/graphics/pokemon/trapinch/anim_front.png b/graphics/pokemon/trapinch/anim_front.png index a0f792c07..e8ee63af6 100644 Binary files a/graphics/pokemon/trapinch/anim_front.png and b/graphics/pokemon/trapinch/anim_front.png differ diff --git a/graphics/pokemon/trapinch/front.png b/graphics/pokemon/trapinch/front.png index 110c9ab4e..a74591721 100644 Binary files a/graphics/pokemon/trapinch/front.png and b/graphics/pokemon/trapinch/front.png differ diff --git a/graphics/pokemon/trapinch/normal.pal b/graphics/pokemon/trapinch/normal.pal index a771387d7..affb02664 100644 --- a/graphics/pokemon/trapinch/normal.pal +++ b/graphics/pokemon/trapinch/normal.pal @@ -2,16 +2,16 @@ JASC-PAL 0100 16 152 208 160 -168 96 64 -240 168 136 -240 136 88 -104 64 48 +192 88 72 +248 144 120 +232 112 64 +112 64 64 32 32 32 -216 224 232 +200 200 192 248 248 248 -184 184 208 -136 144 152 -72 72 88 +160 168 160 +128 128 128 +64 64 48 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/treecko/anim_front.png b/graphics/pokemon/treecko/anim_front.png index 728b53a33..867137cfc 100644 Binary files a/graphics/pokemon/treecko/anim_front.png and b/graphics/pokemon/treecko/anim_front.png differ diff --git a/graphics/pokemon/treecko/front.png b/graphics/pokemon/treecko/front.png index 67fb82a27..6869c279b 100644 Binary files a/graphics/pokemon/treecko/front.png and b/graphics/pokemon/treecko/front.png differ diff --git a/graphics/pokemon/treecko/normal.pal b/graphics/pokemon/treecko/normal.pal index e2a879c93..b655471e4 100644 --- a/graphics/pokemon/treecko/normal.pal +++ b/graphics/pokemon/treecko/normal.pal @@ -7,13 +7,13 @@ JASC-PAL 224 248 160 128 176 40 192 224 104 -168 136 32 +160 128 0 248 248 248 -248 208 56 -248 232 160 -224 72 96 -128 32 40 -240 128 136 -40 80 24 -80 128 56 -128 176 112 +248 160 32 +248 232 80 +224 72 104 +168 56 72 +240 96 120 +48 80 40 +56 104 56 +88 152 88 diff --git a/graphics/pokemon/tropius/anim_front.png b/graphics/pokemon/tropius/anim_front.png index 975e12732..a8ce49059 100644 Binary files a/graphics/pokemon/tropius/anim_front.png and b/graphics/pokemon/tropius/anim_front.png differ diff --git a/graphics/pokemon/tropius/front.png b/graphics/pokemon/tropius/front.png index 2e6ea1add..4bece6d40 100644 Binary files a/graphics/pokemon/tropius/front.png and b/graphics/pokemon/tropius/front.png differ diff --git a/graphics/pokemon/tropius/normal.pal b/graphics/pokemon/tropius/normal.pal index 1d980f30c..9bffa5d77 100644 --- a/graphics/pokemon/tropius/normal.pal +++ b/graphics/pokemon/tropius/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 0 176 232 -88 136 80 -64 88 56 -88 176 104 +56 136 72 +32 96 32 +80 168 80 16 16 16 -144 200 152 -88 64 48 +104 192 104 +80 56 48 248 248 248 -152 120 96 -184 160 136 -120 96 80 -224 176 96 -248 224 136 -176 120 144 -88 64 48 +144 112 80 +176 144 104 +120 88 72 +232 184 56 +248 248 104 +224 104 136 0 0 0 +80 56 48 diff --git a/graphics/pokemon/trubbish/anim_front.png b/graphics/pokemon/trubbish/anim_front.png index 46c3ba76e..3ed705609 100644 Binary files a/graphics/pokemon/trubbish/anim_front.png and b/graphics/pokemon/trubbish/anim_front.png differ diff --git a/graphics/pokemon/trubbish/front.png b/graphics/pokemon/trubbish/front.png index f1b7eb3f7..75fb61a26 100644 Binary files a/graphics/pokemon/trubbish/front.png and b/graphics/pokemon/trubbish/front.png differ diff --git a/graphics/pokemon/trubbish/normal.pal b/graphics/pokemon/trubbish/normal.pal index 0f5e78c36..4f2653379 100644 --- a/graphics/pokemon/trubbish/normal.pal +++ b/graphics/pokemon/trubbish/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -176 176 176 -88 120 96 +120 192 168 +40 104 72 16 16 16 -120 160 120 -32 56 40 -176 184 192 +72 136 104 +16 48 32 +160 192 168 248 248 248 -64 88 64 -80 64 56 -128 104 88 -176 152 128 -216 112 160 -40 128 120 -16 96 104 -160 64 104 +24 72 48 +80 72 56 +112 96 80 +160 136 112 +232 80 160 +0 136 224 +24 88 128 +184 48 120 0 0 0 diff --git a/graphics/pokemon/turtwig/anim_front.png b/graphics/pokemon/turtwig/anim_front.png index 91ac3ee83..84e5fc8eb 100644 Binary files a/graphics/pokemon/turtwig/anim_front.png and b/graphics/pokemon/turtwig/anim_front.png differ diff --git a/graphics/pokemon/turtwig/front.png b/graphics/pokemon/turtwig/front.png index 774f44c7d..59d3efa89 100644 Binary files a/graphics/pokemon/turtwig/front.png and b/graphics/pokemon/turtwig/front.png differ diff --git a/graphics/pokemon/turtwig/normal.pal b/graphics/pokemon/turtwig/normal.pal index b1325eb3c..775b018c2 100644 --- a/graphics/pokemon/turtwig/normal.pal +++ b/graphics/pokemon/turtwig/normal.pal @@ -2,9 +2,9 @@ JASC-PAL 0100 16 152 208 160 -48 160 56 +56 160 64 56 88 40 -88 208 112 +120 208 104 104 80 48 16 16 16 168 120 64 diff --git a/graphics/pokemon/tympole/anim_front.png b/graphics/pokemon/tympole/anim_front.png index f0ba75c18..2d72a92d1 100644 Binary files a/graphics/pokemon/tympole/anim_front.png and b/graphics/pokemon/tympole/anim_front.png differ diff --git a/graphics/pokemon/tympole/front.png b/graphics/pokemon/tympole/front.png index dc6ccd191..d1b5dfd48 100644 Binary files a/graphics/pokemon/tympole/front.png and b/graphics/pokemon/tympole/front.png differ diff --git a/graphics/pokemon/tympole/normal.pal b/graphics/pokemon/tympole/normal.pal index 26fc0fc31..1e707ef25 100644 --- a/graphics/pokemon/tympole/normal.pal +++ b/graphics/pokemon/tympole/normal.pal @@ -5,14 +5,14 @@ JASC-PAL 40 40 40 64 64 64 248 248 248 -248 216 160 -192 160 112 -16 16 16 -56 88 120 +248 216 184 +192 152 128 +0 0 0 +56 96 136 96 96 96 -144 112 72 -80 152 176 -96 200 240 +144 88 72 +112 144 192 +104 184 248 24 24 24 0 0 0 0 0 0 diff --git a/graphics/pokemon/tynamo/anim_front.png b/graphics/pokemon/tynamo/anim_front.png index 4dc1d1261..827e650ac 100644 Binary files a/graphics/pokemon/tynamo/anim_front.png and b/graphics/pokemon/tynamo/anim_front.png differ diff --git a/graphics/pokemon/tynamo/front.png b/graphics/pokemon/tynamo/front.png index 8489c52f0..47d48757e 100644 Binary files a/graphics/pokemon/tynamo/front.png and b/graphics/pokemon/tynamo/front.png differ diff --git a/graphics/pokemon/tynamo/normal.pal b/graphics/pokemon/tynamo/normal.pal index ee546581d..7c53e6da9 100644 --- a/graphics/pokemon/tynamo/normal.pal +++ b/graphics/pokemon/tynamo/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -152 176 208 -120 136 176 -232 248 248 -80 120 144 +180 189 205 +156 164 180 +238 255 255 +123 131 148 24 24 32 -184 216 232 -184 80 88 -136 56 72 -248 224 128 -248 216 56 -240 96 88 +205 222 230 +205 74 0 +148 32 0 +255 230 123 +255 213 0 +246 131 90 176 184 200 0 0 0 0 0 0 diff --git a/graphics/pokemon/typhlosion/anim_front.png b/graphics/pokemon/typhlosion/anim_front.png index d2cde117e..a4f46ae24 100644 Binary files a/graphics/pokemon/typhlosion/anim_front.png and b/graphics/pokemon/typhlosion/anim_front.png differ diff --git a/graphics/pokemon/typhlosion/back.png b/graphics/pokemon/typhlosion/back.png index 30af3f6df..3252c26e9 100644 Binary files a/graphics/pokemon/typhlosion/back.png and b/graphics/pokemon/typhlosion/back.png differ diff --git a/graphics/pokemon/typhlosion/front.png b/graphics/pokemon/typhlosion/front.png index 292c6a309..79830374f 100644 Binary files a/graphics/pokemon/typhlosion/front.png and b/graphics/pokemon/typhlosion/front.png differ diff --git a/graphics/pokemon/typhlosion/normal.pal b/graphics/pokemon/typhlosion/normal.pal index 6578eb2a9..8315b8af8 100644 --- a/graphics/pokemon/typhlosion/normal.pal +++ b/graphics/pokemon/typhlosion/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -160 56 16 -248 88 16 -248 216 32 -224 168 16 -72 80 104 +216 0 0 +248 96 0 +248 216 0 +248 152 0 +40 88 120 24 40 48 -104 120 136 -168 144 88 -248 224 144 -88 72 40 +56 128 136 +160 136 72 +248 232 144 +104 80 40 16 16 16 248 248 248 -216 192 104 +208 192 112 128 72 72 -48 56 88 +48 64 112 diff --git a/graphics/pokemon/tyranitar/anim_front.png b/graphics/pokemon/tyranitar/anim_front.png index d080f270c..0c39b74f9 100644 Binary files a/graphics/pokemon/tyranitar/anim_front.png and b/graphics/pokemon/tyranitar/anim_front.png differ diff --git a/graphics/pokemon/tyranitar/front.png b/graphics/pokemon/tyranitar/front.png index af5ffe0af..2032b956a 100644 Binary files a/graphics/pokemon/tyranitar/front.png and b/graphics/pokemon/tyranitar/front.png differ diff --git a/graphics/pokemon/tyranitar/normal.pal b/graphics/pokemon/tyranitar/normal.pal index c7ddf8e37..8773244e8 100644 --- a/graphics/pokemon/tyranitar/normal.pal +++ b/graphics/pokemon/tyranitar/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 248 160 176 -64 80 48 -168 192 128 +72 88 56 +168 200 152 16 16 16 -216 216 184 -128 144 96 +216 224 200 +112 152 96 248 248 248 -184 192 208 -88 96 112 -120 80 80 -224 136 136 -104 120 168 -48 64 104 -136 152 192 +192 192 192 +112 112 112 +144 40 0 +208 80 0 +104 128 168 +64 88 120 +144 168 208 0 0 0 0 0 0 diff --git a/graphics/pokemon/tyrogue/anim_front.png b/graphics/pokemon/tyrogue/anim_front.png index dce02b7ad..b5c0a3d87 100644 Binary files a/graphics/pokemon/tyrogue/anim_front.png and b/graphics/pokemon/tyrogue/anim_front.png differ diff --git a/graphics/pokemon/tyrogue/front.png b/graphics/pokemon/tyrogue/front.png index 27c3d8cd4..0fcc422d5 100644 Binary files a/graphics/pokemon/tyrogue/front.png and b/graphics/pokemon/tyrogue/front.png differ diff --git a/graphics/pokemon/tyrogue/normal.pal b/graphics/pokemon/tyrogue/normal.pal index a8540cb04..34d6db822 100644 --- a/graphics/pokemon/tyrogue/normal.pal +++ b/graphics/pokemon/tyrogue/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -144 112 136 +152 104 152 112 64 96 192 152 184 -240 184 232 +232 192 248 16 16 16 248 248 248 160 128 64 224 160 64 -176 80 152 -160 144 136 -88 64 40 -176 136 104 -56 40 24 -136 96 56 +176 48 0 +152 152 168 +120 72 0 +208 152 72 +80 48 0 +160 120 64 216 208 200 diff --git a/graphics/pokemon/umbreon/anim_front.png b/graphics/pokemon/umbreon/anim_front.png index 658ff6b68..74c7e1c79 100644 Binary files a/graphics/pokemon/umbreon/anim_front.png and b/graphics/pokemon/umbreon/anim_front.png differ diff --git a/graphics/pokemon/umbreon/front.png b/graphics/pokemon/umbreon/front.png index 4d5ddb188..82a649940 100644 Binary files a/graphics/pokemon/umbreon/front.png and b/graphics/pokemon/umbreon/front.png differ diff --git a/graphics/pokemon/umbreon/normal.pal b/graphics/pokemon/umbreon/normal.pal index 526761aed..1019edcaf 100644 --- a/graphics/pokemon/umbreon/normal.pal +++ b/graphics/pokemon/umbreon/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -40 48 48 -88 96 104 +40 48 72 +96 96 120 16 16 16 -128 96 48 -240 208 120 -200 152 72 -64 72 72 -104 40 24 -248 232 216 -184 72 40 -24 32 40 -232 96 56 +80 80 0 +232 208 80 +176 144 40 +64 64 80 +128 32 16 +248 240 240 +192 48 48 +32 32 56 +248 64 64 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/unfezant/anim_front.png b/graphics/pokemon/unfezant/anim_front.png index 59ff1e4d6..8e564674d 100644 Binary files a/graphics/pokemon/unfezant/anim_front.png and b/graphics/pokemon/unfezant/anim_front.png differ diff --git a/graphics/pokemon/unfezant/anim_frontf.png b/graphics/pokemon/unfezant/anim_frontf.png index bd39fc3d1..46fbed1c2 100644 Binary files a/graphics/pokemon/unfezant/anim_frontf.png and b/graphics/pokemon/unfezant/anim_frontf.png differ diff --git a/graphics/pokemon/unfezant/front.png b/graphics/pokemon/unfezant/front.png index 6227f4c9b..cea0bc3ab 100644 Binary files a/graphics/pokemon/unfezant/front.png and b/graphics/pokemon/unfezant/front.png differ diff --git a/graphics/pokemon/unfezant/frontf.png b/graphics/pokemon/unfezant/frontf.png new file mode 100644 index 000000000..76e532526 Binary files /dev/null and b/graphics/pokemon/unfezant/frontf.png differ diff --git a/graphics/pokemon/unfezant/normal.pal b/graphics/pokemon/unfezant/normal.pal index bb69c2c40..7310caf8e 100644 --- a/graphics/pokemon/unfezant/normal.pal +++ b/graphics/pokemon/unfezant/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -153 210 164 -170 97 108 -219 189 54 -109 68 29 -98 98 98 -51 165 110 -96 50 72 -132 127 132 -49 49 53 -48 122 82 -158 60 79 -221 79 108 -164 166 173 +120 192 168 +168 96 104 +248 224 0 +96 72 48 +96 96 96 +56 168 112 +120 32 80 +120 128 136 +40 40 40 +48 120 80 +176 24 88 +248 64 120 +176 176 176 16 16 16 -75 75 81 -255 255 255 +64 64 80 +248 248 248 diff --git a/graphics/pokemon/unfezant/normalf.pal b/graphics/pokemon/unfezant/normalf.pal index a878e4c53..c870fbffc 100644 --- a/graphics/pokemon/unfezant/normalf.pal +++ b/graphics/pokemon/unfezant/normalf.pal @@ -1,18 +1,18 @@ JASC-PAL 0100 16 -153 210 164 +120 192 168 170 97 108 -219 189 54 +248 224 0 98 98 98 -158 110 55 +160 120 64 0 0 0 -132 127 132 -109 68 29 -49 49 53 +120 120 136 +96 72 48 +40 40 40 16 16 16 -164 166 173 -75 75 81 +176 176 176 +64 64 80 255 255 255 0 0 0 0 0 0 diff --git a/graphics/pokemon/ursaring/anim_front.png b/graphics/pokemon/ursaring/anim_front.png index 66f54bcef..3a8e048b2 100644 Binary files a/graphics/pokemon/ursaring/anim_front.png and b/graphics/pokemon/ursaring/anim_front.png differ diff --git a/graphics/pokemon/ursaring/front.png b/graphics/pokemon/ursaring/front.png index f85b56895..0229df204 100644 Binary files a/graphics/pokemon/ursaring/front.png and b/graphics/pokemon/ursaring/front.png differ diff --git a/graphics/pokemon/ursaring/normal.pal b/graphics/pokemon/ursaring/normal.pal index 10e091cd8..41bc6f31a 100644 --- a/graphics/pokemon/ursaring/normal.pal +++ b/graphics/pokemon/ursaring/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -96 64 48 -144 88 64 -56 32 24 -112 128 136 +96 64 40 +144 80 32 +64 40 24 +120 120 136 16 16 16 -176 128 104 +184 112 64 248 248 248 -248 240 152 -168 184 176 -200 224 216 -240 208 104 -184 152 80 -104 56 64 -200 112 120 -248 240 152 +248 232 128 +176 176 184 +216 216 216 +240 192 96 +192 152 72 +128 24 48 +216 56 88 +248 232 128 diff --git a/graphics/pokemon/uxie/anim_front.png b/graphics/pokemon/uxie/anim_front.png index effb33d2d..4753ea3cb 100644 Binary files a/graphics/pokemon/uxie/anim_front.png and b/graphics/pokemon/uxie/anim_front.png differ diff --git a/graphics/pokemon/uxie/back.png b/graphics/pokemon/uxie/back.png index d5114c262..5f6292d52 100644 Binary files a/graphics/pokemon/uxie/back.png and b/graphics/pokemon/uxie/back.png differ diff --git a/graphics/pokemon/uxie/front.png b/graphics/pokemon/uxie/front.png index f45ac4e5f..3d923f443 100644 Binary files a/graphics/pokemon/uxie/front.png and b/graphics/pokemon/uxie/front.png differ diff --git a/graphics/pokemon/uxie/normal.pal b/graphics/pokemon/uxie/normal.pal index bd46f4f88..e3783dcae 100644 --- a/graphics/pokemon/uxie/normal.pal +++ b/graphics/pokemon/uxie/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 96 56 -168 136 72 -240 200 104 -248 224 160 +112 88 64 +168 136 64 +240 192 112 +248 216 152 16 16 16 -224 104 96 -72 64 48 +232 64 64 +248 208 160 248 248 248 -176 48 48 -168 208 240 -128 160 192 -48 64 72 -96 120 152 -0 0 0 +168 64 64 +176 200 240 +144 152 192 +64 64 64 +120 112 144 +88 56 64 0 0 0 diff --git a/graphics/pokemon/vanillish/anim_front.png b/graphics/pokemon/vanillish/anim_front.png index fdd2bbf6e..6ccecc5c8 100644 Binary files a/graphics/pokemon/vanillish/anim_front.png and b/graphics/pokemon/vanillish/anim_front.png differ diff --git a/graphics/pokemon/vanillish/front.png b/graphics/pokemon/vanillish/front.png index a9d589b27..eb3237a5c 100644 Binary files a/graphics/pokemon/vanillish/front.png and b/graphics/pokemon/vanillish/front.png differ diff --git a/graphics/pokemon/vanillish/normal.pal b/graphics/pokemon/vanillish/normal.pal index 5aa6c7fab..61580bb7b 100644 --- a/graphics/pokemon/vanillish/normal.pal +++ b/graphics/pokemon/vanillish/normal.pal @@ -5,14 +5,14 @@ JASC-PAL 120 136 184 248 248 248 72 80 112 -16 16 16 -160 176 224 -144 208 248 +0 0 0 +184 184 216 +160 216 240 120 176 200 -88 160 216 -48 80 152 -72 104 176 -192 200 232 +104 160 232 +56 64 112 +72 80 160 +208 208 232 40 96 168 32 80 120 0 0 0 diff --git a/graphics/pokemon/vanillite/anim_front.png b/graphics/pokemon/vanillite/anim_front.png index e63bdf23e..a837f0dcd 100644 Binary files a/graphics/pokemon/vanillite/anim_front.png and b/graphics/pokemon/vanillite/anim_front.png differ diff --git a/graphics/pokemon/vanillite/front.png b/graphics/pokemon/vanillite/front.png index 8aaabc8af..dfcfb42c7 100644 Binary files a/graphics/pokemon/vanillite/front.png and b/graphics/pokemon/vanillite/front.png differ diff --git a/graphics/pokemon/vanillite/normal.pal b/graphics/pokemon/vanillite/normal.pal index ba24b30c4..58ca8c87b 100644 --- a/graphics/pokemon/vanillite/normal.pal +++ b/graphics/pokemon/vanillite/normal.pal @@ -5,15 +5,15 @@ JASC-PAL 120 136 184 72 80 112 248 248 248 -16 16 16 -160 176 224 -192 200 232 -136 208 240 +0 0 0 +184 184 216 +208 208 232 +160 216 240 120 160 192 -88 144 208 +104 160 232 104 120 160 -32 56 136 -48 88 168 +48 56 96 +64 72 136 40 96 168 32 80 120 0 0 0 diff --git a/graphics/pokemon/vanilluxe/anim_front.png b/graphics/pokemon/vanilluxe/anim_front.png index 1993221f3..c2dc106e7 100644 Binary files a/graphics/pokemon/vanilluxe/anim_front.png and b/graphics/pokemon/vanilluxe/anim_front.png differ diff --git a/graphics/pokemon/vanilluxe/front.png b/graphics/pokemon/vanilluxe/front.png index 7bda2d14e..168c54b67 100644 Binary files a/graphics/pokemon/vanilluxe/front.png and b/graphics/pokemon/vanilluxe/front.png differ diff --git a/graphics/pokemon/vanilluxe/normal.pal b/graphics/pokemon/vanilluxe/normal.pal index 23d54f7ba..8a88dfe3c 100644 --- a/graphics/pokemon/vanilluxe/normal.pal +++ b/graphics/pokemon/vanilluxe/normal.pal @@ -4,16 +4,16 @@ JASC-PAL 152 208 160 120 136 184 248 248 248 -160 176 224 +184 184 216 64 64 112 -16 16 16 +0 0 0 40 96 168 -88 160 216 -192 200 232 -144 208 248 +104 160 232 +208 208 232 +160 216 240 32 64 112 120 160 192 -96 80 152 -144 120 184 +88 72 120 +128 88 168 72 80 112 32 64 112 diff --git a/graphics/pokemon/vaporeon/anim_front.png b/graphics/pokemon/vaporeon/anim_front.png index 40c1f627e..3d7011269 100644 Binary files a/graphics/pokemon/vaporeon/anim_front.png and b/graphics/pokemon/vaporeon/anim_front.png differ diff --git a/graphics/pokemon/vaporeon/front.png b/graphics/pokemon/vaporeon/front.png index 7005e9439..e0e276556 100644 Binary files a/graphics/pokemon/vaporeon/front.png and b/graphics/pokemon/vaporeon/front.png differ diff --git a/graphics/pokemon/vaporeon/normal.pal b/graphics/pokemon/vaporeon/normal.pal index cdbd04274..3655a6b0d 100644 --- a/graphics/pokemon/vaporeon/normal.pal +++ b/graphics/pokemon/vaporeon/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -24 64 88 -32 112 152 -184 176 128 -112 104 64 -128 136 144 +16 72 96 +16 112 144 +184 168 88 +104 96 32 +136 136 136 16 16 16 248 248 248 -248 240 168 -200 208 224 -112 200 224 -152 224 240 -80 160 176 -80 48 120 -120 56 104 -200 112 184 +248 224 160 +200 200 200 +88 192 224 +128 216 248 +64 152 184 +80 16 112 +120 8 40 +208 80 112 diff --git a/graphics/pokemon/venipede/anim_front.png b/graphics/pokemon/venipede/anim_front.png index 7794ee605..27bad5955 100644 Binary files a/graphics/pokemon/venipede/anim_front.png and b/graphics/pokemon/venipede/anim_front.png differ diff --git a/graphics/pokemon/venipede/front.png b/graphics/pokemon/venipede/front.png index c18a74559..ebabe585c 100644 Binary files a/graphics/pokemon/venipede/front.png and b/graphics/pokemon/venipede/front.png differ diff --git a/graphics/pokemon/venipede/normal.pal b/graphics/pokemon/venipede/normal.pal index c4321b3a9..28e4b09d7 100644 --- a/graphics/pokemon/venipede/normal.pal +++ b/graphics/pokemon/venipede/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -96 24 40 +96 32 48 16 16 16 -176 56 88 -128 40 64 -248 152 168 -200 96 112 -32 64 40 -32 40 56 -72 136 96 -56 96 64 -160 104 56 -240 168 80 -0 0 0 +184 48 80 +144 0 64 +248 144 160 +224 96 120 +8 72 56 +48 48 56 +0 144 88 +0 112 56 +184 136 8 +232 176 8 +0 128 255 0 0 0 0 0 0 diff --git a/graphics/pokemon/venomoth/anim_front.png b/graphics/pokemon/venomoth/anim_front.png index 1e7559448..c0c2cd340 100644 Binary files a/graphics/pokemon/venomoth/anim_front.png and b/graphics/pokemon/venomoth/anim_front.png differ diff --git a/graphics/pokemon/venomoth/front.png b/graphics/pokemon/venomoth/front.png index b804c9154..b4eba1b5c 100644 Binary files a/graphics/pokemon/venomoth/front.png and b/graphics/pokemon/venomoth/front.png differ diff --git a/graphics/pokemon/venomoth/normal.pal b/graphics/pokemon/venomoth/normal.pal index deda9413c..2e1ee16bf 100644 --- a/graphics/pokemon/venomoth/normal.pal +++ b/graphics/pokemon/venomoth/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 112 88 120 -176 152 184 +152 136 184 240 216 248 216 192 232 16 16 16 -160 152 208 -64 56 104 -192 184 224 -104 104 160 +208 168 216 +96 72 112 +232 192 248 +152 136 184 248 248 248 184 200 224 -96 80 64 -152 144 144 -200 192 192 +96 80 56 +160 128 120 +192 168 136 224 224 224 diff --git a/graphics/pokemon/venonat/anim_front.png b/graphics/pokemon/venonat/anim_front.png index 619b91818..201b5db4f 100644 Binary files a/graphics/pokemon/venonat/anim_front.png and b/graphics/pokemon/venonat/anim_front.png differ diff --git a/graphics/pokemon/venonat/front.png b/graphics/pokemon/venonat/front.png index 898b4ac40..522f87ef5 100644 Binary files a/graphics/pokemon/venonat/front.png and b/graphics/pokemon/venonat/front.png differ diff --git a/graphics/pokemon/venonat/normal.pal b/graphics/pokemon/venonat/normal.pal index 15dcf048e..42a121e7c 100644 --- a/graphics/pokemon/venonat/normal.pal +++ b/graphics/pokemon/venonat/normal.pal @@ -9,11 +9,11 @@ JASC-PAL 72 64 144 112 112 184 80 24 48 -168 64 120 -216 96 144 -240 128 184 +176 64 88 +232 104 160 +240 144 200 48 48 80 -112 80 64 -216 184 152 -176 144 112 +112 64 40 +232 184 152 +184 144 104 144 136 200 diff --git a/graphics/pokemon/venusaur/anim_front.png b/graphics/pokemon/venusaur/anim_front.png index e814e6278..9ba3e62ad 100644 Binary files a/graphics/pokemon/venusaur/anim_front.png and b/graphics/pokemon/venusaur/anim_front.png differ diff --git a/graphics/pokemon/venusaur/front.png b/graphics/pokemon/venusaur/front.png index 886fe6fa0..0d21e669d 100644 Binary files a/graphics/pokemon/venusaur/front.png and b/graphics/pokemon/venusaur/front.png differ diff --git a/graphics/pokemon/venusaur/normal.pal b/graphics/pokemon/venusaur/normal.pal index 6c5c41d5b..d6751ffe0 100644 --- a/graphics/pokemon/venusaur/normal.pal +++ b/graphics/pokemon/venusaur/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -208 248 184 -88 64 40 -232 176 184 -232 104 120 -184 64 72 -136 104 72 -200 160 80 +248 192 248 +128 48 0 +248 184 184 +248 120 112 +216 64 64 +184 104 48 +216 184 40 16 16 16 -232 192 120 -32 80 80 -80 152 80 -120 192 112 -136 200 200 -72 168 168 -48 128 128 +248 232 80 +16 80 64 +88 152 56 +128 216 120 +88 208 192 +32 176 152 +16 120 104 248 248 248 diff --git a/graphics/pokemon/vespiquen/anim_front.png b/graphics/pokemon/vespiquen/anim_front.png index 80e6e4e2d..abaa335c8 100644 Binary files a/graphics/pokemon/vespiquen/anim_front.png and b/graphics/pokemon/vespiquen/anim_front.png differ diff --git a/graphics/pokemon/vespiquen/front.png b/graphics/pokemon/vespiquen/front.png index 4ba80e4ff..cc731fc7b 100644 Binary files a/graphics/pokemon/vespiquen/front.png and b/graphics/pokemon/vespiquen/front.png differ diff --git a/graphics/pokemon/vespiquen/normal.pal b/graphics/pokemon/vespiquen/normal.pal index d6c43bd44..d806da444 100644 --- a/graphics/pokemon/vespiquen/normal.pal +++ b/graphics/pokemon/vespiquen/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -88 88 104 -176 200 208 +80 88 112 +184 184 208 16 16 16 -48 40 40 -232 248 248 -96 80 32 -72 64 72 -248 184 64 -176 128 32 -224 88 80 -72 48 24 -144 48 48 -232 128 72 -144 80 40 +40 40 40 +232 232 248 +104 88 0 +64 64 72 +248 200 8 +176 136 0 +232 56 56 +104 40 0 +120 48 56 +232 112 0 +168 80 0 128 136 160 diff --git a/graphics/pokemon/vibrava/anim_front.png b/graphics/pokemon/vibrava/anim_front.png index 5cffff36f..553f82207 100644 Binary files a/graphics/pokemon/vibrava/anim_front.png and b/graphics/pokemon/vibrava/anim_front.png differ diff --git a/graphics/pokemon/vibrava/front.png b/graphics/pokemon/vibrava/front.png index c56c6e754..d3dca4c68 100644 Binary files a/graphics/pokemon/vibrava/front.png and b/graphics/pokemon/vibrava/front.png differ diff --git a/graphics/pokemon/vibrava/normal.pal b/graphics/pokemon/vibrava/normal.pal index 11144072b..72ac12b22 100644 --- a/graphics/pokemon/vibrava/normal.pal +++ b/graphics/pokemon/vibrava/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -48 64 56 -16 16 16 -104 120 120 -72 88 80 -40 144 56 -80 184 88 -112 112 80 -176 176 112 -184 184 216 -248 248 248 -224 224 128 -248 248 176 -112 216 120 +57 57 65 +0 0 0 +106 115 115 +74 82 74 +74 148 74 +106 197 106 +115 115 82 +189 172 123 +189 189 222 +255 255 255 +230 213 139 +255 255 164 +148 222 131 0 0 0 0 0 0 diff --git a/graphics/pokemon/victini/anim_front.png b/graphics/pokemon/victini/anim_front.png index 1d037d955..a6b9408ee 100644 Binary files a/graphics/pokemon/victini/anim_front.png and b/graphics/pokemon/victini/anim_front.png differ diff --git a/graphics/pokemon/victini/front.png b/graphics/pokemon/victini/front.png index 8129f758f..6901f6fb3 100644 Binary files a/graphics/pokemon/victini/front.png and b/graphics/pokemon/victini/front.png differ diff --git a/graphics/pokemon/victini/normal.pal b/graphics/pokemon/victini/normal.pal index 9654c51a1..23e9a657e 100644 --- a/graphics/pokemon/victini/normal.pal +++ b/graphics/pokemon/victini/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 168 -120 40 16 -248 112 56 -176 72 32 -16 16 16 -184 160 104 -96 80 56 -248 232 176 -48 40 40 -0 112 184 +152 208 160 +136 48 16 +248 104 24 +184 72 0 +0 0 0 +192 152 88 +104 72 16 +248 224 168 +56 56 56 +56 88 168 248 248 248 192 184 184 -128 192 208 -128 72 104 -224 120 128 -120 104 80 +112 168 248 +160 88 88 +192 112 112 +128 104 56 diff --git a/graphics/pokemon/victreebel/anim_front.png b/graphics/pokemon/victreebel/anim_front.png index 4bdbff1a5..119d4105c 100644 Binary files a/graphics/pokemon/victreebel/anim_front.png and b/graphics/pokemon/victreebel/anim_front.png differ diff --git a/graphics/pokemon/victreebel/back.png b/graphics/pokemon/victreebel/back.png index 9715fcca7..0626c3534 100644 Binary files a/graphics/pokemon/victreebel/back.png and b/graphics/pokemon/victreebel/back.png differ diff --git a/graphics/pokemon/victreebel/front.png b/graphics/pokemon/victreebel/front.png index 257de676a..c87545b1d 100644 Binary files a/graphics/pokemon/victreebel/front.png and b/graphics/pokemon/victreebel/front.png differ diff --git a/graphics/pokemon/victreebel/normal.pal b/graphics/pokemon/victreebel/normal.pal index 39cc05735..fe0893abb 100644 --- a/graphics/pokemon/victreebel/normal.pal +++ b/graphics/pokemon/victreebel/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 0 176 232 -88 72 56 +96 80 40 40 96 40 -136 112 88 +160 120 48 16 16 16 112 208 120 88 160 96 -168 112 104 -240 160 168 +200 104 128 +232 152 168 248 248 248 200 216 208 -192 192 72 +216 184 80 144 152 32 -224 216 72 -248 240 136 -168 176 56 +232 208 104 +240 232 144 +120 40 40 diff --git a/graphics/pokemon/victreebel/shiny.pal b/graphics/pokemon/victreebel/shiny.pal index 8193a9d83..1aac75ff4 100644 --- a/graphics/pokemon/victreebel/shiny.pal +++ b/graphics/pokemon/victreebel/shiny.pal @@ -16,4 +16,4 @@ JASC-PAL 144 152 32 216 248 88 232 248 152 -168 176 56 +0 40 152 diff --git a/graphics/pokemon/vigoroth/anim_front.png b/graphics/pokemon/vigoroth/anim_front.png index 9a394434c..deb372530 100644 Binary files a/graphics/pokemon/vigoroth/anim_front.png and b/graphics/pokemon/vigoroth/anim_front.png differ diff --git a/graphics/pokemon/vigoroth/front.png b/graphics/pokemon/vigoroth/front.png index 4b5669f87..b3840cd1b 100644 Binary files a/graphics/pokemon/vigoroth/front.png and b/graphics/pokemon/vigoroth/front.png differ diff --git a/graphics/pokemon/vigoroth/normal.pal b/graphics/pokemon/vigoroth/normal.pal index 0e6f9968f..f9e53c8d1 100644 --- a/graphics/pokemon/vigoroth/normal.pal +++ b/graphics/pokemon/vigoroth/normal.pal @@ -3,15 +3,15 @@ JASC-PAL 16 152 208 160 104 48 40 -232 96 104 +248 72 88 72 64 64 -152 80 72 +152 64 72 16 16 16 200 200 208 248 248 248 152 120 96 120 96 72 -232 216 216 +224 224 224 136 120 120 88 56 32 160 80 120 diff --git a/graphics/pokemon/vileplume/anim_front.png b/graphics/pokemon/vileplume/anim_front.png index 1b75422cd..f482d7130 100644 Binary files a/graphics/pokemon/vileplume/anim_front.png and b/graphics/pokemon/vileplume/anim_front.png differ diff --git a/graphics/pokemon/vileplume/front.png b/graphics/pokemon/vileplume/front.png index 67ebc9fd3..1a14c31a3 100644 Binary files a/graphics/pokemon/vileplume/front.png and b/graphics/pokemon/vileplume/front.png differ diff --git a/graphics/pokemon/vileplume/normal.pal b/graphics/pokemon/vileplume/normal.pal index 08cb32604..817796bf8 100644 --- a/graphics/pokemon/vileplume/normal.pal +++ b/graphics/pokemon/vileplume/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -152 56 72 -104 32 40 -224 128 144 +192 48 72 +152 56 64 +248 96 96 248 200 208 -200 88 104 +240 48 48 240 168 176 16 16 16 -224 144 88 -144 72 24 +248 160 40 +176 96 32 40 40 40 -200 112 56 +200 144 32 24 40 64 48 72 112 80 112 152 diff --git a/graphics/pokemon/virizion/anim_front.png b/graphics/pokemon/virizion/anim_front.png index 516c9423d..0b7ef3bb8 100644 Binary files a/graphics/pokemon/virizion/anim_front.png and b/graphics/pokemon/virizion/anim_front.png differ diff --git a/graphics/pokemon/virizion/front.png b/graphics/pokemon/virizion/front.png index fa808fc8a..6c1f3a36c 100644 Binary files a/graphics/pokemon/virizion/front.png and b/graphics/pokemon/virizion/front.png differ diff --git a/graphics/pokemon/virizion/normal.pal b/graphics/pokemon/virizion/normal.pal index 9dc688808..a4436e0dd 100644 --- a/graphics/pokemon/virizion/normal.pal +++ b/graphics/pokemon/virizion/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -72 104 48 -40 64 32 -104 136 64 -152 208 96 +153 204 153 +74 98 41 +49 74 41 +98 139 16 +156 205 82 16 16 16 -64 72 80 -120 112 120 -248 136 136 -248 248 248 -104 48 72 -224 232 192 -208 80 96 -168 168 136 -104 104 72 +65 65 74 +106 115 123 +222 115 139 +255 255 255 +123 16 57 +246 246 213 +172 65 106 +172 180 106 +106 106 74 0 0 0 diff --git a/graphics/pokemon/volbeat/anim_front.png b/graphics/pokemon/volbeat/anim_front.png index 429e9b196..b635eae4e 100644 Binary files a/graphics/pokemon/volbeat/anim_front.png and b/graphics/pokemon/volbeat/anim_front.png differ diff --git a/graphics/pokemon/volbeat/front.png b/graphics/pokemon/volbeat/front.png index 11dc67ba3..e4f17ee4d 100644 Binary files a/graphics/pokemon/volbeat/front.png and b/graphics/pokemon/volbeat/front.png differ diff --git a/graphics/pokemon/volbeat/normal.pal b/graphics/pokemon/volbeat/normal.pal index 885328b62..87145254f 100644 --- a/graphics/pokemon/volbeat/normal.pal +++ b/graphics/pokemon/volbeat/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -64 72 64 +72 72 80 16 16 16 216 216 216 -136 136 136 -120 104 56 -224 168 64 -248 224 120 -184 56 64 -136 32 40 -152 168 200 -56 72 104 -112 128 168 -216 88 88 +136 136 144 +136 104 80 +216 176 80 +248 224 80 +200 56 80 +136 48 72 +160 176 192 +72 80 104 +120 136 160 +224 80 96 248 248 248 -240 136 128 +240 128 112 diff --git a/graphics/pokemon/volcarona/anim_front.png b/graphics/pokemon/volcarona/anim_front.png index 9475a4064..a200fe516 100644 Binary files a/graphics/pokemon/volcarona/anim_front.png and b/graphics/pokemon/volcarona/anim_front.png differ diff --git a/graphics/pokemon/volcarona/front.png b/graphics/pokemon/volcarona/front.png index 782ac1276..d36a22a25 100644 Binary files a/graphics/pokemon/volcarona/front.png and b/graphics/pokemon/volcarona/front.png differ diff --git a/graphics/pokemon/volcarona/normal.pal b/graphics/pokemon/volcarona/normal.pal index 4ac0cab8f..a3d2bcfcd 100644 --- a/graphics/pokemon/volcarona/normal.pal +++ b/graphics/pokemon/volcarona/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 64 56 -192 88 80 -96 40 40 -56 48 56 +160 40 8 +192 72 64 +120 32 0 +48 48 56 24 24 32 -240 112 64 -96 88 88 -176 160 152 -232 216 216 -0 112 152 -0 192 240 -56 72 88 -112 152 144 -160 224 224 -80 104 120 +232 112 24 +96 96 96 +176 176 176 +224 224 224 +0 104 160 +0 192 248 +24 80 96 +80 144 152 +144 200 208 +56 112 128 diff --git a/graphics/pokemon/voltorb/anim_front.png b/graphics/pokemon/voltorb/anim_front.png index fcd0ab765..d1928a122 100644 Binary files a/graphics/pokemon/voltorb/anim_front.png and b/graphics/pokemon/voltorb/anim_front.png differ diff --git a/graphics/pokemon/voltorb/front.png b/graphics/pokemon/voltorb/front.png index c87c4dec0..0bf80d9ac 100644 Binary files a/graphics/pokemon/voltorb/front.png and b/graphics/pokemon/voltorb/front.png differ diff --git a/graphics/pokemon/voltorb/normal.pal b/graphics/pokemon/voltorb/normal.pal index f59c1a4d4..d60934515 100644 --- a/graphics/pokemon/voltorb/normal.pal +++ b/graphics/pokemon/voltorb/normal.pal @@ -3,15 +3,15 @@ JASC-PAL 16 152 208 160 16 16 16 -120 48 56 -176 80 88 -224 112 104 -200 80 88 -248 144 144 -232 168 160 +128 16 16 +208 32 72 +240 96 80 +240 56 80 +248 120 120 +248 168 152 200 48 96 -208 216 224 -176 184 200 +216 208 208 +176 168 184 248 248 248 88 80 80 136 128 128 diff --git a/graphics/pokemon/vullaby/anim_front.png b/graphics/pokemon/vullaby/anim_front.png index da73a48bb..4af9402a1 100644 Binary files a/graphics/pokemon/vullaby/anim_front.png and b/graphics/pokemon/vullaby/anim_front.png differ diff --git a/graphics/pokemon/vullaby/front.png b/graphics/pokemon/vullaby/front.png index e4b46f175..a24b2aafb 100644 Binary files a/graphics/pokemon/vullaby/front.png and b/graphics/pokemon/vullaby/front.png differ diff --git a/graphics/pokemon/vullaby/normal.pal b/graphics/pokemon/vullaby/normal.pal index eb0b431a8..9bbe6e037 100644 --- a/graphics/pokemon/vullaby/normal.pal +++ b/graphics/pokemon/vullaby/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -56 48 40 +56 40 40 16 16 16 -88 72 64 -104 56 64 -216 128 144 -152 88 96 +80 64 64 +128 48 64 +224 128 144 +176 80 96 248 248 248 -224 96 88 -136 120 120 -104 88 80 -168 144 112 -240 216 184 -80 64 48 -0 0 0 +200 48 24 +128 120 112 +104 88 88 +176 160 128 +232 232 192 +88 80 56 +104 88 88 0 0 0 diff --git a/graphics/pokemon/vulpix/anim_front.png b/graphics/pokemon/vulpix/anim_front.png index 322b00e4d..2e1f7b084 100644 Binary files a/graphics/pokemon/vulpix/anim_front.png and b/graphics/pokemon/vulpix/anim_front.png differ diff --git a/graphics/pokemon/vulpix/front.png b/graphics/pokemon/vulpix/front.png index 53c4ced44..4de0d78f1 100644 Binary files a/graphics/pokemon/vulpix/front.png and b/graphics/pokemon/vulpix/front.png differ diff --git a/graphics/pokemon/vulpix/normal.pal b/graphics/pokemon/vulpix/normal.pal index 555aff127..acc496df3 100644 --- a/graphics/pokemon/vulpix/normal.pal +++ b/graphics/pokemon/vulpix/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 40 16 -232 136 96 -216 112 64 -176 88 32 +112 32 0 +248 144 88 +216 112 40 +184 72 40 16 16 16 -96 56 48 -168 112 88 -200 136 112 -128 64 40 -184 96 64 +112 48 0 +184 112 88 +224 144 104 +168 88 8 +200 120 40 248 248 248 160 120 112 -128 80 80 -216 192 152 +168 0 0 +240 184 120 0 0 0 diff --git a/graphics/pokemon/wailmer/anim_front.png b/graphics/pokemon/wailmer/anim_front.png index 8d19af603..b2f2a2690 100644 Binary files a/graphics/pokemon/wailmer/anim_front.png and b/graphics/pokemon/wailmer/anim_front.png differ diff --git a/graphics/pokemon/wailmer/front.png b/graphics/pokemon/wailmer/front.png index 457887bdd..3c887adf8 100644 Binary files a/graphics/pokemon/wailmer/front.png and b/graphics/pokemon/wailmer/front.png differ diff --git a/graphics/pokemon/wailmer/normal.pal b/graphics/pokemon/wailmer/normal.pal index d483af0d8..b2007f524 100644 --- a/graphics/pokemon/wailmer/normal.pal +++ b/graphics/pokemon/wailmer/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -32 72 104 -88 160 192 -56 128 176 -16 88 136 -16 40 56 -16 16 16 -168 184 208 -240 216 160 -120 104 56 -248 248 248 -248 240 200 -120 136 168 -168 144 96 -208 184 120 +49 74 115 +98 156 205 +74 131 180 +49 90 148 +32 49 74 +0 0 0 +180 189 197 +238 213 164 +106 98 74 +255 255 255 +255 238 205 +131 139 156 +156 139 98 +205 180 131 0 0 0 diff --git a/graphics/pokemon/wailord/anim_front.png b/graphics/pokemon/wailord/anim_front.png index e0e37ad97..887ecbcf3 100644 Binary files a/graphics/pokemon/wailord/anim_front.png and b/graphics/pokemon/wailord/anim_front.png differ diff --git a/graphics/pokemon/wailord/front.png b/graphics/pokemon/wailord/front.png index aef6d9b8c..9f337fd82 100644 Binary files a/graphics/pokemon/wailord/front.png and b/graphics/pokemon/wailord/front.png differ diff --git a/graphics/pokemon/wailord/normal.pal b/graphics/pokemon/wailord/normal.pal index 6323bf1f4..b6b17ba68 100644 --- a/graphics/pokemon/wailord/normal.pal +++ b/graphics/pokemon/wailord/normal.pal @@ -1,18 +1,18 @@ JASC-PAL 0100 16 -152 208 160 -16 64 96 -24 104 152 +248 248 192 +40 56 152 +16 80 200 8 40 64 -64 168 224 -184 176 168 -104 96 88 -32 136 192 -152 144 136 -168 208 240 +88 128 240 +216 208 224 +128 112 128 +32 112 224 +176 168 176 +144 176 248 56 48 48 -224 208 200 +240 232 248 24 24 24 0 0 0 0 0 0 diff --git a/graphics/pokemon/walrein/anim_front.png b/graphics/pokemon/walrein/anim_front.png index d434f35d4..9a087634e 100644 Binary files a/graphics/pokemon/walrein/anim_front.png and b/graphics/pokemon/walrein/anim_front.png differ diff --git a/graphics/pokemon/walrein/front.png b/graphics/pokemon/walrein/front.png index 3ca4a3d41..7dc56050a 100644 Binary files a/graphics/pokemon/walrein/front.png and b/graphics/pokemon/walrein/front.png differ diff --git a/graphics/pokemon/walrein/normal.pal b/graphics/pokemon/walrein/normal.pal index cd33fcf12..dc70970eb 100644 --- a/graphics/pokemon/walrein/normal.pal +++ b/graphics/pokemon/walrein/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -32 72 96 -16 16 16 -160 208 240 -32 120 160 -248 248 248 -192 224 240 -128 176 208 -160 136 88 -248 216 120 -80 144 176 -224 192 136 -248 224 168 -168 104 128 -232 160 176 +248 192 192 +40 72 104 +0 0 0 +160 192 216 +48 120 160 +248 248 248 +192 208 248 +96 168 200 +160 128 88 +240 160 104 +64 144 192 +248 216 128 +248 248 160 +200 80 128 +232 152 176 0 0 0 diff --git a/graphics/pokemon/wartortle/anim_front.png b/graphics/pokemon/wartortle/anim_front.png index 1480f5f80..a732c60db 100644 Binary files a/graphics/pokemon/wartortle/anim_front.png and b/graphics/pokemon/wartortle/anim_front.png differ diff --git a/graphics/pokemon/wartortle/back.png b/graphics/pokemon/wartortle/back.png index 3e47971cf..9bb691ccb 100644 Binary files a/graphics/pokemon/wartortle/back.png and b/graphics/pokemon/wartortle/back.png differ diff --git a/graphics/pokemon/wartortle/front.png b/graphics/pokemon/wartortle/front.png index ee548702f..8a5639d01 100644 Binary files a/graphics/pokemon/wartortle/front.png and b/graphics/pokemon/wartortle/front.png differ diff --git a/graphics/pokemon/wartortle/normal.pal b/graphics/pokemon/wartortle/normal.pal index ff42ae4d4..9c3c1d6f5 100644 --- a/graphics/pokemon/wartortle/normal.pal +++ b/graphics/pokemon/wartortle/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 153 210 164 -152 174 220 -255 255 255 +136 168 248 +248 248 248 16 16 16 -171 208 219 -43 82 136 -85 137 200 -218 235 242 -192 205 235 -80 46 39 -145 112 87 -204 182 140 -49 65 74 -255 239 206 -145 112 87 -184 157 137 +192 200 232 +40 80 136 +96 120 200 +216 240 248 +172 200 248 +80 48 40 +144 112 88 +200 184 144 +48 64 72 +248 240 208 +200 48 0 +152 128 72 diff --git a/graphics/pokemon/wartortle/shiny.pal b/graphics/pokemon/wartortle/shiny.pal index 39b77faec..b8ca2cfbc 100644 --- a/graphics/pokemon/wartortle/shiny.pal +++ b/graphics/pokemon/wartortle/shiny.pal @@ -15,5 +15,5 @@ JASC-PAL 222 164 65 65 65 82 246 213 123 -164 98 32 -156 197 49 +192 24 0 +136 96 24 diff --git a/graphics/pokemon/watchog/anim_front.png b/graphics/pokemon/watchog/anim_front.png index 21bddd3c8..c47a88e1b 100644 Binary files a/graphics/pokemon/watchog/anim_front.png and b/graphics/pokemon/watchog/anim_front.png differ diff --git a/graphics/pokemon/watchog/front.png b/graphics/pokemon/watchog/front.png index 58affb580..82cfc39e5 100644 Binary files a/graphics/pokemon/watchog/front.png and b/graphics/pokemon/watchog/front.png differ diff --git a/graphics/pokemon/watchog/normal.pal b/graphics/pokemon/watchog/normal.pal index 2dcff58a5..282e96789 100644 --- a/graphics/pokemon/watchog/normal.pal +++ b/graphics/pokemon/watchog/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -144 128 120 +128 128 128 248 248 248 -80 40 32 -144 72 56 -200 184 176 +88 40 56 +144 56 56 +184 184 184 +56 56 56 168 48 48 -64 56 64 -232 72 72 +240 72 72 240 176 40 128 120 96 -216 192 160 -176 152 128 -112 40 40 -184 128 32 +208 184 144 +176 152 112 +112 48 64 +184 128 64 diff --git a/graphics/pokemon/weavile/anim_front.png b/graphics/pokemon/weavile/anim_front.png index a09dde1ff..c98cdf564 100644 Binary files a/graphics/pokemon/weavile/anim_front.png and b/graphics/pokemon/weavile/anim_front.png differ diff --git a/graphics/pokemon/weavile/front.png b/graphics/pokemon/weavile/front.png index 6f8da6525..90ad62cb9 100644 Binary files a/graphics/pokemon/weavile/front.png and b/graphics/pokemon/weavile/front.png differ diff --git a/graphics/pokemon/weavile/normal.pal b/graphics/pokemon/weavile/normal.pal index 8e81acac3..4577a2702 100644 --- a/graphics/pokemon/weavile/normal.pal +++ b/graphics/pokemon/weavile/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -176 40 80 -112 24 40 -240 72 104 +192 40 112 +128 32 80 +240 80 112 240 128 128 104 96 120 192 184 200 16 16 16 248 248 248 -136 128 168 -72 80 112 +112 128 184 +64 72 128 96 112 152 -40 40 64 +40 48 80 240 208 80 176 136 56 72 80 104 diff --git a/graphics/pokemon/weedle/anim_front.png b/graphics/pokemon/weedle/anim_front.png index 16b95eaa6..34dc029e2 100644 Binary files a/graphics/pokemon/weedle/anim_front.png and b/graphics/pokemon/weedle/anim_front.png differ diff --git a/graphics/pokemon/weedle/front.png b/graphics/pokemon/weedle/front.png index 329f69e22..7c0d01400 100644 Binary files a/graphics/pokemon/weedle/front.png and b/graphics/pokemon/weedle/front.png differ diff --git a/graphics/pokemon/weedle/normal.pal b/graphics/pokemon/weedle/normal.pal index eefe5e0dd..a42d955fb 100644 --- a/graphics/pokemon/weedle/normal.pal +++ b/graphics/pokemon/weedle/normal.pal @@ -6,14 +6,14 @@ JASC-PAL 248 248 248 88 88 96 192 192 192 -128 88 48 -208 160 96 -168 112 64 -80 56 32 -224 192 160 +144 88 8 +232 168 64 +200 112 16 +104 56 8 +248 208 120 24 24 24 -152 72 104 -216 112 152 -232 184 208 -0 0 0 +144 64 112 +232 120 184 +248 176 224 +248 216 200 0 0 0 diff --git a/graphics/pokemon/weepinbell/anim_front.png b/graphics/pokemon/weepinbell/anim_front.png index e182c3582..d33c4aa59 100644 Binary files a/graphics/pokemon/weepinbell/anim_front.png and b/graphics/pokemon/weepinbell/anim_front.png differ diff --git a/graphics/pokemon/weepinbell/back.png b/graphics/pokemon/weepinbell/back.png index b4745775c..1f9ccd1a9 100644 Binary files a/graphics/pokemon/weepinbell/back.png and b/graphics/pokemon/weepinbell/back.png differ diff --git a/graphics/pokemon/weepinbell/front.png b/graphics/pokemon/weepinbell/front.png index 10cba75a7..c381e5332 100644 Binary files a/graphics/pokemon/weepinbell/front.png and b/graphics/pokemon/weepinbell/front.png differ diff --git a/graphics/pokemon/weepinbell/normal.pal b/graphics/pokemon/weepinbell/normal.pal index d489fda44..bf05a1549 100644 --- a/graphics/pokemon/weepinbell/normal.pal +++ b/graphics/pokemon/weepinbell/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 0 176 232 -40 96 40 -88 160 96 -160 216 120 -96 88 72 -160 136 112 +8 88 48 +56 168 88 +152 216 128 +96 72 48 +160 120 48 16 16 16 -248 240 160 -240 232 80 -136 192 104 -200 192 72 -152 168 48 +248 240 168 +248 224 104 +104 192 80 +208 192 80 +120 40 40 248 248 248 -144 72 104 -232 168 176 -192 136 128 +176 64 72 +232 152 168 +200 104 128 diff --git a/graphics/pokemon/weepinbell/shiny.pal b/graphics/pokemon/weepinbell/shiny.pal index 700a346af..87c68f5b2 100644 --- a/graphics/pokemon/weepinbell/shiny.pal +++ b/graphics/pokemon/weepinbell/shiny.pal @@ -12,7 +12,7 @@ JASC-PAL 216 248 88 184 224 64 184 200 56 -152 168 48 +144 88 104 248 248 248 152 104 120 232 200 208 diff --git a/graphics/pokemon/weezing/anim_front.png b/graphics/pokemon/weezing/anim_front.png index bcbed2919..95a9ba30f 100644 Binary files a/graphics/pokemon/weezing/anim_front.png and b/graphics/pokemon/weezing/anim_front.png differ diff --git a/graphics/pokemon/weezing/front.png b/graphics/pokemon/weezing/front.png index 1b5aba9c9..3ea4fb6dd 100644 Binary files a/graphics/pokemon/weezing/front.png and b/graphics/pokemon/weezing/front.png differ diff --git a/graphics/pokemon/weezing/normal.pal b/graphics/pokemon/weezing/normal.pal index 3c8be4dec..6ef5ecad9 100644 --- a/graphics/pokemon/weezing/normal.pal +++ b/graphics/pokemon/weezing/normal.pal @@ -5,15 +5,15 @@ JASC-PAL 184 184 136 216 216 184 152 152 96 -120 96 128 -168 144 200 -88 64 80 -144 120 168 -192 184 216 +128 88 136 +184 136 200 +96 48 120 +160 104 176 +208 160 216 16 16 16 248 248 248 -192 192 208 -208 192 176 -160 144 136 -136 88 88 -200 120 136 +184 184 184 +208 208 176 +168 160 80 +152 80 96 +208 112 128 diff --git a/graphics/pokemon/whimsicott/anim_front.png b/graphics/pokemon/whimsicott/anim_front.png index 4b463db3a..07001cccd 100644 Binary files a/graphics/pokemon/whimsicott/anim_front.png and b/graphics/pokemon/whimsicott/anim_front.png differ diff --git a/graphics/pokemon/whimsicott/front.png b/graphics/pokemon/whimsicott/front.png index becc3c286..013719675 100644 Binary files a/graphics/pokemon/whimsicott/front.png and b/graphics/pokemon/whimsicott/front.png differ diff --git a/graphics/pokemon/whimsicott/normal.pal b/graphics/pokemon/whimsicott/normal.pal index 3a8406a84..cce64c2b2 100644 --- a/graphics/pokemon/whimsicott/normal.pal +++ b/graphics/pokemon/whimsicott/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -144 128 96 -96 80 64 -248 240 200 -184 176 136 +172 148 90 +106 90 65 +230 222 205 +197 180 139 16 16 16 -32 80 40 -56 128 64 -80 184 104 -168 128 96 -64 48 40 -192 96 48 -128 96 72 -248 248 248 -248 152 96 -184 96 96 +24 74 24 +65 123 65 +82 164 74 +148 106 65 +82 57 41 +172 106 16 +115 82 65 +255 255 255 +230 131 0 +172 74 98 diff --git a/graphics/pokemon/whirlipede/anim_front.png b/graphics/pokemon/whirlipede/anim_front.png index 5ff49d921..de69698e2 100644 Binary files a/graphics/pokemon/whirlipede/anim_front.png and b/graphics/pokemon/whirlipede/anim_front.png differ diff --git a/graphics/pokemon/whirlipede/front.png b/graphics/pokemon/whirlipede/front.png index 92f12ebaa..624335082 100644 Binary files a/graphics/pokemon/whirlipede/front.png and b/graphics/pokemon/whirlipede/front.png differ diff --git a/graphics/pokemon/whirlipede/normal.pal b/graphics/pokemon/whirlipede/normal.pal index 59a3b2795..3a0db5c8e 100644 --- a/graphics/pokemon/whirlipede/normal.pal +++ b/graphics/pokemon/whirlipede/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -72 64 96 -120 112 152 -16 16 16 -152 152 184 -208 112 120 -192 80 104 -72 72 80 -56 48 56 -32 32 32 -88 88 120 -176 120 64 -240 184 112 -144 72 96 -136 48 64 +88 72 96 +128 112 152 +0 0 0 +168 144 192 +184 80 144 +192 24 88 +64 64 80 +48 48 56 +40 40 40 +112 96 120 +224 168 16 +248 248 0 +144 56 112 +160 0 80 0 0 0 diff --git a/graphics/pokemon/whiscash/anim_front.png b/graphics/pokemon/whiscash/anim_front.png index 04ce0e89e..b11b3a8a7 100644 Binary files a/graphics/pokemon/whiscash/anim_front.png and b/graphics/pokemon/whiscash/anim_front.png differ diff --git a/graphics/pokemon/whiscash/front.png b/graphics/pokemon/whiscash/front.png index bfa4b5cbe..d62e69f3c 100644 Binary files a/graphics/pokemon/whiscash/front.png and b/graphics/pokemon/whiscash/front.png differ diff --git a/graphics/pokemon/whiscash/normal.pal b/graphics/pokemon/whiscash/normal.pal index aaad3dab8..2aee971e4 100644 --- a/graphics/pokemon/whiscash/normal.pal +++ b/graphics/pokemon/whiscash/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -192 160 96 -240 208 144 -112 96 56 -8 24 56 -32 48 112 -136 208 240 -96 168 216 -16 16 16 -96 104 168 -64 80 128 +192 160 64 +240 216 88 +104 88 64 +40 48 72 +56 72 152 +128 216 248 +112 168 224 +0 0 0 +96 120 200 +64 96 176 168 176 128 96 128 184 120 176 224 248 248 248 -153 100 125 +192 64 32 diff --git a/graphics/pokemon/whismur/anim_front.png b/graphics/pokemon/whismur/anim_front.png index 7fd9b5962..098910d89 100644 Binary files a/graphics/pokemon/whismur/anim_front.png and b/graphics/pokemon/whismur/anim_front.png differ diff --git a/graphics/pokemon/whismur/front.png b/graphics/pokemon/whismur/front.png index 5c6ef0e1c..3a4c69d47 100644 Binary files a/graphics/pokemon/whismur/front.png and b/graphics/pokemon/whismur/front.png differ diff --git a/graphics/pokemon/whismur/normal.pal b/graphics/pokemon/whismur/normal.pal index a1e8740ff..fbbff8610 100644 --- a/graphics/pokemon/whismur/normal.pal +++ b/graphics/pokemon/whismur/normal.pal @@ -2,16 +2,16 @@ JASC-PAL 0100 16 152 208 160 -128 80 120 -232 184 224 -208 144 200 -248 200 104 -152 112 48 -248 224 144 -192 152 80 -16 16 16 -168 112 160 -184 96 120 +128 64 104 +232 168 224 +208 128 200 +248 200 64 +160 112 24 +248 224 136 +208 152 0 +0 0 0 +168 80 160 +200 64 112 240 200 240 0 0 0 0 0 0 diff --git a/graphics/pokemon/wigglytuff/anim_front.png b/graphics/pokemon/wigglytuff/anim_front.png index 1fd7706d9..01ffab90d 100644 Binary files a/graphics/pokemon/wigglytuff/anim_front.png and b/graphics/pokemon/wigglytuff/anim_front.png differ diff --git a/graphics/pokemon/wigglytuff/front.png b/graphics/pokemon/wigglytuff/front.png index 89d83fa5c..26ab75305 100644 Binary files a/graphics/pokemon/wigglytuff/front.png and b/graphics/pokemon/wigglytuff/front.png differ diff --git a/graphics/pokemon/wigglytuff/normal.pal b/graphics/pokemon/wigglytuff/normal.pal index 143b2f466..ff6efc68a 100644 --- a/graphics/pokemon/wigglytuff/normal.pal +++ b/graphics/pokemon/wigglytuff/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -120 72 88 +136 64 64 248 248 248 -104 104 112 -224 216 232 +112 112 112 +224 216 224 16 16 16 -248 192 200 -208 144 160 -176 112 136 -248 224 224 -16 144 160 -0 104 136 -72 200 216 -96 40 72 -184 112 136 +248 168 184 +240 120 144 +200 104 96 +248 216 200 +24 112 192 +16 72 136 +16 176 232 +112 64 24 +224 48 48 0 0 0 diff --git a/graphics/pokemon/wingull/anim_front.png b/graphics/pokemon/wingull/anim_front.png index cb83f46af..8580fac15 100644 Binary files a/graphics/pokemon/wingull/anim_front.png and b/graphics/pokemon/wingull/anim_front.png differ diff --git a/graphics/pokemon/wingull/front.png b/graphics/pokemon/wingull/front.png index b0a797561..dc5fe2e80 100644 Binary files a/graphics/pokemon/wingull/front.png and b/graphics/pokemon/wingull/front.png differ diff --git a/graphics/pokemon/wingull/normal.pal b/graphics/pokemon/wingull/normal.pal index b98bdbac8..445b41db6 100644 --- a/graphics/pokemon/wingull/normal.pal +++ b/graphics/pokemon/wingull/normal.pal @@ -6,14 +6,14 @@ JASC-PAL 0 0 0 248 248 248 192 208 232 -32 112 136 -120 200 240 -40 168 208 +40 104 144 +112 168 248 +48 152 208 128 144 144 -144 80 24 -232 168 120 +136 80 16 +248 168 48 48 48 48 -208 128 64 +216 128 0 176 168 192 64 72 64 155 90 110 diff --git a/graphics/pokemon/wobbuffet/anim_front.png b/graphics/pokemon/wobbuffet/anim_front.png index 358a507e5..e5ca905e0 100644 Binary files a/graphics/pokemon/wobbuffet/anim_front.png and b/graphics/pokemon/wobbuffet/anim_front.png differ diff --git a/graphics/pokemon/wobbuffet/front.png b/graphics/pokemon/wobbuffet/front.png index 9034d9ec5..a8efd17ef 100644 Binary files a/graphics/pokemon/wobbuffet/front.png and b/graphics/pokemon/wobbuffet/front.png differ diff --git a/graphics/pokemon/wobbuffet/normal.pal b/graphics/pokemon/wobbuffet/normal.pal index 8a15d7851..de342b751 100644 --- a/graphics/pokemon/wobbuffet/normal.pal +++ b/graphics/pokemon/wobbuffet/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -64 136 168 -32 88 112 -112 192 224 -72 168 216 -160 224 240 +32 128 200 +32 80 136 +128 192 240 +72 168 224 +168 224 248 16 16 16 -128 72 80 -184 96 96 -224 120 120 -48 48 56 -88 88 88 +160 56 56 +184 80 80 +208 96 96 +80 80 80 +128 128 128 248 248 248 -168 168 168 +192 192 192 0 0 0 0 0 0 diff --git a/graphics/pokemon/woobat/anim_front.png b/graphics/pokemon/woobat/anim_front.png index 3c198e33f..675498484 100644 Binary files a/graphics/pokemon/woobat/anim_front.png and b/graphics/pokemon/woobat/anim_front.png differ diff --git a/graphics/pokemon/woobat/front.png b/graphics/pokemon/woobat/front.png index 0769f47fd..793607dc8 100644 Binary files a/graphics/pokemon/woobat/front.png and b/graphics/pokemon/woobat/front.png differ diff --git a/graphics/pokemon/woobat/normal.pal b/graphics/pokemon/woobat/normal.pal index 313df4625..9092ac11f 100644 --- a/graphics/pokemon/woobat/normal.pal +++ b/graphics/pokemon/woobat/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 24 24 32 -48 40 40 +40 40 48 16 16 16 -80 72 72 -72 104 112 +64 72 88 +72 104 120 168 216 240 -128 184 208 -112 144 152 -120 72 72 -232 160 152 -200 112 120 +112 168 192 +104 144 168 +128 24 56 +240 168 176 +192 104 120 248 248 248 112 112 112 -232 128 136 -120 72 72 +200 40 64 +136 72 80 diff --git a/graphics/pokemon/wooper/anim_front.png b/graphics/pokemon/wooper/anim_front.png index 2ade34d3e..7e35c55c0 100644 Binary files a/graphics/pokemon/wooper/anim_front.png and b/graphics/pokemon/wooper/anim_front.png differ diff --git a/graphics/pokemon/wooper/back.png b/graphics/pokemon/wooper/back.png index b8d50ba58..1e33cd094 100644 Binary files a/graphics/pokemon/wooper/back.png and b/graphics/pokemon/wooper/back.png differ diff --git a/graphics/pokemon/wooper/front.png b/graphics/pokemon/wooper/front.png index 0d74723f0..ad14f25b2 100644 Binary files a/graphics/pokemon/wooper/front.png and b/graphics/pokemon/wooper/front.png differ diff --git a/graphics/pokemon/wooper/normal.pal b/graphics/pokemon/wooper/normal.pal index e047dfb4a..0fffdb9e5 100644 --- a/graphics/pokemon/wooper/normal.pal +++ b/graphics/pokemon/wooper/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -144 96 120 -208 152 168 -104 56 80 -88 128 152 -96 152 176 -184 216 232 -120 192 224 -184 120 160 +144 96 160 +232 112 224 +96 56 104 +56 120 192 +80 152 224 +152 208 240 +112 184 248 +208 88 208 16 16 16 248 248 248 -48 88 128 -32 48 88 -142 84 82 -224 123 123 +16 72 128 +16 40 112 +168 16 0 +232 64 48 0 0 0 diff --git a/graphics/pokemon/wormadam/anim_front.png b/graphics/pokemon/wormadam/anim_front.png index 9c65c439e..ebd471034 100644 Binary files a/graphics/pokemon/wormadam/anim_front.png and b/graphics/pokemon/wormadam/anim_front.png differ diff --git a/graphics/pokemon/wormadam/front.png b/graphics/pokemon/wormadam/front.png index aa19c6c1b..575460ac0 100644 Binary files a/graphics/pokemon/wormadam/front.png and b/graphics/pokemon/wormadam/front.png differ diff --git a/graphics/pokemon/wormadam/normal.pal b/graphics/pokemon/wormadam/normal.pal index 4ef4c830d..fbc868775 100644 --- a/graphics/pokemon/wormadam/normal.pal +++ b/graphics/pokemon/wormadam/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -88 88 96 -56 56 56 -136 136 120 -32 88 64 -16 56 32 -56 136 96 -232 240 224 -72 112 48 -168 184 120 -112 160 80 -40 72 32 +90 90 90 +57 57 65 +115 123 106 +57 82 65 +41 49 57 +74 115 74 +255 255 255 +82 115 65 +172 189 123 +123 156 74 +49 74 57 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/wormadam/sandy_cloak/anim_front.png b/graphics/pokemon/wormadam/sandy_cloak/anim_front.png index 7410c9ad2..51990c1a3 100644 Binary files a/graphics/pokemon/wormadam/sandy_cloak/anim_front.png and b/graphics/pokemon/wormadam/sandy_cloak/anim_front.png differ diff --git a/graphics/pokemon/wormadam/sandy_cloak/front.png b/graphics/pokemon/wormadam/sandy_cloak/front.png index ecf9b7964..5d08516fd 100644 Binary files a/graphics/pokemon/wormadam/sandy_cloak/front.png and b/graphics/pokemon/wormadam/sandy_cloak/front.png differ diff --git a/graphics/pokemon/wormadam/sandy_cloak/normal.pal b/graphics/pokemon/wormadam/sandy_cloak/normal.pal index 009475503..0c3aeb435 100644 --- a/graphics/pokemon/wormadam/sandy_cloak/normal.pal +++ b/graphics/pokemon/wormadam/sandy_cloak/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -88 88 96 -56 56 56 -136 136 120 -56 48 24 -168 136 88 -120 88 48 -176 160 112 -248 248 248 -160 64 56 -232 208 136 -96 96 80 -232 112 88 -120 120 88 +90 90 90 +57 57 65 +115 123 106 +57 49 49 +164 123 90 +98 74 57 +172 148 115 +255 255 255 +139 74 57 +213 197 115 +98 82 82 +238 115 82 +131 115 98 0 0 0 diff --git a/graphics/pokemon/wormadam/trash_cloak/anim_front.png b/graphics/pokemon/wormadam/trash_cloak/anim_front.png index cdaa7fb02..d0b41b9df 100644 Binary files a/graphics/pokemon/wormadam/trash_cloak/anim_front.png and b/graphics/pokemon/wormadam/trash_cloak/anim_front.png differ diff --git a/graphics/pokemon/wormadam/trash_cloak/front.png b/graphics/pokemon/wormadam/trash_cloak/front.png index 48670cbf8..a15ba6b90 100644 Binary files a/graphics/pokemon/wormadam/trash_cloak/front.png and b/graphics/pokemon/wormadam/trash_cloak/front.png differ diff --git a/graphics/pokemon/wormadam/trash_cloak/normal.pal b/graphics/pokemon/wormadam/trash_cloak/normal.pal index 707910aec..9035a0f64 100644 --- a/graphics/pokemon/wormadam/trash_cloak/normal.pal +++ b/graphics/pokemon/wormadam/trash_cloak/normal.pal @@ -3,16 +3,16 @@ JASC-PAL 16 152 208 160 16 16 16 -88 88 96 -56 56 56 -136 136 120 -88 40 80 -192 96 160 -152 64 128 -112 64 80 -176 96 104 -248 248 248 -240 144 144 +90 90 90 +57 57 65 +115 123 106 +82 57 74 +197 90 156 +131 74 115 +123 74 90 +180 106 123 +255 255 255 +238 148 156 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/wurmple/anim_front.png b/graphics/pokemon/wurmple/anim_front.png index 86444326c..d214a22e5 100644 Binary files a/graphics/pokemon/wurmple/anim_front.png and b/graphics/pokemon/wurmple/anim_front.png differ diff --git a/graphics/pokemon/wurmple/front.png b/graphics/pokemon/wurmple/front.png index 8022d2852..bad155a3d 100644 Binary files a/graphics/pokemon/wurmple/front.png and b/graphics/pokemon/wurmple/front.png differ diff --git a/graphics/pokemon/wurmple/normal.pal b/graphics/pokemon/wurmple/normal.pal index 15795c06f..5710cd179 100644 --- a/graphics/pokemon/wurmple/normal.pal +++ b/graphics/pokemon/wurmple/normal.pal @@ -2,17 +2,17 @@ JASC-PAL 0100 16 152 208 160 -184 64 72 -232 120 128 -112 32 48 -216 72 80 +216 40 80 +248 96 104 +128 40 40 +232 48 88 0 0 0 -184 152 96 -104 88 48 -248 224 128 -104 96 72 -232 216 200 -176 168 136 +184 136 72 +120 96 56 +248 224 112 +112 104 88 +224 224 200 +192 168 144 96 112 112 248 248 248 200 208 216 diff --git a/graphics/pokemon/wynaut/anim_front.png b/graphics/pokemon/wynaut/anim_front.png index 7239c2372..3dad81357 100644 Binary files a/graphics/pokemon/wynaut/anim_front.png and b/graphics/pokemon/wynaut/anim_front.png differ diff --git a/graphics/pokemon/wynaut/front.png b/graphics/pokemon/wynaut/front.png index 0da52676a..197d67fdf 100644 Binary files a/graphics/pokemon/wynaut/front.png and b/graphics/pokemon/wynaut/front.png differ diff --git a/graphics/pokemon/wynaut/normal.pal b/graphics/pokemon/wynaut/normal.pal index 4c5f2c233..832ce361e 100644 --- a/graphics/pokemon/wynaut/normal.pal +++ b/graphics/pokemon/wynaut/normal.pal @@ -2,15 +2,15 @@ JASC-PAL 0100 16 152 208 160 -48 80 88 -48 128 136 -184 224 232 -104 192 200 -16 16 16 -72 160 168 -160 64 64 +56 80 96 +56 120 160 +152 208 232 +104 184 216 +0 0 0 +72 152 184 +160 48 64 120 40 56 -240 136 128 +216 88 96 128 120 120 200 200 192 0 0 0 diff --git a/graphics/pokemon/xatu/anim_front.png b/graphics/pokemon/xatu/anim_front.png index 3ce8a4a3c..b6968e775 100644 Binary files a/graphics/pokemon/xatu/anim_front.png and b/graphics/pokemon/xatu/anim_front.png differ diff --git a/graphics/pokemon/xatu/front.png b/graphics/pokemon/xatu/front.png index 58def347f..93c794763 100644 Binary files a/graphics/pokemon/xatu/front.png and b/graphics/pokemon/xatu/front.png differ diff --git a/graphics/pokemon/xatu/normal.pal b/graphics/pokemon/xatu/normal.pal index 26b002db4..eb20bf6ae 100644 --- a/graphics/pokemon/xatu/normal.pal +++ b/graphics/pokemon/xatu/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 0 176 232 -104 152 48 -144 216 80 -72 104 40 -208 136 24 -120 184 48 -248 184 80 -120 88 32 +72 144 64 +144 208 64 +40 104 40 +176 136 32 +112 184 64 +248 184 48 +136 88 0 16 16 16 248 248 248 144 144 144 -64 64 64 -112 16 40 -152 40 64 -192 208 208 -232 64 88 +80 80 80 +128 40 0 +176 48 0 +200 200 200 +232 56 0 diff --git a/graphics/pokemon/yamask/anim_front.png b/graphics/pokemon/yamask/anim_front.png index 7b297063f..daf3ec638 100644 Binary files a/graphics/pokemon/yamask/anim_front.png and b/graphics/pokemon/yamask/anim_front.png differ diff --git a/graphics/pokemon/yamask/front.png b/graphics/pokemon/yamask/front.png index 58e6e3cd2..28a564b55 100644 Binary files a/graphics/pokemon/yamask/front.png and b/graphics/pokemon/yamask/front.png differ diff --git a/graphics/pokemon/yamask/normal.pal b/graphics/pokemon/yamask/normal.pal index fa4586573..7ce969a07 100644 --- a/graphics/pokemon/yamask/normal.pal +++ b/graphics/pokemon/yamask/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -56 48 56 -80 80 88 +48 48 48 +80 80 80 16 16 16 -112 40 32 -216 64 64 +168 0 0 +248 0 0 88 0 0 -120 80 40 -248 200 128 -232 176 88 -168 120 64 +136 88 32 +248 216 120 +240 168 40 +200 128 16 216 216 216 -0 0 0 +48 48 48 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/yanma/anim_front.png b/graphics/pokemon/yanma/anim_front.png index 63821296b..cc4df48ea 100644 Binary files a/graphics/pokemon/yanma/anim_front.png and b/graphics/pokemon/yanma/anim_front.png differ diff --git a/graphics/pokemon/yanma/front.png b/graphics/pokemon/yanma/front.png index cd4239010..54d4f54cd 100644 Binary files a/graphics/pokemon/yanma/front.png and b/graphics/pokemon/yanma/front.png differ diff --git a/graphics/pokemon/yanma/normal.pal b/graphics/pokemon/yanma/normal.pal index 8d5f8f9f3..6912eb837 100644 --- a/graphics/pokemon/yanma/normal.pal +++ b/graphics/pokemon/yanma/normal.pal @@ -5,15 +5,15 @@ JASC-PAL 192 208 232 144 168 184 224 248 248 -248 168 128 -96 24 16 -224 80 64 +248 184 152 +120 48 0 +248 80 80 16 16 16 -168 48 24 -232 128 112 -56 72 32 -120 192 56 -96 136 48 -160 216 104 -120 120 152 -80 80 96 +192 64 56 +248 136 96 +56 88 40 +168 208 80 +96 152 48 +208 240 128 +104 120 128 +72 72 80 diff --git a/graphics/pokemon/yanmega/anim_front.png b/graphics/pokemon/yanmega/anim_front.png index 523fb4f73..d50d34b73 100644 Binary files a/graphics/pokemon/yanmega/anim_front.png and b/graphics/pokemon/yanmega/anim_front.png differ diff --git a/graphics/pokemon/yanmega/front.png b/graphics/pokemon/yanmega/front.png index 11000dea1..943aa095a 100644 Binary files a/graphics/pokemon/yanmega/front.png and b/graphics/pokemon/yanmega/front.png differ diff --git a/graphics/pokemon/yanmega/normal.pal b/graphics/pokemon/yanmega/normal.pal index 5c85bb6ee..f7758fee8 100644 --- a/graphics/pokemon/yanmega/normal.pal +++ b/graphics/pokemon/yanmega/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -176 56 48 -224 104 96 -104 32 32 -184 184 160 -248 248 248 -72 64 64 -136 120 120 -16 16 16 -224 224 192 -32 48 24 -128 160 104 -96 120 64 -64 80 40 -40 40 48 +176 48 24 +240 88 80 +112 48 0 160 168 192 +248 248 248 +72 72 80 +120 120 128 +16 16 16 +192 200 224 +32 56 24 +112 152 96 +80 128 72 +56 88 40 +40 40 48 +0 0 0 diff --git a/graphics/pokemon/zangoose/anim_front.png b/graphics/pokemon/zangoose/anim_front.png index 1e431929b..a7a863feb 100644 Binary files a/graphics/pokemon/zangoose/anim_front.png and b/graphics/pokemon/zangoose/anim_front.png differ diff --git a/graphics/pokemon/zangoose/front.png b/graphics/pokemon/zangoose/front.png index 37b418a10..d9640b842 100644 Binary files a/graphics/pokemon/zangoose/front.png and b/graphics/pokemon/zangoose/front.png differ diff --git a/graphics/pokemon/zangoose/normal.pal b/graphics/pokemon/zangoose/normal.pal index 6d0fd5ca5..dd141c40f 100644 --- a/graphics/pokemon/zangoose/normal.pal +++ b/graphics/pokemon/zangoose/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 144 144 +139 148 148 16 16 16 -248 248 248 -136 40 56 -200 208 240 -176 56 80 -232 80 96 -88 96 112 -136 152 200 -224 96 136 -176 176 208 -248 136 168 -64 56 56 -120 104 104 -176 168 160 +255 255 255 +148 41 49 +205 222 246 +180 57 82 +230 74 106 +90 98 98 +139 156 205 +230 98 139 +172 180 205 +255 131 164 +41 49 49 +90 98 98 +139 148 148 diff --git a/graphics/pokemon/zapdos/anim_front.png b/graphics/pokemon/zapdos/anim_front.png index 730db559b..1c0c87904 100644 Binary files a/graphics/pokemon/zapdos/anim_front.png and b/graphics/pokemon/zapdos/anim_front.png differ diff --git a/graphics/pokemon/zapdos/front.png b/graphics/pokemon/zapdos/front.png index c2bddd8d4..c88ae03a3 100644 Binary files a/graphics/pokemon/zapdos/front.png and b/graphics/pokemon/zapdos/front.png differ diff --git a/graphics/pokemon/zapdos/normal.pal b/graphics/pokemon/zapdos/normal.pal index 82ccddda8..5551ab973 100644 --- a/graphics/pokemon/zapdos/normal.pal +++ b/graphics/pokemon/zapdos/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -136 104 40 +152 120 16 248 224 168 72 48 16 0 32 56 -192 152 80 +208 168 8 8 16 16 -248 200 88 +248 208 64 248 248 248 -248 200 128 -240 168 80 -152 112 80 -128 104 88 +248 184 104 +240 144 24 +192 104 24 +152 136 48 216 216 216 104 104 104 163 48 48 diff --git a/graphics/pokemon/zebstrika/anim_front.png b/graphics/pokemon/zebstrika/anim_front.png index 252c65af9..db28f434f 100644 Binary files a/graphics/pokemon/zebstrika/anim_front.png and b/graphics/pokemon/zebstrika/anim_front.png differ diff --git a/graphics/pokemon/zebstrika/front.png b/graphics/pokemon/zebstrika/front.png index 9ced3a800..8d0970282 100644 Binary files a/graphics/pokemon/zebstrika/front.png and b/graphics/pokemon/zebstrika/front.png differ diff --git a/graphics/pokemon/zebstrika/normal.pal b/graphics/pokemon/zebstrika/normal.pal index 340931d5c..7939301a7 100644 --- a/graphics/pokemon/zebstrika/normal.pal +++ b/graphics/pokemon/zebstrika/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -88 88 88 -80 72 72 -168 144 144 -200 184 184 +64 80 88 +64 64 64 +160 160 160 +200 200 200 16 16 16 248 248 248 -120 104 104 -32 24 24 -0 128 160 -0 184 240 -152 136 48 -240 208 80 -56 40 48 +120 120 120 +24 32 32 +0 88 152 +0 168 216 +136 112 32 +248 224 0 +40 48 48 56 56 56 -80 72 72 +0 0 0 diff --git a/graphics/pokemon/zekrom/anim_front.png b/graphics/pokemon/zekrom/anim_front.png index fc445ff40..a987b70e3 100644 Binary files a/graphics/pokemon/zekrom/anim_front.png and b/graphics/pokemon/zekrom/anim_front.png differ diff --git a/graphics/pokemon/zekrom/front.png b/graphics/pokemon/zekrom/front.png index 2e3db00e2..265903400 100644 Binary files a/graphics/pokemon/zekrom/front.png and b/graphics/pokemon/zekrom/front.png differ diff --git a/graphics/pokemon/zekrom/normal.pal b/graphics/pokemon/zekrom/normal.pal index 362c6e7de..2ad25e0bc 100644 --- a/graphics/pokemon/zekrom/normal.pal +++ b/graphics/pokemon/zekrom/normal.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -152 208 160 -40 40 48 -24 96 112 -64 64 64 +248 248 248 +32 32 40 +0 104 184 +48 48 56 0 0 0 -96 232 248 -56 152 176 +104 240 248 +0 200 248 80 80 88 -24 32 32 +24 24 32 16 16 16 -192 64 64 -136 48 48 -216 200 200 +208 0 0 +144 0 0 +224 208 208 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/zigzagoon/anim_front.png b/graphics/pokemon/zigzagoon/anim_front.png index d0b6861df..9acce5453 100644 Binary files a/graphics/pokemon/zigzagoon/anim_front.png and b/graphics/pokemon/zigzagoon/anim_front.png differ diff --git a/graphics/pokemon/zigzagoon/front.png b/graphics/pokemon/zigzagoon/front.png index ffa3cd89c..da1a3a6ad 100644 Binary files a/graphics/pokemon/zigzagoon/front.png and b/graphics/pokemon/zigzagoon/front.png differ diff --git a/graphics/pokemon/zigzagoon/normal.pal b/graphics/pokemon/zigzagoon/normal.pal index 85e04e481..e814e4386 100644 --- a/graphics/pokemon/zigzagoon/normal.pal +++ b/graphics/pokemon/zigzagoon/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -112 96 80 -16 16 16 -184 168 152 -240 224 208 -184 160 136 -152 128 104 -96 88 72 -56 72 72 -248 248 248 -96 72 56 -128 96 56 -32 40 40 -192 192 184 +115 98 90 +0 0 0 +189 172 156 +230 222 205 +180 156 139 +148 123 106 +90 82 74 +65 65 65 +255 255 255 +82 65 49 +106 82 49 +32 32 41 +197 197 189 0 0 0 240 224 208 diff --git a/graphics/pokemon/zoroark/anim_front.png b/graphics/pokemon/zoroark/anim_front.png index 4ab1b0769..1cec32288 100644 Binary files a/graphics/pokemon/zoroark/anim_front.png and b/graphics/pokemon/zoroark/anim_front.png differ diff --git a/graphics/pokemon/zoroark/front.png b/graphics/pokemon/zoroark/front.png index d2828bb99..365e9ca96 100644 Binary files a/graphics/pokemon/zoroark/front.png and b/graphics/pokemon/zoroark/front.png differ diff --git a/graphics/pokemon/zoroark/normal.pal b/graphics/pokemon/zoroark/normal.pal index a3ff79c0c..52adb2069 100644 --- a/graphics/pokemon/zoroark/normal.pal +++ b/graphics/pokemon/zoroark/normal.pal @@ -3,17 +3,17 @@ JASC-PAL 16 152 208 160 16 16 16 -56 48 64 -32 24 40 -104 32 40 -72 16 24 -160 40 56 -120 104 120 -88 80 104 -64 56 72 +40 48 64 +32 32 48 +120 40 64 +72 16 40 +168 16 64 +120 120 128 +96 96 104 +72 72 80 200 200 200 -48 120 104 -48 168 160 +48 128 128 +24 176 176 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/zorua/anim_front.png b/graphics/pokemon/zorua/anim_front.png index 6b16f5c23..a01ab6211 100644 Binary files a/graphics/pokemon/zorua/anim_front.png and b/graphics/pokemon/zorua/anim_front.png differ diff --git a/graphics/pokemon/zorua/front.png b/graphics/pokemon/zorua/front.png index 544b99959..58f3f3a7c 100644 Binary files a/graphics/pokemon/zorua/front.png and b/graphics/pokemon/zorua/front.png differ diff --git a/graphics/pokemon/zorua/normal.pal b/graphics/pokemon/zorua/normal.pal index 83748686b..5c9bfcd1f 100644 --- a/graphics/pokemon/zorua/normal.pal +++ b/graphics/pokemon/zorua/normal.pal @@ -1,17 +1,17 @@ JASC-PAL 0100 16 -152 208 160 -104 32 40 -160 40 56 -96 88 120 -40 32 48 +153 204 153 +104 32 56 +168 16 64 +88 88 112 +32 32 48 16 16 16 64 64 80 -48 176 160 +24 176 176 248 248 248 48 128 128 -64 48 80 +48 48 64 0 0 0 0 0 0 0 0 0 diff --git a/graphics/pokemon/zubat/anim_front.png b/graphics/pokemon/zubat/anim_front.png index fecc35b77..b6b809271 100644 Binary files a/graphics/pokemon/zubat/anim_front.png and b/graphics/pokemon/zubat/anim_front.png differ diff --git a/graphics/pokemon/zubat/front.png b/graphics/pokemon/zubat/front.png index e17298b25..83ba7c583 100644 Binary files a/graphics/pokemon/zubat/front.png and b/graphics/pokemon/zubat/front.png differ diff --git a/graphics/pokemon/zubat/normal.pal b/graphics/pokemon/zubat/normal.pal index 2c4a19853..f21f16cf5 100644 --- a/graphics/pokemon/zubat/normal.pal +++ b/graphics/pokemon/zubat/normal.pal @@ -3,14 +3,14 @@ JASC-PAL 16 152 208 160 16 16 16 -48 112 152 -136 184 216 -64 152 184 -24 64 80 96 120 176 -160 88 168 -96 56 96 -192 120 192 +184 200 248 +136 176 232 +72 64 120 +96 120 176 +176 80 152 +112 32 88 +208 112 184 248 248 248 208 208 208 96 96 96 diff --git a/graphics/pokemon/zweilous/anim_front.png b/graphics/pokemon/zweilous/anim_front.png index afb5bc5f3..622db80f6 100644 Binary files a/graphics/pokemon/zweilous/anim_front.png and b/graphics/pokemon/zweilous/anim_front.png differ diff --git a/graphics/pokemon/zweilous/front.png b/graphics/pokemon/zweilous/front.png index 976ad1132..d6e4b809d 100644 Binary files a/graphics/pokemon/zweilous/front.png and b/graphics/pokemon/zweilous/front.png differ diff --git a/graphics/pokemon/zweilous/normal.pal b/graphics/pokemon/zweilous/normal.pal index b0795275a..068f0e652 100644 --- a/graphics/pokemon/zweilous/normal.pal +++ b/graphics/pokemon/zweilous/normal.pal @@ -2,18 +2,18 @@ JASC-PAL 0100 16 152 208 160 -48 40 40 +40 32 40 64 56 64 -88 80 80 +80 80 80 16 16 16 -80 104 136 -40 56 80 -96 144 200 -136 88 112 +56 96 160 +24 48 104 +96 144 216 +144 88 120 224 216 216 -136 48 88 -72 32 56 -88 56 144 +152 56 104 +96 32 64 168 168 168 -48 40 40 +40 32 40 +0 0 0 0 0 0 diff --git a/include/battle.h b/include/battle.h index 72ec1b41f..aafc3d2f6 100644 --- a/include/battle.h +++ b/include/battle.h @@ -104,6 +104,7 @@ struct DisableStruct u8 noRetreat:1; u8 tarShot:1; u8 octolock:1; + u8 cudChew:1; }; struct ProtectStruct @@ -611,7 +612,7 @@ struct BattleStruct u8 debugBattler; u8 magnitudeBasePower; u8 presentBasePower; - u8 roostTypes[MAX_BATTLERS_COUNT][3]; + u8 roostTypes[MAX_BATTLERS_COUNT][2]; u8 savedBattlerTarget; bool8 ateBoost[MAX_BATTLERS_COUNT]; u8 activeAbilityPopUps; // as bits for each battler @@ -650,6 +651,7 @@ struct BattleStruct u8 skyDropTargets[MAX_BATTLERS_COUNT]; // For Sky Drop, to account for if multiple Pokemon use Sky Drop in a double battle. // When using a move which hits multiple opponents which is then bounced by a target, we need to make sure, the move hits both opponents, the one with bounce, and the one without. u8 attackerBeforeBounce:2; + u8 beatUpSlot:3; u8 targetsDone[MAX_BATTLERS_COUNT]; // Each battler as a bit. u16 overwrittenAbilities[MAX_BATTLERS_COUNT]; // abilities overwritten during battle (keep separate from battle history in case of switching) }; diff --git a/include/battle_script_commands.h b/include/battle_script_commands.h index 44185a11a..60fd9b156 100644 --- a/include/battle_script_commands.h +++ b/include/battle_script_commands.h @@ -43,6 +43,7 @@ u16 GetNaturePowerMove(void); u16 GetSecretPowerMoveEffect(void); void StealTargetItem(u8 battlerStealer, u8 battlerItem); u8 GetCatchingBattler(void); +u32 GetHighestStatId(u32 battlerId); extern void (* const gBattleScriptingCommandsTable[])(void); extern const u8 gBattlePalaceNatureToMoveGroupLikelihood[NUM_NATURES][4]; diff --git a/include/battle_scripts.h b/include/battle_scripts.h index 75afdbf63..d79566a44 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -433,6 +433,21 @@ extern const u8 BattleScript_MultiHitPrintStrings[]; extern const u8 BattleScript_BurnUpRemoveType[]; extern const u8 BattleScript_TargetAbilityStatRaiseRet[]; extern const u8 BattleScript_DoubleShockRemoveType[]; +extern const u8 BattleScript_SeedSowerActivates[]; +extern const u8 BattleScript_AngerShellActivates[]; +extern const u8 BattleScript_WellBakedBodyActivates[]; +extern const u8 BattleScript_WindRiderActivatesMoveEnd[]; +extern const u8 BattleScript_WindPowerActivates[]; +extern const u8 BattleScript_WindPowerActivatesEnd2[]; +extern const u8 BattleScript_ProtosynthesisActivates[]; +extern const u8 BattleScript_QuarkDriveActivates[]; +extern const u8 BattleScript_GoodAsGoldActivates[]; +extern const u8 BattleScript_RuinAbilityActivates[]; +extern const u8 BattleScript_CudChewActivates[]; +extern const u8 BattleScript_SupremeOverlordActivates[]; +extern const u8 BattleScript_CostarActivates[]; +extern const u8 BattleScript_ToxicDebrisActivates[]; +extern const u8 BattleScript_EarthEaterActivates[]; // zmoves extern const u8 BattleScript_ZMoveActivateDamaging[]; diff --git a/include/battle_util.h b/include/battle_util.h index 257b5a743..1a05c246c 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -34,6 +34,8 @@ #define ABILITYEFFECT_MOVE_END_OTHER 12 #define ABILITYEFFECT_NEUTRALIZINGGAS 13 #define ABILITYEFFECT_FIELD_SPORT 14 // Only used if B_SPORT_TURNS < GEN_6 +#define ABILITYEFFECT_ON_WEATHER 15 +#define ABILITYEFFECT_ON_TERRAIN 16 // Special cases #define ABILITYEFFECT_MUD_SPORT 252 // Only used if B_SPORT_TURNS < GEN_6 #define ABILITYEFFECT_WATER_SPORT 253 // Only used if B_SPORT_TURNS < GEN_6 @@ -142,6 +144,7 @@ u16 CalcTypeEffectivenessMultiplier(u16 move, u8 moveType, u8 battlerAtk, u8 bat u16 CalcPartyMonTypeEffectivenessMultiplier(u16 move, u16 speciesDef, u16 abilityDef); u16 GetTypeModifier(u8 atkType, u8 defType); s32 GetStealthHazardDamage(u8 hazardType, u8 battlerId); +s32 GetStealthHazardDamageByTypesAndHP(u8 hazardType, u8 type1, u8 type2, u32 maxHp); u16 GetMegaEvolutionSpecies(u16 preEvoSpecies, u16 heldItemId); u16 GetPrimalReversionSpecies(u16 preEvoSpecies, u16 heldItemId); u16 GetWishMegaEvolutionSpecies(u16 preEvoSpecies, u16 moveId1, u16 moveId2, u16 moveId3, u16 moveId4); @@ -202,5 +205,7 @@ bool32 CanBeFrozen(u8 battlerId); bool32 CanBeConfused(u8 battlerId); bool32 IsBattlerTerrainAffected(u8 battlerId, u32 terrainFlag); u32 GetBattlerFriendshipScore(u8 battlerId); +u32 CountBattlerStatIncreases(u8 battlerId, bool32 countEvasionAcc); +bool32 IsMyceliumMightOnField(void); #endif // GUARD_BATTLE_UTIL_H diff --git a/include/config/battle.h b/include/config/battle.h index 1475510ec..915766647 100644 --- a/include/config/battle.h +++ b/include/config/battle.h @@ -30,6 +30,7 @@ #define B_SPORT_DMG_REDUCTION GEN_LATEST // In Gen5+, Water/Mud Sport reduce Fire/Electric Damage by 67% instead of 50%. #define B_EXPLOSION_DEFENSE GEN_LATEST // In Gen5+, Self-Destruct and Explosion don't halve the targets' defense. #define B_PARENTAL_BOND_DMG GEN_LATEST // In Gen7+, Parental Bond's second hit does 25% of the initial hits damage. Before, it did 50%. +#define B_MULTIPLE_TARGETS_DMG GEN_LATEST // In Gen4+, damage dealt by moves that hit multiple targets at once is reduced to 75%. Before, it was 50%. // Type settings #define B_GHOSTS_ESCAPE GEN_LATEST // In Gen6+, abilities like Shadow Tag or moves like Mean Look fail on Ghost-type Pokémon. They can also escape any Wild Battle. @@ -38,6 +39,7 @@ #define B_STEEL_RESISTANCES GEN_LATEST // In Gen6+, Steel-type Pokémon are no longer resistant to Dark-type and Ghost-type moves. #define B_PRANKSTER_DARK_TYPES GEN_LATEST // In Gen7+, Prankster-elevated status moves do not affect Dark type Pokémon. #define B_SHEER_COLD_IMMUNITY GEN_LATEST // In Gen7+, Ice-types are immune to Sheer Cold +#define B_ROOST_PURE_FLYING GEN_LATEST // In Gen5+, Roost makes pure Flying-types into Normal-type. // Turn settings #define B_BINDING_TURNS GEN_LATEST // In Gen5+, binding moves last for 4-5 turns instead of 2-5 turns. (With Grip Claw, 7 and 5 turns respectively.) @@ -110,6 +112,8 @@ #define B_PLUS_MINUS_INTERACTION GEN_LATEST // In Gen5+, Plus and Minus can be activated with themselves and the opposite ability. Before, only the opposing ability could activate it. #define B_WEATHER_FORMS GEN_LATEST // In Gen5+, Castform and Cherrim revert to their base form upon losing their respective ability. Cherrim needs Flower Gift to swap forms. #define B_SYMBIOSIS_GEMS GEN_LATEST // In Gen7+, Symbiosis passes an item after a gem-boosted attack. Previously, items are passed before the gem-boosted attack hits, making the item effect apply. +#define B_CHECK_IF_CHARGED_UP TRUE // If set to TRUE, certain abilities such as Electromorphosis WILL check if the STATUS3_CHARGED_UP status flag is applied. +#define B_ABSORBING_ABILITY_STRING GEN_LATEST // In Gen5+, the abilities that absorb moves of a certain type use a generic string for stat increases and decreases. // Item settings #define B_HP_BERRIES GEN_LATEST // In Gen4+, berries which restore hp activate immediately after HP drops to half. In Gen3, the effect occurs at the end of the turn. diff --git a/include/config/pokemon.h b/include/config/pokemon.h index b2b08d249..5e3463e67 100644 --- a/include/config/pokemon.h +++ b/include/config/pokemon.h @@ -1,15 +1,15 @@ #ifndef GUARD_CONFIG_POKEMON_H #define GUARD_CONFIG_POKEMON_H -#define P_UPDATED_TYPES GEN_LATEST // Since Gen 6, several Pokémon were changed to be partially or fully Fairy type. -#define P_UPDATED_STATS GEN_LATEST // Since Gen 6, Pokémon stats are updated with each passing generation. -#define P_UPDATED_ABILITIES GEN_LATEST // Since Gen 6, certain Pokémon have their abilities changed. -#define P_UPDATED_EGG_GROUPS GEN_LATEST // Since Gen 8, certain Pokémon have gained new egg groups. -#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_LEGENDARY_PERFECT_IVS GEN_LATEST // Since Gen 6, Legendaries, Mythicals and Ultra Beasts found in the wild or given through gifts have at least 3 perfect IVs. -#define P_KADABRA_EVERSTONE GEN_LATEST // Since Gen 4, Kadabra can evolve even when holding an Everstone. -#define P_NIDORAN_M_DITTO_BREED GEN_LATEST // Since Gen 5, when Nidoran♂ breeds with Ditto it can produce Nidoran♀ offspring. Before, it would only yield male offspring. This change also applies to Volbeat. -#define P_SHINY_BASE_CHANCE GEN_LATEST // Since Gen 6, the base chances of encountering a Shiny Pokémon was raised to 1/4096. This config adds an extra roll to the calculation, which effectively does the same thing. +#define P_UPDATED_TYPES GEN_LATEST // Since Gen 6, several Pokémon were changed to be partially or fully Fairy type. +#define P_UPDATED_STATS GEN_LATEST // Since Gen 6, Pokémon stats are updated with each passing generation. +#define P_UPDATED_ABILITIES GEN_LATEST // Since Gen 6, certain Pokémon have their abilities changed. +#define P_UPDATED_EGG_GROUPS GEN_LATEST // Since Gen 8, certain Pokémon have gained new egg groups. +#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_LEGENDARY_PERFECT_IVS GEN_LATEST // Since Gen 6, Legendaries, Mythicals and Ultra Beasts found in the wild or given through gifts have at least 3 perfect IVs. +#define P_KADABRA_EVERSTONE GEN_LATEST // Since Gen 4, Kadabra can evolve even when holding an Everstone. +#define P_NIDORAN_M_DITTO_BREED GEN_LATEST // Since Gen 5, when Nidoran♂ breeds with Ditto it can produce Nidoran♀ offspring. Before, it would only yield male offspring. This change also applies to Volbeat. +#define P_HIPPO_GENDER_DIFF_ICONS TRUE // If TRUE, will give Hippopotas and Hippowdon custom icons for their female forms. // Flag settings // To use the following features in scripting, replace the 0s with the flag ID you're assigning it to. @@ -21,10 +21,10 @@ // Forms are kept based on the base species, Eg: Meowth and Persian will keep all of their forms, but Perrserker will not be available if P_GEN_8_POKEMON is set to FALSE. // If you're disabling a generation previous to others (eg: Gen 5 but not Gen 6, 7 and 8), // remember to update NATIONAL_DEX enum in include/constants/pokedex.h to avoid players from softlocking in the non-existant entries. -#define P_GEN_4_POKEMON TRUE // Generation 4 Pokémon (DPPt, HGSS) -#define P_GEN_5_POKEMON TRUE // Generation 5 Pokémon (BW, B2W2) -#define P_GEN_6_POKEMON TRUE // Generation 6 Pokémon (XY, ORAS) -#define P_GEN_7_POKEMON TRUE // Generation 7 Pokémon (SM, USUM, LGPE) -#define P_GEN_8_POKEMON TRUE // Generation 8 Pokémon (SwSh, BDSP, LA) +#define P_GEN_4_POKEMON TRUE // Generation 4 Pokémon (DPPt, HGSS) +#define P_GEN_5_POKEMON TRUE // Generation 5 Pokémon (BW, B2W2) +#define P_GEN_6_POKEMON TRUE // Generation 6 Pokémon (XY, ORAS) +#define P_GEN_7_POKEMON TRUE // Generation 7 Pokémon (SM, USUM, LGPE) +#define P_GEN_8_POKEMON TRUE // Generation 8 Pokémon (SwSh, BDSP, LA) #endif // GUARD_CONFIG_POKEMON_H diff --git a/include/constants/abilities.h b/include/constants/abilities.h index 23b9fe2b7..94e5986f7 100644 --- a/include/constants/abilities.h +++ b/include/constants/abilities.h @@ -292,6 +292,41 @@ #define ABILITIES_COUNT_GEN8 268 -#define ABILITIES_COUNT ABILITIES_COUNT_GEN8 +// Gen 9 +#define ABILITY_LINGERING_AROMA 268 +#define ABILITY_SEED_SOWER 269 +#define ABILITY_THERMAL_EXCHANGE 270 +#define ABILITY_ANGER_SHELL 271 +#define ABILITY_PURIFYING_SALT 272 +#define ABILITY_WELL_BAKED_BODY 273 +#define ABILITY_WIND_RIDER 274 +#define ABILITY_GUARD_DOG 275 +#define ABILITY_ROCKY_PAYLOAD 276 +#define ABILITY_WIND_POWER 277 +#define ABILITY_ZERO_TO_HERO 278 +#define ABILITY_COMMANDER 279 +#define ABILITY_ELECTROMORPHOSIS 280 +#define ABILITY_PROTOSYNTHESIS 281 +#define ABILITY_QUARK_DRIVE 282 +#define ABILITY_GOOD_AS_GOLD 283 +#define ABILITY_VESSEL_OF_RUIN 284 +#define ABILITY_SWORD_OF_RUIN 285 +#define ABILITY_TABLETS_OF_RUIN 286 +#define ABILITY_BEADS_OF_RUIN 287 +#define ABILITY_ORICHALCUM_PULSE 288 +#define ABILITY_HADRON_ENGINE 289 +#define ABILITY_OPPORTUNIST 290 +#define ABILITY_CUD_CHEW 291 +#define ABILITY_SHARPNESS 292 +#define ABILITY_SUPREME_OVERLORD 293 +#define ABILITY_COSTAR 294 +#define ABILITY_TOXIC_DEBRIS 295 +#define ABILITY_ARMOR_TAIL 296 +#define ABILITY_EARTH_EATER 297 +#define ABILITY_MYCELIUM_MIGHT 298 + +#define ABILITIES_COUNT_GEN9 299 + +#define ABILITIES_COUNT ABILITIES_COUNT_GEN9 #endif // GUARD_CONSTANTS_ABILITIES_H diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 52b20ecaa..0e8aaea83 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -394,6 +394,8 @@ #define ANIM_TAG_OMEGA_SYMBOL (ANIM_SPRITES_START + 382) #define ANIM_TAG_STEEL_BEAM (ANIM_SPRITES_START + 383) #define ANIM_TAG_POLTERGEIST (ANIM_SPRITES_START + 384) +#define ANIM_TAG_TEAPOT (ANIM_SPRITES_START + 385) + // battlers #define ANIM_ATTACKER 0 diff --git a/include/constants/battle_move_effects.h b/include/constants/battle_move_effects.h index 100b89d53..2cf8d2f9c 100644 --- a/include/constants/battle_move_effects.h +++ b/include/constants/battle_move_effects.h @@ -390,13 +390,14 @@ #define EFFECT_COURT_CHANGE 384 #define EFFECT_STEEL_BEAM 385 #define EFFECT_EXTREME_EVOBOOST 386 -#define EFFECT_DAMAGE_SET_TERRAIN 387 // genesis supernova +#define EFFECT_HIT_SET_REMOVE_TERRAIN 387 // genesis supernova #define EFFECT_DARK_VOID 388 #define EFFECT_SLEEP_HIT 389 #define EFFECT_DOUBLE_SHOCK 390 #define EFFECT_SPECIAL_ATTACK_UP_HIT 391 #define EFFECT_VICTORY_DANCE 392 +#define EFFECT_TEATIME 393 -#define NUM_BATTLE_MOVE_EFFECTS 393 +#define NUM_BATTLE_MOVE_EFFECTS 394 #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h index 0fcb2bbb0..8f9ce0af8 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -247,6 +247,14 @@ #define VARIOUS_GET_BATTLER_SIDE 156 #define VARIOUS_CHECK_PARENTAL_BOND_COUNTER 157 #define VARIOUS_SWAP_STATS 158 +#define VARIOUS_JUMP_IF_ROD 159 +#define VARIOUS_JUMP_IF_ABSORB 160 +#define VARIOUS_JUMP_IF_MOTOR 161 +#define VARIOUS_TEATIME_INVUL 162 +#define VARIOUS_TEATIME_TARGETS 163 +#define VARIOUS_TRY_WIND_RIDER_POWER 164 +#define VARIOUS_ACTIVATE_WEATHER_CHANGE_ABILITIES 165 +#define VARIOUS_ACTIVATE_TERRAIN_CHANGE_ABILITIES 166 // Cmd_manipulatedamage #define DMG_CHANGE_SIGN 0 diff --git a/include/constants/battle_string_ids.h b/include/constants/battle_string_ids.h index 8dd94cca4..f63aa79bc 100644 --- a/include/constants/battle_string_ids.h +++ b/include/constants/battle_string_ids.h @@ -632,8 +632,14 @@ #define STRINGID_TARGETTOUGHEDITOUT 630 #define STRINGID_ATTACKERLOSTELECTRICTYPE 631 #define STRINGID_ATTACKERSWITCHEDSTATWITHTARGET 632 +#define STRINGID_BEINGHITCHARGEDPKMNWITHPOWER 633 +#define STRINGID_SUNLIGHTACTIVATEDABILITY 634 +#define STRINGID_STATWASHEIGHTENED 635 +#define STRINGID_ELECTRICTERRAINACTIVATEDABILITY 636 +#define STRINGID_ABILITYWEAKENEDFSURROUNDINGMONSSTAT 637 +#define STRINGID_ATTACKERGAINEDSTRENGTHFROMTHEFALLEN 638 -#define BATTLESTRINGS_COUNT 633 +#define BATTLESTRINGS_COUNT 639 // 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/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index ff10f52ee..71aac2308 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -684,8 +684,6 @@ #define METATILE_SecretBase_BigPlant_TopRight 0x2E6 #define METATILE_SecretBase_BigPlant_BaseLeft1 0x2EC #define METATILE_SecretBase_BigPlant_BaseRight1 0x2ED -#define METATILE_SecretBase_BigPlant_TopLeftWall 0x2E5 -#define METATILE_SecretBase_BigPlant_TopRightWall 0x2E6 #define METATILE_SecretBase_BigPlant_BaseLeft2 0x2EE #define METATILE_SecretBase_BigPlant_BaseRight2 0x2EF #define METATILE_SecretBase_GorgeousPlant_TopLeft 0x2F0 diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 006e2a703..35eca5bbc 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -235,6 +235,8 @@ #define FLAG_THAW_USER (1 << 25) #define FLAG_HIT_IN_SUBSTITUTE (1 << 26) // Hyperspace Fury #define FLAG_TWO_STRIKES (1 << 27) // A move with this flag will strike twice, and may apply its effect on each hit +#define FLAG_WIND_MOVE (1 << 28) +#define FLAG_SLICING_MOVE (1 << 29) // Split defines. #define SPLIT_PHYSICAL 0x0 diff --git a/include/constants/species.h b/include/constants/species.h index 5a46e856f..61e31953e 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -202,7 +202,7 @@ #define SPECIES_MURKROW 198 #define SPECIES_SLOWKING 199 #define SPECIES_MISDREAVUS 200 -#define SPECIES_UNOWN 201 +#define SPECIES_UNOWN_A 201 #define SPECIES_WOBBUFFET 202 #define SPECIES_GIRAFARIG 203 #define SPECIES_PINECO 204 @@ -1373,4 +1373,6 @@ #define NUM_SPECIES SPECIES_EGG +#define SPECIES_UNOWN NUM_SPECIES + 1 // Used for random Unown form based on personality. + #endif // GUARD_CONSTANTS_SPECIES_H diff --git a/include/contest.h b/include/contest.h index 21e2530c2..a79ad03ce 100644 --- a/include/contest.h +++ b/include/contest.h @@ -338,7 +338,6 @@ void SetContestants(u8 contestType, u8 rank); void SetLinkAIContestants(u8 contestType, u8 rank, bool32 isPostgame); u8 GetContestEntryEligibility(struct Pokemon *pkmn); void CalculateRound1Points(u8 contestCategory); -bool8 IsSpeciesNotUnown(u16 species); bool8 Contest_IsMonsTurnDisabled(u8 contestant); void SaveLinkContestResults(void); void SortContestants(bool8 useRanking); diff --git a/include/gba/multiboot.h b/include/gba/multiboot.h index 14b6594b2..64a860284 100644 --- a/include/gba/multiboot.h +++ b/include/gba/multiboot.h @@ -10,7 +10,7 @@ struct MultiBootParam { u32 system_work[5]; // 00 u8 handshake_data; // 14 - u8 padding; // 15 + //u8 padding; // 15 u16 handshake_timeout; // 16 u8 probe_count; // 18 u8 client_data[MULTIBOOT_NCHILD]; // 19 diff --git a/include/global.berry.h b/include/global.berry.h index 8d1aa369d..29f1cfe14 100644 --- a/include/global.berry.h +++ b/include/global.berry.h @@ -40,6 +40,7 @@ struct Berry2 u8 bitter; u8 sour; u8 smoothness; + //u8 padding; }; struct EnigmaBerry diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 4da3154e2..26e5c44bf 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -41,7 +41,7 @@ struct Tileset /*0x01*/ bool8 isSecondary; /*0x04*/ const u32 *tiles; /*0x08*/ const u16 (*palettes)[16]; - /*0x0c*/ const u16 *metatiles; + /*0x0C*/ const u16 *metatiles; /*0x10*/ const u16 *metatileAttributes; /*0x14*/ TilesetCB callback; }; @@ -51,7 +51,7 @@ struct MapLayout /*0x00*/ s32 width; /*0x04*/ s32 height; /*0x08*/ u16 *border; - /*0x0c*/ u16 *map; + /*0x0C*/ u16 *map; /*0x10*/ struct Tileset *primaryTileset; /*0x14*/ struct Tileset *secondaryTileset; }; @@ -68,16 +68,19 @@ struct ObjectEventTemplate /*0x00*/ u8 localId; /*0x01*/ u8 graphicsId; /*0x02*/ u8 inConnection; // Leftover from FRLG + /*0x03*/ //u8 padding1; /*0x04*/ s16 x; /*0x06*/ s16 y; /*0x08*/ u8 elevation; /*0x09*/ u8 movementType; /*0x0A*/ u16 movementRangeX:4; u16 movementRangeY:4; + //u16 padding2:8; /*0x0C*/ u16 trainerType; /*0x0E*/ u16 trainerRange_berryTreeId; /*0x10*/ const u8 *script; /*0x14*/ u16 flagId; + /*0x16*/ //u8 padding3[2]; }; struct WarpEvent @@ -192,6 +195,7 @@ struct ObjectEvent u32 disableJumpLandingGroundEffect:1; u32 fixedPriority:1; u32 hideReflection:1; + //u32 padding:4; /*0x04*/ u8 spriteId; /*0x05*/ u8 graphicsId; /*0x06*/ u8 movementType; @@ -217,6 +221,7 @@ struct ObjectEvent /*0x20*/ u8 previousMovementDirection; /*0x21*/ u8 directionSequenceIndex; /*0x22*/ u8 playerCopyableMovement; // COPY_MOVE_* + /*0x23*/ //u8 padding2; /*size = 0x24*/ }; diff --git a/include/global.h b/include/global.h index 2f5a5c871..22dc82ecb 100644 --- a/include/global.h +++ b/include/global.h @@ -249,9 +249,11 @@ struct ApprenticeMon struct Apprentice { u8 id:5; - u8 lvlMode:2; // + 1 + u8 lvlMode:2; + //u8 padding1:1; u8 numQuestions; u8 number; + //u8 padding2; struct ApprenticeMon party[MULTI_PARTY_SIZE]; u16 speechWon[EASY_CHAT_BATTLE_WORDS_COUNT]; u8 playerId[TRAINER_ID_LENGTH]; @@ -299,6 +301,7 @@ struct EmeraldBattleTowerRecord /*0x28*/ u16 speechLost[EASY_CHAT_BATTLE_WORDS_COUNT]; /*0x34*/ struct BattleTowerPokemon party[MAX_FRONTIER_PARTY_SIZE]; /*0xE4*/ u8 language; + /*0xE7*/ //u8 padding[3]; /*0xE8*/ u32 checksum; }; @@ -331,14 +334,17 @@ struct DomeMonData u16 moves[MAX_MON_MOVES]; u8 evs[NUM_STATS]; u8 nature; + //u8 padding; }; struct RentalMon { u16 monId; + //u8 padding1[2]; u32 personality; u8 ivs; u8 abilityNum; + //u8 padding2[2]; }; struct BattleDomeTrainer @@ -360,8 +366,9 @@ struct BattleFrontier /*0xBEC*/ struct BattleTowerEReaderTrainer ereaderTrainer; /*0xCA8*/ u8 challengeStatus; /*0xCA9*/ u8 lvlMode:2; - /*0xCA9*/ u8 challengePaused:1; - /*0xCA9*/ u8 disableRecordBattle:1; + u8 challengePaused:1; + u8 disableRecordBattle:1; + //u8 padding1:4; /*0xCAA*/ u16 selectedPartyMons[MAX_FRONTIER_PARTY_SIZE]; /*0xCB2*/ u16 curChallengeBattleNum; // Battle number / room number (Pike) / floor number (Pyramid) /*0xCB4*/ u16 trainerIds[20]; @@ -405,16 +412,19 @@ struct BattleFrontier /*0xE08*/ u16 pikeRecordStreaks[FRONTIER_LVL_MODE_COUNT]; /*0xE0C*/ u16 pikeTotalStreaks[FRONTIER_LVL_MODE_COUNT]; /*0xE10*/ u8 pikeHintedRoomIndex:3; - /*0xE10*/ u8 pikeHintedRoomType:4; - /*0xE10*/ u8 pikeHealingRoomsDisabled:1; + u8 pikeHintedRoomType:4; + u8 pikeHealingRoomsDisabled:1; + /*0xE11*/ //u8 padding2; /*0xE12*/ u16 pikeHeldItemsBackup[FRONTIER_PARTY_SIZE]; /*0xE18*/ u16 pyramidPrize; /*0xE1A*/ u16 pyramidWinStreaks[FRONTIER_LVL_MODE_COUNT]; /*0xE1E*/ u16 pyramidRecordStreaks[FRONTIER_LVL_MODE_COUNT]; /*0xE22*/ u16 pyramidRandoms[4]; /*0xE2A*/ u8 pyramidTrainerFlags; // 1 bit for each trainer (MAX_PYRAMID_TRAINERS) + /*0xE2B*/ //u8 padding3; /*0xE2C*/ struct PyramidBag pyramidBag; /*0xE68*/ u8 pyramidLightRadius; + /*0xE69*/ //u8 padding4; /*0xE6A*/ u16 verdanturfTentPrize; /*0xE6C*/ u16 fallarborTentPrize; /*0xE6E*/ u16 slateportTentPrize; @@ -439,6 +449,7 @@ struct ApprenticeQuestion u8 monId:2; u8 moveSlot:2; u8 suggestedChange:2; // TRUE if told to use held item or second move, FALSE if told to use no item or first move + //u8 padding; u16 data; // used both as an itemId and a moveId }; @@ -449,9 +460,11 @@ struct PlayersApprentice /*0xB1*/ u8 questionsAnswered:4; /*0xB1*/ u8 leadMonId:2; /*0xB2*/ u8 party:3; - /*0xB2*/ u8 saveId:2; + u8 saveId:2; + //u8 padding1:3; /*0xB3*/ u8 unused; /*0xB4*/ u8 speciesIds[MULTI_PARTY_SIZE]; + /*0xB7*/ //u8 padding2; /*0xB8*/ struct ApprenticeQuestion questions[APPRENTICE_MAX_QUESTIONS]; }; @@ -461,6 +474,7 @@ struct RankingHall1P u16 winStreak; u8 name[PLAYER_NAME_LENGTH + 1]; u8 language; + //u8 padding; }; struct RankingHall2P @@ -471,6 +485,7 @@ struct RankingHall2P u8 name1[PLAYER_NAME_LENGTH + 1]; u8 name2[PLAYER_NAME_LENGTH + 1]; u8 language; + //u8 padding; }; struct SaveBlock2 @@ -490,6 +505,8 @@ struct SaveBlock2 u16 optionsBattleStyle:1; // OPTIONS_BATTLE_STYLE_[SHIFT/SET] u16 optionsBattleSceneOff:1; // whether battle animations are disabled u16 regionMapZoom:1; // whether the map is zoomed in + //u16 padding1:4; + //u16 padding2; /*0x18*/ struct Pokedex pokedex; /*0x90*/ u8 filler_90[0x8]; /*0x98*/ struct Time localTimeOffset; @@ -534,6 +551,7 @@ struct SecretBase /*0x1AAD*/ u8 unused; /*0x1AAE*/ u8 decorations[DECOR_MAX_SECRET_BASE]; /*0x1ABE*/ u8 decorationPositions[DECOR_MAX_SECRET_BASE]; + /*0x1ACE*/ //u8 padding[2]; /*0x1AD0*/ struct SecretBaseParty party; }; @@ -548,6 +566,7 @@ struct WarpData s8 mapGroup; s8 mapNum; s8 warpId; + //u8 padding; s16 x, y; }; @@ -592,6 +611,7 @@ struct RamScriptData u8 mapNum; u8 objectId; u8 script[995]; + //u8 padding; }; struct RamScript @@ -606,6 +626,7 @@ struct DewfordTrend u16 trendiness:7; u16 maxTrendiness:7; u16 gainingTrendiness:1; + //u16 padding:1; u16 rand; u16 words[2]; }; /*size = 0x8*/ @@ -618,6 +639,7 @@ struct MauvilleManCommon struct MauvilleManBard { /*0x00*/ u8 id; + /*0x01*/ //u8 padding1; /*0x02*/ u16 songLyrics[BARD_SONG_LENGTH]; /*0x0E*/ u16 temporaryLyrics[BARD_SONG_LENGTH]; /*0x1A*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; @@ -625,6 +647,7 @@ struct MauvilleManBard /*0x25*/ u8 playerTrainerId[TRAINER_ID_LENGTH]; /*0x29*/ bool8 hasChangedSong; /*0x2A*/ u8 language; + /*0x2B*/ //u8 padding2; }; /*size = 0x2C*/ struct MauvilleManStoryteller @@ -643,9 +666,11 @@ struct MauvilleManGiddy /*0x00*/ u8 id; /*0x01*/ u8 taleCounter; /*0x02*/ u8 questionNum; + /*0x03*/ //u8 padding1; /*0x04*/ u16 randomWords[GIDDY_MAX_TALES]; /*0x18*/ u8 questionList[GIDDY_MAX_QUESTIONS]; /*0x20*/ u8 language; + /*0x21*/ //u8 padding2; }; /*size = 0x2C*/ struct MauvilleManHipster @@ -690,6 +715,7 @@ struct LinkBattleRecords { struct LinkBattleRecord entries[LINK_B_RECORDS_COUNT]; u8 languages[LINK_B_RECORDS_COUNT]; + //u8 padding; }; struct RecordMixingGiftData @@ -715,6 +741,7 @@ struct ContestWinner u8 monName[POKEMON_NAME_LENGTH + 1]; u8 trainerName[PLAYER_NAME_LENGTH + 1]; u8 contestRank; + //u8 padding; }; struct Mail @@ -747,6 +774,7 @@ struct DayCare struct DaycareMon mons[DAYCARE_MON_COUNT]; u32 offspringPersonality; u8 stepCounter; + //u8 padding[3]; }; struct LilycoveLadyQuiz @@ -759,10 +787,10 @@ struct LilycoveLadyQuiz /*0x018*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; /*0x020*/ u16 playerTrainerId[TRAINER_ID_LENGTH]; /*0x028*/ u16 prize; - /*0x02a*/ bool8 waitingForChallenger; - /*0x02b*/ u8 questionId; - /*0x02c*/ u8 prevQuestionId; - /*0x02d*/ u8 language; + /*0x02A*/ bool8 waitingForChallenger; + /*0x02B*/ u8 questionId; + /*0x02C*/ u8 prevQuestionId; + /*0x02D*/ u8 language; }; struct LilycoveLadyFavor @@ -772,10 +800,12 @@ struct LilycoveLadyFavor /*0x002*/ bool8 likedItem; /*0x003*/ u8 numItemsGiven; /*0x004*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; - /*0x00c*/ u8 favorId; - /*0x00e*/ u16 itemId; + /*0x00C*/ u8 favorId; + /*0x00D*/ //u8 padding1; + /*0x00E*/ u16 itemId; /*0x010*/ u16 bestItem; /*0x012*/ u8 language; + /*0x013*/ //u8 padding2; }; struct LilycoveLadyContest @@ -785,9 +815,9 @@ struct LilycoveLadyContest /*0x002*/ u8 numGoodPokeblocksGiven; /*0x003*/ u8 numOtherPokeblocksGiven; /*0x004*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; - /*0x00c*/ u8 maxSheen; - /*0x00d*/ u8 category; - /*0x00e*/ u8 language; + /*0x00C*/ u8 maxSheen; + /*0x00D*/ u8 category; + /*0x00E*/ u8 language; }; typedef union // 3b58 @@ -796,7 +826,7 @@ typedef union // 3b58 struct LilycoveLadyFavor favor; struct LilycoveLadyContest contest; u8 id; - u8 pad[0x40]; + u8 filler[0x40]; } LilycoveLady; struct WaldaPhrase @@ -806,6 +836,7 @@ struct WaldaPhrase u8 iconId; u8 patternId; bool8 patternUnlocked; + //u8 padding; }; struct TrainerNameRecord @@ -821,12 +852,13 @@ struct TrainerHillSave /*0x3D6C*/ u8 unk_3D6C; /*0x3D6D*/ u8 unused; /*0x3D6E*/ u16 receivedPrize:1; - /*0x3D6E*/ u16 checkedFinalTime:1; - /*0x3D6E*/ u16 spokeToOwner:1; - /*0x3D6E*/ u16 hasLost:1; - /*0x3D6E*/ u16 maybeECardScanDuringChallenge:1; - /*0x3D6E*/ u16 field_3D6E_0f:1; - /*0x3D6E*/ u16 mode:2; // HILL_MODE_* + u16 checkedFinalTime:1; + u16 spokeToOwner:1; + u16 hasLost:1; + u16 maybeECardScanDuringChallenge:1; + u16 field_3D6E_0f:1; + u16 mode:2; // HILL_MODE_* + //u16 padding:8; }; struct WonderNewsMetadata @@ -835,6 +867,7 @@ struct WonderNewsMetadata u8 sentCounter:3; u8 getCounter:3; u8 rand; + //u8 padding[2]; }; struct WonderNews @@ -860,6 +893,7 @@ struct WonderCard u8 bodyText[WONDER_CARD_BODY_TEXT_LINES][WONDER_CARD_TEXT_LENGTH]; u8 footerLine1Text[WONDER_CARD_TEXT_LENGTH]; u8 footerLine2Text[WONDER_CARD_TEXT_LENGTH]; + //u8 padding[2]; }; struct WonderCardMetadata @@ -906,7 +940,7 @@ struct ExternalEventFlags { u8 usedBoxRS:1; // Set by Pokémon Box: Ruby & Sapphire; denotes whether this save has connected to it and triggered the free False Swipe Swablu Egg giveaway. u8 boxRSEggsUnlocked:2; // Set by Pokémon Box: Ruby & Sapphire; denotes the number of Eggs unlocked from deposits; 1 for ExtremeSpeed Zigzagoon (at 100 deposited), 2 for Pay Day Skitty (at 500 deposited), 3 for Surf Pichu (at 1499 deposited) - u8 padding:5; + //u8 padding:5; u8 unknownFlag1; u8 receivedGCNJirachi; // Both the US Colosseum Bonus Disc and PAL/AUS Pokémon Channel use this field. One cannot receive a WISHMKR Jirachi and CHANNEL Jirachi with the same savefile. u8 unknownFlag3; @@ -942,9 +976,11 @@ struct SaveBlock1 /*0x2E*/ u8 weather; /*0x2F*/ u8 weatherCycleStage; /*0x30*/ u8 flashLevel; + /*0x31*/ //u8 padding1; /*0x32*/ u16 mapLayoutId; /*0x34*/ u16 mapView[0x100]; /*0x234*/ u8 playerPartyCount; + /*0x235*/ //u8 padding2[3]; /*0x238*/ struct Pokemon playerParty[PARTY_SIZE]; /*0x490*/ u32 money; /*0x494*/ u16 coins; @@ -961,6 +997,7 @@ struct SaveBlock1 /*0x9C2*/ u8 unused_9C2[6]; /*0x9C8*/ u16 trainerRematchStepCounter; /*0x9CA*/ u8 trainerRematches[MAX_REMATCH_ENTRIES]; + /*0xA2E*/ //u8 padding3[2]; /*0xA30*/ struct ObjectEvent objectEvents[OBJECT_EVENTS_COUNT]; /*0xC70*/ struct ObjectEventTemplate objectEventTemplates[OBJECT_EVENT_TEMPLATES_COUNT]; /*0x1270*/ u8 flags[NUM_FLAG_BYTES]; @@ -978,6 +1015,7 @@ struct SaveBlock1 /*0x278E*/ u8 decorationPosters[10]; /*0x2798*/ u8 decorationDolls[40]; /*0x27C0*/ u8 decorationCushions[10]; + /*0x27CA*/ //u8 padding4[2]; /*0x27CC*/ TVShow tvShows[TV_SHOWS_COUNT]; /*0x2B50*/ PokeNews pokeNews[POKE_NEWS_COUNT]; /*0x2B90*/ u16 outbreakPokemonSpecies; @@ -997,6 +1035,7 @@ struct SaveBlock1 /*0x2BD4*/ u16 easyChatBattleLost[EASY_CHAT_BATTLE_WORDS_COUNT]; /*0x2BE0*/ struct Mail mail[MAIL_COUNT]; /*0x2E20*/ u8 additionalPhrases[NUM_ADDITIONAL_PHRASE_BYTES]; // bitfield for 33 additional phrases in easy chat system + /*0x2E25*/ //u8 padding5[3]; /*0x2E28*/ OldMan oldMan; /*0x2e64*/ struct DewfordTrend dewfordTrends[SAVED_TRENDS_COUNT]; /*0x2e90*/ struct ContestWinner contestWinners[NUM_CONTEST_WINNERS]; // see CONTEST_WINNER_* diff --git a/include/global.tv.h b/include/global.tv.h index 1fb1b8a33..3729562cd 100644 --- a/include/global.tv.h +++ b/include/global.tv.h @@ -36,6 +36,7 @@ typedef union // size = 0x24 /*0x04*/ u16 words[6]; /*0x10*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; /*0x18*/ u8 language; + /*0x19*/ //u8 padding; } fanclubLetter; // TVSHOW_RECENT_HAPPENINGS @@ -46,6 +47,7 @@ typedef union // size = 0x24 /*0x04*/ u16 words[6]; /*0x10*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; /*0x18*/ u8 language; + /*0x19*/ //u8 padding; } recentHappenings; // TVSHOW_PKMN_FAN_CLUB_OPINIONS @@ -54,7 +56,7 @@ typedef union // size = 0x24 /*0x01*/ bool8 active; /*0x02*/ u16 species; /*0x04*/ u8 friendshipHighNybble:4; - /*0x04*/ u8 questionAsked:4; + u8 questionAsked:4; /*0x05*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; /*0x0D*/ u8 language; /*0x0E*/ u8 pokemonNameLanguage; @@ -70,8 +72,8 @@ typedef union // size = 0x24 /*0x01*/ bool8 active; /*0x02*/ u16 words[2]; /*0x06*/ u16 species; - /*0x08*/ u8 pad_08[3]; - /*0x0b*/ u8 name[12]; + /*0x08*/ u8 filler_08[3]; + /*0x0B*/ u8 name[12]; /*0x17*/ u8 language; } dummy; @@ -98,8 +100,9 @@ typedef union // size = 0x24 /*0x04*/ u16 words[2]; /*0x08*/ u8 pokemonNickname[POKEMON_NAME_LENGTH + 1]; /*0x13*/ u8 contestCategory:3; - /*0x13*/ u8 contestRank:2; - /*0x13*/ u8 contestResult:2; + u8 contestRank:2; + u8 contestResult:2; + //u8 padding:1; /*0x14*/ u16 move; /*0x16*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; /*0x1E*/ u8 language; @@ -121,6 +124,7 @@ typedef union // size = 0x24 /*0x1C*/ bool8 wonTheChallenge; /*0x1D*/ u8 language; /*0x1E*/ u8 pokemonNameLanguage; + /*0x1F*/ //u8 padding; } bravoTrainerTower; // TVSHOW_CONTEST_LIVE_UPDATES @@ -131,14 +135,15 @@ typedef union // size = 0x24 /*0x04*/ u8 losingTrainerName[PLAYER_NAME_LENGTH + 1]; /*0x0C*/ u8 loserAppealFlag; /*0x0D*/ u8 round1Placing; - /*0x0e*/ u8 round2Placing; - /*0x0f*/ u8 winnerAppealFlag; + /*0x0E*/ u8 round2Placing; + /*0x0F*/ u8 winnerAppealFlag; /*0x10*/ u16 move; /*0x12*/ u16 winningSpecies; /*0x14*/ u8 winningTrainerName[PLAYER_NAME_LENGTH + 1]; /*0x1C*/ u8 category; /*0x1D*/ u8 winningTrainerLanguage; /*0x1E*/ u8 losingTrainerLanguage; + /*0x1F*/ //u8 padding; } contestLiveUpdates; // TVSHOW_3_CHEERS_FOR_POKEBLOCKS @@ -147,7 +152,8 @@ typedef union // size = 0x24 /*0x01*/ bool8 active; /*0x02*/ u8 sheen; /*0x03*/ u8 flavor:3; - /*0x03*/ u8 color:2; + u8 color:2; + //u8 padding:3; /*0x04*/ u8 worstBlenderName[PLAYER_NAME_LENGTH + 1]; /*0x0C*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; /*0x14*/ u8 language; @@ -166,6 +172,7 @@ typedef union // size = 0x24 /*0x18*/ u8 battleType; /*0x19*/ u8 language; /*0x1A*/ u8 linkOpponentLanguage; + /*0x1B*/ //u8 padding; } battleUpdate; // TVSHOW_FAN_CLUB_SPECIAL @@ -173,13 +180,14 @@ typedef union // size = 0x24 /*0x00*/ u8 kind; /*0x01*/ bool8 active; /*0x02*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; - /*0x0a*/ u8 idLo; - /*0x0b*/ u8 idHi; - /*0x0c*/ u8 idolName[PLAYER_NAME_LENGTH + 1]; + /*0x0A*/ u8 idLo; + /*0x0B*/ u8 idHi; + /*0x0C*/ u8 idolName[PLAYER_NAME_LENGTH + 1]; /*0x14*/ u16 words[1]; /*0x16*/ u8 score; /*0x17*/ u8 language; /*0x18*/ u8 idolNameLanguage; + /*0x19*/ //u8 padding; } fanClubSpecial; // TVSHOW_LILYCOVE_CONTEST_LADY @@ -187,8 +195,8 @@ typedef union // size = 0x24 /*0x00*/ u8 kind; /*0x01*/ bool8 active; /*0x02*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; - /*0x0a*/ u8 contestCategory; - /*0x0b*/ u8 nickname[POKEMON_NAME_LENGTH + 1]; + /*0x0A*/ u8 contestCategory; + /*0x0B*/ u8 nickname[POKEMON_NAME_LENGTH + 1]; /*0x16*/ u8 pokeblockState; /*0x17*/ u8 language; /*0x18*/ u8 pokemonNameLanguage; @@ -206,6 +214,7 @@ typedef union // size = 0x24 /*0x10*/ u16 species; /*0x12*/ u8 nBallsUsed; /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; + /*0x1B*/ //u8 padding; } pokemonToday; // TVSHOW_SMART_SHOPPER @@ -214,11 +223,12 @@ typedef union // size = 0x24 /*0x01*/ bool8 active; /*0x02*/ u8 priceReduced; /*0x03*/ u8 language; - /*0x04*/ u8 pad04[2]; + /*0x04*/ u8 filler_04[2]; /*0x06*/ u16 itemIds[SMARTSHOPPER_NUM_ITEMS]; /*0x0C*/ u16 itemAmounts[SMARTSHOPPER_NUM_ITEMS]; /*0x12*/ u8 shopLocation; /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; + /*0x1B*/ //u8 padding; } smartshopperShow; // TVSHOW_POKEMON_TODAY_FAILED @@ -226,13 +236,14 @@ typedef union // size = 0x24 /*0x00*/ u8 kind; /*0x01*/ bool8 active; /*0x02*/ u8 language; - /*0x03*/ u8 pad03[9]; - /*0x0c*/ u16 species; - /*0x0e*/ u16 species2; + /*0x03*/ u8 filler_03[9]; + /*0x0C*/ u16 species; + /*0x0E*/ u16 species2; /*0x10*/ u8 nBallsUsed; /*0x11*/ u8 outcome; /*0x12*/ u8 location; /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; + /*0x1B*/ //u8 padding; } pokemonTodayFailed; // TVSHOW_FISHING_ADVICE @@ -243,8 +254,9 @@ typedef union // size = 0x24 /*0x03*/ u8 nFails; /*0x04*/ u16 species; /*0x06*/ u8 language; - /*0x07*/ u8 pad07[12]; + /*0x07*/ u8 filler_07[12]; /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; + /*0x1B*/ //u8 padding; } pokemonAngler; // TVSHOW_WORLD_OF_MASTERS @@ -255,10 +267,11 @@ typedef union // size = 0x24 /*0x04*/ u16 caughtPoke; /*0x06*/ u16 steps; /*0x08*/ u16 species; - /*0x0a*/ u8 location; - /*0x0b*/ u8 language; - /*0x0c*/ u8 pad0c[7]; + /*0x0A*/ u8 location; + /*0x0B*/ u8 language; + /*0x0C*/ u8 filler_0C[7]; /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; + /*0x1B*/ //u8 padding2; } worldOfMasters; // TVSHOW_TODAYS_RIVAL_TRAINER @@ -271,10 +284,11 @@ typedef union // size = 0x24 /*0x06*/ u8 nGoldSymbols; /*0x07*/ u8 location; /*0x08*/ u16 battlePoints; - /*0x0a*/ u16 mapLayoutId; - /*0x0c*/ u8 language; - /*0x0d*/ u8 filler_0d[6]; + /*0x0A*/ u16 mapLayoutId; + /*0x0C*/ u8 language; + /*0x0D*/ u8 filler_0D[6]; /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; + /*0x1B*/ //u8 padding2; } rivalTrainer; // TVSHOW_TREND_WATCHER @@ -285,8 +299,9 @@ typedef union // size = 0x24 /*0x04*/ u16 words[2]; /*0x08*/ u8 gender; /*0x09*/ u8 language; - /*0x0a*/ u8 filler_0a[9]; + /*0x0A*/ u8 filler_0a[9]; /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; + /*0x1B*/ //u8 padding; } trendWatcher; // TVSHOW_TREASURE_INVESTIGATORS @@ -299,6 +314,7 @@ typedef union // size = 0x24 /*0x06*/ u16 mapLayoutId; /*0x08*/ u8 filler_08[11]; /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; + /*0x1B*/ //u8 padding; } treasureInvestigators; // TVSHOW_FIND_THAT_GAMER @@ -312,6 +328,7 @@ typedef union // size = 0x24 /*0x08*/ u8 language; /*0x09*/ u8 filler_09[10]; /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; + /*0x1B*/ //u8 padding; } findThatGamer; // TVSHOW_BREAKING_NEWS @@ -323,11 +340,12 @@ typedef union // size = 0x24 /*0x05*/ u8 outcome; /*0x06*/ u16 caughtMonBall; /*0x08*/ u16 balls; - /*0x0a*/ u16 poke1Species; - /*0x0c*/ u16 lastUsedMove; - /*0x0e*/ u8 language; - /*0x0f*/ u8 filler_0f[4]; + /*0x0A*/ u16 poke1Species; + /*0x0C*/ u16 lastUsedMove; + /*0x0E*/ u8 language; + /*0x0F*/ u8 filler_0f[4]; /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; + /*0x1B*/ //u8 padding; } breakingNews; // TVSHOW_SECRET_BASE_VISIT @@ -338,10 +356,11 @@ typedef union // size = 0x24 /*0x03*/ u8 numDecorations; /*0x04*/ u8 decorations[4]; /*0x08*/ u16 species; - /*0x0a*/ u16 move; - /*0x0c*/ u8 language; - /*0x0d*/ u8 filler_0d[6]; + /*0x0A*/ u16 move; + /*0x0C*/ u8 language; + /*0x0D*/ u8 filler_0d[6]; /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; + /*0x1B*/ //u8 padding; } secretBaseVisit; // TVSHOW_LOTTO_WINNER @@ -353,6 +372,7 @@ typedef union // size = 0x24 /*0x05*/ u8 language; /*0x06*/ u8 filler_06[13]; /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; + /*0x1B*/ //u8 padding; } lottoWinner; // TVSHOW_BATTLE_SEMINAR @@ -363,11 +383,12 @@ typedef union // size = 0x24 /*0x04*/ u16 foeSpecies; /*0x06*/ u16 species; /*0x08*/ u16 otherMoves[3]; - /*0x0e*/ u16 betterMove; + /*0x0E*/ u16 betterMove; /*0x10*/ u8 nOtherMoves; /*0x11*/ u8 language; /*0x12*/ u8 filler_12[1]; /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; + /*0x1B*/ //u8 padding; } battleSeminar; // TVSHOW_TRAINER_FAN_CLUB @@ -379,6 +400,7 @@ typedef union // size = 0x24 /*0x08*/ u8 language; /*0x09*/ u8 filler_09[10]; /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; + /*0x1B*/ //u8 padding; } trainerFanClub; // TVSHOW_CUTIES @@ -388,7 +410,7 @@ typedef union // size = 0x24 /*0x02*/ u8 nRibbons; /*0x03*/ u8 selectedRibbon; /*0x04*/ u8 nickname[POKEMON_NAME_LENGTH + 1]; - /*0x0f*/ u8 language; + /*0x0F*/ u8 language; /*0x10*/ u8 pokemonNameLanguage; /*0x11*/ u8 filler_12[2]; /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; @@ -402,11 +424,12 @@ typedef union // size = 0x24 /*0x04*/ u16 species1; /*0x06*/ u16 species2; /*0x08*/ u16 species3; - /*0x0a*/ u16 species4; - /*0x0c*/ u8 language; - /*0x0d*/ u8 facilityAndMode; - /*0x0e*/ u8 filler_0e[5]; + /*0x0A*/ u16 species4; + /*0x0C*/ u8 language; + /*0x0D*/ u8 facilityAndMode; + /*0x0E*/ u8 filler_0e[5]; /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; + /*0x1B*/ //u8 padding; } frontier; // TVSHOW_NUMBER_ONE @@ -418,6 +441,7 @@ typedef union // size = 0x24 /*0x05*/ u8 language; /*0x06*/ u8 filler_06[13]; /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; + /*0x1B*/ //u8 padding; } numberOne; // TVSHOW_SECRET_BASE_SECRETS @@ -426,12 +450,13 @@ typedef union // size = 0x24 /*0x01*/ bool8 active; /*0x02*/ u16 stepsInBase; /*0x04*/ u8 baseOwnersName[PLAYER_NAME_LENGTH + 1]; - /*0x0c*/ u32 flags; + /*0x0C*/ u32 flags; /*0x10*/ u16 item; /*0x12*/ u8 savedState; /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; - /*0x1b*/ u8 language; - /*0x1c*/ u8 baseOwnersNameLanguage; + /*0x1B*/ u8 language; + /*0x1C*/ u8 baseOwnersNameLanguage; + /*0x1D*/ //u8 padding[3]; } secretBaseSecrets; // TVSHOW_SAFARI_FAN_CLUB @@ -463,6 +488,7 @@ typedef union // size = 0x24 /*0x15*/ u8 unused5; /*0x16*/ u16 daysLeft; /*0x18*/ u8 language; + /*0x19*/ //u8 padding; } massOutbreak; } TVShow; @@ -475,23 +501,23 @@ typedef struct struct GabbyAndTyData { - /*2ba4*/ u16 mon1; - /*2ba6*/ u16 mon2; - /*2ba8*/ u16 lastMove; - /*2baa*/ u16 quote[1]; - /*2bac*/ u8 mapnum; - /*2bad*/ u8 battleNum; - /*2bae*/ u8 battleTookMoreThanOneTurn:1; - /*2bae*/ u8 playerLostAMon:1; - /*2bae*/ u8 playerUsedHealingItem:1; - /*2bae*/ u8 playerThrewABall:1; - /*2bae*/ u8 onAir:1; - /*2bae*/ u8 valA_5:3; - /*2baf*/ u8 battleTookMoreThanOneTurn2:1; - /*2baf*/ u8 playerLostAMon2:1; - /*2baf*/ u8 playerUsedHealingItem2:1; - /*2baf*/ u8 playerThrewABall2:1; - /*2baf*/ u8 valB_4:4; + /*2BA4*/ u16 mon1; + /*2BA6*/ u16 mon2; + /*2BA8*/ u16 lastMove; + /*2BAA*/ u16 quote[1]; + /*2BAC*/ u8 mapnum; + /*2BAD*/ u8 battleNum; + /*2BAE*/ u8 battleTookMoreThanOneTurn:1; + u8 playerLostAMon:1; + u8 playerUsedHealingItem:1; + u8 playerThrewABall:1; + u8 onAir:1; + u8 valA_5:3; + /*2BAF*/ u8 battleTookMoreThanOneTurn2:1; + u8 playerLostAMon2:1; + u8 playerUsedHealingItem2:1; + u8 playerThrewABall2:1; + u8 valB_4:4; }; #endif //GUARD_GLOBAL_TV_H diff --git a/include/graphics.h b/include/graphics.h index 512038b5f..df3f16e8f 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -491,7 +491,6 @@ extern const u32 gMonFrontPic_Burmy[]; extern const u32 gMonFrontPic_Wormadam[]; extern const u32 gMonFrontPic_Mothim[]; extern const u32 gMonFrontPic_Combee[]; -extern const u32 gMonFrontPic_CombeeF[]; extern const u32 gMonFrontPic_Vespiquen[]; extern const u32 gMonFrontPic_Pachirisu[]; extern const u32 gMonFrontPic_Buizel[]; @@ -526,7 +525,6 @@ extern const u32 gMonFrontPic_Munchlax[]; extern const u32 gMonFrontPic_Riolu[]; extern const u32 gMonFrontPic_Lucario[]; extern const u32 gMonFrontPic_Hippopotas[]; -extern const u32 gMonFrontPic_HippopotasF[]; extern const u32 gMonFrontPic_Hippowdon[]; extern const u32 gMonFrontPic_Skorupi[]; extern const u32 gMonFrontPic_Drapion[]; @@ -1741,9 +1739,7 @@ extern const u32 gMonBackPic_Munchlax[]; extern const u32 gMonBackPic_Riolu[]; extern const u32 gMonBackPic_Lucario[]; extern const u32 gMonBackPic_Hippopotas[]; -extern const u32 gMonBackPic_HippopotasF[]; extern const u32 gMonBackPic_Hippowdon[]; -extern const u32 gMonBackPic_HippowdonF[]; extern const u32 gMonBackPic_Skorupi[]; extern const u32 gMonBackPic_Drapion[]; extern const u32 gMonBackPic_Croagunk[]; @@ -2913,6 +2909,7 @@ extern const u32 gMonPalette_Burmy[]; extern const u32 gMonPalette_Wormadam[]; extern const u32 gMonPalette_Mothim[]; extern const u32 gMonPalette_Combee[]; +extern const u32 gMonPalette_CombeeF[]; extern const u32 gMonPalette_Vespiquen[]; extern const u32 gMonPalette_Pachirisu[]; extern const u32 gMonPalette_Buizel[]; @@ -3175,7 +3172,6 @@ extern const u32 gMonPalette_Spewpa[]; extern const u32 gMonPalette_Vivillon[]; extern const u32 gMonPalette_Litleo[]; extern const u32 gMonPalette_Pyroar[]; -extern const u32 gMonPalette_PyroarF[]; extern const u32 gMonPalette_Flabebe[]; extern const u32 gMonPalette_Floette[]; extern const u32 gMonPalette_Florges[]; @@ -4146,6 +4142,7 @@ extern const u32 gMonShinyPalette_Burmy[]; extern const u32 gMonShinyPalette_Wormadam[]; extern const u32 gMonShinyPalette_Mothim[]; extern const u32 gMonShinyPalette_Combee[]; +extern const u32 gMonShinyPalette_CombeeF[]; extern const u32 gMonShinyPalette_Vespiquen[]; extern const u32 gMonShinyPalette_Pachirisu[]; extern const u32 gMonShinyPalette_Buizel[]; @@ -4183,7 +4180,6 @@ extern const u32 gMonShinyPalette_Hippopotas[]; extern const u32 gMonShinyPalette_HippopotasF[]; extern const u32 gMonShinyPalette_Hippowdon[]; extern const u32 gMonShinyPalette_HippowdonF[]; -extern const u32 gMonShinyPalette_Hippowdon[]; extern const u32 gMonShinyPalette_Skorupi[]; extern const u32 gMonShinyPalette_Drapion[]; extern const u32 gMonShinyPalette_Croagunk[]; @@ -4409,7 +4405,6 @@ extern const u32 gMonShinyPalette_Spewpa[]; extern const u32 gMonShinyPalette_Vivillon[]; extern const u32 gMonShinyPalette_Litleo[]; extern const u32 gMonShinyPalette_Pyroar[]; -extern const u32 gMonShinyPalette_PyroarF[]; extern const u32 gMonShinyPalette_Flabebe[]; extern const u32 gMonShinyPalette_Floette[]; extern const u32 gMonShinyPalette_Florges[]; @@ -5407,6 +5402,10 @@ extern const u8 gMonIcon_Riolu[]; extern const u8 gMonIcon_Lucario[]; extern const u8 gMonIcon_Hippopotas[]; extern const u8 gMonIcon_Hippowdon[]; +#if P_HIPPO_GENDER_DIFF_ICONS == TRUE +extern const u8 gMonIcon_HippopotasF[]; +extern const u8 gMonIcon_HippowdonF[]; +#endif extern const u8 gMonIcon_Skorupi[]; extern const u8 gMonIcon_Drapion[]; extern const u8 gMonIcon_Croagunk[]; @@ -9957,6 +9956,8 @@ extern const u32 gBattleAnimSpriteGfx_Tornado[]; extern const u32 gBattleAnimSpritePal_Tornado[]; extern const u32 gBattleAnimSpriteGfx_ZMoveSymbol[]; extern const u32 gBattleAnimSpritePal_ZMoveSymbol[]; +extern const u32 gBattleAnimSpriteGfx_Teapot[]; +extern const u32 gBattleAnimSpritePal_Teapot[]; extern const u32 gBattleAnimBgImage_Dark[]; extern const u32 gBattleAnimBgImage_Ghost[]; diff --git a/include/link_rfu.h b/include/link_rfu.h index c576d04a1..cf4bb2ca7 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -109,7 +109,7 @@ struct __attribute__((packed, aligned(2))) RfuGameData u8 playerGender:1; u8 tradeLevel:7; u8 tradeType:6; - u8 padding:2; + u8 filler:2; }; // Constants for getting/setting information in 'partnerInfo' of RfuGameData. diff --git a/include/mail.h b/include/mail.h index f4590a70e..00fe3425a 100644 --- a/include/mail.h +++ b/include/mail.h @@ -22,8 +22,6 @@ void ClearAllMail(void); void ClearMail(struct Mail *mail); bool8 MonHasMail(struct Pokemon *mon); u8 GiveMailToMonByItemId(struct Pokemon *mon, u16 itemId); -u16 SpeciesToMailSpecies(u16 species, u32 personality); -u16 MailSpeciesToSpecies(u16 mailSpecies, u16 *buffer); u8 GiveMailToMon(struct Pokemon *mon, struct Mail *mail); void TakeMailFromMon(struct Pokemon *mon); void ClearMailItemId(u8 mailId); diff --git a/src/battle_ai_main.c b/src/battle_ai_main.c index 384c50d88..92866a7c2 100644 --- a/src/battle_ai_main.c +++ b/src/battle_ai_main.c @@ -2702,7 +2702,7 @@ static s16 AI_DoubleBattle(u8 battlerAtk, u8 battlerDef, u16 move, s16 score) switch (gBattleMoves[AI_DATA->partnerMove].effect) { case EFFECT_HELPING_HAND: - if (IS_MOVE_STATUS(move)) + if (!IS_MOVE_STATUS(move)) score += 5; break; case EFFECT_PERISH_SONG: diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index 128f223a1..ef97ab9a1 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -2429,19 +2429,41 @@ static bool32 PartyBattlerShouldAvoidHazards(u8 currBattler, u8 switchBattler) { struct Pokemon *mon = GetPartyBattlerPartyData(currBattler, switchBattler); u16 ability = GetMonAbility(mon); // we know our own party data - u16 holdEffect = GetBattlerHoldEffect(GetMonData(mon, MON_DATA_HELD_ITEM), TRUE); + u16 holdEffect; + u16 species = GetMonData(mon, MON_DATA_SPECIES); u32 flags = gSideStatuses[GetBattlerSide(currBattler)] & (SIDE_STATUS_SPIKES | SIDE_STATUS_STEALTH_ROCK | SIDE_STATUS_STICKY_WEB | SIDE_STATUS_TOXIC_SPIKES); + s32 hazardDamage = 0; + u8 type1 = gSpeciesInfo[species].type1; + u8 type2 = gSpeciesInfo[species].type2; + u32 maxHp = GetMonData(mon, MON_DATA_MAX_HP); if (flags == 0) return FALSE; - if (ability == ABILITY_MAGIC_GUARD || ability == ABILITY_LEVITATE - || holdEffect == HOLD_EFFECT_HEAVY_DUTY_BOOTS) + if (ability == ABILITY_MAGIC_GUARD) + return FALSE; + if (gFieldStatuses & STATUS_FIELD_MAGIC_ROOM || ability == ABILITY_KLUTZ) + holdEffect = HOLD_EFFECT_NONE; + else + holdEffect = gItems[GetMonData(mon, MON_DATA_HELD_ITEM)].holdEffect; + if (holdEffect == HOLD_EFFECT_HEAVY_DUTY_BOOTS) return FALSE; - if (flags & (SIDE_STATUS_SPIKES | SIDE_STATUS_STEALTH_ROCK) && GetMonData(mon, MON_DATA_HP) < (GetMonData(mon, MON_DATA_MAX_HP) / 8)) - return TRUE; + if (flags & SIDE_STATUS_STEALTH_ROCK) + hazardDamage += GetStealthHazardDamageByTypesAndHP(gBattleMoves[MOVE_STEALTH_ROCK].type, type1, type2, maxHp); + if (flags & SIDE_STATUS_SPIKES && ((type1 != TYPE_FLYING && type2 != TYPE_FLYING + && ability != ABILITY_LEVITATE && holdEffect != HOLD_EFFECT_AIR_BALLOON) + || holdEffect == HOLD_EFFECT_IRON_BALL || gFieldStatuses & STATUS_FIELD_GRAVITY)) + { + u8 spikesDmg = maxHp / ((5 - gSideTimers[GetBattlerSide(currBattler)].spikesAmount) * 2); + if (spikesDmg == 0) + spikesDmg = 1; + hazardDamage += spikesDmg; + } + + if (hazardDamage >= GetMonData(mon, MON_DATA_HP)) + return TRUE; return FALSE; } diff --git a/src/battle_anim.c b/src/battle_anim.c index f949065f2..86867fc9c 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -739,7 +739,7 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible) battlerSpriteId = gBattlerSpriteIds[battlerId]; gBattle_BG1_X = -(gSprites[battlerSpriteId].x + gSprites[battlerSpriteId].x2) + 0x20; - if (IsContest() && IsSpeciesNotUnown(gContestResources->moveAnim->species)) + if (IsContest()) gBattle_BG1_X--; gBattle_BG1_Y = -(gSprites[battlerSpriteId].y + gSprites[battlerSpriteId].y2) + 0x20; @@ -797,24 +797,21 @@ static void FlipBattlerBgTiles(void) struct BattleAnimBgData animBg; u16 *ptr; - if (IsSpeciesNotUnown(gContestResources->moveAnim->species)) + GetBattleAnimBg1Data(&animBg); + ptr = animBg.bgTilemap; + for (i = 0; i < 8; i++) { - GetBattleAnimBg1Data(&animBg); - ptr = animBg.bgTilemap; - for (i = 0; i < 8; i++) + for (j = 0; j < 4; j++) { - for (j = 0; j < 4; j++) - { - u16 temp; - SWAP(ptr[j + i * 32], ptr[7 - j + i * 32], temp); - } - } - for (i = 0; i < 8; i++) - { - for (j = 0; j < 8; j++) - ptr[j + i * 32] ^= 0x400; + u16 temp; + SWAP(ptr[j + i * 32], ptr[7 - j + i * 32], temp); } } + for (i = 0; i < 8; i++) + { + for (j = 0; j < 8; j++) + ptr[j + i * 32] ^= 0x400; + } } void RelocateBattleBgPal(u16 paletteNum, u16 *dest, u32 offset, bool8 largeScreen) diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index 0db7f69d5..ea36b2eac 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -2447,6 +2447,39 @@ const struct SpriteTemplate gFollowMeFingerSpriteTemplate = .callback = AnimFollowMeFinger, }; +const union AffineAnimCmd gTeaAffineAnimCmds1[] = +{ + AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 0), + AFFINEANIMCMD_FRAME(0x1E, 0x1E, 0, 8), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gTeaAffineAnimCmds2[] = +{ + AFFINEANIMCMD_FRAME(0x0, 0x0, -3, 11), + AFFINEANIMCMD_FRAME(0x0, 0x0, 3, 11), + AFFINEANIMCMD_LOOP(2), + AFFINEANIMCMD_FRAME(0xFFE2, 0xFFE2, 0, 8), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd *const gTeaAffineAnimTable[] = +{ + gTeaAffineAnimCmds1, + gTeaAffineAnimCmds2, +}; + +const struct SpriteTemplate gTeapotSpriteTemplate = +{ + .tileTag = ANIM_TAG_TEAPOT, + .paletteTag = ANIM_TAG_TEAPOT, + .oam = &gOamData_AffineDouble_ObjNormal_64x64, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gTeaAffineAnimTable, + .callback = AnimMetronomeFinger, +}; + const union AnimCmd gTauntFingerAnimCmds1[] = { ANIMCMD_FRAME(0, 1), diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index 552fcf517..ace78bc88 100755 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -2378,33 +2378,7 @@ void AnimTask_TransformMon(u8 taskId) LoadBgTiles(1, animBg.bgTiles, 0x800, animBg.tilesOffset); if (IsContest()) { - if (IsSpeciesNotUnown(gContestResources->moveAnim->species) != IsSpeciesNotUnown(gContestResources->moveAnim->targetSpecies)) - { - bgTilemap = (u16 *)animBg.bgTilemap; - for (i = 0; i < 8; i++) - { - for (j = 0; j < 4; j++) - { - u16 temp = bgTilemap[j + i * 0x20]; - bgTilemap[j + i * 0x20] = bgTilemap[(7 - j) + i * 0x20]; - bgTilemap[(7 - j) + i * 0x20] = temp; - } - } - - for (i = 0; i < 8; i++) - { - for (j = 0; j < 8; j++) - { - bgTilemap[j + i * 0x20] ^= 0x400; - } - } - } - - if (IsSpeciesNotUnown(gContestResources->moveAnim->targetSpecies)) - gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].affineAnims = gAffineAnims_BattleSpriteContest; - else - gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].affineAnims = gAffineAnims_BattleSpriteOpponentSide; - + gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].affineAnims = gAffineAnims_BattleSpriteContest; StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[gBattleAnimAttacker]], BATTLER_AFFINE_NORMAL); } diff --git a/src/battle_anim_mons.c b/src/battle_anim_mons.c index dfe2666a6..af5957411 100644 --- a/src/battle_anim_mons.c +++ b/src/battle_anim_mons.c @@ -177,64 +177,21 @@ u8 GetBattlerYDelta(u8 battlerId, u16 species) if (GetBattlerSide(battlerId) == B_SIDE_PLAYER || IsContest()) { - if (species == SPECIES_UNOWN) - { - if (IsContest()) - { - if (gContestResources->moveAnim->hasTargetAnim) - personality = gContestResources->moveAnim->targetPersonality; - else - personality = gContestResources->moveAnim->personality; - } - else - { - spriteInfo = gBattleSpritesDataPtr->battlerData; - if (!spriteInfo[battlerId].transformSpecies) - personality = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_PERSONALITY); - else - personality = gTransformedPersonalities[battlerId]; - } - coordSpecies = GetUnownSpeciesId(personality); - ret = gMonBackPicCoords[coordSpecies].y_offset; - } - else if (species == SPECIES_CASTFORM) - { + if (species == SPECIES_CASTFORM) ret = sCastformBackSpriteYCoords[gBattleMonForms[battlerId]]; - } else if (species > NUM_SPECIES) - { ret = gMonBackPicCoords[0].y_offset; - } else - { ret = gMonBackPicCoords[species].y_offset; - } } else { - if (species == SPECIES_UNOWN) - { - spriteInfo = gBattleSpritesDataPtr->battlerData; - if (!spriteInfo[battlerId].transformSpecies) - personality = GetMonData(&gEnemyParty[gBattlerPartyIndexes[battlerId]], MON_DATA_PERSONALITY); - else - personality = gTransformedPersonalities[battlerId]; - - coordSpecies = GetUnownSpeciesId(personality); - ret = gMonFrontPicCoords[coordSpecies].y_offset; - } - else if (species == SPECIES_CASTFORM) - { + if (species == SPECIES_CASTFORM) ret = gCastformFrontSpriteCoords[gBattleMonForms[battlerId]].y_offset; - } else if (species > NUM_SPECIES) - { ret = gMonFrontPicCoords[0].y_offset; - } else - { ret = gMonFrontPicCoords[species].y_offset; - } } return ret; } @@ -1317,17 +1274,7 @@ void SetSpriteRotScale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation) // Pokémon in Contests (except Unown) should be flipped. static bool8 ShouldRotScaleSpeciesBeFlipped(void) { - if (IsContest()) - { - if (gSprites[GetAnimBattlerSpriteId(ANIM_ATTACKER)].data[2] == SPECIES_UNOWN) - return FALSE; - else - return TRUE; - } - else - { - return FALSE; - } + return IsContest(); } void PrepareBattlerSpriteForRotScale(u8 spriteId, u8 objMode) @@ -2197,12 +2144,8 @@ s16 GetBattlerSpriteCoordAttr(u8 battlerId, u8 attr) species = gContestResources->moveAnim->species; personality = gContestResources->moveAnim->personality; } - if (species == SPECIES_UNOWN) - { - species = GetUnownSpeciesId(personality); - coords = &gMonBackPicCoords[species]; - } - else if (species == SPECIES_CASTFORM) + + if (species == SPECIES_CASTFORM) { coords = &gCastformFrontSpriteCoords[gBattleMonForms[battlerId]]; } @@ -2231,19 +2174,10 @@ s16 GetBattlerSpriteCoordAttr(u8 battlerId, u8 attr) personality = gTransformedPersonalities[battlerId]; } - if (species == SPECIES_UNOWN) - { - species = GetUnownSpeciesId(personality); - coords = &gMonBackPicCoords[species]; - } - else if (species > NUM_SPECIES) - { + if (species > NUM_SPECIES) coords = &gMonBackPicCoords[0]; - } else - { coords = &gMonBackPicCoords[species]; - } } else { @@ -2259,23 +2193,12 @@ s16 GetBattlerSpriteCoordAttr(u8 battlerId, u8 attr) personality = gTransformedPersonalities[battlerId]; } - if (species == SPECIES_UNOWN) - { - species = GetUnownSpeciesId(personality); - coords = &gMonFrontPicCoords[species]; - } - else if (species == SPECIES_CASTFORM) - { + if (species == SPECIES_CASTFORM) coords = &gCastformFrontSpriteCoords[gBattleMonForms[battlerId]]; - } else if (species > NUM_SPECIES) - { coords = &gMonFrontPicCoords[0]; - } else - { coords = &gMonFrontPicCoords[species]; - } } } diff --git a/src/battle_anim_new.c b/src/battle_anim_new.c index 0a65deb28..b3502fcb9 100644 --- a/src/battle_anim_new.c +++ b/src/battle_anim_new.c @@ -7857,7 +7857,7 @@ static void SpriteCB_TwinkleOnBattler(struct Sprite *sprite) void AnimTask_PrimalReversion(u8 taskId) { - if (gBattleMons[gBattleAnimAttacker].item == ITEM_RED_ORB) + if (gBattleMons[gBattleAnimAttacker].item == ITEM_RED_ORB || gBattleMons[gBattleAnimAttacker].item == ITEM_BLUE_ORB) gBattleAnimArgs[0] = gBattleMons[gBattleAnimAttacker].item; else gBattleAnimArgs[0] = 0; diff --git a/src/battle_debug.c b/src/battle_debug.c index be7dbf715..1fd2d9b00 100644 --- a/src/battle_debug.c +++ b/src/battle_debug.c @@ -1759,7 +1759,7 @@ static void SetUpModifyArrows(struct BattleDebugMenu *data) { case LIST_ITEM_ABILITY: data->modifyArrows.minValue = 0; - data->modifyArrows.maxValue = ABILITIES_COUNT_GEN8 - 1; + data->modifyArrows.maxValue = ABILITIES_COUNT - 1; data->modifyArrows.maxDigits = 3; data->modifyArrows.modifiedValPtr = &gBattleMons[data->battlerId].ability; data->modifyArrows.typeOfVal = VAL_U16; diff --git a/src/battle_factory.c b/src/battle_factory.c index 77f501387..d388b61fb 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -334,7 +334,7 @@ static void GenerateOpponentMons(void) u16 monId = GetFactoryMonId(lvlMode, challengeNum, FALSE); // Unown (FRONTIER_MON_UNOWN) is forbidden on opponent Factory teams. - if (gFacilityTrainerMons[monId].species == SPECIES_UNOWN) + if (GET_BASE_SPECIES_ID(gFacilityTrainerMons[monId].species) == SPECIES_UNOWN_A) continue; // Ensure none of the opponent's pokemon are the same as the potential rental pokemon for the player @@ -559,7 +559,7 @@ static void GenerateInitialRentalMons(void) else monId = GetFactoryMonId(factoryLvlMode, challengeNum, FALSE); - if (gFacilityTrainerMons[monId].species == SPECIES_UNOWN) + if (GET_BASE_SPECIES_ID(gFacilityTrainerMons[monId].species) == SPECIES_UNOWN_A) continue; // Cannot have two pokemon of the same species. @@ -771,7 +771,7 @@ void FillFactoryBrainParty(void) { u16 monId = GetFactoryMonId(lvlMode, challengeNum, FALSE); - if (gFacilityTrainerMons[monId].species == SPECIES_UNOWN) + if (GET_BASE_SPECIES_ID(gFacilityTrainerMons[monId].species) == SPECIES_UNOWN_A) continue; if (monLevel == FRONTIER_MAX_LEVEL_50 && monId > FRONTIER_MONS_HIGH_TIER) continue; diff --git a/src/battle_main.c b/src/battle_main.c index d138cf231..add990d30 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -101,7 +101,7 @@ static void SetActionsAndBattlersTurnOrder(void); static void UpdateBattlerPartyOrdersOnSwitch(void); static bool8 AllAtActionConfirmed(void); static void TryChangeTurnOrder(void); -static void CheckFocusPunch_ClearVarsBeforeTurnStarts(void); +static void CheckChosenMoveForEffectsBeforeTurnStarts(void); static void CheckMegaEvolutionBeforeTurn(void); static void CheckQuickClaw_CustapBerryActivation(void); static void FreeResetData_ReturnToOvOrDoEvolutions(void); @@ -2662,12 +2662,7 @@ void SpriteCB_FaintOpponentMon(struct Sprite *sprite) GetMonData(&gEnemyParty[gBattlerPartyIndexes[battler]], MON_DATA_PERSONALITY); // Unused return value. - if (species == SPECIES_UNOWN) - { - species = GetUnownSpeciesId(personality); - yOffset = gMonFrontPicCoords[species].y_offset; - } - else if (species == SPECIES_CASTFORM) + if (species == SPECIES_CASTFORM) { yOffset = gCastformFrontSpriteCoords[gBattleMonForms[battler]].y_offset; } @@ -3039,6 +3034,7 @@ static void BattleStartClearSetData(void) gBattleStruct->stickyWebUser = 0xFF; gBattleStruct->appearedInBattle = 0; + gBattleStruct->beatUpSlot = 0; for (i = 0; i < PARTY_SIZE; i++) { @@ -4480,6 +4476,7 @@ u32 GetBattlerTotalSpeedStat(u8 battlerId) u32 speed = gBattleMons[battlerId].speed; u32 ability = GetBattlerAbility(battlerId); u32 holdEffect = GetBattlerHoldEffect(battlerId, TRUE); + u32 highestStat = GetHighestStatId(battlerId); // weather abilities if (WEATHER_HAS_EFFECT) @@ -4501,6 +4498,10 @@ u32 GetBattlerTotalSpeedStat(u8 battlerId) speed *= 2; else if (ability == ABILITY_SLOW_START && gDisableStructs[battlerId].slowStartTimer != 0) speed /= 2; + else if (ability == ABILITY_PROTOSYNTHESIS && gBattleWeather & B_WEATHER_SUN && highestStat == STAT_SPEED) + speed = (speed * 150) / 100; + else if (ability == ABILITY_QUARK_DRIVE && gFieldStatuses & STATUS_FIELD_ELECTRIC_TERRAIN && highestStat == STAT_SPEED) + speed = (speed * 150) / 100; // stat stages speed *= gStatStageRatios[gBattleMons[battlerId].statStages[STAT_SPEED]][0]; @@ -4666,6 +4667,10 @@ u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves) strikesFirst = 1; else if (ability2 == ABILITY_STALL && ability1 != ABILITY_STALL) strikesFirst = 0; + else if (ability1 == ABILITY_MYCELIUM_MIGHT && ability2 != ABILITY_MYCELIUM_MIGHT && IS_MOVE_STATUS(gCurrentMove)) + strikesFirst = 1; + else if (ability2 == ABILITY_MYCELIUM_MIGHT && ability1 != ABILITY_MYCELIUM_MIGHT && IS_MOVE_STATUS(gCurrentMove)) + strikesFirst = 0; else { if (speedBattler1 == speedBattler2 && Random() & 1) @@ -4878,7 +4883,7 @@ static void CheckMegaEvolutionBeforeTurn(void) } #if B_MEGA_EVO_TURN_ORDER <= GEN_6 - gBattleMainFunc = CheckFocusPunch_ClearVarsBeforeTurnStarts; + gBattleMainFunc = CheckChosenMoveForEffectsBeforeTurnStarts; gBattleStruct->focusPunchBattlerId = 0; #else gBattleMainFunc = TryChangeTurnOrder; // This will just do nothing if no mon has mega evolved @@ -4903,11 +4908,11 @@ static void TryChangeTurnOrder(void) } } } - gBattleMainFunc = CheckFocusPunch_ClearVarsBeforeTurnStarts; + gBattleMainFunc = CheckChosenMoveForEffectsBeforeTurnStarts; gBattleStruct->focusPunchBattlerId = 0; } -static void CheckFocusPunch_ClearVarsBeforeTurnStarts(void) +static void CheckChosenMoveForEffectsBeforeTurnStarts(void) { u32 i; @@ -4921,7 +4926,7 @@ static void CheckFocusPunch_ClearVarsBeforeTurnStarts(void) && !(gDisableStructs[gBattlerAttacker].truantCounter) && !(gProtectStructs[gActiveBattler].noValidMoves)) { - switch(gChosenMoveByBattler[gActiveBattler]) + switch (gChosenMoveByBattler[gActiveBattler]) { case MOVE_FOCUS_PUNCH: BattleScriptExecute(BattleScript_FocusPunchSetUp); diff --git a/src/battle_message.c b/src/battle_message.c index 031261a28..1189cf3e1 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -616,7 +616,7 @@ static const u8 sText_HealingWishCameTrue[] = _("The healing wish came true\nfor static const u8 sText_HealingWishHealed[] = _("{B_ATK_NAME_WITH_PREFIX} regained health!"); static const u8 sText_LunarDanceCameTrue[] = _("{B_ATK_NAME_WITH_PREFIX} became cloaked\nin mystical moonlight!"); static const u8 sText_CursedBodyDisabled[] = _("{B_ATK_NAME_WITH_PREFIX}'s {B_BUFF1} was disabled\nby {B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}!"); -static const u8 sText_AttackerAquiredAbility[] = _("{B_ATK_NAME_WITH_PREFIX} acquired {B_LAST_ABILITY}!"); +static const u8 sText_AttackerAquiredAbility[] = _("{B_ATK_NAME_WITH_PREFIX} acquired\n{B_LAST_ABILITY}!"); static const u8 sText_TargetStatWontGoHigher[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_BUFF1}\nwon't go higher!"); static const u8 sText_PkmnMoveBouncedViaAbility[] = _("{B_ATK_NAME_WITH_PREFIX}'s {B_CURRENT_MOVE} was\nbounced back by {B_DEF_NAME_WITH_PREFIX}'s\l{B_DEF_ABILITY}!"); static const u8 sText_ImposterTransform[] = _("{B_ATK_NAME_WITH_PREFIX} transformed into\n{B_DEF_NAME_WITH_PREFIX} using {B_LAST_ABILITY}!"); @@ -761,9 +761,21 @@ static const u8 sText_AttackerMeltedTheIce[] = _("{B_ATK_NAME_WITH_PREFIX} melte static const u8 sText_TargetToughedItOut[] = _("{B_DEF_NAME_WITH_PREFIX} toughed it out\nto show you its best side!"); static const u8 sText_AttackerLostElectricType[] = _("{B_ATK_NAME_WITH_PREFIX} used up all\nof its electricity!"); static const u8 sText_AttackerSwitchedStatWithTarget[] = _("{B_ATK_NAME_WITH_PREFIX} switched {B_BUFF1}\nwith its target!"); +static const u8 sText_BeingHitChargedPkmnWithPower[] = _("Being hit by {B_CURRENT_MOVE}\ncharged {B_ATK_NAME_WITH_PREFIX} with power!"); +static const u8 sText_SunlightActivatedAbility[] = _("The harsh sunlight activated\n{B_ATK_NAME_WITH_PREFIX}'s {B_ATK_ABILITY}!"); +static const u8 sText_StatWasHeightened[] = _("{B_ATK_NAME_WITH_PREFIX}'s {B_BUFF1} was heightened!"); +static const u8 sText_ElectricTerrainActivatedAbility[] = _("The Electric Terrain activated\n{B_ATK_NAME_WITH_PREFIX}'s {B_ATK_ABILITY}!"); +static const u8 sText_AbilityWeakenedSurroundingMonsStat[] = _("{B_ATK_NAME_WITH_PREFIX}'s {B_ATK_ABILITY}\nweakened the {B_BUFF1} of\lall surrounding Pokémon!\p"); +static const u8 sText_AttackerGainedStrengthFromTheFallen[] = _("{B_ATK_NAME_WITH_PREFIX} gained strength\nfrom the fallen!"); const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] = { + [STRINGID_ATTACKERGAINEDSTRENGTHFROMTHEFALLEN - BATTLESTRINGS_TABLE_START] = sText_AttackerGainedStrengthFromTheFallen, + [STRINGID_ABILITYWEAKENEDFSURROUNDINGMONSSTAT - BATTLESTRINGS_TABLE_START] = sText_AbilityWeakenedSurroundingMonsStat, + [STRINGID_ELECTRICTERRAINACTIVATEDABILITY - BATTLESTRINGS_TABLE_START] = sText_ElectricTerrainActivatedAbility, + [STRINGID_STATWASHEIGHTENED - BATTLESTRINGS_TABLE_START] = sText_StatWasHeightened, + [STRINGID_SUNLIGHTACTIVATEDABILITY - BATTLESTRINGS_TABLE_START] = sText_SunlightActivatedAbility, + [STRINGID_BEINGHITCHARGEDPKMNWITHPOWER - BATTLESTRINGS_TABLE_START] = sText_BeingHitChargedPkmnWithPower, [STRINGID_ATTACKERSWITCHEDSTATWITHTARGET - BATTLESTRINGS_TABLE_START] = sText_AttackerSwitchedStatWithTarget, [STRINGID_TARGETTOUGHEDITOUT - BATTLESTRINGS_TABLE_START] = sText_TargetToughedItOut, [STRINGID_ATTACKERMELTEDTHEICE - BATTLESTRINGS_TABLE_START] = sText_AttackerMeltedTheIce, diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index d5eea13b1..e24b0cc1c 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -1808,7 +1808,7 @@ u32 GetTotalAccuracy(u32 battlerAtk, u32 battlerDef, u32 move, u32 atkAbility, u if (atkHoldEffect == HOLD_EFFECT_WIDE_LENS) calc = (calc * (100 + atkParam)) / 100; - else if (atkHoldEffect == HOLD_EFFECT_ZOOM_LENS && GetBattlerTurnOrderNum(battlerAtk) > GetBattlerTurnOrderNum(battlerDef)); + else if (atkHoldEffect == HOLD_EFFECT_ZOOM_LENS && GetBattlerTurnOrderNum(battlerAtk) > GetBattlerTurnOrderNum(battlerDef)) calc = (calc * (100 + atkParam)) / 100; if (gProtectStructs[battlerAtk].usedMicleBerry) @@ -4802,22 +4802,24 @@ static void Cmd_setroost(void) { gBattleStruct->roostTypes[gBattlerAttacker][0] = TYPE_FLYING; gBattleStruct->roostTypes[gBattlerAttacker][1] = TYPE_FLYING; - gBattleStruct->roostTypes[gBattlerAttacker][2] = TYPE_FLYING; +#if B_ROOST_PURE_FLYING >= GEN_5 SET_BATTLER_TYPE(gBattlerAttacker, TYPE_NORMAL); +#else + SET_BATTLER_TYPE(gBattlerAttacker, TYPE_MYSTERY); +#endif } - // Dual Type with Flying Type. - else if ((gBattleMons[gBattlerAttacker].type1 == TYPE_FLYING && gBattleMons[gBattlerAttacker].type2 != TYPE_FLYING) - ||(gBattleMons[gBattlerAttacker].type2 == TYPE_FLYING && gBattleMons[gBattlerAttacker].type1 != TYPE_FLYING)) + // Dual type with flying type. + else if (gBattleMons[gBattlerAttacker].type1 == TYPE_FLYING || gBattleMons[gBattlerAttacker].type2 == TYPE_FLYING) { gBattleStruct->roostTypes[gBattlerAttacker][0] = gBattleMons[gBattlerAttacker].type1; gBattleStruct->roostTypes[gBattlerAttacker][1] = gBattleMons[gBattlerAttacker].type2; if (gBattleMons[gBattlerAttacker].type1 == TYPE_FLYING) gBattleMons[gBattlerAttacker].type1 = TYPE_MYSTERY; - if (gBattleMons[gBattlerAttacker].type2 == TYPE_FLYING) + else if (gBattleMons[gBattlerAttacker].type2 == TYPE_FLYING) gBattleMons[gBattlerAttacker].type2 = TYPE_MYSTERY; } // Non-flying type. - else if (!IS_BATTLER_OF_TYPE(gBattlerAttacker, TYPE_FLYING)) + else { gBattleStruct->roostTypes[gBattlerAttacker][0] = gBattleMons[gBattlerAttacker].type1; gBattleStruct->roostTypes[gBattlerAttacker][1] = gBattleMons[gBattlerAttacker].type2; @@ -5759,7 +5761,8 @@ static void Cmd_moveend(void) if (gCurrentMove != MOVE_DRAGON_TAIL && gCurrentMove != MOVE_CIRCLE_THROW && IsBattlerAlive(gBattlerAttacker) - && !TestSheerForceFlag(gBattlerAttacker, gCurrentMove)) + && !TestSheerForceFlag(gBattlerAttacker, gCurrentMove) + && GetBattlerAbility(gBattlerAttacker) != ABILITY_GUARD_DOG) { // Since we check if battler was damaged, we don't need to check move result. // In fact, doing so actually prevents multi-target moves from activating red card properly @@ -7943,7 +7946,7 @@ static void HandleTerrainMove(u16 move) statusFlag = STATUS_FIELD_PSYCHIC_TERRAIN; gBattleCommunication[MULTISTRING_CHOOSER] = 3; break; - case EFFECT_DAMAGE_SET_TERRAIN: + case EFFECT_HIT_SET_REMOVE_TERRAIN: switch (gBattleMoves[move].argument) { case 0: //genesis supernova @@ -8101,7 +8104,7 @@ static void RecalcBattlerStats(u32 battler, struct Pokemon *mon) gBattleMons[battler].type2 = gSpeciesInfo[gBattleMons[battler].species].type2; } -static u32 GetHighestStatId(u32 battlerId) +u32 GetHighestStatId(u32 battlerId) { u32 i, highestId = STAT_ATK, highestStat = gBattleMons[battlerId].attack; @@ -8132,6 +8135,67 @@ static bool32 IsRototillerAffected(u32 battlerId) return TRUE; } + +static bool32 IsAbilityRodAffected(void) +{ + u32 moveType; + + if (gBattleStruct->dynamicMoveType == 0) + moveType = gBattleMoves[gCurrentMove].type; + else if (!(gBattleStruct->dynamicMoveType & 0x40)) + moveType = gBattleStruct->dynamicMoveType & 0x3F; + else + moveType = gBattleMoves[gCurrentMove].type; + + if (moveType == TYPE_ELECTRIC && GetBattlerAbility(gBattlerTarget) == ABILITY_LIGHTNING_ROD) + return TRUE; + else + return FALSE; +} + +static bool32 IsAbilityMotorAffected(void) +{ + u32 moveType; + + if (gBattleStruct->dynamicMoveType == 0) + moveType = gBattleMoves[gCurrentMove].type; + else if (!(gBattleStruct->dynamicMoveType & 0x40)) + moveType = gBattleStruct->dynamicMoveType & 0x3F; + else + moveType = gBattleMoves[gCurrentMove].type; + + if (moveType == TYPE_ELECTRIC && GetBattlerAbility(gBattlerTarget) == ABILITY_MOTOR_DRIVE) + return TRUE; + else + return FALSE; +} + +static bool32 IsAbilityAbsorbAffected(void) +{ + u32 moveType; + + if (gBattleStruct->dynamicMoveType == 0) + moveType = gBattleMoves[gCurrentMove].type; + else if (!(gBattleStruct->dynamicMoveType & 0x40)) + moveType = gBattleStruct->dynamicMoveType & 0x3F; + else + moveType = gBattleMoves[gCurrentMove].type; + + if (moveType == TYPE_ELECTRIC && GetBattlerAbility(gBattlerTarget) == ABILITY_VOLT_ABSORB) + return TRUE; + else + return FALSE; +} + +static bool32 IsTeatimeAffected(u32 battlerId) +{ + if (ItemId_GetPocket(gBattleMons[battlerId].item) != POCKET_BERRIES) + return FALSE; // Only berries + if (gStatuses3[battlerId] & STATUS3_SEMI_INVULNERABLE) + return FALSE; // Teatime doesn't affected semi-invulnerable battlers + return TRUE; +} + #define COURTCHANGE_SWAP(status, structField, temp) \ { \ temp = gSideStatuses[B_SIDE_PLAYER]; \ @@ -9133,9 +9197,10 @@ static void Cmd_various(void) break; case VARIOUS_TRY_HIT_SWITCH_TARGET: if (IsBattlerAlive(gBattlerAttacker) - && IsBattlerAlive(gBattlerTarget) - && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) - && TARGET_TURN_DAMAGED) + && IsBattlerAlive(gBattlerTarget) + && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) + && TARGET_TURN_DAMAGED + && GetBattlerAbility(gBattlerTarget) != ABILITY_GUARD_DOG) { gBattleScripting.switchCase = B_SWITCH_HIT; gBattlescriptCurrInstr = BattleScript_ForceRandomSwitch; @@ -10033,7 +10098,7 @@ static void Cmd_various(void) gBattleMons[gActiveBattler].item = gLastUsedItem; break; case VARIOUS_SET_BEAK_BLAST: - gProtectStructs[gBattlerAttacker].beakBlastCharge = TRUE; + gProtectStructs[gActiveBattler].beakBlastCharge = TRUE; break; case VARIOUS_SWAP_SIDE_STATUSES: CourtChangeSwapSideStatuses(); @@ -10100,6 +10165,70 @@ static void Cmd_various(void) PREPARE_STAT_BUFFER(gBattleTextBuff1, statId); } break; + case VARIOUS_TEATIME_TARGETS: + { + u32 count = 0; + + for (i = 0; i < gBattlersCount; i++) + { + if (IsTeatimeAffected(i)) + count++; + } + if (count == 0) + gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3); // Teatime fails + else + gBattlescriptCurrInstr += 7; + } + return; + case VARIOUS_TEATIME_INVUL: + if (ItemId_GetPocket(gBattleMons[gActiveBattler].item) == POCKET_BERRIES && !(gStatuses3[gBattlerTarget] & (STATUS3_SEMI_INVULNERABLE))) + gBattlescriptCurrInstr += 7; + else + gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3); + return; + case VARIOUS_JUMP_IF_ROD: + if (IsAbilityRodAffected()) + gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3); + else + gBattlescriptCurrInstr += 7; + return; + case VARIOUS_JUMP_IF_MOTOR: + if (IsAbilityMotorAffected()) + gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3); + else + gBattlescriptCurrInstr += 7; + return; + case VARIOUS_JUMP_IF_ABSORB: + if (IsAbilityAbsorbAffected()) + gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3); + else + gBattlescriptCurrInstr += 7; + return; + case VARIOUS_TRY_WIND_RIDER_POWER: + { + u16 ability = GetBattlerAbility(gActiveBattler); + if (GetBattlerSide(gActiveBattler) == GetBattlerSide(gBattlerAttacker) + && (ability == ABILITY_WIND_RIDER || ability == ABILITY_WIND_POWER)) + { + gLastUsedAbility = ability; + RecordAbilityBattle(gActiveBattler, gLastUsedAbility); + gBattlerAbility = gBattleScripting.battler = gActiveBattler; + gBattlescriptCurrInstr += 7; + } + else + { + gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3); + } + } + return; + case VARIOUS_ACTIVATE_WEATHER_CHANGE_ABILITIES: + gBattlescriptCurrInstr += 3; + AbilityBattleEffects(ABILITYEFFECT_ON_WEATHER, gActiveBattler, 0, 0, 0); + return; + case VARIOUS_ACTIVATE_TERRAIN_CHANGE_ABILITIES: + gBattlescriptCurrInstr += 3; + AbilityBattleEffects(ABILITYEFFECT_ON_TERRAIN, gActiveBattler, 0, 0, 0); + return; } // End of switch (gBattlescriptCurrInstr[2]) gBattlescriptCurrInstr += 3; @@ -10778,7 +10907,7 @@ static u32 ChangeStatBuffs(s8 statValue, u32 statId, u32 flags, const u8 *BS_ptr else if ((activeBattlerAbility == ABILITY_CLEAR_BODY || activeBattlerAbility == ABILITY_FULL_METAL_BODY || activeBattlerAbility == ABILITY_WHITE_SMOKE) - && !certain && gCurrentMove != MOVE_CURSE) + && !affectsUser && !certain && gCurrentMove != MOVE_CURSE) { if (flags == STAT_CHANGE_ALLOW_PTR) { @@ -11928,8 +12057,9 @@ static void Cmd_trysetencore(void) } if (gLastMoves[gBattlerTarget] == MOVE_STRUGGLE - || gLastMoves[gBattlerTarget] == MOVE_ENCORE - || gLastMoves[gBattlerTarget] == MOVE_MIRROR_MOVE) + || gLastMoves[gBattlerTarget] == MOVE_ENCORE + || gLastMoves[gBattlerTarget] == MOVE_MIRROR_MOVE + || gLastMoves[gBattlerTarget] == MOVE_SHELL_TRAP) { i = MAX_MON_MOVES; } @@ -12857,6 +12987,10 @@ static void Cmd_trysetfutureattack(void) static void Cmd_trydobeatup(void) { +#if B_BEAT_UP >= GEN_5 + gBattleStruct->beatUpSlot++; + gBattlescriptCurrInstr += 9; +#else struct Pokemon *party; if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER) @@ -12900,6 +13034,7 @@ static void Cmd_trydobeatup(void) else gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 5); } +#endif } static void Cmd_setsemiinvulnerablebit(void) diff --git a/src/battle_tv.c b/src/battle_tv.c index ea568a85e..10c2144cc 100644 --- a/src/battle_tv.c +++ b/src/battle_tv.c @@ -475,7 +475,7 @@ static const u16 sPoints_MoveEffect[NUM_BATTLE_MOVE_EFFECTS] = [EFFECT_COURT_CHANGE] = 0, // TODO: Assign points [EFFECT_STEEL_BEAM] = 0, // TODO: Assign points [EFFECT_EXTREME_EVOBOOST] = 0, // TODO: Assign points - [EFFECT_DAMAGE_SET_TERRAIN] = 0, // TODO: Assign points + [EFFECT_HIT_SET_REMOVE_TERRAIN] = 0, // TODO: Assign points [EFFECT_DARK_VOID] = 0, // TODO: Assign points [EFFECT_SLEEP_HIT] = 1, [EFFECT_DOUBLE_SHOCK] = 0, // TODO: Assign points diff --git a/src/battle_util.c b/src/battle_util.c index 00e3b869b..cf65ee88e 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -230,8 +230,9 @@ static u8 CalcBeatUpPower(void) party = gPlayerParty; else party = gEnemyParty; - // Party slot is set in the battle script for Beat Up - species = GetMonData(&party[gBattleCommunication[0] - 1], MON_DATA_SPECIES); + + // Party slot is incremented by the battle script for Beat Up after this damage calculation + species = GetMonData(&party[gBattleStruct->beatUpSlot], MON_DATA_SPECIES); basePower = (gSpeciesInfo[species].baseAttack / 10) + 5; return basePower; @@ -419,7 +420,7 @@ void HandleAction_UseMove(void) battlerAbility = GetBattlerAbility(gActiveBattler); RecordAbilityBattle(gActiveBattler, gBattleMons[gActiveBattler].ability); - if (battlerAbility == ABILITY_LIGHTNING_ROD) + if (battlerAbility == ABILITY_LIGHTNING_ROD && gCurrentMove != MOVE_TEATIME) gSpecialStatuses[gActiveBattler].lightningRodRedirected = TRUE; else if (battlerAbility == ABILITY_STORM_DRAIN) gSpecialStatuses[gActiveBattler].stormDrainRedirected = TRUE; @@ -1065,6 +1066,11 @@ static const u8 sAbilitiesAffectedByMoldBreaker[] = [ABILITY_ICE_SCALES] = 1, [ABILITY_ICE_FACE] = 1, [ABILITY_PASTEL_VEIL] = 1, + [ABILITY_ARMOR_TAIL] = 1, + [ABILITY_EARTH_EATER] = 1, + [ABILITY_GOOD_AS_GOLD] = 1, + [ABILITY_PURIFYING_SALT] = 1, + [ABILITY_WELL_BAKED_BODY] = 1, }; static const u8 sAbilitiesNotTraced[ABILITIES_COUNT] = @@ -2654,6 +2660,7 @@ enum ENDTURN_THROAT_CHOP, ENDTURN_SLOW_START, ENDTURN_PLASMA_FISTS, + ENDTURN_CUD_CHEW, ENDTURN_BATTLER_COUNT }; @@ -3195,6 +3202,11 @@ u8 DoBattlerEndTurnEffects(void) gStatuses4[gActiveBattler] &= ~STATUS4_PLASMA_FISTS; gBattleStruct->turnEffectsTracker++; break; + case ENDTURN_CUD_CHEW: + if (GetBattlerAbility(gActiveBattler) == ABILITY_CUD_CHEW && !gDisableStructs[gActiveBattler].cudChew && ItemId_GetPocket(GetUsedHeldItem(gActiveBattler)) == POCKET_BERRIES) + gDisableStructs[gActiveBattler].cudChew = TRUE; + gBattleStruct->turnEffectsTracker++; + break; case ENDTURN_BATTLER_COUNT: // done gBattleStruct->turnEffectsTracker = 0; gBattleStruct->turnEffectsBattlerId++; @@ -3875,7 +3887,7 @@ u8 AtkCanceller_UnableToUseMove(void) gMultiHitCounter++; } - gBattleCommunication[0] = 0; // For later + gBattleStruct->beatUpSlot = 0; PREPARE_BYTE_NUMBER_BUFFER(gBattleScripting.multihitString, 1, 0) } #endif @@ -4719,6 +4731,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move } break; case ABILITY_ELECTRIC_SURGE: + case ABILITY_HADRON_ENGINE: if (TryChangeBattleTerrain(battler, STATUS_FIELD_ELECTRIC_TERRAIN, &gFieldTimers.terrainTimer)) { BattleScriptPushCursorAndCallback(BattleScript_ElectricSurgeActivates); @@ -4755,19 +4768,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move effect++; } break; - case ABILITY_FORECAST: -#if B_WEATHER_FORMS >= GEN_5 - case ABILITY_FLOWER_GIFT: -#else - TRY_WEATHER_FORM: -#endif - effect = TryWeatherFormChange(battler); - if (effect != 0) - { - BattleScriptPushCursorAndCallback(BattleScript_WeatherFormChange); - *(&gBattleStruct->formToChangeInto) = effect - 1; - } - break; case ABILITY_TRACE: if (!(gSpecialStatuses[battler].traced)) { @@ -4842,6 +4842,89 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move effect++; } break; + case ABILITY_PROTOSYNTHESIS: + if (!gSpecialStatuses[battler].switchInAbilityDone && gBattleWeather & B_WEATHER_SUN) + { + gSpecialStatuses[battler].switchInAbilityDone = TRUE; + PREPARE_STAT_BUFFER(gBattleTextBuff1, GetHighestStatId(battler)); + BattleScriptPushCursorAndCallback(BattleScript_ProtosynthesisActivates); + effect++; + } + break; + case ABILITY_QUARK_DRIVE: + if (!gSpecialStatuses[battler].switchInAbilityDone && gFieldStatuses & STATUS_FIELD_ELECTRIC_TERRAIN) + { + gSpecialStatuses[battler].switchInAbilityDone = TRUE; + PREPARE_STAT_BUFFER(gBattleTextBuff1, GetHighestStatId(battler)); + BattleScriptPushCursorAndCallback(BattleScript_QuarkDriveActivates); + effect++; + } + break; + case ABILITY_VESSEL_OF_RUIN: + if (!gSpecialStatuses[battler].switchInAbilityDone) + { + PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_SPATK); + gSpecialStatuses[battler].switchInAbilityDone = TRUE; + BattleScriptPushCursorAndCallback(BattleScript_RuinAbilityActivates); + effect++; + } + break; + case ABILITY_SWORD_OF_RUIN: + if (!gSpecialStatuses[battler].switchInAbilityDone) + { + PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_DEF); + gSpecialStatuses[battler].switchInAbilityDone = TRUE; + BattleScriptPushCursorAndCallback(BattleScript_RuinAbilityActivates); + effect++; + } + break; + case ABILITY_TABLETS_OF_RUIN: + if (!gSpecialStatuses[battler].switchInAbilityDone) + { + PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_ATK); + gSpecialStatuses[battler].switchInAbilityDone = TRUE; + BattleScriptPushCursorAndCallback(BattleScript_RuinAbilityActivates); + effect++; + } + break; + case ABILITY_BEADS_OF_RUIN: + if (!gSpecialStatuses[battler].switchInAbilityDone) + { + PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_SPDEF); + gSpecialStatuses[battler].switchInAbilityDone = TRUE; + BattleScriptPushCursorAndCallback(BattleScript_RuinAbilityActivates); + effect++; + } + break; + case ABILITY_ORICHALCUM_PULSE: + if (TryChangeBattleWeather(battler, ENUM_WEATHER_SUN, TRUE)) + { + BattleScriptPushCursorAndCallback(BattleScript_DroughtActivates); + effect++; + } + break; + case ABILITY_SUPREME_OVERLORD: + if (!gSpecialStatuses[battler].switchInAbilityDone && CountUsablePartyMons(battler) < PARTY_SIZE) + { + gSpecialStatuses[battler].switchInAbilityDone = TRUE; + BattleScriptPushCursorAndCallback(BattleScript_SupremeOverlordActivates); + effect++; + } + break; + case ABILITY_COSTAR: + if (!gSpecialStatuses[battler].switchInAbilityDone + && IsDoubleBattle() + && IsBattlerAlive(BATTLE_PARTNER(battler)) + && CountBattlerStatIncreases(BATTLE_PARTNER(battler), FALSE)) + { + gSpecialStatuses[battler].switchInAbilityDone = TRUE; + for (i = 0; i < NUM_BATTLE_STATS; i++) + gBattleMons[battler].statStages[i] = gBattleMons[BATTLE_PARTNER(battler)].statStages[i]; + gBattlerTarget = BATTLE_PARTNER(battler); + BattleScriptPushCursorAndCallback(BattleScript_CostarActivates); + effect++; + } + break; #if B_WEATHER_FORMS < GEN_5 default: if (gBattleMons[battler].species == SPECIES_CHERRIM) @@ -5045,48 +5128,66 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move effect++; } break; + case ABILITY_CUD_CHEW: + if (ItemId_GetPocket(GetUsedHeldItem(battler)) == POCKET_BERRIES && gDisableStructs[gActiveBattler].cudChew == TRUE) + { + gLastUsedItem = gBattleStruct->usedHeldItems[battler][GetBattlerSide(battler)]; + gBattleStruct->usedHeldItems[battler][GetBattlerSide(battler)] = ITEM_NONE; + BattleScriptPushCursorAndCallback(BattleScript_CudChewActivates); + effect++; + } + break; } } break; case ABILITYEFFECT_MOVES_BLOCK: // 2 - { - u16 moveTarget = GetBattlerMoveTargetType(battler, move); + { + u16 moveTarget = GetBattlerMoveTargetType(battler, move); + u16 battlerAbility = GetBattlerAbility(battler); + u16 targetAbility = GetBattlerAbility(gBattlerTarget); - if ((gLastUsedAbility == ABILITY_SOUNDPROOF && gBattleMoves[move].flags & FLAG_SOUND && !(moveTarget & MOVE_TARGET_USER)) - || (gLastUsedAbility == ABILITY_BULLETPROOF && gBattleMoves[move].flags & FLAG_BALLISTIC)) - { - if (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS) - gHitMarker |= HITMARKER_NO_PPDEDUCT; - gBattlescriptCurrInstr = BattleScript_SoundproofProtected; - effect = 1; + if ((gLastUsedAbility == ABILITY_SOUNDPROOF && gBattleMoves[move].flags & FLAG_SOUND && !(moveTarget & MOVE_TARGET_USER)) + || (gLastUsedAbility == ABILITY_BULLETPROOF && gBattleMoves[move].flags & FLAG_BALLISTIC)) + { + if (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS) + gHitMarker |= HITMARKER_NO_PPDEDUCT; + gBattlescriptCurrInstr = BattleScript_SoundproofProtected; + effect = 1; + } + else if ((gLastUsedAbility == ABILITY_DAZZLING || gLastUsedAbility == ABILITY_QUEENLY_MAJESTY || gLastUsedAbility == ABILITY_ARMOR_TAIL || IsBattlerAlive(battler ^= BIT_FLANK)) + && (battlerAbility == ABILITY_DAZZLING || battlerAbility == ABILITY_QUEENLY_MAJESTY || battlerAbility == ABILITY_ARMOR_TAIL) + && GetChosenMovePriority(gBattlerAttacker) > 0 + && GetBattlerSide(gBattlerAttacker) != GetBattlerSide(battler)) + { + if (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS) + gHitMarker |= HITMARKER_NO_PPDEDUCT; + gBattlescriptCurrInstr = BattleScript_DazzlingProtected; + effect = 1; + } + else if (BlocksPrankster(move, gBattlerAttacker, gBattlerTarget, TRUE) && !(IS_MOVE_STATUS(move) && targetAbility == ABILITY_MAGIC_BOUNCE)) + { + if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE) || !(moveTarget & (MOVE_TARGET_BOTH | MOVE_TARGET_FOES_AND_ALLY))) + CancelMultiTurnMoves(gBattlerAttacker); // Don't cancel moves that can hit two targets bc one target might not be protected + gBattleScripting.battler = gBattlerAbility = gBattlerTarget; + gBattlescriptCurrInstr = BattleScript_DarkTypePreventsPrankster; + effect = 1; + } + else if (GetBattlerAbility(gBattlerTarget) == ABILITY_GOOD_AS_GOLD + && IS_MOVE_STATUS(gCurrentMove) + && !(moveTarget & MOVE_TARGET_USER) + && !(moveTarget & MOVE_TARGET_OPPONENTS_FIELD) + && !(moveTarget & MOVE_TARGET_ALL_BATTLERS)) + { + gBattlescriptCurrInstr = BattleScript_GoodAsGoldActivates; + effect = 1; + } + break; } - else if ((((gLastUsedAbility == ABILITY_DAZZLING || gLastUsedAbility == ABILITY_QUEENLY_MAJESTY - || (IsBattlerAlive(battler ^= BIT_FLANK) - && ((GetBattlerAbility(battler) == ABILITY_DAZZLING) || GetBattlerAbility(battler) == ABILITY_QUEENLY_MAJESTY))) - )) - && GetChosenMovePriority(gBattlerAttacker) > 0 - && GetBattlerSide(gBattlerAttacker) != GetBattlerSide(battler)) - { - if (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS) - gHitMarker |= HITMARKER_NO_PPDEDUCT; - gBattlescriptCurrInstr = BattleScript_DazzlingProtected; - effect = 1; - } - else if (BlocksPrankster(move, gBattlerAttacker, gBattlerTarget, TRUE) - && !(IS_MOVE_STATUS(move) && GetBattlerAbility(gBattlerTarget) == ABILITY_MAGIC_BOUNCE)) - { - if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE) || !(moveTarget & (MOVE_TARGET_BOTH | MOVE_TARGET_FOES_AND_ALLY))) - CancelMultiTurnMoves(gBattlerAttacker); // Don't cancel moves that can hit two targets bc one target might not be protected - gBattleScripting.battler = gBattlerAbility = gBattlerTarget; - gBattlescriptCurrInstr = BattleScript_DarkTypePreventsPrankster; - effect = 1; - } - break; - } case ABILITYEFFECT_ABSORBING: // 3 if (move != MOVE_NONE) { u8 statId; + u8 statAmount = 1; switch (gLastUsedAbility) { case ABILITY_VOLT_ABSORB: @@ -5144,6 +5245,18 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move } } break; + case ABILITY_WELL_BAKED_BODY: + if (moveType == TYPE_FIRE) + effect = 2, statId = STAT_DEF, statAmount = 2; + break; + case ABILITY_WIND_RIDER: + if (gBattleMoves[gCurrentMove].flags & FLAG_WIND_MOVE && !(GetBattlerMoveTargetType(gBattlerAttacker, gCurrentMove) & MOVE_TARGET_USER)) + effect = 2, statId = STAT_ATK; + break; + case ABILITY_EARTH_EATER: + if (moveType == TYPE_GROUND) + effect = 1; + break; } if (effect == 1) // Drain Hp ability. @@ -5188,9 +5301,11 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move else gBattlescriptCurrInstr = BattleScript_MoveStatDrain_PPLoss; - SET_STATCHANGER(statId, 1, FALSE); + SET_STATCHANGER(statId, statAmount, FALSE); + #if B_ABSORBING_ABILITY_STRING < GEN_5 gBattleMons[battler].statStages[statId]++; PREPARE_STAT_BUFFER(gBattleTextBuff1, statId); + #endif } } } @@ -5324,11 +5439,13 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move effect++; } break; + case ABILITY_LINGERING_AROMA: case ABILITY_MUMMY: if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && IsBattlerAlive(gBattlerAttacker) && TARGET_TURN_DAMAGED - && (IsMoveMakingContact(move, gBattlerAttacker))) + && IsMoveMakingContact(move, gBattlerAttacker) + && gBattleStruct->overwrittenAbilities[gBattlerAttacker] != GetBattlerAbility(gBattlerTarget)) { switch (gBattleMons[gBattlerAttacker].ability) { @@ -5344,7 +5461,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move case ABILITY_STANCE_CHANGE: break; default: - gLastUsedAbility = gBattleMons[gBattlerAttacker].ability = gBattleStruct->overwrittenAbilities[gBattlerAttacker] = ABILITY_MUMMY; + gLastUsedAbility = gBattleMons[gBattlerAttacker].ability = gBattleStruct->overwrittenAbilities[gBattlerAttacker] = gBattleMons[gBattlerTarget].ability; BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_MummyActivates; effect++; @@ -5691,6 +5808,75 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move } } break; + case ABILITY_SEED_SOWER: + if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) + && !gProtectStructs[gBattlerAttacker].confusionSelfDmg + && TARGET_TURN_DAMAGED + && IsBattlerAlive(gBattlerTarget) + && TryChangeBattleTerrain(gBattlerTarget, STATUS_FIELD_GRASSY_TERRAIN, &gFieldTimers.terrainTimer)) + { + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_SeedSowerActivates; + effect++; + } + break; + case ABILITY_THERMAL_EXCHANGE: + if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) + && TARGET_TURN_DAMAGED + && IsBattlerAlive(gBattlerTarget) + && CompareStat(gBattlerTarget, STAT_ATK, MAX_STAT_STAGE, CMP_LESS_THAN) + && moveType == TYPE_FIRE) + { + gEffectBattler = gBattlerTarget; + SET_STATCHANGER(STAT_ATK, 1, FALSE); + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_TargetAbilityStatRaiseRet; + effect++; + } + break; + case ABILITY_ANGER_SHELL: + if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) + && !gProtectStructs[gBattlerAttacker].confusionSelfDmg + && TARGET_TURN_DAMAGED + && (gBattleMons[gBattlerTarget].hp <= gBattleMons[gBattlerTarget].maxHP / 2) + && !(TestSheerForceFlag(gBattlerAttacker, gCurrentMove))) + { + gBattlerAttacker = gBattlerTarget; + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_AngerShellActivates; + effect++; + } + break; + case ABILITY_WIND_POWER: + if (!(gBattleMoves[gCurrentMove].flags & FLAG_WIND_MOVE)) + break; + // fall through + case ABILITY_ELECTROMORPHOSIS: + if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) + && !gProtectStructs[gBattlerAttacker].confusionSelfDmg + && TARGET_TURN_DAMAGED + && IsBattlerAlive(gBattlerTarget)) + { + gBattlerAttacker = gBattlerTarget; + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_WindPowerActivates; + effect++; + } + break; + case ABILITY_TOXIC_DEBRIS: + if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) + && !gProtectStructs[gBattlerAttacker].confusionSelfDmg + && IS_MOVE_PHYSICAL(gCurrentMove) + && TARGET_TURN_DAMAGED + && !(gSideStatuses[gBattlerAttacker] & SIDE_STATUS_TOXIC_SPIKES) + && IsBattlerAlive(gBattlerTarget)) + { + gBattlerTarget = gBattlerAttacker; + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_ToxicDebrisActivates; + effect++; + } + break; } break; case ABILITYEFFECT_MOVE_END_ATTACKER: // Same as above, but for attacker @@ -6022,6 +6208,47 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move break; } break; + case ABILITYEFFECT_ON_WEATHER: // For ability effects that activate when the battle weather changes. + battler = gBattlerAbility = gBattlerAttacker = gBattleScripting.battler; + switch (GetBattlerAbility(battler)) + { + case ABILITY_FORECAST: +#if B_WEATHER_FORMS >= GEN_5 + case ABILITY_FLOWER_GIFT: +#else + TRY_WEATHER_FORM: +#endif + effect = TryWeatherFormChange(battler); + if (effect != 0) + { + BattleScriptPushCursorAndCallback(BattleScript_WeatherFormChange); + *(&gBattleStruct->formToChangeInto) = effect - 1; + } + break; + case ABILITY_PROTOSYNTHESIS: + if (IsBattlerWeatherAffected(battler, B_WEATHER_SUN)) + { + PREPARE_STAT_BUFFER(gBattleTextBuff1, GetHighestStatId(battler)); + BattleScriptPushCursorAndCallback(BattleScript_ProtosynthesisActivates); + effect++; + } + break; + } + break; + case ABILITYEFFECT_ON_TERRAIN: // For ability effects that activate when the field terrain changes. + battler = gBattlerAbility = gBattlerAttacker = gBattleScripting.battler; + switch (GetBattlerAbility(battler)) + { + case ABILITY_QUARK_DRIVE: + if (IsBattlerTerrainAffected(battler, STATUS_FIELD_ELECTRIC_TERRAIN)) + { + PREPARE_STAT_BUFFER(gBattleTextBuff1, GetHighestStatId(battler)); + BattleScriptPushCursorAndCallback(BattleScript_QuarkDriveActivates); + effect++; + } + break; + } + break; } if (effect && gLastUsedAbility != 0xFF) @@ -6068,6 +6295,19 @@ bool32 IsNeutralizingGasOnField(void) return FALSE; } +bool32 IsMyceliumMightOnField(void) +{ + u32 i; + + for (i = 0; i < gBattlersCount; i++) + { + if (IsBattlerAlive(i) && gBattleMons[i].ability == ABILITY_MYCELIUM_MIGHT && IS_MOVE_STATUS(gCurrentMove)) + return TRUE; + } + + return FALSE; +} + u32 GetBattlerAbility(u8 battlerId) { if (gStatuses3[battlerId] & STATUS3_GASTRO_ACID) @@ -6076,6 +6316,9 @@ u32 GetBattlerAbility(u8 battlerId) if (IsNeutralizingGasOnField() && !IsNeutralizingGasBannedAbility(gBattleMons[battlerId].ability)) return ABILITY_NONE; + if (IsMyceliumMightOnField()) + return ABILITY_NONE; + if ((((gBattleMons[gBattlerAttacker].ability == ABILITY_MOLD_BREAKER || gBattleMons[gBattlerAttacker].ability == ABILITY_TERAVOLT || gBattleMons[gBattlerAttacker].ability == ABILITY_TURBOBLAZE) @@ -6249,6 +6492,7 @@ bool32 CanBeBurned(u8 battlerId) || ability == ABILITY_WATER_VEIL || ability == ABILITY_WATER_BUBBLE || ability == ABILITY_COMATOSE + || ability == ABILITY_THERMAL_EXCHANGE || IsAbilityStatusProtected(battlerId) || IsBattlerTerrainAffected(battlerId, STATUS_FIELD_MISTY_TERRAIN)) return FALSE; @@ -7981,6 +8225,11 @@ bool32 IsBattlerProtected(u8 battlerId, u16 move) else if (gProtectStructs[battlerId].protected) return FALSE; } + + if (move == MOVE_TEATIME) + { + return FALSE; + } // Protective Pads doesn't stop Unseen Fist from bypassing Protect effects, so IsMoveMakingContact() isn't used here. // This means extra logic is needed to handle Shell Side Arm. @@ -8499,17 +8748,41 @@ static u16 CalcMoveBasePower(u16 move, u8 battlerAtk, u8 battlerDef) return basePower; } +// Supreme Overlord adds a damage boost for each fainted ally. +// The first ally adds a x1.2 boost, and subsequent allies add an extra x0.1 boost each. +static u16 GetSupremeOverlordModifier(u8 battlerId) +{ + u32 i; + u8 side = GetBattlerSide(battlerId); + struct Pokemon *party = (side == B_SIDE_PLAYER) ? gPlayerParty : gEnemyParty; + u16 modifier = UQ_4_12(1.0); + bool8 appliedFirstBoost = FALSE; + + for (i = 0; i < PARTY_SIZE; i++) + { + if (GetMonData(&party[i], MON_DATA_SPECIES) != SPECIES_NONE + && !GetMonData(&party[i], MON_DATA_IS_EGG) + && GetMonData(&party[i], MON_DATA_HP) == 0) + modifier += (!appliedFirstBoost) ? UQ_4_12(0.2) : UQ_4_12(0.1); + appliedFirstBoost = TRUE; + } + + return modifier; +} + static u32 CalcMoveBasePowerAfterModifiers(u16 move, u8 battlerAtk, u8 battlerDef, u8 moveType, bool32 updateFlags) { - u32 i, ability; + u32 i; u32 holdEffectAtk, holdEffectParamAtk; u16 basePower = CalcMoveBasePower(move, battlerAtk, battlerDef); u16 holdEffectModifier; u16 modifier = UQ_4_12(1.0); u32 atkSide = GET_BATTLER_SIDE(battlerAtk); + u16 atkAbility = GetBattlerAbility(battlerAtk); + u16 defAbility = GetBattlerAbility(battlerDef); // attacker's abilities - switch (GetBattlerAbility(battlerAtk)) + switch (atkAbility) { case ABILITY_TECHNICIAN: if (basePower <= 60) @@ -8615,11 +8888,44 @@ static u32 CalcMoveBasePowerAfterModifiers(u16 move, u8 battlerAtk, u8 battlerDe if (IS_MOVE_PHYSICAL(move)) MulModifier(&modifier, UQ_4_12(1.5)); break; + case ABILITY_ROCKY_PAYLOAD: + if (moveType == TYPE_ROCK) + MulModifier(&modifier, UQ_4_12(1.5)); + break; + case ABILITY_PROTOSYNTHESIS: + { + u8 atkHighestStat = GetHighestStatId(battlerAtk); + if (gBattleWeather & B_WEATHER_SUN && WEATHER_HAS_EFFECT && (atkHighestStat == STAT_ATK || atkHighestStat == STAT_SPATK)) + MulModifier(&modifier, UQ_4_12(1.3)); + } + break; + case ABILITY_QUARK_DRIVE: + { + u8 atkHighestStat = GetHighestStatId(battlerAtk); + if (gFieldStatuses & STATUS_FIELD_ELECTRIC_TERRAIN && (atkHighestStat == STAT_ATK || atkHighestStat == STAT_SPATK)) + MulModifier(&modifier, UQ_4_12(1.3)); + } + break; + case ABILITY_ORICHALCUM_PULSE: + if (gBattleWeather & B_WEATHER_SUN && WEATHER_HAS_EFFECT) + MulModifier(&modifier, UQ_4_12(1.3)); + break; + case ABILITY_HADRON_ENGINE: + if (gFieldStatuses & STATUS_FIELD_ELECTRIC_TERRAIN) + MulModifier(&modifier, UQ_4_12(1.3)); + break; + case ABILITY_SHARPNESS: + if (gBattleMoves[move].flags & FLAG_SLICING_MOVE) + MulModifier(&modifier, UQ_4_12(1.5)); + break; + case ABILITY_SUPREME_OVERLORD: + MulModifier(&modifier, GetSupremeOverlordModifier(battlerAtk)); + break; } // field abilities if ((IsAbilityOnField(ABILITY_DARK_AURA) && moveType == TYPE_DARK) - || (IsAbilityOnField(ABILITY_FAIRY_AURA) && moveType == TYPE_FAIRY)) + || (IsAbilityOnField(ABILITY_FAIRY_AURA) && moveType == TYPE_FAIRY)) { if (IsAbilityOnField(ABILITY_AURA_BREAK)) MulModifier(&modifier, UQ_4_12(0.75)); @@ -8627,6 +8933,18 @@ static u32 CalcMoveBasePowerAfterModifiers(u16 move, u8 battlerAtk, u8 battlerDe MulModifier(&modifier, UQ_4_12(1.33)); } + if (IsAbilityOnField(ABILITY_VESSEL_OF_RUIN) && atkAbility != ABILITY_VESSEL_OF_RUIN && IS_MOVE_SPECIAL(gCurrentMove)) + MulModifier(&modifier, UQ_4_12(0.25)); + + if (IsAbilityOnField(ABILITY_SWORD_OF_RUIN) && defAbility != ABILITY_SWORD_OF_RUIN && IS_MOVE_PHYSICAL(gCurrentMove)) + MulModifier(&modifier, UQ_4_12(0.25)); + + if (IsAbilityOnField(ABILITY_TABLETS_OF_RUIN) && atkAbility != ABILITY_TABLETS_OF_RUIN && IS_MOVE_PHYSICAL(gCurrentMove)) + MulModifier(&modifier, UQ_4_12(0.25)); + + if (IsAbilityOnField(ABILITY_BEADS_OF_RUIN) && defAbility != ABILITY_BEADS_OF_RUIN && IS_MOVE_SPECIAL(gCurrentMove)) + MulModifier(&modifier, UQ_4_12(0.25)); + // attacker partner's abilities if (IsBattlerAlive(BATTLE_PARTNER(battlerAtk))) { @@ -8647,8 +8965,7 @@ static u32 CalcMoveBasePowerAfterModifiers(u16 move, u8 battlerAtk, u8 battlerDe } // target's abilities - ability = GetBattlerAbility(battlerDef); - switch (ability) + switch (defAbility) { case ABILITY_HEATPROOF: case ABILITY_WATER_BUBBLE: @@ -8656,7 +8973,7 @@ static u32 CalcMoveBasePowerAfterModifiers(u16 move, u8 battlerAtk, u8 battlerDe { MulModifier(&modifier, UQ_4_12(0.5)); if (updateFlags) - RecordAbilityBattle(battlerDef, ability); + RecordAbilityBattle(battlerDef, defAbility); } break; case ABILITY_DRY_SKIN: @@ -8668,11 +8985,25 @@ static u32 CalcMoveBasePowerAfterModifiers(u16 move, u8 battlerAtk, u8 battlerDe { MulModifier(&modifier, UQ_4_12(0.5)); if (updateFlags) - RecordAbilityBattle(battlerDef, ability); + RecordAbilityBattle(battlerDef, defAbility); } if (moveType == TYPE_FIRE) MulModifier(&modifier, UQ_4_12(2.0)); break; + case ABILITY_PROTOSYNTHESIS: + { + u8 defHighestStat = GetHighestStatId(battlerDef); + if (gBattleWeather & B_WEATHER_SUN && WEATHER_HAS_EFFECT && (defHighestStat == STAT_DEF || defHighestStat == STAT_SPDEF)) + MulModifier(&modifier, UQ_4_12(0.7)); + } + break; + case ABILITY_QUARK_DRIVE: + { + u8 defHighestStat = GetHighestStatId(battlerDef); + if (gFieldStatuses & STATUS_FIELD_ELECTRIC_TERRAIN && (defHighestStat == STAT_DEF || defHighestStat == STAT_SPDEF)) + MulModifier(&modifier, UQ_4_12(0.7)); + } + break; } holdEffectAtk = GetBattlerHoldEffect(battlerAtk, TRUE); @@ -8799,7 +9130,7 @@ static u32 CalcMoveBasePowerAfterModifiers(u16 move, u8 battlerAtk, u8 battlerDe #define TERRAIN_TYPE_BOOST UQ_4_12(1.5) #endif - // various effecs + // various effects if (gProtectStructs[battlerAtk].helpingHand) MulModifier(&modifier, UQ_4_12(1.5)); if (gStatuses3[battlerAtk] & STATUS3_CHARGED_UP && moveType == TYPE_ELECTRIC) @@ -9129,6 +9460,10 @@ static u32 CalcDefenseStat(u16 move, u8 battlerAtk, u8 battlerDef, u8 moveType, if (gBattleMoves[move].flags & FLAG_SOUND) MulModifier(&modifier, UQ_4_12(2.0)); break; + case ABILITY_PURIFYING_SALT: + if (gBattleMoves[move].type == TYPE_GHOST) + MulModifier(&modifier, UQ_4_12(2.0)); + break; } // ally's abilities @@ -9197,7 +9532,11 @@ static u32 CalcFinalDmg(u32 dmg, u16 move, u8 battlerAtk, u8 battlerDef, u8 move // check multiple targets in double battle if (GetMoveTargetCount(move, battlerAtk, battlerDef) >= 2) + #if B_MULTIPLE_TARGETS_DMG >= GEN_4 MulModifier(&finalModifier, UQ_4_12(0.75)); + #else + MulModifier(&finalModifier, UQ_4_12(0.5)); + #endif // take type effectiveness MulModifier(&finalModifier, typeEffectivenessModifier); @@ -9596,11 +9935,8 @@ u16 GetTypeModifier(u8 atkType, u8 defType) return sTypeEffectivenessTable[atkType][defType]; } -s32 GetStealthHazardDamage(u8 hazardType, u8 battlerId) +s32 GetStealthHazardDamageByTypesAndHP(u8 hazardType, u8 type1, u8 type2, u32 maxHp) { - u8 type1 = gBattleMons[battlerId].type1; - u8 type2 = gBattleMons[battlerId].type2; - u32 maxHp = gBattleMons[battlerId].maxHP; s32 dmg = 0; u16 modifier = UQ_4_12(1.0); @@ -9643,6 +9979,15 @@ s32 GetStealthHazardDamage(u8 hazardType, u8 battlerId) return dmg; } +s32 GetStealthHazardDamage(u8 hazardType, u8 battlerId) +{ + u8 type1 = gBattleMons[battlerId].type1; + u8 type2 = gBattleMons[battlerId].type2; + u32 maxHp = gBattleMons[battlerId].maxHP; + + return GetStealthHazardDamageByTypesAndHP(hazardType, type1, type2, maxHp); +} + bool32 IsPartnerMonFromSameTrainer(u8 battlerId) { if (GetBattlerSide(battlerId) == B_SIDE_OPPONENT && gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) diff --git a/src/contest.c b/src/contest.c index b9ec9add6..9aed32841 100644 --- a/src/contest.c +++ b/src/contest.c @@ -3136,23 +3136,12 @@ static u8 CreateContestantSprite(u16 species, u32 otId, u32 personality, u32 ind gSprites[spriteId].callback = SpriteCallbackDummy; gSprites[spriteId].data[0] = gSprites[spriteId].oam.paletteNum; gSprites[spriteId].data[2] = species; - if (IsSpeciesNotUnown(species)) - gSprites[spriteId].affineAnims = gAffineAnims_BattleSpriteContest; - else - gSprites[spriteId].affineAnims = gAffineAnims_BattleSpriteOpponentSide; + gSprites[spriteId].affineAnims = gAffineAnims_BattleSpriteContest; StartSpriteAffineAnim(&gSprites[spriteId], BATTLER_AFFINE_NORMAL); return spriteId; } -bool8 IsSpeciesNotUnown(u16 species) -{ - if (species == SPECIES_UNOWN) - return FALSE; - else - return TRUE; -} - // The contestant info windows and general-purpose text box are drawn on one half, while // the moves and move description windows are drawn on another screen. Only the first 32 * 20 // tiles are actually drawn on screen. diff --git a/src/data/bard_music/pokemon.h b/src/data/bard_music/pokemon.h index 7d378da6f..420c59845 100644 --- a/src/data/bard_music/pokemon.h +++ b/src/data/bard_music/pokemon.h @@ -1612,7 +1612,7 @@ const struct BardSound gBardSounds_Pokemon[NUM_SPECIES][6] = { NULL_BARD_SOUND, NULL_BARD_SOUND, }, - [SPECIES_UNOWN] = { + [SPECIES_UNOWN_A] = { { .songLengthId = 42 }, { .songLengthId = 26 }, { .songLengthId = 51 }, diff --git a/src/data/battle_anim.h b/src/data/battle_anim.h index e6e03f06c..5be53fe66 100644 --- a/src/data/battle_anim.h +++ b/src/data/battle_anim.h @@ -1450,6 +1450,7 @@ const struct CompressedSpriteSheet gBattleAnimPicTable[] = {gBattleAnimSpriteGfx_OmegaSymbol, 0x0200, ANIM_TAG_OMEGA_SYMBOL}, {gBattleAnimSpriteGfx_Orbs, 0x0180, ANIM_TAG_STEEL_BEAM}, {gBattleAnimSpriteGfx_AuraSphere, 0x200, ANIM_TAG_POLTERGEIST}, + {gBattleAnimSpriteGfx_Teapot, 0x1800, ANIM_TAG_TEAPOT}, }; const struct CompressedSpritePalette gBattleAnimPaletteTable[] = @@ -1900,6 +1901,7 @@ const struct CompressedSpritePalette gBattleAnimPaletteTable[] = {gBattleAnimSpritePal_OmegaSymbol, ANIM_TAG_OMEGA_SYMBOL}, {gBattleAnimSpritePal_SteelBeam, ANIM_TAG_STEEL_BEAM}, {gBattleAnimSpritePal_Poltergeist, ANIM_TAG_POLTERGEIST}, + {gBattleAnimSpritePal_Teapot, ANIM_TAG_TEAPOT}, }; const struct BattleAnimBackground gBattleAnimBackgroundTable[] = diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 9f0027765..41779a0c5 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -256,7 +256,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SLICING_MOVE, .split = SPLIT_PHYSICAL, .zMovePower = 100, .zMoveEffect = Z_EFFECT_NONE, @@ -272,7 +272,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_DMG_2X_IN_AIR, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_DMG_2X_IN_AIR | FLAG_WIND_MOVE, .split = SPLIT_SPECIAL, .zMovePower = 100, .zMoveEffect = Z_EFFECT_NONE, @@ -298,7 +298,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = { #if B_UPDATED_MOVE_DATA >= GEN_6 .accuracy = 0, - .flags = FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_WIND_MOVE, #elif B_UPDATED_MOVE_DATA == GEN_5 .accuracy = 100, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, @@ -1073,7 +1073,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 10, .target = MOVE_TARGET_BOTH, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_WIND_MOVE, .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, }, @@ -1354,7 +1354,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_HIGH_CRIT, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_HIGH_CRIT | FLAG_SLICING_MOVE, .split = SPLIT_PHYSICAL, .zMovePower = 100, .zMoveEffect = Z_EFFECT_NONE, @@ -2932,7 +2932,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_HIGH_CRIT, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_HIGH_CRIT | FLAG_SLICING_MOVE, .split = SPLIT_PHYSICAL, .zMovePower = 140, .zMoveEffect = Z_EFFECT_NONE, @@ -3541,7 +3541,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 100, .target = MOVE_TARGET_BOTH, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_WIND_MOVE, .split = SPLIT_SPECIAL, .zMovePower = 100, .zMoveEffect = Z_EFFECT_NONE, @@ -3643,7 +3643,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .flags = 0, + .flags = FLAG_WIND_MOVE, .split = SPLIT_STATUS, .zMovePower = 0, .zMoveEffect = Z_EFFECT_SPD_UP_1, @@ -3819,7 +3819,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SLICING_MOVE, .split = SPLIT_PHYSICAL, .zMovePower = 100, .zMoveEffect = Z_EFFECT_NONE, @@ -4304,7 +4304,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = [MOVE_TWISTER] = { #if B_UPDATED_MOVE_DATA >= GEN_5 - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_DMG_2X_IN_AIR, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_DMG_2X_IN_AIR | FLAG_WIND_MOVE, #else .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_DMG_2X_IN_AIR, #endif @@ -4677,7 +4677,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 10, .target = MOVE_TARGET_BOTH, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_WIND_MOVE, .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, }, @@ -5674,7 +5674,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_HIGH_CRIT, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_HIGH_CRIT | FLAG_SLICING_MOVE | FLAG_WIND_MOVE, .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, }, @@ -6007,7 +6007,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SLICING_MOVE, .split = SPLIT_PHYSICAL, .zMovePower = 120, .zMoveEffect = Z_EFFECT_NONE, @@ -6304,7 +6304,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_HIGH_CRIT, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_HIGH_CRIT | FLAG_SLICING_MOVE, .split = SPLIT_PHYSICAL, .zMoveEffect = Z_EFFECT_NONE, }, @@ -6635,7 +6635,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, + .flags = FLAG_SNATCH_AFFECTED | FLAG_WIND_MOVE, .split = SPLIT_STATUS, .zMovePower = 0, .zMoveEffect = Z_EFFECT_BOOST_CRITS, @@ -7239,7 +7239,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_HIGH_CRIT, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_HIGH_CRIT | FLAG_SLICING_MOVE, .split = SPLIT_PHYSICAL, .zMovePower = 140, .zMoveEffect = Z_EFFECT_NONE, @@ -7281,7 +7281,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = { #if B_UPDATED_MOVE_DATA >= GEN_6 .pp = 15, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_SLICING_MOVE, #elif B_UPDATED_MOVE_DATA == GEN_5 .pp = 20, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST, @@ -7311,7 +7311,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SLICING_MOVE, .split = SPLIT_PHYSICAL, .zMovePower = 160, .zMoveEffect = Z_EFFECT_NONE, @@ -7721,7 +7721,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_HIGH_CRIT, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_HIGH_CRIT | FLAG_SLICING_MOVE, .split = SPLIT_PHYSICAL, .zMovePower = 140, .zMoveEffect = Z_EFFECT_NONE, @@ -7943,7 +7943,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_HIGH_CRIT | FLAG_SHEER_FORCE_BOOST, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_HIGH_CRIT | FLAG_SHEER_FORCE_BOOST | FLAG_SLICING_MOVE, .split = SPLIT_PHYSICAL, .zMovePower = 140, .zMoveEffect = Z_EFFECT_NONE, @@ -9555,7 +9555,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_STAT_STAGES_IGNORED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_STAT_STAGES_IGNORED | FLAG_SLICING_MOVE, .split = SPLIT_PHYSICAL, .zMovePower = 175, .zMoveEffect = Z_EFFECT_NONE, @@ -9571,7 +9571,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 50, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_SLICING_MOVE, .split = SPLIT_PHYSICAL, .zMovePower = 140, .zMoveEffect = Z_EFFECT_NONE, @@ -9709,7 +9709,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_DMG_IN_AIR, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_DMG_IN_AIR | FLAG_WIND_MOVE, .split = SPLIT_SPECIAL, .zMoveEffect = Z_EFFECT_NONE, }, @@ -10219,7 +10219,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 0, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_WIND_MOVE, .split = SPLIT_PHYSICAL, .zMovePower = 175, .zMoveEffect = Z_EFFECT_NONE, @@ -10418,7 +10418,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_WIND_MOVE, .split = SPLIT_SPECIAL, .zMovePower = 100, .zMoveEffect = Z_EFFECT_NONE, @@ -11204,7 +11204,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SLICING_MOVE, .split = SPLIT_PHYSICAL, .zMovePower = 190, .zMoveEffect = Z_EFFECT_NONE, @@ -12347,13 +12347,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = [MOVE_TEATIME] = { - .effect = EFFECT_PLACEHOLDER, //TODO + .effect = EFFECT_TEATIME, .power = 0, .type = TYPE_NORMAL, .accuracy = 0, .pp = 10, .secondaryEffectChance = 0, - .target = MOVE_TARGET_ALL_BATTLERS, + .target = MOVE_TARGET_USER, .priority = 0, .flags = 0, .split = SPLIT_STATUS, @@ -12531,7 +12531,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SLICING_MOVE, .split = SPLIT_PHYSICAL, .zMovePower = 180, .zMoveEffect = Z_EFFECT_NONE, @@ -13330,7 +13330,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_SLICING_MOVE, .split = SPLIT_PHYSICAL, .zMovePower = 120, .zMoveEffect = Z_EFFECT_NONE, @@ -13350,7 +13350,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_WIND_MOVE, .split = SPLIT_SPECIAL, .zMovePower = 175, .zMoveEffect = Z_EFFECT_NONE, @@ -13602,7 +13602,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_SLICING_MOVE, .split = SPLIT_PHYSICAL, .zMovePower = 120, .zMoveEffect = Z_EFFECT_NONE, @@ -13623,7 +13623,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_WIND_MOVE, .split = SPLIT_SPECIAL, .zMovePower = 175, .zMoveEffect = Z_EFFECT_NONE, @@ -13644,7 +13644,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_WIND_MOVE, .split = SPLIT_SPECIAL, .zMovePower = 175, .zMoveEffect = Z_EFFECT_NONE, @@ -13665,7 +13665,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .secondaryEffectChance = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_WIND_MOVE, .split = SPLIT_SPECIAL, .zMovePower = 175, .zMoveEffect = Z_EFFECT_NONE, @@ -13868,7 +13868,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = [MOVE_ICE_SPINNER] = { - .effect = EFFECT_DAMAGE_SET_TERRAIN, + .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 80, .type = TYPE_ICE, .accuracy = 100, @@ -13880,7 +13880,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .split = SPLIT_PHYSICAL, .zMovePower = 160, .zMoveEffect = Z_EFFECT_NONE, - .argument = 1, //remove terrain + .argument = 1, // Remove the active field terrain if there is one. }, [MOVE_GLAIVE_RUSH] = @@ -14835,7 +14835,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = }, [MOVE_GENESIS_SUPERNOVA] = { - .effect = EFFECT_DAMAGE_SET_TERRAIN, + .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 185, .type = TYPE_PSYCHIC, .accuracy = 0, @@ -14846,7 +14846,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .flags = 0, .zMovePower = 0, .split = SPLIT_SPECIAL, - .argument = 0, //psychic terrain + .argument = 0, // Set Psychic Terrain. If there's a different field terrain active, overwrite it. .zMoveEffect = 0 }, [MOVE_SINISTER_ARROW_RAID] = @@ -14896,7 +14896,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = }, [MOVE_SPLINTERED_STORMSHARDS] = { - .effect = EFFECT_DAMAGE_SET_TERRAIN, + .effect = EFFECT_HIT_SET_REMOVE_TERRAIN, .power = 190, .type = TYPE_ROCK, .accuracy = 0, @@ -14907,7 +14907,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .flags = 0, .zMovePower = 0, .split = SPLIT_PHYSICAL, - .argument = 1, //remove terrain + .argument = 1, // Remove the active field terrain if there is one. .zMoveEffect = 0 }, [MOVE_LETS_SNUGGLE_FOREVER] = diff --git a/src/data/easy_chat/easy_chat_group_pokemon2.h b/src/data/easy_chat/easy_chat_group_pokemon2.h index 331c5ac6c..fe332c1c0 100755 --- a/src/data/easy_chat/easy_chat_group_pokemon2.h +++ b/src/data/easy_chat/easy_chat_group_pokemon2.h @@ -229,7 +229,7 @@ const u16 gEasyChatGroup_Pokemon2[] = { SPECIES_TYRANITAR, SPECIES_TYROGUE, SPECIES_UMBREON, - SPECIES_UNOWN, + SPECIES_UNOWN_A, SPECIES_URSARING, SPECIES_VAPOREON, SPECIES_VENOMOTH, diff --git a/src/data/easy_chat/easy_chat_words_by_letter.h b/src/data/easy_chat/easy_chat_words_by_letter.h index 8bfe23729..14a4fa4fb 100755 --- a/src/data/easy_chat/easy_chat_words_by_letter.h +++ b/src/data/easy_chat/easy_chat_words_by_letter.h @@ -1770,7 +1770,7 @@ const u16 gEasyChatWordsByLetter_U[] = { EC_WORD_UNDERSTANDS, EC_WORD_UNDERSTOOD, EC_WORD_UNION, - EC_POKEMON_NATIONAL(UNOWN), + EC_POKEMON_NATIONAL(UNOWN_A), EC_WORD_UNTIL, EC_WORD_UP, EC_WORD_UPBEAT, diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index ec7f079f7..385460228 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -424,7 +424,6 @@ const u32 gMonFrontPic_Burmy[] = INCBIN_U32("graphics/pokemon/burmy/anim_front.4 const u32 gMonFrontPic_Wormadam[] = INCBIN_U32("graphics/pokemon/wormadam/anim_front.4bpp.lz"); const u32 gMonFrontPic_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/anim_front.4bpp.lz"); const u32 gMonFrontPic_Combee[] = INCBIN_U32("graphics/pokemon/combee/anim_front.4bpp.lz"); -const u32 gMonFrontPic_CombeeF[] = INCBIN_U32("graphics/pokemon/combee/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/anim_front.4bpp.lz"); const u32 gMonFrontPic_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/anim_front.4bpp.lz"); const u32 gMonFrontPic_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/anim_front.4bpp.lz"); @@ -459,7 +458,6 @@ const u32 gMonFrontPic_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/anim_f const u32 gMonFrontPic_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/anim_front.4bpp.lz"); const u32 gMonFrontPic_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/anim_front.4bpp.lz"); const u32 gMonFrontPic_Hippopotas[] = INCBIN_U32("graphics/pokemon/hippopotas/anim_front.4bpp.lz"); -const u32 gMonFrontPic_HippopotasF[] = INCBIN_U32("graphics/pokemon/hippopotas/anim_frontf.4bpp.lz"); const u32 gMonFrontPic_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/anim_front.4bpp.lz"); const u32 gMonFrontPic_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/anim_front.4bpp.lz"); const u32 gMonFrontPic_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/anim_front.4bpp.lz"); @@ -1672,9 +1670,7 @@ const u32 gMonBackPic_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/back.4b const u32 gMonBackPic_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/back.4bpp.lz"); const u32 gMonBackPic_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/back.4bpp.lz"); const u32 gMonBackPic_Hippopotas[] = INCBIN_U32("graphics/pokemon/hippopotas/back.4bpp.lz"); -const u32 gMonBackPic_HippopotasF[] = INCBIN_U32("graphics/pokemon/hippopotas/backf.4bpp.lz"); const u32 gMonBackPic_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/back.4bpp.lz"); -const u32 gMonBackPic_HippowdonF[] = INCBIN_U32("graphics/pokemon/hippowdon/backf.4bpp.lz"); const u32 gMonBackPic_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/back.4bpp.lz"); const u32 gMonBackPic_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/back.4bpp.lz"); const u32 gMonBackPic_Croagunk[] = INCBIN_U32("graphics/pokemon/croagunk/back.4bpp.lz"); @@ -2844,6 +2840,7 @@ const u32 gMonPalette_Burmy[] = INCBIN_U32("graphics/pokemon/burmy/normal.gbapal const u32 gMonPalette_Wormadam[] = INCBIN_U32("graphics/pokemon/wormadam/normal.gbapal.lz"); const u32 gMonPalette_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/normal.gbapal.lz"); const u32 gMonPalette_Combee[] = INCBIN_U32("graphics/pokemon/combee/normal.gbapal.lz"); +const u32 gMonPalette_CombeeF[] = INCBIN_U32("graphics/pokemon/combee/normalf.gbapal.lz"); const u32 gMonPalette_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/normal.gbapal.lz"); const u32 gMonPalette_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/normal.gbapal.lz"); const u32 gMonPalette_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/normal.gbapal.lz"); @@ -3106,7 +3103,6 @@ const u32 gMonPalette_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/normal.gbap const u32 gMonPalette_Vivillon[] = INCBIN_U32("graphics/pokemon/vivillon/normal.gbapal.lz"); const u32 gMonPalette_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/normal.gbapal.lz"); const u32 gMonPalette_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/normal.gbapal.lz"); -const u32 gMonPalette_PyroarF[] = INCBIN_U32("graphics/pokemon/pyroar/normalf.gbapal.lz"); const u32 gMonPalette_Flabebe[] = INCBIN_U32("graphics/pokemon/flabebe/normal.gbapal.lz"); const u32 gMonPalette_Floette[] = INCBIN_U32("graphics/pokemon/floette/normal.gbapal.lz"); const u32 gMonPalette_Florges[] = INCBIN_U32("graphics/pokemon/florges/normal.gbapal.lz"); @@ -4077,6 +4073,7 @@ const u32 gMonShinyPalette_Burmy[] = INCBIN_U32("graphics/pokemon/burmy/shiny.gb const u32 gMonShinyPalette_Wormadam[] = INCBIN_U32("graphics/pokemon/wormadam/shiny.gbapal.lz"); const u32 gMonShinyPalette_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/shiny.gbapal.lz"); const u32 gMonShinyPalette_Combee[] = INCBIN_U32("graphics/pokemon/combee/shiny.gbapal.lz"); +const u32 gMonShinyPalette_CombeeF[] = INCBIN_U32("graphics/pokemon/combee/shinyf.gbapal.lz"); const u32 gMonShinyPalette_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/shiny.gbapal.lz"); const u32 gMonShinyPalette_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/shiny.gbapal.lz"); const u32 gMonShinyPalette_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/shiny.gbapal.lz"); @@ -4339,7 +4336,6 @@ const u32 gMonShinyPalette_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/shiny. const u32 gMonShinyPalette_Vivillon[] = INCBIN_U32("graphics/pokemon/vivillon/shiny.gbapal.lz"); const u32 gMonShinyPalette_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/shiny.gbapal.lz"); const u32 gMonShinyPalette_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/shiny.gbapal.lz"); -const u32 gMonShinyPalette_PyroarF[] = INCBIN_U32("graphics/pokemon/pyroar/shinyf.gbapal.lz"); const u32 gMonShinyPalette_Flabebe[] = INCBIN_U32("graphics/pokemon/flabebe/shiny.gbapal.lz"); const u32 gMonShinyPalette_Floette[] = INCBIN_U32("graphics/pokemon/floette/shiny.gbapal.lz"); const u32 gMonShinyPalette_Florges[] = INCBIN_U32("graphics/pokemon/florges/shiny.gbapal.lz"); @@ -5337,6 +5333,10 @@ const u8 gMonIcon_Riolu[] = INCBIN_U8("graphics/pokemon/riolu/icon.4bpp"); const u8 gMonIcon_Lucario[] = INCBIN_U8("graphics/pokemon/lucario/icon.4bpp"); const u8 gMonIcon_Hippopotas[] = INCBIN_U8("graphics/pokemon/hippopotas/icon.4bpp"); const u8 gMonIcon_Hippowdon[] = INCBIN_U8("graphics/pokemon/hippowdon/icon.4bpp"); +#if P_HIPPO_GENDER_DIFF_ICONS == TRUE +const u8 gMonIcon_HippopotasF[] = INCBIN_U8("graphics/pokemon/hippopotas/iconf.4bpp"); +const u8 gMonIcon_HippowdonF[] = INCBIN_U8("graphics/pokemon/hippowdon/iconf.4bpp"); +#endif const u8 gMonIcon_Skorupi[] = INCBIN_U8("graphics/pokemon/skorupi/icon.4bpp"); const u8 gMonIcon_Drapion[] = INCBIN_U8("graphics/pokemon/drapion/icon.4bpp"); const u8 gMonIcon_Croagunk[] = INCBIN_U8("graphics/pokemon/croagunk/icon.4bpp"); diff --git a/src/data/pokemon/form_species_table_pointers.h b/src/data/pokemon/form_species_table_pointers.h index 73b1b07d7..a6ebaea7a 100644 --- a/src/data/pokemon/form_species_table_pointers.h +++ b/src/data/pokemon/form_species_table_pointers.h @@ -51,7 +51,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_SLOWKING] = sSlowkingFormSpeciesIdTable, [SPECIES_QWILFISH] = sQwilfishFormSpeciesIdTable, [SPECIES_SNEASEL] = sSneaselFormSpeciesIdTable, - [SPECIES_UNOWN] = sUnownFormSpeciesIdTable, + [SPECIES_UNOWN_A] = sUnownFormSpeciesIdTable, [SPECIES_STEELIX] = sSteelixFormSpeciesIdTable, [SPECIES_SCIZOR] = sScizorFormSpeciesIdTable, [SPECIES_HERACROSS] = sHeracrossFormSpeciesIdTable, diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h index 545201c5a..5ae41331b 100644 --- a/src/data/pokemon/form_species_tables.h +++ b/src/data/pokemon/form_species_tables.h @@ -322,7 +322,7 @@ static const u16 sSneaselFormSpeciesIdTable[] = { }; static const u16 sUnownFormSpeciesIdTable[] = { - SPECIES_UNOWN, + SPECIES_UNOWN_A, SPECIES_UNOWN_B, SPECIES_UNOWN_C, SPECIES_UNOWN_D, diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index 0ecfa59cc..2d5912cd9 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -201,7 +201,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_MURKROW] = sMurkrowLevelUpLearnset, [SPECIES_SLOWKING] = sSlowkingLevelUpLearnset, [SPECIES_MISDREAVUS] = sMisdreavusLevelUpLearnset, - [SPECIES_UNOWN] = sUnownLevelUpLearnset, + [SPECIES_UNOWN_A] = sUnownLevelUpLearnset, [SPECIES_WOBBUFFET] = sWobbuffetLevelUpLearnset, [SPECIES_GIRAFARIG] = sGirafarigLevelUpLearnset, [SPECIES_PINECO] = sPinecoLevelUpLearnset, diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index 95ccf90aa..c5fe59bc1 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -5941,7 +5941,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_UNOWN] = UNOWN_SPECIES_INFO(FLIP), + [SPECIES_UNOWN_A] = UNOWN_SPECIES_INFO(FLIP), [SPECIES_WOBBUFFET] = { diff --git a/src/data/pokemon/teachable_learnset_pointers.h b/src/data/pokemon/teachable_learnset_pointers.h index 28998aae1..55f86bc58 100644 --- a/src/data/pokemon/teachable_learnset_pointers.h +++ b/src/data/pokemon/teachable_learnset_pointers.h @@ -201,7 +201,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_MURKROW] = sMurkrowTeachableLearnset, [SPECIES_SLOWKING] = sSlowkingTeachableLearnset, [SPECIES_MISDREAVUS] = sMisdreavusTeachableLearnset, - [SPECIES_UNOWN] = sUnownTeachableLearnset, + [SPECIES_UNOWN_A] = sUnownTeachableLearnset, [SPECIES_WOBBUFFET] = sWobbuffetTeachableLearnset, [SPECIES_GIRAFARIG] = sGirafarigTeachableLearnset, [SPECIES_PINECO] = sPinecoTeachableLearnset, diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 8dbc2d2a9..b8f783e7c 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -224,7 +224,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_MURKROW] = { .size = MON_COORDS_SIZE(40, 56), .y_offset = 10 }, [SPECIES_SLOWKING] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 3 }, [SPECIES_MISDREAVUS] = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 9 }, - [SPECIES_UNOWN] = { .size = MON_COORDS_SIZE(24, 48), .y_offset = 8 }, + [SPECIES_UNOWN_A] = { .size = MON_COORDS_SIZE(24, 48), .y_offset = 8 }, [SPECIES_WOBBUFFET] = { .size = MON_COORDS_SIZE(56, 56), .y_offset = 10 }, [SPECIES_GIRAFARIG] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 }, [SPECIES_PINECO] = { .size = MON_COORDS_SIZE(56, 40), .y_offset = 13 }, diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index 398cf2875..f14883cbd 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -201,7 +201,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(MURKROW, gMonBackPic_Murkrow), SPECIES_SPRITE(SLOWKING, gMonBackPic_Slowking), SPECIES_SPRITE(MISDREAVUS, gMonBackPic_Misdreavus), - SPECIES_SPRITE(UNOWN, gMonBackPic_Unown), + SPECIES_SPRITE(UNOWN_A, gMonBackPic_Unown), SPECIES_SPRITE(WOBBUFFET, gMonBackPic_Wobbuffet), SPECIES_SPRITE(GIRAFARIG, gMonBackPic_Girafarig), SPECIES_SPRITE(PINECO, gMonBackPic_Pineco), @@ -1348,8 +1348,8 @@ const struct CompressedSpriteSheet gMonBackPicTableFemale[] = SPECIES_SPRITE(KRICKETUNE, gMonBackPic_KricketuneF), SPECIES_SPRITE(SHINX, gMonBackPic_ShinxF), SPECIES_SPRITE(COMBEE, gMonBackPic_Combee), - SPECIES_SPRITE(HIPPOPOTAS, gMonBackPic_HippopotasF), - SPECIES_SPRITE(HIPPOWDON, gMonBackPic_HippowdonF), + SPECIES_SPRITE(HIPPOPOTAS, gMonBackPic_Hippopotas), + SPECIES_SPRITE(HIPPOWDON, gMonBackPic_Hippowdon), #endif #if P_GEN_5_POKEMON == TRUE SPECIES_SPRITE(UNFEZANT, gMonBackPic_UnfezantF), diff --git a/src/data/pokemon_graphics/enemy_mon_elevation.h b/src/data/pokemon_graphics/enemy_mon_elevation.h index 64bd433fa..4f97aa1bf 100644 --- a/src/data/pokemon_graphics/enemy_mon_elevation.h +++ b/src/data/pokemon_graphics/enemy_mon_elevation.h @@ -27,7 +27,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES] = [SPECIES_YANMA] = 13, [SPECIES_MURKROW] = 12, [SPECIES_MISDREAVUS] = 12, - [SPECIES_UNOWN] = 8, + [SPECIES_UNOWN_A] = 8, [SPECIES_GLIGAR] = 8, [SPECIES_MANTINE] = 6, [SPECIES_PORYGON2] = 9, diff --git a/src/data/pokemon_graphics/footprint_table.h b/src/data/pokemon_graphics/footprint_table.h index 2b0dd0a4f..7bbf56700 100644 --- a/src/data/pokemon_graphics/footprint_table.h +++ b/src/data/pokemon_graphics/footprint_table.h @@ -201,7 +201,7 @@ const u8 *const gMonFootprintTable[] = [SPECIES_MURKROW] = gMonFootprint_Murkrow, [SPECIES_SLOWKING] = gMonFootprint_Slowking, [SPECIES_MISDREAVUS] = gMonFootprint_Misdreavus, - [SPECIES_UNOWN] = gMonFootprint_Unown, + [SPECIES_UNOWN_A] = gMonFootprint_Unown, [SPECIES_WOBBUFFET] = gMonFootprint_Wobbuffet, [SPECIES_GIRAFARIG] = gMonFootprint_Girafarig, [SPECIES_PINECO] = gMonFootprint_Pineco, diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index b493b4357..132541021 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -2342,7 +2342,7 @@ static const union AnimCmd sAnim_Misdreavus_1[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_Unown_1[] = +static const union AnimCmd sAnim_UnownA_1[] = { ANIMCMD_FRAME(0, 30), ANIMCMD_FRAME(1, 30), @@ -10704,7 +10704,7 @@ SINGLE_ANIMATION(Umbreon); SINGLE_ANIMATION(Murkrow); SINGLE_ANIMATION(Slowking); SINGLE_ANIMATION(Misdreavus); -SINGLE_ANIMATION(Unown); +SINGLE_ANIMATION(UnownA); DOUBLE_ANIMATION(Wobbuffet); DOUBLE_ANIMATION(Girafarig); SINGLE_ANIMATION(Pineco); @@ -11840,7 +11840,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = [SPECIES_MURKROW] = sAnims_Murkrow, [SPECIES_SLOWKING] = sAnims_Slowking, [SPECIES_MISDREAVUS] = sAnims_Misdreavus, - [SPECIES_UNOWN] = sAnims_Unown, + [SPECIES_UNOWN_A] = sAnims_UnownA, [SPECIES_WOBBUFFET] = sAnims_Wobbuffet, [SPECIES_GIRAFARIG] = sAnims_Girafarig, [SPECIES_PINECO] = sAnims_Pineco, diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index a484b8596..bf6447f2b 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -205,7 +205,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_MURKROW] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 15 }, [SPECIES_SLOWKING] = { .size = MON_COORDS_SIZE(48, 64), .y_offset = 1 }, [SPECIES_MISDREAVUS] = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 13 }, - [SPECIES_UNOWN] = { .size = MON_COORDS_SIZE(24, 40), .y_offset = 15 }, + [SPECIES_UNOWN_A] = { .size = MON_COORDS_SIZE(24, 40), .y_offset = 15 }, [SPECIES_WOBBUFFET] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 5 }, [SPECIES_GIRAFARIG] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 }, [SPECIES_PINECO] = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 }, diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index 7629834ad..30383570c 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -201,7 +201,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(MURKROW, gMonFrontPic_Murkrow), SPECIES_SPRITE(SLOWKING, gMonFrontPic_Slowking), SPECIES_SPRITE(MISDREAVUS, gMonFrontPic_Misdreavus), - SPECIES_SPRITE(UNOWN, gMonFrontPic_Unown), + SPECIES_SPRITE(UNOWN_A, gMonFrontPic_Unown), SPECIES_SPRITE(WOBBUFFET, gMonFrontPic_Wobbuffet), SPECIES_SPRITE(GIRAFARIG, gMonFrontPic_Girafarig), SPECIES_SPRITE(PINECO, gMonFrontPic_Pineco), @@ -1346,8 +1346,8 @@ const struct CompressedSpriteSheet gMonFrontPicTableFemale[] = SPECIES_SPRITE(KRICKETOT, gMonFrontPic_KricketotF), SPECIES_SPRITE(KRICKETUNE, gMonFrontPic_KricketuneF), SPECIES_SPRITE(SHINX, gMonFrontPic_ShinxF), - SPECIES_SPRITE(COMBEE, gMonFrontPic_CombeeF), - SPECIES_SPRITE(HIPPOPOTAS, gMonFrontPic_HippopotasF), + SPECIES_SPRITE(COMBEE, gMonFrontPic_Combee), + SPECIES_SPRITE(HIPPOPOTAS, gMonFrontPic_Hippopotas), SPECIES_SPRITE(HIPPOWDON, gMonFrontPic_Hippowdon), #endif #if P_GEN_5_POKEMON == TRUE diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 8ef3b3231..7403b3d9a 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -201,7 +201,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(MURKROW, gMonPalette_Murkrow), SPECIES_PAL(SLOWKING, gMonPalette_Slowking), SPECIES_PAL(MISDREAVUS, gMonPalette_Misdreavus), - SPECIES_PAL(UNOWN, gMonPalette_Unown), + SPECIES_PAL(UNOWN_A, gMonPalette_Unown), SPECIES_PAL(WOBBUFFET, gMonPalette_Wobbuffet), SPECIES_PAL(GIRAFARIG, gMonPalette_Girafarig), SPECIES_PAL(PINECO, gMonPalette_Pineco), @@ -1339,7 +1339,7 @@ const struct CompressedSpritePalette gMonPaletteTableFemale[] = { SPECIES_PAL(EEVEE, gMonPalette_Eevee), #if P_GEN_4_POKEMON == TRUE - SPECIES_PAL(COMBEE, gMonPalette_Combee), + SPECIES_PAL(COMBEE, gMonPalette_CombeeF), SPECIES_PAL(STARLY, gMonPalette_Starly), SPECIES_PAL(STARAVIA, gMonPalette_Staravia), SPECIES_PAL(STARAPTOR, gMonPalette_Staraptor), @@ -1356,7 +1356,7 @@ const struct CompressedSpritePalette gMonPaletteTableFemale[] = SPECIES_PAL(JELLICENT, gMonPalette_JellicentF), #endif #if P_GEN_6_POKEMON == TRUE - SPECIES_PAL(PYROAR, gMonPalette_PyroarF), + SPECIES_PAL(PYROAR, gMonPalette_Pyroar), #endif #if P_GEN_8_POKEMON == TRUE SPECIES_PAL(BASCULEGION, gMonPalette_CircledQuestionMark), // gMonPalette_BasculegionF), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 64a999c49..860a28f2b 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -201,7 +201,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(MURKROW, gMonShinyPalette_Murkrow), SPECIES_SHINY_PAL(SLOWKING, gMonShinyPalette_Slowking), SPECIES_SHINY_PAL(MISDREAVUS, gMonShinyPalette_Misdreavus), - SPECIES_SHINY_PAL(UNOWN, gMonShinyPalette_Unown), + SPECIES_SHINY_PAL(UNOWN_A, gMonShinyPalette_Unown), SPECIES_SHINY_PAL(WOBBUFFET, gMonShinyPalette_Wobbuffet), SPECIES_SHINY_PAL(GIRAFARIG, gMonShinyPalette_Girafarig), SPECIES_SHINY_PAL(PINECO, gMonShinyPalette_Pineco), @@ -1345,7 +1345,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] = SPECIES_SHINY_PAL(KRICKETOT, gMonShinyPalette_Kricketot), SPECIES_SHINY_PAL(KRICKETUNE, gMonShinyPalette_Kricketune), SPECIES_SHINY_PAL(SHINX, gMonShinyPalette_Shinx), - SPECIES_SHINY_PAL(COMBEE, gMonShinyPalette_Combee), + SPECIES_SHINY_PAL(COMBEE, gMonShinyPalette_CombeeF), SPECIES_SHINY_PAL(HIPPOPOTAS, gMonShinyPalette_HippopotasF), SPECIES_SHINY_PAL(HIPPOWDON, gMonShinyPalette_HippowdonF), #endif @@ -1355,7 +1355,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] = SPECIES_SHINY_PAL(JELLICENT, gMonShinyPalette_JellicentF), #endif #if P_GEN_6_POKEMON == TRUE - SPECIES_SHINY_PAL(PYROAR, gMonShinyPalette_PyroarF), + SPECIES_SHINY_PAL(PYROAR, gMonShinyPalette_Pyroar), #endif #if P_GEN_8_POKEMON == TRUE SPECIES_SHINY_PAL(BASCULEGION, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_BasculegionF), diff --git a/src/data/text/abilities.h b/src/data/text/abilities.h index ac11b9de8..96407c340 100644 --- a/src/data/text/abilities.h +++ b/src/data/text/abilities.h @@ -254,6 +254,37 @@ static const u8 sChillingNeighDescription[] = _("KOs boost Attack stat."); static const u8 sGrimNeighDescription[] = _("KOs boost Sp. Atk stat."); static const u8 sAsOneIceRiderDescription[] = _("Unnerve and Chilling Neigh."); static const u8 sAsOneShadowRiderDescription[] = _("Unnerve and Grim Neigh."); +static const u8 sLingeringAromaDescription[] = _("Spreads with contact."); +static const u8 sSeedSowerDescription[] = _("Affects terrain when hit."); +static const u8 sThermalExchangeDescription[] = _("Fire hits up Attack."); +static const u8 sAngerShellDescription[] = _("Gets angry at half HP."); +static const u8 sPurifyingSaltDescription[] = _("Protected by pure salts."); +static const u8 sWellBakedBodyDescription[] = _("Strengthened by Fire."); +static const u8 sWindRiderDescription[] = _("Ups Attack if hit by wind."); +static const u8 sGuardDogDescription[] = _("Cannot be intimidated."); +static const u8 sRockyPayloadDescription[] = _("Powers up Rock moves."); +static const u8 sWindPowerDescription[] = _("Gets charged by wind."); +static const u8 sZeroToHeroDescription[] = _("Changes form on switch out."); +static const u8 sCommanderDescription[] = _("Commands from Dondozo."); +static const u8 sElectromorphosisDescription[] = _("Gets Charged on contact."); +static const u8 sProtosynthesisDescription[] = _("Sun boosts best stat."); +static const u8 sQuarkDriveDescription[] = _("Elec. field ups best stat."); +static const u8 sGoodAsGoldDescription[] = _("Avoids status problems."); +static const u8 sVesselOfRuinDescription[] = _("Lowers foes' sp. damage."); +static const u8 sSwordOfRuinDescription[] = _("Lowers foes' defense."); +static const u8 sTabletsOfRuinDescription[] = _("Lowers foes' damage."); +static const u8 sBeadsOfRuinDescription[] = _("Lowers foes' sp. defense."); +static const u8 sOrichalcumPulseDescription[] = _("Summons sunlight in battle."); +static const u8 sHadronEngineDescription[] = _("Field becomes Electric."); +static const u8 sOpportunistDescription[] = _("Copies foe's stat change."); +static const u8 sCudChewDescription[] = _("Eats a used berry again."); +static const u8 sSharpnessDescription[] = _("Strengthens cutting moves."); +static const u8 sSupremeOverlordDescription[] = _("Inherits fallen's strength."); +static const u8 sCostarDescription[] = _("Copies ally's stat changes."); +static const u8 sToxicDebrisDescription[] = _("Throws poison spikes if hit."); +static const u8 sArmorTailDescription[] = _("Protects from priority."); +static const u8 sEarthEaterDescription[] = _("Eats ground to heal HP."); +static const u8 sMyceliumMightDescription[] = _("Status moves never fail."); #if B_EXPANDED_ABILITY_NAMES == TRUE const u8 gAbilityNames[ABILITIES_COUNT][ABILITY_NAME_LENGTH + 1] = @@ -526,6 +557,37 @@ const u8 gAbilityNames[ABILITIES_COUNT][ABILITY_NAME_LENGTH + 1] = [ABILITY_GRIM_NEIGH] = _("Grim Neigh"), [ABILITY_AS_ONE_ICE_RIDER] = _("As One"), [ABILITY_AS_ONE_SHADOW_RIDER] = _("As One"), + [ABILITY_LINGERING_AROMA] = _("Lingering Aroma"), + [ABILITY_SEED_SOWER] = _("Seed Sower"), + [ABILITY_THERMAL_EXCHANGE] = _("Thermal Exchange"), + [ABILITY_ANGER_SHELL] = _("Anger Shell"), + [ABILITY_PURIFYING_SALT] = _("Purifying Salt"), + [ABILITY_WELL_BAKED_BODY] = _("Well-Baked Body"), + [ABILITY_WIND_RIDER] = _("Wind Rider"), + [ABILITY_GUARD_DOG] = _("Guard Dog"), + [ABILITY_ROCKY_PAYLOAD] = _("Rocky Payload"), + [ABILITY_WIND_POWER] = _("Wind Power"), + [ABILITY_ZERO_TO_HERO] = _("Zero to Hero"), + [ABILITY_COMMANDER] = _("Commander"), + [ABILITY_ELECTROMORPHOSIS] = _("Electromorphosis"), + [ABILITY_PROTOSYNTHESIS] = _("Protosynthesis"), + [ABILITY_QUARK_DRIVE] = _("Quark Drive"), + [ABILITY_GOOD_AS_GOLD] = _("Good as Gold"), + [ABILITY_VESSEL_OF_RUIN] = _("Vessel of Ruin"), + [ABILITY_SWORD_OF_RUIN] = _("Sword of Ruin"), + [ABILITY_TABLETS_OF_RUIN] = _("Tablets of Ruin"), + [ABILITY_BEADS_OF_RUIN] = _("Beads of Ruin"), + [ABILITY_ORICHALCUM_PULSE] = _("Orichalcum Pulse"), + [ABILITY_HADRON_ENGINE] = _("Hadron Engine"), + [ABILITY_OPPORTUNIST] = _("Opportunist"), + [ABILITY_CUD_CHEW] = _("Cud Chew"), + [ABILITY_SHARPNESS] = _("Sharpness"), + [ABILITY_SUPREME_OVERLORD] = _("Supreme Overlord"), + [ABILITY_COSTAR] = _("Costar"), + [ABILITY_TOXIC_DEBRIS] = _("Toxic Debris"), + [ABILITY_ARMOR_TAIL] = _("Armor Tail"), + [ABILITY_EARTH_EATER] = _("Earth Eater"), + [ABILITY_MYCELIUM_MIGHT] = _("Mycelium Might"), }; #else // 12 characters const u8 gAbilityNames[ABILITIES_COUNT][ABILITY_NAME_LENGTH + 1] = @@ -798,6 +860,37 @@ const u8 gAbilityNames[ABILITIES_COUNT][ABILITY_NAME_LENGTH + 1] = [ABILITY_GRIM_NEIGH] = _("Grim Neigh"), [ABILITY_AS_ONE_ICE_RIDER] = _("As One"), [ABILITY_AS_ONE_SHADOW_RIDER] = _("As One"), + [ABILITY_LINGERING_AROMA] = _("LngerngAroma"), + [ABILITY_SEED_SOWER] = _("Seed Sower"), + [ABILITY_THERMAL_EXCHANGE] = _("ThrmlExchnge"), + [ABILITY_ANGER_SHELL] = _("Anger Shell"), + [ABILITY_PURIFYING_SALT] = _("PurfyingSalt"), + [ABILITY_WELL_BAKED_BODY] = _("WellBakedBdy"), + [ABILITY_WIND_RIDER] = _("Wind Rider"), + [ABILITY_GUARD_DOG] = _("Guard Dog"), + [ABILITY_ROCKY_PAYLOAD] = _("RockyPayload"), + [ABILITY_WIND_POWER] = _("Wind Power"), + [ABILITY_ZERO_TO_HERO] = _("Zero to Hero"), + [ABILITY_COMMANDER] = _("Commander"), + [ABILITY_ELECTROMORPHOSIS] = _("Elecmrphosis"), + [ABILITY_PROTOSYNTHESIS] = _("Protosnthsis"), + [ABILITY_QUARK_DRIVE] = _("Quark Drive"), + [ABILITY_GOOD_AS_GOLD] = _("Good as Gold"), + [ABILITY_VESSEL_OF_RUIN] = _("VesselOfRuin"), + [ABILITY_SWORD_OF_RUIN] = _("SwordOfRuin"), + [ABILITY_TABLETS_OF_RUIN] = _("TabltsOfRuin"), + [ABILITY_BEADS_OF_RUIN] = _("BeadsOfRuin"), + [ABILITY_ORICHALCUM_PULSE] = _("OrchlcumPlse"), + [ABILITY_HADRON_ENGINE] = _("HadronEngine"), + [ABILITY_OPPORTUNIST] = _("Opportunist"), + [ABILITY_CUD_CHEW] = _("Cud Chew"), + [ABILITY_SHARPNESS] = _("Sharpness"), + [ABILITY_SUPREME_OVERLORD] = _("SuprmeOvrlrd"), + [ABILITY_COSTAR] = _("Costar"), + [ABILITY_TOXIC_DEBRIS] = _("Toxic Debris"), + [ABILITY_ARMOR_TAIL] = _("Armor Tail"), + [ABILITY_EARTH_EATER] = _("Earth Eater"), + [ABILITY_MYCELIUM_MIGHT] = _("MceliumMight"), }; #endif @@ -1071,4 +1164,35 @@ const u8 *const gAbilityDescriptionPointers[ABILITIES_COUNT] = [ABILITY_GRIM_NEIGH] = sGrimNeighDescription, [ABILITY_AS_ONE_ICE_RIDER] = sAsOneIceRiderDescription, [ABILITY_AS_ONE_SHADOW_RIDER] = sAsOneShadowRiderDescription, + [ABILITY_LINGERING_AROMA] = sLingeringAromaDescription, + [ABILITY_SEED_SOWER] = sSeedSowerDescription, + [ABILITY_THERMAL_EXCHANGE] = sThermalExchangeDescription, + [ABILITY_ANGER_SHELL] = sAngerShellDescription, + [ABILITY_PURIFYING_SALT] = sPurifyingSaltDescription, + [ABILITY_WELL_BAKED_BODY] = sWellBakedBodyDescription, + [ABILITY_WIND_RIDER] = sWindRiderDescription, + [ABILITY_GUARD_DOG] = sGuardDogDescription, + [ABILITY_ROCKY_PAYLOAD] = sRockyPayloadDescription, + [ABILITY_WIND_POWER] = sWindPowerDescription, + [ABILITY_ZERO_TO_HERO] = sZeroToHeroDescription, + [ABILITY_COMMANDER] = sCommanderDescription, + [ABILITY_ELECTROMORPHOSIS] = sElectromorphosisDescription, + [ABILITY_PROTOSYNTHESIS] = sProtosynthesisDescription, + [ABILITY_QUARK_DRIVE] = sQuarkDriveDescription, + [ABILITY_GOOD_AS_GOLD] = sGoodAsGoldDescription, + [ABILITY_VESSEL_OF_RUIN] = sVesselOfRuinDescription, + [ABILITY_SWORD_OF_RUIN] = sSwordOfRuinDescription, + [ABILITY_TABLETS_OF_RUIN] = sTabletsOfRuinDescription, + [ABILITY_BEADS_OF_RUIN] = sBeadsOfRuinDescription, + [ABILITY_ORICHALCUM_PULSE] = sOrichalcumPulseDescription, + [ABILITY_HADRON_ENGINE] = sHadronEngineDescription, + [ABILITY_OPPORTUNIST] = sOpportunistDescription, + [ABILITY_CUD_CHEW] = sCudChewDescription, + [ABILITY_SHARPNESS] = sSharpnessDescription, + [ABILITY_SUPREME_OVERLORD] = sSupremeOverlordDescription, + [ABILITY_COSTAR] = sCostarDescription, + [ABILITY_TOXIC_DEBRIS] = sToxicDebrisDescription, + [ABILITY_ARMOR_TAIL] = sArmorTailDescription, + [ABILITY_EARTH_EATER] = sEarthEaterDescription, + [ABILITY_MYCELIUM_MIGHT] = sMyceliumMightDescription, }; diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index ec452b31b..f8e8da16e 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -200,7 +200,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_MURKROW] = _("Murkrow"), [SPECIES_SLOWKING] = _("Slowking"), [SPECIES_MISDREAVUS] = _("Misdreavus"), - [SPECIES_UNOWN] = _("Unown"), + [SPECIES_UNOWN_A] = _("Unown"), [SPECIES_WOBBUFFET] = _("Wobbuffet"), [SPECIES_GIRAFARIG] = _("Girafarig"), [SPECIES_PINECO] = _("Pineco"), diff --git a/src/decompress.c b/src/decompress.c index f5d4ff233..20f8897e8 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -83,16 +83,7 @@ void HandleLoadSpecialPokePic(bool32 isFrontPic, void *dest, s32 species, u32 pe void LoadSpecialPokePic(void *dest, s32 species, u32 personality, bool8 isFrontPic) { - if (species == SPECIES_UNOWN) - { - u32 id = GetUnownSpeciesId(personality); - - if (!isFrontPic) - LZ77UnCompWram(gMonBackPicTable[id].data, dest); - else - LZ77UnCompWram(gMonFrontPicTable[id].data, dest); - } - else if (species > NUM_SPECIES) // is species unknown? draw the ? icon + if (species > NUM_SPECIES) // is species unknown? draw the ? icon { if (isFrontPic) LZ77UnCompWram(gMonFrontPicTable[0].data, dest); diff --git a/src/frontier_util.c b/src/frontier_util.c index d89fca436..fcdf3a02d 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -497,100 +497,46 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][FRONTIER_PARTY_SIZ }, }; -static const u8 sBattlePointAwards[][NUM_FRONTIER_FACILITIES][FRONTIER_MODE_COUNT] = +static const u8 sBattlePointAwards[NUM_FRONTIER_FACILITIES][FRONTIER_MODE_COUNT][30] = { + /* facility, mode, tier */ + [FRONTIER_FACILITY_TOWER] = /* Tier: 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30 */ { - {1, 2, 3, 3}, {1, 1}, {4, 5}, {1}, {3, 4}, {1}, {5} + [FRONTIER_MODE_SINGLES] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15 }, + [FRONTIER_MODE_DOUBLES] = { 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15 }, + [FRONTIER_MODE_MULTIS] = { 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15 }, + [FRONTIER_MODE_LINK_MULTIS] = { 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15 }, }, + [FRONTIER_FACILITY_DOME] = { - {2, 3, 4, 4}, {1, 1}, {4, 5}, {1}, {3, 4}, {1}, {5} + [FRONTIER_MODE_SINGLES] = { 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15 }, + [FRONTIER_MODE_DOUBLES] = { 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15 }, }, + [FRONTIER_FACILITY_PALACE] = { - {3, 4, 5, 5}, {2, 2}, {5, 6}, {1}, {4, 5}, {2}, {6} + [FRONTIER_MODE_SINGLES] = { 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15 }, + [FRONTIER_MODE_DOUBLES] = { 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15 }, }, + [FRONTIER_FACILITY_ARENA] = { - {4, 5, 6, 6}, {2, 2}, {5, 6}, {2}, {4, 5}, {2}, {6} + [FRONTIER_MODE_SINGLES] = { 1, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15 }, }, + [FRONTIER_FACILITY_FACTORY] = { - {5, 6, 7, 7}, {3, 3}, {6, 7}, {2}, {5, 6}, {2}, {7} + [FRONTIER_MODE_SINGLES] = { 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 15, 15, 15, 15 }, + [FRONTIER_MODE_DOUBLES] = { 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15 }, }, + [FRONTIER_FACILITY_PIKE] = { - {6, 7, 8, 8}, {3, 3}, {6, 7}, {2}, {5, 6}, {4}, {7} + [FRONTIER_MODE_SINGLES] = { 1, 1, 2, 2, 2, 4, 4, 4, 8, 8, 8, 8, 10, 10, 10, 10, 12, 12, 12, 12, 12, 14, 14, 14, 14, 15, 15, 15, 15, 15 }, }, + [FRONTIER_FACILITY_PYRAMID] = { - {7, 8, 9, 9}, {4, 4}, {7, 8}, {3}, {6, 7}, {4}, {8} - }, - { - {8, 9, 10, 10}, {4, 4}, {7, 8}, {3},{6, 7}, {4}, {8} - }, - { - {9, 10, 11, 11}, {5, 5}, {8, 9}, {4}, {7, 8}, {8}, {9} - }, - { - {10, 11, 12, 12}, {5, 5}, {8, 9}, {4}, {7, 8}, {8}, {9} - }, - { - {11, 12, 13, 13}, {6, 6}, {9, 10}, {5,0}, {8, 9}, {8}, {10} - }, - { - {12, 13, 14, 14}, {6, 6}, {9, 10}, {6,0}, {8, 9}, {8}, {10} - }, - { - {13, 14, 15, 15}, {7, 7}, {10, 11}, {7}, {9, 10}, {10}, {11} - }, - { - {14, 15, 15, 15}, {7, 7}, {10, 11}, {8}, {9, 10}, {10}, {11} - }, - { - {15, 15, 15, 15}, {8, 8}, {11, 12}, {9}, {10, 11}, {10}, {12} - }, - { - {15, 15, 15, 15}, {8, 8}, {11, 12}, {10}, {10, 11}, {10}, {12} - }, - { - {15, 15, 15, 15}, {9, 9}, {12, 13}, {11}, {11, 12}, {12}, {13} - }, - { - {15, 15, 15, 15}, {9, 9}, {12, 13}, {12}, {11, 12}, {12}, {13} - }, - { - {15, 15, 15, 15}, {10, 10}, {13, 14}, {13}, {12, 13}, {12}, {14} - }, - { - {15, 15, 15, 15}, {10, 10}, {13, 14}, {14}, {12, 13}, {12}, {14} - }, - { - {15, 15, 15, 15}, {11, 11}, {14, 15}, {15}, {13, 14}, {12}, {15} - }, - { - {15, 15, 15, 15}, {11, 11}, {14, 15}, {15}, {13, 14}, {14}, {15} - }, - { - {15, 15, 15, 15}, {12, 12}, {15, 15}, {15}, {14, 15}, {14}, {15} - }, - { - {15, 15, 15, 15}, {12, 12}, {15, 15}, {15}, {14, 15}, {14}, {15} - }, - { - {15, 15, 15, 15}, {13, 13}, {15, 15}, {15}, {15, 15}, {14}, {15} - }, - { - {15, 15, 15, 15}, {13, 13}, {15, 15}, {15}, {15, 15}, {15}, {15} - }, - { - {15, 15, 15, 15}, {14, 14}, {15, 15}, {15}, {15, 15}, {15}, {15} - }, - { - {15, 15, 15, 15}, {14, 14}, {15, 15}, {15}, {15, 15}, {15}, {15} - }, - { - {15, 15, 15, 15}, {15, 15}, {15, 15}, {15}, {15, 15}, {15}, {15} - }, - { - {15, 15, 15, 15}, {15, 15}, {15, 15}, {15}, {15, 15}, {15}, {15} + [FRONTIER_MODE_SINGLES] = { 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15 }, }, }; + // Flags to change the conversation when the Frontier Brain is encountered for a battle // First bit is has battled them before and not won yet, second bit is has battled them and won (obtained a Symbol) static const u16 sBattledBrainBitFlags[NUM_FRONTIER_FACILITIES][2] = @@ -1885,10 +1831,10 @@ static void GiveBattlePoints(void) if (challengeNum != 0) challengeNum--; - if (challengeNum >= ARRAY_COUNT(sBattlePointAwards)) - challengeNum = ARRAY_COUNT(sBattlePointAwards) - 1; + if (challengeNum >= ARRAY_COUNT(sBattlePointAwards[0][0])) + challengeNum = ARRAY_COUNT(sBattlePointAwards[0][0]) - 1; - points = sBattlePointAwards[challengeNum][facility][battleMode]; + points = sBattlePointAwards[facility][battleMode][challengeNum]; if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN) points += 10; gSaveBlock2Ptr->frontier.battlePoints += points; @@ -1897,8 +1843,8 @@ static void GiveBattlePoints(void) gSaveBlock2Ptr->frontier.battlePoints = MAX_BATTLE_FRONTIER_POINTS; points = gSaveBlock2Ptr->frontier.cardBattlePoints; - points += sBattlePointAwards[challengeNum][facility][battleMode]; - IncrementDailyBattlePoints(sBattlePointAwards[challengeNum][facility][battleMode]); + points += sBattlePointAwards[facility][battleMode][challengeNum]; + IncrementDailyBattlePoints(sBattlePointAwards[facility][battleMode][challengeNum]); if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN) { points += 10; diff --git a/src/graphics.c b/src/graphics.c index 0126150fd..c0ca2ff3a 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -286,6 +286,8 @@ const u32 gBattleAnimSpritePal_Tornado[] = INCBIN_U32("graphics/battle_anims/spr const u32 gBattleAnimSpriteGfx_ZMoveSymbol[] = INCBIN_U32("graphics/battle_anims/sprites/z_move_symbol.4bpp.lz"); const u32 gBattleAnimSpritePal_ZMoveSymbol[] = INCBIN_U32("graphics/battle_anims/sprites/z_move_symbol.gbapal.lz"); +const u32 gBattleAnimSpriteGfx_Teapot[] = INCBIN_U32("graphics/battle_anims/sprites/new/teapot.4bpp.lz"); +const u32 gBattleAnimSpritePal_Teapot[] = INCBIN_U32("graphics/battle_anims/sprites/new/teapot.gbapal.lz"); // Battle anims const u32 gBattleAnimSpriteGfx_Bubble[] = INCBIN_U32("graphics/battle_anims/sprites/bubble.4bpp.lz"); @@ -682,7 +684,7 @@ const u8 gHealthboxElementsGfxTable[] = INCBIN_U8("graphics/battle_interface/hpb "graphics/battle_interface/hpbar_anim.4bpp", "graphics/battle_interface/misc_frameend.4bpp", "graphics/battle_interface/ball_display.4bpp", - "graphics/battle_interface/ball_display_unused_extra.4bpp", + "graphics/battle_interface/ball_caught_indicator.4bpp", "graphics/battle_interface/status2.4bpp", // these three duplicate sets of graphics are for the opponent pokemon "graphics/battle_interface/status3.4bpp", // and are also for use in double battles. they use dynamic palettes so "graphics/battle_interface/status4.4bpp", // coloring them is an extreme headache and wont be done for now diff --git a/src/item_menu.c b/src/item_menu.c index 608e203a6..2746fcf92 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -987,7 +987,7 @@ static void BagMenu_ItemPrintCallback(u8 windowId, u32 itemIndex, u8 y) else { // Print registered icon - if (gSaveBlock1Ptr->registeredItem && gSaveBlock1Ptr->registeredItem == itemId) + if (gSaveBlock1Ptr->registeredItem != ITEM_NONE && gSaveBlock1Ptr->registeredItem == itemId) BlitBitmapToWindow(windowId, sRegisteredSelect_Gfx, 96, y - 1, 24, 16); } } @@ -1909,7 +1909,7 @@ static void ItemMenu_Register(u8 taskId) u16 *cursorPos = &gBagPosition.cursorPosition[gBagPosition.pocket]; if (gSaveBlock1Ptr->registeredItem == gSpecialVar_ItemId) - gSaveBlock1Ptr->registeredItem = 0; + gSaveBlock1Ptr->registeredItem = ITEM_NONE; else gSaveBlock1Ptr->registeredItem = gSpecialVar_ItemId; DestroyListMenuTask(tListTaskId, scrollPos, cursorPos); diff --git a/src/mail.c b/src/mail.c index e20a53cba..1461521e9 100644 --- a/src/mail.c +++ b/src/mail.c @@ -445,7 +445,6 @@ static const struct MailLayout sMailLayouts_Tall[] = { void ReadMail(struct Mail *mail, void (*exitCallback)(void), bool8 hasText) { - u16 buffer[2]; u16 species; sMailRead = AllocZeroed(sizeof(*sMailRead)); @@ -473,8 +472,7 @@ void ReadMail(struct Mail *mail, void (*exitCallback)(void), bool8 hasText) sMailRead->layout = &sMailLayouts_Tall[sMailRead->mailType]; break; } - species = MailSpeciesToSpecies(mail->species, buffer); - if (species > SPECIES_NONE && species < NUM_SPECIES) + if (mail->species > SPECIES_NONE && mail->species < NUM_SPECIES) { switch (sMailRead->mailType) { diff --git a/src/mail_data.c b/src/mail_data.c index 99cf1f9ed..c6748f83f 100644 --- a/src/mail_data.c +++ b/src/mail_data.c @@ -67,9 +67,7 @@ u8 GiveMailToMonByItemId(struct Pokemon *mon, u16 itemId) for (i = 0; i < TRAINER_ID_LENGTH; i++) gSaveBlock1Ptr->mail[id].trainerId[i] = gSaveBlock2Ptr->playerTrainerId[i]; - species = GetBoxMonData(&mon->box, MON_DATA_SPECIES); - personality = GetBoxMonData(&mon->box, MON_DATA_PERSONALITY); - gSaveBlock1Ptr->mail[id].species = SpeciesToMailSpecies(species, personality); + gSaveBlock1Ptr->mail[id].species = GetBoxMonData(&mon->box, MON_DATA_SPECIES); gSaveBlock1Ptr->mail[id].itemId = itemId; SetMonData(mon, MON_DATA_MAIL, &id); SetMonData(mon, MON_DATA_HELD_ITEM, heldItem); @@ -80,34 +78,6 @@ u8 GiveMailToMonByItemId(struct Pokemon *mon, u16 itemId) return MAIL_NONE; } -u16 SpeciesToMailSpecies(u16 species, u32 personality) -{ - if (species == SPECIES_UNOWN) - { - u32 species = GetUnownLetterByPersonality(personality) + UNOWN_OFFSET; - return species; - } - - return species; -} - -u16 MailSpeciesToSpecies(u16 mailSpecies, u16 *buffer) -{ - u16 result; - - if (mailSpecies >= UNOWN_OFFSET && mailSpecies < UNOWN_OFFSET + NUM_UNOWN_FORMS) - { - result = SPECIES_UNOWN; - *buffer = mailSpecies - UNOWN_OFFSET; - } - else - { - result = mailSpecies; - } - - return result; -} - u8 GiveMailToMon(struct Pokemon *mon, struct Mail *mail) { u8 heldItem[2]; diff --git a/src/new_game.c b/src/new_game.c index 8f8aa9b82..0efc12d47 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -182,7 +182,7 @@ void NewGameInitData(void) ResetPokemonStorageSystem(); ClearRoamerData(); ClearRoamerLocationData(); - gSaveBlock1Ptr->registeredItem = 0; + gSaveBlock1Ptr->registeredItem = ITEM_NONE; ClearBag(); NewGameInitPCItems(); ClearPokeblocks(); diff --git a/src/pokedex.c b/src/pokedex.c index ef71d3129..c72e269f7 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -4592,9 +4592,9 @@ static u16 GetNextPosition(u8 direction, u16 position, u16 min, u16 max) // All others use personality 0 static u32 GetPokedexMonPersonality(u16 species) { - if (species == SPECIES_UNOWN || species == SPECIES_SPINDA) + if (species == SPECIES_UNOWN_A || species == SPECIES_SPINDA) { - if (species == SPECIES_UNOWN) + if (species == SPECIES_UNOWN_A) return gSaveBlock2Ptr->pokedex.unownPersonality; else return gSaveBlock2Ptr->pokedex.spindaPersonality; diff --git a/src/pokemon.c b/src/pokemon.c index 8e8166fb3..fe36c27b5 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -538,7 +538,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(MURKROW), SPECIES_TO_NATIONAL(SLOWKING), SPECIES_TO_NATIONAL(MISDREAVUS), - SPECIES_TO_NATIONAL(UNOWN), + [SPECIES_UNOWN_A - 1] = NATIONAL_DEX_UNOWN, SPECIES_TO_NATIONAL(WOBBUFFET), SPECIES_TO_NATIONAL(GIRAFARIG), SPECIES_TO_NATIONAL(PINECO), @@ -2163,7 +2163,34 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_MURKROW - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_SLOWKING - 1] = ANIM_SHRINK_GROW, [SPECIES_MISDREAVUS - 1] = ANIM_V_SLIDE_WOBBLE, - [SPECIES_UNOWN - 1] = ANIM_ZIGZAG_FAST, + [SPECIES_UNOWN_A - 1] = ANIM_ZIGZAG_FAST, + [SPECIES_UNOWN_B - 1] = ANIM_ZIGZAG_FAST, + [SPECIES_UNOWN_C - 1] = ANIM_ZIGZAG_FAST, + [SPECIES_UNOWN_D - 1] = ANIM_ZIGZAG_FAST, + [SPECIES_UNOWN_E - 1] = ANIM_ZIGZAG_FAST, + [SPECIES_UNOWN_F - 1] = ANIM_ZIGZAG_FAST, + [SPECIES_UNOWN_G - 1] = ANIM_ZIGZAG_FAST, + [SPECIES_UNOWN_H - 1] = ANIM_ZIGZAG_FAST, + [SPECIES_UNOWN_I - 1] = ANIM_ZIGZAG_FAST, + [SPECIES_UNOWN_J - 1] = ANIM_ZIGZAG_FAST, + [SPECIES_UNOWN_K - 1] = ANIM_ZIGZAG_FAST, + [SPECIES_UNOWN_L - 1] = ANIM_ZIGZAG_FAST, + [SPECIES_UNOWN_M - 1] = ANIM_ZIGZAG_FAST, + [SPECIES_UNOWN_N - 1] = ANIM_ZIGZAG_FAST, + [SPECIES_UNOWN_O - 1] = ANIM_ZIGZAG_FAST, + [SPECIES_UNOWN_P - 1] = ANIM_ZIGZAG_FAST, + [SPECIES_UNOWN_Q - 1] = ANIM_ZIGZAG_FAST, + [SPECIES_UNOWN_R - 1] = ANIM_ZIGZAG_FAST, + [SPECIES_UNOWN_S - 1] = ANIM_ZIGZAG_FAST, + [SPECIES_UNOWN_T - 1] = ANIM_ZIGZAG_FAST, + [SPECIES_UNOWN_U - 1] = ANIM_ZIGZAG_FAST, + [SPECIES_UNOWN_V - 1] = ANIM_ZIGZAG_FAST, + [SPECIES_UNOWN_W - 1] = ANIM_ZIGZAG_FAST, + [SPECIES_UNOWN_X - 1] = ANIM_ZIGZAG_FAST, + [SPECIES_UNOWN_Y - 1] = ANIM_ZIGZAG_FAST, + [SPECIES_UNOWN_Z - 1] = ANIM_ZIGZAG_FAST, + [SPECIES_UNOWN_EMARK - 1] = ANIM_ZIGZAG_FAST, + [SPECIES_UNOWN_QMARK - 1] = ANIM_ZIGZAG_FAST, [SPECIES_WOBBUFFET - 1] = ANIM_GROW_VIBRATE, [SPECIES_GIRAFARIG - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_PINECO - 1] = ANIM_SWING_CONCAVE, @@ -3438,6 +3465,9 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV, else personality = Random32(); + if (species == SPECIES_UNOWN) + species = GetUnownSpeciesId(personality); + // Determine original trainer ID if (otIdType == OT_ID_RANDOM_NO_SHINY) { @@ -3481,11 +3511,7 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV, else #endif { - #if P_SHINY_BASE_CHANCE >= GEN_6 - u32 totalRerolls = 1; - #else u32 totalRerolls = 0; - #endif if (CheckBagHasItem(ITEM_SHINY_CHARM, 1)) totalRerolls += I_SHINY_CHARM_REROLLS; if (LURE_STEP_COUNT != 0) @@ -4464,7 +4490,7 @@ u32 GetUnownSpeciesId(u32 personality) u16 unownLetter = GetUnownLetterByPersonality(personality); if (unownLetter == 0) - return SPECIES_UNOWN; + return SPECIES_UNOWN_A; return unownLetter + SPECIES_UNOWN_B - 1; } @@ -8228,7 +8254,7 @@ void HandleSetPokedexFlag(u16 nationalNum, u8 caseId, u32 personality) if (!GetSetPokedexFlag(nationalNum, getFlagCaseId)) // don't set if it's already set { GetSetPokedexFlag(nationalNum, caseId); - if (NationalPokedexNumToSpecies(nationalNum) == SPECIES_UNOWN) + if (GET_BASE_SPECIES_ID(NationalPokedexNumToSpecies(nationalNum)) == SPECIES_UNOWN_A) gSaveBlock2Ptr->pokedex.unownPersonality = personality; if (NationalPokedexNumToSpecies(nationalNum) == SPECIES_SPINDA) gSaveBlock2Ptr->pokedex.spindaPersonality = personality; @@ -8251,13 +8277,12 @@ const u8 *GetTrainerNameFromId(u16 trainerId) bool8 HasTwoFramesAnimation(u16 species) { + species = GET_BASE_SPECIES_ID(species); + return (species != SPECIES_CASTFORM && species != SPECIES_SPINDA - && species != SPECIES_UNOWN - && species != SPECIES_CHERRIM - && species != SPECIES_CASTFORM_SUNNY - && species != SPECIES_CASTFORM_RAINY - && species != SPECIES_CASTFORM_SNOWY); + && species != SPECIES_UNOWN_A + && species != SPECIES_CHERRIM); } static bool8 ShouldSkipFriendshipChange(void) @@ -8621,6 +8646,8 @@ void TrySpecialOverworldEvo(void) bool32 ShouldShowFemaleDifferences(u16 species, u32 personality) { + if (species >= NUM_SPECIES) + return FALSE; return (gSpeciesInfo[species].flags & SPECIES_FLAG_GENDER_DIFFERENCE) && GetGenderFromSpeciesAndPersonality(species, personality) == MON_FEMALE; } diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index 936ef037d..76071ca89 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -414,7 +414,34 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] = [SPECIES_MURKROW] = BACK_ANIM_CONCAVE_ARC_SMALL, [SPECIES_SLOWKING] = BACK_ANIM_DIP_RIGHT_SIDE, [SPECIES_MISDREAVUS] = BACK_ANIM_H_VIBRATE, - [SPECIES_UNOWN] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_UNOWN_A] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_UNOWN_B] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_UNOWN_C] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_UNOWN_D] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_UNOWN_E] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_UNOWN_F] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_UNOWN_G] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_UNOWN_H] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_UNOWN_I] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_UNOWN_J] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_UNOWN_K] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_UNOWN_L] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_UNOWN_M] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_UNOWN_N] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_UNOWN_O] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_UNOWN_P] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_UNOWN_Q] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_UNOWN_R] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_UNOWN_S] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_UNOWN_T] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_UNOWN_U] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_UNOWN_V] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_UNOWN_W] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_UNOWN_X] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_UNOWN_Y] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_UNOWN_Z] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_UNOWN_EMARK] = BACK_ANIM_SHRINK_GROW_VIBRATE, + [SPECIES_UNOWN_QMARK] = BACK_ANIM_SHRINK_GROW_VIBRATE, [SPECIES_WOBBUFFET] = BACK_ANIM_V_STRETCH, [SPECIES_GIRAFARIG] = BACK_ANIM_SHRINK_GROW_VIBRATE, [SPECIES_PINECO] = BACK_ANIM_H_SHAKE, @@ -907,11 +934,11 @@ u8 GetSpeciesBackAnimSet(u16 species) // as 0xFFFFXXXX instead of the desired 0x02YYXXXX. // By dumb luck, this is not an issue in vanilla. However, // changing the link order revealed this bug. -#if MODERN +#if MODERN || defined(BUGFIX) #define ANIM_SPRITE(taskId) ((struct Sprite *)((gTasks[taskId].tPtrHi << 16) | ((u16)gTasks[taskId].tPtrLo))) #else #define ANIM_SPRITE(taskId) ((struct Sprite *)((gTasks[taskId].tPtrHi << 16) | (gTasks[taskId].tPtrLo))) -#endif //MODERN +#endif //MODERN || BUGFIX static void Task_HandleMonAnimation(u8 taskId) { diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index c9dae5343..2d970301f 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -227,7 +227,7 @@ const u8 *const gMonIconTable[] = [SPECIES_MURKROW] = gMonIcon_Murkrow, [SPECIES_SLOWKING] = gMonIcon_Slowking, [SPECIES_MISDREAVUS] = gMonIcon_Misdreavus, - [SPECIES_UNOWN] = gMonIcon_Unown, + [SPECIES_UNOWN_A] = gMonIcon_Unown, [SPECIES_WOBBUFFET] = gMonIcon_Wobbuffet, [SPECIES_GIRAFARIG] = gMonIcon_Girafarig, [SPECIES_PINECO] = gMonIcon_Pineco, @@ -1309,9 +1309,14 @@ const u8 *const gMonIconTableFemale[] = [SPECIES_KRICKETUNE] = gMonIcon_Kricketune, [SPECIES_SHINX] = gMonIcon_Shinx, [SPECIES_COMBEE] = gMonIcon_Combee, +#if P_HIPPO_GENDER_DIFF_ICONS == TRUE + [SPECIES_HIPPOPOTAS] = gMonIcon_HippopotasF, + [SPECIES_HIPPOWDON] = gMonIcon_HippowdonF, +#else [SPECIES_HIPPOPOTAS] = gMonIcon_Hippopotas, [SPECIES_HIPPOWDON] = gMonIcon_Hippowdon, #endif +#endif #if P_GEN_5_POKEMON == TRUE [SPECIES_UNFEZANT] = gMonIcon_UnfezantF, [SPECIES_FRILLISH] = gMonIcon_FrillishF, @@ -1527,7 +1532,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_MURKROW] = 2, [SPECIES_SLOWKING] = 0, [SPECIES_MISDREAVUS] = 0, - [SPECIES_UNOWN] = 0, + [SPECIES_UNOWN_A] = 0, [SPECIES_WOBBUFFET] = 0, [SPECIES_GIRAFARIG] = 1, [SPECIES_PINECO] = 0, @@ -2732,17 +2737,10 @@ u16 GetIconSpecies(u16 species, u32 personality) { u16 result; - if (species == SPECIES_UNOWN) - { - result = GetUnownSpeciesId(personality); - } + if (species > NUM_SPECIES) + result = INVALID_ICON_SPECIES; else - { - if (species > NUM_SPECIES) - result = INVALID_ICON_SPECIES; - else - result = species; - } + result = species; return result; } @@ -2759,18 +2757,10 @@ u16 GetIconSpeciesNoPersonality(u16 species) { u16 value; - if (MailSpeciesToSpecies(species, &value) == SPECIES_UNOWN) - { - value += SPECIES_UNOWN_B; // TODO - return value; - } - else - { - if (species > NUM_SPECIES) - species = INVALID_ICON_SPECIES; + if (species > NUM_SPECIES) + species = INVALID_ICON_SPECIES; - return GetIconSpecies(species, 0); - } + return GetIconSpecies(species, 0); } const u8 *GetMonIconPtr(u16 species, u32 personality) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 0e21d1e59..1e1727f5e 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -109,6 +109,7 @@ enum { #define PSS_DATA_WINDOW_MOVE_DESCRIPTION 2 #define MOVE_SELECTOR_SPRITES_COUNT 10 +#define TYPE_ICON_SPRITE_COUNT (MAX_MON_MOVES + 1) // for the spriteIds field in PokemonSummaryScreenData enum { @@ -116,7 +117,7 @@ enum SPRITE_ARR_ID_BALL, SPRITE_ARR_ID_STATUS, SPRITE_ARR_ID_TYPE, // 2 for mon types, 5 for move types(4 moves and 1 to learn), used interchangeably, because mon types and move types aren't shown on the same screen - SPRITE_ARR_ID_MOVE_SELECTOR1 = SPRITE_ARR_ID_TYPE + 5, // 10 sprites that make up the selector + SPRITE_ARR_ID_MOVE_SELECTOR1 = SPRITE_ARR_ID_TYPE + TYPE_ICON_SPRITE_COUNT, // 10 sprites that make up the selector SPRITE_ARR_ID_MOVE_SELECTOR2 = SPRITE_ARR_ID_MOVE_SELECTOR1 + MOVE_SELECTOR_SPRITES_COUNT, SPRITE_ARR_ID_COUNT = SPRITE_ARR_ID_MOVE_SELECTOR2 + MOVE_SELECTOR_SPRITES_COUNT }; @@ -3873,7 +3874,7 @@ static void CreateMoveTypeIcons(void) { u8 i; - for (i = SPRITE_ARR_ID_TYPE; i < SPRITE_ARR_ID_TYPE + 5; i++) + for (i = SPRITE_ARR_ID_TYPE; i < SPRITE_ARR_ID_TYPE + TYPE_ICON_SPRITE_COUNT; i++) { if (sMonSummaryScreen->spriteIds[i] == SPRITE_NONE) sMonSummaryScreen->spriteIds[i] = CreateSprite(&sSpriteTemplate_MoveTypes, 0, 0, 2); diff --git a/src/record_mixing.c b/src/record_mixing.c index 5d75f3fc8..d6edd078b 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -59,23 +59,23 @@ struct PlayerRecordRS struct RecordMixingDaycareMail daycareMail; struct RSBattleTowerRecord battleTowerRecord; u16 giftItem; - u16 padding[50]; + u16 filler[50]; }; struct PlayerRecordEmerald { /* 0x0000 */ struct SecretBase secretBases[SECRET_BASES_COUNT]; - /* 0x0c80 */ TVShow tvShows[TV_SHOWS_COUNT]; + /* 0x0C80 */ TVShow tvShows[TV_SHOWS_COUNT]; /* 0x1004 */ PokeNews pokeNews[POKE_NEWS_COUNT]; /* 0x1044 */ OldMan oldMan; /* 0x1084 */ struct DewfordTrend dewfordTrends[SAVED_TRENDS_COUNT]; - /* 0x10ac */ struct RecordMixingDaycareMail daycareMail; + /* 0x10AC */ struct RecordMixingDaycareMail daycareMail; /* 0x1124 */ struct EmeraldBattleTowerRecord battleTowerRecord; /* 0x1210 */ u16 giftItem; /* 0x1214 */ LilycoveLady lilycoveLady; /* 0x1254 */ struct Apprentice apprentices[2]; - /* 0x12dc */ struct PlayerHallRecords hallRecords; - /* 0x1434 */ u8 padding[16]; + /* 0x12DC */ struct PlayerHallRecords hallRecords; + /* 0x1434 */ u8 filler_1434[16]; }; // 0x1444 union PlayerRecord