From 90918976bb19d2017d10052ab616ea38e311110c Mon Sep 17 00:00:00 2001 From: gijs Date: Tue, 26 Sep 2023 19:36:24 +0200 Subject: [PATCH] Deleted a lot of old files Enabled more `rodata` migrations --- splat.yaml | 70 +++++++++++++++--------------- src/19E10.c | 10 ----- src/19EB0.c | 3 -- src/26E90.c | 7 --- src/3FE70.c | 15 ------- src/4AC0.c | 4 -- src/_ob_exciting_offer.c | 19 ++++++++ src/_ob_future_title.c | 13 ++++++ src/{19050.c => _ob_past_brick.c} | 22 +++++----- src/{2DE10.c => _ob_prized_room.c} | 12 ++--- src/_ob_slippery_expansion.c | 11 +++++ src/_ob_soft_coach.c | 3 ++ 12 files changed, 99 insertions(+), 90 deletions(-) delete mode 100644 src/19E10.c delete mode 100644 src/19EB0.c delete mode 100644 src/26E90.c delete mode 100644 src/3FE70.c create mode 100644 src/_ob_exciting_offer.c create mode 100644 src/_ob_future_title.c rename src/{19050.c => _ob_past_brick.c} (77%) rename src/{2DE10.c => _ob_prized_room.c} (64%) create mode 100644 src/_ob_slippery_expansion.c create mode 100644 src/_ob_soft_coach.c diff --git a/splat.yaml b/splat.yaml index 1a3b16a..6b113f2 100644 --- a/splat.yaml +++ b/splat.yaml @@ -54,16 +54,18 @@ segments: find_file_boundaries: True subsegments: - [0x1060, c, "main"] + # Unsure about these - [0x4AC0, asm, "_ob_overconfident_mother"] - # - [0x5FC0, asm] - # - [0x68E0, asm] - # - [0x8700, asm] - # - [0xA370, asm, "lha"] - - [0xFC80, asm, "boot"] - - [0xFDC0, asm, "_ob_spooky_degree"] - - [0xFF10, asm, "_ob_offbeat_discovery"] - - [0x10110, asm, "_ob_ambitious_fold"] - - [0x10190, asm, "_ob_rebel_pull"] + - [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] @@ -78,10 +80,10 @@ segments: - [0x105D0, asm] - [0x10610, asm] - [0x10680, asm] - - [0x10CF0, asm] + - [0x10CF0, c, "_ob_soft_coach"] - [0x10D70, asm] - [0x10E70, asm] - - [0x11170, asm] + - [0x11170, c, "_ob_slippery_expansion"] - [0x11440, asm] - [0x11480, asm] @@ -98,7 +100,7 @@ segments: - [0x161A0, asm] - [0x17090, asm] - [0x177B0, asm] - - [0x17990, asm] + - [0x17990, c, "_ob_future_title"] - [0x18380, asm] - [0x18400, asm] - [0x18450, asm] @@ -108,22 +110,22 @@ segments: - [0x18810, asm] - [0x188C0, asm] - [0x18950, asm] - - [0x189D0, asm] + - [0x189D0, c, "_ob_exciting_offer"] - [0x18F30, asm] - [0x18F80, asm] - - [0x19050, asm] + - [0x19050, c, "_ob_past_brick"] - [0x19DD0, asm] - [0x19E10, asm] - [0x19E30, asm] - [0x19EB0, asm] - - [0x19FC0, asm, "black"] - - [0x1A050, asm, "_ob_icy_coast"] - - [0x1A4F0, asm, "rom_copy"] - - [0x1A5B0, asm, "_ob_unusual_spiders"] - - [0x1A660, asm, "_ob_prized_reading"] - - [0x1A9A0, asm, "_ob_silly_cactus"] - - [0x1AA00, asm, "_ob_classy_fold"] - - [0x1AAA0, asm, "_ob_dull_silver"] + - [0x19FC0, c, "black"] + - [0x1A050, c, "_ob_icy_coast"] + - [0x1A4F0, c, "rom_copy"] + - [0x1A5B0, c, "_ob_unusual_spiders"] + - [0x1A660, c, "_ob_prized_reading"] + - [0x1A9A0, c, "_ob_silly_cactus"] + - [0x1AA00, c, "_ob_classy_fold"] + - [0x1AAA0, c, "_ob_dull_silver"] - [0x1AD10, asm] - [0x1AFD0, asm] - [0x1B030, asm] @@ -134,9 +136,9 @@ segments: - [0x1B2E0, asm] - [0x1B320, asm] - [0x1B360, asm] - - [0x1B3A0, asm, "_ob_electric_zephyr"] - - [0x1B3E0, asm, "_ob_grumpy_island"] - - [0x1B510, asm, "_ob_painful_roll"] + - [0x1B3A0, c, "_ob_electric_zephyr"] + - [0x1B3E0, c, "_ob_grumpy_island"] + - [0x1B510, c, "_ob_painful_roll"] - [0x1B530, asm] - [0x1B650, asm] - [0x1B7A0, asm] @@ -310,7 +312,7 @@ segments: - [0x2D7F0, asm] - [0x2DC80, asm] - [0x2DDF0, asm] - - [0x2DE10, asm] + - [0x2DE10, c, "_ob_prized_room"] - [0x2E450, data] - [0x387C0, data, "data/overlay_table"] @@ -321,20 +323,20 @@ segments: - [0x3E100, data] - [0x3E330, rodata, "_ob_overconfident_mother"] - # - [0x3E460, rodata] + - [0x3E460, rodata] - - [0x3E7A0, rodata, "_ob_spooky_degree"] - - [0x3E7C0, rodata, "_ob_ambitious_fold"] - - [0x3E7D0, rodata, "_ob_rebel_pull"] - - [0x3E7F0, rodata, "10CF0"] - - [0x3E800, rodata, "11170"] + - [0x3E7A0, .rodata, "_ob_spooky_degree"] + - [0x3E7C0, .rodata, "_ob_ambitious_fold"] + - [0x3E7D0, .rodata, "_ob_rebel_pull"] + - [0x3E7F0, .rodata, "_ob_soft_coach"] + - [0x3E800, .rodata, "_ob_slippery_expansion"] - [0x3E810, rodata, "libmus/player"] # - [0x3E8F0, rodata] - [0x3E900, rodata, "16100"] - [0x3E930, rodata, "161A0"] - [0x3E9A0, rodata, "177B0"] - - [0x3E9B0, rodata, "17990"] - - [0x3E9F0, rodata, "189D0"] + - [0x3E9B0, .rodata, "_ob_future_title"] + - [0x3E9F0, .rodata, "_ob_exciting_offer"] - [0x3EA90, rodata, "libultra/io/devmgr"] - [0x3EAB0, rodata, "libultra/io/aigetlen"] diff --git a/src/19E10.c b/src/19E10.c deleted file mode 100644 index 42a3c53..0000000 --- a/src/19E10.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(const s32, "19E10", func_80089A10); - -/* 19E10 80089A10 */ -// void func_80089A10(void) { -// if(D_800E79A4 != 0) { -// func_80089A10(); -// } -// } diff --git a/src/19EB0.c b/src/19EB0.c deleted file mode 100644 index a3df526..0000000 --- a/src/19EB0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(const s32, "19EB0", func_80089AB0); diff --git a/src/26E90.c b/src/26E90.c deleted file mode 100644 index eb80a0a..0000000 --- a/src/26E90.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(const s32, "26E90", func_80096A90); - -INCLUDE_ASM(const s32, "26E90", osPfsInitPak); - -INCLUDE_ASM(const s32, "26E90", func_80096D88); diff --git a/src/3FE70.c b/src/3FE70.c deleted file mode 100644 index ced5e7b..0000000 --- a/src/3FE70.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(const s32, "3FE70", func_800EA8E0); - -INCLUDE_ASM(const s32, "3FE70", func_800EA924); - -INCLUDE_ASM(const s32, "3FE70", func_800EA9BC); - -INCLUDE_ASM(const s32, "3FE70", func_800EAB40); - -INCLUDE_ASM(const s32, "3FE70", func_800EAC24); - -INCLUDE_ASM(const s32, "3FE70", func_800EAF1C); - -INCLUDE_ASM(const s32, "3FE70", func_800EB028); diff --git a/src/4AC0.c b/src/4AC0.c index b97f010..5308da6 100644 --- a/src/4AC0.c +++ b/src/4AC0.c @@ -43,12 +43,8 @@ void func_80074BF0(u32 arg0) { } } - - INCLUDE_ASM(const s32, "4AC0", func_80074C58); -// INCLUDE_ASM(const s32, "4AC0", func_80074CF0); - /* 50F0 80074CF0 */ void romCopy_256(void* dst, s32 arg1, s32 len) { s32 devAddr; diff --git a/src/_ob_exciting_offer.c b/src/_ob_exciting_offer.c new file mode 100644 index 0000000..3c190f0 --- /dev/null +++ b/src/_ob_exciting_offer.c @@ -0,0 +1,19 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "_ob_exciting_offer", func_800885D0); + +INCLUDE_ASM(const s32, "_ob_exciting_offer", alAudioFrame); + +INCLUDE_ASM(const s32, "_ob_exciting_offer", func_800889A8); + +INCLUDE_ASM(const s32, "_ob_exciting_offer", func_800889D4); + +INCLUDE_ASM(const s32, "_ob_exciting_offer", func_800889EC); + +INCLUDE_ASM(const s32, "_ob_exciting_offer", func_80088A4C); + +INCLUDE_ASM(const s32, "_ob_exciting_offer", func_80088A84); + +INCLUDE_ASM(const s32, "_ob_exciting_offer", func_80088AD4); + +INCLUDE_RODATA(const s32, "_ob_exciting_offer", D_800AE610); diff --git a/src/_ob_future_title.c b/src/_ob_future_title.c new file mode 100644 index 0000000..024357b --- /dev/null +++ b/src/_ob_future_title.c @@ -0,0 +1,13 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "_ob_future_title", func_80087590); + +INCLUDE_ASM(const s32, "_ob_future_title", func_800878A0); + +INCLUDE_ASM(const s32, "_ob_future_title", func_80087A90); + +INCLUDE_ASM(const s32, "_ob_future_title", func_80087CA0); + +INCLUDE_ASM(const s32, "_ob_future_title", func_80087DC8); + +INCLUDE_ASM(const s32, "_ob_future_title", func_80087EE0); diff --git a/src/19050.c b/src/_ob_past_brick.c similarity index 77% rename from src/19050.c rename to src/_ob_past_brick.c index b608bf2..97bead9 100644 --- a/src/19050.c +++ b/src/_ob_past_brick.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(const s32, "19050", __idle_start_4_threads); +INCLUDE_ASM(const s32, "_ob_past_brick", __idle_start_4_threads); /* 192F0 80088EF0*/ s32* func_80088EF0(void) { @@ -11,7 +11,7 @@ Unk0* func_80088EFC(void) { return &MQ_800E8B4C; } -INCLUDE_ASM(const s32, "19050", __thread_80088F08); +INCLUDE_ASM(const s32, "_ob_past_brick", __thread_80088F08); /* 19454 80089054 */ void Stack__dma_load_loop_new(Stack__dma_load_loop* arg0, OSMesgQueue* mq, s16 flags) @@ -32,15 +32,15 @@ void Stack__dma_load_loop_new(Stack__dma_load_loop* arg0, OSMesgQueue* mq, s16 f } -INCLUDE_ASM(const s32, "19050", func_800890E4); +INCLUDE_ASM(const s32, "_ob_past_brick", func_800890E4); -INCLUDE_ASM(const s32, "19050", Stack__dma_load_loop_delete); +INCLUDE_ASM(const s32, "_ob_past_brick", Stack__dma_load_loop_delete); -INCLUDE_ASM(const s32, "19050", func_800891A0); +INCLUDE_ASM(const s32, "_ob_past_brick", func_800891A0); -INCLUDE_ASM(const s32, "19050", __thread_80089200); +INCLUDE_ASM(const s32, "_ob_past_brick", __thread_80089200); -INCLUDE_ASM(const s32, "19050", __thread_80089358); +INCLUDE_ASM(const s32, "_ob_past_brick", __thread_80089358); void __thread_800893C0(void) { typedef struct { @@ -99,7 +99,7 @@ void func_80089528(s8 arg0) { } -// INCLUDE_ASM(const s32, "19050", func_80089534); +// INCLUDE_ASM(const s32, "_ob_past_brick", func_80089534); extern u8 D_800E918C; /* 19934 80089534 */ @@ -107,11 +107,11 @@ u8 func_80089534(void) { return D_800E918C; } -INCLUDE_ASM(const s32, "19050", __thread_80089540); +INCLUDE_ASM(const s32, "_ob_past_brick", __thread_80089540); -INCLUDE_ASM(const s32, "19050", __start_thread_800B9C88); +INCLUDE_ASM(const s32, "_ob_past_brick", __start_thread_800B9C88); -INCLUDE_ASM(const s32, "19050", __something_display_list); +INCLUDE_ASM(const s32, "_ob_past_brick", __something_display_list); /* 19D90 80089990 */ void func_80089990(void (*arg0)(s32)) { diff --git a/src/2DE10.c b/src/_ob_prized_room.c similarity index 64% rename from src/2DE10.c rename to src/_ob_prized_room.c index 9ac196e..f28063a 100644 --- a/src/2DE10.c +++ b/src/_ob_prized_room.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(const s32, "2DE10", func_8009DA10); +INCLUDE_ASM(const s32, "_ob_prized_room", func_8009DA10); /* 2DE50 8009DA50 */ void __calls_romCopy_8009DA50(u8* src, u8* dst, u32 len) { @@ -28,18 +28,18 @@ void __calls_romCopy_8009DA50(u8* src, u8* dst, u32 len) { void func_8009DAEC(void) { } -INCLUDE_ASM(const s32, "2DE10", __calls_romCopy_8009DAF4); +INCLUDE_ASM(const s32, "_ob_prized_room", __calls_romCopy_8009DAF4); -INCLUDE_ASM(const s32, "2DE10", __calls_romCopy_8009DBB8); +INCLUDE_ASM(const s32, "_ob_prized_room", __calls_romCopy_8009DBB8); void* __add_0x594284(s32 arg0) { return arg0 + &D_594284; } -INCLUDE_ASM(const s32, "2DE10", __calls_romCopy_8009DD38); +INCLUDE_ASM(const s32, "_ob_prized_room", __calls_romCopy_8009DD38); -INCLUDE_ASM(const s32, "2DE10", __calls_romCopy_8009DE40); +INCLUDE_ASM(const s32, "_ob_prized_room", __calls_romCopy_8009DE40); -INCLUDE_ASM(const s32, "2DE10", __load_and_unpack); +INCLUDE_ASM(const s32, "_ob_prized_room", __load_and_unpack); diff --git a/src/_ob_slippery_expansion.c b/src/_ob_slippery_expansion.c new file mode 100644 index 0000000..05f5124 --- /dev/null +++ b/src/_ob_slippery_expansion.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "_ob_slippery_expansion", func_80080D70); + +INCLUDE_ASM(const s32, "_ob_slippery_expansion", func_80080DC0); + +INCLUDE_ASM(const s32, "_ob_slippery_expansion", func_80080E84); + +INCLUDE_ASM(const s32, "_ob_slippery_expansion", func_80080EE8); + +INCLUDE_ASM(const s32, "_ob_slippery_expansion", func_80080F78); diff --git a/src/_ob_soft_coach.c b/src/_ob_soft_coach.c new file mode 100644 index 0000000..934c3f3 --- /dev/null +++ b/src/_ob_soft_coach.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "_ob_soft_coach", func_800808F0);