diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-15 00:04:06 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-15 00:04:06 +0800 |
| commit | 96fa1a23edaf12082034b4ef79244e6ce3dd3128 (patch) | |
| tree | 969c8a73b9f5b3ecdb0f7fc13d551f73d4d70e63 /asm/trade.s | |
| parent | 277726fd5e8c6da021206deeecb163f40073ff3c (diff) | |
| parent | 53b950019aca8896d70c4d5e4f9e2a1d5143e489 (diff) | |
Merge branch 'master' into pokemon
Diffstat (limited to 'asm/trade.s')
| -rw-r--r-- | asm/trade.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/trade.s b/asm/trade.s index 468183b24..61328d618 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -3379,7 +3379,7 @@ _0804E208: movs r1, 0x3 movs r2, 0x10 movs r3, 0x2 - bl sub_810FC80 + bl UnionRoomAndTradeMenuPrintOptions movs r0, 0x10 str r0, [sp] movs r0, 0x2 @@ -3390,7 +3390,7 @@ _0804E208: movs r1, 0x3 movs r2, 0 movs r3, 0 - bl ProgramAndPlaceMenuCursorOnWindow + bl Menu_InitCursor movs r0, 0x1 bl PutWindowTilemap movs r0, 0x1 @@ -3533,7 +3533,7 @@ _0804E384: .4byte 0x06010000 sub_804E388: @ 804E388 push {lr} sub sp, 0x4 - bl ProcessMenuInputNoWrapAround + bl Menu_ProcessInputNoWrapAround lsls r0, 24 asrs r0, 24 movs r1, 0x1 |