mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-08 10:03:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

moved strings + decompile simple store functions

Browse Source
This commit is contained in:
Julgodis
2021-04-10 07:02:38 +02:00
parent 2661db6aaa
commit 0ad6ebe7b4
1299 changed files with 51830 additions and 43634 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/map/d_map.cpp
+21 -15
View File
@@ -386,7 +386,7 @@ SECTION_RODATA static u8 const l_iconSize[68] = {
0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A,
0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A,
};
COMPILER_STRIP_GATE(80378E48, &l_iconSize);
COMPILER_STRIP_GATE(0x80378E48, &l_iconSize);
/* 800284BC-800284D0 022DFC 0014+00 2/0 0/0 0/0 .text getIconSize__15renderingAmap_cCFUc
*/
@@ -654,7 +654,7 @@ SECTION_RODATA static u8 const l_dungeon_offColor[36] = {
0x04, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00,
0x1C, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80378E8C, &l_dungeon_offColor);
COMPILER_STRIP_GATE(0x80378E8C, &l_dungeon_offColor);
#pragma pop
/* 80378EB0-80378ED4 005510 0024+00 0/1 0/0 0/0 .rodata l_dungeon_onColor$3938 */
@@ -665,7 +665,7 @@ SECTION_RODATA static u8 const l_dungeon_onColor[36] = {
0x04, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00,
0x3C, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80378EB0, &l_dungeon_onColor);
COMPILER_STRIP_GATE(0x80378EB0, &l_dungeon_onColor);
#pragma pop
/* 80378ED4-80378EF8 005534 0024+00 0/1 0/0 0/0 .rodata l_dungeon_stayColor$3939 */
@@ -676,7 +676,7 @@ SECTION_RODATA static u8 const l_dungeon_stayColor[36] = {
0x04, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00,
0x5C, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80378ED4, &l_dungeon_stayColor);
COMPILER_STRIP_GATE(0x80378ED4, &l_dungeon_stayColor);
#pragma pop
/* 80028DF4-80028EE4 023734 00F0+00 1/0 0/0 0/0 .text getColor__6dMap_cFi */
@@ -735,7 +735,7 @@ asm void renderingAmap_c::getLineColor(int param_0, int param_1) {
SECTION_RODATA static u8 const colorTable[16] = {
0xBC, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0xC4, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80378EF8, &colorTable);
COMPILER_STRIP_GATE(0x80378EF8, &colorTable);
/* 80028FB4-80029038 0238F4 0084+00 2/0 0/0 0/0 .text getDecoLineColor__15renderingAmap_cFii */
#pragma push
@@ -823,7 +823,7 @@ SECTION_RODATA static u8 const l_stayType[28] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80378F08, &l_stayType);
COMPILER_STRIP_GATE(0x80378F08, &l_stayType);
/* 80029160-80029190 023AA0 0030+00 7/7 0/0 0/0 .text getStayType__15renderingAmap_cCFv
*/
@@ -930,6 +930,12 @@ asm void dMap_c::resCopy() {
#pragma pop
/* ############################################################################################## */
/* 80378F24-80378F24 005584 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80378F24 = "Always";
#pragma pop
/* 803A6F6C-803A6F88 -00001 001C+00 1/1 0/0 0/0 .data @4694 */
SECTION_DATA static void* lit_4694[7] = {
(void*)(((char*)_move__6dMap_cFffif) + 0x350), (void*)(((char*)_move__6dMap_cFffif) + 0x388),
@@ -1190,6 +1196,14 @@ asm void dMap_c::isDrawRoomIcon(int param_0, int param_1) const {
#pragma pop
/* ############################################################################################## */
/* 80378F24-80378F24 005584 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80378F2B = "F_SP121";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80378F33 = "\0\0\0\0";
#pragma pop
/* 80451CEC-80451CF0 0002EC 0004+00 1/1 0/0 0/0 .sdata2 @4688 */
SECTION_SDATA2 static f32 lit_4688 = -3710.0f;
@@ -1425,12 +1439,4 @@ asm renderingDAmap_c::~renderingDAmap_c() {
}
#pragma pop
/* 80378F24-80378F38 005584 000F+05 2/2 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80378F24 = "Always";
SECTION_DEAD static char const* const stringBase_80378F2B = "F_SP121";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80378F33 = "\0\0\0\0";
#pragma pop
/* 80378F24-80378F24 005584 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/map/d_map_path.cpp
+11 -10
View File
@@ -179,7 +179,15 @@ SECTION_RODATA static u8 const data[28] = {
0x00, 0x00, 0x00, 0x4F, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x4D, 0x00, 0x00,
0x00, 0x4E, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x00, 0x00, 0x51, 0x00, 0x00, 0x00, 0x52,
};
COMPILER_STRIP_GATE(80379C30, &data);
COMPILER_STRIP_GATE(0x80379C30, &data);
/* 80379C4C-80379C4C 0062AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379C4C = "Always";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80379C53 = "\0\0\0\0";
#pragma pop
/* 8003C85C-8003C8F4 03719C 0098+00 0/0 1/1 0/0 .text create__Q28dMpath_n18dTexObjAggregate_cFv */
#pragma push
@@ -415,7 +423,7 @@ asm void __sinit_d_map_path_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_8003D6E4 = (void*)__sinit_d_map_path_cpp;
REGISTER_CTORS(0x8003D6E4, __sinit_d_map_path_cpp);
#pragma pop
/* 8003D740-8003D790 038080 0050+00 1/1 0/0 0/0 .text __dt__Q28dMpath_n18dTexObjAggregate_cFv */
@@ -479,11 +487,4 @@ SECTION_DATA extern void* __vt__11dDrawPath_c[16] = {
(void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class,
};
/* 80379C4C-80379C58 0062AC 0007+05 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80379C4C = "Always";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80379C53 = "\0\0\0\0";
#pragma pop
/* 80379C4C-80379C4C 0062AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/map/d_map_path_dmap.cpp
+14 -13
View File
@@ -24,8 +24,6 @@ struct renderingPlusDoor_c {
/* 8004145C */ void beforeDrawPath();
};
struct Vec {};
struct dTres_c {
struct data_s {};
@@ -38,6 +36,8 @@ struct dTres_c {
static u8 mTypeGroupListAll[204 + 4 /* padding */];
};
struct Vec {};
struct renderingPlusDoorAndCursor_c {
/* 8002B008 */ ~renderingPlusDoorAndCursor_c();
/* 800402FC */ void afterDrawPath();
@@ -641,15 +641,12 @@ u8 dMpath_c::isExistMapPathData() {
/* 80450630-80450634 0000B0 0004+00 0/0 1/1 2/2 .sdata mNextRoomNo__10dMapInfo_c */
SECTION_SDATA u32 dMapInfo_c::mNextRoomNo = 0xFFFFFFFF;
/* 80450634-80450638 -00001 0004+00 4/4 0/0 0/0 .sdata None */
SECTION_SDATA static u8 struct_80450634[4] = {
/* 80450634-80450636 -00001 0002+00 3/3 0/0 0/0 .sdata None */
SECTION_SDATA static u8 struct_80450634[2] = {
/* 80450634 0001+00 data_80450634 None */
0x7F,
/* 80450635 0001+00 data_80450635 None */
0x80,
/* 80450636 0002+00 data_80450636 None */
0x01,
0x00,
};
/* 8003F760-8003F7E8 03A0A0 0088+00 0/0 1/1 0/0 .text getTopBottomFloorNo__8dMpath_cFPScPSc */
@@ -703,6 +700,10 @@ asm void dMpath_c::create() {
}
#pragma pop
/* ############################################################################################## */
/* 80450636-80450638 0000B6 0002+00 2/2 0/0 0/0 .sdata None */
SECTION_SDATA static u16 data_80450636 = 0x0100;
/* 8003FBD0-8003FC70 03A510 00A0+00 2/2 0/0 0/0 .text reset__8dMpath_cFv */
#pragma push
#pragma optimization_level 0
@@ -1031,7 +1032,7 @@ SECTION_RODATA static u8 const l_100x100BoxVertexList[48] = {
0xC2, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80379C58, &l_100x100BoxVertexList);
COMPILER_STRIP_GATE(0x80379C58, &l_100x100BoxVertexList);
/* 80451E70-80451E74 000470 0004+00 1/1 0/0 0/0 .sdata2 @4484 */
SECTION_SDATA2 static f32 lit_4484 = 6.0f;
@@ -1135,7 +1136,7 @@ SECTION_RODATA static void* const l_treasureDispList_4524[12] = {
(void*)NULL, (void*)0x00000001, (void*)&l_treasureStartColor,
(void*)0x05000000, (void*)0x00000003, (void*)&l_destinationStartColor,
};
COMPILER_STRIP_GATE(80379C88, &l_treasureDispList_4524);
COMPILER_STRIP_GATE(0x80379C88, &l_treasureDispList_4524);
/* 80451E74-80451E78 000474 0004+00 1/0 0/0 0/0 .sdata2 l_entranceStartColor */
SECTION_SDATA2 static u32 l_entranceStartColor = 0x94000000;
@@ -1227,7 +1228,7 @@ SECTION_RODATA static void* const l_treasureDispList_4606[33] = {
(void*)0x04000000, (void*)0x00000004, (void*)&l_smallKeyStartColor,
(void*)0x03000000, (void*)0x00000004, (void*)&l_bossStartColor,
};
COMPILER_STRIP_GATE(80379CB8, &l_treasureDispList_4606);
COMPILER_STRIP_GATE(0x80379CB8, &l_treasureDispList_4606);
/* 80451EAC-80451EB4 0004AC 0008+00 1/1 0/0 0/0 .sdata2 l_iconTex0$4605 */
SECTION_SDATA2 static u8 l_iconTex0_4605[8] = {
@@ -1259,7 +1260,7 @@ SECTION_RODATA static u8 const l_iconPosData[32] = {
0xC2, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00,
0x42, 0x48, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80379D3C, &l_iconPosData);
COMPILER_STRIP_GATE(0x80379D3C, &l_iconPosData);
/* 80041208-800412C0 03BB48 00B8+00 2/2 0/0 0/0 .text
* drawIconSingle__28renderingPlusDoorAndCursor_cFRC3Vecff */
@@ -1280,7 +1281,7 @@ SECTION_RODATA static u8 const l_offset[36] = {
0xC3, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x70, 0x00, 0x00,
0x43, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x70, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80379D5C, &l_offset);
COMPILER_STRIP_GATE(0x80379D5C, &l_offset);
/* 80450638-80450640 0000B8 0004+04 1/1 0/0 0/0 .sdata l_cursorColor$4709 */
SECTION_SDATA static u8 l_cursorColor[4 + 4 /* padding */] = {
@@ -1331,7 +1332,7 @@ asm void __sinit_d_map_path_dmap_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_80041460 = (void*)__sinit_d_map_path_dmap_cpp;
REGISTER_CTORS(0x80041460, __sinit_d_map_path_dmap_cpp);
#pragma pop
/* ############################################################################################## */