diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-14 10:41:27 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-14 10:46:04 -0400 |
| commit | b8fec3d9f617ec9a764bb56804c526ff7449631f (patch) | |
| tree | 2e84d0bf6107a15ebcb94a23c3158e2bc6382f6f /asm/save_menu_util.s | |
| parent | 9fe74ac590f75a0571de8ebcd499fdf892419328 (diff) | |
| parent | 8efae5c807bf6b27f5c90bfb0c5887dbde24f10d (diff) | |
Merge branch 'master' into trade
Diffstat (limited to 'asm/save_menu_util.s')
| -rw-r--r-- | asm/save_menu_util.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/save_menu_util.s b/asm/save_menu_util.s index 1cb9d85a3..8ebfc3731 100644 --- a/asm/save_menu_util.s +++ b/asm/save_menu_util.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_80F7FCC -sub_80F7FCC: @ 80F7FCC + thumb_func_start SaveStatToString +SaveStatToString: @ 80F7FCC push {r4-r7,lr} lsls r0, 24 lsrs r3, r0, 24 @@ -144,6 +144,6 @@ _080F80D8: bx r0 .align 2, 0 _080F80E0: .4byte 0x00000827 - thumb_func_end sub_80F7FCC + thumb_func_end SaveStatToString .align 2, 0 @ Don't pad with nop. |