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

36
data/maps/SootopolisCity/map.json
View File

@@ -15,7 +15,7 @@
"connections": [],
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
"graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
"x": 31,
"y": 18,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_4",
"x": 47,
"y": 33,
"elevation": 0,
@@ -41,7 +41,7 @@
"flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS"
},
{
"graphics_id": "EVENT_OBJ_GFX_GIRL_2",
"graphics_id": "OBJ_EVENT_GFX_GIRL_2",
"x": 9,
"y": 43,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
"graphics_id": "OBJ_EVENT_GFX_NINJA_BOY",
"x": 51,
"y": 14,
"elevation": 3,
@@ -67,7 +67,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BOY_1",
"graphics_id": "OBJ_EVENT_GFX_BOY_1",
"x": 43,
"y": 26,
"elevation": 3,
@@ -80,7 +80,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_1",
"graphics_id": "OBJ_EVENT_GFX_MAN_1",
"x": 26,
"y": 4,
"elevation": 3,
@@ -93,7 +93,7 @@
"flag": "FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1"
},
{
"graphics_id": "EVENT_OBJ_GFX_STEVEN",
"graphics_id": "OBJ_EVENT_GFX_STEVEN",
"x": 20,
"y": 36,
"elevation": 3,
@@ -106,7 +106,7 @@
"flag": "FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_5",
"x": 49,
"y": 34,
"elevation": 3,
@@ -119,7 +119,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_GROUDON_3",
"graphics_id": "OBJ_EVENT_GFX_GROUDON_3",
"x": 28,
"y": 44,
"elevation": 0,
@@ -132,7 +132,7 @@
"flag": "FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON"
},
{
"graphics_id": "EVENT_OBJ_GFX_KYOGRE_3",
"graphics_id": "OBJ_EVENT_GFX_KYOGRE_3",
"x": 34,
"y": 44,
"elevation": 1,
@@ -145,7 +145,7 @@
"flag": "FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE"
},
{
"graphics_id": "EVENT_OBJ_GFX_RAYQUAZA_2",
"graphics_id": "OBJ_EVENT_GFX_RAYQUAZA_2",
"x": 31,
"y": 41,
"elevation": 1,
@@ -158,7 +158,7 @@
"flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA"
},
{
"graphics_id": "EVENT_OBJ_GFX_MANIAC",
"graphics_id": "OBJ_EVENT_GFX_MANIAC",
"x": 17,
"y": 44,
"elevation": 3,
@@ -171,7 +171,7 @@
"flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS"
},
{
"graphics_id": "EVENT_OBJ_GFX_GIRL_3",
"graphics_id": "OBJ_EVENT_GFX_GIRL_3",
"x": 14,
"y": 42,
"elevation": 3,
@@ -184,7 +184,7 @@
"flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS"
},
{
"graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 17,
"y": 40,
"elevation": 3,
@@ -197,7 +197,7 @@
"flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS"
},
{
"graphics_id": "EVENT_OBJ_GFX_BOY_2",
"graphics_id": "OBJ_EVENT_GFX_BOY_2",
"x": 19,
"y": 37,
"elevation": 3,
@@ -210,7 +210,7 @@
"flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAXIE",
"graphics_id": "OBJ_EVENT_GFX_MAXIE",
"x": 29,
"y": 33,
"elevation": 3,
@@ -223,7 +223,7 @@
"flag": "FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE"
},
{
"graphics_id": "EVENT_OBJ_GFX_ARCHIE",
"graphics_id": "OBJ_EVENT_GFX_ARCHIE",
"x": 31,
"y": 33,
"elevation": 3,
@@ -236,7 +236,7 @@
"flag": "FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE"
},
{
"graphics_id": "EVENT_OBJ_GFX_WALLACE",
"graphics_id": "OBJ_EVENT_GFX_WALLACE",
"x": 31,
"y": 18,
"elevation": 3,

32
data/maps/SootopolisCity/scripts.inc
View File

@@ -179,11 +179,11 @@ SootopolisCity_EventScript_PlayerFaceLegendaries:: @ 81E58E5
end
SootopolisCity_EventScript_PlayerFaceLegendaries1:: @ 81E58FC
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
return
SootopolisCity_EventScript_PlayerFaceLegendaries2:: @ 81E5901
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
setvar VAR_SKY_PILLAR_STATE, 3
return
@@ -210,7 +210,7 @@ SootopolisCity_EventScript_StartLegendariesScene:: @ 81E5926
SootopolisCity_EventScript_LegendariesSceneFromPokeCenter:: @ 81E5946
delay 60
special SpawnCameraObject
applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanToActionFromPokeCenter
applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanToActionFromPokeCenter
waitmovement 0
special RemoveCameraObject
delay 60
@@ -269,7 +269,7 @@ SootopolisCity_EventScript_LegendariesSceneFromPokeCenter:: @ 81E5946
special SpawnCameraObject
applymovement 10, SootopolisCity_Movement_KyogreIdle
applymovement 9, SootopolisCity_Movement_GroudonIdle
applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanBackToPokeCenter
applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanBackToPokeCenter
waitmovement 0
special RemoveCameraObject
setvar VAR_SOOTOPOLIS_CITY_STATE, 2
@@ -310,7 +310,7 @@ SootopolisCity_Movement_PanBackToPokeCenter: @ 81E5A75
SootopolisCity_EventScript_LegendariesSceneFromDive:: @ 81E5A82
delay 60
special SpawnCameraObject
applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanToActionFromDive
applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanToActionFromDive
waitmovement 0
special RemoveCameraObject
delay 60
@@ -369,7 +369,7 @@ SootopolisCity_EventScript_LegendariesSceneFromDive:: @ 81E5A82
special SpawnCameraObject
applymovement 10, SootopolisCity_Movement_KyogreIdle
applymovement 9, SootopolisCity_Movement_GroudonIdle
applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanBackToDive
applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanBackToDive
waitmovement 0
special RemoveCameraObject
setvar VAR_SOOTOPOLIS_CITY_STATE, 2
@@ -501,7 +501,7 @@ SootopolisCity_EventScript_StartRayquazaScene:: @ 81E5BFE
SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E
delay 60
special SpawnCameraObject
applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanToActionFromPokeCenter
applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanToActionFromPokeCenter
waitmovement 0
special RemoveCameraObject
delay 60
@@ -515,7 +515,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E
waitstate
playse SE_T_KAMI
special SpawnCameraObject
applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanUp
applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanUp
waitmovement 0
waitse
playmoncry SPECIES_RAYQUAZA, 2
@@ -554,7 +554,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E
SootopolisCity_EventScript_RayquazaSceneFromDive:: @ 81E5CCE
delay 60
special SpawnCameraObject
applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanToActionFromDive
applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanToActionFromDive
waitmovement 0
special RemoveCameraObject
delay 60
@@ -567,8 +567,8 @@ SootopolisCity_EventScript_RayquazaSceneFromDive:: @ 81E5CCE
special Script_DoRayquazaScene
waitstate
special SpawnCameraObject
applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanUp
applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerApproachLegendaries
applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanUp
applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_PlayerApproachLegendaries
waitmovement 0
waitse
playmoncry SPECIES_RAYQUAZA, 2
@@ -972,18 +972,18 @@ SootopolisCity_EventScript_StevenLeadPlayerCaveOfOrigin:: @ 81E61CC
msgbox SootopolisCity_Text_DoesThisMakeYourFearPokemon, MSGBOX_DEFAULT
closemessage
applymovement 7, SootopolisCity_Movement_StevenWalkToCaveOfOrigin
applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerWalkToCaveOfOrigin
applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_PlayerWalkToCaveOfOrigin
waitmovement 0
delay 120
applymovement 1, SootopolisCity_Movement_ExpertMoveAside
waitmovement 0
applymovement 7, SootopolisCity_Movement_StevenArriveCaveEntrance
applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerArriveCaveEntrance
applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_PlayerArriveCaveEntrance
waitmovement 0
msgbox SootopolisCity_Text_HereWereAreHelpWallace, MSGBOX_DEFAULT
closemessage
setflag FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN
applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerEnterCaveOfOrigin
applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_PlayerEnterCaveOfOrigin
waitmovement 0
warp MAP_CAVE_OF_ORIGIN_ENTRANCE, 255, 9, 20
waitstate
@@ -991,13 +991,13 @@ SootopolisCity_EventScript_StevenLeadPlayerCaveOfOrigin:: @ 81E61CC
SootopolisCity_EventScript_StartWalkToCaveOfOriginWest:: @ 81E6243
applymovement 7, SootopolisCity_Movement_StevenStartWalkToCaveOfOrigin
applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginWest
applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginWest
waitmovement 0
return
SootopolisCity_EventScript_StartWalkToCaveOfOriginNorth:: @ 81E6255
applymovement 7, SootopolisCity_Movement_StevenStartWalkToCaveOfOrigin
applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginNorth
applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginNorth
waitmovement 0
return