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/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 OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
hideobjectat OBJ_EVENT_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 OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
hideobjectat OBJ_EVENT_ID_PLAYER, 0
setvar VAR_0x8004, 2
call Common_EventScript_FerryDepart
return