diff options
| author | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
| commit | c6ff1a6ce39cb67c6de21f2e4938ea62c97ee7e5 (patch) | |
| tree | 47e2f5eaa84c3cc97b96bdf06170136abe446d81 /asm/battle_anim_sound_tasks.s | |
| parent | 3c2b1731eeb7037a1b681444b1c126fc239a904e (diff) | |
| parent | 24e0edee9f428a68715c47051ebba3cda5a3e5a7 (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'asm/battle_anim_sound_tasks.s')
| -rw-r--r-- | asm/battle_anim_sound_tasks.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/battle_anim_sound_tasks.s b/asm/battle_anim_sound_tasks.s index 4bfd7ae68..949934e1d 100644 --- a/asm/battle_anim_sound_tasks.s +++ b/asm/battle_anim_sound_tasks.s @@ -150,8 +150,8 @@ _08158C4C: .pool thumb_func_end sub_8158C04 - thumb_func_start mas_80DCF38 -mas_80DCF38: @ 8158C58 + thumb_func_start sub_8158C58 +sub_8158C58: @ 8158C58 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -230,7 +230,7 @@ mas_80DCF38: @ 8158C58 pop {r0} bx r0 .pool - thumb_func_end mas_80DCF38 + thumb_func_end sub_8158C58 thumb_func_start sub_8158D08 sub_8158D08: @ 8158D08 |