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

16
data/maps/Route119_WeatherInstitute_2F/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 15,
"y": 6,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 10,
"y": 8,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F",
"x": 4,
"y": 6,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_4",
"graphics_id": "OBJ_EVENT_GFX_MAN_4",
"x": 0,
"y": 6,
"elevation": 3,
@@ -67,7 +67,7 @@
"flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS"
},
{
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 18,
"y": 6,
"elevation": 3,
@@ -80,7 +80,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_4",
"graphics_id": "OBJ_EVENT_GFX_MAN_4",
"x": 1,
"y": 7,
"elevation": 3,
@@ -93,7 +93,7 @@
"flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 16,
"y": 6,
"elevation": 3,
@@ -106,7 +106,7 @@
"flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F",
"x": 19,
"y": 6,
"elevation": 3,

4
data/maps/Route119_WeatherInstitute_2F/scripts.inc
View File

@@ -50,7 +50,7 @@ Route119_WeatherInstitute_2F_EventScript_ShellyDefeated:: @ 826FFC8
closemessage
addobject 7 @ Aqua grunt
applymovement 7, Route119_WeatherInstitute_2F_Movement_GruntApproachShelly
applymovement EVENT_OBJ_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_ShovePlayerOutOfWay
applymovement OBJ_EVENT_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_ShovePlayerOutOfWay
waitmovement 0
msgbox Route119_WeatherInstitute_2F_Text_TeamMagmaJustPassedBy, MSGBOX_DEFAULT
closemessage
@@ -72,7 +72,7 @@ Route119_WeatherInstitute_2F_EventScript_ShellyDefeated:: @ 826FFC8
removeobject 3
removeobject 8
removeobject 7
applymovement EVENT_OBJ_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_PlayerReturnToPosition
applymovement OBJ_EVENT_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_PlayerReturnToPosition
waitmovement 0
fadescreen 0
applymovement 5, Route119_WeatherInstitute_2F_Movement_ScientistApproachPlayer