diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-06-19 15:29:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-19 15:29:24 +0200 |
| commit | 11ad653b57d811dbe8df831d4987128da39bdcb5 (patch) | |
| tree | 9e9a793c7dc9a4af7992e6b65c0418d16b25a400 /asm/menu_helpers.s | |
| parent | 48a15638c63f2b3d4b2d12d346e466ddca006570 (diff) | |
| parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) | |
Merge pull request #1 from pret/master
be up to date with the master
Diffstat (limited to 'asm/menu_helpers.s')
| -rw-r--r-- | asm/menu_helpers.s | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/asm/menu_helpers.s b/asm/menu_helpers.s index f10070110..0f5caf3da 100644 --- a/asm/menu_helpers.s +++ b/asm/menu_helpers.s @@ -161,8 +161,8 @@ _080F9140: _080F9148: .4byte gUnknown_020388C4 thumb_func_end Task_CallYesOrNoCallback - thumb_func_start sub_80F914C -sub_80F914C: @ 80F914C + thumb_func_start DoYesNoFuncWithChoice +DoYesNoFuncWithChoice: @ 80F914C lsls r0, 24 lsrs r0, 24 ldr r3, _080F916C @ =gUnknown_020388C4 @@ -182,7 +182,7 @@ sub_80F914C: @ 80F914C _080F916C: .4byte gUnknown_020388C4 _080F9170: .4byte gTasks _080F9174: .4byte Task_CallYesOrNoCallback - thumb_func_end sub_80F914C + thumb_func_end DoYesNoFuncWithChoice thumb_func_start brm_trade_1 brm_trade_1: @ 80F9178 @@ -1207,8 +1207,8 @@ _080F98D4: .4byte gSprites _080F98D8: .4byte SpriteCallbackDummy thumb_func_end sub_80F98A4 - thumb_func_start sub_80F98DC -sub_80F98DC: @ 80F98DC + thumb_func_start StartVerticalScrollIndicators +StartVerticalScrollIndicators: @ 80F98DC push {lr} lsls r0, 24 lsrs r1, r0, 24 @@ -1235,7 +1235,7 @@ _080F9902: _080F9908: .4byte gUnknown_020388C0 _080F990C: .4byte gSprites _080F9910: .4byte sub_80F9834 - thumb_func_end sub_80F98DC + thumb_func_end StartVerticalScrollIndicators thumb_func_start sub_80F9914 sub_80F9914: @ 80F9914 @@ -1284,8 +1284,8 @@ _080F9964: .4byte gUnknown_020388C0 _080F9968: .4byte gSprites thumb_func_end sub_80F9914 - thumb_func_start sub_80F996C -sub_80F996C: @ 80F996C + thumb_func_start PauseVerticalScrollIndicator +PauseVerticalScrollIndicator: @ 80F996C push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -1297,7 +1297,7 @@ sub_80F996C: @ 80F996C pop {r4} pop {r0} bx r0 - thumb_func_end sub_80F996C + thumb_func_end PauseVerticalScrollIndicator thumb_func_start sub_80F9988 sub_80F9988: @ 80F9988 |