diff --git a/src/include/data.h b/src/include/data.h index ddc0279e6..f43ff635a 100644 --- a/src/include/data.h +++ b/src/include/data.h @@ -21,7 +21,7 @@ extern f32 var8005ce80[2]; extern u32 var8005ce88[2]; extern s32 g_ViUnblackTimer; extern u32 var8005ce94; -extern u32 var8005ce98; +extern s32 var8005ce98; extern u32 var8005ce9c; extern OSMesg var8005cea8; extern u32 var8005cec8; diff --git a/src/lib/lib_09a80.c b/src/lib/lib_09a80.c index 54f89f5ef..58c0b3ede 100644 --- a/src/lib/lib_09a80.c +++ b/src/lib/lib_09a80.c @@ -1878,35 +1878,19 @@ glabel vi0000a044 ); #endif -GLOBAL_ASM( -glabel vi0000aa50 -/* aa50: 3c014160 */ lui $at,0x4160 -/* aa54: 44810000 */ mtc1 $at,$f0 -/* aa58: 00000000 */ nop -/* aa5c: 460c003c */ c.lt.s $f0,$f12 -/* aa60: 00000000 */ nop -/* aa64: 45020003 */ bc1fl .L0000aa74 -/* aa68: 44800000 */ mtc1 $zero,$f0 -/* aa6c: 46000306 */ mov.s $f12,$f0 -/* aa70: 44800000 */ mtc1 $zero,$f0 -.L0000aa74: -/* aa74: 00000000 */ nop -/* aa78: 4600603c */ c.lt.s $f12,$f0 -/* aa7c: 00000000 */ nop -/* aa80: 45020003 */ bc1fl .L0000aa90 -/* aa84: 4600610d */ trunc.w.s $f4,$f12 -/* aa88: 46000306 */ mov.s $f12,$f0 -/* aa8c: 4600610d */ trunc.w.s $f4,$f12 -.L0000aa90: -/* aa90: 3c018006 */ lui $at,%hi(var8005ce98) -/* aa94: 2418000a */ addiu $t8,$zero,0xa -/* aa98: 440f2000 */ mfc1 $t7,$f4 -/* aa9c: 00000000 */ nop -/* aaa0: ac2fce98 */ sw $t7,%lo(var8005ce98)($at) -/* aaa4: 3c018006 */ lui $at,%hi(var8005ce9c) -/* aaa8: 03e00008 */ jr $ra -/* aaac: ac38ce9c */ sw $t8,%lo(var8005ce9c)($at) -); +void vi0000aa50(f32 arg0) +{ + if (arg0 > 14) { + arg0 = 14; + } + + if (arg0 < 0) { + arg0 = 0; + } + + var8005ce98 = arg0; + var8005ce9c = 10; +} void vi0000aab0(s32 mode) { diff --git a/src/lib/sched.c b/src/lib/sched.c index 34f570004..097b21283 100644 --- a/src/lib/sched.c +++ b/src/lib/sched.c @@ -47,7 +47,7 @@ f32 var8005ce80[2] = {1, 1}; u32 var8005ce88[2] = {0}; s32 g_ViUnblackTimer = 3; u32 var8005ce94 = 0x00000001; -u32 var8005ce98 = 0x00000000; +s32 var8005ce98 = 0; u32 var8005ce9c = 0x00000000; u32 var8005cea0 = 0x00000000; u32 var8005cea4 = 0x00000000;