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

Standardize EVENT_OBJECT to OBJECT_EVENT

Browse Source
This commit is contained in:
GriffinR
2019-11-20 23:12:51 -05:00
parent ec3e86f1d2
commit 82cb741d8b
611 changed files with 4984 additions and 4984 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/SlateportCity_Harbor/map.json
+8 -8
View File
@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_BEAUTY",
"graphics_id": "OBJ_EVENT_GFX_BEAUTY",
"x": 8,
"y": 10,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS"
},
{
"graphics_id": "EVENT_OBJ_GFX_SAILOR",
"graphics_id": "OBJ_EVENT_GFX_SAILOR",
"x": 4,
"y": 12,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS"
},
{
"graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
"graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
"x": 1,
"y": 12,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS"
},
{
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 6,
"y": 13,
"elevation": 3,
@@ -67,7 +67,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN"
},
{
"graphics_id": "EVENT_OBJ_GFX_SS_TIDAL",
"graphics_id": "OBJ_EVENT_GFX_SS_TIDAL",
"x": 8,
"y": 9,
"elevation": 1,
@@ -80,7 +80,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 7,
"y": 10,
"elevation": 3,
@@ -93,7 +93,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT"
},
{
"graphics_id": "EVENT_OBJ_GFX_ARCHIE",
"graphics_id": "OBJ_EVENT_GFX_ARCHIE",
"x": 8,
"y": 10,
"elevation": 3,
@@ -106,7 +106,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE"
},
{
"graphics_id": "EVENT_OBJ_GFX_SUBMARINE_SHADOW",
"graphics_id": "OBJ_EVENT_GFX_SUBMARINE_SHADOW",
"x": 7,
"y": 9,
"elevation": 1,
data/maps/SlateportCity_Harbor/scripts.inc
+8 -8
View File
@@ -42,7 +42,7 @@ SlateportCity_Harbor_EventScript_AquaEscapeTrigger2:: @ 820C9D3
SlateportCity_Harbor_EventScript_AquaEscapeTrigger3:: @ 820C9DF
lockall
setvar VAR_0x8008, 3
applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_PlayerWalkUp
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Harbor_Movement_PlayerWalkUp
waitmovement 0
goto SlateportCity_Harbor_EventScript_AquaEscapeScene
end
@@ -51,7 +51,7 @@ SlateportCity_Harbor_EventScript_AquaEscapeScene:: @ 820C9F5
applymovement 7, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
applymovement 6, Common_Movement_WalkInPlaceFastestDown
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox SlateportCity_Harbor_Text_ArchieYouAgainHideoutInLilycove, MSGBOX_DEFAULT
closemessage
@@ -85,21 +85,21 @@ SlateportCity_Harbor_EventScript_AquaEscapeScene:: @ 820C9F5
SlateportCity_Harbor_EventScript_SternApproachPlayer0:: @ 820CA89
applymovement 4, SlateportCity_Harbor_Movement_SternApproachPlayer0
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
return
SlateportCity_Harbor_EventScript_SternApproachPlayer1:: @ 820CA9E
applymovement 4, SlateportCity_Harbor_Movement_SternApproachPlayer1
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
SlateportCity_Harbor_EventScript_SternApproachPlayer:: @ 820CAB3
applymovement 4, SlateportCity_Harbor_Movement_SternApproachPlayer
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
@@ -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 OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
setvar VAR_0x8004, 5
call Common_EventScript_FerryDepart
return
@@ -248,12 +248,12 @@ SlateportCity_Harbor_EventScript_CancelDestinationSelect:: @ 820CC2D
end
SlateportCity_Harbor_EventScript_BoardFerryEast:: @ 820CC37
applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_BoardFerryEast
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Harbor_Movement_BoardFerryEast
waitmovement 0
return
SlateportCity_Harbor_EventScript_BoardFerryNorth:: @ 820CC42
applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_BoardFerryNorth
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Harbor_Movement_BoardFerryNorth
waitmovement 0
return