Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into berryexpansion

README.md

@@ -1,8 +1,14 @@
-# pokeemerald Expansion
+# pokeemerald-expansion
 
-## What is the pokeemerald Expansion?
+## What is pokeemerald-expansion?
 
-The pokeemerald Expansion is a decomp hack base project based off pret's [pokeemerald](https://github.com/pret/pokeemerald) decompilation project. It's recommended that any new projects that plan on using it, to clone this repository instead of pret's vanilla repository, as we regurlarly incorporate pret's documentation changes. This is ***NOT*** a standalone romhack, and as such, most features will be unavailable and/or unbalanced if played as is.
+pokeemerald-expansion is a decomp hack base project based off pret's [pokeemerald](https://github.com/pret/pokeemerald) decompilation project. It's recommended that any new projects that plan on using it, to clone this repository instead of pret's vanilla repository, as we regurlarly incorporate pret's documentation changes. This is ***NOT*** a standalone romhack, and as such, most features will be unavailable and/or unbalanced if played as is.
+
+If you use pokeemerald-expansion in your hack, please add RHH (Rom Hacking Hideout) to your credits list. Optionally, you can list the version used, so it can help players know what features to expect.
+You can phrase it as the following:
+```
+Based off RHH's pokeemerald-expansion v1.6.2 https://github.com/rh-hideout/pokeemerald-expansion/
+```
 
 ## What features are included?
 - ***IMPORTANT*❗❗ Read through these to learn what features you can toggle**:
@@ -136,14 +142,14 @@ There are some mechanics, moves and abilities that are missing and being develop
 
 ### [Documentation on features can be found here](https://github.com/rh-hideout/pokeemerald-expansion/wiki)
 
-## If I already have a project based on regular pokeemerald, can I use the pokeemerald Expansion
+## If I already have a project based on regular pokeemerald, can I use pokeemerald-expansion?
 Yes! Keep in mind that we keep up with pret's documentation of pokeemerald, which means that if your project a bit old, you might get merge conflicts that you need to solve manually.
 - If you haven't set up a remote, run the command `git remote add RHH https://github.com/rh-hideout/pokeemerald-expansion`.
 - Once you have your remote set up, run the command `git pull RHH master`.
 
-With this, you'll get the latest version of the Expansion, plus a couple of bugfixes that haven't been released into the next patch version :)
+With this, you'll get the latest version of pokeemerald-expansion, plus a couple of bugfixes that haven't been released into the next patch version :)
 
-## **How do I update my version of the pokeemerald Expansion?**
+## **How do I update my version of pokeemerald-expansion?**
 - If you haven't set up a remote, run the command `git remote add RHH https://github.com/rh-hideout/pokeemerald-expansion`.
 - Once you have your remote set up, run the command `git pull RHH expansion/1.6.2`.
 
@@ -162,7 +168,7 @@ The project was originally started by DizzyEgg alongside other contributors.
 
 The project has now gotten larger and DizzyEgg is now maintaining the project as part of the ROM Hacking Hideout community. Some members of this community are taking on larger roles to help maintain the project.
 
-## What is ROM Hacking Hideout?
+## What is the ROM Hacking Hideout?
 
 A Discord-based ROM hacking community that has many members who hack using the disassembly and decompilation projects for Pokémon. Quite a few contributors to the original feature branches by DizzyEgg were members of ROM Hacking Hideout. You can call it RHH for short!
 

asm/macros/battle_script.inc

@@ -1541,6 +1541,11 @@
 	callnative BS_TryTrainerSlideDynamaxMsg
 	.endm
 
+	.macro tryhealpulse failInstr:req
+	callnative BS_TryHealPulse
+	.4byte \failInstr
+	.endm
+
 @ various command changed to more readable macros
 	.macro cancelmultiturnmoves battler:req
 	various \battler, VARIOUS_CANCEL_MULTI_TURN_MOVES
@@ -1732,11 +1737,6 @@
 	various \battler, VARIOUS_SET_LAST_USED_ABILITY
 	.endm
 
-	.macro tryhealpulse battler:req, failInstr:req
-	various \battler, VARIOUS_TRY_HEAL_PULSE
-	.4byte \failInstr
-	.endm
-
 	.macro tryquash failInstr:req
 	various BS_ATTACKER, VARIOUS_TRY_QUASH
 	.4byte \failInstr

asm/macros/movement.inc

@@ -162,5 +162,7 @@
 	create_movement_action figure_8, MOVEMENT_ACTION_FIGURE_8
 	create_movement_action fly_up, MOVEMENT_ACTION_FLY_UP
 	create_movement_action fly_down, MOVEMENT_ACTION_FLY_DOWN
+	create_movement_action emote_double_exclamation_mark, MOVEMENT_ACTION_EMOTE_DOUBLE_EXCL_MARK
+	create_movement_action emote_x, MOVEMENT_ACTION_EMOTE_X
 
 	create_movement_action step_end, MOVEMENT_ACTION_STEP_END

data/battle_anim_scripts.s

@@ -16835,6 +16835,77 @@ SyrupBombSpeedDropYellow:
 	waitforvisualfinish
 	end
 
