diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-10 09:39:15 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-10 09:39:15 -0400 |
| commit | 0c5bf5559328562f42e85cad9621a55923b7b50b (patch) | |
| tree | f6f2503c132974571653971ac36affc40d2516f0 | |
| parent | f93301e62ba6e2a83258eeabbf354e666d613f02 (diff) | |
sub_8127F5C, sub_8127F64, sub_8127F70
| -rw-r--r-- | asm/field_effect_helpers.s | 27 | ||||
| -rw-r--r-- | src/field_effect_helpers.c | 15 |
2 files changed, 15 insertions, 27 deletions
diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s index bb3f94f22..709c4b4fc 100644 --- a/asm/field_effect_helpers.s +++ b/asm/field_effect_helpers.s @@ -6,33 +6,6 @@ .text - thumb_func_start sub_8127F5C -sub_8127F5C: @ 8127F5C - ldrh r1, [r0, 0x2E] - movs r0, 0xF - ands r0, r1 - bx lr - thumb_func_end sub_8127F5C - - thumb_func_start sub_8127F64 -sub_8127F64: @ 8127F64 - ldrh r1, [r0, 0x2E] - movs r0, 0xF0 - ands r0, r1 - lsrs r0, 4 - bx lr - thumb_func_end sub_8127F64 - - thumb_func_start sub_8127F70 -sub_8127F70: @ 8127F70 - ldrh r1, [r0, 0x2E] - movs r0, 0xF0 - lsls r0, 4 - ands r0, r1 - lsrs r0, 8 - bx lr - thumb_func_end sub_8127F70 - thumb_func_start sub_8127F7C sub_8127F7C: @ 8127F7C push {r4-r6,lr} diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 9cd46745b..4a511fad1 100644 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -997,3 +997,18 @@ void sub_8127F28(u8 spriteId, u8 value, s16 data1) gSprites[spriteId].data0 = (gSprites[spriteId].data0 & ~0xF00) | ((value & 0xF) << 8); gSprites[spriteId].data1 = data1; } + +u8 sub_8127F5C(struct Sprite *sprite) +{ + return sprite->data0 & 0xF; +} + +u8 sub_8127F64(struct Sprite *sprite) +{ + return (sprite->data0 & 0xF0) >> 4; +} + +u8 sub_8127F70(struct Sprite *sprite) +{ + return (sprite->data0 & 0xF00) >> 8; +} |