rom5.s -> reshow_battle_screen.s

4 files changed, 15 insertions, 15 deletions

diff --git a/asm/battle_4.s b/asm/battle_4.s
index c1a6513be..0581d1e7d 100644
--- a/asm/battle_4.s
+++ b/asm/battle_4.s
@@ -15879,7 +15879,7 @@ _08023C3E:
 	subs r2, 0x1
 	lsls r2, 24
 	lsrs r2, 24
-	ldr r3, _08023C78 @ =sub_807AD58
+	ldr r3, _08023C78 @ =ReshowBattleScreenAfterMenu
 	ldr r4, _08023C7C @ =word_2024E82
 	ldrh r4, [r4]
 	str r4, [sp]
@@ -15894,7 +15894,7 @@ _08023C68: .4byte gPaletteFade
 _08023C6C: .4byte gPlayerParty
 _08023C70: .4byte 0x00016018
 _08023C74: .4byte gPlayerPartyCount
-_08023C78: .4byte sub_807AD58
+_08023C78: .4byte ReshowBattleScreenAfterMenu
 _08023C7C: .4byte word_2024E82
 _08023C80: .4byte 0x0001601a
 _08023C84:
diff --git a/asm/battle_5.s b/asm/battle_5.s
index ec95d76db..01541c120 100644
--- a/asm/battle_5.s
+++ b/asm/battle_5.s
@@ -4487,23 +4487,23 @@ nullsub_8: @ 802E410
 	thumb_func_start sub_802E414
 sub_802E414: @ 802E414
 	push {lr}
-	ldr r0, _0802E420 @ =sub_807AD58
+	ldr r0, _0802E420 @ =ReshowBattleScreenAfterMenu
 	bl SetMainCallback2
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0802E420: .4byte sub_807AD58
+_0802E420: .4byte ReshowBattleScreenAfterMenu
 	thumb_func_end sub_802E414
 
 	thumb_func_start sub_802E424
 sub_802E424: @ 802E424
 	push {lr}
-	ldr r0, _0802E430 @ =sub_807AD58
+	ldr r0, _0802E430 @ =ReshowBattleScreenAfterMenu
 	bl SetMainCallback2
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0802E430: .4byte sub_807AD58
+_0802E430: .4byte ReshowBattleScreenAfterMenu
 	thumb_func_end sub_802E424
 
 	thumb_func_start sub_802E434
diff --git a/asm/rom5.s b/asm/reshow_battle_screen.s
index 93f73dca8..88fa5dbde 100644
--- a/asm/rom5.s
+++ b/asm/reshow_battle_screen.s
@@ -11,8 +11,8 @@ nullsub_14: @ 807AD54
 	bx lr
 	thumb_func_end nullsub_14
 
-	thumb_func_start sub_807AD58
-sub_807AD58: @ 807AD58
+	thumb_func_start ReshowBattleScreenAfterMenu
+ReshowBattleScreenAfterMenu: @ 807AD58
 	push {lr}
 	ldr r2, _0807AD90 @ =gPaletteFade
 	ldrb r0, [r2, 0x8]
@@ -33,7 +33,7 @@ sub_807AD58: @ 807AD58
 	ldr r1, _0807ADA0 @ =0x0001fffe
 	adds r0, r1
 	strb r2, [r0]
-	ldr r0, _0807ADA4 @ =sub_807ADA8
+	ldr r0, _0807ADA4 @ =CB2_ReshowBattleScreenAfterMenu
 	bl SetMainCallback2
 	pop {r0}
 	bx r0
@@ -43,11 +43,11 @@ _0807AD94: .4byte REG_MOSAIC
 _0807AD98: .4byte 0x02000000
 _0807AD9C: .4byte 0x0001ffff
 _0807ADA0: .4byte 0x0001fffe
-_0807ADA4: .4byte sub_807ADA8
-	thumb_func_end sub_807AD58
+_0807ADA4: .4byte CB2_ReshowBattleScreenAfterMenu
+	thumb_func_end ReshowBattleScreenAfterMenu
 
-	thumb_func_start sub_807ADA8
-sub_807ADA8: @ 807ADA8
+	thumb_func_start CB2_ReshowBattleScreenAfterMenu
+CB2_ReshowBattleScreenAfterMenu: @ 807ADA8
 	push {r4-r7,lr}
 	sub sp, 0x8
 	ldr r0, _0807ADC4 @ =0x02000000
@@ -352,7 +352,7 @@ _0807B05C: .4byte gPaletteFade
 _0807B060: .4byte sub_800F808
 _0807B064: .4byte 0x02000000
 _0807B068: .4byte 0x0001ffff
-	thumb_func_end sub_807ADA8
+	thumb_func_end CB2_ReshowBattleScreenAfterMenu
 
 	thumb_func_start sub_807B06C
 sub_807B06C: @ 807B06C
diff --git a/ld_script.txt b/ld_script.txt
index eda6f8061..96f46a141 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -120,7 +120,7 @@ SECTIONS {
         src/battle_anim.o(.text);
         src/rom_8077ABC.o(.text);
         src/task.o(.text);
-        asm/rom5.o(.text);
+        asm/reshow_battle_screen.o(.text);
         asm/battle_anim_807B69C.o(.text);
         src/title_screen.o(.text);
         src/field_screeneffect.o(.text);