From 6d939842697d6c84355ef18895d72974a7da4c71 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Sun, 9 Aug 2020 00:24:40 -0500 Subject: [PATCH] (7.29%) Fully Decompiled unknown_0C7F40 --- asm/non_matchings/unknown_0C7F40/D_800C7340.s | 7 ------- lib/asm/non_matchings/unknown_0CCF90/osInitialize.s | 4 ++-- src/unknown_0C7F40.c | 4 +++- undefined_syms.txt | 2 +- 4 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 asm/non_matchings/unknown_0C7F40/D_800C7340.s diff --git a/asm/non_matchings/unknown_0C7F40/D_800C7340.s b/asm/non_matchings/unknown_0C7F40/D_800C7340.s deleted file mode 100644 index a87dbca7..00000000 --- a/asm/non_matchings/unknown_0C7F40/D_800C7340.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel D_800C7340 -/* 0C7F40 800C7340 03E00008 */ jr $ra -/* 0C7F44 800C7344 00001025 */ move $v0, $zero - -/* 0C7F48 800C7348 00000000 */ nop -/* 0C7F4C 800C734C 00000000 */ nop - diff --git a/lib/asm/non_matchings/unknown_0CCF90/osInitialize.s b/lib/asm/non_matchings/unknown_0CCF90/osInitialize.s index 1ce2eb20..49e78744 100644 --- a/lib/asm/non_matchings/unknown_0CCF90/osInitialize.s +++ b/lib/asm/non_matchings/unknown_0CCF90/osInitialize.s @@ -161,9 +161,9 @@ glabel osInitialize /* 0CD3FC 800CC7FC AFAB0034 */ sw $t3, 0x34($sp) /* 0CD400 800CC800 240D0001 */ li $t5, 1 /* 0CD404 800CC804 3C01800E */ lui $at, %hi(D_800E38B0) # $at, 0x800e -/* 0CD408 800CC808 3C05800C */ lui $a1, %hi(D_800C7340) # $a1, 0x800c +/* 0CD408 800CC808 3C05800C */ lui $a1, %hi(func_800C7340) # $a1, 0x800c /* 0CD40C 800CC80C AC2D38B0 */ sw $t5, %lo(D_800E38B0)($at) -/* 0CD410 800CC810 24A57340 */ addiu $a1, %lo(D_800C7340) # addiu $a1, $a1, 0x7340 +/* 0CD410 800CC810 24A57340 */ addiu $a1, %lo(func_800C7340) # addiu $a1, $a1, 0x7340 /* 0CD414 800CC814 0C0351FC */ jal func_800D47F0 /* 0CD418 800CC818 24040001 */ li $a0, 1 /* 0CD41C 800CC81C 10000003 */ b .L800CC82C diff --git a/src/unknown_0C7F40.c b/src/unknown_0C7F40.c index 6ce17ce2..6986dbab 100644 --- a/src/unknown_0C7F40.c +++ b/src/unknown_0C7F40.c @@ -4,4 +4,6 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_0C7F40/D_800C7340.s") +s32 func_800C7340(void) { + return 0; +} diff --git a/undefined_syms.txt b/undefined_syms.txt index 77b290c0..ed24fccb 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -45,7 +45,7 @@ D_8006C330 = 0x8006C330; D_800795AC = 0x800795AC; D_8008F618 = 0x8008F618; D_800B6FC4 = 0x800B6FC4; -D_800C7340 = 0x800C7340; +func_800C7340 = 0x800C7340; D_800C74A0 = 0x800C74A0; D_800C9D40 = 0x800C9D40; alEnvMixerPull = 0x800CA0D0;