Fixed `asm` segment `28A7B0` to C in `overlay_286BD0`

2023-09-27 16:38:36 +02:00 · 2023-09-27 16:38:36 +02:00 · 04dd85feee
parent 666d20736c
commit 04dd85feee
3 changed files with 186 additions and 3 deletions
--- a/linker_scripts/symbols/addr.txt
+++ b/linker_scripts/symbols/addr.txt
@ -578,6 +578,9 @@ STR_buSave_SAVING = 0x800ADF08; // type:asciz
 STR_UNUSEDMALLOCNO_INSUFFICIENT_MEMORY = 0x800ADF88; // type:asciz force_migration:True
 STR_FILE_NOT_FOUND = 0x800AE2AC; // type:asciz force_migration:True

+D_overlay_286BD0_8023E378_29A2B8 = 0x8023E378; // type:asciz rom:0x29A2B8
+STR_SCENE_REPLAY_LEFT_BUTTON = 0x8023E040; // type:asciz rom:0x299F80
+
 D_800A86B8 = 0x800A86B8; // size:0x3 type:u8
 D_800A86BC = 0x800A86BC; // size:0x6 type:u8
 D_800A86C4 = 0x800A86C4; // size:0x8 type:u8
--- a/splat.yaml
+++ b/splat.yaml
@ -1373,7 +1373,7 @@ segments:
    subsegments:
      - [0x286BD0, c, "_ob_pathetic_action"]
      - [0x289780, c, "_ob_childlike_cherry"]
-      - [0x28A7B0, asm, "_ob_future_flesh"]
+      - [0x28A7B0, c, "_ob_future_flesh"]
      - [0x296CE0, c, "_ob_painstaking_mouth"]
      - [0x299D50, c, "_ob_early_ghost"]

@ -1381,8 +1381,9 @@ segments:

      - [0x29A070, .rodata, "_ob_pathetic_action"]
      - [0x29A0A0, .rodata, "_ob_childlike_cherry"]
-      - [0x29A0C0, rodata, "_ob_future_flesh"]
-      - [0x29A2E0, rodata, "data_299D80"]
+      - [0x29A0C0, .rodata, "_ob_future_flesh"]
+      - [0x29A1A0, rodata]
+      - [0x29A2E0, rodata]
      - [0x29A3B0, .rodata, "_ob_painstaking_mouth"]

      - { start: 0x29A4C0, type: bss, vram: 0x8023E580 }
--- a/src/overlay_286BD0/_ob_future_flesh.c
+++ b/src/overlay_286BD0/_ob_future_flesh.c
@ -0,0 +1,179 @@
+#include "common.h"
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022E870_28A7B0);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022E8D4_28A814);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022E90C_28A84C);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022E978_28A8B8);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022E984_28A8C4);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022EA9C_28A9DC);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022EB0C_28AA4C);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022EC34_28AB74);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022ECBC_28ABFC);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022ED48_28AC88);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022ED9C_28ACDC);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022EDEC_28AD2C);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022EEB4_28ADF4);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022F024_28AF64);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022F148_28B088);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022F1A0_28B0E0);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022F264_28B1A4);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022F2D8_28B218);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022F324_28B264);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022F408_28B348);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022F5C4_28B504);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022F848_28B788);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022F864_28B7A4);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022F998_28B8D8);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022FB60_28BAA0);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022FC54_28BB94);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022FCD4_28BC14);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8022FD78_28BCB8);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802300A8_28BFE8);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802300D4_28C014);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80230360_28C2A0);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80230ADC_28CA1C);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80231098_28CFD8);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802311B0_28D0F0);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80231D58_28DC98);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80231EAC_28DDEC);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80231F04_28DE44);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802320C0_28E000);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802321FC_28E13C);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80232E20_28ED60);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8023324C_28F18C);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802339D8_28F918);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80233DA8_28FCE8);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80233F38_28FE78);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80234078_28FFB8);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802344D0_290410);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802348A8_2907E8);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802348B8_2907F8);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802348D0_290810);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802348E0_290820);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8023498C_2908CC);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80234B38_290A78);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80234D10_290C50);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80234DB8_290CF8);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80234E10_290D50);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8023519C_2910DC);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802351C4_291104);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802351F0_291130);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80235254_291194);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80235914_291854);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802359B4_2918F4);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802372C8_293208);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802376B8_2935F8);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80237B7C_293ABC);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80238910_294850);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80238A00_294940);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80238C4C_294B8C);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80238D14_294C54);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80238EC4_294E04);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8023906C_294FAC);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802390AC_294FEC);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80239160_2950A0);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80239394_2952D4);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802394A0_2953E0);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80239570_2954B0);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80239634_295574);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802396F0_295630);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_802397B8_2956F8);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80239B14_295A54);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80239C5C_295B9C);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80239E30_295D70);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_80239EE0_295E20);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8023A398_2962D8);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8023A42C_29636C);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8023A5D8_296518);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8023A814_296754);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8023AA70_2969B0);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8023AB74_296AB4);
+
+INCLUDE_ASM(const s32, "overlay_286BD0/_ob_future_flesh", func_overlay_286BD0_8023AD10_296C50);