From 666d20736cda5d855c85fcc9a2eb585e519cadcc Mon Sep 17 00:00:00 2001 From: gijs Date: Wed, 27 Sep 2023 16:07:48 +0200 Subject: [PATCH] Added `force_migration:True` for symbols not correctly disassembled by `spimdisasm` --- linker_scripts/symbols/addr.txt | 10 ++++++---- splat.yaml | 10 +++++----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index 1c190b8..36afbe8 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -572,10 +572,11 @@ buSave = 0x8007485C; // These strings are translated... STR_CREATING_NEW_DATA = 0x800ADEE8; STR_CREATING_A_NEW_FILE = 0x800ADEC8; -STR_ADDING_NEW_DATA = 0x800ADEA4; -STR_buSave_SAVING = 0x800ADF08; -STR_UNUSEDMALLOCNO_INSUFFICIENT_MEMORY = 0x800ADF88; // type:asciz -STR_FILE_NOT_FOUND = 0x800AE2AC; +STR_ADDING_NEW_DATA = 0x800ADEA4; // type:asciz +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_800A86B8 = 0x800A86B8; // size:0x3 type:u8 D_800A86BC = 0x800A86BC; // size:0x6 type:u8 @@ -941,6 +942,7 @@ __calls_read_controller_1 = 0x8008A508; __calls_read_controller_2 = 0x8008A528; STR_CRC_error = 0x800AE2A0; +__file_open = 0x8007F4E4; // rom:0xF8E4 __FILE_WRITE_ERROR = 0x800AE348; __FILE_READ_ERROR = 0x800AE378; __logs_read_error = 0x8007C590; diff --git a/splat.yaml b/splat.yaml index e2b96fc..55f0083 100644 --- a/splat.yaml +++ b/splat.yaml @@ -57,9 +57,10 @@ segments: # Unsure about these - [0x4AC0, asm, "_ob_overconfident_mother"] - [0x5FC0, asm, "_ob_rabid_jar"] - # - [0x68E0, asm] - # - [0x8700, asm] - # - [0xA370, asm, "lha"] + - [0x68E0, asm] + - [0x8700, asm] + - [0xA370, asm, "lha"] + - [0xFC80, c, "boot"] - [0xFDC0, c, "_ob_spooky_degree"] @@ -328,8 +329,7 @@ segments: - [0x3E100, data] - [0x3E330, rodata] - # - [0x3E3E0, rodata] - # - [0x3E460, rodata] + - [0x3E460, rodata] - [0x3E7A0, .rodata, "_ob_spooky_degree"] - [0x3E7C0, .rodata, "_ob_ambitious_fold"]