Some renaming

5 files changed, 55 insertions, 55 deletions

diff --git a/asm/berry_pouch.s b/asm/berry_pouch.s
index 36fa22f9c..ab157ab99 100644
--- a/asm/berry_pouch.s
+++ b/asm/berry_pouch.s
@@ -1358,8 +1358,8 @@ _0813D800: .4byte gUnknown_203F37C
 _0813D804: .4byte gUnknown_203F380
 	thumb_func_end sub_813D7CC
 
-	thumb_func_start sub_813D808
-sub_813D808: @ 813D808
+	thumb_func_start BerryPouch_StartFadeToExitCallback
+BerryPouch_StartFadeToExitCallback: @ 813D808
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -1387,7 +1387,7 @@ sub_813D808: @ 813D808
 	.align 2, 0
 _0813D83C: .4byte gTasks
 _0813D840: .4byte sub_813D844
-	thumb_func_end sub_813D808
+	thumb_func_end BerryPouch_StartFadeToExitCallback
 
 	thumb_func_start sub_813D844
 sub_813D844: @ 813D844
@@ -1510,15 +1510,15 @@ _0813D92C:
 	bx r0
 	thumb_func_end sub_813D8AC
 
-	thumb_func_start sub_813D934
-sub_813D934: @ 813D934
+	thumb_func_start BerryPouch_SetExitCallback
+BerryPouch_SetExitCallback: @ 813D934
 	ldr r1, _0813D93C @ =gUnknown_203F36C
 	ldr r1, [r1]
 	str r0, [r1]
 	bx lr
 	.align 2, 0
 _0813D93C: .4byte gUnknown_203F36C
-	thumb_func_end sub_813D934
+	thumb_func_end BerryPouch_SetExitCallback
 
 	thumb_func_start sub_813D940
 sub_813D940: @ 813D940
@@ -1767,7 +1767,7 @@ _0813DB46:
 	strh r0, [r1]
 _0813DB48:
 	adds r0, r6, 0
-	bl sub_813D808
+	bl BerryPouch_StartFadeToExitCallback
 	b _0813DB9E
 	.align 2, 0
 _0813DB50: .4byte gUnknown_203F36C
@@ -2577,7 +2577,7 @@ _0813E248:
 	adds r0, r4
 	lsls r0, 3
 	adds r0, r1
-	ldr r1, _0813E270 @ =sub_813D808
+	ldr r1, _0813E270 @ =BerryPouch_StartFadeToExitCallback
 	str r1, [r0]
 _0813E25E:
 	pop {r4}
@@ -2587,7 +2587,7 @@ _0813E25E:
 _0813E264: .4byte gUnknown_203F36C
 _0813E268: .4byte sub_8126EDC
 _0813E26C: .4byte gTasks
-_0813E270: .4byte sub_813D808
+_0813E270: .4byte BerryPouch_StartFadeToExitCallback
 	thumb_func_end sub_813E200
 
 	thumb_func_start sub_813E274
@@ -2598,7 +2598,7 @@ sub_813E274: @ 813E274
 	ldr r2, _0813E288 @ =gText_ThereIsNoPokemon
 	ldr r3, _0813E28C @ =sub_813E290
 	movs r1, 0x2
-	bl sub_813EB20
+	bl DisplayItemMessageInBerryPouch
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -2745,7 +2745,7 @@ sub_813E37C: @ 813E37C
 	adds r0, r5, 0
 	movs r1, 0x2
 	adds r2, r4, 0
-	bl sub_813EB20
+	bl DisplayItemMessageInBerryPouch
 	b _0813E3EA
 	.align 2, 0
 _0813E3C4: .4byte gTasks+0x8
@@ -2761,7 +2761,7 @@ _0813E3D8:
 	adds r0, r7, 0
 	subs r0, 0x8
 	adds r0, r6, r0
-	ldr r1, _0813E3F8 @ =sub_813D808
+	ldr r1, _0813E3F8 @ =BerryPouch_StartFadeToExitCallback
 	str r1, [r0]
 _0813E3EA:
 	pop {r4-r7}
@@ -2770,7 +2770,7 @@ _0813E3EA:
 	.align 2, 0
 _0813E3F0: .4byte gUnknown_203F36C
 _0813E3F4: .4byte c2_8123744
