From 0d7b8e0d12855a96f8bf0f256f44862c2ed41348 Mon Sep 17 00:00:00 2001 From: Alejandro Javier Asenjo Nitti Date: Fri, 6 Oct 2023 09:57:30 -0300 Subject: [PATCH] asm -> code --- src/main/3A80.c | 17 +++++++++++++ src/main/41D0.c | 7 ++++++ src/main/4650.c | 33 +++++++++++++++++++++++++ src/main/5A20.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++ src/main/7B20.c | 17 +++++++++++++ src/main/7D30.c | 9 +++++++ yamls/us/main.yaml | 12 ++++----- 7 files changed, 150 insertions(+), 6 deletions(-) create mode 100644 src/main/3A80.c create mode 100644 src/main/41D0.c create mode 100644 src/main/4650.c create mode 100644 src/main/5A20.c create mode 100644 src/main/7B20.c create mode 100644 src/main/7D30.c diff --git a/src/main/3A80.c b/src/main/3A80.c new file mode 100644 index 00000000..ab65b269 --- /dev/null +++ b/src/main/3A80.c @@ -0,0 +1,17 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/3A80/func_80002E80.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/3A80/func_80002EA0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/3A80/func_80002EE4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/3A80/func_80002F88.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/3A80/func_8000316C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/3A80/func_800032B4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/3A80/func_800033E0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/3A80/func_800034E8.s") diff --git a/src/main/41D0.c b/src/main/41D0.c new file mode 100644 index 00000000..1bde6f54 --- /dev/null +++ b/src/main/41D0.c @@ -0,0 +1,7 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/41D0/func_800035D0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/41D0/func_8000372C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/41D0/func_800038AC.s") diff --git a/src/main/4650.c b/src/main/4650.c new file mode 100644 index 00000000..e8e3b725 --- /dev/null +++ b/src/main/4650.c @@ -0,0 +1,33 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/4650/func_80003A50.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/4650/func_80003B48.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/4650/func_80003C50.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/4650/func_80003DC0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/4650/func_80003EE0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/4650/func_80003FEC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/4650/func_800040D4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/4650/func_80004144.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/4650/func_80004560.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/4650/func_80004714.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/4650/func_80004798.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/4650/func_80004824.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/4650/func_800049D4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/4650/func_80004ABC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/4650/func_80004D00.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/4650/bootproc.s") diff --git a/src/main/5A20.c b/src/main/5A20.c new file mode 100644 index 00000000..926d2c37 --- /dev/null +++ b/src/main/5A20.c @@ -0,0 +1,61 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80004E20.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80004E4C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80004EB0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80004FC8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80004FE8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80005100.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_800051F8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80005320.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_800053C8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_800054C8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_800055DC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80005604.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80005680.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80005708.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80005740.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80005754.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80005B00.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80005C34.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80005D44.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80005E90.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80005FE0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_8000612C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80006500.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_8000671C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80006970.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80006A20.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80006AB8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80006C7C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80006E3C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80006EB8.s") diff --git a/src/main/7B20.c b/src/main/7B20.c new file mode 100644 index 00000000..9cc19a92 --- /dev/null +++ b/src/main/7B20.c @@ -0,0 +1,17 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/7B20/func_80006F20.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/7B20/func_80006F38.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/7B20/func_80006F60.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/7B20/func_80006FD8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/7B20/func_80007068.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/7B20/func_8000707C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/7B20/func_80007088.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/7B20/func_800070C8.s") diff --git a/src/main/7D30.c b/src/main/7D30.c new file mode 100644 index 00000000..2ce43784 --- /dev/null +++ b/src/main/7D30.c @@ -0,0 +1,9 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/7D30/func_80007130.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/7D30/func_8000716C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/7D30/func_800071FC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/main/7D30/func_800072E0.s") diff --git a/yamls/us/main.yaml b/yamls/us/main.yaml index 78052a99..54e7d855 100644 --- a/yamls/us/main.yaml +++ b/yamls/us/main.yaml @@ -8,12 +8,12 @@ - [0x1050, textbin] - [0x1270, textbin] - [0x3440, c] #func_80002840 - - [0x3A80, asm] - - [0x41D0, asm] - - [0x4650, asm] - - [0x5A20, asm] - - [0x7B20, asm] - - [0x7D30, asm] + - [0x3A80, c] + - [0x41D0, c] + - [0x4650, c] + - [0x5A20, c] + - [0x7B20, c] + - [0x7D30, c] - [0x7FC0, asm, 7FC0] - [0x8CC0, asm, 8CC0] - [0xC870, asm]