From e2767c1d6d0a53cd7b812c3976511481e1562809 Mon Sep 17 00:00:00 2001 From: BRODY MORAN Date: Tue, 4 Oct 2022 17:38:20 +0000 Subject: [PATCH 1/2] hope things work --- data/maps/LittlerootTown/scripts.inc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index fa2ea51..14dbe4e 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -259,6 +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_IS_CHAMPION, LittlerootTown_EventScript_DustyTickets goto_if_ne VAR_LITTLEROOT_TOWN_STATE, 0, LittlerootTown_EventScript_GoSaveBirch msgbox LittlerootTown_Text_IfYouGoInGrassPokemonWillJumpOut, MSGBOX_DEFAULT release @@ -285,6 +286,15 @@ LittlerootTown_EventScript_GoodLuck:: release 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 + release + end + LittlerootTown_EventScript_NeedPokemonTriggerLeft:: lockall applymovement LOCALID_TWIN, LittlerootTown_Movement_TwinApproachPlayerLeft @@ -997,6 +1007,13 @@ LittlerootTown_Text_GoodLuckCatchingPokemon: .string "Are you going to catch Pokémon?\n" .string "Good luck!$" +LittlerootTown_Text_FoundTickets: + .string "Um, hi!\p" + .string "I found these in an old suitcase. My\n" + .string "daddy doesn't want them, so I decided\n" + .string "to give these to you!$" + + LittlerootTown_Text_TownSign: .string "Littleroot Town\n" .string "“A town that can't be shaded any hue.”$" From a179459765a62fc0711359837261762ee35a11a9 Mon Sep 17 00:00:00 2001 From: BRODY MORAN Date: Wed, 5 Oct 2022 14:16:44 +0000 Subject: [PATCH 2/2] Reimplement Faraway Island --- agbcc | 1 + data/maps/DewfordTown/scripts.inc | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 160000 agbcc diff --git a/agbcc b/agbcc new file mode 160000 index 0000000..d59cfb5 --- /dev/null +++ b/agbcc @@ -0,0 +1 @@ +Subproject commit d59cfb5ac1ce13d4bc9875ffef1666b118338d33 diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index ee4850d..2e6fa77 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -118,6 +118,14 @@ DewfordTown_EventScript_FishingExcellent:: DewfordTown_EventScript_FishingNotSoGood:: msgbox DewfordTown_Text_FishingAdvice, MSGBOX_DEFAULT + goto_if_set FLAG_IS_CHAMPION, DewfordTown_EventScript_GiveOldSeaMap + release + end + +DewfordTown_EventScript_GiveOldSeaMap:: + msgbox DewfordTown_Text_MaybeExploringWouldBeBetter, MSGBOX_DEFAULT + giveitem ITEM_OLD_SEA_MAP + setflag FLAG_RECEIVED_OLD_SEA_MAP release end @@ -723,6 +731,12 @@ DewfordTown_Text_ThrowInFishingAdvice: .string "you need to time the pulls on your Rod\l" .string "to haul them in.$" +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?$" + DewfordTown_Text_ThatsTooBadThen: .string "Oh, is that so?\n" .string "That's too bad, then.$"