Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald

# Conflicts:
#	include/constants/battle_move_effects.h

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

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

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

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

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

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;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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