document some symbols

asm/field_control_avatar.s

@@ -2572,7 +2572,7 @@ _0806DC78:
 	bl sub_805550C
 	ldrb r0, [r4, 0x7]
 	ldrb r1, [r4, 0x6]
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	ldr r1, [r0, 0x4]
 	ldrb r0, [r4, 0x5]
 	ldr r1, [r1, 0x8]

asm/field_effect.s

@@ -2014,7 +2014,7 @@ task00_8084310: @ 8084310
 	ldrsh r6, [r4, r0]
 	cmp r6, 0
 	bne _08084350
-	bl field_weather_is_fade_finished
+	bl IsWeatherNotFadingIn
 	lsls r0, 24
 	cmp r0, 0
 	beq _08084376
@@ -2287,7 +2287,7 @@ _08084560: .4byte gSprites
 sub_8084564: @ 8084564
 	push {r4,lr}
 	adds r4, r0, 0
-	bl field_weather_is_fade_finished
+	bl IsWeatherNotFadingIn
 	lsls r0, 24
 	cmp r0, 0
 	beq _08084578
@@ -4002,7 +4002,7 @@ sub_8085274: @ 8085274
 	adds r4, r0, 0
 	adds r5, r1, 0
 	adds r6, r2, 0
-	bl field_weather_is_fade_finished
+	bl IsWeatherNotFadingIn
 	lsls r0, 24
 	cmp r0, 0
 	beq _080852B4
@@ -5025,7 +5025,7 @@ _08085A50: .4byte gTasks
 sub_8085A54: @ 8085A54
 	push {r4,lr}
 	adds r4, r0, 0
-	bl field_weather_is_fade_finished
+	bl IsWeatherNotFadingIn
 	lsls r0, 24
 	cmp r0, 0
 	beq _08085A78
@@ -5492,7 +5492,7 @@ _08085E08: .4byte gTasks
 sub_8085E0C: @ 8085E0C
 	push {r4-r6,lr}
 	adds r6, r0, 0
-	bl field_weather_is_fade_finished
+	bl IsWeatherNotFadingIn
 	lsls r0, 24
 	cmp r0, 0
 	beq _08085E82

asm/field_map_obj.s

@@ -376,7 +376,7 @@ sub_805E080: @ 805E080
 	str r0, [sp, 0x8]
 	adds r0, r6, 0
 	adds r1, r7, 0
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	ldr r1, [r0, 0x4]
 	lsls r0, r4, 1
 	adds r0, r4
@@ -4294,7 +4294,7 @@ _0805FD90: .4byte gMapHeader
 _0805FD94:
 	adds r0, r2, 0
 	adds r1, r3, 0
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	ldr r0, [r0, 0x4]
 	ldr r1, [r0, 0x4]
 _0805FDA0:

asm/field_weather.s

@@ -1889,8 +1889,8 @@ _0807AA68: .4byte 0x000006ca
 _0807AA6C: .4byte 0x000006cb
 	thumb_func_end FieldWeather_StartFadingOutCreditsMap
 
-	thumb_func_start field_weather_is_fade_finished
-field_weather_is_fade_finished: @ 807AA70
+	thumb_func_start IsWeatherNotFadingIn
+IsWeatherNotFadingIn: @ 807AA70
 	ldr r0, _0807AA84 @ =gUnknown_2037F34
 	ldr r1, _0807AA88 @ =0x000006c6
 	adds r0, r1
@@ -1904,7 +1904,7 @@ field_weather_is_fade_finished: @ 807AA70
 	.align 2, 0
 _0807AA84: .4byte gUnknown_2037F34
 _0807AA88: .4byte 0x000006c6
-	thumb_func_end field_weather_is_fade_finished
+	thumb_func_end IsWeatherNotFadingIn
 
 	thumb_func_start sub_807AA8C
 sub_807AA8C: @ 807AA8C

asm/item_menu.s

@@ -5,8 +5,8 @@
 
 	.text
 
