summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2019-02-07 11:37:28 -0600
committerMarcus Huderle <huderlem@gmail.com>2019-02-07 11:51:03 -0600
commit3a88ab831d2fb57e1f3e0908aeb79395700867d4 (patch)
tree79323a659a2ad1f81645566d434296966e2dad19 /data
parenta1ad1bad3a96222e8575bb2ce4625864593daa73 (diff)
Document more battle pyramid
Diffstat (limited to 'data')
-rw-r--r--data/event_scripts.s2
-rw-r--r--data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc12
-rw-r--r--data/maps/BattlePyramidSquare01/map.json14
-rw-r--r--data/maps/BattlePyramidSquare02/map.json14
-rw-r--r--data/maps/BattlePyramidSquare03/map.json14
-rw-r--r--data/maps/BattlePyramidSquare04/map.json14
-rw-r--r--data/maps/BattlePyramidSquare05/map.json14
-rw-r--r--data/maps/BattlePyramidSquare06/map.json14
-rw-r--r--data/maps/BattlePyramidSquare07/map.json14
-rw-r--r--data/maps/BattlePyramidSquare08/map.json14
-rw-r--r--data/maps/BattlePyramidSquare09/map.json14
-rw-r--r--data/maps/BattlePyramidSquare10/map.json14
-rw-r--r--data/maps/BattlePyramidSquare11/map.json14
-rw-r--r--data/maps/BattlePyramidSquare12/map.json14
-rw-r--r--data/maps/BattlePyramidSquare13/map.json14
-rw-r--r--data/maps/BattlePyramidSquare14/map.json14
-rw-r--r--data/maps/BattlePyramidSquare15/map.json14
-rw-r--r--data/maps/BattlePyramidSquare16/map.json14
18 files changed, 119 insertions, 119 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index fbee3987c..c6ebcd695 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -7498,7 +7498,7 @@ TrainerHill_1F_Movement_2C83EE:: @ 82C83EE
step_end
EventScript_2C83F0:: @ 82C83F0
- trainerbattle TRAINER_BATTLE_12, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D
+ trainerbattle TRAINER_BATTLE_12, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText
setvar VAR_0x8004, 11
special CallTrainerHillFunction
waitmessage
diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
index 459d2adad..43586bba0 100644
--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
@@ -152,8 +152,8 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45
waitstate
end
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F:: @ 8252C4F
- trainerbattle TRAINER_BATTLE_PYRAMID, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D
+BattlePyramid_TrainerBattle:: @ 8252C4F
+ trainerbattle TRAINER_BATTLE_PYRAMID, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText
setvar VAR_0x8004, 10
special CallBattlePyramidFunction
waitmessage
@@ -162,22 +162,22 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F:: @ 8252C4F
releaseall
end
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A:: @ 8252C6A
+BattlePyramid_FindItemBall:: @ 8252C6A
setvar VAR_0x8004, 7
special CallBattlePyramidFunction
callstd STD_FIND_ITEM
compare VAR_0x8007, 0
- goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87
+ goto_if_eq BattlePyramid_FindItemBall_End
setvar VAR_0x8004, 8
special CallBattlePyramidFunction
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87:: @ 8252C87
+BattlePyramid_FindItemBall_End:: @ 8252C87
end
BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88:: @ 8252C88
goto BattleFrontier_BattlePyramidTop_EventScript_252B42
-BattleFrontier_BattlePyramidEmptySquare_Text_252C8D: @ 8252C8D
+BattleFacility_TrainerBattle_PlaceholderText: @ 8252C8D
.string "This is a sample message.$"
gText_BattlePyramidConfirmRest:: @ 8252CA7
diff --git a/data/maps/BattlePyramidSquare01/map.json b/data/maps/BattlePyramidSquare01/map.json
index 38320ece6..57e51307b 100644
--- a/data/maps/BattlePyramidSquare01/map.json
+++ b/data/maps/BattlePyramidSquare01/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
}
],
diff --git a/data/maps/BattlePyramidSquare02/map.json b/data/maps/BattlePyramidSquare02/map.json
index 0dc6f713a..3f3d6ca93 100644
--- a/data/maps/BattlePyramidSquare02/map.json
+++ b/data/maps/BattlePyramidSquare02/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
}
],
diff --git a/data/maps/BattlePyramidSquare03/map.json b/data/maps/BattlePyramidSquare03/map.json
index 4e446e24b..104579553 100644
--- a/data/maps/BattlePyramidSquare03/map.json
+++ b/data/maps/BattlePyramidSquare03/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
}
],
diff --git a/data/maps/BattlePyramidSquare04/map.json b/data/maps/BattlePyramidSquare04/map.json
index 67dfdaa11..153130999 100644
--- a/data/maps/BattlePyramidSquare04/map.json
+++ b/data/maps/BattlePyramidSquare04/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 6,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 6,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
}
],
diff --git a/data/maps/BattlePyramidSquare05/map.json b/data/maps/BattlePyramidSquare05/map.json
index ac8bd5d7d..d08cc103b 100644
--- a/data/maps/BattlePyramidSquare05/map.json
+++ b/data/maps/BattlePyramidSquare05/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
}
],
diff --git a/data/maps/BattlePyramidSquare06/map.json b/data/maps/BattlePyramidSquare06/map.json
index d9fa40ccd..0528d33bd 100644
--- a/data/maps/BattlePyramidSquare06/map.json
+++ b/data/maps/BattlePyramidSquare06/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
}
],
diff --git a/data/maps/BattlePyramidSquare07/map.json b/data/maps/BattlePyramidSquare07/map.json
index a097f60ba..23a4874ea 100644
--- a/data/maps/BattlePyramidSquare07/map.json
+++ b/data/maps/BattlePyramidSquare07/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 6,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
}
],
diff --git a/data/maps/BattlePyramidSquare08/map.json b/data/maps/BattlePyramidSquare08/map.json
index 6939b8a7e..ab7be039c 100644
--- a/data/maps/BattlePyramidSquare08/map.json
+++ b/data/maps/BattlePyramidSquare08/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
}
],
diff --git a/data/maps/BattlePyramidSquare09/map.json b/data/maps/BattlePyramidSquare09/map.json
index 56380e991..1add766dc 100644
--- a/data/maps/BattlePyramidSquare09/map.json
+++ b/data/maps/BattlePyramidSquare09/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
}
],
diff --git a/data/maps/BattlePyramidSquare10/map.json b/data/maps/BattlePyramidSquare10/map.json
index 33534391b..1450e644c 100644
--- a/data/maps/BattlePyramidSquare10/map.json
+++ b/data/maps/BattlePyramidSquare10/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 6,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 7,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
}
],
diff --git a/data/maps/BattlePyramidSquare11/map.json b/data/maps/BattlePyramidSquare11/map.json
index f22855aa2..d4ebaaa2d 100644
--- a/data/maps/BattlePyramidSquare11/map.json
+++ b/data/maps/BattlePyramidSquare11/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
}
],
diff --git a/data/maps/BattlePyramidSquare12/map.json b/data/maps/BattlePyramidSquare12/map.json
index d8e0d45a9..29063c950 100644
--- a/data/maps/BattlePyramidSquare12/map.json
+++ b/data/maps/BattlePyramidSquare12/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 7,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 7,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 6,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
}
],
diff --git a/data/maps/BattlePyramidSquare13/map.json b/data/maps/BattlePyramidSquare13/map.json
index 880178e0e..71fb71e5d 100644
--- a/data/maps/BattlePyramidSquare13/map.json
+++ b/data/maps/BattlePyramidSquare13/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 6,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 6,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 6,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 6,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
}
],
diff --git a/data/maps/BattlePyramidSquare14/map.json b/data/maps/BattlePyramidSquare14/map.json
index 423346532..3398dcd47 100644
--- a/data/maps/BattlePyramidSquare14/map.json
+++ b/data/maps/BattlePyramidSquare14/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 7,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 6,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 6,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 7,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
}
],
diff --git a/data/maps/BattlePyramidSquare15/map.json b/data/maps/BattlePyramidSquare15/map.json
index 12b1f4cb8..0eb433ae1 100644
--- a/data/maps/BattlePyramidSquare15/map.json
+++ b/data/maps/BattlePyramidSquare15/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 6,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
}
],
diff --git a/data/maps/BattlePyramidSquare16/map.json b/data/maps/BattlePyramidSquare16/map.json
index 65fa0a361..e6827e1a3 100644
--- a/data/maps/BattlePyramidSquare16/map.json
+++ b/data/maps/BattlePyramidSquare16/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 6,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 6,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 6,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 6,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+ "script": "BattlePyramid_TrainerBattle",
"flag": "0"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+ "script": "BattlePyramid_FindItemBall",
"flag": "0"
}
],