summaryrefslogtreecommitdiff
path: root/data/maps/Route132
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-11-11 17:19:39 -0500
committerhuderlem <huderlem@gmail.com>2019-11-14 17:29:46 -0600
commit0ba591d26f95bd5e98f1e4d6f44848a4347797b4 (patch)
tree437a24972f50bc74545dd3974369a0142c6860e8 /data/maps/Route132
parentef8370566f14c22b9927db09b8ff69a98049c796 (diff)
Document ocean routes
Diffstat (limited to 'data/maps/Route132')
-rw-r--r--data/maps/Route132/map.json16
-rw-r--r--data/maps/Route132/scripts.inc48
2 files changed, 32 insertions, 32 deletions
diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json
index 8a7597826..947f8d9cf 100644
--- a/data/maps/Route132/map.json
+++ b/data/maps/Route132/map.json
@@ -35,7 +35,7 @@
"movement_range_y": 3,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
- "script": "Route132_EventScript_1F74EA",
+ "script": "Route132_EventScript_Gilbert",
"flag": "0"
},
{
@@ -48,7 +48,7 @@
"movement_range_y": 3,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
- "script": "Route132_EventScript_1F7501",
+ "script": "Route132_EventScript_Dana",
"flag": "0"
},
{
@@ -74,7 +74,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4",
- "script": "Route132_EventScript_1F752F",
+ "script": "Route132_EventScript_Kiyo",
"flag": "0"
},
{
@@ -87,7 +87,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
- "script": "Route132_EventScript_1F7518",
+ "script": "Route132_EventScript_Ronald",
"flag": "0"
},
{
@@ -100,7 +100,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4",
- "script": "Route132_EventScript_1F7546",
+ "script": "Route132_EventScript_Paxton",
"flag": "0"
},
{
@@ -113,7 +113,7 @@
"movement_range_y": 4,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4",
- "script": "Route132_EventScript_1F755D",
+ "script": "Route132_EventScript_Darcy",
"flag": "0"
},
{
@@ -126,7 +126,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4",
- "script": "Route132_EventScript_1F758B",
+ "script": "Route132_EventScript_Makayla",
"flag": "0"
},
{
@@ -139,7 +139,7 @@
"movement_range_y": 4,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4",
- "script": "Route132_EventScript_1F7574",
+ "script": "Route132_EventScript_Jonathan",
"flag": "0"
},
{
diff --git a/data/maps/Route132/scripts.inc b/data/maps/Route132/scripts.inc
index aed4d0673..6b82102be 100644
--- a/data/maps/Route132/scripts.inc
+++ b/data/maps/Route132/scripts.inc
@@ -1,43 +1,43 @@
Route132_MapScripts:: @ 81F74E9
.byte 0
-Route132_EventScript_1F74EA:: @ 81F74EA
- trainerbattle_single TRAINER_GILBERT, Route132_Text_2A3B4C, Route132_Text_2A3BAC
- msgbox Route132_Text_2A3BC0, MSGBOX_AUTOCLOSE
+Route132_EventScript_Gilbert:: @ 81F74EA
+ trainerbattle_single TRAINER_GILBERT, Route132_Text_GilbertIntro, Route132_Text_GilbertDefeat
+ msgbox Route132_Text_GilbertPostBattle, MSGBOX_AUTOCLOSE
end
-Route132_EventScript_1F7501:: @ 81F7501
- trainerbattle_single TRAINER_DANA, Route132_Text_2A3C04, Route132_Text_2A3C39
- msgbox Route132_Text_2A3C49, MSGBOX_AUTOCLOSE
+Route132_EventScript_Dana:: @ 81F7501
+ trainerbattle_single TRAINER_DANA, Route132_Text_DanaIntro, Route132_Text_DanaDefeat
+ msgbox Route132_Text_DanaPostBattle, MSGBOX_AUTOCLOSE
end
-Route132_EventScript_1F7518:: @ 81F7518
- trainerbattle_single TRAINER_RONALD, Route132_Text_2A3C7F, Route132_Text_2A3CAD
- msgbox Route132_Text_2A3CC5, MSGBOX_AUTOCLOSE
+Route132_EventScript_Ronald:: @ 81F7518
+ trainerbattle_single TRAINER_RONALD, Route132_Text_RonaldIntro, Route132_Text_RonaldDefeat
+ msgbox Route132_Text_RonaldPostBattle, MSGBOX_AUTOCLOSE
end
-Route132_EventScript_1F752F:: @ 81F752F
- trainerbattle_single TRAINER_KIYO, Route132_Text_2A3D26, Route132_Text_2A3D6C
- msgbox Route132_Text_2A3D8B, MSGBOX_AUTOCLOSE
+Route132_EventScript_Kiyo:: @ 81F752F
+ trainerbattle_single TRAINER_KIYO, Route132_Text_KiyoIntro, Route132_Text_KiyoDefeat
+ msgbox Route132_Text_KiyoPostBattle, MSGBOX_AUTOCLOSE
end
-Route132_EventScript_1F7546:: @ 81F7546
- trainerbattle_single TRAINER_PAXTON, Route132_Text_2A3F4F, Route132_Text_2A3FA8
- msgbox Route132_Text_2A3FE5, MSGBOX_AUTOCLOSE
+Route132_EventScript_Paxton:: @ 81F7546
+ trainerbattle_single TRAINER_PAXTON, Route132_Text_PaxtonIntro, Route132_Text_PaxtonDefeat
+ msgbox Route132_Text_PaxtonPostBattle, MSGBOX_AUTOCLOSE
end
-Route132_EventScript_1F755D:: @ 81F755D
- trainerbattle_single TRAINER_DARCY, Route132_Text_2A4026, Route132_Text_2A406E
- msgbox Route132_Text_2A40A4, MSGBOX_AUTOCLOSE
+Route132_EventScript_Darcy:: @ 81F755D
+ trainerbattle_single TRAINER_DARCY, Route132_Text_DarcyIntro, Route132_Text_DarcyDefeat
+ msgbox Route132_Text_DarcyPostBattle, MSGBOX_AUTOCLOSE
end
-Route132_EventScript_1F7574:: @ 81F7574
- trainerbattle_single TRAINER_JONATHAN, Route132_Text_2A3EAC, Route132_Text_2A3EDD
- msgbox Route132_Text_2A3F03, MSGBOX_AUTOCLOSE
+Route132_EventScript_Jonathan:: @ 81F7574
+ trainerbattle_single TRAINER_JONATHAN, Route132_Text_JonathanIntro, Route132_Text_JonathanDefeat
+ msgbox Route132_Text_JonathanPostBattle, MSGBOX_AUTOCLOSE
end
-Route132_EventScript_1F758B:: @ 81F758B
- trainerbattle_single TRAINER_MAKAYLA, Route132_Text_2A3DF0, Route132_Text_2A3E2C
- msgbox Route132_Text_2A3E4E, MSGBOX_AUTOCLOSE
+Route132_EventScript_Makayla:: @ 81F758B
+ trainerbattle_single TRAINER_MAKAYLA, Route132_Text_MakaylaIntro, Route132_Text_MakaylaDefeat
+ msgbox Route132_Text_MakaylaPostBattle, MSGBOX_AUTOCLOSE
end