diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-07-08 08:07:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-08 08:07:53 -0400 |
| commit | 39d68ebd445be5657a916dec1b4872717e9c40d3 (patch) | |
| tree | 4394601f49f220e3c32d9879a3c26284c9c92771 /asm/learn_move.s | |
| parent | 7980c4aa071685983f84861cc7dc69d6daf30a90 (diff) | |
| parent | 122f1395823cfa3dfd96842c61411ad29700f8de (diff) | |
Merge pull request #77 from jiangzhengwenjz/misc
corrected sprite.h + finished safari_zone, list_menu, menu_indicators, field_poison, buy_menu_helpers, dynamic_placeholder_text_util
Diffstat (limited to 'asm/learn_move.s')
| -rw-r--r-- | asm/learn_move.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/learn_move.s b/asm/learn_move.s index f00135fda..6684874bb 100644 --- a/asm/learn_move.s +++ b/asm/learn_move.s @@ -1409,7 +1409,7 @@ sub_80E5204: @ 80E5204 ldr r1, _080E525C @ =0x00000263 adds r0, r1 ldrb r0, [r0] - bl ListMenuHandleInput + bl ListMenu_ProcessInput ldr r0, _080E5260 @ =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 @@ -1568,7 +1568,7 @@ sub_80E5340: @ 80E5340 movs r0, 0x2 movs r2, 0x1 movs r3, 0x4 - bl blit_move_info_icon + bl BlitMoveInfoIcon ldrb r0, [r4, 0x1] cmp r0, 0x1 bhi _080E5388 @@ -1680,27 +1680,27 @@ sub_80E5444: @ 80E5444 movs r1, 0x13 movs r2, 0x1 movs r3, 0x4 - bl blit_move_info_icon + bl BlitMoveInfoIcon movs r0, 0x1 movs r1, 0x14 movs r2, 0 movs r3, 0x4 - bl blit_move_info_icon + bl BlitMoveInfoIcon movs r0, 0x1 movs r1, 0x15 movs r2, 0 movs r3, 0x13 - bl blit_move_info_icon + bl BlitMoveInfoIcon movs r0, 0 movs r1, 0x16 movs r2, 0x1 movs r3, 0x13 - bl blit_move_info_icon + bl BlitMoveInfoIcon movs r0, 0 movs r1, 0x17 movs r2, 0x1 movs r3, 0x22 - bl blit_move_info_icon + bl BlitMoveInfoIcon movs r0, 0 bl PutWindowTilemap movs r0, 0x1 |