-	thumb_func_start sub_8107DB4
-sub_8107DB4: @ 8107DB4
+	thumb_func_start GoToBagMenu
+GoToBagMenu: @ 8107DB4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -136,7 +136,7 @@ _08107EA8: .4byte gSpecialVar_ItemId
 _08107EAC: .4byte sub_8107F10
 _08107EB0: .4byte gUnknown_203AD10
 _08107EB4: .4byte gUnknown_203ACFC
-	thumb_func_end sub_8107DB4
+	thumb_func_end GoToBagMenu
 
 	thumb_func_start CB2_BagMenuFromStartMenu
 CB2_BagMenuFromStartMenu: @ 8107EB8
@@ -144,7 +144,7 @@ CB2_BagMenuFromStartMenu: @ 8107EB8
 	ldr r2, _08107EC8 @ =CB2_ReturnToStartMenu
 	movs r0, 0
 	movs r1, 0x3
-	bl sub_8107DB4
+	bl GoToBagMenu
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -157,7 +157,7 @@ sub_8107ECC: @ 8107ECC
 	ldr r2, _08107EDC @ =SetCB2ToReshowScreenAfterMenu2
 	movs r0, 0x5
 	movs r1, 0x3
-	bl sub_8107DB4
+	bl GoToBagMenu
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -1934,15 +1934,15 @@ _08108CE8: .4byte 0x0000fff0
 _08108CEC: .4byte gUnknown_203ACFC
 	thumb_func_end sub_8108CB4
 
-	thumb_func_start sub_8108CF0
-sub_8108CF0: @ 8108CF0
+	thumb_func_start CB2_SetUpReshowBattleScreenAfterMenu
+CB2_SetUpReshowBattleScreenAfterMenu: @ 8108CF0
 	ldr r1, _08108CF8 @ =gUnknown_203ACFC
 	movs r0, 0
 	strb r0, [r1, 0x5]
 	bx lr
 	.align 2, 0
 _08108CF8: .4byte gUnknown_203ACFC
-	thumb_func_end sub_8108CF0
+	thumb_func_end CB2_SetUpReshowBattleScreenAfterMenu
 
 	thumb_func_start sub_8108CFC
 sub_8108CFC: @ 8108CFC
@@ -4399,7 +4399,7 @@ _0810A120:
 _0810A13E:
 	ldr r0, _0810A154 @ =gUnknown_203AD10
 	ldr r1, [r0]
-	ldr r0, _0810A158 @ =sub_8126EDC
+	ldr r0, _0810A158 @ =CB2_ChooseMonToGiveItem
 	str r0, [r1]
 	mov r0, r8
 	subs r0, 0x8
@@ -4409,7 +4409,7 @@ _0810A13E:
 	b _0810A166
 	.align 2, 0
 _0810A154: .4byte gUnknown_203AD10
-_0810A158: .4byte sub_8126EDC
+_0810A158: .4byte CB2_ChooseMonToGiveItem
 _0810A15C: .4byte ItemMenu_StartFadeToExitCallback
 _0810A160:
 	adds r0, r7, 0
@@ -4786,7 +4786,7 @@ _0810A458: .4byte sub_810A45C
 	thumb_func_start sub_810A45C
 sub_810A45C: @ 810A45C
 	push {lr}
-	bl sub_8123730
+	bl CB2_SelectBagItemToGive
 	pop {r0}
 	bx r0
 	thumb_func_end sub_810A45C
@@ -4918,7 +4918,7 @@ sub_810A554: @ 810A554
 	ldr r2, _0810A564 @ =sub_808CE60
 	movs r0, 0x4
 	movs r1, 0x3
-	bl sub_8107DB4
+	bl GoToBagMenu
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -5063,7 +5063,7 @@ sub_810A67C: @ 810A67C
 	ldr r2, _0810A68C @ =CB2_ReturnToField
 	movs r0, 0x2
 	movs r1, 0x3
