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/berry_pouch.s | |
parent | e0a5896de36da0bb83c3983df8b2f47d019a8896 (diff) | |
parent | 756f2c3a71c8f7e832a9e70a542210f549f4c61b (diff) |
Merge pull request #74 from jiangzhengwenjz/misc
menu_helpers
Diffstat (limited to 'asm/berry_pouch.s')
-rw-r--r-- | asm/berry_pouch.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/berry_pouch.s b/asm/berry_pouch.s index ab157ab99..67d189a12 100644 --- a/asm/berry_pouch.s +++ b/asm/berry_pouch.s @@ -183,7 +183,7 @@ _0813CE84: .4byte _0813CFB0 .4byte _0813CFBE _0813CED0: - bl VblankHblankHandlerSetZero + bl SetVBlankHBlankCallbacksToNull bl clear_scheduled_bg_copies_to_vram b _0813CFD2 _0813CEDA: @@ -386,7 +386,7 @@ _0813D078: .4byte gUnknown_203F370 thumb_func_start sub_813D07C sub_813D07C: @ 813D07C push {r4,lr} - bl InitBgReg + bl ResetAllBgsCoordinatesAndBgCntRegs ldr r4, _0813D0DC @ =gUnknown_203F36C ldr r0, [r4] adds r0, 0xC @@ -2338,7 +2338,7 @@ sub_813E010: @ 813E010 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 @@ -3091,7 +3091,7 @@ sub_813E690: @ 813E690 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 |