From 78f2f49b700d191a9872783b1325317f6034d86d Mon Sep 17 00:00:00 2001 From: gijs Date: Fri, 24 Nov 2023 13:12:53 +0100 Subject: [PATCH] Change addr names which are now considered errors in `splat` --- linker_scripts/symbols/addr.txt | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index 19022b7..2f49a45 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -168,8 +168,6 @@ osPfsNumFiles = 0x80096A90; // rom:0x26E90 osAiSetNextBuffer = 0x8008C550; // rom:0x1C950 __osAiDeviceBusy = 0x80099BC0; // rom:0x29FC0 -__OVERLAY_INFO_8018F330 = 0x8018F330; // size:0x14 -__OVERLAY_INFO_8018F344 = 0x8018F344; // size:0x14 __OVERLAY_INFO_8018F330 = 0x8018F330; // size:0x14 __OVERLAY_INFO_8018F344 = 0x8018F344; // size:0x14 __OVERLAY_INFO_8018FC1C = 0x8018FC1C; // size:0x14 @@ -519,8 +517,6 @@ obElementNameFlameBane = 0x801876F0; // rom:0x5D5F0 type:asciz //obAbilityNameMirageSlash = 0x80187BB8; // type:asciz rom:0x5DAB8 size:13 //obAbilityNameFatalDance = 0x80187BC8; // type:asciz rom:0x5DAC8 size:12 -D_80187BD4 = 0x80187BD4; // rom:0x5DAD4 type:u32 - // TODO: Figure this out FP_CLASS_GET_ITEM_0 = 0x80186FD4; // rom:0x5CED4 size:16 type:u32 FP_CLASS_GET_ITEM_1 = 0x8018B494; // rom:0x61394 size:16 type:u32 @@ -742,26 +738,21 @@ __loads_overlay_array = 0x800761E4; __get_overlay_index = 0x80076430; __calls_loads_overlay_array = 0x80075BC0; -D_800A81C0 = 0x800A81C0; // size:0x30 - - __add_0x594284 = 0x8009DD28; __log_lha_error = 0x8007BB90; __osPiTable = 0x800AA41C; // rom:0x3A81C -osEPiLinkHandle = 0x8008BCE0l // rom:0x1C0E0 +osEPiLinkHandle = 0x8008BCE0; // rom:0x1C0E0 CartRomHandle = 0x800C4C50; // size:0x2A osCartRomInit = 0x8008BD30; D_800A81C0 = 0x800A81C0; // size:0x30 D_800C4BBC = 0x800C4BBC; // size:0x8 -D_800AEFE0 = 0x800AEFE0; // size:0x8 D_80197168 = 0x80197168; // size:0x10 D_800E7D90 = 0x800E7D90; // size:0x58 D_800E7DE8 = 0x800E7DE8; // size:0x58 -D_800AEFE0 = 0x800AEFE0; // size:0x8 D_800E82C8 = 0x800E82C8; // size:0x3F0 type:u8 D_800C4C10 = 0x800C4C10; // size:0xC type:u8 @@ -795,7 +786,6 @@ ldigs = 0x800ABC30; // type:asciz udigs = 0x800ABC44; // type:asciz _Litob = 0x8009B670; -__osSiRawWriteIo = 0x __osFinalrom = 0x800E82C0; // type:u32 osViClock = 0x800ABAC8; // type:s32 __OSGlobalIntMask = 0x800ABAD0; // type:u32 @@ -826,10 +816,6 @@ __resets_menu_timer = 0x8019B2E0; // rom:0x1D17E0 __calls_resets_menu_timer = 0x80177A1C; // rom:0x4D91C __MENU_INDEX = 0x801BA94C; -__GLOBAL_WITH__inc_menu_timer = 0x8018FB20; - - - __osSetTimerIntr = 0x80094F70; __osInsertTimer = 0x80094FD0; osSetTime = 0x80094D20; @@ -974,13 +960,11 @@ __MUS_MEM_800B1868 = 0x800B1868; MQ_SWAP_BUFFER = 0x800E9BA8; MQ_800E7988 = 0x800E7988; -MQ_800C35A0 = 0x800C35A0; obUnpackQueue = 0x800AF320; MQ_800B1880 = 0x800B1880; MQ_800E79C8 = 0x800E79C8; MQ_800C49E8 = 0x800C49E8; -OSMESG_800B1870 = 0x800B1870; OSMESG_800B17D0 = 0x800B17D0; OSMESG_800B17E0 = 0x800B17E0; OSMESG_800B9C58 = 0x800B9C58; @@ -1235,7 +1219,6 @@ __osDpDeviceBusy = 0x8009C350; siAccessBuf = 0x800C35A0; -__osSiRawStartDma = 0x800946C0; __osSiRawStartDma = 0x800946C0; __osSiRelAccess = 0x80094830; __osSiGetAccess = 0x800947C4;