Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers

# Conflicts:
#	src/data/graphics/pokemon.h
#	src/data/pokemon/species_info.h
#	src/data/pokemon/species_info/gen_1_families.h
#	src/data/pokemon/species_info/gen_2_families.h
#	src/data/pokemon/species_info/gen_4_families.h
#	src/data/pokemon/species_info/gen_5_families.h
#	src/data/pokemon/species_info/gen_8_families.h

.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.8.3 (Latest release)
+        - 1.8.4 (Latest release)
         - master (default, unreleased bugfixes)
         - upcoming (Edge)
+        - 1.8.3
         - 1.8.2
         - 1.8.1
         - 1.8.0

.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml

@@ -23,10 +23,10 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using as a base?
       options:
-        - 1.8.3 (Latest release)
+        - 1.8.4 (Latest release)
         - master (default, unreleased bugfixes)
         - upcoming (Edge)
-        - 1.8.2
+        - 1.8.3
         - 1.8.1
         - 1.8.0
         - 1.7.4

.github/ISSUE_TEMPLATE/04_other_errors.yaml

@@ -23,10 +23,10 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using as a base?
       options:
-        - 1.8.3 (Latest release)
+        - 1.8.4 (Latest release)
         - master (default, unreleased bugfixes)
         - upcoming (Edge)
-        - 1.8.2
+        - 1.8.3
         - 1.8.1
         - 1.8.0
         - 1.7.4

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Pokeemerald-Expansion Changelogs
 
 ## 1.8.x
+- ### [Version 1.8.4](docs/changelogs/1.8.x/1.8.4.md) - Bugfix Release 🧹
 - ### [Version 1.8.3](docs/changelogs/1.8.x/1.8.3.md) - Bugfix Release 🧹
 - ### [Version 1.8.2](docs/changelogs/1.8.x/1.8.2.md) - Bugfix Release 🧹
 - ### [Version 1.8.1](docs/changelogs/1.8.x/1.8.1.md) - HOTFIX Release 🔥

README.md

@@ -170,7 +170,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.3, use `git pull RHH expansion/1.8.3`).
+- 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`).
     - ***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`.

asm/macros/battle_anim_script.inc

@@ -315,6 +315,19 @@
 .Lsprite_\@_2:
 	.endm
 
+.macro createdragondartsprite anim_battler:req, subpriority_offset:req, argv:vararg
+	.byte 0x33
+	.if \anim_battler == ANIM_TARGET
+	.byte ANIMSPRITE_IS_TARGET | (\subpriority_offset & 0x7F)
+	.else
+	.byte (\subpriority_offset & 0x7F)
+	.endif
+	.byte (.Lsprite_\@_2 - .Lsprite_\@_1) / 2
+.Lsprite_\@_1:
+	.2byte \argv
+.Lsprite_\@_2:
+	.endm
+
 @ useful macros
 	.macro jumpreteq value:req, ptr:req
 	jumpargeq ARG_RET_ID, \value, \ptr

asm/macros/battle_script.inc

@@ -856,8 +856,9 @@
 	.byte 0x99
 	.endm
 
-	.macro setfocusenergy
+	.macro setfocusenergy battler:req
 	.byte 0x9a
+	.byte \battler
 	.endm
 
 	.macro transformdataexecution
@@ -1388,9 +1389,10 @@
 	.4byte \jumpInstr
 	.endm
 
-	.macro itemrestorehp jumpInstr:req
+	.macro itemrestorehp jumpInstr:req, restoreBattlerInstr:req
 	callnative BS_ItemRestoreHP
 	.4byte \jumpInstr
+	.4byte \restoreBattlerInstr
 	.endm
 
 	.macro itemcurestatus jumpInstr:req

data/battle_anim_scripts.s

@@ -13865,10 +13865,12 @@ Move_MAGIC_POWDER::
 	end
 
 Move_DRAGON_DARTS::
+	loadspritegfx ANIM_TAG_DREEPY_SHINY
 	loadspritegfx ANIM_TAG_DREEPY
+        loadspritegfx ANIM_TAG_AIR_WAVE
 	loadspritegfx ANIM_TAG_EXPLOSION
 	playsewithpan SE_FALL, SOUND_PAN_ATTACKER
-	createsprite gDreepyMissileTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x19
+	createdragondartsprite ANIM_TARGET, 2, 0x0, 0x0, 0x19
 	delay 0x19
 	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 16, 1

data/battle_scripts_1.s

@@ -121,7 +121,7 @@ BattleScript_EffectShedTail::
 	jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_ButItFailed
 	setsubstitute
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_SUBSTITUTE_FAILED, BattleScript_SubstituteString
-        orword gHitMarker, HITMARKER_PASSIVE_DAMAGE
+	orword gHitMarker, HITMARKER_PASSIVE_DAMAGE
 	attackanimation
 	waitanimation
 	healthbarupdate BS_ATTACKER
