From 489718049fa500ad9131f45d9be73075bae33159 Mon Sep 17 00:00:00 2001 From: Tal Hayon Date: Sun, 8 Jan 2023 16:27:00 +0200 Subject: [PATCH] Match sub_08068578 (By TraceEntertains) --- .../zeldaFollower/sub_08068578.inc | 127 ----------------- src/npc/zeldaFollower.c | 134 +++++++++++++++++- 2 files changed, 132 insertions(+), 129 deletions(-) delete mode 100644 asm/non_matching/zeldaFollower/sub_08068578.inc diff --git a/asm/non_matching/zeldaFollower/sub_08068578.inc b/asm/non_matching/zeldaFollower/sub_08068578.inc deleted file mode 100644 index dea71d3a..00000000 --- a/asm/non_matching/zeldaFollower/sub_08068578.inc +++ /dev/null @@ -1,127 +0,0 @@ - .syntax unified - push {r4, r5, r6, r7, lr} - mov r7, sl - mov r6, sb - mov r5, r8 - push {r5, r6, r7} - adds r7, r0, #0 - ldr r4, _08068664 @ =gPlayerEntity - ldrh r1, [r4, #0x2e] - ldr r3, _08068668 @ =0xFFFF0000 - adds r0, r3, #0 - ands r0, r5 - orrs r0, r1 - ldrh r1, [r4, #0x32] - lsls r1, r1, #0x10 - ldr r2, _0806866C @ =0x0000FFFF - ands r0, r2 - adds r5, r0, #0 - orrs r5, r1 - ldrh r0, [r4, #0x36] - ands r3, r6 - orrs r3, r0 - ldr r0, _08068670 @ =gPlayerState - adds r0, #0xa8 - ldrb r0, [r0] - lsls r0, r0, #0x10 - ldr r2, _08068674 @ =0xFF00FFFF - ands r2, r3 - orrs r2, r0 - ldrb r1, [r4, #0x14] - movs r0, #0x3f - ands r1, r0 - lsls r1, r1, #0x18 - ldr r0, _08068678 @ =0xC0FFFFFF - ands r0, r2 - orrs r0, r1 - adds r1, r4, #0 - adds r1, #0x38 - ldrb r1, [r1] - lsls r1, r1, #0x1e - ldr r2, _0806867C @ =0x3FFFFFFF - ands r0, r2 - adds r6, r0, #0 - orrs r6, r1 - movs r0, #0x2e - ldrsh r1, [r4, r0] - movs r2, #0x2e - ldrsh r0, [r7, r2] - subs r1, r1, r0 - mov sl, r1 - movs r0, #0x32 - ldrsh r1, [r4, r0] - movs r2, #0x32 - ldrsh r0, [r7, r2] - subs r1, r1, r0 - mov r8, r1 - mov r1, sl - lsls r0, r1, #0x10 - asrs r0, r0, #0x10 - movs r1, #0x14 - bl FixedDiv - lsls r0, r0, #0x10 - asrs r0, r0, #0x10 - mov sl, r0 - mov r2, r8 - lsls r0, r2, #0x10 - asrs r0, r0, #0x10 - movs r1, #0x14 - bl FixedDiv - lsls r0, r0, #0x10 - asrs r0, r0, #0x10 - mov r8, r0 - ldr r3, [r7, #0x64] - movs r0, #0 - mov sb, r0 - mov ip, r0 - movs r4, #0x13 -_08068614: - mov r1, ip - asrs r0, r1, #8 - subs r0, r5, r0 - strh r0, [r3] - lsrs r0, r5, #0x10 - mov r2, sb - asrs r1, r2, #8 - subs r0, r0, r1 - strh r0, [r3, #2] - strh r6, [r3, #4] - lsrs r0, r6, #0x10 - strb r0, [r3, #6] - ldrb r0, [r7, #0x14] - movs r1, #0x3f - ands r1, r0 - ldrb r2, [r3, #7] - movs r0, #0x40 - rsbs r0, r0, #0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3, #7] - adds r1, r7, #0 - adds r1, #0x38 - ldrb r1, [r1] - lsls r1, r1, #6 - movs r2, #0x3f - ands r0, r2 - orrs r0, r1 - strb r0, [r3, #7] - adds r3, #8 - add sb, r8 - add ip, sl - subs r4, #1 - cmp r4, #0 - bge _08068614 - pop {r3, r4, r5} - mov r8, r3 - mov sb, r4 - mov sl, r5 - pop {r4, r5, r6, r7, pc} - .align 2, 0 -_08068664: .4byte gPlayerEntity -_08068668: .4byte 0xFFFF0000 -_0806866C: .4byte 0x0000FFFF -_08068670: .4byte gPlayerState -_08068674: .4byte 0xFF00FFFF -_08068678: .4byte 0xC0FFFFFF -_0806867C: .4byte 0x3FFFFFFF - .syntax divided diff --git a/src/npc/zeldaFollower.c b/src/npc/zeldaFollower.c index 04153f4a..ae67fcba 100644 --- a/src/npc/zeldaFollower.c +++ b/src/npc/zeldaFollower.c @@ -3,6 +3,17 @@ #include "functions.h" #include "common.h" +typedef struct { + u16 x; + u16 y; + u16 z; + u8 framestate; + u8 animationState : 6; + u8 collisionLayer : 2; +} ZeldaFollowerItem; + +typedef ZeldaFollowerItem ZeldaFollowerHeap[20]; + void sub_08068318(Entity*); void sub_0806854C(Entity*, u32*); void sub_08068578(Entity* this); @@ -28,7 +39,7 @@ void ZeldaFollower(Entity* this) { ASM_FUNC("asm/non_matching/zeldaFollower/sub_08068318.inc", void sub_08068318(Entity* this)) void sub_0806854C(Entity* this, u32* none) { - this->myHeap = zMalloc(0xa0); + this->myHeap = zMalloc(sizeof(ZeldaFollowerHeap)); if (this->myHeap != NULL) { this->field_0x68.HALF.LO = 1; sub_080788E0(this); @@ -37,7 +48,126 @@ void sub_0806854C(Entity* this, u32* none) { } } -ASM_FUNC("asm/non_matching/zeldaFollower/sub_08068578.inc", void sub_08068578(Entity* this)) +void sub_08068578(Entity* this) { + ZeldaFollowerItem* item; + s32 index; +#ifdef REWRITE_CODE + u32 r0; + u32 r1; + u32 r2; + u32 r3; + u32 r5; + u32 r6; + u32 r8; + s32 y; + u32 r10; + s32 x; +#else + register u32 r5 asm("r5"); + register u32 r6 asm("r6"); + register u32 r0 asm("r0"); + register u32 r1 asm("r1"); + register u32 r2 asm("r2"); + register u32 r3 asm("r3"); + register s32 r8 asm("r8"); + register s32 y asm("r9"); + register s32 r10 asm("r10"); + register s32 x asm("r12"); +#endif + + // first u32 (r5) +#ifdef REWRITE_CODE + r0 = gPlayerEntity.x.HALF_U.HI | (r5 & 0xffff0000); + r5 = (gPlayerEntity.y.HALF_U.HI << 0x10) | (r0 & 0x0000ffff); +#else + r1 = gPlayerEntity.x.HALF_U.HI; + + r3 = 0xffff0000; + r0 = r3; + r0 &= r5; + r0 |= r1; + + r1 = gPlayerEntity.y.HALF_U.HI; + r1 <<= 0x10; + r2 = 0xffff; + r0 &= r2; + r0 |= r1; + r5 = r0; +#endif + + // second u32 (r6) +#ifdef REWRITE_CODE + r3 = gPlayerEntity.z.HALF_U.HI | (r6 & 0xffff0000); + r2 = (gPlayerState.framestate << 0x10) | (r3 & 0xff00ffff); + r0 = ((gPlayerEntity.animationState & 0x3f) << 0x18) | (r2 & 0xc0ffffff); + r6 = (gPlayerEntity.collisionLayer << 0x1e) | (r0 & 0x3fffffff); +#else + r0 = gPlayerEntity.z.HALF_U.HI; + r3 &= r6; + r3 |= r0; + + r0 = gPlayerState.framestate; + r0 <<= 0x10; + r2 = 0xff00ffff; + r2 &= r3; + r2 |= r0; + + r1 = gPlayerEntity.animationState; + r0 = 0x3f; + r1 &= r0; + r1 <<= 0x18; + r0 = 0xc0ffffff; + r0 &= r2; + r0 |= r1; + + // gPlayerEntity is now at r1 + r1 = gPlayerEntity.collisionLayer; + r1 <<= 0x1e; + r2 = 0x3fffffff; + r0 &= r2; + r0 |= r1; + r6 = r0; +#endif + +#ifdef REWRITE_CODE + r10 = gPlayerEntity.x.HALF.HI - this->x.HALF.HI; +#else + r1 = gPlayerEntity.x.HALF.HI; + r0 = this->x.HALF.HI; + r0 = r1 - r0; + r10 = r0; +#endif + +#ifdef REWRITE_CODE + r8 = gPlayerEntity.y.HALF.HI - this->y.HALF.HI; +#else + r1 = gPlayerEntity.y.HALF.HI; + r0 = this->y.HALF.HI; + r0 = r1 - r0; + r8 = r0; +#endif + + r10 = FixedDiv(r10, 0x14); + r8 = FixedDiv(r8, 0x14); + + item = this->myHeap; + y = 0; + x = 0; + + // Down here the u32 are suddendly accessed correctly as u16 and bitfields? + // How are the results of above u32 calculations used? + for (index = 0x13; index >= 0; index--) { + item->x = r5 - (x >> 8); + item->y = (r5 >> 0x10) - (y >> 8); + item->z = r6; + item->framestate = r6 >> 0x10; + item->animationState = this->animationState & 0x3f; + item->collisionLayer = this->collisionLayer; + item++; + y = y + r8; + x = x + r10; + } +} void ZeldaFollower_Hide(Entity* zelda, Entity* follower) { follower->field_0x68.HALF.LO = 0;