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/DewfordTown/map.json
+5 -5
View File
@@ -26,7 +26,7 @@
],
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
"x": 7,
"y": 12,
"elevation": 3,
@@ -39,7 +39,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
"graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
"x": 12,
"y": 9,
"elevation": 3,
@@ -52,7 +52,7 @@
"flag": "FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN"
},
{
"graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
"graphics_id": "OBJ_EVENT_GFX_FISHERMAN",
"x": 12,
"y": 14,
"elevation": 3,
@@ -65,7 +65,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MR_BRINEYS_BOAT",
"graphics_id": "OBJ_EVENT_GFX_MR_BRINEYS_BOAT",
"x": 12,
"y": 8,
"elevation": 1,
@@ -78,7 +78,7 @@
"flag": "FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN"
},
{
"graphics_id": "EVENT_OBJ_GFX_BOY_1",
"graphics_id": "OBJ_EVENT_GFX_BOY_1",
"x": 1,
"y": 6,
"elevation": 3,
data/maps/DewfordTown/scripts.inc
+15 -15
View File
@@ -117,29 +117,29 @@ DewfordTown_EventScript_FishingNotSoGood:: @ 81E9656
DewfordTown_EventScript_SailToPetalburg:: @ 81E9660
call EventScript_BackupMrBrineyLocation
setobjectpriority 2, MAP_DEWFORD_TOWN, 0
setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 0
setobjectpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN, 0
applymovement 2, DewfordTown_Movement_BrineyBoardBoat
waitmovement 0
removeobject 2
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_PlayerBoardBoat
applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_PlayerBoardBoat
waitmovement 0
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN
call Common_EventScript_PlayBrineysBoatMusic
applymovement 4, DewfordTown_Movement_SailToPetalburg
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_SailToPetalburg
applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_SailToPetalburg
waitmovement 0
showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104
showobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE104
call Common_EventScript_StopBrineysBoatMusic
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_ExitBoatPetalburg
applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_ExitBoatPetalburg
waitmovement 0
showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104
showobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE104
clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
hideobjectat 4, MAP_DEWFORD_TOWN
setvar VAR_BOARD_BRINEY_BOAT_STATE, 2
resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
resetobjectpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN
warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4
copyvar VAR_BRINEY_LOCATION, VAR_0x8008
waitstate
@@ -149,20 +149,20 @@ DewfordTown_EventScript_SailToPetalburg:: @ 81E9660
DewfordTown_EventScript_SailToSlateport:: @ 81E96E7
call EventScript_BackupMrBrineyLocation
setobjectpriority 2, MAP_DEWFORD_TOWN, 0
setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 1
setobjectpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN, 1
applymovement 2, DewfordTown_Movement_BrineyBoardBoat
waitmovement 0
removeobject 2
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_PlayerBoardBoat
applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_PlayerBoardBoat
waitmovement 0
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN
call Common_EventScript_PlayBrineysBoatMusic
applymovement 4, DewfordTown_Movement_SailToSlateport
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_SailToSlateport
applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_SailToSlateport
waitmovement 0
call Common_EventScript_StopBrineysBoatMusic
showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_ExitBoatSlateport
showobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE109
applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_ExitBoatSlateport
waitmovement 0
setobjectxyperm 2, 21, 26
addobject 2
@@ -178,7 +178,7 @@ DewfordTown_EventScript_SailToSlateport:: @ 81E96E7
call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_LandedSlateport
closemessage
copyvar VAR_BRINEY_LOCATION, VAR_0x8008
resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
resetobjectpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN
resetobjectpriority 2, MAP_ROUTE109
copyobjectxytoperm 2
release