Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2

2024-09-30 15:52:49 -03:00 · 2024-09-30 15:52:49 -03:00 · d1056f887b
commit d1056f887b
parent 18485ca4cf 5a8a393dcd
253 changed files with 6453 additions and 1626 deletions
--- a/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
+++ b/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
@ -23,9 +23,10 @@ body:
      label: Version
      description: What version of pokeemerald-expansion are you using as a base?
      options:
-        - 1.9.1 (Latest release)
+        - 1.9.2 (Latest release)
        - master (default, unreleased bugfixes)
        - upcoming (Edge)
+        - 1.9.1
        - 1.9.0
        - 1.8.6
        - 1.8.5
--- a/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
+++ b/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
@ -23,9 +23,10 @@ body:
      label: Version
      description: What version of pokeemerald-expansion are you using as a base?
      options:
-        - 1.9.1 (Latest release)
+        - 1.9.2 (Latest release)
        - master (default, unreleased bugfixes)
        - upcoming (Edge)
+        - 1.9.1
        - 1.9.0
        - 1.8.6
        - 1.8.5
--- a/.github/ISSUE_TEMPLATE/04_other_errors.yaml
+++ b/.github/ISSUE_TEMPLATE/04_other_errors.yaml
@ -23,9 +23,10 @@ body:
      label: Version
      description: What version of pokeemerald-expansion are you using as a base?
      options:
-        - 1.9.1 (Latest release)
+        - 1.9.2 (Latest release)
        - master (default, unreleased bugfixes)
        - upcoming (Edge)
+        - 1.9.1
        - 1.9.0
        - 1.8.6
        - 1.8.5
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,6 +1,7 @@
 # Pokeemerald-Expansion Changelogs

 ## 1.9.x
+- **[Version 1.9.2](docs/changelogs/1.9.x/1.9.2.md) - 🧹 Bugfix Release**
 - **[Version 1.9.1](docs/changelogs/1.9.x/1.9.1.md) - 🧹 Bugfix Release**
 - **[Version 1.9.0](docs/changelogs/1.9.x/1.9.0.md) - ✨ Feature Release**

--- a/README.md
+++ b/README.md
@ -9,7 +9,7 @@ pokeemerald-expansion is a decomp hack base project based off pret's [pokeemeral
 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 1.9.1 https://github.com/rh-hideout/pokeemerald-expansion/
