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/LittlerootTown_ProfessorBirchsLab/map.json
+6 -6
View File
@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 9,
"y": 8,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH",
"graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH",
"x": 6,
"y": 4,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_0",
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
"x": 7,
"y": 4,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 6,
"y": 8,
"elevation": 3,
@@ -67,7 +67,7 @@
"flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 6,
"y": 8,
"elevation": 3,
@@ -80,7 +80,7 @@
"flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 6,
"y": 8,
"elevation": 3,
data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+7 -7
View File
@@ -63,11 +63,11 @@ LittlerootTown_ProfessorBirchsLab_OnWarp: @ 81F9D06
.2byte 0
LittlerootTown_ProfessorBirchsLab_EventScript_SetPlayerPosForReceiveStarter:: @ 81F9D40
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end
LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForDexUpgrade:: @ 81F9D45
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
addobject 2
addobject 3
turnobject 3, DIR_NORTH
@@ -153,7 +153,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_DeclineSeeingRival:: @ 81F9E48
LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedexEvent:: @ 81F9E67
lockall
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForPokedex
applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForPokedex
waitmovement 0
goto LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedex
end
@@ -185,7 +185,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex:: @ 81F9E80
playse SE_TK_KASYA
delay 20
applymovement 3, Common_Movement_WalkInPlaceFastestRight
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
checkplayergender
compare VAR_RESULT, MALE
@@ -198,7 +198,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex:: @ 81F9E80
applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_BirchReturnPokedex
waitmovement 0
applymovement 3, Common_Movement_WalkInPlaceFastestUp
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox LittlerootTown_ProfessorBirchsLab_Text_OkayAllDone, MSGBOX_DEFAULT
playfanfare MUS_FANFA4
@@ -261,7 +261,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_BirchReturnPokedex: @ 81F9F58
LittlerootTown_ProfessorBirchsLab_EventScript_ChooseJohtoStarter:: @ 81F9F62
lockall
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForJohtoStarter
applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForJohtoStarter
waitmovement 0
msgbox LittlerootTown_ProfessorBirchsLab_Text_CompletedDexChoosePokemon, MSGBOX_DEFAULT
setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5
@@ -546,7 +546,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedex:: @ 81FA2F8
closemessage
applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_RivalApproachPlayer
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
checkplayergender
compare VAR_RESULT, MALE