fix: 解决合并冲突

2026-01-09 21:01:43 +08:00 · 2026-01-09 21:01:43 +08:00 · 06bf56b008
commit 06bf56b008
parent 5e7a9ae828 85b5dac4d0
848 changed files with 5491 additions and 2299 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@ -57,7 +57,8 @@
      "profile": "https://github.com/ghoulslash",
      "contributions": [
        "maintenance",
-        "code"
+        "code",
+        "design"
      ]
    },
    {
@ -375,7 +376,8 @@
      "profile": "https://github.com/Pyredrid",
      "contributions": [
        "userTesting",
-        "maintenance"
+        "maintenance",
+        "code"
      ]
    },
    {
@ -505,6 +507,96 @@
      "contributions": [
        "data"
      ]
+    },
+    {
+      "login": "mrdollsteak",
+      "name": "mrdollsteak",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5975698?v=4",
+      "profile": "https://github.com/mrdollsteak",
+      "contributions": [
+        "data"
+      ]
+    },
+    {
+      "login": "TheXaman",
+      "name": "TheXaman",
+      "avatar_url": "https://avatars.githubusercontent.com/u/48356183?v=4",
+      "profile": "https://github.com/TheXaman",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ZnogyroP",
+      "name": "ZnogyroP",
+      "avatar_url": "https://avatars.githubusercontent.com/u/20970593?v=4",
+      "profile": "https://github.com/ZnogyroP",
+      "contributions": [
+        "design"
+      ]
+    },
+    {
+      "login": "luckytyphlosion",
+      "name": "luckytyphlosion",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10688458?v=4",
+      "profile": "https://github.com/luckytyphlosion",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ShinyDragonHunter",
+      "name": "Josh",
+      "avatar_url": "https://avatars.githubusercontent.com/u/32826900?v=4",
+      "profile": "https://github.com/ShinyDragonHunter",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Gamer2020",
+      "name": "Gamer2020",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6243575?v=4",
+      "profile": "https://github.com/Gamer2020",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "SonikkuA-DatH",
+      "name": "SonikkuA-DatH",
+      "avatar_url": "https://avatars.githubusercontent.com/u/58025603?v=4",
+      "profile": "https://github.com/SonikkuA-DatH",
+      "contributions": [
+        "design"
+      ]
+    },
+    {
+      "login": "Jaizu",
+      "name": "Jaizu",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18596778?v=4",
+      "profile": "https://jaizu.moe",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "izrofid",
+      "name": "Kildemal",
+      "avatar_url": "https://avatars.githubusercontent.com/u/206095739?v=4",
+      "profile": "https://github.com/izrofid",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Skeli789",
+      "name": "Skeli",
+      "avatar_url": "https://avatars.githubusercontent.com/u/17243618?v=4",
+      "profile": "https://github.com/Skeli789",
+      "contributions": [
+        "design"
+      ]
    }
  ],
  "contributorsPerLine": 7,
--- a/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
+++ b/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
@ -43,9 +43,10 @@ body:
      label: Version
      description: What version of pokeemerald-expansion are you using?
      options:
-        - 1.14.1 (Latest release)
+        - 1.14.2 (Latest release)
        - master (default, unreleased bugfixes)
        - upcoming (Edge)
+        - 1.14.1
        - 1.14.0
        - 1.13.4
        - 1.13.3
--- a/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
+++ b/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
@ -43,9 +43,10 @@ body:
      label: Version
      description: What version of pokeemerald-expansion are you using?
      options:
-        - 1.14.1 (Latest release)
+        - 1.14.2 (Latest release)
        - master (default, unreleased bugfixes)
        - upcoming (Edge)
+        - 1.14.1
        - 1.14.0
        - 1.13.4
        - 1.13.3
--- a/.github/ISSUE_TEMPLATE/04_other_errors.yaml
+++ b/.github/ISSUE_TEMPLATE/04_other_errors.yaml
@ -43,9 +43,10 @@ body:
      label: Version
      description: What version of pokeemerald-expansion are you using?
      options:
-        - 1.14.1 (Latest release)
+        - 1.14.2 (Latest release)
        - master (default, unreleased bugfixes)
        - upcoming (Edge)
+        - 1.14.1
        - 1.14.0
        - 1.13.4
        - 1.13.3
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -32,10 +32,10 @@ jobs:
          COMPARE: 0
        run: make -j${nproc} -O all

-      - name: LTO
+      - name: Release
        run: |
          make tidy
-          make -j${nproc} LTO=1
+          make -j${nproc} release
        # make tidy to purge previous build

      - name: Test
--- a/CREDITS.md
+++ b/CREDITS.md
@ -1,13 +1,3 @@
-<!-- ## Old List of Credits -->
-<!-- - **mvit**: ability pop up and mega evo gfx -->
-<!-- - **Doesnt**: berries gfx, pokeball particles -->
-<!-- - **MrDollSteak**: Pokedex descriptions -->
-<!-- - **Avara**: item descriptions -->
-<!-- - **TheLaw**: move animations -->
-<!-- - **BreadCrumbs**: code review -->
-<!-- - **Syreldar**: testing, wrote an explanation post -->
-<!-- - **Pyredrid**: automating issue creation, code review and testing -->
-
 ## Credits ✨

 Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
@ -22,7 +12,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/AlexOn1ine"><img src="https://avatars.githubusercontent.com/u/93446519?v=4?s=100" width="100px;" alt="Alex"/><br /><sub><b>Alex</b></sub></a><br /><a href="#maintenance-AlexOn1ine" title="Maintenance">🚧</a> <a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=AlexOn1ine" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Bassoonian"><img src="https://avatars.githubusercontent.com/u/16993385?v=4?s=100" width="100px;" alt="Bassoonian"/><br /><sub><b>Bassoonian</b></sub></a><br /><a href="#maintenance-Bassoonian" title="Maintenance">🚧</a> <a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=Bassoonian" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/DizzyEggg"><img src="https://avatars.githubusercontent.com/u/16259973?v=4?s=100" width="100px;" alt="DizzyEggg"/><br /><sub><b>DizzyEggg</b></sub></a><br /><a href="#maintenance-DizzyEggg" title="Maintenance">🚧</a> <a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=DizzyEggg" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ghoulslash"><img src="https://avatars.githubusercontent.com/u/41651341?v=4?s=100" width="100px;" alt="ghoulslash"/><br /><sub><b>ghoulslash</b></sub></a><br /><a href="#maintenance-ghoulslash" title="Maintenance">🚧</a> <a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=ghoulslash" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ghoulslash"><img src="https://avatars.githubusercontent.com/u/41651341?v=4?s=100" width="100px;" alt="ghoulslash"/><br /><sub><b>ghoulslash</b></sub></a><br /><a href="#maintenance-ghoulslash" title="Maintenance">🚧</a> <a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=ghoulslash" title="Code">💻</a> <a href="#design-ghoulslash" title="Design">🎨</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/hedara90"><img src="https://avatars.githubusercontent.com/u/149414898?v=4?s=100" width="100px;" alt="hedara90"/><br /><sub><b>hedara90</b></sub></a><br /><a href="#maintenance-hedara90" title="Maintenance">🚧</a> <a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=hedara90" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="http://www.martin-griffin.com/"><img src="https://avatars.githubusercontent.com/u/838573?v=4?s=100" width="100px;" alt="Martin Griffin"/><br /><sub><b>Martin Griffin</b></sub></a><br /><a href="#maintenance-mrgriffin" title="Maintenance">🚧</a> <a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=mrgriffin" title="Code">💻</a></td>
    </tr>
@ -64,7 +54,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
    </tr>
    <tr>
      <td align="center" valign="top" width="14.28%"><a href="https://metin2.dev/index.php"><img src="https://avatars.githubusercontent.com/u/42327659?v=4?s=100" width="100px;" alt="Enrico Drago"/><br /><sub><b>Enrico Drago</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=Syreldar" title="Documentation">📖</a> <a href="#userTesting-Syreldar" title="User Testing">📓</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Pyredrid"><img src="https://avatars.githubusercontent.com/u/8324784?v=4?s=100" width="100px;" alt="Pyredrid"/><br /><sub><b>Pyredrid</b></sub></a><br /><a href="#userTesting-Pyredrid" title="User Testing">📓</a> <a href="#maintenance-Pyredrid" title="Maintenance">🚧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Pyredrid"><img src="https://avatars.githubusercontent.com/u/8324784?v=4?s=100" width="100px;" alt="Pyredrid"/><br /><sub><b>Pyredrid</b></sub></a><br /><a href="#userTesting-Pyredrid" title="User Testing">📓</a> <a href="#maintenance-Pyredrid" title="Maintenance">🚧</a> <a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=Pyredrid" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/mvit"><img src="https://avatars.githubusercontent.com/u/128863?v=4?s=100" width="100px;" alt="mv"/><br /><sub><b>mv</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=mvit" title="Code">💻</a> <a href="#design-mvit" title="Design">🎨</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Mother-Of-Dragons"><img src="https://avatars.githubusercontent.com/u/31101124?v=4?s=100" width="100px;" alt="Avara"/><br /><sub><b>Avara</b></sub></a><br /><a href="#data-Mother-Of-Dragons" title="Data">🔣</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Doesnty"><img src="https://avatars.githubusercontent.com/u/6163136?v=4?s=100" width="100px;" alt="Doesnty"/><br /><sub><b>Doesnty</b></sub></a><br /><a href="#design-Doesnty" title="Design">🎨</a></td>
@ -83,6 +73,18 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
    <tr>
      <td align="center" valign="top" width="14.28%"><a href="http://purrfectdoodle.com"><img src="https://avatars.githubusercontent.com/u/105788407?v=4?s=100" width="100px;" alt="Eva"/><br /><sub><b>Eva</b></sub></a><br /><a href="#design-purrfectdoodle" title="Design">🎨</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/amiosi"><img src="https://avatars.githubusercontent.com/u/44352097?v=4?s=100" width="100px;" alt="amiosi"/><br /><sub><b>amiosi</b></sub></a><br /><a href="#data-amiosi" title="Data">🔣</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/mrdollsteak"><img src="https://avatars.githubusercontent.com/u/5975698?v=4?s=100" width="100px;" alt="mrdollsteak"/><br /><sub><b>mrdollsteak</b></sub></a><br /><a href="#data-mrdollsteak" title="Data">🔣</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/TheXaman"><img src="https://avatars.githubusercontent.com/u/48356183?v=4?s=100" width="100px;" alt="TheXaman"/><br /><sub><b>TheXaman</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=TheXaman" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ZnogyroP"><img src="https://avatars.githubusercontent.com/u/20970593?v=4?s=100" width="100px;" alt="ZnogyroP"/><br /><sub><b>ZnogyroP</b></sub></a><br /><a href="#design-ZnogyroP" title="Design">🎨</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/luckytyphlosion"><img src="https://avatars.githubusercontent.com/u/10688458?v=4?s=100" width="100px;" alt="luckytyphlosion"/><br /><sub><b>luckytyphlosion</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=luckytyphlosion" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ShinyDragonHunter"><img src="https://avatars.githubusercontent.com/u/32826900?v=4?s=100" width="100px;" alt="Josh"/><br /><sub><b>Josh</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=ShinyDragonHunter" title="Code">💻</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Gamer2020"><img src="https://avatars.githubusercontent.com/u/6243575?v=4?s=100" width="100px;" alt="Gamer2020"/><br /><sub><b>Gamer2020</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=Gamer2020" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/SonikkuA-DatH"><img src="https://avatars.githubusercontent.com/u/58025603?v=4?s=100" width="100px;" alt="SonikkuA-DatH"/><br /><sub><b>SonikkuA-DatH</b></sub></a><br /><a href="#design-SonikkuA-DatH" title="Design">🎨</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://jaizu.moe"><img src="https://avatars.githubusercontent.com/u/18596778?v=4?s=100" width="100px;" alt="Jaizu"/><br /><sub><b>Jaizu</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=Jaizu" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/izrofid"><img src="https://avatars.githubusercontent.com/u/206095739?v=4?s=100" width="100px;" alt="Kildemal"/><br /><sub><b>Kildemal</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=izrofid" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Skeli789"><img src="https://avatars.githubusercontent.com/u/17243618?v=4?s=100" width="100px;" alt="Skeli"/><br /><sub><b>Skeli</b></sub></a><br /><a href="#design-Skeli789" title="Design">🎨</a></td>
    </tr>
  </tbody>
  <tfoot>
--- a/README.md
+++ b/README.md
@ -17,7 +17,7 @@
 If you use **`pokeemerald-expansion`**, please credit **RHH (Rom Hacking Hideout)**. Optionally, include the version number for clarity.

 ```
-Based off RHH's pokeemerald-expansion 1.14.1 https://github.com/rh-hideout/pokeemerald-expansion/
+Based off RHH's pokeemerald-expansion 1.14.2 https://github.com/rh-hideout/pokeemerald-expansion/
 ```

 Please consider [crediting all contributors](CREDITS.md) involved in the project!
--- a/asm/macros/battle_script.inc
+++ b/asm/macros/battle_script.inc
@ -1,44 +1,44 @@
@ commands
 	.macro attackcanceler
-	.byte 0x0
+	.byte B_SCR_OP_ATTACKCANCELER
 	.endm

 	.macro accuracycheck failInstr:req, move:req
-	.byte 0x1
+	.byte B_SCR_OP_ACCURACYCHECK
 	.4byte \failInstr
 	.2byte \move
 	.endm

 	.macro printattackstring
-	.byte 0x2
+	.byte B_SCR_OP_PRINTATTACKSTRING
 	.endm

 	.macro unused_0x3
-	.byte 0x3
+	.byte B_SCR_OP_UNUSED_0x3
 	.endm

 	.macro critcalc
-	.byte 0x4
+	.byte B_SCR_OP_CRITCALC
 	.endm

 	.macro damagecalc
-	.byte 0x5
+	.byte B_SCR_OP_DAMAGECALC
 	.endm

 	.macro typecalc
-	.byte 0x6
+	.byte B_SCR_OP_TYPECALC
 	.endm

 	.macro adjustdamage
-	.byte 0x7
+	.byte B_SCR_OP_ADJUSTDAMAGE
 	.endm

 	.macro multihitresultmessage
-	.byte 0x8
+	.byte B_SCR_OP_MULTIHITRESULTMESSAGE
 	.endm

 	.macro attackanimation
-	.byte 0x9
+	.byte B_SCR_OP_ATTACKANIMATION
 	.endm

 	.macro waitanimation
@ -70,7 +70,7 @@
 	.endm

 	.macro printstring id:req
-	.byte 0x10
+	.byte B_SCR_OP_PRINTSTRING
 	.2byte \id
 	.endm

@ -79,28 +79,28 @@
 	.endm

 	.macro printselectionstring id:req
-	.byte 0x11
+	.byte B_SCR_OP_PRINTSELECTIONSTRING
 	.2byte \id
 	.endm

 	.macro waitmessage time:req
-	.byte 0x12
+	.byte B_SCR_OP_WAITMESSAGE
 	.2byte \time
 	.endm

 	.macro printfromtable ptr:req
-	.byte 0x13
+	.byte B_SCR_OP_PRINTFROMTABLE
 	.4byte \ptr
 	.endm

 	.macro printselectionstringfromtable ptr:req
-	.byte 0x14
+	.byte B_SCR_OP_PRINTSELECTIONSTRINGFROMTABLE
 	.4byte \ptr
 	.endm

 	.macro setadditionaleffects
 	1:
-	.byte 0x15
+	.byte B_SCR_OP_SETADDITIONALEFFECTS
 	jumpifhalfword CMP_EQUAL, sMOVE_EFFECT, MOVE_EFFECT_CONTINUE, 1b
 	.endm

@ -108,7 +108,7 @@
 	.if \moveEffect != 0
 		setmoveeffect \moveEffect
 	.endif
-	.byte 0x16
+	.byte B_SCR_OP_SETEFFECTPRIMARY
 	.byte \battler
 	.byte \effectBattler
 	.endm
@ -117,26 +117,26 @@
 	.if \moveEffect != 0
 		setmoveeffect \moveEffect
 	.endif
