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/PetalburgWoods/map.json
+13 -13
View File
@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
"graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE",
"x": 19,
"y": 10,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "FLAG_TEMP_11"
},
{
"graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
"graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE",
"x": 19,
"y": 11,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 26,
"y": 17,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "FLAG_HIDE_PETALBURG_WOODS_AQUA_GRUNT"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_2",
"graphics_id": "OBJ_EVENT_GFX_MAN_2",
"x": 26,
"y": 20,
"elevation": 3,
@@ -67,7 +67,7 @@
"flag": "FLAG_HIDE_PETALBURG_WOODS_DEVON_EMPLOYEE"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 45,
"y": 7,
"elevation": 3,
@@ -80,7 +80,7 @@
"flag": "FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 35,
"y": 20,
"elevation": 3,
@@ -93,7 +93,7 @@
"flag": "FLAG_ITEM_PETALBURG_WOODS_X_ATTACK"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 4,
"y": 8,
"elevation": 3,
@@ -106,7 +106,7 @@
"flag": "FLAG_ITEM_PETALBURG_WOODS_ETHER"
},
{
"graphics_id": "EVENT_OBJ_GFX_BOY_2",
"graphics_id": "OBJ_EVENT_GFX_BOY_2",
"x": 15,
"y": 19,
"elevation": 3,
@@ -119,7 +119,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER",
"graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
"x": 7,
"y": 32,
"elevation": 3,
@@ -132,7 +132,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER",
"graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
"x": 4,
"y": 14,
"elevation": 3,
@@ -145,7 +145,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BOY_3",
"graphics_id": "OBJ_EVENT_GFX_BOY_3",
"x": 30,
"y": 34,
"elevation": 3,
@@ -158,7 +158,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 4,
"y": 26,
"elevation": 3,
@@ -171,7 +171,7 @@
"flag": "FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL"
},
{
"graphics_id": "EVENT_OBJ_GFX_GIRL_2",
"graphics_id": "OBJ_EVENT_GFX_GIRL_2",
"x": 33,
"y": 5,
"elevation": 3,
data/maps/PetalburgWoods/scripts.inc
+5 -5
View File
@@ -30,7 +30,7 @@ PetalburgWoods_EventScript_DevonResearcherLeft:: @ 822DFD7
applymovement 3, PetalburgWoods_Movement_AquaBackOff
waitmovement 0
call PetalburgWoods_EventScript_DevonResearcherPostBattle
applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_WatchResearcherLeave
applymovement OBJ_EVENT_ID_PLAYER, PetalburgWoods_Movement_WatchResearcherLeave
applymovement 4, PetalburgWoods_Movement_DevonResearcherExitLeft
waitmovement 0
goto PetalburgWoods_EventScript_RemoveDevonResearcher
@@ -41,7 +41,7 @@ PetalburgWoods_EventScript_DevonResearcherRight:: @ 822E079
call PetalburgWoods_EventScript_DevonResearcherIntro
applymovement 4, PetalburgWoods_Movement_DevonResearcherApproachPlayerRight
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
msgbox PetalburgWoods_Text_HaveYouSeenShroomish, MSGBOX_DEFAULT
closemessage
@@ -59,14 +59,14 @@ PetalburgWoods_EventScript_DevonResearcherRight:: @ 822E079
applymovement 4, PetalburgWoods_Movement_DevonResearcherFleeToPlayerRight
waitmovement 0
msgbox PetalburgWoods_Text_YouHaveToHelpMe, MSGBOX_DEFAULT
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox PetalburgWoods_Text_NoOneCrossesTeamAqua, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_GRUNT_PETALBURG_WOODS, PetalburgWoods_Text_YoureKiddingMe
applymovement 3, PetalburgWoods_Movement_AquaBackOff
waitmovement 0
call PetalburgWoods_EventScript_DevonResearcherPostBattle
applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_WatchResearcherLeave
applymovement OBJ_EVENT_ID_PLAYER, PetalburgWoods_Movement_WatchResearcherLeave
applymovement 4, PetalburgWoods_Movement_DevonResearcherExitRight
waitmovement 0
goto PetalburgWoods_EventScript_RemoveDevonResearcher
@@ -85,7 +85,7 @@ PetalburgWoods_EventScript_DevonResearcherPostBattle:: @ 822E138
applymovement 3, PetalburgWoods_Movement_AquaRunAway
waitmovement 0
removeobject 3
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
msgbox PetalburgWoods_Text_ThatWasAwfullyClose, MSGBOX_DEFAULT
giveitem_std ITEM_GREAT_BALL