mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-09-03 02:03:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

detect more floats/doubles, including from relocations

Browse Source
This commit is contained in:
Julgodis
2021-04-07 09:16:47 +02:00
parent ed1ee30dd2
commit dca1d2a1c0
1645 changed files with 69992 additions and 69984 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/menu/d_menu_calibration.cpp
+2 -2
View File
@@ -49,10 +49,10 @@ struct dMenu_Calibration_c {
/* 801AFBF4 */ void draw();
};
struct JAISoundID {};
struct Vec {};
struct JAISoundID {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
src/d/menu/d_menu_collect.cpp
+42 -41
View File
@@ -11,14 +11,14 @@
// Types:
//
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);
@@ -62,10 +62,10 @@ struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
struct J2DPane {};
struct JKRArchive {};
struct J2DPane {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
@@ -106,6 +106,14 @@ struct dMenu_save_c {
/* 801F69B8 */ void _draw();
};
struct STControl {
/* 8003219C */ void checkTrigger();
/* 8003242C */ void checkLeftTrigger();
/* 800324A8 */ void checkRightTrigger();
/* 80032524 */ void checkUpTrigger();
/* 800325A0 */ void checkDownTrigger();
};
struct JKRHeap {
/* 802CE5CC */ void freeAll();
/* 802CE784 */ void getTotalFreeSize();
@@ -115,14 +123,6 @@ struct JKRExpHeap {
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
};
struct STControl {
/* 8003219C */ void checkTrigger();
/* 8003242C */ void checkLeftTrigger();
/* 800324A8 */ void checkRightTrigger();
/* 80032524 */ void checkUpTrigger();
/* 800325A0 */ void checkDownTrigger();
};
struct CSTControl {};
struct dMenu_Skill_c {
@@ -289,10 +289,10 @@ struct dDlst_list_c {
/* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
};
struct JAISoundID {};
struct Vec {};
struct JAISoundID {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -1311,7 +1311,7 @@ SECTION_RODATA static u8 const lit_3778[12 + 4 /* padding */] = {
0x00,
0x00,
};
SECTION_DEAD void* const cg_80394F78 = (void*)(&lit_3778);
COMPILER_STRIP_GATE(80394F78, &lit_3778);
/* 80394F88-80394FA0 0215E8 0018+00 0/1 0/0 0/0 .rodata text_sv$4768 */
#pragma push
@@ -1320,7 +1320,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,
};
SECTION_DEAD void* const cg_80394F88 = (void*)(&text_sv);
COMPILER_STRIP_GATE(80394F88, &text_sv);
#pragma pop
/* 80394FA0-80394FB8 021600 0018+00 0/1 0/0 0/0 .rodata text_op$4769 */
@@ -1330,7 +1330,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,
};
SECTION_DEAD void* const cg_80394FA0 = (void*)(&text_op);
COMPILER_STRIP_GATE(80394FA0, &text_op);
#pragma pop
/* 80394FB8-80394FD0 021618 0018+00 0/1 0/0 0/0 .rodata ftext_sv$4770 */
@@ -1340,7 +1340,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,
};
SECTION_DEAD void* const cg_80394FB8 = (void*)(&ftext_sv);
COMPILER_STRIP_GATE(80394FB8, &ftext_sv);
#pragma pop
/* 80394FD0-80394FE8 021630 0018+00 0/1 0/0 0/0 .rodata ftext_op$4771 */
@@ -1350,7 +1350,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,
};
SECTION_DEAD void* const cg_80394FD0 = (void*)(&ftext_op);
COMPILER_STRIP_GATE(80394FD0, &ftext_op);
#pragma pop
/* 80394FE8-80395010 021648 0028+00 0/1 0/0 0/0 .rodata text_a_tag$4777 */
@@ -1361,7 +1361,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,
};
SECTION_DEAD void* const cg_80394FE8 = (void*)(&text_a_tag_4777);
COMPILER_STRIP_GATE(80394FE8, &text_a_tag_4777);
#pragma pop
/* 80395010-80395038 021670 0028+00 0/1 0/0 0/0 .rodata text_b_tag$4778 */
@@ -1372,7 +1372,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,
};
SECTION_DEAD void* const cg_80395010 = (void*)(&text_b_tag_4778);
COMPILER_STRIP_GATE(80395010, &text_b_tag_4778);
#pragma pop
/* 80453F30-80453F34 002530 0004+00 2/2 0/0 0/0 .sdata2 @5173 */
@@ -1455,7 +1455,7 @@ SECTION_RODATA static u8 const lit_5343[9 + 3 /* padding */] = {
0x00,
0x00,
};
SECTION_DEAD void* const cg_80395038 = (void*)(&lit_5343);
COMPILER_STRIP_GATE(80395038, &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 */] = {
@@ -1473,7 +1473,7 @@ SECTION_RODATA static u8 const lit_5344[9 + 3 /* padding */] = {
0x00,
0x00,
};
SECTION_DEAD void* const cg_80395044 = (void*)(&lit_5344);
COMPILER_STRIP_GATE(80395044, &lit_5344);
/* 80453F50-80453F54 002550 0004+00 1/1 0/0 0/0 .sdata2 @5402 */
SECTION_SDATA2 static u32 lit_5402 = 0x03020301;
@@ -1594,7 +1594,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,
};
SECTION_DEAD void* const cg_80395050 = (void*)(&smell_tag);
COMPILER_STRIP_GATE(80395050, &smell_tag);
/* 801B3524-801B3640 1ADE64 011C+00 1/1 0/0 0/0 .text setSmellType__17dMenu_Collect2D_cFv
*/
@@ -1613,7 +1613,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,
};
SECTION_DEAD void* const cg_80395078 = (void*)(&heart_tag);
COMPILER_STRIP_GATE(80395078, &heart_tag);
/* 801B3640-801B370C 1ADF80 00CC+00 1/1 0/0 0/0 .text setHeartPiece__17dMenu_Collect2D_cFv */
#pragma push
@@ -1640,7 +1640,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,
};
SECTION_DEAD void* const cg_80395098 = (void*)(&tag_5980);
COMPILER_STRIP_GATE(80395098, &tag_5980);
/* 801B39D0-801B3CF4 1AE310 0324+00 2/2 0/0 0/0 .text
* setEquipItemFrameColorSword__17dMenu_Collect2D_cFi */
@@ -1658,7 +1658,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,
};
SECTION_DEAD void* const cg_803950A8 = (void*)(&tag_6100);
COMPILER_STRIP_GATE(803950A8, &tag_6100);
/* 801B3CF4-801B3FDC 1AE634 02E8+00 2/2 0/0 0/0 .text
* setEquipItemFrameColorShield__17dMenu_Collect2D_cFi */
@@ -1677,7 +1677,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,
};
SECTION_DEAD void* const cg_803950B8 = (void*)(&tag_6213);
COMPILER_STRIP_GATE(803950B8, &tag_6213);
/* 801B3FDC-801B42D8 1AE91C 02FC+00 2/2 0/0 0/0 .text
* setEquipItemFrameColorClothes__17dMenu_Collect2D_cFi */
@@ -1699,7 +1699,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,
};
SECTION_DEAD void* const cg_803950D0 = (void*)(&kaz_n);
COMPILER_STRIP_GATE(803950D0, &kaz_n);
/* 801B42D8-801B46FC 1AEC18 0424+00 2/2 0/0 0/0 .text setHIO__17dMenu_Collect2D_cFb */
#pragma push
@@ -1736,7 +1736,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,
};
SECTION_DEAD void* const cg_80395118 = (void*)(&itemTag);
COMPILER_STRIP_GATE(80395118, &itemTag);
/* 801B46FC-801B473C 1AF03C 0040+00 3/3 0/0 0/0 .text getItemTag__17dMenu_Collect2D_cFiib
*/
@@ -2183,7 +2183,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,
};
SECTION_DEAD void* const cg_80395268 = (void*)(&text_a_tag_7111);
COMPILER_STRIP_GATE(80395268, &text_a_tag_7111);
/* 801B5FB4-801B60B8 1B08F4 0104+00 20/20 0/0 0/0 .text setAButtonString__17dMenu_Collect2D_cFUs
*/
@@ -2203,7 +2203,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,
};
SECTION_DEAD void* const cg_80395290 = (void*)(&text_b_tag_7134);
COMPILER_STRIP_GATE(80395290, &text_b_tag_7134);
/* 801B60B8-801B61BC 1B09F8 0104+00 20/20 0/0 0/0 .text setBButtonString__17dMenu_Collect2D_cFUs
*/
@@ -2402,7 +2402,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,
};
SECTION_DEAD void* const cg_803952B8 = (void*)(&m_kamen_offset_x);
COMPILER_STRIP_GATE(803952B8, &m_kamen_offset_x);
#pragma pop
/* 803952CC-803952E0 02192C 0014+00 0/1 0/0 0/0 .rodata m_kamen_offset_y$7579 */
@@ -2412,7 +2412,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,
};
SECTION_DEAD void* const cg_803952CC = (void*)(&m_kamen_offset_y);
COMPILER_STRIP_GATE(803952CC, &m_kamen_offset_y);
#pragma pop
/* 803952E0-803952F4 021940 0014+00 0/1 0/0 0/0 .rodata m_kamen_scale$7580 */
@@ -2422,7 +2422,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,
};
SECTION_DEAD void* const cg_803952E0 = (void*)(&m_kamen_scale);
COMPILER_STRIP_GATE(803952E0, &m_kamen_scale);
#pragma pop
/* 801B7014-801B71C4 1B1954 01B0+00 1/1 0/0 0/0 .text createMaskModel__17dMenu_Collect3D_cFv */
@@ -2443,7 +2443,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,
};
SECTION_DEAD void* const cg_803952F4 = (void*)(&m_mirror_offset_x);
COMPILER_STRIP_GATE(803952F4, &m_mirror_offset_x);
#pragma pop
/* 80395308-8039531C 021968 0014+00 0/1 0/0 0/0 .rodata m_mirror_offset_y$7683 */
@@ -2453,7 +2453,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,
};
SECTION_DEAD void* const cg_80395308 = (void*)(&m_mirror_offset_y);
COMPILER_STRIP_GATE(80395308, &m_mirror_offset_y);
#pragma pop
/* 8039531C-80395330 02197C 0014+00 0/1 0/0 0/0 .rodata m_mirror_scale$7684 */
@@ -2463,7 +2463,7 @@ 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,
};
SECTION_DEAD void* const cg_8039531C = (void*)(&m_mirror_scale);
COMPILER_STRIP_GATE(8039531C, &m_mirror_scale);
#pragma pop
/* 801B71C4-801B7434 1B1B04 0270+00 1/1 0/0 0/0 .text createMirrorModel__17dMenu_Collect3D_cFv */
@@ -2510,10 +2510,11 @@ asm void dMenu_Collect3D_c::getMaskMdlVisible() {
/* ############################################################################################## */
/* 80450720-80450728 0001A0 0004+04 1/1 0/0 1/1 .sdata mViewOffsetY__17dMenu_Collect3D_c
*/
SECTION_SDATA extern u32 mViewOffsetY__17dMenu_Collect3D_c[1 + 1 /* padding */] = {
0xC2C80000,
SECTION_SDATA extern f32 mViewOffsetY__17dMenu_Collect3D_c[1 + 1 /* padding */];
SECTION_SDATA f32 mViewOffsetY__17dMenu_Collect3D_c[1 + 1 /* padding */] = {
-100.0f,
/* padding */
0x00000000,
0.0f,
};
/* 80453FC4-80453FC8 0025C4 0004+00 3/3 0/0 0/0 .sdata2 @7944 */
src/d/menu/d_menu_dmap.cpp
+32 -32
View File
@@ -46,6 +46,8 @@ struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
struct JKRArchive {};
struct J2DBasePosition {};
struct J2DPane {
@@ -53,8 +55,6 @@ struct J2DPane {
/* 802F76F8 */ void setBasePosition(J2DBasePosition);
};
struct JKRArchive {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
@@ -86,6 +86,8 @@ struct dMeterHaihai_c {
/* 8020BC20 */ void setScale(f32);
};
struct JMSMesgEntry_c {};
struct ResTIMG {};
struct J2DPicture {
@@ -94,8 +96,6 @@ struct J2DPicture {
/* 802FC708 */ J2DPicture(ResTIMG const*);
};
struct JMSMesgEntry_c {};
struct dMeter2Info_c {
/* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*);
/* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*);
@@ -131,12 +131,6 @@ struct dMenu_StageMapCtrl_c {
/* 801C2590 */ void setPlusZoomCenterZ(f32);
};
struct JKRExpHeap {
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
};
struct J2DOrthoGraph {};
struct STControl {
/* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16);
/* 8003219C */ void checkTrigger();
@@ -146,6 +140,12 @@ struct STControl {
/* 800325A0 */ void checkDownTrigger();
};
struct JKRExpHeap {
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
};
struct J2DOrthoGraph {};
struct dMenu_ItemExplain_c {
/* 801DA754 */ dMenu_ItemExplain_c(JKRExpHeap*, JKRArchive*, STControl*, bool);
/* 801DB470 */ void move();
@@ -153,8 +153,6 @@ struct dMenu_ItemExplain_c {
/* 801DC3C8 */ void openExplainDmap(u8, u8, u8, bool, u8);
};
struct CSTControl {};
struct JGeometry {
template <typename A1>
struct TBox2 {};
@@ -173,6 +171,8 @@ struct J2DScreen {
/* 802F9690 */ void animation();
};
struct CSTControl {};
struct dMenu_Dmap_c {
/* 801BB498 */ dMenu_Dmap_c(JKRExpHeap*, STControl*, CSTControl*, u8, u8);
/* 801BB634 */ void screenInit();
@@ -280,10 +280,10 @@ struct dDlst_list_c {
/* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
};
struct JAISoundID {};
struct Vec {};
struct JAISoundID {};
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);
@@ -1223,7 +1223,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,
};
SECTION_DEAD void* const cg_80395518 = (void*)(&cont_at_4145);
COMPILER_STRIP_GATE(80395518, &cont_at_4145);
/* 80395540-80395568 021BA0 0028+00 0/1 0/0 0/0 .rodata cont_bt$4146 */
#pragma push
@@ -1233,7 +1233,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,
};
SECTION_DEAD void* const cg_80395540 = (void*)(&cont_bt_4146);
COMPILER_STRIP_GATE(80395540, &cont_bt_4146);
#pragma pop
/* 80395568-80395590 021BC8 0028+00 0/1 0/0 0/0 .rodata font_at$4147 */
@@ -1244,7 +1244,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,
};
SECTION_DEAD void* const cg_80395568 = (void*)(&font_at);
COMPILER_STRIP_GATE(80395568, &font_at);
#pragma pop
/* 80395590-803955B8 021BF0 0028+00 0/1 0/0 0/0 .rodata font_bt$4148 */
@@ -1255,7 +1255,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,
};
SECTION_DEAD void* const cg_80395590 = (void*)(&font_bt);
COMPILER_STRIP_GATE(80395590, &font_bt);
#pragma pop
/* 803955B8-803955C8 021C18 0010+00 0/1 0/0 0/0 .rodata c_tag$4155 */
@@ -1264,7 +1264,7 @@ SECTION_DEAD void* const cg_80395590 = (void*)(&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,
};
SECTION_DEAD void* const cg_803955B8 = (void*)(&c_tag_4155);
COMPILER_STRIP_GATE(803955B8, &c_tag_4155);
#pragma pop
/* 80454004-80454008 002604 0004+00 1/1 0/0 0/0 .sdata2 @4191 */
@@ -1290,7 +1290,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,
};
SECTION_DEAD void* const cg_803955C8 = (void*)(&cont_at_4196);
COMPILER_STRIP_GATE(803955C8, &cont_at_4196);
/* 801B8DE4-801B8EBC 1B3724 00D8+00 7/7 0/0 0/0 .text setAButtonString__14dMenu_DmapBg_cFUl */
#pragma push
@@ -1309,7 +1309,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,
};
SECTION_DEAD void* const cg_803955F0 = (void*)(&cont_bt_4211);
COMPILER_STRIP_GATE(803955F0, &cont_bt_4211);
/* 801B8EBC-801B8F94 1B37FC 00D8+00 8/8 0/0 0/0 .text setBButtonString__14dMenu_DmapBg_cFUl */
#pragma push
@@ -1326,13 +1326,13 @@ 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,
};
SECTION_DEAD void* const cg_80395618 = (void*)(&c_tag_4229);
COMPILER_STRIP_GATE(80395618, &c_tag_4229);
/* 80451078-8045107C 000578 0004+00 1/1 0/0 0/0 .sbss player_px */
static u8 player_px[4];
static f32 player_px;
/* 8045107C-80451080 00057C 0004+00 1/1 0/0 0/0 .sbss player_py */
static u8 player_py[4];
static f32 player_py;
/* 80451080-80451088 000580 0004+04 6/6 0/0 0/0 .sbss myclass__12dMenu_Dmap_c */
static u8 myclass__12dMenu_Dmap_c[4 + 4 /* padding */];
@@ -1443,7 +1443,7 @@ SECTION_RODATA static u8 const lit_4325[26 + 6 /* padding */] = {
0x00,
0x00,
};
SECTION_DEAD void* const cg_80395628 = (void*)(&lit_4325);
COMPILER_STRIP_GATE(80395628, &lit_4325);
/* 801B944C-801BA0B4 1B3D8C 0C68+00 1/1 0/0 0/0 .text setFloorMessage__14dMenu_DmapBg_cFv
*/
@@ -1612,7 +1612,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,
};
SECTION_DEAD void* const cg_80395648 = (void*)(&floor_tag);
COMPILER_STRIP_GATE(80395648, &floor_tag);
#pragma pop
/* 80395688-803956C8 021CE8 0040+00 0/1 0/0 0/0 .rodata icon_tag$4933 */
@@ -1624,7 +1624,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,
};
SECTION_DEAD void* const cg_80395688 = (void*)(&icon_tag);
COMPILER_STRIP_GATE(80395688, &icon_tag);
#pragma pop
/* 803956C8-80395708 021D28 0040+00 0/1 0/0 0/0 .rodata boss_tag$4934 */
@@ -1636,7 +1636,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,
};
SECTION_DEAD void* const cg_803956C8 = (void*)(&boss_tag);
COMPILER_STRIP_GATE(803956C8, &boss_tag);
#pragma pop
/* 80395708-80395718 021D68 0010+00 0/1 0/0 0/0 .rodata stay_tag$4935 */
@@ -1645,7 +1645,7 @@ SECTION_DEAD void* const cg_803956C8 = (void*)(&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,
};
SECTION_DEAD void* const cg_80395708 = (void*)(&stay_tag);
COMPILER_STRIP_GATE(80395708, &stay_tag);
#pragma pop
/* 80395718-80395730 021D78 0018+00 0/1 0/0 0/0 .rodata waku_tag$4973 */
@@ -1655,7 +1655,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,
};
SECTION_DEAD void* const cg_80395718 = (void*)(&waku_tag);
COMPILER_STRIP_GATE(80395718, &waku_tag);
#pragma pop
/* 80395730-80395748 021D90 0018+00 0/1 0/0 0/0 .rodata key_tag$5002 */
@@ -1665,7 +1665,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,
};
SECTION_DEAD void* const cg_80395730 = (void*)(&key_tag);
COMPILER_STRIP_GATE(80395730, &key_tag);
#pragma pop
/* 80395748-80395760 021DA8 0018+00 0/1 0/0 0/0 .rodata item_tag$5040 */
@@ -1675,7 +1675,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,
};
SECTION_DEAD void* const cg_80395748 = (void*)(&item_tag);
COMPILER_STRIP_GATE(80395748, &item_tag);
#pragma pop
/* 8045404C-80454050 00264C 0004+00 1/1 0/0 0/0 .sdata2 @5277 */
src/d/menu/d_menu_dmap_map.cpp
+10 -10
View File
@@ -45,6 +45,8 @@ struct renderingDmap_c {
/* 801C263C */ bool isRendIcon() const;
};
struct Vec {};
struct dDrawPath_c {
struct line_class {};
@@ -62,8 +64,6 @@ struct dDrawPath_c {
/* 8003CCC4 */ void drawPath();
};
struct Vec {};
struct renderingDAmap_c {
/* 8003FCC8 */ void init(u8*, u16, u16, u16, u16);
/* 8003FD08 */ void entry(f32, f32, f32, int, s8);
@@ -605,7 +605,7 @@ SECTION_RODATA static void* const l_paletteDmap_m[60] = {
(void*)NULL,
(void*)NULL,
};
SECTION_DEAD void* const cg_80395860 = (void*)(&l_paletteDmap_m);
COMPILER_STRIP_GATE(80395860, &l_paletteDmap_m);
/* 80395950-80395974 021FB0 0024+00 0/1 0/0 0/0 .rodata l_dungeon_offColor$3841 */
#pragma push
@@ -615,7 +615,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,
};
SECTION_DEAD void* const cg_80395950 = (void*)(&l_dungeon_offColor);
COMPILER_STRIP_GATE(80395950, &l_dungeon_offColor);
#pragma pop
/* 80395974-80395998 021FD4 0024+00 0/1 0/0 0/0 .rodata l_dungeon_onColor$3842 */
@@ -626,7 +626,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,
};
SECTION_DEAD void* const cg_80395974 = (void*)(&l_dungeon_onColor);
COMPILER_STRIP_GATE(80395974, &l_dungeon_onColor);
#pragma pop
/* 80395998-803959C0 021FF8 0024+04 0/1 0/0 0/0 .rodata l_dungeon_stayColor$3843 */
@@ -675,7 +675,7 @@ SECTION_RODATA static u8 const l_dungeon_stayColor[36 + 4 /* padding */] = {
0x00,
0x00,
};
SECTION_DEAD void* const cg_80395998 = (void*)(&l_dungeon_stayColor);
COMPILER_STRIP_GATE(80395998, &l_dungeon_stayColor);
#pragma pop
/* 801C0C48-801C0CB8 1BB588 0070+00 1/0 0/0 0/0 .text getColor__15renderingDmap_cFi */
@@ -1311,16 +1311,16 @@ asm void dMenu_StageMapCtrl_c::_create(u16 param_0, u16 param_1, u16 param_2, u1
/* ############################################################################################## */
/* 8045108C-80451090 00058C 0004+00 1/1 0/0 0/0 .sbss m_zoomCenterMinX__20dMenu_StageMapCtrl_c */
static u8 m_zoomCenterMinX__20dMenu_StageMapCtrl_c[4];
static f32 m_zoomCenterMinX__20dMenu_StageMapCtrl_c;
/* 80451090-80451094 000590 0004+00 1/1 0/0 0/0 .sbss m_zoomCenterMaxX__20dMenu_StageMapCtrl_c */
static u8 m_zoomCenterMaxX__20dMenu_StageMapCtrl_c[4];
static f32 m_zoomCenterMaxX__20dMenu_StageMapCtrl_c;
/* 80451094-80451098 000594 0004+00 1/1 0/0 0/0 .sbss m_zoomCenterMinZ__20dMenu_StageMapCtrl_c */
static u8 m_zoomCenterMinZ__20dMenu_StageMapCtrl_c[4];
static f32 m_zoomCenterMinZ__20dMenu_StageMapCtrl_c;
/* 80451098-804510A0 000598 0004+04 1/1 0/0 0/0 .sbss m_zoomCenterMaxZ__20dMenu_StageMapCtrl_c */
static u8 m_zoomCenterMaxZ__20dMenu_StageMapCtrl_c[4 + 4 /* padding */];
static f32 m_zoomCenterMaxZ__20dMenu_StageMapCtrl_c[1 + 1 /* padding */];
/* 804540C8-804540CC 0026C8 0004+00 1/1 0/0 0/0 .sdata2 @4460 */
SECTION_SDATA2 static f32 lit_4460 = 6.0f / 5.0f;
src/d/menu/d_menu_fishing.cpp
+18 -18
View File
@@ -28,10 +28,10 @@ struct dMeter2Info_c {
/* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*);
};
struct JKRExpHeap {};
struct STControl {};
struct JKRExpHeap {};
struct CSTControl {};
struct dMenu_Fishing_c {
@@ -354,7 +354,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,
};
SECTION_DEAD void* const cg_80395D90 = (void*)(&fish_n);
COMPILER_STRIP_GATE(80395D90, &fish_n);
/* 80395DC0-80395DF0 022420 0030+00 0/1 0/0 0/0 .rodata fish_p0$4061 */
#pragma push
@@ -364,7 +364,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,
};
SECTION_DEAD void* const cg_80395DC0 = (void*)(&fish_p0);
COMPILER_STRIP_GATE(80395DC0, &fish_p0);
#pragma pop
/* 80395DF0-80395E20 022450 0030+00 0/1 0/0 0/0 .rodata fish_p1$4062 */
@@ -375,7 +375,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,
};
SECTION_DEAD void* const cg_80395DF0 = (void*)(&fish_p1);
COMPILER_STRIP_GATE(80395DF0, &fish_p1);
#pragma pop
/* 80395E20-80395E50 022480 0030+00 0/1 0/0 0/0 .rodata fish_p2$4063 */
@@ -386,7 +386,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,
};
SECTION_DEAD void* const cg_80395E20 = (void*)(&fish_p2);
COMPILER_STRIP_GATE(80395E20, &fish_p2);
#pragma pop
/* 80395E50-80395E80 0224B0 0030+00 0/1 0/0 0/0 .rodata fish_p3$4064 */
@@ -397,7 +397,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,
};
SECTION_DEAD void* const cg_80395E50 = (void*)(&fish_p3);
COMPILER_STRIP_GATE(80395E50, &fish_p3);
#pragma pop
/* 80395E80-80395EB0 0224E0 0030+00 0/1 0/0 0/0 .rodata fish_p4$4065 */
@@ -408,7 +408,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,
};
SECTION_DEAD void* const cg_80395E80 = (void*)(&fish_p4);
COMPILER_STRIP_GATE(80395E80, &fish_p4);
#pragma pop
/* 80395EB0-80395EE0 022510 0030+00 0/1 0/0 0/0 .rodata fish_p5$4066 */
@@ -419,7 +419,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,
};
SECTION_DEAD void* const cg_80395EB0 = (void*)(&fish_p5);
COMPILER_STRIP_GATE(80395EB0, &fish_p5);
#pragma pop
/* 80395EE0-80395F10 022540 0030+00 0/1 0/0 0/0 .rodata size_1$4081 */
@@ -430,7 +430,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,
};
SECTION_DEAD void* const cg_80395EE0 = (void*)(&size_1);
COMPILER_STRIP_GATE(80395EE0, &size_1);
#pragma pop
/* 80395F10-80395F40 022570 0030+00 0/1 0/0 0/0 .rodata size_unit_1$4082 */
@@ -441,7 +441,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,
};
SECTION_DEAD void* const cg_80395F10 = (void*)(&size_unit_1);
COMPILER_STRIP_GATE(80395F10, &size_unit_1);
#pragma pop
/* 80395F40-80395F70 0225A0 0030+00 0/1 0/0 0/0 .rodata count_1$4083 */
@@ -452,7 +452,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,
};
SECTION_DEAD void* const cg_80395F40 = (void*)(&count_1);
COMPILER_STRIP_GATE(80395F40, &count_1);
#pragma pop
/* 80395F70-80395FA0 0225D0 0030+00 0/1 0/0 0/0 .rodata count_unit_1$4084 */
@@ -463,7 +463,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,
};
SECTION_DEAD void* const cg_80395F70 = (void*)(&count_unit_1);
COMPILER_STRIP_GATE(80395F70, &count_unit_1);
#pragma pop
/* 80395FA0-80395FD0 022600 0030+00 0/1 0/0 0/0 .rodata name_0$4085 */
@@ -474,7 +474,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,
};
SECTION_DEAD void* const cg_80395FA0 = (void*)(&name_0);
COMPILER_STRIP_GATE(80395FA0, &name_0);
#pragma pop
/* 80395FD0-80396000 022630 0030+00 0/1 0/0 0/0 .rodata fname_0$4086 */
@@ -485,7 +485,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,
};
SECTION_DEAD void* const cg_80395FD0 = (void*)(&fname_0);
COMPILER_STRIP_GATE(80395FD0, &fname_0);
#pragma pop
/* 80396000-80396018 022660 0018+00 0/1 0/0 0/0 .rodata name_id$4087 */
@@ -495,7 +495,7 @@ 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,
};
SECTION_DEAD void* const cg_80396000 = (void*)(&name_id);
COMPILER_STRIP_GATE(80396000, &name_id);
#pragma pop
/* 801C55D8-801C5D3C 1BFF18 0764+00 1/1 0/0 0/0 .text screenSetBase__15dMenu_Fishing_cFv
@@ -516,7 +516,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,
};
SECTION_DEAD void* const cg_80396018 = (void*)(&text_a_tag);
COMPILER_STRIP_GATE(80396018, &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] = {
@@ -524,7 +524,7 @@ 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,
};
SECTION_DEAD void* const cg_80396040 = (void*)(&text_b_tag);
COMPILER_STRIP_GATE(80396040, &text_b_tag);
/* 801C5D3C-801C5EB8 1C067C 017C+00 1/1 0/0 0/0 .text screenSetDoIcon__15dMenu_Fishing_cFv */
#pragma push
src/d/menu/d_menu_fmap.cpp
+7 -7
View File
@@ -90,14 +90,14 @@ struct dMenu_Fmap_world_data_c {
struct dMenu_Fmap_stage_data_c {};
struct JKRExpHeap {
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
};
struct STControl {
/* 8003219C */ void checkTrigger();
};
struct JKRExpHeap {
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
};
struct CSTControl {};
struct dMenu_Fmap_c {
@@ -316,10 +316,10 @@ struct dDlst_list_c {
/* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
};
struct JAISoundID {};
struct Vec {};
struct JAISoundID {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -2629,7 +2629,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,
};
SECTION_DEAD void* const cg_803960D0 = (void*)(&i_swBit);
COMPILER_STRIP_GATE(803960D0, &i_swBit);
/* 801CD814-801CD8B4 1C8154 00A0+00 1/1 0/0 0/0 .text howlArrowPosInit__12dMenu_Fmap_cFv
*/
src/d/menu/d_menu_fmap2D.cpp
+27 -27
View File
@@ -48,8 +48,6 @@ struct dMeter2Info_c {
struct JKRExpHeap {};
struct J2DAnmTextureSRTKey {};
struct JGeometry {
template <typename A1>
struct TBox2 {};
@@ -77,6 +75,8 @@ struct CPaneMgrAlpha {
/* 80255828 */ void getAlphaRate();
};
struct J2DAnmTextureSRTKey {};
struct dMenu_Fmap2DTop_c {
/* 801D5BD0 */ dMenu_Fmap2DTop_c(JKRExpHeap*, STControl*);
/* 801D6700 */ ~dMenu_Fmap2DTop_c();
@@ -188,10 +188,10 @@ struct dMenuMapCommon_c {
/* 801C4600 */ void moveLightDropAnime();
};
struct JAISoundID {};
struct Vec {};
struct JAISoundID {};
struct Z2SeMgr {
/* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -429,7 +429,7 @@ 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,
};
SECTION_DEAD void* const cg_80396248 = (void*)(&cur_tag_3868);
COMPILER_STRIP_GATE(80396248, &cur_tag_3868);
/* 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] = {
@@ -492,7 +492,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,
};
SECTION_DEAD void* const cg_80396268 = (void*)(&cur_tag_4092);
COMPILER_STRIP_GATE(80396268, &cur_tag_4092);
/* 804541DC-804541E0 0027DC 0004+00 6/6 0/0 0/0 .sdata2 @4199 */
SECTION_SDATA2 static f32 lit_4199 = 608.0f;
@@ -1263,7 +1263,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,
};
SECTION_DEAD void* const cg_80396288 = (void*)(&area_name);
COMPILER_STRIP_GATE(80396288, &area_name);
#pragma pop
/* 803962A0-803962B8 022900 0018+00 0/1 0/0 0/0 .rodata farea_name$5815 */
@@ -1273,7 +1273,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,
};
SECTION_DEAD void* const cg_803962A0 = (void*)(&farea_name_5815);
COMPILER_STRIP_GATE(803962A0, &farea_name_5815);
#pragma pop
/* 803962B8-803962F0 022918 0038+00 0/1 0/0 0/0 .rodata sfont_name$5821 */
@@ -1285,7 +1285,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,
};
SECTION_DEAD void* const cg_803962B8 = (void*)(&sfont_name);
COMPILER_STRIP_GATE(803962B8, &sfont_name);
#pragma pop
/* 803962F0-80396328 022950 0038+00 0/1 0/0 0/0 .rodata ffont_name$5822 */
@@ -1297,7 +1297,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,
};
SECTION_DEAD void* const cg_803962F0 = (void*)(&ffont_name_5822);
COMPILER_STRIP_GATE(803962F0, &ffont_name_5822);
#pragma pop
/* 80396328-80396350 022988 0028+00 0/1 0/0 0/0 .rodata cont_zt$5828 */
@@ -1308,7 +1308,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,
};
SECTION_DEAD void* const cg_80396328 = (void*)(&cont_zt);
COMPILER_STRIP_GATE(80396328, &cont_zt);
#pragma pop
/* 80396350-80396378 0229B0 0028+00 0/1 0/0 0/0 .rodata font_zt$5829 */
@@ -1319,7 +1319,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,
};
SECTION_DEAD void* const cg_80396350 = (void*)(&font_zt_5829);
COMPILER_STRIP_GATE(80396350, &font_zt_5829);
#pragma pop
/* 80396378-803963A0 0229D8 0028+00 0/1 0/0 0/0 .rodata cont_bt$5835 */
@@ -1330,7 +1330,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,
};
SECTION_DEAD void* const cg_80396378 = (void*)(&cont_bt);
COMPILER_STRIP_GATE(80396378, &cont_bt);
#pragma pop
/* 803963A0-803963C8 022A00 0028+00 0/1 0/0 0/0 .rodata font_bt$5836 */
@@ -1341,7 +1341,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,
};
SECTION_DEAD void* const cg_803963A0 = (void*)(&font_bt_5836);
COMPILER_STRIP_GATE(803963A0, &font_bt_5836);
#pragma pop
/* 803963C8-803963F0 022A28 0028+00 0/1 0/0 0/0 .rodata cont_at$5842 */
@@ -1352,7 +1352,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,
};
SECTION_DEAD void* const cg_803963C8 = (void*)(&cont_at);
COMPILER_STRIP_GATE(803963C8, &cont_at);
#pragma pop
/* 803963F0-80396418 022A50 0028+00 0/1 0/0 0/0 .rodata font_at$5843 */
@@ -1363,7 +1363,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,
};
SECTION_DEAD void* const cg_803963F0 = (void*)(&font_at_5843);
COMPILER_STRIP_GATE(803963F0, &font_at_5843);
#pragma pop
/* 80396418-80396440 022A78 0028+00 0/1 0/0 0/0 .rodata juji_c$5849 */
@@ -1374,7 +1374,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,
};
SECTION_DEAD void* const cg_80396418 = (void*)(&juji_c_5849);
COMPILER_STRIP_GATE(80396418, &juji_c_5849);
#pragma pop
/* 80396440-80396468 022AA0 0028+00 0/1 0/0 0/0 .rodata fuji_c$5850 */
@@ -1385,7 +1385,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,
};
SECTION_DEAD void* const cg_80396440 = (void*)(&fuji_c);
COMPILER_STRIP_GATE(80396440, &fuji_c);
#pragma pop
/* 80396468-80396490 022AC8 0028+00 0/1 0/0 0/0 .rodata ast_c$5856 */
@@ -1396,7 +1396,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,
};
SECTION_DEAD void* const cg_80396468 = (void*)(&ast_c_5856);
COMPILER_STRIP_GATE(80396468, &ast_c_5856);
#pragma pop
/* 80396490-803964B8 022AF0 0028+00 0/1 0/0 0/0 .rodata fst_c$5857 */
@@ -1407,7 +1407,7 @@ 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,
};
SECTION_DEAD void* const cg_80396490 = (void*)(&fst_c);
COMPILER_STRIP_GATE(80396490, &fst_c);
#pragma pop
/* 801D5BD0-801D6700 1D0510 0B30+00 0/0 1/1 0/0 .text
@@ -1490,7 +1490,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,
};
SECTION_DEAD void* const cg_803964B8 = (void*)(&ffont_name_6110);
COMPILER_STRIP_GATE(803964B8, &ffont_name_6110);
/* 801D6F38-801D7010 1D1878 00D8+00 1/1 1/1 0/0 .text setTitleNameString__17dMenu_Fmap2DTop_cFUl
*/
@@ -1509,7 +1509,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,
};
SECTION_DEAD void* const cg_803964F0 = (void*)(&farea_name_6125);
COMPILER_STRIP_GATE(803964F0, &farea_name_6125);
/* 801D7010-801D70E8 1D1950 00D8+00 0/0 2/2 0/0 .text setAreaNameString__17dMenu_Fmap2DTop_cFUl */
#pragma push
@@ -1528,7 +1528,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,
};
SECTION_DEAD void* const cg_80396508 = (void*)(&font_zt_6148);
COMPILER_STRIP_GATE(80396508, &font_zt_6148);
/* 801D70E8-801D7210 1D1A28 0128+00 1/1 12/12 0/0 .text setZButtonString__17dMenu_Fmap2DTop_cFUlUc
*/
@@ -1548,7 +1548,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,
};
SECTION_DEAD void* const cg_80396530 = (void*)(&font_bt_6176);
COMPILER_STRIP_GATE(80396530, &font_bt_6176);
/* 801D7210-801D72D4 1D1B50 00C4+00 1/1 9/9 0/0 .text setBButtonString__17dMenu_Fmap2DTop_cFUlUc
*/
@@ -1568,7 +1568,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,
};
SECTION_DEAD void* const cg_80396558 = (void*)(&font_at_6194);
COMPILER_STRIP_GATE(80396558, &font_at_6194);
/* 801D72D4-801D7398 1D1C14 00C4+00 1/1 14/14 0/0 .text setAButtonString__17dMenu_Fmap2DTop_cFUlUc
*/
@@ -1588,7 +1588,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,
};
SECTION_DEAD void* const cg_80396580 = (void*)(&juji_c_6209);
COMPILER_STRIP_GATE(80396580, &juji_c_6209);
/* 801D7398-801D74EC 1D1CD8 0154+00 1/1 8/8 0/0 .text setCrossLRString__17dMenu_Fmap2DTop_cFUl */
#pragma push
@@ -1607,7 +1607,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,
};
SECTION_DEAD void* const cg_803965A8 = (void*)(&ast_c_6233);
COMPILER_STRIP_GATE(803965A8, &ast_c_6233);
/* 801D74EC-801D7640 1D1E2C 0154+00 1/1 10/10 0/0 .text set3DStickString__17dMenu_Fmap2DTop_cFUl
*/
src/d/menu/d_menu_fmap_map.cpp
+4 -4
View File
@@ -514,7 +514,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,
};
SECTION_DEAD void* const cg_803961B0 = (void*)(&palNo);
COMPILER_STRIP_GATE(803961B0, &palNo);
/* 801CEB1C-801CEC24 1C945C 0108+00 1/1 0/0 0/0 .text setPointColor__15dMenu_FmapMap_cFf
*/
@@ -808,7 +808,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,
};
SECTION_DEAD void* const cg_803961D0 = (void*)(&l_dungeon_onColor);
COMPILER_STRIP_GATE(803961D0, &l_dungeon_onColor);
#pragma pop
/* 803961F4-80396218 022854 0024+00 0/1 0/0 0/0 .rodata l_dungeon_stayColor$4187 */
@@ -819,7 +819,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,
};
SECTION_DEAD void* const cg_803961F4 = (void*)(&l_dungeon_stayColor);
COMPILER_STRIP_GATE(803961F4, &l_dungeon_stayColor);
#pragma pop
/* 80396218-8039623C 022878 0024+00 0/1 0/0 0/0 .rodata l_dungeon_pointColor$4188 */
@@ -830,7 +830,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,
};
SECTION_DEAD void* const cg_80396218 = (void*)(&l_dungeon_pointColor);
COMPILER_STRIP_GATE(80396218, &l_dungeon_pointColor);
#pragma pop
/* 801CF2A0-801CF394 1C9BE0 00F4+00 1/0 0/0 0/0 .text getColor__15dMenu_FmapMap_cFi */
src/d/menu/d_menu_insect.cpp
+13 -13
View File
@@ -28,10 +28,10 @@ struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
struct J2DPane {};
struct JKRArchive {};
struct J2DPane {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
@@ -60,6 +60,8 @@ struct dMsgScrn3Select_c {
/* 8023A97C */ void getCharSpace();
};
struct JMSMesgEntry_c {};
struct ResTIMG {};
struct J2DPicture {
@@ -68,8 +70,6 @@ struct J2DPicture {
struct JUTFont {};
struct JMSMesgEntry_c {};
struct dMeter2Info_c {
/* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*);
/* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*);
@@ -78,8 +78,6 @@ struct dMeter2Info_c {
J2DPicture*, void*, J2DPicture*, int);
};
struct JKRExpHeap {};
struct STControl {
/* 8003219C */ void checkTrigger();
/* 8003242C */ void checkLeftTrigger();
@@ -88,6 +86,8 @@ struct STControl {
/* 800325A0 */ void checkDownTrigger();
};
struct JKRExpHeap {};
struct CSTControl {};
struct dMenu_Insect_c {
@@ -129,10 +129,10 @@ struct dMenu_Insect_c {
/* 801DA630 */ void draw();
};
struct JAISoundID {};
struct Vec {};
struct JAISoundID {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -702,7 +702,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,
};
SECTION_DEAD void* const cg_80396690 = (void*)(&insect_tag);
COMPILER_STRIP_GATE(80396690, &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] = {
@@ -719,7 +719,7 @@ 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,
};
SECTION_DEAD void* const cg_80396750 = (void*)(&ageha_tag);
COMPILER_STRIP_GATE(80396750, &ageha_tag);
/* 801D9644-801D98F0 1D3F84 02AC+00 1/1 0/0 0/0 .text screenSetBase__14dMenu_Insect_cFv
*/
@@ -749,7 +749,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,
};
SECTION_DEAD void* const cg_80396810 = (void*)(&text_a_tag);
COMPILER_STRIP_GATE(80396810, &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] = {
@@ -757,7 +757,7 @@ 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,
};
SECTION_DEAD void* const cg_80396838 = (void*)(&text_b_tag);
COMPILER_STRIP_GATE(80396838, &text_b_tag);
/* 801D9BD0-801D9D4C 1D4510 017C+00 1/1 0/0 0/0 .text screenSetDoIcon__14dMenu_Insect_cFv
*/
@@ -811,7 +811,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,
};
SECTION_DEAD void* const cg_80396860 = (void*)(&i_evtID);
COMPILER_STRIP_GATE(80396860, &i_evtID);
/* 801D9E20-801D9E7C 1D4760 005C+00 4/4 0/0 0/0 .text isGiveInsect__14dMenu_Insect_cFii
*/
src/d/menu/d_menu_item_explain.cpp
+14 -14
View File
@@ -48,6 +48,10 @@ struct dMsgScrn3Select_c {
/* 8023A97C */ void getCharSpace();
};
struct JMSMesgEntry_c {};
struct ResTLUT {};
struct JGeometry {
template <typename A1>
struct TBox2 {};
@@ -55,8 +59,6 @@ struct JGeometry {
struct TBox2__template0 {};
};
struct ResTLUT {};
struct ResTIMG {};
struct J2DPicture {
@@ -66,8 +68,6 @@ struct J2DPicture {
struct JUTFont {};
struct JMSMesgEntry_c {};
struct dMeter2Info_c {
/* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*);
/* 8021C7FC */ void getStringLength(JUTFont*, f32, f32, char*);
@@ -75,18 +75,18 @@ struct dMeter2Info_c {
J2DPicture*, void*, J2DPicture*, int);
};
struct JKRExpHeap {};
struct JKRArchive {};
struct J2DOrthoGraph {};
struct STControl {
/* 8003219C */ void checkTrigger();
/* 80032524 */ void checkUpTrigger();
/* 800325A0 */ void checkDownTrigger();
};
struct JKRExpHeap {};
struct J2DOrthoGraph {};
struct JKRArchive {};
struct dMenu_ItemExplain_c {
/* 801DA754 */ dMenu_ItemExplain_c(JKRExpHeap*, JKRArchive*, STControl*, bool);
/* 801DAFF0 */ ~dMenu_ItemExplain_c();
@@ -122,10 +122,10 @@ struct dKantera_icon_c {
/* 801AEC44 */ void setNowGauge(u16, u16);
};
struct JAISoundID {};
struct Vec {};
struct JAISoundID {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -295,14 +295,14 @@ 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,
};
SECTION_DEAD void* const cg_80396950 = (void*)(&name_tag);
COMPILER_STRIP_GATE(80396950, &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,
};
SECTION_DEAD void* const cg_80396970 = (void*)(&fame_tag);
COMPILER_STRIP_GATE(80396970, &fame_tag);
/* 803BD8C8-803BD8D4 01A9E8 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
src/d/menu/d_menu_letter.cpp
+27 -27
View File
@@ -23,12 +23,12 @@ struct dSv_letter_info_c {
/* 8003449C */ void isLetterReadFlag(int) const;
};
struct JKRArchive {};
struct J2DPane {
/* 802F7100 */ void getBounds();
};
struct JKRArchive {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
@@ -37,8 +37,6 @@ struct dSelect_cursor_c {
/* 801952A0 */ void setAlphaRate(f32);
};
struct COutFont_c {};
struct J2DTextBox {
/* 801DFA28 */ void getWhite() const;
/* 801DFA34 */ void getBlack() const;
@@ -46,6 +44,8 @@ struct J2DTextBox {
/* 8030074C */ void setString(s16, char const*, ...);
};
struct COutFont_c {};
struct JUTFont {};
struct dMsgString_c {
@@ -77,13 +77,13 @@ struct dMeter2Info_c {
/* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*);
};
struct JKRExpHeap {};
struct STControl {
/* 80032524 */ void checkUpTrigger();
/* 800325A0 */ void checkDownTrigger();
};
struct JKRExpHeap {};
struct CSTControl {};
struct dMenu_Letter_c {
@@ -131,10 +131,10 @@ struct dMenu_Letter_c {
/* 801E1D5C */ void draw();
};
struct JAISoundID {};
struct Vec {};
struct JAISoundID {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -859,7 +859,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,
};
SECTION_DEAD void* const cg_803969C8 = (void*)(&tag_sub0);
COMPILER_STRIP_GATE(803969C8, &tag_sub0);
/* 803969F8-80396A28 023058 0030+00 0/1 0/0 0/0 .rodata tag_sub1$4611 */
#pragma push
@@ -869,7 +869,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,
};
SECTION_DEAD void* const cg_803969F8 = (void*)(&tag_sub1);
COMPILER_STRIP_GATE(803969F8, &tag_sub1);
#pragma pop
/* 80396A28-80396A58 023088 0030+00 0/1 0/0 0/0 .rodata tag_name0$4612 */
@@ -880,7 +880,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,
};
SECTION_DEAD void* const cg_80396A28 = (void*)(&tag_name0);
COMPILER_STRIP_GATE(80396A28, &tag_name0);
#pragma pop
/* 80396A58-80396A88 0230B8 0030+00 0/1 0/0 0/0 .rodata tag_name1$4613 */
@@ -891,7 +891,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,
};
SECTION_DEAD void* const cg_80396A58 = (void*)(&tag_name1);
COMPILER_STRIP_GATE(80396A58, &tag_name1);
#pragma pop
/* 80396A88-80396AB8 0230E8 0030+00 0/1 0/0 0/0 .rodata ftag_sub0$4614 */
@@ -902,7 +902,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,
};
SECTION_DEAD void* const cg_80396A88 = (void*)(&ftag_sub0);
COMPILER_STRIP_GATE(80396A88, &ftag_sub0);
#pragma pop
/* 80396AB8-80396AE8 023118 0030+00 0/1 0/0 0/0 .rodata ftag_sub1$4615 */
@@ -913,7 +913,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,
};
SECTION_DEAD void* const cg_80396AB8 = (void*)(&ftag_sub1);
COMPILER_STRIP_GATE(80396AB8, &ftag_sub1);
#pragma pop
/* 80396AE8-80396B18 023148 0030+00 0/1 0/0 0/0 .rodata ftag_name0$4616 */
@@ -924,7 +924,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,
};
SECTION_DEAD void* const cg_80396AE8 = (void*)(&ftag_name0);
COMPILER_STRIP_GATE(80396AE8, &ftag_name0);
#pragma pop
/* 80396B18-80396B48 023178 0030+00 0/1 0/0 0/0 .rodata ftag_name1$4617 */
@@ -935,7 +935,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,
};
SECTION_DEAD void* const cg_80396B18 = (void*)(&ftag_name1);
COMPILER_STRIP_GATE(80396B18, &ftag_name1);
#pragma pop
/* 80396B48-80396B78 0231A8 0030+00 0/1 0/0 0/0 .rodata tag_letter$4628 */
@@ -946,7 +946,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,
};
SECTION_DEAD void* const cg_80396B48 = (void*)(&tag_letter);
COMPILER_STRIP_GATE(80396B48, &tag_letter);
#pragma pop
/* 80396B78-80396BA8 0231D8 0030+00 0/1 0/0 0/0 .rodata tag_frame$4635 */
@@ -957,7 +957,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,
};
SECTION_DEAD void* const cg_80396B78 = (void*)(&tag_frame);
COMPILER_STRIP_GATE(80396B78, &tag_frame);
#pragma pop
/* 80396BA8-80396BD8 023208 0030+00 0/1 0/0 0/0 .rodata tag_menu0$4636 */
@@ -968,7 +968,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,
};
SECTION_DEAD void* const cg_80396BA8 = (void*)(&tag_menu0);
COMPILER_STRIP_GATE(80396BA8, &tag_menu0);
#pragma pop
/* 80396BD8-80396C08 023238 0030+00 0/1 0/0 0/0 .rodata tag_menu1$4637 */
@@ -979,7 +979,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,
};
SECTION_DEAD void* const cg_80396BD8 = (void*)(&tag_menu1);
COMPILER_STRIP_GATE(80396BD8, &tag_menu1);
#pragma pop
/* 80396C08-80396C38 023268 0030+00 0/1 0/0 0/0 .rodata tag_midoku$4638 */
@@ -990,7 +990,7 @@ 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,
};
SECTION_DEAD void* const cg_80396C08 = (void*)(&tag_midoku);
COMPILER_STRIP_GATE(80396C08, &tag_midoku);
#pragma pop
/* 801DF010-801DFA28 1D9950 0A18+00 1/1 0/0 0/0 .text screenSetMenu__14dMenu_Letter_cFv
@@ -1055,7 +1055,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,
};
SECTION_DEAD void* const cg_80396C38 = (void*)(&tag_pip);
COMPILER_STRIP_GATE(80396C38, &tag_pip);
#pragma pop
/* 80396C80-80396CC8 0232E0 0048+00 0/1 0/0 0/0 .rodata tag_pil$4828 */
@@ -1068,7 +1068,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,
};
SECTION_DEAD void* const cg_80396C80 = (void*)(&tag_pil);
COMPILER_STRIP_GATE(80396C80, &tag_pil);
#pragma pop
/* 80396CC8-80396D10 023328 0048+00 0/1 0/0 0/0 .rodata tag_pii$4829 */
@@ -1081,7 +1081,7 @@ 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,
};
SECTION_DEAD void* const cg_80396CC8 = (void*)(&tag_pii);
COMPILER_STRIP_GATE(80396CC8, &tag_pii);
#pragma pop
/* 801DFA58-801E0330 1DA398 08D8+00 1/1 0/0 0/0 .text screenSetBase__14dMenu_Letter_cFv
@@ -1116,7 +1116,7 @@ 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,
};
SECTION_DEAD void* const cg_80396D10 = (void*)(&line_tag);
COMPILER_STRIP_GATE(80396D10, &line_tag);
/* 801E03D8-801E09A8 1DAD18 05D0+00 1/1 0/0 0/0 .text screenSetLetter__14dMenu_Letter_cFv
*/
@@ -1136,7 +1136,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,
};
SECTION_DEAD void* const cg_80396D70 = (void*)(&text_a_tag);
COMPILER_STRIP_GATE(80396D70, &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] = {
@@ -1144,7 +1144,7 @@ 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,
};
SECTION_DEAD void* const cg_80396D98 = (void*)(&text_b_tag);
COMPILER_STRIP_GATE(80396D98, &text_b_tag);
/* 801E09A8-801E0B24 1DB2E8 017C+00 1/1 0/0 0/0 .text screenSetDoIcon__14dMenu_Letter_cFv
*/
src/d/menu/d_menu_option.cpp
+56 -56
View File
@@ -23,6 +23,8 @@ struct dSv_player_config_c {
/* 8003469C */ void setVibration(u8);
};
struct JKRArchive {};
struct J2DBasePosition {};
struct J2DPane {
@@ -31,8 +33,6 @@ struct J2DPane {
/* 802F7FCC */ void animationTransform();
};
struct JKRArchive {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
@@ -169,10 +169,10 @@ struct dComIfG_play_c {
/* 8002B3B0 */ void getNowVibration();
};
struct JAISoundID {};
struct Vec {};
struct JAISoundID {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -883,7 +883,7 @@ SECTION_RODATA static u8 const dMo_soundMode[12 + 4 /* padding */] = {
0x00,
0x00,
};
SECTION_DEAD void* const cg_80396EA8 = (void*)(&dMo_soundMode);
COMPILER_STRIP_GATE(80396EA8, &dMo_soundMode);
/* 80396EB8-80396EE0 023518 0028+00 0/1 0/0 0/0 .rodata text_a_tag$3904 */
#pragma push
@@ -893,7 +893,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,
};
SECTION_DEAD void* const cg_80396EB8 = (void*)(&text_a_tag_3904);
COMPILER_STRIP_GATE(80396EB8, &text_a_tag_3904);
#pragma pop
/* 80396EE0-80396F08 023540 0028+00 0/1 0/0 0/0 .rodata text_b_tag$3905 */
@@ -904,7 +904,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,
};
SECTION_DEAD void* const cg_80396EE0 = (void*)(&text_b_tag_3905);
COMPILER_STRIP_GATE(80396EE0, &text_b_tag_3905);
#pragma pop
/* 80396F08-80396F18 023568 0010+00 0/1 0/0 0/0 .rodata l_tagName012$3918 */
@@ -913,7 +913,7 @@ SECTION_DEAD void* const cg_80396EE0 = (void*)(&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,
};
SECTION_DEAD void* const cg_80396F08 = (void*)(&l_tagName012);
COMPILER_STRIP_GATE(80396F08, &l_tagName012);
#pragma pop
/* 80396F18-80396F28 023578 0010+00 0/1 0/0 0/0 .rodata l_tagName013$3919 */
@@ -922,7 +922,7 @@ SECTION_DEAD void* const cg_80396F08 = (void*)(&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,
};
SECTION_DEAD void* const cg_80396F18 = (void*)(&l_tagName013);
COMPILER_STRIP_GATE(80396F18, &l_tagName013);
#pragma pop
/* 80396F28-80396F38 023588 0010+00 0/1 0/0 0/0 .rodata l_tagName9$3928 */
@@ -931,7 +931,7 @@ SECTION_DEAD void* const cg_80396F18 = (void*)(&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,
};
SECTION_DEAD void* const cg_80396F28 = (void*)(&l_tagName9);
COMPILER_STRIP_GATE(80396F28, &l_tagName9);
#pragma pop
/* 80396F38-80396F48 023598 0010+00 0/1 0/0 0/0 .rodata l_tagName10$3929 */
@@ -940,7 +940,7 @@ SECTION_DEAD void* const cg_80396F28 = (void*)(&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,
};
SECTION_DEAD void* const cg_80396F38 = (void*)(&l_tagName10);
COMPILER_STRIP_GATE(80396F38, &l_tagName10);
#pragma pop
/* 80396F48-80396F58 0235A8 0010+00 0/1 0/0 0/0 .rodata l_tagName11$3930 */
@@ -949,7 +949,7 @@ SECTION_DEAD void* const cg_80396F38 = (void*)(&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,
};
SECTION_DEAD void* const cg_80396F48 = (void*)(&l_tagName11);
COMPILER_STRIP_GATE(80396F48, &l_tagName11);
#pragma pop
/* 80454328-8045432C 002928 0002+02 1/1 0/0 0/0 .sdata2 l_msgNum2$3920 */
@@ -1436,7 +1436,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,
};
SECTION_DEAD void* const cg_80396F58 = (void*)(&tag_frame);
COMPILER_STRIP_GATE(80396F58, &tag_frame);
#pragma pop
/* 80396F88-80396FB8 0235E8 0030+00 0/1 0/0 0/0 .rodata tag_menu0$5202 */
@@ -1447,7 +1447,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,
};
SECTION_DEAD void* const cg_80396F88 = (void*)(&tag_menu0);
COMPILER_STRIP_GATE(80396F88, &tag_menu0);
#pragma pop
/* 80396FB8-80396FE8 023618 0030+00 0/1 0/0 0/0 .rodata let_n$5214 */
@@ -1458,7 +1458,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,
};
SECTION_DEAD void* const cg_80396FB8 = (void*)(&let_n);
COMPILER_STRIP_GATE(80396FB8, &let_n);
#pragma pop
/* 80396FE8-80397018 023648 0030+00 0/1 0/0 0/0 .rodata let2_n$5215 */
@@ -1469,7 +1469,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,
};
SECTION_DEAD void* const cg_80396FE8 = (void*)(&let2_n);
COMPILER_STRIP_GATE(80396FE8, &let2_n);
#pragma pop
/* 80397018-80397048 023678 0030+00 0/1 0/0 0/0 .rodata menu_n$5216 */
@@ -1480,7 +1480,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,
};
SECTION_DEAD void* const cg_80397018 = (void*)(&menu_n);
COMPILER_STRIP_GATE(80397018, &menu_n);
#pragma pop
/* 80397048-80397078 0236A8 0030+00 0/1 0/0 0/0 .rodata menu2_n$5217 */
@@ -1491,7 +1491,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,
};
SECTION_DEAD void* const cg_80397048 = (void*)(&menu2_n);
COMPILER_STRIP_GATE(80397048, &menu2_n);
#pragma pop
/* 80397078-803970A8 0236D8 0030+00 0/1 0/0 0/0 .rodata al0_n$5218 */
@@ -1502,7 +1502,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,
};
SECTION_DEAD void* const cg_80397078 = (void*)(&al0_n);
COMPILER_STRIP_GATE(80397078, &al0_n);
#pragma pop
/* 803970A8-803970D8 023708 0030+00 0/1 0/0 0/0 .rodata al1_n$5219 */
@@ -1513,7 +1513,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,
};
SECTION_DEAD void* const cg_803970A8 = (void*)(&al1_n);
COMPILER_STRIP_GATE(803970A8, &al1_n);
#pragma pop
/* 803970D8-80397108 023738 0030+00 0/1 0/0 0/0 .rodata al2_n$5220 */
@@ -1524,7 +1524,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,
};
SECTION_DEAD void* const cg_803970D8 = (void*)(&al2_n);
COMPILER_STRIP_GATE(803970D8, &al2_n);
#pragma pop
/* 80397108-80397138 023768 0030+00 0/1 0/0 0/0 .rodata al3_n$5221 */
@@ -1535,7 +1535,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,
};
SECTION_DEAD void* const cg_80397108 = (void*)(&al3_n);
COMPILER_STRIP_GATE(80397108, &al3_n);
#pragma pop
/* 80397138-80397160 023798 0028+00 0/1 0/0 0/0 .rodata haihail_n$5238 */
@@ -1546,7 +1546,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,
};
SECTION_DEAD void* const cg_80397138 = (void*)(&haihail_n);
COMPILER_STRIP_GATE(80397138, &haihail_n);
#pragma pop
/* 80397160-80397188 0237C0 0028+00 0/1 0/0 0/0 .rodata haihair_n$5239 */
@@ -1557,7 +1557,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,
};
SECTION_DEAD void* const cg_80397160 = (void*)(&haihair_n);
COMPILER_STRIP_GATE(80397160, &haihair_n);
#pragma pop
/* 80397188-803971B8 0237E8 0030+00 0/1 0/0 0/0 .rodata menu3_n$5256 */
@@ -1568,7 +1568,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,
};
SECTION_DEAD void* const cg_80397188 = (void*)(&menu3_n);
COMPILER_STRIP_GATE(80397188, &menu3_n);
#pragma pop
/* 803971B8-803971E0 023818 0028+00 0/1 0/0 0/0 .rodata tv_btnA$5275 */
@@ -1579,7 +1579,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,
};
SECTION_DEAD void* const cg_803971B8 = (void*)(&tv_btnA);
COMPILER_STRIP_GATE(803971B8, &tv_btnA);
#pragma pop
/* 803971E0-80397208 023840 0028+00 0/1 0/0 0/0 .rodata ftv_btnA$5276 */
@@ -1590,7 +1590,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,
};
SECTION_DEAD void* const cg_803971E0 = (void*)(&ftv_btnA);
COMPILER_STRIP_GATE(803971E0, &ftv_btnA);
#pragma pop
/* 80397208-80397218 023868 0010+00 0/1 0/0 0/0 .rodata fenu_t0$5282 */
@@ -1599,7 +1599,7 @@ SECTION_DEAD void* const cg_803971E0 = (void*)(&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,
};
SECTION_DEAD void* const cg_80397208 = (void*)(&fenu_t0);
COMPILER_STRIP_GATE(80397208, &fenu_t0);
#pragma pop
/* 80397218-80397228 023878 0010+00 0/1 0/0 0/0 .rodata menu_t0$5283 */
@@ -1608,7 +1608,7 @@ SECTION_DEAD void* const cg_80397208 = (void*)(&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,
};
SECTION_DEAD void* const cg_80397218 = (void*)(&menu_t0);
COMPILER_STRIP_GATE(80397218, &menu_t0);
#pragma pop
/* 80397228-80397238 023888 0010+00 0/1 0/0 0/0 .rodata fenu_t2$5289 */
@@ -1617,7 +1617,7 @@ SECTION_DEAD void* const cg_80397218 = (void*)(&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,
};
SECTION_DEAD void* const cg_80397228 = (void*)(&fenu_t2);
COMPILER_STRIP_GATE(80397228, &fenu_t2);
#pragma pop
/* 80397238-80397248 023898 0010+00 0/1 0/0 0/0 .rodata menu_t2$5290 */
@@ -1626,7 +1626,7 @@ SECTION_DEAD void* const cg_80397228 = (void*)(&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,
};
SECTION_DEAD void* const cg_80397238 = (void*)(&menu_t2);
COMPILER_STRIP_GATE(80397238, &menu_t2);
#pragma pop
/* 80397248-80397258 0238A8 0010+00 0/1 0/0 0/0 .rodata fenu_t3$5296 */
@@ -1635,7 +1635,7 @@ SECTION_DEAD void* const cg_80397238 = (void*)(&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,
};
SECTION_DEAD void* const cg_80397248 = (void*)(&fenu_t3);
COMPILER_STRIP_GATE(80397248, &fenu_t3);
#pragma pop
/* 80397258-80397268 0238B8 0010+00 0/1 0/0 0/0 .rodata menu_t3$5297 */
@@ -1644,7 +1644,7 @@ SECTION_DEAD void* const cg_80397248 = (void*)(&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,
};
SECTION_DEAD void* const cg_80397258 = (void*)(&menu_t3);
COMPILER_STRIP_GATE(80397258, &menu_t3);
#pragma pop
/* 80397268-80397278 0238C8 0010+00 0/1 0/0 0/0 .rodata fenu_t4$5303 */
@@ -1653,7 +1653,7 @@ SECTION_DEAD void* const cg_80397258 = (void*)(&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,
};
SECTION_DEAD void* const cg_80397268 = (void*)(&fenu_t4);
COMPILER_STRIP_GATE(80397268, &fenu_t4);
#pragma pop
/* 80397278-80397288 0238D8 0010+00 0/1 0/0 0/0 .rodata menu_t4$5304 */
@@ -1662,7 +1662,7 @@ SECTION_DEAD void* const cg_80397268 = (void*)(&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,
};
SECTION_DEAD void* const cg_80397278 = (void*)(&menu_t4);
COMPILER_STRIP_GATE(80397278, &menu_t4);
#pragma pop
/* 80397288-80397298 0238E8 0010+00 0/1 0/0 0/0 .rodata fenu_t1$5310 */
@@ -1671,7 +1671,7 @@ SECTION_DEAD void* const cg_80397278 = (void*)(&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,
};
SECTION_DEAD void* const cg_80397288 = (void*)(&fenu_t1);
COMPILER_STRIP_GATE(80397288, &fenu_t1);
#pragma pop
/* 80397298-803972A8 0238F8 0010+00 0/1 0/0 0/0 .rodata menu_t1$5311 */
@@ -1680,7 +1680,7 @@ SECTION_DEAD void* const cg_80397288 = (void*)(&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,
};
SECTION_DEAD void* const cg_80397298 = (void*)(&menu_t1);
COMPILER_STRIP_GATE(80397298, &menu_t1);
#pragma pop
/* 803972A8-803972B8 023908 0010+00 0/1 0/0 0/0 .rodata fenu_t5$5317 */
@@ -1689,7 +1689,7 @@ SECTION_DEAD void* const cg_80397298 = (void*)(&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,
};
SECTION_DEAD void* const cg_803972A8 = (void*)(&fenu_t5);
COMPILER_STRIP_GATE(803972A8, &fenu_t5);
#pragma pop
/* 803972B8-803972C8 023918 0010+00 0/1 0/0 0/0 .rodata menu_t5$5318 */
@@ -1698,7 +1698,7 @@ SECTION_DEAD void* const cg_803972A8 = (void*)(&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,
};
SECTION_DEAD void* const cg_803972B8 = (void*)(&menu_t5);
COMPILER_STRIP_GATE(803972B8, &menu_t5);
#pragma pop
/* 803972C8-803972F8 023928 0030+00 0/1 0/0 0/0 .rodata menut_0$5324 */
@@ -1709,7 +1709,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,
};
SECTION_DEAD void* const cg_803972C8 = (void*)(&menut_0);
COMPILER_STRIP_GATE(803972C8, &menut_0);
#pragma pop
/* 803972F8-80397328 023958 0030+00 0/1 0/0 0/0 .rodata fenut_0$5325 */
@@ -1720,7 +1720,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,
};
SECTION_DEAD void* const cg_803972F8 = (void*)(&fenut_0);
COMPILER_STRIP_GATE(803972F8, &fenut_0);
#pragma pop
/* 80397328-80397358 023988 0030+00 0/1 0/0 0/0 .rodata menut_1$5332 */
@@ -1731,7 +1731,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,
};
SECTION_DEAD void* const cg_80397328 = (void*)(&menut_1);
COMPILER_STRIP_GATE(80397328, &menut_1);
#pragma pop
/* 80397358-80397388 0239B8 0030+00 0/1 0/0 0/0 .rodata fenut_1$5333 */
@@ -1742,7 +1742,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,
};
SECTION_DEAD void* const cg_80397358 = (void*)(&fenut_1);
COMPILER_STRIP_GATE(80397358, &fenut_1);
#pragma pop
/* 80397388-803973B8 0239E8 0030+00 0/1 0/0 0/0 .rodata menut_2$5340 */
@@ -1753,7 +1753,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,
};
SECTION_DEAD void* const cg_80397388 = (void*)(&menut_2);
COMPILER_STRIP_GATE(80397388, &menut_2);
#pragma pop
/* 803973B8-803973E8 023A18 0030+00 0/1 0/0 0/0 .rodata fenut_2$5341 */
@@ -1764,7 +1764,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,
};
SECTION_DEAD void* const cg_803973B8 = (void*)(&fenut_2);
COMPILER_STRIP_GATE(803973B8, &fenut_2);
#pragma pop
/* 803973E8-80397418 023A48 0030+00 0/1 0/0 0/0 .rodata menut_3$5348 */
@@ -1775,7 +1775,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,
};
SECTION_DEAD void* const cg_803973E8 = (void*)(&menut_3);
COMPILER_STRIP_GATE(803973E8, &menut_3);
#pragma pop
/* 80397418-80397448 023A78 0030+00 0/1 0/0 0/0 .rodata fenut_3$5349 */
@@ -1786,7 +1786,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,
};
SECTION_DEAD void* const cg_80397418 = (void*)(&fenut_3);
COMPILER_STRIP_GATE(80397418, &fenut_3);
#pragma pop
/* 80397448-80397478 023AA8 0030+00 0/1 0/0 0/0 .rodata menut_4$5356 */
@@ -1797,7 +1797,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,
};
SECTION_DEAD void* const cg_80397448 = (void*)(&menut_4);
COMPILER_STRIP_GATE(80397448, &menut_4);
#pragma pop
/* 80397478-803974A8 023AD8 0030+00 0/1 0/0 0/0 .rodata fenut_4$5357 */
@@ -1808,7 +1808,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,
};
SECTION_DEAD void* const cg_80397478 = (void*)(&fenut_4);
COMPILER_STRIP_GATE(80397478, &fenut_4);
#pragma pop
/* 803974A8-803974D8 023B08 0030+00 0/1 0/0 0/0 .rodata tx$5381 */
@@ -1819,7 +1819,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,
};
SECTION_DEAD void* const cg_803974A8 = (void*)(&tx);
COMPILER_STRIP_GATE(803974A8, &tx);
#pragma pop
/* 803974D8-803974F8 023B38 0020+00 0/0 0/0 0/0 .rodata op_tx$5393 */
@@ -1829,7 +1829,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,
};
SECTION_DEAD void* const cg_803974D8 = (void*)(&op_tx);
COMPILER_STRIP_GATE(803974D8, &op_tx);
#pragma pop
/* 803974F8-80397510 023B58 0018+00 0/1 0/0 0/0 .rodata z_tx$5399 */
@@ -1839,7 +1839,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,
};
SECTION_DEAD void* const cg_803974F8 = (void*)(&z_tx);
COMPILER_STRIP_GATE(803974F8, &z_tx);
#pragma pop
/* 80397510-80397560 023B70 0050+00 0/1 0/0 0/0 .rodata txTV$5409 */
@@ -1852,7 +1852,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,
};
SECTION_DEAD void* const cg_80397510 = (void*)(&txTV);
COMPILER_STRIP_GATE(80397510, &txTV);
#pragma pop
/* 801E5678-801E6FBC 1DFFB8 1944+00 1/1 0/0 0/0 .text screenSet__14dMenu_Option_cFv */
@@ -2001,7 +2001,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,
};
SECTION_DEAD void* const cg_80397560 = (void*)(&txTVhide);
COMPILER_STRIP_GATE(80397560, &txTVhide);
#pragma pop
/* 80397588-803975B0 023BE8 0028+00 1/1 0/0 0/0 .rodata text_a_tag$6194 */
@@ -2010,7 +2010,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,
};
SECTION_DEAD void* const cg_80397588 = (void*)(&text_a_tag_6194);
COMPILER_STRIP_GATE(80397588, &text_a_tag_6194);
/* 801E7E98-801E7F9C 1E27D8 0104+00 11/11 0/0 0/0 .text setAButtonString__14dMenu_Option_cFUs */
#pragma push
@@ -2029,7 +2029,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,
};
SECTION_DEAD void* const cg_803975B0 = (void*)(&text_b_tag_6217);
COMPILER_STRIP_GATE(803975B0, &text_b_tag_6217);
/* 801E7F9C-801E80A0 1E28DC 0104+00 11/11 0/0 0/0 .text setBButtonString__14dMenu_Option_cFUs */
#pragma push
src/d/menu/d_menu_ring.cpp
+12 -12
View File
@@ -65,10 +65,10 @@ struct dMeter2Draw_c {
JUtility::TColor, JUtility::TColor, f32, u8);
};
struct JKRExpHeap {};
struct STControl {};
struct JKRExpHeap {};
struct CSTControl {};
struct dMenu_Ring_c {
@@ -384,7 +384,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,
};
SECTION_DEAD void* const cg_80397738 = (void*)(&xy_text);
COMPILER_STRIP_GATE(80397738, &xy_text);
/* 80397760-80397788 023DC0 0028+00 0/1 0/0 0/0 .rodata fxy_text$4016 */
#pragma push
@@ -394,7 +394,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,
};
SECTION_DEAD void* const cg_80397760 = (void*)(&fxy_text);
COMPILER_STRIP_GATE(80397760, &fxy_text);
#pragma pop
/* 80397788-803977B0 023DE8 0028+00 0/1 0/0 0/0 .rodata c_text$4022 */
@@ -405,7 +405,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,
};
SECTION_DEAD void* const cg_80397788 = (void*)(&c_text);
COMPILER_STRIP_GATE(80397788, &c_text);
#pragma pop
/* 803977B0-803977D8 023E10 0028+00 0/1 0/0 0/0 .rodata fc_text$4023 */
@@ -416,7 +416,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,
};
SECTION_DEAD void* const cg_803977B0 = (void*)(&fc_text);
COMPILER_STRIP_GATE(803977B0, &fc_text);
#pragma pop
/* 803977D8-80397800 023E38 0028+00 0/1 0/0 0/0 .rodata c_text1$4029 */
@@ -427,7 +427,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,
};
SECTION_DEAD void* const cg_803977D8 = (void*)(&c_text1);
COMPILER_STRIP_GATE(803977D8, &c_text1);
#pragma pop
/* 80397800-80397828 023E60 0028+00 0/1 0/0 0/0 .rodata fc_text1$4030 */
@@ -438,7 +438,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,
};
SECTION_DEAD void* const cg_80397800 = (void*)(&fc_text1);
COMPILER_STRIP_GATE(80397800, &fc_text1);
#pragma pop
/* 80397828-80397850 023E88 0028+00 0/1 0/0 0/0 .rodata t_on$4036 */
@@ -449,7 +449,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,
};
SECTION_DEAD void* const cg_80397828 = (void*)(&t_on);
COMPILER_STRIP_GATE(80397828, &t_on);
#pragma pop
/* 80397850-80397878 023EB0 0028+00 0/1 0/0 0/0 .rodata ft_on$4037 */
@@ -460,7 +460,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,
};
SECTION_DEAD void* const cg_80397850 = (void*)(&ft_on);
COMPILER_STRIP_GATE(80397850, &ft_on);
#pragma pop
/* 80397878-803978A0 023ED8 0028+00 0/1 0/0 0/0 .rodata t_off$4043 */
@@ -471,7 +471,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,
};
SECTION_DEAD void* const cg_80397878 = (void*)(&t_off);
COMPILER_STRIP_GATE(80397878, &t_off);
#pragma pop
/* 803978A0-803978C8 023F00 0028+00 0/1 0/0 0/0 .rodata ft_off$4044 */
@@ -482,7 +482,7 @@ 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,
};
SECTION_DEAD void* const cg_803978A0 = (void*)(&ft_off);
COMPILER_STRIP_GATE(803978A0, &ft_off);
#pragma pop
/* 803BDE70-803BDE7C 01AF90 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
src/d/menu/d_menu_save.cpp
+4 -4
View File
@@ -50,12 +50,12 @@ struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
struct JKRArchive {};
struct J2DPane {
/* 802F7FCC */ void animationTransform();
};
struct JKRArchive {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
@@ -256,10 +256,10 @@ struct Z2SeqMgr {
/* 802B3EAC */ void checkBgmIDPlaying(u32);
};
struct JAISoundID {};
struct Vec {};
struct JAISoundID {};
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);
src/d/menu/d_menu_skill.cpp
+26 -26
View File
@@ -21,10 +21,10 @@ struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
struct J2DPane {};
struct JKRArchive {};
struct J2DPane {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
@@ -44,13 +44,13 @@ struct dMeter2Info_c {
/* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*);
};
struct JKRExpHeap {};
struct STControl {
/* 80032524 */ void checkUpTrigger();
/* 800325A0 */ void checkDownTrigger();
};
struct JKRExpHeap {};
struct CSTControl {};
struct dMenu_Skill_c {
@@ -86,10 +86,10 @@ struct dMenu_Skill_c {
/* 801F9A08 */ void draw();
};
struct JAISoundID {};
struct Vec {};
struct JAISoundID {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -520,14 +520,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,
};
SECTION_DEAD void* const cg_80397A18 = (void*)(&i_id);
COMPILER_STRIP_GATE(80397A18, &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,
};
SECTION_DEAD void* const cg_80397A34 = (void*)(&i_id1_4088);
COMPILER_STRIP_GATE(80397A34, &i_id1_4088);
/* 801F7F24-801F7FF8 1F2864 00D4+00 1/0 0/0 0/0 .text read_open_init__13dMenu_Skill_cFv
*/
@@ -609,7 +609,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,
};
SECTION_DEAD void* const cg_80397A50 = (void*)(&tag_sub0);
COMPILER_STRIP_GATE(80397A50, &tag_sub0);
#pragma pop
/* 80397A88-80397AC0 0240E8 0038+00 0/1 0/0 0/0 .rodata tag_sub1$4149 */
@@ -621,7 +621,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,
};
SECTION_DEAD void* const cg_80397A88 = (void*)(&tag_sub1);
COMPILER_STRIP_GATE(80397A88, &tag_sub1);
#pragma pop
/* 80397AC0-80397AF8 024120 0038+00 0/1 0/0 0/0 .rodata tag_name0$4150 */
@@ -633,7 +633,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,
};
SECTION_DEAD void* const cg_80397AC0 = (void*)(&tag_name0);
COMPILER_STRIP_GATE(80397AC0, &tag_name0);
#pragma pop
/* 80397AF8-80397B30 024158 0038+00 0/1 0/0 0/0 .rodata tag_name1$4151 */
@@ -645,7 +645,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,
};
SECTION_DEAD void* const cg_80397AF8 = (void*)(&tag_name1);
COMPILER_STRIP_GATE(80397AF8, &tag_name1);
#pragma pop
/* 80397B30-80397B68 024190 0038+00 0/1 0/0 0/0 .rodata ftag_sub0$4152 */
@@ -657,7 +657,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,
};
SECTION_DEAD void* const cg_80397B30 = (void*)(&ftag_sub0);
COMPILER_STRIP_GATE(80397B30, &ftag_sub0);
#pragma pop
/* 80397B68-80397BA0 0241C8 0038+00 0/1 0/0 0/0 .rodata ftag_sub1$4153 */
@@ -669,7 +669,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,
};
SECTION_DEAD void* const cg_80397B68 = (void*)(&ftag_sub1);
COMPILER_STRIP_GATE(80397B68, &ftag_sub1);
#pragma pop
/* 80397BA0-80397BD8 024200 0038+00 0/1 0/0 0/0 .rodata ftag_name0$4154 */
@@ -681,7 +681,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,
};
SECTION_DEAD void* const cg_80397BA0 = (void*)(&ftag_name0);
COMPILER_STRIP_GATE(80397BA0, &ftag_name0);
#pragma pop
/* 80397BD8-80397C10 024238 0038+00 0/1 0/0 0/0 .rodata ftag_name1$4155 */
@@ -693,7 +693,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,
};
SECTION_DEAD void* const cg_80397BD8 = (void*)(&ftag_name1);
COMPILER_STRIP_GATE(80397BD8, &ftag_name1);
#pragma pop
/* 80397C10-80397C48 024270 0038+00 0/1 0/0 0/0 .rodata tag_letter$4166 */
@@ -705,7 +705,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,
};
SECTION_DEAD void* const cg_80397C10 = (void*)(&tag_letter);
COMPILER_STRIP_GATE(80397C10, &tag_letter);
#pragma pop
/* 80397C48-80397C80 0242A8 0038+00 0/1 0/0 0/0 .rodata tag_frame$4173 */
@@ -717,7 +717,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,
};
SECTION_DEAD void* const cg_80397C48 = (void*)(&tag_frame);
COMPILER_STRIP_GATE(80397C48, &tag_frame);
#pragma pop
/* 80397C80-80397CB8 0242E0 0038+00 0/1 0/0 0/0 .rodata tag_maki$4174 */
@@ -729,7 +729,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,
};
SECTION_DEAD void* const cg_80397C80 = (void*)(&tag_maki);
COMPILER_STRIP_GATE(80397C80, &tag_maki);
#pragma pop
/* 80397CB8-80397CF0 024318 0038+00 0/1 0/0 0/0 .rodata tag_makic$4175 */
@@ -741,7 +741,7 @@ 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,
};
SECTION_DEAD void* const cg_80397CB8 = (void*)(&tag_makic);
COMPILER_STRIP_GATE(80397CB8, &tag_makic);
#pragma pop
/* 801F8388-801F8A18 1F2CC8 0690+00 1/1 0/0 0/0 .text screenSetMenu__13dMenu_Skill_cFv */
@@ -760,14 +760,14 @@ 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,
};
SECTION_DEAD void* const cg_80397CF0 = (void*)(&name_tag);
COMPILER_STRIP_GATE(80397CF0, &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,
};
SECTION_DEAD void* const cg_80397D10 = (void*)(&fame_tag);
COMPILER_STRIP_GATE(80397D10, &fame_tag);
/* 801F8A18-801F8D20 1F3358 0308+00 1/1 0/0 0/0 .text screenSetLetter__13dMenu_Skill_cFv
*/
@@ -787,7 +787,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,
};
SECTION_DEAD void* const cg_80397D30 = (void*)(&text_a_tag);
COMPILER_STRIP_GATE(80397D30, &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] = {
@@ -795,7 +795,7 @@ 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,
};
SECTION_DEAD void* const cg_80397D58 = (void*)(&text_b_tag);
COMPILER_STRIP_GATE(80397D58, &text_b_tag);
/* 801F8D20-801F8E9C 1F3660 017C+00 1/1 0/0 0/0 .text screenSetDoIcon__13dMenu_Skill_cFv
*/
@@ -834,14 +834,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,
};
SECTION_DEAD void* const cg_80397D80 = (void*)(&i_id0);
COMPILER_STRIP_GATE(80397D80, &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,
};
SECTION_DEAD void* const cg_80397D9C = (void*)(&i_id1_4479);
COMPILER_STRIP_GATE(80397D9C, &i_id1_4479);
/* 801F9144-801F9260 1F3A84 011C+00 1/1 0/0 0/0 .text setPageText__13dMenu_Skill_cFv */
#pragma push
src/d/menu/d_menu_window.cpp
+4 -4
View File
@@ -152,14 +152,14 @@ struct dMenu_save_c {
/* 801F69FC */ void _draw2();
};
struct JKRExpHeap {};
struct STControl {
/* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16);
/* 80032088 */ void setWaitParm(s16, s16, s16, s16, f32, f32, s16, s16);
/* 8003219C */ void checkTrigger();
};
struct JKRExpHeap {};
struct CSTControl {};
struct dMenu_Skill_c {
@@ -260,10 +260,10 @@ struct dDlst_MENU_CAPTURE_c {
/* 801FE2E8 */ ~dDlst_MENU_CAPTURE_c();
};
struct JAISoundID {};
struct Vec {};
struct JAISoundID {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};