-	.byte 0x17
+	.byte B_SCR_OP_SETEFFECTSECONDARY
 	.byte \battler
 	.byte \effectBattler
 	.endm

 	.macro clearvolatile battler:req, volatile:req
-	.byte 0x18
+	.byte B_SCR_OP_CLEARVOLATILE
 	.byte \battler
 	.byte \volatile
 	.endm

 	.macro tryfaintmon battler:req
-	.byte 0x19
+	.byte B_SCR_OP_TRYFAINTMON
 	.byte \battler
 	.byte FALSE
 	.4byte NULL
 	.endm

 	.macro tryfaintmon_spikes battler:req, instr:req
-	.byte 0x19
+	.byte B_SCR_OP_TRYFAINTMON
 	.byte \battler
 	.byte TRUE
 	.4byte \instr
@ -181,7 +181,7 @@
 	.endm

 	.macro jumpifstat battler:req, comparison:req, stat:req, value:req, jumpInstr:req
-	.byte 0x20
+	.byte B_SCR_OP_JUMPIFSTAT
 	.byte \battler
 	.byte \comparison
 	.byte \stat
@ -190,7 +190,7 @@
 	.endm

 	.macro jumpifstatignorecontrary battler:req, comparison:req, stat:req, value:req, jumpInstr:req
-	.byte 0x21
+	.byte B_SCR_OP_JUMPIFSTATIGNORECONTRARY
 	.byte \battler
 	.byte \comparison
 	.byte \stat
@ -199,7 +199,7 @@
 	.endm

 	.macro jumpbasedontype battler:req, type:req, jumpIfType:req, jumpInstr:req
-	.byte 0x22
+	.byte B_SCR_OP_JUMPBASEDONTYPE
 	.byte \battler
 	.byte \type
 	.byte \jumpIfType
@ -215,36 +215,36 @@
 	.endm

 	.macro getexp battler:req
-	.byte 0x23
+	.byte B_SCR_OP_GETEXP
 	.byte \battler
 	.endm

 	.macro checkteamslost jumpInstr:req
-	.byte 0x24
+	.byte B_SCR_OP_CHECKTEAMSLOST
 	.4byte \jumpInstr
 	.endm

 	.macro movevaluescleanup
-	.byte 0x25
+	.byte B_SCR_OP_MOVEVALUESCLEANUP
 	.endm

 	.macro setmultihit value:req
-	.byte 0x26
+	.byte B_SCR_OP_SETMULTIHIT
 	.byte \value
 	.endm

 	.macro decrementmultihit loopInstr:req
-	.byte 0x27
+	.byte B_SCR_OP_DECREMENTMULTIHIT
 	.4byte \loopInstr
 	.endm

 	.macro goto instr:req
-	.byte 0x28
+	.byte B_SCR_OP_GOTO
 	.4byte \instr
 	.endm

 	.macro jumpifbyte comparison:req, bytePtr:req, value:req, jumpInstr:req
-	.byte 0x29
+	.byte B_SCR_OP_JUMPIFBYTE
 	.byte \comparison
 	.4byte \bytePtr
 	.byte \value
@ -296,20 +296,20 @@
 	.endm

 	.macro subbyte bytePtr:req, value:req
-	.byte 0x30
+	.byte B_SCR_OP_SUBBYTE
 	.4byte \bytePtr
 	.byte \value
 	.endm

 	.macro copyarray dest:req, src:req, size:req
-	.byte 0x31
+	.byte B_SCR_OP_COPYARRAY
 	.4byte \dest
 	.4byte \src
 	.byte \size
 	.endm

 	.macro copyarraywithindex dest:req, src:req, indexPtr:req, size:req
-	.byte 0x32
+	.byte B_SCR_OP_COPYARRAYWITHINDEX
 	.4byte \dest
 	.4byte \src
 	.4byte \indexPtr
@ -317,48 +317,48 @@
 	.endm

 	.macro orbyte bytePtr:req, value:req
-	.byte 0x33
+	.byte B_SCR_OP_ORBYTE
 	.4byte \bytePtr
 	.byte \value
 	.endm

 	.macro orhalfword halfwordPtr:req, value:req
-	.byte 0x34
+	.byte B_SCR_OP_ORHALFWORD
 	.4byte \halfwordPtr
 	.2byte \value
 	.endm

 	.macro orword wordPtr:req, value:req
-	.byte 0x35
+	.byte B_SCR_OP_ORWORD
 	.4byte \wordPtr
 	.4byte \value
 	.endm

 	.macro bicbyte bytePtr:req, value:req
-	.byte 0x36
+	.byte B_SCR_OP_BICBYTE
 	.4byte \bytePtr
 	.byte \value
 	.endm

 	.macro bichalfword halfwordPtr:req, value:req
-	.byte 0x37
+	.byte B_SCR_OP_BICHALFWORD
 	.4byte \halfwordPtr
 	.2byte \value
 	.endm

 	.macro bicword wordPtr:req, value:req
-	.byte 0x38
+	.byte B_SCR_OP_BICWORD
 	.4byte \wordPtr
 	.4byte \value
 	.endm

 	.macro pause frames:req
-	.byte 0x39
+	.byte B_SCR_OP_PAUSE
 	.2byte \frames
 	.endm

 	.macro setchargingturn
-	.byte 0x40
+	.byte B_SCR_OP_SETCHARGINGTURN
 	.endm

 	.macro waitstate
@ -386,51 +386,51 @@
 	.endm

 	.macro call instr:req
-	.byte 0x41
+	.byte B_SCR_OP_CALL
 	.4byte \instr
 	.endm

 	.macro setroost
-	.byte 0x42
+	.byte B_SCR_OP_SETROOST
 	.endm

 	.macro jumpifabilitypresent ability:req, jumpInstr:req
-	.byte 0x43
+	.byte B_SCR_OP_JUMPIFABILITYPRESENT
 	.2byte \ability
 	.4byte \jumpInstr
 	.endm

 	.macro endselectionscript
-	.byte 0x44
+	.byte B_SCR_OP_ENDSELECTIONSCRIPT
 	.endm

 	.macro playanimation battler:req, animId:req, argPtr=NULL
-	.byte 0x45
+	.byte B_SCR_OP_PLAYANIMATION
 	.byte \battler
 	.byte \animId
 	.4byte \argPtr
 	.endm

 	.macro playanimation_var battler:req, animIdPtr:req, argPtr=NULL
-	.byte 0x46
+	.byte B_SCR_OP_PLAYANIMATION_VAR
 	.byte \battler
 	.4byte \animIdPtr
 	.4byte \argPtr
 	.endm

 	.macro jumpfifsemiinvulnerable battler:req, state:req, jumpInstr:req
-	.byte 0x47
+	.byte B_SCR_OP_JUMPFIFSEMIINVULNERABLE
 	.byte \battler
 	.byte \state
 	.4byte \jumpInstr
 	.endm

 	.macro unused_0x48
-	.byte 0x48
+	.byte B_SCR_OP_UNUSED_0x48
 	.endm

 	.macro moveend endMode:req, endState:req
-	.byte 0x49
+	.byte B_SCR_OP_MOVEEND
 	.byte \endMode
 	.byte \endState
 	.endm
@ -500,54 +500,54 @@
 	.endm

 	.macro openpartyscreen battler:req, failInstr:req
-	.byte 0x50
+	.byte B_SCR_OP_OPENPARTYSCREEN
 	.byte \battler
 	.4byte \failInstr
 	.endm

 	.macro switchhandleorder battler:req, state:req
-	.byte 0x51
+	.byte B_SCR_OP_SWITCHHANDLEORDER
 	.byte \battler
 	.byte \state
 	.endm

 	.macro switchineffects battler:req
-	.byte 0x52
+	.byte B_SCR_OP_SWITCHINEFFECTS
 	.byte \battler
 	.endm

 	.macro trainerslidein position:req
-	.byte 0x53
+	.byte B_SCR_OP_TRAINERSLIDEIN
 	.byte \position
 	.endm

 	.macro playse song:req
-	.byte 0x54
+	.byte B_SCR_OP_PLAYSE
 	.2byte \song
 	.endm

 	.macro fanfare song:req
-	.byte 0x55
+	.byte B_SCR_OP_FANFARE
 	.2byte \song
 	.endm

 	.macro playfaintcry battler:req
-	.byte 0x56
+	.byte B_SCR_OP_PLAYFAINTCRY
 	.byte \battler
 	.endm

 	.macro endlinkbattle
-	.byte 0x57
+	.byte B_SCR_OP_ENDLINKBATTLE
 	.endm

 	.macro returntoball battler:req, changingForm:req
-	.byte 0x58
+	.byte B_SCR_OP_RETURNTOBALL
 	.byte \battler
 	.byte \changingForm
 	.endm

 	.macro handlelearnnewmove learnedMoveInstr:req, nothingToLearnInstr:req, isFirstMove:req
-	.byte 0x59
+	.byte B_SCR_OP_HANDLELEARNNEWMOVE
 	.4byte \learnedMoveInstr
 	.4byte \nothingToLearnInstr
 	.byte \isFirstMove
@ -582,27 +582,27 @@
 	.endm

 	.macro incrementgamestat stat:req
-	.byte 0x60
+	.byte B_SCR_OP_INCREMENTGAMESTAT
 	.byte \stat
 	.endm

 	.macro drawpartystatussummary battler:req
-	.byte 0x61
+	.byte B_SCR_OP_DRAWPARTYSTATUSSUMMARY
 	.byte \battler
 	.endm

 	.macro hidepartystatussummary battler:req
-	.byte 0x62
+	.byte B_SCR_OP_HIDEPARTYSTATUSSUMMARY
 	.byte \battler
 	.endm

 	.macro jumptocalledmove notChosenMove:req
-	.byte 0x63
+	.byte B_SCR_OP_JUMPTOCALLEDMOVE
 	.byte \notChosenMove
 	.endm

 	.macro statusanimation battler:req, status=0, isVolatile=FALSE
-	.byte 0x64
+	.byte B_SCR_OP_STATUSANIMATION
 	.byte \battler
 	.4byte \status
 	.byte \isVolatile
@ -613,15 +613,15 @@
 	.endm

 	.macro yesnobox
-	.byte 0x67
+	.byte B_SCR_OP_YESNOBOX
 	.endm

 	.macro cancelallactions
-	.byte 0x68
+	.byte B_SCR_OP_CANCELALLACTIONS
 	.endm

 	.macro setgravity failInstr:req
-	.byte 0x69
+	.byte B_SCR_OP_SETGRAVITY
 	.4byte \failInstr
 	.endm

@ -652,47 +652,47 @@
 	.endm

 	.macro recordability battler:req
-	.byte 0x70
+	.byte B_SCR_OP_RECORDABILITY
 	.byte \battler
 	.endm

 	.macro buffermovetolearn
-	.byte 0x71
+	.byte B_SCR_OP_BUFFERMOVETOLEARN
 	.endm

 	.macro jumpifplayerran jumpInstr:req
-	.byte 0x72
+	.byte B_SCR_OP_JUMPIFPLAYERRAN
 	.4byte \jumpInstr
 	.endm

 	.macro hpthresholds battler:req
-	.byte 0x73
+	.byte B_SCR_OP_HPTHRESHOLDS
 	.byte \battler
 	.endm

 	.macro hpthresholds2 battler:req
-	.byte 0x74
+	.byte B_SCR_OP_HPTHRESHOLDS2
 	.byte \battler
 	.endm

 	.macro useitemonopponent
-	.byte 0x75
+	.byte B_SCR_OP_USEITEMONOPPONENT
 	.endm

 	.macro unused_0x78
-	.byte 0x76
+	.byte B_SCR_OP_UNUSED_0x78
 	.endm

 	.macro setprotectlike
-	.byte 0x77
+	.byte B_SCR_OP_SETPROTECTLIKE
 	.endm

 	.macro tryexplosion
-	.byte 0x78
+	.byte B_SCR_OP_TRYEXPLOSION
 	.endm

 	.macro setatkhptozero
-	.byte 0x79
+	.byte B_SCR_OP_SETATKHPTOZERO
 	.endm

 	.macro jumpifnexttargetvalid jumpInstr:req
@ -724,38 +724,38 @@
 	.endm

 	.macro manipulatedamage mode:req
-	.byte 0x80
+	.byte B_SCR_OP_MANIPULATEDAMAGE
 	.byte \mode
 	.endm

 	.macro trysetrest
-	.byte 0x81
+	.byte B_SCR_OP_TRYSETREST
 	.endm

 	.macro unused_0x82
-	.byte 0x82
+	.byte B_SCR_OP_UNUSED_0x82
 	.endm

 	.macro unused_0x83
-	.byte 0x83
+	.byte B_SCR_OP_UNUSED_0x83
 	.endm

 	.macro jumpifuproarwakes jumpInstr:req
-	.byte 0x84
+	.byte B_SCR_OP_JUMPIFUPROARWAKES
 	.4byte \jumpInstr
 	.endm

 	.macro stockpile id:req
-	.byte 0x85
+	.byte B_SCR_OP_STOCKPILE
 	.byte \id
 	.endm

 	.macro stockpiletobasedamage
-	.byte 0x86
+	.byte B_SCR_OP_STOCKPILETOBASEDAMAGE
 	.endm

 	.macro stockpiletohpheal failInstr:req
-	.byte 0x87
+	.byte B_SCR_OP_STOCKPILETOHPHEAL
 	.4byte \failInstr
 	.endm

@ -764,11 +764,11 @@
 	.endm

 	.macro unused_0x88
-	.byte 0x88
+	.byte B_SCR_OP_UNUSED_0x88
 	.endm

 	.macro statbuffchange battler:req, flags:req, failInstr:req, stats=0
-	.byte 0x89
+	.byte B_SCR_OP_STATBUFFCHANGE
 	.byte \battler
 	.2byte \flags
 	.4byte \failInstr
@ -814,50 +814,50 @@
 	.endm

 	.macro tryconversiontypechange failInstr:req
-	.byte 0x90
+	.byte B_SCR_OP_TRYCONVERSIONTYPECHANGE
 	.4byte \failInstr
 	.endm

 	.macro givepaydaymoney
-	.byte 0x91
+	.byte B_SCR_OP_GIVEPAYDAYMONEY
 	.endm

 	.macro setlightscreen
-	.byte 0x92
+	.byte B_SCR_OP_SETLIGHTSCREEN
 	.endm

 	.macro tryKO failInstr:req
-	.byte 0x93
+	.byte B_SCR_OP_TRYKO
 	.4byte \failInstr
 	.endm

 	.macro checknonvolatiletrigger nonVolatile:req, failInstr:req
-	.byte 0x94
+	.byte B_SCR_OP_CHECKNONVOLATILETRIGGER
 	.2byte \nonVolatile
 	.4byte \failInstr
 	.endm

 	.macro copybidedmg
-	.byte 0x95
+	.byte B_SCR_OP_COPYBIDEDMG
 	.endm

 	.macro animatewildpokemonafterfailedpokeball battler:req
-	.byte 0x96
+	.byte B_SCR_OP_ANIMATEWILDPOKEMONAFTERFAILEDPOKEBALL
 	.byte \battler
 	.endm

 	.macro tryinfatuating failInstr:req
-	.byte 0x97
+	.byte B_SCR_OP_TRYINFATUATING
 	.4byte \failInstr
 	.endm

 	.macro updatestatusicon battler:req
-	.byte 0x98
+	.byte B_SCR_OP_UPDATESTATUSICON
 	.byte \battler
 	.endm

 	.macro setmist
-	.byte 0x99
+	.byte B_SCR_OP_SETMIST
 	.endm

 	.macro setfocusenergy battler:req
--- a/asm/macros/map.inc
+++ b/asm/macros/map.inc
@ -112,6 +112,9 @@

 	@ Defines a background hidden item event for map data
 	.macro bg_hidden_item_event x:req, y:req, elevation:req, item:req, flag:req
+	.if \flag < FLAG_HIDDEN_ITEMS_START
+	.error "Hidden Item flag \flag is too small. Must be >= FLAG_HIDDEN_ITEMS_START."
+	.endif
 	bg_event \x, \y, \elevation, BG_EVENT_HIDDEN_ITEM, \item, ((\flag) - FLAG_HIDDEN_ITEMS_START)
 	.endm

