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

8
data/maps/SootopolisCity/scripts.inc
View File

@@ -755,7 +755,7 @@ SootopolisCity_EventScript_KiriGiveBerry:: @ 81E5F1B
random NUM_KIRI_BERRIES
addvar VAR_RESULT, NUM_KIRI_BERRIES_SKIPPED
addvar VAR_RESULT, FIRST_BERRY_INDEX
giveitem_std VAR_RESULT
giveitem VAR_RESULT
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_DAILY_SOOTOPOLIS_RECEIVED_BERRY
@@ -768,7 +768,7 @@ SootopolisCity_EventScript_KiriGiveBerry:: @ 81E5F1B
end
SootopolisCity_EventScript_GiveFigyBerry:: @ 81E5F79
giveitem_std ITEM_FIGY_BERRY
giveitem ITEM_FIGY_BERRY
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
msgbox SootopolisCity_Text_WhatKindOfWishInYourName, MSGBOX_DEFAULT
@@ -776,7 +776,7 @@ SootopolisCity_EventScript_GiveFigyBerry:: @ 81E5F79
end
SootopolisCity_EventScript_GiveIapapaBerry:: @ 81E5F9A
giveitem_std ITEM_IAPAPA_BERRY
giveitem ITEM_IAPAPA_BERRY
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
msgbox SootopolisCity_Text_WhatKindOfWishInYourName, MSGBOX_DEFAULT
@@ -1356,7 +1356,7 @@ SootopolisCity_EventScript_Wallace:: @ 81E6446
SootopolisCity_EventScript_GiveWaterfall:: @ 81E646F
msgbox SootopolisCity_Text_ThankYouForHelpAcceptThis, MSGBOX_DEFAULT
giveitem_std ITEM_HM07
giveitem ITEM_HM07
setflag FLAG_RECEIVED_HM07
msgbox SootopolisCity_Text_ExplainWaterfallGoToGym, MSGBOX_DEFAULT
closemessage