+Based off RHH's pokeemerald-expansion 1.9.2 https://github.com/rh-hideout/pokeemerald-expansion/
 ```

 ## What features are included?
@ -178,7 +178,7 @@ With this, you'll get the latest version of pokeemerald-expansion, plus a couple
 - Check your current version.
    - You can check in the debug menu's `Utilities -> Expansion Version` option.
    - If the option is not available, you possibly have version 1.6.2 or older. In that case, please check the [changelogs](CHANGELOG.md) to determine your version based on the features available on your repository.
- Once you have your remote set up, run the command `git pull RHH expansion/X.Y.Z`, replacing X, Y and Z with the digits of the respective version you want to update to (eg, to update to 1.8.4, use `git pull RHH expansion/1.8.4`).
+- Once you have your remote set up, run the command `git pull RHH expansion/X.Y.Z`, replacing X, Y and Z with the digits of the respective version you want to update to (eg, to update to 1.9.2, use `git pull RHH expansion/1.9.2`).
    - ***Important:*** If you are several versions behind, we recommend updating one minor version at a time, skipping directly to the latest patch version (eg, 1.5.3 -> 1.6.2 -> 1.7.4 and so on)
 - Alternatively, you can update to unreleased versions of the expansion.
    - ***master (stable):*** It contains unreleased **bugfixes** that will come in the next patch version. To merge, use `git pull RHH master`.
--- a/asm/macros/battle_script.inc
+++ b/asm/macros/battle_script.inc
@ -1351,7 +1351,6 @@
 	.4byte \func
 	.endm

-@ callnative macros
 	.macro savetarget
 	callnative BS_SaveTarget
 	.endm
@ -1727,6 +1726,11 @@
 	.4byte \failInstr
 	.endm

+	.macro jumpifcommanderactive jumpInstr:req
+	callnative BS_JumpIfCommanderActive
+	.4byte \jumpInstr
+	.endm
+
@ various command changed to more readable macros
 	.macro cancelmultiturnmoves battler:req
 	various \battler, VARIOUS_CANCEL_MULTI_TURN_MOVES
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@ -2107,15 +2107,15 @@
 	@ The rest of the arguments are the stat change values to each stat.
 	@ For example, giving the first opponent +1 to atk and -2 to speed would be: settotemboost B_POSITION_OPPONENT_LEFT, 1, 0, -2
 	.macro settotemboost battler:req, atk=0,def=0,speed=0,spatk=0,spdef=0,acc=0,evas=0
-	setvar VAR_0x8000, \battler
-	setvar VAR_0x8001, \atk
-	setvar VAR_0x8002, \def
-	setvar VAR_0x8003, \speed
-	setvar VAR_0x8004, \spatk
-	setvar VAR_0x8005, \spdef
-	setvar VAR_0x8006, \acc
-	setvar VAR_0x8007, \evas
-	special SetTotemBoost
+	callnative ScriptSetTotemBoost
+	.2byte \battler
+	.2byte \atk
+	.2byte \def
+	.2byte \speed
+	.2byte \spatk
+	.2byte \spdef
+	.2byte \acc
+	.2byte \evas
 	.endm

 	@ useful totem boost macros
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@ -691,6 +691,32 @@ gBattleAnimMove_LuckyChant::
 	end

 gBattleAnimMove_MeFirst::
+	loadspritegfx ANIM_TAG_ORBS
+	loadspritegfx ANIM_TAG_FINGER
+	loadspritegfx ANIM_TAG_THOUGHT_BUBBLE
+	createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ORBS, 0, 12, 12, 0x7FAF
+	setalpha 11, 5
+	monbg_static ANIM_DEF_PARTNER
+	splitbgprio_all
+	createsprite gThoughtBubbleSpriteTemplate, ANIM_ATTACKER, 11, 0, 100
+	playsewithpan SE_M_METRONOME, SOUND_PAN_ATTACKER
+	delay 6
+	createsprite gMetronomeFingerSpriteTemplate, ANIM_ATTACKER, 12, 0
+	delay 24
+	loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 22, 3
+	waitforvisualfinish
+	panse SE_M_MINIMIZE, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0
+	createvisualtask AnimTask_ShrinkTargetCopy, 5, 128, 24
+	delay 15
+	createsprite gMimicOrbSpriteTemplate, ANIM_TARGET, 2, -12, 24
+	delay 10
+	setarg 7, 0xFFFF
+	waitforvisualfinish
+	playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER
+	createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 0, 2, 0, 11, RGB_WHITE
+	waitforvisualfinish
+	clearmonbg_static ANIM_DEF_PARTNER
+	blendoff
 	end

 gBattleAnimMove_Copycat::
@ -1092,8 +1118,8 @@ gBattleAnimMove_ForcePalm::
 	end

 gBattleAnimMove_AuraSphere::
-	loadspritegfx ANIM_TAG_METEOR
-	loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT
+	loadspritegfx ANIM_TAG_IMPACT_2
+	loadspritegfx ANIM_TAG_LEER
 	monbg ANIM_ATK_PARTNER
 	splitbgprio ANIM_ATTACKER
 	setalpha 12, 8
@ -3600,17 +3626,18 @@ gBattleAnimMove_DarkVoid::
 	waitbgfadein
 	createvisualtask AnimTask_DestinyBondWhiteShadow, 5, 0, 0x30
 	loopsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_ATTACKER, 5, 2
-	delay 0x30
-	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0xfd00, 0x15, 0, 0x70 @Last is speed
-	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_DEF_PARTNER, 0xfd00, 0x15, 0, 0x70 @Last is speed
-	delay 0x40
+	delay 48
+	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -768, 21, 0, 112 @Last is duration
+	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_DEF_PARTNER, -768, 21, 0, 112 @Last is duration
+	delay 64
 	invisible ANIM_TARGET
 	invisible ANIM_DEF_PARTNER
-	createsprite gDarkVoidPurpleStarsTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0, 0x20, 0x3c
+	createsprite gDarkVoidPurpleStarsTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 0, 32, 60
+	createsprite gDarkVoidPurpleStarsTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_DEF_PARTNER, 0, 32, 60
 	waitforvisualfinish
 	createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 16
 	createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_DEF_PARTNER, 0, 16
-	delay 0x20
+	delay 32
 	call UnsetPsychicBg
 	visible ANIM_TARGET
 	visible ANIM_DEF_PARTNER
@ -9827,27 +9854,25 @@ gBattleAnimMove_BanefulBunker::

 gBattleAnimMove_SpiritShackle::
 	loadspritegfx ANIM_TAG_SPIRIT_ARROW @Arrow
-	loadspritegfx ANIM_TAG_CHAIN_LINK @Chain
-	monbg ANIM_DEF_PARTNER
-	splitbgprio ANIM_TARGET
-	setalpha 12, 8
-	createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x10, 0x0
-	waitforvisualfinish
+	loadspritegfx ANIM_TAG_PURPLE_CHAIN
+	createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_PURPLE_CHAIN, 0, 9, 9, RGB_BLACK
+	monbg ANIM_TARGET
 	playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER
-	createsprite gSpiritShackleArrowTemplate, ANIM_TARGET, 2, 0x10, 0x0, 0x0, 0x0, 0xf
-	delay 0x8
+	createsprite gSpiritShackleArrowTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 15
+	delay 8
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 10, 1
 	waitforvisualfinish
-	loopsewithpan SE_SHINY, SOUND_PAN_ATTACKER, 0x1c, 0x2
-	createsprite gSpiritShackleChainTemplate, ANIM_TARGET, 2, 0xfff0, 0xfff0
-	delay 0x4
-	createsprite gSpiritShackleChainTemplate, ANIM_TARGET, 2, 0xfff0, 0x0
-	delay 0x4
-	createsprite gSpiritShackleChainTemplate, ANIM_TARGET, 2, 0xfff0, 0x10
+	loopsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET, 6, 2
+	createsprite gChainBindingSpriteTemplate, ANIM_TARGET, 4, 0, 16, 0, 1
+	delay 7
+	createsprite gChainBindingSpriteTemplate, ANIM_TARGET, 2, 0, 8, 1, 1
+	delay 3
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
+	delay 20
+	setarg 7, 0xFFFF
+	playsewithpan SE_M_BIND, SOUND_PAN_TARGET
 	waitforvisualfinish
-	createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x10, 0x0, 0x0
-	waitforvisualfinish
-	clearmonbg ANIM_DEF_PARTNER
+	clearmonbg ANIM_TARGET
 	blendoff
 	end

@ -12621,43 +12646,385 @@ PhotonGeyserBeam:
 	return

 gBattleAnimMove_ZippyZap::
-	end @to do:
+	loadspritegfx ANIM_TAG_IMPACT
+	loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT
+	loadspritegfx ANIM_TAG_SPARK_2
+	monbg ANIM_ATK_PARTNER
+	setalpha 12, 8
+	playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
+	createsprite gGrowingShockWaveOrbSpriteTemplate, ANIM_ATTACKER, 2  @electric circle
+	waitforvisualfinish
+	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5
+	createvisualtask AnimTask_TraceMonBlended, 2, 0, 4, 7, 3
+	playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER
+	delay 4
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
+	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 0, 0, ANIM_TARGET, 1
+	call ElectricityEffect
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
+	waitforvisualfinish
+	clearmonbg ANIM_ATK_PARTNER
+	blendoff
+	waitforvisualfinish
+	end

 gBattleAnimMove_SplishySplash::
-	end @to do:
+	loadspritegfx ANIM_TAG_SPARK_2
+	createvisualtask AnimTask_CreateSurfWave, 2, ANIM_SURF_PAL_SURF
+	delay 24
+	panse SE_M_SURF, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
+	waitforvisualfinish
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 10, 1
+	call ElectricityEffect
+	end

 gBattleAnimMove_FloatyFall::
-	end @to do:
+	loadspritegfx ANIM_TAG_ROUND_SHADOW
+	loadspritegfx ANIM_TAG_IMPACT
+	createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ROUND_SHADOW, 0, 12, 12, RGB_YELLOW
+	monbg ANIM_DEF_PARTNER
+	setalpha 12, 8
+	playsewithpan SE_M_FLY, SOUND_PAN_ATTACKER
+	createsprite gFlyBallUpSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 13, 336
+	waitforvisualfinish
+	playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
+	createsprite gFlyBallAttackSpriteTemplate, ANIM_ATTACKER, 2, 20, FALSE
+	delay 20
+	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 0
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
+	playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
+	waitforvisualfinish
+	clearmonbg ANIM_DEF_PARTNER
+	blendoff
+	waitforvisualfinish
+	end

 gBattleAnimMove_PikaPapow::
-	end @to do:
+	createvisualtask AnimTask_GetReturnPowerLevel, 2
+	delay 2
+	jumpreteq 0, gBattleAnimMove_ThunderShock
+	jumpreteq 1, gBattleAnimMove_ShockWave
+	jumpreteq 2, gBattleAnimMove_Thunderbolt
+	jumpreteq 3, gBattleAnimMove_Thunder

 gBattleAnimMove_BouncyBubble::
-	end @to do:
+	loadspritegfx ANIM_TAG_BUBBLE
+	loadspritegfx ANIM_TAG_SMALL_BUBBLES
+	loadspritegfx ANIM_TAG_ORBS
+	loadspritegfx ANIM_TAG_BLUE_STAR
+	loadspritegfx ANIM_TAG_IMPACT
+	monbg ANIM_TARGET
+	splitbgprio ANIM_TARGET
+	setalpha 12, 8
+	delay 1
+	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 1, 0, 12, RGB(13, 12, 31)
+	waitforvisualfinish
+	playsewithpan SE_M_ABSORB, SOUND_PAN_TARGET
+	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 0
+	delay 2
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1
+	waitforvisualfinish
+	call WaterBubblesEffectLong
+	call GigaDrainAbsorbEffect
+	waitforvisualfinish
+	delay 15
+	call HealingEffect
+	waitforvisualfinish
+	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 1, 12, 0, RGB(13, 12, 31)
+	waitforvisualfinish
+	clearmonbg ANIM_TARGET
+	blendoff
+	end

 gBattleAnimMove_BuzzyBuzz::
-	end @to do:
+	loadspritegfx ANIM_TAG_ELECTRIC_ORBS
+	loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT
+	loadspritegfx ANIM_TAG_SPARK
+	loadspritegfx ANIM_TAG_LIGHTNING
+	loadspritegfx ANIM_TAG_SHOCK_3
+	loadspritegfx ANIM_TAG_SPARK_2
+	createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 0, 6, RGB_BLACK
+	waitforvisualfinish
+	createsprite gSpriteTemplate_SpiritBreakChargeBall, ANIM_TARGET, 1, ANIM_TARGET
+	delay 10
+	createvisualtask AnimTask_ElectricBolt, 5, 24, -52, 0
+	playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET
+	delay 7
+	createvisualtask AnimTask_ElectricBolt, 5, -24, -52, 0
+	playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET
+	delay 7
+	createvisualtask AnimTask_ElectricBolt, 5, 0, -60, 1
+	playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET
+	delay 9
+	createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 0, 0, 13, RGB_BLACK
+	waitforvisualfinish
+	createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 0, 13, 0, RGB_BLACK
+	waitforvisualfinish
+	delay 20
+	waitplaysewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET, 19
+	call ElectricityEffect
+	waitforvisualfinish
+	delay 20
+	createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 6, 0, RGB_BLACK
+	waitforvisualfinish
+	end

 gBattleAnimMove_SizzlySlide::
-	end @to do:
+	loadspritegfx ANIM_TAG_SMALL_EMBER
+	loadspritegfx ANIM_TAG_IMPACT
+	monbg ANIM_ATK_PARTNER
+	setalpha 12, 8
+	createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0
+	playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+	delay 2
+	createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 4
+	playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+	delay 2
+	createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 8
+	playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+	delay 2
+	createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 12
+	playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+	delay 2
+	createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 16
+	playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+	delay 2
+	createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 20
+	playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+	delay 2
+	createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 24
+	playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+	waitforvisualfinish
+	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5
+	createvisualtask AnimTask_TraceMonBlended, 2, 0, 4, 7, 3
+	playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER
+	delay 4
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
+	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 0, 0, ANIM_TARGET, 1
+	createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_TARGET, RGB_RED, 12, 1, 1
+	playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET
+	call FireSpreadEffect
+	delay 7
+	createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 9
+	waitforvisualfinish
+	clearmonbg ANIM_ATK_PARTNER
+	end

 gBattleAnimMove_GlitzyGlow::
-	end @to do:
+	loadspritegfx ANIM_TAG_THIN_RING @hypervoice ring
+	loadspritegfx ANIM_TAG_SPARK_2 @yellow color
+	loadspritegfx ANIM_TAG_WATER_ORB @blue color
+	loadspritegfx ANIM_TAG_POISON_BUBBLE @violet color
+	loadspritegfx ANIM_TAG_SMALL_EMBER @flame wheel particle
+	loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT
+	createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_CIRCLE_OF_LIGHT, 0, 12, 12, 0x289F
+	monbg ANIM_DEF_PARTNER
+	splitbgprio_foes ANIM_TARGET
+	createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, 0 @Darken
+	playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
+	createsprite gGrowingShockWaveOrbSpriteTemplate, ANIM_ATTACKER, 0, 0
+	delay 18
+	panse SE_M_SCREECH, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0
+	createsprite gSynchronoiseVioletRingTemplate, ANIM_ATTACKER, 0, 25, 0, 0, 0, 0, 0, 1
+	delay 1
+	createsprite gSynchronoiseBlueRingTemplate, ANIM_ATTACKER, 0, 25, 0, 0, 0, 0, 0, 1
+	delay 1
+	createsprite gSynchronoiseYellowRingTemplate, ANIM_ATTACKER, 0, 25, 0, 0, 0, 0, 0, 1
+	delay 36
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1
+	createvisualtask AnimTask_ShakeBattleTerrain, 2, 1, 0, 6, 1
+	waitforvisualfinish
+	createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, 0 @Darken
+	waitforvisualfinish
+	clearmonbg ANIM_DEF_PARTNER
+	blendoff
+	delay 1
+	unloadspritegfx ANIM_TAG_THIN_RING @hypervoice ring
+	unloadspritegfx ANIM_TAG_SPARK_2 @yellow color
+	unloadspritegfx ANIM_TAG_WATER_ORB @blue color
+	unloadspritegfx ANIM_TAG_POISON_BUBBLE @violet color
+	unloadspritegfx ANIM_TAG_SMALL_EMBER @flame wheel particle
+	unloadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT
+	waitforvisualfinish
+	goto gBattleAnimMove_LightScreen

 gBattleAnimMove_BaddyBad::
-	end @to do:
+	loadspritegfx ANIM_TAG_STRAIGHT_BEAM
+	createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_STRAIGHT_BEAM, 0, 14, 14, RGB_BLACK
+	monbg ANIM_ATTACKER
+	splitbgprio ANIM_ATTACKER
+	playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
+	fadetobg BG_DARK
+	waitbgfadein
+	delay 10
+	playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER
+	createvisualtask AnimTask_NightShadeClone, 5, 133
+	delay 10
+	createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 6, 0, 16, RGB_BLACK
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 96, 1
+	panse SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0
+	call PhotonGeyserBeam
+	waitforvisualfinish
+	createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 1, 16, 0, RGB_BLACK
+	waitforvisualfinish
+	delay 1
+	restorebg
+	waitbgfadein
+	waitforvisualfinish
+	clearmonbg ANIM_ATTACKER
+	unloadspritegfx ANIM_TAG_STRAIGHT_BEAM
+	waitforvisualfinish
+	goto gBattleAnimMove_Reflect

 gBattleAnimMove_SappySeed::
-	end @to do:
+	loadspritegfx ANIM_TAG_SPROUT
+	loadspritegfx ANIM_TAG_SEED
+	playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_TARGET
+	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 40, 1
+	createsprite gSproutGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, 20, ANIM_TARGET, 1
+	delay 2
+	createsprite gSproutGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, 20, ANIM_TARGET, 1
+	createsprite gSproutGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, 10, ANIM_TARGET, 1
+	delay 2
+	createsprite gSproutGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, 20, ANIM_TARGET, 1
+	createsprite gSproutGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, 10, ANIM_TARGET, 1
+	createsprite gSproutGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1
+	delay 2
+	createsprite gSproutGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, 20, ANIM_TARGET, 1
+	createsprite gSproutGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, 10, ANIM_TARGET, 1
+	createsprite gSproutGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1
+	createsprite gSproutGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, -10, ANIM_TARGET, 1
+	delay 2
+	createsprite gSproutGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, 20, ANIM_TARGET, 1
+	createsprite gSproutGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, 10, ANIM_TARGET, 1
+	createsprite gSproutGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1
+	createsprite gSproutGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, -10, ANIM_TARGET, 1
+	createsprite gSproutGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, -20, ANIM_TARGET, 1
+	delay 2
+	createsprite gSproutGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, 20, ANIM_TARGET, 1
+	createsprite gSproutGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, 10, ANIM_TARGET, 1
+	createsprite gSproutGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1
+	createsprite gSproutGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, -10, ANIM_TARGET, 1
+	createsprite gSproutGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, -20, ANIM_TARGET, 1
+	createsprite gSproutGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, -30, ANIM_TARGET, 1
+	delay 2
+	call FullBeanstalk
+	call FallingSeeds
+	call FullBeanstalk
+	call FullBeanstalk
+	call FullBeanstalk
+	call FullBeanstalk
+	call FullBeanstalk
+	call FullBeanstalk
+	call FullBeanstalk
+	call FullBeanstalk
+	call FullBeanstalk
+	call FullBeanstalk
+	call FullBeanstalk
+	call FullBeanstalk
+	call FullBeanstalk
+	call FullBeanstalk
+	waitforvisualfinish
+	end
+FullBeanstalk:
+	createsprite gSproutGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, 20, ANIM_TARGET, 1
+	createsprite gSproutGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, 10, ANIM_TARGET, 1
+	createsprite gSproutGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1
+	createsprite gSproutGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, -10, ANIM_TARGET, 1
+	createsprite gSproutGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, -20, ANIM_TARGET, 1
+	createsprite gSproutGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, -30, ANIM_TARGET, 1
+	createsprite gSproutGrowSpriteTemplate, ANIM_ATTACKER, 3, 0, -40, ANIM_TARGET, 1
+	delay 2
+	return
+FallingSeeds:
+	createsprite gFallingSeedSpriteTemplate, ANIM_TARGET, 2, -20, 0, -10, 0
+	playsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET
+	createsprite gFallingSeedSpriteTemplate, ANIM_TARGET, 2, 28, 0, 10, 0
+	playsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET
+	createsprite gFallingSeedSpriteTemplate, ANIM_TARGET, 2, -10, 0, -5, 0
+	playsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET
+	createsprite gFallingSeedSpriteTemplate, ANIM_TARGET, 2, 10, 0, 6, 0
+	playsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET
+	createsprite gFallingSeedSpriteTemplate, ANIM_TARGET, 2, 24, 0, 10, 0
+	playsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET
+	createsprite gFallingSeedSpriteTemplate, ANIM_TARGET, 2, -32, 0, -10, 0
+	playsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET
+	createsprite gFallingSeedSpriteTemplate, ANIM_TARGET, 2, -20, 0, -10, 0
+	playsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET
+	createsprite gFallingSeedSpriteTemplate, ANIM_TARGET, 2, 30, 0, 10, 0
+	playsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET
+	return

 gBattleAnimMove_FreezyFrost::
-	end @to do:
+	loadspritegfx ANIM_TAG_ICICLE_SPEAR
+	loadspritegfx ANIM_TAG_ICE_SPIKES
+	loadspritegfx ANIM_TAG_IMPACT
+	createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_ICICLE_SPEAR, 0, 0, 12, RGB_BLACK
+	createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_ICE_SPIKES, 0, 0, 12, RGB_BLACK
+	waitforvisualfinish
+	call FreezyFrostHitEffect
+	call FreezyFrostHitEffect
+	call FreezyFrostHitEffect
+	call FreezyFrostHitEffect
+	waitforvisualfinish
+	call IceSpikesEffectLong
+	waitforvisualfinish
+	end
+FreezyFrostHitEffect:
+	createsprite gFreezyFrostRisingSpearSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, -4, 16
+	playsewithpan SE_M_ROCK_THROW SOUND_PAN_TARGET
+	delay 1
+	createsprite gFreezyFrostRisingSpearSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 4109, 16
+	playsewithpan SE_M_ROCK_THROW SOUND_PAN_TARGET
+	delay 1
+	createsprite gFreezyFrostRisingSpearSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 4, 16
+	playsewithpan SE_M_ROCK_THROW SOUND_PAN_TARGET
+	delay 1
+	createsprite gFreezyFrostRisingSpearSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, -16, 16
+	playsewithpan SE_M_ROCK_THROW SOUND_PAN_TARGET
+	delay 1
+	return

 gBattleAnimMove_SparklySwirl::
-	end @to do:
+	loadspritegfx ANIM_TAG_GUST
+	loadspritegfx ANIM_TAG_PINK_PETAL
+	createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_GUST, 0, 15, 15, RGB(31, 21, 21)
+	monbg ANIM_DEF_PARTNER
+	splitbgprio ANIM_TARGET
+	playsewithpan SE_M_GUST, SOUND_PAN_TARGET
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 47, 1
+	call HurricaneGust
+	call PinkPetalVortex
+	call HurricaneGust
+	call PinkPetalVortex
+	call HurricaneGust
+	call PinkPetalVortex
+	waitforvisualfinish
+	stopsound
+	clearmonbg ANIM_TARGET
+	end
+PinkPetalVortex:
+	createsprite gPinkPetalVortexTemplate, ANIM_TARGET, 2, 0, 28, 528, 30, 13, 50, 1
+	delay 2
+	createsprite gPinkPetalVortexTemplate, ANIM_TARGET, 2, 0, 32, 480, 20, 16, -46, 1
+	delay 2
+	createsprite gPinkPetalVortexTemplate, ANIM_TARGET, 2, 0, 33, 576, 20, 8, 42, 1
+	delay 2
+	createsprite gPinkPetalVortexTemplate, ANIM_TARGET, 2, 0, 31, 400, 25, 11, -42, 1
+	delay 2
+	createsprite gPinkPetalVortexTemplate, ANIM_TARGET, 2, 0, 28, 512, 25, 16, 46, 1
+	delay 2
+	createsprite gPinkPetalVortexTemplate, ANIM_TARGET, 2, 0, 33, 464, 30, 15, -50, 1
+	delay 2
+	return

 gBattleAnimMove_VeeveeVolley::
-	end @to do:
+	createvisualtask AnimTask_GetReturnPowerLevel, 2
+	delay 2
+	jumpreteq 0, gBattleAnimMove_Tackle
+	jumpreteq 1, gBattleAnimMove_Headbutt
+	jumpreteq 2, gBattleAnimMove_TakeDown
+	jumpreteq 3, gBattleAnimMove_DoubleEdge

 gBattleAnimMove_DoubleIronBash::
 	loadspritegfx ANIM_TAG_GUST
@ -13004,6 +13371,9 @@ gBattleAnimMove_ClangorousSoul::
 	createsprite gClangorousSoulRedFistTemplate, ANIM_ATTACKER, 2, 0x10, 0, 0, 0, 10, ANIM_ATTACKER, ANIM_LEFT_FIST, 1
 	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	waitforvisualfinish
+	unloadspritegfx ANIM_TAG_HORSESHOE_SIDE_FIST
+	unloadspritegfx ANIM_TAG_SPARKLE_2 @stars
+	waitforvisualfinish
 	loadspritegfx ANIM_TAG_THIN_RING @ring
 	playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
 	createsprite gClangorousSoulRedRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0
@ -13104,8 +13474,31 @@ gBattleAnimMove_DrumBeating::
 	blendoff
 	end

-gBattleAnimMove_SnapTrap:: @ placeholder
-	goto gBattleAnimMove_Bite
+gBattleAnimMove_SnapTrap::
+	loadspritegfx ANIM_TAG_LEAF @leaves
+	loadspritegfx ANIM_TAG_FLOWER @flowers
+	loadspritegfx ANIM_TAG_SHARP_TEETH
+	loadspritegfx ANIM_TAG_IMPACT
+	createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SHARP_TEETH, 0, 10, 10, 0x0688
+	monbg ANIM_TARGET
+	setalpha 12, 8
+	playsewithpan SE_M_BITE, SOUND_PAN_TARGET
+	createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 0, -32, 0, 0, 819, 10
+	createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 0, 32, 4, 0, -819, 10
+	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
+	delay 10
+	playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER
+	createsprite gTropKickLeavesTemplate, ANIM_TARGET, 1, 0, 10, 192, 176, 40
+	createsprite gTropKickLeavesTemplate, ANIM_TARGET, 1, 0, 10, -192, 240, 40
+	createsprite gTropKickLeavesTemplate, ANIM_TARGET, 1, 0, 10, 192, -160, 40
+	createsprite gTropKickLeavesTemplate, ANIM_TARGET, 1, 0, 10, -192, -112, 40
+	createsprite gTropKickLeavesTemplate, ANIM_TARGET, 1, 0, 10, 160, 48, 40
+	createsprite gTropKickLeavesTemplate, ANIM_TARGET, 1, 0, 10, -224, -32, 40
+	createsprite gTropKickLeavesTemplate, ANIM_TARGET, 1, 0, 10, 112, -128, 40
+	waitforvisualfinish
+	clearmonbg ANIM_DEF_PARTNER
+	end

 gBattleAnimMove_PyroBall::
 	loadspritegfx ANIM_TAG_FLAT_ROCK
@ -14848,7 +15241,44 @@ gBattleAnimMove_GlacialLance::


 gBattleAnimMove_AstralBarrage::
-	goto gBattleAnimMove_ShadowBall
+	loadspritegfx ANIM_TAG_FLAT_ROCK
+	loadspritegfx ANIM_TAG_ICE_CRYSTALS
+	loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT
+	createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_FLAT_ROCK, 0x0, 0xA, 0xA, RGB(2, 1, 4)
+	createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_ICE_CRYSTALS, 0x0, 0xA, 0xA, RGB(2, 1, 4)
+	monbg ANIM_ATK_PARTNER
+	splitbgprio ANIM_ATTACKER
+	setalpha 12, 8
+	fadetobg BG_GHOST
+	waitbgfadein
+	createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, 4, 1, 180, 1
+	createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_FAINT_ATTACK, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 20, 0, 5
+	createsprite gSuperpowerRockSpriteTemplate, ANIM_ATTACKER, 41, 200, 96, 1, 120
+	delay 8
+	createsprite gSuperpowerRockSpriteTemplate, ANIM_ATTACKER, 41, 20, 248, 4, 112
+	delay 8
+	createsprite gSuperpowerRockSpriteTemplate, ANIM_ATTACKER, 41, 130, 160, 2, 104
+	delay 8
+	createsprite gSuperpowerRockSpriteTemplate, ANIM_ATTACKER, 41, 160, 192, 0, 96
+	delay 8
+	createsprite gSuperpowerRockSpriteTemplate, ANIM_ATTACKER, 41, 60, 288, 3, 88
+	delay 74
+	panse SE_M_BLIZZARD, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
+	call BlizzardIceCrystals
+	call BlizzardIceCrystals
+	playsewithpan SE_M_BLIZZARD2, SOUND_PAN_TARGET
+	waitforvisualfinish
+	playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET
+	createspriteontargets gCurseGhostSpriteTemplate, ANIM_TARGET, 3, 2, 8, -5, ANIM_TARGET, 0
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 8, 0, 16, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 8, 0, 16, 1
+	waitforvisualfinish
+	clearmonbg ANIM_ATK_PARTNER
+	restorebg
+	waitbgfadein
+	blendoff
+	delay 1
+	end


@Credits to Skeli
@ -14995,8 +15425,9 @@ gBattleAnimMove_SpringtideStorm::
 	loadspritegfx ANIM_TAG_GUST
 	loadspritegfx ANIM_TAG_RED_HEART
 	playsewithpan SE_M_GUST, SOUND_PAN_TARGET
-	createvisualtaskontargets AnimTask_ShakeMon2, 2, 0, ANIM_TARGET, 0, 4, 0x58, 1
-	createvisualtask AnimTask_BlendColorCycle, 0x2, F_PAL_TARGET, 0x2, 0x6, 0x0, 0xB, 0x7ADF
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 88, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 88, 1
+	createvisualtask AnimTask_BlendColorCycle, 2, (F_PAL_TARGET | F_PAL_DEF_PARTNER), 2, 6, 0, 11, 0x7ADF
 	call HurricaneGustCentered
 	call SpringtideStormHeartSwirl
 	call HurricaneGustCentered
@ -15565,8 +15996,9 @@ gBattleAnimMove_BleakwindStorm::
 	loadspritegfx ANIM_TAG_GUST
 	loadspritegfx ANIM_TAG_ICE_CRYSTALS
 	playsewithpan SE_M_GUST, SOUND_PAN_TARGET
-	createvisualtaskontargets AnimTask_ShakeMon2, 2, 0, ANIM_TARGET, 0, 4, 0x58, 1
-	createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x4, 0x0, 0xB, 0x7FFF
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 88, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 88, 1
+	createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_TARGET | F_PAL_DEF_PARTNER), 4, 0, 11, 0x7FFF
 	call HurricaneGustCentered
 	call BleakwindStormIceSwirl
 	call HurricaneGustCentered
@ -15581,7 +16013,7 @@ gBattleAnimMove_BleakwindStorm::
 	call BleakwindStormIceSwirl
 	waitforvisualfinish
 	stopsound
-	createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x1, 0xB, 0x0, 0x7FFF
+	createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_TARGET | F_PAL_DEF_PARTNER), 1, 11, 0, 0x7FFF
 	waitforvisualfinish
 	end
 BleakwindStormIceSwirl:
@ -15605,11 +16037,12 @@ gBattleAnimMove_WildboltStorm::
 	loadspritegfx ANIM_TAG_SPARK_2
 	fadetobg BG_MAX_LIGHTNING
 	waitbgfadeout
-	createvisualtask AnimTask_StartSlidingBg, 0x5, 0xff00, 0x0, 0x1, 0xffff
+	createvisualtask AnimTask_StartSlidingBg, 5, -256, 0, 1, 0xffff
 	waitbgfadein
 	playsewithpan SE_M_GUST, SOUND_PAN_TARGET
-	createvisualtaskontargets AnimTask_ShakeMon2, 2, 0, ANIM_TARGET, 0, 4, 0x58, 1
-	createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 0x4, 0x0, 0xB, 0x07FE
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 88, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 88, 1
+	createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_TARGET | F_PAL_DEF_PARTNER), 4, 0, 11, 0x07FE
 	call HurricaneGustCentered
 	call WildboltStormSparkSwirl
 	call HurricaneGustCentered
@ -15624,7 +16057,7 @@ gBattleAnimMove_WildboltStorm::
 	call WildboltStormSparkSwirl
 	waitforvisualfinish
 	stopsound
-	createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x1, 0xB, 0x0, 0x07FE
+	createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_TARGET | F_PAL_DEF_PARTNER), 1, 11, 0, 0x07FE
 	call UnsetPsychicBg
 	waitforvisualfinish
 	end
@ -15650,8 +16083,9 @@ gBattleAnimMove_SandsearStorm::
 	loadspritegfx ANIM_TAG_SMALL_EMBER
 	createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_GUST, 0x0, 0xA, 0xA, 0x190B
 	playsewithpan SE_M_GUST, SOUND_PAN_TARGET
-	createvisualtaskontargets AnimTask_ShakeMon2, 2, 0, ANIM_TARGET, 0, 4, 0x58, 1
-	createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x4, 0x0, 0xB, 0x1F
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 88, 1
+	createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 88, 1
+	createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_TARGET | F_PAL_DEF_PARTNER), 4, 0, 11, 0x1F
 	call HurricaneGustCentered
 	call SandsearStormFireSpin
 	call HurricaneGustCentered
@ -15666,7 +16100,7 @@ gBattleAnimMove_SandsearStorm::
 	call SandsearStormFireSpin
 	waitforvisualfinish
 	stopsound
-	createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x1, 0xB, 0x0, 0x1F
+	createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_TARGET | F_PAL_DEF_PARTNER), 1, 11, 0, 0x1F
 	waitforvisualfinish
 	end

@ -15997,7 +16431,30 @@ ChillyReceptionSnowballs:
 	return

 gBattleAnimMove_BurningBulwark::
-	goto gBattleAnimMove_Protect
+	loadspritegfx ANIM_TAG_PROTECT @protect
+	loadspritegfx ANIM_TAG_SMALL_EMBER @fire
+	monbg ANIM_ATK_PARTNER
+	splitbgprio ANIM_ATTACKER
+	waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER 16
+	createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_PROTECT, 0, 13, 13, 0x015B
+	createsprite gProtectSpriteTemplate, ANIM_ATTACKER, 2, 24, 0, 90
+	createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0
+	delay 2
+	createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 4
+	delay 2
+	createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 8
+	delay 2
+	createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 12
+	delay 2
+	createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 16
+	delay 2
+	createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 20
+	delay 2
+	createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 24
+	createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_ATTACKER, RGB_RED, 10, 0, 2
+	waitforvisualfinish
+	clearmonbg ANIM_ATK_PARTNER
+	end

 gBattleAnimMove_AlluringVoice::
 	loadspritegfx ANIM_TAG_THIN_RING
@ -27667,8 +28124,8 @@ Status_Thunder_Cage:
 	@ TODO
 	goto gBattleAnimMove_ThunderCage

-Status_Snap_Trap: @ placeholder
-	goto gBattleAnimMove_Bite
+Status_Snap_Trap:
+	goto gBattleAnimMove_SnapTrap

 Status_SandTomb:
 	loadspritegfx ANIM_TAG_MUD_SAND
@ -27994,7 +28451,7 @@ gBattleAnimGeneral_MegaEvolution::
 	delay 20
 	createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 0, 16, RGB_WHITEALPHA
 	waitforvisualfinish
-	createvisualtask AnimTask_TransformMon, 2, 1, 0
+	createvisualtask AnimTask_HideSwapSprite, 2, 1, 0
 	createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, RGB_WHITEALPHA
 	createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 5, 14
 	waitforvisualfinish
@ -28185,7 +28642,7 @@ General_PrimalReversion_Alpha:
 	delay 20
 	createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 0, 16, RGB_WHITEALPHA
 	waitforvisualfinish
-	createvisualtask AnimTask_TransformMon, 2, 1, 0
+	createvisualtask AnimTask_HideSwapSprite, 2, 1, 0
 	createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, RGB_WHITEALPHA
 	createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 5, 14
 	waitforvisualfinish
@ -28212,7 +28669,7 @@ General_PrimalReversion_Omega:
 	delay 20
 	createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 0, 16, RGB_WHITEALPHA
 	waitforvisualfinish
-	createvisualtask AnimTask_TransformMon, 2, 1, 0
+	createvisualtask AnimTask_HideSwapSprite, 2, 1, 0
 	createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, RGB_WHITEALPHA
 	createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 5, 14
 	waitforvisualfinish
@ -28248,7 +28705,7 @@ gBattleAnimGeneral_UltraBurst::
 	call LightThatBurnsTheSkyGreenSparks
 	delay 20
 	createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 0, 16, RGB_WHITEALPHA
-	createvisualtask AnimTask_TransformMon, 2, 1, 0
+	createvisualtask AnimTask_HideSwapSprite, 2, 1, 0
 	createsprite gUltraBurstSymbolSpriteTemplate, ANIM_ATTACKER, 0x0, 0x0, 0x0, 0x0, 0x0
 	waitforvisualfinish
 	createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, RGB_WHITEALPHA
@ -33004,6 +33461,9 @@ gBattleAnimMove_ClangorousSoulblaze::
 	createsprite gClangorousSoulRedFistTemplate, ANIM_ATTACKER, 2, 0x10, 0x0, 0x0, 0x0, 0xa, ANIM_ATTACKER, ANIM_LEFT_FIST, 0x1
 	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	waitforvisualfinish
+	unloadspritegfx ANIM_TAG_HORSESHOE_SIDE_FIST
+	unloadspritegfx ANIM_TAG_SPARKLE_2 @stars
+	waitforvisualfinish
 	loadspritegfx ANIM_TAG_THIN_RING @ring
 	playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
 	createsprite gClangorousSoulRedRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@ -3265,6 +3265,7 @@ BattleScript_EffectRoar::
 	attackstring
 	ppreduce
 	jumpifroarfails BattleScript_ButItFailed
+	jumpifcommanderactive 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
@ -3279,51 +3280,17 @@ BattleScript_RoarBlockedByDynamax:
 	waitmessage B_WAIT_TIME_LONG
 	goto BattleScript_MoveEnd

-BattleScript_MultiHitLoop::
-	jumpifhasnohp BS_ATTACKER, BattleScript_MultiHitEnd
-	jumpifhasnohp BS_TARGET, BattleScript_MultiHitPrintStrings
-	jumpifhalfword CMP_EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_DoMultiHit
-	jumpifstatus BS_ATTACKER, STATUS1_SLEEP, BattleScript_MultiHitPrintStrings
-BattleScript_DoMultiHit::
-	movevaluescleanup
-	copyhword sMOVE_EFFECT, sMULTIHIT_EFFECT
-	critcalc
-	damagecalc
-	jumpifmovehadnoeffect BattleScript_MultiHitNoMoreHits
-	adjustdamage
-	attackanimation
-	waitanimation
-	effectivenesssound
-	hitanimation BS_TARGET
-	waitstate
-	healthbarupdate BS_TARGET
-	datahpupdate BS_TARGET
-	critmessage
-	waitmessage B_WAIT_TIME_LONG
-	multihitresultmessage
-	flushtextbox
-	addbyte sMULTIHIT_STRING + 4, 1
-	moveendto MOVEEND_NEXT_TARGET
-	jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_MultiHitPrintStrings
-	decrementmultihit BattleScript_MultiHitLoop
-	goto BattleScript_MultiHitPrintStrings
-BattleScript_MultiHitNoMoreHits::
-	pause B_WAIT_TIME_SHORT
 BattleScript_MultiHitPrintStrings::
 	resultmessage
 	waitmessage B_WAIT_TIME_LONG
-	jumpifmovehadnoeffect BattleScript_MultiHitEnd
 	copyarray gBattleTextBuff1, sMULTIHIT_STRING, 6
 	printstring STRINGID_HITXTIMES
 	waitmessage B_WAIT_TIME_LONG
 	return

-BattleScript_MultiHitEnd::
-	setadditionaleffects
-	tryfaintmon BS_TARGET
-	moveendcase MOVEEND_SYNCHRONIZE_TARGET
-	moveendfrom MOVEEND_STATUS_IMMUNITY_ABILITIES
-	end
+BattleScript_ScaleShot::
+	call BattleScript_MultiHitPrintStrings
+	goto BattleScript_DefDownSpeedUp

 BattleScript_EffectConversion::
 	attackcanceler
@ -4724,6 +4691,9 @@ BattleScript_ButItFailed::
 	resultmessage
 	waitmessage B_WAIT_TIME_LONG
 	goto BattleScript_MoveEnd
+BattleScript_RestoreAttackerButItFailed:
+	restoreattacker
+	goto BattleScript_ButItFailed

 BattleScript_NotAffected::
 	pause B_WAIT_TIME_SHORT
@ -6460,12 +6430,14 @@ BattleScript_SeedSowerActivates::
 	return

 BattleScript_AngerShellActivates::
+	saveattacker
+	copybyte gBattlerAttacker, gBattlerTarget
 	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
+	jumpifstat BS_TARGET, CMP_EQUAL, STAT_SPDEF, MIN_STAT_STAGE, BattleScript_RestoreAttackerButItFailed
 BattleScript_AngerShellTryDef::
 	setbyte sSTAT_ANIM_PLAYED, FALSE
 	modifybattlerstatstage BS_ATTACKER, STAT_DEF, DECREASE, 1, BattleScript_AngerShellTrySpDef, ANIM_ON
@ -6479,6 +6451,7 @@ BattleScript_AngerShellTrySpAtk:
 BattleScript_AngerShellTrySpeed:
 	modifybattlerstatstage BS_ATTACKER, STAT_SPEED, INCREASE, 1, BattleScript_AngerShellRet, ANIM_ON
 BattleScript_AngerShellRet:
+	restoreattacker
 	return

 BattleScript_WindPowerActivates::
@ -6995,12 +6968,12 @@ BattleScript_WishMegaEvolution::

 BattleScript_PrimalReversion::
 	call BattleScript_PrimalReversionRet
-	end2
+	end3

 BattleScript_PrimalReversionRestoreAttacker::
 	call BattleScript_PrimalReversionRet
 	copybyte gBattlerAttacker, sSAVED_BATTLER
-	end2
+	end3

 BattleScript_PrimalReversionRet::
 	flushtextbox
@ -7709,15 +7682,11 @@ BattleScript_EmergencyExitWildNoPopUp::

 BattleScript_TraceActivates::
 	pause B_WAIT_TIME_SHORT
-	call BattleScript_AbilityPopUp
+	call BattleScript_AbilityPopUpScripting
 	printstring STRINGID_PKMNTRACED
 	waitmessage B_WAIT_TIME_LONG
 	settracedability BS_SCRIPTING
 	switchinabilities BS_SCRIPTING
-	return
-
-BattleScript_TraceActivatesEnd3::
-	call BattleScript_TraceActivates
 	end3

 BattleScript_ReceiverActivates::
@ -8040,11 +8009,52 @@ BattleScript_CostarActivates::

 BattleScript_ZeroToHeroActivates::
 	pause B_WAIT_TIME_SHORT
-	call BattleScript_AbilityPopUp
+	call BattleScript_AbilityPopUpScripting
 	printstring STRINGID_ZEROTOHEROTRANSFORMATION
 	waitmessage B_WAIT_TIME_LONG
 	end3

+BattleScript_CommanderActivates::
+	pause B_WAIT_TIME_SHORT
+	call BattleScript_AbilityPopUpScripting
+	printstring STRINGID_COMMANDERACTIVATES
+	waitmessage B_WAIT_TIME_LONG
+BattleScript_CommanderAtkIncrease:
+	setbyte sSTAT_ANIM_PLAYED, FALSE
+	playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF | BIT_SPATK | BIT_SPDEF | BIT_SPEED, STAT_CHANGE_BY_TWO
+	setstatchanger STAT_ATK, 2, FALSE
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CommanderDefIncrease
+	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CommanderDefIncrease
+	printfromtable gStatUpStringIds
+	waitmessage B_WAIT_TIME_LONG
+BattleScript_CommanderDefIncrease:
+	setstatchanger STAT_DEF, 2, FALSE
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CommanderSpAtkIncrease
+	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CommanderSpAtkIncrease
+	printfromtable gStatUpStringIds
+	waitmessage B_WAIT_TIME_LONG
+BattleScript_CommanderSpAtkIncrease:
+	setstatchanger STAT_SPATK, 2, FALSE
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CommanderSpDefIncrease
+	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CommanderSpDefIncrease
+	printfromtable gStatUpStringIds
+	waitmessage B_WAIT_TIME_LONG
+BattleScript_CommanderSpDefIncrease:
+	setstatchanger STAT_SPDEF, 2, FALSE
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CommanderSpeedIncrease
+	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CommanderSpeedIncrease
+	printfromtable gStatUpStringIds
+	waitmessage B_WAIT_TIME_LONG
+BattleScript_CommanderSpeedIncrease:
+	setstatchanger STAT_SPEED, 2, FALSE
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CommanderEnd
+	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CommanderEnd
+	printfromtable gStatUpStringIds
+	waitmessage B_WAIT_TIME_LONG
+BattleScript_CommanderEnd:
+	restoreattacker
+	end3
+
 BattleScript_HospitalityActivates::
 	pause B_WAIT_TIME_SHORT
 	call BattleScript_AbilityPopUp
@ -9404,6 +9414,16 @@ BattleScript_ZMoveActivateStatus::
 	copybyte sSTATCHANGER, sSAVED_STAT_CHANGER
 	return

+BattleScript_ZMoveActivatePowder::
+	flushtextbox
+	trytrainerslidezmovemsg
+	savetarget
+	printstring STRINGID_ZPOWERSURROUNDS
+	playanimation BS_ATTACKER, B_ANIM_ZMOVE_ACTIVATE, NULL
+	setzeffect
+	restoretarget
+	goto BattleScript_MoveUsedPowder
+
 BattleScript_ZEffectPrintString::
 	printfromtable gZEffectStringIds
 	waitmessage B_WAIT_TIME_LONG
@ -9555,6 +9575,14 @@ BattleScript_StickyBarbTransfer::
 	removeitem BS_TARGET
 	return

+BattleScript_RedCardActivationNoSwitch::
+	playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT
+	printstring STRINGID_REDCARDACTIVATE
+	waitmessage B_WAIT_TIME_LONG
+	removeitem BS_SCRIPTING
+	restoretarget
+	return
+
 BattleScript_RedCardActivates::
 	playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT
 	printstring STRINGID_REDCARDACTIVATE
@ -10035,7 +10063,7 @@ BattleScript_BerserkGeneRet_End:

 BattleScript_BoosterEnergyEnd2::
 	playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, sB_ANIM_ARG1
-	call BattleScript_AbilityPopUpTarget
+	call BattleScript_AbilityPopUpScripting
 	printstring STRINGID_BOOSTERENERGYACTIVATES
 	waitmessage B_WAIT_TIME_MED
 	printstring STRINGID_STATWASHEIGHTENED
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@ -724,6 +724,11 @@ EventScript_BackupMrBrineyLocation::
 	.include "data/scripts/rival_graphics.inc"
 	.include "data/scripts/set_gym_trainers.inc"

+EventScript_CancelMessageBox::
+	special UseBlankMessageToCancelPokemonPic
+	release
+	end
+
 Common_EventScript_ShowBagIsFull::
 	msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
 	release
@ -1143,6 +1148,5 @@ EventScript_VsSeekerChargingDone::
 	.include "data/scripts/trainer_hill.inc"
 	.include "data/scripts/test_signpost.inc"
 	.include "data/scripts/follower.inc"
-	.include "data/text/frontier_brain.inc"
 	.include "data/text/save.inc"
 	.include "data/text/birch_speech.inc"
--- a/data/specials.inc
+++ b/data/specials.inc
@ -534,7 +534,6 @@ gSpecials::
 	def_special RemoveRecordsWindow
 	def_special CloseDeptStoreElevatorWindow
 	def_special TrySetBattleTowerLinkType
-	def_special SetTotemBoost
 	def_special TrySpecialOverworldEvo
 	def_special GetNumberSprayStrength
 	def_special GetSprayId
@ -554,3 +553,4 @@ gSpecials::
 	def_special Script_GetChosenMonDefensiveEVs
 	def_special Script_GetChosenMonOffensiveIVs
 	def_special Script_GetChosenMonDefensiveIVs
+	def_special UseBlankMessageToCancelPokemonPic
--- a/data/text/frontier_brain.inc
+++ b/data/text/frontier_brain.inc
@ -1,108 +0,0 @@
-@ Battle Tower
-gText_AnabelWonSilver::
-	.string "It's very disappointing…$"
-
-gText_AnabelDefeatSilver::
-	.string "Okay, I understand…$"
-
-gText_AnabelWonGold::
-	.string "I'm terribly sorry…$"
-
-gText_AnabelDefeatGold::
-	.string "Thank you…$"
-
-@ Battle Dome
-gText_TuckerWonSilver::
-	.string "Ahahaha! Aren't you embarrassed?\n"
-	.string "Everyone's watching!$"
-
-gText_TuckerDefeatSilver::
-	.string "Grr…\n"
-	.string "What the…$"
-
-gText_TuckerWonGold::
-	.string "My DOME ACE title isn't just for show!$"
-
-gText_TuckerDefeatGold::
-	.string "Ahahaha!\n"
-	.string "You're inspiring!$"
-
-@ Battle Factory
-gText_NolandWonSilver::
-	.string "Way to work!\n"
-	.string "That was a good lesson, eh?$"
-
-gText_NolandDefeatSilver::
-	.string "Good job!\n"
-	.string "You know what you're doing!$"
-
-gText_NolandWonGold::
-	.string "Hey, hey, hey!\n"
-	.string "You're finished already?$"
-
-gText_NolandDefeatGold::
-	.string "What happened here?$"
-
-@ Battle Pike
-gText_LucyWonSilver::
-	.string "Humph…$"
-
-gText_LucyDefeatSilver::
-	.string "Urk…$"
-
-gText_LucyWonGold::
-	.string "Hah!$"
-
-gText_LucyDefeatGold::
-	.string "Darn!$"
-
-@ Battle Arena
-gText_GretaWonSilver::
-	.string "Oh, come on!\n"
-	.string "You have to try harder than that!$"
-
-gText_GretaDefeatSilver::
-	.string "No way!\n"
-	.string "Good job!$"
-
-gText_GretaWonGold::
-	.string "Heheh!\n"
-	.string "What did you expect?$"
-
-gText_GretaDefeatGold::
-	.string "Huh?\n"
-	.string "Are you serious?!$"
-
-@ Battle Palace
-gText_SpenserWonSilver::
-	.string "Your POKéMON are wimpy because\n"
-	.string "you're wimpy as a TRAINER!$"
-
-gText_SpenserDefeatSilver::
-	.string "Ah…\n"
-	.string "Now this is something else…$"
-
-gText_SpenserWonGold::
-	.string "Gwahahaha!\n"
-	.string "My brethren, we have nothing to fear!$"
-
-gText_SpenserDefeatGold::
-	.string "Gwah!\n"
-	.string "Hahahaha!$"
-
-@ Battle Pyramid
-gText_BrandonWonSilver::
-	.string "Hey! What's wrong with you!\n"
-	.string "Let's see some effort! Get up!$"
-
-gText_BrandonDefeatSilver::
-	.string "That's it! You've done great!\n"
-	.string "You've worked hard for this!$"
-
-gText_BrandonWonGold::
-	.string "Hey! Don't you give up now!\n"
-	.string "Get up! Don't lose faith in yourself!$"
-
-gText_BrandonDefeatGold::
-	.string "That's it! You've done it!\n"
-	.string "You kept working for this!$"
--- a/docs/SUMMARY.md
+++ b/docs/SUMMARY.md
@ -19,6 +19,8 @@
  - [How to use the Testing System](./how_to_testing_system.md)
 - [Changelog](./CHANGELOG.md)
    - [1.9.x]()
+        - [Version 1.9.2](changelogs/1.9.x/1.9.2.md)
+        - [Version 1.9.1](changelogs/1.9.x/1.9.1.md)
        - [Version 1.9.0](changelogs/1.9.x/1.9.0.md)
    - [1.8.x]()
        - [Version 1.8.6](changelogs/1.8.x/1.8.6.md)
--- a/docs/changelogs/1.9.x/1.9.0.md
+++ b/docs/changelogs/1.9.x/1.9.0.md
@ -551,6 +551,6 @@
 * @rayrobdod made their first contribution in https://github.com/rh-hideout/pokeemerald-expansion/pull/4727
 * @innocenthedgehog made their first contribution in https://github.com/rh-hideout/pokeemerald-expansion/pull/4988

-**Full Changelog**: https://github.com/rh-hideout/pokeemerald-expansion/compare/expansion/1.8.5...expansion/1.9.0
+**Full Changelog**: https://github.com/rh-hideout/pokeemerald-expansion/compare/expansion/1.8.6...expansion/1.9.0

 <!--Last PR: 5060-->
--- a/docs/changelogs/1.9.x/1.9.1.md
+++ b/docs/changelogs/1.9.x/1.9.1.md
@ -120,14 +120,14 @@
 * Improved 1.8 ⇒ 1.9 non-Competitive syntax migration instructions by @mrgriffin in [#5079](https://github.com/rh-hideout/pokeemerald-expansion/pull/5079)

 ## 📦 Branch Synchronisation 📦
-### pret
+### pret's base pokeemerald
 * 5th of August in [#5098](https://github.com/rh-hideout/pokeemerald-expansion/pull/5098)
    * Fixed bottom half of Mt. Pyre not being labeled in PokeNav by @fdeblasio in [pret#2018](https://github.com/pret/pokeemerald/pull/2018)
 * 7th of August in [#5116](https://github.com/rh-hideout/pokeemerald-expansion/pull/5116)
    * Changed type1 and type2 to be consistent by @pkmnsnfrn in [pret#2021](https://github.com/pret/pokeemerald/pull/2021)
 * 14th of August in [#5165](https://github.com/rh-hideout/pokeemerald-expansion/pull/5165)
    * Fix type for offset in MapConnection by @GriffinRichards in [pret#2011](https://github.com/pret/pokeemerald/pull/2011)
-### Followers
+### merrp/aarant's followers
 * 7th of August in [#5110](https://github.com/rh-hideout/pokeemerald-expansion/pull/5110)
    * Fixed expanded OW IDs by @pkmnsnfrn in [aarant#38](https://github.com/aarant/pokeemerald/pull/38)
    * Fix two small text errors in follower dialogue by @Bassoonian in [aarant#39](https://github.com/aarant/pokeemerald/pull/39)
--- a/docs/changelogs/1.9.x/1.9.2.md
+++ b/docs/changelogs/1.9.x/1.9.2.md
@ -0,0 +1,202 @@
+# Version 1.9.2
+
+```md
+## How to update
+- 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.9.2`.
+```
+
+## 🌋 *REFACTORS* 🌋
+📜 = Uses a migration script.
+* Remove unused `BattleScript_WindPowerActivatesEnd2` in [#5257](https://github.com/rh-hideout/pokeemerald-expansion/pull/5257)
+* Refactored in-battle disobedience to fix bug in [#5245](https://github.com/rh-hideout/pokeemerald-expansion/pull/5245)
+
+## 💥 *Hardlock/Softlock/Crash/Compiling fixes* 💥
+* Fixed hardlock when Hyperspace Fury is used by Hoopa Unbound by @AlexOn1ine in [#5237](https://github.com/rh-hideout/pokeemerald-expansion/pull/5237)
+* Fixed compile error when `OW_POKEMON_OBJECT_EVENTS` is `TRUE` but `P_HISUIAN_FORMS` is `FALSE` around Basculin by @hjk321 in [#5256](https://github.com/rh-hideout/pokeemerald-expansion/pull/5256)
+* Fixed hardlock when the AI cannot choose moves due to its opponent having Wonder Guard by @Pawkkie and Wiz in [#5317](https://github.com/rh-hideout/pokeemerald-expansion/pull/5317)
+* Fixed multiple Pledge move hardlocks
+    * Fixed potential hardlock when attempting to use Pledge moves on the same turn that the user would wake up by @PhallenTree in [#5330](https://github.com/rh-hideout/pokeemerald-expansion/pull/5330)
+    * Fixed hardlock when the opponent's combo doesn't happen when cancelled by sleep by @hedara90 and @PhallenTree in [#5339](https://github.com/rh-hideout/pokeemerald-expansion/pull/5339)
+    * Fixes hardlock when the opponent's combo doesn't happen when cancelled by freeze by @PhallenTree in [#5340](https://github.com/rh-hideout/pokeemerald-expansion/pull/5340)
+    * Fixed hardlock when the opponent's combo doesn't happen when cancelled by Powder by @hedara90 in [#5341](https://github.com/rh-hideout/pokeemerald-expansion/pull/5341)
+
+## 🧬 General 🧬
+### Fixed
+* Fixed loading into the wrong version of a map after saving in areas with multiple layouts by @hedara90 in [#5347](https://github.com/rh-hideout/pokeemerald-expansion/pull/5347)
+
+## 🐉 Pokémon 🐉
+### Added
+* Added `OVERWORLD_SET_ANIM` macro to allow using custom animation tables for Overworld Pokémon by @hedara90 in [#5309](https://github.com/rh-hideout/pokeemerald-expansion/pull/5309)
+    * Added asymetrical Farfetch'd sprites using a previously unused table from merrp's followers branch.
+* Added unique sprites for overworld Pumpkaboo and Gourgeist forms by @hedara90 in [#5390](https://github.com/rh-hideout/pokeemerald-expansion/pull/5390)
+* Added missing Sirfetch'd competitive alias (`SPECIES_SIRFETCH_D`) by @cawtds in [#5283](https://github.com/rh-hideout/pokeemerald-expansion/pull/5283)
+* Added Paldean Wooper and Clodsire overworld sprites by @Cafeei in [#5277](https://github.com/rh-hideout/pokeemerald-expansion/pull/5277)
+* Added missing Gen 9 Overworld sprites by @Liamjd14 in [#5304](https://github.com/rh-hideout/pokeemerald-expansion/pull/5304)
+    * Original sprites by Darkus_Shadow, Princess-Phoenix, shaderr31, Molfang62, CarmaNekko, EduarPokeN, Larryturbo, TyranitarDark and Anarlaurendil
+    * Sources:
+        * Normal: https://www.deviantart.com/darkusshadow/art/Gen-9-Paldea-Pokemon-Overworld-Sprites-967776690
+        * Shiny: https://www.deviantart.com/darkusshadow/art/SHINY-Gen-9-Paldea-Pokemon-Overworld-Sprites-967779547
+* Added missing overworld sprites by @Liamjd14 in [#5336](https://github.com/rh-hideout/pokeemerald-expansion/pull/5336)
+    * **New Sprites:**
+        * Oricorio Pom Pom/Pa'U/Sensu, Zygarde 10%/Complete and Original Color Magearna
+            * Credits to: Princess-Phoenix, Larryturbo, Kidkatt, Zender1752 and SageDeoxys.
+        * Black/White Kyurem
+            * Credits to: Larryturbo.
+        * Shaymin Sky and Therian Tornadus/Thundurus/Landorus
+            * Credits to: @Liamjd14
+    * **Using their base form's sprites**
+        * Totem Raticate/Mimikyu/Marowak and Partner Pikachu/Eevee
+* Added Added asymmetrical overworld sprites by @Liamjd14 in [#5336](https://github.com/rh-hideout/pokeemerald-expansion/pull/5336)
+    * Slowbro (Galarian), Tinkatink, Tinkatuff, Tinkaton and Scovillain
+    * Enabled in `gSpeciesInfo` by @Liamjd14 in [#5385](https://github.com/rh-hideout/pokeemerald-expansion/pull/5385)
+### Changed
+* Improved Garganacl and Naclstack battle sprites by using the ones from @CyanSMP64's repo by @kittenchilly in [#5142](https://github.com/rh-hideout/pokeemerald-expansion/pull/5142)
+* Improved both shiny Indeedee by @Cafeei in [#5285](https://github.com/rh-hideout/pokeemerald-expansion/pull/5285)
+* Shiny Combusken now uses its Gen8+ palette by @Cafeei in [#5333](https://github.com/rh-hideout/pokeemerald-expansion/pull/5333)
+### Fixed
+* Reenabled unused female Indeedee overworld sprite by @Cafeei in [#5285](https://github.com/rh-hideout/pokeemerald-expansion/pull/5285)
+* Fixed G-Max Corviknight and Centiskorch's expanded names by @PhallenTree in [#5296](https://github.com/rh-hideout/pokeemerald-expansion/pull/5296)
+* Fixed G-Max Cinderace back sprite by @hedara90 in [#5295](https://github.com/rh-hideout/pokeemerald-expansion/pull/5295)
+* Fixed Shiny Mothim' by @Cafeei in [#5333](https://github.com/rh-hideout/pokeemerald-expansion/pull/5333)
+* Fixed multiple battle sprite issues by @kittenchilly in [#5142](https://github.com/rh-hideout/pokeemerald-expansion/pull/5142)
+    * **Sprite issues:**
+        * Bombirdier, Mega Absol/Aerodactyl/Latias/Latios/Salamence, Orthworm and Veluza.
+    * **Shiny issues:**
+        * Bombirdier, Kilowattrel, Landorus, Magearna, Mega Diancie/Medicham, Galarian Ponyta, Shroodle, Spidops and Wattrel.
+* Fixed multiple overworld Pokémon sprites - Part 1 by @Cafeei in [#5241](https://github.com/rh-hideout/pokeemerald-expansion/pull/5241)
+    * **"Blinking pixels":**
+        * Dwebble, Krookodile, Servine, Throh and Vulpix.
+    * **Shiny Palettes**
+        * Crustle, Excadrill, Lillipup, Serperior, Servine, Sigilyph, Swoobat, Tranquil and Venipede.
+    * **Misc fixes:**
+        * Archen, Basculin, Blitzle, Crustle, Escavalier, Krokorok, Krookodile, Sawsbuck, secondary, Serperior, Snivy, Throh, Woobat, Zebstrika
+* Fixed multiple overworld Pokémon sprites - Part 2 by @Cafeei in [#5333](https://github.com/rh-hideout/pokeemerald-expansion/pull/5333)
+    * **Palette Fixes:**
+        * Shiny Riolu/Snover, Oshawott, Kabutops, Shieldon, Kingler and Groudon.
+    * **Fixed "Blinking pixels":**
+        * Abomasnow, Aggron, Alakazam, Ariados, Articuno, Azumarill, Barboach, Bayleef, Bibarel, Blastoise, Celebi, Charmeleon, Cherrim, Chinchou, Cloyster, Corphish, Corsola, Crawdaunt, Cubone, Dewott, Doduo, Dusknoir, Electabuzz, Espeon, Exeggcute, Farfetch'd, Feraligatr, Flaafy, Flareon, Floatzel, Furret, Gastly, Girafarig, Giratina, Gligar, Gloom, Golbat, Grumpig, Hariyama, Heatran (just reduced), Hoppip, Jolteon, Jumpluff, Kricketot, Larvitar, Leafeon, Lileep, Lumineon, Luxio, Luxray, Machamp, Magneton, Mantine, Mantyke, Marowak, Meowth, Mesprit, Mew, Mewtwo, Mime Jr, Moltres, Numel, Oshawott, Phione, Pinsir, Politoed, Porygon-Z, Probopass, Quilava, Qwilfish, Rampardos, Rapidash, Regirock, Sceptile, Scizor, Seel, Shieldon, Shiftry, Slowking, Smoochum, Sneasel, Spheal, Steelix, Sudowoodo, Suicune, Swellow, Swinub, Tentacruel, Togekiss, Togepi, Vaporeon, Vibrava, Wartortle, Wooper, Yanma, Yanma, Yanmega, Zangoose, Zapdos, Zubat
+    * **Misc. Sprite Fixes**: Dewott, Misdreavus, Oshawott, Torkoal and Victini.
+* Overworld sprite fixes by @Liamjd14 (with help from @hedara90 to solve conflicts) in [#5334](https://github.com/rh-hideout/pokeemerald-expansion/pull/5334)
+    * **Palette Fixes**: Shieldon.
+    * **Misc. Sprite Fixes** Torkoal.
+    * **"Blinking pixels":**
+        * Ambipom, Armaldo, Crawdaunt, Crobat, Donphan, Flaaffy, Flygon, Grovyle, Hoppip, Igglybuff, Illumise, Jumpluff, Ledian, Ledyba, Mamoswine, Mantine, Marshtomp, Meganium, Mightyena, Miltank, Numel, Prinplup, Raikou, Roserade, Skarmory, Skiploom, Spinarak, Staraptor, Stunky, Torkoal, Wooper, Xatu, Yanma
+* Overworld Pokémon sprite changes by @Liamjd14 in [#5336](https://github.com/rh-hideout/pokeemerald-expansion/pull/5336)
+    * **Fixed "blinking pixels":**
+            * Alolan Graveler/Golem/Alolan/Ninetales
+            * Dawn Wings Necrozma
+            * Hisuian Growlithe/Arcanine
+            * Winter Sawsbuck
+    * **Added missing Shiny Palettes**
+        * Calyrex Ice/Shadow Rider, Origin Dialga/Palkia, White-Striped Basculin, Therian Enamorus and Low-Key Toxtricity.
+    * **Removed Gigantamax Low-Key Toxtricity using base Low-Key follower sprites.**
+    * **Fixed Shiny palettes**
+        * Alolan Marowak/Raichu, Eternal Flower Floette, Flabébé (All), Galarian Ponyta/Rapidash
+        * Typhlosion-Hisui follower shiny stomach color wrong - done
+    * **Other sprite/palette fixes**
+        * Alolan Exeggutor/Marowak/Persian/Raichu/Sandshrew, Hisuian Sligoo/Goodra and Winter Sawsbuck.
+## ⚔️ Battle General ⚔️ ##
+### Changed
+* Updated Damage Category icons to match Gen6+ colors by @kittenchilly in [#5080](https://github.com/rh-hideout/pokeemerald-expansion/pull/5080)
+### Fixed
+* Fixed Slateport Battle Tent/Battle Factory issues by @SarnPoke in [#5281](https://github.com/rh-hideout/pokeemerald-expansion/pull/5281)
+    * Choosing the "SWAP" option no longer shows invalid Pokémon ("??????????").
+    * Reloading after choosing "REST" no longer resets the player's challenge party to invalid Pokémon ("??????????").
+* Fixed Starting Status happening Wild Battles from a previous Trainer Battle by @PhallenTree in [#5248](https://github.com/rh-hideout/pokeemerald-expansion/pull/5248)
+* Fixed bugged behavior caused by Z-Moves and disobedience by @hedara90 in [#5245](https://github.com/rh-hideout/pokeemerald-expansion/pull/5245)
+* Fixed Entry Hazards targeting wrong side of the field if the opponent fainted by @PhallenTree in [#5262](https://github.com/rh-hideout/pokeemerald-expansion/pull/5262)
+* Fixed being able to use multiple of the same Gimmick in Double Battles by @AgustinGDLV in [#5235](https://github.com/rh-hideout/pokeemerald-expansion/pull/5235)
+* Fixed Terastallization not granting immunity to Tar Shot by @AlexOn1ine in [#5302](https://github.com/rh-hideout/pokeemerald-expansion/pull/5302)
+* Fixed `Cmd_trainerslidein/out` using the incorrect function by @ghoulslash in [#5326](https://github.com/rh-hideout/pokeemerald-expansion/pull/5326)
+    * Cleanup by @hedara90 in [#5344](https://github.com/rh-hideout/pokeemerald-expansion/pull/5344)
+
+## 🤹 Moves 🤹
+### Added
+* Added Charge's Gen 9 behavior via `B_CHARGE` config by @AlexOn1ine in [#5274](https://github.com/rh-hideout/pokeemerald-expansion/pull/5274)
+* Added Powder's Gen 7+ behavior of not causing damage when under Heavy Rain via `B_POWDER_RAIN` by @PhallenTree in [#5370](https://github.com/rh-hideout/pokeemerald-expansion/pull/5370)
+### Fixed
+* Fixed move descriptions missing periods (Decorate, Collision Course, Electro Drift) by @Pawkkie and Kasen in [#5221](https://github.com/rh-hideout/pokeemerald-expansion/pull/5221)
+* Fixed Confide not being blocked by Crafty Shield interaction by @hedara90 in [#5202](https://github.com/rh-hideout/pokeemerald-expansion/pull/5202)
+* Fixed message for switch out moves by @kittenchilly in [#5258](https://github.com/rh-hideout/pokeemerald-expansion/pull/5258)
+* Fixed Ice Fang's descriptions using the opposite of what they're supposed to do based on `B_USE_FROSTBITE` by @laserXdolphin in [#5273](https://github.com/rh-hideout/pokeemerald-expansion/pull/5273)
+* Fixes to Instruct by @PhallenTree in [#5262](https://github.com/rh-hideout/pokeemerald-expansion/pull/5262)
+    * Fixed Instruct bypassing AtkCanceler checks (Instruct allowed the target to act while asleep, flinched, etc.) and its interaction with First Turn Only moves (Fake Out, First Impression, Mat Block). 
+    * Fixed Instruct's animation using the attacker and target of the called move.
+* Fixed Scale Shot's effect not activating if the opponent fainted before all hits finished by @AlexOn1ine in [#5292](https://github.com/rh-hideout/pokeemerald-expansion/pull/5292)
+* Fixed Round not preserving turn order for non-Round users if there's a switch out at the beginning of the turn by @AlexOn1ine in [#5292](https://github.com/rh-hideout/pokeemerald-expansion/pull/5292)
+* Fixed Max Moves ignoring absorbing abilities (+ test) by @PhallenTree in [#5296](https://github.com/rh-hideout/pokeemerald-expansion/pull/5296)
+* Fixed attack string for Max Moves not being printed if it's blocked by Max Guard by @hedara90 in [#5312](https://github.com/rh-hideout/pokeemerald-expansion/pull/5312)
+* Fixed some Pledge move combo issues by @PhallenTree in [#5330](https://github.com/rh-hideout/pokeemerald-expansion/pull/5330)
+    * Fixed Pledge move combos attempting to be executed multiple times in a turn, causing mons to decrement sleep timer multiple times during the turn or causing infinite loops.
+* Fixed potential issue with custom non-sound moves that use `EFFECT_ATTACK_UP_USER_ALLY` or `EFFECT_PERISH_SONG` being blocked by Soundproof anyway by @AlexOn1ine in [#5301](https://github.com/rh-hideout/pokeemerald-expansion/pull/5301)
+* Fixed Pledge combinations not being absorbed by absorption Abilities (Sap Sipper, Storm Drain, etc.) by @hedara90 in [#5364](https://github.com/rh-hideout/pokeemerald-expansion/pull/5364)
+* Fixed Toxic Thread decreasing speed by 2 stages instead of 1 by @AsparagusEduardo in [#5369](https://github.com/rh-hideout/pokeemerald-expansion/pull/5369)
+* Fixed Destiny Bond not working if the user was fainted by a multi-Hit move's non-first hit by @AlexOn1ine in [#5377](https://github.com/rh-hideout/pokeemerald-expansion/pull/5377)
+* Fixed Powder interactions by @PhallenTree in [#5370](https://github.com/rh-hideout/pokeemerald-expansion/pull/5370)
+    * Fixed Magic Guard not protecting against Powder's secondary damage when using a Fire-type move.
+    * Fixed Fire/Water Pledge combination being cancelled by Powder.
+    * Fixed Fire Z-Moves not playing their animations and not granting their secondary effects when the user is under Powder's effect
+* Fixed After You/Shell Trap not updating battlers' actions correctly by @PhallenTree in [#5384](https://github.com/rh-hideout/pokeemerald-expansion/pull/5384)
+
+## 🎭 Abilities 🎭
+### Fixed
+* Fixed weather abilities not activating when Cloud Nine user leaves the field by @AlexOn1ine in [#5209](https://github.com/rh-hideout/pokeemerald-expansion/pull/5209)
+* Fixed missing `break` for Poison Puppeteer's code by @u8-Salem in [#5243](https://github.com/rh-hideout/pokeemerald-expansion/pull/5243)
+* Fixed Pokémon with Purifying Salt being poisoned by Toxic Spikes by @AlexOn1ine in [#5252](https://github.com/rh-hideout/pokeemerald-expansion/pull/5252)
+* Fixed Parental Bond not affecting Snore by @hedara90 in [#5264](https://github.com/rh-hideout/pokeemerald-expansion/pull/5264)
+* Fixed Tera Shift's description by @AsparagusEduardo in [#5351](https://github.com/rh-hideout/pokeemerald-expansion/pull/5351)
+
+## 🧶 Items 🧶
+### Fixed
+* Fixed berries missing their timing after passive damage by @AlexOn1ine in [#5300](https://github.com/rh-hideout/pokeemerald-expansion/pull/5300)
+* Fixed Micle Berry not increasing accuracy on the next turn by @AlexOn1ine in [#5358](https://github.com/rh-hideout/pokeemerald-expansion/pull/5358)
+
+## 🤖 Battle AI 🤖
+### Changed
+* AI is encouraged to use "always crit" moves on partner with Anger Point by @SarnPoke in [#5244](https://github.com/rh-hideout/pokeemerald-expansion/pull/5244)
+### Fixed
+* Fixed AI not seeing the power of Max Moves by @AlexOn1ine in [#5299](https://github.com/rh-hideout/pokeemerald-expansion/pull/5299)
+* Fixed minor wrong order in `AI_CalcDamage` that made Nature Power not be considered for Z-Moves by @AlexOn1ine in [#5155](https://github.com/rh-hideout/pokeemerald-expansion/pull/5155)
+* Fixed AI not considering Tera Blast/Tera Storm by @AlexOn1ine in [#5155](https://github.com/rh-hideout/pokeemerald-expansion/pull/5155)
+* Fixed `AI_IsMoveEffectInPlus` reading the incorrect stat for secondary effects that reduce stats by 2 stages by @ghoulslash and @Pawkkie in [#5366](https://github.com/rh-hideout/pokeemerald-expansion/pull/5366)
+
+## 🧹 Other Cleanup 🧹
+### Changed
+* Remove unused `BattleScript_WindPowerActivatesEnd2` signature by @u8-Salem in [#5257](https://github.com/rh-hideout/pokeemerald-expansion/pull/5257)
+* Replaced all usages of tabs in C files with spaces by @hedara90 in [#5261](https://github.com/rh-hideout/pokeemerald-expansion/pull/5261)
+* Fixed missing `break`s in two `ENDTURN` cases by @ghoulslash in [#5350](https://github.com/rh-hideout/pokeemerald-expansion/pull/5350)
+* `ShouldSwitchIfWonderGuard` cleanup by @Pawkkie in [#5383](https://github.com/rh-hideout/pokeemerald-expansion/pull/5383)
+
+## 🧪 Test Runner 🧪
+### Added
+* Added missing Adaptability, Aerilate, Aftermath tests by @kittenchilly in [#5242](https://github.com/rh-hideout/pokeemerald-expansion/pull/5242)
+* Added missing Disguise tests by @hedara90 in [#5249](https://github.com/rh-hideout/pokeemerald-expansion/pull/5249)
+* Added some missing Instruct tests by @PhallenTree in [#5262](https://github.com/rh-hideout/pokeemerald-expansion/pull/5262)
+* Added missing Powder tests by @PhallenTree in [#5370](https://github.com/rh-hideout/pokeemerald-expansion/pull/5370)
+* Added `ShouldSwitchIfWonderGuard` AI tests by @Pawkkie in [#5383](https://github.com/rh-hideout/pokeemerald-expansion/pull/5383)
+### Changed
+* Moved `ASSUME`s to inside `GIVEN` blocks to prevent them from being added correctly to the totals in the test summary by @AsparagusEduardo in [#5308](https://github.com/rh-hideout/pokeemerald-expansion/pull/5308)
+
+## 📚 Documentation 📚
+### Fixed
+* Fixed test system documentation saying that `make check TESTS="Spikes"` could be done with single quotes instead of double quotes by @AsparagusEduardo in [#5266](https://github.com/rh-hideout/pokeemerald-expansion/pull/5266)
+
+## 📦 Branch Synchronisation 📦
+### pret's base pokeemerald
+* N/A
+### merrp/aarant's followers
+* Merrp merge (September 9th) by @AsparagusEduardo in [#5359](https://github.com/rh-hideout/pokeemerald-expansion/pull/5359)
+    * aarant#40 (discarded, as it was already part of the expansion)
+    * New features:
+        * [Static OW pokemon now bob while walking in place](https://github.com/rh-hideout/pokeemerald-expansion/commit/839cf2e79012e0fc9159af5ab9e6a497e86bbfa4)
+            * Toggled by `OW_FOLLOWERS_BOBBING`.
+        * [Added `OW_MON_WANDER_WALK` config option](https://github.com/rh-hideout/pokeemerald-expansion/commit/42d9f24c8472a67d742d9d9da106480c84514336)
+            * If true, OW pokemon with `MOVEMENT_TYPE_WANDER*` will walk-in-place in between steps.
+
+## New Contributors
+* @laserXdolphin made their first contribution in [#5273](https://github.com/rh-hideout/pokeemerald-expansion/pull/5273)
+* @Liamjd14 made their first contribution in [#5304](https://github.com/rh-hideout/pokeemerald-expansion/pull/5304)
+
+**Full Changelog**: https://github.com/rh-hideout/pokeemerald-expansion/compare/expansion/1.9.1...expansion/1.9.2
+<!--Last PR: 5390-->
--- a/docs/changelogs/template.md
+++ b/docs/changelogs/template.md
@ -10,7 +10,7 @@
 📜 = Uses a migration script.
 * N/A

-## 💥 *Softlock/Crash fixes* 💥
+## 💥 *Hardlock/Softlock/Crash/Compiling fixes* 💥
 * N/A

 ## 🧬 General 🧬
@ -122,6 +122,14 @@
 ### Fixed
 * N/A

+## 📚 Documentation 📚
+### Added
+* N/A
+### Changed
+* N/A
+### Fixed
+* N/A
+
 ## 📦 Branch Synchronisation 📦
 ### pret's base pokeemerald
 * N/A
@ -135,3 +143,4 @@
 **Full Changelog**: https://github.com/rh-hideout/pokeemerald-expansion/compare/expansion/1.Y.Z...expansion/1.Y.Z

 <!--Last PR: ____-->
+<!--Used to keep track of the last PR merged in case new ones come in before the changelog is done.-->
--- a/gflib/text.c
+++ b/gflib/text.c
@ -932,8 +932,9 @@ bool32 TextPrinterWaitAutoMode(struct TextPrinter *textPrinter)
 {
    struct TextPrinterSubStruct *subStruct = (struct TextPrinterSubStruct *)(&textPrinter->subStructFields);

-    if (subStruct->autoScrollDelay == 49)
+    if (subStruct->autoScrollDelay == NUM_FRAMES_AUTO_SCROLL_DELAY)
    {
+        subStruct->autoScrollDelay = 0;
        return TRUE;
    }
    else
@ -943,21 +944,29 @@ bool32 TextPrinterWaitAutoMode(struct TextPrinter *textPrinter)
    }
 }

+void SetResultWithButtonPress(bool32 *result)
+{
+    if (JOY_NEW(A_BUTTON | B_BUTTON))
+    {
+        *result = TRUE;
+        PlaySE(SE_SELECT);
+    }
+}
+
 bool32 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter)
 {
    bool32 result = FALSE;
-    if (gTextFlags.autoScroll != 0)
+    if (gTextFlags.autoScroll != 0 || AUTO_SCROLL_TEXT)
    {
        result = TextPrinterWaitAutoMode(textPrinter);
+
+        if (AUTO_SCROLL_TEXT)
+            SetResultWithButtonPress(&result);
    }
    else
    {
        TextPrinterDrawDownArrow(textPrinter);
-        if (JOY_NEW(A_BUTTON | B_BUTTON))
-        {
-            result = TRUE;
-            PlaySE(SE_SELECT);
-        }
+        SetResultWithButtonPress(&result);
    }
    return result;
 }
@ -965,17 +974,16 @@ bool32 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter)
 bool32 TextPrinterWait(struct TextPrinter *textPrinter)
 {
    bool32 result = FALSE;
-    if (gTextFlags.autoScroll != 0)
+    if (gTextFlags.autoScroll != 0 || AUTO_SCROLL_TEXT)
    {
        result = TextPrinterWaitAutoMode(textPrinter);
+
+        if (AUTO_SCROLL_TEXT)
+            SetResultWithButtonPress(&result);
    }
    else
    {
-        if (JOY_NEW(A_BUTTON | B_BUTTON))
-        {
-            result = TRUE;
-            PlaySE(SE_SELECT);
-        }
+        SetResultWithButtonPress(&result);
    }
    return result;
 }
--- a/graphics/battle_anims/sprites/spirit_shackle_arrow.png
+++ b/graphics/battle_anims/sprites/spirit_shackle_arrow.png
--- a/graphics/pokemon/arcanine/hisuian/overworld.png
+++ b/graphics/pokemon/arcanine/hisuian/overworld.png
--- a/graphics/pokemon/basculin/white_striped/overworld_shiny.pal
+++ b/graphics/pokemon/basculin/white_striped/overworld_shiny.pal
@ -6,13 +6,13 @@ JASC-PAL
 255 255 255
 172 197 255
 0 0 0
-32 139 65
+80 112 40
 16 98 41
 123 172 172
 172 222 230
-41 189 90
+120 168 56
 74 74 74
-90 90 90
+64 80 80
 57 74 82
 123 148 197
 123 148 189
--- a/graphics/pokemon/calyrex/ice_rider/overworld.png
+++ b/graphics/pokemon/calyrex/ice_rider/overworld.png
--- a/graphics/pokemon/calyrex/ice_rider/overworld_shiny.pal
+++ b/graphics/pokemon/calyrex/ice_rider/overworld_shiny.pal
@ -7,13 +7,13 @@ JASC-PAL
 0 37 32
 146 175 206
 183 206 229
-0 75 65
+0 88 72
 52 69 167
-66 119 111
+0 112 96
 100 100 100
 242 242 242
 64 83 103
-216 215 206
+208 200 144
 0 0 0
-169 160 155
+168 136 88
 191 191 191
--- a/graphics/pokemon/calyrex/shadow_rider/overworld.png
+++ b/graphics/pokemon/calyrex/shadow_rider/overworld.png
--- a/graphics/pokemon/calyrex/shadow_rider/overworld_normal.pal
+++ b/graphics/pokemon/calyrex/shadow_rider/overworld_normal.pal
@ -8,7 +8,7 @@ JASC-PAL
 246 242 246
 65 64 74
 32 36 65
-49 68 164
+0 75 65
 213 210 205
 0 32 24
 148 174 205
--- a/graphics/pokemon/calyrex/shadow_rider/overworld_shiny.pal
+++ b/graphics/pokemon/calyrex/shadow_rider/overworld_shiny.pal
@ -8,12 +8,12 @@ JASC-PAL
 246 242 246
 65 64 74
 32 36 65
-49 68 164
-213 210 205
+0 88 72
+208 200 144
 0 32 24
 148 174 205
 74 52 148
-172 161 156
+168 136 88
 98 101 98
 24 16 65
 49 36 115
--- a/graphics/pokemon/dialga/origin/overworld_shiny.pal
+++ b/graphics/pokemon/dialga/origin/overworld_shiny.pal
@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-98 182 49
+0 40 128
 0 0 0
 65 129 255
 189 32 16
 246 80 65
 57 121 180
-98 121 139
-32 64 106
-16 56 90
-24 64 106
+156 172 115
+8 106 123
+8 106 123
+8 148 156
 189 202 222
-32 89 148
-139 161 180
-156 210 246
+8 148 156
+115 189 156
+156 246 148
 16 16 16
 24 40 49
--- a/graphics/pokemon/enamorus/overworld_shiny.pal
+++ b/graphics/pokemon/enamorus/overworld_shiny.pal
@ -4,16 +4,16 @@ JASC-PAL
 41 165 49
 0 0 0
 164 133 41
-230 117 156
-189 60 90
-172 72 82
+230 131 164
+255 90 0
+189 82 106
 238 234 255
 32 36 32
 57 60 57
 205 202 222
-148 32 24
+164 24 24
 255 198 57
 16 16 16
-246 85 139
+255 139 238
 82 80 90
 115 48 57
--- a/graphics/pokemon/enamorus/therian/overworld.png
+++ b/graphics/pokemon/enamorus/therian/overworld.png
--- a/graphics/pokemon/enamorus/therian/overworld_shiny.pal
+++ b/graphics/pokemon/enamorus/therian/overworld_shiny.pal
@ -6,14 +6,14 @@ JASC-PAL
 118 50 58
 232 232 248
 200 200 216
-224 116 156
-174 74 87
+213 106 156
+213 65 57
 16 16 16
 243 46 46
-199 46 41
+74 74 74
 147 33 30
-243 84 143
-187 62 94
+238 131 230
+203 0 128
 247 238 76
 255 197 60
 0 0 0
--- a/graphics/pokemon/exeggutor/alolan/overworld.png
+++ b/graphics/pokemon/exeggutor/alolan/overworld.png
--- a/graphics/pokemon/flabebe/blue_flower/overworld.png
+++ b/graphics/pokemon/flabebe/blue_flower/overworld.png
--- a/graphics/pokemon/flabebe/blue_flower/overworld_shiny.pal
+++ b/graphics/pokemon/flabebe/blue_flower/overworld_shiny.pal
@ -12,8 +12,8 @@ JASC-PAL
 221 181 0
 243 86 75
 21 44 77
-69 66 127
+31 95 31
 70 144 248
-154 149 228
+184 216 153
 96 90 188
 0 0 0
--- a/graphics/pokemon/flabebe/orange_flower/overworld.png
+++ b/graphics/pokemon/flabebe/orange_flower/overworld.png
--- a/graphics/pokemon/flabebe/orange_flower/overworld_shiny.pal
+++ b/graphics/pokemon/flabebe/orange_flower/overworld_shiny.pal
@ -12,8 +12,8 @@ JASC-PAL
 221 181 0
 243 86 75
 171 61 1
-69 66 127
+31 95 31
 253 145 59
-154 149 228
+184 216 153
 96 90 188
 0 0 0
--- a/graphics/pokemon/flabebe/overworld.png
+++ b/graphics/pokemon/flabebe/overworld.png
--- a/graphics/pokemon/flabebe/overworld_shiny.pal
+++ b/graphics/pokemon/flabebe/overworld_shiny.pal
@ -12,8 +12,8 @@ JASC-PAL
 221 181 0
 243 86 75
 107 36 33
-96 90 188
-154 149 228
+31 95 31
+184 216 153
 96 90 188
 0 0 0
 0 0 0
--- a/graphics/pokemon/flabebe/white_flower/overworld.png
+++ b/graphics/pokemon/flabebe/white_flower/overworld.png
--- a/graphics/pokemon/flabebe/white_flower/overworld_shiny.pal
+++ b/graphics/pokemon/flabebe/white_flower/overworld_shiny.pal
@ -11,8 +11,8 @@ JASC-PAL
 232 153 2
 221 181 0
 243 86 75
-69 66 127
-154 149 228
+31 95 31
+184 216 153
 96 90 188
 0 0 0
 0 0 0
--- a/graphics/pokemon/flabebe/yellow_flower/overworld.png
+++ b/graphics/pokemon/flabebe/yellow_flower/overworld.png
--- a/graphics/pokemon/flabebe/yellow_flower/overworld_shiny.pal
+++ b/graphics/pokemon/flabebe/yellow_flower/overworld_shiny.pal
@ -12,8 +12,8 @@ JASC-PAL
 221 181 0
 243 86 75
 148 81 2
-69 66 127
+31 95 31
 230 206 10
-154 149 228
+184 216 153
 96 90 188
 0 0 0
--- a/graphics/pokemon/floette/eternal_flower/overworld_shiny.pal
+++ b/graphics/pokemon/floette/eternal_flower/overworld_shiny.pal
@ -9,8 +9,8 @@ JASC-PAL
 255 93 135
 59 55 55
 205 39 81
-25 105 88
-12 180 149
+127 63 79
+207 143 159
 251 254 255
 99 113 115
 197 199 199
--- a/graphics/pokemon/golem/alolan/overworld.png
+++ b/graphics/pokemon/golem/alolan/overworld.png
--- a/graphics/pokemon/goodra/hisuian/overworld.png
+++ b/graphics/pokemon/goodra/hisuian/overworld.png
--- a/graphics/pokemon/gourgeist/large/overworld.png
+++ b/graphics/pokemon/gourgeist/large/overworld.png
--- a/graphics/pokemon/gourgeist/overworld.png
+++ b/graphics/pokemon/gourgeist/overworld.png
--- a/graphics/pokemon/gourgeist/small/overworld.png
+++ b/graphics/pokemon/gourgeist/small/overworld.png
--- a/graphics/pokemon/gourgeist/super/overworld.png
+++ b/graphics/pokemon/gourgeist/super/overworld.png
--- a/graphics/pokemon/graveler/alolan/overworld.png
+++ b/graphics/pokemon/graveler/alolan/overworld.png
--- a/graphics/pokemon/growlithe/hisuian/overworld.png
+++ b/graphics/pokemon/growlithe/hisuian/overworld.png
--- a/graphics/pokemon/kyurem/black/overworld.png
+++ b/graphics/pokemon/kyurem/black/overworld.png
--- a/graphics/pokemon/kyurem/black/overworld_normal.pal
+++ b/graphics/pokemon/kyurem/black/overworld_normal.pal
@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 18 128
+16 16 16
+40 40 40
+48 48 42
+56 56 56
+72 72 72
+71 86 86
+96 96 96
+248 232 8
+144 136 120
+239 173 74
+72 72 72
+136 152 144
+184 176 152
+179 204 187
+232 232 248
--- a/graphics/pokemon/kyurem/black/overworld_shiny.pal
+++ b/graphics/pokemon/kyurem/black/overworld_shiny.pal
@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+125 146 158
+16 16 16
+40 40 40
+48 48 42
+57 62 66
+72 72 72
+71 86 86
+48 80 56
+240 64 180
+96 128 108
+194 52 146
+72 72 72
+173 228 247
+184 176 152
+122 147 201
+232 232 248
--- a/graphics/pokemon/kyurem/white/overworld.png
+++ b/graphics/pokemon/kyurem/white/overworld.png
--- a/graphics/pokemon/kyurem/white/overworld_normal.pal
+++ b/graphics/pokemon/kyurem/white/overworld_normal.pal
@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+238 27 128
+16 16 16
+48 48 42
+62 62 66
+80 96 96
+96 96 96
+80 96 96
+232 232 248
+236 220 10
+144 136 120
+239 173 74
+136 152 144
+184 176 152
+182 207 190
+196 196 209
+232 232 248
--- a/graphics/pokemon/kyurem/white/overworld_shiny.pal
+++ b/graphics/pokemon/kyurem/white/overworld_shiny.pal
@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+238 27 128
+16 16 16
+48 48 42
+62 62 66
+80 96 96
+48 75 81
+80 96 96
+232 232 248
+237 90 188
+90 115 128
+170 45 128
+122 147 200
+184 176 152
+196 203 240
+196 196 209
+232 232 248
--- a/graphics/pokemon/landorus/therian/overworld.png
+++ b/graphics/pokemon/landorus/therian/overworld.png
--- a/graphics/pokemon/landorus/therian/overworld_normal.pal
+++ b/graphics/pokemon/landorus/therian/overworld_normal.pal
@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+84 86 84
+109 127 139
+237 237 246
+198 198 211
+22 37 14
+142 85 23
+219 152 23
+246 131 142
+87 78 43
+212 99 49
+225 80 74
+38 37 38
+214 195 61
+0 0 0
+0 0 0
--- a/graphics/pokemon/landorus/therian/overworld_shiny.pal
+++ b/graphics/pokemon/landorus/therian/overworld_shiny.pal
@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+103 64 40
+103 128 140
+237 237 246
+160 184 160
+22 37 14
+158 97 23
+248 160 40
+229 89 32
+38 37 38
+158 97 23
+229 89 32
+38 37 38
+214 195 61
+0 0 0
+0 0 0
--- a/graphics/pokemon/lycanroc/overworld.png
+++ b/graphics/pokemon/lycanroc/overworld.png
--- a/graphics/pokemon/lycanroc/overworld_normal.pal
+++ b/graphics/pokemon/lycanroc/overworld_normal.pal
@ -1,12 +1,12 @@
 JASC-PAL
 0100
 16
-255 255 255
+243 18 128
 199 162 141
 184 181 175
 92 170 238
 128 128 128
-88 146 214
+255 255 255
 85 129 197
 141 116 102
 178 98 156
--- a/graphics/pokemon/lycanroc/overworld_shiny.pal
+++ b/graphics/pokemon/lycanroc/overworld_shiny.pal
@ -1,12 +1,12 @@
 JASC-PAL
 0100
 16
-255 255 255
+243 18 128
 136 168 200
 184 181 175
 92 170 238
 128 128 128
-88 146 214
+255 255 240
 85 129 197
 96 120 176
 248 152 136
--- a/graphics/pokemon/magearna/original_color/overworld.png
+++ b/graphics/pokemon/magearna/original_color/overworld.png
--- a/graphics/pokemon/magearna/original_color/overworld_normal.pal
+++ b/graphics/pokemon/magearna/original_color/overworld_normal.pal
@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+49 44 43
+179 74 68
+203 98 96
+179 74 68
+0 0 0
+232 227 162
+203 98 96
+186 177 108
+94 84 82
+70 153 169
+168 161 155
+239 229 115
+231 227 224
+186 177 108
+0 0 0
--- a/graphics/pokemon/magearna/original_color/overworld_shiny.pal
+++ b/graphics/pokemon/magearna/original_color/overworld_shiny.pal
@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+49 44 43
+90 85 84
+216 120 144
+179 74 68
+0 0 0
+206 200 197
+135 129 126
+153 146 143
+105 93 91
+70 153 169
+168 161 155
+232 220 110
+206 200 197
+167 157 71
+0 0 0
--- a/graphics/pokemon/marowak/alolan/overworld.png
+++ b/graphics/pokemon/marowak/alolan/overworld.png
--- a/graphics/pokemon/marowak/alolan/overworld_normal.pal
+++ b/graphics/pokemon/marowak/alolan/overworld_normal.pal
@ -7,13 +7,13 @@ JASC-PAL
 72 72 72
 0 0 0
 216 224 224
-81 51 79
-50 142 66
-211 248 121
+48 48 80
+40 216 176
+160 248 240
 52 35 51
-112 71 82
-4 107 56
-48 189 120
-137 86 133
-170 130 145
+112 64 80
+40 216 176
+24 168 136
+80 72 136
+168 128 144
 172 229 196
--- a/graphics/pokemon/marowak/alolan/overworld_shiny.pal
+++ b/graphics/pokemon/marowak/alolan/overworld_shiny.pal
@ -7,13 +7,13 @@ JASC-PAL
 72 72 72
 0 0 0
 216 224 224
-67 58 109
-50 142 66
-211 248 121
-54 49 81
-67 67 67
-4 107 56
-48 189 120
-101 87 164
-112 112 112
+96 64 136
+40 216 176
+160 248 240
+52 35 51
+40 32 32
+40 216 176
+24 168 136
+136 96 192
+64 48 48
 172 229 196
--- a/graphics/pokemon/necrozma/dawn_wings/overworld.png
+++ b/graphics/pokemon/necrozma/dawn_wings/overworld.png
--- a/graphics/pokemon/ninetales/alolan/overworld.png
+++ b/graphics/pokemon/ninetales/alolan/overworld.png
--- a/graphics/pokemon/ninetales/alolan/overworld_shiny.pal
+++ b/graphics/pokemon/ninetales/alolan/overworld_shiny.pal
@ -2,7 +2,7 @@ JASC-PAL
 0100
 16
 152 208 160
-91 74 138
+112 80 112
 0 0 0
 178 178 219
 230 225 246
--- a/graphics/pokemon/oricorio/pau/overworld.png
+++ b/graphics/pokemon/oricorio/pau/overworld.png
--- a/graphics/pokemon/oricorio/pau/overworld_normal.pal
+++ b/graphics/pokemon/oricorio/pau/overworld_normal.pal
@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+32 32 32
+192 173 154
+252 234 216
+144 128 112
+104 59 68
+239 183 188
+184 142 145
+0 0 0
+191 137 141
+199 132 137
+242 106 141
+135 104 106
+237 243 238
+230 97 131
+255 190 197
--- a/graphics/pokemon/oricorio/pau/overworld_shiny.pal
+++ b/graphics/pokemon/oricorio/pau/overworld_shiny.pal
@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+32 32 32
+223 90 124
+252 152 158
+158 54 72
+104 59 68
+239 183 188
+202 86 116
+0 0 0
+252 152 158
+199 132 137
+254 236 199
+135 104 106
+237 243 238
+220 174 133
+254 236 199
--- a/graphics/pokemon/oricorio/pom_pom/overworld.png
+++ b/graphics/pokemon/oricorio/pom_pom/overworld.png
--- a/graphics/pokemon/oricorio/pom_pom/overworld_normal.pal
+++ b/graphics/pokemon/oricorio/pom_pom/overworld_normal.pal
@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+244 234 66
+175 167 45
+72 58 37
+240 224 112
+161 150 73
+215 201 100
+135 104 106
+105 101 27
+184 142 145
+237 243 238
+87 87 87
+237 183 187
+135 104 106
+255 237 191
--- a/graphics/pokemon/oricorio/pom_pom/overworld_shiny.pal
+++ b/graphics/pokemon/oricorio/pom_pom/overworld_shiny.pal
@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+240 240 240
+207 207 207
+72 65 54
+240 224 112
+161 150 73
+215 201 100
+135 135 135
+135 135 135
+184 142 145
+237 243 238
+87 87 87
+246 190 194
+135 104 106
+255 237 191
--- a/graphics/pokemon/oricorio/sensu/overworld.png
+++ b/graphics/pokemon/oricorio/sensu/overworld.png
--- a/graphics/pokemon/oricorio/sensu/overworld_normal.pal
+++ b/graphics/pokemon/oricorio/sensu/overworld_normal.pal
@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+27 64 78
+210 249 248
+55 97 92
+240 230 248
+0 0 0
+162 232 232
+60 61 86
+169 171 225
+148 148 250
+184 142 145
+122 124 160
+246 190 194
+229 177 181
+135 104 106
+72 58 37
--- a/graphics/pokemon/oricorio/sensu/overworld_shiny.pal
+++ b/graphics/pokemon/oricorio/sensu/overworld_shiny.pal
@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+27 64 78
+131 131 241
+48 58 68
+240 230 248
+0 0 0
+148 148 250
+48 58 68
+169 197 225
+148 209 250
+184 142 145
+122 147 160
+246 190 194
+229 177 181
+135 104 106
+72 58 37
--- a/graphics/pokemon/palkia/origin/overworld.png
+++ b/graphics/pokemon/palkia/origin/overworld.png
--- a/graphics/pokemon/palkia/origin/overworld_normal.pal
+++ b/graphics/pokemon/palkia/origin/overworld_normal.pal
@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-32 97 0
-0 0 0
-246 80 65
-172 161 180
-255 238 238
-246 161 156
-131 121 148
+115 197 164
+72 76 80
+248 248 248
+176 184 192
+200 216 232
+120 136 144
+136 120 144
 16 16 16
-197 190 213
-246 194 189
-164 80 164
-205 137 197
-106 97 24
-222 218 246
-65 72 74
-82 80 90
+208 192 216
+232 216 248
+200 136 192
+240 80 64
+240 160 152
+232 216 248
+160 80 160
+104 96 24
--- a/graphics/pokemon/palkia/origin/overworld_shiny.pal
+++ b/graphics/pokemon/palkia/origin/overworld_shiny.pal
@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-32 97 0
-0 0 0
-246 80 65
-172 161 180
-255 238 238
-246 161 156
-131 121 148
+115 197 164
+72 76 80
+248 248 248
+191 175 192
+228 193 232
+137 125 144
+164 120 144
 16 16 16
-197 190 213
-246 194 189
-164 80 164
-205 137 197
-106 97 24
-222 218 246
-65 72 74
-82 80 90
+217 183 216
+240 193 248
+224 128 186
+240 80 64
+240 160 152
+251 227 225
+164 120 144
+104 96 24
--- a/graphics/pokemon/persian/alolan/overworld.png
+++ b/graphics/pokemon/persian/alolan/overworld.png
--- a/graphics/pokemon/ponyta/galarian/overworld.png
+++ b/graphics/pokemon/ponyta/galarian/overworld.png
--- a/graphics/pokemon/ponyta/galarian/overworld_normal.pal
+++ b/graphics/pokemon/ponyta/galarian/overworld_normal.pal
@ -10,10 +10,10 @@ JASC-PAL
 65 113 106
 213 153 213
 189 186 189
-246 226 172
+72 200 232
 238 234 255
 0 0 0
 106 222 222
 115 113 65
-230 186 230
+48 152 168
 246 242 222
--- a/graphics/pokemon/ponyta/galarian/overworld_shiny.pal
+++ b/graphics/pokemon/ponyta/galarian/overworld_shiny.pal
@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-200 144 48
+199 171 123
 131 121 90
 32 32 32
 192 216 200
-240 200 80
-66 149 97
-248 240 160
+240 219 158
+48 152 168
+247 244 203
 189 186 189
-71 180 150
+72 200 232
 238 234 255
 0 0 0
-128 248 176
-72 88 72
-229 218 105
+106 222 222
+16 16 16
+48 152 168
 232 248 240
--- a/graphics/pokemon/pumpkaboo/large/overworld.png
+++ b/graphics/pokemon/pumpkaboo/large/overworld.png
--- a/graphics/pokemon/pumpkaboo/overworld.png
+++ b/graphics/pokemon/pumpkaboo/overworld.png
--- a/graphics/pokemon/pumpkaboo/small/overworld.png
+++ b/graphics/pokemon/pumpkaboo/small/overworld.png
--- a/graphics/pokemon/pumpkaboo/super/overworld.png
+++ b/graphics/pokemon/pumpkaboo/super/overworld.png
--- a/graphics/pokemon/raichu/alolan/overworld_shiny.pal
+++ b/graphics/pokemon/raichu/alolan/overworld_shiny.pal
@ -2,16 +2,16 @@ JASC-PAL
 0100
 16
 152 208 160
-112 105 18
-240 225 38
+144 88 40
+248 176 72
 0 0 0
-81 54 41
-150 141 24
+168 104 64
+112 40 40
 151 117 86
 102 68 37
-123 87 56
+136 72 56
 112 72 40
-255 239 225
+232 216 176
 44 29 27
 78 201 201
 204 188 174
--- a/graphics/pokemon/rapidash/galarian/overworld.png
+++ b/graphics/pokemon/rapidash/galarian/overworld.png
--- a/graphics/pokemon/rapidash/galarian/overworld_shiny.pal
+++ b/graphics/pokemon/rapidash/galarian/overworld_shiny.pal
@ -4,16 +4,16 @@ JASC-PAL
 152 208 160
 18 2 31
 0 24 96
-71 113 111
-107 220 217
-167 235 232
+32 128 120
+56 192 168
+128 224 200
 62 62 62
-176 144 32
+176 160 104
 245 243 220
-237 237 137
+224 220 175
 255 255 255
 0 0 0
-233 217 173
-248 248 208
+224 220 175
+247 247 228
 232 232 248
 230 223 160
--- a/graphics/pokemon/sandshrew/alolan/overworld.png
+++ b/graphics/pokemon/sandshrew/alolan/overworld.png
--- a/graphics/pokemon/sawsbuck/winter/overworld.png
+++ b/graphics/pokemon/sawsbuck/winter/overworld.png
--- a/graphics/pokemon/scovillain/overworld.png
+++ b/graphics/pokemon/scovillain/overworld.png
--- a/graphics/pokemon/shaymin/sky/overworld.png
+++ b/graphics/pokemon/shaymin/sky/overworld.png
--- a/graphics/pokemon/shaymin/sky/overworld_normal.pal
+++ b/graphics/pokemon/shaymin/sky/overworld_normal.pal
@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+88 88 112
+176 224 96
+120 168 48
+240 192 0
+240 128 168
+128 128 152
+184 56 56
+248 40 48
+48 152 72
+232 232 248
+168 168 208
+64 64 64
+104 128 0
+40 88 56
+0 0 0
--- a/graphics/pokemon/shaymin/sky/overworld_shiny.pal
+++ b/graphics/pokemon/shaymin/sky/overworld_shiny.pal
@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+88 88 112
+136 208 192
+80 168 152
+240 192 0
+240 128 168
+128 128 152
+184 56 56
+248 40 48
+48 152 72
+232 232 248
+168 168 208
+64 64 64
+104 128 0
+56 104 96
+0 0 0
--- a/Show More
+++ b/Show More