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

data/battle_anim_scripts.s

@@ -17630,9 +17630,30 @@ Move_MALIGNANT_CHAIN::
 	waitforvisualfinish
 	end
 
+Move_POPULATION_BOMB::
+	loadspritegfx ANIM_TAG_CUT
+	monbg ANIM_TARGET
+	setalpha 12, 8
+	playsewithpan SE_M_CUT, SOUND_PAN_TARGET
+	createvisualtask AnimTask_RandomBool, 2
+	jumpretfalse PopulationBombSliceRight
+	jumprettrue PopulationBombSliceLeft
+PopulationBombSliceRight:
+	createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0
+	goto PopulationBombContinue
+PopulationBombSliceLeft:
+	createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 1
+PopulationBombContinue:
+	delay 5
+	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1
+	waitforvisualfinish
+	clearmonbg ANIM_TARGET
+	blendoff
+	waitforvisualfinish
+	end
+
 Move_TERA_BLAST::
 Move_ORDER_UP::
-Move_POPULATION_BOMB::
 Move_GLAIVE_RUSH::
 Move_REVIVAL_BLESSING::
 Move_SALT_CURE::

data/battle_scripts_1.s

@@ -928,19 +928,10 @@ BattleScript_BothCanNoLongerEscape::
 	return
 
 BattleScript_EffectHyperspaceFury::
-	jumpifspecies BS_ATTACKER, SPECIES_HOOPA_UNBOUND, BattleScript_EffectHyperspaceFuryUnbound
+	jumpifspecies BS_ATTACKER, SPECIES_HOOPA_UNBOUND, BattleScript_EffectHit
 	jumpifspecies BS_ATTACKER, SPECIES_HOOPA_CONFINED, BattleScript_ButHoopaCantUseIt
 	goto BattleScript_PokemonCantUseTheMove
 
-BattleScript_EffectHyperspaceFuryUnbound::
-	attackcanceler
-	accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
-	attackstring
-	pause B_WAIT_TIME_LONG
-	ppreduce
-	seteffectprimary MOVE_EFFECT_FEINT
-	goto BattleScript_HitFromCritCalc
-
 BattleScript_ButHoopaCantUseIt:
 	printstring STRINGID_BUTHOOPACANTUSEIT
 	waitmessage B_WAIT_TIME_LONG
@@ -1766,6 +1757,8 @@ BattleScript_EffectInstruct::
 	tryinstruct BattleScript_ButItFailed
 	attackanimation
 	waitanimation
+	copybyte gBattlerAttacker, gBattlerTarget
+	copybyte gBattlerTarget, gEffectBattler
 	printstring STRINGID_USEDINSTRUCTEDMOVE
 	waitmessage B_WAIT_TIME_LONG
 	setbyte sB_ANIM_TURN, 0

docs/how_to_testing_system.md

@@ -4,9 +4,9 @@
 To run all the tests use:
 `make check -j`
 To run specific tests, e.g. Spikes ones, use:
-`make check TESTS='Spikes'`
+`make check TESTS="Spikes"`
 To build a ROM (pokemerald-test.elf) that can be opened in mgba to view specific tests, e.g. Spikes ones, use:
-`make pokeemerald-test.elf TESTS='Spikes'`
+`make pokeemerald-test.elf TESTS="Spikes"`
 
 ## How to Write Tests
 Manually testing a battle mechanic often follows this pattern:
@@ -54,7 +54,7 @@ The `ASSUMPTIONS` block documents that Stun Spore has `EFFECT_PARALYZE`.
 If Stun Spore did not have that effect it would cause the tests in the file to be skipped. We write our tests like this so that hackers can change the effects of moves without causing tests to fail.
 
 `SINGLE_BATTLE_TEST` defines the name of the test. Related tests should start with the same prefix, e.g. Stun Spore tests should start with "Stun Spore", this allows just the Stun Spore-related tests to be run with:
-`make check TESTS='Stun Spore'`
+`make check TESTS="Stun Spore"`
 
 `GIVEN` initializes the parties, `PLAYER` and `OPPONENT` add a Pokémon to their respective parties. They can both accept a block which further customizes the Pokémon's stats, moves, item, ability, etc.
 

docs/mmbn_style_names.md

