diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-06-23 22:00:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-23 22:00:47 -0400 |
| commit | 5b7c34096cff301c4d74bb2e67a7164b66bcc5dd (patch) | |
| tree | 6124fc5f2881ec5d698509101b407a36fdb934cd /asm/item_menu.s | |
| parent | e0a5896de36da0bb83c3983df8b2f47d019a8896 (diff) | |
| parent | 756f2c3a71c8f7e832a9e70a542210f549f4c61b (diff) | |
Merge pull request #74 from jiangzhengwenjz/misc
menu_helpers
Diffstat (limited to 'asm/item_menu.s')
| -rw-r--r-- | asm/item_menu.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/item_menu.s b/asm/item_menu.s index bdefc393f..4e4c2ebfd 100644 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -253,7 +253,7 @@ _08107F60: .4byte _081080D8 .4byte _081080DE _08107FB0: - bl VblankHblankHandlerSetZero + bl SetVBlankHBlankCallbacksToNull bl clear_scheduled_bg_copies_to_vram b _08108104 _08107FBA: @@ -520,7 +520,7 @@ _081081CC: .4byte gUnknown_203AD1C thumb_func_start sub_81081D0 sub_81081D0: @ 81081D0 push {r4,r5,lr} - bl InitBgReg + bl ResetAllBgsCoordinatesAndBgCntRegs ldr r5, _08108230 @ =gUnknown_203AD14 movs r4, 0x80 lsls r4, 4 @@ -3551,7 +3551,7 @@ _081099EC: strb r0, [r4] ldr r0, _08109A10 @ =gSpecialVar_ItemId ldrh r0, [r0] - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -4035,7 +4035,7 @@ sub_8109DEC: @ 8109DEC adds r0, r4, 0 adds r0, 0x10 ldrh r1, [r4, 0x4] - bl sub_80BF848 + bl AdjustQuantityAccordingToDPadInput lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -4817,7 +4817,7 @@ sub_810A468: @ 810A468 lsrs r4, r0, 16 adds r6, r4, 0 adds r0, r4, 0 - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -5296,7 +5296,7 @@ sub_810A85C: @ 810A85C adds r0, r5, 0 adds r0, 0x10 ldrh r1, [r5, 0x4] - bl sub_80BF848 + bl AdjustQuantityAccordingToDPadInput lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -5659,7 +5659,7 @@ sub_810AB88: @ 810AB88 adds r0, r4, 0 adds r0, 0x10 ldrh r1, [r4, 0x4] - bl sub_80BF848 + bl AdjustQuantityAccordingToDPadInput lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 |