From 8ce8d6974b60a40aeb735dbbe27cbd73334c727d Mon Sep 17 00:00:00 2001 From: gijs Date: Tue, 26 Sep 2023 00:26:56 +0200 Subject: [PATCH] Hopefully made the main segment nicer --- splat.yaml | 37 +- src/_ob_ambitious_fold.c | 3 + src/_ob_offbeat_discovery.c | 5 + src/_ob_rebel_pull.c | 3 + src/_ob_spooky_degree.c | 5 + ..._mother.c => bk_ob_overconfident_mother.c} | 0 src/ro_ob_overconfident_mother.c | 336 ++++++++++++++++++ 7 files changed, 370 insertions(+), 19 deletions(-) create mode 100644 src/_ob_ambitious_fold.c create mode 100644 src/_ob_offbeat_discovery.c create mode 100644 src/_ob_rebel_pull.c create mode 100644 src/_ob_spooky_degree.c rename src/{_ob_overconfident_mother.c => bk_ob_overconfident_mother.c} (100%) create mode 100644 src/ro_ob_overconfident_mother.c diff --git a/splat.yaml b/splat.yaml index 9e9cc40..358f74a 100644 --- a/splat.yaml +++ b/splat.yaml @@ -51,17 +51,16 @@ segments: find_file_boundaries: True subsegments: - [0x1060, c, "main"] - - [0x4AC0, asm] - - [0x5FC0, asm, "_ob_overconfident_mother"] - - [0x68E0, asm] - - [0x8700, asm] - - [0xA370, asm, "lha"] - - [0xFC80, asm, "boot"] - - [0xFDC0, asm] - - [0xFF10, asm] - - [0x10110, asm] - - [0x10190, asm] - - [0x10190, asm] + - [0x4AC0, asm, "_ob_overconfident_mother"] + # - [0x5FC0, asm] + # - [0x68E0, asm] + # - [0x8700, asm] + # - [0xA370, asm, "lha"] + - [0xFC80, c, "boot"] + - [0xFDC0, c, "_ob_spooky_degree"] + - [0xFF10, c, "_ob_offbeat_discovery"] + - [0x10110, c, "_ob_ambitious_fold"] + - [0x10190, c, "_ob_rebel_pull"] - [0x10250, asm] - [0x102E0, asm] - [0x10340, asm] @@ -84,7 +83,7 @@ segments: - [0x11480, asm] - [0x114F0, asm, "libmus/player"] - - [0x12530, asm] + # - [0x12530, asm] - [0x155C0, asm] - [0x15A20, asm] @@ -318,16 +317,16 @@ segments: - [0x3E100, .rodata, "main"] - - [0x3E330, rodata] - - [0x3E460, rodata] + - [0x3E330, rodata, "_ob_overconfident_mother"] + # - [0x3E460, rodata] - - [0x3E7A0, rodata, "FDC0"] - - [0x3E7C0, rodata, "10110"] - - [0x3E7D0, rodata, "10190"] + - [0x3E7A0, .rodata, "_ob_spooky_degree"] + - [0x3E7C0, .rodata, "_ob_ambitious_fold"] + - [0x3E7D0, .rodata, "_ob_rebel_pull"] - [0x3E7F0, rodata, "10CF0"] - [0x3E800, rodata, "11170"] - - [0x3E810, rodata, "libmus"] - - [0x3E8F0, rodata] + - [0x3E810, rodata, "libmus/player"] + # - [0x3E8F0, rodata] - [0x3E900, rodata, "16100"] - [0x3E930, rodata, "161A0"] - [0x3E9A0, rodata, "177B0"] diff --git a/src/_ob_ambitious_fold.c b/src/_ob_ambitious_fold.c new file mode 100644 index 0000000..6b47853 --- /dev/null +++ b/src/_ob_ambitious_fold.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "_ob_ambitious_fold", func_8007FD10); diff --git a/src/_ob_offbeat_discovery.c b/src/_ob_offbeat_discovery.c new file mode 100644 index 0000000..765f8ef --- /dev/null +++ b/src/_ob_offbeat_discovery.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "_ob_offbeat_discovery", func_8007FB10); + +INCLUDE_ASM(const s32, "_ob_offbeat_discovery", func_8007FB60); diff --git a/src/_ob_rebel_pull.c b/src/_ob_rebel_pull.c new file mode 100644 index 0000000..88b9330 --- /dev/null +++ b/src/_ob_rebel_pull.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "_ob_rebel_pull", func_8007FD90); diff --git a/src/_ob_spooky_degree.c b/src/_ob_spooky_degree.c new file mode 100644 index 0000000..7be732c --- /dev/null +++ b/src/_ob_spooky_degree.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "_ob_spooky_degree", func_8007F9C0); + +INCLUDE_ASM(const s32, "_ob_spooky_degree", func_8007FA38); diff --git a/src/_ob_overconfident_mother.c b/src/bk_ob_overconfident_mother.c similarity index 100% rename from src/_ob_overconfident_mother.c rename to src/bk_ob_overconfident_mother.c diff --git a/src/ro_ob_overconfident_mother.c b/src/ro_ob_overconfident_mother.c new file mode 100644 index 0000000..c978917 --- /dev/null +++ b/src/ro_ob_overconfident_mother.c @@ -0,0 +1,336 @@ +#include "common.h" + +void func_800746C0(void) { +} + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_800746C8); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80074834); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", buSave); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_800749C0); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80074AD4); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80074BF0); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80074C58); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", romCopy_256); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80074DA0); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80074F9C); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007513C); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80075224); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80075360); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007541C); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80075578); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80075688); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007578C); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80075858); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_800758FC); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007599C); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80075A84); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80075AC4); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80075B00); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80075B60); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", __calls_loads_overlay_array); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80076150); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80076188); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80076194); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_800761A4); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", __loads_overlay_array); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80076324); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", __get_overlay_index); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_800764E0); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_800765D8); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80076AE8); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80076DC8); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80076E00); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80076E2C); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80076E58); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80076EAC); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80076F00); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80076F5C); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007705C); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80077160); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80077200); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80077288); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80077314); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", UnusedMallocNo); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_800773D4); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007740C); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007745C); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80077494); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_800775EC); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80077BF8); + +void func_80077F80(void) { +} + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80077F88); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_800780D4); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80078164); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007819C); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_800782EC); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80078300); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007834C); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80078658); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80078674); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007896C); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80078C6C); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80079028); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007913C); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80079358); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80079380); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007938C); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80079618); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80079850); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_800798AC); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80079950); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80079AFC); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80079BD8); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80079CB4); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80079D60); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80079D98); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80079DF8); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80079E50); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80079E9C); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80079EF4); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_80079F70); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007A070); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", Unpack); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", __read_u32_le); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007A80C); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007AB30); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007AB7C); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007ABAC); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", UnpackProc); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007ACB0); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007AE9C); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007AF3C); + +INCLUDE_RODATA(const s32, "ro_ob_overconfident_mother", D_800AE060); + +INCLUDE_RODATA(const s32, "ro_ob_overconfident_mother", D_800AE068); + +INCLUDE_RODATA(const s32, "ro_ob_overconfident_mother", D_800AE070); + +INCLUDE_RODATA(const s32, "ro_ob_overconfident_mother", D_800AE078); + +INCLUDE_RODATA(const s32, "ro_ob_overconfident_mother", D_800AE080); + +INCLUDE_RODATA(const s32, "ro_ob_overconfident_mother", D_800AE088); + +INCLUDE_RODATA(const s32, "ro_ob_overconfident_mother", D_800AE090); + +INCLUDE_RODATA(const s32, "ro_ob_overconfident_mother", D_800AE098); + +INCLUDE_RODATA(const s32, "ro_ob_overconfident_mother", D_800AE0A0); + +INCLUDE_RODATA(const s32, "ro_ob_overconfident_mother", STR_rb); + +INCLUDE_RODATA(const s32, "ro_ob_overconfident_mother", D_800AE0AC); + +INCLUDE_RODATA(const s32, "ro_ob_overconfident_mother", D_800AE0C8); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007AFE4); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007B710); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007B744); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007B7A8); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007B83C); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", can_log_crc_error); + +INCLUDE_RODATA(const s32, "ro_ob_overconfident_mother", STR_FILE_NOT_FOUND); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007BA98); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007BB48); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", __log_lha_error); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", __log_fatal_error_desc); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", __log_fatal_error); + +INCLUDE_RODATA(const s32, "ro_ob_overconfident_mother", STR_LHa___s_s__s); + +INCLUDE_RODATA(const s32, "ro_ob_overconfident_mother", STR_Error); + +INCLUDE_RODATA(const s32, "ro_ob_overconfident_mother", STR_Fatal_error); + +INCLUDE_RODATA(const s32, "ro_ob_overconfident_mother", STR_EMPTY); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007BC24); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007BF10); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007C204); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007C25C); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007C378); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007C438); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007C538); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", __logs_read_error); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007C74C); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007CAB8); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007CE48); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007D200); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007D594); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007D5B8); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007D7BC); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007D8A8); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007DBF4); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007DDF0); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007DFF0); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007E2F8); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007E698); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007E6DC); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007E800); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007E8F0); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007EE2C); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007F1A0); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007F1F8); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007F218); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007F234); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007F314); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007F334); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007F408); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007F450); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007F47C); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007F4B0); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007F4E4); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", __file_read); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", __file_write); + +void func_8007F640(void) { +} + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007F648); + +INCLUDE_ASM(const s32, "ro_ob_overconfident_mother", func_8007F844);