@@ -0,0 +1,300 @@
+# Megaman Battle Network Style Names
+
+Prior to 1.10, names in expansion that were too long for the game's UIs were truncated to fit using the naming conventions from the [Megaman Battle Network](<https://www.therockmanexezone.com/wiki/The_Rockman_EXE_Zone_Wiki>) series.
+
+These were removed as part of https://github.com/rh-hideout/pokeemerald-expansion/pull/5240. They are stored here for users that may want to refer back to them or restore them.
+
+# Table
+
+Attribute | MMBN | Official
+-- | -- | --
+Item | PewtrCrnches | Pewter Crunchies
+Item | RageCandyBar | Rage Candy Bar
+Item | LumioseGlete | Lumiose Galette
+Item | ShalourSable | Shalour Sable
+Item | HealthFeather | Health Feather
+Item | MuscleFeather | Muscle Feather
+Item | ResistFeather | Resist Feather
+Item | GeniusFeather | Genius Feather
+Item | CleverFeather | Clever Feather
+Item | SwiftFeather | Swift Feather
+Item | AbilityCapsle | Ability Capsule
+Item | AbilityPatch | Ability Patch
+Item | AbilityPatches | Ability Patches
+Item | Exp.Candy XS | Exp. Candy XS
+Item | Exp.Candies XS | Exp. Candies XS
+Item | Exp.Candy S | Exp. Candy S
+Item | Exp.Candies S | Exp. Candies S
+Item | Exp.Candy M | Exp. Candy M
+Item | Exp.Candies M | Exp. Candies M
+Item | Exp.Candy L | Exp. Candy L
+Item | Exp.Candies L | Exp. Candies L
+Item | Exp.Candy XL | Exp. Candy XL
+Item | Exp.Candies XL | Exp. Candies XL
+Item | DynamaxCandy | Dynamax Candy
+Item | DynamaxCandies | Dynamax Candies
+Item | MaxMushrooms | Max Mushrooms
+Item | GoldBottlCap | Gold Bottle Cap
+Item | PrettyFeather | Pretty Feather
+Item | StrngeSouvnr | Strange Souvenir
+Item | FosslzedBird | Fossilized Bird
+Item | FosslzedFish | Fossilized Fish
+Item | FosslzedFishes | Fossilized Fishes
+Item | FosslzedDrke | Fossilized Drake
+Item | FosslzedDino | Fossilized Dino
+Item | SurprseMulch | Surprise Mulch
+Item | YellwApricorn | Yellow Apricorn
+Item | GreenApricorn | Green Apricorn
+Item | WhiteApricorn | White Apricorn
+Item | BlackApricorn | Black Apricorn
+Item | WishingPiece | Wishing Piece
+Item | GalaricaTwig | Galarica Twig
+Item | GalaricaCuff | Galarica Cuff
+Item | GalrcaWreath | Galarica Wreath
+Item | GalrcaWreathes | Galarica Wreathes
+Item | StrwbrySweet | Strawberry Sweet
+Item | ElectrcMemory | Electric Memory
+Item | ElectrcMemories | Electric Memories
+Item | FightngMemory | Fighting Memory
+Item | FightngMemories | Fighting Memories
+Item | PsychicMemory | Psychic Memory
+Item | PsychicMemories | Psychic Memories
+Item | RustedSword | Rusted Sword
+Item | RustedShield | Rusted Shield
+Item | CharizarditeX | Charizardite X
+Item | CharizarditeY | Charizardite Y
+Item | U-Necrozium Z | Ultranecrozium Z
+Item | DeepSeaScale | Deep Sea Scale
+Item | DeepSeaTooth | Deep Sea Tooth
+Item | Never-MeltIce | Never-Melt Ice
+Item | WeaknssPolicy | Weakness Policy
+Item | WeaknssPolicies | Weakness Policies
+Item | SafetyGoggles | Safety Goggles
+Item | AdrenalineOrb | Adrenaline Orb
+Item | TerainExtendr | Terrain Extender
+Item | ProtectvePads | Protective Pads
+Item | Heavy-DtyBts | Heavy-Duty Boots
+Item | BlundrPolicy | Blunder Policy
+Item | BlundrPolicies | Blunder Policies
+Item | UtltyUmbrlla | Utility Umbrella
+Item | CatchngCharm | Catching Charm
+Item | RotomCatalog | Rotom Catalog
+Item | ReinsOfUnity | Reins of Unity
+Item | Dowsing MCHN | Dowsing Machine
+Item | AbilityShield | Ability Shield
+Item | PunchingGlove | Punching Glove
+Item | AuspciousArmr | Auspicious Armor
+Item | BoosterEnergy | Booster Energy
+Item | BoosterEnergies | Booster Energies
+Item | BigBmbooShoot | Big Bamboo Shoot
+Item | GimighoulCoin | Gimmighoul Coin
+Item | Leader'sCrest | Leader's Crest
+Item | MaliciousArmr | Malicious Armor
+Item | ScrllOfDrknss | Scroll of Darkness
+Item | ScrllsOfDrknss | Scrolls of Darkness
+Item | ScrollOfWatrs | Scroll of Waters
+Item | ScrollsOfWatrs | Scrolls of Waters
+Item | TinyBmbooShot | Tiny Bamboo Shoot
+Item | Bug TeraShard | Bug Tera Shard
+Item | DarkTeraShard | Dark Tera Shard
+Item | DragnTeraShrd | Dragon Tera Shard
+Item | EltrcTeraShrd | Electric Tera Shard
+Item | FairyTeraShrd | Fairy Tera Shard
+Item | FghtngTerShrd | Fighting Tera Shard
+Item | FireTeraShard | Fire Tera Shard
+Item | FlyngTeraShrd | Flying Tera Shard
+Item | GhostTeraShrd | Ghost Tera Shard
+Item | GrassTeraShrd | Grass Tera Shard
+Item | GrondTeraShrd | Ground Tera Shard
+Item | Ice TeraShard | Ice Tera Shard
+Item | NormlTeraShrd | Normal Tera Shard
+Item | PoisnTeraShrd | Poison Tera Shard
+Item | PschcTeraShrd | Psychic Tera Shard
+Item | RockTeraShard | Rock Tera Shard
+Item | SteelTeraShrd | Steel Tera Shard
+Item | WaterTeraShrd | Water Tera Shard
+Item | AdamantCrystl | Adamant Crystal
+Item | LustrousGlobe | Lustrous Globe
+Item | BlackAugurite | Black Augurite
+Item | UnrmkblTeacup | Unremarkable Teacup
+Item | MstrpceTeacup | Masterpiece Teacup
+Item | CornrstneMask | Cornerstone Mask
+Item | WellsprngMask | Wellspring Mask
+Item | HrthflameMask | Hearthflame Mask
+Item | FrshStrtMochi | Fresh Start Mochi
+Item | GlmmringCharm | Glimmering Charm
+Item | StllrTeraShrd | Stellar Tera Shard
+Item | JublifeMuffin | Jubilife Muffin
+Item | AuxPowerguard | Aux Powerguard
+Item | ChoiceDumplng | Choice Dumpling
+Item | 2xSpicedRadsh | Twice-Spiced Radish
+Move | ThunderPunch | Thunder Punch
+Move | PoisonPowder | Poison Powder
+Move | ThunderShock | Thunder Shock
+Move | SelfDestruct | Self-Destruct
+Move | HighJumpKick | High Jump Kick
+Move | DynamicPunch | Dynamic Punch
+Move | DragonBreath | Dragon Breath
+Move | ExtremeSpeed | Extreme Speed
+Move | AncientPower | Ancient Power
+Move | SmellngSalts | Smelling Salts
+Move | FeatherDance | Feather Dance
+Move | GrassWhistle | Grass Whistle
+Move | PhantomForce | Phantom Force
+Move | TrickOrTreat | Trick-or-Treat
+Move | ParabolcChrg | Parabolic Charge
+Move | Forest'sCurs | Forest's Curse
+Move | PetalBlizzrd | Petal Blizzard
+Move | DisrmngVoice | Disarming Voice
+Move | DrainingKiss | Draining Kiss
+Move | CraftyShield | Crafty Shield
+Move | FlowerShield | Flower Shield
+Move | GrssyTerrain | Grassy Terrain
+Move | MistyTerrain | Misty Terrain
+Move | King'sShield | King's Shield
+Move | DiamondStorm | Diamond Storm
+Move | SteamErption | Steam Eruption
+Move | HyprspceHole | Hyperspace Hole
+Move | WatrShuriken | Water Shuriken
+Move | MysticalFire | Mystical Fire
+Move | AromaticMist | Aromatic Mist
+Move | EerieImpulse | Eerie Impulse
+Move | MagneticFlux | Magnetic Flux
+Move | ElctrcTrrain | Electric Terrain
+Move | DazzlngGleam | Dazzling Gleam
+Move | BabyDollEyes | Baby-Doll Eyes
+Move | PowerUpPunch | Power-Up Punch
+Move | OblivionWing | Oblivion Wing
+Move | ThousndArrws | Thousand Arrows
+Move | ThousndWaves | Thousand Waves
+Move | LightOfRuin | Light Of Ruin
+Move | PrcipceBldes | Precipice Blades
+Move | DragonAscent | Dragon Ascent
+Move | HyprspceFury | Hyperspace Fury
+Move | FrstImpressn | First Impression
+Move | BanefulBunkr | Baneful Bunker
+Move | SpiritShackl | Spirit Shackle
+Move | DarkstLariat | Darkest Lariat
+Move | SparklngAria | Sparkling Aria
+Move | FloralHealng | Floral Healing
+Move | HighHorsepwr | High Horsepower
+Move | PsychcTrrain | Psychic Terrain
+Move | RvlationDnce | Revelation Dance
+Move | CoreEnforcer | Core Enforcer
+Move | ClngngScales | Clanging Scales
+Move | DragonHammer | Dragon Hammer
+Move | PsychicFangs | Psychic Fangs
+Move | StmpngTantrm | Stomping Tantrum
+Move | PrsmaticLasr | Prismatic Laser
+Move | SpectrlThief | Spectral Thief
+Move | SnsteelStrke | Sunsteel Strike
+Move | MoongestBeam | Moongeist Beam
+Move | Natur'sMadns | Nature's Madness
+Move | PhotonGeyser | Photon Geyser
+Move | SplishySplsh | Splishy Splash
+Move | BouncyBubble | Bouncy Bubble
+Move | SparklySwirl | Sparkly Swirl
+Move | VeeveeVolley | Veevee Volley
+Move | DublIronBash | Double Iron Bash
+Move | DynamxCannon | Dynamax Cannon
+Move | FishiousRend | Fishious Rend
+Move | ClngrousSoul | Clangorous Soul
+Move | BehemthBlade | Behemoth Blade
+Move | BehemothBash | Behemoth Bash
+Move | BreakngSwipe | Breaking Swipe
+Move | StrangeSteam | Strange Steam
+Move | FalsSurrendr | False Surrender
+Move | MeteorAssalt | Meteor Assault
+Move | ExpandngForc | Expanding Force
+Move | ShellSideArm | Shell Side Arm
+Move | MstyExplsion | Misty Explosion
+Move | RisngVoltage | Rising Voltage
+Move | TerrainPulse | Terrain Pulse
+Move | SkitterSmack | Skitter Smack
+Move | BrningJelosy | Burning Jealousy
+Move | CorrosiveGas | Corrosive Gas
+Move | DualWingbeat | Dual Wingbeat
+Move | ScorchngSnds | Scorching Sands
+Move | JungleHealng | Jungle Healing
+Move | SurgngStrkes | Surging Strikes
+Move | DragonEnergy | Dragon Energy
+Move | FreezngGlare | Freezing Glare
+Move | ThnderusKick | Thunderous Kick
+Move | GlacialLance | Glacial Lance
+Move | AstrlBarrage | Astral Barrage
+Move | PsyshieldBsh | Psyshield Bash
+Move | SprngtdeStrm | Springtide Storm
+Move | MystcalPower | Mystical Power
+Move | MountainGale | Mountain Gale
+Move | VictoryDance | Victory Dance
+Move | HeadlongRush | Headlong Rush
+Move | BitterMalice | Bitter Malice
+Move | TripleArrows | Triple Arrows
+Move | InfrnlParade | Infernal Parade
+Move | CeaslessEdge | Ceaseless Edge
+Move | BlekwndStorm | Bleakwind Storm
+Move | WildbltStorm | Wildbolt Storm
+Move | SndsearStorm | Sandsear Storm
+Move | LunarBlessng | Lunar Blessing
+Move | LastRespects | Last Respects
+Move | SpicyExtract | Spicy Extract
+Move | PoplatinBomb | Population Bomb
+Move | RevivlBlesng | Revival Blessing
+Move | KowtowCleave | Kowtow Cleave
+Move | ColisinCours | Collision Course
+Move | ElectroDrift | Electro Drift
+Move | ChilReceptin | Chilly Reception
+Move | ChillingWatr | Chilling Water
+Move | GigatonHammr | Gigaton Hammer
+Move | BlazngTorque | Blazing Torque
+Move | WickedTorque | Wicked Torque
+Move | NoxiusTorque | Noxious Torque
+Move | CombatTorque | Combat Torque
+Move | MagiclTorque | Magical Torque
+Move | MatchaGotcha | Matcha Gotcha
+Move | TeraStarstrm | Tera Starstorm
+Move | BurnngBulwrk | Burning Bulwark
+Move | MightyCleave | Mighty Cleave
+Move | TachyonCuttr | Tachyon Cutter
+Move | AllurngVoice | Alluring Voice
+Move | SuprcellSlam | Supercell Slam
+Move | PsychicNoise | Psychic Noise
+Move | MalignntChan | Malignant Chain
+Species | Dudunsprce | Dudunsparce
+Species | Corvisquir | Corvisquire
+Species | Corviknigh | Corviknight
+Species | Barraskewd | Barraskewda
+Species | Centiskorc | Centiskorch
+Species | Polteageis | Polteageist
+Species | Stonjourne | Stonjourner
+Species | Meowscarad | Meowscarada
+Species | Sqawkabily | Squawkabilly
+Species | Kilowatrel | Kilowattrel
+Species | Brmblghast | Brambleghast
+Species | ScreamTail | Scream Tail
+Species | BruteBonet | Brute Bonnet
+Species | FluttrMane | Flutter Mane
+Species | SlithrWing | Slither Wing
+Species | SndyShocks | Sandy Shocks
+Species | IronTreads | Iron Treads
+Species | IronBundle | Iron Bundle
+Species | IronJuguls | Iron Jugulis
+Species | IronThorns | Iron Thorns
+Species | RoarngMoon | Roaring Moon
+Species | IronVliant | Iron Valiant
+Species | WalkngWake | Walking Wake
+Species | IronLeaves | Iron Leaves
+Species | Ptchageist | Poltchageist
+Species | Fezndipiti | Fezandipiti
+Species | GouginFire | Gouging Fire
+Species | RagingBolt | Raging Bolt
+Species | IronBouldr | Iron Boulder
+Species | Crabminabl | Crabominable
+Species | Blacephaln | Blacephalon
+Species | Bsculegion | Basculegion
+Species | Flechinder | Fletchinder
+Type | Fight | Fighting
+Type | Electr | Electric
+Type | Psychc | Psychic
+Type | Stellr | Stellar
+

