moved strings + decompile simple store functions

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
+86 -43
View File
@@ -15,16 +15,16 @@ struct mDoCPd_c {
static u8 m_cpadInfo[256];
};
struct jmessage_tControl {
/* 802299EC */ jmessage_tControl();
};
struct Vec {};
struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
};
struct jmessage_tControl {
/* 802299EC */ jmessage_tControl();
};
struct jmessage_tReference {
/* 80228B04 */ jmessage_tReference();
/* 80228CB4 */ ~jmessage_tReference();
@@ -124,16 +124,16 @@ struct jmessage_string_tControl {
/* 802328DC */ ~jmessage_string_tControl();
};
struct COutFont_c {
/* 80226CF8 */ void initialize();
};
struct J2DTextBox {
/* 80300658 */ void getStringPtr() const;
};
struct JUTFont {};
struct COutFont_c {
/* 80226CF8 */ void initialize();
};
struct jmessage_string_tReference {
/* 8022F8C0 */ jmessage_string_tReference();
/* 8022F94C */ ~jmessage_string_tReference();
@@ -728,7 +728,7 @@ SECTION_RODATA static u8 const colorTable_3861[36] = {
0xA0, 0xB4, 0xDC, 0xFF, 0xDC, 0xDC, 0x82, 0xFF, 0xB4, 0xC8, 0xE6, 0xFF,
0xC8, 0xA0, 0xDC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xAA, 0x78, 0xFF,
};
COMPILER_STRIP_GATE(803995C8, &colorTable_3861);
COMPILER_STRIP_GATE(0x803995C8, &colorTable_3861);
/* 802288FC-802289A8 22323C 00AC+00 2/2 0/0 0/0 .text getFontCCColorTable__FUcUc */
#pragma push
@@ -747,7 +747,7 @@ SECTION_RODATA static u8 const colorTable_3877[36] = {
0xA0, 0xB4, 0xDC, 0xFF, 0xDC, 0xDC, 0x82, 0xFF, 0xB4, 0xC8, 0xE6, 0xFF,
0xC8, 0xA0, 0xDC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xAA, 0x78, 0xFF,
};
COMPILER_STRIP_GATE(803995EC, &colorTable_3877);
COMPILER_STRIP_GATE(0x803995EC, &colorTable_3877);
/* 802289A8-80228A54 2232E8 00AC+00 2/2 0/0 0/0 .text getFontGCColorTable__FUcUc */
#pragma push
@@ -2017,6 +2017,14 @@ asm void jmessage_tMeasureProcessor::do_character(int param_0) {
#pragma pop
/* ############################################################################################## */
/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80399610 = "'";
SECTION_DEAD static char const* const stringBase_80399612 = "s";
SECTION_DEAD static char const* const stringBase_80399614 = "%d";
#pragma pop
/* 80454A7C-80454A80 00307C 0004+00 5/5 0/0 0/0 .sdata2 @5151 */
SECTION_SDATA2 static f32 lit_5151 = 100.0f;
@@ -2269,6 +2277,13 @@ void jmessage_tRenderingProcessor::do_reset() {
/* empty function */
}
/* ############################################################################################## */
/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80399617 = "";
#pragma pop
/* 8022CDCC-8022CFD8 22770C 020C+00 1/0 0/0 0/0 .text
* do_begin__28jmessage_tRenderingProcessorFPCvPCc */
#pragma push
@@ -2327,6 +2342,15 @@ asm void jmessage_tRenderingProcessor::resetRendering() {
}
#pragma pop
/* ############################################################################################## */
/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80399618 = ""
"\x1B"
"CR[%d]";
#pragma pop
/* 8022E17C-8022E260 228ABC 00E4+00 2/2 0/0 0/0 .text
* do_widthcenter__28jmessage_tRenderingProcessorFv */
#pragma push
@@ -2349,6 +2373,15 @@ asm void jmessage_tRenderingProcessor::do_selwidthcenter(int param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80399620 = ""
"\x1B"
"CD[%d]";
#pragma pop
/* 8022E318-8022E7CC 228C58 04B4+00 3/2 0/0 0/0 .text
* do_heightcenter__28jmessage_tRenderingProcessorFv */
#pragma push
@@ -2360,6 +2393,17 @@ asm void jmessage_tRenderingProcessor::do_heightcenter() {
}
#pragma pop
/* ############################################################################################## */
/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80399628 = ""
"\x1B"
"CC[%08x]"
"\x1B"
"GC[%08x]";
#pragma pop
/* 8022E7CC-8022E860 22910C 0094+00 2/2 0/0 0/0 .text do_color__28jmessage_tRenderingProcessorFUc
*/
#pragma push
@@ -2371,6 +2415,17 @@ asm void jmessage_tRenderingProcessor::do_color(u8 param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039963B = ""
"\x1B"
"FX[%d]"
"\x1B"
"FY[%d]";
#pragma pop
/* 8022E860-8022E960 2291A0 0100+00 2/2 0/0 0/0 .text do_scale__28jmessage_tRenderingProcessorFf
*/
#pragma push
@@ -2393,6 +2448,15 @@ asm void jmessage_tRenderingProcessor::do_linedown(s16 param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039964A = ""
"\x1B"
"CU[%d]";
#pragma pop
/* 8022E9C0-8022EAE4 229300 0124+00 1/1 0/0 0/0 .text do_transY__28jmessage_tRenderingProcessorFsb
*/
#pragma push
@@ -2464,6 +2528,17 @@ asm void jmessage_tRenderingProcessor::do_rubyset(void const* param_0, u32 param
}
#pragma pop
/* ############################################################################################## */
/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80399652 = ""
"\x1B"
"CL[%d]";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039965A = "\0\0\0\0\0";
#pragma pop
/* 8022F384-8022F53C 229CC4 01B8+00 3/3 0/0 0/0 .text
* do_rubystrcat__28jmessage_tRenderingProcessorFPcPcff */
#pragma push
@@ -3063,36 +3138,4 @@ asm void jmessage_tReference::getActorPos() {
}
#pragma pop
/* 80399610-80399660 025C70 004A+06 22/22 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80399610 = "'";
SECTION_DEAD static char const* const stringBase_80399612 = "s";
SECTION_DEAD static char const* const stringBase_80399614 = "%d";
SECTION_DEAD static char const* const stringBase_80399617 = "";
SECTION_DEAD static char const* const stringBase_80399618 = ""
"\x1B"
"CR[%d]";
SECTION_DEAD static char const* const stringBase_80399620 = ""
"\x1B"
"CD[%d]";
SECTION_DEAD static char const* const stringBase_80399628 = ""
"\x1B"
"CC[%08x]"
"\x1B"
"GC[%08x]";
SECTION_DEAD static char const* const stringBase_8039963B = ""
"\x1B"
"FX[%d]"
"\x1B"
"FY[%d]";
SECTION_DEAD static char const* const stringBase_8039964A = ""
"\x1B"
"CU[%d]";
SECTION_DEAD static char const* const stringBase_80399652 = ""
"\x1B"
"CL[%d]";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039965A = "\0\0\0\0\0";
#pragma pop
/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
+27 -13
View File
@@ -417,7 +417,7 @@ extern "C" void event039__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c();
extern "C" void event040__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c();
extern "C" void event041__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c();
extern "C" bool event042__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c();
extern "C" void func_8024DAB0(s32*);
extern "C" void func_8024DAB0(void* _this, s32*);
extern "C" void __sinit_d_msg_flow_cpp();
extern "C" extern char const* const d_msg_d_msg_flow__stringBase0;
extern "C" u8 mQueryList__10dMsgFlow_c[636];
@@ -1743,6 +1743,14 @@ asm dMsgFlow_c::~dMsgFlow_c() {
}
#pragma pop
/* ############################################################################################## */
/* 80399CB0-80399CB0 026310 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80399CB0 = "FLW1";
SECTION_DEAD static char const* const stringBase_80399CB5 = "FLI1";
#pragma pop
/* 80249F90-8024A13C 2448D0 01AC+00 0/0 10/10 86/86 .text
* init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c */
#pragma push
@@ -1897,6 +1905,14 @@ asm void dMsgFlow_c::setNodeIndex(u16 param_0, fopAc_ac_c** param_1) {
}
#pragma pop
/* ############################################################################################## */
/* 80399CB0-80399CB0 026310 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80399CBA = "";
SECTION_DEAD static char const* const stringBase_80399CBB = "INF1";
#pragma pop
/* 8024A95C-8024AA50 24529C 00F4+00 1/1 0/0 0/0 .text
* setSelectMsg__10dMsgFlow_cFP14mesg_flow_nodeP14mesg_flow_nodeP10fopAc_ac_c */
#pragma push
@@ -2458,6 +2474,13 @@ asm void dMsgFlow_c::query041(mesg_flow_node_branch* param_0, fopAc_ac_c* param_
}
#pragma pop
/* ############################################################################################## */
/* 80399CB0-80399CB0 026310 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80399CC0 = "F_SP116";
#pragma pop
/* 8024BFEC-8024C0A8 24692C 00BC+00 1/0 0/0 0/0 .text
* query042__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
#pragma push
@@ -3059,7 +3082,7 @@ bool dMsgFlow_c::event042(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8024DAB0(s32* param_0) {
extern "C" asm void func_8024DAB0(void* _this, s32* param_0) {
nofralloc
#include "asm/d/msg/d_msg_flow/func_8024DAB0.s"
}
@@ -3077,16 +3100,7 @@ asm void __sinit_d_msg_flow_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_8024DACC = (void*)__sinit_d_msg_flow_cpp;
REGISTER_CTORS(0x8024DACC, __sinit_d_msg_flow_cpp);
#pragma pop
/* 80399CB0-80399CC8 026310 0018+00 5/5 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80399CB0 = "FLW1";
SECTION_DEAD static char const* const stringBase_80399CB5 = "FLI1";
SECTION_DEAD static char const* const stringBase_80399CBA = "";
SECTION_DEAD static char const* const stringBase_80399CBB = "INF1";
SECTION_DEAD static char const* const stringBase_80399CC0 = "F_SP116";
#pragma pop
/* 80399CB0-80399CB0 026310 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
+45 -54
View File
@@ -13,14 +13,14 @@
struct msg_class {};
struct JKRArchive {
struct EMountMode {};
};
struct JKRHeap {
/* 802CE784 */ void getTotalFreeSize();
};
struct JKRArchive {
struct EMountMode {};
};
struct mDoDvdThd_mountXArchive_c {
/* 800161E0 */ void create(char const*, u8, JKRArchive::EMountMode, JKRHeap*);
};
@@ -96,10 +96,10 @@ struct dMsgString_c {
/* 80249D28 */ ~dMsgString_c();
};
struct JKRExpHeap {};
struct JUTFont {};
struct JKRExpHeap {};
struct dMsgScrnTree_c {
/* 80248954 */ dMsgScrnTree_c(JUTFont*, JKRExpHeap*);
};
@@ -154,12 +154,12 @@ struct dMsgScrnBase_c {
/* 8023C3EC */ void setRubyString(char*);
};
struct J2DTextBox {};
struct COutFont_c {
/* 80225C94 */ COutFont_c(u8);
};
struct J2DTextBox {};
struct dMsgObject_c {
/* 80233284 */ void _create(msg_class*);
/* 80233590 */ void _execute();
@@ -407,7 +407,7 @@ struct TNodeLinkList {
// Forward References:
//
extern "C" void dMsgObject_getGroupID__Fv();
extern "C" s32 dMsgObject_getGroupID__Fv();
extern "C" static void dMsgObject_searchSSItem__FPvPv();
extern "C" void __ct__20dMsgObject_HowlHIO_cFv();
extern "C" void __ct__16dMsgObject_HIO_cFv();
@@ -695,18 +695,13 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
/* ############################################################################################## */
/* 804510C8-804510D0 0005C8 0002+06 5/5 0/0 0/0 .sbss s_groupID */
/* 804510C8-804510D0 0005C8 0002+06 5/4 0/0 0/0 .sbss s_groupID */
static u8 s_groupID[2 + 6 /* padding */];
/* 80232A3C-80232A44 22D37C 0008+00 0/0 1/1 0/0 .text dMsgObject_getGroupID__Fv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMsgObject_getGroupID() {
nofralloc
#include "asm/d/msg/d_msg_object/dMsgObject_getGroupID__Fv.s"
/* 80232A3C-80232A44 -00001 0008+00 0/0 0/0 0/0 .text dMsgObject_getGroupID__Fv */
s32 dMsgObject_getGroupID() {
return (s32) * (s16*)(&s_groupID);
}
#pragma pop
/* 80232A44-80232AEC 22D384 00A8+00 1/1 0/0 0/0 .text dMsgObject_searchSSItem__FPvPv */
#pragma push
@@ -937,6 +932,22 @@ asm void dMsgObject_c::_create(msg_class* param_0) {
#pragma pop
/* ############################################################################################## */
/* 80399660-80399660 025CC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80399660 = "zel_00.bmg";
SECTION_DEAD static char const* const stringBase_8039966B = "zel_01.bmg";
SECTION_DEAD static char const* const stringBase_80399676 = "zel_02.bmg";
SECTION_DEAD static char const* const stringBase_80399681 = "zel_03.bmg";
SECTION_DEAD static char const* const stringBase_8039968C = "zel_04.bmg";
SECTION_DEAD static char const* const stringBase_80399697 = "zel_05.bmg";
SECTION_DEAD static char const* const stringBase_803996A2 = "zel_06.bmg";
SECTION_DEAD static char const* const stringBase_803996AD = "zel_07.bmg";
SECTION_DEAD static char const* const stringBase_803996B8 = "zel_08.bmg";
SECTION_DEAD static char const* const stringBase_803996C3 = "zel_99.bmg";
SECTION_DEAD static char const* const stringBase_803996CE = "";
#pragma pop
/* 80430280-8043028C 05CFA0 000C+00 1/1 0/0 0/0 .bss @4011 */
static u8 lit_4011[12];
@@ -1253,6 +1264,14 @@ asm void dMsgObject_c::isSend() {
#pragma pop
/* ############################################################################################## */
/* 80399660-80399660 025CC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803996CF = "/res/Msgus/bmgres%d.arc";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803996E7 = "";
#pragma pop
/* 8043069C-804306B8 05D3BC 0016+06 1/1 0/0 0/0 .bss arcName$6106 */
static u8 arcName[22 + 6 /* padding */];
@@ -1658,15 +1677,10 @@ asm void dMsgObject_c::setShopWaitTimer(u8 param_0) {
}
#pragma pop
/* 802378CC-802378D4 23220C 0008+00 1/1 0/0 0/0 .text setSelectWordFlagLocal__12dMsgObject_cFUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMsgObject_c::setSelectWordFlagLocal(u8 param_0) {
nofralloc
#include "asm/d/msg/d_msg_object/setSelectWordFlagLocal__12dMsgObject_cFUc.s"
/* 802378CC-802378D4 -00001 0008+00 0/0 0/0 0/0 .text setSelectWordFlagLocal__12dMsgObject_cFUc */
void dMsgObject_c::setSelectWordFlagLocal(u8 param_0) {
*(u8*)(((u8*)this) + 1222) /* this->field_0x4c6 */ = (u8)(param_0);
}
#pragma pop
/* 802378D4-80237934 232214 0060+00 1/1 0/0 0/0 .text isHowlHearingModeLocal__12dMsgObject_cFv */
#pragma push
@@ -1897,16 +1911,11 @@ asm void dMsgObject_c::setSelectCursorPosLocal(u8 param_0) {
}
#pragma pop
/* 80237F10-80237F18 232850 0008+00 1/1 0/0 0/0 .text
/* 80237F10-80237F18 -00001 0008+00 0/0 0/0 0/0 .text
* setTalkActorLocal__12dMsgObject_cFP10fopAc_ac_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMsgObject_c::setTalkActorLocal(fopAc_ac_c* param_0) {
nofralloc
#include "asm/d/msg/d_msg_object/setTalkActorLocal__12dMsgObject_cFP10fopAc_ac_c.s"
void dMsgObject_c::setTalkActorLocal(fopAc_ac_c* param_0) {
*(u32*)(((u8*)this) + 312) /* this->field_0x138 */ = (u32)(param_0);
}
#pragma pop
/* 80237F18-80237F38 232858 0020+00 1/0 0/0 0/0 .text dMsgObject_Draw__FP12dMsgObject_c
*/
@@ -2534,7 +2543,7 @@ asm void __sinit_d_msg_object_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_80238B58 = (void*)__sinit_d_msg_object_cpp;
REGISTER_CTORS(0x80238B58, __sinit_d_msg_object_cpp);
#pragma pop
/* 80238B94-80238BDC 2334D4 0048+00 1/0 0/0 0/0 .text __dt__20dMsgObject_HowlHIO_cFv */
@@ -2629,22 +2638,4 @@ asm void jmessage_tReference::setActorPos(cXyz param_0) {
}
#pragma pop
/* 80399660-803996E8 025CC0 0087+01 4/4 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80399660 = "zel_00.bmg";
SECTION_DEAD static char const* const stringBase_8039966B = "zel_01.bmg";
SECTION_DEAD static char const* const stringBase_80399676 = "zel_02.bmg";
SECTION_DEAD static char const* const stringBase_80399681 = "zel_03.bmg";
SECTION_DEAD static char const* const stringBase_8039968C = "zel_04.bmg";
SECTION_DEAD static char const* const stringBase_80399697 = "zel_05.bmg";
SECTION_DEAD static char const* const stringBase_803996A2 = "zel_06.bmg";
SECTION_DEAD static char const* const stringBase_803996AD = "zel_07.bmg";
SECTION_DEAD static char const* const stringBase_803996B8 = "zel_08.bmg";
SECTION_DEAD static char const* const stringBase_803996C3 = "zel_99.bmg";
SECTION_DEAD static char const* const stringBase_803996CE = "";
SECTION_DEAD static char const* const stringBase_803996CF = "/res/Msgus/bmgres%d.arc";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803996E7 = "";
#pragma pop
/* 80399660-80399660 025CC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
+56 -55
View File
@@ -93,6 +93,61 @@ extern "C" extern u8 g_MsgObject_HIO_c[1040];
//
/* ############################################################################################## */
/* 80399350-80399350 0259B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80399350 = "font_07_02.bti";
SECTION_DEAD static char const* const stringBase_8039935F = "font_20.bti";
SECTION_DEAD static char const* const stringBase_8039936B = "font_21.bti";
SECTION_DEAD static char const* const stringBase_80399377 = "font_30.bti";
SECTION_DEAD static char const* const stringBase_80399383 = "font_31.bti";
SECTION_DEAD static char const* const stringBase_8039938F = "font_34.bti";
SECTION_DEAD static char const* const stringBase_8039939B = "font_00.bti";
SECTION_DEAD static char const* const stringBase_803993A7 = "font_01.bti";
SECTION_DEAD static char const* const stringBase_803993B3 = "font_09.bti";
SECTION_DEAD static char const* const stringBase_803993BF = "font_04.bti";
SECTION_DEAD static char const* const stringBase_803993CB = "font_05.bti";
SECTION_DEAD static char const* const stringBase_803993D7 = "font_02.bti";
SECTION_DEAD static char const* const stringBase_803993E3 = "font_03.bti";
SECTION_DEAD static char const* const stringBase_803993EF = "font_06.bti";
SECTION_DEAD static char const* const stringBase_803993FB = "font_08.bti";
SECTION_DEAD static char const* const stringBase_80399407 = "font_07_01.bti";
SECTION_DEAD static char const* const stringBase_80399416 = "font_10.bti";
SECTION_DEAD static char const* const stringBase_80399422 = "font_15.bti";
SECTION_DEAD static char const* const stringBase_8039942E = "font_12.bti";
SECTION_DEAD static char const* const stringBase_8039943A = "im_map_icon_portal_4ia_40_05.bti";
SECTION_DEAD static char const* const stringBase_8039945B = "font_16_backlight.bti";
SECTION_DEAD static char const* const stringBase_80399471 = "font_13.bti";
SECTION_DEAD static char const* const stringBase_8039947D = "font_14.bti";
SECTION_DEAD static char const* const stringBase_80399489 = "im_zelda_item_icon_rupy_13.bti";
SECTION_DEAD static char const* const stringBase_803994A8 = "";
SECTION_DEAD static char const* const stringBase_803994A9 = "st_bompoach_lv1.bti";
SECTION_DEAD static char const* const stringBase_803994BD = "font_46.bti";
SECTION_DEAD static char const* const stringBase_803994C9 = "font_47.bti";
SECTION_DEAD static char const* const stringBase_803994D5 = "font_35.bti";
SECTION_DEAD static char const* const stringBase_803994E1 = "font_36.bti";
SECTION_DEAD static char const* const stringBase_803994ED = "font_19.bti";
SECTION_DEAD static char const* const stringBase_803994F9 = "font_22.bti";
SECTION_DEAD static char const* const stringBase_80399505 = "font_23.bti";
SECTION_DEAD static char const* const stringBase_80399511 = "font_24.bti";
SECTION_DEAD static char const* const stringBase_8039951D = "font_25.bti";
SECTION_DEAD static char const* const stringBase_80399529 = "font_40.bti";
SECTION_DEAD static char const* const stringBase_80399535 = "font_39.bti";
SECTION_DEAD static char const* const stringBase_80399541 = "font_29.bti";
SECTION_DEAD static char const* const stringBase_8039954D = "font_28.bti";
SECTION_DEAD static char const* const stringBase_80399559 = "font_32.bti";
SECTION_DEAD static char const* const stringBase_80399565 = "font_33.bti";
SECTION_DEAD static char const* const stringBase_80399571 = "font_41.bti";
SECTION_DEAD static char const* const stringBase_8039957D = "font_42.bti";
SECTION_DEAD static char const* const stringBase_80399589 = "font_50.bti";
SECTION_DEAD static char const* const stringBase_80399595 = "font_49.bti";
SECTION_DEAD static char const* const stringBase_803995A1 = "font_51.bti";
SECTION_DEAD static char const* const stringBase_803995AD = "font_52.bti";
SECTION_DEAD static char const* const stringBase_803995B9 = "font_53.bti";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803995C5 = "\0\0";
#pragma pop
/* 803BFA90-803BFBA8 -00001 0118+00 1/1 0/0 0/0 .data @4395 */
SECTION_DATA static void* lit_4395[70] = {
(void*)(((char*)createPane__10COutFont_cFv) + 0xDC),
@@ -546,58 +601,4 @@ asm void COutFont_c::getBtiName(int param_0) {
}
#pragma pop
/* 80399350-803995C8 0259B0 0275+03 2/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80399350 = "font_07_02.bti";
SECTION_DEAD static char const* const stringBase_8039935F = "font_20.bti";
SECTION_DEAD static char const* const stringBase_8039936B = "font_21.bti";
SECTION_DEAD static char const* const stringBase_80399377 = "font_30.bti";
SECTION_DEAD static char const* const stringBase_80399383 = "font_31.bti";
SECTION_DEAD static char const* const stringBase_8039938F = "font_34.bti";
SECTION_DEAD static char const* const stringBase_8039939B = "font_00.bti";
SECTION_DEAD static char const* const stringBase_803993A7 = "font_01.bti";
SECTION_DEAD static char const* const stringBase_803993B3 = "font_09.bti";
SECTION_DEAD static char const* const stringBase_803993BF = "font_04.bti";
SECTION_DEAD static char const* const stringBase_803993CB = "font_05.bti";
SECTION_DEAD static char const* const stringBase_803993D7 = "font_02.bti";
SECTION_DEAD static char const* const stringBase_803993E3 = "font_03.bti";
SECTION_DEAD static char const* const stringBase_803993EF = "font_06.bti";
SECTION_DEAD static char const* const stringBase_803993FB = "font_08.bti";
SECTION_DEAD static char const* const stringBase_80399407 = "font_07_01.bti";
SECTION_DEAD static char const* const stringBase_80399416 = "font_10.bti";
SECTION_DEAD static char const* const stringBase_80399422 = "font_15.bti";
SECTION_DEAD static char const* const stringBase_8039942E = "font_12.bti";
SECTION_DEAD static char const* const stringBase_8039943A = "im_map_icon_portal_4ia_40_05.bti";
SECTION_DEAD static char const* const stringBase_8039945B = "font_16_backlight.bti";
SECTION_DEAD static char const* const stringBase_80399471 = "font_13.bti";
SECTION_DEAD static char const* const stringBase_8039947D = "font_14.bti";
SECTION_DEAD static char const* const stringBase_80399489 = "im_zelda_item_icon_rupy_13.bti";
SECTION_DEAD static char const* const stringBase_803994A8 = "";
SECTION_DEAD static char const* const stringBase_803994A9 = "st_bompoach_lv1.bti";
SECTION_DEAD static char const* const stringBase_803994BD = "font_46.bti";
SECTION_DEAD static char const* const stringBase_803994C9 = "font_47.bti";
SECTION_DEAD static char const* const stringBase_803994D5 = "font_35.bti";
SECTION_DEAD static char const* const stringBase_803994E1 = "font_36.bti";
SECTION_DEAD static char const* const stringBase_803994ED = "font_19.bti";
SECTION_DEAD static char const* const stringBase_803994F9 = "font_22.bti";
SECTION_DEAD static char const* const stringBase_80399505 = "font_23.bti";
SECTION_DEAD static char const* const stringBase_80399511 = "font_24.bti";
SECTION_DEAD static char const* const stringBase_8039951D = "font_25.bti";
SECTION_DEAD static char const* const stringBase_80399529 = "font_40.bti";
SECTION_DEAD static char const* const stringBase_80399535 = "font_39.bti";
SECTION_DEAD static char const* const stringBase_80399541 = "font_29.bti";
SECTION_DEAD static char const* const stringBase_8039954D = "font_28.bti";
SECTION_DEAD static char const* const stringBase_80399559 = "font_32.bti";
SECTION_DEAD static char const* const stringBase_80399565 = "font_33.bti";
SECTION_DEAD static char const* const stringBase_80399571 = "font_41.bti";
SECTION_DEAD static char const* const stringBase_8039957D = "font_42.bti";
SECTION_DEAD static char const* const stringBase_80399589 = "font_50.bti";
SECTION_DEAD static char const* const stringBase_80399595 = "font_49.bti";
SECTION_DEAD static char const* const stringBase_803995A1 = "font_51.bti";
SECTION_DEAD static char const* const stringBase_803995AD = "font_52.bti";
SECTION_DEAD static char const* const stringBase_803995B9 = "font_53.bti";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803995C5 = "\0\0";
#pragma pop
/* 80399350-80399350 0259B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
+4 -4
View File
@@ -11,14 +11,14 @@
// Types:
//
struct COutFont_c {
/* 80225C94 */ COutFont_c(u8);
};
struct J2DTextBox {};
struct JUTFont {};
struct COutFont_c {
/* 80225C94 */ COutFont_c(u8);
};
struct dMsgString_c {
/* 80191B6C */ void getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8);
/* 801E1D10 */ void getStringPage(u32, u8, u8, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*,
+13 -5
View File
@@ -15,12 +15,12 @@ struct jmessage_string_tControl {
/* 8022FB5C */ jmessage_string_tControl();
};
struct COutFont_c {};
struct J2DTextBox {};
struct JUTFont {};
struct COutFont_c {};
struct jmessage_string_tReference {
/* 8022F8C0 */ jmessage_string_tReference();
/* 8022F9AC */ void init(J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8);
@@ -191,6 +191,13 @@ asm dMsgStringBase_c::~dMsgStringBase_c() {
}
#pragma pop
/* ############################################################################################## */
/* 80399C98-80399C98 0262F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80399C98 = "zel_00.bmg";
#pragma pop
/* 80249700-80249768 244040 0068+00 1/1 2/2 0/0 .text getResource__16dMsgStringBase_cFv
*/
#pragma push
@@ -311,14 +318,15 @@ void dMsgStringBase_c::drawOutFontLocal(J2DTextBox* param_0, f32 param_1) {
/* empty function */
}
/* 80399C98-80399CB0 0262F8 0013+05 1/1 0/0 0/0 .rodata @stringBase0 */
/* ############################################################################################## */
/* 80399CA3-80399CB0 026303 0008+05 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80399C98 = "zel_00.bmg";
SECTION_DEAD static char const* const stringBase_80399CA3 = ""
"\x1B"
"CR[%d]";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80399CAB = "\0\0\0\0";
#pragma pop
/* 80399C98-80399C98 0262F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
+15 -14
View File
@@ -82,6 +82,19 @@ asm dMsgUnit_c::~dMsgUnit_c() {
#pragma pop
/* ############################################################################################## */
/* 803996E8-803996E8 025D48 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803996E8 = "%d";
SECTION_DEAD static char const* const stringBase_803996EB = "%d-%d";
SECTION_DEAD static char const* const stringBase_803996F1 = "%d:%02d";
SECTION_DEAD static char const* const stringBase_803996F9 = "";
SECTION_DEAD static char const* const stringBase_803996FA = "%d%s";
SECTION_DEAD static char const* const stringBase_803996FF = "%d %s";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80399705 = "\0\0";
#pragma pop
/* 80454B40-80454B44 003140 0004+00 1/1 0/0 0/0 .sdata2 @3702 */
SECTION_SDATA2 static f32 lit_3702 = 1000000.0f;
@@ -128,7 +141,7 @@ asm void __sinit_d_msg_unit_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_8023907C = (void*)__sinit_d_msg_unit_cpp;
REGISTER_CTORS(0x8023907C, __sinit_d_msg_unit_cpp);
#pragma pop
/* ############################################################################################## */
@@ -136,16 +149,4 @@ SECTION_CTORS void* const _ctors_8023907C = (void*)__sinit_d_msg_unit_cpp;
extern u8 data_804510D8[8];
u8 data_804510D8[8];
/* 803996E8-80399708 025D48 001D+03 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803996E8 = "%d";
SECTION_DEAD static char const* const stringBase_803996EB = "%d-%d";
SECTION_DEAD static char const* const stringBase_803996F1 = "%d:%02d";
SECTION_DEAD static char const* const stringBase_803996F9 = "";
SECTION_DEAD static char const* const stringBase_803996FA = "%d%s";
SECTION_DEAD static char const* const stringBase_803996FF = "%d %s";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80399705 = "\0\0";
#pragma pop
/* 803996E8-803996E8 025D48 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */