diff --git a/linker_scripts/us/symbol_addrs.txt b/linker_scripts/us/symbol_addrs.txt index 89590554..442e124f 100644 --- a/linker_scripts/us/symbol_addrs.txt +++ b/linker_scripts/us/symbol_addrs.txt @@ -1,2 +1,3 @@ bootproc = 0x80004DA8; -D_800C90F0 = 0x800C90F0; \ No newline at end of file +D_800C90F0 = 0x800C90F0; +D_800D934C = 0x800D934C; // force_migration:True \ No newline at end of file diff --git a/src/main/versus.c b/src/main/versus.c new file mode 100644 index 00000000..5f767ea0 --- /dev/null +++ b/src/main/versus.c @@ -0,0 +1,151 @@ +#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/yamls/us/main.yaml b/yamls/us/main.yaml index 4bc6615a..867bae5a 100644 --- a/yamls/us/main.yaml +++ b/yamls/us/main.yaml @@ -167,7 +167,7 @@ - [0xA4B50, asm] # don't touch before fixing rodata - [0xB99D0, c] # -02 -g3 - [0xBB360, asm, BB360] # don't touch before fixing rodata - - [0xBD360, asm, BD360] + - [0xBD360, c, versus] - [0xC3430, asm, C3430] # DATA @@ -273,7 +273,7 @@ - [0xD8ED0, rodata, A24B0] - [0xD8EE0, rodata, A48A0] - [0xD97F0, rodata, BB360] - - [0xD9E50, rodata, BD360] + - [0xD9E50, .rodata, versus] - [0xD9F60, rodata, C3430] - [0xDA030, rodata] - [0xDC620, rodata]