+Move_CHILLY_RECEPTION::
+	loadspritegfx ANIM_TAG_CONFETTI
+	loadspritegfx ANIM_TAG_PINK_CLOUD
+	loadspritegfx ANIM_TAG_ICE_CRYSTALS
+	createvisualtask AnimTask_RotateMonSpriteToSide, 2, 16, 96, ANIM_ATTACKER, 1
+	createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 0, 1, 0, 13, RGB_BLACK
+	delay 60
+	waitforvisualfinish
+	createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 0, 1, 13, 0, RGB_BLACK
+	createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7
+	waitforvisualfinish
+	createvisualtask SoundTask_PlayDoubleCry, 2, ANIM_ATTACKER, DOUBLE_CRY_ROAR
+	setalpha 12, 4
+	monbg ANIM_ATTACKER
+	playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET
+	createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 122, 3, -14, 18, 24
+	createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 121, 3, 14, 6, 24
+	createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 120, 3, -12, 12, 24
+	createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 119, 3, 14, 18, 24
+	createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 118, 3, 0, 0, 24
+	call CreateFlatterConfetti
+	call CreateFlatterConfetti
+	call CreateFlatterConfetti
+	call CreateFlatterConfetti
+	call CreateFlatterConfetti
+	call CreateFlatterConfetti
+	call CreateFlatterConfetti
+	call CreateFlatterConfetti
+	call CreateFlatterConfetti
+	call CreateFlatterConfetti
+	call CreateFlatterConfetti
+	call CreateFlatterConfetti
+	call CreateFlatterConfetti
+	call CreateFlatterConfetti
+	call CreateFlatterConfetti
+	call CreateFlatterConfetti
+	call CreateFlatterConfetti
+	call CreateFlatterConfetti
+	call CreateFlatterConfetti
+	call CreateFlatterConfetti
+	waitforvisualfinish
+	clearmonbg ANIM_ATTACKER
+	delay 10
+	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG | F_PAL_BATTLERS, 1, 0, 3, RGB_WHITE
+	playsewithpan SE_M_GUST, SOUND_PAN_ATTACKER
+	call ChillyReceptionSnowballs
+	call ChillyReceptionSnowballs
+	call ChillyReceptionSnowballs
+	call ChillyReceptionSnowballs
+	playsewithpan SE_M_GUST2, SOUND_PAN_TARGET
+	waitforvisualfinish
+	waitsound
+	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG | F_PAL_BATTLERS, 1, 3, 0, RGB_WHITE
+	end
+ChillyReceptionSnowballs:
+	createsprite gPowderSnowSnowballSpriteTemplate, ANIM_ATTACKER, 40, 200, -150, 24, 0, 56, 4, 4, 0
+	delay 3
+	createsprite gPowderSnowSnowballSpriteTemplate, ANIM_ATTACKER, 40, 200, -100, 24, -10, 56, 4, 4, 0
+	delay 3
+	createsprite gPowderSnowSnowballSpriteTemplate, ANIM_ATTACKER, 40, 200, -100, 24, 10, 56, -4, 3, 0
+	delay 3
+	createsprite gPowderSnowSnowballSpriteTemplate, ANIM_ATTACKER, 40, 200, -200, 24, -20, 56, -4, 5, 0
+	delay 3
+	createsprite gPowderSnowSnowballSpriteTemplate, ANIM_ATTACKER, 40, 200, -150, 24, 15, 56, 4, 4, 0
+	delay 3
+	createsprite gPowderSnowSnowballSpriteTemplate, ANIM_ATTACKER, 40, 200, -200, 24, -20, 56, 4, 4, 0
+	delay 3
+	createsprite gPowderSnowSnowballSpriteTemplate, ANIM_ATTACKER, 40, 200, -200, 24, 20, 56, 4, 4, 0
+	delay 3
+	return
+
 Move_TERA_BLAST::
 Move_AXE_KICK::
 Move_LAST_RESPECTS::
@@ -16862,7 +16933,6 @@ Move_RUINATION::
 Move_COLLISION_COURSE::
 Move_ELECTRO_DRIFT::
 Move_SHED_TAIL::
-Move_CHILLY_RECEPTION::
 Move_TIDY_UP::
 Move_POUNCE::
 Move_TRAILBLAZE::

data/battle_scripts_1.s

@@ -436,6 +436,7 @@ gBattleScriptsForMoveEffects::
 	.4byte BattleScript_EffectHit                     @ EFFECT_POPULATION_BOMB
 	.4byte BattleScript_EffectMortalSpin              @ EFFECT_MORTAL_SPIN
 	.4byte BattleScript_EffectSaltCure                @ EFFECT_SALT_CURE
+	.4byte BattleScript_EffectChillyReception         @ EFFECT_CHILLY_RECEPTION
 	.4byte BattleScript_EffectMatchaGotcha            @ EFFECT_MATCHA_GOTCHA
 	.4byte BattleScript_EffectSyrupBomb               @ EFFECT_SYRUP_BOMB
 	.4byte BattleScript_EffectHit                     @ EFFECT_IVY_CUDGEL
@@ -471,6 +472,71 @@ BattleScript_SyrupBombTurnDmgEnd:
 BattleScript_EffectMatchaGotcha::
 	setmoveeffect MOVE_EFFECT_BURN
 	goto BattleScript_EffectAbsorb
+	end
+
+BattleScript_EffectChillyReception::
+	printstring STRINGID_PKMNTELLCHILLINGRECEPTIONJOKE
+	waitmessage B_WAIT_TIME_LONG
+	attackcanceler
+	ppreduce
+	jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN_PRIMAL, BattleScript_EffectChillyReceptionBlockedByPrimalSun
+	jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_RAIN_PRIMAL, BattleScript_EffectChillyReceptionBlockedByPrimalRain
+	jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_STRONG_WINDS, BattleScript_EffectChillyReceptionBlockedByStrongWinds
+	call BattleScript_EffectChillyReceptionPlayAnimation
+	setsnow
+	call BattleScript_MoveWeatherChangeRet
+	goto BattleScript_MoveSwitch
+BattleScript_EffectChillyReceptionPlayAnimation:
+	attackstring
+	attackanimation
+	waitanimation
+	return
+BattleScript_EffectChillyReceptionBlockedByPrimalSun:
+	call BattleScript_EffectChillyReceptionTrySwitchWeatherFailed
+	call BattleScript_ExtremelyHarshSunlightWasNotLessenedRet
+	goto BattleScript_MoveSwitch
+BattleScript_EffectChillyReceptionBlockedByPrimalRain:
+	call BattleScript_EffectChillyReceptionTrySwitchWeatherFailed
+	call BattleScript_NoReliefFromHeavyRainRet
+	goto BattleScript_MoveSwitch
+BattleScript_EffectChillyReceptionBlockedByStrongWinds:
+	call BattleScript_EffectChillyReceptionTrySwitchWeatherFailed
+	call BattleScript_MysteriousAirCurrentBlowsOnRet
+	goto BattleScript_MoveSwitch
+BattleScript_EffectChillyReceptionTrySwitchWeatherFailed:
+	jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_FailedFromAtkString
+	jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_FailedFromAtkString
+	call BattleScript_EffectChillyReceptionPlayAnimation
+	return
+
+BattleScript_CheckPrimalWeather:
+	jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN_PRIMAL, BattleScript_ExtremelyHarshSunlightWasNotLessened
+	jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_RAIN_PRIMAL, BattleScript_NoReliefFromHeavyRain
+	jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_STRONG_WINDS, BattleScript_MysteriousAirCurrentBlowsOn
+	return
+
+BattleScript_MoveSwitch:
+	jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_MoveSwitchEnd
+	jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_MoveSwitchEnd
+	printstring STRINGID_PKMNWENTBACK
+	waitmessage B_WAIT_TIME_SHORT
+	openpartyscreen BS_ATTACKER, BattleScript_MoveSwitchEnd
+	switchoutabilities BS_ATTACKER
+	waitstate
+	switchhandleorder BS_ATTACKER, 2
+	returntoball BS_ATTACKER
+	getswitchedmondata BS_ATTACKER
+	switchindataupdate BS_ATTACKER
+	hpthresholds BS_ATTACKER
+	trytoclearprimalweather
+	printstring STRINGID_EMPTYSTRING3
+	waitmessage 1
+	printstring STRINGID_SWITCHINMON
+	switchinanim BS_ATTACKER, TRUE
+	waitstate
+	switchineffects BS_ATTACKER
+BattleScript_MoveSwitchEnd:
+	end
 
 BattleScript_EffectPledge::
 	attackcanceler
