mirror/st
1
0
Fork 0
mirror of https://github.com/zeldaret/st synced 2026-05-23 15:01:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

progress

Browse Source
This commit is contained in:
Yanis002
2025-03-20 13:49:10 +01:00
parent d8015068aa
commit e20137b303
6 changed files with 315 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/eur/arm9/delinks.txt
+3
View File
@@ -12,3 +12,6 @@ libs/cpp/src/__register_global_object.c:
src/Main/Main.cpp:
.text start:0x02000800 end:0x02000bdc
src/Main/System/OverlayManager.cpp:
.text start:0x020147fc end:0x02014944
config/eur/arm9/symbols.txt
+12 -12
View File
@@ -709,9 +709,9 @@ func_0201478c kind:function(arm,size=0x1c) addr:0x0201478c
func_020147a8 kind:function(arm,size=0x1c) addr:0x020147a8
func_020147c4 kind:function(arm,size=0x1c) addr:0x020147c4
func_020147e0 kind:function(thumb,size=0x1c) addr:0x020147e0
func_020147fc kind:function(thumb,size=0x28) addr:0x020147fc
func_02014824 kind:function(thumb,size=0x2c) addr:0x02014824
func_02014850 kind:function(thumb,size=0x28) addr:0x02014850
OverlayManager_LoadIfNotLoaded kind:function(thumb,size=0x28) addr:0x020147fc
OverlayManager_Load kind:function(thumb,size=0x2c) addr:0x02014824
OverlayManager_Unload kind:function(thumb,size=0x28) addr:0x02014850
func_02014878 kind:function(thumb,size=0x58) addr:0x02014878
func_020148d0 kind:function(thumb,size=0x48) addr:0x020148d0
func_02014918 kind:function(thumb,size=0x2c) addr:0x02014918
@@ -1310,7 +1310,7 @@ func_0202350c kind:function(arm,size=0x3c) addr:0x0202350c
func_02023548 kind:function(arm,size=0x44) addr:0x02023548
func_0202358c kind:function(arm,size=0x68) addr:0x0202358c
func_020235f4 kind:function(arm,size=0x1c) addr:0x020235f4
func_02023610 kind:function(arm,size=0x28) addr:0x02023610
SetBrightColor kind:function(arm,size=0x28) addr:0x02023610
func_02023638 kind:function(arm,size=0x40) addr:0x02023638
func_02023678 kind:function(arm,size=0x60) addr:0x02023678
func_020236d8 kind:function(arm,size=0x98) addr:0x020236d8
@@ -1782,11 +1782,11 @@ func_0202d6f4 kind:function(arm,size=0xfc) addr:0x0202d6f4
func_0202d7f0 kind:function(arm,size=0x100) addr:0x0202d7f0
func_0202d8f0 kind:function(arm,size=0x94) addr:0x0202d8f0
func_0202d984 kind:function(arm,size=0x90) addr:0x0202d984
func_0202da14 kind:function(arm,size=0xf4) addr:0x0202da14
func_0202db08 kind:function(arm,size=0xf0) addr:0x0202db08
func_0202dbf8 kind:function(arm,size=0x10) addr:0x0202dbf8
func_0202dc08 kind:function(arm,size=0x58) addr:0x0202dc08
func_0202dc60 kind:function(arm,size=0x50) addr:0x0202dc60
Overlay_Load kind:function(arm,size=0xf4) addr:0x0202da14
Overlay_CleanupResources kind:function(arm,size=0xf0) addr:0x0202db08
Overlay_Unload kind:function(arm,size=0x10) addr:0x0202dbf8
Overlay_LoadOverlay kind:function(arm,size=0x58) addr:0x0202dc08
Overlay_UnloadOverlay kind:function(arm,size=0x50) addr:0x0202dc60
func_0202dcb0 kind:function(arm,size=0x50) addr:0x0202dcb0
func_0202dd00 kind:function(arm,size=0x154) addr:0x0202dd00
func_0202de54 kind:function(arm,size=0x1fc) addr:0x0202de54
@@ -2109,7 +2109,7 @@ func_0203cc7c kind:function(arm,size=0xf4) addr:0x0203cc7c
func_0203cd70 kind:function(arm,size=0x28) addr:0x0203cd70
func_0203cd98 kind:function(arm,size=0x14) addr:0x0203cd98
func_0203cdac kind:function(arm,size=0xc) addr:0x0203cdac
func_0203cdb8 kind:function(arm,size=0x30) addr:0x0203cdb8
CallStaticInitializers kind:function(arm,size=0x30) addr:0x0203cdb8
func_0203cde8 kind:function(arm,size=0x44) addr:0x0203cde8
func_0203ce2c kind:function(arm,size=0xc) addr:0x0203ce2c
func_0203ce38 kind:function(arm,size=0xc) addr:0x0203ce38
@@ -2483,7 +2483,7 @@ data_02043c54 kind:data(any) addr:0x02043c54
data_02043c64 kind:data(any) addr:0x02043c64
data_02043c74 kind:data(any) addr:0x02043c74
data_02043c88 kind:data(any) addr:0x02043c88
data_02043e50 kind:data(any) addr:0x02043e50
gOverlayManager kind:data(any) addr:0x02043e50
data_02043e98 kind:data(any) addr:0x02043e98
data_02043ea8 kind:data(any) addr:0x02043ea8
data_02043eb8 kind:data(any) addr:0x02043eb8
@@ -2711,7 +2711,7 @@ data_02049bd0 kind:bss addr:0x02049bd0
data_02049bd4 kind:bss addr:0x02049bd4
data_02049bdc kind:bss addr:0x02049bdc
data_02049be0 kind:bss addr:0x02049be0
data_02049be4 kind:bss addr:0x02049be4
gRandom kind:bss addr:0x02049be4
data_02049bfc kind:bss addr:0x02049bfc
data_02049f00 kind:bss addr:0x02049f00
data_02049f04 kind:bss addr:0x02049f04
include/System/OverlayManager.hpp
+163
View File
@@ -0,0 +1,163 @@
#pragma once
#include "types.h"
// #include "Item/Item.hpp"
typedef u32 ItemFlag;
typedef u32 OverlayId;
enum OverlayId_ {
OverlayId_None = -1,
OverlayId_Core,
OverlayId_01,
OverlayId_02,
OverlayId_03,
OverlayId_04,
OverlayId_05,
OverlayId_06,
OverlayId_07,
OverlayId_08,
OverlayId_09,
OverlayId_10,
OverlayId_11,
OverlayId_12,
OverlayId_13,
OverlayId_14,
OverlayId_15,
OverlayId_16,
OverlayId_17,
OverlayId_18,
OverlayId_19,
OverlayId_20,
OverlayId_21,
OverlayId_22,
OverlayId_23,
OverlayId_24,
OverlayId_25,
OverlayId_26,
OverlayId_27,
OverlayId_28,
OverlayId_29,
OverlayId_30,
OverlayId_31,
OverlayId_32,
OverlayId_33,
OverlayId_34,
OverlayId_35,
OverlayId_36,
OverlayId_37,
OverlayId_38,
OverlayId_39,
OverlayId_40,
OverlayId_41,
OverlayId_42,
OverlayId_43,
OverlayId_44,
OverlayId_45,
OverlayId_46,
OverlayId_47,
OverlayId_48,
OverlayId_49,
OverlayId_50,
OverlayId_51,
OverlayId_52,
OverlayId_53,
OverlayId_54,
OverlayId_55,
OverlayId_56,
OverlayId_57,
OverlayId_58,
OverlayId_59,
OverlayId_60,
OverlayId_61,
OverlayId_62,
OverlayId_63,
OverlayId_64,
OverlayId_65,
OverlayId_66,
OverlayId_67,
OverlayId_68,
OverlayId_69,
OverlayId_70,
OverlayId_71,
OverlayId_72,
OverlayId_73,
OverlayId_74,
OverlayId_75,
OverlayId_76,
OverlayId_77,
OverlayId_78,
OverlayId_79,
OverlayId_80,
OverlayId_81,
OverlayId_82,
OverlayId_83,
OverlayId_84,
OverlayId_85,
OverlayId_86,
OverlayId_87,
OverlayId_88,
OverlayId_89,
OverlayId_90,
OverlayId_91,
OverlayId_92,
OverlayId_93,
OverlayId_94,
OverlayId_95,
OverlayId_96,
OverlayId_97,
OverlayId_98,
OverlayId_99,
OverlayId_100,
OverlayId_101,
OverlayId_102,
OverlayId_103,
OverlayId_104,
OverlayId_105,
OverlayId_106,
OverlayId_107,
OverlayId_108,
OverlayId_109,
OverlayId_110,
OverlayId_111,
OverlayId_112,
OverlayId_113,
};
typedef u32 OverlayIndex;
enum OverlayIndex_ {
OverlayIndex_Core,
OverlayIndex_1,
OverlayIndex_2,
OverlayIndex_3,
OverlayIndex_4,
OverlayIndex_5,
OverlayIndex_6,
OverlayIndex_7,
OverlayIndex_8,
OverlayIndex_9,
OverlayIndex_10,
OverlayIndex_11,
OverlayIndex_12,
OverlayIndex_13,
OverlayIndex_14,
OverlayIndex_15,
OverlayIndex_16,
OverlayIndex_17,
OverlayIndex_COUNT,
};
class OverlayManager {
public:
OverlayId mLoadedOverlays[OverlayIndex_COUNT];
void Load(OverlayIndex index, OverlayId id);
void LoadIfNotLoaded(OverlayIndex index, OverlayId id);
void Unload(OverlayIndex index);
void LoadOverlaySetup(s32 index);
void UnloadOverlaySetup();
void LoadEquipItem(ItemFlag equipId);
};
extern OverlayManager gOverlayManager;
include/nitro/Overlay.h
+40
View File
@@ -0,0 +1,40 @@
#ifndef _NITRO_OVERLAY_H
#define _NITRO_OVERLAY_H
#include "types.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct Overlay {
/* 00 */ unk32 mId;
/* 04 */ void* mBaseAddress;
/* 08 */ u32 mTextSize;
/* 0c */ s32 mBssSize;
/* 10 */ unk32 mCtorStart;
/* 14 */ unk32 mCtorEnd;
/* 18 */ unk32 mFileId;
/* 1c */ u32 mFileSize;
/* 20 */
} Overlay;
u32 Overlay_FileSize(Overlay* overlay);
void Overlay_ClearCacheAndBss(Overlay* overlay);
void Overlay_func_02042238(unk32* param1, Overlay* overlay);
bool Overlay_func_02042250(Overlay* param1, Overlay* param2, s32 param3, unk32 param4, s32 param5, u32 param6,
s32 param7, u32 param8);
bool Overlay_func_020422ec(Overlay* param1, Overlay* param2, s32 param3);
bool Overlay_func_0204238c(Overlay* overlay);
bool Overlay_func_020423e8(s32 param1, unk32 param2, unk32 param3);
void Overlay_Init(Overlay* overlay);
void Overlay_RunGlobalDestructors(Overlay* overlay);
bool Overlay_Destroy(Overlay* overlay);
bool Overlay_Load(Overlay* overlay, unk32 param2);
bool Overlay_Unload(Overlay* overlay, unk32 param2);
#ifdef __cplusplus
}
#endif
#endif
src/Main/Main.cpp
+6 -10
View File
@@ -3,7 +3,7 @@
void func_0203b920(void);
void func_02011da0(void);
void func_0203cdb8(void);
void CallStaticInitializers(void);
void main(void);
void func_02000a78(void);
@@ -93,7 +93,7 @@ ARM void Entry(void) {
func_0203b920();
func_02011da0();
func_0203cdb8();
CallStaticInitializers();
main();
}
@@ -108,11 +108,9 @@ ARM void* func_0200093c(unk32 param1, u32* param2, unk32 param3) {
return param2;
}
void AutoloadCallback(void) {
}
void AutoloadCallback(void) {}
void func_02000b60(void) {
}
void func_02000b60(void) {}
BuildInfo gBuildInfo = {
.mUnk_00 = data_0204cde0,
@@ -125,10 +123,8 @@ BuildInfo gBuildInfo = {
.mUnk_1C = 0x04027539,
.mUnk_20 = 0xDEC00621,
"\xDE\xC0\x06![SDK+NINTENDO:BACKUP]",
"[SDK+MEI:libASR_V1.0.5-CW2.0-SDK4.0]"
"[SDK+MEI:libASR_V1.0.5-CW2.0-SDK4.0]",
};
// non-matching
void main(void) {
data_02049a2c->func_02013394();
}
void main(void) { data_02049a2c->func_02013394(); }
src/Main/System/OverlayManager.cpp
+91
View File
@@ -0,0 +1,91 @@
#include "System/OverlayManager.hpp"
#include "global.h"
#include "nitro/Overlay.h"
struct UnkStruct_020ee698 {
/* 00 */ unk8 mUnk_00[0x2C];
/* 2c */ unk32 mUnk_2c;
/* 30 */
};
extern UnkStruct_020ee698 data_ov000_020ee698;
struct OverlaySetup {
/* 00 */ unk8 mUnk_00;
/* 01 */ unk8 mUnk_01;
/* 02 */ unk8 mUnk_02;
/* 03 */ unk8 mUnk_03;
/* 04 */ OverlayId slot1Overlay;
/* 08 */ OverlayId slot2Overlay;
/* 0c */ OverlayId slot3Overlay;
/* 10 */ OverlayId slot12Overlay;
/* 14 */ void* mUnk_14;
/* 18 */ void* mUnk_18;
/* 1c */
};
extern OverlaySetup gOverlaySetups[];
extern u32* data_027e0ce0[];
extern u32 data_0203e0e8[]; // seems to contain overlay IDs
extern "C" void func_ov007_02102850(u32**);
extern "C" void func_ov007_021028a0(u32**);
THUMB void OverlayManager::LoadIfNotLoaded(OverlayIndex index, OverlayId id) {
OverlayId loadedId = gOverlayManager.mLoadedOverlays[index];
if (id != loadedId) {
this->Unload(index);
this->Load(index, id);
}
}
THUMB void OverlayManager::Load(OverlayIndex index, OverlayId id) {
if (id != OverlayId_None) {
Overlay_Load(NULL, data_0203e0e8[id]);
}
gOverlayManager.mLoadedOverlays[index] = id;
}
THUMB void OverlayManager::Unload(OverlayIndex index) {
OverlayId loadedId = gOverlayManager.mLoadedOverlays[index];
if (loadedId != OverlayId_None) {
Overlay_Unload(NULL, data_0203e0e8[index]);
gOverlayManager.mLoadedOverlays[index] = OverlayId_None;
}
}
//! TODO: solve the .word issue with the overlay IDs
//! both functions should match otherwise
THUMB void OverlayManager::LoadOverlaySetup(s32 index) {
OverlayId overlayId;
OverlaySetup* pSetup;
pSetup = &gOverlaySetups[index];
this->LoadIfNotLoaded(OverlayIndex_1, pSetup->slot1Overlay);
this->LoadIfNotLoaded(OverlayIndex_2, pSetup->slot2Overlay);
if (index == 5) {
func_ov007_02102850(data_027e0ce0);
} else {
overlayId = pSetup->slot12Overlay;
if (index == 6 && data_ov000_020ee698.mUnk_2c == 2) {
overlayId = OverlayId_61;
}
this->Load(OverlayIndex_3, pSetup->slot3Overlay);
this->Load(OverlayIndex_12, overlayId);
}
}
THUMB void OverlayManager::UnloadOverlaySetup() {
this->Unload(OverlayIndex_12);
this->Unload(OverlayIndex_3);
if (this->mLoadedOverlays[2] == OverlayId_07) {
func_ov007_021028a0(data_027e0ce0);
this->Unload(OverlayIndex_2);
}
}