-	bl sub_8107DB4
+	bl GoToBagMenu
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -6127,7 +6127,7 @@ sub_810AF74: @ 810AF74
 	ldr r2, _0810AF98 @ =SetCB2ToReshowScreenAfterMenu2
 	movs r0, 0x6
 	movs r1, 0
-	bl sub_8107DB4
+	bl GoToBagMenu
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -6358,7 +6358,7 @@ _0810B16C:
 	movs r0, 0x8
 _0810B170:
 	movs r1, 0
-	bl sub_8107DB4
+	bl GoToBagMenu
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -6856,10 +6856,10 @@ _0810B564:
 	movs r2, 0
 	bl DestroyListMenuTask
 	bl sub_810AECC
-	ldr r1, _0810B5B0 @ =gUnknown_3005E98
+	ldr r1, _0810B5B0 @ =gItemUseCB
 	ldr r0, _0810B5B4 @ =ItemUseCB_Medicine
 	str r0, [r1]
-	ldr r0, _0810B5B8 @ =sub_81279A4
+	ldr r0, _0810B5B8 @ =ChooseMonForInBattleItem
 	bl ItemMenu_SetExitCallback
 	mov r0, r9
 	subs r0, 0x8
@@ -6868,9 +6868,9 @@ _0810B564:
 	str r1, [r0]
 	b _0810B5C6
 	.align 2, 0
-_0810B5B0: .4byte gUnknown_3005E98
+_0810B5B0: .4byte gItemUseCB
 _0810B5B4: .4byte ItemUseCB_Medicine
-_0810B5B8: .4byte sub_81279A4
+_0810B5B8: .4byte ChooseMonForInBattleItem
 _0810B5BC: .4byte sub_810B070
 _0810B5C0:
 	ldrh r0, [r5, 0x10]

asm/link_rfu.s

@@ -3172,8 +3172,8 @@ _080FEBA6:
 	bx r0
 	thumb_func_end sub_80FEB3C
 
-	thumb_func_start sub_80FEBAC
-sub_80FEBAC: @ 80FEBAC
+	thumb_func_start DoEasyChatScreen
+DoEasyChatScreen: @ 80FEBAC
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -3214,7 +3214,7 @@ sub_80FEBAC: @ 80FEBAC
 _080FEC00: .4byte sub_80FEC54
 _080FEC04: .4byte gTasks
 _080FEC08: .4byte sub_80FEC0C
-	thumb_func_end sub_80FEBAC
+	thumb_func_end DoEasyChatScreen
 
 	thumb_func_start sub_80FEC0C
 sub_80FEC0C: @ 80FEC0C
@@ -3588,7 +3588,7 @@ _080FEF08:
 	ldr r0, _080FEF24 @ =gSpecialVar_0x8004
 	ldrb r0, [r0]
 	ldr r2, _080FEF28 @ =sub_80568C4
-	bl sub_80FEBAC
+	bl DoEasyChatScreen
 _080FEF12:
 	pop {r0}
 	bx r0

asm/link_rfu_3.s

@@ -3650,7 +3650,7 @@ _08117784:
 	ldr r0, _0811779C @ =sub_811C1C8
 	str r0, [r1, 0x8]
 	movs r0, 0x2
-	bl sub_81274A8
+	bl InitChooseHalfPartyForBattle
 	b _081178E0
 	.align 2, 0
 _08117798: .4byte gMain
@@ -5602,12 +5602,12 @@ _0811887C:
 _081188C4: .4byte gUnknown_203B06C
 _081188C8: .4byte gSpecialVar_Result
 _081188CC:
-	bl sub_811FB18
+	bl GetPartyMenuType
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x8
 	beq _081188E4
-	bl sub_811FB18
+	bl GetPartyMenuType
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x9
@@ -7006,7 +7006,7 @@ _08119512:
 	str r0, [r1]
 	ldr r1, _08119538 @ =CB2_ReturnToField
 	movs r0, 0x8
-	bl sub_81277F4
+	bl ChooseMonForMoveTutor
 	b _081198DC
 	.align 2, 0
 _08119528: .4byte gPaletteFade
