name functions

12 files changed, 50 insertions, 50 deletions

diff --git a/asm/daycare.s b/asm/daycare.s
index ff3fa5464..072b646d1 100644
--- a/asm/daycare.s
+++ b/asm/daycare.s
@@ -329,7 +329,7 @@ sub_804151C: @ 804151C
 	ldr r7, _08041538 @ =0x0000ffff
 _08041524:
 	adds r0, r4, 0
-	bl sub_8040300
+	bl TryIncrementMonLevel
 	lsls r0, 24
 	cmp r0, 0
 	beq _08041560
@@ -1387,7 +1387,7 @@ _08041D16:
 	lsls r1, r5, 24
 	lsrs r1, 24
 	adds r0, r7, 0
-	bl sub_8040374
+	bl CanMonLearnTMHM
 	cmp r0, 0
 	beq _08041D52
 	ldrh r1, [r4]
diff --git a/asm/rom3.s b/asm/rom3.s
index 04fe5e626..c562583e9 100644
--- a/asm/rom3.s
+++ b/asm/rom3.s
@@ -16764,9 +16764,9 @@ c4_overworld: @ 8013EB0
 	bne _08013ECE
 	ldr r4, _08013F34 @ =gPlayerParty
 	adds r0, r4, 0
-	bl sub_8040048
+	bl RandomlyGivePartyPokerus
 	adds r0, r4, 0
-	bl atkE5_pickupitemcalculation
+	bl PartySpreadPokerus
 _08013ECE:
 	ldrh r4, [r5]
 	adds r0, r6, 0
@@ -40864,7 +40864,7 @@ _08020490:
 	muls r1, r2
 	adds r1, r3
 	ldrh r1, [r1]
-	bl sub_803FE70
+	bl MonGainEVs
 _0802051E:
 	ldr r1, _08020530 @ =0x02000000
 	ldr r3, _08020554 @ =0x0001605f
diff --git a/asm/rom_803D1FC.s b/asm/rom_803D1FC.s
index a9b2a4aaa..91ab01a6a 100644
--- a/asm/rom_803D1FC.s
+++ b/asm/rom_803D1FC.s
@@ -3795,8 +3795,8 @@ _0803FE68: .4byte gTrainerBattleOpponent
 _0803FE6C: .4byte gUnknown_082082FE
 	thumb_func_end AdjustFriendship
 
-	thumb_func_start sub_803FE70
-sub_803FE70: @ 803FE70
+	thumb_func_start MonGainEVs
+MonGainEVs: @ 803FE70
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -3828,7 +3828,7 @@ _0803FE84:
 _0803FEA8:
 	mov r0, r8
 	movs r1, 0
-	bl sub_8040178
+	bl CheckPartyHasHadPokerus
 	lsls r0, 24
 	movs r2, 0x1
 	cmp r0, 0
@@ -4018,7 +4018,7 @@ _0804000E:
 	bx r0
 	.align 2, 0
 _0804001C: .4byte 0x000001fd
-	thumb_func_end sub_803FE70
+	thumb_func_end MonGainEVs
 
 	thumb_func_start GetMonEVCount
 GetMonEVCount: @ 8040020
@@ -4044,8 +4044,8 @@ _08040028:
 	bx r1
 	thumb_func_end GetMonEVCount
 
-	thumb_func_start sub_8040048
-sub_8040048: @ 8040048
+	thumb_func_start RandomlyGivePartyPokerus
+RandomlyGivePartyPokerus: @ 8040048
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r6, r0, 0
@@ -4092,7 +4092,7 @@ _0804006E:
 	adds r0, r1
 	ldrb r1, [r0]
 	adds r0, r6, 0
-	bl sub_8040178
+	bl CheckPartyHasHadPokerus
 	lsls r0, 24
 	cmp r0, 0
 	bne _08040104
@@ -4142,7 +4142,7 @@ _08040104:
 	bx r0
 	.align 2, 0
 _0804010C: .4byte gBitTable
-	thumb_func_end sub_8040048
+	thumb_func_end RandomlyGivePartyPokerus
 
 	thumb_func_start CheckPartyPokerus
 CheckPartyPokerus: @ 8040110
@@ -4201,8 +4201,8 @@ _0804016C:
 	bx r1
 	thumb_func_end CheckPartyPokerus
 
-	thumb_func_start sub_8040178
-sub_8040178: @ 8040178
+	thumb_func_start CheckPartyHasHadPokerus
+CheckPartyHasHadPokerus: @ 8040178
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r7, r0, 0
@@ -4252,10 +4252,10 @@ _080401CC:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_8040178
+	thumb_func_end CheckPartyHasHadPokerus
 
-	thumb_func_start sub_80401D8
-sub_80401D8: @ 80401D8
+	thumb_func_start UpdatePartyPokerusTime
+UpdatePartyPokerusTime: @ 80401D8
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 16
@@ -4317,10 +4317,10 @@ _0804023C:
 	bx r0
 	.align 2, 0
 _0804024C: .4byte gPlayerParty
