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

Merge pull request #953 from GriffinRichards/sync-script

Browse Source 
Port some macro/script fixes from pokefirered
This commit is contained in:
huderlem
2020-01-13 19:33:47 -06:00
committed by GitHub
parent fa5816915d 96720db083
commit 6d6c57f383
117 changed files with 604 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/maps/SlateportCity/scripts.inc
View File

@@ -726,7 +726,7 @@ SlateportCity_EventScript_BerryPowderClerk:: @ 81DD36E
faceplayer
goto_if_set FLAG_RECEIVED_POWDER_JAR, SlateportCity_EventScript_ReceivedPowderJar
msgbox SlateportCity_Text_ExplainBerries, MSGBOX_DEFAULT
giveitem_std ITEM_POWDER_JAR
giveitem ITEM_POWDER_JAR
setflag FLAG_RECEIVED_POWDER_JAR
msgbox SlateportCity_Text_ExplainBerryPowder, MSGBOX_DEFAULT
release
@@ -860,7 +860,7 @@ SlateportCity_EventScript_TryBuyBerryPowderItem:: @ 81DD557
specialvar VAR_RESULT, HasEnoughBerryPowder
compare VAR_RESULT, FALSE
goto_if_eq SlateportCity_EventScript_NotEnoughBerryPowder
giveitem_std VAR_0x8008
giveitem VAR_0x8008
compare VAR_RESULT, FALSE
goto_if_eq SlateportCity_EventScript_NoRoomForBerryPowderItem
copyvar VAR_0x8004, VAR_0x8009