diff --git a/splat.yaml b/splat.yaml index ee0987b..7617629 100644 --- a/splat.yaml +++ b/splat.yaml @@ -403,7 +403,7 @@ segments: - [0x495E0, asm, "segment_obdata/_ob_abandoned_shape"] - [0x49820, asm, "segment_obdata/_ob_hardy_thrill"] - [0x49A30, asm, "segment_obdata/_ob_worthless_drawer"] - + - [0x514B0, c, "segment_obdata/_ob_squeamish_mask"] - [0x5A030, c, "segment_obdata/_ob_utopian_queen"] - [0x5AFF0, c, "segment_obdata/_ob_pithy_collar"] @@ -467,14 +467,14 @@ segments: symbol_name_format: overlay_66E10_$VRAM_$ROM exclusive_ram_id: test_overlapping subsegments: - - [0x66E10, asm, "ob_modern_notebook"] - - [0x67570, asm, "ob_disagreeable_flowers"] - - [0x680F0, asm, "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 } diff --git a/src/overlay_66E10/ob_depressed_birth.c b/src/overlay_66E10/ob_depressed_birth.c new file mode 100644 index 0000000..660d9ab --- /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..13403ff --- /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..50f9847 --- /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);