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/MauvilleCity/map.json
+11 -11
View File
@@ -36,7 +36,7 @@
],
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_BOY_3",
"graphics_id": "OBJ_EVENT_GFX_BOY_3",
"x": 29,
"y": 16,
"elevation": 3,
@@ -49,7 +49,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_RICH_BOY",
"graphics_id": "OBJ_EVENT_GFX_RICH_BOY",
"x": 24,
"y": 10,
"elevation": 3,
@@ -62,7 +62,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MANIAC",
"graphics_id": "OBJ_EVENT_GFX_MANIAC",
"x": 14,
"y": 11,
"elevation": 3,
@@ -75,7 +75,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_4",
"x": 18,
"y": 6,
"elevation": 3,
@@ -88,7 +88,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M",
"graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M",
"x": 17,
"y": 14,
"elevation": 3,
@@ -101,7 +101,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_WALLY",
"graphics_id": "OBJ_EVENT_GFX_WALLY",
"x": 8,
"y": 6,
"elevation": 3,
@@ -114,7 +114,7 @@
"flag": "FLAG_HIDE_MAUVILLE_CITY_WALLY"
},
{
"graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
"graphics_id": "OBJ_EVENT_GFX_POKEFAN_M",
"x": 9,
"y": 6,
"elevation": 3,
@@ -127,7 +127,7 @@
"flag": "FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE"
},
{
"graphics_id": "EVENT_OBJ_GFX_WATTSON",
"graphics_id": "OBJ_EVENT_GFX_WATTSON",
"x": 29,
"y": 9,
"elevation": 3,
@@ -140,7 +140,7 @@
"flag": "FLAG_HIDE_MAUVILLE_CITY_WATTSON"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 28,
"y": 19,
"elevation": 3,
@@ -153,7 +153,7 @@
"flag": "FLAG_ITEM_MAUVILLE_CITY_X_SPEED"
},
{
"graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
"graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
"x": 13,
"y": 7,
"elevation": 3,
@@ -166,7 +166,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_SCOTT",
"graphics_id": "OBJ_EVENT_GFX_SCOTT",
"x": 12,
"y": 14,
"elevation": 3,
data/maps/MauvilleCity/scripts.inc
+8 -8
View File
@@ -114,19 +114,19 @@ MauvilleCity_EventScript_BattleWallyPrompt:: @ 81DF4AD
end
MauvilleCity_EventScript_WallyAndUncleExitNorth:: @ 81DF4E0
applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitNorth1
applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitNorth1
applymovement 6, MauvilleCity_Movement_WallyExitNorth1
applymovement 7, MauvilleCity_Movement_WallysUncleExitNorth1
waitmovement 0
applymovement 6, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
delay 30
applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerFaceUncleNorth
applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerFaceUncleNorth
applymovement 7, MauvilleCity_Movement_WallysUncleApproachPlayerNorth
waitmovement 0
msgbox MauvilleCity_Text_UncleVisitUsSometime, MSGBOX_DEFAULT
closemessage
applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitNorth2
applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitNorth2
applymovement 7, MauvilleCity_Movement_WallysUncleExitNorth2
applymovement 6, MauvilleCity_Movement_WallyExitNorth2
waitmovement 0
@@ -134,7 +134,7 @@ MauvilleCity_EventScript_WallyAndUncleExitNorth:: @ 81DF4E0
end
MauvilleCity_EventScript_WallyAndUncleExitEast:: @ 81DF53D
applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitEast1
applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitEast1
applymovement 6, MauvilleCity_Movement_WallyExitEast1
applymovement 7, MauvilleCity_Movement_WallysUncleExitEast1
waitmovement 0
@@ -145,7 +145,7 @@ MauvilleCity_EventScript_WallyAndUncleExitEast:: @ 81DF53D
waitmovement 0
msgbox MauvilleCity_Text_UncleVisitUsSometime, MSGBOX_DEFAULT
closemessage
applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitEast2
applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitEast2
applymovement 7, MauvilleCity_Movement_WallysUncleExitEast2
applymovement 6, MauvilleCity_Movement_WallyExitEast2
waitmovement 0
@@ -164,7 +164,7 @@ MauvilleCity_EventScript_DefeatedWally:: @ 81DF593
call_if_eq MauvilleCity_EventScript_ScottApproachPlayerNorth
compare VAR_FACING, DIR_EAST
call_if_eq MauvilleCity_EventScript_ScottApproachPlayerEast
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
msgbox MauvilleCity_Text_ScottYouDidntHoldBack, MSGBOX_DEFAULT
closemessage
@@ -191,13 +191,13 @@ MauvilleCity_EventScript_ScottApproachPlayerEast:: @ 81DF601
return
MauvilleCity_EventScript_ScottExitNorth:: @ 81DF616
applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchScottExitNorth
applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerWatchScottExitNorth
applymovement 11, MauvilleCity_Movement_ScottExitNorth
waitmovement 0
return
MauvilleCity_EventScript_ScottExitEast:: @ 81DF628
applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchScottExitEast
applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerWatchScottExitEast
applymovement 11, MauvilleCity_Movement_ScottExitEast
waitmovement 0
return