@@ -3522,7 +3522,7 @@ BattleScript_EffectFocusEnergy::
 	attackstring
 	ppreduce
 	jumpifstatus2 BS_ATTACKER, STATUS2_FOCUS_ENERGY_ANY, BattleScript_ButItFailed
-	setfocusenergy
+	setfocusenergy BS_TARGET
 	attackanimation
 	waitanimation
 	printfromtable gFocusEnergyUsedStringIds
@@ -3821,7 +3821,7 @@ BattleScript_EffectSubstitute::
 	jumpifstatus2 BS_ATTACKER, STATUS2_SUBSTITUTE, BattleScript_AlreadyHasSubstitute
 	setsubstitute
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_SUBSTITUTE_FAILED, BattleScript_SubstituteString
-        orword gHitMarker, HITMARKER_PASSIVE_DAMAGE
+	orword gHitMarker, HITMARKER_PASSIVE_DAMAGE
 	attackanimation
 	waitanimation
 	healthbarupdate BS_ATTACKER
@@ -7457,6 +7457,12 @@ BattleScript_TargetBurnHeal::
 	updatestatusicon BS_TARGET
 	return
 
+BattleScript_TargetPoisonHealed::
+	printstring STRINGID_PASTELVEILENTERS
+	waitmessage B_WAIT_TIME_LONG
+	updatestatusicon BS_TARGET
+	return
+
 BattleScript_MoveEffectSleep::
 	statusanimation BS_EFFECT_BATTLER
 	printfromtable gFellAsleepStringIds
@@ -7567,6 +7573,7 @@ BattleScript_MoveEffectConfusion::
 BattleScript_MoveEffectRecoil::
 	jumpifmove MOVE_STRUGGLE, BattleScript_DoRecoil
 	jumpifability BS_ATTACKER, ABILITY_ROCK_HEAD, BattleScript_RecoilEnd
+	jumpifability BS_ATTACKER, ABILITY_MAGIC_GUARD, BattleScript_RecoilEnd
 BattleScript_DoRecoil::
 	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE | HITMARKER_IGNORE_DISGUISE
 	healthbarupdate BS_ATTACKER
@@ -7825,6 +7832,12 @@ BattleScript_IntimidateLoop:
 	jumpiftargetally BattleScript_IntimidateLoopIncrement
 	jumpifabsent BS_TARGET, BattleScript_IntimidateLoopIncrement
 	jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_IntimidateLoopIncrement
+.if B_UPDATED_INTIMIDATE >= GEN_8 @These abilties specifically prevent just intimidate, without blocking stat decreases
+	jumpifability BS_TARGET, ABILITY_INNER_FOCUS, BattleScript_IntimidatePrevented
+	jumpifability BS_TARGET, ABILITY_SCRAPPY, BattleScript_IntimidatePrevented
+	jumpifability BS_TARGET, ABILITY_OWN_TEMPO, BattleScript_IntimidatePrevented
+	jumpifability BS_TARGET, ABILITY_OBLIVIOUS, BattleScript_IntimidatePrevented
+.endif
 	jumpifability BS_TARGET, ABILITY_GUARD_DOG, BattleScript_IntimidateInReverse
 BattleScript_IntimidateEffect:
 	copybyte sBATTLER, gBattlerAttacker
@@ -7849,6 +7862,12 @@ BattleScript_IntimidateEnd:
 	pause B_WAIT_TIME_MED
 	end3
 
+BattleScript_IntimidatePrevented:
+	copybyte sBATTLER, gBattlerTarget
+	call BattleScript_AbilityPopUp
+	printstring STRINGID_PKMNPREVENTSSTATLOSSWITH
+	goto BattleScript_IntimidateEffect_WaitString
+
 BattleScript_IntimidateWontDecrease:
 	printstring STRINGID_STATSWONTDECREASE
 	goto BattleScript_IntimidateEffect_WaitString
@@ -8196,7 +8215,6 @@ BattleScript_MoveStatDrain::
 .endif
 BattleScript_MoveStatDrain_Cont:
 	clearsemiinvulnerablebit
-	tryfaintmon BS_ATTACKER
 	goto BattleScript_MoveEnd
 
 BattleScript_MonMadeMoveUseless_PPLoss::
@@ -8207,7 +8225,6 @@ BattleScript_MonMadeMoveUseless::
 	call BattleScript_AbilityPopUp
 	printstring STRINGID_PKMNSXMADEYUSELESS
 	waitmessage B_WAIT_TIME_LONG
