Migrated `rodata` for `overlay_14EBE0`

2023-09-26 21:07:49 +02:00 · 2023-09-26 21:07:49 +02:00 · d6cb74bc70
parent 9d7aea8819
commit d6cb74bc70
7 changed files with 253 additions and 37 deletions
--- a/linker_scripts/symbols/addr.txt
+++ b/linker_scripts/symbols/addr.txt
@ -522,11 +522,11 @@ NAME_SHEEN = 0x8018E9FC; // type:asciz size:0x6
 ITEM_NAME_SWORD = 0x8018B4B0; // rom:0x613B0
 ITEM_NAME_LAEVATEINN = 0x8018B514; // rom:0x61414

-ITEM_NAME_SWORD_2 = 0x80212E50; // type:asciz rom:0x163FC0
-ITEM_NAME_GREAT_SWORD_2 = 0x80212E58; // type:asciz rom:0x163FC8
-ITEM_NAME_THRUSTING_SWORD_2 = 0x80212E64; // type:asciz rom:0x163FC8
-ITEM_NAME_1HANDED_2 = 0x80212E74; // type:asciz rom:0x163FE4
-ITEM_NAME_SHORT_SPEAR_2 = 0x80212EA4; // type:asciz rom:0x164014 size:0xbc
+//ITEM_NAME_SWORD_2 = 0x80212E50; // type:asciz rom:0x163FC0
+//ITEM_NAME_GREAT_SWORD_2 = 0x80212E58; // type:asciz rom:0x163FC8
+//ITEM_NAME_THRUSTING_SWORD_2 = 0x80212E64; // type:asciz rom:0x163FC8
+//ITEM_NAME_1HANDED_2 = 0x80212E74; // type:asciz rom:0x163FE4
+//ITEM_NAME_SHORT_SPEAR_2 = 0x80212EA4; // type:asciz rom:0x164014 size:0xbc

 __PTR_BIG_STRUCT = 0x80196AF8; // type:u32

--- a/splat.yaml
+++ b/splat.yaml
@ -751,40 +751,27 @@ segments:

      - { start: 0x14EBE0, type: bss, vram: 0x801FDA00 }

-  - [0x14EBE0, bin]
+  # __SOME_OVERLAY_TABLE[9]
+  - type: code
+    dir: overlay_14EBE0
+    start: 0x14EBE0
+    vram: 0x801FDA70
+    bss_size: 0x130
+    symbol_name_format: overlay_14EBE0_$VRAM_$ROM
+    exclusive_ram_id: test_overlapping
+    subsegments:
+      - [0x14EBE0, c, "_ob_phobic_spot"]
+      - [0x151F40, c, "_ob_touted_bedroom"]
+      - [0x15DF10, c, "_ob_daily_account"]
+      - [0x15DF70, c, "_ob_gaudy_line"]
+      - [0x15E670, c, "_ob_devilish_crayon"]
      
-  # # __SOME_OVERLAY_TABLE[9]
-  # - type: code
-  #   dir: overlay_14EBE0
-  #   start: 0x14EBE0
-  #   vram: 0x801FDA70
-  #   bss_size: 0x130
-  #   symbol_name_format: overlay_14EBE0_$VRAM_$ROM
-  #   exclusive_ram_id: test_overlapping
-  #   subsegments:
-  #     - [0x14EBE0, asm]      
-  #     - [0x151F40, asm]
-  #     - [0x15DF10, asm]
-  #     - [0x15DF70, asm]
-  #     - [0x15E670, asm]
+      - [0x15FBF0, data]

-  #     - [0x15FBF0, rodata]
-  #     - [0x161940, rodata]
-  #     - [0x161B90, rodata]
-  #     - [0x161C40, rodata]
-  #     - [0x163580, rodata]
-  #     - [0x1636D0, rodata]
-  #     - [0x1647E0, rodata]
-  #     - [0x1647F0, rodata]
-  #     - [0x164940, rodata]
-  #     - [0x1649F0, rodata]
-  #     - [0x164D60, rodata]
-  #     - [0x165DA0, rodata]
-  #     - [0x165E00, rodata]
-  #     - [0x165E80, rodata]
-  #     - [0x165FB0, rodata]
+      - [0x165E50, .rodata, "_ob_touted_bedroom"]
+      - [0x165FB0, .rodata, "_ob_devilish_crayon"]

-  #     - { start: 0x165FC0, type: bss, vram: 0x80214E50 }
+      - { start: 0x165FC0, type: bss, vram: 0x80214E50 }

  - type: code
    dir: overlay_165FC0
