diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-16 15:41:54 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-16 15:41:54 -0400 |
| commit | 559833ccf622eef7932369b169f279a0b73c807f (patch) | |
| tree | 4bec10795ab76bc055dfd9c3d73c3e79100ec38d /asm/egg_hatch.s | |
| parent | c7f28f034c4a86b6373b45941f47e5a231392ad0 (diff) | |
| parent | 19d2d73c7064375e6cef64ced734052170d4361b (diff) | |
Merge branch 'master' into field_map_obj
Diffstat (limited to 'asm/egg_hatch.s')
| -rw-r--r-- | asm/egg_hatch.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index 52a659663..d646dbb73 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -218,10 +218,10 @@ sub_80714B8: @ 80714B8 lsrs r4, 16 adds r0, r4, 0 movs r1, 0x2 - bl pokedex_flag_operation + bl GetSetPokedexFlag adds r0, r4, 0 movs r1, 0x3 - bl pokedex_flag_operation + bl GetSetPokedexFlag ldr r1, =gStringVar1 adds r0, r5, 0 bl pokemon_get_nick @@ -399,7 +399,7 @@ _08071688: lsls r0, r4, 3 ldr r1, =gMonFrontPicTable adds r0, r1 - ldr r1, =gUnknown_020244D4 + ldr r1, =gBattleSpritesGfx ldr r2, [r1] mov r6, r8 lsls r1, r6, 1 @@ -937,7 +937,7 @@ _08071BBC: adds r1, r7, 0 movs r2, 0 movs r3, 0x1 - bl sub_806ED40 + bl DoMonFrontSpriteAnimation ldr r1, [r5] b _08071DC8 .pool |