graphics/pokemon/blitzle/overworld_normal.pal

@@ -10,7 +10,7 @@ JASC-PAL
 0 0 0
 200 200 200
 0 168 216
-0 0 0
+248 224 88
 0 0 0
 0 0 0
 0 0 0

graphics/pokemon/blitzle/overworld_shiny.pal

@@ -10,7 +10,7 @@ JASC-PAL
 0 0 0
 200 200 200
 24 232 104
-0 0 0
+248 224 88
 0 0 0
 0 0 0
 0 0 0

graphics/pokemon/clodsire/overworld_normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+64 60 48
+128 108 96
+96 80 72
+48 40 32
+16 16 16
+184 160 160
+208 208 208
+40 36 32
+152 120 120
+80 68 72
+104 52 56
+176 88 104
+248 140 160
+0 0 0
+0 0 0

graphics/pokemon/clodsire/overworld_shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+74 67 90
+127 116 143
+96 87 115
+46 40 44
+16 16 16
+160 158 197
+205 180 170
+40 36 32
+117 117 158
+77 63 72
+104 52 56
+176 88 104
+248 140 160
+0 0 0
+0 0 0

graphics/pokemon/crustle/overworld_normal.pal

@@ -8,10 +8,10 @@ JASC-PAL
 128 96 64
 224 192 64
 192 128 0
