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 | |
| parent | 0ba591d26f95bd5e98f1e4d6f44848a4347797b4 (diff) | |
Document Routes 111-118
24 files changed, 1427 insertions, 1420 deletions
diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index de28aa251..dca3dc47d 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -1,13 +1,13 @@ Route101_MapScripts:: @ 81EBCBA map_script MAP_SCRIPT_ON_TRANSITION, Route101_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route101_MapScript2_1EBCCB + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route101_OnFrame .byte 0 Route101_OnTransition: @ 81EBCC5 call ProfBirch_EventScript_UpdateLocation end -Route101_MapScript2_1EBCCB: @ 81EBCCB +Route101_OnFrame: @ 81EBCCB map_script_2 VAR_ROUTE101_STATE, 0, Route101_EventScript_HideMapNamePopup .2byte 0 diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 0a8b6eafc..bccc903f1 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -309,11 +309,11 @@ Route110_EventScript_CyclingChallengeEnd:: @ 81EF661 lockall applymovement 21, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - call Route110_EventScript_1EF673 + call Route110_EventScript_CyclingChallengeResults releaseall end -Route110_EventScript_1EF673:: @ 81EF673 +Route110_EventScript_CyclingChallengeResults:: @ 81EF673 special FinishCyclingRoadChallenge msgbox Route110_Text_CyclingChallengeResultSummary, MSGBOX_DEFAULT switch VAR_RESULT diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index 37c70e351..5770ab0c0 100644 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -40,7 +40,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_1F0FC5", + "script": "Route111_EventScript_Victor", "flag": "FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE" }, { @@ -92,7 +92,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route111_EventScript_1F121B", + "script": "Route111_EventScript_Heidi", "flag": "0" }, { @@ -131,7 +131,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_1F1189", + "script": "Route111_EventScript_Man1", "flag": "0" }, { @@ -144,7 +144,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route111_EventScript_1F1204", + "script": "Route111_EventScript_Drew", "flag": "0" }, { @@ -157,7 +157,7 @@ "movement_range_y": 2, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route111_EventScript_1F1260", + "script": "Route111_EventScript_Dusty", "flag": "0" }, { @@ -170,7 +170,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route111_EventScript_1F1232", + "script": "Route111_EventScript_Beau", "flag": "0" }, { @@ -183,7 +183,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route111_EventScript_1F1249", + "script": "Route111_EventScript_Becky", "flag": "0" }, { @@ -248,7 +248,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_1F0EB9", + "script": "Route111_EventScript_Girl", "flag": "0" }, { @@ -391,7 +391,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route111_EventScript_1F12D9", + "script": "Route111_EventScript_Irene", "flag": "0" }, { @@ -404,7 +404,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route111_EventScript_1F12C2", + "script": "Route111_EventScript_Travis", "flag": "0" }, { @@ -417,7 +417,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route111_EventScript_1F12F0", + "script": "Route111_EventScript_Daisuke", "flag": "0" }, { @@ -430,7 +430,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route111_EventScript_1F1369", + "script": "Route111_EventScript_Brooke", "flag": "0" }, { @@ -443,7 +443,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route111_EventScript_1F1307", + "script": "Route111_EventScript_Wilton", "flag": "0" }, { @@ -469,7 +469,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_1F1192", + "script": "Route111_EventScript_Man2", "flag": "0" }, { @@ -482,7 +482,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route111_EventScript_1F13F9", + "script": "Route111_EventScript_Tyron", "flag": "0" }, { @@ -495,7 +495,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route111_EventScript_1F1410", + "script": "Route111_EventScript_Celina", "flag": "0" }, { @@ -508,7 +508,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route111_EventScript_1F13E2", + "script": "Route111_EventScript_Bianca", "flag": "0" }, { @@ -521,7 +521,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route111_EventScript_1F13CB", + "script": "Route111_EventScript_Hayden", "flag": "0" }, { @@ -534,7 +534,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "7", - "script": "Route111_EventScript_1F143E", + "script": "Route111_EventScript_Bryan", "flag": "0" }, { @@ -547,7 +547,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "Route111_EventScript_1F1427", + "script": "Route111_EventScript_Celia", "flag": "0" }, { @@ -560,7 +560,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "7", - "script": "Route111_EventScript_1F1455", + "script": "Route111_EventScript_Branden", "flag": "0" }, { @@ -586,7 +586,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_1F119B", + "script": "Route111_EventScript_Hiker", "flag": "0" }, { @@ -625,7 +625,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_1F11E4", + "script": "Route111_EventScript_RockSmashTipFatMan", "flag": "FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY" } ], @@ -674,7 +674,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FBD" + "script": "Route111_EventScript_SandstormTrigger" }, { "type": "trigger", @@ -683,7 +683,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route111_EventScript_1F0F0A" + "script": "Route111_EventScript_ViciousSandstormTriggerDown" }, { "type": "trigger", @@ -692,7 +692,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route111_EventScript_1F0F0A" + "script": "Route111_EventScript_ViciousSandstormTriggerDown" }, { "type": "trigger", @@ -701,7 +701,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route111_EventScript_1F0F0A" + "script": "Route111_EventScript_ViciousSandstormTriggerDown" }, { "type": "trigger", @@ -710,7 +710,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FB0" + "script": "Route111_EventScript_SunTrigger" }, { "type": "trigger", @@ -719,7 +719,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route111_EventScript_1F0F16" + "script": "Route111_EventScript_ViciousSandstormTriggerLeft" }, { "type": "trigger", @@ -728,7 +728,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route111_EventScript_1F0F16" + "script": "Route111_EventScript_ViciousSandstormTriggerLeft" }, { "type": "trigger", @@ -737,7 +737,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route111_EventScript_1F0F16" + "script": "Route111_EventScript_ViciousSandstormTriggerLeft" }, { "type": "trigger", @@ -746,7 +746,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route111_EventScript_1F0F16" + "script": "Route111_EventScript_ViciousSandstormTriggerLeft" }, { "type": "trigger", @@ -755,7 +755,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route111_EventScript_1F0F0A" + "script": "Route111_EventScript_ViciousSandstormTriggerDown" }, { "type": "trigger", @@ -764,7 +764,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FB0" + "script": "Route111_EventScript_SunTrigger" }, { "type": "trigger", @@ -773,7 +773,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FB0" + "script": "Route111_EventScript_SunTrigger" }, { "type": "trigger", @@ -782,7 +782,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FB0" + "script": "Route111_EventScript_SunTrigger" }, { "type": "trigger", @@ -791,7 +791,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FB0" + "script": "Route111_EventScript_SunTrigger" }, { "type": "trigger", @@ -800,7 +800,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route111_EventScript_1F0F16" + "script": "Route111_EventScript_ViciousSandstormTriggerLeft" }, { "type": "trigger", @@ -809,7 +809,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route111_EventScript_1F0F16" + "script": "Route111_EventScript_ViciousSandstormTriggerLeft" }, { "type": "trigger", @@ -818,7 +818,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FB0" + "script": "Route111_EventScript_SunTrigger" }, { "type": "trigger", @@ -827,7 +827,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FB0" + "script": "Route111_EventScript_SunTrigger" }, { "type": "trigger", @@ -836,7 +836,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FB0" + "script": "Route111_EventScript_SunTrigger" }, { "type": "trigger", @@ -845,7 +845,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FB0" + "script": "Route111_EventScript_SunTrigger" }, { "type": "trigger", @@ -854,7 +854,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FB0" + "script": "Route111_EventScript_SunTrigger" }, { "type": "trigger", @@ -863,7 +863,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FB0" + "script": "Route111_EventScript_SunTrigger" }, { "type": "trigger", @@ -872,7 +872,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FB0" + "script": "Route111_EventScript_SunTrigger" }, { "type": "trigger", @@ -881,7 +881,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FBD" + "script": "Route111_EventScript_SandstormTrigger" }, { "type": "trigger", @@ -890,7 +890,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FBD" + "script": "Route111_EventScript_SandstormTrigger" }, { "type": "trigger", @@ -899,7 +899,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FBD" + "script": "Route111_EventScript_SandstormTrigger" }, { "type": "trigger", @@ -908,7 +908,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FBD" + "script": "Route111_EventScript_SandstormTrigger" }, { "type": "trigger", @@ -917,7 +917,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FBD" + "script": "Route111_EventScript_SandstormTrigger" }, { "type": "trigger", @@ -926,7 +926,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FBD" + "script": "Route111_EventScript_SandstormTrigger" }, { "type": "trigger", @@ -935,7 +935,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FBD" + "script": "Route111_EventScript_SandstormTrigger" }, { "type": "trigger", @@ -944,7 +944,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FBD" + "script": "Route111_EventScript_SandstormTrigger" }, { "type": "trigger", @@ -953,7 +953,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FBD" + "script": "Route111_EventScript_SandstormTrigger" }, { "type": "trigger", @@ -962,7 +962,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FBD" + "script": "Route111_EventScript_SandstormTrigger" }, { "type": "trigger", @@ -971,7 +971,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FBD" + "script": "Route111_EventScript_SandstormTrigger" } ], "bg_events": [ @@ -981,7 +981,7 @@ "y": 114, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route111_EventScript_1F115C" + "script": "Route111_EventScript_WinstrateHouseSign" }, { "type": "sign", @@ -989,7 +989,7 @@ "y": 126, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route111_EventScript_1F1153" + "script": "Route111_EventScript_RouteSignMauville" }, { "type": "sign", @@ -997,7 +997,7 @@ "y": 66, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route111_EventScript_1F1165" + "script": "Route111_EventScript_RouteSign112" }, { "type": "sign", @@ -1005,7 +1005,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route111_EventScript_1F116E" + "script": "Route111_EventScript_RouteSign113" }, { "type": "secret_base", @@ -1034,7 +1034,7 @@ "y": 19, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route111_EventScript_1F1177" + "script": "Route111_EventScript_OldLadysRestStopSign" }, { "type": "secret_base", @@ -1071,7 +1071,7 @@ "y": 84, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route111_EventScript_1F1180" + "script": "Route111_EventScript_TrainerTipsSpAtkSpDef" }, { "type": "secret_base", @@ -1109,7 +1109,7 @@ "y": 116, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route111_EventScript_1F146C" + "script": "Route111_EventScript_TrainerHillSign" } ] }
\ No newline at end of file diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 91d13e88c..b80ef6b84 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -1,22 +1,23 @@ Route111_MapScripts:: @ 81F0CA7 - map_script MAP_SCRIPT_ON_LOAD, Route111_MapScript1_1F0CBC + map_script MAP_SCRIPT_ON_LOAD, Route111_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, Route111_OnTransition - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route111_MapScript2_1F0E46 - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route111_MapScript2_1F0E56 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route111_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route111_OnFrame .byte 0 -Route111_MapScript1_1F0CBC: @ 81F0CBC - call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_1F0CD1 +Route111_OnLoad: @ 81F0CBC + call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_CloseDesertRuins compare VAR_MIRAGE_TOWER_STATE, 1 - call_if_eq Route111_EventScript_1F0CE4 + call_if_eq Route111_EventScript_ShowTemporaryMirageTower end -Route111_EventScript_1F0CD1:: @ 81F0CD1 +Route111_EventScript_CloseDesertRuins:: @ 81F0CD1 setmetatile 29, 86, METATILE_General_RockWall_RockBase, 1 setmetatile 29, 87, METATILE_General_RockWall_SandBase, 1 return -Route111_EventScript_1F0CE4:: @ 81F0CE4 +@ Show Mirage Tower just prior to disintegration. Mirage Tower is otherwise handled by the map layout +Route111_EventScript_ShowTemporaryMirageTower:: @ 81F0CE4 setmetatile 18, 53, METATILE_Mauville_MirageTower_Tile0, 0 setmetatile 19, 53, METATILE_Mauville_MirageTower_Tile1, 0 setmetatile 20, 53, METATILE_Mauville_MirageTower_Tile2, 0 @@ -40,53 +41,51 @@ Route111_EventScript_1F0CE4:: @ 81F0CE4 Route111_OnTransition: @ 81F0D87 setvar VAR_TRAINER_HILL_IS_ACTIVE, 0 special SetMirageTowerVisibility - call_if_unset FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F0E3C + call_if_unset FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_SetLayoutNoMirageTower compare VAR_MIRAGE_TOWER_STATE, 1 - call_if_eq Route111_EventScript_1F0DC2 + call_if_eq Route111_EventScript_SetFallingPlayerGfx compare VAR_MIRAGE_TOWER_STATE, 2 - call_if_eq Route111_EventScript_1F0E40 - call Route111_EventScript_1F0DE6 + call_if_eq Route111_EventScript_SetMirageTowerGone + call Route111_EventScript_CheckSetSandstorm call GabbyAndTy_EventScript_UpdateLocation checktrainerflag TRAINER_VICKY - goto_if_lt Route111_EventScript_1F0E26 + goto_if_lt Route111_EventScript_SetWinstratesNotDefeated end -Route111_EventScript_1F0DC2:: @ 81F0DC2 +Route111_EventScript_SetFallingPlayerGfx:: @ 81F0DC2 checkplayergender compare VAR_RESULT, MALE - goto_if_eq Route111_EventScript_1F0DDA + goto_if_eq Route111_EventScript_SetFallingPlayerGfxMale compare VAR_RESULT, FEMALE - goto_if_eq Route111_EventScript_1F0DE0 + goto_if_eq Route111_EventScript_SetFallingPlayerGfxFemale return -Route111_EventScript_1F0DDA:: @ 81F0DDA +Route111_EventScript_SetFallingPlayerGfxMale:: @ 81F0DDA setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL return -Route111_EventScript_1F0DE0:: @ 81F0DE0 +Route111_EventScript_SetFallingPlayerGfxFemale:: @ 81F0DE0 setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL return -Route111_EventScript_1F0DE6:: @ 81F0DE6 +Route111_EventScript_CheckSetSandstorm:: @ 81F0DE6 getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_1, 34 - goto_if_lt Route111_EventScript_1F0E25 + goto_if_lt Route111_EventScript_EndCheckSetSandstorm compare VAR_TEMP_1, 107 - goto_if_gt Route111_EventScript_1F0E25 + goto_if_gt Route111_EventScript_EndCheckSetSandstorm compare VAR_TEMP_1, 72 - goto_if_gt Route111_EventScript_1F0E22 + goto_if_gt Route111_EventScript_SetSandstorm compare VAR_TEMP_0, 2000 - goto_if_gt Route111_EventScript_1F0E25 + goto_if_gt Route111_EventScript_EndCheckSetSandstorm compare VAR_TEMP_0, 8 - goto_if_lt Route111_EventScript_1F0E25 - -Route111_EventScript_1F0E22:: @ 81F0E22 + goto_if_lt Route111_EventScript_EndCheckSetSandstorm +Route111_EventScript_SetSandstorm:: @ 81F0E22 setweather WEATHER_SANDSTORM - -Route111_EventScript_1F0E25:: @ 81F0E25 +Route111_EventScript_EndCheckSetSandstorm:: @ 81F0E25 return -Route111_EventScript_1F0E26:: @ 81F0E26 +Route111_EventScript_SetWinstratesNotDefeated:: @ 81F0E26 clearflag FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE setflag FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE setflag FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE @@ -96,27 +95,27 @@ Route111_EventScript_1F0E26:: @ 81F0E26 cleartrainerflag TRAINER_VIVI end -Route111_EventScript_1F0E3C:: @ 81F0E3C +Route111_EventScript_SetLayoutNoMirageTower:: @ 81F0E3C setmaplayoutindex LAYOUT_ROUTE111_NO_MIRAGE_TOWER return -Route111_EventScript_1F0E40:: @ 81F0E40 +Route111_EventScript_SetMirageTowerGone:: @ 81F0E40 setvar VAR_MIRAGE_TOWER_STATE, 3 return -Route111_MapScript2_1F0E46: @ 81F0E46 - map_script_2 VAR_MIRAGE_TOWER_STATE, 1, Route111_EventScript_1F0E50 +Route111_OnWarp: @ 81F0E46 + map_script_2 VAR_MIRAGE_TOWER_STATE, 1, Route111_EventScript_HidePlayerForMirageTower .2byte 0 -Route111_EventScript_1F0E50:: @ 81F0E50 +Route111_EventScript_HidePlayerForMirageTower:: @ 81F0E50 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN end -Route111_MapScript2_1F0E56: @ 81F0E56 - map_script_2 VAR_MIRAGE_TOWER_STATE, 1, Route111_EventScript_1F0E60 +Route111_OnFrame: @ 81F0E56 + map_script_2 VAR_MIRAGE_TOWER_STATE, 1, Route111_EventScript_MirageTowerDisappear .2byte 0 -Route111_EventScript_1F0E60:: @ 81F0E60 +Route111_EventScript_MirageTowerDisappear:: @ 81F0E60 lockall special StartMirageTowerShake waitstate @@ -136,17 +135,18 @@ Route111_EventScript_1F0E60:: @ 81F0E60 waitstate setvar VAR_MIRAGE_TOWER_STATE, 2 clearflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL - goto_if_set FLAG_CHOSE_CLAW_FOSSIL, Route111_EventScript_1F0EA7 - msgbox Route111_Text_1F1C74, MSGBOX_DEFAULT + goto_if_set FLAG_CHOSE_CLAW_FOSSIL, Route111_EventScript_RootFossilDisappeared + msgbox Route111_Text_ClawFossilDisappeared, MSGBOX_DEFAULT releaseall end -Route111_EventScript_1F0EA7:: @ 81F0EA7 - msgbox Route111_Text_1F1C9F, MSGBOX_DEFAULT +Route111_EventScript_RootFossilDisappeared:: @ 81F0EA7 + msgbox Route111_Text_RootFossilDisappeared, MSGBOX_DEFAULT releaseall end -Route111_Movement_1F0EB1:: @ 81F0EB1 +@ Unused +Route111_Movement_PlayerFall:: @ 81F0EB1 store_lock_anim walk_fast_down walk_fast_down @@ -156,498 +156,500 @@ Route111_Movement_1F0EB1:: @ 81F0EB1 walk_fast_down step_end -Route111_EventScript_1F0EB9:: @ 81F0EB9 +Route111_EventScript_Girl:: @ 81F0EB9 lock faceplayer dotimebasedevents - goto_if_set FLAG_DAILY_ROUTE_111_RECEIVED_BERRY, Route111_EventScript_1F0EF4 - msgbox Route111_Text_2A6EBD, MSGBOX_DEFAULT + goto_if_set FLAG_DAILY_ROUTE_111_RECEIVED_BERRY, Route111_EventScript_ReceivedBerry + msgbox Route111_Text_WateredPlantsEveryDayTakeBerry, MSGBOX_DEFAULT giveitem_std ITEM_RAZZ_BERRY - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_ROUTE_111_RECEIVED_BERRY special GetPlayerBigGuyGirlString - msgbox Route111_Text_2A6F3D, MSGBOX_DEFAULT + msgbox Route111_Text_GoingToTryToMakeDifferentColorBerries, MSGBOX_DEFAULT release end -Route111_EventScript_1F0EF4:: @ 81F0EF4 - msgbox Route111_Text_2A6F9A, MSGBOX_DEFAULT +Route111_EventScript_ReceivedBerry:: @ 81F0EF4 + msgbox Route111_Text_WhatColorBerriesToLookForToday, MSGBOX_DEFAULT release end -Route111_EventScript_1F0EFE:: @ 81F0EFE +@ Unused +Route111_EventScript_ViciousSandstormTriggerUp:: @ 81F0EFE lockall setvar VAR_0x8004, 0 - goto Route111_EventScript_1F0F2E + goto Route111_EventScript_ViciousSandstormTrigger end -Route111_EventScript_1F0F0A:: @ 81F0F0A +Route111_EventScript_ViciousSandstormTriggerDown:: @ 81F0F0A lockall setvar VAR_0x8004, 1 - goto Route111_EventScript_1F0F2E + goto Route111_EventScript_ViciousSandstormTrigger end -Route111_EventScript_1F0F16:: @ 81F0F16 +Route111_EventScript_ViciousSandstormTriggerLeft:: @ 81F0F16 lockall setvar VAR_0x8004, 2 - goto Route111_EventScript_1F0F2E + goto Route111_EventScript_ViciousSandstormTrigger end -Route111_EventScript_1F0F22:: @ 81F0F22 +@ Unused +Route111_EventScript_ViciousSandstormTriggerRight:: @ 81F0F22 lockall setvar VAR_0x8004, 3 - goto Route111_EventScript_1F0F2E + goto Route111_EventScript_ViciousSandstormTrigger end -Route111_EventScript_1F0F2E:: @ 81F0F2E +Route111_EventScript_ViciousSandstormTrigger:: @ 81F0F2E checkitem ITEM_GO_GOGGLES, 1 - compare VAR_RESULT, 0 - goto_if_eq Route111_EventScript_1F0F45 + compare VAR_RESULT, FALSE + goto_if_eq Route111_EventScript_PreventRouteAccess setvar VAR_TEMP_3, 1 releaseall end -Route111_EventScript_1F0F45:: @ 81F0F45 +Route111_EventScript_PreventRouteAccess:: @ 81F0F45 msgbox gText_SandstormIsVicious, MSGBOX_DEFAULT closemessage compare VAR_0x8004, 0 - call_if_eq Route111_EventScript_1F0F7C + call_if_eq Route111_EventScript_PushUpFromRoute compare VAR_0x8004, 1 - call_if_eq Route111_EventScript_1F0F87 + call_if_eq Route111_EventScript_PushDownFromRoute compare VAR_0x8004, 2 - call_if_eq Route111_EventScript_1F0F92 + call_if_eq Route111_EventScript_PushLeftFromRoute compare VAR_0x8004, 3 - call_if_eq Route111_EventScript_1F0F9D + call_if_eq Route111_EventScript_PushRightFromRoute releaseall end -Route111_EventScript_1F0F7C:: @ 81F0F7C - applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F0FA8 +Route111_EventScript_PushUpFromRoute:: @ 81F0F7C + applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_PushUpFromRoute waitmovement 0 return -Route111_EventScript_1F0F87:: @ 81F0F87 - applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F0FAA +Route111_EventScript_PushDownFromRoute:: @ 81F0F87 + applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_PushDownFromRoute waitmovement 0 return -Route111_EventScript_1F0F92:: @ 81F0F92 - applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F0FAC +Route111_EventScript_PushLeftFromRoute:: @ 81F0F92 + applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_PushLeftFromRoute waitmovement 0 return -Route111_EventScript_1F0F9D:: @ 81F0F9D - applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F0FAE +Route111_EventScript_PushRightFromRoute:: @ 81F0F9D + applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_PushRightFromRoute waitmovement 0 return -Route111_Movement_1F0FA8: @ 81F0FA8 +Route111_Movement_PushUpFromRoute: @ 81F0FA8 walk_up step_end -Route111_Movement_1F0FAA: @ 81F0FAA +Route111_Movement_PushDownFromRoute: @ 81F0FAA walk_down step_end -Route111_Movement_1F0FAC: @ 81F0FAC +Route111_Movement_PushLeftFromRoute: @ 81F0FAC walk_left step_end -Route111_Movement_1F0FAE: @ 81F0FAE +Route111_Movement_PushRightFromRoute: @ 81F0FAE walk_right step_end -Route111_EventScript_1F0FB0:: @ 81F0FB0 +Route111_EventScript_SunTrigger:: @ 81F0FB0 setweather WEATHER_SUNNY fadenewbgm MUS_DOORO_X1 doweather setvar VAR_TEMP_3, 0 end -Route111_EventScript_1F0FBD:: @ 81F0FBD +Route111_EventScript_SandstormTrigger:: @ 81F0FBD setweather WEATHER_SANDSTORM fadenewbgm MUS_ASHROAD doweather end -Route111_EventScript_1F0FC5:: @ 81F0FC5 +Route111_EventScript_Victor:: @ 81F0FC5 lock faceplayer setflag FLAG_LANDMARK_WINSTRATE_FAMILY - msgbox Route111_Text_1F1475, MSGBOX_YESNO + msgbox Route111_Text_BattleOurFamily, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq Route111_EventScript_1F0FE7 - msgbox Route111_Text_1F14F5, MSGBOX_DEFAULT + goto_if_eq Route111_EventScript_BattleWinstrates + msgbox Route111_Text_IsThatSo, MSGBOX_DEFAULT release end -Route111_EventScript_1F0FE7:: @ 81F0FE7 - msgbox Route111_Text_1F1523, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_1F1542 +Route111_EventScript_BattleWinstrates:: @ 81F0FE7 + msgbox Route111_Text_VictorIntro, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_VictorDefeat applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - call Route111_EventScript_1F113C - msgbox Route111_Text_1F156F, MSGBOX_DEFAULT + call Route111_EventScript_OpenWinstrateDoor + msgbox Route111_Text_VictorPostBattle, MSGBOX_DEFAULT closemessage - applymovement 1, Route111_Movement_1F114A + applymovement 1, Route111_Movement_WinstrateEnterHouse waitmovement 0 removeobject 1 - call Route111_EventScript_1F1143 - applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F114F + call Route111_EventScript_CloseWinstrateDoor + applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_WaitForNextWinstrate waitmovement 0 - call Route111_EventScript_1F113C + call Route111_EventScript_OpenWinstrateDoor addobject 2 - applymovement 2, Route111_Movement_1F114D + applymovement 2, Route111_Movement_WinstrateExitHouse waitmovement 0 - call Route111_EventScript_1F1143 - msgbox Route111_Text_1F159D, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_1F1616 + call Route111_EventScript_CloseWinstrateDoor + msgbox Route111_Text_VictoriaIntro, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_VictoriaDefeat applymovement 2, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - call Route111_EventScript_1F113C - msgbox Route111_Text_1F1645, MSGBOX_DEFAULT + call Route111_EventScript_OpenWinstrateDoor + msgbox Route111_Text_VictoriaPostBattle, MSGBOX_DEFAULT closemessage - applymovement 2, Route111_Movement_1F114A + applymovement 2, Route111_Movement_WinstrateEnterHouse waitmovement 0 removeobject 2 - call Route111_EventScript_1F1143 - applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F114F + call Route111_EventScript_CloseWinstrateDoor + applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_WaitForNextWinstrate waitmovement 0 - call Route111_EventScript_1F113C + call Route111_EventScript_OpenWinstrateDoor addobject 3 - applymovement 3, Route111_Movement_1F114D + applymovement 3, Route111_Movement_WinstrateExitHouse waitmovement 0 - call Route111_EventScript_1F1143 - msgbox Route111_Text_1F167E, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_VIVI, Route111_Text_1F16C6 + call Route111_EventScript_CloseWinstrateDoor + msgbox Route111_Text_ViviIntro, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_VIVI, Route111_Text_ViviDefeat applymovement 3, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - call Route111_EventScript_1F113C - msgbox Route111_Text_1F16DC, MSGBOX_DEFAULT + call Route111_EventScript_OpenWinstrateDoor + msgbox Route111_Text_ViviPostBattle, MSGBOX_DEFAULT closemessage - applymovement 3, Route111_Movement_1F114A + applymovement 3, Route111_Movement_WinstrateEnterHouse waitmovement 0 removeobject 3 - call Route111_EventScript_1F1143 - applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F114F + call Route111_EventScript_CloseWinstrateDoor + applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_WaitForNextWinstrate waitmovement 0 - call Route111_EventScript_1F113C + call Route111_EventScript_OpenWinstrateDoor addobject 4 - applymovement 4, Route111_Movement_1F114D + applymovement 4, Route111_Movement_WinstrateExitHouse waitmovement 0 - call Route111_EventScript_1F1143 - msgbox Route111_Text_1F16FB, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_VICKY, Route111_Text_1F1756 - msgbox Route111_Text_1F1788, MSGBOX_DEFAULT + call Route111_EventScript_CloseWinstrateDoor + msgbox Route111_Text_VickyIntro, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_VICKY, Route111_Text_VickyDefeat + msgbox Route111_Text_VickyPostBattle, MSGBOX_DEFAULT closemessage applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - call Route111_EventScript_1F113C - applymovement 4, Route111_Movement_1F114A + call Route111_EventScript_OpenWinstrateDoor + applymovement 4, Route111_Movement_WinstrateEnterHouse waitmovement 0 removeobject 4 - call Route111_EventScript_1F1143 + call Route111_EventScript_CloseWinstrateDoor release end -Route111_EventScript_1F113C:: @ 81F113C +Route111_EventScript_OpenWinstrateDoor:: @ 81F113C opendoor 13, 113 waitdooranim return -Route111_EventScript_1F1143:: @ 81F1143 +Route111_EventScript_CloseWinstrateDoor:: @ 81F1143 closedoor 13, 113 waitdooranim return -Route111_Movement_1F114A: @ 81F114A +Route111_Movement_WinstrateEnterHouse: @ 81F114A walk_in_place_fastest_up walk_up step_end -Route111_Movement_1F114D: @ 81F114D +Route111_Movement_WinstrateExitHouse: @ 81F114D walk_down step_end -Route111_Movement_1F114F: @ 81F114F +Route111_Movement_WaitForNextWinstrate: @ 81F114F delay_16 delay_16 delay_16 step_end -Route111_EventScript_1F1153:: @ 81F1153 - msgbox Route111_Text_1F18CE, MSGBOX_SIGN +Route111_EventScript_RouteSignMauville:: @ 81F1153 + msgbox Route111_Text_RouteSignMauville, MSGBOX_SIGN end -Route111_EventScript_1F115C:: @ 81F115C - msgbox Route111_Text_1F18E8, MSGBOX_SIGN +Route111_EventScript_WinstrateHouseSign:: @ 81F115C + msgbox Route111_Text_WinstrateHouseSign, MSGBOX_SIGN end -Route111_EventScript_1F1165:: @ 81F1165 - msgbox Route111_Text_1F1921, MSGBOX_SIGN +Route111_EventScript_RouteSign112:: @ 81F1165 + msgbox Route111_Text_RouteSign112, MSGBOX_SIGN end -Route111_EventScript_1F116E:: @ 81F116E - msgbox Route111_Text_1F1937, MSGBOX_SIGN +Route111_EventScript_RouteSign113:: @ 81F116E + msgbox Route111_Text_RouteSign113, MSGBOX_SIGN end -Route111_EventScript_1F1177:: @ 81F1177 - msgbox Route111_Text_1F194D, MSGBOX_SIGN +Route111_EventScript_OldLadysRestStopSign:: @ 81F1177 + msgbox Route111_Text_OldLadysRestStopSign, MSGBOX_SIGN end -Route111_EventScript_1F1180:: @ 81F1180 - msgbox Route111_Text_1F1987, MSGBOX_SIGN +Route111_EventScript_TrainerTipsSpAtkSpDef:: @ 81F1180 + msgbox Route111_Text_TrainerTipsSpAtkSpDef, MSGBOX_SIGN end -Route111_EventScript_1F1189:: @ 81F1189 - msgbox Route111_Text_1F17BA, MSGBOX_NPC +Route111_EventScript_Man1:: @ 81F1189 + msgbox Route111_Text_ToughToKeepWinningUpTheRanks, MSGBOX_NPC end -Route111_EventScript_1F1192:: @ 81F1192 - msgbox Route111_Text_1F186E, MSGBOX_NPC +Route111_EventScript_Man2:: @ 81F1192 + msgbox Route111_Text_WinstrateFamilyDestroyedMe, MSGBOX_NPC end -Route111_EventScript_1F119B:: @ 81F119B +Route111_EventScript_Hiker:: @ 81F119B lock faceplayer compare VAR_MIRAGE_TOWER_STATE, 3 - goto_if_eq Route111_EventScript_1F11C6 + goto_if_eq Route111_EventScript_HikerMirageTowerGone compare VAR_MIRAGE_TOWER_STATE, 2 - goto_if_eq Route111_EventScript_1F11D0 - goto_if_set FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F11DA - msgbox Route111_Text_1F1A22, MSGBOX_DEFAULT + goto_if_eq Route111_EventScript_HikerMirageTowerDisintegrated + goto_if_set FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_HikerMirageTowerVisible + msgbox Route111_Text_ShouldBeMirageTowerAroundHere, MSGBOX_DEFAULT release end -Route111_EventScript_1F11C6:: @ 81F11C6 - msgbox Route111_Text_1F1C12, MSGBOX_DEFAULT +Route111_EventScript_HikerMirageTowerGone:: @ 81F11C6 + msgbox Route111_Text_MirageTowerHasntBeenSeenSince, MSGBOX_DEFAULT release end -Route111_EventScript_1F11D0:: @ 81F11D0 - msgbox Route111_Text_1F1B92, MSGBOX_DEFAULT +Route111_EventScript_HikerMirageTowerDisintegrated:: @ 81F11D0 + msgbox Route111_Text_ThatWasShockingSandRainedDown, MSGBOX_DEFAULT release end -Route111_EventScript_1F11DA:: @ 81F11DA - msgbox Route111_Text_1F1AC7, MSGBOX_DEFAULT +Route111_EventScript_HikerMirageTowerVisible:: @ 81F11DA + msgbox Route111_Text_MirageTowerClearlyVisible, MSGBOX_DEFAULT release end -Route111_EventScript_1F11E4:: @ 81F11E4 +Route111_EventScript_RockSmashTipFatMan:: @ 81F11E4 lockall applymovement 46, Common_Movement_FacePlayer waitmovement 0 - msgbox Route111_Text_1F1CCA, MSGBOX_DEFAULT + msgbox Route111_Text_MauvilleUncleToldMeToTakeRockSmash, MSGBOX_DEFAULT closemessage applymovement 46, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end -Route111_EventScript_1F1204:: @ 81F1204 - trainerbattle_single TRAINER_DREW, Route111_Text_29878E, Route111_Text_29880A - msgbox Route111_Text_298853, MSGBOX_AUTOCLOSE +Route111_EventScript_Drew:: @ 81F1204 + trainerbattle_single TRAINER_DREW, Route111_Text_DrewIntro, Route111_Text_DrewDefeat + msgbox Route111_Text_DrewPostBattle, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F121B:: @ 81F121B - trainerbattle_single TRAINER_HEIDI, Route111_Text_2988A3, Route111_Text_298908 - msgbox Route111_Text_29891B, MSGBOX_AUTOCLOSE +Route111_EventScript_Heidi:: @ 81F121B + trainerbattle_single TRAINER_HEIDI, Route111_Text_HeidiIntro, Route111_Text_HeidiDefeat + msgbox Route111_Text_HeidiPostBattle, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F1232:: @ 81F1232 - trainerbattle_single TRAINER_BEAU, Route111_Text_29898E, Route111_Text_2989E6 - msgbox Route111_Text_298A03, MSGBOX_AUTOCLOSE +Route111_EventScript_Beau:: @ 81F1232 + trainerbattle_single TRAINER_BEAU, Route111_Text_BeauIntro, Route111_Text_BeauDefeat + msgbox Route111_Text_BeauPostBattle, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F1249:: @ 81F1249 - trainerbattle_single TRAINER_BECKY, Route111_Text_298A65, Route111_Text_298AAF - msgbox Route111_Text_298AC0, MSGBOX_AUTOCLOSE +Route111_EventScript_Becky:: @ 81F1249 + trainerbattle_single TRAINER_BECKY, Route111_Text_BeckyIntro, Route111_Text_BeckyDefeat + msgbox Route111_Text_BeckyPostBattle, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F1260:: @ 81F1260 - trainerbattle_single TRAINER_DUSTY_1, Route111_Text_298B08, Route111_Text_298B53, Route111_EventScript_1F128C +Route111_EventScript_Dusty:: @ 81F1260 + trainerbattle_single TRAINER_DUSTY_1, Route111_Text_DustyIntro, Route111_Text_DustyDefeat, Route111_EventScript_RegisterDusty specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route111_EventScript_1F12AB - msgbox Route111_Text_298B9A, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route111_EventScript_RematchDusty + msgbox Route111_Text_DustyPostBattle, MSGBOX_DEFAULT release end -Route111_EventScript_1F128C:: @ 81F128C +Route111_EventScript_RegisterDusty:: @ 81F128C special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route111_Text_298C00, MSGBOX_DEFAULT + msgbox Route111_Text_DustyRegister, MSGBOX_DEFAULT register_matchcall TRAINER_DUSTY_1 release end -Route111_EventScript_1F12AB:: @ 81F12AB - trainerbattle_rematch TRAINER_DUSTY_1, Route111_Text_298C5F, Route111_Text_298CD2 - msgbox Route111_Text_298D0C, MSGBOX_AUTOCLOSE +Route111_EventScript_RematchDusty:: @ 81F12AB + trainerbattle_rematch TRAINER_DUSTY_1, Route111_Text_DustyRematchIntro, Route111_Text_DustyRematchDefeat + msgbox Route111_Text_DustyPostRematch, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F12C2:: @ 81F12C2 - trainerbattle_single TRAINER_TRAVIS, Route111_Text_298DA9, Route111_Text_298DD8 - msgbox Route111_Text_298DF1, MSGBOX_AUTOCLOSE +Route111_EventScript_Travis:: @ 81F12C2 + trainerbattle_single TRAINER_TRAVIS, Route111_Text_TravisIntro, Route111_Text_TravisDefeat + msgbox Route111_Text_TravisPostBattle, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F12D9:: @ 81F12D9 - trainerbattle_single TRAINER_IRENE, Route111_Text_298E2F, Route111_Text_298E6E - msgbox Route111_Text_298E8C, MSGBOX_AUTOCLOSE +Route111_EventScript_Irene:: @ 81F12D9 + trainerbattle_single TRAINER_IRENE, Route111_Text_IreneIntro, Route111_Text_IreneDefeat + msgbox Route111_Text_IrenePostBattle, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F12F0:: @ 81F12F0 - trainerbattle_single TRAINER_DAISUKE, Route111_Text_298EE6, Route111_Text_298F14 - msgbox Route111_Text_298F26, MSGBOX_AUTOCLOSE +Route111_EventScript_Daisuke:: @ 81F12F0 + trainerbattle_single TRAINER_DAISUKE, Route111_Text_DaisukeIntro, Route111_Text_DaisukeDefeat + msgbox Route111_Text_DaisukePostBattle, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F1307:: @ 81F1307 - trainerbattle_single TRAINER_WILTON_1, Route111_Text_298F79, Route111_Text_298FA9, Route111_EventScript_1F1333 +Route111_EventScript_Wilton:: @ 81F1307 + trainerbattle_single TRAINER_WILTON_1, Route111_Text_WiltonIntro, Route111_Text_WiltonDefeat, Route111_EventScript_RegisterWilton specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route111_EventScript_1F1352 - msgbox Route111_Text_298FD4, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route111_EventScript_RematchWilton + msgbox Route111_Text_WiltonPostBattle, MSGBOX_DEFAULT release end -Route111_EventScript_1F1333:: @ 81F1333 +Route111_EventScript_RegisterWilton:: @ 81F1333 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route111_Text_29903D, MSGBOX_DEFAULT + msgbox Route111_Text_WiltonRegister, MSGBOX_DEFAULT register_matchcall TRAINER_WILTON_1 release end -Route111_EventScript_1F1352:: @ 81F1352 - trainerbattle_rematch TRAINER_WILTON_1, Route111_Text_29909B, Route111_Text_2990EE - msgbox Route111_Text_299102, MSGBOX_AUTOCLOSE +Route111_EventScript_RematchWilton:: @ 81F1352 + trainerbattle_rematch TRAINER_WILTON_1, Route111_Text_WiltonRematchIntro, Route111_Text_WiltonRematchDefeat + msgbox Route111_Text_WiltonPostRematch, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F1369:: @ 81F1369 - trainerbattle_single TRAINER_BROOKE_1, Route111_Text_299143, Route111_Text_299193, Route111_EventScript_1F1395 +Route111_EventScript_Brooke:: @ 81F1369 + trainerbattle_single TRAINER_BROOKE_1, Route111_Text_BrookeIntro, Route111_Text_BrookeDefeat, Route111_EventScript_RegisterBrooke specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route111_EventScript_1F13B4 - msgbox Route111_Text_2991C2, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route111_EventScript_RematchBrooke + msgbox Route111_Text_BrookePostBattle, MSGBOX_DEFAULT release end -Route111_EventScript_1F1395:: @ 81F1395 +Route111_EventScript_RegisterBrooke:: @ 81F1395 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route111_Text_29921D, MSGBOX_DEFAULT + msgbox Route111_Text_BrookeRegister, MSGBOX_DEFAULT register_matchcall TRAINER_BROOKE_1 release end -Route111_EventScript_1F13B4:: @ 81F13B4 - trainerbattle_rematch TRAINER_BROOKE_1, Route111_Text_29925D, Route111_Text_2992D6 - msgbox Route111_Text_2992F5, MSGBOX_AUTOCLOSE +Route111_EventScript_RematchBrooke:: @ 81F13B4 + trainerbattle_rematch TRAINER_BROOKE_1, Route111_Text_BrookeRematchIntro, Route111_Text_BrookeRematchDefeat + msgbox Route111_Text_BrookePostRematch, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F13CB:: @ 81F13CB - trainerbattle_single TRAINER_HAYDEN, Route111_Text_299682, Route111_Text_2996BE - msgbox Route111_Text_2996C5, MSGBOX_AUTOCLOSE +Route111_EventScript_Hayden:: @ 81F13CB + trainerbattle_single TRAINER_HAYDEN, Route111_Text_HaydenIntro, Route111_Text_HaydenDefeat + msgbox Route111_Text_HaydenPostBattle, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F13E2:: @ 81F13E2 - trainerbattle_single TRAINER_BIANCA, Route111_Text_2996FE, Route111_Text_29973D - msgbox Route111_Text_29975D, MSGBOX_AUTOCLOSE +Route111_EventScript_Bianca:: @ 81F13E2 + trainerbattle_single TRAINER_BIANCA, Route111_Text_BiancaIntro, Route111_Text_BiancaDefeat + msgbox Route111_Text_BiancaPostBattle, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F13F9:: @ 81F13F9 - trainerbattle_single TRAINER_TYRON, Route111_Text_299524, Route111_Text_299549 - msgbox Route111_Text_299576, MSGBOX_AUTOCLOSE +Route111_EventScript_Tyron:: @ 81F13F9 + trainerbattle_single TRAINER_TYRON, Route111_Text_TyronIntro, Route111_Text_TyronDefeat + msgbox Route111_Text_TyronPostBattle, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F1410:: @ 81F1410 - trainerbattle_single TRAINER_CELINA, Route111_Text_2995F0, Route111_Text_299625 - msgbox Route111_Text_29964B, MSGBOX_AUTOCLOSE +Route111_EventScript_Celina:: @ 81F1410 + trainerbattle_single TRAINER_CELINA, Route111_Text_CelinaIntro, Route111_Text_CelinaDefeat + msgbox Route111_Text_CelinaPostBattle, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F1427:: @ 81F1427 - trainerbattle_single TRAINER_CELIA, Route111_Text_29934B, Route111_Text_299384 - msgbox Route111_Text_2993A7, MSGBOX_AUTOCLOSE +Route111_EventScript_Celia:: @ 81F1427 + trainerbattle_single TRAINER_CELIA, Route111_Text_CeliaIntro, Route111_Text_CeliaDefeat + msgbox Route111_Text_CeliaPostBattle, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F143E:: @ 81F143E - trainerbattle_single TRAINER_BRYAN, Route111_Text_299401, Route111_Text_299431 - msgbox Route111_Text_29945F, MSGBOX_AUTOCLOSE +Route111_EventScript_Bryan:: @ 81F143E + trainerbattle_single TRAINER_BRYAN, Route111_Text_BryanIntro, Route111_Text_BryanDefeat + msgbox Route111_Text_BryanPostBattle, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F1455:: @ 81F1455 - trainerbattle_single TRAINER_BRANDEN, Route111_Text_299493, Route111_Text_2994C5 - msgbox Route111_Text_2994FB, MSGBOX_AUTOCLOSE +Route111_EventScript_Branden:: @ 81F1455 + trainerbattle_single TRAINER_BRANDEN, Route111_Text_BrandenIntro, Route111_Text_BrandenDefeat + msgbox Route111_Text_BrandenPostBattle, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F146C:: @ 81F146C - msgbox Route111_Text_1F1D61, MSGBOX_SIGN +Route111_EventScript_TrainerHillSign:: @ 81F146C + msgbox Route111_Text_TrainerHillSign, MSGBOX_SIGN end -Route111_Text_1F1475: @ 81F1475 +Route111_Text_BattleOurFamily: @ 81F1475 .string "Hello! I take it you're a traveler.\p" .string "How's this? What do you say to taking\n" .string "on our family of four in a series of\l" .string "POKéMON battles?$" -Route111_Text_1F14F5: @ 81F14F5 +Route111_Text_IsThatSo: @ 81F14F5 .string "Is that so?\n" .string "Drop in, if you change your mind!$" -Route111_Text_1F1523: @ 81F1523 +Route111_Text_VictorIntro: @ 81F1523 .string "That's the spirit! I like you!$" -Route111_Text_1F1542: @ 81F1542 +Route111_Text_VictorDefeat: @ 81F1542 .string "Aiyah!\n" .string "You're a lot tougher than I expected!$" -Route111_Text_1F156F: @ 81F156F +Route111_Text_VictorPostBattle: @ 81F156F .string "Hey, all!\n" .string "I've found a pretty strong TRAINER!$" -Route111_Text_1F159D: @ 81F159D +Route111_Text_VictoriaIntro: @ 81F159D .string "Oh, my goodness! Aren't you young?\p" .string "You must be quite the TRAINER to beat\n" .string "my husband, though.\p" .string "It's my turn to battle now!$" -Route111_Text_1F1616: @ 81F1616 +Route111_Text_VictoriaDefeat: @ 81F1616 .string "Oh, gosh!\n" .string "I can't get over how strong you are!$" -Route111_Text_1F1645: @ 81F1645 +Route111_Text_VictoriaPostBattle: @ 81F1645 .string "There's a strong TRAINER here!\n" .string "This one's really strong!$" -Route111_Text_1F167E: @ 81F167E +Route111_Text_ViviIntro: @ 81F167E .string "You're stronger than Mommy? Wow!\p" .string "But I'm strong, too!\n" .string "Really! Honestly!$" -Route111_Text_1F16C6: @ 81F16C6 +Route111_Text_ViviDefeat: @ 81F16C6 .string "Huh? Did I just lose?$" -Route111_Text_1F16DC: @ 81F16DC +Route111_Text_ViviPostBattle: @ 81F16DC .string "This stinks…\p" .string "…Snivel… Grandma!$" -Route111_Text_1F16FB: @ 81F16FB +Route111_Text_VickyIntro: @ 81F16FB .string "How dare you make my granddaughter\n" .string "cry!\p" .string "For that, I'm going to smack you!\n" .string "Prepare to lose!$" -Route111_Text_1F1756: @ 81F1756 +Route111_Text_VickyDefeat: @ 81F1756 .string "Kwah! You are strong…\n" .string "My granddaughter was right…$" -Route111_Text_1F1788: @ 81F1788 +Route111_Text_VickyPostBattle: @ 81F1788 .string "If you're not in any hurry,\n" .string "visit with us awhile.$" -Route111_Text_1F17BA: @ 81F17BA +Route111_Text_ToughToKeepWinningUpTheRanks: @ 81F17BA .string "If you don't raise your POKéMON some\n" .string "more, it could be tough to keep winning\l" .string "up through the ranks.\p" @@ -655,32 +657,32 @@ Route111_Text_1F17BA: @ 81F17BA .string "ELITE FOUR are far stronger than\l" .string "any GYM LEADER.$" -Route111_Text_1F186E: @ 81F186E +Route111_Text_WinstrateFamilyDestroyedMe: @ 81F186E .string "I challenged the WINSTRATE family,\n" .string "but four matches in a row is tough\l" .string "going… They destroyed me.$" -Route111_Text_1F18CE: @ 81F18CE +Route111_Text_RouteSignMauville: @ 81F18CE .string "ROUTE 111\n" .string "{DOWN_ARROW} MAUVILLE CITY$" -Route111_Text_1F18E8: @ 81F18E8 +Route111_Text_WinstrateHouseSign: @ 81F18E8 .string "“Our family's hearts beat as one!”\n" .string "THE WINSTRATE'S HOUSE$" -Route111_Text_1F1921: @ 81F1921 +Route111_Text_RouteSign112: @ 81F1921 .string "ROUTE 111\n" .string "{LEFT_ARROW} ROUTE 112$" -Route111_Text_1F1937: @ 81F1937 +Route111_Text_RouteSign113: @ 81F1937 .string "ROUTE 111\n" .string "{LEFT_ARROW} ROUTE 113$" -Route111_Text_1F194D: @ 81F194D +Route111_Text_OldLadysRestStopSign: @ 81F194D .string "OLD LADY'S REST STOP\n" .string "“Come in and rest your tired bones.”$" -Route111_Text_1F1987: @ 81F1987 +Route111_Text_TrainerTipsSpAtkSpDef: @ 81F1987 .string "TRAINER TIPS\p" .string "One of the indicators of a POKéMON's\n" .string "powerfulness is SP. ATK. It stands for\l" @@ -688,14 +690,14 @@ Route111_Text_1F1987: @ 81F1987 .string "Likewise, SP. DEF stands for “SPECIAL\n" .string "DEFENSE.”$" -Route111_Text_1F1A22: @ 81F1A22 +Route111_Text_ShouldBeMirageTowerAroundHere: @ 81F1A22 .string "There should be a tower made of sand\n" .string "around here somewhere.\p" .string "But for some reason, it can be seen\n" .string "sometimes, and sometimes not.\p" .string "That's why I call it the MIRAGE TOWER.$" -Route111_Text_1F1AC7: @ 81F1AC7 +Route111_Text_MirageTowerClearlyVisible: @ 81F1AC7 .string "I see it!\n" .string "The tower of sand!\p" .string "The sand tower they called a mirage\n" @@ -705,7 +707,7 @@ Route111_Text_1F1AC7: @ 81F1AC7 .string "I want to go inside it, but I can't\n" .string "get my courage up for it…$" -Route111_Text_1F1B92: @ 81F1B92 +Route111_Text_ThatWasShockingSandRainedDown: @ 81F1B92 .string "Whoa…\n" .string "That was shocking.\p" .string "Sand rained down in chunks all of\n" @@ -713,21 +715,21 @@ Route111_Text_1F1B92: @ 81F1B92 .string "What was it like inside?\n" .string "Were there sandy ghosts and such?$" -Route111_Text_1F1C12: @ 81F1C12 +Route111_Text_MirageTowerHasntBeenSeenSince: @ 81F1C12 .string "Since I spoke to you, the tower of sand\n" .string "hasn't been seen.\p" .string "Perhaps it really was\n" .string "the MIRAGE TOWER…$" -Route111_Text_1F1C74: @ 81F1C74 +Route111_Text_ClawFossilDisappeared: @ 81F1C74 .string "The CLAW FOSSIL disappeared into\n" .string "the sand…$" -Route111_Text_1F1C9F: @ 81F1C9F +Route111_Text_RootFossilDisappeared: @ 81F1C9F .string "The ROOT FOSSIL disappeared into\n" .string "the sand…$" -Route111_Text_1F1CCA: @ 81F1CCA +Route111_Text_MauvilleUncleToldMeToTakeRockSmash: @ 81F1CCA .string "Oh, no!\p" .string "My uncle in MAUVILLE told me to take\n" .string "ROCK SMASH with me if I was going to\l" @@ -735,7 +737,7 @@ Route111_Text_1F1CCA: @ 81F1CCA .string "My uncle? He lives across from\n" .string "the bike shop in MAUVILLE.$" -Route111_Text_1F1D61: @ 81F1D61 +Route111_Text_TrainerHillSign: @ 81F1D61 .string "{RIGHT_ARROW} TRAINER HILL ENTRANCE\p" .string "“Scale the heights, you hot-blooded\n" .string "TRAINERS!”$" diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json index b963c6c48..e52468f32 100644 --- a/data/maps/Route112/map.json +++ b/data/maps/Route112/map.json @@ -40,7 +40,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route112_EventScript_1F1DB7", + "script": "Route112_EventScript_MagmaGrunts", "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA" }, { @@ -53,7 +53,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route112_EventScript_1F1E6A", + "script": "Route112_EventScript_Brice", "flag": "0" }, { @@ -66,7 +66,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route112_EventScript_1F1EE3", + "script": "Route112_EventScript_Larry", "flag": "0" }, { @@ -79,7 +79,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route112_EventScript_1F1EFA", + "script": "Route112_EventScript_Carol", "flag": "0" }, { @@ -92,7 +92,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route112_EventScript_1F1E81", + "script": "Route112_EventScript_Trent", "flag": "0" }, { @@ -105,7 +105,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route112_EventScript_1F1DB7", + "script": "Route112_EventScript_MagmaGrunts", "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA" }, { @@ -170,7 +170,7 @@ "movement_range_y": 3, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route112_EventScript_1F1E61", + "script": "Route112_EventScript_Hiker", "flag": "0" }, { @@ -196,7 +196,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route112_EventScript_1F1F11", + "script": "Route112_EventScript_Bryant", "flag": "0" }, { @@ -209,7 +209,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route112_EventScript_1F1F28", + "script": "Route112_EventScript_Shayla", "flag": "0" } ], @@ -265,7 +265,7 @@ "y": 44, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route112_EventScript_1F1E4F" + "script": "Route112_EventScript_MtChimneySign" }, { "type": "sign", @@ -273,7 +273,7 @@ "y": 37, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route112_EventScript_1F1E46" + "script": "Route112_EventScript_MtChimneyCableCarSign" }, { "type": "sign", @@ -281,7 +281,7 @@ "y": 49, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route112_EventScript_1F1E58" + "script": "Route112_EventScript_RouteSignLavaridge" } ] }
\ No newline at end of file diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index beb572f08..4dd4fe112 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -7,13 +7,13 @@ Route112_OnTransition: @ 81F1DAE setvar VAR_JAGGED_PASS_ASH_WEATHER, 0 end -Route112_EventScript_1F1DB7:: @ 81F1DB7 +Route112_EventScript_MagmaGrunts:: @ 81F1DB7 lockall delay 40 applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 20 - msgbox Route112_Text_1F1F3F, MSGBOX_DEFAULT + msgbox Route112_Text_LeaderGoingToAwakenThing, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 @@ -21,7 +21,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 applymovement 6, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 delay 20 - msgbox Route112_Text_1F1F7A, MSGBOX_DEFAULT + msgbox Route112_Text_YeahWeNeedMeteorite, MSGBOX_DEFAULT closemessage applymovement 6, Common_Movement_FaceOriginalDirection waitmovement 0 @@ -29,7 +29,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 20 - msgbox Route112_Text_1F1FBA, MSGBOX_DEFAULT + msgbox Route112_Text_OhThatsWhyCrewWentToFallarbor, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 @@ -37,107 +37,107 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 applymovement 6, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 delay 20 - msgbox Route112_Text_1F2003, MSGBOX_DEFAULT + msgbox Route112_Text_CantLetAnyonePassUntilTheyreBack, MSGBOX_DEFAULT closemessage applymovement 6, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end -Route112_EventScript_1F1E46:: @ 81F1E46 - msgbox Route112_Text_1F20C1, MSGBOX_SIGN +Route112_EventScript_MtChimneyCableCarSign:: @ 81F1E46 + msgbox Route112_Text_MtChimneyCableCarSign, MSGBOX_SIGN end -Route112_EventScript_1F1E4F:: @ 81F1E4F - msgbox Route112_Text_1F20ED, MSGBOX_SIGN +Route112_EventScript_MtChimneySign:: @ 81F1E4F + msgbox Route112_Text_MtChimneySign, MSGBOX_SIGN end -Route112_EventScript_1F1E58:: @ 81F1E58 - msgbox Route112_Text_1F2138, MSGBOX_SIGN +Route112_EventScript_RouteSignLavaridge:: @ 81F1E58 + msgbox Route112_Text_RouteSignLavaridge, MSGBOX_SIGN end -Route112_EventScript_1F1E61:: @ 81F1E61 - msgbox Route112_Text_1F204E, MSGBOX_NPC +Route112_EventScript_Hiker:: @ 81F1E61 + msgbox Route112_Text_NotEasyToGetBackToLavaridge, MSGBOX_NPC end -Route112_EventScript_1F1E6A:: @ 81F1E6A - trainerbattle_single TRAINER_BRICE, Route112_Text_29978E, Route112_Text_2997CA - msgbox Route112_Text_2997DC, MSGBOX_AUTOCLOSE +Route112_EventScript_Brice:: @ 81F1E6A + trainerbattle_single TRAINER_BRICE, Route112_Text_BriceIntro, Route112_Text_BriceDefeat + msgbox Route112_Text_BricePostBattle, MSGBOX_AUTOCLOSE end -Route112_EventScript_1F1E81:: @ 81F1E81 - trainerbattle_single TRAINER_TRENT_1, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD +Route112_EventScript_Trent:: @ 81F1E81 + trainerbattle_single TRAINER_TRENT_1, Route112_Text_TrentIntro, Route112_Text_TrentDefeat, Route112_EventScript_RegisterTrent specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route112_EventScript_1F1ECC - msgbox Route112_Text_299896, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route112_EventScript_RematchTrent + msgbox Route112_Text_TrentPostBattle, MSGBOX_DEFAULT release end -Route112_EventScript_1F1EAD:: @ 81F1EAD +Route112_EventScript_RegisterTrent:: @ 81F1EAD special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route112_Text_29993C, MSGBOX_DEFAULT + msgbox Route112_Text_TrentRegister, MSGBOX_DEFAULT register_matchcall TRAINER_TRENT_1 release end -Route112_EventScript_1F1ECC:: @ 81F1ECC - trainerbattle_rematch TRAINER_TRENT_1, Route112_Text_2999BD, Route112_Text_2999F7 - msgbox Route112_Text_299A0F, MSGBOX_AUTOCLOSE +Route112_EventScript_RematchTrent:: @ 81F1ECC + trainerbattle_rematch TRAINER_TRENT_1, Route112_Text_TrentRematchIntro, Route112_Text_TrentRematchDefeat + msgbox Route112_Text_TrentRematchPostBattle, MSGBOX_AUTOCLOSE end -Route112_EventScript_1F1EE3:: @ 81F1EE3 - trainerbattle_single TRAINER_LARRY, Route112_Text_299A89, Route112_Text_299AAC - msgbox Route112_Text_299AB4, MSGBOX_AUTOCLOSE +Route112_EventScript_Larry:: @ 81F1EE3 + trainerbattle_single TRAINER_LARRY, Route112_Text_LarryIntro, Route112_Text_LarryDefeat + msgbox Route112_Text_LarryPostBattle, MSGBOX_AUTOCLOSE end -Route112_EventScript_1F1EFA:: @ 81F1EFA - trainerbattle_single TRAINER_CAROL, Route112_Text_299AE4, Route112_Text_299B36 - msgbox Route112_Text_299B4C, MSGBOX_AUTOCLOSE +Route112_EventScript_Carol:: @ 81F1EFA + trainerbattle_single TRAINER_CAROL, Route112_Text_CarolIntro, Route112_Text_CarolDefeat + msgbox Route112_Text_CarolPostBattle, MSGBOX_AUTOCLOSE end -Route112_EventScript_1F1F11:: @ 81F1F11 - trainerbattle_single TRAINER_BRYANT, Route112_Text_299BAE, Route112_Text_299BDF - msgbox Route112_Text_299BFB, MSGBOX_AUTOCLOSE +Route112_EventScript_Bryant:: @ 81F1F11 + trainerbattle_single TRAINER_BRYANT, Route112_Text_BryantIntro, Route112_Text_BryantDefeat + msgbox Route112_Text_BryantPostBattle, MSGBOX_AUTOCLOSE end -Route112_EventScript_1F1F28:: @ 81F1F28 - trainerbattle_single TRAINER_SHAYLA, Route112_Text_299C34, Route112_Text_299C8F - msgbox Route112_Text_299CC6, MSGBOX_AUTOCLOSE +Route112_EventScript_Shayla:: @ 81F1F28 + trainerbattle_single TRAINER_SHAYLA, Route112_Text_ShaylaIntro, Route112_Text_ShaylaDefeat + msgbox Route112_Text_ShaylaPostBattle, MSGBOX_AUTOCLOSE end -Route112_Text_1F1F3F: @ 81F1F3F +Route112_Text_LeaderGoingToAwakenThing: @ 81F1F3F .string "Hey, man, is our leader really going\n" .string "to awaken that thing?$" -Route112_Text_1F1F7A: @ 81F1F7A +Route112_Text_YeahWeNeedMeteorite: @ 81F1F7A .string "Sounds like it, yeah. But I heard\n" .string "we need a METEORITE to do it.$" -Route112_Text_1F1FBA: @ 81F1FBA +Route112_Text_OhThatsWhyCrewWentToFallarbor: @ 81F1FBA .string "Oh, I get it now. That's why the rest\n" .string "of the crew went out to FALLARBOR.$" -Route112_Text_1F2003: @ 81F2003 +Route112_Text_CantLetAnyonePassUntilTheyreBack: @ 81F2003 .string "You got it. And until they come back,\n" .string "we're not to let anyone pass, right.$" -Route112_Text_1F204E: @ 81F204E +Route112_Text_NotEasyToGetBackToLavaridge: @ 81F204E .string "Eh, I'd like to get to MAUVILLE, but if\n" .string "I went down these ledges, it'd be no\l" .string "easy matter to get back to LAVARIDGE.$" -Route112_Text_1F20C1: @ 81F20C1 +Route112_Text_MtChimneyCableCarSign: @ 81F20C1 .string "MT. CHIMNEY CABLE CAR\n" .string "“A short walk {UP_ARROW} way!”$" -Route112_Text_1F20ED: @ 81F20ED +Route112_Text_MtChimneySign: @ 81F20ED .string "MT. CHIMNEY\p" .string "“For LAVARIDGE TOWN or the summit,\n" .string "please take the CABLE CAR.”$" -Route112_Text_1F2138: @ 81F2138 +Route112_Text_RouteSignLavaridge: @ 81F2138 .string "ROUTE 112\n" .string "{LEFT_ARROW} LAVARIDGE TOWN$" diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json index bcff99de4..ba3cf2452 100644 --- a/data/maps/Route113/map.json +++ b/data/maps/Route113/map.json @@ -40,7 +40,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route113_EventScript_1F2193", + "script": "Route113_EventScript_NinjaBoy", "flag": "0" }, { @@ -53,7 +53,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route113_EventScript_1F218A", + "script": "Route113_EventScript_Gentleman", "flag": "0" }, { @@ -66,7 +66,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route113_EventScript_1F21C0", + "script": "Route113_EventScript_Jaylen", "flag": "0" }, { @@ -79,7 +79,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route113_EventScript_1F21D7", + "script": "Route113_EventScript_Dillon", "flag": "0" }, { @@ -92,7 +92,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route113_EventScript_1F21EE", + "script": "Route113_EventScript_Madeline", "flag": "0" }, { @@ -131,7 +131,7 @@ "movement_range_y": 0, "trainer_type": "3", "trainer_sight_or_berry_tree_id": "1", - "script": "Route113_EventScript_1F2250", + "script": "Route113_EventScript_Lao", "flag": "0" }, { @@ -144,7 +144,7 @@ "movement_range_y": 0, "trainer_type": "3", "trainer_sight_or_berry_tree_id": "1", - "script": "Route113_EventScript_1F22B2", + "script": "Route113_EventScript_Lung", "flag": "0" }, { @@ -157,7 +157,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route113_EventScript_1F22C9", + "script": "Route113_EventScript_Tori", "flag": "0" }, { @@ -170,7 +170,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route113_EventScript_1F22E4", + "script": "Route113_EventScript_Tia", "flag": "0" }, { @@ -196,7 +196,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route113_EventScript_1F2344", + "script": "Route113_EventScript_Wyatt", "flag": "0" }, { @@ -209,7 +209,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route113_EventScript_1F232D", + "script": "Route113_EventScript_Lawrence", "flag": "0" }, { @@ -222,7 +222,7 @@ "movement_range_y": 3, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "Route113_EventScript_1F22FF", + "script": "Route113_EventScript_Sophie", "flag": "0" }, { @@ -235,7 +235,7 @@ "movement_range_y": 3, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "Route113_EventScript_1F2316", + "script": "Route113_EventScript_Coby", "flag": "0" } ], @@ -404,7 +404,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route113_EventScript_1F219C" + "script": "Route113_EventScript_RouteSign111" }, { "type": "sign", @@ -412,7 +412,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route113_EventScript_1F21A5" + "script": "Route113_EventScript_RouteSignFallarbor" }, { "type": "sign", @@ -420,7 +420,7 @@ "y": 4, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route113_EventScript_1F21B7" + "script": "Route113_EventScript_TrainerTipsRegisterKeyItems" }, { "type": "sign", @@ -428,7 +428,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route113_EventScript_1F21AE" + "script": "Route113_EventScript_GlassWorkshopSign" }, { "type": "secret_base", diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index 89bf97373..612e4a864 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -1,170 +1,170 @@ Route113_MapScripts:: @ 81F2153 - map_script MAP_SCRIPT_ON_RESUME, Route113_MapScript1_1F215E + map_script MAP_SCRIPT_ON_RESUME, Route113_OnResume map_script MAP_SCRIPT_ON_TRANSITION, Route113_OnTransition .byte 0 -Route113_MapScript1_1F215E: @ 81F215E +Route113_OnResume: @ 81F215E setstepcallback STEP_CB_ASH end Route113_OnTransition: @ 81F2161 clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE - call Route113_EventScript_1F216A + call Route113_EventScript_CheckSetAshWeather end -Route113_EventScript_1F216A:: @ 81F216A +Route113_EventScript_CheckSetAshWeather:: @ 81F216A getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_0, 19 - goto_if_lt Route113_EventScript_1F2189 + goto_if_lt Route113_EventScript_DontSetAshWeather compare VAR_TEMP_0, 84 - goto_if_gt Route113_EventScript_1F2189 + goto_if_gt Route113_EventScript_DontSetAshWeather setweather WEATHER_ASH return -Route113_EventScript_1F2189:: @ 81F2189 +Route113_EventScript_DontSetAshWeather:: @ 81F2189 return -Route113_EventScript_1F218A:: @ 81F218A - msgbox Route113_Text_1F235B, MSGBOX_NPC +Route113_EventScript_Gentleman:: @ 81F218A + msgbox Route113_Text_AshCanBeFashionedIntoGlass, MSGBOX_NPC end -Route113_EventScript_1F2193:: @ 81F2193 - msgbox Route113_Text_1F23CA, MSGBOX_NPC +Route113_EventScript_NinjaBoy:: @ 81F2193 + msgbox Route113_Text_FunWalkingThroughAsh, MSGBOX_NPC end -Route113_EventScript_1F219C:: @ 81F219C - msgbox Route113_Text_1F2440, MSGBOX_SIGN +Route113_EventScript_RouteSign111:: @ 81F219C + msgbox Route113_Text_RouteSign111, MSGBOX_SIGN end -Route113_EventScript_1F21A5:: @ 81F21A5 - msgbox Route113_Text_1F2456, MSGBOX_SIGN +Route113_EventScript_RouteSignFallarbor:: @ 81F21A5 + msgbox Route113_Text_RouteSignFallarbor, MSGBOX_SIGN end -Route113_EventScript_1F21AE:: @ 81F21AE - msgbox Route113_Text_1F24F8, MSGBOX_SIGN +Route113_EventScript_GlassWorkshopSign:: @ 81F21AE + msgbox Route113_Text_GlassWorkshopSign, MSGBOX_SIGN end -Route113_EventScript_1F21B7:: @ 81F21B7 - msgbox Route113_Text_1F2471, MSGBOX_SIGN +Route113_EventScript_TrainerTipsRegisterKeyItems:: @ 81F21B7 + msgbox Route113_Text_TrainerTipsRegisterKeyItems, MSGBOX_SIGN end -Route113_EventScript_1F21C0:: @ 81F21C0 - trainerbattle_single TRAINER_JAYLEN, Route113_Text_299D3C, Route113_Text_299D68 - msgbox Route113_Text_299D7D, MSGBOX_AUTOCLOSE +Route113_EventScript_Jaylen:: @ 81F21C0 + trainerbattle_single TRAINER_JAYLEN, Route113_Text_JaylenIntro, Route113_Text_JaylenDefeat + msgbox Route113_Text_JaylenPostBattle, MSGBOX_AUTOCLOSE end -Route113_EventScript_1F21D7:: @ 81F21D7 - trainerbattle_single TRAINER_DILLON, Route113_Text_299DE3, Route113_Text_299E1C - msgbox Route113_Text_299E38, MSGBOX_AUTOCLOSE +Route113_EventScript_Dillon:: @ 81F21D7 + trainerbattle_single TRAINER_DILLON, Route113_Text_DillonIntro, Route113_Text_DillonDefeat + msgbox Route113_Text_DillonPostBattle, MSGBOX_AUTOCLOSE end -Route113_EventScript_1F21EE:: @ 81F21EE - trainerbattle_single TRAINER_MADELINE_1, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A +Route113_EventScript_Madeline:: @ 81F21EE + trainerbattle_single TRAINER_MADELINE_1, Route113_Text_MadelineIntro, Route113_Text_MadelineDefeat, Route113_EventScript_RegisterMadeline specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route113_EventScript_1F2239 - msgbox Route113_Text_299F15, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route113_EventScript_RematchMadeline + msgbox Route113_Text_MadelinePostBattle, MSGBOX_DEFAULT release end -Route113_EventScript_1F221A:: @ 81F221A +Route113_EventScript_RegisterMadeline:: @ 81F221A special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route113_Text_299F49, MSGBOX_DEFAULT + msgbox Route113_Text_MadelineRegister, MSGBOX_DEFAULT register_matchcall TRAINER_MADELINE_1 release end -Route113_EventScript_1F2239:: @ 81F2239 - trainerbattle_rematch TRAINER_MADELINE_1, Route113_Text_299F8A, Route113_Text_299FC9 - msgbox Route113_Text_299FD8, MSGBOX_AUTOCLOSE +Route113_EventScript_RematchMadeline:: @ 81F2239 + trainerbattle_rematch TRAINER_MADELINE_1, Route113_Text_MadelineRematchIntro, Route113_Text_MadelineRematchDefeat + msgbox Route113_Text_MadelinePostRematch, MSGBOX_AUTOCLOSE end -Route113_EventScript_1F2250:: @ 81F2250 - trainerbattle_single TRAINER_LAO_1, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C +Route113_EventScript_Lao:: @ 81F2250 + trainerbattle_single TRAINER_LAO_1, Route113_Text_LaoIntro, Route113_Text_LaoDefeat, Route113_EventScript_RegisterLao specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route113_EventScript_1F229B - msgbox Route113_Text_29A067, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route113_EventScript_RematchLao + msgbox Route113_Text_LaoPostBattle, MSGBOX_DEFAULT release end -Route113_EventScript_1F227C:: @ 81F227C +Route113_EventScript_RegisterLao:: @ 81F227C special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route113_Text_29A0A2, MSGBOX_DEFAULT + msgbox Route113_Text_LaoRegister, MSGBOX_DEFAULT register_matchcall TRAINER_LAO_1 release end -Route113_EventScript_1F229B:: @ 81F229B - trainerbattle_rematch TRAINER_LAO_1, Route113_Text_29A0E8, Route113_Text_29A11F - msgbox Route113_Text_29A13A, MSGBOX_AUTOCLOSE +Route113_EventScript_RematchLao:: @ 81F229B + trainerbattle_rematch TRAINER_LAO_1, Route113_Text_LaoRematchIntro, Route113_Text_LaoRematchDefeat + msgbox Route113_Text_LaoPostRematch, MSGBOX_AUTOCLOSE end -Route113_EventScript_1F22B2:: @ 81F22B2 - trainerbattle_single TRAINER_LUNG, Route113_Text_29A192, Route113_Text_29A1C6 - msgbox Route113_Text_29A219, MSGBOX_AUTOCLOSE +Route113_EventScript_Lung:: @ 81F22B2 + trainerbattle_single TRAINER_LUNG, Route113_Text_LungIntro, Route113_Text_LungDefeat + msgbox Route113_Text_LungPostBattle, MSGBOX_AUTOCLOSE end -Route113_EventScript_1F22C9:: @ 81F22C9 - trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_29A261, Route113_Text_29A29D, Route113_Text_29A31F - msgbox Route113_Text_29A2DE, MSGBOX_AUTOCLOSE +Route113_EventScript_Tori:: @ 81F22C9 + trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_ToriIntro, Route113_Text_ToriDefeat, Route113_Text_ToriNotEnoughMons + msgbox Route113_Text_ToriPostBattle, MSGBOX_AUTOCLOSE end -Route113_EventScript_1F22E4:: @ 81F22E4 - trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_29A35C, Route113_Text_29A397, Route113_Text_29A419 - msgbox Route113_Text_29A3DA, MSGBOX_AUTOCLOSE +Route113_EventScript_Tia:: @ 81F22E4 + trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_TiaIntro, Route113_Text_TiaDefeat, Route113_Text_TiaNotEnoughMons + msgbox Route113_Text_TiaPostBattle, MSGBOX_AUTOCLOSE end -Route113_EventScript_1F22FF:: @ 81F22FF - trainerbattle_single TRAINER_SOPHIE, Route113_Text_29A4BF, Route113_Text_29A508 - msgbox Route113_Text_29A529, MSGBOX_AUTOCLOSE +Route113_EventScript_Sophie:: @ 81F22FF + trainerbattle_single TRAINER_SOPHIE, Route113_Text_SophieIntro, Route113_Text_SophieDefeat + msgbox Route113_Text_SophiePostBattle, MSGBOX_AUTOCLOSE end -Route113_EventScript_1F2316:: @ 81F2316 - trainerbattle_single TRAINER_COBY, Route113_Text_29A453, Route113_Text_29A480 - msgbox Route113_Text_29A489, MSGBOX_AUTOCLOSE +Route113_EventScript_Coby:: @ 81F2316 + trainerbattle_single TRAINER_COBY, Route113_Text_CobyIntro, Route113_Text_CobyDefeat + msgbox Route113_Text_CobyPostBattle, MSGBOX_AUTOCLOSE end -Route113_EventScript_1F232D:: @ 81F232D - trainerbattle_single TRAINER_LAWRENCE, Route113_Text_29A566, Route113_Text_29A5A0 - msgbox Route113_Text_29A5BE, MSGBOX_AUTOCLOSE +Route113_EventScript_Lawrence:: @ 81F232D + trainerbattle_single TRAINER_LAWRENCE, Route113_Text_LawrenceIntro, Route113_Text_LawrenceDefeat + msgbox Route113_Text_LawrencePostBattle, MSGBOX_AUTOCLOSE end -Route113_EventScript_1F2344:: @ 81F2344 - trainerbattle_single TRAINER_WYATT, Route113_Text_29A5E4, Route113_Text_29A628 - msgbox Route113_Text_29A65D, MSGBOX_AUTOCLOSE +Route113_EventScript_Wyatt:: @ 81F2344 + trainerbattle_single TRAINER_WYATT, Route113_Text_WyattIntro, Route113_Text_WyattDefeat + msgbox Route113_Text_WyattPostBattle, MSGBOX_AUTOCLOSE end -Route113_Text_1F235B: @ 81F235B +Route113_Text_AshCanBeFashionedIntoGlass: @ 81F235B .string "Wahahaha! Today's technology is a\n" .string "wondrous thing!\p" .string "Take this volcanic ash here.\n" .string "It can be fashioned into glass.$" -Route113_Text_1F23CA: @ 81F23CA +Route113_Text_FunWalkingThroughAsh: @ 81F23CA .string "It's fun walking through the volcano's\n" .string "ashes on the ground and grass.\p" .string "You can see where you walked--it's\n" .string "really neat!$" -Route113_Text_1F2440: @ 81F2440 +Route113_Text_RouteSign111: @ 81F2440 .string "ROUTE 113\n" .string "{RIGHT_ARROW} ROUTE 111$" -Route113_Text_1F2456: @ 81F2456 +Route113_Text_RouteSignFallarbor: @ 81F2456 .string "ROUTE 113\n" .string "{LEFT_ARROW} FALLARBOR TOWN$" -Route113_Text_1F2471: @ 81F2471 +Route113_Text_TrainerTipsRegisterKeyItems: @ 81F2471 .string "TRAINER TIPS\p" .string "You may register one of the KEY ITEMS\n" .string "in your BAG as SELECT.\p" .string "Simply press SELECT to use\n" .string "the registered item conveniently.$" -Route113_Text_1F24F8: @ 81F24F8 +Route113_Text_GlassWorkshopSign: @ 81F24F8 .string "GLASS WORKSHOP\n" .string "“Turning Volcanic Ash into Glass Items”$" diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json index 1aee2d422..76a9083f4 100644 --- a/data/maps/Route114/map.json +++ b/data/maps/Route114/map.json @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "Route114_EventScript_1F2640", + "script": "Route114_EventScript_Lenny", "flag": "0" }, { @@ -74,7 +74,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route114_EventScript_1F2657", + "script": "Route114_EventScript_Lucas", "flag": "0" }, { @@ -87,7 +87,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route114_EventScript_1F266E", + "script": "Route114_EventScript_Shane", "flag": "0" }, { @@ -100,7 +100,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route114_EventScript_1F2685", + "script": "Route114_EventScript_Nancy", "flag": "0" }, { @@ -113,7 +113,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route114_EventScript_1F269C", + "script": "Route114_EventScript_Steve", "flag": "0" }, { @@ -178,7 +178,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route114_EventScript_1F25D1", + "script": "Route114_EventScript_RoarGentleman", "flag": "0" }, { @@ -191,7 +191,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route114_EventScript_1F2612", + "script": "Route114_EventScript_Poochyena", "flag": "0" }, { @@ -204,7 +204,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route114_EventScript_1F2582", + "script": "Route114_EventScript_Man", "flag": "0" }, { @@ -217,7 +217,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "Route114_EventScript_1F2777", + "script": "Route114_EventScript_Nolan", "flag": "0" }, { @@ -230,7 +230,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "Route114_EventScript_1F2760", + "script": "Route114_EventScript_Claude", "flag": "0" }, { @@ -243,7 +243,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route114_EventScript_1F26FE", + "script": "Route114_EventScript_Bernie", "flag": "0" }, { @@ -308,7 +308,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route114_EventScript_1F27A9", + "script": "Route114_EventScript_Ivy", "flag": "0" }, { @@ -321,7 +321,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route114_EventScript_1F278E", + "script": "Route114_EventScript_Tyra", "flag": "0" }, { @@ -334,7 +334,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route114_EventScript_1F27DB", + "script": "Route114_EventScript_Charlotte", "flag": "0" }, { @@ -347,7 +347,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route114_EventScript_1F27C4", + "script": "Route114_EventScript_Angelina", "flag": "0" }, { @@ -373,7 +373,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route114_EventScript_1F27F2", + "script": "Route114_EventScript_Kai", "flag": "0" } ], @@ -422,7 +422,7 @@ "y": 64, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route114_EventScript_1F2625" + "script": "Route114_EventScript_MeteorFallsSign" }, { "type": "sign", @@ -430,7 +430,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route114_EventScript_1F262E" + "script": "Route114_EventScript_FossilManiacsHouseSign" }, { "type": "secret_base", @@ -480,7 +480,7 @@ "y": 38, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route114_EventScript_1F2637" + "script": "Route114_EventScript_LanettesHouseSign" }, { "type": "hidden_item", diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index caf6e1496..1873f6f7a 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -1,7 +1,7 @@ Route114_MapScripts:: @ 81F252F map_script MAP_SCRIPT_ON_TRANSITION, Route114_OnTransition - map_script MAP_SCRIPT_ON_LOAD, Route114_MapScript1_1F2561 - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route114_MapScript2_1F2578 + map_script MAP_SCRIPT_ON_LOAD, Route114_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route114_OnFrame .byte 0 Route114_OnTransition: @ 81F253F @@ -13,199 +13,199 @@ Route114_OnTransition: @ 81F253F call_if_eq UnusualWeather_StartGroudonWeather end -Route114_MapScript1_1F2561: @ 81F2561 +Route114_OnLoad: @ 81F2561 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH call_if_eq UnusualWeather_EventScript_PlaceTilesRoute114North compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_SOUTH call_if_eq UnusualWeather_EventScript_PlaceTilesRoute114South end -Route114_MapScript2_1F2578: @ 81F2578 +Route114_OnFrame: @ 81F2578 map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 -Route114_EventScript_1F2582:: @ 81F2582 +Route114_EventScript_Man:: @ 81F2582 lock faceplayer dotimebasedevents - goto_if_set FLAG_DAILY_ROUTE_114_RECEIVED_BERRY, Route114_EventScript_1F25C7 - msgbox Route114_Text_2A6FCB, MSGBOX_DEFAULT - random 5 - addvar VAR_RESULT, 15 + goto_if_set FLAG_DAILY_ROUTE_114_RECEIVED_BERRY, Route114_EventScript_ReceivedBerry + msgbox Route114_Text_LoveUsingBerryCrushShareBerry, MSGBOX_DEFAULT + random NUM_ROUTE_114_MAN_BERRIES + addvar VAR_RESULT, NUM_ROUTE_114_MAN_BERRIES_SKIPPED addvar VAR_RESULT, FIRST_BERRY_INDEX giveitem_std VAR_RESULT - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_ROUTE_114_RECEIVED_BERRY - msgbox Route114_Text_2A7034, MSGBOX_DEFAULT + msgbox Route114_Text_TryBerryCrushWithFriends, MSGBOX_DEFAULT release end -Route114_EventScript_1F25C7:: @ 81F25C7 - msgbox Route114_Text_2A706E, MSGBOX_DEFAULT +Route114_EventScript_ReceivedBerry:: @ 81F25C7 + msgbox Route114_Text_FunToThinkAboutBerries, MSGBOX_DEFAULT release end -Route114_EventScript_1F25D1:: @ 81F25D1 +Route114_EventScript_RoarGentleman:: @ 81F25D1 lock faceplayer - goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_1F2608 - msgbox Route114_Text_1F2809, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_ReceivedRoar + msgbox Route114_Text_AllMyMonDoesIsRoarTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_TM05 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM05 - msgbox Route114_Text_1F2872, MSGBOX_DEFAULT + msgbox Route114_Text_ExplainRoar, MSGBOX_DEFAULT release end -Route114_EventScript_1F2608:: @ 81F2608 - msgbox Route114_Text_1F2872, MSGBOX_DEFAULT +Route114_EventScript_ReceivedRoar:: @ 81F2608 + msgbox Route114_Text_ExplainRoar, MSGBOX_DEFAULT release end -Route114_EventScript_1F2612:: @ 81F2612 +Route114_EventScript_Poochyena:: @ 81F2612 lock faceplayer waitse playmoncry SPECIES_POOCHYENA, 2 - msgbox Route114_Text_1F28A6, MSGBOX_DEFAULT + msgbox Route114_Text_Poochyena, MSGBOX_DEFAULT waitmoncry release end -Route114_EventScript_1F2625:: @ 81F2625 - msgbox Route114_Text_1F28B3, MSGBOX_SIGN +Route114_EventScript_MeteorFallsSign:: @ 81F2625 + msgbox Route114_Text_MeteorFallsSign, MSGBOX_SIGN end -Route114_EventScript_1F262E:: @ 81F262E - msgbox Route114_Text_1F28DB, MSGBOX_SIGN +Route114_EventScript_FossilManiacsHouseSign:: @ 81F262E + msgbox Route114_Text_FossilManiacsHouseSign, MSGBOX_SIGN end -Route114_EventScript_1F2637:: @ 81F2637 - msgbox Route114_Text_1F2910, MSGBOX_SIGN +Route114_EventScript_LanettesHouseSign:: @ 81F2637 + msgbox Route114_Text_LanettesHouse, MSGBOX_SIGN end -Route114_EventScript_1F2640:: @ 81F2640 - trainerbattle_single TRAINER_LENNY, Route114_Text_29A6B1, Route114_Text_29A707 - msgbox Route114_Text_29A715, MSGBOX_AUTOCLOSE +Route114_EventScript_Lenny:: @ 81F2640 + trainerbattle_single TRAINER_LENNY, Route114_Text_LennyIntro, Route114_Text_LennyDefeat + msgbox Route114_Text_LennyPostBattle, MSGBOX_AUTOCLOSE end -Route114_EventScript_1F2657:: @ 81F2657 - trainerbattle_single TRAINER_LUCAS_1, Route114_Text_29A777, Route114_Text_29A7B5 - msgbox Route114_Text_29A7D4, MSGBOX_AUTOCLOSE +Route114_EventScript_Lucas:: @ 81F2657 + trainerbattle_single TRAINER_LUCAS_1, Route114_Text_LucasIntro, Route114_Text_LucasDefeat + msgbox Route114_Text_LucasPostBattle, MSGBOX_AUTOCLOSE end -Route114_EventScript_1F266E:: @ 81F266E - trainerbattle_single TRAINER_SHANE, Route114_Text_29A818, Route114_Text_29A88F - msgbox Route114_Text_29A89F, MSGBOX_AUTOCLOSE +Route114_EventScript_Shane:: @ 81F266E + trainerbattle_single TRAINER_SHANE, Route114_Text_ShaneIntro, Route114_Text_ShaneDefeat + msgbox Route114_Text_ShanePostBattle, MSGBOX_AUTOCLOSE end -Route114_EventScript_1F2685:: @ 81F2685 - trainerbattle_single TRAINER_NANCY, Route114_Text_29A8D9, Route114_Text_29A90E - msgbox Route114_Text_29A916, MSGBOX_AUTOCLOSE +Route114_EventScript_Nancy:: @ 81F2685 + trainerbattle_single TRAINER_NANCY, Route114_Text_NancyIntro, Route114_Text_NancyDefeat + msgbox Route114_Text_NancyPostBattle, MSGBOX_AUTOCLOSE end -Route114_EventScript_1F269C:: @ 81F269C - trainerbattle_single TRAINER_STEVE_1, Route114_Text_29A943, Route114_Text_29A973, Route114_EventScript_1F26C8 +Route114_EventScript_Steve:: @ 81F269C + trainerbattle_single TRAINER_STEVE_1, Route114_Text_SteveIntro, Route114_Text_SteveDefeat, Route114_EventScript_RegisterSteve specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route114_EventScript_1F26E7 - msgbox Route114_Text_29A981, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route114_EventScript_RematchSteve + msgbox Route114_Text_StevePostBattle, MSGBOX_DEFAULT release end -Route114_EventScript_1F26C8:: @ 81F26C8 +Route114_EventScript_RegisterSteve:: @ 81F26C8 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route114_Text_29A9F7, MSGBOX_DEFAULT + msgbox Route114_Text_SteveRegister, MSGBOX_DEFAULT register_matchcall TRAINER_STEVE_1 release end -Route114_EventScript_1F26E7:: @ 81F26E7 - trainerbattle_rematch TRAINER_STEVE_1, Route114_Text_29AA3E, Route114_Text_29AA67 - msgbox Route114_Text_29AA94, MSGBOX_AUTOCLOSE +Route114_EventScript_RematchSteve:: @ 81F26E7 + trainerbattle_rematch TRAINER_STEVE_1, Route114_Text_SteveRematchIntro, Route114_Text_SteveRematchDefeat + msgbox Route114_Text_StevePostRematch, MSGBOX_AUTOCLOSE end -Route114_EventScript_1F26FE:: @ 81F26FE - trainerbattle_single TRAINER_BERNIE_1, Route114_Text_29AADB, Route114_Text_29AB1A, Route114_EventScript_1F272A +Route114_EventScript_Bernie:: @ 81F26FE + trainerbattle_single TRAINER_BERNIE_1, Route114_Text_BernieIntro, Route114_Text_BernieDefeat, Route114_EventScript_RegisterBernie specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route114_EventScript_1F2749 - msgbox Route114_Text_29AB36, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route114_EventScript_RematchBernie + msgbox Route114_Text_BerniePostBattle, MSGBOX_DEFAULT release end -Route114_EventScript_1F272A:: @ 81F272A +Route114_EventScript_RegisterBernie:: @ 81F272A special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route114_Text_29ABA6, MSGBOX_DEFAULT + msgbox Route114_Text_BernieRegister, MSGBOX_DEFAULT register_matchcall TRAINER_BERNIE_1 release end -Route114_EventScript_1F2749:: @ 81F2749 - trainerbattle_rematch TRAINER_BERNIE_1, Route114_Text_29ABDC, Route114_Text_29AC10 - msgbox Route114_Text_29AC43, MSGBOX_AUTOCLOSE +Route114_EventScript_RematchBernie:: @ 81F2749 + trainerbattle_rematch TRAINER_BERNIE_1, Route114_Text_BernieRematchIntro, Route114_Text_BernieRematchDefeat + msgbox Route114_Text_BerniePostRematch, MSGBOX_AUTOCLOSE end -Route114_EventScript_1F2760:: @ 81F2760 - trainerbattle_single TRAINER_CLAUDE, Route114_Text_29ACB3, Route114_Text_29AD0A - msgbox Route114_Text_29AD2E, MSGBOX_AUTOCLOSE +Route114_EventScript_Claude:: @ 81F2760 + trainerbattle_single TRAINER_CLAUDE, Route114_Text_ClaudeIntro, Route114_Text_ClaudeDefeat + msgbox Route114_Text_ClaudePostBattle, MSGBOX_AUTOCLOSE end -Route114_EventScript_1F2777:: @ 81F2777 - trainerbattle_single TRAINER_NOLAN, Route114_Text_29ADA1, Route114_Text_29AE05 - msgbox Route114_Text_29AE3D, MSGBOX_AUTOCLOSE +Route114_EventScript_Nolan:: @ 81F2777 + trainerbattle_single TRAINER_NOLAN, Route114_Text_NolanIntro, Route114_Text_NolanDefeat + msgbox Route114_Text_NolanPostBattle, MSGBOX_AUTOCLOSE end -Route114_EventScript_1F278E:: @ 81F278E - trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_29AE96, Route114_Text_29AEE7, Route114_Text_29AF3D - msgbox Route114_Text_29AF0B, MSGBOX_AUTOCLOSE +Route114_EventScript_Tyra:: @ 81F278E + trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_TyraIntro, Route114_Text_TyraDefeat, Route114_Text_TyraNotEnoughMons + msgbox Route114_Text_TyraPostBattle, MSGBOX_AUTOCLOSE end -Route114_EventScript_1F27A9:: @ 81F27A9 - trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_29AF89, Route114_Text_29AFAC, Route114_Text_29B01B - msgbox Route114_Text_29AFCF, MSGBOX_AUTOCLOSE +Route114_EventScript_Ivy:: @ 81F27A9 + trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_IvyIntro, Route114_Text_IvyDefeat, Route114_Text_IvyNotEnoughMons + msgbox Route114_Text_IvyPostBattle, MSGBOX_AUTOCLOSE end -Route114_EventScript_1F27C4:: @ 81F27C4 - trainerbattle_single TRAINER_ANGELINA, Route114_Text_29B16F, Route114_Text_29B19C - msgbox Route114_Text_29B1BC, MSGBOX_AUTOCLOSE +Route114_EventScript_Angelina:: @ 81F27C4 + trainerbattle_single TRAINER_ANGELINA, Route114_Text_AngelinaIntro, Route114_Text_AngelinaDefeat + msgbox Route114_Text_AngelinaPostBattle, MSGBOX_AUTOCLOSE end -Route114_EventScript_1F27DB:: @ 81F27DB - trainerbattle_single TRAINER_CHARLOTTE, Route114_Text_29B0DB, Route114_Text_29B0FB - msgbox Route114_Text_29B11A, MSGBOX_AUTOCLOSE +Route114_EventScript_Charlotte:: @ 81F27DB + trainerbattle_single TRAINER_CHARLOTTE, Route114_Text_CharlotteIntro, Route114_Text_CharlotteDefeat + msgbox Route114_Text_CharlottePostBattle, MSGBOX_AUTOCLOSE end -Route114_EventScript_1F27F2:: @ 81F27F2 - trainerbattle_single TRAINER_KAI, Route114_Text_29B05D, Route114_Text_29B089 - msgbox Route114_Text_29B0B5, MSGBOX_AUTOCLOSE +Route114_EventScript_Kai:: @ 81F27F2 + trainerbattle_single TRAINER_KAI, Route114_Text_KaiIntro, Route114_Text_KaiDefeat + msgbox Route114_Text_KaiPostBattle, MSGBOX_AUTOCLOSE end -Route114_Text_1F2809: @ 81F2809 +Route114_Text_AllMyMonDoesIsRoarTakeThis: @ 81F2809 .string "All my POKéMON does is ROAR…\n" .string "No one dares to come near me…\p" .string "Sigh… If you would, please take\n" .string "this TM away…$" -Route114_Text_1F2872: @ 81F2872 +Route114_Text_ExplainRoar: @ 81F2872 .string "TM05 contains ROAR.\n" .string "A ROAR sends POKéMON scurrying.$" -Route114_Text_1F28A6: @ 81F28A6 +Route114_Text_Poochyena: @ 81F28A6 .string "Bow! Bowwow!$" -Route114_Text_1F28B3: @ 81F28B3 +Route114_Text_MeteorFallsSign: @ 81F28B3 .string "METEOR FALLS\n" .string "RUSTBORO CITY THROUGH HERE$" -Route114_Text_1F28DB: @ 81F28DB +Route114_Text_FossilManiacsHouseSign: @ 81F28DB .string "FOSSIL MANIAC'S HOUSE\n" .string "“Fossils gratefully accepted!”$" -Route114_Text_1F2910: @ 81F2910 +Route114_Text_LanettesHouse: @ 81F2910 .string "LANETTE'S HOUSE$" 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$" diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json index 8a369e407..366fe1ed5 100644 --- a/data/maps/Route116/map.json +++ b/data/maps/Route116/map.json @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route116_EventScript_1F2E89", + "script": "Route116_EventScript_Joey", "flag": "0" }, { @@ -100,7 +100,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route116_EventScript_1F2EA0", + "script": "Route116_EventScript_Jose", "flag": "0" }, { @@ -165,7 +165,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route116_EventScript_1F2D84", + "script": "Route116_EventScript_Briney", "flag": "FLAG_HIDE_ROUTE_116_MR_BRINEY" }, { @@ -191,7 +191,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route116_EventScript_1F2F65", + "script": "Route116_EventScript_Clark", "flag": "0" }, { @@ -230,7 +230,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route116_EventScript_1F2F7C", + "script": "Route116_EventScript_Janice", "flag": "0" }, { @@ -243,7 +243,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route116_EventScript_1F2F93", + "script": "Route116_EventScript_Karen", "flag": "0" }, { @@ -256,7 +256,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route116_EventScript_1F2EB7", + "script": "Route116_EventScript_Jerry", "flag": "0" }, { @@ -269,7 +269,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route116_EventScript_1F2CA2", + "script": "Route116_EventScript_DevonEmployee", "flag": "FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE" }, { @@ -295,8 +295,8 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route116_EventScript_1F2C70", - "flag": "FLAG_HIDE_ROUTE_116_TUNNELER" + "script": "Route116_EventScript_WandasBoyfriend", + "flag": "FLAG_HIDE_ROUTE_116_WANDAS_BOYFRIEND" }, { "graphics_id": "EVENT_OBJ_GFX_MANIAC", @@ -308,7 +308,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route116_EventScript_1F2DB6", + "script": "Route116_EventScript_GlassesMan", "flag": "FLAG_HIDE_ROUTE_116_DROPPED_GLASSES_MAN" }, { @@ -321,7 +321,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route116_EventScript_1F3041", + "script": "Route116_EventScript_Sarah", "flag": "0" }, { @@ -334,7 +334,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route116_EventScript_1F3058", + "script": "Route116_EventScript_Dawson", "flag": "0" }, { @@ -373,7 +373,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route116_EventScript_1F3086", + "script": "Route116_EventScript_Johnson", "flag": "0" }, { @@ -386,7 +386,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route116_EventScript_1F306F", + "script": "Route116_EventScript_Devan", "flag": "0" } ], @@ -435,7 +435,7 @@ "elevation": 3, "var": "VAR_ROUTE116_STATE", "var_value": "1", - "script": "Route116_EventScript_1F2D95" + "script": "Route116_EventScript_BrineyTrigger" } ], "bg_events": [ @@ -445,7 +445,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route116_EventScript_1F2D57" + "script": "Route116_EventScript_RouteSignRustboro" }, { "type": "sign", @@ -453,7 +453,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route116_EventScript_1F2D60" + "script": "Route116_EventScript_RusturfTunnelSign" }, { "type": "sign", @@ -461,7 +461,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route116_EventScript_1F2D69" + "script": "Route116_EventScript_TunnelersRestHouseSign" }, { "type": "secret_base", @@ -483,7 +483,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route116_EventScript_1F2D72" + "script": "Route116_EventScript_TrainerTipsBToStopEvolution" }, { "type": "sign", @@ -491,7 +491,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route116_EventScript_1F2D7B" + "script": "Route116_EventScript_TrainerTipsBagHasPockets" }, { "type": "secret_base", diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index f52c8a05f..1b69b312a 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -1,11 +1,11 @@ Route116_MapScripts:: @ 81F2C0C map_script MAP_SCRIPT_ON_TRANSITION, Route116_OnTransition - map_script MAP_SCRIPT_ON_LOAD, Route116_MapScript1_1F2C4F - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route116_MapScript2_1F2C66 + map_script MAP_SCRIPT_ON_LOAD, Route116_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route116_OnFrame .byte 0 Route116_OnTransition: @ 81F2C1C - call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_1F2C47 + call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_SetWandasBoyfriendPos compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq UnusualWeather_EventScript_HideMapNamePopup compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH @@ -14,90 +14,90 @@ Route116_OnTransition: @ 81F2C1C call_if_eq UnusualWeather_StartGroudonWeather end -Route116_EventScript_1F2C47:: @ 81F2C47 +Route116_EventScript_SetWandasBoyfriendPos:: @ 81F2C47 setobjectxyperm 21, 38, 10 return -Route116_MapScript1_1F2C4F: @ 81F2C4F +Route116_OnLoad: @ 81F2C4F compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH call_if_eq UnusualWeather_EventScript_PlaceTilesRoute116North compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_SOUTH call_if_eq UnusualWeather_EventScript_PlaceTilesRoute116South end -Route116_MapScript2_1F2C66: @ 81F2C66 +Route116_OnFrame: @ 81F2C66 map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 -Route116_EventScript_1F2C70:: @ 81F2C70 +Route116_EventScript_WandasBoyfriend:: @ 81F2C70 lock faceplayer - goto_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_1F2C8E - goto_if_set FLAG_DEVON_GOODS_STOLEN, Route116_EventScript_1F2C98 - msgbox Route116_Text_1F3140, MSGBOX_DEFAULT + goto_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_BoyfriendGruntLeftTunnel + goto_if_set FLAG_DEVON_GOODS_STOLEN, Route116_EventScript_BoyfriendGruntInTunnel + msgbox Route116_Text_WantToDigTunnel, MSGBOX_DEFAULT release end -Route116_EventScript_1F2C8E:: @ 81F2C8E - msgbox Route116_Text_1F32C1, MSGBOX_DEFAULT +Route116_EventScript_BoyfriendGruntLeftTunnel:: @ 81F2C8E + msgbox Route116_Text_GoonHightailedItOutOfTunnel, MSGBOX_DEFAULT release end -Route116_EventScript_1F2C98:: @ 81F2C98 - msgbox Route116_Text_1F3166, MSGBOX_DEFAULT +Route116_EventScript_BoyfriendGruntInTunnel:: @ 81F2C98 + msgbox Route116_Text_DiggingTunnelWhenGoonOrderedMeOut, MSGBOX_DEFAULT release end -Route116_EventScript_1F2CA2:: @ 81F2CA2 +Route116_EventScript_DevonEmployee:: @ 81F2CA2 lock faceplayer - goto_if_set FLAG_MET_DEVON_EMPLOYEE, Route116_EventScript_1F2D2B - msgbox Route116_Text_1F3317, MSGBOX_DEFAULT - goto Route116_EventScript_1F2CBB + goto_if_set FLAG_MET_DEVON_EMPLOYEE, Route116_EventScript_TryGiveRepeatBallAgain + msgbox Route116_Text_ThankYouTokenOfAppreciation, MSGBOX_DEFAULT + goto Route116_EventScript_GiveRepeatBall end -Route116_EventScript_1F2CBB:: @ 81F2CBB +Route116_EventScript_GiveRepeatBall:: @ 81F2CBB setflag FLAG_MET_DEVON_EMPLOYEE giveitem_std ITEM_REPEAT_BALL - compare VAR_RESULT, 0 - goto_if_eq Route116_EventScript_1F2D39 - msgbox Route116_Text_1F3521, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq Route116_EventScript_NoRoomForRepeatBall + msgbox Route116_Text_NewBallAvailableAtMart, MSGBOX_DEFAULT closemessage compare VAR_FACING, DIR_NORTH - call_if_eq Route116_EventScript_1F2D15 + call_if_eq Route116_EventScript_DevonEmployeeExit compare VAR_FACING, DIR_SOUTH - call_if_eq Route116_EventScript_1F2D15 + call_if_eq Route116_EventScript_DevonEmployeeExit compare VAR_FACING, DIR_WEST - call_if_eq Route116_EventScript_1F2D15 + call_if_eq Route116_EventScript_DevonEmployeeExit compare VAR_FACING, DIR_EAST - call_if_eq Route116_EventScript_1F2D20 + call_if_eq Route116_EventScript_DevonEmployeeExitEast removeobject VAR_LAST_TALKED clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE setflag FLAG_RECEIVED_REPEAT_BALL release end -Route116_EventScript_1F2D15:: @ 81F2D15 - applymovement VAR_LAST_TALKED, Route116_Movement_1F2D43 +Route116_EventScript_DevonEmployeeExit:: @ 81F2D15 + applymovement VAR_LAST_TALKED, Route116_Movement_DevonEmployeeExit waitmovement 0 return -Route116_EventScript_1F2D20:: @ 81F2D20 - applymovement VAR_LAST_TALKED, Route116_Movement_1F2D4C +Route116_EventScript_DevonEmployeeExitEast:: @ 81F2D20 + applymovement VAR_LAST_TALKED, Route116_Movement_DevonEmployeeExitEast waitmovement 0 return -Route116_EventScript_1F2D2B:: @ 81F2D2B - msgbox Route116_Text_1F35CE, MSGBOX_DEFAULT - goto Route116_EventScript_1F2CBB +Route116_EventScript_TryGiveRepeatBallAgain:: @ 81F2D2B + msgbox Route116_Text_TokenOfAppreciation, MSGBOX_DEFAULT + goto Route116_EventScript_GiveRepeatBall end -Route116_EventScript_1F2D39:: @ 81F2D39 - msgbox Route116_Text_1F3593, MSGBOX_DEFAULT +Route116_EventScript_NoRoomForRepeatBall:: @ 81F2D39 + msgbox Route116_Text_BagIsJamPacked, MSGBOX_DEFAULT release end -Route116_Movement_1F2D43: @ 81F2D43 +Route116_Movement_DevonEmployeeExit: @ 81F2D43 walk_left walk_left walk_left @@ -108,7 +108,7 @@ Route116_Movement_1F2D43: @ 81F2D43 walk_left step_end -Route116_Movement_1F2D4C: @ 81F2D4C +Route116_Movement_DevonEmployeeExitEast: @ 81F2D4C walk_down walk_left walk_left @@ -121,104 +121,104 @@ Route116_Movement_1F2D4C: @ 81F2D4C walk_left step_end -Route116_EventScript_1F2D57:: @ 81F2D57 - msgbox Route116_Text_1F379D, MSGBOX_SIGN +Route116_EventScript_RouteSignRustboro:: @ 81F2D57 + msgbox Route116_Text_RouteSignRustboro, MSGBOX_SIGN end -Route116_EventScript_1F2D60:: @ 81F2D60 - msgbox Route116_Text_1F37B7, MSGBOX_SIGN +Route116_EventScript_RusturfTunnelSign:: @ 81F2D60 + msgbox Route116_Text_RusturfTunnelSign, MSGBOX_SIGN end -Route116_EventScript_1F2D69:: @ 81F2D69 - msgbox Route116_Text_1F380F, MSGBOX_SIGN +Route116_EventScript_TunnelersRestHouseSign:: @ 81F2D69 + msgbox Route116_Text_TunnelersRestHouse, MSGBOX_SIGN end -Route116_EventScript_1F2D72:: @ 81F2D72 - msgbox Route116_Text_1F3825, MSGBOX_SIGN +Route116_EventScript_TrainerTipsBToStopEvolution:: @ 81F2D72 + msgbox Route116_Text_TrainerTipsBToStopEvolution, MSGBOX_SIGN end -Route116_EventScript_1F2D7B:: @ 81F2D7B - msgbox Route116_Text_1F38D4, MSGBOX_SIGN +Route116_EventScript_TrainerTipsBagHasPockets:: @ 81F2D7B + msgbox Route116_Text_TrainerTipsBagHasPockets, MSGBOX_SIGN end -Route116_EventScript_1F2D84:: @ 81F2D84 +Route116_EventScript_Briney:: @ 81F2D84 lock faceplayer - msgbox Route116_Text_1F309D, MSGBOX_DEFAULT + msgbox Route116_Text_ScoundrelMadeOffWithPeeko, MSGBOX_DEFAULT setvar VAR_ROUTE116_STATE, 2 release end -Route116_EventScript_1F2D95:: @ 81F2D95 +Route116_EventScript_BrineyTrigger:: @ 81F2D95 lockall applymovement 11, Common_Movement_WalkInPlaceFastestRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox Route116_Text_1F309D, MSGBOX_DEFAULT + msgbox Route116_Text_ScoundrelMadeOffWithPeeko, MSGBOX_DEFAULT setvar VAR_ROUTE116_STATE, 2 releaseall end -Route116_EventScript_1F2DB6:: @ 81F2DB6 +Route116_EventScript_GlassesMan:: @ 81F2DB6 lock faceplayer checkitem ITEM_BLACK_GLASSES, 1 - compare VAR_RESULT, 1 - goto_if_eq Route116_EventScript_1F2DF1 + compare VAR_RESULT, TRUE + goto_if_eq Route116_EventScript_PlayerHasGlasses specialvar VAR_RESULT, FoundBlackGlasses - compare VAR_RESULT, 1 - goto_if_eq Route116_EventScript_1F2DE2 - msgbox Route116_Text_1F3657, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route116_EventScript_FoundGlassesNotOnPlayer + msgbox Route116_Text_CanYouHelpMeFindGlasses, MSGBOX_DEFAULT release end -Route116_EventScript_1F2DE2:: @ 81F2DE2 - msgbox Route116_Text_1F3718, MSGBOX_DEFAULT +Route116_EventScript_FoundGlassesNotOnPlayer:: @ 81F2DE2 + msgbox Route116_Text_CantFindGlassesNotHere, MSGBOX_DEFAULT closemessage - goto Route116_EventScript_1F2E2A + goto Route116_EventScript_GlassesManExit end -Route116_EventScript_1F2DF1:: @ 81F2DF1 - msgbox Route116_Text_1F3657, MSGBOX_DEFAULT - msgbox Route116_Text_1F3688, MSGBOX_DEFAULT +Route116_EventScript_PlayerHasGlasses:: @ 81F2DF1 + msgbox Route116_Text_CanYouHelpMeFindGlasses, MSGBOX_DEFAULT + msgbox Route116_Text_MayISeeThoseGlasses, MSGBOX_DEFAULT specialvar VAR_RESULT, FoundBlackGlasses - compare VAR_RESULT, 1 - goto_if_eq Route116_EventScript_1F2E1B - msgbox Route116_Text_1F375E, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route116_EventScript_FoundGlassesOnPlayer + msgbox Route116_Text_NotWhatImLookingFor, MSGBOX_DEFAULT release end -Route116_EventScript_1F2E1B:: @ 81F2E1B - msgbox Route116_Text_1F36B4, MSGBOX_DEFAULT +Route116_EventScript_FoundGlassesOnPlayer:: @ 81F2E1B + msgbox Route116_Text_NotWhatImLookingForMaybeTheyArentHere, MSGBOX_DEFAULT closemessage - goto Route116_EventScript_1F2E2A + goto Route116_EventScript_GlassesManExit end -Route116_EventScript_1F2E2A:: @ 81F2E2A +Route116_EventScript_GlassesManExit:: @ 81F2E2A delay 20 compare VAR_FACING, DIR_NORTH - call_if_eq Route116_EventScript_1F2E5E + call_if_eq Route116_EventScript_GlassesManExitNormal compare VAR_FACING, DIR_SOUTH - call_if_eq Route116_EventScript_1F2E5E + call_if_eq Route116_EventScript_GlassesManExitNormal compare VAR_FACING, DIR_WEST - call_if_eq Route116_EventScript_1F2E5E + call_if_eq Route116_EventScript_GlassesManExitNormal compare VAR_FACING, DIR_EAST - call_if_eq Route116_EventScript_1F2E69 + call_if_eq Route116_EventScript_GlassesManExitEast removeobject VAR_LAST_TALKED release end -Route116_EventScript_1F2E5E:: @ 81F2E5E - applymovement VAR_LAST_TALKED, Route116_Movement_1F2E74 +Route116_EventScript_GlassesManExitNormal:: @ 81F2E5E + applymovement VAR_LAST_TALKED, Route116_Movement_GlassesManExit waitmovement 0 return -Route116_EventScript_1F2E69:: @ 81F2E69 - applymovement VAR_LAST_TALKED, Route116_Movement_1F2E7E +Route116_EventScript_GlassesManExitEast:: @ 81F2E69 + applymovement VAR_LAST_TALKED, Route116_Movement_GlassesManExitEast waitmovement 0 return -Route116_Movement_1F2E74: @ 81F2E74 +Route116_Movement_GlassesManExit: @ 81F2E74 walk_left walk_left walk_left @@ -230,7 +230,7 @@ Route116_Movement_1F2E74: @ 81F2E74 walk_left step_end -Route116_Movement_1F2E7E: @ 81F2E7E +Route116_Movement_GlassesManExitEast: @ 81F2E7E walk_up walk_left walk_left @@ -243,133 +243,133 @@ Route116_Movement_1F2E7E: @ 81F2E7E walk_left step_end -Route116_EventScript_1F2E89:: @ 81F2E89 - trainerbattle_single TRAINER_JOEY, Route116_Text_29BB79, Route116_Text_29BB9A - msgbox Route116_Text_29BBC6, MSGBOX_AUTOCLOSE +Route116_EventScript_Joey:: @ 81F2E89 + trainerbattle_single TRAINER_JOEY, Route116_Text_JoeyIntro, Route116_Text_JoeyDefeat + msgbox Route116_Text_JoeyPostBattle, MSGBOX_AUTOCLOSE end -Route116_EventScript_1F2EA0:: @ 81F2EA0 - trainerbattle_single TRAINER_JOSE, Route116_Text_29BBFD, Route116_Text_29BC25 - msgbox Route116_Text_29BC42, MSGBOX_AUTOCLOSE +Route116_EventScript_Jose:: @ 81F2EA0 + trainerbattle_single TRAINER_JOSE, Route116_Text_JoseIntro, Route116_Text_JoseDefeat + msgbox Route116_Text_JosePostBattle, MSGBOX_AUTOCLOSE end -Route116_EventScript_1F2EB7:: @ 81F2EB7 - trainerbattle_single TRAINER_JERRY_1, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8 +Route116_EventScript_Jerry:: @ 81F2EB7 + trainerbattle_single TRAINER_JERRY_1, Route116_Text_JerryIntro, Route116_Text_JerryDefeat, Route116_EventScript_TryRegisterJerryAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route116_EventScript_1F2F4E + compare VAR_RESULT, TRUE + goto_if_eq Route116_EventScript_RematchJerry setvar VAR_0x8004, TRAINER_JERRY_1 specialvar VAR_RESULT, IsTrainerRegistered - compare VAR_RESULT, 0 - goto_if_eq Route116_EventScript_1F2F22 - msgbox Route116_Text_29BD92, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq Route116_EventScript_TryRegisterJerry + msgbox Route116_Text_JerryPostBattle, MSGBOX_DEFAULT release end -Route116_EventScript_1F2EF8:: @ 81F2EF8 - goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F2F03 +Route116_EventScript_TryRegisterJerryAfterBattle:: @ 81F2EF8 + goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterJerryAfterBattle release end -Route116_EventScript_1F2F03:: @ 81F2F03 +Route116_EventScript_RegisterJerryAfterBattle:: @ 81F2F03 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route116_Text_29BE71, MSGBOX_DEFAULT + msgbox Route116_Text_JerryRegister2, MSGBOX_DEFAULT register_matchcall TRAINER_JERRY_1 release end -Route116_EventScript_1F2F22:: @ 81F2F22 - goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F2F35 - msgbox Route116_Text_29BD92, MSGBOX_DEFAULT +Route116_EventScript_TryRegisterJerry:: @ 81F2F22 + goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterJerry + msgbox Route116_Text_JerryPostBattle, MSGBOX_DEFAULT release end -Route116_EventScript_1F2F35:: @ 81F2F35 - msgbox Route116_Text_29BDEF, MSGBOX_DEFAULT +Route116_EventScript_RegisterJerry:: @ 81F2F35 + msgbox Route116_Text_JerryRegister1, MSGBOX_DEFAULT register_matchcall TRAINER_JERRY_1 release end -Route116_EventScript_1F2F4E:: @ 81F2F4E - trainerbattle_rematch TRAINER_JERRY_1, Route116_Text_29BEF3, Route116_Text_29BF4C - msgbox Route116_Text_29BF68, MSGBOX_AUTOCLOSE +Route116_EventScript_RematchJerry:: @ 81F2F4E + trainerbattle_rematch TRAINER_JERRY_1, Route116_Text_JerryRematchIntro, Route116_Text_JerryRematchDefeat + msgbox Route116_Text_JerryPostRematch, MSGBOX_AUTOCLOSE end -Route116_EventScript_1F2F65:: @ 81F2F65 - trainerbattle_single TRAINER_CLARK, Route116_Text_29BACD, Route116_Text_29BB0F - msgbox Route116_Text_29BB31, MSGBOX_AUTOCLOSE +Route116_EventScript_Clark:: @ 81F2F65 + trainerbattle_single TRAINER_CLARK, Route116_Text_ClarkIntro, Route116_Text_ClarkDefeat + msgbox Route116_Text_ClarkPostBattle, MSGBOX_AUTOCLOSE end -Route116_EventScript_1F2F7C:: @ 81F2F7C - trainerbattle_single TRAINER_JANICE, Route116_Text_29BC7F, Route116_Text_29BCB3 - msgbox Route116_Text_29BCCC, MSGBOX_AUTOCLOSE +Route116_EventScript_Janice:: @ 81F2F7C + trainerbattle_single TRAINER_JANICE, Route116_Text_JaniceIntro, Route116_Text_JaniceDefeat + msgbox Route116_Text_JanicePostBattle, MSGBOX_AUTOCLOSE end -Route116_EventScript_1F2F93:: @ 81F2F93 - trainerbattle_single TRAINER_KAREN_1, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4 +Route116_EventScript_Karen:: @ 81F2F93 + trainerbattle_single TRAINER_KAREN_1, Route116_Text_KarenIntro, Route116_Text_KarenDefeat, Route116_EventScript_TryRegisterKarenAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route116_EventScript_1F302A + compare VAR_RESULT, TRUE + goto_if_eq Route116_EventScript_RematchKaren setvar VAR_0x8004, TRAINER_KAREN_1 specialvar VAR_RESULT, IsTrainerRegistered - compare VAR_RESULT, 0 - goto_if_eq Route116_EventScript_1F2FFE - msgbox Route116_Text_29C010, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq Route116_EventScript_TryRegisterKaren + msgbox Route116_Text_KarenPostBattle, MSGBOX_DEFAULT release end -Route116_EventScript_1F2FD4:: @ 81F2FD4 - goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F2FDF +Route116_EventScript_TryRegisterKarenAfterBattle:: @ 81F2FD4 + goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterKarenAfterBattle release end -Route116_EventScript_1F2FDF:: @ 81F2FDF +Route116_EventScript_RegisterKarenAfterBattle:: @ 81F2FDF special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route116_Text_29C096, MSGBOX_DEFAULT + msgbox Route116_Text_KarenRegister2, MSGBOX_DEFAULT register_matchcall TRAINER_KAREN_1 release end -Route116_EventScript_1F2FFE:: @ 81F2FFE - goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F3011 - msgbox Route116_Text_29C010, MSGBOX_DEFAULT +Route116_EventScript_TryRegisterKaren:: @ 81F2FFE + goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterKaren + msgbox Route116_Text_KarenPostBattle, MSGBOX_DEFAULT release end -Route116_EventScript_1F3011:: @ 81F3011 - msgbox Route116_Text_29C052, MSGBOX_DEFAULT +Route116_EventScript_RegisterKaren:: @ 81F3011 + msgbox Route116_Text_KarenRegister1, MSGBOX_DEFAULT register_matchcall TRAINER_KAREN_1 release end -Route116_EventScript_1F302A:: @ 81F302A - trainerbattle_rematch TRAINER_KAREN_1, Route116_Text_29C0DA, Route116_Text_29C11F - msgbox Route116_Text_29C13B, MSGBOX_AUTOCLOSE +Route116_EventScript_RematchKaren:: @ 81F302A + trainerbattle_rematch TRAINER_KAREN_1, Route116_Text_KarenRematchIntro, Route116_Text_KarenRematchDefeat + msgbox Route116_Text_KarenPostRematch, MSGBOX_AUTOCLOSE end -Route116_EventScript_1F3041:: @ 81F3041 - trainerbattle_single TRAINER_SARAH, Route116_Text_29C173, Route116_Text_29C1B8 - msgbox Route116_Text_29C1EA, MSGBOX_AUTOCLOSE +Route116_EventScript_Sarah:: @ 81F3041 + trainerbattle_single TRAINER_SARAH, Route116_Text_SarahIntro, Route116_Text_SarahDefeat + msgbox Route116_Text_SarahPostBattle, MSGBOX_AUTOCLOSE end -Route116_EventScript_1F3058:: @ 81F3058 - trainerbattle_single TRAINER_DAWSON, Route116_Text_29C266, Route116_Text_29C2C2 - msgbox Route116_Text_29C2DD, MSGBOX_AUTOCLOSE +Route116_EventScript_Dawson:: @ 81F3058 + trainerbattle_single TRAINER_DAWSON, Route116_Text_DawsonIntro, Route116_Text_DawsonDefeat + msgbox Route116_Text_DawsonPostBattle, MSGBOX_AUTOCLOSE end -Route116_EventScript_1F306F:: @ 81F306F - trainerbattle_single TRAINER_DEVAN, Route116_Text_29C350, Route116_Text_29C365 - msgbox Route116_Text_29C380, MSGBOX_AUTOCLOSE +Route116_EventScript_Devan:: @ 81F306F + trainerbattle_single TRAINER_DEVAN, Route116_Text_DevanIntro, Route116_Text_DevanDefeat + msgbox Route116_Text_DevanPostBattle, MSGBOX_AUTOCLOSE end -Route116_EventScript_1F3086:: @ 81F3086 - trainerbattle_single TRAINER_JOHNSON, Route116_Text_29C3C1, Route116_Text_29C3F7 - msgbox Route116_Text_29C418, MSGBOX_AUTOCLOSE +Route116_EventScript_Johnson:: @ 81F3086 + trainerbattle_single TRAINER_JOHNSON, Route116_Text_JohnsonIntro, Route116_Text_JohnsonDefeat + msgbox Route116_Text_JohnsonPostBattle, MSGBOX_AUTOCLOSE end -Route116_Text_1F309D: @ 81F309D +Route116_Text_ScoundrelMadeOffWithPeeko: @ 81F309D .string "Ohhh, what am I to do?\p" .string "We were on our walk, PEEKO and I, when\n" .string "we were jumped by an odd thug…\p" @@ -377,11 +377,11 @@ Route116_Text_1F309D: @ 81F309D .string "darling PEEKO!\p" .string "Wrrrooooooaaaar! PEEKO!$" -Route116_Text_1F3140: @ 81F3140 +Route116_Text_WantToDigTunnel: @ 81F3140 .string "Nnn… Roar!\p" .string "I want to dig that tunnel!$" -Route116_Text_1F3166: @ 81F3166 +Route116_Text_DiggingTunnelWhenGoonOrderedMeOut: @ 81F3166 .string "Nnn… Roar!\n" .string "What's going on?\p" .string "I was digging the tunnel without any\n" @@ -395,12 +395,12 @@ Route116_Text_1F3166: @ 81F3166 .string "something stupid and startle the\l" .string "POKéMON into an uproar.$" -Route116_Text_1F32C1: @ 81F32C1 +Route116_Text_GoonHightailedItOutOfTunnel: @ 81F32C1 .string "Nnn… Roar!\p" .string "That goofy goon hightailed it out of\n" .string "the tunnel! I can go back to digging!$" -Route116_Text_1F3317: @ 81F3317 +Route116_Text_ThankYouTokenOfAppreciation: @ 81F3317 .string "Oh! It's you!\p" .string "You're that person who not only helped\n" .string "me in PETALBURG WOODS, but also got\l" @@ -419,61 +419,61 @@ Route116_Text_1F3317: @ 81F3317 .string "As a token of our appreciation, this\n" .string "is our gift to our wonderful TRAINER!$" -Route116_Text_1F3521: @ 81F3521 +Route116_Text_NewBallAvailableAtMart: @ 81F3521 .string "Our new POKé BALL will be available\n" .string "at the POKéMON MART in RUSTBORO.\p" .string "Please do try it out!\n" .string "Thank you and bye-bye!$" -Route116_Text_1F3593: @ 81F3593 +Route116_Text_BagIsJamPacked: @ 81F3593 .string "Your BAG is jam-packed.\n" .string "I can't give you this REPEAT BALL.$" -Route116_Text_1F35CE: @ 81F35CE +Route116_Text_TokenOfAppreciation: @ 81F35CE .string "As a token of our appreciation for\n" .string "your delivering our package, I have\l" .string "a gift of a new kind of POKé BALL\l" .string "for our most wonderful TRAINER!$" -Route116_Text_1F3657: @ 81F3657 +Route116_Text_CanYouHelpMeFindGlasses: @ 81F3657 .string "I dropped my glasses…\n" .string "Can you help me find them?$" -Route116_Text_1F3688: @ 81F3688 +Route116_Text_MayISeeThoseGlasses: @ 81F3688 .string "Those glasses!\n" .string "May I see them for a second?$" -Route116_Text_1F36B4: @ 81F36B4 +Route116_Text_NotWhatImLookingForMaybeTheyArentHere: @ 81F36B4 .string "Hmm…\n" .string "These are BLACKGLASSES.\l" .string "They're not what I'm looking for…\p" .string "Maybe my glasses aren't around\n" .string "here…$" -Route116_Text_1F3718: @ 81F3718 +Route116_Text_CantFindGlassesNotHere: @ 81F3718 .string "Hmm…\n" .string "I can't find my glasses anywhere…\l" .string "Maybe they're not around here…$" -Route116_Text_1F375E: @ 81F375E +Route116_Text_NotWhatImLookingFor: @ 81F375E .string "Hmm…\n" .string "These are BLACKGLASSES.\l" .string "They're not what I'm looking for…$" -Route116_Text_1F379D: @ 81F379D +Route116_Text_RouteSignRustboro: @ 81F379D .string "ROUTE 116\n" .string "{LEFT_ARROW} RUSTBORO CITY$" -Route116_Text_1F37B7: @ 81F37B7 +Route116_Text_RusturfTunnelSign: @ 81F37B7 .string "RUSTURF TUNNEL\n" .string "“Linking RUSTBORO and VERDANTURF\p" .string "“The tunnel project has been\n" .string "canceled.”$" -Route116_Text_1F380F: @ 81F380F +Route116_Text_TunnelersRestHouse: @ 81F380F .string "TUNNELER'S REST HOUSE$" -Route116_Text_1F3825: @ 81F3825 +Route116_Text_TrainerTipsBToStopEvolution: @ 81F3825 .string "TRAINER TIPS\p" .string "If you want to stop a POKéMON from\n" .string "evolving, press the B Button while it\l" @@ -481,7 +481,7 @@ Route116_Text_1F3825: @ 81F3825 .string "The startled POKéMON will stop.\p" .string "This is called an evolution cancel.$" -Route116_Text_1F38D4: @ 81F38D4 +Route116_Text_TrainerTipsBagHasPockets: @ 81F38D4 .string "TRAINER TIPS\p" .string "Your BAG has several POCKETS.\p" .string "Items you obtain are automatically\n" diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json index 12420784c..4bb513cdf 100644 --- a/data/maps/Route117/map.json +++ b/data/maps/Route117/map.json @@ -35,7 +35,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route117_EventScript_1F399A", + "script": "Route117_EventScript_Woman", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 2, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route117_EventScript_1F39A3", + "script": "Route117_EventScript_LittleBoy", "flag": "0" }, { @@ -126,7 +126,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route117_EventScript_1F3A94", + "script": "Route117_EventScript_Dylan", "flag": "0" }, { @@ -139,7 +139,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route117_EventScript_1F3A32", + "script": "Route117_EventScript_Lydia", "flag": "0" }, { @@ -152,7 +152,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route117_EventScript_1F39D0", + "script": "Route117_EventScript_Isaac", "flag": "0" }, { @@ -243,7 +243,7 @@ "movement_range_y": 2, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route117_EventScript_1F3AF6", + "script": "Route117_EventScript_Maria", "flag": "0" }, { @@ -256,7 +256,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route117_EventScript_1F3B58", + "script": "Route117_EventScript_Derek", "flag": "0" }, { @@ -269,7 +269,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route117_EventScript_1F3BD3", + "script": "Route117_EventScript_Meg", "flag": "0" }, { @@ -282,7 +282,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route117_EventScript_1F3B6F", + "script": "Route117_EventScript_Anna", "flag": "0" }, { @@ -295,7 +295,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route117_EventScript_1F39AC", + "script": "Route117_EventScript_Girl", "flag": "0" }, { @@ -308,7 +308,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route117_EventScript_1F3C4E", + "script": "Route117_EventScript_Brandi", "flag": "0" }, { @@ -321,7 +321,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route117_EventScript_1F3C65", + "script": "Route117_EventScript_Aisha", "flag": "0" }, { @@ -334,7 +334,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route117_EventScript_1F3C37", + "script": "Route117_EventScript_Melina", "flag": "0" } ], @@ -355,7 +355,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route117_EventScript_1F39B5" + "script": "Route117_EventScript_RouteSignVerdanturf" }, { "type": "sign", @@ -363,7 +363,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route117_EventScript_1F39BE" + "script": "Route117_EventScript_RouteSignMauville" }, { "type": "sign", @@ -371,7 +371,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route117_EventScript_1F39C7" + "script": "Route117_EventScript_DayCareSign" }, { "type": "hidden_item", diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index 40d121fc7..47d8eced9 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -3,211 +3,210 @@ Route117_MapScripts:: @ 81F397D .byte 0 Route117_OnTransition: @ 81F3983 - call Route117_EventScript_1F3989 + call Route117_EventScript_TryMoveDayCareMan end -Route117_EventScript_1F3989:: @ 81F3989 - goto_if_unset FLAG_PENDING_DAYCARE_EGG, Route117_EventScript_1F3999 +Route117_EventScript_TryMoveDayCareMan:: @ 81F3989 + goto_if_unset FLAG_PENDING_DAYCARE_EGG, Route117_EventScript_StopMoveDayCareMan setobjectxyperm 3, 47, 6 - -Route117_EventScript_1F3999:: @ 81F3999 +Route117_EventScript_StopMoveDayCareMan:: @ 81F3999 return -Route117_EventScript_1F399A:: @ 81F399A - msgbox Route117_Text_1F3CFD, MSGBOX_NPC +Route117_EventScript_Woman:: @ 81F399A + msgbox Route117_Text_ArentTheseFlowersPretty, MSGBOX_NPC end -Route117_EventScript_1F39A3:: @ 81F39A3 - msgbox Route117_Text_1F3D41, MSGBOX_NPC +Route117_EventScript_LittleBoy:: @ 81F39A3 + msgbox Route117_Text_AirIsTastyHere, MSGBOX_NPC end -Route117_EventScript_1F39AC:: @ 81F39AC - msgbox Route117_Text_1F3C7C, MSGBOX_NPC +Route117_EventScript_Girl:: @ 81F39AC + msgbox Route117_Text_DayCarePokemonHadNewMove, MSGBOX_NPC end -Route117_EventScript_1F39B5:: @ 81F39B5 - msgbox Route117_Text_1F3D58, MSGBOX_SIGN +Route117_EventScript_RouteSignVerdanturf:: @ 81F39B5 + msgbox Route117_Text_RouteSignVerdanturf, MSGBOX_SIGN end -Route117_EventScript_1F39BE:: @ 81F39BE - msgbox Route117_Text_1F3D74, MSGBOX_SIGN +Route117_EventScript_RouteSignMauville:: @ 81F39BE + msgbox Route117_Text_RouteSignMauville, MSGBOX_SIGN end -Route117_EventScript_1F39C7:: @ 81F39C7 - msgbox Route117_Text_1F3D8E, MSGBOX_SIGN +Route117_EventScript_DayCareSign:: @ 81F39C7 + msgbox Route117_Text_DayCareSign, MSGBOX_SIGN end -Route117_EventScript_1F39D0:: @ 81F39D0 - trainerbattle_single TRAINER_ISAAC_1, Route117_Text_29C43F, Route117_Text_29C47A, Route117_EventScript_1F39FC +Route117_EventScript_Isaac:: @ 81F39D0 + trainerbattle_single TRAINER_ISAAC_1, Route117_Text_IsaacIntro, Route117_Text_IsaacDefeat, Route117_EventScript_RegisterIsaac specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route117_EventScript_1F3A1B - msgbox Route117_Text_29C498, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route117_EventScript_RematchIsaac + msgbox Route117_Text_IsaacPostBattle, MSGBOX_DEFAULT release end -Route117_EventScript_1F39FC:: @ 81F39FC +Route117_EventScript_RegisterIsaac:: @ 81F39FC special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route117_Text_29C508, MSGBOX_DEFAULT + msgbox Route117_Text_IsaacRegister, MSGBOX_DEFAULT register_matchcall TRAINER_ISAAC_1 release end -Route117_EventScript_1F3A1B:: @ 81F3A1B - trainerbattle_rematch TRAINER_ISAAC_1, Route117_Text_29C549, Route117_Text_29C58B - msgbox Route117_Text_29C5D0, MSGBOX_AUTOCLOSE +Route117_EventScript_RematchIsaac:: @ 81F3A1B + trainerbattle_rematch TRAINER_ISAAC_1, Route117_Text_IsaacRematchIntro, Route117_Text_IsaacRematchDefeat + msgbox Route117_Text_IsaacPostRematch, MSGBOX_AUTOCLOSE end -Route117_EventScript_1F3A32:: @ 81F3A32 - trainerbattle_single TRAINER_LYDIA_1, Route117_Text_29C612, Route117_Text_29C659, Route117_EventScript_1F3A5E +Route117_EventScript_Lydia:: @ 81F3A32 + trainerbattle_single TRAINER_LYDIA_1, Route117_Text_LydiaIntro, Route117_Text_LydiaDefeat, Route117_EventScript_RegisterLydia specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route117_EventScript_1F3A7D - msgbox Route117_Text_29C679, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route117_EventScript_RematchLydia + msgbox Route117_Text_LydiaPostBattle, MSGBOX_DEFAULT release end -Route117_EventScript_1F3A5E:: @ 81F3A5E +Route117_EventScript_RegisterLydia:: @ 81F3A5E special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route117_Text_29C6BC, MSGBOX_DEFAULT + msgbox Route117_Text_LydiaRegister, MSGBOX_DEFAULT register_matchcall TRAINER_LYDIA_1 release end -Route117_EventScript_1F3A7D:: @ 81F3A7D - trainerbattle_rematch TRAINER_LYDIA_1, Route117_Text_29C6FD, Route117_Text_29C73E - msgbox Route117_Text_29C75A, MSGBOX_AUTOCLOSE +Route117_EventScript_RematchLydia:: @ 81F3A7D + trainerbattle_rematch TRAINER_LYDIA_1, Route117_Text_LydiaRematchIntro, Route117_Text_LydiaRematchDefeat + msgbox Route117_Text_LydiaPostRematch, MSGBOX_AUTOCLOSE end -Route117_EventScript_1F3A94:: @ 81F3A94 - trainerbattle_single TRAINER_DYLAN_1, Route117_Text_29C7A5, Route117_Text_29C7EB, Route117_EventScript_1F3AC0 +Route117_EventScript_Dylan:: @ 81F3A94 + trainerbattle_single TRAINER_DYLAN_1, Route117_Text_DylanIntro, Route117_Text_DylanDefeat, Route117_EventScript_RegisterDylan specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route117_EventScript_1F3ADF - msgbox Route117_Text_29C800, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route117_EventScript_RematchDylan + msgbox Route117_Text_DylanPostBattle, MSGBOX_DEFAULT release end -Route117_EventScript_1F3AC0:: @ 81F3AC0 +Route117_EventScript_RegisterDylan:: @ 81F3AC0 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route117_Text_29C846, MSGBOX_DEFAULT + msgbox Route117_Text_DylanRegister, MSGBOX_DEFAULT register_matchcall TRAINER_DYLAN_1 release end -Route117_EventScript_1F3ADF:: @ 81F3ADF - trainerbattle_rematch TRAINER_DYLAN_1, Route117_Text_29C880, Route117_Text_29C8E3 - msgbox Route117_Text_29C8FE, MSGBOX_AUTOCLOSE +Route117_EventScript_RematchDylan:: @ 81F3ADF + trainerbattle_rematch TRAINER_DYLAN_1, Route117_Text_DylanRematchIntro, Route117_Text_DylanRematchDefeat + msgbox Route117_Text_DylanPostRematch, MSGBOX_AUTOCLOSE end -Route117_EventScript_1F3AF6:: @ 81F3AF6 - trainerbattle_single TRAINER_MARIA_1, Route117_Text_29C955, Route117_Text_29C9A6, Route117_EventScript_1F3B22 +Route117_EventScript_Maria:: @ 81F3AF6 + trainerbattle_single TRAINER_MARIA_1, Route117_Text_MariaIntro, Route117_Text_MariaDefeat, Route117_EventScript_RegisterMaria specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route117_EventScript_1F3B41 - msgbox Route117_Text_29C9D0, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route117_EventScript_RematchMaria + msgbox Route117_Text_MariaPostBattle, MSGBOX_DEFAULT release end -Route117_EventScript_1F3B22:: @ 81F3B22 +Route117_EventScript_RegisterMaria:: @ 81F3B22 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route117_Text_29CA32, MSGBOX_DEFAULT + msgbox Route117_Text_MariaRegister, MSGBOX_DEFAULT register_matchcall TRAINER_MARIA_1 release end -Route117_EventScript_1F3B41:: @ 81F3B41 - trainerbattle_rematch TRAINER_MARIA_1, Route117_Text_29CA7C, Route117_Text_29CACC - msgbox Route117_Text_29CAF6, MSGBOX_AUTOCLOSE +Route117_EventScript_RematchMaria:: @ 81F3B41 + trainerbattle_rematch TRAINER_MARIA_1, Route117_Text_MariaRematchIntro, Route117_Text_MariaRematchDefeat + msgbox Route117_Text_MariaPostRematch, MSGBOX_AUTOCLOSE end -Route117_EventScript_1F3B58:: @ 81F3B58 - trainerbattle_single TRAINER_DEREK, Route117_Text_29CB32, Route117_Text_29CB87 - msgbox Route117_Text_29CBAD, MSGBOX_AUTOCLOSE +Route117_EventScript_Derek:: @ 81F3B58 + trainerbattle_single TRAINER_DEREK, Route117_Text_DerekIntro, Route117_Text_DerekDefeat + msgbox Route117_Text_DerekPostBattle, MSGBOX_AUTOCLOSE end -Route117_EventScript_1F3B6F:: @ 81F3B6F - trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CC4A, Route117_Text_29CC8E, Route117_Text_29CD61, Route117_EventScript_1F3B9F +Route117_EventScript_Anna:: @ 81F3B6F + trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_AnnaIntro, Route117_Text_AnnaDefeat, Route117_Text_AnnaNotEnoughMons, Route117_EventScript_RegisterAnna specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route117_EventScript_1F3BB8 - msgbox Route117_Text_29CCCB, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route117_EventScript_RematchAnna + msgbox Route117_Text_AnnaPostBattle, MSGBOX_DEFAULT release end -Route117_EventScript_1F3B9F:: @ 81F3B9F - msgbox Route117_Text_29CD1D, MSGBOX_DEFAULT +Route117_EventScript_RegisterAnna:: @ 81F3B9F + msgbox Route117_Text_AnnaAndMegRegister, MSGBOX_DEFAULT register_matchcall TRAINER_ANNA_AND_MEG_1 release end -Route117_EventScript_1F3BB8:: @ 81F3BB8 - trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CEB6, Route117_Text_29CEF6, Route117_Text_29CF6E - msgbox Route117_Text_29CF1C, MSGBOX_AUTOCLOSE +Route117_EventScript_RematchAnna:: @ 81F3BB8 + trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_AnnaRematchIntro, Route117_Text_AnnaRematchDefeat, Route117_Text_AnnaRematchNotEnoughMons + msgbox Route117_Text_AnnaPostRematch, MSGBOX_AUTOCLOSE end -Route117_EventScript_1F3BD3:: @ 81F3BD3 - trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CD9D, Route117_Text_29CDE9, Route117_Text_29CE52, Route117_EventScript_1F3C03 +Route117_EventScript_Meg:: @ 81F3BD3 + trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_MegIntro, Route117_Text_MegDefeat, Route117_Text_MegNotEnoughMons, Route117_EventScript_RegisterMeg specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route117_EventScript_1F3C1C - msgbox Route117_Text_29CE17, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route117_EventScript_RematchMeg + msgbox Route117_Text_MegPostBattle, MSGBOX_DEFAULT release end -Route117_EventScript_1F3C03:: @ 81F3C03 - msgbox Route117_Text_29CD1D, MSGBOX_DEFAULT +Route117_EventScript_RegisterMeg:: @ 81F3C03 + msgbox Route117_Text_AnnaAndMegRegister, MSGBOX_DEFAULT register_matchcall TRAINER_ANNA_AND_MEG_1 release end -Route117_EventScript_1F3C1C:: @ 81F3C1C - trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CFAA, Route117_Text_29CFED, Route117_Text_29D053 - msgbox Route117_Text_29CFFE, MSGBOX_AUTOCLOSE +Route117_EventScript_RematchMeg:: @ 81F3C1C + trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_MegRematchIntro, Route117_Text_MegRematchDefeat, Route117_Text_MegRematchNotEnoughMons + msgbox Route117_Text_MegPostRematch, MSGBOX_AUTOCLOSE end -Route117_EventScript_1F3C37:: @ 81F3C37 - trainerbattle_single TRAINER_MELINA, Route117_Text_29D0B7, Route117_Text_29D0F1 - msgbox Route117_Text_29D10E, MSGBOX_AUTOCLOSE +Route117_EventScript_Melina:: @ 81F3C37 + trainerbattle_single TRAINER_MELINA, Route117_Text_MelinaIntro, Route117_Text_MelinaDefeat + msgbox Route117_Text_MelinaPostBattle, MSGBOX_AUTOCLOSE end -Route117_EventScript_1F3C4E:: @ 81F3C4E - trainerbattle_single TRAINER_BRANDI, Route117_Text_29D14B, Route117_Text_29D189 - msgbox Route117_Text_29D196, MSGBOX_AUTOCLOSE +Route117_EventScript_Brandi:: @ 81F3C4E + trainerbattle_single TRAINER_BRANDI, Route117_Text_BrandiIntro, Route117_Text_BrandiDefeat + msgbox Route117_Text_BrandiPostBattle, MSGBOX_AUTOCLOSE end -Route117_EventScript_1F3C65:: @ 81F3C65 - trainerbattle_single TRAINER_AISHA, Route117_Text_29D1D1, Route117_Text_29D206 - msgbox Route117_Text_29D24C, MSGBOX_AUTOCLOSE +Route117_EventScript_Aisha:: @ 81F3C65 + trainerbattle_single TRAINER_AISHA, Route117_Text_AishaIntro, Route117_Text_AishaDefeat + msgbox Route117_Text_AishaPostBattle, MSGBOX_AUTOCLOSE end -Route117_Text_1F3C7C: @ 81F3C7C +Route117_Text_DayCarePokemonHadNewMove: @ 81F3C7C .string "I left my POKéMON at the DAY CARE.\p" .string "When I got it back, it had a new move\n" .string "that I didn't teach it.\l" .string "I was really, really surprised.$" -Route117_Text_1F3CFD: @ 81F3CFD +Route117_Text_ArentTheseFlowersPretty: @ 81F3CFD .string "What do you think?\n" .string "Aren't these flowers pretty?\p" .string "I planted them all!$" -Route117_Text_1F3D41: @ 81F3D41 +Route117_Text_AirIsTastyHere: @ 81F3D41 .string "The air is tasty here!$" -Route117_Text_1F3D58: @ 81F3D58 +Route117_Text_RouteSignVerdanturf: @ 81F3D58 .string "ROUTE 117\n" .string "{LEFT_ARROW} VERDANTURF TOWN$" -Route117_Text_1F3D74: @ 81F3D74 +Route117_Text_RouteSignMauville: @ 81F3D74 .string "ROUTE 117\n" .string "{RIGHT_ARROW} MAUVILLE CITY$" -Route117_Text_1F3D8E: @ 81F3D8E +Route117_Text_DayCareSign: @ 81F3D8E .string "POKéMON DAY CARE\n" .string "“Let us raise your POKéMON.”$" diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json index 40a988bad..d64adbb86 100644 --- a/data/maps/Route118/map.json +++ b/data/maps/Route118/map.json @@ -79,7 +79,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route118_EventScript_1F4079", + "script": "Route118_EventScript_Perry", "flag": "0" }, { @@ -118,7 +118,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route118_EventScript_1F3E73", + "script": "Route118_EventScript_Girl", "flag": "0" }, { @@ -131,7 +131,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route118_EventScript_GabbyBattle5", + "script": "GabbyAndTy_EventScript_GabbyBattle5", "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2" }, { @@ -144,7 +144,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route118_EventScript_TyBattle5", + "script": "GabbyAndTy_EventScript_TyBattle5", "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2" }, { @@ -196,7 +196,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route118_EventScript_1F3E14", + "script": "Route118_EventScript_GoodRodFisherman", "flag": "0" }, { @@ -209,7 +209,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route118_EventScript_1F3F87", + "script": "Route118_EventScript_Rose", "flag": "0" }, { @@ -222,7 +222,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "Route118_EventScript_1F4000", + "script": "Route118_EventScript_Wade", "flag": "0" }, { @@ -235,7 +235,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route118_EventScript_1F4090", + "script": "Route118_EventScript_Chester", "flag": "0" }, { @@ -248,7 +248,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route118_EventScript_1F3FE9", + "script": "Route118_EventScript_Barny", "flag": "0" }, { @@ -261,7 +261,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route118_EventScript_1F4017", + "script": "Route118_EventScript_Dalton", "flag": "0" }, { @@ -300,7 +300,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route118_EventScript_1F40A7", + "script": "Route118_EventScript_Deandre", "flag": "0" } ], @@ -328,7 +328,7 @@ "elevation": 3, "var": "VAR_ROUTE118_STATE", "var_value": "0", - "script": "Route118_EventScript_1F3E8E" + "script": "Route118_EventScript_StevenTrigger0" }, { "type": "trigger", @@ -337,7 +337,7 @@ "elevation": 3, "var": "VAR_ROUTE118_STATE", "var_value": "0", - "script": "Route118_EventScript_1F3EAE" + "script": "Route118_EventScript_StevenTrigger1" }, { "type": "trigger", @@ -346,7 +346,7 @@ "elevation": 3, "var": "VAR_ROUTE118_STATE", "var_value": "0", - "script": "Route118_EventScript_1F3EC4" + "script": "Route118_EventScript_StevenTrigger2" } ], "bg_events": [ @@ -363,7 +363,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route118_EventScript_1F3E7C" + "script": "Route118_EventScript_RouteSignMauville" }, { "type": "sign", @@ -371,7 +371,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route118_EventScript_1F3E85" + "script": "Route118_EventScript_RouteSign119" }, { "type": "secret_base", diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index fe9c4137d..7b2326b13 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -1,7 +1,7 @@ Route118_MapScripts:: @ 81F3DBC map_script MAP_SCRIPT_ON_TRANSITION, Route118_OnTransition - map_script MAP_SCRIPT_ON_LOAD, Route118_MapScript1_1F3DF3 - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route118_MapScript2_1F3E0A + map_script MAP_SCRIPT_ON_LOAD, Route118_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route118_OnFrame .byte 0 Route118_OnTransition: @ 81F3DCC @@ -14,142 +14,142 @@ Route118_OnTransition: @ 81F3DCC call_if_eq UnusualWeather_StartGroudonWeather end -Route118_MapScript1_1F3DF3: @ 81F3DF3 +Route118_OnLoad: @ 81F3DF3 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST call_if_eq UnusualWeather_EventScript_PlaceTilesRoute118East compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_WEST call_if_eq UnusualWeather_EventScript_PlaceTilesRoute118West end -Route118_MapScript2_1F3E0A: @ 81F3E0A +Route118_OnFrame: @ 81F3E0A map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 -Route118_EventScript_1F3E14:: @ 81F3E14 +Route118_EventScript_GoodRodFisherman:: @ 81F3E14 lock faceplayer - goto_if_set FLAG_RECEIVED_GOOD_ROD, Route118_EventScript_1F3E69 - msgbox Route118_Text_1F427B, MSGBOX_YESNO + goto_if_set FLAG_RECEIVED_GOOD_ROD, Route118_EventScript_ReceivedGoodRod + msgbox Route118_Text_YouAgreeGoodRodIsGood, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq Route118_EventScript_1F3E3E + goto_if_eq Route118_EventScript_ReceiveGoodRod compare VAR_RESULT, NO - goto_if_eq Route118_EventScript_1F3E5F + goto_if_eq Route118_EventScript_DeclineGoodRod end -Route118_EventScript_1F3E3E:: @ 81F3E3E - msgbox Route118_Text_1F42AF, MSGBOX_DEFAULT +Route118_EventScript_ReceiveGoodRod:: @ 81F3E3E + msgbox Route118_Text_IdenticalMindsTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_GOOD_ROD setflag FLAG_RECEIVED_GOOD_ROD - msgbox Route118_Text_1F42E7, MSGBOX_DEFAULT + msgbox Route118_Text_TryYourLuckFishing, MSGBOX_DEFAULT release end -Route118_EventScript_1F3E5F:: @ 81F3E5F - msgbox Route118_Text_1F4319, MSGBOX_DEFAULT +Route118_EventScript_DeclineGoodRod:: @ 81F3E5F + msgbox Route118_Text_DontYouLikeToFish, MSGBOX_DEFAULT release end -Route118_EventScript_1F3E69:: @ 81F3E69 - msgbox Route118_Text_1F4331, MSGBOX_DEFAULT +Route118_EventScript_ReceivedGoodRod:: @ 81F3E69 + msgbox Route118_Text_TryCatchingMonWithGoodRod, MSGBOX_DEFAULT release end -Route118_EventScript_1F3E73:: @ 81F3E73 - msgbox Route118_Text_1F4367, MSGBOX_NPC +Route118_EventScript_Girl:: @ 81F3E73 + msgbox Route118_Text_CanCrossRiversWithSurf, MSGBOX_NPC end -Route118_EventScript_1F3E7C:: @ 81F3E7C - msgbox Route118_Text_1F43F4, MSGBOX_SIGN +Route118_EventScript_RouteSignMauville:: @ 81F3E7C + msgbox Route118_Text_RouteSignMauville, MSGBOX_SIGN end -Route118_EventScript_1F3E85:: @ 81F3E85 - msgbox Route118_Text_1F440E, MSGBOX_SIGN +Route118_EventScript_RouteSign119:: @ 81F3E85 + msgbox Route118_Text_RouteSign119, MSGBOX_SIGN end -Route118_EventScript_1F3E8E:: @ 81F3E8E +Route118_EventScript_StevenTrigger0:: @ 81F3E8E lockall setvar VAR_0x8008, 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 - applymovement 19, Route118_Movement_1F3F61 + applymovement 19, Route118_Movement_StevenApproachLedge0 waitmovement 0 - goto Route118_EventScript_1F3EE4 + goto Route118_EventScript_StevenTrigger end -Route118_EventScript_1F3EAE:: @ 81F3EAE +Route118_EventScript_StevenTrigger1:: @ 81F3EAE lockall setvar VAR_0x8008, 1 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 - goto Route118_EventScript_1F3EE4 + goto Route118_EventScript_StevenTrigger end -Route118_EventScript_1F3EC4:: @ 81F3EC4 +Route118_EventScript_StevenTrigger2:: @ 81F3EC4 lockall setvar VAR_0x8008, 2 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 - applymovement 19, Route118_Movement_1F3F63 + applymovement 19, Route118_Movement_StevenApproachLedge2 waitmovement 0 - goto Route118_EventScript_1F3EE4 + goto Route118_EventScript_StevenTrigger end -Route118_EventScript_1F3EE4:: @ 81F3EE4 +Route118_EventScript_StevenTrigger:: @ 81F3EE4 playse SE_DANSA - applymovement 19, Route118_Movement_1F3F65 + applymovement 19, Route118_Movement_StevenJumpLedge waitmovement 0 delay 30 - msgbox Route118_Text_1F40BE, MSGBOX_DEFAULT + msgbox Route118_Text_StevenQuestions, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if_eq Route118_EventScript_1F3F28 + call_if_eq Route118_EventScript_StevenExit0 compare VAR_0x8008, 1 - call_if_eq Route118_EventScript_1F3F3A + call_if_eq Route118_EventScript_StevenExit1 compare VAR_0x8008, 2 - call_if_eq Route118_EventScript_1F3F4C + call_if_eq Route118_EventScript_StevenExit2 setvar VAR_ROUTE118_STATE, 1 removeobject 19 releaseall end -Route118_EventScript_1F3F28:: @ 81F3F28 - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_1F3F5E - applymovement 19, Route118_Movement_1F3F69 +Route118_EventScript_StevenExit0:: @ 81F3F28 + applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit + applymovement 19, Route118_Movement_StevenExit0 waitmovement 0 return -Route118_EventScript_1F3F3A:: @ 81F3F3A - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_1F3F5E - applymovement 19, Route118_Movement_1F3F74 +Route118_EventScript_StevenExit1:: @ 81F3F3A + applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit + applymovement 19, Route118_Movement_StevenExit1 waitmovement 0 return -Route118_EventScript_1F3F4C:: @ 81F3F4C - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_1F3F5E - applymovement 19, Route118_Movement_1F3F7E +Route118_EventScript_StevenExit2:: @ 81F3F4C + applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit + applymovement 19, Route118_Movement_StevenExit2 waitmovement 0 return -Route118_Movement_1F3F5E: @ 81F3F5E +Route118_Movement_PlayerWatchStevenExit: @ 81F3F5E delay_16 walk_in_place_fastest_right step_end -Route118_Movement_1F3F61: @ 81F3F61 +Route118_Movement_StevenApproachLedge0: @ 81F3F61 walk_left step_end -Route118_Movement_1F3F63: @ 81F3F63 +Route118_Movement_StevenApproachLedge2: @ 81F3F63 walk_right step_end -Route118_Movement_1F3F65: @ 81F3F65 +Route118_Movement_StevenJumpLedge: @ 81F3F65 jump_2_down delay_16 walk_down step_end -Route118_Movement_1F3F69: @ 81F3F69 +Route118_Movement_StevenExit0: @ 81F3F69 walk_right walk_right walk_right @@ -162,7 +162,7 @@ Route118_Movement_1F3F69: @ 81F3F69 walk_right step_end -Route118_Movement_1F3F74: @ 81F3F74 +Route118_Movement_StevenExit1: @ 81F3F74 walk_right walk_right walk_right @@ -174,7 +174,7 @@ Route118_Movement_1F3F74: @ 81F3F74 walk_right step_end -Route118_Movement_1F3F7E: @ 81F3F7E +Route118_Movement_StevenExit2: @ 81F3F7E walk_right walk_right walk_right @@ -185,76 +185,76 @@ Route118_Movement_1F3F7E: @ 81F3F7E walk_right step_end -Route118_EventScript_1F3F87:: @ 81F3F87 - trainerbattle_single TRAINER_ROSE_1, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3 +Route118_EventScript_Rose:: @ 81F3F87 + trainerbattle_single TRAINER_ROSE_1, Route118_Text_RoseIntro, Route118_Text_RoseDefeat, Route118_EventScript_RegisterRose specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route118_EventScript_1F3FD2 - msgbox Route118_Text_29D2FA, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route118_EventScript_RematchRose + msgbox Route118_Text_RosePostBattle, MSGBOX_DEFAULT release end -Route118_EventScript_1F3FB3:: @ 81F3FB3 +Route118_EventScript_RegisterRose:: @ 81F3FB3 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route118_Text_29D343, MSGBOX_DEFAULT + msgbox Route118_Text_RoseRegister, MSGBOX_DEFAULT register_matchcall TRAINER_ROSE_1 release end -Route118_EventScript_1F3FD2:: @ 81F3FD2 - trainerbattle_rematch TRAINER_ROSE_1, Route118_Text_29D382, Route118_Text_29D3AA - msgbox Route118_Text_29D3D9, MSGBOX_AUTOCLOSE +Route118_EventScript_RematchRose:: @ 81F3FD2 + trainerbattle_rematch TRAINER_ROSE_1, Route118_Text_RoseRematchIntro, Route118_Text_RoseRematchDefeat + msgbox Route118_Text_RosePostRematch, MSGBOX_AUTOCLOSE end -Route118_EventScript_1F3FE9:: @ 81F3FE9 - trainerbattle_single TRAINER_BARNY, Route118_Text_29D515, Route118_Text_29D55C - msgbox Route118_Text_29D587, MSGBOX_AUTOCLOSE +Route118_EventScript_Barny:: @ 81F3FE9 + trainerbattle_single TRAINER_BARNY, Route118_Text_BarnyIntro, Route118_Text_BarnyDefeat + msgbox Route118_Text_BarnyPostBattle, MSGBOX_AUTOCLOSE end -Route118_EventScript_1F4000:: @ 81F4000 - trainerbattle_single TRAINER_WADE, Route118_Text_29D5DF, Route118_Text_29D64C - msgbox Route118_Text_29D663, MSGBOX_AUTOCLOSE +Route118_EventScript_Wade:: @ 81F4000 + trainerbattle_single TRAINER_WADE, Route118_Text_WadeIntro, Route118_Text_WadeDefeat + msgbox Route118_Text_WadePostBattle, MSGBOX_AUTOCLOSE end -Route118_EventScript_1F4017:: @ 81F4017 - trainerbattle_single TRAINER_DALTON_1, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043 +Route118_EventScript_Dalton:: @ 81F4017 + trainerbattle_single TRAINER_DALTON_1, Route118_Text_DaltonIntro, Route118_Text_DaltonDefeat, Route118_EventScript_RegisterDalton specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route118_EventScript_1F4062 - msgbox Route118_Text_29D6D8, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route118_EventScript_RematchDalton + msgbox Route118_Text_DaltonPostBattle, MSGBOX_DEFAULT release end -Route118_EventScript_1F4043:: @ 81F4043 +Route118_EventScript_RegisterDalton:: @ 81F4043 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route118_Text_29D74A, MSGBOX_DEFAULT + msgbox Route118_Text_DaltonRegister, MSGBOX_DEFAULT register_matchcall TRAINER_DALTON_1 release end -Route118_EventScript_1F4062:: @ 81F4062 - trainerbattle_rematch TRAINER_DALTON_1, Route118_Text_29D789, Route118_Text_29D7CA - msgbox Route118_Text_29D7D5, MSGBOX_AUTOCLOSE +Route118_EventScript_RematchDalton:: @ 81F4062 + trainerbattle_rematch TRAINER_DALTON_1, Route118_Text_DaltonRematchIntro, Route118_Text_DaltonRematchDefeat + msgbox Route118_Text_DaltonPostRematch, MSGBOX_AUTOCLOSE end -Route118_EventScript_1F4079:: @ 81F4079 - trainerbattle_single TRAINER_PERRY, Route118_Text_29D41D, Route118_Text_29D45B - msgbox Route118_Text_29D46C, MSGBOX_AUTOCLOSE +Route118_EventScript_Perry:: @ 81F4079 + trainerbattle_single TRAINER_PERRY, Route118_Text_PerryIntro, Route118_Text_PerryDefeat + msgbox Route118_Text_PerryPostBattle, MSGBOX_AUTOCLOSE end -Route118_EventScript_1F4090:: @ 81F4090 - trainerbattle_single TRAINER_CHESTER, Route118_Text_29D4A6, Route118_Text_29D4C4 - msgbox Route118_Text_29D4DA, MSGBOX_AUTOCLOSE +Route118_EventScript_Chester:: @ 81F4090 + trainerbattle_single TRAINER_CHESTER, Route118_Text_ChesterIntro, Route118_Text_ChesterDefeat + msgbox Route118_Text_ChesterPostBattle, MSGBOX_AUTOCLOSE end -Route118_EventScript_1F40A7:: @ 81F40A7 - trainerbattle_single TRAINER_DEANDRE, Route118_Text_29D81B, Route118_Text_29D83C - msgbox Route118_Text_29D872, MSGBOX_AUTOCLOSE +Route118_EventScript_Deandre:: @ 81F40A7 + trainerbattle_single TRAINER_DEANDRE, Route118_Text_DeandreIntro, Route118_Text_DeandreDefeat + msgbox Route118_Text_DeandrePostBattle, MSGBOX_AUTOCLOSE end -Route118_Text_1F40BE: @ 81F40BE +Route118_Text_StevenQuestions: @ 81F40BE .string "STEVEN: Hi, {PLAYER}{KUN}!\p" .string "It's me, STEVEN!\n" .string "We met in the cave near DEWFORD.\p" @@ -272,40 +272,40 @@ Route118_Text_1F40BE: @ 81F40BE .string "It would be nice if we were to meet\n" .string "again somewhere.$" -Route118_Text_1F427B: @ 81F427B +Route118_Text_YouAgreeGoodRodIsGood: @ 81F427B .string "Hmm!\n" .string "A GOOD ROD is really good!\p" .string "Wouldn't you agree?$" -Route118_Text_1F42AF: @ 81F42AF +Route118_Text_IdenticalMindsTakeThis: @ 81F42AF .string "Hmm!\n" .string "We're of identical minds!\p" .string "Hmm!\n" .string "Take this GOOD ROD!$" -Route118_Text_1F42E7: @ 81F42E7 +Route118_Text_TryYourLuckFishing: @ 81F42E7 .string "Wherever there's water, try your luck\n" .string "at fishing.$" -Route118_Text_1F4319: @ 81F4319 +Route118_Text_DontYouLikeToFish: @ 81F4319 .string "Don't you like to fish?$" -Route118_Text_1F4331: @ 81F4331 +Route118_Text_TryCatchingMonWithGoodRod: @ 81F4331 .string "Try catching all sorts of POKéMON\n" .string "with your GOOD ROD.$" -Route118_Text_1F4367: @ 81F4367 +Route118_Text_CanCrossRiversWithSurf: @ 81F4367 .string "Even if there isn't a boat, you can\n" .string "cross rivers and the sea if you have\l" .string "a POKéMON that knows SURF.\p" .string "POKéMON can be counted on to do so\n" .string "much!$" -Route118_Text_1F43F4: @ 81F43F4 +Route118_Text_RouteSignMauville: @ 81F43F4 .string "ROUTE 118\n" .string "{LEFT_ARROW} MAUVILLE CITY$" -Route118_Text_1F440E: @ 81F440E +Route118_Text_RouteSign119: @ 81F440E .string "ROUTE 118\n" .string "{UP_ARROW} ROUTE 119$" diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index 349ec616e..143ff4543 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -60,7 +60,7 @@ RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 821246E closemessage call Common_EventScript_OutOfCenterPartyHeal msgbox RustboroCity_DevonCorp_3F_Text_MrStoneGoWithCautionAndCare, MSGBOX_DEFAULT - setflag FLAG_HIDE_ROUTE_116_TUNNELER + setflag FLAG_HIDE_ROUTE_116_WANDAS_BOYFRIEND clearflag FLAG_HIDE_RUSTURF_TUNNEL_WANDAS_BOYFRIEND clearflag FLAG_HIDE_RUSTURF_TUNNEL_WANDA clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index f61b9d6db..456f56f45 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -184,13 +184,13 @@ GabbyAndTy_EventScript_TyBattle4:: @ 828CEB6 release end -Route118_EventScript_GabbyBattle5:: @ 828CED6 +GabbyAndTy_EventScript_GabbyBattle5:: @ 828CED6 trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT release end -Route118_EventScript_TyBattle5:: @ 828CEF6 +GabbyAndTy_EventScript_TyBattle5:: @ 828CEF6 trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT release diff --git a/data/text/berries.inc b/data/text/berries.inc index 17443ea3c..ad12032ea 100644 --- a/data/text/berries.inc +++ b/data/text/berries.inc @@ -18,32 +18,32 @@ Route104_Text_2A6E32: @ 82A6E32 .string "It's up to you whether to grow BERRIES\n" .string "or use them.$" -Route111_Text_2A6EBD: @ 82A6EBD +Route111_Text_WateredPlantsEveryDayTakeBerry: @ 82A6EBD .string "I watered the plants every day.\n" .string "They grew lots of flowers.\p" .string "And they gave me lots of BERRIES, too.\p" .string "Here you go!\n" .string "You can have it!$" -Route111_Text_2A6F3D: @ 82A6F3D +Route111_Text_GoingToTryToMakeDifferentColorBerries: @ 82A6F3D .string "I'm going to try really hard and make\n" .string "BERRIES in different colors.\p" .string "I hope you try hard, too!$" -Route111_Text_2A6F9A: @ 82A6F9A +Route111_Text_WhatColorBerriesToLookForToday: @ 82A6F9A .string "I wonder what color BERRIES I'll look\n" .string "for today?$" -Route114_Text_2A6FCB: @ 82A6FCB +Route114_Text_LoveUsingBerryCrushShareBerry: @ 82A6FCB .string "I love using the BERRY CRUSH machine,\n" .string "so I'm collecting BERRIES.\p" .string "I'll share one with you, if you'd like.$" -Route114_Text_2A7034: @ 82A7034 +Route114_Text_TryBerryCrushWithFriends: @ 82A7034 .string "You should try the BERRY CRUSH\n" .string "machine with your friends.$" -Route114_Text_2A706E: @ 82A706E +Route114_Text_FunToThinkAboutBerries: @ 82A706E .string "Which BERRY should be planted?\n" .string "Should you use or hoard BERRIES?\p" .string "It's fun to think about.$" diff --git a/data/text/trainers.inc b/data/text/trainers.inc index 040445c85..3c66046f8 100644 --- a/data/text/trainers.inc +++ b/data/text/trainers.inc @@ -1232,91 +1232,91 @@ Route110_Text_KalebPostBattle: @ 8298755 .string "Okay, okay, you've done the best you\n" .string "could, my pretties.$" -Route111_Text_29878E: @ 829878E +Route111_Text_DrewIntro: @ 829878E .string "Oh, hey! Those GO-GOGGLES suit you.\n" .string "But I think they look better on me.\p" .string "Let's decide who they look better on\n" .string "with a battle!$" -Route111_Text_29880A: @ 829880A +Route111_Text_DrewDefeat: @ 829880A .string "I couldn't see what was happening at\n" .string "my sides because of the GO-GOGGLES.$" -Route111_Text_298853: @ 8298853 +Route111_Text_DrewPostBattle: @ 8298853 .string "The GO-GOGGLES make it possible to\n" .string "get through sandstorms.\l" .string "That makes me happy!$" -Route111_Text_2988A3: @ 82988A3 +Route111_Text_HeidiIntro: @ 82988A3 .string "I'm having a picnic in the desert.\p" .string "You can always find a TRAINER,\n" .string "so I can enjoy a battle here, too!$" -Route111_Text_298908: @ 8298908 +Route111_Text_HeidiDefeat: @ 8298908 .string "Ohhh! You're mean!$" -Route111_Text_29891B: @ 829891B +Route111_Text_HeidiPostBattle: @ 829891B .string "When you're battling in a sandstorm,\n" .string "watch out for your POKéMON's HP.\p" .string "It can faint if you don't keep\n" .string "an eye on it!$" -Route111_Text_29898E: @ 829898E +Route111_Text_BeauIntro: @ 829898E .string "Wearing these GO-GOGGLES makes me\n" .string "feel like a superhero.\l" .string "Right now, nobody can beat me!$" -Route111_Text_2989E6: @ 82989E6 +Route111_Text_BeauDefeat: @ 82989E6 .string "I can't win on spirit alone…$" -Route111_Text_298A03: @ 8298A03 +Route111_Text_BeauPostBattle: @ 8298A03 .string "I'm going to be a real hero one day.\n" .string "I'm going to work harder to make me\l" .string "and my POKéMON stronger.$" -Route111_Text_298A65: @ 8298A65 +Route111_Text_BeckyIntro: @ 8298A65 .string "I heard there are fossils to be found\n" .string "in the desert. Where could they be?$" -Route111_Text_298AAF: @ 8298AAF +Route111_Text_BeckyDefeat: @ 8298AAF .string "I came up short…$" -Route111_Text_298AC0: @ 8298AC0 +Route111_Text_BeckyPostBattle: @ 8298AC0 .string "If they can find fossils in the desert,\n" .string "it must have been a sea before.$" -Route111_Text_298B08: @ 8298B08 +Route111_Text_DustyIntro: @ 8298B08 .string "For thirty years I have searched for\n" .string "ancient ruins!\l" .string "I am to be challenged?$" -Route111_Text_298B53: @ 8298B53 +Route111_Text_DustyDefeat: @ 8298B53 .string "While I have searched for ruins,\n" .string "I've not searched for strong POKéMON.$" -Route111_Text_298B9A: @ 8298B9A +Route111_Text_DustyPostBattle: @ 8298B9A .string "For thirty years I have searched for\n" .string "ancient ruins!\p" .string "No, wait, was that forty years?\n" .string "Which was it now?$" -Route111_Text_298C00: @ 8298C00 +Route111_Text_DustyRegister: @ 8298C00 .string "I haven't been searching for any\n" .string "tough POKéMON.\p" .string "But, for some reason, I sure do like\n" .string "POKéNAVS.$" -Route111_Text_298C5F: @ 8298C5F +Route111_Text_DustyRematchIntro: @ 8298C5F .string "For thirty years I have searched for\n" .string "ancient ruins!\p" .string "No, wait, was that forty years?\n" .string "Anyway, am I to be challenged?$" -Route111_Text_298CD2: @ 8298CD2 +Route111_Text_DustyRematchDefeat: @ 8298CD2 .string "I've found no ruins, nor have I found\n" .string "any strong POKéMON…$" -Route111_Text_298D0C: @ 8298D0C +Route111_Text_DustyPostRematch: @ 8298D0C .string "For thirty years I have searched for\n" .string "ancient ruins!\p" .string "No, wait, was that forty years\n" @@ -1324,215 +1324,215 @@ Route111_Text_298D0C: @ 8298D0C .string "Hmm… It could even be fifty…\n" .string "How long have I been at this?$" -Route111_Text_298DA9: @ 8298DA9 +Route111_Text_TravisIntro: @ 8298DA9 .string "I'm full of pep!\n" .string "And my POKéMON is peppy, too!$" -Route111_Text_298DD8: @ 8298DD8 +Route111_Text_TravisDefeat: @ 8298DD8 .string "My POKéMON lost its pep…$" -Route111_Text_298DF1: @ 8298DF1 +Route111_Text_TravisPostBattle: @ 8298DF1 .string "When I see a TRAINER with a lot of pep,\n" .string "I can't help looking.$" -Route111_Text_298E2F: @ 8298E2F +Route111_Text_IreneIntro: @ 8298E2F .string "I don't know where you're going,\n" .string "but would you like to battle?$" -Route111_Text_298E6E: @ 8298E6E +Route111_Text_IreneDefeat: @ 8298E6E .string "Oh, you're disgustingly good!$" -Route111_Text_298E8C: @ 8298E8C +Route111_Text_IrenePostBattle: @ 8298E8C .string "I'm thinking that I should go to\n" .string "MT. CHIMNEY, but the view around\l" .string "here is very nice, too.$" -Route111_Text_298EE6: @ 8298EE6 +Route111_Text_DaisukeIntro: @ 8298EE6 .string "To train myself, I challenge all\n" .string "whom I meet!$" -Route111_Text_298F14: @ 8298F14 +Route111_Text_DaisukeDefeat: @ 8298F14 .string "Uncle! I give up!$" -Route111_Text_298F26: @ 8298F26 +Route111_Text_DaisukePostBattle: @ 8298F26 .string "All I can do is keep training until\n" .string "I can defeat strong TRAINERS such\l" .string "as yourself.$" -Route111_Text_298F79: @ 8298F79 +Route111_Text_WiltonIntro: @ 8298F79 .string "Show me how much you've toughened\n" .string "your POKéMON.$" -Route111_Text_298FA9: @ 8298FA9 +Route111_Text_WiltonDefeat: @ 8298FA9 .string "I see, you've toughened them\n" .string "considerably.$" -Route111_Text_298FD4: @ 8298FD4 +Route111_Text_WiltonPostBattle: @ 8298FD4 .string "POKéMON and TRAINERS learn much\n" .string "through battling.\p" .string "What's important is to never give up\n" .string "even if you lose.$" -Route111_Text_29903D: @ 829903D +Route111_Text_WiltonRegister: @ 829903D .string "There is much to be learned from\n" .string "your training style.\p" .string "I request a rematch if it\n" .string "behooves you.$" -Route111_Text_29909B: @ 829909B +Route111_Text_WiltonRematchIntro: @ 829909B .string "We're training here to elevate our\n" .string "game to the next level.\l" .string "Stay and train with us!$" -Route111_Text_2990EE: @ 82990EE +Route111_Text_WiltonRematchDefeat: @ 82990EE .string "Ooh, you're decent!$" -Route111_Text_299102: @ 8299102 +Route111_Text_WiltonPostRematch: @ 8299102 .string "Since you're that strong, you should\n" .string "aim for the POKéMON LEAGUE.$" -Route111_Text_299143: @ 8299143 +Route111_Text_BrookeIntro: @ 8299143 .string "Oh, your POKéMON look like serious\n" .string "actors.\l" .string "I have to ask you for an engagement.$" -Route111_Text_299193: @ 8299193 +Route111_Text_BrookeDefeat: @ 8299193 .string "They didn't just look strong,\n" .string "they are strong!$" -Route111_Text_2991C2: @ 82991C2 +Route111_Text_BrookePostBattle: @ 82991C2 .string "I thought I was raising my POKéMON\n" .string "diligently, but, oh no, there is still\l" .string "much to be done.$" -Route111_Text_29921D: @ 829921D +Route111_Text_BrookeRegister: @ 829921D .string "I wish I could become friends with\n" .string "more strong people like you!$" -Route111_Text_29925D: @ 829925D +Route111_Text_BrookeRematchIntro: @ 829925D .string "You can make POKéMON stronger or\n" .string "weaker depending on the moves you\l" .string "teach them.\p" .string "What kinds of moves do your POKéMON\n" .string "know?$" -Route111_Text_2992D6: @ 82992D6 +Route111_Text_BrookeRematchDefeat: @ 82992D6 .string "You've taught them good moves!$" -Route111_Text_2992F5: @ 82992F5 +Route111_Text_BrookePostRematch: @ 82992F5 .string "Maybe I should have stopped my\n" .string "POKéMON from evolving until they\l" .string "learned better moves…$" -Route111_Text_29934B: @ 829934B +Route111_Text_CeliaIntro: @ 829934B .string "I shouldn't have come to a place like\n" .string "this for a picnic!$" -Route111_Text_299384: @ 8299384 +Route111_Text_CeliaDefeat: @ 8299384 .string "Aww!\n" .string "I really shouldn't have come!$" -Route111_Text_2993A7: @ 82993A7 +Route111_Text_CeliaPostBattle: @ 82993A7 .string "In a sandstorm like this, I can't set\n" .string "the places for a picnic even with my\l" .string "GO-GOGGLES on…$" -Route111_Text_299401: @ 8299401 +Route111_Text_BryanIntro: @ 8299401 .string "How tough are you?\n" .string "We shall expose that secret!$" -Route111_Text_299431: @ 8299431 +Route111_Text_BryanDefeat: @ 8299431 .string "Oh! Your strength!\n" .string "It is shrouded in mystery!$" -Route111_Text_29945F: @ 829945F +Route111_Text_BryanPostBattle: @ 829945F .string "This desert hoards mysteries in\n" .string "its shifting sands!$" -Route111_Text_299493: @ 8299493 +Route111_Text_BrandenIntro: @ 8299493 .string "I'll give you some of my sandwich\n" .string "if you'll lose.$" -Route111_Text_2994C5: @ 82994C5 +Route111_Text_BrandenDefeat: @ 82994C5 .string "Tch! I thought a sandwich would be\n" .string "enough of a bribe…$" -Route111_Text_2994FB: @ 82994FB +Route111_Text_BrandenPostBattle: @ 82994FB .string "My SANDSHREW loves eating\n" .string "my sandwiches.$" -Route111_Text_299524: @ 8299524 +Route111_Text_TyronIntro: @ 8299524 .string "This is my favorite kind of POKéMON!$" -Route111_Text_299549: @ 8299549 +Route111_Text_TyronDefeat: @ 8299549 .string "Wait!\n" .string "Did you get a good look at my POKéMON?$" -Route111_Text_299576: @ 8299576 +Route111_Text_TyronPostBattle: @ 8299576 .string "When having a battle, I get a kick out\n" .string "of showing off my POKéMON.\p" .string "I bet everyone feels that way when\n" .string "they enter a battle!$" -Route111_Text_2995F0: @ 82995F0 +Route111_Text_CelinaIntro: @ 82995F0 .string "Show me how to put a little excitement\n" .string "into my life.$" -Route111_Text_299625: @ 8299625 +Route111_Text_CelinaDefeat: @ 8299625 .string "Oh… My…\n" .string "That was too much excitement.$" -Route111_Text_29964B: @ 829964B +Route111_Text_CelinaPostBattle: @ 829964B .string "My pulse is still racing.\n" .string "You're one fabulous TRAINER.$" -Route111_Text_299682: @ 8299682 +Route111_Text_HaydenIntro: @ 8299682 .string "When you're as famished as I am,\n" .string "there is no room for pity!$" -Route111_Text_2996BE: @ 82996BE +Route111_Text_HaydenDefeat: @ 82996BE .string "Groan…$" -Route111_Text_2996C5: @ 82996C5 +Route111_Text_HaydenPostBattle: @ 82996C5 .string "My stomach is grumbling!\n" .string "Maybe I can grill some BERRIES…$" -Route111_Text_2996FE: @ 82996FE +Route111_Text_BiancaIntro: @ 82996FE .string "Did you come from MAUVILLE?\n" .string "Then you should be full of energy!$" -Route111_Text_29973D: @ 829973D +Route111_Text_BiancaDefeat: @ 829973D .string "Ooh lala!\n" .string "That's a lot to take!$" -Route111_Text_29975D: @ 829975D +Route111_Text_BiancaPostBattle: @ 829975D .string "This road here…\n" .string "You have quite a ways to travel.$" -Route112_Text_29978E: @ 829978E +Route112_Text_BriceIntro: @ 829978E .string "Hahahaha!\n" .string "How about we have a battle?\l" .string "You and me!\l" .string "Hahahaha!$" -Route112_Text_2997CA: @ 82997CA +Route112_Text_BriceDefeat: @ 82997CA .string "I lost!\n" .string "Hahahaha!$" -Route112_Text_2997DC: @ 82997DC +Route112_Text_BricePostBattle: @ 82997DC .string "Hahahahaha! Something flew up my nose!\n" .string "Hahahaha-hatchoo!$" -Route112_Text_299815: @ 8299815 +Route112_Text_TrentIntro: @ 8299815 .string "My legs are solid from pounding up\n" .string "and down the mountains.\p" .string "They're not going to buckle easily,\n" .string "friend!$" -Route112_Text_29987C: @ 829987C +Route112_Text_TrentDefeat: @ 829987C .string "Ouch! My legs cramped up!$" -Route112_Text_299896: @ 8299896 +Route112_Text_TrentPostBattle: @ 8299896 .string "Try hiking, and I mean really\n" .string "pounding, on these mountain trails\l" .string "with a heavy pack weighing dozens of\l" @@ -1540,1155 +1540,1155 @@ Route112_Text_299896: @ 8299896 .string "That, my friend, will get your body\n" .string "into serious shape.$" -Route112_Text_29993C: @ 829993C +Route112_Text_TrentRegister: @ 829993C .string "Ow, my legs have cramped up.\n" .string "Can you grab me some bandages from\l" .string "my backpack?\p" .string "No, that's my POKéNAV!\n" .string "Oh, fine, I'll register you.$" -Route112_Text_2999BD: @ 82999BD +Route112_Text_TrentRematchIntro: @ 82999BD .string "I've been keeping fit by hiking.\n" .string "Power, I have in spades!$" -Route112_Text_2999F7: @ 82999F7 +Route112_Text_TrentRematchDefeat: @ 82999F7 .string "I got trumped in power?$" -Route112_Text_299A0F: @ 8299A0F +Route112_Text_TrentRematchPostBattle: @ 8299A0F .string "I hear there are some seriously tough\n" .string "TRAINERS on top of MT. CHIMNEY.\p" .string "I intend to get up there and give them\n" .string "a challenge!$" -Route112_Text_299A89: @ 8299A89 +Route112_Text_LarryIntro: @ 8299A89 .string "I'm strong.\n" .string "I won't cry if I lose.$" -Route112_Text_299AAC: @ 8299AAC +Route112_Text_LarryDefeat: @ 8299AAC .string "Waaaah!$" -Route112_Text_299AB4: @ 8299AB4 +Route112_Text_LarryPostBattle: @ 8299AB4 .string "I'm not crying because I miss my mommy!\n" .string "Snivel…$" -Route112_Text_299AE4: @ 8299AE4 +Route112_Text_CarolIntro: @ 8299AE4 .string "When you're out on a picnic, why,\n" .string "you simply have to sing!\l" .string "Come on, sing with me!$" -Route112_Text_299B36: @ 8299B36 +Route112_Text_CarolDefeat: @ 8299B36 .string "Oh, you're so strong!$" -Route112_Text_299B4C: @ 8299B4C +Route112_Text_CarolPostBattle: @ 8299B4C .string "It doesn't matter if you're good or bad\n" .string "at singing or POKéMON.\p" .string "If you have the most fun, you win!$" -Route112_Text_299BAE: @ 8299BAE +Route112_Text_BryantIntro: @ 8299BAE .string "I caught hot POKéMON in FIERY PATH!\n" .string "Take a look!$" -Route112_Text_299BDF: @ 8299BDF +Route112_Text_BryantDefeat: @ 8299BDF .string "What a bumpy ride that was!$" -Route112_Text_299BFB: @ 8299BFB +Route112_Text_BryantPostBattle: @ 8299BFB .string "I like the way you battle.\n" .string "It has a certain flair to it.$" -Route112_Text_299C34: @ 8299C34 +Route112_Text_ShaylaIntro: @ 8299C34 .string "Oh, aren't you an adorable TRAINER!\n" .string "Please, I need a romantic battle!\l" .string "I'm somewhat decent!$" -Route112_Text_299C8F: @ 8299C8F +Route112_Text_ShaylaDefeat: @ 8299C8F .string "Oh, how strong you are!\n" .string "You've given me quite a shock!$" -Route112_Text_299CC6: @ 8299CC6 +Route112_Text_ShaylaPostBattle: @ 8299CC6 .string "Are you busy right now?\n" .string "I was thinking that maybe we can have\l" .string "a rematch right now…\l" .string "But it's all right if you're busy.$" -Route113_Text_299D3C: @ 8299D3C +Route113_Text_JaylenIntro: @ 8299D3C .string "Can you guess why it's so cool\n" .string "around here?$" -Route113_Text_299D68: @ 8299D68 +Route113_Text_JaylenDefeat: @ 8299D68 .string "Peeuuw!\n" .string "That stinks!$" -Route113_Text_299D7D: @ 8299D7D +Route113_Text_JaylenPostBattle: @ 8299D7D .string "The volcanic ash blocks the sun,\n" .string "so it doesn't get very warm.\p" .string "That's good for me--I can't stand heat!$" -Route113_Text_299DE3: @ 8299DE3 +Route113_Text_DillonIntro: @ 8299DE3 .string "The volcano's eruption is proof that\n" .string "the earth is alive.$" -Route113_Text_299E1C: @ 8299E1C +Route113_Text_DillonDefeat: @ 8299E1C .string "You're some kind of strong!$" -Route113_Text_299E38: @ 8299E38 +Route113_Text_DillonPostBattle: @ 8299E38 .string "Ouch! Owww! I can't see!\n" .string "I got ashes in my eyelashes!\p" .string "Get it? Ashes and eyelashes?\p" .string "Okay, that was bad, sorry…$" -Route113_Text_299EA6: @ 8299EA6 +Route113_Text_MadelineIntro: @ 8299EA6 .string "I use this parasol to ward off this\n" .string "filthy, yucky volcanic ash from\l" .string "my dear NUMEL.$" -Route113_Text_299EF9: @ 8299EF9 +Route113_Text_MadelineDefeat: @ 8299EF9 .string "Huff, huff…\n" .string "I am exhausted…$" -Route113_Text_299F15: @ 8299F15 +Route113_Text_MadelinePostBattle: @ 8299F15 .string "You're very good at this.\n" .string "I must say I'm impressed!$" -Route113_Text_299F49: @ 8299F49 +Route113_Text_MadelineRegister: @ 8299F49 .string "Here, slide under my parasol.\n" .string "Let me register you in my POKéNAV.$" -Route113_Text_299F8A: @ 8299F8A +Route113_Text_MadelineRematchIntro: @ 8299F8A .string "Oh, hello, hasn't it been a while?\n" .string "May I invite you to battle?$" -Route113_Text_299FC9: @ 8299FC9 +Route113_Text_MadelineRematchDefeat: @ 8299FC9 .string "Oh, how super!$" -Route113_Text_299FD8: @ 8299FD8 +Route113_Text_MadelinePostRematch: @ 8299FD8 .string "You've remained very good at this.\n" .string "I must say I'm impressed!$" -Route113_Text_29A015: @ 829A015 +Route113_Text_LaoIntro: @ 829A015 .string "From out of the ashes I leap! Hiyah!\n" .string "I challenge thee!$" -Route113_Text_29A04C: @ 829A04C +Route113_Text_LaoDefeat: @ 829A04C .string "With honor I admit defeat!$" -Route113_Text_29A067: @ 829A067 +Route113_Text_LaoPostBattle: @ 829A067 .string "I must refine the art of concealment.\n" .string "I bid thee farewell.$" -Route113_Text_29A0A2: @ 829A0A2 +Route113_Text_LaoRegister: @ 829A0A2 .string "Yiiyaah! Witness the ancient ninja\n" .string "technique of POKéNAV registration!$" -Route113_Text_29A0E8: @ 829A0E8 +Route113_Text_LaoRematchIntro: @ 829A0E8 .string "From out of the ashes I leap! Hiyah!\n" .string "I challenge thee!$" -Route113_Text_29A11F: @ 829A11F +Route113_Text_LaoRematchDefeat: @ 829A11F .string "With honor I admit defeat!$" -Route113_Text_29A13A: @ 829A13A +Route113_Text_LaoPostRematch: @ 829A13A .string "My flawless concealment was let down\n" .string "by my immature battle skills…\p" .string "I bid thee farewell.$" -Route113_Text_29A192: @ 829A192 +Route113_Text_LungIntro: @ 829A192 .string "Thanks for finding me!\n" .string "But we still have to battle!$" -Route113_Text_29A1C6: @ 829A1C6 +Route113_Text_LungDefeat: @ 829A1C6 .string "I'll use my ninjutsu on you…\n" .string "“VOLCANIC ASH SWIRL CLOAK”!\p" .string "…What?\n" .string "It's already over?$" -Route113_Text_29A219: @ 829A219 +Route113_Text_LungPostBattle: @ 829A219 .string "You know what's crummy about hiding?\n" .string "It's lonely if no one comes along.$" -Route113_Text_29A261: @ 829A261 +Route113_Text_ToriIntro: @ 829A261 .string "TORI: Both of us, we collect ashes.\n" .string "We battle POKéMON, too.$" -Route113_Text_29A29D: @ 829A29D +Route113_Text_ToriDefeat: @ 829A29D .string "TORI: We lost… It's boring, so I'm going\n" .string "to get some more ashes.$" -Route113_Text_29A2DE: @ 829A2DE +Route113_Text_ToriPostBattle: @ 829A2DE .string "TORI: How much ash do we have?\n" .string "Enough for a WHITE FLUTE, I hope.$" -Route113_Text_29A31F: @ 829A31F +Route113_Text_ToriNotEnoughMons: @ 829A31F .string "TORI: We want to battle 2-on-2.\n" .string "If we didn't, we would lose!$" -Route113_Text_29A35C: @ 829A35C +Route113_Text_TiaIntro: @ 829A35C .string "TIA: Both of us, we collect ashes.\n" .string "We battle POKéMON, too.$" -Route113_Text_29A397: @ 829A397 +Route113_Text_TiaDefeat: @ 829A397 .string "TIA: We couldn't win… It's boring,\n" .string "so I'm getting some more ashes.$" -Route113_Text_29A3DA: @ 829A3DA +Route113_Text_TiaPostBattle: @ 829A3DA .string "TIA: We have a lot of ashes!\n" .string "I think enough for a WHITE FLUTE!$" -Route113_Text_29A419: @ 829A419 +Route113_Text_TiaNotEnoughMons: @ 829A419 .string "TIA: We want to battle 2-on-2.\n" .string "If we don't, we won't win!$" -Route113_Text_29A453: @ 829A453 +Route113_Text_CobyIntro: @ 829A453 .string "Pfft, with these wings I can\n" .string "flick you away!$" -Route113_Text_29A480: @ 829A480 +Route113_Text_CobyDefeat: @ 829A480 .string "A… What?$" -Route113_Text_29A489: @ 829A489 +Route113_Text_CobyPostBattle: @ 829A489 .string "I don't know what to say when I get\n" .string "beaten so easily…$" -Route113_Text_29A4BF: @ 829A4BF +Route113_Text_SophieIntro: @ 829A4BF .string "The warmth here is making me drowsy.\n" .string "Battle with me so I can stay awake.$" -Route113_Text_29A508: @ 829A508 +Route113_Text_SophieDefeat: @ 829A508 .string "This is a dream.\n" .string "I'm sure of it…$" -Route113_Text_29A529: @ 829A529 +Route113_Text_SophiePostBattle: @ 829A529 .string "Losing burns me up…\n" .string "I'm just going to sleep right here!\l" .string "Zzz!$" -Route113_Text_29A566: @ 829A566 +Route113_Text_LawrenceIntro: @ 829A566 .string "Were you maybe in the middle\n" .string "of gathering volcanic ashes?$" -Route113_Text_29A5A0: @ 829A5A0 +Route113_Text_LawrenceDefeat: @ 829A5A0 .string "Ehehe.\n" .string "We got beaten cleanly.$" -Route113_Text_29A5BE: @ 829A5BE +Route113_Text_LawrencePostBattle: @ 829A5BE .string "I ought to hide under the ashes, too.$" -Route113_Text_29A5E4: @ 829A5E4 +Route113_Text_WyattIntro: @ 829A5E4 .string "Y-you want to battle with me?\n" .string "Even though I just caught my POKéMON?$" -Route113_Text_29A628: @ 829A628 +Route113_Text_WyattDefeat: @ 829A628 .string "Y-you're all happy to win?\n" .string "Even though it's only me?$" -Route113_Text_29A65D: @ 829A65D +Route113_Text_WyattPostBattle: @ 829A65D .string "Oh, so now you want to say a word to\n" .string "the loser?\p" .string "Aren't you just the coolest?\n" .string "Humph!$" -Route114_Text_29A6B1: @ 829A6B1 +Route114_Text_LennyIntro: @ 829A6B1 .string "Yodelayhihoo!\p" .string "… …\p" .string "You're supposed to shout\n" .string "“yodelayhihoo” since it doesn't\l" .string "echo here!$" -Route114_Text_29A707: @ 829A707 +Route114_Text_LennyDefeat: @ 829A707 .string "Yodelayhihoo!$" -Route114_Text_29A715: @ 829A715 +Route114_Text_LennyPostBattle: @ 829A715 .string "When I was a wee tyke, I believed there\n" .string "was someone copying me and shouting\l" .string "back, “Yodelayhihoo.”$" -Route114_Text_29A777: @ 829A777 +Route114_Text_LucasIntro: @ 829A777 .string "If you're not prepared, you shouldn't\n" .string "be up in the mountains!$" -Route114_Text_29A7B5: @ 829A7B5 +Route114_Text_LucasDefeat: @ 829A7B5 .string "The mountains are unforgiving…$" -Route114_Text_29A7D4: @ 829A7D4 +Route114_Text_LucasPostBattle: @ 829A7D4 .string "In the winter, mountains turn deadly\n" .string "with blizzards and avalanches.$" -Route114_Text_29A818: @ 829A818 +Route114_Text_ShaneIntro: @ 829A818 .string "Camping's fun! You can fish, roast\n" .string "marshmallows, and tell spooky stories!\p" .string "But the best of all are the POKéMON\n" .string "battles!$" -Route114_Text_29A88F: @ 829A88F +Route114_Text_ShaneDefeat: @ 829A88F .string "Way too strong!$" -Route114_Text_29A89F: @ 829A89F +Route114_Text_ShanePostBattle: @ 829A89F .string "I think it's great that I can go\n" .string "camping with my POKéMON.$" -Route114_Text_29A8D9: @ 829A8D9 +Route114_Text_NancyIntro: @ 829A8D9 .string "I need to exercise after a meal.\n" .string "Let's have a match!$" -Route114_Text_29A90E: @ 829A90E +Route114_Text_NancyDefeat: @ 829A90E .string "Oh, no!$" -Route114_Text_29A916: @ 829A916 +Route114_Text_NancyPostBattle: @ 829A916 .string "I just had a tasty meal.\n" .string "I'm getting drowsy…$" -Route114_Text_29A943: @ 829A943 +Route114_Text_SteveIntro: @ 829A943 .string "Ufufufufufu…\n" .string "Want to battle against my POKéMON?$" -Route114_Text_29A973: @ 829A973 +Route114_Text_SteveDefeat: @ 829A973 .string "M-My POKéMON…$" -Route114_Text_29A981: @ 829A981 +Route114_Text_StevePostBattle: @ 829A981 .string "A big body that's all lumpy and hard,\n" .string "enormous horns, and vicious fangs…\p" .string "Ufufufufu…\n" .string "I wish I had a POKéMON like that…$" -Route114_Text_29A9F7: @ 829A9F7 +Route114_Text_SteveRegister: @ 829A9F7 .string "Don't forget what you've done to me!\n" .string "I'll make it so you can't forget!$" -Route114_Text_29AA3E: @ 829AA3E +Route114_Text_SteveRematchIntro: @ 829AA3E .string "Ufufufufufu…\n" .string "Come on, battle my POKéMON…$" -Route114_Text_29AA67: @ 829AA67 +Route114_Text_SteveRematchDefeat: @ 829AA67 .string "I feel so lucky getting to see your\n" .string "POKéMON…$" -Route114_Text_29AA94: @ 829AA94 +Route114_Text_StevePostRematch: @ 829AA94 .string "Ufufufufufu…\p" .string "When I see POKéMON battling, I get all\n" .string "shivery and shaky…$" -Route114_Text_29AADB: @ 829AADB +Route114_Text_BernieIntro: @ 829AADB .string "If you're lighting a campfire,\n" .string "make sure you have water handy.$" -Route114_Text_29AB1A: @ 829AB1A +Route114_Text_BernieDefeat: @ 829AB1A .string "Thanks for dousing my fire!$" -Route114_Text_29AB36: @ 829AB36 +Route114_Text_BerniePostBattle: @ 829AB36 .string "You really do have to be careful with\n" .string "any sort of fire in a forest.\p" .string "Don't ever underestimate the power\n" .string "of fire.$" -Route114_Text_29ABA6: @ 829ABA6 +Route114_Text_BernieRegister: @ 829ABA6 .string "You set my spirit on fire.\n" .string "Let's register each other!$" -Route114_Text_29ABDC: @ 829ABDC +Route114_Text_BernieRematchIntro: @ 829ABDC .string "Have you learned to keep water handy\n" .string "for campfires?$" -Route114_Text_29AC10: @ 829AC10 +Route114_Text_BernieRematchDefeat: @ 829AC10 .string "I got hosed down before I could\n" .string "flare up, I guess.$" -Route114_Text_29AC43: @ 829AC43 +Route114_Text_BerniePostRematch: @ 829AC43 .string "You really do have to be careful with\n" .string "any sort of fire in a forest.\p" .string "Don't ever underestimate the power\n" .string "of fire.$" -Route114_Text_29ACB3: @ 829ACB3 +Route114_Text_ClaudeIntro: @ 829ACB3 .string "If we were fishing, you wouldn't stand\n" .string "a chance against me.\l" .string "So, bring on your POKéMON!$" -Route114_Text_29AD0A: @ 829AD0A +Route114_Text_ClaudeDefeat: @ 829AD0A .string "If we were fishing, I would've won…$" -Route114_Text_29AD2E: @ 829AD2E +Route114_Text_ClaudePostBattle: @ 829AD2E .string "I think I'll try my luck at landing\n" .string "a big one at METEOR FALLS.\p" .string "There has to be something in there.\n" .string "I just know it.$" -Route114_Text_29ADA1: @ 829ADA1 +Route114_Text_NolanIntro: @ 829ADA1 .string "I like to fish. But I also like to\n" .string "battle!\p" .string "If anyone challenges me, I'm there,\n" .string "even if I'm fishing.$" -Route114_Text_29AE05: @ 829AE05 +Route114_Text_NolanDefeat: @ 829AE05 .string "I like to battle, but that doesn't\n" .string "mean I'm good at it…$" -Route114_Text_29AE3D: @ 829AE3D +Route114_Text_NolanPostBattle: @ 829AE3D .string "This time I'll do it!\p" .string "I always think that, so I can't walk\n" .string "away from fishing or POKéMON.$" -Route114_Text_29AE96: @ 829AE96 +Route114_Text_TyraIntro: @ 829AE96 .string "TYRA: Well, sure.\n" .string "I'm in the mood for it.\l" .string "I'll teach you a little about POKéMON.$" -Route114_Text_29AEE7: @ 829AEE7 +Route114_Text_TyraDefeat: @ 829AEE7 .string "TYRA: What an amazing battle style!$" -Route114_Text_29AF0B: @ 829AF0B +Route114_Text_TyraPostBattle: @ 829AF0B .string "TYRA: I was teaching my junior IVY\n" .string "about POKéMON.$" -Route114_Text_29AF3D: @ 829AF3D +Route114_Text_TyraNotEnoughMons: @ 829AF3D .string "TYRA: Giggle…\n" .string "If you want to battle with us, just one\l" .string "POKéMON isn't enough!$" -Route114_Text_29AF89: @ 829AF89 +Route114_Text_IvyIntro: @ 829AF89 .string "IVY: Who taught you about POKéMON?$" -Route114_Text_29AFAC: @ 829AFAC +Route114_Text_IvyDefeat: @ 829AFAC .string "IVY: What an amazing battle style!$" -Route114_Text_29AFCF: @ 829AFCF +Route114_Text_IvyPostBattle: @ 829AFCF .string "IVY: I started training POKéMON\n" .string "because TYRA, my student mentor,\l" .string "taught me!$" -Route114_Text_29B01B: @ 829B01B +Route114_Text_IvyNotEnoughMons: @ 829B01B .string "IVY: Do you only have one POKéMON?\n" .string "I think it must feel lonesome.$" -Route114_Text_29B05D: @ 829B05D +Route114_Text_KaiIntro: @ 829B05D .string "I landed a big one!\n" .string "A huge one, I tell you!$" -Route114_Text_29B089: @ 829B089 +Route114_Text_KaiDefeat: @ 829B089 .string "What was that about?\n" .string "Did mine lose in size?$" -Route114_Text_29B0B5: @ 829B0B5 +Route114_Text_KaiPostBattle: @ 829B0B5 .string "Okay!\n" .string "I'll just fish me a bigger one!$" -Route114_Text_29B0DB: @ 829B0DB +Route114_Text_CharlotteIntro: @ 829B0DB .string "Me!\n" .string "I'm not just a pretty face!$" -Route114_Text_29B0FB: @ 829B0FB +Route114_Text_CharlotteDefeat: @ 829B0FB .string "That wasn't cute in the least!$" -Route114_Text_29B11A: @ 829B11A +Route114_Text_CharlottePostBattle: @ 829B11A .string "I don't want a POKéMON that's\n" .string "just cute.\p" .string "I adore cute ones that have a quirk\n" .string "or two!$" -Route114_Text_29B16F: @ 829B16F +Route114_Text_AngelinaIntro: @ 829B16F .string "Have you made your POKéMON evolve\n" .string "very much?$" -Route114_Text_29B19C: @ 829B19C +Route114_Text_AngelinaDefeat: @ 829B19C .string "Oh, I see.\n" .string "That's good to know.$" -Route114_Text_29B1BC: @ 829B1BC +Route114_Text_AngelinaPostBattle: @ 829B1BC .string "Some POKéMON change so much when\n" .string "they evolve, it's startling!$" -Route115_Text_29B1FA: @ 829B1FA +Route115_Text_TimothyIntro: @ 829B1FA .string "Hm…\n" .string "You seem rather capable…\l" .string "Let me keep you company!$" -Route115_Text_29B230: @ 829B230 +Route115_Text_TimothyDefeat: @ 829B230 .string "You're much stronger than\n" .string "I'd imagined!$" -Route115_Text_29B258: @ 829B258 +Route115_Text_TimothyPostBattle: @ 829B258 .string "There is no such thing as a born genius.\n" .string "It all depends on effort!\l" .string "That is what I believe…$" -Route115_Text_29B2B3: @ 829B2B3 +Route115_Text_TimothyRegister: @ 829B2B3 .string "Hmm… A loss this thorough has been\n" .string "a distant memory.\p" .string "If you would allow it, I wish for\n" .string "another opportunity to do battle.$" -Route115_Text_29B32C: @ 829B32C +Route115_Text_TimothyRematchIntro: @ 829B32C .string "Hm… As always, your agility speaks\n" .string "for itself.\l" .string "Come, keep me company!$" -Route115_Text_29B372: @ 829B372 +Route115_Text_TimothyRematchDefeat: @ 829B372 .string "As strong as ever!$" -Route115_Text_29B385: @ 829B385 +Route115_Text_TimothyPostRematch: @ 829B385 .string "All it takes is effort!\p" .string "I lost because I haven't put in enough\n" .string "effort!$" -Route115_Text_29B3CC: @ 829B3CC +Route115_Text_KoichiIntro: @ 829B3CC .string "You!\p" .string "My MACHOP!\p" .string "Demand a battle!$" -Route115_Text_29B3ED: @ 829B3ED +Route115_Text_KoichiDefeat: @ 829B3ED .string "Ouch, ouch, ouch!$" -Route115_Text_29B3FF: @ 829B3FF +Route115_Text_KoichiPostBattle: @ 829B3FF .string "My MACHOP crew!\p" .string "So long as they seek power, I will\n" .string "grow strong with them!$" -Route115_Text_29B449: @ 829B449 +Route115_Text_NobIntro: @ 829B449 .string "My strongest skill is busting bricks\n" .string "with my forehead!$" -Route115_Text_29B480: @ 829B480 +Route115_Text_NobDefeat: @ 829B480 .string "Ugwaaaah!\n" .string "My head is busted!$" -Route115_Text_29B49D: @ 829B49D +Route115_Text_NobPostBattle: @ 829B49D .string "I've been teaching my POKéMON karate.\p" .string "It looks like they'll get a lot better\n" .string "than me. I'm excited about that.$" -Route115_Text_29B50B: @ 829B50B +Route115_Text_NobRegister: @ 829B50B .string "You impress me! Give me a rematch\n" .string "after I redo my training!$" -Route115_Text_29B547: @ 829B547 +Route115_Text_NobRematchIntro: @ 829B547 .string "After you beat me, we trained hard to\n" .string "improve our skills.\l" .string "Come on, give us a rematch!$" -Route115_Text_29B59D: @ 829B59D +Route115_Text_NobRematchDefeat: @ 829B59D .string "Ugwaaah!\n" .string "We lost again!$" -Route115_Text_29B5B5: @ 829B5B5 +Route115_Text_NobPostRematch: @ 829B5B5 .string "My POKéMON will grow stronger!\n" .string "I'll redouble my training!$" -Route115_Text_29B5EF: @ 829B5EF +Route115_Text_CyndyIntro: @ 829B5EF .string "This beach is my secret training spot!\n" .string "Don't come butting in!$" -Route115_Text_29B62D: @ 829B62D +Route115_Text_CyndyDefeat: @ 829B62D .string "I haven't trained enough!$" -Route115_Text_29B647: @ 829B647 +Route115_Text_CyndyPostBattle: @ 829B647 .string "The sand acts as a cushion to reduce\n" .string "impact and prevent injury.\l" .string "This is the perfect place to train.$" -Route115_Text_29B6AB: @ 829B6AB +Route115_Text_CyndyRegister: @ 829B6AB .string "Okay, fine, you're free to come here.\n" .string "In return, I'd like to battle you again.$" -Route115_Text_29B6FA: @ 829B6FA +Route115_Text_CyndyRematchIntro: @ 829B6FA .string "Okay, let's get this battle on!$" -Route115_Text_29B71A: @ 829B71A +Route115_Text_CyndyRematchDefeat: @ 829B71A .string "I can battle but my POKéMON…$" -Route115_Text_29B737: @ 829B737 +Route115_Text_CyndyPostRematch: @ 829B737 .string "Even when I lose, I still get some\n" .string "enjoyment out of it.\l" .string "It must be that I love POKéMON.$" -Route115_Text_29B78F: @ 829B78F +Route115_Text_HectorIntro: @ 829B78F .string "I have a rare POKéMON!\n" .string "Would you like me to show you?$" -Route115_Text_29B7C5: @ 829B7C5 +Route115_Text_HectorDefeat: @ 829B7C5 .string "You…\n" .string "You want my POKéMON, don't you?$" -Route115_Text_29B7EA: @ 829B7EA +Route115_Text_HectorPostBattle: @ 829B7EA .string "I have this rare POKéMON.\n" .string "It's enough to keep me satisfied.$" -Route115_Text_29B826: @ 829B826 +Route115_Text_KyraIntro: @ 829B826 .string "I'll battle while I'm running!\n" .string "Try to keep up with me!$" -Route115_Text_29B85D: @ 829B85D +Route115_Text_KyraDefeat: @ 829B85D .string "Gasp, gasp…$" -Route115_Text_29B869: @ 829B869 +Route115_Text_KyraPostBattle: @ 829B869 .string "I made the mistake of trying to battle\n" .string "while running!\p" .string "I should take a run to calm down…$" -Route115_Text_29B8C1: @ 829B8C1 +Route115_Text_JaidenIntro: @ 829B8C1 .string "Take that!\n" .string "Ultra POKéMON ninja attack!$" -Route115_Text_29B8E8: @ 829B8E8 +Route115_Text_JaidenDefeat: @ 829B8E8 .string "Waaah!\n" .string "Our strategy failed!$" -Route115_Text_29B904: @ 829B904 +Route115_Text_JaidenPostBattle: @ 829B904 .string "But my POKéMON were ultra,\n" .string "weren't they?$" -Route115_Text_29B92D: @ 829B92D +Route115_Text_HeleneIntro: @ 829B92D .string "My POKéMON have black belt-level\n" .string "strength!$" -Route115_Text_29B958: @ 829B958 +Route115_Text_HeleneDefeat: @ 829B958 .string "This is too humiliating!$" -Route115_Text_29B971: @ 829B971 +Route115_Text_HelenePostBattle: @ 829B971 .string "I rarely meet anyone who's better\n" .string "than me…\p" .string "I get it now!\n" .string "You're a GYM LEADER, aren't you?$" -Route115_Text_29B9CB: @ 829B9CB +Route115_Text_AlixIntro: @ 829B9CB .string "Our eyes met!\n" .string "There's no getting away now!$" -Route115_Text_29B9F6: @ 829B9F6 +Route115_Text_AlixDefeat: @ 829B9F6 .string "Gah!\n" .string "Not bad!$" -Route115_Text_29BA04: @ 829BA04 +Route115_Text_AlixPostBattle: @ 829BA04 .string "Oh, well.\n" .string "I think I will TELEPORT home.$" -Route115_Text_29BA2C: @ 829BA2C +Route115_Text_MarleneIntro: @ 829BA2C .string "You've disturbed my meditation…\n" .string "You'll be punished for it.$" -Route115_Text_29BA67: @ 829BA67 +Route115_Text_MarleneDefeat: @ 829BA67 .string "You've broken my concentration!$" -Route115_Text_29BA87: @ 829BA87 +Route115_Text_MarlenePostBattle: @ 829BA87 .string "I was meditating with my POKéMON.\n" .string "But this place isn't very peaceful…$" -Route116_Text_29BACD: @ 829BACD +Route116_Text_ClarkIntro: @ 829BACD .string "If the tunnel doesn't go through, then\n" .string "I'll just go over the top.$" -Route116_Text_29BB0F: @ 829BB0F +Route116_Text_ClarkDefeat: @ 829BB0F .string "Gasp… Gasp…\n" .string "Losing made me tired…$" -Route116_Text_29BB31: @ 829BB31 +Route116_Text_ClarkPostBattle: @ 829BB31 .string "It's no big deal if there's no tunnel.\n" .string "To a HIKER, mountains are roads!$" -Route116_Text_29BB79: @ 829BB79 +Route116_Text_JoeyIntro: @ 829BB79 .string "My POKéMON rule!\n" .string "Check them out!$" -Route116_Text_29BB9A: @ 829BB9A +Route116_Text_JoeyDefeat: @ 829BB9A .string "Ouch! A scrape!\n" .string "I have to put on a bandage!$" -Route116_Text_29BBC6: @ 829BBC6 +Route116_Text_JoeyPostBattle: @ 829BBC6 .string "Bandages are signs of toughness!\n" .string "I've got another one!$" -Route116_Text_29BBFD: @ 829BBFD +Route116_Text_JoseIntro: @ 829BBFD .string "My BUG POKéMON are tough!\n" .string "Let's battle!$" -Route116_Text_29BC25: @ 829BC25 +Route116_Text_JoseDefeat: @ 829BC25 .string "I lost!\n" .string "I thought I had you!$" -Route116_Text_29BC42: @ 829BC42 +Route116_Text_JosePostBattle: @ 829BC42 .string "BUG POKéMON evolve quickly.\n" .string "So they get strong quickly, too.$" -Route116_Text_29BC7F: @ 829BC7F +Route116_Text_JaniceIntro: @ 829BC7F .string "Let me teach you how strong my\n" .string "adorable POKéMON is!$" -Route116_Text_29BCB3: @ 829BCB3 +Route116_Text_JaniceDefeat: @ 829BCB3 .string "You're a notch above me…$" -Route116_Text_29BCCC: @ 829BCCC +Route116_Text_JanicePostBattle: @ 829BCCC .string "POKéMON that possess cuteness and\n" .string "power, that's ideal, I think.$" -Route116_Text_29BD0C: @ 829BD0C +Route116_Text_JerryIntro: @ 829BD0C .string "We learn all sorts of things at the\n" .string "TRAINER'S SCHOOL.\p" .string "I want to test things out for real!$" -Route116_Text_29BD66: @ 829BD66 +Route116_Text_JerryDefeat: @ 829BD66 .string "I slacked off in school…\n" .string "That's why I lost.$" -Route116_Text_29BD92: @ 829BD92 +Route116_Text_JerryPostBattle: @ 829BD92 .string "I'll have to redo some courses at\n" .string "the TRAINER'S SCHOOL.\l" .string "If I don't, ROXANNE will be steamed.$" -Route116_Text_29BDEF: @ 829BDEF +Route116_Text_JerryRegister1: @ 829BDEF .string "I learned at the TRAINER'S SCHOOL\n" .string "that a POKéNAV can register TRAINERS.\p" .string "I don't really get what that means,\n" .string "so can I just try it?$" -Route116_Text_29BE71: @ 829BE71 +Route116_Text_JerryRegister2: @ 829BE71 .string "I learned at the TRAINER'S SCHOOL\n" .string "that a POKéNAV can register TRAINERS.\p" .string "I don't really get what that means,\n" .string "so can I just try it?$" -Route116_Text_29BEF3: @ 829BEF3 +Route116_Text_JerryRematchIntro: @ 829BEF3 .string "I've been studying seriously at the\n" .string "TRAINER'S SCHOOL.\l" .string "I won't lose like I did last time.$" -Route116_Text_29BF4C: @ 829BF4C +Route116_Text_JerryRematchDefeat: @ 829BF4C .string "Hunh?\n" .string "I studied diligently.$" -Route116_Text_29BF68: @ 829BF68 +Route116_Text_JerryPostRematch: @ 829BF68 .string "I'll have to redo some courses at\n" .string "the TRAINER'S SCHOOL.\l" .string "If I don't, ROXANNE will be steamed.$" -Route116_Text_29BFC5: @ 829BFC5 +Route116_Text_KarenIntro: @ 829BFC5 .string "I study at school, and I study on\n" .string "the way home, too!$" -Route116_Text_29BFFA: @ 829BFFA +Route116_Text_KarenDefeat: @ 829BFFA .string "I'm in shock--I lost?$" -Route116_Text_29C010: @ 829C010 +Route116_Text_KarenPostBattle: @ 829C010 .string "Awww, I'll never become an elegant\n" .string "TRAINER like ROXANNE this way!$" -Route116_Text_29C052: @ 829C052 +Route116_Text_KarenRegister1: @ 829C052 .string "Oh, wow! Isn't that a POKéNAV?\n" .string "I have one, too! Please register me!$" -Route116_Text_29C096: @ 829C096 +Route116_Text_KarenRegister2: @ 829C096 .string "Oh, wow! Isn't that a POKéNAV?\n" .string "I have one, too! Please register me!$" -Route116_Text_29C0DA: @ 829C0DA +Route116_Text_KarenRematchIntro: @ 829C0DA .string "I studied a whole lot since I saw you.\n" .string "You must see my achievements!$" -Route116_Text_29C11F: @ 829C11F +Route116_Text_KarenRematchDefeat: @ 829C11F .string "I'm in shock.\n" .string "I lost again?$" -Route116_Text_29C13B: @ 829C13B +Route116_Text_KarenPostRematch: @ 829C13B .string "You've beaten ROXANNE?\n" .string "I can't beat you, then. Not yet.$" -Route116_Text_29C173: @ 829C173 +Route116_Text_SarahIntro: @ 829C173 .string "Just so you know, I've never once been\n" .string "bested by anyone at anything.$" -Route116_Text_29C1B8: @ 829C1B8 +Route116_Text_SarahDefeat: @ 829C1B8 .string "Oh, my goodness.\n" .string "This is a new experience for me.$" -Route116_Text_29C1EA: @ 829C1EA +Route116_Text_SarahPostBattle: @ 829C1EA .string "My life of luxury affords me all that\n" .string "I could possibly desire.\p" .string "However, when it comes to POKéMON,\n" .string "my wealth has no meaning.$" -Route116_Text_29C266: @ 829C266 +Route116_Text_DawsonIntro: @ 829C266 .string "When you lay your eyes on my POKéMON's\n" .string "gorgeous fur, their beauty will render\l" .string "you helpless!$" -Route116_Text_29C2C2: @ 829C2C2 +Route116_Text_DawsonDefeat: @ 829C2C2 .string "Oh, baby, say it isn't so!$" -Route116_Text_29C2DD: @ 829C2DD +Route116_Text_DawsonPostBattle: @ 829C2DD .string "Oh, no, no, no!\n" .string "You've mussed up my POKéMON's fur!\l" .string "You've ruined my hairdo, too!\l" .string "I'll have to call my stylist now!$" -Route116_Text_29C350: @ 829C350 +Route116_Text_DevanIntro: @ 829C350 .string "We'll rock you hard!$" -Route116_Text_29C365: @ 829C365 +Route116_Text_DevanDefeat: @ 829C365 .string "Aiyiyi!\n" .string "No contest at all!$" -Route116_Text_29C380: @ 829C380 +Route116_Text_DevanPostBattle: @ 829C380 .string "I should try different POKéMON\n" .string "types, that's what I ought to do.$" -Route116_Text_29C3C1: @ 829C3C1 +Route116_Text_JohnsonIntro: @ 829C3C1 .string "It's a dead end up here.\n" .string "I'm bored, so can we battle?$" -Route116_Text_29C3F7: @ 829C3F7 +Route116_Text_JohnsonDefeat: @ 829C3F7 .string "That was fun even though I lost.$" -Route116_Text_29C418: @ 829C418 +Route116_Text_JohnsonPostBattle: @ 829C418 .string "Want to stay here and keep\n" .string "me company?$" -Route117_Text_29C43F: @ 829C43F +Route117_Text_IsaacIntro: @ 829C43F .string "Listen, could I get you to battle\n" .string "the POKéMON I'm raising?$" -Route117_Text_29C47A: @ 829C47A +Route117_Text_IsaacDefeat: @ 829C47A .string "You've raised yours superbly…$" -Route117_Text_29C498: @ 829C498 +Route117_Text_IsaacPostBattle: @ 829C498 .string "POKéMON isn't all about power.\p" .string "Polishing a unique aspect of one's\n" .string "character is another way of enjoying\l" .string "POKéMON.$" -Route117_Text_29C508: @ 829C508 +Route117_Text_IsaacRegister: @ 829C508 .string "I'm going to redouble my training.\n" .string "Would you come look in on us?$" -Route117_Text_29C549: @ 829C549 +Route117_Text_IsaacRematchIntro: @ 829C549 .string "The POKéMON I've been raising are\n" .string "looking good, just like before.$" -Route117_Text_29C58B: @ 829C58B +Route117_Text_IsaacRematchDefeat: @ 829C58B .string "You know how to raise them properly.\n" .string "You might have DAY CARE skills…$" -Route117_Text_29C5D0: @ 829C5D0 +Route117_Text_IsaacPostRematch: @ 829C5D0 .string "Your POKéMON are growing good!\n" .string "You should enter them in CONTESTS.$" -Route117_Text_29C612: @ 829C612 +Route117_Text_LydiaIntro: @ 829C612 .string "Please, allow me to evaluate if you\n" .string "have raised your POKéMON properly.$" -Route117_Text_29C659: @ 829C659 +Route117_Text_LydiaDefeat: @ 829C659 .string "Yes, they are growing properly.$" -Route117_Text_29C679: @ 829C679 +Route117_Text_LydiaPostBattle: @ 829C679 .string "Try raising POKéMON with more\n" .string "attention to their character traits.$" -Route117_Text_29C6BC: @ 829C6BC +Route117_Text_LydiaRegister: @ 829C6BC .string "I'm glad I met a superb TRAINER in you.\n" .string "I hope to see you again.$" -Route117_Text_29C6FD: @ 829C6FD +Route117_Text_LydiaRematchIntro: @ 829C6FD .string "Allow me to reevaluate if you have\n" .string "raised your POKéMON properly.$" -Route117_Text_29C73E: @ 829C73E +Route117_Text_LydiaRematchDefeat: @ 829C73E .string "They are growing admirably.$" -Route117_Text_29C75A: @ 829C75A +Route117_Text_LydiaPostRematch: @ 829C75A .string "POKéMON seem to like different kinds\n" .string "of {POKEBLOCK}S, depending on their nature.$" -Route117_Text_29C7A5: @ 829C7A5 +Route117_Text_DylanIntro: @ 829C7A5 .string "I'm in the middle of a triathlon, but,\n" .string "whatever, let's have a battle!$" -Route117_Text_29C7EB: @ 829C7EB +Route117_Text_DylanDefeat: @ 829C7EB .string "I ran out of energy!$" -Route117_Text_29C800: @ 829C800 +Route117_Text_DylanPostBattle: @ 829C800 .string "I may have blown it…\p" .string "I might have dropped to last during\n" .string "that battle…$" -Route117_Text_29C846: @ 829C846 +Route117_Text_DylanRegister: @ 829C846 .string "POKéMON have to be strong, too?\n" .string "I'd like you to train me!$" -Route117_Text_29C880: @ 829C880 +Route117_Text_DylanRematchIntro: @ 829C880 .string "I'm smack in the middle of a triathlon,\n" .string "but I'm comfortably ahead.\l" .string "Let's make this a quick battle!$" -Route117_Text_29C8E3: @ 829C8E3 +Route117_Text_DylanRematchDefeat: @ 829C8E3 .string "I ran out of energy again!$" -Route117_Text_29C8FE: @ 829C8FE +Route117_Text_DylanPostRematch: @ 829C8FE .string "I was tops in swimming and cycling,\n" .string "but I'm not quite that confident with\l" .string "POKéMON yet.$" -Route117_Text_29C955: @ 829C955 +Route117_Text_MariaIntro: @ 829C955 .string "I do my triathlon training with POKéMON,\n" .string "so I'm pretty confident about my speed.$" -Route117_Text_29C9A6: @ 829C9A6 +Route117_Text_MariaDefeat: @ 829C9A6 .string "I need to get more practices in,\n" .string "I guess.$" -Route117_Text_29C9D0: @ 829C9D0 +Route117_Text_MariaPostBattle: @ 829C9D0 .string "Training is meaningful only if you\n" .string "keep it up regularly.\p" .string "Okay! I'll resume my training!\n" .string "Tomorrow!$" -Route117_Text_29CA32: @ 829CA32 +Route117_Text_MariaRegister: @ 829CA32 .string "You appear to be training properly…\n" .string "If you'd like, I'll battle you later!$" -Route117_Text_29CA7C: @ 829CA7C +Route117_Text_MariaRematchIntro: @ 829CA7C .string "Are you keeping up with your training?\n" .string "I sure am!\l" .string "Let me show you the evidence!$" -Route117_Text_29CACC: @ 829CACC +Route117_Text_MariaRematchDefeat: @ 829CACC .string "I need to get more practices in,\n" .string "I guess.$" -Route117_Text_29CAF6: @ 829CAF6 +Route117_Text_MariaPostRematch: @ 829CAF6 .string "I'll resume training tomorrow.\n" .string "Let's battle again sometime!$" -Route117_Text_29CB32: @ 829CB32 +Route117_Text_DerekIntro: @ 829CB32 .string "Once a BUG CATCHER!\n" .string "And now a BUG MANIAC!\p" .string "But my love for POKéMON remains\n" .string "unchanged!$" -Route117_Text_29CB87: @ 829CB87 +Route117_Text_DerekDefeat: @ 829CB87 .string "My ineptitude also remains\n" .string "unchanged…$" -Route117_Text_29CBAD: @ 829CBAD +Route117_Text_DerekPostBattle: @ 829CBAD .string "All I did was follow my heart, and now\n" .string "they call me a BUG MANIAC…\p" .string "Still, I am an expert on BUG POKéMON,\n" .string "so it's only natural that they call me\l" .string "a BUG MANIAC.$" -Route117_Text_29CC4A: @ 829CC4A +Route117_Text_AnnaIntro: @ 829CC4A .string "ANNA: I'm with my pretty junior student\n" .string "partner. I have to do good!$" -Route117_Text_29CC8E: @ 829CC8E +Route117_Text_AnnaDefeat: @ 829CC8E .string "ANNA: I'm with my pretty junior student\n" .string "partner! Let me win!$" -Route117_Text_29CCCB: @ 829CCCB +Route117_Text_AnnaPostBattle: @ 829CCCB .string "ANNA: Your POKéMON have some good\n" .string "combinations.\p" .string "I'd say you're second only to us!$" -Route117_Text_29CD1D: @ 829CD1D +Route117_Text_AnnaAndMegRegister: @ 829CD1D .string "ANNA: We can't take this lying down!\n" .string "You will come back, won't you?$" -Route117_Text_29CD61: @ 829CD61 +Route117_Text_AnnaNotEnoughMons: @ 829CD61 .string "ANNA: If you want to battle us,\n" .string "bring two POKéMON with you.$" -Route117_Text_29CD9D: @ 829CD9D +Route117_Text_MegIntro: @ 829CD9D .string "MEG: I'm going to tag up with my super\n" .string "senior student partner and beat you!$" -Route117_Text_29CDE9: @ 829CDE9 +Route117_Text_MegDefeat: @ 829CDE9 .string "MEG: Oh, no!\n" .string "I'm sorry, ANNA! I let you down…$" -Route117_Text_29CE17: @ 829CE17 +Route117_Text_MegPostBattle: @ 829CE17 .string "MEG: I dragged ANNA down…\n" .string "If I didn't, she would have won!$" -Route117_Text_29CE52: @ 829CE52 +Route117_Text_MegNotEnoughMons: @ 829CE52 .string "MEG: Do you only have one POKéMON?\n" .string "We can't battle with you, then.\p" .string "We want to have a 2-on-2 battle.$" -Route117_Text_29CEB6: @ 829CEB6 +Route117_Text_AnnaRematchIntro: @ 829CEB6 .string "ANNA: I can't keep losing in front of\n" .string "my junior partner, right?$" -Route117_Text_29CEF6: @ 829CEF6 +Route117_Text_AnnaRematchDefeat: @ 829CEF6 .string "ANNA: I couldn't get into the groove.$" -Route117_Text_29CF1C: @ 829CF1C +Route117_Text_AnnaPostRematch: @ 829CF1C .string "ANNA: Your POKéMON have some good\n" .string "combinations.\p" .string "I'd say you're second only to us!$" -Route117_Text_29CF6E: @ 829CF6E +Route117_Text_AnnaRematchNotEnoughMons: @ 829CF6E .string "ANNA: If you want to battle us,\n" .string "bring two POKéMON with you.$" -Route117_Text_29CFAA: @ 829CFAA +Route117_Text_MegRematchIntro: @ 829CFAA .string "MEG: I'm going to tag up with my\n" .string "senior partner and win this time!$" -Route117_Text_29CFED: @ 829CFED +Route117_Text_MegRematchDefeat: @ 829CFED .string "MEG: Too strong!$" -Route117_Text_29CFFE: @ 829CFFE +Route117_Text_MegPostRematch: @ 829CFFE .string "MEG: I battled together with my\n" .string "senior partner, but we lost…\p" .string "That's so discouraging…$" -Route117_Text_29D053: @ 829D053 +Route117_Text_MegRematchNotEnoughMons: @ 829D053 .string "MEG: Do you only have one POKéMON?\n" .string "We can't battle with you, then.\p" .string "We want to have a 2-on-2 battle.$" -Route117_Text_29D0B7: @ 829D0B7 +Route117_Text_MelinaIntro: @ 829D0B7 .string "Isn't it nice? To battle while looking\n" .string "at pretty flowers?$" -Route117_Text_29D0F1: @ 829D0F1 +Route117_Text_MelinaDefeat: @ 829D0F1 .string "Oh, that's quite impressive!$" -Route117_Text_29D10E: @ 829D10E +Route117_Text_MelinaPostBattle: @ 829D10E .string "It feels wonderful to go for a jog\n" .string "while looking at flowers.$" -Route117_Text_29D14B: @ 829D14B +Route117_Text_BrandiIntro: @ 829D14B .string "Let me demonstrate the power\n" .string "hidden within a PSYCHIC POKéMON!$" -Route117_Text_29D189: @ 829D189 +Route117_Text_BrandiDefeat: @ 829D189 .string "Astonishing!$" -Route117_Text_29D196: @ 829D196 +Route117_Text_BrandiPostBattle: @ 829D196 .string "PSYCHIC POKéMON are complex.\n" .string "You should try catching some.$" -Route117_Text_29D1D1: @ 829D1D1 +Route117_Text_AishaIntro: @ 829D1D1 .string "Concentrate on getting the win.\n" .string "That's how I battle!$" -Route117_Text_29D206: @ 829D206 +Route117_Text_AishaDefeat: @ 829D206 .string "I don't waste any time being angry\n" .string "over a loss--I would rather train.$" -Route117_Text_29D24C: @ 829D24C +Route117_Text_AishaPostBattle: @ 829D24C .string "I think that if you worry about losing,\n" .string "you're more likely to lose.$" -Route118_Text_29D290: @ 829D290 +Route118_Text_RoseIntro: @ 829D290 .string "The aroma of flowers has a magical\n" .string "power. It cleanses us body and soul.$" -Route118_Text_29D2D8: @ 829D2D8 +Route118_Text_RoseDefeat: @ 829D2D8 .string "Oh, dear me.\n" .string "I seem to have lost.$" -Route118_Text_29D2FA: @ 829D2FA +Route118_Text_RosePostBattle: @ 829D2FA .string "Flowers, POKéMON…\n" .string "I love whatever smells nice.\p" .string "Stinky things…\n" .string "I'll pass.$" -Route118_Text_29D343: @ 829D343 +Route118_Text_RoseRegister: @ 829D343 .string "Sniff… That odor--it's a POKéNAV!\n" .string "We must register each other!$" -Route118_Text_29D382: @ 829D382 +Route118_Text_RoseRematchIntro: @ 829D382 .string "Were you drawn here by the sweet\n" .string "aroma?$" -Route118_Text_29D3AA: @ 829D3AA +Route118_Text_RoseRematchDefeat: @ 829D3AA .string "The power of aroma…\n" .string "It didn't seem to do much.$" -Route118_Text_29D3D9: @ 829D3D9 +Route118_Text_RosePostRematch: @ 829D3D9 .string "If you use a sweet aroma properly,\n" .string "POKéMON will be attracted by it.$" -Route118_Text_29D41D: @ 829D41D +Route118_Text_PerryIntro: @ 829D41D .string "BIRD POKéMON that FLY elegantly in\n" .string "the sky… They're the best!$" -Route118_Text_29D45B: @ 829D45B +Route118_Text_PerryDefeat: @ 829D45B .string "Urgh…\n" .string "I crashed…$" -Route118_Text_29D46C: @ 829D46C +Route118_Text_PerryPostBattle: @ 829D46C .string "You've got great POKéMON.\n" .string "I'll have to train mine better.$" -Route118_Text_29D4A6: @ 829D4A6 +Route118_Text_ChesterIntro: @ 829D4A6 .string "Take flight!\n" .string "My BIRD POKéMON!$" -Route118_Text_29D4C4: @ 829D4C4 +Route118_Text_ChesterDefeat: @ 829D4C4 .string "They did take flight…$" -Route118_Text_29D4DA: @ 829D4DA +Route118_Text_ChesterPostBattle: @ 829D4DA .string "If they'd get stronger, they'd be able\n" .string "to fly more freely…$" -Route118_Text_29D515: @ 829D515 +Route118_Text_BarnyIntro: @ 829D515 .string "I'm a FISHERMAN, but also a TRAINER.\n" .string "I'm raising the POKéMON I caught.$" -Route118_Text_29D55C: @ 829D55C +Route118_Text_BarnyDefeat: @ 829D55C .string "I thought I was doing okay in my\n" .string "training…$" -Route118_Text_29D587: @ 829D587 +Route118_Text_BarnyPostBattle: @ 829D587 .string "I couldn't win by training POKéMON\n" .string "while I fished…\p" .string "Was I doing things in half measures?$" -Route118_Text_29D5DF: @ 829D5DF +Route118_Text_WadeIntro: @ 829D5DF .string "For FISHERMEN, equipment is the key.\p" .string "But for TRAINERS, the key ingredients\n" .string "are POKéMON and heart, of course!$" -Route118_Text_29D64C: @ 829D64C +Route118_Text_WadeDefeat: @ 829D64C .string "I was beaten in heart?$" -Route118_Text_29D663: @ 829D663 +Route118_Text_WadePostBattle: @ 829D663 .string "Come to think of it, fishing is a battle\n" .string "between a FISHERMAN and a POKéMON.$" -Route118_Text_29D6AF: @ 829D6AF +Route118_Text_DaltonIntro: @ 829D6AF .string "Let my melody rock your soul!$" -Route118_Text_29D6CD: @ 829D6CD +Route118_Text_DaltonDefeat: @ 829D6CD .string "La-lalala…$" -Route118_Text_29D6D8: @ 829D6D8 +Route118_Text_DaltonPostBattle: @ 829D6D8 .string "An electric guitar doesn't always\n" .string "have to be noisy…\p" .string "It can be strummed to squeeze out\n" .string "this heart-stirring melody…$" -Route118_Text_29D74A: @ 829D74A +Route118_Text_DaltonRegister: @ 829D74A .string "When I compose better melodies,\n" .string "you have to come listen, okay?$" -Route118_Text_29D789: @ 829D789 +Route118_Text_DaltonRematchIntro: @ 829D789 .string "A melody from my POKéMON and me…\n" .string "Let us deliver it to your soul.$" -Route118_Text_29D7CA: @ 829D7CA +Route118_Text_DaltonRematchDefeat: @ 829D7CA .string "La-lalala…$" -Route118_Text_29D7D5: @ 829D7D5 +Route118_Text_DaltonPostRematch: @ 829D7D5 .string "When I play, my emotions should reach\n" .string "you through my electric guitar…$" -Route118_Text_29D81B: @ 829D81B +Route118_Text_DeandreIntro: @ 829D81B .string "Go, go, go!\n" .string "POKéMON 1, 2, and 3!$" -Route118_Text_29D83C: @ 829D83C +Route118_Text_DeandreDefeat: @ 829D83C .string "Come in, POKéMON! Are you okay?\n" .string "POKéMON 1, 2, and 3?!$" -Route118_Text_29D872: @ 829D872 +Route118_Text_DeandrePostBattle: @ 829D872 .string "Isn't it cool that I have a POKéMON\n" .string "battle team?\p" .string "You can copy me--I don't mind!$" diff --git a/include/constants/flags.h b/include/constants/flags.h index 8a507e976..1fe162f72 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -934,7 +934,7 @@ #define FLAG_HIDE_ROUTE_116_MR_BRINEY 0x37B #define FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS 0x37C #define FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS 0x37D -#define FLAG_HIDE_ROUTE_116_TUNNELER 0x37E +#define FLAG_HIDE_ROUTE_116_WANDAS_BOYFRIEND 0x37E #define FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2 0x37F #define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 0x380 #define FLAG_HIDE_ROUTE_101_BIRCH 0x381 diff --git a/include/constants/items.h b/include/constants/items.h index b4e4798fb..db3474a72 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -467,18 +467,24 @@ #define FIRST_BERRY_INDEX ITEM_CHERI_BERRY #define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY + +// Range of berries given out by various NPCS #define FIRST_BERRY_MASTER_BERRY ITEM_POMEG_BERRY #define LAST_BERRY_MASTER_BERRY ITEM_NOMEL_BERRY #define FIRST_BERRY_MASTER_WIFE_BERRY ITEM_CHERI_BERRY #define LAST_BERRY_MASTER_WIFE_BERRY ITEM_SITRUS_BERRY #define FIRST_KIRI_BERRY ITEM_POMEG_BERRY #define LAST_KIRI_BERRY ITEM_NOMEL_BERRY +#define FIRST_ROUTE_114_MAN_BERRY ITEM_RAZZ_BERRY +#define LAST_ROUTE_114_MAN_BERRY ITEM_PINAP_BERRY -#define NUM_BERRY_MASTER_BERRIES LAST_BERRY_MASTER_BERRY - FIRST_BERRY_MASTER_BERRY + 1 -#define NUM_BERRY_MASTER_BERRIES_SKIPPED FIRST_BERRY_MASTER_BERRY - FIRST_BERRY_INDEX -#define NUM_BERRY_MASTER_WIFE_BERRIES LAST_BERRY_MASTER_WIFE_BERRY - FIRST_BERRY_MASTER_WIFE_BERRY + 1 -#define NUM_KIRI_BERRIES LAST_KIRI_BERRY - FIRST_KIRI_BERRY + 1 -#define NUM_KIRI_BERRIES_SKIPPED FIRST_KIRI_BERRY - FIRST_BERRY_INDEX +#define NUM_BERRY_MASTER_BERRIES LAST_BERRY_MASTER_BERRY - FIRST_BERRY_MASTER_BERRY + 1 +#define NUM_BERRY_MASTER_BERRIES_SKIPPED FIRST_BERRY_MASTER_BERRY - FIRST_BERRY_INDEX +#define NUM_BERRY_MASTER_WIFE_BERRIES LAST_BERRY_MASTER_WIFE_BERRY - FIRST_BERRY_MASTER_WIFE_BERRY + 1 +#define NUM_KIRI_BERRIES LAST_KIRI_BERRY - FIRST_KIRI_BERRY + 1 +#define NUM_KIRI_BERRIES_SKIPPED FIRST_KIRI_BERRY - FIRST_BERRY_INDEX +#define NUM_ROUTE_114_MAN_BERRIES LAST_ROUTE_114_MAN_BERRY - FIRST_ROUTE_114_MAN_BERRY + 1 +#define NUM_ROUTE_114_MAN_BERRIES_SKIPPED FIRST_ROUTE_114_MAN_BERRY - FIRST_BERRY_INDEX #define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1)) |