-	tryfaintmon BS_ATTACKER
 	orhalfword gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE
 	goto BattleScript_MoveEnd
 
@@ -8219,7 +8236,6 @@ BattleScript_FlashFireBoost::
 	call BattleScript_AbilityPopUp
 	printfromtable gFlashFireStringIds
 	waitmessage B_WAIT_TIME_LONG
-	tryfaintmon BS_ATTACKER
 	goto BattleScript_MoveEnd
 
 BattleScript_AbilityPreventsPhasingOut::

data/battle_scripts_2.s

@@ -57,7 +57,11 @@ BattleScript_ItemRestoreHPRet:
 
 BattleScript_ItemRestoreHP::
 	call BattleScript_UseItemMessage
-	itemrestorehp BattleScript_ItemRestoreHPEnd
+	itemrestorehp BattleScript_ItemRestoreHPEnd, BattleScript_ItemRestoreHP_Battler
+	call BattleScript_ItemRestoreHP_Party
+	goto BattleScript_ItemRestoreHPEnd
+
+BattleScript_ItemRestoreHP_Battler::
 	call BattleScript_ItemRestoreHPRet
 BattleScript_ItemRestoreHPEnd:
 	end
@@ -67,7 +71,7 @@ BattleScript_ItemRestoreHP_Party::
 	bichalfword gMoveResultFlags, MOVE_RESULT_NO_EFFECT
 	printstring STRINGID_ITEMRESTOREDSPECIESHEALTH
 	waitmessage B_WAIT_TIME_LONG
-	end
+	return
 
 BattleScript_ItemRestoreHP_SendOutRevivedBattler:
 	switchinanim BS_SCRIPTING, FALSE
@@ -87,8 +91,13 @@ BattleScript_ItemCureStatusEnd:
 
 BattleScript_ItemHealAndCureStatus::
 	call BattleScript_UseItemMessage
-	itemrestorehp BattleScript_ItemCureStatusAfterItemMsg
+	itemrestorehp BattleScript_ItemCureStatusAfterItemMsg, BattleScript_ItemHealAndCureStatus_Battler
+	call BattleScript_ItemRestoreHP_Party
+	goto BattleScript_ItemHealAndCureStatusEnd
+
+BattleScript_ItemHealAndCureStatus_Battler::
 	call BattleScript_ItemRestoreHPRet
+BattleScript_ItemHealAndCureStatusEnd::
 	goto BattleScript_ItemCureStatusAfterItemMsg
 
 BattleScript_ItemIncreaseStat::
@@ -113,7 +122,7 @@ BattleScript_ItemSetMist::
 BattleScript_ItemSetFocusEnergy::
 	call BattleScript_UseItemMessage
 	jumpifstatus2 BS_ATTACKER, STATUS2_FOCUS_ENERGY_ANY, BattleScript_ButItFailed
-	setfocusenergy
+	setfocusenergy BS_ATTACKER
 	playmoveanimation BS_ATTACKER, MOVE_FOCUS_ENERGY
 	waitanimation
 	copybyte sBATTLER, gBattlerAttacker

data/scripts/safari_zone.inc

@@ -53,6 +53,9 @@ SafariZone_EventScript_ChoosePokeblock::
 	special OpenPokeblockCaseOnFeeder
 	waitstate
 	goto_if_ne VAR_RESULT, 0xFFFF, SafariZone_EventScript_PokeblockPlaced
+#ifdef BUGFIX
+	releaseall  @ Only gets called from EventScript_PokeBlockFeeder which uses lockall.
+#endif
 	end
 
 SafariZone_EventScript_PokeblockPlaced::

docs/changelogs/1.8.x/1.8.0.md

@@ -359,10 +359,10 @@
 * Added missing `P_UPDATED_EVS` config that allows setting the EV yield changes across generations by @Bassoonian in https://github.com/rh-hideout/pokeemerald-expansion/pull/3993
 * Added missing `P_UPDATED_EXP_YIELDS` config that allows setting the Experience yield changes across generations by @Bassoonian in https://github.com/rh-hideout/pokeemerald-expansion/pull/3995
 * Added evolution methods that require custom trackers (`MON_DATA_EVOLUTION_TRACKER`) by @Bassoonian in https://github.com/rh-hideout/pokeemerald-expansion/pull/4087
-    * `EVO_LEVEL_MOVE_TWENTY_TIMES`:
+    * `EVO_USE_MOVE_TWENTY_TIMES`:
         * Stantler can now evolve into Wyrdeer by using Psyshield Bash 20 times.
         * Primeape can now evolve into Annihilape by using Rage Fist 20 times.