-229 229 247
 96 32 0
-224 128 64
+229 229 247
 192 96 64
+224 128 64
 0 0 0
 0 0 0
 0 0 0

graphics/pokemon/crustle/overworld_shiny.pal

@@ -8,10 +8,10 @@ JASC-PAL
 96 88 80
 176 192 72
 48 40 24
-229 229 247
 48 40 24
-136 152 72
-96 104 48
+229 229 247
+137 153 67
+179 206 83
 0 0 0
 0 0 0
 0 0 0

graphics/pokemon/diancie/mega/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-144 80 120
-16 16 16
-216 96 160
-248 200 216
-248 248 248
-232 160 176
-72 64 104
-168 160 208
-120 112 152
-224 40 72
-240 208 104
-224 216 224
-192 208 208
-112 136 136
-248 248 248
+89 80 89
+115 115 115
+166 58 112
+217 85 69
+255 229 102
+128 115 128
+217 87 152
+179 161 179
+242 242 242
+242 145 178
+24 24 24
+255 204 217
+227 219 224
+191 191 191
+255 249 251

graphics/pokemon/diancie/mega/shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-144 80 120
-16 16 16
-216 96 160
-248 200 216
-248 248 248
-232 160 176
-48 48 48
-136 136 136
-88 88 88
-224 40 72
-240 208 104
-224 216 224
-168 48 104
-112 40 72
-224 112 160
+62 60 64
+140 45 99
+166 58 112
+230 85 121
+255 229 102
+99 90 99
+217 87 152
+140 125 140
+254 92 155
+242 145 178
+24 24 24
+255 204 217
+194 174 189
+194 72 133
+232 220 228

