diff --git a/asm/nonmatchings/os/code_45a50_len_3a0/osInitialize.s b/asm/nonmatchings/os/code_45a50_len_3a0/__osInitialize_common.s similarity index 99% rename from asm/nonmatchings/os/code_45a50_len_3a0/osInitialize.s rename to asm/nonmatchings/os/code_45a50_len_3a0/__osInitialize_common.s index d61ecb5849..4bfb22c61c 100644 --- a/asm/nonmatchings/os/code_45a50_len_3a0/osInitialize.s +++ b/asm/nonmatchings/os/code_45a50_len_3a0/__osInitialize_common.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel osInitialize +glabel __osInitialize_common /* 45B08 8006A708 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 45B0C 8006A70C 24020001 */ addiu $v0, $zero, 1 /* 45B10 8006A710 AFBF0018 */ sw $ra, 0x18($sp) diff --git a/configure.py b/configure.py index 9e97cc4d00..3634b771e5 100755 --- a/configure.py +++ b/configure.py @@ -278,7 +278,7 @@ async def main(): n.newline() n.rule("link", - command="${cross}ld -T undefined_syms.txt -T undefined_syms_auto.txt -T undefined_funcs.txt -T undefined_funcs_auto.txt -Map $builddir/$target.map --no-check-sections -T $in -o $out", + command="${cross}ld -T undefined_syms.txt -T undefined_syms_auto.txt -T undefined_funcs_auto.txt -Map $builddir/$target.map --no-check-sections -T $in -o $out", description="link $out") n.newline() diff --git a/src/os/code_45a50_len_3a0.c b/src/os/code_45a50_len_3a0.c index 9e13461d99..2c7b03cf70 100644 --- a/src/os/code_45a50_len_3a0.c +++ b/src/os/code_45a50_len_3a0.c @@ -2,7 +2,6 @@ INCLUDE_ASM(s32, "os/code_45a50_len_3a0", func_8006A650) -#undef osInitialize -INCLUDE_ASM(void, "os/code_45a50_len_3a0", osInitialize, void); +INCLUDE_ASM(void, "os/code_45a50_len_3a0", __osInitialize_common, void); INCLUDE_ASM(s32, "os/code_45a50_len_3a0", func_8006A9E0) diff --git a/undefined_funcs.txt b/undefined_funcs.txt deleted file mode 100644 index 167a4421d9..0000000000 --- a/undefined_funcs.txt +++ /dev/null @@ -1,63 +0,0 @@ -func_802A91F8 = 0x802A91F8; -func_802A9208 = 0x802A9208; -func_802A9228 = 0x802A9228; -func_802A9234 = 0x802A9234; -func_802A9254 = 0x802A9254; -func_802A9278 = 0x802A9278; -func_802A928C = 0x802A928C; -func_802A9294 = 0x802A9294; -func_802A9298 = 0x802A9298; -func_802A92A0 = 0x802A92A0; -func_802A92D4 = 0x802A92D4; -func_802A92DC = 0x802A92DC; -func_802A92F0 = 0x802A92F0; -func_802A9310 = 0x802A9310; -func_802A936C = 0x802A936C; -func_802A9378 = 0x802A9378; -func_802A948C = 0x802A948C; -func_802A94A4 = 0x802A94A4; -func_802A94D8 = 0x802A94D8; -func_802A9544 = 0x802A9544; -func_802A955C = 0x802A955C; -func_802A9590 = 0x802A9590; -func_802A959C = 0x802A959C; -func_802A9634 = 0x802A9634; -func_802A963C = 0x802A963C; -func_802A9664 = 0x802A9664; -func_802A96B8 = 0x802A96B8; -func_802A96DC = 0x802A96DC; -func_802A96EC = 0x802A96EC; -func_802A96F4 = 0x802A96F4; -func_802A9708 = 0x802A9708; -func_802A9718 = 0x802A9718; -func_802A9720 = 0x802A9720; -func_802A973C = 0x802A973C; -func_802A9744 = 0x802A9744; -func_802A9764 = 0x802A9764; -func_802A97AC = 0x802A97AC; -func_802A97BC = 0x802A97BC; -func_802A97CC = 0x802A97CC; -func_802A97F8 = 0x802A97F8; -func_802A97FC = 0x802A97FC; -func_802A9810 = 0x802A9810; -func_802A981C = 0x802A981C; -func_802A9834 = 0x802A9834; -func_802A984C = 0x802A984C; -func_802A9894 = 0x802A9894; -func_802A9898 = 0x802A9898; -func_802A98B0 = 0x802A98B0; -func_802A98D0 = 0x802A98D0; -func_802A98DC = 0x802A98DC; -func_802A98E0 = 0x802A98E0; -func_802A9914 = 0x802A9914; -func_802A992C = 0x802A992C; -func_802A9990 = 0x802A9990; -func_802A99D4 = 0x802A99D4; -func_802A9A30 = 0x802A9A30; -func_802A9A54 = 0x802A9A54; -func_802AA014 = 0x802AA014; -func_802AA0D8 = 0x802AA0D8; -func_802AB330 = 0x802AB330; -func_802AB338 = 0x802AB338; -func_802B71E8 = 0x802B71E8; -__osInitialize_common = 0x8006A708;