-    * `EVO_LEVEL_RECOIL_DAMAGE_MALE`/`EVO_LEVEL_RECOIL_DAMAGE_FEMALE`
+    * `EVO_RECOIL_DAMAGE_MALE`/`EVO_RECOIL_DAMAGE_FEMALE`
         * White-Striped Basculin can now evolve into Basculegion when leveling up after receiving 294HP of recoil damage and being the corresponding gender.
 * Added missing Paldean Wooper icon by @kittenchilly in https://github.com/rh-hideout/pokeemerald-expansion/pull/4260
 * Added missing data for placeholder Pokémon by @AsparagusEduardo in https://github.com/rh-hideout/pokeemerald-expansion/pull/4281
@@ -495,7 +495,7 @@
     * Aeroblast: Added Wind Move flag.
 * Ivy Cudgel's type now changes based on Ogerpon's form rather than held item by @kittenchilly in https://github.com/rh-hideout/pokeemerald-expansion/pull/3865
 * Renamed `healBlockBanned` flag to `healingMove` by @AsparagusEduardo in https://github.com/rh-hideout/pokeemerald-expansion/pull/3981
-* Removed some hardcoded move IDs 
+* Removed some hardcoded move IDs
     * By @AsparagusEduardo in https://github.com/rh-hideout/pokeemerald-expansion/pull/3982
         * `MOVE_EXPLOSION`, `MOVE_SELF_DESTRUCT`, `MOVE_FRUSTRATION`, `MOVE_AURA_WHEEL`, `MOVE_PRESENT`, `MOVE_BLIZZARD`.
     * By @ZnogyroP in https://github.com/rh-hideout/pokeemerald-expansion/pull/4085

docs/changelogs/1.8.x/1.8.3.md

@@ -23,8 +23,8 @@
     * Fixed Exp. Candies ignoring hard caps.
     * Fixed Pokémon gaining 1 experience if they are at the level cap.
 * Fixed evolution tracker issues by @cawtds in https://github.com/rh-hideout/pokeemerald-expansion/pull/4503
-    * `EVO_LEVEL_MOVE_TWENTY_TIMES` no longer increases with every move.
-    * `EVO_LEVEL_RECOIL_DAMAGE_MALE/FEMALE` is no longer updated twice than intended.
+    * `EVO_USE_MOVE_TWENTY_TIMES` no longer increases with every move.
+    * `EVO_RECOIL_DAMAGE_MALE/FEMALE` is no longer updated twice than intended.
 
 ## ✨ Feature Branches ✨
 ### ***TheXaman's HGSS Pokédex Plus***:

docs/changelogs/1.8.x/1.8.4.md

