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/BattleFrontier_BattleTowerBattleRoom2/map.json
+6 -6
View File
@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_VAR_0",
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
"x": 5,
"y": 1,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT"
},
{
"graphics_id": "EVENT_OBJ_GFX_TEALA",
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 1,
"y": 4,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TEALA",
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 1,
"y": 5,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_1",
"graphics_id": "OBJ_EVENT_GFX_VAR_1",
"x": 4,
"y": 1,
"elevation": 3,
@@ -67,7 +67,7 @@
"flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_F",
"graphics_id": "OBJ_EVENT_GFX_VAR_F",
"x": 4,
"y": 8,
"elevation": 3,
@@ -80,7 +80,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_E",
"graphics_id": "OBJ_EVENT_GFX_VAR_E",
"x": 5,
"y": 8,
"elevation": 3,
data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
+3 -3
View File
@@ -17,11 +17,11 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F
checkplayergender
compare VAR_RESULT, FEMALE
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29
setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_BRENDAN_NORMAL
setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_BRENDAN_NORMAL
return
BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29:: @ 8248F29
setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_MAY_NORMAL
setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_MAY_NORMAL
return
BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F:: @ 8248F2F
@@ -33,7 +33,7 @@ BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33: @ 8248F33
.2byte 0
BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D:: @ 8248F3D
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2
end
BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43: @ 8248F43