@@ -661,14 +727,14 @@ BattleScript_EffectRevivalBlessing::
 	waitanimation
 	printstring STRINGID_PKMNREVIVEDREADYTOFIGHT
 	waitmessage B_WAIT_TIME_LONG
-    jumpifbyte CMP_EQUAL, gBattleCommunication, TRUE, BattleScript_EffectRevivalBlessingSendOut
+	jumpifbyte CMP_EQUAL, gBattleCommunication, TRUE, BattleScript_EffectRevivalBlessingSendOut
 	goto BattleScript_MoveEnd
 
 BattleScript_EffectRevivalBlessingSendOut:
-    switchinanim BS_SCRIPTING, FALSE
+	switchinanim BS_SCRIPTING, FALSE
 	waitstate
 	switchineffects BS_SCRIPTING
-    goto BattleScript_MoveEnd
+	goto BattleScript_MoveEnd
 
 BattleScript_StealthRockActivates::
 	setstealthrock BattleScript_MoveEnd
@@ -749,10 +815,10 @@ BattleScript_TeatimeLoop:
 	jumpifabsorbaffected BS_TARGET, BattleScript_Teatimesorb
 	jumpifmotoraffected BS_TARGET, BattleScript_Teatimemotor
 	jumpifteainvulnerable BS_TARGET, BattleScript_Teatimevul @ in semi-invulnerable state OR held item is not a Berry
-	orword gHitMarker, HITMARKER_NO_ANIMATIONS | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_IGNORE_DISGUISE
+	orword gHitMarker, HITMARKER_DISABLE_ANIMATION | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_IGNORE_DISGUISE
 	setbyte sBERRY_OVERRIDE, TRUE   @ override the requirements for eating berries
 	consumeberry BS_TARGET, TRUE  @ consume the berry, then restore the item from changedItems
-	bicword gHitMarker, HITMARKER_NO_ANIMATIONS | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_IGNORE_DISGUISE
+	bicword gHitMarker, HITMARKER_DISABLE_ANIMATION | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_IGNORE_DISGUISE
 	setbyte sBERRY_OVERRIDE, FALSE
 	removeitem BS_TARGET
 	moveendto MOVEEND_NEXT_TARGET
@@ -1052,9 +1118,9 @@ BattleScript_EffectFlingConsumeBerry:
 	savebattleritem BS_TARGET
 	battleritemtolastuseditem BS_TARGET
 	setbyte sBERRY_OVERRIDE, 1 @ override the requirements for eating berries
-	orword gHitMarker, HITMARKER_NO_ANIMATIONS
+	orword gHitMarker, HITMARKER_DISABLE_ANIMATION
 	consumeberry BS_TARGET, TRUE
-	bicword gHitMarker, HITMARKER_NO_ANIMATIONS
+	bicword gHitMarker, HITMARKER_DISABLE_ANIMATION
 	setbyte sBERRY_OVERRIDE, 0
 	restorebattleritem BS_TARGET
 BattleScript_FlingEnd:
@@ -1327,9 +1393,9 @@ BattleScript_EffectStuffCheeks::
 	waitanimation
 BattleScript_StuffCheeksEatBerry:
 	setbyte sBERRY_OVERRIDE, 1
-	orword gHitMarker, HITMARKER_NO_ANIMATIONS
+	orword gHitMarker, HITMARKER_DISABLE_ANIMATION
 	consumeberry BS_ATTACKER, TRUE
-	bicword gHitMarker, HITMARKER_NO_ANIMATIONS
+	bicword gHitMarker, HITMARKER_DISABLE_ANIMATION
 	setbyte sBERRY_OVERRIDE, 0
 	removeitem BS_ATTACKER
 	setstatchanger STAT_DEF, 2, FALSE
@@ -1593,11 +1659,11 @@ BattleScript_MoveEffectIncinerate::
 BattleScript_MoveEffectBugBite::
 	printstring STRINGID_BUGBITE
 	waitmessage B_WAIT_TIME_LONG
-	orword gHitMarker, HITMARKER_NO_ANIMATIONS
+	orword gHitMarker, HITMARKER_DISABLE_ANIMATION
 	setbyte sBERRY_OVERRIDE, 1   @ override the requirements for eating berries
 	savetarget
 	consumeberry BS_ATTACKER, FALSE
-	bicword gHitMarker, HITMARKER_NO_ANIMATIONS
+	bicword gHitMarker, HITMARKER_DISABLE_ANIMATION
 	setbyte sBERRY_OVERRIDE, 0
 	trysymbiosis
 	restoretarget
@@ -1696,22 +1762,7 @@ BattleScript_EffectPartingShotTrySpAtk:
 	waitmessage B_WAIT_TIME_LONG
 BattleScript_EffectPartingShotSwitch:
 	moveendall
