diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-06 16:45:21 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-07 01:46:06 +0800 |
| commit | 050bb937533b98a6828f0b276bbe13608b7e2fb0 (patch) | |
| tree | 8643c5ef255ec82035688cb441e364f239b67e2c /asm/pokedex_screen.s | |
| parent | cc4d2f524cbac1610e6ff517d55d7de48ebcafc7 (diff) | |
finished list_menu
Diffstat (limited to 'asm/pokedex_screen.s')
| -rw-r--r-- | asm/pokedex_screen.s | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/asm/pokedex_screen.s b/asm/pokedex_screen.s index 80cc1ab5d..268b65fd8 100644 --- a/asm/pokedex_screen.s +++ b/asm/pokedex_screen.s @@ -621,7 +621,7 @@ _08102A10: .4byte gUnknown_203ACF0 _08102A14: ldr r0, [r4] ldrb r0, [r0, 0x17] - bl ListMenuHandleInput + bl ListMenu_ProcessInput ldr r1, [r4] str r0, [r1, 0xC] ldrb r0, [r1, 0x17] @@ -754,7 +754,7 @@ _08102B24: adds r1, r2, 0 adds r1, 0x12 adds r2, 0x10 - bl DestroyListMenu + bl DestroyListMenuTask movs r0, 0x20 str r0, [sp] movs r0, 0x14 @@ -804,7 +804,7 @@ _08102B94: adds r1, r2, 0 adds r1, 0x12 adds r2, 0x10 - bl DestroyListMenu + bl DestroyListMenuTask movs r0, 0x1 bl HideBg ldr r0, [r4] @@ -832,7 +832,7 @@ _08102BD8: adds r1, r2, 0 adds r1, 0x12 adds r2, 0x10 - bl DestroyListMenu + bl DestroyListMenuTask movs r0, 0x1 bl HideBg ldr r0, [r4] @@ -1238,7 +1238,7 @@ _08102F60: movs r0, 0x1 movs r1, 0 movs r2, 0x3 - bl sub_8107A9C + bl ListMenuOverrideSetColors b _08102F7A .align 2, 0 _08102F6C: .4byte gUnknown_203ACF0 @@ -1246,7 +1246,7 @@ _08102F70: movs r0, 0xA movs r1, 0 movs r2, 0xB - bl sub_8107A9C + bl ListMenuOverrideSetColors _08102F7A: pop {r0} bx r0 @@ -1379,7 +1379,7 @@ _08103098: ldr r0, [r4] adds r0, 0x41 ldrb r0, [r0] - bl ListMenuHandleInput + bl ListMenu_ProcessInput ldr r1, [r4] str r0, [r1, 0x30] ldrb r0, [r1, 0x17] @@ -1700,7 +1700,7 @@ _08103362: ldr r0, [r4] adds r0, 0x41 ldrb r0, [r0] - bl ListMenuHandleInput + bl ListMenu_ProcessInput ldr r1, [r4] str r0, [r1, 0x30] ldrb r0, [r1, 0x17] @@ -2433,7 +2433,7 @@ _08103964: ldrh r3, [r0, 0x3C] _0810396E: adds r0, r5, 0 - bl Unused_ListMenuInit2 + bl ListMenuInitInRect ldr r1, [r4] adds r1, 0x41 strb r0, [r1] @@ -2467,7 +2467,7 @@ _0810399C: adds r1, r2, 0 adds r1, 0x36 adds r2, 0x34 - bl DestroyListMenu + bl DestroyListMenuTask b _081039E8 .align 2, 0 _081039B4: .4byte gUnknown_203ACF0 @@ -2480,7 +2480,7 @@ _081039B8: adds r1, r2, 0 adds r1, 0x3A adds r2, 0x38 - bl DestroyListMenu + bl DestroyListMenuTask b _081039E8 .align 2, 0 _081039D0: .4byte gUnknown_203ACF0 @@ -2493,7 +2493,7 @@ _081039D4: adds r1, r2, 0 adds r1, 0x3E adds r2, 0x3C - bl DestroyListMenu + bl DestroyListMenuTask _081039E8: pop {r0} bx r0 @@ -2572,7 +2572,7 @@ sub_8103A40: @ 8103A40 movs r1, 0 movs r2, 0x28 adds r3, r6, 0 - bl blit_move_info_icon + bl BlitMoveInfoIcon ldr r0, _08103AC4 @ =gBaseStats lsls r4, r5, 3 subs r4, r5 @@ -2587,7 +2587,7 @@ sub_8103A40: @ 8103A40 lsrs r1, 24 movs r2, 0x78 adds r3, r6, 0 - bl blit_move_info_icon + bl BlitMoveInfoIcon ldrb r1, [r4, 0x7] cmp r5, r1 beq _08103AB6 @@ -2599,7 +2599,7 @@ sub_8103A40: @ 8103A40 lsrs r1, 24 movs r2, 0x98 adds r3, r6, 0 - bl blit_move_info_icon + bl BlitMoveInfoIcon _08103AB6: add sp, 0x4 pop {r4-r7} @@ -7753,7 +7753,7 @@ _08106478: lsrs r1, 24 movs r2, 0 movs r3, 0x1 - bl blit_move_info_icon + bl BlitMoveInfoIcon ldrb r1, [r4, 0x7] cmp r5, r1 beq _08106504 @@ -7765,7 +7765,7 @@ _08106478: lsrs r1, 24 movs r2, 0x20 movs r3, 0x1 - bl blit_move_info_icon + bl BlitMoveInfoIcon _08106504: ldr r7, _081066B8 @ =gUnknown_203ACF0 ldr r0, [r7] |