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/PetalburgCity_Gym/map.json
+11 -11
View File
@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_NORMAN",
"graphics_id": "OBJ_EVENT_GFX_NORMAN",
"x": 4,
"y": 2,
"elevation": 0,
@@ -28,7 +28,7 @@
"flag": "FLAG_HIDE_PETALBURG_GYM_NORMAN"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_5",
"x": 4,
"y": 94,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_3",
"graphics_id": "OBJ_EVENT_GFX_MAN_3",
"x": 4,
"y": 81,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_3",
"graphics_id": "OBJ_EVENT_GFX_MAN_3",
"x": 4,
"y": 42,
"elevation": 3,
@@ -67,7 +67,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_5",
"x": 4,
"y": 55,
"elevation": 3,
@@ -80,7 +80,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_3",
"graphics_id": "OBJ_EVENT_GFX_MAN_3",
"x": 4,
"y": 68,
"elevation": 3,
@@ -93,7 +93,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_5",
"x": 4,
"y": 16,
"elevation": 3,
@@ -106,7 +106,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_3",
"graphics_id": "OBJ_EVENT_GFX_MAN_3",
"x": 4,
"y": 29,
"elevation": 3,
@@ -119,7 +119,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_2",
"graphics_id": "OBJ_EVENT_GFX_MAN_2",
"x": 3,
"y": 109,
"elevation": 3,
@@ -132,7 +132,7 @@
"flag": "FLAG_HIDE_PETALBURG_GYM_GREETER"
},
{
"graphics_id": "EVENT_OBJ_GFX_WALLY",
"graphics_id": "OBJ_EVENT_GFX_WALLY",
"x": 4,
"y": 111,
"elevation": 3,
@@ -145,7 +145,7 @@
"flag": "FLAG_HIDE_PETALBURG_GYM_WALLY"
},
{
"graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
"graphics_id": "OBJ_EVENT_GFX_POKEFAN_M",
"x": 1,
"y": 7,
"elevation": 3,
data/maps/PetalburgCity_Gym/scripts.inc
+18 -18
View File
@@ -79,7 +79,7 @@ PetalburgCity_Gym_OnWarp: @ 820498B
.2byte 0
PetalburgCity_Gym_EventScript_TurnPlayerNorth:: @ 8204995
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end
PetalburgCity_Gym_OnFrame: @ 820499A
@@ -91,14 +91,14 @@ PetalburgCity_Gym_EventScript_ReturnFromWallyTutorial:: @ 82049A4
msgbox PetalburgCity_Gym_Text_DadSoDidItWorkOut, MSGBOX_DEFAULT
msgbox PetalburgCity_Gym_Text_WallyThankYouBye, MSGBOX_DEFAULT
closemessage
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
applymovement 10, PetalburgCity_Gym_Movement_WallyExitGym
waitmovement 0
playse SE_KAIDAN
removeobject 10
setflag FLAG_HIDE_PETALBURG_CITY_WALLY
delay 30
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox PetalburgCity_Gym_Text_DadGoCollectBadges, MSGBOX_DEFAULT
setvar VAR_PETALBURG_GYM_STATE, 2
@@ -238,13 +238,13 @@ PetalburgCity_Gym_EventScript_WallyArriveNorth:: @ 8204C43
applymovement 10, PetalburgCity_Gym_Movement_WallyArriveNorth
waitmovement 0
applymovement 1, Common_Movement_WalkInPlaceFastestRight
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
PetalburgCity_Gym_EventScript_WallyArriveWestEast:: @ 8204C5F
applymovement 1, Common_Movement_WalkInPlaceFastestDown
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
applymovement 10, PetalburgCity_Gym_Movement_WallyArrive
waitmovement 0
return
@@ -252,25 +252,25 @@ PetalburgCity_Gym_EventScript_WallyArriveWestEast:: @ 8204C5F
PetalburgCity_Gym_EventScript_ExitGymWithWallySouth:: @ 8204C78
applymovement 1, Common_Movement_WalkInPlaceFastestDown
applymovement 10, PetalburgCity_Gym_Movement_WallyExitSouthWest
applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallySouth
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallySouth
waitmovement 0
return
PetalburgCity_Gym_EventScript_ExitGymWithWallyNorth:: @ 8204C91
applymovement 10, PetalburgCity_Gym_Movement_WallyExitNorth
applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyNorth
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyNorth
waitmovement 0
return
PetalburgCity_Gym_EventScript_ExitGymWithWallyWest:: @ 8204CA3
applymovement 10, PetalburgCity_Gym_Movement_WallyExitSouthWest
applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyWest
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyWest
waitmovement 0
return
PetalburgCity_Gym_EventScript_ExitGymWithWallyEast:: @ 8204CB5
applymovement 10, PetalburgCity_Gym_Movement_WallyExitEast
applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyEast
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyEast
waitmovement 0
return
@@ -281,19 +281,19 @@ PetalburgCity_Gym_EventScript_NormanAddressPlayerSouth:: @ 8204CC7
PetalburgCity_Gym_EventScript_NormanAddressPlayerNorth:: @ 8204CD2
applymovement 1, Common_Movement_WalkInPlaceFastestDown
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
return
PetalburgCity_Gym_EventScript_NormanAddressPlayerWest:: @ 8204CE4
applymovement 1, Common_Movement_WalkInPlaceFastestRight
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
PetalburgCity_Gym_EventScript_NormanAddressPlayerEast:: @ 8204CF6
applymovement 1, Common_Movement_WalkInPlaceFastestLeft
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
@@ -523,7 +523,7 @@ PetalburgCity_Gym_EventScript_WallysUncleFaceNormanWest:: @ 8204FE2
PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerNorth:: @ 8204FED
applymovement 11, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerNorth
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
applymovement 1, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
@@ -531,7 +531,7 @@ PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerNorth:: @ 8204FED
PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerEast:: @ 8205009
applymovement 11, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerEast
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
applymovement 1, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
return
@@ -539,7 +539,7 @@ PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerEast:: @ 8205009
PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerWest:: @ 8205025
applymovement 11, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerWest
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
applymovement 1, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
return
@@ -547,19 +547,19 @@ PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerWest:: @ 8205025
PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleNorth:: @ 8205041
applymovement 11, PetalburgCity_Gym_Movement_WallysUncleExitNorth
applymovement 1, Common_Movement_WalkInPlaceFastestDown
applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleNorth
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleNorth
waitmovement 0
return
PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleEast:: @ 820505A
applymovement 11, PetalburgCity_Gym_Movement_WallysUncleExitEast
applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleEast
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleEast
waitmovement 0
return
PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleWest:: @ 820506C
applymovement 11, PetalburgCity_Gym_Movement_WallysUncleExitWest
applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleWest
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleWest
waitmovement 0
return