-	jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_PartingShotEnd
-	jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_PartingShotEnd
-	openpartyscreen BS_ATTACKER, BattleScript_PartingShotEnd
-	switchoutabilities BS_ATTACKER
-	waitstate
-	switchhandleorder BS_ATTACKER, 2
-	returntoball BS_ATTACKER
-	getswitchedmondata BS_ATTACKER
-	switchindataupdate BS_ATTACKER
-	hpthresholds BS_ATTACKER
-	trytoclearprimalweather
-	flushtextbox
-	printstring STRINGID_SWITCHINMON
-	switchinanim BS_ATTACKER, TRUE
-	waitstate
-	switchineffects BS_ATTACKER
+	goto BattleScript_MoveSwitch
 BattleScript_PartingShotEnd:
 	end
 
@@ -2712,7 +2763,7 @@ BattleScript_EffectHealPulse:
     jumpifstatus3 BS_TARGET, STATUS3_HEAL_BLOCK, BattleScript_MoveUsedHealBlockPrevents
 	accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
 	jumpifsubstituteblocks BattleScript_ButItFailed
-	tryhealpulse BS_TARGET, BattleScript_AlreadyAtFullHp
+	tryhealpulse BattleScript_AlreadyAtFullHp
 	attackanimation
 	waitanimation
 	healthbarupdate BS_TARGET
@@ -3173,23 +3224,8 @@ BattleScript_EffectHitEscape:
 	moveendfrom MOVEEND_TARGET_VISIBLE
 	jumpifbattleend BattleScript_HitEscapeEnd
 	jumpifbyte CMP_NOT_EQUAL gBattleOutcome 0, BattleScript_HitEscapeEnd
-	jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_HitEscapeEnd
-	jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_HitEscapeEnd
 	jumpifemergencyexited BS_TARGET, BattleScript_HitEscapeEnd
-	openpartyscreen BS_ATTACKER, BattleScript_HitEscapeEnd
-	switchoutabilities BS_ATTACKER
-	waitstate
-	switchhandleorder BS_ATTACKER, 2
-	returntoball BS_ATTACKER
-	getswitchedmondata BS_ATTACKER
-	switchindataupdate BS_ATTACKER
-	hpthresholds BS_ATTACKER
-	trytoclearprimalweather
-	flushtextbox
-	printstring STRINGID_SWITCHINMON
-	switchinanim BS_ATTACKER, TRUE
-	waitstate
-	switchineffects BS_ATTACKER
+	goto BattleScript_MoveSwitch
 BattleScript_HitEscapeEnd:
 	end
 
@@ -4971,9 +5007,7 @@ BattleScript_EffectSandstorm::
 	attackcanceler
 	attackstring
 	ppreduce
-	jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN_PRIMAL, BattleScript_ExtremelyHarshSunlightWasNotLessened
-	jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_RAIN_PRIMAL, BattleScript_NoReliefFromHeavyRain
-	jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_STRONG_WINDS, BattleScript_MysteriousAirCurrentBlowsOn
+	call BattleScript_CheckPrimalWeather
 	setsandstorm
 	goto BattleScript_MoveWeatherChange
 
@@ -5162,25 +5196,25 @@ BattleScript_EffectRainDance::
 	attackcanceler
 	attackstring
 	ppreduce
-	jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN_PRIMAL, BattleScript_ExtremelyHarshSunlightWasNotLessened
-	jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_RAIN_PRIMAL, BattleScript_NoReliefFromHeavyRain
-	jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_STRONG_WINDS, BattleScript_MysteriousAirCurrentBlowsOn
+	call BattleScript_CheckPrimalWeather
 	setrain
 BattleScript_MoveWeatherChange::
 	attackanimation
 	waitanimation
+	call BattleScript_MoveWeatherChangeRet
+	goto BattleScript_MoveEnd
+
+BattleScript_MoveWeatherChangeRet::
 	printfromtable gMoveWeatherChangeStringIds
 	waitmessage B_WAIT_TIME_LONG
 	call BattleScript_ActivateWeatherAbilities
-	goto BattleScript_MoveEnd
+	return
 
 BattleScript_EffectSunnyDay::
 	attackcanceler
 	attackstring
 	ppreduce
-	jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN_PRIMAL, BattleScript_ExtremelyHarshSunlightWasNotLessened
-	jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_RAIN_PRIMAL, BattleScript_NoReliefFromHeavyRain
-	jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_STRONG_WINDS, BattleScript_MysteriousAirCurrentBlowsOn
+	call BattleScript_CheckPrimalWeather
 	setsunny
 	goto BattleScript_MoveWeatherChange
 
@@ -5644,9 +5678,7 @@ BattleScript_EffectHail::
 	attackcanceler
 	attackstring
 	ppreduce
-	jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN_PRIMAL, BattleScript_ExtremelyHarshSunlightWasNotLessened
-	jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_RAIN_PRIMAL, BattleScript_NoReliefFromHeavyRain
-	jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_STRONG_WINDS, BattleScript_MysteriousAirCurrentBlowsOn
+	call BattleScript_CheckPrimalWeather
 	sethail
 	goto BattleScript_MoveWeatherChange
 
@@ -10771,9 +10803,7 @@ BattleScript_BerserkGeneRet_End:
 BattleScript_EffectSnow::
 	attackcanceler
 	attackstring
-	ppreduce
-	jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN_PRIMAL, BattleScript_ExtremelyHarshSunlightWasNotLessened
-	jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_RAIN_PRIMAL, BattleScript_NoReliefFromHeavyRain
-	jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_STRONG_WINDS, BattleScript_MysteriousAirCurrentBlowsOn
+	ppreduce	
+	call BattleScript_CheckPrimalWeather
 	setsnow
 	goto BattleScript_MoveWeatherChange

data/event_scripts.s

@@ -1005,6 +1005,13 @@ Common_EventScript_LegendaryFlewAway::
 	release
 	end
 
+EventScript_VsSeekerChargingDone::
+	special VsSeekerFreezeObjectsAfterChargeComplete
+	waitstate
+	special VsSeekerResetObjectMovementAfterChargeComplete
+	releaseall
+	end
+
 	.include "data/scripts/pc_transfer.inc"
 	.include "data/scripts/questionnaire.inc"
 	.include "data/scripts/abnormal_weather.inc"

data/field_effect_scripts.s

