From 57499a5a096a8c274eb5c67b90277d4e8dbc2366 Mon Sep 17 00:00:00 2001 From: gijs Date: Tue, 26 Sep 2023 21:09:13 +0200 Subject: [PATCH] Migrated `rodata` for `overlay_FA5E0` --- splat.yaml | 4 +- src/overlay_FA5E0/_ob_cautious_spring.c | 135 ++++++++++++++++++++++++ 2 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 src/overlay_FA5E0/_ob_cautious_spring.c diff --git a/splat.yaml b/splat.yaml index 55a147c..d9ccbeb 100644 --- a/splat.yaml +++ b/splat.yaml @@ -657,11 +657,11 @@ segments: symbol_name_format: overlay_FA5E0_$VRAM_$ROM exclusive_ram_id: test_overlapping subsegments: - - [0xFA5E0, asm] + - [0xFA5E0, c, "_ob_cautious_spring"] - [0x1003D0, data] - - [0x101A40, rodata, "FA5E0"] + - [0x101A40, .rodata, "_ob_cautious_spring"] - { start: 0x101CE0, type: bss, vram: 0x801B4CA0 } diff --git a/src/overlay_FA5E0/_ob_cautious_spring.c b/src/overlay_FA5E0/_ob_cautious_spring.c new file mode 100644 index 0000000..a6f8a10 --- /dev/null +++ b/src/overlay_FA5E0/_ob_cautious_spring.c @@ -0,0 +1,135 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801AD5A0_FA5E0); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801AD748_FA788); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801ADF6C_FAFAC); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801AE090_FB0D0); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801AE0C4_FB104); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801AE5BC_FB5FC); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801AE79C_FB7DC); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801AE7EC_FB82C); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801AE7FC_FB83C); + +INCLUDE_RODATA(const s32, "overlay_FA5E0/_ob_cautious_spring", D_overlay_FA5E0_801B4A54_101A94); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801AE814_FB854); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801AEB2C_FBB6C); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801AEBA4_FBBE4); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801AEC40_FBC80); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801AED48_FBD88); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801AED6C_FBDAC); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801AEDEC_FBE2C); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801AEE94_FBED4); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801AEEC0_FBF00); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801AFB94_FCBD4); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801AFD30_FCD70); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B01FC_FD23C); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B0218_FD258); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B022C_FD26C); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B02C0_FD300); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B0444_FD484); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B04B8_FD4F8); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B04E4_FD524); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B05D0_FD610); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B060C_FD64C); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B073C_FD77C); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B09B8_FD9F8); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B0C0C_FDC4C); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B0C3C_FDC7C); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B0C50_FDC90); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B0CE4_FDD24); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B0E48_FDE88); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B0EB8_FDEF8); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B0ECC_FDF0C); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B0F60_FDFA0); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B1250_FE290); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B1288_FE2C8); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B129C_FE2DC); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B1330_FE370); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B15BC_FE5FC); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B18AC_FE8EC); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B1AF0_FEB30); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B1CC0_FED00); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B1FD8_FF018); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B2664_FF6A4); + +INCLUDE_RODATA(const s32, "overlay_FA5E0/_ob_cautious_spring", D_overlay_FA5E0_801B4C78_101CB8); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B2854_FF894); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B2CC0_FFD00); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B2CFC_FFD3C); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B2DBC_FFDFC); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B2FF8_100038); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B3038_100078); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B3040_100080); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B3258_100298); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B3288_1002C8); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B32B8_1002F8); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B32E8_100328); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B333C_10037C); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B3350_100390); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B3364_1003A4); + +INCLUDE_ASM(const s32, "overlay_FA5E0/_ob_cautious_spring", func_overlay_FA5E0_801B3378_1003B8); + +INCLUDE_RODATA(const s32, "overlay_FA5E0/_ob_cautious_spring", D_overlay_FA5E0_801B4C90_101CD0);