diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-28 14:26:34 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-28 14:26:34 -0500 |
| commit | 30f01c7df68bb9cf80ece491a457c8ce96c52c83 (patch) | |
| tree | 448e66dcb49dd7d4544ce7e9e722f2518d2459fc | |
| parent | 0ddd7ebb1d15a8dc03baaa7c581096eb295ac352 (diff) | |
Document Sevii Island caves
37 files changed, 590 insertions, 578 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index e28093686..0e9c4d6f3 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -25,7 +25,9 @@ #include "constants/battle_setup.h" #include "constants/map_scripts.h" #include "constants/cable_club.h" +#include "constants/field_tasks.h" #include "constants/field_weather.h" +#include "constants/weather.h" #include "constants/union_room.h" #include "constants/trade.h" #include "constants/quest_log.h" @@ -658,6 +660,7 @@ gStdScriptsEnd:: .include "data/maps/SevenIsland_TrainerTower/text.inc" .include "data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc" .include "data/maps/SevenIsland_SevaultCanyon/text.inc" + .include "data/maps/SevenIsland_TanobyRuins/text.inc" .include "data/maps/PalletTown_PlayersHouse_1F/text.inc" .include "data/maps/PalletTown_PlayersHouse_2F/text.inc" .include "data/maps/PalletTown_GarysHouse/text.inc" @@ -1648,9 +1651,9 @@ EventScript_1A8EC0:: @ 81A8EC0 .include "data/scripts/seagallop.inc" .include "data/scripts/static_pokemon.inc" -EventScript_1A925E:: @ 81A925E +EventScript_TryDarkenRuins:: @ 81A925E goto_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, EventScript_Return - setweather 11 + setweather WEATHER_SHADE doweather return diff --git a/data/layouts/UnusedLayout_83453C0/border.bin b/data/layouts/ThreeIsland_DunsparceTunnel_DugOut/border.bin index a021ddd4e..a021ddd4e 100644 --- a/data/layouts/UnusedLayout_83453C0/border.bin +++ b/data/layouts/ThreeIsland_DunsparceTunnel_DugOut/border.bin diff --git a/data/layouts/UnusedLayout_83453C0/map.bin b/data/layouts/ThreeIsland_DunsparceTunnel_DugOut/map.bin index ffc668ba5..ffc668ba5 100644 --- a/data/layouts/UnusedLayout_83453C0/map.bin +++ b/data/layouts/ThreeIsland_DunsparceTunnel_DugOut/map.bin diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index 63fc06562..f08efe5c7 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -3620,16 +3620,16 @@ "blockdata_filepath": "data/layouts/ThreeIsland_DunsparceTunnel/map.bin" }, { - "id": "LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_2", - "name": "UnusedLayout_83453C0_Layout", + "id": "LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_DUG_OUT", + "name": "ThreeIsland_DunsparceTunnel_DugOut_Layout", "width": 30, "height": 7, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4A94", "secondary_tileset": "gTileset_82D4BFC", - "border_filepath": "data/layouts/UnusedLayout_83453C0/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_83453C0/map.bin" + "border_filepath": "data/layouts/ThreeIsland_DunsparceTunnel_DugOut/border.bin", + "blockdata_filepath": "data/layouts/ThreeIsland_DunsparceTunnel_DugOut/map.bin" }, { "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ENTRANCE", diff --git a/data/maps/FourIsland_IcefallCave_1F/scripts.inc b/data/maps/FourIsland_IcefallCave_1F/scripts.inc index c3e3eaff2..c976122a7 100644 --- a/data/maps/FourIsland_IcefallCave_1F/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_1F/scripts.inc @@ -5,7 +5,7 @@ FourIsland_IcefallCave_1F_MapScripts:: @ 8163D44 .byte 0 FourIsland_IcefallCave_1F_OnResume:: @ 8163D54 - setstepcallback 4 + setstepcallback STEP_CB_ICE end FourIsland_IcefallCave_1F_OnLoad:: @ 8163D57 @@ -13,13 +13,13 @@ FourIsland_IcefallCave_1F_OnLoad:: @ 8163D57 end FourIsland_IcefallCave_1F_OnFrame:: @ 8163D5B - map_script_2 VAR_TEMP_1, 1, EventScript_163D65 + map_script_2 VAR_TEMP_1, 1, FourIsland_IcefallCave_1F_EventScript_FallDownHole .2byte 0 -EventScript_163D65:: @ 8163D65 +FourIsland_IcefallCave_1F_EventScript_FallDownHole:: @ 8163D65 lockall delay 20 - applymovement OBJ_EVENT_ID_PLAYER, Movement_163D7F + applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_1F_Movement_SetInvisible waitmovement 0 playse SE_RU_HYUU delay 60 @@ -28,6 +28,6 @@ EventScript_163D65:: @ 8163D65 releaseall end -Movement_163D7F:: @ 8163D7F +FourIsland_IcefallCave_1F_Movement_SetInvisible:: @ 8163D7F set_invisible step_end diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json index 9af9a6faf..32ca627ba 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_IcefallCave_Back_EventScript_163F25", + "script": "FourIsland_IcefallCave_Back_EventScript_Lorelei", "flag": "FLAG_HIDE_ICEFALL_CAVE_LORELEI" }, { @@ -83,7 +83,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ICEFALL_CAVE_BACK", "var_value": 0, - "script": "FourIsland_IcefallCave_Back_EventScript_163D98" + "script": "FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene" }, { "type": "trigger", @@ -92,7 +92,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ICEFALL_CAVE_BACK", "var_value": 0, - "script": "FourIsland_IcefallCave_Back_EventScript_163D98" + "script": "FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene" }, { "type": "trigger", @@ -101,7 +101,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ICEFALL_CAVE_BACK", "var_value": 0, - "script": "FourIsland_IcefallCave_Back_EventScript_163D98" + "script": "FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene" } ], "bg_events": [] diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index 39eb3f0b4..a0a94d4be 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -1,100 +1,105 @@ +.equ LOCALID_ROCKET1, 1 +.equ LOCALID_ROCKET2, 2 +.equ LOCALID_LORELEI, 3 +.equ LOCALID_ROCKET3, 4 + FourIsland_IcefallCave_Back_MapScripts:: @ 8163D82 map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_IcefallCave_Back_OnTransition .byte 0 FourIsland_IcefallCave_Back_OnTransition:: @ 8163D88 compare VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1 - call_if_eq EventScript_163D94 + call_if_eq FourIsland_IcefallCave_Back_EventScript_HideLorelei end -EventScript_163D94:: @ 8163D94 +FourIsland_IcefallCave_Back_EventScript_HideLorelei:: @ 8163D94 setflag FLAG_HIDE_ICEFALL_CAVE_LORELEI return -FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 +FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene:: @ 8163D98 lockall textcolor 1 - msgbox gUnknown_817B04F - applymovement 1, Movement_163EE8 + msgbox FourIsland_IcefallCave_Back_Text_LoreleiKeepHandsOffMons + applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown waitmovement 0 textcolor 0 - msgbox gUnknown_817B0B9 + msgbox FourIsland_IcefallCave_Back_Text_ShutItLadyLeaveUsBe closemessage playse SE_PIN - applymovement 3, Movement_ExclamationMark + applymovement LOCALID_LORELEI, Movement_ExclamationMark waitmovement 0 - applymovement 3, Movement_WalkInPlaceFastestDown + applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestDown waitmovement 0 - applymovement 3, Movement_Delay48 + applymovement LOCALID_LORELEI, Movement_Delay48 waitmovement 0 textcolor 1 - msgbox gUnknown_817B109 + msgbox FourIsland_IcefallCave_Back_Text_LoreleiPlayerHelpMeKickPoachersOut closemessage - applymovement 3, Movement_WalkInPlaceFastestRight + applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestRight waitmovement 0 delay 18 - applymovement 3, Movement_WalkInPlaceFastestDown + applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestDown waitmovement 0 delay 35 - applymovement 4, Movement_163F11 - applymovement 3, Movement_163F18 - applymovement OBJ_EVENT_ID_PLAYER, Movement_163EDD + applymovement LOCALID_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei + applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiToRockets + applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_Back_Movement_PlayerToRockets waitmovement 0 - applymovement 2, Movement_163EE8 + applymovement LOCALID_ROCKET2, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown waitmovement 0 playbgm MUS_ROCKET, 0 textcolor 0 - msgbox gUnknown_817B20B - setvar VAR_LAST_TALKED, 4 - trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_45, Text_17B251 - applymovement 3, Movement_163F1B + msgbox FourIsland_IcefallCave_Back_Text_GruntIntro + setvar VAR_LAST_TALKED, LOCALID_ROCKET3 + trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_45, FourIsland_IcefallCave_Back_Text_GruntDefeat + applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_WalkInPlaceUp waitmovement 0 textcolor 1 - msgbox gUnknown_817B269 + msgbox FourIsland_IcefallCave_Back_Text_LoreleiWhereHaveYouTakenMons textcolor 0 - msgbox gUnknown_817B2EF + msgbox FourIsland_IcefallCave_Back_Text_NotTellingYouThat textcolor 1 - message Text_17B313 + message FourIsland_IcefallCave_Back_Text_LoreleiWellDeepFreezeYou waitmessage waitse playmoncry SPECIES_LAPRAS, 2 waitbuttonpress waitmoncry - applymovement 1, Movement_163EEE + applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat waitmovement 0 textcolor 0 - msgbox gUnknown_817B399 + msgbox FourIsland_IcefallCave_Back_Text_OkayRocketWareHouseFiveIsland closemessage - applymovement 3, Movement_163F1D - applymovement OBJ_EVENT_ID_PLAYER, Movement_163EE2 - applymovement 1, Movement_163EF0 - applymovement 2, Movement_163EFA - applymovement 4, Movement_163F05 + applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit + applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit + applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1Exit + applymovement LOCALID_ROCKET2, FourIsland_IcefallCave_Back_Movement_Rocket2Exit + applymovement LOCALID_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3Exit waitmovement 0 - removeobject 1 - removeobject 2 - removeobject 4 + removeobject LOCALID_ROCKET1 + removeobject LOCALID_ROCKET2 + removeobject LOCALID_ROCKET3 delay 50 - applymovement 3, Movement_163F23 + applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 textcolor 1 - msgbox gUnknown_817B457 + msgbox FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful setflag FLAG_HIDE_RUIN_VALLEY_SCIENTIST clearflag FLAG_HIDE_LORELEI_IN_HER_HOUSE setvar VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1 releaseall end -Movement_163EDD:: @ 8163EDD +FourIsland_IcefallCave_Back_Movement_PlayerToRockets:: @ 8163EDD walk_up walk_up walk_right walk_up step_end -Movement_163EE2:: @ 8163EE2 +FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit:: @ 8163EE2 delay_16 walk_in_place_fastest_left delay_16 @@ -102,21 +107,21 @@ Movement_163EE2:: @ 8163EE2 walk_in_place_fastest_down step_end -Movement_163EE8:: @ 8163EE8 +FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown:: @ 8163EE8 walk_in_place_down step_end -gUnknown_163EEA:: @ 8163EEA +FourIsland_IcefallCave_Back_Movement_UnusedPushRight:: @ 8163EEA lock_facing_direction walk_right unlock_facing_direction step_end -Movement_163EEE:: @ 8163EEE +FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat:: @ 8163EEE walk_in_place_fast_down step_end -Movement_163EF0:: @ 8163EF0 +FourIsland_IcefallCave_Back_Movement_Rocket1Exit:: @ 8163EF0 walk_right walk_down walk_fast_down @@ -128,7 +133,7 @@ Movement_163EF0:: @ 8163EF0 walk_fast_down step_end -Movement_163EFA:: @ 8163EFA +FourIsland_IcefallCave_Back_Movement_Rocket2Exit:: @ 8163EFA delay_16 walk_left walk_down @@ -141,7 +146,7 @@ Movement_163EFA:: @ 8163EFA walk_fast_down step_end -Movement_163F05:: @ 8163F05 +FourIsland_IcefallCave_Back_Movement_Rocket3Exit:: @ 8163F05 delay_16 walk_down delay_16 @@ -155,27 +160,27 @@ Movement_163F05:: @ 8163F05 walk_fast_down step_end -Movement_163F11:: @ 8163F11 +FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei:: @ 8163F11 delay_16 delay_8 walk_in_place_fastest_right step_end -Movement_163F15:: @ 8163F15 +FourIsland_IcefallCave_Back_Movement_UnusedWalkLeft:: @ 8163F15 walk_left walk_left step_end -Movement_163F18:: @ 8163F18 +FourIsland_IcefallCave_Back_Movement_LoreleiToRockets:: @ 8163F18 walk_left walk_up step_end -Movement_163F1B:: @ 8163F1B +FourIsland_IcefallCave_Back_Movement_WalkInPlaceUp:: @ 8163F1B walk_in_place_up step_end -Movement_163F1D:: @ 8163F1D +FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit:: @ 8163F1D delay_8 walk_in_place_fastest_right delay_16 @@ -183,10 +188,10 @@ Movement_163F1D:: @ 8163F1D walk_in_place_fastest_down step_end -Movement_163F23:: @ 8163F23 +FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer:: @ 8163F23 walk_right step_end -FourIsland_IcefallCave_Back_EventScript_163F25:: @ 8163F25 - msgbox gUnknown_817B457, MSGBOX_NPC +FourIsland_IcefallCave_Back_EventScript_Lorelei:: @ 8163F25 + msgbox FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful, MSGBOX_NPC end diff --git a/data/maps/FourIsland_IcefallCave_Back/text.inc b/data/maps/FourIsland_IcefallCave_Back/text.inc index f65e95854..981041777 100644 --- a/data/maps/FourIsland_IcefallCave_Back/text.inc +++ b/data/maps/FourIsland_IcefallCave_Back/text.inc @@ -1,16 +1,16 @@ -gUnknown_817B04F:: @ 817B04F +FourIsland_IcefallCave_Back_Text_LoreleiKeepHandsOffMons:: @ 817B04F .string "LORELEI: Keep your filthy hands\n" .string "off the POKéMON in the cave!\p" .string "Do as I say, or you'll have me to\n" .string "answer to!$" -gUnknown_817B0B9:: @ 817B0B9 +FourIsland_IcefallCave_Back_Text_ShutItLadyLeaveUsBe:: @ 817B0B9 .string "Aww, shut it, lady, and leave\n" .string "us be.\p" .string "Don't let your glasses get all\n" .string "steamed up!$" -gUnknown_817B109:: @ 817B109 +FourIsland_IcefallCave_Back_Text_LoreleiPlayerHelpMeKickPoachersOut:: @ 817B109 .string "LORELEI: {PLAYER}?!\n" .string "What are you doing here?\p" .string "No, we can catch up later.\n" @@ -22,15 +22,15 @@ gUnknown_817B109:: @ 817B109 .string "Are you ready?\n" .string "You take that one, please!$" -gUnknown_817B20B:: @ 817B20B +FourIsland_IcefallCave_Back_Text_GruntIntro:: @ 817B20B .string "W-what?!\p" .string "Who says we can't do what we want\n" .string "with the POKéMON we catch?$" -Text_17B251:: @ 817B251 +FourIsland_IcefallCave_Back_Text_GruntDefeat:: @ 817B251 .string "We didn't plan on this!$" -gUnknown_817B269:: @ 817B269 +FourIsland_IcefallCave_Back_Text_LoreleiWhereHaveYouTakenMons:: @ 817B269 .string "LORELEI: Humph.\n" .string "So despicably weak.\p" .string "You!\n" @@ -40,11 +40,11 @@ gUnknown_817B269:: @ 817B269 .string "I'm smashing your ring once and\n" .string "for all!$" -gUnknown_817B2EF:: @ 817B2EF +FourIsland_IcefallCave_Back_Text_NotTellingYouThat:: @ 817B2EF .string "N-no way!\n" .string "I'm not telling you that!$" -Text_17B313:: @ 817B313 +FourIsland_IcefallCave_Back_Text_LoreleiWellDeepFreezeYou:: @ 817B313 .string "LORELEI: If you won't confess,\n" .string "we'll deep-freeze you.\p" .string "My LAPRAS is furious for what\n" @@ -52,7 +52,7 @@ Text_17B313:: @ 817B313 .string "Go, LAPRAS!\n" .string "ICE BEAM…$" -gUnknown_817B399:: @ 817B399 +FourIsland_IcefallCave_Back_Text_OkayRocketWareHouseFiveIsland:: @ 817B399 .string "Wawaah! Okay!\n" .string "I'll talk!\p" .string "The POKéMON are in the ROCKET\n" @@ -63,7 +63,7 @@ gUnknown_817B399:: @ 817B399 .string "into the ROCKET WAREHOUSE!\p" .string "Heheheheh!$" -gUnknown_817B457:: @ 817B457 +FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful:: @ 817B457 .string "{PLAYER}, thank you.\n" .string "But this is awful…\p" .string "I was born and raised here on\n" diff --git a/data/maps/PalletTown_PlayersHouse_1F/text.inc b/data/maps/PalletTown_PlayersHouse_1F/text.inc index faa31c9d1..ba40d1729 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/text.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/text.inc @@ -1,65 +1,3 @@ -Text_18CF4D:: @ 818CF4D - .string "Training by oneself is certainly\n" - .string "not a bad thing.\p" - .string "But it's also not bad to aim for\n" - .string "the top with a partner.\p" - .string "Even BRUNO…\n" - .string "He trained with a fellow by the\l" - .string "name of BRAWLY before.$" - -Text_18CFFB:: @ 818CFFB - .string "Do you know anything about this\n" - .string "stone chamber?$" - -Text_18D02A:: @ 818D02A - .string "That was uncalled for.\n" - .string "You didn't have to be so rough.$" - -Text_18D061:: @ 818D061 - .string "The TANOBY RUINS date back at\n" - .string "least 1,500 years.\p" - .string "But it's a baffling mystery as to\n" - .string "why it was built in the first place.$" - -Text_18D0D9:: @ 818D0D9 - .string "A mystic POKéMON is said to sleep\n" - .string "inside here.$" - -Text_18D108:: @ 818D108 - .string "I'm not much good in battle.$" - -Text_18D125:: @ 818D125 - .string "I hear there are other ruins like\n" - .string "the one here.\p" - .string "Might they be the resting places\n" - .string "of other mystic POKéMON?$" - -Text_18D18F:: @ 818D18F - .string "CLIFFORD is teaching me how to\n" - .string "paint.$" - -Text_18D1B5:: @ 818D1B5 - .string "We might get in trouble for being\n" - .string "noisy here.$" - -Text_18D1E3:: @ 818D1E3 - .string "I said that I wanted to paint an\n" - .string "old building.\p" - .string "So CLIFFORD brought me here.$" - -Text_18D22F:: @ 818D22F - .string "Today, in addition to our lesson,\n" - .string "we came to see the chamber.$" - -Text_18D26D:: @ 818D26D - .string "My, how extraordinary.$" - -Text_18D284:: @ 818D284 - .string "Ah, so you are studying POKéMON\n" - .string "on your own…\p" - .string "Yes, you certainly are quite the\n" - .string "extraordinary person, indeed.$" - gUnknown_818D2F0:: @ 818D2F0 .string "MOM: …Right.\n" .string "All boys leave home someday.\l" diff --git a/data/maps/SevenIsland_SevaultCanyon/text.inc b/data/maps/SevenIsland_SevaultCanyon/text.inc index 3d728797a..21c87dbc0 100644 --- a/data/maps/SevenIsland_SevaultCanyon/text.inc +++ b/data/maps/SevenIsland_SevaultCanyon/text.inc @@ -120,3 +120,11 @@ gUnknown_818CF2B:: @ 818CF2B .string "SEVAULT CANYON\n" .string "TANOBY RUINS AHEAD$" +Text_18CF4D:: @ 818CF4D + .string "Training by oneself is certainly\n" + .string "not a bad thing.\p" + .string "But it's also not bad to aim for\n" + .string "the top with a partner.\p" + .string "Even BRUNO…\n" + .string "He trained with a fellow by the\l" + .string "name of BRAWLY before.$" diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index b768509fb..6c16bf0c0 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -122,7 +122,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": 99, - "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch1" }, { "type": "trigger", @@ -131,7 +131,7 @@ "elevation": 3, "var": "VAR_TEMP_7", "var_value": 99, - "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch7" }, { "type": "trigger", @@ -140,7 +140,7 @@ "elevation": 3, "var": "VAR_TEMP_6", "var_value": 99, - "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch6" }, { "type": "trigger", @@ -149,7 +149,7 @@ "elevation": 3, "var": "VAR_TEMP_5", "var_value": 99, - "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch5" }, { "type": "trigger", @@ -158,7 +158,7 @@ "elevation": 3, "var": "VAR_TEMP_4", "var_value": 99, - "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch4" }, { "type": "trigger", @@ -167,7 +167,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": 99, - "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch3" }, { "type": "trigger", @@ -176,7 +176,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": 99, - "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch2" } ], "bg_events": [] diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc index 8758f8517..70ef487b8 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc @@ -1,10 +1,12 @@ +.equ NUM_SWITCHES_PRESSED, VAR_TEMP_8 + SevenIsland_SevaultCanyon_TanobyKey_MapScripts:: @ 8164DCC map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_SevaultCanyon_TanobyKey_OnTransition .byte 0 SevenIsland_SevaultCanyon_TanobyKey_OnTransition:: @ 8164DD2 setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY - call_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, EventScript_164E07 + call_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, SevenIsland_SevaultCanyon_TanobyKey_EventScript_MoveBouldersToSolvedPos setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 setvar VAR_TEMP_3, 0 @@ -12,10 +14,10 @@ SevenIsland_SevaultCanyon_TanobyKey_OnTransition:: @ 8164DD2 setvar VAR_TEMP_5, 0 setvar VAR_TEMP_6, 0 setvar VAR_TEMP_7, 0 - setvar VAR_TEMP_8, 0 + setvar NUM_SWITCHES_PRESSED, 0 end -EventScript_164E07:: @ 8164E07 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_MoveBouldersToSolvedPos:: @ 8164E07 setobjectxyperm 1, 7, 2 setobjectxyperm 2, 4, 4 setobjectxyperm 3, 10, 4 @@ -25,85 +27,85 @@ EventScript_164E07:: @ 8164E07 setobjectxyperm 7, 9, 8 return -SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch1:: @ 8164E39 lockall compare VAR_TEMP_1, 100 - goto_if_eq EventScript_164F8A - call EventScript_164F2E + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed + call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed setvar VAR_TEMP_1, 100 - compare VAR_TEMP_8, 7 - goto_if_eq EventScript_164F8C + compare NUM_SWITCHES_PRESSED, 7 + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved releaseall end -SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C +SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch2:: @ 8164E5C lockall compare VAR_TEMP_2, 100 - goto_if_eq EventScript_164F8A - call EventScript_164F2E + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed + call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed setvar VAR_TEMP_2, 100 - compare VAR_TEMP_8, 7 - goto_if_eq EventScript_164F8C + compare NUM_SWITCHES_PRESSED, 7 + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved releaseall end -SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F +SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch3:: @ 8164E7F lockall compare VAR_TEMP_3, 100 - goto_if_eq EventScript_164F8A - call EventScript_164F2E + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed + call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed setvar VAR_TEMP_3, 100 - compare VAR_TEMP_8, 7 - goto_if_eq EventScript_164F8C + compare NUM_SWITCHES_PRESSED, 7 + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved releaseall end -SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch4:: @ 8164EA2 lockall compare VAR_TEMP_4, 100 - goto_if_eq EventScript_164F8A - call EventScript_164F2E + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed + call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed setvar VAR_TEMP_4, 100 - compare VAR_TEMP_8, 7 - goto_if_eq EventScript_164F8C + compare NUM_SWITCHES_PRESSED, 7 + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved releaseall end -SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch5:: @ 8164EC5 lockall compare VAR_TEMP_5, 100 - goto_if_eq EventScript_164F8A - call EventScript_164F2E + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed + call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed setvar VAR_TEMP_5, 100 - compare VAR_TEMP_8, 7 - goto_if_eq EventScript_164F8C + compare NUM_SWITCHES_PRESSED, 7 + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved releaseall end -SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch6:: @ 8164EE8 lockall compare VAR_TEMP_6, 100 - goto_if_eq EventScript_164F8A - call EventScript_164F2E + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed + call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed setvar VAR_TEMP_6, 100 - compare VAR_TEMP_8, 7 - goto_if_eq EventScript_164F8C + compare NUM_SWITCHES_PRESSED, 7 + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved releaseall end -SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B +SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch7:: @ 8164F0B lockall compare VAR_TEMP_7, 100 - goto_if_eq EventScript_164F8A - call EventScript_164F2E + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed + call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed setvar VAR_TEMP_7, 100 - compare VAR_TEMP_8, 7 - goto_if_eq EventScript_164F8C + compare NUM_SWITCHES_PRESSED, 7 + goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved releaseall end -EventScript_164F2E:: @ 8164F2E - addvar VAR_TEMP_8, 1 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed:: @ 8164F2E + addvar NUM_SWITCHES_PRESSED, 1 playse SE_TRACK_MOVE setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 @@ -113,7 +115,7 @@ EventScript_164F2E:: @ 8164F2E delay 60 return -EventScript_164F51:: @ 8164F51 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolvedShakeScreen:: @ 8164F51 setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 10 @@ -130,13 +132,13 @@ EventScript_164F51:: @ 8164F51 waitse return -EventScript_164F8A:: @ 8164F8A +SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed:: @ 8164F8A releaseall end -EventScript_164F8C:: @ 8164F8C - call EventScript_164F51 - msgbox gUnknown_817D31B +SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved:: @ 8164F8C + call SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolvedShakeScreen + msgbox SevenIsland_SevaultCanyon_TanobyKey_Text_MysteriousRumbleFarAway setflag FLAG_SYS_UNLOCKED_TANOBY_RUINS releaseall end diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc index c6f137869..f86669ce4 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc @@ -1,4 +1,4 @@ -gUnknown_817D31B:: @ 817D31B +SevenIsland_SevaultCanyon_TanobyKey_Text_MysteriousRumbleFarAway:: @ 817D31B .string "A mysterious rumble echoed\n" .string "somewhere far away.$" diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json index 42c643af5..3f50db9fe 100644 --- a/data/maps/SevenIsland_TanobyRuins/map.json +++ b/data/maps/SevenIsland_TanobyRuins/map.json @@ -29,7 +29,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SevenIsland_TanobyRuins_EventScript_1ACC4D", + "script": "SevenIsland_TanobyRuins_EventScript_Brandon", "flag": "0" }, { @@ -42,7 +42,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SevenIsland_TanobyRuins_EventScript_1ACC8B", + "script": "SevenIsland_TanobyRuins_EventScript_Benjamin", "flag": "0" }, { @@ -55,7 +55,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SevenIsland_TanobyRuins_EventScript_1ACCC9", + "script": "SevenIsland_TanobyRuins_EventScript_Edna", "flag": "0" }, { @@ -68,7 +68,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SevenIsland_TanobyRuins_EventScript_1ACD07", + "script": "SevenIsland_TanobyRuins_EventScript_Clifford", "flag": "0" } ], diff --git a/data/maps/SevenIsland_TanobyRuins/text.inc b/data/maps/SevenIsland_TanobyRuins/text.inc new file mode 100644 index 000000000..a5453f527 --- /dev/null +++ b/data/maps/SevenIsland_TanobyRuins/text.inc @@ -0,0 +1,52 @@ +SevenIsland_TanobyRuins_Text_BrandonIntro:: @ 818CFFB + .string "Do you know anything about this\n" + .string "stone chamber?$" + +SevenIsland_TanobyRuins_Text_BrandonDefeat:: @ 818D02A + .string "That was uncalled for.\n" + .string "You didn't have to be so rough.$" + +SevenIsland_TanobyRuins_Text_BrandonPostBattle:: @ 818D061 + .string "The TANOBY RUINS date back at\n" + .string "least 1,500 years.\p" + .string "But it's a baffling mystery as to\n" + .string "why it was built in the first place.$" + +SevenIsland_TanobyRuins_Text_BenjaminIntro:: @ 818D0D9 + .string "A mystic POKéMON is said to sleep\n" + .string "inside here.$" + +SevenIsland_TanobyRuins_Text_BenjaminDefeat:: @ 818D108 + .string "I'm not much good in battle.$" + +SevenIsland_TanobyRuins_Text_BenjaminPostBattle:: @ 818D125 + .string "I hear there are other ruins like\n" + .string "the one here.\p" + .string "Might they be the resting places\n" + .string "of other mystic POKéMON?$" + +SevenIsland_TanobyRuins_Text_EdnaIntro:: @ 818D18F + .string "CLIFFORD is teaching me how to\n" + .string "paint.$" + +SevenIsland_TanobyRuins_Text_EdnaDefeat:: @ 818D1B5 + .string "We might get in trouble for being\n" + .string "noisy here.$" + +SevenIsland_TanobyRuins_Text_EdnaPostBattle:: @ 818D1E3 + .string "I said that I wanted to paint an\n" + .string "old building.\p" + .string "So CLIFFORD brought me here.$" + +SevenIsland_TanobyRuins_Text_CliffordIntro:: @ 818D22F + .string "Today, in addition to our lesson,\n" + .string "we came to see the chamber.$" + +SevenIsland_TanobyRuins_Text_CliffordDefeat:: @ 818D26D + .string "My, how extraordinary.$" + +SevenIsland_TanobyRuins_Text_CliffordPostBattle:: @ 818D284 + .string "Ah, so you are studying POKéMON\n" + .string "on your own…\p" + .string "Yes, you certainly are quite the\n" + .string "extraordinary person, indeed.$" diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc index 847ae472a..0646e661d 100644 --- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc @@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_DilfordChamber_MapScripts:: @ 8164CF6 .byte 0 SevenIsland_TanobyRuins_DilfordChamber_OnTransition:: @ 8164CFC - call EventScript_1A925E + call EventScript_TryDarkenRuins end diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc index b982b77dd..8a606a2c3 100644 --- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc @@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_LiptooChamber_MapScripts:: @ 8164CDE .byte 0 SevenIsland_TanobyRuins_LiptooChamber_OnTransition:: @ 8164CE4 - call EventScript_1A925E + call EventScript_TryDarkenRuins end diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc index d467f79ef..819b2bbc1 100644 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc @@ -4,5 +4,5 @@ SevenIsland_TanobyRuins_MoneanChamber_MapScripts:: @ 8164CCF SevenIsland_TanobyRuins_MoneanChamber_OnTransition:: @ 8164CD5 setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER - call EventScript_1A925E + call EventScript_TryDarkenRuins end diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc index 2f3d604c3..e29694d8f 100644 --- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc @@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_RixyChamber_MapScripts:: @ 8164D0E .byte 0 SevenIsland_TanobyRuins_RixyChamber_OnTransition:: @ 8164D14 - call EventScript_1A925E + call EventScript_TryDarkenRuins end diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc index dd1a73f83..4917ecdf8 100644 --- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc @@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_ScufibChamber_MapScripts:: @ 8164D02 .byte 0 SevenIsland_TanobyRuins_ScufibChamber_OnTransition:: @ 8164D08 - call EventScript_1A925E + call EventScript_TryDarkenRuins end diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc index 131a6ecca..f1a13adcb 100644 --- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc @@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_ViapoisChamber_MapScripts:: @ 8164D1A .byte 0 SevenIsland_TanobyRuins_ViapoisChamber_OnTransition:: @ 8164D20 - call EventScript_1A925E + call EventScript_TryDarkenRuins end diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc index ff6c851ee..3a7720b4c 100644 --- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc @@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_WeepthChamber_MapScripts:: @ 8164CEA .byte 0 SevenIsland_TanobyRuins_WeepthChamber_OnTransition:: @ 8164CF0 - call EventScript_1A925E + call EventScript_TryDarkenRuins end diff --git a/data/maps/SixIsland_DottedHole_1F/scripts.inc b/data/maps/SixIsland_DottedHole_1F/scripts.inc index 26217512e..21a47dcd6 100644 --- a/data/maps/SixIsland_DottedHole_1F/scripts.inc +++ b/data/maps/SixIsland_DottedHole_1F/scripts.inc @@ -6,28 +6,28 @@ SixIsland_DottedHole_1F_OnTransition:: @ 8164188 setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_DOTTED_HOLE_1F end -SixIsland_DottedHole_B1F_EventScript_16418C:: @ 816418C +SixIsland_DottedHole_B1F_EventScript_BrailleUp:: @ 816418C lockall braillemessage Braille_Text_Up waitbuttonpress releaseall end -SixIsland_DottedHole_B4F_EventScript_164195:: @ 8164195 +SixIsland_DottedHole_B4F_EventScript_BrailleDown:: @ 8164195 lockall braillemessage Braille_Text_Down waitbuttonpress releaseall end -SixIsland_DottedHole_B3F_EventScript_16419E:: @ 816419E +SixIsland_DottedHole_B3F_EventScript_BrailleRight:: @ 816419E lockall braillemessage Braille_Text_Right waitbuttonpress releaseall end -SixIsland_DottedHole_B2F_EventScript_1641A7:: @ 81641A7 +SixIsland_DottedHole_B2F_EventScript_BrailleLeft:: @ 81641A7 lockall braillemessage Braille_Text_Left waitbuttonpress diff --git a/data/maps/SixIsland_DottedHole_B1F/map.json b/data/maps/SixIsland_DottedHole_B1F/map.json index 449f0da2d..9d264d645 100644 --- a/data/maps/SixIsland_DottedHole_B1F/map.json +++ b/data/maps/SixIsland_DottedHole_B1F/map.json @@ -57,7 +57,7 @@ "x": 6, "y": 5, "elevation": 0, - "script": "SixIsland_DottedHole_B1F_EventScript_16418C" + "script": "SixIsland_DottedHole_B1F_EventScript_BrailleUp" } ] } diff --git a/data/maps/SixIsland_DottedHole_B2F/map.json b/data/maps/SixIsland_DottedHole_B2F/map.json index 79cf28355..0dd58ba70 100644 --- a/data/maps/SixIsland_DottedHole_B2F/map.json +++ b/data/maps/SixIsland_DottedHole_B2F/map.json @@ -57,7 +57,7 @@ "x": 6, "y": 5, "elevation": 0, - "script": "SixIsland_DottedHole_B2F_EventScript_1641A7" + "script": "SixIsland_DottedHole_B2F_EventScript_BrailleLeft" } ] } diff --git a/data/maps/SixIsland_DottedHole_B3F/map.json b/data/maps/SixIsland_DottedHole_B3F/map.json index 6c7af4456..df77a280c 100644 --- a/data/maps/SixIsland_DottedHole_B3F/map.json +++ b/data/maps/SixIsland_DottedHole_B3F/map.json @@ -57,7 +57,7 @@ "x": 6, "y": 5, "elevation": 0, - "script": "SixIsland_DottedHole_B3F_EventScript_16419E" + "script": "SixIsland_DottedHole_B3F_EventScript_BrailleRight" } ] } diff --git a/data/maps/SixIsland_DottedHole_B4F/map.json b/data/maps/SixIsland_DottedHole_B4F/map.json index 2490d48a7..56e07628d 100644 --- a/data/maps/SixIsland_DottedHole_B4F/map.json +++ b/data/maps/SixIsland_DottedHole_B4F/map.json @@ -57,7 +57,7 @@ "x": 6, "y": 5, "elevation": 0, - "script": "SixIsland_DottedHole_B4F_EventScript_164195" + "script": "SixIsland_DottedHole_B4F_EventScript_BrailleDown" } ] } diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json index e3cce0b89..0acc6464e 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_DottedHole_SapphireRoom_EventScript_1641B5", + "script": "SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire", "flag": "FLAG_HIDE_SAPPHIRE" }, { @@ -63,7 +63,7 @@ "x": 7, "y": 2, "elevation": 0, - "script": "SixIsland_DottedHole_SapphireRoom_EventScript_16441F" + "script": "SixIsland_DottedHole_SapphireRoom_EventScript_BrailleMessage" } ] } diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index a73503f7c..67f4c6a2d 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -1,29 +1,32 @@ +.equ LOCALID_SAPPHIRE, 1 +.equ LOCALID_THIEF, 2 + SixIsland_DottedHole_SapphireRoom_MapScripts:: @ 81641B4 .byte 0 -SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 +SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire:: @ 81641B5 lock faceplayer textcolor 3 playfanfare MUS_FAN5 - message Text_17BD82 + message SixIsland_DottedHole_SapphireRoom_Text_FoundSapphire waitmessage waitfanfare closemessage - setobjectxyperm 2, 5, 0 - addobject 2 + setobjectxyperm LOCALID_THIEF, 5, 0 + addobject LOCALID_THIEF playse SE_RU_HYUU - applymovement 2, Movement_16440F + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefFallIn waitmovement 0 playse SE_W070 compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_16430F + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_16430F + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft compare VAR_FACING, DIR_EAST - call_if_eq EventScript_16431A + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown compare VAR_FACING, DIR_WEST - call_if_eq EventScript_16431A + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 setvar VAR_0x8006, 12 @@ -31,163 +34,164 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 special Special_ShakeScreen delay 60 compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_164325 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_164330 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_16433B + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireEast compare VAR_FACING, DIR_WEST - call_if_eq EventScript_164346 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireWest textcolor 0 - msgbox gUnknown_817BD97 + msgbox SixIsland_DottedHole_SapphireRoom_Text_IWasRightInTailingYou closemessage compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_164351 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_164366 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_16437B + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireEast compare VAR_FACING, DIR_WEST - call_if_eq EventScript_164390 - removeobject 1 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireWest + removeobject LOCALID_SAPPHIRE compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_1642F9 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft2 compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_1642F9 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft2 compare VAR_FACING, DIR_EAST - call_if_eq EventScript_164304 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown2 compare VAR_FACING, DIR_WEST - call_if_eq EventScript_164304 - msgbox gUnknown_817BDD4 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown2 + msgbox SixIsland_DottedHole_SapphireRoom_Text_SellToTeamRocketTellPassword closemessage compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_1643A5 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_1643B7 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_1643C9 + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitEast compare VAR_FACING, DIR_WEST - call_if_eq EventScript_1643DB + call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitWest playse SE_KAIDAN delay 35 - removeobject 2 + removeobject LOCALID_THIEF setflag FLAG_LEARNED_YES_NAH_CHANSEY release end -EventScript_1642F9:: @ 81642F9 +@ Lots of redundant scripts below +SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft2:: @ 81642F9 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return -EventScript_164304:: @ 8164304 +SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown2:: @ 8164304 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return -EventScript_16430F:: @ 816430F +SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft:: @ 816430F applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return -EventScript_16431A:: @ 816431A +SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown:: @ 816431A applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return -EventScript_164325:: @ 8164325 - applymovement 2, Movement_1643ED +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireNorth:: @ 8164325 + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft waitmovement 0 return -EventScript_164330:: @ 8164330 - applymovement 2, Movement_1643ED +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireSouth:: @ 8164330 + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft waitmovement 0 return -EventScript_16433B:: @ 816433B - applymovement 2, Movement_1643F1 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireEast:: @ 816433B + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow waitmovement 0 return -EventScript_164346:: @ 8164346 - applymovement 2, Movement_1643F1 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireWest:: @ 8164346 + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow waitmovement 0 return -EventScript_164351:: @ 8164351 - applymovement 2, Movement_1643F5 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireNorth:: @ 8164351 + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return -EventScript_164366:: @ 8164366 - applymovement 2, Movement_1643F5 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireSouth:: @ 8164366 + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return -EventScript_16437B:: @ 816437B - applymovement 2, Movement_1643F7 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireEast:: @ 816437B + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 return -EventScript_164390:: @ 8164390 - applymovement 2, Movement_1643F7 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireWest:: @ 8164390 + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return -EventScript_1643A5:: @ 81643A5 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C - applymovement 2, Movement_1643F9 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitNorth:: @ 81643A5 + applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitNorth waitmovement 0 return -EventScript_1643B7:: @ 81643B7 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C - applymovement 2, Movement_164401 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitSouth:: @ 81643B7 + applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitSouth waitmovement 0 return -EventScript_1643C9:: @ 81643C9 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C - applymovement 2, Movement_164409 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitEast:: @ 81643C9 + applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest waitmovement 0 return -EventScript_1643DB:: @ 81643DB - applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C - applymovement 2, Movement_164409 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitWest:: @ 81643DB + applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit + applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest waitmovement 0 return -Movement_1643ED:: @ 81643ED +SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft:: @ 81643ED walk_up walk_up walk_in_place_fastest_right step_end -Movement_1643F1:: @ 81643F1 +SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow:: @ 81643F1 walk_right walk_right walk_in_place_fastest_up step_end -Movement_1643F5:: @ 81643F5 +SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft:: @ 81643F5 walk_right step_end -Movement_1643F7:: @ 81643F7 +SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow:: @ 81643F7 walk_up step_end -Movement_1643F9:: @ 81643F9 +SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitNorth:: @ 81643F9 walk_fast_up walk_fast_right walk_fast_right @@ -197,7 +201,7 @@ Movement_1643F9:: @ 81643F9 walk_fast_right step_end -Movement_164401:: @ 8164401 +SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitSouth:: @ 8164401 walk_fast_down walk_fast_right walk_fast_right @@ -207,7 +211,7 @@ Movement_164401:: @ 8164401 walk_fast_right step_end -Movement_164409:: @ 8164409 +SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest:: @ 8164409 walk_fast_right walk_fast_right walk_fast_right @@ -215,7 +219,7 @@ Movement_164409:: @ 8164409 walk_fast_up step_end -Movement_16440F:: @ 816440F +SixIsland_DottedHole_SapphireRoom_Movement_ThiefFallIn:: @ 816440F face_down disable_anim slide_down @@ -230,12 +234,12 @@ Movement_16440F:: @ 816440F restore_anim step_end -Movement_16441C:: @ 816441C +SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit:: @ 816441C delay_16 walk_in_place_fastest_right step_end -SixIsland_DottedHole_SapphireRoom_EventScript_16441F:: @ 816441F +SixIsland_DottedHole_SapphireRoom_EventScript_BrailleMessage:: @ 816441F lockall setvar VAR_0x8005, 130 braillemessage_wait Braille_Text_LetTheTwo diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc index 713e8cadf..4fdef4a5d 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc @@ -1,12 +1,12 @@ -Text_17BD82:: @ 817BD82 +SixIsland_DottedHole_SapphireRoom_Text_FoundSapphire:: @ 817BD82 .string "{PLAYER} found a SAPPHIRE!$" -gUnknown_817BD97:: @ 817BD97 +SixIsland_DottedHole_SapphireRoom_Text_IWasRightInTailingYou:: @ 817BD97 .string "Fufu… Fufufufu…\n" .string "I guessed right.\p" .string "I was right in tailing you!$" -gUnknown_817BDD4:: @ 817BDD4 +SixIsland_DottedHole_SapphireRoom_Text_SellToTeamRocketTellPassword:: @ 817BDD4 .string "I knew that there was a SAPPHIRE\n" .string "here, so it belongs to me!\p" .string "I'll sell it to TEAM ROCKET for\n" diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index f6dd0d71c..d3ba4d3c3 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -5,7 +5,7 @@ "music": "MUS_T_MORI", "region_map_section": "MAPSEC_BERRY_FOREST", "requires_flash": false, - "weather": "WEATHER_CLOUDY", + "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_3", "unknown_18": 1, "unknown_19": 7, diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json index 22ddfed8b..84f116348 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/map.json +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_DunsparceTunnel_EventScript_164D60", + "script": "ThreeIsland_DunsparceTunnel_EventScript_Prospector", "flag": "0" } ], diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index 46e8e15f8..7729b3536 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -7,49 +7,49 @@ ThreeIsland_DunsparceTunnel_OnTransition:: @ 8164D2C specialvar VAR_RESULT, IsNationalPokedexEnabled copyvar VAR_0x8008, VAR_RESULT compare VAR_0x8008, TRUE - call_if_eq EventScript_164D50 + call_if_eq ThreeIsland_DunsparceTunnel_EventScript_SetLayoutDugOut compare VAR_0x8008, FALSE - call_if_eq EventScript_164D54 + call_if_eq ThreeIsland_DunsparceTunnel_EventScript_MoveProspectorToWall end -EventScript_164D50:: @ 8164D50 - setmaplayoutindex LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_2 +ThreeIsland_DunsparceTunnel_EventScript_SetLayoutDugOut:: @ 8164D50 + setmaplayoutindex LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_DUG_OUT return -EventScript_164D54:: @ 8164D54 +ThreeIsland_DunsparceTunnel_EventScript_MoveProspectorToWall:: @ 8164D54 setobjectxyperm 1, 6, 3 - setobjectmovementtype 1, 10 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT return -ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60 +ThreeIsland_DunsparceTunnel_EventScript_Prospector:: @ 8164D60 lock faceplayer - goto_if_set FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL, EventScript_164DC2 + goto_if_set FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL, ThreeIsland_DunsparceTunnel_EventScript_ProspectorAlreadyGaveNugget specialvar VAR_RESULT, IsNationalPokedexEnabled compare VAR_RESULT, TRUE - goto_if_eq EventScript_164D90 - msgbox gUnknown_817D13B + goto_if_eq ThreeIsland_DunsparceTunnel_EventScript_ProspectorStruckGold + msgbox ThreeIsland_DunsparceTunnel_Text_ProspectingForGold closemessage applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end -EventScript_164D90:: @ 8164D90 - msgbox gUnknown_817D1C9 +ThreeIsland_DunsparceTunnel_EventScript_ProspectorStruckGold:: @ 8164D90 + msgbox ThreeIsland_DunsparceTunnel_Text_StruckGoldThisIsForYou giveitem ITEM_NUGGET - compare VAR_RESULT, 0 - goto_if_eq EventScript_164DB8 + compare VAR_RESULT, FALSE + goto_if_eq ThreeIsland_DunsparceTunnel_EventScript_NoRoomForNugget setflag FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL - goto EventScript_164DC2 + goto ThreeIsland_DunsparceTunnel_EventScript_ProspectorAlreadyGaveNugget end -EventScript_164DB8:: @ 8164DB8 - msgbox gUnknown_817D2DC +ThreeIsland_DunsparceTunnel_EventScript_NoRoomForNugget:: @ 8164DB8 + msgbox ThreeIsland_DunsparceTunnel_Text_WhoopsBagCrammedFull release end -EventScript_164DC2:: @ 8164DC2 - msgbox gUnknown_817D28C +ThreeIsland_DunsparceTunnel_EventScript_ProspectorAlreadyGaveNugget:: @ 8164DC2 + msgbox ThreeIsland_DunsparceTunnel_Text_ThatsANugget release end diff --git a/data/maps/ThreeIsland_DunsparceTunnel/text.inc b/data/maps/ThreeIsland_DunsparceTunnel/text.inc index e8c5269dd..96a0603c4 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/text.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/text.inc @@ -1,4 +1,4 @@ -gUnknown_817D13B:: @ 817D13B +ThreeIsland_DunsparceTunnel_Text_ProspectingForGold:: @ 817D13B .string "Hey, there!\n" .string "How's it going?\p" .string "What am I doing here, you ask?\n" @@ -6,7 +6,7 @@ gUnknown_817D13B:: @ 817D13B .string "When I strike it rich, I'm buying\n" .string "a house in KANTO.$" -gUnknown_817D1C9:: @ 817D1C9 +ThreeIsland_DunsparceTunnel_Text_StruckGoldThisIsForYou:: @ 817D1C9 .string "Hey, there! How's it going?\n" .string "Did you hear? I've struck gold!\p" .string "You remembered that I was\n" @@ -16,12 +16,12 @@ gUnknown_817D1C9:: @ 817D1C9 .string "So, I'll show you!\n" .string "This is for you!$" -gUnknown_817D28C:: @ 817D28C +ThreeIsland_DunsparceTunnel_Text_ThatsANugget:: @ 817D28C .string "That's a NUGGET!\p" .string "I can't give you any nuggets of\n" .string "wisdom, so that'll have to do!$" -gUnknown_817D2DC:: @ 817D2DC +ThreeIsland_DunsparceTunnel_Text_WhoopsBagCrammedFull:: @ 817D2DC .string "Whoops, your BAG is crammed full!\n" .string "I'll give this to you later.$" diff --git a/data/scripts/trainers.inc b/data/scripts/trainers.inc index d08364a6a..5cbb8b589 100644 --- a/data/scripts/trainers.inc +++ b/data/scripts/trainers.inc @@ -1,7 +1,7 @@ Route3_EventScript_1A93C9:: @ 81A93C9 trainerbattle_single TRAINER_YOUNGSTER_BEN, Text_183560, Text_1835A0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A93F0 msgbox Text_1835B4, MSGBOX_AUTOCLOSE end @@ -14,7 +14,7 @@ EventScript_1A93F0:: @ 81A93F0 Route3_EventScript_1A9407:: @ 81A9407 trainerbattle_single TRAINER_YOUNGSTER_CALVIN, Text_183786, Text_1837BD specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A942E msgbox Text_1837CF, MSGBOX_AUTOCLOSE end @@ -27,7 +27,7 @@ EventScript_1A942E:: @ 81A942E Route3_EventScript_1A9445:: @ 81A9445 trainerbattle_single TRAINER_BUG_CATCHER_COLTON, Text_1834E6, Text_183509 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A946C msgbox Text_18351C, MSGBOX_AUTOCLOSE end @@ -40,7 +40,7 @@ EventScript_1A946C:: @ 81A946C Route3_EventScript_1A9483:: @ 81A9483 trainerbattle_single TRAINER_BUG_CATCHER_GREG, Text_183682, Text_1836B3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A94AA msgbox Text_1836D9, MSGBOX_AUTOCLOSE end @@ -53,7 +53,7 @@ EventScript_1A94AA:: @ 81A94AA Route3_EventScript_1A94C1:: @ 81A94C1 trainerbattle_single TRAINER_BUG_CATCHER_JAMES, Text_183807, Text_183837 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A94E8 msgbox Text_183849, MSGBOX_AUTOCLOSE end @@ -66,7 +66,7 @@ EventScript_1A94E8:: @ 81A94E8 Route3_EventScript_1A94FF:: @ 81A94FF trainerbattle_single TRAINER_LASS_JANICE, Text_183616, Text_18363F specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9526 msgbox Text_18364C, MSGBOX_AUTOCLOSE end @@ -79,7 +79,7 @@ EventScript_1A9526:: @ 81A9526 Route3_EventScript_1A953D:: @ 81A953D trainerbattle_single TRAINER_LASS_SALLY, Text_18371B, Text_183746 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9564 msgbox Text_18374F, MSGBOX_AUTOCLOSE end @@ -92,7 +92,7 @@ EventScript_1A9564:: @ 81A9564 Route3_EventScript_1A957B:: @ 81A957B trainerbattle_single TRAINER_LASS_ROBIN, Text_18387A, Text_183891 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A95A2 msgbox Text_18389C, MSGBOX_AUTOCLOSE end @@ -105,7 +105,7 @@ EventScript_1A95A2:: @ 81A95A2 Route4_EventScript_1A95B9:: @ 81A95B9 trainerbattle_single TRAINER_LASS_CRISSY, Text_183906, Text_183938 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A95E0 msgbox Text_183957, MSGBOX_AUTOCLOSE end @@ -118,7 +118,7 @@ EventScript_1A95E0:: @ 81A95E0 Route24_EventScript_1A95F7:: @ 81A95F7 trainerbattle_single TRAINER_YOUNGSTER_TIMMY, Text_188F76, Text_188F95 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A961E msgbox Text_188FA7, MSGBOX_AUTOCLOSE end @@ -131,7 +131,7 @@ EventScript_1A961E:: @ 81A961E Route24_EventScript_1A9635:: @ 81A9635 trainerbattle_single TRAINER_BUG_CATCHER_CALE, Text_18901B, Text_18908C specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A965C msgbox Text_18909E, MSGBOX_AUTOCLOSE end @@ -144,7 +144,7 @@ EventScript_1A965C:: @ 81A965C Route24_EventScript_1A9673:: @ 81A9673 trainerbattle_single TRAINER_LASS_RELI, Text_188F2C, Text_188F46 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A969A msgbox Text_188F53, MSGBOX_AUTOCLOSE end @@ -157,7 +157,7 @@ EventScript_1A969A:: @ 81A969A Route24_EventScript_1A96B1:: @ 81A96B1 trainerbattle_single TRAINER_LASS_ALI, Text_188FC9, Text_188FE7 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A96D8 msgbox Text_188FF9, MSGBOX_AUTOCLOSE end @@ -170,7 +170,7 @@ EventScript_1A96D8:: @ 81A96D8 Route24_EventScript_1A96EF:: @ 81A96EF trainerbattle_single TRAINER_CAMPER_SHANE, Text_188E74, Text_188E94 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9716 msgbox Text_188EA3, MSGBOX_AUTOCLOSE end @@ -183,7 +183,7 @@ EventScript_1A9716:: @ 81A9716 Route24_EventScript_1A972D:: @ 81A972D trainerbattle_single TRAINER_CAMPER_ETHAN, Text_188ED9, Text_188EFA specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9754 msgbox Text_188F0A, MSGBOX_AUTOCLOSE end @@ -196,7 +196,7 @@ EventScript_1A9754:: @ 81A9754 Route25_EventScript_1A976B:: @ 81A976B trainerbattle_single TRAINER_YOUNGSTER_JOEY, Text_1890C0, Text_1890E6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9792 msgbox Text_1890F5, MSGBOX_AUTOCLOSE end @@ -209,7 +209,7 @@ EventScript_1A9792:: @ 81A9792 Route25_EventScript_1A97A9:: @ 81A97A9 trainerbattle_single TRAINER_YOUNGSTER_DAN, Text_189165, Text_1891A6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A97D0 msgbox Text_1891B3, MSGBOX_AUTOCLOSE end @@ -222,7 +222,7 @@ EventScript_1A97D0:: @ 81A97D0 Route25_EventScript_1A97E7:: @ 81A97E7 trainerbattle_single TRAINER_YOUNGSTER_CHAD, Text_1892A9, Text_1892D9 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A980E msgbox Text_1892EF, MSGBOX_AUTOCLOSE end @@ -235,7 +235,7 @@ EventScript_1A980E:: @ 81A980E Route25_EventScript_1A9825:: @ 81A9825 trainerbattle_single TRAINER_PICNICKER_KELSEY, Text_189247, Text_189261 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A984C msgbox Text_189281, MSGBOX_AUTOCLOSE end @@ -248,7 +248,7 @@ EventScript_1A984C:: @ 81A984C Route25_EventScript_1A9863:: @ 81A9863 trainerbattle_single TRAINER_LASS_HALEY, Text_189333, Text_189364 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A988A msgbox Text_189378, MSGBOX_AUTOCLOSE end @@ -261,7 +261,7 @@ EventScript_1A988A:: @ 81A988A Route25_EventScript_1A98A1:: @ 81A98A1 trainerbattle_single TRAINER_HIKER_FRANKLIN, Text_1893A7, Text_1893EA specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A98C8 msgbox Text_1893FB, MSGBOX_AUTOCLOSE end @@ -274,7 +274,7 @@ EventScript_1A98C8:: @ 81A98C8 Route25_EventScript_1A98DF:: @ 81A98DF trainerbattle_single TRAINER_HIKER_NOB, Text_189423, Text_189459 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9906 msgbox Text_18947E, MSGBOX_AUTOCLOSE end @@ -287,7 +287,7 @@ EventScript_1A9906:: @ 81A9906 Route25_EventScript_1A991D:: @ 81A991D trainerbattle_single TRAINER_HIKER_WAYNE, Text_1894DE, Text_18950A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9944 msgbox Text_18951C, MSGBOX_AUTOCLOSE end @@ -300,7 +300,7 @@ EventScript_1A9944:: @ 81A9944 Route25_EventScript_1A995B:: @ 81A995B trainerbattle_single TRAINER_CAMPER_FLINT, Text_1891EB, Text_189212 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9982 msgbox Text_18921D, MSGBOX_AUTOCLOSE end @@ -313,7 +313,7 @@ EventScript_1A9982:: @ 81A9982 Route6_EventScript_1A9999:: @ 81A9999 trainerbattle_single TRAINER_BUG_CATCHER_KEIGO, Text_183E9F, Text_183EC0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A99C0 msgbox Text_183ED4, MSGBOX_AUTOCLOSE end @@ -326,7 +326,7 @@ EventScript_1A99C0:: @ 81A99C0 Route6_EventScript_1A99D7:: @ 81A99D7 trainerbattle_single TRAINER_BUG_CATCHER_ELIJAH, Text_183FF0, Text_18401A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A99FE msgbox Text_18402B, MSGBOX_AUTOCLOSE end @@ -339,7 +339,7 @@ EventScript_1A99FE:: @ 81A99FE Route6_EventScript_1A9A15:: @ 81A9A15 trainerbattle_single TRAINER_CAMPER_RICKY, Text_183E04, Text_183E2A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9A3C msgbox Text_183E3C, MSGBOX_AUTOCLOSE end @@ -352,7 +352,7 @@ EventScript_1A9A3C:: @ 81A9A3C Route6_EventScript_1A9A53:: @ 81A9A53 trainerbattle_single TRAINER_CAMPER_JEFF, Text_183F07, Text_183F24 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9A7A msgbox Text_183F51, MSGBOX_AUTOCLOSE end @@ -365,7 +365,7 @@ EventScript_1A9A7A:: @ 81A9A7A Route6_EventScript_1A9A91:: @ 81A9A91 trainerbattle_single TRAINER_PICNICKER_NANCY, Text_183E4E, Text_183E79 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9AB8 msgbox Text_183E8D, MSGBOX_AUTOCLOSE end @@ -378,7 +378,7 @@ EventScript_1A9AB8:: @ 81A9AB8 Route6_EventScript_1A9ACF:: @ 81A9ACF trainerbattle_single TRAINER_PICNICKER_ISABELLE, Text_183F90, Text_183FAB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9AF6 msgbox Text_183FC4, MSGBOX_AUTOCLOSE end @@ -391,7 +391,7 @@ EventScript_1A9AF6:: @ 81A9AF6 Route11_EventScript_1A9B0D:: @ 81A9B0D trainerbattle_single TRAINER_YOUNGSTER_EDDIE, Text_184FBD, Text_184FD8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9B34 msgbox Text_184FEF, MSGBOX_AUTOCLOSE end @@ -404,7 +404,7 @@ EventScript_1A9B34:: @ 81A9B34 Route11_EventScript_1A9B4B:: @ 81A9B4B trainerbattle_single TRAINER_YOUNGSTER_DILLON, Text_18506A, Text_18509B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9B72 msgbox Text_1850CF, MSGBOX_AUTOCLOSE end @@ -417,7 +417,7 @@ EventScript_1A9B72:: @ 81A9B72 Route11_EventScript_1A9B89:: @ 81A9B89 trainerbattle_single TRAINER_YOUNGSTER_YASU, Text_18517B, Text_1851AC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9BB0 msgbox Text_1851D2, MSGBOX_AUTOCLOSE end @@ -430,7 +430,7 @@ EventScript_1A9BB0:: @ 81A9BB0 Route11_EventScript_1A9BC7:: @ 81A9BC7 trainerbattle_single TRAINER_YOUNGSTER_DAVE, Text_185285, Text_1852C1 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9BEE msgbox Text_1852E3, MSGBOX_AUTOCLOSE end @@ -443,7 +443,7 @@ EventScript_1A9BEE:: @ 81A9BEE Route11_EventScript_1A9C05:: @ 81A9C05 trainerbattle_single TRAINER_ENGINEER_BRAXTON, Text_185011, Text_185037 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9C2C msgbox Text_18504A, MSGBOX_AUTOCLOSE end @@ -456,7 +456,7 @@ EventScript_1A9C2C:: @ 81A9C2C Route11_EventScript_1A9C43:: @ 81A9C43 trainerbattle_single TRAINER_ENGINEER_BERNIE, Text_185236, Text_185250 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9C6A msgbox Text_185266, MSGBOX_AUTOCLOSE end @@ -469,7 +469,7 @@ EventScript_1A9C6A:: @ 81A9C6A Route11_EventScript_1A9C81:: @ 81A9C81 trainerbattle_single TRAINER_GAMER_HUGO, Text_184F01, Text_184F15 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9CA8 msgbox Text_184F2E, MSGBOX_AUTOCLOSE end @@ -482,7 +482,7 @@ EventScript_1A9CA8:: @ 81A9CA8 Route11_EventScript_1A9CBF:: @ 81A9CBF trainerbattle_single TRAINER_GAMER_JASPER, Text_184F5D, Text_184F7E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9CE6 msgbox Text_184F8E, MSGBOX_AUTOCLOSE end @@ -495,7 +495,7 @@ EventScript_1A9CE6:: @ 81A9CE6 Route11_EventScript_1A9CFD:: @ 81A9CFD trainerbattle_single TRAINER_GAMER_DIRK, Text_1850E9, Text_185105 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9D24 msgbox Text_185114, MSGBOX_AUTOCLOSE end @@ -508,7 +508,7 @@ EventScript_1A9D24:: @ 81A9D24 Route11_EventScript_1A9D3B:: @ 81A9D3B trainerbattle_single TRAINER_GAMER_DARIAN, Text_185135, Text_18514E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9D62 msgbox Text_185161, MSGBOX_AUTOCLOSE end @@ -521,7 +521,7 @@ EventScript_1A9D62:: @ 81A9D62 Route9_EventScript_1A9D79:: @ 81A9D79 trainerbattle_single TRAINER_BUG_CATCHER_BRENT, Text_184A2F, Text_184A6A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9DA0 msgbox Text_184A8C, MSGBOX_AUTOCLOSE end @@ -534,7 +534,7 @@ EventScript_1A9DA0:: @ 81A9DA0 Route9_EventScript_1A9DB7:: @ 81A9DB7 trainerbattle_single TRAINER_BUG_CATCHER_CONNER, Text_184B18, Text_184B32 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9DDE msgbox Text_184B3B, MSGBOX_AUTOCLOSE end @@ -547,7 +547,7 @@ EventScript_1A9DDE:: @ 81A9DDE Route9_EventScript_1A9DF5:: @ 81A9DF5 trainerbattle_single TRAINER_CAMPER_CHRIS, Text_184844, Text_18487E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9E1C msgbox Text_184890, MSGBOX_AUTOCLOSE end @@ -560,7 +560,7 @@ EventScript_1A9E1C:: @ 81A9E1C Route9_EventScript_1A9E33:: @ 81A9E33 trainerbattle_single TRAINER_CAMPER_DREW, Text_18489E, Text_1848CC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9E5A msgbox Text_1848DE, MSGBOX_AUTOCLOSE end @@ -573,7 +573,7 @@ EventScript_1A9E5A:: @ 81A9E5A Route9_EventScript_1A9E71:: @ 81A9E71 trainerbattle_single TRAINER_PICNICKER_ALICIA, Text_1847B7, Text_1847DF specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9E98 msgbox Text_1847F0, MSGBOX_AUTOCLOSE end @@ -586,7 +586,7 @@ EventScript_1A9E98:: @ 81A9E98 Route9_EventScript_1A9EAF:: @ 81A9EAF trainerbattle_single TRAINER_PICNICKER_CAITLIN, Text_1848FF, Text_18491C specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9ED6 msgbox Text_184931, MSGBOX_AUTOCLOSE end @@ -599,7 +599,7 @@ EventScript_1A9ED6:: @ 81A9ED6 Route9_EventScript_1A9EED:: @ 81A9EED trainerbattle_single TRAINER_HIKER_ALAN, Text_184ABE, Text_184AD5 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9F14 msgbox Text_184AF1, MSGBOX_AUTOCLOSE end @@ -612,7 +612,7 @@ EventScript_1A9F14:: @ 81A9F14 Route9_EventScript_1A9F2B:: @ 81A9F2B trainerbattle_single TRAINER_HIKER_BRICE, Text_1849DF, Text_184A04 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9F52 msgbox Text_184A11, MSGBOX_AUTOCLOSE end @@ -625,7 +625,7 @@ EventScript_1A9F52:: @ 81A9F52 Route9_EventScript_1A9F69:: @ 81A9F69 trainerbattle_single TRAINER_HIKER_JEREMY, Text_18495E, Text_18497F specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9F90 msgbox Text_1849B0, MSGBOX_AUTOCLOSE end @@ -638,7 +638,7 @@ EventScript_1A9F90:: @ 81A9F90 Route10_EventScript_1A9FA7:: @ 81A9FA7 trainerbattle_single TRAINER_PICNICKER_HEIDI, Text_184CF1, Text_184D31 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1A9FCE msgbox Text_184D4D, MSGBOX_AUTOCLOSE end @@ -651,7 +651,7 @@ EventScript_1A9FCE:: @ 81A9FCE Route10_EventScript_1A9FE5:: @ 81A9FE5 trainerbattle_single TRAINER_PICNICKER_CAROL, Text_184E04, Text_184E3B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA00C msgbox Text_184E5E, MSGBOX_AUTOCLOSE end @@ -664,7 +664,7 @@ EventScript_1AA00C:: @ 81AA00C Route10_EventScript_1AA023:: @ 81AA023 trainerbattle_single TRAINER_POKEMANIAC_MARK, Text_184B8A, Text_184BE5 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA04A msgbox Text_184BFB, MSGBOX_AUTOCLOSE end @@ -677,7 +677,7 @@ EventScript_1AA04A:: @ 81AA04A Route10_EventScript_1AA061:: @ 81AA061 trainerbattle_single TRAINER_POKEMANIAC_HERMAN, Text_184C86, Text_184CA7 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA088 msgbox Text_184CBB, MSGBOX_AUTOCLOSE end @@ -690,7 +690,7 @@ EventScript_1AA088:: @ 81AA088 Route10_EventScript_1AA09F:: @ 81AA09F trainerbattle_single TRAINER_HIKER_CLARK, Text_184C1D, Text_184C2D specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA0C6 msgbox Text_184C60, MSGBOX_AUTOCLOSE end @@ -703,7 +703,7 @@ EventScript_1AA0C6:: @ 81AA0C6 Route10_EventScript_1AA0DD:: @ 81AA0DD trainerbattle_single TRAINER_HIKER_TRENT, Text_184DAA, Text_184DCE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA104 msgbox Text_184DE4, MSGBOX_AUTOCLOSE end @@ -716,7 +716,7 @@ EventScript_1AA104:: @ 81AA104 Route8_EventScript_1AA11B:: @ 81AA11B trainerbattle_single TRAINER_LASS_PAIGE, Text_1841ED, Text_184210 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA142 msgbox Text_18421B, MSGBOX_AUTOCLOSE end @@ -729,7 +729,7 @@ EventScript_1AA142:: @ 81AA142 Route8_EventScript_1AA159:: @ 81AA159 trainerbattle_single TRAINER_LASS_ANDREA, Text_184321, Text_184346 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA180 msgbox Text_184350, MSGBOX_AUTOCLOSE end @@ -742,7 +742,7 @@ EventScript_1AA180:: @ 81AA180 Route8_EventScript_1AA197:: @ 81AA197 trainerbattle_single TRAINER_LASS_MEGAN, Text_18437A, Text_1843A6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA1BE msgbox Text_1843D2, MSGBOX_AUTOCLOSE end @@ -755,7 +755,7 @@ EventScript_1AA1BE:: @ 81AA1BE Route8_EventScript_1AA1D5:: @ 81AA1D5 trainerbattle_single TRAINER_LASS_JULIA, Text_1844AC, Text_1844D6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA1FC msgbox Text_1844FD, MSGBOX_AUTOCLOSE end @@ -768,7 +768,7 @@ EventScript_1AA1FC:: @ 81AA1FC Route8_EventScript_1AA213:: @ 81AA213 trainerbattle_single TRAINER_SUPER_NERD_AIDAN, Text_1840C5, Text_184100 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA23A msgbox Text_18410E, MSGBOX_AUTOCLOSE end @@ -781,7 +781,7 @@ EventScript_1AA23A:: @ 81AA23A Route8_EventScript_1AA251:: @ 81AA251 trainerbattle_single TRAINER_SUPER_NERD_GLENN, Text_18417C, Text_1841B6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA278 msgbox Text_1841C8, MSGBOX_AUTOCLOSE end @@ -794,7 +794,7 @@ EventScript_1AA278:: @ 81AA278 Route8_EventScript_1AA28F:: @ 81AA28F trainerbattle_single TRAINER_SUPER_NERD_LESLIE, Text_184257, Text_18427A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA2B6 msgbox Text_1842B3, MSGBOX_AUTOCLOSE end @@ -807,7 +807,7 @@ EventScript_1AA2B6:: @ 81AA2B6 Route8_EventScript_1AA2CD:: @ 81AA2CD trainerbattle_single TRAINER_GAMER_STAN, Text_18412F, Text_18414D specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA2F4 msgbox Text_184162, MSGBOX_AUTOCLOSE end @@ -820,7 +820,7 @@ EventScript_1AA2F4:: @ 81AA2F4 Route8_EventScript_1AA30B:: @ 81AA30B trainerbattle_single TRAINER_GAMER_RICH, Text_184432, Text_18444F specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA332 msgbox Text_184466, MSGBOX_AUTOCLOSE end @@ -833,7 +833,7 @@ EventScript_1AA332:: @ 81AA332 Route8_EventScript_1AA349:: @ 81AA349 trainerbattle_double TRAINER_TWINS_ELI_ANNE, Text_1845A4, Text_1845D0, Text_184616 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA374 msgbox Text_1845F2, MSGBOX_AUTOCLOSE end @@ -846,7 +846,7 @@ EventScript_1AA374:: @ 81AA374 Route8_EventScript_1AA38F:: @ 81AA38F trainerbattle_double TRAINER_TWINS_ELI_ANNE, Text_18464A, Text_184675, Text_1846AF specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA3BA msgbox Text_18468B, MSGBOX_AUTOCLOSE end @@ -859,7 +859,7 @@ EventScript_1AA3BA:: @ 81AA3BA Route8_EventScript_1AA3D5:: @ 81AA3D5 trainerbattle_single TRAINER_BIKER_RICARDO, Text_1846E2, Text_1846FC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA3FC msgbox Text_184719, MSGBOX_AUTOCLOSE end @@ -872,7 +872,7 @@ EventScript_1AA3FC:: @ 81AA3FC Route8_EventScript_1AA413:: @ 81AA413 trainerbattle_single TRAINER_BIKER_JAREN, Text_184742, Text_184767 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA43A msgbox Text_18477A, MSGBOX_AUTOCLOSE end @@ -885,7 +885,7 @@ EventScript_1AA43A:: @ 81AA43A Route12_EventScript_1AA451:: @ 81AA451 trainerbattle_single TRAINER_FISHERMAN_NED, Text_185402, Text_18541B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA478 msgbox Text_185432, MSGBOX_AUTOCLOSE end @@ -898,7 +898,7 @@ EventScript_1AA478:: @ 81AA478 Route12_EventScript_1AA48F:: @ 81AA48F trainerbattle_single TRAINER_FISHERMAN_CHIP, Text_18544E, Text_185475 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA4B6 msgbox Text_185488, MSGBOX_AUTOCLOSE end @@ -911,7 +911,7 @@ EventScript_1AA4B6:: @ 81AA4B6 Route12_EventScript_1AA4CD:: @ 81AA4CD trainerbattle_single TRAINER_FISHERMAN_HANK, Text_1855E1, Text_185606 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA4F4 msgbox Text_185616, MSGBOX_AUTOCLOSE end @@ -924,7 +924,7 @@ EventScript_1AA4F4:: @ 81AA4F4 Route12_EventScript_1AA50B:: @ 81AA50B trainerbattle_single TRAINER_FISHERMAN_ELLIOT, Text_185682, Text_1856D0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA532 msgbox Text_1856DF, MSGBOX_AUTOCLOSE end @@ -937,7 +937,7 @@ EventScript_1AA532:: @ 81AA532 Route12_EventScript_1AA549:: @ 81AA549 trainerbattle_single TRAINER_FISHERMAN_ANDREW, Text_18570E, Text_185744 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA570 msgbox Text_18574D, MSGBOX_AUTOCLOSE end @@ -950,7 +950,7 @@ EventScript_1AA570:: @ 81AA570 Route12_EventScript_1AA587:: @ 81AA587 trainerbattle_single TRAINER_ROCKER_LUCA, Text_185547, Text_18559B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA5AE msgbox Text_1855A6, MSGBOX_AUTOCLOSE end @@ -963,7 +963,7 @@ EventScript_1AA5AE:: @ 81AA5AE Route12_EventScript_1AA5C5:: @ 81AA5C5 trainerbattle_single TRAINER_CAMPER_JUSTIN, Text_1854B9, Text_1854ED specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA5EC msgbox Text_1854F2, MSGBOX_AUTOCLOSE end @@ -976,7 +976,7 @@ EventScript_1AA5EC:: @ 81AA5EC Route12_EventScript_1AA603:: @ 81AA603 trainerbattle_double TRAINER_YOUNG_COUPLE_GIA_JES, Text_1857C5, Text_1857F1, Text_185842 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA62E msgbox Text_18581F, MSGBOX_AUTOCLOSE end @@ -989,7 +989,7 @@ EventScript_1AA62E:: @ 81AA62E Route12_EventScript_1AA649:: @ 81AA649 trainerbattle_double TRAINER_YOUNG_COUPLE_GIA_JES, Text_1858A6, Text_1858D0, Text_185908 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA674 msgbox Text_1858E2, MSGBOX_AUTOCLOSE end @@ -1002,7 +1002,7 @@ EventScript_1AA674:: @ 81AA674 Route13_EventScript_1AA68F:: @ 81AA68F trainerbattle_single TRAINER_BIKER_JARED, Text_185D05, Text_185D1D specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA6B6 msgbox Text_185D33, MSGBOX_AUTOCLOSE end @@ -1015,7 +1015,7 @@ EventScript_1AA6B6:: @ 81AA6B6 Route13_EventScript_1AA6CD:: @ 81AA6CD trainerbattle_single TRAINER_BEAUTY_LOLA, Text_185BFC, Text_185C1F specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA6F4 msgbox Text_185C35, MSGBOX_AUTOCLOSE end @@ -1028,7 +1028,7 @@ EventScript_1AA6F4:: @ 81AA6F4 Route13_EventScript_1AA70B:: @ 81AA70B trainerbattle_single TRAINER_BEAUTY_SHEILA, Text_185C69, Text_185C95 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA732 msgbox Text_185CA8, MSGBOX_AUTOCLOSE end @@ -1041,7 +1041,7 @@ EventScript_1AA732:: @ 81AA732 Route13_EventScript_1AA749:: @ 81AA749 trainerbattle_single TRAINER_BIRD_KEEPER_SEBASTIAN, Text_185955, Text_18597E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA770 msgbox Text_1859A2, MSGBOX_AUTOCLOSE end @@ -1054,7 +1054,7 @@ EventScript_1AA770:: @ 81AA770 Route13_EventScript_1AA787:: @ 81AA787 trainerbattle_single TRAINER_BIRD_KEEPER_PERRY, Text_185B8F, Text_185BCA specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA7AE msgbox Text_185BDB, MSGBOX_AUTOCLOSE end @@ -1067,7 +1067,7 @@ EventScript_1AA7AE:: @ 81AA7AE Route13_EventScript_1AA7C5:: @ 81AA7C5 trainerbattle_single TRAINER_BIRD_KEEPER_ROBERT, Text_185D3D, Text_185D7B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA7EC msgbox Text_185D89, MSGBOX_AUTOCLOSE end @@ -1080,7 +1080,7 @@ EventScript_1AA7EC:: @ 81AA7EC Route13_EventScript_1AA803:: @ 81AA803 trainerbattle_single TRAINER_PICNICKER_ALMA, Text_185B12, Text_185B48 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA82A msgbox Text_185B67, MSGBOX_AUTOCLOSE end @@ -1093,7 +1093,7 @@ EventScript_1AA82A:: @ 81AA82A Route13_EventScript_1AA841:: @ 81AA841 trainerbattle_single TRAINER_PICNICKER_SUSIE, Text_1859CF, Text_1859EC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA868 msgbox Text_1859F9, MSGBOX_AUTOCLOSE end @@ -1106,7 +1106,7 @@ EventScript_1AA868:: @ 81AA868 Route13_EventScript_1AA87F:: @ 81AA87F trainerbattle_single TRAINER_PICNICKER_VALERIE, Text_185A37, Text_185A56 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA8A6 msgbox Text_185A62, MSGBOX_AUTOCLOSE end @@ -1119,7 +1119,7 @@ EventScript_1AA8A6:: @ 81AA8A6 Route13_EventScript_1AA8BD:: @ 81AA8BD trainerbattle_single TRAINER_PICNICKER_GWEN, Text_185A91, Text_185AC1 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA8E4 msgbox Text_185ADE, MSGBOX_AUTOCLOSE end @@ -1132,7 +1132,7 @@ EventScript_1AA8E4:: @ 81AA8E4 Route14_EventScript_1AA8FB:: @ 81AA8FB trainerbattle_single TRAINER_BIKER_MALIK, Text_186344, Text_186362 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA922 msgbox Text_18636E, MSGBOX_AUTOCLOSE end @@ -1145,7 +1145,7 @@ EventScript_1AA922:: @ 81AA922 Route14_EventScript_1AA939:: @ 81AA939 trainerbattle_single TRAINER_BIKER_LUKAS, Text_1861F7, Text_186223 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA960 msgbox Text_186239, MSGBOX_AUTOCLOSE end @@ -1158,7 +1158,7 @@ EventScript_1AA960:: @ 81AA960 Route14_EventScript_1AA977:: @ 81AA977 trainerbattle_single TRAINER_BIKER_ISAAC, Text_186263, Text_186291 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA99E msgbox Text_18629D, MSGBOX_AUTOCLOSE end @@ -1171,7 +1171,7 @@ EventScript_1AA99E:: @ 81AA99E Route14_EventScript_1AA9B5:: @ 81AA9B5 trainerbattle_single TRAINER_BIKER_GERALD, Text_1862BD, Text_1862EF specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AA9DC msgbox Text_1862F8, MSGBOX_AUTOCLOSE end @@ -1184,7 +1184,7 @@ EventScript_1AA9DC:: @ 81AA9DC Route14_EventScript_1AA9F3:: @ 81AA9F3 trainerbattle_single TRAINER_BIRD_KEEPER_DONALD, Text_1860D9, Text_18610A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAA1A msgbox Text_18611D, MSGBOX_AUTOCLOSE end @@ -1197,7 +1197,7 @@ EventScript_1AAA1A:: @ 81AAA1A Route14_EventScript_1AAA31:: @ 81AAA31 trainerbattle_single TRAINER_BIRD_KEEPER_BENNY, Text_18618E, Text_1861B3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAA58 msgbox Text_1861BE, MSGBOX_AUTOCLOSE end @@ -1210,7 +1210,7 @@ EventScript_1AAA58:: @ 81AAA58 Route14_EventScript_1AAA6F:: @ 81AAA6F trainerbattle_single TRAINER_BIRD_KEEPER_CARTER, Text_185E4D, Text_185E81 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAA96 msgbox Text_185E9C, MSGBOX_AUTOCLOSE end @@ -1223,7 +1223,7 @@ EventScript_1AAA96:: @ 81AAA96 Route14_EventScript_1AAAAD:: @ 81AAAAD trainerbattle_single TRAINER_BIRD_KEEPER_MITCH, Text_185EDF, Text_185F0B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAAD4 msgbox Text_185F1A, MSGBOX_AUTOCLOSE end @@ -1236,7 +1236,7 @@ EventScript_1AAAD4:: @ 81AAAD4 Route14_EventScript_1AAAEB:: @ 81AAAEB trainerbattle_single TRAINER_BIRD_KEEPER_BECK, Text_185F46, Text_185FAE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAB12 msgbox Text_185FBB, MSGBOX_AUTOCLOSE end @@ -1249,7 +1249,7 @@ EventScript_1AAB12:: @ 81AAB12 Route14_EventScript_1AAB29:: @ 81AAB29 trainerbattle_single TRAINER_BIRD_KEEPER_MARLON, Text_186021, Text_18607C specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAB50 msgbox Text_186091, MSGBOX_AUTOCLOSE end @@ -1262,7 +1262,7 @@ EventScript_1AAB50:: @ 81AAB50 Route14_EventScript_1AAB67:: @ 81AAB67 trainerbattle_double TRAINER_TWINS_KIRI_JAN, Text_1863B7, Text_1863EA, Text_18642E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAB92 msgbox Text_18640D, MSGBOX_AUTOCLOSE end @@ -1275,7 +1275,7 @@ EventScript_1AAB92:: @ 81AAB92 Route14_EventScript_1AABAD:: @ 81AABAD trainerbattle_double TRAINER_TWINS_KIRI_JAN, Text_18645B, Text_186487, Text_1864D3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AABD8 msgbox Text_18649C, MSGBOX_AUTOCLOSE end @@ -1288,7 +1288,7 @@ EventScript_1AABD8:: @ 81AABD8 Route15_EventScript_1AABF3:: @ 81AABF3 trainerbattle_single TRAINER_BIKER_ERNEST, Text_1868B6, Text_1868E8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAC1A msgbox Text_1868F1, MSGBOX_AUTOCLOSE end @@ -1301,7 +1301,7 @@ EventScript_1AAC1A:: @ 81AAC1A Route15_EventScript_1AAC31:: @ 81AAC31 trainerbattle_single TRAINER_BIKER_ALEX, Text_186936, Text_186968 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAC58 msgbox Text_18697C, MSGBOX_AUTOCLOSE end @@ -1314,7 +1314,7 @@ EventScript_1AAC58:: @ 81AAC58 Route15_EventScript_1AAC6F:: @ 81AAC6F trainerbattle_single TRAINER_BEAUTY_GRACE, Text_18678B, Text_1867C1 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAC96 msgbox Text_1867DA, MSGBOX_AUTOCLOSE end @@ -1327,7 +1327,7 @@ EventScript_1AAC96:: @ 81AAC96 Route15_EventScript_1AACAD:: @ 81AACAD trainerbattle_single TRAINER_BEAUTY_OLIVIA, Text_18680C, Text_186841 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AACD4 msgbox Text_18686F, MSGBOX_AUTOCLOSE end @@ -1340,7 +1340,7 @@ EventScript_1AACD4:: @ 81AACD4 Route15_EventScript_1AACEB:: @ 81AACEB trainerbattle_single TRAINER_BIRD_KEEPER_EDWIN, Text_18664F, Text_18667A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAD12 msgbox Text_18668D, MSGBOX_AUTOCLOSE end @@ -1353,7 +1353,7 @@ EventScript_1AAD12:: @ 81AAD12 Route15_EventScript_1AAD29:: @ 81AAD29 trainerbattle_single TRAINER_BIRD_KEEPER_CHESTER, Text_1866D1, Text_186707 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAD50 msgbox Text_18671A, MSGBOX_AUTOCLOSE end @@ -1366,7 +1366,7 @@ EventScript_1AAD50:: @ 81AAD50 Route15_EventScript_1AAD67:: @ 81AAD67 trainerbattle_single TRAINER_PICNICKER_YAZMIN, Text_186A22, Text_186A40 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAD8E msgbox Text_186A55, MSGBOX_AUTOCLOSE end @@ -1379,7 +1379,7 @@ EventScript_1AAD8E:: @ 81AAD8E Route15_EventScript_1AADA5:: @ 81AADA5 trainerbattle_single TRAINER_PICNICKER_KINDRA, Text_18650B, Text_186549 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AADCC msgbox Text_18655A, MSGBOX_AUTOCLOSE end @@ -1392,7 +1392,7 @@ EventScript_1AADCC:: @ 81AADCC Route15_EventScript_1AADE3:: @ 81AADE3 trainerbattle_single TRAINER_PICNICKER_BECKY, Text_1865D3, Text_186612 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAE0A msgbox Text_18661D, MSGBOX_AUTOCLOSE end @@ -1405,7 +1405,7 @@ EventScript_1AAE0A:: @ 81AAE0A Route15_EventScript_1AAE21:: @ 81AAE21 trainerbattle_single TRAINER_PICNICKER_CELIA, Text_1869BA, Text_1869E6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAE48 msgbox Text_1869F4, MSGBOX_AUTOCLOSE end @@ -1418,7 +1418,7 @@ EventScript_1AAE48:: @ 81AAE48 Route15_EventScript_1AAE5F:: @ 81AAE5F trainerbattle_double TRAINER_CRUSH_KIN_RON_MYA, Text_186A95, Text_186ACB, Text_186B46 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAE8A msgbox Text_186B0A, MSGBOX_AUTOCLOSE end @@ -1431,7 +1431,7 @@ EventScript_1AAE8A:: @ 81AAE8A Route15_EventScript_1AAEA5:: @ 81AAEA5 trainerbattle_double TRAINER_CRUSH_KIN_RON_MYA, Text_186B89, Text_186BB1, Text_186BFE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAED0 msgbox Text_186BD2, MSGBOX_AUTOCLOSE end @@ -1444,7 +1444,7 @@ EventScript_1AAED0:: @ 81AAED0 Route16_EventScript_1AAEEB:: @ 81AAEEB trainerbattle_single TRAINER_BIKER_LAO, Text_186C4D, Text_186C5F specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAF12 msgbox Text_186C75, MSGBOX_AUTOCLOSE end @@ -1457,7 +1457,7 @@ EventScript_1AAF12:: @ 81AAF12 Route16_EventScript_1AAF29:: @ 81AAF29 trainerbattle_single TRAINER_BIKER_HIDEO, Text_186D39, Text_186D52 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAF50 msgbox Text_186D5A, MSGBOX_AUTOCLOSE end @@ -1470,7 +1470,7 @@ EventScript_1AAF50:: @ 81AAF50 Route16_EventScript_1AAF67:: @ 81AAF67 trainerbattle_single TRAINER_BIKER_RUBEN, Text_186E86, Text_186EB4 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAF8E msgbox Text_186EC7, MSGBOX_AUTOCLOSE end @@ -1483,7 +1483,7 @@ EventScript_1AAF8E:: @ 81AAF8E Route16_EventScript_1AAFA5:: @ 81AAFA5 trainerbattle_single TRAINER_CUE_BALL_KOJI, Text_186CA2, Text_186CBB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AAFCC msgbox Text_186CC5, MSGBOX_AUTOCLOSE end @@ -1496,7 +1496,7 @@ EventScript_1AAFCC:: @ 81AAFCC Route16_EventScript_1AAFE3:: @ 81AAFE3 trainerbattle_single TRAINER_CUE_BALL_LUKE, Text_186CE5, Text_186D06 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB00A msgbox Text_186D16, MSGBOX_AUTOCLOSE end @@ -1509,7 +1509,7 @@ EventScript_1AB00A:: @ 81AB00A Route16_EventScript_1AB021:: @ 81AB021 trainerbattle_single TRAINER_CUE_BALL_CAMRON, Text_186DD9, Text_186E0D specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB048 msgbox Text_186E1C, MSGBOX_AUTOCLOSE end @@ -1522,7 +1522,7 @@ EventScript_1AB048:: @ 81AB048 Route16_EventScript_1AB05F:: @ 81AB05F trainerbattle_double TRAINER_YOUNG_COUPLE_LEA_JED, Text_186FBD, Text_186FFA, Text_187057 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB08A msgbox Text_187027, MSGBOX_AUTOCLOSE end @@ -1535,7 +1535,7 @@ EventScript_1AB08A:: @ 81AB08A Route16_EventScript_1AB0A5:: @ 81AB0A5 trainerbattle_double TRAINER_YOUNG_COUPLE_LEA_JED, Text_187097, Text_1870CC, Text_187120 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB0D0 msgbox Text_1870F9, MSGBOX_AUTOCLOSE end @@ -1548,7 +1548,7 @@ EventScript_1AB0D0:: @ 81AB0D0 Route17_EventScript_1AB0EB:: @ 81AB0EB trainerbattle_single TRAINER_BIKER_BILLY, Text_1872BD, Text_1872E3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB112 msgbox Text_1872EB, MSGBOX_AUTOCLOSE end @@ -1561,7 +1561,7 @@ EventScript_1AB112:: @ 81AB112 Route17_EventScript_1AB129:: @ 81AB129 trainerbattle_single TRAINER_BIKER_NIKOLAS, Text_18730A, Text_187325 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB150 msgbox Text_187333, MSGBOX_AUTOCLOSE end @@ -1574,7 +1574,7 @@ EventScript_1AB150:: @ 81AB150 Route17_EventScript_1AB167:: @ 81AB167 trainerbattle_single TRAINER_BIKER_JAXON, Text_187456, Text_187472 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB18E msgbox Text_187479, MSGBOX_AUTOCLOSE end @@ -1587,7 +1587,7 @@ EventScript_1AB18E:: @ 81AB18E Route17_EventScript_1AB1A5:: @ 81AB1A5 trainerbattle_single TRAINER_BIKER_WILLIAM, Text_18749B, Text_1874B6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB1CC msgbox Text_1874C9, MSGBOX_AUTOCLOSE end @@ -1600,7 +1600,7 @@ EventScript_1AB1CC:: @ 81AB1CC Route17_EventScript_1AB1E3:: @ 81AB1E3 trainerbattle_single TRAINER_CUE_BALL_RAUL, Text_18717E, Text_1871AE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB20A msgbox Text_1871BA, MSGBOX_AUTOCLOSE end @@ -1613,7 +1613,7 @@ EventScript_1AB20A:: @ 81AB20A Route17_EventScript_1AB221:: @ 81AB221 trainerbattle_single TRAINER_CUE_BALL_ISAIAH, Text_187228, Text_187254 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB248 msgbox Text_18725A, MSGBOX_AUTOCLOSE end @@ -1626,7 +1626,7 @@ EventScript_1AB248:: @ 81AB248 Route17_EventScript_1AB25F:: @ 81AB25F trainerbattle_single TRAINER_CUE_BALL_ZEEK, Text_187362, Text_187395 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB286 msgbox Text_18739F, MSGBOX_AUTOCLOSE end @@ -1639,7 +1639,7 @@ EventScript_1AB286:: @ 81AB286 Route17_EventScript_1AB29D:: @ 81AB29D trainerbattle_single TRAINER_CUE_BALL_JAMAL, Text_1873D1, Text_1873EB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB2C4 msgbox Text_1873FF, MSGBOX_AUTOCLOSE end @@ -1652,7 +1652,7 @@ EventScript_1AB2C4:: @ 81AB2C4 Route17_EventScript_1AB2DB:: @ 81AB2DB trainerbattle_single TRAINER_CUE_BALL_COREY, Text_18741D, Text_187429 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB302 msgbox Text_187432, MSGBOX_AUTOCLOSE end @@ -1665,7 +1665,7 @@ EventScript_1AB302:: @ 81AB302 Route17_EventScript_1AB319:: @ 81AB319 trainerbattle_single TRAINER_BIKER_VIRGIL, Text_18727D, Text_187295 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB340 msgbox Text_1872A5, MSGBOX_AUTOCLOSE end @@ -1678,7 +1678,7 @@ EventScript_1AB340:: @ 81AB340 Route18_EventScript_1AB357:: @ 81AB357 trainerbattle_single TRAINER_BIRD_KEEPER_WILTON, Text_187640, Text_187672 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB37E msgbox Text_187677, MSGBOX_AUTOCLOSE end @@ -1691,7 +1691,7 @@ EventScript_1AB37E:: @ 81AB37E Route18_EventScript_1AB395:: @ 81AB395 trainerbattle_single TRAINER_BIRD_KEEPER_RAMIRO, Text_18768C, Text_1876B3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB3BC msgbox Text_1876C5, MSGBOX_AUTOCLOSE end @@ -1704,7 +1704,7 @@ EventScript_1AB3BC:: @ 81AB3BC Route18_EventScript_1AB3D3:: @ 81AB3D3 trainerbattle_single TRAINER_BIRD_KEEPER_JACOB, Text_187704, Text_187726 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB3FA msgbox Text_18772C, MSGBOX_AUTOCLOSE end @@ -1717,7 +1717,7 @@ EventScript_1AB3FA:: @ 81AB3FA Route19_EventScript_1AB411:: @ 81AB411 trainerbattle_single TRAINER_SWIMMER_MALE_RICHARD, Text_1877A3, Text_1877DF specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB438 msgbox Text_1877EE, MSGBOX_AUTOCLOSE end @@ -1730,7 +1730,7 @@ EventScript_1AB438:: @ 81AB438 Route19_EventScript_1AB44F:: @ 81AB44F trainerbattle_single TRAINER_SWIMMER_MALE_REECE, Text_187811, Text_18783E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB476 msgbox Text_187852, MSGBOX_AUTOCLOSE end @@ -1743,7 +1743,7 @@ EventScript_1AB476:: @ 81AB476 Route19_EventScript_1AB48D:: @ 81AB48D trainerbattle_single TRAINER_SWIMMER_MALE_MATTHEW, Text_187884, Text_1878A5 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB4B4 msgbox Text_1878B1, MSGBOX_AUTOCLOSE end @@ -1756,7 +1756,7 @@ EventScript_1AB4B4:: @ 81AB4B4 Route19_EventScript_1AB4CB:: @ 81AB4CB trainerbattle_single TRAINER_SWIMMER_MALE_DOUGLAS, Text_1878DD, Text_1878F8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB4F2 msgbox Text_1878FE, MSGBOX_AUTOCLOSE end @@ -1769,7 +1769,7 @@ EventScript_1AB4F2:: @ 81AB4F2 Route19_EventScript_1AB509:: @ 81AB509 trainerbattle_single TRAINER_SWIMMER_MALE_DAVID, Text_187925, Text_187955 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB530 msgbox Text_18795B, MSGBOX_AUTOCLOSE end @@ -1782,7 +1782,7 @@ EventScript_1AB530:: @ 81AB530 Route19_EventScript_1AB547:: @ 81AB547 trainerbattle_single TRAINER_SWIMMER_MALE_TONY, Text_187985, Text_1879C3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB56E msgbox Text_1879D3, MSGBOX_AUTOCLOSE end @@ -1795,7 +1795,7 @@ EventScript_1AB56E:: @ 81AB56E Route19_EventScript_1AB585:: @ 81AB585 trainerbattle_single TRAINER_SWIMMER_MALE_AXLE, Text_187AFA, Text_187B25 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB5AC msgbox Text_187B35, MSGBOX_AUTOCLOSE end @@ -1808,7 +1808,7 @@ EventScript_1AB5AC:: @ 81AB5AC Route19_EventScript_1AB5C3:: @ 81AB5C3 trainerbattle_single TRAINER_SWIMMER_FEMALE_ANYA, Text_187A11, Text_187A44 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB5EA msgbox Text_187A50, MSGBOX_AUTOCLOSE end @@ -1821,7 +1821,7 @@ EventScript_1AB5EA:: @ 81AB5EA Route19_EventScript_1AB601:: @ 81AB601 trainerbattle_single TRAINER_SWIMMER_FEMALE_ALICE, Text_187A9E, Text_187AC1 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB628 msgbox Text_187ACA, MSGBOX_AUTOCLOSE end @@ -1834,7 +1834,7 @@ EventScript_1AB628:: @ 81AB628 Route19_EventScript_1AB63F:: @ 81AB63F trainerbattle_single TRAINER_SWIMMER_FEMALE_CONNIE, Text_187B5D, Text_187B85 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB666 msgbox Text_187B94, MSGBOX_AUTOCLOSE end @@ -1847,7 +1847,7 @@ EventScript_1AB666:: @ 81AB666 Route19_EventScript_1AB67D:: @ 81AB67D trainerbattle_double TRAINER_SIS_AND_BRO_LIA_LUC, Text_187C32, Text_187C6F, Text_187CF2 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB6A8 msgbox Text_187C9E, MSGBOX_AUTOCLOSE end @@ -1860,7 +1860,7 @@ EventScript_1AB6A8:: @ 81AB6A8 Route19_EventScript_1AB6C3:: @ 81AB6C3 trainerbattle_double TRAINER_SIS_AND_BRO_LIA_LUC, Text_187D45, Text_187D7E, Text_187DE8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB6EE msgbox Text_187DAD, MSGBOX_AUTOCLOSE end @@ -1873,7 +1873,7 @@ EventScript_1AB6EE:: @ 81AB6EE Route20_EventScript_1AB709:: @ 81AB709 trainerbattle_single TRAINER_SWIMMER_MALE_BARRY, Text_187E40, Text_187E7B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB730 msgbox Text_187E83, MSGBOX_AUTOCLOSE end @@ -1886,7 +1886,7 @@ EventScript_1AB730:: @ 81AB730 Route20_EventScript_1AB747:: @ 81AB747 trainerbattle_single TRAINER_SWIMMER_MALE_DEAN, Text_187FDB, Text_187FF7 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB76E msgbox Text_187FFE, MSGBOX_AUTOCLOSE end @@ -1899,7 +1899,7 @@ EventScript_1AB76E:: @ 81AB76E Route20_EventScript_1AB785:: @ 81AB785 trainerbattle_single TRAINER_SWIMMER_MALE_DARRIN, Text_18802E, Text_18805C specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB7AC msgbox Text_18806D, MSGBOX_AUTOCLOSE end @@ -1912,7 +1912,7 @@ EventScript_1AB7AC:: @ 81AB7AC Route20_EventScript_1AB7C3:: @ 81AB7C3 trainerbattle_single TRAINER_SWIMMER_FEMALE_TIFFANY, Text_187F24, Text_187F5A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB7EA msgbox Text_187F61, MSGBOX_AUTOCLOSE end @@ -1925,7 +1925,7 @@ EventScript_1AB7EA:: @ 81AB7EA Route20_EventScript_1AB801:: @ 81AB801 trainerbattle_single TRAINER_SWIMMER_FEMALE_NORA, Text_1880F8, Text_188119 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB828 msgbox Text_188139, MSGBOX_AUTOCLOSE end @@ -1938,7 +1938,7 @@ EventScript_1AB828:: @ 81AB828 Route20_EventScript_1AB83F:: @ 81AB83F trainerbattle_single TRAINER_SWIMMER_FEMALE_MELISSA, Text_188218, Text_18825C specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB866 msgbox Text_18827B, MSGBOX_AUTOCLOSE end @@ -1951,7 +1951,7 @@ EventScript_1AB866:: @ 81AB866 Route20_EventScript_1AB87D:: @ 81AB87D trainerbattle_single TRAINER_SWIMMER_FEMALE_SHIRLEY, Text_187EBB, Text_187EED specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB8A4 msgbox Text_187EF6, MSGBOX_AUTOCLOSE end @@ -1964,7 +1964,7 @@ EventScript_1AB8A4:: @ 81AB8A4 Route20_EventScript_1AB8BB:: @ 81AB8BB trainerbattle_single TRAINER_BIRD_KEEPER_ROGER, Text_18808E, Text_1880AB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB8E2 msgbox Text_1880C8, MSGBOX_AUTOCLOSE end @@ -1977,7 +1977,7 @@ EventScript_1AB8E2:: @ 81AB8E2 Route20_EventScript_1AB8F9:: @ 81AB8F9 trainerbattle_single TRAINER_PICNICKER_MISSY, Text_188165, Text_1881A3 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB920 msgbox Text_1881B8, MSGBOX_AUTOCLOSE end @@ -1990,7 +1990,7 @@ EventScript_1AB920:: @ 81AB920 Route20_EventScript_1AB937:: @ 81AB937 trainerbattle_single TRAINER_PICNICKER_IRENE, Text_187F78, Text_187F92 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB95E msgbox Text_187FA3, MSGBOX_AUTOCLOSE end @@ -2003,7 +2003,7 @@ EventScript_1AB95E:: @ 81AB95E Route21_North_EventScript_1AB975:: @ 81AB975 trainerbattle_single TRAINER_FISHERMAN_RONALD, Text_18835A, Text_188383 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB99C msgbox Text_188389, MSGBOX_AUTOCLOSE end @@ -2016,7 +2016,7 @@ EventScript_1AB99C:: @ 81AB99C Route21_South_EventScript_1AB9B3:: @ 81AB9B3 trainerbattle_single TRAINER_FISHERMAN_CLAUDE, Text_1885D8, Text_1885F8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AB9DA msgbox Text_188632, MSGBOX_AUTOCLOSE end @@ -2029,7 +2029,7 @@ EventScript_1AB9DA:: @ 81AB9DA Route21_North_EventScript_1AB9F1:: @ 81AB9F1 trainerbattle_single TRAINER_FISHERMAN_WADE, Text_1883C6, Text_1883E9 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABA18 msgbox Text_18841D, MSGBOX_AUTOCLOSE end @@ -2042,7 +2042,7 @@ EventScript_1ABA18:: @ 81ABA18 Route21_South_EventScript_1ABA2F:: @ 81ABA2F trainerbattle_single TRAINER_FISHERMAN_NOLAN, Text_18868C, Text_1886AE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABA56 msgbox Text_1886C5, MSGBOX_AUTOCLOSE end @@ -2055,7 +2055,7 @@ EventScript_1ABA56:: @ 81ABA56 Route21_North_EventScript_1ABA6D:: @ 81ABA6D trainerbattle_single TRAINER_SWIMMER_MALE_SPENCER, Text_18843C, Text_18845F specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABA94 msgbox Text_188465, MSGBOX_AUTOCLOSE end @@ -2068,7 +2068,7 @@ EventScript_1ABA94:: @ 81ABA94 Route21_South_EventScript_1ABAAB:: @ 81ABAAB trainerbattle_single TRAINER_SWIMMER_MALE_JACK, Text_1884D4, Text_1884F0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABAD2 msgbox Text_1884FF, MSGBOX_AUTOCLOSE end @@ -2081,7 +2081,7 @@ EventScript_1ABAD2:: @ 81ABAD2 Route21_South_EventScript_1ABAE9:: @ 81ABAE9 trainerbattle_single TRAINER_SWIMMER_MALE_JEROME, Text_18851F, Text_188543 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABB10 msgbox Text_188555, MSGBOX_AUTOCLOSE end @@ -2094,7 +2094,7 @@ EventScript_1ABB10:: @ 81ABB10 Route21_South_EventScript_1ABB27:: @ 81ABB27 trainerbattle_single TRAINER_SWIMMER_MALE_ROLAND, Text_188592, Text_1885B2 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABB4E msgbox Text_1885BF, MSGBOX_AUTOCLOSE end @@ -2107,7 +2107,7 @@ EventScript_1ABB4E:: @ 81ABB4E Route21_North_EventScript_1ABB65:: @ 81ABB65 trainerbattle_double TRAINER_SIS_AND_BRO_LIL_IAN, Text_1886E2, Text_188712, Text_18875E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABB90 msgbox Text_188734, MSGBOX_AUTOCLOSE end @@ -2120,7 +2120,7 @@ EventScript_1ABB90:: @ 81ABB90 Route21_North_EventScript_1ABBAB:: @ 81ABBAB trainerbattle_double TRAINER_SIS_AND_BRO_LIL_IAN, Text_1887B4, Text_1887F1, Text_188850 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABBD6 msgbox Text_188812, MSGBOX_AUTOCLOSE end @@ -2133,7 +2133,7 @@ EventScript_1ABBD6:: @ 81ABBD6 OneIsland_KindleRoad_EventScript_1ABBF1:: @ 81ABBF1 trainerbattle_single TRAINER_SWIMMER_FEMALE_MARIA, Text_18961F, Text_18964D specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABC18 msgbox Text_189657, MSGBOX_AUTOCLOSE end @@ -2146,7 +2146,7 @@ EventScript_1ABC18:: @ 81ABC18 OneIsland_KindleRoad_EventScript_1ABC2F:: @ 81ABC2F trainerbattle_single TRAINER_SWIMMER_FEMALE_ABIGAIL, Text_18968C, Text_1896AC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABC56 msgbox Text_1896C1, MSGBOX_AUTOCLOSE end @@ -2159,7 +2159,7 @@ EventScript_1ABC56:: @ 81ABC56 OneIsland_KindleRoad_EventScript_1ABC6D:: @ 81ABC6D trainerbattle_single TRAINER_SWIMMER_MALE_FINN, Text_1896F9, Text_189728 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABC94 msgbox Text_189740, MSGBOX_AUTOCLOSE end @@ -2172,7 +2172,7 @@ EventScript_1ABC94:: @ 81ABC94 OneIsland_KindleRoad_EventScript_1ABCAB:: @ 81ABCAB trainerbattle_single TRAINER_SWIMMER_MALE_GARRETT, Text_189767, Text_1897A4 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABCD2 msgbox Text_1897C5, MSGBOX_AUTOCLOSE end @@ -2185,7 +2185,7 @@ EventScript_1ABCD2:: @ 81ABCD2 OneIsland_KindleRoad_EventScript_1ABCE9:: @ 81ABCE9 trainerbattle_single TRAINER_FISHERMAN_TOMMY, Text_1897FF, Text_189833 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABD10 msgbox Text_18984B, MSGBOX_AUTOCLOSE end @@ -2198,7 +2198,7 @@ EventScript_1ABD10:: @ 81ABD10 OneIsland_KindleRoad_EventScript_1ABD27:: @ 81ABD27 trainerbattle_single TRAINER_CRUSH_GIRL_SHARON, Text_189883, Text_1898AB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABD4E msgbox Text_1898C4, MSGBOX_AUTOCLOSE end @@ -2211,7 +2211,7 @@ EventScript_1ABD4E:: @ 81ABD4E OneIsland_KindleRoad_EventScript_1ABD65:: @ 81ABD65 trainerbattle_single TRAINER_CRUSH_GIRL_TANYA, Text_1898F0, Text_18991B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABD8C msgbox Text_18992C, MSGBOX_AUTOCLOSE end @@ -2224,7 +2224,7 @@ EventScript_1ABD8C:: @ 81ABD8C OneIsland_KindleRoad_EventScript_1ABDA3:: @ 81ABDA3 trainerbattle_single TRAINER_BLACK_BELT_SHEA, Text_189950, Text_18998C specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABDCA msgbox Text_189998, MSGBOX_AUTOCLOSE end @@ -2237,7 +2237,7 @@ EventScript_1ABDCA:: @ 81ABDCA OneIsland_KindleRoad_EventScript_1ABDE1:: @ 81ABDE1 trainerbattle_single TRAINER_BLACK_BELT_HUGH, Text_1899CE, Text_189A0A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABE08 msgbox Text_189A13, MSGBOX_AUTOCLOSE end @@ -2250,7 +2250,7 @@ EventScript_1ABE08:: @ 81ABE08 OneIsland_KindleRoad_EventScript_1ABE1F:: @ 81ABE1F trainerbattle_single TRAINER_CAMPER_BRYCE, Text_189A53, Text_189A92 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABE46 msgbox Text_189A9F, MSGBOX_AUTOCLOSE end @@ -2263,7 +2263,7 @@ EventScript_1ABE46:: @ 81ABE46 OneIsland_KindleRoad_EventScript_1ABE5D:: @ 81ABE5D trainerbattle_single TRAINER_PICNICKER_CLAIRE, Text_189ACB, Text_189B0B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABE84 msgbox Text_189B24, MSGBOX_AUTOCLOSE end @@ -2276,7 +2276,7 @@ EventScript_1ABE84:: @ 81ABE84 OneIsland_KindleRoad_EventScript_1ABE9B:: @ 81ABE9B trainerbattle_double TRAINER_CRUSH_KIN_MIK_KIA, Text_189B4D, Text_189B84, Text_189BDE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABEC6 msgbox Text_189BA3, MSGBOX_AUTOCLOSE end @@ -2289,7 +2289,7 @@ EventScript_1ABEC6:: @ 81ABEC6 OneIsland_KindleRoad_EventScript_1ABEE1:: @ 81ABEE1 trainerbattle_double TRAINER_CRUSH_KIN_MIK_KIA, Text_189C33, Text_189C62, Text_189CAB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABF0C msgbox Text_189C7E, MSGBOX_AUTOCLOSE end @@ -2302,7 +2302,7 @@ EventScript_1ABF0C:: @ 81ABF0C OneIsland_TreasureBeach_EventScript_1ABF27:: @ 81ABF27 trainerbattle_single TRAINER_SWIMMER_FEMALE_AMARA, Text_189D5A, Text_189D8B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABF4E msgbox Text_189DA3, MSGBOX_AUTOCLOSE end @@ -2315,7 +2315,7 @@ EventScript_1ABF4E:: @ 81ABF4E ThreeIsland_BondBridge_EventScript_1ABF65:: @ 81ABF65 trainerbattle_single TRAINER_AROMA_LADY_NIKKI, Text_189E42, Text_189E72 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABF8C msgbox Text_189E9E, MSGBOX_AUTOCLOSE end @@ -2328,7 +2328,7 @@ EventScript_1ABF8C:: @ 81ABF8C ThreeIsland_BondBridge_EventScript_1ABFA3:: @ 81ABFA3 trainerbattle_single TRAINER_AROMA_LADY_VIOLET, Text_189ED4, Text_189EFA specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ABFCA msgbox Text_189F21, MSGBOX_AUTOCLOSE end @@ -2341,7 +2341,7 @@ EventScript_1ABFCA:: @ 81ABFCA ThreeIsland_BondBridge_EventScript_1ABFE1:: @ 81ABFE1 trainerbattle_single TRAINER_TUBER_AMIRA, Text_189F63, Text_189F9A specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC008 msgbox Text_189FA8, MSGBOX_AUTOCLOSE end @@ -2354,7 +2354,7 @@ EventScript_1AC008:: @ 81AC008 ThreeIsland_BondBridge_EventScript_1AC01F:: @ 81AC01F trainerbattle_single TRAINER_TUBER_ALEXIS, Text_189FDB, Text_189FEE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC046 msgbox Text_18A000, MSGBOX_AUTOCLOSE end @@ -2367,7 +2367,7 @@ EventScript_1AC046:: @ 81AC046 ThreeIsland_BondBridge_EventScript_1AC05D:: @ 81AC05D trainerbattle_single TRAINER_SWIMMER_FEMALE_TISHA, Text_18A01F, Text_18A053 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC084 msgbox Text_18A082, MSGBOX_AUTOCLOSE end @@ -2380,7 +2380,7 @@ EventScript_1AC084:: @ 81AC084 ThreeIsland_BondBridge_EventScript_1AC09B:: @ 81AC09B trainerbattle_double TRAINER_TWINS_JOY_MEG, Text_18A0C4, Text_18A0F7, Text_18A138 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC0C6 msgbox Text_18A106, MSGBOX_AUTOCLOSE end @@ -2393,7 +2393,7 @@ EventScript_1AC0C6:: @ 81AC0C6 ThreeIsland_BondBridge_EventScript_1AC0E1:: @ 81AC0E1 trainerbattle_double TRAINER_TWINS_JOY_MEG, Text_18A179, Text_18A1A3, Text_18A1CD specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC10C msgbox Text_18A1B2, MSGBOX_AUTOCLOSE end @@ -2406,7 +2406,7 @@ EventScript_1AC10C:: @ 81AC10C FiveIsland_ResortGorgeous_EventScript_1AC127:: @ 81AC127 trainerbattle_single TRAINER_PAINTER_DAISY, Text_18A3E2, Text_18A40E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC14E msgbox Text_18A430, MSGBOX_AUTOCLOSE end @@ -2419,7 +2419,7 @@ EventScript_1AC14E:: @ 81AC14E FiveIsland_ResortGorgeous_EventScript_1AC165:: @ 81AC165 trainerbattle_single TRAINER_PAINTER_CELINA, Text_18A461, Text_18A49E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC18C msgbox Text_18A4C6, MSGBOX_AUTOCLOSE end @@ -2432,7 +2432,7 @@ EventScript_1AC18C:: @ 81AC18C FiveIsland_ResortGorgeous_EventScript_1AC1A3:: @ 81AC1A3 trainerbattle_single TRAINER_PAINTER_RAYNA, Text_18A50E, Text_18A535 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC1CA msgbox Text_18A555, MSGBOX_AUTOCLOSE end @@ -2445,7 +2445,7 @@ EventScript_1AC1CA:: @ 81AC1CA FiveIsland_ResortGorgeous_EventScript_1AC1E1:: @ 81AC1E1 trainerbattle_single TRAINER_LADY_JACKI, Text_18A5B9, Text_18A5EE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC208 msgbox Text_18A601, MSGBOX_AUTOCLOSE end @@ -2458,7 +2458,7 @@ EventScript_1AC208:: @ 81AC208 FiveIsland_ResortGorgeous_EventScript_1AC21F:: @ 81AC21F trainerbattle_single TRAINER_LADY_GILLIAN, Text_18A645, Text_18A67F specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC246 msgbox Text_18A699, MSGBOX_AUTOCLOSE end @@ -2471,7 +2471,7 @@ EventScript_1AC246:: @ 81AC246 FiveIsland_ResortGorgeous_EventScript_1AC25D:: @ 81AC25D trainerbattle_single TRAINER_YOUNGSTER_DESTIN, Text_18A6DA, Text_18A6FE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC284 msgbox Text_18A715, MSGBOX_AUTOCLOSE end @@ -2484,7 +2484,7 @@ EventScript_1AC284:: @ 81AC284 FiveIsland_ResortGorgeous_EventScript_1AC29B:: @ 81AC29B trainerbattle_single TRAINER_SWIMMER_MALE_TOBY, Text_18A74A, Text_18A786 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC2C2 msgbox Text_18A7AC, MSGBOX_AUTOCLOSE end @@ -2497,7 +2497,7 @@ EventScript_1AC2C2:: @ 81AC2C2 FiveIsland_WaterLabyrinth_EventScript_1AC2D9:: @ 81AC2D9 trainerbattle_single TRAINER_PKMN_BREEDER_ALIZE, Text_18AAD5, Text_18AB0B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC300 msgbox Text_18AB37, MSGBOX_AUTOCLOSE end @@ -2510,7 +2510,7 @@ EventScript_1AC300:: @ 81AC300 FiveIsland_MemorialPillar_EventScript_1AC317:: @ 81AC317 trainerbattle_single TRAINER_BIRD_KEEPER_MILO, Text_18AE50, Text_18AEA8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC33E msgbox Text_18AEB6, MSGBOX_AUTOCLOSE end @@ -2523,7 +2523,7 @@ EventScript_1AC33E:: @ 81AC33E FiveIsland_MemorialPillar_EventScript_1AC355:: @ 81AC355 trainerbattle_single TRAINER_BIRD_KEEPER_CHAZ, Text_18AEDC, Text_18AF39 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC37C msgbox Text_18AF45, MSGBOX_AUTOCLOSE end @@ -2536,7 +2536,7 @@ EventScript_1AC37C:: @ 81AC37C FiveIsland_MemorialPillar_EventScript_1AC393:: @ 81AC393 trainerbattle_single TRAINER_BIRD_KEEPER_HAROLD, Text_18AF72, Text_18AFCC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC3BA msgbox Text_18AFF2, MSGBOX_AUTOCLOSE end @@ -2549,7 +2549,7 @@ EventScript_1AC3BA:: @ 81AC3BA SixIsland_OutcastIsland_EventScript_1AC3D1:: @ 81AC3D1 trainerbattle_single TRAINER_FISHERMAN_TYLOR, Text_18B400, Text_18B43B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC3F8 msgbox Text_18B451, MSGBOX_AUTOCLOSE end @@ -2562,7 +2562,7 @@ EventScript_1AC3F8:: @ 81AC3F8 SixIsland_OutcastIsland_EventScript_1AC40F:: @ 81AC40F trainerbattle_single TRAINER_SWIMMER_MALE_MYMO, Text_18B48F, Text_18B4C5 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC436 msgbox Text_18B4D1, MSGBOX_AUTOCLOSE end @@ -2575,7 +2575,7 @@ EventScript_1AC436:: @ 81AC436 SixIsland_OutcastIsland_EventScript_1AC44D:: @ 81AC44D trainerbattle_single TRAINER_SWIMMER_FEMALE_NICOLE, Text_18B4FA, Text_18B539 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC474 msgbox Text_18B573, MSGBOX_AUTOCLOSE end @@ -2588,7 +2588,7 @@ EventScript_1AC474:: @ 81AC474 SixIsland_OutcastIsland_EventScript_1AC48B:: @ 81AC48B trainerbattle_double TRAINER_SIS_AND_BRO_AVA_GEB, Text_18B5C8, Text_18B5F4, Text_18B660 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC4B6 msgbox Text_18B62E, MSGBOX_AUTOCLOSE end @@ -2601,7 +2601,7 @@ EventScript_1AC4B6:: @ 81AC4B6 SixIsland_OutcastIsland_EventScript_1AC4D1:: @ 81AC4D1 trainerbattle_double TRAINER_SIS_AND_BRO_AVA_GEB, Text_18B6C1, Text_18B6EF, Text_18B762 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC4FC msgbox Text_18B720, MSGBOX_AUTOCLOSE end @@ -2614,7 +2614,7 @@ EventScript_1AC4FC:: @ 81AC4FC SixIsland_GreenPath_EventScript_1AC517:: @ 81AC517 trainerbattle_single TRAINER_PSYCHIC_JACLYN, Text_18B7B0, Text_18B7F0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC53E msgbox Text_18B7FD, MSGBOX_AUTOCLOSE end @@ -2627,7 +2627,7 @@ EventScript_1AC53E:: @ 81AC53E SixIsland_WaterPath_EventScript_1AC555:: @ 81AC555 trainerbattle_single TRAINER_AROMA_LADY_ROSE, Text_18B896, Text_18B8C8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC57C msgbox Text_18B8F7, MSGBOX_AUTOCLOSE end @@ -2640,7 +2640,7 @@ EventScript_1AC57C:: @ 81AC57C SixIsland_WaterPath_EventScript_1AC593:: @ 81AC593 trainerbattle_single TRAINER_JUGGLER_EDWARD, Text_18B959, Text_18B988 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC5BA msgbox Text_18B9A5, MSGBOX_AUTOCLOSE end @@ -2653,7 +2653,7 @@ EventScript_1AC5BA:: @ 81AC5BA SixIsland_WaterPath_EventScript_1AC5D1:: @ 81AC5D1 trainerbattle_single TRAINER_SWIMMER_MALE_SAMIR, Text_18B9EC, Text_18BA47 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC5F8 msgbox Text_18BA57, MSGBOX_AUTOCLOSE end @@ -2666,7 +2666,7 @@ EventScript_1AC5F8:: @ 81AC5F8 SixIsland_WaterPath_EventScript_1AC60F:: @ 81AC60F trainerbattle_single TRAINER_SWIMMER_FEMALE_DENISE, Text_18BA86, Text_18BAC0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC636 msgbox Text_18BAE0, MSGBOX_AUTOCLOSE end @@ -2679,7 +2679,7 @@ EventScript_1AC636:: @ 81AC636 SixIsland_WaterPath_EventScript_1AC64D:: @ 81AC64D trainerbattle_double TRAINER_TWINS_MIU_MIA, Text_18BBBA, Text_18BBE2, Text_18BC24 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC678 msgbox Text_18BBF6, MSGBOX_AUTOCLOSE end @@ -2692,7 +2692,7 @@ EventScript_1AC678:: @ 81AC678 SixIsland_WaterPath_EventScript_1AC693:: @ 81AC693 trainerbattle_double TRAINER_TWINS_MIU_MIA, Text_18BC5A, Text_18BC84, Text_18BCCF specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC6BE msgbox Text_18BCAE, MSGBOX_AUTOCLOSE end @@ -2705,7 +2705,7 @@ EventScript_1AC6BE:: @ 81AC6BE SixIsland_WaterPath_EventScript_1AC6D9:: @ 81AC6D9 trainerbattle_single TRAINER_HIKER_EARL, Text_18BB2D, Text_18BB62 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC700 msgbox Text_18BB8B, MSGBOX_AUTOCLOSE end @@ -2718,7 +2718,7 @@ EventScript_1AC700:: @ 81AC700 SixIsland_RuinValley_EventScript_1AC717:: @ 81AC717 trainerbattle_single TRAINER_RUIN_MANIAC_STANLY, Text_18BE5D, Text_18BE9B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC73E msgbox Text_18BEA0, MSGBOX_AUTOCLOSE end @@ -2731,7 +2731,7 @@ EventScript_1AC73E:: @ 81AC73E SixIsland_RuinValley_EventScript_1AC755:: @ 81AC755 trainerbattle_single TRAINER_RUIN_MANIAC_FOSTER, Text_18BF05, Text_18BF33 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC77C msgbox Text_18BF6C, MSGBOX_AUTOCLOSE end @@ -2744,7 +2744,7 @@ EventScript_1AC77C:: @ 81AC77C SixIsland_RuinValley_EventScript_1AC793:: @ 81AC793 trainerbattle_single TRAINER_RUIN_MANIAC_LARRY, Text_18BFC5, Text_18C03B specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC7BA msgbox Text_18C04C, MSGBOX_AUTOCLOSE end @@ -2757,7 +2757,7 @@ EventScript_1AC7BA:: @ 81AC7BA SixIsland_RuinValley_EventScript_1AC7D1:: @ 81AC7D1 trainerbattle_single TRAINER_HIKER_DARYL, Text_18C09C, Text_18C0BB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC7F8 msgbox Text_18C0EA, MSGBOX_AUTOCLOSE end @@ -2770,7 +2770,7 @@ EventScript_1AC7F8:: @ 81AC7F8 SixIsland_RuinValley_EventScript_1AC80F:: @ 81AC80F trainerbattle_single TRAINER_POKEMANIAC_HECTOR, Text_18C10A, Text_18C140 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC836 msgbox Text_18C17A, MSGBOX_AUTOCLOSE end @@ -2783,7 +2783,7 @@ EventScript_1AC836:: @ 81AC836 SevenIsland_TrainerTower_EventScript_1AC84D:: @ 81AC84D trainerbattle_single TRAINER_PSYCHIC_DARIO, Text_18C1ED, Text_18C205 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC874 msgbox Text_18C20E, MSGBOX_AUTOCLOSE end @@ -2796,7 +2796,7 @@ EventScript_1AC874:: @ 81AC874 SevenIsland_TrainerTower_EventScript_1AC88B:: @ 81AC88B trainerbattle_single TRAINER_PSYCHIC_RODETTE, Text_18C283, Text_18C2BC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC8B2 msgbox Text_18C2D5, MSGBOX_AUTOCLOSE end @@ -2809,7 +2809,7 @@ EventScript_1AC8B2:: @ 81AC8B2 SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9:: @ 81AC8C9 trainerbattle_single TRAINER_AROMA_LADY_MIAH, Text_18C3BC, Text_18C3E7 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC8F0 msgbox Text_18C3FF, MSGBOX_AUTOCLOSE end @@ -2822,7 +2822,7 @@ EventScript_1AC8F0:: @ 81AC8F0 SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907:: @ 81AC907 trainerbattle_double TRAINER_YOUNG_COUPLE_EVE_JON, Text_18C632, Text_18C662, Text_18C6AB specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC932 msgbox Text_18C683, MSGBOX_AUTOCLOSE end @@ -2835,7 +2835,7 @@ EventScript_1AC932:: @ 81AC932 SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D:: @ 81AC94D trainerbattle_double TRAINER_YOUNG_COUPLE_EVE_JON, Text_18C700, Text_18C73B, Text_18C7BD specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC978 msgbox Text_18C773, MSGBOX_AUTOCLOSE end @@ -2848,7 +2848,7 @@ EventScript_1AC978:: @ 81AC978 SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993:: @ 81AC993 trainerbattle_single TRAINER_JUGGLER_MASON, Text_18C44B, Text_18C473 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC9BA msgbox Text_18C4BA, MSGBOX_AUTOCLOSE end @@ -2861,7 +2861,7 @@ EventScript_1AC9BA:: @ 81AC9BA SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1:: @ 81AC9D1 trainerbattle_single TRAINER_PKMN_RANGER_NICOLAS, Text_18C500, Text_18C543 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1AC9F8 msgbox Text_18C54B, MSGBOX_AUTOCLOSE end @@ -2874,7 +2874,7 @@ EventScript_1AC9F8:: @ 81AC9F8 SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F:: @ 81ACA0F trainerbattle_single TRAINER_PKMN_RANGER_MADELINE, Text_18C5AA, Text_18C5CD specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACA36 msgbox Text_18C5F5, MSGBOX_AUTOCLOSE end @@ -2887,7 +2887,7 @@ EventScript_1ACA36:: @ 81ACA36 SevenIsland_SevaultCanyon_EventScript_1ACA4D:: @ 81ACA4D trainerbattle_single TRAINER_CRUSH_GIRL_CYNDY, Text_18C887, Text_18C8A6 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACA74 msgbox Text_18C8C2, MSGBOX_AUTOCLOSE end @@ -2900,7 +2900,7 @@ EventScript_1ACA74:: @ 81ACA74 SevenIsland_SevaultCanyon_EventScript_1ACA8B:: @ 81ACA8B trainerbattle_single TRAINER_TAMER_EVAN, Text_18C8FD, Text_18C980 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACAB2 msgbox Text_18C999, MSGBOX_AUTOCLOSE end @@ -2913,7 +2913,7 @@ EventScript_1ACAB2:: @ 81ACAB2 SevenIsland_SevaultCanyon_EventScript_1ACAC9:: @ 81ACAC9 trainerbattle_single TRAINER_PKMN_RANGER_JACKSON, Text_18CA2F, Text_18CA6F specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACAF0 msgbox Text_18CA9C, MSGBOX_AUTOCLOSE end @@ -2926,7 +2926,7 @@ EventScript_1ACAF0:: @ 81ACAF0 SevenIsland_SevaultCanyon_EventScript_1ACB07:: @ 81ACB07 trainerbattle_single TRAINER_PKMN_RANGER_KATELYN, Text_18CB16, Text_18CB3E specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACB2E msgbox Text_18CB6C, MSGBOX_AUTOCLOSE end @@ -2939,7 +2939,7 @@ EventScript_1ACB2E:: @ 81ACB2E SevenIsland_SevaultCanyon_EventScript_1ACB45:: @ 81ACB45 trainerbattle_single TRAINER_COOLTRAINER_LEROY, Text_18CBB4, Text_18CBE0 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACB6C msgbox Text_18CC09, MSGBOX_AUTOCLOSE end @@ -2952,7 +2952,7 @@ EventScript_1ACB6C:: @ 81ACB6C SevenIsland_SevaultCanyon_EventScript_1ACB83:: @ 81ACB83 trainerbattle_single TRAINER_COOLTRAINER_MICHELLE, Text_18CC4F, Text_18CCAE specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACBAA msgbox Text_18CCEA, MSGBOX_AUTOCLOSE end @@ -2965,7 +2965,7 @@ EventScript_1ACBAA:: @ 81ACBAA SevenIsland_SevaultCanyon_EventScript_1ACBC1:: @ 81ACBC1 trainerbattle_double TRAINER_COOL_COUPLE_LEX_NYA, Text_18CD49, Text_18CD75, Text_18CDE2 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACBEC msgbox Text_18CD9C, MSGBOX_AUTOCLOSE end @@ -2978,7 +2978,7 @@ EventScript_1ACBEC:: @ 81ACBEC SevenIsland_SevaultCanyon_EventScript_1ACC07:: @ 81ACC07 trainerbattle_double TRAINER_COOL_COUPLE_LEX_NYA, Text_18CE20, Text_18CE5A, Text_18CEF4 specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_1ACC32 msgbox Text_18CE78, MSGBOX_AUTOCLOSE end @@ -2988,54 +2988,54 @@ EventScript_1ACC32:: @ 81ACC32 msgbox Text_18CE78, MSGBOX_AUTOCLOSE end -SevenIsland_TanobyRuins_EventScript_1ACC4D:: @ 81ACC4D - trainerbattle_single TRAINER_RUIN_MANIAC_BRANDON, Text_18CFFB, Text_18D02A +SevenIsland_TanobyRuins_EventScript_Brandon:: @ 81ACC4D + trainerbattle_single TRAINER_RUIN_MANIAC_BRANDON, SevenIsland_TanobyRuins_Text_BrandonIntro, SevenIsland_TanobyRuins_Text_BrandonDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1ACC74 - msgbox Text_18D061, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq SevenIsland_TanobyRuins_EventScript_RematchBrandon + msgbox SevenIsland_TanobyRuins_Text_BrandonPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ACC74:: @ 81ACC74 - trainerbattle_rematch TRAINER_RUIN_MANIAC_BRANDON, Text_1C46D3, Text_18D02A - msgbox Text_18D061, MSGBOX_AUTOCLOSE +SevenIsland_TanobyRuins_EventScript_RematchBrandon:: @ 81ACC74 + trainerbattle_rematch TRAINER_RUIN_MANIAC_BRANDON, SevenIsland_TanobyRuins_Text_BrandonRematchIntro, SevenIsland_TanobyRuins_Text_BrandonDefeat + msgbox SevenIsland_TanobyRuins_Text_BrandonPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_TanobyRuins_EventScript_1ACC8B:: @ 81ACC8B - trainerbattle_single TRAINER_RUIN_MANIAC_BENJAMIN, Text_18D0D9, Text_18D108 +SevenIsland_TanobyRuins_EventScript_Benjamin:: @ 81ACC8B + trainerbattle_single TRAINER_RUIN_MANIAC_BENJAMIN, SevenIsland_TanobyRuins_Text_BenjaminIntro, SevenIsland_TanobyRuins_Text_BenjaminDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1ACCB2 - msgbox Text_18D125, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq SevenIsland_TanobyRuins_EventScript_RematchBenjamin + msgbox SevenIsland_TanobyRuins_Text_BenjaminPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ACCB2:: @ 81ACCB2 - trainerbattle_rematch TRAINER_RUIN_MANIAC_BENJAMIN, Text_1C470A, Text_18D108 - msgbox Text_18D125, MSGBOX_AUTOCLOSE +SevenIsland_TanobyRuins_EventScript_RematchBenjamin:: @ 81ACCB2 + trainerbattle_rematch TRAINER_RUIN_MANIAC_BENJAMIN, SevenIsland_TanobyRuins_Text_BenjaminRematchIntro, SevenIsland_TanobyRuins_Text_BenjaminDefeat + msgbox SevenIsland_TanobyRuins_Text_BenjaminPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_TanobyRuins_EventScript_1ACCC9:: @ 81ACCC9 - trainerbattle_single TRAINER_PAINTER_EDNA, Text_18D18F, Text_18D1B5 +SevenIsland_TanobyRuins_EventScript_Edna:: @ 81ACCC9 + trainerbattle_single TRAINER_PAINTER_EDNA, SevenIsland_TanobyRuins_Text_EdnaIntro, SevenIsland_TanobyRuins_Text_EdnaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1ACCF0 - msgbox Text_18D1E3, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq SevenIsland_TanobyRuins_EventScript_RematchEdna + msgbox SevenIsland_TanobyRuins_Text_EdnaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ACCF0:: @ 81ACCF0 - trainerbattle_rematch TRAINER_PAINTER_EDNA, Text_1C4739, Text_18D1B5 - msgbox Text_18D1E3, MSGBOX_AUTOCLOSE +SevenIsland_TanobyRuins_EventScript_RematchEdna:: @ 81ACCF0 + trainerbattle_rematch TRAINER_PAINTER_EDNA, SevenIsland_TanobyRuins_Text_EdnaRematchIntro, SevenIsland_TanobyRuins_Text_EdnaDefeat + msgbox SevenIsland_TanobyRuins_Text_EdnaPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_TanobyRuins_EventScript_1ACD07:: @ 81ACD07 - trainerbattle_single TRAINER_GENTLEMAN_CLIFFORD, Text_18D22F, Text_18D26D +SevenIsland_TanobyRuins_EventScript_Clifford:: @ 81ACD07 + trainerbattle_single TRAINER_GENTLEMAN_CLIFFORD, SevenIsland_TanobyRuins_Text_CliffordIntro, SevenIsland_TanobyRuins_Text_CliffordDefeat specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq EventScript_1ACD2E - msgbox Text_18D284, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq SevenIsland_TanobyRuins_EventScript_RematchClifford + msgbox SevenIsland_TanobyRuins_Text_CliffordPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ACD2E:: @ 81ACD2E - trainerbattle_rematch TRAINER_GENTLEMAN_CLIFFORD, Text_1C476A, Text_18D26D - msgbox Text_18D284, MSGBOX_AUTOCLOSE +SevenIsland_TanobyRuins_EventScript_RematchClifford:: @ 81ACD2E + trainerbattle_rematch TRAINER_GENTLEMAN_CLIFFORD, SevenIsland_TanobyRuins_Text_CliffordRematchIntro, SevenIsland_TanobyRuins_Text_CliffordDefeat + msgbox SevenIsland_TanobyRuins_Text_CliffordPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/text/trainers.inc b/data/text/trainers.inc index 21a96a964..471c54a4b 100644 --- a/data/text/trainers.inc +++ b/data/text/trainers.inc @@ -989,18 +989,18 @@ Text_1C4699:: @ 81C4699 .string "NYA: I won't drag down my mentor\n" .string "LEX! We're going to win!$" -Text_1C46D3:: @ 81C46D3 +SevenIsland_TanobyRuins_Text_BrandonRematchIntro:: @ 81C46D3 .string "Have you discovered anything about\n" .string "this stone chamber?$" -Text_1C470A:: @ 81C470A +SevenIsland_TanobyRuins_Text_BenjaminRematchIntro:: @ 81C470A .string "A mystic POKéMON is said to sleep\n" .string "inside here.$" -Text_1C4739:: @ 81C4739 +SevenIsland_TanobyRuins_Text_EdnaRematchIntro:: @ 81C4739 .string "My teacher is showing me how to\n" .string "paint some more.$" -Text_1C476A:: @ 81C476A +SevenIsland_TanobyRuins_Text_CliffordRematchIntro:: @ 81C476A .string "Today, in addition to our lesson,\n" .string "we came to see the chamber again.$" diff --git a/include/constants/layouts.h b/include/constants/layouts.h index 657d531e8..769378cfd 100644 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -301,7 +301,7 @@ #define LAYOUT_ONE_ISLAND_POKEMON_CENTER_2F 316 #define LAYOUT_SIX_ISLAND_PATTERN_BUSH 317 #define LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL 318 -#define LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_2 319 +#define LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_DUG_OUT 319 #define LAYOUT_FIVE_ISLAND_LOST_CAVE_ENTRANCE 320 #define LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM1 321 #define LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM2 322 |