diff --git a/splat.yaml b/splat.yaml index 0c05ec2..5316d5d 100644 --- a/splat.yaml +++ b/splat.yaml @@ -1422,18 +1422,18 @@ segments: # # - { start: 0x2A8D20, type: bss, vram: 0x802394F0 } - # - type: code - # dir: overlay_2A8D20 - # start: 0x2A8D20 - # vram: 0x802395C0 - # bss_size: 0x0 - # symbol_name_format: overlay_2A8D20_$VRAM_$ROM - # exclusive_ram_id: test_overlapping - # subsegments: - # - [0x2A8D20, asm] - # - [0x2ADA80, asm] + - type: code + dir: overlay_2A8D20 + start: 0x2A8D20 + vram: 0x802395C0 + bss_size: 0x0 + symbol_name_format: overlay_2A8D20_$VRAM_$ROM + exclusive_ram_id: test_overlapping + subsegments: + - [0x2A8D20, c, "_ob_dead_push"] + - [0x2ADA80, c, "_ob_painful_beds"] - # - [0x2AE340, rodata] + - [0x2AE340, .rodata, "_ob_dead_push"] - type: code dir: overlay_2AE3C0 diff --git a/src/overlay_2A8D20/_ob_dead_push.c b/src/overlay_2A8D20/_ob_dead_push.c new file mode 100644 index 0000000..b1681c3 --- /dev/null +++ b/src/overlay_2A8D20/_ob_dead_push.c @@ -0,0 +1,103 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_802395C0_2A8D20); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023965C_2A8DBC); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_802396E4_2A8E44); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023977C_2A8EDC); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_802397C4_2A8F24); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023998C_2A90EC); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_80239A84_2A91E4); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_80239AF8_2A9258); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_80239B68_2A92C8); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_80239B88_2A92E8); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_80239C04_2A9364); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023A0FC_2A985C); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023A164_2A98C4); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023A270_2A99D0); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023A370_2A9AD0); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023AA8C_2AA1EC); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023AC50_2AA3B0); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023AEA8_2AA608); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023AECC_2AA62C); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023B428_2AAB88); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023B494_2AABF4); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023B500_2AAC60); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023B998_2AB0F8); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023BB48_2AB2A8); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023BD7C_2AB4DC); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023BD9C_2AB4FC); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023BDA8_2AB508); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023BDDC_2AB53C); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023BDF8_2AB558); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023BE14_2AB574); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023BF5C_2AB6BC); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023C0B0_2AB810); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023C3DC_2ABB3C); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023C804_2ABF64); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023C874_2ABFD4); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023C9BC_2AC11C); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023C9EC_2AC14C); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023CFA0_2AC700); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023D0EC_2AC84C); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023D1E8_2AC948); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023D2DC_2ACA3C); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023D7A8_2ACF08); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023D878_2ACFD8); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023DAC4_2AD224); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023DCC0_2AD420); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023DCD4_2AD434); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023DE14_2AD574); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023DF70_2AD6D0); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023E050_2AD7B0); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023E2C0_2ADA20); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_dead_push", func_overlay_2A8D20_8023E2E8_2ADA48); diff --git a/src/overlay_2A8D20/_ob_painful_beds.c b/src/overlay_2A8D20/_ob_painful_beds.c new file mode 100644 index 0000000..5f7096f --- /dev/null +++ b/src/overlay_2A8D20/_ob_painful_beds.c @@ -0,0 +1,13 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_painful_beds", func_overlay_2A8D20_8023E320_2ADA80); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_painful_beds", func_overlay_2A8D20_8023E354_2ADAB4); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_painful_beds", func_overlay_2A8D20_8023E394_2ADAF4); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_painful_beds", func_overlay_2A8D20_8023E7D0_2ADF30); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_painful_beds", func_overlay_2A8D20_8023E83C_2ADF9C); + +INCLUDE_ASM(const s32, "overlay_2A8D20/_ob_painful_beds", func_overlay_2A8D20_8023EA44_2AE1A4);