-_0813E3F8: .4byte sub_813D808
+_0813E3F8: .4byte BerryPouch_StartFadeToExitCallback
 	thumb_func_end sub_813E37C
 
 	thumb_func_start sub_813E3FC
@@ -2786,14 +2786,14 @@ sub_813E3FC: @ 813E3FC
 	adds r1, r0
 	lsls r1, 3
 	adds r1, r2
-	ldr r0, _0813E424 @ =sub_813D808
+	ldr r0, _0813E424 @ =BerryPouch_StartFadeToExitCallback
 	str r0, [r1]
 	bx lr
 	.align 2, 0
 _0813E418: .4byte gUnknown_203F36C
 _0813E41C: .4byte sub_808CE60
 _0813E420: .4byte gTasks
-_0813E424: .4byte sub_813D808
+_0813E424: .4byte BerryPouch_StartFadeToExitCallback
 	thumb_func_end sub_813E3FC
 
 	thumb_func_start sub_813E428
@@ -2827,7 +2827,7 @@ sub_813E428: @ 813E428
 	ldr r3, _0813E484 @ =sub_813E2B8
 	adds r0, r5, 0
 	adds r2, r4, 0
-	bl sub_813EB20
+	bl DisplayItemMessageInBerryPouch
 	b _0813E4CE
 	.align 2, 0
 _0813E470: .4byte gTasks+0x8
@@ -2867,7 +2867,7 @@ _0813E4A8:
 	ldr r3, _0813E4E0 @ =sub_813E5B8
 	adds r0, r7, 0
 	adds r2, r4, 0
-	bl sub_813EB20
+	bl DisplayItemMessageInBerryPouch
 _0813E4CE:
 	pop {r4-r7}
 	pop {r0}
@@ -2917,7 +2917,7 @@ sub_813E4E4: @ 813E4E4
 	ldr r3, _0813E550 @ =sub_813E554
 	adds r0, r5, 0
 	adds r2, r4, 0
-	bl sub_813EB20
+	bl DisplayItemMessageInBerryPouch
 	pop {r4-r6}
 	pop {r0}
 	bx r0
@@ -3213,7 +3213,7 @@ sub_813E768: @ 813E768
 	adds r0, r5, 0
 	movs r1, 0x2
 	adds r2, r4, 0
-	bl sub_813EB20
+	bl DisplayItemMessageInBerryPouch
 	pop {r4-r6}
 	pop {r0}
 	bx r0
@@ -3622,8 +3622,8 @@ sub_813EB10: @ 813EB10
 _0813EB1C: .4byte gUnknown_203F38C
 	thumb_func_end sub_813EB10
 
-	thumb_func_start sub_813EB20
-sub_813EB20: @ 813EB20
+	thumb_func_start DisplayItemMessageInBerryPouch
+DisplayItemMessageInBerryPouch: @ 813EB20
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -3666,7 +3666,7 @@ _0813EB44:
 	.align 2, 0
 _0813EB74: .4byte gUnknown_203F38C
 _0813EB78: .4byte gUnknown_8464400
-	thumb_func_end sub_813EB20
+	thumb_func_end DisplayItemMessageInBerryPouch
 
 	thumb_func_start sub_813EB7C
 sub_813EB7C: @ 813EB7C
diff --git a/asm/bike.s b/asm/bike.s
index c85537d3d..b731e51c0 100644
--- a/asm/bike.s
+++ b/asm/bike.s
@@ -713,8 +713,8 @@ _080BD5C2:
 	bx r1
 	thumb_func_end player_should_look_direction_be_enforced_upon_movement
 
-	thumb_func_start sub_80BD5C8
-sub_80BD5C8: @ 80BD5C8
+	thumb_func_start StartTransitionToFlipBikeState
+StartTransitionToFlipBikeState: @ 80BD5C8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -738,8 +738,8 @@ _080BD5F4: .4byte gPlayerAvatar
 _080BD5F8:
 	adds r0, r2, 0
 	bl SetPlayerAvatarTransitionFlags
-	movs r4, 0x8D
-	lsls r4, 1
+	movs r4, 0x8D @ BGM_FRLG_BICYCLE
+	lsls r4, 1    @ BGM_FRLG_BICYCLE
 	adds r0, r4, 0
 	bl sub_8056124
 	cmp r0, 0
@@ -752,7 +752,7 @@ _080BD618:
 	pop {r4}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_80BD5C8