-	thumb_func_end sub_80401D8
+	thumb_func_end UpdatePartyPokerusTime
 
-	thumb_func_start atkE5_pickupitemcalculation
-atkE5_pickupitemcalculation: @ 8040250
+	thumb_func_start PartySpreadPokerus
+PartySpreadPokerus: @ 8040250
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r7, r0, 0
@@ -4404,10 +4404,10 @@ _080402F6:
 	pop {r4-r7}
 	pop {r0}
 	bx r0
-	thumb_func_end atkE5_pickupitemcalculation
+	thumb_func_end PartySpreadPokerus
 
-	thumb_func_start sub_8040300
-sub_8040300: @ 8040300
+	thumb_func_start TryIncrementMonLevel
+TryIncrementMonLevel: @ 8040300
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r6, r0, 0
@@ -4462,10 +4462,10 @@ _0804036C:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_8040300
+	thumb_func_end TryIncrementMonLevel
 
-	thumb_func_start sub_8040374
-sub_8040374: @ 8040374
+	thumb_func_start CanMonLearnTMHM
+CanMonLearnTMHM: @ 8040374
 	push {r4,r5,lr}
 	lsls r1, 24
 	lsrs r4, r1, 24
@@ -4512,7 +4512,7 @@ _080403C2:
 	bx r1
 	.align 2, 0
 _080403C8: .4byte gTMHMLearnsets
-	thumb_func_end sub_8040374
+	thumb_func_end CanMonLearnTMHM
 
 	thumb_func_start sub_80403CC
 sub_80403CC: @ 80403CC
@@ -4922,8 +4922,8 @@ _080406D0: .4byte 0x0000ffff
 _080406D4: .4byte 0x000001ff
 	thumb_func_end sub_8040574
 
-	thumb_func_start sub_80406D8
-sub_80406D8: @ 80406D8
+	thumb_func_start SpeciesToPokedexNum
+SpeciesToPokedexNum: @ 80406D8
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -4951,7 +4951,7 @@ _0804070A:
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_80406D8
+	thumb_func_end SpeciesToPokedexNum
 
 	thumb_func_start sub_8040710
 sub_8040710: @ 8040710
diff --git a/asm/rom_806936C.s b/asm/rom_806936C.s
index 068b70736..117143f19 100644
--- a/asm/rom_806936C.s
+++ b/asm/rom_806936C.s
@@ -2192,7 +2192,7 @@ sub_806A390: @ 806A390
 	adds r0, r4, 0
 	bl sub_8080834
 	adds r0, r4, 0
-	bl sub_80401D8
+	bl UpdatePartyPokerusTime
 	adds r0, r4, 0
 	bl sub_810D2F4
 	adds r0, r4, 0
diff --git a/asm/rom_806D7F8.s b/asm/rom_806D7F8.s
index 7993c1aac..6b8ae47cb 100644
--- a/asm/rom_806D7F8.s
+++ b/asm/rom_806D7F8.s
@@ -3254,7 +3254,7 @@ _0806F138:
 	subs r1, 0x21
 	lsls r1, 24
 	lsrs r1, 24
-	bl sub_8040374
+	bl CanMonLearnTMHM
 	cmp r0, 0
 	bne _0806F17C
 	ldr r4, _0806F16C @ =gStringVar4
diff --git a/asm/rom_80859BC.s b/asm/rom_80859BC.s
index fe8287ce8..6685b3084 100644
--- a/asm/rom_80859BC.s
+++ b/asm/rom_80859BC.s
@@ -10887,7 +10887,7 @@ _0808AE9A:
 	bne _0808AECE
 	adds r0, r4, 0
 	adds r1, r6, 0
-	bl sub_8040374
+	bl CanMonLearnTMHM
 	cmp r0, 0
 	bne _0808AEE0
 _0808AECE:
diff --git a/asm/rom_8094928.s b/asm/rom_8094928.s
index 7274a255a..fab0f2531 100644
--- a/asm/rom_8094928.s
+++ b/asm/rom_8094928.s
@@ -22544,7 +22544,7 @@ _0809FB28:
 	bl GetMonData
 	lsls r0, 16
 	lsrs r0, 16
-	bl sub_80406D8
+	bl SpeciesToPokedexNum
 	lsls r0, 16
 	lsrs r4, r0, 16
 	ldr r0, _0809FB6C @ =0x0000ffff
@@ -24901,7 +24901,7 @@ sub_80A0EA4: @ 80A0EA4
 	bne _080A0ED4
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_8040178
+	bl CheckPartyHasHadPokerus
 	lsls r0, 24
 	cmp r0, 0
 	beq _080A0ED4
diff --git a/asm/rom_813BA94.s b/asm/rom_813BA94.s
index d5ee794a0..79a52f971 100644
--- a/asm/rom_813BA94.s
+++ b/asm/rom_813BA94.s
@@ -15014,7 +15014,7 @@ sub_8143088: @ 8143088
 	beq _081430EA
 	lsls r0, r2, 23
 	lsrs r0, 23
