Documentation and cleanup

5 files changed, 25 insertions, 25 deletions

diff --git a/asm/field_weather.s b/asm/field_weather.s
index ac24101a7..bdb31a434 100644
--- a/asm/field_weather.s
+++ b/asm/field_weather.s
@@ -1737,8 +1737,8 @@ _0807A93C: .4byte 0x000006ca
 _0807A940: .4byte 0x000006cb
 	thumb_func_end fade_screen
 
-	thumb_func_start sub_807A944
-sub_807A944: @ 807A944
+	thumb_func_start FieldWeather_StartFadingOutCreditsMap
+FieldWeather_StartFadingOutCreditsMap: @ 807A944
 	push {r4-r6,lr}
 	sub sp, 0x4
 	adds r6, r2, 0
@@ -1887,7 +1887,7 @@ _0807AA60: .4byte gUnknown_2037F34
 _0807AA64: .4byte 0x000006c6
 _0807AA68: .4byte 0x000006ca
 _0807AA6C: .4byte 0x000006cb
-	thumb_func_end sub_807A944
+	thumb_func_end FieldWeather_StartFadingOutCreditsMap
 
 	thumb_func_start sub_807AA70
 sub_807AA70: @ 807AA70
diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s
index 19ff62664..5b28e21d5 100644
--- a/asm/hall_of_fame.s
+++ b/asm/hall_of_fame.s
@@ -138,7 +138,7 @@ _080F1EC4:
 	bne _080F1EF0
 	ldr r0, _080F1EEC @ =sub_80F1DC0
 	bl SetMainCallback2
-	movs r0, 0x8F
+	movs r0, 0x8F @ BGM_FRLG_CONGRATULATIONS_HALL_OF_FAME >> 1
 	lsls r0, 1
 	bl PlayBGM
 	movs r0, 0
@@ -1448,15 +1448,15 @@ sub_80F2934: @ 80F2934
 	movs r0, 0x80
 	lsls r0, 7
 	bl FlagSet
-	ldr r1, _080F2974 @ =gUnknown_2031DD8
+	ldr r1, _080F2974 @ =gDisableMapMusicChangeOnMapLoad
 	movs r0, 0x2
 	strb r0, [r1]
 	movs r2, 0x1
 	negs r2, r2
 	movs r0, 0x6
 	str r0, [sp]
-	movs r0, 0x3
-	movs r1, 0x9
+	movs r0, 0x3 @ MAP_GROUP(INDIGO_PLATEAU_EXTERIOR)
+	movs r1, 0x9 @ MAP_NUM(INDIGO_PLATEAU_EXTERIOR)
 	movs r3, 0xB
 	bl Overworld_SetWarpDestination
 	bl DoWarp
@@ -1466,7 +1466,7 @@ sub_80F2934: @ 80F2934
 	bx r0
 	.align 2, 0
 _080F2970: .4byte 0x00004085
-_080F2974: .4byte gUnknown_2031DD8
+_080F2974: .4byte gDisableMapMusicChangeOnMapLoad
 	thumb_func_end sub_80F2934
 
 	thumb_func_start sub_80F2978
diff --git a/asm/overworld.s b/asm/overworld.s
index b2bce4b48..811ee5c04 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -2382,14 +2382,14 @@ sub_8055DB8: @ 8055DB8
 Overworld_PlaySpecialMapMusic: @ 8055DC4
 	push {r4,r5,lr}
 	sub sp, 0x4
-	ldr r0, _08055DD8 @ =gUnknown_2031DD8
+	ldr r0, _08055DD8 @ =gDisableMapMusicChangeOnMapLoad
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	bne _08055DDC
 	bl StopMapMusic
 	b _08055E6C
 	.align 2, 0
-_08055DD8: .4byte gUnknown_2031DD8
+_08055DD8: .4byte gDisableMapMusicChangeOnMapLoad
 _08055DDC:
 	cmp r0, 0x2
 	beq _08055E6C
@@ -2488,14 +2488,14 @@ _08055E90: .4byte gSaveBlock1Ptr
 	thumb_func_start sub_8055E94
 sub_8055E94: @ 8055E94
 	push {r4-r6,lr}
-	ldr r0, _08055EA4 @ =gUnknown_2031DD8
+	ldr r0, _08055EA4 @ =gDisableMapMusicChangeOnMapLoad
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	bne _08055EA8
 	bl StopMapMusic
 	b _08055F14
 	.align 2, 0
