1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2024-11-20 00:46:34 +00:00

Fix Duck Hunt's Reticle being destroyed (#629)

* Fix Duck Hunt's Reticle being destroyed

* fmt
This commit is contained in:
GradualSyrup 2023-09-10 11:29:10 -05:00 committed by GitHub
parent 40f3133e54
commit d8ecebfe12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions

View file

@ -521,7 +521,7 @@ These are the features that can be found [in the latest beta release](https://gi
* **Dodge Staling**: Control whether the CPU is affected by the game's default dodge (roll, airdodge, etc.) staling mechanism. - @GradualSyrup * **Dodge Staling**: Control whether the CPU is affected by the game's default dodge (roll, airdodge, etc.) staling mechanism. - @GradualSyrup
## Bugfixes ## Bugfixes
* Keep Luma, Mii Fighter hats, Mythra's sword, and Pikmin when loading save states - @GradualSyrup * Keep Duck Hunt's Reticle, Luma, Mii Fighter hats, Mythra's sword, and Pikmin when loading save states - @GradualSyrup
* Fix Pokemon Trainer load on save state - @GradualSyrup * Fix Pokemon Trainer load on save state - @GradualSyrup
* Allow Pokemon to be saved properly * Allow Pokemon to be saved properly
* Speed up load to match other fighters * Speed up load to match other fighters

View file

@ -37,7 +37,7 @@ use crate::training::ui::notifications;
use crate::{is_ptrainer, ITEM_MANAGER_ADDR}; use crate::{is_ptrainer, ITEM_MANAGER_ADDR};
// Don't remove Mii hats, Pikmin, Luma, or crafting table // Don't remove Mii hats, Pikmin, Luma, or crafting table
const ARTICLE_ALLOWLIST: [(LuaConst, LuaConst); 8] = [ const ARTICLE_ALLOWLIST: [(LuaConst, LuaConst); 9] = [
( (
FIGHTER_KIND_MIIFIGHTER, FIGHTER_KIND_MIIFIGHTER,
FIGHTER_MIIFIGHTER_GENERATE_ARTICLE_HAT, FIGHTER_MIIFIGHTER_GENERATE_ARTICLE_HAT,
@ -55,6 +55,10 @@ const ARTICLE_ALLOWLIST: [(LuaConst, LuaConst); 8] = [
(FIGHTER_KIND_ELIGHT, FIGHTER_ELIGHT_GENERATE_ARTICLE_ESWORD), (FIGHTER_KIND_ELIGHT, FIGHTER_ELIGHT_GENERATE_ARTICLE_ESWORD),
(FIGHTER_KIND_EFLAME, FIGHTER_EFLAME_GENERATE_ARTICLE_ESWORD), (FIGHTER_KIND_EFLAME, FIGHTER_EFLAME_GENERATE_ARTICLE_ESWORD),
(FIGHTER_KIND_PIKMIN, FIGHTER_PIKMIN_GENERATE_ARTICLE_PIKMIN), (FIGHTER_KIND_PIKMIN, FIGHTER_PIKMIN_GENERATE_ARTICLE_PIKMIN),
(
FIGHTER_KIND_DUCKHUNT,
FIGHTER_DUCKHUNT_GENERATE_ARTICLE_RETICLE,
),
]; ];
extern "C" { extern "C" {