--- a/constants/m4a_constants.inc
+++ b/constants/m4a_constants.inc
@ -181,7 +181,7 @@
 	struct_field o_MusicPlayerTrack_ToneData_sustain, 1
 	struct_field o_MusicPlayerTrack_ToneData_release, 1
 	struct_field o_MusicPlayerTrack_gap, 10
-	struct_field o_MusicPlayerTrack_unk_3A, 2
+	struct_field o_MusicPlayerTrack_timer, 2
 	struct_field o_MusicPlayerTrack_unk_3C, 4
 	struct_field o_MusicPlayerTrack_cmdPtr, 4
 	struct_field o_MusicPlayerTrack_patternStack, 12
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@ -341,7 +341,6 @@ gBattleAnimMove_MetalBurst::
 	waitforvisualfinish
 	end

-@Credits: Skeli
 gBattleAnimMove_UTurn::
 	loadspritegfx ANIM_TAG_SMALL_BUBBLES
 	loadspritegfx ANIM_TAG_RAZOR_LEAF
@ -1979,7 +1978,6 @@ SnowSlide1:
 	delay 2
 	return

-@Credits to Skeli
 gBattleAnimMove_IceShard::
 	monbg ANIM_TARGET
 	splitbgprio ANIM_TARGET
@ -2419,7 +2417,6 @@ InitRoomAnimation:
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_TARGET, 1
 	return

-@ Credits to Skeli
 gBattleAnimMove_DracoMeteor::
 	loadspritegfx ANIM_TAG_ROCKS @Rocks
 	loadspritegfx ANIM_TAG_FAIRY_LOCK_CHAINS @Gray Colour
@ -5606,7 +5603,6 @@ GrassPledgeMiddleFountain:
 	delay 4
 	return

-@Credits to Skeli
 gBattleAnimMove_VoltSwitch::
 	loadspritegfx ANIM_TAG_SHADOW_BALL
 	loadspritegfx ANIM_TAG_IONS
@ -14105,7 +14101,6 @@ SmallAppleShower:
 	delay 2
 	return

-@ credits to Skeli
 gBattleAnimMove_SpiritBreak::
 	loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT
 	loadspritegfx ANIM_TAG_TEAL_ALERT
@ -14212,7 +14207,6 @@ gBattleAnimMove_Obstruct::
 	clearmonbg ANIM_ATK_PARTNER
 	end

-@Credits to Skeli
 gBattleAnimMove_FalseSurrender::
 	loadspritegfx ANIM_TAG_IMPACT
 	loadspritegfx ANIM_TAG_CROSS_IMPACT
@ -14435,7 +14429,6 @@ SetSteelBeamBgPlayer:
 	fadetobg BG_STEEL_BEAM_PLAYER
 	goto SetHighSpeedBgFade

-@Credits to Skeli
 gBattleAnimMove_ExpandingForce::
 	loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT
 	loadspritegfx ANIM_TAG_EXPLOSION_2
@ -14546,7 +14539,6 @@ MaxKnuckleExplosionGeyser:
 	return


-@Credits to Skeli
 gBattleAnimMove_SteelRoller::
 	loadspritegfx ANIM_TAG_STEAMROLLER
 	loadspritegfx ANIM_TAG_IMPACT
@ -14569,7 +14561,6 @@ SteelRollerRocks:
 	createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 0xc, 0x19, 0x4, 0x4
 	return

-@Credits to Skeli
 gBattleAnimMove_ScaleShot::
 	loadspritegfx ANIM_TAG_SHELL_RIGHT
 	loadspritegfx ANIM_TAG_IMPACT
@ -14586,7 +14577,6 @@ gBattleAnimMove_ScaleShot::
 	waitforvisualfinish
 	end

-@Credits to Skeli
 gBattleAnimMove_MeteorBeam::
 	loadspritegfx ANIM_TAG_ROCKS
 	fadetobg BG_COSMIC
@ -14692,7 +14682,6 @@ gBattleAnimMove_ShellSideArmSpecial:: @ Modified Snipe Shot, placeholder
 	waitforvisualfinish
 	end

-@Credits to Skeli
 gBattleAnimMove_MistyExplosion::
 	loadspritegfx ANIM_TAG_EXPLOSION
 	createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 8, 9, RGB(27, 18, 30), 8, RGB_BLACK, 8
@ -14709,7 +14698,6 @@ gBattleAnimMove_MistyExplosion::
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 3, 16, 0, RGB(31, 27, 31) @;White Pink
 	end

-@Credits to Skeli
 gBattleAnimMove_GrassyGlide::
 	loadspritegfx ANIM_TAG_LEAF @leaves
 	loadspritegfx ANIM_TAG_IMPACT @hits
@ -14725,7 +14713,6 @@ gBattleAnimMove_GrassyGlide::
 	createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x2
 	end

-@Credits to Skeli
 gBattleAnimMove_RisingVoltage::
 	loadspritegfx ANIM_TAG_ELECTRIC_ORBS
 	loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT
@ -14929,7 +14916,6 @@ gBattleAnimMove_SkitterSmack::
 	waitforvisualfinish
 	end

-@Credits to Skeli
 gBattleAnimMove_BurningJealousy::
 	loadspritegfx ANIM_TAG_SMALL_EMBER
 	playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
@ -14982,7 +14968,6 @@ BurningJealousyFlames:
 	return


-@Credits to Skeli
 gBattleAnimMove_LashOut::
 	loadspritegfx ANIM_TAG_FOCUS_ENERGY @focus energy
 	loadspritegfx ANIM_TAG_HANDS_AND_FEET @black color
@ -15063,7 +15048,6 @@ gBattleAnimMove_Poltergeist::
 	unloadspritegfx ANIM_TAG_ITEM_BAG
 	end

-@Credits to Skeli
 gBattleAnimMove_CorrosiveGas::
 	loadspritegfx ANIM_TAG_PINK_CLOUD @Fumes
 	createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_PINK_CLOUD, 0, 14, 14, RGB(15, 15, 6) @;Garbage green
@ -15089,7 +15073,6 @@ gBattleAnimMove_CorrosiveGas::
 	clearmonbg ANIM_ATTACKER
 	end

-@Credits to Skeli
 gBattleAnimMove_Coaching::
 	playsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_Splash, 2, ANIM_ATTACKER, 1
@ -15100,7 +15083,6 @@ gBattleAnimMove_Coaching::
 	waitforvisualfinish
 	end

-@Credits to Skeli
 gBattleAnimMove_FlipTurn::
 	loadspritegfx ANIM_TAG_ICE_CRYSTALS @;Bubbles
 	loadspritegfx ANIM_TAG_HYDRO_PUMP
@ -15124,7 +15106,6 @@ gBattleAnimMove_FlipTurn::
 	end


-@Credits to Skeli
 gBattleAnimMove_TripleAxel::
 	loadspritegfx ANIM_TAG_HANDS_AND_FEET
 	loadspritegfx ANIM_TAG_IMPACT
@ -15169,7 +15150,6 @@ TripleAxelEnd:
 	blendoff
 	end

-@Credits to Skeli
 gBattleAnimMove_DualWingbeat::
 	loadspritegfx ANIM_TAG_IMPACT
 	loadspritegfx ANIM_TAG_WHITE_FEATHER
@ -15226,7 +15206,6 @@ DualWingbeatFeatherScatterRight:
 	createsprite gDualWingbeatFeatherSpriteTemplate, ANIM_TARGET, 1, 0, 0xfff8, 0xfe80, 0xffe1
 	return

-@ credits to Skeli
 gBattleAnimMove_ScorchingSands::
 	loadspritegfx ANIM_TAG_MUD_SAND
 	loadspritegfx ANIM_TAG_SMALL_EMBER
@ -15251,7 +15230,6 @@ gBattleAnimMove_ScorchingSands::
 	blendoff
 	end

-@ credits to skeli
 gBattleAnimMove_JungleHealing::
 	loadspritegfx ANIM_TAG_ROOTS
 	loadspritegfx ANIM_TAG_ORBS
@ -15289,7 +15267,6 @@ gBattleAnimMove_JungleHealing::
 	waitbgfadein
 	end

-@ credits to ghoulslash
 gBattleAnimMove_SilkTrap::
 	loadspritegfx ANIM_TAG_PROTECT
 	loadspritegfx ANIM_TAG_SPIDER_WEB
@ -15305,7 +15282,6 @@ gBattleAnimMove_SilkTrap::
 	clearmonbg ANIM_ATK_PARTNER
 	end

-@ Also used by Snow weather. Credits to Dat.H A
 gBattleAnimMove_Snowscape::
 	loadspritegfx ANIM_TAG_SNOWFLAKES
 	playsewithpan SE_M_GUST, SOUND_PAN_ATTACKER
@ -15322,7 +15298,6 @@ gBattleAnimMove_Snowscape::
 	waitforvisualfinish
 	end

-@Credits to Skeli
 gBattleAnimMove_WickedBlow::
 	loadspritegfx ANIM_TAG_FOCUS_ENERGY
 	loadspritegfx ANIM_TAG_HANDS_AND_FEET
@ -15385,7 +15360,6 @@ WickedBlowBuffEffect:



-@Credits to Skeli
 gBattleAnimMove_SurgingStrikes::
 	loadspritegfx ANIM_TAG_IMPACT_2
 	loadspritegfx ANIM_TAG_WATER_IMPACT
@ -15432,7 +15406,6 @@ SURGING_STRIKES_2:
 	end


-@Credits to Skeli
 gBattleAnimMove_ThunderCage::
 	loadspritegfx ANIM_TAG_SHOCK_3 	@Thunderbolt Ball
 	loadspritegfx ANIM_TAG_SPARK 	@Electric lines
@ -15471,7 +15444,6 @@ ThunderCageBolts:
 	return


-@Credits to Skeli
 gBattleAnimMove_DragonEnergy::
 	loadspritegfx ANIM_TAG_HYDRO_PUMP
 	createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_HYDRO_PUMP, 0, 12, 12, RGB(30, 2, 11) @;Regidrago Reddish Reddish, Purple
@ -15530,7 +15502,6 @@ DragonEnergyShot:
 	return


-@Credits to Skeli
 gBattleAnimMove_FreezingGlare::
 	loadspritegfx ANIM_TAG_SMALL_RED_EYE
 	loadspritegfx ANIM_TAG_EYE_SPARKLE
@ -15549,7 +15520,6 @@ gBattleAnimMove_FreezingGlare::
 	end


-@Credits to Skeli
 gBattleAnimMove_FieryWrath::
 	loadspritegfx ANIM_TAG_SMALL_EMBER
 	loadspritegfx ANIM_TAG_PURPLE_RING
@ -15629,7 +15599,6 @@ FieryWrathGeyser:
 	return


-@Credits to Skeli
 gBattleAnimMove_ThunderousKick::
 	loadspritegfx ANIM_TAG_IMPACT
 	loadspritegfx ANIM_TAG_HANDS_AND_FEET
@ -15666,7 +15635,6 @@ gBattleAnimMove_ThunderousKick::
 	end


-@Credits to Skeli
 gBattleAnimMove_GlacialLance::
 	loadspritegfx ANIM_TAG_ICICLE_SPEAR
 	loadspritegfx ANIM_TAG_ICE_CUBE
@ -15821,7 +15789,6 @@ AstralBarrageFlames5:
 	return


-@Credits to Skeli
 gBattleAnimMove_EerieSpell::
 	loadspritegfx ANIM_TAG_PURPLE_FLAME
 	call SetPsychicBackground
@ -15864,7 +15831,6 @@ EerieSpellConvergingFlames:
 	return

@@@@@@@@@@@@@@@@@@@@@@@ GEN 9 @@@@@@@@@@@@@@@@@@@@@@@
-@ credits to Skeli
 gBattleAnimMove_DireClaw::
 	loadspritegfx ANIM_TAG_SLASH
 	loadspritegfx ANIM_TAG_POISON_BUBBLE
@ -15885,7 +15851,6 @@ gBattleAnimMove_DireClaw::
 	end


-@ credits to Skeli
 gBattleAnimMove_PsyshieldBash::
 	loadspritegfx ANIM_TAG_IMPACT
 	loadspritegfx ANIM_TAG_WATER_GUN @Blue colour
@ -15914,7 +15879,6 @@ gBattleAnimMove_PsyshieldBash::
 	blendoff
 	end

-@ credits to skeli
 gBattleAnimMove_PowerShift::
 	loadspritegfx ANIM_TAG_BLUEGREEN_ORB
 	loadspritegfx ANIM_TAG_RED_HEART @Red colour for orb
@ -15930,7 +15894,6 @@ gBattleAnimMove_PowerShift::
 	end


-@ credits to skeli
 gBattleAnimMove_StoneAxe::
 	loadspritegfx ANIM_TAG_SLAM_HIT_2 @Cut
 	loadspritegfx ANIM_TAG_ROCKS
@ -15960,7 +15923,6 @@ StoneAxeRockFragments:
 	return


-@Credits to Skeli
 gBattleAnimMove_SpringtideStorm::
 	loadspritegfx ANIM_TAG_GUST
 	loadspritegfx ANIM_TAG_RED_HEART
@ -15999,7 +15961,6 @@ SpringtideStormHeartSwirl:
 	return


-@Credits to Skeli
 gBattleAnimMove_MysticalPower::
 	loadspritegfx ANIM_TAG_THIN_RING
 	loadspritegfx ANIM_TAG_POISON_BUBBLE @Purple Colour
@ -16054,7 +16015,6 @@ MysticalPowerFoeTwoRingsOnly:
 	return


-@Credits to Skeli
 gBattleAnimMove_RagingFury::
 	loadspritegfx ANIM_TAG_SMALL_EMBER
 	loopsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER, 0x8, 0x3
@ -16071,7 +16031,6 @@ gBattleAnimMove_RagingFury::
 	waitforvisualfinish
 	end

-@Credits to Skeli
 gBattleAnimMove_WaveCrash::
 	loadspritegfx ANIM_TAG_WATER_IMPACT
 	loadspritegfx ANIM_TAG_SMALL_BUBBLES
@ -16092,7 +16051,6 @@ gBattleAnimMove_WaveCrash::
 	end


-@Credits to Skeli
 gBattleAnimMove_Chloroblast::
 	loadspritegfx ANIM_TAG_THIN_RING
 	loadspritegfx ANIM_TAG_HYDRO_PUMP
@ -16153,7 +16111,6 @@ ChloroblastShot:
 	delay 2
 	return

-@Credits to Skeli
 gBattleAnimMove_MountainGale::
 	loadspritegfx ANIM_TAG_ROCKS @Rocks
 	loadspritegfx ANIM_TAG_DRAGON_ASCENT_FOE @White Rock Colour
@ -16186,7 +16143,6 @@ MountainGaleIceRock:



-@Credits to Skeli
 gBattleAnimMove_VictoryDance::
 	loadspritegfx ANIM_TAG_HOLLOW_ORB
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 40, 6, 3, 3
@ -16206,7 +16162,6 @@ gBattleAnimMove_VictoryDance::
 	waitforvisualfinish
 	end

-@Credits to Skeli
 gBattleAnimMove_HeadlongRush::
 	loadspritegfx ANIM_TAG_MUD_SAND @Dig
 	loadspritegfx ANIM_TAG_IMPACT
@ -16293,7 +16248,6 @@ MaxQuake_DirtGeyser:
 	return


-@Credits to Skeli
 gBattleAnimMove_BarbBarrage::
 	loadspritegfx ANIM_TAG_SPIKES
 	loadspritegfx ANIM_TAG_SHADOW_BALL @Spikes colour
@ -16326,7 +16280,6 @@ BarbBarrageSpikeShoot:



-@Credits to Skeli
 gBattleAnimMove_EsperWing::
 	loadspritegfx ANIM_TAG_PUNISHMENT_BLADES @Punishment Blade
 	loadspritegfx ANIM_TAG_WHITE_FEATHER
@ -16363,7 +16316,6 @@ WingAttackFeatherScatter:
 	return


-@Credits to Skeli
 gBattleAnimMove_BitterMalice::
 	loadspritegfx ANIM_TAG_PURPLE_RING
 	loadspritegfx ANIM_TAG_EYE_SPARKLE
