diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-10 09:37:17 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-10 09:37:17 -0400 |
| commit | f93301e62ba6e2a83258eeabbf354e666d613f02 (patch) | |
| tree | b2976426130ec160c1e8eefb8e259ababad94ee9 | |
| parent | ab786df511b47bbe4101b3de3fdb3254da249228 (diff) | |
sub_8127F28
| -rw-r--r-- | asm/field_effect_helpers.s | 29 | ||||
| -rw-r--r-- | src/field_effect_helpers.c | 8 |
2 files changed, 7 insertions, 30 deletions
diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s index 3a26f5928..bb3f94f22 100644 --- a/asm/field_effect_helpers.s +++ b/asm/field_effect_helpers.s @@ -6,35 +6,6 @@ .text - thumb_func_start sub_8127F28 -sub_8127F28: @ 8127F28 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - ldr r4, _08127F54 @ =gSprites - lsls r3, r0, 4 - adds r3, r0 - lsls r3, 2 - adds r3, r4 - ldrh r0, [r3, 0x2E] - ldr r4, _08127F58 @ =0xfffff0ff - ands r4, r0 - movs r0, 0xF0 - lsls r0, 20 - ands r0, r1 - lsrs r0, 16 - orrs r4, r0 - strh r4, [r3, 0x2E] - strh r2, [r3, 0x30] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08127F54: .4byte gSprites -_08127F58: .4byte 0xfffff0ff - thumb_func_end sub_8127F28 - thumb_func_start sub_8127F5C sub_8127F5C: @ 8127F5C ldrh r1, [r0, 0x2E] diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 47676b0aa..9cd46745b 100644 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -984,10 +984,16 @@ u8 FldEff_SurfBlob(void) void sub_8127ED0(u8 spriteId, u8 value) { - gSprites[spriteId].data0 = (gSprites[spriteId].data0 & ~0x0F) | (value & 0x0F); + gSprites[spriteId].data0 = (gSprites[spriteId].data0 & ~0xF) | (value & 0xF); } void sub_8127EFC(u8 spriteId, u8 value) { gSprites[spriteId].data0 = (gSprites[spriteId].data0 & ~0xF0) | ((value & 0xF) << 4); } + +void sub_8127F28(u8 spriteId, u8 value, s16 data1) +{ + gSprites[spriteId].data0 = (gSprites[spriteId].data0 & ~0xF00) | ((value & 0xF) << 8); + gSprites[spriteId].data1 = data1; +} |