From 3f5539ebe3b553523aae81e97c26742fc08bf3ea Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 3 Oct 2021 21:23:16 +1000 Subject: [PATCH] Attempt to decompile func0f14f510 --- src/game/camdraw.c | 29 ++++++++ src/include/game/camdraw.h | 2 +- src/include/types.h | 139 +------------------------------------ 3 files changed, 33 insertions(+), 137 deletions(-) diff --git a/src/game/camdraw.c b/src/game/camdraw.c index 38ce93ea2..fead8d512 100644 --- a/src/game/camdraw.c +++ b/src/game/camdraw.c @@ -4403,6 +4403,35 @@ glabel var7f1b7364 /* f14f6fc: 27bd0060 */ addiu $sp,$sp,0x60 ); +//void func0f14f510(s32 arg0) +//{ +// s32 i; +// s32 j; +// +// for (i = 0; i < 8; i++) { +// s32 tmp = (i + 1) * arg0 + 1; +// +// for (j = 0; j < 8; j++) { +// var800a45a0->unk06c[i * 8 + j] = tmp + j * arg0; +// } +// } +// +// var800a45a0->unk010 = 0; +// var800a45a0->unk00c = 0; +// +// for (i = 0; i < 8; i++) { +// var800a45a0->unk17c[i] = 1 / sqrtf(8); +// var800a45a0->unk27c[i * 8] = var800a45a0->unk17c[i]; +// } +// +// for (i = 1; i < 8; i++) { +// for (j = 0; j < 8; j++) { +// var800a45a0->unk17c[i * 8 + j] = sqrtf(0.25f) * cosf(((1 + j * 2) * M_PI * i) / 16.0f); +// var800a45a0->unk27c[j * 8 + i] = var800a45a0->unk17c[i * 8 + j]; +// } +// } +//} + GLOBAL_ASM( glabel func0f14f700 /* f14f700: 24ce001f */ addiu $t6,$a2,0x1f diff --git a/src/include/game/camdraw.h b/src/include/game/camdraw.h index 2bb23ab9e..7b3911da2 100644 --- a/src/include/game/camdraw.h +++ b/src/include/game/camdraw.h @@ -74,7 +74,7 @@ s32 func0f14f008(s32 index); Gfx *func0f14f07c(Gfx *gdl, s32 headorbodynum, s32 x1, s32 y1, s32 x2, s32 y2); void func0f14f4b8(struct var8007f8e0 *arg0); void func0f14f4e4(struct var8007f8e0 *arg0); -void func0f14f510(u32 arg0); +void func0f14f510(s32 arg0); u32 func0f14f700(void); u32 func0f14f76c(struct var8007f8e0 *arg0, u32 arg1); u32 func0f14f7d4(void); diff --git a/src/include/types.h b/src/include/types.h index 7229a9635..9493d7048 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -7150,82 +7150,12 @@ struct var800a45a0 { /*0x060*/ u32 unk060; /*0x064*/ u32 unk064; /*0x068*/ u32 unk068; - /*0x06c*/ u32 unk06c; - /*0x070*/ u32 unk070; - /*0x074*/ u32 unk074; - /*0x078*/ u32 unk078; - /*0x07c*/ u32 unk07c; - /*0x080*/ u32 unk080; - /*0x084*/ u32 unk084; - /*0x088*/ u32 unk088; - /*0x08c*/ u32 unk08c; - /*0x090*/ u32 unk090; - /*0x094*/ u32 unk094; - /*0x098*/ u32 unk098; - /*0x09c*/ u32 unk09c; - /*0x0a0*/ u32 unk0a0; - /*0x0a4*/ u32 unk0a4; - /*0x0a8*/ u32 unk0a8; - /*0x0ac*/ u32 unk0ac; - /*0x0b0*/ u32 unk0b0; - /*0x0b4*/ u32 unk0b4; - /*0x0b8*/ u32 unk0b8; - /*0x0bc*/ u32 unk0bc; - /*0x0c0*/ u32 unk0c0; - /*0x0c4*/ u32 unk0c4; - /*0x0c8*/ u32 unk0c8; - /*0x0cc*/ u32 unk0cc; - /*0x0d0*/ u32 unk0d0; - /*0x0d4*/ u32 unk0d4; - /*0x0d8*/ u32 unk0d8; - /*0x0dc*/ u32 unk0dc; - /*0x0e0*/ u32 unk0e0; - /*0x0e4*/ u32 unk0e4; - /*0x0e8*/ u32 unk0e8; - /*0x0ec*/ u32 unk0ec; - /*0x0f0*/ u32 unk0f0; - /*0x0f4*/ u32 unk0f4; - /*0x0f8*/ u32 unk0f8; - /*0x0fc*/ u32 unk0fc; - /*0x100*/ u32 unk100; - /*0x104*/ u32 unk104; - /*0x108*/ u32 unk108; - /*0x10c*/ u32 unk10c; - /*0x110*/ u32 unk110; - /*0x114*/ u32 unk114; - /*0x118*/ u32 unk118; - /*0x11c*/ u32 unk11c; - /*0x120*/ u32 unk120; - /*0x124*/ u32 unk124; - /*0x128*/ u32 unk128; - /*0x12c*/ u32 unk12c; - /*0x130*/ u32 unk130; - /*0x134*/ u32 unk134; - /*0x138*/ u32 unk138; - /*0x13c*/ u32 unk13c; - /*0x140*/ u32 unk140; - /*0x144*/ u32 unk144; - /*0x148*/ u32 unk148; - /*0x14c*/ u32 unk14c; - /*0x150*/ u32 unk150; - /*0x154*/ u32 unk154; - /*0x158*/ u32 unk158; - /*0x15c*/ u32 unk15c; - /*0x160*/ u32 unk160; - /*0x164*/ u32 unk164; - /*0x168*/ u32 unk168; + /*0x06c*/ u32 unk06c[64]; /*0x16c*/ u32 unk16c; /*0x170*/ u32 unk170; /*0x174*/ u32 unk174; /*0x178*/ u32 unk178; - /*0x17c*/ u32 unk17c; - /*0x180*/ u32 unk180; - /*0x184*/ u32 unk184; - /*0x188*/ u32 unk188; - /*0x18c*/ u32 unk18c; - /*0x190*/ u32 unk190; - /*0x194*/ u32 unk194; - /*0x198*/ u32 unk198; + /*0x17c*/ f32 unk17c[8]; /*0x19c*/ u32 unk19c; /*0x1a0*/ u32 unk1a0; /*0x1a4*/ u32 unk1a4; @@ -7282,70 +7212,7 @@ struct var800a45a0 { /*0x270*/ u32 unk270; /*0x274*/ u32 unk274; /*0x278*/ u32 unk278; - /*0x27c*/ u32 unk27c; - /*0x280*/ u32 unk280; - /*0x284*/ u32 unk284; - /*0x288*/ u32 unk288; - /*0x28c*/ u32 unk28c; - /*0x290*/ u32 unk290; - /*0x294*/ u32 unk294; - /*0x298*/ u32 unk298; - /*0x29c*/ u32 unk29c; - /*0x2a0*/ u32 unk2a0; - /*0x2a4*/ u32 unk2a4; - /*0x2a8*/ u32 unk2a8; - /*0x2ac*/ u32 unk2ac; - /*0x2b0*/ u32 unk2b0; - /*0x2b4*/ u32 unk2b4; - /*0x2b8*/ u32 unk2b8; - /*0x2bc*/ u32 unk2bc; - /*0x2c0*/ u32 unk2c0; - /*0x2c4*/ u32 unk2c4; - /*0x2c8*/ u32 unk2c8; - /*0x2cc*/ u32 unk2cc; - /*0x2d0*/ u32 unk2d0; - /*0x2d4*/ u32 unk2d4; - /*0x2d8*/ u32 unk2d8; - /*0x2dc*/ u32 unk2dc; - /*0x2e0*/ u32 unk2e0; - /*0x2e4*/ u32 unk2e4; - /*0x2e8*/ u32 unk2e8; - /*0x2ec*/ u32 unk2ec; - /*0x2f0*/ u32 unk2f0; - /*0x2f4*/ u32 unk2f4; - /*0x2f8*/ u32 unk2f8; - /*0x2fc*/ u32 unk2fc; - /*0x300*/ u32 unk300; - /*0x304*/ u32 unk304; - /*0x308*/ u32 unk308; - /*0x30c*/ u32 unk30c; - /*0x310*/ u32 unk310; - /*0x314*/ u32 unk314; - /*0x318*/ u32 unk318; - /*0x31c*/ u32 unk31c; - /*0x320*/ u32 unk320; - /*0x324*/ u32 unk324; - /*0x328*/ u32 unk328; - /*0x32c*/ u32 unk32c; - /*0x330*/ u32 unk330; - /*0x334*/ u32 unk334; - /*0x338*/ u32 unk338; - /*0x33c*/ u32 unk33c; - /*0x340*/ u32 unk340; - /*0x344*/ u32 unk344; - /*0x348*/ u32 unk348; - /*0x34c*/ u32 unk34c; - /*0x350*/ u32 unk350; - /*0x354*/ u32 unk354; - /*0x358*/ u32 unk358; - /*0x35c*/ u32 unk35c; - /*0x360*/ u32 unk360; - /*0x364*/ u32 unk364; - /*0x368*/ u32 unk368; - /*0x36c*/ u32 unk36c; - /*0x370*/ u32 unk370; - /*0x374*/ u32 unk374; - /*0x378*/ u32 unk378; + /*0x27c*/ f32 unk27c[64]; /*0x37c*/ s32 unk37c; /*0x380*/ u8 *unk380[1]; /*0x384*/ u32 unk384;