diff options
Diffstat (limited to 'data')
85 files changed, 1173 insertions, 644 deletions
diff --git a/data/data_835B488.s b/data/data_835B488.s index f3385b949..e5e7b9e90 100644 --- a/data/data_835B488.s +++ b/data/data_835B488.s @@ -785,7 +785,7 @@ gUnknown_83E0248:: @ 83E0248 .4byte gUnknown_841807D, NULL .4byte gUnknown_841808E, NULL .4byte gUnknown_841809C, NULL - .4byte gUnknown_8417929, NULL + .4byte gOtherText_Quit, NULL gUnknown_83E0268:: @ 83E0268 .4byte gUnknown_8417DFE, NULL diff --git a/data/data_83F5738.s b/data/data_83F5738.s index cd73dd0d1..db34735d9 100644 --- a/data/data_83F5738.s +++ b/data/data_83F5738.s @@ -1,3 +1,7 @@ +#include "constants/species.h" +#include "constants/items.h" + .include "asm/macros.inc" + .include "constants/constants.inc" .section .rodata .align 2 @@ -22,89 +26,6 @@ gUnknown_83F5864:: @ 83F5864 gUnknown_83F5A44:: @ 83F5A44 .incbin "baserom.gba", 0x3F5A44, 0xB4 -gUnknown_83F5AF8:: @ 83F5AF8 - .incbin "baserom.gba", 0x3F5AF8, 0x22 - -gUnknown_83F5B1A:: @ 83F5B1A - .incbin "baserom.gba", 0x3F5B1A, 0x16 - -gUnknown_83F5B30:: @ 83F5B30 - .incbin "baserom.gba", 0x3F5B30, 0xC - -gUnknown_83F5B3C:: @ 83F5B3C - .incbin "baserom.gba", 0x3F5B3C, 0x8 - -gUnknown_83F5B44:: @ 83F5B44 - .incbin "baserom.gba", 0x3F5B44, 0x50 - -gUnknown_83F5B94:: @ 83F5B94 - .incbin "baserom.gba", 0x3F5B94, 0x12 - -gUnknown_83F5BA6:: @ 83F5BA6 - .incbin "baserom.gba", 0x3F5BA6, 0x12 - -gUnknown_83F5BB8:: @ 83F5BB8 - .incbin "baserom.gba", 0x3F5BB8, 0x9 - -gUnknown_83F5BC1:: @ 83F5BC1 - .incbin "baserom.gba", 0x3F5BC1, 0xB - -gUnknown_83F5BCC:: @ 83F5BCC - .incbin "baserom.gba", 0x3F5BCC, 0x150 - -gUnknown_83F5D1C:: @ 83F5D1C - .incbin "baserom.gba", 0x3F5D1C, 0x10 - -sStarterMon:: @ 83F5D2C - .incbin "baserom.gba", 0x3F5D2C, 0x6 - -gUnknown_83F5D32:: @ 83F5D32 - .incbin "baserom.gba", 0x3F5D32, 0x26 - -gUnknown_83F5D58:: @ 83F5D58 - .incbin "baserom.gba", 0x3F5D58, 0x198 - - .align 2 -gUnknown_83F5EF0:: @ 83F5EF0 - .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scr_tool.c" - - .align 2 -gUnknown_83F5F24:: @ 83F5F24 - .asciz "0" - -gUnknown_83F5F26:: @ 83F5F26 - .incbin "baserom.gba", 0x3F5F26, 0x2A - -gUnknown_83F5F50:: @ 83F5F50 - .incbin "baserom.gba", 0x3F5F50, 0x160 - -gUnknown_83F60B0:: @ 83F60B0 - .incbin "baserom.gba", 0x3F60B0, 0x20 - -gUnknown_83F60D0:: @ 83F60D0 - .incbin "baserom.gba", 0x3F60D0, 0x100 - -gUnknown_83F61D0:: @ 83F61D0 - .incbin "baserom.gba", 0x3F61D0, 0x20 - -gUnknown_83F61F0:: @ 83F61F0 - .incbin "baserom.gba", 0x3F61F0, 0xB - -gUnknown_83F61FB:: @ 83F61FB - .incbin "baserom.gba", 0x3F61FB, 0x8 - -gUnknown_83F6203:: @ 83F6203 - .incbin "baserom.gba", 0x3F6203, 0x3 - -gUnknown_83F6206:: @ 83F6206 - .incbin "baserom.gba", 0x3F6206, 0x160 - -gUnknown_83F6366:: @ 83F6366 - .incbin "baserom.gba", 0x3F6366, 0x16 - -gUnknown_83F637C:: @ 83F637C - .incbin "baserom.gba", 0x3F637C, 0xC - .section .rodata.83F6C90 gUnknown_83F6C90:: @ 83F6C90 .incbin "baserom.gba", 0x3F6C90, 0x20 diff --git a/data/data_8471F00.s b/data/data_8471F00.s index bd77774a9..82d507ea1 100644 --- a/data/data_8471F00.s +++ b/data/data_8471F00.s @@ -342,7 +342,7 @@ gUnknown_84827B4:: @ 84827B4 .include "data/text/move_descriptions.inc" .align 2, 0 -gUnknown_84886E8:: @ 84886E8 +gMoveDescriptionPointers:: @ 84886E8 .4byte gMoveDescription_Pound .4byte gMoveDescription_KarateChop .4byte gMoveDescription_DoubleSlap diff --git a/data/event_scripts.s b/data/event_scripts.s index 66ae76910..8762619db 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -15,6 +15,7 @@ #include "constants/map_objects.h" #include "constants/fame_checker.h" #include "constants/seagallop.h" +#include "constants/game_stat.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .set FALSE, 0 @@ -227,7 +228,7 @@ gStdScriptsEnd:: .include "data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc" .include "data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc" .include "data/maps/ThreeIsland_DunsparceTunnel/scripts.inc" - .include "data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc" + .include "data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc" .include "data/maps/NavelRock_1F/scripts.inc" .include "data/maps/NavelRock_Summit/scripts.inc" .include "data/maps/NavelRock_Base/scripts.inc" @@ -583,7 +584,7 @@ gStdScriptsEnd:: .include "data/maps/FiveIsland_LostCave_Room4/text.inc" .include "data/maps/FiveIsland_LostCave_Room10/text.inc" .include "data/maps/ThreeIsland_DunsparceTunnel/text.inc" - .include "data/maps/SevenIsland_SeavaultCanyon_TanobyKey/text.inc" + .include "data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc" .include "data/maps/OneIsland_KindleRoad_EmberSpa/text.inc" .include "data/maps/PalletTown/text.inc" .include "data/maps/ViridianCity/text.inc" @@ -897,7 +898,7 @@ EventScript_DoTrainerBattle:: @ 81A4F21 EventScript_TryDoRematchBattle:: @ 81A4F3E call EventScript_1A4FBA - specialvar VAR_RESULT, sub_810CEB4 + specialvar VAR_RESULT, ScrSpecial_GetTrainerEyeRematchFlag compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1A4F72 special SetUpTrainerEncounterMusic @@ -917,7 +918,7 @@ EventScript_1A4F72:: @ 81A4F72 ontrainerbattleend EventScript_TryDoDoubleRematchBattle:: @ 81A4F73 - specialvar VAR_RESULT, sub_810CEB4 + specialvar VAR_RESULT, ScrSpecial_GetTrainerEyeRematchFlag compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1A4FB0 special CheckForAlivePartyMons @@ -1599,7 +1600,7 @@ EventScript_1A6578:: @ 81A6578 end EventScript_1A65B8:: @ 81A65B8 - incrementgamestat 15 + incrementgamestat GAME_STAT_USED_POKECENTER message Text_1A54E1 waitmessage call EventScript_1A65CE @@ -1618,7 +1619,7 @@ EventScript_1A65CE:: @ 81A65CE return EventScript_1A65EC:: @ 81A65EC - specialvar VAR_RESULT, sub_80CD074 + specialvar VAR_RESULT, Special_PlayerIsNotInTrainerTowerLobby compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1A661D specialvar VAR_RESULT, sp182_move_string @@ -1797,7 +1798,7 @@ gStdScript_1:: @ 81A67B3 EventScript_1A67EE:: @ 81A67EE removeobject VAR_LAST_TALKED additem VAR_0x8004, VAR_0x8005 - specialvar VAR_RESULT, sub_80CC8CC + specialvar VAR_RESULT, Special_ItemIsTM_GetMoveName copyvar VAR_0x8008, VAR_RESULT compare_var_to_value VAR_0x8008, 1 call_if eq, EventScript_1A6821 @@ -1922,7 +1923,7 @@ gUnknown_81A6955:: @ 81A6955 setvar VAR_0x8004, 27 special Special_SetSomeVariable setvar VAR_0x8004, 0 - special sub_80CA86C + special Special_AnimatePcTurnOn playse SE_PC_ON msgbox Text_1A5075 goto EventScript_1A6998 @@ -1954,7 +1955,7 @@ EventScript_1A69A8:: @ 81A69A8 EventScript_1A69F0:: @ 81A69F0 playse SE_PC_LOGIN msgbox Text_1A50DD - special sub_80EB6FC + special PlayerPC waitstate goto EventScript_1A6998 end @@ -1966,7 +1967,7 @@ EventScript_1A6A05:: @ 81A6A05 checkflag FLAG_SYS_NOT_SOMEONES_PC call_if TRUE, EventScript_1A6A3D msgbox Text_1A50BE - special sub_808C6A8 + special ShowPokemonStorageSystem waitstate setvar VAR_0x8004, 27 special Special_SetSomeVariable @@ -1984,7 +1985,7 @@ EventScript_1A6A3D:: @ 81A6A3D EventScript_1A6A46:: @ 81A6A46 setvar VAR_0x8004, 0 playse SE_PC_OFF - special sub_80CA9A8 + special Special_AnimatePcTurnOff special sub_812B35C releaseall end @@ -2169,7 +2170,7 @@ gUnknown_81A6C32:: @ 81A6C32 compare_var_to_value VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 fadescreen 1 - special sub_80CA7EC + special Special_TownMap waitstate releaseall end @@ -2319,7 +2320,7 @@ EventScript_1A73AD:: @ 81A73AD EventScript_1A73B6:: @ 81A73B6 copyvar VAR_0x8004, VAR_0x8009 - special sub_80CA524 + special Special_GetProfOaksRatingMessage waitmessage compare_var_to_value VAR_RESULT, 0 call_if eq, EventScript_1A73D8 @@ -2410,7 +2411,7 @@ EventScript_1A74B7:: @ 81A74B7 setvar VAR_0x8005, 1 setvar VAR_0x8006, 8 setvar VAR_0x8007, 5 - special sub_80CAC28 + special Special_ShakeScreen waitstate releaseall end @@ -2500,7 +2501,7 @@ Movement_1A75D3:: @ 81A75D3 step_end EventScript_1A75D5:: @ 81A75D5 - special sub_80CC974 + special Special_PokemonLeagueLightingEffect return Movement_1A75D9:: @ 81A75D9 @@ -2704,7 +2705,7 @@ gUnknown_81A7702:: @ 81A7702 call EventScript_1A6AC0 lock faceplayer - specialvar VAR_0x8008, sub_80CC4D4 + specialvar VAR_0x8008, Special_GetMartClerkObjectId textcolor 0 compare_var_to_value VAR_0x8004, 0 goto_if eq, EventScript_1A774D @@ -3894,7 +3895,7 @@ EventScript_1A8C9B:: @ 81A8C9B EventScript_1A8CAD:: @ 81A8CAD copyvar VAR_0x8004, VAR_0x8008 - specialvar VAR_RESULT, sub_8053A9C + specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT return @@ -3908,15 +3909,15 @@ EventScript_1A8CBD:: @ 81A8CBD EventScript_1A8CC9:: @ 81A8CC9 copyvar VAR_0x8005, VAR_0x800A - specialvar VAR_RESULT, sub_8053D2C + specialvar VAR_RESULT, GetTradeSpecies copyvar VAR_0x800B, VAR_RESULT return EventScript_1A8CD9:: @ 81A8CD9 copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A - special sub_8053D68 - special sub_8054440 + special CreateInGameTradePokemon + special DoInGameTradeScene waitstate lock faceplayer @@ -4113,7 +4114,7 @@ EventScript_1A8E4D:: @ 81A8E4D special sub_807F0B0 waitstate fadescreen 1 - special sub_80CA3C4 + special sp0C8_whiteout_maybe waitstate end @@ -4392,12 +4393,12 @@ EventScript_1A925E:: @ 81A925E doweather return -EventScript_1A926C:: @ 81A926C - special sub_80CD098 +EventScript_BrailleCursorWaitButton:: @ 81A926C + special Special_BrailleCursorToggle waitbuttonpress playse SE_SELECT setvar VAR_0x8006, 1 - special sub_80CD098 + special Special_BrailleCursorToggle return EventScript_1A927C:: @ 81A927C @@ -4525,7 +4526,7 @@ gUnknown_81A93C0:: @ 81A93C0 Route3_EventScript_1A93C9:: @ 81A93C9 trainerbattle 0, TRAINER_YOUNGSTER_BEN, 0, Text_183560, Text_1835A0 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A93F0 msgbox Text_1835B4, 6 @@ -4538,7 +4539,7 @@ EventScript_1A93F0:: @ 81A93F0 Route3_EventScript_1A9407:: @ 81A9407 trainerbattle 0, TRAINER_YOUNGSTER_CALVIN, 0, Text_183786, Text_1837BD - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A942E msgbox Text_1837CF, 6 @@ -4551,7 +4552,7 @@ EventScript_1A942E:: @ 81A942E Route3_EventScript_1A9445:: @ 81A9445 trainerbattle 0, TRAINER_BUG_CATCHER_COLTON, 0, Text_1834E6, Text_183509 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A946C msgbox Text_18351C, 6 @@ -4564,7 +4565,7 @@ EventScript_1A946C:: @ 81A946C Route3_EventScript_1A9483:: @ 81A9483 trainerbattle 0, TRAINER_BUG_CATCHER_GREG, 0, Text_183682, Text_1836B3 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A94AA msgbox Text_1836D9, 6 @@ -4577,7 +4578,7 @@ EventScript_1A94AA:: @ 81A94AA Route3_EventScript_1A94C1:: @ 81A94C1 trainerbattle 0, TRAINER_BUG_CATCHER_JAMES, 0, Text_183807, Text_183837 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A94E8 msgbox Text_183849, 6 @@ -4590,7 +4591,7 @@ EventScript_1A94E8:: @ 81A94E8 Route3_EventScript_1A94FF:: @ 81A94FF trainerbattle 0, TRAINER_LASS_JANICE, 0, Text_183616, Text_18363F - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9526 msgbox Text_18364C, 6 @@ -4603,7 +4604,7 @@ EventScript_1A9526:: @ 81A9526 Route3_EventScript_1A953D:: @ 81A953D trainerbattle 0, TRAINER_LASS_SALLY, 0, Text_18371B, Text_183746 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9564 msgbox Text_18374F, 6 @@ -4616,7 +4617,7 @@ EventScript_1A9564:: @ 81A9564 Route3_EventScript_1A957B:: @ 81A957B trainerbattle 0, TRAINER_LASS_ROBIN, 0, Text_18387A, Text_183891 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A95A2 msgbox Text_18389C, 6 @@ -4629,7 +4630,7 @@ EventScript_1A95A2:: @ 81A95A2 Route4_EventScript_1A95B9:: @ 81A95B9 trainerbattle 0, TRAINER_LASS_CRISSY, 0, Text_183906, Text_183938 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A95E0 msgbox Text_183957, 6 @@ -4642,7 +4643,7 @@ EventScript_1A95E0:: @ 81A95E0 Route24_EventScript_1A95F7:: @ 81A95F7 trainerbattle 0, TRAINER_YOUNGSTER_TIMMY, 0, Text_188F76, Text_188F95 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A961E msgbox Text_188FA7, 6 @@ -4655,7 +4656,7 @@ EventScript_1A961E:: @ 81A961E Route24_EventScript_1A9635:: @ 81A9635 trainerbattle 0, TRAINER_BUG_CATCHER_CALE, 0, Text_18901B, Text_18908C - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A965C msgbox Text_18909E, 6 @@ -4668,7 +4669,7 @@ EventScript_1A965C:: @ 81A965C Route24_EventScript_1A9673:: @ 81A9673 trainerbattle 0, TRAINER_LASS_RELI, 0, Text_188F2C, Text_188F46 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A969A msgbox Text_188F53, 6 @@ -4681,7 +4682,7 @@ EventScript_1A969A:: @ 81A969A Route24_EventScript_1A96B1:: @ 81A96B1 trainerbattle 0, TRAINER_LASS_ALI, 0, Text_188FC9, Text_188FE7 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A96D8 msgbox Text_188FF9, 6 @@ -4694,7 +4695,7 @@ EventScript_1A96D8:: @ 81A96D8 Route24_EventScript_1A96EF:: @ 81A96EF trainerbattle 0, TRAINER_CAMPER_SHANE, 0, Text_188E74, Text_188E94 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9716 msgbox Text_188EA3, 6 @@ -4707,7 +4708,7 @@ EventScript_1A9716:: @ 81A9716 Route24_EventScript_1A972D:: @ 81A972D trainerbattle 0, TRAINER_CAMPER_ETHAN, 0, Text_188ED9, Text_188EFA - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9754 msgbox Text_188F0A, 6 @@ -4720,7 +4721,7 @@ EventScript_1A9754:: @ 81A9754 Route25_EventScript_1A976B:: @ 81A976B trainerbattle 0, TRAINER_YOUNGSTER_JOEY, 0, Text_1890C0, Text_1890E6 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9792 msgbox Text_1890F5, 6 @@ -4733,7 +4734,7 @@ EventScript_1A9792:: @ 81A9792 Route25_EventScript_1A97A9:: @ 81A97A9 trainerbattle 0, TRAINER_YOUNGSTER_DAN, 0, Text_189165, Text_1891A6 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A97D0 msgbox Text_1891B3, 6 @@ -4746,7 +4747,7 @@ EventScript_1A97D0:: @ 81A97D0 Route25_EventScript_1A97E7:: @ 81A97E7 trainerbattle 0, TRAINER_YOUNGSTER_CHAD, 0, Text_1892A9, Text_1892D9 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A980E msgbox Text_1892EF, 6 @@ -4759,7 +4760,7 @@ EventScript_1A980E:: @ 81A980E Route25_EventScript_1A9825:: @ 81A9825 trainerbattle 0, TRAINER_PICNICKER_KELSEY, 0, Text_189247, Text_189261 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A984C msgbox Text_189281, 6 @@ -4772,7 +4773,7 @@ EventScript_1A984C:: @ 81A984C Route25_EventScript_1A9863:: @ 81A9863 trainerbattle 0, TRAINER_LASS_HALEY, 0, Text_189333, Text_189364 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A988A msgbox Text_189378, 6 @@ -4785,7 +4786,7 @@ EventScript_1A988A:: @ 81A988A Route25_EventScript_1A98A1:: @ 81A98A1 trainerbattle 0, TRAINER_HIKER_FRANKLIN, 0, Text_1893A7, Text_1893EA - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A98C8 msgbox Text_1893FB, 6 @@ -4798,7 +4799,7 @@ EventScript_1A98C8:: @ 81A98C8 Route25_EventScript_1A98DF:: @ 81A98DF trainerbattle 0, TRAINER_HIKER_NOB, 0, Text_189423, Text_189459 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9906 msgbox Text_18947E, 6 @@ -4811,7 +4812,7 @@ EventScript_1A9906:: @ 81A9906 Route25_EventScript_1A991D:: @ 81A991D trainerbattle 0, TRAINER_HIKER_WAYNE, 0, Text_1894DE, Text_18950A - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9944 msgbox Text_18951C, 6 @@ -4824,7 +4825,7 @@ EventScript_1A9944:: @ 81A9944 Route25_EventScript_1A995B:: @ 81A995B trainerbattle 0, TRAINER_CAMPER_FLINT, 0, Text_1891EB, Text_189212 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9982 msgbox Text_18921D, 6 @@ -4837,7 +4838,7 @@ EventScript_1A9982:: @ 81A9982 Route6_EventScript_1A9999:: @ 81A9999 trainerbattle 0, TRAINER_BUG_CATCHER_KEIGO, 0, Text_183E9F, Text_183EC0 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A99C0 msgbox Text_183ED4, 6 @@ -4850,7 +4851,7 @@ EventScript_1A99C0:: @ 81A99C0 Route6_EventScript_1A99D7:: @ 81A99D7 trainerbattle 0, TRAINER_BUG_CATCHER_ELIJAH, 0, Text_183FF0, Text_18401A - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A99FE msgbox Text_18402B, 6 @@ -4863,7 +4864,7 @@ EventScript_1A99FE:: @ 81A99FE Route6_EventScript_1A9A15:: @ 81A9A15 trainerbattle 0, TRAINER_CAMPER_RICKY, 0, Text_183E04, Text_183E2A - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9A3C msgbox Text_183E3C, 6 @@ -4876,7 +4877,7 @@ EventScript_1A9A3C:: @ 81A9A3C Route6_EventScript_1A9A53:: @ 81A9A53 trainerbattle 0, TRAINER_CAMPER_JEFF, 0, Text_183F07, Text_183F24 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9A7A msgbox Text_183F51, 6 @@ -4889,7 +4890,7 @@ EventScript_1A9A7A:: @ 81A9A7A Route6_EventScript_1A9A91:: @ 81A9A91 trainerbattle 0, TRAINER_PICNICKER_NANCY, 0, Text_183E4E, Text_183E79 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9AB8 msgbox Text_183E8D, 6 @@ -4902,7 +4903,7 @@ EventScript_1A9AB8:: @ 81A9AB8 Route6_EventScript_1A9ACF:: @ 81A9ACF trainerbattle 0, TRAINER_PICNICKER_ISABELLE, 0, Text_183F90, Text_183FAB - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9AF6 msgbox Text_183FC4, 6 @@ -4915,7 +4916,7 @@ EventScript_1A9AF6:: @ 81A9AF6 Route11_EventScript_1A9B0D:: @ 81A9B0D trainerbattle 0, TRAINER_YOUNGSTER_EDDIE, 0, Text_184FBD, Text_184FD8 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9B34 msgbox Text_184FEF, 6 @@ -4928,7 +4929,7 @@ EventScript_1A9B34:: @ 81A9B34 Route11_EventScript_1A9B4B:: @ 81A9B4B trainerbattle 0, TRAINER_YOUNGSTER_DILLON, 0, Text_18506A, Text_18509B - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9B72 msgbox Text_1850CF, 6 @@ -4941,7 +4942,7 @@ EventScript_1A9B72:: @ 81A9B72 Route11_EventScript_1A9B89:: @ 81A9B89 trainerbattle 0, TRAINER_YOUNGSTER_YASU, 0, Text_18517B, Text_1851AC - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9BB0 msgbox Text_1851D2, 6 @@ -4954,7 +4955,7 @@ EventScript_1A9BB0:: @ 81A9BB0 Route11_EventScript_1A9BC7:: @ 81A9BC7 trainerbattle 0, TRAINER_YOUNGSTER_DAVE, 0, Text_185285, Text_1852C1 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9BEE msgbox Text_1852E3, 6 @@ -4967,7 +4968,7 @@ EventScript_1A9BEE:: @ 81A9BEE Route11_EventScript_1A9C05:: @ 81A9C05 trainerbattle 0, TRAINER_ENGINEER_BRAXTON, 0, Text_185011, Text_185037 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9C2C msgbox Text_18504A, 6 @@ -4980,7 +4981,7 @@ EventScript_1A9C2C:: @ 81A9C2C Route11_EventScript_1A9C43:: @ 81A9C43 trainerbattle 0, TRAINER_ENGINEER_BERNIE, 0, Text_185236, Text_185250 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9C6A msgbox Text_185266, 6 @@ -4993,7 +4994,7 @@ EventScript_1A9C6A:: @ 81A9C6A Route11_EventScript_1A9C81:: @ 81A9C81 trainerbattle 0, TRAINER_GAMER_HUGO, 0, Text_184F01, Text_184F15 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9CA8 msgbox Text_184F2E, 6 @@ -5006,7 +5007,7 @@ EventScript_1A9CA8:: @ 81A9CA8 Route11_EventScript_1A9CBF:: @ 81A9CBF trainerbattle 0, TRAINER_GAMER_JASPER, 0, Text_184F5D, Text_184F7E - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9CE6 msgbox Text_184F8E, 6 @@ -5019,7 +5020,7 @@ EventScript_1A9CE6:: @ 81A9CE6 Route11_EventScript_1A9CFD:: @ 81A9CFD trainerbattle 0, TRAINER_GAMER_DIRK, 0, Text_1850E9, Text_185105 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9D24 msgbox Text_185114, 6 @@ -5032,7 +5033,7 @@ EventScript_1A9D24:: @ 81A9D24 Route11_EventScript_1A9D3B:: @ 81A9D3B trainerbattle 0, TRAINER_GAMER_DARIAN, 0, Text_185135, Text_18514E - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9D62 msgbox Text_185161, 6 @@ -5045,7 +5046,7 @@ EventScript_1A9D62:: @ 81A9D62 Route9_EventScript_1A9D79:: @ 81A9D79 trainerbattle 0, TRAINER_BUG_CATCHER_BRENT, 0, Text_184A2F, Text_184A6A - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9DA0 msgbox Text_184A8C, 6 @@ -5058,7 +5059,7 @@ EventScript_1A9DA0:: @ 81A9DA0 Route9_EventScript_1A9DB7:: @ 81A9DB7 trainerbattle 0, TRAINER_BUG_CATCHER_CONNER, 0, Text_184B18, Text_184B32 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9DDE msgbox Text_184B3B, 6 @@ -5071,7 +5072,7 @@ EventScript_1A9DDE:: @ 81A9DDE Route9_EventScript_1A9DF5:: @ 81A9DF5 trainerbattle 0, TRAINER_CAMPER_CHRIS, 0, Text_184844, Text_18487E - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9E1C msgbox Text_184890, 6 @@ -5084,7 +5085,7 @@ EventScript_1A9E1C:: @ 81A9E1C Route9_EventScript_1A9E33:: @ 81A9E33 trainerbattle 0, TRAINER_CAMPER_DREW, 0, Text_18489E, Text_1848CC - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9E5A msgbox Text_1848DE, 6 @@ -5097,7 +5098,7 @@ EventScript_1A9E5A:: @ 81A9E5A Route9_EventScript_1A9E71:: @ 81A9E71 trainerbattle 0, TRAINER_PICNICKER_ALICIA, 0, Text_1847B7, Text_1847DF - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9E98 msgbox Text_1847F0, 6 @@ -5110,7 +5111,7 @@ EventScript_1A9E98:: @ 81A9E98 Route9_EventScript_1A9EAF:: @ 81A9EAF trainerbattle 0, TRAINER_PICNICKER_CAITLIN, 0, Text_1848FF, Text_18491C - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9ED6 msgbox Text_184931, 6 @@ -5123,7 +5124,7 @@ EventScript_1A9ED6:: @ 81A9ED6 Route9_EventScript_1A9EED:: @ 81A9EED trainerbattle 0, TRAINER_HIKER_ALAN, 0, Text_184ABE, Text_184AD5 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9F14 msgbox Text_184AF1, 6 @@ -5136,7 +5137,7 @@ EventScript_1A9F14:: @ 81A9F14 Route9_EventScript_1A9F2B:: @ 81A9F2B trainerbattle 0, TRAINER_HIKER_BRICE, 0, Text_1849DF, Text_184A04 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9F52 msgbox Text_184A11, 6 @@ -5149,7 +5150,7 @@ EventScript_1A9F52:: @ 81A9F52 Route9_EventScript_1A9F69:: @ 81A9F69 trainerbattle 0, TRAINER_HIKER_JEREMY, 0, Text_18495E, Text_18497F - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9F90 msgbox Text_1849B0, 6 @@ -5162,7 +5163,7 @@ EventScript_1A9F90:: @ 81A9F90 Route10_EventScript_1A9FA7:: @ 81A9FA7 trainerbattle 0, TRAINER_PICNICKER_HEIDI, 0, Text_184CF1, Text_184D31 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A9FCE msgbox Text_184D4D, 6 @@ -5175,7 +5176,7 @@ EventScript_1A9FCE:: @ 81A9FCE Route10_EventScript_1A9FE5:: @ 81A9FE5 trainerbattle 0, TRAINER_PICNICKER_CAROL, 0, Text_184E04, Text_184E3B - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA00C msgbox Text_184E5E, 6 @@ -5188,7 +5189,7 @@ EventScript_1AA00C:: @ 81AA00C Route10_EventScript_1AA023:: @ 81AA023 trainerbattle 0, TRAINER_POKEMANIAC_MARK, 0, Text_184B8A, Text_184BE5 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA04A msgbox Text_184BFB, 6 @@ -5201,7 +5202,7 @@ EventScript_1AA04A:: @ 81AA04A Route10_EventScript_1AA061:: @ 81AA061 trainerbattle 0, TRAINER_POKEMANIAC_HERMAN, 0, Text_184C86, Text_184CA7 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA088 msgbox Text_184CBB, 6 @@ -5214,7 +5215,7 @@ EventScript_1AA088:: @ 81AA088 Route10_EventScript_1AA09F:: @ 81AA09F trainerbattle 0, TRAINER_HIKER_CLARK, 0, Text_184C1D, Text_184C2D - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA0C6 msgbox Text_184C60, 6 @@ -5227,7 +5228,7 @@ EventScript_1AA0C6:: @ 81AA0C6 Route10_EventScript_1AA0DD:: @ 81AA0DD trainerbattle 0, TRAINER_HIKER_TRENT, 0, Text_184DAA, Text_184DCE - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA104 msgbox Text_184DE4, 6 @@ -5240,7 +5241,7 @@ EventScript_1AA104:: @ 81AA104 Route8_EventScript_1AA11B:: @ 81AA11B trainerbattle 0, TRAINER_LASS_PAIGE, 0, Text_1841ED, Text_184210 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA142 msgbox Text_18421B, 6 @@ -5253,7 +5254,7 @@ EventScript_1AA142:: @ 81AA142 Route8_EventScript_1AA159:: @ 81AA159 trainerbattle 0, TRAINER_LASS_ANDREA, 0, Text_184321, Text_184346 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA180 msgbox Text_184350, 6 @@ -5266,7 +5267,7 @@ EventScript_1AA180:: @ 81AA180 Route8_EventScript_1AA197:: @ 81AA197 trainerbattle 0, TRAINER_LASS_MEGAN, 0, Text_18437A, Text_1843A6 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA1BE msgbox Text_1843D2, 6 @@ -5279,7 +5280,7 @@ EventScript_1AA1BE:: @ 81AA1BE Route8_EventScript_1AA1D5:: @ 81AA1D5 trainerbattle 0, TRAINER_LASS_JULIA, 0, Text_1844AC, Text_1844D6 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA1FC msgbox Text_1844FD, 6 @@ -5292,7 +5293,7 @@ EventScript_1AA1FC:: @ 81AA1FC Route8_EventScript_1AA213:: @ 81AA213 trainerbattle 0, TRAINER_SUPER_NERD_AIDAN, 0, Text_1840C5, Text_184100 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA23A msgbox Text_18410E, 6 @@ -5305,7 +5306,7 @@ EventScript_1AA23A:: @ 81AA23A Route8_EventScript_1AA251:: @ 81AA251 trainerbattle 0, TRAINER_SUPER_NERD_GLENN, 0, Text_18417C, Text_1841B6 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA278 msgbox Text_1841C8, 6 @@ -5318,7 +5319,7 @@ EventScript_1AA278:: @ 81AA278 Route8_EventScript_1AA28F:: @ 81AA28F trainerbattle 0, TRAINER_SUPER_NERD_LESLIE, 0, Text_184257, Text_18427A - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA2B6 msgbox Text_1842B3, 6 @@ -5331,7 +5332,7 @@ EventScript_1AA2B6:: @ 81AA2B6 Route8_EventScript_1AA2CD:: @ 81AA2CD trainerbattle 0, TRAINER_GAMER_STAN, 0, Text_18412F, Text_18414D - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA2F4 msgbox Text_184162, 6 @@ -5344,7 +5345,7 @@ EventScript_1AA2F4:: @ 81AA2F4 Route8_EventScript_1AA30B:: @ 81AA30B trainerbattle 0, TRAINER_GAMER_RICH, 0, Text_184432, Text_18444F - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA332 msgbox Text_184466, 6 @@ -5357,7 +5358,7 @@ EventScript_1AA332:: @ 81AA332 Route8_EventScript_1AA349:: @ 81AA349 trainerbattle 4, TRAINER_TWINS_ELI_ANNE, 0, Text_1845A4, Text_1845D0, Text_184616 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA374 msgbox Text_1845F2, 6 @@ -5370,7 +5371,7 @@ EventScript_1AA374:: @ 81AA374 Route8_EventScript_1AA38F:: @ 81AA38F trainerbattle 4, TRAINER_TWINS_ELI_ANNE, 0, Text_18464A, Text_184675, Text_1846AF - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA3BA msgbox Text_18468B, 6 @@ -5383,7 +5384,7 @@ EventScript_1AA3BA:: @ 81AA3BA Route8_EventScript_1AA3D5:: @ 81AA3D5 trainerbattle 0, TRAINER_BIKER_RICARDO, 0, Text_1846E2, Text_1846FC - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA3FC msgbox Text_184719, 6 @@ -5396,7 +5397,7 @@ EventScript_1AA3FC:: @ 81AA3FC Route8_EventScript_1AA413:: @ 81AA413 trainerbattle 0, TRAINER_BIKER_JAREN, 0, Text_184742, Text_184767 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA43A msgbox Text_18477A, 6 @@ -5409,7 +5410,7 @@ EventScript_1AA43A:: @ 81AA43A Route12_EventScript_1AA451:: @ 81AA451 trainerbattle 0, TRAINER_FISHERMAN_NED, 0, Text_185402, Text_18541B - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA478 msgbox Text_185432, 6 @@ -5422,7 +5423,7 @@ EventScript_1AA478:: @ 81AA478 Route12_EventScript_1AA48F:: @ 81AA48F trainerbattle 0, TRAINER_FISHERMAN_CHIP, 0, Text_18544E, Text_185475 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA4B6 msgbox Text_185488, 6 @@ -5435,7 +5436,7 @@ EventScript_1AA4B6:: @ 81AA4B6 Route12_EventScript_1AA4CD:: @ 81AA4CD trainerbattle 0, TRAINER_FISHERMAN_HANK, 0, Text_1855E1, Text_185606 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA4F4 msgbox Text_185616, 6 @@ -5448,7 +5449,7 @@ EventScript_1AA4F4:: @ 81AA4F4 Route12_EventScript_1AA50B:: @ 81AA50B trainerbattle 0, TRAINER_FISHERMAN_ELLIOT, 0, Text_185682, Text_1856D0 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA532 msgbox Text_1856DF, 6 @@ -5461,7 +5462,7 @@ EventScript_1AA532:: @ 81AA532 Route12_EventScript_1AA549:: @ 81AA549 trainerbattle 0, TRAINER_FISHERMAN_ANDREW, 0, Text_18570E, Text_185744 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA570 msgbox Text_18574D, 6 @@ -5474,7 +5475,7 @@ EventScript_1AA570:: @ 81AA570 Route12_EventScript_1AA587:: @ 81AA587 trainerbattle 0, TRAINER_ROCKER_LUCA, 0, Text_185547, Text_18559B - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA5AE msgbox Text_1855A6, 6 @@ -5487,7 +5488,7 @@ EventScript_1AA5AE:: @ 81AA5AE Route12_EventScript_1AA5C5:: @ 81AA5C5 trainerbattle 0, TRAINER_CAMPER_JUSTIN, 0, Text_1854B9, Text_1854ED - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA5EC msgbox Text_1854F2, 6 @@ -5500,7 +5501,7 @@ EventScript_1AA5EC:: @ 81AA5EC Route12_EventScript_1AA603:: @ 81AA603 trainerbattle 4, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1857C5, Text_1857F1, Text_185842 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA62E msgbox Text_18581F, 6 @@ -5513,7 +5514,7 @@ EventScript_1AA62E:: @ 81AA62E Route12_EventScript_1AA649:: @ 81AA649 trainerbattle 4, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1858A6, Text_1858D0, Text_185908 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA674 msgbox Text_1858E2, 6 @@ -5526,7 +5527,7 @@ EventScript_1AA674:: @ 81AA674 Route13_EventScript_1AA68F:: @ 81AA68F trainerbattle 0, TRAINER_BIKER_JARED, 0, Text_185D05, Text_185D1D - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA6B6 msgbox Text_185D33, 6 @@ -5539,7 +5540,7 @@ EventScript_1AA6B6:: @ 81AA6B6 Route13_EventScript_1AA6CD:: @ 81AA6CD trainerbattle 0, TRAINER_BEAUTY_LOLA, 0, Text_185BFC, Text_185C1F - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA6F4 msgbox Text_185C35, 6 @@ -5552,7 +5553,7 @@ EventScript_1AA6F4:: @ 81AA6F4 Route13_EventScript_1AA70B:: @ 81AA70B trainerbattle 0, TRAINER_BEAUTY_SHEILA, 0, Text_185C69, Text_185C95 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA732 msgbox Text_185CA8, 6 @@ -5565,7 +5566,7 @@ EventScript_1AA732:: @ 81AA732 Route13_EventScript_1AA749:: @ 81AA749 trainerbattle 0, TRAINER_BIRD_KEEPER_SEBASTIAN, 0, Text_185955, Text_18597E - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA770 msgbox Text_1859A2, 6 @@ -5578,7 +5579,7 @@ EventScript_1AA770:: @ 81AA770 Route13_EventScript_1AA787:: @ 81AA787 trainerbattle 0, TRAINER_BIRD_KEEPER_PERRY, 0, Text_185B8F, Text_185BCA - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA7AE msgbox Text_185BDB, 6 @@ -5591,7 +5592,7 @@ EventScript_1AA7AE:: @ 81AA7AE Route13_EventScript_1AA7C5:: @ 81AA7C5 trainerbattle 0, TRAINER_BIRD_KEEPER_ROBERT, 0, Text_185D3D, Text_185D7B - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA7EC msgbox Text_185D89, 6 @@ -5604,7 +5605,7 @@ EventScript_1AA7EC:: @ 81AA7EC Route13_EventScript_1AA803:: @ 81AA803 trainerbattle 0, TRAINER_PICNICKER_ALMA, 0, Text_185B12, Text_185B48 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA82A msgbox Text_185B67, 6 @@ -5617,7 +5618,7 @@ EventScript_1AA82A:: @ 81AA82A Route13_EventScript_1AA841:: @ 81AA841 trainerbattle 0, TRAINER_PICNICKER_SUSIE, 0, Text_1859CF, Text_1859EC - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA868 msgbox Text_1859F9, 6 @@ -5630,7 +5631,7 @@ EventScript_1AA868:: @ 81AA868 Route13_EventScript_1AA87F:: @ 81AA87F trainerbattle 0, TRAINER_PICNICKER_VALERIE, 0, Text_185A37, Text_185A56 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA8A6 msgbox Text_185A62, 6 @@ -5643,7 +5644,7 @@ EventScript_1AA8A6:: @ 81AA8A6 Route13_EventScript_1AA8BD:: @ 81AA8BD trainerbattle 0, TRAINER_PICNICKER_GWEN, 0, Text_185A91, Text_185AC1 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA8E4 msgbox Text_185ADE, 6 @@ -5656,7 +5657,7 @@ EventScript_1AA8E4:: @ 81AA8E4 Route14_EventScript_1AA8FB:: @ 81AA8FB trainerbattle 0, TRAINER_BIKER_MALIK, 0, Text_186344, Text_186362 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA922 msgbox Text_18636E, 6 @@ -5669,7 +5670,7 @@ EventScript_1AA922:: @ 81AA922 Route14_EventScript_1AA939:: @ 81AA939 trainerbattle 0, TRAINER_BIKER_LUKAS, 0, Text_1861F7, Text_186223 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA960 msgbox Text_186239, 6 @@ -5682,7 +5683,7 @@ EventScript_1AA960:: @ 81AA960 Route14_EventScript_1AA977:: @ 81AA977 trainerbattle 0, TRAINER_BIKER_ISAAC, 0, Text_186263, Text_186291 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA99E msgbox Text_18629D, 6 @@ -5695,7 +5696,7 @@ EventScript_1AA99E:: @ 81AA99E Route14_EventScript_1AA9B5:: @ 81AA9B5 trainerbattle 0, TRAINER_BIKER_GERALD, 0, Text_1862BD, Text_1862EF - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AA9DC msgbox Text_1862F8, 6 @@ -5708,7 +5709,7 @@ EventScript_1AA9DC:: @ 81AA9DC Route14_EventScript_1AA9F3:: @ 81AA9F3 trainerbattle 0, TRAINER_BIRD_KEEPER_DONALD, 0, Text_1860D9, Text_18610A - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AAA1A msgbox Text_18611D, 6 @@ -5721,7 +5722,7 @@ EventScript_1AAA1A:: @ 81AAA1A Route14_EventScript_1AAA31:: @ 81AAA31 trainerbattle 0, TRAINER_BIRD_KEEPER_BENNY, 0, Text_18618E, Text_1861B3 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AAA58 msgbox Text_1861BE, 6 @@ -5734,7 +5735,7 @@ EventScript_1AAA58:: @ 81AAA58 Route14_EventScript_1AAA6F:: @ 81AAA6F trainerbattle 0, TRAINER_BIRD_KEEPER_CARTER, 0, Text_185E4D, Text_185E81 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AAA96 msgbox Text_185E9C, 6 @@ -5747,7 +5748,7 @@ EventScript_1AAA96:: @ 81AAA96 Route14_EventScript_1AAAAD:: @ 81AAAAD trainerbattle 0, TRAINER_BIRD_KEEPER_MITCH, 0, Text_185EDF, Text_185F0B - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AAAD4 msgbox Text_185F1A, 6 @@ -5760,7 +5761,7 @@ EventScript_1AAAD4:: @ 81AAAD4 Route14_EventScript_1AAAEB:: @ 81AAAEB trainerbattle 0, TRAINER_BIRD_KEEPER_BECK, 0, Text_185F46, Text_185FAE - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AAB12 msgbox Text_185FBB, 6 @@ -5773,7 +5774,7 @@ EventScript_1AAB12:: @ 81AAB12 Route14_EventScript_1AAB29:: @ 81AAB29 trainerbattle 0, TRAINER_BIRD_KEEPER_MARLON, 0, Text_186021, Text_18607C - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AAB50 msgbox Text_186091, 6 @@ -5786,7 +5787,7 @@ EventScript_1AAB50:: @ 81AAB50 Route14_EventScript_1AAB67:: @ 81AAB67 trainerbattle 4, TRAINER_TWINS_KIRI_JAN, 0, Text_1863B7, Text_1863EA, Text_18642E - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AAB92 msgbox Text_18640D, 6 @@ -5799,7 +5800,7 @@ EventScript_1AAB92:: @ 81AAB92 Route14_EventScript_1AABAD:: @ 81AABAD trainerbattle 4, TRAINER_TWINS_KIRI_JAN, 0, Text_18645B, Text_186487, Text_1864D3 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AABD8 msgbox Text_18649C, 6 @@ -5812,7 +5813,7 @@ EventScript_1AABD8:: @ 81AABD8 Route15_EventScript_1AABF3:: @ 81AABF3 trainerbattle 0, TRAINER_BIKER_ERNEST, 0, Text_1868B6, Text_1868E8 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AAC1A msgbox Text_1868F1, 6 @@ -5825,7 +5826,7 @@ EventScript_1AAC1A:: @ 81AAC1A Route15_EventScript_1AAC31:: @ 81AAC31 trainerbattle 0, TRAINER_BIKER_ALEX, 0, Text_186936, Text_186968 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AAC58 msgbox Text_18697C, 6 @@ -5838,7 +5839,7 @@ EventScript_1AAC58:: @ 81AAC58 Route15_EventScript_1AAC6F:: @ 81AAC6F trainerbattle 0, TRAINER_BEAUTY_GRACE, 0, Text_18678B, Text_1867C1 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AAC96 msgbox Text_1867DA, 6 @@ -5851,7 +5852,7 @@ EventScript_1AAC96:: @ 81AAC96 Route15_EventScript_1AACAD:: @ 81AACAD trainerbattle 0, TRAINER_BEAUTY_OLIVIA, 0, Text_18680C, Text_186841 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AACD4 msgbox Text_18686F, 6 @@ -5864,7 +5865,7 @@ EventScript_1AACD4:: @ 81AACD4 Route15_EventScript_1AACEB:: @ 81AACEB trainerbattle 0, TRAINER_BIRD_KEEPER_EDWIN, 0, Text_18664F, Text_18667A - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AAD12 msgbox Text_18668D, 6 @@ -5877,7 +5878,7 @@ EventScript_1AAD12:: @ 81AAD12 Route15_EventScript_1AAD29:: @ 81AAD29 trainerbattle 0, TRAINER_BIRD_KEEPER_CHESTER, 0, Text_1866D1, Text_186707 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AAD50 msgbox Text_18671A, 6 @@ -5890,7 +5891,7 @@ EventScript_1AAD50:: @ 81AAD50 Route15_EventScript_1AAD67:: @ 81AAD67 trainerbattle 0, TRAINER_PICNICKER_YAZMIN, 0, Text_186A22, Text_186A40 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AAD8E msgbox Text_186A55, 6 @@ -5903,7 +5904,7 @@ EventScript_1AAD8E:: @ 81AAD8E Route15_EventScript_1AADA5:: @ 81AADA5 trainerbattle 0, TRAINER_PICNICKER_KINDRA, 0, Text_18650B, Text_186549 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AADCC msgbox Text_18655A, 6 @@ -5916,7 +5917,7 @@ EventScript_1AADCC:: @ 81AADCC Route15_EventScript_1AADE3:: @ 81AADE3 trainerbattle 0, TRAINER_PICNICKER_BECKY, 0, Text_1865D3, Text_186612 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AAE0A msgbox Text_18661D, 6 @@ -5929,7 +5930,7 @@ EventScript_1AAE0A:: @ 81AAE0A Route15_EventScript_1AAE21:: @ 81AAE21 trainerbattle 0, TRAINER_PICNICKER_CELIA, 0, Text_1869BA, Text_1869E6 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AAE48 msgbox Text_1869F4, 6 @@ -5942,7 +5943,7 @@ EventScript_1AAE48:: @ 81AAE48 Route15_EventScript_1AAE5F:: @ 81AAE5F trainerbattle 4, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_186A95, Text_186ACB, Text_186B46 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AAE8A msgbox Text_186B0A, 6 @@ -5955,7 +5956,7 @@ EventScript_1AAE8A:: @ 81AAE8A Route15_EventScript_1AAEA5:: @ 81AAEA5 trainerbattle 4, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_186B89, Text_186BB1, Text_186BFE - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AAED0 msgbox Text_186BD2, 6 @@ -5968,7 +5969,7 @@ EventScript_1AAED0:: @ 81AAED0 Route16_EventScript_1AAEEB:: @ 81AAEEB trainerbattle 0, TRAINER_BIKER_LAO, 0, Text_186C4D, Text_186C5F - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AAF12 msgbox Text_186C75, 6 @@ -5981,7 +5982,7 @@ EventScript_1AAF12:: @ 81AAF12 Route16_EventScript_1AAF29:: @ 81AAF29 trainerbattle 0, TRAINER_BIKER_HIDEO, 0, Text_186D39, Text_186D52 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AAF50 msgbox Text_186D5A, 6 @@ -5994,7 +5995,7 @@ EventScript_1AAF50:: @ 81AAF50 Route16_EventScript_1AAF67:: @ 81AAF67 trainerbattle 0, TRAINER_BIKER_RUBEN, 0, Text_186E86, Text_186EB4 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AAF8E msgbox Text_186EC7, 6 @@ -6007,7 +6008,7 @@ EventScript_1AAF8E:: @ 81AAF8E Route16_EventScript_1AAFA5:: @ 81AAFA5 trainerbattle 0, TRAINER_CUE_BALL_KOJI, 0, Text_186CA2, Text_186CBB - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AAFCC msgbox Text_186CC5, 6 @@ -6020,7 +6021,7 @@ EventScript_1AAFCC:: @ 81AAFCC Route16_EventScript_1AAFE3:: @ 81AAFE3 trainerbattle 0, TRAINER_CUE_BALL_LUKE, 0, Text_186CE5, Text_186D06 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB00A msgbox Text_186D16, 6 @@ -6033,7 +6034,7 @@ EventScript_1AB00A:: @ 81AB00A Route16_EventScript_1AB021:: @ 81AB021 trainerbattle 0, TRAINER_CUE_BALL_CAMRON, 0, Text_186DD9, Text_186E0D - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB048 msgbox Text_186E1C, 6 @@ -6046,7 +6047,7 @@ EventScript_1AB048:: @ 81AB048 Route16_EventScript_1AB05F:: @ 81AB05F trainerbattle 4, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_186FBD, Text_186FFA, Text_187057 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB08A msgbox Text_187027, 6 @@ -6059,7 +6060,7 @@ EventScript_1AB08A:: @ 81AB08A Route16_EventScript_1AB0A5:: @ 81AB0A5 trainerbattle 4, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_187097, Text_1870CC, Text_187120 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB0D0 msgbox Text_1870F9, 6 @@ -6072,7 +6073,7 @@ EventScript_1AB0D0:: @ 81AB0D0 Route17_EventScript_1AB0EB:: @ 81AB0EB trainerbattle 0, TRAINER_BIKER_BILLY, 0, Text_1872BD, Text_1872E3 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB112 msgbox Text_1872EB, 6 @@ -6085,7 +6086,7 @@ EventScript_1AB112:: @ 81AB112 Route17_EventScript_1AB129:: @ 81AB129 trainerbattle 0, TRAINER_BIKER_NIKOLAS, 0, Text_18730A, Text_187325 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB150 msgbox Text_187333, 6 @@ -6098,7 +6099,7 @@ EventScript_1AB150:: @ 81AB150 Route17_EventScript_1AB167:: @ 81AB167 trainerbattle 0, TRAINER_BIKER_JAXON, 0, Text_187456, Text_187472 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB18E msgbox Text_187479, 6 @@ -6111,7 +6112,7 @@ EventScript_1AB18E:: @ 81AB18E Route17_EventScript_1AB1A5:: @ 81AB1A5 trainerbattle 0, TRAINER_BIKER_WILLIAM, 0, Text_18749B, Text_1874B6 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB1CC msgbox Text_1874C9, 6 @@ -6124,7 +6125,7 @@ EventScript_1AB1CC:: @ 81AB1CC Route17_EventScript_1AB1E3:: @ 81AB1E3 trainerbattle 0, TRAINER_CUE_BALL_RAUL, 0, Text_18717E, Text_1871AE - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB20A msgbox Text_1871BA, 6 @@ -6137,7 +6138,7 @@ EventScript_1AB20A:: @ 81AB20A Route17_EventScript_1AB221:: @ 81AB221 trainerbattle 0, TRAINER_CUE_BALL_ISAIAH, 0, Text_187228, Text_187254 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB248 msgbox Text_18725A, 6 @@ -6150,7 +6151,7 @@ EventScript_1AB248:: @ 81AB248 Route17_EventScript_1AB25F:: @ 81AB25F trainerbattle 0, TRAINER_CUE_BALL_ZEEK, 0, Text_187362, Text_187395 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB286 msgbox Text_18739F, 6 @@ -6163,7 +6164,7 @@ EventScript_1AB286:: @ 81AB286 Route17_EventScript_1AB29D:: @ 81AB29D trainerbattle 0, TRAINER_CUE_BALL_JAMAL, 0, Text_1873D1, Text_1873EB - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB2C4 msgbox Text_1873FF, 6 @@ -6176,7 +6177,7 @@ EventScript_1AB2C4:: @ 81AB2C4 Route17_EventScript_1AB2DB:: @ 81AB2DB trainerbattle 0, TRAINER_CUE_BALL_COREY, 0, Text_18741D, Text_187429 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB302 msgbox Text_187432, 6 @@ -6189,7 +6190,7 @@ EventScript_1AB302:: @ 81AB302 Route17_EventScript_1AB319:: @ 81AB319 trainerbattle 0, TRAINER_BIKER_VIRGIL, 0, Text_18727D, Text_187295 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB340 msgbox Text_1872A5, 6 @@ -6202,7 +6203,7 @@ EventScript_1AB340:: @ 81AB340 Route18_EventScript_1AB357:: @ 81AB357 trainerbattle 0, TRAINER_BIRD_KEEPER_WILTON, 0, Text_187640, Text_187672 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB37E msgbox Text_187677, 6 @@ -6215,7 +6216,7 @@ EventScript_1AB37E:: @ 81AB37E Route18_EventScript_1AB395:: @ 81AB395 trainerbattle 0, TRAINER_BIRD_KEEPER_RAMIRO, 0, Text_18768C, Text_1876B3 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB3BC msgbox Text_1876C5, 6 @@ -6228,7 +6229,7 @@ EventScript_1AB3BC:: @ 81AB3BC Route18_EventScript_1AB3D3:: @ 81AB3D3 trainerbattle 0, TRAINER_BIRD_KEEPER_JACOB, 0, Text_187704, Text_187726 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB3FA msgbox Text_18772C, 6 @@ -6241,7 +6242,7 @@ EventScript_1AB3FA:: @ 81AB3FA Route19_EventScript_1AB411:: @ 81AB411 trainerbattle 0, TRAINER_SWIMMER_MALE_RICHARD, 0, Text_1877A3, Text_1877DF - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB438 msgbox Text_1877EE, 6 @@ -6254,7 +6255,7 @@ EventScript_1AB438:: @ 81AB438 Route19_EventScript_1AB44F:: @ 81AB44F trainerbattle 0, TRAINER_SWIMMER_MALE_REECE, 0, Text_187811, Text_18783E - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB476 msgbox Text_187852, 6 @@ -6267,7 +6268,7 @@ EventScript_1AB476:: @ 81AB476 Route19_EventScript_1AB48D:: @ 81AB48D trainerbattle 0, TRAINER_SWIMMER_MALE_MATTHEW, 0, Text_187884, Text_1878A5 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB4B4 msgbox Text_1878B1, 6 @@ -6280,7 +6281,7 @@ EventScript_1AB4B4:: @ 81AB4B4 Route19_EventScript_1AB4CB:: @ 81AB4CB trainerbattle 0, TRAINER_SWIMMER_MALE_DOUGLAS, 0, Text_1878DD, Text_1878F8 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB4F2 msgbox Text_1878FE, 6 @@ -6293,7 +6294,7 @@ EventScript_1AB4F2:: @ 81AB4F2 Route19_EventScript_1AB509:: @ 81AB509 trainerbattle 0, TRAINER_SWIMMER_MALE_DAVID, 0, Text_187925, Text_187955 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB530 msgbox Text_18795B, 6 @@ -6306,7 +6307,7 @@ EventScript_1AB530:: @ 81AB530 Route19_EventScript_1AB547:: @ 81AB547 trainerbattle 0, TRAINER_SWIMMER_MALE_TONY, 0, Text_187985, Text_1879C3 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB56E msgbox Text_1879D3, 6 @@ -6319,7 +6320,7 @@ EventScript_1AB56E:: @ 81AB56E Route19_EventScript_1AB585:: @ 81AB585 trainerbattle 0, TRAINER_SWIMMER_MALE_AXLE, 0, Text_187AFA, Text_187B25 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB5AC msgbox Text_187B35, 6 @@ -6332,7 +6333,7 @@ EventScript_1AB5AC:: @ 81AB5AC Route19_EventScript_1AB5C3:: @ 81AB5C3 trainerbattle 0, TRAINER_SWIMMER_FEMALE_ANYA, 0, Text_187A11, Text_187A44 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB5EA msgbox Text_187A50, 6 @@ -6345,7 +6346,7 @@ EventScript_1AB5EA:: @ 81AB5EA Route19_EventScript_1AB601:: @ 81AB601 trainerbattle 0, TRAINER_SWIMMER_FEMALE_ALICE, 0, Text_187A9E, Text_187AC1 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB628 msgbox Text_187ACA, 6 @@ -6358,7 +6359,7 @@ EventScript_1AB628:: @ 81AB628 Route19_EventScript_1AB63F:: @ 81AB63F trainerbattle 0, TRAINER_SWIMMER_FEMALE_CONNIE, 0, Text_187B5D, Text_187B85 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB666 msgbox Text_187B94, 6 @@ -6371,7 +6372,7 @@ EventScript_1AB666:: @ 81AB666 Route19_EventScript_1AB67D:: @ 81AB67D trainerbattle 4, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_187C32, Text_187C6F, Text_187CF2 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB6A8 msgbox Text_187C9E, 6 @@ -6384,7 +6385,7 @@ EventScript_1AB6A8:: @ 81AB6A8 Route19_EventScript_1AB6C3:: @ 81AB6C3 trainerbattle 4, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_187D45, Text_187D7E, Text_187DE8 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB6EE msgbox Text_187DAD, 6 @@ -6397,7 +6398,7 @@ EventScript_1AB6EE:: @ 81AB6EE Route20_EventScript_1AB709:: @ 81AB709 trainerbattle 0, TRAINER_SWIMMER_MALE_BARRY, 0, Text_187E40, Text_187E7B - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB730 msgbox Text_187E83, 6 @@ -6410,7 +6411,7 @@ EventScript_1AB730:: @ 81AB730 Route20_EventScript_1AB747:: @ 81AB747 trainerbattle 0, TRAINER_SWIMMER_MALE_DEAN, 0, Text_187FDB, Text_187FF7 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB76E msgbox Text_187FFE, 6 @@ -6423,7 +6424,7 @@ EventScript_1AB76E:: @ 81AB76E Route20_EventScript_1AB785:: @ 81AB785 trainerbattle 0, TRAINER_SWIMMER_MALE_DARRIN, 0, Text_18802E, Text_18805C - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB7AC msgbox Text_18806D, 6 @@ -6436,7 +6437,7 @@ EventScript_1AB7AC:: @ 81AB7AC Route20_EventScript_1AB7C3:: @ 81AB7C3 trainerbattle 0, TRAINER_SWIMMER_FEMALE_TIFFANY, 0, Text_187F24, Text_187F5A - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB7EA msgbox Text_187F61, 6 @@ -6449,7 +6450,7 @@ EventScript_1AB7EA:: @ 81AB7EA Route20_EventScript_1AB801:: @ 81AB801 trainerbattle 0, TRAINER_SWIMMER_FEMALE_NORA, 0, Text_1880F8, Text_188119 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB828 msgbox Text_188139, 6 @@ -6462,7 +6463,7 @@ EventScript_1AB828:: @ 81AB828 Route20_EventScript_1AB83F:: @ 81AB83F trainerbattle 0, TRAINER_SWIMMER_FEMALE_MELISSA, 0, Text_188218, Text_18825C - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB866 msgbox Text_18827B, 6 @@ -6475,7 +6476,7 @@ EventScript_1AB866:: @ 81AB866 Route20_EventScript_1AB87D:: @ 81AB87D trainerbattle 0, TRAINER_SWIMMER_FEMALE_SHIRLEY, 0, Text_187EBB, Text_187EED - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB8A4 msgbox Text_187EF6, 6 @@ -6488,7 +6489,7 @@ EventScript_1AB8A4:: @ 81AB8A4 Route20_EventScript_1AB8BB:: @ 81AB8BB trainerbattle 0, TRAINER_BIRD_KEEPER_ROGER, 0, Text_18808E, Text_1880AB - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB8E2 msgbox Text_1880C8, 6 @@ -6501,7 +6502,7 @@ EventScript_1AB8E2:: @ 81AB8E2 Route20_EventScript_1AB8F9:: @ 81AB8F9 trainerbattle 0, TRAINER_PICNICKER_MISSY, 0, Text_188165, Text_1881A3 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB920 msgbox Text_1881B8, 6 @@ -6514,7 +6515,7 @@ EventScript_1AB920:: @ 81AB920 Route20_EventScript_1AB937:: @ 81AB937 trainerbattle 0, TRAINER_PICNICKER_IRENE, 0, Text_187F78, Text_187F92 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB95E msgbox Text_187FA3, 6 @@ -6527,7 +6528,7 @@ EventScript_1AB95E:: @ 81AB95E Route21_North_EventScript_1AB975:: @ 81AB975 trainerbattle 0, TRAINER_FISHERMAN_RONALD, 0, Text_18835A, Text_188383 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB99C msgbox Text_188389, 6 @@ -6540,7 +6541,7 @@ EventScript_1AB99C:: @ 81AB99C Route21_South_EventScript_1AB9B3:: @ 81AB9B3 trainerbattle 0, TRAINER_FISHERMAN_CLAUDE, 0, Text_1885D8, Text_1885F8 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AB9DA msgbox Text_188632, 6 @@ -6553,7 +6554,7 @@ EventScript_1AB9DA:: @ 81AB9DA Route21_North_EventScript_1AB9F1:: @ 81AB9F1 trainerbattle 0, TRAINER_FISHERMAN_WADE, 0, Text_1883C6, Text_1883E9 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ABA18 msgbox Text_18841D, 6 @@ -6566,7 +6567,7 @@ EventScript_1ABA18:: @ 81ABA18 Route21_South_EventScript_1ABA2F:: @ 81ABA2F trainerbattle 0, TRAINER_FISHERMAN_NOLAN, 0, Text_18868C, Text_1886AE - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ABA56 msgbox Text_1886C5, 6 @@ -6579,7 +6580,7 @@ EventScript_1ABA56:: @ 81ABA56 Route21_North_EventScript_1ABA6D:: @ 81ABA6D trainerbattle 0, TRAINER_SWIMMER_MALE_SPENCER, 0, Text_18843C, Text_18845F - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ABA94 msgbox Text_188465, 6 @@ -6592,7 +6593,7 @@ EventScript_1ABA94:: @ 81ABA94 Route21_South_EventScript_1ABAAB:: @ 81ABAAB trainerbattle 0, TRAINER_SWIMMER_MALE_JACK, 0, Text_1884D4, Text_1884F0 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ABAD2 msgbox Text_1884FF, 6 @@ -6605,7 +6606,7 @@ EventScript_1ABAD2:: @ 81ABAD2 Route21_South_EventScript_1ABAE9:: @ 81ABAE9 trainerbattle 0, TRAINER_SWIMMER_MALE_JEROME, 0, Text_18851F, Text_188543 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ABB10 msgbox Text_188555, 6 @@ -6618,7 +6619,7 @@ EventScript_1ABB10:: @ 81ABB10 Route21_South_EventScript_1ABB27:: @ 81ABB27 trainerbattle 0, TRAINER_SWIMMER_MALE_ROLAND, 0, Text_188592, Text_1885B2 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ABB4E msgbox Text_1885BF, 6 @@ -6631,7 +6632,7 @@ EventScript_1ABB4E:: @ 81ABB4E Route21_North_EventScript_1ABB65:: @ 81ABB65 trainerbattle 4, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1886E2, Text_188712, Text_18875E - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ABB90 msgbox Text_188734, 6 @@ -6644,7 +6645,7 @@ EventScript_1ABB90:: @ 81ABB90 Route21_North_EventScript_1ABBAB:: @ 81ABBAB trainerbattle 4, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1887B4, Text_1887F1, Text_188850 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ABBD6 msgbox Text_188812, 6 @@ -6657,7 +6658,7 @@ EventScript_1ABBD6:: @ 81ABBD6 OneIsland_KindleRoad_EventScript_1ABBF1:: @ 81ABBF1 trainerbattle 0, TRAINER_SWIMMER_FEMALE_MARIA, 0, Text_18961F, Text_18964D - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ABC18 msgbox Text_189657, 6 @@ -6670,7 +6671,7 @@ EventScript_1ABC18:: @ 81ABC18 OneIsland_KindleRoad_EventScript_1ABC2F:: @ 81ABC2F trainerbattle 0, TRAINER_SWIMMER_FEMALE_ABIGAIL, 0, Text_18968C, Text_1896AC - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ABC56 msgbox Text_1896C1, 6 @@ -6683,7 +6684,7 @@ EventScript_1ABC56:: @ 81ABC56 OneIsland_KindleRoad_EventScript_1ABC6D:: @ 81ABC6D trainerbattle 0, TRAINER_SWIMMER_MALE_FINN, 0, Text_1896F9, Text_189728 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ABC94 msgbox Text_189740, 6 @@ -6696,7 +6697,7 @@ EventScript_1ABC94:: @ 81ABC94 OneIsland_KindleRoad_EventScript_1ABCAB:: @ 81ABCAB trainerbattle 0, TRAINER_SWIMMER_MALE_GARRETT, 0, Text_189767, Text_1897A4 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ABCD2 msgbox Text_1897C5, 6 @@ -6709,7 +6710,7 @@ EventScript_1ABCD2:: @ 81ABCD2 OneIsland_KindleRoad_EventScript_1ABCE9:: @ 81ABCE9 trainerbattle 0, TRAINER_FISHERMAN_TOMMY, 0, Text_1897FF, Text_189833 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ABD10 msgbox Text_18984B, 6 @@ -6722,7 +6723,7 @@ EventScript_1ABD10:: @ 81ABD10 OneIsland_KindleRoad_EventScript_1ABD27:: @ 81ABD27 trainerbattle 0, TRAINER_CRUSH_GIRL_SHARON, 0, Text_189883, Text_1898AB - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ABD4E msgbox Text_1898C4, 6 @@ -6735,7 +6736,7 @@ EventScript_1ABD4E:: @ 81ABD4E OneIsland_KindleRoad_EventScript_1ABD65:: @ 81ABD65 trainerbattle 0, TRAINER_CRUSH_GIRL_TANYA, 0, Text_1898F0, Text_18991B - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ABD8C msgbox Text_18992C, 6 @@ -6748,7 +6749,7 @@ EventScript_1ABD8C:: @ 81ABD8C OneIsland_KindleRoad_EventScript_1ABDA3:: @ 81ABDA3 trainerbattle 0, TRAINER_BLACK_BELT_SHEA, 0, Text_189950, Text_18998C - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ABDCA msgbox Text_189998, 6 @@ -6761,7 +6762,7 @@ EventScript_1ABDCA:: @ 81ABDCA OneIsland_KindleRoad_EventScript_1ABDE1:: @ 81ABDE1 trainerbattle 0, TRAINER_BLACK_BELT_HUGH, 0, Text_1899CE, Text_189A0A - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ABE08 msgbox Text_189A13, 6 @@ -6774,7 +6775,7 @@ EventScript_1ABE08:: @ 81ABE08 OneIsland_KindleRoad_EventScript_1ABE1F:: @ 81ABE1F trainerbattle 0, TRAINER_CAMPER_BRYCE, 0, Text_189A53, Text_189A92 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ABE46 msgbox Text_189A9F, 6 @@ -6787,7 +6788,7 @@ EventScript_1ABE46:: @ 81ABE46 OneIsland_KindleRoad_EventScript_1ABE5D:: @ 81ABE5D trainerbattle 0, TRAINER_PICNICKER_CLAIRE, 0, Text_189ACB, Text_189B0B - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ABE84 msgbox Text_189B24, 6 @@ -6800,7 +6801,7 @@ EventScript_1ABE84:: @ 81ABE84 OneIsland_KindleRoad_EventScript_1ABE9B:: @ 81ABE9B trainerbattle 4, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_189B4D, Text_189B84, Text_189BDE - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ABEC6 msgbox Text_189BA3, 6 @@ -6813,7 +6814,7 @@ EventScript_1ABEC6:: @ 81ABEC6 OneIsland_KindleRoad_EventScript_1ABEE1:: @ 81ABEE1 trainerbattle 4, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_189C33, Text_189C62, Text_189CAB - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ABF0C msgbox Text_189C7E, 6 @@ -6826,7 +6827,7 @@ EventScript_1ABF0C:: @ 81ABF0C OneIsland_TreasureBeach_EventScript_1ABF27:: @ 81ABF27 trainerbattle 0, TRAINER_SWIMMER_FEMALE_AMARA, 0, Text_189D5A, Text_189D8B - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ABF4E msgbox Text_189DA3, 6 @@ -6839,7 +6840,7 @@ EventScript_1ABF4E:: @ 81ABF4E ThreeIsland_BondBridge_EventScript_1ABF65:: @ 81ABF65 trainerbattle 0, TRAINER_AROMA_LADY_NIKKI, 0, Text_189E42, Text_189E72 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ABF8C msgbox Text_189E9E, 6 @@ -6852,7 +6853,7 @@ EventScript_1ABF8C:: @ 81ABF8C ThreeIsland_BondBridge_EventScript_1ABFA3:: @ 81ABFA3 trainerbattle 0, TRAINER_AROMA_LADY_VIOLET, 0, Text_189ED4, Text_189EFA - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ABFCA msgbox Text_189F21, 6 @@ -6865,7 +6866,7 @@ EventScript_1ABFCA:: @ 81ABFCA ThreeIsland_BondBridge_EventScript_1ABFE1:: @ 81ABFE1 trainerbattle 0, TRAINER_TUBER_AMIRA, 0, Text_189F63, Text_189F9A - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC008 msgbox Text_189FA8, 6 @@ -6878,7 +6879,7 @@ EventScript_1AC008:: @ 81AC008 ThreeIsland_BondBridge_EventScript_1AC01F:: @ 81AC01F trainerbattle 0, TRAINER_TUBER_ALEXIS, 0, Text_189FDB, Text_189FEE - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC046 msgbox Text_18A000, 6 @@ -6891,7 +6892,7 @@ EventScript_1AC046:: @ 81AC046 ThreeIsland_BondBridge_EventScript_1AC05D:: @ 81AC05D trainerbattle 0, TRAINER_SWIMMER_FEMALE_TISHA, 0, Text_18A01F, Text_18A053 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC084 msgbox Text_18A082, 6 @@ -6904,7 +6905,7 @@ EventScript_1AC084:: @ 81AC084 ThreeIsland_BondBridge_EventScript_1AC09B:: @ 81AC09B trainerbattle 4, TRAINER_TWINS_JOY_MEG, 0, Text_18A0C4, Text_18A0F7, Text_18A138 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC0C6 msgbox Text_18A106, 6 @@ -6917,7 +6918,7 @@ EventScript_1AC0C6:: @ 81AC0C6 ThreeIsland_BondBridge_EventScript_1AC0E1:: @ 81AC0E1 trainerbattle 4, TRAINER_TWINS_JOY_MEG, 0, Text_18A179, Text_18A1A3, Text_18A1CD - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC10C msgbox Text_18A1B2, 6 @@ -6930,7 +6931,7 @@ EventScript_1AC10C:: @ 81AC10C FiveIsland_ResortGorgeous_EventScript_1AC127:: @ 81AC127 trainerbattle 0, TRAINER_PAINTER_DAISY, 0, Text_18A3E2, Text_18A40E - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC14E msgbox Text_18A430, 6 @@ -6943,7 +6944,7 @@ EventScript_1AC14E:: @ 81AC14E FiveIsland_ResortGorgeous_EventScript_1AC165:: @ 81AC165 trainerbattle 0, TRAINER_PAINTER_CELINA, 0, Text_18A461, Text_18A49E - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC18C msgbox Text_18A4C6, 6 @@ -6956,7 +6957,7 @@ EventScript_1AC18C:: @ 81AC18C FiveIsland_ResortGorgeous_EventScript_1AC1A3:: @ 81AC1A3 trainerbattle 0, TRAINER_PAINTER_RAYNA, 0, Text_18A50E, Text_18A535 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC1CA msgbox Text_18A555, 6 @@ -6969,7 +6970,7 @@ EventScript_1AC1CA:: @ 81AC1CA FiveIsland_ResortGorgeous_EventScript_1AC1E1:: @ 81AC1E1 trainerbattle 0, TRAINER_LADY_JACKI, 0, Text_18A5B9, Text_18A5EE - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC208 msgbox Text_18A601, 6 @@ -6982,7 +6983,7 @@ EventScript_1AC208:: @ 81AC208 FiveIsland_ResortGorgeous_EventScript_1AC21F:: @ 81AC21F trainerbattle 0, TRAINER_LADY_GILLIAN, 0, Text_18A645, Text_18A67F - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC246 msgbox Text_18A699, 6 @@ -6995,7 +6996,7 @@ EventScript_1AC246:: @ 81AC246 FiveIsland_ResortGorgeous_EventScript_1AC25D:: @ 81AC25D trainerbattle 0, TRAINER_YOUNGSTER_DESTIN, 0, Text_18A6DA, Text_18A6FE - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC284 msgbox Text_18A715, 6 @@ -7008,7 +7009,7 @@ EventScript_1AC284:: @ 81AC284 FiveIsland_ResortGorgeous_EventScript_1AC29B:: @ 81AC29B trainerbattle 0, TRAINER_SWIMMER_MALE_TOBY, 0, Text_18A74A, Text_18A786 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC2C2 msgbox Text_18A7AC, 6 @@ -7021,7 +7022,7 @@ EventScript_1AC2C2:: @ 81AC2C2 FiveIsland_WaterLabyrinth_EventScript_1AC2D9:: @ 81AC2D9 trainerbattle 0, TRAINER_PKMN_BREEDER_ALIZE, 0, Text_18AAD5, Text_18AB0B - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC300 msgbox Text_18AB37, 6 @@ -7034,7 +7035,7 @@ EventScript_1AC300:: @ 81AC300 FiveIsland_MemorialPillar_EventScript_1AC317:: @ 81AC317 trainerbattle 0, TRAINER_BIRD_KEEPER_MILO, 0, Text_18AE50, Text_18AEA8 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC33E msgbox Text_18AEB6, 6 @@ -7047,7 +7048,7 @@ EventScript_1AC33E:: @ 81AC33E FiveIsland_MemorialPillar_EventScript_1AC355:: @ 81AC355 trainerbattle 0, TRAINER_BIRD_KEEPER_CHAZ, 0, Text_18AEDC, Text_18AF39 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC37C msgbox Text_18AF45, 6 @@ -7060,7 +7061,7 @@ EventScript_1AC37C:: @ 81AC37C FiveIsland_MemorialPillar_EventScript_1AC393:: @ 81AC393 trainerbattle 0, TRAINER_BIRD_KEEPER_HAROLD, 0, Text_18AF72, Text_18AFCC - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC3BA msgbox Text_18AFF2, 6 @@ -7073,7 +7074,7 @@ EventScript_1AC3BA:: @ 81AC3BA SixIsland_OutcastIsland_EventScript_1AC3D1:: @ 81AC3D1 trainerbattle 0, TRAINER_FISHERMAN_TYLOR, 0, Text_18B400, Text_18B43B - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC3F8 msgbox Text_18B451, 6 @@ -7086,7 +7087,7 @@ EventScript_1AC3F8:: @ 81AC3F8 SixIsland_OutcastIsland_EventScript_1AC40F:: @ 81AC40F trainerbattle 0, TRAINER_SWIMMER_MALE_MYMO, 0, Text_18B48F, Text_18B4C5 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC436 msgbox Text_18B4D1, 6 @@ -7099,7 +7100,7 @@ EventScript_1AC436:: @ 81AC436 SixIsland_OutcastIsland_EventScript_1AC44D:: @ 81AC44D trainerbattle 0, TRAINER_SWIMMER_FEMALE_NICOLE, 0, Text_18B4FA, Text_18B539 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC474 msgbox Text_18B573, 6 @@ -7112,7 +7113,7 @@ EventScript_1AC474:: @ 81AC474 SixIsland_OutcastIsland_EventScript_1AC48B:: @ 81AC48B trainerbattle 4, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_18B5C8, Text_18B5F4, Text_18B660 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC4B6 msgbox Text_18B62E, 6 @@ -7125,7 +7126,7 @@ EventScript_1AC4B6:: @ 81AC4B6 SixIsland_OutcastIsland_EventScript_1AC4D1:: @ 81AC4D1 trainerbattle 4, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_18B6C1, Text_18B6EF, Text_18B762 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC4FC msgbox Text_18B720, 6 @@ -7138,7 +7139,7 @@ EventScript_1AC4FC:: @ 81AC4FC SixIsland_GreenPath_EventScript_1AC517:: @ 81AC517 trainerbattle 0, TRAINER_PSYCHIC_JACLYN, 0, Text_18B7B0, Text_18B7F0 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC53E msgbox Text_18B7FD, 6 @@ -7151,7 +7152,7 @@ EventScript_1AC53E:: @ 81AC53E SixIsland_WaterPath_EventScript_1AC555:: @ 81AC555 trainerbattle 0, TRAINER_AROMA_LADY_ROSE, 0, Text_18B896, Text_18B8C8 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC57C msgbox Text_18B8F7, 6 @@ -7164,7 +7165,7 @@ EventScript_1AC57C:: @ 81AC57C SixIsland_WaterPath_EventScript_1AC593:: @ 81AC593 trainerbattle 0, TRAINER_JUGGLER_EDWARD, 0, Text_18B959, Text_18B988 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC5BA msgbox Text_18B9A5, 6 @@ -7177,7 +7178,7 @@ EventScript_1AC5BA:: @ 81AC5BA SixIsland_WaterPath_EventScript_1AC5D1:: @ 81AC5D1 trainerbattle 0, TRAINER_SWIMMER_MALE_SAMIR, 0, Text_18B9EC, Text_18BA47 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC5F8 msgbox Text_18BA57, 6 @@ -7190,7 +7191,7 @@ EventScript_1AC5F8:: @ 81AC5F8 SixIsland_WaterPath_EventScript_1AC60F:: @ 81AC60F trainerbattle 0, TRAINER_SWIMMER_FEMALE_DENISE, 0, Text_18BA86, Text_18BAC0 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC636 msgbox Text_18BAE0, 6 @@ -7203,7 +7204,7 @@ EventScript_1AC636:: @ 81AC636 SixIsland_WaterPath_EventScript_1AC64D:: @ 81AC64D trainerbattle 4, TRAINER_TWINS_MIU_MIA, 0, Text_18BBBA, Text_18BBE2, Text_18BC24 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC678 msgbox Text_18BBF6, 6 @@ -7216,7 +7217,7 @@ EventScript_1AC678:: @ 81AC678 SixIsland_WaterPath_EventScript_1AC693:: @ 81AC693 trainerbattle 4, TRAINER_TWINS_MIU_MIA, 0, Text_18BC5A, Text_18BC84, Text_18BCCF - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC6BE msgbox Text_18BCAE, 6 @@ -7229,7 +7230,7 @@ EventScript_1AC6BE:: @ 81AC6BE SixIsland_WaterPath_EventScript_1AC6D9:: @ 81AC6D9 trainerbattle 0, TRAINER_HIKER_EARL, 0, Text_18BB2D, Text_18BB62 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC700 msgbox Text_18BB8B, 6 @@ -7242,7 +7243,7 @@ EventScript_1AC700:: @ 81AC700 SixIsland_RuinValley_EventScript_1AC717:: @ 81AC717 trainerbattle 0, TRAINER_RUIN_MANIAC_STANLY, 0, Text_18BE5D, Text_18BE9B - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC73E msgbox Text_18BEA0, 6 @@ -7255,7 +7256,7 @@ EventScript_1AC73E:: @ 81AC73E SixIsland_RuinValley_EventScript_1AC755:: @ 81AC755 trainerbattle 0, TRAINER_RUIN_MANIAC_FOSTER, 0, Text_18BF05, Text_18BF33 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC77C msgbox Text_18BF6C, 6 @@ -7268,7 +7269,7 @@ EventScript_1AC77C:: @ 81AC77C SixIsland_RuinValley_EventScript_1AC793:: @ 81AC793 trainerbattle 0, TRAINER_RUIN_MANIAC_LARRY, 0, Text_18BFC5, Text_18C03B - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC7BA msgbox Text_18C04C, 6 @@ -7281,7 +7282,7 @@ EventScript_1AC7BA:: @ 81AC7BA SixIsland_RuinValley_EventScript_1AC7D1:: @ 81AC7D1 trainerbattle 0, TRAINER_HIKER_DARYL, 0, Text_18C09C, Text_18C0BB - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC7F8 msgbox Text_18C0EA, 6 @@ -7294,7 +7295,7 @@ EventScript_1AC7F8:: @ 81AC7F8 SixIsland_RuinValley_EventScript_1AC80F:: @ 81AC80F trainerbattle 0, TRAINER_POKEMANIAC_HECTOR, 0, Text_18C10A, Text_18C140 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC836 msgbox Text_18C17A, 6 @@ -7307,7 +7308,7 @@ EventScript_1AC836:: @ 81AC836 SevenIsland_TrainerTower_EventScript_1AC84D:: @ 81AC84D trainerbattle 0, TRAINER_PSYCHIC_DARIO, 0, Text_18C1ED, Text_18C205 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC874 msgbox Text_18C20E, 6 @@ -7320,7 +7321,7 @@ EventScript_1AC874:: @ 81AC874 SevenIsland_TrainerTower_EventScript_1AC88B:: @ 81AC88B trainerbattle 0, TRAINER_PSYCHIC_RODETTE, 0, Text_18C283, Text_18C2BC - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC8B2 msgbox Text_18C2D5, 6 @@ -7333,7 +7334,7 @@ EventScript_1AC8B2:: @ 81AC8B2 SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9:: @ 81AC8C9 trainerbattle 0, TRAINER_AROMA_LADY_MIAH, 0, Text_18C3BC, Text_18C3E7 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC8F0 msgbox Text_18C3FF, 6 @@ -7346,7 +7347,7 @@ EventScript_1AC8F0:: @ 81AC8F0 SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907:: @ 81AC907 trainerbattle 4, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_18C632, Text_18C662, Text_18C6AB - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC932 msgbox Text_18C683, 6 @@ -7359,7 +7360,7 @@ EventScript_1AC932:: @ 81AC932 SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D:: @ 81AC94D trainerbattle 4, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_18C700, Text_18C73B, Text_18C7BD - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC978 msgbox Text_18C773, 6 @@ -7372,7 +7373,7 @@ EventScript_1AC978:: @ 81AC978 SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993:: @ 81AC993 trainerbattle 0, TRAINER_JUGGLER_MASON, 0, Text_18C44B, Text_18C473 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC9BA msgbox Text_18C4BA, 6 @@ -7385,7 +7386,7 @@ EventScript_1AC9BA:: @ 81AC9BA SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1:: @ 81AC9D1 trainerbattle 0, TRAINER_PKMN_RANGER_NICOLAS, 0, Text_18C500, Text_18C543 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1AC9F8 msgbox Text_18C54B, 6 @@ -7398,7 +7399,7 @@ EventScript_1AC9F8:: @ 81AC9F8 SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F:: @ 81ACA0F trainerbattle 0, TRAINER_PKMN_RANGER_MADELINE, 0, Text_18C5AA, Text_18C5CD - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ACA36 msgbox Text_18C5F5, 6 @@ -7411,7 +7412,7 @@ EventScript_1ACA36:: @ 81ACA36 SevenIsland_SevaultCanyon_EventScript_1ACA4D:: @ 81ACA4D trainerbattle 0, TRAINER_CRUSH_GIRL_CYNDY, 0, Text_18C887, Text_18C8A6 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ACA74 msgbox Text_18C8C2, 6 @@ -7424,7 +7425,7 @@ EventScript_1ACA74:: @ 81ACA74 SevenIsland_SevaultCanyon_EventScript_1ACA8B:: @ 81ACA8B trainerbattle 0, TRAINER_TAMER_EVAN, 0, Text_18C8FD, Text_18C980 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ACAB2 msgbox Text_18C999, 6 @@ -7437,7 +7438,7 @@ EventScript_1ACAB2:: @ 81ACAB2 SevenIsland_SevaultCanyon_EventScript_1ACAC9:: @ 81ACAC9 trainerbattle 0, TRAINER_PKMN_RANGER_JACKSON, 0, Text_18CA2F, Text_18CA6F - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ACAF0 msgbox Text_18CA9C, 6 @@ -7450,7 +7451,7 @@ EventScript_1ACAF0:: @ 81ACAF0 SevenIsland_SevaultCanyon_EventScript_1ACB07:: @ 81ACB07 trainerbattle 0, TRAINER_PKMN_RANGER_KATELYN, 0, Text_18CB16, Text_18CB3E - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ACB2E msgbox Text_18CB6C, 6 @@ -7463,7 +7464,7 @@ EventScript_1ACB2E:: @ 81ACB2E SevenIsland_SevaultCanyon_EventScript_1ACB45:: @ 81ACB45 trainerbattle 0, TRAINER_COOLTRAINER_LEROY, 0, Text_18CBB4, Text_18CBE0 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ACB6C msgbox Text_18CC09, 6 @@ -7476,7 +7477,7 @@ EventScript_1ACB6C:: @ 81ACB6C SevenIsland_SevaultCanyon_EventScript_1ACB83:: @ 81ACB83 trainerbattle 0, TRAINER_COOLTRAINER_MICHELLE, 0, Text_18CC4F, Text_18CCAE - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ACBAA msgbox Text_18CCEA, 6 @@ -7489,7 +7490,7 @@ EventScript_1ACBAA:: @ 81ACBAA SevenIsland_SevaultCanyon_EventScript_1ACBC1:: @ 81ACBC1 trainerbattle 4, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_18CD49, Text_18CD75, Text_18CDE2 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ACBEC msgbox Text_18CD9C, 6 @@ -7502,7 +7503,7 @@ EventScript_1ACBEC:: @ 81ACBEC SevenIsland_SevaultCanyon_EventScript_1ACC07:: @ 81ACC07 trainerbattle 4, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_18CE20, Text_18CE5A, Text_18CEF4 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ACC32 msgbox Text_18CE78, 6 @@ -7515,7 +7516,7 @@ EventScript_1ACC32:: @ 81ACC32 SevenIsland_TanobyRuins_EventScript_1ACC4D:: @ 81ACC4D trainerbattle 0, TRAINER_RUIN_MANIAC_BRANDON, 0, Text_18CFFB, Text_18D02A - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ACC74 msgbox Text_18D061, 6 @@ -7528,7 +7529,7 @@ EventScript_1ACC74:: @ 81ACC74 SevenIsland_TanobyRuins_EventScript_1ACC8B:: @ 81ACC8B trainerbattle 0, TRAINER_RUIN_MANIAC_BENJAMIN, 0, Text_18D0D9, Text_18D108 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ACCB2 msgbox Text_18D125, 6 @@ -7541,7 +7542,7 @@ EventScript_1ACCB2:: @ 81ACCB2 SevenIsland_TanobyRuins_EventScript_1ACCC9:: @ 81ACCC9 trainerbattle 0, TRAINER_PAINTER_EDNA, 0, Text_18D18F, Text_18D1B5 - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ACCF0 msgbox Text_18D1E3, 6 @@ -7554,7 +7555,7 @@ EventScript_1ACCF0:: @ 81ACCF0 SevenIsland_TanobyRuins_EventScript_1ACD07:: @ 81ACD07 trainerbattle 0, TRAINER_GENTLEMAN_CLIFFORD, 0, Text_18D22F, Text_18D26D - specialvar VAR_RESULT, sub_810CD4C + specialvar VAR_RESULT, ShouldTryRematchBattle compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1ACD2E msgbox Text_18D284, 6 @@ -7917,7 +7918,7 @@ EventScript_1B2907:: @ 81B2907 playse MUS_ME_PHOTO dofieldeffect FLDEFF_UNK_45 delay 60 - special sub_80CC2BC + special Special_UpdateTrainerCardPhotoIcons msgbox gUnknown_81B1E7D hidemoneybox nop @@ -7942,7 +7943,7 @@ EventScript_1B292B:: @ 81B292B FourIsland_House2_EventScript_1B2938:: @ 81B2938 lock - specialvar VAR_0x8008, sub_80CC3CC + specialvar VAR_0x8008, Special_StickerLadyGetBragFlags checkflag FLAG_MET_STICKER_LADY goto_if FALSE, EventScript_1B2951 checkflag FLAG_MET_STICKER_LADY @@ -8725,7 +8726,7 @@ EventScript_1BB5B3:: @ 81BB5B3 goto_if eq, EventScript_1BB62C special SetCableClubWarp warp MAP_UNKNOWN_MAP_00_00, 255, 6, 8 - special sub_807E654 + special DoCableClubWarp waitstate end @@ -8737,7 +8738,7 @@ EventScript_1BB621:: @ 81BB621 EventScript_1BB62C:: @ 81BB62C special SetCableClubWarp warp MAP_UNKNOWN_MAP_00_03, 255, 5, 8 - special sub_807E654 + special DoCableClubWarp waitstate end @@ -8839,7 +8840,7 @@ EventScript_1BB73D:: @ 81BB73D release special SetCableClubWarp setwarp MAP_UNKNOWN_MAP_00_01, 255, 5, 8 - special sub_807E654 + special DoCableClubWarp waitstate end @@ -8917,7 +8918,7 @@ EventScript_1BB83F:: @ 81BB83F EventScript_1BB84F:: @ 81BB84F special SetCableClubWarp - special sub_807E654 + special DoCableClubWarp waitstate end @@ -9182,7 +9183,7 @@ EventScript_1BBA04:: @ 81BBA04 faceplayer checkflag FLAG_SYS_POKEDEX_GET goto_if FALSE, EventScript_1BB877 - specialvar VAR_RESULT, sub_80CD034 + specialvar VAR_RESULT, Special_BadEggInParty compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1BB867 copyvar VAR_0x8007, VAR_LAST_TALKED @@ -9304,7 +9305,7 @@ EventScript_1BBB9C:: @ 81BBB9C faceplayer checkflag FLAG_SYS_POKEDEX_GET goto_if FALSE, EventScript_1BB877 - specialvar VAR_RESULT, sub_80CD034 + specialvar VAR_RESULT, Special_BadEggInParty compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1BB867 specialvar VAR_RESULT, IsWirelessAdapterConnected @@ -11504,7 +11505,7 @@ EventScript_1BF3DD:: @ 81BF3DD msgbox Text_19DE24 waitmoncry special PutMonInRoute5Daycare - incrementgamestat 47 + incrementgamestat GAME_STAT_USED_DAYCARE goto EventScript_1BF541 end @@ -13879,13 +13880,13 @@ TwoIsland_CapeBrink_House_EventScript_1C4DEC:: @ 81C4DEC special sub_8112364 lock faceplayer - checkflag FLAG_LEARNED_MOVE_AT_CAPE_BRINK + checkflag FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK goto_if TRUE, EventScript_1C4EA1 checkflag FLAG_TEMP_2 goto_if TRUE, EventScript_1C4E97 getfirstpartymonname 0 msgbox Text_1A46C6 - specialvar VAR_RESULT, sub_80CCB94 + specialvar VAR_RESULT, Special_CapeBrinkGetMoveToTeachLeadPokemon compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1C4F26 copyvar VAR_0x8009, VAR_0x8005 @@ -13925,7 +13926,7 @@ EventScript_1C4EA1:: @ 81C4EA1 EventScript_1C4EAB:: @ 81C4EAB copyvar VAR_0x8005, VAR_0x8009 - specialvar VAR_RESULT, sub_80CCCF8 + specialvar VAR_RESULT, Special_HasLearnedAllMovesFromCapeBrinkTutor compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1C4ECD msgbox Text_1A4865 @@ -13935,7 +13936,7 @@ EventScript_1C4EAB:: @ 81C4EAB EventScript_1C4ECD:: @ 81C4ECD msgbox Text_1A48F3 - setflag FLAG_LEARNED_MOVE_AT_CAPE_BRINK + setflag FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK release end diff --git a/data/field_specials/unk_83F5F50.pal b/data/field_specials/unk_83F5F50.pal new file mode 100644 index 000000000..6528f9f75 --- /dev/null +++ b/data/field_specials/unk_83F5F50.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +82 82 106 +82 82 106 +82 82 106 +82 82 106 +82 82 106 +82 82 106 diff --git a/data/field_specials/unk_83F5F70.pal b/data/field_specials/unk_83F5F70.pal new file mode 100644 index 000000000..934306488 --- /dev/null +++ b/data/field_specials/unk_83F5F70.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +82 82 106 +82 82 106 +82 82 106 +82 82 106 +41 115 205 +82 82 106 diff --git a/data/field_specials/unk_83F5F90.pal b/data/field_specials/unk_83F5F90.pal new file mode 100644 index 000000000..624c69448 --- /dev/null +++ b/data/field_specials/unk_83F5F90.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +82 82 106 +82 82 106 +82 82 106 +41 115 205 +131 238 255 +0 41 156 diff --git a/data/field_specials/unk_83F5FB0.pal b/data/field_specials/unk_83F5FB0.pal new file mode 100644 index 000000000..fb3cdebd0 --- /dev/null +++ b/data/field_specials/unk_83F5FB0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +82 82 106 +82 82 106 +41 115 205 +131 238 255 +82 172 230 +0 65 189 diff --git a/data/field_specials/unk_83F5FD0.pal b/data/field_specials/unk_83F5FD0.pal new file mode 100644 index 000000000..f2c6c78af --- /dev/null +++ b/data/field_specials/unk_83F5FD0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +82 82 106 +41 115 205 +131 238 255 +82 172 230 +41 115 205 +41 115 205 diff --git a/data/field_specials/unk_83F5FF0.pal b/data/field_specials/unk_83F5FF0.pal new file mode 100644 index 000000000..3e2c5757a --- /dev/null +++ b/data/field_specials/unk_83F5FF0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +41 115 205 +131 238 255 +82 172 230 +41 115 205 +0 65 189 +82 172 230 diff --git a/data/field_specials/unk_83F6010.pal b/data/field_specials/unk_83F6010.pal new file mode 100644 index 000000000..84e6e811a --- /dev/null +++ b/data/field_specials/unk_83F6010.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +131 238 255 +82 172 230 +41 115 205 +0 65 189 +0 41 156 +131 238 255 diff --git a/data/field_specials/unk_83F6030.pal b/data/field_specials/unk_83F6030.pal new file mode 100644 index 000000000..f49f8ef99 --- /dev/null +++ b/data/field_specials/unk_83F6030.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +82 172 230 +41 115 205 +0 65 189 +0 41 156 +82 82 106 +90 180 238 diff --git a/data/field_specials/unk_83F6050.pal b/data/field_specials/unk_83F6050.pal new file mode 100644 index 000000000..538ebf789 --- /dev/null +++ b/data/field_specials/unk_83F6050.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +41 115 205 +0 65 189 +0 41 156 +82 82 106 +82 82 106 +41 115 205 diff --git a/data/field_specials/unk_83F6070.pal b/data/field_specials/unk_83F6070.pal new file mode 100644 index 000000000..49b9d85b6 --- /dev/null +++ b/data/field_specials/unk_83F6070.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +0 65 189 +0 41 156 +82 82 106 +82 82 106 +82 82 106 +0 65 189 diff --git a/data/field_specials/unk_83F6090.pal b/data/field_specials/unk_83F6090.pal new file mode 100644 index 000000000..ff81da8b3 --- /dev/null +++ b/data/field_specials/unk_83F6090.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +0 41 156 +82 82 106 +82 82 106 +82 82 106 +82 82 106 +0 41 156 diff --git a/data/field_specials/unk_83F60B0.pal b/data/field_specials/unk_83F60B0.pal new file mode 100644 index 000000000..a0763ff47 --- /dev/null +++ b/data/field_specials/unk_83F60B0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +131 238 255 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +172 172 98 +148 148 74 +82 82 106 +82 82 106 +82 82 106 +82 82 106 +82 82 106 +82 82 106 diff --git a/data/field_specials/unk_83F60D0.pal b/data/field_specials/unk_83F60D0.pal new file mode 100644 index 000000000..6528f9f75 --- /dev/null +++ b/data/field_specials/unk_83F60D0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +82 82 106 +82 82 106 +82 82 106 +82 82 106 +82 82 106 +82 82 106 diff --git a/data/field_specials/unk_83F60F0.pal b/data/field_specials/unk_83F60F0.pal new file mode 100644 index 000000000..75dfaa19a --- /dev/null +++ b/data/field_specials/unk_83F60F0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +82 82 106 +82 82 106 +82 82 106 +82 82 106 +82 172 230 +41 115 205 diff --git a/data/field_specials/unk_83F6110.pal b/data/field_specials/unk_83F6110.pal new file mode 100644 index 000000000..092544dec --- /dev/null +++ b/data/field_specials/unk_83F6110.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +82 82 106 +82 82 106 +82 172 230 +41 115 205 +131 238 255 +82 172 230 diff --git a/data/field_specials/unk_83F6130.pal b/data/field_specials/unk_83F6130.pal new file mode 100644 index 000000000..3b93965ad --- /dev/null +++ b/data/field_specials/unk_83F6130.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +82 172 230 +41 115 205 +131 238 255 +82 172 230 +82 172 230 +41 115 205 diff --git a/data/field_specials/unk_83F6150.pal b/data/field_specials/unk_83F6150.pal new file mode 100644 index 000000000..be23edc23 --- /dev/null +++ b/data/field_specials/unk_83F6150.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +131 238 255 +82 172 230 +82 172 230 +41 115 205 +41 115 205 +0 65 189 diff --git a/data/field_specials/unk_83F6170.pal b/data/field_specials/unk_83F6170.pal new file mode 100644 index 000000000..788d0bd65 --- /dev/null +++ b/data/field_specials/unk_83F6170.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +82 172 230 +41 115 205 +41 115 205 +0 65 189 +0 65 189 +82 82 106 diff --git a/data/field_specials/unk_83F6190.pal b/data/field_specials/unk_83F6190.pal new file mode 100644 index 000000000..8ca385f0d --- /dev/null +++ b/data/field_specials/unk_83F6190.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +41 115 205 +0 65 189 +0 65 189 +82 82 106 +82 82 106 +82 82 106 diff --git a/data/field_specials/unk_83F61B0.pal b/data/field_specials/unk_83F61B0.pal new file mode 100644 index 000000000..63fe8e97e --- /dev/null +++ b/data/field_specials/unk_83F61B0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +255 74 0 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +255 255 180 +189 189 115 +0 65 189 +82 82 106 +82 82 106 +82 82 106 +82 82 106 +82 82 106 diff --git a/data/field_specials/unk_83F61D0.pal b/data/field_specials/unk_83F61D0.pal new file mode 100644 index 000000000..a0763ff47 --- /dev/null +++ b/data/field_specials/unk_83F61D0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 106 +123 123 123 +131 238 255 +255 213 131 +230 164 98 +197 115 74 +164 82 65 +172 172 98 +148 148 74 +82 82 106 +82 82 106 +82 82 106 +82 82 106 +82 82 106 +82 82 106 diff --git a/data/field_specials/unk_83F6206.pal b/data/field_specials/unk_83F6206.pal new file mode 100644 index 000000000..c20bacb57 --- /dev/null +++ b/data/field_specials/unk_83F6206.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 156 197 +32 32 32 +82 82 82 +139 139 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/field_specials/unk_83F6226.pal b/data/field_specials/unk_83F6226.pal new file mode 100644 index 000000000..2c106a4ae --- /dev/null +++ b/data/field_specials/unk_83F6226.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 156 197 +41 32 32 +82 82 82 +139 139 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/field_specials/unk_83F6246.pal b/data/field_specials/unk_83F6246.pal new file mode 100644 index 000000000..38fe7d084 --- /dev/null +++ b/data/field_specials/unk_83F6246.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +49 32 32 +90 82 82 +148 148 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/field_specials/unk_83F6266.pal b/data/field_specials/unk_83F6266.pal new file mode 100644 index 000000000..7b7fb7c44 --- /dev/null +++ b/data/field_specials/unk_83F6266.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +65 32 32 +115 82 82 +156 148 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/field_specials/unk_83F6286.pal b/data/field_specials/unk_83F6286.pal new file mode 100644 index 000000000..4eda607b7 --- /dev/null +++ b/data/field_specials/unk_83F6286.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +74 32 32 +123 82 82 +164 156 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/field_specials/unk_83F62A6.pal b/data/field_specials/unk_83F62A6.pal new file mode 100644 index 000000000..a92bc65fd --- /dev/null +++ b/data/field_specials/unk_83F62A6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +98 32 32 +139 82 82 +172 156 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/field_specials/unk_83F62C6.pal b/data/field_specials/unk_83F62C6.pal new file mode 100644 index 000000000..0de8519c6 --- /dev/null +++ b/data/field_specials/unk_83F62C6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +98 32 32 +148 82 82 +180 164 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/field_specials/unk_83F62E6.pal b/data/field_specials/unk_83F62E6.pal new file mode 100644 index 000000000..ae67047d4 --- /dev/null +++ b/data/field_specials/unk_83F62E6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +106 32 32 +156 82 82 +189 164 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/field_specials/unk_83F6306.pal b/data/field_specials/unk_83F6306.pal new file mode 100644 index 000000000..27cf345e4 --- /dev/null +++ b/data/field_specials/unk_83F6306.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +123 32 32 +172 82 82 +197 172 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/field_specials/unk_83F6326.pal b/data/field_specials/unk_83F6326.pal new file mode 100644 index 000000000..fcca0b4de --- /dev/null +++ b/data/field_specials/unk_83F6326.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +131 32 32 +180 82 82 +205 172 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/field_specials/unk_83F6346.pal b/data/field_specials/unk_83F6346.pal new file mode 100644 index 000000000..6c7540611 --- /dev/null +++ b/data/field_specials/unk_83F6346.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 156 197 +205 32 32 +255 82 82 +255 205 156 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/border.bin b/data/layouts/SevenIsland_SevaultCanyon_TanobyKey/border.bin index 56b76feec..56b76feec 100644 --- a/data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/border.bin +++ b/data/layouts/SevenIsland_SevaultCanyon_TanobyKey/border.bin diff --git a/data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/map.bin b/data/layouts/SevenIsland_SevaultCanyon_TanobyKey/map.bin Binary files differindex 77ec431c8..77ec431c8 100644 --- a/data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/map.bin +++ b/data/layouts/SevenIsland_SevaultCanyon_TanobyKey/map.bin diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index 0b1685e5a..fbeee8c39 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -3884,16 +3884,16 @@ "blockdata_filepath": "data/layouts/SixIsland_AlteringCave/map.bin" }, { - "id": "LAYOUT_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY", - "name": "SevenIsland_SeavaultCanyon_TanobyKey_Layout", + "id": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY", + "name": "SevenIsland_SevaultCanyon_TanobyKey_Layout", "width": 15, "height": 16, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4A94", "secondary_tileset": "gTileset_82D4E0C", - "border_filepath": "data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/border.bin", - "blockdata_filepath": "data/layouts/SevenIsland_SeavaultCanyon_TanobyKey/map.bin" + "border_filepath": "data/layouts/SevenIsland_SevaultCanyon_TanobyKey/border.bin", + "blockdata_filepath": "data/layouts/SevenIsland_SevaultCanyon_TanobyKey/map.bin" }, { "id": "LAYOUT_BIRTH_ISLAND_EXTERIOR", diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 44c5297e5..0c20c59b8 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -5,7 +5,7 @@ BirthIsland_Exterior_MapScripts:: @ 8165203 .byte 0 BirthIsland_Exterior_MapScript3_165213:: @ 8165213 - special sub_80CD008 + special Special_SetDeoxysTriangleObjectPal end BirthIsland_Exterior_MapScript1_165217:: @ 8165217 @@ -50,7 +50,7 @@ BirthIsland_Exterior_EventScript_165271:: @ 8165271 compare_var_to_value VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 - special sub_80CCDFC + special Special_DeoxysSound waitstate switch VAR_RESULT case 0, EventScript_1652BA diff --git a/data/maps/CeladonCity_Condominiums_3F/scripts.inc b/data/maps/CeladonCity_Condominiums_3F/scripts.inc index b69ad021a..258846f29 100644 --- a/data/maps/CeladonCity_Condominiums_3F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_3F/scripts.inc @@ -34,7 +34,7 @@ EventScript_16C418:: @ 816C418 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 - special sub_80CA618 + special Special_ShowDiploma waitstate release end diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index c4d07baff..0e2673614 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -7,11 +7,11 @@ CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153 checkflag FLAG_TEMP_2 call_if FALSE, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR - special sub_80CB580 + special Special_DrawElevatorCurrentFloorWindow message Text_1A535C waitmessage setvar VAR_0x8004, 3 - specialvar VAR_RESULT, sub_80CB328 + specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos switch VAR_RESULT case 0, EventScript_16C1B7 case 1, EventScript_16C1C3 @@ -109,15 +109,15 @@ EventScript_16C2E6:: @ 816C2E6 end EventScript_16C30E:: @ 816C30E - special sub_80CB63C + special Special_CloseElevatorCurrentFloorWindow releaseall end EventScript_16C313:: @ 816C313 - special sub_80CB63C + special Special_CloseElevatorCurrentFloorWindow closemessage waitse - special sub_80CB498 + special Special_AnimateElevator waitstate setflag FLAG_TEMP_2 return diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 7a95e7bf7..f79ffb046 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -273,7 +273,7 @@ EventScript_16C96C:: @ 816C96C setfieldeffectarg 2, 14 dofieldeffect 64 waitfieldeffect 64 - specialvar VAR_RESULT, sub_80CAABC + specialvar VAR_RESULT, Special_GetRandomSlotMachine playslotmachine VAR_RESULT releaseall end diff --git a/data/maps/CeruleanCity_House1/scripts.inc b/data/maps/CeruleanCity_House1/scripts.inc index 18bc90fb6..26995d532 100644 --- a/data/maps/CeruleanCity_House1/scripts.inc +++ b/data/maps/CeruleanCity_House1/scripts.inc @@ -8,7 +8,7 @@ CeruleanCity_House1_EventScript_16A7F0:: @ 816A7F0 message Text_191967 waitmessage setvar VAR_0x8004, 0 - special sub_80CB7C4 + special Special_ListMenu waitstate switch VAR_RESULT case 0, EventScript_16A8FB @@ -26,7 +26,7 @@ CeruleanCity_House1_EventScript_16A7F0:: @ 816A7F0 EventScript_16A87D:: @ 816A87D message Text_191967 waitmessage - special sub_80CBC5C + special Special_ReturnToListMenu waitstate switch VAR_RESULT case 0, EventScript_16A8FB diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc index 1f5d8899a..79cd75785 100644 --- a/data/maps/CeruleanCity_House5/scripts.inc +++ b/data/maps/CeruleanCity_House5/scripts.inc @@ -40,7 +40,7 @@ EventScript_16AEC8:: @ 816AEC8 message Text_1932F4 waitmessage setvar VAR_0x8004, 5 - special sub_80CB7C4 + special Special_ListMenu waitstate switch VAR_RESULT case 0, EventScript_16AF6C diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc index 6cf717fe5..8a7dc8df1 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc @@ -48,7 +48,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E faceplayer setvar VAR_0x8008, 7 copyvar VAR_0x8004, VAR_0x8008 - specialvar VAR_RESULT, sub_8053A9C + specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT checkflag FLAG_DID_TANGENY_TRADE goto_if TRUE, EventScript_16E3D4 @@ -61,14 +61,14 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E compare_var_to_value VAR_0x8004, 6 goto_if ge, EventScript_16E3BC copyvar VAR_0x8005, VAR_0x800A - specialvar VAR_RESULT, sub_8053D2C + specialvar VAR_RESULT, GetTradeSpecies copyvar VAR_0x800B, VAR_RESULT compare_var_to_var VAR_RESULT, VAR_0x8009 goto_if ne, EventScript_16E3C6 copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A - special sub_8053D68 - special sub_8054440 + special CreateInGameTradePokemon + special DoInGameTradeScene waitstate msgbox gUnknown_81A5B4A setflag FLAG_DID_TANGENY_TRADE diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index 18a6d0b14..1d1610ace 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -10,16 +10,16 @@ FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE faceplayer checkflag FLAG_TEMP_2 goto_if TRUE, EventScript_172043 - compare_var_to_value VAR_STORAGE_UNKNOWN, 65535 + compare_var_to_value VAR_RESORT_GORGEOUS_REQUESTED_MON, 0xFFFF goto_if eq, EventScript_171F0B - compare_var_to_value VAR_STORAGE_UNKNOWN, 0 + compare_var_to_value VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE goto_if ne, EventScript_171F19 msgbox gUnknown_81A42A0 goto EventScript_171EFE end EventScript_171EFE:: @ 8171EFE - special sub_80CB0A8 + special Special_SampleResortGorgeousMonAndReward msgbox gUnknown_81A4315 release end @@ -30,15 +30,15 @@ EventScript_171F0B:: @ 8171F0B end EventScript_171F19:: @ 8171F19 - copyvar VAR_0x8004, VAR_STORAGE_UNKNOWN - specialvar VAR_RESULT, sub_80CC48C + copyvar VAR_0x8004, VAR_RESORT_GORGEOUS_REQUESTED_MON + specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_171F34 goto EventScript_171EFE end EventScript_171F34:: @ 8171F34 - special sub_80CB0A8 + special Special_SampleResortGorgeousMonAndReward msgbox gUnknown_81A43F7 addobject 2 applymovement 2, Movement_172060 @@ -62,11 +62,11 @@ EventScript_171F34:: @ 8171F34 call_if eq, EventScript_17201A moveobjectoffscreen 2 msgbox gUnknown_81A458E - giveitem VAR_0x403B + giveitem VAR_RESORT_GORGEOUS_REWARD compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_172025 setflag FLAG_TEMP_2 - setvar VAR_STORAGE_UNKNOWN, 0 + setvar VAR_RESORT_GORGEOUS_REQUESTED_MON, 0 release end @@ -104,7 +104,7 @@ EventScript_172025:: @ 8172025 textcolor 1 msgbox gUnknown_81A461B setflag FLAG_TEMP_2 - setvar VAR_STORAGE_UNKNOWN, 0 + setvar VAR_RESORT_GORGEOUS_REQUESTED_MON, 0 release end diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc index 979486b7c..a334ab2df 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc @@ -13,7 +13,7 @@ FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E checkflag FLAG_NO_ROOM_FOR_TOGEPI_EGG goto_if TRUE, EventScript_16892C msgbox gUnknown_818A80D - specialvar VAR_RESULT, sub_80CA76C + specialvar VAR_RESULT, Special_GetLeadMonFriendship compare_var_to_value VAR_RESULT, 6 goto_if eq, EventScript_1688AC msgbox gUnknown_818A88F @@ -49,12 +49,12 @@ EventScript_1688BA:: @ 81688BA EventScript_1688E3:: @ 81688E3 getspeciesname 1, SPECIES_TOGEPI setvar VAR_0x8004, SPECIES_TOGEPI - specialvar VAR_RESULT, sub_80CD0F4 + specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_168895 getspeciesname 1, SPECIES_TOGETIC setvar VAR_0x8004, SPECIES_TOGETIC - specialvar VAR_RESULT, sub_80CD0F4 + specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_168895 msgbox gUnknown_818A9C0 diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 3ef1f2054..68788f93a 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -133,7 +133,7 @@ EventScript_167E19:: @ 8167E19 special GetDaycareMonNicknames msgbox gUnknown_81BF789 special SetDaycareCompatibilityString - special sub_80CA68C + special Special_ShowStringVar4AsFieldMessage waitmessage waitbuttonpress release diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index 7ca07b4ba..c91cc86e5 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -40,7 +40,7 @@ EventScript_171993:: @ 8171993 msgbox gUnknown_81BF860 waitmoncry special StoreSelectedPokemonInDaycare - incrementgamestat 47 + incrementgamestat GAME_STAT_USED_DAYCARE specialvar VAR_RESULT, GetDaycareState compare_var_to_value VAR_RESULT, 2 goto_if eq, EventScript_171A01 diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc index d62d5252d..ea921b4d1 100644 --- a/data/maps/FuchsiaCity/scripts.inc +++ b/data/maps/FuchsiaCity/scripts.inc @@ -72,7 +72,7 @@ FuchsiaCity_EventScript_166E07:: @ 8166E07 FuchsiaCity_EventScript_166E1F:: @ 8166E1F lockall setvar VAR_0x8004, SPECIES_CHANSEY - special sub_80CBDCC + special Special_SetSeenMon drawmonpic SPECIES_CHANSEY, 10, 3 msgbox gUnknown_81807A9 erasemonpic @@ -82,7 +82,7 @@ FuchsiaCity_EventScript_166E1F:: @ 8166E1F FuchsiaCity_EventScript_166E38:: @ 8166E38 lockall setvar VAR_0x8004, SPECIES_VOLTORB - special sub_80CBDCC + special Special_SetSeenMon drawmonpic SPECIES_VOLTORB, 10, 3 msgbox gUnknown_81807D9 erasemonpic @@ -92,7 +92,7 @@ FuchsiaCity_EventScript_166E38:: @ 8166E38 FuchsiaCity_EventScript_166E51:: @ 8166E51 lockall setvar VAR_0x8004, SPECIES_KANGASKHAN - special sub_80CBDCC + special Special_SetSeenMon drawmonpic SPECIES_KANGASKHAN, 10, 3 msgbox gUnknown_8180806 erasemonpic @@ -102,7 +102,7 @@ FuchsiaCity_EventScript_166E51:: @ 8166E51 FuchsiaCity_EventScript_166E6A:: @ 8166E6A lockall setvar VAR_0x8004, SPECIES_SLOWPOKE - special sub_80CBDCC + special Special_SetSeenMon drawmonpic SPECIES_SLOWPOKE, 10, 3 msgbox gUnknown_8180859 erasemonpic @@ -112,7 +112,7 @@ FuchsiaCity_EventScript_166E6A:: @ 8166E6A FuchsiaCity_EventScript_166E83:: @ 8166E83 lockall setvar VAR_0x8004, SPECIES_LAPRAS - special sub_80CBDCC + special Special_SetSeenMon drawmonpic SPECIES_LAPRAS, 10, 3 msgbox gUnknown_8180887 erasemonpic @@ -124,7 +124,7 @@ FuchsiaCity_EventScript_166E9C:: @ 8166E9C checkflag FLAG_GOT_DOME_FOSSIL goto_if TRUE, EventScript_166EBE setvar VAR_0x8004, SPECIES_KABUTO - special sub_80CBDCC + special Special_SetSeenMon drawmonpic SPECIES_KABUTO, 10, 3 msgbox gUnknown_81808FA erasemonpic @@ -133,7 +133,7 @@ FuchsiaCity_EventScript_166E9C:: @ 8166E9C EventScript_166EBE:: @ 8166EBE setvar VAR_0x8004, SPECIES_OMANYTE - special sub_80CBDCC + special Special_SetSeenMon drawmonpic SPECIES_OMANYTE, 10, 3 msgbox gUnknown_81808AE erasemonpic diff --git a/data/maps/FuchsiaCity_House3/scripts.inc b/data/maps/FuchsiaCity_House3/scripts.inc index f08f9371d..da4f19e60 100644 --- a/data/maps/FuchsiaCity_House3/scripts.inc +++ b/data/maps/FuchsiaCity_House3/scripts.inc @@ -16,7 +16,7 @@ EventScript_16D8B0:: @ 816D8B0 waitstate compare_var_to_value VAR_0x8004, 6 goto_if ge, EventScript_16D941 - special sub_80BFC14 + special IsSelectedMonEgg compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16D937 special ScrSpecial_CountPokemonMoves @@ -24,7 +24,7 @@ EventScript_16D8B0:: @ 816D8B0 goto_if eq, EventScript_16D92A msgbox gUnknown_8199445 fadescreen 1 - special Special_ChooseMoveToDelete + special SelectMove fadescreen 0 compare_var_to_value VAR_0x8005, 4 goto_if eq, EventScript_16D8B0 @@ -36,7 +36,7 @@ EventScript_16D8B0:: @ 816D8B0 end EventScript_16D919:: @ 816D919 - special Special_DeleteSelectedMove + special DeleteMonMove playfanfare MUS_ME_WASURE waitfanfare msgbox gUnknown_81994B1 diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index e1031e737..16b796efe 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -157,7 +157,7 @@ EventScript_16D462:: @ 816D462 countpokemon compare_var_to_value VAR_RESULT, 6 goto_if ne, EventScript_1A77A9 - specialvar VAR_RESULT, sub_80CABD0 + specialvar VAR_RESULT, Special_IsThereRoomInAnyBoxForMorePokemon compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1A77A9 msgbox gUnknown_81BFEAC diff --git a/data/maps/LavenderTown_House2/scripts.inc b/data/maps/LavenderTown_House2/scripts.inc index 213e84754..cd9e5e8d7 100644 --- a/data/maps/LavenderTown_House2/scripts.inc +++ b/data/maps/LavenderTown_House2/scripts.inc @@ -27,14 +27,14 @@ EventScript_16B2AA:: @ 816B2AA end EventScript_16B2B4:: @ 816B2B4 - specialvar VAR_RESULT, sub_80CAD54 + specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004 compare_var_to_value VAR_RESULT, SPECIES_EGG goto_if eq, EventScript_16B307 special TV_CopyNicknameToStringVar1AndEnsureTerminated special TV_CheckMonOTIDEqualsPlayerID compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16B311 - specialvar VAR_RESULT, sub_80CAD7C + specialvar VAR_RESULT, Special_BufferMonOTNameAndCompareToPlayerName special TV_CopyNicknameToStringVar1AndEnsureTerminated compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16B311 @@ -58,7 +58,7 @@ EventScript_16B311:: @ 816B311 EventScript_16B31B:: @ 816B31B msgbox gUnknown_8193B36 call EventScript_1A74EB - specialvar VAR_RESULT, sub_80CBFA0 + specialvar VAR_RESULT, NameRaterWasNicknameChanged special TV_CopyNicknameToStringVar1AndEnsureTerminated compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16B345 diff --git a/data/maps/MtEmber_RubyPath_B5F/scripts.inc b/data/maps/MtEmber_RubyPath_B5F/scripts.inc index c3d8b7320..53aec5282 100644 --- a/data/maps/MtEmber_RubyPath_B5F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B5F/scripts.inc @@ -7,31 +7,31 @@ MtEmber_RubyPath_B5F_EventScript_163BAB:: @ 8163BAB setvar VAR_0x8006, 0 braillemessage gUnknown_81A92C5 getbraillestringwidth gUnknown_81A92C5 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A92D0 getbraillestringwidth gUnknown_81A92D0 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A92DC getbraillestringwidth gUnknown_81A92DC - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A92E6 getbraillestringwidth gUnknown_81A92E6 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A92F2 getbraillestringwidth gUnknown_81A92F2 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A92FE getbraillestringwidth gUnknown_81A92FE - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A930A getbraillestringwidth gUnknown_81A930A - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton braillemessage gUnknown_81A9316 waitbuttonpress releaseall diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 4cca0f497..20cff0f8f 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -46,14 +46,14 @@ NavelRock_Base_EventScript_165134:: @ 8165134 setvar VAR_0x8005, 3 setvar VAR_0x8006, 4 setvar VAR_0x8007, 2 - special sub_80CAC28 + special Special_ShakeScreen delay 30 playse SE_T_AME_E setvar VAR_0x8004, 0 setvar VAR_0x8005, 3 setvar VAR_0x8006, 4 setvar VAR_0x8007, 2 - special sub_80CAC28 + special Special_ShakeScreen delay 30 delay 50 waitse diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index 0c5a694d7..563ef520f 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -45,7 +45,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB special SpawnCameraObject setvar VAR_0x8004, 3 setvar VAR_0x8005, 35 - special sub_80CD1B4 + special Special_LoopWingFlapSound applymovement 1, Movement_1650E0 applymovement 127, Movement_1650CD waitmovement 0 @@ -59,7 +59,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB delay 60 setvar VAR_0x8004, 3 setvar VAR_0x8005, 35 - special sub_80CD1B4 + special Special_LoopWingFlapSound applymovement 127, Movement_1650D1 applymovement 1, Movement_1650D7 waitmovement 0 diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index 7900d62e8..42c7d44ad 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -61,7 +61,7 @@ EventScript_168DB9:: @ 8168DB9 faceplayer compare_var_to_value VAR_0x8004, 6 goto_if ge, EventScript_168E3C - specialvar VAR_RESULT, sub_80CAD54 + specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004 compare_var_to_value VAR_RESULT, SPECIES_EGG goto_if eq, EventScript_168E32 msgbox gUnknown_818D8CC @@ -88,7 +88,7 @@ EventScript_168E3C:: @ 8168E3C EventScript_168E46:: @ 8168E46 msgbox gUnknown_818D9A5 - specialvar VAR_RESULT, sub_80CA76C + specialvar VAR_RESULT, Special_GetLeadMonFriendship switch VAR_RESULT case 0, EventScript_168EA6 case 1, EventScript_168EB0 diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index 80249e6c4..dc90bc7bf 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -38,10 +38,10 @@ PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4 setvar VAR_0x8004, 32 special Special_SetSomeVariable setvar VAR_0x8004, 1 - special sub_80CA86C + special Special_AnimatePcTurnOn playse SE_PC_ON msgbox gUnknown_81A5420 - special sub_80EB6AC + special BedroomPC waitstate special sub_812B35C releaseall @@ -50,7 +50,7 @@ PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4 EventScript_PalletTown_PlayersHouse_2F_ShutDownPC:: @ 8168D17 setvar VAR_0x8004, 1 playse SE_PC_OFF - special sub_80CA9A8 + special Special_AnimatePcTurnOff special sub_812B35C releaseall end diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc index c83bc7fd9..c6a199a52 100644 --- a/data/maps/RocketHideout_Elevator/scripts.inc +++ b/data/maps/RocketHideout_Elevator/scripts.inc @@ -9,11 +9,11 @@ RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9 checkflag FLAG_TEMP_2 call_if FALSE, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR - special sub_80CB580 + special Special_DrawElevatorCurrentFloorWindow message Text_1A535C waitmessage setvar VAR_0x8004, 2 - specialvar VAR_RESULT, sub_80CB328 + specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos switch VAR_RESULT case 0, EventScript_161530 case 1, EventScript_16153C @@ -87,15 +87,15 @@ EventScript_161608:: @ 8161608 end EventScript_161609:: @ 8161609 - special sub_80CB63C + special Special_CloseElevatorCurrentFloorWindow releaseall end EventScript_16160E:: @ 816160E - special sub_80CB63C + special Special_CloseElevatorCurrentFloorWindow closemessage waitse - special sub_80CB498 + special Special_AnimateElevator waitstate setflag FLAG_TEMP_2 return diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index 927bc3bea..0f0aa4f68 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -36,17 +36,17 @@ EventScript_16FF7F:: @ 816FF7F goto_if eq, EventScript_1A7AE0 special sub_8112364 setvar VAR_0x8004, SPECIES_MAGIKARP - specialvar VAR_RESULT, sub_80CC48C + specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_16FFF5 - special sub_80A096C + special GetMagikarpSizeRecordInfo msgbox gUnknown_819F2DB special Special_ChooseMonFromParty waitstate copyvar VAR_RESULT, VAR_0x8004 compare_var_to_value VAR_RESULT, 6 goto_if ge, EventScript_16FFFF - special sub_80A0984 + special CompareMagikarpSize compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_170001 compare_var_to_value VAR_RESULT, 2 @@ -110,7 +110,7 @@ Route12_FishingHouse_EventScript_170067:: @ 8170067 end EventScript_17007B:: @ 817007B - special sub_80A096C + special GetMagikarpSizeRecordInfo msgbox gUnknown_819F4CF releaseall end diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index 7ec851931..1b491d4e5 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -9,7 +9,7 @@ Route15_WestEntrance_2F_EventScript_170093:: @ 8170093 waitbuttonpress erasemonpic setvar VAR_0x8004, SPECIES_ARTICUNO - special sub_80CBDCC + special Special_SetSeenMon releaseall end diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index b20a716ca..0bc8d6c8a 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -27,7 +27,7 @@ Route16_MapScript3_168113:: @ 8168113 .2byte 0 EventScript_16811D:: @ 816811D - special sub_80CA630 + special Special_ForcePlayerOntoBike end Route16_EventScript_168121:: @ 8168121 diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc index dfc5f8578..cc6d11221 100644 --- a/data/maps/Route18/scripts.inc +++ b/data/maps/Route18/scripts.inc @@ -17,7 +17,7 @@ Route18_MapScript2_168211:: @ 8168211 .2byte 0 EventScript_16821B:: @ 816821B - special sub_80CA630 + special Special_ForcePlayerOntoBike end Route18_EventScript_16821F:: @ 816821F diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index b3c8e79ed..76be366f2 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -263,7 +263,7 @@ EventScript_17082B:: @ 817082B waitbuttonpress erasemonpic setvar VAR_0x8004, SPECIES_EEVEE - special sub_80CBDCC + special Special_SetSeenMon goto EventScript_1707D8 end @@ -272,7 +272,7 @@ EventScript_170840:: @ 8170840 waitbuttonpress erasemonpic setvar VAR_0x8004, SPECIES_FLAREON - special sub_80CBDCC + special Special_SetSeenMon goto EventScript_1707D8 end @@ -281,7 +281,7 @@ EventScript_170855:: @ 8170855 waitbuttonpress erasemonpic setvar VAR_0x8004, SPECIES_JOLTEON - special sub_80CBDCC + special Special_SetSeenMon goto EventScript_1707D8 end @@ -290,7 +290,7 @@ EventScript_17086A:: @ 817086A waitbuttonpress erasemonpic setvar VAR_0x8004, SPECIES_VAPOREON - special sub_80CBDCC + special Special_SetSeenMon goto EventScript_1707D8 end diff --git a/data/maps/SSAnne_2F_Room1/scripts.inc b/data/maps/SSAnne_2F_Room1/scripts.inc index f3dc1f136..9748777c7 100644 --- a/data/maps/SSAnne_2F_Room1/scripts.inc +++ b/data/maps/SSAnne_2F_Room1/scripts.inc @@ -7,7 +7,7 @@ SSAnne_2F_Room1_EventScript_160C97:: @ 8160C97 message Text_173CE3 waitmessage setvar VAR_0x8004, SPECIES_SNORLAX - special sub_80CBDCC + special Special_SetSeenMon drawmonpic SPECIES_SNORLAX, 10, 3 waitbuttonpress erasemonpic diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index 30d528791..426226422 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -78,37 +78,37 @@ SaffronCity_PokemonTrainerFanClub_MapScript2_16F144:: @ 816F144 end EventScript_16F15B:: @ 816F15B - special sub_81132CC + special UpdateMovedSaffronFanClubMembers setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_8113364 + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 0 call_if eq, EventScript_16F207 setvar VAR_0x8004, 1 - specialvar VAR_RESULT, sub_8113364 + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 0 call_if eq, EventScript_16F213 setvar VAR_0x8004, 2 - specialvar VAR_RESULT, sub_8113364 + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 0 call_if eq, EventScript_16F21F setvar VAR_0x8004, 3 - specialvar VAR_RESULT, sub_8113364 + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 0 call_if eq, EventScript_16F22B setvar VAR_0x8004, 4 - specialvar VAR_RESULT, sub_8113364 + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 0 call_if eq, EventScript_16F237 setvar VAR_0x8004, 5 - specialvar VAR_RESULT, sub_8113364 + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 0 call_if eq, EventScript_16F243 setvar VAR_0x8004, 6 - specialvar VAR_RESULT, sub_8113364 + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 0 call_if eq, EventScript_16F24F setvar VAR_0x8004, 7 - specialvar VAR_RESULT, sub_8113364 + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 0 call_if eq, EventScript_16F25B end @@ -165,13 +165,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281 lock faceplayer setvar VAR_0x8004, 0 - special sub_81133A4 + special BufferStreakTrainerText compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if eq, EventScript_16F2EE - specialvar VAR_RESULT, sub_8113364 + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F2C0 - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 7 goto_if eq, EventScript_16F2E4 msgbox gUnknown_819C420 @@ -179,7 +179,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281 end EventScript_16F2C0:: @ 816F2C0 - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F2DA msgbox gUnknown_819C390 @@ -205,13 +205,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8 lock faceplayer setvar VAR_0x8004, 3 - special sub_81133A4 + special BufferStreakTrainerText compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if eq, EventScript_16F365 - specialvar VAR_RESULT, sub_8113364 + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F337 - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 7 goto_if eq, EventScript_16F35B msgbox gUnknown_819CBD3 @@ -219,7 +219,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8 end EventScript_16F337:: @ 816F337 - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F351 msgbox gUnknown_819CB32 @@ -245,13 +245,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F lock faceplayer setvar VAR_0x8004, 1 - special sub_81133A4 + special BufferStreakTrainerText compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if eq, EventScript_16F3DC - specialvar VAR_RESULT, sub_8113364 + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F3AE - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 7 goto_if eq, EventScript_16F3D2 msgbox gUnknown_819C6BA @@ -259,7 +259,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F end EventScript_16F3AE:: @ 816F3AE - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F3C8 msgbox gUnknown_819C5A9 @@ -285,13 +285,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6 lock faceplayer setvar VAR_0x8004, 2 - special sub_81133A4 + special BufferStreakTrainerText compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 goto_if eq, EventScript_16F453 - specialvar VAR_RESULT, sub_8113364 + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F425 - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 7 goto_if eq, EventScript_16F449 msgbox gUnknown_819C986 @@ -299,7 +299,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6 end EventScript_16F425:: @ 816F425 - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F43F msgbox gUnknown_819C81E @@ -325,11 +325,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D lock faceplayer setvar VAR_0x8004, 5 - special sub_81133A4 - specialvar VAR_RESULT, sub_8113364 + special BufferStreakTrainerText + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F491 - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 7 goto_if eq, EventScript_16F4B5 msgbox gUnknown_819D01F @@ -337,7 +337,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D end EventScript_16F491:: @ 816F491 - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F4AB msgbox gUnknown_819CEDF @@ -358,11 +358,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF lock faceplayer setvar VAR_0x8004, 4 - special sub_81133A4 - specialvar VAR_RESULT, sub_8113364 + special BufferStreakTrainerText + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F4F3 - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 7 goto_if eq, EventScript_16F517 msgbox gUnknown_819CDDA @@ -370,7 +370,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF end EventScript_16F4F3:: @ 816F4F3 - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F50D msgbox gUnknown_819CCF3 @@ -391,11 +391,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521 lock faceplayer setvar VAR_0x8004, 6 - special sub_81133A4 - specialvar VAR_RESULT, sub_8113364 + special BufferStreakTrainerText + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F555 - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 7 goto_if eq, EventScript_16F579 msgbox gUnknown_819D1AE @@ -403,7 +403,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521 end EventScript_16F555:: @ 816F555 - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F56F msgbox gUnknown_819D0E3 @@ -424,11 +424,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583 lock faceplayer setvar VAR_0x8004, 7 - special sub_81133A4 - specialvar VAR_RESULT, sub_8113364 + special BufferStreakTrainerText + specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F5B7 - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 7 goto_if eq, EventScript_16F5DB msgbox gUnknown_819D3D2 @@ -436,7 +436,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583 end EventScript_16F5B7:: @ 816F5B7 - specialvar VAR_RESULT, sub_8113288 + specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16F5D1 msgbox gUnknown_819D2B4 diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 64ff2b3ab..8d69a4808 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -70,7 +70,7 @@ SeafoamIslands_B4F_MapScript4_1630E7:: @ 81630E7 EventScript_1630F1:: @ 81630F1 turnobject 255, 2 - special sub_80CBD80 + special Special_ForcePlayerToStartSurfing end SeafoamIslands_B4F_MapScript5_1630F9:: @ 81630F9 diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index 70813ddba..fd83fa051 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -90,7 +90,7 @@ EventScript_17097D:: @ 817097D EventScript_170987:: @ 8170987 special SavePlayerParty - special sub_80CAAAC + special Special_BufferEReaderTrainerName5 msgbox gUnknown_81A0598, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_170A11 @@ -105,7 +105,7 @@ EventScript_170987:: @ 8170987 compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_170A11 special SavePlayerParty - special sub_80A03D8 + special ReducePlayerPartyToThree msgbox gUnknown_81A07C4 closemessage compare_var_to_value VAR_FACING, 2 diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index d77eda077..f2928f916 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -4,7 +4,7 @@ SevenIsland_House_Room2_MapScripts:: @ 8170A7E .byte 0 SevenIsland_House_Room2_MapScript1_170A89:: @ 8170A89 - special sub_80E5E70 + special SetEReaderTrainerGfxId end SevenIsland_House_Room2_MapScript2_170A8D:: @ 8170A8D @@ -15,12 +15,12 @@ EventScript_170A97:: @ 8170A97 lockall applymovement 255, Movement_170B22 waitmovement 0 - special sub_80E7538 + special PrintEReaderTrainerGreeting msgbox gStringVar4 closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 - special sub_80E6900 + special StartSpecialBattle waitstate compare_var_to_value VAR_RESULT, 3 call_if eq, EventScript_170AFE @@ -46,14 +46,14 @@ EventScript_170AFE:: @ 8170AFE EventScript_170B0C:: @ 8170B0C setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1 - special sub_80CA68C + special Special_ShowStringVar4AsFieldMessage waitmessage waitbuttonpress return EventScript_170B17:: @ 8170B17 setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2 - special sub_80CA68C + special Special_ShowStringVar4AsFieldMessage waitmessage waitbuttonpress return diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index ecc28a62d..cf4f14540 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -290,7 +290,7 @@ "x": 7, "y": 17, "elevation": 5, - "dest_map": "MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY", + "dest_map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY", "dest_warp_id": 0 }, { diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index f8c9c1a1f..4f492d72d 100644 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY", - "name": "SevenIsland_SeavaultCanyon_TanobyKey", - "layout": "LAYOUT_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY", + "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY", + "name": "SevenIsland_SevaultCanyon_TanobyKey", + "layout": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY", "music": "MUS_NANAISEKI", "region_map_section": "MAPSEC_TANOBY_KEY", "requires_flash": false, @@ -122,7 +122,7 @@ "elevation": 3, "var": "VAR_0x4001", "var_value": 99, - "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39" }, { "type": "trigger", @@ -131,7 +131,7 @@ "elevation": 3, "var": "VAR_0x4007", "var_value": 99, - "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164F0B" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B" }, { "type": "trigger", @@ -140,7 +140,7 @@ "elevation": 3, "var": "VAR_0x4006", "var_value": 99, - "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8" }, { "type": "trigger", @@ -149,7 +149,7 @@ "elevation": 3, "var": "VAR_0x4005", "var_value": 99, - "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EC5" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5" }, { "type": "trigger", @@ -158,7 +158,7 @@ "elevation": 3, "var": "VAR_0x4004", "var_value": 99, - "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EA2" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2" }, { "type": "trigger", @@ -167,7 +167,7 @@ "elevation": 3, "var": "VAR_0x4003", "var_value": 99, - "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F" }, { "type": "trigger", @@ -176,7 +176,7 @@ "elevation": 3, "var": "VAR_0x4002", "var_value": 99, - "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C" + "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C" } ], "bg_events": [] diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc index 44dd71179..442e13942 100644 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc @@ -1,9 +1,9 @@ -SevenIsland_SeavaultCanyon_TanobyKey_MapScripts:: @ 8164DCC - map_script 3, SevenIsland_SeavaultCanyon_TanobyKey_MapScript1_164DD2 +SevenIsland_SevaultCanyon_TanobyKey_MapScripts:: @ 8164DCC + map_script 3, SevenIsland_SevaultCanyon_TanobyKey_MapScript1_164DD2 .byte 0 -SevenIsland_SeavaultCanyon_TanobyKey_MapScript1_164DD2:: @ 8164DD2 - setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY +SevenIsland_SevaultCanyon_TanobyKey_MapScript1_164DD2:: @ 8164DD2 + setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY checkflag FLAG_SYS_UNLOCKED_TANOBY_RUINS call_if TRUE, EventScript_164E07 setvar VAR_0x4001, 0 @@ -26,7 +26,7 @@ EventScript_164E07:: @ 8164E07 setobjectxyperm 7, 9, 8 return -SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39 lockall compare_var_to_value VAR_0x4001, 100 goto_if eq, EventScript_164F8A @@ -37,7 +37,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39 releaseall end -SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C +SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C lockall compare_var_to_value VAR_0x4002, 100 goto_if eq, EventScript_164F8A @@ -48,7 +48,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C releaseall end -SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F +SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F lockall compare_var_to_value VAR_0x4003, 100 goto_if eq, EventScript_164F8A @@ -59,7 +59,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F releaseall end -SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2 lockall compare_var_to_value VAR_0x4004, 100 goto_if eq, EventScript_164F8A @@ -70,7 +70,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2 releaseall end -SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5 lockall compare_var_to_value VAR_0x4005, 100 goto_if eq, EventScript_164F8A @@ -81,7 +81,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5 releaseall end -SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8 lockall compare_var_to_value VAR_0x4006, 100 goto_if eq, EventScript_164F8A @@ -92,7 +92,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8 releaseall end -SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B +SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B lockall compare_var_to_value VAR_0x4007, 100 goto_if eq, EventScript_164F8A @@ -110,7 +110,7 @@ EventScript_164F2E:: @ 8164F2E setvar VAR_0x8005, 1 setvar VAR_0x8006, 8 setvar VAR_0x8007, 3 - special sub_80CAC28 + special Special_ShakeScreen delay 60 return @@ -119,13 +119,13 @@ EventScript_164F51:: @ 8164F51 setvar VAR_0x8005, 2 setvar VAR_0x8006, 10 setvar VAR_0x8007, 3 - special sub_80CAC28 + special Special_ShakeScreen delay 60 setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 setvar VAR_0x8006, 12 setvar VAR_0x8007, 2 - special sub_80CAC28 + special Special_ShakeScreen delay 60 playse SE_FU_ZUZUZU waitse diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/text.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc index c6f137869..c6f137869 100644 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/text.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc index b1fc46abd..a415190da 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc @@ -9,11 +9,11 @@ SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03 checkflag FLAG_TEMP_2 call_if FALSE, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR - special sub_80CB580 + special Special_DrawElevatorCurrentFloorWindow message Text_1A535C waitmessage setvar VAR_0x8004, 6 - specialvar VAR_RESULT, sub_80CB328 + specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos switch VAR_RESULT case 0, EventScript_164B46 case 1, EventScript_164B52 @@ -44,7 +44,7 @@ EventScript_164B90:: @ 8164B90 goto_if eq, EventScript_164BD3 call EventScript_164BD8 setvar VAR_ELEVATOR_FLOOR, 3 - special sub_80CB63C + special Special_CloseElevatorCurrentFloorWindow delay 25 applymovement 255, Movement_164BE5 waitmovement 0 @@ -58,15 +58,15 @@ EventScript_164BCD:: @ 8164BCD end EventScript_164BD3:: @ 8164BD3 - special sub_80CB63C + special Special_CloseElevatorCurrentFloorWindow releaseall end EventScript_164BD8:: @ 8164BD8 - special sub_80CB63C + special Special_CloseElevatorCurrentFloorWindow closemessage waitse - special sub_80CB498 + special Special_AnimateElevator waitstate setflag FLAG_TEMP_2 return diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc index 9338e5c6e..4d75eec38 100644 --- a/data/maps/SilphCo_Elevator/scripts.inc +++ b/data/maps/SilphCo_Elevator/scripts.inc @@ -7,12 +7,12 @@ SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F checkflag FLAG_TEMP_2 call_if FALSE, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR - special sub_80CB580 + special Special_DrawElevatorCurrentFloorWindow message Text_1A535C waitmessage setvar VAR_0x8004, 1 - specialvar VAR_RESULT, sub_80CB328 - special sub_80CB7C4 + specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos + special Special_ListMenu waitstate switch VAR_RESULT case 0, EventScript_1621BF @@ -163,15 +163,15 @@ EventScript_1621E6:: @ 81621E6 end EventScript_1621E7:: @ 81621E7 - special sub_80CB63C + special Special_CloseElevatorCurrentFloorWindow releaseall end EventScript_1621EC:: @ 81621EC - special sub_80CB63C + special Special_CloseElevatorCurrentFloorWindow closemessage waitse - special sub_80CB498 + special Special_AnimateElevator waitstate setflag FLAG_TEMP_2 return diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index bf2e1eb6d..64ef24b72 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -28,7 +28,7 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 setvar VAR_0x8005, 0 setvar VAR_0x8006, 12 setvar VAR_0x8007, 3 - special sub_80CAC28 + special Special_ShakeScreen delay 60 compare_var_to_value VAR_FACING, 2 call_if eq, EventScript_164325 @@ -241,63 +241,63 @@ SixIsland_DottedHole_SapphireRoom_EventScript_16441F:: @ 816441F setvar VAR_0x8006, 0 braillemessage gUnknown_81A9321 getbraillestringwidth gUnknown_81A9321 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A932D getbraillestringwidth gUnknown_81A932D - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A9338 getbraillestringwidth gUnknown_81A9338 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A933F getbraillestringwidth gUnknown_81A933F - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A934A getbraillestringwidth gUnknown_81A934A - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A9356 getbraillestringwidth gUnknown_81A9356 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A9362 getbraillestringwidth gUnknown_81A9362 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A9368 getbraillestringwidth gUnknown_81A9368 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A9374 getbraillestringwidth gUnknown_81A9374 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A937C getbraillestringwidth gUnknown_81A937C - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A9387 getbraillestringwidth gUnknown_81A9387 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A9393 getbraillestringwidth gUnknown_81A9393 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A939F getbraillestringwidth gUnknown_81A939F - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A93AB getbraillestringwidth gUnknown_81A93AB - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A93B4 getbraillestringwidth gUnknown_81A93B4 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton braillemessage gUnknown_81A93C0 waitbuttonpress releaseall diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc index be9e12915..d38e40aac 100644 --- a/data/maps/SixIsland_WaterPath_House1/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc @@ -9,17 +9,17 @@ SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D goto_if eq, EventScript_1A7AE0 special sub_8112364 setvar VAR_0x8004, SPECIES_HERACROSS - specialvar VAR_RESULT, sub_80CC48C + specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1720E5 - special sub_80A0918 + special GetHeracrossSizeRecordInfo msgbox gUnknown_81A4A3F special Special_ChooseMonFromParty waitstate copyvar VAR_RESULT, VAR_0x8004 compare_var_to_value VAR_RESULT, 6 goto_if ge, EventScript_1720EF - special sub_80A0930 + special CompareHeracrossSize compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_1720F1 compare_var_to_value VAR_RESULT, 2 @@ -83,7 +83,7 @@ SixIsland_WaterPath_House1_EventScript_172157:: @ 8172157 end EventScript_17216B:: @ 817216B - special sub_80A0918 + special GetHeracrossSizeRecordInfo msgbox gUnknown_81A4C6E releaseall end diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index 739b926b0..3119a1d44 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -32,7 +32,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 giveitem ITEM_IAPAPA_BERRY compare_var_to_value VAR_RESULT, 0 call_if eq, EventScript_163D19 - special sub_80CA6DC + special Special_BufferBigGuyOrBigGirlString msgbox gUnknown_817AF3B closemessage setflag FLAG_RESCUED_LOSTELLE diff --git a/data/maps/ThreeIsland_House1/scripts.inc b/data/maps/ThreeIsland_House1/scripts.inc index 29952137a..7738d2e5c 100644 --- a/data/maps/ThreeIsland_House1/scripts.inc +++ b/data/maps/ThreeIsland_House1/scripts.inc @@ -4,7 +4,7 @@ ThreeIsland_House1_MapScripts:: @ 8171819 ThreeIsland_House1_EventScript_17181A:: @ 817181A lock faceplayer - special sub_80CA6DC + special Special_BufferBigGuyOrBigGirlString msgbox gUnknown_81A2F3E release end diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index 564ee8481..33f6d42fd 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -53,11 +53,11 @@ EventScript_1716A5:: @ 81716A5 EventScript_1716BE:: @ 81716BE msgbox gUnknown_81A2CC3 - special sub_80BF93C + special SelectMoveTutorMon waitstate compare_var_to_value VAR_0x8004, 6 goto_if ge, EventScript_17179E - special sub_80BFC14 + special IsSelectedMonEgg compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_171790 compare_var_to_value VAR_0x8005, 0 @@ -67,7 +67,7 @@ EventScript_1716BE:: @ 81716BE EventScript_1716F4:: @ 81716F4 msgbox gUnknown_81A2CE1 - special sub_80E4634 + special DisplayMoveTutorMenu waitstate compare_var_to_value VAR_0x8004, 0 goto_if eq, EventScript_1716BE diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index 7d4bb6684..798435eaf 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -37,7 +37,7 @@ EventScript_171435:: @ 8171435 textcolor 0 msgbox gUnknown_81A28B2 textcolor 1 - special sub_80CA6DC + special Special_BufferBigGuyOrBigGirlString msgbox gUnknown_81A2931 closemessage applymovement 3, Movement_1A75ED diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 3bf3c6982..8619c19ad 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -212,7 +212,7 @@ "SevenIsland_TanobyRuins_RixyChamber", "SevenIsland_TanobyRuins_ViapoisChamber", "ThreeIsland_DunsparceTunnel", - "SevenIsland_SeavaultCanyon_TanobyKey", + "SevenIsland_SevaultCanyon_TanobyKey", "NavelRock_1F", "NavelRock_Summit", "NavelRock_Base", diff --git a/data/specials.inc b/data/specials.inc index f5bb13bc6..8ef7a0671 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -7,11 +7,10 @@ .set __special__, 0 .align 2 - gSpecials:: @ 815FD60 def_special sp000_heal_pokemon def_special SetCableClubWarp - def_special sub_807E654 + def_special DoCableClubWarp def_special sub_807E704 def_special sub_8081744 def_special sub_8081770 @@ -66,10 +65,10 @@ gSpecials:: @ 815FD60 def_special GetTrainerFlag def_special ScrSpecial_EndTrainerApproach def_special SetUpTrainerEncounterMusic - def_special sub_810CD4C - def_special sub_810CEB4 + def_special ShouldTryRematchBattle + def_special ScrSpecial_GetTrainerEyeRematchFlag def_special ScrSpecial_StartTrainerEyeRematch - def_special sub_808C6A8 + def_special ShowPokemonStorageSystem def_special CheckForAlivePartyMons def_special nullsub_75 def_special nullsub_75 @@ -78,7 +77,7 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 - def_special sub_80CBEBC + def_special Special_HasLeadMonBeenRenamed def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 @@ -128,16 +127,16 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 - def_special sub_80A0918 - def_special sub_80A0930 - def_special sub_80A096C - def_special sub_80A0984 - def_special sub_80CBFA0 + def_special GetHeracrossSizeRecordInfo + def_special CompareHeracrossSize + def_special GetMagikarpSizeRecordInfo + def_special CompareMagikarpSize + def_special NameRaterWasNicknameChanged def_special TV_CopyNicknameToStringVar1AndEnsureTerminated def_special TV_CheckMonOTIDEqualsPlayerID def_special nullsub_75 def_special nullsub_75 - def_special sub_80BDB1C + def_special BufferRandomHobbyOrLifestyleString def_special nullsub_75 def_special RegisteredItemHandleBikeSwap def_special CalculatePlayerPartyCount @@ -150,15 +149,15 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 - def_special sub_80CA68C + def_special Special_ShowStringVar4AsFieldMessage def_special DrawWholeMapView - def_special sub_80CA69C + def_special Special_GetPlayerXY def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 - def_special sub_80CA6BC - def_special sub_80CA6DC - def_special sub_80CA714 + def_special Special_GetPlayerTrainerIdOnesDigit + def_special Special_BufferBigGuyOrBigGirlString + def_special Special_BufferSonOrDaughterString def_special Special_SetHiddenItemFlag def_special nullsub_75 def_special nullsub_75 @@ -172,11 +171,11 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 - def_special sub_8113364 - def_special sub_8113288 - def_special sub_81133A4 + def_special ShouldMoveSaffronFanClubMember + def_special GetNumMovedSaffronFanClubMembers + def_special BufferStreakTrainerText def_special sub_8113064 - def_special sub_81132CC + def_special UpdateMovedSaffronFanClubMembers def_special sub_8113510 def_special sub_81130A8 def_special sub_8113530 @@ -204,12 +203,12 @@ gSpecials:: @ 815FD60 def_special TakePokemonFromDaycare def_special ScriptHatchMon def_special EggHatch - def_special sub_8046EAC + def_special DaycareMonReceivedMail def_special Special_BattleRecords def_special IsEnoughForCostInVar0x8005 def_special SubtractMoneyFromVar0x8005 def_special ExecuteWhiteOut - def_special sub_80CA3C4 + def_special sp0C8_whiteout_maybe def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 @@ -222,49 +221,49 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special nullsub_75 def_special Special_GetPokedexCount - def_special sub_80CA524 - def_special sub_80CA86C - def_special sub_80CA9A8 + def_special Special_GetProfOaksRatingMessage + def_special Special_AnimatePcTurnOn + def_special Special_AnimatePcTurnOff def_special Special_GetElevatorFloor def_special nullsub_75 def_special nullsub_75 - def_special sub_80BF93C - def_special Special_ChooseMoveToDelete - def_special Special_DeleteSelectedMove + def_special SelectMoveTutorMon + def_special SelectMove + def_special DeleteMonMove def_special ScrSpecial_GetPokemonNicknameAndMoveName def_special ScrSpecial_CountPokemonMoves - def_special sub_80E4634 + def_special DisplayMoveTutorMenu def_special nullsub_75 def_special nullsub_75 - def_special sub_80CA664 + def_special Special_GetPlayerAvatarBike def_special nullsub_75 def_special nullsub_75 - def_special sub_80CA76C + def_special Special_GetLeadMonFriendship def_special sub_80E5970 - def_special sub_80E5C28 - def_special sub_80E6648 - def_special sub_80E67FC - def_special sub_80E7538 - def_special sub_80E6900 - def_special sub_80E6A0C - def_special sub_80E6C8C - def_special sub_80E6E14 - def_special sub_80E6FB8 - def_special sub_80E7058 - def_special sub_80E71D0 - def_special sub_80E724C - def_special sub_80E72B8 - def_special sub_80A0380 + def_special ChooseNextBattleTowerTrainer + def_special CheckPartyBattleTowerBanlist + def_special PrintBattleTowerTrainerGreeting + def_special PrintEReaderTrainerGreeting + def_special StartSpecialBattle + def_special SetBattleTowerProperty + def_special BattleTowerUtil + def_special SetBattleTowerParty + def_special SaveBattleTowerProgress + def_special BattleTower_SoftReset + def_special DetermineBattleTowerPrize + def_special GiveBattleTowerPrize + def_special AwardBattleTowerRibbons + def_special ChooseBattleTowerPlayerParty def_special ValidateEReaderTrainer def_special nullsub_75 - def_special sub_80A03D8 - def_special sub_80EB6AC - def_special sub_80EB6FC - def_special sub_80CA7EC - def_special sub_8053A9C - def_special sub_8053D68 - def_special sub_8054440 - def_special sub_8053D2C + def_special ReducePlayerPartyToThree + def_special BedroomPC + def_special PlayerPC + def_special Special_TownMap + def_special GetInGameTradeSpeciesInfo + def_special CreateInGameTradePokemon + def_special DoInGameTradeScene + def_special GetTradeSpecies def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 @@ -273,7 +272,7 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special ScrSpecial_CreatePCMenu def_special HallOfFamePCBeginFade - def_special sub_80CA618 + def_special Special_ShowDiploma def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 @@ -282,7 +281,7 @@ gSpecials:: @ 815FD60 def_special nullsub_61 def_special DoSoftReset def_special Special_HallOfFame - def_special sub_80CB498 + def_special Special_AnimateElevator def_special nullsub_75 def_special SpawnCameraObject def_special RemoveCameraObject @@ -294,32 +293,32 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 - def_special sub_80CAAAC - def_special sub_80CAABC + def_special Special_BufferEReaderTrainerName5 + def_special Special_GetRandomSlotMachine def_special GetPlayerFacingDirection def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 def_special LeadMonHasEffortRibbon - def_special GivLeadMonEffortRibbon + def_special GiveLeadMonEffortRibbon def_special ScrSpecial_AreLeadMonEVsMaxedOut def_special sub_8069740 def_special sub_8069768 def_special InitRoamer def_special nullsub_75 - def_special sub_80CA804 + def_special Special_PlayerHasGrassPokemonInParty def_special nullsub_75 def_special nullsub_75 - def_special sub_80CAB78 + def_special Special_IsStarterFirstStageInParty def_special nullsub_75 - def_special sub_80CABD0 + def_special Special_IsThereRoomInAnyBoxForMorePokemon def_special nullsub_75 - def_special sub_80CB580 + def_special Special_DrawElevatorCurrentFloorWindow def_special nullsub_75 - def_special sub_80CAC08 + def_special Special_CheckPartyPokerus def_special sub_806E99C - def_special sub_80CAC28 + def_special Special_ShakeScreen def_special Special_StartGroudonKyogreBattle def_special Special_StartLegendaryBattle def_special Special_StartRegiBattle @@ -331,13 +330,13 @@ gSpecials:: @ 815FD60 def_special DoFallWarp def_special nullsub_75 def_special nullsub_75 - def_special sub_80E5E70 + def_special SetEReaderTrainerGfxId def_special ScrSpecial_StartSouthernIslandBattle def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 - def_special sub_80CAD54 - def_special sub_80BFC14 + def_special Special_GetSpeciesOfPartySlot_x8004 + def_special IsSelectedMonEgg def_special nullsub_75 def_special nullsub_75 def_special LoadPlayerBag @@ -345,31 +344,31 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special nullsub_75 def_special HasAllKantoMons - def_special sub_80CAD7C + def_special Special_BufferMonOTNameAndCompareToPlayerName def_special nullsub_75 - def_special sub_80E759C + def_special Dummy_TryEnableBravoTrainerBattleTower def_special GetNameOfEnigmaBerryInPlayerParty def_special nullsub_75 def_special sub_810B82C def_special ScrSpecial_StartMarowakBattle - def_special sub_80CA630 - def_special sub_80CB7C4 - def_special sub_80CBC5C + def_special Special_ForcePlayerOntoBike + def_special Special_ListMenu + def_special Special_ReturnToListMenu def_special sub_80CADC4 def_special Special_SetVermilionTrashCans def_special sub_805D1A8 - def_special sub_80CB0A8 + def_special Special_SampleResortGorgeousMonAndReward def_special Special_CheckAddCoins def_special GetDaycarePokemonCount - def_special sub_80CB63C - def_special sub_80CBD80 + def_special Special_CloseElevatorCurrentFloorWindow + def_special Special_ForcePlayerToStartSurfing def_special ScrSpecial_GetStarter - def_special sub_80CBDCC + def_special Special_SetSeenMon def_special sub_810C444 def_special sub_80CC7B4 def_special ChangeBoxPokemonNickname - def_special sub_80CC2BC - def_special sub_80CC3CC + def_special Special_UpdateTrainerCardPhotoIcons + def_special Special_StickerLadyGetBragFlags def_special sub_80CC524 def_special IsWirelessAdapterConnected def_special sub_8115A24 @@ -389,7 +388,7 @@ gSpecials:: @ 815FD60 def_special GetNumLevelsGainedForRoute5DaycareMon def_special TakePokemonFromRoute5Daycare def_special ScrSpecial_SeaGallopFerry - def_special sub_80CC48C + def_special Special_PlayerPartyContainsSpecies def_special Special_SetSomeVariable def_special HelpSystem_BackupSomeVariable def_special HelpSystem_RestoreSomeVariable @@ -398,7 +397,7 @@ gSpecials:: @ 815FD60 def_special sub_811999C def_special sp182_move_string def_special sub_811390C - def_special sub_80CC4D4 + def_special Special_GetMartClerkObjectId def_special Special_BattleCardAction def_special sub_8110AB4 def_special sub_8112364 @@ -415,7 +414,7 @@ gSpecials:: @ 815FD60 def_special IsNationalPokedexEnabled def_special sub_815D9E8 def_special sub_814B504 - def_special sub_80CC8CC + def_special Special_ItemIsTM_GetMoveName def_special Special_DaisyMassageServices def_special HelpSystem_Disable def_special HelpSystem_Enable @@ -426,31 +425,31 @@ gSpecials:: @ 815FD60 def_special sub_815EEB0 def_special sub_815EF5C def_special sub_815F070 - def_special sub_80CC974 + def_special Special_PokemonLeagueLightingEffect def_special sub_814EA7C - def_special sub_80CCB94 - def_special sub_80CCCF8 + def_special Special_CapeBrinkGetMoveToTeachLeadPokemon + def_special Special_HasLearnedAllMovesFromCapeBrinkTutor def_special Special_Credits def_special sub_8153810 def_special sub_809D764 def_special sub_809D8C0 def_special sub_8147500 def_special GetPlayerFacingDirection - def_special sub_80CCDFC - def_special sub_80CD008 + def_special Special_DeoxysSound + def_special Special_SetDeoxysTriangleObjectPal def_special sub_8147594 - def_special sub_80CD034 + def_special Special_BadEggInParty def_special sub_815D834 def_special HasAllMons - def_special sub_80CD074 - def_special sub_80CD098 + def_special Special_PlayerIsNotInTrainerTowerLobby + def_special Special_BrailleCursorToggle def_special sub_811B15C - def_special sub_80CD0F4 + def_special Special_PlayerPartyContainsSpeciesWithPlayerID def_special sub_809C4A8 def_special sub_81537C0 def_special sub_809C5FC - def_special sub_80CB328 + def_special Special_InitElevatorFloorSelectMenuPos def_special Special_ComputeLoreleiDollCollection - def_special sub_80CD1B4 + def_special Special_LoopWingFlapSound def_special CreateObedientEnemyMon gSpecialsEnd:: diff --git a/data/strings.s b/data/strings.s index 1d086f4c8..546f40899 100644 --- a/data/strings.s +++ b/data/strings.s @@ -1394,7 +1394,7 @@ gUnknown_8417920:: @ 0x8417920 gUnknown_8417926:: @ 0x8417926 .string "OK$" -gUnknown_8417929:: @ 0x8417929 +gOtherText_Quit:: @ 0x8417929 .string "QUIT$" gUnknown_841792E:: @ 0x841792E |