diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-07-01 21:45:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-01 21:45:36 -0400 |
| commit | 74d771ef90a3189bd2da1b35f6b42a1fa8f51e67 (patch) | |
| tree | 96c754aee40f16956fb0958ecb31bd806bd99642 /asm/battle_anim_status_effects.s | |
| parent | 7f06718571de81609208a5fa402a93da63cfa8bf (diff) | |
| parent | 062238aa12cb4f54f70b73459ff5b5d775f69a54 (diff) | |
Merge pull request #76 from jiangzhengwenjz/misc
new_menu_helpers, multiboot, hof_pc, play_time, decompress, reset_save_heap, save_location, mail_data, fldeff_*
Diffstat (limited to 'asm/battle_anim_status_effects.s')
| -rw-r--r-- | asm/battle_anim_status_effects.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_anim_status_effects.s b/asm/battle_anim_status_effects.s index 5530fd869..b1da74298 100644 --- a/asm/battle_anim_status_effects.s +++ b/asm/battle_anim_status_effects.s @@ -26,9 +26,9 @@ sub_8078178: @ 8078178 lsrs r0, 24 mov r8, r0 ldr r0, _08078224 @ =gUnknown_83AD048 - bl sub_800F034 + bl LoadCompressedSpriteSheetUsingHeap ldr r0, _08078228 @ =gUnknown_83AD950 - bl sub_800F078 + bl LoadCompressedSpritePaletteUsingHeap ldr r1, _0807822C @ =gTasks mov r2, r8 lsls r0, r2, 2 |