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/MossdeepCity_SpaceCenter_2F/map.json
+9 -9
View File
@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_RICH_BOY",
"graphics_id": "OBJ_EVENT_GFX_RICH_BOY",
"x": 6,
"y": 2,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
"graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
"x": 11,
"y": 8,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 5,
"y": 6,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_STEVEN",
"graphics_id": "OBJ_EVENT_GFX_STEVEN",
"x": 1,
"y": 8,
"elevation": 3,
@@ -67,7 +67,7 @@
"flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M",
"x": 12,
"y": 2,
"elevation": 3,
@@ -80,7 +80,7 @@
"flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M",
"x": 13,
"y": 3,
"elevation": 3,
@@ -93,7 +93,7 @@
"flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M",
"x": 14,
"y": 2,
"elevation": 3,
@@ -106,7 +106,7 @@
"flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M",
"x": 0,
"y": 8,
"elevation": 3,
@@ -119,7 +119,7 @@
"flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAXIE",
"graphics_id": "OBJ_EVENT_GFX_MAXIE",
"x": 1,
"y": 9,
"elevation": 3,
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+5 -5
View File
@@ -32,16 +32,16 @@ MossdeepCity_SpaceCenter_2F_OnFrame: @ 8223DB5
MossdeepCity_SpaceCenter_2F_EventScript_ThreeMagmaGrunts:: @ 8223DBF
playse SE_PIN
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_ExclamationMark
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay48
waitmovement 0
msgbox MossdeepCity_SpaceCenter_2F_Text_YoureOutnumberedTakeUsOn, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_BattleThreeMagmaGrunts
msgbox MossdeepCity_SpaceCenter_2F_Text_GoodAnswer, MSGBOX_DEFAULT
closemessage
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_PlayerExit
applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_PlayerExit
waitmovement 0
warp MAP_MOSSDEEP_CITY_SPACE_CENTER_1F, 255, 13, 1
waitstate
@@ -57,13 +57,13 @@ MossdeepCity_SpaceCenter_2F_EventScript_BattleThreeMagmaGrunts:: @ 8223E09
trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_5, MossdeepCity_SpaceCenter_2F_Text_Grunt5Defeat
applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_Grunt5Defeated
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt6Intro, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_6, MossdeepCity_SpaceCenter_2F_Text_Grunt6Defeat
applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_Grunt6Defeated
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt7Intro, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_7, MossdeepCity_SpaceCenter_2F_Text_Grunt7Defeat