tbld
/
tumbledemerald-legacy
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 5 Wiki Activity

More broken reimplementation fixes...

This commit is contained in:
Jess 2022-10-11 02:10:54 +00:00
parent 34e697e91d
commit 608f0982cb
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
data/maps/DewfordTown/scripts.inc
View File

@ -118,10 +118,15 @@ DewfordTown_EventScript_FishingExcellent::
DewfordTown_EventScript_FishingNotSoGood:: DewfordTown_EventScript_FishingNotSoGood::
msgbox DewfordTown_Text_FishingAdvice, MSGBOX_DEFAULT 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 release
end end
DewfordTown_EventScript_Intermediate_GiveOldSeaMap::
goto_if_unset FLAG_RECEIVED_OLD_SEA_MAP, DewfordTown_EventScript_GiveOldSeaMap
release
end
DewfordTown_EventScript_GiveOldSeaMap:: DewfordTown_EventScript_GiveOldSeaMap::
msgbox DewfordTown_Text_MaybeExploringWouldBeBetter, MSGBOX_DEFAULT msgbox DewfordTown_Text_MaybeExploringWouldBeBetter, MSGBOX_DEFAULT
giveitem ITEM_OLD_SEA_MAP giveitem ITEM_OLD_SEA_MAP
@ -733,9 +738,9 @@ DewfordTown_Text_ThrowInFishingAdvice:
DewfordTown_Text_MaybeExploringWouldBeBetter: DewfordTown_Text_MaybeExploringWouldBeBetter:
.string "Hmmm... Well, if you aren't having much\n" .string "Hmmm... Well, if you aren't having much\n"
.string "luck with fishing... Maybe exploring\l" .string "luck with fishing...\l
.string "would be a better fit for a Trainer like\l" .string "Maybe exploring would be a better\n
.string "you?$" .string "fit for a Trainer like you?$"
DewfordTown_Text_ThatsTooBadThen: DewfordTown_Text_ThatsTooBadThen:
.string "Oh, is that so?\n" .string "Oh, is that so?\n"

7
data/maps/LittlerootTown/scripts.inc
View File

@ -259,7 +259,7 @@ LittlerootTown_EventScript_Twin::
faceplayer faceplayer
goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_GoodLuck goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_GoodLuck
goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_YouSavedBirch 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 goto_if_ne VAR_LITTLEROOT_TOWN_STATE, 0, LittlerootTown_EventScript_GoSaveBirch
msgbox LittlerootTown_Text_IfYouGoInGrassPokemonWillJumpOut, MSGBOX_DEFAULT msgbox LittlerootTown_Text_IfYouGoInGrassPokemonWillJumpOut, MSGBOX_DEFAULT
release release
@ -286,12 +286,17 @@ LittlerootTown_EventScript_GoodLuck::
release release
end end
LittlerootTown_EventScript_Intermediate_DustyTickets::
goto_if_unset FLAG_AURORA_MYSTIC_RECEIVED, LittlerootTown_EventScript_DustyTickets
end
LittlerootTown_EventScript_DustyTickets:: LittlerootTown_EventScript_DustyTickets::
msgbox LittlerootTown_Text_FoundTickets, MSGBOX_DEFAULT msgbox LittlerootTown_Text_FoundTickets, MSGBOX_DEFAULT
giveitem ITEM_MYSTIC_TICKET giveitem ITEM_MYSTIC_TICKET
giveitem ITEM_AURORA_TICKET giveitem ITEM_AURORA_TICKET
setflag FLAG_RECEIVED_AURORA_TICKET setflag FLAG_RECEIVED_AURORA_TICKET
setflag FLAG_RECEIVED_MYSTIC_TICKET setflag FLAG_RECEIVED_MYSTIC_TICKET
setflag FLAG_AURORA_MYSTIC_RECEIVED @ because I'm bad at hacking.
release release
end end

2
include/constants/flags.h
View File

@ -97,7 +97,7 @@
#define FLAG_LEGENDARIES_IN_SOOTOPOLIS 0x53 #define FLAG_LEGENDARIES_IN_SOOTOPOLIS 0x53
#define FLAG_REMOVE_WARP_FADE 0x54 // Custom flag used in tumbledemerald. #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_HIDE_CONTEST_POKE_BALL 0x56 // Always set after new game, object it hides is added directly
#define FLAG_MET_RIVAL_MOM 0x57 #define FLAG_MET_RIVAL_MOM 0x57