diff options
| -rw-r--r-- | asm/field_effect_helpers.s | 25 | ||||
| -rw-r--r-- | src/field_effect_helpers.c | 12 |
2 files changed, 12 insertions, 25 deletions
diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s index df3610f42..c2582df74 100644 --- a/asm/field_effect_helpers.s +++ b/asm/field_effect_helpers.s @@ -6,31 +6,6 @@ .text - thumb_func_start sub_8128800 -sub_8128800: @ 8128800 - push {lr} - adds r2, r0, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _0812881E - ldrh r1, [r2, 0x2E] - lsls r1, 24 - lsrs r1, 24 - adds r0, r2, 0 - bl FieldEffectStop - b _08128826 -_0812881E: - adds r0, r2, 0 - movs r1, 0 - bl sub_806487C -_08128826: - pop {r0} - bx r0 - thumb_func_end sub_8128800 - thumb_func_start sub_812882C sub_812882C: @ 812882C push {r4-r7,lr} diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 793bef3e2..9914defe4 100644 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -1483,3 +1483,15 @@ void sub_81287C4(struct Sprite *sprite) SetObjectSubpriorityByZCoord(sprite->data0, sprite, 0); } } + +void sub_8128800(struct Sprite *sprite) +{ + if (sprite->animEnded) + { + FieldEffectStop(sprite, sprite->data0); + } + else + { + sub_806487C(sprite, FALSE); + } +} |