summaryrefslogtreecommitdiff
path: root/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-12-11 01:09:06 -0500
committerGitHub <noreply@github.com>2019-12-11 01:09:06 -0500
commit6556b556dd624964f53d76ff546589e6688412eb (patch)
treeb2e0049af7ebf824a8d264818ce3884ff6074396 /data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json
parent8da7a94423b11f52a1e9ea74df3ec0e6f16e96d0 (diff)
parent49f1a90534180445d293761e2bdac165b49319a2 (diff)
Merge branch 'master' into fix-eventobj
Diffstat (limited to 'data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json')
-rw-r--r--data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json
index ca84f402b..7fd2e1c88 100644
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908",
+ "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_Attendant",
"flag": "0"
},
{
@@ -77,7 +77,7 @@
"elevation": 0,
"var": "VAR_TEMP_3",
"var_value": "1",
- "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D"
+ "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_NoTurningBack"
},
{
"type": "trigger",
@@ -86,7 +86,7 @@
"elevation": 0,
"var": "VAR_TEMP_3",
"var_value": "1",
- "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D"
+ "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_NoTurningBack"
},
{
"type": "trigger",
@@ -95,7 +95,7 @@
"elevation": 3,
"var": "VAR_TEMP_2",
"var_value": "0",
- "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062"
+ "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_SetEnteredRoom"
},
{
"type": "trigger",
@@ -104,7 +104,7 @@
"elevation": 3,
"var": "VAR_TEMP_2",
"var_value": "0",
- "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062"
+ "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_SetEnteredRoom"
},
{
"type": "trigger",
@@ -113,7 +113,7 @@
"elevation": 3,
"var": "VAR_TEMP_2",
"var_value": "0",
- "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062"
+ "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_SetEnteredRoom"
},
{
"type": "trigger",
@@ -122,7 +122,7 @@
"elevation": 0,
"var": "VAR_TEMP_3",
"var_value": "1",
- "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D"
+ "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_NoTurningBack"
}
],
"bg_events": []