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

Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj

Browse Source
This commit is contained in:
GriffinR
2020-01-13 20:41:57 -05:00
parent 655910a16f 736f3bbbe0
commit e92cc7752b
118 changed files with 605 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/SlateportCity_Harbor/scripts.inc
+5 -5
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 OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
hideobjectat OBJ_EVENT_ID_PLAYER, 0
setvar VAR_0x8004, 5
call Common_EventScript_FerryDepart
return
@@ -358,10 +358,10 @@ 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
removeitem ITEM_SCANNER
msgbox SlateportCity_Harbor_Text_HandedScannerToStern, MSGBOX_DEFAULT
setflag FLAG_EXCHANGED_SCANNER
goto SlateportCity_Harbor_EventScript_TradedScanner
@@ -371,10 +371,10 @@ 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
removeitem ITEM_SCANNER
msgbox SlateportCity_Harbor_Text_HandedScannerToStern, MSGBOX_DEFAULT
setflag FLAG_EXCHANGED_SCANNER
goto SlateportCity_Harbor_EventScript_TradedScanner