Merge branch '_RHH/upcoming' into _RHH/pr/master/1.9.0

rh-hideout · Aug 1, 2024 · 7ec24b8 · 7ec24b8
1 parent f953226
commit 7ec24b8
Show file tree

Hide file tree

Showing 10 changed files with 584 additions and 27 deletions.
diff --git a/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml b/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
@@ -23,21 +23,17 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using as a base?
       options:
-        - 1.8.6 (Latest release)
+        - 1.9.0 (Latest release)
         - master (default, unreleased bugfixes)
         - upcoming (Edge)
+        - 1.8.6
         - 1.8.5
         - 1.8.4
         - 1.8.3
         - 1.8.2
         - 1.8.1
         - 1.8.0
-        - 1.7.4
-        - 1.7.3
-        - 1.7.2
-        - 1.7.1
-        - 1.7.0
-        - pre-1.7.0
+        - pre-1.8.0
     validations:
       required: true
   - type: input

diff --git a/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml b/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
@@ -23,21 +23,17 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using as a base?
       options:
-        - 1.8.6 (Latest release)
+        - 1.9.0 (Latest release)
         - master (default, unreleased bugfixes)
         - upcoming (Edge)
+        - 1.8.6
         - 1.8.5
         - 1.8.4
         - 1.8.3
         - 1.8.2
         - 1.8.1
         - 1.8.0
-        - 1.7.4
-        - 1.7.3
-        - 1.7.2
-        - 1.7.1
-        - 1.7.0
-        - pre-1.7.0
+        - pre-1.8.0
     validations:
       required: true
   - type: input

diff --git a/.github/ISSUE_TEMPLATE/04_other_errors.yaml b/.github/ISSUE_TEMPLATE/04_other_errors.yaml
@@ -23,21 +23,17 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using as a base?
       options:
-        - 1.8.6 (Latest release)
+        - 1.9.0 (Latest release)
         - master (default, unreleased bugfixes)
         - upcoming (Edge)
+        - 1.8.6
         - 1.8.5
         - 1.8.4
         - 1.8.3
         - 1.8.2
         - 1.8.1
         - 1.8.0
-        - 1.7.4
-        - 1.7.3
-        - 1.7.2
-        - 1.7.1
-        - 1.7.0
-        - pre-1.7.0
+        - pre-1.8.0
     validations:
       required: true
   - type: input

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Pokeemerald-Expansion Changelogs
 
+## 1.9.x
+- **[Version 1.9.0](docs/changelogs/1.9.x/1.9.0.md) - ✨ Feature Release**
+
 ## 1.8.x
 - **[Version 1.8.6](docs/changelogs/1.8.x/1.8.6.md) - 🧹 Bugfix Release**
 - **[Version 1.8.5](docs/changelogs/1.8.x/1.8.5.md) - 🧹 Bugfix Release**

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ pokeemerald-expansion is a decomp hack base project based off pret's [pokeemeral
 If you use pokeemerald-expansion in your hack, please add RHH (Rom Hacking Hideout) to your credits list. Optionally, you can list the version used, so it can help players know what features to expect.
 You can phrase it as the following:
 ```
-Based off RHH's pokeemerald-expansion 1.8.6 https://github.com/rh-hideout/pokeemerald-expansion/
+Based off RHH's pokeemerald-expansion 1.9.0 https://github.com/rh-hideout/pokeemerald-expansion/
 ```
 
 ## What features are included?

diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md
@@ -5,6 +5,8 @@
     - [Setting up WSL1 (Legacy Portion)](./legacy_WSL1_INSTALL.md)
 - [AI Flags](./ai_flags.md)
 - [Changelog](./CHANGELOG.md)
+    - [1.9.x]()
+        - [Version 1.9.0](changelogs/1.9.x/1.9.0.md)
     - [1.8.x]()
         - [Version 1.8.6](changelogs/1.8.x/1.8.6.md)
         - [Version 1.8.5](changelogs/1.8.x/1.8.5.md)

diff --git a/docs/changelogs/1.8.x/1.8.5.md b/docs/changelogs/1.8.x/1.8.5.md
@@ -58,7 +58,7 @@
     * Pawmi (Front by KingOfThe-X-Roads, back by Vent, QC by leParagon)
     * Pawmo (By vent, qc by leParagon)
     * Okidogi (Front by KingOfThe-X-Roads + by leParagon, back by Lykeron + QC by Alexandrev2. 0)
-    * Backported Hedara's Terapagos from `upcoming`.
+    * Backported @hedara90's Terapagos from https://github.com/rh-hideout/pokeemerald-expansion/pull/4691
 * Updated wild held items to Gen 9 by @kittenchilly in https://github.com/rh-hideout/pokeemerald-expansion/pull/4769
     * Teddiursa (Common: None_> Honey)
     * Bisharp (Rare: None -> Leader's Crest)

diff --git a/docs/changelogs/1.9.x/1.9.0.md b/docs/changelogs/1.9.x/1.9.0.md
diff --git a/docs/changelogs/template.md b/docs/changelogs/template.md
@@ -6,7 +6,8 @@
 - Once you have your remote set up, run the command `git pull RHH expansion/1.Y.Z`.
 ```
 
-## 🌋 *IMPORTANT CHANGES AND REFACTORS* 🌋
+## 🌋 *REFACTORS* 🌋
+📜 = Uses a migration script.
 * N/A
 
 ## 💥 *Softlock/Crash fixes* 💥
@@ -49,6 +50,13 @@
 * N/A
 #### Fixed
 * N/A
+### ***merrp/aarant's Followers***
+#### Added
+* N/A
+#### Changed
+* N/A
+#### Fixed
+* N/A
 
 ## 🐉 Pokémon 🐉
 ### Added

diff --git a/include/constants/expansion.h b/include/constants/expansion.h
@@ -1,10 +1,10 @@
 #ifndef GUARD_CONSTANTS_EXPANSION_H
 #define GUARD_CONSTANTS_EXPANSION_H
 
-// 1.8.6
+// 1.9.0
 #define EXPANSION_VERSION_MAJOR 1
-#define EXPANSION_VERSION_MINOR 8
-#define EXPANSION_VERSION_PATCH 6
+#define EXPANSION_VERSION_MINOR 9
+#define EXPANSION_VERSION_PATCH 0
 
 // FALSE if this this version of Expansion is not a tagged commit, i.e.
 // it contains unreleased changes.