@@ -0,0 +1,174 @@
+# Version 1.8.4
+
+```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.8.4`.
+```
+
+## 🌋 *IMPORTANT CHANGES* 🌋
+### ***[Reverted Guillotine feature branch](https://github.com/rh-hideout/pokeemerald-expansion/pull/4525)*** by @AsparagusEduardo:
+* This was a runtime decapitalization branch introduced silently in version 1.8.0. We didn't properly announce as it was hastily merged and we were hoping that future versions of it would have fixed issues that we encountered after the merge. However, issues kept piling on and we felt the need to revert it as it was also silently breaking other features as well.
+* ***We will work on an alternate decapitalization option in the future***.
+
+## 💥 *Softlock/Crash fixes* 💥
+* Fixed softlock caused by Destiny Bond triggering after Explosion by @AlexOn1ine in https://github.com/rh-hideout/pokeemerald-expansion/pull/4516
+* Fixed softlock caused by Future Sight trying to hit a fainted target by @AlexOn1ine in https://github.com/rh-hideout/pokeemerald-expansion/pull/4543
+* Fixed softlock caused by Galvanized Explosion being absorbed by Volt Absorb by @AlexOn1ine in https://github.com/rh-hideout/pokeemerald-expansion/pull/4601
+* Fixed softlock caused by Flinging a Razor Fang when the target had already moved by @hedara90 in https://github.com/rh-hideout/pokeemerald-expansion/pull/4625
+
+## 🧬 General 🧬
+### Fixed
+* Fixed instances of Level Caps causing absurd amounts of Exp. by @Nopinou in https://github.com/rh-hideout/pokeemerald-expansion/pull/4505
+* Fixed `GetBoxMonData` evolution tracker reading garbage data if compiled with `agbcc` by @cawtds in https://github.com/rh-hideout/pokeemerald-expansion/pull/4510
+* Fixed potential Berry Tree mutation corruptions when compiling with `agbcc` by @Bassoonian in https://github.com/rh-hideout/pokeemerald-expansion/pull/4535
+* Added missing EOF newlines to `species_info` files by @Bassoonian in https://github.com/rh-hideout/pokeemerald-expansion/pull/4584
+* Fixed `EVO_MODE_BATTLE_SPECIAL` evolutions (only Sirfetch'd currently) triggering twice under certain situations by @cawtds in https://github.com/rh-hideout/pokeemerald-expansion/pull/4553
+    * As a side effect, these evolutions no longer happen before other ones, instead being triggered in party order alongside `EVO_MODE_NORMAL`.
+
+## ✨ Feature Branches ✨
+### ***TheXaman's Debug Menu***:
+#### Fixed
+* Fixed abilities past ID 255 not being properly being given to Pokémon using the debug menu's Give Pokémon option by @Bassoonian in https://github.com/rh-hideout/pokeemerald-expansion/pull/4576
+### ***SBird/Karathan's Dynamic Multichoices***:
+#### Changed
+* Dynamic Multichoice no longer plays sound on init by @Sneed69 in https://github.com/rh-hideout/pokeemerald-expansion/pull/4480
+### ***TheXaman's HGSS Pokédex Plus***:
+#### Fixed
+* Multiple evolution page fixes by @Sneed69 in https://github.com/rh-hideout/pokeemerald-expansion/pull/4514
+    * Fixed duplicate icons when 2 or more evolution methods share the same target species (eg. Magnezone evolution via Thunder Stone or Electromagnetic field).
+    * Fixed arrow not loading when there are multiple evolution methods to the same target species that hadn't been caught.
+    * Fixed wonky D-Pad inconsistency when scrolling down.
+    * Fixed regression from #3562 (1.7.0) that caused non-evolving Pokémon to not show their "X has no evolution" text.
+        * **Change from the original branch:** The message no longer shows for Pokémon that are part of an evolutionary family, even if they don't evolve themselves (eg. Venusaur).
+* Added failsafe for Egg Groups without text defined by @AsparagusEduardo in https://github.com/rh-hideout/pokeemerald-expansion/pull/4628
+### ***ghoulslash's Saveblock Cleansing***:
+#### Changed
+* Adjusted description of `FREE_MATCH_CALL` config to clarify that the VS Seeker also utilizes that data by @Pawkkie in https://github.com/rh-hideout/pokeemerald-expansion/pull/4590
+
+## 🐉 Pokémon 🐉
+### Added
+* Added missing Gen 9 and PLA footprints + update some footprints by @kittenchilly in https://github.com/rh-hideout/pokeemerald-expansion/pull/4621
+    * Credits to Caruban for creating the sprites: eeveeexpo.com/resources/1101 https://eeveeexpo.com/resources/1101/
+### Changed
+* Update various sprites to ones from PokeCommunity by @kittenchilly in https://github.com/rh-hideout/pokeemerald-expansion/pull/4554
+* Updated footprints to Gen 4/5 designs, being more accurate to their designs @kittenchilly in https://github.com/rh-hideout/pokeemerald-expansion/pull/4621
+    * Golem, Ludicolo, Shroomish and Mawile.
+    * Also updated Origin Giratina to have an empty footprint.
+* Explicitly define Gengar's 3rd ability slot (Hidden Ability) by @lhearachel in https://github.com/rh-hideout/pokeemerald-expansion/pull/4633
+### Fixed
+* Fixed animation errors by adding missing 2nd frames:
+    * Keldeo Resolute and Meloetta Pirouette by @TheJamesLJ in https://github.com/rh-hideout/pokeemerald-expansion/pull/4541
+    * White-Striped Basculin and Neutral Xerneas @cafei-uh in https://github.com/rh-hideout/pokeemerald-expansion/pull/4552
+    * Summer, Autumn and Winter Sawsbuck by @cafei-uh in https://github.com/rh-hideout/pokeemerald-expansion/pull/4592
+* Fixed Unown B-Z and Punctuation Marks entry animations by @cafei-uh in https://github.com/rh-hideout/pokeemerald-expansion/pull/4546
+* Fixed Iron Hands and Iron Bundle incorrect backsprite palettes @cafei-uh in https://github.com/rh-hideout/pokeemerald-expansion/pull/4552
+* Fixed transparent pixel in Mega Mewtwo Y's backsprite eye by @TheJamesLJ in https://github.com/rh-hideout/pokeemerald-expansion/pull/4541
+* Fixed floating Munkidori backsprite @cafei-uh in https://github.com/rh-hideout/pokeemerald-expansion/pull/4552
+* Fixed Salandit's sprite and palettes by @BlueAnthem37510 in https://github.com/rh-hideout/pokeemerald-expansion/pull/4614
+* Fixed regression from #4230 (1.8.0) that caused Mr. Mime's typing to ignore `P_UPDATED_TYPES` by @PhallenTree in https://github.com/rh-hideout/pokeemerald-expansion/pull/4547
+* Fixed silent Oricorio Pom-Pom cry by @cafei-uh in https://github.com/rh-hideout/pokeemerald-expansion/pull/4551
+* Fixed regression from #4360 (1.8.2) that caused Shaymin to changing form with the incorrect status + receiving damage upon form change by @TheJamesLJ in https://github.com/rh-hideout/pokeemerald-expansion/pull/4559
+
+## ⚔️ Battle General ⚔️ ##
+### Fixed
+* Fixed Imposter and Transform causing the user to look shiny until screen is refreshed if they're not in the first party slot by @Sneed69 in https://github.com/rh-hideout/pokeemerald-expansion/pull/4486
+* Fixed regression in #4307 (1.8.2) that caused special battle types to not finish correctly by @ghoulslash in https://github.com/rh-hideout/pokeemerald-expansion/pull/4536
+* Fixed multiple Speed ignoring effects by @Sneed69 in https://github.com/rh-hideout/pokeemerald-expansion/pull/4613
+    * Fixed Quick Draw always outspeeding Quick Claw and Custap Berry.
+    * Fixed Myceleum Might always outspeeding Stall.
+
+## 🤹 Moves 🤹
+### Changed
+* Ported Explosion/Mind Blown/Steel Beam implementation from CFRU (with tweaks) by @AlexOn1ine in https://github.com/rh-hideout/pokeemerald-expansion/pull/4516
+### Fixed
+* Fixes Thief and Covet used by an opponent not stealing items by @PhallenTree in https://github.com/rh-hideout/pokeemerald-expansion/pull/4506
+* Fixed Substitute, Fillet Away, Shed Tail and Belly Drum missing their `HITMARKER_PASSIVE_DAMAGE`, which weretriggering effects where they shouldn't by @hedara90 in https://github.com/rh-hideout/pokeemerald-expansion/pull/4533
+    * Cleanup by @AsparagusEduardo in https://github.com/rh-hideout/pokeemerald-expansion/pull/4629
+* Fixed Copycat issues by @PhallenTree in https://github.com/rh-hideout/pokeemerald-expansion/pull/4549
+    * Copycat can no longer call Z-Moves.
+    * 2-turn moves no longer play their animation twice when called by Copycat.
+* Fixed Substitute issues by @hedara90 in https://github.com/rh-hideout/pokeemerald-expansion/pull/4558
+    * The following secondary effects no longer occur if the target is behind a Substitute.
+        * Knock Off
+        * Salt Cure
+        * Smack Down/Thousand Arrows
+        * Wake-Up Slap/Smelling Salts, including doubling in damage, unless they have the `ignoresSubstitute` like Sparkling Aria.
+* Fixed move animations by @Sneed69 in https://github.com/rh-hideout/pokeemerald-expansion/pull/4560
+    * Animations using `AnimTask_ShakeMonInPlace`: Last Resort,, Aqua Tail, Earth Power, Giga Impact, Zen Headbutt, Rock Climb, Stone Edge and Attack Order
+    * Animations using `AnimTask_HorizontalShake`: Sunsteel Strike and Chloroblast
+* Fixed Future Sight/Doom Desire triggering Focus Sash but not consuming the item moves by @hedara90 in https://github.com/rh-hideout/pokeemerald-expansion/pull/4625
+
+## 🎭 Abilities 🎭
+### Fixed
+* Fixed Gulp Missile not triggering before fainting by @BlueAnthem37510 in https://github.com/rh-hideout/pokeemerald-expansion/pull/4502
+* Fixed Parental Bond converting Multi-Hit moves into in two-hit moves by @iriv24 in https://github.com/rh-hideout/pokeemerald-expansion/pull/4570
+* Fixed Magic Guard not preventing recoil damage by @iriv24 in https://github.com/rh-hideout/pokeemerald-expansion/pull/4578
+* Fixed Inner Focus, Scrappy, Oblivious and Own Temp granting immunity to all stat drops if the attacker has Intimidate by @kittenchilly in https://github.com/rh-hideout/pokeemerald-expansion/pull/4606
+* Fixed Moxie-like abilities not triggering when fainting the target with G-Max/Max Moves by @hedara90 in https://github.com/rh-hideout/pokeemerald-expansion/pull/4625
+
+## 🧶 Items 🧶
+### Added
+* Added missing Stellar Tera Shard sprite by @kittenchilly in https://github.com/rh-hideout/pokeemerald-expansion/pull/4595
+### Fixed
+* Fixed overflowing item descriptions for Dubious Disc and for Ice Beam and Blizzard TMs when `B_USE_FROSTBITE` is set to `TRUE` by @WillKolada in https://github.com/rh-hideout/pokeemerald-expansion/pull/4540
+* Fixed plural of "Exp. Candy XL" by @Bassoonian in https://github.com/rh-hideout/pokeemerald-expansion/pull/4574
+* Fixed Elixir only being usable if the first move was missing PP by @hedara90 in https://github.com/rh-hideout/pokeemerald-expansion/pull/4594
+* Fixed Full Restore not curing statuses when used on party member that's not in battle by @cawtds in https://github.com/rh-hideout/pokeemerald-expansion/pull/4603
+* Fixed Sceptilite using Tyranitarite's palette by @BlueAnthem37510 in https://github.com/rh-hideout/pokeemerald-expansion/pull/4614
+* Fixed Dire Hit being used on incorrect targets by @cawtds in https://github.com/rh-hideout/pokeemerald-expansion/pull/4626
+
+## 🤖 Battle AI 🤖
+### Changed
+* AI is now aware that Dynamaxed targets are immune to Heat Crash's effect by @WillKolada in https://github.com/rh-hideout/pokeemerald-expansion/pull/4521
+* AI now ignores resistances that don't actually apply when checking for bad moves by @Sneed69 in https://github.com/rh-hideout/pokeemerald-expansion/pull/4524
+    * For example: Super Fang, Counter and Endeavor.
+* Stat stage related AI improvements by @Sneed69 in https://github.com/rh-hideout/pokeemerald-expansion/pull/4548
+    * Contrary is now properly checked.
+    * Some evasion and accuracy checks that were incorrectly handled are now fixed.
+* Updated AI scores for Status moves that Dynamax Pokémon are immune to by @WillKolada in https://github.com/rh-hideout/pokeemerald-expansion/pull/4523
+    * Roar, One-Hit KO moves, Disable, Encore, Torment, Destiny Bond, Skill Swap, Entrainment, Instruct and Skill Swappokeemerald-expansion/pull/4518
+### Fixed
+* Various AI switching logic fixes by @Sneed69 in https://github.com/rh-hideout/pokeemerald-expansion/pull/4571
+    * Weather-based healing was treated as damage
+    * Damage and healing from multiple sources overwrote each other
+    * Utility Umbrella and Magic Guard were ignored.
+    * Max G-Steelsurge was ignored.
+    * Sitrus Berry's Gen 4+ effect was ignored.
+    * Removed item ID hardcoding for confuse berries.
+* Various AI switching logic fixes Part 2 by @Sneed69 in https://github.com/rh-hideout/pokeemerald-expansion/pull/4572
+    * AI now calculates damage from the badly poisoned status.
+    * AI now removes weather damage from current AI instead of adding it.
+    * Cleanup for #4571
+* AI respects partner when using spread moves in double battles by @AlexOn1ine in https://github.com/rh-hideout/
+* Fixed AI not properly reading that Belch could be used after eating a berry by @Pawkkie in https://github.com/rh-hideout/pokeemerald-expansion/pull/4616
+
+## 🧹 Other Cleanup 🧹
+### Fixed
+* Fixed `BS_SetGlaiveRush` formatting by @AlexOn1ine in https://github.com/rh-hideout/pokeemerald-expansion/pull/4610
+
+## 🧪 Test Runner 🧪
+### Added
+* Added tests to verify Parental Bond doesn't affect `EFFECT_MULTI_HIT` moves by @iriv24 in https://github.com/rh-hideout/pokeemerald-expansion/pull/4573
+* Added missing Move Effect TODO tests - Volume A by @AsparagusEduardo in https://github.com/rh-hideout/pokeemerald-expansion/pull/4569
+    * Handles all `EFFECTS_x` that start with A, other effects will follow. Once all TODO tests are added, tests can begin to be written to assure that all current functionalities are fully functional.
+### Fixed
+* Fixed incorrect Quick Claw test name by @Sneed69 in https://github.com/rh-hideout/pokeemerald-expansion/pull/4613
+
+## 📦 Pret merges 📦
+* Pre-1.8.4 pret merge (2024/05/26) (v2) by @SBird1337 in https://github.com/rh-hideout/pokeemerald-expansion/pull/4637
+    * Fix poison projectile array being incorrectly combined into three separate arrays by @NTx86 in https://github.com/pret/pokeemerald/pull/1989
+    * Fix hoenn pokedex palette being split in two by @NTx86 in https://github.com/pret/pokeemerald/pull/1990
+    * Fix Pokeblock script missing a releaseall by @Jaizu in https://github.com/pret/pokeemerald/pull/1996
+    * Fix Pokeblock script missing a releaseall by @Jaizu in https://github.com/pret/pokeemerald/pull/1996
+    * Make AdjustFriendship more readable by @Jaizu in https://github.com/pret/pokeemerald/pull/1995
+    * Move POKE_ICON_BASE_PAL_TAG to a header by @Sneed69 in https://github.com/pret/pokeemerald/pull/1998
+
+## New Contributors
+* @BlueAnthem37510 made their first contribution in https://github.com/rh-hideout/pokeemerald-expansion/pull/4502
+* @TheJamesLJ made their first contribution in https://github.com/rh-hideout/pokeemerald-expansion/pull/4541
+* @iriv24 made their first contribution in https://github.com/rh-hideout/pokeemerald-expansion/pull/4570
+
+**Full Changelog**: https://github.com/rh-hideout/pokeemerald-expansion/compare/expansion/1.8.3...expansion/1.8.4
+
+<!--Last PR: 4637-->

graphics/battle_anims/sprites/dreepy_missile.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+153 217 234
+254 87 103
+77 119 117
+62 67 67
+170 237 211
+138 189 179
+121 163 146
+77 119 117
+251 234 137
+195 97 109
+78 52 54
+222 214 198
+173 146 118
+151 135 135
+122 105 94
+0 4 1

graphics/battle_anims/sprites/dreepy_missile_shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+153 217 234
+222 223 109
+77 119 117
+62 67 67
+170 237 211
+138 189 179
+77 171 225
+53 110 226
+251 234 137
+195 97 109
+78 52 54
+222 214 198
+173 146 118
+151 135 135
+122 105 94
+0 4 1

graphics/items/icon_palettes/sceptilite.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 255 0 128
-48 48 48
-80 96 80
-184 40 48
-248 32 32
-128 160 104
-168 192 160
-248 160 152
-192 96 64
-248 248 248
-64 64 64
-96 120 88
-192 208 120
-0 0 0
-0 0 0
-0 0 0
+115 57 41
+197 148 123
+255 255 255
+197 148 115
+82 131 74
+172 197 164
+189 115 82
+148 115 74
+65 106 65
+164 139 90
+115 189 115
+222 98 82
+41 74 41
+49 49 49
+189 246 213

graphics/items/icon_palettes/stellar_tera_shard.pal

@@ -0,0 +1,18 @@
+JASC-PAL
+0100
+15
+0 255 92
+147 87 0
+0 161 79
+0 0 0
+209 155 7
+57 67 189
+167 25 135
+217 120 165
+189 109 220
+167 219 139
+255 239 132
+246 240 183
+171 225 199
+137 195 227
+233 240 241

graphics/pokedex/bg_hoenn.pal

@@ -1,6 +1,6 @@
 JASC-PAL
 0100
-48
+96
 123 131 0
 255 255 255
 222 222 222
@@ -49,3 +49,51 @@ JASC-PAL
 49 139 255
 189 156 90
 0 0 0
+123 131 0
+255 255 255
+255 238 0
+255 189 0
+255 115 0
+98 98 115
+41 57 65
+41 57 106
+0 0 41
+255 255 255
+238 246 57
+255 0 189
+49 213 74
+24 131 32
+189 156 90
+0 0 0
+123 131 0
+255 255 255
+197 32 32
+189 189 189
+164 164 164
+98 98 115
+41 57 65
+41 57 106
+0 0 41
+255 255 255
+238 246 57
+189 0 0
+74 148 180
+8 90 131
+189 156 90
+0 0 0
+123 131 0
+255 255 255
+197 32 32
+189 189 189
+164 164 164
+98 98 115
+41 57 65
+41 57 106
+0 0 41
+255 255 255
+238 246 57
+255 0 189
+180 205 246
+49 139 255
+189 156 90
+0 0 0

graphics/pokedex/caught_screen.pal

@@ -1,51 +0,0 @@
-JASC-PAL
-0100
-48
-123 131 0
-255 255 255
-255 238 0
-255 189 0
-255 115 0
-98 98 115
-41 57 65
-41 57 106
-0 0 41
-255 255 255
-238 246 57
-255 0 189
-49 213 74
-24 131 32
-189 156 90
-0 0 0
-123 131 0
-255 255 255
-197 32 32
-189 189 189
-164 164 164
-98 98 115
-41 57 65
-41 57 106
-0 0 41
-255 255 255
-238 246 57
-189 0 0
-74 148 180
-8 90 131
-189 156 90
-0 0 0
-123 131 0
-255 255 255
-197 32 32
-189 189 189
-164 164 164
-98 98 115
-41 57 65
-41 57 106
-0 0 41
-255 255 255
-238 246 57
-255 0 189
-180 205 246
-49 139 255
-189 156 90
-0 0 0