From acb4a9cf6266ffad7b52ae33f18cfb09c490c555 Mon Sep 17 00:00:00 2001 From: Hedara Date: Fri, 30 May 2025 20:15:56 +0200 Subject: [PATCH] Expansion 1.11.4 --- .../ISSUE_TEMPLATE/01_battle_engine_bugs.yaml | 3 +- .../ISSUE_TEMPLATE/02_battle_ai_issues.yaml | 3 +- .github/ISSUE_TEMPLATE/04_other_errors.yaml | 4 +- README.md | 2 +- docs/SUMMARY.md | 1 + docs/changelogs/1.11.x/1.11.4.md | 45 +++++++++++++++++++ include/constants/expansion.h | 4 +- 7 files changed, 55 insertions(+), 7 deletions(-) create mode 100644 docs/changelogs/1.11.x/1.11.4.md diff --git a/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml b/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml index 93079a6439..3dc0735813 100644 --- 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.11.3 (Latest release) + - 1.11.4 (Latest release) - master (default, unreleased bugfixes) - upcoming (Edge) + - 1.11.3 - 1.11.2 - 1.11.1 - 1.11.0 diff --git a/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml b/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml index 5525931aaf..1053a2e805 100644 --- 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.11.3 (Latest release) + - 1.11.4 (Latest release) - master (default, unreleased bugfixes) - upcoming (Edge) + - 1.11.3 - 1.11.2 - 1.11.1 - 1.11.0 diff --git a/.github/ISSUE_TEMPLATE/04_other_errors.yaml b/.github/ISSUE_TEMPLATE/04_other_errors.yaml index 8adf1a6882..20c4984eb3 100644 --- a/.github/ISSUE_TEMPLATE/04_other_errors.yaml +++ b/.github/ISSUE_TEMPLATE/04_other_errors.yaml @@ -43,10 +43,10 @@ body: label: Version description: What version of pokeemerald-expansion are you using? options: - - 1.11.3 (Latest release) + - 1.11.4 (Latest release) - master (default, unreleased bugfixes) - upcoming (Edge) - - 1.11.2 + - 1.11.3 - 1.11.1 - 1.11.0 - 1.10.3 diff --git a/README.md b/README.md index 8737b96e44..da5af472fe 100644 --- 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.11.3 https://github.com/rh-hideout/pokeemerald-expansion/ +Based off RHH's pokeemerald-expansion 1.11.4 https://github.com/rh-hideout/pokeemerald-expansion/ ``` Please consider [crediting all contributors](CREDITS.md) involved in the project! diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md index 1a551b955e..5c23e99ad2 100644 --- a/docs/SUMMARY.md +++ b/docs/SUMMARY.md @@ -17,6 +17,7 @@ - [How to add new Trainer Slides](tutorials/how_to_new_trainer_slide.md) - [Changelog](./CHANGELOG.md) - [1.11.x]() + - [Version 1.11.4](changelogs/1.11.x/1.11.4.md) - [Version 1.11.3](changelogs/1.11.x/1.11.3.md) - [Version 1.11.2](changelogs/1.11.x/1.11.2.md) - [Version 1.11.1](changelogs/1.11.x/1.11.1.md) diff --git a/docs/changelogs/1.11.x/1.11.4.md b/docs/changelogs/1.11.x/1.11.4.md new file mode 100644 index 0000000000..051323075d --- /dev/null +++ b/docs/changelogs/1.11.x/1.11.4.md @@ -0,0 +1,45 @@ +```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.11.4 +`. +``` + + +## 🐉 Pokémon 🐉 +### Fixed +* Fixed `CreateMon` param order in `CreateFacilityMon` by @PCG06 in [#6989](https://github.com/rh-hideout/pokeemerald-expansion/pull/6989) + - Fixed `CreateMon` param order in `CreateFacilityMon`. + +## ⚔️ Battle General ⚔️ +### Fixed +* Fix Eiscue not resetting back to Ice Face form after battle. by @DarkVexon in [#6997](https://github.com/rh-hideout/pokeemerald-expansion/pull/6997) +* Fixes spread move fire types not defrosting all targets by @AlexOn1ine in [#6998](https://github.com/rh-hideout/pokeemerald-expansion/pull/6998) +* Update Supersweet Syrup with eject pack fix by @AlexOn1ine in [#7015](https://github.com/rh-hideout/pokeemerald-expansion/pull/7015) +* fix battle controller macros by @cawtds in [#7021](https://github.com/rh-hideout/pokeemerald-expansion/pull/7021) + + +## 🧪 Test Runner 🧪 +### Fixed +* Fix out-of-bounds in Heal Bell Cures Entire Party test by @rayrobdod in [#7011](https://github.com/rh-hideout/pokeemerald-expansion/pull/7011) + + +## 📦 Branch Synchronisation 📦 +### pret +* 27th of May, 2025 in [#6995](https://github.com/rh-hideout/pokeemerald-expansion/pull/6995) + * Fix defines in MAP_NUM and MAP_GROUP by @Bassoonian in [pret#2023](https://github.com/pret/pokeemerald/pull/2023) + * Change metatile behaviors to enum by @pkmnsnfrn in [pret#2027](https://github.com/pret/pokeemerald/pull/2027) + * Move heal locations data to their associated map.json by @GriffinRichards in [pret#2034](https://github.com/pret/pokeemerald/pull/2034) + * Generate local IDs from map.json files by @GriffinRichards in [pret#2047](https://github.com/pret/pokeemerald/pull/2047) + * Generate MAPSEC constants from JSON by @GriffinRichards in [pret#2063](https://github.com/pret/pokeemerald/pull/2063) + * Generate heal location constants automatically by @GriffinRichards in [pret#2101](https://github.com/pret/pokeemerald/pull/2101) + * Update for Porymap 6 by @GriffinRichards in [pret#2141](https://github.com/pret/pokeemerald/pull/2141) +* 29th of May, 2025 in [#7012](https://github.com/rh-hideout/pokeemerald-expansion/pull/7012) + * Update for Porymap 6 by @GriffinRichards in [pret#2141](https://github.com/pret/pokeemerald/pull/2141) + + +**Full Changelog**: https://github.com/rh-hideout/pokeemerald-expansion/compare/expansion/1.11.3...expansion/1.11.4 + + + + diff --git a/include/constants/expansion.h b/include/constants/expansion.h index ce8b3fdefa..59618ad155 100644 --- a/include/constants/expansion.h +++ b/include/constants/expansion.h @@ -1,13 +1,13 @@ #ifndef GUARD_CONSTANTS_EXPANSION_H #define GUARD_CONSTANTS_EXPANSION_H -// Last version: 1.11.3 +// Last version: 1.11.4 #define EXPANSION_VERSION_MAJOR 1 #define EXPANSION_VERSION_MINOR 11 #define EXPANSION_VERSION_PATCH 4 // FALSE if this this version of Expansion is not a tagged commit, i.e. // it contains unreleased changes. -#define EXPANSION_TAGGED_RELEASE FALSE +#define EXPANSION_TAGGED_RELEASE TRUE #endif