@ -16397,7 +16349,6 @@ BitterMaliceSwirl:
 	delay 2
 	return

-@ credits to Skeli
 gBattleAnimMove_Shelter::
 	loadspritegfx ANIM_TAG_SHELL_LEFT
 	loadspritegfx ANIM_TAG_SHELL_RIGHT
@ -16413,7 +16364,6 @@ gBattleAnimMove_Shelter::
 	end


-@Credits to Skeli
 gBattleAnimMove_TripleArrows::
 	loadspritegfx ANIM_TAG_SPIRIT_ARROW @Arrow
 	loadspritegfx ANIM_TAG_HANDS_AND_FEET
@ -16447,7 +16397,6 @@ TripleArrowsOnOpponent:



-@Credits to Skeli
 gBattleAnimMove_InfernalParade::
 	loadspritegfx ANIM_TAG_PURPLE_FLAME
 	loadspritegfx ANIM_TAG_WISP_FIRE
@ -16493,7 +16442,6 @@ InfernalFlames:



-@Credits to Skeli
 gBattleAnimMove_CeaselessEdge::
 	loadspritegfx ANIM_TAG_SLASH
 	playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER
@ -16531,7 +16479,6 @@ CeaselessEdgeSlashes:
 	return


-@Credits to Skeli
 gBattleAnimMove_BleakwindStorm::
 	loadspritegfx ANIM_TAG_GUST
 	loadspritegfx ANIM_TAG_ICE_CRYSTALS
@ -16571,7 +16518,6 @@ BleakwindStormIceSwirl:
 	return


-@Credits to Skeli
 gBattleAnimMove_WildboltStorm::
 	loadspritegfx ANIM_TAG_GUST
 	loadspritegfx ANIM_TAG_SPARK_2
@ -16617,7 +16563,6 @@ WildboltStormSparkSwirl:
 	return


-@Credits to Skeli
 gBattleAnimMove_SandsearStorm::
 	loadspritegfx ANIM_TAG_GUST
 	loadspritegfx ANIM_TAG_SMALL_EMBER
@ -16659,7 +16604,6 @@ SandsearStormFireSpin:
 	return


-@Credits to Skeli
 gBattleAnimMove_LunarBlessing::
 	loadspritegfx ANIM_TAG_BLUE_STAR
 	loadspritegfx ANIM_TAG_MOON
@ -16693,7 +16637,6 @@ gBattleAnimMove_LunarBlessing::
 	end


-@Credits to Skeli
 gBattleAnimMove_TakeHeart::
 	loadspritegfx ANIM_TAG_RED_HEART
 	loadspritegfx ANIM_TAG_SPARKLE_2
@ -16796,7 +16739,6 @@ gBattleAnimMove_SyrupBomb::
 	jumpargeq 0x0, FALSE, gBattleAnimMove_SyrupBombRed
 	jumpargeq 0x0, TRUE, gBattleAnimMove_SyrupBombYellow

-@ Credits to Dat.H A
 gBattleAnimMove_SyrupBombRed::
 	loadspritegfx ANIM_TAG_SYRUP_BLOB_RED
 	loadspritegfx ANIM_TAG_SYRUP_SPLAT_RED
@ -17015,7 +16957,6 @@ gBattleAnimMove_AlluringVoice::
 	waitforvisualfinish
 	end

-@ Credits to Z-nogyroP
 gBattleAnimMove_AquaCutter::
 	loadspritegfx ANIM_TAG_SLASH_2
 	loadspritegfx ANIM_TAG_SMALL_BUBBLES
@ -17054,7 +16995,6 @@ gBattleAnimMove_AquaCutter::
 	waitforvisualfinish
 	end

-@ Credits to Z-nogyroP
 gBattleAnimMove_GigatonHammer::
 	loadspritegfx ANIM_TAG_ROCKS
 	loadspritegfx ANIM_TAG_WOOD_HAMMER_HAMMER
@ -17083,7 +17023,6 @@ GigatonHammerImpact:
 	createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 0xc, 0x1e, 0x4, 0x3
 	return

-@ Credits to Z-nogyroP
 gBattleAnimMove_IceSpinner::
 	loadspritegfx ANIM_TAG_IMPACT
 	loadspritegfx ANIM_TAG_RAPID_SPIN
@ -17126,7 +17065,6 @@ IceCrystalSpinEffect:
 	delay 2
 	return

-@ Credits to Z-nogyroP
 gBattleAnimMove_RagingBull::
 	loadspritegfx ANIM_TAG_IMPACT
 	loadspritegfx ANIM_TAG_ANGER
@ -17213,7 +17151,6 @@ RagingBullShatteredWall:
 	clearmonbg ANIM_TARGET
 	end

-@ Credits to Z-nogyroP. Simple anim that combines Force Palm + Fake Out
 gBattleAnimMove_UpperHand::
 	loadspritegfx ANIM_TAG_SHADOW_BALL
 	loadspritegfx ANIM_TAG_HANDS_AND_FEET
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@ -4958,6 +4958,7 @@ BattleScript_LeechSeedTurnDrain:
 	healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
 	datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
 	tryfaintmon BS_ATTACKER
+	tryactivateitem BS_ATTACKER, ACTIVATION_ON_HP_THRESHOLD
 	return

 BattleScript_BideStoringEnergy::
@ -6294,6 +6295,7 @@ BattleScript_YawnMakesAsleepEnd2::
 	waitmessage B_WAIT_TIME_LONG
 	updatestatusicon BS_EFFECT_BATTLER
 	waitstate
+	tryactivateitem BS_EFFECT_BATTLER, ACTIVATION_ON_STATUS_CHANGE
 	jumpfifsemiinvulnerable BS_EFFECT_BATTLER, STATE_SKY_DROP, BattleScript_YawnEnd
 	makevisible BS_EFFECT_BATTLER
 	skydropyawn
--- a/docs/SUMMARY.md
+++ b/docs/SUMMARY.md
@ -44,6 +44,7 @@
  - [Vs. Seeker](tutorials/vs_seeker.md)
 - [Changelog](./CHANGELOG.md)
    - [1.14.x]()
+        - [Version 1.14.2](changelogs/1.14.x/1.14.2.md)
        - [Version 1.14.1](changelogs/1.14.x/1.14.1.md)
        - [Version 1.14.0](changelogs/1.14.x/1.14.0.md)
    - [1.13.x]()
