Prepare learn_move for merge

2018-08-12 12:54:07 -07:00
parent a000eb4f36
commit 2dd5fc23d4
39 changed files with 875 additions and 1902 deletions
@@ -2920,7 +2920,7 @@ _080170E0:
 	negs r0, r0
 	b _08017110
 _080170F2:
-	bl ProcessMenuInputNoWrap_
+	bl Menu_ProcessInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	movs r2, 0x80
@@ -6278,7 +6278,7 @@ _08018BD6:
 	b _08018C3E
 	.pool
 _08018BE4:
-	bl ProcessMenuInputNoWrap_
+	bl Menu_ProcessInputNoWrap_
 	lsls r0, 24
 	asrs r6, r0, 24
 	movs r1, 0x80
@@ -28890,7 +28890,7 @@ _0802426A:
 	bl sub_8197930
 	b _080242D0
 _08024270:
-	bl ProcessMenuInputNoWrap_
+	bl Menu_ProcessInputNoWrap_
 	lsls r0, 24
 	asrs r4, r0, 24
 	movs r0, 0x2
@@ -47811,7 +47811,7 @@ _0802DA84:
 	thumb_func_start sub_802DA8C
 sub_802DA8C: @ 802DA8C
 	push {lr}
-	bl ProcessMenuInputNoWrap_
+	bl Menu_ProcessInputNoWrap_
 	lsls r0, 24
 	asrs r0, 24
 	pop {r1}