From 84a59ff8a8f94697a55d5b30ff9f7873a4abd010 Mon Sep 17 00:00:00 2001 From: gijs Date: Tue, 26 Sep 2023 20:22:16 +0200 Subject: [PATCH] Enabled `rodata` migration for `overlay_79730` --- splat.yaml | 15 +++---- src/overlay_79730/_ob_painstaking_leg.c | 56 +++++++++++++++++++++++++ src/overlay_79730/_ob_reach_bead.c | 55 ++++++++++++++++++++++++ src/overlay_79730/_ob_thick_turn.c | 21 ++++++++++ 4 files changed, 140 insertions(+), 7 deletions(-) create mode 100644 src/overlay_79730/_ob_painstaking_leg.c create mode 100644 src/overlay_79730/_ob_reach_bead.c create mode 100644 src/overlay_79730/_ob_thick_turn.c diff --git a/splat.yaml b/splat.yaml index 13be85b..c6c2eb0 100644 --- a/splat.yaml +++ b/splat.yaml @@ -548,20 +548,21 @@ segments: bss_size: 0x0 symbol_name_format: overlay_79730_$VRAM_$ROM exclusive_ram_id: test_overlapping + # Complete + find_file_boundaries: False subsegments: - - [0x79730, asm, "overlay_79730/ob_painstaking_leg"] - - [0x7E4F0, asm, "overlay_79730/ob_reach_bead"] - - [0x83080, asm, "overlay_79730/ob_thick_turn"] - - [0x83610, asm, "overlay_79730/ob_enthusiastic_friction"] + - [0x79730, c, "overlay_79730/_ob_painstaking_leg"] + - [0x7E4F0, c, "overlay_79730/_ob_reach_bead"] + - [0x83080, c, "overlay_79730/_ob_thick_turn"] - [0x85820, data] - [0x867B0, data, "gfx/ob_pithy_seashore"] - [0x86890, data] - [0x869F0, data] - - [0x86EF0, rodata, "overlay_79730/ob_painstaking_leg"] - - [0x87130, rodata, "overlay_79730/ob_reach_bead"] - - [0x871C0, rodata, "overlay_79730/ob_thick_turn"] + - [0x86EF0, .rodata, "overlay_79730/_ob_painstaking_leg"] + - [0x87130, .rodata, "overlay_79730/_ob_reach_bead"] + - [0x871C0, .rodata, "overlay_79730/_ob_thick_turn"] - { start: 0x87200, type: bss, vram: 0x801A8270 } diff --git a/src/overlay_79730/_ob_painstaking_leg.c b/src/overlay_79730/_ob_painstaking_leg.c new file mode 100644 index 0000000..7fa2e7b --- /dev/null +++ b/src/overlay_79730/_ob_painstaking_leg.c @@ -0,0 +1,56 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "overlay_79730/_ob_painstaking_leg", func_overlay_79730_8019A7A0_79730); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_painstaking_leg", func_overlay_79730_8019AD88_79D18); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_painstaking_leg", func_overlay_79730_8019AEEC_79E7C); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_painstaking_leg", func_overlay_79730_8019DA74_7CA04); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_painstaking_leg", func_overlay_79730_8019DBA8_7CB38); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_painstaking_leg", func_overlay_79730_8019DCD8_7CC68); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_painstaking_leg", func_overlay_79730_8019DE44_7CDD4); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_painstaking_leg", func_overlay_79730_8019E0D4_7D064); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_painstaking_leg", func_overlay_79730_8019E110_7D0A0); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_painstaking_leg", func_overlay_79730_8019E240_7D1D0); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_painstaking_leg", func_overlay_79730_8019E294_7D224); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_painstaking_leg", func_overlay_79730_8019E314_7D2A4); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_painstaking_leg", func_overlay_79730_8019E368_7D2F8); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_painstaking_leg", func_overlay_79730_8019E414_7D3A4); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_painstaking_leg", func_overlay_79730_8019E4C0_7D450); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_painstaking_leg", func_overlay_79730_8019E8A4_7D834); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_painstaking_leg", func_overlay_79730_8019E97C_7D90C); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_painstaking_leg", func_overlay_79730_8019E9D0_7D960); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_painstaking_leg", func_overlay_79730_8019EA04_7D994); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_painstaking_leg", func_overlay_79730_8019EA3C_7D9CC); + +void func_overlay_79730_8019EC70_7DC00(void) { +} + +INCLUDE_ASM(const s32, "overlay_79730/_ob_painstaking_leg", func_overlay_79730_8019EC78_7DC08); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_painstaking_leg", func_overlay_79730_8019ED10_7DCA0); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_painstaking_leg", func_overlay_79730_8019ED58_7DCE8); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_painstaking_leg", func_overlay_79730_8019EF18_7DEA8); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_painstaking_leg", func_overlay_79730_8019F1B8_7E148); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_painstaking_leg", func_overlay_79730_8019F354_7E2E4); diff --git a/src/overlay_79730/_ob_reach_bead.c b/src/overlay_79730/_ob_reach_bead.c new file mode 100644 index 0000000..9cf4700 --- /dev/null +++ b/src/overlay_79730/_ob_reach_bead.c @@ -0,0 +1,55 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "overlay_79730/_ob_reach_bead", func_overlay_79730_8019F560_7E4F0); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_reach_bead", func_overlay_79730_8019F81C_7E7AC); + +INCLUDE_RODATA(const s32, "overlay_79730/_ob_reach_bead", D_overlay_79730_801A81A0_87130); + +INCLUDE_RODATA(const s32, "overlay_79730/_ob_reach_bead", D_overlay_79730_801A81A4_87134); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_reach_bead", func_overlay_79730_8019F9BC_7E94C); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_reach_bead", func_overlay_79730_8019FD5C_7ECEC); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_reach_bead", func_overlay_79730_801A05AC_7F53C); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_reach_bead", func_overlay_79730_801A086C_7F7FC); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_reach_bead", func_overlay_79730_801A092C_7F8BC); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_reach_bead", func_overlay_79730_801A0C08_7FB98); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_reach_bead", func_overlay_79730_801A101C_7FFAC); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_reach_bead", func_overlay_79730_801A214C_810DC); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_reach_bead", func_overlay_79730_801A23F0_81380); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_reach_bead", func_overlay_79730_801A24E4_81474); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_reach_bead", func_overlay_79730_801A26A0_81630); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_reach_bead", func_overlay_79730_801A2A5C_819EC); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_reach_bead", func_overlay_79730_801A2D64_81CF4); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_reach_bead", func_overlay_79730_801A347C_8240C); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_reach_bead", func_overlay_79730_801A36CC_8265C); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_reach_bead", func_overlay_79730_801A3994_82924); + +INCLUDE_RODATA(const s32, "overlay_79730/_ob_reach_bead", D_overlay_79730_801A81AC_8713C); + +INCLUDE_RODATA(const s32, "overlay_79730/_ob_reach_bead", D_overlay_79730_801A81BC_8714C); + +INCLUDE_RODATA(const s32, "overlay_79730/_ob_reach_bead", D_overlay_79730_801A81EC_8717C); + +INCLUDE_RODATA(const s32, "overlay_79730/_ob_reach_bead", D_overlay_79730_801A8214_871A4); + +INCLUDE_RODATA(const s32, "overlay_79730/_ob_reach_bead", D_overlay_79730_801A8218_871A8); + +INCLUDE_RODATA(const s32, "overlay_79730/_ob_reach_bead", D_overlay_79730_801A8224_871B4); + +INCLUDE_RODATA(const s32, "overlay_79730/_ob_reach_bead", D_overlay_79730_801A8228_871B8); diff --git a/src/overlay_79730/_ob_thick_turn.c b/src/overlay_79730/_ob_thick_turn.c new file mode 100644 index 0000000..eea8c59 --- /dev/null +++ b/src/overlay_79730/_ob_thick_turn.c @@ -0,0 +1,21 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "overlay_79730/_ob_thick_turn", func_overlay_79730_801A40F0_83080); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_thick_turn", func_overlay_79730_801A4568_834F8); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_thick_turn", func_overlay_79730_801A4680_83610); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_thick_turn", func_overlay_79730_801A4860_837F0); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_thick_turn", func_overlay_79730_801A4940_838D0); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_thick_turn", func_overlay_79730_801A49E0_83970); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_thick_turn", func_overlay_79730_801A4CCC_83C5C); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_thick_turn", func_overlay_79730_801A6240_851D0); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_thick_turn", func_overlay_79730_801A64C0_85450); + +INCLUDE_ASM(const s32, "overlay_79730/_ob_thick_turn", func_overlay_79730_801A66F4_85684);