diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-08-16 22:53:01 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-08-16 22:53:01 +0200 |
| commit | 0bfe894566fe3c19c0f12342a273a40c5d6e12da (patch) | |
| tree | 37ef4a4f7be61b3bd70c2118dff9421140c67abe /asm/script_menu.s | |
| parent | ba225f8eaab5e46f7fc825adc6df833f3996b38d (diff) | |
| parent | 2b81db7acecd8baa3e343de66fd229040ec81381 (diff) | |
Merge with master
Diffstat (limited to 'asm/script_menu.s')
| -rw-r--r-- | asm/script_menu.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/script_menu.s b/asm/script_menu.s index 670740a77..b521121bf 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -327,7 +327,7 @@ _080E2090: ldrsh r0, [r5, r1] cmp r0, 0 bne _080E209E - bl ProcessMenuInputNoWrapAround + bl Menu_ProcessInputNoWrapAround b _080E20A2 _080E209E: bl ProcessMenuInput @@ -444,7 +444,7 @@ task_yes_no_maybe: @ 80E215C b _080E21C4 .pool _080E2180: - bl ProcessMenuInputNoWrap_ + bl Menu_ProcessInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 movs r0, 0x1 |