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

EnSw OK (#1283) 

* EnSw OK

Decompiled the last remaining function.

* Update src/overlays/actors/ovl_En_Sw/z_en_sw.c

Add FAKE comment.

Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>

---------

Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
This commit is contained in:
StickyThwomp 2023-06-12 11:57:33 -05:00 committed by GitHub
parent 21671975ec
commit 196f9dba52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spec
View File

@ -1107,11 +1107,7 @@ beginseg
name "ovl_En_Sw" name "ovl_En_Sw"
compress compress
include "build/src/overlays/actors/ovl_En_Sw/z_en_sw.o" include "build/src/overlays/actors/ovl_En_Sw/z_en_sw.o"
#ifdef NON_MATCHING include "build/src/overlays/actors/ovl_En_Sw/ovl_En_Sw_reloc.o"
include "build/src/overlays/actors/ovl_En_Sw/ovl_En_Sw_reloc.o"
#else
include "build/data/ovl_En_Sw/ovl_En_Sw.reloc.o"
#endif
endseg endseg
beginseg beginseg

9
src/overlays/actors/ovl_En_Sw/z_en_sw.c
View File

@ -358,7 +358,6 @@ s32 func_808D9440(PlayState* play, Vec3f* posA, Vec3f* posB, Vec3f* posResult, C
return ret; return ret;
} }
#ifdef NON_MATCHING
void func_808D94D0(EnSw* this, PlayState* play, s32 arg2, s32 arg3, s16 arg4) { void func_808D94D0(EnSw* this, PlayState* play, s32 arg2, s32 arg3, s16 arg4) {
CollisionPoly* spA4; CollisionPoly* spA4;
CollisionPoly* spA0; CollisionPoly* spA0;
@ -412,7 +411,6 @@ void func_808D94D0(EnSw* this, PlayState* play, s32 arg2, s32 arg3, s16 arg4) {
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
if (i == 0) { if (i == 0) {
if (this && this && this) {}
sp84.x = sp90.x - (this->unk_350.x * temp_f20); sp84.x = sp90.x - (this->unk_350.x * temp_f20);
sp84.y = sp90.y - (this->unk_350.y * temp_f20); sp84.y = sp90.y - (this->unk_350.y * temp_f20);
sp84.z = sp90.z - (this->unk_350.z * temp_f20); sp84.z = sp90.z - (this->unk_350.z * temp_f20);
@ -433,6 +431,9 @@ void func_808D94D0(EnSw* this, PlayState* play, s32 arg2, s32 arg3, s16 arg4) {
break; break;
} }
} }
//! FAKE
if (i == 3) {}
} }
func_808D93BC(this); func_808D93BC(this);
@ -448,10 +449,6 @@ void func_808D94D0(EnSw* this, PlayState* play, s32 arg2, s32 arg3, s16 arg4) {
Actor_MoveWithoutGravity(&this->actor); Actor_MoveWithoutGravity(&this->actor);
} }
} }
#else
void func_808D94D0(EnSw* this, PlayState* play, s32 arg2, s32 arg3, s16 arg4);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Sw/func_808D94D0.s")
#endif
void func_808D9894(EnSw* this, Vec3f* vec) { void func_808D9894(EnSw* this, Vec3f* vec) {
Vec3f sp5C; Vec3f sp5C;