Rename specials according to Ruby

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

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

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.

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:

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

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

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

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

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.

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.

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.

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

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

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

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

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
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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);
 }

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();

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);

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;
 

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));
 }

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;

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);
 }