diff --git a/src/game/game_0b0420.c b/src/game/game_0b0420.c index c90af8885..d6d1c8167 100644 --- a/src/game/game_0b0420.c +++ b/src/game/game_0b0420.c @@ -234,7 +234,7 @@ glabel func0f0b05a4 /* f0b05d4: 8d090318 */ lw $t1,0x318($t0) /* f0b05d8: 51200055 */ beqzl $t1,.L0f0b0730 /* f0b05dc: 8fbf0014 */ lw $ra,0x14($sp) -/* f0b05e0: 0fc3089f */ jal func0f0c227c +/* f0b05e0: 0fc3089f */ jal getMissionTime /* f0b05e4: 00000000 */ sll $zero,$zero,0x0 /* f0b05e8: afa2002c */ sw $v0,0x2c($sp) /* f0b05ec: 0fc5b9f1 */ jal langGet @@ -403,7 +403,7 @@ glabel func0f0b0818 /* f0b0828: afbf0014 */ sw $ra,0x14($sp) /* f0b082c: 51c0006e */ beqzl $t6,.L0f0b09e8 /* f0b0830: 8fbf0014 */ lw $ra,0x14($sp) -/* f0b0834: 0fc3089f */ jal func0f0c227c +/* f0b0834: 0fc3089f */ jal getMissionTime /* f0b0838: 00000000 */ sll $zero,$zero,0x0 /* f0b083c: 3c09800a */ lui $t1,%hi(g_Vars) /* f0b0840: 25299fc0 */ addiu $t1,$t1,%lo(g_Vars) diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index f409660da..938d4aa55 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -2092,7 +2092,7 @@ glabel func0f0b802c /* f0b807c: 8ef80284 */ lw $t8,0x284($s7) /* f0b8080: af110328 */ sw $s1,0x328($t8) /* f0b8084: 8ef90284 */ lw $t9,0x284($s7) -/* f0b8088: 0fc3089f */ jal func0f0c227c +/* f0b8088: 0fc3089f */ jal getMissionTime /* f0b808c: af201960 */ sw $zero,0x1960($t9) /* f0b8090: 8ee90284 */ lw $t1,0x284($s7) /* f0b8094: 02202025 */ or $a0,$s1,$zero @@ -12138,7 +12138,7 @@ glabel func0f0c1404 /* f0c1598: 00002025 */ or $a0,$zero,$zero /* f0c159c: 0fc28a72 */ jal func0f0a29c8 /* f0c15a0: 00000000 */ sll $zero,$zero,0x0 -/* f0c15a4: 0fc3089f */ jal func0f0c227c +/* f0c15a4: 0fc3089f */ jal getMissionTime /* f0c15a8: 00000000 */ sll $zero,$zero,0x0 /* f0c15ac: 8e0f0284 */ lw $t7,0x284($s0) /* f0c15b0: 8e080288 */ lw $t0,0x288($s0) @@ -12148,7 +12148,7 @@ glabel func0f0c1404 /* f0c15c0: 0329082a */ slt $at,$t9,$t1 /* f0c15c4: 10200008 */ beqz $at,.L0f0c15e8 /* f0c15c8: 00000000 */ sll $zero,$zero,0x0 -/* f0c15cc: 0fc3089f */ jal func0f0c227c +/* f0c15cc: 0fc3089f */ jal getMissionTime /* f0c15d0: 00000000 */ sll $zero,$zero,0x0 /* f0c15d4: 8e0a0284 */ lw $t2,0x284($s0) /* f0c15d8: 8e0d0288 */ lw $t5,0x288($s0) @@ -12156,7 +12156,7 @@ glabel func0f0c1404 /* f0c15e0: 004b6023 */ subu $t4,$v0,$t3 /* f0c15e4: adac0050 */ sw $t4,0x50($t5) .L0f0c15e8: -/* f0c15e8: 0fc3089f */ jal func0f0c227c +/* f0c15e8: 0fc3089f */ jal getMissionTime /* f0c15ec: 00000000 */ sll $zero,$zero,0x0 /* f0c15f0: 8e0e0284 */ lw $t6,0x284($s0) /* f0c15f4: adc2195c */ sw $v0,0x195c($t6) @@ -12973,13 +12973,10 @@ glabel func0f0c2210 /* f0c2278: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel func0f0c227c -/* f0c227c: 3c0e800a */ lui $t6,0x800a -/* f0c2280: 8dcea244 */ lw $t6,-0x5dbc($t6) -/* f0c2284: 03e00008 */ jr $ra -/* f0c2288: 8dc21b7c */ lw $v0,0x1b7c($t6) -); +s32 getMissionTime(void) +{ + return g_Vars.currentplayer->bondviewlevtime60; +} GLOBAL_ASM( glabel func0f0c228c diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c index d9095b8ac..885c61874 100644 --- a/src/game/game_0dcdb0.c +++ b/src/game/game_0dcdb0.c @@ -4619,7 +4619,7 @@ glabel func0f0dcef4 /* f0dd1fc: 00007012 */ mflo $t6 /* f0dd200: 3c0100ff */ lui $at,0xff /* f0dd204: 01c17825 */ or $t7,$t6,$at -/* f0dd208: 0fc3089f */ jal func0f0c227c +/* f0dd208: 0fc3089f */ jal getMissionTime /* f0dd20c: afaf0064 */ sw $t7,0x64($sp) /* f0dd210: 27a40068 */ addiu $a0,$sp,0x68 /* f0dd214: 00402825 */ or $a1,$v0,$zero diff --git a/src/game/game_10ccd0.c b/src/game/game_10ccd0.c index dfb4d69a6..3e44d5973 100644 --- a/src/game/game_10ccd0.c +++ b/src/game/game_10ccd0.c @@ -813,7 +813,7 @@ GLOBAL_ASM( glabel func0f10d6e4 /* f10d6e4: 27bdffe8 */ addiu $sp,$sp,-24 /* f10d6e8: afbf0014 */ sw $ra,0x14($sp) -/* f10d6ec: 0fc3089f */ jal func0f0c227c +/* f10d6ec: 0fc3089f */ jal getMissionTime /* f10d6f0: afa40018 */ sw $a0,0x18($sp) /* f10d6f4: 3c048007 */ lui $a0,0x8007 /* f10d6f8: 8c841440 */ lw $a0,0x1440($a0) @@ -2075,7 +2075,7 @@ glabel func0f10e620 /* f10e8dc: 03202025 */ or $a0,$t9,$zero /* f10e8e0: afa2001c */ sw $v0,0x1c($sp) .L0f10e8e4: -/* f10e8e4: 0fc3089f */ jal func0f0c227c +/* f10e8e4: 0fc3089f */ jal getMissionTime /* f10e8e8: 00000000 */ sll $zero,$zero,0x0 /* f10e8ec: 2401003c */ addiu $at,$zero,0x3c /* f10e8f0: 0041001a */ div $zero,$v0,$at @@ -2138,7 +2138,7 @@ glabel func0f10e620 /* f10e9c8: 00000000 */ sll $zero,$zero,0x0 /* f10e9cc: 104000a5 */ beqz $v0,.L0f10ec64 /* f10e9d0: 00000000 */ sll $zero,$zero,0x0 -/* f10e9d4: 0fc3089f */ jal func0f0c227c +/* f10e9d4: 0fc3089f */ jal getMissionTime /* f10e9d8: 00000000 */ sll $zero,$zero,0x0 /* f10e9dc: 2401003c */ addiu $at,$zero,0x3c /* f10e9e0: 0041001a */ div $zero,$v0,$at diff --git a/src/game/game_187770.c b/src/game/game_187770.c index 0e5d91fba..9c12e9173 100644 --- a/src/game/game_187770.c +++ b/src/game/game_187770.c @@ -3616,7 +3616,7 @@ glabel func0f18a56c /* f18a60c: 0238c821 */ addu $t9,$s1,$t8 /* f18a610: 032d7021 */ addu $t6,$t9,$t5 /* f18a614: 01cf8021 */ addu $s0,$t6,$t7 -/* f18a618: 0fc3089f */ jal func0f0c227c +/* f18a618: 0fc3089f */ jal getMissionTime /* f18a61c: afb002fc */ sw $s0,0x2fc($sp) /* f18a620: 0c00cf76 */ jal func00033dd8 /* f18a624: afa202ec */ sw $v0,0x2ec($sp) diff --git a/src/include/game/game_0b63b0.h b/src/include/game/game_0b63b0.h index 628d2bcf9..d6f483937 100644 --- a/src/include/game/game_0b63b0.h +++ b/src/include/game/game_0b63b0.h @@ -80,7 +80,7 @@ void propPlayerGetBbox(struct prop *prop, f32 *width, f32 *ymax, f32 *ymin); u32 func0f0c2194(void); u32 func0f0c21a4(void); u32 func0f0c2210(void); -u32 func0f0c227c(void); +s32 getMissionTime(void); u32 func0f0c228c(void); u32 func0f0c2364(void); u32 func0f0c2a58(void);