diff --git a/asm/enemy/stalfos.s b/asm/enemy/stalfos.s deleted file mode 100644 index 69d6ee51..00000000 --- a/asm/enemy/stalfos.s +++ /dev/null @@ -1,1199 +0,0 @@ - .include "asm/macros.inc" - - .include "constants/constants.inc" - - .syntax unified - - .text - - - thumb_func_start Stalfos -Stalfos: @ 0x080392AC - push {r4, lr} - adds r4, r0, #0 - ldr r1, _080392C8 @ =gUnk_080CF8A4 - bl EnemyFunctionHandler - movs r3, #0x12 - rsbs r3, r3, #0 - adds r0, r4, #0 - movs r1, #0 - movs r2, #1 - bl SetChildOffset - pop {r4, pc} - .align 2, 0 -_080392C8: .4byte gUnk_080CF8A4 - - thumb_func_start sub_080392CC -sub_080392CC: @ 0x080392CC - push {r4, lr} - adds r4, r0, #0 - ldr r0, _080392FC @ =gUnk_080CF8BC - ldrb r1, [r4, #0xc] - lsls r1, r1, #2 - adds r1, r1, r0 - ldr r1, [r1] - adds r0, r4, #0 - bl _call_via_r1 - adds r1, r4, #0 - adds r1, #0x7c - ldrb r0, [r1] - cmp r0, #0 - beq _0803930C - subs r0, #1 - strb r0, [r1] - lsls r0, r0, #0x18 - cmp r0, #0 - beq _08039300 - subs r1, #0x3d - movs r0, #0x45 - b _0803930A - .align 2, 0 -_080392FC: .4byte gUnk_080CF8BC -_08039300: - adds r0, r4, #0 - adds r0, #0x7d - ldrb r0, [r0] - adds r1, r4, #0 - adds r1, #0x3f -_0803930A: - strb r0, [r1] -_0803930C: - movs r0, #0x36 - ldrsh r1, [r4, r0] - cmp r1, #0 - beq _0803933A - movs r0, #8 - rsbs r0, r0, #0 - cmp r1, r0 - bge _08039334 - ldrb r2, [r4, #0x1b] - movs r1, #0x3f - adds r0, r1, #0 - ands r0, r2 - movs r2, #0x40 - orrs r0, r2 - strb r0, [r4, #0x1b] - ldrb r0, [r4, #0x19] - ands r1, r0 - orrs r1, r2 - strb r1, [r4, #0x19] - b _0803933A -_08039334: - adds r0, r4, #0 - bl UpdateSpriteForCollisionLayer -_0803933A: - pop {r4, pc} - - thumb_func_start sub_0803933C -sub_0803933C: @ 0x0803933C - push {r4, r5, lr} - adds r5, r0, #0 - adds r0, #0x3f - ldrb r0, [r0] - cmp r0, #0x44 - bne _08039390 - adds r0, r5, #0 - adds r0, #0x41 - ldrb r0, [r0] - movs r1, #0x7f - ands r1, r0 - cmp r1, #6 - bgt _08039390 - cmp r1, #4 - blt _08039390 - adds r0, r5, #0 - adds r0, #0x3d - ldrb r0, [r0] - lsls r0, r0, #0x18 - asrs r0, r0, #0x18 - cmp r0, #0 - bgt _08039390 - movs r0, #4 - strb r0, [r5, #0xc] - adds r0, r5, #0 - adds r0, #0x3e - ldrb r0, [r0] - strb r0, [r5, #0x15] - ldrb r0, [r5, #0x15] - adds r0, #4 - movs r1, #0x18 - ands r0, r1 - movs r1, #0x10 - eors r0, r1 - asrs r0, r0, #3 - strb r0, [r5, #0x14] - movs r0, #0x90 - lsls r0, r0, #1 - strh r0, [r5, #0x24] - adds r0, r5, #0 - bl sub_0803981C -_08039390: - adds r0, r5, #0 - adds r0, #0x41 - ldrb r2, [r0] - cmp r2, #0x9d - bne _080393F8 - ldr r1, [r5, #0x54] - cmp r1, #0 - bne _080393CA - ldrb r0, [r5, #0xc] - cmp r0, #8 - bhi _080393EC - adds r0, r5, #0 - movs r1, #0x10 - movs r2, #1 - bl CreateProjectileWithParent - adds r1, r0, #0 - cmp r1, #0 - beq _080393DC - ldrb r0, [r5, #0x14] - lsls r0, r0, #1 - strb r0, [r1, #0x1e] - movs r0, #2 - strb r0, [r1, #0xb] - movs r0, #0xc3 - lsls r0, r0, #1 - bl EnqueueSFX - b _080393DC -_080393CA: - adds r0, r1, #0 - adds r0, #0x41 - movs r4, #0 - strb r2, [r0] - movs r0, #0xc3 - lsls r0, r0, #1 - bl EnqueueSFX - str r4, [r5, #0x54] -_080393DC: - adds r0, r5, #0 - bl sub_08039A48 - adds r1, r5, #0 - adds r1, #0x78 - ldrh r0, [r1] - adds r0, #0x5a - strh r0, [r1] -_080393EC: - adds r2, r5, #0 - adds r2, #0x3b - ldrb r1, [r2] - movs r0, #0xfb - ands r0, r1 - strb r0, [r2] -_080393F8: - adds r0, r5, #0 - adds r0, #0x43 - ldrb r0, [r0] - cmp r0, #0 - beq _0803940A - adds r0, r5, #0 - movs r1, #0x1c - bl sub_0804A9FC -_0803940A: - ldr r1, _08039414 @ =gUnk_080CF8A4 - adds r0, r5, #0 - bl sub_0804AA30 - pop {r4, r5, pc} - .align 2, 0 -_08039414: .4byte gUnk_080CF8A4 - - thumb_func_start sub_08039418 -sub_08039418: @ 0x08039418 - push {lr} - adds r1, r0, #0 - ldrb r0, [r1, #0xa] - cmp r0, #0 - bne _0803942E - adds r0, r1, #0 - movs r1, #0xf3 - movs r2, #0 - bl CreateDeathFx - b _08039434 -_0803942E: - adds r0, r1, #0 - bl sub_0804A7D4 -_08039434: - pop {pc} - .align 2, 0 - - thumb_func_start sub_08039438 -sub_08039438: @ 0x08039438 - push {r4, lr} - adds r4, r0, #0 - bl sub_0806F520 - cmp r0, #0 - beq _08039454 - ldr r0, _08039458 @ =gUnk_080CF8EC - ldrb r1, [r4, #0xd] - lsls r1, r1, #2 - adds r1, r1, r0 - ldr r1, [r1] - adds r0, r4, #0 - bl _call_via_r1 -_08039454: - pop {r4, pc} - .align 2, 0 -_08039458: .4byte gUnk_080CF8EC - - thumb_func_start sub_0803945C -sub_0803945C: @ 0x0803945C - movs r1, #1 - strb r1, [r0, #0xd] - movs r1, #0x5a - strb r1, [r0, #0x1d] - bx lr - .align 2, 0 - - thumb_func_start sub_08039468 -sub_08039468: @ 0x08039468 - push {lr} - bl sub_0806F4E8 - pop {pc} - - thumb_func_start sub_08039470 -sub_08039470: @ 0x08039470 - push {r4, lr} - adds r4, r0, #0 - ldr r2, [r4, #0x54] - cmp r2, #0 - bne _08039494 - movs r1, #0x10 - movs r2, #1 - bl CreateProjectileWithParent - adds r2, r0, #0 - cmp r2, #0 - beq _0803949C - ldrb r0, [r4, #0x14] - lsls r0, r0, #1 - strb r0, [r2, #0x1e] - movs r0, #1 - strb r0, [r2, #0xb] - b _0803949C -_08039494: - ldrb r1, [r2, #0x10] - movs r0, #0x80 - orrs r0, r1 - strb r0, [r2, #0x10] -_0803949C: - movs r0, #0 - str r0, [r4, #0x54] - adds r3, r4, #0 - adds r3, #0x3a - ldrb r2, [r3] - movs r1, #0xfb - adds r0, r1, #0 - ands r0, r2 - strb r0, [r3] - adds r2, r4, #0 - adds r2, #0x3b - ldrb r0, [r2] - ands r1, r0 - strb r1, [r2] - adds r0, r4, #0 - bl sub_08039A48 - adds r1, r4, #0 - adds r1, #0x78 - ldrh r0, [r1] - adds r0, #0x5a - strh r0, [r1] - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_080394CC -sub_080394CC: @ 0x080394CC - push {r4, lr} - adds r4, r0, #0 - bl sub_0804A720 - bl Random - movs r1, #3 - ands r0, r1 - movs r1, #0 - strb r0, [r4, #0x14] - adds r0, r4, #0 - adds r0, #0x7b - strb r1, [r0] - adds r0, #1 - strb r1, [r0] - subs r0, #0x3d - ldrb r0, [r0] - adds r1, r4, #0 - adds r1, #0x7d - strb r0, [r1] - adds r0, r4, #0 - movs r1, #0 - bl sub_08039A00 - ldrb r0, [r4, #0xb] - cmp r0, #0 - bne _0803950A - adds r0, r4, #0 - bl sub_0803998C - b _0803952A -_0803950A: - movs r0, #4 - strb r0, [r4, #0xc] - movs r0, #0xff - strb r0, [r4, #0x15] - ldr r1, _0803952C @ =gPlayerEntity - adds r0, r4, #0 - bl GetFacingDirection - adds r0, #4 - movs r1, #0x18 - ands r0, r1 - lsrs r0, r0, #3 - strb r0, [r4, #0x14] - adds r0, r4, #0 - bl sub_0803981C -_0803952A: - pop {r4, pc} - .align 2, 0 -_0803952C: .4byte gPlayerEntity - - thumb_func_start sub_08039530 -sub_08039530: @ 0x08039530 - push {r4, lr} - adds r4, r0, #0 - movs r1, #0xc0 - lsls r1, r1, #5 - bl GravityUpdate - cmp r0, #0 - bne _08039568 - adds r0, r4, #0 - bl sub_08039758 - cmp r0, #0 - bne _08039568 - adds r1, r4, #0 - adds r1, #0x78 - ldrh r0, [r1] - subs r0, #1 - strh r0, [r1] - lsls r0, r0, #0x10 - cmp r0, #0 - bne _08039568 - movs r0, #2 - strb r0, [r4, #0xc] - movs r0, #0xa - strb r0, [r4, #0xe] - adds r0, r4, #0 - bl sub_08039858 -_08039568: - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_0803956C -sub_0803956C: @ 0x0803956C - push {r4, lr} - adds r4, r0, #0 - bl sub_08039758 - cmp r0, #0 - bne _0803958A - ldrb r0, [r4, #0xe] - subs r0, #1 - strb r0, [r4, #0xe] - lsls r0, r0, #0x18 - cmp r0, #0 - bne _0803958A - adds r0, r4, #0 - bl sub_0803992C -_0803958A: - pop {r4, pc} - - thumb_func_start sub_0803958C -sub_0803958C: @ 0x0803958C - push {r4, lr} - adds r4, r0, #0 - bl sub_08039758 - cmp r0, #0 - bne _080395D4 - adds r0, r4, #0 - bl ProcessMovement - cmp r0, #0 - beq _080395C0 - adds r0, r4, #0 - bl UpdateAnimationSingleFrame - adds r1, r4, #0 - adds r1, #0x78 - ldrh r0, [r1] - subs r0, #1 - strh r0, [r1] - lsls r0, r0, #0x10 - cmp r0, #0 - bne _080395D4 - adds r0, r4, #0 - bl sub_0803998C - b _080395D4 -_080395C0: - adds r2, r4, #0 - adds r2, #0x7b - ldrb r0, [r2] - lsls r0, r0, #1 - movs r1, #1 - orrs r0, r1 - strb r0, [r2] - adds r0, r4, #0 - bl sub_0803998C -_080395D4: - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_080395D8 -sub_080395D8: @ 0x080395D8 - push {r4, lr} - adds r4, r0, #0 - bl sub_080AEFE0 - movs r1, #0xc0 - lsls r1, r1, #5 - adds r0, r4, #0 - bl GravityUpdate - cmp r0, #0 - bne _08039602 - adds r0, r4, #0 - bl sub_0803998C - adds r1, r4, #0 - adds r1, #0x7c - movs r0, #0x5a - strb r0, [r1] - movs r0, #0x7d - bl EnqueueSFX -_08039602: - pop {r4, pc} - - thumb_func_start sub_08039604 -sub_08039604: @ 0x08039604 - push {r4, lr} - adds r4, r0, #0 - bl sub_080AEFE0 - movs r1, #0xc0 - lsls r1, r1, #5 - adds r0, r4, #0 - bl GravityUpdate - ldr r0, [r4, #0x20] - cmp r0, #0 - bge _08039624 - movs r0, #6 - strb r0, [r4, #0xc] - movs r0, #0xf - strb r0, [r4, #0xe] -_08039624: - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_08039628 -sub_08039628: @ 0x08039628 - push {lr} - adds r2, r0, #0 - ldrb r0, [r2, #0xe] - adds r1, r0, #0 - cmp r1, #0 - beq _0803963A - subs r0, #1 - strb r0, [r2, #0xe] - b _0803966A -_0803963A: - ldrh r0, [r2, #0x36] - adds r0, #4 - strh r0, [r2, #0x36] - lsls r0, r0, #0x10 - cmp r0, #0 - blt _0803966A - movs r0, #7 - strb r0, [r2, #0xc] - movs r0, #0xa - strb r0, [r2, #0xe] - strh r1, [r2, #0x36] - adds r1, r2, #0 - adds r1, #0x7a - movs r0, #0x78 - strb r0, [r1] - adds r1, #2 - movs r0, #0x3c - strb r0, [r1] - adds r0, r2, #0 - bl sub_080399C4 - ldr r0, _0803966C @ =0x0000014B - bl EnqueueSFX -_0803966A: - pop {pc} - .align 2, 0 -_0803966C: .4byte 0x0000014B - - thumb_func_start sub_08039670 -sub_08039670: @ 0x08039670 - push {lr} - adds r1, r0, #0 - ldrb r0, [r1, #0xe] - subs r0, #1 - strb r0, [r1, #0xe] - lsls r0, r0, #0x18 - cmp r0, #0 - bne _08039686 - adds r0, r1, #0 - bl sub_0803998C -_08039686: - pop {pc} - - thumb_func_start sub_08039688 -sub_08039688: @ 0x08039688 - push {r4, lr} - adds r4, r0, #0 - bl UpdateAnimationSingleFrame - ldrb r0, [r4, #0xe] - subs r1, r0, #1 - strb r1, [r4, #0xe] - lsls r0, r1, #0x18 - cmp r0, #0 - bne _080396AC - adds r0, r4, #0 - movs r1, #0x3c - bl sub_08039A00 - adds r0, r4, #0 - bl sub_0803998C - b _080396BA -_080396AC: - movs r0, #0x1f - ands r1, r0 - cmp r1, #0 - bne _080396BA - adds r0, r4, #0 - bl sub_08039A20 -_080396BA: - pop {r4, pc} - - thumb_func_start sub_080396BC -sub_080396BC: @ 0x080396BC - push {r4, lr} - adds r4, r0, #0 - movs r1, #0xc0 - lsls r1, r1, #5 - bl GravityUpdate - cmp r0, #0 - bne _080396E2 - adds r1, r4, #0 - adds r1, #0x78 - ldrh r0, [r1] - subs r0, #1 - strh r0, [r1] - lsls r0, r0, #0x10 - cmp r0, #0 - bne _080396E2 - adds r0, r4, #0 - bl sub_08039A70 -_080396E2: - pop {r4, pc} - - thumb_func_start sub_080396E4 -sub_080396E4: @ 0x080396E4 - push {r4, lr} - adds r4, r0, #0 - bl sub_080AEFE0 - adds r0, r4, #0 - bl UpdateAnimationSingleFrame - adds r1, r4, #0 - adds r1, #0x78 - ldrh r0, [r1] - subs r0, #1 - strh r0, [r1] - lsls r0, r0, #0x10 - cmp r0, #0 - bne _08039708 - adds r0, r4, #0 - bl sub_08039AD4 -_08039708: - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_0803970C -sub_0803970C: @ 0x0803970C - push {r4, lr} - adds r4, r0, #0 - bl UpdateAnimationSingleFrame - adds r0, r4, #0 - adds r0, #0x5a - ldrb r1, [r0] - movs r0, #0x80 - ands r0, r1 - cmp r0, #0 - beq _08039756 - ldrb r0, [r4, #0xb] - cmp r0, #1 - bne _0803973A - adds r0, r4, #0 - bl sub_0803998C - ldr r0, [r4, #0x54] - bl DeleteEntity - movs r0, #0 - str r0, [r4, #0x54] - b _08039740 -_0803973A: - adds r0, r4, #0 - bl sub_08039A48 -_08039740: - adds r2, r4, #0 - adds r2, #0x3b - ldrb r1, [r2] - movs r0, #4 - orrs r0, r1 - strb r0, [r2] - adds r1, r4, #0 - adds r1, #0x78 - ldrh r0, [r1] - adds r0, #0x3c - strh r0, [r1] -_08039756: - pop {r4, pc} - - thumb_func_start sub_08039758 -sub_08039758: @ 0x08039758 - push {r4, r5, lr} - adds r4, r0, #0 - adds r5, r4, #0 - adds r5, #0x7a - ldrb r0, [r5] - cmp r0, #0 - beq _0803976A - subs r0, #1 - strb r0, [r5] -_0803976A: - adds r0, r4, #0 - movs r1, #1 - bl sub_08049FDC - cmp r0, #0 - beq _08039818 - ldrb r0, [r5] - cmp r0, #0 - bne _08039818 - ldrb r0, [r4, #0xa] - cmp r0, #0 - bne _080397DC - ldr r5, _080397D8 @ =gUnk_020000B0 - ldr r0, [r5] - movs r2, #0x2e - ldrsh r1, [r0, r2] - movs r3, #0x32 - ldrsh r2, [r0, r3] - adds r0, r4, #0 - movs r3, #0x24 - bl EntityWithinDistance - cmp r0, #0 - beq _08039818 - movs r0, #5 - strb r0, [r4, #0xc] - movs r0, #0xc0 - lsls r0, r0, #1 - strh r0, [r4, #0x24] - ldr r1, [r5] - adds r0, r4, #0 - bl GetFacingDirection - strb r0, [r4, #0x15] - ldrb r0, [r4, #0x15] - adds r0, #4 - movs r1, #0x18 - ands r0, r1 - asrs r0, r0, #3 - strb r0, [r4, #0x14] - adds r0, r4, #0 - bl sub_0803981C - adds r1, r4, #0 - adds r1, #0x3f - movs r0, #0x46 - strb r0, [r1] - adds r1, #0x3e - strb r0, [r1] - movs r0, #0xa0 - lsls r0, r0, #0xa - str r0, [r4, #0x20] - movs r0, #1 - b _0803981A - .align 2, 0 -_080397D8: .4byte gUnk_020000B0 -_080397DC: - ldr r5, _08039814 @ =gUnk_020000B0 - ldr r0, [r5] - movs r2, #0x2e - ldrsh r1, [r0, r2] - movs r3, #0x32 - ldrsh r2, [r0, r3] - adds r0, r4, #0 - movs r3, #0x48 - bl EntityWithinDistance - cmp r0, #0 - beq _08039818 - movs r0, #8 - strb r0, [r4, #0xc] - movs r0, #0x3c - strb r0, [r4, #0xe] - ldr r1, [r5] - adds r0, r4, #0 - bl GetFacingDirection - strb r0, [r4, #0x15] - ldrb r1, [r4, #0x14] - adds r1, #0xc - adds r0, r4, #0 - bl InitAnimationForceUpdate - movs r0, #1 - b _0803981A - .align 2, 0 -_08039814: .4byte gUnk_020000B0 -_08039818: - movs r0, #0 -_0803981A: - pop {r4, r5, pc} - - thumb_func_start sub_0803981C -sub_0803981C: @ 0x0803981C - push {lr} - adds r2, r0, #0 - movs r0, #0x80 - lsls r0, r0, #0xa - str r0, [r2, #0x20] - adds r1, r2, #0 - adds r1, #0x3d - movs r0, #0 - ldrsb r0, [r1, r0] - cmp r0, #0 - bne _08039836 - movs r0, #0xf4 - strb r0, [r1] -_08039836: - adds r1, r2, #0 - adds r1, #0x3f - movs r0, #0x45 - strb r0, [r1] - adds r1, #0x3e - strb r0, [r1] - ldrb r1, [r2, #0x14] - adds r1, #8 - adds r0, r2, #0 - bl InitAnimationForceUpdate - ldr r0, _08039854 @ =0x0000012B - bl EnqueueSFX - pop {pc} - .align 2, 0 -_08039854: .4byte 0x0000012B - - thumb_func_start sub_08039858 -sub_08039858: @ 0x08039858 - push {r4, r5, r6, lr} - adds r5, r0, #0 - bl sub_080398C0 - adds r6, r0, #0 - ldrb r0, [r5, #0x14] - lsls r4, r0, #3 - adds r0, r6, #4 - movs r1, #0x18 - ands r0, r1 - cmp r0, r4 - bne _0803988C - adds r1, r5, #0 - adds r1, #0x7b - ldrb r0, [r1] - cmp r0, #3 - bne _080398B8 - movs r0, #0 - strb r0, [r1] - bl Random - movs r1, #2 - ands r1, r0 - subs r1, #1 - lsls r1, r1, #3 - adds r6, r6, r1 -_0803988C: - subs r0, r6, r4 - movs r1, #0x1f - ands r0, r1 - lsrs r4, r0, #4 - movs r0, #1 - eors r4, r0 - ldr r1, _080398BC @ =gUnk_080CF8F8 - ldrb r0, [r5, #0x14] - lsls r0, r0, #1 - adds r0, r0, r4 - adds r0, r0, r1 - ldrb r1, [r0] - adds r0, r5, #0 - bl InitAnimationForceUpdate - lsls r0, r4, #1 - ldrb r1, [r5, #0x14] - adds r0, r0, r1 - subs r0, #1 - movs r1, #3 - ands r0, r1 - strb r0, [r5, #0x14] -_080398B8: - pop {r4, r5, r6, pc} - .align 2, 0 -_080398BC: .4byte gUnk_080CF8F8 - - thumb_func_start sub_080398C0 -sub_080398C0: @ 0x080398C0 - push {r4, r5, lr} - adds r4, r0, #0 - bl Random - adds r5, r0, #0 - ldrb r0, [r4, #0xa] - cmp r0, #0 - bne _08039908 - adds r0, r4, #0 - movs r1, #1 - bl sub_08049FDC - cmp r0, #0 - beq _08039908 - ldr r0, _08039900 @ =gUnk_020000B0 - ldr r0, [r0] - movs r2, #0x2e - ldrsh r1, [r0, r2] - movs r3, #0x32 - ldrsh r2, [r0, r3] - adds r0, r4, #0 - movs r3, #0x58 - bl EntityWithinDistance - cmp r0, #0 - beq _08039908 - ldr r1, _08039904 @ =gPlayerEntity - adds r0, r4, #0 - bl GetFacingDirection - b _08039928 - .align 2, 0 -_08039900: .4byte gUnk_020000B0 -_08039904: .4byte gPlayerEntity -_08039908: - adds r0, r4, #0 - bl sub_08049FA0 - cmp r0, #0 - bne _08039922 - movs r0, #7 - ands r0, r5 - cmp r0, #0 - beq _08039922 - adds r0, r4, #0 - bl sub_08049EE4 - b _08039928 -_08039922: - lsrs r0, r5, #0x10 - movs r1, #0x18 - ands r0, r1 -_08039928: - pop {r4, r5, pc} - .align 2, 0 - - thumb_func_start sub_0803992C -sub_0803992C: @ 0x0803992C - push {r4, lr} - adds r4, r0, #0 - movs r0, #3 - strb r0, [r4, #0xc] - movs r0, #0xe0 - strh r0, [r4, #0x24] - ldrb r0, [r4, #0x14] - lsls r0, r0, #3 - strb r0, [r4, #0x15] - bl Random - ldr r2, _08039978 @ =gUnk_080CF900 - movs r1, #0xf - ands r1, r0 - adds r1, r1, r2 - ldrb r1, [r1] - adds r0, r4, #0 - adds r0, #0x78 - strh r1, [r0] - ldrb r1, [r4, #0x15] - adds r0, r4, #0 - movs r2, #0 - bl sub_080AE58C - ldr r1, _0803997C @ =gUnk_080CF910 - ldrb r2, [r4, #0x14] - lsls r0, r2, #1 - adds r0, r0, r1 - ldrh r1, [r0] - ldrh r0, [r4, #0x2a] - ands r0, r1 - cmp r0, #0 - beq _08039980 - adds r0, r4, #0 - adds r1, r2, #0 - bl InitAnimationForceUpdate - b _08039988 - .align 2, 0 -_08039978: .4byte gUnk_080CF900 -_0803997C: .4byte gUnk_080CF910 -_08039980: - adds r1, r2, #4 - adds r0, r4, #0 - bl InitAnimationForceUpdate -_08039988: - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_0803998C -sub_0803998C: @ 0x0803998C - push {r4, lr} - adds r4, r0, #0 - movs r0, #1 - strb r0, [r4, #0xc] - adds r1, r4, #0 - adds r1, #0x3f - movs r0, #0x44 - strb r0, [r1] - adds r1, #0x3e - strb r0, [r1] - bl Random - ldr r2, _080399C0 @ =gUnk_080CF918 - movs r1, #0xf - ands r1, r0 - adds r1, r1, r2 - ldrb r1, [r1] - adds r0, r4, #0 - adds r0, #0x78 - strh r1, [r0] - ldrb r1, [r4, #0x14] - adds r0, r4, #0 - bl InitAnimationForceUpdate - pop {r4, pc} - .align 2, 0 -_080399C0: .4byte gUnk_080CF918 - - thumb_func_start sub_080399C4 -sub_080399C4: @ 0x080399C4 - push {r4, lr} - adds r4, r0, #0 - movs r1, #0x11 - movs r2, #0 - bl CreateFx - adds r1, r0, #0 - cmp r1, #0 - beq _080399E2 - ldrh r0, [r1, #0x2e] - subs r0, #4 - strh r0, [r1, #0x2e] - ldrh r0, [r1, #0x32] - adds r0, #2 - strh r0, [r1, #0x32] -_080399E2: - adds r0, r4, #0 - movs r1, #0x11 - movs r2, #0 - bl CreateFx - adds r1, r0, #0 - cmp r1, #0 - beq _080399FE - ldrh r0, [r1, #0x2e] - adds r0, #4 - strh r0, [r1, #0x2e] - ldrh r0, [r1, #0x32] - adds r0, #2 - strh r0, [r1, #0x32] -_080399FE: - pop {r4, pc} - - thumb_func_start sub_08039A00 -sub_08039A00: @ 0x08039A00 - push {r4, r5, lr} - adds r4, r0, #0 - adds r5, r1, #0 - bl Random - ldr r2, _08039A1C @ =gUnk_080CF928 - movs r1, #3 - ands r1, r0 - adds r1, r1, r2 - ldrb r0, [r1] - adds r0, r0, r5 - adds r4, #0x7a - strb r0, [r4] - pop {r4, r5, pc} - .align 2, 0 -_08039A1C: .4byte gUnk_080CF928 - - thumb_func_start sub_08039A20 -sub_08039A20: @ 0x08039A20 - push {r4, lr} - adds r4, r0, #0 - movs r1, #2 - movs r2, #0 - bl CreateProjectileWithParent - adds r1, r0, #0 - cmp r1, #0 - beq _08039A44 - ldrb r0, [r4, #0x15] - strb r0, [r1, #0x15] - adds r1, r4, #0 - adds r1, #0x7c - movs r0, #0x3c - strb r0, [r1] - movs r0, #0xfb - bl EnqueueSFX -_08039A44: - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_08039A48 -sub_08039A48: @ 0x08039A48 - push {lr} - adds r2, r0, #0 - movs r0, #9 - strb r0, [r2, #0xc] - adds r1, r2, #0 - adds r1, #0x3f - movs r0, #0x47 - strb r0, [r1] - adds r1, #0x3e - strb r0, [r1] - subs r1, #5 - movs r0, #0xa - strh r0, [r1] - ldrb r1, [r2, #0x14] - adds r1, #0x10 - adds r0, r2, #0 - bl InitAnimationForceUpdate - pop {pc} - .align 2, 0 - - thumb_func_start sub_08039A70 -sub_08039A70: @ 0x08039A70 - push {r4, r5, lr} - adds r5, r0, #0 - movs r0, #0xa - strb r0, [r5, #0xc] - movs r0, #0xe0 - strh r0, [r5, #0x24] - bl Random - adds r4, r0, #0 - ldr r1, _08039AB8 @ =gUnk_080CF92C - movs r0, #3 - ands r0, r4 - adds r0, r0, r1 - ldrb r1, [r0] - adds r0, r5, #0 - adds r0, #0x78 - strh r1, [r0] - lsrs r4, r4, #0x10 - adds r0, r5, #0 - bl sub_08049FA0 - cmp r0, #0 - bne _08039ABC - movs r0, #7 - ands r0, r4 - cmp r0, #0 - beq _08039ABC - adds r0, r5, #0 - bl sub_08049EE4 - adds r0, #4 - movs r1, #0x18 - ands r0, r1 - strb r0, [r5, #0x15] - b _08039AC2 - .align 2, 0 -_08039AB8: .4byte gUnk_080CF92C -_08039ABC: - movs r0, #0x18 - ands r4, r0 - strb r4, [r5, #0x15] -_08039AC2: - ldrb r0, [r5, #0x15] - lsrs r0, r0, #3 - strb r0, [r5, #0x14] - ldrb r1, [r5, #0x14] - adds r1, #0x14 - adds r0, r5, #0 - bl InitAnimationForceUpdate - pop {r4, r5, pc} - - thumb_func_start sub_08039AD4 -sub_08039AD4: @ 0x08039AD4 - push {r4, r5, lr} - adds r4, r0, #0 - bl sub_08039B28 - adds r5, r0, #0 - ldr r0, _08039B18 @ =0x0000FFFF - cmp r5, r0 - beq _08039B20 - ldrb r2, [r4, #0xb] - adds r0, r4, #0 - movs r1, #0x10 - bl CreateProjectileWithParent - adds r1, r0, #0 - cmp r1, #0 - beq _08039B20 - str r4, [r1, #0x50] - movs r0, #0xb - strb r0, [r4, #0xc] - str r1, [r4, #0x54] - ldrb r1, [r4, #0x14] - adds r1, #0x18 - adds r0, r4, #0 - bl InitAnimationForceUpdate - ldr r0, _08039B1C @ =0x00004067 - adds r1, r4, #0 - adds r1, #0x38 - ldrb r2, [r1] - adds r1, r5, #0 - bl SetTile - b _08039B26 - .align 2, 0 -_08039B18: .4byte 0x0000FFFF -_08039B1C: .4byte 0x00004067 -_08039B20: - adds r0, r4, #0 - bl sub_08039A48 -_08039B26: - pop {r4, r5, pc} - - thumb_func_start sub_08039B28 -sub_08039B28: @ 0x08039B28 - push {r4, r5, r6, lr} - adds r6, r0, #0 - ldr r0, [r6, #0x54] - cmp r0, #0 - bne _08039B84 - ldrb r2, [r6, #0x14] - lsls r2, r2, #1 - ldr r0, _08039B88 @ =gUnk_080CF930 - adds r2, r2, r0 - movs r1, #0x2e - ldrsh r0, [r6, r1] - movs r1, #0 - ldrsb r1, [r2, r1] - adds r0, r0, r1 - ldr r4, _08039B8C @ =gRoomControls - ldrh r1, [r4, #6] - subs r0, r0, r1 - asrs r5, r0, #4 - movs r3, #0x3f - ands r5, r3 - movs r1, #0x32 - ldrsh r0, [r6, r1] - movs r1, #1 - ldrsb r1, [r2, r1] - adds r0, r0, r1 - ldrh r1, [r4, #8] - subs r0, r0, r1 - asrs r0, r0, #4 - ands r0, r3 - lsls r0, r0, #6 - orrs r5, r0 - adds r0, r6, #0 - adds r0, #0x38 - ldrb r1, [r0] - adds r0, r5, #0 - bl GetTileType - adds r2, r0, #0 - ldr r1, _08039B90 @ =gUnk_080CF938 -_08039B76: - ldrh r0, [r1] - cmp r0, r2 - beq _08039B98 - adds r1, #4 - ldrh r0, [r1] - cmp r0, #0 - bne _08039B76 -_08039B84: - ldr r0, _08039B94 @ =0x0000FFFF - b _08039B9E - .align 2, 0 -_08039B88: .4byte gUnk_080CF930 -_08039B8C: .4byte gRoomControls -_08039B90: .4byte gUnk_080CF938 -_08039B94: .4byte 0x0000FFFF -_08039B98: - ldrh r0, [r1, #2] - strb r0, [r6, #0xb] - adds r0, r5, #0 -_08039B9E: - pop {r4, r5, r6, pc} diff --git a/asm/non_matching/stalfos/sub_0803933C.inc b/asm/non_matching/stalfos/sub_0803933C.inc new file mode 100644 index 00000000..875ca86a --- /dev/null +++ b/asm/non_matching/stalfos/sub_0803933C.inc @@ -0,0 +1,111 @@ + .syntax unified + push {r4, r5, lr} + adds r5, r0, #0 + adds r0, #0x3f + ldrb r0, [r0] + cmp r0, #0x44 + bne _08039390 + adds r0, r5, #0 + adds r0, #0x41 + ldrb r0, [r0] + movs r1, #0x7f + ands r1, r0 + cmp r1, #6 + bgt _08039390 + cmp r1, #4 + blt _08039390 + adds r0, r5, #0 + adds r0, #0x3d + ldrb r0, [r0] + lsls r0, r0, #0x18 + asrs r0, r0, #0x18 + cmp r0, #0 + bgt _08039390 + movs r0, #4 + strb r0, [r5, #0xc] + adds r0, r5, #0 + adds r0, #0x3e + ldrb r0, [r0] + strb r0, [r5, #0x15] + ldrb r0, [r5, #0x15] + adds r0, #4 + movs r1, #0x18 + ands r0, r1 + movs r1, #0x10 + eors r0, r1 + asrs r0, r0, #3 + strb r0, [r5, #0x14] + movs r0, #0x90 + lsls r0, r0, #1 + strh r0, [r5, #0x24] + adds r0, r5, #0 + bl sub_0803981C +_08039390: + adds r0, r5, #0 + adds r0, #0x41 + ldrb r2, [r0] + cmp r2, #0x9d + bne _080393F8 + ldr r1, [r5, #0x54] + cmp r1, #0 + bne _080393CA + ldrb r0, [r5, #0xc] + cmp r0, #8 + bhi _080393EC + adds r0, r5, #0 + movs r1, #0x10 + movs r2, #1 + bl CreateProjectileWithParent + adds r1, r0, #0 + cmp r1, #0 + beq _080393DC + ldrb r0, [r5, #0x14] + lsls r0, r0, #1 + strb r0, [r1, #0x1e] + movs r0, #2 + strb r0, [r1, #0xb] + movs r0, #0xc3 + lsls r0, r0, #1 + bl EnqueueSFX + b _080393DC +_080393CA: + adds r0, r1, #0 + adds r0, #0x41 + movs r4, #0 + strb r2, [r0] + movs r0, #0xc3 + lsls r0, r0, #1 + bl EnqueueSFX + str r4, [r5, #0x54] +_080393DC: + adds r0, r5, #0 + bl sub_08039A48 + adds r1, r5, #0 + adds r1, #0x78 + ldrh r0, [r1] + adds r0, #0x5a + strh r0, [r1] +_080393EC: + adds r2, r5, #0 + adds r2, #0x3b + ldrb r1, [r2] + movs r0, #0xfb + ands r0, r1 + strb r0, [r2] +_080393F8: + adds r0, r5, #0 + adds r0, #0x43 + ldrb r0, [r0] + cmp r0, #0 + beq _0803940A + adds r0, r5, #0 + movs r1, #0x1c + bl sub_0804A9FC +_0803940A: + ldr r1, _08039414 @ =Stalfos_Functions + adds r0, r5, #0 + bl sub_0804AA30 + pop {r4, r5, pc} + .align 2, 0 +_08039414: .4byte Stalfos_Functions + .syntax divided diff --git a/asm/non_matching/stalfos/sub_08039858.inc b/asm/non_matching/stalfos/sub_08039858.inc new file mode 100644 index 00000000..d76732bc --- /dev/null +++ b/asm/non_matching/stalfos/sub_08039858.inc @@ -0,0 +1,52 @@ + .syntax unified + push {r4, r5, r6, lr} + adds r5, r0, #0 + bl sub_080398C0 + adds r6, r0, #0 + ldrb r0, [r5, #0x14] + lsls r4, r0, #3 + adds r0, r6, #4 + movs r1, #0x18 + ands r0, r1 + cmp r0, r4 + bne _0803988C + adds r1, r5, #0 + adds r1, #0x7b + ldrb r0, [r1] + cmp r0, #3 + bne _080398B8 + movs r0, #0 + strb r0, [r1] + bl Random + movs r1, #2 + ands r1, r0 + subs r1, #1 + lsls r1, r1, #3 + adds r6, r6, r1 +_0803988C: + subs r0, r6, r4 + movs r1, #0x1f + ands r0, r1 + lsrs r4, r0, #4 + movs r0, #1 + eors r4, r0 + ldr r1, _080398BC @ =gUnk_080CF8F8 + ldrb r0, [r5, #0x14] + lsls r0, r0, #1 + adds r0, r0, r4 + adds r0, r0, r1 + ldrb r1, [r0] + adds r0, r5, #0 + bl InitAnimationForceUpdate + lsls r0, r4, #1 + ldrb r1, [r5, #0x14] + adds r0, r0, r1 + subs r0, #1 + movs r1, #3 + ands r0, r1 + strb r0, [r5, #0x14] +_080398B8: + pop {r4, r5, r6, pc} + .align 2, 0 +_080398BC: .4byte gUnk_080CF8F8 + .syntax divided diff --git a/asm/non_matching/stalfos/sub_08039B28.inc b/asm/non_matching/stalfos/sub_08039B28.inc new file mode 100644 index 00000000..92b41bf7 --- /dev/null +++ b/asm/non_matching/stalfos/sub_08039B28.inc @@ -0,0 +1,62 @@ + .syntax unified + push {r4, r5, r6, lr} + adds r6, r0, #0 + ldr r0, [r6, #0x54] + cmp r0, #0 + bne _08039B84 + ldrb r2, [r6, #0x14] + lsls r2, r2, #1 + ldr r0, _08039B88 @ =gUnk_080CF930 + adds r2, r2, r0 + movs r1, #0x2e + ldrsh r0, [r6, r1] + movs r1, #0 + ldrsb r1, [r2, r1] + adds r0, r0, r1 + ldr r4, _08039B8C @ =gRoomControls + ldrh r1, [r4, #6] + subs r0, r0, r1 + asrs r5, r0, #4 + movs r3, #0x3f + ands r5, r3 + movs r1, #0x32 + ldrsh r0, [r6, r1] + movs r1, #1 + ldrsb r1, [r2, r1] + adds r0, r0, r1 + ldrh r1, [r4, #8] + subs r0, r0, r1 + asrs r0, r0, #4 + ands r0, r3 + lsls r0, r0, #6 + orrs r5, r0 + adds r0, r6, #0 + adds r0, #0x38 + ldrb r1, [r0] + adds r0, r5, #0 + bl GetTileType + adds r2, r0, #0 + ldr r1, _08039B90 @ =gUnk_080CF938 +_08039B76: + ldrh r0, [r1] + cmp r0, r2 + beq _08039B98 + adds r1, #4 + ldrh r0, [r1] + cmp r0, #0 + bne _08039B76 +_08039B84: + ldr r0, _08039B94 @ =0x0000FFFF + b _08039B9E + .align 2, 0 +_08039B88: .4byte gUnk_080CF930 +_08039B8C: .4byte gRoomControls +_08039B90: .4byte gUnk_080CF938 +_08039B94: .4byte 0x0000FFFF +_08039B98: + ldrh r0, [r1, #2] + strb r0, [r6, #0xb] + adds r0, r5, #0 +_08039B9E: + pop {r4, r5, r6, pc} + .syntax divided diff --git a/assets/assets.json b/assets/assets.json index 706dcd76..28e0f063 100644 --- a/assets/assets.json +++ b/assets/assets.json @@ -26635,46 +26635,6 @@ "size": 6, "type": "animation" }, - { - "path": "stalfos/gUnk_080CF8F8.bin", - "start": 850168, - "size": 8 - }, - { - "path": "stalfos/gUnk_080CF900.bin", - "start": 850176, - "size": 16 - }, - { - "path": "stalfos/gUnk_080CF910.bin", - "start": 850192, - "size": 8 - }, - { - "path": "stalfos/gUnk_080CF918.bin", - "start": 850200, - "size": 16 - }, - { - "path": "stalfos/gUnk_080CF928.bin", - "start": 850216, - "size": 4 - }, - { - "path": "stalfos/gUnk_080CF92C.bin", - "start": 850220, - "size": 4 - }, - { - "path": "stalfos/gUnk_080CF930.bin", - "start": 850224, - "size": 8 - }, - { - "path": "stalfos/gUnk_080CF938.bin", - "start": 850232, - "size": 10 - }, { "path": "animations/gSpriteAnimations_FlyingSkull_0.bin", "start": 850920, diff --git a/data/const/enemy/stalfos.s b/data/const/enemy/stalfos.s deleted file mode 100644 index 9771d939..00000000 --- a/data/const/enemy/stalfos.s +++ /dev/null @@ -1,56 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_080CF8A4:: @ 080CF8A4 - .4byte sub_080392CC - .4byte sub_0803933C - .4byte sub_08001324 - .4byte sub_08039418 - .4byte sub_08001242 - .4byte sub_08039438 - -gUnk_080CF8BC:: @ 080CF8BC - .4byte sub_080394CC - .4byte sub_08039530 - .4byte sub_0803956C - .4byte sub_0803958C - .4byte sub_080395D8 - .4byte sub_08039604 - .4byte sub_08039628 - .4byte sub_08039670 - .4byte sub_08039688 - .4byte sub_080396BC - .4byte sub_080396E4 - .4byte sub_0803970C - -gUnk_080CF8EC:: @ 080CF8EC - .4byte sub_0803945C - .4byte sub_08039468 - .4byte sub_08039470 - -gUnk_080CF8F8:: @ 080CF8F8 - .incbin "stalfos/gUnk_080CF8F8.bin" - -gUnk_080CF900:: @ 080CF900 - .incbin "stalfos/gUnk_080CF900.bin" - -gUnk_080CF910:: @ 080CF910 - .incbin "stalfos/gUnk_080CF910.bin" - -gUnk_080CF918:: @ 080CF918 - .incbin "stalfos/gUnk_080CF918.bin" - -gUnk_080CF928:: @ 080CF928 - .incbin "stalfos/gUnk_080CF928.bin" - -gUnk_080CF92C:: @ 080CF92C - .incbin "stalfos/gUnk_080CF92C.bin" - -gUnk_080CF930:: @ 080CF930 - .incbin "stalfos/gUnk_080CF930.bin" - -gUnk_080CF938:: @ 080CF938 - .incbin "stalfos/gUnk_080CF938.bin" diff --git a/include/enemy.h b/include/enemy.h index 4bbecfec..7273f2f8 100644 --- a/include/enemy.h +++ b/include/enemy.h @@ -199,7 +199,7 @@ void RopeGolden(Entity*); void CloudPiranha(Entity*); void ScissorsBeetle(Entity*); void CuccoAggr(Entity*); -void Stalfos(Entity*); +void Stalfos(); void FlyingSkull(Entity*); void MazaalBracelet(Entity*); void Takkuri(Entity*); diff --git a/include/functions.h b/include/functions.h index 171e6c90..ecdc319b 100644 --- a/include/functions.h +++ b/include/functions.h @@ -172,4 +172,5 @@ extern void CreateRandomItemDrop(Entity*, s32); extern Entity* sub_080A2A3C(Entity*, u32, u32, u32); extern void sub_0806FCF4(Entity*, s32, s32, s32); extern u32 sub_080041DC(Entity*, u32, u32); +extern void sub_080AE58C(Entity*, u32, u32); #endif diff --git a/linker.ld b/linker.ld index d1126618..f628ac60 100644 --- a/linker.ld +++ b/linker.ld @@ -391,7 +391,7 @@ SECTIONS { asm/enemy/cloudPiranha.o(.text); src/enemy/scissorsBeetle.o(.text); src/enemy/cuccoAggr.o(.text); - asm/enemy/stalfos.o(.text); + src/enemy/stalfos.o(.text); src/enemy/flyingSkull.o(.text); src/enemy/mazaalBracelet.o(.text); src/enemy/takkuri.o(.text); @@ -1060,7 +1060,7 @@ SECTIONS { data/animations/enemy/scissorsBeetle.o(.rodata); src/enemy/cuccoAggr.o(.rodata); data/animations/enemy/cuccoAggr.o(.rodata); - data/const/enemy/stalfos.o(.rodata); + src/enemy/stalfos.o(.rodata); data/animations/enemy/stalfos.o(.rodata); src/enemy/flyingSkull.o(.rodata); data/animations/enemy/flyingSkull.o(.rodata); diff --git a/src/enemy/rollobite.c b/src/enemy/rollobite.c index 4b8e07b0..71ebddee 100644 --- a/src/enemy/rollobite.c +++ b/src/enemy/rollobite.c @@ -21,7 +21,6 @@ void sub_08020A7C(Entity*); bool32 Rollobite_TryToHoleUp(Entity*); bool32 Rollobite_IsRolledUp(Entity*); -extern void sub_080AE58C(Entity*, u32, u32); extern void sub_080AE7E8(Entity*, u32, u32, u32); extern void sub_08078930(Entity*); diff --git a/src/enemy/stalfos.c b/src/enemy/stalfos.c new file mode 100644 index 00000000..2fea7018 --- /dev/null +++ b/src/enemy/stalfos.c @@ -0,0 +1,500 @@ +/** + * @file stalfos.c + * @ingroup Enemies + * + * @brief Stalfos enemy + */ + +#define NENT_DEPRECATED +#include "global.h" +#include "enemy.h" +#include "functions.h" + +typedef struct { + /*0x00*/ Entity base; + /*0x68*/ u8 unk_68[0x10]; + /*0x78*/ u16 unk_78; + /*0x7a*/ u8 unk_7a; + /*0x7b*/ u8 unk_7b; + /*0x7c*/ u8 unk_7c; + /*0x7d*/ u8 unk_7d; +} StalfosEntity; + +extern Entity* gUnk_020000B0; + +extern void (*const Stalfos_Functions[])(StalfosEntity*); +extern void (*const Stalfos_Actions[])(StalfosEntity*); +extern void (*const Stalfos_SubActions[])(StalfosEntity*); +extern const u8 gUnk_080CF8F8[]; +extern const u8 gUnk_080CF900[]; +extern const u16 gUnk_080CF910[]; +extern const u8 gUnk_080CF918[]; +extern const u8 gUnk_080CF928[]; +extern const u8 gUnk_080CF92C[]; +extern const u8 gUnk_080CF930[]; +extern const u16 gUnk_080CF938[]; + +void sub_0803981C(StalfosEntity*); +void sub_08039A48(StalfosEntity*); +void sub_08039A00(StalfosEntity*, u32); +void sub_0803998C(StalfosEntity*); +bool32 sub_08039758(StalfosEntity*); +void sub_08039858(StalfosEntity*); +void sub_0803992C(StalfosEntity*); +void sub_080399C4(StalfosEntity*); +void sub_08039A20(StalfosEntity*); +void sub_08039A70(StalfosEntity*); +void sub_08039AD4(StalfosEntity*); +u32 sub_080398C0(StalfosEntity*); +u32 sub_08039B28(StalfosEntity*); + +void Stalfos(StalfosEntity* this) { + EnemyFunctionHandler(super, (EntityActionArray)&Stalfos_Functions); + SetChildOffset(super, 0, 1, -0x12); +} + +void Stalfos_OnTick(StalfosEntity* this) { + Stalfos_Actions[super->action](this); + if (this->unk_7c != 0) { + if (--this->unk_7c != 0) { + super->hitType = 0x45; + } else { + super->hitType = this->unk_7d; + } + } + if (super->z.HALF.HI != 0) { + if (super->z.HALF.HI < -8) { + super->spriteOrientation.flipY = 1; + super->spriteRendering.b3 = 1; + } else { + UpdateSpriteForCollisionLayer(super); + } + } +} + +NONMATCH("asm/non_matching/stalfos/sub_0803933C.inc", void sub_0803933C(StalfosEntity* this)) { + if (super->hitType == 0x44) { + if ((super->bitfield & 0x7f) < 7) { + if ((super->bitfield & 0x7f) > 3) { + if (super->iframes < 1) { + super->action = 4; + super->direction = super->knockbackDirection; + super->animationState = ((((super->direction + 4) & 0x18) ^ 0x10) >> 3); + super->speed = 0x120; + sub_0803981C(this); + } + } + } + } + if (super->bitfield == 0x9d) { + if (super->child == NULL) { + if (super->action < 9) { + Entity* projectile = CreateProjectileWithParent(super, STALFOS_PROJECTILE, 1); + if (projectile != NULL) { + projectile->frameIndex = super->animationState << 1; + projectile->type2 = 2; + EnqueueSFX(SFX_186); + } + sub_08039A48(this); + this->unk_78 += 0x5a; + } + } else { + super->child->bitfield = 0x9d; + EnqueueSFX(SFX_186); + super->child = NULL; + sub_08039A48(this); + this->unk_78 += 0x5a; + } + super->flags2 &= 0xfb; + } + if (super->field_0x43 != 0) { + sub_0804A9FC(super, 0x1c); + } + sub_0804AA30(super, Stalfos_Functions); +} +END_NONMATCH + +void sub_08039418(StalfosEntity* this) { + if (super->type == 0) { + CreateDeathFx(super, 0xf3, 0); + } else { + sub_0804A7D4(super); + } +} + +void sub_08039438(StalfosEntity* this) { + if (sub_0806F520()) { + Stalfos_SubActions[super->subAction](this); + } +} + +void Stalfos_SubAction0(StalfosEntity* this) { + super->subAction = 1; + super->field_0x1d = 0x5a; +} + +void Stalfos_SubAction1(StalfosEntity* this) { + sub_0806F4E8(super); +} + +void Stalfos_SubAction2(StalfosEntity* this) { + Entity* projectile = super->child; + if (projectile == NULL) { + projectile = CreateProjectileWithParent(super, STALFOS_PROJECTILE, 1); + if (projectile != NULL) { + projectile->frameIndex = super->animationState << 1; + projectile->type2 = 1; + } + } else { + COLLISION_ON(projectile); + } + super->child = NULL; + super->field_0x3a &= 0xfb; + super->flags2 &= 0xfb; + sub_08039A48(this); + this->unk_78 += 0x5a; +} + +void Stalfos_Init(StalfosEntity* this) { + sub_0804A720(super); + super->animationState = Random() & 3; + this->unk_7b = 0; + this->unk_7c = 0; + this->unk_7d = super->hitType; + sub_08039A00(this, 0); + if (super->type2 == 0) { + sub_0803998C(this); + } else { + super->action = 4; + super->direction = 0xff; + super->animationState = (((GetFacingDirection(super, &gPlayerEntity) + 4) & 0x18) >> 3); + sub_0803981C(this); + } +} + +void Stalfos_Action1(StalfosEntity* this) { + if (GravityUpdate(super, 0x1800) == 0 && sub_08039758(this) == 0 && --this->unk_78 == 0) { + super->action = 2; + super->actionDelay = 0xa; + sub_08039858(this); + } +} + +void Stalfos_Action2(StalfosEntity* this) { + if (sub_08039758(this) == 0 && --super->actionDelay == 0) { + sub_0803992C(this); + } +} + +void Stalfos_Action3(StalfosEntity* this) { + if (sub_08039758(this) == 0) { + if (ProcessMovement(super)) { + UpdateAnimationSingleFrame(super); + if (--this->unk_78 == 0) { + sub_0803998C(this); + } + } else { + this->unk_7b = this->unk_7b << 1 | 1; + sub_0803998C(this); + } + } +} + +void Stalfos_Action4(StalfosEntity* this) { + sub_080AEFE0(super); + if (GravityUpdate(super, 0x1800) == 0) { + sub_0803998C(this); + this->unk_7c = 0x5a; + EnqueueSFX(SFX_PLY_LAND); + } +} + +void Stalfos_Action5(StalfosEntity* this) { + sub_080AEFE0(super); + GravityUpdate(super, 0x1800); + if (super->zVelocity < 0) { + super->action = 6; + super->actionDelay = 0x0f; + } +} + +void Stalfos_Action6(StalfosEntity* this) { + u16 tmp; + + if (super->actionDelay != 0) { + super->actionDelay--; + } else { + tmp = super->z.HALF.HI += 4; + if (-1 < (tmp * 0x10000)) { + super->action = 7; + super->actionDelay = 0xa; + super->z.HALF.HI = 0; + this->unk_7a = 0x78; + this->unk_7c = 0x3c; + sub_080399C4(this); + EnqueueSFX(SFX_14B); + } + } +} + +void Stalfos_Action7(StalfosEntity* this) { + if (--super->actionDelay == 0) { + sub_0803998C(this); + } +} + +void Stalfos_Action8(StalfosEntity* this) { + UpdateAnimationSingleFrame(super); + if (--super->actionDelay == 0) { + sub_08039A00(this, 0x3c); + sub_0803998C(this); + } else if ((super->actionDelay & 0x1f) == 0) { + sub_08039A20(this); + } +} + +void Stalfos_Action9(StalfosEntity* this) { + if (GravityUpdate(super, 0x1800) == 0 && --this->unk_78 == 0) { + sub_08039A70(this); + } +} + +void Stalfos_Action11(StalfosEntity* this) { + sub_080AEFE0(super); + UpdateAnimationSingleFrame(super); + if (--this->unk_78 == 0) { + sub_08039AD4(this); + } +} + +void Stalfos_Action12(StalfosEntity* this) { + UpdateAnimationSingleFrame(super); + if ((super->frame & 0x80) != 0) { + if (super->type2 == 1) { + sub_0803998C(this); + DeleteEntity(super->child); + super->child = NULL; + } else { + sub_08039A48(this); + } + super->flags2 |= 4; + this->unk_78 += 0x3c; + } +} + +bool32 sub_08039758(StalfosEntity* this) { + if (this->unk_7a != 0) { + this->unk_7a--; + } + if (sub_08049FDC(super, 1) && (this->unk_7a == 0)) { + if (super->type == 0) { + if (EntityWithinDistance(super, gUnk_020000B0->x.HALF.HI, gUnk_020000B0->y.HALF.HI, 0x24)) { + super->action = 5; + super->speed = 0x180; + super->direction = GetFacingDirection(super, gUnk_020000B0); + super->animationState = (((super->direction + 4) & 0x18) >> 3); + sub_0803981C(this); + super->hitType = 0x46; + this->unk_7d = 0x46; + super->zVelocity = 0x28000; + return TRUE; + } + } else { + if (EntityWithinDistance(super, gUnk_020000B0->x.HALF.HI, gUnk_020000B0->y.HALF.HI, 0x48)) { + super->action = 8; + super->actionDelay = 0x3c; + super->direction = GetFacingDirection(super, gUnk_020000B0); + InitAnimationForceUpdate(super, super->animationState + 0xc); + return TRUE; + } + } + } + return FALSE; +} + +void sub_0803981C(StalfosEntity* this) { + super->zVelocity = 0x20000; + if (super->iframes == 0) { + super->iframes = -0xc; + } + super->hitType = 0x45; + this->unk_7d = 0x45; + InitAnimationForceUpdate(super, super->animationState + 8); + EnqueueSFX(SFX_12B); +} + +NONMATCH("asm/non_matching/stalfos/sub_08039858.inc", void sub_08039858(StalfosEntity* this)) { + s32 iVar1; + u32 uVar2; + u32 uVar3; + u32 tmp; + + iVar1 = sub_080398C0(this); + uVar2 = (u32)super->animationState; + tmp = uVar2 * 8; + if (((iVar1 + 4U) & 0x18) == tmp) { + if (this->unk_7b != 3) { + return; + } + this->unk_7b = 0; + uVar3 = Random(); + iVar1 += ((uVar3 & 2) - 1) * 8; + } + uVar2 = ((iVar1 + uVar2 * -8) & 0x1f) >> 4 ^ 1; + InitAnimationForceUpdate(super, gUnk_080CF8F8[(u32)super->animationState * 2 + uVar2]); + super->animationState = ((uVar2 * 2 + super->animationState) - 1) & 3; +} +END_NONMATCH + +u32 sub_080398C0(StalfosEntity* this) { + u32 rand = Random(); + if ((super->type == 0) && sub_08049FDC(super, 1) && + (EntityWithinDistance(super, gUnk_020000B0->x.HALF.HI, gUnk_020000B0->y.HALF.HI, 0x58) != 0)) { + return GetFacingDirection(super, &gPlayerEntity); + } else { + if ((sub_08049FA0(super) == 0) && ((rand & 7) != 0)) { + return sub_08049EE4(super); + } else { + return rand >> 0x10 & 0x18; + } + } +} + +void sub_0803992C(StalfosEntity* this) { + super->action = 3; + super->speed = 0xe0; + super->direction = super->animationState << 3; + this->unk_78 = (u16)gUnk_080CF900[Random() & 0xf]; + sub_080AE58C(super, super->direction, 0); + if ((gUnk_080CF910[super->animationState] & super->collisions) != 0) { + InitAnimationForceUpdate(super, super->animationState); + } else { + InitAnimationForceUpdate(super, super->animationState + 4); + } +} + +void sub_0803998C(StalfosEntity* this) { + super->action = 1; + super->hitType = 0x44; + this->unk_7d = 0x44; + this->unk_78 = gUnk_080CF918[Random() & 0xf]; + InitAnimationForceUpdate(super, super->animationState); +} + +void sub_080399C4(StalfosEntity* this) { + Entity* effect = CreateFx(super, FX_DASH, 0); + if (effect != NULL) { + effect->x.HALF.HI -= 4; + effect->y.HALF.HI += 2; + } + effect = CreateFx(super, FX_DASH, 0); + if (effect != NULL) { + effect->x.HALF.HI += 4; + effect->y.HALF.HI += 2; + } +} + +void sub_08039A00(StalfosEntity* this, u32 param_2) { + this->unk_7a = gUnk_080CF928[Random() & 3] + param_2; +} + +void sub_08039A20(StalfosEntity* this) { + Entity* projectile = CreateProjectileWithParent(super, BONE_PROJECTILE, 0); + if (projectile != NULL) { + projectile->direction = super->direction; + this->unk_7c = 0x3c; + EnqueueSFX(SFX_FB); + } +} + +void sub_08039A48(StalfosEntity* this) { + super->action = 9; + super->hitType = 0x47; + this->unk_7d = 0x47; + this->unk_78 = 10; + InitAnimationForceUpdate(super, super->animationState + 0x10); +} + +void sub_08039A70(StalfosEntity* this) { + u32 rand; + super->action = 0xa; + super->speed = 0xe0; + rand = Random(); + this->unk_78 = gUnk_080CF92C[rand & 3]; + rand >>= 0x10; + if ((sub_08049FA0(super) == 0) && ((rand & 7) != 0)) { + super->direction = (sub_08049EE4(super) + 4) & 0x18; + } else { + super->direction = rand & 0x18; + } + super->animationState = super->direction >> 3; + InitAnimationForceUpdate(super, super->animationState + 0x14); +} + +void sub_08039AD4(StalfosEntity* this) { + u32 position = sub_08039B28(this); + if (position != 0xffff) { + Entity* projectile = CreateProjectileWithParent(super, STALFOS_PROJECTILE, super->type2); + if (projectile != NULL) { + projectile->parent = super; + super->action = 0xb; + super->child = projectile; + InitAnimationForceUpdate(super, super->animationState + 0x18); + SetTile(0x4067, position, super->collisionLayer); + return; + } + } + sub_08039A48(this); +} +ASM_FUNC("asm/non_matching/stalfos/sub_08039B28.inc", u32 sub_08039B28(StalfosEntity* this)) + +void (*const Stalfos_Functions[])(StalfosEntity*) = { + Stalfos_OnTick, + sub_0803933C, + (void (*)(StalfosEntity*))sub_08001324, + sub_08039418, + (void (*)(StalfosEntity*))sub_08001242, + sub_08039438, +}; +void (*const Stalfos_Actions[])(StalfosEntity*) = { + Stalfos_Init, Stalfos_Action1, Stalfos_Action2, Stalfos_Action3, Stalfos_Action4, Stalfos_Action5, + Stalfos_Action6, Stalfos_Action7, Stalfos_Action8, Stalfos_Action9, Stalfos_Action11, Stalfos_Action12, +}; +void (*const Stalfos_SubActions[])(StalfosEntity*) = { + Stalfos_SubAction0, + Stalfos_SubAction1, + Stalfos_SubAction2, +}; +const u8 gUnk_080CF8F8[] = { + 28, 29, 30, 31, 32, 33, 34, 35, +}; +const u8 gUnk_080CF900[] = { + 60, 60, 90, 90, 90, 90, 120, 120, 120, 120, 120, 120, 120, 120, 150, 150, +}; +const u16 gUnk_080CF910[] = { + 8, + 32768, + 128, + 2048, +}; +const u8 gUnk_080CF918[] = { + 10, 10, 15, 15, 15, 15, 20, 20, 20, 20, 20, 25, 25, 25, 30, 30, +}; +const u8 gUnk_080CF928[] = { + 30, + 60, + 60, + 90, +}; +const u8 gUnk_080CF92C[] = { + 45, + 60, + 75, + 90, +}; +const u8 gUnk_080CF930[] = { + 0, 248, 8, 0, 0, 8, 248, 0, +}; +const u16 gUnk_080CF938[] = { + 16384, 0, 16480, 1, 0, +}; diff --git a/src/projectile/octorokBossProjectile.c b/src/projectile/octorokBossProjectile.c index 1f5c8ddd..49d4b40f 100644 --- a/src/projectile/octorokBossProjectile.c +++ b/src/projectile/octorokBossProjectile.c @@ -4,7 +4,6 @@ #include "projectile.h" void OctorokBossProjectile_Action2(Entity*); -extern void sub_080AE58C(Entity*, u32, u32); extern void (*const OctorokBossProjectile_Functions[])(Entity*); extern void (*const OctorokBossProjectile_Actions[])(Entity*);