@@ -7335,7 +7335,7 @@ _081197CA:
 	adds r0, r1
 	ldr r0, [r0]
 	str r0, [r2]
-	ldr r2, _0811982C @ =gUnknown_203B06A
+	ldr r2, _0811982C @ =gUnionRoomRequestedMonType
 	ldr r1, [r6]
 	movs r3, 0x2
 	ldrsh r0, [r7, r3]
@@ -7344,7 +7344,7 @@ _081197CA:
 	ldrb r0, [r1, 0x9]
 	lsrs r0, 2
 	strb r0, [r2]
-	ldr r2, _08119830 @ =gUnknown_203B068
+	ldr r2, _08119830 @ =gUnionRoomOfferedSpecies
 	ldr r1, [r6]
 	movs r3, 0x2
 	ldrsh r0, [r7, r3]
@@ -7359,7 +7359,7 @@ _081197CA:
 	str r0, [r1]
 	ldr r1, _0811983C @ =CB2_ReturnToField
 	movs r0, 0x9
-	bl sub_81277F4
+	bl ChooseMonForMoveTutor
 	adds r0, r6, 0
 	bl sub_81186B0
 	ldrh r0, [r7, 0x2]
@@ -7369,8 +7369,8 @@ _081197CA:
 _08119820: .4byte gUnknown_8458D1C
 _08119824: .4byte gUnknown_203B06C
 _08119828: .4byte gUnknown_203B064
-_0811982C: .4byte gUnknown_203B06A
-_08119830: .4byte gUnknown_203B068
+_0811982C: .4byte gUnionRoomRequestedMonType
+_08119830: .4byte gUnionRoomOfferedSpecies
 _08119834: .4byte gFieldCallback
 _08119838: .4byte sub_807DCE4
 _0811983C: .4byte CB2_ReturnToField

asm/naming_screen.s

@@ -3623,7 +3623,7 @@ sub_809F5C4: @ 809F5C4
 	push {r4,r5,lr}
 	sub sp, 0x10
 	movs r4, 0
-	ldr r1, _0809F61C @ =gUnknown_841621F
+	ldr r1, _0809F61C @ =gText_MaleSymbol
 	add r0, sp, 0xC
 	bl StringCopy
 	ldr r5, _0809F620 @ =gUnknown_203998C
@@ -3635,7 +3635,7 @@ sub_809F5C4: @ 809F5C4
 	beq _0809F614
 	cmp r0, 0xFE
 	bne _0809F5EE
-	ldr r1, _0809F628 @ =gUnknown_8416221
+	ldr r1, _0809F628 @ =gText_FemaleSymbol
 	add r0, sp, 0xC
 	bl StringCopy
 	movs r4, 0x1
@@ -3664,10 +3664,10 @@ _0809F614:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0809F61C: .4byte gUnknown_841621F
+_0809F61C: .4byte gText_MaleSymbol
 _0809F620: .4byte gUnknown_203998C
 _0809F624: .4byte 0x00001e36
-_0809F628: .4byte gUnknown_8416221
+_0809F628: .4byte gText_FemaleSymbol
 _0809F62C: .4byte 0x00001e13
 _0809F630: .4byte gUnknown_83E2428
 	thumb_func_end sub_809F5C4

asm/overworld.s

@@ -473,7 +473,7 @@ _08054F8A:
 	str r2, [sp, 0x4]
 	adds r0, r2, 0
 	adds r1, r5, 0
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	mov r6, r10
 	ldr r1, [r6]
 	mov r2, r8
@@ -821,8 +821,8 @@ _08055232:
 	bx r1
 	thumb_func_end warp_data_is_not_neg_1
 
-	thumb_func_start get_mapheader_by_bank_and_number
-get_mapheader_by_bank_and_number: @ 8055238
+	thumb_func_start Overworld_GetMapHeaderByGroupAndId
+Overworld_GetMapHeaderByGroupAndId: @ 8055238
 	lsls r0, 16
 	lsls r1, 16
 	ldr r2, _0805524C @ =gMapGroups
