diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-11 17:19:39 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-11-14 17:29:46 -0600 |
| commit | 0ba591d26f95bd5e98f1e4d6f44848a4347797b4 (patch) | |
| tree | 437a24972f50bc74545dd3974369a0142c6860e8 /data/maps/Route126 | |
| parent | ef8370566f14c22b9927db09b8ff69a98049c796 (diff) | |
Document ocean routes
Diffstat (limited to 'data/maps/Route126')
| -rw-r--r-- | data/maps/Route126/map.json | 16 | ||||
| -rw-r--r-- | data/maps/Route126/scripts.inc | 62 |
2 files changed, 39 insertions, 39 deletions
diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json index b8359bd84..db01091ac 100644 --- a/data/maps/Route126/map.json +++ b/data/maps/Route126/map.json @@ -40,7 +40,7 @@ "movement_range_y": 3, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route126_EventScript_1F68D6", + "script": "Route126_EventScript_Barry", "flag": "0" }, { @@ -53,7 +53,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route126_EventScript_1F68ED", + "script": "Route126_EventScript_Dean", "flag": "0" }, { @@ -66,7 +66,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route126_EventScript_1F6904", + "script": "Route126_EventScript_Nikki", "flag": "0" }, { @@ -79,7 +79,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route126_EventScript_1F691B", + "script": "Route126_EventScript_Brenda", "flag": "0" }, { @@ -105,7 +105,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "7", - "script": "Route126_EventScript_1F6960", + "script": "Route126_EventScript_Sienna", "flag": "0" }, { @@ -118,7 +118,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "7", - "script": "Route126_EventScript_1F6977", + "script": "Route126_EventScript_Pablo", "flag": "0" }, { @@ -131,7 +131,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "7", - "script": "Route126_EventScript_1F6949", + "script": "Route126_EventScript_Isobel", "flag": "0" }, { @@ -144,7 +144,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "7", - "script": "Route126_EventScript_1F6932", + "script": "Route126_EventScript_Leonardo", "flag": "0" } ], diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index d1a2ff0f3..3624cc8a5 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -6,60 +6,60 @@ Route126_OnTransition: @ 81F68CC call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather end -Route126_EventScript_1F68D6:: @ 81F68D6 - trainerbattle_single TRAINER_BARRY, Route126_Text_2A1C95, Route126_Text_2A1CC8 - msgbox Route126_Text_2A1CDD, MSGBOX_AUTOCLOSE +Route126_EventScript_Barry:: @ 81F68D6 + trainerbattle_single TRAINER_BARRY, Route126_Text_BarryIntro, Route126_Text_BarryDefeat + msgbox Route126_Text_BarryPostBattle, MSGBOX_AUTOCLOSE end -Route126_EventScript_1F68ED:: @ 81F68ED - trainerbattle_single TRAINER_DEAN, Route126_Text_2A1D2A, Route126_Text_2A1D63 - msgbox Route126_Text_2A1D72, MSGBOX_AUTOCLOSE +Route126_EventScript_Dean:: @ 81F68ED + trainerbattle_single TRAINER_DEAN, Route126_Text_DeanIntro, Route126_Text_DeanDefeat + msgbox Route126_Text_DeanPostBattle, MSGBOX_AUTOCLOSE end -Route126_EventScript_1F6904:: @ 81F6904 - trainerbattle_single TRAINER_NIKKI, Route126_Text_2A1DAE, Route126_Text_2A1DC8 - msgbox Route126_Text_2A1E03, MSGBOX_AUTOCLOSE +Route126_EventScript_Nikki:: @ 81F6904 + trainerbattle_single TRAINER_NIKKI, Route126_Text_NikkiIntro, Route126_Text_NikkiDefeat + msgbox Route126_Text_NikkiPostBattle, MSGBOX_AUTOCLOSE end -Route126_EventScript_1F691B:: @ 81F691B - trainerbattle_single TRAINER_BRENDA, Route126_Text_2A1E3E, Route126_Text_2A1E63 - msgbox Route126_Text_2A1E70, MSGBOX_AUTOCLOSE +Route126_EventScript_Brenda:: @ 81F691B + trainerbattle_single TRAINER_BRENDA, Route126_Text_BrendaIntro, Route126_Text_BrendaDefeat + msgbox Route126_Text_BrendaPostBattle, MSGBOX_AUTOCLOSE end -Route126_EventScript_1F6932:: @ 81F6932 - trainerbattle_single TRAINER_LEONARDO, Route126_Text_2A2063, Route126_Text_2A20C6 - msgbox Route126_Text_2A20F7, MSGBOX_AUTOCLOSE +Route126_EventScript_Leonardo:: @ 81F6932 + trainerbattle_single TRAINER_LEONARDO, Route126_Text_LeonardoIntro, Route126_Text_LeonardoDefeat + msgbox Route126_Text_LeonardoPostBattle, MSGBOX_AUTOCLOSE end -Route126_EventScript_1F6949:: @ 81F6949 - trainerbattle_single TRAINER_ISOBEL, Route126_Text_2A216A, Route126_Text_2A21A3 - msgbox Route126_Text_2A21B8, MSGBOX_AUTOCLOSE +Route126_EventScript_Isobel:: @ 81F6949 + trainerbattle_single TRAINER_ISOBEL, Route126_Text_IsobelIntro, Route126_Text_IsobelDefeat + msgbox Route126_Text_IsobelPostBattle, MSGBOX_AUTOCLOSE end -Route126_EventScript_1F6960:: @ 81F6960 - trainerbattle_single TRAINER_SIENNA, Route126_Text_2A21EF, Route126_Text_2A2216 - msgbox Route126_Text_2A222A, MSGBOX_AUTOCLOSE +Route126_EventScript_Sienna:: @ 81F6960 + trainerbattle_single TRAINER_SIENNA, Route126_Text_SiennaIntro, Route126_Text_SiennaDefeat + msgbox Route126_Text_SiennaPostBattle, MSGBOX_AUTOCLOSE end -Route126_EventScript_1F6977:: @ 81F6977 - trainerbattle_single TRAINER_PABLO_1, Route126_Text_2A1EA5, Route126_Text_2A1EE3, Route126_EventScript_1F69A3 +Route126_EventScript_Pablo:: @ 81F6977 + trainerbattle_single TRAINER_PABLO_1, Route126_Text_PabloIntro, Route126_Text_PabloDefeat, Route126_EventScript_RegisterPablo specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route126_EventScript_1F69C2 - msgbox Route126_Text_2A1F10, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route126_EventScript_RematchPablo + msgbox Route126_Text_PabloPostBattle, MSGBOX_DEFAULT release end -Route126_EventScript_1F69A3:: @ 81F69A3 +Route126_EventScript_RegisterPablo:: @ 81F69A3 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route126_Text_2A1F5A, MSGBOX_DEFAULT + msgbox Route126_Text_PabloRegister, MSGBOX_DEFAULT register_matchcall TRAINER_PABLO_1 release end -Route126_EventScript_1F69C2:: @ 81F69C2 - trainerbattle_rematch TRAINER_PABLO_1, Route126_Text_2A1F98, Route126_Text_2A1FD8 - msgbox Route126_Text_2A200C, MSGBOX_AUTOCLOSE +Route126_EventScript_RematchPablo:: @ 81F69C2 + trainerbattle_rematch TRAINER_PABLO_1, Route126_Text_PabloRematchIntro, Route126_Text_PabloRematchDefeat + msgbox Route126_Text_PabloPostRematch, MSGBOX_AUTOCLOSE end |
