Prepare learn_move for merge

This commit is contained in:
Diegoisawesome
2018-08-12 12:54:07 -07:00
parent a000eb4f36
commit 2dd5fc23d4
39 changed files with 875 additions and 1902 deletions

View File

@@ -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