diff --git a/asm/object/object43.s b/asm/object/object43.s deleted file mode 100644 index 24d96cfa..00000000 --- a/asm/object/object43.s +++ /dev/null @@ -1,499 +0,0 @@ - .include "asm/macros.inc" - - .include "constants/constants.inc" - - .syntax unified - - .text - - - thumb_func_start Object43 -Object43: @ 0x0808DED0 - push {lr} - ldr r2, _0808DEE4 @ =gUnk_081217BC - ldrb r1, [r0, #0xc] - lsls r1, r1, #2 - adds r1, r1, r2 - ldr r1, [r1] - bl _call_via_r1 - pop {pc} - .align 2, 0 -_0808DEE4: .4byte gUnk_081217BC - - thumb_func_start sub_0808DEE8 -sub_0808DEE8: @ 0x0808DEE8 - push {r4, r5, lr} - adds r5, r0, #0 - movs r4, #0 - movs r0, #1 - strb r0, [r5, #0xc] - ldrb r1, [r5, #0x10] - movs r0, #0x20 - orrs r0, r1 - strb r0, [r5, #0x10] - adds r2, r5, #0 - adds r2, #0x29 - ldrb r1, [r2] - movs r0, #8 - rsbs r0, r0, #0 - ands r0, r1 - strb r0, [r2] - ldr r3, _0808DF74 @ =gPlayerEntity - ldrb r1, [r3, #0x1b] - lsrs r1, r1, #6 - lsls r1, r1, #6 - ldrb r2, [r5, #0x1b] - movs r0, #0x3f - ands r0, r2 - orrs r0, r1 - strb r0, [r5, #0x1b] - ldrb r0, [r3, #0x14] - lsrs r0, r0, #1 - strb r0, [r5, #0x14] - adds r0, #1 - movs r1, #3 - ands r0, r1 - lsls r0, r0, #3 - strb r0, [r5, #0x15] - movs r3, #6 - movs r0, #6 - strb r0, [r5, #0xf] - movs r0, #0xa0 - lsls r0, r0, #1 - strh r0, [r5, #0x24] - adds r1, r5, #0 - adds r1, #0x60 - movs r0, #0x3c - strh r0, [r1] - ldrb r1, [r5, #0x1a] - movs r2, #0x10 - rsbs r2, r2, #0 - adds r0, r2, #0 - ands r0, r1 - movs r1, #4 - orrs r0, r1 - strb r0, [r5, #0x1a] - adds r0, r5, #0 - adds r0, #0x72 - strh r4, [r0] - subs r0, #6 - strh r4, [r0] - ldrb r0, [r5, #0x11] - ands r2, r0 - orrs r2, r3 - strb r2, [r5, #0x11] - adds r0, r5, #0 - movs r1, #7 - bl InitializeAnimation - ldrb r0, [r5, #0xb] - cmp r0, #0 - beq _0808DF78 - movs r0, #0x28 - strb r0, [r5, #0xe] - b _0808DFAA - .align 2, 0 -_0808DF74: .4byte gPlayerEntity -_0808DF78: - ldrb r1, [r5, #0x18] - movs r0, #4 - rsbs r0, r0, #0 - ands r0, r1 - movs r1, #1 - orrs r0, r1 - strb r0, [r5, #0x18] - ldr r0, _0808DF9C @ =gPlayerState - adds r0, #0xac - ldrh r1, [r0] - movs r0, #0x80 - lsls r0, r0, #2 - ands r0, r1 - cmp r0, #0 - beq _0808DFA0 - movs r0, #0x28 - b _0808DFA2 - .align 2, 0 -_0808DF9C: .4byte gPlayerState -_0808DFA0: - movs r0, #0x50 -_0808DFA2: - strb r0, [r5, #0xe] - adds r0, r5, #0 - bl sub_0808DFAC -_0808DFAA: - pop {r4, r5, pc} - - thumb_func_start sub_0808DFAC -sub_0808DFAC: @ 0x0808DFAC - push {r4, r5, r6, r7, lr} - adds r4, r0, #0 - ldrb r0, [r4, #0xb] - cmp r0, #0 - beq _0808E00E - ldr r1, _0808DFF0 @ =gPlayerState - adds r0, r1, #0 - adds r0, #0x21 - ldrb r0, [r0] - cmp r0, #0 - beq _0808DFCC - ldrb r1, [r1, #4] - movs r0, #0x80 - ands r0, r1 - cmp r0, #0 - beq _0808DFD0 -_0808DFCC: - bl DeleteThisEntity -_0808DFD0: - ldr r0, _0808DFF0 @ =gPlayerState - adds r2, r0, #0 - adds r2, #0x21 - ldrb r0, [r2] - cmp r0, #0x4f - bls _0808DFF8 - ldrb r0, [r4, #0x18] - movs r1, #4 - rsbs r1, r1, #0 - ands r1, r0 - movs r0, #1 - orrs r1, r0 - strb r1, [r4, #0x18] - ldrb r6, [r2] - ldr r7, _0808DFF4 @ =gUnk_081217D8 - b _0808E038 - .align 2, 0 -_0808DFF0: .4byte gPlayerState -_0808DFF4: .4byte gUnk_081217D8 -_0808DFF8: - cmp r0, #0 - beq _0808E008 - ldrb r1, [r4, #0x18] - movs r0, #4 - rsbs r0, r0, #0 - ands r0, r1 - strb r0, [r4, #0x18] - b _0808E1BA -_0808E008: - bl DeleteThisEntity - b _0808E038 -_0808E00E: - ldr r5, _0808E02C @ =gPlayerState - ldrb r0, [r5, #4] - cmp r0, #0 - bne _0808E01A - bl DeleteThisEntity -_0808E01A: - ldrb r1, [r5, #0x1b] - movs r0, #1 - ands r0, r1 - cmp r0, #0 - beq _0808E034 - ldrb r6, [r5, #0x1b] - ldr r7, _0808E030 @ =gUnk_081217D0 - b _0808E038 - .align 2, 0 -_0808E02C: .4byte gPlayerState -_0808E030: .4byte gUnk_081217D0 -_0808E034: - bl DeleteThisEntity -_0808E038: - cmp r6, #0 - bne _0808E03E - b _0808E1B6 -_0808E03E: - adds r0, r4, #0 - bl GetNextFrame - ldrb r0, [r4, #0xe] - cmp r0, #0 - beq _0808E084 - subs r0, #1 - strb r0, [r4, #0xe] - movs r2, #3 - ldrb r0, [r4, #0xb] - cmp r0, #0 - bne _0808E068 - ldr r0, _0808E080 @ =gPlayerState - adds r0, #0xac - ldrh r1, [r0] - movs r0, #0x80 - lsls r0, r0, #2 - ands r0, r1 - cmp r0, #0 - bne _0808E068 - movs r2, #7 -_0808E068: - ldrb r0, [r4, #0xe] - ands r0, r2 - adds r5, r4, #0 - adds r5, #0x6c - adds r6, r4, #0 - adds r6, #0x38 - cmp r0, #0 - bne _0808E0E4 - ldrh r0, [r5] - adds r0, #1 - strh r0, [r5] - b _0808E0E4 - .align 2, 0 -_0808E080: .4byte gPlayerState -_0808E084: - adds r5, r4, #0 - adds r5, #0x72 - ldrh r0, [r5] - cmp r0, #0 - beq _0808E0BC - ldr r0, _0808E0B8 @ =gRoomTransition - ldr r1, [r0] - movs r0, #0x1f - ands r1, r0 - subs r5, #6 - adds r6, r4, #0 - adds r6, #0x38 - cmp r1, #0 - bne _0808E0E4 - adds r0, r4, #0 - movs r1, #7 - movs r2, #0 - bl CreateFx - cmp r0, #0 - beq _0808E0E4 - ldrb r1, [r6] - adds r0, #0x38 - strb r1, [r0] - b _0808E0E4 - .align 2, 0 -_0808E0B8: .4byte gRoomTransition -_0808E0BC: - ldr r0, _0808E140 @ =0x00000115 - bl EnqueueSFX - adds r0, r4, #0 - movs r1, #0x12 - movs r2, #0 - bl CreateFx - adds r6, r4, #0 - adds r6, #0x38 - cmp r0, #0 - beq _0808E0DA - ldrb r1, [r6] - adds r0, #0x38 - strb r1, [r0] -_0808E0DA: - ldrh r0, [r5] - adds r0, #1 - strh r0, [r5] - adds r5, r4, #0 - adds r5, #0x6c -_0808E0E4: - ldr r2, _0808E144 @ =gPlayerEntity - ldrb r1, [r2, #0x19] - lsrs r1, r1, #6 - lsls r1, r1, #6 - ldrb r3, [r4, #0x19] - movs r0, #0x3f - ands r0, r3 - orrs r0, r1 - strb r0, [r4, #0x19] - ldrb r0, [r4, #0x14] - lsls r0, r0, #1 - adds r0, r7, r0 - ldrb r0, [r0] - lsls r0, r0, #0x18 - asrs r0, r0, #0x18 - ldrh r1, [r2, #0x2e] - adds r0, r0, r1 - strh r0, [r4, #0x2e] - ldrb r0, [r4, #0x14] - lsls r0, r0, #1 - adds r0, r0, r7 - ldrb r0, [r0, #1] - lsls r0, r0, #0x18 - asrs r0, r0, #0x18 - ldrh r1, [r2, #0x32] - adds r0, r0, r1 - strh r0, [r4, #0x32] - ldrh r0, [r2, #0x36] - strh r0, [r4, #0x36] - adds r2, #0x38 - ldrb r0, [r2] - strb r0, [r6] - ldrb r0, [r4, #0x14] - cmp r0, #1 - beq _0808E148 - cmp r0, #1 - ble _0808E136 - cmp r0, #2 - beq _0808E150 - cmp r0, #3 - beq _0808E15A -_0808E136: - ldrh r0, [r4, #0x32] - ldrh r1, [r5] - subs r0, r0, r1 - strh r0, [r4, #0x32] - b _0808E162 - .align 2, 0 -_0808E140: .4byte 0x00000115 -_0808E144: .4byte gPlayerEntity -_0808E148: - ldrh r0, [r5] - ldrh r1, [r4, #0x2e] - adds r0, r0, r1 - b _0808E160 -_0808E150: - ldrh r0, [r5] - ldrh r1, [r4, #0x32] - adds r0, r0, r1 - strh r0, [r4, #0x32] - b _0808E162 -_0808E15A: - ldrh r0, [r4, #0x2e] - ldrh r1, [r5] - subs r0, r0, r1 -_0808E160: - strh r0, [r4, #0x2e] -_0808E162: - ldrb r0, [r4, #0xf] - subs r0, #1 - strb r0, [r4, #0xf] - lsls r0, r0, #0x18 - cmp r0, #0 - bne _0808E17A - movs r0, #6 - strb r0, [r4, #0xf] - ldrb r0, [r4, #0x15] - movs r1, #0x10 - eors r0, r1 - strb r0, [r4, #0x15] -_0808E17A: - adds r0, r4, #0 - bl LinearMoveUpdate - ldrb r0, [r4, #0xb] - cmp r0, #0 - bne _0808E1BA - ldr r0, _0808E1AC @ =gPlayerState - ldrb r1, [r0, #0x1b] - movs r0, #0x40 - ands r0, r1 - cmp r0, #0 - beq _0808E1BA - ldrb r0, [r4, #0x10] - movs r1, #0xdf - ands r1, r0 - strb r1, [r4, #0x10] - movs r0, #6 - bl GetInventoryValue - cmp r0, #1 - bne _0808E1B0 - ldrb r0, [r4, #0xc] - adds r0, #1 - strb r0, [r4, #0xc] - b _0808E1BA - .align 2, 0 -_0808E1AC: .4byte gPlayerState -_0808E1B0: - bl DeleteThisEntity - b _0808E1BA -_0808E1B6: - bl DeleteThisEntity -_0808E1BA: - pop {r4, r5, r6, r7, pc} - - thumb_func_start sub_0808E1BC -sub_0808E1BC: @ 0x0808E1BC - push {r4, lr} - adds r4, r0, #0 - bl sub_08079BD8 - ldrb r0, [r4, #0xc] - adds r0, #1 - movs r2, #0 - strb r0, [r4, #0xc] - ldrb r1, [r4, #0x18] - movs r0, #4 - rsbs r0, r0, #0 - ands r0, r1 - movs r1, #1 - orrs r0, r1 - strb r0, [r4, #0x18] - ldr r0, _0808E204 @ =gPlayerEntity - ldrb r0, [r0, #0x14] - strb r0, [r4, #0x14] - adds r0, r4, #0 - adds r0, #0x60 - strh r2, [r0] - ldrb r1, [r4, #0x1a] - movs r0, #0x10 - rsbs r0, r0, #0 - ands r0, r1 - movs r1, #4 - orrs r0, r1 - strb r0, [r4, #0x1a] - movs r0, #0xaf - strh r0, [r4, #0x12] - ldrb r1, [r4, #0x14] - lsrs r1, r1, #1 - adds r0, r4, #0 - bl InitializeAnimation - pop {r4, pc} - .align 2, 0 -_0808E204: .4byte gPlayerEntity - - thumb_func_start sub_0808E208 -sub_0808E208: @ 0x0808E208 - push {r4, lr} - adds r4, r0, #0 - bl sub_08079BD8 - adds r0, r4, #0 - bl GetNextFrame - ldr r0, _0808E240 @ =gPlayerState - ldrb r0, [r0, #0x1b] - cmp r0, #0 - beq _0808E248 - ldr r0, _0808E244 @ =gRoomTransition - ldr r0, [r0] - movs r1, #3 - ands r0, r1 - cmp r0, #0 - bne _0808E24C - ldrb r2, [r4, #0x1a] - lsls r1, r2, #0x1c - lsrs r1, r1, #0x1c - movs r0, #4 - eors r1, r0 - subs r0, #0x14 - ands r0, r2 - orrs r0, r1 - strb r0, [r4, #0x1a] - b _0808E24C - .align 2, 0 -_0808E240: .4byte gPlayerState -_0808E244: .4byte gRoomTransition -_0808E248: - bl DeleteThisEntity -_0808E24C: - adds r0, r4, #0 - adds r0, #0x5a - ldrb r1, [r0] - movs r0, #1 - ands r0, r1 - cmp r0, #0 - beq _0808E260 - ldrb r0, [r4, #0xc] - adds r0, #1 - strb r0, [r4, #0xc] -_0808E260: - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_0808E264 -sub_0808E264: @ 0x0808E264 - push {r4, lr} - adds r4, r0, #0 - bl GetNextFrame - adds r4, #0x5a - ldrb r1, [r4] - movs r0, #0x80 - ands r0, r1 - cmp r0, #0 - beq _0808E27C - bl DeleteThisEntity -_0808E27C: - pop {r4, pc} - .align 2, 0 diff --git a/assets/assets.json b/assets/assets.json index 410ef933..4f09547f 100644 --- a/assets/assets.json +++ b/assets/assets.json @@ -43663,16 +43663,6 @@ "size": 36, "type": "animation" }, - { - "path": "object43/gUnk_081217D0.bin", - "start": 1185744, - "size": 8 - }, - { - "path": "object43/gUnk_081217D8.bin", - "start": 1185752, - "size": 8 - }, { "path": "animations/gSpriteAnimations_Object44_0.bin", "start": 1186708, diff --git a/data/const/object/object43.s b/data/const/object/object43.s deleted file mode 100644 index 3ea091fe..00000000 --- a/data/const/object/object43.s +++ /dev/null @@ -1,18 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_081217BC:: @ 081217BC - .4byte sub_0808DEE8 - .4byte sub_0808DFAC - .4byte sub_0808E1BC - .4byte sub_0808E208 - .4byte sub_0808E264 - -gUnk_081217D0:: @ 081217D0 - .incbin "object43/gUnk_081217D0.bin" - -gUnk_081217D8:: @ 081217D8 - .incbin "object43/gUnk_081217D8.bin" diff --git a/include/object.h b/include/object.h index 83933d73..34937cac 100644 --- a/include/object.h +++ b/include/object.h @@ -293,7 +293,7 @@ void GiantLeaf(Entity*); void Fairy(); void LadderUp(Entity*); void Object42(Entity*); -void Object43(Entity*); +void Object43(); void Object44(Entity*); void Object45(Entity*); void GiantBookLadder(Entity*); diff --git a/linker.ld b/linker.ld index 93cf0e43..4d951206 100644 --- a/linker.ld +++ b/linker.ld @@ -712,7 +712,7 @@ SECTIONS { src/object/fairy.o(.text); asm/object/ladderUp.o(.text); asm/object/object42.o(.text); - asm/object/object43.o(.text); + src/object/object43.o(.text); asm/object/object44.o(.text); asm/object/object45.o(.text); src/object/giantBookLadder.o(.text); @@ -1446,7 +1446,7 @@ SECTIONS { data/const/object/giantLeaf.o(.rodata); src/object/fairy.o(.rodata); data/const/object/object42.o(.rodata); - data/const/object/object43.o(.rodata); + src/object/object43.o(.rodata); data/animations/object/object43.o(.rodata); data/const/object/object44.o(.rodata); data/animations/object/object44.o(.rodata); diff --git a/src/entity.c b/src/entity.c index 7d6b0344..864b9482 100644 --- a/src/entity.c +++ b/src/entity.c @@ -16,7 +16,6 @@ void ClearAllDeletedEntities(void); void DeleteAllEntities(void); void sub_0805E98C(void); extern void sub_0806FE84(Entity*); -extern void sub_08078954(Entity*); extern void sub_08017744(Entity*); extern void UnloadHitbox(Entity*); extern void sub_0804AA1C(Entity*); diff --git a/src/object/object43.c b/src/object/object43.c new file mode 100644 index 00000000..f123d0bc --- /dev/null +++ b/src/object/object43.c @@ -0,0 +1,203 @@ +/** + * @file object43.c + * @ingroup Objects + * + * @brief Object43 object + */ + +#define NENT_DEPRECATED +#include "global.h" +#include "object.h" +#include "functions.h" +#include "item.h" + +typedef struct { + /*0x00*/ Entity base; + /*0x68*/ u8 unk_68[4]; + /*0x6c*/ u16 unk_6c; + /*0x6e*/ u8 unk_7e[4]; + /*0x72*/ u16 unk_72; +} Object43Entity; + +void Object43_Init(Object43Entity*); +void Object43_Action1(Object43Entity*); +void Object43_Action2(Object43Entity*); +void Object43_Action3(Object43Entity*); +void Object43_Action4(Object43Entity*); + +void Object43(Object43Entity* this) { + static void (*const Object43_Actions[])(Object43Entity*) = { + Object43_Init, Object43_Action1, Object43_Action2, Object43_Action3, Object43_Action4, + }; + Object43_Actions[super->action](this); +} + +void Object43_Init(Object43Entity* this) { + super->action = 1; + super->flags |= ENT_PERSIST; + super->spritePriority.b0 = 0; + super->spriteOrientation.flipY = gPlayerEntity.spriteOrientation.flipY; + super->animationState = gPlayerEntity.animationState >> 1; + super->direction = (((super->animationState + 1) & 3) << 3); + super->field_0xf = 6; + super->speed = 0x140; + super->spriteVramOffset = 0x3c; + super->palette.b.b0 = 4; + this->unk_72 = 0; + this->unk_6c = 0; + super->updatePriority = 6; + InitializeAnimation(super, 7); + if (super->type2 != 0) { + super->actionDelay = 0x28; + } else { + super->spriteSettings.draw = 1; + if ((gPlayerState.field_0xac & 0x200) != 0) { + super->actionDelay = 0x28; + } else { + super->actionDelay = 0x50; + } + + Object43_Action1(this); + } +} + +void Object43_Action1(Object43Entity* this) { + static const s8 gUnk_081217D0[] = { -1, -14, 8, -4, 4, 4, -8, -4 }; + static const s8 gUnk_081217D8[] = { -1, -14, 4, -4, 4, -1, -4, -4 }; + Entity* effect; + const s8* ptr; + const s8* ptr2; + u32 tmp1; + u32 tmp2; + + if (super->type2 != 0) { + if ((gPlayerState.field_0x1f[2] == 0) || ((gPlayerState.field_0x3[1] & 0x80) != 0)) { + DeleteThisEntity(); + } + if (gPlayerState.field_0x1f[2] >= 0x50) { + super->spriteSettings.draw = 1; + tmp1 = gPlayerState.field_0x1f[2]; + ptr = gUnk_081217D8; + } else { + if (gPlayerState.field_0x1f[2] != 0) { + super->spriteSettings.draw = 0; + return; + } + DeleteThisEntity(); + } + } else { + if (gPlayerState.field_0x3[1] == 0) { + DeleteThisEntity(); + } + if ((gPlayerState.sword_state & 1) != 0) { + tmp1 = gPlayerState.sword_state; + ptr = gUnk_081217D0; + } else { + DeleteThisEntity(); + } + } + if (tmp1 != 0) { + + GetNextFrame(super); + if (super->actionDelay != 0) { + super->actionDelay--; + tmp2 = 3; + if ((super->type2 == 0) && ((gPlayerState.field_0xac & 0x200) == 0)) { + tmp2 = 7; + } + if ((super->actionDelay & tmp2) == 0) { + this->unk_6c++; + } + } else { + if (this->unk_72 != 0) { + if (((gRoomTransition.frameCount & 0x1fU) == 0) && + (effect = CreateFx(super, FX_SPARKLE, 0), effect != NULL)) { + effect->collisionLayer = super->collisionLayer; + } + } else { + EnqueueSFX(SFX_115); + effect = CreateFx(super, FX_BLUE_SPARKLE, 0); + if (effect != NULL) { + effect->collisionLayer = super->collisionLayer; + } + this->unk_72++; + } + } + + super->spriteRendering.b3 = gPlayerEntity.spriteRendering.b3; + ptr2 = &ptr[super->animationState * 2]; + super->x.HALF.HI = ptr2[0] + gPlayerEntity.x.HALF.HI; + super->y.HALF.HI = ptr[super->animationState * 2 + 1] + gPlayerEntity.y.HALF.HI; + super->z.HALF.HI = gPlayerEntity.z.HALF.HI; + super->collisionLayer = gPlayerEntity.collisionLayer; + switch (super->animationState) { + default: + super->y.HALF.HI -= this->unk_6c; + break; + case 0: + super->y.HALF.HI -= this->unk_6c; + break; + case 1: + super->x.HALF.HI += this->unk_6c; + break; + case 2: + super->y.HALF.HI += this->unk_6c; + break; + case 3: + super->x.HALF.HI -= this->unk_6c; + break; + } + + if (--super->field_0xf == 0) { + super->field_0xf = 6; + super->direction ^= 0x10; + } + LinearMoveUpdate(super); + if ((super->type2 == 0) && ((gPlayerState.sword_state & 0x40) != 0)) { + super->flags &= ~ENT_PERSIST; + if (GetInventoryValue(ITEM_FOURSWORD) == 1) { + super->action++; + } else { + DeleteThisEntity(); + } + } + } else { + DeleteThisEntity(); + return; + } +} + +void Object43_Action2(Object43Entity* this) { + sub_08079BD8(super); + super->action += 1; + super->spriteSettings.draw = 1; + super->animationState = gPlayerEntity.animationState; + super->spriteVramOffset = 0; + super->palette.b.b0 = 4; + super->spriteIndex = 0xaf; + InitializeAnimation(super, super->animationState >> 1); +} + +void Object43_Action3(Object43Entity* this) { + sub_08079BD8(super); + GetNextFrame(super); + if (gPlayerState.sword_state != 0) { + if ((gRoomTransition.frameCount & 3U) == 0) { + u32 tmp = super->palette.b.b0; + tmp ^= 4; + super->palette.b.b0 = tmp; + } + } else { + DeleteThisEntity(); + } + if ((super->frame & 1) != 0) { + super->action++; + } +} + +void Object43_Action4(Object43Entity* this) { + GetNextFrame(super); + if ((super->frame & 0x80) != 0) { + DeleteThisEntity(); + } +} diff --git a/src/playerItem/playerItemBomb.c b/src/playerItem/playerItemBomb.c index 785793de..c7bdd7cb 100644 --- a/src/playerItem/playerItemBomb.c +++ b/src/playerItem/playerItemBomb.c @@ -3,14 +3,11 @@ #include "functions.h" extern void (*const gUnk_080B77C8[])(Entity*); -extern void sub_08078954(Entity*); void sub_0801B418(Entity*); void sub_0801B3A4(Entity*); extern void (*const gUnk_080B77D8[])(Entity*); -extern void sub_08079BD8(Entity*); - void PlayerItemBomb(Entity* this) { u8 uVar1, uVar2; diff --git a/src/playerItem/playerItemC.c b/src/playerItem/playerItemC.c index f376fdd2..d1e857ff 100644 --- a/src/playerItem/playerItemC.c +++ b/src/playerItem/playerItemC.c @@ -3,7 +3,6 @@ #include "player.h" #include "functions.h" -extern void sub_08079BD8(Entity*); extern Entity* sub_08008782(Entity*, u32, s32, s32); void sub_0801B8FC(Entity*); diff --git a/src/projectile/dirtBallProjectile.c b/src/projectile/dirtBallProjectile.c index bda5e1a2..81970ad1 100644 --- a/src/projectile/dirtBallProjectile.c +++ b/src/projectile/dirtBallProjectile.c @@ -5,8 +5,6 @@ #include "coord.h" #include "functions.h" -extern void sub_08078954(Entity*); - extern void (*const DirtBallProjectile_Functions[])(Entity*); extern void (*const DirtBallProjectile_Actions[])(Entity*); extern const Hitbox3D gUnk_08129764;