summaryrefslogtreecommitdiff
path: root/asm/clear_save_data_screen.s
diff options
context:
space:
mode:
authorjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-08-03 06:59:28 +0800
committerjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-08-03 06:59:28 +0800
commit26a71921863214c4eb0af3f8320c321b51d0102e (patch)
treec39d533ff9ac7af61b69507577493316f3ffc4ea /asm/clear_save_data_screen.s
parent6a063cf74ad8168e9080c1f3be20e5dfe3c3187c (diff)
parentd58bf398b2b83a326d23d14d531de7f45a1058bb (diff)
Merge branch 'master' into battle
Diffstat (limited to 'asm/clear_save_data_screen.s')
-rw-r--r--asm/clear_save_data_screen.s6
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/clear_save_data_screen.s b/asm/clear_save_data_screen.s
index f6cd11410..5d9d2ac03 100644
--- a/asm/clear_save_data_screen.s
+++ b/asm/clear_save_data_screen.s
@@ -26,8 +26,8 @@ sub_80F558C: @ 80F558C
bx r0
thumb_func_end sub_80F558C
- thumb_func_start sub_80F55A0
-sub_80F55A0: @ 80F55A0
+ thumb_func_start CB2_SaveClearScreen_Init
+CB2_SaveClearScreen_Init: @ 80F55A0
push {r4,lr}
ldr r4, _080F55D0 @ =gUnknown_203AB54
movs r0, 0x4
@@ -52,7 +52,7 @@ sub_80F55A0: @ 80F55A0
_080F55D0: .4byte gUnknown_203AB54
_080F55D4: .4byte sub_80F55DC
_080F55D8: .4byte sub_80F5574
- thumb_func_end sub_80F55A0
+ thumb_func_end CB2_SaveClearScreen_Init
thumb_func_start sub_80F55DC
sub_80F55DC: @ 80F55DC