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/MeteorFalls_1F_1R/map.json
+10 -10
View File
@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 2,
"y": 4,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 2,
"y": 14,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 27,
"y": 5,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 26,
"y": 32,
"elevation": 3,
@@ -67,7 +67,7 @@
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M",
"x": 12,
"y": 20,
"elevation": 3,
@@ -80,7 +80,7 @@
"flag": "FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M",
"x": 14,
"y": 21,
"elevation": 3,
@@ -93,7 +93,7 @@
"flag": "FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA"
},
{
"graphics_id": "EVENT_OBJ_GFX_ARCHIE",
"graphics_id": "OBJ_EVENT_GFX_ARCHIE",
"x": 6,
"y": 20,
"elevation": 3,
@@ -106,7 +106,7 @@
"flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 6,
"y": 20,
"elevation": 3,
@@ -119,7 +119,7 @@
"flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 6,
"y": 21,
"elevation": 3,
@@ -132,7 +132,7 @@
"flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA"
},
{
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 13,
"y": 23,
"elevation": 3,
data/maps/MeteorFalls_1F_1R/scripts.inc
+3 -3
View File
@@ -16,7 +16,7 @@ MeteorFalls_1F_1R_EventScript_OpenStevensCave:: @ 822BD3A
MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene:: @ 822BD5F
lockall
playbgm MUS_MGM0, 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceDown
waitmovement 0
delay 30
applymovement 5, Common_Movement_WalkInPlaceDown
@@ -37,7 +37,7 @@ MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene:: @ 822BD5F
waitmovement 0
msgbox MeteorFalls_1F_1R_Text_HoldItRightThereMagma, MSGBOX_DEFAULT
closemessage
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
applymovement 5, Common_Movement_WalkInPlaceFastestLeft
applymovement 6, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
@@ -54,7 +54,7 @@ MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene:: @ 822BD5F
waitmovement 0
msgbox MeteorFalls_1F_1R_Text_BeSeeingYouTeamAqua, MSGBOX_DEFAULT
closemessage
applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_PushPlayerOutOfWay
applymovement OBJ_EVENT_ID_PLAYER, MeteorFalls_1F_1R_Movement_PushPlayerOutOfWay
applymovement 5, MeteorFalls_1F_1R_Movement_MagmaGrunt1Exit
applymovement 6, MeteorFalls_1F_1R_Movement_MagmaGrunt2Exit
waitmovement 0