@@ -835,7 +835,7 @@ get_mapheader_by_bank_and_number: @ 8055238
 	bx lr
 	.align 2, 0
 _0805524C: .4byte gMapGroups
-	thumb_func_end get_mapheader_by_bank_and_number
+	thumb_func_end Overworld_GetMapHeaderByGroupAndId
 
 	thumb_func_start warp1_get_mapheader
 warp1_get_mapheader: @ 8055250
@@ -850,7 +850,7 @@ warp1_get_mapheader: @ 8055250
 	asrs r1, 24
 	lsls r1, 16
 	lsrs r1, 16
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	pop {r1}
 	bx r1
 	.align 2, 0
@@ -872,7 +872,7 @@ set_current_map_header_from_sav1_save_old_name: @ 8055274
 	asrs r1, 24
 	lsls r1, 16
 	lsrs r1, 16
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	adds r1, r4, 0
 	ldm r0!, {r2,r3,r6}
 	stm r1!, {r2,r3,r6}
@@ -908,7 +908,7 @@ set_current_map_header_from_sav1: @ 80552BC
 	asrs r1, 24
 	lsls r1, 16
 	lsrs r1, 16
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	adds r1, r4, 0
 	ldm r0!, {r2,r3,r5}
 	stm r1!, {r2,r3,r5}
@@ -2336,7 +2336,7 @@ sub_8055D6C: @ 8055D6C
 	asrs r1, 24
 	lsls r1, 16
 	lsrs r1, 16
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	ldrh r0, [r0, 0x10]
 	pop {r1}
 	bx r1
@@ -2863,7 +2863,7 @@ get_map_light_level_by_bank_and_number: @ 8056158
 	lsls r1, 24
 	asrs r1, 8
 	lsrs r1, 16
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	ldrb r0, [r0, 0x17]
 	pop {r1}
 	bx r1
@@ -2925,7 +2925,7 @@ sub_80561B4: @ 80561B4
 	asrs r1, 24
 	lsls r1, 16
 	lsrs r1, 16
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	ldrb r0, [r0, 0x14]
 	pop {r1}
 	bx r1
@@ -3014,7 +3014,7 @@ sav1_saved_warp2_map_get_name: @ 8056238
 	asrs r1, 24
 	lsls r1, 16
 	lsrs r1, 16
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	ldrb r0, [r0, 0x14]
 	pop {r1}
 	bx r1
@@ -3036,7 +3036,7 @@ GetCurrentRegionMapSectionId: @ 8056260
 	asrs r1, 24
 	lsls r1, 16
 	lsrs r1, 16
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	ldrb r0, [r0, 0x14]
 	pop {r1}
 	bx r1
@@ -3058,7 +3058,7 @@ sav1_map_get_battletype: @ 8056288
 	asrs r1, 24
 	lsls r1, 16
 	lsrs r1, 16
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	ldrb r0, [r0, 0x1B]
 	pop {r1}
 	bx r1

asm/pokemon_storage_system.s

@@ -1455,7 +1455,7 @@ _0808C3E0:
 	.align 2, 0
 _0808C444: .4byte gUnknown_83CDA20
 _0808C448:
-	bl field_weather_is_fade_finished
+	bl IsWeatherNotFadingIn
 	lsls r0, 24
 	cmp r0, 0
 	bne _0808C454
@@ -6591,7 +6591,7 @@ _0808EEE8:
 	ldr r2, _0808EF08 @ =sub_808CE60
 	movs r0, 0x4
 	movs r1, 0
-	bl sub_8107DB4
+	bl GoToBagMenu
 _0808EEF6:
 	adds r0, r7, 0
 	bl DestroyTask

asm/pokemon_summary_screen.s

@@ -3448,7 +3448,7 @@ _08136168:
 	ldr r0, [r6]
 	ldr r3, _08136208 @ =0x00003084
 	adds r0, r3
