diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-01-04 16:19:23 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-04 16:19:23 -0800 |
| commit | 07a0c88eb7ca2ea29db1abab8151887f72d45bbd (patch) | |
| tree | 85846be37f4d9b11b62875957b2684a91120d423 | |
| parent | 0698806e00d7da64f5c007e23426ed68d52c69ea (diff) | |
| parent | 028006591481eed1142879887d98b2f90e9d9799 (diff) | |
Merge pull request #241 from hatal175/chuchu
Decompile EU sub_0801F428
| -rw-r--r-- | asm/non_matching/eu/sub_0801F428.inc | 47 | ||||
| -rw-r--r-- | src/enemy/chuchu.c | 13 |
2 files changed, 9 insertions, 51 deletions
diff --git a/asm/non_matching/eu/sub_0801F428.inc b/asm/non_matching/eu/sub_0801F428.inc deleted file mode 100644 index 6c876322..00000000 --- a/asm/non_matching/eu/sub_0801F428.inc +++ /dev/null @@ -1,47 +0,0 @@ -.syntax unified - push {r4, r5, lr} - adds r5, r0, #0 - bl sub_0804A720 - movs r4, #0 - movs r0, #1 - strb r0, [r5, #0xc] - bl Random - strb r0, [r5, #0xe] - adds r0, r5, #0 - adds r0, #0x45 - ldrb r1, [r0] - adds r0, #0x3b - strb r1, [r0] - adds r0, #2 - strb r4, [r0] - ldrb r0, [r5, #0xb] - cmp r0, #0 - beq _0801F484 - movs r0, #3 - strb r0, [r5, #0xc] - movs r0, #0x1e - strb r0, [r5, #0xf] - adds r0, r5, #0 - movs r1, #1 - bl sub_08049F84 - strb r0, [r5, #0x15] - ldrb r0, [r5, #0x10] - movs r1, #0x80 - orrs r0, r1 - strb r0, [r5, #0x10] - adds r2, r5, #0 - adds r2, #0x29 - ldrb r1, [r2] - movs r0, #0x39 - rsbs r0, r0, #0 - ands r0, r1 - movs r1, #0x18 - orrs r0, r1 - strb r0, [r2] - adds r0, r5, #0 - movs r1, #2 - bl InitializeAnimation -_0801F484: - pop {r4, r5, pc} - .align 2, 0 -.syntax divided diff --git a/src/enemy/chuchu.c b/src/enemy/chuchu.c index 9f10023a..308fb47f 100644 --- a/src/enemy/chuchu.c +++ b/src/enemy/chuchu.c @@ -331,9 +331,6 @@ void sub_0801F3AC(Entity* this) { } } -#ifdef EU -ASM_FUNC("asm/non_matching/eu/sub_0801F428.inc", void sub_0801F428(Entity* this)) -#else void sub_0801F428(Entity* this) { sub_0804A720(this); this->action = 1; @@ -345,12 +342,20 @@ void sub_0801F428(Entity* this) { this->action = 3; this->field_0xf = 30; + +#ifdef EU + this->direction = sub_08049F84(this, 1); +#endif + COLLISION_ON(this); this->spritePriority.b1 = 3; + +#ifndef EU this->spriteSettings.draw = 1; +#endif + InitializeAnimation(this, 2); } -#endif void sub_0801F48C(Entity* this) { GetNextFrame(this); |