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
data/maps/LilycoveCity_Harbor/scripts.inc
+2 -2
View File
@@ -364,7 +364,7 @@ LilycoveCity_Harbor_EventScript_BoardFerryWithSailor:: @ 821E514
compare VAR_FACING, DIR_EAST
call_if_eq LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast
delay 30
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
hideobjectat EVENT_OBJ_ID_PLAYER, 0
setvar VAR_0x8004, 2
call Common_EventScript_FerryDepart
return
@@ -428,7 +428,7 @@ LilycoveCity_Harbor_EventScript_BoardFerry:: @ 821E5CC
compare VAR_FACING, DIR_EAST
call_if_eq LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast
delay 30
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
hideobjectat EVENT_OBJ_ID_PLAYER, 0
setvar VAR_0x8004, 2
call Common_EventScript_FerryDepart
return