-	bl sub_80406D8
+	bl SpeciesToPokedexNum
 	lsls r0, 16
 	lsrs r6, r0, 16
 	ldr r0, _08143190 @ =0x0000ffff
diff --git a/asm/title_screen.s b/asm/title_screen.s
index 6a318fd66..cf3960429 100644
--- a/asm/title_screen.s
+++ b/asm/title_screen.s
@@ -1069,7 +1069,7 @@ _0807C6A0: .4byte 0x00002142
 _0807C6A4: .4byte 0x00001f0f
 _0807C6A8: .4byte gMain
 _0807C6AC: .4byte 0x0000ffff
-_0807C6B0: .4byte sub_807C774
+_0807C6B0: .4byte CB2_GoToMainMenu
 _0807C6B4:
 	ldrh r1, [r4, 0x2C]
 	movs r0, 0x46
@@ -1100,7 +1100,7 @@ _0807C6C4:
 	bl SetMainCallback2
 	b _0807C74E
 	.align 2, 0
-_0807C6F4: .4byte sub_807C7AC
+_0807C6F4: .4byte CB2_GoToClearSaveDataScreen
 _0807C6F8: .4byte sub_807C7C8
 _0807C6FC:
 	ldr r0, _0807C758 @ =REG_BG2Y_L
@@ -1157,8 +1157,8 @@ _0807C76C: .4byte 0x0000ffff
 _0807C770: .4byte sub_807C790
 	thumb_func_end sub_807C644
 
-	thumb_func_start sub_807C774
-sub_807C774: @ 807C774
+	thumb_func_start CB2_GoToMainMenu
+CB2_GoToMainMenu: @ 807C774
 	push {lr}
 	bl UpdatePaletteFade
 	lsls r0, 24
@@ -1171,7 +1171,7 @@ _0807C786:
 	bx r0
 	.align 2, 0
 _0807C78C: .4byte CB2_InitMainMenu
-	thumb_func_end sub_807C774
+	thumb_func_end CB2_GoToMainMenu
 
 	thumb_func_start sub_807C790
 sub_807C790: @ 807C790
@@ -1189,8 +1189,8 @@ _0807C7A2:
 _0807C7A8: .4byte sub_813BA88
 	thumb_func_end sub_807C790
 
-	thumb_func_start sub_807C7AC
-sub_807C7AC: @ 807C7AC
+	thumb_func_start CB2_GoToClearSaveDataScreen
+CB2_GoToClearSaveDataScreen: @ 807C7AC
 	push {lr}
 	bl UpdatePaletteFade
 	lsls r0, 24
@@ -1202,8 +1202,8 @@ _0807C7BE:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0807C7C4: .4byte c2_clear_save_data_screen_2
-	thumb_func_end sub_807C7AC
+_0807C7C4: .4byte CB2_InitClearSaveDataScreen
+	thumb_func_end CB2_GoToClearSaveDataScreen
 
 	thumb_func_start sub_807C7C8
 sub_807C7C8: @ 807C7C8
diff --git a/include/clear_save_data_menu.h b/include/clear_save_data_menu.h
index e153eb406..86ba99849 100644
--- a/include/clear_save_data_menu.h
+++ b/include/clear_save_data_menu.h
@@ -1,6 +1,6 @@
 #ifndef GUARD_CLEAR_SAVE_DATA_MENU_H
 #define GUARD_CLEAR_SAVE_DATA_MENU_H
 
-void c2_clear_save_data_screen_2(void);
+void CB2_InitClearSaveDataScreen(void);
 
 #endif // GUARD_CLEAR_SAVE_DATA_MENU_H
diff --git a/src/clear_save_data_menu.c b/src/clear_save_data_menu.c
index 183d7b70c..22fc8cc13 100644
--- a/src/clear_save_data_menu.c
+++ b/src/clear_save_data_menu.c
@@ -21,7 +21,7 @@ static void VBlankCB_InitClearSaveDataScreen(void);
 static u8 InitClearSaveDataScreen(void);
 static void CB2_SoftReset(void);
 
-void c2_clear_save_data_screen_2(void)
+void CB2_InitClearSaveDataScreen(void)
 {
     if (InitClearSaveDataScreen())
     {
@@ -75,7 +75,7 @@ static void Task_ProcessMenuInput(u8 taskId)
 
 static void Task_ClearSaveData(u8 taskId)
 {
-    calls_flash_erase_block();
+    ClearSaveData();
     DestroyTask(taskId);
     SetMainCallback2(CB2_SoftReset);
 }
diff --git a/src/save.c b/src/save.c
index 456bfdbe4..c6b82bc0a 100644
--- a/src/save.c
+++ b/src/save.c
@@ -54,7 +54,7 @@ u8 sub_8125BF8(u8, struct SaveSection *);
 u8 sub_8125974(struct SaveSectionLocation *);
 u16 sub_8125C10(void *, u16);
 
-void calls_flash_erase_block(void)
+void ClearSaveData(void)
 {
     u16 i;
     for (i = 0; i < 32; i++)