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_OceanicMuseum_2F/map.json
+7 -7
View File
@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 13,
"y": 6,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN"
},
{
"graphics_id": "EVENT_OBJ_GFX_ARCHIE",
"graphics_id": "OBJ_EVENT_GFX_ARCHIE",
"x": 6,
"y": 1,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 6,
"y": 1,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 6,
"y": 1,
"elevation": 3,
@@ -67,7 +67,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2"
},
{
"graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
"graphics_id": "OBJ_EVENT_GFX_OLD_MAN",
"x": 12,
"y": 7,
"elevation": 3,
@@ -80,7 +80,7 @@
"flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION"
},
{
"graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
"graphics_id": "OBJ_EVENT_GFX_POKEFAN_F",
"x": 9,
"y": 6,
"elevation": 3,
@@ -93,7 +93,7 @@
"flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION"
},
{
"graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
"graphics_id": "OBJ_EVENT_GFX_NINJA_BOY",
"x": 1,
"y": 3,
"elevation": 3,
data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
+4 -4
View File
@@ -68,7 +68,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 820BB00
fadescreen 0
delay 30
setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox SlateportCity_OceanicMuseum_2F_Text_SternThankYouForSavingUs, MSGBOX_DEFAULT
setvar VAR_0x8004, ITEM_DEVON_GOODS
@@ -96,7 +96,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_ReadyRegisterBirch:: @ 820BC8C
return
SlateportCity_OceanicMuseum_2F_EventScript_PlayerFaceGrunts:: @ 820BC92
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
@@ -106,12 +106,12 @@ SlateportCity_OceanicMuseum_2F_EventScript_SternFaceGrunts:: @ 820BC9D
return
SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntSouth:: @ 820BCA8
applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntSouth
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntSouth
waitmovement 0
return
SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntWest:: @ 820BCB3
applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntWest
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntWest
waitmovement 0
return