diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index d3c501720..ecbfb39e6 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -27087,7 +27087,7 @@ glabel func0f034524 /* f0359fc: 25f80001 */ addiu $t8,$t7,0x1 /* f035a00: a21802ff */ sb $t8,0x2ff($s0) .L0f035a04: -/* f035a04: 0fc5b364 */ jal func0f16cd90 +/* f035a04: 0fc5b364 */ jal getVar80084014 /* f035a08: 00000000 */ sll $zero,$zero,0x0 /* f035a0c: 14400005 */ bnez $v0,.L0f035a24 /* f035a10: 8fad00f4 */ lw $t5,0xf4($sp) diff --git a/src/game/game_000920.c b/src/game/game_000920.c index 36763cb22..f5d7b3127 100644 --- a/src/game/game_000920.c +++ b/src/game/game_000920.c @@ -6128,7 +6128,7 @@ glabel func0f005bb0 /* f005e5c: 31ae0001 */ andi $t6,$t5,0x1 /* f005e60: 11c0003c */ beqz $t6,.L0f005f54 /* f005e64: 00000000 */ sll $zero,$zero,0x0 -/* f005e68: 0fc5b364 */ jal func0f16cd90 +/* f005e68: 0fc5b364 */ jal getVar80084014 /* f005e6c: 00000000 */ sll $zero,$zero,0x0 /* f005e70: 14400038 */ bnez $v0,.L0f005f54 /* f005e74: 3c08800a */ lui $t0,0x800a diff --git a/src/game/game_066310.c b/src/game/game_066310.c index 33de7996f..64225be23 100644 --- a/src/game/game_066310.c +++ b/src/game/game_066310.c @@ -10910,7 +10910,7 @@ glabel func0f06e87c /* f06e924: 3406ffff */ dli $a2,0xffff /* f06e928: 0fc249af */ jal func0f0926bc /* f06e92c: 8e040014 */ lw $a0,0x14($s0) -/* f06e930: 0fc5b364 */ jal func0f16cd90 +/* f06e930: 0fc5b364 */ jal getVar80084014 /* f06e934: 00000000 */ sll $zero,$zero,0x0 /* f06e938: 1440001f */ bnez $v0,.L0f06e9b8 /* f06e93c: 3c01bf80 */ lui $at,0xbf80 @@ -23571,7 +23571,7 @@ GLOBAL_ASM( glabel func0f079f1c /* f079f1c: 27bdfe68 */ addiu $sp,$sp,-408 /* f079f20: afbf0044 */ sw $ra,0x44($sp) -/* f079f24: 0fc5b364 */ jal func0f16cd90 +/* f079f24: 0fc5b364 */ jal getVar80084014 /* f079f28: afa40198 */ sw $a0,0x198($sp) /* f079f2c: 14400363 */ bnez $v0,.L0f07acbc /* f079f30: 8fae0198 */ lw $t6,0x198($sp) @@ -29383,7 +29383,7 @@ glabel func0f07e758 /* f07f29c: 24050001 */ addiu $a1,$zero,0x1 /* f07f2a0: 1580002a */ bnez $t4,.L0f07f34c /* f07f2a4: 00000000 */ sll $zero,$zero,0x0 -/* f07f2a8: 0fc5b364 */ jal func0f16cd90 +/* f07f2a8: 0fc5b364 */ jal getVar80084014 /* f07f2ac: 00000000 */ sll $zero,$zero,0x0 /* f07f2b0: 54400037 */ bnezl $v0,.L0f07f390 /* f07f2b4: 92020003 */ lbu $v0,0x3($s0) @@ -49032,7 +49032,7 @@ glabel func0f09054c /* f090714: 8d089900 */ lw $t0,-0x6700($t0) /* f090718: 15000016 */ bnez $t0,.L0f090774 /* f09071c: 00000000 */ sll $zero,$zero,0x0 -/* f090720: 0fc5b364 */ jal func0f16cd90 +/* f090720: 0fc5b364 */ jal getVar80084014 /* f090724: 00000000 */ sll $zero,$zero,0x0 /* f090728: 14400012 */ bnez $v0,.L0f090774 /* f09072c: 24090037 */ addiu $t1,$zero,0x37 @@ -49516,7 +49516,7 @@ glabel func0f090db4 .L0f090e24: /* f090e24: 240500a3 */ addiu $a1,$zero,0xa3 .L0f090e28: -/* f090e28: 0fc5b364 */ jal func0f16cd90 +/* f090e28: 0fc5b364 */ jal getVar80084014 /* f090e2c: a7a50036 */ sh $a1,0x36($sp) /* f090e30: 14400057 */ bnez $v0,.L0f090f90 /* f090e34: 87a50036 */ lh $a1,0x36($sp) @@ -49864,7 +49864,7 @@ glabel func0f0912dc /* f0912e4: afa40200 */ sw $a0,0x200($sp) /* f0912e8: afa50204 */ sw $a1,0x204($sp) /* f0912ec: afa60208 */ sw $a2,0x208($sp) -/* f0912f0: 0fc5b364 */ jal func0f16cd90 +/* f0912f0: 0fc5b364 */ jal getVar80084014 /* f0912f4: afa7020c */ sw $a3,0x20c($sp) /* f0912f8: 1440029e */ bnez $v0,.L0f091d74 /* f0912fc: 8fa30208 */ lw $v1,0x208($sp) @@ -51960,7 +51960,7 @@ glabel func0f092c04 /* f093034: afa50048 */ sw $a1,0x48($sp) .L0f093038: /* f093038: afa80040 */ sw $t0,0x40($sp) -/* f09303c: 0fc5b364 */ jal func0f16cd90 +/* f09303c: 0fc5b364 */ jal getVar80084014 /* f093040: e7b2003c */ swc1 $f18,0x3c($sp) /* f093044: 3c09800a */ lui $t1,%hi(g_Vars) /* f093048: 25299fc0 */ addiu $t1,$t1,%lo(g_Vars) diff --git a/src/game/game_0b28d0.c b/src/game/game_0b28d0.c index 289532e20..686e1b3e0 100644 --- a/src/game/game_0b28d0.c +++ b/src/game/game_0b28d0.c @@ -13144,7 +13144,7 @@ glabel func0f0bd904 /* f0bdf40: 2411ffd8 */ addiu $s1,$zero,-40 /* f0bdf44: a611024c */ sh $s1,0x24c($s0) .L0f0bdf48: -/* f0bdf48: 0fc5b364 */ jal func0f16cd90 +/* f0bdf48: 0fc5b364 */ jal getVar80084014 /* f0bdf4c: 2411ffd8 */ addiu $s1,$zero,-40 /* f0bdf50: 50400004 */ beqzl $v0,.L0f0bdf64 /* f0bdf54: 8e700284 */ lw $s0,0x284($s3) @@ -14929,7 +14929,7 @@ glabel func0f0bd904 /* f0bf960: 8d440070 */ lw $a0,0x70($t2) /* f0bf964: 00028600 */ sll $s0,$v0,0x18 /* f0bf968: 00105e03 */ sra $t3,$s0,0x18 -/* f0bf96c: 0fc5b364 */ jal func0f16cd90 +/* f0bf96c: 0fc5b364 */ jal getVar80084014 /* f0bf970: 01608025 */ or $s0,$t3,$zero /* f0bf974: 1440002c */ bnez $v0,.L0f0bfa28 /* f0bf978: 8fad0330 */ lw $t5,0x330($sp) diff --git a/src/game/game_0c79f0.c b/src/game/game_0c79f0.c index f7f33f613..3ec804ec3 100644 --- a/src/game/game_0c79f0.c +++ b/src/game/game_0c79f0.c @@ -1881,7 +1881,7 @@ glabel func0f0c8b90 /* f0c91f4: 8e4c0284 */ lw $t4,0x284($s2) /* f0c91f8: ad8b0120 */ sw $t3,0x120($t4) .L0f0c91fc: -/* f0c91fc: 0fc5b364 */ jal func0f16cd90 +/* f0c91fc: 0fc5b364 */ jal getVar80084014 /* f0c9200: 00000000 */ sll $zero,$zero,0x0 /* f0c9204: 54400243 */ bnezl $v0,.L0f0c9b14 /* f0c9208: 8e450284 */ lw $a1,0x284($s2) @@ -2667,7 +2667,7 @@ glabel func0f0c8b90 /* f0c9cec: 8e480284 */ lw $t0,0x284($s2) /* f0c9cf0: ad190120 */ sw $t9,0x120($t0) .L0f0c9cf4: -/* f0c9cf4: 0fc5b364 */ jal func0f16cd90 +/* f0c9cf4: 0fc5b364 */ jal getVar80084014 /* f0c9cf8: 00000000 */ sll $zero,$zero,0x0 /* f0c9cfc: 544002ba */ bnezl $v0,.L0f0ca7e8 /* f0c9d00: 8e450284 */ lw $a1,0x284($s2) diff --git a/src/game/game_0d1fe0.c b/src/game/game_0d1fe0.c index 5e72c4ab7..40dd003de 100644 --- a/src/game/game_0d1fe0.c +++ b/src/game/game_0d1fe0.c @@ -551,7 +551,7 @@ glabel func0f0d26ac /* f0d2738: 14400011 */ bnez $v0,.L0f0d2780 /* f0d273c: 8fa70060 */ lw $a3,0x60($sp) .L0f0d2740: -/* f0d2740: 0fc5b364 */ jal func0f16cd90 +/* f0d2740: 0fc5b364 */ jal getVar80084014 /* f0d2744: 00000000 */ sll $zero,$zero,0x0 /* f0d2748: 1440000d */ bnez $v0,.L0f0d2780 /* f0d274c: 8fa70060 */ lw $a3,0x60($sp) diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c index be74ecf34..0a4712d30 100644 --- a/src/game/game_0dcdb0.c +++ b/src/game/game_0dcdb0.c @@ -7270,7 +7270,7 @@ glabel func0f0df364 .L0f0df75c: /* f0df75c: 55600038 */ bnezl $t3,.L0f0df840 /* f0df760: 9602001c */ lhu $v0,0x1c($s0) -/* f0df764: 0fc5b364 */ jal func0f16cd90 +/* f0df764: 0fc5b364 */ jal getVar80084014 /* f0df768: 00000000 */ sll $zero,$zero,0x0 /* f0df76c: 54400034 */ bnezl $v0,.L0f0df840 /* f0df770: 9602001c */ lhu $v0,0x1c($s0) diff --git a/src/game/game_129900.c b/src/game/game_129900.c index 3f9646a4f..d12104b71 100644 --- a/src/game/game_129900.c +++ b/src/game/game_129900.c @@ -9896,7 +9896,7 @@ glabel func0f131a30 /* f131b9c: 46083282 */ mul.s $f10,$f6,$f8 /* f131ba0: 4600540d */ trunc.w.s $f16,$f10 /* f131ba4: 44118000 */ mfc1 $s1,$f16 -/* f131ba8: 0fc5b364 */ jal func0f16cd90 +/* f131ba8: 0fc5b364 */ jal getVar80084014 /* f131bac: 00000000 */ sll $zero,$zero,0x0 /* f131bb0: 10400002 */ beqz $v0,.L0f131bbc /* f131bb4: 00000000 */ sll $zero,$zero,0x0 diff --git a/src/game/game_1668e0.c b/src/game/game_1668e0.c index 0b483ba6a..c1de4fc35 100644 --- a/src/game/game_1668e0.c +++ b/src/game/game_1668e0.c @@ -6030,7 +6030,7 @@ glabel func0f16b96c /* f16bb34: 5420ffde */ bnezl $at,.L0f16bab0 /* f16bb38: 8cce0064 */ lw $t6,0x64($a2) .L0f16bb3c: -/* f16bb3c: 0fc5b364 */ jal func0f16cd90 +/* f16bb3c: 0fc5b364 */ jal getVar80084014 /* f16bb40: 00000000 */ sll $zero,$zero,0x0 /* f16bb44: 10400003 */ beqz $v0,.L0f16bb54 /* f16bb48: 00000000 */ sll $zero,$zero,0x0 @@ -6759,7 +6759,7 @@ glabel func0f16b96c /* f16c57c: 8e0d0000 */ lw $t5,0x0($s0) /* f16c580: 55a00019 */ bnezl $t5,.L0f16c5e8 /* f16c584: 8e8d0034 */ lw $t5,0x34($s4) -/* f16c588: 0fc5b364 */ jal func0f16cd90 +/* f16c588: 0fc5b364 */ jal getVar80084014 /* f16c58c: 00000000 */ sll $zero,$zero,0x0 /* f16c590: 14400014 */ bnez $v0,.L0f16c5e4 /* f16c594: 3c0e8008 */ lui $t6,0x8008 @@ -7294,12 +7294,10 @@ glabel func0f16cd40 /* f16cd8c: ac2f4014 */ sw $t7,0x4014($at) ); -GLOBAL_ASM( -glabel func0f16cd90 -/* f16cd90: 3c028008 */ lui $v0,0x8008 -/* f16cd94: 03e00008 */ jr $ra -/* f16cd98: 8c424014 */ lw $v0,0x4014($v0) -); +u32 getVar80084014(void) +{ + return var80084014; +} s32 getDifficulty(void) { @@ -7320,37 +7318,33 @@ glabel func0f16cda8 /* f16cdc4: ac244020 */ sw $a0,0x4020($at) ); -GLOBAL_ASM( -glabel func0f16cdc8 -/* f16cdc8: 3c018008 */ lui $at,0x8008 -/* f16cdcc: 03e00008 */ jr $ra -/* f16cdd0: ac244028 */ sw $a0,0x4028($at) -); +void setVar80084028(u32 arg0) +{ + var80084028 = arg0; +} -GLOBAL_ASM( -glabel func0f16cdd4 -/* f16cdd4: 3c018008 */ lui $at,0x8008 -/* f16cdd8: 03e00008 */ jr $ra -/* f16cddc: ac24402c */ sw $a0,0x402c($at) -); +void setVar8008402c(u32 arg0) +{ + var8008402c = arg0; +} -GLOBAL_ASM( -glabel func0f16cde0 -/* f16cde0: 3c018008 */ lui $at,0x8008 -/* f16cde4: 03e00008 */ jr $ra -/* f16cde8: ac244030 */ sw $a0,0x4030($at) -); +void setVar80084030(u32 arg0) +{ + var80084030 = arg0; +} f32 getUptime(void) { return g_Uptime; } +u32 getVar80084024(void) +{ + return var80084024; +} + GLOBAL_ASM( -glabel func0f16cdf8 -/* f16cdf8: 3c028008 */ lui $v0,0x8008 -/* f16cdfc: 03e00008 */ jr $ra -/* f16ce00: 8c424024 */ lw $v0,0x4024($v0) +glabel func0f16ce04 /* f16ce04: 03e00008 */ jr $ra /* f16ce08: 00801025 */ or $v0,$a0,$zero /* f16ce0c: 00000000 */ sll $zero,$zero,0x0 diff --git a/src/game/game_16cfa0.c b/src/game/game_16cfa0.c index f2d40c260..72a9a0d9c 100644 --- a/src/game/game_16cfa0.c +++ b/src/game/game_16cfa0.c @@ -642,7 +642,7 @@ glabel func0f16d6c0 /* f16d6dc: 1000006b */ beqz $zero,.L0f16d88c /* f16d6e0: 00001025 */ or $v0,$zero,$zero .L0f16d6e4: -/* f16d6e4: 0fc5b364 */ jal func0f16cd90 +/* f16d6e4: 0fc5b364 */ jal getVar80084014 /* f16d6e8: 00000000 */ sll $zero,$zero,0x0 /* f16d6ec: 3c05800a */ lui $a1,%hi(g_Vars) /* f16d6f0: 10400003 */ beqz $v0,.L0f16d700 diff --git a/src/game/game_176d70.c b/src/game/game_176d70.c index b989dfdfa..84995ac24 100644 --- a/src/game/game_176d70.c +++ b/src/game/game_176d70.c @@ -2050,7 +2050,7 @@ GLOBAL_ASM( glabel func0f1782f8 /* f1782f8: 27bdffe8 */ addiu $sp,$sp,-24 /* f1782fc: afbf0014 */ sw $ra,0x14($sp) -/* f178300: 0fc5b37e */ jal func0f16cdf8 +/* f178300: 0fc5b37e */ jal getVar80084024 /* f178304: afa40018 */ sw $a0,0x18($sp) /* f178308: 3c048007 */ lui $a0,0x8007 /* f17830c: 8c841440 */ lw $a0,0x1440($a0) diff --git a/src/game/game_187770.c b/src/game/game_187770.c index c1ccd414b..8f42b862d 100644 --- a/src/game/game_187770.c +++ b/src/game/game_187770.c @@ -1248,7 +1248,7 @@ glabel func0f188530 /* f188540: 2841003c */ slti $at,$v0,0x3c /* f188544: 14200005 */ bnez $at,.L0f18855c /* f188548: 000220c0 */ sll $a0,$v0,0x3 -/* f18854c: 0fc5b372 */ jal func0f16cdc8 +/* f18854c: 0fc5b372 */ jal setVar80084028 /* f188550: 00002025 */ or $a0,$zero,$zero /* f188554: 10000007 */ beqz $zero,.L0f188574 /* f188558: 00000000 */ sll $zero,$zero,0x0 @@ -1257,7 +1257,7 @@ glabel func0f188530 /* f188560: 00042140 */ sll $a0,$a0,0x5 /* f188564: 00822021 */ addu $a0,$a0,$v0 /* f188568: 00042100 */ sll $a0,$a0,0x4 -/* f18856c: 0fc5b372 */ jal func0f16cdc8 +/* f18856c: 0fc5b372 */ jal setVar80084028 /* f188570: 24840e10 */ addiu $a0,$a0,0xe10 .L0f188574: /* f188574: 3c02800b */ lui $v0,0x800b @@ -1265,12 +1265,12 @@ glabel func0f188530 /* f18857c: 28410064 */ slti $at,$v0,0x64 /* f188580: 14200005 */ bnez $at,.L0f188598 /* f188584: 00000000 */ sll $zero,$zero,0x0 -/* f188588: 0fc5b375 */ jal func0f16cdd4 +/* f188588: 0fc5b375 */ jal setVar8008402c /* f18858c: 00002025 */ or $a0,$zero,$zero /* f188590: 10000003 */ beqz $zero,.L0f1885a0 /* f188594: 00000000 */ sll $zero,$zero,0x0 .L0f188598: -/* f188598: 0fc5b375 */ jal func0f16cdd4 +/* f188598: 0fc5b375 */ jal setVar8008402c /* f18859c: 24440001 */ addiu $a0,$v0,0x1 .L0f1885a0: /* f1885a0: 3c0e800b */ lui $t6,0x800b @@ -1278,14 +1278,14 @@ glabel func0f188530 /* f1885a8: 29c10190 */ slti $at,$t6,0x190 /* f1885ac: 14200005 */ bnez $at,.L0f1885c4 /* f1885b0: 00000000 */ sll $zero,$zero,0x0 -/* f1885b4: 0fc5b378 */ jal func0f16cde0 +/* f1885b4: 0fc5b378 */ jal setVar80084030 /* f1885b8: 00002025 */ or $a0,$zero,$zero /* f1885bc: 10000006 */ beqz $zero,.L0f1885d8 /* f1885c0: 8fbf0014 */ lw $ra,0x14($sp) .L0f1885c4: /* f1885c4: 0fc62113 */ jal func0f18844c /* f1885c8: 00000000 */ sll $zero,$zero,0x0 -/* f1885cc: 0fc5b378 */ jal func0f16cde0 +/* f1885cc: 0fc5b378 */ jal setVar80084030 /* f1885d0: 24440001 */ addiu $a0,$v0,0x1 /* f1885d4: 8fbf0014 */ lw $ra,0x14($sp) .L0f1885d8: diff --git a/src/include/game/game_1668e0.h b/src/include/game/game_1668e0.h index 3bce9f214..3be2f2148 100644 --- a/src/include/game/game_1668e0.h +++ b/src/include/game/game_1668e0.h @@ -61,13 +61,13 @@ u32 func0f16cb04(void); void stageLoad(void); u32 func0f16cce4(void); u32 func0f16cd40(void); -u32 func0f16cd90(void); +u32 getVar80084014(void); u32 func0f16cda8(void); -u32 func0f16cdc8(void); -u32 func0f16cdd4(void); -u32 func0f16cde0(void); +void setVar80084028(u32 arg0); +void setVar8008402c(u32 arg0); +void setVar80084030(u32 arg0); f32 getUptime(void); -u32 func0f16cdf8(void); +u32 getVar80084024(void); u32 func0f16ce10(void); u32 func0f16ce3c(void); u32 func0f16ce94(void); diff --git a/src/include/setup/setup_020df0.h b/src/include/setup/setup_020df0.h index b99faddbc..cf90b9d01 100644 --- a/src/include/setup/setup_020df0.h +++ b/src/include/setup/setup_020df0.h @@ -206,6 +206,11 @@ extern struct smallsky smallskies[]; extern u32 var80082050; extern void *filetable[]; extern u32 var80084008; +extern u32 var80084014; +extern u32 var80084024; +extern u32 var80084028; +extern u32 var8008402c; +extern u32 var80084030; extern s32 var80084034; extern u32 var80084038; extern f32 g_Uptime; diff --git a/src/library/library_0e9d0.c b/src/library/library_0e9d0.c index 46bcf533c..2d88f5d65 100644 --- a/src/library/library_0e9d0.c +++ b/src/library/library_0e9d0.c @@ -2723,7 +2723,7 @@ glabel func00010e10 /* 10e7c: 8c460000 */ lw $a2,0x0($v0) /* 10e80: c4323c84 */ lwc1 $f18,%lo(var70053c84)($at) /* 10e84: 46120000 */ add.s $f0,$f0,$f18 -/* 10e88: 0fc5b364 */ jal func0f16cd90 +/* 10e88: 0fc5b364 */ jal getVar80084014 /* 10e8c: e7a00034 */ swc1 $f0,0x34($sp) /* 10e90: 3c08800a */ lui $t0,%hi(g_Vars) /* 10e94: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) @@ -2962,7 +2962,7 @@ glabel func0001111c /* 111d8: 46128102 */ mul.s $f4,$f16,$f18 /* 111dc: 460c2000 */ add.s $f0,$f4,$f12 .L000111e0: -/* 111e0: 0fc5b364 */ jal func0f16cd90 +/* 111e0: 0fc5b364 */ jal getVar80084014 /* 111e4: e7a00034 */ swc1 $f0,0x34($sp) /* 111e8: 3c08800a */ lui $t0,%hi(g_Vars) /* 111ec: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) diff --git a/src/setup/setup_020df0.c b/src/setup/setup_020df0.c index ab7a4c430..475401944 100644 --- a/src/setup/setup_020df0.c +++ b/src/setup/setup_020df0.c @@ -9572,18 +9572,18 @@ u32 var80084004 = 0x00000001; u32 var80084008 = 0x00000002; u32 var8008400c = 0x00000000; u32 var80084010 = 0x00000000; -u32 var80084014 = 0x00000000; +u32 var80084014 = 0; u32 var80084018 = 0x3f800000; u32 var8008401c = 0x00000001; s32 g_Difficulty = 0; u32 var80084024 = 0x00000000; -u32 var80084028 = 0x00008ca0; -u32 var8008402c = 0x0000000a; -u32 var80084030 = 0x00000014; +u32 var80084028 = 36000; +u32 var8008402c = 10; +u32 var80084030 = 20; s32 var80084034 = 0; -u32 var80084038 = 0x00000000; +u32 var80084038 = 0; f32 g_Uptime = 0; u32 var80084040 = 0x00000001; u32 var80084044 = 0x000005c8;