From fe676802fad0783f24967446fbf95e0ebbdb3486 Mon Sep 17 00:00:00 2001 From: angie Date: Sun, 17 Jan 2021 21:25:11 -0300 Subject: [PATCH] void func_8099D8E0(EffDust *this) Signed-off-by: angie --- .../actors/ovl_Eff_Dust/func_8099D8E0.s | 31 ------------------- src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c | 16 ++++++++-- src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h | 7 +++-- 3 files changed, 19 insertions(+), 35 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099D8E0.s diff --git a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099D8E0.s b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099D8E0.s deleted file mode 100644 index 6a76aff8be..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099D8E0.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_8099D8E0 -/* 00010 8099D8E0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00014 8099D8E4 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 00018 8099D8E8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0001C 8099D8EC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00020 8099D8F0 00801825 */ or $v1, $a0, $zero ## $v1 = 00000000 -/* 00024 8099D8F4 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00028 8099D8F8 24060040 */ addiu $a2, $zero, 0x0040 ## $a2 = 00000040 -.L8099D8FC: -/* 0002C 8099D8FC E4600254 */ swc1 $f0, 0x0254($v1) ## 00000254 -/* 00030 8099D900 E4600250 */ swc1 $f0, 0x0250($v1) ## 00000250 -/* 00034 8099D904 E460024C */ swc1 $f0, 0x024C($v1) ## 0000024C -/* 00038 8099D908 E4A2014C */ swc1 $f2, 0x014C($a1) ## 0000014C -/* 0003C 8099D90C E4600258 */ swc1 $f0, 0x0258($v1) ## 00000258 -/* 00040 8099D910 E460025C */ swc1 $f0, 0x025C($v1) ## 0000025C -/* 00044 8099D914 E4600260 */ swc1 $f0, 0x0260($v1) ## 00000260 -/* 00048 8099D918 E4A20150 */ swc1 $f2, 0x0150($a1) ## 00000150 -/* 0004C 8099D91C E4600264 */ swc1 $f0, 0x0264($v1) ## 00000264 -/* 00050 8099D920 E4600268 */ swc1 $f0, 0x0268($v1) ## 00000268 -/* 00054 8099D924 E460026C */ swc1 $f0, 0x026C($v1) ## 0000026C -/* 00058 8099D928 E4A20154 */ swc1 $f2, 0x0154($a1) ## 00000154 -/* 0005C 8099D92C E4600270 */ swc1 $f0, 0x0270($v1) ## 00000270 -/* 00060 8099D930 E4600274 */ swc1 $f0, 0x0274($v1) ## 00000274 -/* 00064 8099D934 E4600278 */ swc1 $f0, 0x0278($v1) ## 00000278 -/* 00068 8099D938 24420004 */ addiu $v0, $v0, 0x0004 ## $v0 = 00000004 -/* 0006C 8099D93C E4A20158 */ swc1 $f2, 0x0158($a1) ## 00000158 -/* 00070 8099D940 24630030 */ addiu $v1, $v1, 0x0030 ## $v1 = 00000030 -/* 00074 8099D944 1446FFED */ bne $v0, $a2, .L8099D8FC -/* 00078 8099D948 24A50010 */ addiu $a1, $a1, 0x0010 ## $a1 = 00000010 -/* 0007C 8099D94C 03E00008 */ jr $ra -/* 00080 8099D950 A080054C */ sb $zero, 0x054C($a0) ## 0000054C diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c index 69793fd7a1..38a0e5a990 100644 --- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c @@ -9,7 +9,7 @@ void EffDust_Destroy(Actor* thisx, GlobalContext* globalCtx); void EffDust_Update(Actor* thisx, GlobalContext* globalCtx); void EffDust_Draw(Actor* thisx, GlobalContext* globalCtx); -s32 func_8099D8E0(EffDust* this); +void func_8099D8E0(EffDust* this); f32 func_8099DB28(EffDust* this, GlobalContext* globalCtx); f32 func_8099DD74(EffDust* this, GlobalContext* globalCtx); @@ -45,7 +45,19 @@ void EffDust_setDrawFunc(EffDust* this, EffDustActionFunc callback_drawFunc) { } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099D8E0.s") +void func_8099D8E0(EffDust *this) { + s32 i; + for (i = 0; i != 0x40; i++) { + this->unk_024C[i].z = 0.0f; + this->unk_024C[i].y = 0.0f; + this->unk_024C[i].x = 0.0f; + + this->unk_014C[i] = 1.0f; + } + + this->unk_054C = 0; +} + //#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Eff_Dust/EffDust_Init.s") diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h index e19c39ca05..b3748bb572 100644 --- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h @@ -10,9 +10,11 @@ typedef f32 (*EffDustActionFunc)(struct EffDust *, GlobalContext *); typedef struct EffDust { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x401]; + /* 0x014C */ f32 unk_014C[0x40]; + /* 0x024C */ Vec3f unk_024C[0x40]; + /* 0x054C */ u8 unk_054C; /* 0x054D */ u8 unk_054D; - /* 0x054E */ char unk_54E[0x02]; + /* 0x054E */ char unk_054E[0x0002]; /* 0x0550 */ f32 unk_0550; /* 0x0554 */ f32 unk_0554; /* 0x0558 */ f32 unk_0558; @@ -21,6 +23,7 @@ typedef struct EffDust { /* 0x0560 */ EffDustActionFunc drawFunc; } EffDust; // size = 0x0568 + extern const ActorInit Eff_Dust_InitVars; #endif