Rename specials according to Ruby

12 files changed, 135 insertions, 135 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