diff --git a/src/game/camdraw.c b/src/game/camdraw.c index a7977c1d3..a3ff20059 100644 --- a/src/game/camdraw.c +++ b/src/game/camdraw.c @@ -372,7 +372,7 @@ u32 var8007f8cc = (u32)&var7f1b6080; u32 var8007f8d0 = (u32)&var7f1b6088; u32 var8007f8d4 = (u32)&var7f1b6090; u32 var8007f8d8 = (u32)&var7f1b6098; -u32 var8007f8dc = 0x00000000; +struct var8007f8dc *var8007f8dc = NULL; struct var8007f8e0 *var8007f8e0 = NULL; u32 var8007f8e4 = 0x00000000; u32 var8007f8e8 = 0x00000008; @@ -1678,17 +1678,10 @@ glabel func0f14ad14 /* f14ad34: 3322ffff */ andi $v0,$t9,0xffff ); -GLOBAL_ASM( -glabel func0f14ad38 -/* f14ad38: 3c0e8008 */ lui $t6,%hi(var8007f8dc) -/* f14ad3c: 8dcef8dc */ lw $t6,%lo(var8007f8dc)($t6) -/* f14ad40: 00047980 */ sll $t7,$a0,0x6 -/* f14ad44: 01e47821 */ addu $t7,$t7,$a0 -/* f14ad48: 000f7880 */ sll $t7,$t7,0x2 -/* f14ad4c: 01cfc021 */ addu $t8,$t6,$t7 -/* f14ad50: 03e00008 */ jr $ra -/* f14ad54: 8f020060 */ lw $v0,0x60($t8) -); +s32 func0f14ad38(s32 device) +{ + return var8007f8dc[device].unk060; +} GLOBAL_ASM( glabel func0f14ad58 diff --git a/src/include/game/camdraw.h b/src/include/game/camdraw.h index 70817ecee..6dde8cebf 100644 --- a/src/include/game/camdraw.h +++ b/src/include/game/camdraw.h @@ -31,7 +31,7 @@ u32 func0f14aa70(void); u32 func0f14aac4(void); u32 func0f14ab3c(void); u32 func0f14ad14(s8 device); -u8 func0f14ad38(s8 device); +s32 func0f14ad38(s32 device); u32 func0f14ad58(void); bool func0f14aea0(s8 device); void func0f14aed0(s32 device); diff --git a/src/include/types.h b/src/include/types.h index 8935533a3..6ad795418 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -7478,4 +7478,72 @@ struct var8007f8e0 { // perfect head? /*0x3f8*/ struct fileguid fileguid; }; +struct var8007f8dc { + /*0x000*/ u32 unk000; + /*0x004*/ u32 unk004; + /*0x008*/ u32 unk008; + /*0x00c*/ u32 unk00c; + /*0x010*/ u32 unk010; + /*0x014*/ u32 unk014; + /*0x018*/ u32 unk018; + /*0x01c*/ u32 unk01c; + /*0x020*/ u32 unk020; + /*0x024*/ u32 unk024; + /*0x028*/ u32 unk028; + /*0x02c*/ u32 unk02c; + /*0x030*/ u32 unk030; + /*0x034*/ u32 unk034; + /*0x038*/ u32 unk038; + /*0x03c*/ u32 unk03c; + /*0x040*/ u32 unk040; + /*0x044*/ u32 unk044; + /*0x048*/ u32 unk048; + /*0x04c*/ u32 unk04c; + /*0x050*/ u32 unk050; + /*0x054*/ u32 unk054; + /*0x058*/ u32 unk058; + /*0x05c*/ u32 unk05c; + /*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; +}; + #endif