From cae58ca93ec56780f85344354da1f3cd9cb1ca69 Mon Sep 17 00:00:00 2001 From: fakuzatsu <118256341+fakuzatsu@users.noreply.github.com> Date: Wed, 17 Jan 2024 23:03:55 +0000 Subject: [PATCH] fixed oversight causing chosen fossil to be lost if bag is full (#3978) * fixed oversight causing chosen fossil to be lost * fixed an error with my condition * - conditional check and + underpass fossil check --- data/maps/DesertUnderpass/scripts.inc | 2 ++ data/maps/MirageTower_4F/scripts.inc | 2 ++ 2 files changed, 4 insertions(+) diff --git a/data/maps/DesertUnderpass/scripts.inc b/data/maps/DesertUnderpass/scripts.inc index 518d988832..1a20e0add2 100644 --- a/data/maps/DesertUnderpass/scripts.inc +++ b/data/maps/DesertUnderpass/scripts.inc @@ -18,12 +18,14 @@ DesertUnderpass_EventScript_Fossil:: DesertUnderpass_EventScript_GiveClawFossil:: giveitem ITEM_CLAW_FOSSIL + goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull removeobject LOCALID_FOSSIL release end DesertUnderpass_EventScript_GiveRootFossil:: giveitem ITEM_ROOT_FOSSIL + goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull removeobject LOCALID_FOSSIL release end diff --git a/data/maps/MirageTower_4F/scripts.inc b/data/maps/MirageTower_4F/scripts.inc index 61bde877c5..6fce7fa10b 100644 --- a/data/maps/MirageTower_4F/scripts.inc +++ b/data/maps/MirageTower_4F/scripts.inc @@ -10,6 +10,7 @@ MirageTower_4F_EventScript_RootFossil:: msgbox MirageTower_4F_Text_TakeRootFossil, MSGBOX_YESNO goto_if_eq VAR_RESULT, NO, MirageTower_4F_EventScript_LeaveRootFossil giveitem ITEM_ROOT_FOSSIL + goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull closemessage setflag FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL setflag FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL @@ -30,6 +31,7 @@ MirageTower_4F_EventScript_ClawFossil:: msgbox MirageTower_4F_Text_TakeClawFossil, MSGBOX_YESNO goto_if_eq VAR_RESULT, NO, MirageTower_4F_EventScript_LeaveClawFossil giveitem ITEM_CLAW_FOSSIL + goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull closemessage setflag FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL setflag FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL