Version 1.8.0 (#4259)

rh-hideout · Mar 17, 2024 · 107bcdf · 107bcdf
2 parents dbd7e2a + 331efed
commit 107bcdf
Show file tree

Hide file tree

Showing 862 changed files with 1,375,343 additions and 77,592 deletions.
diff --git a/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml b/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
@@ -23,17 +23,15 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using as a base?
       options:
-        - 1.7.4 (Latest release)
-        - master (default when pulling, unreleased bugfixes)
+        - 1.8.0 (Latest release)
+        - master (default, unreleased bugfixes)
         - upcoming (Edge)
+        - 1.7.4
         - 1.7.3
         - 1.7.2
         - 1.7.1
         - 1.7.0
-        - 1.6.2
-        - 1.6.1
-        - 1.6.0
-        - pre-1.6.0
+        - pre-1.7.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,17 +23,15 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using as a base?
       options:
-        - 1.7.4 (Latest release)
-        - master (default when pulling, unreleased bugfixes)
+        - 1.8.0 (Latest release)
+        - master (default, unreleased bugfixes)
         - upcoming (Edge)
+        - 1.7.4
         - 1.7.3
         - 1.7.2
         - 1.7.1
         - 1.7.0
-        - 1.6.2
-        - 1.6.1
-        - 1.6.0
-        - pre-1.6.0
+        - pre-1.7.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,17 +23,15 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using as a base?
       options:
-        - 1.7.4 (Latest release)
-        - master (default when pulling, unreleased bugfixes)
+        - 1.8.0 (Latest release)
+        - master (default, unreleased bugfixes)
         - upcoming (Edge)
+        - 1.7.4
         - 1.7.3
         - 1.7.2
         - 1.7.1
         - 1.7.0
-        - 1.6.2
-        - 1.6.1
-        - 1.6.0
-        - pre-1.6.0
+        - pre-1.7.0
     validations:
       required: true
   - type: input

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Pokeemerald-Expansion Changelogs
 
+## Version 1.8.x
+### [Version 1.8.0](docs/changelogs/1.8.0.md) - Feature Release
+
 ## Version 1.7.x
 ### [Version 1.7.4](docs/changelogs/1.7.4.md) - Bugfix Release
 ### [Version 1.7.3](docs/changelogs/1.7.3.md) - Bugfix Release

diff --git a/INSTALL.md b/INSTALL.md
@@ -118,6 +118,17 @@ Some tips before proceeding:
 
 devkitARM is now installed.
 
+### Installing Python on WSL1
+
+To install Python on WSL1, simply run the following commands:
+
+    ```bash
+    sudo apt update && upgrade
+    sudo apt install python3
+    ```
+
+Python is now installed.
+
 ### Choosing where to store pokeemerald Expansion (WSL1)
 WSL has its own file system that's not natively accessible from Windows, but Windows files *are* accessible from WSL. So you're going to want to store pokeemerald Expansion within Windows.
 
@@ -200,6 +211,16 @@ Note that in msys2, Copy is Ctrl+Insert and Paste is Shift+Insert.
     cd
     ```
 
+### Installing Python on msys2
+
+To install Python on WSL1, simply run the following commands:
+
+    ```bash
+    pacman -S mingw-w64-x86_64-python3
+    ```
+
+Python is now installed.
+
 ### Choosing where to store pokeemerald Expansion (msys2)
 At this point, you can choose a folder to store pokeemerald Expansion into. If you're okay with storing pokeemerald Expansion in the user profile folder, then proceed to [Installation](#installation). Otherwise, you'll need to account for where pokeemerald Expansion is stored when changing directory to the pokeemerald-expansion folder.
 
@@ -334,6 +355,12 @@ If this works, then proceed to [Installation](#installation). Otherwise, ask for
     echo "if [ -f ~/.bashrc ]; then . ~/.bashrc; fi" >> ~/.bash_profile
     ```
 
+### Installing Python (macOS)
+1. Download the latest Python package from [here](https://www.python.org/downloads/).
+2. Open the package to install Python.
+
+Python is now installed.
+
 ### Choosing where to store pokeemerald Expansion (macOS)
 At this point, you can choose a folder to store pokeemerald Expansion into. If you're okay with storing pokeemerald Expansion in the user folder, then proceed to [Installation](#installation). Otherwise, you'll need to account for where pokeemerald Expansion is stored when changing directory to the pokeemerald-expansion folder.
 
@@ -434,6 +461,9 @@ _(Specific instructions for other distributions would be greatly appreciated!)_
 
     The last command will ask for the selection of packages to install. Just press Enter to install all of them, followed by entering Y to proceed with the installation.
 
+### Installing Python in Linux
+Installing Python depends on your distribution, please refere to the instructions [here](https://docs.python-guide.org/starting/install3/linux/).
+
 ### Choosing where to store pokeemerald Expansion (Linux)
 At this point, you can choose a folder to store pokeemerald Expansion into. If so, you'll have to account for the modified folder path when changing directory to the pokeemerald-expansion folder.
 
@@ -576,4 +606,4 @@ Note that this is not necessary for a non-modern (agbcc) build since those are b
 
 * [porymap](https://github.com/huderlem/porymap) for viewing and editing maps
 * [poryscript](https://github.com/huderlem/poryscript) for scripting ([VS Code extension](https://marketplace.visualstudio.com/items?itemName=karathan.poryscript))
-* [Tilemap Studio](https://github.com/Rangi42/tilemap-studio) for viewing and editing tilemaps
+* [Tilemap Studio](https://github.com/Rangi42/tilemap-studio) for viewing and editing tilemaps
diff --git a/Makefile b/Makefile
@@ -461,6 +461,10 @@ $(OBJ_DIR)/sym_common.ld: sym_common.txt $(C_OBJS) $(wildcard common_syms/*.txt)
 $(OBJ_DIR)/sym_ewram.ld: sym_ewram.txt
 	$(RAMSCRGEN) ewram_data $< ENGLISH > $@
 
+# NOTE: Depending on event_scripts.o is hacky, but we want to depend on everything event_scripts.s depends on without having to alter scaninc
+$(DATA_SRC_SUBDIR)/pokemon/teachable_learnsets.h: $(DATA_ASM_BUILDDIR)/event_scripts.o
+	python3 tools/learnset_helpers/teachable.py
+
 # NOTE: Based on C_DEP above, but without NODEP and KEEP_TEMPS handling.
 define TEST_DEP
 $1: $2 $$(shell $(SCANINC) -I include -I tools/agbcc/include -I gflib $2)

diff --git a/README.md b/README.md
@@ -22,27 +22,26 @@ Based off RHH's pokeemerald-expansion v1.7.3 https://github.com/rh-hideout/pokee
     - 2v2 Wild battles support.
     - 1v2/2v1 battles support.
     - Fairy Type (configurable).
-    - Physical/Special/Status Category Split (configurable).
+    - Physical/Special/Status Category (configurable).
     - New moves and abilities up to Scarlet and Violet.
         - Custom Contest data up to SwSh, newer moves are WIP. ([source](https://pokemonurpg.com/info/contests/rse-move-list/))
-    - Mega Evolution
-    - Primal Reversion
-    - Ultra Burst
-    - Z-Moves
-        - Gen 8+ damaging moves are given power extrapolated from Gen 7.
-        - Gen 8+ status moves have no additional effects, like Healing Wish.
-    - Dynamax
-        - Gigantamax forms
+    - Battle gimmick support:
+        - Mega Evolution
+        - Primal Reversion
+        - Ultra Burst
+        - Z-Moves
+            - Gen 8+ damaging moves are given power extrapolated from Gen 7.
+            - Gen 8+ status moves have no additional effects, like Healing Wish.
+        - Dynamax and Gigantamax
     - Initial battle parameters
         - Queueing stat boosts (aka, Totem Boosts)
         - Setting Terrains.
     - Mid-turn speed recalculation.
     - Quick Poké Ball selection in Wild Battles
-        - Press `R` to use last selected Poké Ball.
         - Hold `R` to change selection with the D-Pad.
+        - Press `R` to use last selected Poké Ball.
     - Run option shortcut
-    - Faster battle intro
-        - Message and animation/cry happens at the same time.
+    - Faster battle intro - Message and animation/cry happens at the same time.
     - Faster HP drain.
     - Battle Debug menu.
         - Accessed by pressing `Select` on the "Fight/Bag/Pokémon/Run" menu.
@@ -105,7 +104,8 @@ Based off RHH's pokeemerald-expansion v1.7.3 https://github.com/rh-hideout/pokee
     - HP Threshold (eg. Darmanitan)
     - Weather (eg. Castform)
     - End of turn (eg. Morpeko)
-    - Time of day (Shaymin)
+    - Time of day (eg. Shaymin)
+    - Fusions (eg. Kyurem)
 - ***Breeding Improvements***
     - Incense Baby Pokémon now happen automatically (configurable).
     - Level 1 eggs (configurable).
@@ -118,9 +118,6 @@ Based off RHH's pokeemerald-expansion v1.7.3 https://github.com/rh-hideout/pokee
     - Berserk Gene
     - Most battle items from Gen 4+
     - Existing item data but missing effects:
-        - Mints
-        - Dynamax Candy
-        - Mulches
         - Gimmighoul Coin
         - Booster Energy
         - Tera Shards
@@ -140,6 +137,7 @@ Based off RHH's pokeemerald-expansion v1.7.3 https://github.com/rh-hideout/pokee
             - *Support for new evolution methods*.
             - *Dark Mode*.
     - [Nature Colors](https://github.com/DizzyEggg/pokeemerald/tree/nature_color) in summary screen by @DizzyEggg
+    - [Dynamic Multichoice](https://github.com/SBird1337/pokeemerald/tree/feature/dynmulti) by @SBird1337
 - ***Other features***
     - Pressing B while holding a Pokémon drops them like in modern games (configurable).
     - Running indoors (configurable).
@@ -166,7 +164,7 @@ With this, you'll get the latest version of pokeemerald-expansion, plus a couple
 
 ## **How do I update my version of pokeemerald-expansion?**
 - If you haven't set up a remote, run the command `git remote add RHH https://github.com/rh-hideout/pokeemerald-expansion`.
-- Once you have your remote set up, run the command `git pull RHH expansion/1.7.4`.
+- Once you have your remote set up, run the command `git pull RHH expansion/1.8.0`.
 
 ### Please consider crediting the entire [list of contributors](https://github.com/rh-hideout/pokeemerald-expansion/wiki/Credits) in your project, as they have all worked hard to develop this project :)