-	ldr r1, _0813620C @ =gUnknown_8416221
+	ldr r1, _0813620C @ =gText_FemaleSymbol
 	bl StringCopy
 	b _08136238
 	.align 2, 0
@@ -3459,19 +3459,19 @@ _081361FC: .4byte 0x00003220
 _08136200: .4byte 0x00003221
 _08136204: .4byte 0x00003034
 _08136208: .4byte 0x00003084
-_0813620C: .4byte gUnknown_8416221
+_0813620C: .4byte gText_FemaleSymbol
 _08136210:
 	cmp r7, 0
 	bne _0813622C
 	ldr r0, [r6]
 	ldr r1, _08136224 @ =0x00003084
 	adds r0, r1
-	ldr r1, _08136228 @ =gUnknown_841621F
+	ldr r1, _08136228 @ =gText_MaleSymbol
 	bl StringCopy
 	b _08136238
 	.align 2, 0
 _08136224: .4byte 0x00003084
-_08136228: .4byte gUnknown_841621F
+_08136228: .4byte gText_MaleSymbol
 _0813622C:
 	ldr r0, [r6]
 	ldr r2, _08136308 @ =0x00003084
@@ -3622,7 +3622,7 @@ sub_8136350: @ 8136350
 	bl ConvertIntToDecimalStringN
 	ldr r0, [r6]
 	adds r0, r4
-	ldr r1, _08136504 @ =gUnknown_841620C
+	ldr r1, _08136504 @ =gText_Slash
 	bl StringAppend
 	ldr r0, [r6]
 	adds r0, r7
@@ -3794,7 +3794,7 @@ _081363E6:
 _081364F8: .4byte gUnknown_203B140
 _081364FC: .4byte 0x00003290
 _08136500: .4byte 0x00003090
-_08136504: .4byte gUnknown_841620C
+_08136504: .4byte gText_Slash
 _08136508: .4byte gUnknown_203B144
 _0813650C: .4byte 0x000032f8
 _08136510: .4byte sub_804CF14
@@ -5618,7 +5618,7 @@ _081373EA:
 	str r6, [sp]
 	mov r7, r9
 	str r7, [sp, 0x4]
-	ldr r1, _081374E0 @ =gUnknown_841620C
+	ldr r1, _081374E0 @ =gText_Slash
 	str r1, [sp, 0x8]
 	movs r1, 0x2
 	movs r2, 0x3A
@@ -5663,7 +5663,7 @@ _081374D0: .4byte gUnknown_8416238
 _081374D4: .4byte gUnknown_203B144
 _081374D8: .4byte 0x000030b8
 _081374DC: .4byte 0x00003258
-_081374E0: .4byte gUnknown_841620C
+_081374E0: .4byte gText_Slash
 _081374E4: .4byte 0x000030f0
 	thumb_func_end sub_81372E4
 
@@ -9489,7 +9489,7 @@ sub_8139388: @ 8139388
 	bl sub_8138BEC
 	lsls r0, 16
 	lsrs r0, 16
-	bl sub_8125A90
+	bl IsMoveHm
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1

asm/region_map.s

@@ -7395,7 +7395,7 @@ sub_80C3B00: @ 80C3B00
 	asrs r1, 24
 	lsls r1, 16
 	lsrs r1, 16
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	ldrb r0, [r0, 0x14]
 	pop {r1}
 	bx r1
@@ -7477,7 +7477,7 @@ _080C3BAC:
 	asrs r1, 24
 	lsls r1, 16
 	lsrs r1, 16
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	adds r2, r0, 0
 	ldr r0, _080C3BEC @ =gUnknown_20399E4
 	ldr r1, [r0]
@@ -7506,7 +7506,7 @@ _080C3BF0:
 	asrs r1, 24
 	lsls r1, 16
 	lsrs r1, 16
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	adds r2, r0, 0
 	ldr r0, _080C3C28 @ =gUnknown_20399E4
 	ldr r1, [r0]
