diff --git a/splat.yaml b/splat.yaml index 96729f4..8e12cb9 100644 --- a/splat.yaml +++ b/splat.yaml @@ -812,24 +812,25 @@ segments: - { start: 0x188B60, type: bss, vram: 0x8021E120 } - - [0x188B60, bin] + - type: code + dir: overlay_188B60 + start: 0x188B60 + vram: 0x80214F80 + bss_size: 0xD0 + symbol_name_format: overlay_188B60_$VRAM_$ROM + exclusive_ram_id: test_overlapping + subsegments: + - [0x188B60, c, "_ob_threatening_pickle"] + - [0x18C2E0, c, "_ob_stunning_moon"] - # - type: code - # dir: overlay_188B60 - # start: 0x188B60 - # vram: 0x80214F80 - # bss_size: 0xD0 - # symbol_name_format: overlay_188B60_$VRAM_$ROM - # exclusive_ram_id: test_overlapping - # subsegments: - # - [0x188B60, asm] - # - [0x18C2E0, asm] + - [0x18F050, data] - # - [0x18F060, rodata] - # - [0x18F090, rodata] - # - [0x18F0D0, rodata] + - [0x18F0D0, .rodata, "_ob_threatening_pickle"] - # # - { start: 0x18F100, type: bss, vram: 0x8021B520 } + + - { start: 0x18F100, type: bss, vram: 0x8021B520 } + + - [0x18F100, bin] # - type: code # dir: overlay_18F100 diff --git a/src/overlay_188B60/_ob_stunning_moon.c b/src/overlay_188B60/_ob_stunning_moon.c new file mode 100644 index 0000000..b2ecf62 --- /dev/null +++ b/src/overlay_188B60/_ob_stunning_moon.c @@ -0,0 +1,21 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "overlay_188B60/_ob_stunning_moon", func_overlay_188B60_80218700_18C2E0); + +INCLUDE_ASM(const s32, "overlay_188B60/_ob_stunning_moon", func_overlay_188B60_802188EC_18C4CC); + +INCLUDE_ASM(const s32, "overlay_188B60/_ob_stunning_moon", func_overlay_188B60_80218F74_18CB54); + +INCLUDE_ASM(const s32, "overlay_188B60/_ob_stunning_moon", func_overlay_188B60_8021948C_18D06C); + +INCLUDE_ASM(const s32, "overlay_188B60/_ob_stunning_moon", func_overlay_188B60_80219500_18D0E0); + +INCLUDE_ASM(const s32, "overlay_188B60/_ob_stunning_moon", func_overlay_188B60_80219584_18D164); + +INCLUDE_ASM(const s32, "overlay_188B60/_ob_stunning_moon", func_overlay_188B60_80219F84_18DB64); + +INCLUDE_ASM(const s32, "overlay_188B60/_ob_stunning_moon", func_overlay_188B60_8021A0A4_18DC84); + +INCLUDE_ASM(const s32, "overlay_188B60/_ob_stunning_moon", func_overlay_188B60_8021AA3C_18E61C); + +INCLUDE_ASM(const s32, "overlay_188B60/_ob_stunning_moon", func_overlay_188B60_8021AFD8_18EBB8); diff --git a/src/overlay_188B60/_ob_threatening_pickle.c b/src/overlay_188B60/_ob_threatening_pickle.c new file mode 100644 index 0000000..d0f8df9 --- /dev/null +++ b/src/overlay_188B60/_ob_threatening_pickle.c @@ -0,0 +1,19 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "overlay_188B60/_ob_threatening_pickle", func_overlay_188B60_80214F80_188B60); + +INCLUDE_ASM(const s32, "overlay_188B60/_ob_threatening_pickle", func_overlay_188B60_802150FC_188CDC); + +INCLUDE_ASM(const s32, "overlay_188B60/_ob_threatening_pickle", func_overlay_188B60_80215AA8_189688); + +INCLUDE_ASM(const s32, "overlay_188B60/_ob_threatening_pickle", func_overlay_188B60_80215B14_1896F4); + +INCLUDE_ASM(const s32, "overlay_188B60/_ob_threatening_pickle", func_overlay_188B60_80215B98_189778); + +INCLUDE_ASM(const s32, "overlay_188B60/_ob_threatening_pickle", func_overlay_188B60_80217DEC_18B9CC); + +INCLUDE_ASM(const s32, "overlay_188B60/_ob_threatening_pickle", func_overlay_188B60_80217E60_18BA40); + +INCLUDE_ASM(const s32, "overlay_188B60/_ob_threatening_pickle", func_overlay_188B60_80217EAC_18BA8C); + +INCLUDE_ASM(const s32, "overlay_188B60/_ob_threatening_pickle", func_overlay_188B60_80217ED4_18BAB4);