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

Merge pull request #662 from KEKW555/CustsceneType15TrueMatch 

True match CutsceneMiscObject_Type15
This commit is contained in:
Theo 2023-12-23 21:10:43 -08:00 committed by GitHub
parent 22ed1e35d7 588d7ce6d4
commit 06591e7c31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/object/cutsceneMiscObject.c
View File

@ -718,24 +718,21 @@ void CutsceneMiscObject_Type15(CutsceneMiscObjectEntity* this) {
Entity* p; Entity* p;
u16* p1; u16* p1;
u16* p2; u16* p2;
Type15Vars* tmp; u16* tmp;
if (super->action == 0) { if (super->action == 0) {
s32 i; s32 i;
u16* p;
u32 x; u32 x;
u32 y; u32 y;
super->action++; super->action++;
InitializeAnimation(super, 0); InitializeAnimation(super, 0);
// p = this->v.arr; tmp = ((CutsceneMiscObjectEntityType15*)this)->vars.arr;
asm("mov r4, r5");
asm("add r4, #0x68");
x = super->x.HALF_U.HI; x = super->x.HALF_U.HI;
y = super->y.HALF_U.HI; y = super->y.HALF_U.HI;
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
*p++ = x; *tmp++ = x;
*p++ = y; *tmp++ = y;
} }
} }
GetNextFrame(super); GetNextFrame(super);
@ -750,13 +747,13 @@ void CutsceneMiscObject_Type15(CutsceneMiscObjectEntity* this) {
} else { } else {
DeleteThisEntity(); DeleteThisEntity();
} }
tmp = &((CutsceneMiscObjectEntityType15*)this)->vars; tmp = ((CutsceneMiscObjectEntityType15*)this)->vars.arr;
MemCopy(&tmp->arr[2], &tmp->arr[0], 0x1C); MemCopy(&tmp[2], &tmp[0], 0x1C);
super->x.HALF.HI = tmp->my_x; super->x.HALF.HI = tmp[10];
super->y.HALF.HI = tmp->my_y; super->y.HALF.HI = tmp[11];
super->z.HALF.HI = p->z.HALF.HI; super->z.HALF.HI = p->z.HALF.HI;
tmp->parent_x = p->x.HALF.HI; tmp[14] = p->x.HALF.HI;
tmp->parent_y = p->y.HALF.HI; tmp[15] = p->y.HALF.HI;
} }
void sub_08095754(CutsceneMiscObjectEntity* this) { void sub_08095754(CutsceneMiscObjectEntity* this) {