graphics/pokemon/excadrill/overworld_shiny.pal

@@ -8,7 +8,7 @@ JASC-PAL
 176 64 96
 152 152 192
 75 81 113
-78 140 154
+60 91 97
 78 140 154
 5 5 5
 201 206 220

graphics/pokemon/garganacl/normal.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-153 211 165
-179 179 179
-217 217 217
-242 242 242
-138 138 138
-77 50 38
-148 104 90
+156 213 164
+123 123 123
+197 180 189
+255 255 255
+82 82 82
+148 98 90
+139 115 98
+197 148 123
+8 8 8
+65 49 41
+98 82 74
+238 139 24
+246 230 24
+90 74 57
+230 213 205
 0 0 0
-102 61 44
-195 146 123
-245 147 45
-251 242 54
-46 43 40
-93 86 80
-220 191 179
-145 131 122

graphics/pokemon/garganacl/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-153 211 165
-161 104 55
-214 153 99
-237 173 116
-128 81 41
-77 50 38
-148 104 90
+156 213 164
+123 98 65
+189 148 106
+230 172 139
+90 57 49
+148 98 90
+139 115 98
+197 148 123
+8 8 8
+65 49 41
+98 82 74
+238 139 24
+246 230 24
+90 74 57
+230 213 205
 0 0 0
-102 61 44
-195 146 123
-245 147 45
-251 242 54
-46 43 40
-93 86 80
-220 191 179
-145 131 122

graphics/pokemon/kilowattrel/shiny.pal

@@ -8,7 +8,7 @@ JASC-PAL
 248 204 48
 192 144 40
 248 252 248
-212 95 60
+131 27 27
 16 16 16
 96 248 208
 128 128 128
@@ -16,4 +16,4 @@ JASC-PAL
 212 95 60
 120 92 32
 72 88 96
-48 56 72
+90 91 92

graphics/pokemon/krookodile/overworld_normal.pal

@@ -10,8 +10,8 @@ JASC-PAL
 25 25 33
 99 99 99
 236 236 246
-99 99 99
-185 172 189
+35 35 35
+152 142 156
 38 37 38
 129 138 129
 182 191 199

graphics/pokemon/krookodile/overworld_shiny.pal

@@ -8,10 +8,10 @@ JASC-PAL
 168 136 88
 0 0 0
 224 200 88
-99 99 99
+48 48 48
 236 236 246
 168 144 64
-185 172 189
+122 94 0
 38 37 38
 129 138 129
 182 191 199

graphics/pokemon/landorus/normal.pal

@@ -10,10 +10,10 @@ JASC-PAL
 184 72 80
 160 88 56
 240 120 64