+	thumb_func_end StartTransitionToFlipBikeState
 
 	thumb_func_start sub_80BD620
 sub_80BD620: @ 80BD620
diff --git a/asm/item_menu.s b/asm/item_menu.s
index 42378c28e..bdefc393f 100644
--- a/asm/item_menu.s
+++ b/asm/item_menu.s
@@ -1739,8 +1739,8 @@ _08108B48: .4byte gUnknown_203AD18
 _08108B4C: .4byte gUnknown_203AD1C
 	thumb_func_end sub_8108B04
 
-	thumb_func_start sub_8108B50
-sub_8108B50: @ 8108B50
+	thumb_func_start ItemMenu_StartFadeToExitCallback
+ItemMenu_StartFadeToExitCallback: @ 8108B50
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -1768,7 +1768,7 @@ sub_8108B50: @ 8108B50
 	.align 2, 0
 _08108B84: .4byte gTasks
 _08108B88: .4byte sub_8108B8C
-	thumb_func_end sub_8108B50
+	thumb_func_end ItemMenu_StartFadeToExitCallback
 
 	thumb_func_start sub_8108B8C
 sub_8108B8C: @ 8108B8C
@@ -2204,15 +2204,15 @@ DisplayItemMessageInBag: @ 8108E70
 _08108EDC: .4byte gTasks+0x8
 	thumb_func_end DisplayItemMessageInBag
 
-	thumb_func_start sub_8108EE0
-sub_8108EE0: @ 8108EE0
+	thumb_func_start ItemMenu_SetExitCallback
+ItemMenu_SetExitCallback: @ 8108EE0
 	ldr r1, _08108EE8 @ =gUnknown_203AD10
 	ldr r1, [r1]
 	str r0, [r1]
 	bx lr
 	.align 2, 0
 _08108EE8: .4byte gUnknown_203AD10
-	thumb_func_end sub_8108EE0
+	thumb_func_end ItemMenu_SetExitCallback
 
 	thumb_func_start sub_8108EEC
 sub_8108EEC: @ 8108EEC
@@ -2376,12 +2376,12 @@ _08109018:
 	adds r0, r6
 	lsls r0, 3
 	adds r0, r1
-	ldr r1, _08109040 @ =sub_8108B50
+	ldr r1, _08109040 @ =ItemMenu_StartFadeToExitCallback
 	b _081090C4
 	.align 2, 0
 _08109038: .4byte gSpecialVar_ItemId
 _0810903C: .4byte gTasks
-_08109040: .4byte sub_8108B50
+_08109040: .4byte ItemMenu_StartFadeToExitCallback
 _08109044:
 	movs r0, 0x5
 	bl PlaySE
@@ -2402,13 +2402,13 @@ _08109044:
 	adds r0, r6
 	lsls r0, 3
 	adds r0, r1
-	ldr r1, _08109080 @ =sub_8108B50
+	ldr r1, _08109080 @ =ItemMenu_StartFadeToExitCallback
 	b _081090C4
 	.align 2, 0
 _08109074: .4byte gUnknown_203AD10
 _08109078: .4byte gSpecialVar_ItemId
 _0810907C: .4byte gTasks
-_08109080: .4byte sub_8108B50
+_08109080: .4byte ItemMenu_StartFadeToExitCallback
 _08109084:
 	bl sub_8108978
 	ldrb r0, [r7]
@@ -4404,13 +4404,13 @@ _0810A13E:
 	mov r0, r8
 	subs r0, 0x8
 	adds r0, r6, r0
-	ldr r1, _0810A15C @ =sub_8108B50
+	ldr r1, _0810A15C @ =ItemMenu_StartFadeToExitCallback
 	str r1, [r0]
 	b _0810A166
 	.align 2, 0
 _0810A154: .4byte gUnknown_203AD10
 _0810A158: .4byte sub_8126EDC
-_0810A15C: .4byte sub_8108B50
+_0810A15C: .4byte ItemMenu_StartFadeToExitCallback
 _0810A160:
 	adds r0, r7, 0
 	bl sub_810A18C
@@ -4719,9 +4719,9 @@ _0810A3DC:
 	bne _0810A3F8
 	ldr r0, _0810A3F4 @ =sub_810A448
 _0810A3E4:
-	bl sub_8108EE0
+	bl ItemMenu_SetExitCallback
 	adds r0, r5, 0
