diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 32a201b..0f512aa 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -118,10 +118,15 @@ DewfordTown_EventScript_FishingExcellent:: DewfordTown_EventScript_FishingNotSoGood:: msgbox DewfordTown_Text_FishingAdvice, MSGBOX_DEFAULT - goto_if_set FLAG_SYS_GAME_CLEAR, DewfordTown_EventScript_GiveOldSeaMap + goto_if_set FLAG_SYS_GAME_CLEAR, DewfordTown_EventScript_Intermediate_GiveOldSeaMap release end +DewfordTown_EventScript_Intermediate_GiveOldSeaMap:: + goto_if_unset FLAG_RECEIVED_OLD_SEA_MAP, DewfordTown_EventScript_GiveOldSeaMap + release + end + DewfordTown_EventScript_GiveOldSeaMap:: msgbox DewfordTown_Text_MaybeExploringWouldBeBetter, MSGBOX_DEFAULT giveitem ITEM_OLD_SEA_MAP @@ -733,9 +738,9 @@ DewfordTown_Text_ThrowInFishingAdvice: DewfordTown_Text_MaybeExploringWouldBeBetter: .string "Hmmm... Well, if you aren't having much\n" - .string "luck with fishing... Maybe exploring\l" - .string "would be a better fit for a Trainer like\l" - .string "you?$" + .string "luck with fishing...\l + .string "Maybe exploring would be a better\n + .string "fit for a Trainer like you?$" DewfordTown_Text_ThatsTooBadThen: .string "Oh, is that so?\n" diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 47a3c54..50e6ff8 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -259,7 +259,7 @@ LittlerootTown_EventScript_Twin:: faceplayer goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_GoodLuck goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_YouSavedBirch - goto_if_set FLAG_SYS_GAME_CLEAR, LittlerootTown_EventScript_DustyTickets + goto_if_set FLAG_SYS_GAME_CLEAR, LittlerootTown_EventScript_Intermediate_DustyTickets goto_if_ne VAR_LITTLEROOT_TOWN_STATE, 0, LittlerootTown_EventScript_GoSaveBirch msgbox LittlerootTown_Text_IfYouGoInGrassPokemonWillJumpOut, MSGBOX_DEFAULT release @@ -286,12 +286,17 @@ LittlerootTown_EventScript_GoodLuck:: release end +LittlerootTown_EventScript_Intermediate_DustyTickets:: + goto_if_unset FLAG_AURORA_MYSTIC_RECEIVED, LittlerootTown_EventScript_DustyTickets + end + LittlerootTown_EventScript_DustyTickets:: msgbox LittlerootTown_Text_FoundTickets, MSGBOX_DEFAULT giveitem ITEM_MYSTIC_TICKET giveitem ITEM_AURORA_TICKET setflag FLAG_RECEIVED_AURORA_TICKET setflag FLAG_RECEIVED_MYSTIC_TICKET + setflag FLAG_AURORA_MYSTIC_RECEIVED @ because I'm bad at hacking. release end diff --git a/include/constants/flags.h b/include/constants/flags.h index 91e3669..63fcddb 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -97,7 +97,7 @@ #define FLAG_LEGENDARIES_IN_SOOTOPOLIS 0x53 #define FLAG_REMOVE_WARP_FADE 0x54 // Custom flag used in tumbledemerald. -#define FLAG_UNUSED_0x055 0x55 // Unused Flag +#define FLAG_AURORA_MYSTIC_RECEIVED 0x55 // Custom flag used in tumbledemerald. Basically a workaround. #define FLAG_HIDE_CONTEST_POKE_BALL 0x56 // Always set after new game, object it hides is added directly #define FLAG_MET_RIVAL_MOM 0x57