-51 51 34
+96 48 16
 248 200 96
-51 51 51
+72 40 24
 96 64 48
 119 51 85
 128 128 128
-0 0 0
+128 96 72

graphics/pokemon/landorus/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-88 112 88
-16 16 16
-248 248 248
-152 176 160
-88 64 40
-240 96 8
-160 96 16
-248 160 40
-80 48 24
-248 192 0
-56 32 16
-72 48 32
-120 72 40
-128 128 128
-0 0 0
+153 204 153
+90 115 90
+17 17 17
+255 255 255
+164 189 164
+115 65 57
+238 98 8
+180 115 24
+255 164 41
+82 49 24
+255 197 0
+41 24 16
+74 49 32
+172 82 32
+90 115 90
+106 65 41

graphics/pokemon/lillipup/overworld_shiny.pal

@@ -2,11 +2,11 @@ JASC-PAL
 0100
 16
 152 208 160
-104 72 16
-96 72 24
+97 62 1
+171 105 39
 184 128 72
-232 176 88
 0 0 0
+224 169 81
 240 216 152
 88 88 88
 232 232 248

graphics/pokemon/magearna/shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 153 211 165
-175 92 10
-252 238 137
-219 168 62
-218 192 200
-183 132 149
-119 83 89
+103 114 114
+234 236 236
+158 166 166
+209 216 216
+162 176 176
+110 130 130
 16 16 16
-115 128 128
-248 248 248
-185 185 185
+94 100 100
+191 194 194
+140 147 147
 252 154 188
 248 82 111
 12 168 201
-54 237 227
+221 233 229
 67 63 61

graphics/pokemon/medicham/mega/normal.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-176 72 88
-88 64 72
-136 128 136
-200 88 112
-224 112 136
-248 248 248
-208 200 200
-168 160 168
-16 16 16
-232 184 88
-160 112 40
-240 216 128
-64 160 184
-224 224 224
-16 72 88
+153 211 165
+23 75 93
+82 65 74
+164 115 41
+131 65 74
+180 74 90
+238 189 90
+230 115 139
+67 163 189
+139 131 139
+172 164 172
+17 17 17
+246 222 131
+197 197 197
+222 222 222
+250 250 250

graphics/pokemon/medicham/mega/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-16 72 88
-16 16 16
-136 128 136
-32 120 200
-80 160 224
-232 224 200
-232 224 200
-216 168 128
-16 16 16
-160 112 40
-160 112 40
-240 216 128
-64 160 184
-232 224 200
-16 72 88
+153 211 165
+0 122 112
+148 82 32
+163 153 24
+57 98 172
+90 131 205
+229 226 36
+156 180 255
+0 193 190
+180 123 65
+205 156 98
+17 17 17
+255 249 140
+230 189 131
+255 230 164
+250 250 250

graphics/pokemon/naclstack/normal.pal

@@ -1,17 +1,19 @@
 JASC-PAL
 0100
-14
-153 211 165
-113 113 113
+16
+156 213 164
+148 98 90
+98 82 74
+123 123 123
+197 148 123
+230 213 205
+197 180 189
 255 255 255
-180 180 180
-18 18 18
-198 135 110
-135 86 81
-246 195 158
-87 44 39
-107 65 60
-255 160 0
-255 255 0
-66 22 28
-194 103 16
+82 82 82
+65 49 41
+139 115 98
+8 8 8
+238 139 24
+246 230 24
+0 0 0
+0 0 0

graphics/pokemon/naclstack/shiny.pal

@@ -1,17 +1,19 @@
 JASC-PAL
 0100
-14
-153 211 165
-164 70 47
-235 145 61
-211 94 44
-18 18 18
-198 135 110
-135 86 81
-246 195 158
-87 44 39
-107 65 60
-255 160 0
-255 255 0
-66 22 28
-194 103 16
+16
+156 213 164
+148 98 90
+98 82 74
+123 98 65
+197 148 123
+230 213 205
+197 131 106
+238 189 148
+90 57 49
+65 49 41
+139 115 98
+8 8 8
+238 139 24
+246 230 24
+0 0 0
+0 0 0

graphics/pokemon/ponyta/galarian/shiny.pal

@@ -2,15 +2,15 @@ JASC-PAL
 0100
 16
 152 208 160
-72 184 120
-16 144 64
-128 248 176
-200 144 48
-248 240 160
-240 200 80
+72 200 232
+48 152 168
+128 224 216
+199 171 123
+247 244 203
+240 219 158
 72 88 72
 16 16 16
-88 32 120
+64 56 165
 232 248 240
 192 216 200
 136 160 144

graphics/pokemon/rapidash/galarian/shiny.pal

@@ -6,11 +6,11 @@ JASC-PAL
 128 224 200
 56 192 168
 16 16 16
-176 144 32
+176 160 104
 240 240 240
-224 216 128
+224 220 175
 0 24 96
-248 248 208
+247 247 228
 104 104 120
 200 200 208
 160 160 176

graphics/pokemon/serperior/overworld_normal.pal

@@ -3,17 +3,17 @@ JASC-PAL
 16
 128 208 232
 12 98 39
-106 115 57
+115 112 57
 24 156 74
-236 173 21
+248 248 248
 8 16 16
 156 213 156
 236 173 21
 115 164 115
-12 98 39
-236 173 21
+5 59 26
+248 128 0
 24 156 74
-0 0 0
-0 0 0
-0 0 0
+208 152 8
+12 98 39
+5 59 26
 0 0 0

graphics/pokemon/serperior/overworld_shiny.pal

@@ -8,12 +8,12 @@ JASC-PAL
 207 215 195
 7 14 14
 168 232 104
-185 175 53
+224 248 152
 96 166 87
-40 56 48
-212 33 0
+40 48 56
+248 64 24
 24 156 74
-0 0 0
-0 0 0
-0 0 0
+184 179 114
+43 99 64
+0 72 40
 0 0 0

graphics/pokemon/servine/overworld_normal.pal

@@ -10,9 +10,9 @@ JASC-PAL
 141 120 48
 251 243 199
 110 64 20
-0 0 0
-0 0 0
-0 0 0
+193 193 147
+63 89 63
+184 72 32
 0 0 0
 0 0 0
 0 0 0

graphics/pokemon/servine/overworld_shiny.pal

@@ -3,16 +3,16 @@ JASC-PAL
 16
 152 208 160
 32 48 72
-0 0 0
 237 151 18
 40 152 168
-63 74 11
 32 88 160
-138 103 54
+0 0 0
+74 58 11
 218 221 187
-0 0 0
-0 0 0
-0 0 0
+144 24 40
+182 189 145
+63 84 89
+248 48 48
 0 0 0
 0 0 0
 0 0 0

graphics/pokemon/shroodle/shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-96 88 88
-232 236 200
+125 121 118
+236 235 232
 16 16 16
-176 168 136
-64 76 104
-72 60 56
+172 166 153
+79 104 117
+72 68 65
 48 36 40
-128 156 168
-168 168 224
-96 108 136
+187 210 227
+173 114 205
+128 149 168
 248 252 248
-208 200 248
+225 171 233
 184 176 184
-160 112 224
+225 52 239
 0 0 0

graphics/pokemon/sigilyph/overworld_normal.pal

@@ -2,17 +2,17 @@ JASC-PAL
 0100
 16
 152 208 160
-33 112 129
-72 70 22
+16 88 105
+147 50 4
 7 7 7
 63 164 227
 171 92 25
 255 191 5
 40 40 40
-192 192 203
+248 248 248
 47 155 63
-0 0 0
-0 0 0
+206 0 46
+18 117 33
 0 0 0
 0 0 0
 0 0 0

graphics/pokemon/sigilyph/overworld_shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-203 38 19
-90 63 20
+117 76 35
+120 48 7
 7 7 7
-248 136 0
+248 168 72
+97 120 16
 192 224 88
-40 40 40
-209 88 56
-128 152 40
-192 192 203
-0 0 0
-0 0 0
-0 0 0
+48 48 48
+248 248 248
+160 136 80
+217 79 61
+181 114 72
+199 172 109
 0 0 0
 0 0 0
 0 0 0

graphics/pokemon/swoobat/overworld_shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 104 48 152
-72 32 0
+87 48 2
 248 192 48
 232 144 16
 1 1 1
 198 217 180
-198 217 180
-72 32 0
+136 192 120
+41 18 0
 96 48 16
-167 89 102
-198 217 180
-167 89 102
+144 72 112
 198 217 180
+106 48 87
+248 160 232
 198 217 180
 1 1 1
 0 0 0

graphics/pokemon/throh/overworld_normal.pal

@@ -4,7 +4,7 @@ JASC-PAL
 152 208 160
 87 18 18
 87 18 18
-152 208 160
+33 33 25
 0 0 0
 218 79 79
 164 40 40

graphics/pokemon/tranquill/overworld_normal.pal

@@ -11,8 +11,8 @@ JASC-PAL
 126 101 54
 224 176 38
 117 117 117
-0 0 0
-0 0 0
+126 101 54
+248 248 248
 0 0 0
 0 0 0
 0 0 0

graphics/pokemon/tranquill/overworld_shiny.pal

@@ -5,14 +5,14 @@ JASC-PAL
 48 64 48
 72 128 72
 0 0 0
-49 45 41
 112 168 112
-184 248 184
+195 237 195
+160 102 204
 96 79 92
 201 144 119
-217 217 233
-0 0 0
-0 0 0
+129 167 131
+80 56 96
+248 248 248
 0 0 0
 0 0 0
 0 0 0

graphics/pokemon/venipede/overworld_normal.pal

@@ -3,14 +3,14 @@ JASC-PAL
 16
 152 208 160
 11 11 11
-124 56 72
+102 46 59
 182 65 92
 191 69 98
 227 81 116
 55 55 55
 79 79 79
-26 95 77
 20 140 80
+26 95 77
 22 177 116
 55 106 55
 224 172 35

graphics/pokemon/venipede/overworld_shiny.pal

