diff --git a/src/game/data/data_020df0.c b/src/game/data/data_020df0.c index f2ee72e20..f9b93f3e9 100644 --- a/src/game/data/data_020df0.c +++ b/src/game/data/data_020df0.c @@ -9619,7 +9619,7 @@ u32 var80084094 = 0x1e000000; u32 var80084098 = 0x00000000; u32 var8008409c = 0x00000064; u32 var800840a0 = 0x00000000; -u32 var800840a4 = 0x00000000; +u32 g_CutsceneTime240_60 = 0x00000000; u32 var800840a8 = 0x00000000; u32 var800840ac = 0x00000000; u32 var800840b0 = 0x00000000; diff --git a/src/game/game_167ae0.c b/src/game/game_167ae0.c index a1b057563..920415d92 100644 --- a/src/game/game_167ae0.c +++ b/src/game/game_167ae0.c @@ -4211,27 +4211,15 @@ u32 addFfff2bcf(u32 value) return value + 0xffff2bcf; } -GLOBAL_ASM( -glabel func0f16b810 -/* f16b810: 3c02800a */ lui $v0,%hi(g_Vars) -/* f16b814: 24429fc0 */ addiu $v0,$v0,%lo(g_Vars) -/* f16b818: 8c4e04cc */ lw $t6,0x4cc($v0) -/* f16b81c: 3c038008 */ lui $v1,%hi(var800840a4) -/* f16b820: 246340a4 */ addiu $v1,$v1,%lo(var800840a4) -/* f16b824: 11c00006 */ beqz $t6,.L0f16b840 -/* f16b828: 00000000 */ sll $zero,$zero,0x0 -/* f16b82c: 8c6f0000 */ lw $t7,0x0($v1) -/* f16b830: 8c580038 */ lw $t8,0x38($v0) -/* f16b834: 01f8c821 */ addu $t9,$t7,$t8 -/* f16b838: 03e00008 */ jr $ra -/* f16b83c: ac790000 */ sw $t9,0x0($v1) -.L0f16b840: -/* f16b840: 3c038008 */ lui $v1,%hi(var800840a4) -/* f16b844: 246340a4 */ addiu $v1,$v1,%lo(var800840a4) -/* f16b848: ac600000 */ sw $zero,0x0($v1) -/* f16b84c: 03e00008 */ jr $ra -/* f16b850: 00000000 */ sll $zero,$zero,0x0 -); +void updateCutsceneTime(void) +{ + if (g_Vars.in_cutscene) { + g_CutsceneTime240_60 += g_Vars.lvupdate240_60; + return; + } + + g_CutsceneTime240_60 = 0; +} GLOBAL_ASM( glabel getEffectiveSlowMotion @@ -5500,7 +5488,7 @@ glabel func0f16b96c /* f16c958: 10000062 */ beqz $zero,.L0f16cae4 /* f16c95c: 8fbf0044 */ lw $ra,0x44($sp) .L0f16c960: -/* f16c960: 0fc5ae04 */ jal func0f16b810 +/* f16c960: 0fc5ae04 */ jal updateCutsceneTime /* f16c964: 00000000 */ sll $zero,$zero,0x0 /* f16c968: 0fc4a4e7 */ jal func0f12939c /* f16c96c: 00000000 */ sll $zero,$zero,0x0 @@ -5923,7 +5911,7 @@ glabel func0f16b96c // func00011d84(); // func0f01d860(); // } else { -// func0f16b810(); +// updateCutsceneTime(); // func0f12939c(); // func0f16b0c8(); // func0f01d8c0(); diff --git a/src/include/game/data/data_020df0.h b/src/include/game/data/data_020df0.h index 6a5b0d071..60ca050c8 100644 --- a/src/include/game/data/data_020df0.h +++ b/src/include/game/data/data_020df0.h @@ -227,7 +227,7 @@ extern u32 var80084068; extern u32 var80084078; extern u32 var80084088; extern u32 var80084098; -extern u32 var800840a4; +extern u32 g_CutsceneTime240_60; extern u32 var800840c4; extern u32 var800840d4; extern u32 var800840e0; diff --git a/src/include/game/game_167ae0.h b/src/include/game/game_167ae0.h index 627c05bc5..0b275dfec 100644 --- a/src/include/game/game_167ae0.h +++ b/src/include/game/game_167ae0.h @@ -19,7 +19,7 @@ u32 func0f1691c0(void); u32 func0f169374(void); void func0f16b0c8(void); u32 addFfff2bcf(u32 value); -void func0f16b810(void); +void updateCutsceneTime(void); s32 getEffectiveSlowMotion(void); void func0f16b96c(void); u32 func0f16cb04(void);