diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-12 01:57:39 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-11-14 17:41:01 -0600 |
| commit | 525ec2025d754894e2c0c736c396b07af05a7278 (patch) | |
| tree | b7537d1199c1c6a507248a197b64ca3fc70eaaf0 /data/maps/Route115 | |
| parent | 0ba591d26f95bd5e98f1e4d6f44848a4347797b4 (diff) | |
Document Routes 111-118
Diffstat (limited to 'data/maps/Route115')
| -rw-r--r-- | data/maps/Route115/map.json | 26 | ||||
| -rw-r--r-- | data/maps/Route115/scripts.inc | 128 |
2 files changed, 77 insertions, 77 deletions
diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json index 53ce80ce7..c9f1d8833 100644 --- a/data/maps/Route115/map.json +++ b/data/maps/Route115/map.json @@ -35,7 +35,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route115_EventScript_1F2973", + "script": "Route115_EventScript_Woman", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "Route115_EventScript_1F298E", + "script": "Route115_EventScript_Timothy", "flag": "0" }, { @@ -61,7 +61,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route115_EventScript_1F2A07", + "script": "Route115_EventScript_Nob", "flag": "0" }, { @@ -113,7 +113,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route115_EventScript_1F2A69", + "script": "Route115_EventScript_Cyndy", "flag": "0" }, { @@ -126,7 +126,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route115_EventScript_1F29F0", + "script": "Route115_EventScript_Koichi", "flag": "0" }, { @@ -139,7 +139,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route115_EventScript_1F2ACB", + "script": "Route115_EventScript_Hector", "flag": "0" }, { @@ -243,7 +243,7 @@ "movement_range_y": 3, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route115_EventScript_1F2AE2", + "script": "Route115_EventScript_Kyra", "flag": "0" }, { @@ -256,7 +256,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route115_EventScript_1F2AF9", + "script": "Route115_EventScript_Jaiden", "flag": "0" }, { @@ -269,7 +269,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route115_EventScript_1F2B27", + "script": "Route115_EventScript_Helene", "flag": "0" }, { @@ -282,7 +282,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route115_EventScript_1F2B10", + "script": "Route115_EventScript_Alix", "flag": "0" }, { @@ -295,7 +295,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route115_EventScript_1F2B3E", + "script": "Route115_EventScript_Marlene", "flag": "0" }, { @@ -370,7 +370,7 @@ "y": 64, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route115_EventScript_1F297C" + "script": "Route115_EventScript_RouteSignRustboro" }, { "type": "sign", @@ -378,7 +378,7 @@ "y": 38, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route115_EventScript_1F2985" + "script": "Route115_EventScript_MeteorFallsSign" }, { "type": "secret_base", diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 8877f31bd..74d0c6519 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -1,10 +1,10 @@ Route115_MapScripts:: @ 81F2920 - map_script MAP_SCRIPT_ON_LOAD, Route115_MapScript1_1F2930 + map_script MAP_SCRIPT_ON_LOAD, Route115_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, Route115_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route115_MapScript2_1F2969 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route115_OnFrame .byte 0 -Route115_MapScript1_1F2930: @ 81F2930 +Route115_OnLoad: @ 81F2930 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST call_if_eq UnusualWeather_EventScript_PlaceTilesRoute115West compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_EAST @@ -20,134 +20,134 @@ Route115_OnTransition: @ 81F2947 call_if_eq UnusualWeather_StartGroudonWeather end -Route115_MapScript2_1F2969: @ 81F2969 +Route115_OnFrame: @ 81F2969 map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 -Route115_EventScript_1F2973:: @ 81F2973 - msgbox Route115_Text_1F2B55, MSGBOX_NPC +Route115_EventScript_Woman:: @ 81F2973 + msgbox Route115_Text_NeverKnowWhenCavePokemonWillAppear, MSGBOX_NPC end -Route115_EventScript_1F297C:: @ 81F297C - msgbox Route115_Text_1F2BC9, MSGBOX_SIGN +Route115_EventScript_RouteSignRustboro:: @ 81F297C + msgbox Route115_Text_RouteSignRustboro, MSGBOX_SIGN end -Route115_EventScript_1F2985:: @ 81F2985 - msgbox Route115_Text_1F2BE3, MSGBOX_SIGN +Route115_EventScript_MeteorFallsSign:: @ 81F2985 + msgbox Route115_Text_MeteorFallsSign, MSGBOX_SIGN end -Route115_EventScript_1F298E:: @ 81F298E - trainerbattle_single TRAINER_TIMOTHY_1, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA +Route115_EventScript_Timothy:: @ 81F298E + trainerbattle_single TRAINER_TIMOTHY_1, Route115_Text_TimothyIntro, Route115_Text_TimothyDefeat, Route115_EventScript_RegisterTimothy specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route115_EventScript_1F29D9 - msgbox Route115_Text_29B258, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route115_EventScript_RematchTimothy + msgbox Route115_Text_TimothyPostBattle, MSGBOX_DEFAULT release end -Route115_EventScript_1F29BA:: @ 81F29BA +Route115_EventScript_RegisterTimothy:: @ 81F29BA special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route115_Text_29B2B3, MSGBOX_DEFAULT + msgbox Route115_Text_TimothyRegister, MSGBOX_DEFAULT register_matchcall TRAINER_TIMOTHY_1 release end -Route115_EventScript_1F29D9:: @ 81F29D9 - trainerbattle_rematch TRAINER_TIMOTHY_1, Route115_Text_29B32C, Route115_Text_29B372 - msgbox Route115_Text_29B385, MSGBOX_AUTOCLOSE +Route115_EventScript_RematchTimothy:: @ 81F29D9 + trainerbattle_rematch TRAINER_TIMOTHY_1, Route115_Text_TimothyRematchIntro, Route115_Text_TimothyRematchDefeat + msgbox Route115_Text_TimothyPostRematch, MSGBOX_AUTOCLOSE end -Route115_EventScript_1F29F0:: @ 81F29F0 - trainerbattle_single TRAINER_KOICHI, Route115_Text_29B3CC, Route115_Text_29B3ED - msgbox Route115_Text_29B3FF, MSGBOX_AUTOCLOSE +Route115_EventScript_Koichi:: @ 81F29F0 + trainerbattle_single TRAINER_KOICHI, Route115_Text_KoichiIntro, Route115_Text_KoichiDefeat + msgbox Route115_Text_KoichiPostBattle, MSGBOX_AUTOCLOSE end -Route115_EventScript_1F2A07:: @ 81F2A07 - trainerbattle_single TRAINER_NOB_1, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33 +Route115_EventScript_Nob:: @ 81F2A07 + trainerbattle_single TRAINER_NOB_1, Route115_Text_NobIntro, Route115_Text_NobDefeat, Route115_EventScript_RegisterNob specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route115_EventScript_1F2A52 - msgbox Route115_Text_29B49D, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route115_EventScript_RematchNob + msgbox Route115_Text_NobPostBattle, MSGBOX_DEFAULT release end -Route115_EventScript_1F2A33:: @ 81F2A33 +Route115_EventScript_RegisterNob:: @ 81F2A33 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route115_Text_29B50B, MSGBOX_DEFAULT + msgbox Route115_Text_NobRegister, MSGBOX_DEFAULT register_matchcall TRAINER_NOB_1 release end -Route115_EventScript_1F2A52:: @ 81F2A52 - trainerbattle_rematch TRAINER_NOB_1, Route115_Text_29B547, Route115_Text_29B59D - msgbox Route115_Text_29B5B5, MSGBOX_AUTOCLOSE +Route115_EventScript_RematchNob:: @ 81F2A52 + trainerbattle_rematch TRAINER_NOB_1, Route115_Text_NobRematchIntro, Route115_Text_NobRematchDefeat + msgbox Route115_Text_NobPostRematch, MSGBOX_AUTOCLOSE end -Route115_EventScript_1F2A69:: @ 81F2A69 - trainerbattle_single TRAINER_CYNDY_1, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95 +Route115_EventScript_Cyndy:: @ 81F2A69 + trainerbattle_single TRAINER_CYNDY_1, Route115_Text_CyndyIntro, Route115_Text_CyndyDefeat, Route115_EventScript_RegisterCyndy specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route115_EventScript_1F2AB4 - msgbox Route115_Text_29B647, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route115_EventScript_RematchCyndy + msgbox Route115_Text_CyndyPostBattle, MSGBOX_DEFAULT release end -Route115_EventScript_1F2A95:: @ 81F2A95 +Route115_EventScript_RegisterCyndy:: @ 81F2A95 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route115_Text_29B6AB, MSGBOX_DEFAULT + msgbox Route115_Text_CyndyRegister, MSGBOX_DEFAULT register_matchcall TRAINER_CYNDY_1 release end -Route115_EventScript_1F2AB4:: @ 81F2AB4 - trainerbattle_rematch TRAINER_CYNDY_1, Route115_Text_29B6FA, Route115_Text_29B71A - msgbox Route115_Text_29B737, MSGBOX_AUTOCLOSE +Route115_EventScript_RematchCyndy:: @ 81F2AB4 + trainerbattle_rematch TRAINER_CYNDY_1, Route115_Text_CyndyRematchIntro, Route115_Text_CyndyRematchDefeat + msgbox Route115_Text_CyndyPostRematch, MSGBOX_AUTOCLOSE end -Route115_EventScript_1F2ACB:: @ 81F2ACB - trainerbattle_single TRAINER_HECTOR, Route115_Text_29B78F, Route115_Text_29B7C5 - msgbox Route115_Text_29B7EA, MSGBOX_AUTOCLOSE +Route115_EventScript_Hector:: @ 81F2ACB + trainerbattle_single TRAINER_HECTOR, Route115_Text_HectorIntro, Route115_Text_HectorDefeat + msgbox Route115_Text_HectorPostBattle, MSGBOX_AUTOCLOSE end -Route115_EventScript_1F2AE2:: @ 81F2AE2 - trainerbattle_single TRAINER_KYRA, Route115_Text_29B826, Route115_Text_29B85D - msgbox Route115_Text_29B869, MSGBOX_AUTOCLOSE +Route115_EventScript_Kyra:: @ 81F2AE2 + trainerbattle_single TRAINER_KYRA, Route115_Text_KyraIntro, Route115_Text_KyraDefeat + msgbox Route115_Text_KyraPostBattle, MSGBOX_AUTOCLOSE end -Route115_EventScript_1F2AF9:: @ 81F2AF9 - trainerbattle_single TRAINER_JAIDEN, Route115_Text_29B8C1, Route115_Text_29B8E8 - msgbox Route115_Text_29B904, MSGBOX_AUTOCLOSE +Route115_EventScript_Jaiden:: @ 81F2AF9 + trainerbattle_single TRAINER_JAIDEN, Route115_Text_JaidenIntro, Route115_Text_JaidenDefeat + msgbox Route115_Text_JaidenPostBattle, MSGBOX_AUTOCLOSE end -Route115_EventScript_1F2B10:: @ 81F2B10 - trainerbattle_single TRAINER_ALIX, Route115_Text_29B9CB, Route115_Text_29B9F6 - msgbox Route115_Text_29BA04, MSGBOX_AUTOCLOSE +Route115_EventScript_Alix:: @ 81F2B10 + trainerbattle_single TRAINER_ALIX, Route115_Text_AlixIntro, Route115_Text_AlixDefeat + msgbox Route115_Text_AlixPostBattle, MSGBOX_AUTOCLOSE end -Route115_EventScript_1F2B27:: @ 81F2B27 - trainerbattle_single TRAINER_HELENE, Route115_Text_29B92D, Route115_Text_29B958 - msgbox Route115_Text_29B971, MSGBOX_AUTOCLOSE +Route115_EventScript_Helene:: @ 81F2B27 + trainerbattle_single TRAINER_HELENE, Route115_Text_HeleneIntro, Route115_Text_HeleneDefeat + msgbox Route115_Text_HelenePostBattle, MSGBOX_AUTOCLOSE end -Route115_EventScript_1F2B3E:: @ 81F2B3E - trainerbattle_single TRAINER_MARLENE, Route115_Text_29BA2C, Route115_Text_29BA67 - msgbox Route115_Text_29BA87, MSGBOX_AUTOCLOSE +Route115_EventScript_Marlene:: @ 81F2B3E + trainerbattle_single TRAINER_MARLENE, Route115_Text_MarleneIntro, Route115_Text_MarleneDefeat + msgbox Route115_Text_MarlenePostBattle, MSGBOX_AUTOCLOSE end -Route115_Text_1F2B55: @ 81F2B55 +Route115_Text_NeverKnowWhenCavePokemonWillAppear: @ 81F2B55 .string "Exploring a cave isn't like walking\n" .string "on a road.\p" .string "You never know when wild POKéMON will\n" .string "appear. It's full of suspense.$" -Route115_Text_1F2BC9: @ 81F2BC9 +Route115_Text_RouteSignRustboro: @ 81F2BC9 .string "ROUTE 115\n" .string "{DOWN_ARROW} RUSTBORO CITY$" -Route115_Text_1F2BE3: @ 81F2BE3 +Route115_Text_MeteorFallsSign: @ 81F2BE3 .string "METEOR FALLS\n" .string "FALLARBOR TOWN THROUGH HERE$" |