@@ -3,16 +3,16 @@ JASC-PAL
 16
 152 208 160
 11 11 11
-64 64 16
-96 72 40
-144 80 48
-55 55 55
+87 39 36
+152 96 75
+158 103 81
+193 125 98
 40 40 40
-40 72 8
-80 112 0
-96 144 0
-55 106 55
-182 65 92
+74 70 71
+113 145 61
+76 105 27
+150 196 80
+80 96 40
 224 172 35
 0 0 0
 0 0 0

graphics/pokemon/woobat/overworld_shiny.pal

@@ -2,7 +2,7 @@ JASC-PAL
 0100
 16
 152 208 160
-16 56 64
+24 64 16
 192 232 160
 0 0 0
 120 184 56
@@ -11,7 +11,7 @@ JASC-PAL
 192 104 120
 136 72 80
 240 168 176
-72 104 120
+72 120 74
 252 188 219
 0 0 0
 0 0 0

graphics/pokemon/wooper/wooper_paldean/overworld_normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+153 211 165
+99 73 120
+201 177 219
+85 67 66
+104 82 81
+16 16 16
+169 147 146
+130 103 102
+158 129 179
+255 255 255
+46 36 35
+180 65 65
+255 106 115
+0 0 0
+0 0 0
+0 0 0

graphics/pokemon/wooper/wooper_paldean/overworld_shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+153 211 165
+120 80 48
+230 186 149
+102 96 146
+140 133 186
+16 16 16
+204 202 219
+171 167 198
+200 144 97
+255 255 255
+35 36 46
+180 65 65
+255 106 115
+0 0 0
+0 0 0
+0 0 0

graphics/pokemon/zebstrika/overworld_normal.pal

@@ -3,7 +3,7 @@ JASC-PAL
 16
 152 208 160
 57 65 65
-57 65 65
+29 41 41
 244 245 247
 204 204 204
 7 7 7
@@ -13,7 +13,7 @@ JASC-PAL
 57 65 65
 112 112 112
 116 168 95
-7 7 7
-7 7 7
+248 224 0
+0 168 216
 7 7 7
 0 0 0

graphics/pokemon/zebstrika/overworld_shiny.pal

@@ -11,9 +11,9 @@ JASC-PAL
 0 0 0
 164 164 164
 30 109 89
-116 116 116
+104 98 115
 134 216 33
-0 0 0
-0 0 0
+248 224 0
+0 192 88
 0 0 0
 0 0 0

include/battle.h

@@ -115,17 +115,15 @@ struct DisableStruct
     u8 disableTimer:4;
     u8 encoreTimer:4;
     u8 perishSongTimer:4;
-    u8 furyCutterCounter;
     u8 rolloutTimer:4;
     u8 rolloutTimerStartValue:4;
-    u8 chargeTimer:4;
     u8 tauntTimer:4;
+    u8 furyCutterCounter;
     u8 battlerPreventingEscape;
     u8 battlerWithSureHit;
     u8 isFirstTurn;
-    u8 truantCounter:1;
-    u8 truantSwitchInHack:1;
     u8 mimickedMoves:4;
+    u8 chargeTimer:4;
     u8 rechargeTimer;
     u8 autotomizeCount;
     u8 slowStartTimer;
@@ -138,6 +136,8 @@ struct DisableStruct
     u8 wrapTurns;
     u8 tormentTimer:4; // used for G-Max Meltdown
     u8 usedMoves:4;
+    u8 truantCounter:1;
+    u8 truantSwitchInHack:1;
     u8 noRetreat:1;
     u8 tarShot:1;
     u8 octolock:1;
@@ -221,7 +221,7 @@ struct SpecialStatus
     u8 faintedHasReplacement:1;
     u8 focusBanded:1;
     u8 focusSashed:1;
-    u8 unused:1;
+    u8 unused:2;
     // End of byte
     u8 sturdied:1;
     u8 stormDrainRedirected:1;
@@ -818,6 +818,7 @@ struct BattleStruct
     u8 categoryOverride; // for Z-Moves and Max Moves
     u32 stellarBoostFlags[NUM_BATTLE_SIDES]; // stored as a bitfield of flags for all types for each side
     u8 fickleBeamBoosted:1;
+    u8 obedienceResult:3;
 };
 
 // The palaceFlags member of struct BattleStruct contains 1 flag per move to indicate which moves the AI should consider,

include/battle_ai_util.h

@@ -205,5 +205,6 @@ bool32 AI_ShouldCopyStatChanges(u32 battlerAtk, u32 battlerDef);
 bool32 AI_ShouldSetUpHazards(u32 battlerAtk, u32 battlerDef, struct AiLogicData *aiData);
 void IncreaseTidyUpScore(u32 battlerAtk, u32 battlerDef, u32 move, s32 *score);
 bool32 AI_ShouldSpicyExtract(u32 battlerAtk, u32 battlerAtkPartner, u32 move, struct AiLogicData *aiData);
+void IncreaseSubstituteMoveScore(u32 battlerAtk, u32 battlerDef, u32 move, s32 *score);
 
 #endif //GUARD_BATTLE_AI_UTIL_H