From 4b12de02ed23300a088e933b60fe8a2ef2a1f7b6 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 15 Jun 2020 18:58:13 +1000 Subject: [PATCH] Decompile viGetUnk28 --- src/game/chr/chr.c | 4 ++-- src/game/game_015470.c | 2 +- src/game/game_01afc0.c | 2 +- src/game/game_141820.c | 16 ++++++++-------- src/game/game_176080.c | 4 ++-- src/include/lib/lib_09660.h | 2 +- src/lib/lib_09660.c | 11 ++++------- 7 files changed, 19 insertions(+), 22 deletions(-) diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index a6bb03b22..399cdbf4d 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -14947,7 +14947,7 @@ glabel func0f02bdf8 /* f02c33c: 332c0fff */ andi $t4,$t9,0xfff /* f02c340: 3c01fd10 */ lui $at,0xfd10 /* f02c344: 01816825 */ or $t5,$t4,$at -/* f02c348: 0c002ac7 */ jal func0000ab1c +/* f02c348: 0c002ac7 */ jal viGetUnk28 /* f02c34c: ae4d0000 */ sw $t5,0x0($s2) /* f02c350: 2663000f */ addiu $v1,$s3,0xf /* f02c354: 00734823 */ subu $t1,$v1,$s3 @@ -15102,7 +15102,7 @@ glabel func0f02bdf8 /* f02c580: 318d0fff */ andi $t5,$t4,0xfff /* f02c584: 3c01ff10 */ lui $at,0xff10 /* f02c588: 01a17825 */ or $t7,$t5,$at -/* f02c58c: 0c002ac7 */ jal func0000ab1c +/* f02c58c: 0c002ac7 */ jal viGetUnk28 /* f02c590: ae0f0000 */ sw $t7,0x0($s0) /* f02c594: 3c018000 */ lui $at,0x8000 /* f02c598: 0041c021 */ addu $t8,$v0,$at diff --git a/src/game/game_015470.c b/src/game/game_015470.c index c575ed7a0..0d1726693 100644 --- a/src/game/game_015470.c +++ b/src/game/game_015470.c @@ -180,7 +180,7 @@ glabel func0f0155f0 /* f01567c: 31f80fff */ andi $t8,$t7,0xfff /* f015680: 3c01ff10 */ lui $at,0xff10 /* f015684: 0301c825 */ or $t9,$t8,$at -/* f015688: 0c002ac7 */ jal func0000ab1c +/* f015688: 0c002ac7 */ jal viGetUnk28 /* f01568c: add90000 */ sw $t9,0x0($t6) /* f015690: 0c012d20 */ jal osVirtualToPhysical /* f015694: 00402025 */ or $a0,$v0,$zero diff --git a/src/game/game_01afc0.c b/src/game/game_01afc0.c index 75a9fafdd..ac5e7f440 100644 --- a/src/game/game_01afc0.c +++ b/src/game/game_01afc0.c @@ -31,7 +31,7 @@ glabel func0f01afc0 /* f01aff8: 33190fff */ andi $t9,$t8,0xfff /* f01affc: 3c01ff10 */ lui $at,0xff10 /* f01b000: 03214025 */ or $t0,$t9,$at -/* f01b004: 0c002ac7 */ jal func0000ab1c +/* f01b004: 0c002ac7 */ jal viGetUnk28 /* f01b008: ad280000 */ sw $t0,0x0($t1) /* f01b00c: 0c012d20 */ jal osVirtualToPhysical /* f01b010: 00402025 */ or $a0,$v0,$zero diff --git a/src/game/game_141820.c b/src/game/game_141820.c index b8cc4f9be..9d506ad7c 100644 --- a/src/game/game_141820.c +++ b/src/game/game_141820.c @@ -1141,7 +1141,7 @@ glabel func0f142774 /* f1427a8: afb10044 */ sw $s1,0x44($sp) /* f1427ac: f7b80038 */ sdc1 $f24,0x38($sp) /* f1427b0: f7b60030 */ sdc1 $f22,0x30($sp) -/* f1427b4: 0c002ac7 */ jal func0000ab1c +/* f1427b4: 0c002ac7 */ jal viGetUnk28 /* f1427b8: f7b40028 */ sdc1 $f20,0x28($sp) /* f1427bc: 0c002f44 */ jal viGetViewTop /* f1427c0: afa2007c */ sw $v0,0x7c($sp) @@ -1285,7 +1285,7 @@ glabel func0f14298c /* f1429b8: afb50044 */ sw $s5,0x44($sp) /* f1429bc: afb20038 */ sw $s2,0x38($sp) /* f1429c0: afb10034 */ sw $s1,0x34($sp) -/* f1429c4: 0c002ac7 */ jal func0000ab1c +/* f1429c4: 0c002ac7 */ jal viGetUnk28 /* f1429c8: f7b40028 */ sdc1 $f20,0x28($sp) /* f1429cc: 0c002f44 */ jal viGetViewTop /* f1429d0: afa2008c */ sw $v0,0x8c($sp) @@ -1607,7 +1607,7 @@ glabel hudRenderEyespyView /* f142e44: f7b80038 */ sdc1 $f24,0x38($sp) /* f142e48: f7b60030 */ sdc1 $f22,0x30($sp) /* f142e4c: f7b40028 */ sdc1 $f20,0x28($sp) -/* f142e50: 0c002ac7 */ jal func0000ab1c +/* f142e50: 0c002ac7 */ jal viGetUnk28 /* f142e54: afa7013c */ sw $a3,0x13c($sp) /* f142e58: 0c002f44 */ jal viGetViewTop /* f142e5c: afa2012c */ sw $v0,0x12c($sp) @@ -6240,7 +6240,7 @@ glabel func0f1472fc /* f147320: afb3003c */ sw $s3,0x3c($sp) /* f147324: afb20038 */ sw $s2,0x38($sp) /* f147328: afb00030 */ sw $s0,0x30($sp) -/* f14732c: 0c002ac7 */ jal func0000ab1c +/* f14732c: 0c002ac7 */ jal viGetUnk28 /* f147330: f7b40028 */ sdc1 $f20,0x28($sp) /* f147334: 0c002f26 */ jal viGetViewY /* f147338: afa2005c */ sw $v0,0x5c($sp) @@ -6416,7 +6416,7 @@ glabel func0f147578 /* f1475a0: afb1003c */ sw $s1,0x3c($sp) /* f1475a4: afb00038 */ sw $s0,0x38($sp) /* f1475a8: f7b60030 */ sdc1 $f22,0x30($sp) -/* f1475ac: 0c002ac7 */ jal func0000ab1c +/* f1475ac: 0c002ac7 */ jal viGetUnk28 /* f1475b0: f7b40028 */ sdc1 $f20,0x28($sp) /* f1475b4: 0c002f26 */ jal viGetViewY /* f1475b8: 0040f025 */ or $s8,$v0,$zero @@ -6795,7 +6795,7 @@ glabel func0f147578 /* f147b30: f7b80038 */ sdc1 $f24,0x38($sp) /* f147b34: f7b60030 */ sdc1 $f22,0x30($sp) /* f147b38: f7b40028 */ sdc1 $f20,0x28($sp) -/* f147b3c: 0c002ac7 */ jal func0000ab1c +/* f147b3c: 0c002ac7 */ jal viGetUnk28 /* f147b40: afa5008c */ sw $a1,0x8c($sp) /* f147b44: 0c002f44 */ jal viGetViewTop /* f147b48: 0040b025 */ or $s6,$v0,$zero @@ -6926,7 +6926,7 @@ glabel func0f147cf8 /* f147d10: afb30038 */ sw $s3,0x38($sp) /* f147d14: afb10030 */ sw $s1,0x30($sp) /* f147d18: afb0002c */ sw $s0,0x2c($sp) -/* f147d1c: 0c002ac7 */ jal func0000ab1c +/* f147d1c: 0c002ac7 */ jal viGetUnk28 /* f147d20: f7b40020 */ sdc1 $f20,0x20($sp) /* f147d24: 0c002f44 */ jal viGetViewTop /* f147d28: 0040a825 */ or $s5,$v0,$zero @@ -7007,7 +7007,7 @@ glabel hudRenderHorizonScanner /* f147e34: afb1004c */ sw $s1,0x4c($sp) /* f147e38: afb00048 */ sw $s0,0x48($sp) /* f147e3c: f7b60040 */ sdc1 $f22,0x40($sp) -/* f147e40: 0c002ac7 */ jal func0000ab1c +/* f147e40: 0c002ac7 */ jal viGetUnk28 /* f147e44: f7b40038 */ sdc1 $f20,0x38($sp) /* f147e48: 0c002f44 */ jal viGetViewTop /* f147e4c: afa20194 */ sw $v0,0x194($sp) diff --git a/src/game/game_176080.c b/src/game/game_176080.c index c7b97f059..48f9d055e 100644 --- a/src/game/game_176080.c +++ b/src/game/game_176080.c @@ -494,7 +494,7 @@ glabel func0f1766b4 /* f1766ec: 8dce44f0 */ lw $t6,%lo(var800844f0)($t6) /* f1766f0: 00409025 */ or $s2,$v0,$zero /* f1766f4: 0000a025 */ or $s4,$zero,$zero -/* f1766f8: 0c002ac7 */ jal func0000ab1c +/* f1766f8: 0c002ac7 */ jal viGetUnk28 /* f1766fc: afae004c */ sw $t6,0x4c($sp) /* f176700: 3c138009 */ lui $s3,%hi(var8008fa6c) /* f176704: 2673fa6c */ addiu $s3,$s3,%lo(var8008fa6c) @@ -765,7 +765,7 @@ glabel func0f1766b4 /* f176b1c: 318d0fff */ andi $t5,$t4,0xfff /* f176b20: 3c01ff10 */ lui $at,0xff10 /* f176b24: 01a17025 */ or $t6,$t5,$at -/* f176b28: 0c002ac7 */ jal func0000ab1c +/* f176b28: 0c002ac7 */ jal viGetUnk28 /* f176b2c: ae2e0000 */ sw $t6,0x0($s1) /* f176b30: 3c018000 */ lui $at,0x8000 /* f176b34: 00417821 */ addu $t7,$v0,$at diff --git a/src/include/lib/lib_09660.h b/src/include/lib/lib_09660.h index ae55ff319..df96959c9 100644 --- a/src/include/lib/lib_09660.h +++ b/src/include/lib/lib_09660.h @@ -21,7 +21,7 @@ u32 func00009ed4(void); u32 func0000a044(void); u32 func0000aa50(void); void func0000aab0(u32 arg0); -u32 func0000ab1c(void); +u32 viGetUnk28(void); u32 func0000ab2c(void); u32 func0000ab4c(void); u32 func0000ab6c(void); diff --git a/src/lib/lib_09660.c b/src/lib/lib_09660.c index 809150688..debe36bb7 100644 --- a/src/lib/lib_09660.c +++ b/src/lib/lib_09660.c @@ -1546,13 +1546,10 @@ glabel func0000aab0 /* ab18: ac20d598 */ sw $zero,%lo(var8005d598)($at) ); -GLOBAL_ASM( -glabel func0000ab1c -/* ab1c: 3c0e8006 */ lui $t6,%hi(g_ViData) -/* ab20: 8dced594 */ lw $t6,%lo(g_ViData)($t6) -/* ab24: 03e00008 */ jr $ra -/* ab28: 8dc20028 */ lw $v0,0x28($t6) -); +u32 viGetUnk28(void) +{ + return g_ViData->unk28; +} GLOBAL_ASM( glabel func0000ab2c