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

6
data/maps/SlateportCity_Harbor/scripts.inc
View File

@@ -237,7 +237,7 @@ SlateportCity_Harbor_EventScript_BoardFerry:: @ 820CBE9
compare VAR_FACING, DIR_EAST
call_if_eq SlateportCity_Harbor_EventScript_BoardFerryEast
delay 30
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
hideobjectat EVENT_OBJ_ID_PLAYER, 0
setvar VAR_0x8004, 5
call Common_EventScript_FerryDepart
return
@@ -358,7 +358,7 @@ SlateportCity_Harbor_EventScript_DeepSeaTooth:: @ 820CD7B
msgbox SlateportCity_Harbor_Text_TradeForDeepSeaTooth, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq SlateportCity_Harbor_EventScript_ChooseDifferentTrade
giveitem_std ITEM_DEEP_SEA_TOOTH
giveitem ITEM_DEEP_SEA_TOOTH
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
takeitem ITEM_SCANNER, 1
@@ -371,7 +371,7 @@ SlateportCity_Harbor_EventScript_DeepSeaScale:: @ 820CDBB
msgbox SlateportCity_Harbor_Text_TradeForDeepSeaScale, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq SlateportCity_Harbor_EventScript_ChooseDifferentTrade
giveitem_std ITEM_DEEP_SEA_SCALE
giveitem ITEM_DEEP_SEA_SCALE
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
takeitem ITEM_SCANNER, 1