diff --git a/src/game/game_0e0770.c b/src/game/game_0e0770.c index b62658d68..ba5dc4eea 100644 --- a/src/game/game_0e0770.c +++ b/src/game/game_0e0770.c @@ -78,7 +78,7 @@ glabel func0f0e0770 /* f0e078c: afb30024 */ sw $s3,0x24($sp) /* f0e0790: afb20020 */ sw $s2,0x20($sp) /* f0e0794: afb1001c */ sw $s1,0x1c($sp) -/* f0e0798: 0c002acb */ jal func0000ab2c +/* f0e0798: 0c002acb */ jal vi2GetUnk28 /* f0e079c: afb00018 */ sw $s0,0x18($sp) /* f0e07a0: 0c002f02 */ jal viGetX /* f0e07a4: 00408025 */ or $s0,$v0,$zero @@ -101,7 +101,7 @@ glabel func0f0e0770 /* f0e07e0: 17010006 */ bne $t8,$at,.L0f0e07fc /* f0e07e4: 00000000 */ sll $zero,$zero,0x0 /* f0e07e8: afbf0070 */ sw $ra,0x70($sp) -/* f0e07ec: 0c002acb */ jal func0000ab2c +/* f0e07ec: 0c002acb */ jal vi2GetUnk28 /* f0e07f0: 00000000 */ sll $zero,$zero,0x0 /* f0e07f4: 8fbf0070 */ lw $ra,0x70($sp) /* f0e07f8: 00408025 */ or $s0,$v0,$zero diff --git a/src/game/game_141820.c b/src/game/game_141820.c index 929c4e5fd..1986b992b 100644 --- a/src/game/game_141820.c +++ b/src/game/game_141820.c @@ -914,7 +914,7 @@ glabel func0f142438 /* f142464: f7b80038 */ sdc1 $f24,0x38($sp) /* f142468: f7b60030 */ sdc1 $f22,0x30($sp) /* f14246c: f7b40028 */ sdc1 $f20,0x28($sp) -/* f142470: 0c002acb */ jal func0000ab2c +/* f142470: 0c002acb */ jal vi2GetUnk28 /* f142474: afa5007c */ sw $a1,0x7c($sp) /* f142478: 0c002f44 */ jal viGetViewTop /* f14247c: 0040b025 */ or $s6,$v0,$zero @@ -1054,7 +1054,7 @@ glabel func0f142644 /* f142668: afb50044 */ sw $s5,0x44($sp) /* f14266c: afb40040 */ sw $s4,0x40($sp) /* f142670: afb3003c */ sw $s3,0x3c($sp) -/* f142674: 0c002acb */ jal func0000ab2c +/* f142674: 0c002acb */ jal vi2GetUnk28 /* f142678: f7b40028 */ sdc1 $f20,0x28($sp) /* f14267c: 0c002f44 */ jal viGetViewTop /* f142680: 00000000 */ sll $zero,$zero,0x0 @@ -1454,7 +1454,7 @@ glabel func0f142bf0 /* f142c20: afb40050 */ sw $s4,0x50($sp) /* f142c24: afb3004c */ sw $s3,0x4c($sp) /* f142c28: f7b60030 */ sdc1 $f22,0x30($sp) -/* f142c2c: 0c002acb */ jal func0000ab2c +/* f142c2c: 0c002acb */ jal vi2GetUnk28 /* f142c30: f7b40028 */ sdc1 $f20,0x28($sp) /* f142c34: 0c002f44 */ jal viGetViewTop /* f142c38: 0040b025 */ or $s6,$v0,$zero diff --git a/src/include/game/data/data_000000.h b/src/include/game/data/data_000000.h index 6c4fd50dc..b0ce5cd05 100644 --- a/src/include/game/data/data_000000.h +++ b/src/include/game/data/data_000000.h @@ -76,6 +76,7 @@ extern u32 var8005d4e8; extern u32 var8005d520; extern struct rend_vidat var8005d530; extern u32 var8005d588; +extern struct rend_vidat *var8005d590; extern struct rend_vidat *g_ViData; extern u32 var8005d59c; extern u32 var8005d5b4; diff --git a/src/include/lib/lib_09660.h b/src/include/lib/lib_09660.h index 82ed078cd..dc8e7d58e 100644 --- a/src/include/lib/lib_09660.h +++ b/src/include/lib/lib_09660.h @@ -22,7 +22,7 @@ u32 func0000a044(void); u32 func0000aa50(void); void func0000aab0(u32 arg0); u32 viGetUnk28(void); -u32 func0000ab2c(void); +u32 vi2GetUnk28(void); u32 func0000ab4c(void); u32 func0000ab6c(void); u32 func0000ab78(void); diff --git a/src/lib/lib_09660.c b/src/lib/lib_09660.c index a53dc2d18..c2f5612d8 100644 --- a/src/lib/lib_09660.c +++ b/src/lib/lib_09660.c @@ -1551,13 +1551,10 @@ u32 viGetUnk28(void) return g_ViData->unk28; } -GLOBAL_ASM( -glabel func0000ab2c -/* ab2c: 3c0e8006 */ lui $t6,%hi(var8005d590) -/* ab30: 8dced590 */ lw $t6,%lo(var8005d590)($t6) -/* ab34: 03e00008 */ jr $ra -/* ab38: 8dc20028 */ lw $v0,0x28($t6) -); +u32 vi2GetUnk28(void) +{ + return var8005d590->unk28; +} void viSetUnk28(u32 arg0) {