Squashed commit of the following:

commit 35f7e16 Author: johannakullmann <151456919+johannakullmann@users.noreply.github.com> Date: Sat Mar 2 21:07:20 2024 +0100 update gitignore to include poryscript folder commit c8a7df0 Merge: 5a6bc81 bb01ab6 Author: Johanna K <kujojoo@gmail.com> Date: Sat Mar 2 20:59:03 2024 +0100 Merge tag 'expansion/1.7.4' of https://github.com/rh-hideout/pokeemerald-expansion commit bb01ab6 Author: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> Date: Sun Feb 18 21:53:12 2024 -0300 Version 1.7.4 (rh-hideout#4203) * Version 1.7.4 commit 585e06e Author: kittenchilly <mario.pikmin.zelda@gmail.com> Date: Sun Feb 18 14:30:52 2024 -0600 Move Tatsugiri and Squawkabilly base species icons to graphic root folders (rh-hideout#4212) commit 3d2e0d2 Author: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> Date: Sun Feb 18 06:21:56 2024 -0300 Fixed Ursaluna's cry using P_GEN_9_CROSS_EVOS (rh-hideout#4210) commit 45cee81 Author: Wesmaster <34153881+Wesmaster@users.noreply.github.com> Date: Sat Feb 17 20:26:45 2024 +0100 Fixed LastUsedBall not being saved and DisplayBall not being shown (rh-hideout#4209) In rh-hideout#4168 b7d7709 a memset was added but this causes the issue rh-hideout#4200. The sizeof was done on the variable instead of the struct. This caused other variables in EWRAM to loose their value. I have no idea if this fix breaks what was intented to do in rh-hideout#4168. Also fixed the issue reported in my comment. When you run out of balls gLastThrownBall has a value, but you enter the if statement because you have no more balls. There the next in line ball is set to display but if there are non there is nothing to display. Afterwards when you get a new ball, you do not enter the if statement to update the gBallToDisplay because the ball is in the bag and gLastThrownBall is still set to not 0. Then it's checked if the bag has gBallToDisplay which does not point to a ball and therefor nothing is shown. Now we only update gBallToDisplay if there is actually a ball to display. commit 20a3d91 Author: MelonSpeedruns <melonspeedruns@outlook.com> Date: Thu Feb 15 13:56:32 2024 -0500 Fixed Basculegion Back Sprite Offset & Greninja forms animations (rh-hideout#4198) commit 6a61e65 Author: Bassoonian <iasperbassoonian@gmail.com> Date: Thu Feb 15 13:07:31 2024 +0100 Fix height call (rh-hideout#4195) commit ab2260a Author: cmy2008 <65344456+cmy2008@users.noreply.github.com> Date: Thu Feb 15 17:21:35 2024 +0800 Deleted a space (rh-hideout#4194) commit 3598a18 Author: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Sun Feb 11 10:40:30 2024 +0100 Adds config for Soundproof change during Uproar status (rh-hideout#4174) commit b4fa0b1 Author: Bassoonian <iasperbassoonian@gmail.com> Date: Sat Feb 10 18:43:14 2024 +0100 Clean up space/tabs difference (rh-hideout#4163) commit b7d7709 Author: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Sat Feb 10 18:18:29 2024 +0100 Fixes Opportunist accumulating stat changes (rh-hideout#4168) * Fixes Opportunist accumulating stat changes * move memset to TurnValuesCleanUp * Update test/battle/ability/opportunist.c --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> commit 8b871b7 Author: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> Date: Sat Feb 10 13:13:46 2024 -0300 Fixed Disguise not ending the battle in the correct form (rh-hideout#4167) * Fixed Disguise not ending the battle in the correct form * Added TODO comments commit 5a6bc81 Merge: 7a37a99 2d24f96 Author: Johanna K <kujojoo@gmail.com> Date: Sat Feb 10 14:29:58 2024 +0100 Merge tag 'expansion/1.7.3' of https://github.com/rh-hideout/pokeemerald-expansion commit 0f312e3 Author: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> Date: Fri Feb 9 18:51:36 2024 -0300 Fixed Ogerpon shiny palettes (rh-hideout#4165) commit 47abc33 Author: Hungry Pickle <81360291+HungryPickle@users.noreply.github.com> Date: Fri Feb 9 09:35:40 2024 -0500 Fixes Stench ability triggering on non-damaging attacks (rh-hideout#4159) * Fixes Stench ability triggering on non-damaging attacks * adds stench ability test * added stench ability test for partner pokemon --------- Co-authored-by: HungryPickle <beardybirdy@gmail.com> commit e89f8e0 Author: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Fri Feb 9 14:00:42 2024 +0100 Fixes Hit Escape moves interaction with hold effects and switch in ab… (rh-hideout#4091) * Fixes Hit Escape moves interaction with hold effects and switch in abilities * leftover * fix spelling * fix desc. commit 31ac151 Author: DizzyEggg <jajkodizzy@wp.pl> Date: Fri Feb 9 13:58:16 2024 +0100 Fix Full Restore / Antidote not reseting Toxic Counter (rh-hideout#4135) * Fix Full Restore / Antidote not reseting Toxic Counter * Update battle_scripts_2.s --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> commit 4524325 Author: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Wed Feb 7 15:42:22 2024 +0100 Kee berry (rh-hideout#4149) * Fixes Kee Berry * new line * Fix fix --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> commit fa5f507 Author: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Tue Feb 6 23:30:57 2024 +0100 Fixes Mycelium Might speed bracker (rh-hideout#4146) Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> commit 6a71e14 Author: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> Date: Tue Feb 6 08:39:42 2024 -0300 Added credits section to PR template (rh-hideout#4141) commit 8b70cea Author: ravepossum <145081120+ravepossum@users.noreply.github.com> Date: Mon Feb 5 09:40:25 2024 -0500 Fix screen select bar popping in too early for area screen in HGSS dex (rh-hideout#4094) * fixing screen select bar popping in too early for area screen in HGSS pokedex * exit early from select bar load function if dex is disabled * remove unnecessary early exit --------- Co-authored-by: ravepossum <ravepossum@example.com> Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> commit 065c0ec Author: DizzyEggg <jajkodizzy@wp.pl> Date: Sun Feb 4 23:23:03 2024 +0100 Fairy Lock animation fix (rh-hideout#4111) * Fairy Lock animation fix * remove comment * fairy lock anim hopefully works --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> commit 512ab98 Author: DizzyEggg <jajkodizzy@wp.pl> Date: Sun Feb 4 16:13:27 2024 +0100 Fix disobedience not resetting multihit moves (rh-hideout#4133) commit e75169f Author: ravepossum <145081120+ravepossum@users.noreply.github.com> Date: Sat Feb 3 14:07:47 2024 -0500 Fix HGSS Dex List Decapped Tileset (rh-hideout#4126) * fix decap HGSS dex tileset scroll bar * more tileset fixes --------- Co-authored-by: ravepossum <ravepossum@example.com> Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> commit 46d9adb Author: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Sat Feb 3 19:34:52 2024 +0100 Fixes Eerie Spell double pp and message drop (rh-hideout#4127) Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> commit 85eea48 Author: DizzyEggg <jajkodizzy@wp.pl> Date: Sat Feb 3 16:56:50 2024 +0100 Fix move animation crashing on some emulators because of division by zero (rh-hideout#4121) * fix flip turn div by zero * fix incinerate move anim div by zero commit e828ae5 Author: kaicardenas2 <150625530+kaicardenas2@users.noreply.github.com> Date: Thu Feb 1 19:20:10 2024 -0500 Non-Tagged Release (rh-hideout#4109) commit 2d24f96 Author: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> Date: Thu Feb 1 20:55:53 2024 -0300 Version 1.7.3 (rh-hideout#4106) * Version 1.7.3 * Latest changelog commit 1d9e692 Merge: 1a65894 e8538ef Author: DizzyEggg <jajkodizzy@wp.pl> Date: Thu Feb 1 20:19:14 2024 +0100 Unused warnings are no longer treated as errrors by default (rh-hideout#4092) commit e8538ef Merge: 5af733a 1a65894 Author: Bassoonian <iasperbassoonian@gmail.com> Date: Thu Feb 1 13:48:44 2024 +0100 Merge branch 'master' into _RHH/pr/master/unused commit 1a65894 Author: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Wed Jan 31 13:33:04 2024 +0100 Fixes test description + small fix follow up (rh-hideout#4100) * Fixes test description + small fix follow up * fix fix * Apply suggestions from code review --------- Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> commit 5af733a Merge: f7e5709 f562359 Author: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> Date: Wed Jan 31 08:18:55 2024 -0300 Merge branch 'master' into _RHH/pr/master/unused commit f7e5709 Author: Eduardo Quezada <eduardo602002@gmail.com> Date: Wed Jan 31 08:18:43 2024 -0300 Review changes commit f562359 Author: DizzyEggg <jajkodizzy@wp.pl> Date: Tue Jan 30 16:14:33 2024 +0100 Fix AI trying to switch into the same mon 2 times (rh-hideout#4098) commit 8b62828 Author: ravepossum <145081120+ravepossum@users.noreply.github.com> Date: Mon Jan 29 15:51:10 2024 -0500 Fix HGSS Dex dark mode search palette (rh-hideout#4095) Co-authored-by: ravepossum <ravepossum@example.com> Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> commit a2a38a5 Author: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> Date: Mon Jan 29 17:01:50 2024 -0300 Added passing "KNOWN_FAILING" to test summary (rh-hideout#4063) * Added passing "KNOWN_FAILING" to test summary * Added test names for passing KNOWN_FAILING to summary * Removed unused function commit a0bcdbf Author: Eduardo Quezada <eduardo602002@gmail.com> Date: Mon Jan 29 13:31:42 2024 -0300 Workflow test worked, undoing changes commit e8a6c46 Author: Eduardo Quezada <eduardo602002@gmail.com> Date: Mon Jan 29 13:19:01 2024 -0300 Only do unused error under RHH's repo + workflow test commit 2988883 Author: Eduardo Quezada <eduardo602002@gmail.com> Date: Mon Jan 29 12:52:03 2024 -0300 Unused warnings are not treated as errrors by default commit 127a7e9 Author: Eduardo Quezada <eduardo602002@gmail.com> Date: Sun Jan 28 20:43:14 2024 -0300 Backported gHeap alignment fix from upstream pret commit 9bcd46b Author: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Sun Jan 28 19:15:53 2024 +0100 Fixes Pursuit, Tangling Hair interaction (rh-hideout#4086) commit 3e50480 Author: johannakullmann <151456919+johannakullmann@users.noreply.github.com> Date: Sat Jan 27 15:59:39 2024 +0100 Fixed graphics bug with Steven double battle (rh-hideout#4078) Caused the wrong palette to be used during Steven's ball throw animation in the Mossdeep Space Center fight. commit e995927 Author: Bassoonian <iasperbassoonian@gmail.com> Date: Fri Jan 26 21:11:04 2024 +0100 Add extra key item bag space checks (rh-hideout#4066) * Fix 4019 * I am exceedingly brilliant in my failure to build before pushing commit 91f429b Author: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Mon Jan 22 13:55:08 2024 +0100 Fixes Glimmering Charm (rh-hideout#4047) Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> commit b99ec5d Author: Bassoonian <iasperbassoonian@gmail.com> Date: Mon Jan 22 00:07:19 2024 +0100 Update level_up_learnsets.h (rh-hideout#4046) commit 0ec777d Author: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Sun Jan 21 23:42:01 2024 +0100 Fixes Mind Blown / Magic Guard interaction and renames Steel Beam effect (rh-hideout#4043) * Fixes Mind Blown / Magic Guard interaction and renames Steel Beam effect * review fixes --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> commit a01d442 Author: Mathew Arnold <mattyarnold@hotmail.co.uk> Date: Sun Jan 21 17:23:55 2024 +0000 Fixed Kingra's learnset gen (rh-hideout#4044) In level_up_learnsets.h, Kingdra's learnset was inside a check for P_GEN_4_CROSS_EVOS. As a Gen 2 Pokemon, this has been updated to check for P_GEN_2_CROSS_EVOS instead. commit 9286b80 Author: Bassoonian <iasperbassoonian@gmail.com> Date: Sun Jan 21 13:02:45 2024 +0100 Remove illegal moves from teachable learnsets (rh-hideout#4042) Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> commit 35e2157 Author: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Sun Jan 21 12:27:58 2024 +0100 Fixes ability Corrosion (rh-hideout#4037) * Fixes ability Corrosion * forgot AI_CanPoisonType * More tests * review comments applied * more review changes * simplify CanPosionType (original state) * remove redundant function --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> commit 04fa3aa Author: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Sun Jan 21 11:08:25 2024 +0100 Fixes Emergency Exit when hp is restored over tag out range (rh-hideout#4041) * Fixes Emergency Exit when hp is restored over tag out range * Update test/battle/ability/emergency_exit.c Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> commit 53a46b7 Author: Bassoonian <iasperbassoonian@gmail.com> Date: Sun Jan 21 10:25:37 2024 +0100 Remove faulty teachable learnset moves (rh-hideout#4039) commit 73a1fa3 Author: Philipp AUER <SBird1337@users.noreply.github.com> Date: Sun Jan 21 09:11:10 2024 +0100 fix: emergency exit cutoff off by 1 on odd max hp (rh-hideout#4040) * fix: emergency exit cutoff off by 1 on odd max hp * squash!: newline at end of file --------- Co-authored-by: sbird <sbird@no.tld> commit d125da7 Author: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Sat Jan 20 22:48:34 2024 +0100 Fixes Life Orb + Eject Pack / Red Card interaction (rh-hideout#4038) * Fixes Life Orb + Eject Pack / Red Card interaction * fix test
johannakullmann · Mar 2, 2024 · d10193e · d10193e
1 parent dcd953c
commit d10193e
Show file tree

Hide file tree

Showing 104 changed files with 2,863 additions and 667 deletions.
diff --git a/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml b/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
@@ -23,9 +23,11 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using as a base?
       options:
-        - 1.7.2 (Latest release)
+        - 1.7.4 (Latest release)
         - master (default when pulling, unreleased bugfixes)
         - upcoming (Edge)
+        - 1.7.3
+        - 1.7.2
         - 1.7.1
         - 1.7.0
         - 1.6.2

diff --git a/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml b/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
@@ -23,9 +23,11 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using as a base?
       options:
-        - 1.7.2 (Latest release)
+        - 1.7.4 (Latest release)
         - master (default when pulling, unreleased bugfixes)
         - upcoming (Edge)
+        - 1.7.3
+        - 1.7.2
         - 1.7.1
         - 1.7.0
         - 1.6.2

diff --git a/.github/ISSUE_TEMPLATE/04_other_errors.yaml b/.github/ISSUE_TEMPLATE/04_other_errors.yaml
@@ -23,9 +23,11 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using as a base?
       options:
-        - 1.7.2 (Latest release)
+        - 1.7.4 (Latest release)
         - master (default when pulling, unreleased bugfixes)
         - upcoming (Edge)
+        - 1.7.3
+        - 1.7.2
         - 1.7.1
         - 1.7.0
         - 1.6.2

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -11,8 +11,14 @@
 <!-- Format: "Fixes #2345, fixes #4523, fixes #2222." -->
 <!-- If it doesn't apply, feel free to remove this section. -->
 