-	bl sub_8108B50
+	bl ItemMenu_StartFadeToExitCallback
 	b _0810A426
 	.align 2, 0
 _0810A3F0: .4byte 0x0000016d
@@ -4740,11 +4740,11 @@ _0810A3F8:
 	mov r0, r9
 	subs r0, 0x8
 	adds r0, r7, r0
-	ldr r1, _0810A41C @ =sub_8108B50
+	ldr r1, _0810A41C @ =ItemMenu_StartFadeToExitCallback
 	str r1, [r0]
 	b _0810A426
 	.align 2, 0
-_0810A41C: .4byte sub_8108B50
+_0810A41C: .4byte ItemMenu_StartFadeToExitCallback
 _0810A420:
 	adds r0, r5, 0
 	bl sub_810A18C
@@ -4848,9 +4848,9 @@ _0810A4D4:
 	bne _0810A4F0
 	ldr r0, _0810A4EC @ =sub_810A540
 _0810A4DC:
-	bl sub_8108EE0
+	bl ItemMenu_SetExitCallback
 	adds r0, r5, 0
-	bl sub_8108B50
+	bl ItemMenu_StartFadeToExitCallback
 	b _0810A51E
 	.align 2, 0
 _0810A4E8: .4byte 0x0000016d
@@ -4869,11 +4869,11 @@ _0810A4F0:
 	mov r0, r9
 	subs r0, 0x8
 	adds r0, r7, r0
-	ldr r1, _0810A514 @ =sub_8108B50
+	ldr r1, _0810A514 @ =ItemMenu_StartFadeToExitCallback
 	str r1, [r0]
 	b _0810A51E
 	.align 2, 0
-_0810A514: .4byte sub_8108B50
+_0810A514: .4byte ItemMenu_StartFadeToExitCallback
 _0810A518:
 	adds r0, r5, 0
 	bl sub_810A18C
@@ -4954,9 +4954,9 @@ _0810A598:
 	bne _0810A5B4
 	ldr r0, _0810A5B0 @ =sub_810A668
 _0810A5A0:
-	bl sub_8108EE0
+	bl ItemMenu_SetExitCallback
 	adds r0, r5, 0
-	bl sub_8108B50
+	bl ItemMenu_StartFadeToExitCallback
 	b _0810A63E
 	.align 2, 0
 _0810A5AC: .4byte 0x0000016d
@@ -6860,7 +6860,7 @@ _0810B564:
 	ldr r0, _0810B5B4 @ =ItemUseCB_Medicine
 	str r0, [r1]
 	ldr r0, _0810B5B8 @ =sub_81279A4
-	bl sub_8108EE0
+	bl ItemMenu_SetExitCallback
 	mov r0, r9
 	subs r0, 0x8
 	add r0, r8
diff --git a/asm/overworld.s b/asm/overworld.s
index 87f146d39..ee0e8aa6d 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -2441,7 +2441,7 @@ _08055E40:
 	lsls r0, 24
 	cmp r0, 0
 	beq _08055E5A
-	ldr r5, _08055E74 @ =0x00000131
+	ldr r5, _08055E74 @ =0x00000131 @ BGM_FRLG_SURF
 	adds r0, r5, 0
 	bl sub_8056124
 	cmp r0, 0
@@ -2511,7 +2511,7 @@ _08055EA8:
 	bl GetCurrentMapMusic
 	lsls r0, 16
 	lsrs r6, r0, 16
-	ldr r5, _08055F08 @ =0x00000131
+	ldr r5, _08055F08 @ =0x00000131 @ BGM_FRLG_SURF
 	cmp r6, r5
 	beq _08055F14
 	movs r0, 0x8
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 5a55f9f5b..2c3623442 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -13730,8 +13730,8 @@ _081256F2:
 	bx r0
 	thumb_func_end sub_81256C0
 
-	thumb_func_start sub_81256F8
-sub_81256F8: @ 81256F8
+	thumb_func_start ItemUseCB_PpRestore
+ItemUseCB_PpRestore: @ 81256F8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -13802,7 +13802,7 @@ _0812577E:
 _08125784: .4byte gUnknown_203B0A0
 _08125788: .4byte gTasks
 _0812578C: .4byte sub_81256C0
-	thumb_func_end sub_81256F8
+	thumb_func_end ItemUseCB_PpRestore
 
 	thumb_func_start sub_8125790
 sub_8125790: @ 8125790