Some sbss

This commit is contained in:
robojumper 2024-11-24 20:59:00 +01:00
parent e5a20e19c6
commit e9cbe49c1e
4 changed files with 27 additions and 2 deletions

View File

@ -425,6 +425,7 @@ d/lyt/d_lyt_map.cpp:
.ctors start:0x804DB76C end:0x804DB770 .ctors start:0x804DB76C end:0x804DB770
.rodata start:0x804E76A0 end:0x804E7F50 .rodata start:0x804E76A0 end:0x804E7F50
.data start:0x8051EAE0 end:0x805225E8 .data start:0x8051EAE0 end:0x805225E8
.sbss start:0x805754A8 end:0x805754B8
.sdata2 start:0x80579F40 end:0x80579FB8 .sdata2 start:0x80579F40 end:0x80579FB8
.bss start:0x805AF470 end:0x805B0830 .bss start:0x805AF470 end:0x805B0830
@ -443,6 +444,7 @@ d/lyt/d_lyt_battery.cpp:
.rodata start:0x804E7F80 end:0x804E7FA0 .rodata start:0x804E7F80 end:0x804E7FA0
.data start:0x80522820 end:0x80522B00 .data start:0x80522820 end:0x80522B00
.sdata start:0x80572870 end:0x80572878 .sdata start:0x80572870 end:0x80572878
.sbss start:0x805754B8 end:0x805754C0
.sdata2 start:0x80579FC8 end:0x80579FD0 .sdata2 start:0x80579FC8 end:0x80579FD0
.bss start:0x805B0930 end:0x805B0A70 .bss start:0x805B0930 end:0x805B0A70
@ -452,20 +454,24 @@ d/lyt/d_lyt_area_caption.cpp:
.rodata start:0x804E7FA0 end:0x804E7FE0 .rodata start:0x804E7FA0 end:0x804E7FE0
.data start:0x80522B00 end:0x80522E80 .data start:0x80522B00 end:0x80522E80
.sdata start:0x80572878 end:0x80572880 .sdata start:0x80572878 end:0x80572880
.sbss start:0x805754C0 end:0x805754C8
.bss start:0x805B0A70 end:0x805B0B30 .bss start:0x805B0A70 end:0x805B0B30
d/lyt/d_lyt_wipe.cpp: d/lyt/d_lyt_wipe.cpp:
.text start:0x8014C6C0 end:0x8014E008 .text start:0x8014C6C0 end:0x8014E008
.ctors start:0x804DB77C end:0x804DB780 .ctors start:0x804DB77C end:0x804DB780
.sbss start:0x805754C8 end:0x805754D0
d/lyt/d_lyt_help.cpp: d/lyt/d_lyt_help.cpp:
.text start:0x8014E010 end:0x80150428 .text start:0x8014E010 end:0x80150428
.ctors start:0x804DB780 end:0x804DB784 .ctors start:0x804DB780 end:0x804DB784
.sbss start:0x805754D0 end:0x805754D8
d/lyt/d_lyt_bird_gauge.cpp: d/lyt/d_lyt_bird_gauge.cpp:
.text start:0x80152FD0 end:0x801548D8 .text start:0x80152FD0 end:0x801548D8
.ctors start:0x804DB784 end:0x804DB788 .ctors start:0x804DB784 end:0x804DB788
.data start:0x80524020 end:0x80524510 .data start:0x80524020 end:0x80524510
.sbss start:0x805754E0 end:0x805754E8
d/lyt/d_lyt_sky_gauge.cpp: d/lyt/d_lyt_sky_gauge.cpp:
.text start:0x801548E0 end:0x80155CC8 .text start:0x801548E0 end:0x80155CC8

View File

@ -130,7 +130,15 @@ private:
class dLytMapFloorBtnMgr_c : public d2d::dSubPane { class dLytMapFloorBtnMgr_c : public d2d::dSubPane {
public: public:
dLytMapFloorBtnMgr_c(void *arg) : field_0x008(arg), mStateMgr(*this, sStateID::null) {} dLytMapFloorBtnMgr_c(void *arg) : field_0x008(arg), field_0x51C(nullptr), mStateMgr(*this, sStateID::null) {
field_0x700 = 1;
field_0x704 = 0;
field_0x708 = 0;
field_0x70C = 4;
field_0x710 = 0;
field_0x711 = 0;
field_0x712 = 0;
}
virtual ~dLytMapFloorBtnMgr_c(); virtual ~dLytMapFloorBtnMgr_c();
virtual bool build(d2d::ResAccIf_c *resAcc) override; virtual bool build(d2d::ResAccIf_c *resAcc) override;
@ -155,9 +163,16 @@ private:
/* 0x048 */ d2d::dLytSub mLyt; /* 0x048 */ d2d::dLytSub mLyt;
/* 0x0DC */ d2d::AnmGroup_c mAnmGroups[1]; /* 0x0DC */ d2d::AnmGroup_c mAnmGroups[1];
/* 0x11C */ LytMapFourAnimGroups mMoreGroups[4]; /* 0x11C */ LytMapFourAnimGroups mMoreGroups[4];
/* 0x51C */ u8 field_0x51C[0x520 - 0x51C]; /* 0x51C */ void *field_0x51C;
/* 0x520 */ d2d::dLytStructD mStructDs[4]; /* 0x520 */ d2d::dLytStructD mStructDs[4];
/* 0x5C0 */ dLytMapFloorBtn_c mFloorBtns[4]; /* 0x5C0 */ dLytMapFloorBtn_c mFloorBtns[4];
/* 0x700 */ UNKWORD field_0x700;
/* 0x704 */ UNKWORD field_0x704;
/* 0x708 */ UNKWORD field_0x708;
/* 0x70C */ UNKWORD field_0x70C;
/* 0x710 */ u8 field_0x710;
/* 0x711 */ u8 field_0x711;
/* 0x712 */ u8 field_0x712;
}; };
// Size 0x4C // Size 0x4C

View File

@ -28,6 +28,8 @@ static const char *captionBoxes[] = {
"T_captionS_01", "T_captionS_01",
}; };
dLytAreaCaption_c *dLytAreaCaption_c::sInstance;
bool dLytAreaCaptionParts_c::init(int first) { bool dLytAreaCaptionParts_c::init(int first) {
void *data = LayoutArcManager::sInstance->getLoadedData("DoButton"); void *data = LayoutArcManager::sInstance->getLoadedData("DoButton");
mResAcc.attach(data, ""); mResAcc.attach(data, "");

View File

@ -17,6 +17,8 @@ static const d2d::LytBrlanMapping brlanMap[] = {
{ "denchi_00_out.brlan", "G_inOut_00"}, { "denchi_00_out.brlan", "G_inOut_00"},
}; };
dLytBattery_c *dLytBattery_c::sInstance;
#define LYT_BATTERY_ANIM_IN 0 #define LYT_BATTERY_ANIM_IN 0
#define LYT_BATTERY_ANIM_NONE 1 #define LYT_BATTERY_ANIM_NONE 1
#define LYT_BATTERY_ANIM_LOOP 2 #define LYT_BATTERY_ANIM_LOOP 2