From 4eee9982da1d7d0431d8d59e9a48d9224d954f17 Mon Sep 17 00:00:00 2001 From: SoupPotato Date: Tue, 28 May 2024 06:19:37 +0100 Subject: [PATCH] Bugfix: Curse TM cannot be obtained sometimes --- constants/event_flags.asm | 2 +- maps/CeladonMansionRoofHouse.asm | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 9beb045c3..03c576f5d 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -224,7 +224,7 @@ const EVENT_CINNABAR_ROCKS_CLEARED const EVENT_CLEARED_NUGGET_BRIDGE const EVENT_TALKED_TO_WARDENS_GRANDDAUGHTER - const EVENT_GOT_TM03_CURSE + const_skip ; unused in Sour Crystal. Caused issues, new method of checking is used. const EVENT_GOT_CLEANSE_TAG const EVENT_GOT_TM19_GIGA_DRAIN const EVENT_GOT_TM06_TOXIC diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index 25c8372fc..64c25caf3 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -9,7 +9,7 @@ CeladonMansionRoofHouse_MapScripts: CeladonMansionRoofHousePharmacistScript: faceplayer opentext - checkevent EVENT_GOT_TM03_CURSE + checkitem TM_CURSE iftrue .GotCurse writetext CeladonMansionRoofHousePharmacistIntroText promptbutton @@ -25,7 +25,6 @@ CeladonMansionRoofHousePharmacistScript: promptbutton verbosegiveitem TM_CURSE iffalse .NoRoom - setevent EVENT_GOT_TM03_CURSE .GotCurse: writetext CeladonMansionRoofHousePharmacistCurseText waitbutton