+## **People who collaborated with me in this PR**
+<!-- Please credit everyone else that contributed to this PR, be it code and/or assets. -->
+<!-- Use their GitHub tag if they have one. -->
+<!-- If it doesn't apply, feel free to remove this section. -->
+
 ## Feature(s) this PR does NOT handle:
 <!-- If your PR contains any unfinished features that are not considered merge-blocking, please list them here for clarity so no one can forget. -->
+<!-- If it doesn't apply, feel free to remove this section. -->
 
 ## **Discord contact info**
 <!--- formatted as name#numbers, e.g. Lunos#4026 -->

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,6 +17,7 @@ jobs:
       GAME_LANGUAGE: ENGLISH
       MODERN: 0
       COMPARE: 0
+      UNUSED_ERROR: 1
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/.gitignore b/.gitignore
@@ -20,7 +20,6 @@
 sound/**/*.bin
 sound/songs/midi/*.s
 tools/agbcc
-tools/poryscript
 *.map
 *.bat
 *.dump

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,11 @@
 # Pokeemerald-Expansion Changelogs
 
-## [Version 1.7.2](docs/changelogs/1.7.2.md) - Bugfix Release
-
-## [Version 1.7.1](docs/changelogs/1.7.1.md) - Bugfix Release
-
-## [Version 1.7.0](docs/changelogs/1.7.0.md) - Feature Release
-
-## [Version 1.6.2](docs/changelogs/1.6.2.md) - Bugfix Release
+## Version 1.7.x
+### [Version 1.7.4](docs/changelogs/1.7.4.md) - Bugfix Release
+### [Version 1.7.3](docs/changelogs/1.7.3.md) - Bugfix Release
+### [Version 1.7.2](docs/changelogs/1.7.2.md) - Bugfix Release
+### [Version 1.7.1](docs/changelogs/1.7.1.md) - Bugfix Release
+### [Version 1.7.0](docs/changelogs/1.7.0.md) - Feature Release
+
+## Version 1.6.x
+### [Version 1.6.2](docs/changelogs/1.6.2.md) - Bugfix Release
diff --git a/Makefile b/Makefile
@@ -36,13 +36,14 @@ else
 EXE :=
 endif
 
-TITLE       := POKEMON AMET
-GAME_CODE   := BPEE
-MAKER_CODE  := 01
-REVISION    := 0
-MODERN      ?= 1
-TEST        ?= 0
-ANALYZE     ?= 0
+TITLE        := POKEMON AMET
+GAME_CODE    := BPEE
+MAKER_CODE   := 01
+REVISION     := 0
+MODERN       ?= 1
+TEST         ?= 0
+ANALYZE      ?= 0
+UNUSED_ERROR ?= 0
 
 ifeq (agbcc,$(MAKECMDGOALS))
   MODERN := 0
@@ -127,6 +128,12 @@ override CFLAGS += -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi
 ifeq ($(ANALYZE),1)
 override CFLAGS += -fanalyzer
 endif
+# Only throw an error for unused elements if its RH-Hideout's repo
+ifeq ($(UNUSED_ERROR),0)
+ifneq ($(GITHUB_REPOSITORY_OWNER),rh-hideout)
+override CFLAGS += -Wno-error=unused-variable -Wno-error=unused-const-variable -Wno-error=unused-parameter -Wno-error=unused-function -Wno-error=unused-but-set-parameter -Wno-error=unused-but-set-variable -Wno-error=unused-value -Wno-error=unused-local-typedefs
+endif
+endif
 ROM := $(MODERN_ROM_NAME)
 OBJ_DIR := $(MODERN_OBJ_DIR_NAME)
 LIBPATH := -L "$(dir $(shell $(PATH_MODERNCC) -mthumb -print-file-name=libgcc.a))" -L "$(dir $(shell $(PATH_MODERNCC) -mthumb -print-file-name=libnosys.a))" -L "$(dir $(shell $(PATH_MODERNCC) -mthumb -print-file-name=libc.a))"

diff --git a/README.md b/README.md
@@ -7,7 +7,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 v1.7.2 https://github.com/rh-hideout/pokeemerald-expansion/
+Based off RHH's pokeemerald-expansion v1.7.3 https://github.com/rh-hideout/pokeemerald-expansion/
 ```
 
 ## What features are included?
@@ -133,7 +133,7 @@ Based off RHH's pokeemerald-expansion v1.7.2 https://github.com/rh-hideout/pokee
         - Accesible by pressing `R + Start` in the overworld by default.
         - **Additional features**:
             - *Clear Boxes*: cleans every Pokémon from the Boxes.
-            - *Hatch an Egg*: lets you choose an Egg in your party and immediatly hatch it.
+            - *Hatch an Egg*: lets you choose an Egg in your party and immediately hatch it.
     - [HGSS Pokédex](https://github.com/TheXaman/pokeemerald/tree/tx_pokedexPlus_hgss) by @TheXaman
         - May be disabled.
         - **Additional features**:
@@ -166,7 +166,7 @@ With this, you'll get the latest version of pokeemerald-expansion, plus a couple
 
 ## **How do I update my version of pokeemerald-expansion?**
 - If you haven't set up a remote, run the command `git remote add RHH https://github.com/rh-hideout/pokeemerald-expansion`.
-- Once you have your remote set up, run the command `git pull RHH expansion/1.7.2`.
+- Once you have your remote set up, run the command `git pull RHH expansion/1.7.4`.
 
 ### Please consider crediting the entire [list of contributors](https://github.com/rh-hideout/pokeemerald-expansion/wiki/Credits) in your project, as they have all worked hard to develop this project :)
 

diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc
@@ -1332,12 +1332,14 @@
 	.4byte \jumpInstr
 	.endm
 
-	.macro itemrestorehp
+	.macro itemrestorehp jumpInstr:req
 	callnative BS_ItemRestoreHP
+	.4byte \jumpInstr
 	.endm
 
-	.macro itemcurestatus
+	.macro itemcurestatus jumpInstr:req
 	callnative BS_ItemCureStatus
+	.4byte \jumpInstr
 	.endm
 
 	.macro itemincreasestat

diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
@@ -9216,13 +9216,12 @@ Boomburst_Doubles:
 	goto Boomburst_Last
 
 Move_FAIRY_LOCK::
-	loadspritegfx ANIM_TAG_CHAIN_LINK @Chain Colour
-	loadspritegfx ANIM_TAG_FAIRY_LOCK_CHAINS @AnimTask is missing for Fairy Lock Chain
+	loadspritegfx ANIM_TAG_FAIRY_LOCK_CHAINS
 	setalpha 8, 8
 	monbg ANIM_ATK_PARTNER
 	createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x8, 0x6B1F
 	waitforvisualfinish
-	loopsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET, 0x6, 0x4
+	loopsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET, 0x6, 0x9
 	createvisualtask AnimTask_VoltTackleBolt, 0x5, 0x7
 	createvisualtask AnimTask_VoltTackleBolt, 0x5, 0x33
 	createvisualtask AnimTask_VoltTackleBolt, 0x5, 0x2
@@ -9548,7 +9547,7 @@ Move_EERIE_IMPULSE::
 	createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 32, 30, 0, 40, 0
 	createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 32, 30, 0, 40, 1
 	createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 32, 30, 0, 40, 0
- 	createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 32, 30, 0, 40, 2
+	createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 32, 30, 0, 40, 2
 	createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 48, 30, 0, 40, 0
 	createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 48, 30, 0, 40, 1
 	createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 48, 30, 0, 40, 0
@@ -10213,7 +10212,7 @@ Move_THOUSAND_WAVES::
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER            @I placed this one here, because it ruins the teleport animation
 	loopsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 0x3, 0x15
- 	call ThousandWavesRecover
+	call ThousandWavesRecover
 	createsprite gThousandWavesGreenRecoverTemplate, ANIM_ATTACKER, 2, 0x28, 0xfff6, 0xd
 	delay 0x3
 	createsprite gThousandWavesGreenRecoverTemplate, ANIM_ATTACKER, 2, 0xffdd, 0x8, 0xd
@@ -10441,7 +10440,7 @@ Move_ORIGIN_PULSE::
 	delay 0x10
 	createsprite gOriginPulseRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0, 0x1F, 0x8
 	playsewithpan SE_INTRO_BLAST, SOUND_PAN_ATTACKER
- 	waitforvisualfinish
+	waitforvisualfinish
 	createsprite gOriginPulseOrbTemplate, ANIM_ATTACKER, 2, 0x0
 	createsprite gOriginPulseOrbTemplate, ANIM_ATTACKER, 2, 0x2b
 	createsprite gOriginPulseOrbTemplate, ANIM_ATTACKER, 2, 0x55
@@ -12024,7 +12023,7 @@ Move_CORE_ENFORCER::
 	delay 0x1
 	createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0xfffa, 0xffe2, 0x1, 0x3
 	delay 0x1
- 	createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0xffff, 0xffe2, 0x1, 0x3
+	createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0xffff, 0xffe2, 0x1, 0x3
 	delay 0x1
 	createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0x5, 0xffe2, 0x1, 0x3
 	delay 0x1
@@ -12067,7 +12066,7 @@ Move_CORE_ENFORCER::
 	createsprite gCoreEnforcerBeamTemplate, ANIM_TARGET, 3, 0xf, 0x0, 0x14, 0x5
 	createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0x7, 0x3, 0x1, 0x3
 	delay 0x1
- 	createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0xC, 0x3, 0x1, 0x3
+	createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0xC, 0x3, 0x1, 0x3
 	delay 0x1
 	createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0x11, 0x3, 0x1, 0x3
 	delay 0x1
@@ -13508,7 +13507,7 @@ Move_PHOTON_GEYSER::
 	unloadspritegfx ANIM_TAG_YELLOW_BALL @confuse ray (for zap cannon)
 	unloadspritegfx ANIM_TAG_BLACK_BALL_2 @zap cannon
 	unloadspritegfx ANIM_TAG_AIR_WAVE_2 @white/gray color
-    @Shoot beam to the sky
+	@Shoot beam to the sky
 	loadspritegfx ANIM_TAG_STRAIGHT_BEAM
 	createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x6, 0x0, 0x10, 0x43FF  @Light yellow
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 96, 1
@@ -13630,7 +13629,7 @@ Move_SNIPE_SHOT::
 	loadspritegfx ANIM_TAG_LEER
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 0, 16, 0 @;Black
 	waitforvisualfinish
- 	createsprite gLeerSpriteTemplate, ANIM_TARGET, 2, 0x18, -12
+	createsprite gLeerSpriteTemplate, ANIM_TARGET, 2, 0x18, -12
 	playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	delay 0x20

diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
@@ -406,7 +406,7 @@ gBattleScriptsForMoveEffects::
 	.4byte BattleScript_EffectHit                     @ EFFECT_RISING_VOLTAGE
 	.4byte BattleScript_EffectHit                     @ EFFECT_BEAK_BLAST
 	.4byte BattleScript_EffectCourtChange             @ EFFECT_COURT_CHANGE
-	.4byte BattleScript_EffectSteelBeam               @ EFFECT_STEEL_BEAM
+	.4byte BattleScript_EffectMaxHp50Recoil           @ EFFECT_MAX_HP_50_RECOIL
 	.4byte BattleScript_EffectExtremeEvoboost         @ EFFECT_EXTREME_EVOBOOST
 	.4byte BattleScript_EffectHitSetRemoveTerrain     @ EFFECT_HIT_SET_REMOVE_TERRAIN
 	.4byte BattleScript_EffectDarkVoid                @ EFFECT_DARK_VOID
@@ -779,7 +779,7 @@ BattleScript_EffectAttackUpUserAlly_TryAlly:
 BattleScript_EffectAttackUpUserAlly_End:
 	goto BattleScript_MoveEnd
 BattleScript_EffectAttackUpUserAlly_TryAlly_:
- 	jumpifability BS_ATTACKER_PARTNER, ABILITY_SOUNDPROOF, BattleScript_EffectAttackUpUserAlly_TryAllyBlocked
+	jumpifability BS_ATTACKER_PARTNER, ABILITY_SOUNDPROOF, BattleScript_EffectAttackUpUserAlly_TryAllyBlocked
 	setstatchanger STAT_ATK, 1, FALSE
 	statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_EffectAttackUpUserAlly_End
 	jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectAttackUpUserAlly_AllyAnim
@@ -927,7 +927,7 @@ BattleScript_EffectShellTrap::
 	waitmessage B_WAIT_TIME_LONG
 	goto BattleScript_MoveEnd
 
-BattleScript_EffectSteelBeam::
+BattleScript_EffectMaxHp50Recoil::
 	attackcanceler
 	attackstring
 	ppreduce
@@ -2757,8 +2757,8 @@ BattleScript_EffectHealPulse:
 	attackcanceler
 	attackstring
 	ppreduce
-    jumpifstatus3 BS_ATTACKER, STATUS3_HEAL_BLOCK, BattleScript_MoveUsedHealBlockPrevents @ stops pollen puff
-    jumpifstatus3 BS_TARGET, STATUS3_HEAL_BLOCK, BattleScript_MoveUsedHealBlockPrevents
+	jumpifstatus3 BS_ATTACKER, STATUS3_HEAL_BLOCK, BattleScript_MoveUsedHealBlockPrevents @ stops pollen puff
+	jumpifstatus3 BS_TARGET, STATUS3_HEAL_BLOCK, BattleScript_MoveUsedHealBlockPrevents
 	accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
 	jumpifsubstituteblocks BattleScript_ButItFailed
 	tryhealpulse BattleScript_AlreadyAtFullHp
@@ -3592,6 +3592,7 @@ BattleScript_MindBlownDamp:
 	goto BattleScript_DampStopsExplosion
 BattleScript_EffectMindBlown_HpDown:
 	setbyte sMULTIHIT_EFFECT, 1 @ Note to not faint the attacker
+	jumpifability BS_ATTACKER, ABILITY_MAGIC_GUARD, BattleScript_EffectMindBlown_AnimDmgNoFaint
 	dmg_1_2_attackerhp
 	healthbarupdate BS_ATTACKER
 	datahpupdate BS_ATTACKER
@@ -4754,26 +4755,7 @@ BattleScript_EffectDestinyBond::
 	goto BattleScript_MoveEnd
 
 BattleScript_EffectEerieSpell::
-	attackcanceler
-	attackstring
-	ppreduce
-	accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
-	attackstring
-	ppreduce
-	critcalc
-	damagecalc
-	adjustdamage
-	attackanimation
-	waitanimation
-	effectivenesssound
-	hitanimation BS_TARGET
-	waitstate
-	healthbarupdate BS_TARGET
-	datahpupdate BS_TARGET
-	critmessage
-	waitmessage B_WAIT_TIME_LONG
-	resultmessage
-	waitmessage B_WAIT_TIME_LONG
+	call BattleScript_EffectHit_Ret
 	tryfaintmon BS_TARGET
 	eeriespellppreduce BattleScript_MoveEnd
 	printstring STRINGID_PKMNREDUCEDPP
@@ -6038,7 +6020,7 @@ BattleScript_EffectYawn::
 	setyawn BattleScript_ButItFailed
 	attackanimation
 	waitanimation
- BattleScript_EffectYawnSuccess::
+BattleScript_EffectYawnSuccess::
 	printstring STRINGID_PKMNWASMADEDROWSY
 	waitmessage B_WAIT_TIME_LONG
 	goto BattleScript_MoveEnd
@@ -6715,6 +6697,7 @@ BattleScript_PrintFullBox::
 
 BattleScript_ActionSwitch::
 	hpthresholds2 BS_ATTACKER
+	copybyte sSAVED_BATTLER, gBattlerAttacker
 	printstring STRINGID_RETURNMON
 	jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_PursuitSwitchDmgSetMultihit
 	setmultihit 1
@@ -6732,6 +6715,7 @@ BattleScript_DoSwitchOut::
 	switchoutabilities BS_ATTACKER
 	updatedynamax
 	waitstate
+	copybyte gBattlerAttacker, sSAVED_BATTLER
 	returnatktoball
 	waitstate
 	drawpartystatussummary BS_ATTACKER
@@ -8685,6 +8669,7 @@ BattleScript_TryAdrenalineOrbRet:
 
 BattleScript_IntimidateActivates::
 	showabilitypopup BS_ATTACKER
+	copybyte sSAVED_BATTLER, gBattlerTarget
 	pause B_WAIT_TIME_LONG
 	destroyabilitypopup
 	setbyte gBattlerTarget, 0
@@ -8712,6 +8697,7 @@ BattleScript_IntimidateLoopIncrement:
 BattleScript_IntimidateEnd:
 	copybyte sBATTLER, gBattlerAttacker
 	destroyabilitypopup
+	copybyte gBattlerTarget, sSAVED_BATTLER
 	pause B_WAIT_TIME_MED
 	end3