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

8
data/maps/OldaleTown/map.json
View File

@@ -31,7 +31,7 @@
],
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_GIRL_3",
"graphics_id": "OBJ_EVENT_GFX_GIRL_3",
"x": 16,
"y": 11,
"elevation": 3,
@@ -44,7 +44,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE",
"graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE",
"x": 13,
"y": 7,
"elevation": 3,
@@ -57,7 +57,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MANIAC",
"graphics_id": "OBJ_EVENT_GFX_MANIAC",
"x": 8,
"y": 9,
"elevation": 3,
@@ -70,7 +70,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_0",
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
"x": 11,
"y": 19,
"elevation": 3,

16
data/maps/OldaleTown/scripts.inc
View File

@@ -50,20 +50,20 @@ OldaleTown_EventScript_MartEmployee:: @ 81E8EFC
OldaleTown_EventScript_GoToMartSouth:: @ 81E8F47
applymovement 2, OldaleTown_Movement_EmployeeSouth
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_PlayerSouth
applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_PlayerSouth
waitmovement 0
goto OldaleTown_EventScript_ExplainPokemonMart
end
OldaleTown_EventScript_GoToMartNorth:: @ 81E8F5E
applymovement 2, OldaleTown_Movement_EmployeeNorth
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_PlayerNorth
applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_PlayerNorth
waitmovement 0
goto OldaleTown_EventScript_ExplainPokemonMart
end
OldaleTown_EventScript_GoToMartEast:: @ 81E8F75
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_PlayerEast
applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_PlayerEast
applymovement 2, OldaleTown_Movement_EmployeeEast
waitmovement 0
goto OldaleTown_EventScript_ExplainPokemonMart
@@ -201,7 +201,7 @@ OldaleTown_EventScript_FootprintsMan:: @ 81E901F
OldaleTown_EventScript_BlockedPath:: @ 81E903F
lockall
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_PlayerStepBack
applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_PlayerStepBack
applymovement 3, OldaleTown_Movement_BackUp
waitmovement 0
msgbox OldaleTown_Text_WaitDontComeInHere, MSGBOX_DEFAULT
@@ -228,7 +228,7 @@ OldaleTown_EventScript_RivalTrigger1:: @ 81E9086
lockall
applymovement 4, OldaleTown_Movement_RivalApproachPlayer1
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
setvar VAR_0x8009, 1
goto OldaleTown_EventScript_ShowRivalMessage
@@ -238,7 +238,7 @@ OldaleTown_EventScript_RivalTrigger2:: @ 81E90A6
lockall
applymovement 4, OldaleTown_Movement_RivalApproachPlayer2
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
setvar VAR_0x8009, 1
goto OldaleTown_EventScript_ShowRivalMessage
@@ -248,7 +248,7 @@ OldaleTown_EventScript_RivalTrigger3:: @ 81E90C6
lockall
applymovement 4, OldaleTown_Movement_RivalApproachPlayer3
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
setvar VAR_0x8009, 1
goto OldaleTown_EventScript_ShowRivalMessage
@@ -294,7 +294,7 @@ OldaleTown_EventScript_DoExitMovement1:: @ 81E9148
return
OldaleTown_EventScript_DoExitMovement2:: @ 81E915E
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_WatchRivalExit
applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_WatchRivalExit
applymovement 4, OldaleTown_Movement_RivalExit
waitmovement 0
return