mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-30 15:43:19 -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/a/npc/d_a_npc_cd.cpp
+45 -45
View File
@@ -22,15 +22,15 @@ struct mDoHIO_entry_c {
/* 8015791C */ ~mDoHIO_entry_c();
};
struct mDoExt_McaMorfCallBack1_c {};
struct J3DModelData {};
struct mDoExt_McaMorfCallBack2_c {};
struct J3DAnmTransform {};
struct Z2Creature {};
struct mDoExt_McaMorfCallBack2_c {};
struct J3DModelData {};
struct mDoExt_McaMorfCallBack1_c {};
struct mDoExt_McaMorfSO {
/* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
@@ -50,12 +50,12 @@ struct daPy_py_c {
/* 8015F424 */ void checkNowWolfEyeUp();
};
struct J3DModel {};
struct J3DAnmTransformKey {};
struct J3DJoint {};
struct J3DModel {};
struct daNpcCd_c {
/* 8015605C */ void NpcCreate(int);
/* 801561E8 */ void ObjCreate(int);
@@ -110,10 +110,10 @@ struct dRes_control_c {
struct dPa_levelEcallBack {};
struct csXyz {};
struct _GXColor {};
struct csXyz {};
struct dPa_control_c {
struct level_c {
/* 8004B918 */ void getEmitter(u32);
@@ -249,7 +249,7 @@ SECTION_RODATA static void* const l_resMANa[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392A18 = (void*)(&l_resMANa);
COMPILER_STRIP_GATE(80392A18, &l_resMANa);
/* 80392A30-80392A48 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMADa */
SECTION_RODATA static void* const l_resMADa[6] = {
@@ -260,7 +260,7 @@ SECTION_RODATA static void* const l_resMADa[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392A30 = (void*)(&l_resMADa);
COMPILER_STRIP_GATE(80392A30, &l_resMADa);
/* 80392A48-80392A60 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMCNa */
SECTION_RODATA static void* const l_resMCNa[6] = {
@@ -271,7 +271,7 @@ SECTION_RODATA static void* const l_resMCNa[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392A48 = (void*)(&l_resMCNa);
COMPILER_STRIP_GATE(80392A48, &l_resMCNa);
/* 80392A60-80392A78 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMONa */
SECTION_RODATA static void* const l_resMONa[6] = {
@@ -282,7 +282,7 @@ SECTION_RODATA static void* const l_resMONa[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392A60 = (void*)(&l_resMONa);
COMPILER_STRIP_GATE(80392A60, &l_resMONa);
/* 80392A78-80392A90 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANb */
SECTION_RODATA static void* const l_resMANb[6] = {
@@ -293,7 +293,7 @@ SECTION_RODATA static void* const l_resMANb[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392A78 = (void*)(&l_resMANb);
COMPILER_STRIP_GATE(80392A78, &l_resMANb);
/* 80392A90-80392AA8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANc */
SECTION_RODATA static void* const l_resMANc[6] = {
@@ -304,7 +304,7 @@ SECTION_RODATA static void* const l_resMANc[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392A90 = (void*)(&l_resMANc);
COMPILER_STRIP_GATE(80392A90, &l_resMANc);
/* 80392AA8-80392AC0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMASa */
SECTION_RODATA static void* const l_resMASa[6] = {
@@ -315,7 +315,7 @@ SECTION_RODATA static void* const l_resMASa[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392AA8 = (void*)(&l_resMASa);
COMPILER_STRIP_GATE(80392AA8, &l_resMASa);
/* 80392AC0-80392AD8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMBNa */
SECTION_RODATA static void* const l_resMBNa[6] = {
@@ -326,7 +326,7 @@ SECTION_RODATA static void* const l_resMBNa[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392AC0 = (void*)(&l_resMBNa);
COMPILER_STRIP_GATE(80392AC0, &l_resMBNa);
/* 80392AD8-80392AF0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANa2 */
SECTION_RODATA static void* const l_resMANa2[6] = {
@@ -337,7 +337,7 @@ SECTION_RODATA static void* const l_resMANa2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392AD8 = (void*)(&l_resMANa2);
COMPILER_STRIP_GATE(80392AD8, &l_resMANa2);
/* 80392AF0-80392B08 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMADa2 */
SECTION_RODATA static void* const l_resMADa2[6] = {
@@ -348,7 +348,7 @@ SECTION_RODATA static void* const l_resMADa2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392AF0 = (void*)(&l_resMADa2);
COMPILER_STRIP_GATE(80392AF0, &l_resMADa2);
/* 80392B08-80392B20 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMCNa2 */
SECTION_RODATA static void* const l_resMCNa2[6] = {
@@ -359,7 +359,7 @@ SECTION_RODATA static void* const l_resMCNa2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392B08 = (void*)(&l_resMCNa2);
COMPILER_STRIP_GATE(80392B08, &l_resMCNa2);
/* 80392B20-80392B38 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMONa2 */
SECTION_RODATA static void* const l_resMONa2[6] = {
@@ -370,7 +370,7 @@ SECTION_RODATA static void* const l_resMONa2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392B20 = (void*)(&l_resMONa2);
COMPILER_STRIP_GATE(80392B20, &l_resMONa2);
/* 80392B38-80392B50 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANb2 */
SECTION_RODATA static void* const l_resMANb2[6] = {
@@ -381,7 +381,7 @@ SECTION_RODATA static void* const l_resMANb2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392B38 = (void*)(&l_resMANb2);
COMPILER_STRIP_GATE(80392B38, &l_resMANb2);
/* 80392B50-80392B68 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANc2 */
SECTION_RODATA static void* const l_resMANc2[6] = {
@@ -392,7 +392,7 @@ SECTION_RODATA static void* const l_resMANc2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392B50 = (void*)(&l_resMANc2);
COMPILER_STRIP_GATE(80392B50, &l_resMANc2);
/* 80392B68-80392B80 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMASa2 */
SECTION_RODATA static void* const l_resMASa2[6] = {
@@ -403,7 +403,7 @@ SECTION_RODATA static void* const l_resMASa2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392B68 = (void*)(&l_resMASa2);
COMPILER_STRIP_GATE(80392B68, &l_resMASa2);
/* 80392B80-80392B98 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMBNa2 */
SECTION_RODATA static void* const l_resMBNa2[6] = {
@@ -414,7 +414,7 @@ SECTION_RODATA static void* const l_resMBNa2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392B80 = (void*)(&l_resMBNa2);
COMPILER_STRIP_GATE(80392B80, &l_resMBNa2);
/* 80392B98-80392BB0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANa */
SECTION_RODATA static void* const l_resWANa[6] = {
@@ -425,7 +425,7 @@ SECTION_RODATA static void* const l_resWANa[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392B98 = (void*)(&l_resWANa);
COMPILER_STRIP_GATE(80392B98, &l_resWANa);
/* 80392BB0-80392BC8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWADa */
SECTION_RODATA static void* const l_resWADa[6] = {
@@ -436,7 +436,7 @@ SECTION_RODATA static void* const l_resWADa[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392BB0 = (void*)(&l_resWADa);
COMPILER_STRIP_GATE(80392BB0, &l_resWADa);
/* 80392BC8-80392BE0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMATa */
SECTION_RODATA static void* const l_resMATa[6] = {
@@ -447,7 +447,7 @@ SECTION_RODATA static void* const l_resMATa[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392BC8 = (void*)(&l_resMATa);
COMPILER_STRIP_GATE(80392BC8, &l_resMATa);
/* 80392BE0-80392BF8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWCNa */
SECTION_RODATA static void* const l_resWCNa[6] = {
@@ -458,7 +458,7 @@ SECTION_RODATA static void* const l_resWCNa[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392BE0 = (void*)(&l_resWCNa);
COMPILER_STRIP_GATE(80392BE0, &l_resWCNa);
/* 80392BF8-80392C10 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWONa */
SECTION_RODATA static void* const l_resWONa[6] = {
@@ -469,7 +469,7 @@ SECTION_RODATA static void* const l_resWONa[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392BF8 = (void*)(&l_resWONa);
COMPILER_STRIP_GATE(80392BF8, &l_resWONa);
/* 80392C10-80392C28 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWGNa */
SECTION_RODATA static void* const l_resWGNa[6] = {
@@ -480,7 +480,7 @@ SECTION_RODATA static void* const l_resWGNa[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392C10 = (void*)(&l_resWGNa);
COMPILER_STRIP_GATE(80392C10, &l_resWGNa);
/* 80392C28-80392C40 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANb */
SECTION_RODATA static void* const l_resWANb[6] = {
@@ -491,7 +491,7 @@ SECTION_RODATA static void* const l_resWANb[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392C28 = (void*)(&l_resWANb);
COMPILER_STRIP_GATE(80392C28, &l_resWANb);
/* 80392C40-80392C58 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANa2 */
SECTION_RODATA static void* const l_resWANa2[6] = {
@@ -502,7 +502,7 @@ SECTION_RODATA static void* const l_resWANa2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392C40 = (void*)(&l_resWANa2);
COMPILER_STRIP_GATE(80392C40, &l_resWANa2);
/* 80392C58-80392C70 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWADa2 */
SECTION_RODATA static void* const l_resWADa2[6] = {
@@ -513,7 +513,7 @@ SECTION_RODATA static void* const l_resWADa2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392C58 = (void*)(&l_resWADa2);
COMPILER_STRIP_GATE(80392C58, &l_resWADa2);
/* 80392C70-80392C88 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMATa2 */
SECTION_RODATA static void* const l_resMATa2[6] = {
@@ -524,7 +524,7 @@ SECTION_RODATA static void* const l_resMATa2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392C70 = (void*)(&l_resMATa2);
COMPILER_STRIP_GATE(80392C70, &l_resMATa2);
/* 80392C88-80392CA0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWCNa2 */
SECTION_RODATA static void* const l_resWCNa2[6] = {
@@ -535,7 +535,7 @@ SECTION_RODATA static void* const l_resWCNa2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392C88 = (void*)(&l_resWCNa2);
COMPILER_STRIP_GATE(80392C88, &l_resWCNa2);
/* 80392CA0-80392CB8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWONa2 */
SECTION_RODATA static void* const l_resWONa2[6] = {
@@ -546,7 +546,7 @@ SECTION_RODATA static void* const l_resWONa2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392CA0 = (void*)(&l_resWONa2);
COMPILER_STRIP_GATE(80392CA0, &l_resWONa2);
/* 80392CB8-80392CD0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWGNa2 */
SECTION_RODATA static void* const l_resWGNa2[6] = {
@@ -557,7 +557,7 @@ SECTION_RODATA static void* const l_resWGNa2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392CB8 = (void*)(&l_resWGNa2);
COMPILER_STRIP_GATE(80392CB8, &l_resWGNa2);
/* 80392CD0-80392CE8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANb2 */
SECTION_RODATA static void* const l_resWANb2[6] = {
@@ -568,7 +568,7 @@ SECTION_RODATA static void* const l_resWANb2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26),
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F),
};
SECTION_DEAD void* const cg_80392CD0 = (void*)(&l_resWANb2);
COMPILER_STRIP_GATE(80392CD0, &l_resWANb2);
/* 80392CE8-80392D30 -00001 0048+00 1/1 0/0 0/0 .rodata l_objTbl */
SECTION_RODATA static void* const l_objTbl[18] = {
@@ -582,7 +582,7 @@ SECTION_RODATA static void* const l_objTbl[18] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)0xFFFFFFFF,
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)0x00000004,
};
SECTION_DEAD void* const cg_80392CE8 = (void*)(&l_objTbl);
COMPILER_STRIP_GATE(80392CE8, &l_objTbl);
/* 80392D30-80392D78 -00001 0048+00 1/1 0/0 0/0 .rodata l_objTWTbl */
SECTION_RODATA static void* const l_objTWTbl[18] = {
@@ -596,7 +596,7 @@ SECTION_RODATA static void* const l_objTWTbl[18] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), (void*)0xFFFFFFFF,
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), (void*)0x00000004,
};
SECTION_DEAD void* const cg_80392D30 = (void*)(&l_objTWTbl);
COMPILER_STRIP_GATE(80392D30, &l_objTWTbl);
/* 80392D78-80392DC8 -00001 0050+00 1/1 0/0 0/0 .rodata l_bckTbl_M */
SECTION_RODATA static void* const l_bckTbl_M[20] = {
@@ -611,7 +611,7 @@ SECTION_RODATA static void* const l_bckTbl_M[20] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1C), (void*)0x00000004,
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1C), (void*)0x00000005,
};
SECTION_DEAD void* const cg_80392D78 = (void*)(&l_bckTbl_M);
COMPILER_STRIP_GATE(80392D78, &l_bckTbl_M);
/* 80392DC8-80392E18 -00001 0050+00 1/1 0/0 0/0 .rodata l_bckTbl_W */
SECTION_RODATA static void* const l_bckTbl_W[20] = {
@@ -626,7 +626,7 @@ SECTION_RODATA static void* const l_bckTbl_W[20] = {
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x16B), (void*)0x00000004,
(void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x16B), (void*)0x00000005,
};
SECTION_DEAD void* const cg_80392DC8 = (void*)(&l_bckTbl_W);
COMPILER_STRIP_GATE(80392DC8, &l_bckTbl_W);
/* 80392E18-80392E5C 01F478 0044+00 0/0 0/0 1/1 .rodata m_cylDat__9daNpcCd_c */
SECTION_RODATA extern u8 const m_cylDat__9daNpcCd_c[68] = {
@@ -636,7 +636,7 @@ SECTION_RODATA extern u8 const m_cylDat__9daNpcCd_c[68] = {
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_80392E18 = (void*)(&m_cylDat__9daNpcCd_c);
COMPILER_STRIP_GATE(80392E18, &m_cylDat__9daNpcCd_c);
/* 80392E5C-80392FC4 01F4BC 0168+00 1/1 0/0 0/0 .rodata a_transScaleTbl$3984 */
SECTION_RODATA static u8 const a_transScaleTbl[360] = {
@@ -664,7 +664,7 @@ SECTION_RODATA static u8 const a_transScaleTbl[360] = {
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x5C, 0xF2, 0x9A, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
0x3F, 0x86, 0xC7, 0x2F, 0x3F, 0x80, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80392E5C = (void*)(&a_transScaleTbl);
COMPILER_STRIP_GATE(80392E5C, &a_transScaleTbl);
/* 804534B8-804534BC 001AB8 0004+00 2/2 0/0 0/0 .sdata2 @4021 */
SECTION_SDATA2 static f32 lit_4021 = 1.0f;
@@ -1018,7 +1018,7 @@ SECTION_RODATA static u8 const a_jntNumTbl[36] = {
0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x05,
0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80392FC4 = (void*)(&a_jntNumTbl);
COMPILER_STRIP_GATE(80392FC4, &a_jntNumTbl);
/* 80156E8C-80156F74 1517CC 00E8+00 0/0 0/0 1/1 .text drawObj__9daNpcCd_cFiP8J3DModelf */
#pragma push
src/a/npc/d_a_npc_cd2.cpp
+49 -49
View File
@@ -13,14 +13,14 @@
struct request_of_phase_process_class {};
struct csXyz {
/* 802673F4 */ csXyz(s16, s16, s16);
};
struct cXyz {
/* 80009184 */ ~cXyz();
};
struct csXyz {
/* 802673F4 */ csXyz(s16, s16, s16);
};
struct mDoMtx_stack_c {
/* 8000CD64 */ void transS(cXyz const&);
/* 8000CDD4 */ void transM(cXyz const&);
@@ -39,15 +39,15 @@ struct mDoExt_btpAnm {
/* 8000D5E8 */ void entry(J3DMaterialTable*, s16);
};
struct mDoExt_McaMorfCallBack1_c {};
struct J3DModelData {};
struct mDoExt_McaMorfCallBack2_c {};
struct J3DAnmTransform {};
struct Z2Creature {};
struct mDoExt_McaMorfCallBack2_c {};
struct J3DModelData {};
struct mDoExt_McaMorfCallBack1_c {};
struct mDoExt_McaMorfSO {
/* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
@@ -65,12 +65,12 @@ struct daPy_py_c {
/* 8015F424 */ void checkNowWolfEyeUp();
};
struct J3DModel {};
struct J3DAnmTransformKey {};
struct J3DJoint {};
struct J3DModel {};
struct daNpcCd2_c {
/* 80157D00 */ void NpcCreate(int);
/* 80157F28 */ void ObjCreate(int);
@@ -338,7 +338,7 @@ SECTION_RODATA static void* const l_resMANa[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_80393250 = (void*)(&l_resMANa);
COMPILER_STRIP_GATE(80393250, &l_resMANa);
/* 80393268-80393280 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMADa */
SECTION_RODATA static void* const l_resMADa[6] = {
@@ -349,7 +349,7 @@ SECTION_RODATA static void* const l_resMADa[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_80393268 = (void*)(&l_resMADa);
COMPILER_STRIP_GATE(80393268, &l_resMADa);
/* 80393280-80393298 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMCNa */
SECTION_RODATA static void* const l_resMCNa[6] = {
@@ -360,7 +360,7 @@ SECTION_RODATA static void* const l_resMCNa[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_80393280 = (void*)(&l_resMCNa);
COMPILER_STRIP_GATE(80393280, &l_resMCNa);
/* 80393298-803932B0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMONa */
SECTION_RODATA static void* const l_resMONa[6] = {
@@ -371,7 +371,7 @@ SECTION_RODATA static void* const l_resMONa[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_80393298 = (void*)(&l_resMONa);
COMPILER_STRIP_GATE(80393298, &l_resMONa);
/* 803932B0-803932C8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANb */
SECTION_RODATA static void* const l_resMANb[6] = {
@@ -382,7 +382,7 @@ SECTION_RODATA static void* const l_resMANb[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_803932B0 = (void*)(&l_resMANb);
COMPILER_STRIP_GATE(803932B0, &l_resMANb);
/* 803932C8-803932E0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANc */
SECTION_RODATA static void* const l_resMANc[6] = {
@@ -393,7 +393,7 @@ SECTION_RODATA static void* const l_resMANc[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_803932C8 = (void*)(&l_resMANc);
COMPILER_STRIP_GATE(803932C8, &l_resMANc);
/* 803932E0-803932F8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMASa */
SECTION_RODATA static void* const l_resMASa[6] = {
@@ -404,7 +404,7 @@ SECTION_RODATA static void* const l_resMASa[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_803932E0 = (void*)(&l_resMASa);
COMPILER_STRIP_GATE(803932E0, &l_resMASa);
/* 803932F8-80393310 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMBNa */
SECTION_RODATA static void* const l_resMBNa[6] = {
@@ -415,7 +415,7 @@ SECTION_RODATA static void* const l_resMBNa[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_803932F8 = (void*)(&l_resMBNa);
COMPILER_STRIP_GATE(803932F8, &l_resMBNa);
/* 80393310-80393328 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANa2 */
SECTION_RODATA static void* const l_resMANa2[6] = {
@@ -426,7 +426,7 @@ SECTION_RODATA static void* const l_resMANa2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_80393310 = (void*)(&l_resMANa2);
COMPILER_STRIP_GATE(80393310, &l_resMANa2);
/* 80393328-80393340 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMADa2 */
SECTION_RODATA static void* const l_resMADa2[6] = {
@@ -437,7 +437,7 @@ SECTION_RODATA static void* const l_resMADa2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_80393328 = (void*)(&l_resMADa2);
COMPILER_STRIP_GATE(80393328, &l_resMADa2);
/* 80393340-80393358 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMCNa2 */
SECTION_RODATA static void* const l_resMCNa2[6] = {
@@ -448,7 +448,7 @@ SECTION_RODATA static void* const l_resMCNa2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_80393340 = (void*)(&l_resMCNa2);
COMPILER_STRIP_GATE(80393340, &l_resMCNa2);
/* 80393358-80393370 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMONa2 */
SECTION_RODATA static void* const l_resMONa2[6] = {
@@ -459,7 +459,7 @@ SECTION_RODATA static void* const l_resMONa2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_80393358 = (void*)(&l_resMONa2);
COMPILER_STRIP_GATE(80393358, &l_resMONa2);
/* 80393370-80393388 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANb2 */
SECTION_RODATA static void* const l_resMANb2[6] = {
@@ -470,7 +470,7 @@ SECTION_RODATA static void* const l_resMANb2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_80393370 = (void*)(&l_resMANb2);
COMPILER_STRIP_GATE(80393370, &l_resMANb2);
/* 80393388-803933A0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANc2 */
SECTION_RODATA static void* const l_resMANc2[6] = {
@@ -481,7 +481,7 @@ SECTION_RODATA static void* const l_resMANc2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_80393388 = (void*)(&l_resMANc2);
COMPILER_STRIP_GATE(80393388, &l_resMANc2);
/* 803933A0-803933B8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMASa2 */
SECTION_RODATA static void* const l_resMASa2[6] = {
@@ -492,7 +492,7 @@ SECTION_RODATA static void* const l_resMASa2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_803933A0 = (void*)(&l_resMASa2);
COMPILER_STRIP_GATE(803933A0, &l_resMASa2);
/* 803933B8-803933D0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMBNa2 */
SECTION_RODATA static void* const l_resMBNa2[6] = {
@@ -503,7 +503,7 @@ SECTION_RODATA static void* const l_resMBNa2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_803933B8 = (void*)(&l_resMBNa2);
COMPILER_STRIP_GATE(803933B8, &l_resMBNa2);
/* 803933D0-803933E8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANa */
SECTION_RODATA static void* const l_resWANa[6] = {
@@ -514,7 +514,7 @@ SECTION_RODATA static void* const l_resWANa[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_803933D0 = (void*)(&l_resWANa);
COMPILER_STRIP_GATE(803933D0, &l_resWANa);
/* 803933E8-80393400 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWADa */
SECTION_RODATA static void* const l_resWADa[6] = {
@@ -525,7 +525,7 @@ SECTION_RODATA static void* const l_resWADa[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_803933E8 = (void*)(&l_resWADa);
COMPILER_STRIP_GATE(803933E8, &l_resWADa);
/* 80393400-80393418 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMATa */
SECTION_RODATA static void* const l_resMATa[6] = {
@@ -536,7 +536,7 @@ SECTION_RODATA static void* const l_resMATa[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_80393400 = (void*)(&l_resMATa);
COMPILER_STRIP_GATE(80393400, &l_resMATa);
/* 80393418-80393430 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWCNa */
SECTION_RODATA static void* const l_resWCNa[6] = {
@@ -547,7 +547,7 @@ SECTION_RODATA static void* const l_resWCNa[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_80393418 = (void*)(&l_resWCNa);
COMPILER_STRIP_GATE(80393418, &l_resWCNa);
/* 80393430-80393448 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWONa */
SECTION_RODATA static void* const l_resWONa[6] = {
@@ -558,7 +558,7 @@ SECTION_RODATA static void* const l_resWONa[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_80393430 = (void*)(&l_resWONa);
COMPILER_STRIP_GATE(80393430, &l_resWONa);
/* 80393448-80393460 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWGNa */
SECTION_RODATA static void* const l_resWGNa[6] = {
@@ -569,7 +569,7 @@ SECTION_RODATA static void* const l_resWGNa[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_80393448 = (void*)(&l_resWGNa);
COMPILER_STRIP_GATE(80393448, &l_resWGNa);
/* 80393460-80393478 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANb */
SECTION_RODATA static void* const l_resWANb[6] = {
@@ -580,7 +580,7 @@ SECTION_RODATA static void* const l_resWANb[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_80393460 = (void*)(&l_resWANb);
COMPILER_STRIP_GATE(80393460, &l_resWANb);
/* 80393478-80393490 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANa2 */
SECTION_RODATA static void* const l_resWANa2[6] = {
@@ -591,7 +591,7 @@ SECTION_RODATA static void* const l_resWANa2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_80393478 = (void*)(&l_resWANa2);
COMPILER_STRIP_GATE(80393478, &l_resWANa2);
/* 80393490-803934A8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWADa2 */
SECTION_RODATA static void* const l_resWADa2[6] = {
@@ -602,7 +602,7 @@ SECTION_RODATA static void* const l_resWADa2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_80393490 = (void*)(&l_resWADa2);
COMPILER_STRIP_GATE(80393490, &l_resWADa2);
/* 803934A8-803934C0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMATa2 */
SECTION_RODATA static void* const l_resMATa2[6] = {
@@ -613,7 +613,7 @@ SECTION_RODATA static void* const l_resMATa2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_803934A8 = (void*)(&l_resMATa2);
COMPILER_STRIP_GATE(803934A8, &l_resMATa2);
/* 803934C0-803934D8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWCNa2 */
SECTION_RODATA static void* const l_resWCNa2[6] = {
@@ -624,7 +624,7 @@ SECTION_RODATA static void* const l_resWCNa2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_803934C0 = (void*)(&l_resWCNa2);
COMPILER_STRIP_GATE(803934C0, &l_resWCNa2);
/* 803934D8-803934F0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWONa2 */
SECTION_RODATA static void* const l_resWONa2[6] = {
@@ -635,7 +635,7 @@ SECTION_RODATA static void* const l_resWONa2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_803934D8 = (void*)(&l_resWONa2);
COMPILER_STRIP_GATE(803934D8, &l_resWONa2);
/* 803934F0-80393508 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWGNa2 */
SECTION_RODATA static void* const l_resWGNa2[6] = {
@@ -646,7 +646,7 @@ SECTION_RODATA static void* const l_resWGNa2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_803934F0 = (void*)(&l_resWGNa2);
COMPILER_STRIP_GATE(803934F0, &l_resWGNa2);
/* 80393508-80393520 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANb2 */
SECTION_RODATA static void* const l_resWANb2[6] = {
@@ -657,7 +657,7 @@ SECTION_RODATA static void* const l_resWANb2[6] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21),
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28),
};
SECTION_DEAD void* const cg_80393508 = (void*)(&l_resWANb2);
COMPILER_STRIP_GATE(80393508, &l_resWANb2);
/* 80393520-80393588 -00001 0068+00 1/1 0/0 0/0 .rodata l_objTbl */
SECTION_RODATA static void* const l_objTbl[26] = {
@@ -675,7 +675,7 @@ SECTION_RODATA static void* const l_objTbl[26] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)0x0000000F,
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)0x00000010,
};
SECTION_DEAD void* const cg_80393520 = (void*)(&l_objTbl);
COMPILER_STRIP_GATE(80393520, &l_objTbl);
/* 80393588-803935F0 -00001 0068+00 1/1 0/0 0/0 .rodata l_objTWTbl */
SECTION_RODATA static void* const l_objTWTbl[26] = {
@@ -693,7 +693,7 @@ SECTION_RODATA static void* const l_objTWTbl[26] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), (void*)0xFFFFFFFF,
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), (void*)0xFFFFFFFF,
};
SECTION_DEAD void* const cg_80393588 = (void*)(&l_objTWTbl);
COMPILER_STRIP_GATE(80393588, &l_objTWTbl);
/* 803935F0-803937A0 -00001 01B0+00 1/1 0/0 0/0 .rodata l_bckTbl_M */
SECTION_RODATA static void* const l_bckTbl_M[108] = {
@@ -752,7 +752,7 @@ SECTION_RODATA static void* const l_bckTbl_M[108] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0xFFFFFFFF,
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x0000000A,
};
SECTION_DEAD void* const cg_803935F0 = (void*)(&l_bckTbl_M);
COMPILER_STRIP_GATE(803935F0, &l_bckTbl_M);
/* 803937A0-80393950 -00001 01B0+00 1/1 0/0 0/0 .rodata l_bckTbl_W */
SECTION_RODATA static void* const l_bckTbl_W[108] = {
@@ -811,7 +811,7 @@ SECTION_RODATA static void* const l_bckTbl_W[108] = {
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x00000009,
(void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x0000000F,
};
SECTION_DEAD void* const cg_803937A0 = (void*)(&l_bckTbl_W);
COMPILER_STRIP_GATE(803937A0, &l_bckTbl_W);
/* 80393950-80393994 01FFB0 0044+00 0/0 0/0 4/4 .rodata m_cylDat__10daNpcCd2_c */
SECTION_RODATA extern u8 const m_cylDat__10daNpcCd2_c[68] = {
@@ -821,7 +821,7 @@ SECTION_RODATA extern u8 const m_cylDat__10daNpcCd2_c[68] = {
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_80393950 = (void*)(&m_cylDat__10daNpcCd2_c);
COMPILER_STRIP_GATE(80393950, &m_cylDat__10daNpcCd2_c);
/* 80393994-80393AFC 01FFF4 0168+00 1/1 0/0 0/0 .rodata a_transScaleTbl$3998 */
SECTION_RODATA static u8 const a_transScaleTbl[360] = {
@@ -849,7 +849,7 @@ SECTION_RODATA static u8 const a_transScaleTbl[360] = {
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x5C, 0xF2, 0x9A, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
0x3F, 0x86, 0xC7, 0x2F, 0x3F, 0x80, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80393994 = (void*)(&a_transScaleTbl);
COMPILER_STRIP_GATE(80393994, &a_transScaleTbl);
/* 804534E0-804534E4 001AE0 0004+00 3/3 0/0 0/0 .sdata2 @4050 */
SECTION_SDATA2 static f32 lit_4050 = 1.0f;
@@ -879,7 +879,7 @@ asm void daNpcCd2_c::ObjCreate(int param_0) {
SECTION_RODATA static u8 const lit_4072[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80393AFC = (void*)(&lit_4072);
COMPILER_STRIP_GATE(80393AFC, &lit_4072);
/* 80157F68-801580A8 1528A8 0140+00 0/0 0/0 1/1 .text ChairCreate__10daNpcCd2_cFf */
#pragma push
@@ -2288,7 +2288,7 @@ SECTION_RODATA static u8 const a_jntNumTbl[104] = {
0x0A, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00,
0x00, 0x0A, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x0B,
};
SECTION_DEAD void* const cg_80393B08 = (void*)(&a_jntNumTbl);
COMPILER_STRIP_GATE(80393B08, &a_jntNumTbl);
/* 80158FF0-801590FC 153930 010C+00 0/0 0/0 4/4 .text drawObj__10daNpcCd2_cFiP8J3DModelf
*/
@@ -2357,7 +2357,7 @@ asm void daNpcCd2_c::setHitodamaParticle() {
static u8 target[4];
/* 80451008-8045100C 000508 0004+00 1/1 0/0 0/0 .sbss targetWay */
static u8 targetWay[4];
static f32 targetWay;
/* 8045100C-80451010 00050C 0002+02 2/2 0/0 0/0 .sbss wolfAngle */
static u8 wolfAngle[2 + 2 /* padding */];
src/a/obj/d_a_obj_item.cpp
+4 -4
View File
@@ -13,8 +13,6 @@
struct request_of_phase_process_class {};
struct csXyz {};
struct Vec {};
struct cXyz {
@@ -25,6 +23,8 @@ struct cXyz {
/* 8026706C */ bool operator!=(Vec const&) const;
};
struct csXyz {};
struct mDoMtx_stack_c {
/* 8000CD64 */ void transS(cXyz const&);
/* 8000CD9C */ void transM(f32, f32, f32);
@@ -137,10 +137,10 @@ struct dSv_info_c {
/* 80035590 */ void isItem(int, int) const;
};
struct J3DModelData {};
struct dKy_tevstr_c {};
struct J3DModelData {};
struct dScnKy_env_light_c {
/* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
/* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
src/c/c_dylink.cpp
+1 -1
View File
@@ -872,7 +872,7 @@ SECTION_RODATA static void* const DynamicNameTable[1514] = {
(void*)0x03100000, (void*)(((char*)&c_c_dylink__stringBase0) + 0x2A03),
(void*)0xFFFF0000, (void*)NULL,
};
SECTION_DEAD void* const cg_80374640 = (void*)(&DynamicNameTable);
COMPILER_STRIP_GATE(80374640, &DynamicNameTable);
/* 803F0F50-803F1BB0 01DC70 0C60+00 4/4 0/0 0/0 .bss DMC */
static u8 DMC[3168];
src/d/a/d_a_alink.cpp
+317 -317
View File
File diff suppressed because it is too large Load Diff
src/d/a/d_a_itembase.cpp
+2 -2
View File
@@ -13,10 +13,10 @@
struct request_of_phase_process_class {};
struct J3DMaterialTable {};
struct J3DAnmTexPattern {};
struct J3DMaterialTable {};
struct mDoExt_btpAnm {
/* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16);
/* 8000D5E8 */ void entry(J3DMaterialTable*, s16);
src/d/a/d_a_itembase_static.cpp
+1 -1
View File
@@ -150,4 +150,4 @@ SECTION_RODATA extern u8 const m_data__12daItemBase_c[56] = {
0x00, 0x78, 0x00, 0x00, 0xC0, 0x80, 0x00, 0x00, 0x40, 0x60, 0x00, 0x00, 0x04, 0x4C,
0x0B, 0xB8, 0x41, 0xB8, 0x00, 0x00, 0xC0, 0xC0, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x0A,
};
SECTION_DEAD void* const cg_803792B0 = (void*)(&m_data__12daItemBase_c);
COMPILER_STRIP_GATE(803792B0, &m_data__12daItemBase_c);
src/d/a/d_a_npc.cpp
+19 -19
View File
@@ -13,12 +13,6 @@
struct request_of_phase_process_class {};
struct csXyz {
/* 80018BD0 */ ~csXyz();
/* 80112C80 */ csXyz();
/* 8026745C */ void operator+=(csXyz&);
};
struct Vec {};
struct cXyz {
@@ -30,6 +24,12 @@ struct cXyz {
/* 802670AC */ void isZero() const;
};
struct csXyz {
/* 80018BD0 */ ~csXyz();
/* 80112C80 */ csXyz();
/* 8026745C */ void operator+=(csXyz&);
};
struct mDoMtx_stack_c {
/* 8000CD64 */ void transS(cXyz const&);
/* 8000CD9C */ void transM(f32, f32, f32);
@@ -44,13 +44,13 @@ struct mDoExt_morf_c {
/* 8000FB7C */ void setMorf(f32);
};
struct J3DAnmColor {};
struct J3DAnmTextureSRTKey {};
struct J3DAnmTexPattern {};
struct J3DAnmTevRegKey {};
struct J3DAnmTexPattern {};
struct J3DAnmColor {};
struct J3DAnmTextureSRTKey {};
struct J3DMaterialTable {
/* 8032F64C */ void removeMatColorAnimator(J3DAnmColor*);
@@ -116,11 +116,9 @@ struct daNpcT_motionAnmData_c {};
struct daNpcT_faceMotionAnmData_c {};
struct J3DModel {};
struct J3DAnmTransformKey {};
struct dCcD_GObjInf {
/* 80084460 */ void ChkTgHit();
};
struct J3DModel {};
struct J3DFrameCtrl {
/* 803283FC */ void init(s16);
@@ -128,10 +126,12 @@ struct J3DFrameCtrl {
struct _GXColorS10 {};
struct J3DAnmTransformKey {};
struct J3DJoint {};
struct dCcD_GObjInf {
/* 80084460 */ void ChkTgHit();
};
struct daNpcT_c {
/* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
/* 80147FD4 */ void srchActor(void*, void*);
@@ -3206,7 +3206,7 @@ SECTION_RODATA extern u8 const mCcDObjData__8daNpcT_c[48] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 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_80392680 = (void*)(&mCcDObjData__8daNpcT_c);
COMPILER_STRIP_GATE(80392680, &mCcDObjData__8daNpcT_c);
/* 8014D3D8-8014D538 147D18 0160+00 0/0 1/0 0/0 .text __sinit_d_a_npc_cpp */
#pragma push
@@ -5128,7 +5128,7 @@ SECTION_RODATA static u8 const mCcDObj__11daBaseNpc_c[48] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 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_803926B0 = (void*)(&mCcDObj__11daBaseNpc_c);
COMPILER_STRIP_GATE(803926B0, &mCcDObj__11daBaseNpc_c);
#pragma pop
/* 803926E0-80392710 01ED40 0030+00 0/0 0/0 0/0 .rodata mCcDObjInfo__8daNpcF_c */
@@ -5139,7 +5139,7 @@ SECTION_RODATA static u8 const mCcDObjInfo__8daNpcF_c[48] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 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_803926E0 = (void*)(&mCcDObjInfo__8daNpcF_c);
COMPILER_STRIP_GATE(803926E0, &mCcDObjInfo__8daNpcF_c);
#pragma pop
/* 80450FF8-80451000 0004F8 0008+00 0/0 1/1 0/0 .sbss None */
src/d/a/d_a_obj.cpp
+7 -7
View File
@@ -27,13 +27,13 @@ struct cXyz {
/* 80266CBC */ void outprod(Vec const&) const;
};
struct Quaternion {};
struct dCcD_GObjInf {
/* 800844F8 */ void GetTgHitObj();
/* 8008457C */ void GetTgHitObjSe();
};
struct Quaternion {};
struct daObj {
/* 80037038 */ void eff_break_tsubo(fopAc_ac_c*, cXyz, int);
/* 80037180 */ void make_eff_break_kotubo(fopAc_ac_c*);
@@ -53,10 +53,10 @@ struct dRes_control_c {
/* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
};
struct JPABaseEmitter {};
struct dKy_tevstr_c {};
struct JPABaseEmitter {};
struct J3DModelData {};
struct dPa_modelEcallBack {
@@ -66,10 +66,10 @@ struct dPa_modelEcallBack {
struct dPa_levelEcallBack {};
struct csXyz {};
struct _GXColor {};
struct csXyz {};
struct dPa_control_c {
/* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
@@ -324,7 +324,7 @@ SECTION_RODATA static f32 const zero_quat[4] = {
0.0f,
1.0f,
};
SECTION_DEAD void* const cg_80379298 = (void*)(&zero_quat);
COMPILER_STRIP_GATE(80379298, &zero_quat);
/* 80451DA8-80451DB0 0003A8 0004+04 1/1 0/0 0/0 .sdata2 @3956 */
SECTION_SDATA2 static f32 lit_3956[1 + 1 /* padding */] = {
src/d/a/d_a_player.cpp
+2 -2
View File
@@ -652,7 +652,7 @@ SECTION_RODATA static u8 const twglArcName[10 + 2 /* padding */] = {
0x00,
0x00,
};
SECTION_DEAD void* const cg_80393DA8 = (void*)(&twglArcName);
COMPILER_STRIP_GATE(80393DA8, &twglArcName);
/* 80393DB4-80393DC0 020414 000A+02 1/0 0/0 0/0 .rodata twgwArcName$4617 */
SECTION_RODATA static u8 const twgwArcName[10 + 2 /* padding */] = {
@@ -670,7 +670,7 @@ SECTION_RODATA static u8 const twgwArcName[10 + 2 /* padding */] = {
0x00,
0x00,
};
SECTION_DEAD void* const cg_80393DB4 = (void*)(&twgwArcName);
COMPILER_STRIP_GATE(80393DB4, &twgwArcName);
/* 803BA0A0-803BA0C0 -00001 0020+00 1/1 0/0 0/0 .data arcName$4622 */
SECTION_DATA static void* arcName[8] = {
src/d/a/d_a_shop_item_static.cpp
+1 -1
View File
@@ -341,7 +341,7 @@ SECTION_RODATA extern void* const mData__12daShopItem_c[276] = {
(void*)0x0000000C,
(void*)NULL,
};
SECTION_DEAD void* const cg_803792E8 = (void*)(&mData__12daShopItem_c);
COMPILER_STRIP_GATE(803792E8, &mData__12daShopItem_c);
/* 80037C24-80037C7C 032564 0058+00 0/0 0/0 1/1 .text CheckShopItemCreateHeap__FP10fopAc_ac_c */
#pragma push
src/d/bg/d_bg_s.cpp
+2 -2
View File
@@ -38,6 +38,8 @@ struct dBgS_Acch {
/* 8007732C */ void CalcWallRR();
};
struct cXyz {};
struct cBgS_PolyInfo {
/* 802680F8 */ void ChkSetInfo() const;
/* 80268120 */ void ClearPi();
@@ -48,8 +50,6 @@ struct cBgS_PolyInfo {
struct csXyz {};
struct cXyz {};
struct dBgS {
/* 80030C50 */ ~dBgS();
/* 800748FC */ void Ct();
src/d/bg/d_bg_s_acch.cpp
+4 -4
View File
@@ -60,10 +60,6 @@ struct dBgS_AcchCir {
/* 80077414 */ ~dBgS_AcchCir();
};
struct Vec {};
struct csXyz {};
struct cBgS_PolyInfo {
/* 80268074 */ cBgS_PolyInfo();
/* 802680B0 */ ~cBgS_PolyInfo();
@@ -72,6 +68,8 @@ struct cBgS_PolyInfo {
/* 802681A4 */ void SetPolyIndex(int);
};
struct csXyz {};
struct dBgS_Acch;
struct dBgS {
/* 8007524C */ void WallCorrect(dBgS_Acch*);
@@ -82,6 +80,8 @@ struct dBgS {
/* 80075B84 */ void RideCallBack(cBgS_PolyInfo const&, fopAc_ac_c*);
};
struct Vec {};
struct dBgS_Acch {
/* 80075F94 */ ~dBgS_Acch();
/* 800760A0 */ dBgS_Acch();
src/d/bg/d_bg_s_movebg_actor.cpp
+2 -2
View File
@@ -32,11 +32,11 @@ struct dBgW {
/* 8007B9C0 */ void Move();
};
struct csXyz {};
struct cXyz {};
struct cBgS_PolyInfo {};
struct cXyz {};
struct csXyz {};
struct dBgS_MoveBgActor {
/* 80078624 */ dBgS_MoveBgActor();
src/d/bg/d_bg_w.cpp
+14 -14
View File
@@ -25,24 +25,14 @@ struct dBgW_Base {
struct dBgS_CaptPoly {};
struct cBgS_PolyInfo {
/* 802681A4 */ void SetPolyIndex(int);
};
struct dBgS_SplGrpChk {};
struct cBgS_GrpPassChk {};
struct dBgS_RoofChk {};
struct dBgS_SphChk {};
struct csXyz {};
struct cM3dGPla {
/* 8026F57C */ void getCrossY(cXyz const&, f32*) const;
};
struct cBgS_GrpPassChk {};
struct Vec {};
struct dBgS_Acch {
@@ -54,6 +44,16 @@ struct dBgS_Acch {
struct cBgS_PolyPassChk {};
struct dBgS_RoofChk {};
struct cBgS_PolyInfo {
/* 802681A4 */ void SetPolyIndex(int);
};
struct dBgS_SphChk {};
struct csXyz {};
struct dBgW {
/* 8007B3AC */ void GetExitId(cBgS_PolyInfo const&);
/* 8007B3D8 */ void GetPolyColor(cBgS_PolyInfo const&);
@@ -178,10 +178,10 @@ struct cBgD_t {};
struct cBgS_ShdwDraw {};
struct cBgS_LinChk {};
struct cBgS_GndChk {};
struct cBgS_LinChk {};
struct cBgW {
/* 80079294 */ cBgW();
/* 8007933C */ ~cBgW();
src/d/bg/d_bg_w_kcol.cpp
+22 -22
View File
@@ -27,34 +27,26 @@ struct dBgW_Base {
/* 8007E6DC */ void CallArrowStickCallBack(fopAc_ac_c*, fopAc_ac_c*, cXyz&);
};
struct dBgS_SplGrpChk {};
struct cBgS_GndChk {};
struct cBgS_GrpPassChk {};
struct cBgS_PolyPassChk {};
struct cBgS_LinChk {};
struct cBgS_PolyInfo {
/* 802681A4 */ void SetPolyIndex(int);
};
struct cBgS_GrpPassChk {};
struct Vec {};
struct dBgPc {
/* 80074048 */ void setCode(sBgPc&);
};
struct dBgS_SphChk {};
struct csXyz {};
struct cBgS_LinChk {};
struct dBgS_CaptPoly {};
struct dBgS_SplGrpChk {};
struct KC_PrismData {};
struct dBgS_RoofChk {};
struct cBgS_ShdwDraw {};
struct Vec {};
struct dBgS_Acch {
/* 800771E4 */ void GetSpeedY();
/* 80077200 */ void GetWallAddY(Vec&);
@@ -62,9 +54,17 @@ struct dBgS_Acch {
/* 800772E8 */ void CalcMovePosWork();
};
struct cBgS_GndChk {};
struct dBgS_RoofChk {};
struct cBgS_PolyPassChk {};
struct dBgPc {
/* 80074048 */ void setCode(sBgPc&);
};
struct KC_PrismData {};
struct dBgS_SphChk {};
struct csXyz {};
struct dBgWKCol {
/* 8007E6F4 */ dBgWKCol();
src/d/bg/d_bg_w_sv.cpp
+6 -6
View File
@@ -17,12 +17,12 @@ struct dBgW_Base {
/* 80074AB4 */ void SetOldShapeAngleY(s16);
};
struct cBgD_t {};
struct cXyz {};
struct cBgS_PolyInfo {};
struct cBgD_t {};
struct csXyz {};
struct dBgWSv {
@@ -42,14 +42,14 @@ struct dBgS_SplGrpChk {};
struct cBgS_GrpPassChk {};
struct dBgS_RoofChk {};
struct dBgS_SphChk {};
struct dBgS_Acch {};
struct cBgS_PolyPassChk {};
struct dBgS_RoofChk {};
struct dBgS_SphChk {};
struct dBgW {
/* 8007B3AC */ void GetExitId(cBgS_PolyInfo const&);
/* 8007B3D8 */ void GetPolyColor(cBgS_PolyInfo const&);
src/d/cc/d_cc_d.cpp
+25 -25
View File
@@ -155,9 +155,6 @@ struct cM3dGCps {
struct cCcD_AabAttr {};
struct cCcD_PntAttr {};
struct cCcD_SphAttr;
struct cCcD_ShapeAttr {
struct Shape {};
@@ -166,8 +163,30 @@ struct cCcD_ShapeAttr {
/* 80263A64 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
};
struct cCcD_CpsAttr;
struct cCcD_SphAttr;
struct cCcD_TriAttr;
struct cCcD_CylAttr;
struct cCcD_PntAttr {};
struct cCcD_CpsAttr {
/* 80263DC0 */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
/* 80084FE4 */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const;
/* 80263E04 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
/* 80263D7C */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
/* 80084FD4 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const;
/* 80263D38 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
/* 80084FDC */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const;
/* 80085024 */ bool CrossCo(cCcD_TriAttr const&, f32*) const;
/* 80263F24 */ void CrossCo(cCcD_CylAttr const&, f32*) const;
/* 8008502C */ bool CrossCo(cCcD_PntAttr const&, f32*) const;
/* 8008501C */ bool CrossCo(cCcD_AabAttr const&, f32*) const;
/* 80085034 */ void CrossCo(cCcD_ShapeAttr const&, f32*) const;
/* 80263ED4 */ void CrossCo(cCcD_CpsAttr const&, f32*) const;
/* 80263F74 */ void CrossCo(cCcD_SphAttr const&, f32*) const;
/* 80263FC4 */ void CalcAabBox();
/* 80264014 */ void GetNVec(cXyz const&, cXyz*) const;
};
struct cCcD_CylAttr {
/* 80084CC0 */ void GetCoCP() const;
/* 80037A4C */ void GetCoCP();
@@ -190,25 +209,6 @@ struct cCcD_CylAttr {
/* 802644B8 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
};
struct cCcD_CpsAttr {
/* 80263DC0 */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
/* 80084FE4 */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const;
/* 80263E04 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
/* 80263D7C */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
/* 80084FD4 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const;
/* 80263D38 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
/* 80084FDC */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const;
/* 80085024 */ bool CrossCo(cCcD_TriAttr const&, f32*) const;
/* 80263F24 */ void CrossCo(cCcD_CylAttr const&, f32*) const;
/* 8008502C */ bool CrossCo(cCcD_PntAttr const&, f32*) const;
/* 8008501C */ bool CrossCo(cCcD_AabAttr const&, f32*) const;
/* 80085034 */ void CrossCo(cCcD_ShapeAttr const&, f32*) const;
/* 80263ED4 */ void CrossCo(cCcD_CpsAttr const&, f32*) const;
/* 80263F74 */ void CrossCo(cCcD_SphAttr const&, f32*) const;
/* 80263FC4 */ void CalcAabBox();
/* 80264014 */ void GetNVec(cXyz const&, cXyz*) const;
};
struct cCcD_SphAttr {
/* 80084B44 */ void GetCoCP() const;
/* 80037A54 */ void GetCoCP();
@@ -516,7 +516,7 @@ extern "C" extern void* __vt__12cCcD_CpsAttr[25];
extern "C" extern void* __vt__12cCcD_TriAttr[25];
extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
extern "C" extern void* __vt__9cCcD_Stts[8];
extern "C" extern u8 m_virtual_center__14cCcD_ShapeAttr[12];
extern "C" extern f32 m_virtual_center__14cCcD_ShapeAttr[3];
extern "C" extern f32 Zero__4cXyz[3];
//
@@ -1274,7 +1274,7 @@ SECTION_RODATA static u8 const m_hitSeID__12dCcD_GObjInf[96] = {
0x00, 0x04, 0x00, 0x10, 0x00, 0x04, 0x00, 0x11, 0x00, 0x04, 0x00, 0x12, 0x00, 0x04, 0x00, 0x13,
0x00, 0x04, 0x00, 0x14, 0x00, 0x04, 0x00, 0x15, 0x00, 0x04, 0x00, 0x18, 0x00, 0x04, 0x00, 0x16,
};
SECTION_DEAD void* const cg_8037A780 = (void*)(&m_hitSeID__12dCcD_GObjInf);
COMPILER_STRIP_GATE(8037A780, &m_hitSeID__12dCcD_GObjInf);
/* 800845B0-8008460C 07EEF0 005C+00 0/0 3/3 32/32 .text getHitSeID__12dCcD_GObjInfFUci */
#pragma push
src/d/cc/d_cc_mass_s.cpp
+8 -8
View File
@@ -13,10 +13,10 @@
struct fopAc_ac_c {};
struct cCcD_Obj {};
struct cXyz {};
struct cCcD_Obj {};
struct dCcMassS_Obj {
/* 800300F4 */ ~dCcMassS_Obj();
/* 800852E0 */ void Set(cCcD_Obj*, u8, void (*)(fopAc_ac_c*, cXyz*, u32));
@@ -24,18 +24,18 @@ struct dCcMassS_Obj {
/* 800855C8 */ dCcMassS_Obj();
};
struct dCcMassS_HitInf {
/* 80085334 */ void ClearPointer();
};
struct Vec {};
struct cM3dGCps {
/* 8026EF88 */ cM3dGCps();
/* 8026EFA4 */ ~cM3dGCps();
/* 8026F080 */ void SetCps(cM3dGCps const&);
};
struct Vec {};
struct dCcMassS_HitInf {
/* 80085334 */ void ClearPointer();
};
struct dCcMassS_Mng {
/* 80085350 */ dCcMassS_Mng();
/* 800855E4 */ void Ct();
src/d/cc/d_cc_s.cpp
+12 -12
View File
@@ -29,28 +29,28 @@ struct dJntCol_c {
/* 80036C44 */ void getHitmarkPosAndAngle(cXyz const*, csXyz const*, cXyz*, csXyz*, int) const;
};
struct cCcD_Obj {
/* 80263A48 */ void GetAc();
};
struct cCcD_Stts {
/* 80263934 */ void PlusCcMove(f32, f32, f32);
/* 80263970 */ void PlusDmg(int);
struct dCcD_GObjInf {
/* 800843DC */ void ChkAtNoGuard();
};
struct cCcD_GObjInf {};
struct dCcD_GStts {};
struct cCcD_Obj {
/* 80263A48 */ void GetAc();
};
struct cCcD_GStts {};
struct cCcD_ShapeAttr {
struct Shape {};
};
struct dCcD_GObjInf {
/* 800843DC */ void ChkAtNoGuard();
};
struct dCcD_GStts {};
struct cCcD_GStts {};
struct cCcD_Stts {
/* 80263934 */ void PlusCcMove(f32, f32, f32);
/* 80263970 */ void PlusDmg(int);
};
struct dCcS {
/* 8002FF40 */ ~dCcS();
src/d/com/d_com_inf_game.cpp
+2 -2
View File
@@ -175,10 +175,10 @@ struct dStage_nextStage_c {
/* 80023E28 */ void set(char const*, s8, s16, s8, s8, u8);
};
struct J3DModel {};
struct J3DModelData {};
struct J3DModel {};
struct dSmplMdl_draw_c {
/* 80048CB4 */ dSmplMdl_draw_c();
/* 80048E0C */ void draw();
src/d/com/d_com_static.cpp
+16 -8
View File
@@ -498,28 +498,36 @@ SECTION_SDATA2 extern void* M_dir_base__Q212daObjMovebox5Act_c[2] = {
SECTION_SDATA2 extern u32 OPEN_SIZE__7daDsh_c = 0x43870CCD;
/* 80451D34-80451D38 000334 0004+00 0/0 0/0 1/1 .sdata2 OPEN_ACCEL__7daDsh_c */
SECTION_SDATA2 extern u32 OPEN_ACCEL__7daDsh_c = 0x41200000;
SECTION_SDATA2 extern f32 OPEN_ACCEL__7daDsh_c;
SECTION_SDATA2 f32 OPEN_ACCEL__7daDsh_c = 10.0f;
/* 80451D38-80451D3C 000338 0004+00 0/0 0/0 1/1 .sdata2 OPEN_SPEED__7daDsh_c */
SECTION_SDATA2 extern u32 OPEN_SPEED__7daDsh_c = 0xC2200000;
SECTION_SDATA2 extern f32 OPEN_SPEED__7daDsh_c;
SECTION_SDATA2 f32 OPEN_SPEED__7daDsh_c = -40.0f;
/* 80451D3C-80451D40 00033C 0004+00 0/0 0/0 1/1 .sdata2 OPEN_BOUND_SPEED__7daDsh_c */
SECTION_SDATA2 extern u32 OPEN_BOUND_SPEED__7daDsh_c = 0xC1F00000;
SECTION_SDATA2 extern f32 OPEN_BOUND_SPEED__7daDsh_c;
SECTION_SDATA2 f32 OPEN_BOUND_SPEED__7daDsh_c = -30.0f;
/* 80451D40-80451D44 000340 0004+00 0/0 0/0 1/1 .sdata2 OPEN_BOUND_RATIO__7daDsh_c */
SECTION_SDATA2 extern u32 OPEN_BOUND_RATIO__7daDsh_c = 0xBECCCCCD;
SECTION_SDATA2 extern f32 OPEN_BOUND_RATIO__7daDsh_c;
SECTION_SDATA2 f32 OPEN_BOUND_RATIO__7daDsh_c = -2.0f / 5.0f;
/* 80451D44-80451D48 000344 0004+00 0/0 0/0 1/1 .sdata2 CLOSE_ACCEL__7daDsh_c */
SECTION_SDATA2 extern u32 CLOSE_ACCEL__7daDsh_c = 0x41200000;
SECTION_SDATA2 extern f32 CLOSE_ACCEL__7daDsh_c;
SECTION_SDATA2 f32 CLOSE_ACCEL__7daDsh_c = 10.0f;
/* 80451D48-80451D4C 000348 0004+00 0/0 0/0 1/1 .sdata2 CLOSE_SPEED__7daDsh_c */
SECTION_SDATA2 extern u32 CLOSE_SPEED__7daDsh_c = 0x42200000;
SECTION_SDATA2 extern f32 CLOSE_SPEED__7daDsh_c;
SECTION_SDATA2 f32 CLOSE_SPEED__7daDsh_c = 40.0f;
/* 80451D4C-80451D50 00034C 0004+00 0/0 0/0 1/1 .sdata2 CLOSE_BOUND_SPEED__7daDsh_c */
SECTION_SDATA2 extern u32 CLOSE_BOUND_SPEED__7daDsh_c = 0x41F00000;
SECTION_SDATA2 extern f32 CLOSE_BOUND_SPEED__7daDsh_c;
SECTION_SDATA2 f32 CLOSE_BOUND_SPEED__7daDsh_c = 30.0f;
/* 80451D50-80451D54 000350 0004+00 0/0 0/0 1/1 .sdata2 CLOSE_BOUND_RATIO__7daDsh_c */
SECTION_SDATA2 extern u32 CLOSE_BOUND_RATIO__7daDsh_c = 0xBECCCCCD;
SECTION_SDATA2 extern f32 CLOSE_BOUND_RATIO__7daDsh_c;
SECTION_SDATA2 f32 CLOSE_BOUND_RATIO__7daDsh_c = -2.0f / 5.0f;
/* 80451D54-80451D58 000354 0004+00 1/1 0/0 0/0 .sdata2 @4338 */
SECTION_SDATA2 static u8 lit_4338[4] = {
src/d/d_attention.cpp
+2 -2
View File
@@ -11,10 +11,10 @@
// Types:
//
struct J3DMaterialTable {};
struct J3DAnmTextureSRTKey {};
struct J3DMaterialTable {};
struct mDoExt_btkAnm {
/* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16);
/* 8000D6D8 */ void entry(J3DMaterialTable*, f32);
src/d/d_bright_check.cpp
+6 -6
View File
@@ -39,10 +39,10 @@ struct dBrightCheck_c {
/* 80193594 */ void _draw();
};
struct JAISoundID {};
struct Vec {};
struct JAISoundID {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -182,7 +182,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_80394910 = (void*)(&tv_btnA);
COMPILER_STRIP_GATE(80394910, &tv_btnA);
/* 80394938-80394960 020F98 0028+00 0/1 0/0 0/0 .rodata ftv_btnA$3745 */
#pragma push
@@ -192,7 +192,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_80394938 = (void*)(&ftv_btnA);
COMPILER_STRIP_GATE(80394938, &ftv_btnA);
#pragma pop
/* 80394960-803949B0 020FC0 0050+00 0/1 0/0 0/0 .rodata txTV$3751 */
@@ -205,7 +205,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_80394960 = (void*)(&txTV);
COMPILER_STRIP_GATE(80394960, &txTV);
#pragma pop
/* 803949B0-803949D8 021010 0028+00 0/1 0/0 0/0 .rodata txTVhide$3752 */
@@ -216,7 +216,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_803949B0 = (void*)(&txTVhide);
COMPILER_STRIP_GATE(803949B0, &txTVhide);
#pragma pop
/* 80453A00-80453A04 002000 0004+00 2/2 0/0 0/0 .sdata2 @3792 */
src/d/d_camera.cpp
+10 -10
View File
@@ -187,8 +187,16 @@ struct dCcMassS_Mng {
/* 80085EB8 */ void GetCamTopPos(Vec*);
};
struct dBgS_LinChk {
/* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
};
struct camera_class {};
struct dCamMapToolData {
/* 8015FEB8 */ void Set(s32, s32, fopAc_ac_c*, u16, u8);
};
struct cSAngle {
/* 80030510 */ ~cSAngle();
/* 80271004 */ void Val(s16);
@@ -221,14 +229,6 @@ struct cSAngle {
/* 802712B4 */ void operator*=(f32);
};
struct dCamMapToolData {
/* 8015FEB8 */ void Set(s32, s32, fopAc_ac_c*, u16, u8);
};
struct dBgS_LinChk {
/* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
};
struct dCamera_c {
struct dCamInfo_c {
/* 8018291C */ dCamInfo_c();
@@ -3689,7 +3689,7 @@ SECTION_RODATA static u8 const lit_16654[408] = {
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_80393DC0 = (void*)(&lit_16654);
COMPILER_STRIP_GATE(80393DC0, &lit_16654);
/* 8017F828-8018050C 17A168 0CE4+00 2/1 0/0 0/0 .text eventCamera__9dCamera_cFl */
#pragma push
@@ -3813,7 +3813,7 @@ asm void dCamera_c::Reset() {
SECTION_RODATA static u8 const wave[16] = {
0x3E, 0xCC, 0xCC, 0xCD, 0x3F, 0x66, 0x66, 0x66, 0x40, 0x06, 0x66, 0x66, 0x40, 0x4C, 0xCC, 0xCD,
};
SECTION_DEAD void* const cg_80393F58 = (void*)(&wave);
COMPILER_STRIP_GATE(80393F58, &wave);
/* 80453908-8045390C 001F08 0004+00 1/1 0/0 0/0 .sdata2 @17253 */
SECTION_SDATA2 static f32 lit_17253 = 43.0f / 100.0f;
src/d/d_demo.cpp
+3 -3
View File
@@ -46,13 +46,13 @@ struct dRes_control_c {
struct dPa_levelEcallBack {};
struct csXyz {};
struct dKy_tevstr_c {};
struct cXyz {
/* 80009184 */ ~cXyz();
};
struct dKy_tevstr_c {};
struct csXyz {};
struct dPa_control_c {
/* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
@@ -1708,7 +1708,7 @@ asm jmessage_tControl::~jmessage_tControl() {
static u8 lit_5233[12];
/* 80424668-80424678 051388 000C+04 1/1 0/0 0/0 .bss l_translation$5232 */
static u8 l_translation[12 + 4 /* padding */];
static f32 l_translation[3 + 1 /* padding */];
/* 80450E50-80450E58 000350 0008+00 1/1 0/0 0/0 .sbss None */
static u8 data_80450E50[8];
src/d/d_drawlist.cpp
+10 -10
View File
@@ -32,8 +32,6 @@ struct dDlst_shadowTri_c {
/* 80056344 */ dDlst_shadowTri_c();
};
struct _GXTexObj {};
struct Vec {};
struct cXyz {
@@ -44,6 +42,8 @@ struct cXyz {
/* 802670AC */ void isZero() const;
};
struct _GXTexObj {};
struct dDlst_shadowSimple_c {
/* 8005520C */ void draw();
/* 800553EC */ void set(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*);
@@ -68,10 +68,10 @@ struct dDlst_shadowRealPoly_c {
/* 800569A8 */ s32 getTriMax();
};
struct cM3dGPla {};
struct cBgD_Vtx_t {};
struct cM3dGPla {};
struct dDlst_shadowPoly_c {
/* 80054288 */ void set(cBgD_Vtx_t*, u16, u16, u16, cM3dGPla*);
/* 800543B4 */ void draw();
@@ -95,6 +95,10 @@ struct dDlst_peekZ_c {
/* 80056080 */ void peekData();
};
struct _GXColor {};
struct dDlst_base_c {};
struct J3DPacket {};
struct J3DDrawBuffer {
@@ -106,10 +110,6 @@ struct J3DDrawBuffer {
/* 803254AC */ void draw() const;
};
struct _GXColor {};
struct dDlst_base_c {};
struct dDlst_list_c {
/* 800560F0 */ dDlst_list_c();
/* 80056390 */ void init();
@@ -3041,7 +3041,7 @@ SECTION_RODATA static u8 const l_drawlistSize[42 + 2 /* padding */] = {
0x00,
0x00,
};
SECTION_DEAD void* const cg_8037A178 = (void*)(&l_drawlistSize);
COMPILER_STRIP_GATE(8037A178, &l_drawlistSize);
/* 8037A1A4-8037A1B0 006804 0009+03 1/1 0/0 0/0 .rodata l_nonSortId$5662 */
SECTION_RODATA static u8 const l_nonSortId[9 + 3 /* padding */] = {
@@ -3059,7 +3059,7 @@ SECTION_RODATA static u8 const l_nonSortId[9 + 3 /* padding */] = {
0x00,
0x00,
};
SECTION_DEAD void* const cg_8037A1A4 = (void*)(&l_nonSortId);
COMPILER_STRIP_GATE(8037A1A4, &l_nonSortId);
/* 804520C4-804520CC 0006C4 0006+02 1/1 0/0 0/0 .sdata2 l_zSortId$5668 */
SECTION_SDATA2 static u8 l_zSortId[6 + 2 /* padding */] = {
src/d/d_error_msg.cpp
+3 -3
View File
@@ -176,7 +176,7 @@ SECTION_RODATA static u8 const black_tex[64] = {
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_8037B140 = (void*)(&black_tex);
COMPILER_STRIP_GATE(8037B140, &black_tex);
/* 8037B180-8037B3E0 0077E0 0260+00 1/1 0/0 0/0 .rodata msg_data */
SECTION_RODATA static u8 const msg_data[608] = {
@@ -219,7 +219,7 @@ SECTION_RODATA static u8 const msg_data[608] = {
0x6F, 0x72, 0x20, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6C, 0x73, 0x2E, 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_8037B180 = (void*)(&msg_data);
COMPILER_STRIP_GATE(8037B180, &msg_data);
/* 8037B3E0-8038D640 -00001 12260+00 1/1 0/0 0/0 .rodata font_data */
SECTION_RODATA static void* const font_data[18584] = {
@@ -18809,7 +18809,7 @@ SECTION_RODATA static void* const font_data[18584] = {
(void*)0x69727473,
(void*)0xE1B80000,
};
SECTION_DEAD void* const cg_8037B3E0 = (void*)(&font_data);
COMPILER_STRIP_GATE(8037B3E0, &font_data);
/* 80452C18-80452C1C 001218 0004+00 3/3 0/0 0/0 .sdata2 @3758 */
SECTION_SDATA2 static u8 lit_3758[4] = {
src/d/d_ev_camera.cpp
+14 -14
View File
@@ -723,7 +723,7 @@ asm void dCamera_c::uniformAcceleEvCamera() {
SECTION_RODATA static u8 const lit_3871[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_DEAD void* const cg_8037A7F0 = (void*)(&lit_3871);
COMPILER_STRIP_GATE(8037A7F0, &lit_3871);
/* 8037A7FC-8037A80C 006E5C 0010+00 0/1 0/0 0/0 .rodata @5984 */
#pragma push
@@ -731,7 +731,7 @@ SECTION_DEAD void* const cg_8037A7F0 = (void*)(&lit_3871);
SECTION_RODATA static u8 const lit_5984[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
};
SECTION_DEAD void* const cg_8037A7FC = (void*)(&lit_5984);
COMPILER_STRIP_GATE(8037A7FC, &lit_5984);
#pragma pop
/* 80452900-80452904 000F00 0004+00 1/1 0/0 0/0 .sdata2 @6682 */
@@ -1108,7 +1108,7 @@ SECTION_RODATA static u8 const lit_5985[28] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0xCC, 0xCC, 0xCD, 0x3F, 0x33,
0x33, 0x33, 0x3F, 0x66, 0x66, 0x66, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
};
SECTION_DEAD void* const cg_8037A80C = (void*)(&lit_5985);
COMPILER_STRIP_GATE(8037A80C, &lit_5985);
#pragma pop
/* 8037A828-8037A844 006E88 001C+00 0/0 0/0 0/0 .rodata @5986 */
@@ -1118,7 +1118,7 @@ SECTION_RODATA static u8 const lit_5986[28] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xCC, 0xCC, 0xCD, 0x3E, 0x99,
0x99, 0x9A, 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
};
SECTION_DEAD void* const cg_8037A828 = (void*)(&lit_5986);
COMPILER_STRIP_GATE(8037A828, &lit_5986);
#pragma pop
/* 8037A844-8037A858 006EA4 0014+00 0/0 0/0 0/0 .rodata @5987 */
@@ -1128,7 +1128,7 @@ SECTION_RODATA static u8 const lit_5987[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_8037A844 = (void*)(&lit_5987);
COMPILER_STRIP_GATE(8037A844, &lit_5987);
#pragma pop
/* 8037A858-8037A86C 006EB8 0014+00 0/0 0/0 0/0 .rodata @5988 */
@@ -1138,7 +1138,7 @@ SECTION_RODATA static u8 const lit_5988[20] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,
0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
};
SECTION_DEAD void* const cg_8037A858 = (void*)(&lit_5988);
COMPILER_STRIP_GATE(8037A858, &lit_5988);
#pragma pop
/* 8037A86C-8037A884 006ECC 0018+00 1/1 0/0 0/0 .rodata @8236 */
@@ -1146,7 +1146,7 @@ SECTION_RODATA static u8 const lit_8236[24] = {
0x3F, 0x40, 0x00, 0x00, 0x3E, 0xB3, 0x33, 0x33, 0x3F, 0x4C, 0xCC, 0xCD,
0x3F, 0x4C, 0xCC, 0xCD, 0x3F, 0x4C, 0xCC, 0xCD, 0x3F, 0x4C, 0xCC, 0xCD,
};
SECTION_DEAD void* const cg_8037A86C = (void*)(&lit_8236);
COMPILER_STRIP_GATE(8037A86C, &lit_8236);
/* 803AC528-803AC5A0 -00001 0078+00 1/1 0/0 0/0 .data @8754 */
SECTION_DATA static void* lit_8754[30] = {
@@ -1332,7 +1332,7 @@ SECTION_RODATA static u8 const lit_8840[24] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_DEAD void* const cg_8037A884 = (void*)(&lit_8840);
COMPILER_STRIP_GATE(8037A884, &lit_8840);
/* 8009258C-800929AC 08CECC 0420+00 0/0 1/0 0/0 .text loadEvCamera__9dCamera_cFv */
#pragma push
@@ -1371,7 +1371,7 @@ SECTION_RODATA static u8 const lit_8969[364] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x82, 0x00, 0x00,
0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
};
SECTION_DEAD void* const cg_8037A89C = (void*)(&lit_8969);
COMPILER_STRIP_GATE(8037A89C, &lit_8969);
/* 80452A88-80452A8C 001088 0004+00 1/1 0/0 0/0 .sdata2 @9395 */
SECTION_SDATA2 static f32 lit_9395 = 64.0f;
@@ -1532,7 +1532,7 @@ SECTION_RODATA static u8 const lit_9468[56] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x41, 0xF0,
0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
};
SECTION_DEAD void* const cg_8037AA08 = (void*)(&lit_9468);
COMPILER_STRIP_GATE(8037AA08, &lit_9468);
/* 80452B44-80452B48 001144 0004+00 2/2 0/0 0/0 .sdata2 @9798 */
SECTION_SDATA2 static f32 lit_9798 = 1.0f / 20.0f;
@@ -1567,14 +1567,14 @@ SECTION_RODATA static u8 const lit_9811[100] = {
0x11, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x48,
0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00,
};
SECTION_DEAD void* const cg_8037AA40 = (void*)(&lit_9811);
COMPILER_STRIP_GATE(8037AA40, &lit_9811);
/* 8037AAA4-8037AABC 007104 0018+00 1/1 0/0 0/0 .rodata @9812 */
SECTION_RODATA static u8 const lit_9812[24] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xCC, 0xCC, 0xCD,
0x3F, 0x33, 0x33, 0x33, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
};
SECTION_DEAD void* const cg_8037AAA4 = (void*)(&lit_9812);
COMPILER_STRIP_GATE(8037AAA4, &lit_9812);
/* 80452B54-80452B58 001154 0004+00 1/1 0/0 0/0 .sdata2 @10118 */
SECTION_SDATA2 static f32 lit_10118 = 32.0f;
@@ -1727,7 +1727,7 @@ SECTION_RODATA static u8 const lit_11087[40] = {
0x00, 0x00, 0x42, 0x96, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00,
0x42, 0xB4, 0x00, 0x00, 0x42, 0xDC, 0x00, 0x00, 0x43, 0x0C, 0x00, 0x00,
};
SECTION_DEAD void* const cg_8037AABC = (void*)(&lit_11087);
COMPILER_STRIP_GATE(8037AABC, &lit_11087);
/* 80452BA8-80452BAC 0011A8 0004+00 1/1 0/0 0/0 .sdata2 @11415 */
SECTION_SDATA2 static f32 lit_11415 = 280.0f;
@@ -1768,7 +1768,7 @@ asm void dCamera_c::hintTalkEvCamera() {
SECTION_RODATA static u8 const lit_11437[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
};
SECTION_DEAD void* const cg_8037AAE4 = (void*)(&lit_11437);
COMPILER_STRIP_GATE(8037AAE4, &lit_11437);
/* 80096EDC-80097694 09181C 07B8+00 0/0 1/0 0/0 .text bspTransEvCamera__9dCamera_cFv */
#pragma push
src/d/d_jnt_col.cpp
+4 -4
View File
@@ -11,8 +11,6 @@
// Types:
//
struct csXyz {};
struct Vec {};
struct cXyz {
@@ -25,6 +23,8 @@ struct cXyz {
/* 80267150 */ void atan2sY_XZ() const;
};
struct csXyz {};
struct mDoMtx_stack_c {
/* 8000CD64 */ void transS(cXyz const&);
/* 8000CD9C */ void transM(f32, f32, f32);
@@ -35,13 +35,13 @@ struct fopAc_ac_c {};
struct J3DModel {};
struct dJntColData_c {};
struct cM3dGLin {
/* 80036A5C */ ~cM3dGLin();
/* 8026F2E8 */ void SetStartEnd(cXyz const&, cXyz const&);
};
struct dJntColData_c {};
struct dJntCol_c {
/* 80035C8C */ dJntCol_c();
/* 80035CA0 */ void init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int);
src/d/d_k_wmark.cpp
+3 -3
View File
@@ -27,10 +27,10 @@ struct dkWmark_c {
/* 802616C4 */ void setMatrix();
};
struct J3DModelData {};
struct dKy_tevstr_c {};
struct J3DModelData {};
struct dScnKy_env_light_c {
/* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
/* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
@@ -242,7 +242,7 @@ static asm void dkWmark_Execute(dkWmark_c* param_0) {
SECTION_RODATA static u8 const data_8039A488[12] = {
0x00, 0x00, 0x00, 0x82, 0x5F, 0x4B, 0x32, 0x3C, 0x64, 0x6E, 0x78, 0x28,
};
SECTION_DEAD void* const cg_8039A488 = (void*)(&data_8039A488);
COMPILER_STRIP_GATE(8039A488, &data_8039A488);
/* 80454FE4-80454FE8 0035E4 0004+00 1/1 0/0 0/0 .sdata2 @3906 */
SECTION_SDATA2 static f32 lit_3906 = 50.0f;
src/d/d_k_wpillar.cpp
+4 -4
View File
@@ -11,10 +11,10 @@
// Types:
//
struct J3DMaterialTable {};
struct J3DAnmTextureSRTKey {};
struct J3DMaterialTable {};
struct mDoExt_btkAnm {
/* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16);
/* 8000D6D8 */ void entry(J3DMaterialTable*, f32);
@@ -70,10 +70,10 @@ struct dRes_control_c {
struct dPa_levelEcallBack {};
struct csXyz {};
struct _GXColor {};
struct csXyz {};
struct dPa_control_c {
/* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
src/d/d_ky_thunder.cpp
+2 -2
View File
@@ -156,10 +156,10 @@ static u8 lit_3818[12];
/* 8042E808-8042E814 05B528 000C+00 1/1 0/0 0/0 .bss l_offsetPos$localstatic3$draw__10dThunder_cFv
*/
static u8 data_8042E808[12];
static f32 data_8042E808[3];
/* 8042E814-8042E820 05B534 000C+00 1/1 0/0 0/0 .bss l_scale$localstatic5$draw__10dThunder_cFv */
static u8 data_8042E814[12];
static f32 data_8042E814[3];
/* 80453E70-80453E74 002470 0004+00 2/2 0/0 0/0 .sdata2 @3882 */
SECTION_SDATA2 static u8 lit_3882[4] = {
src/d/d_name.cpp
+4 -4
View File
@@ -11,10 +11,10 @@
// Types:
//
struct J2DPane {};
struct JKRArchive {};
struct J2DPane {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
@@ -81,10 +81,10 @@ struct dDlst_NameIN_c {
/* 8025115C */ ~dDlst_NameIN_c();
};
struct JAISoundID {};
struct Vec {};
struct JAISoundID {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
src/d/d_npc_lib.cpp
+6 -6
View File
@@ -11,12 +11,6 @@
// Types:
//
struct csXyz {
/* 80018BD0 */ ~csXyz();
/* 80112C80 */ csXyz();
/* 8026745C */ void operator+=(csXyz&);
};
struct Vec {};
struct cXyz {
@@ -27,6 +21,12 @@ struct cXyz {
/* 802670AC */ void isZero() const;
};
struct csXyz {
/* 80018BD0 */ ~csXyz();
/* 80112C80 */ csXyz();
/* 8026745C */ void operator+=(csXyz&);
};
struct mDoMtx_stack_c {
/* 8000CD64 */ void transS(cXyz const&);
/* 8000CE9C */ void XYZrotS(csXyz const&);
src/d/d_resorce.cpp
+2 -2
View File
@@ -410,14 +410,14 @@ SECTION_RODATA static u8 const l_texMtxInfo[100] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80379840 = (void*)(&l_texMtxInfo);
COMPILER_STRIP_GATE(80379840, &l_texMtxInfo);
/* 803798A4-803798B8 005F04 0014+00 1/1 0/0 0/0 .rodata l_tevStageInfo$3774 */
SECTION_RODATA static u8 const l_tevStageInfo[20] = {
0x05, 0x0F, 0x08, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x01, 0x00,
0x07, 0x04, 0x00, 0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
};
SECTION_DEAD void* const cg_803798A4 = (void*)(&l_tevStageInfo);
COMPILER_STRIP_GATE(803798A4, &l_tevStageInfo);
/* 80450628-8045062C 0000A8 0004+00 1/1 0/0 0/0 .sdata l_texCoordInfo$3772 */
SECTION_SDATA static u8 l_texCoordInfo[4] = {
src/d/d_select_cursor.cpp
+8 -8
View File
@@ -19,16 +19,16 @@ struct dSelect_icon_c {
/* 80195B70 */ void setPos(J2DPane*, f32, f32);
};
struct J2DAnmColor {};
struct JKRArchive {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmTransformKey {
/* 801959C0 */ ~J2DAnmTransformKey();
};
struct J2DAnmColor {};
struct J2DAnmTextureSRTKey {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801949EC */ ~dSelect_cursor_c();
@@ -267,7 +267,7 @@ SECTION_RODATA static u8 const corner_tag[32] = {
0x6C, 0x5F, 0x75, 0x5F, 0x6E, 0x75, 0x6C, 0x6C, 0x6C, 0x5F, 0x64, 0x5F, 0x6E, 0x75, 0x6C, 0x6C,
0x72, 0x5F, 0x75, 0x5F, 0x6E, 0x75, 0x6C, 0x6C, 0x72, 0x5F, 0x64, 0x5F, 0x6E, 0x75, 0x6C, 0x6C,
};
SECTION_DEAD void* const cg_80394A10 = (void*)(&corner_tag);
COMPILER_STRIP_GATE(80394A10, &corner_tag);
/* 80453A50-80453A54 002050 0004+00 4/4 0/0 0/0 .sdata2 @3808 */
SECTION_SDATA2 static u8 lit_3808[4] = {
@@ -400,7 +400,7 @@ SECTION_RODATA static u8 const tag_4181[32] = {
0x00, 0x00, 0x00, 0x00, 0x6C, 0x5F, 0x6C, 0x64, 0x00, 0x00, 0x00, 0x00, 0x6C, 0x5F, 0x6C, 0x75,
0x00, 0x00, 0x00, 0x00, 0x6C, 0x5F, 0x72, 0x64, 0x00, 0x00, 0x00, 0x00, 0x6C, 0x5F, 0x72, 0x75,
};
SECTION_DEAD void* const cg_80394A30 = (void*)(&tag_4181);
COMPILER_STRIP_GATE(80394A30, &tag_4181);
/* 80195460-801955F0 18FDA0 0190+00 1/1 0/0 0/0 .text
* setBpkAnimation__16dSelect_cursor_cFP11J2DAnmColor */
@@ -421,13 +421,13 @@ SECTION_RODATA static u8 const tag_4197[64] = {
0x00, 0x69, 0x5F, 0x63, 0x5F, 0x72, 0x64, 0x31, 0x00, 0x69, 0x5F, 0x63, 0x5F, 0x72, 0x64, 0x32,
0x00, 0x69, 0x5F, 0x63, 0x5F, 0x72, 0x75, 0x31, 0x00, 0x69, 0x5F, 0x63, 0x5F, 0x72, 0x75, 0x32,
};
SECTION_DEAD void* const cg_80394A50 = (void*)(&tag_4197);
COMPILER_STRIP_GATE(80394A50, &tag_4197);
/* 80394A90-80394AA0 0210F0 0010+00 1/1 0/0 0/0 .rodata tag$4204 */
SECTION_RODATA static u8 const tag_4204[16] = {
0x00, 0x00, 0x67, 0x6F, 0x6C, 0x64, 0x30, 0x31, 0x00, 0x00, 0x67, 0x6F, 0x6C, 0x64, 0x30, 0x32,
};
SECTION_DEAD void* const cg_80394A90 = (void*)(&tag_4204);
COMPILER_STRIP_GATE(80394A90, &tag_4204);
/* 801955F0-80195724 18FF30 0134+00 1/1 0/0 0/0 .text
* setBtk0Animation__16dSelect_cursor_cFP19J2DAnmTextureSRTKey */
src/d/d_stage.cpp
+10 -10
View File
@@ -97,29 +97,29 @@ struct dStage_startStage_c {
/* 8002419C */ void set(char const*, s8, s16, s8);
};
struct dStage_Lbnk_c {};
struct dStage_FileList2_dt_c {};
struct dStage_SoundInfo_c {};
struct dStage_Elst_c {};
struct dStage_FloorInfo_c {};
struct dStage_MemoryMap_c {};
struct dStage_MemoryConfig_c {};
struct dStage_Lbnk_c {};
struct dStage_dPnt_c {};
struct dStage_FileList_dt_c {};
struct dStage_Multi_c {};
struct dStage_dPnt_c {};
struct dStage_FloorInfo_c {};
struct dStage_MapEventInfo_c {};
struct dStage_Elst_c {};
struct dStage_DMap_c {};
struct dStage_FileList_dt_c {};
struct dStage_MapEventInfo_c {};
struct dStage_SoundInfo_c {};
struct dStage_dPath_c {};
src/d/d_timer.cpp
+4 -4
View File
@@ -73,13 +73,13 @@ struct dDlst_list_c {
/* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
};
struct JKRArchive {};
struct J2DPane {
/* 802F7AFC */ void getParentPane();
/* 802F7FCC */ void animationTransform();
};
struct JKRArchive {};
struct dDlst_TimerScrnDraw_c {
/* 8025DB38 */ dDlst_TimerScrnDraw_c();
/* 8025DBE0 */ void setHIO();
@@ -122,10 +122,10 @@ struct dComIfG_play_c {
/* 8002CBDC */ void getTimerPtr();
};
struct JAISoundID {};
struct Vec {};
struct JAISoundID {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
src/d/d_tresure.cpp
+1 -1
View File
@@ -321,7 +321,7 @@ SECTION_RODATA static u8 const typeToTypeGroup__7dTres_c[34 + 6 /* padding */] =
0x00,
0x00,
};
SECTION_DEAD void* const cg_8037B0D8 = (void*)(&typeToTypeGroup__7dTres_c);
COMPILER_STRIP_GATE(8037B0D8, &typeToTypeGroup__7dTres_c);
/* 8009C49C-8009C4B0 096DDC 0014+00 0/0 1/1 0/0 .text getTypeGroupNoToType__7dTres_cFUc
*/
src/d/d_vib_pattern.cpp
+4 -4
View File
@@ -34,7 +34,7 @@ SECTION_RODATA extern u8 const MS_patt__12dVibration_c[88] = {
0xF6, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xFB, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
0x08, 0xC2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xC0, 0x00, 0x00, 0x00,
};
SECTION_DEAD void* const cg_8037A620 = (void*)(&MS_patt__12dVibration_c);
COMPILER_STRIP_GATE(8037A620, &MS_patt__12dVibration_c);
/* 8037A678-8037A6D0 006CD8 0058+00 0/0 1/1 0/0 .rodata CS_patt__12dVibration_c */
SECTION_RODATA extern u8 const CS_patt__12dVibration_c[88] = {
@@ -45,7 +45,7 @@ SECTION_RODATA extern u8 const CS_patt__12dVibration_c[88] = {
0xF6, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xFB, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
0x08, 0xC2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xC0, 0x00, 0x00, 0x00,
};
SECTION_DEAD void* const cg_8037A678 = (void*)(&CS_patt__12dVibration_c);
COMPILER_STRIP_GATE(8037A678, &CS_patt__12dVibration_c);
/* 8037A6D0-8037A720 006D30 0050+00 0/0 1/1 0/0 .rodata MQ_patt__12dVibration_c */
SECTION_RODATA extern u8 const MQ_patt__12dVibration_c[80] = {
@@ -55,7 +55,7 @@ SECTION_RODATA extern u8 const MQ_patt__12dVibration_c[80] = {
0x00, 0x03, 0x00, 0x20, 0x4A, 0x94, 0xAA, 0x95, 0x00, 0x04, 0x00, 0x20, 0x36, 0x55, 0x56, 0x55,
0x00, 0x04, 0x00, 0x20, 0x6B, 0x6D, 0x6B, 0x6D, 0x00, 0x01, 0x00, 0x1B, 0x20, 0x20, 0x10, 0x00,
};
SECTION_DEAD void* const cg_8037A6D0 = (void*)(&MQ_patt__12dVibration_c);
COMPILER_STRIP_GATE(8037A6D0, &MQ_patt__12dVibration_c);
/* 8037A720-8037A770 006D80 0050+00 0/0 1/1 0/0 .rodata CQ_patt__12dVibration_c */
SECTION_RODATA extern u8 const CQ_patt__12dVibration_c[80] = {
@@ -65,4 +65,4 @@ SECTION_RODATA extern u8 const CQ_patt__12dVibration_c[80] = {
0x00, 0x03, 0x00, 0x20, 0x4A, 0x94, 0xAA, 0x95, 0x00, 0x04, 0x00, 0x20, 0x36, 0x55, 0x56, 0x55,
0x00, 0x04, 0x00, 0x20, 0x6B, 0x6D, 0x6B, 0x6D, 0x00, 0x00, 0x00, 0x1B, 0x20, 0x20, 0x10, 0x00,
};
SECTION_DEAD void* const cg_8037A720 = (void*)(&CQ_patt__12dVibration_c);
COMPILER_STRIP_GATE(8037A720, &CQ_patt__12dVibration_c);
src/d/event/d_event_data.cpp
+2 -2
View File
@@ -125,10 +125,10 @@ struct Z2SeqMgr {
/* 802AFE18 */ void bgmStreamPlay();
};
struct JAISoundID {};
struct Vec {};
struct JAISoundID {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
src/d/event/d_event_manager.cpp
+7 -7
View File
@@ -41,11 +41,7 @@ struct dEvt_control_c {
/* 800436F4 */ void setPtD(void*);
};
struct Vec {};
struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
};
struct dEvDtData_c {};
struct dEvDtStaff_c {
/* 80044134 */ void init();
@@ -56,7 +52,11 @@ struct dEvDtEvent_c {
/* 80043F70 */ void specialStaffProc(dEvDtStaff_c*);
};
struct dEvDtData_c {};
struct Vec {};
struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
};
struct dEvent_manager_c {
/* 800465E8 */ void getSubstance(dEvDtData_c*, int);
@@ -373,7 +373,7 @@ SECTION_RODATA static u8 const data_80379F50[15 + 1 /* padding */] = {
/* padding */
0x00,
};
SECTION_DEAD void* const cg_80379F50 = (void*)(&data_80379F50);
COMPILER_STRIP_GATE(80379F50, &data_80379F50);
/* 80046710-80046800 041050 00F0+00 0/0 1/1 0/0 .text create__16dEvent_manager_cFv */
#pragma push
src/d/file/d_file_sel_warning.cpp
+4 -4
View File
@@ -16,12 +16,12 @@ struct dMsgString_c {
/* 80249D28 */ ~dMsgString_c();
};
struct JKRArchive {};
struct JUtility {
struct TColor {};
};
struct JKRArchive {};
struct dFile_warning_c {
/* 80191BAC */ dFile_warning_c(JKRArchive*, u8);
/* 80191C18 */ ~dFile_warning_c();
@@ -61,10 +61,10 @@ struct J2DTextBox {
/* 8030074C */ void setString(s16, char const*, ...);
};
struct J2DGrafContext {};
struct J2DAnmTransform {};
struct J2DGrafContext {};
struct J2DScreen {
/* 80192414 */ void setAnimation(J2DAnmTransform*);
/* 802F8498 */ J2DScreen();
src/d/file/d_file_select.cpp
+14 -14
View File
@@ -21,14 +21,14 @@ struct mDoMemCd_Ctrl_c {
/* 80016F2C */ void FormatSync();
};
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);
@@ -66,6 +66,8 @@ struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
struct JKRArchive {};
struct JGeometry {
template <typename A1>
struct TBox2 {};
@@ -84,8 +86,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);
@@ -110,8 +110,6 @@ struct dName_c {
/* 80250560 */ void _draw();
};
struct COutFont_c {};
struct JUtility {
struct TColor {};
};
@@ -123,6 +121,8 @@ struct J2DTextBox {
/* 8030074C */ void setString(s16, char const*, ...);
};
struct COutFont_c {};
struct JUTFont {};
struct dMsgString_c {
@@ -375,10 +375,10 @@ struct dComIfG_play_c {
/* 8002B2C8 */ void itemInit();
};
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);
@@ -4319,7 +4319,7 @@ SECTION_RODATA static u8 const m_kamen_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_80394310 = (void*)(&m_kamen_offset_x);
COMPILER_STRIP_GATE(80394310, &m_kamen_offset_x);
/* 80394324-80394338 020984 0014+00 0/1 0/0 0/0 .rodata m_kamen_offset_y$8679 */
#pragma push
@@ -4328,7 +4328,7 @@ SECTION_RODATA static u8 const m_kamen_offset_y[20] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80394324 = (void*)(&m_kamen_offset_y);
COMPILER_STRIP_GATE(80394324, &m_kamen_offset_y);
#pragma pop
/* 80394338-8039434C 020998 0014+00 0/1 0/0 0/0 .rodata m_kamen_scale$8680 */
@@ -4338,7 +4338,7 @@ SECTION_RODATA static u8 const m_kamen_scale[20] = {
0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00,
0x00, 0x00, 0x3F, 0xCC, 0xCC, 0xCD, 0x3F, 0xCC, 0xCC, 0xCD,
};
SECTION_DEAD void* const cg_80394338 = (void*)(&m_kamen_scale);
COMPILER_STRIP_GATE(80394338, &m_kamen_scale);
#pragma pop
/* 80190BA8-80190D68 18B4E8 01C0+00 1/1 0/0 0/0 .text createMaskModel__16dFile_select3D_cFv */
@@ -4359,7 +4359,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_8039434C = (void*)(&m_mirror_offset_x);
COMPILER_STRIP_GATE(8039434C, &m_mirror_offset_x);
#pragma pop
/* 80394360-80394374 0209C0 0014+00 0/1 0/0 0/0 .rodata m_mirror_offset_y$8782 */
@@ -4369,7 +4369,7 @@ SECTION_RODATA static u8 const m_mirror_offset_y[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_80394360 = (void*)(&m_mirror_offset_y);
COMPILER_STRIP_GATE(80394360, &m_mirror_offset_y);
#pragma pop
/* 80394374-80394388 0209D4 0014+00 0/1 0/0 0/0 .rodata m_mirror_scale$8783 */
@@ -4379,7 +4379,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_80394374 = (void*)(&m_mirror_scale);
COMPILER_STRIP_GATE(80394374, &m_mirror_scale);
#pragma pop
/* 80190D68-80190FE8 18B6A8 0280+00 1/1 0/0 0/0 .text createMirrorModel__16dFile_select3D_cFv */
src/d/kankyo/d_kankyo.cpp
+9 -9
View File
@@ -21,10 +21,10 @@ struct mDoGph_gInf_c {
};
};
struct J3DMaterialTable {};
struct J3DAnmTextureSRTKey {};
struct J3DMaterialTable {};
struct mDoExt_btkAnm {
/* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16);
/* 8000D6D8 */ void entry(J3DMaterialTable*, f32);
@@ -61,6 +61,8 @@ struct dStage_roomControl_c {
/* 8019F780 */ void GetTimePass();
};
struct dKy_tevstr_c {};
struct Vec {};
struct cXyz {
@@ -70,14 +72,12 @@ struct cXyz {
/* 80266B84 */ void operator*(f32) const;
};
struct _GXColorS10 {};
struct J3DModelData {
/* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]);
};
struct dKy_tevstr_c {};
struct _GXColorS10 {};
struct dScnKy_env_light_c {
/* 8019F2E8 */ dScnKy_env_light_c();
/* 8019F4FC */ void setDaytime();
@@ -114,10 +114,10 @@ struct dRes_control_c {
struct dPa_levelEcallBack {};
struct csXyz {};
struct _GXColor {};
struct csXyz {};
struct dPa_control_c {
/* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
@@ -2879,7 +2879,7 @@ static asm void NewAmbColGet(_GXColorS10* param_0) {
SECTION_RODATA static u8 const lit_9035[12] = {
0x4C, 0xBE, 0xBC, 0x20, 0x4C, 0xBE, 0xBC, 0x20, 0x4C, 0xBE, 0xBC, 0x20,
};
SECTION_DEAD void* const cg_80394C60 = (void*)(&lit_9035);
COMPILER_STRIP_GATE(80394C60, &lit_9035);
/* 80453DAC-80453DB0 0023AC 0004+00 1/1 0/0 0/0 .sdata2 @8975 */
SECTION_SDATA2 static f32 lit_8975 = 50.0f;
src/d/kankyo/d_kankyo_rain.cpp
+22 -22
View File
@@ -36,10 +36,9 @@ struct dRes_control_c {
struct dPa_levelEcallBack {};
struct csXyz {
/* 80018BD0 */ ~csXyz();
/* 802673F4 */ csXyz(s16, s16, s16);
};
struct _GXColor {};
struct dKy_tevstr_c {};
struct Vec {};
@@ -48,9 +47,10 @@ struct cXyz {
/* 80266AE4 */ void operator+(Vec const&) const;
};
struct _GXColor {};
struct dKy_tevstr_c {};
struct csXyz {
/* 80018BD0 */ ~csXyz();
/* 802673F4 */ csXyz(s16, s16, s16);
};
struct dPa_control_c {
/* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
@@ -543,7 +543,7 @@ SECTION_RODATA static u8 const sun_chkpnt[40] = {
0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0xC1, 0xA0, 0x00, 0x00,
0x41, 0x20, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0xC1, 0x20, 0x00, 0x00,
};
SECTION_DEAD void* const cg_8037A4C0 = (void*)(&sun_chkpnt);
COMPILER_STRIP_GATE(8037A4C0, &sun_chkpnt);
/* 803A9BA0-803A9BAC 006CC0 000C+00 1/1 0/0 0/0 .data sun_color$4213 */
SECTION_DATA static u8 sun_color[12] = {
@@ -556,7 +556,7 @@ SECTION_DATA static u8 sun_color2[12] = {
};
/* 80450EE8-80450EEC 0003E8 0004+00 1/1 0/0 0/0 .sbss S_parcent_bak$4131 */
static u8 S_parcent_bak[4];
static f32 S_parcent_bak;
/* 80450EEC-80450EF0 -00001 0004+00 2/2 0/0 0/0 .sbss None */
/* 80450EEC 0002+00 data_80450EEC None */
@@ -1155,7 +1155,7 @@ SECTION_RODATA static u8 const lit_6991[32] = {
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x54, 0x7A, 0xE1, 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x47, 0xAE, 0x14,
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x47, 0xAE, 0x14, 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x54, 0x7A, 0xE1,
};
SECTION_DEAD void* const cg_8037A4E8 = (void*)(&lit_6991);
COMPILER_STRIP_GATE(8037A4E8, &lit_6991);
/* 803A9BB8-803A9BD8 -00001 0020+00 1/1 0/0 0/0 .data @7214 */
SECTION_DATA static void* lit_7214[8] = {
@@ -1203,7 +1203,7 @@ SECTION_RODATA static u8 const lit_7275[32] = {
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x54, 0x7A, 0xE1, 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x47, 0xAE, 0x14,
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x47, 0xAE, 0x14, 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x54, 0x7A, 0xE1,
};
SECTION_DEAD void* const cg_8037A508 = (void*)(&lit_7275);
COMPILER_STRIP_GATE(8037A508, &lit_7275);
/* 803A9BD8-803A9BF8 -00001 0020+00 1/1 0/0 0/0 .data @7549 */
SECTION_DATA static void* lit_7549[8] = {
@@ -1245,14 +1245,14 @@ SECTION_RODATA static u8 const scale_dat[32] = {
0x45, 0xFA, 0x00, 0x00, 0x46, 0x24, 0x10, 0x00, 0x40, 0x4C, 0xCC, 0xCD, 0x3F, 0xE6, 0x66, 0x66,
0x3F, 0xE6, 0x66, 0x66, 0x40, 0xC6, 0x66, 0x66, 0x3F, 0x99, 0x99, 0x9A, 0x40, 0x80, 0x00, 0x00,
};
SECTION_DEAD void* const cg_8037A528 = (void*)(&scale_dat);
COMPILER_STRIP_GATE(8037A528, &scale_dat);
/* 8037A548-8037A568 006BA8 0020+00 1/1 0/0 0/0 .rodata col_dat$7609 */
SECTION_RODATA static u8 const col_dat[32] = {
0xB4, 0xC8, 0xFF, 0xFF, 0xC8, 0xC8, 0xFF, 0x50, 0xFF, 0x8C, 0x78, 0x5A, 0xFF, 0xB4, 0x78, 0x64,
0xB4, 0xB4, 0x78, 0x55, 0xB4, 0xC8, 0x64, 0x5A, 0xDC, 0xFF, 0xB4, 0x6E, 0xC8, 0xDC, 0xFF, 0x5A,
};
SECTION_DEAD void* const cg_8037A548 = (void*)(&col_dat);
COMPILER_STRIP_GATE(8037A548, &col_dat);
/* 80450EF0-80450EF4 -00001 0004+00 1/1 0/0 0/0 .sbss None */
/* 80450EF0 0002+00 data_80450EF0 None */
@@ -1392,7 +1392,7 @@ asm void dKyr_drawSibuki(f32 (*param_0)[4], u8** param_1) {
/* ############################################################################################## */
/* 80450F00-80450F04 000400 0004+00 1/1 0/0 0/0 .sbss rot$8366 */
static u8 rot_8366[4];
static f32 rot_8366;
/* 80450F04-80450F08 000404 0004+00 1/1 0/0 0/0 .sbss None */
static u8 data_80450F04[4];
@@ -1478,7 +1478,7 @@ static u8 add_table_8941[48];
#pragma pop
/* 80450F08-80450F0C 000408 0004+00 1/1 0/0 0/0 .sbss rot$8936 */
static u8 rot_8936[4];
static f32 rot_8936;
/* 80450F0C-80450F10 -00001 0004+00 1/1 0/0 0/0 .sbss None */
/* 80450F0C 0001+00 data_80450F0C None */
@@ -1569,7 +1569,7 @@ asm void dKyr_drawSnow(f32 (*param_0)[4], u8** param_1) {
SECTION_RODATA static u8 const star_col[16] = {
0xFF, 0xBE, 0xC8, 0xA0, 0xC8, 0xFF, 0xBE, 0x78, 0xC8, 0xBE, 0xFF, 0x50, 0xFF, 0xFF, 0xFF, 0xC8,
};
SECTION_DEAD void* const cg_8037A568 = (void*)(&star_col);
COMPILER_STRIP_GATE(8037A568, &star_col);
/* 80424A10-80424A1C 051730 000C+00 0/1 0/0 0/0 .bss @9425 */
#pragma push
@@ -1656,7 +1656,7 @@ static u8 hokuto_position[78 + 6 /* padding */];
#pragma pop
/* 80450F18-80450F1C 000418 0004+00 1/1 0/0 0/0 .sbss rot$9421 */
static u8 rot_9421[4];
static f32 rot_9421;
/* 80450F1C-80450F20 -00001 0004+00 1/1 0/0 0/0 .sbss None */
/* 80450F1C 0001+00 data_80450F1C None */
@@ -1690,7 +1690,7 @@ asm void dKyr_drawStar(f32 (*param_0)[4], u8** param_1) {
/* ############################################################################################## */
/* 80450F20-80450F24 000420 0004+00 1/1 0/0 0/0 .sbss rot$9847 */
static u8 rot_9847[4];
static f32 rot_9847;
/* 80450F24-80450F28 000424 0004+00 1/1 0/0 0/0 .sbss None */
static u8 data_80450F24[4];
@@ -1722,7 +1722,7 @@ asm void drawCloudShadow(f32 (*param_0)[4], u8** param_1) {
/* ############################################################################################## */
/* 80450F28-80450F2C 000428 0004+00 1/1 0/0 0/0 .sbss howa_loop_cnt$10108 */
static u8 howa_loop_cnt[4];
static f32 howa_loop_cnt;
/* 80450F2C-80450F30 00042C 0004+00 1/1 0/0 0/0 .sbss None */
static u8 data_80450F2C[4];
@@ -1857,7 +1857,7 @@ asm void dKyr_odour_move() {
/* ############################################################################################## */
/* 80450F30-80450F34 000430 0004+00 1/1 0/0 0/0 .sbss rot$10882 */
static u8 rot_10882[4];
static f32 rot_10882;
/* 80450F34-80450F38 000434 0004+00 1/1 0/0 0/0 .sbss None */
static u8 data_80450F34[4];
@@ -1941,7 +1941,7 @@ asm void dKyr_evil_move() {
/* ############################################################################################## */
/* 80450F40-80450F44 000440 0004+00 1/1 0/0 0/0 .sbss rot$11586 */
static u8 rot_11586[4];
static f32 rot_11586;
/* 80450F44-80450F48 000444 0004+00 1/1 0/0 0/0 .sbss None */
static u8 data_80450F44[4];
@@ -1991,7 +1991,7 @@ static asm void dKyr_near_bosslight_check(cXyz param_0) {
/* ############################################################################################## */
/* 80450F48-80450F4C 000448 0004+00 1/1 0/0 0/0 .sbss rot$11958 */
static u8 rot_11958[4];
static f32 rot_11958;
/* 80450F4C-80450F50 00044C 0004+00 1/1 0/0 0/0 .sbss None */
static u8 data_80450F4C[4];
src/d/kankyo/d_kankyo_wether.cpp
+5 -5
View File
@@ -27,7 +27,9 @@ struct dRes_control_c {
struct dPa_levelEcallBack {};
struct csXyz {};
struct _GXColor {};
struct dKy_tevstr_c {};
struct Vec {};
@@ -40,9 +42,7 @@ struct cXyz {
/* 8026706C */ bool operator!=(Vec const&) const;
};
struct _GXColor {};
struct dKy_tevstr_c {};
struct csXyz {};
struct dPa_control_c {
/* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
@@ -1342,7 +1342,7 @@ static asm void wether_move_moya() {
static u8 lit_4965[12];
/* 80424944-80424950 051664 000C+00 1/1 0/0 0/0 .bss r09o$4964 */
static u8 r09o[12];
static f32 r09o[3];
/* 80452130-80452134 000730 0004+00 1/1 0/0 0/0 .sdata2 @5181 */
SECTION_SDATA2 static f32 lit_5181 = -180000.0f;
src/d/map/d_map.cpp
+12 -12
View File
@@ -31,6 +31,8 @@ struct renderingPlusDoorAndCursor_c {
/* 80040ADC */ void getIconPosition(dTres_c::typeGroupData_c*) const;
};
struct Vec {};
struct dDrawPath_c {
struct room_class {};
@@ -49,8 +51,6 @@ struct dDrawPath_c {
/* 8003CCC4 */ void drawPath();
};
struct Vec {};
struct renderingDAmap_c {
/* 8002B150 */ ~renderingDAmap_c();
/* 8003FCC8 */ void init(u8*, u16, u16, u16, u16);
@@ -342,10 +342,10 @@ extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" extern u32 mNextRoomNo__10dMapInfo_c;
extern "C" extern u8 data_80450E58[4];
extern "C" extern u8 data_80450E60[4];
extern "C" extern u8 mMinX__8dMpath_c[4];
extern "C" extern u8 mMaxX__8dMpath_c[4];
extern "C" extern u8 mMinZ__8dMpath_c[4];
extern "C" extern u8 mMaxZ__8dMpath_c[4];
extern "C" extern f32 mMinX__8dMpath_c;
extern "C" extern f32 mMaxX__8dMpath_c;
extern "C" extern f32 mMinZ__8dMpath_c;
extern "C" extern f32 mMaxZ__8dMpath_c;
//
// Declarations:
@@ -360,7 +360,7 @@ SECTION_RODATA static u8 const l_iconSize[68] = {
0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A,
0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A,
};
SECTION_DEAD void* const cg_80378E48 = (void*)(&l_iconSize);
COMPILER_STRIP_GATE(80378E48, &l_iconSize);
/* 800284BC-800284D0 022DFC 0014+00 2/0 0/0 0/0 .text getIconSize__15renderingAmap_cCFUc
*/
@@ -628,7 +628,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_80378E8C = (void*)(&l_dungeon_offColor);
COMPILER_STRIP_GATE(80378E8C, &l_dungeon_offColor);
#pragma pop
/* 80378EB0-80378ED4 005510 0024+00 0/1 0/0 0/0 .rodata l_dungeon_onColor$3938 */
@@ -639,7 +639,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_80378EB0 = (void*)(&l_dungeon_onColor);
COMPILER_STRIP_GATE(80378EB0, &l_dungeon_onColor);
#pragma pop
/* 80378ED4-80378EF8 005534 0024+00 0/1 0/0 0/0 .rodata l_dungeon_stayColor$3939 */
@@ -650,7 +650,7 @@ SECTION_RODATA static u8 const l_dungeon_stayColor[36] = {
0x04, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00,
0x5C, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80378ED4 = (void*)(&l_dungeon_stayColor);
COMPILER_STRIP_GATE(80378ED4, &l_dungeon_stayColor);
#pragma pop
/* 80028DF4-80028EE4 023734 00F0+00 1/0 0/0 0/0 .text getColor__6dMap_cFi */
@@ -709,7 +709,7 @@ asm void renderingAmap_c::getLineColor(int param_0, int param_1) {
SECTION_RODATA static u8 const colorTable[16] = {
0xBC, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0xC4, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80378EF8 = (void*)(&colorTable);
COMPILER_STRIP_GATE(80378EF8, &colorTable);
/* 80028FB4-80029038 0238F4 0084+00 2/0 0/0 0/0 .text getDecoLineColor__15renderingAmap_cFii */
#pragma push
@@ -797,7 +797,7 @@ SECTION_RODATA static u8 const l_stayType[28] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80378F08 = (void*)(&l_stayType);
COMPILER_STRIP_GATE(80378F08, &l_stayType);
/* 80029160-80029190 023AA0 0030+00 7/7 0/0 0/0 .text getStayType__15renderingAmap_cCFv
*/
src/d/map/d_map_path.cpp
+1 -1
View File
@@ -176,7 +176,7 @@ SECTION_RODATA static u8 const data[28] = {
0x00, 0x00, 0x00, 0x4F, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x4D, 0x00, 0x00,
0x00, 0x4E, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x00, 0x00, 0x51, 0x00, 0x00, 0x00, 0x52,
};
SECTION_DEAD void* const cg_80379C30 = (void*)(&data);
COMPILER_STRIP_GATE(80379C30, &data);
/* 8003C85C-8003C8F4 03719C 0098+00 0/0 1/1 0/0 .text create__Q28dMpath_n18dTexObjAggregate_cFv */
#pragma push
src/d/map/d_map_path_dmap.cpp
+13 -13
View File
@@ -573,20 +573,20 @@ extern u8 mLayerList__8dMpath_c[4];
u8 mLayerList__8dMpath_c[4];
/* 80450E68-80450E6C 000368 0004+00 3/3 1/1 0/0 .sbss mMinX__8dMpath_c */
extern u8 mMinX__8dMpath_c[4];
u8 mMinX__8dMpath_c[4];
extern f32 mMinX__8dMpath_c;
f32 mMinX__8dMpath_c;
/* 80450E6C-80450E70 00036C 0004+00 3/3 1/1 0/0 .sbss mMaxX__8dMpath_c */
extern u8 mMaxX__8dMpath_c[4];
u8 mMaxX__8dMpath_c[4];
extern f32 mMaxX__8dMpath_c;
f32 mMaxX__8dMpath_c;
/* 80450E70-80450E74 000370 0004+00 3/3 2/2 0/0 .sbss mMinZ__8dMpath_c */
extern u8 mMinZ__8dMpath_c[4];
u8 mMinZ__8dMpath_c[4];
extern f32 mMinZ__8dMpath_c;
f32 mMinZ__8dMpath_c;
/* 80450E74-80450E78 000374 0004+00 3/3 1/1 0/0 .sbss mMaxZ__8dMpath_c */
extern u8 mMaxZ__8dMpath_c[4];
u8 mMaxZ__8dMpath_c[4];
extern f32 mMaxZ__8dMpath_c;
f32 mMaxZ__8dMpath_c;
/* 80450E78-80450E7C 000378 0004+00 1/1 2/2 0/0 .sbss mAllCenterX__8dMpath_c */
extern f32 mAllCenterX__8dMpath_c;
@@ -1011,7 +1011,7 @@ SECTION_RODATA static u8 const l_100x100BoxVertexList[48] = {
0xC2, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80379C58 = (void*)(&l_100x100BoxVertexList);
COMPILER_STRIP_GATE(80379C58, &l_100x100BoxVertexList);
/* 80451E70-80451E74 000470 0004+00 1/1 0/0 0/0 .sdata2 @4484 */
SECTION_SDATA2 static f32 lit_4484 = 6.0f;
@@ -1115,7 +1115,7 @@ SECTION_RODATA static void* const l_treasureDispList_4524[12] = {
(void*)NULL, (void*)0x00000001, (void*)&l_treasureStartColor,
(void*)0x05000000, (void*)0x00000003, (void*)&l_destinationStartColor,
};
SECTION_DEAD void* const cg_80379C88 = (void*)(&l_treasureDispList_4524);
COMPILER_STRIP_GATE(80379C88, &l_treasureDispList_4524);
/* 80451E74-80451E78 000474 0004+00 1/0 0/0 0/0 .sdata2 l_entranceStartColor */
SECTION_SDATA2 static u32 l_entranceStartColor = 0x94000000;
@@ -1207,7 +1207,7 @@ SECTION_RODATA static void* const l_treasureDispList_4606[33] = {
(void*)0x04000000, (void*)0x00000004, (void*)&l_smallKeyStartColor,
(void*)0x03000000, (void*)0x00000004, (void*)&l_bossStartColor,
};
SECTION_DEAD void* const cg_80379CB8 = (void*)(&l_treasureDispList_4606);
COMPILER_STRIP_GATE(80379CB8, &l_treasureDispList_4606);
/* 80451EAC-80451EB4 0004AC 0008+00 1/1 0/0 0/0 .sdata2 l_iconTex0$4605 */
SECTION_SDATA2 static u8 l_iconTex0_4605[8] = {
@@ -1239,7 +1239,7 @@ SECTION_RODATA static u8 const l_iconPosData[32] = {
0xC2, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00,
0x42, 0x48, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80379D3C = (void*)(&l_iconPosData);
COMPILER_STRIP_GATE(80379D3C, &l_iconPosData);
/* 80041208-800412C0 03BB48 00B8+00 2/2 0/0 0/0 .text
* drawIconSingle__28renderingPlusDoorAndCursor_cFRC3Vecff */
@@ -1260,7 +1260,7 @@ SECTION_RODATA static u8 const l_offset[36] = {
0xC3, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x70, 0x00, 0x00,
0x43, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x70, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80379D5C = (void*)(&l_offset);
COMPILER_STRIP_GATE(80379D5C, &l_offset);
/* 80450638-80450640 0000B8 0004+04 1/1 0/0 0/0 .sdata l_cursorColor$4709 */
SECTION_SDATA static u8 l_cursorColor[4 + 4 /* padding */] = {
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);
};
src/d/meter/d_meter2.cpp
+2 -2
View File
@@ -240,10 +240,10 @@ struct Z2StatusMgr {
/* 802B5F70 */ void heartGaugeOn();
};
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/meter/d_meter2_draw.cpp
+39 -39
View File
@@ -29,6 +29,10 @@ struct dMsgObject_c {
/* 8023822C */ void getStatus();
};
struct JMSMesgEntry_c {};
struct ResTLUT {};
struct JGeometry {
template <typename A1>
struct TBox2 {};
@@ -36,8 +40,6 @@ struct JGeometry {
struct TBox2__template0 {};
};
struct ResTLUT {};
struct ResTIMG {};
struct J2DPicture {
@@ -45,8 +47,6 @@ struct J2DPicture {
/* 802FC800 */ J2DPicture(u64, JGeometry::TBox2<f32> const&, ResTIMG const*, ResTLUT const*);
};
struct JMSMesgEntry_c {};
struct dMeter2Info_c {
/* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*);
/* 8021C370 */ void getStringKana(u32, char*, JMSMesgEntry_c*);
@@ -71,10 +71,21 @@ struct J2DScreen {
/* 802F9690 */ void animation();
};
struct CPaneMgrAlpha {
/* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*);
/* 802555C8 */ void show();
/* 80255608 */ void hide();
/* 8025564C */ void isVisible();
/* 802557D0 */ void setAlphaRate(f32);
/* 80255828 */ void getAlphaRate();
};
struct JUtility {
struct TColor {};
};
struct J2DAnmColor {};
struct J2DBasePosition {};
struct J2DRotateAxis {};
@@ -94,17 +105,6 @@ struct CPaneMgr {
/* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16);
};
struct J2DAnmColor {};
struct CPaneMgrAlpha {
/* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*);
/* 802555C8 */ void show();
/* 80255608 */ void hide();
/* 8025564C */ void isVisible();
/* 802557D0 */ void setAlphaRate(f32);
/* 80255828 */ void getAlphaRate();
};
struct dMeter2Draw_c {
/* 8020FAB4 */ dMeter2Draw_c(JKRExpHeap*);
/* 802102F8 */ ~dMeter2Draw_c();
@@ -215,10 +215,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);
/* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
@@ -454,7 +454,7 @@ SECTION_RODATA static u8 const a_tag[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_80398258 = (void*)(&a_tag);
COMPILER_STRIP_GATE(80398258, &a_tag);
/* 80398280-803982A8 0248E0 0028+00 0/1 0/0 0/0 .rodata b_tag$3950 */
#pragma push
@@ -464,7 +464,7 @@ SECTION_RODATA static u8 const b_tag[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_80398280 = (void*)(&b_tag);
COMPILER_STRIP_GATE(80398280, &b_tag);
#pragma pop
/* 803982A8-803982D0 024908 0028+00 0/1 0/0 0/0 .rodata z_tag$3951 */
@@ -475,7 +475,7 @@ SECTION_RODATA static u8 const z_tag[40] = {
0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74,
0x5F, 0x7A, 0x74, 0x34, 0x00, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x72, 0x74,
};
SECTION_DEAD void* const cg_803982A8 = (void*)(&z_tag);
COMPILER_STRIP_GATE(803982A8, &z_tag);
#pragma pop
/* 803982D0-803982F8 024930 0028+00 0/1 0/0 0/0 .rodata x_tag$3952 */
@@ -486,7 +486,7 @@ SECTION_RODATA static u8 const x_tag[40] = {
0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x78, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74,
0x5F, 0x78, 0x74, 0x34, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x78, 0x74, 0x35,
};
SECTION_DEAD void* const cg_803982D0 = (void*)(&x_tag);
COMPILER_STRIP_GATE(803982D0, &x_tag);
#pragma pop
/* 803982F8-80398320 024958 0028+00 0/1 0/0 0/0 .rodata y_tag$3953 */
@@ -497,7 +497,7 @@ SECTION_RODATA static u8 const y_tag[40] = {
0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x79, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74,
0x5F, 0x79, 0x74, 0x34, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x79, 0x74, 0x35,
};
SECTION_DEAD void* const cg_803982F8 = (void*)(&y_tag);
COMPILER_STRIP_GATE(803982F8, &y_tag);
#pragma pop
/* 803BF328-803BF350 -00001 0028+00 1/1 0/0 0/0 .data bmg_filename$3954 */
@@ -803,7 +803,7 @@ SECTION_RODATA static u8 const life_tag[160] = {
0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x31, 0x36, 0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x31, 0x37,
0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x31, 0x38, 0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x31, 0x39,
};
SECTION_DEAD void* const cg_80398320 = (void*)(&life_tag);
COMPILER_STRIP_GATE(80398320, &life_tag);
#pragma pop
/* 803983C0-80398460 024A20 00A0+00 0/1 0/0 0/0 .rodata mark_tag$4932 */
@@ -821,7 +821,7 @@ SECTION_RODATA static u8 const mark_tag[160] = {
0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x31, 0x36, 0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x31, 0x37,
0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x31, 0x38, 0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x31, 0x39,
};
SECTION_DEAD void* const cg_803983C0 = (void*)(&mark_tag);
COMPILER_STRIP_GATE(803983C0, &mark_tag);
#pragma pop
/* 80398460-80398500 024AC0 00A0+00 0/1 0/0 0/0 .rodata base_tag$4933 */
@@ -839,7 +839,7 @@ SECTION_RODATA static u8 const base_tag[160] = {
0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x31, 0x36, 0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x31, 0x37,
0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x31, 0x38, 0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x31, 0x39,
};
SECTION_DEAD void* const cg_80398460 = (void*)(&base_tag);
COMPILER_STRIP_GATE(80398460, &base_tag);
#pragma pop
/* 80398500-803985A0 024B60 00A0+00 0/1 0/0 0/0 .rodata lifet1_tag$4934 */
@@ -857,7 +857,7 @@ SECTION_RODATA static u8 const lifet1_tag[160] = {
0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x36, 0x73, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x37, 0x73,
0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x38, 0x73, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x39, 0x73,
};
SECTION_DEAD void* const cg_80398500 = (void*)(&lifet1_tag);
COMPILER_STRIP_GATE(80398500, &lifet1_tag);
#pragma pop
/* 803985A0-80398640 024C00 00A0+00 0/1 0/0 0/0 .rodata lifet2_tag$4935 */
@@ -875,7 +875,7 @@ SECTION_RODATA static u8 const lifet2_tag[160] = {
0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x36, 0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x37,
0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x38, 0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x39,
};
SECTION_DEAD void* const cg_803985A0 = (void*)(&lifet2_tag);
COMPILER_STRIP_GATE(803985A0, &lifet2_tag);
#pragma pop
/* 80211BEC-80211E64 20C52C 0278+00 1/1 0/0 0/0 .text initLife__13dMeter2Draw_cFv */
@@ -912,7 +912,7 @@ SECTION_RODATA static u8 const tuta_0[128] = {
0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x31, 0x32, 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x31, 0x33,
0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x31, 0x34, 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x31, 0x35,
};
SECTION_DEAD void* const cg_80398640 = (void*)(&tuta_0);
COMPILER_STRIP_GATE(80398640, &tuta_0);
#pragma pop
/* 803986C0-80398740 024D20 0080+00 0/1 0/0 0/0 .rodata tuta_1$5095 */
@@ -928,7 +928,7 @@ SECTION_RODATA static u8 const tuta_1[128] = {
0x00, 0x00, 0x00, 0x73, 0x6C, 0x5F, 0x31, 0x32, 0x00, 0x00, 0x00, 0x73, 0x6C, 0x5F, 0x31, 0x33,
0x00, 0x00, 0x00, 0x73, 0x6C, 0x5F, 0x31, 0x34, 0x00, 0x00, 0x00, 0x73, 0x6C, 0x5F, 0x31, 0x35,
};
SECTION_DEAD void* const cg_803986C0 = (void*)(&tuta_1);
COMPILER_STRIP_GATE(803986C0, &tuta_1);
#pragma pop
/* 80398740-803987C0 024DA0 0080+00 0/1 0/0 0/0 .rodata tuta_2$5096 */
@@ -944,7 +944,7 @@ SECTION_RODATA static u8 const tuta_2[128] = {
0x00, 0x00, 0x73, 0x63, 0x70, 0x5F, 0x31, 0x32, 0x00, 0x00, 0x73, 0x63, 0x70, 0x5F, 0x31, 0x33,
0x00, 0x00, 0x73, 0x63, 0x70, 0x5F, 0x31, 0x34, 0x00, 0x00, 0x73, 0x63, 0x70, 0x5F, 0x31, 0x35,
};
SECTION_DEAD void* const cg_80398740 = (void*)(&tuta_2);
COMPILER_STRIP_GATE(80398740, &tuta_2);
#pragma pop
/* 80212190-80212404 20CAD0 0274+00 1/1 0/0 0/0 .text initLightDrop__13dMeter2Draw_cFv */
@@ -965,7 +965,7 @@ SECTION_RODATA static u8 const rupeet1_tag[32] = {
0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x31, 0x5F, 0x73, 0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x32, 0x5F, 0x73,
0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x33, 0x5F, 0x73, 0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x34, 0x5F, 0x73,
};
SECTION_DEAD void* const cg_803987C0 = (void*)(&rupeet1_tag);
COMPILER_STRIP_GATE(803987C0, &rupeet1_tag);
#pragma pop
/* 803987E0-80398800 024E40 0020+00 0/1 0/0 0/0 .rodata rupeet2_tag$5153 */
@@ -975,7 +975,7 @@ SECTION_RODATA static u8 const rupeet2_tag[32] = {
0x00, 0x00, 0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x31, 0x00, 0x00, 0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x32,
0x00, 0x00, 0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x33, 0x00, 0x00, 0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x34,
};
SECTION_DEAD void* const cg_803987E0 = (void*)(&rupeet2_tag);
COMPILER_STRIP_GATE(803987E0, &rupeet2_tag);
#pragma pop
/* 80398800-80398828 024E60 0028+00 0/1 0/0 0/0 .rodata key_tag$5165 */
@@ -986,7 +986,7 @@ SECTION_RODATA static u8 const key_tag[40] = {
0x5F, 0x6E, 0x00, 0x6B, 0x5F, 0x6E, 0x5F, 0x32, 0x5F, 0x6E, 0x00, 0x6B, 0x5F, 0x6E,
0x5F, 0x33, 0x5F, 0x6E, 0x00, 0x6B, 0x5F, 0x6E, 0x5F, 0x34, 0x5F, 0x6E,
};
SECTION_DEAD void* const cg_80398800 = (void*)(&key_tag);
COMPILER_STRIP_GATE(80398800, &key_tag);
#pragma pop
/* 80212404-802126E4 20CD44 02E0+00 1/1 0/0 0/0 .text initRupeeKey__13dMeter2Draw_cFv */
@@ -1006,7 +1006,7 @@ SECTION_RODATA static u8 const juji_i_tag[40] = {
0x30, 0x30, 0x00, 0x79, 0x61, 0x6A, 0x69, 0x5F, 0x30, 0x31, 0x6A, 0x75, 0x5F, 0x72,
0x69, 0x6E, 0x67, 0x32, 0x6A, 0x75, 0x5F, 0x72, 0x69, 0x6E, 0x67, 0x34,
};
SECTION_DEAD void* const cg_80398828 = (void*)(&juji_i_tag);
COMPILER_STRIP_GATE(80398828, &juji_i_tag);
/* 80398850-80398878 024EB0 0028+00 1/1 0/0 0/0 .rodata juji_m_tag$5270 */
SECTION_RODATA static u8 const juji_m_tag[40] = {
@@ -1014,7 +1014,7 @@ SECTION_RODATA static u8 const juji_m_tag[40] = {
0x30, 0x32, 0x00, 0x79, 0x61, 0x6A, 0x69, 0x5F, 0x30, 0x33, 0x6A, 0x75, 0x5F, 0x72,
0x69, 0x6E, 0x67, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80398850 = (void*)(&juji_m_tag);
COMPILER_STRIP_GATE(80398850, &juji_m_tag);
/* 802126E4-8021350C 20D024 0E28+00 1/1 0/0 0/0 .text initButton__13dMeter2Draw_cFv */
#pragma push
@@ -1139,13 +1139,13 @@ SECTION_RODATA static u8 const tag_bigh[32] = {
0x00, 0x62, 0x69, 0x67, 0x68, 0x5F, 0x30, 0x30, 0x00, 0x62, 0x69, 0x67, 0x68, 0x5F, 0x30, 0x31,
0x00, 0x62, 0x69, 0x67, 0x68, 0x5F, 0x30, 0x32, 0x00, 0x62, 0x69, 0x67, 0x68, 0x5F, 0x30, 0x33,
};
SECTION_DEAD void* const cg_80398878 = (void*)(&tag_bigh);
COMPILER_STRIP_GATE(80398878, &tag_bigh);
/* 80398898-803988A8 024EF8 0010+00 1/1 0/0 0/0 .rodata tag_du$5852 */
SECTION_RODATA static u8 const tag_du[16] = {
0x68, 0x65, 0x61, 0x72, 0x74, 0x5F, 0x6C, 0x6E, 0x68, 0x65, 0x61, 0x72, 0x74, 0x5F, 0x75, 0x6E,
};
SECTION_DEAD void* const cg_80398898 = (void*)(&tag_du);
COMPILER_STRIP_GATE(80398898, &tag_du);
/* 802147CC-802149F4 20F10C 0228+00 1/1 0/0 0/0 .text changeTextureLife__13dMeter2Draw_cFibUc */
#pragma push
@@ -1548,7 +1548,7 @@ asm void dMeter2Draw_c::drawButtonBin(u8 param_0) {
SECTION_RODATA static u8 const tag_7361[16] = {
0x69, 0x74, 0x65, 0x6D, 0x5F, 0x78, 0x5F, 0x6E, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x79, 0x5F, 0x6E,
};
SECTION_DEAD void* const cg_803988A8 = (void*)(&tag_7361);
COMPILER_STRIP_GATE(803988A8, &tag_7361);
/* 80217AB4-80218238 2123F4 0784+00 1/1 1/1 0/0 .text drawButtonXY__13dMeter2Draw_cFiUcUcbb */
#pragma push
@@ -2177,7 +2177,7 @@ SECTION_RODATA static u8 const tag_7759[24] = {
0x69, 0x74, 0x65, 0x6D, 0x5F, 0x78, 0x5F, 0x6E, 0x69, 0x74, 0x65, 0x6D,
0x5F, 0x79, 0x5F, 0x6E, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6A, 0x5F, 0x6E,
};
SECTION_DEAD void* const cg_803988B8 = (void*)(&tag_7759);
COMPILER_STRIP_GATE(803988B8, &tag_7759);
#pragma pop
/* 803988D0-80398A78 024F30 01A7+01 6/5 0/0 0/0 .rodata @stringBase0 */
src/d/meter/d_meter2_info.cpp
+18 -18
View File
@@ -60,18 +60,18 @@ struct dMeterMap_c {
/* 8020D900 */ void isMapOpenCheck();
};
struct JMSMesgEntry_c {};
struct JUTFont {};
struct cXyz {};
struct J2DTextBox {
/* 8021C7F4 */ void getFont() const;
};
struct cXyz {};
struct JUTFont {};
struct J2DPicture {};
struct JMSMesgEntry_c {};
struct dMeter2Info_c {
/* 8021BDDC */ dMeter2Info_c();
/* 8021BE20 */ ~dMeter2Info_c();
@@ -720,7 +720,7 @@ SECTION_RODATA static u8 const black_color_4634[148] = {
0x46, 0x46, 0x41, 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_80398A78 = (void*)(&black_color_4634);
COMPILER_STRIP_GATE(80398A78, &black_color_4634);
/* 80398B0C-80398BA0 02516C 0094+00 0/1 0/0 0/0 .rodata white_color$4635 */
#pragma push
@@ -737,7 +737,7 @@ SECTION_RODATA static u8 const white_color_4635[148] = {
0xF5, 0xF5, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
};
SECTION_DEAD void* const cg_80398B0C = (void*)(&white_color_4635);
COMPILER_STRIP_GATE(80398B0C, &white_color_4635);
#pragma pop
/* 80398BA0-80398C34 025200 0094+00 0/1 0/0 0/0 .rodata vertex_color_lu$4636 */
@@ -755,7 +755,7 @@ SECTION_RODATA static u8 const vertex_color_lu_4636[148] = {
0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
};
SECTION_DEAD void* const cg_80398BA0 = (void*)(&vertex_color_lu_4636);
COMPILER_STRIP_GATE(80398BA0, &vertex_color_lu_4636);
#pragma pop
/* 80398C34-80398CC8 025294 0094+00 0/1 0/0 0/0 .rodata vertex_color_ru$4637 */
@@ -773,7 +773,7 @@ SECTION_RODATA static u8 const vertex_color_ru_4637[148] = {
0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
};
SECTION_DEAD void* const cg_80398C34 = (void*)(&vertex_color_ru_4637);
COMPILER_STRIP_GATE(80398C34, &vertex_color_ru_4637);
#pragma pop
/* 80398CC8-80398D5C 025328 0094+00 0/1 0/0 0/0 .rodata vertex_color_ld$4638 */
@@ -791,7 +791,7 @@ SECTION_RODATA static u8 const vertex_color_ld_4638[148] = {
0x00, 0x00, 0x00, 0xFF, 0xE0, 0x00, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
};
SECTION_DEAD void* const cg_80398CC8 = (void*)(&vertex_color_ld_4638);
COMPILER_STRIP_GATE(80398CC8, &vertex_color_ld_4638);
#pragma pop
/* 80398D5C-80398DF0 0253BC 0094+00 0/1 0/0 0/0 .rodata vertex_color_rd$4639 */
@@ -809,7 +809,7 @@ SECTION_RODATA static u8 const vertex_color_rd_4639[148] = {
0x00, 0x00, 0x00, 0xFF, 0xE0, 0x00, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
};
SECTION_DEAD void* const cg_80398D5C = (void*)(&vertex_color_rd_4639);
COMPILER_STRIP_GATE(80398D5C, &vertex_color_rd_4639);
#pragma pop
/* 8021D524-8021D644 217E64 0120+00 2/2 0/0 0/0 .text set1stColor__13dMeter2Info_cFUcP10J2DPicture
@@ -839,7 +839,7 @@ SECTION_RODATA static u8 const black_color_4675[148] = {
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_80398DF0 = (void*)(&black_color_4675);
COMPILER_STRIP_GATE(80398DF0, &black_color_4675);
#pragma pop
/* 80398E84-80398F18 0254E4 0094+00 0/1 0/0 0/0 .rodata white_color$4676 */
@@ -857,7 +857,7 @@ SECTION_RODATA static u8 const white_color_4676[148] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
};
SECTION_DEAD void* const cg_80398E84 = (void*)(&white_color_4676);
COMPILER_STRIP_GATE(80398E84, &white_color_4676);
#pragma pop
/* 80398F18-80398FAC 025578 0094+00 0/1 0/0 0/0 .rodata vertex_color_lu$4677 */
@@ -875,7 +875,7 @@ SECTION_RODATA static u8 const vertex_color_lu_4677[148] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
};
SECTION_DEAD void* const cg_80398F18 = (void*)(&vertex_color_lu_4677);
COMPILER_STRIP_GATE(80398F18, &vertex_color_lu_4677);
#pragma pop
/* 80398FAC-80399040 02560C 0094+00 0/1 0/0 0/0 .rodata vertex_color_ru$4678 */
@@ -893,7 +893,7 @@ SECTION_RODATA static u8 const vertex_color_ru_4678[148] = {
0xFF, 0xFF, 0xFF, 0x58, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
};
SECTION_DEAD void* const cg_80398FAC = (void*)(&vertex_color_ru_4678);
COMPILER_STRIP_GATE(80398FAC, &vertex_color_ru_4678);
#pragma pop
/* 80399040-803990D4 0256A0 0094+00 0/1 0/0 0/0 .rodata vertex_color_ld$4679 */
@@ -911,7 +911,7 @@ SECTION_RODATA static u8 const vertex_color_ld_4679[148] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
};
SECTION_DEAD void* const cg_80399040 = (void*)(&vertex_color_ld_4679);
COMPILER_STRIP_GATE(80399040, &vertex_color_ld_4679);
#pragma pop
/* 803990D4-80399168 025734 0094+00 0/1 0/0 0/0 .rodata vertex_color_rd$4680 */
@@ -929,7 +929,7 @@ SECTION_RODATA static u8 const vertex_color_rd_4680[148] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
};
SECTION_DEAD void* const cg_803990D4 = (void*)(&vertex_color_rd_4680);
COMPILER_STRIP_GATE(803990D4, &vertex_color_rd_4680);
#pragma pop
/* 8021D644-8021D764 217F84 0120+00 2/2 0/0 0/0 .text set2ndColor__13dMeter2Info_cFUcP10J2DPicture
src/d/meter/d_meter_HIO.cpp
+21 -21
View File
@@ -408,7 +408,7 @@ SECTION_RODATA static u8 const fipaScale[24] = {
0x3F, 0x7A, 0xE1, 0x48, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x73, 0x33, 0x33, 0x3F, 0x8C, 0xCC, 0xCD,
};
SECTION_DEAD void* const cg_80397E50 = (void*)(&fipaScale);
COMPILER_STRIP_GATE(80397E50, &fipaScale);
/* 80397E68-80397E80 0244C8 0018+00 0/1 0/0 0/0 .rodata fipaPosX$3872 */
#pragma push
@@ -417,7 +417,7 @@ SECTION_RODATA static u8 const fipaPosX[24] = {
0x3F, 0xA6, 0x66, 0x66, 0x40, 0xD3, 0x33, 0x33, 0x00, 0x00, 0x00, 0x00,
0x40, 0x7D, 0x70, 0xA4, 0x40, 0x80, 0x00, 0x00, 0x41, 0xDC, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80397E68 = (void*)(&fipaPosX);
COMPILER_STRIP_GATE(80397E68, &fipaPosX);
#pragma pop
/* 80397E80-80397E98 0244E0 0018+00 0/1 0/0 0/0 .rodata fipaPosY$3873 */
@@ -427,7 +427,7 @@ SECTION_RODATA static u8 const fipaPosY[24] = {
0xC1, 0x13, 0x33, 0x33, 0xC1, 0xDC, 0x00, 0x00, 0xC1, 0x3B, 0x33, 0x33,
0xC1, 0x13, 0x33, 0x33, 0xC1, 0xF0, 0xCC, 0xCD, 0xC1, 0x8F, 0x33, 0x33,
};
SECTION_DEAD void* const cg_80397E80 = (void*)(&fipaPosY);
COMPILER_STRIP_GATE(80397E80, &fipaPosY);
#pragma pop
/* 80397E98-80397EB0 0244F8 0018+00 0/1 0/0 0/0 .rodata finaScale$3874 */
@@ -437,7 +437,7 @@ SECTION_RODATA static u8 const finaScale[24] = {
0x3F, 0x66, 0x66, 0x66, 0x3F, 0x66, 0x66, 0x66, 0x3F, 0x66, 0x66, 0x66,
0x3F, 0x66, 0x66, 0x66, 0x3F, 0x66, 0x66, 0x66, 0x3F, 0x66, 0x66, 0x66,
};
SECTION_DEAD void* const cg_80397E98 = (void*)(&finaScale);
COMPILER_STRIP_GATE(80397E98, &finaScale);
#pragma pop
/* 80397EB0-80397EC8 024510 0018+00 0/1 0/0 0/0 .rodata finaPosX$3875 */
@@ -447,7 +447,7 @@ SECTION_RODATA static u8 const finaPosX[24] = {
0xC1, 0xC8, 0x00, 0x00, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x80, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80397EB0 = (void*)(&finaPosX);
COMPILER_STRIP_GATE(80397EB0, &finaPosX);
#pragma pop
/* 80397EC8-80397EE0 024528 0018+00 0/1 0/0 0/0 .rodata finaPosY$3876 */
@@ -457,7 +457,7 @@ SECTION_RODATA static u8 const finaPosY[24] = {
0xC1, 0x80, 0x00, 0x00, 0xC2, 0x22, 0x66, 0x66, 0xC1, 0xC0, 0x00, 0x00,
0xC1, 0x3B, 0x33, 0x33, 0xC2, 0x17, 0x99, 0x9A, 0xC1, 0x50, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80397EC8 = (void*)(&finaPosY);
COMPILER_STRIP_GATE(80397EC8, &finaPosY);
#pragma pop
/* 80397EE0-80397EF8 024540 0018+00 0/1 0/0 0/0 .rodata filiScale$3877 */
@@ -467,7 +467,7 @@ SECTION_RODATA static u8 const filiScale[24] = {
0x3F, 0x26, 0x66, 0x66, 0x3F, 0x26, 0x66, 0x66, 0x3F, 0x26, 0x66, 0x66,
0x3F, 0x26, 0x66, 0x66, 0x3F, 0x26, 0x66, 0x66, 0x3F, 0x26, 0x66, 0x66,
};
SECTION_DEAD void* const cg_80397EE0 = (void*)(&filiScale);
COMPILER_STRIP_GATE(80397EE0, &filiScale);
#pragma pop
/* 80397EF8-80397F10 024558 0018+00 0/1 0/0 0/0 .rodata filiPosX$3878 */
@@ -477,7 +477,7 @@ SECTION_RODATA static u8 const filiPosX[24] = {
0xC1, 0xE0, 0x00, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x41, 0x13, 0x33, 0x33,
0x41, 0x13, 0x33, 0x33, 0x41, 0x13, 0x33, 0x33, 0xC1, 0x00, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80397EF8 = (void*)(&filiPosX);
COMPILER_STRIP_GATE(80397EF8, &filiPosX);
#pragma pop
/* 80397F10-80397F28 024570 0018+00 0/1 0/0 0/0 .rodata filiPosY$3879 */
@@ -487,7 +487,7 @@ SECTION_RODATA static u8 const filiPosY[24] = {
0xC0, 0xD3, 0x33, 0x33, 0xC1, 0x60, 0x00, 0x00, 0xC1, 0x66, 0x66, 0x66,
0x41, 0xC7, 0x33, 0x33, 0xC1, 0x3B, 0x33, 0x33, 0x41, 0xC7, 0x33, 0x33,
};
SECTION_DEAD void* const cg_80397F10 = (void*)(&filiPosY);
COMPILER_STRIP_GATE(80397F10, &filiPosY);
#pragma pop
/* 80397F28-80397F40 024588 0018+00 0/1 0/0 0/0 .rodata bboxScale$3880 */
@@ -497,7 +497,7 @@ SECTION_RODATA static u8 const bboxScale[24] = {
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80397F28 = (void*)(&bboxScale);
COMPILER_STRIP_GATE(80397F28, &bboxScale);
#pragma pop
/* 80397F40-80397F58 0245A0 0018+00 0/0 0/0 0/0 .rodata bboxPosX$3881 */
@@ -507,7 +507,7 @@ SECTION_RODATA static u8 const bboxPosX[24] = {
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_80397F40 = (void*)(&bboxPosX);
COMPILER_STRIP_GATE(80397F40, &bboxPosX);
#pragma pop
/* 80397F58-80397F70 0245B8 0018+00 0/0 0/0 0/0 .rodata bboxPosY$3882 */
@@ -517,7 +517,7 @@ SECTION_RODATA static u8 const bboxPosY[24] = {
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_80397F58 = (void*)(&bboxPosY);
COMPILER_STRIP_GATE(80397F58, &bboxPosY);
#pragma pop
/* 80397F70-80397F88 0245D0 0018+00 0/1 0/0 0/0 .rodata rboxScale$3883 */
@@ -527,7 +527,7 @@ SECTION_RODATA static u8 const rboxScale[24] = {
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80397F70 = (void*)(&rboxScale);
COMPILER_STRIP_GATE(80397F70, &rboxScale);
#pragma pop
/* 80397F88-80397FA0 0245E8 0018+00 0/1 0/0 0/0 .rodata rboxPosX$3884 */
@@ -537,7 +537,7 @@ SECTION_RODATA static u8 const rboxPosX[24] = {
0x3F, 0x80, 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_80397F88 = (void*)(&rboxPosX);
COMPILER_STRIP_GATE(80397F88, &rboxPosX);
#pragma pop
/* 80397FA0-80397FB8 024600 0018+00 0/1 0/0 0/0 .rodata rboxPosY$3885 */
@@ -547,7 +547,7 @@ SECTION_RODATA static u8 const rboxPosY[24] = {
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_80397FA0 = (void*)(&rboxPosY);
COMPILER_STRIP_GATE(80397FA0, &rboxPosY);
#pragma pop
/* 80397FB8-80397FD0 024618 0018+00 0/1 0/0 0/0 .rodata finfoScale$3886 */
@@ -557,7 +557,7 @@ SECTION_RODATA static u8 const finfoScale[24] = {
0x3F, 0x5E, 0xB8, 0x52, 0x3F, 0x5E, 0xB8, 0x52, 0x3F, 0x61, 0x47, 0xAE,
0x3F, 0x5E, 0xB8, 0x52, 0x3F, 0x5E, 0xB8, 0x52, 0x3F, 0x5E, 0xB8, 0x52,
};
SECTION_DEAD void* const cg_80397FB8 = (void*)(&finfoScale);
COMPILER_STRIP_GATE(80397FB8, &finfoScale);
#pragma pop
/* 80397FD0-80397FE8 024630 0018+00 0/1 0/0 0/0 .rodata finfoPosX$3887 */
@@ -567,7 +567,7 @@ SECTION_RODATA static u8 const finfoPosX[24] = {
0xC1, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x60, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0xC1, 0x40, 0x00, 0x00, 0xC2, 0x03, 0x33, 0x33,
};
SECTION_DEAD void* const cg_80397FD0 = (void*)(&finfoPosX);
COMPILER_STRIP_GATE(80397FD0, &finfoPosX);
#pragma pop
/* 80397FE8-80398000 024648 0018+00 0/1 0/0 0/0 .rodata finfoPosY$3888 */
@@ -577,7 +577,7 @@ SECTION_RODATA static u8 const finfoPosY[24] = {
0x40, 0xD3, 0x33, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x3F, 0xA6, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80397FE8 = (void*)(&finfoPosY);
COMPILER_STRIP_GATE(80397FE8, &finfoPosY);
#pragma pop
/* 80398000-80398018 024660 0018+00 0/1 0/0 0/0 .rodata fishnScale$3889 */
@@ -587,7 +587,7 @@ SECTION_RODATA static u8 const fishnScale[24] = {
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80398000 = (void*)(&fishnScale);
COMPILER_STRIP_GATE(80398000, &fishnScale);
#pragma pop
/* 80398018-80398030 024678 0018+00 0/1 0/0 0/0 .rodata fishnPosX$3890 */
@@ -597,7 +597,7 @@ SECTION_RODATA static u8 const fishnPosX[24] = {
0x40, 0x80, 0x00, 0x00, 0xC1, 0xA0, 0x00, 0x00, 0x3F, 0xA6, 0x66, 0x66,
0x40, 0xD3, 0x33, 0x33, 0x3F, 0xA6, 0x66, 0x66, 0x41, 0x13, 0x33, 0x33,
};
SECTION_DEAD void* const cg_80398018 = (void*)(&fishnPosX);
COMPILER_STRIP_GATE(80398018, &fishnPosX);
#pragma pop
/* 80398030-80398048 024690 0018+00 0/1 0/0 0/0 .rodata fishnPosY$3891 */
@@ -607,7 +607,7 @@ SECTION_RODATA static u8 const fishnPosY[24] = {
0xC2, 0x90, 0x33, 0x33, 0x43, 0x01, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00,
0x40, 0xD3, 0x33, 0x33, 0x42, 0x03, 0x33, 0x33, 0x41, 0x3B, 0x33, 0x33,
};
SECTION_DEAD void* const cg_80398030 = (void*)(&fishnPosY);
COMPILER_STRIP_GATE(80398030, &fishnPosY);
#pragma pop
/* 80454538-8045453C 002B38 0004+00 1/1 0/0 0/0 .sdata2 @3902 */
src/d/meter/d_meter_button.cpp
+12 -12
View File
@@ -24,15 +24,15 @@ struct dMsgString_c {
/* 80249D28 */ ~dMsgString_c();
};
struct COutFont_c {
/* 80225C94 */ COutFont_c(u8);
};
struct J2DTextBox {
/* 80300658 */ void getStringPtr() const;
/* 8030074C */ void setString(s16, char const*, ...);
};
struct COutFont_c {
/* 80225C94 */ COutFont_c(u8);
};
struct JUTFont {};
struct dMsgObject_c {
@@ -181,6 +181,10 @@ struct dMeter2Info_c {
J2DPicture*, void*, J2DPicture*, int);
};
struct JUtility {
struct TColor {};
};
struct CPaneMgrAlpha {
/* 802555C8 */ void show();
/* 80255608 */ void hide();
@@ -188,10 +192,6 @@ struct CPaneMgrAlpha {
/* 80255828 */ void getAlphaRate();
};
struct JUtility {
struct TColor {};
};
struct dMeter2Draw_c {
/* 802140DC */ void drawPikari(f32, f32, f32*, f32, JUtility::TColor, JUtility::TColor,
JUtility::TColor, JUtility::TColor, f32, u8);
@@ -203,10 +203,10 @@ struct dComIfG_play_c {
/* 8002C97C */ void getLayerNo(int);
};
struct JAISoundID {};
struct Vec {};
struct JAISoundID {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -797,7 +797,7 @@ SECTION_RODATA static u8 const text_tag[80] = {
0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x61, 0x72, 0x36, 0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x61, 0x72, 0x37,
0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x61, 0x72, 0x38, 0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x61, 0x72, 0x39,
};
SECTION_DEAD void* const cg_80398048 = (void*)(&text_tag);
COMPILER_STRIP_GATE(80398048, &text_tag);
/* 80398098-803980E8 0246F8 0050+00 1/1 0/0 0/0 .rodata ftext_tag$5462 */
SECTION_RODATA static u8 const ftext_tag[80] = {
@@ -807,7 +807,7 @@ SECTION_RODATA static u8 const ftext_tag[80] = {
0x66, 0x6E, 0x66, 0x6F, 0x5F, 0x61, 0x72, 0x36, 0x66, 0x6E, 0x66, 0x6F, 0x5F, 0x61, 0x72, 0x37,
0x66, 0x6E, 0x66, 0x6F, 0x5F, 0x61, 0x72, 0x38, 0x66, 0x6E, 0x66, 0x6F, 0x5F, 0x61, 0x72, 0x39,
};
SECTION_DEAD void* const cg_80398098 = (void*)(&ftext_tag);
COMPILER_STRIP_GATE(80398098, &ftext_tag);
/* 80454770-80454774 002D70 0004+00 4/4 0/0 0/0 .sdata2 @5628 */
SECTION_SDATA2 static f32 lit_5628 = 0.5f;
src/d/meter/d_meter_hakusha.cpp
+4 -4
View File
@@ -31,6 +31,10 @@ struct dMeterHakusha_c {
/* 8020D480 */ void getHakushaNum();
};
struct JUtility {
struct TColor {};
};
struct CPaneMgrAlpha {
/* 802555C8 */ void show();
/* 80255608 */ void hide();
@@ -38,10 +42,6 @@ struct CPaneMgrAlpha {
/* 80255828 */ void getAlphaRate();
};
struct JUtility {
struct TColor {};
};
struct dMeter2Draw_c {
/* 8021462C */ void drawPikariHakusha(f32, f32, f32, f32, JUtility::TColor, JUtility::TColor,
JUtility::TColor, JUtility::TColor);
src/d/meter/d_meter_map.cpp
+2 -2
View File
@@ -80,10 +80,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);
};
src/d/msg/d_msg_class.cpp
+15 -15
View File
@@ -11,6 +11,12 @@
// Types:
//
struct Vec {};
struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
};
struct jmessage_tReference {
/* 80228B04 */ jmessage_tReference();
/* 80228CB4 */ ~jmessage_tReference();
@@ -43,12 +49,6 @@ struct jmessage_tReference {
/* 80232A20 */ void getActorPos();
};
struct Vec {};
struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
};
struct jmessage_tControl {
/* 802299EC */ jmessage_tControl();
};
@@ -115,19 +115,14 @@ struct jmessage_tMeasureProcessor {
/* 8022B5F4 */ ~jmessage_tMeasureProcessor();
};
struct jmessage_string_tControl {
/* 8022FB5C */ jmessage_string_tControl();
/* 802328DC */ ~jmessage_string_tControl();
struct J2DTextBox {
/* 80300658 */ void getStringPtr() const;
};
struct COutFont_c {
/* 80226CF8 */ void initialize();
};
struct J2DTextBox {
/* 80300658 */ void getStringPtr() const;
};
struct JUTFont {};
struct jmessage_string_tReference {
@@ -145,6 +140,11 @@ struct jmessage_string_tReference {
/* 8022FB24 */ void getLineCountNowPage();
};
struct jmessage_string_tControl {
/* 8022FB5C */ jmessage_string_tControl();
/* 802328DC */ ~jmessage_string_tControl();
};
struct jmessage_string_tSequenceProcessor {
/* 80230A08 */ jmessage_string_tSequenceProcessor(jmessage_string_tReference const*,
jmessage_string_tControl*);
@@ -712,7 +712,7 @@ SECTION_RODATA static u8 const colorTable_3861[36] = {
0xA0, 0xB4, 0xDC, 0xFF, 0xDC, 0xDC, 0x82, 0xFF, 0xB4, 0xC8, 0xE6, 0xFF,
0xC8, 0xA0, 0xDC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xAA, 0x78, 0xFF,
};
SECTION_DEAD void* const cg_803995C8 = (void*)(&colorTable_3861);
COMPILER_STRIP_GATE(803995C8, &colorTable_3861);
/* 802288FC-802289A8 22323C 00AC+00 2/2 0/0 0/0 .text getFontCCColorTable__FUcUc */
#pragma push
@@ -731,7 +731,7 @@ SECTION_RODATA static u8 const colorTable_3877[36] = {
0xA0, 0xB4, 0xDC, 0xFF, 0xDC, 0xDC, 0x82, 0xFF, 0xB4, 0xC8, 0xE6, 0xFF,
0xC8, 0xA0, 0xDC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xAA, 0x78, 0xFF,
};
SECTION_DEAD void* const cg_803995EC = (void*)(&colorTable_3877);
COMPILER_STRIP_GATE(803995EC, &colorTable_3877);
/* 802289A8-80228A54 2232E8 00AC+00 2/2 0/0 0/0 .text getFontGCColorTable__FUcUc */
#pragma push
src/d/msg/d_msg_object.cpp
+4 -4
View File
@@ -13,14 +13,14 @@
struct msg_class {};
struct JKRHeap {
/* 802CE784 */ void getTotalFreeSize();
};
struct JKRArchive {
struct EMountMode {};
};
struct JKRHeap {
/* 802CE784 */ void getTotalFreeSize();
};
struct mDoDvdThd_mountXArchive_c {
/* 800161E0 */ void create(char const*, u8, JKRArchive::EMountMode, JKRHeap*);
};
src/d/msg/d_msg_string.cpp
+2 -2
View File
@@ -11,12 +11,12 @@
// Types:
//
struct J2DTextBox {};
struct COutFont_c {
/* 80225C94 */ COutFont_c(u8);
};
struct J2DTextBox {};
struct JUTFont {};
struct dMsgString_c {
src/d/msg/d_msg_string_base.cpp
+5 -5
View File
@@ -11,14 +11,10 @@
// Types:
//
struct jmessage_string_tControl {
/* 8022FB5C */ jmessage_string_tControl();
};
struct J2DTextBox {};
struct COutFont_c {};
struct J2DTextBox {};
struct JUTFont {};
struct jmessage_string_tReference {
@@ -27,6 +23,10 @@ struct jmessage_string_tReference {
/* 8022FA38 */ void getLineLength(int);
};
struct jmessage_string_tControl {
/* 8022FB5C */ jmessage_string_tControl();
};
struct jmessage_string_tSequenceProcessor {
/* 80230A08 */ jmessage_string_tSequenceProcessor(jmessage_string_tReference const*,
jmessage_string_tControl*);
src/d/pane/d_pane_class.cpp
+1 -1
View File
@@ -494,7 +494,7 @@ asm void CPaneMgr::getGlobalVtxCenter(J2DPane* param_0, bool param_1, s16 param_
/* ############################################################################################## */
/* 80430748-80430758 05D468 0010+00 2/2 0/0 0/0 .bss static_mBounds */
static u8 static_mBounds[16];
static f32 static_mBounds[4];
/* 80254FB8-802550E8 24F8F8 0130+00 1/1 0/0 0/0 .text getBounds__8CPaneMgrFP7J2DPane */
#pragma push
src/d/pane/d_pane_class_ex.cpp
+2 -2
View File
@@ -35,11 +35,11 @@ struct J2DPicture {
/* 8025603C */ bool getMaterial() const;
};
struct J2DAnmVtxColor {};
struct J2DAnmTexPattern {};
struct J2DAnmVisibilityFull {};
struct J2DAnmTexPattern {};
struct J2DAnmVtxColor {};
struct J2DPane {
/* 80256018 */ void setAnimation(J2DAnmVtxColor*);
src/d/particle/d_particle.cpp
+16 -16
View File
@@ -58,7 +58,9 @@ struct dPa_wbPcallBack_c {
/* 8004FECC */ ~dPa_wbPcallBack_c();
};
struct JPADrawInfo {};
struct _GXColor {};
struct dKy_tevstr_c {};
struct JPAParticleCallBack {
/* 800183D4 */ void execute(JPABaseEmitter*, JPABaseParticle*);
@@ -66,6 +68,16 @@ struct JPAParticleCallBack {
/* 8027EFA4 */ ~JPAParticleCallBack();
};
struct JPAEmitterCallBack {
/* 80050368 */ void execute(JPABaseEmitter*);
/* 8005036C */ void draw(JPABaseEmitter*);
/* 80050370 */ void drawAfter(JPABaseEmitter*);
/* 80050374 */ void executeAfter(JPABaseEmitter*);
/* 8027E6A4 */ ~JPAEmitterCallBack();
};
struct JPADrawInfo {};
struct ResTIMG {};
struct JPAResourceManager {
@@ -82,14 +94,6 @@ struct JGeometry {
struct TVec3__template0 {};
};
struct JPAEmitterCallBack {
/* 80050368 */ void execute(JPABaseEmitter*);
/* 8005036C */ void draw(JPABaseEmitter*);
/* 80050370 */ void drawAfter(JPABaseEmitter*);
/* 80050374 */ void executeAfter(JPABaseEmitter*);
/* 8027E6A4 */ ~JPAEmitterCallBack();
};
struct JPAEmitterManager {
/* 8027DCA0 */ JPAEmitterManager(u32, u32, JKRHeap*, u8, u8);
/* 8027DEBC */ void createSimpleEmitterID(JGeometry::TVec3<f32> const&, u16, u8, u8,
@@ -101,10 +105,6 @@ struct JPAEmitterManager {
/* 8027E354 */ void clearResourceManager(u8);
};
struct _GXColor {};
struct dKy_tevstr_c {};
struct dPa_simpleEcallBack {
/* 8004ADF4 */ dPa_simpleEcallBack();
/* 8004AE1C */ void executeAfter(JPABaseEmitter*);
@@ -1263,7 +1263,7 @@ static asm void dPa_setWindPower(JPABaseParticle* param_0) {
SECTION_RODATA static u8 const lit_4065[12] = {
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
};
SECTION_DEAD void* const cg_8037A108 = (void*)(&lit_4065);
COMPILER_STRIP_GATE(8037A108, &lit_4065);
/* 80451F5C-80451F60 00055C 0004+00 3/3 0/0 0/0 .sdata2 @4090 */
SECTION_SDATA2 static f32 lit_4090 = -0.0054931640625f;
@@ -2332,7 +2332,7 @@ void dPa_gen_d_light8PcallBack::execute(JPABaseEmitter* param_0, JPABaseParticle
SECTION_RODATA static u8 const lit_5691[12] = {
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
};
SECTION_DEAD void* const cg_8037A114 = (void*)(&lit_5691);
COMPILER_STRIP_GATE(8037A114, &lit_5691);
/* 80451FD8-80451FDC 0005D8 0004+00 3/3 0/0 0/0 .sdata2 @6075 */
SECTION_SDATA2 static f32 lit_6075 = 32.0f;
@@ -2383,7 +2383,7 @@ asm void dPa_gen_b_light8PcallBack::draw(JPABaseEmitter* param_0, JPABaseParticl
SECTION_RODATA static u8 const lit_6363[12] = {
0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
};
SECTION_DEAD void* const cg_8037A120 = (void*)(&lit_6363);
COMPILER_STRIP_GATE(8037A120, &lit_6363);
/* 8004ED44-8004F6B8 049684 0974+00 1/0 0/0 0/0 .text
* draw__25dPa_gen_d_light8PcallBackFP14JPABaseEmitterP15JPABaseParticle */
src/d/particle/d_particle_copoly.cpp
+4 -4
View File
@@ -11,14 +11,14 @@
// Types:
//
struct csXyz {};
struct cBgS_PolyInfo {};
struct dKy_tevstr_c {};
struct cXyz {};
struct cBgS_PolyInfo {};
struct csXyz {};
struct dPa_control_c {
struct level_c {
/* 8004B918 */ void getEmitter(u32);
src/d/s/d_s_logo.cpp
+3 -3
View File
@@ -116,10 +116,10 @@ struct cDylPhs {
/* 8001884C */ void Link(request_of_phase_process_class*, s16);
};
struct JAISoundID {};
struct Vec {};
struct JAISoundID {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -539,7 +539,7 @@ SECTION_RODATA static u8 const l_preLoad_dylKeyTbl[28] = {
0x02, 0xDC, 0x02, 0xCE, 0x02, 0x21, 0x00, 0xF2, 0x02, 0x1B, 0x02, 0xF4, 0x01, 0x39,
0x01, 0x5A, 0x02, 0xE4, 0x00, 0xFE, 0x03, 0x08, 0x03, 0x0F, 0x00, 0xFF, 0x01, 0x3F,
};
SECTION_DEAD void* const cg_80399FE0 = (void*)(&l_preLoad_dylKeyTbl);
COMPILER_STRIP_GATE(80399FE0, &l_preLoad_dylKeyTbl);
/* 8025611C-80256198 250A5C 007C+00 2/2 0/0 0/0 .text preLoad_dyl__10dScnLogo_cFv */
#pragma push
src/d/s/d_s_play.cpp
+1 -1
View File
@@ -672,7 +672,7 @@ SECTION_RODATA static void* const PreLoadInfoT[4] = {
(void*)&T_JOINT_resName,
(void*)0x01010000,
};
SECTION_DEAD void* const cg_8039A2C8 = (void*)(&PreLoadInfoT);
COMPILER_STRIP_GATE(8039A2C8, &PreLoadInfoT);
/* 80450760-80450764 -00001 0004+00 1/0 0/0 0/0 .sdata T_JOINT_resName */
SECTION_SDATA static void* T_JOINT_resName = (void*)&d_s_d_s_play__stringBase0;
src/d/save/d_save.cpp
+1 -1
View File
@@ -4226,7 +4226,7 @@ SECTION_RODATA extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /*
0x00,
0x00,
};
SECTION_DEAD void* const cg_803790C0 = (void*)(&tempBitLabels__20dSv_event_tmp_flag_c);
COMPILER_STRIP_GATE(803790C0, &tempBitLabels__20dSv_event_tmp_flag_c);
/* 80379234-80379298 005894 0062+02 8/8 0/0 0/0 .rodata @stringBase0 */
#pragma push
src/d/shop/d_shop_system.cpp
+2 -2
View File
@@ -21,14 +21,14 @@ struct daNpcT_faceMotionAnmData_c {};
struct J3DModel {};
struct J3DJoint {};
struct Vec {};
struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
};
struct J3DJoint {};
struct daNpcT_c {
/* 801490D4 */ void ctrlBtk();
/* 8014951C */ void ctrlJoint(J3DJoint*, J3DModel*);
src/f_op/f_op_actor.cpp
+4 -4
View File
@@ -61,13 +61,13 @@ struct dRes_control_c {
struct dPa_levelEcallBack {};
struct csXyz {
/* 80018BD0 */ ~csXyz();
};
struct _GXColor {};
struct cXyz {};
struct _GXColor {};
struct csXyz {
/* 80018BD0 */ ~csXyz();
};
struct dPa_control_c {
/* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
src/f_op/f_op_actor_mng.cpp
+9 -9
View File
@@ -63,16 +63,16 @@ struct dSv_info_c {
struct dPa_levelEcallBack {};
struct _GXColor {};
struct cBgS_PolyInfo {};
struct dKy_tevstr_c {};
struct csXyz {
/* 802673F4 */ csXyz(s16, s16, s16);
};
struct _GXColor {};
struct dKy_tevstr_c {};
struct dPa_control_c {
struct level_c {
/* 8004B918 */ void getEmitter(u32);
@@ -904,13 +904,13 @@ asm void fopAcM_rollPlayerCrash(fopAc_ac_c const* param_0, f32 param_1, u32 para
SECTION_RODATA static u8 const lit_4932[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80378880 = (void*)(&lit_4932);
COMPILER_STRIP_GATE(80378880, &lit_4932);
/* 8037888C-80378898 004EEC 000C+00 1/1 0/0 0/0 .rodata @4933 */
SECTION_RODATA static u8 const lit_4933[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_DEAD void* const cg_8037888C = (void*)(&lit_4933);
COMPILER_STRIP_GATE(8037888C, &lit_4933);
/* 8001AC40-8001ACEC 015580 00AC+00 0/0 0/0 2/2 .text fopAcM_checkCullingBox__FPA4_fffffff */
#pragma push
@@ -1626,7 +1626,7 @@ SECTION_RODATA static u8 const mtx_adj[48] = {
0x00, 0x00, 0x00, 0x00, 0xBF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80378898 = (void*)(&mtx_adj);
COMPILER_STRIP_GATE(80378898, &mtx_adj);
/* 8001D42C-8001D5A4 017D6C 0178+00 0/0 3/3 40/40 .text
* fopAcM_setEffectMtx__FPC10fopAc_ac_cPC12J3DModelData */
@@ -1713,8 +1713,8 @@ extern u8 mWaterCheck__11fopAcM_wt_c[84 + 4 /* padding */];
u8 mWaterCheck__11fopAcM_wt_c[84 + 4 /* padding */];
/* 80450CD4-80450CD8 0001D4 0004+00 1/1 0/0 3/3 .sbss mRoofY__11fopAcM_rc_c */
extern u8 mRoofY__11fopAcM_rc_c[4];
u8 mRoofY__11fopAcM_rc_c[4];
extern f32 mRoofY__11fopAcM_rc_c;
f32 mRoofY__11fopAcM_rc_c;
/* 80450CD8-80450CE0 0001D8 0004+04 2/2 4/4 19/19 .sbss mWaterY__11fopAcM_wt_c */
extern f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */];
src/f_op/f_op_kankyo_mng.cpp
+4 -4
View File
@@ -15,14 +15,14 @@ struct layer_class {};
struct dPa_levelEcallBack {};
struct csXyz {};
struct cXyz {};
struct _GXColor {};
struct dKy_tevstr_c {};
struct cXyz {};
struct csXyz {};
struct dPa_control_c {
/* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
src/m_Do/m_Do_audio.cpp
+2 -2
View File
@@ -52,13 +52,13 @@ struct Z2MultiSeMgr {
/* 802AEB34 */ ~Z2MultiSeMgr();
};
struct JAISoundID {};
struct JAISoundHandle {
/* 80007838 */ ~JAISoundHandle();
/* 802A2184 */ void releaseSound();
};
struct JAISoundID {};
struct JGeometry {
template <typename A1>
struct TVec3 {};
src/m_Do/m_Do_ext.cpp
+41 -40
View File
@@ -18,17 +18,6 @@ struct mDoExt_morf_c {
/* 8000FBC0 */ void frameUpdate();
};
struct J3DModelData {};
struct J3DModel {
/* 80327100 */ void initialize();
/* 80327184 */ void entryModelData(J3DModelData*, u32, u32);
/* 803275FC */ void newDifferedDisplayList(u32);
/* 8032767C */ void lock();
/* 803276B4 */ void unlock();
/* 803279A0 */ void diff();
};
struct Vec {};
struct cXyz {
@@ -41,6 +30,17 @@ struct cXyz {
/* 80266F48 */ void normalizeZP();
};
struct J3DModelData {};
struct J3DModel {
/* 80327100 */ void initialize();
/* 80327184 */ void entryModelData(J3DModelData*, u32, u32);
/* 803275FC */ void newDifferedDisplayList(u32);
/* 8032767C */ void lock();
/* 803276B4 */ void unlock();
/* 803279A0 */ void diff();
};
struct mDoExt_invisibleModel {
/* 8000E53C */ void create(J3DModel*, u8);
/* 8000E6C8 */ void entryJoint(cXyz*);
@@ -54,20 +54,17 @@ struct mDoExt_invJntPacket {
};
struct J3DMaterialTable;
struct J3DAnmColor {
/* 8032A8A4 */ void searchUpdateMaterialID(J3DMaterialTable*);
};
struct J3DAnmTextureSRTKey {
/* 8032B0C0 */ void searchUpdateMaterialID(J3DMaterialTable*);
};
struct J3DAnmTevRegKey {
/* 8032B780 */ void searchUpdateMaterialID(J3DMaterialTable*);
};
struct J3DAnmTexPattern {
/* 8032B004 */ void searchUpdateMaterialID(J3DMaterialTable*);
struct J3DAnmColor {
/* 8032A8A4 */ void searchUpdateMaterialID(J3DMaterialTable*);
};
struct J3DAnmTexPattern;
struct J3DAnmTextureSRTKey {
/* 8032B0C0 */ void searchUpdateMaterialID(J3DMaterialTable*);
};
struct J3DMaterialTable {
@@ -77,6 +74,10 @@ struct J3DMaterialTable {
/* 8032FE70 */ void entryTevRegAnimator(J3DAnmTevRegKey*);
};
struct J3DAnmTexPattern {
/* 8032B004 */ void searchUpdateMaterialID(J3DMaterialTable*);
};
struct mDoExt_btpAnm {
/* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16);
/* 8000D5E8 */ void entry(J3DMaterialTable*, s16);
@@ -136,14 +137,14 @@ struct mDoExt_MtxCalcAnmBlendTbl {
/* 80014F3C */ ~mDoExt_MtxCalcAnmBlendTbl();
};
struct mDoExt_McaMorfCallBack1_c {};
struct mDoExt_McaMorfCallBack2_c {};
struct Z2Creature {
/* 802C0628 */ void initAnime(void*, bool, f32, f32);
/* 802C06D0 */ void updateAnime(f32, f32);
};
struct mDoExt_McaMorfCallBack2_c {};
struct mDoExt_McaMorfCallBack1_c {};
struct J3DTransformInfo {};
@@ -214,10 +215,10 @@ struct mDoExt_3DlineMatSortPacket {
struct _GXColor {};
struct ResTIMG {};
struct dKy_tevstr_c {};
struct ResTIMG {};
struct mDoExt_3DlineMat1_c {
/* 80013360 */ void init(u16, u16, ResTIMG*, int);
/* 800134F8 */ void setMaterial();
@@ -236,16 +237,16 @@ struct mDoExt_3DlineMat0_c {
/* 80014E84 */ bool getMaterialID();
};
struct J3DPacket;
struct J3DDrawBuffer {
/* 8032548C */ void entryImm(J3DPacket*, u16);
};
struct J3DDrawBuffer;
struct J3DPacket {
/* 8000E680 */ ~J3DPacket();
/* 80312750 */ bool entry(J3DDrawBuffer*);
};
struct J3DDrawBuffer {
/* 8032548C */ void entryImm(J3DPacket*, u16);
};
struct dDlst_list_c {
/* 800565EC */ void entryZSortXluDrawList(J3DDrawBuffer*, J3DPacket*, cXyz&);
};
@@ -258,10 +259,10 @@ struct _GXBlendMode {};
struct _GXBlendFactor {};
struct JAISoundID {};
struct Z2SoundHandlePool {};
struct JAISoundID {};
struct Z2SoundObjBase {
/* 802BE038 */ void framework(u32, s8);
/* 802BE070 */ void dispose();
@@ -376,14 +377,14 @@ struct J3DIndTevStage {
/* 8000E14C */ J3DIndTevStage();
};
struct J3DGXColor {
/* 8000E538 */ J3DGXColor();
};
struct J3DGXColorS10 {
/* 8000E460 */ J3DGXColorS10();
};
struct J3DGXColor {
/* 8000E538 */ J3DGXColor();
};
struct J3DTevBlock {
/* 8000DBC8 */ void patchTexNoAndTexCoordScale();
/* 8000DBD4 */ void patch();
@@ -926,7 +927,7 @@ extern "C" extern void* __vt__8J3DModel[9];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 mCurrentMtx__6J3DSys[48];
extern "C" extern u8 mParentS__6J3DSys[12];
extern "C" extern f32 mParentS__6J3DSys[3];
extern "C" extern u8 sGDLObj__17J3DDisplayListObj[16];
extern "C" extern u32 __float_nan;
extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */];
@@ -3582,7 +3583,7 @@ SECTION_RODATA static u8 const fontdata_8224[18 + 2 /* padding */] = {
0x00,
0x00,
};
SECTION_DEAD void* const cg_803740C0 = (void*)(&fontdata_8224);
COMPILER_STRIP_GATE(803740C0, &fontdata_8224);
/* 80450C44-80450C48 000144 0004+00 3/3 0/0 0/0 .sbss mDoExt_font0 */
static u8 mDoExt_font0[4];
@@ -3629,7 +3630,7 @@ SECTION_RODATA static u8 const fontdata_8253[20] = {
0x72, 0x65, 0x69, 0x73, 0x68, 0x6F, 0x74, 0x61, 0x69, 0x5F,
0x32, 0x34, 0x5F, 0x32, 0x32, 0x2E, 0x62, 0x66, 0x6E, 0x00,
};
SECTION_DEAD void* const cg_803740D4 = (void*)(&fontdata_8253);
COMPILER_STRIP_GATE(803740D4, &fontdata_8253);
/* 80450C50-80450C54 000150 0004+00 2/2 0/0 0/0 .sbss mDoExt_font1 */
static u8 mDoExt_font1[4];
@@ -3666,7 +3667,7 @@ SECTION_RODATA static u8 const fontdata_8287[20] = {
0x72, 0x65, 0x69, 0x73, 0x68, 0x6F, 0x74, 0x61, 0x69, 0x5F,
0x32, 0x34, 0x5F, 0x32, 0x32, 0x2E, 0x62, 0x66, 0x6E, 0x00,
};
SECTION_DEAD void* const cg_803740E8 = (void*)(&fontdata_8287);
COMPILER_STRIP_GATE(803740E8, &fontdata_8287);
/* 80450C5C-80450C60 00015C 0004+00 3/3 0/0 0/0 .sbss mDoExt_font2 */
static u8 mDoExt_font2[4];
src/m_Do/m_Do_graphic.cpp
+2 -2
View File
@@ -54,10 +54,10 @@ struct dDlst_shadowControl_c {
/* 80055A14 */ void draw(f32 (*)[4]);
};
struct dDlst_base_c {};
struct J3DDrawBuffer {};
struct dDlst_base_c {};
struct dDlst_list_c {
/* 80056390 */ void init();
/* 80056538 */ void reset();
src/m_Do/m_Do_main.cpp
+1 -1
View File
@@ -435,7 +435,7 @@ static f32 console_position_y;
static u8 data_80450B28[4];
/* 80450B2C-80450B30 00002C 0004+00 1/1 0/0 0/0 .sbss console_scroll$3782 */
static u8 console_scroll[4];
static f32 console_scroll;
/* 80450B30-80450B34 000030 0004+00 1/1 0/0 0/0 .sbss None */
static u8 data_80450B30[4];
src/m_Do/m_Do_mtx.cpp
+4 -4
View File
@@ -11,10 +11,6 @@
// Types:
//
struct csXyz {};
struct Quaternion {};
struct Vec {};
struct cXyz {
@@ -24,6 +20,10 @@ struct cXyz {
/* 80266FDC */ void normalizeRS();
};
struct csXyz {};
struct Quaternion {};
struct mDoMtx_stack_c {
/* 8000CCC8 */ void push();
/* 8000CD14 */ void pop();
src/msg/scrn/d_msg_scrn_3select.cpp
+5 -5
View File
@@ -11,13 +11,13 @@
// Types:
//
struct JKRArchive {};
struct J2DPane {
/* 802F7100 */ void getBounds();
/* 802F7FCC */ void animationTransform();
};
struct JKRArchive {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
@@ -207,7 +207,7 @@ SECTION_RODATA static u8 const tag_name[288] = {
0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x31, 0x34, 0x73, 0x65, 0x6C, 0x5F, 0x70, 0x6F, 0x30, 0x32,
0x00, 0x63, 0x5F, 0x6B, 0x61, 0x68, 0x65, 0x6E, 0x63, 0x5F, 0x63, 0x75, 0x72, 0x73, 0x6F, 0x72,
};
SECTION_DEAD void* const cg_80399708 = (void*)(&tag_name);
COMPILER_STRIP_GATE(80399708, &tag_name);
/* 803C0C00-803C0C0C 01DD20 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
@@ -675,7 +675,7 @@ asm void dMsgScrn3Select_c::getTextBoxGlobalPosY(int param_0) {
SECTION_RODATA static u8 const lit_4497[12] = {
0x43, 0x4C, 0x00, 0x00, 0x43, 0x98, 0x00, 0x00, 0x43, 0xCA, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80399828 = (void*)(&lit_4497);
COMPILER_STRIP_GATE(80399828, &lit_4497);
/* 8023AA04-8023AAF4 235344 00F0+00 1/0 0/0 0/0 .text open1Proc__17dMsgScrn3Select_cFv */
#pragma push
@@ -692,7 +692,7 @@ asm void dMsgScrn3Select_c::open1Proc() {
SECTION_RODATA static u8 const lit_4520[12] = {
0x43, 0x4C, 0x00, 0x00, 0x43, 0x98, 0x00, 0x00, 0x43, 0xCA, 0x00, 0x00,
};
SECTION_DEAD void* const cg_80399834 = (void*)(&lit_4520);
COMPILER_STRIP_GATE(80399834, &lit_4520);
/* 8023AAF4-8023AC14 235434 0120+00 1/0 0/0 0/0 .text open2Proc__17dMsgScrn3Select_cFv */
#pragma push
src/msg/scrn/d_msg_scrn_explain.cpp
+6 -6
View File
@@ -69,15 +69,15 @@ struct dMsgScrn3Select_c {
/* 8023A97C */ void getCharSpace();
};
struct COutFont_c {
/* 80225C94 */ COutFont_c(u8);
};
struct J2DTextBox {
/* 80300658 */ void getStringPtr() const;
/* 8030074C */ void setString(s16, char const*, ...);
};
struct COutFont_c {
/* 80225C94 */ COutFont_c(u8);
};
struct JUTFont {};
struct dMsgObject_c {
@@ -96,10 +96,10 @@ struct Z2SpeechMgr2 {
/* 802CBF60 */ void setTextCount(s16);
};
struct JAISoundID {};
struct Vec {};
struct JAISoundID {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
src/msg/scrn/d_msg_scrn_item.cpp
+2 -2
View File
@@ -18,10 +18,10 @@ struct dMsgScrnLight_c {
struct JKRExpHeap {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmColor {};
struct J2DAnmTextureSRTKey {};
struct dMsgScrnItem_c {
/* 8023E79C */ dMsgScrnItem_c(u8, u8, JKRExpHeap*);
/* 8023F51C */ ~dMsgScrnItem_c();
src/msg/scrn/d_msg_scrn_kanban.cpp
+1 -1
View File
@@ -150,7 +150,7 @@ SECTION_RODATA static u8 const t_tag[24] = {
0x6D, 0x67, 0x5F, 0x65, 0x34, 0x6C, 0x69, 0x6E, 0x00, 0x00, 0x00, 0x00,
0x66, 0x34, 0x5F, 0x77, 0x00, 0x00, 0x00, 0x00, 0x74, 0x34, 0x5F, 0x73,
};
SECTION_DEAD void* const cg_80399AA0 = (void*)(&t_tag);
COMPILER_STRIP_GATE(80399AA0, &t_tag);
/* 803C1240-803C1298 01E360 0058+00 2/2 0/0 0/0 .data __vt__16dMsgScrnKanban_c */
SECTION_DATA extern void* __vt__16dMsgScrnKanban_c[22] = {
src/msg/scrn/d_msg_scrn_tree.cpp
+1 -1
View File
@@ -157,7 +157,7 @@ SECTION_RODATA static u8 const t_tag[24] = {
0x6D, 0x67, 0x5F, 0x65, 0x34, 0x6C, 0x69, 0x6E, 0x00, 0x00, 0x00, 0x00,
0x66, 0x34, 0x5F, 0x77, 0x00, 0x00, 0x00, 0x00, 0x74, 0x34, 0x5F, 0x73,
};
SECTION_DEAD void* const cg_80399C18 = (void*)(&t_tag);
COMPILER_STRIP_GATE(80399C18, &t_tag);
/* 803C1420-803C1478 01E540 0058+00 2/2 0/0 0/0 .data __vt__14dMsgScrnTree_c */
SECTION_DATA extern void* __vt__14dMsgScrnTree_c[22] = {