@@ -1,3 +1,4 @@
+#include "config/item.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 
@@ -72,6 +73,9 @@ gFieldEffectScriptPointers::
 	.4byte gFieldEffectScript_RayquazaSpotlight         @ FLDEFF_RAYQUAZA_SPOTLIGHT
 	.4byte gFieldEffectScript_DestroyDeoxysRock         @ FLDEFF_DESTROY_DEOXYS_ROCK
 	.4byte gFieldEffectScript_MoveDeoxysRock            @ FLDEFF_MOVE_DEOXYS_ROCK
+	.4byte gFldEffScript_UseVsSeeker                    @ FLDEFF_USE_VS_SEEKER
+	.4byte gFldEffScript_XIcon                          @ FLDEFF_X_ICON
+	.4byte gFldEffScript_DoubleExclMarkIcon             @ FLDEFF_DOUBLE_EXCL_MARK_ICON
 
 gFieldEffectScript_ExclamationMarkIcon1::
 	field_eff_callnative FldEff_ExclamationMarkIcon
@@ -343,3 +347,15 @@ gFieldEffectScript_DestroyDeoxysRock::
 gFieldEffectScript_MoveDeoxysRock::
 	field_eff_callnative FldEff_MoveDeoxysRock
 	field_eff_end
+
+gFldEffScript_UseVsSeeker::
+	field_eff_callnative FldEff_UseVsSeeker
+	field_eff_end
+
+gFldEffScript_XIcon::
+	field_eff_callnative FldEff_XIcon
+	field_eff_end
+
+gFldEffScript_DoubleExclMarkIcon::
+	field_eff_callnative FldEff_DoubleExclMarkIcon
+	field_eff_end

data/scripts/debug.inc

@@ -95,19 +95,6 @@ Debug_BoxFilledMessage::
 Debug_BoxFilledMessage_Text:
 	.string "Storage boxes filled!$"
 
-Debug_FlagsAndVarNotSetBattleConfigMessage::
-	lockall
-	message Debug_FlagsAndVarNotSetBattleConfigMessage_Text
-	waitmessage
-	waitbuttonpress
-	releaseall
-	end
-
-Debug_FlagsAndVarNotSetBattleConfigMessage_Text:
-	.string "Feature unavailable! Please define a\n"
-	.string "usable flag and a usable var in:\l"
-	.string "'include/config/battle.h'!$"
-
 Debug_EventScript_Script_1::
 	end
 
@@ -247,3 +234,17 @@ DebugText_BerryWeedsDisabled:
 	.string "Unable to force weeds onto berry trees.$"
 
 .endif
+
+Debug_FlagsAndVarNotSetBattleConfigMessage::
+	lockall
+	message Debug_FlagsAndVarNotSetBattleConfigMessage_Text
+	waitmessage
+	waitbuttonpress
+	releaseall
+	end
+
+Debug_FlagsAndVarNotSetBattleConfigMessage_Text:
+	.string "Feature unavailable! Please define a\n"
+	.string "usable flag and a usable var in:\l"
+	.string "'include/config/battle.h'!$"
+

data/specials.inc

@@ -540,6 +540,8 @@ gSpecials::
 	def_special GetSprayId
 	def_special GetLastUsedSprayType
 	def_special TrySkyBattle
+	def_special VsSeekerResetObjectMovementAfterChargeComplete
+	def_special VsSeekerFreezeObjectsAfterChargeComplete
 	def_special PlayerHasMulch
 	def_special Bag_ChooseMulch
 	def_special ObjectEventInteractionApplyMulch

data/text/trainers.inc

@@ -4779,3 +4779,18 @@ Route134_Text_HudsonPostBattle:
 	.string "Our boat drifted out to sea.\p"
 	.string "My buddy's a timid fellow, so I'm\n"
 	.string "worried about him.$"
+
+VSSeeker_Text_BatteryNotChargedNeedXSteps::
+	.string "The battery isn't charged enough.\p"
+	.string "No. of steps required to fully\n"
+	.string "charge the battery: {STR_VAR_1}{PAUSE_UNTIL_PRESS}$"
+
+VSSeeker_Text_NoTrainersWithinRange::
+	.string "There are no Trainers within range\n"
+	.string "who can battle…\p"
+	.string "The VS Seeker was turned off.{PAUSE_UNTIL_PRESS}$"
+
+VSSeeker_Text_TrainersNotReady::
+	.string "The other Trainers don't appear\n"
+	.string "to be ready for battle.\p"
+	.string "Let's wait till later.{PAUSE_UNTIL_PRESS}$"

graphics/pokemon/chansey/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-230 123 131
-139 65 65
-255 230 230
-255 213 222
-139 65 65
-238 123 123
-246 164 156
-248 248 248
-16 16 16
-139 65 65
-246 164 180
+255 255 255
+230 222 189
 172 164 115
 115 106 74
-230 222 189
-0 0 0
+238 123 123
+225 96 96
+16 16 16
+139 65 65
+246 164 156
+238 123 123
+255 230 230
+255 213 222
+246 164 180
+230 123 131
+139 65 65

graphics/pokemon/chansey/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-192 160 88
-112 88 56
-248 240 224
-248 232 200
-80 112 56
-128 176 64
-152 216 72
-248 248 248
+152 160 208
+255 255 255
+230 222 189
+172 164 115
+115 106 74
+141 215 40
+106 164 32
 16 16 16
-80 112 56
-232 200 144
-168 160 112
-112 104 72
-224 216 184
-0 0 0
+88 128 64
+148 222 49
+106 164 32
+255 246 230
+255 238 205
+238 205 148
+213 172 90
+139 106 65

graphics/pokemon/cloyster/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-123 82 131
 213 189 238
 172 123 189
+148 98 180
+123 82 131
 74 32 82
-16 16 16
-197 197 197
-65 65 65
-248 248 248
-148 148 148
-98 98 98
-82 41 90
+164 123 189
 131 90 164
 106 65 131
-164 123 189
-120 96 176
+82 41 90
+197 197 197
+148 148 148
+98 98 98
+65 65 65
+16 16 16
+255 255 255

graphics/pokemon/cloyster/shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-48 96 152
-152 200 248
-104 152 208
-16 64 112
+139 197 255
+90 156 230
+98 123 213
+41 98 172
+0 57 131
+164 123 189
+131 90 164
+106 65 131
+82 41 90
+197 197 197
+148 148 148
+98 98 98
+65 65 65
 16 16 16
