From fa7b76925a0908cb6ce1b9a43d7b59dcc8da7bbb Mon Sep 17 00:00:00 2001 From: gijs Date: Wed, 27 Sep 2023 01:45:08 +0200 Subject: [PATCH] Migrated `rodata` for `overlay_177ED0` --- splat.yaml | 40 ++++++++-------------- src/overlay_177ED0/_ob_possible_engine.c | 19 ++++++++++ src/overlay_177ED0/_ob_steep_grandmother.c | 5 +++ src/overlay_177ED0/_ob_zany_payment.c | 9 +++++ 4 files changed, 48 insertions(+), 25 deletions(-) create mode 100644 src/overlay_177ED0/_ob_possible_engine.c create mode 100644 src/overlay_177ED0/_ob_steep_grandmother.c create mode 100644 src/overlay_177ED0/_ob_zany_payment.c diff --git a/splat.yaml b/splat.yaml index 48bd618..73c0774 100644 --- a/splat.yaml +++ b/splat.yaml @@ -774,35 +774,25 @@ segments: - { start: 0x177ED0, type: bss, vram: 0x8021AFB0 } - - [0x177ED0, bin] + - type: code + dir: overlay_177ED0 + start: 0x177ED0 + vram: 0x80214F80 + bss_size: 0x18D0 + symbol_name_format: overlay_177ED0_$VRAM_$ROM + exclusive_ram_id: test_overlapping + subsegments: + - [0x177ED0, c, "_ob_zany_payment"] + - [0x1782C0, c, "_ob_steep_grandmother"] + - [0x178450, c, "_ob_possible_engine"] - # - type: code - # dir: overlay_177ED0 - # start: 0x177ED0 - # vram: 0x80214F80 - # bss_size: 0x18D0 - # symbol_name_format: overlay_177ED0_$VRAM_$ROM - # exclusive_ram_id: test_overlapping - # subsegments: - # - [0x177ED0, asm] - # - [0x1782C0, asm] - # - [0x178450, asm] + - [0x17BCF0, data] - # - [0x17BCD0, rodata] - # - [0x17BCE0, rodata] - # - [0x17C500, rodata] - # - [0x17CC20, rodata] - # - [0x17CCE0, rodata] - # - [0x17F130, rodata] - # - [0x17F460, rodata] - # - [0x17F7F0, rodata] - # - [0x17F8D0, rodata] - # - [0x17F8F0, rodata] - # - [0x17F900, rodata] - # - [0x17F910, rodata] + - [0x17F9A0, .rodata, "_ob_possible_engine"] - # # - { start: 0x17F9C0, type: bss, vram: 0x8021CA70 } + - { start: 0x17F9C0, type: bss, vram: 0x8021CA70 } + - [0x17F9C0, bin] # - type: code # dir: overlay_17F9C0 diff --git a/src/overlay_177ED0/_ob_possible_engine.c b/src/overlay_177ED0/_ob_possible_engine.c new file mode 100644 index 0000000..7620423 --- /dev/null +++ b/src/overlay_177ED0/_ob_possible_engine.c @@ -0,0 +1,19 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "overlay_177ED0/_ob_possible_engine", func_overlay_177ED0_80215500_178450); + +INCLUDE_ASM(const s32, "overlay_177ED0/_ob_possible_engine", func_overlay_177ED0_80215AF4_178A44); + +INCLUDE_ASM(const s32, "overlay_177ED0/_ob_possible_engine", func_overlay_177ED0_80217220_17A170); + +INCLUDE_ASM(const s32, "overlay_177ED0/_ob_possible_engine", func_overlay_177ED0_802174D8_17A428); + +INCLUDE_ASM(const s32, "overlay_177ED0/_ob_possible_engine", func_overlay_177ED0_80217538_17A488); + +INCLUDE_ASM(const s32, "overlay_177ED0/_ob_possible_engine", func_overlay_177ED0_802175B4_17A504); + +INCLUDE_ASM(const s32, "overlay_177ED0/_ob_possible_engine", func_overlay_177ED0_80217710_17A660); + +INCLUDE_ASM(const s32, "overlay_177ED0/_ob_possible_engine", func_overlay_177ED0_80218A34_17B984); + +INCLUDE_ASM(const s32, "overlay_177ED0/_ob_possible_engine", func_overlay_177ED0_80218D80_17BCD0); diff --git a/src/overlay_177ED0/_ob_steep_grandmother.c b/src/overlay_177ED0/_ob_steep_grandmother.c new file mode 100644 index 0000000..65c6f90 --- /dev/null +++ b/src/overlay_177ED0/_ob_steep_grandmother.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "overlay_177ED0/_ob_steep_grandmother", func_overlay_177ED0_80215370_1782C0); + +INCLUDE_ASM(const s32, "overlay_177ED0/_ob_steep_grandmother", func_overlay_177ED0_802154CC_17841C); diff --git a/src/overlay_177ED0/_ob_zany_payment.c b/src/overlay_177ED0/_ob_zany_payment.c new file mode 100644 index 0000000..9e62178 --- /dev/null +++ b/src/overlay_177ED0/_ob_zany_payment.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "overlay_177ED0/_ob_zany_payment", func_overlay_177ED0_80214F80_177ED0); + +INCLUDE_ASM(const s32, "overlay_177ED0/_ob_zany_payment", func_overlay_177ED0_80214FB0_177F00); + +INCLUDE_ASM(const s32, "overlay_177ED0/_ob_zany_payment", func_overlay_177ED0_80215290_1781E0); + +INCLUDE_ASM(const s32, "overlay_177ED0/_ob_zany_payment", func_overlay_177ED0_8021533C_17828C);