dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Port some macro/script fixes from pokefirered

Browse Source
This commit is contained in:
GriffinR
2020-01-11 12:02:58 -05:00
parent 8b1595ebc3
commit f2e7b1507e
107 changed files with 528 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,7 @@ Route109_SeashoreHouse_EventScript_AlreadyGaveIntroduction:: @ 8269428
Route109_SeashoreHouse_EventScript_DefeatedTrainers:: @ 8269432
msgbox Route109_SeashoreHouse_Text_TakeTheseSodaPopBottles, MSGBOX_DEFAULT
giveitem_std ITEM_SODA_POP, 6
giveitem ITEM_SODA_POP, 6
compare VAR_RESULT, 0
goto_if_eq Route109_SeashoreHouse_EventScript_BagFull
setflag FLAG_RECEIVED_6_SODA_POP
@@ -56,7 +56,7 @@ Route109_SeashoreHouse_EventScript_BuySodaPop:: @ 8269484
msgbox Route109_SeashoreHouse_Text_HereYouGo, MSGBOX_DEFAULT
takemoney 300, 0
updatemoneybox 0, 0
giveitem_std ITEM_SODA_POP
giveitem ITEM_SODA_POP
hidemoneybox
release
end
@@ -89,12 +89,9 @@ Route109_SeashoreHouse_EventScript_Simon:: @ 8269518
end
Route109_SeashoreHouse_EventScript_CheckTrainersCompletion:: @ 8269533
checktrainerflag TRAINER_DWAYNE
goto_if_lt Route109_SeashoreHouse_EventScript_TrainersNotCompleted
checktrainerflag TRAINER_JOHANNA
goto_if_lt Route109_SeashoreHouse_EventScript_TrainersNotCompleted
checktrainerflag TRAINER_SIMON
goto_if_lt Route109_SeashoreHouse_EventScript_TrainersNotCompleted
goto_if_undefeated TRAINER_DWAYNE, Route109_SeashoreHouse_EventScript_TrainersNotCompleted
goto_if_undefeated TRAINER_JOHANNA, Route109_SeashoreHouse_EventScript_TrainersNotCompleted
goto_if_undefeated TRAINER_SIMON, Route109_SeashoreHouse_EventScript_TrainersNotCompleted
setflag FLAG_DEFEATED_SEASHORE_HOUSE
release
end