diff --git a/src/boot/boot.c b/src/boot/boot.c index 59a5bb5c8..195ea01cd 100644 --- a/src/boot/boot.c +++ b/src/boot/boot.c @@ -547,7 +547,7 @@ glabel func000016ac ); GLOBAL_ASM( -glabel func000016c0 +glabel osGetMemSize /* 16c0: 3c028009 */ lui $v0,0x8009 /* 16c4: 03e00008 */ jr $ra /* 16c8: 8c42dcb4 */ lw $v0,-0x234c($v0) @@ -672,7 +672,7 @@ glabel func000016c0 /* 1884: 00003825 */ or $a3,$zero,$zero /* 1888: 0c000fb8 */ jal func00003ee0 /* 188c: afa20010 */ sw $v0,0x10($sp) -/* 1890: 0c01207c */ jal func000481f0 +/* 1890: 0c01207c */ jal osStartThread /* 1894: 02002025 */ or $a0,$s0,$zero /* 1898: 8fbf0024 */ lw $ra,0x24($sp) /* 189c: 8fb00020 */ lw $s0,0x20($sp) @@ -744,7 +744,7 @@ glabel func00001948 /* 1978: 0c000fb8 */ jal func00003ee0 /* 197c: afa00014 */ sw $zero,0x14($sp) /* 1980: 3c048009 */ lui $a0,%hi(var8008d4a0) -/* 1984: 0c01207c */ jal func000481f0 +/* 1984: 0c01207c */ jal osStartThread /* 1988: 2484d4a0 */ addiu $a0,$a0,%lo(var8008d4a0) /* 198c: 8fbf001c */ lw $ra,0x1c($sp) /* 1990: 27bd0020 */ addiu $sp,$sp,0x20 @@ -770,7 +770,7 @@ glabel func0000199c /* 19d0: 0c000fb8 */ jal func00003ee0 /* 19d4: afa20010 */ sw $v0,0x10($sp) /* 19d8: 3c048009 */ lui $a0,%hi(var8008d270) -/* 19dc: 0c01207c */ jal func000481f0 +/* 19dc: 0c01207c */ jal osStartThread /* 19e0: 2484d270 */ addiu $a0,$a0,%lo(var8008d270) /* 19e4: 8fbf001c */ lw $ra,0x1c($sp) /* 19e8: 27bd0020 */ addiu $sp,$sp,0x20 @@ -786,7 +786,7 @@ glabel func000019f4 /* 1a00: 3c058009 */ lui $a1,%hi(var8008db48) /* 1a04: 24a5db48 */ addiu $a1,$a1,%lo(var8008db48) /* 1a08: 2484db30 */ addiu $a0,$a0,%lo(var8008db30) -/* 1a0c: 0c0120d0 */ jal func00048340 +/* 1a0c: 0c0120d0 */ jal osCreateMesgQueue /* 1a10: 24060020 */ addiu $a2,$zero,0x20 /* 1a14: 3c0e8000 */ lui $t6,0x8000 /* 1a18: 8dce0300 */ lw $t6,0x300($t6) @@ -913,11 +913,11 @@ glabel func00001c4c /* 1ca0: 26110040 */ addiu $s1,$s0,0x40 /* 1ca4: 02202025 */ or $a0,$s1,$zero /* 1ca8: 26050058 */ addiu $a1,$s0,0x58 -/* 1cac: 0c0120d0 */ jal func00048340 +/* 1cac: 0c0120d0 */ jal osCreateMesgQueue /* 1cb0: 24060008 */ addiu $a2,$zero,0x8 /* 1cb4: 26040078 */ addiu $a0,$s0,0x78 /* 1cb8: 26050090 */ addiu $a1,$s0,0x90 -/* 1cbc: 0c0120d0 */ jal func00048340 +/* 1cbc: 0c0120d0 */ jal osCreateMesgQueue /* 1cc0: 24060008 */ addiu $a2,$zero,0x8 /* 1cc4: 0c000c14 */ jal func00003050 /* 1cc8: 240400fe */ addiu $a0,$zero,0xfe @@ -1005,7 +1005,7 @@ glabel func00001c4c /* 1e08: 24050002 */ addiu $a1,$zero,0x2 /* 1e0c: 0c000fb8 */ jal func00003ee0 /* 1e10: 02003825 */ or $a3,$s0,$zero -/* 1e14: 0c01207c */ jal func000481f0 +/* 1e14: 0c01207c */ jal osStartThread /* 1e18: 8e0400b0 */ lw $a0,0xb0($s0) /* 1e1c: 8fbf0024 */ lw $ra,0x24($sp) /* 1e20: 8fb0001c */ lw $s0,0x1c($sp) @@ -1067,7 +1067,7 @@ glabel func00001e8c /* 1ee0: 02402025 */ or $a0,$s2,$zero .L00001ee4: /* 1ee4: 02602825 */ or $a1,$s3,$zero -/* 1ee8: 0c0121bc */ jal func000486f0 +/* 1ee8: 0c0121bc */ jal osRecvMesg /* 1eec: 24060001 */ addiu $a2,$zero,0x1 /* 1ef0: 8fae004c */ lw $t6,0x4c($sp) /* 1ef4: 11d40007 */ beq $t6,$s4,.L00001f14 @@ -1256,7 +1256,7 @@ glabel func00002148 /* 2178: 26320078 */ addiu $s2,$s1,0x78 /* 217c: 02402025 */ or $a0,$s2,$zero /* 2180: 02602825 */ or $a1,$s3,$zero -/* 2184: 0c0121bc */ jal func000486f0 +/* 2184: 0c0121bc */ jal osRecvMesg /* 2188: 00003025 */ or $a2,$zero,$zero /* 218c: 2410ffff */ addiu $s0,$zero,-1 /* 2190: 10500009 */ beq $v0,$s0,.L000021b8 @@ -1266,7 +1266,7 @@ glabel func00002148 /* 219c: 8fa50050 */ lw $a1,0x50($sp) /* 21a0: 02402025 */ or $a0,$s2,$zero /* 21a4: 02602825 */ or $a1,$s3,$zero -/* 21a8: 0c0121bc */ jal func000486f0 +/* 21a8: 0c0121bc */ jal osRecvMesg /* 21ac: 00003025 */ or $a2,$zero,$zero /* 21b0: 5450fff9 */ bnel $v0,$s0,.L00002198 /* 21b4: 02202025 */ or $a0,$s1,$zero @@ -1314,7 +1314,7 @@ glabel func00002148 /* 2248: 55a00004 */ bnezl $t5,.L0000225c /* 224c: 8e100000 */ lw $s0,0x0($s0) .L00002250: -/* 2250: 0c012238 */ jal func000488e0 +/* 2250: 0c012238 */ jal osSendMesg /* 2254: 8e040004 */ lw $a0,0x4($s0) /* 2258: 8e100000 */ lw $s0,0x0($s0) .L0000225c: @@ -1822,7 +1822,7 @@ glabel func00002768 .L000029f4: /* 29f4: 24060001 */ addiu $a2,$zero,0x1 /* 29f8: 8d640050 */ lw $a0,0x50($t3) -/* 29fc: 0c012238 */ jal func000488e0 +/* 29fc: 0c012238 */ jal osSendMesg /* 2a00: 8d650054 */ lw $a1,0x54($t3) /* 2a04: 10000001 */ beqz $zero,.L00002a0c /* 2a08: 24020001 */ addiu $v0,$zero,0x1 @@ -2130,7 +2130,7 @@ glabel func00002d90 /* 2e10: afa0002c */ sw $zero,0x2c($sp) /* 2e14: 2484faa8 */ addiu $a0,$a0,%lo(var8008faa8) /* 2e18: 27a5002c */ addiu $a1,$sp,0x2c -/* 2e1c: 0c0121bc */ jal func000486f0 +/* 2e1c: 0c0121bc */ jal osRecvMesg /* 2e20: 24060001 */ addiu $a2,$zero,0x1 /* 2e24: 240e0001 */ addiu $t6,$zero,0x1 /* 2e28: 3c018006 */ lui $at,0x8006 @@ -2230,7 +2230,7 @@ glabel func00002f70 /* 2f7c: 3c058009 */ lui $a1,%hi(var8008fa80) /* 2f80: 24a5fa80 */ addiu $a1,$a1,%lo(var8008fa80) /* 2f84: 2484faa8 */ addiu $a0,$a0,%lo(var8008faa8) -/* 2f88: 0c0120d0 */ jal func00048340 +/* 2f88: 0c0120d0 */ jal osCreateMesgQueue /* 2f8c: 2406000a */ addiu $a2,$zero,0xa /* 2f90: 3c058009 */ lui $a1,%hi(var8008faa8) /* 2f94: 24a5faa8 */ addiu $a1,$a1,%lo(var8008faa8) @@ -2250,7 +2250,7 @@ glabel func00002f70 /* 2fcc: 0c000fb8 */ jal func00003ee0 /* 2fd0: 00003825 */ or $a3,$zero,$zero /* 2fd4: 3c048009 */ lui $a0,%hi(var8008fac0) -/* 2fd8: 0c01207c */ jal func000481f0 +/* 2fd8: 0c01207c */ jal osStartThread /* 2fdc: 2484fac0 */ addiu $a0,$a0,%lo(var8008fac0) /* 2fe0: 8fbf001c */ lw $ra,0x1c($sp) /* 2fe4: 27bd0020 */ addiu $sp,$sp,0x20 diff --git a/src/game/game_005fd0.c b/src/game/game_005fd0.c index 85096922c..e23a4f194 100644 --- a/src/game/game_005fd0.c +++ b/src/game/game_005fd0.c @@ -1386,7 +1386,7 @@ glabel func0f006c80 /* f00719c: 372c0024 */ ori $t4,$t9,0x24 /* f0071a0: ac6c0000 */ sw $t4,0x0($v1) /* f0071a4: afa30058 */ sw $v1,0x58($sp) -/* f0071a8: 0c012d20 */ jal func0004b480 +/* f0071a8: 0c012d20 */ jal osVirtualToPhysical /* f0071ac: afa80050 */ sw $t0,0x50($sp) /* f0071b0: 83aa00ab */ lb $t2,0xab($sp) /* f0071b4: 8fa30058 */ lw $v1,0x58($sp) @@ -1572,7 +1572,7 @@ glabel func0f006c80 /* f007478: 26190008 */ addiu $t9,$s0,0x8 /* f00747c: afb90150 */ sw $t9,0x150($sp) /* f007480: 02202025 */ or $a0,$s1,$zero -/* f007484: 0c012d20 */ jal func0004b480 +/* f007484: 0c012d20 */ jal osVirtualToPhysical /* f007488: ae0f0000 */ sw $t7,0x0($s0) /* f00748c: ae020004 */ sw $v0,0x4($s0) /* f007490: 3c05800b */ lui $a1,0x800b @@ -2128,7 +2128,7 @@ glabel func0f006c80 /* f007d10: afae0150 */ sw $t6,0x150($sp) /* f007d14: adf80000 */ sw $t8,0x0($t7) /* f007d18: 00402025 */ or $a0,$v0,$zero -/* f007d1c: 0c012d20 */ jal func0004b480 +/* f007d1c: 0c012d20 */ jal osVirtualToPhysical /* f007d20: afaf005c */ sw $t7,0x5c($sp) /* f007d24: 8fa3005c */ lw $v1,0x5c($sp) /* f007d28: 3c0e0450 */ lui $t6,0x450 @@ -2139,7 +2139,7 @@ glabel func0f006c80 /* f007d3c: 272f0008 */ addiu $t7,$t9,0x8 /* f007d40: afaf0150 */ sw $t7,0x150($sp) /* f007d44: af2e0000 */ sw $t6,0x0($t9) -/* f007d48: 0c012d20 */ jal func0004b480 +/* f007d48: 0c012d20 */ jal osVirtualToPhysical /* f007d4c: afb90058 */ sw $t9,0x58($sp) /* f007d50: 8fa80058 */ lw $t0,0x58($sp) /* f007d54: 27b000bc */ addiu $s0,$sp,0xbc @@ -2589,7 +2589,7 @@ glabel func0f006c80 /* f00842c: 37390048 */ ori $t9,$t9,0x48 /* f008430: 26380008 */ addiu $t8,$s1,0x8 /* f008434: afb80150 */ sw $t8,0x150($sp) -/* f008438: 0c012d20 */ jal func0004b480 +/* f008438: 0c012d20 */ jal osVirtualToPhysical /* f00843c: ae390000 */ sw $t9,0x0($s1) /* f008440: ae220004 */ sw $v0,0x4($s1) /* f008444: 27b000d4 */ addiu $s0,$sp,0xd4 @@ -3088,7 +3088,7 @@ glabel func0f008558 /* f008bb4: a6090046 */ sh $t1,0x46($s0) /* f008bb8: ac6f0000 */ sw $t7,0x0($v1) /* f008bbc: afa30058 */ sw $v1,0x58($sp) -/* f008bc0: 0c012d20 */ jal func0004b480 +/* f008bc0: 0c012d20 */ jal osVirtualToPhysical /* f008bc4: afa200a8 */ sw $v0,0xa8($sp) /* f008bc8: 8fa30058 */ lw $v1,0x58($sp) /* f008bcc: 27b00068 */ addiu $s0,$sp,0x68 @@ -3543,7 +3543,7 @@ glabel func0f008558 /* f0092a0: 02002025 */ or $a0,$s0,$zero /* f0092a4: 262e0008 */ addiu $t6,$s1,0x8 /* f0092a8: afae00a8 */ sw $t6,0xa8($sp) -/* f0092ac: 0c012d20 */ jal func0004b480 +/* f0092ac: 0c012d20 */ jal osVirtualToPhysical /* f0092b0: ae2f0000 */ sw $t7,0x0($s1) /* f0092b4: ae220004 */ sw $v0,0x4($s1) /* f0092b8: 8fb90050 */ lw $t9,0x50($sp) @@ -3885,7 +3885,7 @@ glabel func0f009504 /* f00979c: afae0074 */ sw $t6,0x74($sp) /* f0097a0: adf90000 */ sw $t9,0x0($t7) /* f0097a4: 00402025 */ or $a0,$v0,$zero -/* f0097a8: 0c012d20 */ jal func0004b480 +/* f0097a8: 0c012d20 */ jal osVirtualToPhysical /* f0097ac: afaf0048 */ sw $t7,0x48($sp) /* f0097b0: 8fa50048 */ lw $a1,0x48($sp) /* f0097b4: 27a9007c */ addiu $t1,$sp,0x7c @@ -3946,7 +3946,7 @@ glabel func0f009818 /* f009878: ac780000 */ sw $t8,0x0($v1) /* f00987c: afa30030 */ sw $v1,0x30($sp) /* f009880: 26100008 */ addiu $s0,$s0,0x8 -/* f009884: 0c012d20 */ jal func0004b480 +/* f009884: 0c012d20 */ jal osVirtualToPhysical /* f009888: 00402025 */ or $a0,$v0,$zero /* f00988c: 8fa30030 */ lw $v1,0x30($sp) /* f009890: 44800000 */ mtc1 $zero,$f0 @@ -4003,7 +4003,7 @@ glabel func0f009818 /* f00995c: acaa0000 */ sw $t2,0x0($a1) /* f009960: afa5002c */ sw $a1,0x2c($sp) /* f009964: 8fa40108 */ lw $a0,0x108($sp) -/* f009968: 0c012d20 */ jal func0004b480 +/* f009968: 0c012d20 */ jal osVirtualToPhysical /* f00996c: 26100008 */ addiu $s0,$s0,0x8 /* f009970: 8fa5002c */ lw $a1,0x2c($sp) /* f009974: 02001825 */ or $v1,$s0,$zero @@ -5073,7 +5073,7 @@ glabel func0f00a490 /* f00a8ac: 37180004 */ ori $t8,$t8,0x4 /* f00a8b0: 262f0008 */ addiu $t7,$s1,0x8 /* f00a8b4: afaf0080 */ sw $t7,0x80($sp) -/* f00a8b8: 0c012d20 */ jal func0004b480 +/* f00a8b8: 0c012d20 */ jal osVirtualToPhysical /* f00a8bc: ae380000 */ sw $t8,0x0($s1) /* f00a8c0: ae220004 */ sw $v0,0x4($s1) /* f00a8c4: 8fb20080 */ lw $s2,0x80($sp) @@ -5082,7 +5082,7 @@ glabel func0f00a490 /* f00a8d0: 264a0008 */ addiu $t2,$s2,0x8 /* f00a8d4: afaa0080 */ sw $t2,0x80($sp) /* f00a8d8: 02002025 */ or $a0,$s0,$zero -/* f00a8dc: 0c012d20 */ jal func0004b480 +/* f00a8dc: 0c012d20 */ jal osVirtualToPhysical /* f00a8e0: ae4c0000 */ sw $t4,0x0($s2) /* f00a8e4: ae420004 */ sw $v0,0x4($s2) /* f00a8e8: 8fad0080 */ lw $t5,0x80($sp) @@ -5621,7 +5621,7 @@ glabel func0f00a940 /* f00b0e8: 00a02025 */ or $a0,$a1,$zero /* f00b0ec: 262c0008 */ addiu $t4,$s1,0x8 /* f00b0f0: afac0110 */ sw $t4,0x110($sp) -/* f00b0f4: 0c012d20 */ jal func0004b480 +/* f00b0f4: 0c012d20 */ jal osVirtualToPhysical /* f00b0f8: ae2d0000 */ sw $t5,0x0($s1) /* f00b0fc: ae220004 */ sw $v0,0x4($s1) /* f00b100: 8fb90110 */ lw $t9,0x110($sp) @@ -5631,7 +5631,7 @@ glabel func0f00a940 /* f00b110: afb80110 */ sw $t8,0x110($sp) /* f00b114: af2a0000 */ sw $t2,0x0($t9) /* f00b118: 02002025 */ or $a0,$s0,$zero -/* f00b11c: 0c012d20 */ jal func0004b480 +/* f00b11c: 0c012d20 */ jal osVirtualToPhysical /* f00b120: afb90044 */ sw $t9,0x44($sp) /* f00b124: 8fa50044 */ lw $a1,0x44($sp) /* f00b128: 3c0bb100 */ lui $t3,0xb100 diff --git a/src/game/game_015470.c b/src/game/game_015470.c index 935bf719a..e2e9e6301 100644 --- a/src/game/game_015470.c +++ b/src/game/game_015470.c @@ -334,7 +334,7 @@ glabel func0f0155f0 /* f015684: 0301c825 */ or $t9,$t8,$at /* f015688: 0c002ac7 */ jal func0000ab1c /* f01568c: add90000 */ sw $t9,0x0($t6) -/* f015690: 0c012d20 */ jal func0004b480 +/* f015690: 0c012d20 */ jal osVirtualToPhysical /* f015694: 00402025 */ or $a0,$v0,$zero /* f015698: 8faf00fc */ lw $t7,0xfc($sp) /* f01569c: 02001825 */ or $v1,$s0,$zero @@ -392,7 +392,7 @@ glabel func0f0155f0 /* f015768: 000e7980 */ sll $t7,$t6,0x6 /* f01576c: afab00e8 */ sw $t3,0xe8($sp) /* f015770: 26100008 */ addiu $s0,$s0,0x8 -/* f015774: 0c012d20 */ jal func0004b480 +/* f015774: 0c012d20 */ jal osVirtualToPhysical /* f015778: 01f82021 */ addu $a0,$t7,$t8 /* f01577c: 8fab00e8 */ lw $t3,0xe8($sp) /* f015780: 02001825 */ or $v1,$s0,$zero @@ -454,7 +454,7 @@ glabel func0f0155f0 /* f015860: 00197180 */ sll $t6,$t9,0x6 /* f015864: afa300dc */ sw $v1,0xdc($sp) /* f015868: 26100008 */ addiu $s0,$s0,0x8 -/* f01586c: 0c012d20 */ jal func0004b480 +/* f01586c: 0c012d20 */ jal osVirtualToPhysical /* f015870: 01cf2021 */ addu $a0,$t6,$t7 /* f015874: 8fa300dc */ lw $v1,0xdc($sp) /* f015878: 3c180100 */ lui $t8,0x100 @@ -469,7 +469,7 @@ glabel func0f0155f0 /* f01589c: 00197180 */ sll $t6,$t9,0x6 /* f0158a0: afaa00d8 */ sw $t2,0xd8($sp) /* f0158a4: 26100008 */ addiu $s0,$s0,0x8 -/* f0158a8: 0c012d20 */ jal func0004b480 +/* f0158a8: 0c012d20 */ jal osVirtualToPhysical /* f0158ac: 01cf2021 */ addu $a0,$t6,$t7 /* f0158b0: 8faa00d8 */ lw $t2,0xd8($sp) /* f0158b4: 02003825 */ or $a3,$s0,$zero @@ -870,7 +870,7 @@ glabel func0f0155f0 /* f015ebc: 00801825 */ or $v1,$a0,$zero /* f015ec0: 3c04800a */ lui $a0,0x800a /* f015ec4: 8c84cc90 */ lw $a0,-0x3370($a0) -/* f015ec8: 0c012d20 */ jal func0004b480 +/* f015ec8: 0c012d20 */ jal osVirtualToPhysical /* f015ecc: afa30034 */ sw $v1,0x34($sp) /* f015ed0: 8fa30034 */ lw $v1,0x34($sp) /* f015ed4: 3c0a8006 */ lui $t2,%hi(var80062414) diff --git a/src/game/game_01afc0.c b/src/game/game_01afc0.c index 4d25d7584..7d865cfd8 100644 --- a/src/game/game_01afc0.c +++ b/src/game/game_01afc0.c @@ -30,7 +30,7 @@ glabel func0f01afc0 /* f01b000: 03214025 */ or $t0,$t9,$at /* f01b004: 0c002ac7 */ jal func0000ab1c /* f01b008: ad280000 */ sw $t0,0x0($t1) -/* f01b00c: 0c012d20 */ jal func0004b480 +/* f01b00c: 0c012d20 */ jal osVirtualToPhysical /* f01b010: 00402025 */ or $a0,$v0,$zero /* f01b014: 8faa0030 */ lw $t2,0x30($sp) /* f01b018: 02001825 */ or $v1,$s0,$zero diff --git a/src/game/game_01e250.c b/src/game/game_01e250.c index 34dca8329..15b8f4f87 100644 --- a/src/game/game_01e250.c +++ b/src/game/game_01e250.c @@ -12723,7 +12723,7 @@ glabel func0f02983c /* f029a88: afa601c4 */ sw $a2,0x1c4($sp) /* f029a8c: afa701c0 */ sw $a3,0x1c0($sp) /* f029a90: afa801bc */ sw $t0,0x1bc($sp) -/* f029a94: 0c012d20 */ jal func0004b480 +/* f029a94: 0c012d20 */ jal osVirtualToPhysical /* f029a98: afa901b8 */ sw $t1,0x1b8($sp) /* f029a9c: 8fa80204 */ lw $t0,0x204($sp) /* f029aa0: c7ae016c */ lwc1 $f14,0x16c($sp) @@ -12739,7 +12739,7 @@ glabel func0f02983c /* f029ac8: afb801f0 */ sw $t8,0x1f0($sp) /* f029acc: ae0e0000 */ sw $t6,0x0($s0) /* f029ad0: afa201d8 */ sw $v0,0x1d8($sp) -/* f029ad4: 0c012d20 */ jal func0004b480 +/* f029ad4: 0c012d20 */ jal osVirtualToPhysical /* f029ad8: 00402025 */ or $a0,$v0,$zero /* f029adc: 8fa301d8 */ lw $v1,0x1d8($sp) /* f029ae0: ae020004 */ sw $v0,0x4($s0) @@ -12841,7 +12841,7 @@ glabel func0f02983c /* f029c50: af190000 */ sw $t9,0x0($t8) /* f029c54: afa60054 */ sw $a2,0x54($sp) /* f029c58: 02002025 */ or $a0,$s0,$zero -/* f029c5c: 0c012d20 */ jal func0004b480 +/* f029c5c: 0c012d20 */ jal osVirtualToPhysical /* f029c60: afb800c8 */ sw $t8,0xc8($sp) /* f029c64: 8fa800c8 */ lw $t0,0xc8($sp) /* f029c68: 8fa60054 */ lw $a2,0x54($sp) @@ -13068,7 +13068,7 @@ glabel func0f02983c /* f029fa0: afae01f0 */ sw $t6,0x1f0($sp) /* f029fa4: ae190000 */ sw $t9,0x0($s0) /* f029fa8: afa201d8 */ sw $v0,0x1d8($sp) -/* f029fac: 0c012d20 */ jal func0004b480 +/* f029fac: 0c012d20 */ jal osVirtualToPhysical /* f029fb0: 00402025 */ or $a0,$v0,$zero /* f029fb4: 8fa80204 */ lw $t0,0x204($sp) /* f029fb8: 8fa301d8 */ lw $v1,0x1d8($sp) @@ -13420,7 +13420,7 @@ glabel func0f02983c /* f02a4c4: a7a80176 */ sh $t0,0x176($sp) /* f02a4c8: afa60054 */ sw $a2,0x54($sp) /* f02a4cc: 02002025 */ or $a0,$s0,$zero -/* f02a4d0: 0c012d20 */ jal func0004b480 +/* f02a4d0: 0c012d20 */ jal osVirtualToPhysical /* f02a4d4: afae00b4 */ sw $t6,0xb4($sp) /* f02a4d8: 8fa700b4 */ lw $a3,0xb4($sp) /* f02a4dc: 8fa60054 */ lw $a2,0x54($sp) @@ -13512,7 +13512,7 @@ glabel func0f02983c /* f02a620: afae01f0 */ sw $t6,0x1f0($sp) /* f02a624: ae0f0000 */ sw $t7,0x0($s0) /* f02a628: afa201d8 */ sw $v0,0x1d8($sp) -/* f02a62c: 0c012d20 */ jal func0004b480 +/* f02a62c: 0c012d20 */ jal osVirtualToPhysical /* f02a630: 00402025 */ or $a0,$v0,$zero /* f02a634: 8fa301d8 */ lw $v1,0x1d8($sp) /* f02a638: c7a200ac */ lwc1 $f2,0xac($sp) @@ -13639,7 +13639,7 @@ glabel func0f02983c /* f02a814: af0e0000 */ sw $t6,0x0($t8) /* f02a818: afab0044 */ sw $t3,0x44($sp) /* f02a81c: afa60054 */ sw $a2,0x54($sp) -/* f02a820: 0c012d20 */ jal func0004b480 +/* f02a820: 0c012d20 */ jal osVirtualToPhysical /* f02a824: afb800a4 */ sw $t8,0xa4($sp) /* f02a828: 8fa700a4 */ lw $a3,0xa4($sp) /* f02a82c: 8fa60054 */ lw $a2,0x54($sp) @@ -13713,7 +13713,7 @@ glabel func0f02983c /* f02a934: afb801f0 */ sw $t8,0x1f0($sp) /* f02a938: ae2f0000 */ sw $t7,0x0($s1) /* f02a93c: afa201d8 */ sw $v0,0x1d8($sp) -/* f02a940: 0c012d20 */ jal func0004b480 +/* f02a940: 0c012d20 */ jal osVirtualToPhysical /* f02a944: 00402025 */ or $a0,$v0,$zero /* f02a948: 8fa301d8 */ lw $v1,0x1d8($sp) /* f02a94c: 93a5017f */ lbu $a1,0x17f($sp) @@ -13799,7 +13799,7 @@ glabel func0f02983c /* f02aa78: afaf01f0 */ sw $t7,0x1f0($sp) /* f02aa7c: ae2e0000 */ sw $t6,0x0($s1) /* f02aa80: afa201d8 */ sw $v0,0x1d8($sp) -/* f02aa84: 0c012d20 */ jal func0004b480 +/* f02aa84: 0c012d20 */ jal osVirtualToPhysical /* f02aa88: 00402025 */ or $a0,$v0,$zero /* f02aa8c: 8fa301d8 */ lw $v1,0x1d8($sp) /* f02aa90: c7a20094 */ lwc1 $f2,0x94($sp) @@ -13933,7 +13933,7 @@ glabel func0f02983c /* f02ac88: 37390090 */ ori $t9,$t9,0x90 /* f02ac8c: 262e0008 */ addiu $t6,$s1,0x8 /* f02ac90: afae01f0 */ sw $t6,0x1f0($sp) -/* f02ac94: 0c012d20 */ jal func0004b480 +/* f02ac94: 0c012d20 */ jal osVirtualToPhysical /* f02ac98: ae390000 */ sw $t9,0x0($s1) /* f02ac9c: ae220004 */ sw $v0,0x4($s1) /* f02aca0: 8fb801f0 */ lw $t8,0x1f0($sp) @@ -14047,7 +14047,7 @@ glabel func0f02983c /* f02ae3c: afaf01f0 */ sw $t7,0x1f0($sp) /* f02ae40: ae0e0000 */ sw $t6,0x0($s0) /* f02ae44: afa201d8 */ sw $v0,0x1d8($sp) -/* f02ae48: 0c012d20 */ jal func0004b480 +/* f02ae48: 0c012d20 */ jal osVirtualToPhysical /* f02ae4c: 00402025 */ or $a0,$v0,$zero /* f02ae50: 8fa301d8 */ lw $v1,0x1d8($sp) /* f02ae54: 93a5017f */ lbu $a1,0x17f($sp) @@ -14244,7 +14244,7 @@ glabel func0f02983c /* f02b12c: afa30040 */ sw $v1,0x40($sp) /* f02b130: afaf004c */ sw $t7,0x4c($sp) /* f02b134: 02002025 */ or $a0,$s0,$zero -/* f02b138: 0c012d20 */ jal func0004b480 +/* f02b138: 0c012d20 */ jal osVirtualToPhysical /* f02b13c: afb90078 */ sw $t9,0x78($sp) /* f02b140: 8fa60078 */ lw $a2,0x78($sp) /* f02b144: 8fa80204 */ lw $t0,0x204($sp) @@ -14514,7 +14514,7 @@ glabel func0f02983c /* f02b52c: afab0044 */ sw $t3,0x44($sp) /* f02b530: afaa0058 */ sw $t2,0x58($sp) /* f02b534: afa70054 */ sw $a3,0x54($sp) -/* f02b538: 0c012d20 */ jal func0004b480 +/* f02b538: 0c012d20 */ jal osVirtualToPhysical /* f02b53c: afaf0068 */ sw $t7,0x68($sp) /* f02b540: 8fa60068 */ lw $a2,0x68($sp) /* f02b544: 8fa70054 */ lw $a3,0x54($sp) @@ -14666,7 +14666,7 @@ glabel func0f02983c /* f02b770: 8fb101f0 */ lw $s1,0x1f0($sp) /* f02b774: 26390008 */ addiu $t9,$s1,0x8 /* f02b778: afb901f0 */ sw $t9,0x1f0($sp) -/* f02b77c: 0c012d20 */ jal func0004b480 +/* f02b77c: 0c012d20 */ jal osVirtualToPhysical /* f02b780: ae2e0000 */ sw $t6,0x0($s1) /* f02b784: ae220004 */ sw $v0,0x4($s1) /* f02b788: 8fb801f0 */ lw $t8,0x1f0($sp) diff --git a/src/game/game_066310.c b/src/game/game_066310.c index ba93af7a7..a61d74240 100644 --- a/src/game/game_066310.c +++ b/src/game/game_066310.c @@ -30531,7 +30531,7 @@ glabel func0f07fbf8 /* f0808d0: afa900c4 */ sw $t1,0xc4($sp) /* f0808d4: ae190000 */ sw $t9,0x0($s0) /* f0808d8: 8faa00b8 */ lw $t2,0xb8($sp) -/* f0808dc: 0c012d20 */ jal func0004b480 +/* f0808dc: 0c012d20 */ jal osVirtualToPhysical /* f0808e0: 8d44000c */ lw $a0,0xc($t2) /* f0808e4: ae020004 */ sw $v0,0x4($s0) /* f0808e8: 8fb100c4 */ lw $s1,0xc4($sp) @@ -30540,7 +30540,7 @@ glabel func0f07fbf8 /* f0808f4: 262c0008 */ addiu $t4,$s1,0x8 /* f0808f8: afac00c4 */ sw $t4,0xc4($sp) /* f0808fc: ae2d0000 */ sw $t5,0x0($s1) -/* f080900: 0c012d20 */ jal func0004b480 +/* f080900: 0c012d20 */ jal osVirtualToPhysical /* f080904: 8fa400b4 */ lw $a0,0xb4($sp) /* f080908: ae220004 */ sw $v0,0x4($s1) /* f08090c: 8fb000c4 */ lw $s0,0xc4($sp) @@ -30549,7 +30549,7 @@ glabel func0f07fbf8 /* f080918: 260e0008 */ addiu $t6,$s0,0x8 /* f08091c: afae00c4 */ sw $t6,0xc4($sp) /* f080920: ae180000 */ sw $t8,0x0($s0) -/* f080924: 0c012d20 */ jal func0004b480 +/* f080924: 0c012d20 */ jal osVirtualToPhysical /* f080928: 8fa400b0 */ lw $a0,0xb0($sp) /* f08092c: ae020004 */ sw $v0,0x4($s0) /* f080930: 8fa900c4 */ lw $t1,0xc4($sp) @@ -31128,7 +31128,7 @@ glabel func0f080f8c /* f081180: 262a0008 */ addiu $t2,$s1,0x8 /* f081184: afaa0100 */ sw $t2,0x100($sp) /* f081188: ae2b0000 */ sw $t3,0x0($s1) -/* f08118c: 0c012d20 */ jal func0004b480 +/* f08118c: 0c012d20 */ jal osVirtualToPhysical /* f081190: 8fa4007c */ lw $a0,0x7c($sp) /* f081194: ae220004 */ sw $v0,0x4($s1) /* f081198: 8fac0100 */ lw $t4,0x100($sp) @@ -31138,7 +31138,7 @@ glabel func0f080f8c /* f0811a8: afad0100 */ sw $t5,0x100($sp) /* f0811ac: ad8e0000 */ sw $t6,0x0($t4) /* f0811b0: 8fa40074 */ lw $a0,0x74($sp) -/* f0811b4: 0c012d20 */ jal func0004b480 +/* f0811b4: 0c012d20 */ jal osVirtualToPhysical /* f0811b8: afac0044 */ sw $t4,0x44($sp) /* f0811bc: 8fa30044 */ lw $v1,0x44($sp) /* f0811c0: 3c190430 */ lui $t9,0x430 @@ -31148,7 +31148,7 @@ glabel func0f080f8c /* f0811d0: 02002025 */ or $a0,$s0,$zero /* f0811d4: 26380008 */ addiu $t8,$s1,0x8 /* f0811d8: afb80100 */ sw $t8,0x100($sp) -/* f0811dc: 0c012d20 */ jal func0004b480 +/* f0811dc: 0c012d20 */ jal osVirtualToPhysical /* f0811e0: ae390000 */ sw $t9,0x0($s1) /* f0811e4: ae220004 */ sw $v0,0x4($s1) /* f0811e8: 8fa80100 */ lw $t0,0x100($sp) diff --git a/src/game/game_0abe70.c b/src/game/game_0abe70.c index 42f3956b7..6b3757012 100644 --- a/src/game/game_0abe70.c +++ b/src/game/game_0abe70.c @@ -974,7 +974,7 @@ glabel func0f0ac4b8 /* f0acabc: afad00f0 */ sw $t5,0xf0($sp) /* f0acac0: ad2b0000 */ sw $t3,0x0($t1) /* f0acac4: 8fa400c8 */ lw $a0,0xc8($sp) -/* f0acac8: 0c012d20 */ jal func0004b480 +/* f0acac8: 0c012d20 */ jal osVirtualToPhysical /* f0acacc: afa90054 */ sw $t1,0x54($sp) /* f0acad0: 8fa30054 */ lw $v1,0x54($sp) /* f0acad4: 3c190704 */ lui $t9,0x704 @@ -985,7 +985,7 @@ glabel func0f0ac4b8 /* f0acae8: afac00f0 */ sw $t4,0xf0($sp) /* f0acaec: ad590000 */ sw $t9,0x0($t2) /* f0acaf0: 8fa400c4 */ lw $a0,0xc4($sp) -/* f0acaf4: 0c012d20 */ jal func0004b480 +/* f0acaf4: 0c012d20 */ jal osVirtualToPhysical /* f0acaf8: afaa0050 */ sw $t2,0x50($sp) /* f0acafc: 8fa80050 */ lw $t0,0x50($sp) /* f0acb00: 24180002 */ addiu $t8,$zero,0x2 @@ -1006,7 +1006,7 @@ glabel func0f0ac4b8 /* f0acb3c: afa900f0 */ sw $t1,0xf0($sp) /* f0acb40: adcd0000 */ sw $t5,0x0($t6) /* f0acb44: 02002025 */ or $a0,$s0,$zero -/* f0acb48: 0c012d20 */ jal func0004b480 +/* f0acb48: 0c012d20 */ jal osVirtualToPhysical /* f0acb4c: afae004c */ sw $t6,0x4c($sp) /* f0acb50: 8fa5004c */ lw $a1,0x4c($sp) /* f0acb54: 3c0cb100 */ lui $t4,0xb100 @@ -1938,7 +1938,7 @@ glabel func0f0acb90 /* f0ad938: afaf0190 */ sw $t7,0x190($sp) /* f0ad93c: adca0000 */ sw $t2,0x0($t6) /* f0ad940: 8fa40188 */ lw $a0,0x188($sp) -/* f0ad944: 0c012d20 */ jal func0004b480 +/* f0ad944: 0c012d20 */ jal osVirtualToPhysical /* f0ad948: afae009c */ sw $t6,0x9c($sp) /* f0ad94c: 8fa7009c */ lw $a3,0x9c($sp) /* f0ad950: 3c09ba00 */ lui $t1,0xba00 @@ -2004,7 +2004,7 @@ glabel func0f0acb90 /* f0ada40: afaa0190 */ sw $t2,0x190($sp) /* f0ada44: aded0000 */ sw $t5,0x0($t7) /* f0ada48: 8fa40144 */ lw $a0,0x144($sp) -/* f0ada4c: 0c012d20 */ jal func0004b480 +/* f0ada4c: 0c012d20 */ jal osVirtualToPhysical /* f0ada50: afaf007c */ sw $t7,0x7c($sp) /* f0ada54: 8fa5007c */ lw $a1,0x7c($sp) /* f0ada58: 2401001d */ addiu $at,$zero,0x1d @@ -2034,7 +2034,7 @@ glabel func0f0acb90 /* f0adab8: afab0190 */ sw $t3,0x190($sp) /* f0adabc: ad8e0000 */ sw $t6,0x0($t4) /* f0adac0: 02002025 */ or $a0,$s0,$zero -/* f0adac4: 0c012d20 */ jal func0004b480 +/* f0adac4: 0c012d20 */ jal osVirtualToPhysical /* f0adac8: afac0078 */ sw $t4,0x78($sp) /* f0adacc: 8fa80078 */ lw $t0,0x78($sp) /* f0adad0: 3c0db100 */ lui $t5,0xb100 @@ -2079,7 +2079,7 @@ glabel func0f0acb90 /* f0adb68: afa90190 */ sw $t1,0x190($sp) /* f0adb6c: af190000 */ sw $t9,0x0($t8) /* f0adb70: 02002025 */ or $a0,$s0,$zero -/* f0adb74: 0c012d20 */ jal func0004b480 +/* f0adb74: 0c012d20 */ jal osVirtualToPhysical /* f0adb78: afb8006c */ sw $t8,0x6c($sp) /* f0adb7c: 8fa5006c */ lw $a1,0x6c($sp) /* f0adb80: 3c0eb100 */ lui $t6,0xb100 @@ -3797,7 +3797,7 @@ glabel func0f0af158 /* f0af400: 262b0008 */ addiu $t3,$s1,0x8 /* f0af404: afab0200 */ sw $t3,0x200($sp) /* f0af408: 02002025 */ or $a0,$s0,$zero -/* f0af40c: 0c012d20 */ jal func0004b480 +/* f0af40c: 0c012d20 */ jal osVirtualToPhysical /* f0af410: ae2c0000 */ sw $t4,0x0($s1) /* f0af414: ae220004 */ sw $v0,0x4($s1) /* f0af418: 3c017f1b */ lui $at,%hi(var7f1acd74) @@ -3838,7 +3838,7 @@ glabel func0f0af158 /* f0af4a0: 26390008 */ addiu $t9,$s1,0x8 /* f0af4a4: afb90200 */ sw $t9,0x200($sp) /* f0af4a8: 00402025 */ or $a0,$v0,$zero -/* f0af4ac: 0c012d20 */ jal func0004b480 +/* f0af4ac: 0c012d20 */ jal osVirtualToPhysical /* f0af4b0: ae280000 */ sw $t0,0x0($s1) /* f0af4b4: ae220004 */ sw $v0,0x4($s1) /* f0af4b8: c6040028 */ lwc1 $f4,0x28($s0) @@ -4178,7 +4178,7 @@ glabel func0f0af158 /* f0af9bc: 8fb10200 */ lw $s1,0x200($sp) /* f0af9c0: 262c0008 */ addiu $t4,$s1,0x8 /* f0af9c4: afac0200 */ sw $t4,0x200($sp) -/* f0af9c8: 0c012d20 */ jal func0004b480 +/* f0af9c8: 0c012d20 */ jal osVirtualToPhysical /* f0af9cc: ae2d0000 */ sw $t5,0x0($s1) /* f0af9d0: ae220004 */ sw $v0,0x4($s1) /* f0af9d4: 8fae0200 */ lw $t6,0x200($sp) @@ -4383,7 +4383,7 @@ glabel func0f0afa4c /* f0afcdc: 26390008 */ addiu $t9,$s1,0x8 /* f0afce0: afb901e8 */ sw $t9,0x1e8($sp) /* f0afce4: 02002025 */ or $a0,$s0,$zero -/* f0afce8: 0c012d20 */ jal func0004b480 +/* f0afce8: 0c012d20 */ jal osVirtualToPhysical /* f0afcec: ae280000 */ sw $t0,0x0($s1) /* f0afcf0: 3c0143c8 */ lui $at,0x43c8 /* f0afcf4: 4481d000 */ mtc1 $at,$f26 @@ -4493,7 +4493,7 @@ glabel func0f0afa4c /* f0afe88: 262d0008 */ addiu $t5,$s1,0x8 /* f0afe8c: afad01e8 */ sw $t5,0x1e8($sp) /* f0afe90: 00402025 */ or $a0,$v0,$zero -/* f0afe94: 0c012d20 */ jal func0004b480 +/* f0afe94: 0c012d20 */ jal osVirtualToPhysical /* f0afe98: ae2e0000 */ sw $t6,0x0($s1) /* f0afe9c: ae220004 */ sw $v0,0x4($s1) /* f0afea0: 0fc59e59 */ jal func0f167964 @@ -4702,7 +4702,7 @@ glabel func0f0afa4c /* f0b01cc: 8fb101e8 */ lw $s1,0x1e8($sp) /* f0b01d0: 262c0008 */ addiu $t4,$s1,0x8 /* f0b01d4: afac01e8 */ sw $t4,0x1e8($sp) -/* f0b01d8: 0c012d20 */ jal func0004b480 +/* f0b01d8: 0c012d20 */ jal osVirtualToPhysical /* f0b01dc: ae2d0000 */ sw $t5,0x0($s1) /* f0b01e0: ae220004 */ sw $v0,0x4($s1) /* f0b01e4: 8fae01e8 */ lw $t6,0x1e8($sp) diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index 2a14510d9..8ef1a5235 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -6274,7 +6274,7 @@ glabel func0f0bbf78 /* f0bbfe0: acee0000 */ sw $t6,0x0($a3) /* f0bbfe4: afa70060 */ sw $a3,0x60($sp) /* f0bbfe8: 8fa40064 */ lw $a0,0x64($sp) -/* f0bbfec: 0c012d20 */ jal func0004b480 +/* f0bbfec: 0c012d20 */ jal osVirtualToPhysical /* f0bbff0: 26100008 */ addiu $s0,$s0,0x8 /* f0bbff4: 8fa70060 */ lw $a3,0x60($sp) /* f0bbff8: 02001825 */ or $v1,$s0,$zero @@ -6330,7 +6330,7 @@ glabel func0f0bbf78 /* f0bc0c0: ac590000 */ sw $t9,0x0($v0) /* f0bc0c4: 0fc2d3fa */ jal func0f0b4fe8 /* f0bc0c8: 24500008 */ addiu $s0,$v0,0x8 -/* f0bc0cc: 0c012d20 */ jal func0004b480 +/* f0bc0cc: 0c012d20 */ jal osVirtualToPhysical /* f0bc0d0: 00402025 */ or $a0,$v0,$zero /* f0bc0d4: 8fa90040 */ lw $t1,0x40($sp) /* f0bc0d8: ad220004 */ sw $v0,0x4($t1) diff --git a/src/game/game_0d4690.c b/src/game/game_0d4690.c index 838f62d1b..2dbba285d 100644 --- a/src/game/game_0d4690.c +++ b/src/game/game_0d4690.c @@ -319,7 +319,7 @@ glabel func0f0d479c /* f0d48ac: 02208025 */ or $s0,$s1,$zero /* f0d48b0: ae190000 */ sw $t9,0x0($s0) /* f0d48b4: 8fa40050 */ lw $a0,0x50($sp) -/* f0d48b8: 0c012d20 */ jal func0004b480 +/* f0d48b8: 0c012d20 */ jal osVirtualToPhysical /* f0d48bc: 26310008 */ addiu $s1,$s1,0x8 /* f0d48c0: 3c080103 */ lui $t0,0x103 /* f0d48c4: ae020004 */ sw $v0,0x4($s0) @@ -328,7 +328,7 @@ glabel func0f0d479c /* f0d48d0: ac680000 */ sw $t0,0x0($v1) /* f0d48d4: afa30048 */ sw $v1,0x48($sp) /* f0d48d8: 8fa40054 */ lw $a0,0x54($sp) -/* f0d48dc: 0c012d20 */ jal func0004b480 +/* f0d48dc: 0c012d20 */ jal osVirtualToPhysical /* f0d48e0: 26310008 */ addiu $s1,$s1,0x8 /* f0d48e4: 8fa30048 */ lw $v1,0x48($sp) /* f0d48e8: 3c108007 */ lui $s0,%hi(var80070f10) @@ -413,7 +413,7 @@ glabel func0f0d49c8 /* f0d4a0c: afa40020 */ sw $a0,0x20($sp) /* f0d4a10: 0fc2d3fa */ jal func0f0b4fe8 /* f0d4a14: 26100008 */ addiu $s0,$s0,0x8 -/* f0d4a18: 0c012d20 */ jal func0004b480 +/* f0d4a18: 0c012d20 */ jal osVirtualToPhysical /* f0d4a1c: 00402025 */ or $a0,$v0,$zero /* f0d4a20: 8fb90020 */ lw $t9,0x20($sp) /* f0d4a24: af220004 */ sw $v0,0x4($t9) @@ -565,7 +565,7 @@ glabel func0f0d4a3c /* f0d4c50: afab00a0 */ sw $t3,0xa0($sp) /* f0d4c54: ad4c0000 */ sw $t4,0x0($t2) /* f0d4c58: 8fa4005c */ lw $a0,0x5c($sp) -/* f0d4c5c: 0c012d20 */ jal func0004b480 +/* f0d4c5c: 0c012d20 */ jal osVirtualToPhysical /* f0d4c60: afaa0028 */ sw $t2,0x28($sp) /* f0d4c64: 8fa30028 */ lw $v1,0x28($sp) /* f0d4c68: ac620004 */ sw $v0,0x4($v1) @@ -604,7 +604,7 @@ glabel func0f0d4c80 /* f0d4cdc: 24420008 */ addiu $v0,$v0,0x8 /* f0d4ce0: afa20060 */ sw $v0,0x60($sp) /* f0d4ce4: afa30018 */ sw $v1,0x18($sp) -/* f0d4ce8: 0c012d20 */ jal func0004b480 +/* f0d4ce8: 0c012d20 */ jal osVirtualToPhysical /* f0d4cec: 8fa4001c */ lw $a0,0x1c($sp) /* f0d4cf0: 8fa30018 */ lw $v1,0x18($sp) /* f0d4cf4: ac620004 */ sw $v0,0x4($v1) @@ -996,7 +996,7 @@ glabel func0f0d4d0c /* f0d5284: ac790000 */ sw $t9,0x0($v1) /* f0d5288: afac0048 */ sw $t4,0x48($sp) /* f0d528c: afa60040 */ sw $a2,0x40($sp) -/* f0d5290: 0c012d20 */ jal func0004b480 +/* f0d5290: 0c012d20 */ jal osVirtualToPhysical /* f0d5294: afa3001c */ sw $v1,0x1c($sp) /* f0d5298: 8fa3001c */ lw $v1,0x1c($sp) /* f0d529c: 8fa50048 */ lw $a1,0x48($sp) @@ -1007,7 +1007,7 @@ glabel func0f0d4d0c /* f0d52b0: acae0000 */ sw $t6,0x0($a1) /* f0d52b4: 24ac0008 */ addiu $t4,$a1,0x8 /* f0d52b8: afac0048 */ sw $t4,0x48($sp) -/* f0d52bc: 0c012d20 */ jal func0004b480 +/* f0d52bc: 0c012d20 */ jal osVirtualToPhysical /* f0d52c0: afa50018 */ sw $a1,0x18($sp) /* f0d52c4: 8fa50018 */ lw $a1,0x18($sp) /* f0d52c8: 8fa30048 */ lw $v1,0x48($sp) diff --git a/src/game/game_0d5a90.c b/src/game/game_0d5a90.c index 01e413975..fba35f5b0 100644 --- a/src/game/game_0d5a90.c +++ b/src/game/game_0d5a90.c @@ -1206,7 +1206,7 @@ glabel func0f0d5d8c /* f0d6c80: 01f8c825 */ or $t9,$t7,$t8 /* f0d6c84: ac590010 */ sw $t9,0x10($v0) /* f0d6c88: 8fa40180 */ lw $a0,0x180($sp) -/* f0d6c8c: 0c012d20 */ jal func0004b480 +/* f0d6c8c: 0c012d20 */ jal osVirtualToPhysical /* f0d6c90: 24510010 */ addiu $s1,$v0,0x10 /* f0d6c94: 8fb20428 */ lw $s2,0x428($sp) /* f0d6c98: 3c0c04d0 */ lui $t4,0x4d0 @@ -1215,7 +1215,7 @@ glabel func0f0d5d8c /* f0d6ca4: ae4c0000 */ sw $t4,0x0($s2) /* f0d6ca8: 26430008 */ addiu $v1,$s2,0x8 /* f0d6cac: afa30428 */ sw $v1,0x428($sp) -/* f0d6cb0: 0c012d20 */ jal func0004b480 +/* f0d6cb0: 0c012d20 */ jal osVirtualToPhysical /* f0d6cb4: 8fa40184 */ lw $a0,0x184($sp) /* f0d6cb8: 8fa30428 */ lw $v1,0x428($sp) /* f0d6cbc: ae420004 */ sw $v0,0x4($s2) @@ -1256,7 +1256,7 @@ glabel func0f0d5d8c /* f0d6d48: 8fa40184 */ lw $a0,0x184($sp) /* f0d6d4c: 26870008 */ addiu $a3,$s4,0x8 /* f0d6d50: afa70428 */ sw $a3,0x428($sp) -/* f0d6d54: 0c012d20 */ jal func0004b480 +/* f0d6d54: 0c012d20 */ jal osVirtualToPhysical /* f0d6d58: 24840090 */ addiu $a0,$a0,%lo(var80070090) /* f0d6d5c: 8fa50428 */ lw $a1,0x428($sp) /* f0d6d60: ae820004 */ sw $v0,0x4($s4) @@ -1308,7 +1308,7 @@ glabel func0f0d5d8c /* f0d6e10: 8fa40180 */ lw $a0,0x180($sp) /* f0d6e14: 24a50008 */ addiu $a1,$a1,0x8 /* f0d6e18: afa50428 */ sw $a1,0x428($sp) -/* f0d6e1c: 0c012d20 */ jal func0004b480 +/* f0d6e1c: 0c012d20 */ jal osVirtualToPhysical /* f0d6e20: 24840060 */ addiu $a0,$a0,0x60 /* f0d6e24: 00147900 */ sll $t7,$s4,0x4 /* f0d6e28: 00106880 */ sll $t5,$s0,0x2 @@ -1325,7 +1325,7 @@ glabel func0f0d5d8c /* f0d6e54: aeae0000 */ sw $t6,0x0($s5) /* f0d6e58: 26a30008 */ addiu $v1,$s5,0x8 /* f0d6e5c: afa30428 */ sw $v1,0x428($sp) -/* f0d6e60: 0c012d20 */ jal func0004b480 +/* f0d6e60: 0c012d20 */ jal osVirtualToPhysical /* f0d6e64: 8fa400a0 */ lw $a0,0xa0($sp) /* f0d6e68: 8fa50428 */ lw $a1,0x428($sp) /* f0d6e6c: aea20004 */ sw $v0,0x4($s5) @@ -1385,7 +1385,7 @@ glabel func0f0d5d8c /* f0d6f3c: 8fa40180 */ lw $a0,0x180($sp) /* f0d6f40: 24a50008 */ addiu $a1,$a1,0x8 /* f0d6f44: afa50428 */ sw $a1,0x428($sp) -/* f0d6f48: 0c012d20 */ jal func0004b480 +/* f0d6f48: 0c012d20 */ jal osVirtualToPhysical /* f0d6f4c: 248400a0 */ addiu $a0,$a0,%lo(var800700a0) /* f0d6f50: 00147900 */ sll $t7,$s4,0x4 /* f0d6f54: 00106080 */ sll $t4,$s0,0x2 @@ -1402,7 +1402,7 @@ glabel func0f0d5d8c /* f0d6f80: ae6e0000 */ sw $t6,0x0($s3) /* f0d6f84: 26630008 */ addiu $v1,$s3,0x8 /* f0d6f88: afa30428 */ sw $v1,0x428($sp) -/* f0d6f8c: 0c012d20 */ jal func0004b480 +/* f0d6f8c: 0c012d20 */ jal osVirtualToPhysical /* f0d6f90: 8fa4009c */ lw $a0,0x9c($sp) /* f0d6f94: 8fa50428 */ lw $a1,0x428($sp) /* f0d6f98: ae620004 */ sw $v0,0x4($s3) diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c index 30b872b3c..39686d811 100644 --- a/src/game/game_0dcdb0.c +++ b/src/game/game_0dcdb0.c @@ -8717,7 +8717,7 @@ glabel func0f0e0998 /* f0e0c4c: ac6a0000 */ sw $t2,0x0($v1) /* f0e0c50: afa3003c */ sw $v1,0x3c($sp) /* f0e0c54: 26100008 */ addiu $s0,$s0,0x8 -/* f0e0c58: 0c012d20 */ jal func0004b480 +/* f0e0c58: 0c012d20 */ jal osVirtualToPhysical /* f0e0c5c: 00e02025 */ or $a0,$a3,$zero /* f0e0c60: 8fa3003c */ lw $v1,0x3c($sp) /* f0e0c64: 3c0b0430 */ lui $t3,0x430 @@ -8727,7 +8727,7 @@ glabel func0f0e0998 /* f0e0c74: acab0000 */ sw $t3,0x0($a1) /* f0e0c78: afa50038 */ sw $a1,0x38($sp) /* f0e0c7c: 8fa40080 */ lw $a0,0x80($sp) -/* f0e0c80: 0c012d20 */ jal func0004b480 +/* f0e0c80: 0c012d20 */ jal osVirtualToPhysical /* f0e0c84: 26100008 */ addiu $s0,$s0,0x8 /* f0e0c88: 8fa50038 */ lw $a1,0x38($sp) /* f0e0c8c: 3c0cb100 */ lui $t4,0xb100 @@ -9329,7 +9329,7 @@ glabel func0f0e0dac /* f0e157c: 8fb00118 */ lw $s0,0x118($sp) /* f0e1580: 260c0008 */ addiu $t4,$s0,0x8 /* f0e1584: afac0118 */ sw $t4,0x118($sp) -/* f0e1588: 0c012d20 */ jal func0004b480 +/* f0e1588: 0c012d20 */ jal osVirtualToPhysical /* f0e158c: ae0d0000 */ sw $t5,0x0($s0) /* f0e1590: ae020004 */ sw $v0,0x4($s0) /* f0e1594: 8fb10118 */ lw $s1,0x118($sp) @@ -9338,7 +9338,7 @@ glabel func0f0e0dac /* f0e15a0: 262f0008 */ addiu $t7,$s1,0x8 /* f0e15a4: afaf0118 */ sw $t7,0x118($sp) /* f0e15a8: 02e02025 */ or $a0,$s7,$zero -/* f0e15ac: 0c012d20 */ jal func0004b480 +/* f0e15ac: 0c012d20 */ jal osVirtualToPhysical /* f0e15b0: ae380000 */ sw $t8,0x0($s1) /* f0e15b4: 3c013f00 */ lui $at,0x3f00 /* f0e15b8: 44812000 */ mtc1 $at,$f4 @@ -9550,7 +9550,7 @@ glabel func0f0e1668 /* f0e18d0: afb80078 */ sw $t8,0x78($sp) /* f0e18d4: adf90000 */ sw $t9,0x0($t7) /* f0e18d8: 02202025 */ or $a0,$s1,$zero -/* f0e18dc: 0c012d20 */ jal func0004b480 +/* f0e18dc: 0c012d20 */ jal osVirtualToPhysical /* f0e18e0: afaf0048 */ sw $t7,0x48($sp) /* f0e18e4: 8fa50048 */ lw $a1,0x48($sp) /* f0e18e8: 3c180450 */ lui $t8,0x450 @@ -9560,7 +9560,7 @@ glabel func0f0e1668 /* f0e18f8: 02002025 */ or $a0,$s0,$zero /* f0e18fc: 262f0008 */ addiu $t7,$s1,0x8 /* f0e1900: afaf0078 */ sw $t7,0x78($sp) -/* f0e1904: 0c012d20 */ jal func0004b480 +/* f0e1904: 0c012d20 */ jal osVirtualToPhysical /* f0e1908: ae380000 */ sw $t8,0x0($s1) /* f0e190c: ae220004 */ sw $v0,0x4($s1) /* f0e1910: 8fb90078 */ lw $t9,0x78($sp) @@ -9749,7 +9749,7 @@ glabel func0f0e194c /* f0e1bd8: afac0068 */ sw $t4,0x68($sp) /* f0e1bdc: af2d0000 */ sw $t5,0x0($t9) /* f0e1be0: 02202025 */ or $a0,$s1,$zero -/* f0e1be4: 0c012d20 */ jal func0004b480 +/* f0e1be4: 0c012d20 */ jal osVirtualToPhysical /* f0e1be8: afb90038 */ sw $t9,0x38($sp) /* f0e1bec: 8fa70038 */ lw $a3,0x38($sp) /* f0e1bf0: 3c180480 */ lui $t8,0x480 @@ -9759,7 +9759,7 @@ glabel func0f0e194c /* f0e1c00: 02002025 */ or $a0,$s0,$zero /* f0e1c04: 262f0008 */ addiu $t7,$s1,0x8 /* f0e1c08: afaf0068 */ sw $t7,0x68($sp) -/* f0e1c0c: 0c012d20 */ jal func0004b480 +/* f0e1c0c: 0c012d20 */ jal osVirtualToPhysical /* f0e1c10: ae380000 */ sw $t8,0x0($s1) /* f0e1c14: ae220004 */ sw $v0,0x4($s1) /* f0e1c18: 8fb90068 */ lw $t9,0x68($sp) @@ -9967,7 +9967,7 @@ glabel func0f0e1ce8 /* f0e1f28: 25ae0008 */ addiu $t6,$t5,0x8 /* f0e1f2c: afae0060 */ sw $t6,0x60($sp) /* f0e1f30: adaf0000 */ sw $t7,0x0($t5) -/* f0e1f34: 0c012d20 */ jal func0004b480 +/* f0e1f34: 0c012d20 */ jal osVirtualToPhysical /* f0e1f38: afad0034 */ sw $t5,0x34($sp) /* f0e1f3c: 8fa30034 */ lw $v1,0x34($sp) /* f0e1f40: 3c0d0450 */ lui $t5,0x450 @@ -9978,7 +9978,7 @@ glabel func0f0e1ce8 /* f0e1f54: 27190008 */ addiu $t9,$t8,0x8 /* f0e1f58: afb90060 */ sw $t9,0x60($sp) /* f0e1f5c: af0d0000 */ sw $t5,0x0($t8) -/* f0e1f60: 0c012d20 */ jal func0004b480 +/* f0e1f60: 0c012d20 */ jal osVirtualToPhysical /* f0e1f64: afb80030 */ sw $t8,0x30($sp) /* f0e1f68: 8fa50030 */ lw $a1,0x30($sp) /* f0e1f6c: 3c18b100 */ lui $t8,0xb100 @@ -10149,7 +10149,7 @@ glabel func0f0e1fac /* f0e21f0: 25ae0008 */ addiu $t6,$t5,0x8 /* f0e21f4: afae0060 */ sw $t6,0x60($sp) /* f0e21f8: adaf0000 */ sw $t7,0x0($t5) -/* f0e21fc: 0c012d20 */ jal func0004b480 +/* f0e21fc: 0c012d20 */ jal osVirtualToPhysical /* f0e2200: afad0034 */ sw $t5,0x34($sp) /* f0e2204: 8fa30034 */ lw $v1,0x34($sp) /* f0e2208: 3c0b0450 */ lui $t3,0x450 @@ -10159,7 +10159,7 @@ glabel func0f0e1fac /* f0e2218: 02002025 */ or $a0,$s0,$zero /* f0e221c: 26390008 */ addiu $t9,$s1,0x8 /* f0e2220: afb90060 */ sw $t9,0x60($sp) -/* f0e2224: 0c012d20 */ jal func0004b480 +/* f0e2224: 0c012d20 */ jal osVirtualToPhysical /* f0e2228: ae2b0000 */ sw $t3,0x0($s1) /* f0e222c: ae220004 */ sw $v0,0x4($s1) /* f0e2230: 8fac0060 */ lw $t4,0x60($sp) @@ -10454,7 +10454,7 @@ glabel func0f0e258c /* f0e267c: 26100008 */ addiu $s0,$s0,0x8 /* f0e2680: ac8b0004 */ sw $t3,0x4($a0) /* f0e2684: ac6c0000 */ sw $t4,0x0($v1) -/* f0e2688: 0c012d20 */ jal func0004b480 +/* f0e2688: 0c012d20 */ jal osVirtualToPhysical /* f0e268c: afa30024 */ sw $v1,0x24($sp) /* f0e2690: 8fa30024 */ lw $v1,0x24($sp) /* f0e2694: 3c0d0430 */ lui $t5,0x430 @@ -10464,7 +10464,7 @@ glabel func0f0e258c /* f0e26a4: acad0000 */ sw $t5,0x0($a1) /* f0e26a8: afa50020 */ sw $a1,0x20($sp) /* f0e26ac: 8fa4002c */ lw $a0,0x2c($sp) -/* f0e26b0: 0c012d20 */ jal func0004b480 +/* f0e26b0: 0c012d20 */ jal osVirtualToPhysical /* f0e26b4: 26100008 */ addiu $s0,$s0,0x8 /* f0e26b8: 8fa50020 */ lw $a1,0x20($sp) /* f0e26bc: 02001825 */ or $v1,$s0,$zero @@ -11302,7 +11302,7 @@ glabel func0f0e2fe4 /* f0e32a8: 25f80008 */ addiu $t8,$t7,0x8 /* f0e32ac: afb80060 */ sw $t8,0x60($sp) /* f0e32b0: adf90000 */ sw $t9,0x0($t7) -/* f0e32b4: 0c012d20 */ jal func0004b480 +/* f0e32b4: 0c012d20 */ jal osVirtualToPhysical /* f0e32b8: afaf0034 */ sw $t7,0x34($sp) /* f0e32bc: 8fa30034 */ lw $v1,0x34($sp) /* f0e32c0: 3c0f0420 */ lui $t7,0x420 @@ -11313,7 +11313,7 @@ glabel func0f0e2fe4 /* f0e32d4: 25ae0008 */ addiu $t6,$t5,0x8 /* f0e32d8: afae0060 */ sw $t6,0x60($sp) /* f0e32dc: adaf0000 */ sw $t7,0x0($t5) -/* f0e32e0: 0c012d20 */ jal func0004b480 +/* f0e32e0: 0c012d20 */ jal osVirtualToPhysical /* f0e32e4: afad0030 */ sw $t5,0x30($sp) /* f0e32e8: 8fa50030 */ lw $a1,0x30($sp) /* f0e32ec: 3c0db100 */ lui $t5,0xb100 @@ -11607,7 +11607,7 @@ glabel func0f0e3324 /* f0e3734: 25f80008 */ addiu $t8,$t7,0x8 /* f0e3738: afb80068 */ sw $t8,0x68($sp) /* f0e373c: adf90000 */ sw $t9,0x0($t7) -/* f0e3740: 0c012d20 */ jal func0004b480 +/* f0e3740: 0c012d20 */ jal osVirtualToPhysical /* f0e3744: afaf0038 */ sw $t7,0x38($sp) /* f0e3748: 8fa30038 */ lw $v1,0x38($sp) /* f0e374c: 3c0f0430 */ lui $t7,0x430 @@ -11618,7 +11618,7 @@ glabel func0f0e3324 /* f0e3760: 25ae0008 */ addiu $t6,$t5,0x8 /* f0e3764: afae0068 */ sw $t6,0x68($sp) /* f0e3768: adaf0000 */ sw $t7,0x0($t5) -/* f0e376c: 0c012d20 */ jal func0004b480 +/* f0e376c: 0c012d20 */ jal osVirtualToPhysical /* f0e3770: afad0034 */ sw $t5,0x34($sp) /* f0e3774: 8fa50034 */ lw $a1,0x34($sp) /* f0e3778: 3c0db100 */ lui $t5,0xb100 @@ -13709,7 +13709,7 @@ glabel func0f0e5000 /* f0e56d0: 260e0008 */ addiu $t6,$s0,0x8 /* f0e56d4: afae0150 */ sw $t6,0x150($sp) /* f0e56d8: 02402025 */ or $a0,$s2,$zero -/* f0e56dc: 0c012d20 */ jal func0004b480 +/* f0e56dc: 0c012d20 */ jal osVirtualToPhysical /* f0e56e0: ae0f0000 */ sw $t7,0x0($s0) /* f0e56e4: ae020004 */ sw $v0,0x4($s0) /* f0e56e8: 0fc59e73 */ jal func0f1679cc @@ -13889,7 +13889,7 @@ glabel func0f0e5000 /* f0e5958: 266e0008 */ addiu $t6,$s3,0x8 /* f0e595c: afae0150 */ sw $t6,0x150($sp) /* f0e5960: 02002025 */ or $a0,$s0,$zero -/* f0e5964: 0c012d20 */ jal func0004b480 +/* f0e5964: 0c012d20 */ jal osVirtualToPhysical /* f0e5968: ae6f0000 */ sw $t7,0x0($s3) /* f0e596c: ae620004 */ sw $v0,0x4($s3) /* f0e5970: 3c017f1b */ lui $at,%hi(var7f1adf84) @@ -14081,7 +14081,7 @@ glabel func0f0e5000 /* f0e5c4c: 27190008 */ addiu $t9,$t8,0x8 /* f0e5c50: afb90150 */ sw $t9,0x150($sp) /* f0e5c54: af090000 */ sw $t1,0x0($t8) -/* f0e5c58: 0c012d20 */ jal func0004b480 +/* f0e5c58: 0c012d20 */ jal osVirtualToPhysical /* f0e5c5c: afb80080 */ sw $t8,0x80($sp) /* f0e5c60: 8fa60080 */ lw $a2,0x80($sp) /* f0e5c64: 3c0db100 */ lui $t5,0xb100 diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 0d90130d5..743df0509 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -4861,7 +4861,7 @@ glabel func0f0f38b0 /* f0f4770: ac4f0000 */ sw $t7,0x0($v0) /* f0f4774: 0fc2d3fa */ jal func0f0b4fe8 /* f0f4778: 00408825 */ or $s1,$v0,$zero -/* f0f477c: 0c012d20 */ jal func0004b480 +/* f0f477c: 0c012d20 */ jal osVirtualToPhysical /* f0f4780: 00402025 */ or $a0,$v0,$zero /* f0f4784: 1000005f */ beqz $zero,.L0f0f4904 /* f0f4788: ae220004 */ sw $v0,0x4($s1) @@ -13402,7 +13402,7 @@ glabel func0f0fbc30 /* f0fc1ac: ae0b0000 */ sw $t3,0x0($s0) /* f0fc1b0: 0fc2d3fa */ jal func0f0b4fe8 /* f0fc1b4: 26b50008 */ addiu $s5,$s5,0x8 -/* f0fc1b8: 0c012d20 */ jal func0004b480 +/* f0fc1b8: 0c012d20 */ jal osVirtualToPhysical /* f0fc1bc: 00402025 */ or $a0,$v0,$zero /* f0fc1c0: 02a01825 */ or $v1,$s5,$zero /* f0fc1c4: ae020004 */ sw $v0,0x4($s0) diff --git a/src/game/game_0fd660.c b/src/game/game_0fd660.c index d15653fbd..ad493190c 100644 --- a/src/game/game_0fd660.c +++ b/src/game/game_0fd660.c @@ -3359,7 +3359,7 @@ glabel func0f100ad0 /* f100f84: 262e0008 */ addiu $t6,$s1,0x8 /* f100f88: afae01d8 */ sw $t6,0x1d8($sp) /* f100f8c: 02a02025 */ or $a0,$s5,$zero -/* f100f90: 0c012d20 */ jal func0004b480 +/* f100f90: 0c012d20 */ jal osVirtualToPhysical /* f100f94: ae2f0000 */ sw $t7,0x0($s1) /* f100f98: ae220004 */ sw $v0,0x4($s1) /* f100f9c: 8fb201d8 */ lw $s2,0x1d8($sp) @@ -3368,7 +3368,7 @@ glabel func0f100ad0 /* f100fa8: 26590008 */ addiu $t9,$s2,0x8 /* f100fac: afb901d8 */ sw $t9,0x1d8($sp) /* f100fb0: 02002025 */ or $a0,$s0,$zero -/* f100fb4: 0c012d20 */ jal func0004b480 +/* f100fb4: 0c012d20 */ jal osVirtualToPhysical /* f100fb8: ae4e0000 */ sw $t6,0x0($s2) /* f100fbc: ae420004 */ sw $v0,0x4($s2) /* f100fc0: 8faf01d8 */ lw $t7,0x1d8($sp) diff --git a/src/game/game_129900.c b/src/game/game_129900.c index b68b6eaf3..a055b3e14 100644 --- a/src/game/game_129900.c +++ b/src/game/game_129900.c @@ -4053,7 +4053,7 @@ glabel func0f12c654 /* f12c77c: ae2f0000 */ sw $t7,0x0($s1) /* f12c780: 0fc2d402 */ jal func0f0b5008 /* f12c784: 26b50008 */ addiu $s5,$s5,0x8 -/* f12c788: 0c012d20 */ jal func0004b480 +/* f12c788: 0c012d20 */ jal osVirtualToPhysical /* f12c78c: 00402025 */ or $a0,$v0,$zero /* f12c790: ae220004 */ sw $v0,0x4($s1) /* f12c794: 02a02025 */ or $a0,$s5,$zero @@ -4316,7 +4316,7 @@ glabel func0f12c654 /* f12cb48: 02a08025 */ or $s0,$s5,$zero /* f12cb4c: ae0b0000 */ sw $t3,0x0($s0) /* f12cb50: 26b50008 */ addiu $s5,$s5,0x8 -/* f12cb54: 0c012d20 */ jal func0004b480 +/* f12cb54: 0c012d20 */ jal osVirtualToPhysical /* f12cb58: 02202025 */ or $a0,$s1,$zero /* f12cb5c: 3c138008 */ lui $s3,%hi(g_ExplosionTypes) /* f12cb60: ae020004 */ sw $v0,0x4($s0) @@ -4413,7 +4413,7 @@ glabel func0f12c654 /* f12ccc0: ae4f0000 */ sw $t7,0x0($s2) /* f12ccc4: 0fc2d3fa */ jal func0f0b4fe8 /* f12ccc8: 26b50008 */ addiu $s5,$s5,0x8 -/* f12cccc: 0c012d20 */ jal func0004b480 +/* f12cccc: 0c012d20 */ jal osVirtualToPhysical /* f12ccd0: 00402025 */ or $a0,$v0,$zero /* f12ccd4: ae420004 */ sw $v0,0x4($s2) /* f12ccd8: 82d803cc */ lb $t8,0x3cc($s6) @@ -4876,7 +4876,7 @@ glabel func0f12cd64 /* f12d38c: acb80000 */ sw $t8,0x0($a1) /* f12d390: 24420008 */ addiu $v0,$v0,0x8 /* f12d394: afa200d8 */ sw $v0,0xd8($sp) -/* f12d398: 0c012d20 */ jal func0004b480 +/* f12d398: 0c012d20 */ jal osVirtualToPhysical /* f12d39c: afa50054 */ sw $a1,0x54($sp) /* f12d3a0: 8fa300d8 */ lw $v1,0xd8($sp) /* f12d3a4: 8fa50054 */ lw $a1,0x54($sp) diff --git a/src/game/game_12d3f0.c b/src/game/game_12d3f0.c index b20c56ead..4a96f8d76 100644 --- a/src/game/game_12d3f0.c +++ b/src/game/game_12d3f0.c @@ -925,7 +925,7 @@ glabel func0f12d3f0 /* f12e150: a4aa0028 */ sh $t2,0x28($a1) /* f12e154: ac6b0000 */ sw $t3,0x0($v1) /* f12e158: afa500b4 */ sw $a1,0xb4($sp) -/* f12e15c: 0c012d20 */ jal func0004b480 +/* f12e15c: 0c012d20 */ jal osVirtualToPhysical /* f12e160: afa30028 */ sw $v1,0x28($sp) /* f12e164: 8fa30028 */ lw $v1,0x28($sp) /* f12e168: 8fa400b4 */ lw $a0,0xb4($sp) @@ -935,7 +935,7 @@ glabel func0f12d3f0 /* f12e178: ac620004 */ sw $v0,0x4($v1) /* f12e17c: accc0000 */ sw $t4,0x0($a2) /* f12e180: afa60024 */ sw $a2,0x24($sp) -/* f12e184: 0c012d20 */ jal func0004b480 +/* f12e184: 0c012d20 */ jal osVirtualToPhysical /* f12e188: 26310008 */ addiu $s1,$s1,0x8 /* f12e18c: 8fa60024 */ lw $a2,0x24($sp) /* f12e190: 3c0db100 */ lui $t5,0xb100 @@ -2253,7 +2253,7 @@ glabel func0f12f230 /* f12f410: afa3005c */ sw $v1,0x5c($sp) /* f12f414: 0fc2d402 */ jal func0f0b5008 /* f12f418: 26310008 */ addiu $s1,$s1,0x8 -/* f12f41c: 0c012d20 */ jal func0004b480 +/* f12f41c: 0c012d20 */ jal osVirtualToPhysical /* f12f420: 00402025 */ or $a0,$v0,$zero /* f12f424: 8fb8005c */ lw $t8,0x5c($sp) /* f12f428: 02202025 */ or $a0,$s1,$zero @@ -2271,7 +2271,7 @@ glabel func0f12f230 /* f12f458: 24843448 */ addiu $a0,$a0,%lo(var800a3448) /* f12f45c: ac480000 */ sw $t0,0x0($v0) /* f12f460: 00408025 */ or $s0,$v0,$zero -/* f12f464: 0c012d20 */ jal func0004b480 +/* f12f464: 0c012d20 */ jal osVirtualToPhysical /* f12f468: 24510008 */ addiu $s1,$v0,0x8 /* f12f46c: 10000008 */ beqz $zero,.L0f12f490 /* f12f470: ae020004 */ sw $v0,0x4($s0) @@ -2280,7 +2280,7 @@ glabel func0f12f230 /* f12f478: 35290040 */ ori $t1,$t1,0x40 /* f12f47c: 3c04800a */ lui $a0,%hi(var800a3488) /* f12f480: 24843488 */ addiu $a0,$a0,%lo(var800a3488) -/* f12f484: 0c012d20 */ jal func0004b480 +/* f12f484: 0c012d20 */ jal osVirtualToPhysical /* f12f488: ae090000 */ sw $t1,0x0($s0) /* f12f48c: ae020004 */ sw $v0,0x4($s0) .L0f12f490: @@ -2366,7 +2366,7 @@ glabel func0f12f230 /* f12f5c0: ae190000 */ sw $t9,0x0($s0) /* f12f5c4: 0fc2d3fa */ jal func0f0b4fe8 /* f12f5c8: 26310008 */ addiu $s1,$s1,0x8 -/* f12f5cc: 0c012d20 */ jal func0004b480 +/* f12f5cc: 0c012d20 */ jal osVirtualToPhysical /* f12f5d0: 00402025 */ or $a0,$v0,$zero /* f12f5d4: ae020004 */ sw $v0,0x4($s0) .L0f12f5d8: diff --git a/src/game/game_12f6c0.c b/src/game/game_12f6c0.c index e709d1583..a1b41624d 100644 --- a/src/game/game_12f6c0.c +++ b/src/game/game_12f6c0.c @@ -1361,7 +1361,7 @@ glabel func0f130044 /* f1309f0: 02202025 */ or $a0,$s1,$zero /* f1309f4: 26090008 */ addiu $t1,$s0,0x8 /* f1309f8: afa90170 */ sw $t1,0x170($sp) -/* f1309fc: 0c012d20 */ jal func0004b480 +/* f1309fc: 0c012d20 */ jal osVirtualToPhysical /* f130a00: ae0a0000 */ sw $t2,0x0($s0) /* f130a04: ae020004 */ sw $v0,0x4($s0) /* f130a08: 3c017f1b */ lui $at,%hi(var7f1b5610) @@ -1400,7 +1400,7 @@ glabel func0f130044 /* f130a8c: 260c0008 */ addiu $t4,$s0,0x8 /* f130a90: afac0170 */ sw $t4,0x170($sp) /* f130a94: 02202025 */ or $a0,$s1,$zero -/* f130a98: 0c012d20 */ jal func0004b480 +/* f130a98: 0c012d20 */ jal osVirtualToPhysical /* f130a9c: ae0d0000 */ sw $t5,0x0($s0) /* f130aa0: ae020004 */ sw $v0,0x4($s0) /* f130aa4: 8e780004 */ lw $t8,0x4($s3) @@ -1739,7 +1739,7 @@ glabel func0f130044 /* f130f98: 35ad0024 */ ori $t5,$t5,0x24 /* f130f9c: 262f0008 */ addiu $t7,$s1,0x8 /* f130fa0: afaf0170 */ sw $t7,0x170($sp) -/* f130fa4: 0c012d20 */ jal func0004b480 +/* f130fa4: 0c012d20 */ jal osVirtualToPhysical /* f130fa8: ae2d0000 */ sw $t5,0x0($s1) /* f130fac: ae220004 */ sw $v0,0x4($s1) /* f130fb0: 8fa80170 */ lw $t0,0x170($sp) diff --git a/src/game/game_131060.c b/src/game/game_131060.c index f6fba9508..e81aa1214 100644 --- a/src/game/game_131060.c +++ b/src/game/game_131060.c @@ -2294,7 +2294,7 @@ glabel func0f132e28 /* f1330c4: 260c0008 */ addiu $t4,$s0,0x8 /* f1330c8: afac0de8 */ sw $t4,0xde8($sp) /* f1330cc: 02202025 */ or $a0,$s1,$zero -/* f1330d0: 0c012d20 */ jal func0004b480 +/* f1330d0: 0c012d20 */ jal osVirtualToPhysical /* f1330d4: ae0d0000 */ sw $t5,0x0($s0) /* f1330d8: ae020004 */ sw $v0,0x4($s0) /* f1330dc: 8e630284 */ lw $v1,0x284($s3) @@ -3108,7 +3108,7 @@ glabel func0f132e28 /* f133c74: 8fb00de8 */ lw $s0,0xde8($sp) /* f133c78: 260e0008 */ addiu $t6,$s0,0x8 /* f133c7c: afae0de8 */ sw $t6,0xde8($sp) -/* f133c80: 0c012d20 */ jal func0004b480 +/* f133c80: 0c012d20 */ jal osVirtualToPhysical /* f133c84: ae0b0000 */ sw $t3,0x0($s0) /* f133c88: 0c012144 */ jal func00048510 /* f133c8c: ae020004 */ sw $v0,0x4($s0) @@ -3683,7 +3683,7 @@ glabel func0f132e28 /* f134524: afb90de8 */ sw $t9,0xde8($sp) /* f134528: ae0d0000 */ sw $t5,0x0($s0) /* f13452c: afa00194 */ sw $zero,0x194($sp) -/* f134530: 0c012d20 */ jal func0004b480 +/* f134530: 0c012d20 */ jal osVirtualToPhysical /* f134534: 8fa40210 */ lw $a0,0x210($sp) /* f134538: ae020004 */ sw $v0,0x4($s0) /* f13453c: 8fab0de8 */ lw $t3,0xde8($sp) @@ -3728,7 +3728,7 @@ glabel func0f132e28 /* f1345c8: afaf0de8 */ sw $t7,0xde8($sp) /* f1345cc: 35ce0090 */ ori $t6,$t6,0x90 /* f1345d0: ae0e0000 */ sw $t6,0x0($s0) -/* f1345d4: 0c012d20 */ jal func0004b480 +/* f1345d4: 0c012d20 */ jal osVirtualToPhysical /* f1345d8: 8fa40210 */ lw $a0,0x210($sp) /* f1345dc: ae020004 */ sw $v0,0x4($s0) /* f1345e0: 8fac0194 */ lw $t4,0x194($sp) @@ -3928,7 +3928,7 @@ glabel func0f1346b0 /* f1348cc: 26180008 */ addiu $t8,$s0,0x8 /* f1348d0: afb81398 */ sw $t8,0x1398($sp) /* f1348d4: 02202025 */ or $a0,$s1,$zero -/* f1348d8: 0c012d20 */ jal func0004b480 +/* f1348d8: 0c012d20 */ jal osVirtualToPhysical /* f1348dc: ae190000 */ sw $t9,0x0($s0) /* f1348e0: 3c05800a */ lui $a1,%hi(g_Vars) /* f1348e4: 24a59fc0 */ addiu $a1,$a1,%lo(g_Vars) @@ -4547,7 +4547,7 @@ glabel func0f1346b0 /* f1351c4: 262e0008 */ addiu $t6,$s1,0x8 /* f1351c8: afae1398 */ sw $t6,0x1398($sp) /* f1351cc: 02002025 */ or $a0,$s0,$zero -/* f1351d0: 0c012d20 */ jal func0004b480 +/* f1351d0: 0c012d20 */ jal osVirtualToPhysical /* f1351d4: ae380000 */ sw $t8,0x0($s1) /* f1351d8: 27b301cc */ addiu $s3,$sp,0x1cc /* f1351dc: 4480c000 */ mtc1 $zero,$f24 @@ -5167,7 +5167,7 @@ glabel func0f1346b0 /* f135ae8: 37180060 */ ori $t8,$t8,0x60 /* f135aec: ae380000 */ sw $t8,0x0($s1) /* f135af0: afa00198 */ sw $zero,0x198($sp) -/* f135af4: 0c012d20 */ jal func0004b480 +/* f135af4: 0c012d20 */ jal osVirtualToPhysical /* f135af8: 8fa40214 */ lw $a0,0x214($sp) /* f135afc: ae220004 */ sw $v0,0x4($s1) /* f135b00: 8fae1398 */ lw $t6,0x1398($sp) @@ -5197,7 +5197,7 @@ glabel func0f1346b0 /* f135b54: afb81398 */ sw $t8,0x1398($sp) /* f135b58: 35ce0060 */ ori $t6,$t6,0x60 /* f135b5c: ae0e0000 */ sw $t6,0x0($s0) -/* f135b60: 0c012d20 */ jal func0004b480 +/* f135b60: 0c012d20 */ jal osVirtualToPhysical /* f135b64: 8fa40214 */ lw $a0,0x214($sp) /* f135b68: ae020004 */ sw $v0,0x4($s0) /* f135b6c: 8faf1398 */ lw $t7,0x1398($sp) @@ -7592,7 +7592,7 @@ glabel func0f137b4c /* f137e08: 26190008 */ addiu $t9,$s0,0x8 /* f137e0c: afb90080 */ sw $t9,0x80($sp) /* f137e10: ae0b0000 */ sw $t3,0x0($s0) -/* f137e14: 0c012d20 */ jal func0004b480 +/* f137e14: 0c012d20 */ jal osVirtualToPhysical /* f137e18: 8fa40078 */ lw $a0,0x78($sp) /* f137e1c: ae020004 */ sw $v0,0x4($s0) /* f137e20: 8fac0080 */ lw $t4,0x80($sp) @@ -7602,7 +7602,7 @@ glabel func0f137b4c /* f137e30: afad0080 */ sw $t5,0x80($sp) /* f137e34: ad8e0000 */ sw $t6,0x0($t4) /* f137e38: 8fa4007c */ lw $a0,0x7c($sp) -/* f137e3c: 0c012d20 */ jal func0004b480 +/* f137e3c: 0c012d20 */ jal osVirtualToPhysical /* f137e40: afac0044 */ sw $t4,0x44($sp) /* f137e44: 8fa50044 */ lw $a1,0x44($sp) /* f137e48: 3c19b100 */ lui $t9,0xb100 @@ -8184,7 +8184,7 @@ glabel func0f1384b4 /* f13869c: ac890000 */ sw $t1,0x0($a0) /* f1386a0: ac890004 */ sw $t1,0x4($a0) /* f1386a4: ac6e0000 */ sw $t6,0x0($v1) -/* f1386a8: 0c012d20 */ jal func0004b480 +/* f1386a8: 0c012d20 */ jal osVirtualToPhysical /* f1386ac: afa30024 */ sw $v1,0x24($sp) /* f1386b0: 8fa30024 */ lw $v1,0x24($sp) /* f1386b4: 3c0f0430 */ lui $t7,0x430 @@ -8194,7 +8194,7 @@ glabel func0f1384b4 /* f1386c4: acaf0000 */ sw $t7,0x0($a1) /* f1386c8: afa50020 */ sw $a1,0x20($sp) /* f1386cc: 8fa4002c */ lw $a0,0x2c($sp) -/* f1386d0: 0c012d20 */ jal func0004b480 +/* f1386d0: 0c012d20 */ jal osVirtualToPhysical /* f1386d4: 26100008 */ addiu $s0,$s0,0x8 /* f1386d8: 8fa50020 */ lw $a1,0x20($sp) /* f1386dc: 02001825 */ or $v1,$s0,$zero @@ -9143,7 +9143,7 @@ glabel func0f139290 /* f139494: 260c0008 */ addiu $t4,$s0,0x8 /* f139498: afac0118 */ sw $t4,0x118($sp) /* f13949c: 03c02025 */ or $a0,$s8,$zero -/* f1394a0: 0c012d20 */ jal func0004b480 +/* f1394a0: 0c012d20 */ jal osVirtualToPhysical /* f1394a4: ae0d0000 */ sw $t5,0x0($s0) /* f1394a8: 3c013f80 */ lui $at,0x3f80 /* f1394ac: 3c1e800b */ lui $s8,%hi(var800ab5a8) @@ -9443,7 +9443,7 @@ glabel func0f139290 /* f13992c: 8fb00118 */ lw $s0,0x118($sp) /* f139930: 26090008 */ addiu $t1,$s0,0x8 /* f139934: afa90118 */ sw $t1,0x118($sp) -/* f139938: 0c012d20 */ jal func0004b480 +/* f139938: 0c012d20 */ jal osVirtualToPhysical /* f13993c: ae0a0000 */ sw $t2,0x0($s0) /* f139940: ae020004 */ sw $v0,0x4($s0) /* f139944: 8fab0118 */ lw $t3,0x118($sp) @@ -11225,7 +11225,7 @@ glabel func0f13b064 /* f13b2c4: afa20040 */ sw $v0,0x40($sp) /* f13b2c8: ac4e0000 */ sw $t6,0x0($v0) /* f13b2cc: 8fa40064 */ lw $a0,0x64($sp) -/* f13b2d0: 0c012d20 */ jal func0004b480 +/* f13b2d0: 0c012d20 */ jal osVirtualToPhysical /* f13b2d4: 24500008 */ addiu $s0,$v0,0x8 /* f13b2d8: 8faf0040 */ lw $t7,0x40($sp) /* f13b2dc: 02002025 */ or $a0,$s0,$zero @@ -11247,7 +11247,7 @@ glabel func0f13b064 /* f13b318: ac780000 */ sw $t8,0x0($v1) /* f13b31c: afa3003c */ sw $v1,0x3c($sp) /* f13b320: 8fa40064 */ lw $a0,0x64($sp) -/* f13b324: 0c012d20 */ jal func0004b480 +/* f13b324: 0c012d20 */ jal osVirtualToPhysical /* f13b328: 26100008 */ addiu $s0,$s0,0x8 /* f13b32c: 8fa3003c */ lw $v1,0x3c($sp) /* f13b330: 3c01c47a */ lui $at,0xc47a diff --git a/src/game/game_13e0e0.c b/src/game/game_13e0e0.c index 1dabbd99b..acaa2ffb6 100644 --- a/src/game/game_13e0e0.c +++ b/src/game/game_13e0e0.c @@ -2980,7 +2980,7 @@ glabel func0f1408a8 /* f140a88: 8fb10054 */ lw $s1,0x54($sp) /* f140a8c: 26290008 */ addiu $t1,$s1,0x8 /* f140a90: afa90054 */ sw $t1,0x54($sp) -/* f140a94: 0c012d20 */ jal func0004b480 +/* f140a94: 0c012d20 */ jal osVirtualToPhysical /* f140a98: ae2a0000 */ sw $t2,0x0($s1) /* f140a9c: ae220004 */ sw $v0,0x4($s1) /* f140aa0: 8e0b0064 */ lw $t3,0x64($s0) @@ -2997,7 +2997,7 @@ glabel func0f1408a8 /* f140acc: ad8e0004 */ sw $t6,0x4($t4) .L0f140ad0: /* f140ad0: afb80054 */ sw $t8,0x54($sp) -/* f140ad4: 0c012d20 */ jal func0004b480 +/* f140ad4: 0c012d20 */ jal osVirtualToPhysical /* f140ad8: ae340000 */ sw $s4,0x0($s1) /* f140adc: ae220004 */ sw $v0,0x4($s1) .L0f140ae0: @@ -3161,7 +3161,7 @@ glabel func0f140b7c /* f140d2c: 8fb10054 */ lw $s1,0x54($sp) /* f140d30: 262b0008 */ addiu $t3,$s1,0x8 /* f140d34: afab0054 */ sw $t3,0x54($sp) -/* f140d38: 0c012d20 */ jal func0004b480 +/* f140d38: 0c012d20 */ jal osVirtualToPhysical /* f140d3c: ae2c0000 */ sw $t4,0x0($s1) /* f140d40: ae220004 */ sw $v0,0x4($s1) /* f140d44: 8e0d0064 */ lw $t5,0x64($s0) @@ -3178,7 +3178,7 @@ glabel func0f140b7c /* f140d70: add80004 */ sw $t8,0x4($t6) .L0f140d74: /* f140d74: afa80054 */ sw $t0,0x54($sp) -/* f140d78: 0c012d20 */ jal func0004b480 +/* f140d78: 0c012d20 */ jal osVirtualToPhysical /* f140d7c: ae340000 */ sw $s4,0x0($s1) /* f140d80: ae220004 */ sw $v0,0x4($s1) .L0f140d84: @@ -3326,7 +3326,7 @@ glabel func0f140e20 /* f140f8c: 37180040 */ ori $t8,$t8,0x40 /* f140f90: 01a0a825 */ or $s5,$t5,$zero /* f140f94: ae380000 */ sw $t8,0x0($s1) -/* f140f98: 0c012d20 */ jal func0004b480 +/* f140f98: 0c012d20 */ jal osVirtualToPhysical /* f140f9c: 016c2021 */ addu $a0,$t3,$t4 /* f140fa0: ae220004 */ sw $v0,0x4($s1) .L0f140fa4: @@ -3398,7 +3398,7 @@ glabel func0f140e20 /* f141098: 8fb100b8 */ lw $s1,0xb8($sp) /* f14109c: 262f0008 */ addiu $t7,$s1,0x8 /* f1410a0: afaf00b8 */ sw $t7,0xb8($sp) -/* f1410a4: 0c012d20 */ jal func0004b480 +/* f1410a4: 0c012d20 */ jal osVirtualToPhysical /* f1410a8: ae380000 */ sw $t8,0x0($s1) /* f1410ac: ae220004 */ sw $v0,0x4($s1) /* f1410b0: 8e190064 */ lw $t9,0x64($s0) @@ -3415,7 +3415,7 @@ glabel func0f140e20 /* f1410dc: ad0a0004 */ sw $t2,0x4($t0) .L0f1410e0: /* f1410e0: afac00b8 */ sw $t4,0xb8($sp) -/* f1410e4: 0c012d20 */ jal func0004b480 +/* f1410e4: 0c012d20 */ jal osVirtualToPhysical /* f1410e8: ae340000 */ sw $s4,0x0($s1) /* f1410ec: ae220004 */ sw $v0,0x4($s1) .L0f1410f0: diff --git a/src/game/game_150820.c b/src/game/game_150820.c index a5b906062..f16561abd 100644 --- a/src/game/game_150820.c +++ b/src/game/game_150820.c @@ -1128,7 +1128,7 @@ glabel func0f151780 /* f15188c: ae190000 */ sw $t9,0x0($s0) /* f151890: 0fc2d402 */ jal func0f0b5008 /* f151894: 26730008 */ addiu $s3,$s3,0x8 -/* f151898: 0c012d20 */ jal func0004b480 +/* f151898: 0c012d20 */ jal osVirtualToPhysical /* f15189c: 00402025 */ or $a0,$v0,$zero /* f1518a0: ae020004 */ sw $v0,0x4($s0) /* f1518a4: 3c08800a */ lui $t0,0x800a @@ -1258,7 +1258,7 @@ glabel func0f151780 /* f151a84: 02608025 */ or $s0,$s3,$zero /* f151a88: ae180000 */ sw $t8,0x0($s0) /* f151a8c: 26730008 */ addiu $s3,$s3,0x8 -/* f151a90: 0c012d20 */ jal func0004b480 +/* f151a90: 0c012d20 */ jal osVirtualToPhysical /* f151a94: 02202025 */ or $a0,$s1,$zero /* f151a98: ae020004 */ sw $v0,0x4($s0) /* f151a9c: 8ef90284 */ lw $t9,0x284($s7) @@ -1447,7 +1447,7 @@ glabel func0f151780 /* f151d44: 02608025 */ or $s0,$s3,$zero /* f151d48: ae0b0000 */ sw $t3,0x0($s0) /* f151d4c: 26730008 */ addiu $s3,$s3,0x8 -/* f151d50: 0c012d20 */ jal func0004b480 +/* f151d50: 0c012d20 */ jal osVirtualToPhysical /* f151d54: 00c02025 */ or $a0,$a2,$zero /* f151d58: 10000018 */ beqz $zero,.L0f151dbc /* f151d5c: ae020004 */ sw $v0,0x4($s0) @@ -1473,7 +1473,7 @@ glabel func0f151780 /* f151da4: 8e490000 */ lw $t1,0x0($s2) /* f151da8: 26730008 */ addiu $s3,$s3,0x8 /* f151dac: 01342021 */ addu $a0,$t1,$s4 -/* f151db0: 0c012d20 */ jal func0004b480 +/* f151db0: 0c012d20 */ jal osVirtualToPhysical /* f151db4: 2484005c */ addiu $a0,$a0,0x5c /* f151db8: ae020004 */ sw $v0,0x4($s0) .L0f151dbc: @@ -1484,7 +1484,7 @@ glabel func0f151780 /* f151dcc: 8e4b0000 */ lw $t3,0x0($s2) /* f151dd0: 26730008 */ addiu $s3,$s3,0x8 /* f151dd4: 01742021 */ addu $a0,$t3,$s4 -/* f151dd8: 0c012d20 */ jal func0004b480 +/* f151dd8: 0c012d20 */ jal osVirtualToPhysical /* f151ddc: 24840038 */ addiu $a0,$a0,0x38 /* f151de0: 02601825 */ or $v1,$s3,$zero /* f151de4: ae020004 */ sw $v0,0x4($s0) @@ -1667,7 +1667,7 @@ glabel func0f151ed0 /* f15207c: afa80140 */ sw $t0,0x140($sp) /* f152080: 0fc2d402 */ jal func0f0b5008 /* f152084: ae090000 */ sw $t1,0x0($s0) -/* f152088: 0c012d20 */ jal func0004b480 +/* f152088: 0c012d20 */ jal osVirtualToPhysical /* f15208c: 00402025 */ or $a0,$v0,$zero /* f152090: ae020004 */ sw $v0,0x4($s0) /* f152094: 3c0a800a */ lui $t2,0x800a @@ -1799,7 +1799,7 @@ glabel func0f151ed0 /* f15227c: 26090008 */ addiu $t1,$s0,0x8 /* f152280: afa90140 */ sw $t1,0x140($sp) /* f152284: 02202025 */ or $a0,$s1,$zero -/* f152288: 0c012d20 */ jal func0004b480 +/* f152288: 0c012d20 */ jal osVirtualToPhysical /* f15228c: ae0a0000 */ sw $t2,0x0($s0) /* f152290: ae020004 */ sw $v0,0x4($s0) /* f152294: 8ecb0284 */ lw $t3,0x284($s6) @@ -1989,7 +1989,7 @@ glabel func0f151ed0 /* f152540: 26180008 */ addiu $t8,$s0,0x8 /* f152544: afb80140 */ sw $t8,0x140($sp) /* f152548: 00c02025 */ or $a0,$a2,$zero -/* f15254c: 0c012d20 */ jal func0004b480 +/* f15254c: 0c012d20 */ jal osVirtualToPhysical /* f152550: ae080000 */ sw $t0,0x0($s0) /* f152554: 10000019 */ beqz $zero,.L0f1525bc /* f152558: ae020004 */ sw $v0,0x4($s0) @@ -2016,7 +2016,7 @@ glabel func0f151ed0 /* f1525a4: ae180000 */ sw $t8,0x0($s0) /* f1525a8: 8e480000 */ lw $t0,0x0($s2) /* f1525ac: 01132021 */ addu $a0,$t0,$s3 -/* f1525b0: 0c012d20 */ jal func0004b480 +/* f1525b0: 0c012d20 */ jal osVirtualToPhysical /* f1525b4: 2484005c */ addiu $a0,$a0,0x5c /* f1525b8: ae020004 */ sw $v0,0x4($s0) .L0f1525bc: @@ -2028,7 +2028,7 @@ glabel func0f151ed0 /* f1525d0: ae0a0000 */ sw $t2,0x0($s0) /* f1525d4: 8e4b0000 */ lw $t3,0x0($s2) /* f1525d8: 01732021 */ addu $a0,$t3,$s3 -/* f1525dc: 0c012d20 */ jal func0004b480 +/* f1525dc: 0c012d20 */ jal osVirtualToPhysical /* f1525e0: 24840038 */ addiu $a0,$a0,0x38 /* f1525e4: ae020004 */ sw $v0,0x4($s0) /* f1525e8: 8fac0140 */ lw $t4,0x140($sp) diff --git a/src/game/game_1531a0.c b/src/game/game_1531a0.c index 11b3ff82c..d53662c35 100644 --- a/src/game/game_1531a0.c +++ b/src/game/game_1531a0.c @@ -2467,7 +2467,7 @@ glabel func0f1552d4 /* f15542c: ac6c0000 */ sw $t4,0x0($v1) /* f155430: ae8e0000 */ sw $t6,0x0($s4) /* f155434: 46124282 */ mul.s $f10,$f8,$f18 -/* f155438: 0c012d20 */ jal func0004b480 +/* f155438: 0c012d20 */ jal osVirtualToPhysical /* f15543c: 460a8581 */ sub.s $f22,$f16,$f10 /* f155440: 02201825 */ or $v1,$s1,$zero /* f155444: ae820004 */ sw $v0,0x4($s4) @@ -3508,7 +3508,7 @@ glabel func0f15603c /* f156374: 3c048008 */ lui $a0,%hi(var8007fb3c) /* f156378: 2484fb3c */ addiu $a0,$a0,%lo(var8007fb3c) /* f15637c: aec80000 */ sw $t0,0x0($s6) -/* f156380: 0c012d20 */ jal func0004b480 +/* f156380: 0c012d20 */ jal osVirtualToPhysical /* f156384: 26b50008 */ addiu $s5,$s5,0x8 /* f156388: 02a01825 */ or $v1,$s5,$zero /* f15638c: aec20004 */ sw $v0,0x4($s6) @@ -4310,7 +4310,7 @@ glabel func0f156e48 /* f156f20: 3c0ffd10 */ lui $t7,0xfd10 /* f156f24: 3c048008 */ lui $a0,%hi(var8007fb5c) /* f156f28: 2484fb5c */ addiu $a0,$a0,%lo(var8007fb5c) -/* f156f2c: 0c012d20 */ jal func0004b480 +/* f156f2c: 0c012d20 */ jal osVirtualToPhysical /* f156f30: ae6f0000 */ sw $t7,0x0($s3) /* f156f34: 02201825 */ or $v1,$s1,$zero /* f156f38: ae620004 */ sw $v0,0x4($s3) diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c index 74cec2afd..ab6c8b29c 100644 --- a/src/game/game_157db0.c +++ b/src/game/game_157db0.c @@ -2800,7 +2800,7 @@ glabel func0f15a2c4 /* f15a460: afaf0238 */ sw $t7,0x238($sp) /* f15a464: 0fc2d402 */ jal func0f0b5008 /* f15a468: ae140000 */ sw $s4,0x0($s0) -/* f15a46c: 0c012d20 */ jal func0004b480 +/* f15a46c: 0c012d20 */ jal osVirtualToPhysical /* f15a470: 00402025 */ or $a0,$v0,$zero /* f15a474: ae020004 */ sw $v0,0x4($s0) /* f15a478: 24180002 */ addiu $t8,$zero,0x2 @@ -2868,7 +2868,7 @@ glabel func0f15a2c4 /* f15a55c: ac540000 */ sw $s4,0x0($v0) /* f15a560: 0fc2d402 */ jal func0f0b5008 /* f15a564: 00408025 */ or $s0,$v0,$zero -/* f15a568: 0c012d20 */ jal func0004b480 +/* f15a568: 0c012d20 */ jal osVirtualToPhysical /* f15a56c: 00402025 */ or $a0,$v0,$zero /* f15a570: ae020004 */ sw $v0,0x4($s0) /* f15a574: 3c13800a */ lui $s3,0x800a @@ -2892,7 +2892,7 @@ glabel func0f15a2c4 /* f15a5b4: afb90238 */ sw $t9,0x238($sp) /* f15a5b8: 0fc2d402 */ jal func0f0b5008 /* f15a5bc: ae340000 */ sw $s4,0x0($s1) -/* f15a5c0: 0c012d20 */ jal func0004b480 +/* f15a5c0: 0c012d20 */ jal osVirtualToPhysical /* f15a5c4: 00402025 */ or $a0,$v0,$zero /* f15a5c8: ae220004 */ sw $v0,0x4($s1) /* f15a5cc: 860b0008 */ lh $t3,0x8($s0) @@ -2918,7 +2918,7 @@ glabel func0f15a2c4 /* f15a61c: ac540000 */ sw $s4,0x0($v0) /* f15a620: 0fc2d3fa */ jal func0f0b4fe8 /* f15a624: 00408825 */ or $s1,$v0,$zero -/* f15a628: 0c012d20 */ jal func0004b480 +/* f15a628: 0c012d20 */ jal osVirtualToPhysical /* f15a62c: 00402025 */ or $a0,$v0,$zero /* f15a630: 0fc47b60 */ jal func0f11ed80 /* f15a634: ae220004 */ sw $v0,0x4($s1) @@ -3255,7 +3255,7 @@ glabel func0f15a6f4 /* f15aad0: 00408025 */ or $s0,$v0,$zero /* f15aad4: 0fc2d402 */ jal func0f0b5008 /* f15aad8: 24510008 */ addiu $s1,$v0,0x8 -/* f15aadc: 0c012d20 */ jal func0004b480 +/* f15aadc: 0c012d20 */ jal osVirtualToPhysical /* f15aae0: 00402025 */ or $a0,$v0,$zero /* f15aae4: ae020004 */ sw $v0,0x4($s0) /* f15aae8: 0fc30cbf */ jal func0f0c32fc @@ -3378,7 +3378,7 @@ glabel func0f15a6f4 /* f15ac88: afa20084 */ sw $v0,0x84($sp) /* f15ac8c: 0fc2d3fa */ jal func0f0b4fe8 /* f15ac90: 26310008 */ addiu $s1,$s1,0x8 -/* f15ac94: 0c012d20 */ jal func0004b480 +/* f15ac94: 0c012d20 */ jal osVirtualToPhysical /* f15ac98: 00402025 */ or $a0,$v0,$zero /* f15ac9c: 8fb90084 */ lw $t9,0x84($sp) /* f15aca0: 02202025 */ or $a0,$s1,$zero @@ -3415,7 +3415,7 @@ glabel func0f15a6f4 /* f15ad14: afa20080 */ sw $v0,0x80($sp) /* f15ad18: 0fc2d402 */ jal func0f0b5008 /* f15ad1c: 26310008 */ addiu $s1,$s1,0x8 -/* f15ad20: 0c012d20 */ jal func0004b480 +/* f15ad20: 0c012d20 */ jal osVirtualToPhysical /* f15ad24: 00402025 */ or $a0,$v0,$zero /* f15ad28: 8fad0080 */ lw $t5,0x80($sp) /* f15ad2c: 02202025 */ or $a0,$s1,$zero @@ -3465,7 +3465,7 @@ glabel func0f15a6f4 /* f15add4: afa2007c */ sw $v0,0x7c($sp) /* f15add8: 0fc2d3fa */ jal func0f0b4fe8 /* f15addc: 26310008 */ addiu $s1,$s1,0x8 -/* f15ade0: 0c012d20 */ jal func0004b480 +/* f15ade0: 0c012d20 */ jal osVirtualToPhysical /* f15ade4: 00402025 */ or $a0,$v0,$zero /* f15ade8: 8fad007c */ lw $t5,0x7c($sp) /* f15adec: 02202025 */ or $a0,$s1,$zero @@ -3513,7 +3513,7 @@ glabel func0f15a6f4 /* f15ae88: 00408025 */ or $s0,$v0,$zero /* f15ae8c: 0fc2d402 */ jal func0f0b5008 /* f15ae90: 24510008 */ addiu $s1,$v0,0x8 -/* f15ae94: 0c012d20 */ jal func0004b480 +/* f15ae94: 0c012d20 */ jal osVirtualToPhysical /* f15ae98: 00402025 */ or $a0,$v0,$zero /* f15ae9c: 0fc59eb8 */ jal func0f167ae0 /* f15aea0: ae020004 */ sw $v0,0x4($s0) @@ -3566,7 +3566,7 @@ glabel func0f15a6f4 /* f15af50: afa20074 */ sw $v0,0x74($sp) /* f15af54: 0fc2d402 */ jal func0f0b5008 /* f15af58: 26310008 */ addiu $s1,$s1,0x8 -/* f15af5c: 0c012d20 */ jal func0004b480 +/* f15af5c: 0c012d20 */ jal osVirtualToPhysical /* f15af60: 00402025 */ or $a0,$v0,$zero /* f15af64: 8fab0074 */ lw $t3,0x74($sp) /* f15af68: 0012c880 */ sll $t9,$s2,0x2 @@ -3617,7 +3617,7 @@ glabel func0f15a6f4 /* f15b014: afa20070 */ sw $v0,0x70($sp) /* f15b018: 0fc2d3fa */ jal func0f0b4fe8 /* f15b01c: 26310008 */ addiu $s1,$s1,0x8 -/* f15b020: 0c012d20 */ jal func0004b480 +/* f15b020: 0c012d20 */ jal osVirtualToPhysical /* f15b024: 00402025 */ or $a0,$v0,$zero /* f15b028: 8fb90070 */ lw $t9,0x70($sp) /* f15b02c: 02202025 */ or $a0,$s1,$zero diff --git a/src/game/game_16e810.c b/src/game/game_16e810.c index 17bff8ae3..64d79b664 100644 --- a/src/game/game_16e810.c +++ b/src/game/game_16e810.c @@ -5365,7 +5365,7 @@ glabel func0f173010 /* f1730a4: 0c012048 */ jal func00048120 /* f1730a8: afab002c */ sw $t3,0x2c($sp) /* f1730ac: 8fa4002c */ lw $a0,0x2c($sp) -/* f1730b0: 0c013920 */ jal func0004e480 +/* f1730b0: 0c013920 */ jal osInvalDCache /* f1730b4: 24052000 */ addiu $a1,$zero,0x2000 /* f1730b8: 3c0d800b */ lui $t5,0x800b /* f1730bc: 8dadb53c */ lw $t5,-0x4ac4($t5) @@ -5446,7 +5446,7 @@ glabel func0f173010 /* f1731d8: 50200007 */ beqzl $at,.L0f1731f8 /* f1731dc: 93ac148b */ lbu $t4,0x148b($sp) .L0f1731e0: -/* f1731e0: 0c012d20 */ jal func0004b480 +/* f1731e0: 0c012d20 */ jal osVirtualToPhysical /* f1731e4: 8e040000 */ lw $a0,0x0($s0) /* f1731e8: 8fad24f0 */ lw $t5,0x24f0($sp) /* f1731ec: 1000008c */ beqz $zero,.L0f173420 @@ -5598,7 +5598,7 @@ glabel func0f173010 .L0f17340c: /* f17340c: 8fb9149c */ lw $t9,0x149c($sp) .L0f173410: -/* f173410: 0c012d20 */ jal func0004b480 +/* f173410: 0c012d20 */ jal osVirtualToPhysical /* f173414: 8f240004 */ lw $a0,0x4($t9) /* f173418: 8faa24f0 */ lw $t2,0x24f0($sp) /* f17341c: ad420000 */ sw $v0,0x0($t2) diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index c31682b28..032d5a7b7 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -13219,7 +13219,7 @@ u32 var80099a10 = 0; u32 var80099a14 = 0; u32 var80099a18 = 0; u32 var80099a1c = 0; -u32 var80099a20 = 0; +OSMesg var80099a20 = NULL; u32 var80099a24 = 0; u32 var80099a28 = 0; u32 var80099a2c = 0; @@ -13227,12 +13227,7 @@ u32 var80099a30 = 0; u32 var80099a34 = 0; u32 var80099a38 = 0; u32 var80099a3c = 0; -u32 var80099a40 = 0; -u32 var80099a44 = 0; -u32 var80099a48 = 0; -u32 var80099a4c = 0; -u32 var80099a50 = 0; -u32 var80099a54 = 0; +OSMesgQueue var80099a40 = {0}; u32 var80099a58 = 0; u32 var80099a5c = 0; u32 var80099a60 = 0; diff --git a/src/include/boot/boot.h b/src/include/boot/boot.h index f87d07a5a..7203e0bf1 100644 --- a/src/include/boot/boot.h +++ b/src/include/boot/boot.h @@ -5,7 +5,7 @@ s32 func000010a4(void); s32 func0000113c(void); s32 func00001180(void); -s32 func000016c0(void); +s32 osGetMemSize(void); s32 func000018ac(void); void func00001b28(u32 arg0); s32 func00001e30(void); diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index 64786ce94..4ca4d70b7 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -472,8 +472,8 @@ extern u32 var80099880; extern u32 var800998f8; extern u32 var80099900; extern u32 var80099a00; -extern u32 var80099a20; -extern u32 var80099a40; +extern OSMesg var80099a20; +extern OSMesgQueue var80099a40; extern u32 var80099a60; extern u32 var80099c64; extern u32 var80099e68; diff --git a/src/include/lib/lib_034f0.h b/src/include/lib/lib_034f0.h index 1bec6381a..b2027c2af 100644 --- a/src/include/lib/lib_034f0.h +++ b/src/include/lib/lib_034f0.h @@ -5,9 +5,9 @@ u32 func000034f0(void); u32 func00003ab8(void); -u32 func00003ba0(void); -u32 func00003cb8(void); -u32 func00003d00(void); -u32 func00003d10(void); +u32 __osEnqueueAndYield(void); +u32 __osEnqueueThread(void); +u32 __osPopThread(void); +u32 __osDispatchThread(void); #endif diff --git a/src/include/lib/lib_481e0.h b/src/include/lib/lib_481e0.h index cad7ab9f6..19b57cd6a 100644 --- a/src/include/lib/lib_481e0.h +++ b/src/include/lib/lib_481e0.h @@ -4,8 +4,8 @@ #include "types.h" u32 func000481e0(void); -u32 func000481f0(void); -void func00048340(u32 *arg0, u32 *arg1, s32 arg2); +void osStartThread(OSThread *thread); +void osCreateMesgQueue(OSMesgQueue *mq, OSMesg *msgBuf, s32 count); void func00048370(s32 arg0); void func00048430(s32 arg0, s32 arg1); u32 func00048510(void); diff --git a/src/include/lib/lib_48650.h b/src/include/lib/lib_48650.h index ace1632a8..25942fe99 100644 --- a/src/include/lib/lib_48650.h +++ b/src/include/lib/lib_48650.h @@ -4,6 +4,6 @@ #include "types.h" u32 func00048650(void); -u32 func000486f0(void); +s32 osRecvMesg(OSMesgQueue *mq, OSMesg *msg, s32 flag); #endif diff --git a/src/include/lib/lib_488e0.h b/src/include/lib/lib_488e0.h index 7ad57838e..fd41f2868 100644 --- a/src/include/lib/lib_488e0.h +++ b/src/include/lib/lib_488e0.h @@ -3,7 +3,7 @@ #include #include "types.h" -u32 func000488e0(void); +s32 osSendMesg(OSMesgQueue *mq, OSMesg msg, s32 flag); u32 func00048a30(void); #endif diff --git a/src/include/lib/lib_491b0.h b/src/include/lib/lib_491b0.h index 8066f764b..5d0b9e611 100644 --- a/src/include/lib/lib_491b0.h +++ b/src/include/lib/lib_491b0.h @@ -7,7 +7,7 @@ u32 func000491b0(void); u32 func0004923c(void); u32 func000493b4(void); u32 func00049428(void); -u32 func000495b0(void); -u32 func00049620(void); +u32 __osDisableInt(void); +u32 __osRestoreInt(void); #endif diff --git a/src/include/lib/lib_4a810.h b/src/include/lib/lib_4a810.h index 832b8720c..9a0246c27 100644 --- a/src/include/lib/lib_4a810.h +++ b/src/include/lib/lib_4a810.h @@ -3,9 +3,9 @@ #include #include "types.h" -u32 func0004a810(void); -u32 func0004a860(void); -u32 func0004a8a4(void); -u32 func0004a8d0(void); +u32 __osSiCreateAccessQueue(void); +u32 __osSiGetAccess(void); +u32 __osSiRelAccess(void); +u32 __osSiRawStartDma(void); #endif diff --git a/src/include/lib/lib_4ad80.h b/src/include/lib/lib_4ad80.h index 72a0491b9..8529f953b 100644 --- a/src/include/lib/lib_4ad80.h +++ b/src/include/lib/lib_4ad80.h @@ -3,6 +3,6 @@ #include #include "types.h" -u32 func0004ad80(void); +void osWritebackDCache(void *vaddr, s32 nbytes); #endif diff --git a/src/include/lib/lib_4b480.h b/src/include/lib/lib_4b480.h index 819b3ade8..db250ebf9 100644 --- a/src/include/lib/lib_4b480.h +++ b/src/include/lib/lib_4b480.h @@ -3,6 +3,6 @@ #include #include "types.h" -u32 func0004b480(void); +u32 osVirtualToPhysical(void *); #endif diff --git a/src/include/lib/lib_4b5e0.h b/src/include/lib/lib_4b5e0.h index 29836e37f..1dda6a57b 100644 --- a/src/include/lib/lib_4b5e0.h +++ b/src/include/lib/lib_4b5e0.h @@ -4,7 +4,7 @@ #include "types.h" u32 func0004b5e0(void); -u32 func0004b610(void); -u32 func0004b860(void); +u32 __osContRamWrite(void); +u32 __osContRamRead(void); #endif diff --git a/src/include/lib/lib_4ba90.h b/src/include/lib/lib_4ba90.h index 2ed4ee9d0..cddd4d7c1 100644 --- a/src/include/lib/lib_4ba90.h +++ b/src/include/lib/lib_4ba90.h @@ -3,9 +3,9 @@ #include #include "types.h" -u32 func0004ba90(void); -u32 func0004bb60(void); -u32 func0004bc24(void); +u32 __osPfsGetStatus(void); +u32 __osPfsRequestOneChannel(void); +u32 __osPfsGetOneChannelData(void); u32 func0004bcc0(void); u32 func0004be38(void); u32 func0004bee4(void); diff --git a/src/include/lib/lib_4d6f0.h b/src/include/lib/lib_4d6f0.h index ce4132a54..a74e88cea 100644 --- a/src/include/lib/lib_4d6f0.h +++ b/src/include/lib/lib_4d6f0.h @@ -7,6 +7,6 @@ u32 func0004d6f0(void); u32 func0004dc28(void); u32 func0004def4(void); u32 func0004e090(void); -u32 func0004e1b0(void); +void osMapTLB(s32 index, OSPageMask pm, void *vaddr, u32 evenpaddr, u32 oddpaddr, s32 asid); #endif diff --git a/src/include/lib/lib_4e470.h b/src/include/lib/lib_4e470.h index c4adce5ae..66e7dbcb4 100644 --- a/src/include/lib/lib_4e470.h +++ b/src/include/lib/lib_4e470.h @@ -4,6 +4,6 @@ #include "types.h" u32 func0004e470(void); -u32 func0004e480(void); +void osInvalDCache(void *vaddr, s32 nbytes); #endif diff --git a/src/include/lib/lib_4f400.h b/src/include/lib/lib_4f400.h index 3fbbd72e5..eedc210fa 100644 --- a/src/include/lib/lib_4f400.h +++ b/src/include/lib/lib_4f400.h @@ -3,8 +3,7 @@ #include #include "types.h" -u32 func0004f400(void); -u32 func0004f484(void); -u32 func0004f510(void); +s32 osContStartReadData(OSMesgQueue *mq); +void osContGetReadData(OSContPad *data); #endif diff --git a/src/include/lib/lib_51c60.h b/src/include/lib/lib_51c60.h index 8392d96b7..018f93d50 100644 --- a/src/include/lib/lib_51c60.h +++ b/src/include/lib/lib_51c60.h @@ -4,6 +4,6 @@ #include "types.h" u32 func00051c60(void); -u32 func00051c90(void); +u32 __osProbeTLB(void); #endif diff --git a/src/lib/lib_03050.c b/src/lib/lib_03050.c index 89cc2549f..3a9588d5a 100644 --- a/src/lib/lib_03050.c +++ b/src/lib/lib_03050.c @@ -46,7 +46,7 @@ glabel func00003050 /* 3088: ac20cefc */ sw $zero,-0x3104($at) /* 308c: 24a50248 */ addiu $a1,$a1,%lo(var80090248) /* 3090: 24840230 */ addiu $a0,$a0,%lo(var80090230) -/* 3094: 0c0120d0 */ jal func00048340 +/* 3094: 0c0120d0 */ jal osCreateMesgQueue /* 3098: 24060005 */ addiu $a2,$zero,0x5 /* 309c: 3c068009 */ lui $a2,%hi(var80090260) /* 30a0: 3c078009 */ lui $a3,%hi(var80090278) @@ -82,7 +82,7 @@ glabel func00003050 /* 3118: 0c01210c */ jal func00048430 /* 311c: afa20028 */ sw $v0,0x28($sp) .L00003120: -/* 3120: 0c01256c */ jal func000495b0 +/* 3120: 0c01256c */ jal __osDisableInt /* 3124: 00000000 */ sll $zero,$zero,0x0 /* 3128: 8fab0030 */ lw $t3,0x30($sp) /* 312c: 3c038009 */ lui $v1,%hi(var80090230) @@ -110,9 +110,9 @@ glabel func00003050 /* 3184: 0c012590 */ jal func00049640 /* 3188: 00000000 */ sll $zero,$zero,0x0 /* 318c: 3c048009 */ lui $a0,%hi(var8008fe00) -/* 3190: 0c01207c */ jal func000481f0 +/* 3190: 0c01207c */ jal osStartThread /* 3194: 2484fe00 */ addiu $a0,$a0,%lo(var8008fe00) -/* 3198: 0c012588 */ jal func00049620 +/* 3198: 0c012588 */ jal __osRestoreInt /* 319c: 8fa4002c */ lw $a0,0x2c($sp) /* 31a0: 8fac0028 */ lw $t4,0x28($sp) /* 31a4: 2401ffff */ addiu $at,$zero,-1 @@ -161,7 +161,7 @@ glabel func00003050 /* 3244: 8ee4000c */ lw $a0,0xc($s7) .L00003248: /* 3248: 02802825 */ or $a1,$s4,$zero -/* 324c: 0c0121bc */ jal func000486f0 +/* 324c: 0c0121bc */ jal osRecvMesg /* 3250: 24060001 */ addiu $a2,$zero,0x1 /* 3254: 8fae0044 */ lw $t6,0x44($sp) /* 3258: 95c30000 */ lhu $v1,0x0($t6) @@ -189,7 +189,7 @@ glabel func00003050 /* 32ac: 53000005 */ beqzl $t8,.L000032c4 /* 32b0: 96030002 */ lhu $v1,0x2($s0) /* 32b4: 8c440010 */ lw $a0,0x10($v0) -/* 32b8: 0c012238 */ jal func000488e0 +/* 32b8: 0c012238 */ jal osSendMesg /* 32bc: 8c450014 */ lw $a1,0x14($v0) /* 32c0: 96030002 */ lhu $v1,0x2($s0) .L000032c4: @@ -250,13 +250,13 @@ glabel func00003360 /* 3384: afa60038 */ sw $a2,0x38($sp) /* 3388: 00a02025 */ or $a0,$a1,$zero /* 338c: 00c02825 */ or $a1,$a2,$zero -/* 3390: 0c0120d0 */ jal func00048340 +/* 3390: 0c0120d0 */ jal osCreateMesgQueue /* 3394: 00e03025 */ or $a2,$a3,$zero /* 3398: 3c048009 */ lui $a0,%hi(var800907c0) /* 339c: 3c058009 */ lui $a1,%hi(var800907d8) /* 33a0: 24a507d8 */ addiu $a1,$a1,%lo(var800907d8) /* 33a4: 248407c0 */ addiu $a0,$a0,%lo(var800907c0) -/* 33a8: 0c0120d0 */ jal func00048340 +/* 33a8: 0c0120d0 */ jal osCreateMesgQueue /* 33ac: 24060004 */ addiu $a2,$zero,0x4 /* 33b0: 3c0f8006 */ lui $t7,0x8006 /* 33b4: 8def0920 */ lw $t7,0x920($t7) @@ -283,7 +283,7 @@ glabel func00003360 /* 3404: 0c01210c */ jal func00048430 /* 3408: afa20028 */ sw $v0,0x28($sp) .L0000340c: -/* 340c: 0c01256c */ jal func000495b0 +/* 340c: 0c01256c */ jal __osDisableInt /* 3410: 00000000 */ sll $zero,$zero,0x0 /* 3414: 8fa90034 */ lw $t1,0x34($sp) /* 3418: 8faf0030 */ lw $t7,0x30($sp) @@ -316,9 +316,9 @@ glabel func00003360 /* 3484: 0c000fb8 */ jal func00003ee0 /* 3488: afaf0014 */ sw $t7,0x14($sp) /* 348c: 3c048009 */ lui $a0,%hi(var80090390) -/* 3490: 0c01207c */ jal func000481f0 +/* 3490: 0c01207c */ jal osStartThread /* 3494: 24840390 */ addiu $a0,$a0,%lo(var80090390) -/* 3498: 0c012588 */ jal func00049620 +/* 3498: 0c012588 */ jal __osRestoreInt /* 349c: 8fa4002c */ lw $a0,0x2c($sp) /* 34a0: 8fb80028 */ lw $t8,0x28($sp) /* 34a4: 2401ffff */ addiu $at,$zero,-1 diff --git a/src/lib/lib_034f0.c b/src/lib/lib_034f0.c index 17478d4f7..8bbcb802e 100644 --- a/src/lib/lib_034f0.c +++ b/src/lib/lib_034f0.c @@ -404,7 +404,7 @@ glabel func000034f0 /* 3a54: 00000000 */ sll $zero,$zero,0x0 /* 3a58: 3c048006 */ lui $a0,%hi(var80060938) /* 3a5c: 03402825 */ or $a1,$k0,$zero -/* 3a60: 0c000f2e */ jal func00003cb8 +/* 3a60: 0c000f2e */ jal __osEnqueueThread /* 3a64: 24840938 */ addiu $a0,$a0,%lo(var80060938) /* 3a68: 08000f44 */ j 0x3d10 /* 3a6c: 00000000 */ sll $zero,$zero,0x0 @@ -470,12 +470,12 @@ glabel func00003ab8 /* 3b3c: 8d4b0000 */ lw $t3,0x0($t2) /* 3b40: 11600008 */ beqz $t3,.L00003b64 /* 3b44: 00000000 */ sll $zero,$zero,0x0 -/* 3b48: 0c000f40 */ jal func00003d00 +/* 3b48: 0c000f40 */ jal __osPopThread /* 3b4c: 01202025 */ or $a0,$t1,$zero /* 3b50: 00405025 */ or $t2,$v0,$zero /* 3b54: 3c048006 */ lui $a0,%hi(var80060938) /* 3b58: 01402825 */ or $a1,$t2,$zero -/* 3b5c: 0c000f2e */ jal func00003cb8 +/* 3b5c: 0c000f2e */ jal __osEnqueueThread /* 3b60: 24840938 */ addiu $a0,$a0,%lo(var80060938) .L00003b64: /* 3b64: 02400008 */ jr $s2 @@ -497,7 +497,7 @@ glabel func00003ab8 ); GLOBAL_ASM( -glabel func00003ba0 +glabel __osEnqueueAndYield /* 3ba0: 3c058006 */ lui $a1,0x8006 /* 3ba4: 8ca50940 */ lw $a1,0x940($a1) /* 3ba8: 40086000 */ mfc0 $t0,$12 @@ -567,7 +567,7 @@ glabel func00003ba0 .L00003ca0: /* 3ca0: 10800003 */ beqz $a0,.L00003cb0 /* 3ca4: acbb0128 */ sw $k1,0x128($a1) -/* 3ca8: 0c000f2e */ jal func00003cb8 +/* 3ca8: 0c000f2e */ jal __osEnqueueThread /* 3cac: 00000000 */ sll $zero,$zero,0x0 .L00003cb0: /* 3cb0: 08000f44 */ j 0x3d10 @@ -575,7 +575,7 @@ glabel func00003ba0 ); GLOBAL_ASM( -glabel func00003cb8 +glabel __osEnqueueThread /* 3cb8: 8c980000 */ lw $t8,0x0($a0) /* 3cbc: 8caf0004 */ lw $t7,0x4($a1) /* 3cc0: 0080c825 */ or $t9,$a0,$zero @@ -599,7 +599,7 @@ glabel func00003cb8 ); GLOBAL_ASM( -glabel func00003d00 +glabel __osPopThread /* 3d00: 8c820000 */ lw $v0,0x0($a0) /* 3d04: 8c590000 */ lw $t9,0x0($v0) /* 3d08: 03e00008 */ jr $ra @@ -607,9 +607,9 @@ glabel func00003d00 ); GLOBAL_ASM( -glabel func00003d10 +glabel __osDispatchThread /* 3d10: 3c048006 */ lui $a0,%hi(var80060938) -/* 3d14: 0c000f40 */ jal func00003d00 +/* 3d14: 0c000f40 */ jal __osPopThread /* 3d18: 24840938 */ addiu $a0,$a0,%lo(var80060938) /* 3d1c: 3c018006 */ lui $at,0x8006 /* 3d20: ac220940 */ sw $v0,0x940($at) diff --git a/src/lib/lib_03ee0.c b/src/lib/lib_03ee0.c index 7d59dd4c8..7ce17b16b 100644 --- a/src/lib/lib_03ee0.c +++ b/src/lib/lib_03ee0.c @@ -46,14 +46,14 @@ glabel func00003ee0 /* 3f64: ac99012c */ sw $t9,0x12c($a0) /* 3f68: ac800018 */ sw $zero,0x18($a0) /* 3f6c: a4880010 */ sh $t0,0x10($a0) -/* 3f70: 0c01256c */ jal func000495b0 +/* 3f70: 0c01256c */ jal __osDisableInt /* 3f74: a4800012 */ sh $zero,0x12($a0) /* 3f78: 3c038006 */ lui $v1,%hi(var8006093c) /* 3f7c: 2463093c */ addiu $v1,$v1,%lo(var8006093c) /* 3f80: 8c690000 */ lw $t1,0x0($v1) /* 3f84: 00402025 */ or $a0,$v0,$zero /* 3f88: ae09000c */ sw $t1,0xc($s0) -/* 3f8c: 0c012588 */ jal func00049620 +/* 3f8c: 0c012588 */ jal __osRestoreInt /* 3f90: ac700000 */ sw $s0,0x0($v1) /* 3f94: 8fbf001c */ lw $ra,0x1c($sp) /* 3f98: 8fb00018 */ lw $s0,0x18($sp) diff --git a/src/lib/lib_04a80.c b/src/lib/lib_04a80.c index 557a4e570..23a29366f 100644 --- a/src/lib/lib_04a80.c +++ b/src/lib/lib_04a80.c @@ -1005,7 +1005,7 @@ glabel func00005770 /* 579c: afb00018 */ sw $s0,0x18($sp) /* 57a0: afa50074 */ sw $a1,0x74($sp) /* 57a4: 0000a825 */ or $s5,$zero,$zero -/* 57a8: 0c012a18 */ jal func0004a860 +/* 57a8: 0c012a18 */ jal __osSiGetAccess /* 57ac: 24110001 */ addiu $s1,$zero,0x1 /* 57b0: 3c1e800a */ lui $s8,0x800a /* 57b4: 3c138009 */ lui $s3,%hi(var80090a20) @@ -1019,19 +1019,19 @@ glabel func00005770 /* 57d0: 0c00163f */ jal func000058fc /* 57d4: 00002025 */ or $a0,$zero,$zero /* 57d8: 24040001 */ addiu $a0,$zero,0x1 -/* 57dc: 0c012a34 */ jal func0004a8d0 +/* 57dc: 0c012a34 */ jal __osSiRawStartDma /* 57e0: 02602825 */ or $a1,$s3,$zero /* 57e4: 02402025 */ or $a0,$s2,$zero /* 57e8: 02802825 */ or $a1,$s4,$zero -/* 57ec: 0c0121bc */ jal func000486f0 +/* 57ec: 0c0121bc */ jal osRecvMesg /* 57f0: 24060001 */ addiu $a2,$zero,0x1 /* 57f4: 00002025 */ or $a0,$zero,$zero -/* 57f8: 0c012a34 */ jal func0004a8d0 +/* 57f8: 0c012a34 */ jal __osSiRawStartDma /* 57fc: 02602825 */ or $a1,$s3,$zero /* 5800: afa2006c */ sw $v0,0x6c($sp) /* 5804: 02402025 */ or $a0,$s2,$zero /* 5808: 02802825 */ or $a1,$s4,$zero -/* 580c: 0c0121bc */ jal func000486f0 +/* 580c: 0c0121bc */ jal osRecvMesg /* 5810: 24060001 */ addiu $a2,$zero,0x1 /* 5814: 02c02025 */ or $a0,$s6,$zero /* 5818: 0c00166c */ jal func000059b0 @@ -1082,7 +1082,7 @@ glabel func00005770 /* 58b0: 1420fff1 */ bnez $at,.L00005878 /* 58b4: 24420004 */ addiu $v0,$v0,0x4 .L000058b8: -/* 58b8: 0c012a29 */ jal func0004a8a4 +/* 58b8: 0c012a29 */ jal __osSiRelAccess /* 58bc: 00000000 */ sll $zero,$zero,0x0 /* 58c0: 8fac0074 */ lw $t4,0x74($sp) /* 58c4: a1950000 */ sb $s5,0x0($t4) @@ -1375,7 +1375,7 @@ glabel func00005b60 /* 5c9c: 8c410008 */ lw $at,0x8($v0) /* 5ca0: ade10008 */ sw $at,0x8($t7) /* 5ca4: 8c59000c */ lw $t9,0xc($v0) -/* 5ca8: 0c012b60 */ jal func0004ad80 +/* 5ca8: 0c012b60 */ jal osWritebackDCache /* 5cac: adf9000c */ sw $t9,0xc($t7) /* 5cb0: 02002025 */ or $a0,$s0,$zero /* 5cb4: 0c012054 */ jal func00048150 diff --git a/src/lib/lib_05e40.c b/src/lib/lib_05e40.c index 18d1f1174..57f208437 100644 --- a/src/lib/lib_05e40.c +++ b/src/lib/lib_05e40.c @@ -26,7 +26,7 @@ glabel func00005e40 /* 5e5c: 8c840a80 */ lw $a0,0xa80($a0) /* 5e60: 10800005 */ beqz $a0,.L00005e78 /* 5e64: 00000000 */ sll $zero,$zero,0x0 -/* 5e68: 0c012d20 */ jal func0004b480 +/* 5e68: 0c012d20 */ jal osVirtualToPhysical /* 5e6c: 00000000 */ sll $zero,$zero,0x0 /* 5e70: 3c018009 */ lui $at,0x8009 /* 5e74: ac220a80 */ sw $v0,0xa80($at) @@ -35,7 +35,7 @@ glabel func00005e40 /* 5e7c: 8c840a88 */ lw $a0,0xa88($a0) /* 5e80: 10800005 */ beqz $a0,.L00005e98 /* 5e84: 00000000 */ sll $zero,$zero,0x0 -/* 5e88: 0c012d20 */ jal func0004b480 +/* 5e88: 0c012d20 */ jal osVirtualToPhysical /* 5e8c: 00000000 */ sll $zero,$zero,0x0 /* 5e90: 3c018009 */ lui $at,0x8009 /* 5e94: ac220a88 */ sw $v0,0xa88($at) @@ -44,7 +44,7 @@ glabel func00005e40 /* 5e9c: 8c840a90 */ lw $a0,0xa90($a0) /* 5ea0: 10800005 */ beqz $a0,.L00005eb8 /* 5ea4: 00000000 */ sll $zero,$zero,0x0 -/* 5ea8: 0c012d20 */ jal func0004b480 +/* 5ea8: 0c012d20 */ jal osVirtualToPhysical /* 5eac: 00000000 */ sll $zero,$zero,0x0 /* 5eb0: 3c018009 */ lui $at,0x8009 /* 5eb4: ac220a90 */ sw $v0,0xa90($at) @@ -53,7 +53,7 @@ glabel func00005e40 /* 5ebc: 8c840a98 */ lw $a0,0xa98($a0) /* 5ec0: 10800005 */ beqz $a0,.L00005ed8 /* 5ec4: 00000000 */ sll $zero,$zero,0x0 -/* 5ec8: 0c012d20 */ jal func0004b480 +/* 5ec8: 0c012d20 */ jal osVirtualToPhysical /* 5ecc: 00000000 */ sll $zero,$zero,0x0 /* 5ed0: 3c018009 */ lui $at,0x8009 /* 5ed4: ac220a98 */ sw $v0,0xa98($at) @@ -62,7 +62,7 @@ glabel func00005e40 /* 5edc: 8c840a9c */ lw $a0,0xa9c($a0) /* 5ee0: 10800005 */ beqz $a0,.L00005ef8 /* 5ee4: 00000000 */ sll $zero,$zero,0x0 -/* 5ee8: 0c012d20 */ jal func0004b480 +/* 5ee8: 0c012d20 */ jal osVirtualToPhysical /* 5eec: 00000000 */ sll $zero,$zero,0x0 /* 5ef0: 3c018009 */ lui $at,0x8009 /* 5ef4: ac220a9c */ sw $v0,0xa9c($at) @@ -71,7 +71,7 @@ glabel func00005e40 /* 5efc: 8c840aa0 */ lw $a0,0xaa0($a0) /* 5f00: 10800005 */ beqz $a0,.L00005f18 /* 5f04: 00000000 */ sll $zero,$zero,0x0 -/* 5f08: 0c012d20 */ jal func0004b480 +/* 5f08: 0c012d20 */ jal osVirtualToPhysical /* 5f0c: 00000000 */ sll $zero,$zero,0x0 /* 5f10: 3c018009 */ lui $at,0x8009 /* 5f14: ac220aa0 */ sw $v0,0xaa0($at) @@ -80,7 +80,7 @@ glabel func00005e40 /* 5f1c: 8c840aa8 */ lw $a0,0xaa8($a0) /* 5f20: 50800006 */ beqzl $a0,.L00005f3c /* 5f24: 8fbf0014 */ lw $ra,0x14($sp) -/* 5f28: 0c012d20 */ jal func0004b480 +/* 5f28: 0c012d20 */ jal osVirtualToPhysical /* 5f2c: 00000000 */ sll $zero,$zero,0x0 /* 5f30: 3c018009 */ lui $at,0x8009 /* 5f34: ac220aa8 */ sw $v0,0xaa8($at) @@ -127,7 +127,7 @@ glabel func00005f4c /* 5fc4: 8dcf0000 */ lw $t7,0x0($t6) /* 5fc8: ac4f0010 */ sw $t7,0x10($v0) .L00005fcc: -/* 5fcc: 0c012b60 */ jal func0004ad80 +/* 5fcc: 0c012b60 */ jal osWritebackDCache /* 5fd0: 24050040 */ addiu $a1,$zero,0x40 /* 5fd4: 0c012d40 */ jal func0004b500 /* 5fd8: 24042b00 */ addiu $a0,$zero,0x2b00 diff --git a/src/lib/lib_06100.c b/src/lib/lib_06100.c index a31eb5859..b7fce170b 100644 --- a/src/lib/lib_06100.c +++ b/src/lib/lib_06100.c @@ -32,7 +32,7 @@ glabel func00006100 /* 6138: 8fa50060 */ lw $a1,0x60($sp) /* 613c: 24060400 */ addiu $a2,$zero,0x400 /* 6140: 27a70030 */ addiu $a3,$sp,0x30 -/* 6144: 0c012d84 */ jal func0004b610 +/* 6144: 0c012d84 */ jal __osContRamWrite /* 6148: afa00010 */ sw $zero,0x10($sp) /* 614c: 24010002 */ addiu $at,$zero,0x2 /* 6150: 14410008 */ bne $v0,$at,.L00006174 @@ -41,7 +41,7 @@ glabel func00006100 /* 615c: 8fa50060 */ lw $a1,0x60($sp) /* 6160: 24060400 */ addiu $a2,$zero,0x400 /* 6164: 27a70030 */ addiu $a3,$sp,0x30 -/* 6168: 0c012d84 */ jal func0004b610 +/* 6168: 0c012d84 */ jal __osContRamWrite /* 616c: afa00010 */ sw $zero,0x10($sp) /* 6170: 00401825 */ or $v1,$v0,$zero .L00006174: @@ -52,7 +52,7 @@ glabel func00006100 .L00006184: /* 6184: 8fa50060 */ lw $a1,0x60($sp) /* 6188: 24060400 */ addiu $a2,$zero,0x400 -/* 618c: 0c012e18 */ jal func0004b860 +/* 618c: 0c012e18 */ jal __osContRamRead /* 6190: 27a70030 */ addiu $a3,$sp,0x30 /* 6194: 24010002 */ addiu $at,$zero,0x2 /* 6198: 14410002 */ bne $v0,$at,.L000061a4 @@ -80,7 +80,7 @@ glabel func00006100 /* 61e0: 8fa50060 */ lw $a1,0x60($sp) /* 61e4: 24060400 */ addiu $a2,$zero,0x400 /* 61e8: 27a70030 */ addiu $a3,$sp,0x30 -/* 61ec: 0c012d84 */ jal func0004b610 +/* 61ec: 0c012d84 */ jal __osContRamWrite /* 61f0: afa00010 */ sw $zero,0x10($sp) /* 61f4: 24010002 */ addiu $at,$zero,0x2 /* 61f8: 14410002 */ bne $v0,$at,.L00006204 @@ -94,7 +94,7 @@ glabel func00006100 .L00006214: /* 6214: 8fa50060 */ lw $a1,0x60($sp) /* 6218: 24060400 */ addiu $a2,$zero,0x400 -/* 621c: 0c012e18 */ jal func0004b860 +/* 621c: 0c012e18 */ jal __osContRamRead /* 6220: 27a70030 */ addiu $a3,$sp,0x30 /* 6224: 24010002 */ addiu $at,$zero,0x2 /* 6228: 14410002 */ bne $v0,$at,.L00006234 @@ -112,7 +112,7 @@ glabel func00006100 /* 6250: 10000030 */ beqz $zero,.L00006314 /* 6254: 2402000b */ addiu $v0,$zero,0xb .L00006258: -/* 6258: 0c012ea4 */ jal func0004ba90 +/* 6258: 0c012ea4 */ jal __osPfsGetStatus /* 625c: 8fa50060 */ lw $a1,0x60($sp) /* 6260: 10400003 */ beqz $v0,.L00006270 /* 6264: 3c048009 */ lui $a0,%hi(var80090ad0) @@ -122,7 +122,7 @@ glabel func00006100 /* 6270: 3c058009 */ lui $a1,%hi(var80090ae8) /* 6274: 24a50ae8 */ addiu $a1,$a1,%lo(var80090ae8) /* 6278: 24840ad0 */ addiu $a0,$a0,%lo(var80090ad0) -/* 627c: 0c0120d0 */ jal func00048340 +/* 627c: 0c0120d0 */ jal osCreateMesgQueue /* 6280: 24060001 */ addiu $a2,$zero,0x1 /* 6284: 3c198009 */ lui $t9,%hi(var80090ad0) /* 6288: 3c098009 */ lui $t1,%hi(var80090ae8) @@ -143,7 +143,7 @@ glabel func00006100 /* 62c4: 3c048009 */ lui $a0,%hi(var80090ad0) /* 62c8: 24840ad0 */ addiu $a0,$a0,%lo(var80090ad0) /* 62cc: 00002825 */ or $a1,$zero,$zero -/* 62d0: 0c0121bc */ jal func000486f0 +/* 62d0: 0c0121bc */ jal osRecvMesg /* 62d4: 24060001 */ addiu $a2,$zero,0x1 /* 62d8: 8fa4005c */ lw $a0,0x5c($sp) /* 62dc: 8fac0058 */ lw $t4,0x58($sp) diff --git a/src/lib/lib_06330.c b/src/lib/lib_06330.c index 5bcc02599..849da9c7a 100644 --- a/src/lib/lib_06330.c +++ b/src/lib/lib_06330.c @@ -29,7 +29,7 @@ glabel func00006330 /* 6360: 8e250008 */ lw $a1,0x8($s1) /* 6364: afa00010 */ sw $zero,0x10($sp) /* 6368: 24060580 */ addiu $a2,$zero,0x580 -/* 636c: 0c012d84 */ jal func0004b610 +/* 636c: 0c012d84 */ jal __osContRamWrite /* 6370: 27a70038 */ addiu $a3,$sp,0x38 /* 6374: 24010002 */ addiu $at,$zero,0x2 /* 6378: 14410011 */ bne $v0,$at,.L000063c0 @@ -44,7 +44,7 @@ glabel func00006330 /* 639c: 8e250008 */ lw $a1,0x8($s1) /* 63a0: afa00010 */ sw $zero,0x10($sp) /* 63a4: 24060580 */ addiu $a2,$zero,0x580 -/* 63a8: 0c012d84 */ jal func0004b610 +/* 63a8: 0c012d84 */ jal __osContRamWrite /* 63ac: 27a70038 */ addiu $a3,$sp,0x38 /* 63b0: 24010002 */ addiu $at,$zero,0x2 /* 63b4: 14410002 */ bne $v0,$at,.L000063c0 @@ -71,7 +71,7 @@ glabel func00006330 /* 6404: afa30058 */ sw $v1,0x58($sp) /* 6408: 02002025 */ or $a0,$s0,$zero /* 640c: 00002825 */ or $a1,$zero,$zero -/* 6410: 0c0121bc */ jal func000486f0 +/* 6410: 0c0121bc */ jal osRecvMesg /* 6414: 24060001 */ addiu $a2,$zero,0x1 /* 6418: 8fa30058 */ lw $v1,0x58($sp) .L0000641c: diff --git a/src/lib/lib_06440.c b/src/lib/lib_06440.c index d24dd907e..470d01890 100644 --- a/src/lib/lib_06440.c +++ b/src/lib/lib_06440.c @@ -63,7 +63,7 @@ glabel func00006440 /* 64f8: afb5001c */ sw $s5,0x1c($sp) /* 64fc: 02602025 */ or $a0,$s3,$zero /* 6500: 00002825 */ or $a1,$zero,$zero -/* 6504: 0c0121bc */ jal func000486f0 +/* 6504: 0c0121bc */ jal osRecvMesg /* 6508: 24060001 */ addiu $a2,$zero,0x1 /* 650c: 5e00ffe4 */ bgtzl $s0,.L000064a0 /* 6510: 02e02025 */ or $a0,$s7,$zero diff --git a/src/lib/lib_06550.c b/src/lib/lib_06550.c index fe0b9ede8..f8b66ca0f 100644 --- a/src/lib/lib_06550.c +++ b/src/lib/lib_06550.c @@ -114,7 +114,7 @@ glabel func00006550 /* 6694: 018d3021 */ addu $a2,$t4,$t5 /* 6698: 30ceffff */ andi $t6,$a2,0xffff /* 669c: 01c03025 */ or $a2,$t6,$zero -/* 66a0: 0c012e18 */ jal func0004b860 +/* 66a0: 0c012e18 */ jal __osContRamRead /* 66a4: 27a700a4 */ addiu $a3,$sp,0xa4 /* 66a8: 10400003 */ beqz $v0,.L000066b8 /* 66ac: 00402025 */ or $a0,$v0,$zero @@ -581,7 +581,7 @@ glabel func00006550 /* 6d08: 018e3021 */ addu $a2,$t4,$t6 /* 6d0c: 30d9ffff */ andi $t9,$a2,0xffff /* 6d10: 03203025 */ or $a2,$t9,$zero -/* 6d14: 0c012d84 */ jal func0004b610 +/* 6d14: 0c012d84 */ jal __osContRamWrite /* 6d18: afa00010 */ sw $zero,0x10($sp) /* 6d1c: 10400003 */ beqz $v0,.L00006d2c /* 6d20: 00402025 */ or $a0,$v0,$zero @@ -613,12 +613,12 @@ glabel func00006d60 /* 6d6c: 00a08025 */ or $s0,$a1,$zero /* 6d70: afa40070 */ sw $a0,0x70($sp) /* 6d74: afa60078 */ sw $a2,0x78($sp) -/* 6d78: 0c012a18 */ jal func0004a860 +/* 6d78: 0c012a18 */ jal __osSiGetAccess /* 6d7c: afa7007c */ sw $a3,0x7c($sp) /* 6d80: 8fa40070 */ lw $a0,0x70($sp) -/* 6d84: 0c012ea4 */ jal func0004ba90 +/* 6d84: 0c012ea4 */ jal __osPfsGetStatus /* 6d88: 8fa50078 */ lw $a1,0x78($sp) -/* 6d8c: 0c012a29 */ jal func0004a8a4 +/* 6d8c: 0c012a29 */ jal __osSiRelAccess /* 6d90: afa2006c */ sw $v0,0x6c($sp) /* 6d94: 8fa3006c */ lw $v1,0x6c($sp) /* 6d98: 8fae0070 */ lw $t6,0x70($sp) @@ -647,7 +647,7 @@ glabel func00006d60 .L00006dec: /* 6dec: 8e040004 */ lw $a0,0x4($s0) /* 6df0: 8e050008 */ lw $a1,0x8($s0) -/* 6df4: 0c012e18 */ jal func0004b860 +/* 6df4: 0c012e18 */ jal __osContRamRead /* 6df8: 27a70048 */ addiu $a3,$sp,0x48 /* 6dfc: 10400003 */ beqz $v0,.L00006e0c /* 6e00: 27a40048 */ addiu $a0,$sp,0x48 @@ -731,7 +731,7 @@ glabel func00006d60 /* 6f20: ae180060 */ sw $t8,0x60($s0) /* 6f24: ae080058 */ sw $t0,0x58($s0) /* 6f28: ae0a005c */ sw $t2,0x5c($s0) -/* 6f2c: 0c012e18 */ jal func0004b860 +/* 6f2c: 0c012e18 */ jal __osContRamRead /* 6f30: a20e0064 */ sb $t6,0x64($s0) /* 6f34: 10400003 */ beqz $v0,.L00006f44 /* 6f38: 00000000 */ sll $zero,$zero,0x0 @@ -778,7 +778,7 @@ glabel func00006f98 .L00006fc0: /* 6fc0: 8e040004 */ lw $a0,0x4($s0) /* 6fc4: 8e050008 */ lw $a1,0x8($s0) -/* 6fc8: 0c012e18 */ jal func0004b860 +/* 6fc8: 0c012e18 */ jal __osContRamRead /* 6fcc: 27a70030 */ addiu $a3,$sp,0x30 /* 6fd0: 10400003 */ beqz $v0,.L00006fe0 /* 6fd4: 27a30070 */ addiu $v1,$sp,0x70 @@ -796,7 +796,7 @@ glabel func00006f98 /* 6ffc: 8e050008 */ lw $a1,0x8($s0) /* 7000: afa00010 */ sw $zero,0x10($sp) /* 7004: 00003025 */ or $a2,$zero,$zero -/* 7008: 0c012d84 */ jal func0004b610 +/* 7008: 0c012d84 */ jal __osContRamWrite /* 700c: 27a70070 */ addiu $a3,$sp,0x70 /* 7010: 10400003 */ beqz $v0,.L00007020 /* 7014: 00003025 */ or $a2,$zero,$zero @@ -805,7 +805,7 @@ glabel func00006f98 .L00007020: /* 7020: 8e040004 */ lw $a0,0x4($s0) /* 7024: 8e050008 */ lw $a1,0x8($s0) -/* 7028: 0c012e18 */ jal func0004b860 +/* 7028: 0c012e18 */ jal __osContRamRead /* 702c: 27a70050 */ addiu $a3,$sp,0x50 /* 7030: 10400003 */ beqz $v0,.L00007040 /* 7034: 27a40070 */ addiu $a0,$sp,0x70 @@ -823,7 +823,7 @@ glabel func00006f98 /* 705c: 8e040004 */ lw $a0,0x4($s0) /* 7060: 8e050008 */ lw $a1,0x8($s0) /* 7064: afa00010 */ sw $zero,0x10($sp) -/* 7068: 0c012d84 */ jal func0004b610 +/* 7068: 0c012d84 */ jal __osContRamWrite /* 706c: 27a70030 */ addiu $a3,$sp,0x30 .L00007070: /* 7070: 8fbf0024 */ lw $ra,0x24($sp) @@ -843,7 +843,7 @@ glabel func00007084 /* 7094: 8dc50008 */ lw $a1,0x8($t6) /* 7098: 8c840004 */ lw $a0,0x4($a0) /* 709c: 27a70018 */ addiu $a3,$sp,0x18 -/* 70a0: 0c012e18 */ jal func0004b860 +/* 70a0: 0c012e18 */ jal __osContRamRead /* 70a4: 24060001 */ addiu $a2,$zero,0x1 /* 70a8: 10400003 */ beqz $v0,.L000070b8 /* 70ac: 8fbf0014 */ lw $ra,0x14($sp) diff --git a/src/lib/lib_070d0.c b/src/lib/lib_070d0.c index 59171f6a7..5865c5fc0 100644 --- a/src/lib/lib_070d0.c +++ b/src/lib/lib_070d0.c @@ -29,7 +29,7 @@ glabel func000070d0 /* 70fc: afb10020 */ sw $s1,0x20($sp) /* 7100: 0c00222c */ jal func000088b0 /* 7104: a030ae28 */ sb $s0,-0x51d8($at) -/* 7108: 0c0005b0 */ jal func000016c0 +/* 7108: 0c0005b0 */ jal osGetMemSize /* 710c: 00000000 */ sll $zero,$zero,0x0 /* 7110: 3c010040 */ lui $at,0x40 /* 7114: 34210001 */ ori $at,$at,0x1 @@ -252,10 +252,10 @@ glabel func000070d0 /* 7444: 3c150001 */ lui $s5,0x1 /* 7448: 3c140002 */ lui $s4,0x2 .L0000744c: -/* 744c: 0c012d20 */ jal func0004b480 +/* 744c: 0c012d20 */ jal osVirtualToPhysical /* 7450: 02602025 */ or $a0,$s3,$zero /* 7454: 00409025 */ or $s2,$v0,$zero -/* 7458: 0c012d20 */ jal func0004b480 +/* 7458: 0c012d20 */ jal osVirtualToPhysical /* 745c: 02752021 */ addu $a0,$s3,$s5 /* 7460: 240dffff */ addiu $t5,$zero,-1 /* 7464: afad0014 */ sw $t5,0x14($sp) @@ -263,7 +263,7 @@ glabel func000070d0 /* 746c: 02c02825 */ or $a1,$s6,$zero /* 7470: 02203025 */ or $a2,$s1,$zero /* 7474: 02403825 */ or $a3,$s2,$zero -/* 7478: 0c01386c */ jal func0004e1b0 +/* 7478: 0c01386c */ jal osMapTLB /* 747c: afa20010 */ sw $v0,0x10($sp) /* 7480: 02749821 */ addu $s3,$s3,$s4 /* 7484: 02f3082b */ sltu $at,$s7,$s3 diff --git a/src/lib/lib_08a20.c b/src/lib/lib_08a20.c index 653cf03ee..c520c9b2f 100644 --- a/src/lib/lib_08a20.c +++ b/src/lib/lib_08a20.c @@ -119,13 +119,13 @@ glabel func00008a48 /* 8b6c: 3c058009 */ lui $a1,%hi(var80091860) /* 8b70: 24a51860 */ addiu $a1,$a1,%lo(var80091860) /* 8b74: 24841848 */ addiu $a0,$a0,%lo(var80091848) -/* 8b78: 0c0120d0 */ jal func00048340 +/* 8b78: 0c0120d0 */ jal osCreateMesgQueue /* 8b7c: 24060008 */ addiu $a2,$zero,0x8 /* 8b80: 3c048009 */ lui $a0,%hi(var80091810) /* 8b84: 3c058009 */ lui $a1,%hi(var80091828) /* 8b88: 24a51828 */ addiu $a1,$a1,%lo(var80091828) /* 8b8c: 24841810 */ addiu $a0,$a0,%lo(var80091810) -/* 8b90: 0c0120d0 */ jal func00048340 +/* 8b90: 0c0120d0 */ jal osCreateMesgQueue /* 8b94: 24060008 */ addiu $a2,$zero,0x8 /* 8b98: 92af0000 */ lbu $t7,0x0($s5) /* 8b9c: 3c128009 */ lui $s2,%hi(var800918ec) @@ -498,7 +498,7 @@ glabel func000090ec /* 90ec: 27bdffe8 */ addiu $sp,$sp,-24 /* 90f0: afbf0014 */ sw $ra,0x14($sp) /* 90f4: 3c048009 */ lui $a0,%hi(var800915e0) -/* 90f8: 0c01207c */ jal func000481f0 +/* 90f8: 0c01207c */ jal osStartThread /* 90fc: 248415e0 */ addiu $a0,$a0,%lo(var800915e0) /* 9100: 8fbf0014 */ lw $ra,0x14($sp) /* 9104: 240e0001 */ addiu $t6,$zero,0x1 @@ -573,7 +573,7 @@ glabel func00009124 /* 91f0: 3c048009 */ lui $a0,%hi(var80091810) /* 91f4: 24841810 */ addiu $a0,$a0,%lo(var80091810) /* 91f8: 02c02825 */ or $a1,$s6,$zero -/* 91fc: 0c0121bc */ jal func000486f0 +/* 91fc: 0c0121bc */ jal osRecvMesg /* 9200: 24060001 */ addiu $a2,$zero,0x1 /* 9204: 8faf0064 */ lw $t7,0x64($sp) /* 9208: 85e70000 */ lh $a3,0x0($t7) @@ -697,7 +697,7 @@ glabel func00009124 /* 93cc: 24841848 */ addiu $a0,$a0,%lo(var80091848) /* 93d0: 17000003 */ bnez $t8,.L000093e0 /* 93d4: 27a50060 */ addiu $a1,$sp,0x60 -/* 93d8: 0c0121bc */ jal func000486f0 +/* 93d8: 0c0121bc */ jal osRecvMesg /* 93dc: 24060001 */ addiu $a2,$zero,0x1 .L000093e0: /* 93e0: 3c018006 */ lui $at,0x8006 @@ -760,7 +760,7 @@ glabel func00009448 /* 94a8: 000fc082 */ srl $t8,$t7,0x2 /* 94ac: afb8002c */ sw $t8,0x2c($sp) /* 94b0: afa90024 */ sw $t1,0x24($sp) -/* 94b4: 0c012d20 */ jal func0004b480 +/* 94b4: 0c012d20 */ jal osVirtualToPhysical /* 94b8: 8e040000 */ lw $a0,0x0($s0) /* 94bc: 8fa30034 */ lw $v1,0x34($sp) /* 94c0: 00403025 */ or $a2,$v0,$zero diff --git a/src/lib/lib_09660.c b/src/lib/lib_09660.c index 6e54d6633..35d95ae85 100644 --- a/src/lib/lib_09660.c +++ b/src/lib/lib_09660.c @@ -42,7 +42,7 @@ glabel func00009660 /* 966c: 3c058009 */ lui $a1,%hi(var800926e8) /* 9670: 24a526e8 */ addiu $a1,$a1,%lo(var800926e8) /* 9674: 248426d0 */ addiu $a0,$a0,%lo(var800926d0) -/* 9678: 0c0120d0 */ jal func00048340 +/* 9678: 0c0120d0 */ jal osCreateMesgQueue /* 967c: 24060050 */ addiu $a2,$zero,0x50 /* 9680: 8fbf0014 */ lw $ra,0x14($sp) /* 9684: 27bd0018 */ addiu $sp,$sp,0x18 @@ -74,7 +74,7 @@ glabel func00009660 /* 96e8: 8def2828 */ lw $t7,0x2828($t7) /* 96ec: 0307c821 */ addu $t9,$t8,$a3 /* 96f0: 03222023 */ subu $a0,$t9,$v0 -/* 96f4: 0c012d20 */ jal func0004b480 +/* 96f4: 0c012d20 */ jal osVirtualToPhysical /* 96f8: accf000c */ sw $t7,0xc($a2) /* 96fc: 1000004d */ beqz $zero,.L00009834 /* 9700: 8fbf002c */ lw $ra,0x2c($sp) @@ -86,7 +86,7 @@ glabel func00009660 /* 9710: 8d060008 */ lw $a2,0x8($t0) /* 9714: 14c00005 */ bnez $a2,.L0000972c /* 9718: 00c02025 */ or $a0,$a2,$zero -/* 971c: 0c012d20 */ jal func0004b480 +/* 971c: 0c012d20 */ jal osVirtualToPhysical /* 9720: 02202025 */ or $a0,$s1,$zero /* 9724: 10000043 */ beqz $zero,.L00009834 /* 9728: 8fbf002c */ lw $ra,0x2c($sp) @@ -133,7 +133,7 @@ glabel func00009660 /* 97bc: acca000c */ sw $t2,0xc($a2) /* 97c0: afa70040 */ sw $a3,0x40($sp) /* 97c4: 00e12025 */ or $a0,$a3,$at -/* 97c8: 0c013920 */ jal func0004e480 +/* 97c8: 0c013920 */ jal osInvalDCache /* 97cc: 24050400 */ addiu $a1,$zero,0x400 /* 97d0: 3c038006 */ lui $v1,%hi(var8005d520) /* 97d4: 2463d520 */ addiu $v1,$v1,%lo(var8005d520) @@ -156,7 +156,7 @@ glabel func00009660 /* 9818: 00003025 */ or $a2,$zero,$zero /* 981c: 0c01394c */ jal func0004e530 /* 9820: afb00010 */ sw $s0,0x10($sp) -/* 9824: 0c012d20 */ jal func0004b480 +/* 9824: 0c012d20 */ jal osVirtualToPhysical /* 9828: 02002025 */ or $a0,$s0,$zero /* 982c: 00511021 */ addu $v0,$v0,$s1 /* 9830: 8fbf002c */ lw $ra,0x2c($sp) @@ -312,7 +312,7 @@ glabel func00009a08 /* 9a3c: 02202025 */ or $a0,$s1,$zero .L00009a40: /* 9a40: 00002825 */ or $a1,$zero,$zero -/* 9a44: 0c0121bc */ jal func000486f0 +/* 9a44: 0c0121bc */ jal osRecvMesg /* 9a48: 00003025 */ or $a2,$zero,$zero /* 9a4c: 8e6f0000 */ lw $t7,0x0($s3) /* 9a50: 26100001 */ addiu $s0,$s0,0x1 diff --git a/src/lib/lib_0c000.c b/src/lib/lib_0c000.c index 9b4aa56da..3e249c870 100644 --- a/src/lib/lib_0c000.c +++ b/src/lib/lib_0c000.c @@ -67,7 +67,7 @@ glabel func0000c000 /* c00c: 3c058009 */ lui $a1,%hi(var80094ac8) /* c010: 24a54ac8 */ addiu $a1,$a1,%lo(var80094ac8) /* c014: 24844ab0 */ addiu $a0,$a0,%lo(var80094ab0) -/* c018: 0c0120d0 */ jal func00048340 +/* c018: 0c0120d0 */ jal osCreateMesgQueue /* c01c: 24060001 */ addiu $a2,$zero,0x1 /* c020: 3c0e8009 */ lui $t6,%hi(var80092eb0) /* c024: 25ce2eb0 */ addiu $t6,$t6,%lo(var80092eb0) @@ -82,7 +82,7 @@ glabel func0000c000 /* c048: 0c000fb8 */ jal func00003ee0 /* c04c: 00003825 */ or $a3,$zero,$zero /* c050: 3c048009 */ lui $a0,%hi(var80092880) -/* c054: 0c01207c */ jal func000481f0 +/* c054: 0c01207c */ jal osStartThread /* c058: 24842880 */ addiu $a0,$a0,%lo(var80092880) /* c05c: 8fbf001c */ lw $ra,0x1c($sp) /* c060: 27bd0020 */ addiu $sp,$sp,0x20 @@ -108,7 +108,7 @@ glabel func0000c000 /* c0ac: 02202025 */ or $a0,$s1,$zero .L0000c0b0: /* c0b0: 02402825 */ or $a1,$s2,$zero -/* c0b4: 0c0121bc */ jal func000486f0 +/* c0b4: 0c0121bc */ jal osRecvMesg /* c0b8: 24060001 */ addiu $a2,$zero,0x1 /* c0bc: 0c012194 */ jal func00048650 /* c0c0: 24040001 */ addiu $a0,$zero,0x1 diff --git a/src/lib/lib_0d0a0.c b/src/lib/lib_0d0a0.c index 583157869..6a2118f3b 100644 --- a/src/lib/lib_0d0a0.c +++ b/src/lib/lib_0d0a0.c @@ -31,7 +31,7 @@ glabel func0000d0a0 /* d0d4: adc00000 */ sw $zero,0x0($t6) /* d0d8: 24a54e08 */ addiu $a1,$a1,%lo(var80094e08) /* d0dc: 24844e88 */ addiu $a0,$a0,%lo(var80094e88) -/* d0e0: 0c0120d0 */ jal func00048340 +/* d0e0: 0c0120d0 */ jal osCreateMesgQueue /* d0e4: 24060020 */ addiu $a2,$zero,0x20 /* d0e8: 8fbf0014 */ lw $ra,0x14($sp) /* d0ec: 27bd0018 */ addiu $sp,$sp,0x18 @@ -75,7 +75,7 @@ glabel func0000d0f8 /* d16c: 0000f025 */ or $s8,$zero,$zero /* d170: afb00050 */ sw $s0,0x50($sp) .L0000d174: -/* d174: 0c013920 */ jal func0004e480 +/* d174: 0c013920 */ jal osInvalDCache /* d178: 02002825 */ or $a1,$s0,$zero /* d17c: 13c0001b */ beqz $s8,.L0000d1ec /* d180: 00009025 */ or $s2,$zero,$zero @@ -238,7 +238,7 @@ glabel func0000d350 .L0000d39c: /* d39c: 02802825 */ or $a1,$s4,$zero /* d3a0: 24060001 */ addiu $a2,$zero,0x1 -/* d3a4: 0c0121bc */ jal func000486f0 +/* d3a4: 0c0121bc */ jal osRecvMesg /* d3a8: 00008025 */ or $s0,$zero,$zero /* d3ac: 3c028009 */ lui $v0,%hi(var80094ae8) /* d3b0: 24424ae8 */ addiu $v0,$v0,%lo(var80094ae8) diff --git a/src/lib/lib_0d520.c b/src/lib/lib_0d520.c index 01498f8ea..afa67ab4f 100644 --- a/src/lib/lib_0d520.c +++ b/src/lib/lib_0d520.c @@ -205,7 +205,7 @@ glabel func0000d520 /* d578: ac22d9b0 */ sw $v0,-0x2650($at) /* d57c: 27a41490 */ addiu $a0,$sp,0x1490 /* d580: 27a514cc */ addiu $a1,$sp,0x14cc -/* d584: 0c0120d0 */ jal func00048340 +/* d584: 0c0120d0 */ jal osCreateMesgQueue /* d588: 24060001 */ addiu $a2,$zero,0x1 /* d58c: 00008025 */ or $s0,$zero,$zero /* d590: 3c070047 */ lui $a3,0x47 @@ -224,7 +224,7 @@ glabel func0000d520 /* d5c0: 24060000 */ addiu $a2,$zero,0x0 /* d5c4: 27a41490 */ addiu $a0,$sp,0x1490 /* d5c8: 27a514cc */ addiu $a1,$sp,0x14cc -/* d5cc: 0c0121bc */ jal func000486f0 +/* d5cc: 0c0121bc */ jal osRecvMesg /* d5d0: 24060001 */ addiu $a2,$zero,0x1 /* d5d4: 24010001 */ addiu $at,$zero,0x1 /* d5d8: 56010006 */ bnel $s0,$at,.L0000d5f4 @@ -298,7 +298,7 @@ glabel func0000d520 /* d6d4: 8dd9001c */ lw $t9,0x1c($t6) /* d6d8: 8dc10018 */ lw $at,0x18($t6) /* d6dc: adb9001c */ sw $t9,0x1c($t5) -/* d6e0: 0c0005b0 */ jal func000016c0 +/* d6e0: 0c0005b0 */ jal osGetMemSize /* d6e4: ada10018 */ sw $at,0x18($t5) /* d6e8: 3c010040 */ lui $at,0x40 /* d6ec: 34210001 */ ori $at,$at,0x1 @@ -415,14 +415,14 @@ glabel func0000d520 /* d888: ac2ef040 */ sw $t6,-0xfc0($at) /* d88c: 2484db30 */ addiu $a0,$a0,%lo(var8008db30) /* d890: 27a51470 */ addiu $a1,$sp,0x1470 -/* d894: 0c0121bc */ jal func000486f0 +/* d894: 0c0121bc */ jal osRecvMesg /* d898: 00003025 */ or $a2,$zero,$zero /* d89c: 14400007 */ bnez $v0,.L0000d8bc .L0000d8a0: /* d8a0: 3c048009 */ lui $a0,%hi(var8008db30) /* d8a4: 2484db30 */ addiu $a0,$a0,%lo(var8008db30) /* d8a8: 27a51470 */ addiu $a1,$sp,0x1470 -/* d8ac: 0c0121bc */ jal func000486f0 +/* d8ac: 0c0121bc */ jal osRecvMesg /* d8b0: 00003025 */ or $a2,$zero,$zero /* d8b4: 1040fffa */ beqz $v0,.L0000d8a0 /* d8b8: 00000000 */ sll $zero,$zero,0x0 @@ -433,7 +433,7 @@ glabel func0000d520 /* d8c4: 2484db30 */ addiu $a0,$a0,%lo(var8008db30) /* d8c8: 27a51470 */ addiu $a1,$sp,0x1470 /* d8cc: 24060001 */ addiu $a2,$zero,0x1 -/* d8d0: 0c0121bc */ jal func000486f0 +/* d8d0: 0c0121bc */ jal osRecvMesg /* d8d4: afa31488 */ sw $v1,0x1488($sp) /* d8d8: 8fb91470 */ lw $t9,0x1470($sp) /* d8dc: 24010001 */ addiu $at,$zero,0x1 @@ -483,7 +483,7 @@ glabel func0000d520 /* d980: 24843aa0 */ addiu $a0,$a0,%lo(var70053aa0) .L0000d984: /* d984: 3c04800b */ lui $a0,%hi(var800ad1c0) -/* d988: 0c012d20 */ jal func0004b480 +/* d988: 0c012d20 */ jal osVirtualToPhysical /* d98c: 2484d1c0 */ addiu $a0,$a0,%lo(var800ad1c0) /* d990: 3c038009 */ lui $v1,0x8009 /* d994: 8c630b00 */ lw $v1,0xb00($v1) @@ -1058,13 +1058,13 @@ glabel func0000db3c /* e1b0: 00000000 */ sll $zero,$zero,0x0 /* e1b4: 02602025 */ or $a0,$s3,$zero /* e1b8: 02802825 */ or $a1,$s4,$zero -/* e1bc: 0c0121bc */ jal func000486f0 +/* e1bc: 0c0121bc */ jal osRecvMesg /* e1c0: 00003025 */ or $a2,$zero,$zero /* e1c4: 10550006 */ beq $v0,$s5,.L0000e1e0 /* e1c8: 02602025 */ or $a0,$s3,$zero .L0000e1cc: /* e1cc: 02802825 */ or $a1,$s4,$zero -/* e1d0: 0c0121bc */ jal func000486f0 +/* e1d0: 0c0121bc */ jal osRecvMesg /* e1d4: 00003025 */ or $a2,$zero,$zero /* e1d8: 5455fffc */ bnel $v0,$s5,.L0000e1cc /* e1dc: 02602025 */ or $a0,$s3,$zero @@ -1077,7 +1077,7 @@ glabel func0000db3c /* e1f4: 02602025 */ or $a0,$s3,$zero .L0000e1f8: /* e1f8: 02802825 */ or $a1,$s4,$zero -/* e1fc: 0c0121bc */ jal func000486f0 +/* e1fc: 0c0121bc */ jal osRecvMesg /* e200: 02c03025 */ or $a2,$s6,$zero /* e204: 8fad0060 */ lw $t5,0x60($sp) /* e208: 85a30000 */ lh $v1,0x0($t5) diff --git a/src/lib/lib_121e0.c b/src/lib/lib_121e0.c index ced0d3bb5..e9a9abda6 100644 --- a/src/lib/lib_121e0.c +++ b/src/lib/lib_121e0.c @@ -46,11 +46,11 @@ glabel func000121e8 /* 12250: ac460078 */ sw $a2,0x78($v0) /* 12254: ac430080 */ sw $v1,0x80($v0) /* 12258: ac460050 */ sw $a2,0x50($v0) -/* 1225c: 0c0005b0 */ jal func000016c0 +/* 1225c: 0c0005b0 */ jal osGetMemSize /* 12260: ac430058 */ sw $v1,0x58($v0) /* 12264: 3c018000 */ lui $at,0x8000 /* 12268: 00417021 */ addu $t6,$v0,$at -/* 1226c: 0c0005b0 */ jal func000016c0 +/* 1226c: 0c0005b0 */ jal osGetMemSize /* 12270: afae0018 */ sw $t6,0x18($sp) /* 12274: 3c010040 */ lui $at,0x40 /* 12278: 34210001 */ ori $at,$at,0x1 diff --git a/src/lib/lib_13750.c b/src/lib/lib_13750.c index b0fe18105..cef29d1ef 100644 --- a/src/lib/lib_13750.c +++ b/src/lib/lib_13750.c @@ -16,5 +16,5 @@ void func00013750(void) void func00013758(void) { - func00048340(&var80099a40, &var80099a20, 8); + osCreateMesgQueue(&var80099a40, &var80099a20, 8); } diff --git a/src/lib/lib_13900.c b/src/lib/lib_13900.c index 1a37ccdc8..5e629a277 100644 --- a/src/lib/lib_13900.c +++ b/src/lib/lib_13900.c @@ -332,31 +332,31 @@ glabel func00013c94 /* 13ca0: 3c05800a */ lui $a1,%hi(var80099eb8) /* 13ca4: 24a59eb8 */ addiu $a1,$a1,%lo(var80099eb8) /* 13ca8: 24849ec0 */ addiu $a0,$a0,%lo(var80099ec0) -/* 13cac: 0c0120d0 */ jal func00048340 +/* 13cac: 0c0120d0 */ jal osCreateMesgQueue /* 13cb0: 24060001 */ addiu $a2,$zero,0x1 /* 13cb4: 3c04800a */ lui $a0,%hi(var80099ee0) /* 13cb8: 3c05800a */ lui $a1,%hi(var80099ed8) /* 13cbc: 24a59ed8 */ addiu $a1,$a1,%lo(var80099ed8) /* 13cc0: 24849ee0 */ addiu $a0,$a0,%lo(var80099ee0) -/* 13cc4: 0c0120d0 */ jal func00048340 +/* 13cc4: 0c0120d0 */ jal osCreateMesgQueue /* 13cc8: 24060001 */ addiu $a2,$zero,0x1 /* 13ccc: 3c04800a */ lui $a0,%hi(var80099f00) /* 13cd0: 3c05800a */ lui $a1,%hi(var80099ef8) /* 13cd4: 24a59ef8 */ addiu $a1,$a1,%lo(var80099ef8) /* 13cd8: 24849f00 */ addiu $a0,$a0,%lo(var80099f00) -/* 13cdc: 0c0120d0 */ jal func00048340 +/* 13cdc: 0c0120d0 */ jal osCreateMesgQueue /* 13ce0: 24060001 */ addiu $a2,$zero,0x1 /* 13ce4: 3c04800a */ lui $a0,%hi(var80099f20) /* 13ce8: 3c05800a */ lui $a1,%hi(var80099f18) /* 13cec: 24a59f18 */ addiu $a1,$a1,%lo(var80099f18) /* 13cf0: 24849f20 */ addiu $a0,$a0,%lo(var80099f20) -/* 13cf4: 0c0120d0 */ jal func00048340 +/* 13cf4: 0c0120d0 */ jal osCreateMesgQueue /* 13cf8: 24060001 */ addiu $a2,$zero,0x1 /* 13cfc: 3c04800a */ lui $a0,%hi(var80099e78) /* 13d00: 3c05800a */ lui $a1,%hi(var80099e90) /* 13d04: 24a59e90 */ addiu $a1,$a1,%lo(var80099e90) /* 13d08: 24849e78 */ addiu $a0,$a0,%lo(var80099e78) -/* 13d0c: 0c0120d0 */ jal func00048340 +/* 13d0c: 0c0120d0 */ jal osCreateMesgQueue /* 13d10: 2406000a */ addiu $a2,$zero,0xa /* 13d14: 3c05800a */ lui $a1,%hi(var80099e78) /* 13d18: 24a59e78 */ addiu $a1,$a1,%lo(var80099e78) @@ -436,24 +436,24 @@ glabel func00013dfc /* 13e10: 3c04800a */ lui $a0,%hi(var80099ec0) /* 13e14: 24849ec0 */ addiu $a0,$a0,%lo(var80099ec0) /* 13e18: 27a5001c */ addiu $a1,$sp,0x1c -/* 13e1c: 0c012238 */ jal func000488e0 +/* 13e1c: 0c012238 */ jal osSendMesg /* 13e20: 00003025 */ or $a2,$zero,$zero /* 13e24: 3c04800a */ lui $a0,%hi(var80099ee0) /* 13e28: 24849ee0 */ addiu $a0,$a0,%lo(var80099ee0) /* 13e2c: 27a5001c */ addiu $a1,$sp,0x1c -/* 13e30: 0c0121bc */ jal func000486f0 +/* 13e30: 0c0121bc */ jal osRecvMesg /* 13e34: 24060001 */ addiu $a2,$zero,0x1 /* 13e38: 0c004fa1 */ jal func00013e84 /* 13e3c: 00000000 */ sll $zero,$zero,0x0 /* 13e40: 3c04800a */ lui $a0,%hi(var80099f00) /* 13e44: 24849f00 */ addiu $a0,$a0,%lo(var80099f00) /* 13e48: 27a5001c */ addiu $a1,$sp,0x1c -/* 13e4c: 0c012238 */ jal func000488e0 +/* 13e4c: 0c012238 */ jal osSendMesg /* 13e50: 00003025 */ or $a2,$zero,$zero /* 13e54: 3c04800a */ lui $a0,%hi(var80099f20) /* 13e58: 24849f20 */ addiu $a0,$a0,%lo(var80099f20) /* 13e5c: 27a5001c */ addiu $a1,$sp,0x1c -/* 13e60: 0c0121bc */ jal func000486f0 +/* 13e60: 0c0121bc */ jal osRecvMesg /* 13e64: 24060001 */ addiu $a2,$zero,0x1 /* 13e68: 240f0001 */ addiu $t7,$zero,0x1 /* 13e6c: 3c018006 */ lui $at,0x8006 @@ -507,7 +507,7 @@ glabel func00013e84 /* 13f10: 02202025 */ or $a0,$s1,$zero /* 13f14: 02202025 */ or $a0,$s1,$zero /* 13f18: 00002825 */ or $a1,$zero,$zero -/* 13f1c: 0c0121bc */ jal func000486f0 +/* 13f1c: 0c0121bc */ jal osRecvMesg /* 13f20: 24060001 */ addiu $a2,$zero,0x1 /* 13f24: 3c04800a */ lui $a0,%hi(var80099f38) /* 13f28: 0c013cf5 */ jal func0004f3d4 @@ -867,7 +867,7 @@ GLOBAL_ASM( glabel func000143e8 /* 143e8: 27bdffe8 */ addiu $sp,$sp,-24 /* 143ec: afbf0014 */ sw $ra,0x14($sp) -/* 143f0: 0c013d00 */ jal func0004f400 +/* 143f0: 0c013d00 */ jal osContStartReadData /* 143f4: 00000000 */ sll $zero,$zero,0x0 /* 143f8: 8fbf0014 */ lw $ra,0x14($sp) /* 143fc: 27bd0018 */ addiu $sp,$sp,0x18 @@ -895,7 +895,7 @@ glabel func00014408 /* 14440: 0302c023 */ subu $t8,$t8,$v0 /* 14444: 0018c0c0 */ sll $t8,$t8,0x3 /* 14448: 00782021 */ addu $a0,$v1,$t8 -/* 1444c: 0c013d21 */ jal func0004f484 +/* 1444c: 0c013d21 */ jal osContGetReadData /* 14450: afa2001c */ sw $v0,0x1c($sp) /* 14454: 8fa2001c */ lw $v0,0x1c($sp) /* 14458: 24010014 */ addiu $at,$zero,0x14 @@ -918,7 +918,7 @@ glabel func00014484 /* 1448c: 3c04800a */ lui $a0,%hi(var80099ec0) /* 14490: 24849ec0 */ addiu $a0,$a0,%lo(var80099ec0) /* 14494: 27a50034 */ addiu $a1,$sp,0x34 -/* 14498: 0c0121bc */ jal func000486f0 +/* 14498: 0c0121bc */ jal osRecvMesg /* 1449c: 00003025 */ or $a2,$zero,$zero /* 144a0: 14400049 */ bnez $v0,.L000145c8 /* 144a4: 3c04800a */ lui $a0,%hi(var80099f00) @@ -928,7 +928,7 @@ glabel func00014484 /* 144b4: 24849e78 */ addiu $a0,$a0,%lo(var80099e78) /* 144b8: 11c00035 */ beqz $t6,.L00014590 /* 144bc: 27a50034 */ addiu $a1,$sp,0x34 -/* 144c0: 0c0121bc */ jal func000486f0 +/* 144c0: 0c0121bc */ jal osRecvMesg /* 144c4: 24060001 */ addiu $a2,$zero,0x1 /* 144c8: 3c018006 */ lui $at,0x8006 /* 144cc: 0c005102 */ jal func00014408 @@ -989,7 +989,7 @@ glabel func00014484 /* 14590: 3c04800a */ lui $a0,%hi(var80099ee0) /* 14594: 24849ee0 */ addiu $a0,$a0,%lo(var80099ee0) /* 14598: 27a50034 */ addiu $a1,$sp,0x34 -/* 1459c: 0c012238 */ jal func000488e0 +/* 1459c: 0c012238 */ jal osSendMesg /* 145a0: 00003025 */ or $a2,$zero,$zero /* 145a4: 3c038006 */ lui $v1,%hi(var8005ee68) /* 145a8: 2463ee68 */ addiu $v1,$v1,%lo(var8005ee68) @@ -1003,7 +1003,7 @@ glabel func00014484 .L000145c8: /* 145c8: 24849f00 */ addiu $a0,$a0,%lo(var80099f00) /* 145cc: 27a50034 */ addiu $a1,$sp,0x34 -/* 145d0: 0c0121bc */ jal func000486f0 +/* 145d0: 0c0121bc */ jal osRecvMesg /* 145d4: 00003025 */ or $a2,$zero,$zero /* 145d8: 14400014 */ bnez $v0,.L0001462c /* 145dc: 3c198006 */ lui $t9,0x8006 @@ -1023,7 +1023,7 @@ glabel func00014484 /* 14610: 3c04800a */ lui $a0,%hi(var80099f20) /* 14614: 24849f20 */ addiu $a0,$a0,%lo(var80099f20) /* 14618: 27a50034 */ addiu $a1,$sp,0x34 -/* 1461c: 0c012238 */ jal func000488e0 +/* 1461c: 0c012238 */ jal osSendMesg /* 14620: 00003025 */ or $a2,$zero,$zero /* 14624: 10000077 */ beqz $zero,.L00014804 /* 14628: 8fbf0014 */ lw $ra,0x14($sp) @@ -1043,7 +1043,7 @@ glabel func00014484 /* 1465c: 10000069 */ beqz $zero,.L00014804 /* 14660: 8fbf0014 */ lw $ra,0x14($sp) .L00014664: -/* 14664: 0c0121bc */ jal func000486f0 +/* 14664: 0c0121bc */ jal osRecvMesg /* 14668: 00003025 */ or $a2,$zero,$zero /* 1466c: 14400064 */ bnez $v0,.L00014800 /* 14670: 3c018006 */ lui $at,0x8006 @@ -1826,12 +1826,12 @@ glabel func000150e8 /* 150fc: 3c04800a */ lui $a0,%hi(var80099ec0) /* 15100: 24849ec0 */ addiu $a0,$a0,%lo(var80099ec0) /* 15104: 27a5001c */ addiu $a1,$sp,0x1c -/* 15108: 0c012238 */ jal func000488e0 +/* 15108: 0c012238 */ jal osSendMesg /* 1510c: 00003025 */ or $a2,$zero,$zero /* 15110: 3c04800a */ lui $a0,%hi(var80099ee0) /* 15114: 24849ee0 */ addiu $a0,$a0,%lo(var80099ee0) /* 15118: 27a5001c */ addiu $a1,$sp,0x1c -/* 1511c: 0c0121bc */ jal func000486f0 +/* 1511c: 0c0121bc */ jal osRecvMesg /* 15120: 24060001 */ addiu $a2,$zero,0x1 /* 15124: 3c028006 */ lui $v0,0x8006 /* 15128: 8c42eebc */ lw $v0,-0x1144($v0) @@ -1857,12 +1857,12 @@ glabel func00015144 /* 15164: 3c04800a */ lui $a0,%hi(var80099f00) /* 15168: 24849f00 */ addiu $a0,$a0,%lo(var80099f00) /* 1516c: 27a5001c */ addiu $a1,$sp,0x1c -/* 15170: 0c012238 */ jal func000488e0 +/* 15170: 0c012238 */ jal osSendMesg /* 15174: 00003025 */ or $a2,$zero,$zero /* 15178: 3c04800a */ lui $a0,%hi(var80099f20) /* 1517c: 24849f20 */ addiu $a0,$a0,%lo(var80099f20) /* 15180: 27a5001c */ addiu $a1,$sp,0x1c -/* 15184: 0c0121bc */ jal func000486f0 +/* 15184: 0c0121bc */ jal osRecvMesg /* 15188: 24060001 */ addiu $a2,$zero,0x1 .L0001518c: /* 1518c: 8fbf0014 */ lw $ra,0x14($sp) @@ -1885,7 +1885,7 @@ glabel func0001519c /* 151c0: afb00018 */ sw $s0,0x18($sp) /* 151c4: 24a59e90 */ addiu $a1,$a1,%lo(var80099e90) /* 151c8: 02802025 */ or $a0,$s4,$zero -/* 151cc: 0c0120d0 */ jal func00048340 +/* 151cc: 0c0120d0 */ jal osCreateMesgQueue /* 151d0: 2406000a */ addiu $a2,$zero,0xa /* 151d4: 24040005 */ addiu $a0,$zero,0x5 /* 151d8: 02802825 */ or $a1,$s4,$zero diff --git a/src/lib/lib_159b0.c b/src/lib/lib_159b0.c index 7d5f95832..1f65a30cb 100644 --- a/src/lib/lib_159b0.c +++ b/src/lib/lib_159b0.c @@ -496,7 +496,7 @@ glabel func00015fd0 /* 15fd8: 3c04800a */ lui $a0,%hi(var8009c7a8) /* 15fdc: 2484c7a8 */ addiu $a0,$a0,%lo(var8009c7a8) /* 15fe0: 24050000 */ addiu $a1,$zero,0x0 -/* 15fe4: 0c0121bc */ jal func000486f0 +/* 15fe4: 0c0121bc */ jal osRecvMesg /* 15fe8: 3c060001 */ lui $a2,0x1 /* 15fec: 3c04a45f */ lui $a0,0xa45f /* 15ff0: 3484ffff */ ori $a0,$a0,0xffff @@ -519,7 +519,7 @@ glabel func00015fd0 /* 16030: 3c04800a */ lui $a0,%hi(var8009c7a8) /* 16034: 2484c7a8 */ addiu $a0,$a0,%lo(var8009c7a8) /* 16038: 24050000 */ addiu $a1,$zero,0x0 -/* 1603c: 0c012238 */ jal func000488e0 +/* 1603c: 0c012238 */ jal osSendMesg /* 16040: 3c060000 */ lui $a2,0x0 /* 16044: 8fa20018 */ lw $v0,0x18($sp) /* 16048: 8fbf0014 */ lw $ra,0x14($sp) diff --git a/src/lib/lib_1a500.c b/src/lib/lib_1a500.c index 5ba9aa368..d2918d837 100644 --- a/src/lib/lib_1a500.c +++ b/src/lib/lib_1a500.c @@ -7778,7 +7778,7 @@ glabel func00020d1c /* 20d80: ae19000c */ sw $t9,0xc($s0) /* 20d84: ac480000 */ sw $t0,0x0($v0) /* 20d88: 8e240008 */ lw $a0,0x8($s1) -/* 20d8c: 0c012d20 */ jal func0004b480 +/* 20d8c: 0c012d20 */ jal osVirtualToPhysical /* 20d90: afa20030 */ sw $v0,0x30($sp) /* 20d94: 8fa30030 */ lw $v1,0x30($sp) /* 20d98: ac620004 */ sw $v0,0x4($v1) @@ -7866,7 +7866,7 @@ glabel func00020d1c /* 20ec4: ae0d000c */ sw $t5,0xc($s0) /* 20ec8: ac4e0000 */ sw $t6,0x0($v0) /* 20ecc: 8e240008 */ lw $a0,0x8($s1) -/* 20ed0: 0c012d20 */ jal func0004b480 +/* 20ed0: 0c012d20 */ jal osVirtualToPhysical /* 20ed4: afa20024 */ sw $v0,0x24($sp) /* 20ed8: 8fa30024 */ lw $v1,0x24($sp) /* 20edc: ac620004 */ sw $v0,0x4($v1) @@ -7932,7 +7932,7 @@ glabel func00020f30 /* 20fb0: ac6a0000 */ sw $t2,0x0($v1) /* 20fb4: 8fab004c */ lw $t3,0x4c($sp) /* 20fb8: 8d640008 */ lw $a0,0x8($t3) -/* 20fbc: 0c012d20 */ jal func0004b480 +/* 20fbc: 0c012d20 */ jal osVirtualToPhysical /* 20fc0: afa30044 */ sw $v1,0x44($sp) /* 20fc4: 8fa50044 */ lw $a1,0x44($sp) /* 20fc8: aca20004 */ sw $v0,0x4($a1) @@ -7983,7 +7983,7 @@ glabel func00020f30 /* 21064: ac6e0000 */ sw $t6,0x0($v1) /* 21068: 8fb80048 */ lw $t8,0x48($sp) /* 2106c: 8f040000 */ lw $a0,0x0($t8) -/* 21070: 0c012d20 */ jal func0004b480 +/* 21070: 0c012d20 */ jal osVirtualToPhysical /* 21074: afa30040 */ sw $v1,0x40($sp) /* 21078: 8fa50040 */ lw $a1,0x40($sp) /* 2107c: 3c08bc00 */ lui $t0,0xbc00 @@ -7995,7 +7995,7 @@ glabel func00020f30 /* 21094: ac680000 */ sw $t0,0x0($v1) /* 21098: 8fa90048 */ lw $t1,0x48($sp) /* 2109c: 8d240008 */ lw $a0,0x8($t1) -/* 210a0: 0c012d20 */ jal func0004b480 +/* 210a0: 0c012d20 */ jal osVirtualToPhysical /* 210a4: afa3003c */ sw $v1,0x3c($sp) /* 210a8: 8fa6003c */ lw $a2,0x3c($sp) /* 210ac: 3c0b0600 */ lui $t3,0x600 @@ -8054,7 +8054,7 @@ glabel func00020f30 /* 2117c: ac680000 */ sw $t0,0x0($v1) /* 21180: 8fa9004c */ lw $t1,0x4c($sp) /* 21184: 8d240008 */ lw $a0,0x8($t1) -/* 21188: 0c012d20 */ jal func0004b480 +/* 21188: 0c012d20 */ jal osVirtualToPhysical /* 2118c: afa3002c */ sw $v1,0x2c($sp) /* 21190: 8fa5002c */ lw $a1,0x2c($sp) /* 21194: aca20004 */ sw $v0,0x4($a1) @@ -8072,7 +8072,7 @@ glabel func00020f30 /* 211c0: ac6c0000 */ sw $t4,0x0($v1) /* 211c4: 8fad0030 */ lw $t5,0x30($sp) /* 211c8: 8da40000 */ lw $a0,0x0($t5) -/* 211cc: 0c012d20 */ jal func0004b480 +/* 211cc: 0c012d20 */ jal osVirtualToPhysical /* 211d0: afa30028 */ sw $v1,0x28($sp) /* 211d4: 8fa50028 */ lw $a1,0x28($sp) /* 211d8: 3c0ebc00 */ lui $t6,0xbc00 @@ -8084,7 +8084,7 @@ glabel func00020f30 /* 211f0: ac6e0000 */ sw $t6,0x0($v1) /* 211f4: 8fb80030 */ lw $t8,0x30($sp) /* 211f8: 8f040008 */ lw $a0,0x8($t8) -/* 211fc: 0c012d20 */ jal func0004b480 +/* 211fc: 0c012d20 */ jal osVirtualToPhysical /* 21200: afa30024 */ sw $v1,0x24($sp) /* 21204: 8fa60024 */ lw $a2,0x24($sp) /* 21208: 02002025 */ or $a0,$s0,$zero @@ -8145,7 +8145,7 @@ glabel func0002124c /* 212d0: ae69000c */ sw $t1,0xc($s3) /* 212d4: 00408025 */ or $s0,$v0,$zero /* 212d8: 00402025 */ or $a0,$v0,$zero -/* 212dc: 0c012d20 */ jal func0004b480 +/* 212dc: 0c012d20 */ jal osVirtualToPhysical /* 212e0: ae8a0000 */ sw $t2,0x0($s4) /* 212e4: 8fa30044 */ lw $v1,0x44($sp) /* 212e8: ae820004 */ sw $v0,0x4($s4) @@ -8164,7 +8164,7 @@ glabel func0002124c /* 2131c: 01b82021 */ addu $a0,$t5,$t8 /* 21320: 24840007 */ addiu $a0,$a0,0x7 /* 21324: 34990007 */ ori $t9,$a0,0x7 -/* 21328: 0c012d20 */ jal func0004b480 +/* 21328: 0c012d20 */ jal osVirtualToPhysical /* 2132c: 3b240007 */ xori $a0,$t9,0x7 /* 21330: aec20004 */ sw $v0,0x4($s6) /* 21334: 8e74000c */ lw $s4,0xc($s3) @@ -8174,7 +8174,7 @@ glabel func0002124c /* 21344: ae6a000c */ sw $t2,0xc($s3) /* 21348: ae8b0000 */ sw $t3,0x0($s4) /* 2134c: 8fac0044 */ lw $t4,0x44($sp) -/* 21350: 0c012d20 */ jal func0004b480 +/* 21350: 0c012d20 */ jal osVirtualToPhysical /* 21354: 8d84000c */ lw $a0,0xc($t4) /* 21358: 8fa50044 */ lw $a1,0x44($sp) /* 2135c: ae820004 */ sw $v0,0x4($s4) @@ -8824,7 +8824,7 @@ glabel func0002170c /* 21d24: ae79000c */ sw $t9,0xc($s3) /* 21d28: ac6b0000 */ sw $t3,0x0($v1) /* 21d2c: 8e240024 */ lw $a0,0x24($s1) -/* 21d30: 0c012d20 */ jal func0004b480 +/* 21d30: 0c012d20 */ jal osVirtualToPhysical /* 21d34: afa30068 */ sw $v1,0x68($sp) /* 21d38: 8fa50068 */ lw $a1,0x68($sp) /* 21d3c: 02602025 */ or $a0,$s3,$zero @@ -8903,7 +8903,7 @@ glabel func0002170c /* 21e58: 262f0008 */ addiu $t7,$s1,0x8 /* 21e5c: ae6f000c */ sw $t7,0xc($s3) /* 21e60: 02402025 */ or $a0,$s2,$zero -/* 21e64: 0c012d20 */ jal func0004b480 +/* 21e64: 0c012d20 */ jal osVirtualToPhysical /* 21e68: ae380000 */ sw $t8,0x0($s1) /* 21e6c: ae220004 */ sw $v0,0x4($s1) /* 21e70: 8e72000c */ lw $s2,0xc($s3) @@ -8912,7 +8912,7 @@ glabel func0002170c /* 21e7c: 264c0008 */ addiu $t4,$s2,0x8 /* 21e80: ae6c000c */ sw $t4,0xc($s3) /* 21e84: ae590000 */ sw $t9,0x0($s2) -/* 21e88: 0c012d20 */ jal func0004b480 +/* 21e88: 0c012d20 */ jal osVirtualToPhysical /* 21e8c: 8fa40078 */ lw $a0,0x78($sp) /* 21e90: ae420004 */ sw $v0,0x4($s2) /* 21e94: 8e71000c */ lw $s1,0xc($s3) @@ -8921,7 +8921,7 @@ glabel func0002170c /* 21ea0: 262b0008 */ addiu $t3,$s1,0x8 /* 21ea4: ae6b000c */ sw $t3,0xc($s3) /* 21ea8: 02002025 */ or $a0,$s0,$zero -/* 21eac: 0c012d20 */ jal func0004b480 +/* 21eac: 0c012d20 */ jal osVirtualToPhysical /* 21eb0: ae2d0000 */ sw $t5,0x0($s1) /* 21eb4: ae220004 */ sw $v0,0x4($s1) /* 21eb8: 8e63000c */ lw $v1,0xc($s3) @@ -8961,7 +8961,7 @@ glabel func00021ef4 /* 21f2c: ac580000 */ sw $t8,0x0($v0) /* 21f30: 00a09025 */ or $s2,$a1,$zero /* 21f34: 8ca4000c */ lw $a0,0xc($a1) -/* 21f38: 0c012d20 */ jal func0004b480 +/* 21f38: 0c012d20 */ jal osVirtualToPhysical /* 21f3c: 00408825 */ or $s1,$v0,$zero /* 21f40: 12000067 */ beqz $s0,.L000220e0 /* 21f44: ae220004 */ sw $v0,0x4($s1) diff --git a/src/lib/lib_317f0.c b/src/lib/lib_317f0.c index 1c77db5bf..a7c117a42 100644 --- a/src/lib/lib_317f0.c +++ b/src/lib/lib_317f0.c @@ -4876,7 +4876,7 @@ glabel func00035110 /* 35a28: 00084883 */ sra $t1,$t0,0x2 /* 35a2c: 01892825 */ or $a1,$t4,$t1 /* 35a30: 00003025 */ or $a2,$zero,$zero -/* 35a34: 0c012238 */ jal func000488e0 +/* 35a34: 0c012238 */ jal osSendMesg /* 35a38: 8d440084 */ lw $a0,0x84($t2) .L00035a3c: /* 35a3c: 100005f0 */ beqz $zero,.L00037200 @@ -4955,7 +4955,7 @@ glabel func00035110 /* 35b4c: 000c4883 */ sra $t1,$t4,0x2 /* 35b50: 03092825 */ or $a1,$t8,$t1 /* 35b54: 00003025 */ or $a2,$zero,$zero -/* 35b58: 0c012238 */ jal func000488e0 +/* 35b58: 0c012238 */ jal osSendMesg /* 35b5c: 8d440084 */ lw $a0,0x84($t2) .L00035b60: /* 35b60: 100005a7 */ beqz $zero,.L00037200 @@ -5484,7 +5484,7 @@ glabel func00035110 /* 3630c: 01816824 */ and $t5,$t4,$at /* 36310: 030d2825 */ or $a1,$t8,$t5 /* 36314: 00003025 */ or $a2,$zero,$zero -/* 36318: 0c012238 */ jal func000488e0 +/* 36318: 0c012238 */ jal osSendMesg /* 3631c: 8d240084 */ lw $a0,0x84($t1) .L00036320: /* 36320: 10000322 */ beqz $zero,.L00036fac diff --git a/src/lib/lib_37b00.c b/src/lib/lib_37b00.c index b4c6e4401..a84ee4845 100644 --- a/src/lib/lib_37b00.c +++ b/src/lib/lib_37b00.c @@ -576,7 +576,7 @@ glabel func00037fc0 /* 382c4: 3c04800a */ lui $a0,0x800a /* 382c8: 0018c880 */ sll $t9,$t8,0x2 /* 382cc: 00992021 */ addu $a0,$a0,$t9 -/* 382d0: 0c012d20 */ jal func0004b480 +/* 382d0: 0c012d20 */ jal osVirtualToPhysical /* 382d4: 8c84c3d4 */ lw $a0,-0x3c2c($a0) /* 382d8: 8fa80044 */ lw $t0,0x44($sp) /* 382dc: ad020004 */ sw $v0,0x4($t0) @@ -593,7 +593,7 @@ glabel func00037fc0 /* 38308: 314effff */ andi $t6,$t2,0xffff /* 3830c: 01c17825 */ or $t7,$t6,$at /* 38310: af0f0000 */ sw $t7,0x0($t8) -/* 38314: 0c012d20 */ jal func0004b480 +/* 38314: 0c012d20 */ jal osVirtualToPhysical /* 38318: 8fa40058 */ lw $a0,0x58($sp) /* 3831c: 8fb90040 */ lw $t9,0x40($sp) /* 38320: af220004 */ sw $v0,0x4($t9) @@ -651,7 +651,7 @@ glabel func00037fc0 /* 383e4: 31890fff */ andi $t1,$t4,0xfff /* 383e8: 01695025 */ or $t2,$t3,$t1 /* 383ec: adca0000 */ sw $t2,0x0($t6) -/* 383f0: 0c012d20 */ jal func0004b480 +/* 383f0: 0c012d20 */ jal osVirtualToPhysical /* 383f4: 8fa40054 */ lw $a0,0x54($sp) /* 383f8: 8fad003c */ lw $t5,0x3c($sp) /* 383fc: ada20004 */ sw $v0,0x4($t5) @@ -679,7 +679,7 @@ glabel func00037fc0 /* 38454: 332c0fff */ andi $t4,$t9,0xfff /* 38458: 030c5825 */ or $t3,$t8,$t4 /* 3845c: ad2b0000 */ sw $t3,0x0($t1) -/* 38460: 0c012d20 */ jal func0004b480 +/* 38460: 0c012d20 */ jal osVirtualToPhysical /* 38464: 8fa40054 */ lw $a0,0x54($sp) /* 38468: 8fa80038 */ lw $t0,0x38($sp) /* 3846c: ad020004 */ sw $v0,0x4($t0) @@ -730,7 +730,7 @@ glabel func00037fc0 /* 38518: 33090fff */ andi $t1,$t8,0xfff /* 3851c: 01894025 */ or $t0,$t4,$t1 /* 38520: ad480000 */ sw $t0,0x0($t2) -/* 38524: 0c012d20 */ jal func0004b480 +/* 38524: 0c012d20 */ jal osVirtualToPhysical /* 38528: 8fa40054 */ lw $a0,0x54($sp) /* 3852c: 8fab0034 */ lw $t3,0x34($sp) /* 38530: ad620004 */ sw $v0,0x4($t3) @@ -758,7 +758,7 @@ glabel func00037fc0 /* 38588: 31f80fff */ andi $t8,$t7,0xfff /* 3858c: 01d86025 */ or $t4,$t6,$t8 /* 38590: ad2c0000 */ sw $t4,0x0($t1) -/* 38594: 0c012d20 */ jal func0004b480 +/* 38594: 0c012d20 */ jal osVirtualToPhysical /* 38598: 8fa40054 */ lw $a0,0x54($sp) /* 3859c: 8fb90030 */ lw $t9,0x30($sp) /* 385a0: af220004 */ sw $v0,0x4($t9) @@ -940,7 +940,7 @@ glabel func00037fc0 /* 38858: 03016825 */ or $t5,$t8,$at /* 3885c: ad6d0000 */ sw $t5,0x0($t3) /* 38860: 3c04800a */ lui $a0,0x800a -/* 38864: 0c012d20 */ jal func0004b480 +/* 38864: 0c012d20 */ jal osVirtualToPhysical /* 38868: 8c84c398 */ lw $a0,-0x3c68($a0) /* 3886c: 8fae001c */ lw $t6,0x1c($sp) /* 38870: adc20004 */ sw $v0,0x4($t6) @@ -957,7 +957,7 @@ glabel func00037fc0 /* 38898: 3c190300 */ lui $t9,0x300 /* 3889c: ad590000 */ sw $t9,0x0($t2) /* 388a0: 3c04800a */ lui $a0,0x800a -/* 388a4: 0c012d20 */ jal func0004b480 +/* 388a4: 0c012d20 */ jal osVirtualToPhysical /* 388a8: 8c84c398 */ lw $a0,-0x3c68($a0) /* 388ac: 8fb80018 */ lw $t8,0x18($sp) /* 388b0: af020004 */ sw $v0,0x4($t8) diff --git a/src/lib/lib_3a100.c b/src/lib/lib_3a100.c index 6a3876e85..4f7e3e824 100644 --- a/src/lib/lib_3a100.c +++ b/src/lib/lib_3a100.c @@ -1062,7 +1062,7 @@ glabel func0003ae60 /* 3b054: 8dab0024 */ lw $t3,0x24($t5) /* 3b058: 00087880 */ sll $t7,$t0,0x2 /* 3b05c: 016f7021 */ addu $t6,$t3,$t7 -/* 3b060: 0c012d20 */ jal func0004b480 +/* 3b060: 0c012d20 */ jal osVirtualToPhysical /* 3b064: 8dc40014 */ lw $a0,0x14($t6) /* 3b068: 3c0100ff */ lui $at,0xff /* 3b06c: 3421ffff */ ori $at,$at,0xffff @@ -1207,7 +1207,7 @@ glabel func0003b178 /* 3b278: 33280fff */ andi $t0,$t9,0xfff /* 3b27c: 01c86825 */ or $t5,$t6,$t0 /* 3b280: aded0000 */ sw $t5,0x0($t7) -/* 3b284: 0c012d20 */ jal func0004b480 +/* 3b284: 0c012d20 */ jal osVirtualToPhysical /* 3b288: 8fa40040 */ lw $a0,0x40($sp) /* 3b28c: 8fa90020 */ lw $t1,0x20($sp) /* 3b290: ad220004 */ sw $v0,0x4($t1) @@ -1233,7 +1233,7 @@ glabel func0003b178 /* 3b2e0: 8fb90038 */ lw $t9,0x38($sp) /* 3b2e4: 000e6880 */ sll $t5,$t6,0x2 /* 3b2e8: 032d7821 */ addu $t7,$t9,$t5 -/* 3b2ec: 0c012d20 */ jal func0004b480 +/* 3b2ec: 0c012d20 */ jal osVirtualToPhysical /* 3b2f0: 8de40020 */ lw $a0,0x20($t7) /* 3b2f4: 8fa9001c */ lw $t1,0x1c($sp) /* 3b2f8: ad220004 */ sw $v0,0x4($t1) @@ -1255,7 +1255,7 @@ glabel func0003b178 /* 3b334: 31af0fff */ andi $t7,$t5,0xfff /* 3b338: 032f4825 */ or $t1,$t9,$t7 /* 3b33c: ad690000 */ sw $t1,0x0($t3) -/* 3b340: 0c012d20 */ jal func0004b480 +/* 3b340: 0c012d20 */ jal osVirtualToPhysical /* 3b344: 8fa40040 */ lw $a0,0x40($sp) /* 3b348: 8faa0018 */ lw $t2,0x18($sp) /* 3b34c: ad420004 */ sw $v0,0x4($t2) @@ -1339,7 +1339,7 @@ glabel func0003b370 /* 3b468: 330e0fff */ andi $t6,$t8,0xfff /* 3b46c: 018ec825 */ or $t9,$t4,$t6 /* 3b470: ad190000 */ sw $t9,0x0($t0) -/* 3b474: 0c012d20 */ jal func0004b480 +/* 3b474: 0c012d20 */ jal osVirtualToPhysical /* 3b478: 8fa40040 */ lw $a0,0x40($sp) /* 3b47c: 8fad0020 */ lw $t5,0x20($sp) /* 3b480: ada20004 */ sw $v0,0x4($t5) @@ -1365,7 +1365,7 @@ glabel func0003b370 /* 3b4d0: 8fb80038 */ lw $t8,0x38($sp) /* 3b4d4: 000cc880 */ sll $t9,$t4,0x2 /* 3b4d8: 03194021 */ addu $t0,$t8,$t9 -/* 3b4dc: 0c012d20 */ jal func0004b480 +/* 3b4dc: 0c012d20 */ jal osVirtualToPhysical /* 3b4e0: 8d040020 */ lw $a0,0x20($t0) /* 3b4e4: 8fad001c */ lw $t5,0x1c($sp) /* 3b4e8: ada20004 */ sw $v0,0x4($t5) @@ -1382,7 +1382,7 @@ glabel func0003b370 /* 3b510: 31ca0fff */ andi $t2,$t6,0xfff /* 3b514: 01415825 */ or $t3,$t2,$at /* 3b518: ad8b0000 */ sw $t3,0x0($t4) -/* 3b51c: 0c012d20 */ jal func0004b480 +/* 3b51c: 0c012d20 */ jal osVirtualToPhysical /* 3b520: 8fa40040 */ lw $a0,0x40($sp) /* 3b524: 8fb80018 */ lw $t8,0x18($sp) /* 3b528: af020004 */ sw $v0,0x4($t8) @@ -1420,7 +1420,7 @@ glabel func0003b54c /* 3b590: 35290020 */ ori $t1,$t1,0x20 /* 3b594: ad490000 */ sw $t1,0x0($t2) /* 3b598: 8fa40028 */ lw $a0,0x28($sp) -/* 3b59c: 0c012d20 */ jal func0004b480 +/* 3b59c: 0c012d20 */ jal osVirtualToPhysical /* 3b5a0: 24840008 */ addiu $a0,$a0,0x8 /* 3b5a4: 8fab001c */ lw $t3,0x1c($sp) /* 3b5a8: ad620004 */ sw $v0,0x4($t3) @@ -1443,7 +1443,7 @@ glabel func0003b54c /* 3b5ec: 8fad0028 */ lw $t5,0x28($sp) /* 3b5f0: 000fc080 */ sll $t8,$t7,0x2 /* 3b5f4: 01b8c821 */ addu $t9,$t5,$t8 -/* 3b5f8: 0c012d20 */ jal func0004b480 +/* 3b5f8: 0c012d20 */ jal osVirtualToPhysical /* 3b5fc: 8f24002c */ lw $a0,0x2c($t9) /* 3b600: 87a90022 */ lh $t1,0x22($sp) /* 3b604: 3c0100ff */ lui $at,0xff diff --git a/src/lib/lib_3e730.c b/src/lib/lib_3e730.c index 3be2fddb7..7ec9905e1 100644 --- a/src/lib/lib_3e730.c +++ b/src/lib/lib_3e730.c @@ -6438,7 +6438,7 @@ glabel func0003f328 /* 3f578: 0121c825 */ or $t9,$t1,$at /* 3f57c: ad190000 */ sw $t9,0x0($t0) /* 3f580: 8faa0030 */ lw $t2,0x30($sp) -/* 3f584: 0c012d20 */ jal func0004b480 +/* 3f584: 0c012d20 */ jal osVirtualToPhysical /* 3f588: 8d440054 */ lw $a0,0x54($t2) /* 3f58c: 8fab0020 */ lw $t3,0x20($sp) /* 3f590: ad620004 */ sw $v0,0x4($t3) @@ -6453,7 +6453,7 @@ glabel func0003f328 /* 3f5b0: 3c0e0300 */ lui $t6,0x300 /* 3f5b4: af0e0000 */ sw $t6,0x0($t8) /* 3f5b8: 8faf0030 */ lw $t7,0x30($sp) -/* 3f5bc: 0c012d20 */ jal func0004b480 +/* 3f5bc: 0c012d20 */ jal osVirtualToPhysical /* 3f5c0: 8de40054 */ lw $a0,0x54($t7) /* 3f5c4: 8fa9001c */ lw $t1,0x1c($sp) /* 3f5c8: ad220004 */ sw $v0,0x4($t1) diff --git a/src/lib/lib_44bc0.c b/src/lib/lib_44bc0.c index a2d07a020..b05908886 100644 --- a/src/lib/lib_44bc0.c +++ b/src/lib/lib_44bc0.c @@ -188,7 +188,7 @@ glabel func00044bc0 /* 44e50: 354a0020 */ ori $t2,$t2,0x20 /* 44e54: ad8a0000 */ sw $t2,0x0($t4) /* 44e58: 8fa40024 */ lw $a0,0x24($sp) -/* 44e5c: 0c012d20 */ jal func0004b480 +/* 44e5c: 0c012d20 */ jal osVirtualToPhysical /* 44e60: 24840008 */ addiu $a0,$a0,0x8 /* 44e64: 8fae0020 */ lw $t6,0x20($sp) /* 44e68: adc20004 */ sw $v0,0x4($t6) @@ -201,7 +201,7 @@ glabel func00044bc0 /* 44e84: 35ef04e0 */ ori $t7,$t7,0x4e0 /* 44e88: af0f0000 */ sw $t7,0x0($t8) /* 44e8c: 8fa80024 */ lw $t0,0x24($sp) -/* 44e90: 0c012d20 */ jal func0004b480 +/* 44e90: 0c012d20 */ jal osVirtualToPhysical /* 44e94: 8d04002c */ lw $a0,0x2c($t0) /* 44e98: 3c0100ff */ lui $at,0xff /* 44e9c: 8faa001c */ lw $t2,0x1c($sp) @@ -218,7 +218,7 @@ glabel func00044bc0 /* 44ec8: 35ad0650 */ ori $t5,$t5,0x650 /* 44ecc: af2d0000 */ sw $t5,0x0($t9) /* 44ed0: 8faf0024 */ lw $t7,0x24($sp) -/* 44ed4: 0c012d20 */ jal func0004b480 +/* 44ed4: 0c012d20 */ jal osVirtualToPhysical /* 44ed8: 8de40030 */ lw $a0,0x30($t7) /* 44edc: 3c0100ff */ lui $at,0xff /* 44ee0: 8fa90018 */ lw $t1,0x18($sp) diff --git a/src/lib/lib_44f60.c b/src/lib/lib_44f60.c index d72bd1b9d..2292f8a94 100644 --- a/src/lib/lib_44f60.c +++ b/src/lib/lib_44f60.c @@ -951,7 +951,7 @@ glabel func00045ab0 /* 45ce4: 358c0020 */ ori $t4,$t4,0x20 /* 45ce8: af0c0000 */ sw $t4,0x0($t8) /* 45cec: 8fa40030 */ lw $a0,0x30($sp) -/* 45cf0: 0c012d20 */ jal func0004b480 +/* 45cf0: 0c012d20 */ jal osVirtualToPhysical /* 45cf4: 24840098 */ addiu $a0,$a0,0x98 /* 45cf8: 8fb90020 */ lw $t9,0x20($sp) /* 45cfc: af220004 */ sw $v0,0x4($t9) @@ -980,7 +980,7 @@ glabel func00045ab0 /* 45d54: 018a5825 */ or $t3,$t4,$t2 /* 45d58: adab0000 */ sw $t3,0x0($t5) /* 45d5c: 8fae0030 */ lw $t6,0x30($sp) -/* 45d60: 0c012d20 */ jal func0004b480 +/* 45d60: 0c012d20 */ jal osVirtualToPhysical /* 45d64: 8dc400bc */ lw $a0,0xbc($t6) /* 45d68: 3c0100ff */ lui $at,0xff /* 45d6c: 8fb9001c */ lw $t9,0x1c($sp) diff --git a/src/lib/lib_47a90.c b/src/lib/lib_47a90.c index 028c57cbe..16d9f56af 100644 --- a/src/lib/lib_47a90.c +++ b/src/lib/lib_47a90.c @@ -125,7 +125,7 @@ glabel func00047a90 /* 47c44: afaf0034 */ sw $t7,0x34($sp) /* 47c48: afac001c */ sw $t4,0x1c($sp) /* 47c4c: 8fb80038 */ lw $t8,0x38($sp) -/* 47c50: 0c012d20 */ jal func0004b480 +/* 47c50: 0c012d20 */ jal osVirtualToPhysical /* 47c54: 8f040040 */ lw $a0,0x40($t8) /* 47c58: 3c0100ff */ lui $at,0xff /* 47c5c: 3421ffff */ ori $at,$at,0xffff diff --git a/src/lib/lib_481e0.c b/src/lib/lib_481e0.c index 60dc8a36f..41f1c74dc 100644 --- a/src/lib/lib_481e0.c +++ b/src/lib/lib_481e0.c @@ -19,12 +19,12 @@ glabel func000481e0 ); GLOBAL_ASM( -glabel func000481f0 +glabel osStartThread /* 481f0: 27bdffd8 */ addiu $sp,$sp,-40 /* 481f4: afbf001c */ sw $ra,0x1c($sp) /* 481f8: afa40028 */ sw $a0,0x28($sp) /* 481fc: afb10018 */ sw $s1,0x18($sp) -/* 48200: 0c01256c */ jal func000495b0 +/* 48200: 0c01256c */ jal __osDisableInt /* 48204: afb00014 */ sw $s0,0x14($sp) /* 48208: 8fae0028 */ lw $t6,0x28($sp) /* 4820c: 24010001 */ addiu $at,$zero,0x1 @@ -39,7 +39,7 @@ glabel func000481f0 /* 48230: 3c048006 */ lui $a0,%hi(var80060938) /* 48234: a70f0010 */ sh $t7,0x10($t8) /* 48238: 8fa50028 */ lw $a1,0x28($sp) -/* 4823c: 0c000f2e */ jal func00003cb8 +/* 4823c: 0c000f2e */ jal __osEnqueueThread /* 48240: 24840938 */ addiu $a0,$a0,%lo(var80060938) /* 48244: 10000021 */ beqz $zero,.L000482cc /* 48248: 00000000 */ sll $zero,$zero,0x0 @@ -58,7 +58,7 @@ glabel func000481f0 /* 48274: 3c048006 */ lui $a0,%hi(var80060938) /* 48278: a56a0010 */ sh $t2,0x10($t3) /* 4827c: 8fa50028 */ lw $a1,0x28($sp) -/* 48280: 0c000f2e */ jal func00003cb8 +/* 48280: 0c000f2e */ jal __osEnqueueThread /* 48284: 24840938 */ addiu $a0,$a0,%lo(var80060938) /* 48288: 10000010 */ beqz $zero,.L000482cc /* 4828c: 00000000 */ sll $zero,$zero,0x0 @@ -68,22 +68,22 @@ glabel func000481f0 /* 48298: a5ac0010 */ sh $t4,0x10($t5) /* 4829c: 8fae0028 */ lw $t6,0x28($sp) /* 482a0: 8dc40008 */ lw $a0,0x8($t6) -/* 482a4: 0c000f2e */ jal func00003cb8 +/* 482a4: 0c000f2e */ jal __osEnqueueThread /* 482a8: 01c02825 */ or $a1,$t6,$zero /* 482ac: 8faf0028 */ lw $t7,0x28($sp) -/* 482b0: 0c000f40 */ jal func00003d00 +/* 482b0: 0c000f40 */ jal __osPopThread /* 482b4: 8de40008 */ lw $a0,0x8($t7) /* 482b8: 00408825 */ or $s1,$v0,$zero /* 482bc: 3c048006 */ lui $a0,%hi(var80060938) /* 482c0: 24840938 */ addiu $a0,$a0,%lo(var80060938) -/* 482c4: 0c000f2e */ jal func00003cb8 +/* 482c4: 0c000f2e */ jal __osEnqueueThread /* 482c8: 02202825 */ or $a1,$s1,$zero .L000482cc: /* 482cc: 3c188006 */ lui $t8,0x8006 /* 482d0: 8f180940 */ lw $t8,0x940($t8) /* 482d4: 17000005 */ bnez $t8,.L000482ec /* 482d8: 00000000 */ sll $zero,$zero,0x0 -/* 482dc: 0c000f44 */ jal func00003d10 +/* 482dc: 0c000f44 */ jal __osDispatchThread /* 482e0: 00000000 */ sll $zero,$zero,0x0 /* 482e4: 1000000f */ beqz $zero,.L00048324 /* 482e8: 00000000 */ sll $zero,$zero,0x0 @@ -100,10 +100,10 @@ glabel func000481f0 /* 48310: 240b0002 */ addiu $t3,$zero,0x2 /* 48314: 3c048006 */ lui $a0,%hi(var80060938) /* 48318: a72b0010 */ sh $t3,0x10($t9) -/* 4831c: 0c000ee8 */ jal func00003ba0 +/* 4831c: 0c000ee8 */ jal __osEnqueueAndYield /* 48320: 24840938 */ addiu $a0,$a0,%lo(var80060938) .L00048324: -/* 48324: 0c012588 */ jal func00049620 +/* 48324: 0c012588 */ jal __osRestoreInt /* 48328: 02002025 */ or $a0,$s0,$zero /* 4832c: 8fbf001c */ lw $ra,0x1c($sp) /* 48330: 8fb00014 */ lw $s0,0x14($sp) @@ -113,7 +113,7 @@ glabel func000481f0 ); GLOBAL_ASM( -glabel func00048340 +glabel osCreateMesgQueue /* 48340: 3c0e8006 */ lui $t6,%hi(var80060930) /* 48344: 3c0f8006 */ lui $t7,%hi(var80060930) /* 48348: 25ce0930 */ addiu $t6,$t6,%lo(var80060930) @@ -135,7 +135,7 @@ glabel func00048370 /* 48378: afa40038 */ sw $a0,0x38($sp) /* 4837c: afb20020 */ sw $s2,0x20($sp) /* 48380: afb1001c */ sw $s1,0x1c($sp) -/* 48384: 0c01256c */ jal func000495b0 +/* 48384: 0c01256c */ jal __osDisableInt /* 48388: afb00018 */ sw $s0,0x18($sp) /* 4838c: 8fae0038 */ lw $t6,0x38($sp) /* 48390: 00408025 */ or $s0,$v0,$zero @@ -162,7 +162,7 @@ glabel func00048370 /* 483d8: 8f390940 */ lw $t9,0x940($t9) /* 483dc: 24180001 */ addiu $t8,$zero,0x1 /* 483e0: 00002025 */ or $a0,$zero,$zero -/* 483e4: 0c000ee8 */ jal func00003ba0 +/* 483e4: 0c000ee8 */ jal __osEnqueueAndYield /* 483e8: a7380010 */ sh $t8,0x10($t9) /* 483ec: 10000008 */ beqz $zero,.L00048410 /* 483f0: 00000000 */ sll $zero,$zero,0x0 @@ -175,7 +175,7 @@ glabel func00048370 /* 48408: 0c012884 */ jal func0004a210 /* 4840c: 01402825 */ or $a1,$t2,$zero .L00048410: -/* 48410: 0c012588 */ jal func00049620 +/* 48410: 0c012588 */ jal __osRestoreInt /* 48414: 02002025 */ or $a0,$s0,$zero /* 48418: 8fbf0024 */ lw $ra,0x24($sp) /* 4841c: 8fb00018 */ lw $s0,0x18($sp) @@ -191,7 +191,7 @@ glabel func00048430 /* 48434: afbf001c */ sw $ra,0x1c($sp) /* 48438: afa40028 */ sw $a0,0x28($sp) /* 4843c: afa5002c */ sw $a1,0x2c($sp) -/* 48440: 0c01256c */ jal func000495b0 +/* 48440: 0c01256c */ jal __osDisableInt /* 48444: afb00018 */ sw $s0,0x18($sp) /* 48448: 8fae0028 */ lw $t6,0x28($sp) /* 4844c: 00408025 */ or $s0,$v0,$zero @@ -221,7 +221,7 @@ glabel func00048430 /* 484a8: 01202825 */ or $a1,$t1,$zero /* 484ac: 8fac0028 */ lw $t4,0x28($sp) /* 484b0: 8d840008 */ lw $a0,0x8($t4) -/* 484b4: 0c000f2e */ jal func00003cb8 +/* 484b4: 0c000f2e */ jal __osEnqueueThread /* 484b8: 01802825 */ or $a1,$t4,$zero .L000484bc: /* 484bc: 3c0d8006 */ lui $t5,0x8006 @@ -236,10 +236,10 @@ glabel func00048430 /* 484e0: 24080002 */ addiu $t0,$zero,0x2 /* 484e4: 3c048006 */ lui $a0,%hi(var80060938) /* 484e8: a5a80010 */ sh $t0,0x10($t5) -/* 484ec: 0c000ee8 */ jal func00003ba0 +/* 484ec: 0c000ee8 */ jal __osEnqueueAndYield /* 484f0: 24840938 */ addiu $a0,$a0,%lo(var80060938) .L000484f4: -/* 484f4: 0c012588 */ jal func00049620 +/* 484f4: 0c012588 */ jal __osRestoreInt /* 484f8: 02002025 */ or $a0,$s0,$zero /* 484fc: 8fbf001c */ lw $ra,0x1c($sp) /* 48500: 8fb00018 */ lw $s0,0x18($sp) diff --git a/src/lib/lib_48520.c b/src/lib/lib_48520.c index 9d0a8d660..d1dd8e6e5 100644 --- a/src/lib/lib_48520.c +++ b/src/lib/lib_48520.c @@ -16,7 +16,7 @@ glabel func00048520 /* 48528: afa40028 */ sw $a0,0x28($sp) /* 4852c: afa5002c */ sw $a1,0x2c($sp) /* 48530: afa60030 */ sw $a2,0x30($sp) -/* 48534: 0c01256c */ jal func000495b0 +/* 48534: 0c01256c */ jal __osDisableInt /* 48538: afb00018 */ sw $s0,0x18($sp) /* 4853c: 8fae0028 */ lw $t6,0x28($sp) /* 48540: 3c18800a */ lui $t8,%hi(var8009c6e0) @@ -44,14 +44,14 @@ glabel func00048520 /* 48598: 00000000 */ sll $zero,$zero,0x0 /* 4859c: 8fa4002c */ lw $a0,0x2c($sp) /* 485a0: 8fa50030 */ lw $a1,0x30($sp) -/* 485a4: 0c012238 */ jal func000488e0 +/* 485a4: 0c012238 */ jal osSendMesg /* 485a8: 00003025 */ or $a2,$zero,$zero .L000485ac: /* 485ac: 240e0001 */ addiu $t6,$zero,0x1 /* 485b0: 3c018006 */ lui $at,0x8006 /* 485b4: ac2e0890 */ sw $t6,0x890($at) .L000485b8: -/* 485b8: 0c012588 */ jal func00049620 +/* 485b8: 0c012588 */ jal __osRestoreInt /* 485bc: 02002025 */ or $a0,$s0,$zero /* 485c0: 8fbf001c */ lw $ra,0x1c($sp) /* 485c4: 8fb00018 */ lw $s0,0x18($sp) diff --git a/src/lib/lib_485e0.c b/src/lib/lib_485e0.c index cfd37efaf..833174da6 100644 --- a/src/lib/lib_485e0.c +++ b/src/lib/lib_485e0.c @@ -15,7 +15,7 @@ glabel func000485e0 /* 485e8: afa40028 */ sw $a0,0x28($sp) /* 485ec: afa5002c */ sw $a1,0x2c($sp) /* 485f0: afa60030 */ sw $a2,0x30($sp) -/* 485f4: 0c01256c */ jal func000495b0 +/* 485f4: 0c01256c */ jal __osDisableInt /* 485f8: afb00018 */ sw $s0,0x18($sp) /* 485fc: 3c0f8006 */ lui $t7,0x8006 /* 48600: 8def0914 */ lw $t7,0x914($t7) @@ -30,7 +30,7 @@ glabel func000485e0 /* 48624: af380014 */ sw $t8,0x14($t9) /* 48628: 8d290914 */ lw $t1,0x914($t1) /* 4862c: 8fa80030 */ lw $t0,0x30($sp) -/* 48630: 0c012588 */ jal func00049620 +/* 48630: 0c012588 */ jal __osRestoreInt /* 48634: a5280002 */ sh $t0,0x2($t1) /* 48638: 8fbf001c */ lw $ra,0x1c($sp) /* 4863c: 8fb00018 */ lw $s0,0x18($sp) diff --git a/src/lib/lib_48650.c b/src/lib/lib_48650.c index ad75989f1..d305638ea 100644 --- a/src/lib/lib_48650.c +++ b/src/lib/lib_48650.c @@ -56,14 +56,14 @@ glabel func00048650 ); GLOBAL_ASM( -glabel func000486f0 +glabel osRecvMesg /* 486f0: 27bdffd8 */ addiu $sp,$sp,-40 /* 486f4: afbf001c */ sw $ra,0x1c($sp) /* 486f8: afa40028 */ sw $a0,0x28($sp) /* 486fc: afa5002c */ sw $a1,0x2c($sp) /* 48700: afa60030 */ sw $a2,0x30($sp) /* 48704: afb10018 */ sw $s1,0x18($sp) -/* 48708: 0c01256c */ jal func000495b0 +/* 48708: 0c01256c */ jal __osDisableInt /* 4870c: afb00014 */ sw $s0,0x14($sp) /* 48710: 8fae0028 */ lw $t6,0x28($sp) /* 48714: 00408025 */ or $s0,$v0,$zero @@ -74,7 +74,7 @@ glabel func000486f0 /* 48724: 8fb80030 */ lw $t8,0x30($sp) /* 48728: 17000005 */ bnez $t8,.L00048740 /* 4872c: 00000000 */ sll $zero,$zero,0x0 -/* 48730: 0c012588 */ jal func00049620 +/* 48730: 0c012588 */ jal __osRestoreInt /* 48734: 02002025 */ or $a0,$s0,$zero /* 48738: 10000036 */ beqz $zero,.L00048814 /* 4873c: 2402ffff */ addiu $v0,$zero,-1 @@ -83,7 +83,7 @@ glabel func000486f0 /* 48744: 8d080940 */ lw $t0,0x940($t0) /* 48748: 24190008 */ addiu $t9,$zero,0x8 /* 4874c: a5190010 */ sh $t9,0x10($t0) -/* 48750: 0c000ee8 */ jal func00003ba0 +/* 48750: 0c000ee8 */ jal __osEnqueueAndYield /* 48754: 8fa40028 */ lw $a0,0x28($sp) /* 48758: 8fa90028 */ lw $t1,0x28($sp) /* 4875c: 8d2a0008 */ lw $t2,0x8($t1) @@ -128,13 +128,13 @@ glabel func000486f0 /* 487e8: 8d690000 */ lw $t1,0x0($t3) /* 487ec: 11200006 */ beqz $t1,.L00048808 /* 487f0: 00000000 */ sll $zero,$zero,0x0 -/* 487f4: 0c000f40 */ jal func00003d00 +/* 487f4: 0c000f40 */ jal __osPopThread /* 487f8: 27240004 */ addiu $a0,$t9,0x4 /* 487fc: 00408825 */ or $s1,$v0,$zero -/* 48800: 0c01207c */ jal func000481f0 +/* 48800: 0c01207c */ jal osStartThread /* 48804: 02202025 */ or $a0,$s1,$zero .L00048808: -/* 48808: 0c012588 */ jal func00049620 +/* 48808: 0c012588 */ jal __osRestoreInt /* 4880c: 02002025 */ or $a0,$s0,$zero /* 48810: 00001025 */ or $v0,$zero,$zero .L00048814: diff --git a/src/lib/lib_48830.c b/src/lib/lib_48830.c index ad3599d05..b894dca8f 100644 --- a/src/lib/lib_48830.c +++ b/src/lib/lib_48830.c @@ -12,14 +12,14 @@ GLOBAL_ASM( glabel func00048830 /* 48830: 27bdffd8 */ addiu $sp,$sp,-40 /* 48834: afbf001c */ sw $ra,0x1c($sp) -/* 48838: 0c01256c */ jal func000495b0 +/* 48838: 0c01256c */ jal __osDisableInt /* 4883c: afb00018 */ sw $s0,0x18($sp) /* 48840: 3c0e8006 */ lui $t6,0x8006 /* 48844: 8dce0910 */ lw $t6,0x910($t6) /* 48848: 00408025 */ or $s0,$v0,$zero /* 4884c: 02002025 */ or $a0,$s0,$zero /* 48850: 8dcf0004 */ lw $t7,0x4($t6) -/* 48854: 0c012588 */ jal func00049620 +/* 48854: 0c012588 */ jal __osRestoreInt /* 48858: afaf0020 */ sw $t7,0x20($sp) /* 4885c: 8fbf001c */ lw $ra,0x1c($sp) /* 48860: 8fa20020 */ lw $v0,0x20($sp) @@ -32,14 +32,14 @@ GLOBAL_ASM( glabel func00048870 /* 48870: 27bdffd8 */ addiu $sp,$sp,-40 /* 48874: afbf001c */ sw $ra,0x1c($sp) -/* 48878: 0c01256c */ jal func000495b0 +/* 48878: 0c01256c */ jal __osDisableInt /* 4887c: afb00018 */ sw $s0,0x18($sp) /* 48880: 3c0e8006 */ lui $t6,0x8006 /* 48884: 8dce0914 */ lw $t6,0x914($t6) /* 48888: 00408025 */ or $s0,$v0,$zero /* 4888c: 02002025 */ or $a0,$s0,$zero /* 48890: 8dcf0004 */ lw $t7,0x4($t6) -/* 48894: 0c012588 */ jal func00049620 +/* 48894: 0c012588 */ jal __osRestoreInt /* 48898: afaf0020 */ sw $t7,0x20($sp) /* 4889c: 8fbf001c */ lw $ra,0x1c($sp) /* 488a0: 8fa20020 */ lw $v0,0x20($sp) diff --git a/src/lib/lib_488e0.c b/src/lib/lib_488e0.c index 5d9aaa06d..ee26cf804 100644 --- a/src/lib/lib_488e0.c +++ b/src/lib/lib_488e0.c @@ -12,7 +12,7 @@ #include "types.h" GLOBAL_ASM( -glabel func000488e0 +glabel osSendMesg /* 488e0: 27bdffc8 */ addiu $sp,$sp,-56 /* 488e4: afbf0024 */ sw $ra,0x24($sp) /* 488e8: afa40038 */ sw $a0,0x38($sp) @@ -20,7 +20,7 @@ glabel func000488e0 /* 488f0: afa60040 */ sw $a2,0x40($sp) /* 488f4: afb20020 */ sw $s2,0x20($sp) /* 488f8: afb1001c */ sw $s1,0x1c($sp) -/* 488fc: 0c01256c */ jal func000495b0 +/* 488fc: 0c01256c */ jal __osDisableInt /* 48900: afb00018 */ sw $s0,0x18($sp) /* 48904: 8fae0038 */ lw $t6,0x38($sp) /* 48908: 00408025 */ or $s0,$v0,$zero @@ -39,12 +39,12 @@ glabel func000488e0 /* 48938: 24080008 */ addiu $t0,$zero,0x8 /* 4893c: a5280010 */ sh $t0,0x10($t1) /* 48940: 8fa40038 */ lw $a0,0x38($sp) -/* 48944: 0c000ee8 */ jal func00003ba0 +/* 48944: 0c000ee8 */ jal __osEnqueueAndYield /* 48948: 24840004 */ addiu $a0,$a0,0x4 /* 4894c: 10000005 */ beqz $zero,.L00048964 /* 48950: 00000000 */ sll $zero,$zero,0x0 .L00048954: -/* 48954: 0c012588 */ jal func00049620 +/* 48954: 0c012588 */ jal __osRestoreInt /* 48958: 02002025 */ or $a0,$s0,$zero /* 4895c: 1000002d */ beqz $zero,.L00048a14 /* 48960: 2402ffff */ addiu $v0,$zero,-1 @@ -88,13 +88,13 @@ glabel func000488e0 /* 489e8: 8f2d0000 */ lw $t5,0x0($t9) /* 489ec: 11a00006 */ beqz $t5,.L00048a08 /* 489f0: 00000000 */ sll $zero,$zero,0x0 -/* 489f4: 0c000f40 */ jal func00003d00 +/* 489f4: 0c000f40 */ jal __osPopThread /* 489f8: 03002025 */ or $a0,$t8,$zero /* 489fc: 00409025 */ or $s2,$v0,$zero -/* 48a00: 0c01207c */ jal func000481f0 +/* 48a00: 0c01207c */ jal osStartThread /* 48a04: 02402025 */ or $a0,$s2,$zero .L00048a08: -/* 48a08: 0c012588 */ jal func00049620 +/* 48a08: 0c012588 */ jal __osRestoreInt /* 48a0c: 02002025 */ or $a0,$s0,$zero /* 48a10: 00001025 */ or $v0,$zero,$zero .L00048a14: @@ -120,7 +120,7 @@ glabel func00048a30 /* 48a50: 1000002c */ beqz $zero,.L00048b04 /* 48a54: 2402ffff */ addiu $v0,$zero,-1 .L00048a58: -/* 48a58: 0c01256c */ jal func000495b0 +/* 48a58: 0c01256c */ jal __osDisableInt /* 48a5c: 00000000 */ sll $zero,$zero,0x0 /* 48a60: 8fb80030 */ lw $t8,0x30($sp) /* 48a64: 3c088006 */ lui $t0,0x8006 @@ -162,7 +162,7 @@ glabel func00048a30 /* 48af0: 0c014620 */ jal func00051880 /* 48af4: 00002025 */ or $a0,$zero,$zero .L00048af8: -/* 48af8: 0c012588 */ jal func00049620 +/* 48af8: 0c012588 */ jal __osRestoreInt /* 48afc: 02002025 */ or $a0,$s0,$zero /* 48b00: 00001025 */ or $v0,$zero,$zero .L00048b04: diff --git a/src/lib/lib_48cd0.c b/src/lib/lib_48cd0.c index 0de4784d8..ba005633a 100644 --- a/src/lib/lib_48cd0.c +++ b/src/lib/lib_48cd0.c @@ -21,7 +21,7 @@ glabel func00048ce0 /* 48ce0: 27bdffd8 */ addiu $sp,$sp,-40 /* 48ce4: afbf001c */ sw $ra,0x1c($sp) /* 48ce8: afa40028 */ sw $a0,0x28($sp) -/* 48cec: 0c01256c */ jal func000495b0 +/* 48cec: 0c01256c */ jal __osDisableInt /* 48cf0: afb00018 */ sw $s0,0x18($sp) /* 48cf4: 93ae002b */ lbu $t6,0x2b($sp) /* 48cf8: 00408025 */ or $s0,$v0,$zero @@ -41,7 +41,7 @@ glabel func00048ce0 /* 48d2c: 01215024 */ and $t2,$t1,$at /* 48d30: a50a0000 */ sh $t2,0x0($t0) .L00048d34: -/* 48d34: 0c012588 */ jal func00049620 +/* 48d34: 0c012588 */ jal __osRestoreInt /* 48d38: 02002025 */ or $a0,$s0,$zero /* 48d3c: 8fbf001c */ lw $ra,0x1c($sp) /* 48d40: 8fb00018 */ lw $s0,0x18($sp) @@ -55,7 +55,7 @@ glabel func00048d50 /* 48d50: 27bdffd8 */ addiu $sp,$sp,-40 /* 48d54: afbf001c */ sw $ra,0x1c($sp) /* 48d58: afa40028 */ sw $a0,0x28($sp) -/* 48d5c: 0c01256c */ jal func000495b0 +/* 48d5c: 0c01256c */ jal __osDisableInt /* 48d60: afb00018 */ sw $s0,0x18($sp) /* 48d64: 3c0f8006 */ lui $t7,0x8006 /* 48d68: 8def0914 */ lw $t7,0x914($t7) @@ -71,7 +71,7 @@ glabel func00048d50 /* 48d90: 02002025 */ or $a0,$s0,$zero /* 48d94: 8d090008 */ lw $t1,0x8($t0) /* 48d98: 8d2a0004 */ lw $t2,0x4($t1) -/* 48d9c: 0c012588 */ jal func00049620 +/* 48d9c: 0c012588 */ jal __osRestoreInt /* 48da0: ad0a000c */ sw $t2,0xc($t0) /* 48da4: 8fbf001c */ lw $ra,0x1c($sp) /* 48da8: 8fb00018 */ lw $s0,0x18($sp) diff --git a/src/lib/lib_48dc0.c b/src/lib/lib_48dc0.c index 54280866f..2a4f545fe 100644 --- a/src/lib/lib_48dc0.c +++ b/src/lib/lib_48dc0.c @@ -14,7 +14,7 @@ glabel func00048dc0 /* 48dc4: afbf001c */ sw $ra,0x1c($sp) /* 48dc8: e7ac0028 */ swc1 $f12,0x28($sp) /* 48dcc: afb10018 */ sw $s1,0x18($sp) -/* 48dd0: 0c01256c */ jal func000495b0 +/* 48dd0: 0c01256c */ jal __osDisableInt /* 48dd4: afb00014 */ sw $s0,0x14($sp) /* 48dd8: 3c0e8006 */ lui $t6,0x8006 /* 48ddc: 8dce0914 */ lw $t6,0x914($t6) @@ -81,7 +81,7 @@ glabel func00048dc0 /* 48ec0: 44cbf800 */ ctc1 $t3,$31 /* 48ec4: 318d0fff */ andi $t5,$t4,0xfff /* 48ec8: ad0d0020 */ sw $t5,0x20($t0) -/* 48ecc: 0c012588 */ jal func00049620 +/* 48ecc: 0c012588 */ jal __osRestoreInt /* 48ed0: 02202025 */ or $a0,$s1,$zero /* 48ed4: 8fbf001c */ lw $ra,0x1c($sp) /* 48ed8: 8fb00014 */ lw $s0,0x14($sp) diff --git a/src/lib/lib_48ef0.c b/src/lib/lib_48ef0.c index fce2a4c21..b1638600e 100644 --- a/src/lib/lib_48ef0.c +++ b/src/lib/lib_48ef0.c @@ -13,7 +13,7 @@ glabel func00048ef0 /* 48ef0: 27bdffd8 */ addiu $sp,$sp,-40 /* 48ef4: afbf001c */ sw $ra,0x1c($sp) /* 48ef8: e7ac0028 */ swc1 $f12,0x28($sp) -/* 48efc: 0c01256c */ jal func000495b0 +/* 48efc: 0c01256c */ jal __osDisableInt /* 48f00: afb00018 */ sw $s0,0x18($sp) /* 48f04: 3c0e8006 */ lui $t6,0x8006 /* 48f08: 8dce0914 */ lw $t6,0x914($t6) @@ -25,7 +25,7 @@ glabel func00048ef0 /* 48f20: 02002025 */ or $a0,$s0,$zero /* 48f24: 95f80000 */ lhu $t8,0x0($t7) /* 48f28: 37190004 */ ori $t9,$t8,0x4 -/* 48f2c: 0c012588 */ jal func00049620 +/* 48f2c: 0c012588 */ jal __osRestoreInt /* 48f30: a5f90000 */ sh $t9,0x0($t7) /* 48f34: 8fbf001c */ lw $ra,0x1c($sp) /* 48f38: 8fb00018 */ lw $s0,0x18($sp) diff --git a/src/lib/lib_48f50.c b/src/lib/lib_48f50.c index cbf66d528..dd669be2f 100644 --- a/src/lib/lib_48f50.c +++ b/src/lib/lib_48f50.c @@ -12,7 +12,7 @@ GLOBAL_ASM( glabel func00048f50 /* 48f50: 27bdffe8 */ addiu $sp,$sp,-24 /* 48f54: afbf0014 */ sw $ra,0x14($sp) -/* 48f58: 0c01256c */ jal func000495b0 +/* 48f58: 0c01256c */ jal __osDisableInt /* 48f5c: afa40018 */ sw $a0,0x18($sp) /* 48f60: 8fa40018 */ lw $a0,0x18($sp) /* 48f64: 00402825 */ or $a1,$v0,$zero @@ -99,7 +99,7 @@ glabel func00048f50 /* 49088: 00a02025 */ or $a0,$a1,$zero /* 4908c: 944f0000 */ lhu $t7,0x0($v0) /* 49090: 35f80008 */ ori $t8,$t7,0x8 -/* 49094: 0c012588 */ jal func00049620 +/* 49094: 0c012588 */ jal __osRestoreInt /* 49098: a4580000 */ sh $t8,0x0($v0) /* 4909c: 8fbf0014 */ lw $ra,0x14($sp) /* 490a0: 27bd0018 */ addiu $sp,$sp,0x18 diff --git a/src/lib/lib_490b0.c b/src/lib/lib_490b0.c index dde6629d8..20c1d1e70 100644 --- a/src/lib/lib_490b0.c +++ b/src/lib/lib_490b0.c @@ -14,7 +14,7 @@ GLOBAL_ASM( glabel func000490b0 /* 490b0: 27bdffe0 */ addiu $sp,$sp,-32 /* 490b4: afbf0014 */ sw $ra,0x14($sp) -/* 490b8: 0c01256c */ jal func000495b0 +/* 490b8: 0c01256c */ jal __osDisableInt /* 490bc: afa40020 */ sw $a0,0x20($sp) /* 490c0: 3c0f8006 */ lui $t7,0x8006 /* 490c4: 8def0914 */ lw $t7,0x914($t7) @@ -26,7 +26,7 @@ glabel func000490b0 /* 490dc: 97190000 */ lhu $t9,0x0($t8) /* 490e0: 37280010 */ ori $t0,$t9,0x10 /* 490e4: a7080000 */ sh $t0,0x0($t8) -/* 490e8: 0c012588 */ jal func00049620 +/* 490e8: 0c012588 */ jal __osRestoreInt /* 490ec: 8fa4001c */ lw $a0,0x1c($sp) /* 490f0: 8fbf0014 */ lw $ra,0x14($sp) /* 490f4: 27bd0020 */ addiu $sp,$sp,0x20 @@ -50,7 +50,7 @@ GLOBAL_ASM( glabel func00049120 /* 49120: 27bdffc8 */ addiu $sp,$sp,-56 /* 49124: afbf001c */ sw $ra,0x1c($sp) -/* 49128: 0c01256c */ jal func000495b0 +/* 49128: 0c01256c */ jal __osDisableInt /* 4912c: afb00018 */ sw $s0,0x18($sp) /* 49130: 0c012144 */ jal func00048510 /* 49134: 00408025 */ or $s0,$v0,$zero @@ -66,7 +66,7 @@ glabel func00049120 /* 4915c: afb80030 */ sw $t8,0x30($sp) /* 49160: 02002025 */ or $a0,$s0,$zero /* 49164: afa9002c */ sw $t1,0x2c($sp) -/* 49168: 0c012588 */ jal func00049620 +/* 49168: 0c012588 */ jal __osRestoreInt /* 4916c: afa80028 */ sw $t0,0x28($sp) /* 49170: 8fb90030 */ lw $t9,0x30($sp) /* 49174: 8fad002c */ lw $t5,0x2c($sp) diff --git a/src/lib/lib_491b0.c b/src/lib/lib_491b0.c index abe2ca97f..3a2f71093 100644 --- a/src/lib/lib_491b0.c +++ b/src/lib/lib_491b0.c @@ -131,7 +131,7 @@ glabel func0004923c /* 4935c: 00000000 */ sll $zero,$zero,0x0 /* 49360: 01c02025 */ or $a0,$t6,$zero /* 49364: 8f25001c */ lw $a1,0x1c($t9) -/* 49368: 0c012238 */ jal func000488e0 +/* 49368: 0c012238 */ jal osSendMesg /* 4936c: 00003025 */ or $a2,$zero,$zero .L00049370: /* 49370: 8faf0024 */ lw $t7,0x24($sp) @@ -160,7 +160,7 @@ glabel func000493b4 /* 493b4: 27bdffd8 */ addiu $sp,$sp,-40 /* 493b8: afbf0014 */ sw $ra,0x14($sp) /* 493bc: afa40028 */ sw $a0,0x28($sp) -/* 493c0: 0c01256c */ jal func000495b0 +/* 493c0: 0c01256c */ jal __osDisableInt /* 493c4: afa5002c */ sw $a1,0x2c($sp) /* 493c8: 0c012144 */ jal func00048510 /* 493cc: afa2001c */ sw $v0,0x1c($sp) @@ -180,7 +180,7 @@ glabel func000493b4 /* 49404: afab0024 */ sw $t3,0x24($sp) /* 49408: 0c014620 */ jal func00051880 /* 4940c: 01602025 */ or $a0,$t3,$zero -/* 49410: 0c012588 */ jal func00049620 +/* 49410: 0c012588 */ jal __osRestoreInt /* 49414: 8fa4001c */ lw $a0,0x1c($sp) /* 49418: 8fbf0014 */ lw $ra,0x14($sp) /* 4941c: 27bd0028 */ addiu $sp,$sp,0x28 @@ -192,7 +192,7 @@ GLOBAL_ASM( glabel func00049428 /* 49428: 27bdffc8 */ addiu $sp,$sp,-56 /* 4942c: afbf0014 */ sw $ra,0x14($sp) -/* 49430: 0c01256c */ jal func000495b0 +/* 49430: 0c01256c */ jal __osDisableInt /* 49434: afa40038 */ sw $a0,0x38($sp) /* 49438: 3c0e8006 */ lui $t6,0x8006 /* 4943c: 8dce08a0 */ lw $t6,0x8a0($t6) @@ -284,7 +284,7 @@ glabel func00049428 /* 49588: 8faa0034 */ lw $t2,0x34($sp) /* 4958c: 8fa90038 */ lw $t1,0x38($sp) /* 49590: ad490004 */ sw $t1,0x4($t2) -/* 49594: 0c012588 */ jal func00049620 +/* 49594: 0c012588 */ jal __osRestoreInt /* 49598: 8fa40024 */ lw $a0,0x24($sp) /* 4959c: 8fbf0014 */ lw $ra,0x14($sp) /* 495a0: 8fa20028 */ lw $v0,0x28($sp) @@ -294,7 +294,7 @@ glabel func00049428 ); GLOBAL_ASM( -glabel func000495b0 +glabel __osDisableInt /* 495b0: 3c0a8006 */ lui $t2,%hi(var8005cf70) /* 495b4: 254acf70 */ addiu $t2,$t2,%lo(var8005cf70) /* 495b8: 8d4b0000 */ lw $t3,0x0($t2) @@ -327,7 +327,7 @@ glabel func000495b0 ); GLOBAL_ASM( -glabel func00049620 +glabel __osRestoreInt /* 49620: 40086000 */ mfc0 $t0,$12 /* 49624: 01044025 */ or $t0,$t0,$a0 /* 49628: 40886000 */ mtc0 $t0,$12 diff --git a/src/lib/lib_49780.c b/src/lib/lib_49780.c index 2a5bb7acb..c19b6ef13 100644 --- a/src/lib/lib_49780.c +++ b/src/lib/lib_49780.c @@ -29,7 +29,7 @@ glabel func00049790 /* 497b0: 31f80001 */ andi $t8,$t7,0x1 /* 497b4: afb8002c */ sw $t8,0x2c($sp) /* 497b8: 8e040004 */ lw $a0,0x4($s0) -/* 497bc: 0c012d20 */ jal func0004b480 +/* 497bc: 0c012d20 */ jal osVirtualToPhysical /* 497c0: afa50044 */ sw $a1,0x44($sp) /* 497c4: 8fb9002c */ lw $t9,0x2c($sp) /* 497c8: 8fa50044 */ lw $a1,0x44($sp) @@ -136,7 +136,7 @@ glabel func00049790 /* 49938: 8e040004 */ lw $a0,0x4($s0) /* 4993c: afa70038 */ sw $a3,0x38($sp) /* 49940: afa60024 */ sw $a2,0x24($sp) -/* 49944: 0c012d20 */ jal func0004b480 +/* 49944: 0c012d20 */ jal osVirtualToPhysical /* 49948: afa50044 */ sw $a1,0x44($sp) /* 4994c: 8fa50044 */ lw $a1,0x44($sp) /* 49950: 8fa60024 */ lw $a2,0x24($sp) @@ -155,7 +155,7 @@ glabel func00049790 /* 49980: ae0e002c */ sw $t6,0x2c($s0) /* 49984: afa70038 */ sw $a3,0x38($sp) /* 49988: afa60024 */ sw $a2,0x24($sp) -/* 4998c: 0c012d20 */ jal func0004b480 +/* 4998c: 0c012d20 */ jal osVirtualToPhysical /* 49990: afa50044 */ sw $a1,0x44($sp) /* 49994: 8fa50044 */ lw $a1,0x44($sp) /* 49998: 8fa60024 */ lw $a2,0x24($sp) diff --git a/src/lib/lib_49a90.c b/src/lib/lib_49a90.c index d02243cfd..760b7eb2f 100644 --- a/src/lib/lib_49a90.c +++ b/src/lib/lib_49a90.c @@ -23,12 +23,12 @@ glabel func00049a90 /* 49aa8: ac2e0920 */ sw $t6,0x920($at) /* 49aac: 24a5c7a0 */ addiu $a1,$a1,%lo(var8009c7a0) /* 49ab0: 2484c7a8 */ addiu $a0,$a0,%lo(var8009c7a8) -/* 49ab4: 0c0120d0 */ jal func00048340 +/* 49ab4: 0c0120d0 */ jal osCreateMesgQueue /* 49ab8: 24060001 */ addiu $a2,$zero,0x1 /* 49abc: 3c04800a */ lui $a0,%hi(var8009c7a8) /* 49ac0: 2484c7a8 */ addiu $a0,$a0,%lo(var8009c7a8) /* 49ac4: 00002825 */ or $a1,$zero,$zero -/* 49ac8: 0c012238 */ jal func000488e0 +/* 49ac8: 0c012238 */ jal osSendMesg /* 49acc: 00003025 */ or $a2,$zero,$zero /* 49ad0: 8fbf0014 */ lw $ra,0x14($sp) /* 49ad4: 27bd0018 */ addiu $sp,$sp,0x18 @@ -50,7 +50,7 @@ glabel func00049ae0 /* 49b00: 3c04800a */ lui $a0,%hi(var8009c7a8) /* 49b04: 2484c7a8 */ addiu $a0,$a0,%lo(var8009c7a8) /* 49b08: 27a5001c */ addiu $a1,$sp,0x1c -/* 49b0c: 0c0121bc */ jal func000486f0 +/* 49b0c: 0c0121bc */ jal osRecvMesg /* 49b10: 24060001 */ addiu $a2,$zero,0x1 /* 49b14: 8fbf0014 */ lw $ra,0x14($sp) /* 49b18: 27bd0020 */ addiu $sp,$sp,0x20 @@ -65,7 +65,7 @@ glabel func00049b24 /* 49b2c: 3c04800a */ lui $a0,%hi(var8009c7a8) /* 49b30: 2484c7a8 */ addiu $a0,$a0,%lo(var8009c7a8) /* 49b34: 00002825 */ or $a1,$zero,$zero -/* 49b38: 0c012238 */ jal func000488e0 +/* 49b38: 0c012238 */ jal osSendMesg /* 49b3c: 00003025 */ or $a2,$zero,$zero /* 49b40: 8fbf0014 */ lw $ra,0x14($sp) /* 49b44: 27bd0018 */ addiu $sp,$sp,0x18 @@ -88,7 +88,7 @@ glabel func00049b24 /* 49b84: 55e0fffe */ bnezl $t7,.L00049b80 /* 49b88: 8c620000 */ lw $v0,0x0($v1) .L00049b8c: -/* 49b8c: 0c012d20 */ jal func0004b480 +/* 49b8c: 0c012d20 */ jal osVirtualToPhysical /* 49b90: afa70024 */ sw $a3,0x24($sp) /* 49b94: 8fa30018 */ lw $v1,0x18($sp) /* 49b98: 8fa70024 */ lw $a3,0x24($sp) diff --git a/src/lib/lib_49c20.c b/src/lib/lib_49c20.c index f756cbef3..9b8aa1dc8 100644 --- a/src/lib/lib_49c20.c +++ b/src/lib/lib_49c20.c @@ -115,7 +115,7 @@ glabel func00049c20 /* 49d68: a0690008 */ sb $t1,0x8($v1) /* 49d6c: 00e02025 */ or $a0,$a3,$zero .L00049d70: -/* 49d70: 0c012d20 */ jal func0004b480 +/* 49d70: 0c012d20 */ jal osVirtualToPhysical /* 49d74: afa50024 */ sw $a1,0x24($sp) /* 49d78: 8fa50024 */ lw $a1,0x24($sp) /* 49d7c: 3c0aa460 */ lui $t2,0xa460 @@ -178,7 +178,7 @@ glabel func00049c20 /* 49e4c: 8e840008 */ lw $a0,0x8($s4) .L00049e50: /* 49e50: 27a50074 */ addiu $a1,$sp,0x74 -/* 49e54: 0c0121bc */ jal func000486f0 +/* 49e54: 0c0121bc */ jal osRecvMesg /* 49e58: 02e03025 */ or $a2,$s7,$zero /* 49e5c: 8fae0074 */ lw $t6,0x74($sp) /* 49e60: 8fa80074 */ lw $t0,0x74($sp) @@ -225,7 +225,7 @@ glabel func00049c20 /* 49efc: 10000001 */ beqz $zero,.L00049f04 /* 49f00: 02e09025 */ or $s2,$s7,$zero .L00049f04: -/* 49f04: 0c0121bc */ jal func000486f0 +/* 49f04: 0c0121bc */ jal osRecvMesg /* 49f08: 8e840010 */ lw $a0,0x10($s4) /* 49f0c: 3c040010 */ lui $a0,0x10 /* 49f10: 0c014628 */ jal func000518a0 @@ -241,7 +241,7 @@ glabel func00049c20 .L00049f38: /* 49f38: 8e84000c */ lw $a0,0xc($s4) /* 49f3c: 02c02825 */ or $a1,$s6,$zero -/* 49f40: 0c0121bc */ jal func000486f0 +/* 49f40: 0c0121bc */ jal osRecvMesg /* 49f44: 02e03025 */ or $a2,$s7,$zero /* 49f48: 8fb90074 */ lw $t9,0x74($sp) /* 49f4c: 8f240014 */ lw $a0,0x14($t9) @@ -295,7 +295,7 @@ glabel func00049c20 /* 4a008: 8fa50074 */ lw $a1,0x74($sp) .L0004a00c: /* 4a00c: 00003025 */ or $a2,$zero,$zero -/* 4a010: 0c012238 */ jal func000488e0 +/* 4a010: 0c012238 */ jal osSendMesg /* 4a014: 8ca40004 */ lw $a0,0x4($a1) /* 4a018: 16570007 */ bne $s2,$s7,.L0004a038 /* 4a01c: 8fac0074 */ lw $t4,0x74($sp) @@ -309,7 +309,7 @@ glabel func00049c20 /* 4a038: 8e840010 */ lw $a0,0x10($s4) .L0004a03c: /* 4a03c: 00002825 */ or $a1,$zero,$zero -/* 4a040: 0c012238 */ jal func000488e0 +/* 4a040: 0c012238 */ jal osSendMesg /* 4a044: 00003025 */ or $a2,$zero,$zero /* 4a048: 8faf0074 */ lw $t7,0x74($sp) /* 4a04c: 8df80014 */ lw $t8,0x14($t7) @@ -333,7 +333,7 @@ glabel func00049c20 /* 4a090: 00000000 */ sll $zero,$zero,0x0 /* 4a094: 8e840010 */ lw $a0,0x10($s4) /* 4a098: 27a5006c */ addiu $a1,$sp,0x6c -/* 4a09c: 0c0121bc */ jal func000486f0 +/* 4a09c: 0c0121bc */ jal osRecvMesg /* 4a0a0: 02e03025 */ or $a2,$s7,$zero /* 4a0a4: 8fab0074 */ lw $t3,0x74($sp) /* 4a0a8: 8e990014 */ lw $t9,0x14($s4) @@ -346,7 +346,7 @@ glabel func00049c20 /* 4a0c4: 00408025 */ or $s0,$v0,$zero /* 4a0c8: 8e840010 */ lw $a0,0x10($s4) /* 4a0cc: 27a5006c */ addiu $a1,$sp,0x6c -/* 4a0d0: 0c0121bc */ jal func000486f0 +/* 4a0d0: 0c0121bc */ jal osRecvMesg /* 4a0d4: 02e03025 */ or $a2,$s7,$zero /* 4a0d8: 8fac0074 */ lw $t4,0x74($sp) /* 4a0dc: 8e990014 */ lw $t9,0x14($s4) @@ -359,7 +359,7 @@ glabel func00049c20 /* 4a0f8: 00408025 */ or $s0,$v0,$zero /* 4a0fc: 8e840010 */ lw $a0,0x10($s4) /* 4a100: 27a5006c */ addiu $a1,$sp,0x6c -/* 4a104: 0c0121bc */ jal func000486f0 +/* 4a104: 0c0121bc */ jal osRecvMesg /* 4a108: 02e03025 */ or $a2,$s7,$zero /* 4a10c: 8fad0074 */ lw $t5,0x74($sp) /* 4a110: 00002825 */ or $a1,$zero,$zero @@ -375,7 +375,7 @@ glabel func00049c20 /* 4a138: 00408025 */ or $s0,$v0,$zero /* 4a13c: 8e840010 */ lw $a0,0x10($s4) /* 4a140: 27a5006c */ addiu $a1,$sp,0x6c -/* 4a144: 0c0121bc */ jal func000486f0 +/* 4a144: 0c0121bc */ jal osRecvMesg /* 4a148: 02e03025 */ or $a2,$s7,$zero /* 4a14c: 8faf0074 */ lw $t7,0x74($sp) /* 4a150: 02e02825 */ or $a1,$s7,$zero @@ -392,7 +392,7 @@ glabel func00049c20 /* 4a17c: 8fa50074 */ lw $a1,0x74($sp) /* 4a180: 00003025 */ or $a2,$zero,$zero /* 4a184: 2410ffff */ addiu $s0,$zero,-1 -/* 4a188: 0c012238 */ jal func000488e0 +/* 4a188: 0c012238 */ jal osSendMesg /* 4a18c: 8ca40004 */ lw $a0,0x4($a1) /* 4a190: 10000002 */ beqz $zero,.L0004a19c /* 4a194: 00000000 */ sll $zero,$zero,0x0 @@ -402,15 +402,15 @@ glabel func00049c20 /* 4a19c: 1600ff2b */ bnez $s0,.L00049e4c /* 4a1a0: 02c02825 */ or $a1,$s6,$zero /* 4a1a4: 8e84000c */ lw $a0,0xc($s4) -/* 4a1a8: 0c0121bc */ jal func000486f0 +/* 4a1a8: 0c0121bc */ jal osRecvMesg /* 4a1ac: 02e03025 */ or $a2,$s7,$zero /* 4a1b0: 8fa50074 */ lw $a1,0x74($sp) /* 4a1b4: 00003025 */ or $a2,$zero,$zero -/* 4a1b8: 0c012238 */ jal func000488e0 +/* 4a1b8: 0c012238 */ jal osSendMesg /* 4a1bc: 8ca40004 */ lw $a0,0x4($a1) /* 4a1c0: 8e840010 */ lw $a0,0x10($s4) /* 4a1c4: 00002825 */ or $a1,$zero,$zero -/* 4a1c8: 0c012238 */ jal func000488e0 +/* 4a1c8: 0c012238 */ jal osSendMesg /* 4a1cc: 00003025 */ or $a2,$zero,$zero /* 4a1d0: 1000ff1f */ beqz $zero,.L00049e50 /* 4a1d4: 8e840008 */ lw $a0,0x8($s4) @@ -460,7 +460,7 @@ glabel func0004a250 /* 4a258: afa40038 */ sw $a0,0x38($sp) /* 4a25c: afb20020 */ sw $s2,0x20($sp) /* 4a260: afb1001c */ sw $s1,0x1c($sp) -/* 4a264: 0c01256c */ jal func000495b0 +/* 4a264: 0c01256c */ jal __osDisableInt /* 4a268: afb00018 */ sw $s0,0x18($sp) /* 4a26c: 8fae0038 */ lw $t6,0x38($sp) /* 4a270: 00408025 */ or $s0,$v0,$zero @@ -516,10 +516,10 @@ glabel func0004a250 /* 4a320: 8faf0038 */ lw $t7,0x38($sp) /* 4a324: 15f90003 */ bne $t7,$t9,.L0004a334 /* 4a328: 00000000 */ sll $zero,$zero,0x0 -/* 4a32c: 0c000f44 */ jal func00003d10 +/* 4a32c: 0c000f44 */ jal __osDispatchThread /* 4a330: 00000000 */ sll $zero,$zero,0x0 .L0004a334: -/* 4a334: 0c012588 */ jal func00049620 +/* 4a334: 0c012588 */ jal __osRestoreInt /* 4a338: 02002025 */ or $a0,$s0,$zero /* 4a33c: 8fbf0024 */ lw $ra,0x24($sp) /* 4a340: 8fb00018 */ lw $s0,0x18($sp) diff --git a/src/lib/lib_4a810.c b/src/lib/lib_4a810.c index e63f7fbdc..0d5a374c4 100644 --- a/src/lib/lib_4a810.c +++ b/src/lib/lib_4a810.c @@ -15,7 +15,7 @@ #include "types.h" GLOBAL_ASM( -glabel func0004a810 +glabel __osSiCreateAccessQueue /* 4a810: 27bdffe8 */ addiu $sp,$sp,-24 /* 4a814: afbf0014 */ sw $ra,0x14($sp) /* 4a818: 240e0001 */ addiu $t6,$zero,0x1 @@ -25,12 +25,12 @@ glabel func0004a810 /* 4a828: ac2e0950 */ sw $t6,0x950($at) /* 4a82c: 24a5c7c0 */ addiu $a1,$a1,%lo(var8009c7c0) /* 4a830: 2484c7c8 */ addiu $a0,$a0,%lo(var8009c7c8) -/* 4a834: 0c0120d0 */ jal func00048340 +/* 4a834: 0c0120d0 */ jal osCreateMesgQueue /* 4a838: 24060001 */ addiu $a2,$zero,0x1 /* 4a83c: 3c04800a */ lui $a0,%hi(var8009c7c8) /* 4a840: 2484c7c8 */ addiu $a0,$a0,%lo(var8009c7c8) /* 4a844: 00002825 */ or $a1,$zero,$zero -/* 4a848: 0c012238 */ jal func000488e0 +/* 4a848: 0c012238 */ jal osSendMesg /* 4a84c: 00003025 */ or $a2,$zero,$zero /* 4a850: 8fbf0014 */ lw $ra,0x14($sp) /* 4a854: 27bd0018 */ addiu $sp,$sp,0x18 @@ -39,20 +39,20 @@ glabel func0004a810 ); GLOBAL_ASM( -glabel func0004a860 +glabel __osSiGetAccess /* 4a860: 3c0e8006 */ lui $t6,0x8006 /* 4a864: 8dce0950 */ lw $t6,0x950($t6) /* 4a868: 27bdffe0 */ addiu $sp,$sp,-32 /* 4a86c: afbf0014 */ sw $ra,0x14($sp) /* 4a870: 15c00003 */ bnez $t6,.L0004a880 /* 4a874: 00000000 */ sll $zero,$zero,0x0 -/* 4a878: 0c012a04 */ jal func0004a810 +/* 4a878: 0c012a04 */ jal __osSiCreateAccessQueue /* 4a87c: 00000000 */ sll $zero,$zero,0x0 .L0004a880: /* 4a880: 3c04800a */ lui $a0,%hi(var8009c7c8) /* 4a884: 2484c7c8 */ addiu $a0,$a0,%lo(var8009c7c8) /* 4a888: 27a5001c */ addiu $a1,$sp,0x1c -/* 4a88c: 0c0121bc */ jal func000486f0 +/* 4a88c: 0c0121bc */ jal osRecvMesg /* 4a890: 24060001 */ addiu $a2,$zero,0x1 /* 4a894: 8fbf0014 */ lw $ra,0x14($sp) /* 4a898: 27bd0020 */ addiu $sp,$sp,0x20 @@ -61,13 +61,13 @@ glabel func0004a860 ); GLOBAL_ASM( -glabel func0004a8a4 +glabel __osSiRelAccess /* 4a8a4: 27bdffe8 */ addiu $sp,$sp,-24 /* 4a8a8: afbf0014 */ sw $ra,0x14($sp) /* 4a8ac: 3c04800a */ lui $a0,%hi(var8009c7c8) /* 4a8b0: 2484c7c8 */ addiu $a0,$a0,%lo(var8009c7c8) /* 4a8b4: 00002825 */ or $a1,$zero,$zero -/* 4a8b8: 0c012238 */ jal func000488e0 +/* 4a8b8: 0c012238 */ jal osSendMesg /* 4a8bc: 00003025 */ or $a2,$zero,$zero /* 4a8c0: 8fbf0014 */ lw $ra,0x14($sp) /* 4a8c4: 27bd0018 */ addiu $sp,$sp,0x18 @@ -76,7 +76,7 @@ glabel func0004a8a4 ); GLOBAL_ASM( -glabel func0004a8d0 +glabel __osSiRawStartDma /* 4a8d0: 27bdffe8 */ addiu $sp,$sp,-24 /* 4a8d4: afbf0014 */ sw $ra,0x14($sp) /* 4a8d8: afa5001c */ sw $a1,0x1c($sp) @@ -93,12 +93,12 @@ glabel func0004a8d0 /* 4a900: 14c10005 */ bne $a2,$at,.L0004a918 /* 4a904: 8fa4001c */ lw $a0,0x1c($sp) /* 4a908: 24050040 */ addiu $a1,$zero,0x40 -/* 4a90c: 0c012b60 */ jal func0004ad80 +/* 4a90c: 0c012b60 */ jal osWritebackDCache /* 4a910: afa60018 */ sw $a2,0x18($sp) /* 4a914: 8fa60018 */ lw $a2,0x18($sp) .L0004a918: /* 4a918: 8fa4001c */ lw $a0,0x1c($sp) -/* 4a91c: 0c012d20 */ jal func0004b480 +/* 4a91c: 0c012d20 */ jal osVirtualToPhysical /* 4a920: afa60018 */ sw $a2,0x18($sp) /* 4a924: 8fa60018 */ lw $a2,0x18($sp) /* 4a928: 3c19a480 */ lui $t9,0xa480 @@ -117,7 +117,7 @@ glabel func0004a8d0 .L0004a958: /* 4a958: 14c00003 */ bnez $a2,.L0004a968 /* 4a95c: 8fa4001c */ lw $a0,0x1c($sp) -/* 4a960: 0c013920 */ jal func0004e480 +/* 4a960: 0c013920 */ jal osInvalDCache /* 4a964: 24050040 */ addiu $a1,$zero,0x40 .L0004a968: /* 4a968: 00001025 */ or $v0,$zero,$zero diff --git a/src/lib/lib_4a980.c b/src/lib/lib_4a980.c index c62d01210..442d39b30 100644 --- a/src/lib/lib_4a980.c +++ b/src/lib/lib_4a980.c @@ -43,7 +43,7 @@ glabel func0004a980 /* 4a9e0: 00000000 */ sll $zero,$zero,0x0 /* 4a9e4: 27a40028 */ addiu $a0,$sp,0x28 /* 4a9e8: 27a5006c */ addiu $a1,$sp,0x6c -/* 4a9ec: 0c0120d0 */ jal func00048340 +/* 4a9ec: 0c0120d0 */ jal osCreateMesgQueue /* 4a9f0: 24060001 */ addiu $a2,$zero,0x1 /* 4a9f4: 8fa80060 */ lw $t0,0x60($sp) /* 4a9f8: 8fa90064 */ lw $t1,0x64($sp) @@ -66,7 +66,7 @@ glabel func0004a980 /* 4aa3c: 01693823 */ subu $a3,$t3,$t1 /* 4aa40: 27a40028 */ addiu $a0,$sp,0x28 /* 4aa44: 27a5006c */ addiu $a1,$sp,0x6c -/* 4aa48: 0c0121bc */ jal func000486f0 +/* 4aa48: 0c0121bc */ jal osRecvMesg /* 4aa4c: 24060001 */ addiu $a2,$zero,0x1 .L0004aa50: /* 4aa50: 24180004 */ addiu $t8,$zero,0x4 @@ -76,33 +76,33 @@ glabel func0004a980 /* 4aa60: 00002025 */ or $a0,$zero,$zero /* 4aa64: 3c05800a */ lui $a1,%hi(var8009c7e0) /* 4aa68: 24a5c7e0 */ addiu $a1,$a1,%lo(var8009c7e0) -/* 4aa6c: 0c012a34 */ jal func0004a8d0 +/* 4aa6c: 0c012a34 */ jal __osSiRawStartDma /* 4aa70: 24040001 */ addiu $a0,$zero,0x1 /* 4aa74: afa20068 */ sw $v0,0x68($sp) /* 4aa78: 8fa40070 */ lw $a0,0x70($sp) /* 4aa7c: 27a5006c */ addiu $a1,$sp,0x6c -/* 4aa80: 0c0121bc */ jal func000486f0 +/* 4aa80: 0c0121bc */ jal osRecvMesg /* 4aa84: 24060001 */ addiu $a2,$zero,0x1 /* 4aa88: 3c05800a */ lui $a1,%hi(var8009c7e0) /* 4aa8c: 24a5c7e0 */ addiu $a1,$a1,%lo(var8009c7e0) -/* 4aa90: 0c012a34 */ jal func0004a8d0 +/* 4aa90: 0c012a34 */ jal __osSiRawStartDma /* 4aa94: 00002025 */ or $a0,$zero,$zero /* 4aa98: afa20068 */ sw $v0,0x68($sp) /* 4aa9c: 8fa40070 */ lw $a0,0x70($sp) /* 4aaa0: 27a5006c */ addiu $a1,$sp,0x6c -/* 4aaa4: 0c0121bc */ jal func000486f0 +/* 4aaa4: 0c0121bc */ jal osRecvMesg /* 4aaa8: 24060001 */ addiu $a2,$zero,0x1 /* 4aaac: 8fa40074 */ lw $a0,0x74($sp) /* 4aab0: 0c012abc */ jal func0004aaf0 /* 4aab4: 8fa50078 */ lw $a1,0x78($sp) /* 4aab8: 3c01800a */ lui $at,0x800a -/* 4aabc: 0c012a04 */ jal func0004a810 +/* 4aabc: 0c012a04 */ jal __osSiCreateAccessQueue /* 4aac0: a020c820 */ sb $zero,-0x37e0($at) /* 4aac4: 3c04800a */ lui $a0,%hi(var8009c848) /* 4aac8: 3c05800a */ lui $a1,%hi(var8009c860) /* 4aacc: 24a5c860 */ addiu $a1,$a1,%lo(var8009c860) /* 4aad0: 2484c848 */ addiu $a0,$a0,%lo(var8009c848) -/* 4aad4: 0c0120d0 */ jal func00048340 +/* 4aad4: 0c0120d0 */ jal osCreateMesgQueue /* 4aad8: 24060001 */ addiu $a2,$zero,0x1 /* 4aadc: 8fa20068 */ lw $v0,0x68($sp) .L0004aae0: diff --git a/src/lib/lib_4ad80.c b/src/lib/lib_4ad80.c index 9ba8628e1..483d2c8fd 100644 --- a/src/lib/lib_4ad80.c +++ b/src/lib/lib_4ad80.c @@ -8,7 +8,7 @@ #include "types.h" GLOBAL_ASM( -glabel func0004ad80 +glabel osWritebackDCache /* 4ad80: 18a00011 */ blez $a1,.L0004adc8 /* 4ad84: 00000000 */ sll $zero,$zero,0x0 /* 4ad88: 240b2000 */ addiu $t3,$zero,0x2000 diff --git a/src/lib/lib_4b480.c b/src/lib/lib_4b480.c index d1a3e4e5c..ae91eef04 100644 --- a/src/lib/lib_4b480.c +++ b/src/lib/lib_4b480.c @@ -9,7 +9,7 @@ #include "types.h" GLOBAL_ASM( -glabel func0004b480 +glabel osVirtualToPhysical /* 4b480: 27bdffe8 */ addiu $sp,$sp,-24 /* 4b484: afa40018 */ sw $a0,0x18($sp) /* 4b488: 8fae0018 */ lw $t6,0x18($sp) @@ -37,7 +37,7 @@ glabel func0004b480 /* 4b4dc: 10000003 */ beqz $zero,.L0004b4ec /* 4b4e0: 01e11024 */ and $v0,$t7,$at .L0004b4e4: -/* 4b4e4: 0c014724 */ jal func00051c90 +/* 4b4e4: 0c014724 */ jal __osProbeTLB /* 4b4e8: 8fa40018 */ lw $a0,0x18($sp) .L0004b4ec: /* 4b4ec: 8fbf0014 */ lw $ra,0x14($sp) diff --git a/src/lib/lib_4b550.c b/src/lib/lib_4b550.c index ffbed6f26..f757c9c8b 100644 --- a/src/lib/lib_4b550.c +++ b/src/lib/lib_4b550.c @@ -25,7 +25,7 @@ glabel func0004b550 .L0004b57c: /* 4b57c: 3c0fa404 */ lui $t7,0xa404 /* 4b580: adee0000 */ sw $t6,0x0($t7) -/* 4b584: 0c012d20 */ jal func0004b480 +/* 4b584: 0c012d20 */ jal osVirtualToPhysical /* 4b588: 8fa40020 */ lw $a0,0x20($sp) /* 4b58c: 3c18a404 */ lui $t8,0xa404 /* 4b590: af020004 */ sw $v0,0x4($t8) diff --git a/src/lib/lib_4b5e0.c b/src/lib/lib_4b5e0.c index 64fae329b..27b57b761 100644 --- a/src/lib/lib_4b5e0.c +++ b/src/lib/lib_4b5e0.c @@ -31,7 +31,7 @@ glabel func0004b5e0 ); GLOBAL_ASM( -glabel func0004b610 +glabel __osContRamWrite /* 4b610: 27bdff98 */ addiu $sp,$sp,-104 /* 4b614: 8faf0078 */ lw $t7,0x78($sp) /* 4b618: afb5002c */ sw $s5,0x2c($sp) @@ -63,7 +63,7 @@ glabel func0004b610 .L0004b680: /* 4b680: 00c08025 */ or $s0,$a2,$zero .L0004b684: -/* 4b684: 0c012a18 */ jal func0004a860 +/* 4b684: 0c012a18 */ jal __osSiGetAccess /* 4b688: a7a60072 */ sh $a2,0x72($sp) /* 4b68c: 0010c0c3 */ sra $t8,$s0,0x3 /* 4b690: 0010c940 */ sll $t9,$s0,0x5 @@ -135,21 +135,21 @@ glabel func0004b610 /* 4b780: 0c012c5c */ jal func0004b170 /* 4b784: 8fa40074 */ lw $a0,0x74($sp) /* 4b788: 24040001 */ addiu $a0,$zero,0x1 -/* 4b78c: 0c012a34 */ jal func0004a8d0 +/* 4b78c: 0c012a34 */ jal __osSiRawStartDma /* 4b790: 02602825 */ or $a1,$s3,$zero /* 4b794: 0c014788 */ jal func00051e20 /* 4b798: 8fa40074 */ lw $a0,0x74($sp) /* 4b79c: 305200ff */ andi $s2,$v0,0xff /* 4b7a0: 02a02025 */ or $a0,$s5,$zero /* 4b7a4: 00002825 */ or $a1,$zero,$zero -/* 4b7a8: 0c0121bc */ jal func000486f0 +/* 4b7a8: 0c0121bc */ jal osRecvMesg /* 4b7ac: 24060001 */ addiu $a2,$zero,0x1 /* 4b7b0: 00002025 */ or $a0,$zero,$zero -/* 4b7b4: 0c012a34 */ jal func0004a8d0 +/* 4b7b4: 0c012a34 */ jal __osSiRawStartDma /* 4b7b8: 02602825 */ or $a1,$s3,$zero /* 4b7bc: 02a02025 */ or $a0,$s5,$zero /* 4b7c0: 00002825 */ or $a1,$zero,$zero -/* 4b7c4: 0c0121bc */ jal func000486f0 +/* 4b7c4: 0c0121bc */ jal osRecvMesg /* 4b7c8: 24060001 */ addiu $a2,$zero,0x1 /* 4b7cc: 92030002 */ lbu $v1,0x2($s0) /* 4b7d0: 306900c0 */ andi $t1,$v1,0xc0 @@ -160,7 +160,7 @@ glabel func0004b610 /* 4b7e4: 02a02025 */ or $a0,$s5,$zero /* 4b7e8: 51720009 */ beql $t3,$s2,.L0004b810 /* 4b7ec: 24010004 */ addiu $at,$zero,0x4 -/* 4b7f0: 0c012ea4 */ jal func0004ba90 +/* 4b7f0: 0c012ea4 */ jal __osPfsGetStatus /* 4b7f4: 02202825 */ or $a1,$s1,$zero /* 4b7f8: 14400009 */ bnez $v0,.L0004b820 /* 4b7fc: 00401825 */ or $v1,$v0,$zero @@ -175,7 +175,7 @@ glabel func0004b610 /* 4b818: 1040ffa7 */ beqz $v0,.L0004b6b8 /* 4b81c: 2694ffff */ addiu $s4,$s4,-1 .L0004b820: -/* 4b820: 0c012a29 */ jal func0004a8a4 +/* 4b820: 0c012a29 */ jal __osSiRelAccess /* 4b824: afa30064 */ sw $v1,0x64($sp) /* 4b828: 8fa20064 */ lw $v0,0x64($sp) .L0004b82c: @@ -195,7 +195,7 @@ glabel func0004b610 ); GLOBAL_ASM( -glabel func0004b860 +glabel __osContRamRead /* 4b860: 27bdffa0 */ addiu $sp,$sp,-96 /* 4b864: afbf003c */ sw $ra,0x3c($sp) /* 4b868: afb60030 */ sw $s6,0x30($sp) @@ -211,7 +211,7 @@ glabel func0004b860 /* 4b890: afb00018 */ sw $s0,0x18($sp) /* 4b894: afa60068 */ sw $a2,0x68($sp) /* 4b898: afa7006c */ sw $a3,0x6c($sp) -/* 4b89c: 0c012a18 */ jal func0004a860 +/* 4b89c: 0c012a18 */ jal __osSiGetAccess /* 4b8a0: 24150002 */ addiu $s5,$zero,0x2 /* 4b8a4: 97a5006a */ lhu $a1,0x6a($sp) /* 4b8a8: 3c1e8006 */ lui $s8,%hi(var80060970) @@ -282,18 +282,18 @@ glabel func0004b860 /* 4b990: 24040001 */ addiu $a0,$zero,0x1 /* 4b994: 02802825 */ or $a1,$s4,$zero /* 4b998: 00594025 */ or $t0,$v0,$t9 -/* 4b99c: 0c012a34 */ jal func0004a8d0 +/* 4b99c: 0c012a34 */ jal __osSiRawStartDma /* 4b9a0: a2080005 */ sb $t0,0x5($s0) /* 4b9a4: 02c02025 */ or $a0,$s6,$zero /* 4b9a8: 00002825 */ or $a1,$zero,$zero -/* 4b9ac: 0c0121bc */ jal func000486f0 +/* 4b9ac: 0c0121bc */ jal osRecvMesg /* 4b9b0: 24060001 */ addiu $a2,$zero,0x1 /* 4b9b4: 00002025 */ or $a0,$zero,$zero -/* 4b9b8: 0c012a34 */ jal func0004a8d0 +/* 4b9b8: 0c012a34 */ jal __osSiRawStartDma /* 4b9bc: 02802825 */ or $a1,$s4,$zero /* 4b9c0: 02c02025 */ or $a0,$s6,$zero /* 4b9c4: 00002825 */ or $a1,$zero,$zero -/* 4b9c8: 0c0121bc */ jal func000486f0 +/* 4b9c8: 0c0121bc */ jal osRecvMesg /* 4b9cc: 24060001 */ addiu $a2,$zero,0x1 /* 4b9d0: 92130002 */ lbu $s3,0x2($s0) /* 4b9d4: 26120006 */ addiu $s2,$s0,0x6 @@ -309,7 +309,7 @@ glabel func0004b860 /* 4b9fc: 11620008 */ beq $t3,$v0,.L0004ba20 /* 4ba00: 00000000 */ sll $zero,$zero,0x0 /* 4ba04: 02c02025 */ or $a0,$s6,$zero -/* 4ba08: 0c012ea4 */ jal func0004ba90 +/* 4ba08: 0c012ea4 */ jal __osPfsGetStatus /* 4ba0c: 02202825 */ or $a1,$s1,$zero /* 4ba10: 1440000d */ bnez $v0,.L0004ba48 /* 4ba14: 00409825 */ or $s3,$v0,$zero @@ -329,7 +329,7 @@ glabel func0004b860 /* 4ba40: 1040ffa3 */ beqz $v0,.L0004b8d0 /* 4ba44: 26b5ffff */ addiu $s5,$s5,-1 .L0004ba48: -/* 4ba48: 0c012a29 */ jal func0004a8a4 +/* 4ba48: 0c012a29 */ jal __osSiRelAccess /* 4ba4c: 00000000 */ sll $zero,$zero,0x0 /* 4ba50: 8fbf003c */ lw $ra,0x3c($sp) /* 4ba54: 02601025 */ or $v0,$s3,$zero diff --git a/src/lib/lib_4ba90.c b/src/lib/lib_4ba90.c index 3fe278884..ba90b9013 100644 --- a/src/lib/lib_4ba90.c +++ b/src/lib/lib_4ba90.c @@ -11,7 +11,7 @@ #include "types.h" GLOBAL_ASM( -glabel func0004ba90 +glabel __osPfsGetStatus /* 4ba90: 27bdffd0 */ addiu $sp,$sp,-48 /* 4ba94: afa40030 */ sw $a0,0x30($sp) /* 4ba98: afbf0014 */ sw $ra,0x14($sp) @@ -20,27 +20,27 @@ glabel func0004ba90 /* 4baa4: 3c018006 */ lui $at,0x8006 /* 4baa8: 00a02025 */ or $a0,$a1,$zero /* 4baac: a02e0984 */ sb $t6,0x984($at) -/* 4bab0: 0c012ed8 */ jal func0004bb60 +/* 4bab0: 0c012ed8 */ jal __osPfsRequestOneChannel /* 4bab4: 00002825 */ or $a1,$zero,$zero /* 4bab8: 3c058009 */ lui $a1,%hi(var80090a20) /* 4babc: 24a50a20 */ addiu $a1,$a1,%lo(var80090a20) -/* 4bac0: 0c012a34 */ jal func0004a8d0 +/* 4bac0: 0c012a34 */ jal __osSiRawStartDma /* 4bac4: 24040001 */ addiu $a0,$zero,0x1 /* 4bac8: 8fa40030 */ lw $a0,0x30($sp) /* 4bacc: 27a50028 */ addiu $a1,$sp,0x28 -/* 4bad0: 0c0121bc */ jal func000486f0 +/* 4bad0: 0c0121bc */ jal osRecvMesg /* 4bad4: 24060001 */ addiu $a2,$zero,0x1 /* 4bad8: 3c058009 */ lui $a1,%hi(var80090a20) /* 4badc: 24a50a20 */ addiu $a1,$a1,%lo(var80090a20) -/* 4bae0: 0c012a34 */ jal func0004a8d0 +/* 4bae0: 0c012a34 */ jal __osSiRawStartDma /* 4bae4: 00002025 */ or $a0,$zero,$zero /* 4bae8: afa2002c */ sw $v0,0x2c($sp) /* 4baec: 8fa40030 */ lw $a0,0x30($sp) /* 4baf0: 27a50028 */ addiu $a1,$sp,0x28 -/* 4baf4: 0c0121bc */ jal func000486f0 +/* 4baf4: 0c0121bc */ jal osRecvMesg /* 4baf8: 24060001 */ addiu $a2,$zero,0x1 /* 4bafc: 8fa40034 */ lw $a0,0x34($sp) -/* 4bb00: 0c012f09 */ jal func0004bc24 +/* 4bb00: 0c012f09 */ jal __osPfsGetOneChannelData /* 4bb04: 27a50024 */ addiu $a1,$sp,0x24 /* 4bb08: 93a20026 */ lbu $v0,0x26($sp) /* 4bb0c: 93b80027 */ lbu $t8,0x27($sp) @@ -71,7 +71,7 @@ glabel func0004ba90 ); GLOBAL_ASM( -glabel func0004bb60 +glabel __osPfsRequestOneChannel /* 4bb60: 27bdffe8 */ addiu $sp,$sp,-24 /* 4bb64: 3c068009 */ lui $a2,0x8009 /* 4bb68: 240700fe */ addiu $a3,$zero,0xfe @@ -127,7 +127,7 @@ glabel func0004bb60 ); GLOBAL_ASM( -glabel func0004bc24 +glabel __osPfsGetOneChannelData /* 4bc24: 3c028009 */ lui $v0,%hi(var80090a20) /* 4bc28: 27bdffe8 */ addiu $sp,$sp,-24 /* 4bc2c: 24420a20 */ addiu $v0,$v0,%lo(var80090a20) @@ -181,7 +181,7 @@ glabel func0004bcc0 /* 4bccc: 00808825 */ or $s1,$a0,$zero /* 4bcd0: afb00014 */ sw $s0,0x14($sp) /* 4bcd4: afa5004c */ sw $a1,0x4c($sp) -/* 4bcd8: 0c012a18 */ jal func0004a860 +/* 4bcd8: 0c012a18 */ jal __osSiGetAccess /* 4bcdc: afa60050 */ sw $a2,0x50($sp) /* 4bce0: 27b0002c */ addiu $s0,$sp,0x2c /* 4bce4: 02002825 */ or $a1,$s0,$zero @@ -214,7 +214,7 @@ glabel func0004bcc0 .L0004bd48: /* 4bd48: 10600005 */ beqz $v1,.L0004bd60 /* 4bd4c: 93a8002e */ lbu $t0,0x2e($sp) -/* 4bd50: 0c012a29 */ jal func0004a8a4 +/* 4bd50: 0c012a29 */ jal __osSiRelAccess /* 4bd54: afa30044 */ sw $v1,0x44($sp) /* 4bd58: 10000032 */ beqz $zero,.L0004be24 /* 4bd5c: 8fa20044 */ lw $v0,0x44($sp) @@ -235,22 +235,22 @@ glabel func0004bcc0 /* 4bd8c: 8fa50050 */ lw $a1,0x50($sp) /* 4bd90: 3c05800a */ lui $a1,%hi(var8009ca80) /* 4bd94: 24a5ca80 */ addiu $a1,$a1,%lo(var8009ca80) -/* 4bd98: 0c012a34 */ jal func0004a8d0 +/* 4bd98: 0c012a34 */ jal __osSiRawStartDma /* 4bd9c: 24040001 */ addiu $a0,$zero,0x1 /* 4bda0: 02202025 */ or $a0,$s1,$zero /* 4bda4: 00002825 */ or $a1,$zero,$zero -/* 4bda8: 0c0121bc */ jal func000486f0 +/* 4bda8: 0c0121bc */ jal osRecvMesg /* 4bdac: 24060001 */ addiu $a2,$zero,0x1 /* 4bdb0: 3c05800a */ lui $a1,%hi(var8009ca80) /* 4bdb4: 24a5ca80 */ addiu $a1,$a1,%lo(var8009ca80) -/* 4bdb8: 0c012a34 */ jal func0004a8d0 +/* 4bdb8: 0c012a34 */ jal __osSiRawStartDma /* 4bdbc: 00002025 */ or $a0,$zero,$zero /* 4bdc0: 240c0005 */ addiu $t4,$zero,0x5 /* 4bdc4: 3c01800a */ lui $at,0x800a /* 4bdc8: a02cc820 */ sb $t4,-0x37e0($at) /* 4bdcc: 02202025 */ or $a0,$s1,$zero /* 4bdd0: 00002825 */ or $a1,$zero,$zero -/* 4bdd4: 0c0121bc */ jal func000486f0 +/* 4bdd4: 0c0121bc */ jal osRecvMesg /* 4bdd8: 24060001 */ addiu $a2,$zero,0x1 /* 4bddc: 3c07800a */ lui $a3,%hi(var8009ca84) /* 4bde0: 24e7ca84 */ addiu $a3,$a3,%lo(var8009ca84) @@ -267,7 +267,7 @@ glabel func0004bcc0 /* 4be0c: 93a30031 */ lbu $v1,0x31($sp) /* 4be10: 307900c0 */ andi $t9,$v1,0xc0 /* 4be14: 00194103 */ sra $t0,$t9,0x4 -/* 4be18: 0c012a29 */ jal func0004a8a4 +/* 4be18: 0c012a29 */ jal __osSiRelAccess /* 4be1c: afa80044 */ sw $t0,0x44($sp) /* 4be20: 8fa20044 */ lw $v0,0x44($sp) .L0004be24: @@ -378,23 +378,23 @@ glabel func0004bee4 /* 4bf98: a0580000 */ sb $t8,0x0($v0) /* 4bf9c: 24040001 */ addiu $a0,$zero,0x1 /* 4bfa0: a84ffffc */ swl $t7,-0x4($v0) -/* 4bfa4: 0c012a34 */ jal func0004a8d0 +/* 4bfa4: 0c012a34 */ jal __osSiRawStartDma /* 4bfa8: b84fffff */ swr $t7,-0x1($v0) /* 4bfac: 8fa40030 */ lw $a0,0x30($sp) /* 4bfb0: 00002825 */ or $a1,$zero,$zero -/* 4bfb4: 0c0121bc */ jal func000486f0 +/* 4bfb4: 0c0121bc */ jal osRecvMesg /* 4bfb8: 24060001 */ addiu $a2,$zero,0x1 /* 4bfbc: 241900fe */ addiu $t9,$zero,0xfe /* 4bfc0: 3c01800a */ lui $at,0x800a /* 4bfc4: 3c05800a */ lui $a1,%hi(var8009ca80) /* 4bfc8: a039c820 */ sb $t9,-0x37e0($at) /* 4bfcc: 24a5ca80 */ addiu $a1,$a1,%lo(var8009ca80) -/* 4bfd0: 0c012a34 */ jal func0004a8d0 +/* 4bfd0: 0c012a34 */ jal __osSiRawStartDma /* 4bfd4: 00002025 */ or $a0,$zero,$zero /* 4bfd8: 8fa40030 */ lw $a0,0x30($sp) /* 4bfdc: 00002825 */ or $a1,$zero,$zero /* 4bfe0: 24060001 */ addiu $a2,$zero,0x1 -/* 4bfe4: 0c0121bc */ jal func000486f0 +/* 4bfe4: 0c0121bc */ jal osRecvMesg /* 4bfe8: afa2002c */ sw $v0,0x2c($sp) /* 4bfec: 8fa3002c */ lw $v1,0x2c($sp) /* 4bff0: 3c02800a */ lui $v0,0x800a diff --git a/src/lib/lib_4c090.c b/src/lib/lib_4c090.c index 361c5b65b..4b68df12a 100644 --- a/src/lib/lib_4c090.c +++ b/src/lib/lib_4c090.c @@ -170,7 +170,7 @@ glabel func0004c200 .L0004c2b4: /* 4c2b4: 8e440004 */ lw $a0,0x4($s2) /* 4c2b8: 8e450008 */ lw $a1,0x8($s2) -/* 4c2bc: 0c012e18 */ jal func0004b860 +/* 4c2bc: 0c012e18 */ jal __osContRamRead /* 4c2c0: 02a03825 */ or $a3,$s5,$zero /* 4c2c4: 10400003 */ beqz $v0,.L0004c2d4 /* 4c2c8: 366b0080 */ ori $t3,$s3,0x80 @@ -190,7 +190,7 @@ glabel func0004c200 /* 4c2f8: 8e450008 */ lw $a1,0x8($s2) /* 4c2fc: afa00010 */ sw $zero,0x10($sp) /* 4c300: 00003025 */ or $a2,$zero,$zero -/* 4c304: 0c012d84 */ jal func0004b610 +/* 4c304: 0c012d84 */ jal __osContRamWrite /* 4c308: 02a03825 */ or $a3,$s5,$zero /* 4c30c: 10400003 */ beqz $v0,.L0004c31c /* 4c310: 00003025 */ or $a2,$zero,$zero @@ -199,7 +199,7 @@ glabel func0004c200 .L0004c31c: /* 4c31c: 8e440004 */ lw $a0,0x4($s2) /* 4c320: 8e450008 */ lw $a1,0x8($s2) -/* 4c324: 0c012e18 */ jal func0004b860 +/* 4c324: 0c012e18 */ jal __osContRamRead /* 4c328: 27a7005c */ addiu $a3,$sp,0x5c /* 4c32c: 10400003 */ beqz $v0,.L0004c33c /* 4c330: 27a3005c */ addiu $v1,$sp,0x5c @@ -231,7 +231,7 @@ glabel func0004c200 .L0004c38c: /* 4c38c: 8e440004 */ lw $a0,0x4($s2) /* 4c390: 8e450008 */ lw $a1,0x8($s2) -/* 4c394: 0c012e18 */ jal func0004b860 +/* 4c394: 0c012e18 */ jal __osContRamRead /* 4c398: 02a03825 */ or $a3,$s5,$zero /* 4c39c: 10400003 */ beqz $v0,.L0004c3ac /* 4c3a0: 93a8007c */ lbu $t0,0x7c($sp) @@ -292,7 +292,7 @@ glabel func0004c200 /* 4c45c: 96060000 */ lhu $a2,0x0($s0) /* 4c460: 24080001 */ addiu $t0,$zero,0x1 /* 4c464: afa80010 */ sw $t0,0x10($sp) -/* 4c468: 0c012d84 */ jal func0004b610 +/* 4c468: 0c012d84 */ jal __osContRamWrite /* 4c46c: 02803825 */ or $a3,$s4,$zero /* 4c470: 10400003 */ beqz $v0,.L0004c480 /* 4c474: 26100002 */ addiu $s0,$s0,0x2 @@ -305,7 +305,7 @@ glabel func0004c200 /* 4c48c: 8e440004 */ lw $a0,0x4($s2) /* 4c490: 8e450008 */ lw $a1,0x8($s2) /* 4c494: 24060001 */ addiu $a2,$zero,0x1 -/* 4c498: 0c012e18 */ jal func0004b860 +/* 4c498: 0c012e18 */ jal __osContRamRead /* 4c49c: 02a03825 */ or $a3,$s5,$zero /* 4c4a0: 10400003 */ beqz $v0,.L0004c4b0 /* 4c4a4: 02801825 */ or $v1,$s4,$zero @@ -401,7 +401,7 @@ glabel func0004c550 /* 4c5d4: 8e640004 */ lw $a0,0x4($s3) /* 4c5d8: 8e650008 */ lw $a1,0x8($s3) /* 4c5dc: 96060000 */ lhu $a2,0x0($s0) -/* 4c5e0: 0c012e18 */ jal func0004b860 +/* 4c5e0: 0c012e18 */ jal __osContRamRead /* 4c5e4: 02403825 */ or $a3,$s2,$zero /* 4c5e8: 10400003 */ beqz $v0,.L0004c5f8 /* 4c5ec: 02402025 */ or $a0,$s2,$zero @@ -439,7 +439,7 @@ glabel func0004c550 /* 4c658: 8e650008 */ lw $a1,0x8($s3) /* 4c65c: 240f0001 */ addiu $t7,$zero,0x1 /* 4c660: afaf0010 */ sw $t7,0x10($sp) -/* 4c664: 0c012d84 */ jal func0004b610 +/* 4c664: 0c012d84 */ jal __osContRamWrite /* 4c668: 02403825 */ or $a3,$s2,$zero /* 4c66c: 50400004 */ beqzl $v0,.L0004c680 /* 4c670: 26100001 */ addiu $s0,$s0,0x1 @@ -485,7 +485,7 @@ glabel func0004c6b4 .L0004c6f0: /* 4c6f0: 8e050008 */ lw $a1,0x8($s0) /* 4c6f4: 24060001 */ addiu $a2,$zero,0x1 -/* 4c6f8: 0c012e18 */ jal func0004b860 +/* 4c6f8: 0c012e18 */ jal __osContRamRead /* 4c6fc: 27a7004c */ addiu $a3,$sp,0x4c /* 4c700: 10400003 */ beqz $v0,.L0004c710 /* 4c704: 27a4004c */ addiu $a0,$sp,0x4c @@ -572,7 +572,7 @@ glabel func0004c6b4 /* 4c824: 8e050008 */ lw $a1,0x8($s0) /* 4c828: 24060007 */ addiu $a2,$zero,0x7 /* 4c82c: 2607002c */ addiu $a3,$s0,0x2c -/* 4c830: 0c012e18 */ jal func0004b860 +/* 4c830: 0c012e18 */ jal __osContRamRead /* 4c834: a20f0064 */ sb $t7,0x64($s0) /* 4c838: 50400004 */ beqzl $v0,.L0004c84c /* 4c83c: 00001025 */ or $v0,$zero,$zero @@ -615,7 +615,7 @@ glabel func0004c860 .L0004c8b4: /* 4c8b4: 8e050008 */ lw $a1,0x8($s0) /* 4c8b8: 24060001 */ addiu $a2,$zero,0x1 -/* 4c8bc: 0c012e18 */ jal func0004b860 +/* 4c8bc: 0c012e18 */ jal __osContRamRead /* 4c8c0: 27a70028 */ addiu $a3,$sp,0x28 /* 4c8c4: 1040000d */ beqz $v0,.L0004c8fc /* 4c8c8: 24010002 */ addiu $at,$zero,0x2 @@ -626,7 +626,7 @@ glabel func0004c860 .L0004c8dc: /* 4c8dc: 8e040004 */ lw $a0,0x4($s0) /* 4c8e0: 8e050008 */ lw $a1,0x8($s0) -/* 4c8e4: 0c012e18 */ jal func0004b860 +/* 4c8e4: 0c012e18 */ jal __osContRamRead /* 4c8e8: 27a70028 */ addiu $a3,$sp,0x28 /* 4c8ec: 50400004 */ beqzl $v0,.L0004c900 /* 4c8f0: 2604000c */ addiu $a0,$s0,0xc @@ -735,7 +735,7 @@ glabel func0004c934 /* 4ca50: 01103021 */ addu $a2,$t0,$s0 /* 4ca54: 30c9ffff */ andi $t1,$a2,0xffff /* 4ca58: 01203025 */ or $a2,$t1,$zero -/* 4ca5c: 0c012d84 */ jal func0004b610 +/* 4ca5c: 0c012d84 */ jal __osContRamWrite /* 4ca60: 02203825 */ or $a3,$s1,$zero /* 4ca64: 8e4a0058 */ lw $t2,0x58($s2) /* 4ca68: 8e440004 */ lw $a0,0x4($s2) @@ -745,7 +745,7 @@ glabel func0004c934 /* 4ca78: 30ccffff */ andi $t4,$a2,0xffff /* 4ca7c: 01803025 */ or $a2,$t4,$zero /* 4ca80: afa00010 */ sw $zero,0x10($sp) -/* 4ca84: 0c012d84 */ jal func0004b610 +/* 4ca84: 0c012d84 */ jal __osContRamWrite /* 4ca88: 02203825 */ or $a3,$s1,$zero /* 4ca8c: 1000000a */ beqz $zero,.L0004cab8 /* 4ca90: 00401825 */ or $v1,$v0,$zero @@ -756,7 +756,7 @@ glabel func0004c934 /* 4caa0: 01d36821 */ addu $t5,$t6,$s3 /* 4caa4: 01b03021 */ addu $a2,$t5,$s0 /* 4caa8: 30cfffff */ andi $t7,$a2,0xffff -/* 4caac: 0c012e18 */ jal func0004b860 +/* 4caac: 0c012e18 */ jal __osContRamRead /* 4cab0: 01e03025 */ or $a2,$t7,$zero /* 4cab4: 00401825 */ or $v1,$v0,$zero .L0004cab8: @@ -794,7 +794,7 @@ glabel func0004c934 /* 4cb2c: 01b03021 */ addu $a2,$t5,$s0 /* 4cb30: 30cfffff */ andi $t7,$a2,0xffff /* 4cb34: 01e03025 */ or $a2,$t7,$zero -/* 4cb38: 0c012e18 */ jal func0004b860 +/* 4cb38: 0c012e18 */ jal __osContRamRead /* 4cb3c: 02203825 */ or $a3,$s1,$zero /* 4cb40: 26100001 */ addiu $s0,$s0,0x1 /* 4cb44: 2a010008 */ slti $at,$s0,0x8 @@ -821,7 +821,7 @@ glabel func0004c934 /* 4cb94: 30ccffff */ andi $t4,$a2,0xffff /* 4cb98: 01803025 */ or $a2,$t4,$zero /* 4cb9c: afa00010 */ sw $zero,0x10($sp) -/* 4cba0: 0c012d84 */ jal func0004b610 +/* 4cba0: 0c012d84 */ jal __osContRamWrite /* 4cba4: 02203825 */ or $a3,$s1,$zero /* 4cba8: 26100001 */ addiu $s0,$s0,0x1 /* 4cbac: 24010008 */ addiu $at,$zero,0x8 diff --git a/src/lib/lib_4cc10.c b/src/lib/lib_4cc10.c index 0045d07df..5e7934572 100644 --- a/src/lib/lib_4cc10.c +++ b/src/lib/lib_4cc10.c @@ -55,7 +55,7 @@ glabel func0004cc10 /* 4cca4: 03333021 */ addu $a2,$t9,$s3 /* 4cca8: 30c8ffff */ andi $t0,$a2,0xffff /* 4ccac: 01003025 */ or $a2,$t0,$zero -/* 4ccb0: 0c012e18 */ jal func0004b860 +/* 4ccb0: 0c012e18 */ jal __osContRamRead /* 4ccb4: 02c03825 */ or $a3,$s6,$zero /* 4ccb8: 50400004 */ beqzl $v0,.L0004cccc /* 4ccbc: 8e440004 */ lw $a0,0x4($s2) @@ -63,7 +63,7 @@ glabel func0004cc10 /* 4ccc4: 8fbf003c */ lw $ra,0x3c($sp) /* 4ccc8: 8e440004 */ lw $a0,0x4($s2) .L0004cccc: -/* 4cccc: 0c012ea4 */ jal func0004ba90 +/* 4cccc: 0c012ea4 */ jal __osPfsGetStatus /* 4ccd0: 8e450008 */ lw $a1,0x8($s2) /* 4ccd4: 10400003 */ beqz $v0,.L0004cce4 /* 4ccd8: 00403025 */ or $a2,$v0,$zero diff --git a/src/lib/lib_4cde0.c b/src/lib/lib_4cde0.c index 84cbc3fe8..66ff09ae1 100644 --- a/src/lib/lib_4cde0.c +++ b/src/lib/lib_4cde0.c @@ -30,7 +30,7 @@ glabel func0004cde0 /* 4ce20: 27a70038 */ addiu $a3,$sp,0x38 /* 4ce24: 8dc40004 */ lw $a0,0x4($t6) /* 4ce28: 8dc50008 */ lw $a1,0x8($t6) -/* 4ce2c: 0c012d84 */ jal func0004b610 +/* 4ce2c: 0c012d84 */ jal __osContRamWrite /* 4ce30: afa00010 */ sw $zero,0x10($sp) /* 4ce34: 14400003 */ bnez $v0,.L0004ce44 /* 4ce38: 00401825 */ or $v1,$v0,$zero diff --git a/src/lib/lib_4d000.c b/src/lib/lib_4d000.c index cd899ca44..b4af92a8e 100644 --- a/src/lib/lib_4d000.c +++ b/src/lib/lib_4d000.c @@ -230,7 +230,7 @@ glabel func0004d000 /* 4d2f4: 03193021 */ addu $a2,$t8,$t9 /* 4d2f8: 30c8ffff */ andi $t0,$a2,0xffff /* 4d2fc: 01003025 */ or $a2,$t0,$zero -/* 4d300: 0c012d84 */ jal func0004b610 +/* 4d300: 0c012d84 */ jal __osContRamWrite /* 4d304: 27a70060 */ addiu $a3,$sp,0x60 .L0004d308: /* 4d308: 8fbf0044 */ lw $ra,0x44($sp) diff --git a/src/lib/lib_4d480.c b/src/lib/lib_4d480.c index 9e5cc3db6..0f483064e 100644 --- a/src/lib/lib_4d480.c +++ b/src/lib/lib_4d480.c @@ -62,7 +62,7 @@ glabel func0004d480 /* 4d520: 01093021 */ addu $a2,$t0,$t1 /* 4d524: 30caffff */ andi $t2,$a2,0xffff /* 4d528: 01403025 */ or $a2,$t2,$zero -/* 4d52c: 0c012e18 */ jal func0004b860 +/* 4d52c: 0c012e18 */ jal __osContRamRead /* 4d530: 27a70048 */ addiu $a3,$sp,0x48 /* 4d534: 10400003 */ beqz $v0,.L0004d544 /* 4d538: 93b0004e */ lbu $s0,0x4e($sp) @@ -134,7 +134,7 @@ glabel func0004d480 /* 4d620: 30cfffff */ andi $t7,$a2,0xffff /* 4d624: 01e03025 */ or $a2,$t7,$zero /* 4d628: afa00010 */ sw $zero,0x10($sp) -/* 4d62c: 0c012d84 */ jal func0004b610 +/* 4d62c: 0c012d84 */ jal __osContRamWrite /* 4d630: 27a70048 */ addiu $a3,$sp,0x48 .L0004d634: /* 4d634: 8fbf0034 */ lw $ra,0x34($sp) diff --git a/src/lib/lib_4d6f0.c b/src/lib/lib_4d6f0.c index acc267415..ed8fb56d2 100644 --- a/src/lib/lib_4d6f0.c +++ b/src/lib/lib_4d6f0.c @@ -60,7 +60,7 @@ glabel func0004d6f0 /* 4d78c: 01d43021 */ addu $a2,$t6,$s4 /* 4d790: 30cfffff */ andi $t7,$a2,0xffff /* 4d794: 01e03025 */ or $a2,$t7,$zero -/* 4d798: 0c012e18 */ jal func0004b860 +/* 4d798: 0c012e18 */ jal __osContRamRead /* 4d79c: 27a7029c */ addiu $a3,$sp,0x29c /* 4d7a0: 10400003 */ beqz $v0,.L0004d7b0 /* 4d7a4: 0040b825 */ or $s7,$v0,$zero @@ -180,7 +180,7 @@ glabel func0004d6f0 /* 4d940: 30cfffff */ andi $t7,$a2,0xffff /* 4d944: 01e03025 */ or $a2,$t7,$zero /* 4d948: afa00010 */ sw $zero,0x10($sp) -/* 4d94c: 0c012d84 */ jal func0004b610 +/* 4d94c: 0c012d84 */ jal __osContRamWrite /* 4d950: 27a7029c */ addiu $a3,$sp,0x29c /* 4d954: 10400003 */ beqz $v0,.L0004d964 /* 4d958: 8fb80074 */ lw $t8,0x74($sp) @@ -207,7 +207,7 @@ glabel func0004d6f0 /* 4d998: 01543021 */ addu $a2,$t2,$s4 /* 4d99c: 30c9ffff */ andi $t1,$a2,0xffff /* 4d9a0: 01203025 */ or $a2,$t1,$zero -/* 4d9a4: 0c012e18 */ jal func0004b860 +/* 4d9a4: 0c012e18 */ jal __osContRamRead /* 4d9a8: 27a7029c */ addiu $a3,$sp,0x29c /* 4d9ac: 10400003 */ beqz $v0,.L0004d9bc /* 4d9b0: 97ae02a0 */ lhu $t6,0x2a0($sp) @@ -811,7 +811,7 @@ glabel func0004e090 ); GLOBAL_ASM( -glabel func0004e1b0 +glabel osMapTLB /* 4e1b0: 40085000 */ mfc0 $t0,$10 /* 4e1b4: 40840000 */ mtc0 $a0,$0 /* 4e1b8: 40852800 */ mtc0 $a1,$5 diff --git a/src/lib/lib_4e3c0.c b/src/lib/lib_4e3c0.c index bdd394302..67738446c 100644 --- a/src/lib/lib_4e3c0.c +++ b/src/lib/lib_4e3c0.c @@ -44,7 +44,7 @@ glabel func0004e3c0 /* 4e42c: 10000009 */ beqz $zero,.L0004e454 /* 4e430: 2402ffff */ addiu $v0,$zero,-1 .L0004e434: -/* 4e434: 0c012d20 */ jal func0004b480 +/* 4e434: 0c012d20 */ jal osVirtualToPhysical /* 4e438: 8fa4001c */ lw $a0,0x1c($sp) /* 4e43c: 3c0ca450 */ lui $t4,0xa450 /* 4e440: ad820000 */ sw $v0,0x0($t4) diff --git a/src/lib/lib_4e470.c b/src/lib/lib_4e470.c index 0f7ddf3ee..0ce23fc48 100644 --- a/src/lib/lib_4e470.c +++ b/src/lib/lib_4e470.c @@ -16,7 +16,7 @@ glabel func0004e470 ); GLOBAL_ASM( -glabel func0004e480 +glabel osInvalDCache /* 4e480: 18a0001f */ blez $a1,.L0004e500 /* 4e484: 00000000 */ sll $zero,$zero,0x0 /* 4e488: 240b2000 */ addiu $t3,$zero,0x2000 diff --git a/src/lib/lib_4e530.c b/src/lib/lib_4e530.c index f81b601f8..534537c7d 100644 --- a/src/lib/lib_4e530.c +++ b/src/lib/lib_4e530.c @@ -75,7 +75,7 @@ glabel func0004e530 /* 4e60c: 00408825 */ or $s1,$v0,$zero /* 4e610: 02202025 */ or $a0,$s1,$zero /* 4e614: 8fa50028 */ lw $a1,0x28($sp) -/* 4e618: 0c012238 */ jal func000488e0 +/* 4e618: 0c012238 */ jal osSendMesg /* 4e61c: 00003025 */ or $a2,$zero,$zero /* 4e620: 00408025 */ or $s0,$v0,$zero .L0004e624: diff --git a/src/lib/lib_4f350.c b/src/lib/lib_4f350.c index 0fb781094..b95c616fd 100644 --- a/src/lib/lib_4f350.c +++ b/src/lib/lib_4f350.c @@ -15,7 +15,7 @@ glabel func0004f350 /* 4f350: 27bdffe0 */ addiu $sp,$sp,-32 /* 4f354: afbf0014 */ sw $ra,0x14($sp) /* 4f358: afa40020 */ sw $a0,0x20($sp) -/* 4f35c: 0c012a18 */ jal func0004a860 +/* 4f35c: 0c012a18 */ jal __osSiGetAccess /* 4f360: afa0001c */ sw $zero,0x1c($sp) /* 4f364: 3c0e800a */ lui $t6,0x800a /* 4f368: 91cec820 */ lbu $t6,-0x37e0($t6) @@ -25,21 +25,21 @@ glabel func0004f350 /* 4f378: 00002025 */ or $a0,$zero,$zero /* 4f37c: 3c05800a */ lui $a1,%hi(var8009c7e0) /* 4f380: 24a5c7e0 */ addiu $a1,$a1,%lo(var8009c7e0) -/* 4f384: 0c012a34 */ jal func0004a8d0 +/* 4f384: 0c012a34 */ jal __osSiRawStartDma /* 4f388: 24040001 */ addiu $a0,$zero,0x1 /* 4f38c: afa2001c */ sw $v0,0x1c($sp) /* 4f390: 8fa40020 */ lw $a0,0x20($sp) /* 4f394: 00002825 */ or $a1,$zero,$zero -/* 4f398: 0c0121bc */ jal func000486f0 +/* 4f398: 0c0121bc */ jal osRecvMesg /* 4f39c: 24060001 */ addiu $a2,$zero,0x1 .L0004f3a0: /* 4f3a0: 3c05800a */ lui $a1,%hi(var8009c7e0) /* 4f3a4: 24a5c7e0 */ addiu $a1,$a1,%lo(var8009c7e0) -/* 4f3a8: 0c012a34 */ jal func0004a8d0 +/* 4f3a8: 0c012a34 */ jal __osSiRawStartDma /* 4f3ac: 00002025 */ or $a0,$zero,$zero /* 4f3b0: 3c01800a */ lui $at,0x800a /* 4f3b4: afa2001c */ sw $v0,0x1c($sp) -/* 4f3b8: 0c012a29 */ jal func0004a8a4 +/* 4f3b8: 0c012a29 */ jal __osSiRelAccess /* 4f3bc: a020c820 */ sb $zero,-0x37e0($at) /* 4f3c0: 8fbf0014 */ lw $ra,0x14($sp) /* 4f3c4: 8fa2001c */ lw $v0,0x1c($sp) diff --git a/src/lib/lib_4f400.c b/src/lib/lib_4f400.c index c6e239038..6d0d0572c 100644 --- a/src/lib/lib_4f400.c +++ b/src/lib/lib_4f400.c @@ -11,35 +11,35 @@ #include "types.h" GLOBAL_ASM( -glabel func0004f400 +glabel osContStartReadData /* 4f400: 27bdffe0 */ addiu $sp,$sp,-32 /* 4f404: afbf0014 */ sw $ra,0x14($sp) -/* 4f408: 0c012a18 */ jal func0004a860 +/* 4f408: 0c012a18 */ jal __osSiGetAccess /* 4f40c: afa40020 */ sw $a0,0x20($sp) /* 4f410: 3c0e800a */ lui $t6,0x800a /* 4f414: 91cec820 */ lbu $t6,-0x37e0($t6) /* 4f418: 24010001 */ addiu $at,$zero,0x1 /* 4f41c: 11c1000b */ beq $t6,$at,.L0004f44c /* 4f420: 00000000 */ sll $zero,$zero,0x0 -/* 4f424: 0c013d44 */ jal func0004f510 +/* 4f424: 0c013d44 */ jal __osPackReadData /* 4f428: 00000000 */ sll $zero,$zero,0x0 /* 4f42c: 3c05800a */ lui $a1,%hi(var8009c7e0) /* 4f430: 24a5c7e0 */ addiu $a1,$a1,%lo(var8009c7e0) -/* 4f434: 0c012a34 */ jal func0004a8d0 +/* 4f434: 0c012a34 */ jal __osSiRawStartDma /* 4f438: 24040001 */ addiu $a0,$zero,0x1 /* 4f43c: 8fa40020 */ lw $a0,0x20($sp) /* 4f440: 00002825 */ or $a1,$zero,$zero -/* 4f444: 0c0121bc */ jal func000486f0 +/* 4f444: 0c0121bc */ jal osRecvMesg /* 4f448: 24060001 */ addiu $a2,$zero,0x1 .L0004f44c: /* 4f44c: 3c05800a */ lui $a1,%hi(var8009c7e0) /* 4f450: 24a5c7e0 */ addiu $a1,$a1,%lo(var8009c7e0) -/* 4f454: 0c012a34 */ jal func0004a8d0 +/* 4f454: 0c012a34 */ jal __osSiRawStartDma /* 4f458: 00002025 */ or $a0,$zero,$zero /* 4f45c: 240f0001 */ addiu $t7,$zero,0x1 /* 4f460: 3c01800a */ lui $at,0x800a /* 4f464: afa2001c */ sw $v0,0x1c($sp) -/* 4f468: 0c012a29 */ jal func0004a8a4 +/* 4f468: 0c012a29 */ jal __osSiRelAccess /* 4f46c: a02fc820 */ sb $t7,-0x37e0($at) /* 4f470: 8fbf0014 */ lw $ra,0x14($sp) /* 4f474: 8fa2001c */ lw $v0,0x1c($sp) @@ -49,7 +49,7 @@ glabel func0004f400 ); GLOBAL_ASM( -glabel func0004f484 +glabel osContGetReadData /* 4f484: 3c05800a */ lui $a1,0x800a /* 4f488: 24a5c821 */ addiu $a1,$a1,-14303 /* 4f48c: 90ae0000 */ lbu $t6,0x0($a1) @@ -91,7 +91,7 @@ glabel func0004f484 ); GLOBAL_ASM( -glabel func0004f510 +glabel __osPackReadData /* 4f510: 3c05800a */ lui $a1,%hi(var8009c7e0) /* 4f514: 24a5c7e0 */ addiu $a1,$a1,%lo(var8009c7e0) /* 4f518: 3c04800a */ lui $a0,%hi(var8009c7e0) diff --git a/src/lib/lib_4f5e0.c b/src/lib/lib_4f5e0.c index 5405bfa77..bc8348de9 100644 --- a/src/lib/lib_4f5e0.c +++ b/src/lib/lib_4f5e0.c @@ -35,7 +35,7 @@ glabel func0004f5e0 /* 4f618: 24020005 */ addiu $v0,$zero,0x5 .L0004f61c: /* 4f61c: afa70034 */ sw $a3,0x34($sp) -/* 4f620: 0c012a18 */ jal func0004a860 +/* 4f620: 0c012a18 */ jal __osSiGetAccess /* 4f624: afa80024 */ sw $t0,0x24($sp) /* 4f628: 8e0b0008 */ lw $t3,0x8($s0) /* 4f62c: 3c06800a */ lui $a2,%hi(var8009c970) @@ -67,22 +67,22 @@ glabel func0004f5e0 /* 4f690: afa70034 */ sw $a3,0x34($sp) /* 4f694: 0018c980 */ sll $t9,$t8,0x6 /* 4f698: 00d92821 */ addu $a1,$a2,$t9 -/* 4f69c: 0c012a34 */ jal func0004a8d0 +/* 4f69c: 0c012a34 */ jal __osSiRawStartDma /* 4f6a0: 24040001 */ addiu $a0,$zero,0x1 /* 4f6a4: 8e040004 */ lw $a0,0x4($s0) /* 4f6a8: 00002825 */ or $a1,$zero,$zero -/* 4f6ac: 0c0121bc */ jal func000486f0 +/* 4f6ac: 0c0121bc */ jal osRecvMesg /* 4f6b0: 24060001 */ addiu $a2,$zero,0x1 /* 4f6b4: 8e090008 */ lw $t1,0x8($s0) /* 4f6b8: 3c0c800a */ lui $t4,%hi(var8009c970) /* 4f6bc: 258cc970 */ addiu $t4,$t4,%lo(var8009c970) /* 4f6c0: 00095980 */ sll $t3,$t1,0x6 /* 4f6c4: 016c2821 */ addu $a1,$t3,$t4 -/* 4f6c8: 0c012a34 */ jal func0004a8d0 +/* 4f6c8: 0c012a34 */ jal __osSiRawStartDma /* 4f6cc: 00002025 */ or $a0,$zero,$zero /* 4f6d0: 8e040004 */ lw $a0,0x4($s0) /* 4f6d4: 00002825 */ or $a1,$zero,$zero -/* 4f6d8: 0c0121bc */ jal func000486f0 +/* 4f6d8: 0c0121bc */ jal osRecvMesg /* 4f6dc: 24060001 */ addiu $a2,$zero,0x1 /* 4f6e0: 8fa80024 */ lw $t0,0x24($sp) /* 4f6e4: 8fa70034 */ lw $a3,0x34($sp) @@ -104,7 +104,7 @@ glabel func0004f5e0 /* 4f720: 00000000 */ sll $zero,$zero,0x0 /* 4f724: 24100004 */ addiu $s0,$zero,0x4 .L0004f728: -/* 4f728: 0c012a29 */ jal func0004a8a4 +/* 4f728: 0c012a29 */ jal __osSiRelAccess /* 4f72c: 00000000 */ sll $zero,$zero,0x0 /* 4f730: 02001025 */ or $v0,$s0,$zero .L0004f734: @@ -222,7 +222,7 @@ glabel func0004f854 .L0004f8bc: /* 4f8bc: 8fa50050 */ lw $a1,0x50($sp) /* 4f8c0: 24060400 */ addiu $a2,$zero,0x400 -/* 4f8c4: 0c012e18 */ jal func0004b860 +/* 4f8c4: 0c012e18 */ jal __osContRamRead /* 4f8c8: 27a70024 */ addiu $a3,$sp,0x24 /* 4f8cc: 24010002 */ addiu $at,$zero,0x2 /* 4f8d0: 14410002 */ bne $v0,$at,.L0004f8dc @@ -254,7 +254,7 @@ glabel func0004f854 .L0004f928: /* 4f928: 8fa50050 */ lw $a1,0x50($sp) /* 4f92c: 24060400 */ addiu $a2,$zero,0x400 -/* 4f930: 0c012e18 */ jal func0004b860 +/* 4f930: 0c012e18 */ jal __osContRamRead /* 4f934: 27a70024 */ addiu $a3,$sp,0x24 /* 4f938: 24010002 */ addiu $at,$zero,0x2 /* 4f93c: 14410002 */ bne $v0,$at,.L0004f948 diff --git a/src/lib/lib_50130.c b/src/lib/lib_50130.c index 4a8060316..140c4407b 100644 --- a/src/lib/lib_50130.c +++ b/src/lib/lib_50130.c @@ -15,7 +15,7 @@ GLOBAL_ASM( glabel func00050130 /* 50130: 27bdffd0 */ addiu $sp,$sp,-48 /* 50134: afbf0014 */ sw $ra,0x14($sp) -/* 50138: 0c012a18 */ jal func0004a860 +/* 50138: 0c012a18 */ jal __osSiGetAccess /* 5013c: afa40030 */ sw $a0,0x30($sp) /* 50140: 8fa40030 */ lw $a0,0x30($sp) /* 50144: 0c012fb9 */ jal func0004bee4 @@ -37,7 +37,7 @@ glabel func00050130 /* 5017c: 10000001 */ beqz $zero,.L00050184 /* 50180: 24030001 */ addiu $v1,$zero,0x1 .L00050184: -/* 50184: 0c012a29 */ jal func0004a8a4 +/* 50184: 0c012a29 */ jal __osSiRelAccess /* 50188: afa3002c */ sw $v1,0x2c($sp) /* 5018c: 8fbf0014 */ lw $ra,0x14($sp) /* 50190: 8fa2002c */ lw $v0,0x2c($sp) @@ -57,7 +57,7 @@ glabel func000501a0 /* 501b8: 00c08025 */ or $s0,$a2,$zero /* 501bc: 00809025 */ or $s2,$a0,$zero /* 501c0: afa50054 */ sw $a1,0x54($sp) -/* 501c4: 0c012a18 */ jal func0004a860 +/* 501c4: 0c012a18 */ jal __osSiGetAccess /* 501c8: 2631ca80 */ addiu $s1,$s1,%lo(var8009ca80) /* 501cc: 02402025 */ or $a0,$s2,$zero /* 501d0: 0c012fb9 */ jal func0004bee4 @@ -89,7 +89,7 @@ glabel func000501a0 .L00050230: /* 50230: 10800005 */ beqz $a0,.L00050248 /* 50234: 93a8003e */ lbu $t0,0x3e($sp) -/* 50238: 0c012a29 */ jal func0004a8a4 +/* 50238: 0c012a29 */ jal __osSiRelAccess /* 5023c: afa4004c */ sw $a0,0x4c($sp) /* 50240: 10000042 */ beqz $zero,.L0005034c /* 50244: 8fa2004c */ lw $v0,0x4c($sp) @@ -109,22 +109,22 @@ glabel func000501a0 /* 50270: 93a40057 */ lbu $a0,0x57($sp) /* 50274: 3c05800a */ lui $a1,%hi(var8009ca80) /* 50278: 24a5ca80 */ addiu $a1,$a1,%lo(var8009ca80) -/* 5027c: 0c012a34 */ jal func0004a8d0 +/* 5027c: 0c012a34 */ jal __osSiRawStartDma /* 50280: 24040001 */ addiu $a0,$zero,0x1 /* 50284: 02402025 */ or $a0,$s2,$zero /* 50288: 00002825 */ or $a1,$zero,$zero -/* 5028c: 0c0121bc */ jal func000486f0 +/* 5028c: 0c0121bc */ jal osRecvMesg /* 50290: 24060001 */ addiu $a2,$zero,0x1 /* 50294: 3c05800a */ lui $a1,%hi(var8009ca80) /* 50298: 24a5ca80 */ addiu $a1,$a1,%lo(var8009ca80) -/* 5029c: 0c012a34 */ jal func0004a8d0 +/* 5029c: 0c012a34 */ jal __osSiRawStartDma /* 502a0: 00002025 */ or $a0,$zero,$zero /* 502a4: 240c0004 */ addiu $t4,$zero,0x4 /* 502a8: 3c01800a */ lui $at,0x800a /* 502ac: a02cc820 */ sb $t4,-0x37e0($at) /* 502b0: 02402025 */ or $a0,$s2,$zero /* 502b4: 00002825 */ or $a1,$zero,$zero -/* 502b8: 0c0121bc */ jal func000486f0 +/* 502b8: 0c0121bc */ jal osRecvMesg /* 502bc: 24060001 */ addiu $a2,$zero,0x1 /* 502c0: 00001825 */ or $v1,$zero,$zero .L000502c4: @@ -161,7 +161,7 @@ glabel func000501a0 /* 50338: 1443fff6 */ bne $v0,$v1,.L00050314 /* 5033c: a20bffff */ sb $t3,-0x1($s0) .L00050340: -/* 50340: 0c012a29 */ jal func0004a8a4 +/* 50340: 0c012a29 */ jal __osSiRelAccess /* 50344: afa4004c */ sw $a0,0x4c($sp) /* 50348: 8fa2004c */ lw $v0,0x4c($sp) .L0005034c: diff --git a/src/lib/lib_50480.c b/src/lib/lib_50480.c index c50e08cb5..1f11febd4 100644 --- a/src/lib/lib_50480.c +++ b/src/lib/lib_50480.c @@ -146,7 +146,7 @@ glabel func00050554 /* 50638: 014b3021 */ addu $a2,$t2,$t3 /* 5063c: 30ccffff */ andi $t4,$a2,0xffff /* 50640: 01803025 */ or $a2,$t4,$zero -/* 50644: 0c012e18 */ jal func0004b860 +/* 50644: 0c012e18 */ jal __osContRamRead /* 50648: 27a7014c */ addiu $a3,$sp,0x14c /* 5064c: 10400003 */ beqz $v0,.L0005065c /* 50650: 97ad0150 */ lhu $t5,0x150($sp) @@ -267,14 +267,14 @@ glabel func00050554 /* 507d8: 01603025 */ or $a2,$t3,$zero /* 507dc: 8e440004 */ lw $a0,0x4($s2) /* 507e0: 8e450008 */ lw $a1,0x8($s2) -/* 507e4: 0c012e18 */ jal func0004b860 +/* 507e4: 0c012e18 */ jal __osContRamRead /* 507e8: 02203825 */ or $a3,$s1,$zero /* 507ec: 10000006 */ beqz $zero,.L00050808 /* 507f0: 00401825 */ or $v1,$v0,$zero .L000507f4: /* 507f4: 8e440004 */ lw $a0,0x4($s2) /* 507f8: 8e450008 */ lw $a1,0x8($s2) -/* 507fc: 0c012d84 */ jal func0004b610 +/* 507fc: 0c012d84 */ jal __osContRamWrite /* 50800: afa00010 */ sw $zero,0x10($sp) /* 50804: 00401825 */ or $v1,$v0,$zero .L00050808: @@ -314,7 +314,7 @@ glabel func00050554 /* 50880: 30c9ffff */ andi $t1,$a2,0xffff /* 50884: 01203025 */ or $a2,$t1,$zero /* 50888: afa00010 */ sw $zero,0x10($sp) -/* 5088c: 0c012d84 */ jal func0004b610 +/* 5088c: 0c012d84 */ jal __osContRamWrite /* 50890: 27a7014c */ addiu $a3,$sp,0x14c /* 50894: 50400004 */ beqzl $v0,.L000508a8 /* 50898: 8e440004 */ lw $a0,0x4($s2) @@ -323,7 +323,7 @@ glabel func00050554 .L000508a4: /* 508a4: 8e440004 */ lw $a0,0x4($s2) .L000508a8: -/* 508a8: 0c012ea4 */ jal func0004ba90 +/* 508a8: 0c012ea4 */ jal __osPfsGetStatus /* 508ac: 8e450008 */ lw $a1,0x8($s2) .L000508b0: /* 508b0: 8fbf002c */ lw $ra,0x2c($sp) @@ -386,7 +386,7 @@ glabel func000508d0 /* 50970: 01103021 */ addu $a2,$t0,$s0 /* 50974: 30c9ffff */ andi $t1,$a2,0xffff /* 50978: 01203025 */ or $a2,$t1,$zero -/* 5097c: 0c012e18 */ jal func0004b860 +/* 5097c: 0c012e18 */ jal __osContRamRead /* 50980: 02603825 */ or $a3,$s3,$zero /* 50984: 10400003 */ beqz $v0,.L00050994 /* 50988: 97aa0034 */ lhu $t2,0x34($sp) @@ -412,7 +412,7 @@ glabel func000508d0 /* 509c8: 8e2e0050 */ lw $t6,0x50($s1) /* 509cc: adee0000 */ sw $t6,0x0($t7) /* 509d0: 8e250008 */ lw $a1,0x8($s1) -/* 509d4: 0c012ea4 */ jal func0004ba90 +/* 509d4: 0c012ea4 */ jal __osPfsGetStatus /* 509d8: 8e240004 */ lw $a0,0x4($s1) .L000509dc: /* 509dc: 8fbf0024 */ lw $ra,0x24($sp) diff --git a/src/lib/lib_50a00.c b/src/lib/lib_50a00.c index 7c5cc4d57..70bcfd37f 100644 --- a/src/lib/lib_50a00.c +++ b/src/lib/lib_50a00.c @@ -70,7 +70,7 @@ glabel func00050a00 /* 50aac: 01103021 */ addu $a2,$t0,$s0 /* 50ab0: 30c9ffff */ andi $t1,$a2,0xffff /* 50ab4: 01203025 */ or $a2,$t1,$zero -/* 50ab8: 0c012e18 */ jal func0004b860 +/* 50ab8: 0c012e18 */ jal __osContRamRead /* 50abc: 27a70038 */ addiu $a3,$sp,0x38 /* 50ac0: 10400003 */ beqz $v0,.L00050ad0 /* 50ac4: 97aa003c */ lhu $t2,0x3c($sp) @@ -141,7 +141,7 @@ glabel func00050a00 /* 50ba8: 0c012c5c */ jal func0004b170 /* 50bac: 24a5000a */ addiu $a1,$a1,0xa /* 50bb0: 8e640004 */ lw $a0,0x4($s3) -/* 50bb4: 0c012ea4 */ jal func0004ba90 +/* 50bb4: 0c012ea4 */ jal __osPfsGetStatus /* 50bb8: 8e650008 */ lw $a1,0x8($s3) .L00050bbc: /* 50bbc: 8fbf002c */ lw $ra,0x2c($sp) @@ -167,7 +167,7 @@ glabel func00050be0 /* 50bf8: 27a70028 */ addiu $a3,$sp,0x28 /* 50bfc: 8e250008 */ lw $a1,0x8($s1) /* 50c00: 8c840004 */ lw $a0,0x4($a0) -/* 50c04: 0c012e18 */ jal func0004b860 +/* 50c04: 0c012e18 */ jal __osContRamRead /* 50c08: 24060400 */ addiu $a2,$zero,0x400 /* 50c0c: 24010002 */ addiu $at,$zero,0x2 /* 50c10: 10410005 */ beq $v0,$at,.L00050c28 @@ -189,12 +189,12 @@ glabel func00050be0 /* 50c48: 8e240004 */ lw $a0,0x4($s1) .L00050c4c: /* 50c4c: 8e250008 */ lw $a1,0x8($s1) -/* 50c50: 0c012e18 */ jal func0004b860 +/* 50c50: 0c012e18 */ jal __osContRamRead /* 50c54: 24060580 */ addiu $a2,$zero,0x580 /* 50c58: 14400036 */ bnez $v0,.L00050d34 /* 50c5c: 00402825 */ or $a1,$v0,$zero /* 50c60: 8e240004 */ lw $a0,0x4($s1) -/* 50c64: 0c012ea4 */ jal func0004ba90 +/* 50c64: 0c012ea4 */ jal __osPfsGetStatus /* 50c68: 8e250008 */ lw $a1,0x8($s1) /* 50c6c: 27a70028 */ addiu $a3,$sp,0x28 /* 50c70: 10400003 */ beqz $v0,.L00050c80 diff --git a/src/lib/lib_513b0.c b/src/lib/lib_513b0.c index 54290c279..b2de27bad 100644 --- a/src/lib/lib_513b0.c +++ b/src/lib/lib_513b0.c @@ -62,7 +62,7 @@ glabel func000513b0 /* 5144c: 8e450008 */ lw $a1,0x8($s2) /* 51450: afa00010 */ sw $zero,0x10($sp) /* 51454: 3206ffff */ andi $a2,$s0,0xffff -/* 51458: 0c012d84 */ jal func0004b610 +/* 51458: 0c012d84 */ jal __osContRamWrite /* 5145c: 02803825 */ or $a3,$s4,$zero /* 51460: 14400035 */ bnez $v0,.L00051538 /* 51464: 00401825 */ or $v1,$v0,$zero @@ -97,7 +97,7 @@ glabel func000513b0 /* 514cc: 8e440004 */ lw $a0,0x4($s2) /* 514d0: 8e450008 */ lw $a1,0x8($s2) /* 514d4: 3206ffff */ andi $a2,$s0,0xffff -/* 514d8: 0c012e18 */ jal func0004b860 +/* 514d8: 0c012e18 */ jal __osContRamRead /* 514dc: 02803825 */ or $a3,$s4,$zero /* 514e0: 14400015 */ bnez $v0,.L00051538 /* 514e4: 00401825 */ or $v1,$v0,$zero @@ -145,12 +145,12 @@ glabel func000513b0 /* 51578: afb00018 */ sw $s0,0x18($sp) /* 5157c: 00a08025 */ or $s0,$a1,$zero /* 51580: afa40070 */ sw $a0,0x70($sp) -/* 51584: 0c012a18 */ jal func0004a860 +/* 51584: 0c012a18 */ jal __osSiGetAccess /* 51588: afa60078 */ sw $a2,0x78($sp) /* 5158c: 8fa40070 */ lw $a0,0x70($sp) -/* 51590: 0c012ea4 */ jal func0004ba90 +/* 51590: 0c012ea4 */ jal __osPfsGetStatus /* 51594: 8fa50078 */ lw $a1,0x78($sp) -/* 51598: 0c012a29 */ jal func0004a8a4 +/* 51598: 0c012a29 */ jal __osSiRelAccess /* 5159c: afa2006c */ sw $v0,0x6c($sp) /* 515a0: 8fa3006c */ lw $v1,0x6c($sp) /* 515a4: 8fae0070 */ lw $t6,0x70($sp) @@ -179,7 +179,7 @@ glabel func000513b0 .L000515f8: /* 515f8: 8e040004 */ lw $a0,0x4($s0) /* 515fc: 8e050008 */ lw $a1,0x8($s0) -/* 51600: 0c012e18 */ jal func0004b860 +/* 51600: 0c012e18 */ jal __osContRamRead /* 51604: 27a70048 */ addiu $a3,$sp,0x48 /* 51608: 10400003 */ beqz $v0,.L00051618 /* 5160c: 27a40048 */ addiu $a0,$sp,0x48 @@ -263,7 +263,7 @@ glabel func000513b0 /* 5172c: ae180060 */ sw $t8,0x60($s0) /* 51730: ae080058 */ sw $t0,0x58($s0) /* 51734: ae0a005c */ sw $t2,0x5c($s0) -/* 51738: 0c012e18 */ jal func0004b860 +/* 51738: 0c012e18 */ jal __osContRamRead /* 5173c: a20e0064 */ sb $t6,0x64($s0) /* 51740: 10400003 */ beqz $v0,.L00051750 /* 51744: 00000000 */ sll $zero,$zero,0x0 @@ -299,7 +299,7 @@ glabel func00051778 .L000517a0: /* 517a0: 8e040004 */ lw $a0,0x4($s0) /* 517a4: 8e050008 */ lw $a1,0x8($s0) -/* 517a8: 0c012e18 */ jal func0004b860 +/* 517a8: 0c012e18 */ jal __osContRamRead /* 517ac: 27a70030 */ addiu $a3,$sp,0x30 /* 517b0: 10400003 */ beqz $v0,.L000517c0 /* 517b4: 27a30070 */ addiu $v1,$sp,0x70 @@ -323,7 +323,7 @@ glabel func00051778 /* 517f4: 8e050008 */ lw $a1,0x8($s0) /* 517f8: afa00010 */ sw $zero,0x10($sp) /* 517fc: 00003025 */ or $a2,$zero,$zero -/* 51800: 0c012d84 */ jal func0004b610 +/* 51800: 0c012d84 */ jal __osContRamWrite /* 51804: 27a70070 */ addiu $a3,$sp,0x70 /* 51808: 10400003 */ beqz $v0,.L00051818 /* 5180c: 00003025 */ or $a2,$zero,$zero @@ -332,7 +332,7 @@ glabel func00051778 .L00051818: /* 51818: 8e040004 */ lw $a0,0x4($s0) /* 5181c: 8e050008 */ lw $a1,0x8($s0) -/* 51820: 0c012e18 */ jal func0004b860 +/* 51820: 0c012e18 */ jal __osContRamRead /* 51824: 27a70050 */ addiu $a3,$sp,0x50 /* 51828: 10400003 */ beqz $v0,.L00051838 /* 5182c: 27a40070 */ addiu $a0,$sp,0x70 @@ -350,7 +350,7 @@ glabel func00051778 /* 51854: 8e040004 */ lw $a0,0x4($s0) /* 51858: 8e050008 */ lw $a1,0x8($s0) /* 5185c: afa00010 */ sw $zero,0x10($sp) -/* 51860: 0c012d84 */ jal func0004b610 +/* 51860: 0c012d84 */ jal __osContRamWrite /* 51864: 27a70030 */ addiu $a3,$sp,0x30 .L00051868: /* 51868: 8fbf0024 */ lw $ra,0x24($sp) diff --git a/src/lib/lib_51890.c b/src/lib/lib_51890.c index c3970bcf7..7e3d6fad1 100644 --- a/src/lib/lib_51890.c +++ b/src/lib/lib_51890.c @@ -21,7 +21,7 @@ glabel func000518a0 /* 518a0: 27bdffd8 */ addiu $sp,$sp,-40 /* 518a4: afbf001c */ sw $ra,0x1c($sp) /* 518a8: afa40028 */ sw $a0,0x28($sp) -/* 518ac: 0c01256c */ jal func000495b0 +/* 518ac: 0c01256c */ jal __osDisableInt /* 518b0: afb00018 */ sw $s0,0x18($sp) /* 518b4: 8faf0028 */ lw $t7,0x28($sp) /* 518b8: 3c0e8006 */ lui $t6,0x8006 @@ -33,7 +33,7 @@ glabel func000518a0 /* 518d0: 3c018006 */ lui $at,0x8006 /* 518d4: 01d94024 */ and $t0,$t6,$t9 /* 518d8: ac28cf70 */ sw $t0,-0x3090($at) -/* 518dc: 0c012588 */ jal func00049620 +/* 518dc: 0c012588 */ jal __osRestoreInt /* 518e0: 02002025 */ or $a0,$s0,$zero /* 518e4: 8fbf001c */ lw $ra,0x1c($sp) /* 518e8: 8fb00018 */ lw $s0,0x18($sp) diff --git a/src/lib/lib_51a60.c b/src/lib/lib_51a60.c index ba5075a97..92aa21367 100644 --- a/src/lib/lib_51a60.c +++ b/src/lib/lib_51a60.c @@ -117,7 +117,7 @@ glabel func00051bc0 /* 51bc0: 27bdffd8 */ addiu $sp,$sp,-40 /* 51bc4: afbf001c */ sw $ra,0x1c($sp) /* 51bc8: afa40028 */ sw $a0,0x28($sp) -/* 51bcc: 0c01256c */ jal func000495b0 +/* 51bcc: 0c01256c */ jal __osDisableInt /* 51bd0: afb00018 */ sw $s0,0x18($sp) /* 51bd4: 3c0e8006 */ lui $t6,0x8006 /* 51bd8: 8dcecf70 */ lw $t6,-0x3090($t6) @@ -126,7 +126,7 @@ glabel func00051bc0 /* 51be4: 3c018006 */ lui $at,0x8006 /* 51be8: 01cfc025 */ or $t8,$t6,$t7 /* 51bec: ac38cf70 */ sw $t8,-0x3090($at) -/* 51bf0: 0c012588 */ jal func00049620 +/* 51bf0: 0c012588 */ jal __osRestoreInt /* 51bf4: 02002025 */ or $a0,$s0,$zero /* 51bf8: 8fbf001c */ lw $ra,0x1c($sp) /* 51bfc: 8fb00018 */ lw $s0,0x18($sp) diff --git a/src/lib/lib_51c10.c b/src/lib/lib_51c10.c index bc420dbe4..0bc3be003 100644 --- a/src/lib/lib_51c10.c +++ b/src/lib/lib_51c10.c @@ -13,7 +13,7 @@ GLOBAL_ASM( glabel func00051c10 /* 51c10: 27bdffd8 */ addiu $sp,$sp,-40 /* 51c14: afbf001c */ sw $ra,0x1c($sp) -/* 51c18: 0c01256c */ jal func000495b0 +/* 51c18: 0c01256c */ jal __osDisableInt /* 51c1c: afb00018 */ sw $s0,0x18($sp) /* 51c20: 3c0f8006 */ lui $t7,0x8006 /* 51c24: 8def0940 */ lw $t7,0x940($t7) @@ -21,9 +21,9 @@ glabel func00051c10 /* 51c2c: 3c048006 */ lui $a0,%hi(var80060938) /* 51c30: 00408025 */ or $s0,$v0,$zero /* 51c34: 24840938 */ addiu $a0,$a0,%lo(var80060938) -/* 51c38: 0c000ee8 */ jal func00003ba0 +/* 51c38: 0c000ee8 */ jal __osEnqueueAndYield /* 51c3c: a5ee0010 */ sh $t6,0x10($t7) -/* 51c40: 0c012588 */ jal func00049620 +/* 51c40: 0c012588 */ jal __osRestoreInt /* 51c44: 02002025 */ or $a0,$s0,$zero /* 51c48: 8fbf001c */ lw $ra,0x1c($sp) /* 51c4c: 8fb00018 */ lw $s0,0x18($sp) diff --git a/src/lib/lib_51c60.c b/src/lib/lib_51c60.c index bd2159a6d..55667440a 100644 --- a/src/lib/lib_51c60.c +++ b/src/lib/lib_51c60.c @@ -26,7 +26,7 @@ glabel func00051c60 ); GLOBAL_ASM( -glabel func00051c90 +glabel __osProbeTLB /* 51c90: 40085000 */ mfc0 $t0,$10 /* 51c94: 310900ff */ andi $t1,$t0,0xff /* 51c98: 2401e000 */ addiu $at,$zero,-8192 diff --git a/src/lib/lib_51ec0.c b/src/lib/lib_51ec0.c index eb965f1c4..072906373 100644 --- a/src/lib/lib_51ec0.c +++ b/src/lib/lib_51ec0.c @@ -36,7 +36,7 @@ glabel func00051ef0 /* 51efc: afa5002c */ sw $a1,0x2c($sp) /* 51f00: afa60030 */ sw $a2,0x30($sp) /* 51f04: afb10018 */ sw $s1,0x18($sp) -/* 51f08: 0c01256c */ jal func000495b0 +/* 51f08: 0c01256c */ jal __osDisableInt /* 51f0c: afb00014 */ sw $s0,0x14($sp) /* 51f10: 8fae0028 */ lw $t6,0x28($sp) /* 51f14: 00408025 */ or $s0,$v0,$zero @@ -55,12 +55,12 @@ glabel func00051ef0 /* 51f44: 24080008 */ addiu $t0,$zero,0x8 /* 51f48: a5280010 */ sh $t0,0x10($t1) /* 51f4c: 8fa40028 */ lw $a0,0x28($sp) -/* 51f50: 0c000ee8 */ jal func00003ba0 +/* 51f50: 0c000ee8 */ jal __osEnqueueAndYield /* 51f54: 24840004 */ addiu $a0,$a0,0x4 /* 51f58: 10000005 */ beqz $zero,.L00051f70 /* 51f5c: 00000000 */ sll $zero,$zero,0x0 .L00051f60: -/* 51f60: 0c012588 */ jal func00049620 +/* 51f60: 0c012588 */ jal __osRestoreInt /* 51f64: 02002025 */ or $a0,$s0,$zero /* 51f68: 10000030 */ beqz $zero,.L0005202c /* 51f6c: 2402ffff */ addiu $v0,$zero,-1 @@ -107,13 +107,13 @@ glabel func00051ef0 /* 52000: 8d4c0000 */ lw $t4,0x0($t2) /* 52004: 11800006 */ beqz $t4,.L00052020 /* 52008: 00000000 */ sll $zero,$zero,0x0 -/* 5200c: 0c000f40 */ jal func00003d00 +/* 5200c: 0c000f40 */ jal __osPopThread /* 52010: 01a02025 */ or $a0,$t5,$zero /* 52014: 00408825 */ or $s1,$v0,$zero -/* 52018: 0c01207c */ jal func000481f0 +/* 52018: 0c01207c */ jal osStartThread /* 5201c: 02202025 */ or $a0,$s1,$zero .L00052020: -/* 52020: 0c012588 */ jal func00049620 +/* 52020: 0c012588 */ jal __osRestoreInt /* 52024: 02002025 */ or $a0,$s0,$zero /* 52028: 00001025 */ or $v0,$zero,$zero .L0005202c: diff --git a/src/lib/lib_52360.c b/src/lib/lib_52360.c index 769d1c0cf..321de15a4 100644 --- a/src/lib/lib_52360.c +++ b/src/lib/lib_52360.c @@ -36,7 +36,7 @@ glabel func00052360 /* 523b0: 8e250008 */ lw $a1,0x8($s1) /* 523b4: afa00010 */ sw $zero,0x10($sp) /* 523b8: 24060500 */ addiu $a2,$zero,0x500 -/* 523bc: 0c012d84 */ jal func0004b610 +/* 523bc: 0c012d84 */ jal __osContRamWrite /* 523c0: 27a70030 */ addiu $a3,$sp,0x30 /* 523c4: 24010002 */ addiu $at,$zero,0x2 /* 523c8: 14410011 */ bne $v0,$at,.L00052410 @@ -51,7 +51,7 @@ glabel func00052360 /* 523ec: 8e250008 */ lw $a1,0x8($s1) /* 523f0: afa00010 */ sw $zero,0x10($sp) /* 523f4: 24060500 */ addiu $a2,$zero,0x500 -/* 523f8: 0c012d84 */ jal func0004b610 +/* 523f8: 0c012d84 */ jal __osContRamWrite /* 523fc: 27a70030 */ addiu $a3,$sp,0x30 /* 52400: 24010002 */ addiu $at,$zero,0x2 /* 52404: 14410002 */ bne $v0,$at,.L00052410