diff --git a/linker_scripts/us/symbol_addrs.txt b/linker_scripts/us/symbol_addrs.txt index 0841523a..b1676d89 100644 --- a/linker_scripts/us/symbol_addrs.txt +++ b/linker_scripts/us/symbol_addrs.txt @@ -1,6 +1,15 @@ bootproc = 0x80004DA8; D_800C90F0 = 0x800C90F0; + D_800D934C = 0x800D934C; // force_migration:True +D_800D503C = 0x800D503C; // force_migration:True +D_800D5248 = 0x800D5248; // force_migration:True +D_800D525C = 0x800D525C; // force_migration:True +D_800D8560 = 0x800D8560; // force_migration:True +D_800D55E4_fake = 0x800D55E4; // force_migration:True +D_800D8570 = 0x800D8570; // force_migration:True +D_800D8594 = 0x800D8594; // force_migration:True + D_8019B1EC_E07F2C = 0x8019B1EC; // force_migration:True segment:segment_DF4260 D_801C171C_E50E4C = 0x801C171C; // force_migration:True segment:segment_E16C50 D_801C1728_E50E58 = 0x801C1728; // force_migration:True segment:segment_E16C50 @@ -15,4 +24,4 @@ D_8019FE74_E6A2C4 = 0x8019FE74; // force_migration:True segment:segment_E51970 D_8019FEFC_E6A34C = 0x8019FEFC; // force_migration:True segment:segment_E51970 D_801A7560_EBF210 = 0x801A7560; // force_migration:True segment:segment_E9F1D0 D_801A792C_EBF5DC = 0x801A792C; // force_migration:True segment:segment_E9F1D0 -D_801B6E50_EEF510 = 0x801B6E50; // force_migration:True segment:segment_EBFBE0 +D_801B6E50_EEF510 = 0x801B6E50; // force_migration:True segment:segment_EBFBE0 \ No newline at end of file diff --git a/src/main/B99D0.c b/src/main/B99D0.c deleted file mode 100644 index 15e0b18f..00000000 --- a/src/main/B99D0.c +++ /dev/null @@ -1,113 +0,0 @@ -#include "global.h" - -extern Gfx D_800D31B0[]; - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B8DD0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B8E14.s") - -void func_800B8F18(void) { - gSPDisplayList(D_80137E64++, D_800D31B0); -} - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B8F48.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B8F78.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B8FA8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B8FD8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B9008.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B9120.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B9150.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B9180.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B9298.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B92C8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B92F8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B9328.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B9358.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B9388.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B94A0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B94D0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B95E8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B9618.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B9730.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B9760.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B9790.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B98A8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B99C0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B99F0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B9A20.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B9B38.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B9C50.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B9D68.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B9E80.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B9EB0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B9FC8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800BA0E0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800BA110.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800BA140.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800BA170.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800BA1A0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800BA1D0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800BA2E8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800BA400.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800BA430.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800BA460.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800BA490.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800BA4C0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800BA4F0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800BA520.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800BA550.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800BA580.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800BA5B0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800BA5E0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800BA610.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800BA640.s") diff --git a/src/main/hud.c b/src/main/hud.c deleted file mode 100644 index 09a2a70e..00000000 --- a/src/main/hud.c +++ /dev/null @@ -1,444 +0,0 @@ -#include "hud.h" - -extern s32 D_8013B3C0; -extern Gfx D_F014180[]; - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80084930.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80084B94.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80084E78.s") - -void func_800853A4(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { - func_8009D0BC(&D_80137E64, &D_1013170, &D_1013570, 24, 17, arg0, arg1, arg2, arg3); -} - -void func_80085404(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { - func_8009C320(&D_80137E64, &D_1011280, &D_10116A0, 48, 44, arg0, arg1, arg2, arg3); -} - -void func_80085464(f32 arg0, f32 arg1) { - func_8009C320(&D_80137E64, &D_1011AC0, &D_1011B90, 16, 26, arg0, arg1, 1.0f, 1.0f); -} - -void func_800854BC(f32 arg0, f32 arg1) { - func_8009C320(&D_80137E64, &D_1011BB0, &D_1011C80, 16, 26, arg0, arg1, 1.0f, 1.0f); -} - -void func_80085514(f32 arg0, f32 arg1) { - func_8009C320(&D_80137E64, &D_1011CA0, &D_1011D70, 16, 26, arg0, arg1, 1.0f, 1.0f); -} - -void func_8008556C(f32 arg0, f32 arg1) { - func_8009C320(&D_80137E64, &D_1011D90, &D_1011E60, 16, 26, arg0, arg1, 1.0f, 1.0f); -} - -void func_800855C4(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { - func_8009E1E8(&D_80137E64, &D_1002280, 8, 12, arg0, arg1, arg2, arg3); -} - -void func_80085618(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { - func_8009D994(&D_80137E64, &D_1002280, 8, 12, arg0, arg1, arg2, arg3); -} - -void func_8008566C(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { - func_8009D994(&D_80137E64, &D_10030D0, 8, 12, arg0, arg1, arg2, arg3); -} - -void func_800856C0(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { - func_80084E78(&D_80137E64, &D_1013580, &D_1013700, 0x30, 0xC, arg0, arg1, arg2, arg3, 48.0f * arg4, 8.0f); -} - -void func_80085740(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { - if (D_801778E8 != 0) { - func_8009D994(&D_80137E64, &D_3000B20, 0x20, 5, arg0, arg1, arg2, arg3); - } else { - func_8009D994(&D_80137E64, &D_1000E80, 0x30, 9, arg0, arg1, arg2, arg3); - } -} - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_800857DC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80085890.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80085944.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80086110.s") - -s32 func_800863C8(void) { - s32 var_v1 = 0; - - switch (D_80178234) { - case 10: - var_v1++; - - case 9: - var_v1++; - - case 19: - var_v1++; - - case 6: - var_v1++; - - case 3: - var_v1++; - - case 17: - var_v1++; - - case 18: - var_v1++; - - case 11: - var_v1++; - - case 12: - var_v1++; - - case 8: - var_v1++; - - case 7: - var_v1++; - - case 2: - var_v1++; - - case 13: - var_v1++; - - case 16: - var_v1++; - - case 14: - var_v1++; - - case 5: - var_v1++; - - case 1: - var_v1++; - case 0: - break; - } - return var_v1; -} - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80086444.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80086664.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_800869A0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80086C08.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80086CC8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80086DCC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80087530.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80087788.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80087B5C.s") - -void func_800884E4(void) { - s32 var_v1; - s32 i; - - D_80177B70[D_80177B48] = D_80161A98; - var_v1 = 0xFF0000; - - for (i = 0; i < 3; i++) { - if (D_801778B0[3 - i] <= 0) { - D_80177B50[D_80177B48] ^= var_v1; - } else { - D_80177B50[D_80177B48] |= var_v1; - } - var_v1 >>= 8; - } -} - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80088564.s") - -void func_8008865C(void) { - s32 i; - - for (i = 0; i < 5; i++) { - if (D_801617E8[i] != 0) { - D_801617E8[i]--; - } - } - func_80086CC8(); - func_80086DCC(); - func_80087B5C(); -} - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_800886B8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80088784.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80088970.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80089670.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80089710.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_800897B0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80089850.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_800898F0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80089994.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80089AF4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80089B94.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80089C38.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80089D28.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80089E98.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008A07C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008A240.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008A4DC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008AC54.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008AD94.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008B044.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008B1B0.s") - -void func_8008B2A4(void) { - if (D_80177854 != 100) { - func_8008B044(); - } - if (D_80161690 != 0) { - func_8008B1B0(); - } -} - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008B2F0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008B5B0.s") - -void func_8008B734(void) { - func_8008B2F0(); - func_8008B5B0(20.0f, 18.0f); - func_80085944(); -} - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008B774.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008B9E8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008BAE4.s") - -void func_8008BC80(void) { - if (D_80177854 != 100) { - func_8008B9E8(); - func_8008BAE4(); - } -} - -s32 func_8008BCBC(s32 arg0) { - s32 temp = 10; - s32 ret; - - if (arg0 < 0) { - arg0 = (s64) -arg0; - } - - ret = 1; - - while (arg0 >= temp) { - ret++; - temp *= 10; - } - - return ret; -} - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008BD00.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008C104.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008C390.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008C5C8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008C6F4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008CA44.s") - -s32 func_8008CB8C(void) { - return 0; -} - -void func_8008CB98(f32 arg0, f32 arg1, f32 arg2) { - func_8009D994(&D_80137E64, &D_30013E0, 8, 8, arg0, arg1, arg2, arg2); -} - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008CBE4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008CFB8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008D0DC.s") - -void func_8008D1F0(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { - func_8009C320(&D_80137E64, &D_10116B0, &D_1011730, 16, 16, arg0, arg1, arg2, arg3); -} - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008D250.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008D31C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008D4F0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008D7F4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008D984.s") - -void func_8008DC34(void) { - if ((D_80177E7C != 0) && (D_80178750 == 0)) { - func_8008D250(); - func_8008D7F4(); - func_8008D4F0(0, 0); - func_8008D31C(); - func_8008D984(); - } - - if (D_80178750 == 0) { - func_8008CBE4(); - } -} - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008DCB0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008DD78.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008DE68.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008E2C8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008E51C.s") - -void func_8008E5E8(void) { - if (D_801778E8 != 0) { - func_8008DC34(); - } - func_8008A4DC(); -} - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008E620.s") - -void func_8008E9EC(void) { - func_8008E620(); - func_8008B734(); -} - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008EA14.s") - -void func_8008F94C(void) { - func_8008E5E8(); -} - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008F96C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008FA84.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008FE78.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8008FFF0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80090200.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_800907C4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8009092C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80090A00.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80090CCC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80090E8C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_800910C0.s") - -void func_80091254(void) { - if (D_80177880 == 1) { - func_80090E8C(); - } else { - func_800910C0(); - } -} - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80091298.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80091368.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_800914FC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_800915FC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80091864.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80091B90.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80091CF8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80091DF4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80091F00.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80092244.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_800922F4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_800924E0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_800927A0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80092D48.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80092EC0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80093164.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80093310.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_800933D8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_800935E8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80094954.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80094BBC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80094D20.s") - -void func_80095350(UnkStruct_func_80095350* arg0) { - func_800613C4(arg0); - arg0->unk0 = 2; - arg0->unk2 = 0xC3; - arg0->unkB6 = 0x270F; - func_800612B8((s32*) arg0 + 7, arg0->unk2, arg0); -} - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_800953A0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_8009546C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80095538.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80095604.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/hud/func_80096A74.s") diff --git a/src/main/sf_2F300.c b/src/main/sf_2F300.c new file mode 100644 index 00000000..c0913a5c --- /dev/null +++ b/src/main/sf_2F300.c @@ -0,0 +1,51 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2F300/func_8002E700.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2F300/func_8002ED60.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2F300/func_8002EE34.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2F300/func_8002EE64.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2F300/func_8002F180.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2F300/func_8002F3E0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2F300/func_8002F5F4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2F300/func_8002F64C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2F300/func_8002F69C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2F300/func_8002FB4C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2F300/func_8002FC00.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2F300/func_8002FE74.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2F300/func_8002FEF0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2F300/func_8003010C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2F300/func_800301F4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2F300/func_8003049C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2F300/func_8003088C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2F300/func_80031858.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2F300/func_80031900.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2F300/func_800319AC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2F300/func_80034E64.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2F300/func_80035098.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2F300/func_800352E0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2F300/func_80035448.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2F300/D_800D4D20.s") diff --git a/src/main/sf_36930.c b/src/main/sf_36930.c new file mode 100644 index 00000000..9a4f59b0 --- /dev/null +++ b/src/main/sf_36930.c @@ -0,0 +1,95 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80035D30.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80035DEC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80035E48.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80035E78.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80036318.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80036528.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_800365E4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_800366CC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80036770.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80036874.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80036F88.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80037438.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80037698.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003774C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80037CF4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80038140.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80038F34.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80039210.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80039A50.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003AF88.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003AFD8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003B00C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003B55C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003BA80.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003BAA0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003BACC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003BB4C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003BEF4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003C008.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003C3D8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003C4D0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003CC08.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003CF90.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003D54C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003D854.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003D9B8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003DA0C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003DAF0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003DE68.s") + +void func_8003E1E0(void) { +} + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003E1E8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80040450.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80040954.s") + +void func_80040CDC(void) { +} + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80040CE4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80042D38.s") diff --git a/src/main/sf_43AC0.c b/src/main/sf_43AC0.c new file mode 100644 index 00000000..bfdd3b05 --- /dev/null +++ b/src/main/sf_43AC0.c @@ -0,0 +1,25 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43AC0/func_80042EC0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43AC0/func_80042FAC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43AC0/func_80042FB8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43AC0/func_80042FC4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43AC0/func_80042FD0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43AC0/func_80042FDC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43AC0/func_80042FE8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43AC0/func_80042FF4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43AC0/func_800430DC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43AC0/func_80043188.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43AC0/func_8004319C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43AC0/D_800D55D0.s") diff --git a/src/main/sf_43E80.c b/src/main/sf_43E80.c new file mode 100644 index 00000000..453295a9 --- /dev/null +++ b/src/main/sf_43E80.c @@ -0,0 +1,55 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43E80/func_80043280.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43E80/func_80043468.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43E80/func_800438E0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43E80/func_80043AA0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43E80/func_80043B0C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43E80/func_80043B18.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43E80/func_80044120.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43E80/func_800441C8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43E80/func_800443DC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43E80/func_800444BC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43E80/func_80044868.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43E80/func_80045130.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43E80/func_80045348.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43E80/func_80045678.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43E80/func_80045E7C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43E80/func_800460E0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43E80/func_80046260.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43E80/func_80046358.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43E80/func_8004641C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43E80/func_80046704.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43E80/func_80046E40.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43E80/func_80047504.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43E80/func_80047754.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43E80/func_80047D38.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43E80/func_80047E7C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43E80/func_80047FBC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43E80/func_800481F4.s") diff --git a/src/main/sf_496C0.c b/src/main/sf_496C0.c new file mode 100644 index 00000000..0f8eeaac --- /dev/null +++ b/src/main/sf_496C0.c @@ -0,0 +1,71 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_80048AC0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_80048CC4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_80048E40.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_80049630.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004990C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_80049968.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_80049A9C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_80049B44.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_80049C0C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004A52C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004A700.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004A840.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004A888.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004AA84.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004AAF4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004B368.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004C90C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004C930.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004CCC0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004D3C8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004D3D4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004D440.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004D738.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004D828.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004DEF8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004E3D8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004E4D4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004EBD0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004F05C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004F798.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004F8AC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004FCB8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_8004FEC0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/func_800515C4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_496C0/D_800D5750.s") diff --git a/src/main/sf_52730.c b/src/main/sf_52730.c new file mode 100644 index 00000000..299b3b7a --- /dev/null +++ b/src/main/sf_52730.c @@ -0,0 +1,75 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_80051B30.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_800520FC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_800523A8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_80052420.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_80052498.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_8005250C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_80052584.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_800526B8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_80052884.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_80052B80.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_80052D48.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_8005314C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_800531A4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_80053658.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_80053B00.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_80053B18.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_80053C38.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_80053F7C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_80054280.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_80054300.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_8005465C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_8005478C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_80054914.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_80054CA4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_80054E80.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_80055788.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_80055B58.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_80055E98.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_80056230.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_800563B4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_800564C0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_80056E2C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_80057248.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_80057504.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_80057814.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_800578C4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_52730/func_80057D00.s") diff --git a/src/main/sf_59780.c b/src/main/sf_59780.c new file mode 100644 index 00000000..99f9b7f2 --- /dev/null +++ b/src/main/sf_59780.c @@ -0,0 +1,17 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_59780/func_80058B80.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_59780/func_80058C48.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_59780/func_80058F14.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_59780/func_80059498.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_59780/func_800594F0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_59780/func_800595D0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_59780/func_800596B0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_59780/D_800D5FA0.s") diff --git a/src/main/sf_5A2C0.c b/src/main/sf_5A2C0.c new file mode 100644 index 00000000..f5e55b5c --- /dev/null +++ b/src/main/sf_5A2C0.c @@ -0,0 +1,131 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_800596C0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_800597C0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005980C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_80059850.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_800598DC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_800598E8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_800599A4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_80059A24.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_80059AEC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_80059B20.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_80059BB0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_80059BBC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_80059BF0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_80059C28.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_80059C34.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_80059C40.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_80059F68.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_80059FDC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005A010.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005A07C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005A088.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005A094.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005ADAC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005B1E8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005B388.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005B6A4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005B71C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005B7CC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005B848.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005B9A4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005BA30.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005BAB4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005C5F0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005C900.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005C9C0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005CA80.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005CB44.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005CC9C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005CDA8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005D008.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005D1F0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005D3CC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005D654.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005D8B8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005D954.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005DBC0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005E1B8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005E454.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005E538.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005E7B8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005EA24.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005ECD8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005F030.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005F0E8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005F1EC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005F290.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005F2F4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005F670.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005F9DC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8005FB70.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8006046C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_80060714.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_8006089C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_80060968.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_5A2C0/func_80060D94.s") diff --git a/src/main/sf_61B30.c b/src/main/sf_61B30.c new file mode 100644 index 00000000..27987a83 --- /dev/null +++ b/src/main/sf_61B30.c @@ -0,0 +1,191 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80060F30.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80060FBC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80060FE4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80061148.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_800612B8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80061364.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80061394.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_800613C4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80061404.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80061444.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80061474.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_800614B4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_800615A0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_8006168C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80061778.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80061864.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80061958.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80061A4C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80061B68.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80061CD0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80061E48.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80061F0C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80062180.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80062568.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80062664.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80062B60.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80062C38.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80062D04.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80062DBC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_800631A8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_8006326C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_8006351C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80063CAC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80063D58.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80063E5C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80063F4C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80063F58.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80063F74.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80063F90.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_800652CC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80065380.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_8006546C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_800654E4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_800655C8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_8006566C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_800656D4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_800660F0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80066254.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_8006654C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_8006684C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_800669A0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80066A80.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80066A8C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80066C00.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80066D5C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80066E80.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80066E8C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80066EA8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80066EE4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80066EF0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_800671D0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80067348.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_800674B4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_8006753C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80067874.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80067A40.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80067B1C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80067BEC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80067F6C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80068020.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_800685D8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_800685F8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80068618.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80068688.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80068914.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80068C48.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80068C88.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80068FE0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_800690D0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_800693E8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80069658.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_800696F8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80069858.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80069924.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80069A10.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80069AAC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80069CBC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80069DF4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80069E88.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80069F30.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_80069FD4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_8006A06C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_8006A38C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/func_8006A3E8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_61B30/D_800D63D0.s") diff --git a/src/main/sf_6B3B0.c b/src/main/sf_6B3B0.c new file mode 100644 index 00000000..666837e0 --- /dev/null +++ b/src/main/sf_6B3B0.c @@ -0,0 +1,125 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006A7B0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006A800.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006A900.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006A96C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006A978.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006A984.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006AA3C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006AA98.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006ABA4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006AC08.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006AD18.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006B094.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006B0A0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006B46C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006B74C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006B95C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006BA64.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006BB1C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006BB78.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006BF7C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006C008.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006D0F4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006D350.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006D36C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006EA50.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006EAC4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006EB64.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006EBC0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006EC60.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006ECBC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006EEFC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006EFA0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006F044.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006F0D8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006F140.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006F1EC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006F254.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006F40C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006FE28.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006FEEC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_800700A4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_800701E0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_80070BA8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_80070CEC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_80070D44.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_80071DC0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_800720E8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_800722EC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8007240C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_80072474.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_80072594.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_80074BFC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_80074C44.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_80074E3C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_80074F04.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_80074F90.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_80074FF0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_800763A4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8007717C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_800771CC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_80077218.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/D_800D6A50.s") diff --git a/src/main/sf_77E40.c b/src/main/sf_77E40.c new file mode 100644 index 00000000..a9149313 --- /dev/null +++ b/src/main/sf_77E40.c @@ -0,0 +1,345 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80077240.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007729C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80077404.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80077790.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007783C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_800778C4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007797C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80077A00.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80077A7C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80077B78.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80077B84.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80078038.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_800780F8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_800783C0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80078438.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_800784B4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80078550.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80078604.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007868C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007879C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_800788B0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80078A64.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80078AE0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80078AEC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80078B8C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80078BE0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80078C84.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80078CE8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80078D60.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80078E50.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80078EBC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80078F78.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007905C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_800794CC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007953C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_800795AC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80079618.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007968C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_800798C4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_800798F0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007A28C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007A3C0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007A4B8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007A568.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007A5F8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007A6F0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007A748.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007A774.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007A818.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007A900.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007A994.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007AA60.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007AB50.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007AC0C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007ACE0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007AD58.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007ADF4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007AF30.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007AFD0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007B040.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007B0F4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007B180.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007B228.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007B2BC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007B344.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007B3B8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007B494.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007B550.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007B5C0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007B62C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007B670.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007B67C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007B758.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007B7E8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007B8F8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007B960.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007B9DC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007BB14.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007BC7C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007BCE8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007BDE0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007BE54.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007BEE8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007BF64.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007BFFC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007C088.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007C120.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007C1AC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007C250.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007C3B4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007C484.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007C50C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007C608.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007C688.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007C6FC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007C85C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007C8C4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007C9E0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007CAF0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007CC00.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007CCBC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007CD7C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007CEBC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007CF30.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007CF9C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007D008.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007D074.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007D0E0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007D10C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007D138.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007D1E0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007D24C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007D2C8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007D2F4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007D55C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007D748.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007D8A8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007D94C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007D9DC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007DA58.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007DAE4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007DB70.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007DED4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007E014.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007E258.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007E298.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007E330.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007E3E4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007E45C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007E5CC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007E648.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007E6B8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007E93C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007EBB8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007ECB4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007ED54.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007EE68.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007F04C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007F11C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007F20C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007F2FC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007F438.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007F5AC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007F6B0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007F958.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007FBE0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007FD84.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007FE88.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_800802B8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_800802D8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_800802F8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80080360.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8008040C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8008092C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80080ACC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80080D04.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_800815DC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8008165C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80081A8C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80081B24.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80081BEC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80081C5C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80082F78.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_800836C0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8008377C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_800837EC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80083B8C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80083C70.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80083D2C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80083FA8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_80084194.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/D_800D7230.s") diff --git a/src/main/sf_84F70.c b/src/main/sf_84F70.c new file mode 100644 index 00000000..4529e6dd --- /dev/null +++ b/src/main/sf_84F70.c @@ -0,0 +1,13 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_84F70/func_80084370.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_84F70/func_800843FC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_84F70/func_80084488.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_84F70/func_80084688.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_84F70/func_800846F0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_84F70/D_800D76F0.s") diff --git a/src/main/sf_97F80.c b/src/main/sf_97F80.c new file mode 100644 index 00000000..37282435 --- /dev/null +++ b/src/main/sf_97F80.c @@ -0,0 +1,31 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_97F80/func_80097380.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_97F80/func_80097558.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_97F80/func_80097730.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_97F80/func_800978C4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_97F80/func_800979E8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_97F80/func_80097C88.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_97F80/func_8009808C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_97F80/func_800985CC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_97F80/func_80098860.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_97F80/func_800988B4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_97F80/func_800988F8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_97F80/func_8009893C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_97F80/func_80098980.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_97F80/func_80099254.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_97F80/func_800998FC.s") diff --git a/src/main/sf_9A580.c b/src/main/sf_9A580.c new file mode 100644 index 00000000..1fb1d39c --- /dev/null +++ b/src/main/sf_9A580.c @@ -0,0 +1,93 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_80099980.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_800999D8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_80099A2C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_80099E28.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009A400.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009A440.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009A72C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009AA20.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009ACDC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009AD18.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009B74C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009B784.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009BC2C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009BD38.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009BEEC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009C124.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009C320.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009C674.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009C9C8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009CD3C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009D0BC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009D418.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009D6CC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009D994.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009DC4C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009DF14.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009E1E8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009E4B0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009E784.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009EA38.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009ED04.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009EFDC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009F2C0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009F574.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009F6CC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009F768.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009F7B4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009FC0C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_8009FEA0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_800A0094.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_800A06F8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_800A100C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_800A1200.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_800A13EC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_800A1540.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_9A580/func_800A1558.s") diff --git a/src/main/sf_A24B0.c b/src/main/sf_A24B0.c new file mode 100644 index 00000000..dbf2083b --- /dev/null +++ b/src/main/sf_A24B0.c @@ -0,0 +1,23 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A24B0/func_800A18B0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A24B0/func_800A1980.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A24B0/func_800A1B6C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A24B0/func_800A1C14.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A24B0/func_800A1E68.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A24B0/func_800A1F44.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A24B0/func_800A1FB0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A24B0/func_800A24DC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A24B0/func_800A25DC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A24B0/func_800A26C0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A24B0/func_800A3608.s") diff --git a/src/main/sf_A4290.c b/src/main/sf_A4290.c new file mode 100644 index 00000000..a54947d6 --- /dev/null +++ b/src/main/sf_A4290.c @@ -0,0 +1,7 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4290/func_800A3690.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4290/func_800A36FC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4290/func_800A3A74.s") diff --git a/src/main/sf_A48A0.c b/src/main/sf_A48A0.c new file mode 100644 index 00000000..753939ec --- /dev/null +++ b/src/main/sf_A48A0.c @@ -0,0 +1,5 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A48A0/func_800A3CA0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A48A0/func_800A3E00.s") diff --git a/src/main/sf_A4B50.c b/src/main/sf_A4B50.c new file mode 100644 index 00000000..77d86953 --- /dev/null +++ b/src/main/sf_A4B50.c @@ -0,0 +1,204 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A3F50.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A3FB0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A3FC4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A3FEC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A4460.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A46A0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A4C40.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A4F4C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A4F7C.s") + +void func_800A5330(void) { +} + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A5338.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A55B0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A57E0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A5844.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A594C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A5D6C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A5EBC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A5FA0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A6028.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A6070.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A60B8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A60E8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A6118.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A6148.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A6590.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A668C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A670C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A69F8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A6A74.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A6AC0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A6CD0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A729C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A73E4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A78C4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A7974.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A8054.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A8304.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A86E4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A8804.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A887C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A8BA4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800AA800.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800AB2AC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800AB304.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800AB334.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800AB964.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800ABA08.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800ABAB4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800AC290.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800AC650.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800ACA40.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800ACABC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800ACC7C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800ACDC0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800AD094.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800AD118.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800AD1F4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800AD7F0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800ADA28.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800ADD98.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800ADF58.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800AE278.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800AE4A4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800AECAC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800AF07C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800AF928.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B00C0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B0194.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B0F50.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B2130.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B22C0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B2574.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B2BE0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B2C00.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B3010.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B3314.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B39E0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B40AC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B415C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B41E0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B41EC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B42B0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B44C4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B46F8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B48BC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B56BC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B5D30.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B5FBC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B63BC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B6848.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B6BFC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B6F50.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B7184.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B71E4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B73E0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B79B0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B832C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B852C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B86A4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800B86CC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/D_800D82F0.s") diff --git a/src/main/sf_B99D0.c b/src/main/sf_B99D0.c new file mode 100644 index 00000000..5b0364a5 --- /dev/null +++ b/src/main/sf_B99D0.c @@ -0,0 +1,113 @@ +#include "global.h" + +extern Gfx D_800D31B0[]; + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B8DD0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B8E14.s") + +void func_800B8F18(void) { + gSPDisplayList(D_80137E64++, D_800D31B0); +} + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B8F48.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B8F78.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B8FA8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B8FD8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9008.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9120.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9150.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9180.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9298.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B92C8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B92F8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9328.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9358.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9388.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B94A0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B94D0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B95E8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9618.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9730.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9760.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9790.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B98A8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B99C0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B99F0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9A20.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9B38.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9C50.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9D68.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9E80.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9EB0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9FC8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA0E0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA110.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA140.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA170.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA1A0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA1D0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA2E8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA400.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA430.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA460.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA490.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA4C0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA4F0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA520.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA550.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA580.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA5B0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA5E0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA610.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA640.s") diff --git a/src/main/sf_BB360.c b/src/main/sf_BB360.c new file mode 100644 index 00000000..2104ff77 --- /dev/null +++ b/src/main/sf_BB360.c @@ -0,0 +1,17 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_BB360/func_800BA760.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_BB360/func_800BA7BC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_BB360/func_800BA808.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_BB360/func_800BAAE8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_BB360/func_800BB388.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_BB360/func_800BB5D0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_BB360/func_800BC040.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_BB360/func_800BC4B0.s") diff --git a/src/main/sf_C3430.c b/src/main/sf_C3430.c new file mode 100644 index 00000000..655556a2 --- /dev/null +++ b/src/main/sf_C3430.c @@ -0,0 +1,23 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_C3430/func_800C2830.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_C3430/func_800C2890.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_C3430/func_800C28DC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_C3430/func_800C2928.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_C3430/func_800C295C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_C3430/func_800C2AF0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_C3430/func_800C2D3C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_C3430/func_800C2F30.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_C3430/func_800C2FB0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_C3430/func_800C3084.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_C3430/func_800C3194.s") diff --git a/src/main/sf_hud.c b/src/main/sf_hud.c new file mode 100644 index 00000000..016d4090 --- /dev/null +++ b/src/main/sf_hud.c @@ -0,0 +1,444 @@ +#include "hud.h" + +extern s32 D_8013B3C0; +extern Gfx D_F014180[]; + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80084930.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80084B94.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80084E78.s") + +void func_800853A4(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { + func_8009D0BC(&D_80137E64, &D_1013170, &D_1013570, 24, 17, arg0, arg1, arg2, arg3); +} + +void func_80085404(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { + func_8009C320(&D_80137E64, &D_1011280, &D_10116A0, 48, 44, arg0, arg1, arg2, arg3); +} + +void func_80085464(f32 arg0, f32 arg1) { + func_8009C320(&D_80137E64, &D_1011AC0, &D_1011B90, 16, 26, arg0, arg1, 1.0f, 1.0f); +} + +void func_800854BC(f32 arg0, f32 arg1) { + func_8009C320(&D_80137E64, &D_1011BB0, &D_1011C80, 16, 26, arg0, arg1, 1.0f, 1.0f); +} + +void func_80085514(f32 arg0, f32 arg1) { + func_8009C320(&D_80137E64, &D_1011CA0, &D_1011D70, 16, 26, arg0, arg1, 1.0f, 1.0f); +} + +void func_8008556C(f32 arg0, f32 arg1) { + func_8009C320(&D_80137E64, &D_1011D90, &D_1011E60, 16, 26, arg0, arg1, 1.0f, 1.0f); +} + +void func_800855C4(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { + func_8009E1E8(&D_80137E64, &D_1002280, 8, 12, arg0, arg1, arg2, arg3); +} + +void func_80085618(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { + func_8009D994(&D_80137E64, &D_1002280, 8, 12, arg0, arg1, arg2, arg3); +} + +void func_8008566C(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { + func_8009D994(&D_80137E64, &D_10030D0, 8, 12, arg0, arg1, arg2, arg3); +} + +void func_800856C0(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { + func_80084E78(&D_80137E64, &D_1013580, &D_1013700, 0x30, 0xC, arg0, arg1, arg2, arg3, 48.0f * arg4, 8.0f); +} + +void func_80085740(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { + if (D_801778E8 != 0) { + func_8009D994(&D_80137E64, &D_3000B20, 0x20, 5, arg0, arg1, arg2, arg3); + } else { + func_8009D994(&D_80137E64, &D_1000E80, 0x30, 9, arg0, arg1, arg2, arg3); + } +} + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_800857DC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80085890.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80085944.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80086110.s") + +s32 func_800863C8(void) { + s32 var_v1 = 0; + + switch (D_80178234) { + case 10: + var_v1++; + + case 9: + var_v1++; + + case 19: + var_v1++; + + case 6: + var_v1++; + + case 3: + var_v1++; + + case 17: + var_v1++; + + case 18: + var_v1++; + + case 11: + var_v1++; + + case 12: + var_v1++; + + case 8: + var_v1++; + + case 7: + var_v1++; + + case 2: + var_v1++; + + case 13: + var_v1++; + + case 16: + var_v1++; + + case 14: + var_v1++; + + case 5: + var_v1++; + + case 1: + var_v1++; + case 0: + break; + } + return var_v1; +} + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80086444.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80086664.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_800869A0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80086C08.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80086CC8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80086DCC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80087530.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80087788.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80087B5C.s") + +void func_800884E4(void) { + s32 var_v1; + s32 i; + + D_80177B70[D_80177B48] = D_80161A98; + var_v1 = 0xFF0000; + + for (i = 0; i < 3; i++) { + if (D_801778B0[3 - i] <= 0) { + D_80177B50[D_80177B48] ^= var_v1; + } else { + D_80177B50[D_80177B48] |= var_v1; + } + var_v1 >>= 8; + } +} + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80088564.s") + +void func_8008865C(void) { + s32 i; + + for (i = 0; i < 5; i++) { + if (D_801617E8[i] != 0) { + D_801617E8[i]--; + } + } + func_80086CC8(); + func_80086DCC(); + func_80087B5C(); +} + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_800886B8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80088784.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80088970.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80089670.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80089710.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_800897B0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80089850.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_800898F0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80089994.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80089AF4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80089B94.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80089C38.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80089D28.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80089E98.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008A07C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008A240.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008A4DC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008AC54.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008AD94.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008B044.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008B1B0.s") + +void func_8008B2A4(void) { + if (D_80177854 != 100) { + func_8008B044(); + } + if (D_80161690 != 0) { + func_8008B1B0(); + } +} + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008B2F0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008B5B0.s") + +void func_8008B734(void) { + func_8008B2F0(); + func_8008B5B0(20.0f, 18.0f); + func_80085944(); +} + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008B774.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008B9E8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008BAE4.s") + +void func_8008BC80(void) { + if (D_80177854 != 100) { + func_8008B9E8(); + func_8008BAE4(); + } +} + +s32 func_8008BCBC(s32 arg0) { + s32 temp = 10; + s32 ret; + + if (arg0 < 0) { + arg0 = (s64) -arg0; + } + + ret = 1; + + while (arg0 >= temp) { + ret++; + temp *= 10; + } + + return ret; +} + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008BD00.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008C104.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008C390.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008C5C8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008C6F4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008CA44.s") + +s32 func_8008CB8C(void) { + return 0; +} + +void func_8008CB98(f32 arg0, f32 arg1, f32 arg2) { + func_8009D994(&D_80137E64, &D_30013E0, 8, 8, arg0, arg1, arg2, arg2); +} + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008CBE4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008CFB8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008D0DC.s") + +void func_8008D1F0(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { + func_8009C320(&D_80137E64, &D_10116B0, &D_1011730, 16, 16, arg0, arg1, arg2, arg3); +} + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008D250.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008D31C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008D4F0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008D7F4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008D984.s") + +void func_8008DC34(void) { + if ((D_80177E7C != 0) && (D_80178750 == 0)) { + func_8008D250(); + func_8008D7F4(); + func_8008D4F0(0, 0); + func_8008D31C(); + func_8008D984(); + } + + if (D_80178750 == 0) { + func_8008CBE4(); + } +} + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008DCB0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008DD78.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008DE68.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008E2C8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008E51C.s") + +void func_8008E5E8(void) { + if (D_801778E8 != 0) { + func_8008DC34(); + } + func_8008A4DC(); +} + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008E620.s") + +void func_8008E9EC(void) { + func_8008E620(); + func_8008B734(); +} + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008EA14.s") + +void func_8008F94C(void) { + func_8008E5E8(); +} + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008F96C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008FA84.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008FE78.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8008FFF0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80090200.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_800907C4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8009092C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80090A00.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80090CCC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80090E8C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_800910C0.s") + +void func_80091254(void) { + if (D_80177880 == 1) { + func_80090E8C(); + } else { + func_800910C0(); + } +} + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80091298.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80091368.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_800914FC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_800915FC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80091864.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80091B90.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80091CF8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80091DF4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80091F00.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80092244.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_800922F4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_800924E0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_800927A0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80092D48.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80092EC0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80093164.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80093310.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_800933D8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_800935E8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80094954.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80094BBC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80094D20.s") + +void func_80095350(UnkStruct_func_80095350* arg0) { + func_800613C4(arg0); + arg0->unk0 = 2; + arg0->unk2 = 0xC3; + arg0->unkB6 = 0x270F; + func_800612B8((s32*) arg0 + 7, arg0->unk2, arg0); +} + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_800953A0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_8009546C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80095538.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80095604.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80096A74.s") diff --git a/src/main/sf_versus.c b/src/main/sf_versus.c new file mode 100644 index 00000000..4b272ed9 --- /dev/null +++ b/src/main/sf_versus.c @@ -0,0 +1,151 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BC760.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BC88C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BC8D8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BC9DC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BCB44.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BCC48.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BCE24.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BCEF8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BCFFC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BD05C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BD0B4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BD10C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BD164.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BD1B0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BD1FC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BD248.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BD2A0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BD2F8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BD350.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BD3A8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BD4D4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BD720.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BD76C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BD7C4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BD9FC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BDA54.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BDAA0.s") + +void func_800BDE3C(void) { +} + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BDE44.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BE078.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BE300.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BE564.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BE924.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BECA8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BED78.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BEDDC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BEF00.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BEFE4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BF17C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BF59C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BF750.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800BF9AC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800C024C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800C0294.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800C04DC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800C075C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800C07C4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800C08D0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800C0970.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800C0A04.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800C0B0C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800C0C84.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800C0D10.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800C0E78.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800C107C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800C1138.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800C1368.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800C15D8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800C1690.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800C16A0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800C16D0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800C1700.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800C176C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800C1E9C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800C1ED4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800C20B0.s") + +void func_800C2190(void) { +} + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800C2198.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800C2244.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/func_800C26C8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/D_800D9260.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/D_800D9264.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/D_800D926C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_versus/D_800D9274.s") diff --git a/src/main/versus.c b/src/main/versus.c deleted file mode 100644 index 5f767ea0..00000000 --- a/src/main/versus.c +++ /dev/null @@ -1,151 +0,0 @@ -#include "common.h" - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BC760.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BC88C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BC8D8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BC9DC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BCB44.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BCC48.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BCE24.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BCEF8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BCFFC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BD05C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BD0B4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BD10C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BD164.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BD1B0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BD1FC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BD248.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BD2A0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BD2F8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BD350.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BD3A8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BD4D4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BD720.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BD76C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BD7C4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BD9FC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BDA54.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BDAA0.s") - -void func_800BDE3C(void) { -} - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BDE44.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BE078.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BE300.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BE564.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BE924.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BECA8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BED78.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BEDDC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BEF00.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BEFE4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BF17C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BF59C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BF750.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800BF9AC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800C024C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800C0294.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800C04DC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800C075C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800C07C4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800C08D0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800C0970.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800C0A04.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800C0B0C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800C0C84.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800C0D10.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800C0E78.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800C107C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800C1138.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800C1368.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800C15D8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800C1690.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800C16A0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800C16D0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800C1700.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800C176C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800C1E9C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800C1ED4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800C20B0.s") - -void func_800C2190(void) { -} - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800C2198.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800C2244.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/func_800C26C8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/D_800D9260.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/D_800D9264.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/D_800D926C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/versus/D_800D9274.s") diff --git a/src/overlays/segment_EBFBE0/EBFCA0.c b/src/overlays/segment_EBFBE0/EBFCA0.c index f81c07de..0453363e 100644 --- a/src/overlays/segment_EBFBE0/EBFCA0.c +++ b/src/overlays/segment_EBFBE0/EBFCA0.c @@ -390,11 +390,11 @@ void func_80187E28_EC04E8(void) { //! TODO: Clean up this mess! -f32 func_80005100(f32, f32); -void func_8009BC2C(f32*, f32, f32, f32, f32); -void func_8018D2B8_EC5978(s32); -void func_8018EA78_EC7138(s32); -void func_80191674_EC9D34(f32, f32, f32, f32*, f32*, f32*); +f32 func_80005100(f32, f32); +void func_8009BC2C(f32*, f32, f32, f32, f32); +void func_8018D2B8_EC5978(s32); +void func_8018EA78_EC7138(s32); +void func_80191674_EC9D34(f32, f32, f32, f32*, f32*, f32*); extern s32 D_80178548; extern s32 D_8017854C; diff --git a/tools/splat b/tools/splat index 6cfc9a1e..0b0bfa6c 160000 --- a/tools/splat +++ b/tools/splat @@ -1 +1 @@ -Subproject commit 6cfc9a1ea7dd5c1be363196ea2b57569af2f55f9 +Subproject commit 0b0bfa6c99e3c757517d1630fcdb8b7dd34d9792 diff --git a/yamls/us/header.yaml b/yamls/us/header.yaml index 01ee18b4..1f2aedd6 100644 --- a/yamls/us/header.yaml +++ b/yamls/us/header.yaml @@ -51,7 +51,10 @@ options: asm_jtbl_label_macro: jlabel asm_data_macro: dlabel - section_order: [".text", ".data", ".rodata", ".bss", "bin"] + ld_legacy_generation: True + check_consecutive_segment_types: False + + # section_order: [".text", ".data", ".rodata", ".bss", "bin"] # auto_all_sections: [".data", ".rodata", ".bss"] diff --git a/yamls/us/main.yaml b/yamls/us/main.yaml index 7ae18aeb..60a787aa 100644 --- a/yamls/us/main.yaml +++ b/yamls/us/main.yaml @@ -149,32 +149,36 @@ - [0x2EE30, asm, ../libultra/2EE30] - [0x2EE80, asm, ../libultra/os/stopthread] # Problem when trying to C - # Game code starts here? - - [0x36930, asm, 36930] # don't touch before fixing rodata - - [0x43AC0, asm] # don't touch before fixing rodata - - [0x43E80, asm, 43E80] - - [0x496C0, asm, 496C0] # don't touch before fixing rodata - - [0x52730, asm, 52730] # don't touch before fixing rodata - - [0x59780, asm, 59780] - - [0x5A2C0, asm] # -02 -g3 - - [0x6B3B0, asm, 6B3B0] - - [0x77E40, asm] - - [0x84F70, asm, 84F70] - - [0x85530, c, hud] - - [0x97F80, asm, 97F80] - - [0x9A580, asm, 9A580] - - [0xA24B0, asm, A24B0] # don't touch before fixing rodata - - [0xA48A0, asm, A48A0] - - [0xA4B50, asm] # don't touch before fixing rodata - - [0xB99D0, c] # -02 -g3 - - [0xBB360, asm, BB360] # don't touch before fixing rodata - - [0xBD360, c, versus] - - [0xC3430, asm, C3430] + # Game engine + - [0x2F300, c, sf_2F300] + - [0x36930, c, sf_36930] + - [0x43AC0, c, sf_43AC0] + - [0x43E80, c, sf_43E80] + - [0x496C0, c, sf_496C0] + - [0x52730, c, sf_52730] + - [0x59780, c, sf_59780] + - [0x5A2C0, c, sf_5A2C0] # -02 -g3 + - [0x61B30, c, sf_61B30] + - [0x6B3B0, c, sf_6B3B0] + - [0x77E40, c, sf_77E40] + - [0x84F70, c, sf_84F70] + - [0x85530, c, sf_hud] + - [0x97F80, c, sf_97F80] + - [0x9A580, c, sf_9A580] + - [0xA24B0, c, sf_A24B0] + - [0xA4290, c, sf_A4290] + - [0xA48A0, c, sf_A48A0] + - [0xA4B50, c, sf_A4B50] + - [0xB99D0, c, sf_B99D0] # -02 -g3, no rodata + - [0xBB360, c, sf_BB360] + - [0xBD360, c, sf_versus] + - [0xC3430, c, sf_C3430] - # DATA - - [0xC3EE0, data] + # DATA - Libultra + - [0xC3EE0, data, libraries] - # RODATA + # RODATA - Libultra + - [0xC8CC0, rodata] - [0xC8E40, .rodata, 7FC0] - [0xC9220, .rodata, 8CC0] - [0xC9260, .rodata, C870] @@ -195,93 +199,34 @@ - [0xCA1E0, .rodata, ../libultra/2BDF0] - [0xCA5A0, rodata, 2DF00] - [0xCA650, rodata] - - [0xCA690, rodata] - - [0xCA7C0, rodata] - - [0xCA830, rodata] - - [0xCAB00, rodata] - - [0xCAB10, rodata] - - [0xCAB20, rodata, 43E80] - - [0xCABD0, rodata] - - [0xCABE0, rodata] - - [0xCAC10, rodata] - - [0xCAC30, rodata] - - [0xCAC50, rodata] - - [0xCAC80, rodata] - - [0xCAD90, rodata, 496C0] - - [0xCAE20, rodata] - - [0xCAE90, rodata] - - [0xCAFB0, rodata] - - [0xD05B0, rodata] - - [0xD08C0, rodata] - - [0xD0910, rodata] - - [0xD09A0, rodata] - - [0xD0B80, rodata] - - [0xD0B90, rodata] - - [0xD0C00, rodata] - - [0xD0C30, rodata, 6B3B0] - - [0xD20E0, rodata] - - [0xD2550, rodata] - - [0xD2570, rodata] - - [0xD25E0, rodata] - - [0xD2900, rodata] - - [0xD2D30, rodata] - - [0xD2D90, rodata] - - [0xD2DA0, rodata] - - [0xD2F20, rodata] - - [0xD31D0, rodata] - - [0xD3460, rodata] - - [0xD3C00, rodata] - - [0xD3C40, rodata] - - [0xD3DB0, rodata] - - [0xD3E40, rodata] - - [0xD3ED0, rodata] - - [0xD3FF0, rodata] - - [0xD4110, rodata] - - [0xD41A0, rodata] - - [0xD42C0, rodata] - - [0xD4350, rodata] - - [0xD4620, rodata] - - [0xD46B0, rodata] - - [0xD4740, rodata] - - [0xD47D0, rodata] - - [0xD48F0, rodata] - - [0xD4980, rodata] - - [0xD4A10, rodata] - - [0xD4AA0, rodata] - - [0xD4B30, rodata] - - [0xD4BC0, rodata] - - [0xD4C50, rodata] - - [0xD4E90, rodata] - - [0xD4F20, rodata] - - [0xD4FB0, rodata] - - [0xD5040, rodata] - - [0xD50D0, rodata] - - [0xD5280, rodata] - - [0xD5310, rodata] - - [0xD53A0, rodata] - - [0xD5670, rodata] - - [0xD5680, rodata] - - [0xD5690, rodata] - - [0xD5910, rodata, ../libultra/2EE30] - - [0xD5CF0, rodata] - - [0xD61F0, rodata] - - [0xD69A0, rodata, 59780] - - [0xD6C20, rodata, 84F70] - - [0xD8320, .rodata, hud] - - [0xD8DE0, rodata, 97F80] - - [0xD8DF0, rodata, 9A580] - - [0xD8E50, rodata] - - [0xD8ED0, rodata, A24B0] - - [0xD8EE0, rodata, A48A0] - - [0xD97F0, rodata, BB360] - - [0xD9E50, .rodata, versus] - - [0xD9F60, rodata, C3430] - - [0xDA030, rodata] - - [0xDC620, rodata] - - [0xDD330, rodata] - - [0xDDD30, rodata] - - [0xDDD60, rodata] - - [0xDDD70, rodata] - - [0xDDD80, rodata] - - [0xDDE80, rodata] + + # DATA - game engine + - [0xCA690, data, engine] + + # RODATA - game engine + - [0xD5920, .rodata, sf_2F300] + - [0xD5CF0, .rodata, sf_36930] + - [0xD61D0, .rodata, sf_43AC0] + - [0xD61F0, .rodata, sf_43E80] + - [0xD6350, .rodata, sf_496C0] + - [0xD69A0, .rodata, sf_52730] + - [0xD6BA0, .rodata, sf_59780] + - [0xD6C20, .rodata, sf_5A2C0] + - [0xD6FD0, .rodata, sf_61B30] + - [0xD7650, .rodata, sf_6B3B0] + - [0xD7E30, .rodata, sf_77E40] + - [0xD82F0, .rodata, sf_84F70] + - [0xD8320, .rodata, sf_hud] + - [0xD8DE0, .rodata, sf_97F80] + - [0xD8DF0, .rodata, sf_9A580] + - [0xD8E50, .rodata, sf_A24B0] + - [0xD8ED0, .rodata, sf_A4290] + - [0xD8EE0, .rodata, sf_A48A0] + - [0xD8EF0, .rodata, sf_A4B50] + - [0xD97F0, .rodata, sf_BB360] + - [0xD9E50, .rodata, sf_versus] + - [0xD9F60, .rodata, sf_C3430] + + # Common assets + - [0xDA030, bin, assets] - { start: 0xDE480, type: bss, vram: 0x800DD880 } diff --git a/yamls/us/overlays.yaml b/yamls/us/overlays.yaml index 8a01b583..f90decab 100644 --- a/yamls/us/overlays.yaml +++ b/yamls/us/overlays.yaml @@ -128,10 +128,10 @@ exclusive_ram_id: overlay symbol_name_format: $VRAM_$ROM subsegments: - - [0xEBFBE0, c] + - [0xEBFBE0, c, EBFBE0] - [0xEBFCA0, c, EBFCA0] - - [0xECA1E0, c] - - [0xED6EC0, c] + - [0xECA1E0, c, ECA1E0] + - [0xED6EC0, c, ED6EC0] - [0xEE60C0, data, EBFCA0] - [0xEE6C30, data, ECA1E0] - [0xEE7AE0, data, ED6EC0] @@ -148,8 +148,8 @@ exclusive_ram_id: overlay symbol_name_format: $VRAM_$ROM subsegments: - - [0xEF0260, c] - - [0xEF5B60, c] + - [0xEF0260, c, EF0260] + - [0xEF5B60, c, EF5B60] - [0xEFB560, data, EF0260] - [0xEFBBB0, data, EF5B60] - [0xEFEF80, .rodata, EF0260]