diff options
| author | Evan <eroelke@gmail.com> | 2019-11-21 10:23:49 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-21 10:23:49 -0700 |
| commit | b18ec47b1393d562655e50d30acb3de191423581 (patch) | |
| tree | 7959a1477120baf656599794b423aa8cc11ea0c0 /asm/clear_save_data_screen.s | |
| parent | 359d345913d7f5ed36c34ede5476fff946318ffd (diff) | |
| parent | 2d284654440cb77365639bf107c31b44326362e3 (diff) | |
fix conflicts
Diffstat (limited to 'asm/clear_save_data_screen.s')
| -rw-r--r-- | asm/clear_save_data_screen.s | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/asm/clear_save_data_screen.s b/asm/clear_save_data_screen.s index 5d9d2ac03..367f12814 100644 --- a/asm/clear_save_data_screen.s +++ b/asm/clear_save_data_screen.s @@ -466,9 +466,4 @@ _080F5944: .4byte gUnknown_841EE64 _080F5948: .4byte gUnknown_841EE68 thumb_func_end sub_80F5820 - thumb_func_start nullsub_85 -nullsub_85: @ 80F594C - bx lr - thumb_func_end nullsub_85 - .align 2, 0 @ Don't pad with nop. |