-192 192 192
-64 64 64
-248 248 248
-144 144 144
-96 96 96
-80 40 88
-128 88 160
-104 64 128
-128 88 160
-96 120 208
+255 255 255

graphics/pokemon/cubone/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-139 131 106
-248 248 248
-41 41 41
-197 197 213
-82 82 57
-148 106 90
+222 189 106
 197 156 74
+148 106 90
 82 57 16
-200 168 136
-240 208 176
-224 224 232
-0 0 0
-0 0 0
-0 0 0
-0 0 0
+255 255 255
+230 230 238
+197 197 213
+139 131 106
+82 82 57
+255 222 180
+246 213 180
+205 172 139
+255 0 255
+255 0 255
+16 16 16

graphics/pokemon/cubone/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-128 128 112
-248 248 248
-16 16 16
-200 184 184
-72 80 72
-80 104 48
-112 144 80
-32 56 8
-184 160 136
-224 208 176
-224 216 216
-0 0 0
-0 0 0
-0 0 0
-0 0 0
+152 160 208
+156 172 106
+106 139 74
+74 98 49
+32 65 0
+255 255 255
+230 222 222
+205 189 189
+131 131 115
+74 82 74
+238 222 180
+230 213 180
+189 164 139
+255 0 255
+255 0 255
+41 41 41

graphics/pokemon/dewgong/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 153 210 164
+230 230 246
+213 205 238
+156 164 189
 106 123 164
 65 82 98
-156 164 189
-230 230 246
-16 16 16
-213 205 238
-255 255 255
+213 41 32
+156 0 0
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+213 205 205
 131 123 123
-112 40 40
-232 128 120
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
+16 16 16
+255 255 255

graphics/pokemon/dewgong/shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 153 210 164
+246 246 230
+213 213 197
+180 180 164
 148 148 115
 98 98 74
-180 180 164
-246 246 230
-16 16 16
-213 213 197
-255 255 255
+213 41 32
+156 0 0
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+213 205 205
 131 123 123
-163 32 32
-219 83 78
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
+16 16 16
+255 255 255

graphics/pokemon/dodrio/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-65 65 65
-16 16 16
-131 131 131
+238 197 115
+205 156 82
 164 123 90
 90 65 32
-205 156 82
-248 248 248
-98 90 65
 238 222 172
 180 164 123
-180 65 65
-246 131 164
-180 65 65
-246 131 164
+98 90 65
 255 213 230
+246 131 164
+180 65 65
+213 205 205
+131 131 131
+65 65 65
+0 0 0
+255 255 255

graphics/pokemon/dodrio/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-64 64 64
-16 16 16
-128 128 128
-112 136 24
-64 88 16
-160 184 48
-248 248 248
-152 104 24
-248 240 136
-216 160 64
-176 80 80
-240 128 160
-176 80 80
-240 128 160
-248 200 224
+152 160 208
+197 222 90
+164 189 49
+115 139 16
+74 106 0
+255 246 139
+222 164 57
+164 106 0
+255 213 230
+246 131 164
+180 65 65
+213 205 205
+131 131 131
+65 65 65
+0 0 0
+255 255 255

graphics/pokemon/doduo/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-80 56 24
-144 104 88
-184 136 80
-216 168 112
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+222 172 115
+189 139 82
+148 106 90
+82 57 24
+238 222 172
+222 189 139
+164 131 74
+98 82 16
+98 98 98
 16 16 16
-248 248 248
-96 80 16
-96 96 96
-160 128 72
-232 216 168
-216 184 136
-0 0 0
-0 0 0
-0 0 0
-0 0 0
+255 255 255

graphics/pokemon/doduo/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-80 96 16
-112 144 32
-168 192 64
-192 224 96
+152 160 208
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+197 230 98
+172 197 65
+115 148 32
+90 115 0
+238 230 172
+222 205 139
+164 156 74
+98 98 16
+98 98 98
 16 16 16
-248 248 248
-96 96 16
-96 96 96
-160 152 72
-232 224 168
-216 200 136
-0 0 0
-0 0 0
-0 0 0
-0 0 0
+255 255 255

graphics/pokemon/drowzee/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-168 136 0
-112 88 0
-240 232 0
-80 56 32
-208 168 72
-248 232 112
 0 0 0
-104 80 64
-248 248 248
-136 32 56
-232 56 56
-136 112 88
-176 152 120
-104 80 64
+82 57 32
+106 82 65
+139 115 90
+180 156 123
+115 90 0
+172 139 0
+197 164 32
+213 172 74
+246 238 0
+255 238 115
+255 255 255
+139 32 57
+238 57 57
 0 0 0

graphics/pokemon/drowzee/shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-136 96 104
-104 64 72
-224 176 192
-96 32 48
-184 144 152
-248 216 232
-16 16 16
-120 72 88
-248 248 248
-136 40 64
-232 80 80
-176 88 104
-200 120 136
-144 56 80
+0 0 0
+115 16 32
+148 41 74
+180 82 98
+205 106 123
+115 74 82
+139 98 106
+164 123 131
+189 148 156
+230 180 197
+238 205 222
+255 255 255
+139 32 57
+238 57 57
 0 0 0

graphics/pokemon/electrode/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-90 82 82
-164 156 156
+255 255 255
 238 238 238
-248 248 248
 205 205 222
-16 16 16
-213 49 65
-255 82 32
+164 156 156
+90 82 82
+255 0 255
+240 160 136
+208 128 144
+255 172 156
 255 131 90
-131 16 16
+255 82 32
 238 65 49
-0 0 0
-0 0 0
-0 0 0
-0 0 0
+213 49 65
+131 16 16
+16 16 16

graphics/pokemon/electrode/shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-88 80 80
-160 152 152
-232 232 232
-248 248 248
-200 200 216
-16 16 16
-56 72 208
-32 112 248
+255 255 255
+238 238 238
+205 205 222
+164 156 156
+90 82 82
+255 0 255
 144 168 232
-24 48 112
-48 96 232
-0 0 0
-0 0 0
-0 0 0
-0 0 0
+128 136 216
+156 205 255
+90 164 255
+32 115 255
+49 98 238
+57 74 213
+16 49 131
+16 16 16

graphics/pokemon/exeggcute/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-197 115 148
-139 32 32
-255 213 222
-16 16 16
+255 255 255
+222 222 222
 255 238 139
 205 139 8
