diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-06 13:34:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-06 13:34:09 -0500 |
| commit | ab4fa0e76e4478804266cddf6604308a77cdcb3b (patch) | |
| tree | 038ca78f1ebf0a1f9f10a6f15f850ecb7d3376c7 /asm/field_effect_helpers.s | |
| parent | 4d7a5b165f96dd1788364523eb160041157d3004 (diff) | |
| parent | 5c9114a245a3e29cb43323a33b27e1f2943107db (diff) | |
Merge pull request #203 from mrgriffin/field-tasks
Decompile field_tasks
Diffstat (limited to 'asm/field_effect_helpers.s')
| -rw-r--r-- | asm/field_effect_helpers.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s index 3f2cf04d1..2797accf4 100644 --- a/asm/field_effect_helpers.s +++ b/asm/field_effect_helpers.s @@ -2691,8 +2691,8 @@ _080DC234: .4byte gFieldEffectObjectTemplatePointers _080DC238: .4byte gSprites thumb_func_end FldEff_Unknown22 - thumb_func_start ash -ash: @ 80DC23C + thumb_func_start StartAshFieldEffect +StartAshFieldEffect: @ 80DC23C push {r4,lr} lsls r2, 16 lsrs r2, 16 @@ -2718,7 +2718,7 @@ ash: @ 80DC23C bx r0 .align 2, 0 _080DC26C: .4byte gFieldEffectArguments - thumb_func_end ash + thumb_func_end StartAshFieldEffect thumb_func_start oei_ash oei_ash: @ 80DC270 |