diff --git a/src/game/data/data_0160b0.c b/src/game/data/data_0160b0.c index 8b9ff7266..a838e8d7e 100644 --- a/src/game/data/data_0160b0.c +++ b/src/game/data/data_0160b0.c @@ -349,73 +349,17 @@ u32 var800705b0 = 0x00000000; u32 var800705b4 = 0x00000000; u32 var800705b8 = 0x00000000; u32 var800705bc = 0x00000000; -u32 var800705c0 = 0x00000140; -u32 var800705c4 = 0x000000dc; -u32 var800705c8 = 0x00000140; -u32 var800705cc = 0x3f800000; -u32 var800705d0 = 0x00000001; -u32 var800705d4 = 0x000000dc; -u32 var800705d8 = 0x00000000; -u32 var800705dc = 0x000000b4; -u32 var800705e0 = 0x00000014; -u32 var800705e4 = 0x00000088; -u32 var800705e8 = 0x0000002a; -u32 var800705ec = 0x00000280; -u32 var800705f0 = 0x000000dc; -u32 var800705f4 = 0x00000280; -u32 var800705f8 = 0x3f000000; -u32 var800705fc = 0x00000001; -u32 var80070600 = 0x000000dc; -u32 var80070604 = 0x00000000; -u32 var80070608 = 0x000000b4; -u32 var8007060c = 0x00000014; -u32 var80070610 = 0x00000088; -u32 var80070614 = 0x0000002a; -u32 var80070618 = 0x00000140; -u32 var8007061c = 0x000001e0; -u32 var80070620 = 0x00000140; -u32 var80070624 = 0x40000000; -u32 var80070628 = 0x00000002; -u32 var8007062c = 0x000001b8; -u32 var80070630 = 0x00000014; -u32 var80070634 = 0x00000168; -u32 var80070638 = 0x0000003c; -u32 var8007063c = 0x00000110; -u32 var80070640 = 0x00000068; -u32 var80070644 = 0x000001b8; -u32 var80070648 = 0x0000014a; -u32 var8007064c = 0x000001b8; -u32 var80070650 = 0x3f800000; -u32 var80070654 = 0x00000001; -u32 var80070658 = 0x0000014a; -u32 var8007065c = 0x00000000; -u32 var80070660 = 0x0000014a; -u32 var80070664 = 0x00000000; -u32 var80070668 = 0x0000014a; -u32 var8007066c = 0x00000000; -u32 var80070670 = 0x000001b8; -u32 var80070674 = 0x000000f0; -u32 var80070678 = 0x000001b8; -u32 var8007067c = 0x3f3a2e8c; -u32 var80070680 = 0x00000001; -u32 var80070684 = 0x000000dc; -u32 var80070688 = 0x00000000; -u32 var8007068c = 0x000000b4; -u32 var80070690 = 0x00000000; -u32 var80070694 = 0x00000088; -u32 var80070698 = 0x00000000; -u32 var8007069c = 0x00000190; -u32 var800706a0 = 0x0000012c; -u32 var800706a4 = 0x00000190; -u32 var800706a8 = 0x3f800000; -u32 var800706ac = 0x00000002; -u32 var800706b0 = 0x0000012c; -u32 var800706b4 = 0x00000000; -u32 var800706b8 = 0x0000012c; -u32 var800706bc = 0x00000000; -u32 var800706c0 = 0x0000012c; -u32 var800706c4 = 0x00000000; -u32 var800706c8 = 0x00000000; + +struct var800705c0 var800705c0[] = { + { 0x0000, 0x0140, 0x000000dc, 0x00000140, 0x3f800000, 0x00000001, 0x000000dc, 0x00000000, 0x000000b4, 0x00000014, 0x00000088, 0x0000002a }, + { 0x0000, 0x0280, 0x000000dc, 0x00000280, 0x3f000000, 0x00000001, 0x000000dc, 0x00000000, 0x000000b4, 0x00000014, 0x00000088, 0x0000002a }, + { 0x0000, 0x0140, 0x000001e0, 0x00000140, 0x40000000, 0x00000002, 0x000001b8, 0x00000014, 0x00000168, 0x0000003c, 0x00000110, 0x00000068 }, + { 0x0000, 0x01b8, 0x0000014a, 0x000001b8, 0x3f800000, 0x00000001, 0x0000014a, 0x00000000, 0x0000014a, 0x00000000, 0x0000014a, 0x00000000 }, + { 0x0000, 0x01b8, 0x000000f0, 0x000001b8, 0x3f3a2e8c, 0x00000001, 0x000000dc, 0x00000000, 0x000000b4, 0x00000000, 0x00000088, 0x00000000 }, + { 0x0000, 0x0190, 0x0000012c, 0x00000190, 0x3f800000, 0x00000002, 0x0000012c, 0x00000000, 0x0000012c, 0x00000000, 0x0000012c, 0x00000000 }, +}; + +s32 var800706c8 = 0; bool g_HiRes = false; u32 var800706d0 = 0x00000000; u32 var800706d4 = 0x00000000; diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index 8ef1a5235..d760dfdb2 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -6574,20 +6574,11 @@ void optionsSetHiRes(bool enable) g_HiRes = enable; } -GLOBAL_ASM( -glabel func0f0bc44c -/* f0bc44c: 3c0e8007 */ lui $t6,0x8007 -/* f0bc450: 8dce06c8 */ lw $t6,0x6c8($t6) -/* f0bc454: 3c038007 */ lui $v1,0x8007 -/* f0bc458: 000e7880 */ sll $t7,$t6,0x2 -/* f0bc45c: 01ee7823 */ subu $t7,$t7,$t6 -/* f0bc460: 000f7880 */ sll $t7,$t7,0x2 -/* f0bc464: 01ee7823 */ subu $t7,$t7,$t6 -/* f0bc468: 000f7880 */ sll $t7,$t7,0x2 -/* f0bc46c: 006f1821 */ addu $v1,$v1,$t7 -/* f0bc470: 03e00008 */ jr $ra -/* f0bc474: 846205c2 */ lh $v0,0x5c2($v1) -); +s16 func0f0bc44c(void) +{ + s16 value = var800705c0[var800706c8].unk02; + return value; +} GLOBAL_ASM( glabel func0f0bc478 diff --git a/src/include/game/data/data_0160b0.h b/src/include/game/data/data_0160b0.h index c4b612970..38fa5dc6a 100644 --- a/src/include/game/data/data_0160b0.h +++ b/src/include/game/data/data_0160b0.h @@ -54,8 +54,8 @@ extern u32 var800705b0; extern u32 var800705b4; extern u32 var800705b8; extern u32 var800705bc; -extern u32 var800705c0; -extern u32 var800706c8; +extern struct var800705c0 var800705c0[]; +extern s32 var800706c8; extern bool g_HiRes; extern u32 var8007072c; extern u32 var80070738; diff --git a/src/include/game/game_0b63b0.h b/src/include/game/game_0b63b0.h index 58479ba72..49f17ce2d 100644 --- a/src/include/game/game_0b63b0.h +++ b/src/include/game/game_0b63b0.h @@ -48,7 +48,7 @@ u32 func0f0bbf78(void); void currentPlayerSurroundWithExplosions(s32 arg0); u32 func0f0bc120(void); void func0f0bc3f0(void); -u32 func0f0bc44c(void); +s16 func0f0bc44c(void); u32 func0f0bc478(void); u32 func0f0bc4c0(void); u32 func0f0bc554(void); diff --git a/src/include/types.h b/src/include/types.h index 6a6630569..8b476906c 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -5183,4 +5183,19 @@ struct var80075c00 { f32 unk14; }; +struct var800705c0 { + u16 unk00; + s16 unk02; + u32 unk04; + u32 unk08; + u32 unk0c; + u32 unk10; + u32 unk14; + u32 unk18; + u32 unk1c; + u32 unk20; + u32 unk24; + u32 unk28; +}; + #endif