From a88c64d461578bb62a0449cc8b5fc806b2490ed0 Mon Sep 17 00:00:00 2001 From: gijs Date: Tue, 26 Sep 2023 20:18:48 +0200 Subject: [PATCH] Enabled `rodata` migration for segment `overlay_6E660` --- splat.yaml | 15 +++++------ src/overlay_6E660/ob_chunky_hot.c | 43 +++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 8 deletions(-) create mode 100644 src/overlay_6E660/ob_chunky_hot.c diff --git a/splat.yaml b/splat.yaml index 7617629..13be85b 100644 --- a/splat.yaml +++ b/splat.yaml @@ -488,18 +488,17 @@ segments: bss_size: 0x60 symbol_name_format: overlay_69900_$VRAM_$ROM exclusive_ram_id: test_overlapping - # Complete - find_file_boundaries: False subsegments: - [0x69900, asm, "overlay_69900/ob_ancient_ball"] - [0x6D3D0, asm, "overlay_69900/ob_fixed_mitten"] - - [0x6DF80, data] - - [0x6E1B0, data, "gfx/ob_quarrelsome_spot"] + - [0x6DF80, data, "gfx/_ob_ardent_connection"] + - [0x6DFA0, data] + - [0x6E1B0, data, "gfx/_ob_quarrelsome_spot"] - [0x6E250, data] - - [0x6E2A0, rodata, "overlay_69900/ob_fixed_mitten"] - - [0x6E2B0, rodata, "overlay_69900/ob_ancient_ball"] + - [0x6E520, rodata] + - [0x6E610, rodata] - { start: 0x6E660, type: bss, vram: 0x8019C8D0 } @@ -516,9 +515,9 @@ segments: # Complete find_file_boundaries: False subsegments: - - [0x6E660, asm, "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/overlay_6E660/ob_chunky_hot.c b/src/overlay_6E660/ob_chunky_hot.c new file mode 100644 index 0000000..4742ed9 --- /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);