-248 248 248
+16 16 16
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
 255 238 238
-222 222 222
-224 176 184
-232 192 192
-0 0 0
-0 0 0
-0 0 0
-0 0 0
+255 213 222
+230 180 189
+197 115 148
+139 32 32

graphics/pokemon/exeggcute/shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-224 168 40
-136 96 24
-248 232 88
+255 255 255
+222 222 222
+255 205 74
+230 156 0
 16 16 16
-248 200 72
-224 152 0
-248 248 248
-248 248 160
-216 216 216
-208 80 64
-240 208 64
-0 0 0
-0 0 0
-0 0 0
-0 0 0
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 255 189
+255 238 16
+246 205 16
+238 172 0
+180 123 0

graphics/pokemon/exeggutor/normal.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-0 176 232
-82 98 41
-16 16 16
-115 172 49
+152 160 208
+255 255 205
+255 246 139
+230 172 90
+164 106 32
+123 82 16
+180 156 74
+139 115 65
+82 65 16
 189 255 115
 156 213 74
-82 65 16
-230 172 90
-255 246 139
-248 248 168
-248 248 248
-123 82 16
-164 106 32
-139 115 65
-230 172 90
-180 156 74
+115 172 49
+82 98 41
+255 255 255
+98 98 98
+16 16 16

graphics/pokemon/exeggutor/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-0 176 232
-136 56 24
+152 208 160
+255 238 164
+255 222 106
+230 172 90
+164 106 32
+115 65 16
+238 230 74
+205 172 0
+148 115 0
+255 189 106
+230 131 74
+197 98 57
+156 57 16
+255 255 255
+98 98 98
 16 16 16
-192 104 64
-232 184 120
-224 144 96
-120 96 24
-224 168 88
-248 224 136
-248 232 160
-248 248 248
-160 104 32
-160 104 32
-200 176 40
-224 168 88
-240 232 96

graphics/pokemon/farfetchd/normal.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-132 107 33
-90 58 0
-181 148 82
+152 160 208
+255 255 255
+213 213 213
+230 230 164
+197 205 131
+255 222 106
+246 180 65
+189 115 24
+205 255 139
+65 222 65
+0 156 32
+216 184 112
+180 148 82
+131 106 32
+90 57 0
 16 16 16
-0 156 33
-230 230 165
-66 222 66
-197 206 132
-214 214 214
-230 197 123
-248 248 248
-206 255 140
-255 222 107
-247 181 66
-189 115 25

graphics/pokemon/farfetchd/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
+152 160 208
+255 255 255
+213 213 213
+238 230 164
+197 197 123
+255 213 115
+255 180 74
+197 115 32
+230 255 148
+172 230 74
+112 152 32
+216 184 112
+230 136 120
 200 104 88
 104 56 48
-224 136 120
 16 16 16
-128 168 32
-240 232 176
-168 224 72
-192 192 120
-208 208 208
-216 184 112
-248 248 248
-224 248 144
-248 208 112
-248 176 72
-192 120 48

graphics/pokemon/gastly/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
+255 255 255
+222 222 222
+222 82 57
+180 41 16
+255 0 255
+189 148 180
+139 98 131
+115 74 106
+57 41 57
 213 172 205
 189 148 180
 139 98 131
-57 41 57
+255 0 255
+255 0 255
 16 16 16
-115 74 106
-139 98 131
-112 72 104
-255 255 255
-180 41 16
-222 82 57
-208 168 192
-216 216 216
-180 41 16
-222 82 57

graphics/pokemon/gastly/shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-160 224 248
-120 192 232
-88 152 208
-96 24 120
+255 255 255
+222 222 222
+222 82 57
+180 41 16
+255 0 255
+205 164 255
+172 123 205
+123 74 156
+98 24 123
+164 230 255
+123 197 238
+90 156 213
+255 0 255
+255 0 255
 16 16 16
-120 72 152
-168 120 200
-112 72 104
-248 248 248
-176 40 16
-216 80 56
-216 80 56
-216 216 216
-176 40 16
-216 80 56

graphics/pokemon/gengar/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-90 74 156
-180 139 189
-16 16 16
-148 115 180
-74 41 74
-123 98 164
-255 90 90
-255 148 148
-189 172 189
 255 246 255
-106 98 123
 222 213 222
-168 16 16
-72 40 72
-0 0 0
+106 98 123
+255 194 194
+255 144 144
+248 88 88
+189 172 189
+255 0 255
+255 0 255
+120 96 160
+176 136 184
+144 112 180
+90 74 152
+74 41 74
+16 16 16

graphics/pokemon/gengar/shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-88 88 120
-144 144 176
-16 16 16
-120 120 152
-56 56 96
+255 255 255
+222 222 222
+106 98 123
+255 205 205
+238 144 144
+184 106 106
+189 172 189
+255 0 255
+255 0 255
 104 104 136
-184 104 104
-232 144 144
-184 168 184
-248 240 248
-104 96 120
-216 208 216
-136 56 56
-72 40 72
-0 0 0
+148 148 180
+123 123 156
+90 90 123
+57 57 98
+16 16 16

graphics/pokemon/grimer/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-156 106 156
-222 172 222
-98 57 123
-238 222 238
-180 139 180
-16 16 16
-123 74 131
-248 248 248
+255 255 255
+213 213 222
+172 180 189
 131 139 156
 65 74 90
-172 180 189
-208 208 216
-0 0 0
-0 0 0
-0 0 0
+238 222 238
+222 172 222
+180 139 180
+156 106 156
+123 74 131
+98 57 123
+255 0 255
+255 0 255
+255 0 255
+16 16 16

graphics/pokemon/grimer/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-128 176 96
-184 224 144
-72 120 40
-200 240 160
-152 200 128
+152 160 208
+255 255 255
+213 213 222
+172 180 189
+131 139 156
+65 74 90
+205 246 164
+189 230 148
+156 205 131
+131 180 98
+98 148 65
+74 123 41
+255 0 255
+255 0 255
+255 0 255
 16 16 16
-96 144 64
-248 248 248
-128 136 152
-64 72 88
-168 176 184
-208 208 216
-0 0 0
-0 0 0
-0 0 0

