From 555cf2fe8d231824be4814657d607c3ae5c2d7d5 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 10 Mar 2020 20:55:53 +1000 Subject: [PATCH] Identify more libultra functions --- src/boot/boot.c | 39 +- src/game/camdraw.c | 6 +- src/game/chr/chraicommands.c | 16 +- src/game/game_0601b0.c | 16 +- src/game/game_092610.c | 40 +- src/game/game_097ba0.c | 48 +-- src/game/game_0f09f0.c | 8 +- src/game/pak/pak.c | 16 +- src/gvars/gvars.c | 763 +---------------------------------- src/include/gvars/gvars.h | 14 +- src/include/lib/lib_03050.h | 4 +- src/include/lib/lib_034f0.h | 2 +- src/include/lib/lib_03ee0.h | 3 +- src/include/lib/lib_481e0.h | 6 +- src/include/lib/lib_48520.h | 2 +- src/include/lib/lib_48830.h | 2 +- src/include/lib/lib_491b0.h | 4 +- src/include/lib/lib_49640.h | 2 +- src/include/lib/lib_49780.h | 2 +- src/include/lib/lib_49a90.h | 2 +- src/include/lib/lib_49c20.h | 6 +- src/include/lib/lib_4a5e0.h | 2 +- src/include/lib/lib_4ae00.h | 2 +- src/include/lib/lib_4e690.h | 2 +- src/lib/lib_03050.c | 40 +- src/lib/lib_034f0.c | 12 +- src/lib/lib_03ee0.c | 6 +- src/lib/lib_04a80.c | 18 +- src/lib/lib_08a20.c | 4 +- src/lib/lib_0c000.c | 4 +- src/lib/lib_0e9d0.c | 16 +- src/lib/lib_13130.c | 10 +- src/lib/lib_13710.c | 2 +- src/lib/lib_13900.c | 4 +- src/lib/lib_2fa00.c | 2 +- src/lib/lib_37b00.c | 4 +- src/lib/lib_3e730.c | 12 +- src/lib/lib_43dd0.c | 4 +- src/lib/lib_481e0.c | 8 +- src/lib/lib_48520.c | 2 +- src/lib/lib_48830.c | 2 +- src/lib/lib_491b0.c | 4 +- src/lib/lib_49640.c | 6 +- src/lib/lib_49780.c | 2 +- src/lib/lib_49a90.c | 8 +- src/lib/lib_49c20.c | 8 +- src/lib/lib_4a5e0.c | 2 +- src/lib/lib_4ae00.c | 2 +- src/lib/lib_4d480.c | 2 +- src/lib/lib_4d6f0.c | 2 +- src/lib/lib_4e690.c | 2 +- src/lib/lib_50f20.c | 4 +- src/lib/lib_52070.c | 2 +- 53 files changed, 226 insertions(+), 975 deletions(-) diff --git a/src/boot/boot.c b/src/boot/boot.c index e1f0c3d11..fa06b5978 100644 --- a/src/boot/boot.c +++ b/src/boot/boot.c @@ -684,7 +684,7 @@ glabel func000016cc /* 187c: 02002025 */ or $a0,$s0,$zero /* 1880: 24050003 */ addiu $a1,$zero,0x3 /* 1884: 00003825 */ or $a3,$zero,$zero -/* 1888: 0c000fb8 */ jal func00003ee0 +/* 1888: 0c000fb8 */ jal osCreateThread /* 188c: afa20010 */ sw $v0,0x10($sp) /* 1890: 0c01207c */ jal osStartThread /* 1894: 02002025 */ or $a0,$s0,$zero @@ -735,8 +735,7 @@ glabel func000018ac /* 1930: 2442fff8 */ addiu $v0,$v0,-8 ); -// This is possibly the idle thread's callback -void func00001934(u32 arg) +void idle(void *data) { while (true); } @@ -749,13 +748,13 @@ glabel func00001948 /* 1954: 0c00062b */ jal func000018ac /* 1958: 24050040 */ addiu $a1,$zero,0x40 /* 195c: 3c048009 */ lui $a0,%hi(var8008d4a0) -/* 1960: 3c067000 */ lui $a2,%hi(func00001934) -/* 1964: 24c61934 */ addiu $a2,$a2,%lo(func00001934) +/* 1960: 3c067000 */ lui $a2,%hi(idle) +/* 1964: 24c61934 */ addiu $a2,$a2,%lo(idle) /* 1968: 2484d4a0 */ addiu $a0,$a0,%lo(var8008d4a0) /* 196c: 24050001 */ addiu $a1,$zero,0x1 /* 1970: 00003825 */ or $a3,$zero,$zero /* 1974: afa20010 */ sw $v0,0x10($sp) -/* 1978: 0c000fb8 */ jal func00003ee0 +/* 1978: 0c000fb8 */ jal osCreateThread /* 197c: afa00014 */ sw $zero,0x14($sp) /* 1980: 3c048009 */ lui $a0,%hi(var8008d4a0) /* 1984: 0c01207c */ jal osStartThread @@ -781,7 +780,7 @@ glabel func0000199c /* 19c4: 2484d270 */ addiu $a0,$a0,%lo(var8008d270) /* 19c8: 00002825 */ or $a1,$zero,$zero /* 19cc: 00003825 */ or $a3,$zero,$zero -/* 19d0: 0c000fb8 */ jal func00003ee0 +/* 19d0: 0c000fb8 */ jal osCreateThread /* 19d4: afa20010 */ sw $v0,0x10($sp) /* 19d8: 3c048009 */ lui $a0,%hi(var8008d270) /* 19dc: 0c01207c */ jal osStartThread @@ -850,10 +849,10 @@ void func00001aa4(u32 value) func0000199c(); if (func00012f30()) { - func00048370(0); + osStopThread(0); } - func00048430(0, 10); + osSetThreadPri(0, 10); func000019f4(); func0000dae8(); } @@ -933,7 +932,7 @@ glabel func00001c4c /* 1cb8: 26050090 */ addiu $a1,$s0,0x90 /* 1cbc: 0c0120d0 */ jal osCreateMesgQueue /* 1cc0: 24060008 */ addiu $a2,$zero,0x8 -/* 1cc4: 0c000c14 */ jal func00003050 +/* 1cc4: 0c000c14 */ jal osCreateViManager /* 1cc8: 240400fe */ addiu $a0,$zero,0xfe /* 1ccc: 93b80033 */ lbu $t8,0x33($sp) /* 1cd0: 3c098006 */ lui $t1,%hi(var8005f710) @@ -995,11 +994,11 @@ glabel func00001c4c /* 1da8: ad610000 */ sw $at,0x0($t3) /* 1dac: 8d490004 */ lw $t1,0x4($t2) /* 1db0: 2406029b */ addiu $a2,$zero,0x29b -/* 1db4: 0c012148 */ jal func00048520 +/* 1db4: 0c012148 */ jal osSetEventMesg /* 1db8: ad690004 */ sw $t1,0x4($t3) /* 1dbc: 24040009 */ addiu $a0,$zero,0x9 /* 1dc0: 02202825 */ or $a1,$s1,$zero -/* 1dc4: 0c012148 */ jal func00048520 +/* 1dc4: 0c012148 */ jal osSetEventMesg /* 1dc8: 2406029c */ addiu $a2,$zero,0x29c /* 1dcc: 02202025 */ or $a0,$s1,$zero /* 1dd0: 2405029a */ addiu $a1,$zero,0x29a @@ -1017,7 +1016,7 @@ glabel func00001c4c /* 1e00: 24c61e94 */ addiu $a2,$a2,%lo(func00001e94) /* 1e04: afa20010 */ sw $v0,0x10($sp) /* 1e08: 24050002 */ addiu $a1,$zero,0x2 -/* 1e0c: 0c000fb8 */ jal func00003ee0 +/* 1e0c: 0c000fb8 */ jal osCreateThread /* 1e10: 02003825 */ or $a3,$s0,$zero /* 1e14: 0c01207c */ jal osStartThread /* 1e18: 8e0400b0 */ lw $a0,0xb0($s0) @@ -1149,11 +1148,11 @@ glabel func00001fa8 /* 1fb8: afa50034 */ sw $a1,0x34($sp) /* 1fbc: afa00028 */ sw $zero,0x28($sp) /* 1fc0: afa00024 */ sw $zero,0x24($sp) -/* 1fc4: 0c012230 */ jal func000488c0 +/* 1fc4: 0c012230 */ jal osGetThreadPri /* 1fc8: 00002025 */ or $a0,$zero,$zero /* 1fcc: afa20020 */ sw $v0,0x20($sp) /* 1fd0: 00002025 */ or $a0,$zero,$zero -/* 1fd4: 0c01210c */ jal func00048430 +/* 1fd4: 0c01210c */ jal osSetThreadPri /* 1fd8: 2405001f */ addiu $a1,$zero,0x1f /* 1fdc: 02002025 */ or $a0,$s0,$zero /* 1fe0: 0c000a87 */ jal func00002a1c @@ -1189,7 +1188,7 @@ glabel func00001fa8 /* 2054: 8fa60024 */ lw $a2,0x24($sp) /* 2058: 00002025 */ or $a0,$zero,$zero .L0000205c: -/* 205c: 0c01210c */ jal func00048430 +/* 205c: 0c01210c */ jal osSetThreadPri /* 2060: 8fa50020 */ lw $a1,0x20($sp) /* 2064: 8fbf001c */ lw $ra,0x1c($sp) /* 2068: 8fb00018 */ lw $s0,0x18($sp) @@ -2163,10 +2162,10 @@ glabel func00002e00 /* 2e2c: 0c002449 */ jal func00009124 /* 2e30: a02eced0 */ sb $t6,-0x3130($at) /* 2e34: 3c048009 */ lui $a0,%hi(var8008d6d0) -/* 2e38: 0c0120dc */ jal func00048370 +/* 2e38: 0c0120dc */ jal osStopThread /* 2e3c: 2484d6d0 */ addiu $a0,$a0,%lo(var8008d6d0) /* 2e40: 00002025 */ or $a0,$zero,$zero -/* 2e44: 0c01210c */ jal func00048430 +/* 2e44: 0c01210c */ jal osSetThreadPri /* 2e48: 2405000b */ addiu $a1,$zero,0xb /* 2e4c: 3c0f8000 */ lui $t7,0x8000 /* 2e50: 8def0300 */ lw $t7,0x300($t7) @@ -2261,7 +2260,7 @@ glabel func00002f70 /* 2f90: 3c058009 */ lui $a1,%hi(var8008faa8) /* 2f94: 24a5faa8 */ addiu $a1,$a1,%lo(var8008faa8) /* 2f98: 2404000e */ addiu $a0,$zero,0xe -/* 2f9c: 0c012148 */ jal func00048520 +/* 2f9c: 0c012148 */ jal osSetEventMesg /* 2fa0: 2406029d */ addiu $a2,$zero,0x29d /* 2fa4: 3c0e8009 */ lui $t6,%hi(var8008fdf0) /* 2fa8: 25cefdf0 */ addiu $t6,$t6,%lo(var8008fdf0) @@ -2273,7 +2272,7 @@ glabel func00002f70 /* 2fc0: 2484fac0 */ addiu $a0,$a0,%lo(var8008fac0) /* 2fc4: afae0010 */ sw $t6,0x10($sp) /* 2fc8: 24050006 */ addiu $a1,$zero,0x6 -/* 2fcc: 0c000fb8 */ jal func00003ee0 +/* 2fcc: 0c000fb8 */ jal osCreateThread /* 2fd0: 00003825 */ or $a3,$zero,$zero /* 2fd4: 3c048009 */ lui $a0,%hi(var8008fac0) /* 2fd8: 0c01207c */ jal osStartThread diff --git a/src/game/camdraw.c b/src/game/camdraw.c index fce296bda..91caff3f2 100644 --- a/src/game/camdraw.c +++ b/src/game/camdraw.c @@ -6652,7 +6652,7 @@ glabel func0f14f07c /* f14f3a8: 0306c023 */ subu $t8,$t8,$a2 /* f14f3ac: 00183080 */ sll $a2,$t8,0x2 /* f14f3b0: 8de5000c */ lw $a1,0xc($t7) -/* f14f3b4: 0c012978 */ jal func0004a5e0 +/* f14f3b4: 0c012978 */ jal memcpy /* f14f3b8: afa60024 */ sw $a2,0x24($sp) /* f14f3bc: 8fa70034 */ lw $a3,0x34($sp) /* f14f3c0: 8faf0040 */ lw $t7,0x40($sp) @@ -6664,7 +6664,7 @@ glabel func0f14f07c /* f14f3d8: 8de5000c */ lw $a1,0xc($t7) /* f14f3dc: afa60028 */ sw $a2,0x28($sp) /* f14f3e0: 00c03825 */ or $a3,$a2,$zero -/* f14f3e4: 0c012978 */ jal func0004a5e0 +/* f14f3e4: 0c012978 */ jal memcpy /* f14f3e8: 032e2021 */ addu $a0,$t9,$t6 /* f14f3ec: 8e190000 */ lw $t9,0x0($s0) /* f14f3f0: 8fae0024 */ lw $t6,0x24($sp) @@ -6676,7 +6676,7 @@ glabel func0f14f07c /* f14f408: 0326c823 */ subu $t9,$t9,$a2 /* f14f40c: 00193080 */ sll $a2,$t9,0x2 /* f14f410: 01e72021 */ addu $a0,$t7,$a3 -/* f14f414: 0c012978 */ jal func0004a5e0 +/* f14f414: 0c012978 */ jal memcpy /* f14f418: 8f05000c */ lw $a1,0xc($t8) /* f14f41c: 8fae0060 */ lw $t6,0x60($sp) /* f14f420: 8faf002c */ lw $t7,0x2c($sp) diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 514d823fd..9575ce2b6 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -10678,16 +10678,16 @@ bool aiChrBeginOrEndTeleport(void) g_Vars.currentplayer->teleportpad = pad_id; g_Vars.currentplayer->teleportcamerapad = 0; - a = func000488c0(0); - b = func000488c0(&var800915e0); - func00048430(0, b + 1); + a = osGetThreadPri(0); + b = osGetThreadPri(&var800915e0); + osSetThreadPri(0, b + 1); c = func00010904(var80095200, 1075, 0, -1, -1, -1, -1, -1); if (c) { func00033e50(c, 16, fvalue[0]); } - func00048430(0, a); + osSetThreadPri(0, a); } g_Vars.aioffset += 5; @@ -10719,16 +10719,16 @@ bool aiIfChrTeleportFullWhite(void) g_Vars.aioffset += 4; } else { fvalue[0] = 0.4; - a = func000488c0(0); - b = func000488c0(&var800915e0); - func00048430(0, b + 1); + a = osGetThreadPri(0); + b = osGetThreadPri(&var800915e0); + osSetThreadPri(0, b + 1); c = func00010904(var80095200, -32683, 0, -1, -1, -1, -1, -1); if (c) { func00033e50(c, 16, fvalue[0]); } - func00048430(0, a); + osSetThreadPri(0, a); g_Vars.currentplayer->teleportstate = TELEPORTSTATE_3; g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c index ed30cba09..f13229638 100644 --- a/src/game/game_0601b0.c +++ b/src/game/game_0601b0.c @@ -643,14 +643,14 @@ glabel var7f1a9e50 /* f060ab0: 15f90027 */ bne $t7,$t9,.L0f060b50 /* f060ab4: 8fa50064 */ lw $a1,0x64($sp) /* f060ab8: 00002025 */ or $a0,$zero,$zero -/* f060abc: 0c012230 */ jal func000488c0 +/* f060abc: 0c012230 */ jal osGetThreadPri /* f060ac0: afa3005c */ sw $v1,0x5c($sp) /* f060ac4: 3c048009 */ lui $a0,%hi(var800915e0) /* f060ac8: afa2004c */ sw $v0,0x4c($sp) -/* f060acc: 0c012230 */ jal func000488c0 +/* f060acc: 0c012230 */ jal osGetThreadPri /* f060ad0: 248415e0 */ addiu $a0,$a0,%lo(var800915e0) /* f060ad4: 00002025 */ or $a0,$zero,$zero -/* f060ad8: 0c01210c */ jal func00048430 +/* f060ad8: 0c01210c */ jal osSetThreadPri /* f060adc: 24450001 */ addiu $a1,$v0,0x1 /* f060ae0: 8fa3005c */ lw $v1,0x5c($sp) /* f060ae4: 3c01bf80 */ lui $at,0xbf80 @@ -677,7 +677,7 @@ glabel var7f1a9e50 /* f060b38: 8fa60058 */ lw $a2,0x58($sp) .L0f060b3c: /* f060b3c: 00002025 */ or $a0,$zero,$zero -/* f060b40: 0c01210c */ jal func00048430 +/* f060b40: 0c01210c */ jal osSetThreadPri /* f060b44: 8fa5004c */ lw $a1,0x4c($sp) /* f060b48: 10000015 */ beqz $zero,.L0f060ba0 /* f060b4c: 8fbf0044 */ lw $ra,0x44($sp) @@ -796,14 +796,14 @@ glabel var7f1a9e5c /* f060cbc: 00002025 */ or $a0,$zero,$zero /* f060cc0: 15f90025 */ bne $t7,$t9,.L0f060d58 /* f060cc4: 8fa50064 */ lw $a1,0x64($sp) -/* f060cc8: 0c012230 */ jal func000488c0 +/* f060cc8: 0c012230 */ jal osGetThreadPri /* f060ccc: 00002025 */ or $a0,$zero,$zero /* f060cd0: 3c048009 */ lui $a0,%hi(var800915e0) /* f060cd4: afa20050 */ sw $v0,0x50($sp) -/* f060cd8: 0c012230 */ jal func000488c0 +/* f060cd8: 0c012230 */ jal osGetThreadPri /* f060cdc: 248415e0 */ addiu $a0,$a0,%lo(var800915e0) /* f060ce0: 00002025 */ or $a0,$zero,$zero -/* f060ce4: 0c01210c */ jal func00048430 +/* f060ce4: 0c01210c */ jal osSetThreadPri /* f060ce8: 24450001 */ addiu $a1,$v0,0x1 /* f060cec: 3c01bf80 */ lui $at,0xbf80 /* f060cf0: 44810000 */ mtc1 $at,$f0 @@ -829,7 +829,7 @@ glabel var7f1a9e5c /* f060d40: 8fa60058 */ lw $a2,0x58($sp) .L0f060d44: /* f060d44: 00002025 */ or $a0,$zero,$zero -/* f060d48: 0c01210c */ jal func00048430 +/* f060d48: 0c01210c */ jal osSetThreadPri /* f060d4c: 8fa50050 */ lw $a1,0x50($sp) /* f060d50: 10000015 */ beqz $zero,.L0f060da8 /* f060d54: 8fbf004c */ lw $ra,0x4c($sp) diff --git a/src/game/game_092610.c b/src/game/game_092610.c index 33fd9844a..88083c441 100644 --- a/src/game/game_092610.c +++ b/src/game/game_092610.c @@ -1316,18 +1316,18 @@ glabel func0f093630 /* f0936f4: 01706021 */ addu $t4,$t3,$s0 /* f0936f8: ad960020 */ sw $s6,0x20($t4) .L0f0936fc: -/* f0936fc: 0c012230 */ jal func000488c0 +/* f0936fc: 0c012230 */ jal osGetThreadPri /* f093700: 00002025 */ or $a0,$zero,$zero /* f093704: 00408825 */ or $s1,$v0,$zero -/* f093708: 0c012230 */ jal func000488c0 +/* f093708: 0c012230 */ jal osGetThreadPri /* f09370c: 02a02025 */ or $a0,$s5,$zero /* f093710: 00002025 */ or $a0,$zero,$zero -/* f093714: 0c01210c */ jal func00048430 +/* f093714: 0c01210c */ jal osSetThreadPri /* f093718: 24450001 */ addiu $a1,$v0,0x1 /* f09371c: 0fc24b01 */ jal func0f092c04 /* f093720: 02402025 */ or $a0,$s2,$zero /* f093724: 00002025 */ or $a0,$zero,$zero -/* f093728: 0c01210c */ jal func00048430 +/* f093728: 0c01210c */ jal osSetThreadPri /* f09372c: 02202825 */ or $a1,$s1,$zero /* f093730: 3c038009 */ lui $v1,%hi(g_Is4Mb) /* f093734: 90630af0 */ lbu $v1,%lo(g_Is4Mb)($v1) @@ -1413,13 +1413,13 @@ glabel func0f093790 /* f093844: 0221001a */ div $zero,$s1,$at /* f093848: 00008812 */ mflo $s1 /* f09384c: 00002025 */ or $a0,$zero,$zero -/* f093850: 0c012230 */ jal func000488c0 +/* f093850: 0c012230 */ jal osGetThreadPri /* f093854: 00000000 */ sll $zero,$zero,0x0 /* f093858: 00408025 */ or $s0,$v0,$zero -/* f09385c: 0c012230 */ jal func000488c0 +/* f09385c: 0c012230 */ jal osGetThreadPri /* f093860: 02c02025 */ or $a0,$s6,$zero /* f093864: 00002025 */ or $a0,$zero,$zero -/* f093868: 0c01210c */ jal func00048430 +/* f093868: 0c01210c */ jal osSetThreadPri /* f09386c: 24450001 */ addiu $a1,$v0,0x1 /* f093870: 8ea90000 */ lw $t1,0x0($s5) /* f093874: 02602025 */ or $a0,$s3,$zero @@ -1427,7 +1427,7 @@ glabel func0f093790 /* f09387c: 0fc24b01 */ jal func0f092c04 /* f093880: a5510010 */ sh $s1,0x10($t2) /* f093884: 00002025 */ or $a0,$zero,$zero -/* f093888: 0c01210c */ jal func00048430 +/* f093888: 0c01210c */ jal osSetThreadPri /* f09388c: 02002825 */ or $a1,$s0,$zero /* f093890: 3c038009 */ lui $v1,%hi(g_Is4Mb) /* f093894: 90630af0 */ lbu $v1,%lo(g_Is4Mb)($v1) @@ -1937,36 +1937,36 @@ glabel func0f0939f8 /* f093f78: 960e0030 */ lhu $t6,0x30($s0) /* f093f7c: 00002025 */ or $a0,$zero,$zero /* f093f80: 35cf0010 */ ori $t7,$t6,0x10 -/* f093f84: 0c012230 */ jal func000488c0 +/* f093f84: 0c012230 */ jal osGetThreadPri /* f093f88: a60f0030 */ sh $t7,0x30($s0) /* f093f8c: 3c048009 */ lui $a0,%hi(var800915e0) /* f093f90: afa200a8 */ sw $v0,0xa8($sp) -/* f093f94: 0c012230 */ jal func000488c0 +/* f093f94: 0c012230 */ jal osGetThreadPri /* f093f98: 248415e0 */ addiu $a0,$a0,%lo(var800915e0) /* f093f9c: 00002025 */ or $a0,$zero,$zero -/* f093fa0: 0c01210c */ jal func00048430 +/* f093fa0: 0c01210c */ jal osSetThreadPri /* f093fa4: 24450001 */ addiu $a1,$v0,0x1 /* f093fa8: 0fc24b01 */ jal func0f092c04 /* f093fac: 8604002e */ lh $a0,0x2e($s0) /* f093fb0: 00002025 */ or $a0,$zero,$zero -/* f093fb4: 0c01210c */ jal func00048430 +/* f093fb4: 0c01210c */ jal osSetThreadPri /* f093fb8: 8fa500a8 */ lw $a1,0xa8($sp) /* f093fbc: 10000010 */ beqz $zero,.L0f094000 /* f093fc0: 96030030 */ lhu $v1,0x30($s0) .L0f093fc4: -/* f093fc4: 0c012230 */ jal func000488c0 +/* f093fc4: 0c012230 */ jal osGetThreadPri /* f093fc8: 00002025 */ or $a0,$zero,$zero /* f093fcc: 3c048009 */ lui $a0,%hi(var800915e0) /* f093fd0: afa200a8 */ sw $v0,0xa8($sp) -/* f093fd4: 0c012230 */ jal func000488c0 +/* f093fd4: 0c012230 */ jal osGetThreadPri /* f093fd8: 248415e0 */ addiu $a0,$a0,%lo(var800915e0) /* f093fdc: 00002025 */ or $a0,$zero,$zero -/* f093fe0: 0c01210c */ jal func00048430 +/* f093fe0: 0c01210c */ jal osSetThreadPri /* f093fe4: 24450001 */ addiu $a1,$v0,0x1 /* f093fe8: 0fc24b01 */ jal func0f092c04 /* f093fec: 8604002e */ lh $a0,0x2e($s0) /* f093ff0: 00002025 */ or $a0,$zero,$zero -/* f093ff4: 0c01210c */ jal func00048430 +/* f093ff4: 0c01210c */ jal osSetThreadPri /* f093ff8: 8fa500a8 */ lw $a1,0xa8($sp) /* f093ffc: 96030030 */ lhu $v1,0x30($s0) .L0f094000: @@ -2438,19 +2438,19 @@ glabel audioPlayFromProp2 /* f094660: 57000010 */ bnezl $t8,.L0f0946a4 /* f094664: 8fbf0044 */ lw $ra,0x44($sp) .L0f094668: -/* f094668: 0c012230 */ jal func000488c0 +/* f094668: 0c012230 */ jal osGetThreadPri /* f09466c: 00002025 */ or $a0,$zero,$zero /* f094670: 3c048009 */ lui $a0,%hi(var800915e0) /* f094674: afa20048 */ sw $v0,0x48($sp) -/* f094678: 0c012230 */ jal func000488c0 +/* f094678: 0c012230 */ jal osGetThreadPri /* f09467c: 248415e0 */ addiu $a0,$a0,%lo(var800915e0) /* f094680: 00002025 */ or $a0,$zero,$zero -/* f094684: 0c01210c */ jal func00048430 +/* f094684: 0c01210c */ jal osSetThreadPri /* f094688: 24450001 */ addiu $a1,$v0,0x1 /* f09468c: 0fc24b01 */ jal func0f092c04 /* f094690: 8fa40058 */ lw $a0,0x58($sp) /* f094694: 00002025 */ or $a0,$zero,$zero -/* f094698: 0c01210c */ jal func00048430 +/* f094698: 0c01210c */ jal osSetThreadPri /* f09469c: 8fa50048 */ lw $a1,0x48($sp) /* f0946a0: 8fbf0044 */ lw $ra,0x44($sp) .L0f0946a4: diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index ce5cb113c..23be44cb1 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -3657,14 +3657,14 @@ glabel var7f1ac320 .L0f09a9bc: /* f09a9bc: 50600075 */ beqzl $v1,.L0f09ab94 /* f09a9c0: 8fbf002c */ lw $ra,0x2c($sp) -/* f09a9c4: 0c012230 */ jal func000488c0 +/* f09a9c4: 0c012230 */ jal osGetThreadPri /* f09a9c8: 00002025 */ or $a0,$zero,$zero /* f09a9cc: 3c048009 */ lui $a0,%hi(var800915e0) /* f09a9d0: afa20040 */ sw $v0,0x40($sp) -/* f09a9d4: 0c012230 */ jal func000488c0 +/* f09a9d4: 0c012230 */ jal osGetThreadPri /* f09a9d8: 248415e0 */ addiu $a0,$a0,%lo(var800915e0) /* f09a9dc: 00002025 */ or $a0,$zero,$zero -/* f09a9e0: 0c01210c */ jal func00048430 +/* f09a9e0: 0c01210c */ jal osSetThreadPri /* f09a9e4: 24450001 */ addiu $a1,$v0,0x1 /* f09a9e8: 8e0401cc */ lw $a0,0x1cc($s0) /* f09a9ec: 50800008 */ beqzl $a0,.L0f09aa10 @@ -3778,7 +3778,7 @@ glabel var7f1ac320 .L0f09ab84: /* f09ab84: 00002025 */ or $a0,$zero,$zero .L0f09ab88: -/* f09ab88: 0c01210c */ jal func00048430 +/* f09ab88: 0c01210c */ jal osSetThreadPri /* f09ab8c: 8fa50040 */ lw $a1,0x40($sp) .L0f09ab90: /* f09ab90: 8fbf002c */ lw $ra,0x2c($sp) @@ -5016,14 +5016,14 @@ glabel var7f1ac450 /* f09ba7c: 3c017f1b */ lui $at,%hi(var7f1ac480) /* f09ba80: c424c480 */ lwc1 $f4,%lo(var7f1ac480)($at) /* f09ba84: 00002025 */ or $a0,$zero,$zero -/* f09ba88: 0c012230 */ jal func000488c0 +/* f09ba88: 0c012230 */ jal osGetThreadPri /* f09ba8c: e7a40044 */ swc1 $f4,0x44($sp) /* f09ba90: 3c048009 */ lui $a0,%hi(var800915e0) /* f09ba94: afa20040 */ sw $v0,0x40($sp) -/* f09ba98: 0c012230 */ jal func000488c0 +/* f09ba98: 0c012230 */ jal osGetThreadPri /* f09ba9c: 248415e0 */ addiu $a0,$a0,%lo(var800915e0) /* f09baa0: 00002025 */ or $a0,$zero,$zero -/* f09baa4: 0c01210c */ jal func00048430 +/* f09baa4: 0c01210c */ jal osSetThreadPri /* f09baa8: 24450001 */ addiu $a1,$v0,0x1 /* f09baac: 3c01bf80 */ lui $at,0xbf80 /* f09bab0: 44813000 */ mtc1 $at,$f6 @@ -5047,19 +5047,19 @@ glabel var7f1ac450 /* f09baf8: 8fa60044 */ lw $a2,0x44($sp) .L0f09bafc: /* f09bafc: 00002025 */ or $a0,$zero,$zero -/* f09bb00: 0c01210c */ jal func00048430 +/* f09bb00: 0c01210c */ jal osSetThreadPri /* f09bb04: 8fa50040 */ lw $a1,0x40($sp) /* f09bb08: 3c013fc0 */ lui $at,0x3fc0 /* f09bb0c: 44814000 */ mtc1 $at,$f8 /* f09bb10: 00002025 */ or $a0,$zero,$zero -/* f09bb14: 0c012230 */ jal func000488c0 +/* f09bb14: 0c012230 */ jal osGetThreadPri /* f09bb18: e7a80038 */ swc1 $f8,0x38($sp) /* f09bb1c: 3c048009 */ lui $a0,%hi(var800915e0) /* f09bb20: afa20034 */ sw $v0,0x34($sp) -/* f09bb24: 0c012230 */ jal func000488c0 +/* f09bb24: 0c012230 */ jal osGetThreadPri /* f09bb28: 248415e0 */ addiu $a0,$a0,%lo(var800915e0) /* f09bb2c: 00002025 */ or $a0,$zero,$zero -/* f09bb30: 0c01210c */ jal func00048430 +/* f09bb30: 0c01210c */ jal osSetThreadPri /* f09bb34: 24450001 */ addiu $a1,$v0,0x1 /* f09bb38: 3c01bf80 */ lui $at,0xbf80 /* f09bb3c: 44815000 */ mtc1 $at,$f10 @@ -5083,7 +5083,7 @@ glabel var7f1ac450 /* f09bb84: 8fa60038 */ lw $a2,0x38($sp) .L0f09bb88: /* f09bb88: 00002025 */ or $a0,$zero,$zero -/* f09bb8c: 0c01210c */ jal func00048430 +/* f09bb8c: 0c01210c */ jal osSetThreadPri /* f09bb90: 8fa50034 */ lw $a1,0x34($sp) /* f09bb94: 10000011 */ beqz $zero,.L0f09bbdc /* f09bb98: 8e0e000c */ lw $t6,0xc($s0) @@ -6120,14 +6120,14 @@ glabel var7f1ac5ec /* f09c6dc: 3c014060 */ lui $at,0x4060 /* f09c6e0: 44813000 */ mtc1 $at,$f6 /* f09c6e4: 00002025 */ or $a0,$zero,$zero -/* f09c6e8: 0c012230 */ jal func000488c0 +/* f09c6e8: 0c012230 */ jal osGetThreadPri /* f09c6ec: e7a6004c */ swc1 $f6,0x4c($sp) /* f09c6f0: 3c048009 */ lui $a0,%hi(var800915e0) /* f09c6f4: afa20044 */ sw $v0,0x44($sp) -/* f09c6f8: 0c012230 */ jal func000488c0 +/* f09c6f8: 0c012230 */ jal osGetThreadPri /* f09c6fc: 248415e0 */ addiu $a0,$a0,%lo(var800915e0) /* f09c700: 00002025 */ or $a0,$zero,$zero -/* f09c704: 0c01210c */ jal func00048430 +/* f09c704: 0c01210c */ jal osSetThreadPri /* f09c708: 24450001 */ addiu $a1,$v0,0x1 /* f09c70c: 3c01bf80 */ lui $at,0xbf80 /* f09c710: 44814000 */ mtc1 $at,$f8 @@ -6151,7 +6151,7 @@ glabel var7f1ac5ec /* f09c758: 8fa6004c */ lw $a2,0x4c($sp) .L0f09c75c: /* f09c75c: 00002025 */ or $a0,$zero,$zero -/* f09c760: 0c01210c */ jal func00048430 +/* f09c760: 0c01210c */ jal osSetThreadPri /* f09c764: 8fa50044 */ lw $a1,0x44($sp) /* f09c768: 100000a1 */ beqz $zero,.L0f09c9f0 /* f09c76c: 8e0e001c */ lw $t6,0x1c($s0) @@ -6228,14 +6228,14 @@ glabel var7f1ac5ec /* f09c888: 3c013fc0 */ lui $at,0x3fc0 /* f09c88c: 44813000 */ mtc1 $at,$f6 /* f09c890: 00002025 */ or $a0,$zero,$zero -/* f09c894: 0c012230 */ jal func000488c0 +/* f09c894: 0c012230 */ jal osGetThreadPri /* f09c898: e7a60040 */ swc1 $f6,0x40($sp) /* f09c89c: 3c048009 */ lui $a0,%hi(var800915e0) /* f09c8a0: afa2003c */ sw $v0,0x3c($sp) -/* f09c8a4: 0c012230 */ jal func000488c0 +/* f09c8a4: 0c012230 */ jal osGetThreadPri /* f09c8a8: 248415e0 */ addiu $a0,$a0,%lo(var800915e0) /* f09c8ac: 00002025 */ or $a0,$zero,$zero -/* f09c8b0: 0c01210c */ jal func00048430 +/* f09c8b0: 0c01210c */ jal osSetThreadPri /* f09c8b4: 24450001 */ addiu $a1,$v0,0x1 /* f09c8b8: 3c01bf80 */ lui $at,0xbf80 /* f09c8bc: 44814000 */ mtc1 $at,$f8 @@ -6259,21 +6259,21 @@ glabel var7f1ac5ec /* f09c904: 8fa60040 */ lw $a2,0x40($sp) .L0f09c908: /* f09c908: 00002025 */ or $a0,$zero,$zero -/* f09c90c: 0c01210c */ jal func00048430 +/* f09c90c: 0c01210c */ jal osSetThreadPri /* f09c910: 8fa5003c */ lw $a1,0x3c($sp) /* f09c914: 10000036 */ beqz $zero,.L0f09c9f0 /* f09c918: 8e0e001c */ lw $t6,0x1c($s0) /* f09c91c: 3c017f1b */ lui $at,%hi(var7f1ac5e8) /* f09c920: c430c5e8 */ lwc1 $f16,%lo(var7f1ac5e8)($at) /* f09c924: 00002025 */ or $a0,$zero,$zero -/* f09c928: 0c012230 */ jal func000488c0 +/* f09c928: 0c012230 */ jal osGetThreadPri /* f09c92c: e7b00034 */ swc1 $f16,0x34($sp) /* f09c930: 3c048009 */ lui $a0,%hi(var800915e0) /* f09c934: afa20030 */ sw $v0,0x30($sp) -/* f09c938: 0c012230 */ jal func000488c0 +/* f09c938: 0c012230 */ jal osGetThreadPri /* f09c93c: 248415e0 */ addiu $a0,$a0,%lo(var800915e0) /* f09c940: 00002025 */ or $a0,$zero,$zero -/* f09c944: 0c01210c */ jal func00048430 +/* f09c944: 0c01210c */ jal osSetThreadPri /* f09c948: 24450001 */ addiu $a1,$v0,0x1 /* f09c94c: 3c01bf80 */ lui $at,0xbf80 /* f09c950: 44815000 */ mtc1 $at,$f10 @@ -6297,7 +6297,7 @@ glabel var7f1ac5ec /* f09c998: 8fa60034 */ lw $a2,0x34($sp) .L0f09c99c: /* f09c99c: 00002025 */ or $a0,$zero,$zero -/* f09c9a0: 0c01210c */ jal func00048430 +/* f09c9a0: 0c01210c */ jal osSetThreadPri /* f09c9a4: 8fa50030 */ lw $a1,0x30($sp) /* f09c9a8: 10000011 */ beqz $zero,.L0f09c9f0 /* f09c9ac: 8e0e001c */ lw $t6,0x1c($s0) diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index c9ae9a59f..a1142f792 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -485,14 +485,14 @@ glabel var7f1b27fc /* f0f0ac0: 00002025 */ or $a0,$zero,$zero /* f0f0ac4: afa20034 */ sw $v0,0x34($sp) /* f0f0ac8: afa3003c */ sw $v1,0x3c($sp) -/* f0f0acc: 0c012230 */ jal func000488c0 +/* f0f0acc: 0c012230 */ jal osGetThreadPri /* f0f0ad0: afa80038 */ sw $t0,0x38($sp) /* f0f0ad4: 3c048009 */ lui $a0,%hi(var800915e0) /* f0f0ad8: afa20028 */ sw $v0,0x28($sp) -/* f0f0adc: 0c012230 */ jal func000488c0 +/* f0f0adc: 0c012230 */ jal osGetThreadPri /* f0f0ae0: 248415e0 */ addiu $a0,$a0,%lo(var800915e0) /* f0f0ae4: 00002025 */ or $a0,$zero,$zero -/* f0f0ae8: 0c01210c */ jal func00048430 +/* f0f0ae8: 0c01210c */ jal osSetThreadPri /* f0f0aec: 24450001 */ addiu $a1,$v0,0x1 /* f0f0af0: 8fa3003c */ lw $v1,0x3c($sp) /* f0f0af4: 3c01bf80 */ lui $at,0xbf80 @@ -530,7 +530,7 @@ glabel var7f1b27fc /* f0f0b70: 24064000 */ addiu $a2,$zero,0x4000 .L0f0f0b74: /* f0f0b74: 00002025 */ or $a0,$zero,$zero -/* f0f0b78: 0c01210c */ jal func00048430 +/* f0f0b78: 0c01210c */ jal osSetThreadPri /* f0f0b7c: 8fa50028 */ lw $a1,0x28($sp) .L0f0f0b80: /* f0f0b80: 8fbf0024 */ lw $ra,0x24($sp) diff --git a/src/game/pak/pak.c b/src/game/pak/pak.c index f20278cbf..f67fd7640 100644 --- a/src/game/pak/pak.c +++ b/src/game/pak/pak.c @@ -1385,7 +1385,7 @@ glabel func0f117430 /* f1174e8: 8d0a02c0 */ lw $t2,0x2c0($t0) /* f1174ec: 00403025 */ or $a2,$v0,$zero /* f1174f0: 01472821 */ addu $a1,$t2,$a3 -/* f1174f4: 0c012978 */ jal func0004a5e0 +/* f1174f4: 0c012978 */ jal memcpy /* f1174f8: 24a50004 */ addiu $a1,$a1,0x4 /* f1174fc: 10000004 */ beqz $zero,.L0f117510 /* f117500: 24020001 */ addiu $v0,$zero,0x1 @@ -1492,7 +1492,7 @@ glabel func0f117520 /* f11765c: 24020004 */ addiu $v0,$zero,0x4 .L0f117660: /* f117660: 27a50038 */ addiu $a1,$sp,0x38 -/* f117664: 0c012978 */ jal func0004a5e0 +/* f117664: 0c012978 */ jal memcpy /* f117668: 24060010 */ addiu $a2,$zero,0x10 /* f11766c: 27a40040 */ addiu $a0,$sp,0x40 /* f117670: 27a50048 */ addiu $a1,$sp,0x48 @@ -3644,7 +3644,7 @@ glabel func0f119368 /* f1193fc: 02602825 */ or $a1,$s3,$zero /* f119400: 10800003 */ beqz $a0,.L0f119410 /* f119404: 00000000 */ sll $zero,$zero,0x0 -/* f119408: 0c012978 */ jal func0004a5e0 +/* f119408: 0c012978 */ jal memcpy /* f11940c: 24060010 */ addiu $a2,$zero,0x10 .L0f119410: /* f119410: 10000012 */ beqz $zero,.L0f11945c @@ -4004,7 +4004,7 @@ glabel func0f11970c /* f119910: 02802825 */ or $a1,$s4,$zero /* f119914: acf20000 */ sw $s2,0x0($a3) /* f119918: 8fa40054 */ lw $a0,0x54($sp) -/* f11991c: 0c012978 */ jal func0004a5e0 +/* f11991c: 0c012978 */ jal memcpy /* f119920: 24060010 */ addiu $a2,$zero,0x10 /* f119924: 8fab03a4 */ lw $t3,0x3a4($sp) /* f119928: 8fa6047c */ lw $a2,0x47c($sp) @@ -4029,7 +4029,7 @@ glabel func0f11970c /* f11996c: 03298021 */ addu $s0,$t9,$t1 /* f119970: 026f2021 */ addu $a0,$s3,$t7 /* f119974: 02802825 */ or $a1,$s4,$zero -/* f119978: 0c012978 */ jal func0004a5e0 +/* f119978: 0c012978 */ jal memcpy /* f11997c: 24060010 */ addiu $a2,$zero,0x10 /* f119980: 8fae03a4 */ lw $t6,0x3a4($sp) /* f119984: 8fa6047c */ lw $a2,0x47c($sp) @@ -5904,7 +5904,7 @@ glabel func0f11b178 /* f11b3b4: 00403025 */ or $a2,$v0,$zero /* f11b3b8: 00006012 */ mflo $t4 /* f11b3bc: 014c2021 */ addu $a0,$t2,$t4 -/* f11b3c0: 0c012978 */ jal func0004a5e0 +/* f11b3c0: 0c012978 */ jal memcpy /* f11b3c4: 24840004 */ addiu $a0,$a0,0x4 /* f11b3c8: 92cd02be */ lbu $t5,0x2be($s6) /* f11b3cc: 00009025 */ or $s2,$zero,$zero @@ -5932,7 +5932,7 @@ glabel func0f11b178 /* f11b420: 02112021 */ addu $a0,$s0,$s1 /* f11b424: 02132821 */ addu $a1,$s0,$s3 /* f11b428: 24a50004 */ addiu $a1,$a1,0x4 -/* f11b42c: 0c012978 */ jal func0004a5e0 +/* f11b42c: 0c012978 */ jal memcpy /* f11b430: 24840004 */ addiu $a0,$a0,0x4 /* f11b434: 26520001 */ addiu $s2,$s2,0x1 /* f11b438: 8fa9107c */ lw $t1,0x107c($sp) @@ -5995,7 +5995,7 @@ glabel func0f11b488 /* f11b500: 910c02be */ lbu $t4,0x2be($t0) /* f11b504: 01472821 */ addu $a1,$t2,$a3 /* f11b508: 24a50004 */ addiu $a1,$a1,0x4 -/* f11b50c: 0c012978 */ jal func0004a5e0 +/* f11b50c: 0c012978 */ jal memcpy /* f11b510: 24060010 */ addiu $a2,$zero,0x10 /* f11b514: 10000008 */ beqz $zero,.L0f11b538 /* f11b518: 24020001 */ addiu $v0,$zero,0x1 diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index ef76ef6c8..0f26aaba4 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -2326,114 +2326,7 @@ u32 var8008d260 = 0; u32 var8008d264 = 0; u32 var8008d268 = 0; u32 var8008d26c = 0; -u32 var8008d270 = 0; -u32 var8008d274 = 0; -u32 var8008d278 = 0; -u32 var8008d27c = 0; -u32 var8008d280 = 0; -u32 var8008d284 = 0; -u32 var8008d288 = 0; -u32 var8008d28c = 0; -u32 var8008d290 = 0; -u32 var8008d294 = 0; -u32 var8008d298 = 0; -u32 var8008d29c = 0; -u32 var8008d2a0 = 0; -u32 var8008d2a4 = 0; -u32 var8008d2a8 = 0; -u32 var8008d2ac = 0; -u32 var8008d2b0 = 0; -u32 var8008d2b4 = 0; -u32 var8008d2b8 = 0; -u32 var8008d2bc = 0; -u32 var8008d2c0 = 0; -u32 var8008d2c4 = 0; -u32 var8008d2c8 = 0; -u32 var8008d2cc = 0; -u32 var8008d2d0 = 0; -u32 var8008d2d4 = 0; -u32 var8008d2d8 = 0; -u32 var8008d2dc = 0; -u32 var8008d2e0 = 0; -u32 var8008d2e4 = 0; -u32 var8008d2e8 = 0; -u32 var8008d2ec = 0; -u32 var8008d2f0 = 0; -u32 var8008d2f4 = 0; -u32 var8008d2f8 = 0; -u32 var8008d2fc = 0; -u32 var8008d300 = 0; -u32 var8008d304 = 0; -u32 var8008d308 = 0; -u32 var8008d30c = 0; -u32 var8008d310 = 0; -u32 var8008d314 = 0; -u32 var8008d318 = 0; -u32 var8008d31c = 0; -u32 var8008d320 = 0; -u32 var8008d324 = 0; -u32 var8008d328 = 0; -u32 var8008d32c = 0; -u32 var8008d330 = 0; -u32 var8008d334 = 0; -u32 var8008d338 = 0; -u32 var8008d33c = 0; -u32 var8008d340 = 0; -u32 var8008d344 = 0; -u32 var8008d348 = 0; -u32 var8008d34c = 0; -u32 var8008d350 = 0; -u32 var8008d354 = 0; -u32 var8008d358 = 0; -u32 var8008d35c = 0; -u32 var8008d360 = 0; -u32 var8008d364 = 0; -u32 var8008d368 = 0; -u32 var8008d36c = 0; -u32 var8008d370 = 0; -u32 var8008d374 = 0; -u32 var8008d378 = 0; -u32 var8008d37c = 0; -u32 var8008d380 = 0; -u32 var8008d384 = 0; -u32 var8008d388 = 0; -u32 var8008d38c = 0; -u32 var8008d390 = 0; -u32 var8008d394 = 0; -u32 var8008d398 = 0; -u32 var8008d39c = 0; -u32 var8008d3a0 = 0; -u32 var8008d3a4 = 0; -u32 var8008d3a8 = 0; -u32 var8008d3ac = 0; -u32 var8008d3b0 = 0; -u32 var8008d3b4 = 0; -u32 var8008d3b8 = 0; -u32 var8008d3bc = 0; -u32 var8008d3c0 = 0; -u32 var8008d3c4 = 0; -u32 var8008d3c8 = 0; -u32 var8008d3cc = 0; -u32 var8008d3d0 = 0; -u32 var8008d3d4 = 0; -u32 var8008d3d8 = 0; -u32 var8008d3dc = 0; -u32 var8008d3e0 = 0; -u32 var8008d3e4 = 0; -u32 var8008d3e8 = 0; -u32 var8008d3ec = 0; -u32 var8008d3f0 = 0; -u32 var8008d3f4 = 0; -u32 var8008d3f8 = 0; -u32 var8008d3fc = 0; -u32 var8008d400 = 0; -u32 var8008d404 = 0; -u32 var8008d408 = 0; -u32 var8008d40c = 0; -u32 var8008d410 = 0; -u32 var8008d414 = 0; -u32 var8008d418 = 0; -u32 var8008d41c = 0; +OSThread var8008d270 = {0}; u32 var8008d420 = 0; u32 var8008d424 = 0; u32 var8008d428 = 0; @@ -2466,114 +2359,7 @@ u32 var8008d490 = 0; u32 var8008d494 = 0; u32 var8008d498 = 0; u32 var8008d49c = 0; -u32 var8008d4a0 = 0; -u32 var8008d4a4 = 0; -u32 var8008d4a8 = 0; -u32 var8008d4ac = 0; -u32 var8008d4b0 = 0; -u32 var8008d4b4 = 0; -u32 var8008d4b8 = 0; -u32 var8008d4bc = 0; -u32 var8008d4c0 = 0; -u32 var8008d4c4 = 0; -u32 var8008d4c8 = 0; -u32 var8008d4cc = 0; -u32 var8008d4d0 = 0; -u32 var8008d4d4 = 0; -u32 var8008d4d8 = 0; -u32 var8008d4dc = 0; -u32 var8008d4e0 = 0; -u32 var8008d4e4 = 0; -u32 var8008d4e8 = 0; -u32 var8008d4ec = 0; -u32 var8008d4f0 = 0; -u32 var8008d4f4 = 0; -u32 var8008d4f8 = 0; -u32 var8008d4fc = 0; -u32 var8008d500 = 0; -u32 var8008d504 = 0; -u32 var8008d508 = 0; -u32 var8008d50c = 0; -u32 var8008d510 = 0; -u32 var8008d514 = 0; -u32 var8008d518 = 0; -u32 var8008d51c = 0; -u32 var8008d520 = 0; -u32 var8008d524 = 0; -u32 var8008d528 = 0; -u32 var8008d52c = 0; -u32 var8008d530 = 0; -u32 var8008d534 = 0; -u32 var8008d538 = 0; -u32 var8008d53c = 0; -u32 var8008d540 = 0; -u32 var8008d544 = 0; -u32 var8008d548 = 0; -u32 var8008d54c = 0; -u32 var8008d550 = 0; -u32 var8008d554 = 0; -u32 var8008d558 = 0; -u32 var8008d55c = 0; -u32 var8008d560 = 0; -u32 var8008d564 = 0; -u32 var8008d568 = 0; -u32 var8008d56c = 0; -u32 var8008d570 = 0; -u32 var8008d574 = 0; -u32 var8008d578 = 0; -u32 var8008d57c = 0; -u32 var8008d580 = 0; -u32 var8008d584 = 0; -u32 var8008d588 = 0; -u32 var8008d58c = 0; -u32 var8008d590 = 0; -u32 var8008d594 = 0; -u32 var8008d598 = 0; -u32 var8008d59c = 0; -u32 var8008d5a0 = 0; -u32 var8008d5a4 = 0; -u32 var8008d5a8 = 0; -u32 var8008d5ac = 0; -u32 var8008d5b0 = 0; -u32 var8008d5b4 = 0; -u32 var8008d5b8 = 0; -u32 var8008d5bc = 0; -u32 var8008d5c0 = 0; -u32 var8008d5c4 = 0; -u32 var8008d5c8 = 0; -u32 var8008d5cc = 0; -u32 var8008d5d0 = 0; -u32 var8008d5d4 = 0; -u32 var8008d5d8 = 0; -u32 var8008d5dc = 0; -u32 var8008d5e0 = 0; -u32 var8008d5e4 = 0; -u32 var8008d5e8 = 0; -u32 var8008d5ec = 0; -u32 var8008d5f0 = 0; -u32 var8008d5f4 = 0; -u32 var8008d5f8 = 0; -u32 var8008d5fc = 0; -u32 var8008d600 = 0; -u32 var8008d604 = 0; -u32 var8008d608 = 0; -u32 var8008d60c = 0; -u32 var8008d610 = 0; -u32 var8008d614 = 0; -u32 var8008d618 = 0; -u32 var8008d61c = 0; -u32 var8008d620 = 0; -u32 var8008d624 = 0; -u32 var8008d628 = 0; -u32 var8008d62c = 0; -u32 var8008d630 = 0; -u32 var8008d634 = 0; -u32 var8008d638 = 0; -u32 var8008d63c = 0; -u32 var8008d640 = 0; -u32 var8008d644 = 0; -u32 var8008d648 = 0; -u32 var8008d64c = 0; +OSThread var8008d4a0 = {0}; u32 var8008d650 = 0; u32 var8008d654 = 0; u32 var8008d658 = 0; @@ -2606,114 +2392,7 @@ u32 var8008d6c0 = 0; u32 var8008d6c4 = 0; u32 var8008d6c8 = 0; u32 var8008d6cc = 0; -u32 var8008d6d0 = 0; -u32 var8008d6d4 = 0; -u32 var8008d6d8 = 0; -u32 var8008d6dc = 0; -u32 var8008d6e0 = 0; -u32 var8008d6e4 = 0; -u32 var8008d6e8 = 0; -u32 var8008d6ec = 0; -u32 var8008d6f0 = 0; -u32 var8008d6f4 = 0; -u32 var8008d6f8 = 0; -u32 var8008d6fc = 0; -u32 var8008d700 = 0; -u32 var8008d704 = 0; -u32 var8008d708 = 0; -u32 var8008d70c = 0; -u32 var8008d710 = 0; -u32 var8008d714 = 0; -u32 var8008d718 = 0; -u32 var8008d71c = 0; -u32 var8008d720 = 0; -u32 var8008d724 = 0; -u32 var8008d728 = 0; -u32 var8008d72c = 0; -u32 var8008d730 = 0; -u32 var8008d734 = 0; -u32 var8008d738 = 0; -u32 var8008d73c = 0; -u32 var8008d740 = 0; -u32 var8008d744 = 0; -u32 var8008d748 = 0; -u32 var8008d74c = 0; -u32 var8008d750 = 0; -u32 var8008d754 = 0; -u32 var8008d758 = 0; -u32 var8008d75c = 0; -u32 var8008d760 = 0; -u32 var8008d764 = 0; -u32 var8008d768 = 0; -u32 var8008d76c = 0; -u32 var8008d770 = 0; -u32 var8008d774 = 0; -u32 var8008d778 = 0; -u32 var8008d77c = 0; -u32 var8008d780 = 0; -u32 var8008d784 = 0; -u32 var8008d788 = 0; -u32 var8008d78c = 0; -u32 var8008d790 = 0; -u32 var8008d794 = 0; -u32 var8008d798 = 0; -u32 var8008d79c = 0; -u32 var8008d7a0 = 0; -u32 var8008d7a4 = 0; -u32 var8008d7a8 = 0; -u32 var8008d7ac = 0; -u32 var8008d7b0 = 0; -u32 var8008d7b4 = 0; -u32 var8008d7b8 = 0; -u32 var8008d7bc = 0; -u32 var8008d7c0 = 0; -u32 var8008d7c4 = 0; -u32 var8008d7c8 = 0; -u32 var8008d7cc = 0; -u32 var8008d7d0 = 0; -u32 var8008d7d4 = 0; -u32 var8008d7d8 = 0; -u32 var8008d7dc = 0; -u32 var8008d7e0 = 0; -u32 var8008d7e4 = 0; -u32 var8008d7e8 = 0; -u32 var8008d7ec = 0; -u32 var8008d7f0 = 0; -u32 var8008d7f4 = 0; -u32 var8008d7f8 = 0; -u32 var8008d7fc = 0; -u32 var8008d800 = 0; -u32 var8008d804 = 0; -u32 var8008d808 = 0; -u32 var8008d80c = 0; -u32 var8008d810 = 0; -u32 var8008d814 = 0; -u32 var8008d818 = 0; -u32 var8008d81c = 0; -u32 var8008d820 = 0; -u32 var8008d824 = 0; -u32 var8008d828 = 0; -u32 var8008d82c = 0; -u32 var8008d830 = 0; -u32 var8008d834 = 0; -u32 var8008d838 = 0; -u32 var8008d83c = 0; -u32 var8008d840 = 0; -u32 var8008d844 = 0; -u32 var8008d848 = 0; -u32 var8008d84c = 0; -u32 var8008d850 = 0; -u32 var8008d854 = 0; -u32 var8008d858 = 0; -u32 var8008d85c = 0; -u32 var8008d860 = 0; -u32 var8008d864 = 0; -u32 var8008d868 = 0; -u32 var8008d86c = 0; -u32 var8008d870 = 0; -u32 var8008d874 = 0; -u32 var8008d878 = 0; -u32 var8008d87c = 0; +OSThread var8008d6d0 = {0}; u32 var8008d880 = 0; u32 var8008d884 = 0; u32 var8008d888 = 0; @@ -3107,114 +2786,7 @@ u32 var8008fab0 = 0; u32 var8008fab4 = 0; u32 var8008fab8 = 0; u32 var8008fabc = 0; -u32 var8008fac0 = 0; -u32 var8008fac4 = 0; -u32 var8008fac8 = 0; -u32 var8008facc = 0; -u32 var8008fad0 = 0; -u32 var8008fad4 = 0; -u32 var8008fad8 = 0; -u32 var8008fadc = 0; -u32 var8008fae0 = 0; -u32 var8008fae4 = 0; -u32 var8008fae8 = 0; -u32 var8008faec = 0; -u32 var8008faf0 = 0; -u32 var8008faf4 = 0; -u32 var8008faf8 = 0; -u32 var8008fafc = 0; -u32 var8008fb00 = 0; -u32 var8008fb04 = 0; -u32 var8008fb08 = 0; -u32 var8008fb0c = 0; -u32 var8008fb10 = 0; -u32 var8008fb14 = 0; -u32 var8008fb18 = 0; -u32 var8008fb1c = 0; -u32 var8008fb20 = 0; -u32 var8008fb24 = 0; -u32 var8008fb28 = 0; -u32 var8008fb2c = 0; -u32 var8008fb30 = 0; -u32 var8008fb34 = 0; -u32 var8008fb38 = 0; -u32 var8008fb3c = 0; -u32 var8008fb40 = 0; -u32 var8008fb44 = 0; -u32 var8008fb48 = 0; -u32 var8008fb4c = 0; -u32 var8008fb50 = 0; -u32 var8008fb54 = 0; -u32 var8008fb58 = 0; -u32 var8008fb5c = 0; -u32 var8008fb60 = 0; -u32 var8008fb64 = 0; -u32 var8008fb68 = 0; -u32 var8008fb6c = 0; -u32 var8008fb70 = 0; -u32 var8008fb74 = 0; -u32 var8008fb78 = 0; -u32 var8008fb7c = 0; -u32 var8008fb80 = 0; -u32 var8008fb84 = 0; -u32 var8008fb88 = 0; -u32 var8008fb8c = 0; -u32 var8008fb90 = 0; -u32 var8008fb94 = 0; -u32 var8008fb98 = 0; -u32 var8008fb9c = 0; -u32 var8008fba0 = 0; -u32 var8008fba4 = 0; -u32 var8008fba8 = 0; -u32 var8008fbac = 0; -u32 var8008fbb0 = 0; -u32 var8008fbb4 = 0; -u32 var8008fbb8 = 0; -u32 var8008fbbc = 0; -u32 var8008fbc0 = 0; -u32 var8008fbc4 = 0; -u32 var8008fbc8 = 0; -u32 var8008fbcc = 0; -u32 var8008fbd0 = 0; -u32 var8008fbd4 = 0; -u32 var8008fbd8 = 0; -u32 var8008fbdc = 0; -u32 var8008fbe0 = 0; -u32 var8008fbe4 = 0; -u32 var8008fbe8 = 0; -u32 var8008fbec = 0; -u32 var8008fbf0 = 0; -u32 var8008fbf4 = 0; -u32 var8008fbf8 = 0; -u32 var8008fbfc = 0; -u32 var8008fc00 = 0; -u32 var8008fc04 = 0; -u32 var8008fc08 = 0; -u32 var8008fc0c = 0; -u32 var8008fc10 = 0; -u32 var8008fc14 = 0; -u32 var8008fc18 = 0; -u32 var8008fc1c = 0; -u32 var8008fc20 = 0; -u32 var8008fc24 = 0; -u32 var8008fc28 = 0; -u32 var8008fc2c = 0; -u32 var8008fc30 = 0; -u32 var8008fc34 = 0; -u32 var8008fc38 = 0; -u32 var8008fc3c = 0; -u32 var8008fc40 = 0; -u32 var8008fc44 = 0; -u32 var8008fc48 = 0; -u32 var8008fc4c = 0; -u32 var8008fc50 = 0; -u32 var8008fc54 = 0; -u32 var8008fc58 = 0; -u32 var8008fc5c = 0; -u32 var8008fc60 = 0; -u32 var8008fc64 = 0; -u32 var8008fc68 = 0; -u32 var8008fc6c = 0; +OSThread var8008fac0 = {0}; u32 var8008fc70 = 0; u32 var8008fc74 = 0; u32 var8008fc78 = 0; @@ -3315,114 +2887,7 @@ u32 var8008fdf0 = 0; u32 var8008fdf4 = 0; u32 var8008fdf8 = 0; u32 var8008fdfc = 0; -u32 var8008fe00 = 0; -u32 var8008fe04 = 0; -u32 var8008fe08 = 0; -u32 var8008fe0c = 0; -u32 var8008fe10 = 0; -u32 var8008fe14 = 0; -u32 var8008fe18 = 0; -u32 var8008fe1c = 0; -u32 var8008fe20 = 0; -u32 var8008fe24 = 0; -u32 var8008fe28 = 0; -u32 var8008fe2c = 0; -u32 var8008fe30 = 0; -u32 var8008fe34 = 0; -u32 var8008fe38 = 0; -u32 var8008fe3c = 0; -u32 var8008fe40 = 0; -u32 var8008fe44 = 0; -u32 var8008fe48 = 0; -u32 var8008fe4c = 0; -u32 var8008fe50 = 0; -u32 var8008fe54 = 0; -u32 var8008fe58 = 0; -u32 var8008fe5c = 0; -u32 var8008fe60 = 0; -u32 var8008fe64 = 0; -u32 var8008fe68 = 0; -u32 var8008fe6c = 0; -u32 var8008fe70 = 0; -u32 var8008fe74 = 0; -u32 var8008fe78 = 0; -u32 var8008fe7c = 0; -u32 var8008fe80 = 0; -u32 var8008fe84 = 0; -u32 var8008fe88 = 0; -u32 var8008fe8c = 0; -u32 var8008fe90 = 0; -u32 var8008fe94 = 0; -u32 var8008fe98 = 0; -u32 var8008fe9c = 0; -u32 var8008fea0 = 0; -u32 var8008fea4 = 0; -u32 var8008fea8 = 0; -u32 var8008feac = 0; -u32 var8008feb0 = 0; -u32 var8008feb4 = 0; -u32 var8008feb8 = 0; -u32 var8008febc = 0; -u32 var8008fec0 = 0; -u32 var8008fec4 = 0; -u32 var8008fec8 = 0; -u32 var8008fecc = 0; -u32 var8008fed0 = 0; -u32 var8008fed4 = 0; -u32 var8008fed8 = 0; -u32 var8008fedc = 0; -u32 var8008fee0 = 0; -u32 var8008fee4 = 0; -u32 var8008fee8 = 0; -u32 var8008feec = 0; -u32 var8008fef0 = 0; -u32 var8008fef4 = 0; -u32 var8008fef8 = 0; -u32 var8008fefc = 0; -u32 var8008ff00 = 0; -u32 var8008ff04 = 0; -u32 var8008ff08 = 0; -u32 var8008ff0c = 0; -u32 var8008ff10 = 0; -u32 var8008ff14 = 0; -u32 var8008ff18 = 0; -u32 var8008ff1c = 0; -u32 var8008ff20 = 0; -u32 var8008ff24 = 0; -u32 var8008ff28 = 0; -u32 var8008ff2c = 0; -u32 var8008ff30 = 0; -u32 var8008ff34 = 0; -u32 var8008ff38 = 0; -u32 var8008ff3c = 0; -u32 var8008ff40 = 0; -u32 var8008ff44 = 0; -u32 var8008ff48 = 0; -u32 var8008ff4c = 0; -u32 var8008ff50 = 0; -u32 var8008ff54 = 0; -u32 var8008ff58 = 0; -u32 var8008ff5c = 0; -u32 var8008ff60 = 0; -u32 var8008ff64 = 0; -u32 var8008ff68 = 0; -u32 var8008ff6c = 0; -u32 var8008ff70 = 0; -u32 var8008ff74 = 0; -u32 var8008ff78 = 0; -u32 var8008ff7c = 0; -u32 var8008ff80 = 0; -u32 var8008ff84 = 0; -u32 var8008ff88 = 0; -u32 var8008ff8c = 0; -u32 var8008ff90 = 0; -u32 var8008ff94 = 0; -u32 var8008ff98 = 0; -u32 var8008ff9c = 0; -u32 var8008ffa0 = 0; -u32 var8008ffa4 = 0; -u32 var8008ffa8 = 0; -u32 var8008ffac = 0; +OSThread var8008fe00 = {0}; u32 var8008ffb0 = 0; u32 var8008ffb4 = 0; u32 var8008ffb8 = 0; @@ -3671,114 +3136,7 @@ u32 var80090380 = 0; u32 var80090384 = 0; u32 var80090388 = 0; u32 var8009038c = 0; -u32 var80090390 = 0; -u32 var80090394 = 0; -u32 var80090398 = 0; -u32 var8009039c = 0; -u32 var800903a0 = 0; -u32 var800903a4 = 0; -u32 var800903a8 = 0; -u32 var800903ac = 0; -u32 var800903b0 = 0; -u32 var800903b4 = 0; -u32 var800903b8 = 0; -u32 var800903bc = 0; -u32 var800903c0 = 0; -u32 var800903c4 = 0; -u32 var800903c8 = 0; -u32 var800903cc = 0; -u32 var800903d0 = 0; -u32 var800903d4 = 0; -u32 var800903d8 = 0; -u32 var800903dc = 0; -u32 var800903e0 = 0; -u32 var800903e4 = 0; -u32 var800903e8 = 0; -u32 var800903ec = 0; -u32 var800903f0 = 0; -u32 var800903f4 = 0; -u32 var800903f8 = 0; -u32 var800903fc = 0; -u32 var80090400 = 0; -u32 var80090404 = 0; -u32 var80090408 = 0; -u32 var8009040c = 0; -u32 var80090410 = 0; -u32 var80090414 = 0; -u32 var80090418 = 0; -u32 var8009041c = 0; -u32 var80090420 = 0; -u32 var80090424 = 0; -u32 var80090428 = 0; -u32 var8009042c = 0; -u32 var80090430 = 0; -u32 var80090434 = 0; -u32 var80090438 = 0; -u32 var8009043c = 0; -u32 var80090440 = 0; -u32 var80090444 = 0; -u32 var80090448 = 0; -u32 var8009044c = 0; -u32 var80090450 = 0; -u32 var80090454 = 0; -u32 var80090458 = 0; -u32 var8009045c = 0; -u32 var80090460 = 0; -u32 var80090464 = 0; -u32 var80090468 = 0; -u32 var8009046c = 0; -u32 var80090470 = 0; -u32 var80090474 = 0; -u32 var80090478 = 0; -u32 var8009047c = 0; -u32 var80090480 = 0; -u32 var80090484 = 0; -u32 var80090488 = 0; -u32 var8009048c = 0; -u32 var80090490 = 0; -u32 var80090494 = 0; -u32 var80090498 = 0; -u32 var8009049c = 0; -u32 var800904a0 = 0; -u32 var800904a4 = 0; -u32 var800904a8 = 0; -u32 var800904ac = 0; -u32 var800904b0 = 0; -u32 var800904b4 = 0; -u32 var800904b8 = 0; -u32 var800904bc = 0; -u32 var800904c0 = 0; -u32 var800904c4 = 0; -u32 var800904c8 = 0; -u32 var800904cc = 0; -u32 var800904d0 = 0; -u32 var800904d4 = 0; -u32 var800904d8 = 0; -u32 var800904dc = 0; -u32 var800904e0 = 0; -u32 var800904e4 = 0; -u32 var800904e8 = 0; -u32 var800904ec = 0; -u32 var800904f0 = 0; -u32 var800904f4 = 0; -u32 var800904f8 = 0; -u32 var800904fc = 0; -u32 var80090500 = 0; -u32 var80090504 = 0; -u32 var80090508 = 0; -u32 var8009050c = 0; -u32 var80090510 = 0; -u32 var80090514 = 0; -u32 var80090518 = 0; -u32 var8009051c = 0; -u32 var80090520 = 0; -u32 var80090524 = 0; -u32 var80090528 = 0; -u32 var8009052c = 0; -u32 var80090530 = 0; -u32 var80090534 = 0; -u32 var80090538 = 0; -u32 var8009053c = 0; +OSThread var80090390 = {0}; u32 var80090540 = 0; u32 var80090544 = 0; u32 var80090548 = 0; @@ -4843,114 +4201,7 @@ u32 var800915d0 = 0; u32 var800915d4 = 0; u32 var800915d8 = 0; u32 var800915dc = 0; -u32 var800915e0 = 0; -u32 var800915e4 = 0; -u32 var800915e8 = 0; -u32 var800915ec = 0; -u32 var800915f0 = 0; -u32 var800915f4 = 0; -u32 var800915f8 = 0; -u32 var800915fc = 0; -u32 var80091600 = 0; -u32 var80091604 = 0; -u32 var80091608 = 0; -u32 var8009160c = 0; -u32 var80091610 = 0; -u32 var80091614 = 0; -u32 var80091618 = 0; -u32 var8009161c = 0; -u32 var80091620 = 0; -u32 var80091624 = 0; -u32 var80091628 = 0; -u32 var8009162c = 0; -u32 var80091630 = 0; -u32 var80091634 = 0; -u32 var80091638 = 0; -u32 var8009163c = 0; -u32 var80091640 = 0; -u32 var80091644 = 0; -u32 var80091648 = 0; -u32 var8009164c = 0; -u32 var80091650 = 0; -u32 var80091654 = 0; -u32 var80091658 = 0; -u32 var8009165c = 0; -u32 var80091660 = 0; -u32 var80091664 = 0; -u32 var80091668 = 0; -u32 var8009166c = 0; -u32 var80091670 = 0; -u32 var80091674 = 0; -u32 var80091678 = 0; -u32 var8009167c = 0; -u32 var80091680 = 0; -u32 var80091684 = 0; -u32 var80091688 = 0; -u32 var8009168c = 0; -u32 var80091690 = 0; -u32 var80091694 = 0; -u32 var80091698 = 0; -u32 var8009169c = 0; -u32 var800916a0 = 0; -u32 var800916a4 = 0; -u32 var800916a8 = 0; -u32 var800916ac = 0; -u32 var800916b0 = 0; -u32 var800916b4 = 0; -u32 var800916b8 = 0; -u32 var800916bc = 0; -u32 var800916c0 = 0; -u32 var800916c4 = 0; -u32 var800916c8 = 0; -u32 var800916cc = 0; -u32 var800916d0 = 0; -u32 var800916d4 = 0; -u32 var800916d8 = 0; -u32 var800916dc = 0; -u32 var800916e0 = 0; -u32 var800916e4 = 0; -u32 var800916e8 = 0; -u32 var800916ec = 0; -u32 var800916f0 = 0; -u32 var800916f4 = 0; -u32 var800916f8 = 0; -u32 var800916fc = 0; -u32 var80091700 = 0; -u32 var80091704 = 0; -u32 var80091708 = 0; -u32 var8009170c = 0; -u32 var80091710 = 0; -u32 var80091714 = 0; -u32 var80091718 = 0; -u32 var8009171c = 0; -u32 var80091720 = 0; -u32 var80091724 = 0; -u32 var80091728 = 0; -u32 var8009172c = 0; -u32 var80091730 = 0; -u32 var80091734 = 0; -u32 var80091738 = 0; -u32 var8009173c = 0; -u32 var80091740 = 0; -u32 var80091744 = 0; -u32 var80091748 = 0; -u32 var8009174c = 0; -u32 var80091750 = 0; -u32 var80091754 = 0; -u32 var80091758 = 0; -u32 var8009175c = 0; -u32 var80091760 = 0; -u32 var80091764 = 0; -u32 var80091768 = 0; -u32 var8009176c = 0; -u32 var80091770 = 0; -u32 var80091774 = 0; -u32 var80091778 = 0; -u32 var8009177c = 0; -u32 var80091780 = 0; -u32 var80091784 = 0; -u32 var80091788 = 0; -u32 var8009178c = 0; +OSThread var800915e0 = {0}; u32 var80091790 = 0; u32 var80091794 = 0; u32 var80091798 = 0; diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index 64638dd6d..ae6a94b65 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -359,9 +359,9 @@ extern u32 var8008ae30; extern u32 var8008ae38; extern u32 var8008be38; extern u32 var8008d238; -extern u32 var8008d270; -extern u32 var8008d4a0; -extern u32 var8008d6d0; +extern OSThread var8008d270; +extern OSThread var8008d4a0; +extern OSThread var8008d6d0; extern u32 var8008d900; extern u32 var8008db30; extern u32 var8008db48; @@ -378,9 +378,9 @@ extern u32 var8008de18; extern u32 var8008fa68; extern u32 var8008fa80; extern u32 var8008faa8; -extern u32 var8008fac0; +extern OSThread var8008fac0; extern u32 var8008fdf0; -extern u32 var8008fe00; +extern OSThread var8008fe00; extern u32 var80090004; extern u32 var80090008; extern u32 var8009000c; @@ -394,7 +394,7 @@ extern u32 var80090260; extern u32 var80090278; extern u32 var800902a0; extern u32 var80090318; -extern u32 var80090390; +extern OSThread var80090390; extern u32 var800907c0; extern u32 var800907d8; extern u32 var800907f0; @@ -415,7 +415,7 @@ extern u32 var80091590; extern u32 var800915c8; extern u32 var800915d0; extern u32 var800915d4; -extern u32 var800915e0; +extern OSThread var800915e0; extern u32 var80091810; extern u32 var80091828; extern u32 var80091848; diff --git a/src/include/lib/lib_03050.h b/src/include/lib/lib_03050.h index dca344e15..e085ac462 100644 --- a/src/include/lib/lib_03050.h +++ b/src/include/lib/lib_03050.h @@ -3,8 +3,8 @@ #include #include "types.h" -u32 func00003050(void); -void func00003360(s32 arg0, u32 *arg1, u32 *arg2, s32 arg3); +void osCreateViManager(OSPri pri); +void osCreatePiPanager(s32 arg0, u32 *arg1, u32 *arg2, s32 arg3); void func000034d0(void); void func000034d8(void); u32 func000034e0(void); diff --git a/src/include/lib/lib_034f0.h b/src/include/lib/lib_034f0.h index b2027c2af..186e3d3b9 100644 --- a/src/include/lib/lib_034f0.h +++ b/src/include/lib/lib_034f0.h @@ -3,7 +3,7 @@ #include #include "types.h" -u32 func000034f0(void); +u32 __osExceptionPreamble(void); u32 func00003ab8(void); u32 __osEnqueueAndYield(void); u32 __osEnqueueThread(void); diff --git a/src/include/lib/lib_03ee0.h b/src/include/lib/lib_03ee0.h index 1ea76a739..d6a154e9c 100644 --- a/src/include/lib/lib_03ee0.h +++ b/src/include/lib/lib_03ee0.h @@ -3,6 +3,7 @@ #include #include "types.h" -u32 func00003ee0(void); +void osCreateThread(OSThread *thread, OSId id, void (*entry)(void *), + void *arg, void *sp, OSPri pri); #endif diff --git a/src/include/lib/lib_481e0.h b/src/include/lib/lib_481e0.h index 299ffab3b..fa6a6bc37 100644 --- a/src/include/lib/lib_481e0.h +++ b/src/include/lib/lib_481e0.h @@ -3,11 +3,11 @@ #include #include "types.h" -u32 func000481e0(void); +void func000481e0(void); void osStartThread(OSThread *thread); void osCreateMesgQueue(OSMesgQueue *mq, OSMesg *msgBuf, s32 count); -void func00048370(s32 arg0); -void func00048430(s32 arg0, s32 arg1); +void osStopThread(OSThread *thread); +void osSetThreadPri(OSThread *thread, OSPri pri); u32 osGetCount(void); #endif diff --git a/src/include/lib/lib_48520.h b/src/include/lib/lib_48520.h index 292f9e3a5..3e613dac8 100644 --- a/src/include/lib/lib_48520.h +++ b/src/include/lib/lib_48520.h @@ -3,6 +3,6 @@ #include #include "types.h" -u32 func00048520(void); +void osSetEventMesg(OSEvent e, OSMesgQueue *mq, OSMesg msg); #endif diff --git a/src/include/lib/lib_48830.h b/src/include/lib/lib_48830.h index 7bda6f6f5..958b2aa07 100644 --- a/src/include/lib/lib_48830.h +++ b/src/include/lib/lib_48830.h @@ -6,6 +6,6 @@ u32 func00048830(void); u32 func00048870(void); u32 func000488b0(void); -s32 func000488c0(void *ptr); +OSPri osGetThreadPri(OSThread *thread); #endif diff --git a/src/include/lib/lib_491b0.h b/src/include/lib/lib_491b0.h index 1d3411016..212697a9c 100644 --- a/src/include/lib/lib_491b0.h +++ b/src/include/lib/lib_491b0.h @@ -3,8 +3,8 @@ #include #include "types.h" -u32 func000491b0(void); -u32 func0004923c(void); +u32 __osTimerServicesInit(void); +u32 __osTimerInterrupt(void); u32 __osSetTimerIntr(void); u32 __osInsertTimer(void); u32 __osDisableInt(void); diff --git a/src/include/lib/lib_49640.h b/src/include/lib/lib_49640.h index 645d568f9..edcd9b610 100644 --- a/src/include/lib/lib_49640.h +++ b/src/include/lib/lib_49640.h @@ -3,6 +3,6 @@ #include #include "types.h" -u32 func00049640(void); +u32 __osViInit(void); #endif diff --git a/src/include/lib/lib_49780.h b/src/include/lib/lib_49780.h index 8afce6b8a..2339914b3 100644 --- a/src/include/lib/lib_49780.h +++ b/src/include/lib/lib_49780.h @@ -4,6 +4,6 @@ #include "types.h" u32 func00049780(void); -u32 func00049790(void); +u32 __osViSwapContext(void); #endif diff --git a/src/include/lib/lib_49a90.h b/src/include/lib/lib_49a90.h index 16db42c95..1b3c667e7 100644 --- a/src/include/lib/lib_49a90.h +++ b/src/include/lib/lib_49a90.h @@ -3,7 +3,7 @@ #include #include "types.h" -u32 func00049a90(void); +u32 __osPiCreateAccessQueue(void); u32 func00049ae0(void); u32 func00049b24(void); diff --git a/src/include/lib/lib_49c20.h b/src/include/lib/lib_49c20.h index ffc18ba59..dc1ff455d 100644 --- a/src/include/lib/lib_49c20.h +++ b/src/include/lib/lib_49c20.h @@ -3,8 +3,8 @@ #include #include "types.h" -u32 func00049c20(void); -u32 func0004a210(void); -u32 func0004a250(void); +u32 osEPiRawStartDma(void); +u32 __osDequeueThread(void); +u32 __osDestroyThread(void); #endif diff --git a/src/include/lib/lib_4a5e0.h b/src/include/lib/lib_4a5e0.h index 08f573672..f7baea3d4 100644 --- a/src/include/lib/lib_4a5e0.h +++ b/src/include/lib/lib_4a5e0.h @@ -3,7 +3,7 @@ #include #include "types.h" -u32 func0004a5e0(void); +u32 memcpy(void); u32 func0004a60c(void); u32 strchr(void); diff --git a/src/include/lib/lib_4ae00.h b/src/include/lib/lib_4ae00.h index aff9efb48..7f68533e9 100644 --- a/src/include/lib/lib_4ae00.h +++ b/src/include/lib/lib_4ae00.h @@ -9,6 +9,6 @@ u32 func0004ae68(void); u32 func0004aea4(void); u32 func0004af0c(void); u32 func0004af68(void); -u32 func0004b0c0(void); +void bzero(void *s, size_t size); #endif diff --git a/src/include/lib/lib_4e690.h b/src/include/lib/lib_4e690.h index ce7ac8c0a..315a552da 100644 --- a/src/include/lib/lib_4e690.h +++ b/src/include/lib/lib_4e690.h @@ -4,6 +4,6 @@ #include "types.h" u32 func0004e690(void); -u32 func0004ed00(void); +u32 _Printf(void); #endif diff --git a/src/lib/lib_03050.c b/src/lib/lib_03050.c index f1ec7860a..42a86ed82 100644 --- a/src/lib/lib_03050.c +++ b/src/lib/lib_03050.c @@ -30,7 +30,7 @@ const u32 var70052448[] = {0x70002d14}; const u32 var7005244c[] = {0x00000000}; GLOBAL_ASM( -glabel func00003050 +glabel osCreateViManager /* 3050: 27bdffd0 */ addiu $sp,$sp,-48 /* 3054: afb00020 */ sw $s0,0x20($sp) /* 3058: 3c108006 */ lui $s0,%hi(var8005cee0) @@ -40,7 +40,7 @@ glabel func00003050 /* 3068: afa40030 */ sw $a0,0x30($sp) /* 306c: 55c00054 */ bnezl $t6,.L000031c0 /* 3070: 8fbf0024 */ lw $ra,0x24($sp) -/* 3074: 0c01246c */ jal func000491b0 +/* 3074: 0c01246c */ jal __osTimerServicesInit /* 3078: 00000000 */ sll $zero,$zero,0x0 /* 307c: 3c018006 */ lui $at,0x8006 /* 3080: 3c048009 */ lui $a0,%hi(var80090230) @@ -64,24 +64,24 @@ glabel func00003050 /* 30c8: a0e00002 */ sb $zero,0x2($a3) /* 30cc: ace00004 */ sw $zero,0x4($a3) /* 30d0: 24a50230 */ addiu $a1,$a1,%lo(var80090230) -/* 30d4: 0c012148 */ jal func00048520 +/* 30d4: 0c012148 */ jal osSetEventMesg /* 30d8: 24040007 */ addiu $a0,$zero,0x7 /* 30dc: 3c078009 */ lui $a3,%hi(var80090278) /* 30e0: 3c058009 */ lui $a1,%hi(var80090230) /* 30e4: 24e60278 */ addiu $a2,$a3,%lo(var80090278) /* 30e8: 24a50230 */ addiu $a1,$a1,%lo(var80090230) -/* 30ec: 0c012148 */ jal func00048520 +/* 30ec: 0c012148 */ jal osSetEventMesg /* 30f0: 24040003 */ addiu $a0,$zero,0x3 /* 30f4: 2419ffff */ addiu $t9,$zero,-1 /* 30f8: afb90028 */ sw $t9,0x28($sp) -/* 30fc: 0c012230 */ jal func000488c0 +/* 30fc: 0c012230 */ jal osGetThreadPri /* 3100: 00002025 */ or $a0,$zero,$zero /* 3104: 8fa80030 */ lw $t0,0x30($sp) /* 3108: 00002025 */ or $a0,$zero,$zero /* 310c: 0048082a */ slt $at,$v0,$t0 /* 3110: 10200003 */ beqz $at,.L00003120 /* 3114: 01002825 */ or $a1,$t0,$zero -/* 3118: 0c01210c */ jal func00048430 +/* 3118: 0c01210c */ jal osSetThreadPri /* 311c: afa20028 */ sw $v0,0x28($sp) .L00003120: /* 3120: 0c01256c */ jal __osDisableInt @@ -107,9 +107,9 @@ glabel func00003050 /* 3170: afaa0010 */ sw $t2,0x10($sp) /* 3174: 00002825 */ or $a1,$zero,$zero /* 3178: 02003825 */ or $a3,$s0,$zero -/* 317c: 0c000fb8 */ jal func00003ee0 +/* 317c: 0c000fb8 */ jal osCreateThread /* 3180: afab0014 */ sw $t3,0x14($sp) -/* 3184: 0c012590 */ jal func00049640 +/* 3184: 0c012590 */ jal __osViInit /* 3188: 00000000 */ sll $zero,$zero,0x0 /* 318c: 3c048009 */ lui $a0,%hi(var8008fe00) /* 3190: 0c01207c */ jal osStartThread @@ -121,7 +121,7 @@ glabel func00003050 /* 31a8: 00002025 */ or $a0,$zero,$zero /* 31ac: 51810004 */ beql $t4,$at,.L000031c0 /* 31b0: 8fbf0024 */ lw $ra,0x24($sp) -/* 31b4: 0c01210c */ jal func00048430 +/* 31b4: 0c01210c */ jal osSetThreadPri /* 31b8: 01802825 */ or $a1,$t4,$zero /* 31bc: 8fbf0024 */ lw $ra,0x24($sp) .L000031c0: @@ -178,7 +178,7 @@ glabel func000031d0 /* 326c: 1000fff6 */ beqz $zero,.L00003248 /* 3270: 8ee4000c */ lw $a0,0xc($s7) .L00003274: -/* 3274: 0c0125e4 */ jal func00049790 +/* 3274: 0c0125e4 */ jal __osViSwapContext /* 3278: 00000000 */ sll $zero,$zero,0x0 /* 327c: 3c038009 */ lui $v1,%hi(var80090290) /* 3280: 94630290 */ lhu $v1,%lo(var80090290)($v1) @@ -220,7 +220,7 @@ glabel func000031d0 /* 3308: 1000ffce */ beqz $zero,.L00003244 /* 330c: ae2f0004 */ sw $t7,0x4($s1) .L00003310: -/* 3310: 0c01248f */ jal func0004923c +/* 3310: 0c01248f */ jal __osTimerInterrupt /* 3314: 00000000 */ sll $zero,$zero,0x0 /* 3318: 1000ffcb */ beqz $zero,.L00003248 /* 331c: 8ee4000c */ lw $a0,0xc($s7) @@ -243,7 +243,7 @@ glabel func000031d0 ); GLOBAL_ASM( -glabel func00003360 +glabel osCreatePiPanager /* 3360: 27bdffd0 */ addiu $sp,$sp,-48 /* 3364: afb00020 */ sw $s0,0x20($sp) /* 3368: 3c108006 */ lui $s0,%hi(var8005cf00) @@ -268,25 +268,25 @@ glabel func00003360 /* 33b4: 8def0920 */ lw $t7,%lo(var80060920)($t7) /* 33b8: 15e00003 */ bnez $t7,.L000033c8 /* 33bc: 00000000 */ sll $zero,$zero,0x0 -/* 33c0: 0c0126a4 */ jal func00049a90 +/* 33c0: 0c0126a4 */ jal __osPiCreateAccessQueue /* 33c4: 00000000 */ sll $zero,$zero,0x0 .L000033c8: /* 33c8: 3c058009 */ lui $a1,%hi(var800907c0) /* 33cc: 3c062222 */ lui $a2,0x2222 /* 33d0: 34c62222 */ ori $a2,$a2,0x2222 /* 33d4: 24a507c0 */ addiu $a1,$a1,%lo(var800907c0) -/* 33d8: 0c012148 */ jal func00048520 +/* 33d8: 0c012148 */ jal osSetEventMesg /* 33dc: 24040008 */ addiu $a0,$zero,0x8 /* 33e0: 2418ffff */ addiu $t8,$zero,-1 /* 33e4: afb80028 */ sw $t8,0x28($sp) -/* 33e8: 0c012230 */ jal func000488c0 +/* 33e8: 0c012230 */ jal osGetThreadPri /* 33ec: 00002025 */ or $a0,$zero,$zero /* 33f0: 8fb90030 */ lw $t9,0x30($sp) /* 33f4: 00002025 */ or $a0,$zero,$zero /* 33f8: 0059082a */ slt $at,$v0,$t9 /* 33fc: 10200003 */ beqz $at,.L0000340c /* 3400: 03202825 */ or $a1,$t9,$zero -/* 3404: 0c01210c */ jal func00048430 +/* 3404: 0c01210c */ jal osSetThreadPri /* 3408: afa20028 */ sw $v0,0x28($sp) .L0000340c: /* 340c: 0c01256c */ jal __osDisableInt @@ -297,14 +297,14 @@ glabel func00003360 /* 3420: 3c0a8009 */ lui $t2,%hi(var800907c0) /* 3424: 3c0b800a */ lui $t3,%hi(var8009c7a8) /* 3428: 3c0c7005 */ lui $t4,0x7005 -/* 342c: 3c0d7005 */ lui $t5,%hi(func00049c20) +/* 342c: 3c0d7005 */ lui $t5,%hi(osEPiRawStartDma) /* 3430: 3c0e8009 */ lui $t6,%hi(var800907c0) /* 3434: 24840390 */ addiu $a0,$a0,%lo(var80090390) /* 3438: 24080001 */ addiu $t0,$zero,0x1 /* 343c: 254a07c0 */ addiu $t2,$t2,%lo(var800907c0) /* 3440: 256bc7a8 */ addiu $t3,$t3,%lo(var8009c7a8) /* 3444: 258c9b50 */ addiu $t4,$t4,-25776 -/* 3448: 25ad9c20 */ addiu $t5,$t5,%lo(func00049c20) +/* 3448: 25ad9c20 */ addiu $t5,$t5,%lo(osEPiRawStartDma) /* 344c: 25ce07c0 */ addiu $t6,$t6,%lo(var800907c0) /* 3450: 3c067005 */ lui $a2,%hi(func00049e00) /* 3454: afa2002c */ sw $v0,0x2c($sp) @@ -319,7 +319,7 @@ glabel func00003360 /* 3478: 00002825 */ or $a1,$zero,$zero /* 347c: 02003825 */ or $a3,$s0,$zero /* 3480: ae090008 */ sw $t1,0x8($s0) -/* 3484: 0c000fb8 */ jal func00003ee0 +/* 3484: 0c000fb8 */ jal osCreateThread /* 3488: afaf0014 */ sw $t7,0x14($sp) /* 348c: 3c048009 */ lui $a0,%hi(var80090390) /* 3490: 0c01207c */ jal osStartThread @@ -331,7 +331,7 @@ glabel func00003360 /* 34a8: 00002025 */ or $a0,$zero,$zero /* 34ac: 53010004 */ beql $t8,$at,.L000034c0 /* 34b0: 8fbf0024 */ lw $ra,0x24($sp) -/* 34b4: 0c01210c */ jal func00048430 +/* 34b4: 0c01210c */ jal osSetThreadPri /* 34b8: 03002825 */ or $a1,$t8,$zero .L000034bc: /* 34bc: 8fbf0024 */ lw $ra,0x24($sp) diff --git a/src/lib/lib_034f0.c b/src/lib/lib_034f0.c index c0f737a2d..f612a64b3 100644 --- a/src/lib/lib_034f0.c +++ b/src/lib/lib_034f0.c @@ -38,15 +38,15 @@ const u32 var700524a8[] = {0x3a83126f}; const u32 var700524ac[] = {0x00000000}; GLOBAL_ASM( -glabel func000034f0 -/* 34f0: 3c1a7000 */ lui $k0,%hi(func00003500) -/* 34f4: 275a3500 */ addiu $k0,$k0,%lo(func00003500) +glabel __osExceptionPreamble +/* 34f0: 3c1a7000 */ lui $k0,%hi(__osException) +/* 34f4: 275a3500 */ addiu $k0,$k0,%lo(__osException) /* 34f8: 03400008 */ jr $k0 /* 34fc: 00000000 */ sll $zero,$zero,0x0 ); GLOBAL_ASM( -glabel func00003500 +glabel __osException /* 3500: 3c1a8009 */ lui $k0,%hi(var800907f0) /* 3504: 275a07f0 */ addiu $k0,$k0,%lo(var800907f0) /* 3508: ff410020 */ sd $at,0x20($k0) @@ -729,8 +729,8 @@ glabel __osDispatchThread ); GLOBAL_ASM( -glabel func00003ecc -/* 3ecc: 0c012894 */ jal func0004a250 +glabel __osCleanupThread +/* 3ecc: 0c012894 */ jal __osDestroyThread /* 3ed0: 00002025 */ or $a0,$zero,$zero /* 3ed4: 00000000 */ sll $zero,$zero,0x0 /* 3ed8: 00000000 */ sll $zero,$zero,0x0 diff --git a/src/lib/lib_03ee0.c b/src/lib/lib_03ee0.c index d8a7cb747..1442f455a 100644 --- a/src/lib/lib_03ee0.c +++ b/src/lib/lib_03ee0.c @@ -11,7 +11,7 @@ #include "types.h" GLOBAL_ASM( -glabel func00003ee0 +glabel osCreateThread /* 3ee0: 27bdffe0 */ addiu $sp,$sp,-32 /* 3ee4: afbf001c */ sw $ra,0x1c($sp) /* 3ee8: afb00018 */ sw $s0,0x18($sp) @@ -25,8 +25,8 @@ glabel func00003ee0 /* 3f08: ac87003c */ sw $a3,0x3c($a0) /* 3f0c: ac8e0004 */ sw $t6,0x4($a0) /* 3f10: 8faf0030 */ lw $t7,0x30($sp) -/* 3f14: 3c0c7000 */ lui $t4,%hi(func00003ecc) -/* 3f18: 258c3ecc */ addiu $t4,$t4,%lo(func00003ecc) +/* 3f14: 3c0c7000 */ lui $t4,%hi(__osCleanupThread) +/* 3f18: 258c3ecc */ addiu $t4,$t4,%lo(__osCleanupThread) /* 3f1c: 000f47c3 */ sra $t0,$t7,0x1f /* 3f20: 2de10010 */ sltiu $at,$t7,0x10 /* 3f24: 01015023 */ subu $t2,$t0,$at diff --git a/src/lib/lib_04a80.c b/src/lib/lib_04a80.c index 95f8fc90d..9338a387e 100644 --- a/src/lib/lib_04a80.c +++ b/src/lib/lib_04a80.c @@ -235,7 +235,7 @@ glabel func00004c50 /* 4d08: 24190003 */ addiu $t9,$zero,0x3 /* 4d0c: 24060003 */ addiu $a2,$zero,0x3 /* 4d10: ac590014 */ sw $t9,0x14($v0) -/* 4d14: 0c012978 */ jal func0004a5e0 +/* 4d14: 0c012978 */ jal memcpy /* 4d18: 8c440008 */ lw $a0,0x8($v0) /* 4d1c: 100000e9 */ beqz $zero,.L000050c4 /* 4d20: 8fbf0044 */ lw $ra,0x44($sp) @@ -683,7 +683,7 @@ glabel func000051a4 /* 5318: ae07001c */ sw $a3,0x1c($s0) /* 531c: a7a7002e */ sh $a3,0x2e($sp) /* 5320: 00e03025 */ or $a2,$a3,$zero -/* 5324: 0c012978 */ jal func0004a5e0 +/* 5324: 0c012978 */ jal memcpy /* 5328: 030d2021 */ addu $a0,$t8,$t5 /* 532c: 87a7002e */ lh $a3,0x2e($sp) /* 5330: 8e0e0024 */ lw $t6,0x24($s0) @@ -699,7 +699,7 @@ glabel func000051a4 /* 5354: a7a7002e */ sh $a3,0x2e($sp) /* 5358: 02202825 */ or $a1,$s1,$zero /* 535c: 00e03025 */ or $a2,$a3,$zero -/* 5360: 0c012978 */ jal func0004a5e0 +/* 5360: 0c012978 */ jal memcpy /* 5364: 012a2021 */ addu $a0,$t1,$t2 /* 5368: 87a7002e */ lh $a3,0x2e($sp) /* 536c: 87a80032 */ lh $t0,0x32($sp) @@ -733,7 +733,7 @@ glabel func000051a4 /* 53d0: a7a80032 */ sh $t0,0x32($sp) /* 53d4: a7a7002e */ sh $a3,0x2e($sp) /* 53d8: 01003025 */ or $a2,$t0,$zero -/* 53dc: 0c012978 */ jal func0004a5e0 +/* 53dc: 0c012978 */ jal memcpy /* 53e0: 01f82021 */ addu $a0,$t7,$t8 /* 53e4: 87a7002e */ lh $a3,0x2e($sp) /* 53e8: 87a80032 */ lh $t0,0x32($sp) @@ -771,7 +771,7 @@ glabel func000051a4 /* 545c: 8e0b0014 */ lw $t3,0x14($s0) /* 5460: a7a7002e */ sh $a3,0x2e($sp) /* 5464: 00e03025 */ or $a2,$a3,$zero -/* 5468: 0c012978 */ jal func0004a5e0 +/* 5468: 0c012978 */ jal memcpy /* 546c: 014b2021 */ addu $a0,$t2,$t3 /* 5470: 87a7002e */ lh $a3,0x2e($sp) /* 5474: 8e0f0014 */ lw $t7,0x14($s0) @@ -853,7 +853,7 @@ glabel func000051a4 /* 557c: a7a80032 */ sh $t0,0x32($sp) /* 5580: a7a7002e */ sh $a3,0x2e($sp) /* 5584: 00e03025 */ or $a2,$a3,$zero -/* 5588: 0c012978 */ jal func0004a5e0 +/* 5588: 0c012978 */ jal memcpy /* 558c: 01f82021 */ addu $a0,$t7,$t8 /* 5590: 87a7002e */ lh $a3,0x2e($sp) /* 5594: 8e0a0014 */ lw $t2,0x14($s0) @@ -1335,8 +1335,8 @@ glabel func00005b60 /* 5bf8: 5440fffb */ bnezl $v0,.L00005be8 /* 5bfc: 8fa50034 */ lw $a1,0x34($sp) .L00005c00: -/* 5c00: 3c027000 */ lui $v0,%hi(func000034f0) -/* 5c04: 244234f0 */ addiu $v0,$v0,%lo(func000034f0) +/* 5c00: 3c027000 */ lui $v0,%hi(__osExceptionPreamble) +/* 5c04: 244234f0 */ addiu $v0,$v0,%lo(__osExceptionPreamble) /* 5c08: 8c410000 */ lw $at,0x0($v0) /* 5c0c: 3c108000 */ lui $s0,0x8000 /* 5c10: 3c098000 */ lui $t1,0x8000 @@ -1406,7 +1406,7 @@ glabel func00005b60 /* 5d10: 2484031c */ addiu $a0,$a0,0x31c /* 5d14: 15000003 */ bnez $t0,.L00005d24 /* 5d18: 00000000 */ sll $zero,$zero,0x0 -/* 5d1c: 0c012c30 */ jal func0004b0c0 +/* 5d1c: 0c012c30 */ jal bzero /* 5d20: 24050040 */ addiu $a1,$zero,0x40 .L00005d24: /* 5d24: 3c028000 */ lui $v0,0x8000 diff --git a/src/lib/lib_08a20.c b/src/lib/lib_08a20.c index e911e4025..bc63345b2 100644 --- a/src/lib/lib_08a20.c +++ b/src/lib/lib_08a20.c @@ -482,7 +482,7 @@ glabel func00008a48 /* 90b4: 248415e0 */ addiu $a0,$a0,%lo(var800915e0) /* 90b8: 24050004 */ addiu $a1,$zero,0x4 /* 90bc: 00003825 */ or $a3,$zero,$zero -/* 90c0: 0c000fb8 */ jal func00003ee0 +/* 90c0: 0c000fb8 */ jal osCreateThread /* 90c4: afa80010 */ sw $t0,0x10($sp) /* 90c8: 8fbf0034 */ lw $ra,0x34($sp) /* 90cc: 8fb0001c */ lw $s0,0x1c($sp) @@ -525,7 +525,7 @@ glabel func00009124 /* 9130: afbf0014 */ sw $ra,0x14($sp) /* 9134: 11c00003 */ beqz $t6,.L00009144 /* 9138: 3c048009 */ lui $a0,%hi(var800915e0) -/* 913c: 0c0120dc */ jal func00048370 +/* 913c: 0c0120dc */ jal osStopThread /* 9140: 248415e0 */ addiu $a0,$a0,%lo(var800915e0) .L00009144: /* 9144: 8fbf0014 */ lw $ra,0x14($sp) diff --git a/src/lib/lib_0c000.c b/src/lib/lib_0c000.c index a1ae2eca8..ae7bdba15 100644 --- a/src/lib/lib_0c000.c +++ b/src/lib/lib_0c000.c @@ -81,7 +81,7 @@ glabel func0000c000 /* c03c: 24842880 */ addiu $a0,$a0,%lo(var80092880) /* c040: afae0010 */ sw $t6,0x10($sp) /* c044: 24050005 */ addiu $a1,$zero,0x5 -/* c048: 0c000fb8 */ jal func00003ee0 +/* c048: 0c000fb8 */ jal osCreateThread /* c04c: 00003825 */ or $a3,$zero,$zero /* c050: 3c048009 */ lui $a0,%hi(var80092880) /* c054: 0c01207c */ jal osStartThread @@ -105,7 +105,7 @@ glabel func0000c06c /* c08c: afa0005c */ sw $zero,0x5c($sp) /* c090: 2404000c */ addiu $a0,$zero,0xc /* c094: 02202825 */ or $a1,$s1,$zero -/* c098: 0c012148 */ jal func00048520 +/* c098: 0c012148 */ jal osSetEventMesg /* c09c: 24060010 */ addiu $a2,$zero,0x10 /* c0a0: 3c018009 */ lui $at,0x8009 /* c0a4: ac204ad0 */ sw $zero,0x4ad0($at) diff --git a/src/lib/lib_0e9d0.c b/src/lib/lib_0e9d0.c index ece4ca3b8..b1cdbd279 100644 --- a/src/lib/lib_0e9d0.c +++ b/src/lib/lib_0e9d0.c @@ -1562,14 +1562,14 @@ glabel func0000fe88 /* fe8c: afbf002c */ sw $ra,0x2c($sp) /* fe90: 0c003b45 */ jal func0000ed14 /* fe94: afb00028 */ sw $s0,0x28($sp) -/* fe98: 0c012230 */ jal func000488c0 +/* fe98: 0c012230 */ jal osGetThreadPri /* fe9c: 00002025 */ or $a0,$zero,$zero /* fea0: 3c048009 */ lui $a0,%hi(var800915e0) /* fea4: 00408025 */ or $s0,$v0,$zero -/* fea8: 0c012230 */ jal func000488c0 +/* fea8: 0c012230 */ jal osGetThreadPri /* feac: 248415e0 */ addiu $a0,$a0,%lo(var800915e0) /* feb0: 00002025 */ or $a0,$zero,$zero -/* feb4: 0c01210c */ jal func00048430 +/* feb4: 0c01210c */ jal osSetThreadPri /* feb8: 24450001 */ addiu $a1,$v0,0x1 /* febc: 0c00cfc9 */ jal func00033f24 /* fec0: 00000000 */ sll $zero,$zero,0x0 @@ -1631,7 +1631,7 @@ glabel func0000fe88 .L0000ff90: /* ff90: 00002025 */ or $a0,$zero,$zero .L0000ff94: -/* ff94: 0c01210c */ jal func00048430 +/* ff94: 0c01210c */ jal osSetThreadPri /* ff98: 02002825 */ or $a1,$s0,$zero /* ff9c: 3c048006 */ lui $a0,%hi(var8005ddd8) /* ffa0: 3c078006 */ lui $a3,%hi(var8005ddd4) @@ -2208,16 +2208,16 @@ glabel func00010718 /* 10724: afa50044 */ sw $a1,0x44($sp) /* 10728: afa60048 */ sw $a2,0x48($sp) /* 1072c: afa7004c */ sw $a3,0x4c($sp) -/* 10730: 0c012230 */ jal func000488c0 +/* 10730: 0c012230 */ jal osGetThreadPri /* 10734: 00002025 */ or $a0,$zero,$zero /* 10738: 2408ffff */ addiu $t0,$zero,-1 /* 1073c: 3c048009 */ lui $a0,%hi(var800915e0) /* 10740: afa2003c */ sw $v0,0x3c($sp) /* 10744: 248415e0 */ addiu $a0,$a0,%lo(var800915e0) -/* 10748: 0c012230 */ jal func000488c0 +/* 10748: 0c012230 */ jal osGetThreadPri /* 1074c: afa80038 */ sw $t0,0x38($sp) /* 10750: 00002025 */ or $a0,$zero,$zero -/* 10754: 0c01210c */ jal func00048430 +/* 10754: 0c01210c */ jal osSetThreadPri /* 10758: 24450001 */ addiu $a1,$v0,0x1 /* 1075c: 8fae0060 */ lw $t6,0x60($sp) /* 10760: 8fa80038 */ lw $t0,0x38($sp) @@ -2326,7 +2326,7 @@ glabel func00010718 /* 108dc: afb80018 */ sw $t8,0x18($sp) /* 108e0: afa20034 */ sw $v0,0x34($sp) /* 108e4: 00002025 */ or $a0,$zero,$zero -/* 108e8: 0c01210c */ jal func00048430 +/* 108e8: 0c01210c */ jal osSetThreadPri /* 108ec: 8fa5003c */ lw $a1,0x3c($sp) /* 108f0: 8fbf0024 */ lw $ra,0x24($sp) /* 108f4: 8fa20034 */ lw $v0,0x34($sp) diff --git a/src/lib/lib_13130.c b/src/lib/lib_13130.c index aee56a977..14bd77842 100644 --- a/src/lib/lib_13130.c +++ b/src/lib/lib_13130.c @@ -460,10 +460,10 @@ glabel func00013408 ); GLOBAL_ASM( -glabel func00013690 +glabel proutSprintf /* 13690: 27bdffe8 */ addiu $sp,$sp,-24 /* 13694: afbf0014 */ sw $ra,0x14($sp) -/* 13698: 0c012978 */ jal func0004a5e0 +/* 13698: 0c012978 */ jal memcpy /* 1369c: afa60020 */ sw $a2,0x20($sp) /* 136a0: 8fbf0014 */ lw $ra,0x14($sp) /* 136a4: 8fae0020 */ lw $t6,0x20($sp) @@ -480,11 +480,11 @@ glabel sprintf /* 136c0: afa50024 */ sw $a1,0x24($sp) /* 136c4: afa60028 */ sw $a2,0x28($sp) /* 136c8: afa7002c */ sw $a3,0x2c($sp) -/* 136cc: 3c047001 */ lui $a0,%hi(func00013690) -/* 136d0: 24843690 */ addiu $a0,$a0,%lo(func00013690) +/* 136cc: 3c047001 */ lui $a0,%hi(proutSprintf) +/* 136d0: 24843690 */ addiu $a0,$a0,%lo(proutSprintf) /* 136d4: 27a70028 */ addiu $a3,$sp,0x28 /* 136d8: 8fa60024 */ lw $a2,0x24($sp) -/* 136dc: 0c013b40 */ jal func0004ed00 +/* 136dc: 0c013b40 */ jal _Printf /* 136e0: 8fa50020 */ lw $a1,0x20($sp) /* 136e4: 04400004 */ bltz $v0,.L000136f8 /* 136e8: 00401825 */ or $v1,$v0,$zero diff --git a/src/lib/lib_13710.c b/src/lib/lib_13710.c index d6005fd24..cb3feb7bc 100644 --- a/src/lib/lib_13710.c +++ b/src/lib/lib_13710.c @@ -13,6 +13,6 @@ void func00013710(void) { - func00003360(0x96, &var80099a00, &var80099900, 0x40); + osCreatePiPanager(0x96, &var80099a00, &var80099900, 0x40); } diff --git a/src/lib/lib_13900.c b/src/lib/lib_13900.c index 3d7068621..ce570979b 100644 --- a/src/lib/lib_13900.c +++ b/src/lib/lib_13900.c @@ -363,7 +363,7 @@ glabel func00013c94 /* 13d14: 3c05800a */ lui $a1,%hi(var80099e78) /* 13d18: 24a59e78 */ addiu $a1,$a1,%lo(var80099e78) /* 13d1c: 24040005 */ addiu $a0,$zero,0x5 -/* 13d20: 0c012148 */ jal func00048520 +/* 13d20: 0c012148 */ jal osSetEventMesg /* 13d24: 00003025 */ or $a2,$zero,$zero /* 13d28: 240e0001 */ addiu $t6,$zero,0x1 /* 13d2c: 3c018006 */ lui $at,0x8006 @@ -1891,7 +1891,7 @@ glabel func0001519c /* 151d0: 2406000a */ addiu $a2,$zero,0xa /* 151d4: 24040005 */ addiu $a0,$zero,0x5 /* 151d8: 02802825 */ or $a1,$s4,$zero -/* 151dc: 0c012148 */ jal func00048520 +/* 151dc: 0c012148 */ jal osSetEventMesg /* 151e0: 00003025 */ or $a2,$zero,$zero /* 151e4: 3c12800a */ lui $s2,%hi(var800a3180) /* 151e8: 26523180 */ addiu $s2,$s2,%lo(var800a3180) diff --git a/src/lib/lib_2fa00.c b/src/lib/lib_2fa00.c index d6ca6df84..40eaa497e 100644 --- a/src/lib/lib_2fa00.c +++ b/src/lib/lib_2fa00.c @@ -78,7 +78,7 @@ glabel func0002faa4 /* 2fac0: 2484fa48 */ addiu $a0,$a0,%lo(func0002fa48) /* 2fac4: 27a70024 */ addiu $a3,$sp,0x24 /* 2fac8: 8fa60020 */ lw $a2,0x20($sp) -/* 2facc: 0c013b40 */ jal func0004ed00 +/* 2facc: 0c013b40 */ jal _Printf /* 2fad0: 00002825 */ or $a1,$zero,$zero /* 2fad4: 8fbf0014 */ lw $ra,0x14($sp) /* 2fad8: 27bd0020 */ addiu $sp,$sp,0x20 diff --git a/src/lib/lib_37b00.c b/src/lib/lib_37b00.c index 6f5b4e05b..fd5fce3ed 100644 --- a/src/lib/lib_37b00.c +++ b/src/lib/lib_37b00.c @@ -23,7 +23,7 @@ glabel func00037b00 /* 37b08: afa40020 */ sw $a0,0x20($sp) /* 37b0c: 3c04800a */ lui $a0,%hi(var8009c390) /* 37b10: 2484c390 */ addiu $a0,$a0,%lo(var8009c390) -/* 37b14: 0c012c30 */ jal func0004b0c0 +/* 37b14: 0c012c30 */ jal bzero /* 37b18: 24050064 */ addiu $a1,$zero,0x64 /* 37b1c: 240e0001 */ addiu $t6,$zero,0x1 /* 37b20: afae0010 */ sw $t6,0x10($sp) @@ -472,7 +472,7 @@ glabel func00037fc0 /* 38138: 3c0f800a */ lui $t7,%hi(var8009c390) /* 3813c: 25efc390 */ addiu $t7,$t7,%lo(var8009c390) /* 38140: 8de40044 */ lw $a0,0x44($t7) -/* 38144: 0c012c30 */ jal func0004b0c0 +/* 38144: 0c012c30 */ jal bzero /* 38148: 24050440 */ addiu $a1,$zero,0x440 .L0003814c: /* 3814c: 10000006 */ beqz $zero,.L00038168 diff --git a/src/lib/lib_3e730.c b/src/lib/lib_3e730.c index 64c46bc5d..b34505ccb 100644 --- a/src/lib/lib_3e730.c +++ b/src/lib/lib_3e730.c @@ -6867,7 +6867,7 @@ glabel func0003f8a0 .L0003fb9c: /* 3fb9c: 3c04800a */ lui $a0,%hi(var8009c640) /* 3fba0: 8c84c640 */ lw $a0,%lo(var8009c640)($a0) -/* 3fba4: 0c012c30 */ jal func0004b0c0 +/* 3fba4: 0c012c30 */ jal bzero /* 3fba8: 3405a410 */ dli $a1,0xa410 /* 3fbac: afa00264 */ sw $zero,0x264($sp) .L0003fbb0: @@ -6928,7 +6928,7 @@ glabel func0003f8a0 /* 3fc80: 240c0001 */ addiu $t4,$zero,0x1 /* 3fc84: afac0228 */ sw $t4,0x228($sp) /* 3fc88: 27a40028 */ addiu $a0,$sp,0x28 -/* 3fc8c: 0c012c30 */ jal func0004b0c0 +/* 3fc8c: 0c012c30 */ jal bzero /* 3fc90: 24050200 */ addiu $a1,$zero,0x200 /* 3fc94: 24190001 */ addiu $t9,$zero,0x1 /* 3fc98: afb90260 */ sw $t9,0x260($sp) @@ -8073,7 +8073,7 @@ glabel func00040164 /* 40d6c: 000d4080 */ sll $t0,$t5,0x2 /* 40d70: 01c84821 */ addu $t1,$t6,$t0 /* 40d74: 8d254660 */ lw $a1,0x4660($t1) -/* 40d78: 0c012c30 */ jal func0004b0c0 +/* 40d78: 0c012c30 */ jal bzero /* 40d7c: 00052880 */ sll $a1,$a1,0x2 /* 40d80: 10000005 */ beqz $zero,.L00040d98 /* 40d84: 24020001 */ addiu $v0,$zero,0x1 @@ -9752,7 +9752,7 @@ glabel func00042238 /* 425e0: afab002c */ sw $t3,0x2c($sp) /* 425e4: 8fa5002c */ lw $a1,0x2c($sp) /* 425e8: 8fa40044 */ lw $a0,0x44($sp) -/* 425ec: 0c012c30 */ jal func0004b0c0 +/* 425ec: 0c012c30 */ jal bzero /* 425f0: 00052840 */ sll $a1,$a1,0x1 /* 425f4: 8fb9002c */ lw $t9,0x2c($sp) /* 425f8: 8fad0044 */ lw $t5,0x44($sp) @@ -9862,7 +9862,7 @@ glabel func00042238 /* 42788: 0019c080 */ sll $t8,$t9,0x2 /* 4278c: 01187021 */ addu $t6,$t0,$t8 /* 42790: 8dc54660 */ lw $a1,0x4660($t6) -/* 42794: 0c012c30 */ jal func0004b0c0 +/* 42794: 0c012c30 */ jal bzero /* 42798: 00052840 */ sll $a1,$a1,0x1 /* 4279c: 10000006 */ beqz $zero,.L000427b8 /* 427a0: 00000000 */ sll $zero,$zero,0x0 @@ -11260,7 +11260,7 @@ glabel func0004371c /* 43bfc: 018a5821 */ addu $t3,$t4,$t2 /* 43c00: 016d2021 */ addu $a0,$t3,$t5 /* 43c04: 24846a64 */ addiu $a0,$a0,0x6a64 -/* 43c08: 0c012c30 */ jal func0004b0c0 +/* 43c08: 0c012c30 */ jal bzero /* 43c0c: 24050048 */ addiu $a1,$zero,0x48 /* 43c10: 8fb9093c */ lw $t9,0x93c($sp) /* 43c14: 27380001 */ addiu $t8,$t9,0x1 diff --git a/src/lib/lib_43dd0.c b/src/lib/lib_43dd0.c index b3d897fb3..b65e98425 100644 --- a/src/lib/lib_43dd0.c +++ b/src/lib/lib_43dd0.c @@ -69,7 +69,7 @@ glabel func00043dd0 /* 43e90: 8f093f88 */ lw $t1,0x3f88($t8) /* 43e94: 03082021 */ addu $a0,$t8,$t0 /* 43e98: 2484001c */ addiu $a0,$a0,0x1c -/* 43e9c: 0c012c30 */ jal func0004b0c0 +/* 43e9c: 0c012c30 */ jal bzero /* 43ea0: 01282823 */ subu $a1,$t1,$t0 .L00043ea4: /* 43ea4: 8faf0020 */ lw $t7,0x20($sp) @@ -520,7 +520,7 @@ glabel func00044460 /* 44508: ac200475 */ sw $zero,0x475($at) /* 4450c: 8fa4001c */ lw $a0,0x1c($sp) /* 44510: 24050900 */ addiu $a1,$zero,0x900 -/* 44514: 0c012c30 */ jal func0004b0c0 +/* 44514: 0c012c30 */ jal bzero /* 44518: 24846a64 */ addiu $a0,$a0,0x6a64 /* 4451c: 10000003 */ beqz $zero,.L0004452c /* 44520: 8fa2001c */ lw $v0,0x1c($sp) diff --git a/src/lib/lib_481e0.c b/src/lib/lib_481e0.c index a3ec64eef..d4a491321 100644 --- a/src/lib/lib_481e0.c +++ b/src/lib/lib_481e0.c @@ -131,7 +131,7 @@ glabel osCreateMesgQueue ); GLOBAL_ASM( -glabel func00048370 +glabel osStopThread /* 48370: 27bdffc8 */ addiu $sp,$sp,-56 /* 48374: afbf0024 */ sw $ra,0x24($sp) /* 48378: afa40038 */ sw $a0,0x38($sp) @@ -174,7 +174,7 @@ glabel func00048370 /* 483fc: a5280010 */ sh $t0,0x10($t1) /* 48400: 8faa0038 */ lw $t2,0x38($sp) /* 48404: 8d440008 */ lw $a0,0x8($t2) -/* 48408: 0c012884 */ jal func0004a210 +/* 48408: 0c012884 */ jal __osDequeueThread /* 4840c: 01402825 */ or $a1,$t2,$zero .L00048410: /* 48410: 0c012588 */ jal __osRestoreInt @@ -188,7 +188,7 @@ glabel func00048370 ); GLOBAL_ASM( -glabel func00048430 +glabel osSetThreadPri /* 48430: 27bdffd8 */ addiu $sp,$sp,-40 /* 48434: afbf001c */ sw $ra,0x1c($sp) /* 48438: afa40028 */ sw $a0,0x28($sp) @@ -219,7 +219,7 @@ glabel func00048430 /* 48498: 11610008 */ beq $t3,$at,.L000484bc /* 4849c: 00000000 */ sll $zero,$zero,0x0 /* 484a0: 8d240008 */ lw $a0,0x8($t1) -/* 484a4: 0c012884 */ jal func0004a210 +/* 484a4: 0c012884 */ jal __osDequeueThread /* 484a8: 01202825 */ or $a1,$t1,$zero /* 484ac: 8fac0028 */ lw $t4,0x28($sp) /* 484b0: 8d840008 */ lw $a0,0x8($t4) diff --git a/src/lib/lib_48520.c b/src/lib/lib_48520.c index 48ae0e4f4..d3973c8db 100644 --- a/src/lib/lib_48520.c +++ b/src/lib/lib_48520.c @@ -12,7 +12,7 @@ #include "types.h" GLOBAL_ASM( -glabel func00048520 +glabel osSetEventMesg /* 48520: 27bdffd8 */ addiu $sp,$sp,-40 /* 48524: afbf001c */ sw $ra,0x1c($sp) /* 48528: afa40028 */ sw $a0,0x28($sp) diff --git a/src/lib/lib_48830.c b/src/lib/lib_48830.c index 4deb0d837..c11a72b52 100644 --- a/src/lib/lib_48830.c +++ b/src/lib/lib_48830.c @@ -59,7 +59,7 @@ glabel func000488b0 ); GLOBAL_ASM( -glabel func000488c0 +glabel osGetThreadPri /* 488c0: 14800003 */ bnez $a0,.L000488d0 /* 488c4: 00000000 */ sll $zero,$zero,0x0 /* 488c8: 3c048006 */ lui $a0,%hi(var80060940) diff --git a/src/lib/lib_491b0.c b/src/lib/lib_491b0.c index 98ed901b6..a194a5265 100644 --- a/src/lib/lib_491b0.c +++ b/src/lib/lib_491b0.c @@ -14,7 +14,7 @@ #include "types.h" GLOBAL_ASM( -glabel func000491b0 +glabel __osTimerServicesInit /* 491b0: 3c01800a */ lui $at,0x800a /* 491b4: 240e0000 */ addiu $t6,$zero,0x0 /* 491b8: 240f0000 */ addiu $t7,$zero,0x0 @@ -53,7 +53,7 @@ glabel func000491b0 ); GLOBAL_ASM( -glabel func0004923c +glabel __osTimerInterrupt /* 4923c: 3c0e8006 */ lui $t6,%hi(var800608a0) /* 49240: 8dce08a0 */ lw $t6,%lo(var800608a0)($t6) /* 49244: 27bdffd8 */ addiu $sp,$sp,-40 diff --git a/src/lib/lib_49640.c b/src/lib/lib_49640.c index 367359cf6..ab6f23841 100644 --- a/src/lib/lib_49640.c +++ b/src/lib/lib_49640.c @@ -12,12 +12,12 @@ #include "types.h" GLOBAL_ASM( -glabel func00049640 +glabel __osViInit /* 49640: 27bdffe8 */ addiu $sp,$sp,-24 /* 49644: afbf0014 */ sw $ra,0x14($sp) /* 49648: 3c048006 */ lui $a0,%hi(var800608b0) /* 4964c: 248408b0 */ addiu $a0,$a0,%lo(var800608b0) -/* 49650: 0c012c30 */ jal func0004b0c0 +/* 49650: 0c012c30 */ jal bzero /* 49654: 24050060 */ addiu $a1,$zero,0x60 /* 49658: 3c0e8006 */ lui $t6,%hi(var800608b0) /* 4965c: 25ce08b0 */ addiu $t6,$t6,%lo(var800608b0) @@ -91,7 +91,7 @@ glabel func00049640 /* 4975c: 00000000 */ sll $zero,$zero,0x0 .L00049760: /* 49760: 3c0aa440 */ lui $t2,0xa440 -/* 49764: 0c0125e4 */ jal func00049790 +/* 49764: 0c0125e4 */ jal __osViSwapContext /* 49768: ad400000 */ sw $zero,0x0($t2) /* 4976c: 8fbf0014 */ lw $ra,0x14($sp) /* 49770: 27bd0018 */ addiu $sp,$sp,0x18 diff --git a/src/lib/lib_49780.c b/src/lib/lib_49780.c index 674e6ab6a..f50412656 100644 --- a/src/lib/lib_49780.c +++ b/src/lib/lib_49780.c @@ -19,7 +19,7 @@ glabel func00049780 ); GLOBAL_ASM( -glabel func00049790 +glabel __osViSwapContext /* 49790: 27bdffb8 */ addiu $sp,$sp,-72 /* 49794: afb00018 */ sw $s0,0x18($sp) /* 49798: afbf001c */ sw $ra,0x1c($sp) diff --git a/src/lib/lib_49a90.c b/src/lib/lib_49a90.c index f705f5d5a..c4e7afcd4 100644 --- a/src/lib/lib_49a90.c +++ b/src/lib/lib_49a90.c @@ -15,7 +15,7 @@ #include "types.h" GLOBAL_ASM( -glabel func00049a90 +glabel __osPiCreateAccessQueue /* 49a90: 27bdffe8 */ addiu $sp,$sp,-24 /* 49a94: afbf0014 */ sw $ra,0x14($sp) /* 49a98: 240e0001 */ addiu $t6,$zero,0x1 @@ -46,7 +46,7 @@ glabel func00049ae0 /* 49aec: afbf0014 */ sw $ra,0x14($sp) /* 49af0: 15c00003 */ bnez $t6,.L00049b00 /* 49af4: 00000000 */ sll $zero,$zero,0x0 -/* 49af8: 0c0126a4 */ jal func00049a90 +/* 49af8: 0c0126a4 */ jal __osPiCreateAccessQueue /* 49afc: 00000000 */ sll $zero,$zero,0x0 .L00049b00: /* 49b00: 3c04800a */ lui $a0,%hi(var8009c7a8) @@ -73,11 +73,11 @@ glabel func00049b24 /* 49b44: 27bd0018 */ addiu $sp,$sp,0x18 /* 49b48: 03e00008 */ jr $ra /* 49b4c: 00000000 */ sll $zero,$zero,0x0 -/* 49b50: 27bdffe8 */ addiu $sp,$sp,-24 ); GLOBAL_ASM( -glabel func00049b54 +glabel osPiRawStartDma +/* 49b50: 27bdffe8 */ addiu $sp,$sp,-24 /* 49b54: 3c03a460 */ lui $v1,0xa460 /* 49b58: 34630010 */ ori $v1,$v1,0x10 /* 49b5c: afbf0014 */ sw $ra,0x14($sp) diff --git a/src/lib/lib_49c20.c b/src/lib/lib_49c20.c index 0f9b4c793..b996a7ab8 100644 --- a/src/lib/lib_49c20.c +++ b/src/lib/lib_49c20.c @@ -20,7 +20,7 @@ #include "types.h" GLOBAL_ASM( -glabel func00049c20 +glabel osEPiRawStartDma /* 49c20: 27bdffe0 */ addiu $sp,$sp,-32 /* 49c24: 3c03a460 */ lui $v1,0xa460 /* 49c28: 34630010 */ ori $v1,$v1,0x10 @@ -437,7 +437,7 @@ glabel func00049e00 ); GLOBAL_ASM( -glabel func0004a210 +glabel __osDequeueThread /* 4a210: 00803025 */ or $a2,$a0,$zero /* 4a214: 8cc70000 */ lw $a3,0x0($a2) /* 4a218: 27bdfff8 */ addiu $sp,$sp,-8 @@ -460,7 +460,7 @@ glabel func0004a210 ); GLOBAL_ASM( -glabel func0004a250 +glabel __osDestroyThread /* 4a250: 27bdffc8 */ addiu $sp,$sp,-56 /* 4a254: afbf0024 */ sw $ra,0x24($sp) /* 4a258: afa40038 */ sw $a0,0x38($sp) @@ -483,7 +483,7 @@ glabel func0004a250 /* 4a298: 13210004 */ beq $t9,$at,.L0004a2ac /* 4a29c: 00000000 */ sll $zero,$zero,0x0 /* 4a2a0: 8f040008 */ lw $a0,0x8($t8) -/* 4a2a4: 0c012884 */ jal func0004a210 +/* 4a2a4: 0c012884 */ jal __osDequeueThread /* 4a2a8: 03002825 */ or $a1,$t8,$zero .L0004a2ac: /* 4a2ac: 3c088006 */ lui $t0,%hi(var8006093c) diff --git a/src/lib/lib_4a5e0.c b/src/lib/lib_4a5e0.c index dd0c038ce..58b746cd2 100644 --- a/src/lib/lib_4a5e0.c +++ b/src/lib/lib_4a5e0.c @@ -10,7 +10,7 @@ #include "types.h" GLOBAL_ASM( -glabel func0004a5e0 +glabel memcpy /* 4a5e0: 00801025 */ or $v0,$a0,$zero /* 4a5e4: 10c00007 */ beqz $a2,.L0004a604 /* 4a5e8: 00a01825 */ or $v1,$a1,$zero diff --git a/src/lib/lib_4ae00.c b/src/lib/lib_4ae00.c index 9654a1566..dee2fa181 100644 --- a/src/lib/lib_4ae00.c +++ b/src/lib/lib_4ae00.c @@ -222,7 +222,7 @@ glabel func0004af68 ); GLOBAL_ASM( -glabel func0004b0c0 +glabel bzero /* 4b0c0: 28a1000c */ slti $at,$a1,0xc /* 4b0c4: 1420001d */ bnez $at,.L0004b13c /* 4b0c8: 00041823 */ negu $v1,$a0 diff --git a/src/lib/lib_4d480.c b/src/lib/lib_4d480.c index aa2ff49fb..ed5ac4798 100644 --- a/src/lib/lib_4d480.c +++ b/src/lib/lib_4d480.c @@ -126,7 +126,7 @@ glabel func0004d480 /* 4d5fc: 1000000d */ beqz $zero,.L0004d634 /* 4d600: 24020003 */ addiu $v0,$zero,0x3 .L0004d604: -/* 4d604: 0c012c30 */ jal func0004b0c0 +/* 4d604: 0c012c30 */ jal bzero /* 4d608: 24050020 */ addiu $a1,$zero,0x20 /* 4d60c: 8e4d005c */ lw $t5,0x5c($s2) /* 4d610: 8fae016c */ lw $t6,0x16c($sp) diff --git a/src/lib/lib_4d6f0.c b/src/lib/lib_4d6f0.c index 2b861ff45..0c489469d 100644 --- a/src/lib/lib_4d6f0.c +++ b/src/lib/lib_4d6f0.c @@ -162,7 +162,7 @@ glabel func0004d6f0 /* 4d8f8: 1181001c */ beq $t4,$at,.L0004d96c .L0004d8fc: /* 4d8fc: 27a4029c */ addiu $a0,$sp,0x29c -/* 4d900: 0c012c30 */ jal func0004b0c0 +/* 4d900: 0c012c30 */ jal bzero /* 4d904: 24050020 */ addiu $a1,$zero,0x20 /* 4d908: 926e0065 */ lbu $t6,0x65($s3) /* 4d90c: 02602025 */ or $a0,$s3,$zero diff --git a/src/lib/lib_4e690.c b/src/lib/lib_4e690.c index 8a9babfaa..6bddc7ee0 100644 --- a/src/lib/lib_4e690.c +++ b/src/lib/lib_4e690.c @@ -470,7 +470,7 @@ glabel func0004e690 ); GLOBAL_ASM( -glabel func0004ed00 +glabel _Printf /* 4ed00: 27bdff28 */ addiu $sp,$sp,-216 /* 4ed04: afb70034 */ sw $s7,0x34($sp) /* 4ed08: afb60030 */ sw $s6,0x30($sp) diff --git a/src/lib/lib_50f20.c b/src/lib/lib_50f20.c index a306d3199..bfa9268c8 100644 --- a/src/lib/lib_50f20.c +++ b/src/lib/lib_50f20.c @@ -63,7 +63,7 @@ glabel func50f20 /* 50fc8: 8fbf0044 */ lw $ra,0x44($sp) /* 50fcc: 27a40070 */ addiu $a0,$sp,0x70 .L00050fd0: -/* 50fd0: 0c012c30 */ jal func0004b0c0 +/* 50fd0: 0c012c30 */ jal bzero /* 50fd4: 2405000c */ addiu $a1,$zero,0xc /* 50fd8: 24080080 */ addiu $t0,$zero,0x80 /* 50fdc: 24020080 */ addiu $v0,$zero,0x80 @@ -221,7 +221,7 @@ glabel func50f20 /* 51208: 000d7080 */ sll $t6,$t5,0x2 /* 5120c: 27af0070 */ addiu $t7,$sp,0x70 /* 51210: 01cf2021 */ addu $a0,$t6,$t7 -/* 51214: 0c012c30 */ jal func0004b0c0 +/* 51214: 0c012c30 */ jal bzero /* 51218: 24050004 */ addiu $a1,$zero,0x4 .L0005121c: /* 5121c: 8faa0068 */ lw $t2,0x68($sp) diff --git a/src/lib/lib_52070.c b/src/lib/lib_52070.c index 102e484e3..41a2c319b 100644 --- a/src/lib/lib_52070.c +++ b/src/lib/lib_52070.c @@ -191,7 +191,7 @@ glabel func000520c0 /* 522d0: 01903023 */ subu $a2,$t4,$s0 /* 522d4: ae260014 */ sw $a2,0x14($s1) /* 522d8: 8e240008 */ lw $a0,0x8($s1) -/* 522dc: 0c012978 */ jal func0004a5e0 +/* 522dc: 0c012978 */ jal memcpy /* 522e0: 02502821 */ addu $a1,$s2,$s0 /* 522e4: 8e250014 */ lw $a1,0x14($s1) /* 522e8: 8e240024 */ lw $a0,0x24($s1)