diff options
| author | Swastik Baranwal <swstkbaranwal@gmail.com> | 2019-06-23 18:47:35 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-23 18:47:35 +0530 |
| commit | 99703c6ab831d34e6859d8a8f53ba8e73dc4d3d9 (patch) | |
| tree | 3a712d3039d152616af58a45a13d82c40a87e58f /asm/clear_save_data_screen.s | |
| parent | 6d190f861e3559eec922cd760778c0cba6e08397 (diff) | |
| parent | 9ee0c34758a63f8c00724b6fc984b4e96be2f7af (diff) | |
Merge pull request #5 from pret/master
Take files
Diffstat (limited to 'asm/clear_save_data_screen.s')
| -rw-r--r-- | asm/clear_save_data_screen.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/clear_save_data_screen.s b/asm/clear_save_data_screen.s index 84dd082f6..ccae18c34 100644 --- a/asm/clear_save_data_screen.s +++ b/asm/clear_save_data_screen.s @@ -109,11 +109,11 @@ _080F564A: movs r0, 0 movs r1, 0x1 movs r2, 0xF0 - bl sub_814FF2C + bl TextWindow_SetStdFrame0_WithPal movs r0, 0x1 movs r1, 0x1 movs r2, 0xF0 - bl sub_814FF2C + bl TextWindow_SetStdFrame0_WithPal b _080F56E2 _080F5660: movs r0, 0x1 @@ -134,7 +134,7 @@ _080F5660: movs r1, 0x2 movs r2, 0 movs r3, 0x3 - bl AddTextPrinterParametrized2 + bl AddTextPrinterParameterized4 movs r0, 0x1 movs r1, 0x2 bl CopyWindowToVram @@ -152,7 +152,7 @@ _080F569C: movs r1, 0x2 movs r2, 0 movs r3, 0x2 - bl sub_810FF60 + bl CreateYesNoMenu movs r0, 0 bl CopyBgTilemapBufferToVram b _080F56E2 @@ -204,7 +204,7 @@ sub_80F5708: @ 80F5708 ldrb r0, [r0] cmp r0, 0 bne _080F578C - bl ProcessMenuInputNoWrap_ + bl Menu_ProcessInputNoWrapClearOnChoose lsls r0, 24 asrs r4, r0, 24 movs r0, 0x1 @@ -241,7 +241,7 @@ _080F5744: movs r1, 0x2 movs r2, 0 movs r3, 0x3 - bl AddTextPrinterParametrized2 + bl AddTextPrinterParameterized4 movs r0, 0x1 movs r1, 0x3 bl CopyWindowToVram |