@@ -7543,7 +7543,7 @@ _080C3C2C:
 	ldrsb r1, [r5, r1]
 	lsls r1, 16
 	lsrs r1, 16
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	adds r2, r0, 0
 	b _080C3C8E
 	.align 2, 0
@@ -7564,7 +7564,7 @@ _080C3C68:
 	ldrsb r1, [r5, r1]
 	lsls r1, 16
 	lsrs r1, 16
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	adds r2, r0, 0
 	ldr r1, [r4]
 	ldrb r0, [r2, 0x14]
@@ -9761,8 +9761,8 @@ _080C4DF2:
 	bx r1
 	thumb_func_end GetMapName
 
-	thumb_func_start sub_80C4DF8
-sub_80C4DF8: @ 80C4DF8
+	thumb_func_start GetMapNameGeneric
+GetMapNameGeneric: @ 80C4DF8
 	push {lr}
 	lsls r1, 16
 	lsrs r1, 16
@@ -9770,14 +9770,14 @@ sub_80C4DF8: @ 80C4DF8
 	bl GetMapName
 	pop {r1}
 	bx r1
-	thumb_func_end sub_80C4DF8
+	thumb_func_end GetMapNameGeneric
 
 	thumb_func_start sub_80C4E08
 sub_80C4E08: @ 80C4E08
 	push {lr}
 	lsls r1, 16
 	lsrs r1, 16
-	bl sub_80C4DF8
+	bl GetMapNameGeneric
 	pop {r1}
 	bx r1
 	thumb_func_end sub_80C4E08
@@ -10283,7 +10283,7 @@ _080C5220:
 _080C5250: .4byte gUnknown_20399FC
 _080C5254: .4byte CB2_ReturnToField
 _080C5258:
-	ldr r0, _080C5274 @ =sub_8124AB0
+	ldr r0, _080C5274 @ =CB2_ReturnToPartyMenuFromFlyMap
 	bl SetMainCallback2
 _080C525E:
 	ldr r4, _080C5278 @ =gUnknown_20399FC
@@ -10298,7 +10298,7 @@ _080C526E:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080C5274: .4byte sub_8124AB0
+_080C5274: .4byte CB2_ReturnToPartyMenuFromFlyMap
 _080C5278: .4byte gUnknown_20399FC
 	thumb_func_end sub_80C5208
 

asm/script_pokemon_util_80A0058.s

@@ -385,7 +385,7 @@ sub_80A0334: @ 80A0334
 	ldr r0, _080A034C @ =sub_80A0350
 	str r0, [r1, 0x8]
 	movs r0, 0
-	bl sub_81274A8
+	bl InitChooseHalfPartyForBattle
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -427,7 +427,7 @@ ChooseBattleTowerPlayerParty: @ 80A0380
 	ldr r0, _080A0398 @ =sub_80A039C
 	str r0, [r1, 0x8]
 	movs r0, 0x1
-	bl sub_81274A8
+	bl InitChooseHalfPartyForBattle
 	pop {r0}
 	bx r0
 	.align 2, 0

asm/script_pokemon_util_80BF8FC.s

@@ -88,7 +88,7 @@ sub_80BF97C: @ 80BF97C
 	lsls r0, 3
 	adds r0, r1
 	ldrb r0, [r0, 0x8]
-	bl sub_81283A8
+	bl ChoosePartyMonByMenuType
 	adds r0, r4, 0
 	bl DestroyTask
 _080BF9AC:

asm/shop.s

@@ -291,7 +291,7 @@ sub_809ACD4: @ 809ACD4
 	ldr r2, _0809ACEC @ =CB2_ReturnToField
 	movs r0, 0x2
 	movs r1, 0x3
-	bl sub_8107DB4
+	bl GoToBagMenu
 	ldr r1, _0809ACF0 @ =gFieldCallback
 	ldr r0, _0809ACF4 @ =sub_809AD74
 	str r0, [r1]
@@ -386,7 +386,7 @@ sub_809AD8C: @ 809AD8C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl field_weather_is_fade_finished
+	bl IsWeatherNotFadingIn
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1