--- a/src/overlay_14EBE0/_ob_daily_account.c
+++ b/src/overlay_14EBE0/_ob_daily_account.c
@ -0,0 +1,3 @@
+#include "common.h"
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_daily_account", func_overlay_14EBE0_8020CDA0_15DF10);
--- a/src/overlay_14EBE0/_ob_devilish_crayon.c
+++ b/src/overlay_14EBE0/_ob_devilish_crayon.c
@ -0,0 +1,29 @@
+#include "common.h"
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_devilish_crayon", func_overlay_14EBE0_8020D500_15E670);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_devilish_crayon", func_overlay_14EBE0_8020D5E4_15E754);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_devilish_crayon", func_overlay_14EBE0_8020D780_15E8F0);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_devilish_crayon", func_overlay_14EBE0_8020DAA8_15EC18);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_devilish_crayon", func_overlay_14EBE0_8020DDD0_15EF40);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_devilish_crayon", func_overlay_14EBE0_8020E0F0_15F260);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_devilish_crayon", func_overlay_14EBE0_8020E394_15F504);
+
+INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_devilish_crayon", D_overlay_14EBE0_80214E40_165FB0);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_devilish_crayon", func_overlay_14EBE0_8020E524_15F694);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_devilish_crayon", func_overlay_14EBE0_8020E6C8_15F838);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_devilish_crayon", func_overlay_14EBE0_8020E7F4_15F964);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_devilish_crayon", func_overlay_14EBE0_8020E9A4_15FB14);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_devilish_crayon", func_overlay_14EBE0_8020E9E0_15FB50);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_devilish_crayon", func_overlay_14EBE0_8020EA18_15FB88);
--- a/src/overlay_14EBE0/_ob_gaudy_line.c
+++ b/src/overlay_14EBE0/_ob_gaudy_line.c
@ -0,0 +1,13 @@
+#include "common.h"
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_gaudy_line", func_overlay_14EBE0_8020CE00_15DF70);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_gaudy_line", func_overlay_14EBE0_8020CE0C_15DF7C);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_gaudy_line", func_overlay_14EBE0_8020CE8C_15DFFC);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_gaudy_line", func_overlay_14EBE0_8020CEBC_15E02C);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_gaudy_line", func_overlay_14EBE0_8020D210_15E380);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_gaudy_line", func_overlay_14EBE0_8020D328_15E498);
--- a/src/overlay_14EBE0/_ob_phobic_spot.c
+++ b/src/overlay_14EBE0/_ob_phobic_spot.c
@ -0,0 +1,21 @@
+#include "common.h"
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_phobic_spot", func_overlay_14EBE0_801FDA70_14EBE0);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_phobic_spot", func_overlay_14EBE0_801FE190_14F300);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_phobic_spot", func_overlay_14EBE0_801FE28C_14F3FC);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_phobic_spot", func_overlay_14EBE0_801FF3E0_150550);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_phobic_spot", func_overlay_14EBE0_801FFEEC_15105C);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_phobic_spot", func_overlay_14EBE0_802001A8_151318);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_phobic_spot", func_overlay_14EBE0_802004C4_151634);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_phobic_spot", func_overlay_14EBE0_8020078C_1518FC);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_phobic_spot", func_overlay_14EBE0_80200A38_151BA8);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_phobic_spot", func_overlay_14EBE0_80200AC0_151C30);
--- a/src/overlay_14EBE0/_ob_touted_bedroom.c
+++ b/src/overlay_14EBE0/_ob_touted_bedroom.c
@ -0,0 +1,163 @@
+#include "common.h"
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80200DD0_151F40);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80200F70_1520E0);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_8020122C_15239C);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_802012D8_152448);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80201384_1524F4);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_802014C8_152638);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_8020153C_1526AC);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_802017C0_152930);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80201A44_152BB4);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80201AFC_152C6C);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80201B68_152CD8);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80201C7C_152DEC);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80201D1C_152E8C);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80201D9C_152F0C);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80201E4C_152FBC);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80202140_1532B0);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80202434_1535A4);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80202728_153898);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_802027DC_15394C);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80202840_1539B0);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_802028A4_153A14);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80202928_153A98);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_8020296C_153ADC);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80202B70_153CE0);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80202E10_153F80);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80202F54_1540C4);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80203050_1541C0);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80203524_154694);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80203558_1546C8);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80203D9C_154F0C);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80203FA4_155114);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80204050_1551C0);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80204120_155290);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80204210_155380);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_8020439C_15550C);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80204B34_155CA4);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80204B58_155CC8);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80204B80_155CF0);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80204BA4_155D14);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80204BE8_155D58);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80204C3C_155DAC);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_8020521C_15638C);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80205D20_156E90);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80205DC8_156F38);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80205F2C_15709C);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80206340_1574B0);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80206C70_157DE0);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80206D78_157EE8);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80206DBC_157F2C);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80206DE4_157F54);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80206EB4_158024);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80207068_1581D8);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80207210_158380);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80207380_1584F0);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_8020746C_1585DC);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_8020753C_1586AC);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_8020766C_1587DC);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80207C94_158E04);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_8020808C_1591FC);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80208304_159474);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80208920_159A90);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80208A3C_159BAC);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80208ADC_159C4C);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80208BE4_159D54);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_80208E64_159FD4);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_8020C284_15D3F4);
+
+INCLUDE_ASM(const s32, "overlay_14EBE0/_ob_touted_bedroom", func_overlay_14EBE0_8020C7F4_15D964);
+
+INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_touted_bedroom", D_overlay_14EBE0_80214D10_165E80);
+
+INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_touted_bedroom", D_overlay_14EBE0_80214D30_165EA0);
+
+INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_touted_bedroom", D_overlay_14EBE0_80214D54_165EC4);
+
+INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_touted_bedroom", D_overlay_14EBE0_80214D84_165EF4);
+
+INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_touted_bedroom", D_overlay_14EBE0_80214D9C_165F0C);
+
+INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_touted_bedroom", D_overlay_14EBE0_80214DB4_165F24);
+
+INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_touted_bedroom", D_overlay_14EBE0_80214DC4_165F34);
+
+INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_touted_bedroom", D_overlay_14EBE0_80214DD4_165F44);
+
+INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_touted_bedroom", D_overlay_14EBE0_80214DE4_165F54);
+
+INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_touted_bedroom", D_overlay_14EBE0_80214E0C_165F7C);
+
+INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_touted_bedroom", D_overlay_14EBE0_80214E1C_165F8C);
+
+INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_touted_bedroom", D_overlay_14EBE0_80214E24_165F94);
+
+INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_touted_bedroom", D_overlay_14EBE0_80214E2C_165F9C);
+
+INCLUDE_RODATA(const s32, "overlay_14EBE0/_ob_touted_bedroom", D_overlay_14EBE0_80214E34_165FA4);