1
0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2025-07-10 12:56:42 +00:00

Fix crash when loading save state while grabbing with Olimar ()

* grab check, maybe useless

* fix crash via article_allowlist

* fmt
This commit is contained in:
GradualSyrup
2023-08-21 21:27:01 -05:00
committed by GitHub
parent 1186398c50
commit 58f699b285

@ -35,7 +35,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, or Luma, or crafting table // Don't remove Mii hats, or Luma, or crafting table
const ARTICLE_ALLOWLIST: [(LuaConst, LuaConst); 7] = [ const ARTICLE_ALLOWLIST: [(LuaConst, LuaConst); 8] = [
( (
FIGHTER_KIND_MIIFIGHTER, FIGHTER_KIND_MIIFIGHTER,
FIGHTER_MIIFIGHTER_GENERATE_ARTICLE_HAT, FIGHTER_MIIFIGHTER_GENERATE_ARTICLE_HAT,
@ -52,6 +52,7 @@ const ARTICLE_ALLOWLIST: [(LuaConst, LuaConst); 7] = [
(FIGHTER_KIND_PICKEL, FIGHTER_PICKEL_GENERATE_ARTICLE_TABLE), (FIGHTER_KIND_PICKEL, FIGHTER_PICKEL_GENERATE_ARTICLE_TABLE),
(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),
]; ];
extern "C" { extern "C" {