diff --git a/splat.yaml b/splat.yaml index 1e99f07..d8510db 100644 --- a/splat.yaml +++ b/splat.yaml @@ -317,7 +317,7 @@ segments: - [0x2E450, data] - [0x387C0, data, "data/overlay_table"] - [0x38B50, data] - - [0x3A2F0, .data, "gfx/ob_saucy_hose"] + - [0x3A2F0, .data, "gfx/_ob_saucy_hose"] - [0x3A3E0, data] - [0x3E100, data] @@ -467,14 +467,14 @@ segments: symbol_name_format: overlay_66E10_$VRAM_$ROM exclusive_ram_id: test_overlapping subsegments: - - [0x66E10, c, "ob_modern_notebook"] - - [0x67570, c, "ob_disagreeable_flowers"] - - [0x680F0, c, "ob_depressed_birth"] + - [0x66E10, c, "_ob_modern_notebook"] + - [0x67570, c, "_ob_disagreeable_flowers"] + - [0x680F0, c, "_ob_depressed_birth"] - [0x694B0, data] - - [0x69610, .rodata, "ob_modern_notebook"] - - [0x69790, .rodata, "ob_disagreeable_flowers"] + - [0x69610, .rodata, "_ob_modern_notebook"] + - [0x69790, .rodata, "_ob_disagreeable_flowers"] - { start: 0x69900, type: bss, vram: 0x8019A660 } @@ -515,9 +515,9 @@ segments: # Complete find_file_boundaries: False subsegments: - - [0x6E660, c, "overlay_6E660/ob_chunky_hot"] + - [0x6E660, c, "overlay_6E660/_ob_chunky_hot"] - - [0x70E70, .rodata, "overlay_6E660/ob_chunky_hot"] + - [0x70E70, .rodata, "overlay_6E660/_ob_chunky_hot"] - { start: 0x71280, type: bss, vram: 0x8019A790 } diff --git a/src/gfx/ob_saucy_hose.c b/src/gfx/_ob_saucy_hose.c similarity index 100% rename from src/gfx/ob_saucy_hose.c rename to src/gfx/_ob_saucy_hose.c diff --git a/src/overlay_66E10/_ob_depressed_birth.c b/src/overlay_66E10/_ob_depressed_birth.c new file mode 100644 index 0000000..387a34f --- /dev/null +++ b/src/overlay_66E10/_ob_depressed_birth.c @@ -0,0 +1,23 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "overlay_66E10/_ob_depressed_birth", func_overlay_66E10_80198E50_680F0); + +INCLUDE_ASM(const s32, "overlay_66E10/_ob_depressed_birth", func_overlay_66E10_80198FC8_68268); + +INCLUDE_ASM(const s32, "overlay_66E10/_ob_depressed_birth", func_overlay_66E10_80199110_683B0); + +INCLUDE_ASM(const s32, "overlay_66E10/_ob_depressed_birth", func_overlay_66E10_8019951C_687BC); + +INCLUDE_ASM(const s32, "overlay_66E10/_ob_depressed_birth", func_overlay_66E10_80199568_68808); + +INCLUDE_ASM(const s32, "overlay_66E10/_ob_depressed_birth", func_overlay_66E10_8019974C_689EC); + +INCLUDE_ASM(const s32, "overlay_66E10/_ob_depressed_birth", func_overlay_66E10_8019994C_68BEC); + +INCLUDE_ASM(const s32, "overlay_66E10/_ob_depressed_birth", func_overlay_66E10_801999E8_68C88); + +INCLUDE_ASM(const s32, "overlay_66E10/_ob_depressed_birth", func_overlay_66E10_80199D10_68FB0); + +INCLUDE_ASM(const s32, "overlay_66E10/_ob_depressed_birth", func_overlay_66E10_8019A088_69328); + +INCLUDE_ASM(const s32, "overlay_66E10/_ob_depressed_birth", func_overlay_66E10_8019A1DC_6947C); diff --git a/src/overlay_66E10/_ob_disagreeable_flowers.c b/src/overlay_66E10/_ob_disagreeable_flowers.c new file mode 100644 index 0000000..65628d8 --- /dev/null +++ b/src/overlay_66E10/_ob_disagreeable_flowers.c @@ -0,0 +1,19 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "overlay_66E10/_ob_disagreeable_flowers", func_overlay_66E10_801982D0_67570); + +INCLUDE_ASM(const s32, "overlay_66E10/_ob_disagreeable_flowers", func_overlay_66E10_80198360_67600); + +INCLUDE_ASM(const s32, "overlay_66E10/_ob_disagreeable_flowers", func_overlay_66E10_801985A4_67844); + +INCLUDE_ASM(const s32, "overlay_66E10/_ob_disagreeable_flowers", func_overlay_66E10_801988A8_67B48); + +INCLUDE_ASM(const s32, "overlay_66E10/_ob_disagreeable_flowers", func_overlay_66E10_80198B04_67DA4); + +INCLUDE_ASM(const s32, "overlay_66E10/_ob_disagreeable_flowers", func_overlay_66E10_80198C7C_67F1C); + +INCLUDE_ASM(const s32, "overlay_66E10/_ob_disagreeable_flowers", func_overlay_66E10_80198D08_67FA8); + +INCLUDE_RODATA(const s32, "overlay_66E10/_ob_disagreeable_flowers", D_overlay_66E10_8019A63C_698DC); + +INCLUDE_RODATA(const s32, "overlay_66E10/_ob_disagreeable_flowers", D_overlay_66E10_8019A64C_698EC); diff --git a/src/overlay_66E10/_ob_modern_notebook.c b/src/overlay_66E10/_ob_modern_notebook.c new file mode 100644 index 0000000..bfd0aa3 --- /dev/null +++ b/src/overlay_66E10/_ob_modern_notebook.c @@ -0,0 +1,13 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "overlay_66E10/_ob_modern_notebook", func_overlay_66E10_80197B70_66E10); + +INCLUDE_RODATA(const s32, "overlay_66E10/_ob_modern_notebook", D_overlay_66E10_8019A370_69610); + +INCLUDE_RODATA(const s32, "overlay_66E10/_ob_modern_notebook", D_overlay_66E10_8019A388_69628); + +INCLUDE_ASM(const s32, "overlay_66E10/_ob_modern_notebook", func_overlay_66E10_80197E3C_670DC); + +INCLUDE_ASM(const s32, "overlay_66E10/_ob_modern_notebook", func_overlay_66E10_80198080_67320); + +INCLUDE_RODATA(const s32, "overlay_66E10/_ob_modern_notebook", D_overlay_66E10_8019A4DC_6977C); diff --git a/src/overlay_66E10/ob_depressed_birth.c b/src/overlay_66E10/ob_depressed_birth.c deleted file mode 100644 index 660d9ab..0000000 --- a/src/overlay_66E10/ob_depressed_birth.c +++ /dev/null @@ -1,23 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(const s32, "overlay_66E10/ob_depressed_birth", func_overlay_66E10_80198E50_680F0); - -INCLUDE_ASM(const s32, "overlay_66E10/ob_depressed_birth", func_overlay_66E10_80198FC8_68268); - -INCLUDE_ASM(const s32, "overlay_66E10/ob_depressed_birth", func_overlay_66E10_80199110_683B0); - -INCLUDE_ASM(const s32, "overlay_66E10/ob_depressed_birth", func_overlay_66E10_8019951C_687BC); - -INCLUDE_ASM(const s32, "overlay_66E10/ob_depressed_birth", func_overlay_66E10_80199568_68808); - -INCLUDE_ASM(const s32, "overlay_66E10/ob_depressed_birth", func_overlay_66E10_8019974C_689EC); - -INCLUDE_ASM(const s32, "overlay_66E10/ob_depressed_birth", func_overlay_66E10_8019994C_68BEC); - -INCLUDE_ASM(const s32, "overlay_66E10/ob_depressed_birth", func_overlay_66E10_801999E8_68C88); - -INCLUDE_ASM(const s32, "overlay_66E10/ob_depressed_birth", func_overlay_66E10_80199D10_68FB0); - -INCLUDE_ASM(const s32, "overlay_66E10/ob_depressed_birth", func_overlay_66E10_8019A088_69328); - -INCLUDE_ASM(const s32, "overlay_66E10/ob_depressed_birth", func_overlay_66E10_8019A1DC_6947C); diff --git a/src/overlay_66E10/ob_disagreeable_flowers.c b/src/overlay_66E10/ob_disagreeable_flowers.c deleted file mode 100644 index 13403ff..0000000 --- a/src/overlay_66E10/ob_disagreeable_flowers.c +++ /dev/null @@ -1,19 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(const s32, "overlay_66E10/ob_disagreeable_flowers", func_overlay_66E10_801982D0_67570); - -INCLUDE_ASM(const s32, "overlay_66E10/ob_disagreeable_flowers", func_overlay_66E10_80198360_67600); - -INCLUDE_ASM(const s32, "overlay_66E10/ob_disagreeable_flowers", func_overlay_66E10_801985A4_67844); - -INCLUDE_ASM(const s32, "overlay_66E10/ob_disagreeable_flowers", func_overlay_66E10_801988A8_67B48); - -INCLUDE_ASM(const s32, "overlay_66E10/ob_disagreeable_flowers", func_overlay_66E10_80198B04_67DA4); - -INCLUDE_ASM(const s32, "overlay_66E10/ob_disagreeable_flowers", func_overlay_66E10_80198C7C_67F1C); - -INCLUDE_ASM(const s32, "overlay_66E10/ob_disagreeable_flowers", func_overlay_66E10_80198D08_67FA8); - -INCLUDE_RODATA(const s32, "overlay_66E10/ob_disagreeable_flowers", D_overlay_66E10_8019A63C_698DC); - -INCLUDE_RODATA(const s32, "overlay_66E10/ob_disagreeable_flowers", D_overlay_66E10_8019A64C_698EC); diff --git a/src/overlay_66E10/ob_modern_notebook.c b/src/overlay_66E10/ob_modern_notebook.c deleted file mode 100644 index 50f9847..0000000 --- a/src/overlay_66E10/ob_modern_notebook.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(const s32, "overlay_66E10/ob_modern_notebook", func_overlay_66E10_80197B70_66E10); - -INCLUDE_RODATA(const s32, "overlay_66E10/ob_modern_notebook", D_overlay_66E10_8019A370_69610); - -INCLUDE_RODATA(const s32, "overlay_66E10/ob_modern_notebook", D_overlay_66E10_8019A388_69628); - -INCLUDE_ASM(const s32, "overlay_66E10/ob_modern_notebook", func_overlay_66E10_80197E3C_670DC); - -INCLUDE_ASM(const s32, "overlay_66E10/ob_modern_notebook", func_overlay_66E10_80198080_67320); - -INCLUDE_RODATA(const s32, "overlay_66E10/ob_modern_notebook", D_overlay_66E10_8019A4DC_6977C); diff --git a/src/overlay_6E660/_ob_chunky_hot.c b/src/overlay_6E660/_ob_chunky_hot.c new file mode 100644 index 0000000..c5b45e1 --- /dev/null +++ b/src/overlay_6E660/_ob_chunky_hot.c @@ -0,0 +1,43 @@ +#include "common.h" + +INCLUDE_RODATA(const s32, "overlay_6E660/_ob_chunky_hot", D_overlay_6E660_8019A380_70E70); + +INCLUDE_RODATA(const s32, "overlay_6E660/_ob_chunky_hot", D_overlay_6E660_8019A570_71060); + +INCLUDE_RODATA(const s32, "overlay_6E660/_ob_chunky_hot", D_overlay_6E660_8019A590_71080); + +INCLUDE_ASM(const s32, "overlay_6E660/_ob_chunky_hot", func_overlay_6E660_80197B70_6E660); + +INCLUDE_ASM(const s32, "overlay_6E660/_ob_chunky_hot", func_overlay_6E660_80197D20_6E810); + +INCLUDE_ASM(const s32, "overlay_6E660/_ob_chunky_hot", func_overlay_6E660_80197DB8_6E8A8); + +INCLUDE_ASM(const s32, "overlay_6E660/_ob_chunky_hot", func_overlay_6E660_80197DE4_6E8D4); + +INCLUDE_ASM(const s32, "overlay_6E660/_ob_chunky_hot", func_overlay_6E660_80197F08_6E9F8); + +INCLUDE_ASM(const s32, "overlay_6E660/_ob_chunky_hot", func_overlay_6E660_80197FB4_6EAA4); + +INCLUDE_ASM(const s32, "overlay_6E660/_ob_chunky_hot", func_overlay_6E660_801980AC_6EB9C); + +INCLUDE_ASM(const s32, "overlay_6E660/_ob_chunky_hot", func_overlay_6E660_8019898C_6F47C); + +INCLUDE_ASM(const s32, "overlay_6E660/_ob_chunky_hot", func_overlay_6E660_80198A4C_6F53C); + +INCLUDE_ASM(const s32, "overlay_6E660/_ob_chunky_hot", func_overlay_6E660_80198FA4_6FA94); + +INCLUDE_ASM(const s32, "overlay_6E660/_ob_chunky_hot", func_overlay_6E660_80199354_6FE44); + +INCLUDE_ASM(const s32, "overlay_6E660/_ob_chunky_hot", func_overlay_6E660_80199624_70114); + +INCLUDE_ASM(const s32, "overlay_6E660/_ob_chunky_hot", func_overlay_6E660_801997D0_702C0); + +INCLUDE_ASM(const s32, "overlay_6E660/_ob_chunky_hot", func_overlay_6E660_80199D74_70864); + +INCLUDE_ASM(const s32, "overlay_6E660/_ob_chunky_hot", func_overlay_6E660_80199DA0_70890); + +INCLUDE_ASM(const s32, "overlay_6E660/_ob_chunky_hot", func_overlay_6E660_80199DD0_708C0); + +INCLUDE_ASM(const s32, "overlay_6E660/_ob_chunky_hot", func_overlay_6E660_80199E00_708F0); + +INCLUDE_ASM(const s32, "overlay_6E660/_ob_chunky_hot", func_overlay_6E660_80199E98_70988); diff --git a/src/overlay_6E660/ob_chunky_hot.c b/src/overlay_6E660/ob_chunky_hot.c deleted file mode 100644 index 4742ed9..0000000 --- a/src/overlay_6E660/ob_chunky_hot.c +++ /dev/null @@ -1,43 +0,0 @@ -#include "common.h" - -INCLUDE_RODATA(const s32, "overlay_6E660/ob_chunky_hot", D_overlay_6E660_8019A380_70E70); - -INCLUDE_RODATA(const s32, "overlay_6E660/ob_chunky_hot", D_overlay_6E660_8019A570_71060); - -INCLUDE_RODATA(const s32, "overlay_6E660/ob_chunky_hot", D_overlay_6E660_8019A590_71080); - -INCLUDE_ASM(const s32, "overlay_6E660/ob_chunky_hot", func_overlay_6E660_80197B70_6E660); - -INCLUDE_ASM(const s32, "overlay_6E660/ob_chunky_hot", func_overlay_6E660_80197D20_6E810); - -INCLUDE_ASM(const s32, "overlay_6E660/ob_chunky_hot", func_overlay_6E660_80197DB8_6E8A8); - -INCLUDE_ASM(const s32, "overlay_6E660/ob_chunky_hot", func_overlay_6E660_80197DE4_6E8D4); - -INCLUDE_ASM(const s32, "overlay_6E660/ob_chunky_hot", func_overlay_6E660_80197F08_6E9F8); - -INCLUDE_ASM(const s32, "overlay_6E660/ob_chunky_hot", func_overlay_6E660_80197FB4_6EAA4); - -INCLUDE_ASM(const s32, "overlay_6E660/ob_chunky_hot", func_overlay_6E660_801980AC_6EB9C); - -INCLUDE_ASM(const s32, "overlay_6E660/ob_chunky_hot", func_overlay_6E660_8019898C_6F47C); - -INCLUDE_ASM(const s32, "overlay_6E660/ob_chunky_hot", func_overlay_6E660_80198A4C_6F53C); - -INCLUDE_ASM(const s32, "overlay_6E660/ob_chunky_hot", func_overlay_6E660_80198FA4_6FA94); - -INCLUDE_ASM(const s32, "overlay_6E660/ob_chunky_hot", func_overlay_6E660_80199354_6FE44); - -INCLUDE_ASM(const s32, "overlay_6E660/ob_chunky_hot", func_overlay_6E660_80199624_70114); - -INCLUDE_ASM(const s32, "overlay_6E660/ob_chunky_hot", func_overlay_6E660_801997D0_702C0); - -INCLUDE_ASM(const s32, "overlay_6E660/ob_chunky_hot", func_overlay_6E660_80199D74_70864); - -INCLUDE_ASM(const s32, "overlay_6E660/ob_chunky_hot", func_overlay_6E660_80199DA0_70890); - -INCLUDE_ASM(const s32, "overlay_6E660/ob_chunky_hot", func_overlay_6E660_80199DD0_708C0); - -INCLUDE_ASM(const s32, "overlay_6E660/ob_chunky_hot", func_overlay_6E660_80199E00_708F0); - -INCLUDE_ASM(const s32, "overlay_6E660/ob_chunky_hot", func_overlay_6E660_80199E98_70988);