diff --git a/decompressed.pal.yaml b/decompressed.pal.yaml index 972a0bae..9e4f156c 100644 --- a/decompressed.pal.yaml +++ b/decompressed.pal.yaml @@ -171,11 +171,11 @@ segments: - [0xF50010, c, code_13640] - [0xF50050, c, code_13680] - [0xF500a0, c, overlaymanager] - - [0xF50360, bin, untouched] -# # - [0xF2CBE0, c, code_13990] -# # - [0xF2E840, hasm, code_155F0] #DONE -# # - [0xF2E880, c, overlay] #DONE -# # - [0xF2E9C0, c, code_15770] #DONE + - [0xF50360, c, code_13990] + - [0xF51FC0, hasm, code_155F0] + - [0xF52000, c, overlay] + - [0xF52140, c, code_15770] + - [0xF52500, bin, untouched] # # - [0xF2ED80, c, code_15B30] #DONE # # - [0xF2FCA0, c, memory] #DONE # # - [0xF31360, c, code_18110] #DONE @@ -380,8 +380,8 @@ segments: - [0xF74DE0, .data, code_10A00] - [0xF74DF0, .data, code_11AC0] - [0xF75380, .data, overlaymanager] - - [0xF75620, bin, remain_core1_data] -# # - [0xF51DA0, .data, code_13990] + - [0xF75620, .data, code_13990] + - [0xF75630, bin, remain_core1_data] # # - [0xF51DB0, .data, code_15B30] # # - [0xF51DC0, .data, memory] # # - [0xF51DF0, .data, code_18310] @@ -422,8 +422,8 @@ segments: - [0xF77210, .rodata, code_11AC0] - [0xF77220, .rodata, rumblemanager] - [0xF77230, .rodata, overlaymanager] - - [0xF772b0, bin, remain_core1_rodata] -# # - [0xF53A50, .rodata, code_13990] + - [0xF772B0, .rodata, code_13990] + - [0xF772D0, bin, remain_core1_rodata] # # - [0xF53A70, .rodata, code_18350] # # - [0xF53B70, .rodata, code_1BE90] # # - [0xF53BA0, .rodata, code_1D5D0] @@ -473,8 +473,8 @@ segments: - [0xF791D0, .bss, rumblemanager] - [0xF791D0, .bss, code_13640] - [0xF791D0, .bss, overlaymanager] -# # - [0xF791D0, .bss, code_13990] -# # - [0xF791D0, .bss, code_15770] + - [0xF791D0, .bss, code_13990] + - [0xF791D0, .bss, code_15770] # # - [0xF791D0, .bss, code_15B30] # # - [0xF791D0, .bss, memory] # # - [0xF791D0, .bss, code_18210] diff --git a/manual_syms.pal.txt b/manual_syms.pal.txt index 2d76b73c..082f09ca 100644 --- a/manual_syms.pal.txt +++ b/manual_syms.pal.txt @@ -33,11 +33,7 @@ boot_gOverlayTable = gOverlayTable; boot_func_8023DA20 = func_8023DA20; /* Temporary Correct*/ -mlMtxGet = 0x80251000; -mlMtxIdent = 0x8025175c; -mlMtxRotPitch = 0x802518c8; -mlMtxRotYaw = 0x802519d4; -func_8025235C = 0x80251fac; +func_80253010 = 0x80252c60; func_80253034 = 0x80252c84; overlay_load = 0x80252Ca0; func_802535A8 = 0x802531f8; @@ -183,6 +179,8 @@ osMotorStop = 0x80267980; osMotorStart = 0x80267ae8; osMotorInit = 0x80267dd0; osPfsInit = 0x80267fa0; +osInvalICache = 0x80268060; + D_80276574 = 0x802762c4; framebuffer_width = 0x802762d8; @@ -257,6 +255,7 @@ func_80323240 = 0x80323690; timedFunc_set_3 = 0x803253b4; marker_getActor = 0x80329db0; map_get = 0x80334d10; +func_80335134 = 0x80335584; sfxInstruments_init = 0x80335670; assetcache_release = 0x8033b828; func_8033B788 = 0x8033bbd8; @@ -426,4 +425,3 @@ fight_BSS_END = 0x80393390; /* Temporary */ - diff --git a/src/core1/code_13990.c b/src/core1/code_13990.c index 086bf7a5..05687f95 100644 --- a/src/core1/code_13990.c +++ b/src/core1/code_13990.c @@ -2,18 +2,21 @@ #include "functions.h" #include "variables.h" +#include "version.h" + #include "ml/mtx.h" void _guRotateF(Mtx*, f32, f32, f32, f32); f32 func_80263FF0(f32); f32 cosf(f32); -#ifndef CORE2_DATA_CRC2 - #define CORE2_DATA_CRC2 0x84D7B4F8 +#if VERSION == VERSION_USA_1_0 + s32 D_80276570 = 0xFF62C2B8; //WHAT IS THIS? + s32 D_80276574 = 0x84D7B4F8; //CORE2_DATA_CRC2 +#elif VERSION == VERSION_PAL + s32 D_80276570 = 0xF71CBE76; //WHAT IS THIS? + s32 D_80276574 = 0xA2B6F47C; //CORE2_DATA_CRC2 #endif - -s32 D_80276570 = 0xFF62C2B8; //WHAT IS THIS? -s32 D_80276574 = CORE2_DATA_CRC2; f32 D_80276578 = BAD_DTOR; f32 D_8027657C = BAD_DTOR;