graphics/pokemon/haunter/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-128 88 136
-192 152 200
-80 64 96
+213 164 222
+197 156 205
+172 131 197
+131 90 139
+82 65 98
+255 0 255
+255 0 255
+255 0 255
+222 90 164
+180 24 98
+106 0 0
+213 213 213
+115 115 115
 16 16 16
-168 128 192
-248 248 248
-112 112 112
-176 24 96
-216 88 160
-208 208 208
-104 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
+255 255 255

graphics/pokemon/haunter/shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-128 88 112
-192 136 208
-80 64 104
+213 164 230
+197 139 213
+172 106 213
+131 90 115
+82 65 106
+255 0 255
+255 0 255
+255 0 255
+90 148 255
+41 98 213
+8 49 164
+213 213 213
+115 115 115
 16 16 16
-168 104 208
-248 248 248
-112 112 112
-40 96 208
-88 144 248
-208 208 208
-8 48 160
-0 0 0
-0 0 0
-0 0 0
-0 0 0
+255 255 255

graphics/pokemon/hitmonchan/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-90 65 16
-205 180 123
-16 16 16
-164 139 115
-238 213 156
 255 246 255
-98 74 115
+222 205 222
+197 180 197
+164 156 164
 98 74 115
 189 49 74
 255 148 90
 230 98 74
+189 49 74
 139 32 0
-164 156 164
-197 180 197
-232 128 120
+238 213 156
+205 180 123
+164 139 115
+90 65 16
+16 16 16

graphics/pokemon/hitmonchan/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-88 96 24
-192 208 96
+208 152 160
+246 246 255
+213 205 222
+189 180 197
+156 156 164
+90 74 115
+189 49 74
+65 180 255
+24 131 213
+0 90 180
+0 49 148
+230 246 139
+197 213 98
+148 164 65
+106 123 8
 16 16 16
-144 160 64
-224 240 136
-248 240 248
-88 72 112
-96 96 168
-32 104 176
-120 184 224
-80 152 200
-16 48 112
-144 144 152
-184 176 192
-204 77 77

graphics/pokemon/hitmonlee/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-131 90 57
-164 123 115
-205 164 131
-98 57 24
 238 197 164
+205 164 131
+164 123 115
+131 90 57
+98 57 24
+255 255 255
+213 205 205
 115 98 98
-41 41 41
-248 248 248
-208 200 200
-90 74 41
-189 180 106
 238 230 180
 189 180 106
-240 224 168
-0 0 0
+90 74 41
+238 255 148
+197 205 115
+115 123 32
+41 41 41

graphics/pokemon/hitmonlee/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-64 88 0
-96 120 16
-152 168 56
-32 56 8
-184 200 88
-112 96 96
-16 16 16
-248 248 248
-208 200 200
-88 56 40
-184 160 104
-232 216 176
-184 160 104
-232 216 176
-0 0 0
+152 160 208
+189 205 74
+148 172 41
+98 123 8
+65 90 0
+41 65 0
+255 255 255
+213 205 205
+115 98 98
+238 222 180
+189 164 106
+90 57 41
+230 255 148
+189 205 115
+106 123 32
+41 41 41

graphics/pokemon/hitmontop/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-144 144 152
-96 96 104
-248 248 248
-200 200 200
-72 112 192
-96 152 216
-136 184 232
-80 88 144
-128 88 40
+255 255 255
+255 222 156
+222 189 131
+180 139 90
+131 90 41
+139 189 238
+98 156 222
+74 115 197
+82 90 148
+197 74 49
+123 32 24
+205 205 205
+148 148 156
+98 98 106
 16 16 16
-216 184 128
-176 136 88
-248 216 152
-0 0 0
-0 0 0

graphics/pokemon/hitmontop/shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-144 144 152
-96 96 104
-248 248 248
-200 200 200
-144 72 160
-208 120 200
-240 152 216
-112 48 96
-112 104 80
+255 255 255
+238 238 230
+213 213 197
+172 164 156
+115 106 82
+246 156 222
+213 123 205
+164 82 180
+139 49 123
+197 74 49
+123 32 24
+205 205 205
+148 148 156
+98 98 106
 16 16 16
-208 208 192
-168 160 152
-232 232 224
-144 144 152
-0 0 0

graphics/pokemon/hypno/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-136 96 48
-104 80 0
-240 216 0
 0 0 0
-176 144 32
-88 64 40
-248 232 112
-216 184 64
-128 144 160
-80 88 104
-248 248 248
-152 168 184
-200 216 232
-160 128 88
+106 82 0
+180 148 32
+222 189 65
+246 222 0
+255 238 115
+90 65 41
+139 98 49
+164 131 90
+82 90 106
+131 148 164
+156 172 189
+205 222 238
+255 255 255
 0 0 0

graphics/pokemon/hypno/shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-136 96 48
-136 48 80
-232 144 176
-16 16 16
-168 80 112
-88 64 40
-248 176 208
-200 112 168
-160 144 128
-104 88 80
-248 248 248
-184 168 152
-232 216 200
 0 0 0
+139 49 82
+172 82 115
+205 106 164
+238 148 180
+255 172 205
+90 65 41
+128 64 40
+136 72 48
+106 90 82
+164 148 131
+189 172 156
+238 222 205
+255 255 255
 0 0 0

graphics/pokemon/kingler/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-131 41 8
+246 197 139
 255 139 82
 180 90 74
-16 16 16
-246 197 139
-74 49 32
-222 172 156
-115 82 16
-90 65 49
+131 41 8
 255 246 222
+222 172 156
 164 106 65
-255 255 255
+115 82 16
+255 16 255
+90 65 49
+74 49 32
+255 16 255
 189 189 230
-0 0 0
-0 0 0
+16 16 16
+255 255 255

graphics/pokemon/kingler/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-64 80 0
-136 152 72
-104 112 48
+152 160 208
+180 197 115
+139 156 74
+106 115 49
+74 90 0
+230 246 197
+205 213 115
+148 139 57
+106 98 8
+255 16 255
+90 65 49
+74 49 32
+255 16 255
+222 222 246
 16 16 16
-176 192 112
-56 40 24
-200 208 112
-104 96 8
-88 64 56
-224 240 192
-144 136 56
-248 248 248
-184 184 224
-0 0 0
-0 0 0
+255 255 255