From 8c4808f801030c677afb68807871dd56c70d9e13 Mon Sep 17 00:00:00 2001 From: gijs Date: Wed, 27 Sep 2023 01:53:46 +0200 Subject: [PATCH] Migrated `rodata` for `overlay_17F9C0` --- splat.yaml | 33 ++++++++++++++------------- src/overlay_17F9C0/_ob_gnarly_fruit.c | 21 +++++++++++++++++ src/overlay_17F9C0/_ob_helpful_test.c | 13 +++++++++++ 3 files changed, 51 insertions(+), 16 deletions(-) create mode 100644 src/overlay_17F9C0/_ob_gnarly_fruit.c create mode 100644 src/overlay_17F9C0/_ob_helpful_test.c diff --git a/splat.yaml b/splat.yaml index 4d320c7..22a6ed8 100644 --- a/splat.yaml +++ b/splat.yaml @@ -792,24 +792,25 @@ segments: - { start: 0x17F9C0, type: bss, vram: 0x8021CA70 } - - [0x17F9C0, bin] + - type: code + dir: overlay_17F9C0 + start: 0x17F9C0 + vram: 0x80214F80 + bss_size: 0x10 + symbol_name_format: overlay_17F9C0_$VRAM_$ROM + exclusive_ram_id: test_overlapping + subsegments: + - [0x17F9C0, c, "_ob_helpful_test"] + - [0x181520, c, "_ob_gnarly_fruit"] - # - type: code - # dir: overlay_17F9C0 - # start: 0x17F9C0 - # vram: 0x80214F80 - # bss_size: 0x10 - # symbol_name_format: overlay_17F9C0_$VRAM_$ROM - # exclusive_ram_id: test_overlapping - # subsegments: - # - [0x17F9C0, asm] - # - [0x181520, asm] + - [0x1822F0, data] - # - [0x1822F0, rodata] - # - [0x185790, rodata] - # - [0x188B10, rodata] - - # # - { start: 0x188B60, type: bss, vram: 0x8021E120 } + - [0x188B10, .rodata, "_ob_helpful_test"] + - [0x188B40, .rodata, "_ob_gnarly_fruit"] + + - { start: 0x188B60, type: bss, vram: 0x8021E120 } + + - [0x188B60, bin] # - type: code # dir: overlay_188B60 diff --git a/src/overlay_17F9C0/_ob_gnarly_fruit.c b/src/overlay_17F9C0/_ob_gnarly_fruit.c new file mode 100644 index 0000000..efaee10 --- /dev/null +++ b/src/overlay_17F9C0/_ob_gnarly_fruit.c @@ -0,0 +1,21 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "overlay_17F9C0/_ob_gnarly_fruit", func_overlay_17F9C0_80216AE0_181520); + +INCLUDE_ASM(const s32, "overlay_17F9C0/_ob_gnarly_fruit", func_overlay_17F9C0_80216C08_181648); + +INCLUDE_ASM(const s32, "overlay_17F9C0/_ob_gnarly_fruit", func_overlay_17F9C0_80216F3C_18197C); + +INCLUDE_ASM(const s32, "overlay_17F9C0/_ob_gnarly_fruit", func_overlay_17F9C0_80217114_181B54); + +INCLUDE_ASM(const s32, "overlay_17F9C0/_ob_gnarly_fruit", func_overlay_17F9C0_80217474_181EB4); + +INCLUDE_ASM(const s32, "overlay_17F9C0/_ob_gnarly_fruit", func_overlay_17F9C0_8021751C_181F5C); + +INCLUDE_ASM(const s32, "overlay_17F9C0/_ob_gnarly_fruit", func_overlay_17F9C0_802175B0_181FF0); + +INCLUDE_ASM(const s32, "overlay_17F9C0/_ob_gnarly_fruit", func_overlay_17F9C0_80217640_182080); + +INCLUDE_ASM(const s32, "overlay_17F9C0/_ob_gnarly_fruit", func_overlay_17F9C0_80217664_1820A4); + +INCLUDE_ASM(const s32, "overlay_17F9C0/_ob_gnarly_fruit", func_overlay_17F9C0_80217670_1820B0); diff --git a/src/overlay_17F9C0/_ob_helpful_test.c b/src/overlay_17F9C0/_ob_helpful_test.c new file mode 100644 index 0000000..a26dd76 --- /dev/null +++ b/src/overlay_17F9C0/_ob_helpful_test.c @@ -0,0 +1,13 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "overlay_17F9C0/_ob_helpful_test", func_overlay_17F9C0_80214F80_17F9C0); + +INCLUDE_ASM(const s32, "overlay_17F9C0/_ob_helpful_test", func_overlay_17F9C0_80214FC4_17FA04); + +INCLUDE_ASM(const s32, "overlay_17F9C0/_ob_helpful_test", func_overlay_17F9C0_80215094_17FAD4); + +INCLUDE_ASM(const s32, "overlay_17F9C0/_ob_helpful_test", func_overlay_17F9C0_8021550C_17FF4C); + +INCLUDE_ASM(const s32, "overlay_17F9C0/_ob_helpful_test", func_overlay_17F9C0_802166D8_181118); + +INCLUDE_ASM(const s32, "overlay_17F9C0/_ob_helpful_test", func_overlay_17F9C0_80216A14_181454);