falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

True match sub_08068578 (#683)

This commit is contained in:
KEKW555 2024-01-01 04:43:39 +05:30 committed by GitHub
parent 65cbb00669
commit 72c27b5393
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

157
src/npc/zeldaFollower.c
View File

@ -15,7 +15,7 @@ typedef union {
struct { struct {
u16 x; u16 x;
u16 y; u16 y;
u16 z; s16 z;
u8 framestate; u8 framestate;
u8 animationState : 6; u8 animationState : 6;
u8 collisionLayer : 2; u8 collisionLayer : 2;
@ -41,7 +41,7 @@ typedef union {
void sub_08068318(ZeldaFollowerEntity*); void sub_08068318(ZeldaFollowerEntity*);
void sub_0806854C(ZeldaFollowerEntity*, u32*); void sub_0806854C(ZeldaFollowerEntity*, u32*);
void sub_08068578(Entity* this); void sub_08068578(ZeldaFollowerEntity* this);
void ZeldaFollower(ZeldaFollowerEntity* this) { void ZeldaFollower(ZeldaFollowerEntity* this) {
if (super->action == 0) { if (super->action == 0) {
@ -63,7 +63,6 @@ void ZeldaFollower(ZeldaFollowerEntity* this) {
void sub_08068318(ZeldaFollowerEntity* this) { void sub_08068318(ZeldaFollowerEntity* this) {
s32 dist; s32 dist;
s16 z;
u32 animIndex; u32 animIndex;
u32 animIndexTmp; u32 animIndexTmp;
@ -85,7 +84,7 @@ void sub_08068318(ZeldaFollowerEntity* this) {
super->x.HALF.HI = gPlayerEntity.base.x.HALF.HI; super->x.HALF.HI = gPlayerEntity.base.x.HALF.HI;
super->y.HALF.HI = gPlayerEntity.base.y.HALF.HI; super->y.HALF.HI = gPlayerEntity.base.y.HALF.HI;
super->spriteSettings.draw = 1; super->spriteSettings.draw = 1;
sub_08068578(super); sub_08068578(this);
} }
animIndex = 0; animIndex = 0;
@ -100,9 +99,8 @@ void sub_08068318(ZeldaFollowerEntity* this) {
} }
} else { } else {
heapPtr += ZELDA_FOLLOWER_HEAP_LEN - 1; heapPtr += ZELDA_FOLLOWER_HEAP_LEN - 1;
z = heapPtr->FIELDS.z;
if (z < 0) { if (heapPtr->FIELDS.z < 0) {
ZELDA_FOLLOWER_HEAP_SHIFT_RIGHT(super, heapPtr); ZELDA_FOLLOWER_HEAP_SHIFT_RIGHT(super, heapPtr);
animIndex = 0x4; animIndex = 0x4;
} else { } else {
@ -154,128 +152,41 @@ void sub_0806854C(ZeldaFollowerEntity* this, u32* none) {
this->unk_68 = 1; this->unk_68 = 1;
RemoveInteractableObject(super); RemoveInteractableObject(super);
super->hitbox = NULL; super->hitbox = NULL;
sub_08068578(super); sub_08068578(this);
} }
} }
void sub_08068578(Entity* this) { void sub_08068578(ZeldaFollowerEntity* this) {
ZeldaFollowerItem* item; s32 dx, dy;
s32 index; s32 i;
#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) ZeldaFollowerItem *heapPtr, item;
#ifdef REWRITE_CODE
r0 = gPlayerEntity.base.x.HALF_U.HI | (r5 & 0xffff0000);
r5 = (gPlayerEntity.base.y.HALF_U.HI << 0x10) | (r0 & 0x0000ffff);
#else
r1 = gPlayerEntity.base.x.HALF_U.HI;
r3 = 0xffff0000; // Copy from the player's position/state.
r0 = r3; item.FIELDS.x = gPlayerEntity.base.x.HALF_U.HI;
r0 &= r5; item.FIELDS.y = gPlayerEntity.base.y.HALF_U.HI;
r0 |= r1; item.FIELDS.z = gPlayerEntity.base.z.HALF_U.HI;
item.FIELDS.framestate = gPlayerState.framestate;
item.FIELDS.animationState = gPlayerEntity.base.animationState;
item.FIELDS.collisionLayer = gPlayerEntity.base.collisionLayer;
r1 = gPlayerEntity.base.y.HALF_U.HI; // Compute the distance between zelda and the player.
r1 <<= 0x10; dx = gPlayerEntity.base.x.HALF.HI - super->x.HALF.HI;
r2 = 0xffff; dy = gPlayerEntity.base.y.HALF.HI - super->y.HALF.HI;
r0 &= r2;
r0 |= r1;
r5 = r0;
#endif
// second u32 (r6) // Divide it into ZELDA_FOLLOWER_HEAP_LEN increments.
#ifdef REWRITE_CODE dx = FixedDiv(dx, ZELDA_FOLLOWER_HEAP_LEN);
r3 = gPlayerEntity.base.z.HALF_U.HI | (r6 & 0xffff0000); dy = FixedDiv(dy, ZELDA_FOLLOWER_HEAP_LEN);
r2 = (gPlayerState.framestate << 0x10) | (r3 & 0xff00ffff);
r0 = ((gPlayerEntity.base.animationState & 0x3f) << 0x18) | (r2 & 0xc0ffffff);
r6 = (gPlayerEntity.base.collisionLayer << 0x1e) | (r0 & 0x3fffffff);
#else
r0 = gPlayerEntity.base.z.HALF_U.HI;
r3 &= r6;
r3 |= r0;
r0 = gPlayerState.framestate; heapPtr = ZELDA_FOLLOWER_HEAP;
r0 <<= 0x10; for (i = 0; i < ZELDA_FOLLOWER_HEAP_LEN; i++) {
r2 = 0xff00ffff; heapPtr->FIELDS.x = item.FIELDS.x - ((i * dx) >> 8);
r2 &= r3; heapPtr->FIELDS.y = item.FIELDS.y - ((i * dy) >> 8);
r2 |= r0; heapPtr->FIELDS.z = item.FIELDS.z;
heapPtr->FIELDS.framestate = item.FIELDS.framestate;
r1 = gPlayerEntity.base.animationState; heapPtr->FIELDS.animationState = super->animationState;
r0 = 0x3f; heapPtr->FIELDS.collisionLayer = super->collisionLayer;
r1 &= r0; heapPtr++;
r1 <<= 0x18;
r0 = 0xc0ffffff;
r0 &= r2;
r0 |= r1;
// gPlayerEntity.base.is now at r1
r1 = gPlayerEntity.base.collisionLayer;
r1 <<= 0x1e;
r2 = 0x3fffffff;
r0 &= r2;
r0 |= r1;
r6 = r0;
#endif
#ifdef REWRITE_CODE
r10 = gPlayerEntity.base.x.HALF.HI - this->x.HALF.HI;
#else
r1 = gPlayerEntity.base.x.HALF.HI;
r0 = this->x.HALF.HI;
r0 = r1 - r0;
r10 = r0;
#endif
#ifdef REWRITE_CODE
r8 = gPlayerEntity.base.y.HALF.HI - this->y.HALF.HI;
#else
r1 = gPlayerEntity.base.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->FIELDS.x = r5 - (x >> 8);
item->FIELDS.y = (r5 >> 0x10) - (y >> 8);
item->FIELDS.z = r6;
item->FIELDS.framestate = r6 >> 0x10;
item->FIELDS.animationState = this->animationState & 0x3f;
item->FIELDS.collisionLayer = this->collisionLayer;
item++;
y = y + r8;
x = x + r10;
} }
} }
@ -288,11 +199,11 @@ void ZeldaFollower_Show(Entity* zelda, ZeldaFollowerEntity* follower) {
follower->unk_68 = 1; follower->unk_68 = 1;
follower->base.spriteSettings.draw = 1; follower->base.spriteSettings.draw = 1;
follower->base.animationState = zelda->animationState; follower->base.animationState = zelda->animationState;
sub_08068578(&follower->base); sub_08068578(follower);
InitAnimationForceUpdate(&follower->base, follower->base.animationState / 2); InitAnimationForceUpdate(&follower->base, follower->base.animationState / 2);
} }
void sub_080686C4(Entity* zelda, Entity* follower) { void sub_080686C4(Entity* zelda, ZeldaFollowerEntity* follower) {
follower->y.HALF.HI -= 0x10; follower->base.y.HALF.HI -= 0x10;
sub_08068578(follower); sub_08068578(follower);
} }