-_08055EA4: .4byte gUnknown_2031DD8
+_08055EA4: .4byte gDisableMapMusicChangeOnMapLoad
 _08055EA8:
 	cmp r0, 0x2
 	beq _08055F14
@@ -2701,7 +2701,7 @@ _08056014:
 	adds r0, 0x32
 	lsls r0, 24
 	lsrs r2, r0, 24
-	ldr r0, _08056050 @ =gUnknown_2031DD8
+	ldr r0, _08056050 @ =gDisableMapMusicChangeOnMapLoad
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	bne _08056054
@@ -2709,7 +2709,7 @@ _08056014:
 	b _0805606A
 	.align 2, 0
 _0805604C: .4byte gUnknown_2031DDC
-_08056050: .4byte gUnknown_2031DD8
+_08056050: .4byte gDisableMapMusicChangeOnMapLoad
 _08056054:
 	cmp r0, 0x2
 	beq _0805606A
@@ -5158,8 +5158,8 @@ _0805749A:
 _080574A0: .4byte sub_8056534
 	thumb_func_end sub_8057430
 
-	thumb_func_start sub_80574A4
-sub_80574A4: @ 80574A4
+	thumb_func_start Overworld_CreditsMainCB
+Overworld_CreditsMainCB: @ 80574A4
 	push {r4,lr}
 	ldr r0, _080574E8 @ =gPaletteFade
 	ldrb r0, [r0, 0x7]
@@ -5187,7 +5187,7 @@ _080574E0:
 	bx r0
 	.align 2, 0
 _080574E8: .4byte gPaletteFade
-	thumb_func_end sub_80574A4
+	thumb_func_end Overworld_CreditsMainCB
 
 	thumb_func_start sub_80574EC
 sub_80574EC: @ 80574EC
@@ -5209,8 +5209,8 @@ _08057506:
 	bx r1
 	thumb_func_end sub_80574EC
 
-	thumb_func_start sub_805750C
-sub_805750C: @ 805750C
+	thumb_func_start Overworld_DoScrollSceneForCredits
+Overworld_DoScrollSceneForCredits: @ 805750C
 	push {lr}
 	ldr r3, _08057520 @ =gUnknown_2031DE4
 	str r1, [r3]
@@ -5223,7 +5223,7 @@ sub_805750C: @ 805750C
 	.align 2, 0
 _08057520: .4byte gUnknown_2031DE4
 _08057524: .4byte gUnknown_2036E28
-	thumb_func_end sub_805750C
+	thumb_func_end Overworld_DoScrollSceneForCredits
 
 	thumb_func_start sub_8057528
 sub_8057528: @ 8057528
@@ -5451,7 +5451,7 @@ _08057712:
 	ldr r2, _08057738 @ =0x3fffffff
 	movs r0, 0
 	movs r1, 0
-	bl sub_807A944
+	bl FieldWeather_StartFadingOutCreditsMap
 _0805772A:
 	ldrb r0, [r4]
 	adds r0, 0x1
diff --git a/asm/pokedex_screen.s b/asm/pokedex_screen.s
index b9c18d201..9394675c6 100644
--- a/asm/pokedex_screen.s
+++ b/asm/pokedex_screen.s
@@ -4491,7 +4491,7 @@ sub_81049FC: @ 81049FC
 	adds r0, r5, 0
 	movs r1, 0x8
 	movs r3, 0x1
-	bl sub_810C228
+	bl LoadMonPicForCredits
 	add sp, 0x8
 	pop {r4-r6}
 	pop {r0}
diff --git a/asm/post_battle_event_funcs.s b/asm/post_battle_event_funcs.s
index 264ca380d..20455093a 100644
--- a/asm/post_battle_event_funcs.s
+++ b/asm/post_battle_event_funcs.s
@@ -5,8 +5,8 @@
 
 	.text
 
-	thumb_func_start sub_80CA2E4
-sub_80CA2E4: @ 80CA2E4
+	thumb_func_start Special_HallOfFame
+Special_HallOfFame: @ 80CA2E4
 	push {r4-r7,lr}
 	sub sp, 0x4
 	bl sp000_heal_pokemon
@@ -104,7 +104,7 @@ _080CA3B4: .4byte gSaveBlock2Ptr
 _080CA3B8: .4byte gPlayerParty
 _080CA3BC: .4byte 0x0000083b
 _080CA3C0: .4byte CB2_DoHallOfFameScreen
-	thumb_func_end sub_80CA2E4
+	thumb_func_end Special_HallOfFame
 
 	thumb_func_start sub_80CA3C4
 sub_80CA3C4: @ 80CA3C4