diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-10 09:14:02 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-10 09:14:02 -0400 |
| commit | 1a53367ffbbb40b0f88e7bbca1444e3df6840aba (patch) | |
| tree | ce43c1a6305ef2ff2b3ab31c2543562f3c451cf1 | |
| parent | 490c4cd644463ce650df8333c1b1e5aeb3821dd0 (diff) | |
ash. just ash.
| -rw-r--r-- | asm/field_effect_helpers.s | 29 | ||||
| -rw-r--r-- | include/field_effect_helpers.h | 2 | ||||
| -rw-r--r-- | src/field_effect_helpers.c | 11 |
3 files changed, 12 insertions, 30 deletions
diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s index 9c26a1b33..611faa925 100644 --- a/asm/field_effect_helpers.s +++ b/asm/field_effect_helpers.s @@ -6,35 +6,6 @@ .text - thumb_func_start ash -ash: @ 8127CC4 - push {r4,lr} - lsls r2, 16 - lsrs r2, 16 - ldr r4, _08127CF4 @ =gFieldEffectSpawnParams - lsls r0, 16 - asrs r0, 16 - str r0, [r4] - lsls r1, 16 - asrs r1, 16 - str r1, [r4, 0x4] - movs r0, 0x52 - str r0, [r4, 0x8] - movs r0, 0x1 - str r0, [r4, 0xC] - str r2, [r4, 0x10] - lsls r3, 16 - asrs r3, 16 - str r3, [r4, 0x14] - movs r0, 0x7 - bl FieldEffectStart - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08127CF4: .4byte gFieldEffectSpawnParams - thumb_func_end ash - thumb_func_start FldEff_Ash FldEff_Ash: @ 8127CF8 push {r4,r5,lr} diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index 482f7e87e..7bba24fa6 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -28,7 +28,7 @@ void sub_8126BC4(u8 unk_1B, u8 r6, s16 x, s16 y); void sub_8127ED0(u8, u8); void sub_8127F28(u8, u8, s16); u8 sub_8128124(u8 id); -void ash(s16, s16, u16, u8); +void ash(s16, s16, u16, s16); void SetUpReflection(struct MapObject *mapObj, struct Sprite *sprite, u8 a); u32 oe_exec_and_other_stuff(u8 fieldEffectId, struct MapObject *mapObject); u8 sub_8126FF0(u8, u8, u8, s16, s16); diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 510ca556f..493189f83 100644 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -891,3 +891,14 @@ u8 FldEff_Unknown22(void) } return 0; } + +void ash(s16 x, s16 y, u16 c, s16 d) +{ + gFieldEffectSpawnParams[0] = x; + gFieldEffectSpawnParams[1] = y; + gFieldEffectSpawnParams[2] = 0x52; + gFieldEffectSpawnParams[3] = 1; + gFieldEffectSpawnParams[4] = c; + gFieldEffectSpawnParams[5] = d; + FieldEffectStart(FLDEFF_ASH); +} |