summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2019-10-24 16:31:38 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2019-10-24 16:31:38 -0400
commita18e9c27e1b64ddb67d25afe815163c209247d9b (patch)
tree9fc9fe7c037d53250ee4cbfeb462753191130ed7
parent440d06293682f9060ec7c6bd1bba6575981733de (diff)
Rename specials according to Ruby
-rw-r--r--asm/battle_2.s2
-rw-r--r--asm/battle_setup.s62
-rw-r--r--asm/battle_tower.s92
-rw-r--r--asm/cable_club.s4
-rw-r--r--asm/easy_chat.s6
-rw-r--r--asm/learn_move.s6
-rw-r--r--asm/pokemon_size_record.s24
-rw-r--r--asm/pokemon_storage_system.s6
-rw-r--r--asm/post_battle_event_funcs.s6
-rw-r--r--asm/script_pokemon_util_80A0058.s14
-rw-r--r--asm/script_pokemon_util_80BF8FC.s24
-rw-r--r--asm/trade.s24
-rw-r--r--data/event_scripts.s512
-rw-r--r--data/maps/BirthIsland_Exterior/scripts.inc2
-rw-r--r--data/maps/CeruleanCave_B1F/scripts.inc2
-rw-r--r--data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc8
-rw-r--r--data/maps/FiveIsland_ResortGorgeous_House/scripts.inc12
-rw-r--r--data/maps/FuchsiaCity_House3/scripts.inc6
-rw-r--r--data/maps/LavenderTown_House2/scripts.inc2
-rw-r--r--data/maps/MtEmber_Summit/scripts.inc2
-rw-r--r--data/maps/NavelRock_Base/scripts.inc2
-rw-r--r--data/maps/NavelRock_Summit/scripts.inc2
-rw-r--r--data/maps/PalletTown_PlayersHouse_2F/scripts.inc2
-rw-r--r--data/maps/PokemonTower_6F/scripts.inc2
-rw-r--r--data/maps/PowerPlant/scripts.inc2
-rw-r--r--data/maps/Route12_FishingHouse/scripts.inc6
-rw-r--r--data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc82
-rw-r--r--data/maps/SeafoamIslands_B4F/scripts.inc2
-rw-r--r--data/maps/SevenIsland_House_Room1/scripts.inc2
-rw-r--r--data/maps/SevenIsland_House_Room2/scripts.inc6
-rw-r--r--data/maps/SixIsland_WaterPath_House1/scripts.inc6
-rw-r--r--data/maps/TwoIsland_House/scripts.inc6
-rw-r--r--data/maps/ViridianCity/scripts.inc4
-rw-r--r--data/specials.inc111
-rw-r--r--include/constants/vars.h8
-rw-r--r--src/daycare.c2
-rw-r--r--src/field_fadetransition.c2
-rw-r--r--src/field_specials.c22
-rw-r--r--src/player_pc.c4
-rw-r--r--src/prof_pc.c6
-rw-r--r--src/quest_log.c8
-rw-r--r--src/vs_seeker.c4
42 files changed, 553 insertions, 554 deletions
diff --git a/asm/battle_2.s b/asm/battle_2.s
index bb696b4ab..5e342a50f 100644
--- a/asm/battle_2.s
+++ b/asm/battle_2.s
@@ -11209,7 +11209,7 @@ _080157E0:
ands r1, r0
cmp r1, 0
beq _08015824
- bl sub_80803CC
+ bl ScrSpecial_GetTrainerBattleMode
lsls r0, 24
lsrs r0, 24
cmp r0, 0x9
diff --git a/asm/battle_setup.s b/asm/battle_setup.s
index e8e0071db..5b2dd8144 100644
--- a/asm/battle_setup.s
+++ b/asm/battle_setup.s
@@ -291,8 +291,8 @@ sub_807F868: @ 807F868
bx r0
thumb_func_end sub_807F868
- thumb_func_start sub_807F888
-sub_807F888: @ 807F888
+ thumb_func_start ScrSpecial_StartOldManTutorialBattle
+ScrSpecial_StartOldManTutorialBattle: @ 807F888
push {lr}
ldr r0, _0807F8B4 @ =gEnemyParty
movs r1, 0xD
@@ -316,7 +316,7 @@ _0807F8B4: .4byte gEnemyParty
_0807F8B8: .4byte gMain
_0807F8BC: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
_0807F8C0: .4byte gBattleTypeFlags
- thumb_func_end sub_807F888
+ thumb_func_end ScrSpecial_StartOldManTutorialBattle
thumb_func_start BattleSetup_StartScriptedWildBattle
BattleSetup_StartScriptedWildBattle: @ 807F8C4
@@ -346,8 +346,8 @@ _0807F8FC: .4byte sub_807FBA0
_0807F900: .4byte gBattleTypeFlags
thumb_func_end BattleSetup_StartScriptedWildBattle
- thumb_func_start sub_807F904
-sub_807F904: @ 807F904
+ thumb_func_start ScrSpecial_StartMarowakBattle
+ScrSpecial_StartMarowakBattle: @ 807F904
push {lr}
sub sp, 0xC
bl ScriptContext2_Enable
@@ -408,10 +408,10 @@ _0807F960:
_0807F98C: .4byte gBattleTypeFlags
_0807F990: .4byte gEnemyParty
_0807F994: .4byte gUnknown_841D148
- thumb_func_end sub_807F904
+ thumb_func_end ScrSpecial_StartMarowakBattle
- thumb_func_start sub_807F998
-sub_807F998: @ 807F998
+ thumb_func_start ScrSpecial_StartSouthernIslandBattle
+ScrSpecial_StartSouthernIslandBattle: @ 807F998
push {lr}
bl ScriptContext2_Enable
ldr r1, _0807F9CC @ =gMain
@@ -436,10 +436,10 @@ sub_807F998: @ 807F998
_0807F9CC: .4byte gMain
_0807F9D0: .4byte sub_807FBA0
_0807F9D4: .4byte gBattleTypeFlags
- thumb_func_end sub_807F998
+ thumb_func_end ScrSpecial_StartSouthernIslandBattle
- thumb_func_start sub_807F9D8
-sub_807F9D8: @ 807F9D8
+ thumb_func_start Special_StartLegendaryBattle
+Special_StartLegendaryBattle: @ 807F9D8
push {lr}
bl ScriptContext2_Enable
ldr r1, _0807FA0C @ =gMain
@@ -508,10 +508,10 @@ _0807FA56:
bl IncrementGameStat
pop {r0}
bx r0
- thumb_func_end sub_807F9D8
+ thumb_func_end Special_StartLegendaryBattle
- thumb_func_start sub_807FA68
-sub_807FA68: @ 807FA68
+ thumb_func_start Special_StartGroudonKyogreBattle
+Special_StartGroudonKyogreBattle: @ 807FA68
push {lr}
bl ScriptContext2_Enable
ldr r1, _0807FA90 @ =gMain
@@ -547,10 +547,10 @@ _0807FAAA:
bl IncrementGameStat
pop {r0}
bx r0
- thumb_func_end sub_807FA68
+ thumb_func_end Special_StartGroudonKyogreBattle
- thumb_func_start sub_807FABC
-sub_807FABC: @ 807FABC
+ thumb_func_start Special_StartRegiBattle
+Special_StartRegiBattle: @ 807FABC
push {lr}
bl ScriptContext2_Enable
ldr r1, _0807FAEC @ =gMain
@@ -574,7 +574,7 @@ sub_807FABC: @ 807FABC
_0807FAEC: .4byte gMain
_0807FAF0: .4byte sub_807FBA0
_0807FAF4: .4byte gBattleTypeFlags
- thumb_func_end sub_807FABC
+ thumb_func_end Special_StartRegiBattle
thumb_func_start sub_807FAF8
sub_807FAF8: @ 807FAF8
@@ -1717,14 +1717,14 @@ _080803C4: .4byte gSelectedEventObject
_080803C8: .4byte gMapObjects
thumb_func_end sub_8080398
- thumb_func_start sub_80803CC
-sub_80803CC: @ 80803CC
+ thumb_func_start ScrSpecial_GetTrainerBattleMode
+ScrSpecial_GetTrainerBattleMode: @ 80803CC
ldr r0, _080803D4 @ =gUnknown_20386AC
ldrb r0, [r0]
bx lr
.align 2, 0
_080803D4: .4byte gUnknown_20386AC
- thumb_func_end sub_80803CC
+ thumb_func_end ScrSpecial_GetTrainerBattleMode
thumb_func_start sub_80803D8
sub_80803D8: @ 80803D8
@@ -1817,7 +1817,7 @@ BattleSetup_StartTrainerBattle: @ 8080464
ldr r4, _080804A0 @ =gBattleTypeFlags
movs r0, 0x8
str r0, [r4]
- bl sub_80803CC
+ bl ScrSpecial_GetTrainerBattleMode
lsls r0, 24
lsrs r0, 24
cmp r0, 0x9
@@ -1964,8 +1964,8 @@ _080805A6:
_080805AC: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
thumb_func_end sub_8080558
- thumb_func_start sub_80805B0
-sub_80805B0: @ 80805B0
+ thumb_func_start ScrSpecial_StartTrainerEyeRematch
+ScrSpecial_StartTrainerEyeRematch: @ 80805B0
push {lr}
ldr r1, _080805CC @ =gBattleTypeFlags
movs r0, 0x8
@@ -1981,16 +1981,16 @@ sub_80805B0: @ 80805B0
_080805CC: .4byte gBattleTypeFlags
_080805D0: .4byte gMain
_080805D4: .4byte sub_8080558
- thumb_func_end sub_80805B0
+ thumb_func_end ScrSpecial_StartTrainerEyeRematch
- thumb_func_start sub_80805D8
-sub_80805D8: @ 80805D8
+ thumb_func_start ScrSpecial_ShowTrainerIntroSpeech
+ScrSpecial_ShowTrainerIntroSpeech: @ 80805D8
push {lr}
bl sub_80806D8
bl ShowFieldMessage
pop {r0}
bx r0
- thumb_func_end sub_80805D8
+ thumb_func_end ScrSpecial_ShowTrainerIntroSpeech
thumb_func_start BattleSetup_GetScriptAddrAfterBattle
BattleSetup_GetScriptAddrAfterBattle: @ 80805E8
@@ -2024,14 +2024,14 @@ _08080610: .4byte gUnknown_20386C8
_08080614: .4byte EventScript_1C555B
thumb_func_end BattleSetup_GetTrainerPostBattleScript
- thumb_func_start sub_8080618
-sub_8080618: @ 8080618
+ thumb_func_start ScrSpecial_ShowTrainerNonBattlingSpeech
+ScrSpecial_ShowTrainerNonBattlingSpeech: @ 8080618
push {lr}
bl sub_8080734
bl ShowFieldMessage
pop {r0}
bx r0
- thumb_func_end sub_8080618
+ thumb_func_end ScrSpecial_ShowTrainerNonBattlingSpeech
thumb_func_start PlayTrainerEncounterMusic
PlayTrainerEncounterMusic: @ 8080628
diff --git a/asm/battle_tower.s b/asm/battle_tower.s
index 6b8b36642..72cba63a3 100644
--- a/asm/battle_tower.s
+++ b/asm/battle_tower.s
@@ -358,8 +358,8 @@ _080E5C20: .4byte gSaveBlock2Ptr
_080E5C24: .4byte 0x0000056c
thumb_func_end sub_80E5B14
- thumb_func_start sub_80E5C28
-sub_80E5C28: @ 80E5C28
+ thumb_func_start ChooseNextBattleTowerTrainer
+ChooseNextBattleTowerTrainer: @ 80E5C28
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -637,7 +637,7 @@ _080E5E4C: .4byte 0x00000572
_080E5E50: .4byte gSaveBlock2Ptr
_080E5E54: .4byte 0x0000056c
_080E5E58: .4byte 0x00000571
- thumb_func_end sub_80E5C28
+ thumb_func_end ChooseNextBattleTowerTrainer
thumb_func_start sub_80E5E5C
sub_80E5E5C: @ 80E5E5C
@@ -651,14 +651,14 @@ sub_80E5E5C: @ 80E5E5C
_080E5E6C: .4byte 0x00004010
thumb_func_end sub_80E5E5C
- thumb_func_start sub_80E5E70
-sub_80E5E70: @ 80E5E70
+ thumb_func_start SetEReaderTrainerGfxId
+SetEReaderTrainerGfxId: @ 80E5E70
push {lr}
movs r0, 0xC8
bl sub_80E5E5C
pop {r0}
bx r0
- thumb_func_end sub_80E5E70
+ thumb_func_end SetEReaderTrainerGfxId
thumb_func_start sub_80E5E7C
sub_80E5E7C: @ 80E5E7C
@@ -1700,8 +1700,8 @@ _080E6640: .4byte gUnknown_84020C4
_080E6644: .4byte 0x0000ffff
thumb_func_end sub_80E6564
- thumb_func_start sub_80E6648
-sub_80E6648: @ 80E6648
+ thumb_func_start CheckPartyBattleTowerBanlist
+CheckPartyBattleTowerBanlist: @ 80E6648
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1854,7 +1854,7 @@ _080E6770:
_080E6780: .4byte gSpecialVar_0x8004
_080E6784: .4byte gSaveBlock2Ptr
_080E6788: .4byte 0x0000055c
- thumb_func_end sub_80E6648
+ thumb_func_end CheckPartyBattleTowerBanlist
thumb_func_start sub_80E678C
sub_80E678C: @ 80E678C
@@ -1918,8 +1918,8 @@ _080E67F0:
_080E67F8: .4byte gStringVar4
thumb_func_end sub_80E678C
- thumb_func_start sub_80E67FC
-sub_80E67FC: @ 80E67FC
+ thumb_func_start PrintBattleTowerTrainerGreeting
+PrintBattleTowerTrainerGreeting: @ 80E67FC
push {lr}
ldr r0, _080E6818 @ =gSaveBlock2Ptr
ldr r2, [r0]
@@ -1962,7 +1962,7 @@ _080E684C:
bx r0
.align 2, 0
_080E6850: .4byte 0xffffc154
- thumb_func_end sub_80E67FC
+ thumb_func_end PrintBattleTowerTrainerGreeting
thumb_func_start sub_80E6854
sub_80E6854: @ 80E6854
@@ -2048,8 +2048,8 @@ _080E68F8: .4byte sub_80E6854
_080E68FC: .4byte sub_800FD9C
thumb_func_end sub_80E68C4
- thumb_func_start sub_80E6900
-sub_80E6900: @ 80E6900
+ thumb_func_start StartSpecialBattle
+StartSpecialBattle: @ 80E6900
push {r4-r6,lr}
sub sp, 0x4
ldr r0, _080E691C @ =gUnknown_203AAB8
@@ -2168,10 +2168,10 @@ _080E69FC: .4byte gBattleTypeFlags
_080E6A00: .4byte 0x00000808
_080E6A04: .4byte gTrainerBattleOpponent_A
_080E6A08: .4byte sub_80E68C4
- thumb_func_end sub_80E6900
+ thumb_func_end StartSpecialBattle
- thumb_func_start sub_80E6A0C
-sub_80E6A0C: @ 80E6A0C
+ thumb_func_start SetBattleTowerProperty
+SetBattleTowerProperty: @ 80E6A0C
push {r4-r6,lr}
ldr r1, _080E6A34 @ =gSaveBlock2Ptr
ldr r0, [r1]
@@ -2469,10 +2469,10 @@ _080E6C80:
bx r0
.align 2, 0
_080E6C88: .4byte 0x0000055c
- thumb_func_end sub_80E6A0C
+ thumb_func_end SetBattleTowerProperty
- thumb_func_start sub_80E6C8C
-sub_80E6C8C: @ 80E6C8C
+ thumb_func_start BattleTowerUtil
+BattleTowerUtil: @ 80E6C8C
push {r4,lr}
ldr r1, _080E6CB4 @ =gSaveBlock2Ptr
ldr r0, [r1]
@@ -2652,10 +2652,10 @@ _080E6E08:
bx r0
.align 2, 0
_080E6E10: .4byte 0x0000055c
- thumb_func_end sub_80E6C8C
+ thumb_func_end BattleTowerUtil
- thumb_func_start sub_80E6E14
-sub_80E6E14: @ 80E6E14
+ thumb_func_start SetBattleTowerParty
+SetBattleTowerParty: @ 80E6E14
push {r4,r5,lr}
movs r2, 0
ldr r5, _080E6E3C @ =gUnknown_203B0D4
@@ -2671,7 +2671,7 @@ _080E6E1E:
adds r2, 0x1
cmp r2, 0x2
ble _080E6E1E
- bl sub_80A03D8
+ bl ReducePlayerPartyToThree
pop {r4,r5}
pop {r0}
bx r0
@@ -2679,7 +2679,7 @@ _080E6E1E:
_080E6E3C: .4byte gUnknown_203B0D4
_080E6E40: .4byte gSaveBlock2Ptr
_080E6E44: .4byte 0x0000056d
- thumb_func_end sub_80E6E14
+ thumb_func_end SetBattleTowerParty
thumb_func_start sub_80E6E48
sub_80E6E48: @ 80E6E48
@@ -2858,8 +2858,8 @@ _080E6FB0: .4byte 0x0000056d
_080E6FB4: .4byte gUnknown_2024220
thumb_func_end sub_80E6EE0
- thumb_func_start sub_80E6FB8
-sub_80E6FB8: @ 80E6FB8
+ thumb_func_start SaveBattleTowerProgress
+SaveBattleTowerProgress: @ 80E6FB8
push {r4,r5,lr}
ldr r0, _080E703C @ =gSaveBlock2Ptr
ldr r1, [r0]
@@ -2933,15 +2933,15 @@ _080E7048: .4byte 0x00000564
_080E704C: .4byte gBattleOutcome
_080E7050: .4byte 0x0000055d
_080E7054: .4byte 0x0000055e
- thumb_func_end sub_80E6FB8
+ thumb_func_end SaveBattleTowerProgress
- thumb_func_start sub_80E7058
-sub_80E7058: @ 80E7058
+ thumb_func_start BattleTower_SoftReset
+BattleTower_SoftReset: @ 80E7058
push {lr}
bl DoSoftReset
pop {r0}
bx r0
- thumb_func_end sub_80E7058
+ thumb_func_end BattleTower_SoftReset
thumb_func_start sub_80E7064
sub_80E7064: @ 80E7064
@@ -3142,8 +3142,8 @@ _080E71C8: .4byte 0x0000ffff
_080E71CC: .4byte 0x0000270f
thumb_func_end sub_80E7188
- thumb_func_start sub_80E71D0
-sub_80E71D0: @ 80E71D0
+ thumb_func_start DetermineBattleTowerPrize
+DetermineBattleTowerPrize: @ 80E71D0
push {r4,r5,lr}
ldr r4, _080E7214 @ =gSaveBlock2Ptr
ldr r1, [r4]
@@ -3201,10 +3201,10 @@ _080E7240:
bx r0
.align 2, 0
_080E7248: .4byte gUnknown_84020DA
- thumb_func_end sub_80E71D0
+ thumb_func_end DetermineBattleTowerPrize
- thumb_func_start sub_80E724C
-sub_80E724C: @ 80E724C
+ thumb_func_start GiveBattleTowerPrize
+GiveBattleTowerPrize: @ 80E724C
push {r4-r6,lr}
ldr r5, _080E7288 @ =gSaveBlock2Ptr
ldr r1, [r5]
@@ -3255,10 +3255,10 @@ _080E72AA:
.align 2, 0
_080E72B0: .4byte gSpecialVar_Result
_080E72B4: .4byte 0x0000055e
- thumb_func_end sub_80E724C
+ thumb_func_end GiveBattleTowerPrize
- thumb_func_start sub_80E72B8
-sub_80E72B8: @ 80E72B8
+ thumb_func_start AwardBattleTowerRibbons
+AwardBattleTowerRibbons: @ 80E72B8
push {r4-r7,lr}
ldr r0, _080E7334 @ =gSaveBlock2Ptr
ldr r0, [r0]
@@ -3328,7 +3328,7 @@ _080E7338: .4byte 0x0000055c
_080E733C: .4byte gSpecialVar_Result
_080E7340: .4byte 0x0000056d
_080E7344: .4byte gPlayerParty
- thumb_func_end sub_80E72B8
+ thumb_func_end AwardBattleTowerRibbons
thumb_func_start sub_80E7348
sub_80E7348: @ 80E7348
@@ -3594,8 +3594,8 @@ _080E752A:
bx r0
thumb_func_end sub_80E7524
- thumb_func_start sub_80E7538
-sub_80E7538: @ 80E7538
+ thumb_func_start PrintEReaderTrainerGreeting
+PrintEReaderTrainerGreeting: @ 80E7538
push {lr}
ldr r0, _080E754C @ =gSaveBlock2Ptr
ldr r0, [r0]
@@ -3607,7 +3607,7 @@ sub_80E7538: @ 80E7538
bx r0
.align 2, 0
_080E754C: .4byte gSaveBlock2Ptr
- thumb_func_end sub_80E7538
+ thumb_func_end PrintEReaderTrainerGreeting
thumb_func_start sub_80E7550
sub_80E7550: @ 80E7550
@@ -3649,8 +3649,8 @@ _080E7594: .4byte gSaveBlock2Ptr
_080E7598: .4byte 0x000004bc
thumb_func_end sub_80E7550
- thumb_func_start sub_80E759C
-sub_80E759C: @ 80E759C
+ thumb_func_start Dummy_TryEnableBravoTrainerBattleTower
+Dummy_TryEnableBravoTrainerBattleTower: @ 80E759C
push {lr}
movs r0, 0x1
_080E75A0:
@@ -3659,6 +3659,6 @@ _080E75A0:
bge _080E75A0
pop {r0}
bx r0
- thumb_func_end sub_80E759C
+ thumb_func_end Dummy_TryEnableBravoTrainerBattleTower
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/cable_club.s b/asm/cable_club.s
index 76346a28c..4c265b65f 100644
--- a/asm/cable_club.s
+++ b/asm/cable_club.s
@@ -1625,7 +1625,7 @@ _08081404:
.align 2, 0
_0808140C: .4byte gBattleTypeFlags
_08081410:
- bl sub_80A03D8
+ bl ReducePlayerPartyToThree
ldr r1, _08081440 @ =gBattleTypeFlags
movs r0, 0x4B
_08081418:
@@ -1848,7 +1848,7 @@ _080815D4:
.align 2, 0
_080815DC: .4byte gBattleTypeFlags
_080815E0:
- bl sub_80A03D8
+ bl ReducePlayerPartyToThree
ldr r1, _08081610 @ =gBattleTypeFlags
movs r0, 0x4B
_080815E8:
diff --git a/asm/easy_chat.s b/asm/easy_chat.s
index 26d7ac8bc..0daa8b2bc 100644
--- a/asm/easy_chat.s
+++ b/asm/easy_chat.s
@@ -576,8 +576,8 @@ _080BDB14: .4byte 0x00002cc4
_080BDB18: .4byte gStringVar4
thumb_func_end sub_80BDA7C
- thumb_func_start sub_80BDB1C
-sub_80BDB1C: @ 80BDB1C
+ thumb_func_start BufferRandomHobbyOrLifestyleString
+BufferRandomHobbyOrLifestyleString: @ 80BDB1C
push {lr}
bl Random
movs r1, 0x1
@@ -597,7 +597,7 @@ _080BDB2E:
bx r0
.align 2, 0
_080BDB44: .4byte gStringVar2
- thumb_func_end sub_80BDB1C
+ thumb_func_end BufferRandomHobbyOrLifestyleString
thumb_func_start sub_80BDB48
sub_80BDB48: @ 80BDB48
diff --git a/asm/learn_move.s b/asm/learn_move.s
index d93c534c0..36b88bc20 100644
--- a/asm/learn_move.s
+++ b/asm/learn_move.s
@@ -15,8 +15,8 @@ sub_80E4620: @ 80E4620
bx r0
thumb_func_end sub_80E4620
- thumb_func_start sub_80E4634
-sub_80E4634: @ 80E4634
+ thumb_func_start DisplayMoveTutorMenu
+DisplayMoveTutorMenu: @ 80E4634
push {lr}
sub sp, 0x4
bl ScriptContext2_Enable
@@ -35,7 +35,7 @@ sub_80E4634: @ 80E4634
bx r0
.align 2, 0
_080E465C: .4byte sub_80E4660
- thumb_func_end sub_80E4634
+ thumb_func_end DisplayMoveTutorMenu
thumb_func_start sub_80E4660
sub_80E4660: @ 80E4660
diff --git a/asm/pokemon_size_record.s b/asm/pokemon_size_record.s
index cb87652fa..e14bdc51d 100644
--- a/asm/pokemon_size_record.s
+++ b/asm/pokemon_size_record.s
@@ -323,8 +323,8 @@ sub_80A0904: @ 80A0904
_080A0914: .4byte 0x0000403d
thumb_func_end sub_80A0904
- thumb_func_start sub_80A0918
-sub_80A0918: @ 80A0918
+ thumb_func_start GetHeracrossSizeRecordInfo
+GetHeracrossSizeRecordInfo: @ 80A0918
push {lr}
ldr r0, _080A092C @ =0x0000403d
bl GetVarPointer
@@ -335,10 +335,10 @@ sub_80A0918: @ 80A0918
bx r0
.align 2, 0
_080A092C: .4byte 0x0000403d
- thumb_func_end sub_80A0918
+ thumb_func_end GetHeracrossSizeRecordInfo
- thumb_func_start sub_80A0930
-sub_80A0930: @ 80A0930
+ thumb_func_start CompareHeracrossSize
+CompareHeracrossSize: @ 80A0930
push {r4,lr}
ldr r0, _080A0950 @ =0x0000403d
bl GetVarPointer
@@ -355,7 +355,7 @@ sub_80A0930: @ 80A0930
.align 2, 0
_080A0950: .4byte 0x0000403d
_080A0954: .4byte gSpecialVar_Result
- thumb_func_end sub_80A0930
+ thumb_func_end CompareHeracrossSize
thumb_func_start sub_80A0958
sub_80A0958: @ 80A0958
@@ -369,8 +369,8 @@ sub_80A0958: @ 80A0958
_080A0968: .4byte 0x00004040
thumb_func_end sub_80A0958
- thumb_func_start sub_80A096C
-sub_80A096C: @ 80A096C
+ thumb_func_start GetMagikarpSizeRecordInfo
+GetMagikarpSizeRecordInfo: @ 80A096C
push {lr}
ldr r0, _080A0980 @ =0x00004040
bl GetVarPointer
@@ -381,10 +381,10 @@ sub_80A096C: @ 80A096C
bx r0
.align 2, 0
_080A0980: .4byte 0x00004040
- thumb_func_end sub_80A096C
+ thumb_func_end GetMagikarpSizeRecordInfo
- thumb_func_start sub_80A0984
-sub_80A0984: @ 80A0984
+ thumb_func_start CompareMagikarpSize
+CompareMagikarpSize: @ 80A0984
push {r4,lr}
ldr r0, _080A09A4 @ =0x00004040
bl GetVarPointer
@@ -401,7 +401,7 @@ sub_80A0984: @ 80A0984
.align 2, 0
_080A09A4: .4byte 0x00004040
_080A09A8: .4byte gSpecialVar_Result
- thumb_func_end sub_80A0984
+ thumb_func_end CompareMagikarpSize
thumb_func_start GiveGiftRibbonToParty
GiveGiftRibbonToParty: @ 80A09AC
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index 71e0e2e0e..ec0e9e53c 100644
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -1751,8 +1751,8 @@ _0808C69C:
_0808C6A4: .4byte gPaletteFade
thumb_func_end c3_0808C39C
- thumb_func_start sub_808C6A8
-sub_808C6A8: @ 808C6A8
+ thumb_func_start ShowPokemonStorageSystem
+ShowPokemonStorageSystem: @ 808C6A8
push {lr}
ldr r0, _0808C6D0 @ =c3_0808C39C
movs r1, 0x50
@@ -1773,7 +1773,7 @@ sub_808C6A8: @ 808C6A8
.align 2, 0
_0808C6D0: .4byte c3_0808C39C
_0808C6D4: .4byte gTasks
- thumb_func_end sub_808C6A8
+ thumb_func_end ShowPokemonStorageSystem
thumb_func_start mapldr_0808C6D8
mapldr_0808C6D8: @ 808C6D8
diff --git a/asm/post_battle_event_funcs.s b/asm/post_battle_event_funcs.s
index 20455093a..a96501d7b 100644
--- a/asm/post_battle_event_funcs.s
+++ b/asm/post_battle_event_funcs.s
@@ -106,8 +106,8 @@ _080CA3BC: .4byte 0x0000083b
_080CA3C0: .4byte CB2_DoHallOfFameScreen
thumb_func_end Special_HallOfFame
- thumb_func_start sub_80CA3C4
-sub_80CA3C4: @ 80CA3C4
+ thumb_func_start sp0C8_whiteout_maybe
+sp0C8_whiteout_maybe: @ 80CA3C4
push {lr}
ldr r0, _080CA3D4 @ =c2_whiteout
bl SetMainCallback2
@@ -116,6 +116,6 @@ sub_80CA3C4: @ 80CA3C4
bx r1
.align 2, 0
_080CA3D4: .4byte c2_whiteout
- thumb_func_end sub_80CA3C4
+ thumb_func_end sp0C8_whiteout_maybe
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/script_pokemon_util_80A0058.s b/asm/script_pokemon_util_80A0058.s
index 6b4cdd1a8..525293081 100644
--- a/asm/script_pokemon_util_80A0058.s
+++ b/asm/script_pokemon_util_80A0058.s
@@ -420,8 +420,8 @@ _080A0378: .4byte gSpecialVar_Result
_080A037C: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
thumb_func_end sub_80A0350
- thumb_func_start sub_80A0380
-sub_80A0380: @ 80A0380
+ thumb_func_start ChooseBattleTowerPlayerParty
+ChooseBattleTowerPlayerParty: @ 80A0380
push {lr}
ldr r1, _080A0394 @ =gMain
ldr r0, _080A0398 @ =sub_80A039C
@@ -433,7 +433,7 @@ sub_80A0380: @ 80A0380
.align 2, 0
_080A0394: .4byte gMain
_080A0398: .4byte sub_80A039C
- thumb_func_end sub_80A0380
+ thumb_func_end ChooseBattleTowerPlayerParty
thumb_func_start sub_80A039C
sub_80A039C: @ 80A039C
@@ -450,7 +450,7 @@ sub_80A039C: @ 80A039C
_080A03B0: .4byte gUnknown_203B0D4
_080A03B4: .4byte gSpecialVar_Result
_080A03B8:
- bl sub_80A03D8
+ bl ReducePlayerPartyToThree
ldr r1, _080A03D0 @ =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
@@ -465,8 +465,8 @@ _080A03D0: .4byte gSpecialVar_Result
_080A03D4: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
thumb_func_end sub_80A039C
- thumb_func_start sub_80A03D8
-sub_80A03D8: @ 80A03D8
+ thumb_func_start ReducePlayerPartyToThree
+ReducePlayerPartyToThree: @ 80A03D8
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -530,6 +530,6 @@ _080A042C:
_080A0454: .4byte gPlayerParty
_080A0458: .4byte gUnknown_203B0D4
_080A045C: .4byte 0x05000096
- thumb_func_end sub_80A03D8
+ thumb_func_end ReducePlayerPartyToThree
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/script_pokemon_util_80BF8FC.s b/asm/script_pokemon_util_80BF8FC.s
index bf461b039..15d19e08b 100644
--- a/asm/script_pokemon_util_80BF8FC.s
+++ b/asm/script_pokemon_util_80BF8FC.s
@@ -36,8 +36,8 @@ _080BF934: .4byte sub_80BF97C
_080BF938: .4byte gTasks
thumb_func_end Special_ChooseMonFromParty
- thumb_func_start sub_80BF93C
-sub_80BF93C: @ 80BF93C
+ thumb_func_start SelectMoveTutorMon
+SelectMoveTutorMon: @ 80BF93C
push {lr}
sub sp, 0x4
bl ScriptContext2_Enable
@@ -65,7 +65,7 @@ sub_80BF93C: @ 80BF93C
.align 2, 0
_080BF974: .4byte sub_80BF97C
_080BF978: .4byte gTasks
- thumb_func_end sub_80BF93C
+ thumb_func_end SelectMoveTutorMon
thumb_func_start sub_80BF97C
sub_80BF97C: @ 80BF97C
@@ -100,8 +100,8 @@ _080BF9B4: .4byte gPaletteFade
_080BF9B8: .4byte gTasks
thumb_func_end sub_80BF97C
- thumb_func_start Special_ChooseMoveToDelete
-Special_ChooseMoveToDelete: @ 80BF9BC
+ thumb_func_start SelectMove
+SelectMove: @ 80BF9BC
push {r4,lr}
sub sp, 0x4
ldr r0, _080BF9F0 @ =gPlayerParty
@@ -132,7 +132,7 @@ _080BF9F8: .4byte gPlayerPartyCount
_080BF9FC: .4byte CB2_ReturnToField
_080BFA00: .4byte gFieldCallback
_080BFA04: .4byte FieldCallback_ReturnToEventScript2
- thumb_func_end Special_ChooseMoveToDelete
+ thumb_func_end SelectMove
thumb_func_start ScrSpecial_CountPokemonMoves
ScrSpecial_CountPokemonMoves: @ 80BFA08
@@ -333,8 +333,8 @@ sub_80BFAA8: @ 80BFAA8
_080BFBA4: .4byte gPPUpGetMask
thumb_func_end sub_80BFAA8
- thumb_func_start Special_DeleteSelectedMove
-Special_DeleteSelectedMove: @ 80BFBA8
+ thumb_func_start DeleteMonMove
+DeleteMonMove: @ 80BFBA8
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -385,10 +385,10 @@ _080BFBFC:
_080BFC08: .4byte gSpecialVar_0x8004
_080BFC0C: .4byte gPlayerParty
_080BFC10: .4byte gSpecialVar_0x8005
- thumb_func_end Special_DeleteSelectedMove
+ thumb_func_end DeleteMonMove
- thumb_func_start sub_80BFC14
-sub_80BFC14: @ 80BFC14
+ thumb_func_start IsSelectedMonEgg
+IsSelectedMonEgg: @ 80BFC14
push {lr}
ldr r0, _080BFC38 @ =gSpecialVar_0x8004
ldrh r1, [r0]
@@ -417,6 +417,6 @@ _080BFC48:
bx r0
.align 2, 0
_080BFC4C: .4byte gSpecialVar_Result
- thumb_func_end sub_80BFC14
+ thumb_func_end IsSelectedMonEgg
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/trade.s b/asm/trade.s
index b5e8ee022..8dd3809f1 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -13779,8 +13779,8 @@ _08053A94: .4byte gUnknown_826D1E4
_08053A98: .4byte SpriteCallbackDummy
thumb_func_end sub_8053A0C
- thumb_func_start sub_8053A9C
-sub_8053A9C: @ 8053A9C
+ thumb_func_start GetInGameTradeSpeciesInfo
+GetInGameTradeSpeciesInfo: @ 8053A9C
push {r4-r6,lr}
ldr r0, _08053AD0 @ =gSpecialVar_0x8004
ldrh r0, [r0]
@@ -13811,7 +13811,7 @@ _08053AD4: .4byte gUnknown_826CF8C
_08053AD8: .4byte gStringVar1
_08053ADC: .4byte gSpeciesNames
_08053AE0: .4byte gStringVar2
- thumb_func_end sub_8053A9C
+ thumb_func_end GetInGameTradeSpeciesInfo
thumb_func_start sub_8053AE4
sub_8053AE4: @ 8053AE4
@@ -14078,8 +14078,8 @@ _08053CEE:
_08053D28: .4byte gUnknown_826D1A8
thumb_func_end sub_8053CD4
- thumb_func_start sub_8053D2C
-sub_8053D2C: @ 8053D2C
+ thumb_func_start GetTradeSpecies
+GetTradeSpecies: @ 8053D2C
push {r4-r6,lr}
ldr r6, _08053D58 @ =gSpecialVar_0x8005
ldrh r0, [r6]
@@ -14108,10 +14108,10 @@ _08053D62:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_8053D2C
+ thumb_func_end GetTradeSpecies
- thumb_func_start sub_8053D68
-sub_8053D68: @ 8053D68
+ thumb_func_start CreateInGameTradePokemon
+CreateInGameTradePokemon: @ 8053D68
push {lr}
ldr r0, _08053D7C @ =gSpecialVar_0x8005
ldrb r0, [r0]
@@ -14123,7 +14123,7 @@ sub_8053D68: @ 8053D68
.align 2, 0
_08053D7C: .4byte gSpecialVar_0x8005
_08053D80: .4byte gSpecialVar_0x8004
- thumb_func_end sub_8053D68
+ thumb_func_end CreateInGameTradePokemon
thumb_func_start sub_8053D84
sub_8053D84: @ 8053D84
@@ -14839,8 +14839,8 @@ _08054438: .4byte gWirelessCommType
_0805443C: .4byte gMain
thumb_func_end sub_80543C4
- thumb_func_start sub_8054440
-sub_8054440: @ 8054440
+ thumb_func_start DoInGameTradeScene
+DoInGameTradeScene: @ 8054440
push {lr}
sub sp, 0x4
bl ScriptContext2_Enable
@@ -14860,7 +14860,7 @@ sub_8054440: @ 8054440
bx r0
.align 2, 0
_0805446C: .4byte sub_8054470
- thumb_func_end sub_8054440
+ thumb_func_end DoInGameTradeScene
thumb_func_start sub_8054470
sub_8054470: @ 8054470
diff --git a/data/event_scripts.s b/data/event_scripts.s
index bbed58b46..da56bcf96 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -877,7 +877,7 @@ gUnknown_81A4EE9:: @ 81A4EE9
goto EventScript_1A4FC7
EventScript_1A4F19:: @ 81A4F19
- special sub_8080618
+ special ScrSpecial_ShowTrainerNonBattlingSpeech
waitmessage
waitbuttonpress
release
@@ -898,18 +898,18 @@ gUnknown_81A4F21:: @ 81A4F21
gUnknown_81A4F3E:: @ 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 PlayTrainerEncounterMusic
special sub_8080398
- special sub_80805D8
+ special ScrSpecial_ShowTrainerIntroSpeech
waitmessage
waitbuttonpress
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if eq, EventScript_1A4FB8
- special sub_80805B0
+ special ScrSpecial_StartTrainerEyeRematch
waitstate
releaseall
end
@@ -918,7 +918,7 @@ EventScript_1A4F72:: @ 81A4F72
ontrainerbattleend
gUnknown_81A4F73:: @ 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
@@ -926,13 +926,13 @@ gUnknown_81A4F73:: @ 81A4F73
goto_if ne, EventScript_1A4FB1
special PlayTrainerEncounterMusic
special sub_8080398
- special sub_80805D8
+ special ScrSpecial_ShowTrainerIntroSpeech
waitmessage
waitbuttonpress
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if eq, EventScript_1A4FB8
- special sub_80805B0
+ special ScrSpecial_StartTrainerEyeRematch
waitstate
releaseall
end
@@ -941,7 +941,7 @@ EventScript_1A4FB0:: @ 81A4FB0
ontrainerbattleend
EventScript_1A4FB1:: @ 81A4FB1
- special sub_8080618
+ special ScrSpecial_ShowTrainerNonBattlingSpeech
waitmessage
waitbuttonpress
release
@@ -961,14 +961,14 @@ Movement_1A4FC5:: @ 81A4FC5
step_end
EventScript_1A4FC7:: @ 81A4FC7
- special sub_80805D8
+ special ScrSpecial_ShowTrainerIntroSpeech
waitmessage
waitbuttonpress
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if eq, EventScript_1A501A
battlebegin
- specialvar VAR_RESULT, sub_80803CC
+ specialvar VAR_RESULT, ScrSpecial_GetTrainerBattleMode
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1A5017
compare_var_to_value VAR_RESULT, 2
@@ -1955,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
@@ -1967,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
@@ -2320,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
@@ -3895,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
@@ -3909,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
@@ -4114,7 +4114,7 @@ EventScript_1A8E4D:: @ 81A8E4D
special sub_807F0B0
waitstate
fadescreen 1
- special sub_80CA3C4
+ special sp0C8_whiteout_maybe
waitstate
end
@@ -4526,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
@@ -4539,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
@@ -4552,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
@@ -4565,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
@@ -4578,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
@@ -4591,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
@@ -4604,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
@@ -4617,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
@@ -4630,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
@@ -4643,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
@@ -4656,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
@@ -4669,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
@@ -4682,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
@@ -4695,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
@@ -4708,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
@@ -4721,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
@@ -4734,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
@@ -4747,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
@@ -4760,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
@@ -4773,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
@@ -4786,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
@@ -4799,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
@@ -4812,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
@@ -4825,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
@@ -4838,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
@@ -4851,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
@@ -4864,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
@@ -4877,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
@@ -4890,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
@@ -4903,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
@@ -4916,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
@@ -4929,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
@@ -4942,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
@@ -4955,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
@@ -4968,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
@@ -4981,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
@@ -4994,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
@@ -5007,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
@@ -5020,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
@@ -5033,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
@@ -5046,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
@@ -5059,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
@@ -5072,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
@@ -5085,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
@@ -5098,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
@@ -5111,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
@@ -5124,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
@@ -5137,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
@@ -5150,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
@@ -5163,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
@@ -5176,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
@@ -5189,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
@@ -5202,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
@@ -5215,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
@@ -5228,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
@@ -5241,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
@@ -5254,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
@@ -5267,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
@@ -5280,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
@@ -5293,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
@@ -5306,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
@@ -5319,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
@@ -5332,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
@@ -5345,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
@@ -5358,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
@@ -5371,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
@@ -5384,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
@@ -5397,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
@@ -5410,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
@@ -5423,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
@@ -5436,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
@@ -5449,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
@@ -5462,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
@@ -5475,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
@@ -5488,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
@@ -5501,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
@@ -5514,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
@@ -5527,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
@@ -5540,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
@@ -5553,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
@@ -5566,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
@@ -5579,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
@@ -5592,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
@@ -5605,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
@@ -5618,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
@@ -5631,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
@@ -5644,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
@@ -5657,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
@@ -5670,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
@@ -5683,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
@@ -5696,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
@@ -5709,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
@@ -5722,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
@@ -5735,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
@@ -5748,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
@@ -5761,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
@@ -5774,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
@@ -5787,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
@@ -5800,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
@@ -5813,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
@@ -5826,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
@@ -5839,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
@@ -5852,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
@@ -5865,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
@@ -5878,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
@@ -5891,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
@@ -5904,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
@@ -5917,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
@@ -5930,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
@@ -5943,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
@@ -5956,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
@@ -5969,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
@@ -5982,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
@@ -5995,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
@@ -6008,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
@@ -6021,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
@@ -6034,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
@@ -6047,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
@@ -6060,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
@@ -6073,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
@@ -6086,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
@@ -6099,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
@@ -6112,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
@@ -6125,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
@@ -6138,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
@@ -6151,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
@@ -6164,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
@@ -6177,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
@@ -6190,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
@@ -6203,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
@@ -6216,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
@@ -6229,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
@@ -6242,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
@@ -6255,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
@@ -6268,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
@@ -6281,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
@@ -6294,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
@@ -6307,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
@@ -6320,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
@@ -6333,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
@@ -6346,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
@@ -6359,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
@@ -6372,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
@@ -6385,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
@@ -6398,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
@@ -6411,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
@@ -6424,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
@@ -6437,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
@@ -6450,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
@@ -6463,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
@@ -6476,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
@@ -6489,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
@@ -6502,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
@@ -6515,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
@@ -6528,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
@@ -6541,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
@@ -6554,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
@@ -6567,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
@@ -6580,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
@@ -6593,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
@@ -6606,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
@@ -6619,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
@@ -6632,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
@@ -6645,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
@@ -6658,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
@@ -6671,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
@@ -6684,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
@@ -6697,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
@@ -6710,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
@@ -6723,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
@@ -6736,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
@@ -6749,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
@@ -6762,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
@@ -6775,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
@@ -6788,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
@@ -6801,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
@@ -6814,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
@@ -6827,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
@@ -6840,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
@@ -6853,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
@@ -6866,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
@@ -6879,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
@@ -6892,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
@@ -6905,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
@@ -6918,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
@@ -6931,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
@@ -6944,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
@@ -6957,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
@@ -6970,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
@@ -6983,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
@@ -6996,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
@@ -7009,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
@@ -7022,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
@@ -7035,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
@@ -7048,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
@@ -7061,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
@@ -7074,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
@@ -7087,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
@@ -7100,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
@@ -7113,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
@@ -7126,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
@@ -7139,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
@@ -7152,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
@@ -7165,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
@@ -7178,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
@@ -7191,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
@@ -7204,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
@@ -7217,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
@@ -7230,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
@@ -7243,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
@@ -7256,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
@@ -7269,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
@@ -7282,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
@@ -7295,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
@@ -7308,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
@@ -7321,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
@@ -7334,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
@@ -7347,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
@@ -7360,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
@@ -7373,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
@@ -7386,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
@@ -7399,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
@@ -7412,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
@@ -7425,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
@@ -7438,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
@@ -7451,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
@@ -7464,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
@@ -7477,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
@@ -7490,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
@@ -7503,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
@@ -7516,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
@@ -7529,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
@@ -7542,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
@@ -7555,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
@@ -8726,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
@@ -8738,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
@@ -8840,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
@@ -8918,7 +8918,7 @@ EventScript_1BB83F:: @ 81BB83F
EventScript_1BB84F:: @ 81BB84F
special SetCableClubWarp
- special sub_807E654
+ special DoCableClubWarp
waitstate
end
diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc
index 05ef15804..0c20c59b8 100644
--- a/data/maps/BirthIsland_Exterior/scripts.inc
+++ b/data/maps/BirthIsland_Exterior/scripts.inc
@@ -92,7 +92,7 @@ EventScript_1652C0:: @ 81652C0
setvar VAR_0x8006, 0
special CreateObedientEnemyMon
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
- special sub_807F9D8
+ special Special_StartLegendaryBattle
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc
index ad68f84bc..5c51d2601 100644
--- a/data/maps/CeruleanCave_B1F/scripts.inc
+++ b/data/maps/CeruleanCave_B1F/scripts.inc
@@ -41,7 +41,7 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
waitbuttonpress
setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
- special sub_807F9D8
+ special Special_StartLegendaryBattle
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
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 46a900b93..1d1610ace 100644
--- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc
+++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc
@@ -10,9 +10,9 @@ FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE
faceplayer
checkflag FLAG_TEMP_2
goto_if TRUE, EventScript_172043
- compare_var_to_value VAR_RESORT_GOREGOUS_REQUESTED_MON, 0xFFFF
+ compare_var_to_value VAR_RESORT_GORGEOUS_REQUESTED_MON, 0xFFFF
goto_if eq, EventScript_171F0B
- compare_var_to_value VAR_RESORT_GOREGOUS_REQUESTED_MON, SPECIES_NONE
+ compare_var_to_value VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE
goto_if ne, EventScript_171F19
msgbox gUnknown_81A42A0
goto EventScript_171EFE
@@ -30,7 +30,7 @@ EventScript_171F0B:: @ 8171F0B
end
EventScript_171F19:: @ 8171F19
- copyvar VAR_0x8004, VAR_RESORT_GOREGOUS_REQUESTED_MON
+ 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
@@ -62,11 +62,11 @@ EventScript_171F34:: @ 8171F34
call_if eq, EventScript_17201A
moveobjectoffscreen 2
msgbox gUnknown_81A458E
- giveitem VAR_RESORT_GOREGOUS_REWARD
+ giveitem VAR_RESORT_GORGEOUS_REWARD
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_172025
setflag FLAG_TEMP_2
- setvar VAR_RESORT_GOREGOUS_REQUESTED_MON, 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_RESORT_GOREGOUS_REQUESTED_MON, 0
+ setvar VAR_RESORT_GORGEOUS_REQUESTED_MON, 0
release
end
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/LavenderTown_House2/scripts.inc b/data/maps/LavenderTown_House2/scripts.inc
index 046530258..cd9e5e8d7 100644
--- a/data/maps/LavenderTown_House2/scripts.inc
+++ b/data/maps/LavenderTown_House2/scripts.inc
@@ -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_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc
index 8287d1d93..3f8256837 100644
--- a/data/maps/MtEmber_Summit/scripts.inc
+++ b/data/maps/MtEmber_Summit/scripts.inc
@@ -41,7 +41,7 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33
playbgm MUS_EXEYE, 0
waitbuttonpress
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
- special sub_807F9D8
+ special Special_StartLegendaryBattle
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc
index 28b7996d4..20cff0f8f 100644
--- a/data/maps/NavelRock_Base/scripts.inc
+++ b/data/maps/NavelRock_Base/scripts.inc
@@ -65,7 +65,7 @@ NavelRock_Base_EventScript_165134:: @ 8165134
setvar VAR_0x8006, 0
special CreateObedientEnemyMon
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
- special sub_807F9D8
+ special Special_StartLegendaryBattle
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc
index 59499f1cf..563ef520f 100644
--- a/data/maps/NavelRock_Summit/scripts.inc
+++ b/data/maps/NavelRock_Summit/scripts.inc
@@ -69,7 +69,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
setvar VAR_0x8006, 0
special CreateObedientEnemyMon
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
- special sub_807F9D8
+ special Special_StartLegendaryBattle
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
setvar VAR_LAST_TALKED, 1
diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc
index b7938f2ca..dc90bc7bf 100644
--- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc
+++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc
@@ -41,7 +41,7 @@ PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4
special Special_AnimatePcTurnOn
playse SE_PC_ON
msgbox gUnknown_81A5420
- special sub_80EB6AC
+ special BedroomPC
waitstate
special sub_812B35C
releaseall
diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc
index ee40d071b..086f589de 100644
--- a/data/maps/PokemonTower_6F/scripts.inc
+++ b/data/maps/PokemonTower_6F/scripts.inc
@@ -9,7 +9,7 @@ PokemonTower_6F_EventScript_1634B8:: @ 81634B8
compare_var_to_value VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE
- special sub_807F904
+ special ScrSpecial_StartMarowakBattle
waitstate
special sub_8112364
compare_var_to_value VAR_RESULT, 0
diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc
index aa6fa42b0..aa16e1881 100644
--- a/data/maps/PowerPlant/scripts.inc
+++ b/data/maps/PowerPlant/scripts.inc
@@ -54,7 +54,7 @@ PowerPlant_EventScript_1637B8:: @ 81637B8
playbgm MUS_EXEYE, 0
waitbuttonpress
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
- special sub_807F9D8
+ special Special_StartLegendaryBattle
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc
index 9f0255568..0f0aa4f68 100644
--- a/data/maps/Route12_FishingHouse/scripts.inc
+++ b/data/maps/Route12_FishingHouse/scripts.inc
@@ -39,14 +39,14 @@ EventScript_16FF7F:: @ 816FF7F
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/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 d861d3700..8d69a4808 100644
--- a/data/maps/SeafoamIslands_B4F/scripts.inc
+++ b/data/maps/SeafoamIslands_B4F/scripts.inc
@@ -179,7 +179,7 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC
playbgm MUS_EXEYE, 0
waitbuttonpress
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
- special sub_807F9D8
+ special Special_StartLegendaryBattle
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc
index 2f7e63cfb..fd83fa051 100644
--- a/data/maps/SevenIsland_House_Room1/scripts.inc
+++ b/data/maps/SevenIsland_House_Room1/scripts.inc
@@ -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 2cbb7d1db..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
diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc
index 08efbc6fc..d38e40aac 100644
--- a/data/maps/SixIsland_WaterPath_House1/scripts.inc
+++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc
@@ -12,14 +12,14 @@ SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D
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/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/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc
index 5c5cebf82..24c38bfd7 100644
--- a/data/maps/ViridianCity/scripts.inc
+++ b/data/maps/ViridianCity/scripts.inc
@@ -151,7 +151,7 @@ EventScript_165A65:: @ 8165A65
compare_var_to_value VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_8112364
- special sub_807F888
+ special ScrSpecial_StartOldManTutorialBattle
waitstate
release
end
@@ -246,7 +246,7 @@ EventScript_165B4C:: @ 8165B4C
compare_var_to_value VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_8112364
- special sub_807F888
+ special ScrSpecial_StartOldManTutorialBattle
waitstate
lock
faceplayer
diff --git a/data/specials.inc b/data/specials.inc
index 8bef2748a..96d997597 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
@@ -60,16 +59,16 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special IsEnigmaBerryValid
- def_special sub_80803CC
- def_special sub_80805D8
- def_special sub_8080618
+ def_special ScrSpecial_GetTrainerBattleMode
+ def_special ScrSpecial_ShowTrainerIntroSpeech
+ def_special ScrSpecial_ShowTrainerNonBattlingSpeech
def_special ScrSpecial_HasTrainerBeenFought
def_special ScrSpecial_EndTrainerApproach
def_special PlayTrainerEncounterMusic
- def_special sub_810CD4C
- def_special sub_810CEB4
- def_special sub_80805B0
- def_special sub_808C6A8
+ def_special ShouldTryRematchBattle
+ def_special ScrSpecial_GetTrainerEyeRematchFlag
+ def_special ScrSpecial_StartTrainerEyeRematch
+ def_special ShowPokemonStorageSystem
def_special CheckForAlivePartyMons
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
@@ -166,17 +165,17 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
- def_special sub_807F888
+ def_special ScrSpecial_StartOldManTutorialBattle
def_special ChangePokemonNickname
def_special Special_ChooseMonFromParty
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,18 +221,18 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special Special_GetPokedexCount
- def_special sub_80CA524
+ 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 Special_GetPlayerAvatarBike
@@ -241,30 +240,30 @@ gSpecials:: @ 815FD60
def_special nullsub_75
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 ReducePlayerPartyToThree
+ def_special BedroomPC
+ def_special PlayerPC
def_special Special_TownMap
- def_special sub_8053A9C
- def_special sub_8053D68
- def_special sub_8054440
- def_special sub_8053D2C
+ def_special GetInGameTradeSpeciesInfo
+ def_special CreateInGameTradePokemon
+ def_special DoInGameTradeScene
+ def_special GetTradeSpecies
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
@@ -320,9 +319,9 @@ gSpecials:: @ 815FD60
def_special Special_CheckPartyPokerus
def_special sub_806E99C
def_special Special_ShakeScreen
- def_special sub_807FA68
- def_special sub_807F9D8
- def_special sub_807FABC
+ def_special Special_StartGroudonKyogreBattle
+ def_special Special_StartLegendaryBattle
+ def_special Special_StartRegiBattle
def_special sub_8080398
def_special nullsub_75
def_special nullsub_75
@@ -331,13 +330,13 @@ gSpecials:: @ 815FD60
def_special DoFallWarp
def_special nullsub_75
def_special nullsub_75
- def_special sub_80E5E70
- def_special sub_807F998
+ def_special SetEReaderTrainerGfxId
+ def_special ScrSpecial_StartSouthernIslandBattle
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special Special_GetSpeciesOfPartySlot_x8004
- def_special sub_80BFC14
+ def_special IsSelectedMonEgg
def_special nullsub_75
def_special nullsub_75
def_special LoadPlayerBag
@@ -347,11 +346,11 @@ gSpecials:: @ 815FD60
def_special HasAllKantoMons
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 sub_807F904
+ def_special ScrSpecial_StartMarowakBattle
def_special Special_ForcePlayerOntoBike
def_special Special_ListMenu
def_special Special_ReturnToListMenu
diff --git a/include/constants/vars.h b/include/constants/vars.h
index cfb239594..3f171ede8 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -96,17 +96,17 @@
#define VAR_0x4034 0x4034
#define VAR_RESORT_GOREGEOUS_STEP_COUNTER 0x4035
-#define VAR_RESORT_GOREGOUS_REQUESTED_MON 0x4036
+#define VAR_RESORT_GORGEOUS_REQUESTED_MON 0x4036
#define VAR_0x4037 0x4037
#define VAR_0x4038 0x4038
#define VAR_0x4039 0x4039
#define VAR_ELEVATOR_FLOOR 0x403A
-#define VAR_RESORT_GOREGOUS_REWARD 0x403B
+#define VAR_RESORT_GORGEOUS_REWARD 0x403B
#define VAR_0x403C 0x403C
-#define VAR_0x403D 0x403D
+#define VAR_HERACROSS_SIZE_RECORD 0x403D
#define VAR_DEOXYS_INTERACTION_NUM 0x403E
#define VAR_0x403F 0x403F
-#define VAR_DAYS 0x4040
+#define VAR_MAGIKARP_SIZE_RECORD 0x4040
#define VAR_0x4041 0x4041
#define VAR_TRAINER_CARD_MON_ICON_TINT_IDX 0x4042
#define VAR_TRAINER_CARD_MON_ICON_1 0x4043
diff --git a/src/daycare.c b/src/daycare.c
index fede86156..ca9eb14f7 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -1739,7 +1739,7 @@ static bool8 sub_8046E34(struct DayCare *daycare, u8 daycareId)
return FALSE;
}
-bool8 sub_8046EAC(void)
+bool8 DaycareMonReceivedMail(void)
{
return sub_8046E34(&gSaveBlock1Ptr->daycare, gSpecialVar_0x8004);
}
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index 6a539b60e..de9f09ff0 100644
--- a/src/field_fadetransition.c
+++ b/src/field_fadetransition.c
@@ -639,7 +639,7 @@ static void sub_807E5EC(u8 taskId)
}
}
-void sub_807E654(void)
+void DoCableClubWarp(void)
{
ScriptContext2_Enable();
sub_8055F88();
diff --git a/src/field_specials.c b/src/field_specials.c
index 0589fb77a..1554cfd2d 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -61,8 +61,8 @@ static void Task_AnimatePcTurnOn(u8 taskId);
static void PcTurnOnUpdateMetatileId(bool16 flag);
static void Task_ShakeScreen(u8 taskId);
static void Task_EndScreenShake(u8 taskId);
-static u16 SampleResortGoregeousMon(void);
-static u16 SampleResortGoregeousReward(void);
+static u16 SampleResortGorgeousMon(void);
+static u16 SampleResortGorgeousReward(void);
static void Task_ElevatorShake(u8 taskId);
static void AnimateElevatorWindowView(u16 nfloors, bool8 direction);
static void Task_AnimateElevatorWindowView(u8 taskId);
@@ -654,12 +654,12 @@ static const u16 sResortGorgeousDeluxeRewards[] = {
void IncrementResortGorgeousStepCounter(void)
{
u16 var4035 = VarGet(VAR_RESORT_GOREGEOUS_STEP_COUNTER);
- if (VarGet(VAR_RESORT_GOREGOUS_REQUESTED_MON) != SPECIES_NONE)
+ if (VarGet(VAR_RESORT_GORGEOUS_REQUESTED_MON) != SPECIES_NONE)
{
var4035++;
if (var4035 >= 250)
{
- VarSet(VAR_RESORT_GOREGOUS_REQUESTED_MON, 0xFFFF);
+ VarSet(VAR_RESORT_GORGEOUS_REQUESTED_MON, 0xFFFF);
VarSet(VAR_RESORT_GOREGEOUS_STEP_COUNTER, 0);
}
else
@@ -671,17 +671,17 @@ void IncrementResortGorgeousStepCounter(void)
void Special_SampleResortGorgeousMonAndReward(void)
{
- u16 var4036 = VarGet(VAR_RESORT_GOREGOUS_REQUESTED_MON);
+ u16 var4036 = VarGet(VAR_RESORT_GORGEOUS_REQUESTED_MON);
if (var4036 == SPECIES_NONE || var4036 == 0xFFFF)
{
- VarSet(VAR_RESORT_GOREGOUS_REQUESTED_MON, SampleResortGoregeousMon());
- VarSet(VAR_RESORT_GOREGOUS_REWARD, SampleResortGoregeousReward());
+ VarSet(VAR_RESORT_GORGEOUS_REQUESTED_MON, SampleResortGorgeousMon());
+ VarSet(VAR_RESORT_GORGEOUS_REWARD, SampleResortGorgeousReward());
VarSet(VAR_RESORT_GOREGEOUS_STEP_COUNTER, 0);
}
- StringCopy(gStringVar1, gSpeciesNames[VarGet(VAR_RESORT_GOREGOUS_REQUESTED_MON)]);
+ StringCopy(gStringVar1, gSpeciesNames[VarGet(VAR_RESORT_GORGEOUS_REQUESTED_MON)]);
}
-static u16 SampleResortGoregeousMon(void)
+static u16 SampleResortGorgeousMon(void)
{
u16 i;
u16 species;
@@ -701,7 +701,7 @@ static u16 SampleResortGoregeousMon(void)
return species;
}
-static u16 SampleResortGoregeousReward(void)
+static u16 SampleResortGorgeousReward(void)
{
if ((Random() % 100) >= 30)
return ITEM_LUXURY_BALL;
@@ -1565,7 +1565,7 @@ s32 CountDigits(s32 number)
return 1;
}
-bool8 sub_80CBFA0(void)
+bool8 NameRaterWasNicknameChanged(void)
{
struct Pokemon * pokemon = &gPlayerParty[gSpecialVar_0x8004];
GetMonData(pokemon, MON_DATA_NICKNAME, gStringVar1);
diff --git a/src/player_pc.c b/src/player_pc.c
index bb073e3a6..f454cd07f 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -149,7 +149,7 @@ void NewGameInitPCItems(void)
;
}
-void sub_80EB6AC(void)
+void BedroomPC(void)
{
u8 taskId;
@@ -161,7 +161,7 @@ void sub_80EB6AC(void)
DisplayItemMessageOnField(taskId, 2, gText_WhatWouldYouLikeToDo, Task_DrawPlayerPcTopMenu);
}
-void sub_80EB6FC(void)
+void PlayerPC(void)
{
u8 taskId;
diff --git a/src/prof_pc.c b/src/prof_pc.c
index aeabc8644..d1f06a2ba 100644
--- a/src/prof_pc.c
+++ b/src/prof_pc.c
@@ -36,7 +36,7 @@ u16 Special_GetPokedexCount(void)
return IsNationalPokedexEnabled();
}
-const u8 * sub_80CA424(u16 count)
+static const u8 *GetProfOaksRatingMessageByCount(u16 count)
{
gSpecialVar_Result = FALSE;
@@ -102,7 +102,7 @@ const u8 * sub_80CA424(u16 count)
return gUnknown_81A6D17;
}
-void sub_80CA524(void)
+void Special_GetProfOaksRatingMessage(void)
{
- ShowFieldMessage(sub_80CA424(gSpecialVar_0x8004));
+ ShowFieldMessage(GetProfOaksRatingMessageByCount(gSpecialVar_0x8004));
}
diff --git a/src/quest_log.c b/src/quest_log.c
index 1c951867e..ffced87ee 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -2594,7 +2594,7 @@ u8 sub_81131FC(struct Var4038Struct * a0)
return gUnknown_8456940[retval];
}
-u16 sub_8113288(void)
+u16 GetNumMovedSaffronFanClubMembers(void)
{
return sub_81132A0(VAR_0x4038_STRUCT);
}
@@ -2613,7 +2613,7 @@ static u16 sub_81132A0(struct Var4038Struct * a0)
return count;
}
-void sub_81132CC(void)
+void UpdateMovedSaffronFanClubMembers(void)
{
sub_81132E0(VAR_0x4038_STRUCT);
}
@@ -2645,7 +2645,7 @@ static void sub_81132E0(struct Var4038Struct * a0)
}
}
-bool16 sub_8113364(void)
+bool16 ShouldMoveSaffronFanClubMember(void)
{
return sub_811337C(VAR_0x4038_STRUCT);
}
@@ -2662,7 +2662,7 @@ static void sub_8113390(struct Var4038Struct * a0)
a0->unk_1 |= 4;
}
-void sub_81133A4(void)
+void BufferStreakTrainerText(void)
{
u8 r3 = 0;
u8 r2 = 0;
diff --git a/src/vs_seeker.c b/src/vs_seeker.c
index c0145e22d..6ae92236f 100644
--- a/src/vs_seeker.c
+++ b/src/vs_seeker.c
@@ -1290,7 +1290,7 @@ static u8 GetRematchTrainerIdGivenGameState(const u16 * a0, u8 a1)
return 0;
}
-u8 sub_810CD4C(void)
+u8 ShouldTryRematchBattle(void)
{
if (sub_810CD80(sVsSeekerData, gTrainerBattleOpponent_A))
{
@@ -1364,7 +1364,7 @@ s32 sub_810CE64(u16 a0)
return sVsSeekerData[i].trainerIdxs[j];
}
-u8 sub_810CEB4(void) // unreferenced, or reference not disassembled
+u8 ScrSpecial_GetTrainerEyeRematchFlag(void) // unreferenced, or reference not disassembled
{
return sub_810CED0(sVsSeekerData, gTrainerBattleOpponent_A);
}