Merge branch 'reimplement_farawayisland' into 'main'

Reimplement event tickets and Faraway Island  (closes #1)

Closes #1

See merge request tbld/game!8
This commit is contained in:
Jess 2022-10-05 14:28:25 +00:00
commit 04f97628c1
3 changed files with 32 additions and 0 deletions

1
agbcc Submodule

@ -0,0 +1 @@
Subproject commit d59cfb5ac1ce13d4bc9875ffef1666b118338d33

View File

@ -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.$"

View File

@ -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.”$"