--- a/docs/changelogs/1.14.x/1.14.2.md
+++ b/docs/changelogs/1.14.x/1.14.2.md
@ -0,0 +1,209 @@
+```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.14.2
+`.
+```
+
+## 🌋 *REFACTORS* 🌋
+📜 = Uses a migration script.
+* Renamed Config Test system to more general names by @AsparagusEduardo in [#7283](https://github.com/rh-hideout/pokeemerald-expansion/pull/7283)
+
+## 🧬 General 🧬
+### Changed
+* Fix docs not compiling by @hedara90 in [#8407](https://github.com/rh-hideout/pokeemerald-expansion/pull/8407)
+* Update mdbook to v0.5.1 by @rayrobdod in [#8437](https://github.com/rh-hideout/pokeemerald-expansion/pull/8437)
+* Add a ci step that checks that documentation md files are mentioned in `docs/SUMMARY.md` by @rayrobdod in [#8439](https://github.com/rh-hideout/pokeemerald-expansion/pull/8439)
+* Fix `GEN_6_ORAS` definition by @AsparagusEduardo in [#8537](https://github.com/rh-hideout/pokeemerald-expansion/pull/8537)
+* Add different Poke Balls to more Trainers by @amiosi in [#8467](https://github.com/rh-hideout/pokeemerald-expansion/pull/8467)
+* Remove another unused deoxys function by @FosterProgramming in [#8576](https://github.com/rh-hideout/pokeemerald-expansion/pull/8576)
+* Gorilla Tactics and Test typos fix by @bassforte123 in [#8653](https://github.com/rh-hideout/pokeemerald-expansion/pull/8653)
+* Use release instead of LTO in CI by @hedara90 in [#8706](https://github.com/rh-hideout/pokeemerald-expansion/pull/8706)
+
+### Fixed
+* Fix merge error that broke some hgss palette by @FosterProgramming in [#8411](https://github.com/rh-hideout/pokeemerald-expansion/pull/8411)
+* Make TRUE and 1 behave the same in config/species_enabled.h by @hedara90 in [#8421](https://github.com/rh-hideout/pokeemerald-expansion/pull/8421)
+* Do not add padding to end of smol file when smol is natually word-sized by @rayrobdod in [#8522](https://github.com/rh-hideout/pokeemerald-expansion/pull/8522)
+* Align gSpecialVars by @Stevebel in [#8541](https://github.com/rh-hideout/pokeemerald-expansion/pull/8541)
+* Fix Safari and Wally backsprites when reshowing battle screen by @AsparagusEduardo in [#8561](https://github.com/rh-hideout/pokeemerald-expansion/pull/8561)
+* Fix party pool oob by @hedara90 in [#8581](https://github.com/rh-hideout/pokeemerald-expansion/pull/8581)
+* Fix progbits flags for iwram asm functions by @DizzyEggg in [#8627](https://github.com/rh-hideout/pokeemerald-expansion/pull/8627)
+
+## 🗺️ Overworld 🗺️
+### Fixed
+* Fix bug with enterCode default value by @FosterProgramming in [#8438](https://github.com/rh-hideout/pokeemerald-expansion/pull/8438)
+* Free the allocated buffer before the second decompression call (hopefully helps) by @FosterProgramming in [#8301](https://github.com/rh-hideout/pokeemerald-expansion/pull/8301)
+* Fix truck fade being cancelled by @FosterProgramming in [#8617](https://github.com/rh-hideout/pokeemerald-expansion/pull/8617)
+* Refactor dexnav to not use overworld task by @FosterProgramming in [#8602](https://github.com/rh-hideout/pokeemerald-expansion/pull/8602)
+
+## 🐉 Pokémon 🐉
+### Changed
+* GBA Asset Fixes by @amiosi in [#8382](https://github.com/rh-hideout/pokeemerald-expansion/pull/8382)
+* Fix Flabébé and Floette overworld sprites by @estellarc in [#8511](https://github.com/rh-hideout/pokeemerald-expansion/pull/8511)
+* Fix Naclstack and Garganacl shadows by @kittenchilly in [#8698](https://github.com/rh-hideout/pokeemerald-expansion/pull/8698)
+
+### Fixed
+* Fix Summary screen lag with move relearner when there's a lot of TMs by @PCG06 in [#8503](https://github.com/rh-hideout/pokeemerald-expansion/pull/8503)
+* Small fix that prevented TM relearner if `P_ENABLE_ALL_TM_MOVES` was `TRUE` by @PCG06 in [#8525](https://github.com/rh-hideout/pokeemerald-expansion/pull/8525)
+* Re-colored Gliscor's anim_front.png by @DaniRainbow in [#8341](https://github.com/rh-hideout/pokeemerald-expansion/pull/8341)
+* Allow Floette Eternal to mega evolve by @PhallenTree in [#8558](https://github.com/rh-hideout/pokeemerald-expansion/pull/8558)
+* Redraw Gurdurr's overworld sprite by @artsquirrelb in [#8625](https://github.com/rh-hideout/pokeemerald-expansion/pull/8625)
+* Expansion OW sprites fix by @artsquirrelb in [#8633](https://github.com/rh-hideout/pokeemerald-expansion/pull/8633)
+* Fix the game not building with OW_POKEMON_OBJECT_EVENTS disabled by @kittenchilly in [#8654](https://github.com/rh-hideout/pokeemerald-expansion/pull/8654)
+* Fix the sprite visualizer not showing asymmetrical follower sprites by @kittenchilly in [#8643](https://github.com/rh-hideout/pokeemerald-expansion/pull/8643)
+* Fixes Kingambit evolution conditions by @PhallenTree in [#8689](https://github.com/rh-hideout/pokeemerald-expansion/pull/8689)
+
+## ⚔️ Battle General ⚔️
+### Changed
+* Generational Move Changes by @amiosi in [#8405](https://github.com/rh-hideout/pokeemerald-expansion/pull/8405)
+* Fix Lunar Dance not checking PP by @AsparagusEduardo in [#8364](https://github.com/rh-hideout/pokeemerald-expansion/pull/8364)
+    - Added `EFFECT_LUNAR_DANCE`, which is the same as `EFFECT_HEALING_WISH` but also heals PP.
+* Fixes Instruct's message by @PhallenTree in [#8543](https://github.com/rh-hideout/pokeemerald-expansion/pull/8543)
+* Adds tests for Beak Blast not burning when the target is protected by @PhallenTree in [#8713](https://github.com/rh-hideout/pokeemerald-expansion/pull/8713)
+
+### Fixed
+* Multiple bugfixes (mostly Dancer/called moves) by @PhallenTree in [#8401](https://github.com/rh-hideout/pokeemerald-expansion/pull/8401)
+* Fix Costar not copying partner's critical hit boosts by @moostoet in [#8386](https://github.com/rh-hideout/pokeemerald-expansion/pull/8386)
+* Fix transform tint applying to every from change on reload by @FosterProgramming in [#8417](https://github.com/rh-hideout/pokeemerald-expansion/pull/8417)
+* Fix illusion not breaking properly when behind substitute by @FosterProgramming in [#8423](https://github.com/rh-hideout/pokeemerald-expansion/pull/8423)
+* Fix substitute/defog interactions by @FosterProgramming in [#8418](https://github.com/rh-hideout/pokeemerald-expansion/pull/8418)
+* Fixes Wind Power/Electromorphosis potentially boosting 2 electric attacks by @PhallenTree in [#8431](https://github.com/rh-hideout/pokeemerald-expansion/pull/8431)
+* Add missing breakable flags by @AlexOn1ine in [#8454](https://github.com/rh-hideout/pokeemerald-expansion/pull/8454)
+* Adds missing cases for Revenge and Assurance doubling power by @AlexOn1ine in [#8453](https://github.com/rh-hideout/pokeemerald-expansion/pull/8453)
+* Fix potential issue when destiny knot fail after proccing from cute charm by @FosterProgramming in [#8459](https://github.com/rh-hideout/pokeemerald-expansion/pull/8459)
+* Fix bug when changing forms multiple times by @FosterProgramming in [#8458](https://github.com/rh-hideout/pokeemerald-expansion/pull/8458)
+* Fix gimmick icon not appearing correctly in 1v2 by @FosterProgramming in [#8474](https://github.com/rh-hideout/pokeemerald-expansion/pull/8474)
+* Give dead mons priority over eggs when assigning battlers by @FosterProgramming in [#8473](https://github.com/rh-hideout/pokeemerald-expansion/pull/8473)
+* Environment Fixes by @amiosi in [#8471](https://github.com/rh-hideout/pokeemerald-expansion/pull/8471)
+* Fixes Disguise + Counter/Mirror Coat/Metal Burst + Disguise tests by @PhallenTree in [#8495](https://github.com/rh-hideout/pokeemerald-expansion/pull/8495)
+* Fix battler side status check in CalcCritChanceStage by @AlexOn1ine in [#8524](https://github.com/rh-hideout/pokeemerald-expansion/pull/8524)
+* Fix AI handling of Trick/Bestow and add comprehensive tests by @Cle-bit in [#8516](https://github.com/rh-hideout/pokeemerald-expansion/pull/8516)
+* Fix incorrect "last to move" check for Analytic, Snatch, and Magic Coat by @moostoet in [#8536](https://github.com/rh-hideout/pokeemerald-expansion/pull/8536)
+* Fix species gfx change in link battles by @AsparagusEduardo in [#8552](https://github.com/rh-hideout/pokeemerald-expansion/pull/8552)
+* Fixes Water Sport/Mud Sport when B_SPORT_TURNS < GEN_6 by @PhallenTree in [#8613](https://github.com/rh-hideout/pokeemerald-expansion/pull/8613)
+* fix poisons absorbing toxic spikes when fainting from other hazards by @spindrift64 in [#8644](https://github.com/rh-hideout/pokeemerald-expansion/pull/8644)
+* Fix incorrectly applied change in atkcanceler by @AlexOn1ine in [#8641](https://github.com/rh-hideout/pokeemerald-expansion/pull/8641)
+* Fix transform shininess in link battles by @AlexOn1ine in [#8554](https://github.com/rh-hideout/pokeemerald-expansion/pull/8554)
+* Fix Mimic trying to access MOVE_UNAVAILABLE in an incredibly small amount of possible scenarios by @hedara90 in [#8685](https://github.com/rh-hideout/pokeemerald-expansion/pull/8685)
+* Fix stat access for stats other than Attack in BS_GetStatValue by @hedara90 in [#8684](https://github.com/rh-hideout/pokeemerald-expansion/pull/8684)
+* Add tests for abilities that affect weather by @Cle-bit in [#8709](https://github.com/rh-hideout/pokeemerald-expansion/pull/8709)
+
+## 🤹 Moves 🤹
+### Fixed
+* Fixes incorrect battler used in STRINGID_USEDINSTRUCTEDMOVE by @grintoul1 in [#8704](https://github.com/rh-hideout/pokeemerald-expansion/pull/8704)
+
+## 🎭 Abilities 🎭
+### Fixed
+* Fix some bugs related to abilities by @Cle-bit in [#8695](https://github.com/rh-hideout/pokeemerald-expansion/pull/8695)
+
+## 🤖 Battle AI 🤖
+### Added
+* Respect beneficial status in healing moves and add tests by @Cle-bit in [#8478](https://github.com/rh-hideout/pokeemerald-expansion/pull/8478)
+
+### Fixed
+* fix (setup): ignore self-speed drop when checking speed control on KO threshold change by @ghostyboyy97 in [#8409](https://github.com/rh-hideout/pokeemerald-expansion/pull/8409)
+    - AI now correctly sees that moves like Hammer Arm are self-targeted speed drops on the player when evaluating speed control in setup scenarios.
+* fix (hazards): ghosty used rapid spin! ghosty blew the semicolon away! by @ghostyboyy97 in [#8433](https://github.com/rh-hideout/pokeemerald-expansion/pull/8433)
+    - The AI will now correctly see if the player can prevent hazards on moves with a secondary Stealth Rock effect.
+* Fix incorrect Spikes reference in switch AI by @Pawkkie in [#8510](https://github.com/rh-hideout/pokeemerald-expansion/pull/8510)
+* Fix AI handling of Trick/Bestow and add comprehensive tests by @Cle-bit in [#8516](https://github.com/rh-hideout/pokeemerald-expansion/pull/8516)
+* Fix: AI should not use Helping Hand on a partner with ABILITY_GOOD_AS_GOLD by @Cle-bit in [#8560](https://github.com/rh-hideout/pokeemerald-expansion/pull/8560)
+* Fixing crash from Last Resort with Normalium Z in certain damage thresholds by @surskitty in [#8583](https://github.com/rh-hideout/pokeemerald-expansion/pull/8583)
+* fix (scoring): AI_IsMoveEffectInPlus - AI should not see secondary effect of Sheer Force boosted moves as beneficial by @ghostyboyy97 in [#8579](https://github.com/rh-hideout/pokeemerald-expansion/pull/8579)
+    - The AI is now aware if its positive move effects are removed by Sheer Force when evaluating both guaranteed and secondary effects.
+* Fix type check in Magnet Rise AI by @grintoul1 in [#8609](https://github.com/rh-hideout/pokeemerald-expansion/pull/8609)
+* Fix Commander Dondozo Switching by @Pawkkie in [#8624](https://github.com/rh-hideout/pokeemerald-expansion/pull/8624)
+* Prevent AI seeing Pollen Puff damage on its ally by @grintoul1 in [#8693](https://github.com/rh-hideout/pokeemerald-expansion/pull/8693)
+
+## 🧹 Other Cleanup 🧹
+* Include FEATURES.md in documentation by @AsparagusEduardo in [#8464](https://github.com/rh-hideout/pokeemerald-expansion/pull/8464)
+* Fix Lunar Dance not checking PP by @AsparagusEduardo in [#8364](https://github.com/rh-hideout/pokeemerald-expansion/pull/8364)
+    - Added `EFFECT_LUNAR_DANCE`, which is the same as `EFFECT_HEALING_WISH` but also heals PP.
+* Fixes Instruct's message by @PhallenTree in [#8543](https://github.com/rh-hideout/pokeemerald-expansion/pull/8543)
+* Fix `GEN_6_ORAS` definition by @AsparagusEduardo in [#8537](https://github.com/rh-hideout/pokeemerald-expansion/pull/8537)
+* Automatically fix TM numbers over 100 in Bag menu by @AsparagusEduardo in [#8531](https://github.com/rh-hideout/pokeemerald-expansion/pull/8531)
+* Add different Poke Balls to more Trainers by @amiosi in [#8467](https://github.com/rh-hideout/pokeemerald-expansion/pull/8467)
+* Remove another unused deoxys function by @FosterProgramming in [#8576](https://github.com/rh-hideout/pokeemerald-expansion/pull/8576)
+* Update maintainer list by @pkmnsnfrn in [#8638](https://github.com/rh-hideout/pokeemerald-expansion/pull/8638)
+
+## 🧪 Test Runner 🧪
+### Changed
+* Renamed Config Test system to more general names by @AsparagusEduardo in [#7283](https://github.com/rh-hideout/pokeemerald-expansion/pull/7283)
+* Create missing hold effect test files by @AsparagusEduardo in [#8397](https://github.com/rh-hideout/pokeemerald-expansion/pull/8397)
+* `WITH_CONFIG` Refactor by @AsparagusEduardo in [#7584](https://github.com/rh-hideout/pokeemerald-expansion/pull/7584)
+    - Changed the way configs into the testing system to occupy less memory and make it easier to add more.
+    - Fixes inconsistency in enum names.
+    - Starts reserving the memory necessary to allow testing for all configs.
+* Add test for lum berry multi status by @FosterProgramming in [#8430](https://github.com/rh-hideout/pokeemerald-expansion/pull/8430)
+* Added missing Move Effect TODO tests - Volume G by @AsparagusEduardo in [#8428](https://github.com/rh-hideout/pokeemerald-expansion/pull/8428)
+* Fixed KNOWN_FAILING Dire Claw test by @AsparagusEduardo in [#8442](https://github.com/rh-hideout/pokeemerald-expansion/pull/8442)
+* Finished Defog tests by @AsparagusEduardo in [#8424](https://github.com/rh-hideout/pokeemerald-expansion/pull/8424)
+* Fix move anim tests sometimes leaking tasks by @hedara90 in [#8493](https://github.com/rh-hideout/pokeemerald-expansion/pull/8493)
+* Added tests for stat-changing moves by @AsparagusEduardo in [#8278](https://github.com/rh-hideout/pokeemerald-expansion/pull/8278)
+* Expanded `B_EXP_CATCH` test by @AsparagusEduardo in [#8527](https://github.com/rh-hideout/pokeemerald-expansion/pull/8527)
+* Fixed `AI_GetSwitchinWeather` not considering `CONFIG_SNOW_WARNING` by @AsparagusEduardo in [#8533](https://github.com/rh-hideout/pokeemerald-expansion/pull/8533)
+* Expanded `B_SANDSTORM_SPDEF_BOOST` test by @AsparagusEduardo in [#8532](https://github.com/rh-hideout/pokeemerald-expansion/pull/8532)
+* `B_SYMBIOSIS_GEMS` tests by @AsparagusEduardo in [#8534](https://github.com/rh-hideout/pokeemerald-expansion/pull/8534)
+* Added Ability TODO tests - Volume D by @AsparagusEduardo in [#8538](https://github.com/rh-hideout/pokeemerald-expansion/pull/8538)
+* Finished Wish tests by @AsparagusEduardo in [#8530](https://github.com/rh-hideout/pokeemerald-expansion/pull/8530)
+* Add SUB_HIT check to tests by @hedara90 in [#8413](https://github.com/rh-hideout/pokeemerald-expansion/pull/8413)
+* Added Light Ball tests by @AsparagusEduardo in [#8526](https://github.com/rh-hideout/pokeemerald-expansion/pull/8526)
+* Add debug print to show what move failed in Sheer Force tests by @hedara90 in [#8523](https://github.com/rh-hideout/pokeemerald-expansion/pull/8523)
+* `B_STURDY` config test by @AsparagusEduardo in [#8565](https://github.com/rh-hideout/pokeemerald-expansion/pull/8565)
+* `B_KLUTZ_FLING_INTERACTION` config test by @AsparagusEduardo in [#8568](https://github.com/rh-hideout/pokeemerald-expansion/pull/8568)
+* `B_IRON_BALL` config test by @AsparagusEduardo in [#8569](https://github.com/rh-hideout/pokeemerald-expansion/pull/8569)
+* `B_SYNCHRONIZE_TOXIC` config test by @AsparagusEduardo in [#8572](https://github.com/rh-hideout/pokeemerald-expansion/pull/8572)
+* `B_BURN_DAMAGE` config tests by @AsparagusEduardo in [#8574](https://github.com/rh-hideout/pokeemerald-expansion/pull/8574)
+* `B_REDIRECT_ABILITY_IMMUNITY` config tests by @AsparagusEduardo in [#8571](https://github.com/rh-hideout/pokeemerald-expansion/pull/8571)
+* `B_UPDATED_CONVERSION_2` config tests by @AsparagusEduardo in [#8573](https://github.com/rh-hideout/pokeemerald-expansion/pull/8573)
+* `B_TAILWIND_TURNS` config tests by @AsparagusEduardo in [#8592](https://github.com/rh-hideout/pokeemerald-expansion/pull/8592)
+* `B_BINDING_TURNS` config tests by @AsparagusEduardo in [#8595](https://github.com/rh-hideout/pokeemerald-expansion/pull/8595)
+* `B_SPORT_DMG_REDUCTION` config tests by @AsparagusEduardo in [#8593](https://github.com/rh-hideout/pokeemerald-expansion/pull/8593)
+* Add tests for Intrepid Sword and Dauntless Shield at max stages by @FosterProgramming in [#8610](https://github.com/rh-hideout/pokeemerald-expansion/pull/8610)
+* Add some missing tests for heatproof, thick fat and grudge by @izrofid in [#8705](https://github.com/rh-hideout/pokeemerald-expansion/pull/8705)
+* Adds tests for Beak Blast not burning when the target is protected by @PhallenTree in [#8713](https://github.com/rh-hideout/pokeemerald-expansion/pull/8713)
+
+### Fixed
+* Fix random function in testing trying to run trials when rng tag is 0/RNG_NONE by @FosterProgramming in [#8460](https://github.com/rh-hideout/pokeemerald-expansion/pull/8460)
+* Fix AI handling of Trick/Bestow and add comprehensive tests by @Cle-bit in [#8516](https://github.com/rh-hideout/pokeemerald-expansion/pull/8516)
+* Corrects test system Forced Ability handing for multi battles by @grintoul1 in [#8611](https://github.com/rh-hideout/pokeemerald-expansion/pull/8611)
+* Fix Status1 icon not being registered for recorded partner in tests by @AsparagusEduardo in [#8520](https://github.com/rh-hideout/pokeemerald-expansion/pull/8520)
+* Prevent AI seeing Pollen Puff damage on its ally by @grintoul1 in [#8693](https://github.com/rh-hideout/pokeemerald-expansion/pull/8693)
+* Fix some bugs related to abilities by @Cle-bit in [#8695](https://github.com/rh-hideout/pokeemerald-expansion/pull/8695)
+* Add tests for abilities that affect weather by @Cle-bit in [#8709](https://github.com/rh-hideout/pokeemerald-expansion/pull/8709)
+
+## 📚 Documentation 📚
+* Fix docs not compiling by @hedara90 in [#8407](https://github.com/rh-hideout/pokeemerald-expansion/pull/8407)
+* Add a ci step that checks that documentation md files are mentioned in `docs/SUMMARY.md` by @rayrobdod in [#8439](https://github.com/rh-hideout/pokeemerald-expansion/pull/8439)
+* Include FEATURES.md in documentation by @AsparagusEduardo in [#8464](https://github.com/rh-hideout/pokeemerald-expansion/pull/8464)
+* Document magic number in `createspriteontargets` by @AsparagusEduardo in [#8551](https://github.com/rh-hideout/pokeemerald-expansion/pull/8551)
+* fix CONTRIBUTING.md by @u8-Salem in [#8577](https://github.com/rh-hideout/pokeemerald-expansion/pull/8577)
+* Update maintainer list by @pkmnsnfrn in [#8638](https://github.com/rh-hideout/pokeemerald-expansion/pull/8638)
+
+## 📦 Branch Synchronisation 📦
+### pret
+* 1st of January, 2026 in [#8737](https://github.com/rh-hideout/pokeemerald-expansion/pull/8737)
+    * Document UpdateLegendaryMarkingColor by @mrgriffin in [pret#2221](https://github.com/pret/pokeemerald/pull/2221)
+    * Fix some typos by @Jaizu in [pret#2219](https://github.com/pret/pokeemerald/pull/2219)
+    * Document m4a xcmd_0C by @ShinyDragonHunter in [pret#2218](https://github.com/pret/pokeemerald/pull/2218)
+    * Fixed pokenav glow issue by @shachar700 in [pret#2215](https://github.com/pret/pokeemerald/pull/2215)
+    * Added bugfix for missing no weather case in Cmd_weather_get by @Mitsunee in [pret#2203](https://github.com/pret/pokeemerald/pull/2203)
+    * Label unused functions in siirtc.c, m4a.c & rtc.c with the "UNUSED" attribute by @ShinyDragonHunter in [pret#2171](https://github.com/pret/pokeemerald/pull/2171)
+    * Add fix for possible crash when decompressing trainer back pics by @GriffinRichards in [pret#2074](https://github.com/pret/pokeemerald/pull/2074)
+    * Change rangeX and rangeY to u8 in ObjectEvent struct by @NTx86 in [pret#2176](https://github.com/pret/pokeemerald/pull/2176)
+    * Fix sScrollableMultichoice_ListMenuItem allocation size magic number by @NTx86 in [pret#2177](https://github.com/pret/pokeemerald/pull/2177)
+    * Name pokemon summary screen remaining unnamed symbols by @FosterProgramming in [pret#2178](https://github.com/pret/pokeemerald/pull/2178)
+    * Fix FLAG_REGISTERED_WALLY by @mrgriffin in [pret#2201](https://github.com/pret/pokeemerald/pull/2201)
+    * Display error for invalid hidden item flags by @GriffinRichards in [pret#2214](https://github.com/pret/pokeemerald/pull/2214)
+
+## New Contributors
+* @Stevebel made their first contribution in [#8541](https://github.com/rh-hideout/pokeemerald-expansion/pull/8541)
+* @DaniRainbow made their first contribution in [#8341](https://github.com/rh-hideout/pokeemerald-expansion/pull/8341)
+* @artsquirrelb made their first contribution in [#8625](https://github.com/rh-hideout/pokeemerald-expansion/pull/8625)
+* @izrofid made their first contribution in [#8705](https://github.com/rh-hideout/pokeemerald-expansion/pull/8705)
+
+**Full Changelog**: https://github.com/rh-hideout/pokeemerald-expansion/compare/expansion/1.14.1...expansion/1.14.2
+
+
+<!--Last PR: 8737-->
+<!--Used to keep track of the last PR merged in case new ones come in before the changelog is done.-->
--- a/include/battle.h
+++ b/include/battle.h
@ -616,7 +616,7 @@ struct EventStates
    u32 arenaTurn:8;
    enum BattleSide battlerSide:4;
    enum BattlerId moveEndBattler:4;
-    enum FirstTurnEventsStates beforeFristTurn:8;
+    enum FirstTurnEventsStates beforeFirstTurn:8;
    enum FaintedActions faintedAction:8;
    enum BattlerId faintedActionBattler:4;
    enum MoveSuccessOrder atkCanceler:8;
--- a/include/config/battle.h
+++ b/include/config/battle.h
@ -36,7 +36,7 @@
 #define B_SPORT_DMG_REDUCTION       GEN_LATEST // In Gen5+, Water/Mud Sport reduce Fire/Electric Damage by 67% instead of 50%.
 #define B_EXPLOSION_DEFENSE         GEN_LATEST // In Gen5+, Self-Destruct and Explosion don't halve the targets' defense.
 #define B_PARENTAL_BOND_DMG         GEN_LATEST // In Gen7+, Parental Bond's second hit does 25% of the initial hits damage. Before, it did 50%.
-#define B_MULTIPLE_TARGETS_DMG      GEN_LATEST // In Gen4+, damage dealt by moves that hit multiple targets at once is reduced to 75%. Before, it was 50%.
+#define B_MULTIPLE_TARGETS_DMG      GEN_LATEST // In Gen4+, damage dealt by moves that hit multiple targets at once is reduced to 75%. In Gen3, it was 50%, unless the move hit the entire field, in which case there was no reduction.

 // Type settings
 #define B_GHOSTS_ESCAPE             GEN_LATEST // In Gen6+, abilities like Shadow Tag or moves like Mean Look fail on Ghost-type Pokémon. They can also escape any Wild Battle.
@ -54,18 +54,18 @@
 #define B_UPROAR_IGNORE_SOUNDPROOF  GEN_LATEST // In Gen5+, Uproar status ignores Soundproof.
 #define B_DISABLE_TURNS             GEN_LATEST // Disable's turns. See Cmd_disablelastusedattack.
 #define B_TAILWIND_TURNS            GEN_LATEST // In Gen5+, Tailwind lasts 4 turns instead of 3.
-#define B_SLEEP_TURNS               GEN_LATEST // In Gen5+, sleep lasts for 1-3 turns instead of 2-5 turns.
+#define B_SLEEP_TURNS               GEN_LATEST // In Gen5+, sleep lasts for 2-4 turns instead of 2-5 turns.
 #define B_TAUNT_TURNS               GEN_LATEST // In Gen5+, Taunt lasts 3 turns if the user acts before the target, or 4 turns if the target acted before the user. In Gen3, taunt lasts 2 turns and in Gen 4, 3-5 turns.
 #define B_SPORT_TURNS               GEN_LATEST // In Gen6+, Water/Mud Sport last 5 turns, even if the user switches out.
 #define B_MEGA_EVO_TURN_ORDER       GEN_LATEST // In Gen7, a Pokémon's Speed after Mega Evolution is used to determine turn order, not its Speed before.
-#define B_RECALC_TURN_AFTER_ACTIONS GEN_LATEST // In Gen8, switching/using a move affects the current turn's order of actions, better known as dynamic speed.
+#define B_RECALC_TURN_AFTER_ACTIONS GEN_LATEST // In Gen8+, switching/using a move affects the current turn's order of actions, better known as dynamic speed.
 #define B_FAINT_SWITCH_IN           GEN_LATEST // In Gen4+, sending out a new Pokémon after the previous one fainted happens at the end of the turn. Before, it would happen after each action.

 // Move data settings
 #define B_UPDATED_MOVE_DATA         GEN_LATEST // Updates move data in gMovesInfo, including Power, Accuracy, PP, stat changes, targets and chances of secondary effects.
 #define B_UPDATED_MOVE_TYPES        GEN_LATEST // Updates move types.
 #define B_UPDATED_MOVE_FLAGS        GEN_LATEST // Updates move flags.
-#define B_PHYSICAL_SPECIAL_SPLIT    GEN_LATEST // In Gen3, the move's type determines if it will do physical or special damage. The split icon in the summary will reflect this.
+#define B_PHYSICAL_SPECIAL_SPLIT    GEN_LATEST // In Gens1-3, the move's type determines if it will do physical or special damage. The split icon in the summary will reflect this.
 #define B_RECOIL_IF_MISS_DMG        GEN_LATEST // In Gen5+, Jump Kick and High Jump Kick will always do half of the user's max HP when missing.
 #define B_KLUTZ_FLING_INTERACTION   GEN_LATEST // In Gen5+, Pokémon with the Klutz ability can't use Fling.
 #define B_UPDATED_CONVERSION        GEN_LATEST // In Gen6+, Conversion changes the user's type to match their first move's. Before, it would choose a move at random.
@ -85,7 +85,7 @@
 // Move stat change settings
 #define B_FELL_STINGER_STAT_RAISE   GEN_LATEST // In Gen7+, it raises Atk by 3 stages instead of 2 if it causes the target to faint.
 #define B_KINGS_SHIELD_LOWER_ATK    GEN_LATEST // In Gen8+, it lowers Atk by 1 stage instead of 2 of opponents that hit it.
-#define B_SPEED_BUFFING_RAPID_SPIN  GEN_LATEST // In Gen8, Rapid Spin raises the user's Speed by 1 stage.
+#define B_SPEED_BUFFING_RAPID_SPIN  GEN_LATEST // In Gen8+, Rapid Spin raises the user's Speed by 1 stage.
 #define B_CHARGE_SPDEF_RAISE        GEN_LATEST // In Gen5+, Charge raises the user's Special Defense by 1 stage.
 #define B_MINIMIZE_EVASION          GEN_LATEST // In Gen5+, Minimize raises evasion by 2 stages instead of 1.
 #define B_GROWTH_STAT_RAISE         GEN_LATEST // In Gen5+, Growth raises Attack in addition to Special Attack by 1 stage each. Under the effects of the sun, it raises them by 2 stages each instead.
@ -94,8 +94,8 @@
 // Other move settings
 #define B_INCINERATE_GEMS           GEN_LATEST // In Gen6+, Incinerate can destroy Gems.
 #define B_CAN_SPITE_FAIL            GEN_LATEST // In Gen4+, Spite can no longer fail if the foe's last move only has 1 remaining PP.
-#define B_CRASH_IF_TARGET_IMMUNE    GEN_LATEST // In Gen4+, The user of Jump Kick or High Jump Kick will "keep going and crash" if it attacks a target that is immune to the move.
-#define B_MEMENTO_FAIL              GEN_LATEST // In Gen4+, Memento fails if there is no target or if the target is protected or behind substitute. But not if Atk/Sp. Atk are at -6.
+#define B_CRASH_IF_TARGET_IMMUNE    GEN_LATEST // In Gen4+, moves with crash damage will crash if the user attacks a target that is immune due to their typing.
+#define B_MEMENTO_FAIL              GEN_LATEST // In Gen4+, Memento no longer fails if the target already has -6 Attack and Special Attack. Additionally, in Gen5+, it fails if there is no target, or if the target is protected or behind a Substitute.
 #define B_GLARE_GHOST               GEN_LATEST // In Gen4+, Glare can hit Ghost-type Pokémon normally.
 #define B_SKILL_SWAP                GEN_LATEST // In Gen4+, Skill Swap triggers switch-in abilities after use.
 #define B_BRICK_BREAK               GEN_LATEST // In Gen4+, you can destroy your own side's screens. In Gen 5+, screens are not removed if the target is immune.
@ -118,11 +118,11 @@
 #define B_WIDE_GUARD                GEN_LATEST // In Gen5 only, Wide Guard has a chance to fail if used consecutively.
 #define B_QUICK_GUARD               GEN_LATEST // In Gen5 only, Quick Guard has a chance to fail if used consecutively.
 #define B_IMPRISON                  GEN_LATEST // In Gen5+, Imprison doesn't fail if opposing pokemon don't have any moves the user knows.
-#define B_ALLY_SWITCH_FAIL_CHANCE   GEN_LATEST // In Gen9, using Ally Switch consecutively decreases the chance of success for each consecutive use.
+#define B_ALLY_SWITCH_FAIL_CHANCE   GEN_LATEST // In Gen9+, using Ally Switch consecutively decreases the chance of success for each consecutive use.
 #define B_SKETCH_BANS               GEN_LATEST // In Gen9+, Sketch is unable to copy more moves than in previous generations.
 #define B_KNOCK_OFF_REMOVAL         GEN_LATEST // In Gen5+, Knock Off removes the foe's item instead of rendering it unusable.
 #define B_HEAL_BELL_SOUNDPROOF      GEN_LATEST // In Gen5, Heal Bell affects all mons with Soundproof.  In Gen6-8 it affects inactive mons, but not battlers. In Gen9 it always affects the user.
-#define B_CHARGE                    GEN_LATEST // In Gen8-, Charge status is lost regardless of the typing of the next move.
+#define B_CHARGE                    GEN_LATEST // In Gens3-7, Charge status is lost regardless of the typing of the next move.
 #define B_POWDER_RAIN               GEN_LATEST // In Gen7+, Powder doesn't damage the user of a Fire type move in heavy rain.
 #define B_AFTER_YOU_TURN_ORDER      GEN_LATEST // In Gen8+, After You doesn't fail if the turn order wouldn't change after use.
 #define B_QUASH_TURN_ORDER          GEN_LATEST // In Gen8+, Quash-affected battlers move according to speed order. Before Gen8, Quash-affected battlers move in the order they were affected by Quash.
@ -139,10 +139,10 @@
 #define B_GALE_WINGS                GEN_LATEST // In Gen7+ requires full HP to trigger.
 #define B_STANCE_CHANGE_FAIL        GEN_LATEST // In Gen7+, Stance Change fails if the Pokémon is unable to use a move because of confusion, paralysis, etc. In Gen6, it doesn't.
 #define B_SHADOW_TAG_ESCAPE         GEN_LATEST // In Gen4+, if both sides have a Pokémon with Shadow Tag, all battlers can escape. Before, neither side could escape this situation.
-#define B_MOODY_ACC_EVASION         GEN_LATEST // In Gen8, Moody CANNOT raise Accuracy and Evasion anymore.
+#define B_MOODY_ACC_EVASION         GEN_LATEST // In Gen8+, Moody CANNOT raise Accuracy and Evasion anymore.
 #define B_FLASH_FIRE_FROZEN         GEN_LATEST // In Gen5+, Flash Fire can trigger even when frozen, when it couldn't before.
 #define B_SYNCHRONIZE_TOXIC         GEN_LATEST // In Gen5+, if a Pokémon with Synchronize is badly poisoned, the opponent will also become badly poisoned. Previously, the opponent would become regular poisoned.
-#define B_UPDATED_INTIMIDATE        GEN_LATEST // In Gen8, Intimidate doesn't work on opponents with the Inner Focus, Scrappy, Own Tempo or Oblivious abilities. It also activates Rattled.
+#define B_UPDATED_INTIMIDATE        GEN_LATEST // In Gen8+, Intimidate doesn't work on opponents with the Inner Focus, Scrappy, Own Tempo or Oblivious abilities. It also activates Rattled.
 #define B_OBLIVIOUS_TAUNT           GEN_LATEST // In Gen6+, Pokémon with Oblivious can't be taunted.
 #define B_STURDY                    GEN_LATEST // In Gen5+, Sturdy causes the Pokémon to have 1 HP remaining if another Pokémon's attack or confusion damage would have brought it from full health to 0 HP.
 #define B_PLUS_MINUS_INTERACTION    GEN_LATEST // In Gen5+, Plus and Minus can be activated with themselves and the opposite ability. Before, only the opposing ability could activate it.
@ -170,13 +170,13 @@
 #define B_POWDER_OVERCOAT           GEN_LATEST // In Gen6+, Overcoat blocks powder and spore moves from affecting the user.

 // Item settings
-#define B_CONFUSE_BERRIES_HEAL      GEN_LATEST // Before Gen7, Figy and similar berries restore 1/8th of HP and trigger at half HP. In Gen7 they restore half HP, triggering at 25% HP. In Gen8 they heal 1/3rd of HP.
+#define B_CONFUSE_BERRIES_HEAL      GEN_LATEST // In Gens3-6, Figy and similar berries restore 1/8th of HP and trigger at half HP. In Gen7 they restore half HP, triggering at 25% HP. In Gen8 they heal 1/3rd of HP.
 #define B_X_ITEMS_BUFF              GEN_LATEST // In Gen7+, the X Items raise a stat by 2 stages instead of 1.
 #define B_MENTAL_HERB               GEN_LATEST // In Gen5+, the Mental Herb cures Taunt, Encore, Torment, Heal Block, and Disable in addition to Infatuation from before.
-#define B_TRAINERS_KNOCK_OFF_ITEMS  TRUE       // If TRUE, trainers can steal/swap your items (non-berries are restored after battle). In vanilla games trainers cannot steal items.
+#define B_TRAINERS_KNOCK_OFF_ITEMS  TRUE       // If TRUE, trainers can steal/swap your items (non-berries are restored after battle). In vanilla games, trainers cannot steal items outside of facilities.
 #define B_RETURN_STOLEN_NPC_ITEMS   GEN_LATEST // In Gen5+, Thief and Covet no longer steal items from NPCs.
-#define B_STEAL_WILD_ITEMS          GEN_LATEST // In Gen9, Thief and Covet steal a wild pokemon's item and send it to the bag. Before Gen9, the stolen item would be held by the Thief/Covet user.
-#define B_RESTORE_HELD_BATTLE_ITEMS GEN_LATEST // In Gen9, all non-berry items are restored after battle.
+#define B_STEAL_WILD_ITEMS          GEN_LATEST // In Gen9+, Thief and Covet steal a wild pokemon's item and send it to the bag. In Gens2-8, the stolen item would be held by the Thief/Covet user.
+#define B_RESTORE_HELD_BATTLE_ITEMS GEN_LATEST // In Gen9+, all non-berry items are restored after battle.
 #define B_SOUL_DEW_BOOST            GEN_LATEST // In Gens3-6, Soul Dew boosts Latis' Sp. Atk and Sp. Def. In Gen7+ it boosts the power of their Psychic and Dragon type moves instead.
 #define B_NET_BALL_MODIFIER         GEN_LATEST // In Gen7+, Net Ball's catch multiplier is x5 instead of x3.
 #define B_DIVE_BALL_MODIFIER        GEN_LATEST // In Gen4+, Dive Ball's effectiveness increases by x3.5 when Surfing or Fishing.
--- a/include/config/item.h
+++ b/include/config/item.h
@ -12,7 +12,7 @@
 #define I_GRISEOUS_ORB_FORM_CHANGE      GEN_LATEST  // In Gen9+, the Griseous Orb no longer changes Giratina's form when held.
 #define I_GEM_BOOST_POWER               GEN_LATEST  // In Gen6+, the Gem boost power was reduced from 50% to 30%.
 #define I_USE_EVO_HELD_ITEMS_FROM_BAG   FALSE       // If TRUE, items such as Razor Claw or Electirizer will be usable from the bag to evolve a Pokémon just like in LA.
-#define I_TYPE_BOOST_POWER              GEN_LATEST  // In Gen4+, all regular type boosting held items had their power increased from 10% to 20%. eg. Charcoal
+#define I_TYPE_BOOST_POWER              GEN_LATEST  // In Gen4+, type-enhancing held items (such as Charcoal) had their multiplier increased from 1.1x to 1.2x. Sea Incense was changed from 1.05x to 1.2x.
 #define I_SELL_VALUE_FRACTION           GEN_LATEST  // In Gen9+, items sell for 1/4 of their value instead of 1/2.
 #define I_PRICE                         GEN_LATEST  // Some items have varied in value across generations.
 #define I_BERRY_PRICE                   GEN_7       // Since Berries have become unplantable (Gen8+), their price has gone up.
--- a/include/constants/battle_script_commands.h
+++ b/include/constants/battle_script_commands.h
@ -1,6 +1,266 @@
 #ifndef GUARD_CONSTANTS_BATTLE_SCRIPT_COMMANDS_H
 #define GUARD_CONSTANTS_BATTLE_SCRIPT_COMMANDS_H

+enum BattleScriptOpcode
+{
+    B_SCR_OP_ATTACKCANCELER,
+    B_SCR_OP_ACCURACYCHECK,
+    B_SCR_OP_PRINTATTACKSTRING,
+    B_SCR_OP_UNUSED_0x3,
+    B_SCR_OP_CRITCALC,
+    B_SCR_OP_DAMAGECALC,
+    B_SCR_OP_TYPECALC,
+    B_SCR_OP_ADJUSTDAMAGE,
+    B_SCR_OP_MULTIHITRESULTMESSAGE,
+    B_SCR_OP_ATTACKANIMATION,
+    B_SCR_OP_WAITANIMATION,
+    B_SCR_OP_HEALTHBARUPDATE,
+    B_SCR_OP_DATAHPUPDATE,
+    B_SCR_OP_CRITMESSAGE,
+    B_SCR_OP_EFFECTIVENESSSOUND,
+    B_SCR_OP_RESULTMESSAGE,
+    B_SCR_OP_PRINTSTRING,
+    B_SCR_OP_PRINTSELECTIONSTRING,
+    B_SCR_OP_WAITMESSAGE,
+    B_SCR_OP_PRINTFROMTABLE,
+    B_SCR_OP_PRINTSELECTIONSTRINGFROMTABLE,
+    B_SCR_OP_SETADDITIONALEFFECTS,
+    B_SCR_OP_SETEFFECTPRIMARY,
+    B_SCR_OP_SETEFFECTSECONDARY,
+    B_SCR_OP_CLEARVOLATILE,
+    B_SCR_OP_TRYFAINTMON,
+    B_SCR_OP_DOFAINTANIMATION,
+    B_SCR_OP_CLEAREFFECTSONFAINT,
+    B_SCR_OP_JUMPIFSTATUS,
+    B_SCR_OP_JUMPIFVOLATILE,
+    B_SCR_OP_JUMPIFABILITY,
+    B_SCR_OP_JUMPIFSIDEAFFECTING,
+    B_SCR_OP_JUMPIFSTAT,
+    B_SCR_OP_JUMPIFSTATIGNORECONTRARY,
+    B_SCR_OP_JUMPBASEDONTYPE,
+    B_SCR_OP_GETEXP,
+    B_SCR_OP_CHECKTEAMSLOST,
+    B_SCR_OP_MOVEVALUESCLEANUP,
+    B_SCR_OP_SETMULTIHIT,
+    B_SCR_OP_DECREMENTMULTIHIT,
+    B_SCR_OP_GOTO,
+    B_SCR_OP_JUMPIFBYTE,
+    B_SCR_OP_JUMPIFHALFWORD,
+    B_SCR_OP_JUMPIFWORD,
+    B_SCR_OP_JUMPIFARRAYEQUAL,
+    B_SCR_OP_JUMPIFARRAYNOTEQUAL,
+    B_SCR_OP_SETBYTE,
+    B_SCR_OP_ADDBYTE,
+    B_SCR_OP_SUBBYTE,
+    B_SCR_OP_COPYARRAY,
+    B_SCR_OP_COPYARRAYWITHINDEX,
+    B_SCR_OP_ORBYTE,
+    B_SCR_OP_ORHALFWORD,
+    B_SCR_OP_ORWORD,
+    B_SCR_OP_BICBYTE,
+    B_SCR_OP_BICHALFWORD,
+    B_SCR_OP_BICWORD,
+    B_SCR_OP_PAUSE,
+    B_SCR_OP_WAITSTATE,
+    B_SCR_OP_ISDMGBLOCKEDBYDISGUISE,
+    B_SCR_OP_RETURN,
+    B_SCR_OP_END,
+    B_SCR_OP_END2,
+    B_SCR_OP_END3,
+    B_SCR_OP_SETCHARGINGTURN,
+    B_SCR_OP_CALL,
+    B_SCR_OP_SETROOST,
+    B_SCR_OP_JUMPIFABILITYPRESENT,
+    B_SCR_OP_ENDSELECTIONSCRIPT,
+    B_SCR_OP_PLAYANIMATION,
+    B_SCR_OP_PLAYANIMATION_VAR,
+    B_SCR_OP_JUMPFIFSEMIINVULNERABLE,
+    B_SCR_OP_UNUSED_0x48,
+    B_SCR_OP_MOVEEND,
+    B_SCR_OP_SETHEALBLOCK,
+    B_SCR_OP_RETURNATKTOBALL,
+    B_SCR_OP_GETSWITCHEDMONDATA,
+    B_SCR_OP_SWITCHINDATAUPDATE,
+    B_SCR_OP_SWITCHINANIM,
+    B_SCR_OP_JUMPIFCANTSWITCH,
+    B_SCR_OP_OPENPARTYSCREEN,
+    B_SCR_OP_SWITCHHANDLEORDER,
+    B_SCR_OP_SWITCHINEFFECTS,
+    B_SCR_OP_TRAINERSLIDEIN,
+    B_SCR_OP_PLAYSE,
+    B_SCR_OP_FANFARE,
+    B_SCR_OP_PLAYFAINTCRY,
+    B_SCR_OP_ENDLINKBATTLE,
+    B_SCR_OP_RETURNTOBALL,
+    B_SCR_OP_HANDLELEARNNEWMOVE,
+    B_SCR_OP_YESNOBOXLEARNMOVE,
+    B_SCR_OP_YESNOBOXSTOPLEARNINGMOVE,
+    B_SCR_OP_HITANIMATION,
+    B_SCR_OP_GETMONEYREWARD,
+    B_SCR_OP_UPDATEBATTLERMOVES,
+    B_SCR_OP_SWAPATTACKERWITHTARGET,
+    B_SCR_OP_INCREMENTGAMESTAT,
+    B_SCR_OP_DRAWPARTYSTATUSSUMMARY,
+    B_SCR_OP_HIDEPARTYSTATUSSUMMARY,
+    B_SCR_OP_JUMPTOCALLEDMOVE,
+    B_SCR_OP_STATUSANIMATION,
+    B_SCR_OP_UNUSED_0x65,
+    B_SCR_OP_UNUSED_0x66,
+    B_SCR_OP_YESNOBOX,
+    B_SCR_OP_CANCELALLACTIONS,
+    B_SCR_OP_SETGRAVITY,
+    B_SCR_OP_REMOVEITEM,
+    B_SCR_OP_ATKNAMEINBUFF1,
+    B_SCR_OP_DRAWLVLUPBOX,
+    B_SCR_OP_RESETSENTMONSVALUE,
+    B_SCR_OP_SETATKTOPLAYER0,
+    B_SCR_OP_MAKEVISIBLE,
+    B_SCR_OP_RECORDABILITY,
+    B_SCR_OP_BUFFERMOVETOLEARN,
+    B_SCR_OP_JUMPIFPLAYERRAN,
+    B_SCR_OP_HPTHRESHOLDS,
+    B_SCR_OP_HPTHRESHOLDS2,
+    B_SCR_OP_USEITEMONOPPONENT,
+    B_SCR_OP_UNUSED_0x78,
+    B_SCR_OP_SETPROTECTLIKE,
+    B_SCR_OP_TRYEXPLOSION,
+    B_SCR_OP_SETATKHPTOZERO,
+    B_SCR_OP_JUMPIFNEXTTARGETVALID,
+    B_SCR_OP_TRYHEALHALFHEALTH,
+    B_SCR_OP_UNUSED_0x7E,
+    B_SCR_OP_SETFIELDWEATHER,
+    B_SCR_OP_SETREFLECT,
+    B_SCR_OP_SETSEEDED,
+    B_SCR_OP_MANIPULATEDAMAGE,
+    B_SCR_OP_TRYSETREST,
+    B_SCR_OP_UNUSED_0x82,
+    B_SCR_OP_UNUSED_0x83,
+    B_SCR_OP_JUMPIFUPROARWAKES,
+    B_SCR_OP_STOCKPILE,
+    B_SCR_OP_STOCKPILETOBASEDAMAGE,
+    B_SCR_OP_STOCKPILETOHPHEAL,
+    B_SCR_OP_UNUSED_0x88,
+    B_SCR_OP_STATBUFFCHANGE,
+    B_SCR_OP_NORMALISEBUFFS,
+    B_SCR_OP_SETBIDE,
+    B_SCR_OP_TWOTURNMOVESCHARGESTRINGANDANIMATION,
+    B_SCR_OP_TRYNONVOLATILESTATUS,
+    B_SCR_OP_INITMULTIHITSTRING,
+    B_SCR_OP_FORCERANDOMSWITCH,
+    B_SCR_OP_TRYCONVERSIONTYPECHANGE,
+    B_SCR_OP_GIVEPAYDAYMONEY,
+    B_SCR_OP_SETLIGHTSCREEN,
+    B_SCR_OP_TRYKO,
+    B_SCR_OP_CHECKNONVOLATILETRIGGER,
+    B_SCR_OP_COPYBIDEDMG,
+    B_SCR_OP_ANIMATEWILDPOKEMONAFTERFAILEDPOKEBALL,
+    B_SCR_OP_TRYINFATUATING,
+    B_SCR_OP_UPDATESTATUSICON,
+    B_SCR_OP_SETMIST,
+    B_SCR_OP_SETFOCUSENERGY,
+    B_SCR_OP_TRANSFORMDATAEXECUTION,
+    B_SCR_OP_SETSUBSTITUTE,
+    B_SCR_OP_MIMICATTACKCOPY,
+    B_SCR_OP_SETCALLEDMOVE,
+    B_SCR_OP_UNUSED_0x9F,
+    B_SCR_OP_UNUSED_0xA0,
+    B_SCR_OP_COUNTERDAMAGECALCULATOR,
+    B_SCR_OP_MIRRORCOATDAMAGECALCULATOR,
+    B_SCR_OP_DISABLELASTUSEDATTACK,
+    B_SCR_OP_TRYSETENCORE,
+    B_SCR_OP_PAINSPLITDMGCALC,
+    B_SCR_OP_SETTYPETORANDOMRESISTANCE,
+    B_SCR_OP_SETALWAYSHITFLAG,
+    B_SCR_OP_COPYMOVEPERMANENTLY,
+    B_SCR_OP_UNUSED_0xA9,
+    B_SCR_OP_UNUSED_AA,
+    B_SCR_OP_UNUSED_0xAB,
+    B_SCR_OP_SETTAILWIND,
+    B_SCR_OP_TRYSPITEPPREDUCE,
+    B_SCR_OP_HEALPARTYSTATUS,
+    B_SCR_OP_CURSETARGET,
+    B_SCR_OP_TRYSETSPIKES,
+    B_SCR_OP_SETVOLATILE,
+    B_SCR_OP_TRYSETPERISHSONG,
+    B_SCR_OP_HANDLEROLLOUT,
+    B_SCR_OP_JUMPIFCONFUSEDANDSTATMAXED,
+    B_SCR_OP_HANDLEFURYCUTTER,
+    B_SCR_OP_SETEMBARGO,
+    B_SCR_OP_PRESENTDAMAGECALCULATION,
+    B_SCR_OP_SETSAFEGUARD,
+    B_SCR_OP_MAGNITUDEDAMAGECALCULATION,
+    B_SCR_OP_JUMPIFNOPURSUITSWITCHDMG,
+    B_SCR_OP_TRYACTIVATEITEM,
+    B_SCR_OP_HALVEHP,
+    B_SCR_OP_COPYFOESTATS,
+    B_SCR_OP_RAPIDSPINFREE,
+    B_SCR_OP_UNUSED_0xBF,
+    B_SCR_OP_RECOVERBASEDONSUNLIGHT,
+    B_SCR_OP_SETSTICKYWEB,
+    B_SCR_OP_SELECTFIRSTVALIDTARGET,
+    B_SCR_OP_SETFUTUREATTACK,
+    B_SCR_OP_TRYDOBEATUP,
+    B_SCR_OP_SETSEMIINVULNERABLEBIT,
+    B_SCR_OP_TRYFIRETWOTURNMOVENOWBYEFFECT,
+    B_SCR_OP_UNUSED_0xC7,
+    B_SCR_OP_UNUSED_C8,
+    B_SCR_OP_TRYMEMENTO,
+    B_SCR_OP_SETFORCEDTARGET,
+    B_SCR_OP_UNUSED_0xCB,
+    B_SCR_OP_UNUSED_0xCC,
+    B_SCR_OP_CURESTATUSWITHMOVE,
+    B_SCR_OP_SETTORMENT,
+    B_SCR_OP_JUMPIFNODAMAGE,
+    B_SCR_OP_SETTAUNT,
+    B_SCR_OP_TRYSETHELPINGHAND,
+    B_SCR_OP_TRYSWAPITEMS,
+    B_SCR_OP_TRYCOPYABILITY,
+    B_SCR_OP_TRYWISH,
+    B_SCR_OP_SETTOXICSPIKES,
+    B_SCR_OP_SETGASTROACID,
+    B_SCR_OP_SETYAWN,
+    B_SCR_OP_SETDAMAGETOHEALTHDIFFERENCE,
+    B_SCR_OP_SETROOM,
+    B_SCR_OP_TRYSWAPABILITIES,
+    B_SCR_OP_TRYIMPRISON,
+    B_SCR_OP_SETSTEALTHROCK,
+    B_SCR_OP_TRYSETVOLATILE,
+    B_SCR_OP_UNUSED_0xDE,
+    B_SCR_OP_TRYSETMAGICCOAT,
+    B_SCR_OP_TRYSETSNATCH,
+    B_SCR_OP_UNUSED2,
+    B_SCR_OP_SWITCHOUTABILITIES,
+    B_SCR_OP_JUMPIFHASNOHP,
+    B_SCR_OP_UNUSED_0xE4,
+    B_SCR_OP_PICKUP,
+    B_SCR_OP_UNUSED_0xE6,
+    B_SCR_OP_UNUSED_0xE7,
+    B_SCR_OP_SETTYPEBASEDHALVERS,
+    B_SCR_OP_JUMPIFSUBSTITUTEBLOCKS,
+    B_SCR_OP_TRYRECYCLEITEM,
+    B_SCR_OP_SETTYPETOENVIRONMENT,
+    B_SCR_OP_PURSUITDOUBLES,
+    B_SCR_OP_SNATCHSETBATTLERS,
+    B_SCR_OP_REMOVESCREENS,
+    B_SCR_OP_HANDLEBALLTHROW,
+    B_SCR_OP_GIVECAUGHTMON,
+    B_SCR_OP_TRYSETCAUGHTMONDEXFLAGS,
+    B_SCR_OP_DISPLAYDEXINFO,
+    B_SCR_OP_TRYGIVECAUGHTMONNICK,
+    B_SCR_OP_UNUSED_0xF4,
+    B_SCR_OP_REMOVEATTACKERSTATUS1,
+    B_SCR_OP_FINISHACTION,
+    B_SCR_OP_FINISHTURN,
+    B_SCR_OP_TRAINERSLIDEOUT,
+    B_SCR_OP_SETTELEKINESIS,
+    B_SCR_OP_SWAPSTATSTAGES,
+    B_SCR_OP_AVERAGESTATS,
+    B_SCR_OP_JUMPIFCAPTIVATEAFFECTED,
+    B_SCR_OP_SETNONVOLATILESTATUS,
+    B_SCR_OP_TRYOVERWRITEABILITY,
+    B_SCR_OP_CALLNATIVE,
+};
+
 // The following correspond to the struct members of BattleScripting by adding their offset
 #define sUNUSED_0x00                 (gBattleScripting + 0x00) // unused_0x00
 #define sUNUSED_0x04                 (gBattleScripting + 0x04) // unused_0x04
--- a/include/constants/expansion.h
+++ b/include/constants/expansion.h
@ -1,10 +1,10 @@
 #ifndef GUARD_CONSTANTS_EXPANSION_H
 #define GUARD_CONSTANTS_EXPANSION_H

-// Last version: 1.14.1
+// Last version: 1.14.2
 #define EXPANSION_VERSION_MAJOR 1
 #define EXPANSION_VERSION_MINOR 14
-#define EXPANSION_VERSION_PATCH 2
+#define EXPANSION_VERSION_PATCH 3

 // FALSE if this this version of Expansion is not a tagged commit, i.e.
 // it contains unreleased changes.
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@ -445,7 +445,7 @@
 #define FLAG_REGISTERED_TRENT                (TRAINER_REGISTERED_FLAGS_START + REMATCH_TRENT)
 #define FLAG_REGISTERED_SAWYER               (TRAINER_REGISTERED_FLAGS_START + REMATCH_SAWYER)
 #define FLAG_REGISTERED_KIRA_AND_DAN         (TRAINER_REGISTERED_FLAGS_START + REMATCH_KIRA_AND_DAN)
-#define FLAG_REGISTERED_WALLY                (TRAINER_REGISTERED_FLAGS_START + REMATCH_WALLY)
+#define FLAG_REGISTERED_WALLY                (TRAINER_REGISTERED_FLAGS_START + REMATCH_WALLY_VR)
 #define FLAG_REGISTERED_ROXANNE              (TRAINER_REGISTERED_FLAGS_START + REMATCH_ROXANNE)
 #define FLAG_REGISTERED_BRAWLY               (TRAINER_REGISTERED_FLAGS_START + REMATCH_BRAWLY)
 #define FLAG_REGISTERED_WATTSON              (TRAINER_REGISTERED_FLAGS_START + REMATCH_WATTSON)
--- a/include/constants/generational_changes.h
+++ b/include/constants/generational_changes.h
@ -147,7 +147,7 @@
    F(INTREPID_SWORD,            intrepidSword,           (u32, GEN_COUNT - 1)) \
    F(DAUNTLESS_SHIELD,          dauntlessShield,         (u32, GEN_COUNT - 1)) \
    F(DISGUISE_HP_LOSS,          disguiseHpLoss,          (u32, GEN_COUNT - 1)) \
-    F(ABILITY_TRIGGER_CHANCE,    abilityTriggerChance,    (u32, GEN_COUNT - 1)) /* TODO: use in tests */ \
+    F(ABILITY_TRIGGER_CHANCE,    abilityTriggerChance,    (u32, GEN_COUNT - 1)) \
    F(PICKUP_WILD,               pickupWild,              (u32, GEN_COUNT - 1)) \
    F(MAGIC_GUARD,               magicGuard,              (u32, GEN_COUNT - 1)) /* TODO: use in tests */ \
    F(BATTLE_BOND,               battleBond,              (u32, GEN_COUNT - 1)) \
--- a/include/constants/hold_effects.h
+++ b/include/constants/hold_effects.h
@ -157,6 +157,7 @@ enum ItemActivationState
    ACTIVATION_ON_PICK_UP,
    ACTIVATION_ON_HARVEST,
    ACTIVATION_ON_HP_THRESHOLD,
+    ACTIVATION_ON_STATUS_CHANGE,
 };

 #endif // GUARD_HOLD_EFFECTS_H
--- a/include/dexnav.h
+++ b/include/dexnav.h
@ -69,14 +69,15 @@ enum EncounterType
 #define DEXNAV_MASK_SPECIES         0x3FFF  // First 14 bits
 #define DEXNAV_MASK_ENVIRONMENT     0xC000  // Last two bit

-void EndDexNavSearch(u8 taskId);
+void EndDexNavSearch(void);
 void Task_OpenDexNavFromStartMenu(u8 taskId);
-bool8 TryStartDexNavSearch(void);
+bool32 TryStartDexNavSearch(void);
 void TryIncrementSpeciesSearchLevel(void);
 void ResetDexNavSearch(void);
-bool8 TryFindHiddenPokemon(void);
+bool32 TryFindHiddenPokemon(void);
 u32 CalculateDexNavShinyRolls(void);
 void IncrementDexNavChain(void);
+bool32 OnStep_DexNavSearch(void);

 extern u16 gDexNavSpecies;

--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@ -3,6 +3,10 @@

 #include "constants/event_object_movement.h"

+#if OW_BATTLE_ONLY_FORMS && !OW_POKEMON_OBJECT_EVENTS
+#error "OW_POKEMON_OBJECT_EVENTS needs to be TRUE in order for OW_BATTLE_ONLY_FORMS to work."
+#endif
+
 #if OW_POKEMON_OBJECT_EVENTS == FALSE && OW_FOLLOWERS_ENABLED == TRUE
 #error "OW_POKEMON_OBJECT_EVENTS needs to be TRUE in order for OW_FOLLOWERS_ENABLED to work."
 #endif
--- a/include/gba/m4a_internal.h
+++ b/include/gba/m4a_internal.h
@ -257,8 +257,8 @@ struct PokemonCrySong
    u8 tieCmd; // 0x29
    u8 tieKeyValue; // 0x2A
    u8 tieVelocityValue; // 0x2B
-    u8 unkCmd0C[2]; // 0x2C
-    u16 unkCmd0CParam; // 0x2E
+    u8 xwaitCmd[2]; // 0x2C
+    u16 length; // 0x2E
    u8 end[2]; // 0x30
 };

@ -306,7 +306,7 @@ struct MusicPlayerTrack
    struct SoundChannel *chan;
    struct ToneData tone;
    u8 gap[10];
-    u16 unk_3A;
+    u16 timer;
    u32 unk_3C;
    u8 *cmdPtr;
    u8 *patternStack[3];
@ -495,7 +495,7 @@ void ply_xiecv(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
 void ply_xiecl(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
 void ply_xleng(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
 void ply_xswee(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_xcmd_0C(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
+void ply_xwait(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
 void ply_xcmd_0D(struct MusicPlayerInfo *, struct MusicPlayerTrack *);

 #endif // GUARD_GBA_M4A_INTERNAL_H
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@ -232,8 +232,8 @@ struct ObjectEvent
             u16 movementDirection:4;
             struct __attribute__((packed))
             {
-                u16 rangeX:4;
-                u16 rangeY:4;
+                u8 rangeX:4;
+                u8 rangeY:4;
             } range;
    /*0x1A*/ u8 fieldEffectSpriteId;
    /*0x1B*/ u8 warpArrowSpriteId;
--- a/include/rtc.h
+++ b/include/rtc.h
@ -23,11 +23,6 @@ void RtcGetStatus(struct SiiRtcInfo *rtc);
 void RtcGetRawInfo(struct SiiRtcInfo *rtc);
 u16 RtcCheckInfo(struct SiiRtcInfo *rtc);
 void RtcReset(void);
-void FormatDecimalTime(u8 *dest, s32 hour, s32 minute, s32 second);
-void FormatHexTime(u8 *dest, s32 hour, s32 minute, s32 second);
-void FormatHexRtcTime(u8 *dest);
-void FormatDecimalDate(u8 *dest, s32 year, s32 month, s32 day);
-void FormatHexDate(u8 *dest, s32 year, s32 month, s32 day);
 void RtcCalcTimeDifference(struct SiiRtcInfo *rtc, struct Time *result, struct Time *t);
 void RtcCalcLocalTime(void);
 bool8 IsBetweenHours(s32 hours, s32 begin, s32 end);
--- a/include/siirtc.h
+++ b/include/siirtc.h
@ -28,6 +28,5 @@ bool8 SiiRtcGetDateTime(struct SiiRtcInfo *rtc);
 bool8 SiiRtcSetDateTime(struct SiiRtcInfo *rtc);
 bool8 SiiRtcGetTime(struct SiiRtcInfo *rtc);
 bool8 SiiRtcSetTime(struct SiiRtcInfo *rtc);
-bool8 SiiRtcSetAlarm(struct SiiRtcInfo *rtc);

 #endif // GUARD_RTC_H
--- a/sound/direct_sound_samples/bicycle_bell.wav
+++ b/sound/direct_sound_samples/bicycle_bell.wav
--- a/sound/direct_sound_samples/classical_choir_voice_ahhs.wav
+++ b/sound/direct_sound_samples/classical_choir_voice_ahhs.wav
--- a/sound/direct_sound_samples/cries/abra.wav
+++ b/sound/direct_sound_samples/cries/abra.wav
--- a/sound/direct_sound_samples/cries/absol.wav
+++ b/sound/direct_sound_samples/cries/absol.wav
--- a/sound/direct_sound_samples/cries/aerodactyl.wav
+++ b/sound/direct_sound_samples/cries/aerodactyl.wav
--- a/sound/direct_sound_samples/cries/aggron.wav
+++ b/sound/direct_sound_samples/cries/aggron.wav
--- a/sound/direct_sound_samples/cries/aipom.wav
+++ b/sound/direct_sound_samples/cries/aipom.wav
--- a/sound/direct_sound_samples/cries/alakazam.wav
+++ b/sound/direct_sound_samples/cries/alakazam.wav
--- a/sound/direct_sound_samples/cries/altaria.wav
+++ b/sound/direct_sound_samples/cries/altaria.wav
--- a/sound/direct_sound_samples/cries/ampharos.wav
+++ b/sound/direct_sound_samples/cries/ampharos.wav
--- a/sound/direct_sound_samples/cries/anorith.wav
+++ b/sound/direct_sound_samples/cries/anorith.wav
--- a/sound/direct_sound_samples/cries/arbok.wav
+++ b/sound/direct_sound_samples/cries/arbok.wav
--- a/sound/direct_sound_samples/cries/arcanine.wav
+++ b/sound/direct_sound_samples/cries/arcanine.wav
--- a/sound/direct_sound_samples/cries/ariados.wav
+++ b/sound/direct_sound_samples/cries/ariados.wav
--- a/sound/direct_sound_samples/cries/armaldo.wav
+++ b/sound/direct_sound_samples/cries/armaldo.wav
--- a/sound/direct_sound_samples/cries/aron.wav
+++ b/sound/direct_sound_samples/cries/aron.wav
--- a/sound/direct_sound_samples/cries/articuno.wav
+++ b/sound/direct_sound_samples/cries/articuno.wav
--- a/sound/direct_sound_samples/cries/azumarill.wav
+++ b/sound/direct_sound_samples/cries/azumarill.wav
--- a/sound/direct_sound_samples/cries/azurill.wav
+++ b/sound/direct_sound_samples/cries/azurill.wav
--- a/sound/direct_sound_samples/cries/bagon.wav
+++ b/sound/direct_sound_samples/cries/bagon.wav
--- a/sound/direct_sound_samples/cries/baltoy.wav
+++ b/sound/direct_sound_samples/cries/baltoy.wav
--- a/sound/direct_sound_samples/cries/banette.wav
+++ b/sound/direct_sound_samples/cries/banette.wav
--- a/sound/direct_sound_samples/cries/barboach.wav
+++ b/sound/direct_sound_samples/cries/barboach.wav
--- a/sound/direct_sound_samples/cries/bayleef.wav
+++ b/sound/direct_sound_samples/cries/bayleef.wav
--- a/sound/direct_sound_samples/cries/beautifly.wav
+++ b/sound/direct_sound_samples/cries/beautifly.wav
--- a/sound/direct_sound_samples/cries/beedrill.wav
+++ b/sound/direct_sound_samples/cries/beedrill.wav
--- a/sound/direct_sound_samples/cries/beldum.wav
+++ b/sound/direct_sound_samples/cries/beldum.wav
--- a/sound/direct_sound_samples/cries/bellossom.wav
+++ b/sound/direct_sound_samples/cries/bellossom.wav
--- a/sound/direct_sound_samples/cries/bellsprout.wav
+++ b/sound/direct_sound_samples/cries/bellsprout.wav
--- a/sound/direct_sound_samples/cries/blastoise.wav
+++ b/sound/direct_sound_samples/cries/blastoise.wav
--- a/sound/direct_sound_samples/cries/blaziken.wav
+++ b/sound/direct_sound_samples/cries/blaziken.wav
--- a/sound/direct_sound_samples/cries/blissey.wav
+++ b/sound/direct_sound_samples/cries/blissey.wav
--- a/sound/direct_sound_samples/cries/breloom.wav
+++ b/sound/direct_sound_samples/cries/breloom.wav
--- a/sound/direct_sound_samples/cries/bulbasaur.wav
+++ b/sound/direct_sound_samples/cries/bulbasaur.wav
--- a/sound/direct_sound_samples/cries/butterfree.wav
+++ b/sound/direct_sound_samples/cries/butterfree.wav
--- a/sound/direct_sound_samples/cries/cacnea.wav
+++ b/sound/direct_sound_samples/cries/cacnea.wav
--- a/sound/direct_sound_samples/cries/cacturne.wav
+++ b/sound/direct_sound_samples/cries/cacturne.wav
--- a/sound/direct_sound_samples/cries/camerupt.wav
+++ b/sound/direct_sound_samples/cries/camerupt.wav
--- a/sound/direct_sound_samples/cries/carvanha.wav
+++ b/sound/direct_sound_samples/cries/carvanha.wav
--- a/sound/direct_sound_samples/cries/cascoon.wav
+++ b/sound/direct_sound_samples/cries/cascoon.wav
--- a/sound/direct_sound_samples/cries/castform.wav
+++ b/sound/direct_sound_samples/cries/castform.wav
--- a/sound/direct_sound_samples/cries/caterpie.wav
+++ b/sound/direct_sound_samples/cries/caterpie.wav
--- a/sound/direct_sound_samples/cries/celebi.wav
+++ b/sound/direct_sound_samples/cries/celebi.wav
--- a/sound/direct_sound_samples/cries/chansey.wav
+++ b/sound/direct_sound_samples/cries/chansey.wav
--- a/sound/direct_sound_samples/cries/charizard.wav
+++ b/sound/direct_sound_samples/cries/charizard.wav
--- a/sound/direct_sound_samples/cries/charmander.wav
+++ b/sound/direct_sound_samples/cries/charmander.wav
--- a/sound/direct_sound_samples/cries/charmeleon.wav
+++ b/sound/direct_sound_samples/cries/charmeleon.wav
--- a/sound/direct_sound_samples/cries/chikorita.wav
+++ b/sound/direct_sound_samples/cries/chikorita.wav
--- a/sound/direct_sound_samples/cries/chimecho.wav
+++ b/sound/direct_sound_samples/cries/chimecho.wav
--- a/sound/direct_sound_samples/cries/chinchou.wav
+++ b/sound/direct_sound_samples/cries/chinchou.wav
--- a/sound/direct_sound_samples/cries/clamperl.wav
+++ b/sound/direct_sound_samples/cries/clamperl.wav
--- a/sound/direct_sound_samples/cries/claydol.wav
+++ b/sound/direct_sound_samples/cries/claydol.wav
--- a/sound/direct_sound_samples/cries/clefable.wav
+++ b/sound/direct_sound_samples/cries/clefable.wav
--- a/sound/direct_sound_samples/cries/clefairy.wav
+++ b/sound/direct_sound_samples/cries/clefairy.wav
--- a/sound/direct_sound_samples/cries/cleffa.wav
+++ b/sound/direct_sound_samples/cries/cleffa.wav
--- a/sound/direct_sound_samples/cries/cloyster.wav
+++ b/sound/direct_sound_samples/cries/cloyster.wav
--- a/sound/direct_sound_samples/cries/combusken.wav
+++ b/sound/direct_sound_samples/cries/combusken.wav
--- a/sound/direct_sound_samples/cries/corphish.wav
+++ b/sound/direct_sound_samples/cries/corphish.wav
--- a/sound/direct_sound_samples/cries/corsola.wav
+++ b/sound/direct_sound_samples/cries/corsola.wav
--- a/sound/direct_sound_samples/cries/cradily.wav
+++ b/sound/direct_sound_samples/cries/cradily.wav
--- a/sound/direct_sound_samples/cries/crawdaunt.wav
+++ b/sound/direct_sound_samples/cries/crawdaunt.wav
--- a/sound/direct_sound_samples/cries/crobat.wav
+++ b/sound/direct_sound_samples/cries/crobat.wav
--- a/sound/direct_sound_samples/cries/croconaw.wav
+++ b/sound/direct_sound_samples/cries/croconaw.wav
--- a/sound/direct_sound_samples/cries/cubone.wav
+++ b/sound/direct_sound_samples/cries/cubone.wav
--- a/sound/direct_sound_samples/cries/cyndaquil.wav
+++ b/sound/direct_sound_samples/cries/cyndaquil.wav
--- a/sound/direct_sound_samples/cries/delcatty.wav
+++ b/sound/direct_sound_samples/cries/delcatty.wav
--- a/sound/direct_sound_samples/cries/delibird.wav
+++ b/sound/direct_sound_samples/cries/delibird.wav
--- a/sound/direct_sound_samples/cries/deoxys.wav
+++ b/sound/direct_sound_samples/cries/deoxys.wav
--- a/sound/direct_sound_samples/cries/dewgong.wav
+++ b/sound/direct_sound_samples/cries/dewgong.wav
--- a/sound/direct_sound_samples/cries/diglett.wav
+++ b/sound/direct_sound_samples/cries/diglett.wav
--- a/sound/direct_sound_samples/cries/ditto.wav
+++ b/sound/direct_sound_samples/cries/ditto.wav
--- a/sound/direct_sound_samples/cries/dodrio.wav
+++ b/sound/direct_sound_samples/cries/dodrio.wav
--- a/Show More
+++ b/Show More