mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-09-08 11:36:13 -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/menu/d_menu_calibration.cpp
+13 -11
View File
@@ -53,10 +53,10 @@ struct dMenu_Calibration_c {
/* 801AFBF4 */ void draw();
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -475,6 +475,15 @@ asm void dMenu_Calibration_c::setCalibrationValue() {
}
#pragma pop
/* ############################################################################################## */
/* 80394F70-80394F70 0215D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394F70 = "";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80394F71 = "\0\0\0\0\0\0";
#pragma pop
/* 801AF738-801AF7E8 1AA078 00B0+00 6/6 0/0 0/0 .text setAButtonString__19dMenu_Calibration_cFUs
*/
#pragma push
@@ -550,14 +559,7 @@ asm void __sinit_d_menu_calibration_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801AFC14 = (void*)__sinit_d_menu_calibration_cpp;
REGISTER_CTORS(0x801AFC14, __sinit_d_menu_calibration_cpp);
#pragma pop
/* 80394F70-80394F78 0215D0 0001+07 4/4 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80394F70 = "";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80394F71 = "\0\0\0\0\0\0";
#pragma pop
/* 80394F70-80394F70 0215D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_collect.cpp
+64 -58
View File
@@ -19,14 +19,14 @@ struct mDoGph_gInf_c {
static u8 mFader[4];
};
struct J3DMaterialTable {};
struct J3DModelData {};
struct J3DAnmTevRegKey {
/* 8032B87C */ void searchUpdateMaterialID(J3DModelData*);
};
struct J3DMaterialTable {};
struct mDoExt_brkAnm {
/* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16);
/* 8000D7A8 */ void entry(J3DMaterialTable*, f32);
@@ -128,6 +128,8 @@ struct STControl {
/* 800325A0 */ void checkDownTrigger();
};
struct CSTControl {};
struct JKRHeap {
/* 802CE5CC */ void freeAll();
/* 802CE784 */ void getTotalFreeSize();
@@ -137,8 +139,6 @@ struct JKRExpHeap {
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
};
struct CSTControl {};
struct dMenu_Skill_c {
/* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*);
/* 801F7718 */ void _move();
@@ -305,10 +305,10 @@ struct dDlst_list_c {
/* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -709,6 +709,30 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
/* ############################################################################################## */
/* 80395330-80395330 021990 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80395330 = "zelda_collect_soubi_screen.blo";
SECTION_DEAD static char const* const stringBase_8039534F = "zelda_collect_soubi_do_icon_parts.blo";
SECTION_DEAD static char const* const stringBase_80395375 = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_80395385 = "";
SECTION_DEAD static char const* const stringBase_80395386 = "zelda_collect_soubi_screen.btk";
SECTION_DEAD static char const* const stringBase_803953A5 = "md_mask_parts_spin_1.bck";
SECTION_DEAD static char const* const stringBase_803953BE = "md_mask_parts_spin_2.bck";
SECTION_DEAD static char const* const stringBase_803953D7 = "md_mask_parts_spin_3.bck";
SECTION_DEAD static char const* const stringBase_803953F0 = "md_mask_parts_spin_4.bck";
SECTION_DEAD static char const* const stringBase_80395409 = "md_mask_parts_spin_1.brk";
SECTION_DEAD static char const* const stringBase_80395422 = "md_mask_parts_spin_2_3.brk";
SECTION_DEAD static char const* const stringBase_8039543D = "md_mask_parts_spin_4.brk";
SECTION_DEAD static char const* const stringBase_80395456 = "md_mask_UI.bmd";
SECTION_DEAD static char const* const stringBase_80395465 = "kageri_mirrer_spin_1.bck";
SECTION_DEAD static char const* const stringBase_8039547E = "kageri_mirrer_spin_2.bck";
SECTION_DEAD static char const* const stringBase_80395497 = "kageri_mirrer_spin_3.bck";
SECTION_DEAD static char const* const stringBase_803954B0 = "kageri_mirrer_spin_4.bck";
SECTION_DEAD static char const* const stringBase_803954C9 = "kageri_mirrer_spin_1.brk";
SECTION_DEAD static char const* const stringBase_803954E2 = "kageri_mirrer_spin_2_3_4.brk";
#pragma pop
/* 803BC380-803BC38C 0194A0 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1332,7 +1356,7 @@ SECTION_RODATA static u8 const lit_3778[12 + 4 /* padding */] = {
0x00,
0x00,
};
COMPILER_STRIP_GATE(80394F78, &lit_3778);
COMPILER_STRIP_GATE(0x80394F78, &lit_3778);
/* 80394F88-80394FA0 0215E8 0018+00 0/1 0/0 0/0 .rodata text_sv$4768 */
#pragma push
@@ -1341,7 +1365,7 @@ SECTION_RODATA static u8 const text_sv[24] = {
0x00, 0x00, 0x00, 0x73, 0x61, 0x76, 0x5F, 0x30, 0x00, 0x00, 0x00, 0x73,
0x61, 0x76, 0x5F, 0x31, 0x00, 0x00, 0x00, 0x73, 0x61, 0x76, 0x5F, 0x32,
};
COMPILER_STRIP_GATE(80394F88, &text_sv);
COMPILER_STRIP_GATE(0x80394F88, &text_sv);
#pragma pop
/* 80394FA0-80394FB8 021600 0018+00 0/1 0/0 0/0 .rodata text_op$4769 */
@@ -1351,7 +1375,7 @@ SECTION_RODATA static u8 const text_op[24] = {
0x00, 0x00, 0x00, 0x6F, 0x70, 0x74, 0x5F, 0x30, 0x00, 0x00, 0x00, 0x6F,
0x70, 0x74, 0x5F, 0x31, 0x00, 0x00, 0x00, 0x6F, 0x70, 0x74, 0x5F, 0x32,
};
COMPILER_STRIP_GATE(80394FA0, &text_op);
COMPILER_STRIP_GATE(0x80394FA0, &text_op);
#pragma pop
/* 80394FB8-80394FD0 021618 0018+00 0/1 0/0 0/0 .rodata ftext_sv$4770 */
@@ -1361,7 +1385,7 @@ SECTION_RODATA static u8 const ftext_sv[24] = {
0x00, 0x66, 0x5F, 0x73, 0x61, 0x76, 0x5F, 0x30, 0x00, 0x66, 0x5F, 0x73,
0x61, 0x76, 0x5F, 0x31, 0x00, 0x66, 0x5F, 0x73, 0x61, 0x76, 0x5F, 0x32,
};
COMPILER_STRIP_GATE(80394FB8, &ftext_sv);
COMPILER_STRIP_GATE(0x80394FB8, &ftext_sv);
#pragma pop
/* 80394FD0-80394FE8 021630 0018+00 0/1 0/0 0/0 .rodata ftext_op$4771 */
@@ -1371,7 +1395,7 @@ SECTION_RODATA static u8 const ftext_op[24] = {
0x00, 0x66, 0x5F, 0x6F, 0x70, 0x74, 0x5F, 0x30, 0x00, 0x66, 0x5F, 0x6F,
0x70, 0x74, 0x5F, 0x31, 0x00, 0x66, 0x5F, 0x6F, 0x70, 0x74, 0x5F, 0x32,
};
COMPILER_STRIP_GATE(80394FD0, &ftext_op);
COMPILER_STRIP_GATE(0x80394FD0, &ftext_op);
#pragma pop
/* 80394FE8-80395010 021648 0028+00 0/1 0/0 0/0 .rodata text_a_tag$4777 */
@@ -1382,7 +1406,7 @@ SECTION_RODATA static u8 const text_a_tag_4777[40] = {
0x5F, 0x32, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x61, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80394FE8, &text_a_tag_4777);
COMPILER_STRIP_GATE(0x80394FE8, &text_a_tag_4777);
#pragma pop
/* 80395010-80395038 021670 0028+00 0/1 0/0 0/0 .rodata text_b_tag$4778 */
@@ -1393,7 +1417,7 @@ SECTION_RODATA static u8 const text_b_tag_4778[40] = {
0x5F, 0x32, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x62, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80395010, &text_b_tag_4778);
COMPILER_STRIP_GATE(0x80395010, &text_b_tag_4778);
#pragma pop
/* 80453F30-80453F34 002530 0004+00 2/2 0/0 0/0 .sdata2 @5173 */
@@ -1476,7 +1500,7 @@ SECTION_RODATA static u8 const lit_5343[9 + 3 /* padding */] = {
0x00,
0x00,
};
COMPILER_STRIP_GATE(80395038, &lit_5343);
COMPILER_STRIP_GATE(0x80395038, &lit_5343);
/* 80395044-80395050 0216A4 0009+03 1/1 0/0 0/0 .rodata @5344 */
SECTION_RODATA static u8 const lit_5344[9 + 3 /* padding */] = {
@@ -1494,7 +1518,7 @@ SECTION_RODATA static u8 const lit_5344[9 + 3 /* padding */] = {
0x00,
0x00,
};
COMPILER_STRIP_GATE(80395044, &lit_5344);
COMPILER_STRIP_GATE(0x80395044, &lit_5344);
/* 80453F50-80453F54 002550 0004+00 1/1 0/0 0/0 .sdata2 @5402 */
SECTION_SDATA2 static u32 lit_5402 = 0x03020301;
@@ -1615,7 +1639,7 @@ SECTION_RODATA static u8 const smell_tag[40] = {
0x68, 0x69, 0x77, 0x6F, 0x6C, 0x66, 0x5F, 0x66, 0x69, 0x73, 0x77, 0x6F, 0x6C, 0x66,
0x5F, 0x69, 0x72, 0x69, 0x77, 0x6F, 0x6C, 0x66, 0x5F, 0x70, 0x6F, 0x75,
};
COMPILER_STRIP_GATE(80395050, &smell_tag);
COMPILER_STRIP_GATE(0x80395050, &smell_tag);
/* 801B3524-801B3640 1ADE64 011C+00 1/1 0/0 0/0 .text setSmellType__17dMenu_Collect2D_cFv
*/
@@ -1634,7 +1658,7 @@ SECTION_RODATA static u8 const heart_tag[32] = {
0x68, 0x65, 0x61, 0x72, 0x74, 0x5F, 0x31, 0x6E, 0x68, 0x65, 0x61, 0x72, 0x74, 0x5F, 0x32, 0x6E,
0x68, 0x65, 0x61, 0x72, 0x74, 0x5F, 0x33, 0x6E, 0x68, 0x65, 0x61, 0x72, 0x74, 0x5F, 0x34, 0x6E,
};
COMPILER_STRIP_GATE(80395078, &heart_tag);
COMPILER_STRIP_GATE(0x80395078, &heart_tag);
/* 801B3640-801B370C 1ADF80 00CC+00 1/1 0/0 0/0 .text setHeartPiece__17dMenu_Collect2D_cFv */
#pragma push
@@ -1661,7 +1685,7 @@ asm void dMenu_Collect2D_c::setPohMaxNum(u8 param_0) {
SECTION_RODATA static u8 const tag_5980[16] = {
0x00, 0x6B, 0x65, 0x6E, 0x5F, 0x67, 0x5F, 0x30, 0x00, 0x6B, 0x65, 0x6E, 0x5F, 0x67, 0x5F, 0x31,
};
COMPILER_STRIP_GATE(80395098, &tag_5980);
COMPILER_STRIP_GATE(0x80395098, &tag_5980);
/* 801B39D0-801B3CF4 1AE310 0324+00 2/2 0/0 0/0 .text
* setEquipItemFrameColorSword__17dMenu_Collect2D_cFi */
@@ -1679,7 +1703,7 @@ asm void dMenu_Collect2D_c::setEquipItemFrameColorSword(int param_0) {
SECTION_RODATA static u8 const tag_6100[16] = {
0x74, 0x61, 0x74, 0x65, 0x5F, 0x67, 0x5F, 0x30, 0x74, 0x61, 0x74, 0x65, 0x5F, 0x67, 0x5F, 0x31,
};
COMPILER_STRIP_GATE(803950A8, &tag_6100);
COMPILER_STRIP_GATE(0x803950A8, &tag_6100);
/* 801B3CF4-801B3FDC 1AE634 02E8+00 2/2 0/0 0/0 .text
* setEquipItemFrameColorShield__17dMenu_Collect2D_cFi */
@@ -1698,7 +1722,7 @@ SECTION_RODATA static u8 const tag_6213[24] = {
0x66, 0x75, 0x6B, 0x75, 0x5F, 0x67, 0x5F, 0x30, 0x66, 0x75, 0x6B, 0x75,
0x5F, 0x67, 0x5F, 0x31, 0x66, 0x75, 0x6B, 0x75, 0x5F, 0x67, 0x5F, 0x32,
};
COMPILER_STRIP_GATE(803950B8, &tag_6213);
COMPILER_STRIP_GATE(0x803950B8, &tag_6213);
/* 801B3FDC-801B42D8 1AE91C 02FC+00 2/2 0/0 0/0 .text
* setEquipItemFrameColorClothes__17dMenu_Collect2D_cFi */
@@ -1720,7 +1744,7 @@ SECTION_RODATA static u8 const kaz_n[72] = {
0x5F, 0x30, 0x35, 0x00, 0x00, 0x75, 0x7A, 0x75, 0x5F, 0x30, 0x36, 0x00, 0x00, 0x75, 0x7A,
0x75, 0x5F, 0x30, 0x37, 0x00, 0x00, 0x00, 0x68, 0x69, 0x73, 0x68, 0x69,
};
COMPILER_STRIP_GATE(803950D0, &kaz_n);
COMPILER_STRIP_GATE(0x803950D0, &kaz_n);
/* 801B42D8-801B46FC 1AEC18 0424+00 2/2 0/0 0/0 .text setHIO__17dMenu_Collect2D_cFb */
#pragma push
@@ -1757,7 +1781,7 @@ SECTION_RODATA static u8 const itemTag[336] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80395118, &itemTag);
COMPILER_STRIP_GATE(0x80395118, &itemTag);
/* 801B46FC-801B473C 1AF03C 0040+00 3/3 0/0 0/0 .text getItemTag__17dMenu_Collect2D_cFiib
*/
@@ -2204,7 +2228,7 @@ SECTION_RODATA static u8 const text_a_tag_7111[40] = {
0x5F, 0x32, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x61, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80395268, &text_a_tag_7111);
COMPILER_STRIP_GATE(0x80395268, &text_a_tag_7111);
/* 801B5FB4-801B60B8 1B08F4 0104+00 20/20 0/0 0/0 .text setAButtonString__17dMenu_Collect2D_cFUs
*/
@@ -2224,7 +2248,7 @@ SECTION_RODATA static u8 const text_b_tag_7134[40] = {
0x5F, 0x32, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x62, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80395290, &text_b_tag_7134);
COMPILER_STRIP_GATE(0x80395290, &text_b_tag_7134);
/* 801B60B8-801B61BC 1B09F8 0104+00 20/20 0/0 0/0 .text setBButtonString__17dMenu_Collect2D_cFUs
*/
@@ -2423,7 +2447,7 @@ SECTION_RODATA static u8 const m_kamen_offset_x[20] = {
0xC1, 0x60, 0x00, 0x00, 0xC1, 0x60, 0x00, 0x00, 0xC1, 0x60,
0x00, 0x00, 0x3F, 0xA6, 0x66, 0x66, 0x40, 0xD0, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803952B8, &m_kamen_offset_x);
COMPILER_STRIP_GATE(0x803952B8, &m_kamen_offset_x);
#pragma pop
/* 803952CC-803952E0 02192C 0014+00 0/1 0/0 0/0 .rodata m_kamen_offset_y$7579 */
@@ -2433,7 +2457,7 @@ SECTION_RODATA static u8 const m_kamen_offset_y[20] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x41, 0xB0, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803952CC, &m_kamen_offset_y);
COMPILER_STRIP_GATE(0x803952CC, &m_kamen_offset_y);
#pragma pop
/* 803952E0-803952F4 021940 0014+00 0/1 0/0 0/0 .rodata m_kamen_scale$7580 */
@@ -2443,7 +2467,7 @@ SECTION_RODATA static u8 const m_kamen_scale[20] = {
0x40, 0x26, 0x66, 0x66, 0x40, 0x26, 0x66, 0x66, 0x40, 0x0C,
0xCC, 0xCD, 0x3F, 0xE6, 0x66, 0x66, 0x3F, 0xE6, 0x66, 0x66,
};
COMPILER_STRIP_GATE(803952E0, &m_kamen_scale);
COMPILER_STRIP_GATE(0x803952E0, &m_kamen_scale);
#pragma pop
/* 801B7014-801B71C4 1B1954 01B0+00 1/1 0/0 0/0 .text createMaskModel__17dMenu_Collect3D_cFv */
@@ -2464,7 +2488,7 @@ SECTION_RODATA static u8 const m_mirror_offset_x[20] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803952F4, &m_mirror_offset_x);
COMPILER_STRIP_GATE(0x803952F4, &m_mirror_offset_x);
#pragma pop
/* 80395308-8039531C 021968 0014+00 0/1 0/0 0/0 .rodata m_mirror_offset_y$7683 */
@@ -2474,7 +2498,7 @@ SECTION_RODATA static u8 const m_mirror_offset_y[20] = {
0x40, 0x80, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x40, 0x80,
0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80395308, &m_mirror_offset_y);
COMPILER_STRIP_GATE(0x80395308, &m_mirror_offset_y);
#pragma pop
/* 8039531C-80395330 02197C 0014+00 0/1 0/0 0/0 .rodata m_mirror_scale$7684 */
@@ -2484,7 +2508,15 @@ SECTION_RODATA static u8 const m_mirror_scale[20] = {
0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x19,
0x99, 0x9A, 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x19, 0x99, 0x9A,
};
COMPILER_STRIP_GATE(8039531C, &m_mirror_scale);
COMPILER_STRIP_GATE(0x8039531C, &m_mirror_scale);
#pragma pop
/* 80395330-80395330 021990 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803954FF = "kageri_mirrer_UI.bmd";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80395514 = "\0\0\0";
#pragma pop
/* 801B71C4-801B7434 1B1B04 0270+00 1/1 0/0 0/0 .text createMirrorModel__17dMenu_Collect3D_cFv */
@@ -2677,7 +2709,7 @@ asm void __sinit_d_menu_collect_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801B7B14 = (void*)__sinit_d_menu_collect_cpp;
REGISTER_CTORS(0x801B7B14, __sinit_d_menu_collect_cpp);
#pragma pop
/* 801B7EB8-801B7F00 1B27F8 0048+00 1/0 0/0 0/0 .text __dt__20dMenu_Collect2DTop_cFv */
@@ -2700,30 +2732,4 @@ asm void dMenu_Collect2D_c::draw() {
}
#pragma pop
/* 80395330-80395518 021990 01E4+04 13/9 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80395330 = "zelda_collect_soubi_screen.blo";
SECTION_DEAD static char const* const stringBase_8039534F = "zelda_collect_soubi_do_icon_parts.blo";
SECTION_DEAD static char const* const stringBase_80395375 = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_80395385 = "";
SECTION_DEAD static char const* const stringBase_80395386 = "zelda_collect_soubi_screen.btk";
SECTION_DEAD static char const* const stringBase_803953A5 = "md_mask_parts_spin_1.bck";
SECTION_DEAD static char const* const stringBase_803953BE = "md_mask_parts_spin_2.bck";
SECTION_DEAD static char const* const stringBase_803953D7 = "md_mask_parts_spin_3.bck";
SECTION_DEAD static char const* const stringBase_803953F0 = "md_mask_parts_spin_4.bck";
SECTION_DEAD static char const* const stringBase_80395409 = "md_mask_parts_spin_1.brk";
SECTION_DEAD static char const* const stringBase_80395422 = "md_mask_parts_spin_2_3.brk";
SECTION_DEAD static char const* const stringBase_8039543D = "md_mask_parts_spin_4.brk";
SECTION_DEAD static char const* const stringBase_80395456 = "md_mask_UI.bmd";
SECTION_DEAD static char const* const stringBase_80395465 = "kageri_mirrer_spin_1.bck";
SECTION_DEAD static char const* const stringBase_8039547E = "kageri_mirrer_spin_2.bck";
SECTION_DEAD static char const* const stringBase_80395497 = "kageri_mirrer_spin_3.bck";
SECTION_DEAD static char const* const stringBase_803954B0 = "kageri_mirrer_spin_4.bck";
SECTION_DEAD static char const* const stringBase_803954C9 = "kageri_mirrer_spin_1.brk";
SECTION_DEAD static char const* const stringBase_803954E2 = "kageri_mirrer_spin_2_3_4.brk";
SECTION_DEAD static char const* const stringBase_803954FF = "kageri_mirrer_UI.bmd";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80395514 = "\0\0\0";
#pragma pop
/* 80395330-80395330 021990 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_dmap.cpp
+66 -39
View File
@@ -140,8 +140,6 @@ struct dMenu_StageMapCtrl_c {
/* 801C2590 */ void setPlusZoomCenterZ(f32);
};
struct J2DOrthoGraph {};
struct STControl {
/* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16);
/* 8003219C */ void checkTrigger();
@@ -151,6 +149,8 @@ struct STControl {
/* 800325A0 */ void checkDownTrigger();
};
struct J2DOrthoGraph {};
struct JKRExpHeap {
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
};
@@ -291,10 +291,10 @@ struct dDlst_list_c {
/* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
/* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
@@ -602,6 +602,12 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
/* ############################################################################################## */
/* 80395760-80395760 021DC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80395760 = "/res/FieldMap/D_MN10.arc";
#pragma pop
/* 803BC7E0-803BC7EC 019900 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1170,6 +1176,13 @@ asm dMenu_DmapBg_c::dMenu_DmapBg_c(JKRExpHeap* param_0, STControl* param_1) {
#pragma pop
/* ############################################################################################## */
/* 80395760-80395760 021DC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80395779 = "zelda_dungeon_map_map.blo";
SECTION_DEAD static char const* const stringBase_80395793 = "zelda_dungeon_map_map.btk";
#pragma pop
/* 80453FF0-80453FF4 0025F0 0004+00 1/1 0/0 0/0 .sdata2 @4073 */
SECTION_SDATA2 static f32 lit_4073 = -15.0f;
@@ -1243,7 +1256,7 @@ SECTION_RODATA static u8 const cont_at_4145[40] = {
0x74, 0x31, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74,
0x5F, 0x61, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x34,
};
COMPILER_STRIP_GATE(80395518, &cont_at_4145);
COMPILER_STRIP_GATE(0x80395518, &cont_at_4145);
/* 80395540-80395568 021BA0 0028+00 0/1 0/0 0/0 .rodata cont_bt$4146 */
#pragma push
@@ -1253,7 +1266,7 @@ SECTION_RODATA static u8 const cont_bt_4146[40] = {
0x74, 0x31, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74,
0x5F, 0x62, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x34,
};
COMPILER_STRIP_GATE(80395540, &cont_bt_4146);
COMPILER_STRIP_GATE(0x80395540, &cont_bt_4146);
#pragma pop
/* 80395568-80395590 021BC8 0028+00 0/1 0/0 0/0 .rodata font_at$4147 */
@@ -1264,7 +1277,7 @@ SECTION_RODATA static u8 const font_at[40] = {
0x74, 0x31, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74,
0x5F, 0x61, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x34,
};
COMPILER_STRIP_GATE(80395568, &font_at);
COMPILER_STRIP_GATE(0x80395568, &font_at);
#pragma pop
/* 80395590-803955B8 021BF0 0028+00 0/1 0/0 0/0 .rodata font_bt$4148 */
@@ -1275,7 +1288,7 @@ SECTION_RODATA static u8 const font_bt[40] = {
0x74, 0x31, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74,
0x5F, 0x62, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x34,
};
COMPILER_STRIP_GATE(80395590, &font_bt);
COMPILER_STRIP_GATE(0x80395590, &font_bt);
#pragma pop
/* 803955B8-803955C8 021C18 0010+00 0/1 0/0 0/0 .rodata c_tag$4155 */
@@ -1284,7 +1297,14 @@ COMPILER_STRIP_GATE(80395590, &font_bt);
SECTION_RODATA static u8 const c_tag_4155[16] = {
0x66, 0x5F, 0x74, 0x65, 0x78, 0x74, 0x5F, 0x73, 0x00, 0x00, 0x66, 0x5F, 0x74, 0x65, 0x78, 0x74,
};
COMPILER_STRIP_GATE(803955B8, &c_tag_4155);
COMPILER_STRIP_GATE(0x803955B8, &c_tag_4155);
#pragma pop
/* 80395760-80395760 021DC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803957AD = "zelda_dungeon_map_spot_button.blo";
SECTION_DEAD static char const* const stringBase_803957CF = "";
#pragma pop
/* 80454004-80454008 002604 0004+00 1/1 0/0 0/0 .sdata2 @4191 */
@@ -1310,7 +1330,7 @@ SECTION_RODATA static u8 const cont_at_4196[40] = {
0x74, 0x31, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74,
0x5F, 0x61, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x34,
};
COMPILER_STRIP_GATE(803955C8, &cont_at_4196);
COMPILER_STRIP_GATE(0x803955C8, &cont_at_4196);
/* 801B8DE4-801B8EBC 1B3724 00D8+00 7/7 0/0 0/0 .text setAButtonString__14dMenu_DmapBg_cFUl */
#pragma push
@@ -1329,7 +1349,7 @@ SECTION_RODATA static u8 const cont_bt_4211[40] = {
0x74, 0x31, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74,
0x5F, 0x62, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x34,
};
COMPILER_STRIP_GATE(803955F0, &cont_bt_4211);
COMPILER_STRIP_GATE(0x803955F0, &cont_bt_4211);
/* 801B8EBC-801B8F94 1B37FC 00D8+00 8/8 0/0 0/0 .text setBButtonString__14dMenu_DmapBg_cFUl */
#pragma push
@@ -1346,7 +1366,7 @@ asm void dMenu_DmapBg_c::setBButtonString(u32 param_0) {
SECTION_RODATA static u8 const c_tag_4229[16] = {
0x66, 0x5F, 0x74, 0x65, 0x78, 0x74, 0x5F, 0x73, 0x00, 0x00, 0x66, 0x5F, 0x74, 0x65, 0x78, 0x74,
};
COMPILER_STRIP_GATE(80395618, &c_tag_4229);
COMPILER_STRIP_GATE(0x80395618, &c_tag_4229);
/* 80451078-8045107C 000578 0004+00 1/1 0/0 0/0 .sbss player_px */
static f32 player_px;
@@ -1403,6 +1423,13 @@ asm void dMenu_DmapBg_c::deleteExplain() {
#pragma pop
/* ############################################################################################## */
/* 80395760-80395760 021DC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803957D0 = "zelda_dungeon_map_base.blo";
SECTION_DEAD static char const* const stringBase_803957EB = "zelda_dungeon_map_floor_parts.blo";
#pragma pop
/* 80454010-80454014 002610 0004+00 1/1 0/0 0/0 .sdata2 @4312 */
SECTION_SDATA2 static f32 lit_4312 = 19.0f / 20.0f;
@@ -1463,7 +1490,7 @@ SECTION_RODATA static u8 const lit_4325[26 + 6 /* padding */] = {
0x00,
0x00,
};
COMPILER_STRIP_GATE(80395628, &lit_4325);
COMPILER_STRIP_GATE(0x80395628, &lit_4325);
/* 801B944C-801BA0B4 1B3D8C 0C68+00 1/1 0/0 0/0 .text setFloorMessage__14dMenu_DmapBg_cFv
*/
@@ -1575,6 +1602,13 @@ asm void dMenu_DmapBg_c::draw() {
#pragma pop
/* ############################################################################################## */
/* 80395760-80395760 021DC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039580D = "tex/bg.bti";
SECTION_DEAD static char const* const stringBase_80395818 = "spec/spec.dat";
#pragma pop
/* 80454040-80454044 002640 0004+00 1/1 0/0 0/0 .sdata2 @4848 */
SECTION_SDATA2 static f32 lit_4848 = 25.5f;
@@ -1632,7 +1666,7 @@ SECTION_RODATA static u8 const floor_tag[64] = {
0x66, 0x6C, 0x6F, 0x6F, 0x72, 0x33, 0x5F, 0x6E, 0x66, 0x6C, 0x6F, 0x6F, 0x72, 0x34, 0x5F, 0x6E,
0x66, 0x6C, 0x6F, 0x6F, 0x72, 0x35, 0x5F, 0x6E, 0x66, 0x6C, 0x6F, 0x6F, 0x72, 0x36, 0x5F, 0x6E,
};
COMPILER_STRIP_GATE(80395648, &floor_tag);
COMPILER_STRIP_GATE(0x80395648, &floor_tag);
#pragma pop
/* 80395688-803956C8 021CE8 0040+00 0/1 0/0 0/0 .rodata icon_tag$4933 */
@@ -1644,7 +1678,7 @@ SECTION_RODATA static u8 const icon_tag[64] = {
0x69, 0x63, 0x6F, 0x5F, 0x73, 0x65, 0x74, 0x33, 0x69, 0x63, 0x6F, 0x5F, 0x73, 0x65, 0x74, 0x34,
0x69, 0x63, 0x6F, 0x5F, 0x73, 0x65, 0x74, 0x35, 0x69, 0x63, 0x6F, 0x5F, 0x73, 0x65, 0x74, 0x36,
};
COMPILER_STRIP_GATE(80395688, &icon_tag);
COMPILER_STRIP_GATE(0x80395688, &icon_tag);
#pragma pop
/* 803956C8-80395708 021D28 0040+00 0/1 0/0 0/0 .rodata boss_tag$4934 */
@@ -1656,7 +1690,7 @@ SECTION_RODATA static u8 const boss_tag[64] = {
0x69, 0x63, 0x5F, 0x73, 0x74, 0x5F, 0x62, 0x33, 0x69, 0x63, 0x5F, 0x73, 0x74, 0x5F, 0x62, 0x34,
0x69, 0x63, 0x5F, 0x73, 0x74, 0x5F, 0x62, 0x35, 0x69, 0x63, 0x5F, 0x73, 0x74, 0x5F, 0x62, 0x36,
};
COMPILER_STRIP_GATE(803956C8, &boss_tag);
COMPILER_STRIP_GATE(0x803956C8, &boss_tag);
#pragma pop
/* 80395708-80395718 021D68 0010+00 0/1 0/0 0/0 .rodata stay_tag$4935 */
@@ -1665,7 +1699,7 @@ COMPILER_STRIP_GATE(803956C8, &boss_tag);
SECTION_RODATA static u8 const stay_tag[16] = {
0x72, 0x69, 0x6E, 0x6B, 0x5F, 0x6E, 0x75, 0x6C, 0x62, 0x6F, 0x73, 0x73, 0x5F, 0x6E, 0x75, 0x6C,
};
COMPILER_STRIP_GATE(80395708, &stay_tag);
COMPILER_STRIP_GATE(0x80395708, &stay_tag);
#pragma pop
/* 80395718-80395730 021D78 0018+00 0/1 0/0 0/0 .rodata waku_tag$4973 */
@@ -1675,7 +1709,7 @@ SECTION_RODATA static u8 const waku_tag[24] = {
0x67, 0x72, 0x61, 0x79, 0x5F, 0x6D, 0x61, 0x70, 0x67, 0x72, 0x61, 0x79,
0x5F, 0x63, 0x6F, 0x6E, 0x67, 0x72, 0x61, 0x79, 0x5F, 0x6B, 0x65, 0x79,
};
COMPILER_STRIP_GATE(80395718, &waku_tag);
COMPILER_STRIP_GATE(0x80395718, &waku_tag);
#pragma pop
/* 80395730-80395748 021D90 0018+00 0/1 0/0 0/0 .rodata key_tag$5002 */
@@ -1685,7 +1719,7 @@ SECTION_RODATA static u8 const key_tag[24] = {
0x00, 0x00, 0x6B, 0x65, 0x79, 0x5F, 0x30, 0x30, 0x00, 0x00, 0x6B, 0x65,
0x79, 0x5F, 0x30, 0x31, 0x00, 0x00, 0x6B, 0x65, 0x79, 0x5F, 0x30, 0x32,
};
COMPILER_STRIP_GATE(80395730, &key_tag);
COMPILER_STRIP_GATE(0x80395730, &key_tag);
#pragma pop
/* 80395748-80395760 021DA8 0018+00 0/1 0/0 0/0 .rodata item_tag$5040 */
@@ -1695,7 +1729,7 @@ SECTION_RODATA static u8 const item_tag[24] = {
0x00, 0x00, 0x6D, 0x61, 0x70, 0x30, 0x30, 0x30, 0x00, 0x00, 0x63, 0x6F,
0x6E, 0x30, 0x30, 0x30, 0x00, 0x69, 0x5F, 0x6B, 0x65, 0x79, 0x5F, 0x6E,
};
COMPILER_STRIP_GATE(80395748, &item_tag);
COMPILER_STRIP_GATE(0x80395748, &item_tag);
#pragma pop
/* 8045404C-80454050 00264C 0004+00 1/1 0/0 0/0 .sdata2 @5277 */
@@ -1913,6 +1947,16 @@ asm void dMenu_Dmap_c::mapControl() {
}
#pragma pop
/* ############################################################################################## */
/* 80395760-80395760 021DC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80395826 = "/res/FieldMap/res-d.arc";
SECTION_DEAD static char const* const stringBase_8039583E = "dat/data.dat";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039584B = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
#pragma pop
/* 801BE328-801BE670 1B8C68 0348+00 0/0 1/1 0/0 .text isOpen__12dMenu_Dmap_cFv */
#pragma push
#pragma optimization_level 0
@@ -2304,7 +2348,7 @@ asm void __sinit_d_menu_dmap_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801C05C4 = (void*)__sinit_d_menu_dmap_cpp;
REGISTER_CTORS(0x801C05C4, __sinit_d_menu_dmap_cpp);
#pragma pop
/* 801C0844-801C084C 1BB184 0008+00 1/0 0/0 0/0 .text @4@__dt__14dMenu_DmapBg_cFv */
@@ -2317,21 +2361,4 @@ static asm void func_801C0844() {
}
#pragma pop
/* 80395760-80395860 021DC0 00EB+15 10/10 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80395760 = "/res/FieldMap/D_MN10.arc";
SECTION_DEAD static char const* const stringBase_80395779 = "zelda_dungeon_map_map.blo";
SECTION_DEAD static char const* const stringBase_80395793 = "zelda_dungeon_map_map.btk";
SECTION_DEAD static char const* const stringBase_803957AD = "zelda_dungeon_map_spot_button.blo";
SECTION_DEAD static char const* const stringBase_803957CF = "";
SECTION_DEAD static char const* const stringBase_803957D0 = "zelda_dungeon_map_base.blo";
SECTION_DEAD static char const* const stringBase_803957EB = "zelda_dungeon_map_floor_parts.blo";
SECTION_DEAD static char const* const stringBase_8039580D = "tex/bg.bti";
SECTION_DEAD static char const* const stringBase_80395818 = "spec/spec.dat";
SECTION_DEAD static char const* const stringBase_80395826 = "/res/FieldMap/res-d.arc";
SECTION_DEAD static char const* const stringBase_8039583E = "dat/data.dat";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039584B = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
#pragma pop
/* 80395760-80395760 021DC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_dmap_map.cpp
+5 -5
View File
@@ -631,7 +631,7 @@ SECTION_RODATA static void* const l_paletteDmap_m[60] = {
(void*)NULL,
(void*)NULL,
};
COMPILER_STRIP_GATE(80395860, &l_paletteDmap_m);
COMPILER_STRIP_GATE(0x80395860, &l_paletteDmap_m);
/* 80395950-80395974 021FB0 0024+00 0/1 0/0 0/0 .rodata l_dungeon_offColor$3841 */
#pragma push
@@ -641,7 +641,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(80395950, &l_dungeon_offColor);
COMPILER_STRIP_GATE(0x80395950, &l_dungeon_offColor);
#pragma pop
/* 80395974-80395998 021FD4 0024+00 0/1 0/0 0/0 .rodata l_dungeon_onColor$3842 */
@@ -652,7 +652,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(80395974, &l_dungeon_onColor);
COMPILER_STRIP_GATE(0x80395974, &l_dungeon_onColor);
#pragma pop
/* 80395998-803959C0 021FF8 0024+04 0/1 0/0 0/0 .rodata l_dungeon_stayColor$3843 */
@@ -701,7 +701,7 @@ SECTION_RODATA static u8 const l_dungeon_stayColor[36 + 4 /* padding */] = {
0x00,
0x00,
};
COMPILER_STRIP_GATE(80395998, &l_dungeon_stayColor);
COMPILER_STRIP_GATE(0x80395998, &l_dungeon_stayColor);
#pragma pop
/* 801C0C48-801C0CB8 1BB588 0070+00 1/0 0/0 0/0 .text getColor__15renderingDmap_cFi */
@@ -1511,7 +1511,7 @@ asm void __sinit_d_menu_dmap_map_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801C2644 = (void*)__sinit_d_menu_dmap_map_cpp;
REGISTER_CTORS(0x801C2644, __sinit_d_menu_dmap_map_cpp);
#pragma pop
/* ############################################################################################## */
src/d/menu/d_menu_fishing.cpp
+42 -31
View File
@@ -38,10 +38,10 @@ struct dMeter2Info_c {
struct STControl {};
struct JKRExpHeap {};
struct CSTControl {};
struct JKRExpHeap {};
struct dMenu_Fishing_c {
/* 801C4D54 */ dMenu_Fishing_c(JKRExpHeap*, STControl*, CSTControl*);
/* 801C4D98 */ ~dMenu_Fishing_c();
@@ -309,6 +309,12 @@ asm void dMenu_Fishing_c::init() {
#pragma pop
/* ############################################################################################## */
/* 80396068-80396068 0226C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80396068 = "/res/Layout/fishres.arc";
#pragma pop
/* 80454114-80454118 002714 0004+00 1/1 0/0 0/0 .sdata2 @4010 */
SECTION_SDATA2 static f32 lit_4010 = 1.0f;
@@ -362,7 +368,7 @@ SECTION_RODATA static u8 const fish_n[48] = {
0x66, 0x69, 0x73, 0x68, 0x5F, 0x6E, 0x5F, 0x33, 0x66, 0x69, 0x73, 0x68, 0x5F, 0x6E, 0x5F, 0x31,
0x66, 0x69, 0x73, 0x68, 0x5F, 0x6E, 0x5F, 0x32, 0x66, 0x69, 0x73, 0x68, 0x5F, 0x6E, 0x5F, 0x34,
};
COMPILER_STRIP_GATE(80395D90, &fish_n);
COMPILER_STRIP_GATE(0x80395D90, &fish_n);
/* 80395DC0-80395DF0 022420 0030+00 0/1 0/0 0/0 .rodata fish_p0$4061 */
#pragma push
@@ -372,7 +378,7 @@ SECTION_RODATA static u8 const fish_p0[48] = {
0x66, 0x69, 0x5F, 0x70, 0x61, 0x5F, 0x33, 0x6E, 0x66, 0x69, 0x5F, 0x70, 0x61, 0x5F, 0x31, 0x6E,
0x66, 0x69, 0x5F, 0x70, 0x61, 0x5F, 0x32, 0x6E, 0x66, 0x69, 0x5F, 0x70, 0x61, 0x5F, 0x34, 0x6E,
};
COMPILER_STRIP_GATE(80395DC0, &fish_p0);
COMPILER_STRIP_GATE(0x80395DC0, &fish_p0);
#pragma pop
/* 80395DF0-80395E20 022450 0030+00 0/1 0/0 0/0 .rodata fish_p1$4062 */
@@ -383,7 +389,7 @@ SECTION_RODATA static u8 const fish_p1[48] = {
0x66, 0x69, 0x5F, 0x6E, 0x61, 0x5F, 0x33, 0x6E, 0x66, 0x69, 0x5F, 0x6E, 0x61, 0x5F, 0x31, 0x6E,
0x66, 0x69, 0x5F, 0x6E, 0x61, 0x5F, 0x32, 0x6E, 0x66, 0x69, 0x5F, 0x6E, 0x61, 0x5F, 0x34, 0x6E,
};
COMPILER_STRIP_GATE(80395DF0, &fish_p1);
COMPILER_STRIP_GATE(0x80395DF0, &fish_p1);
#pragma pop
/* 80395E20-80395E50 022480 0030+00 0/1 0/0 0/0 .rodata fish_p2$4063 */
@@ -394,7 +400,7 @@ SECTION_RODATA static u8 const fish_p2[48] = {
0x66, 0x69, 0x5F, 0x6C, 0x69, 0x5F, 0x33, 0x6E, 0x66, 0x69, 0x5F, 0x6C, 0x69, 0x5F, 0x31, 0x6E,
0x66, 0x69, 0x5F, 0x6C, 0x69, 0x5F, 0x32, 0x6E, 0x66, 0x69, 0x5F, 0x6C, 0x69, 0x5F, 0x34, 0x6E,
};
COMPILER_STRIP_GATE(80395E20, &fish_p2);
COMPILER_STRIP_GATE(0x80395E20, &fish_p2);
#pragma pop
/* 80395E50-80395E80 0224B0 0030+00 0/1 0/0 0/0 .rodata fish_p3$4064 */
@@ -405,7 +411,7 @@ SECTION_RODATA static u8 const fish_p3[48] = {
0x62, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x33, 0x6E, 0x62, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x31, 0x6E,
0x62, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x32, 0x6E, 0x62, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x34, 0x6E,
};
COMPILER_STRIP_GATE(80395E50, &fish_p3);
COMPILER_STRIP_GATE(0x80395E50, &fish_p3);
#pragma pop
/* 80395E80-80395EB0 0224E0 0030+00 0/1 0/0 0/0 .rodata fish_p4$4065 */
@@ -416,7 +422,7 @@ SECTION_RODATA static u8 const fish_p4[48] = {
0x72, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x33, 0x6E, 0x72, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x31, 0x6E,
0x72, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x32, 0x6E, 0x72, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x34, 0x6E,
};
COMPILER_STRIP_GATE(80395E80, &fish_p4);
COMPILER_STRIP_GATE(0x80395E80, &fish_p4);
#pragma pop
/* 80395EB0-80395EE0 022510 0030+00 0/1 0/0 0/0 .rodata fish_p5$4066 */
@@ -427,7 +433,7 @@ SECTION_RODATA static u8 const fish_p5[48] = {
0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x33, 0x5F, 0x6E, 0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x31, 0x5F, 0x6E,
0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x32, 0x5F, 0x6E, 0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x34, 0x5F, 0x6E,
};
COMPILER_STRIP_GATE(80395EB0, &fish_p5);
COMPILER_STRIP_GATE(0x80395EB0, &fish_p5);
#pragma pop
/* 80395EE0-80395F10 022540 0030+00 0/1 0/0 0/0 .rodata size_1$4081 */
@@ -438,7 +444,7 @@ SECTION_RODATA static u8 const size_1[48] = {
0x73, 0x69, 0x7A, 0x65, 0x5F, 0x74, 0x5F, 0x33, 0x73, 0x69, 0x7A, 0x65, 0x5F, 0x74, 0x5F, 0x31,
0x73, 0x69, 0x7A, 0x65, 0x5F, 0x74, 0x5F, 0x32, 0x73, 0x69, 0x7A, 0x65, 0x5F, 0x74, 0x5F, 0x34,
};
COMPILER_STRIP_GATE(80395EE0, &size_1);
COMPILER_STRIP_GATE(0x80395EE0, &size_1);
#pragma pop
/* 80395F10-80395F40 022570 0030+00 0/1 0/0 0/0 .rodata size_unit_1$4082 */
@@ -449,7 +455,7 @@ SECTION_RODATA static u8 const size_unit_1[48] = {
0x00, 0x00, 0x63, 0x6D, 0x5F, 0x74, 0x5F, 0x33, 0x00, 0x00, 0x63, 0x6D, 0x5F, 0x74, 0x5F, 0x31,
0x00, 0x00, 0x63, 0x6D, 0x5F, 0x74, 0x5F, 0x32, 0x00, 0x00, 0x63, 0x6D, 0x5F, 0x74, 0x5F, 0x34,
};
COMPILER_STRIP_GATE(80395F10, &size_unit_1);
COMPILER_STRIP_GATE(0x80395F10, &size_unit_1);
#pragma pop
/* 80395F40-80395F70 0225A0 0030+00 0/1 0/0 0/0 .rodata count_1$4083 */
@@ -460,7 +466,7 @@ SECTION_RODATA static u8 const count_1[48] = {
0x63, 0x6F, 0x75, 0x6E, 0x74, 0x5F, 0x74, 0x33, 0x63, 0x6F, 0x75, 0x6E, 0x74, 0x5F, 0x74, 0x31,
0x63, 0x6F, 0x75, 0x6E, 0x74, 0x5F, 0x74, 0x32, 0x63, 0x6F, 0x75, 0x6E, 0x74, 0x5F, 0x74, 0x34,
};
COMPILER_STRIP_GATE(80395F40, &count_1);
COMPILER_STRIP_GATE(0x80395F40, &count_1);
#pragma pop
/* 80395F70-80395FA0 0225D0 0030+00 0/1 0/0 0/0 .rodata count_unit_1$4084 */
@@ -471,7 +477,7 @@ SECTION_RODATA static u8 const count_unit_1[48] = {
0x00, 0x63, 0x6F, 0x75, 0x5F, 0x74, 0x5F, 0x33, 0x00, 0x63, 0x6F, 0x75, 0x5F, 0x74, 0x5F, 0x31,
0x00, 0x63, 0x6F, 0x75, 0x5F, 0x74, 0x5F, 0x32, 0x00, 0x63, 0x6F, 0x75, 0x5F, 0x74, 0x5F, 0x34,
};
COMPILER_STRIP_GATE(80395F70, &count_unit_1);
COMPILER_STRIP_GATE(0x80395F70, &count_unit_1);
#pragma pop
/* 80395FA0-80395FD0 022600 0030+00 0/1 0/0 0/0 .rodata name_0$4085 */
@@ -482,7 +488,7 @@ SECTION_RODATA static u8 const name_0[48] = {
0x00, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x33, 0x00, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x31,
0x00, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x32, 0x00, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x34,
};
COMPILER_STRIP_GATE(80395FA0, &name_0);
COMPILER_STRIP_GATE(0x80395FA0, &name_0);
#pragma pop
/* 80395FD0-80396000 022630 0030+00 0/1 0/0 0/0 .rodata fname_0$4086 */
@@ -493,7 +499,7 @@ SECTION_RODATA static u8 const fname_0[48] = {
0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x33, 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x31,
0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x32, 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x34,
};
COMPILER_STRIP_GATE(80395FD0, &fname_0);
COMPILER_STRIP_GATE(0x80395FD0, &fname_0);
#pragma pop
/* 80396000-80396018 022660 0018+00 0/1 0/0 0/0 .rodata name_id$4087 */
@@ -503,7 +509,15 @@ SECTION_RODATA static u8 const name_id[24] = {
0x00, 0x00, 0x05, 0x9E, 0x00, 0x00, 0x05, 0x9D, 0x00, 0x00, 0x05, 0x9B,
0x00, 0x00, 0x05, 0x99, 0x00, 0x00, 0x05, 0x9A, 0x00, 0x00, 0x05, 0x9C,
};
COMPILER_STRIP_GATE(80396000, &name_id);
COMPILER_STRIP_GATE(0x80396000, &name_id);
#pragma pop
/* 80396068-80396068 0226C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80396080 = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_80396090 = "zelda_fish_window.blo";
SECTION_DEAD static char const* const stringBase_803960A6 = "";
#pragma pop
/* 801C55D8-801C5D3C 1BFF18 0764+00 1/1 0/0 0/0 .text screenSetBase__15dMenu_Fishing_cFv
@@ -524,7 +538,7 @@ SECTION_RODATA static u8 const text_a_tag[40] = {
0x5F, 0x32, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x61, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80396018, &text_a_tag);
COMPILER_STRIP_GATE(0x80396018, &text_a_tag);
/* 80396040-80396068 0226A0 0028+00 1/1 0/0 0/0 .rodata text_b_tag$4168 */
SECTION_RODATA static u8 const text_b_tag[40] = {
@@ -532,7 +546,15 @@ SECTION_RODATA static u8 const text_b_tag[40] = {
0x5F, 0x32, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x62, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80396040, &text_b_tag);
COMPILER_STRIP_GATE(0x80396040, &text_b_tag);
/* 80396068-80396068 0226C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803960A7 = "zelda_collect_soubi_do_icon_parts.blo";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803960CD = "\0\0";
#pragma pop
/* 801C5D3C-801C5EB8 1C067C 017C+00 1/1 0/0 0/0 .text screenSetDoIcon__15dMenu_Fishing_cFv */
#pragma push
@@ -616,18 +638,7 @@ asm void __sinit_d_menu_fishing_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801C65BC = (void*)__sinit_d_menu_fishing_cpp;
REGISTER_CTORS(0x801C65BC, __sinit_d_menu_fishing_cpp);
#pragma pop
/* 80396068-803960D0 0226C8 0065+03 5/5 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80396068 = "/res/Layout/fishres.arc";
SECTION_DEAD static char const* const stringBase_80396080 = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_80396090 = "zelda_fish_window.blo";
SECTION_DEAD static char const* const stringBase_803960A6 = "";
SECTION_DEAD static char const* const stringBase_803960A7 = "zelda_collect_soubi_do_icon_parts.blo";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803960CD = "\0\0";
#pragma pop
/* 80396068-80396068 0226C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_fmap.cpp
+32 -31
View File
@@ -104,12 +104,12 @@ struct STControl {
/* 8003219C */ void checkTrigger();
};
struct CSTControl {};
struct JKRExpHeap {
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
};
struct CSTControl {};
struct dMenu_Fmap_c {
/* 801C66E4 */ dMenu_Fmap_c(JKRExpHeap*, STControl*, CSTControl*, u8, u8, u8, f32, f32, u8);
/* 801C6AC8 */ ~dMenu_Fmap_c();
@@ -328,10 +328,10 @@ struct dDlst_list_c {
/* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -637,6 +637,31 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
/* ############################################################################################## */
/* 803960E8-803960E8 022748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803960E8 = "";
SECTION_DEAD static char const* const stringBase_803960E9 = "dat/field.dat";
SECTION_DEAD static char const* const stringBase_803960F7 = "dat/portal.dat";
SECTION_DEAD static char const* const stringBase_80396106 = "F_SP124";
SECTION_DEAD static char const* const stringBase_8039610E = "/res/FieldMap/res-f.arc";
SECTION_DEAD static char const* const stringBase_80396126 = "dat/data.dat";
SECTION_DEAD static char const* const stringBase_80396133 = "%s/stage.dat";
SECTION_DEAD static char const* const stringBase_80396140 = "%s/room%d.dzs";
SECTION_DEAD static char const* const stringBase_8039614E = "tex/region8.bti";
SECTION_DEAD static char const* const stringBase_8039615E = "tex/region%d.bti";
SECTION_DEAD static char const* const stringBase_8039616F = "F_SP115";
SECTION_DEAD static char const* const stringBase_80396177 = "F_SP113";
SECTION_DEAD static char const* const stringBase_8039617F = "F_SP109";
SECTION_DEAD static char const* const stringBase_80396187 = "F_SP108";
SECTION_DEAD static char const* const stringBase_8039618F = "F_SP104";
SECTION_DEAD static char const* const stringBase_80396197 = "F_SP122";
SECTION_DEAD static char const* const stringBase_8039619F = "F_SP111";
SECTION_DEAD static char const* const stringBase_803961A7 = "F_SP116";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803961AF = "";
#pragma pop
/* 803BD090-803BD09C 01A1B0 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -2647,7 +2672,7 @@ SECTION_RODATA static u8 const i_swBit[24] = {
0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x2A,
0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x32,
};
COMPILER_STRIP_GATE(803960D0, &i_swBit);
COMPILER_STRIP_GATE(0x803960D0, &i_swBit);
/* 801CD814-801CD8B4 1C8154 00A0+00 1/1 0/0 0/0 .text howlArrowPosInit__12dMenu_Fmap_cFv
*/
@@ -2714,31 +2739,7 @@ asm void __sinit_d_menu_fmap_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801CDA74 = (void*)__sinit_d_menu_fmap_cpp;
REGISTER_CTORS(0x801CDA74, __sinit_d_menu_fmap_cpp);
#pragma pop
/* 803960E8-803961B0 022748 00C7+01 9/7 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803960E8 = "";
SECTION_DEAD static char const* const stringBase_803960E9 = "dat/field.dat";
SECTION_DEAD static char const* const stringBase_803960F7 = "dat/portal.dat";
SECTION_DEAD static char const* const stringBase_80396106 = "F_SP124";
SECTION_DEAD static char const* const stringBase_8039610E = "/res/FieldMap/res-f.arc";
SECTION_DEAD static char const* const stringBase_80396126 = "dat/data.dat";
SECTION_DEAD static char const* const stringBase_80396133 = "%s/stage.dat";
SECTION_DEAD static char const* const stringBase_80396140 = "%s/room%d.dzs";
SECTION_DEAD static char const* const stringBase_8039614E = "tex/region8.bti";
SECTION_DEAD static char const* const stringBase_8039615E = "tex/region%d.bti";
SECTION_DEAD static char const* const stringBase_8039616F = "F_SP115";
SECTION_DEAD static char const* const stringBase_80396177 = "F_SP113";
SECTION_DEAD static char const* const stringBase_8039617F = "F_SP109";
SECTION_DEAD static char const* const stringBase_80396187 = "F_SP108";
SECTION_DEAD static char const* const stringBase_8039618F = "F_SP104";
SECTION_DEAD static char const* const stringBase_80396197 = "F_SP122";
SECTION_DEAD static char const* const stringBase_8039619F = "F_SP111";
SECTION_DEAD static char const* const stringBase_803961A7 = "F_SP116";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803961AF = "";
#pragma pop
/* 803960E8-803960E8 022748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_fmap2D.cpp
+46 -40
View File
@@ -196,10 +196,10 @@ struct dMenuMapCommon_c {
/* 801C4600 */ void moveLightDropAnime();
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -445,7 +445,17 @@ SECTION_RODATA static u8 const cur_tag_3868[32] = {
0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x72, 0x75, 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x72, 0x64,
0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x6C, 0x64, 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x6C, 0x75,
};
COMPILER_STRIP_GATE(80396248, &cur_tag_3868);
COMPILER_STRIP_GATE(0x80396248, &cur_tag_3868);
/* 803965D0-803965D0 022C30 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803965D0 = "zelda_map_screen_stone_base.blo";
SECTION_DEAD static char const* const stringBase_803965F0 = "zelda_map_screen_base.blo";
SECTION_DEAD static char const* const stringBase_8039660A = "zelda_map_screen_base.btk";
SECTION_DEAD static char const* const stringBase_80396624 = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_80396634 = "zelda_field_map_point_cursor.blo";
#pragma pop
/* 803BD750-803BD760 01A870 0010+00 2/2 0/0 0/0 .data __vt__17dMenu_Fmap2DTop_c */
SECTION_DATA extern void* __vt__17dMenu_Fmap2DTop_c[4] = {
@@ -508,7 +518,7 @@ SECTION_RODATA static u8 const cur_tag_4092[32] = {
0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x72, 0x75, 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x72, 0x64,
0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x6C, 0x64, 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x6C, 0x75,
};
COMPILER_STRIP_GATE(80396268, &cur_tag_4092);
COMPILER_STRIP_GATE(0x80396268, &cur_tag_4092);
/* 804541DC-804541E0 0027DC 0004+00 6/6 0/0 0/0 .sdata2 @4199 */
SECTION_SDATA2 static f32 lit_4199 = 608.0f;
@@ -1279,7 +1289,7 @@ SECTION_RODATA static u8 const area_name[24] = {
0x69, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x73, 0x00, 0x00, 0x69, 0x5F,
0x6E, 0x61, 0x6D, 0x65, 0x00, 0x69, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x31,
};
COMPILER_STRIP_GATE(80396288, &area_name);
COMPILER_STRIP_GATE(0x80396288, &area_name);
#pragma pop
/* 803962A0-803962B8 022900 0018+00 0/1 0/0 0/0 .rodata farea_name$5815 */
@@ -1289,7 +1299,7 @@ SECTION_RODATA static u8 const farea_name_5815[24] = {
0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x31, 0x00, 0x66, 0x5F, 0x6E,
0x61, 0x6D, 0x65, 0x33, 0x00, 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x32,
};
COMPILER_STRIP_GATE(803962A0, &farea_name_5815);
COMPILER_STRIP_GATE(0x803962A0, &farea_name_5815);
#pragma pop
/* 803962B8-803962F0 022918 0038+00 0/1 0/0 0/0 .rodata sfont_name$5821 */
@@ -1301,7 +1311,7 @@ SECTION_RODATA static u8 const sfont_name[56] = {
0x6E, 0x74, 0x6C, 0x32, 0x00, 0x73, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x30, 0x00, 0x73,
0x66, 0x6F, 0x6E, 0x74, 0x62, 0x31, 0x00, 0x73, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x32,
};
COMPILER_STRIP_GATE(803962B8, &sfont_name);
COMPILER_STRIP_GATE(0x803962B8, &sfont_name);
#pragma pop
/* 803962F0-80396328 022950 0038+00 0/1 0/0 0/0 .rodata ffont_name$5822 */
@@ -1313,7 +1323,7 @@ SECTION_RODATA static u8 const ffont_name_5822[56] = {
0x6E, 0x74, 0x6C, 0x32, 0x00, 0x66, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x30, 0x00, 0x66,
0x66, 0x6F, 0x6E, 0x74, 0x62, 0x33, 0x00, 0x66, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x34,
};
COMPILER_STRIP_GATE(803962F0, &ffont_name_5822);
COMPILER_STRIP_GATE(0x803962F0, &ffont_name_5822);
#pragma pop
/* 80396328-80396350 022988 0028+00 0/1 0/0 0/0 .rodata cont_zt$5828 */
@@ -1324,7 +1334,7 @@ SECTION_RODATA static u8 const cont_zt[40] = {
0x74, 0x31, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74,
0x5F, 0x7A, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x34,
};
COMPILER_STRIP_GATE(80396328, &cont_zt);
COMPILER_STRIP_GATE(0x80396328, &cont_zt);
#pragma pop
/* 80396350-80396378 0229B0 0028+00 0/1 0/0 0/0 .rodata font_zt$5829 */
@@ -1335,7 +1345,7 @@ SECTION_RODATA static u8 const font_zt_5829[40] = {
0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74,
0x5F, 0x7A, 0x74, 0x34, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x35,
};
COMPILER_STRIP_GATE(80396350, &font_zt_5829);
COMPILER_STRIP_GATE(0x80396350, &font_zt_5829);
#pragma pop
/* 80396378-803963A0 0229D8 0028+00 0/1 0/0 0/0 .rodata cont_bt$5835 */
@@ -1346,7 +1356,7 @@ SECTION_RODATA static u8 const cont_bt[40] = {
0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74,
0x5F, 0x62, 0x74, 0x34, 0x00, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74,
};
COMPILER_STRIP_GATE(80396378, &cont_bt);
COMPILER_STRIP_GATE(0x80396378, &cont_bt);
#pragma pop
/* 803963A0-803963C8 022A00 0028+00 0/1 0/0 0/0 .rodata font_bt$5836 */
@@ -1357,7 +1367,7 @@ SECTION_RODATA static u8 const font_bt_5836[40] = {
0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74,
0x5F, 0x62, 0x74, 0x34, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x35,
};
COMPILER_STRIP_GATE(803963A0, &font_bt_5836);
COMPILER_STRIP_GATE(0x803963A0, &font_bt_5836);
#pragma pop
/* 803963C8-803963F0 022A28 0028+00 0/1 0/0 0/0 .rodata cont_at$5842 */
@@ -1368,7 +1378,7 @@ SECTION_RODATA static u8 const cont_at[40] = {
0x74, 0x31, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74,
0x5F, 0x61, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x34,
};
COMPILER_STRIP_GATE(803963C8, &cont_at);
COMPILER_STRIP_GATE(0x803963C8, &cont_at);
#pragma pop
/* 803963F0-80396418 022A50 0028+00 0/1 0/0 0/0 .rodata font_at$5843 */
@@ -1379,7 +1389,7 @@ SECTION_RODATA static u8 const font_at_5843[40] = {
0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74,
0x5F, 0x61, 0x74, 0x34, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x35,
};
COMPILER_STRIP_GATE(803963F0, &font_at_5843);
COMPILER_STRIP_GATE(0x803963F0, &font_at_5843);
#pragma pop
/* 80396418-80396440 022A78 0028+00 0/1 0/0 0/0 .rodata juji_c$5849 */
@@ -1390,7 +1400,7 @@ SECTION_RODATA static u8 const juji_c_5849[40] = {
0x30, 0x31, 0x6A, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x32, 0x6A, 0x75, 0x6A, 0x69,
0x5F, 0x63, 0x30, 0x33, 0x6A, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x34,
};
COMPILER_STRIP_GATE(80396418, &juji_c_5849);
COMPILER_STRIP_GATE(0x80396418, &juji_c_5849);
#pragma pop
/* 80396440-80396468 022AA0 0028+00 0/1 0/0 0/0 .rodata fuji_c$5850 */
@@ -1401,7 +1411,7 @@ SECTION_RODATA static u8 const fuji_c[40] = {
0x30, 0x31, 0x66, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x32, 0x66, 0x75, 0x6A, 0x69,
0x5F, 0x63, 0x30, 0x33, 0x66, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x34,
};
COMPILER_STRIP_GATE(80396440, &fuji_c);
COMPILER_STRIP_GATE(0x80396440, &fuji_c);
#pragma pop
/* 80396468-80396490 022AC8 0028+00 0/1 0/0 0/0 .rodata ast_c$5856 */
@@ -1412,7 +1422,7 @@ SECTION_RODATA static u8 const ast_c_5856[40] = {
0x30, 0x31, 0x00, 0x00, 0x61, 0x73, 0x74, 0x5F, 0x30, 0x32, 0x00, 0x00, 0x61, 0x73,
0x74, 0x5F, 0x30, 0x33, 0x00, 0x00, 0x61, 0x73, 0x74, 0x5F, 0x30, 0x34,
};
COMPILER_STRIP_GATE(80396468, &ast_c_5856);
COMPILER_STRIP_GATE(0x80396468, &ast_c_5856);
#pragma pop
/* 80396490-803964B8 022AF0 0028+00 0/1 0/0 0/0 .rodata fst_c$5857 */
@@ -1423,7 +1433,17 @@ SECTION_RODATA static u8 const fst_c[40] = {
0x30, 0x31, 0x00, 0x00, 0x66, 0x73, 0x74, 0x5F, 0x30, 0x32, 0x00, 0x00, 0x66, 0x73,
0x74, 0x5F, 0x30, 0x33, 0x00, 0x00, 0x66, 0x73, 0x74, 0x5F, 0x30, 0x34,
};
COMPILER_STRIP_GATE(80396490, &fst_c);
COMPILER_STRIP_GATE(0x80396490, &fst_c);
#pragma pop
/* 803965D0-803965D0 022C30 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80396655 = "zelda_map_screen_title.blo";
SECTION_DEAD static char const* const stringBase_80396670 = "zelda_map_screen_title.btk";
SECTION_DEAD static char const* const stringBase_8039668B = "";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039668C = "\0\0\0";
#pragma pop
/* 801D5BD0-801D6700 1D0510 0B30+00 0/0 1/1 0/0 .text
@@ -1506,7 +1526,7 @@ SECTION_RODATA static u8 const ffont_name_6110[56] = {
0x6E, 0x74, 0x6C, 0x32, 0x00, 0x66, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x30, 0x00, 0x66,
0x66, 0x6F, 0x6E, 0x74, 0x62, 0x33, 0x00, 0x66, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x34,
};
COMPILER_STRIP_GATE(803964B8, &ffont_name_6110);
COMPILER_STRIP_GATE(0x803964B8, &ffont_name_6110);
/* 801D6F38-801D7010 1D1878 00D8+00 1/1 1/1 0/0 .text setTitleNameString__17dMenu_Fmap2DTop_cFUl
*/
@@ -1525,7 +1545,7 @@ SECTION_RODATA static u8 const farea_name_6125[24] = {
0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x31, 0x00, 0x66, 0x5F, 0x6E,
0x61, 0x6D, 0x65, 0x33, 0x00, 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x32,
};
COMPILER_STRIP_GATE(803964F0, &farea_name_6125);
COMPILER_STRIP_GATE(0x803964F0, &farea_name_6125);
/* 801D7010-801D70E8 1D1950 00D8+00 0/0 2/2 0/0 .text setAreaNameString__17dMenu_Fmap2DTop_cFUl */
#pragma push
@@ -1544,7 +1564,7 @@ SECTION_RODATA static u8 const font_zt_6148[40] = {
0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74,
0x5F, 0x7A, 0x74, 0x34, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x35,
};
COMPILER_STRIP_GATE(80396508, &font_zt_6148);
COMPILER_STRIP_GATE(0x80396508, &font_zt_6148);
/* 801D70E8-801D7210 1D1A28 0128+00 1/1 12/12 0/0 .text setZButtonString__17dMenu_Fmap2DTop_cFUlUc
*/
@@ -1564,7 +1584,7 @@ SECTION_RODATA static u8 const font_bt_6176[40] = {
0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74,
0x5F, 0x62, 0x74, 0x34, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x35,
};
COMPILER_STRIP_GATE(80396530, &font_bt_6176);
COMPILER_STRIP_GATE(0x80396530, &font_bt_6176);
/* 801D7210-801D72D4 1D1B50 00C4+00 1/1 9/9 0/0 .text setBButtonString__17dMenu_Fmap2DTop_cFUlUc
*/
@@ -1584,7 +1604,7 @@ SECTION_RODATA static u8 const font_at_6194[40] = {
0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74,
0x5F, 0x61, 0x74, 0x34, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x35,
};
COMPILER_STRIP_GATE(80396558, &font_at_6194);
COMPILER_STRIP_GATE(0x80396558, &font_at_6194);
/* 801D72D4-801D7398 1D1C14 00C4+00 1/1 14/14 0/0 .text setAButtonString__17dMenu_Fmap2DTop_cFUlUc
*/
@@ -1604,7 +1624,7 @@ SECTION_RODATA static u8 const juji_c_6209[40] = {
0x30, 0x31, 0x66, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x32, 0x66, 0x75, 0x6A, 0x69,
0x5F, 0x63, 0x30, 0x33, 0x66, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x34,
};
COMPILER_STRIP_GATE(80396580, &juji_c_6209);
COMPILER_STRIP_GATE(0x80396580, &juji_c_6209);
/* 801D7398-801D74EC 1D1CD8 0154+00 1/1 8/8 0/0 .text setCrossLRString__17dMenu_Fmap2DTop_cFUl */
#pragma push
@@ -1623,7 +1643,7 @@ SECTION_RODATA static u8 const ast_c_6233[40] = {
0x30, 0x31, 0x00, 0x00, 0x66, 0x73, 0x74, 0x5F, 0x30, 0x32, 0x00, 0x00, 0x66, 0x73,
0x74, 0x5F, 0x30, 0x33, 0x00, 0x00, 0x66, 0x73, 0x74, 0x5F, 0x30, 0x34,
};
COMPILER_STRIP_GATE(803965A8, &ast_c_6233);
COMPILER_STRIP_GATE(0x803965A8, &ast_c_6233);
/* 801D74EC-801D7640 1D1E2C 0154+00 1/1 10/10 0/0 .text set3DStickString__17dMenu_Fmap2DTop_cFUl
*/
@@ -1788,18 +1808,4 @@ static asm void func_801D810C() {
}
#pragma pop
/* 803965D0-80396690 022C30 00BC+04 6/6 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803965D0 = "zelda_map_screen_stone_base.blo";
SECTION_DEAD static char const* const stringBase_803965F0 = "zelda_map_screen_base.blo";
SECTION_DEAD static char const* const stringBase_8039660A = "zelda_map_screen_base.btk";
SECTION_DEAD static char const* const stringBase_80396624 = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_80396634 = "zelda_field_map_point_cursor.blo";
SECTION_DEAD static char const* const stringBase_80396655 = "zelda_map_screen_title.blo";
SECTION_DEAD static char const* const stringBase_80396670 = "zelda_map_screen_title.btk";
SECTION_DEAD static char const* const stringBase_8039668B = "";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039668C = "\0\0\0";
#pragma pop
/* 803965D0-803965D0 022C30 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_fmap_map.cpp
+14 -12
View File
@@ -297,6 +297,15 @@ asm void renderingFmap_c::entry(dMenu_Fmap_world_data_c* param_0, int param_1, f
}
#pragma pop
/* ############################################################################################## */
/* 8039623C-8039623C 02289C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039623C = "F_SP121";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80396244 = "\0\0\0";
#pragma pop
/* 801CE224-801CE288 1C8B64 0064+00 1/1 0/0 0/0 .text isSwitchSpecialOff__15renderingFmap_cFi */
#pragma push
#pragma optimization_level 0
@@ -523,7 +532,7 @@ SECTION_RODATA static u8 const palNo[32] = {
0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x14,
0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x18,
};
COMPILER_STRIP_GATE(803961B0, &palNo);
COMPILER_STRIP_GATE(0x803961B0, &palNo);
/* 801CEB1C-801CEC24 1C945C 0108+00 1/1 0/0 0/0 .text setPointColor__15dMenu_FmapMap_cFf
*/
@@ -817,7 +826,7 @@ SECTION_RODATA static u8 const l_dungeon_onColor[36] = {
0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
0x18, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803961D0, &l_dungeon_onColor);
COMPILER_STRIP_GATE(0x803961D0, &l_dungeon_onColor);
#pragma pop
/* 803961F4-80396218 022854 0024+00 0/1 0/0 0/0 .rodata l_dungeon_stayColor$4187 */
@@ -828,7 +837,7 @@ SECTION_RODATA static u8 const l_dungeon_stayColor[36] = {
0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00,
0x38, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803961F4, &l_dungeon_stayColor);
COMPILER_STRIP_GATE(0x803961F4, &l_dungeon_stayColor);
#pragma pop
/* 80396218-8039623C 022878 0024+00 0/1 0/0 0/0 .rodata l_dungeon_pointColor$4188 */
@@ -839,7 +848,7 @@ SECTION_RODATA static u8 const l_dungeon_pointColor[36] = {
0x00, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00,
0x58, 0x00, 0x00, 0x00, 0x5C, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80396218, &l_dungeon_pointColor);
COMPILER_STRIP_GATE(0x80396218, &l_dungeon_pointColor);
#pragma pop
/* 801CF2A0-801CF394 1C9BE0 00F4+00 1/0 0/0 0/0 .text getColor__15dMenu_FmapMap_cFi */
@@ -901,11 +910,4 @@ void renderingFmap_c::afterDrawPath() {
/* empty function */
}
/* 8039623C-80396248 02289C 0008+04 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8039623C = "F_SP121";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80396244 = "\0\0\0";
#pragma pop
/* 8039623C-8039623C 02289C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_insect.cpp
+55 -28
View File
@@ -78,10 +78,10 @@ struct J2DPicture {
/* 802FC708 */ J2DPicture(ResTIMG const*);
};
struct JMSMesgEntry_c {};
struct JUTFont {};
struct JMSMesgEntry_c {};
struct dMeter2Info_c {
/* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*);
/* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*);
@@ -98,10 +98,10 @@ struct STControl {
/* 800325A0 */ void checkDownTrigger();
};
struct JKRExpHeap {};
struct CSTControl {};
struct JKRExpHeap {};
struct dMenu_Insect_c {
/* 801D8114 */ dMenu_Insect_c(JKRExpHeap*, STControl*, CSTControl*, u8);
/* 801D82F4 */ ~dMenu_Insect_c();
@@ -141,10 +141,10 @@ struct dMenu_Insect_c {
/* 801DA630 */ void draw();
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -311,6 +311,12 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
/* ############################################################################################## */
/* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803968C0 = "tt_block8x8.bti";
#pragma pop
/* 803BD780-803BD78C 01A8A0 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -566,6 +572,12 @@ asm void dMenu_Insect_c::init() {
#pragma pop
/* ############################################################################################## */
/* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803968D0 = "/res/Layout/insectRes.arc";
#pragma pop
/* 80454260-80454268 002860 0008+00 2/2 0/0 0/0 .sdata2 @4020 */
SECTION_SDATA2 static f64 lit_4020 = 4503601774854144.0 /* cast s32 to float */;
@@ -614,6 +626,15 @@ asm void dMenu_Insect_c::wait_move() {
#pragma pop
/* ############################################################################################## */
/* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803968EA = ""
"\x1B"
"CR[%d]";
SECTION_DEAD static char const* const stringBase_803968F2 = "";
#pragma pop
/* 8045426C-80454270 00286C 0004+00 1/1 0/0 0/0 .sdata2 @4135 */
SECTION_SDATA2 static f32 lit_4135 = 48.0f;
@@ -718,7 +739,7 @@ SECTION_RODATA static u8 const insect_tag[192] = {
0x00, 0x00, 0x62, 0x61, 0x74, 0x5F, 0x6F, 0x73, 0x00, 0x62, 0x61, 0x74, 0x5F, 0x6D, 0x65, 0x73,
0x00, 0x74, 0x6F, 0x6E, 0x62, 0x5F, 0x6F, 0x73, 0x74, 0x6F, 0x6E, 0x62, 0x5F, 0x6D, 0x65, 0x73,
};
COMPILER_STRIP_GATE(80396690, &insect_tag);
COMPILER_STRIP_GATE(0x80396690, &insect_tag);
/* 80396750-80396810 022DB0 00C0+00 1/1 0/0 0/0 .rodata ageha_tag$4250 */
SECTION_RODATA static u8 const ageha_tag[192] = {
@@ -735,7 +756,13 @@ SECTION_RODATA static u8 const ageha_tag[192] = {
0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x32, 0x30, 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x32, 0x31,
0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x32, 0x32, 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x32, 0x33,
};
COMPILER_STRIP_GATE(80396750, &ageha_tag);
COMPILER_STRIP_GATE(0x80396750, &ageha_tag);
/* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803968F3 = "zelda_gold_insects.blo";
#pragma pop
/* 801D9644-801D98F0 1D3F84 02AC+00 1/1 0/0 0/0 .text screenSetBase__14dMenu_Insect_cFv
*/
@@ -748,6 +775,13 @@ asm void dMenu_Insect_c::screenSetBase() {
}
#pragma pop
/* ############################################################################################## */
/* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039690A = "zelda_gold_insects_info.blo";
#pragma pop
/* 801D98F0-801D9BD0 1D4230 02E0+00 1/1 0/0 0/0 .text screenSetExplain__14dMenu_Insect_cFv */
#pragma push
#pragma optimization_level 0
@@ -765,7 +799,7 @@ SECTION_RODATA static u8 const text_a_tag[40] = {
0x5F, 0x32, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x61, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80396810, &text_a_tag);
COMPILER_STRIP_GATE(0x80396810, &text_a_tag);
/* 80396838-80396860 022E98 0028+00 1/1 0/0 0/0 .rodata text_b_tag$4329 */
SECTION_RODATA static u8 const text_b_tag[40] = {
@@ -773,7 +807,15 @@ SECTION_RODATA static u8 const text_b_tag[40] = {
0x5F, 0x32, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x62, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80396838, &text_b_tag);
COMPILER_STRIP_GATE(0x80396838, &text_b_tag);
/* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80396926 = "zelda_collect_soubi_do_icon_parts.blo";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039694C = "\0\0\0";
#pragma pop
/* 801D9BD0-801D9D4C 1D4510 017C+00 1/1 0/0 0/0 .text screenSetDoIcon__14dMenu_Insect_cFv
*/
@@ -827,7 +869,7 @@ SECTION_RODATA static u8 const i_evtID[96] = {
0x00, 0x00, 0x01, 0xA1, 0x00, 0x00, 0x01, 0xA2, 0x00, 0x00, 0x01, 0x99, 0x00, 0x00, 0x01, 0x9A,
0x00, 0x00, 0x01, 0x97, 0x00, 0x00, 0x01, 0x98, 0x00, 0x00, 0x01, 0xA3, 0x00, 0x00, 0x01, 0xA4,
};
COMPILER_STRIP_GATE(80396860, &i_evtID);
COMPILER_STRIP_GATE(0x80396860, &i_evtID);
/* 801D9E20-801D9E7C 1D4760 005C+00 4/4 0/0 0/0 .text isGiveInsect__14dMenu_Insect_cFii
*/
@@ -958,22 +1000,7 @@ asm void __sinit_d_menu_insect_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801DA650 = (void*)__sinit_d_menu_insect_cpp;
REGISTER_CTORS(0x801DA650, __sinit_d_menu_insect_cpp);
#pragma pop
/* 803968C0-80396950 022F20 008C+04 8/8 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803968C0 = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_803968D0 = "/res/Layout/insectRes.arc";
SECTION_DEAD static char const* const stringBase_803968EA = ""
"\x1B"
"CR[%d]";
SECTION_DEAD static char const* const stringBase_803968F2 = "";
SECTION_DEAD static char const* const stringBase_803968F3 = "zelda_gold_insects.blo";
SECTION_DEAD static char const* const stringBase_8039690A = "zelda_gold_insects_info.blo";
SECTION_DEAD static char const* const stringBase_80396926 = "zelda_collect_soubi_do_icon_parts.blo";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039694C = "\0\0\0";
#pragma pop
/* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_item_explain.cpp
+35 -28
View File
@@ -52,6 +52,10 @@ struct dMsgScrn3Select_c {
/* 8023A97C */ void getCharSpace();
};
struct ResTIMG {};
struct ResTLUT {};
struct JGeometry {
template <typename A1>
struct TBox2 {};
@@ -59,19 +63,15 @@ struct JGeometry {
struct TBox2__template0 {};
};
struct ResTIMG {};
struct ResTLUT {};
struct J2DPicture {
/* 802FC708 */ J2DPicture(ResTIMG const*);
/* 802FC800 */ J2DPicture(u64, JGeometry::TBox2<f32> const&, ResTIMG const*, ResTLUT const*);
};
struct JMSMesgEntry_c {};
struct JUTFont {};
struct JMSMesgEntry_c {};
struct dMeter2Info_c {
/* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*);
/* 8021C7FC */ void getStringLength(JUTFont*, f32, f32, char*);
@@ -79,18 +79,18 @@ struct dMeter2Info_c {
J2DPicture*, void*, J2DPicture*, int);
};
struct J2DOrthoGraph {};
struct STControl {
/* 8003219C */ void checkTrigger();
/* 80032524 */ void checkUpTrigger();
/* 800325A0 */ void checkDownTrigger();
};
struct JKRExpHeap {};
struct JKRArchive {};
struct J2DOrthoGraph {};
struct JKRExpHeap {};
struct dMenu_ItemExplain_c {
/* 801DA754 */ dMenu_ItemExplain_c(JKRExpHeap*, JKRArchive*, STControl*, bool);
/* 801DAFF0 */ ~dMenu_ItemExplain_c();
@@ -126,10 +126,10 @@ struct dKantera_icon_c {
/* 801AEC44 */ void setNowGauge(u16, u16);
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -303,14 +303,22 @@ SECTION_RODATA static u8 const name_tag[32] = {
0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x34, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x35,
0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x36, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x37,
};
COMPILER_STRIP_GATE(80396950, &name_tag);
COMPILER_STRIP_GATE(0x80396950, &name_tag);
/* 80396970-80396990 022FD0 0020+00 1/1 0/0 0/0 .rodata fame_tag$3884 */
SECTION_RODATA static u8 const fame_tag[32] = {
0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x31, 0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x32,
0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x33, 0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x34,
};
COMPILER_STRIP_GATE(80396970, &fame_tag);
COMPILER_STRIP_GATE(0x80396970, &fame_tag);
/* 80396990-80396990 022FF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80396990 = "zelda_item_screen_info.blo";
SECTION_DEAD static char const* const stringBase_803969AB = "";
SECTION_DEAD static char const* const stringBase_803969AC = "tt_block8x8.bti";
#pragma pop
/* 803BD8C8-803BD8D4 01A9E8 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
@@ -631,6 +639,17 @@ asm void dMenu_ItemExplain_c::move_proc() {
}
#pragma pop
/* ############################################################################################## */
/* 80396990-80396990 022FF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803969BC = ""
"\x1B"
"CR[%d]";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803969C4 = "\0\0\0";
#pragma pop
/* 801DBCB4-801DBF44 1D65F4 0290+00 1/0 0/0 0/0 .text move_select_init__19dMenu_ItemExplain_cFv */
#pragma push
#pragma optimization_level 0
@@ -791,19 +810,7 @@ asm void __sinit_d_menu_item_explain_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801DCC8C = (void*)__sinit_d_menu_item_explain_cpp;
REGISTER_CTORS(0x801DCC8C, __sinit_d_menu_item_explain_cpp);
#pragma pop
/* 80396990-803969C8 022FF0 0034+04 2/2 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80396990 = "zelda_item_screen_info.blo";
SECTION_DEAD static char const* const stringBase_803969AB = "";
SECTION_DEAD static char const* const stringBase_803969AC = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_803969BC = ""
"\x1B"
"CR[%d]";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803969C4 = "\0\0\0";
#pragma pop
/* 80396990-80396990 022FF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_letter.cpp
+74 -41
View File
@@ -45,8 +45,6 @@ struct dSelect_cursor_c {
/* 801952A0 */ void setAlphaRate(f32);
};
struct COutFont_c {};
struct J2DTextBox {
/* 801DFA28 */ void getWhite() const;
/* 801DFA34 */ void getBlack() const;
@@ -56,6 +54,8 @@ struct J2DTextBox {
struct JUTFont {};
struct COutFont_c {};
struct dMsgString_c {
/* 801E1D10 */ void getStringPage(u32, u8, u8, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*,
u8);
@@ -90,10 +90,10 @@ struct STControl {
/* 800325A0 */ void checkDownTrigger();
};
struct JKRExpHeap {};
struct CSTControl {};
struct JKRExpHeap {};
struct dMenu_Letter_c {
/* 801DCDC0 */ dMenu_Letter_c(JKRExpHeap*, STControl*, CSTControl*);
/* 801DCF34 */ ~dMenu_Letter_c();
@@ -143,10 +143,10 @@ struct dMenu_Letter {
static u8 letter_data[512];
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -661,6 +661,12 @@ asm void dMenu_Letter_c::init() {
#pragma pop
/* ############################################################################################## */
/* 80396DC0-80396DC0 023420 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80396DC0 = "/res/Layout/letres.arc";
#pragma pop
/* 80454310-80454318 002910 0008+00 7/7 0/0 0/0 .sdata2 @4171 */
SECTION_SDATA2 static f64 lit_4171 = 4503601774854144.0 /* cast s32 to float */;
@@ -760,6 +766,13 @@ asm void dMenu_Letter_c::slide_left_move() {
}
#pragma pop
/* ############################################################################################## */
/* 80396DC0-80396DC0 023420 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80396DD7 = "%d/%d";
#pragma pop
/* 801DE334-801DE564 1D8C74 0230+00 1/0 0/0 0/0 .text read_open_init__14dMenu_Letter_cFv
*/
#pragma push
@@ -875,7 +888,7 @@ SECTION_RODATA static u8 const tag_sub0[48] = {
0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33, 0x73,
0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x73,
};
COMPILER_STRIP_GATE(803969C8, &tag_sub0);
COMPILER_STRIP_GATE(0x803969C8, &tag_sub0);
/* 803969F8-80396A28 023058 0030+00 0/1 0/0 0/0 .rodata tag_sub1$4611 */
#pragma push
@@ -885,7 +898,7 @@ SECTION_RODATA static u8 const tag_sub1[48] = {
0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33,
0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35,
};
COMPILER_STRIP_GATE(803969F8, &tag_sub1);
COMPILER_STRIP_GATE(0x803969F8, &tag_sub1);
#pragma pop
/* 80396A28-80396A58 023088 0030+00 0/1 0/0 0/0 .rodata tag_name0$4612 */
@@ -896,7 +909,7 @@ SECTION_RODATA static u8 const tag_name0[48] = {
0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x66, 0x38, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x39, 0x73,
0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x30, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x31, 0x73,
};
COMPILER_STRIP_GATE(80396A28, &tag_name0);
COMPILER_STRIP_GATE(0x80396A28, &tag_name0);
#pragma pop
/* 80396A58-80396A88 0230B8 0030+00 0/1 0/0 0/0 .rodata tag_name1$4613 */
@@ -907,7 +920,7 @@ SECTION_RODATA static u8 const tag_name1[48] = {
0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x38, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x39,
0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x30, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x31,
};
COMPILER_STRIP_GATE(80396A58, &tag_name1);
COMPILER_STRIP_GATE(0x80396A58, &tag_name1);
#pragma pop
/* 80396A88-80396AB8 0230E8 0030+00 0/1 0/0 0/0 .rodata ftag_sub0$4614 */
@@ -918,7 +931,7 @@ SECTION_RODATA static u8 const ftag_sub0[48] = {
0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33, 0x73,
0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x73,
};
COMPILER_STRIP_GATE(80396A88, &ftag_sub0);
COMPILER_STRIP_GATE(0x80396A88, &ftag_sub0);
#pragma pop
/* 80396AB8-80396AE8 023118 0030+00 0/1 0/0 0/0 .rodata ftag_sub1$4615 */
@@ -929,7 +942,7 @@ SECTION_RODATA static u8 const ftag_sub1[48] = {
0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33,
0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35,
};
COMPILER_STRIP_GATE(80396AB8, &ftag_sub1);
COMPILER_STRIP_GATE(0x80396AB8, &ftag_sub1);
#pragma pop
/* 80396AE8-80396B18 023148 0030+00 0/1 0/0 0/0 .rodata ftag_name0$4616 */
@@ -940,7 +953,7 @@ SECTION_RODATA static u8 const ftag_name0[48] = {
0x66, 0x65, 0x6E, 0x75, 0x5F, 0x66, 0x38, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x39, 0x73,
0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x30, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x31, 0x73,
};
COMPILER_STRIP_GATE(80396AE8, &ftag_name0);
COMPILER_STRIP_GATE(0x80396AE8, &ftag_name0);
#pragma pop
/* 80396B18-80396B48 023178 0030+00 0/1 0/0 0/0 .rodata ftag_name1$4617 */
@@ -951,7 +964,7 @@ SECTION_RODATA static u8 const ftag_name1[48] = {
0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x38, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x39,
0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x30, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x31,
};
COMPILER_STRIP_GATE(80396B18, &ftag_name1);
COMPILER_STRIP_GATE(0x80396B18, &ftag_name1);
#pragma pop
/* 80396B48-80396B78 0231A8 0030+00 0/1 0/0 0/0 .rodata tag_letter$4628 */
@@ -962,7 +975,7 @@ SECTION_RODATA static u8 const tag_letter[48] = {
0x6C, 0x65, 0x74, 0x5F, 0x30, 0x32, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x33, 0x5F, 0x6E,
0x6C, 0x65, 0x74, 0x5F, 0x30, 0x34, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x35, 0x5F, 0x6E,
};
COMPILER_STRIP_GATE(80396B48, &tag_letter);
COMPILER_STRIP_GATE(0x80396B48, &tag_letter);
#pragma pop
/* 80396B78-80396BA8 0231D8 0030+00 0/1 0/0 0/0 .rodata tag_frame$4635 */
@@ -973,7 +986,7 @@ SECTION_RODATA static u8 const tag_frame[48] = {
0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x32, 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x33,
0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x34, 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x35,
};
COMPILER_STRIP_GATE(80396B78, &tag_frame);
COMPILER_STRIP_GATE(0x80396B78, &tag_frame);
#pragma pop
/* 80396BA8-80396BD8 023208 0030+00 0/1 0/0 0/0 .rodata tag_menu0$4636 */
@@ -984,7 +997,7 @@ SECTION_RODATA static u8 const tag_menu0[48] = {
0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33,
0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35,
};
COMPILER_STRIP_GATE(80396BA8, &tag_menu0);
COMPILER_STRIP_GATE(0x80396BA8, &tag_menu0);
#pragma pop
/* 80396BD8-80396C08 023238 0030+00 0/1 0/0 0/0 .rodata tag_menu1$4637 */
@@ -995,7 +1008,7 @@ SECTION_RODATA static u8 const tag_menu1[48] = {
0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x38, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x39,
0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x30, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x31,
};
COMPILER_STRIP_GATE(80396BD8, &tag_menu1);
COMPILER_STRIP_GATE(0x80396BD8, &tag_menu1);
#pragma pop
/* 80396C08-80396C38 023268 0030+00 0/1 0/0 0/0 .rodata tag_midoku$4638 */
@@ -1006,7 +1019,14 @@ SECTION_RODATA static u8 const tag_midoku[48] = {
0x6D, 0x69, 0x64, 0x6F, 0x6B, 0x75, 0x5F, 0x32, 0x6D, 0x69, 0x64, 0x6F, 0x6B, 0x75, 0x5F, 0x33,
0x6D, 0x69, 0x64, 0x6F, 0x6B, 0x75, 0x5F, 0x34, 0x6D, 0x69, 0x64, 0x6F, 0x6B, 0x75, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80396C08, &tag_midoku);
COMPILER_STRIP_GATE(0x80396C08, &tag_midoku);
#pragma pop
/* 80396DC0-80396DC0 023420 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80396DDD = "zelda_letter_select_6menu.blo";
SECTION_DEAD static char const* const stringBase_80396DFB = "";
#pragma pop
/* 801DF010-801DFA28 1D9950 0A18+00 1/1 0/0 0/0 .text screenSetMenu__14dMenu_Letter_cFv
@@ -1071,7 +1091,7 @@ SECTION_RODATA static u8 const tag_pip[72] = {
0x35, 0x5F, 0x6E, 0x00, 0x70, 0x69, 0x5F, 0x30, 0x36, 0x5F, 0x6E, 0x00, 0x70, 0x69, 0x5F,
0x30, 0x37, 0x5F, 0x6E, 0x00, 0x70, 0x69, 0x5F, 0x30, 0x38, 0x5F, 0x6E,
};
COMPILER_STRIP_GATE(80396C38, &tag_pip);
COMPILER_STRIP_GATE(0x80396C38, &tag_pip);
#pragma pop
/* 80396C80-80396CC8 0232E0 0048+00 0/1 0/0 0/0 .rodata tag_pil$4828 */
@@ -1084,7 +1104,7 @@ SECTION_RODATA static u8 const tag_pil[72] = {
0x5F, 0x30, 0x35, 0x00, 0x70, 0x69, 0x5F, 0x6C, 0x5F, 0x30, 0x36, 0x00, 0x70, 0x69, 0x5F,
0x6C, 0x5F, 0x30, 0x37, 0x00, 0x70, 0x69, 0x5F, 0x6C, 0x5F, 0x30, 0x38,
};
COMPILER_STRIP_GATE(80396C80, &tag_pil);
COMPILER_STRIP_GATE(0x80396C80, &tag_pil);
#pragma pop
/* 80396CC8-80396D10 023328 0048+00 0/1 0/0 0/0 .rodata tag_pii$4829 */
@@ -1097,7 +1117,13 @@ SECTION_RODATA static u8 const tag_pii[72] = {
0x5F, 0x30, 0x35, 0x00, 0x00, 0x00, 0x70, 0x69, 0x5F, 0x30, 0x36, 0x00, 0x00, 0x00, 0x70,
0x69, 0x5F, 0x30, 0x37, 0x00, 0x00, 0x00, 0x70, 0x69, 0x5F, 0x30, 0x38,
};
COMPILER_STRIP_GATE(80396CC8, &tag_pii);
COMPILER_STRIP_GATE(0x80396CC8, &tag_pii);
#pragma pop
/* 80396DC0-80396DC0 023420 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80396DFC = "zelda_letter_select_base.blo";
#pragma pop
/* 801DFA58-801E0330 1DA398 08D8+00 1/1 0/0 0/0 .text screenSetBase__14dMenu_Letter_cFv
@@ -1111,6 +1137,13 @@ asm void dMenu_Letter_c::screenSetBase() {
}
#pragma pop
/* ############################################################################################## */
/* 80396DC0-80396DC0 023420 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80396E19 = "zelda_letter_select_shadow.blo";
#pragma pop
/* 801E0330-801E03D8 1DAC70 00A8+00 1/1 0/0 0/0 .text screenSetShadow__14dMenu_Letter_cFv
*/
#pragma push
@@ -1132,7 +1165,15 @@ SECTION_RODATA static u8 const line_tag[96] = {
0x00, 0x00, 0x6C, 0x69, 0x6E, 0x65, 0x31, 0x37, 0x00, 0x00, 0x6C, 0x69, 0x6E, 0x65, 0x31, 0x38,
0x00, 0x00, 0x6C, 0x69, 0x6E, 0x65, 0x31, 0x39, 0x00, 0x00, 0x6C, 0x69, 0x6E, 0x65, 0x32, 0x30,
};
COMPILER_STRIP_GATE(80396D10, &line_tag);
COMPILER_STRIP_GATE(0x80396D10, &line_tag);
/* 80396DC0-80396DC0 023420 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80396E38 = "zelda_letter_window_base.blo";
SECTION_DEAD static char const* const stringBase_80396E55 = "zelda_letter_window_spot.blo";
SECTION_DEAD static char const* const stringBase_80396E72 = "tt_block8x8.bti";
#pragma pop
/* 801E03D8-801E09A8 1DAD18 05D0+00 1/1 0/0 0/0 .text screenSetLetter__14dMenu_Letter_cFv
*/
@@ -1152,7 +1193,7 @@ SECTION_RODATA static u8 const text_a_tag[40] = {
0x5F, 0x32, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x61, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80396D70, &text_a_tag);
COMPILER_STRIP_GATE(0x80396D70, &text_a_tag);
/* 80396D98-80396DC0 0233F8 0028+00 1/1 0/0 0/0 .rodata text_b_tag$5025 */
SECTION_RODATA static u8 const text_b_tag[40] = {
@@ -1160,7 +1201,13 @@ SECTION_RODATA static u8 const text_b_tag[40] = {
0x5F, 0x32, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x62, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80396D98, &text_b_tag);
COMPILER_STRIP_GATE(0x80396D98, &text_b_tag);
/* 80396DC0-80396DC0 023420 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80396E82 = "zelda_collect_soubi_do_icon_parts.blo";
#pragma pop
/* 801E09A8-801E0B24 1DB2E8 017C+00 1/1 0/0 0/0 .text screenSetDoIcon__14dMenu_Letter_cFv
*/
@@ -1310,21 +1357,7 @@ asm void __sinit_d_menu_letter_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801E1D7C = (void*)__sinit_d_menu_letter_cpp;
REGISTER_CTORS(0x801E1D7C, __sinit_d_menu_letter_cpp);
#pragma pop
/* 80396DC0-80396EA8 023420 00E8+00 10/10 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80396DC0 = "/res/Layout/letres.arc";
SECTION_DEAD static char const* const stringBase_80396DD7 = "%d/%d";
SECTION_DEAD static char const* const stringBase_80396DDD = "zelda_letter_select_6menu.blo";
SECTION_DEAD static char const* const stringBase_80396DFB = "";
SECTION_DEAD static char const* const stringBase_80396DFC = "zelda_letter_select_base.blo";
SECTION_DEAD static char const* const stringBase_80396E19 = "zelda_letter_select_shadow.blo";
SECTION_DEAD static char const* const stringBase_80396E38 = "zelda_letter_window_base.blo";
SECTION_DEAD static char const* const stringBase_80396E55 = "zelda_letter_window_spot.blo";
SECTION_DEAD static char const* const stringBase_80396E72 = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_80396E82 = "zelda_collect_soubi_do_icon_parts.blo";
#pragma pop
/* 80396DC0-80396DC0 023420 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_map_common.cpp
+45 -44
View File
@@ -153,6 +153,50 @@ asm dMenuMapCommon_c::~dMenuMapCommon_c() {
#pragma pop
/* ############################################################################################## */
/* 803959C0-803959C0 022020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803959C0 = "tt_map_icon_boss_s_ci8_16_00.bti";
SECTION_DEAD static char const* const stringBase_803959E1 = "tt_map_icon_boss_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395A00 = "im_map_icon_enter_ci8_24_02.bti";
SECTION_DEAD static char const* const stringBase_80395A20 = "im_map_icon_enter_ci8_02.bti";
SECTION_DEAD static char const* const stringBase_80395A3D = "tt_map_icon_enter_s_ci8_24_00.bti";
SECTION_DEAD static char const* const stringBase_80395A5F = "tt_map_icon_enter_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395A7F = "im_map_icon_warp_24_ci8_00.bti";
SECTION_DEAD static char const* const stringBase_80395A9E = "im_map_icon_warp_32_ci8_00.bti";
SECTION_DEAD static char const* const stringBase_80395ABD = "tt_map_icon_box_s_ci8_24_00.bti";
SECTION_DEAD static char const* const stringBase_80395ADD = "tt_map_icon_box_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395AFB =
"tt_map_icon_s_size_circle_ci4_gray_00.bti";
SECTION_DEAD static char const* const stringBase_80395B25 = "tt_map_icon_key_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395B43 = "tt_map_icon_s_size_circle_ci4_00.bti";
SECTION_DEAD static char const* const stringBase_80395B68 = "st_yuki_M.bti";
SECTION_DEAD static char const* const stringBase_80395B76 = "st_yuki_W.bti";
SECTION_DEAD static char const* const stringBase_80395B84 =
"tt_map_icon_s_size_circle_ci4_yellow_00.bti";
SECTION_DEAD static char const* const stringBase_80395BB0 = "st_gold_wolf.bti";
SECTION_DEAD static char const* const stringBase_80395BC1 = "tt_map_icon_monkey_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395BE2 =
"tt_map_icon_s_size_circle_ci4_blue_00.bti";
SECTION_DEAD static char const* const stringBase_80395C0C = "ni_obacyan.bti";
SECTION_DEAD static char const* const stringBase_80395C1B =
"im_zelda_map_icon_copy_stone_statue_snup_try_00_"
"04.bti";
SECTION_DEAD static char const* const stringBase_80395C52 = "tt_map_icon_link_s_ci8_24_00.bti";
SECTION_DEAD static char const* const stringBase_80395C73 = "tt_map_icon_link_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395C92 = "tt_map_icon_penant_s_ci8_24_00.bti";
SECTION_DEAD static char const* const stringBase_80395CB5 = "tt_map_icon_penant_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395CD6 = "im_black_32.bti";
SECTION_DEAD static char const* const stringBase_80395CE6 =
"im_hikari_no_shizuku_try_10_00_24x24.bti";
SECTION_DEAD static char const* const stringBase_80395D0F = "im_zelda_map_icon_hikari_ball_03.bti";
SECTION_DEAD static char const* const stringBase_80395D34 = "im_map_icon_iron_ball_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395D58 = "im_map_icon_basha_ci8.bti";
SECTION_DEAD static char const* const stringBase_80395D72 = "im_nijumaru_40x40_ind_01.bti";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80395D8F = "";
#pragma pop
/* 804540DC-804540E0 0026DC 0004+00 7/7 0/0 0/0 .sdata2 @3882 */
SECTION_SDATA2 static f32 lit_3882 = 1.0f;
@@ -301,47 +345,4 @@ asm void dMenuMapCommon_c::debugIcon() {
}
#pragma pop
/* 803959C0-80395D90 022020 03CF+01 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803959C0 = "tt_map_icon_boss_s_ci8_16_00.bti";
SECTION_DEAD static char const* const stringBase_803959E1 = "tt_map_icon_boss_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395A00 = "im_map_icon_enter_ci8_24_02.bti";
SECTION_DEAD static char const* const stringBase_80395A20 = "im_map_icon_enter_ci8_02.bti";
SECTION_DEAD static char const* const stringBase_80395A3D = "tt_map_icon_enter_s_ci8_24_00.bti";
SECTION_DEAD static char const* const stringBase_80395A5F = "tt_map_icon_enter_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395A7F = "im_map_icon_warp_24_ci8_00.bti";
SECTION_DEAD static char const* const stringBase_80395A9E = "im_map_icon_warp_32_ci8_00.bti";
SECTION_DEAD static char const* const stringBase_80395ABD = "tt_map_icon_box_s_ci8_24_00.bti";
SECTION_DEAD static char const* const stringBase_80395ADD = "tt_map_icon_box_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395AFB =
"tt_map_icon_s_size_circle_ci4_gray_00.bti";
SECTION_DEAD static char const* const stringBase_80395B25 = "tt_map_icon_key_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395B43 = "tt_map_icon_s_size_circle_ci4_00.bti";
SECTION_DEAD static char const* const stringBase_80395B68 = "st_yuki_M.bti";
SECTION_DEAD static char const* const stringBase_80395B76 = "st_yuki_W.bti";
SECTION_DEAD static char const* const stringBase_80395B84 =
"tt_map_icon_s_size_circle_ci4_yellow_00.bti";
SECTION_DEAD static char const* const stringBase_80395BB0 = "st_gold_wolf.bti";
SECTION_DEAD static char const* const stringBase_80395BC1 = "tt_map_icon_monkey_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395BE2 =
"tt_map_icon_s_size_circle_ci4_blue_00.bti";
SECTION_DEAD static char const* const stringBase_80395C0C = "ni_obacyan.bti";
SECTION_DEAD static char const* const stringBase_80395C1B =
"im_zelda_map_icon_copy_stone_statue_snup_try_00_"
"04.bti";
SECTION_DEAD static char const* const stringBase_80395C52 = "tt_map_icon_link_s_ci8_24_00.bti";
SECTION_DEAD static char const* const stringBase_80395C73 = "tt_map_icon_link_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395C92 = "tt_map_icon_penant_s_ci8_24_00.bti";
SECTION_DEAD static char const* const stringBase_80395CB5 = "tt_map_icon_penant_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395CD6 = "im_black_32.bti";
SECTION_DEAD static char const* const stringBase_80395CE6 =
"im_hikari_no_shizuku_try_10_00_24x24.bti";
SECTION_DEAD static char const* const stringBase_80395D0F = "im_zelda_map_icon_hikari_ball_03.bti";
SECTION_DEAD static char const* const stringBase_80395D34 = "im_map_icon_iron_ball_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395D58 = "im_map_icon_basha_ci8.bti";
SECTION_DEAD static char const* const stringBase_80395D72 = "im_nijumaru_40x40_ind_01.bti";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80395D8F = "";
#pragma pop
/* 803959C0-803959C0 022020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_option.cpp
+80 -76
View File
@@ -28,8 +28,6 @@ struct mDoCPd_c {
struct dSv_player_config_c {
/* 80034684 */ void getSound();
/* 8003468C */ void setSound(u8);
/* 8003469C */ void setVibration(u8);
};
struct J2DBasePosition {};
@@ -174,14 +172,13 @@ struct dFile_warning_c {
};
struct dComIfG_play_c {
/* 8002B3A8 */ void setNowVibration(u8);
/* 8002B3B0 */ void getNowVibration();
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -896,7 +893,7 @@ SECTION_RODATA static u8 const dMo_soundMode[12 + 4 /* padding */] = {
0x00,
0x00,
};
COMPILER_STRIP_GATE(80396EA8, &dMo_soundMode);
COMPILER_STRIP_GATE(0x80396EA8, &dMo_soundMode);
/* 80396EB8-80396EE0 023518 0028+00 0/1 0/0 0/0 .rodata text_a_tag$3904 */
#pragma push
@@ -906,7 +903,7 @@ SECTION_RODATA static u8 const text_a_tag_3904[40] = {
0x5F, 0x32, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x61, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80396EB8, &text_a_tag_3904);
COMPILER_STRIP_GATE(0x80396EB8, &text_a_tag_3904);
#pragma pop
/* 80396EE0-80396F08 023540 0028+00 0/1 0/0 0/0 .rodata text_b_tag$3905 */
@@ -917,7 +914,7 @@ SECTION_RODATA static u8 const text_b_tag_3905[40] = {
0x5F, 0x32, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x62, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80396EE0, &text_b_tag_3905);
COMPILER_STRIP_GATE(0x80396EE0, &text_b_tag_3905);
#pragma pop
/* 80396F08-80396F18 023568 0010+00 0/1 0/0 0/0 .rodata l_tagName012$3918 */
@@ -926,7 +923,7 @@ COMPILER_STRIP_GATE(80396EE0, &text_b_tag_3905);
SECTION_RODATA static u8 const l_tagName012[16] = {
0x00, 0x00, 0x77, 0x5F, 0x6E, 0x6F, 0x5F, 0x6E, 0x00, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x6E,
};
COMPILER_STRIP_GATE(80396F08, &l_tagName012);
COMPILER_STRIP_GATE(0x80396F08, &l_tagName012);
#pragma pop
/* 80396F18-80396F28 023578 0010+00 0/1 0/0 0/0 .rodata l_tagName013$3919 */
@@ -935,7 +932,7 @@ COMPILER_STRIP_GATE(80396F08, &l_tagName012);
SECTION_RODATA static u8 const l_tagName013[16] = {
0x00, 0x00, 0x77, 0x5F, 0x6E, 0x6F, 0x5F, 0x74, 0x00, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x74,
};
COMPILER_STRIP_GATE(80396F18, &l_tagName013);
COMPILER_STRIP_GATE(0x80396F18, &l_tagName013);
#pragma pop
/* 80396F28-80396F38 023588 0010+00 0/1 0/0 0/0 .rodata l_tagName9$3928 */
@@ -944,7 +941,7 @@ COMPILER_STRIP_GATE(80396F18, &l_tagName013);
SECTION_RODATA static u8 const l_tagName9[16] = {
0x00, 0x00, 0x77, 0x5F, 0x6E, 0x6F, 0x5F, 0x6D, 0x00, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x6D,
};
COMPILER_STRIP_GATE(80396F28, &l_tagName9);
COMPILER_STRIP_GATE(0x80396F28, &l_tagName9);
#pragma pop
/* 80396F38-80396F48 023598 0010+00 0/1 0/0 0/0 .rodata l_tagName10$3929 */
@@ -953,7 +950,7 @@ COMPILER_STRIP_GATE(80396F28, &l_tagName9);
SECTION_RODATA static u8 const l_tagName10[16] = {
0x00, 0x00, 0x77, 0x5F, 0x6E, 0x6F, 0x5F, 0x67, 0x00, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x67,
};
COMPILER_STRIP_GATE(80396F38, &l_tagName10);
COMPILER_STRIP_GATE(0x80396F38, &l_tagName10);
#pragma pop
/* 80396F48-80396F58 0235A8 0010+00 0/1 0/0 0/0 .rodata l_tagName11$3930 */
@@ -962,7 +959,24 @@ COMPILER_STRIP_GATE(80396F38, &l_tagName10);
SECTION_RODATA static u8 const l_tagName11[16] = {
0x00, 0x77, 0x5F, 0x6E, 0x6F, 0x5F, 0x67, 0x72, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x67, 0x72,
};
COMPILER_STRIP_GATE(80396F48, &l_tagName11);
COMPILER_STRIP_GATE(0x80396F48, &l_tagName11);
#pragma pop
/* 803975D8-803975D8 023C38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803975D8 = "zelda_option_select_menu.blo";
SECTION_DEAD static char const* const stringBase_803975F5 = "";
SECTION_DEAD static char const* const stringBase_803975F6 = "zelda_option_base.blo";
SECTION_DEAD static char const* const stringBase_8039760C = "zelda_option_menu_text.blo";
SECTION_DEAD static char const* const stringBase_80397627 = "zelda_option_menu_shadow.blo";
SECTION_DEAD static char const* const stringBase_80397644 = "zelda_option_check.blo";
SECTION_DEAD static char const* const stringBase_8039765B = "zelda_collect_soubi_do_icon_parts.blo";
SECTION_DEAD static char const* const stringBase_80397681 = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_80397691 = "zelda_file_select_yes_no_window.blo";
SECTION_DEAD static char const* const stringBase_803976B5 = "zelda_file_select_yes_no_window.bck";
SECTION_DEAD static char const* const stringBase_803976D9 = "zelda_file_select_yes_no_window.bpk";
SECTION_DEAD static char const* const stringBase_803976FD = "zelda_file_select_yes_no_window.btk";
#pragma pop
/* 80454328-8045432C 002928 0002+02 1/1 0/0 0/0 .sdata2 l_msgNum2$3920 */
@@ -1106,6 +1120,13 @@ asm void dMenu_Option_c::setAnimation() {
}
#pragma pop
/* ############################################################################################## */
/* 803975D8-803975D8 023C38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80397721 = "/res/Layout/optres.arc";
#pragma pop
/* 801E3B98-801E3DE0 1DE4D8 0248+00 0/0 2/2 0/0 .text _open__14dMenu_Option_cFv */
#pragma push
#pragma optimization_level 0
@@ -1449,7 +1470,7 @@ SECTION_RODATA static u8 const tag_frame[48] = {
0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x32, 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x33,
0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x34, 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x35,
};
COMPILER_STRIP_GATE(80396F58, &tag_frame);
COMPILER_STRIP_GATE(0x80396F58, &tag_frame);
#pragma pop
/* 80396F88-80396FB8 0235E8 0030+00 0/1 0/0 0/0 .rodata tag_menu0$5202 */
@@ -1460,7 +1481,7 @@ SECTION_RODATA static u8 const tag_menu0[48] = {
0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33,
0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35,
};
COMPILER_STRIP_GATE(80396F88, &tag_menu0);
COMPILER_STRIP_GATE(0x80396F88, &tag_menu0);
#pragma pop
/* 80396FB8-80396FE8 023618 0030+00 0/1 0/0 0/0 .rodata let_n$5214 */
@@ -1471,7 +1492,7 @@ SECTION_RODATA static u8 const let_n[48] = {
0x6C, 0x65, 0x74, 0x5F, 0x30, 0x32, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x33, 0x5F, 0x6E,
0x6C, 0x65, 0x74, 0x5F, 0x30, 0x34, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x35, 0x5F, 0x6E,
};
COMPILER_STRIP_GATE(80396FB8, &let_n);
COMPILER_STRIP_GATE(0x80396FB8, &let_n);
#pragma pop
/* 80396FE8-80397018 023648 0030+00 0/1 0/0 0/0 .rodata let2_n$5215 */
@@ -1482,7 +1503,7 @@ SECTION_RODATA static u8 const let2_n[48] = {
0x6C, 0x65, 0x74, 0x5F, 0x30, 0x32, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x33, 0x5F, 0x6E,
0x6C, 0x65, 0x74, 0x5F, 0x30, 0x34, 0x5F, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80396FE8, &let2_n);
COMPILER_STRIP_GATE(0x80396FE8, &let2_n);
#pragma pop
/* 80397018-80397048 023678 0030+00 0/1 0/0 0/0 .rodata menu_n$5216 */
@@ -1493,7 +1514,7 @@ SECTION_RODATA static u8 const menu_n[48] = {
0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x6E, 0x32, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x6E, 0x33,
0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x6E, 0x34, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x6E, 0x35,
};
COMPILER_STRIP_GATE(80397018, &menu_n);
COMPILER_STRIP_GATE(0x80397018, &menu_n);
#pragma pop
/* 80397048-80397078 0236A8 0030+00 0/1 0/0 0/0 .rodata menu2_n$5217 */
@@ -1504,7 +1525,7 @@ SECTION_RODATA static u8 const menu2_n[48] = {
0x00, 0x00, 0x6D, 0x77, 0x5F, 0x6E, 0x5F, 0x32, 0x00, 0x00, 0x6D, 0x77, 0x5F, 0x6E, 0x5F, 0x33,
0x00, 0x00, 0x6D, 0x77, 0x5F, 0x6E, 0x5F, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80397048, &menu2_n);
COMPILER_STRIP_GATE(0x80397048, &menu2_n);
#pragma pop
/* 80397078-803970A8 0236D8 0030+00 0/1 0/0 0/0 .rodata al0_n$5218 */
@@ -1515,7 +1536,7 @@ SECTION_RODATA static u8 const al0_n[48] = {
0x73, 0x5F, 0x67, 0x72, 0x72, 0x5F, 0x30, 0x32, 0x73, 0x5F, 0x67, 0x72, 0x72, 0x5F, 0x30, 0x33,
0x73, 0x5F, 0x67, 0x72, 0x72, 0x5F, 0x30, 0x34, 0x73, 0x5F, 0x67, 0x72, 0x72, 0x5F, 0x30, 0x35,
};
COMPILER_STRIP_GATE(80397078, &al0_n);
COMPILER_STRIP_GATE(0x80397078, &al0_n);
#pragma pop
/* 803970A8-803970D8 023708 0030+00 0/1 0/0 0/0 .rodata al1_n$5219 */
@@ -1526,7 +1547,7 @@ SECTION_RODATA static u8 const al1_n[48] = {
0x63, 0x5F, 0x67, 0x72, 0x72, 0x5F, 0x30, 0x32, 0x63, 0x5F, 0x67, 0x72, 0x72, 0x5F, 0x30, 0x33,
0x63, 0x5F, 0x67, 0x72, 0x72, 0x5F, 0x30, 0x34, 0x63, 0x5F, 0x67, 0x72, 0x72, 0x5F, 0x30, 0x35,
};
COMPILER_STRIP_GATE(803970A8, &al1_n);
COMPILER_STRIP_GATE(0x803970A8, &al1_n);
#pragma pop
/* 803970D8-80397108 023738 0030+00 0/1 0/0 0/0 .rodata al2_n$5220 */
@@ -1537,7 +1558,7 @@ SECTION_RODATA static u8 const al2_n[48] = {
0x73, 0x5F, 0x67, 0x72, 0x6C, 0x5F, 0x30, 0x32, 0x73, 0x5F, 0x67, 0x72, 0x6C, 0x5F, 0x30, 0x33,
0x73, 0x5F, 0x67, 0x72, 0x6C, 0x5F, 0x30, 0x34, 0x73, 0x5F, 0x67, 0x72, 0x6C, 0x5F, 0x30, 0x35,
};
COMPILER_STRIP_GATE(803970D8, &al2_n);
COMPILER_STRIP_GATE(0x803970D8, &al2_n);
#pragma pop
/* 80397108-80397138 023768 0030+00 0/1 0/0 0/0 .rodata al3_n$5221 */
@@ -1548,7 +1569,7 @@ SECTION_RODATA static u8 const al3_n[48] = {
0x63, 0x5F, 0x67, 0x72, 0x6C, 0x5F, 0x30, 0x32, 0x63, 0x5F, 0x67, 0x72, 0x6C, 0x5F, 0x30, 0x33,
0x63, 0x5F, 0x67, 0x72, 0x6C, 0x5F, 0x30, 0x34, 0x63, 0x5F, 0x67, 0x72, 0x6C, 0x5F, 0x30, 0x35,
};
COMPILER_STRIP_GATE(80397108, &al3_n);
COMPILER_STRIP_GATE(0x80397108, &al3_n);
#pragma pop
/* 80397138-80397160 023798 0028+00 0/1 0/0 0/0 .rodata haihail_n$5238 */
@@ -1559,7 +1580,7 @@ SECTION_RODATA static u8 const haihail_n[40] = {
0x6C, 0x31, 0x79, 0x5F, 0x73, 0x65, 0x74, 0x5F, 0x6C, 0x32, 0x79, 0x5F, 0x73, 0x65,
0x74, 0x5F, 0x6C, 0x33, 0x79, 0x5F, 0x73, 0x65, 0x74, 0x5F, 0x6C, 0x34,
};
COMPILER_STRIP_GATE(80397138, &haihail_n);
COMPILER_STRIP_GATE(0x80397138, &haihail_n);
#pragma pop
/* 80397160-80397188 0237C0 0028+00 0/1 0/0 0/0 .rodata haihair_n$5239 */
@@ -1570,7 +1591,7 @@ SECTION_RODATA static u8 const haihair_n[40] = {
0x72, 0x31, 0x79, 0x5F, 0x73, 0x65, 0x74, 0x5F, 0x72, 0x32, 0x79, 0x5F, 0x73, 0x65,
0x74, 0x5F, 0x72, 0x33, 0x79, 0x5F, 0x73, 0x65, 0x74, 0x5F, 0x72, 0x34,
};
COMPILER_STRIP_GATE(80397160, &haihair_n);
COMPILER_STRIP_GATE(0x80397160, &haihair_n);
#pragma pop
/* 80397188-803971B8 0237E8 0030+00 0/1 0/0 0/0 .rodata menu3_n$5256 */
@@ -1581,7 +1602,7 @@ SECTION_RODATA static u8 const menu3_n[48] = {
0x6D, 0x65, 0x6E, 0x75, 0x61, 0x70, 0x6E, 0x32, 0x6D, 0x65, 0x6E, 0x75, 0x61, 0x70, 0x6E, 0x33,
0x6D, 0x65, 0x6E, 0x75, 0x61, 0x70, 0x6E, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80397188, &menu3_n);
COMPILER_STRIP_GATE(0x80397188, &menu3_n);
#pragma pop
/* 803971B8-803971E0 023818 0028+00 0/1 0/0 0/0 .rodata tv_btnA$5275 */
@@ -1592,7 +1613,7 @@ SECTION_RODATA static u8 const tv_btnA[40] = {
0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74,
0x5F, 0x61, 0x74, 0x34, 0x00, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74,
};
COMPILER_STRIP_GATE(803971B8, &tv_btnA);
COMPILER_STRIP_GATE(0x803971B8, &tv_btnA);
#pragma pop
/* 803971E0-80397208 023840 0028+00 0/1 0/0 0/0 .rodata ftv_btnA$5276 */
@@ -1603,7 +1624,7 @@ SECTION_RODATA static u8 const ftv_btnA[40] = {
0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74,
0x5F, 0x61, 0x74, 0x34, 0x00, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74,
};
COMPILER_STRIP_GATE(803971E0, &ftv_btnA);
COMPILER_STRIP_GATE(0x803971E0, &ftv_btnA);
#pragma pop
/* 80397208-80397218 023868 0010+00 0/1 0/0 0/0 .rodata fenu_t0$5282 */
@@ -1612,7 +1633,7 @@ COMPILER_STRIP_GATE(803971E0, &ftv_btnA);
SECTION_RODATA static u8 const fenu_t0[16] = {
0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x30, 0x73, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x30,
};
COMPILER_STRIP_GATE(80397208, &fenu_t0);
COMPILER_STRIP_GATE(0x80397208, &fenu_t0);
#pragma pop
/* 80397218-80397228 023878 0010+00 0/1 0/0 0/0 .rodata menu_t0$5283 */
@@ -1621,7 +1642,7 @@ COMPILER_STRIP_GATE(80397208, &fenu_t0);
SECTION_RODATA static u8 const menu_t0[16] = {
0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x30, 0x73, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x30,
};
COMPILER_STRIP_GATE(80397218, &menu_t0);
COMPILER_STRIP_GATE(0x80397218, &menu_t0);
#pragma pop
/* 80397228-80397238 023888 0010+00 0/1 0/0 0/0 .rodata fenu_t2$5289 */
@@ -1630,7 +1651,7 @@ COMPILER_STRIP_GATE(80397218, &menu_t0);
SECTION_RODATA static u8 const fenu_t2[16] = {
0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x73, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31,
};
COMPILER_STRIP_GATE(80397228, &fenu_t2);
COMPILER_STRIP_GATE(0x80397228, &fenu_t2);
#pragma pop
/* 80397238-80397248 023898 0010+00 0/1 0/0 0/0 .rodata menu_t2$5290 */
@@ -1639,7 +1660,7 @@ COMPILER_STRIP_GATE(80397228, &fenu_t2);
SECTION_RODATA static u8 const menu_t2[16] = {
0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x73, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31,
};
COMPILER_STRIP_GATE(80397238, &menu_t2);
COMPILER_STRIP_GATE(0x80397238, &menu_t2);
#pragma pop
/* 80397248-80397258 0238A8 0010+00 0/1 0/0 0/0 .rodata fenu_t3$5296 */
@@ -1648,7 +1669,7 @@ COMPILER_STRIP_GATE(80397238, &menu_t2);
SECTION_RODATA static u8 const fenu_t3[16] = {
0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, 0x73, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32,
};
COMPILER_STRIP_GATE(80397248, &fenu_t3);
COMPILER_STRIP_GATE(0x80397248, &fenu_t3);
#pragma pop
/* 80397258-80397268 0238B8 0010+00 0/1 0/0 0/0 .rodata menu_t3$5297 */
@@ -1657,7 +1678,7 @@ COMPILER_STRIP_GATE(80397248, &fenu_t3);
SECTION_RODATA static u8 const menu_t3[16] = {
0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, 0x73, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32,
};
COMPILER_STRIP_GATE(80397258, &menu_t3);
COMPILER_STRIP_GATE(0x80397258, &menu_t3);
#pragma pop
/* 80397268-80397278 0238C8 0010+00 0/1 0/0 0/0 .rodata fenu_t4$5303 */
@@ -1666,7 +1687,7 @@ COMPILER_STRIP_GATE(80397258, &menu_t3);
SECTION_RODATA static u8 const fenu_t4[16] = {
0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33, 0x73, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33,
};
COMPILER_STRIP_GATE(80397268, &fenu_t4);
COMPILER_STRIP_GATE(0x80397268, &fenu_t4);
#pragma pop
/* 80397278-80397288 0238D8 0010+00 0/1 0/0 0/0 .rodata menu_t4$5304 */
@@ -1675,7 +1696,7 @@ COMPILER_STRIP_GATE(80397268, &fenu_t4);
SECTION_RODATA static u8 const menu_t4[16] = {
0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33, 0x73, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33,
};
COMPILER_STRIP_GATE(80397278, &menu_t4);
COMPILER_STRIP_GATE(0x80397278, &menu_t4);
#pragma pop
/* 80397288-80397298 0238E8 0010+00 0/1 0/0 0/0 .rodata fenu_t1$5310 */
@@ -1684,7 +1705,7 @@ COMPILER_STRIP_GATE(80397278, &menu_t4);
SECTION_RODATA static u8 const fenu_t1[16] = {
0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x73, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34,
};
COMPILER_STRIP_GATE(80397288, &fenu_t1);
COMPILER_STRIP_GATE(0x80397288, &fenu_t1);
#pragma pop
/* 80397298-803972A8 0238F8 0010+00 0/1 0/0 0/0 .rodata menu_t1$5311 */
@@ -1693,7 +1714,7 @@ COMPILER_STRIP_GATE(80397288, &fenu_t1);
SECTION_RODATA static u8 const menu_t1[16] = {
0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x73, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34,
};
COMPILER_STRIP_GATE(80397298, &menu_t1);
COMPILER_STRIP_GATE(0x80397298, &menu_t1);
#pragma pop
/* 803972A8-803972B8 023908 0010+00 0/1 0/0 0/0 .rodata fenu_t5$5317 */
@@ -1702,7 +1723,7 @@ COMPILER_STRIP_GATE(80397298, &menu_t1);
SECTION_RODATA static u8 const fenu_t5[16] = {
0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x73, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35,
};
COMPILER_STRIP_GATE(803972A8, &fenu_t5);
COMPILER_STRIP_GATE(0x803972A8, &fenu_t5);
#pragma pop
/* 803972B8-803972C8 023918 0010+00 0/1 0/0 0/0 .rodata menu_t5$5318 */
@@ -1711,7 +1732,7 @@ COMPILER_STRIP_GATE(803972A8, &fenu_t5);
SECTION_RODATA static u8 const menu_t5[16] = {
0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x73, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35,
};
COMPILER_STRIP_GATE(803972B8, &menu_t5);
COMPILER_STRIP_GATE(0x803972B8, &menu_t5);
#pragma pop
/* 803972C8-803972F8 023928 0030+00 0/1 0/0 0/0 .rodata menut_0$5324 */
@@ -1722,7 +1743,7 @@ SECTION_RODATA static u8 const menut_0[48] = {
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x30, 0x61, 0x32, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x30, 0x61, 0x31,
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x30, 0x61, 0x34, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x30, 0x61, 0x33,
};
COMPILER_STRIP_GATE(803972C8, &menut_0);
COMPILER_STRIP_GATE(0x803972C8, &menut_0);
#pragma pop
/* 803972F8-80397328 023958 0030+00 0/1 0/0 0/0 .rodata fenut_0$5325 */
@@ -1733,7 +1754,7 @@ SECTION_RODATA static u8 const fenut_0[48] = {
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x30, 0x61, 0x38, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x30, 0x61, 0x37,
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x30, 0x61, 0x36, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x30, 0x61, 0x35,
};
COMPILER_STRIP_GATE(803972F8, &fenut_0);
COMPILER_STRIP_GATE(0x803972F8, &fenut_0);
#pragma pop
/* 80397328-80397358 023988 0030+00 0/1 0/0 0/0 .rodata menut_1$5332 */
@@ -1744,7 +1765,7 @@ SECTION_RODATA static u8 const menut_1[48] = {
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x31, 0x61, 0x32, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x31, 0x61, 0x31,
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x31, 0x61, 0x34, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x31, 0x61, 0x33,
};
COMPILER_STRIP_GATE(80397328, &menut_1);
COMPILER_STRIP_GATE(0x80397328, &menut_1);
#pragma pop
/* 80397358-80397388 0239B8 0030+00 0/1 0/0 0/0 .rodata fenut_1$5333 */
@@ -1755,7 +1776,7 @@ SECTION_RODATA static u8 const fenut_1[48] = {
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x31, 0x61, 0x38, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x31, 0x61, 0x37,
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x31, 0x61, 0x36, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x31, 0x61, 0x35,
};
COMPILER_STRIP_GATE(80397358, &fenut_1);
COMPILER_STRIP_GATE(0x80397358, &fenut_1);
#pragma pop
/* 80397388-803973B8 0239E8 0030+00 0/1 0/0 0/0 .rodata menut_2$5340 */
@@ -1766,7 +1787,7 @@ SECTION_RODATA static u8 const menut_2[48] = {
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x32, 0x61, 0x32, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x32, 0x61, 0x31,
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x32, 0x61, 0x34, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x32, 0x61, 0x33,
};
COMPILER_STRIP_GATE(80397388, &menut_2);
COMPILER_STRIP_GATE(0x80397388, &menut_2);
#pragma pop
/* 803973B8-803973E8 023A18 0030+00 0/1 0/0 0/0 .rodata fenut_2$5341 */
@@ -1777,7 +1798,7 @@ SECTION_RODATA static u8 const fenut_2[48] = {
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x32, 0x61, 0x38, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x32, 0x61, 0x37,
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x32, 0x61, 0x36, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x32, 0x61, 0x35,
};
COMPILER_STRIP_GATE(803973B8, &fenut_2);
COMPILER_STRIP_GATE(0x803973B8, &fenut_2);
#pragma pop
/* 803973E8-80397418 023A48 0030+00 0/1 0/0 0/0 .rodata menut_3$5348 */
@@ -1788,7 +1809,7 @@ SECTION_RODATA static u8 const menut_3[48] = {
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x61, 0x37, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x61, 0x38,
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x61, 0x39, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x31, 0x30,
};
COMPILER_STRIP_GATE(803973E8, &menut_3);
COMPILER_STRIP_GATE(0x803973E8, &menut_3);
#pragma pop
/* 80397418-80397448 023A78 0030+00 0/1 0/0 0/0 .rodata fenut_3$5349 */
@@ -1799,7 +1820,7 @@ SECTION_RODATA static u8 const fenut_3[48] = {
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x31, 0x33, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x31, 0x32,
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x31, 0x31, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x30, 0x30, 0x31,
};
COMPILER_STRIP_GATE(80397418, &fenut_3);
COMPILER_STRIP_GATE(0x80397418, &fenut_3);
#pragma pop
/* 80397448-80397478 023AA8 0030+00 0/1 0/0 0/0 .rodata menut_4$5356 */
@@ -1810,7 +1831,7 @@ SECTION_RODATA static u8 const menut_4[48] = {
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x61, 0x32, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x61, 0x31,
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x61, 0x34, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x61, 0x33,
};
COMPILER_STRIP_GATE(80397448, &menut_4);
COMPILER_STRIP_GATE(0x80397448, &menut_4);
#pragma pop
/* 80397478-803974A8 023AD8 0030+00 0/1 0/0 0/0 .rodata fenut_4$5357 */
@@ -1821,7 +1842,7 @@ SECTION_RODATA static u8 const fenut_4[48] = {
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x31, 0x39, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x31, 0x38,
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x31, 0x37, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x31, 0x36,
};
COMPILER_STRIP_GATE(80397478, &fenut_4);
COMPILER_STRIP_GATE(0x80397478, &fenut_4);
#pragma pop
/* 803974A8-803974D8 023B08 0030+00 0/1 0/0 0/0 .rodata tx$5381 */
@@ -1832,7 +1853,7 @@ SECTION_RODATA static u8 const tx[48] = {
0x77, 0x5F, 0x70, 0x5F, 0x74, 0x65, 0x78, 0x33, 0x77, 0x5F, 0x70, 0x5F, 0x74, 0x65, 0x78, 0x34,
0x66, 0x70, 0x73, 0x5F, 0x74, 0x65, 0x78, 0x31, 0x66, 0x5F, 0x70, 0x5F, 0x74, 0x65, 0x78, 0x31,
};
COMPILER_STRIP_GATE(803974A8, &tx);
COMPILER_STRIP_GATE(0x803974A8, &tx);
#pragma pop
/* 803974D8-803974F8 023B38 0020+00 0/0 0/0 0/0 .rodata op_tx$5393 */
@@ -1842,7 +1863,7 @@ SECTION_RODATA static u8 const op_tx[32] = {
0x77, 0x5F, 0x74, 0x65, 0x78, 0x74, 0x5F, 0x6E, 0x00, 0x77, 0x5F, 0x62, 0x74, 0x6E, 0x5F, 0x6E,
0x00, 0x77, 0x5F, 0x6B, 0x5F, 0x74, 0x5F, 0x6E, 0x77, 0x5F, 0x61, 0x62, 0x74, 0x6E, 0x5F, 0x6E,
};
COMPILER_STRIP_GATE(803974D8, &op_tx);
COMPILER_STRIP_GATE(0x803974D8, &op_tx);
#pragma pop
/* 803974F8-80397510 023B58 0018+00 0/1 0/0 0/0 .rodata z_tx$5399 */
@@ -1852,7 +1873,7 @@ SECTION_RODATA static u8 const z_tx[24] = {
0x00, 0x00, 0x7A, 0x5F, 0x67, 0x63, 0x5F, 0x6E, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803974F8, &z_tx);
COMPILER_STRIP_GATE(0x803974F8, &z_tx);
#pragma pop
/* 80397510-80397560 023B70 0050+00 0/1 0/0 0/0 .rodata txTV$5409 */
@@ -1865,7 +1886,7 @@ SECTION_RODATA static u8 const txTV[80] = {
0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x37, 0x31, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33,
0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x38, 0x31, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34,
};
COMPILER_STRIP_GATE(80397510, &txTV);
COMPILER_STRIP_GATE(0x80397510, &txTV);
#pragma pop
/* 801E5678-801E6FBC 1DFFB8 1944+00 1/1 0/0 0/0 .text screenSet__14dMenu_Option_cFv */
@@ -2014,7 +2035,7 @@ SECTION_RODATA static u8 const txTVhide[40] = {
0x39, 0x6E, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x30, 0x6E, 0x00, 0x6D, 0x65, 0x6E,
0x75, 0x5F, 0x37, 0x6E, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x38, 0x6E,
};
COMPILER_STRIP_GATE(80397560, &txTVhide);
COMPILER_STRIP_GATE(0x80397560, &txTVhide);
#pragma pop
/* 80397588-803975B0 023BE8 0028+00 1/1 0/0 0/0 .rodata text_a_tag$6194 */
@@ -2023,7 +2044,7 @@ SECTION_RODATA static u8 const text_a_tag_6194[40] = {
0x5F, 0x32, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x61, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80397588, &text_a_tag_6194);
COMPILER_STRIP_GATE(0x80397588, &text_a_tag_6194);
/* 801E7E98-801E7F9C 1E27D8 0104+00 11/11 0/0 0/0 .text setAButtonString__14dMenu_Option_cFUs */
#pragma push
@@ -2042,7 +2063,7 @@ SECTION_RODATA static u8 const text_b_tag_6217[40] = {
0x5F, 0x32, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x62, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(803975B0, &text_b_tag_6217);
COMPILER_STRIP_GATE(0x803975B0, &text_b_tag_6217);
/* 801E7F9C-801E80A0 1E28DC 0104+00 11/11 0/0 0/0 .text setBButtonString__14dMenu_Option_cFUs */
#pragma push
@@ -2229,24 +2250,7 @@ asm void __sinit_d_menu_option_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801E8E8C = (void*)__sinit_d_menu_option_cpp;
REGISTER_CTORS(0x801E8E8C, __sinit_d_menu_option_cpp);
#pragma pop
/* 803975D8-80397738 023C38 0160+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_803975D8 = "zelda_option_select_menu.blo";
SECTION_DEAD static char const* const stringBase_803975F5 = "";
SECTION_DEAD static char const* const stringBase_803975F6 = "zelda_option_base.blo";
SECTION_DEAD static char const* const stringBase_8039760C = "zelda_option_menu_text.blo";
SECTION_DEAD static char const* const stringBase_80397627 = "zelda_option_menu_shadow.blo";
SECTION_DEAD static char const* const stringBase_80397644 = "zelda_option_check.blo";
SECTION_DEAD static char const* const stringBase_8039765B = "zelda_collect_soubi_do_icon_parts.blo";
SECTION_DEAD static char const* const stringBase_80397681 = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_80397691 = "zelda_file_select_yes_no_window.blo";
SECTION_DEAD static char const* const stringBase_803976B5 = "zelda_file_select_yes_no_window.bck";
SECTION_DEAD static char const* const stringBase_803976D9 = "zelda_file_select_yes_no_window.bpk";
SECTION_DEAD static char const* const stringBase_803976FD = "zelda_file_select_yes_no_window.btk";
SECTION_DEAD static char const* const stringBase_80397721 = "/res/Layout/optres.arc";
#pragma pop
/* 803975D8-803975D8 023C38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_ring.cpp
+28 -27
View File
@@ -71,10 +71,10 @@ struct dMeter2Draw_c {
struct STControl {};
struct JKRExpHeap {};
struct CSTControl {};
struct JKRExpHeap {};
struct dMenu_Ring_c {
/* 801E9118 */ dMenu_Ring_c(JKRExpHeap*, STControl*, CSTControl*, u8);
/* 801EA708 */ ~dMenu_Ring_c();
@@ -400,7 +400,7 @@ SECTION_RODATA static u8 const xy_text[40] = {
0x73, 0x31, 0x79, 0x78, 0x5F, 0x74, 0x65, 0x5F, 0x73, 0x32, 0x79, 0x78, 0x5F, 0x74,
0x65, 0x5F, 0x73, 0x33, 0x79, 0x78, 0x5F, 0x74, 0x65, 0x5F, 0x73, 0x34,
};
COMPILER_STRIP_GATE(80397738, &xy_text);
COMPILER_STRIP_GATE(0x80397738, &xy_text);
/* 80397760-80397788 023DC0 0028+00 0/1 0/0 0/0 .rodata fxy_text$4016 */
#pragma push
@@ -410,7 +410,7 @@ SECTION_RODATA static u8 const fxy_text[40] = {
0x5F, 0x31, 0x66, 0x79, 0x78, 0x5F, 0x74, 0x65, 0x5F, 0x32, 0x66, 0x79, 0x78, 0x5F,
0x74, 0x65, 0x5F, 0x33, 0x66, 0x79, 0x78, 0x5F, 0x74, 0x65, 0x5F, 0x34,
};
COMPILER_STRIP_GATE(80397760, &fxy_text);
COMPILER_STRIP_GATE(0x80397760, &fxy_text);
#pragma pop
/* 80397788-803977B0 023DE8 0028+00 0/1 0/0 0/0 .rodata c_text$4022 */
@@ -421,7 +421,7 @@ SECTION_RODATA static u8 const c_text[40] = {
0x73, 0x31, 0x00, 0x63, 0x5F, 0x74, 0x65, 0x5F, 0x73, 0x32, 0x00, 0x63, 0x5F, 0x74,
0x65, 0x5F, 0x73, 0x33, 0x00, 0x63, 0x5F, 0x74, 0x65, 0x5F, 0x73, 0x34,
};
COMPILER_STRIP_GATE(80397788, &c_text);
COMPILER_STRIP_GATE(0x80397788, &c_text);
#pragma pop
/* 803977B0-803977D8 023E10 0028+00 0/1 0/0 0/0 .rodata fc_text$4023 */
@@ -432,7 +432,7 @@ SECTION_RODATA static u8 const fc_text[40] = {
0x73, 0x31, 0x66, 0x63, 0x5F, 0x74, 0x65, 0x5F, 0x73, 0x32, 0x66, 0x63, 0x5F, 0x74,
0x65, 0x5F, 0x73, 0x33, 0x66, 0x63, 0x5F, 0x74, 0x65, 0x5F, 0x73, 0x34,
};
COMPILER_STRIP_GATE(803977B0, &fc_text);
COMPILER_STRIP_GATE(0x803977B0, &fc_text);
#pragma pop
/* 803977D8-80397800 023E38 0028+00 0/1 0/0 0/0 .rodata c_text1$4029 */
@@ -443,7 +443,7 @@ SECTION_RODATA static u8 const c_text1[40] = {
0x73, 0x31, 0x00, 0x63, 0x5F, 0x74, 0x65, 0x78, 0x73, 0x32, 0x00, 0x63, 0x5F, 0x74,
0x65, 0x78, 0x73, 0x33, 0x00, 0x63, 0x5F, 0x74, 0x65, 0x78, 0x73, 0x34,
};
COMPILER_STRIP_GATE(803977D8, &c_text1);
COMPILER_STRIP_GATE(0x803977D8, &c_text1);
#pragma pop
/* 80397800-80397828 023E60 0028+00 0/1 0/0 0/0 .rodata fc_text1$4030 */
@@ -454,7 +454,7 @@ SECTION_RODATA static u8 const fc_text1[40] = {
0x73, 0x31, 0x66, 0x63, 0x5F, 0x74, 0x65, 0x78, 0x73, 0x32, 0x66, 0x63, 0x5F, 0x74,
0x65, 0x78, 0x73, 0x33, 0x66, 0x63, 0x5F, 0x74, 0x65, 0x78, 0x73, 0x34,
};
COMPILER_STRIP_GATE(80397800, &fc_text1);
COMPILER_STRIP_GATE(0x80397800, &fc_text1);
#pragma pop
/* 80397828-80397850 023E88 0028+00 0/1 0/0 0/0 .rodata t_on$4036 */
@@ -465,7 +465,7 @@ SECTION_RODATA static u8 const t_on[40] = {
0x73, 0x35, 0x67, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x36, 0x67, 0x5F, 0x74, 0x6F,
0x66, 0x5F, 0x73, 0x37, 0x67, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x38,
};
COMPILER_STRIP_GATE(80397828, &t_on);
COMPILER_STRIP_GATE(0x80397828, &t_on);
#pragma pop
/* 80397850-80397878 023EB0 0028+00 0/1 0/0 0/0 .rodata ft_on$4037 */
@@ -476,7 +476,7 @@ SECTION_RODATA static u8 const ft_on[40] = {
0x73, 0x35, 0x66, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x36, 0x66, 0x5F, 0x74, 0x6F,
0x66, 0x5F, 0x73, 0x37, 0x66, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x38,
};
COMPILER_STRIP_GATE(80397850, &ft_on);
COMPILER_STRIP_GATE(0x80397850, &ft_on);
#pragma pop
/* 80397878-803978A0 023ED8 0028+00 0/1 0/0 0/0 .rodata t_off$4043 */
@@ -487,7 +487,7 @@ SECTION_RODATA static u8 const t_off[40] = {
0x73, 0x31, 0x67, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x32, 0x67, 0x5F, 0x74, 0x6F,
0x66, 0x5F, 0x73, 0x33, 0x67, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x34,
};
COMPILER_STRIP_GATE(80397878, &t_off);
COMPILER_STRIP_GATE(0x80397878, &t_off);
#pragma pop
/* 803978A0-803978C8 023F00 0028+00 0/1 0/0 0/0 .rodata ft_off$4044 */
@@ -498,7 +498,21 @@ SECTION_RODATA static u8 const ft_off[40] = {
0x73, 0x31, 0x66, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x32, 0x66, 0x5F, 0x74, 0x6F,
0x66, 0x5F, 0x73, 0x33, 0x66, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x34,
};
COMPILER_STRIP_GATE(803978A0, &ft_off);
COMPILER_STRIP_GATE(0x803978A0, &ft_off);
#pragma pop
/* 803978C8-803978C8 023F28 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803978C8 =
"SCRN/zelda_item_select_icon_message_ver2.blo";
SECTION_DEAD static char const* const stringBase_803978F5 = "";
SECTION_DEAD static char const* const stringBase_803978F6 = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_80397906 = "SCRN/zelda_item_select_icon3_spot.blo";
SECTION_DEAD static char const* const stringBase_8039792C =
"SCRN/zelda_item_select_icon3_center_parts.blo";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039795A = "\0\0\0\0\0";
#pragma pop
/* 803BDE70-803BDE7C 01AF90 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
@@ -1296,7 +1310,7 @@ asm void __sinit_d_menu_ring_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801EF580 = (void*)__sinit_d_menu_ring_cpp;
REGISTER_CTORS(0x801EF580, __sinit_d_menu_ring_cpp);
#pragma pop
/* ############################################################################################## */
@@ -1311,17 +1325,4 @@ SECTION_SDATA2 static u8 pad_80454434[4] = {
};
#pragma pop
/* 803978C8-80397960 023F28 0092+06 2/2 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803978C8 =
"SCRN/zelda_item_select_icon_message_ver2.blo";
SECTION_DEAD static char const* const stringBase_803978F5 = "";
SECTION_DEAD static char const* const stringBase_803978F6 = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_80397906 = "SCRN/zelda_item_select_icon3_spot.blo";
SECTION_DEAD static char const* const stringBase_8039792C =
"SCRN/zelda_item_select_icon3_center_parts.blo";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039795A = "\0\0\0\0\0";
#pragma pop
/* 803978C8-803978C8 023F28 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_save.cpp
+29 -17
View File
@@ -268,10 +268,10 @@ struct Z2SeqMgr {
/* 802B3EAC */ void checkBgmIDPlaying(u32);
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
/* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
@@ -1532,6 +1532,12 @@ asm dMenu_save_c::dMenu_save_c() {
#pragma pop
/* ############################################################################################## */
/* 80397960-80397960 023FC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80397960 = "/res/Layout/saveres.arc";
#pragma pop
/* 8042E840-8042E84C 05B560 000C+00 1/1 0/0 0/0 .bss @3785 */
static u8 lit_3785[12];
@@ -1555,6 +1561,18 @@ asm void dMenu_save_c::_create() {
#pragma pop
/* ############################################################################################## */
/* 80397960-80397960 023FC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80397978 = "zelda_file_select2.blo";
SECTION_DEAD static char const* const stringBase_8039798F = "zelda_file_select2.bck";
SECTION_DEAD static char const* const stringBase_803979A6 = "zelda_file_select2.bpk";
SECTION_DEAD static char const* const stringBase_803979BD = "zelda_file_select2_02.btk";
SECTION_DEAD static char const* const stringBase_803979D7 = "zelda_file_select2.btk";
SECTION_DEAD static char const* const stringBase_803979EE = "zelda_file_select2.brk";
SECTION_DEAD static char const* const stringBase_80397A05 = "";
#pragma pop
/* 80450740-80450744 0001C0 0002+02 1/1 0/0 0/0 .sdata l_msgNum0$3868 */
SECTION_SDATA static u8 l_msgNum0[2 + 2 /* padding */] = {
0x08,
@@ -2121,6 +2139,13 @@ asm void dMenu_save_c::dataWrite() {
}
#pragma pop
/* ############################################################################################## */
/* 80397960-80397960 023FC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80397A06 = "save cmdState %d\n";
#pragma pop
/* 801F28E4-801F298C 1ED224 00A8+00 1/0 0/0 0/0 .text memCardDataSaveWait__12dMenu_save_cFv */
#pragma push
#pragma optimization_level 0
@@ -2923,20 +2948,7 @@ asm void __sinit_d_menu_save_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801F6C1C = (void*)__sinit_d_menu_save_cpp;
REGISTER_CTORS(0x801F6C1C, __sinit_d_menu_save_cpp);
#pragma pop
/* 80397960-80397A18 023FC0 00B8+00 6/6 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80397960 = "/res/Layout/saveres.arc";
SECTION_DEAD static char const* const stringBase_80397978 = "zelda_file_select2.blo";
SECTION_DEAD static char const* const stringBase_8039798F = "zelda_file_select2.bck";
SECTION_DEAD static char const* const stringBase_803979A6 = "zelda_file_select2.bpk";
SECTION_DEAD static char const* const stringBase_803979BD = "zelda_file_select2_02.btk";
SECTION_DEAD static char const* const stringBase_803979D7 = "zelda_file_select2.btk";
SECTION_DEAD static char const* const stringBase_803979EE = "zelda_file_select2.brk";
SECTION_DEAD static char const* const stringBase_80397A05 = "";
SECTION_DEAD static char const* const stringBase_80397A06 = "save cmdState %d\n";
#pragma pop
/* 80397960-80397960 023FC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_skill.cpp
+54 -38
View File
@@ -61,10 +61,10 @@ struct STControl {
/* 800325A0 */ void checkDownTrigger();
};
struct JKRExpHeap {};
struct CSTControl {};
struct JKRExpHeap {};
struct dMenu_Skill_c {
/* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*);
/* 801F7348 */ ~dMenu_Skill_c();
@@ -98,10 +98,10 @@ struct dMenu_Skill_c {
/* 801F9A08 */ void draw();
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -487,6 +487,12 @@ asm void dMenu_Skill_c::init() {
#pragma pop
/* ############################################################################################## */
/* 80397DB8-80397DB8 024418 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80397DB8 = "/res/Layout/skillres.arc";
#pragma pop
/* 804544B0-804544B8 002AB0 0008+00 4/4 0/0 0/0 .sdata2 @4016 */
SECTION_SDATA2 static f64 lit_4016 = 4503601774854144.0 /* cast s32 to float */;
@@ -536,14 +542,14 @@ SECTION_RODATA static u8 const i_id[28] = {
0x00, 0x00, 0x06, 0xB4, 0x00, 0x00, 0x06, 0xB3, 0x00, 0x00, 0x06, 0xB5, 0x00, 0x00,
0x06, 0xB6, 0x00, 0x00, 0x06, 0xB7, 0x00, 0x00, 0x06, 0xB8, 0x00, 0x00, 0x06, 0xB9,
};
COMPILER_STRIP_GATE(80397A18, &i_id);
COMPILER_STRIP_GATE(0x80397A18, &i_id);
/* 80397A34-80397A50 024094 001C+00 1/1 0/0 0/0 .rodata i_id1$4088 */
SECTION_RODATA static u8 const i_id1_4088[28] = {
0x00, 0x00, 0x06, 0xAD, 0x00, 0x00, 0x06, 0xAC, 0x00, 0x00, 0x06, 0xAE, 0x00, 0x00,
0x06, 0xAF, 0x00, 0x00, 0x06, 0xB0, 0x00, 0x00, 0x06, 0xB1, 0x00, 0x00, 0x06, 0xB2,
};
COMPILER_STRIP_GATE(80397A34, &i_id1_4088);
COMPILER_STRIP_GATE(0x80397A34, &i_id1_4088);
/* 801F7F24-801F7FF8 1F2864 00D4+00 1/0 0/0 0/0 .text read_open_init__13dMenu_Skill_cFv
*/
@@ -625,7 +631,7 @@ SECTION_RODATA static u8 const tag_sub0[56] = {
0x5F, 0x74, 0x33, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x73, 0x6D, 0x65,
0x6E, 0x75, 0x5F, 0x74, 0x35, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x31,
};
COMPILER_STRIP_GATE(80397A50, &tag_sub0);
COMPILER_STRIP_GATE(0x80397A50, &tag_sub0);
#pragma pop
/* 80397A88-80397AC0 0240E8 0038+00 0/1 0/0 0/0 .rodata tag_sub1$4149 */
@@ -637,7 +643,7 @@ SECTION_RODATA static u8 const tag_sub1[56] = {
0x75, 0x5F, 0x74, 0x33, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x00, 0x6D,
0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x36,
};
COMPILER_STRIP_GATE(80397A88, &tag_sub1);
COMPILER_STRIP_GATE(0x80397A88, &tag_sub1);
#pragma pop
/* 80397AC0-80397AF8 024120 0038+00 0/1 0/0 0/0 .rodata tag_name0$4150 */
@@ -649,7 +655,7 @@ SECTION_RODATA static u8 const tag_name0[56] = {
0x5F, 0x74, 0x39, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x30, 0x73, 0x6D, 0x65,
0x6E, 0x75, 0x5F, 0x31, 0x31, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x31, 0x32,
};
COMPILER_STRIP_GATE(80397AC0, &tag_name0);
COMPILER_STRIP_GATE(0x80397AC0, &tag_name0);
#pragma pop
/* 80397AF8-80397B30 024158 0038+00 0/1 0/0 0/0 .rodata tag_name1$4151 */
@@ -661,7 +667,7 @@ SECTION_RODATA static u8 const tag_name1[56] = {
0x75, 0x5F, 0x74, 0x39, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x30, 0x6D, 0x65,
0x6E, 0x75, 0x5F, 0x74, 0x31, 0x31, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x30, 0x31,
};
COMPILER_STRIP_GATE(80397AF8, &tag_name1);
COMPILER_STRIP_GATE(0x80397AF8, &tag_name1);
#pragma pop
/* 80397B30-80397B68 024190 0038+00 0/1 0/0 0/0 .rodata ftag_sub0$4152 */
@@ -673,7 +679,7 @@ SECTION_RODATA static u8 const ftag_sub0[56] = {
0x5F, 0x74, 0x33, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x73, 0x66, 0x65,
0x6E, 0x75, 0x5F, 0x74, 0x35, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x36, 0x73,
};
COMPILER_STRIP_GATE(80397B30, &ftag_sub0);
COMPILER_STRIP_GATE(0x80397B30, &ftag_sub0);
#pragma pop
/* 80397B68-80397BA0 0241C8 0038+00 0/1 0/0 0/0 .rodata ftag_sub1$4153 */
@@ -685,7 +691,7 @@ SECTION_RODATA static u8 const ftag_sub1[56] = {
0x75, 0x5F, 0x74, 0x33, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x00, 0x66,
0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x36,
};
COMPILER_STRIP_GATE(80397B68, &ftag_sub1);
COMPILER_STRIP_GATE(0x80397B68, &ftag_sub1);
#pragma pop
/* 80397BA0-80397BD8 024200 0038+00 0/1 0/0 0/0 .rodata ftag_name0$4154 */
@@ -697,7 +703,7 @@ SECTION_RODATA static u8 const ftag_name0[56] = {
0x5F, 0x31, 0x30, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x31, 0x73, 0x66, 0x65,
0x6E, 0x75, 0x5F, 0x31, 0x32, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x33, 0x73,
};
COMPILER_STRIP_GATE(80397BA0, &ftag_name0);
COMPILER_STRIP_GATE(0x80397BA0, &ftag_name0);
#pragma pop
/* 80397BD8-80397C10 024238 0038+00 0/1 0/0 0/0 .rodata ftag_name1$4155 */
@@ -709,7 +715,7 @@ SECTION_RODATA static u8 const ftag_name1[56] = {
0x75, 0x5F, 0x31, 0x30, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x31, 0x00, 0x66,
0x65, 0x6E, 0x75, 0x5F, 0x31, 0x32, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x33,
};
COMPILER_STRIP_GATE(80397BD8, &ftag_name1);
COMPILER_STRIP_GATE(0x80397BD8, &ftag_name1);
#pragma pop
/* 80397C10-80397C48 024270 0038+00 0/1 0/0 0/0 .rodata tag_letter$4166 */
@@ -721,7 +727,7 @@ SECTION_RODATA static u8 const tag_letter[56] = {
0x30, 0x33, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x34, 0x5F, 0x6E, 0x6C, 0x65,
0x74, 0x5F, 0x30, 0x35, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x36, 0x5F, 0x6E,
};
COMPILER_STRIP_GATE(80397C10, &tag_letter);
COMPILER_STRIP_GATE(0x80397C10, &tag_letter);
#pragma pop
/* 80397C48-80397C80 0242A8 0038+00 0/1 0/0 0/0 .rodata tag_frame$4173 */
@@ -733,7 +739,7 @@ SECTION_RODATA static u8 const tag_frame[56] = {
0x65, 0x5F, 0x30, 0x33, 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x34, 0x66, 0x6C,
0x61, 0x6D, 0x65, 0x5F, 0x30, 0x35, 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x36,
};
COMPILER_STRIP_GATE(80397C48, &tag_frame);
COMPILER_STRIP_GATE(0x80397C48, &tag_frame);
#pragma pop
/* 80397C80-80397CB8 0242E0 0038+00 0/1 0/0 0/0 .rodata tag_maki$4174 */
@@ -745,7 +751,7 @@ SECTION_RODATA static u8 const tag_maki[56] = {
0x69, 0x5F, 0x33, 0x6E, 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x34, 0x6E, 0x00, 0x6D,
0x61, 0x6B, 0x69, 0x5F, 0x35, 0x6E, 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x36, 0x6E,
};
COMPILER_STRIP_GATE(80397C80, &tag_maki);
COMPILER_STRIP_GATE(0x80397C80, &tag_maki);
#pragma pop
/* 80397CB8-80397CF0 024318 0038+00 0/1 0/0 0/0 .rodata tag_makic$4175 */
@@ -757,7 +763,14 @@ SECTION_RODATA static u8 const tag_makic[56] = {
0x6B, 0x69, 0x5F, 0x33, 0x00, 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x34, 0x00, 0x00,
0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x35, 0x00, 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x36,
};
COMPILER_STRIP_GATE(80397CB8, &tag_makic);
COMPILER_STRIP_GATE(0x80397CB8, &tag_makic);
#pragma pop
/* 80397DB8-80397DB8 024418 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80397DD1 = "zelda_ougi_window.blo";
SECTION_DEAD static char const* const stringBase_80397DE7 = "";
#pragma pop
/* 801F8388-801F8A18 1F2CC8 0690+00 1/1 0/0 0/0 .text screenSetMenu__13dMenu_Skill_cFv */
@@ -776,14 +789,21 @@ SECTION_RODATA static u8 const name_tag[32] = {
0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x34, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x35,
0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x36, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x37,
};
COMPILER_STRIP_GATE(80397CF0, &name_tag);
COMPILER_STRIP_GATE(0x80397CF0, &name_tag);
/* 80397D10-80397D30 024370 0020+00 1/1 0/0 0/0 .rodata fame_tag$4307 */
SECTION_RODATA static u8 const fame_tag[32] = {
0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x31, 0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x32,
0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x33, 0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x34,
};
COMPILER_STRIP_GATE(80397D10, &fame_tag);
COMPILER_STRIP_GATE(0x80397D10, &fame_tag);
/* 80397DB8-80397DB8 024418 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80397DE8 = "zelda_ougi_info.blo";
SECTION_DEAD static char const* const stringBase_80397DFC = "tt_block8x8.bti";
#pragma pop
/* 801F8A18-801F8D20 1F3358 0308+00 1/1 0/0 0/0 .text screenSetLetter__13dMenu_Skill_cFv
*/
@@ -803,7 +823,7 @@ SECTION_RODATA static u8 const text_a_tag[40] = {
0x5F, 0x32, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x61, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80397D30, &text_a_tag);
COMPILER_STRIP_GATE(0x80397D30, &text_a_tag);
/* 80397D58-80397D80 0243B8 0028+00 1/1 0/0 0/0 .rodata text_b_tag$4366 */
SECTION_RODATA static u8 const text_b_tag[40] = {
@@ -811,7 +831,15 @@ SECTION_RODATA static u8 const text_b_tag[40] = {
0x5F, 0x32, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x62, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80397D58, &text_b_tag);
COMPILER_STRIP_GATE(0x80397D58, &text_b_tag);
/* 80397DB8-80397DB8 024418 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80397E0C = "zelda_collect_soubi_do_icon_parts.blo";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80397E32 = "\0\0\0\0\0";
#pragma pop
/* 801F8D20-801F8E9C 1F3660 017C+00 1/1 0/0 0/0 .text screenSetDoIcon__13dMenu_Skill_cFv
*/
@@ -850,14 +878,14 @@ SECTION_RODATA static u8 const i_id0[28] = {
0x00, 0x00, 0x06, 0xA5, 0x00, 0x00, 0x06, 0xA6, 0x00, 0x00, 0x06, 0xA7, 0x00, 0x00,
0x06, 0xA8, 0x00, 0x00, 0x06, 0xA9, 0x00, 0x00, 0x06, 0xAA, 0x00, 0x00, 0x06, 0xAB,
};
COMPILER_STRIP_GATE(80397D80, &i_id0);
COMPILER_STRIP_GATE(0x80397D80, &i_id0);
/* 80397D9C-80397DB8 0243FC 001C+00 1/1 0/0 0/0 .rodata i_id1$4479 */
SECTION_RODATA static u8 const i_id1_4479[28] = {
0x00, 0x00, 0x06, 0xAD, 0x00, 0x00, 0x06, 0xAC, 0x00, 0x00, 0x06, 0xAE, 0x00, 0x00,
0x06, 0xAF, 0x00, 0x00, 0x06, 0xB0, 0x00, 0x00, 0x06, 0xB1, 0x00, 0x00, 0x06, 0xB2,
};
COMPILER_STRIP_GATE(80397D9C, &i_id1_4479);
COMPILER_STRIP_GATE(0x80397D9C, &i_id1_4479);
/* 801F9144-801F9260 1F3A84 011C+00 1/1 0/0 0/0 .text setPageText__13dMenu_Skill_cFv */
#pragma push
@@ -942,19 +970,7 @@ asm void __sinit_d_menu_skill_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801F9A28 = (void*)__sinit_d_menu_skill_cpp;
REGISTER_CTORS(0x801F9A28, __sinit_d_menu_skill_cpp);
#pragma pop
/* 80397DB8-80397E38 024418 007A+06 7/7 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80397DB8 = "/res/Layout/skillres.arc";
SECTION_DEAD static char const* const stringBase_80397DD1 = "zelda_ougi_window.blo";
SECTION_DEAD static char const* const stringBase_80397DE7 = "";
SECTION_DEAD static char const* const stringBase_80397DE8 = "zelda_ougi_info.blo";
SECTION_DEAD static char const* const stringBase_80397DFC = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_80397E0C = "zelda_collect_soubi_do_icon_parts.blo";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80397E32 = "\0\0\0\0\0";
#pragma pop
/* 80397DB8-80397DB8 024418 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_window.cpp
+15 -13
View File
@@ -168,10 +168,10 @@ struct STControl {
/* 8003219C */ void checkTrigger();
};
struct JKRExpHeap {};
struct CSTControl {};
struct JKRExpHeap {};
struct dMenu_Skill_c {
/* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*);
/* 801F7718 */ void _move();
@@ -270,10 +270,10 @@ struct dDlst_MENU_CAPTURE_c {
/* 801FE2E8 */ ~dDlst_MENU_CAPTURE_c();
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -2582,6 +2582,15 @@ asm void dMw_c::markMemSize() {
}
#pragma pop
/* ############################################################################################## */
/* 80397E38-80397E38 024498 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80397E38 = "memory free error!!\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80397E4D = "\0\0";
#pragma pop
/* 801FD0D4-801FD140 1F7A14 006C+00 10/10 0/0 0/0 .text checkMemSize__5dMw_cFv */
#pragma push
#pragma optimization_level 0
@@ -2700,7 +2709,7 @@ asm void __sinit_d_menu_window_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801FD928 = (void*)__sinit_d_menu_window_cpp;
REGISTER_CTORS(0x801FD928, __sinit_d_menu_window_cpp);
#pragma pop
/* ############################################################################################## */
@@ -2727,11 +2736,4 @@ asm dDlst_MENU_CAPTURE_c::~dDlst_MENU_CAPTURE_c() {
}
#pragma pop
/* 80397E38-80397E50 024498 0015+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_80397E38 = "memory free error!!\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80397E4D = "\0\0";
#pragma pop
/* 80397E38-80397E38 024498 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_window_HIO.cpp
+1 -1
View File
@@ -199,5 +199,5 @@ asm void __sinit_d_menu_window_HIO_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801F9F28 = (void*)__sinit_d_menu_window_HIO_cpp;
REGISTER_CTORS(0x801F9F28, __sinit_d_menu_window_HIO_cpp);
#pragma pop