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

moved strings + decompile simple store functions

Browse Source
This commit is contained in:
Julgodis
2021-04-10 07:02:38 +02:00
parent 2661db6aaa
commit 0ad6ebe7b4
1299 changed files with 51830 additions and 43634 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/DynamicLink.cpp
+59 -52
View File
@@ -179,6 +179,52 @@ extern "C" void snprintf();
//
/* ############################################################################################## */
/* 8039A4A0-8039A4A0 026B00 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039A4A0 =
"%08x DynamicModuleControlBase::unlink() mLinkCou"
"nt id already zero.\n";
SECTION_DEAD static char const* const stringBase_8039A4E5 = "\nDynamicModuleControlBase::dump()\n";
SECTION_DEAD static char const* const stringBase_8039A508 = "Do Lnk Size Name\n";
SECTION_DEAD static char const* const stringBase_8039A520 = "(Null)";
SECTION_DEAD static char const* const stringBase_8039A527 = "%3d%3d%5.1f %05x %-4s %-24s ";
SECTION_DEAD static char const* const stringBase_8039A544 = "%3d%3d ???? ????? %-4s %-24s ";
SECTION_DEAD static char const* const stringBase_8039A562 = "\n";
SECTION_DEAD static char const* const stringBase_8039A564 = "TotalSize %6.2f %06x\n\n";
SECTION_DEAD static char const* const stringBase_8039A57B = "Base";
SECTION_DEAD static char const* const stringBase_8039A580 = "/rel/Final/Release";
SECTION_DEAD static char const* const stringBase_8039A593 = "RELS.arc";
SECTION_DEAD static char const* const stringBase_8039A59C =
"マウント失敗ですが単にアーカイブを作ってないだけなら遅いだけです %s\n";
SECTION_DEAD static char const* const stringBase_8039A5E1 = "%s.rel";
SECTION_DEAD static char const* const stringBase_8039A5E8 = "/rel/Final/Release/%s.rel";
// MWCC ignores mapping of some japanese characters using the
// byte 0x5C (ASCII '\'). This is why this string is hex-encoded.
SECTION_DEAD static char const* const stringBase_8039A602 =
"\x44\x79\x6E\x61\x6D\x69\x63\x4D\x6F\x64\x75\x6C\x65\x43\x6F\x6E\x74\x72\x6F\x6C\x3A\x3A\x64"
"\x6F\x5F\x6C\x6F\x61\x64\x28\x29\x20\x83\x8A\x83\x5C\x81\x5B\x83\x58\x93\xC7\x82\xDD\x8D\x9E"
"\x82\xDD"
"\x8E\xB8\x94\x73\x20\x5B\x25\x73\x5D\x0A";
SECTION_DEAD static char const* const stringBase_8039A63D =
"DynamicModuleControl::do_load() チェックサムエラー %04x %"
"04x[%s]\n";
SECTION_DEAD static char const* const stringBase_8039A67F =
"DynamicModuleControl::do_load_async() 非同期読み込みコール"
"バック登録失敗 [%s]\n";
SECTION_DEAD static char const* const stringBase_8039A6CE = "%08x-%08x %08x %08x";
SECTION_DEAD static char const* const stringBase_8039A6E2 = "BSSメモリ確保失敗\n";
SECTION_DEAD static char const* const stringBase_8039A6F5 = "リンク失敗\n";
SECTION_DEAD static char const* const stringBase_8039A701 = "モジュールリサイズ(縮小)失敗\n";
SECTION_DEAD static char const* const stringBase_8039A71F = "BSSメモリ確保失敗 [%x]\n";
SECTION_DEAD static char const* const stringBase_8039A737 =
"アンリンク失敗 mModule=%08x mBss=%08x\n";
SECTION_DEAD static char const* const stringBase_8039A75E = "????";
SECTION_DEAD static char const* const stringBase_8039A763 = "MEM";
SECTION_DEAD static char const* const stringBase_8039A767 = "ARAM";
SECTION_DEAD static char const* const stringBase_8039A76C = "DVD";
#pragma pop
/* 803C34B0-803C34C0 -00001 0010+00 1/1 0/0 0/0 .data strings$4165 */
SECTION_DATA static void* strings[4] = {
(void*)(((char*)&DynamicLink__stringBase0) + 0x2BE),
@@ -473,6 +519,18 @@ void ModuleEpilog() {
/* empty function */
}
/* ############################################################################################## */
/* 8039A4A0-8039A4A0 026B00 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039A770 =
"\nError: リンクされていない関数が呼び出されました.\n";
SECTION_DEAD static char const* const stringBase_8039A7A3 = "Address: Back Chain LR Save\n";
SECTION_DEAD static char const* const stringBase_8039A7C8 = "0x%08x: 0x%08x 0x%08x\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039A7E4 = "\0\0\0";
#pragma pop
/* 80263090-8026314C 25D9D0 00BC+00 0/0 0/0 757/757 .text ModuleUnresolved */
#pragma push
#pragma optimization_level 0
@@ -562,55 +620,4 @@ asm void DynamicModuleControl::getModuleName() const {
}
#pragma pop
/* 8039A4A0-8039A7E8 026B00 0344+04 11/10 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8039A4A0 =
"%08x DynamicModuleControlBase::unlink() mLinkCou"
"nt id already zero.\n";
SECTION_DEAD static char const* const stringBase_8039A4E5 = "\nDynamicModuleControlBase::dump()\n";
SECTION_DEAD static char const* const stringBase_8039A508 = "Do Lnk Size Name\n";
SECTION_DEAD static char const* const stringBase_8039A520 = "(Null)";
SECTION_DEAD static char const* const stringBase_8039A527 = "%3d%3d%5.1f %05x %-4s %-24s ";
SECTION_DEAD static char const* const stringBase_8039A544 = "%3d%3d ???? ????? %-4s %-24s ";
SECTION_DEAD static char const* const stringBase_8039A562 = "\n";
SECTION_DEAD static char const* const stringBase_8039A564 = "TotalSize %6.2f %06x\n\n";
SECTION_DEAD static char const* const stringBase_8039A57B = "Base";
SECTION_DEAD static char const* const stringBase_8039A580 = "/rel/Final/Release";
SECTION_DEAD static char const* const stringBase_8039A593 = "RELS.arc";
SECTION_DEAD static char const* const stringBase_8039A59C =
"マウント失敗ですが単にアーカイブを作ってないだけなら遅いだけです %s\n";
SECTION_DEAD static char const* const stringBase_8039A5E1 = "%s.rel";
SECTION_DEAD static char const* const stringBase_8039A5E8 = "/rel/Final/Release/%s.rel";
// MWCC ignores mapping of some japanese characters using the
// byte 0x5C (ASCII '\'). This is why this string is hex-encoded.
SECTION_DEAD static char const* const stringBase_8039A602 =
"\x44\x79\x6E\x61\x6D\x69\x63\x4D\x6F\x64\x75\x6C\x65\x43\x6F\x6E\x74\x72\x6F\x6C\x3A\x3A\x64"
"\x6F\x5F\x6C\x6F\x61\x64\x28\x29\x20\x83\x8A\x83\x5C\x81\x5B\x83\x58\x93\xC7\x82\xDD\x8D\x9E"
"\x82\xDD"
"\x8E\xB8\x94\x73\x20\x5B\x25\x73\x5D\x0A";
SECTION_DEAD static char const* const stringBase_8039A63D =
"DynamicModuleControl::do_load() チェックサムエラー %04x %"
"04x[%s]\n";
SECTION_DEAD static char const* const stringBase_8039A67F =
"DynamicModuleControl::do_load_async() 非同期読み込みコール"
"バック登録失敗 [%s]\n";
SECTION_DEAD static char const* const stringBase_8039A6CE = "%08x-%08x %08x %08x";
SECTION_DEAD static char const* const stringBase_8039A6E2 = "BSSメモリ確保失敗\n";
SECTION_DEAD static char const* const stringBase_8039A6F5 = "リンク失敗\n";
SECTION_DEAD static char const* const stringBase_8039A701 = "モジュールリサイズ(縮小)失敗\n";
SECTION_DEAD static char const* const stringBase_8039A71F = "BSSメモリ確保失敗 [%x]\n";
SECTION_DEAD static char const* const stringBase_8039A737 =
"アンリンク失敗 mModule=%08x mBss=%08x\n";
SECTION_DEAD static char const* const stringBase_8039A75E = "????";
SECTION_DEAD static char const* const stringBase_8039A763 = "MEM";
SECTION_DEAD static char const* const stringBase_8039A767 = "ARAM";
SECTION_DEAD static char const* const stringBase_8039A76C = "DVD";
SECTION_DEAD static char const* const stringBase_8039A770 =
"\nError: リンクされていない関数が呼び出されました.\n";
SECTION_DEAD static char const* const stringBase_8039A7A3 = "Address: Back Chain LR Save\n";
SECTION_DEAD static char const* const stringBase_8039A7C8 = "0x%08x: 0x%08x 0x%08x\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039A7E4 = "\0\0\0";
#pragma pop
/* 8039A4A0-8039A4A0 026B00 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/a/npc/d_a_npc_cd.cpp
+318 -119
View File
@@ -24,13 +24,13 @@ struct mDoHIO_entry_c {
/* 8015791C */ ~mDoHIO_entry_c();
};
struct J3DAnmTransform {};
struct mDoExt_McaMorfCallBack2_c {};
struct mDoExt_McaMorfCallBack1_c {};
struct J3DModelData {};
struct J3DAnmTransform {};
struct mDoExt_McaMorfCallBack2_c {};
struct J3DModelData {};
struct Z2Creature {};
@@ -52,12 +52,12 @@ struct daPy_py_c {
/* 8015F424 */ void checkNowWolfEyeUp();
};
struct J3DAnmTransformKey {};
struct J3DModel {};
struct J3DJoint {};
struct J3DAnmTransformKey {};
struct daNpcCd_c {
/* 8015605C */ void NpcCreate(int);
/* 801561E8 */ void ObjCreate(int);
@@ -114,10 +114,10 @@ struct dRes_control_c {
struct dPa_levelEcallBack {};
struct _GXColor {};
struct csXyz {};
struct _GXColor {};
struct dPa_control_c {
struct level_c {
/* 8004B918 */ void getEmitter(u32);
@@ -209,7 +209,7 @@ extern "C" void
set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf();
extern "C" void GetPolyColor__4dBgSFRC13cBgS_PolyInfo();
extern "C" void GetRoomId__4dBgSFRC13cBgS_PolyInfo();
extern "C" void func_8014D348(int*);
extern "C" void func_8014D348(void* _this, int*);
extern "C" void checkNowWolfEyeUp__9daPy_py_cFv();
extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
@@ -253,6 +253,204 @@ static asm void jntNodeCallBack(J3DJoint* param_0, int param_1) {
#pragma pop
/* ############################################################################################## */
/* 80392FE8-80392FF0 01F648 0008+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80392FE8;
/* 80392FF0-80392FFA 01F650 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80392FF0;
/* 80392FFA-80393004 01F65A 000A+00 17/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80392FFA;
/* 80393004-8039300E 01F664 000A+00 17/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393004;
/* 8039300E-80393017 01F66E 0009+00 31/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_8039300E;
/* 80393017-80393021 01F677 000A+00 31/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393017;
/* 80393021-80393029 01F681 0008+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393021;
/* 80393029-80393033 01F689 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393029;
/* 80393033-8039303B 01F693 0008+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393033;
/* 8039303B-80393045 01F69B 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_8039303B;
/* 80393045-8039304D 01F6A5 0008+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393045;
/* 8039304D-80393057 01F6AD 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_8039304D;
/* 80393057-8039305F 01F6B7 0008+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393057;
/* 8039305F-80393069 01F6BF 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_8039305F;
/* 80393069-80393071 01F6C9 0008+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393069;
/* 80393071-8039307B 01F6D1 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393071;
/* 8039307B-80393083 01F6DB 0008+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_8039307B;
/* 80393083-8039308D 01F6E3 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393083;
/* 8039308D-80393095 01F6ED 0008+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_8039308D;
/* 80393095-8039309F 01F6F5 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393095;
/* 8039309F-803930A8 01F6FF 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_8039309F;
/* 803930A8-803930B2 01F708 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803930A8;
/* 803930B2-803930BB 01F712 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803930B2;
/* 803930BB-803930C5 01F71B 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803930BB;
/* 803930C5-803930CE 01F725 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803930C5;
/* 803930CE-803930D8 01F72E 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803930CE;
/* 803930D8-803930E1 01F738 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803930D8;
/* 803930E1-803930EB 01F741 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803930E1;
/* 803930EB-803930F4 01F74B 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803930EB;
/* 803930F4-803930FE 01F754 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803930F4;
/* 803930FE-80393107 01F75E 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803930FE;
/* 80393107-80393111 01F767 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393107;
/* 80393111-8039311A 01F771 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393111;
/* 8039311A-80393124 01F77A 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_8039311A;
/* 80393124-8039312D 01F784 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393124;
/* 8039312D-80393137 01F78D 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_8039312D;
/* 80393137-8039313F 01F797 0008+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393137;
/* 8039313F-80393149 01F79F 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_8039313F;
/* 80393149-80393153 01F7A9 000A+00 15/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393149;
/* 80393153-8039315D 01F7B3 000A+00 15/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393153;
/* 8039315D-80393165 01F7BD 0008+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_8039315D;
/* 80393165-8039316F 01F7C5 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393165;
/* 8039316F-80393177 01F7CF 0008+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_8039316F;
/* 80393177-80393181 01F7D7 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393177;
/* 80393181-80393189 01F7E1 0008+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393181;
/* 80393189-80393193 01F7E9 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393189;
/* 80393193-8039319B 01F7F3 0008+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393193;
/* 8039319B-803931A5 01F7FB 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_8039319B;
/* 803931A5-803931AD 01F805 0008+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803931A5;
/* 803931AD-803931B7 01F80D 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803931AD;
/* 803931B7-803931BF 01F817 0008+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803931B7;
/* 803931BF-803931C9 01F81F 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803931BF;
/* 803931C9-803931D2 01F829 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803931C9;
/* 803931D2-803931DC 01F832 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803931D2;
/* 803931DC-803931E5 01F83C 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803931DC;
/* 803931E5-803931EF 01F845 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803931E5;
/* 803931EF-803931F8 01F84F 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803931EF;
/* 803931F8-80393202 01F858 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803931F8;
/* 80393202-8039320B 01F862 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393202;
/* 8039320B-80393215 01F86B 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_8039320B;
/* 80393215-8039321E 01F875 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393215;
/* 8039321E-80393228 01F87E 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_8039321E;
/* 80393228-80393231 01F888 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393228;
/* 80393231-8039323B 01F891 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393231;
/* 8039323B-80393244 01F89B 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_8039323B;
/* 80393244-80393250 01F8A4 000A+02 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393244;
/* 80392A18-80392A30 -00001 0018+00 2/1 0/0 0/0 .rodata l_resMANa */
SECTION_RODATA static void* const l_resMANa[6] = {
(void*)&a_npc_d_a_npc_cd__stringBase0,
@@ -262,7 +460,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),
};
COMPILER_STRIP_GATE(80392A18, &l_resMANa);
COMPILER_STRIP_GATE(0x80392A18, &l_resMANa);
/* 80392A30-80392A48 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMADa */
SECTION_RODATA static void* const l_resMADa[6] = {
@@ -273,7 +471,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),
};
COMPILER_STRIP_GATE(80392A30, &l_resMADa);
COMPILER_STRIP_GATE(0x80392A30, &l_resMADa);
/* 80392A48-80392A60 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMCNa */
SECTION_RODATA static void* const l_resMCNa[6] = {
@@ -284,7 +482,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),
};
COMPILER_STRIP_GATE(80392A48, &l_resMCNa);
COMPILER_STRIP_GATE(0x80392A48, &l_resMCNa);
/* 80392A60-80392A78 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMONa */
SECTION_RODATA static void* const l_resMONa[6] = {
@@ -295,7 +493,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),
};
COMPILER_STRIP_GATE(80392A60, &l_resMONa);
COMPILER_STRIP_GATE(0x80392A60, &l_resMONa);
/* 80392A78-80392A90 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANb */
SECTION_RODATA static void* const l_resMANb[6] = {
@@ -306,7 +504,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),
};
COMPILER_STRIP_GATE(80392A78, &l_resMANb);
COMPILER_STRIP_GATE(0x80392A78, &l_resMANb);
/* 80392A90-80392AA8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANc */
SECTION_RODATA static void* const l_resMANc[6] = {
@@ -317,7 +515,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),
};
COMPILER_STRIP_GATE(80392A90, &l_resMANc);
COMPILER_STRIP_GATE(0x80392A90, &l_resMANc);
/* 80392AA8-80392AC0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMASa */
SECTION_RODATA static void* const l_resMASa[6] = {
@@ -328,7 +526,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),
};
COMPILER_STRIP_GATE(80392AA8, &l_resMASa);
COMPILER_STRIP_GATE(0x80392AA8, &l_resMASa);
/* 80392AC0-80392AD8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMBNa */
SECTION_RODATA static void* const l_resMBNa[6] = {
@@ -339,7 +537,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),
};
COMPILER_STRIP_GATE(80392AC0, &l_resMBNa);
COMPILER_STRIP_GATE(0x80392AC0, &l_resMBNa);
/* 80392AD8-80392AF0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANa2 */
SECTION_RODATA static void* const l_resMANa2[6] = {
@@ -350,7 +548,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),
};
COMPILER_STRIP_GATE(80392AD8, &l_resMANa2);
COMPILER_STRIP_GATE(0x80392AD8, &l_resMANa2);
/* 80392AF0-80392B08 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMADa2 */
SECTION_RODATA static void* const l_resMADa2[6] = {
@@ -361,7 +559,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),
};
COMPILER_STRIP_GATE(80392AF0, &l_resMADa2);
COMPILER_STRIP_GATE(0x80392AF0, &l_resMADa2);
/* 80392B08-80392B20 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMCNa2 */
SECTION_RODATA static void* const l_resMCNa2[6] = {
@@ -372,7 +570,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),
};
COMPILER_STRIP_GATE(80392B08, &l_resMCNa2);
COMPILER_STRIP_GATE(0x80392B08, &l_resMCNa2);
/* 80392B20-80392B38 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMONa2 */
SECTION_RODATA static void* const l_resMONa2[6] = {
@@ -383,7 +581,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),
};
COMPILER_STRIP_GATE(80392B20, &l_resMONa2);
COMPILER_STRIP_GATE(0x80392B20, &l_resMONa2);
/* 80392B38-80392B50 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANb2 */
SECTION_RODATA static void* const l_resMANb2[6] = {
@@ -394,7 +592,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),
};
COMPILER_STRIP_GATE(80392B38, &l_resMANb2);
COMPILER_STRIP_GATE(0x80392B38, &l_resMANb2);
/* 80392B50-80392B68 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANc2 */
SECTION_RODATA static void* const l_resMANc2[6] = {
@@ -405,7 +603,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),
};
COMPILER_STRIP_GATE(80392B50, &l_resMANc2);
COMPILER_STRIP_GATE(0x80392B50, &l_resMANc2);
/* 80392B68-80392B80 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMASa2 */
SECTION_RODATA static void* const l_resMASa2[6] = {
@@ -416,7 +614,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),
};
COMPILER_STRIP_GATE(80392B68, &l_resMASa2);
COMPILER_STRIP_GATE(0x80392B68, &l_resMASa2);
/* 80392B80-80392B98 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMBNa2 */
SECTION_RODATA static void* const l_resMBNa2[6] = {
@@ -427,7 +625,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),
};
COMPILER_STRIP_GATE(80392B80, &l_resMBNa2);
COMPILER_STRIP_GATE(0x80392B80, &l_resMBNa2);
/* 80392B98-80392BB0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANa */
SECTION_RODATA static void* const l_resWANa[6] = {
@@ -438,7 +636,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),
};
COMPILER_STRIP_GATE(80392B98, &l_resWANa);
COMPILER_STRIP_GATE(0x80392B98, &l_resWANa);
/* 80392BB0-80392BC8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWADa */
SECTION_RODATA static void* const l_resWADa[6] = {
@@ -449,7 +647,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),
};
COMPILER_STRIP_GATE(80392BB0, &l_resWADa);
COMPILER_STRIP_GATE(0x80392BB0, &l_resWADa);
/* 80392BC8-80392BE0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMATa */
SECTION_RODATA static void* const l_resMATa[6] = {
@@ -460,7 +658,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),
};
COMPILER_STRIP_GATE(80392BC8, &l_resMATa);
COMPILER_STRIP_GATE(0x80392BC8, &l_resMATa);
/* 80392BE0-80392BF8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWCNa */
SECTION_RODATA static void* const l_resWCNa[6] = {
@@ -471,7 +669,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),
};
COMPILER_STRIP_GATE(80392BE0, &l_resWCNa);
COMPILER_STRIP_GATE(0x80392BE0, &l_resWCNa);
/* 80392BF8-80392C10 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWONa */
SECTION_RODATA static void* const l_resWONa[6] = {
@@ -482,7 +680,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),
};
COMPILER_STRIP_GATE(80392BF8, &l_resWONa);
COMPILER_STRIP_GATE(0x80392BF8, &l_resWONa);
/* 80392C10-80392C28 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWGNa */
SECTION_RODATA static void* const l_resWGNa[6] = {
@@ -493,7 +691,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),
};
COMPILER_STRIP_GATE(80392C10, &l_resWGNa);
COMPILER_STRIP_GATE(0x80392C10, &l_resWGNa);
/* 80392C28-80392C40 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANb */
SECTION_RODATA static void* const l_resWANb[6] = {
@@ -504,7 +702,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),
};
COMPILER_STRIP_GATE(80392C28, &l_resWANb);
COMPILER_STRIP_GATE(0x80392C28, &l_resWANb);
/* 80392C40-80392C58 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANa2 */
SECTION_RODATA static void* const l_resWANa2[6] = {
@@ -515,7 +713,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),
};
COMPILER_STRIP_GATE(80392C40, &l_resWANa2);
COMPILER_STRIP_GATE(0x80392C40, &l_resWANa2);
/* 80392C58-80392C70 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWADa2 */
SECTION_RODATA static void* const l_resWADa2[6] = {
@@ -526,7 +724,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),
};
COMPILER_STRIP_GATE(80392C58, &l_resWADa2);
COMPILER_STRIP_GATE(0x80392C58, &l_resWADa2);
/* 80392C70-80392C88 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMATa2 */
SECTION_RODATA static void* const l_resMATa2[6] = {
@@ -537,7 +735,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),
};
COMPILER_STRIP_GATE(80392C70, &l_resMATa2);
COMPILER_STRIP_GATE(0x80392C70, &l_resMATa2);
/* 80392C88-80392CA0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWCNa2 */
SECTION_RODATA static void* const l_resWCNa2[6] = {
@@ -548,7 +746,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),
};
COMPILER_STRIP_GATE(80392C88, &l_resWCNa2);
COMPILER_STRIP_GATE(0x80392C88, &l_resWCNa2);
/* 80392CA0-80392CB8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWONa2 */
SECTION_RODATA static void* const l_resWONa2[6] = {
@@ -559,7 +757,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),
};
COMPILER_STRIP_GATE(80392CA0, &l_resWONa2);
COMPILER_STRIP_GATE(0x80392CA0, &l_resWONa2);
/* 80392CB8-80392CD0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWGNa2 */
SECTION_RODATA static void* const l_resWGNa2[6] = {
@@ -570,7 +768,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),
};
COMPILER_STRIP_GATE(80392CB8, &l_resWGNa2);
COMPILER_STRIP_GATE(0x80392CB8, &l_resWGNa2);
/* 80392CD0-80392CE8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANb2 */
SECTION_RODATA static void* const l_resWANb2[6] = {
@@ -581,7 +779,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),
};
COMPILER_STRIP_GATE(80392CD0, &l_resWANb2);
COMPILER_STRIP_GATE(0x80392CD0, &l_resWANb2);
/* 80392CE8-80392D30 -00001 0048+00 1/1 0/0 0/0 .rodata l_objTbl */
SECTION_RODATA static void* const l_objTbl[18] = {
@@ -595,7 +793,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,
};
COMPILER_STRIP_GATE(80392CE8, &l_objTbl);
COMPILER_STRIP_GATE(0x80392CE8, &l_objTbl);
/* 80392D30-80392D78 -00001 0048+00 1/1 0/0 0/0 .rodata l_objTWTbl */
SECTION_RODATA static void* const l_objTWTbl[18] = {
@@ -609,7 +807,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,
};
COMPILER_STRIP_GATE(80392D30, &l_objTWTbl);
COMPILER_STRIP_GATE(0x80392D30, &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] = {
@@ -624,7 +822,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,
};
COMPILER_STRIP_GATE(80392D78, &l_bckTbl_M);
COMPILER_STRIP_GATE(0x80392D78, &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] = {
@@ -639,7 +837,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,
};
COMPILER_STRIP_GATE(80392DC8, &l_bckTbl_W);
COMPILER_STRIP_GATE(0x80392DC8, &l_bckTbl_W);
/* 80392E18-80392E5C 01F478 0044+00 0/0 0/0 1/1 .rodata m_cylDat__9daNpcCd_c */
SECTION_RODATA u8 const daNpcCd_c::m_cylDat[68] = {
@@ -649,7 +847,7 @@ SECTION_RODATA u8 const daNpcCd_c::m_cylDat[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,
};
COMPILER_STRIP_GATE(80392E18, &daNpcCd_c::m_cylDat);
COMPILER_STRIP_GATE(0x80392E18, &daNpcCd_c::m_cylDat);
/* 80392E5C-80392FC4 01F4BC 0168+00 1/1 0/0 0/0 .rodata a_transScaleTbl$3984 */
SECTION_RODATA static u8 const a_transScaleTbl[360] = {
@@ -677,7 +875,80 @@ 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,
};
COMPILER_STRIP_GATE(80392E5C, &a_transScaleTbl);
COMPILER_STRIP_GATE(0x80392E5C, &a_transScaleTbl);
/* 80392FE8-80392FE8 01F648 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80392FE8 = "MAN_a_L";
SECTION_DEAD static char const* const stringBase_80392FF0 = "MAN_a_LTW";
SECTION_DEAD static char const* const stringBase_80392FFA = "Mgenral_l";
SECTION_DEAD static char const* const stringBase_80393004 = "Mspcial_l";
SECTION_DEAD static char const* const stringBase_8039300E = "object_l";
SECTION_DEAD static char const* const stringBase_80393017 = "objectLTW";
SECTION_DEAD static char const* const stringBase_80393021 = "MAD_a_L";
SECTION_DEAD static char const* const stringBase_80393029 = "MAD_a_LTW";
SECTION_DEAD static char const* const stringBase_80393033 = "MCN_a_L";
SECTION_DEAD static char const* const stringBase_8039303B = "MCN_a_LTW";
SECTION_DEAD static char const* const stringBase_80393045 = "MON_a_L";
SECTION_DEAD static char const* const stringBase_8039304D = "MON_a_LTW";
SECTION_DEAD static char const* const stringBase_80393057 = "MAN_b_L";
SECTION_DEAD static char const* const stringBase_8039305F = "MAN_b_LTW";
SECTION_DEAD static char const* const stringBase_80393069 = "MAN_c_L";
SECTION_DEAD static char const* const stringBase_80393071 = "MAN_c_LTW";
SECTION_DEAD static char const* const stringBase_8039307B = "MAS_a_L";
SECTION_DEAD static char const* const stringBase_80393083 = "MAS_a_LTW";
SECTION_DEAD static char const* const stringBase_8039308D = "MBN_a_L";
SECTION_DEAD static char const* const stringBase_80393095 = "MBN_a_LTW";
SECTION_DEAD static char const* const stringBase_8039309F = "MAN_a2_L";
SECTION_DEAD static char const* const stringBase_803930A8 = "MAN_a2LTW";
SECTION_DEAD static char const* const stringBase_803930B2 = "MAD_a2_L";
SECTION_DEAD static char const* const stringBase_803930BB = "MAD_a2LTW";
SECTION_DEAD static char const* const stringBase_803930C5 = "MCN_a2_L";
SECTION_DEAD static char const* const stringBase_803930CE = "MCN_a2LTW";
SECTION_DEAD static char const* const stringBase_803930D8 = "MON_a2_L";
SECTION_DEAD static char const* const stringBase_803930E1 = "MON_a2LTW";
SECTION_DEAD static char const* const stringBase_803930EB = "MAN_b2_L";
SECTION_DEAD static char const* const stringBase_803930F4 = "MAN_b2LTW";
SECTION_DEAD static char const* const stringBase_803930FE = "MAN_c2_L";
SECTION_DEAD static char const* const stringBase_80393107 = "MAN_c2LTW";
SECTION_DEAD static char const* const stringBase_80393111 = "MAS_a2_L";
SECTION_DEAD static char const* const stringBase_8039311A = "MAS_a2LTW";
SECTION_DEAD static char const* const stringBase_80393124 = "MBN_a2_L";
SECTION_DEAD static char const* const stringBase_8039312D = "MBN_a2LTW";
SECTION_DEAD static char const* const stringBase_80393137 = "WAN_a_L";
SECTION_DEAD static char const* const stringBase_8039313F = "WAN_a_LTW";
SECTION_DEAD static char const* const stringBase_80393149 = "Wgenral_l";
SECTION_DEAD static char const* const stringBase_80393153 = "Wspcial_l";
SECTION_DEAD static char const* const stringBase_8039315D = "WAD_a_L";
SECTION_DEAD static char const* const stringBase_80393165 = "WAD_a_LTW";
SECTION_DEAD static char const* const stringBase_8039316F = "MAT_a_L";
SECTION_DEAD static char const* const stringBase_80393177 = "MAT_a_LTW";
SECTION_DEAD static char const* const stringBase_80393181 = "WCN_a_L";
SECTION_DEAD static char const* const stringBase_80393189 = "WCN_a_LTW";
SECTION_DEAD static char const* const stringBase_80393193 = "WON_a_L";
SECTION_DEAD static char const* const stringBase_8039319B = "WON_a_LTW";
SECTION_DEAD static char const* const stringBase_803931A5 = "WGN_a_L";
SECTION_DEAD static char const* const stringBase_803931AD = "WGN_a_LTW";
SECTION_DEAD static char const* const stringBase_803931B7 = "WAN_b_L";
SECTION_DEAD static char const* const stringBase_803931BF = "WAN_b_LTW";
SECTION_DEAD static char const* const stringBase_803931C9 = "WAN_a2_L";
SECTION_DEAD static char const* const stringBase_803931D2 = "WAN_a2LTW";
SECTION_DEAD static char const* const stringBase_803931DC = "WAD_a2_L";
SECTION_DEAD static char const* const stringBase_803931E5 = "WAD_a2LTW";
SECTION_DEAD static char const* const stringBase_803931EF = "MAT_a2_L";
SECTION_DEAD static char const* const stringBase_803931F8 = "MAT_a2LTW";
SECTION_DEAD static char const* const stringBase_80393202 = "WCN_a2_L";
SECTION_DEAD static char const* const stringBase_8039320B = "WCN_a2LTW";
SECTION_DEAD static char const* const stringBase_80393215 = "WON_a2_L";
SECTION_DEAD static char const* const stringBase_8039321E = "WON_a2LTW";
SECTION_DEAD static char const* const stringBase_80393228 = "WGN_a2_L";
SECTION_DEAD static char const* const stringBase_80393231 = "WGN_a2LTW";
SECTION_DEAD static char const* const stringBase_8039323B = "WAN_b2_L";
SECTION_DEAD static char const* const stringBase_80393244 = "WAN_b2LTW";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039324E = "\0";
#pragma pop
/* 804534B8-804534BC 001AB8 0004+00 2/2 0/0 0/0 .sdata2 @4021 */
SECTION_SDATA2 static f32 lit_4021 = 1.0f;
@@ -1031,7 +1302,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,
};
COMPILER_STRIP_GATE(80392FC4, &a_jntNumTbl);
COMPILER_STRIP_GATE(0x80392FC4, &a_jntNumTbl);
/* 80156E8C-80156F74 1517CC 00E8+00 0/0 0/0 1/1 .text drawObj__9daNpcCd_cFiP8J3DModelf */
#pragma push
@@ -1879,79 +2150,7 @@ asm void __sinit_d_a_npc_cd_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_80157A10 = (void*)__sinit_d_a_npc_cd_cpp;
REGISTER_CTORS(0x80157A10, __sinit_d_a_npc_cd_cpp);
#pragma pop
/* 80392FE8-80393250 01F648 0266+02 34/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80392FE8 = "MAN_a_L";
SECTION_DEAD static char const* const stringBase_80392FF0 = "MAN_a_LTW";
SECTION_DEAD static char const* const stringBase_80392FFA = "Mgenral_l";
SECTION_DEAD static char const* const stringBase_80393004 = "Mspcial_l";
SECTION_DEAD static char const* const stringBase_8039300E = "object_l";
SECTION_DEAD static char const* const stringBase_80393017 = "objectLTW";
SECTION_DEAD static char const* const stringBase_80393021 = "MAD_a_L";
SECTION_DEAD static char const* const stringBase_80393029 = "MAD_a_LTW";
SECTION_DEAD static char const* const stringBase_80393033 = "MCN_a_L";
SECTION_DEAD static char const* const stringBase_8039303B = "MCN_a_LTW";
SECTION_DEAD static char const* const stringBase_80393045 = "MON_a_L";
SECTION_DEAD static char const* const stringBase_8039304D = "MON_a_LTW";
SECTION_DEAD static char const* const stringBase_80393057 = "MAN_b_L";
SECTION_DEAD static char const* const stringBase_8039305F = "MAN_b_LTW";
SECTION_DEAD static char const* const stringBase_80393069 = "MAN_c_L";
SECTION_DEAD static char const* const stringBase_80393071 = "MAN_c_LTW";
SECTION_DEAD static char const* const stringBase_8039307B = "MAS_a_L";
SECTION_DEAD static char const* const stringBase_80393083 = "MAS_a_LTW";
SECTION_DEAD static char const* const stringBase_8039308D = "MBN_a_L";
SECTION_DEAD static char const* const stringBase_80393095 = "MBN_a_LTW";
SECTION_DEAD static char const* const stringBase_8039309F = "MAN_a2_L";
SECTION_DEAD static char const* const stringBase_803930A8 = "MAN_a2LTW";
SECTION_DEAD static char const* const stringBase_803930B2 = "MAD_a2_L";
SECTION_DEAD static char const* const stringBase_803930BB = "MAD_a2LTW";
SECTION_DEAD static char const* const stringBase_803930C5 = "MCN_a2_L";
SECTION_DEAD static char const* const stringBase_803930CE = "MCN_a2LTW";
SECTION_DEAD static char const* const stringBase_803930D8 = "MON_a2_L";
SECTION_DEAD static char const* const stringBase_803930E1 = "MON_a2LTW";
SECTION_DEAD static char const* const stringBase_803930EB = "MAN_b2_L";
SECTION_DEAD static char const* const stringBase_803930F4 = "MAN_b2LTW";
SECTION_DEAD static char const* const stringBase_803930FE = "MAN_c2_L";
SECTION_DEAD static char const* const stringBase_80393107 = "MAN_c2LTW";
SECTION_DEAD static char const* const stringBase_80393111 = "MAS_a2_L";
SECTION_DEAD static char const* const stringBase_8039311A = "MAS_a2LTW";
SECTION_DEAD static char const* const stringBase_80393124 = "MBN_a2_L";
SECTION_DEAD static char const* const stringBase_8039312D = "MBN_a2LTW";
SECTION_DEAD static char const* const stringBase_80393137 = "WAN_a_L";
SECTION_DEAD static char const* const stringBase_8039313F = "WAN_a_LTW";
SECTION_DEAD static char const* const stringBase_80393149 = "Wgenral_l";
SECTION_DEAD static char const* const stringBase_80393153 = "Wspcial_l";
SECTION_DEAD static char const* const stringBase_8039315D = "WAD_a_L";
SECTION_DEAD static char const* const stringBase_80393165 = "WAD_a_LTW";
SECTION_DEAD static char const* const stringBase_8039316F = "MAT_a_L";
SECTION_DEAD static char const* const stringBase_80393177 = "MAT_a_LTW";
SECTION_DEAD static char const* const stringBase_80393181 = "WCN_a_L";
SECTION_DEAD static char const* const stringBase_80393189 = "WCN_a_LTW";
SECTION_DEAD static char const* const stringBase_80393193 = "WON_a_L";
SECTION_DEAD static char const* const stringBase_8039319B = "WON_a_LTW";
SECTION_DEAD static char const* const stringBase_803931A5 = "WGN_a_L";
SECTION_DEAD static char const* const stringBase_803931AD = "WGN_a_LTW";
SECTION_DEAD static char const* const stringBase_803931B7 = "WAN_b_L";
SECTION_DEAD static char const* const stringBase_803931BF = "WAN_b_LTW";
SECTION_DEAD static char const* const stringBase_803931C9 = "WAN_a2_L";
SECTION_DEAD static char const* const stringBase_803931D2 = "WAN_a2LTW";
SECTION_DEAD static char const* const stringBase_803931DC = "WAD_a2_L";
SECTION_DEAD static char const* const stringBase_803931E5 = "WAD_a2LTW";
SECTION_DEAD static char const* const stringBase_803931EF = "MAT_a2_L";
SECTION_DEAD static char const* const stringBase_803931F8 = "MAT_a2LTW";
SECTION_DEAD static char const* const stringBase_80393202 = "WCN_a2_L";
SECTION_DEAD static char const* const stringBase_8039320B = "WCN_a2LTW";
SECTION_DEAD static char const* const stringBase_80393215 = "WON_a2_L";
SECTION_DEAD static char const* const stringBase_8039321E = "WON_a2LTW";
SECTION_DEAD static char const* const stringBase_80393228 = "WGN_a2_L";
SECTION_DEAD static char const* const stringBase_80393231 = "WGN_a2LTW";
SECTION_DEAD static char const* const stringBase_8039323B = "WAN_b2_L";
SECTION_DEAD static char const* const stringBase_80393244 = "WAN_b2LTW";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039324E = "\0";
#pragma pop
/* 80392FE8-80392FE8 01F648 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/a/npc/d_a_npc_cd2.cpp
+318 -119
View File
@@ -41,13 +41,13 @@ struct mDoExt_btpAnm {
/* 8000D5E8 */ void entry(J3DMaterialTable*, s16);
};
struct J3DAnmTransform {};
struct mDoExt_McaMorfCallBack2_c {};
struct mDoExt_McaMorfCallBack1_c {};
struct J3DModelData {};
struct J3DAnmTransform {};
struct mDoExt_McaMorfCallBack2_c {};
struct J3DModelData {};
struct Z2Creature {};
@@ -67,12 +67,12 @@ struct daPy_py_c {
/* 8015F424 */ void checkNowWolfEyeUp();
};
struct J3DAnmTransformKey {};
struct J3DModel {};
struct J3DJoint {};
struct J3DAnmTransformKey {};
struct daNpcCd2_c {
/* 80157D00 */ void NpcCreate(int);
/* 80157F28 */ void ObjCreate(int);
@@ -284,8 +284,8 @@ extern "C" void dPath_GetPnt__FPC5dPathi();
extern "C" void dPath_GetRoomPath__Fii();
extern "C" void GetPolyColor__4dBgSFRC13cBgS_PolyInfo();
extern "C" void GetRoomId__4dBgSFRC13cBgS_PolyInfo();
extern "C" void func_8014D348(int*);
extern "C" void func_8014D364(int, int);
extern "C" void func_8014D348(void* _this, int*);
extern "C" void func_8014D364(void* _this, int, int);
extern "C" void checkNowWolfEyeUp__9daPy_py_cFv();
extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
@@ -346,6 +346,204 @@ static asm void jntNodeCallBack(J3DJoint* param_0, int param_1) {
#pragma pop
/* ############################################################################################## */
/* 80393B70-80393B76 0201D0 0006+00 2/1 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393B70;
/* 80393B76-80393B7F 0201D6 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393B76;
/* 80393B7F-80393B88 0201DF 0009+00 17/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393B7F;
/* 80393B88-80393B91 0201E8 0009+00 17/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393B88;
/* 80393B91-80393B98 0201F1 0007+00 31/1 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393B91;
/* 80393B98-80393BA1 0201F8 0009+00 31/1 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393B98;
/* 80393BA1-80393BA7 020201 0006+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393BA1;
/* 80393BA7-80393BB0 020207 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393BA7;
/* 80393BB0-80393BB6 020210 0006+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393BB0;
/* 80393BB6-80393BBF 020216 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393BB6;
/* 80393BBF-80393BC5 02021F 0006+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393BBF;
/* 80393BC5-80393BCE 020225 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393BC5;
/* 80393BCE-80393BD4 02022E 0006+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393BCE;
/* 80393BD4-80393BDD 020234 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393BD4;
/* 80393BDD-80393BE3 02023D 0006+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393BDD;
/* 80393BE3-80393BEC 020243 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393BE3;
/* 80393BEC-80393BF2 02024C 0006+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393BEC;
/* 80393BF2-80393BFB 020252 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393BF2;
/* 80393BFB-80393C01 02025B 0006+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393BFB;
/* 80393C01-80393C0A 020261 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393C01;
/* 80393C0A-80393C11 02026A 0007+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393C0A;
/* 80393C11-80393C1B 020271 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393C11;
/* 80393C1B-80393C22 02027B 0007+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393C1B;
/* 80393C22-80393C2C 020282 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393C22;
/* 80393C2C-80393C33 02028C 0007+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393C2C;
/* 80393C33-80393C3D 020293 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393C33;
/* 80393C3D-80393C44 02029D 0007+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393C3D;
/* 80393C44-80393C4E 0202A4 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393C44;
/* 80393C4E-80393C55 0202AE 0007+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393C4E;
/* 80393C55-80393C5F 0202B5 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393C55;
/* 80393C5F-80393C66 0202BF 0007+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393C5F;
/* 80393C66-80393C70 0202C6 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393C66;
/* 80393C70-80393C77 0202D0 0007+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393C70;
/* 80393C77-80393C81 0202D7 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393C77;
/* 80393C81-80393C88 0202E1 0007+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393C81;
/* 80393C88-80393C92 0202E8 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393C88;
/* 80393C92-80393C98 0202F2 0006+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393C92;
/* 80393C98-80393CA1 0202F8 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393C98;
/* 80393CA1-80393CAA 020301 0009+00 15/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393CA1;
/* 80393CAA-80393CB3 02030A 0009+00 15/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393CAA;
/* 80393CB3-80393CB9 020313 0006+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393CB3;
/* 80393CB9-80393CC2 020319 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393CB9;
/* 80393CC2-80393CC8 020322 0006+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393CC2;
/* 80393CC8-80393CD1 020328 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393CC8;
/* 80393CD1-80393CD7 020331 0006+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393CD1;
/* 80393CD7-80393CE0 020337 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393CD7;
/* 80393CE0-80393CE6 020340 0006+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393CE0;
/* 80393CE6-80393CEF 020346 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393CE6;
/* 80393CEF-80393CF5 02034F 0006+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393CEF;
/* 80393CF5-80393CFE 020355 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393CF5;
/* 80393CFE-80393D04 02035E 0006+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393CFE;
/* 80393D04-80393D0D 020364 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393D04;
/* 80393D0D-80393D14 02036D 0007+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393D0D;
/* 80393D14-80393D1E 020374 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393D14;
/* 80393D1E-80393D25 02037E 0007+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393D1E;
/* 80393D25-80393D2F 020385 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393D25;
/* 80393D2F-80393D36 02038F 0007+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393D2F;
/* 80393D36-80393D40 020396 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393D36;
/* 80393D40-80393D47 0203A0 0007+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393D40;
/* 80393D47-80393D51 0203A7 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393D47;
/* 80393D51-80393D58 0203B1 0007+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393D51;
/* 80393D58-80393D62 0203B8 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393D58;
/* 80393D62-80393D69 0203C2 0007+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393D62;
/* 80393D69-80393D73 0203C9 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393D69;
/* 80393D73-80393D7A 0203D3 0007+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393D73;
/* 80393D7A-80393D88 0203DA 000A+04 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80393D7A;
/* 80393250-80393268 -00001 0018+00 2/1 0/0 0/0 .rodata l_resMANa */
SECTION_RODATA static void* const l_resMANa[6] = {
(void*)&a_npc_d_a_npc_cd2__stringBase0,
@@ -355,7 +553,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),
};
COMPILER_STRIP_GATE(80393250, &l_resMANa);
COMPILER_STRIP_GATE(0x80393250, &l_resMANa);
/* 80393268-80393280 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMADa */
SECTION_RODATA static void* const l_resMADa[6] = {
@@ -366,7 +564,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),
};
COMPILER_STRIP_GATE(80393268, &l_resMADa);
COMPILER_STRIP_GATE(0x80393268, &l_resMADa);
/* 80393280-80393298 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMCNa */
SECTION_RODATA static void* const l_resMCNa[6] = {
@@ -377,7 +575,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),
};
COMPILER_STRIP_GATE(80393280, &l_resMCNa);
COMPILER_STRIP_GATE(0x80393280, &l_resMCNa);
/* 80393298-803932B0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMONa */
SECTION_RODATA static void* const l_resMONa[6] = {
@@ -388,7 +586,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),
};
COMPILER_STRIP_GATE(80393298, &l_resMONa);
COMPILER_STRIP_GATE(0x80393298, &l_resMONa);
/* 803932B0-803932C8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANb */
SECTION_RODATA static void* const l_resMANb[6] = {
@@ -399,7 +597,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),
};
COMPILER_STRIP_GATE(803932B0, &l_resMANb);
COMPILER_STRIP_GATE(0x803932B0, &l_resMANb);
/* 803932C8-803932E0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANc */
SECTION_RODATA static void* const l_resMANc[6] = {
@@ -410,7 +608,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),
};
COMPILER_STRIP_GATE(803932C8, &l_resMANc);
COMPILER_STRIP_GATE(0x803932C8, &l_resMANc);
/* 803932E0-803932F8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMASa */
SECTION_RODATA static void* const l_resMASa[6] = {
@@ -421,7 +619,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),
};
COMPILER_STRIP_GATE(803932E0, &l_resMASa);
COMPILER_STRIP_GATE(0x803932E0, &l_resMASa);
/* 803932F8-80393310 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMBNa */
SECTION_RODATA static void* const l_resMBNa[6] = {
@@ -432,7 +630,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),
};
COMPILER_STRIP_GATE(803932F8, &l_resMBNa);
COMPILER_STRIP_GATE(0x803932F8, &l_resMBNa);
/* 80393310-80393328 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANa2 */
SECTION_RODATA static void* const l_resMANa2[6] = {
@@ -443,7 +641,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),
};
COMPILER_STRIP_GATE(80393310, &l_resMANa2);
COMPILER_STRIP_GATE(0x80393310, &l_resMANa2);
/* 80393328-80393340 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMADa2 */
SECTION_RODATA static void* const l_resMADa2[6] = {
@@ -454,7 +652,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),
};
COMPILER_STRIP_GATE(80393328, &l_resMADa2);
COMPILER_STRIP_GATE(0x80393328, &l_resMADa2);
/* 80393340-80393358 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMCNa2 */
SECTION_RODATA static void* const l_resMCNa2[6] = {
@@ -465,7 +663,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),
};
COMPILER_STRIP_GATE(80393340, &l_resMCNa2);
COMPILER_STRIP_GATE(0x80393340, &l_resMCNa2);
/* 80393358-80393370 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMONa2 */
SECTION_RODATA static void* const l_resMONa2[6] = {
@@ -476,7 +674,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),
};
COMPILER_STRIP_GATE(80393358, &l_resMONa2);
COMPILER_STRIP_GATE(0x80393358, &l_resMONa2);
/* 80393370-80393388 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANb2 */
SECTION_RODATA static void* const l_resMANb2[6] = {
@@ -487,7 +685,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),
};
COMPILER_STRIP_GATE(80393370, &l_resMANb2);
COMPILER_STRIP_GATE(0x80393370, &l_resMANb2);
/* 80393388-803933A0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANc2 */
SECTION_RODATA static void* const l_resMANc2[6] = {
@@ -498,7 +696,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),
};
COMPILER_STRIP_GATE(80393388, &l_resMANc2);
COMPILER_STRIP_GATE(0x80393388, &l_resMANc2);
/* 803933A0-803933B8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMASa2 */
SECTION_RODATA static void* const l_resMASa2[6] = {
@@ -509,7 +707,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),
};
COMPILER_STRIP_GATE(803933A0, &l_resMASa2);
COMPILER_STRIP_GATE(0x803933A0, &l_resMASa2);
/* 803933B8-803933D0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMBNa2 */
SECTION_RODATA static void* const l_resMBNa2[6] = {
@@ -520,7 +718,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),
};
COMPILER_STRIP_GATE(803933B8, &l_resMBNa2);
COMPILER_STRIP_GATE(0x803933B8, &l_resMBNa2);
/* 803933D0-803933E8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANa */
SECTION_RODATA static void* const l_resWANa[6] = {
@@ -531,7 +729,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),
};
COMPILER_STRIP_GATE(803933D0, &l_resWANa);
COMPILER_STRIP_GATE(0x803933D0, &l_resWANa);
/* 803933E8-80393400 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWADa */
SECTION_RODATA static void* const l_resWADa[6] = {
@@ -542,7 +740,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),
};
COMPILER_STRIP_GATE(803933E8, &l_resWADa);
COMPILER_STRIP_GATE(0x803933E8, &l_resWADa);
/* 80393400-80393418 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMATa */
SECTION_RODATA static void* const l_resMATa[6] = {
@@ -553,7 +751,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),
};
COMPILER_STRIP_GATE(80393400, &l_resMATa);
COMPILER_STRIP_GATE(0x80393400, &l_resMATa);
/* 80393418-80393430 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWCNa */
SECTION_RODATA static void* const l_resWCNa[6] = {
@@ -564,7 +762,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),
};
COMPILER_STRIP_GATE(80393418, &l_resWCNa);
COMPILER_STRIP_GATE(0x80393418, &l_resWCNa);
/* 80393430-80393448 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWONa */
SECTION_RODATA static void* const l_resWONa[6] = {
@@ -575,7 +773,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),
};
COMPILER_STRIP_GATE(80393430, &l_resWONa);
COMPILER_STRIP_GATE(0x80393430, &l_resWONa);
/* 80393448-80393460 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWGNa */
SECTION_RODATA static void* const l_resWGNa[6] = {
@@ -586,7 +784,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),
};
COMPILER_STRIP_GATE(80393448, &l_resWGNa);
COMPILER_STRIP_GATE(0x80393448, &l_resWGNa);
/* 80393460-80393478 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANb */
SECTION_RODATA static void* const l_resWANb[6] = {
@@ -597,7 +795,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),
};
COMPILER_STRIP_GATE(80393460, &l_resWANb);
COMPILER_STRIP_GATE(0x80393460, &l_resWANb);
/* 80393478-80393490 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANa2 */
SECTION_RODATA static void* const l_resWANa2[6] = {
@@ -608,7 +806,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),
};
COMPILER_STRIP_GATE(80393478, &l_resWANa2);
COMPILER_STRIP_GATE(0x80393478, &l_resWANa2);
/* 80393490-803934A8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWADa2 */
SECTION_RODATA static void* const l_resWADa2[6] = {
@@ -619,7 +817,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),
};
COMPILER_STRIP_GATE(80393490, &l_resWADa2);
COMPILER_STRIP_GATE(0x80393490, &l_resWADa2);
/* 803934A8-803934C0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMATa2 */
SECTION_RODATA static void* const l_resMATa2[6] = {
@@ -630,7 +828,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),
};
COMPILER_STRIP_GATE(803934A8, &l_resMATa2);
COMPILER_STRIP_GATE(0x803934A8, &l_resMATa2);
/* 803934C0-803934D8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWCNa2 */
SECTION_RODATA static void* const l_resWCNa2[6] = {
@@ -641,7 +839,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),
};
COMPILER_STRIP_GATE(803934C0, &l_resWCNa2);
COMPILER_STRIP_GATE(0x803934C0, &l_resWCNa2);
/* 803934D8-803934F0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWONa2 */
SECTION_RODATA static void* const l_resWONa2[6] = {
@@ -652,7 +850,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),
};
COMPILER_STRIP_GATE(803934D8, &l_resWONa2);
COMPILER_STRIP_GATE(0x803934D8, &l_resWONa2);
/* 803934F0-80393508 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWGNa2 */
SECTION_RODATA static void* const l_resWGNa2[6] = {
@@ -663,7 +861,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),
};
COMPILER_STRIP_GATE(803934F0, &l_resWGNa2);
COMPILER_STRIP_GATE(0x803934F0, &l_resWGNa2);
/* 80393508-80393520 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANb2 */
SECTION_RODATA static void* const l_resWANb2[6] = {
@@ -674,7 +872,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),
};
COMPILER_STRIP_GATE(80393508, &l_resWANb2);
COMPILER_STRIP_GATE(0x80393508, &l_resWANb2);
/* 80393520-80393588 -00001 0068+00 1/1 0/0 0/0 .rodata l_objTbl */
SECTION_RODATA static void* const l_objTbl[26] = {
@@ -692,7 +890,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,
};
COMPILER_STRIP_GATE(80393520, &l_objTbl);
COMPILER_STRIP_GATE(0x80393520, &l_objTbl);
/* 80393588-803935F0 -00001 0068+00 1/1 0/0 0/0 .rodata l_objTWTbl */
SECTION_RODATA static void* const l_objTWTbl[26] = {
@@ -710,7 +908,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,
};
COMPILER_STRIP_GATE(80393588, &l_objTWTbl);
COMPILER_STRIP_GATE(0x80393588, &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] = {
@@ -769,7 +967,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,
};
COMPILER_STRIP_GATE(803935F0, &l_bckTbl_M);
COMPILER_STRIP_GATE(0x803935F0, &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] = {
@@ -828,7 +1026,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,
};
COMPILER_STRIP_GATE(803937A0, &l_bckTbl_W);
COMPILER_STRIP_GATE(0x803937A0, &l_bckTbl_W);
/* 80393950-80393994 01FFB0 0044+00 0/0 0/0 4/4 .rodata m_cylDat__10daNpcCd2_c */
SECTION_RODATA u8 const daNpcCd2_c::m_cylDat[68] = {
@@ -838,7 +1036,7 @@ SECTION_RODATA u8 const daNpcCd2_c::m_cylDat[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,
};
COMPILER_STRIP_GATE(80393950, &daNpcCd2_c::m_cylDat);
COMPILER_STRIP_GATE(0x80393950, &daNpcCd2_c::m_cylDat);
/* 80393994-80393AFC 01FFF4 0168+00 1/1 0/0 0/0 .rodata a_transScaleTbl$3998 */
SECTION_RODATA static u8 const a_transScaleTbl[360] = {
@@ -866,7 +1064,80 @@ 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,
};
COMPILER_STRIP_GATE(80393994, &a_transScaleTbl);
COMPILER_STRIP_GATE(0x80393994, &a_transScaleTbl);
/* 80393B70-80393B70 0201D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80393B70 = "MAN_a";
SECTION_DEAD static char const* const stringBase_80393B76 = "MAN_a_TW";
SECTION_DEAD static char const* const stringBase_80393B7F = "Mgeneral";
SECTION_DEAD static char const* const stringBase_80393B88 = "Mspecial";
SECTION_DEAD static char const* const stringBase_80393B91 = "object";
SECTION_DEAD static char const* const stringBase_80393B98 = "objectTW";
SECTION_DEAD static char const* const stringBase_80393BA1 = "MAD_a";
SECTION_DEAD static char const* const stringBase_80393BA7 = "MAD_a_TW";
SECTION_DEAD static char const* const stringBase_80393BB0 = "MCN_a";
SECTION_DEAD static char const* const stringBase_80393BB6 = "MCN_a_TW";
SECTION_DEAD static char const* const stringBase_80393BBF = "MON_a";
SECTION_DEAD static char const* const stringBase_80393BC5 = "MON_a_TW";
SECTION_DEAD static char const* const stringBase_80393BCE = "MAN_b";
SECTION_DEAD static char const* const stringBase_80393BD4 = "MAN_b_TW";
SECTION_DEAD static char const* const stringBase_80393BDD = "MAN_c";
SECTION_DEAD static char const* const stringBase_80393BE3 = "MAN_c_TW";
SECTION_DEAD static char const* const stringBase_80393BEC = "MAS_a";
SECTION_DEAD static char const* const stringBase_80393BF2 = "MAS_a_TW";
SECTION_DEAD static char const* const stringBase_80393BFB = "MBN_a";
SECTION_DEAD static char const* const stringBase_80393C01 = "MBN_a_TW";
SECTION_DEAD static char const* const stringBase_80393C0A = "MAN_a2";
SECTION_DEAD static char const* const stringBase_80393C11 = "MAN_a2_TW";
SECTION_DEAD static char const* const stringBase_80393C1B = "MAD_a2";
SECTION_DEAD static char const* const stringBase_80393C22 = "MAD_a2_TW";
SECTION_DEAD static char const* const stringBase_80393C2C = "MCN_a2";
SECTION_DEAD static char const* const stringBase_80393C33 = "MCN_a2_TW";
SECTION_DEAD static char const* const stringBase_80393C3D = "MON_a2";
SECTION_DEAD static char const* const stringBase_80393C44 = "MON_a2_TW";
SECTION_DEAD static char const* const stringBase_80393C4E = "MAN_b2";
SECTION_DEAD static char const* const stringBase_80393C55 = "MAN_b2_TW";
SECTION_DEAD static char const* const stringBase_80393C5F = "MAN_c2";
SECTION_DEAD static char const* const stringBase_80393C66 = "MAN_c2_TW";
SECTION_DEAD static char const* const stringBase_80393C70 = "MAS_a2";
SECTION_DEAD static char const* const stringBase_80393C77 = "MAS_a2_TW";
SECTION_DEAD static char const* const stringBase_80393C81 = "MBN_a2";
SECTION_DEAD static char const* const stringBase_80393C88 = "MBN_a2_TW";
SECTION_DEAD static char const* const stringBase_80393C92 = "WAN_a";
SECTION_DEAD static char const* const stringBase_80393C98 = "WAN_a_TW";
SECTION_DEAD static char const* const stringBase_80393CA1 = "Wgeneral";
SECTION_DEAD static char const* const stringBase_80393CAA = "Wspecial";
SECTION_DEAD static char const* const stringBase_80393CB3 = "WAD_a";
SECTION_DEAD static char const* const stringBase_80393CB9 = "WAD_a_TW";
SECTION_DEAD static char const* const stringBase_80393CC2 = "MAT_a";
SECTION_DEAD static char const* const stringBase_80393CC8 = "MAT_a_TW";
SECTION_DEAD static char const* const stringBase_80393CD1 = "WCN_a";
SECTION_DEAD static char const* const stringBase_80393CD7 = "WCN_a_TW";
SECTION_DEAD static char const* const stringBase_80393CE0 = "WON_a";
SECTION_DEAD static char const* const stringBase_80393CE6 = "WON_a_TW";
SECTION_DEAD static char const* const stringBase_80393CEF = "WGN_a";
SECTION_DEAD static char const* const stringBase_80393CF5 = "WGN_a_TW";
SECTION_DEAD static char const* const stringBase_80393CFE = "WAN_b";
SECTION_DEAD static char const* const stringBase_80393D04 = "WAN_b_TW";
SECTION_DEAD static char const* const stringBase_80393D0D = "WAN_a2";
SECTION_DEAD static char const* const stringBase_80393D14 = "WAN_a2_TW";
SECTION_DEAD static char const* const stringBase_80393D1E = "WAD_a2";
SECTION_DEAD static char const* const stringBase_80393D25 = "WAD_a2_TW";
SECTION_DEAD static char const* const stringBase_80393D2F = "MAT_a2";
SECTION_DEAD static char const* const stringBase_80393D36 = "MAT_a2_TW";
SECTION_DEAD static char const* const stringBase_80393D40 = "WCN_a2";
SECTION_DEAD static char const* const stringBase_80393D47 = "WCN_a2_TW";
SECTION_DEAD static char const* const stringBase_80393D51 = "WON_a2";
SECTION_DEAD static char const* const stringBase_80393D58 = "WON_a2_TW";
SECTION_DEAD static char const* const stringBase_80393D62 = "WGN_a2";
SECTION_DEAD static char const* const stringBase_80393D69 = "WGN_a2_TW";
SECTION_DEAD static char const* const stringBase_80393D73 = "WAN_b2";
SECTION_DEAD static char const* const stringBase_80393D7A = "WAN_b2_TW";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80393D84 = "\0\0\0";
#pragma pop
/* 804534E0-804534E4 001AE0 0004+00 3/3 0/0 0/0 .sdata2 @4050 */
SECTION_SDATA2 static f32 lit_4050 = 1.0f;
@@ -896,7 +1167,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,
};
COMPILER_STRIP_GATE(80393AFC, &lit_4072);
COMPILER_STRIP_GATE(0x80393AFC, &lit_4072);
/* 80157F68-801580A8 1528A8 0140+00 0/0 0/0 1/1 .text ChairCreate__10daNpcCd2_cFf */
#pragma push
@@ -2305,7 +2576,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,
};
COMPILER_STRIP_GATE(80393B08, &a_jntNumTbl);
COMPILER_STRIP_GATE(0x80393B08, &a_jntNumTbl);
/* 80158FF0-801590FC 153930 010C+00 0/0 0/0 4/4 .text drawObj__10daNpcCd2_cFiP8J3DModelf
*/
@@ -2739,7 +3010,7 @@ asm void __sinit_d_a_npc_cd2_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_8015A90C = (void*)__sinit_d_a_npc_cd2_cpp;
REGISTER_CTORS(0x8015A90C, __sinit_d_a_npc_cd2_cpp);
#pragma pop
/* ############################################################################################## */
@@ -2747,76 +3018,4 @@ SECTION_CTORS void* const _ctors_8015A90C = (void*)__sinit_d_a_npc_cd2_cpp;
extern u8 data_80451010[8];
u8 data_80451010[8];
/* 80393B70-80393D88 0201D0 0214+04 35/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80393B70 = "MAN_a";
SECTION_DEAD static char const* const stringBase_80393B76 = "MAN_a_TW";
SECTION_DEAD static char const* const stringBase_80393B7F = "Mgeneral";
SECTION_DEAD static char const* const stringBase_80393B88 = "Mspecial";
SECTION_DEAD static char const* const stringBase_80393B91 = "object";
SECTION_DEAD static char const* const stringBase_80393B98 = "objectTW";
SECTION_DEAD static char const* const stringBase_80393BA1 = "MAD_a";
SECTION_DEAD static char const* const stringBase_80393BA7 = "MAD_a_TW";
SECTION_DEAD static char const* const stringBase_80393BB0 = "MCN_a";
SECTION_DEAD static char const* const stringBase_80393BB6 = "MCN_a_TW";
SECTION_DEAD static char const* const stringBase_80393BBF = "MON_a";
SECTION_DEAD static char const* const stringBase_80393BC5 = "MON_a_TW";
SECTION_DEAD static char const* const stringBase_80393BCE = "MAN_b";
SECTION_DEAD static char const* const stringBase_80393BD4 = "MAN_b_TW";
SECTION_DEAD static char const* const stringBase_80393BDD = "MAN_c";
SECTION_DEAD static char const* const stringBase_80393BE3 = "MAN_c_TW";
SECTION_DEAD static char const* const stringBase_80393BEC = "MAS_a";
SECTION_DEAD static char const* const stringBase_80393BF2 = "MAS_a_TW";
SECTION_DEAD static char const* const stringBase_80393BFB = "MBN_a";
SECTION_DEAD static char const* const stringBase_80393C01 = "MBN_a_TW";
SECTION_DEAD static char const* const stringBase_80393C0A = "MAN_a2";
SECTION_DEAD static char const* const stringBase_80393C11 = "MAN_a2_TW";
SECTION_DEAD static char const* const stringBase_80393C1B = "MAD_a2";
SECTION_DEAD static char const* const stringBase_80393C22 = "MAD_a2_TW";
SECTION_DEAD static char const* const stringBase_80393C2C = "MCN_a2";
SECTION_DEAD static char const* const stringBase_80393C33 = "MCN_a2_TW";
SECTION_DEAD static char const* const stringBase_80393C3D = "MON_a2";
SECTION_DEAD static char const* const stringBase_80393C44 = "MON_a2_TW";
SECTION_DEAD static char const* const stringBase_80393C4E = "MAN_b2";
SECTION_DEAD static char const* const stringBase_80393C55 = "MAN_b2_TW";
SECTION_DEAD static char const* const stringBase_80393C5F = "MAN_c2";
SECTION_DEAD static char const* const stringBase_80393C66 = "MAN_c2_TW";
SECTION_DEAD static char const* const stringBase_80393C70 = "MAS_a2";
SECTION_DEAD static char const* const stringBase_80393C77 = "MAS_a2_TW";
SECTION_DEAD static char const* const stringBase_80393C81 = "MBN_a2";
SECTION_DEAD static char const* const stringBase_80393C88 = "MBN_a2_TW";
SECTION_DEAD static char const* const stringBase_80393C92 = "WAN_a";
SECTION_DEAD static char const* const stringBase_80393C98 = "WAN_a_TW";
SECTION_DEAD static char const* const stringBase_80393CA1 = "Wgeneral";
SECTION_DEAD static char const* const stringBase_80393CAA = "Wspecial";
SECTION_DEAD static char const* const stringBase_80393CB3 = "WAD_a";
SECTION_DEAD static char const* const stringBase_80393CB9 = "WAD_a_TW";
SECTION_DEAD static char const* const stringBase_80393CC2 = "MAT_a";
SECTION_DEAD static char const* const stringBase_80393CC8 = "MAT_a_TW";
SECTION_DEAD static char const* const stringBase_80393CD1 = "WCN_a";
SECTION_DEAD static char const* const stringBase_80393CD7 = "WCN_a_TW";
SECTION_DEAD static char const* const stringBase_80393CE0 = "WON_a";
SECTION_DEAD static char const* const stringBase_80393CE6 = "WON_a_TW";
SECTION_DEAD static char const* const stringBase_80393CEF = "WGN_a";
SECTION_DEAD static char const* const stringBase_80393CF5 = "WGN_a_TW";
SECTION_DEAD static char const* const stringBase_80393CFE = "WAN_b";
SECTION_DEAD static char const* const stringBase_80393D04 = "WAN_b_TW";
SECTION_DEAD static char const* const stringBase_80393D0D = "WAN_a2";
SECTION_DEAD static char const* const stringBase_80393D14 = "WAN_a2_TW";
SECTION_DEAD static char const* const stringBase_80393D1E = "WAD_a2";
SECTION_DEAD static char const* const stringBase_80393D25 = "WAD_a2_TW";
SECTION_DEAD static char const* const stringBase_80393D2F = "MAT_a2";
SECTION_DEAD static char const* const stringBase_80393D36 = "MAT_a2_TW";
SECTION_DEAD static char const* const stringBase_80393D40 = "WCN_a2";
SECTION_DEAD static char const* const stringBase_80393D47 = "WCN_a2_TW";
SECTION_DEAD static char const* const stringBase_80393D51 = "WON_a2";
SECTION_DEAD static char const* const stringBase_80393D58 = "WON_a2_TW";
SECTION_DEAD static char const* const stringBase_80393D62 = "WGN_a2";
SECTION_DEAD static char const* const stringBase_80393D69 = "WGN_a2_TW";
SECTION_DEAD static char const* const stringBase_80393D73 = "WAN_b2";
SECTION_DEAD static char const* const stringBase_80393D7A = "WAN_b2_TW";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80393D84 = "\0\0\0";
#pragma pop
/* 80393B70-80393B70 0201D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/a/obj/d_a_obj_item.cpp
+10 -9
View File
@@ -175,7 +175,6 @@ struct dItem_data {
struct dEvt_control_c {
/* 80042468 */ void reset();
/* 800436EC */ void setPtI_Id(unsigned int);
};
struct dEvent_manager_c {
@@ -399,7 +398,7 @@ extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl();
extern "C" void execItemGet__FUc();
extern "C" void checkItemGet__FUci();
extern "C" void isHeart__FUc();
extern "C" void func_80141AE8(u8*);
extern "C" void func_80141AE8(void* _this, u8*);
extern "C" void DeleteBase__12daItemBase_cFPCc();
extern "C" bool clothCreate__12daItemBase_cFv();
extern "C" bool __CreateHeap__12daItemBase_cFv();
@@ -1029,6 +1028,13 @@ asm void daItem_c::procWaitGetDemoEvent() {
}
#pragma pop
/* ############################################################################################## */
/* 80393D88-80393D88 0203E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80393D88 = "DEFAULT_GETITEM";
#pragma pop
/* 8015C3BC-8015C41C 156CFC 0060+00 1/0 0/0 0/0 .text procMainGetDemoEvent__8daItem_cFv
*/
#pragma push
@@ -1461,7 +1467,7 @@ asm void __sinit_d_a_obj_item_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_8015DED0 = (void*)__sinit_d_a_obj_item_cpp;
REGISTER_CTORS(0x8015DED0, __sinit_d_a_obj_item_cpp);
#pragma pop
/* 8015DFD8-8015DFF4 158918 001C+00 2/2 0/0 0/0 .text getItemPos__9daPy_py_cCFv */
@@ -1484,9 +1490,4 @@ asm void daPy_py_c::getLeftHandPos() const {
}
#pragma pop
/* 80393D88-80393D98 0203E8 0010+00 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80393D88 = "DEFAULT_GETITEM";
#pragma pop
/* 80393D88-80393D88 0203E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/c/c_damagereaction.cpp
+1 -1
View File
@@ -157,7 +157,7 @@ asm void __sinit_c_damagereaction_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_80018388 = (void*)__sinit_c_damagereaction_cpp;
REGISTER_CTORS(0x80018388, __sinit_c_damagereaction_cpp);
#pragma pop
/* 800183D4-800183D8 012D14 0004+00 1/0 1/0 0/0 .text
src/c/c_dylink.cpp
+2435 -155
View File
File diff suppressed because it is too large Load Diff
src/d/a/d_a_alink.cpp
+492 -470
View File
File diff suppressed because it is too large Load Diff
src/d/a/d_a_horse_static.cpp
-4
View File
@@ -25,10 +25,6 @@ struct daTagHstop_c {
static u8 m_top[4 + 4 /* padding */];
};
struct Z2CreatureRide {
/* 802C522C */ void setLinkRiding(bool);
};
//
// Forward References:
//
src/d/a/d_a_itembase.cpp
+2 -2
View File
@@ -43,10 +43,10 @@ struct mDoExt_bpkAnm {
/* 8000D518 */ void entry(J3DMaterialTable*, f32);
};
struct J3DAnmTransform {};
struct J3DModelData {};
struct J3DAnmTransform {};
struct mDoExt_bckAnm {
/* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
/* 8000D9CC */ void entry(J3DModelData*, f32);
src/d/a/d_a_itembase_static.cpp
+1 -1
View File
@@ -157,4 +157,4 @@ SECTION_RODATA u8 const daItemBase_c::m_data[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,
};
COMPILER_STRIP_GATE(803792B0, &daItemBase_c::m_data);
COMPILER_STRIP_GATE(0x803792B0, &daItemBase_c::m_data);
src/d/a/d_a_no_chg_room.cpp
+10 -9
View File
@@ -129,6 +129,15 @@ asm void daNocrm_c::getRoomNo(int param_0) {
#pragma pop
/* ############################################################################################## */
/* 80392640-80392640 01ECA0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80392640 =
"部屋読み込み矩形：読み込みＩＤが−１ですので、自滅します！\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039267C = "\0\0\0";
#pragma pop
/* 804533CC-804533D0 0019CC 0004+00 1/1 0/0 0/0 .sdata2 @3832 */
SECTION_SDATA2 static f32 lit_3832 = 1000.0f;
@@ -192,12 +201,4 @@ SECTION_DATA extern void* g_profile_NO_CHG_ROOM[12] = {
(void*)0x00060000, (void*)0x05000000,
};
/* 80392640-80392680 01ECA0 003C+04 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80392640 =
"部屋読み込み矩形：読み込みＩＤが−１ですので、自滅します！\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039267C = "\0\0\0";
#pragma pop
/* 80392640-80392640 01ECA0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/a/d_a_npc.cpp
+262 -90
View File
@@ -50,12 +50,12 @@ struct mDoExt_morf_c {
struct J3DAnmTextureSRTKey {};
struct J3DAnmTexPattern {};
struct J3DAnmTevRegKey {};
struct J3DAnmColor {};
struct J3DAnmTexPattern {};
struct J3DMaterialTable {
/* 8032F64C */ void removeMatColorAnimator(J3DAnmColor*);
/* 8032F6F8 */ void removeTexNoAnimator(J3DAnmTexPattern*);
@@ -83,10 +83,10 @@ struct mDoExt_bpkAnm {
/* 8000D518 */ void entry(J3DMaterialTable*, f32);
};
struct J3DAnmTransform {};
struct J3DModelData {};
struct J3DAnmTransform {};
struct mDoExt_bckAnm {
/* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
/* 8000D990 */ void changeBckOnly(J3DAnmTransform*);
@@ -120,22 +120,22 @@ struct daNpcT_motionAnmData_c {};
struct daNpcT_faceMotionAnmData_c {};
struct J3DFrameCtrl {
/* 803283FC */ void init(s16);
};
struct J3DAnmTransformKey {};
struct J3DJoint {};
struct dCcD_GObjInf {
/* 80084460 */ void ChkTgHit();
};
struct J3DAnmTransformKey {};
struct _GXColorS10 {};
struct J3DModel {};
struct J3DFrameCtrl {
/* 803283FC */ void init(s16);
};
struct J3DJoint {};
struct daNpcT_c {
/* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
/* 80147FD4 */ void srchActor(void*, void*);
@@ -612,7 +612,6 @@ struct dEvt_control_c {
/* 80042518 */ void reset(void*);
/* 800432EC */ void convPId(unsigned int);
/* 8004368C */ void setPtT(void*);
/* 800436EC */ void setPtI_Id(unsigned int);
};
struct dEvent_manager_c {
@@ -909,9 +908,9 @@ extern "C" void __dt__22daNpcT_MotionSeqMngr_cFv();
extern "C" void __dt__18daNpcT_ActorMngr_cFv();
extern "C" void __dt__15daNpcT_JntAnm_cFv();
extern "C" void __dt__15daNpcT_MatAnm_cFv();
extern "C" void func_8014D32C(s16*);
extern "C" void func_8014D348(int*);
extern "C" void func_8014D364(int, int);
extern "C" void func_8014D32C(void* _this, s16*);
extern "C" void func_8014D348(void* _this, int*);
extern "C" void func_8014D364(void* _this, int, int);
extern "C" void __sinit_d_a_npc_cpp();
extern "C" static void daBaseNpc_addIdx__FiiPUsi();
extern "C" static void daBaseNpc_subIdx__FiiPUsi();
@@ -2422,6 +2421,13 @@ asm void daNpcT_c::ctrlJoint(J3DJoint* param_0, J3DModel* param_1) {
}
#pragma pop
/* ############################################################################################## */
/* 80392710-80392710 01ED70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80392710 = "DEFAULT_GETITEM";
#pragma pop
/* 8014997C-80149BB4 1442BC 0238+00 1/0 1/0 58/0 .text evtProc__8daNpcT_cFv */
#pragma push
#pragma optimization_level 0
@@ -3236,7 +3242,7 @@ asm daNpcT_MatAnm_c::~daNpcT_MatAnm_c() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8014D32C(s16* param_0) {
extern "C" asm void func_8014D32C(void* _this, s16* param_0) {
nofralloc
#include "asm/d/a/d_a_npc/func_8014D32C.s"
}
@@ -3246,7 +3252,7 @@ extern "C" asm void func_8014D32C(s16* param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8014D348(int* param_0) {
extern "C" asm void func_8014D348(void* _this, int* param_0) {
nofralloc
#include "asm/d/a/d_a_npc/func_8014D348.s"
}
@@ -3256,7 +3262,7 @@ extern "C" asm void func_8014D348(int* param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8014D364(int param_0, int param_1) {
extern "C" asm void func_8014D364(void* _this, int param_0, int param_1) {
nofralloc
#include "asm/d/a/d_a_npc/func_8014D364.s"
}
@@ -3269,7 +3275,7 @@ SECTION_RODATA u8 const daNpcT_c::mCcDObjData[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,
};
COMPILER_STRIP_GATE(80392680, &daNpcT_c::mCcDObjData);
COMPILER_STRIP_GATE(0x80392680, &daNpcT_c::mCcDObjData);
/* 8014D3D8-8014D538 147D18 0160+00 0/0 1/0 0/0 .text __sinit_d_a_npc_cpp */
#pragma push
@@ -3283,7 +3289,7 @@ asm void __sinit_d_a_npc_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_8014D3D8 = (void*)__sinit_d_a_npc_cpp;
REGISTER_CTORS(0x8014D3D8, __sinit_d_a_npc_cpp);
#pragma pop
/* 8014D538-8014D584 147E78 004C+00 2/2 0/0 0/0 .text daBaseNpc_addIdx__FiiPUsi */
@@ -3447,15 +3453,10 @@ asm void daBaseNpc_path_c::getIdx() {
}
#pragma pop
/* 8014DB0C-8014DB14 14844C 0008+00 0/0 0/0 1/1 .text setIdx__16daBaseNpc_path_cFUs */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daBaseNpc_path_c::setIdx(u16 param_0) {
nofralloc
#include "asm/d/a/d_a_npc/setIdx__16daBaseNpc_path_cFUs.s"
/* 8014DB0C-8014DB14 -00001 0008+00 0/0 0/0 0/0 .text setIdx__16daBaseNpc_path_cFUs */
void daBaseNpc_path_c::setIdx(u16 param_0) {
*(u16*)(((u8*)this) + 2576) /* this->field_0xa10 */ = (u16)(param_0);
}
#pragma pop
/* 8014DB14-8014DB40 148454 002C+00 0/0 0/0 4/4 .text getPntPos__16daBaseNpc_path_cFUs */
#pragma push
@@ -3822,8 +3823,8 @@ asm void daBaseNpc_moveBgActor_c::MoveBGCreateHeap() {
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daBaseNpc_moveBgActor_c::MoveBGCreate(char const* param_0, int param_1,
void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool,
cXyz*, csXyz*, csXyz*),
void (*param_2)(dBgW*, void*, cBgS_PolyInfo const&,
bool, cXyz*, csXyz*, csXyz*),
u32 param_3) {
nofralloc
#include "asm/d/a/d_a_npc/MoveBGCreate__23daBaseNpc_moveBgActor_cFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUl.s"
@@ -4044,15 +4045,10 @@ asm void daNpcF_ActorMngr_c::entry(fopAc_ac_c* param_0) {
}
#pragma pop
/* 801506D8-801506E0 14B018 0008+00 0/0 0/0 1/1 .text entry__18daNpcF_ActorMngr_cFUi */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daNpcF_ActorMngr_c::entry(unsigned int param_0) {
nofralloc
#include "asm/d/a/d_a_npc/entry__18daNpcF_ActorMngr_cFUi.s"
/* 801506D8-801506E0 -00001 0008+00 0/0 0/0 0/0 .text entry__18daNpcF_ActorMngr_cFUi */
void daNpcF_ActorMngr_c::entry(unsigned int param_0) {
*(u32*)this = (u32)(param_0);
}
#pragma pop
/* 801506E0-801506EC 14B020 000C+00 2/2 0/0 55/55 .text remove__18daNpcF_ActorMngr_cFv */
#pragma push
@@ -4804,8 +4800,9 @@ SECTION_SDATA2 static f32 lit_11605 = 450.0f;
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daNpcF_c::getAttnActorP(int param_0, void* (*)(void*, void*), f32 param_2, f32 param_3,
f32 param_4, f32 param_5, s16 param_6, int param_7, int param_8) {
asm void daNpcF_c::getAttnActorP(int param_0, void* (*param_1)(void*, void*), f32 param_2,
f32 param_3, f32 param_4, f32 param_5, s16 param_6, int param_7,
int param_8) {
nofralloc
#include "asm/d/a/d_a_npc/getAttnActorP__8daNpcF_cFiPFPvPv_Pvffffsii.s"
}
@@ -5191,7 +5188,7 @@ SECTION_RODATA u8 const daBaseNpc_c::mCcDObj[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,
};
COMPILER_STRIP_GATE(803926B0, &daBaseNpc_c::mCcDObj);
COMPILER_STRIP_GATE(0x803926B0, &daBaseNpc_c::mCcDObj);
#pragma pop
/* 803926E0-80392710 01ED40 0030+00 0/0 0/0 0/0 .rodata mCcDObjInfo__8daNpcF_c */
@@ -5202,57 +5199,232 @@ SECTION_RODATA u8 const daNpcF_c::mCcDObjInfo[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,
};
COMPILER_STRIP_GATE(803926E0, &daNpcF_c::mCcDObjInfo);
COMPILER_STRIP_GATE(0x803926E0, &daNpcF_c::mCcDObjInfo);
#pragma pop
/* 80392720-80392725 01ED80 0005+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80392720 = ".bck";
#pragma pop
/* 80392725-8039272A 01ED85 0005+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80392725 = ".btp";
#pragma pop
/* 8039272A-8039272F 01ED8A 0005+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039272A = ".btk";
#pragma pop
/* 8039272F-8039274A 01ED8F 001B+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039272F = "%.3ff,\t// 注目オフセット\n";
#pragma pop
/* 8039274A-8039275B 01EDAA 0011+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039274A = "%.3ff,\t// 重力\n";
#pragma pop
/* 8039275B-80392770 01EDBB 0015+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039275B = "%.3ff,\t// スケ−ル\n";
#pragma pop
/* 80392770-8039278B 01EDD0 001B+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80392770 = "%.3ff,\t// リアル影サイズ\n";
#pragma pop
/* 8039278B-8039279C 01EDEB 0011+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039278B = "%.3ff,\t// 体重\n";
#pragma pop
/* 8039279C-803927AD 01EDFC 0011+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039279C = "%.3ff,\t// 高さ\n";
#pragma pop
/* 803927AD-803927C0 01EE0D 0013+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803927AD = "%.3ff,\t// ひざ丈\n";
#pragma pop
/* 803927C0-803927CF 01EE20 000F+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803927C0 = "%.3ff,\t// 幅\n";
#pragma pop
/* 803927CF-803927E8 01EE2F 0019+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803927CF = "%.3ff,\t// 腰のＸ角上限\n";
#pragma pop
/* 803927E8-80392801 01EE48 0019+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803927E8 = "%.3ff,\t// 腰のＸ角下限\n";
#pragma pop
/* 80392801-8039281A 01EE61 0019+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80392801 = "%.3ff,\t// 腰のＹ角上限\n";
#pragma pop
/* 8039281A-80392833 01EE7A 0019+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039281A = "%.3ff,\t// 腰のＹ角下限\n";
#pragma pop
/* 80392833-8039284C 01EE93 0019+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80392833 = "%.3ff,\t// 頭のＸ角上限\n";
#pragma pop
/* 8039284C-80392865 01EEAC 0019+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039284C = "%.3ff,\t// 頭のＸ角下限\n";
#pragma pop
/* 80392865-8039287E 01EEC5 0019+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80392865 = "%.3ff,\t// 頭のＹ角上限\n";
#pragma pop
/* 8039287E-80392897 01EEDE 0019+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039287E = "%.3ff,\t// 頭のＹ角下限\n";
#pragma pop
/* 80392897-803928B0 01EEF7 0019+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80392897 = "%.3ff,\t// 首の回転比率\n";
#pragma pop
/* 803928B0-803928C9 01EF10 0019+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803928B0 = "%.3ff,\t// 補間フレ−ム\n";
#pragma pop
/* 803928C9-803928DE 01EF29 0015+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803928C9 = "%d, \t// 会話距離\n";
#pragma pop
/* 803928DE-803928F3 01EF3E 0015+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803928DE = "%d, \t// 会話角度\n";
#pragma pop
/* 803928F3-80392908 01EF53 0015+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803928F3 = "%d, \t// 注目距離\n";
#pragma pop
/* 80392908-8039291D 01EF68 0015+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80392908 = "%d, \t// 注目角度\n";
#pragma pop
/* 8039291D-8039292E 01EF7D 0011+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039291D = "%.3ff,\t// 視界\n";
#pragma pop
/* 8039292E-80392945 01EF8E 0017+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039292E = "%.3ff,\t// サ−チ距離\n";
#pragma pop
/* 80392945-8039295C 01EFA5 0017+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80392945 = "%.3ff,\t// サ−チ高さ\n";
#pragma pop
/* 8039295C-80392973 01EFBC 0017+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039295C = "%.3ff,\t// サ−チ低さ\n";
#pragma pop
/* 80392973-80392988 01EFD3 0015+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80392973 = "%d, \t// 注目時間\n";
#pragma pop
/* 80392988-803929A1 01EFE8 0019+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80392988 = "%d, \t// ダメ−ジ期間\n";
#pragma pop
/* 803929A1-803929B2 01F001 0011+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
// MWCC ignores mapping of some japanese characters using the
// byte 0x5C (ASCII '\'). This is why this string is hex-encoded.
SECTION_DEAD static char const* const stringBase_803929A1 =
"\x25\x64\x2C\x20\x20\x20\x09\x2F\x2F\x20\x20\x95\x5C\x8F\xEE\x0A";
#pragma pop
/* 803929B2-803929C3 01F012 0011+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803929B2 = "%d, \t// 動作\n";
#pragma pop
/* 803929C3-803929DA 01F023 0017+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803929C3 = "%d, \t// 注視モ−ド\n";
#pragma pop
/* 803929DA-803929F7 01F03A 001D+00 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803929DA = "%d, \t// デバグモ−ドＯＮ\n";
#pragma pop
/* 803929F7-80392A18 01F057 001B+06 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803929F7 = "%d, \t// デバグ情報ＯＮ\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80392A12 = "\0\0\0\0\0";
#pragma pop
/* 80450FF8-80451000 0004F8 0008+00 0/0 1/1 0/0 .sbss None */
extern u8 data_80450FF8[8];
u8 data_80450FF8[8];
/* 80392710-80392A18 01ED70 0302+06 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80392710 = "DEFAULT_GETITEM";
SECTION_DEAD static char const* const stringBase_80392720 = ".bck";
SECTION_DEAD static char const* const stringBase_80392725 = ".btp";
SECTION_DEAD static char const* const stringBase_8039272A = ".btk";
SECTION_DEAD static char const* const stringBase_8039272F = "%.3ff,\t// 注目オフセット\n";
SECTION_DEAD static char const* const stringBase_8039274A = "%.3ff,\t// 重力\n";
SECTION_DEAD static char const* const stringBase_8039275B = "%.3ff,\t// スケ−ル\n";
SECTION_DEAD static char const* const stringBase_80392770 = "%.3ff,\t// リアル影サイズ\n";
SECTION_DEAD static char const* const stringBase_8039278B = "%.3ff,\t// 体重\n";
SECTION_DEAD static char const* const stringBase_8039279C = "%.3ff,\t// 高さ\n";
SECTION_DEAD static char const* const stringBase_803927AD = "%.3ff,\t// ひざ丈\n";
SECTION_DEAD static char const* const stringBase_803927C0 = "%.3ff,\t// 幅\n";
SECTION_DEAD static char const* const stringBase_803927CF = "%.3ff,\t// 腰のＸ角上限\n";
SECTION_DEAD static char const* const stringBase_803927E8 = "%.3ff,\t// 腰のＸ角下限\n";
SECTION_DEAD static char const* const stringBase_80392801 = "%.3ff,\t// 腰のＹ角上限\n";
SECTION_DEAD static char const* const stringBase_8039281A = "%.3ff,\t// 腰のＹ角下限\n";
SECTION_DEAD static char const* const stringBase_80392833 = "%.3ff,\t// 頭のＸ角上限\n";
SECTION_DEAD static char const* const stringBase_8039284C = "%.3ff,\t// 頭のＸ角下限\n";
SECTION_DEAD static char const* const stringBase_80392865 = "%.3ff,\t// 頭のＹ角上限\n";
SECTION_DEAD static char const* const stringBase_8039287E = "%.3ff,\t// 頭のＹ角下限\n";
SECTION_DEAD static char const* const stringBase_80392897 = "%.3ff,\t// 首の回転比率\n";
SECTION_DEAD static char const* const stringBase_803928B0 = "%.3ff,\t// 補間フレ−ム\n";
SECTION_DEAD static char const* const stringBase_803928C9 = "%d, \t// 会話距離\n";
SECTION_DEAD static char const* const stringBase_803928DE = "%d, \t// 会話角度\n";
SECTION_DEAD static char const* const stringBase_803928F3 = "%d, \t// 注目距離\n";
SECTION_DEAD static char const* const stringBase_80392908 = "%d, \t// 注目角度\n";
SECTION_DEAD static char const* const stringBase_8039291D = "%.3ff,\t// 視界\n";
SECTION_DEAD static char const* const stringBase_8039292E = "%.3ff,\t// サ−チ距離\n";
SECTION_DEAD static char const* const stringBase_80392945 = "%.3ff,\t// サ−チ高さ\n";
SECTION_DEAD static char const* const stringBase_8039295C = "%.3ff,\t// サ−チ低さ\n";
SECTION_DEAD static char const* const stringBase_80392973 = "%d, \t// 注目時間\n";
SECTION_DEAD static char const* const stringBase_80392988 = "%d, \t// ダメ−ジ期間\n";
// MWCC ignores mapping of some japanese characters using the
// byte 0x5C (ASCII '\'). This is why this string is hex-encoded.
SECTION_DEAD static char const* const stringBase_803929A1 =
"\x25\x64\x2C\x20\x20\x20\x09\x2F\x2F\x20\x20\x95\x5C\x8F\xEE\x0A";
SECTION_DEAD static char const* const stringBase_803929B2 = "%d, \t// 動作\n";
SECTION_DEAD static char const* const stringBase_803929C3 = "%d, \t// 注視モ−ド\n";
SECTION_DEAD static char const* const stringBase_803929DA = "%d, \t// デバグモ−ドＯＮ\n";
SECTION_DEAD static char const* const stringBase_803929F7 = "%d, \t// デバグ情報ＯＮ\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80392A12 = "\0\0\0\0\0";
#pragma pop
/* 80392710-80392710 01ED70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/a/d_a_obj.cpp
+16 -15
View File
@@ -17,13 +17,13 @@ struct daPy_py_c {
/* 8015F398 */ void checkMasterSwordEquip();
};
struct Quaternion {};
struct dCcD_GObjInf {
/* 800844F8 */ void GetTgHitObj();
/* 8008457C */ void GetTgHitObjSe();
};
struct Quaternion {};
struct Vec {};
struct cXyz {
@@ -56,11 +56,11 @@ struct dRes_control_c {
/* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
};
struct JPABaseEmitter {};
struct dKy_tevstr_c {};
struct J3DModelData {};
struct dKy_tevstr_c {};
struct JPABaseEmitter {};
struct dPa_modelEcallBack {
/* 8004AC00 */ void setModel(JPABaseEmitter*, J3DModelData*, dKy_tevstr_c const&, u8, void*, u8,
@@ -71,10 +71,10 @@ struct dPa_modelEcallBack {
struct dPa_levelEcallBack {};
struct _GXColor {};
struct csXyz {};
struct _GXColor {};
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*,
@@ -181,6 +181,14 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
/* ############################################################################################## */
/* 803792A8-803792A8 005908 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803792A8 = "Always";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803792AF = "";
#pragma pop
/* 80451D98-80451D9C 000398 0004+00 6/6 0/0 0/0 .sdata2 @3671 */
SECTION_SDATA2 static f32 lit_3671 = 1.0f;
@@ -339,7 +347,7 @@ SECTION_RODATA static f32 const zero_quat[4] = {
0.0f,
1.0f,
};
COMPILER_STRIP_GATE(80379298, &zero_quat);
COMPILER_STRIP_GATE(0x80379298, &zero_quat);
/* 80451DA8-80451DB0 0003A8 0004+04 1/1 0/0 0/0 .sdata2 @3956 */
SECTION_SDATA2 static f32 lit_3956[1 + 1 /* padding */] = {
@@ -391,11 +399,4 @@ asm void cCcD_SphAttr::GetCoCP() {
}
#pragma pop
/* 803792A8-803792B0 005908 0007+01 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803792A8 = "Always";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803792AF = "";
#pragma pop
/* 803792A8-803792A8 005908 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/a/d_a_player.cpp
+2 -2
View File
@@ -668,7 +668,7 @@ SECTION_RODATA static u8 const twglArcName[10 + 2 /* padding */] = {
0x00,
0x00,
};
COMPILER_STRIP_GATE(80393DA8, &twglArcName);
COMPILER_STRIP_GATE(0x80393DA8, &twglArcName);
/* 80393DB4-80393DC0 020414 000A+02 1/0 0/0 0/0 .rodata twgwArcName$4617 */
SECTION_RODATA static u8 const twgwArcName[10 + 2 /* padding */] = {
@@ -686,7 +686,7 @@ SECTION_RODATA static u8 const twgwArcName[10 + 2 /* padding */] = {
0x00,
0x00,
};
COMPILER_STRIP_GATE(80393DB4, &twgwArcName);
COMPILER_STRIP_GATE(0x80393DB4, &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
+74 -13
View File
@@ -65,6 +65,66 @@ asm void daShopItem_c::getPosP() {
#pragma pop
/* ############################################################################################## */
/* 80379738-80379742 005D98 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80379738;
/* 80379742-8037974B 005DA2 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80379742;
/* 8037974B-80379754 005DAB 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_8037974B;
/* 80379754-8037975E 005DB4 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80379754;
/* 8037975E-80379768 005DBE 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_8037975E;
/* 80379768-80379771 005DC8 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80379768;
/* 80379771-8037977A 005DD1 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80379771;
/* 8037977A-80379783 005DDA 0009+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_8037977A;
/* 80379783-8037978D 005DE3 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80379783;
/* 8037978D-80379795 005DED 0008+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_8037978D;
/* 80379795-8037979D 005DF5 0008+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_80379795;
/* 8037979D-803797A7 005DFD 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_8037979D;
/* 803797A7-803797B1 005E07 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803797A7;
/* 803797B1-803797BB 005E11 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803797B1;
/* 803797BB-803797C5 005E1B 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803797BB;
/* 803797C5-803797CF 005E25 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803797C5;
/* 803797CF-803797D9 005E2F 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803797CF;
/* 803797D9-803797E3 005E39 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803797D9;
/* 803797E3-803797ED 005E43 000A+00 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803797E3;
/* 803797ED-803797F8 005E4D 000A+01 1/0 0/0 0/0 .rodata None */
extern "C" char const* const stringBase_803797ED;
/* 803792E8-80379738 -00001 0450+00 1/1 0/0 9/9 .rodata mData__12daShopItem_c */
SECTION_RODATA void* const daShopItem_c::mData[276] = {
(void*)&d_a_d_a_shop_item_static__stringBase0,
@@ -344,22 +404,11 @@ SECTION_RODATA void* const daShopItem_c::mData[276] = {
(void*)0x0000000C,
(void*)NULL,
};
COMPILER_STRIP_GATE(803792E8, &daShopItem_c::mData);
COMPILER_STRIP_GATE(0x803792E8, &daShopItem_c::mData);
/* 80037C24-80037C7C 032564 0058+00 0/0 0/0 1/1 .text CheckShopItemCreateHeap__FP10fopAc_ac_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void CheckShopItemCreateHeap(fopAc_ac_c* param_0) {
nofralloc
#include "asm/d/a/d_a_shop_item_static/CheckShopItemCreateHeap__FP10fopAc_ac_c.s"
}
#pragma pop
/* 80379738-803797F8 005D98 00BF+01 1/0 0/0 0/0 .rodata @stringBase0 */
/* 80379738-80379738 005D98 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80379738 = "B_mD_sold";
SECTION_DEAD static char const* const stringBase_80379742 = "B_mD_oil";
SECTION_DEAD static char const* const stringBase_8037974B = "O_mD_red";
@@ -383,3 +432,15 @@ SECTION_DEAD static char const* const stringBase_803797ED = "O_mD_gren";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803797F7 = "";
#pragma pop
/* 80037C24-80037C7C 032564 0058+00 0/0 0/0 1/1 .text CheckShopItemCreateHeap__FP10fopAc_ac_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void CheckShopItemCreateHeap(fopAc_ac_c* param_0) {
nofralloc
#include "asm/d/a/d_a_shop_item_static/CheckShopItemCreateHeap__FP10fopAc_ac_c.s"
}
#pragma pop
/* 80379738-80379738 005D98 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/bg/d_bg_plc.cpp
+3 -8
View File
@@ -61,15 +61,10 @@ asm dBgPlc::~dBgPlc() {
}
#pragma pop
/* 800740BC-800740C4 06E9FC 0008+00 0/0 1/1 0/0 .text setBase__6dBgPlcFPv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dBgPlc::setBase(void* param_0) {
nofralloc
#include "asm/d/bg/d_bg_plc/setBase__6dBgPlcFPv.s"
/* 800740BC-800740C4 -00001 0008+00 0/0 0/0 0/0 .text setBase__6dBgPlcFPv */
void dBgPlc::setBase(void* param_0) {
*(u32*)this = (u32)(param_0);
}
#pragma pop
/* 800740C4-800740DC 06EA04 0018+00 0/0 1/1 0/0 .text getCode__6dBgPlcCFiPP5sBgPc */
#pragma push
src/d/bg/d_bg_s.cpp
+7 -13
View File
@@ -38,10 +38,6 @@ struct dBgS_Acch {
/* 8007732C */ void CalcWallRR();
};
struct csXyz {};
struct cXyz {};
struct cBgS_PolyInfo {
/* 802680F8 */ void ChkSetInfo() const;
/* 80268120 */ void ClearPi();
@@ -50,6 +46,10 @@ struct cBgS_PolyInfo {
/* 802681AC */ void ChkBgIndex() const;
};
struct csXyz {};
struct cXyz {};
struct dBgS {
/* 80030C50 */ ~dBgS();
/* 800748FC */ void Ct();
@@ -96,7 +96,6 @@ struct dBgS {
struct cM3dGPla {};
struct cBgW_BgId {
/* 802681C0 */ void Regist(int);
/* 802681C8 */ void Release();
/* 802681D4 */ void ChkUsed() const;
};
@@ -520,15 +519,10 @@ asm void dBgS::Regist(dBgW_Base* param_0, fopAc_ac_c* param_1) {
}
#pragma pop
/* 80074AB4-80074ABC 06F3F4 0008+00 0/0 5/0 0/0 .text SetOldShapeAngleY__9dBgW_BaseFs */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dBgW_Base::SetOldShapeAngleY(s16 param_0) {
nofralloc
#include "asm/d/bg/d_bg_s/SetOldShapeAngleY__9dBgW_BaseFs.s"
/* 80074AB4-80074ABC -00001 0008+00 0/0 0/0 0/0 .text SetOldShapeAngleY__9dBgW_BaseFs */
void dBgW_Base::SetOldShapeAngleY(s16 param_0) {
*(u16*)(((u8*)this) + 12) /* this->field_0xc */ = (u16)(param_0);
}
#pragma pop
/* 80074ABC-80074B40 06F3FC 0084+00 0/0 11/11 5/5 .text ChkMoveBG__4dBgSFRC13cBgS_PolyInfo */
#pragma push
src/d/bg/d_bg_s_acch.cpp
+5 -6
View File
@@ -60,17 +60,18 @@ struct dBgS_AcchCir {
/* 80077414 */ ~dBgS_AcchCir();
};
struct dBgS_Acch;
struct csXyz {};
struct Vec {};
struct cBgS_PolyInfo {
/* 80268074 */ cBgS_PolyInfo();
/* 802680B0 */ ~cBgS_PolyInfo();
/* 80268120 */ void ClearPi();
/* 8026816C */ void SetActorInfo(int, void*, unsigned int);
/* 802681A4 */ void SetPolyIndex(int);
};
struct csXyz {};
struct dBgS_Acch;
struct dBgS {
/* 8007524C */ void WallCorrect(dBgS_Acch*);
/* 80075374 */ void WallCorrectSort(dBgS_Acch*);
@@ -80,8 +81,6 @@ 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
@@ -233,8 +233,8 @@ asm void dBgS_MoveBgActor::MoveBGCreateHeap() {
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dBgS_MoveBgActor::MoveBGCreate(char const* param_0, int param_1,
void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*,
csXyz*, csXyz*),
void (*param_2)(dBgW*, void*, cBgS_PolyInfo const&, bool,
cXyz*, csXyz*, csXyz*),
u32 param_3, f32 (*param_4)[3][4]) {
nofralloc
#include "asm/d/bg/d_bg_s_movebg_actor/func_800787BC.s"
src/d/bg/d_bg_w.cpp
+10 -13
View File
@@ -16,23 +16,22 @@ struct fopAc_ac_c {};
struct cXyz {};
struct dBgW_Base {
/* 80074AB4 */ void SetOldShapeAngleY(s16);
/* 8007E5A8 */ dBgW_Base();
/* 8007E640 */ ~dBgW_Base();
/* 8007E6D8 */ void CallRideCallBack(fopAc_ac_c*, fopAc_ac_c*);
/* 8007E6DC */ void CallArrowStickCallBack(fopAc_ac_c*, fopAc_ac_c*, cXyz&);
};
struct cBgS_PolyInfo {};
struct csXyz {};
struct cBgS_GrpPassChk {};
struct cBgS_PolyPassChk {};
struct dBgS_CaptPoly {};
struct dBgS_RoofChk {};
struct dBgS_SplGrpChk {};
struct Vec {};
struct dBgS_Acch {
@@ -42,18 +41,16 @@ struct dBgS_Acch {
/* 800772E8 */ void CalcMovePosWork();
};
struct cBgS_PolyInfo {
/* 802681A4 */ void SetPolyIndex(int);
};
struct cBgS_PolyPassChk {};
struct dBgS_SphChk {};
struct dBgS_RoofChk {};
struct cM3dGPla {
/* 8026F57C */ void getCrossY(cXyz const&, f32*) const;
};
struct dBgS_SplGrpChk {};
struct dBgW {
/* 8007B3AC */ void GetExitId(cBgS_PolyInfo const&);
/* 8007B3D8 */ void GetPolyColor(cBgS_PolyInfo const&);
@@ -174,14 +171,14 @@ struct cBgW_GrpElm {
/* 8007A1E4 */ cBgW_GrpElm();
};
struct cBgD_t {};
struct cBgS_ShdwDraw {};
struct cBgS_LinChk {};
struct cBgS_GndChk {};
struct cBgD_t {};
struct cBgW {
/* 80079294 */ cBgW();
/* 8007933C */ ~cBgW();
src/d/bg/d_bg_w_base.cpp
-1
View File
@@ -16,7 +16,6 @@ struct fopAc_ac_c {};
struct cXyz {};
struct dBgW_Base {
/* 80074AB4 */ void SetOldShapeAngleY(s16);
/* 8007E5A8 */ dBgW_Base();
/* 8007E640 */ ~dBgW_Base();
/* 8007E69C */ void ClrDBgWBase();
src/d/bg/d_bg_w_kcol.cpp
+16 -20
View File
@@ -18,7 +18,6 @@ struct fopAc_ac_c {};
struct cXyz {};
struct dBgW_Base {
/* 80074AB4 */ void SetOldShapeAngleY(s16);
/* 8007E5A8 */ dBgW_Base();
/* 8007E640 */ ~dBgW_Base();
/* 8007E69C */ void ClrDBgWBase();
@@ -27,16 +26,12 @@ struct dBgW_Base {
/* 8007E6DC */ void CallArrowStickCallBack(fopAc_ac_c*, fopAc_ac_c*, cXyz&);
};
struct cBgS_PolyInfo {};
struct csXyz {};
struct cBgS_ShdwDraw {};
struct cBgS_GrpPassChk {};
struct cBgS_LinChk {};
struct dBgS_RoofChk {};
struct dBgS_SplGrpChk {};
struct dBgPc {
/* 80074048 */ void setCode(sBgPc&);
};
@@ -50,21 +45,23 @@ struct dBgS_Acch {
/* 800772E8 */ void CalcMovePosWork();
};
struct cBgS_PolyInfo {
/* 802681A4 */ void SetPolyIndex(int);
};
struct cBgS_PolyPassChk {};
struct KC_PrismData {};
struct csXyz {};
struct dBgS_SphChk {};
struct dBgS_CaptPoly {};
struct dBgS_SplGrpChk {};
struct KC_PrismData {};
struct cBgS_GrpPassChk {};
struct cBgS_LinChk {};
struct cBgS_GndChk {};
struct dBgS_SphChk {};
struct dBgS_RoofChk {};
struct cBgS_PolyPassChk {};
struct dBgWKCol {
/* 8007E6F4 */ dBgWKCol();
@@ -140,7 +137,6 @@ struct dBgS_PolyPassChk {
struct dBgPlc {
/* 80074074 */ dBgPlc();
/* 80074080 */ ~dBgPlc();
/* 800740BC */ void setBase(void*);
/* 800740C4 */ void getCode(int, sBgPc**) const;
/* 800740DC */ void getGrpCode(int) const;
};
src/d/bg/d_bg_w_sv.cpp
+8 -12
View File
@@ -13,14 +13,10 @@
struct fopAc_ac_c {};
struct dBgW_Base {
/* 80074AB4 */ void SetOldShapeAngleY(s16);
};
struct cBgD_t {};
struct cBgS_PolyInfo {};
struct cBgD_t {};
struct csXyz {};
struct cXyz {};
@@ -38,18 +34,18 @@ struct dBgWSv {
struct cBgS_GrpPassChk {};
struct dBgS_CaptPoly {};
struct dBgS_RoofChk {};
struct cBgS_PolyPassChk {};
struct dBgS_SplGrpChk {};
struct dBgS_Acch {};
struct cBgS_PolyPassChk {};
struct dBgS_SphChk {};
struct dBgS_RoofChk {};
struct dBgS_CaptPoly {};
struct dBgW {
/* 8007B3AC */ void GetExitId(cBgS_PolyInfo const&);
/* 8007B3D8 */ void GetPolyColor(cBgS_PolyInfo const&);
@@ -96,10 +92,10 @@ struct dBgW {
/* 8007E4B4 */ void ChkMoveFlag() const;
};
struct cBgS_LinChk {};
struct cBgS_ShdwDraw {};
struct cBgS_LinChk {};
struct cBgS_GndChk {};
struct cBgW {
src/d/cc/d_cc_d.cpp
+25 -25
View File
@@ -157,7 +157,6 @@ struct cM3dGCps {
/* 8026F03C */ void Set(cM3dGCpsS const&);
};
struct cCcD_TriAttr;
struct cCcD_ShapeAttr {
struct Shape {};
@@ -168,12 +167,13 @@ struct cCcD_ShapeAttr {
static f32 m_virtual_center[3];
};
struct cCcD_AabAttr {};
struct cCcD_CpsAttr;
struct cCcD_SphAttr;
struct cCcD_TriAttr;
struct cCcD_PntAttr {};
struct cCcD_AabAttr {};
struct cCcD_SphAttr;
struct cCcD_CpsAttr;
struct cCcD_CylAttr {
/* 80084CC0 */ void GetCoCP() const;
/* 80037A4C */ void GetCoCP();
@@ -196,6 +196,25 @@ 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();
@@ -218,25 +237,6 @@ struct cCcD_SphAttr {
/* 80264808 */ 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_TriAttr {
/* 80084E44 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const;
/* 80263A88 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
@@ -1281,7 +1281,7 @@ SECTION_RODATA u8 const dCcD_GObjInf::m_hitSeID[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,
};
COMPILER_STRIP_GATE(8037A780, &dCcD_GObjInf::m_hitSeID);
COMPILER_STRIP_GATE(0x8037A780, &dCcD_GObjInf::m_hitSeID);
/* 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
+4 -3
View File
@@ -24,14 +24,14 @@ struct dCcMassS_Obj {
/* 800855C8 */ dCcMassS_Obj();
};
struct Vec {};
struct cM3dGCps {
/* 8026EF88 */ cM3dGCps();
/* 8026EFA4 */ ~cM3dGCps();
/* 8026F080 */ void SetCps(cM3dGCps const&);
};
struct Vec {};
struct dCcMassS_HitInf {
/* 80085334 */ void ClearPointer();
};
@@ -161,7 +161,8 @@ extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */];
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dCcMassS_Obj::Set(cCcD_Obj* param_0, u8 param_1, void (*)(fopAc_ac_c*, cXyz*, u32)) {
asm void dCcMassS_Obj::Set(cCcD_Obj* param_0, u8 param_1,
void (*param_2)(fopAc_ac_c*, cXyz*, u32)) {
nofralloc
#include "asm/d/cc/d_cc_mass_s/Set__12dCcMassS_ObjFP8cCcD_ObjUcPFP10fopAc_ac_cP4cXyzUl_v.s"
}
src/d/cc/d_cc_s.cpp
+10 -10
View File
@@ -33,7 +33,15 @@ struct dJntCol_c {
/* 80036C44 */ void getHitmarkPosAndAngle(cXyz const*, csXyz const*, cXyz*, csXyz*, int) const;
};
struct dCcD_GStts {};
struct dCcD_GObjInf {
/* 800843DC */ void ChkAtNoGuard();
};
struct cCcD_GObjInf {};
struct cCcD_ShapeAttr {
struct Shape {};
};
struct cCcD_Stts {
/* 80263934 */ void PlusCcMove(f32, f32, f32);
@@ -42,19 +50,11 @@ struct cCcD_Stts {
struct cCcD_GStts {};
struct cCcD_ShapeAttr {
struct Shape {};
};
struct cCcD_Obj {
/* 80263A48 */ void GetAc();
};
struct cCcD_GObjInf {};
struct dCcD_GObjInf {
/* 800843DC */ void ChkAtNoGuard();
};
struct dCcD_GStts {};
struct dCcS {
/* 8002FF40 */ ~dCcS();
src/d/com/d_com_inf_game.cpp
+117 -100
View File
@@ -849,15 +849,10 @@ asm void dComIfG_play_c::clearItemBombNumCount(u8 param_0) {
}
#pragma pop
/* 8002B3A8-8002B3B0 025CE8 0008+00 0/0 2/2 0/0 .text setNowVibration__14dComIfG_play_cFUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dComIfG_play_c::setNowVibration(u8 param_0) {
nofralloc
#include "asm/d/com/d_com_inf_game/setNowVibration__14dComIfG_play_cFUc.s"
/* 8002B3A8-8002B3B0 -00001 0008+00 0/0 0/0 0/0 .text setNowVibration__14dComIfG_play_cFUc */
void dComIfG_play_c::setNowVibration(u8 param_0) {
*(u8*)(((u8*)this) + 20314) /* this->field_0x4f5a */ = (u8)(param_0);
}
#pragma pop
/* 8002B3B0-8002B3B8 025CF0 0008+00 0/0 2/2 0/0 .text getNowVibration__14dComIfG_play_cFv
*/
@@ -891,6 +886,46 @@ static asm void dComIfG_get_timelayer(int* param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 80378F38-80378F38 005598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80378F38 = "D_MN11";
SECTION_DEAD static char const* const stringBase_80378F3F = "F_SP114";
SECTION_DEAD static char const* const stringBase_80378F47 = "F_SP108";
SECTION_DEAD static char const* const stringBase_80378F4F = "R_SP108";
SECTION_DEAD static char const* const stringBase_80378F57 = "F_SP109";
SECTION_DEAD static char const* const stringBase_80378F5F = "F_SP111";
SECTION_DEAD static char const* const stringBase_80378F67 = "R_SP109";
SECTION_DEAD static char const* const stringBase_80378F6F = "R_SP209";
SECTION_DEAD static char const* const stringBase_80378F77 = "F_SP110";
SECTION_DEAD static char const* const stringBase_80378F7F = "R_SP110";
SECTION_DEAD static char const* const stringBase_80378F87 = "F_SP115";
SECTION_DEAD static char const* const stringBase_80378F8F = "F_SP116";
SECTION_DEAD static char const* const stringBase_80378F97 = "R_SP116";
SECTION_DEAD static char const* const stringBase_80378F9F = "R_SP115";
SECTION_DEAD static char const* const stringBase_80378FA7 = "F_SP113";
SECTION_DEAD static char const* const stringBase_80378FAF = "F_SP126";
SECTION_DEAD static char const* const stringBase_80378FB7 = "F_SP124";
SECTION_DEAD static char const* const stringBase_80378FBF = "F_SP112";
SECTION_DEAD static char const* const stringBase_80378FC7 = "F_SP103";
SECTION_DEAD static char const* const stringBase_80378FCF = "R_SP01";
SECTION_DEAD static char const* const stringBase_80378FD6 = "F_SP104";
SECTION_DEAD static char const* const stringBase_80378FDE = "F_SP00";
SECTION_DEAD static char const* const stringBase_80378FE5 = "F_SP121";
SECTION_DEAD static char const* const stringBase_80378FED = "F_SP122";
SECTION_DEAD static char const* const stringBase_80378FF5 = "F_SP128";
SECTION_DEAD static char const* const stringBase_80378FFD = "R_SP160";
SECTION_DEAD static char const* const stringBase_80379005 = "F_SP117";
SECTION_DEAD static char const* const stringBase_8037900D = "F_SP118";
SECTION_DEAD static char const* const stringBase_80379015 = "D_SB10";
SECTION_DEAD static char const* const stringBase_8037901C = "R_SP107";
SECTION_DEAD static char const* const stringBase_80379024 = "D_MN09";
SECTION_DEAD static char const* const stringBase_8037902B = "F_SP127";
SECTION_DEAD static char const* const stringBase_80379033 = "R_SP127";
SECTION_DEAD static char const* const stringBase_8037903B = "D_MN08A";
#pragma pop
/* 8002B434-8002C950 025D74 151C+00 1/1 1/1 0/0 .text
* getLayerNo_common_common__14dComIfG_play_cFPCcii */
#pragma push
@@ -998,15 +1033,10 @@ asm void dComIfG_play_c::entrySimpleModel(J3DModel* param_0, int param_1) {
}
#pragma pop
/* 8002CB94-8002CB9C 0274D4 0008+00 0/0 4/4 0/0 .text setTimerNowTimeMs__14dComIfG_play_cFi */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dComIfG_play_c::setTimerNowTimeMs(int param_0) {
nofralloc
#include "asm/d/com/d_com_inf_game/setTimerNowTimeMs__14dComIfG_play_cFi.s"
/* 8002CB94-8002CB9C -00001 0008+00 0/0 0/0 0/0 .text setTimerNowTimeMs__14dComIfG_play_cFi */
void dComIfG_play_c::setTimerNowTimeMs(int param_0) {
*(u32*)(((u8*)this) + 20476) /* this->field_0x4ffc */ = (u32)(param_0);
}
#pragma pop
/* 8002CB9C-8002CBA4 0274DC 0008+00 0/0 2/2 3/3 .text getTimerNowTimeMs__14dComIfG_play_cFv */
#pragma push
@@ -1018,15 +1048,10 @@ asm void dComIfG_play_c::getTimerNowTimeMs() {
}
#pragma pop
/* 8002CBA4-8002CBAC 0274E4 0008+00 0/0 3/3 0/0 .text setTimerLimitTimeMs__14dComIfG_play_cFi */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dComIfG_play_c::setTimerLimitTimeMs(int param_0) {
nofralloc
#include "asm/d/com/d_com_inf_game/setTimerLimitTimeMs__14dComIfG_play_cFi.s"
/* 8002CBA4-8002CBAC -00001 0008+00 0/0 0/0 0/0 .text setTimerLimitTimeMs__14dComIfG_play_cFi */
void dComIfG_play_c::setTimerLimitTimeMs(int param_0) {
*(u32*)(((u8*)this) + 20480) /* this->field_0x5000 */ = (u32)(param_0);
}
#pragma pop
/* 8002CBAC-8002CBB4 0274EC 0008+00 0/0 1/1 0/0 .text getTimerLimitTimeMs__14dComIfG_play_cFv */
#pragma push
@@ -1038,15 +1063,10 @@ asm void dComIfG_play_c::getTimerLimitTimeMs() {
}
#pragma pop
/* 8002CBB4-8002CBBC 0274F4 0008+00 0/0 3/3 0/0 .text setTimerMode__14dComIfG_play_cFi */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dComIfG_play_c::setTimerMode(int param_0) {
nofralloc
#include "asm/d/com/d_com_inf_game/setTimerMode__14dComIfG_play_cFi.s"
/* 8002CBB4-8002CBBC -00001 0008+00 0/0 0/0 0/0 .text setTimerMode__14dComIfG_play_cFi */
void dComIfG_play_c::setTimerMode(int param_0) {
*(u32*)(((u8*)this) + 20484) /* this->field_0x5004 */ = (u32)(param_0);
}
#pragma pop
/* 8002CBBC-8002CBC4 0274FC 0008+00 6/6 8/8 7/7 .text getTimerMode__14dComIfG_play_cFv */
#pragma push
@@ -1058,16 +1078,11 @@ asm void dComIfG_play_c::getTimerMode() {
}
#pragma pop
/* 8002CBC4-8002CBCC 027504 0008+00 0/0 1/1 0/0 .text setTimerType__14dComIfG_play_cFUc
/* 8002CBC4-8002CBCC -00001 0008+00 0/0 0/0 0/0 .text setTimerType__14dComIfG_play_cFUc
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dComIfG_play_c::setTimerType(u8 param_0) {
nofralloc
#include "asm/d/com/d_com_inf_game/setTimerType__14dComIfG_play_cFUc.s"
void dComIfG_play_c::setTimerType(u8 param_0) {
*(u8*)(((u8*)this) + 20488) /* this->field_0x5008 */ = (u8)(param_0);
}
#pragma pop
/* 8002CBCC-8002CBD4 02750C 0008+00 0/0 1/1 0/0 .text getTimerType__14dComIfG_play_cFv */
#pragma push
@@ -1079,15 +1094,10 @@ asm void dComIfG_play_c::getTimerType() {
}
#pragma pop
/* 8002CBD4-8002CBDC 027514 0008+00 0/0 2/2 0/0 .text setTimerPtr__14dComIfG_play_cFP8dTimer_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dComIfG_play_c::setTimerPtr(dTimer_c* param_0) {
nofralloc
#include "asm/d/com/d_com_inf_game/setTimerPtr__14dComIfG_play_cFP8dTimer_c.s"
/* 8002CBD4-8002CBDC -00001 0008+00 0/0 0/0 0/0 .text setTimerPtr__14dComIfG_play_cFP8dTimer_c */
void dComIfG_play_c::setTimerPtr(dTimer_c* param_0) {
*(u32*)(((u8*)this) + 20472) /* this->field_0x4ff8 */ = (u32)(param_0);
}
#pragma pop
/* 8002CBDC-8002CBE4 02751C 0008+00 6/6 7/7 15/15 .text getTimerPtr__14dComIfG_play_cFv
*/
@@ -1111,6 +1121,12 @@ asm void dComIfG_inf_c::ct() {
#pragma pop
/* ############################################################################################## */
/* 80378F38-80378F38 005598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379043 = "F_SP102";
#pragma pop
/* 80450600-80450604 000080 0004+00 0/0 18/18 2/2 .sdata g_clearColor */
SECTION_SDATA extern u8 g_clearColor[4] = {
0x00,
@@ -1143,6 +1159,14 @@ asm void dComIfG_resetToOpening(scene_class* param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 80378F38-80378F38 005598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037904B = "/res/Object/";
SECTION_DEAD static char const* const stringBase_80379058 = "%s.arc Read Error !!\n";
#pragma pop
/* 8002CDB8-8002CE38 0276F8 0080+00 1/0 0/0 0/0 .text phase_1__FPc */
#pragma push
#pragma optimization_level 0
@@ -1153,6 +1177,13 @@ static asm void phase_1(char* param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 80378F38-80378F38 005598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037906E = "%s.arc Sync Read Error !!\n";
#pragma pop
/* 8002CE38-8002CEB4 027778 007C+00 1/0 0/0 0/0 .text phase_2__FPc */
#pragma push
#pragma optimization_level 0
@@ -1299,6 +1330,13 @@ asm void dComIfGp_getRoomArrow(int param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 80378F38-80378F38 005598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379089 = "";
#pragma pop
/* 8002D2FC-8002D554 027C3C 0258+00 2/2 7/7 4/4 .text dComIfGp_setNextStage__FPCcsScScfUliScsii */
#pragma push
#pragma optimization_level 0
@@ -1812,6 +1850,12 @@ asm void dComIfG_getTrigA(u32 param_0) {
#pragma pop
/* ############################################################################################## */
/* 80378F38-80378F38 005598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037908A = "dat/field.dat";
#pragma pop
/* 80451D18-80451D1C 000318 0004+00 1/1 0/0 0/0 .sdata2 @6980 */
SECTION_SDATA2 static f32 lit_6980 = -90300.0f;
@@ -2035,6 +2079,13 @@ asm void dComIfG_resLoader_c::load(char const** param_0, JKRHeap* param_1) {
}
#pragma pop
/* ############################################################################################## */
/* 80378F38-80378F38 005598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379098 = "Stg_00";
#pragma pop
/* 8002F434-8002F478 029D74 0044+00 0/0 12/12 12/12 .text dComIfG_getStageRes__FPCc */
#pragma push
#pragma optimization_level 0
@@ -2045,6 +2096,13 @@ asm void dComIfG_getStageRes(char const* param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 80378F38-80378F38 005598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037909F = "Xtg_00";
#pragma pop
/* 8002F478-8002F4BC 029DB8 0044+00 0/0 1/1 0/0 .text dComIfG_getOldStageRes__FPCc */
#pragma push
#pragma optimization_level 0
@@ -2056,6 +2114,14 @@ asm void dComIfG_getOldStageRes(char const* param_0) {
#pragma pop
/* ############################################################################################## */
/* 80378F38-80378F38 005598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803790A6 = "R%02d_00";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803790AF = "";
#pragma pop
/* 80423FD0-80423FF0 050CF0 0020+00 1/1 0/0 0/0 .bss buf$7371 */
static u8 buf[32];
@@ -2285,7 +2351,7 @@ asm void dComIfGp_TransportWarp_check() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dComLbG_PhaseHandler(request_of_phase_process_class* param_0, int (**)(void*),
asm void dComLbG_PhaseHandler(request_of_phase_process_class* param_0, int (**param_1)(void*),
void* param_2) {
nofralloc
#include "asm/d/com/d_com_inf_game/dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv.s"
@@ -2354,7 +2420,7 @@ asm void __sinit_d_com_inf_game_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_8002FD18 = (void*)__sinit_d_com_inf_game_cpp;
REGISTER_CTORS(0x8002FD18, __sinit_d_com_inf_game_cpp);
#pragma pop
/* 8002FD74-8002FDE8 02A6B4 0074+00 1/1 0/0 0/0 .text __dt__13dComIfG_inf_cFv */
@@ -2774,53 +2840,4 @@ SECTION_SDATA extern u32 g_whiteColor = 0xFFFFFFFF;
/* 8045060C-80450610 00008C 0004+00 0/0 3/3 3/3 .sdata g_saftyWhiteColor */
SECTION_SDATA extern u32 g_saftyWhiteColor = 0xA0A0A0FF;
/* 80378F38-803790B0 005598 0177+01 12/12 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80378F38 = "D_MN11";
SECTION_DEAD static char const* const stringBase_80378F3F = "F_SP114";
SECTION_DEAD static char const* const stringBase_80378F47 = "F_SP108";
SECTION_DEAD static char const* const stringBase_80378F4F = "R_SP108";
SECTION_DEAD static char const* const stringBase_80378F57 = "F_SP109";
SECTION_DEAD static char const* const stringBase_80378F5F = "F_SP111";
SECTION_DEAD static char const* const stringBase_80378F67 = "R_SP109";
SECTION_DEAD static char const* const stringBase_80378F6F = "R_SP209";
SECTION_DEAD static char const* const stringBase_80378F77 = "F_SP110";
SECTION_DEAD static char const* const stringBase_80378F7F = "R_SP110";
SECTION_DEAD static char const* const stringBase_80378F87 = "F_SP115";
SECTION_DEAD static char const* const stringBase_80378F8F = "F_SP116";
SECTION_DEAD static char const* const stringBase_80378F97 = "R_SP116";
SECTION_DEAD static char const* const stringBase_80378F9F = "R_SP115";
SECTION_DEAD static char const* const stringBase_80378FA7 = "F_SP113";
SECTION_DEAD static char const* const stringBase_80378FAF = "F_SP126";
SECTION_DEAD static char const* const stringBase_80378FB7 = "F_SP124";
SECTION_DEAD static char const* const stringBase_80378FBF = "F_SP112";
SECTION_DEAD static char const* const stringBase_80378FC7 = "F_SP103";
SECTION_DEAD static char const* const stringBase_80378FCF = "R_SP01";
SECTION_DEAD static char const* const stringBase_80378FD6 = "F_SP104";
SECTION_DEAD static char const* const stringBase_80378FDE = "F_SP00";
SECTION_DEAD static char const* const stringBase_80378FE5 = "F_SP121";
SECTION_DEAD static char const* const stringBase_80378FED = "F_SP122";
SECTION_DEAD static char const* const stringBase_80378FF5 = "F_SP128";
SECTION_DEAD static char const* const stringBase_80378FFD = "R_SP160";
SECTION_DEAD static char const* const stringBase_80379005 = "F_SP117";
SECTION_DEAD static char const* const stringBase_8037900D = "F_SP118";
SECTION_DEAD static char const* const stringBase_80379015 = "D_SB10";
SECTION_DEAD static char const* const stringBase_8037901C = "R_SP107";
SECTION_DEAD static char const* const stringBase_80379024 = "D_MN09";
SECTION_DEAD static char const* const stringBase_8037902B = "F_SP127";
SECTION_DEAD static char const* const stringBase_80379033 = "R_SP127";
SECTION_DEAD static char const* const stringBase_8037903B = "D_MN08A";
SECTION_DEAD static char const* const stringBase_80379043 = "F_SP102";
SECTION_DEAD static char const* const stringBase_8037904B = "/res/Object/";
SECTION_DEAD static char const* const stringBase_80379058 = "%s.arc Read Error !!\n";
SECTION_DEAD static char const* const stringBase_8037906E = "%s.arc Sync Read Error !!\n";
SECTION_DEAD static char const* const stringBase_80379089 = "";
SECTION_DEAD static char const* const stringBase_8037908A = "dat/field.dat";
SECTION_DEAD static char const* const stringBase_80379098 = "Stg_00";
SECTION_DEAD static char const* const stringBase_8037909F = "Xtg_00";
SECTION_DEAD static char const* const stringBase_803790A6 = "R%02d_00";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803790AF = "";
#pragma pop
/* 80378F38-80378F38 005598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/com/d_com_static.cpp
+15 -8
View File
@@ -454,6 +454,13 @@ asm void daNpcMsg_setEvtNum(u8 param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 803790B0-803790B0 005710 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803790B0 = "F_SP103";
#pragma pop
/* 80031648-800316A8 02BF88 0060+00 0/0 0/0 6/6 .text daNpcKakashi_chkSwdTutorialStage__Fv */
#pragma push
#pragma optimization_level 0
@@ -536,6 +543,12 @@ asm void daNpcKakashi_clrSuccessCount() {
#pragma pop
/* ############################################################################################## */
/* 803790B0-803790B0 005710 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803790B8 = "@bg%04x";
#pragma pop
/* 80450D8C-80450D90 -00001 0004+00 0/0 1/1 3/3 .sbss None */
/* 80450D8C 0001+00 data_80450D8C None */
/* 80450D8D 0001+00 data_80450D8D None */
@@ -923,7 +936,7 @@ asm void __sinit_d_com_static_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_80031DC4 = (void*)__sinit_d_com_static_cpp;
REGISTER_CTORS(0x80031DC4, __sinit_d_com_static_cpp);
#pragma pop
/* 80031EAC-80031EE4 02C7EC 0038+00 1/1 0/0 0/0 .text __arraydtor$4479 */
@@ -983,10 +996,4 @@ asm daSus_c::data_c::data_c() {
static u8 pad_80450DD1[4];
#pragma pop
/* 803790B0-803790C0 005710 0010+00 2/2 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803790B0 = "F_SP103";
SECTION_DEAD static char const* const stringBase_803790B8 = "@bg%04x";
#pragma pop
/* 803790B0-803790B0 005710 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_attention.cpp
+24 -18
View File
@@ -38,10 +38,10 @@ struct mDoExt_bpkAnm {
/* 8000D518 */ void entry(J3DMaterialTable*, f32);
};
struct J3DAnmTransform {};
struct J3DModelData {};
struct J3DAnmTransform {};
struct mDoExt_bckAnm {
/* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
/* 8000D9CC */ void entry(J3DModelData*, f32);
@@ -71,12 +71,6 @@ struct dRes_control_c {
/* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
};
struct Vec {};
struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
};
struct cSAngle {
/* 80270F68 */ cSAngle(cSAngle const&);
/* 80270F98 */ cSAngle(s16);
@@ -84,6 +78,12 @@ struct cSAngle {
/* 80271228 */ void operator-(s16) const;
};
struct Vec {};
struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
};
struct dAttention_c {
/* 80070198 */ dAttention_c(fopAc_ac_c*, u32);
/* 80070774 */ ~dAttention_c();
@@ -393,6 +393,12 @@ static asm void func_80070018() {
#pragma pop
/* ############################################################################################## */
/* 8037A770-8037A770 006DD0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A770 = "D_MN09B";
#pragma pop
/* 803A9BF8-803A9C04 006D18 000C+00 2/2 0/0 0/0 .data loc_type_tbl__12dAttention_c */
SECTION_DATA u8 dAttention_c::loc_type_tbl[12] = {
0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x02, 0x00, 0x04,
@@ -536,6 +542,14 @@ asm void dAttDraw_CallBack_c::execute(u16 param_0, J3DTransformInfo* param_1) {
#pragma pop
/* ############################################################################################## */
/* 8037A770-8037A770 006DD0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A778 = "Always";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8037A77F = "";
#pragma pop
/* 80424B00-80424B0C 051820 000C+00 1/1 0/0 0/0 .bss @4093 */
static u8 lit_4093[12];
@@ -1300,7 +1314,7 @@ asm void __sinit_d_attention_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_8007400C = (void*)__sinit_d_attention_cpp;
REGISTER_CTORS(0x8007400C, __sinit_d_attention_cpp);
#pragma pop
/* ############################################################################################## */
@@ -1325,12 +1339,4 @@ SECTION_SDATA extern u8 data_80450688[8] = {
0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
/* 8037A770-8037A780 006DD0 000F+01 2/2 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8037A770 = "D_MN09B";
SECTION_DEAD static char const* const stringBase_8037A778 = "Always";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8037A77F = "";
#pragma pop
/* 8037A770-8037A770 006DD0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_bright_check.cpp
+15 -14
View File
@@ -43,10 +43,10 @@ struct dBrightCheck_c {
/* 80193594 */ void _draw();
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -190,7 +190,7 @@ SECTION_RODATA static u8 const tv_btnA[40] = {
0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74,
0x5F, 0x61, 0x74, 0x34, 0x00, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74,
};
COMPILER_STRIP_GATE(80394910, &tv_btnA);
COMPILER_STRIP_GATE(0x80394910, &tv_btnA);
/* 80394938-80394960 020F98 0028+00 0/1 0/0 0/0 .rodata ftv_btnA$3745 */
#pragma push
@@ -200,7 +200,7 @@ SECTION_RODATA static u8 const ftv_btnA[40] = {
0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74,
0x5F, 0x61, 0x74, 0x34, 0x00, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74,
};
COMPILER_STRIP_GATE(80394938, &ftv_btnA);
COMPILER_STRIP_GATE(0x80394938, &ftv_btnA);
#pragma pop
/* 80394960-803949B0 020FC0 0050+00 0/1 0/0 0/0 .rodata txTV$3751 */
@@ -213,7 +213,7 @@ SECTION_RODATA static u8 const txTV[80] = {
0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x37, 0x31, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33,
0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x38, 0x31, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34,
};
COMPILER_STRIP_GATE(80394960, &txTV);
COMPILER_STRIP_GATE(0x80394960, &txTV);
#pragma pop
/* 803949B0-803949D8 021010 0028+00 0/1 0/0 0/0 .rodata txTVhide$3752 */
@@ -224,7 +224,14 @@ SECTION_RODATA static u8 const txTVhide[40] = {
0x39, 0x6E, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x30, 0x6E, 0x00, 0x6D, 0x65, 0x6E,
0x75, 0x5F, 0x37, 0x6E, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x38, 0x6E,
};
COMPILER_STRIP_GATE(803949B0, &txTVhide);
COMPILER_STRIP_GATE(0x803949B0, &txTVhide);
#pragma pop
/* 803949D8-803949D8 021038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803949D8 = "zelda_option_check.blo";
SECTION_DEAD static char const* const stringBase_803949EF = "";
#pragma pop
/* 80453A00-80453A04 002000 0004+00 2/2 0/0 0/0 .sdata2 @3792 */
@@ -313,7 +320,7 @@ asm void __sinit_d_bright_check_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_80193608 = (void*)__sinit_d_bright_check_cpp;
REGISTER_CTORS(0x80193608, __sinit_d_bright_check_cpp);
#pragma pop
/* 80193648-80193690 18DF88 0048+00 1/0 0/0 0/0 .text __dt__19dDlst_BrightCheck_cFv */
@@ -326,10 +333,4 @@ asm dDlst_BrightCheck_c::~dDlst_BrightCheck_c() {
}
#pragma pop
/* 803949D8-803949F0 021038 0018+00 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803949D8 = "zelda_option_check.blo";
SECTION_DEAD static char const* const stringBase_803949EF = "";
#pragma pop
/* 803949D8-803949D8 021038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_cam_param.cpp
+10 -8
View File
@@ -311,6 +311,15 @@ asm dCamBGChk_c::dCamBGChk_c() {
}
#pragma pop
/* ############################################################################################## */
/* 8037A7E0-8037A7E0 006E40 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A7E0 = "camstyle.dat";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8037A7ED = "\0\0";
#pragma pop
/* 800884F0-8008858C 082E30 009C+00 0/0 1/1 0/0 .text __ct__11dCamParam_cFl */
#pragma push
#pragma optimization_level 0
@@ -475,11 +484,4 @@ asm dCstick_c::~dCstick_c() {
}
#pragma pop
/* 8037A7E0-8037A7F0 006E40 000D+03 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8037A7E0 = "camstyle.dat";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8037A7ED = "\0\0";
#pragma pop
/* 8037A7E0-8037A7E0 006E40 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_camera.cpp
+155 -169
View File
@@ -206,15 +206,8 @@ struct dCcMassS_Mng {
/* 80085EB8 */ void GetCamTopPos(Vec*);
};
struct camera_class {};
struct dBgS_LinChk {
/* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
};
struct cSAngle {
/* 80030510 */ ~cSAngle();
/* 80271004 */ void Val(s16);
/* 8027100C */ void Val(f32);
/* 8016C2CC */ void Val() const;
/* 80270FF8 */ void Val(cSAngle const&);
@@ -253,6 +246,12 @@ struct dCamMapToolData {
/* 8015FEB8 */ void Set(s32, s32, fopAc_ac_c*, u16, u8);
};
struct camera_class {};
struct dBgS_LinChk {
/* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
};
struct dCamera_c {
struct dCamInfo_c {
/* 8018291C */ dCamInfo_c();
@@ -1296,6 +1295,111 @@ asm void dCamMapToolData::Set(s32 param_0, s32 param_1, fopAc_ac_c* param_2, u16
#pragma pop
/* ############################################################################################## */
/* 80393F68-80393F68 0205C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80393F68 = "camtype.dat";
SECTION_DEAD static char const* const stringBase_80393F74 = "D_MN01A";
SECTION_DEAD static char const* const stringBase_80393F7C = "D_MN10A";
SECTION_DEAD static char const* const stringBase_80393F84 = "D_MN11A";
SECTION_DEAD static char const* const stringBase_80393F8C = "D_MN04A";
SECTION_DEAD static char const* const stringBase_80393F94 = "D_MN05A";
SECTION_DEAD static char const* const stringBase_80393F9C = "D_MN07A";
SECTION_DEAD static char const* const stringBase_80393FA4 = "FieldS";
SECTION_DEAD static char const* const stringBase_80393FAB = "Event";
SECTION_DEAD static char const* const stringBase_80393FB1 = "Water";
SECTION_DEAD static char const* const stringBase_80393FB7 = "Scope";
SECTION_DEAD static char const* const stringBase_80393FBD = "WaterSurf";
SECTION_DEAD static char const* const stringBase_80393FC7 = "HorseT";
SECTION_DEAD static char const* const stringBase_80393FCE = "Board";
SECTION_DEAD static char const* const stringBase_80393FD4 = "Canoe";
SECTION_DEAD static char const* const stringBase_80393FDA = "Keep";
SECTION_DEAD static char const* const stringBase_80393FDF = "Rodeo";
SECTION_DEAD static char const* const stringBase_80393FE5 = "MagneBoots";
SECTION_DEAD static char const* const stringBase_80393FF0 = "MagneRoof";
SECTION_DEAD static char const* const stringBase_80393FFA = "MagneWall";
SECTION_DEAD static char const* const stringBase_80394004 = "CoccoJump";
SECTION_DEAD static char const* const stringBase_8039400E = "Boar";
SECTION_DEAD static char const* const stringBase_80394013 = "GoatBattle";
SECTION_DEAD static char const* const stringBase_8039401E = "GoronJump";
SECTION_DEAD static char const* const stringBase_80394028 = "Spinner";
SECTION_DEAD static char const* const stringBase_80394030 = "HookWall";
SECTION_DEAD static char const* const stringBase_80394039 = "HookRoof";
SECTION_DEAD static char const* const stringBase_80394042 = "HookActor";
SECTION_DEAD static char const* const stringBase_8039404C = "RoofHung";
SECTION_DEAD static char const* const stringBase_80394055 = "Rotary";
SECTION_DEAD static char const* const stringBase_8039405C = "Street";
SECTION_DEAD static char const* const stringBase_80394063 = "StreetN";
SECTION_DEAD static char const* const stringBase_8039406B = "StreetP";
SECTION_DEAD static char const* const stringBase_80394073 = "Rampart2";
SECTION_DEAD static char const* const stringBase_8039407C = "Allay";
SECTION_DEAD static char const* const stringBase_80394082 = "AllayR";
SECTION_DEAD static char const* const stringBase_80394089 = "AllayR2";
SECTION_DEAD static char const* const stringBase_80394091 = "AllayS";
SECTION_DEAD static char const* const stringBase_80394098 = "AllayN";
SECTION_DEAD static char const* const stringBase_8039409F = "AllayR3";
SECTION_DEAD static char const* const stringBase_803940A7 = "CopyRodHall";
SECTION_DEAD static char const* const stringBase_803940B3 = "MidnaTag";
SECTION_DEAD static char const* const stringBase_803940BC = "WarpObj";
SECTION_DEAD static char const* const stringBase_803940C4 = "LV9GZeldaTri";
SECTION_DEAD static char const* const stringBase_803940D1 = "LV4BOSSSPJP";
SECTION_DEAD static char const* const stringBase_803940DD = "LV7BOSS";
SECTION_DEAD static char const* const stringBase_803940E5 = "TeppeiHook";
SECTION_DEAD static char const* const stringBase_803940F0 = "Peep";
SECTION_DEAD static char const* const stringBase_803940F5 = "DungeonS";
SECTION_DEAD static char const* const stringBase_803940FE = "Room";
SECTION_DEAD static char const* const stringBase_80394103 = "Cave";
SECTION_DEAD static char const* const stringBase_80394108 = "Timer";
SECTION_DEAD static char const* const stringBase_8039410E = "Target";
SECTION_DEAD static char const* const stringBase_80394115 = "Smoothless";
SECTION_DEAD static char const* const stringBase_80394120 = "Mode";
SECTION_DEAD static char const* const stringBase_80394125 = "Radius";
SECTION_DEAD static char const* const stringBase_8039412C = "RadiusNear";
SECTION_DEAD static char const* const stringBase_80394137 = "Longitude";
SECTION_DEAD static char const* const stringBase_80394141 = "Fovy";
SECTION_DEAD static char const* const stringBase_80394146 = "FovyNear";
SECTION_DEAD static char const* const stringBase_8039414F = "Latitude";
SECTION_DEAD static char const* const stringBase_80394158 = "Listener";
SECTION_DEAD static char const* const stringBase_80394161 = "@STARTER";
SECTION_DEAD static char const* const stringBase_8039416A = "Speaker";
SECTION_DEAD static char const* const stringBase_80394172 = "@TALKPARTNER";
SECTION_DEAD static char const* const stringBase_8039417F = "E_RD";
SECTION_DEAD static char const* const stringBase_80394184 = "PAUSE";
SECTION_DEAD static char const* const stringBase_8039418A = "WAIT";
SECTION_DEAD static char const* const stringBase_8039418F = "TALK";
SECTION_DEAD static char const* const stringBase_80394194 = "FIXEDPOS";
SECTION_DEAD static char const* const stringBase_8039419D = "FIXEDFRM";
SECTION_DEAD static char const* const stringBase_803941A6 = "UNITRANS";
SECTION_DEAD static char const* const stringBase_803941AF = "WATCHACTOR";
SECTION_DEAD static char const* const stringBase_803941BA = "RESTOREPOS";
SECTION_DEAD static char const* const stringBase_803941C5 = "GETITEM";
SECTION_DEAD static char const* const stringBase_803941CD = "GAMEOVER";
SECTION_DEAD static char const* const stringBase_803941D6 = "TURNTOACTOR";
SECTION_DEAD static char const* const stringBase_803941E2 = "ROLLING";
SECTION_DEAD static char const* const stringBase_803941EA = "TACT";
SECTION_DEAD static char const* const stringBase_803941EF = "WINDDIR";
SECTION_DEAD static char const* const stringBase_803941F7 = "PORTALWARP";
SECTION_DEAD static char const* const stringBase_80394202 = "STYLE";
SECTION_DEAD static char const* const stringBase_80394208 = "SAVE";
SECTION_DEAD static char const* const stringBase_8039420D = "LOAD";
SECTION_DEAD static char const* const stringBase_80394212 = "USEITEM0";
SECTION_DEAD static char const* const stringBase_8039421B = "USEITEM1";
SECTION_DEAD static char const* const stringBase_80394224 = "FIXEDFRMS";
SECTION_DEAD static char const* const stringBase_8039422E = "BSPLINE";
SECTION_DEAD static char const* const stringBase_80394236 = "POSSESSED";
SECTION_DEAD static char const* const stringBase_80394240 = "TWOACTOR0";
SECTION_DEAD static char const* const stringBase_8039424A = "STOKER";
SECTION_DEAD static char const* const stringBase_80394251 = "UNIBRAKE";
SECTION_DEAD static char const* const stringBase_8039425A = "UNIACCELE";
SECTION_DEAD static char const* const stringBase_80394264 = "STBWAIT";
SECTION_DEAD static char const* const stringBase_8039426C = "CURRENT";
SECTION_DEAD static char const* const stringBase_80394274 = "PEEPHOLE";
SECTION_DEAD static char const* const stringBase_8039427D = "DIGHOLE";
SECTION_DEAD static char const* const stringBase_80394285 = "HINTTALK";
SECTION_DEAD static char const* const stringBase_8039428E = "BSPTRANS";
SECTION_DEAD static char const* const stringBase_80394297 = "MAPTOOL";
#pragma pop
/* 803BA160-803BA16C 017280 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -3720,7 +3824,23 @@ 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,
};
COMPILER_STRIP_GATE(80393DC0, &lit_16654);
COMPILER_STRIP_GATE(0x80393DC0, &lit_16654);
/* 80393F68-80393F68 0205C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039429F = "CAMERA";
SECTION_DEAD static char const* const stringBase_803942A6 = "KeepDist";
SECTION_DEAD static char const* const stringBase_803942AF = "Trim";
SECTION_DEAD static char const* const stringBase_803942B4 = "DEFAULT";
SECTION_DEAD static char const* const stringBase_803942BC = "Recover";
SECTION_DEAD static char const* const stringBase_803942C4 = "WaitAnyKey";
SECTION_DEAD static char const* const stringBase_803942CF = "BGCheck";
SECTION_DEAD static char const* const stringBase_803942D7 = "SavePos";
SECTION_DEAD static char const* const stringBase_803942DF = "LoadPos";
SECTION_DEAD static char const* const stringBase_803942E7 = "PlayerHide";
SECTION_DEAD static char const* const stringBase_803942F2 = "WideMode";
#pragma pop
/* 8017F828-8018050C 17A168 0CE4+00 2/1 0/0 0/0 .text eventCamera__9dCamera_cFl */
#pragma push
@@ -3732,6 +3852,15 @@ asm void dCamera_c::eventCamera(s32 param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 80393F68-80393F68 0205C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803942FB = "Continue";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80394304 = "\0\0\0";
#pragma pop
/* 8018050C-801806D4 17AE4C 01C8+00 1/0 0/0 0/0 .text currentEvCamera__9dCamera_cFv */
#pragma push
#pragma optimization_level 0
@@ -3844,7 +3973,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,
};
COMPILER_STRIP_GATE(80393F58, &wave);
COMPILER_STRIP_GATE(0x80393F58, &wave);
/* 80453908-8045390C 001F08 0004+00 1/1 0/0 0/0 .sdata2 @17253 */
SECTION_SDATA2 static f32 lit_17253 = 43.0f / 100.0f;
@@ -3946,15 +4075,10 @@ asm void dCamera_c::SetBlurePosition(f32 param_0, f32 param_1, f32 param_2) {
}
#pragma pop
/* 80181278-80181280 17BBB8 0008+00 1/1 0/0 0/0 .text SetBlureActor__9dCamera_cFP10fopAc_ac_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dCamera_c::SetBlureActor(fopAc_ac_c* param_0) {
nofralloc
#include "asm/d/d_camera/SetBlureActor__9dCamera_cFP10fopAc_ac_c.s"
/* 80181278-80181280 -00001 0008+00 0/0 0/0 0/0 .text SetBlureActor__9dCamera_cFP10fopAc_ac_c */
void dCamera_c::SetBlureActor(fopAc_ac_c* param_0) {
*(u32*)(((u8*)this) + 1808) /* this->field_0x710 */ = (u32)(param_0);
}
#pragma pop
/* ############################################################################################## */
/* 80453918-8045391C 001F18 0004+00 1/1 0/0 0/0 .sdata2 @17392 */
@@ -4250,7 +4374,7 @@ asm void __sinit_d_camera_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801825FC = (void*)__sinit_d_camera_cpp;
REGISTER_CTORS(0x801825FC, __sinit_d_camera_cpp);
#pragma pop
/* 801827EC-801827F4 17D12C 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_CamSphChkFv */
@@ -4635,15 +4759,10 @@ asm void daPy_py_c::checkCopyRodThrowAfter() const {
}
#pragma pop
/* 80182AD0-80182AD8 17D410 0008+00 1/1 0/0 0/0 .text keepLock__12dAttention_cFi */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dAttention_c::keepLock(int param_0) {
nofralloc
#include "asm/d/d_camera/keepLock__12dAttention_cFi.s"
/* 80182AD0-80182AD8 -00001 0008+00 0/0 0/0 0/0 .text keepLock__12dAttention_cFi */
void dAttention_c::keepLock(int param_0) {
*(u32*)(((u8*)this) + 1220) /* this->field_0x4c4 */ = (u32)(param_0);
}
#pragma pop
/* 80182AD8-80182B9C 17D418 00C4+00 1/1 0/0 0/0 .text checkRide__9daPy_py_cCFv */
#pragma push
@@ -4815,35 +4934,20 @@ asm void dCamParam_c::Arg2(s16 param_0) {
}
#pragma pop
/* 80182C6C-80182C74 17D5AC 0008+00 1/1 0/0 0/0 .text Arg1__11dCamParam_cFUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dCamParam_c::Arg1(u8 param_0) {
nofralloc
#include "asm/d/d_camera/Arg1__11dCamParam_cFUc.s"
/* 80182C6C-80182C74 -00001 0008+00 0/0 0/0 0/0 .text Arg1__11dCamParam_cFUc */
void dCamParam_c::Arg1(u8 param_0) {
*(u8*)(((u8*)this) + 2) /* this->field_0x2 */ = (u8)(param_0);
}
#pragma pop
/* 80182C74-80182C7C 17D5B4 0008+00 1/1 0/0 0/0 .text Arg0__11dCamParam_cFUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dCamParam_c::Arg0(u8 param_0) {
nofralloc
#include "asm/d/d_camera/Arg0__11dCamParam_cFUc.s"
/* 80182C74-80182C7C -00001 0008+00 0/0 0/0 0/0 .text Arg0__11dCamParam_cFUc */
void dCamParam_c::Arg0(u8 param_0) {
*(u8*)(((u8*)this) + 1) /* this->field_0x1 */ = (u8)(param_0);
}
#pragma pop
/* 80182C7C-80182C84 17D5BC 0008+00 1/1 0/0 0/0 .text Fovy__11dCamParam_cFUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dCamParam_c::Fovy(u8 param_0) {
nofralloc
#include "asm/d/d_camera/Fovy__11dCamParam_cFUc.s"
/* 80182C7C-80182C84 -00001 0008+00 0/0 0/0 0/0 .text Fovy__11dCamParam_cFUc */
void dCamParam_c::Fovy(u8 param_0) {
*(u8*)this = (u8)(param_0);
}
#pragma pop
/* 80182C84-80182C8C 17D5C4 0008+00 2/2 0/0 0/0 .text U__7cSGlobeCFv */
#pragma push
@@ -5029,122 +5133,4 @@ asm void daTagMwait_c::checkEndMessage() {
}
#pragma pop
/* 80393F68-80394308 0205C8 039C+04 9/8 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80393F68 = "camtype.dat";
SECTION_DEAD static char const* const stringBase_80393F74 = "D_MN01A";
SECTION_DEAD static char const* const stringBase_80393F7C = "D_MN10A";
SECTION_DEAD static char const* const stringBase_80393F84 = "D_MN11A";
SECTION_DEAD static char const* const stringBase_80393F8C = "D_MN04A";
SECTION_DEAD static char const* const stringBase_80393F94 = "D_MN05A";
SECTION_DEAD static char const* const stringBase_80393F9C = "D_MN07A";
SECTION_DEAD static char const* const stringBase_80393FA4 = "FieldS";
SECTION_DEAD static char const* const stringBase_80393FAB = "Event";
SECTION_DEAD static char const* const stringBase_80393FB1 = "Water";
SECTION_DEAD static char const* const stringBase_80393FB7 = "Scope";
SECTION_DEAD static char const* const stringBase_80393FBD = "WaterSurf";
SECTION_DEAD static char const* const stringBase_80393FC7 = "HorseT";
SECTION_DEAD static char const* const stringBase_80393FCE = "Board";
SECTION_DEAD static char const* const stringBase_80393FD4 = "Canoe";
SECTION_DEAD static char const* const stringBase_80393FDA = "Keep";
SECTION_DEAD static char const* const stringBase_80393FDF = "Rodeo";
SECTION_DEAD static char const* const stringBase_80393FE5 = "MagneBoots";
SECTION_DEAD static char const* const stringBase_80393FF0 = "MagneRoof";
SECTION_DEAD static char const* const stringBase_80393FFA = "MagneWall";
SECTION_DEAD static char const* const stringBase_80394004 = "CoccoJump";
SECTION_DEAD static char const* const stringBase_8039400E = "Boar";
SECTION_DEAD static char const* const stringBase_80394013 = "GoatBattle";
SECTION_DEAD static char const* const stringBase_8039401E = "GoronJump";
SECTION_DEAD static char const* const stringBase_80394028 = "Spinner";
SECTION_DEAD static char const* const stringBase_80394030 = "HookWall";
SECTION_DEAD static char const* const stringBase_80394039 = "HookRoof";
SECTION_DEAD static char const* const stringBase_80394042 = "HookActor";
SECTION_DEAD static char const* const stringBase_8039404C = "RoofHung";
SECTION_DEAD static char const* const stringBase_80394055 = "Rotary";
SECTION_DEAD static char const* const stringBase_8039405C = "Street";
SECTION_DEAD static char const* const stringBase_80394063 = "StreetN";
SECTION_DEAD static char const* const stringBase_8039406B = "StreetP";
SECTION_DEAD static char const* const stringBase_80394073 = "Rampart2";
SECTION_DEAD static char const* const stringBase_8039407C = "Allay";
SECTION_DEAD static char const* const stringBase_80394082 = "AllayR";
SECTION_DEAD static char const* const stringBase_80394089 = "AllayR2";
SECTION_DEAD static char const* const stringBase_80394091 = "AllayS";
SECTION_DEAD static char const* const stringBase_80394098 = "AllayN";
SECTION_DEAD static char const* const stringBase_8039409F = "AllayR3";
SECTION_DEAD static char const* const stringBase_803940A7 = "CopyRodHall";
SECTION_DEAD static char const* const stringBase_803940B3 = "MidnaTag";
SECTION_DEAD static char const* const stringBase_803940BC = "WarpObj";
SECTION_DEAD static char const* const stringBase_803940C4 = "LV9GZeldaTri";
SECTION_DEAD static char const* const stringBase_803940D1 = "LV4BOSSSPJP";
SECTION_DEAD static char const* const stringBase_803940DD = "LV7BOSS";
SECTION_DEAD static char const* const stringBase_803940E5 = "TeppeiHook";
SECTION_DEAD static char const* const stringBase_803940F0 = "Peep";
SECTION_DEAD static char const* const stringBase_803940F5 = "DungeonS";
SECTION_DEAD static char const* const stringBase_803940FE = "Room";
SECTION_DEAD static char const* const stringBase_80394103 = "Cave";
SECTION_DEAD static char const* const stringBase_80394108 = "Timer";
SECTION_DEAD static char const* const stringBase_8039410E = "Target";
SECTION_DEAD static char const* const stringBase_80394115 = "Smoothless";
SECTION_DEAD static char const* const stringBase_80394120 = "Mode";
SECTION_DEAD static char const* const stringBase_80394125 = "Radius";
SECTION_DEAD static char const* const stringBase_8039412C = "RadiusNear";
SECTION_DEAD static char const* const stringBase_80394137 = "Longitude";
SECTION_DEAD static char const* const stringBase_80394141 = "Fovy";
SECTION_DEAD static char const* const stringBase_80394146 = "FovyNear";
SECTION_DEAD static char const* const stringBase_8039414F = "Latitude";
SECTION_DEAD static char const* const stringBase_80394158 = "Listener";
SECTION_DEAD static char const* const stringBase_80394161 = "@STARTER";
SECTION_DEAD static char const* const stringBase_8039416A = "Speaker";
SECTION_DEAD static char const* const stringBase_80394172 = "@TALKPARTNER";
SECTION_DEAD static char const* const stringBase_8039417F = "E_RD";
SECTION_DEAD static char const* const stringBase_80394184 = "PAUSE";
SECTION_DEAD static char const* const stringBase_8039418A = "WAIT";
SECTION_DEAD static char const* const stringBase_8039418F = "TALK";
SECTION_DEAD static char const* const stringBase_80394194 = "FIXEDPOS";
SECTION_DEAD static char const* const stringBase_8039419D = "FIXEDFRM";
SECTION_DEAD static char const* const stringBase_803941A6 = "UNITRANS";
SECTION_DEAD static char const* const stringBase_803941AF = "WATCHACTOR";
SECTION_DEAD static char const* const stringBase_803941BA = "RESTOREPOS";
SECTION_DEAD static char const* const stringBase_803941C5 = "GETITEM";
SECTION_DEAD static char const* const stringBase_803941CD = "GAMEOVER";
SECTION_DEAD static char const* const stringBase_803941D6 = "TURNTOACTOR";
SECTION_DEAD static char const* const stringBase_803941E2 = "ROLLING";
SECTION_DEAD static char const* const stringBase_803941EA = "TACT";
SECTION_DEAD static char const* const stringBase_803941EF = "WINDDIR";
SECTION_DEAD static char const* const stringBase_803941F7 = "PORTALWARP";
SECTION_DEAD static char const* const stringBase_80394202 = "STYLE";
SECTION_DEAD static char const* const stringBase_80394208 = "SAVE";
SECTION_DEAD static char const* const stringBase_8039420D = "LOAD";
SECTION_DEAD static char const* const stringBase_80394212 = "USEITEM0";
SECTION_DEAD static char const* const stringBase_8039421B = "USEITEM1";
SECTION_DEAD static char const* const stringBase_80394224 = "FIXEDFRMS";
SECTION_DEAD static char const* const stringBase_8039422E = "BSPLINE";
SECTION_DEAD static char const* const stringBase_80394236 = "POSSESSED";
SECTION_DEAD static char const* const stringBase_80394240 = "TWOACTOR0";
SECTION_DEAD static char const* const stringBase_8039424A = "STOKER";
SECTION_DEAD static char const* const stringBase_80394251 = "UNIBRAKE";
SECTION_DEAD static char const* const stringBase_8039425A = "UNIACCELE";
SECTION_DEAD static char const* const stringBase_80394264 = "STBWAIT";
SECTION_DEAD static char const* const stringBase_8039426C = "CURRENT";
SECTION_DEAD static char const* const stringBase_80394274 = "PEEPHOLE";
SECTION_DEAD static char const* const stringBase_8039427D = "DIGHOLE";
SECTION_DEAD static char const* const stringBase_80394285 = "HINTTALK";
SECTION_DEAD static char const* const stringBase_8039428E = "BSPTRANS";
SECTION_DEAD static char const* const stringBase_80394297 = "MAPTOOL";
SECTION_DEAD static char const* const stringBase_8039429F = "CAMERA";
SECTION_DEAD static char const* const stringBase_803942A6 = "KeepDist";
SECTION_DEAD static char const* const stringBase_803942AF = "Trim";
SECTION_DEAD static char const* const stringBase_803942B4 = "DEFAULT";
SECTION_DEAD static char const* const stringBase_803942BC = "Recover";
SECTION_DEAD static char const* const stringBase_803942C4 = "WaitAnyKey";
SECTION_DEAD static char const* const stringBase_803942CF = "BGCheck";
SECTION_DEAD static char const* const stringBase_803942D7 = "SavePos";
SECTION_DEAD static char const* const stringBase_803942DF = "LoadPos";
SECTION_DEAD static char const* const stringBase_803942E7 = "PlayerHide";
SECTION_DEAD static char const* const stringBase_803942F2 = "WideMode";
SECTION_DEAD static char const* const stringBase_803942FB = "Continue";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80394304 = "\0\0\0";
#pragma pop
/* 80393F68-80393F68 0205C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_demo.cpp
+31 -13
View File
@@ -17,10 +17,10 @@ struct mDoGph_gInf_c {
/* 80007FD8 */ void fadeOut(f32, _GXColor&);
};
struct J3DAnmTransform {};
struct Vec {};
struct J3DAnmTransform {};
struct mDoExt_McaMorf {
/* 8001037C */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32, void*);
/* 800105C8 */ void play(Vec*, u32, s8);
@@ -50,13 +50,13 @@ struct dRes_control_c {
struct dPa_levelEcallBack {};
struct cXyz {
/* 80009184 */ ~cXyz();
};
struct dKy_tevstr_c {};
struct csXyz {};
struct dKy_tevstr_c {};
struct cXyz {
/* 80009184 */ ~cXyz();
};
struct dPa_control_c {
/* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
@@ -110,10 +110,10 @@ struct JStage {
/* 80280B88 */ void JSGGetColor() const;
};
struct TECameraView {};
struct TECameraProjection {};
struct TECameraView {};
struct TCamera {
/* 80280BA0 */ ~TCamera();
/* 80280C00 */ s32 JSGFGetType() const;
@@ -1117,6 +1117,12 @@ static asm void branchFile(char const* param_0) {
#pragma pop
/* ############################################################################################## */
/* 803797F8-803797F8 005E58 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803797F8 = "-";
#pragma pop
/* 80450620-80450628 0000A0 0002+06 3/3 1/1 0/0 .sdata m_branchId__7dDemo_c */
SECTION_SDATA u16 dDemo_c::m_branchId[1 + 3 /* padding */] = {
0xFFFF,
@@ -1685,6 +1691,13 @@ asm dDemo_ambient_c::~dDemo_ambient_c() {
}
#pragma pop
/* ############################################################################################## */
/* 803797F8-803797F8 005E58 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803797FA = "d_act";
#pragma pop
/* 80039528-80039678 033E68 0150+00 1/0 0/0 0/0 .text
* JSGFindObject__14dDemo_system_cCFPPQ26JStage7TObjectPCcQ26JStage8TEObject */
#pragma push
@@ -1742,6 +1755,12 @@ asm jmessage_tControl::~jmessage_tControl() {
#pragma pop
/* ############################################################################################## */
/* 803797F8-803797F8 005E58 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379800 = "デモデータ読み込みエラー！！\n";
#pragma pop
/* 8042465C-80424668 05137C 000C+00 1/1 0/0 0/0 .bss @5233 */
static u8 lit_5233[12];
@@ -1933,14 +1952,13 @@ asm void dDemo_actor_c::JSGGetRotation(Vec* param_0) const {
}
#pragma pop
/* 803797F8-80379840 005E58 0046+02 3/3 0/0 0/0 .rodata @stringBase0 */
/* ############################################################################################## */
/* 8037981E-80379840 005E7E 0020+02 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803797F8 = "-";
SECTION_DEAD static char const* const stringBase_803797FA = "d_act";
SECTION_DEAD static char const* const stringBase_80379800 = "デモデータ読み込みエラー！！\n";
SECTION_DEAD static char const* const stringBase_8037981E = "デモデータ再読み込みエラー！！\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8037983E = "\0";
#pragma pop
/* 803797F8-803797F8 005E58 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_drawlist.cpp
+14 -14
View File
@@ -109,8 +109,6 @@ struct dDlst_peekZ_c {
/* 80056080 */ void peekData();
};
struct dDlst_base_c {};
struct J3DPacket {};
struct J3DDrawBuffer {
@@ -124,6 +122,8 @@ struct J3DDrawBuffer {
struct _GXColor {};
struct dDlst_base_c {};
struct dDlst_list_c {
/* 800560F0 */ dDlst_list_c();
/* 80056390 */ void init();
@@ -206,7 +206,6 @@ struct cBgS_ShdwDraw {
/* 80267F88 */ cBgS_ShdwDraw();
/* 80267FD0 */ ~cBgS_ShdwDraw();
/* 80268048 */ void Set(cXyz&, cXyz&);
/* 8026806C */ void SetCallback(int (*)(cBgS_ShdwDraw*, cBgD_Vtx_t*, int, int, int, cM3dGPla*));
};
struct cBgS {
@@ -3070,7 +3069,7 @@ SECTION_RODATA static u8 const l_drawlistSize[42 + 2 /* padding */] = {
0x00,
0x00,
};
COMPILER_STRIP_GATE(8037A178, &l_drawlistSize);
COMPILER_STRIP_GATE(0x8037A178, &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 */] = {
@@ -3088,7 +3087,7 @@ SECTION_RODATA static u8 const l_nonSortId[9 + 3 /* padding */] = {
0x00,
0x00,
};
COMPILER_STRIP_GATE(8037A1A4, &l_nonSortId);
COMPILER_STRIP_GATE(0x8037A1A4, &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 */] = {
@@ -3217,6 +3216,14 @@ asm void dDlst_list_c::draw(dDlst_base_c** param_0, dDlst_base_c** param_1) {
#pragma pop
/* ############################################################################################## */
/* 8037A1B0-8037A1B0 006810 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A1B0 = "wipe_00.bti";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8037A1BC = "\0\0\0";
#pragma pop
/* 804248F0-80424938 051610 0048+00 3/3 0/0 0/0 .bss mWipeDlst__12dDlst_list_c */
u8 dDlst_list_c::mWipeDlst[72];
@@ -3316,7 +3323,7 @@ asm void __sinit_d_drawlist_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_800569B4 = (void*)__sinit_d_drawlist_cpp;
REGISTER_CTORS(0x800569B4, __sinit_d_drawlist_cpp);
#pragma pop
/* ############################################################################################## */
@@ -3352,11 +3359,4 @@ SECTION_DATA extern void* __vt__13dDlst_2DTri_c[3] = {
extern u8 data_80450EE0[8];
u8 data_80450EE0[8];
/* 8037A1B0-8037A1C0 006810 000C+04 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8037A1B0 = "wipe_00.bti";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8037A1BC = "\0\0\0";
#pragma pop
/* 8037A1B0-8037A1B0 006810 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_envse.cpp
+10 -8
View File
@@ -138,6 +138,15 @@ static asm void dEnvSe_getNearPathPos(cXyz* param_0, cXyz* param_1, dPath* param
}
#pragma pop
/* ############################################################################################## */
/* 80394308-80394308 020968 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394308 = "sndtag";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039430F = "";
#pragma pop
/* 80182FD8-80183480 17D918 04A8+00 1/1 0/0 0/0 .text
* execute_common__8dEnvSe_cFP18dStage_SoundInfo_cPScUc */
#pragma push
@@ -213,11 +222,4 @@ SECTION_DATA extern void* g_profile_ENVSE[10 + 1 /* padding */] = {
NULL,
};
/* 80394308-80394310 020968 0007+01 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80394308 = "sndtag";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039430F = "";
#pragma pop
/* 80394308-80394308 020968 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_error_msg.cpp
+13 -11
View File
@@ -190,7 +190,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,
};
COMPILER_STRIP_GATE(8037B140, &black_tex);
COMPILER_STRIP_GATE(0x8037B140, &black_tex);
/* 8037B180-8037B3E0 0077E0 0260+00 1/1 0/0 0/0 .rodata msg_data */
SECTION_RODATA static u8 const msg_data[608] = {
@@ -233,7 +233,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,
};
COMPILER_STRIP_GATE(8037B180, &msg_data);
COMPILER_STRIP_GATE(0x8037B180, &msg_data);
/* 8037B3E0-8038D640 -00001 12260+00 1/1 0/0 0/0 .rodata font_data */
SECTION_RODATA static void* const font_data[18584] = {
@@ -18823,7 +18823,7 @@ SECTION_RODATA static void* const font_data[18584] = {
(void*)0x69727473,
(void*)0xE1B80000,
};
COMPILER_STRIP_GATE(8037B3E0, &font_data);
COMPILER_STRIP_GATE(0x8037B3E0, &font_data);
/* 80452C18-80452C1C 001218 0004+00 3/3 0/0 0/0 .sdata2 @3758 */
SECTION_SDATA2 static u8 lit_3758[4] = {
@@ -18891,6 +18891,15 @@ asm void dDvdErrorMsg_c::draw(s32 param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 8038D640-8038D640 019CA0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8038D640 = "DVD Error !! <%d>\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8038D653 = "\0\0\0\0";
#pragma pop
/* 8009D354-8009D410 097C94 00BC+00 0/0 1/1 0/0 .text execute__14dDvdErrorMsg_cFv */
#pragma push
#pragma optimization_level 0
@@ -18925,11 +18934,4 @@ asm void dShutdownErrorMsg_c::execute() {
}
#pragma pop
/* 8038D640-8038D658 019CA0 0013+05 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8038D640 = "DVD Error !! <%d>\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8038D653 = "\0\0\0\0";
#pragma pop
/* 8038D640-8038D640 019CA0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_ev_camera.cpp
+197 -102
View File
@@ -580,6 +580,14 @@ asm void dCamera_c::getEvActor(char* param_0, char* param_1) {
}
#pragma pop
/* ############################################################################################## */
/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AAF4 = "Timer";
SECTION_DEAD static char const* const stringBase_8037AAFA = "Stay";
#pragma pop
/* 80089730-800897E8 084070 00B8+00 0/0 3/0 0/0 .text pauseEvCamera__9dCamera_cFv */
#pragma push
#pragma optimization_level 0
@@ -591,6 +599,19 @@ asm void dCamera_c::pauseEvCamera() {
#pragma pop
/* ############################################################################################## */
/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AAFF = "Eye";
SECTION_DEAD static char const* const stringBase_8037AB03 = "Center";
SECTION_DEAD static char const* const stringBase_8037AB0A = "BasePos";
SECTION_DEAD static char const* const stringBase_8037AB12 = "Fovy";
SECTION_DEAD static char const* const stringBase_8037AB17 = "Bank";
SECTION_DEAD static char const* const stringBase_8037AB1C = "RelUseMask";
SECTION_DEAD static char const* const stringBase_8037AB27 = "oo";
SECTION_DEAD static char const* const stringBase_8037AB2A = "RelActor";
#pragma pop
/* 804253A8-804253B4 0520C8 000C+00 1/1 0/0 0/0 .bss @4202 */
static u8 lit_4202[12];
@@ -630,6 +651,19 @@ asm void dCamera_c::fixedFrameEvCamera() {
#pragma pop
/* ############################################################################################## */
/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AB33 = "EyeGap";
SECTION_DEAD static char const* const stringBase_8037AB3A = "CtrGap";
SECTION_DEAD static char const* const stringBase_8037AB41 = "EyeCus";
SECTION_DEAD static char const* const stringBase_8037AB48 = "CtrCus";
SECTION_DEAD static char const* const stringBase_8037AB4F = "Stoker";
SECTION_DEAD static char const* const stringBase_8037AB56 = "@STARTER";
SECTION_DEAD static char const* const stringBase_8037AB5F = "Target";
SECTION_DEAD static char const* const stringBase_8037AB66 = "@PLAYER";
#pragma pop
/* 804528DC-804528E0 000EDC 0004+00 10/10 0/0 0/0 .sdata2 @5346 */
SECTION_SDATA2 static f32 lit_5346 = 1.0f;
@@ -644,6 +678,15 @@ asm void dCamera_c::stokerEvCamera() {
#pragma pop
/* ############################################################################################## */
/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AB6E = "TransType";
SECTION_DEAD static char const* const stringBase_8037AB78 = "Roll";
SECTION_DEAD static char const* const stringBase_8037AB7D = "RadiusAdd";
SECTION_DEAD static char const* const stringBase_8037AB87 = "Latitude";
#pragma pop
/* 804528E0-804528E8 000EE0 0004+04 1/1 0/0 0/0 .sdata2 @5844 */
SECTION_SDATA2 static f32 lit_5844[1 + 1 /* padding */] = {
2.0f,
@@ -665,6 +708,14 @@ asm void dCamera_c::rollingEvCamera() {
#pragma pop
/* ############################################################################################## */
/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AB90 = "Radius";
SECTION_DEAD static char const* const stringBase_8037AB97 = "StartRadius";
SECTION_DEAD static char const* const stringBase_8037ABA3 = "o";
#pragma pop
/* 804253C0-804253CC 0520E0 000C+00 0/1 0/0 0/0 .bss @4203 */
#pragma push
#pragma force_active on
@@ -740,7 +791,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,
};
COMPILER_STRIP_GATE(8037A7F0, &lit_3871);
COMPILER_STRIP_GATE(0x8037A7F0, &lit_3871);
/* 8037A7FC-8037A80C 006E5C 0010+00 0/1 0/0 0/0 .rodata @5984 */
#pragma push
@@ -748,7 +799,22 @@ COMPILER_STRIP_GATE(8037A7F0, &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,
};
COMPILER_STRIP_GATE(8037A7FC, &lit_5984);
COMPILER_STRIP_GATE(0x8037A7FC, &lit_5984);
#pragma pop
/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037ABA5 = "BSpCurve";
SECTION_DEAD static char const* const stringBase_8037ABAE = "BSpPoints";
SECTION_DEAD static char const* const stringBase_8037ABB8 = "EndSlot";
SECTION_DEAD static char const* const stringBase_8037ABC0 = "StartSlot";
SECTION_DEAD static char const* const stringBase_8037ABCA = "StartEye";
SECTION_DEAD static char const* const stringBase_8037ABD3 = "StartCenter";
SECTION_DEAD static char const* const stringBase_8037ABDF = "StartFovy";
SECTION_DEAD static char const* const stringBase_8037ABE9 = "StartBank";
SECTION_DEAD static char const* const stringBase_8037ABF3 = "--oo";
SECTION_DEAD static char const* const stringBase_8037ABF8 = "Cushion";
#pragma pop
/* 80452900-80452904 000F00 0004+00 1/1 0/0 0/0 .sdata2 @6682 */
@@ -828,6 +894,19 @@ asm void cXyz::operator+=(Vec const& param_0) {
#pragma pop
/* ############################################################################################## */
/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AC00 = "NearDist";
SECTION_DEAD static char const* const stringBase_8037AC09 = "ZoomDist";
SECTION_DEAD static char const* const stringBase_8037AC12 = "ZoomVAngle";
SECTION_DEAD static char const* const stringBase_8037AC1D = "FarDist";
SECTION_DEAD static char const* const stringBase_8037AC25 = "NearTimer";
SECTION_DEAD static char const* const stringBase_8037AC2F = "FarTimer";
SECTION_DEAD static char const* const stringBase_8037AC38 = "FrontAngle";
SECTION_DEAD static char const* const stringBase_8037AC43 = "Blure";
#pragma pop
/* 804253F0-804253FC 052110 000C+00 1/1 0/0 0/0 .bss @6756 */
static u8 lit_6756[12];
@@ -913,6 +992,13 @@ static asm void func_8008FA94() {
#pragma pop
/* ############################################################################################## */
/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AC49 = "Dest";
SECTION_DEAD static char const* const stringBase_8037AC4E = "TargetType";
#pragma pop
/* 80425408-80425414 052128 000C+00 1/1 0/0 0/0 .bss @7364 */
static u8 lit_7364[12];
@@ -939,6 +1025,14 @@ asm void dCamera_c::talktoEvCamera() {
}
#pragma pop
/* ############################################################################################## */
/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AC59 = "ID";
SECTION_DEAD static char const* const stringBase_8037AC5C = "CameraID";
#pragma pop
/* 80090230-80090478 08AB70 0248+00 0/0 1/0 0/0 .text maptoolIdEvCamera__9dCamera_cFv */
#pragma push
#pragma optimization_level 0
@@ -949,6 +1043,14 @@ asm void dCamera_c::maptoolIdEvCamera() {
}
#pragma pop
/* ############################################################################################## */
/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AC65 = "Name";
SECTION_DEAD static char const* const stringBase_8037AC6A = "FN01";
#pragma pop
/* 80090478-80090514 08ADB8 009C+00 0/0 1/0 0/0 .text styleEvCamera__9dCamera_cFv */
#pragma push
#pragma optimization_level 0
@@ -960,6 +1062,12 @@ asm void dCamera_c::styleEvCamera() {
#pragma pop
/* ############################################################################################## */
/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AC6F = "Type";
#pragma pop
/* 80452944-80452948 000F44 0004+00 4/4 0/0 0/0 .sdata2 @8178 */
SECTION_SDATA2 static f32 lit_8178 = -45.0f;
@@ -1125,7 +1233,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,
};
COMPILER_STRIP_GATE(8037A80C, &lit_5985);
COMPILER_STRIP_GATE(0x8037A80C, &lit_5985);
#pragma pop
/* 8037A828-8037A844 006E88 001C+00 0/0 0/0 0/0 .rodata @5986 */
@@ -1135,7 +1243,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,
};
COMPILER_STRIP_GATE(8037A828, &lit_5986);
COMPILER_STRIP_GATE(0x8037A828, &lit_5986);
#pragma pop
/* 8037A844-8037A858 006EA4 0014+00 0/0 0/0 0/0 .rodata @5987 */
@@ -1145,7 +1253,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,
};
COMPILER_STRIP_GATE(8037A844, &lit_5987);
COMPILER_STRIP_GATE(0x8037A844, &lit_5987);
#pragma pop
/* 8037A858-8037A86C 006EB8 0014+00 0/0 0/0 0/0 .rodata @5988 */
@@ -1155,7 +1263,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,
};
COMPILER_STRIP_GATE(8037A858, &lit_5988);
COMPILER_STRIP_GATE(0x8037A858, &lit_5988);
#pragma pop
/* 8037A86C-8037A884 006ECC 0018+00 1/1 0/0 0/0 .rodata @8236 */
@@ -1163,7 +1271,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,
};
COMPILER_STRIP_GATE(8037A86C, &lit_8236);
COMPILER_STRIP_GATE(0x8037A86C, &lit_8236);
/* 803AC528-803AC5A0 -00001 0078+00 1/1 0/0 0/0 .data @8754 */
SECTION_DATA static void* lit_8754[30] = {
@@ -1333,6 +1441,13 @@ asm void dCamera_c::stbWaitEvCamera() {
}
#pragma pop
/* ############################################################################################## */
/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AC74 = "Slot";
#pragma pop
/* 800924D0-8009258C 08CE10 00BC+00 0/0 1/0 0/0 .text saveEvCamera__9dCamera_cFv */
#pragma push
#pragma optimization_level 0
@@ -1349,7 +1464,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,
};
COMPILER_STRIP_GATE(8037A884, &lit_8840);
COMPILER_STRIP_GATE(0x8037A884, &lit_8840);
/* 8009258C-800929AC 08CECC 0420+00 0/0 1/0 0/0 .text loadEvCamera__9dCamera_cFv */
#pragma push
@@ -1388,7 +1503,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,
};
COMPILER_STRIP_GATE(8037A89C, &lit_8969);
COMPILER_STRIP_GATE(0x8037A89C, &lit_8969);
/* 80452A88-80452A8C 001088 0004+00 1/1 0/0 0/0 .sdata2 @9395 */
SECTION_SDATA2 static f32 lit_9395 = 64.0f;
@@ -1549,7 +1664,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,
};
COMPILER_STRIP_GATE(8037AA08, &lit_9468);
COMPILER_STRIP_GATE(0x8037AA08, &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;
@@ -1584,14 +1699,20 @@ 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,
};
COMPILER_STRIP_GATE(8037AA40, &lit_9811);
COMPILER_STRIP_GATE(0x8037AA40, &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,
};
COMPILER_STRIP_GATE(8037AAA4, &lit_9812);
COMPILER_STRIP_GATE(0x8037AAA4, &lit_9812);
/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AC79 = "CurvePoints";
#pragma pop
/* 80452B54-80452B58 001154 0004+00 1/1 0/0 0/0 .sdata2 @10118 */
SECTION_SDATA2 static f32 lit_10118 = 32.0f;
@@ -1631,6 +1752,12 @@ asm void dCamera_c::getItemEvCamera() {
#pragma pop
/* ############################################################################################## */
/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AC85 = "Longitude";
#pragma pop
/* 80452B78-80452B7C 001178 0004+00 1/1 0/0 0/0 .sdata2 @10278 */
SECTION_SDATA2 static f32 lit_10278 = 0.5f;
@@ -1663,6 +1790,15 @@ asm void dCamera_c::possessedEvCamera() {
#pragma pop
/* ############################################################################################## */
/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AC8F = "Centers";
SECTION_DEAD static char const* const stringBase_8037AC97 = "Eyes";
SECTION_DEAD static char const* const stringBase_8037AC9C = "Fovys";
SECTION_DEAD static char const* const stringBase_8037ACA2 = "Choice";
#pragma pop
/* 80452B94-80452B98 001194 0004+00 1/1 0/0 0/0 .sdata2 @10437 */
SECTION_SDATA2 static f32 lit_10437 = 1.0f / 100.0f;
@@ -1688,6 +1824,21 @@ asm void dCamera_c::bSplineEvCamera() {
#pragma pop
/* ############################################################################################## */
/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037ACA9 = "Actor1";
SECTION_DEAD static char const* const stringBase_8037ACB0 = "Actor2";
SECTION_DEAD static char const* const stringBase_8037ACB7 = "CtrRatio";
SECTION_DEAD static char const* const stringBase_8037ACC0 = "RadiusMin";
SECTION_DEAD static char const* const stringBase_8037ACCA = "RadiusMax";
SECTION_DEAD static char const* const stringBase_8037ACD4 = "LatitudeMin";
SECTION_DEAD static char const* const stringBase_8037ACE0 = "LatitudeMax";
SECTION_DEAD static char const* const stringBase_8037ACEC = "LongitudeMin";
SECTION_DEAD static char const* const stringBase_8037ACF9 = "LongitudeMax";
SECTION_DEAD static char const* const stringBase_8037AD06 = "LongitudeType";
#pragma pop
/* 80425420-8042542C 052140 000C+00 1/1 0/0 0/0 .bss @10516 */
static u8 lit_10516[12];
@@ -1724,6 +1875,12 @@ asm void dCamera_c::peepHoleEvCamera() {
#pragma pop
/* ############################################################################################## */
/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AD14 = "R_SP01";
#pragma pop
/* 80452BA4-80452BA8 0011A4 0004+00 1/1 0/0 0/0 .sdata2 @11068 */
SECTION_SDATA2 static f32 lit_11068 = 245.0f;
@@ -1744,7 +1901,16 @@ 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,
};
COMPILER_STRIP_GATE(8037AABC, &lit_11087);
COMPILER_STRIP_GATE(0x8037AABC, &lit_11087);
/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AD1B = "Teacher";
SECTION_DEAD static char const* const stringBase_8037AD23 = "Midna";
SECTION_DEAD static char const* const stringBase_8037AD29 = "Student";
SECTION_DEAD static char const* const stringBase_8037AD31 = "CtrGapY";
#pragma pop
/* 80452BA8-80452BAC 0011A8 0004+00 1/1 0/0 0/0 .sdata2 @11415 */
SECTION_SDATA2 static f32 lit_11415 = 280.0f;
@@ -1785,7 +1951,22 @@ 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,
};
COMPILER_STRIP_GATE(8037AAE4, &lit_11437);
COMPILER_STRIP_GATE(0x8037AAE4, &lit_11437);
/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AD39 = "Base";
SECTION_DEAD static char const* const stringBase_8037AD3E = "xxxxxx";
SECTION_DEAD static char const* const stringBase_8037AD45 = "Set1";
SECTION_DEAD static char const* const stringBase_8037AD4A = "Use1";
SECTION_DEAD static char const* const stringBase_8037AD4F = "ooxxxx";
SECTION_DEAD static char const* const stringBase_8037AD56 = "Set2";
SECTION_DEAD static char const* const stringBase_8037AD5B = "Use2";
SECTION_DEAD static char const* const stringBase_8037AD60 = "xxooox";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8037AD67 = "";
#pragma pop
/* 80096EDC-80097694 09181C 07B8+00 0/0 1/0 0/0 .text bspTransEvCamera__9dCamera_cFv */
#pragma push
@@ -1814,7 +1995,7 @@ asm void __sinit_d_ev_camera_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_8009769C = (void*)__sinit_d_ev_camera_cpp;
REGISTER_CTORS(0x8009769C, __sinit_d_ev_camera_cpp);
#pragma pop
/* 8009771C-80097738 09205C 001C+00 11/11 22/22 0/0 .text attentionPos__9dCamera_cFP10fopAc_ac_c
@@ -1966,90 +2147,4 @@ asm void daAlink_c::getShadowTalkAtnPos() {
}
#pragma pop
/* 8037AAF4-8037AD68 007154 0273+01 23/23 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8037AAF4 = "Timer";
SECTION_DEAD static char const* const stringBase_8037AAFA = "Stay";
SECTION_DEAD static char const* const stringBase_8037AAFF = "Eye";
SECTION_DEAD static char const* const stringBase_8037AB03 = "Center";
SECTION_DEAD static char const* const stringBase_8037AB0A = "BasePos";
SECTION_DEAD static char const* const stringBase_8037AB12 = "Fovy";
SECTION_DEAD static char const* const stringBase_8037AB17 = "Bank";
SECTION_DEAD static char const* const stringBase_8037AB1C = "RelUseMask";
SECTION_DEAD static char const* const stringBase_8037AB27 = "oo";
SECTION_DEAD static char const* const stringBase_8037AB2A = "RelActor";
SECTION_DEAD static char const* const stringBase_8037AB33 = "EyeGap";
SECTION_DEAD static char const* const stringBase_8037AB3A = "CtrGap";
SECTION_DEAD static char const* const stringBase_8037AB41 = "EyeCus";
SECTION_DEAD static char const* const stringBase_8037AB48 = "CtrCus";
SECTION_DEAD static char const* const stringBase_8037AB4F = "Stoker";
SECTION_DEAD static char const* const stringBase_8037AB56 = "@STARTER";
SECTION_DEAD static char const* const stringBase_8037AB5F = "Target";
SECTION_DEAD static char const* const stringBase_8037AB66 = "@PLAYER";
SECTION_DEAD static char const* const stringBase_8037AB6E = "TransType";
SECTION_DEAD static char const* const stringBase_8037AB78 = "Roll";
SECTION_DEAD static char const* const stringBase_8037AB7D = "RadiusAdd";
SECTION_DEAD static char const* const stringBase_8037AB87 = "Latitude";
SECTION_DEAD static char const* const stringBase_8037AB90 = "Radius";
SECTION_DEAD static char const* const stringBase_8037AB97 = "StartRadius";
SECTION_DEAD static char const* const stringBase_8037ABA3 = "o";
SECTION_DEAD static char const* const stringBase_8037ABA5 = "BSpCurve";
SECTION_DEAD static char const* const stringBase_8037ABAE = "BSpPoints";
SECTION_DEAD static char const* const stringBase_8037ABB8 = "EndSlot";
SECTION_DEAD static char const* const stringBase_8037ABC0 = "StartSlot";
SECTION_DEAD static char const* const stringBase_8037ABCA = "StartEye";
SECTION_DEAD static char const* const stringBase_8037ABD3 = "StartCenter";
SECTION_DEAD static char const* const stringBase_8037ABDF = "StartFovy";
SECTION_DEAD static char const* const stringBase_8037ABE9 = "StartBank";
SECTION_DEAD static char const* const stringBase_8037ABF3 = "--oo";
SECTION_DEAD static char const* const stringBase_8037ABF8 = "Cushion";
SECTION_DEAD static char const* const stringBase_8037AC00 = "NearDist";
SECTION_DEAD static char const* const stringBase_8037AC09 = "ZoomDist";
SECTION_DEAD static char const* const stringBase_8037AC12 = "ZoomVAngle";
SECTION_DEAD static char const* const stringBase_8037AC1D = "FarDist";
SECTION_DEAD static char const* const stringBase_8037AC25 = "NearTimer";
SECTION_DEAD static char const* const stringBase_8037AC2F = "FarTimer";
SECTION_DEAD static char const* const stringBase_8037AC38 = "FrontAngle";
SECTION_DEAD static char const* const stringBase_8037AC43 = "Blure";
SECTION_DEAD static char const* const stringBase_8037AC49 = "Dest";
SECTION_DEAD static char const* const stringBase_8037AC4E = "TargetType";
SECTION_DEAD static char const* const stringBase_8037AC59 = "ID";
SECTION_DEAD static char const* const stringBase_8037AC5C = "CameraID";
SECTION_DEAD static char const* const stringBase_8037AC65 = "Name";
SECTION_DEAD static char const* const stringBase_8037AC6A = "FN01";
SECTION_DEAD static char const* const stringBase_8037AC6F = "Type";
SECTION_DEAD static char const* const stringBase_8037AC74 = "Slot";
SECTION_DEAD static char const* const stringBase_8037AC79 = "CurvePoints";
SECTION_DEAD static char const* const stringBase_8037AC85 = "Longitude";
SECTION_DEAD static char const* const stringBase_8037AC8F = "Centers";
SECTION_DEAD static char const* const stringBase_8037AC97 = "Eyes";
SECTION_DEAD static char const* const stringBase_8037AC9C = "Fovys";
SECTION_DEAD static char const* const stringBase_8037ACA2 = "Choice";
SECTION_DEAD static char const* const stringBase_8037ACA9 = "Actor1";
SECTION_DEAD static char const* const stringBase_8037ACB0 = "Actor2";
SECTION_DEAD static char const* const stringBase_8037ACB7 = "CtrRatio";
SECTION_DEAD static char const* const stringBase_8037ACC0 = "RadiusMin";
SECTION_DEAD static char const* const stringBase_8037ACCA = "RadiusMax";
SECTION_DEAD static char const* const stringBase_8037ACD4 = "LatitudeMin";
SECTION_DEAD static char const* const stringBase_8037ACE0 = "LatitudeMax";
SECTION_DEAD static char const* const stringBase_8037ACEC = "LongitudeMin";
SECTION_DEAD static char const* const stringBase_8037ACF9 = "LongitudeMax";
SECTION_DEAD static char const* const stringBase_8037AD06 = "LongitudeType";
SECTION_DEAD static char const* const stringBase_8037AD14 = "R_SP01";
SECTION_DEAD static char const* const stringBase_8037AD1B = "Teacher";
SECTION_DEAD static char const* const stringBase_8037AD23 = "Midna";
SECTION_DEAD static char const* const stringBase_8037AD29 = "Student";
SECTION_DEAD static char const* const stringBase_8037AD31 = "CtrGapY";
SECTION_DEAD static char const* const stringBase_8037AD39 = "Base";
SECTION_DEAD static char const* const stringBase_8037AD3E = "xxxxxx";
SECTION_DEAD static char const* const stringBase_8037AD45 = "Set1";
SECTION_DEAD static char const* const stringBase_8037AD4A = "Use1";
SECTION_DEAD static char const* const stringBase_8037AD4F = "ooxxxx";
SECTION_DEAD static char const* const stringBase_8037AD56 = "Set2";
SECTION_DEAD static char const* const stringBase_8037AD5B = "Use2";
SECTION_DEAD static char const* const stringBase_8037AD60 = "xxooox";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8037AD67 = "";
#pragma pop
/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_eye_hl.cpp
+11 -9
View File
@@ -61,6 +61,16 @@ extern "C" extern u8 g_envHIO[68];
// Declarations:
//
/* ############################################################################################## */
/* 8037B100-8037B100 007760 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037B100 =
"目のハイライトテクスチャーがありません！\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8037B12A = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
#pragma pop
/* 8009C964-8009CA28 0972A4 00C4+00 0/0 2/2 0/0 .text entry__8dEyeHL_cFP12J3DModelDataPCc
*/
#pragma push
@@ -145,12 +155,4 @@ u8 struct_80450FB8[4];
extern u8 struct_80450FBC[4];
u8 struct_80450FBC[4];
/* 8037B100-8037B140 007760 002A+16 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8037B100 =
"目のハイライトテクスチャーがありません！\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8037B12A = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
#pragma pop
/* 8037B100-8037B100 007760 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_gameover.cpp
+18 -12
View File
@@ -624,6 +624,13 @@ asm dGov_HIO_c::dGov_HIO_c() {
#pragma pop
/* ############################################################################################## */
/* 80394C28-80394C28 021288 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394C28 = "Gover";
SECTION_DEAD static char const* const stringBase_80394C2E = "D_MN10A";
#pragma pop
/* 803BBDA8-803BBDB8 018EC8 0010+00 2/2 0/0 0/0 .data __vt__24dDlst_Gameover_CAPTURE_c */
SECTION_DATA extern void* __vt__24dDlst_Gameover_CAPTURE_c[4] = {
(void*)NULL /* RTTI */,
@@ -836,6 +843,15 @@ asm void dGameover_c::_delete() {
#pragma pop
/* ############################################################################################## */
/* 80394C28-80394C28 021288 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394C36 = "zelda_game_over.blo";
SECTION_DEAD static char const* const stringBase_80394C4A = "tt_block8x8.bti";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80394C5A = "\0\0\0\0\0";
#pragma pop
/* 80453BA0-80453BA4 0021A0 0004+00 1/1 0/0 0/0 .sdata2 @4290 */
SECTION_SDATA2 static f32 lit_4290 = 486.0f;
@@ -1003,7 +1019,7 @@ asm void __sinit_d_gameover_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_8019C0C8 = (void*)__sinit_d_gameover_cpp;
REGISTER_CTORS(0x8019C0C8, __sinit_d_gameover_cpp);
#pragma pop
/* 8019C2CC-8019C314 196C0C 0048+00 1/0 0/0 0/0 .text __dt__24dDlst_Gameover_CAPTURE_cFv
@@ -1027,14 +1043,4 @@ asm dMenu_save_c::~dMenu_save_c() {
}
#pragma pop
/* 80394C28-80394C60 021288 0032+06 3/3 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80394C28 = "Gover";
SECTION_DEAD static char const* const stringBase_80394C2E = "D_MN10A";
SECTION_DEAD static char const* const stringBase_80394C36 = "zelda_game_over.blo";
SECTION_DEAD static char const* const stringBase_80394C4A = "tt_block8x8.bti";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80394C5A = "\0\0\0\0\0";
#pragma pop
/* 80394C28-80394C28 021288 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_insect.cpp
+8 -7
View File
@@ -36,7 +36,6 @@ struct dInsect_c {
struct dEvt_control_c {
/* 80042468 */ void reset();
/* 800436EC */ void setPtI_Id(unsigned int);
};
struct dEvent_manager_c {
@@ -108,6 +107,13 @@ asm dInsect_c::dInsect_c() {
}
#pragma pop
/* ############################################################################################## */
/* 80393D98-80393D98 0203F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80393D98 = "DEFAULT_GETITEM";
#pragma pop
/* 8015E078-8015E26C 1589B8 01F4+00 0/0 0/0 24/24 .text Insect_GetDemoMain__9dInsect_cFv
*/
#pragma push
@@ -160,9 +166,4 @@ asm void dInsect_c::CalcZBuffer(f32 param_0) {
}
#pragma pop
/* 80393D98-80393DA8 0203F8 0010+00 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80393D98 = "DEFAULT_GETITEM";
#pragma pop
/* 80393D98-80393D98 0203F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_item.cpp
+10 -8
View File
@@ -4419,6 +4419,15 @@ asm void isInsect(u8 param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 8037B0D0-8037B0D0 007730 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037B0D0 = "D_MN08";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8037B0D7 = "";
#pragma pop
/* 8009B7C4-8009B940 096104 017C+00 0/0 3/3 0/0 .text check_itemno__Fi */
#pragma push
#pragma optimization_level 0
@@ -4443,11 +4452,4 @@ static asm void addBombCount(u8 param_0, u8 param_1) {
/* 80450F90-80450F98 000490 0004+04 0/0 2/2 0/0 .sbss mData__12dEnemyItem_c */
u8 dEnemyItem_c::mData[4 + 4 /* padding */];
/* 8037B0D0-8037B0D8 007730 0007+01 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8037B0D0 = "D_MN08";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8037B0D7 = "";
#pragma pop
/* 8037B0D0-8037B0D0 007730 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_item_data.cpp
+549 -98
View File
@@ -35,6 +35,554 @@ extern "C" u8 item_info__10dItem_data[1020 + 4 /* padding */];
//
/* ############################################################################################## */
/* 8037AD68-8037AD72 0073C8 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AD68 = "F_gD_rupy";
#pragma pop
/* 8037AD72-8037AD7C 0073D2 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AD72 = "O_gD_bomb";
#pragma pop
/* 8037AD7C-8037AD86 0073DC 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AD7C = "O_gD_arow";
#pragma pop
/* 8037AD86-8037AD90 0073E6 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AD86 = "O_gD_tane";
#pragma pop
/* 8037AD90-8037AD98 0073F0 0008+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AD90 = "O_gD_PG";
#pragma pop
/* 8037AD98-8037ADA0 0073F8 0008+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AD98 = "O_gD_BI";
#pragma pop
/* 8037ADA0-8037ADA9 007400 0009+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037ADA0 = "T_gD_key";
#pragma pop
/* 8037ADA9-8037ADB3 007409 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037ADA9 = "O_gD_hutk";
#pragma pop
/* 8037ADB3-8037ADBD 007413 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037ADB3 = "O_gD_hutu";
#pragma pop
/* 8037ADBD-8037ADC6 00741D 0009+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037ADBD = "T_gD_map";
#pragma pop
/* 8037ADC6-8037ADD0 007426 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037ADC6 = "T_gD_kmps";
#pragma pop
/* 8037ADD0-8037ADD9 007430 0009+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037ADD0 = "O_gD_TKS";
#pragma pop
/* 8037ADD9-8037ADE3 007439 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037ADD9 = "T_gD_bkey";
#pragma pop
/* 8037ADE3-8037ADEC 007443 0009+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037ADE3 = "O_gD_TKC";
#pragma pop
/* 8037ADEC-8037ADF5 00744C 0009+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037ADEC = "O_gD_SWA";
#pragma pop
/* 8037ADF5-8037ADFE 007455 0009+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037ADF5 = "T_gD_SHB";
#pragma pop
/* 8037ADFE-8037AE07 00745E 0009+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037ADFE = "O_gD_SHC";
#pragma pop
/* 8037AE07-8037AE10 007467 0009+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AE07 = "O_gD_SHA";
#pragma pop
/* 8037AE10-8037AE1A 007470 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AE10 = "O_gD_mem2";
#pragma pop
/* 8037AE1A-8037AE24 00747A 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AE1A = "O_gD_marm";
#pragma pop
/* 8037AE24-8037AE2E 007484 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AE24 = "O_gD_zora";
#pragma pop
/* 8037AE2E-8037AE38 00748E 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AE2E = "O_gD_Injy";
#pragma pop
/* 8037AE38-8037AE42 007498 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AE38 = "O_gD_puL2";
#pragma pop
/* 8037AE42-8037AE4C 0074A2 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AE42 = "O_gD_puL3";
#pragma pop
/* 8037AE4C-8037AE56 0074AC 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AE4C = "O_gD_sang";
#pragma pop
/* 8037AE56-8037AE60 0074B6 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AE56 = "O_gD_hawk";
#pragma pop
/* 8037AE60-8037AE69 0074C0 0009+00 2/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AE60 = "O_gD_SWB";
#pragma pop
/* 8037AE69-8037AE73 0074C9 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AE69 = "O_gD_boom";
#pragma pop
/* 8037AE73-8037AE7B 0074D3 0008+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AE73 = "O_gD_SP";
#pragma pop
/* 8037AE7B-8037AE83 0074DB 0008+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AE7B = "O_gD_IB";
#pragma pop
/* 8037AE83-8037AE8C 0074E3 0009+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AE83 = "O_gD_bow";
#pragma pop
/* 8037AE8C-8037AE94 0074EC 0008+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AE8C = "O_gD_HS";
#pragma pop
/* 8037AE94-8037AE9E 0074F4 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AE94 = "O_gD_boot";
#pragma pop
/* 8037AE9E-8037AEA8 0074FE 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AE9E = "O_gD_CROD";
#pragma pop
/* 8037AEA8-8037AEB0 007508 0008+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AEA8 = "T_gD_kt";
#pragma pop
/* 8037AEB0-8037AEBA 007510 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AEB0 = "O_gD_uktr";
#pragma pop
/* 8037AEBA-8037AEC4 00751A 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AEBA = "O_gD_pach";
#pragma pop
/* 8037AEC4-8037AECE 007524 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AEC4 = "O_gD_bmL2";
#pragma pop
/* 8037AECE-8037AED8 00752E 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AECE = "O_gD_bomc";
#pragma pop
/* 8037AED8-8037AEE2 007538 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AED8 = "O_gD_quL1";
#pragma pop
/* 8037AEE2-8037AEEC 007542 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AEE2 = "O_gD_quL2";
#pragma pop
/* 8037AEEC-8037AEF6 00754C 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AEEC = "O_gD_quL3";
#pragma pop
/* 8037AEF6-8037AF00 007556 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AEF6 = "O_gD_bott";
#pragma pop
/* 8037AF00-8037AF09 007560 0009+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AF00 = "Obj_kntr";
#pragma pop
/* 8037AF09-8037AF13 007569 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AF09 = "O_gD_lttr";
#pragma pop
/* 8037AF13-8037AF1D 007573 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AF13 = "O_gD_bill";
#pragma pop
/* 8037AF1D-8037AF27 00757D 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AF1D = "O_gD_wood";
#pragma pop
/* 8037AF27-8037AF31 007587 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AF27 = "O_gD_pend";
#pragma pop
/* 8037AF31-8037AF3B 007591 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AF31 = "O_gD_hk_s";
#pragma pop
/* 8037AF3B-8037AF45 00759B 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AF3B = "N_gD_Lpod";
#pragma pop
/* 8037AF45-8037AF4F 0075A5 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AF45 = "O_gD_kabo";
#pragma pop
/* 8037AF4F-8037AF59 0075AF 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AF4F = "O_gD_kabm";
#pragma pop
/* 8037AF59-8037AF63 0075B9 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AF59 = "O_gD_choo";
#pragma pop
/* 8037AF63-8037AF6D 0075C3 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AF63 = "O_gD_chom";
#pragma pop
/* 8037AF6D-8037AF77 0075CD 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AF6D = "O_gD_kuwo";
#pragma pop
/* 8037AF77-8037AF81 0075D7 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AF77 = "O_gD_kuwm";
#pragma pop
/* 8037AF81-8037AF8B 0075E1 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AF81 = "O_gD_bato";
#pragma pop
/* 8037AF8B-8037AF95 0075EB 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AF8B = "O_gD_batm";
#pragma pop
/* 8037AF95-8037AF9F 0075F5 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AF95 = "O_gD_nano";
#pragma pop
/* 8037AF9F-8037AFA9 0075FF 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AF9F = "O_gD_nanm";
#pragma pop
/* 8037AFA9-8037AFB3 007609 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AFA9 = "O_gD_dano";
#pragma pop
/* 8037AFB3-8037AFBD 007613 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AFB3 = "O_gD_danm";
#pragma pop
/* 8037AFBD-8037AFC7 00761D 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AFBD = "O_gD_kamo";
#pragma pop
/* 8037AFC7-8037AFD1 007627 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AFC7 = "O_gD_kamm";
#pragma pop
/* 8037AFD1-8037AFDB 007631 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AFD1 = "O_gD_teno";
#pragma pop
/* 8037AFDB-8037AFE5 00763B 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AFDB = "O_gD_tenm";
#pragma pop
/* 8037AFE5-8037AFEF 007645 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AFE5 = "O_gD_kato";
#pragma pop
/* 8037AFEF-8037AFF9 00764F 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AFEF = "O_gD_katm";
#pragma pop
/* 8037AFF9-8037B003 007659 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037AFF9 = "O_gD_tono";
#pragma pop
/* 8037B003-8037B00D 007663 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037B003 = "O_gD_tonm";
#pragma pop
/* 8037B00D-8037B017 00766D 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037B00D = "O_gD_ario";
#pragma pop
/* 8037B017-8037B021 007677 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037B017 = "O_gD_arim";
#pragma pop
/* 8037B021-8037B02B 007681 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037B021 = "O_gD_kago";
#pragma pop
/* 8037B02B-8037B035 00768B 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037B02B = "O_gD_kagm";
#pragma pop
/* 8037B035-8037B03F 007695 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037B035 = "O_gD_tama";
#pragma pop
/* 8037B03F-8037B049 00769F 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037B03F = "O_gD_komo";
#pragma pop
/* 8037B049-8037B053 0076A9 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037B049 = "O_gD_pump";
#pragma pop
/* 8037B053-8037B05D 0076B3 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037B053 = "O_gD_chee";
#pragma pop
/* 8037B05D-8037B067 0076BD 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037B05D = "O_gD_bkey";
#pragma pop
/* 8037B067-8037B071 0076C7 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037B067 = "D_MKey_01";
#pragma pop
/* 8037B071-8037B07B 0076D1 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037B071 = "D_MKey_02";
#pragma pop
/* 8037B07B-8037B085 0076DB 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037B07B = "D_MKey_03";
#pragma pop
/* 8037B085-8037B08F 0076E5 000A+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037B085 = "O_gD_Mkey";
#pragma pop
/* 8037B08F-8037B096 0076EF 0007+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037B08F = "Always";
#pragma pop
/* 8037B096-8037B09E 0076F6 0008+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037B096 = "T_g_key";
#pragma pop
/* 8037B09E-8037B0A7 0076FE 0009+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037B09E = "T_g_bkey";
#pragma pop
/* 8037B0A7-8037B0AF 007707 0008+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037B0A7 = "O_g_SWA";
#pragma pop
/* 8037B0AF-8037B0B7 00770F 0008+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037B0AF = "T_g_SHB";
#pragma pop
/* 8037B0B7-8037B0C0 007717 0009+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037B0B7 = "O_g_ZORA";
#pragma pop
/* 8037B0C0-8037B0C7 007720 0007+00 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037B0C0 = "T_g_kt";
#pragma pop
/* 8037B0C7-8037B0D0 007727 0007+02 1/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037B0C7 = "O_wood";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8037B0CE = "\0";
#pragma pop
/* 803AC5A0-803ADD88 -00001 17E8+00 0/0 10/10 2/2 .data item_resource__10dItem_data */
SECTION_DATA void* dItem_data::item_resource[1530] = {
(void*)&d_d_item_data__stringBase0,
@@ -3622,101 +4170,4 @@ SECTION_DATA u8 dItem_data::item_info[1020 + 4 /* padding */] = {
0x00,
};
/* 8037AD68-8037B0D0 0073C8 0366+02 2/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8037AD68 = "F_gD_rupy";
SECTION_DEAD static char const* const stringBase_8037AD72 = "O_gD_bomb";
SECTION_DEAD static char const* const stringBase_8037AD7C = "O_gD_arow";
SECTION_DEAD static char const* const stringBase_8037AD86 = "O_gD_tane";
SECTION_DEAD static char const* const stringBase_8037AD90 = "O_gD_PG";
SECTION_DEAD static char const* const stringBase_8037AD98 = "O_gD_BI";
SECTION_DEAD static char const* const stringBase_8037ADA0 = "T_gD_key";
SECTION_DEAD static char const* const stringBase_8037ADA9 = "O_gD_hutk";
SECTION_DEAD static char const* const stringBase_8037ADB3 = "O_gD_hutu";
SECTION_DEAD static char const* const stringBase_8037ADBD = "T_gD_map";
SECTION_DEAD static char const* const stringBase_8037ADC6 = "T_gD_kmps";
SECTION_DEAD static char const* const stringBase_8037ADD0 = "O_gD_TKS";
SECTION_DEAD static char const* const stringBase_8037ADD9 = "T_gD_bkey";
SECTION_DEAD static char const* const stringBase_8037ADE3 = "O_gD_TKC";
SECTION_DEAD static char const* const stringBase_8037ADEC = "O_gD_SWA";
SECTION_DEAD static char const* const stringBase_8037ADF5 = "T_gD_SHB";
SECTION_DEAD static char const* const stringBase_8037ADFE = "O_gD_SHC";
SECTION_DEAD static char const* const stringBase_8037AE07 = "O_gD_SHA";
SECTION_DEAD static char const* const stringBase_8037AE10 = "O_gD_mem2";
SECTION_DEAD static char const* const stringBase_8037AE1A = "O_gD_marm";
SECTION_DEAD static char const* const stringBase_8037AE24 = "O_gD_zora";
SECTION_DEAD static char const* const stringBase_8037AE2E = "O_gD_Injy";
SECTION_DEAD static char const* const stringBase_8037AE38 = "O_gD_puL2";
SECTION_DEAD static char const* const stringBase_8037AE42 = "O_gD_puL3";
SECTION_DEAD static char const* const stringBase_8037AE4C = "O_gD_sang";
SECTION_DEAD static char const* const stringBase_8037AE56 = "O_gD_hawk";
SECTION_DEAD static char const* const stringBase_8037AE60 = "O_gD_SWB";
SECTION_DEAD static char const* const stringBase_8037AE69 = "O_gD_boom";
SECTION_DEAD static char const* const stringBase_8037AE73 = "O_gD_SP";
SECTION_DEAD static char const* const stringBase_8037AE7B = "O_gD_IB";
SECTION_DEAD static char const* const stringBase_8037AE83 = "O_gD_bow";
SECTION_DEAD static char const* const stringBase_8037AE8C = "O_gD_HS";
SECTION_DEAD static char const* const stringBase_8037AE94 = "O_gD_boot";
SECTION_DEAD static char const* const stringBase_8037AE9E = "O_gD_CROD";
SECTION_DEAD static char const* const stringBase_8037AEA8 = "T_gD_kt";
SECTION_DEAD static char const* const stringBase_8037AEB0 = "O_gD_uktr";
SECTION_DEAD static char const* const stringBase_8037AEBA = "O_gD_pach";
SECTION_DEAD static char const* const stringBase_8037AEC4 = "O_gD_bmL2";
SECTION_DEAD static char const* const stringBase_8037AECE = "O_gD_bomc";
SECTION_DEAD static char const* const stringBase_8037AED8 = "O_gD_quL1";
SECTION_DEAD static char const* const stringBase_8037AEE2 = "O_gD_quL2";
SECTION_DEAD static char const* const stringBase_8037AEEC = "O_gD_quL3";
SECTION_DEAD static char const* const stringBase_8037AEF6 = "O_gD_bott";
SECTION_DEAD static char const* const stringBase_8037AF00 = "Obj_kntr";
SECTION_DEAD static char const* const stringBase_8037AF09 = "O_gD_lttr";
SECTION_DEAD static char const* const stringBase_8037AF13 = "O_gD_bill";
SECTION_DEAD static char const* const stringBase_8037AF1D = "O_gD_wood";
SECTION_DEAD static char const* const stringBase_8037AF27 = "O_gD_pend";
SECTION_DEAD static char const* const stringBase_8037AF31 = "O_gD_hk_s";
SECTION_DEAD static char const* const stringBase_8037AF3B = "N_gD_Lpod";
SECTION_DEAD static char const* const stringBase_8037AF45 = "O_gD_kabo";
SECTION_DEAD static char const* const stringBase_8037AF4F = "O_gD_kabm";
SECTION_DEAD static char const* const stringBase_8037AF59 = "O_gD_choo";
SECTION_DEAD static char const* const stringBase_8037AF63 = "O_gD_chom";
SECTION_DEAD static char const* const stringBase_8037AF6D = "O_gD_kuwo";
SECTION_DEAD static char const* const stringBase_8037AF77 = "O_gD_kuwm";
SECTION_DEAD static char const* const stringBase_8037AF81 = "O_gD_bato";
SECTION_DEAD static char const* const stringBase_8037AF8B = "O_gD_batm";
SECTION_DEAD static char const* const stringBase_8037AF95 = "O_gD_nano";
SECTION_DEAD static char const* const stringBase_8037AF9F = "O_gD_nanm";
SECTION_DEAD static char const* const stringBase_8037AFA9 = "O_gD_dano";
SECTION_DEAD static char const* const stringBase_8037AFB3 = "O_gD_danm";
SECTION_DEAD static char const* const stringBase_8037AFBD = "O_gD_kamo";
SECTION_DEAD static char const* const stringBase_8037AFC7 = "O_gD_kamm";
SECTION_DEAD static char const* const stringBase_8037AFD1 = "O_gD_teno";
SECTION_DEAD static char const* const stringBase_8037AFDB = "O_gD_tenm";
SECTION_DEAD static char const* const stringBase_8037AFE5 = "O_gD_kato";
SECTION_DEAD static char const* const stringBase_8037AFEF = "O_gD_katm";
SECTION_DEAD static char const* const stringBase_8037AFF9 = "O_gD_tono";
SECTION_DEAD static char const* const stringBase_8037B003 = "O_gD_tonm";
SECTION_DEAD static char const* const stringBase_8037B00D = "O_gD_ario";
SECTION_DEAD static char const* const stringBase_8037B017 = "O_gD_arim";
SECTION_DEAD static char const* const stringBase_8037B021 = "O_gD_kago";
SECTION_DEAD static char const* const stringBase_8037B02B = "O_gD_kagm";
SECTION_DEAD static char const* const stringBase_8037B035 = "O_gD_tama";
SECTION_DEAD static char const* const stringBase_8037B03F = "O_gD_komo";
SECTION_DEAD static char const* const stringBase_8037B049 = "O_gD_pump";
SECTION_DEAD static char const* const stringBase_8037B053 = "O_gD_chee";
SECTION_DEAD static char const* const stringBase_8037B05D = "O_gD_bkey";
SECTION_DEAD static char const* const stringBase_8037B067 = "D_MKey_01";
SECTION_DEAD static char const* const stringBase_8037B071 = "D_MKey_02";
SECTION_DEAD static char const* const stringBase_8037B07B = "D_MKey_03";
SECTION_DEAD static char const* const stringBase_8037B085 = "O_gD_Mkey";
SECTION_DEAD static char const* const stringBase_8037B08F = "Always";
SECTION_DEAD static char const* const stringBase_8037B096 = "T_g_key";
SECTION_DEAD static char const* const stringBase_8037B09E = "T_g_bkey";
SECTION_DEAD static char const* const stringBase_8037B0A7 = "O_g_SWA";
SECTION_DEAD static char const* const stringBase_8037B0AF = "T_g_SHB";
SECTION_DEAD static char const* const stringBase_8037B0B7 = "O_g_ZORA";
SECTION_DEAD static char const* const stringBase_8037B0C0 = "T_g_kt";
SECTION_DEAD static char const* const stringBase_8037B0C7 = "O_wood";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8037B0CE = "\0";
#pragma pop
/* 8037AD68-8037AD68 0073C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_jnt_col.cpp
+2 -2
View File
@@ -37,13 +37,13 @@ struct mDoMtx_stack_c {
struct fopAc_ac_c {};
struct dJntColData_c {};
struct cM3dGLin {
/* 80036A5C */ ~cM3dGLin();
/* 8026F2E8 */ void SetStartEnd(cXyz const&, cXyz const&);
};
struct dJntColData_c {};
struct J3DModel {};
struct dJntCol_c {
src/d/d_k_wmark.cpp
+10 -9
View File
@@ -157,6 +157,14 @@ extern "C" extern u8 struct_80450D64[4];
//
/* ############################################################################################## */
/* 8039A494-8039A494 026AF4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039A494 = "Alink";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039A49A = "\0\0\0\0\0";
#pragma pop
/* 80430C90-80430C9C 05D9B0 000C+00 1/1 0/0 0/0 .bss @3644 */
static u8 lit_3644[12];
@@ -260,7 +268,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,
};
COMPILER_STRIP_GATE(8039A488, &data_8039A488);
COMPILER_STRIP_GATE(0x8039A488, &data_8039A488);
/* 80454FE4-80454FE8 0035E4 0004+00 1/1 0/0 0/0 .sdata2 @3906 */
SECTION_SDATA2 static f32 lit_3906 = 50.0f;
@@ -302,11 +310,4 @@ SECTION_DATA extern void* g_profile_WMARK[10 + 1 /* padding */] = {
NULL,
};
/* 8039A494-8039A4A0 026AF4 0006+06 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8039A494 = "Alink";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039A49A = "\0\0\0\0\0";
#pragma pop
/* 8039A494-8039A494 026AF4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_k_wpillar.cpp
+4 -4
View File
@@ -31,10 +31,10 @@ struct mDoExt_brkAnm {
/* 8000D7A8 */ void entry(J3DMaterialTable*, f32);
};
struct J3DAnmTransform {};
struct J3DModelData {};
struct J3DAnmTransform {};
struct mDoExt_bckAnm {
/* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
/* 8000D9CC */ void entry(J3DModelData*, f32);
@@ -76,10 +76,10 @@ struct dRes_control_c {
struct dPa_levelEcallBack {};
struct _GXColor {};
struct csXyz {};
struct _GXColor {};
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_kantera_icon_meter.cpp
+10 -8
View File
@@ -119,6 +119,15 @@ asm dKantera_icon_c::~dKantera_icon_c() {
}
#pragma pop
/* ############################################################################################## */
/* 80394F50-80394F50 0215B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394F50 = "zelda_kantera_icon_mater.blo";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80394F6D = "\0\0";
#pragma pop
/* 801AEA68-801AEB7C 1A93A8 0114+00 1/1 0/0 0/0 .text initiate__15dKantera_icon_cFv */
#pragma push
#pragma optimization_level 0
@@ -210,11 +219,4 @@ asm dDlst_KanteraIcon_c::~dDlst_KanteraIcon_c() {
}
#pragma pop
/* 80394F50-80394F70 0215B0 001D+03 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80394F50 = "zelda_kantera_icon_mater.blo";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80394F6D = "\0\0";
#pragma pop
/* 80394F50-80394F50 0215B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_ky_thunder.cpp
+10 -9
View File
@@ -256,6 +256,15 @@ static asm void dThunder_Create(kankyo_class* param_0) {
#pragma pop
/* ############################################################################################## */
/* 80394F40-80394F40 0215A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394F40 = "Always";
SECTION_DEAD static char const* const stringBase_80394F47 = "R_SP30";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80394F4E = "\0";
#pragma pop
/* 80453E9C-80453EA0 00249C 0004+00 1/1 0/0 0/0 .sdata2 @4079 */
SECTION_SDATA2 static f32 lit_4079 = 0.5f;
@@ -357,12 +366,4 @@ SECTION_DATA extern void* g_profile_KY_THUNDER[10 + 1 /* padding */] = {
NULL,
};
/* 80394F40-80394F50 0215A0 000E+02 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80394F40 = "Always";
SECTION_DEAD static char const* const stringBase_80394F47 = "R_SP30";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80394F4E = "\0";
#pragma pop
/* 80394F40-80394F40 0215A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_kyeff.cpp
+10 -8
View File
@@ -68,6 +68,15 @@ static asm void dKyeff_Draw(dKyeff_c* param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 80394F38-80394F38 021598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394F38 = "Name";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80394F3D = "\0\0";
#pragma pop
/* 801ADD5C-801ADDB4 1A869C 0058+00 1/1 0/0 0/0 .text execute__8dKyeff_cFv */
#pragma push
#pragma optimization_level 0
@@ -158,11 +167,4 @@ SECTION_DATA extern void* g_profile_KYEFF[10 + 1 /* padding */] = {
NULL,
};
/* 80394F38-80394F40 021598 0005+03 2/2 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80394F38 = "Name";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80394F3D = "\0\0";
#pragma pop
/* 80394F38-80394F38 021598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_model.cpp
+2 -2
View File
@@ -17,10 +17,10 @@ struct dStage_roomControl_c {
struct dMdl_obj_c {};
struct J3DModelData {};
struct dKy_tevstr_c {};
struct J3DModelData {};
struct dMdl_mng_c {
/* 8009C6DC */ void search(J3DModelData*, u16, dKy_tevstr_c*);
/* 8009C724 */ void entry(J3DModelData*, u16, dKy_tevstr_c*);
src/d/d_name.cpp
+296 -278
View File
@@ -85,10 +85,10 @@ struct dDlst_NameIN_c {
/* 8025115C */ ~dDlst_NameIN_c();
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -261,6 +261,244 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
/* ############################################################################################## */
/* 80399CC8-80399CC8 026328 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80399CC8 = "あ";
SECTION_DEAD static char const* const stringBase_80399CCB = "い";
SECTION_DEAD static char const* const stringBase_80399CCE = "う";
SECTION_DEAD static char const* const stringBase_80399CD1 = "え";
SECTION_DEAD static char const* const stringBase_80399CD4 = "お";
SECTION_DEAD static char const* const stringBase_80399CD7 = "か";
SECTION_DEAD static char const* const stringBase_80399CDA = "き";
SECTION_DEAD static char const* const stringBase_80399CDD = "く";
SECTION_DEAD static char const* const stringBase_80399CE0 = "け";
SECTION_DEAD static char const* const stringBase_80399CE3 = "こ";
SECTION_DEAD static char const* const stringBase_80399CE6 = "さ";
SECTION_DEAD static char const* const stringBase_80399CE9 = "し";
SECTION_DEAD static char const* const stringBase_80399CEC = "す";
SECTION_DEAD static char const* const stringBase_80399CEF = "せ";
SECTION_DEAD static char const* const stringBase_80399CF2 = "そ";
SECTION_DEAD static char const* const stringBase_80399CF5 = "た";
SECTION_DEAD static char const* const stringBase_80399CF8 = "ち";
SECTION_DEAD static char const* const stringBase_80399CFB = "つ";
SECTION_DEAD static char const* const stringBase_80399CFE = "て";
SECTION_DEAD static char const* const stringBase_80399D01 = "と";
SECTION_DEAD static char const* const stringBase_80399D04 = "な";
SECTION_DEAD static char const* const stringBase_80399D07 = "に";
SECTION_DEAD static char const* const stringBase_80399D0A = "ぬ";
SECTION_DEAD static char const* const stringBase_80399D0D = "ね";
SECTION_DEAD static char const* const stringBase_80399D10 = "の";
SECTION_DEAD static char const* const stringBase_80399D13 = "は";
SECTION_DEAD static char const* const stringBase_80399D16 = "ひ";
SECTION_DEAD static char const* const stringBase_80399D19 = "ふ";
SECTION_DEAD static char const* const stringBase_80399D1C = "へ";
SECTION_DEAD static char const* const stringBase_80399D1F = "ほ";
SECTION_DEAD static char const* const stringBase_80399D22 = "ま";
SECTION_DEAD static char const* const stringBase_80399D25 = "み";
SECTION_DEAD static char const* const stringBase_80399D28 = "む";
SECTION_DEAD static char const* const stringBase_80399D2B = "め";
SECTION_DEAD static char const* const stringBase_80399D2E = "も";
SECTION_DEAD static char const* const stringBase_80399D31 = "や";
SECTION_DEAD static char const* const stringBase_80399D34 = "　";
SECTION_DEAD static char const* const stringBase_80399D37 = "ゆ";
SECTION_DEAD static char const* const stringBase_80399D3A = "よ";
SECTION_DEAD static char const* const stringBase_80399D3D = "ら";
SECTION_DEAD static char const* const stringBase_80399D40 = "り";
SECTION_DEAD static char const* const stringBase_80399D43 = "る";
SECTION_DEAD static char const* const stringBase_80399D46 = "れ";
SECTION_DEAD static char const* const stringBase_80399D49 = "ろ";
SECTION_DEAD static char const* const stringBase_80399D4C = "わ";
SECTION_DEAD static char const* const stringBase_80399D4F = "を";
SECTION_DEAD static char const* const stringBase_80399D52 = "ん";
SECTION_DEAD static char const* const stringBase_80399D55 = "ぁ";
SECTION_DEAD static char const* const stringBase_80399D58 = "ぃ";
SECTION_DEAD static char const* const stringBase_80399D5B = "ぅ";
SECTION_DEAD static char const* const stringBase_80399D5E = "ぇ";
SECTION_DEAD static char const* const stringBase_80399D61 = "ぉ";
SECTION_DEAD static char const* const stringBase_80399D64 = "ゃ";
SECTION_DEAD static char const* const stringBase_80399D67 = "ゅ";
SECTION_DEAD static char const* const stringBase_80399D6A = "ょ";
SECTION_DEAD static char const* const stringBase_80399D6D = "っ";
SECTION_DEAD static char const* const stringBase_80399D70 = "ー";
SECTION_DEAD static char const* const stringBase_80399D73 = "゛";
SECTION_DEAD static char const* const stringBase_80399D76 = "゜";
SECTION_DEAD static char const* const stringBase_80399D79 = "￥";
SECTION_DEAD static char const* const stringBase_80399D7C = "が";
SECTION_DEAD static char const* const stringBase_80399D7F = "ぎ";
SECTION_DEAD static char const* const stringBase_80399D82 = "ぐ";
SECTION_DEAD static char const* const stringBase_80399D85 = "げ";
SECTION_DEAD static char const* const stringBase_80399D88 = "ご";
SECTION_DEAD static char const* const stringBase_80399D8B = "ざ";
SECTION_DEAD static char const* const stringBase_80399D8E = "じ";
SECTION_DEAD static char const* const stringBase_80399D91 = "ず";
SECTION_DEAD static char const* const stringBase_80399D94 = "ぜ";
SECTION_DEAD static char const* const stringBase_80399D97 = "ぞ";
SECTION_DEAD static char const* const stringBase_80399D9A = "だ";
SECTION_DEAD static char const* const stringBase_80399D9D = "ぢ";
SECTION_DEAD static char const* const stringBase_80399DA0 = "づ";
SECTION_DEAD static char const* const stringBase_80399DA3 = "で";
SECTION_DEAD static char const* const stringBase_80399DA6 = "ど";
SECTION_DEAD static char const* const stringBase_80399DA9 = "ば";
SECTION_DEAD static char const* const stringBase_80399DAC = "び";
SECTION_DEAD static char const* const stringBase_80399DAF = "ぶ";
SECTION_DEAD static char const* const stringBase_80399DB2 = "べ";
SECTION_DEAD static char const* const stringBase_80399DB5 = "ぼ";
SECTION_DEAD static char const* const stringBase_80399DB8 = "ぱ";
SECTION_DEAD static char const* const stringBase_80399DBB = "ぴ";
SECTION_DEAD static char const* const stringBase_80399DBE = "ぷ";
SECTION_DEAD static char const* const stringBase_80399DC1 = "ぺ";
SECTION_DEAD static char const* const stringBase_80399DC4 = "ぽ";
SECTION_DEAD static char const* const stringBase_80399DC7 = "ア";
SECTION_DEAD static char const* const stringBase_80399DCA = "イ";
SECTION_DEAD static char const* const stringBase_80399DCD = "ウ";
SECTION_DEAD static char const* const stringBase_80399DD0 = "エ";
SECTION_DEAD static char const* const stringBase_80399DD3 = "オ";
SECTION_DEAD static char const* const stringBase_80399DD6 = "カ";
SECTION_DEAD static char const* const stringBase_80399DD9 = "キ";
SECTION_DEAD static char const* const stringBase_80399DDC = "ク";
SECTION_DEAD static char const* const stringBase_80399DDF = "ケ";
SECTION_DEAD static char const* const stringBase_80399DE2 = "コ";
SECTION_DEAD static char const* const stringBase_80399DE5 = "サ";
SECTION_DEAD static char const* const stringBase_80399DE8 = "シ";
SECTION_DEAD static char const* const stringBase_80399DEB = "ス";
SECTION_DEAD static char const* const stringBase_80399DEE = "セ";
// MWCC ignores mapping of some japanese characters using the
// byte 0x5C (ASCII '\'). This is why this string is hex-encoded.
SECTION_DEAD static char const* const stringBase_80399DF1 = "\x83\x5C";
SECTION_DEAD static char const* const stringBase_80399DF4 = "タ";
SECTION_DEAD static char const* const stringBase_80399DF7 = "チ";
SECTION_DEAD static char const* const stringBase_80399DFA = "ツ";
SECTION_DEAD static char const* const stringBase_80399DFD = "テ";
SECTION_DEAD static char const* const stringBase_80399E00 = "ト";
SECTION_DEAD static char const* const stringBase_80399E03 = "ナ";
SECTION_DEAD static char const* const stringBase_80399E06 = "ニ";
SECTION_DEAD static char const* const stringBase_80399E09 = "ヌ";
SECTION_DEAD static char const* const stringBase_80399E0C = "ネ";
SECTION_DEAD static char const* const stringBase_80399E0F = "ノ";
SECTION_DEAD static char const* const stringBase_80399E12 = "ハ";
SECTION_DEAD static char const* const stringBase_80399E15 = "ヒ";
SECTION_DEAD static char const* const stringBase_80399E18 = "フ";
SECTION_DEAD static char const* const stringBase_80399E1B = "ヘ";
SECTION_DEAD static char const* const stringBase_80399E1E = "ホ";
SECTION_DEAD static char const* const stringBase_80399E21 = "マ";
SECTION_DEAD static char const* const stringBase_80399E24 = "ミ";
SECTION_DEAD static char const* const stringBase_80399E27 = "ム";
SECTION_DEAD static char const* const stringBase_80399E2A = "メ";
SECTION_DEAD static char const* const stringBase_80399E2D = "モ";
SECTION_DEAD static char const* const stringBase_80399E30 = "ヤ";
SECTION_DEAD static char const* const stringBase_80399E33 = "ユ";
SECTION_DEAD static char const* const stringBase_80399E36 = "ヨ";
SECTION_DEAD static char const* const stringBase_80399E39 = "ラ";
SECTION_DEAD static char const* const stringBase_80399E3C = "リ";
SECTION_DEAD static char const* const stringBase_80399E3F = "ル";
SECTION_DEAD static char const* const stringBase_80399E42 = "レ";
SECTION_DEAD static char const* const stringBase_80399E45 = "ロ";
SECTION_DEAD static char const* const stringBase_80399E48 = "ワ";
SECTION_DEAD static char const* const stringBase_80399E4B = "ヲ";
SECTION_DEAD static char const* const stringBase_80399E4E = "ン";
SECTION_DEAD static char const* const stringBase_80399E51 = "ァ";
SECTION_DEAD static char const* const stringBase_80399E54 = "ィ";
SECTION_DEAD static char const* const stringBase_80399E57 = "ゥ";
SECTION_DEAD static char const* const stringBase_80399E5A = "ェ";
SECTION_DEAD static char const* const stringBase_80399E5D = "ォ";
SECTION_DEAD static char const* const stringBase_80399E60 = "ャ";
SECTION_DEAD static char const* const stringBase_80399E63 = "ュ";
SECTION_DEAD static char const* const stringBase_80399E66 = "ョ";
SECTION_DEAD static char const* const stringBase_80399E69 = "ッ";
SECTION_DEAD static char const* const stringBase_80399E6C = "ヴ";
SECTION_DEAD static char const* const stringBase_80399E6F = "ガ";
SECTION_DEAD static char const* const stringBase_80399E72 = "ギ";
SECTION_DEAD static char const* const stringBase_80399E75 = "グ";
SECTION_DEAD static char const* const stringBase_80399E78 = "ゲ";
SECTION_DEAD static char const* const stringBase_80399E7B = "ゴ";
SECTION_DEAD static char const* const stringBase_80399E7E = "ザ";
SECTION_DEAD static char const* const stringBase_80399E81 = "ジ";
SECTION_DEAD static char const* const stringBase_80399E84 = "ズ";
SECTION_DEAD static char const* const stringBase_80399E87 = "ゼ";
SECTION_DEAD static char const* const stringBase_80399E8A = "ゾ";
SECTION_DEAD static char const* const stringBase_80399E8D = "ダ";
SECTION_DEAD static char const* const stringBase_80399E90 = "ヂ";
SECTION_DEAD static char const* const stringBase_80399E93 = "ヅ";
SECTION_DEAD static char const* const stringBase_80399E96 = "デ";
SECTION_DEAD static char const* const stringBase_80399E99 = "ド";
SECTION_DEAD static char const* const stringBase_80399E9C = "バ";
SECTION_DEAD static char const* const stringBase_80399E9F = "ビ";
SECTION_DEAD static char const* const stringBase_80399EA2 = "ブ";
SECTION_DEAD static char const* const stringBase_80399EA5 = "ベ";
SECTION_DEAD static char const* const stringBase_80399EA8 = "ボ";
SECTION_DEAD static char const* const stringBase_80399EAB = "パ";
SECTION_DEAD static char const* const stringBase_80399EAE = "ピ";
SECTION_DEAD static char const* const stringBase_80399EB1 = "プ";
SECTION_DEAD static char const* const stringBase_80399EB4 = "ペ";
SECTION_DEAD static char const* const stringBase_80399EB7 = "ポ";
SECTION_DEAD static char const* const stringBase_80399EBA = "A";
SECTION_DEAD static char const* const stringBase_80399EBC = "N";
SECTION_DEAD static char const* const stringBase_80399EBE = "a";
SECTION_DEAD static char const* const stringBase_80399EC0 = "n";
SECTION_DEAD static char const* const stringBase_80399EC2 = "1";
SECTION_DEAD static char const* const stringBase_80399EC4 = "B";
SECTION_DEAD static char const* const stringBase_80399EC6 = "O";
SECTION_DEAD static char const* const stringBase_80399EC8 = "b";
SECTION_DEAD static char const* const stringBase_80399ECA = "o";
SECTION_DEAD static char const* const stringBase_80399ECC = "2";
SECTION_DEAD static char const* const stringBase_80399ECE = "C";
SECTION_DEAD static char const* const stringBase_80399ED0 = "P";
SECTION_DEAD static char const* const stringBase_80399ED2 = "c";
SECTION_DEAD static char const* const stringBase_80399ED4 = "p";
SECTION_DEAD static char const* const stringBase_80399ED6 = "3";
SECTION_DEAD static char const* const stringBase_80399ED8 = "D";
SECTION_DEAD static char const* const stringBase_80399EDA = "Q";
SECTION_DEAD static char const* const stringBase_80399EDC = "d";
SECTION_DEAD static char const* const stringBase_80399EDE = "q";
SECTION_DEAD static char const* const stringBase_80399EE0 = "4";
SECTION_DEAD static char const* const stringBase_80399EE2 = "E";
SECTION_DEAD static char const* const stringBase_80399EE4 = "R";
SECTION_DEAD static char const* const stringBase_80399EE6 = "e";
SECTION_DEAD static char const* const stringBase_80399EE8 = "r";
SECTION_DEAD static char const* const stringBase_80399EEA = "5";
SECTION_DEAD static char const* const stringBase_80399EEC = "F";
SECTION_DEAD static char const* const stringBase_80399EEE = "S";
SECTION_DEAD static char const* const stringBase_80399EF0 = "f";
SECTION_DEAD static char const* const stringBase_80399EF2 = "s";
SECTION_DEAD static char const* const stringBase_80399EF4 = "6";
SECTION_DEAD static char const* const stringBase_80399EF6 = "G";
SECTION_DEAD static char const* const stringBase_80399EF8 = "T";
SECTION_DEAD static char const* const stringBase_80399EFA = "g";
SECTION_DEAD static char const* const stringBase_80399EFC = "t";
SECTION_DEAD static char const* const stringBase_80399EFE = "7";
SECTION_DEAD static char const* const stringBase_80399F00 = "H";
SECTION_DEAD static char const* const stringBase_80399F02 = "U";
SECTION_DEAD static char const* const stringBase_80399F04 = "h";
SECTION_DEAD static char const* const stringBase_80399F06 = "u";
SECTION_DEAD static char const* const stringBase_80399F08 = "8";
SECTION_DEAD static char const* const stringBase_80399F0A = "I";
SECTION_DEAD static char const* const stringBase_80399F0C = "V";
SECTION_DEAD static char const* const stringBase_80399F0E = "i";
SECTION_DEAD static char const* const stringBase_80399F10 = "v";
SECTION_DEAD static char const* const stringBase_80399F12 = "9";
SECTION_DEAD static char const* const stringBase_80399F14 = "J";
SECTION_DEAD static char const* const stringBase_80399F16 = "W";
SECTION_DEAD static char const* const stringBase_80399F18 = "j";
SECTION_DEAD static char const* const stringBase_80399F1A = "w";
SECTION_DEAD static char const* const stringBase_80399F1C = "0";
SECTION_DEAD static char const* const stringBase_80399F1E = "K";
SECTION_DEAD static char const* const stringBase_80399F20 = "X";
SECTION_DEAD static char const* const stringBase_80399F22 = "k";
SECTION_DEAD static char const* const stringBase_80399F24 = "x";
SECTION_DEAD static char const* const stringBase_80399F26 = ",";
SECTION_DEAD static char const* const stringBase_80399F28 = "L";
SECTION_DEAD static char const* const stringBase_80399F2A = "Y";
SECTION_DEAD static char const* const stringBase_80399F2C = "l";
SECTION_DEAD static char const* const stringBase_80399F2E = "y";
SECTION_DEAD static char const* const stringBase_80399F30 = ".";
SECTION_DEAD static char const* const stringBase_80399F32 = "M";
SECTION_DEAD static char const* const stringBase_80399F34 = "Z";
SECTION_DEAD static char const* const stringBase_80399F36 = "m";
SECTION_DEAD static char const* const stringBase_80399F38 = "z";
SECTION_DEAD static char const* const stringBase_80399F3A = " ";
#pragma pop
/* 803C1F50-803C1F5C 01F070 000C+00 5/5 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1280,6 +1518,27 @@ asm void dName_c::setMoji(int param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 80399CC8-80399CC8 026328 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80399F3C = ""
"\x1B"
"CD"
"\x1B"
"CR"
"\x1B"
"CC[000000]"
"\x1B"
"GM[0]%c"
"\x1B"
"HM"
"\x1B"
"CC[ffffff]"
"\x1B"
"GM[0]%c";
#pragma pop
/* 8024F88C-8024F914 24A1CC 0088+00 4/4 0/0 0/0 .text setNameText__7dName_cFv */
#pragma push
#pragma optimization_level 0
@@ -1385,6 +1644,28 @@ asm void dName_c::backSpace() {
}
#pragma pop
/* ############################################################################################## */
/* 80399CC8-80399CC8 026328 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80399F6C = ""
"\x1B"
"CD"
"\x1B"
"CR"
"\x1B"
"CC[000000]"
"\x1B"
"GM[0]";
SECTION_DEAD static char const* const stringBase_80399F84 = ""
"\x1B"
"HM"
"\x1B"
"CC[ffffff]"
"\x1B"
"GM[0]";
#pragma pop
/* 802501B0-80250284 24AAF0 00D4+00 2/2 0/0 0/0 .text mojiListChange__7dName_cFv */
#pragma push
#pragma optimization_level 0
@@ -1436,6 +1717,17 @@ asm void dName_c::_draw() {
#pragma pop
/* ############################################################################################## */
/* 80399CC8-80399CC8 026328 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80399F99 = "zelda_player_name.blo";
SECTION_DEAD static char const* const stringBase_80399FAF = "zelda_player_name.bpk";
SECTION_DEAD static char const* const stringBase_80399FC5 = "zelda_player_name.btk";
SECTION_DEAD static char const* const stringBase_80399FDB = "";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80399FDC = "\0\0\0";
#pragma pop
/* 80454DD4-80454DD8 0033D4 0004+00 1/1 0/0 0/0 .sdata2 @4722 */
SECTION_SDATA2 static f32 lit_4722 = 41.0f / 50.0f;
@@ -1534,281 +1826,7 @@ asm void __sinit_d_name_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_802511EC = (void*)__sinit_d_name_cpp;
REGISTER_CTORS(0x802511EC, __sinit_d_name_cpp);
#pragma pop
/* 80399CC8-80399FE0 026328 0314+04 10/3 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80399CC8 = "あ";
SECTION_DEAD static char const* const stringBase_80399CCB = "い";
SECTION_DEAD static char const* const stringBase_80399CCE = "う";
SECTION_DEAD static char const* const stringBase_80399CD1 = "え";
SECTION_DEAD static char const* const stringBase_80399CD4 = "お";
SECTION_DEAD static char const* const stringBase_80399CD7 = "か";
SECTION_DEAD static char const* const stringBase_80399CDA = "き";
SECTION_DEAD static char const* const stringBase_80399CDD = "く";
SECTION_DEAD static char const* const stringBase_80399CE0 = "け";
SECTION_DEAD static char const* const stringBase_80399CE3 = "こ";
SECTION_DEAD static char const* const stringBase_80399CE6 = "さ";
SECTION_DEAD static char const* const stringBase_80399CE9 = "し";
SECTION_DEAD static char const* const stringBase_80399CEC = "す";
SECTION_DEAD static char const* const stringBase_80399CEF = "せ";
SECTION_DEAD static char const* const stringBase_80399CF2 = "そ";
SECTION_DEAD static char const* const stringBase_80399CF5 = "た";
SECTION_DEAD static char const* const stringBase_80399CF8 = "ち";
SECTION_DEAD static char const* const stringBase_80399CFB = "つ";
SECTION_DEAD static char const* const stringBase_80399CFE = "て";
SECTION_DEAD static char const* const stringBase_80399D01 = "と";
SECTION_DEAD static char const* const stringBase_80399D04 = "な";
SECTION_DEAD static char const* const stringBase_80399D07 = "に";
SECTION_DEAD static char const* const stringBase_80399D0A = "ぬ";
SECTION_DEAD static char const* const stringBase_80399D0D = "ね";
SECTION_DEAD static char const* const stringBase_80399D10 = "の";
SECTION_DEAD static char const* const stringBase_80399D13 = "は";
SECTION_DEAD static char const* const stringBase_80399D16 = "ひ";
SECTION_DEAD static char const* const stringBase_80399D19 = "ふ";
SECTION_DEAD static char const* const stringBase_80399D1C = "へ";
SECTION_DEAD static char const* const stringBase_80399D1F = "ほ";
SECTION_DEAD static char const* const stringBase_80399D22 = "ま";
SECTION_DEAD static char const* const stringBase_80399D25 = "み";
SECTION_DEAD static char const* const stringBase_80399D28 = "む";
SECTION_DEAD static char const* const stringBase_80399D2B = "め";
SECTION_DEAD static char const* const stringBase_80399D2E = "も";
SECTION_DEAD static char const* const stringBase_80399D31 = "や";
SECTION_DEAD static char const* const stringBase_80399D34 = "　";
SECTION_DEAD static char const* const stringBase_80399D37 = "ゆ";
SECTION_DEAD static char const* const stringBase_80399D3A = "よ";
SECTION_DEAD static char const* const stringBase_80399D3D = "ら";
SECTION_DEAD static char const* const stringBase_80399D40 = "り";
SECTION_DEAD static char const* const stringBase_80399D43 = "る";
SECTION_DEAD static char const* const stringBase_80399D46 = "れ";
SECTION_DEAD static char const* const stringBase_80399D49 = "ろ";
SECTION_DEAD static char const* const stringBase_80399D4C = "わ";
SECTION_DEAD static char const* const stringBase_80399D4F = "を";
SECTION_DEAD static char const* const stringBase_80399D52 = "ん";
SECTION_DEAD static char const* const stringBase_80399D55 = "ぁ";
SECTION_DEAD static char const* const stringBase_80399D58 = "ぃ";
SECTION_DEAD static char const* const stringBase_80399D5B = "ぅ";
SECTION_DEAD static char const* const stringBase_80399D5E = "ぇ";
SECTION_DEAD static char const* const stringBase_80399D61 = "ぉ";
SECTION_DEAD static char const* const stringBase_80399D64 = "ゃ";
SECTION_DEAD static char const* const stringBase_80399D67 = "ゅ";
SECTION_DEAD static char const* const stringBase_80399D6A = "ょ";
SECTION_DEAD static char const* const stringBase_80399D6D = "っ";
SECTION_DEAD static char const* const stringBase_80399D70 = "ー";
SECTION_DEAD static char const* const stringBase_80399D73 = "゛";
SECTION_DEAD static char const* const stringBase_80399D76 = "゜";
SECTION_DEAD static char const* const stringBase_80399D79 = "￥";
SECTION_DEAD static char const* const stringBase_80399D7C = "が";
SECTION_DEAD static char const* const stringBase_80399D7F = "ぎ";
SECTION_DEAD static char const* const stringBase_80399D82 = "ぐ";
SECTION_DEAD static char const* const stringBase_80399D85 = "げ";
SECTION_DEAD static char const* const stringBase_80399D88 = "ご";
SECTION_DEAD static char const* const stringBase_80399D8B = "ざ";
SECTION_DEAD static char const* const stringBase_80399D8E = "じ";
SECTION_DEAD static char const* const stringBase_80399D91 = "ず";
SECTION_DEAD static char const* const stringBase_80399D94 = "ぜ";
SECTION_DEAD static char const* const stringBase_80399D97 = "ぞ";
SECTION_DEAD static char const* const stringBase_80399D9A = "だ";
SECTION_DEAD static char const* const stringBase_80399D9D = "ぢ";
SECTION_DEAD static char const* const stringBase_80399DA0 = "づ";
SECTION_DEAD static char const* const stringBase_80399DA3 = "で";
SECTION_DEAD static char const* const stringBase_80399DA6 = "ど";
SECTION_DEAD static char const* const stringBase_80399DA9 = "ば";
SECTION_DEAD static char const* const stringBase_80399DAC = "び";
SECTION_DEAD static char const* const stringBase_80399DAF = "ぶ";
SECTION_DEAD static char const* const stringBase_80399DB2 = "べ";
SECTION_DEAD static char const* const stringBase_80399DB5 = "ぼ";
SECTION_DEAD static char const* const stringBase_80399DB8 = "ぱ";
SECTION_DEAD static char const* const stringBase_80399DBB = "ぴ";
SECTION_DEAD static char const* const stringBase_80399DBE = "ぷ";
SECTION_DEAD static char const* const stringBase_80399DC1 = "ぺ";
SECTION_DEAD static char const* const stringBase_80399DC4 = "ぽ";
SECTION_DEAD static char const* const stringBase_80399DC7 = "ア";
SECTION_DEAD static char const* const stringBase_80399DCA = "イ";
SECTION_DEAD static char const* const stringBase_80399DCD = "ウ";
SECTION_DEAD static char const* const stringBase_80399DD0 = "エ";
SECTION_DEAD static char const* const stringBase_80399DD3 = "オ";
SECTION_DEAD static char const* const stringBase_80399DD6 = "カ";
SECTION_DEAD static char const* const stringBase_80399DD9 = "キ";
SECTION_DEAD static char const* const stringBase_80399DDC = "ク";
SECTION_DEAD static char const* const stringBase_80399DDF = "ケ";
SECTION_DEAD static char const* const stringBase_80399DE2 = "コ";
SECTION_DEAD static char const* const stringBase_80399DE5 = "サ";
SECTION_DEAD static char const* const stringBase_80399DE8 = "シ";
SECTION_DEAD static char const* const stringBase_80399DEB = "ス";
SECTION_DEAD static char const* const stringBase_80399DEE = "セ";
// MWCC ignores mapping of some japanese characters using the
// byte 0x5C (ASCII '\'). This is why this string is hex-encoded.
SECTION_DEAD static char const* const stringBase_80399DF1 = "\x83\x5C";
SECTION_DEAD static char const* const stringBase_80399DF4 = "タ";
SECTION_DEAD static char const* const stringBase_80399DF7 = "チ";
SECTION_DEAD static char const* const stringBase_80399DFA = "ツ";
SECTION_DEAD static char const* const stringBase_80399DFD = "テ";
SECTION_DEAD static char const* const stringBase_80399E00 = "ト";
SECTION_DEAD static char const* const stringBase_80399E03 = "ナ";
SECTION_DEAD static char const* const stringBase_80399E06 = "ニ";
SECTION_DEAD static char const* const stringBase_80399E09 = "ヌ";
SECTION_DEAD static char const* const stringBase_80399E0C = "ネ";
SECTION_DEAD static char const* const stringBase_80399E0F = "ノ";
SECTION_DEAD static char const* const stringBase_80399E12 = "ハ";
SECTION_DEAD static char const* const stringBase_80399E15 = "ヒ";
SECTION_DEAD static char const* const stringBase_80399E18 = "フ";
SECTION_DEAD static char const* const stringBase_80399E1B = "ヘ";
SECTION_DEAD static char const* const stringBase_80399E1E = "ホ";
SECTION_DEAD static char const* const stringBase_80399E21 = "マ";
SECTION_DEAD static char const* const stringBase_80399E24 = "ミ";
SECTION_DEAD static char const* const stringBase_80399E27 = "ム";
SECTION_DEAD static char const* const stringBase_80399E2A = "メ";
SECTION_DEAD static char const* const stringBase_80399E2D = "モ";
SECTION_DEAD static char const* const stringBase_80399E30 = "ヤ";
SECTION_DEAD static char const* const stringBase_80399E33 = "ユ";
SECTION_DEAD static char const* const stringBase_80399E36 = "ヨ";
SECTION_DEAD static char const* const stringBase_80399E39 = "ラ";
SECTION_DEAD static char const* const stringBase_80399E3C = "リ";
SECTION_DEAD static char const* const stringBase_80399E3F = "ル";
SECTION_DEAD static char const* const stringBase_80399E42 = "レ";
SECTION_DEAD static char const* const stringBase_80399E45 = "ロ";
SECTION_DEAD static char const* const stringBase_80399E48 = "ワ";
SECTION_DEAD static char const* const stringBase_80399E4B = "ヲ";
SECTION_DEAD static char const* const stringBase_80399E4E = "ン";
SECTION_DEAD static char const* const stringBase_80399E51 = "ァ";
SECTION_DEAD static char const* const stringBase_80399E54 = "ィ";
SECTION_DEAD static char const* const stringBase_80399E57 = "ゥ";
SECTION_DEAD static char const* const stringBase_80399E5A = "ェ";
SECTION_DEAD static char const* const stringBase_80399E5D = "ォ";
SECTION_DEAD static char const* const stringBase_80399E60 = "ャ";
SECTION_DEAD static char const* const stringBase_80399E63 = "ュ";
SECTION_DEAD static char const* const stringBase_80399E66 = "ョ";
SECTION_DEAD static char const* const stringBase_80399E69 = "ッ";
SECTION_DEAD static char const* const stringBase_80399E6C = "ヴ";
SECTION_DEAD static char const* const stringBase_80399E6F = "ガ";
SECTION_DEAD static char const* const stringBase_80399E72 = "ギ";
SECTION_DEAD static char const* const stringBase_80399E75 = "グ";
SECTION_DEAD static char const* const stringBase_80399E78 = "ゲ";
SECTION_DEAD static char const* const stringBase_80399E7B = "ゴ";
SECTION_DEAD static char const* const stringBase_80399E7E = "ザ";
SECTION_DEAD static char const* const stringBase_80399E81 = "ジ";
SECTION_DEAD static char const* const stringBase_80399E84 = "ズ";
SECTION_DEAD static char const* const stringBase_80399E87 = "ゼ";
SECTION_DEAD static char const* const stringBase_80399E8A = "ゾ";
SECTION_DEAD static char const* const stringBase_80399E8D = "ダ";
SECTION_DEAD static char const* const stringBase_80399E90 = "ヂ";
SECTION_DEAD static char const* const stringBase_80399E93 = "ヅ";
SECTION_DEAD static char const* const stringBase_80399E96 = "デ";
SECTION_DEAD static char const* const stringBase_80399E99 = "ド";
SECTION_DEAD static char const* const stringBase_80399E9C = "バ";
SECTION_DEAD static char const* const stringBase_80399E9F = "ビ";
SECTION_DEAD static char const* const stringBase_80399EA2 = "ブ";
SECTION_DEAD static char const* const stringBase_80399EA5 = "ベ";
SECTION_DEAD static char const* const stringBase_80399EA8 = "ボ";
SECTION_DEAD static char const* const stringBase_80399EAB = "パ";
SECTION_DEAD static char const* const stringBase_80399EAE = "ピ";
SECTION_DEAD static char const* const stringBase_80399EB1 = "プ";
SECTION_DEAD static char const* const stringBase_80399EB4 = "ペ";
SECTION_DEAD static char const* const stringBase_80399EB7 = "ポ";
SECTION_DEAD static char const* const stringBase_80399EBA = "A";
SECTION_DEAD static char const* const stringBase_80399EBC = "N";
SECTION_DEAD static char const* const stringBase_80399EBE = "a";
SECTION_DEAD static char const* const stringBase_80399EC0 = "n";
SECTION_DEAD static char const* const stringBase_80399EC2 = "1";
SECTION_DEAD static char const* const stringBase_80399EC4 = "B";
SECTION_DEAD static char const* const stringBase_80399EC6 = "O";
SECTION_DEAD static char const* const stringBase_80399EC8 = "b";
SECTION_DEAD static char const* const stringBase_80399ECA = "o";
SECTION_DEAD static char const* const stringBase_80399ECC = "2";
SECTION_DEAD static char const* const stringBase_80399ECE = "C";
SECTION_DEAD static char const* const stringBase_80399ED0 = "P";
SECTION_DEAD static char const* const stringBase_80399ED2 = "c";
SECTION_DEAD static char const* const stringBase_80399ED4 = "p";
SECTION_DEAD static char const* const stringBase_80399ED6 = "3";
SECTION_DEAD static char const* const stringBase_80399ED8 = "D";
SECTION_DEAD static char const* const stringBase_80399EDA = "Q";
SECTION_DEAD static char const* const stringBase_80399EDC = "d";
SECTION_DEAD static char const* const stringBase_80399EDE = "q";
SECTION_DEAD static char const* const stringBase_80399EE0 = "4";
SECTION_DEAD static char const* const stringBase_80399EE2 = "E";
SECTION_DEAD static char const* const stringBase_80399EE4 = "R";
SECTION_DEAD static char const* const stringBase_80399EE6 = "e";
SECTION_DEAD static char const* const stringBase_80399EE8 = "r";
SECTION_DEAD static char const* const stringBase_80399EEA = "5";
SECTION_DEAD static char const* const stringBase_80399EEC = "F";
SECTION_DEAD static char const* const stringBase_80399EEE = "S";
SECTION_DEAD static char const* const stringBase_80399EF0 = "f";
SECTION_DEAD static char const* const stringBase_80399EF2 = "s";
SECTION_DEAD static char const* const stringBase_80399EF4 = "6";
SECTION_DEAD static char const* const stringBase_80399EF6 = "G";
SECTION_DEAD static char const* const stringBase_80399EF8 = "T";
SECTION_DEAD static char const* const stringBase_80399EFA = "g";
SECTION_DEAD static char const* const stringBase_80399EFC = "t";
SECTION_DEAD static char const* const stringBase_80399EFE = "7";
SECTION_DEAD static char const* const stringBase_80399F00 = "H";
SECTION_DEAD static char const* const stringBase_80399F02 = "U";
SECTION_DEAD static char const* const stringBase_80399F04 = "h";
SECTION_DEAD static char const* const stringBase_80399F06 = "u";
SECTION_DEAD static char const* const stringBase_80399F08 = "8";
SECTION_DEAD static char const* const stringBase_80399F0A = "I";
SECTION_DEAD static char const* const stringBase_80399F0C = "V";
SECTION_DEAD static char const* const stringBase_80399F0E = "i";
SECTION_DEAD static char const* const stringBase_80399F10 = "v";
SECTION_DEAD static char const* const stringBase_80399F12 = "9";
SECTION_DEAD static char const* const stringBase_80399F14 = "J";
SECTION_DEAD static char const* const stringBase_80399F16 = "W";
SECTION_DEAD static char const* const stringBase_80399F18 = "j";
SECTION_DEAD static char const* const stringBase_80399F1A = "w";
SECTION_DEAD static char const* const stringBase_80399F1C = "0";
SECTION_DEAD static char const* const stringBase_80399F1E = "K";
SECTION_DEAD static char const* const stringBase_80399F20 = "X";
SECTION_DEAD static char const* const stringBase_80399F22 = "k";
SECTION_DEAD static char const* const stringBase_80399F24 = "x";
SECTION_DEAD static char const* const stringBase_80399F26 = ",";
SECTION_DEAD static char const* const stringBase_80399F28 = "L";
SECTION_DEAD static char const* const stringBase_80399F2A = "Y";
SECTION_DEAD static char const* const stringBase_80399F2C = "l";
SECTION_DEAD static char const* const stringBase_80399F2E = "y";
SECTION_DEAD static char const* const stringBase_80399F30 = ".";
SECTION_DEAD static char const* const stringBase_80399F32 = "M";
SECTION_DEAD static char const* const stringBase_80399F34 = "Z";
SECTION_DEAD static char const* const stringBase_80399F36 = "m";
SECTION_DEAD static char const* const stringBase_80399F38 = "z";
SECTION_DEAD static char const* const stringBase_80399F3A = " ";
SECTION_DEAD static char const* const stringBase_80399F3C = ""
"\x1B"
"CD"
"\x1B"
"CR"
"\x1B"
"CC[000000]"
"\x1B"
"GM[0]%c"
"\x1B"
"HM"
"\x1B"
"CC[ffffff]"
"\x1B"
"GM[0]%c";
SECTION_DEAD static char const* const stringBase_80399F6C = ""
"\x1B"
"CD"
"\x1B"
"CR"
"\x1B"
"CC[000000]"
"\x1B"
"GM[0]";
SECTION_DEAD static char const* const stringBase_80399F84 = ""
"\x1B"
"HM"
"\x1B"
"CC[ffffff]"
"\x1B"
"GM[0]";
SECTION_DEAD static char const* const stringBase_80399F99 = "zelda_player_name.blo";
SECTION_DEAD static char const* const stringBase_80399FAF = "zelda_player_name.bpk";
SECTION_DEAD static char const* const stringBase_80399FC5 = "zelda_player_name.btk";
SECTION_DEAD static char const* const stringBase_80399FDB = "";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80399FDC = "\0\0\0";
#pragma pop
/* 80399CC8-80399CC8 026328 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_resorce.cpp
+133 -61
View File
@@ -35,6 +35,12 @@ struct mDoDvdThd_mountArchive_c {
/* 80015E14 */ void create(char const*, u8, JKRHeap*);
};
struct J3DModelData {
/* 80325E14 */ void newSharedDisplayList(u32);
/* 80325F94 */ void makeSharedDL();
/* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]);
};
struct JKRArchive {
/* 802D5CE4 */ void getIdxResource(u32);
/* 802D625C */ void getFileAttribute(u32) const;
@@ -42,12 +48,6 @@ struct JKRArchive {
/* 802D66AC */ void findNameResource(char const*) const;
};
struct J3DModelData {
/* 80325E14 */ void newSharedDisplayList(u32);
/* 80325F94 */ void makeSharedDL();
/* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]);
};
struct cXyz {};
struct dRes_info_c {
@@ -370,6 +370,13 @@ asm dRes_info_c::~dRes_info_c() {
}
#pragma pop
/* ############################################################################################## */
/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803798B8 = "%s%s.arc";
#pragma pop
/* 8003A348-8003A3F0 034C88 00A8+00 1/1 0/0 0/0 .text set__11dRes_info_cFPCcPCcUcP7JKRHeap */
#pragma push
#pragma optimization_level 0
@@ -390,6 +397,15 @@ static asm void setAlpha(J3DMaterialTable* param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803798C1 = "fbtex_dummy";
SECTION_DEAD static char const* const stringBase_803798CD = "dummy";
SECTION_DEAD static char const* const stringBase_803798D3 = "Zbuffer";
#pragma pop
/* 8003A490-8003A81C 034DD0 038C+00 1/1 0/0 0/0 .text setIndirectTex__FP12J3DModelData */
#pragma push
#pragma optimization_level 0
@@ -421,14 +437,20 @@ 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,
};
COMPILER_STRIP_GATE(80379840, &l_texMtxInfo);
COMPILER_STRIP_GATE(0x80379840, &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,
};
COMPILER_STRIP_GATE(803798A4, &l_tevStageInfo);
COMPILER_STRIP_GATE(0x803798A4, &l_tevStageInfo);
/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803798DB = "Always";
#pragma pop
/* 80450628-8045062C 0000A8 0004+00 1/1 0/0 0/0 .sdata l_texCoordInfo$3772 */
SECTION_SDATA static u8 l_texCoordInfo[4] = {
@@ -678,6 +700,15 @@ asm J3DMatColorAnm::J3DMatColorAnm() {
}
#pragma pop
/* ############################################################################################## */
/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803798E2 =
"<%s.arc> setRes: res pointer buffer nothing !!\n";
SECTION_DEAD static char const* const stringBase_80379912 = "<%s> res == NULL !!\n";
#pragma pop
/* 8003B30C-8003B8D0 035C4C 05C4+00 2/2 0/0 0/0 .text loadResource__11dRes_info_cFv */
#pragma push
#pragma optimization_level 0
@@ -740,6 +771,16 @@ asm void dRes_info_c::setRes(JKRArchive* param_0, JKRHeap* param_1) {
}
#pragma pop
/* ############################################################################################## */
/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379927 =
"<%s.arc> setRes: archive mount error !!\n";
SECTION_DEAD static char const* const stringBase_80379950 =
"<%s.arc> mDMCommandsetRes: can't alloc memory\n";
#pragma pop
/* 8003BAF8-8003BC98 036438 01A0+00 2/2 0/0 0/0 .text setRes__11dRes_info_cFv */
#pragma push
#pragma optimization_level 0
@@ -770,6 +811,19 @@ static asm void myGetMemBlockSize0(void* param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037997F = "%5.1f %5x %5.1f %5x %3d %s\n";
SECTION_DEAD static char const* const stringBase_8037999B = "dRes_info_c::dump_long %08x %d\n";
SECTION_DEAD static char const* const stringBase_803799BB =
"No Command Archive ArcHeader(size) SolidHeap(si"
"ze) Resource Cnt ArchiveName\n";
SECTION_DEAD static char const* const stringBase_80379A09 =
"%2d %08x %08x %08x(%6x) %08x(%5x) %08x %3d %s\n";
#pragma pop
/* 8003BD2C-8003BE38 03666C 010C+00 1/1 0/0 0/0 .text dump_long__11dRes_info_cFP11dRes_info_ci */
#pragma push
#pragma optimization_level 0
@@ -781,6 +835,19 @@ asm void dRes_info_c::dump_long(dRes_info_c* param_0, int param_1) {
#pragma pop
/* ############################################################################################## */
/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379A38 = "dRes_info_c::dump %08x %d\n";
SECTION_DEAD static char const* const stringBase_80379A53 =
"No ArchiveSize(KB) SolidHeapSize(KB) Cnt Archive"
"Name\n";
SECTION_DEAD static char const* const stringBase_80379A89 = "%2d %6.1f %6x %6.1f %6x %3d %s\n";
SECTION_DEAD static char const* const stringBase_80379AA9 =
"----------------------------------------------\n "
" %6.1f %6x %6.1f %6x Total\n\n";
#pragma pop
/* 80451DF8-80451E00 0003F8 0008+00 1/1 0/0 0/0 .sdata2 @4277 */
SECTION_SDATA2 static f64 lit_4277 = 4503601774854144.0 /* cast s32 to float */;
@@ -812,6 +879,22 @@ asm dRes_control_c::~dRes_control_c() {
}
#pragma pop
/* ############################################################################################## */
/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
// MWCC ignores mapping of some japanese characters using the
// byte 0x5C (ASCII '\'). This is why this string is hex-encoded.
SECTION_DEAD static char const* const stringBase_80379AF9 =
"\x3C\x25\x73\x2E\x61\x72\x63\x3E\x20\x64\x52\x65\x73\x5F\x63\x6F\x6E\x74\x72\x6F\x6C\x5F\x63"
"\x3A\x3A\x73\x65\x74\x52\x65\x73\x3A\x20\x8B\xF3\x82\xAB\x83\x8A\x83\x5C\x81\x5B\x83\x58\x8F"
"\xEE\x95"
"\xF1\x83\x7C\x83\x43\x83\x93\x83\x5E\x82\xAA\x82\xA0\x82\xE8\x82\xDC\x82\xB9\x82\xF1\x0A";
SECTION_DEAD static char const* const stringBase_80379B40 =
"<%s.arc> dRes_control_c::setRes: res info set er"
"ror !!\n";
#pragma pop
/* 8003C078-8003C160 0369B8 00E8+00 2/2 8/8 0/0 .text
* setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap */
#pragma push
@@ -868,6 +951,14 @@ asm void dRes_control_c::newResInfo(dRes_info_c* param_0, int param_1) {
}
#pragma pop
/* ############################################################################################## */
/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379B78 =
"<%s.arc> getRes: res during reading !!\n";
#pragma pop
/* 8003C288-8003C2EC 036BC8 0064+00 4/4 0/0 0/0 .text
* getResInfoLoaded__14dRes_control_cFPCcP11dRes_info_ci */
#pragma push
@@ -879,6 +970,15 @@ asm void dRes_control_c::getResInfoLoaded(char const* param_0, dRes_info_c* para
}
#pragma pop
/* ############################################################################################## */
/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379BA0 =
"<%s.arc> getRes: res index over !! index=%d coun"
"t=%d\n";
#pragma pop
/* 8003C2EC-8003C37C 036C2C 0090+00 1/1 54/54 894/894 .text
* getRes__14dRes_control_cFPCclP11dRes_info_ci */
#pragma push
@@ -926,6 +1026,13 @@ asm void dRes_control_c::syncAllRes(dRes_info_c* param_0, int param_1) {
}
#pragma pop
/* ############################################################################################## */
/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379BD6 = "";
#pragma pop
/* 8003C4E4-8003C5BC 036E24 00D8+00 1/1 0/0 0/0 .text
* setObjectRes__14dRes_control_cFPCcPvUlP7JKRHeap */
#pragma push
@@ -938,6 +1045,13 @@ asm void dRes_control_c::setObjectRes(char const* param_0, void* param_1, u32 pa
}
#pragma pop
/* ############################################################################################## */
/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379BD7 = "/res/Stage/%s/";
#pragma pop
/* 8003C5BC-8003C638 036EFC 007C+00 0/0 2/2 0/0 .text setStageRes__14dRes_control_cFPCcP7JKRHeap
*/
#pragma push
@@ -949,6 +1063,16 @@ asm void dRes_control_c::setStageRes(char const* param_0, JKRHeap* param_1) {
}
#pragma pop
/* ############################################################################################## */
/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379BE6 = "\ndRes_control_c::dump mObjectInfo\n";
SECTION_DEAD static char const* const stringBase_80379C09 = "\ndRes_control_c::dump mStageInfo\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80379C2B = "\0\0\0\0";
#pragma pop
/* 8003C638-8003C6B8 036F78 0080+00 0/0 2/2 0/0 .text dump__14dRes_control_cFv */
#pragma push
#pragma optimization_level 0
@@ -1021,56 +1145,4 @@ asm void J3DTexNoAnm::calc(u16* param_0) const {
}
#pragma pop
/* 803798B8-80379C30 005F18 0373+05 13/13 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803798B8 = "%s%s.arc";
SECTION_DEAD static char const* const stringBase_803798C1 = "fbtex_dummy";
SECTION_DEAD static char const* const stringBase_803798CD = "dummy";
SECTION_DEAD static char const* const stringBase_803798D3 = "Zbuffer";
SECTION_DEAD static char const* const stringBase_803798DB = "Always";
SECTION_DEAD static char const* const stringBase_803798E2 =
"<%s.arc> setRes: res pointer buffer nothing !!\n";
SECTION_DEAD static char const* const stringBase_80379912 = "<%s> res == NULL !!\n";
SECTION_DEAD static char const* const stringBase_80379927 =
"<%s.arc> setRes: archive mount error !!\n";
SECTION_DEAD static char const* const stringBase_80379950 =
"<%s.arc> mDMCommandsetRes: can't alloc memory\n";
SECTION_DEAD static char const* const stringBase_8037997F = "%5.1f %5x %5.1f %5x %3d %s\n";
SECTION_DEAD static char const* const stringBase_8037999B = "dRes_info_c::dump_long %08x %d\n";
SECTION_DEAD static char const* const stringBase_803799BB =
"No Command Archive ArcHeader(size) SolidHeap(si"
"ze) Resource Cnt ArchiveName\n";
SECTION_DEAD static char const* const stringBase_80379A09 =
"%2d %08x %08x %08x(%6x) %08x(%5x) %08x %3d %s\n";
SECTION_DEAD static char const* const stringBase_80379A38 = "dRes_info_c::dump %08x %d\n";
SECTION_DEAD static char const* const stringBase_80379A53 =
"No ArchiveSize(KB) SolidHeapSize(KB) Cnt Archive"
"Name\n";
SECTION_DEAD static char const* const stringBase_80379A89 = "%2d %6.1f %6x %6.1f %6x %3d %s\n";
SECTION_DEAD static char const* const stringBase_80379AA9 =
"----------------------------------------------\n "
" %6.1f %6x %6.1f %6x Total\n\n";
// MWCC ignores mapping of some japanese characters using the
// byte 0x5C (ASCII '\'). This is why this string is hex-encoded.
SECTION_DEAD static char const* const stringBase_80379AF9 =
"\x3C\x25\x73\x2E\x61\x72\x63\x3E\x20\x64\x52\x65\x73\x5F\x63\x6F\x6E\x74\x72\x6F\x6C\x5F\x63"
"\x3A\x3A\x73\x65\x74\x52\x65\x73\x3A\x20\x8B\xF3\x82\xAB\x83\x8A\x83\x5C\x81\x5B\x83\x58\x8F"
"\xEE\x95"
"\xF1\x83\x7C\x83\x43\x83\x93\x83\x5E\x82\xAA\x82\xA0\x82\xE8\x82\xDC\x82\xB9\x82\xF1\x0A";
SECTION_DEAD static char const* const stringBase_80379B40 =
"<%s.arc> dRes_control_c::setRes: res info set er"
"ror !!\n";
SECTION_DEAD static char const* const stringBase_80379B78 =
"<%s.arc> getRes: res during reading !!\n";
SECTION_DEAD static char const* const stringBase_80379BA0 =
"<%s.arc> getRes: res index over !! index=%d coun"
"t=%d\n";
SECTION_DEAD static char const* const stringBase_80379BD6 = "";
SECTION_DEAD static char const* const stringBase_80379BD7 = "/res/Stage/%s/";
SECTION_DEAD static char const* const stringBase_80379BE6 = "\ndRes_control_c::dump mObjectInfo\n";
SECTION_DEAD static char const* const stringBase_80379C09 = "\ndRes_control_c::dump mStageInfo\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80379C2B = "\0\0\0\0";
#pragma pop
/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_scope.cpp
+11 -10
View File
@@ -94,6 +94,15 @@ extern "C" extern u8 g_meter2_info[248];
//
/* ############################################################################################## */
/* 803949F0-803949F0 021050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803949F0 = "wipe_00.bti";
SECTION_DEAD static char const* const stringBase_803949FC = "tt_block8x8.bti";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80394A0C = "\0\0\0";
#pragma pop
/* 803BB618-803BB624 018738 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -392,15 +401,7 @@ asm void __sinit_d_scope_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_80194140 = (void*)__sinit_d_scope_cpp;
REGISTER_CTORS(0x80194140, __sinit_d_scope_cpp);
#pragma pop
/* 803949F0-80394A10 021050 001C+04 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803949F0 = "wipe_00.bti";
SECTION_DEAD static char const* const stringBase_803949FC = "tt_block8x8.bti";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80394A0C = "\0\0\0";
#pragma pop
/* 803949F0-803949F0 021050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_select_cursor.cpp
+29 -28
View File
@@ -19,16 +19,16 @@ struct dSelect_icon_c {
/* 80195B70 */ void setPos(J2DPane*, f32, f32);
};
struct J2DAnmTextureSRTKey {};
struct J2DAnmColor {};
struct J2DAnmTransformKey {
/* 801959C0 */ ~J2DAnmTransformKey();
};
struct J2DAnmTextureSRTKey {};
struct JKRArchive {};
struct J2DAnmColor {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801949EC */ ~dSelect_cursor_c();
@@ -151,6 +151,26 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384];
//
/* ############################################################################################## */
/* 80394AA0-80394AA0 021100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394AA0 = "zelda_select_cursor_4parts.blo";
SECTION_DEAD static char const* const stringBase_80394ABF = "zelda_store_select_icon.blo";
SECTION_DEAD static char const* const stringBase_80394ADB = "zelda_map_screen_portal_icon.blo";
SECTION_DEAD static char const* const stringBase_80394AFC = "zelda_map_screen_batsumark.blo";
SECTION_DEAD static char const* const stringBase_80394B1B = "";
SECTION_DEAD static char const* const stringBase_80394B1C = "zelda_store_select_icon.bck";
SECTION_DEAD static char const* const stringBase_80394B38 = "zelda_select_cursor_4parts.bpk";
SECTION_DEAD static char const* const stringBase_80394B57 = "zelda_store_select_icon.bpk";
SECTION_DEAD static char const* const stringBase_80394B73 = "zelda_map_screen_portal_icon.bpk";
SECTION_DEAD static char const* const stringBase_80394B94 = "zelda_map_screen_batsumark.bpk";
SECTION_DEAD static char const* const stringBase_80394BB3 = "zelda_select_cursor_4parts.btk";
SECTION_DEAD static char const* const stringBase_80394BD2 = "zelda_store_select_icon.btk";
SECTION_DEAD static char const* const stringBase_80394BEE = "zelda_store_select_icon_02.btk";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80394C0D = "\0\0";
#pragma pop
/* 803BB700-803BB70C 018820 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -267,7 +287,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,
};
COMPILER_STRIP_GATE(80394A10, &corner_tag);
COMPILER_STRIP_GATE(0x80394A10, &corner_tag);
/* 80453A50-80453A54 002050 0004+00 4/4 0/0 0/0 .sdata2 @3808 */
SECTION_SDATA2 static u8 lit_3808[4] = {
@@ -400,7 +420,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,
};
COMPILER_STRIP_GATE(80394A30, &tag_4181);
COMPILER_STRIP_GATE(0x80394A30, &tag_4181);
/* 80195460-801955F0 18FDA0 0190+00 1/1 0/0 0/0 .text
* setBpkAnimation__16dSelect_cursor_cFP11J2DAnmColor */
@@ -421,13 +441,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,
};
COMPILER_STRIP_GATE(80394A50, &tag_4197);
COMPILER_STRIP_GATE(0x80394A50, &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,
};
COMPILER_STRIP_GATE(80394A90, &tag_4204);
COMPILER_STRIP_GATE(0x80394A90, &tag_4204);
/* 801955F0-80195724 18FF30 0134+00 1/1 0/0 0/0 .text
* setBtk0Animation__16dSelect_cursor_cFP19J2DAnmTextureSRTKey */
@@ -499,23 +519,4 @@ asm J2DAnmTransformKey::~J2DAnmTransformKey() {
}
#pragma pop
/* 80394AA0-80394C10 021100 016D+03 6/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80394AA0 = "zelda_select_cursor_4parts.blo";
SECTION_DEAD static char const* const stringBase_80394ABF = "zelda_store_select_icon.blo";
SECTION_DEAD static char const* const stringBase_80394ADB = "zelda_map_screen_portal_icon.blo";
SECTION_DEAD static char const* const stringBase_80394AFC = "zelda_map_screen_batsumark.blo";
SECTION_DEAD static char const* const stringBase_80394B1B = "";
SECTION_DEAD static char const* const stringBase_80394B1C = "zelda_store_select_icon.bck";
SECTION_DEAD static char const* const stringBase_80394B38 = "zelda_select_cursor_4parts.bpk";
SECTION_DEAD static char const* const stringBase_80394B57 = "zelda_store_select_icon.bpk";
SECTION_DEAD static char const* const stringBase_80394B73 = "zelda_map_screen_portal_icon.bpk";
SECTION_DEAD static char const* const stringBase_80394B94 = "zelda_map_screen_batsumark.bpk";
SECTION_DEAD static char const* const stringBase_80394BB3 = "zelda_select_cursor_4parts.btk";
SECTION_DEAD static char const* const stringBase_80394BD2 = "zelda_store_select_icon.btk";
SECTION_DEAD static char const* const stringBase_80394BEE = "zelda_store_select_icon_02.btk";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80394C0D = "\0\0";
#pragma pop
/* 80394AA0-80394AA0 021100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_select_icon.cpp
+1 -1
View File
@@ -154,5 +154,5 @@ asm void __sinit_d_select_icon_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_80195C64 = (void*)__sinit_d_select_icon_cpp;
REGISTER_CTORS(0x80195C64, __sinit_d_select_icon_cpp);
#pragma pop
src/d/d_stage.cpp
+484 -561
View File
File diff suppressed because it is too large Load Diff
src/d/d_timer.cpp
+46 -21
View File
@@ -110,22 +110,17 @@ struct dDlst_TimerScrnDraw_c {
};
struct dComIfG_play_c {
/* 8002CB94 */ void setTimerNowTimeMs(int);
/* 8002CB9C */ void getTimerNowTimeMs();
/* 8002CBA4 */ void setTimerLimitTimeMs(int);
/* 8002CBAC */ void getTimerLimitTimeMs();
/* 8002CBB4 */ void setTimerMode(int);
/* 8002CBBC */ void getTimerMode();
/* 8002CBC4 */ void setTimerType(u8);
/* 8002CBCC */ void getTimerType();
/* 8002CBD4 */ void setTimerPtr(dTimer_c*);
/* 8002CBDC */ void getTimerPtr();
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -318,6 +313,12 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
/* ############################################################################################## */
/* 8039A3D8-8039A3D8 026A38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039A3D8 = "Timer";
#pragma pop
/* 80454F40-80454F44 003540 0004+00 10/10 0/0 0/0 .sdata2 @3919 */
SECTION_SDATA2 static u8 lit_3919[4] = {
0x00,
@@ -562,6 +563,14 @@ asm void dDlst_TimerScrnDraw_c::setHIO() {
}
#pragma pop
/* ############################################################################################## */
/* 8039A3D8-8039A3D8 026A38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039A3DE = "zelda_game_image_cow_get_in.blo";
SECTION_DEAD static char const* const stringBase_8039A3FE = "zelda_game_image_cow_get_in.bck";
#pragma pop
/* 8025DFBC-8025E240 2588FC 0284+00 1/1 0/0 0/0 .text
* setScreen__21dDlst_TimerScrnDraw_cFlP10JKRArchive */
#pragma push
@@ -573,6 +582,13 @@ asm void dDlst_TimerScrnDraw_c::setScreen(s32 param_0, JKRArchive* param_1) {
}
#pragma pop
/* ############################################################################################## */
/* 8039A3D8-8039A3D8 026A38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039A41E = "zelda_game_image_cow_game.blo";
#pragma pop
/* 8025E240-8025E66C 258B80 042C+00 1/1 0/0 0/0 .text setScreenBase__21dDlst_TimerScrnDraw_cFv */
#pragma push
#pragma optimization_level 0
@@ -583,6 +599,13 @@ asm void dDlst_TimerScrnDraw_c::setScreenBase() {
}
#pragma pop
/* ############################################################################################## */
/* 8039A3D8-8039A3D8 026A38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039A43C = "zelda_game_image_zora_kawakudari.blo";
#pragma pop
/* 8025E66C-8025E8B8 258FAC 024C+00 1/1 0/0 0/0 .text setScreenBoatRace__21dDlst_TimerScrnDraw_cFv
*/
#pragma push
@@ -594,6 +617,13 @@ asm void dDlst_TimerScrnDraw_c::setScreenBoatRace() {
}
#pragma pop
/* ############################################################################################## */
/* 8039A3D8-8039A3D8 026A38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039A461 = "zelda_game_image_rider.blo";
#pragma pop
/* 8025E8B8-8025EB20 2591F8 0268+00 1/1 0/0 0/0 .text setScreenRider__21dDlst_TimerScrnDraw_cFv */
#pragma push
#pragma optimization_level 0
@@ -930,6 +960,14 @@ asm void dTimer_createTimer(s32 param_0, u32 param_1, u8 param_2, u8 param_3, f3
#pragma pop
/* ############################################################################################## */
/* 8039A3D8-8039A3D8 026A38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039A47C = "F_SP115";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039A484 = "\0\0\0";
#pragma pop
/* 80454FA0-80454FA4 0035A0 0004+00 1/1 0/0 0/0 .sdata2 @5544 */
SECTION_SDATA2 static f32 lit_5544 = 221.0f;
@@ -1042,17 +1080,4 @@ asm void dTimer_c::createGetIn(cXyz param_0) {
}
#pragma pop
/* 8039A3D8-8039A488 026A38 00AC+04 7/7 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8039A3D8 = "Timer";
SECTION_DEAD static char const* const stringBase_8039A3DE = "zelda_game_image_cow_get_in.blo";
SECTION_DEAD static char const* const stringBase_8039A3FE = "zelda_game_image_cow_get_in.bck";
SECTION_DEAD static char const* const stringBase_8039A41E = "zelda_game_image_cow_game.blo";
SECTION_DEAD static char const* const stringBase_8039A43C = "zelda_game_image_zora_kawakudari.blo";
SECTION_DEAD static char const* const stringBase_8039A461 = "zelda_game_image_rider.blo";
SECTION_DEAD static char const* const stringBase_8039A47C = "F_SP115";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039A484 = "\0\0\0";
#pragma pop
/* 8039A3D8-8039A3D8 026A38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/d_tresure.cpp
+1 -1
View File
@@ -333,7 +333,7 @@ SECTION_RODATA u8 const dTres_c::typeToTypeGroup[34 + 6 /* padding */] = {
0x00,
0x00,
};
COMPILER_STRIP_GATE(8037B0D8, &dTres_c::typeToTypeGroup);
COMPILER_STRIP_GATE(0x8037B0D8, &dTres_c::typeToTypeGroup);
/* 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
@@ -45,7 +45,7 @@ SECTION_RODATA u8 const dVibration_c::MS_patt[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,
};
COMPILER_STRIP_GATE(8037A620, &dVibration_c::MS_patt);
COMPILER_STRIP_GATE(0x8037A620, &dVibration_c::MS_patt);
/* 8037A678-8037A6D0 006CD8 0058+00 0/0 1/1 0/0 .rodata CS_patt__12dVibration_c */
SECTION_RODATA u8 const dVibration_c::CS_patt[88] = {
@@ -56,7 +56,7 @@ SECTION_RODATA u8 const dVibration_c::CS_patt[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,
};
COMPILER_STRIP_GATE(8037A678, &dVibration_c::CS_patt);
COMPILER_STRIP_GATE(0x8037A678, &dVibration_c::CS_patt);
/* 8037A6D0-8037A720 006D30 0050+00 0/0 1/1 0/0 .rodata MQ_patt__12dVibration_c */
SECTION_RODATA u8 const dVibration_c::MQ_patt[80] = {
@@ -66,7 +66,7 @@ SECTION_RODATA u8 const dVibration_c::MQ_patt[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,
};
COMPILER_STRIP_GATE(8037A6D0, &dVibration_c::MQ_patt);
COMPILER_STRIP_GATE(0x8037A6D0, &dVibration_c::MQ_patt);
/* 8037A720-8037A770 006D80 0050+00 0/0 1/1 0/0 .rodata CQ_patt__12dVibration_c */
SECTION_RODATA u8 const dVibration_c::CQ_patt[80] = {
@@ -76,4 +76,4 @@ SECTION_RODATA u8 const dVibration_c::CQ_patt[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,
};
COMPILER_STRIP_GATE(8037A720, &dVibration_c::CQ_patt);
COMPILER_STRIP_GATE(0x8037A720, &dVibration_c::CQ_patt);
src/d/event/d_event.cpp
+48 -26
View File
@@ -381,6 +381,14 @@ asm void dEvt_control_c::beforeFlagProc(dEvt_order_c* param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 80379D80-80379D80 0063E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379D80 = "？？？";
SECTION_DEAD static char const* const stringBase_80379D87 = "ALL";
#pragma pop
/* 80041964-800419A8 03C2A4 0044+00 2/2 0/0 0/0 .text
* afterFlagProc__14dEvt_control_cFP12dEvt_order_c */
#pragma push
@@ -403,6 +411,14 @@ asm void dEvt_control_c::commonCheck(dEvt_order_c* param_0, u16 param_1, u16 par
}
#pragma pop
/* ############################################################################################## */
/* 80379D80-80379D80 0063E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379D8B = "DEFAULT_TALK";
SECTION_DEAD static char const* const stringBase_80379D98 = "MHINT_TALK";
#pragma pop
/* 80041A20-80041B58 03C360 0138+00 1/1 0/0 0/0 .text talkCheck__14dEvt_control_cFP12dEvt_order_c
*/
#pragma push
@@ -414,6 +430,13 @@ asm void dEvt_control_c::talkCheck(dEvt_order_c* param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 80379D80-80379D80 0063E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379DA3 = "DEFAULT_TALK_XY";
#pragma pop
/* 80041B58-80041C90 03C498 0138+00 1/1 0/0 0/0 .text
* talkXyCheck__14dEvt_control_cFP12dEvt_order_c */
#pragma push
@@ -489,6 +512,13 @@ asm void dEvt_control_c::doorCheck(dEvt_order_c* param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 80379D80-80379D80 0063E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379DB3 = "DEFAULT_GETITEM";
#pragma pop
/* 8004212C-800421C0 03CA6C 0094+00 1/1 0/0 0/0 .text itemCheck__14dEvt_control_cFP12dEvt_order_c
*/
#pragma push
@@ -590,6 +620,13 @@ asm void dEv_defaultSkipProc(void* param_0, int param_1) {
}
#pragma pop
/* ############################################################################################## */
/* 80379D80-80379D80 0063E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379DC3 = "$0";
#pragma pop
/* 8004261C-80042778 03CF5C 015C+00 1/1 1/1 0/0 .text dEv_defaultSkipZev__FPvi */
#pragma push
#pragma optimization_level 0
@@ -635,7 +672,7 @@ asm void dEvt_control_c::getSkipEventName() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dEvt_control_c::setSkipProc(void* param_0, int (*)(void*, int), int param_2) {
asm void dEvt_control_c::setSkipProc(void* param_0, int (*param_1)(void*, int), int param_2) {
nofralloc
#include "asm/d/event/d_event/setSkipProc__14dEvt_control_cFPvPFPvi_ii.s"
}
@@ -903,15 +940,10 @@ asm void dEvt_control_c::setPtI(void* param_0) {
}
#pragma pop
/* 800436EC-800436F4 03E02C 0008+00 0/0 6/6 43/43 .text setPtI_Id__14dEvt_control_cFUi */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dEvt_control_c::setPtI_Id(unsigned int param_0) {
nofralloc
#include "asm/d/event/d_event/setPtI_Id__14dEvt_control_cFUi.s"
/* 800436EC-800436F4 -00001 0008+00 0/0 0/0 0/0 .text setPtI_Id__14dEvt_control_cFUi */
void dEvt_control_c::setPtI_Id(unsigned int param_0) {
*(u32*)(((u8*)this) + 208) /* this->field_0xd0 */ = (u32)(param_0);
}
#pragma pop
/* 800436F4-80043724 03E034 0030+00 0/0 4/4 0/0 .text setPtD__14dEvt_control_cFPv */
#pragma push
@@ -923,28 +955,18 @@ asm void dEvt_control_c::setPtD(void* param_0) {
}
#pragma pop
/* 80043724-8004372C 03E064 0008+00 0/0 2/2 0/0 .text setGtItm__14dEvt_control_cFUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dEvt_control_c::setGtItm(u8 param_0) {
nofralloc
#include "asm/d/event/d_event/setGtItm__14dEvt_control_cFUc.s"
/* 80043724-8004372C -00001 0008+00 0/0 0/0 0/0 .text setGtItm__14dEvt_control_cFUc */
void dEvt_control_c::setGtItm(u8 param_0) {
*(u8*)(((u8*)this) + 239) /* this->field_0xef */ = (u8)(param_0);
}
#pragma pop
/* 80379D80-80379DD0 0063E0 004E+02 7/7 0/0 0/0 .rodata @stringBase0 */
/* ############################################################################################## */
/* 80379DC6-80379DD0 006426 0008+02 0/0 0/0 0/0 .rodata None */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80379D80 = "？？？";
SECTION_DEAD static char const* const stringBase_80379D87 = "ALL";
SECTION_DEAD static char const* const stringBase_80379D8B = "DEFAULT_TALK";
SECTION_DEAD static char const* const stringBase_80379D98 = "MHINT_TALK";
SECTION_DEAD static char const* const stringBase_80379DA3 = "DEFAULT_TALK_XY";
SECTION_DEAD static char const* const stringBase_80379DB3 = "DEFAULT_GETITEM";
SECTION_DEAD static char const* const stringBase_80379DC3 = "$0";
SECTION_DEAD static char const* const stringBase_80379DC6 = "GIVEMAN";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80379DCE = "\0";
#pragma pop
/* 80379D80-80379D80 0063E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/event/d_event_data.cpp
+113 -62
View File
@@ -141,10 +141,10 @@ struct Z2SeqMgr {
/* 802AFE18 */ void bgmStreamPlay();
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -356,6 +356,21 @@ static asm void getStartTelopNo() {
#pragma pop
/* ############################################################################################## */
/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379DD0 = "ID";
SECTION_DEAD static char const* const stringBase_80379DD3 = "Stage";
SECTION_DEAD static char const* const stringBase_80379DD9 = "StartCode";
SECTION_DEAD static char const* const stringBase_80379DE3 = "RoomNo";
SECTION_DEAD static char const* const stringBase_80379DEA = "Layer";
SECTION_DEAD static char const* const stringBase_80379DF0 = "Wipe";
SECTION_DEAD static char const* const stringBase_80379DF5 = "Mode";
SECTION_DEAD static char const* const stringBase_80379DFA = "Speed";
SECTION_DEAD static char const* const stringBase_80379E00 = "Hour";
SECTION_DEAD static char const* const stringBase_80379E05 = "NoVisit";
#pragma pop
/* 80451ED0-80451ED4 0004D0 0004+00 4/4 0/0 0/0 .sdata2 @4264 */
SECTION_SDATA2 static u8 lit_4264[4] = {
0x00,
@@ -451,6 +466,13 @@ asm void dEvDtEvent_c::specialStaffProc(dEvDtStaff_c* param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379E0D = "Timer";
#pragma pop
/* 80043FD8-8004403C 03E918 0064+00 4/4 0/0 0/0 .text specialProc_WaitStart__12dEvDtStaff_cFi */
#pragma push
#pragma optimization_level 0
@@ -522,6 +544,13 @@ asm void dEvDtStaff_c::advanceCut(int param_0) {
#pragma pop
/* ############################################################################################## */
/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379E13 = "LIGHT";
SECTION_DEAD static char const* const stringBase_80379E19 = "Weather";
#pragma pop
/* 80451EE0-80451EE8 0004E0 0004+04 1/1 0/0 0/0 .sdata2 @4460 */
SECTION_SDATA2 static f32 lit_4460[1 + 1 /* padding */] = {
1.0f / 15.0f,
@@ -543,6 +572,17 @@ asm void dEvDtStaff_c::specialProcLight() {
}
#pragma pop
/* ############################################################################################## */
/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379E21 = "MESSAGE";
SECTION_DEAD static char const* const stringBase_80379E29 = "msgNo";
SECTION_DEAD static char const* const stringBase_80379E2F = "No";
SECTION_DEAD static char const* const stringBase_80379E32 = "Type";
SECTION_DEAD static char const* const stringBase_80379E37 = "ForStart";
#pragma pop
/* 80044324-80044A58 03EC64 0734+00 1/1 0/0 0/0 .text specialProcMessage__12dEvDtStaff_cFv */
#pragma push
#pragma optimization_level 0
@@ -554,6 +594,12 @@ asm void dEvDtStaff_c::specialProcMessage() {
#pragma pop
/* ############################################################################################## */
/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379E40 = "SOUND";
#pragma pop
/* 80451EF0-80451EF4 0004F0 0004+00 4/4 0/0 0/0 .sdata2 @4668 */
SECTION_SDATA2 static f32 lit_4668 = 1.0f;
@@ -571,6 +617,18 @@ asm void dEvDtStaff_c::specialProcSound() {
}
#pragma pop
/* ############################################################################################## */
/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379E46 = "CREATER";
SECTION_DEAD static char const* const stringBase_80379E4E = "MAKECAST";
SECTION_DEAD static char const* const stringBase_80379E57 = "ARG";
SECTION_DEAD static char const* const stringBase_80379E5B = "POS";
SECTION_DEAD static char const* const stringBase_80379E5F = "ANGLE";
SECTION_DEAD static char const* const stringBase_80379E65 = "SCALE";
#pragma pop
/* 80044CB8-80044EE4 03F5F8 022C+00 1/1 0/0 0/0 .text specialProcCreate__12dEvDtStaff_cFv
*/
#pragma push
@@ -582,6 +640,30 @@ asm void dEvDtStaff_c::specialProcCreate() {
}
#pragma pop
/* ############################################################################################## */
/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379E6B = "DIRECTOR";
SECTION_DEAD static char const* const stringBase_80379E74 = "EventFlag";
SECTION_DEAD static char const* const stringBase_80379E7E = "EventFlagOff";
SECTION_DEAD static char const* const stringBase_80379E8B = "SwitchTable";
SECTION_DEAD static char const* const stringBase_80379E97 = "SwitchBit";
SECTION_DEAD static char const* const stringBase_80379EA1 = "SwitchOff";
SECTION_DEAD static char const* const stringBase_80379EAB = "TmpBit";
SECTION_DEAD static char const* const stringBase_80379EB2 = "TmpBitOff";
SECTION_DEAD static char const* const stringBase_80379EBC = "PLAYER_NODRAW";
SECTION_DEAD static char const* const stringBase_80379ECA = "PLAYER_DRAW";
SECTION_DEAD static char const* const stringBase_80379ED6 = "Zev";
SECTION_DEAD static char const* const stringBase_80379EDA = "Rate";
SECTION_DEAD static char const* const stringBase_80379EDF = "Color";
SECTION_DEAD static char const* const stringBase_80379EE5 = "Pattern";
SECTION_DEAD static char const* const stringBase_80379EED = "Pt2";
SECTION_DEAD static char const* const stringBase_80379EF1 = "PtT";
SECTION_DEAD static char const* const stringBase_80379EF5 = "PtI";
SECTION_DEAD static char const* const stringBase_80379EF9 = "PtD";
#pragma pop
/* 80044EE4-80045878 03F824 0994+00 1/1 0/0 0/0 .text specialProcDirector__12dEvDtStaff_cFv */
#pragma push
#pragma optimization_level 0
@@ -593,6 +675,15 @@ asm void dEvDtStaff_c::specialProcDirector() {
#pragma pop
/* ############################################################################################## */
/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379EFD = "PACKAGE";
SECTION_DEAD static char const* const stringBase_80379F05 = "FileName";
SECTION_DEAD static char const* const stringBase_80379F0E = "OffsetPos";
SECTION_DEAD static char const* const stringBase_80379F18 = "OffsetAngY";
#pragma pop
/* 80451EF8-80451EFC 0004F8 0004+00 1/1 0/0 0/0 .sdata2 @5057 */
SECTION_SDATA2 static f32 lit_5057 = 10.0f;
@@ -606,6 +697,13 @@ asm void dEvDtStaff_c::specialProcPackage() {
}
#pragma pop
/* ############################################################################################## */
/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379F23 = "TIMEKEEPER";
#pragma pop
/* 80045AFC-80045C34 04043C 0138+00 1/1 0/0 0/0 .text specialProcTimekeeper__12dEvDtStaff_cFv */
#pragma push
#pragma optimization_level 0
@@ -617,6 +715,18 @@ asm void dEvDtStaff_c::specialProcTimekeeper() {
#pragma pop
/* ############################################################################################## */
/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379F2E = "EFFECT";
SECTION_DEAD static char const* const stringBase_80379F35 = "Power";
SECTION_DEAD static char const* const stringBase_80379F3B = "Random";
SECTION_DEAD static char const* const stringBase_80379F42 = "Alpha";
SECTION_DEAD static char const* const stringBase_80379F48 = "Scale";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80379F4E = "\0";
#pragma pop
/* 80451EFC-80451F00 0004FC 0004+00 1/1 0/0 0/0 .sdata2 @5200 */
SECTION_SDATA2 static f32 lit_5200 = 4.0f / 5.0f;
@@ -682,63 +792,4 @@ asm void dEvDtBase_c::advanceCutLocal(dEvDtStaff_c* param_0) {
}
#pragma pop
/* 80379DD0-80379F50 006430 017E+02 10/10 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80379DD0 = "ID";
SECTION_DEAD static char const* const stringBase_80379DD3 = "Stage";
SECTION_DEAD static char const* const stringBase_80379DD9 = "StartCode";
SECTION_DEAD static char const* const stringBase_80379DE3 = "RoomNo";
SECTION_DEAD static char const* const stringBase_80379DEA = "Layer";
SECTION_DEAD static char const* const stringBase_80379DF0 = "Wipe";
SECTION_DEAD static char const* const stringBase_80379DF5 = "Mode";
SECTION_DEAD static char const* const stringBase_80379DFA = "Speed";
SECTION_DEAD static char const* const stringBase_80379E00 = "Hour";
SECTION_DEAD static char const* const stringBase_80379E05 = "NoVisit";
SECTION_DEAD static char const* const stringBase_80379E0D = "Timer";
SECTION_DEAD static char const* const stringBase_80379E13 = "LIGHT";
SECTION_DEAD static char const* const stringBase_80379E19 = "Weather";
SECTION_DEAD static char const* const stringBase_80379E21 = "MESSAGE";
SECTION_DEAD static char const* const stringBase_80379E29 = "msgNo";
SECTION_DEAD static char const* const stringBase_80379E2F = "No";
SECTION_DEAD static char const* const stringBase_80379E32 = "Type";
SECTION_DEAD static char const* const stringBase_80379E37 = "ForStart";
SECTION_DEAD static char const* const stringBase_80379E40 = "SOUND";
SECTION_DEAD static char const* const stringBase_80379E46 = "CREATER";
SECTION_DEAD static char const* const stringBase_80379E4E = "MAKECAST";
SECTION_DEAD static char const* const stringBase_80379E57 = "ARG";
SECTION_DEAD static char const* const stringBase_80379E5B = "POS";
SECTION_DEAD static char const* const stringBase_80379E5F = "ANGLE";
SECTION_DEAD static char const* const stringBase_80379E65 = "SCALE";
SECTION_DEAD static char const* const stringBase_80379E6B = "DIRECTOR";
SECTION_DEAD static char const* const stringBase_80379E74 = "EventFlag";
SECTION_DEAD static char const* const stringBase_80379E7E = "EventFlagOff";
SECTION_DEAD static char const* const stringBase_80379E8B = "SwitchTable";
SECTION_DEAD static char const* const stringBase_80379E97 = "SwitchBit";
SECTION_DEAD static char const* const stringBase_80379EA1 = "SwitchOff";
SECTION_DEAD static char const* const stringBase_80379EAB = "TmpBit";
SECTION_DEAD static char const* const stringBase_80379EB2 = "TmpBitOff";
SECTION_DEAD static char const* const stringBase_80379EBC = "PLAYER_NODRAW";
SECTION_DEAD static char const* const stringBase_80379ECA = "PLAYER_DRAW";
SECTION_DEAD static char const* const stringBase_80379ED6 = "Zev";
SECTION_DEAD static char const* const stringBase_80379EDA = "Rate";
SECTION_DEAD static char const* const stringBase_80379EDF = "Color";
SECTION_DEAD static char const* const stringBase_80379EE5 = "Pattern";
SECTION_DEAD static char const* const stringBase_80379EED = "Pt2";
SECTION_DEAD static char const* const stringBase_80379EF1 = "PtT";
SECTION_DEAD static char const* const stringBase_80379EF5 = "PtI";
SECTION_DEAD static char const* const stringBase_80379EF9 = "PtD";
SECTION_DEAD static char const* const stringBase_80379EFD = "PACKAGE";
SECTION_DEAD static char const* const stringBase_80379F05 = "FileName";
SECTION_DEAD static char const* const stringBase_80379F0E = "OffsetPos";
SECTION_DEAD static char const* const stringBase_80379F18 = "OffsetAngY";
SECTION_DEAD static char const* const stringBase_80379F23 = "TIMEKEEPER";
SECTION_DEAD static char const* const stringBase_80379F2E = "EFFECT";
SECTION_DEAD static char const* const stringBase_80379F35 = "Power";
SECTION_DEAD static char const* const stringBase_80379F3B = "Random";
SECTION_DEAD static char const* const stringBase_80379F42 = "Alpha";
SECTION_DEAD static char const* const stringBase_80379F48 = "Scale";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80379F4E = "\0";
#pragma pop
/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/event/d_event_lib.cpp
+1 -1
View File
@@ -246,5 +246,5 @@ asm void __sinit_d_event_lib_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_80048BD8 = (void*)__sinit_d_event_lib_cpp;
REGISTER_CTORS(0x80048BD8, __sinit_d_event_lib_cpp);
#pragma pop
src/d/event/d_event_manager.cpp
+89 -43
View File
@@ -52,14 +52,14 @@ struct dEvDtEvent_c {
/* 80043F70 */ void specialStaffProc(dEvDtStaff_c*);
};
struct dEvDtData_c {};
struct Vec {};
struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
};
struct dEvDtData_c {};
struct dEvent_manager_c {
/* 800465E8 */ void getSubstance(dEvDtData_c*, int);
/* 80046688 */ dEvent_manager_c();
@@ -302,6 +302,30 @@ asm void dEvent_exception_c::setStartDemo(int param_0) {
#pragma pop
/* ############################################################################################## */
/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379F60 = "NORMAL_COMEBACK";
SECTION_DEAD static char const* const stringBase_80379F70 = "DEFAULT_START";
SECTION_DEAD static char const* const stringBase_80379F7E = "SHUTTER_START";
SECTION_DEAD static char const* const stringBase_80379F8C = "SHUTTER_START_STOP";
SECTION_DEAD static char const* const stringBase_80379F9F = "BS_SHUTTER_START";
SECTION_DEAD static char const* const stringBase_80379FB0 = "BS_SHUTTER_START_B";
SECTION_DEAD static char const* const stringBase_80379FC3 = "KNOB_START";
SECTION_DEAD static char const* const stringBase_80379FCE = "KNOB_START_B";
SECTION_DEAD static char const* const stringBase_80379FDB = "FMASTER_START";
SECTION_DEAD static char const* const stringBase_80379FE9 = "FALL_START";
SECTION_DEAD static char const* const stringBase_80379FF4 = "CRAWLOUT_START";
SECTION_DEAD static char const* const stringBase_8037A003 = "BOSSWARP_START";
SECTION_DEAD static char const* const stringBase_8037A012 = "PORTALWARP_START";
SECTION_DEAD static char const* const stringBase_8037A023 = "PORTALWARP_START_B";
SECTION_DEAD static char const* const stringBase_8037A036 = "(!NO REGIST!)";
SECTION_DEAD static char const* const stringBase_8037A044 = "(!NO INFO!)";
SECTION_DEAD static char const* const stringBase_8037A050 = "(!BAD NUMBER!)";
SECTION_DEAD static char const* const stringBase_8037A05F = "(MAP TOOL CAMERA)";
SECTION_DEAD static char const* const stringBase_8037A071 = "(!BAD DATA!)";
#pragma pop
/* 803A8270-803A82A8 -00001 0038+00 1/1 0/0 0/0 .data soecial_names$3966 */
SECTION_DATA static void* soecial_names[14] = {
(void*)&d_event_d_event_manager__stringBase0,
@@ -383,7 +407,13 @@ SECTION_RODATA static u8 const data_80379F50[15 + 1 /* padding */] = {
/* padding */
0x00,
};
COMPILER_STRIP_GATE(80379F50, &data_80379F50);
COMPILER_STRIP_GATE(0x80379F50, &data_80379F50);
/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A07E = "Event";
#pragma pop
/* 80046710-80046800 041050 00F0+00 0/0 1/1 0/0 .text create__16dEvent_manager_cFv */
#pragma push
@@ -435,6 +465,14 @@ asm void dEvent_manager_c::roomFinish(int param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A084 = "WOLF_WORLD_CHANGE_OUT";
SECTION_DEAD static char const* const stringBase_8037A09A = "WORLD_CHANGE_OUT";
#pragma pop
/* 80046A58-80046C0C 041398 01B4+00 0/0 1/1 0/0 .text orderStartDemo__16dEvent_manager_cFv */
#pragma push
#pragma optimization_level 0
@@ -507,6 +545,13 @@ asm void dEvent_manager_c::closeProc(dEvDtEvent_c* param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A0AB = "ALL";
#pragma pop
/* 80046DAC-80046E64 0416EC 00B8+00 0/0 2/2 0/0 .text endProc__16dEvent_manager_cFsi */
#pragma push
#pragma optimization_level 0
@@ -588,6 +633,12 @@ asm void dEvent_manager_c::getEventData(s16 param_0) {
#pragma pop
/* ############################################################################################## */
/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A0AF = "MapToolCamera%d";
#pragma pop
/* 804246A0-804246B4 0513C0 0011+03 1/1 0/0 0/0 .bss map_tool_name$4449 */
static u8 map_tool_name_4449[17 + 3 /* padding */];
@@ -692,6 +743,14 @@ asm void dEvent_manager_c::endCheckOld(char const* param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A0BF = "Alink";
SECTION_DEAD static char const* const stringBase_8037A0C5 = "Link";
#pragma pop
/* 80047B1C-80047D4C 04245C 0230+00 1/1 10/10 210/210 .text
* getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci */
#pragma push
@@ -841,6 +900,14 @@ asm void dEvent_manager_c::getGoal() {
}
#pragma pop
/* ############################################################################################## */
/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A0CA = "NO DATA";
SECTION_DEAD static char const* const stringBase_8037A0D2 = "NOT RUNNING";
#pragma pop
/* 800483E8-8004846C 042D28 0084+00 0/0 5/5 27/27 .text getRunEventName__16dEvent_manager_cFv */
#pragma push
#pragma optimization_level 0
@@ -883,6 +950,13 @@ asm void dEvent_manager_c::specialCast_Shutter(s16 param_0, int param_1) {
}
#pragma pop
/* ############################################################################################## */
/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A0DE = "SHUTTER_DOOR";
#pragma pop
/* 80048618-80048748 042F58 0130+00 1/1 0/0 0/0 .text specialCast__16dEvent_manager_cFPCci */
#pragma push
#pragma optimization_level 0
@@ -894,6 +968,17 @@ asm void dEvent_manager_c::specialCast(char const* param_0, int param_1) {
#pragma pop
/* ############################################################################################## */
/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A0EB = "WAIT";
SECTION_DEAD static char const* const stringBase_8037A0F0 = "TALK0";
SECTION_DEAD static char const* const stringBase_8037A0F6 = "TALK1";
SECTION_DEAD static char const* const stringBase_8037A0FC = "TALKMAN";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8037A104 = "\0\0\0";
#pragma pop
/* 803A82A8-803A82B8 -00001 000C+04 1/1 0/0 0/0 .data action_table$5100 */
SECTION_DATA static void* action_table[3 + 1 /* padding */] = {
(void*)(((char*)&d_event_d_event_manager__stringBase0) + 0x18B),
@@ -933,43 +1018,4 @@ asm void dEvent_manager_c::checkStartDemo() {
}
#pragma pop
/* 80379F60-8037A108 0065C0 01A4+04 15/13 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80379F60 = "NORMAL_COMEBACK";
SECTION_DEAD static char const* const stringBase_80379F70 = "DEFAULT_START";
SECTION_DEAD static char const* const stringBase_80379F7E = "SHUTTER_START";
SECTION_DEAD static char const* const stringBase_80379F8C = "SHUTTER_START_STOP";
SECTION_DEAD static char const* const stringBase_80379F9F = "BS_SHUTTER_START";
SECTION_DEAD static char const* const stringBase_80379FB0 = "BS_SHUTTER_START_B";
SECTION_DEAD static char const* const stringBase_80379FC3 = "KNOB_START";
SECTION_DEAD static char const* const stringBase_80379FCE = "KNOB_START_B";
SECTION_DEAD static char const* const stringBase_80379FDB = "FMASTER_START";
SECTION_DEAD static char const* const stringBase_80379FE9 = "FALL_START";
SECTION_DEAD static char const* const stringBase_80379FF4 = "CRAWLOUT_START";
SECTION_DEAD static char const* const stringBase_8037A003 = "BOSSWARP_START";
SECTION_DEAD static char const* const stringBase_8037A012 = "PORTALWARP_START";
SECTION_DEAD static char const* const stringBase_8037A023 = "PORTALWARP_START_B";
SECTION_DEAD static char const* const stringBase_8037A036 = "(!NO REGIST!)";
SECTION_DEAD static char const* const stringBase_8037A044 = "(!NO INFO!)";
SECTION_DEAD static char const* const stringBase_8037A050 = "(!BAD NUMBER!)";
SECTION_DEAD static char const* const stringBase_8037A05F = "(MAP TOOL CAMERA)";
SECTION_DEAD static char const* const stringBase_8037A071 = "(!BAD DATA!)";
SECTION_DEAD static char const* const stringBase_8037A07E = "Event";
SECTION_DEAD static char const* const stringBase_8037A084 = "WOLF_WORLD_CHANGE_OUT";
SECTION_DEAD static char const* const stringBase_8037A09A = "WORLD_CHANGE_OUT";
SECTION_DEAD static char const* const stringBase_8037A0AB = "ALL";
SECTION_DEAD static char const* const stringBase_8037A0AF = "MapToolCamera%d";
SECTION_DEAD static char const* const stringBase_8037A0BF = "Alink";
SECTION_DEAD static char const* const stringBase_8037A0C5 = "Link";
SECTION_DEAD static char const* const stringBase_8037A0CA = "NO DATA";
SECTION_DEAD static char const* const stringBase_8037A0D2 = "NOT RUNNING";
SECTION_DEAD static char const* const stringBase_8037A0DE = "SHUTTER_DOOR";
SECTION_DEAD static char const* const stringBase_8037A0EB = "WAIT";
SECTION_DEAD static char const* const stringBase_8037A0F0 = "TALK0";
SECTION_DEAD static char const* const stringBase_8037A0F6 = "TALK1";
SECTION_DEAD static char const* const stringBase_8037A0FC = "TALKMAN";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8037A104 = "\0\0\0";
#pragma pop
/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/file/d_file_sel_info.cpp
+27 -14
View File
@@ -124,6 +124,14 @@ extern "C" extern u8 g_meter2_info[248];
//
/* ############################################################################################## */
/* 803948B8-803948B8 020F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803948B8 = "zelda_file_select_info_text.blo";
SECTION_DEAD static char const* const stringBase_803948D8 = "";
SECTION_DEAD static char const* const stringBase_803948D9 = "tt_heart_00.bti";
#pragma pop
/* 803BB498-803BB4A8 0185B8 000C+04 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12 + 4 /* padding */] = {
0x00,
@@ -266,6 +274,13 @@ asm void dFile_info_c::setHeartCnt(dSv_save_c* param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 803948B8-803948B8 020F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803948E9 = "%02d/%02d/%d %02d:%02d";
#pragma pop
/* 80192C08-80192C70 18D548 0068+00 1/1 0/0 0/0 .text setSaveDate__12dFile_info_cFP10dSv_save_c */
#pragma push
#pragma optimization_level 0
@@ -276,6 +291,16 @@ asm void dFile_info_c::setSaveDate(dSv_save_c* param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 803948B8-803948B8 020F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394900 = "999:59";
SECTION_DEAD static char const* const stringBase_80394907 = "%d:%02d";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039490F = "";
#pragma pop
/* 80192C70-80192D58 18D5B0 00E8+00 1/1 0/0 0/0 .text setPlayTime__12dFile_info_cFP10dSv_save_c */
#pragma push
#pragma optimization_level 0
@@ -340,7 +365,7 @@ asm void __sinit_d_file_sel_info_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_80192E88 = (void*)__sinit_d_file_sel_info_cpp;
REGISTER_CTORS(0x80192E88, __sinit_d_file_sel_info_cpp);
#pragma pop
/* 80192EC8-80192F10 18D808 0048+00 1/0 0/0 0/0 .text __dt__16dDlst_FileInfo_cFv */
@@ -353,16 +378,4 @@ asm dDlst_FileInfo_c::~dDlst_FileInfo_c() {
}
#pragma pop
/* 803948B8-80394910 020F18 0057+01 6/5 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803948B8 = "zelda_file_select_info_text.blo";
SECTION_DEAD static char const* const stringBase_803948D8 = "";
SECTION_DEAD static char const* const stringBase_803948D9 = "tt_heart_00.bti";
SECTION_DEAD static char const* const stringBase_803948E9 = "%02d/%02d/%d %02d:%02d";
SECTION_DEAD static char const* const stringBase_80394900 = "999:59";
SECTION_DEAD static char const* const stringBase_80394907 = "%d:%02d";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039490F = "";
#pragma pop
/* 803948B8-803948B8 020F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/file/d_file_sel_warning.cpp
+16 -19
View File
@@ -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();
@@ -73,10 +73,6 @@ struct J2DScreen {
/* 802F9690 */ void animation();
};
struct J2DPane {
/* 802F7FC4 */ void setAnimation(J2DAnmTransform*);
};
struct J2DAnmLoaderDataBase {
/* 80308A6C */ void load(void const*);
};
@@ -228,6 +224,18 @@ asm dFile_warning_c::~dFile_warning_c() {
#pragma pop
/* ############################################################################################## */
/* 80394828-80394828 020E88 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394828 = "zelda_file_select_warning_window.blo";
SECTION_DEAD static char const* const stringBase_8039484D = "zelda_option_set_up_window.blo";
SECTION_DEAD static char const* const stringBase_8039486C = "zelda_file_select_warning_window.bck";
SECTION_DEAD static char const* const stringBase_80394891 = "zelda_option_set_up_window.bck";
SECTION_DEAD static char const* const stringBase_803948B0 = "";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803948B1 = "\0\0\0\0\0\0";
#pragma pop
/* 804539DC-804539E0 -00001 0004+00 1/1 0/0 0/0 .sdata2 @3769 */
SECTION_SDATA2 static void* lit_3769 = (void*)&d_file_d_file_sel_warning__stringBase0;
@@ -399,7 +407,7 @@ asm void __sinit_d_file_sel_warning_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_8019238C = (void*)__sinit_d_file_sel_warning_cpp;
REGISTER_CTORS(0x8019238C, __sinit_d_file_sel_warning_cpp);
#pragma pop
/* 801923CC-80192414 18CD0C 0048+00 1/0 0/0 0/0 .text __dt__16dDlst_FileWarn_cFv */
@@ -423,15 +431,4 @@ asm void J2DScreen::setAnimation(J2DAnmTransform* param_0) {
}
#pragma pop
/* 80394828-803948B8 020E88 0089+07 5/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80394828 = "zelda_file_select_warning_window.blo";
SECTION_DEAD static char const* const stringBase_8039484D = "zelda_option_set_up_window.blo";
SECTION_DEAD static char const* const stringBase_8039486C = "zelda_file_select_warning_window.bck";
SECTION_DEAD static char const* const stringBase_80394891 = "zelda_option_set_up_window.bck";
SECTION_DEAD static char const* const stringBase_803948B0 = "";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803948B1 = "\0\0\0\0\0\0";
#pragma pop
/* 80394828-80394828 020E88 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/file/d_file_select.cpp
+70 -64
View File
@@ -34,14 +34,14 @@ struct mDoGph_gInf_c {
static u8 mFader[4];
};
struct J3DMaterialTable {};
struct J3DModelData {};
struct J3DAnmTevRegKey {
/* 8032B87C */ void searchUpdateMaterialID(J3DModelData*);
};
struct J3DMaterialTable {};
struct mDoExt_brkAnm {
/* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16);
/* 8000D7A8 */ void entry(J3DMaterialTable*, f32);
@@ -129,8 +129,6 @@ struct dName_c {
/* 80250560 */ void _draw();
};
struct COutFont_c {};
struct JUtility {
struct TColor {};
};
@@ -144,6 +142,8 @@ struct J2DTextBox {
struct JUTFont {};
struct COutFont_c {};
struct dMsgString_c {
/* 80191B6C */ void getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8);
/* 80249C20 */ dMsgString_c();
@@ -394,10 +394,10 @@ struct dComIfG_play_c {
/* 8002B2C8 */ void itemInit();
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
/* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
@@ -937,6 +937,54 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
/* ############################################################################################## */
/* 80394388-80394388 0209E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394388 = "tt_1_metal_40x40.bti";
SECTION_DEAD static char const* const stringBase_8039439D = "tt_2_metal_40x40.bti";
SECTION_DEAD static char const* const stringBase_803943B2 = "tt_3_metal_40x40.bti";
SECTION_DEAD static char const* const stringBase_803943C7 = "zelda_file_select.blo";
SECTION_DEAD static char const* const stringBase_803943DD = "zelda_file_select.bck";
SECTION_DEAD static char const* const stringBase_803943F3 = "";
SECTION_DEAD static char const* const stringBase_803943F4 = "zelda_file_select.bpk";
SECTION_DEAD static char const* const stringBase_8039440A = "zelda_file_select_05.btk";
SECTION_DEAD static char const* const stringBase_80394423 = "zelda_file_select.btk";
SECTION_DEAD static char const* const stringBase_80394439 = "zelda_file_select.brk";
SECTION_DEAD static char const* const stringBase_8039444F = "zelda_file_select_02.btk";
SECTION_DEAD static char const* const stringBase_80394468 = "zelda_file_select_03.btk";
SECTION_DEAD static char const* const stringBase_80394481 = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_80394491 = "zelda_file_select_copy_select.blo";
SECTION_DEAD static char const* const stringBase_803944B3 = "zelda_file_select_copy_select.bck";
SECTION_DEAD static char const* const stringBase_803944D5 = "zelda_file_select_copy_select.bpk";
SECTION_DEAD static char const* const stringBase_803944F7 = "zelda_file_select_copy_select_03.btk";
SECTION_DEAD static char const* const stringBase_8039451C = "zelda_file_select_copy_select.btk";
SECTION_DEAD static char const* const stringBase_8039453E = "zelda_file_select_copy_select.brk";
SECTION_DEAD static char const* const stringBase_80394560 = "zelda_file_select_yes_no_window.blo";
SECTION_DEAD static char const* const stringBase_80394584 = "zelda_file_select_yes_no_window.bck";
SECTION_DEAD static char const* const stringBase_803945A8 = "zelda_file_select_yes_no_window.bpk";
SECTION_DEAD static char const* const stringBase_803945CC = "zelda_file_select_yes_no_window.btk";
SECTION_DEAD static char const* const stringBase_803945F0 = "zelda_file_select_3menu_window.blo";
SECTION_DEAD static char const* const stringBase_80394613 = "zelda_file_select_3menu_window.bck";
SECTION_DEAD static char const* const stringBase_80394636 = "zelda_file_select_3menu_window.bpk";
SECTION_DEAD static char const* const stringBase_80394659 = "zelda_file_select_3menu_window.btk";
SECTION_DEAD static char const* const stringBase_8039467C = "zelda_file_select_details.blo";
SECTION_DEAD static char const* const stringBase_8039469A = "zelda_file_select_details.btk";
SECTION_DEAD static char const* const stringBase_803946B8 = "md_mask_parts_spin_1.bck";
SECTION_DEAD static char const* const stringBase_803946D1 = "md_mask_parts_spin_2.bck";
SECTION_DEAD static char const* const stringBase_803946EA = "md_mask_parts_spin_3.bck";
SECTION_DEAD static char const* const stringBase_80394703 = "md_mask_parts_spin_4.bck";
SECTION_DEAD static char const* const stringBase_8039471C = "md_mask_parts_spin_1.brk";
SECTION_DEAD static char const* const stringBase_80394735 = "md_mask_parts_spin_2_3.brk";
SECTION_DEAD static char const* const stringBase_80394750 = "md_mask_parts_spin_4.brk";
SECTION_DEAD static char const* const stringBase_80394769 = "md_mask_UI.bmd";
SECTION_DEAD static char const* const stringBase_80394778 = "kageri_mirrer_spin_1.bck";
SECTION_DEAD static char const* const stringBase_80394791 = "kageri_mirrer_spin_2.bck";
SECTION_DEAD static char const* const stringBase_803947AA = "kageri_mirrer_spin_3.bck";
SECTION_DEAD static char const* const stringBase_803947C3 = "kageri_mirrer_spin_4.bck";
SECTION_DEAD static char const* const stringBase_803947DC = "kageri_mirrer_spin_1.brk";
SECTION_DEAD static char const* const stringBase_803947F5 = "kageri_mirrer_spin_2_3_4.brk";
#pragma pop
/* 803BA848-803BA854 017968 000C+00 6/6 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -4346,7 +4394,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,
};
COMPILER_STRIP_GATE(80394310, &m_kamen_offset_x);
COMPILER_STRIP_GATE(0x80394310, &m_kamen_offset_x);
/* 80394324-80394338 020984 0014+00 0/1 0/0 0/0 .rodata m_kamen_offset_y$8679 */
#pragma push
@@ -4355,7 +4403,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,
};
COMPILER_STRIP_GATE(80394324, &m_kamen_offset_y);
COMPILER_STRIP_GATE(0x80394324, &m_kamen_offset_y);
#pragma pop
/* 80394338-8039434C 020998 0014+00 0/1 0/0 0/0 .rodata m_kamen_scale$8680 */
@@ -4365,7 +4413,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,
};
COMPILER_STRIP_GATE(80394338, &m_kamen_scale);
COMPILER_STRIP_GATE(0x80394338, &m_kamen_scale);
#pragma pop
/* 80190BA8-80190D68 18B4E8 01C0+00 1/1 0/0 0/0 .text createMaskModel__16dFile_select3D_cFv */
@@ -4386,7 +4434,7 @@ SECTION_RODATA static u8 const m_mirror_offset_x[20] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8039434C, &m_mirror_offset_x);
COMPILER_STRIP_GATE(0x8039434C, &m_mirror_offset_x);
#pragma pop
/* 80394360-80394374 0209C0 0014+00 0/1 0/0 0/0 .rodata m_mirror_offset_y$8782 */
@@ -4396,7 +4444,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,
};
COMPILER_STRIP_GATE(80394360, &m_mirror_offset_y);
COMPILER_STRIP_GATE(0x80394360, &m_mirror_offset_y);
#pragma pop
/* 80394374-80394388 0209D4 0014+00 0/1 0/0 0/0 .rodata m_mirror_scale$8783 */
@@ -4406,7 +4454,15 @@ SECTION_RODATA static u8 const m_mirror_scale[20] = {
0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x19,
0x99, 0x9A, 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x19, 0x99, 0x9A,
};
COMPILER_STRIP_GATE(80394374, &m_mirror_scale);
COMPILER_STRIP_GATE(0x80394374, &m_mirror_scale);
#pragma pop
/* 80394388-80394388 0209E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394812 = "kageri_mirrer_UI.bmd";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80394827 = "";
#pragma pop
/* 80190D68-80190FE8 18B6A8 0280+00 1/1 0/0 0/0 .text createMirrorModel__16dFile_select3D_cFv */
@@ -4548,7 +4604,7 @@ asm void __sinit_d_file_select_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_80191428 = (void*)__sinit_d_file_select_cpp;
REGISTER_CTORS(0x80191428, __sinit_d_file_select_cpp);
#pragma pop
/* 80191B6C-80191BAC 18C4AC 0040+00 0/0 1/0 0/0 .text
@@ -4563,54 +4619,4 @@ asm void dMsgString_c::getString(u32 param_0, J2DTextBox* param_1, J2DTextBox* p
}
#pragma pop
/* 80394388-80394828 0209E8 049F+01 14/9 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80394388 = "tt_1_metal_40x40.bti";
SECTION_DEAD static char const* const stringBase_8039439D = "tt_2_metal_40x40.bti";
SECTION_DEAD static char const* const stringBase_803943B2 = "tt_3_metal_40x40.bti";
SECTION_DEAD static char const* const stringBase_803943C7 = "zelda_file_select.blo";
SECTION_DEAD static char const* const stringBase_803943DD = "zelda_file_select.bck";
SECTION_DEAD static char const* const stringBase_803943F3 = "";
SECTION_DEAD static char const* const stringBase_803943F4 = "zelda_file_select.bpk";
SECTION_DEAD static char const* const stringBase_8039440A = "zelda_file_select_05.btk";
SECTION_DEAD static char const* const stringBase_80394423 = "zelda_file_select.btk";
SECTION_DEAD static char const* const stringBase_80394439 = "zelda_file_select.brk";
SECTION_DEAD static char const* const stringBase_8039444F = "zelda_file_select_02.btk";
SECTION_DEAD static char const* const stringBase_80394468 = "zelda_file_select_03.btk";
SECTION_DEAD static char const* const stringBase_80394481 = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_80394491 = "zelda_file_select_copy_select.blo";
SECTION_DEAD static char const* const stringBase_803944B3 = "zelda_file_select_copy_select.bck";
SECTION_DEAD static char const* const stringBase_803944D5 = "zelda_file_select_copy_select.bpk";
SECTION_DEAD static char const* const stringBase_803944F7 = "zelda_file_select_copy_select_03.btk";
SECTION_DEAD static char const* const stringBase_8039451C = "zelda_file_select_copy_select.btk";
SECTION_DEAD static char const* const stringBase_8039453E = "zelda_file_select_copy_select.brk";
SECTION_DEAD static char const* const stringBase_80394560 = "zelda_file_select_yes_no_window.blo";
SECTION_DEAD static char const* const stringBase_80394584 = "zelda_file_select_yes_no_window.bck";
SECTION_DEAD static char const* const stringBase_803945A8 = "zelda_file_select_yes_no_window.bpk";
SECTION_DEAD static char const* const stringBase_803945CC = "zelda_file_select_yes_no_window.btk";
SECTION_DEAD static char const* const stringBase_803945F0 = "zelda_file_select_3menu_window.blo";
SECTION_DEAD static char const* const stringBase_80394613 = "zelda_file_select_3menu_window.bck";
SECTION_DEAD static char const* const stringBase_80394636 = "zelda_file_select_3menu_window.bpk";
SECTION_DEAD static char const* const stringBase_80394659 = "zelda_file_select_3menu_window.btk";
SECTION_DEAD static char const* const stringBase_8039467C = "zelda_file_select_details.blo";
SECTION_DEAD static char const* const stringBase_8039469A = "zelda_file_select_details.btk";
SECTION_DEAD static char const* const stringBase_803946B8 = "md_mask_parts_spin_1.bck";
SECTION_DEAD static char const* const stringBase_803946D1 = "md_mask_parts_spin_2.bck";
SECTION_DEAD static char const* const stringBase_803946EA = "md_mask_parts_spin_3.bck";
SECTION_DEAD static char const* const stringBase_80394703 = "md_mask_parts_spin_4.bck";
SECTION_DEAD static char const* const stringBase_8039471C = "md_mask_parts_spin_1.brk";
SECTION_DEAD static char const* const stringBase_80394735 = "md_mask_parts_spin_2_3.brk";
SECTION_DEAD static char const* const stringBase_80394750 = "md_mask_parts_spin_4.brk";
SECTION_DEAD static char const* const stringBase_80394769 = "md_mask_UI.bmd";
SECTION_DEAD static char const* const stringBase_80394778 = "kageri_mirrer_spin_1.bck";
SECTION_DEAD static char const* const stringBase_80394791 = "kageri_mirrer_spin_2.bck";
SECTION_DEAD static char const* const stringBase_803947AA = "kageri_mirrer_spin_3.bck";
SECTION_DEAD static char const* const stringBase_803947C3 = "kageri_mirrer_spin_4.bck";
SECTION_DEAD static char const* const stringBase_803947DC = "kageri_mirrer_spin_1.brk";
SECTION_DEAD static char const* const stringBase_803947F5 = "kageri_mirrer_spin_2_3_4.brk";
SECTION_DEAD static char const* const stringBase_80394812 = "kageri_mirrer_UI.bmd";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80394827 = "";
#pragma pop
/* 80394388-80394388 0209E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/kankyo/d_kankyo.cpp
+184 -104
View File
@@ -73,6 +73,12 @@ struct dStage_roomControl_c {
static u8 mStatus[65792];
};
struct dKy_tevstr_c {};
struct J3DModelData {
/* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]);
};
struct Vec {};
struct cXyz {
@@ -82,14 +88,8 @@ struct cXyz {
/* 80266B84 */ void operator*(f32) const;
};
struct J3DModelData {
/* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]);
};
struct _GXColorS10 {};
struct dKy_tevstr_c {};
struct dScnKy_env_light_c {
/* 8019F2E8 */ dScnKy_env_light_c();
/* 8019F4FC */ void setDaytime();
@@ -126,10 +126,10 @@ struct dRes_control_c {
struct dPa_levelEcallBack {};
struct _GXColor {};
struct csXyz {};
struct _GXColor {};
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*,
@@ -626,6 +626,60 @@ static asm void dKy_WolfPowerup_AmbCol(_GXColorS10* param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394C6C = "F_SP115";
SECTION_DEAD static char const* const stringBase_80394C74 = "F_SP113";
SECTION_DEAD static char const* const stringBase_80394C7C = "D_SB10";
SECTION_DEAD static char const* const stringBase_80394C83 = "F_SP112";
SECTION_DEAD static char const* const stringBase_80394C8B = "F_SP126";
SECTION_DEAD static char const* const stringBase_80394C93 = "F_SP114";
SECTION_DEAD static char const* const stringBase_80394C9B = "D_MN05";
SECTION_DEAD static char const* const stringBase_80394CA2 = "D_MN04";
SECTION_DEAD static char const* const stringBase_80394CA9 = "D_SB04";
SECTION_DEAD static char const* const stringBase_80394CB0 = "D_SB05";
SECTION_DEAD static char const* const stringBase_80394CB7 = "D_SB06";
SECTION_DEAD static char const* const stringBase_80394CBE = "D_SB07";
SECTION_DEAD static char const* const stringBase_80394CC5 = "D_SB08";
SECTION_DEAD static char const* const stringBase_80394CCC = "D_SB09";
SECTION_DEAD static char const* const stringBase_80394CD3 = "D_MN10A";
SECTION_DEAD static char const* const stringBase_80394CDB = "D_MN07A";
SECTION_DEAD static char const* const stringBase_80394CE3 = "D_MN10B";
SECTION_DEAD static char const* const stringBase_80394CEB = "D_MN10";
SECTION_DEAD static char const* const stringBase_80394CF2 = "D_MN11A";
SECTION_DEAD static char const* const stringBase_80394CFA = "D_MN11";
SECTION_DEAD static char const* const stringBase_80394D01 = "D_MN11B";
SECTION_DEAD static char const* const stringBase_80394D09 = "D_SB00";
SECTION_DEAD static char const* const stringBase_80394D10 = "D_MN09B";
SECTION_DEAD static char const* const stringBase_80394D18 = "D_MN09C";
SECTION_DEAD static char const* const stringBase_80394D20 = "F_SP116";
SECTION_DEAD static char const* const stringBase_80394D28 = "D_MN06";
SECTION_DEAD static char const* const stringBase_80394D2F = "D_MN07";
SECTION_DEAD static char const* const stringBase_80394D36 = "D_MN09A";
SECTION_DEAD static char const* const stringBase_80394D3E = "D_SB01";
SECTION_DEAD static char const* const stringBase_80394D45 = "R_SP300";
SECTION_DEAD static char const* const stringBase_80394D4D = "R_SP301";
SECTION_DEAD static char const* const stringBase_80394D55 = "D_MN01";
SECTION_DEAD static char const* const stringBase_80394D5C = "D_MN01B";
SECTION_DEAD static char const* const stringBase_80394D64 = "D_MN01A";
SECTION_DEAD static char const* const stringBase_80394D6C = "D_MN08";
SECTION_DEAD static char const* const stringBase_80394D73 = "D_SB02";
SECTION_DEAD static char const* const stringBase_80394D7A = "D_SB03";
SECTION_DEAD static char const* const stringBase_80394D81 = "R_SP01";
SECTION_DEAD static char const* const stringBase_80394D88 = "R_SP108";
SECTION_DEAD static char const* const stringBase_80394D90 = "R_SP209";
SECTION_DEAD static char const* const stringBase_80394D98 = "R_SP116";
SECTION_DEAD static char const* const stringBase_80394DA0 = "R_SP161";
SECTION_DEAD static char const* const stringBase_80394DA8 = "F_SP110";
SECTION_DEAD static char const* const stringBase_80394DB0 = "R_SP107";
SECTION_DEAD static char const* const stringBase_80394DB8 = "R_SP128";
SECTION_DEAD static char const* const stringBase_80394DC0 = "R_SP160";
SECTION_DEAD static char const* const stringBase_80394DC8 = "R_SP127";
SECTION_DEAD static char const* const stringBase_80394DD0 = "R_SP109";
#pragma pop
/* 8019C3A4-8019CB0C 196CE4 0768+00 2/2 0/0 0/0 .text dKy_sense_pat_get__Fv */
#pragma push
#pragma optimization_level 0
@@ -1047,6 +1101,12 @@ asm void dKy_FiveSenses_fullthrottle_dark() {
#pragma pop
/* ############################################################################################## */
/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394DD8 = "D_MN09";
#pragma pop
/* 80453C70-80453C74 002270 0004+00 4/4 0/0 0/0 .sdata2 @4850 */
SECTION_SDATA2 static f32 lit_4850 = 1000000.0f;
@@ -1222,6 +1282,13 @@ static asm void dungeonlight_init() {
}
#pragma pop
/* ############################################################################################## */
/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394DDF = "Always";
#pragma pop
/* 8019EAA0-8019EBD0 1993E0 0130+00 1/1 0/0 0/0 .text undwater_init__Fv */
#pragma push
#pragma optimization_level 0
@@ -1243,6 +1310,12 @@ static asm void dKy_light_size_get(char const* param_0) {
#pragma pop
/* ############################################################################################## */
/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394DE6 = "F_SP127";
#pragma pop
/* 80453CA0-80453CA4 0022A0 0004+00 2/2 0/0 0/0 .sdata2 @5344 */
SECTION_SDATA2 static f32 lit_5344 = 11.0f / 100.0f;
@@ -1633,6 +1706,12 @@ asm void dStage_roomControl_c::GetTimePass() {
#pragma pop
/* ############################################################################################## */
/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394DEE = "F_SP200";
#pragma pop
/* 80453CC8-80453CCC 0022C8 0004+00 2/2 0/0 0/0 .sdata2 @5613 */
SECTION_SDATA2 static f32 lit_5613 = 270.0f;
@@ -1744,6 +1823,13 @@ asm void dScnKy_env_light_c::getDarkDaytime() {
#pragma pop
/* ############################################################################################## */
/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394DF6 = "D_MN08D";
SECTION_DEAD static char const* const stringBase_80394DFE = "F_SP121";
#pragma pop
/* 80453CE0-80453CE4 0022E0 0004+00 1/1 0/0 0/0 .sdata2 @5839 */
SECTION_SDATA2 static f32 lit_5839 = 1.0f / 30.0f;
@@ -2241,6 +2327,19 @@ static asm void dKy_Delete(sub_kankyo__class* param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394E06 = "pol_efftbl.dat";
SECTION_DEAD static char const* const stringBase_80394E15 = "pol_effcol.dat";
SECTION_DEAD static char const* const stringBase_80394E24 = "pol_efftbl2.dat";
SECTION_DEAD static char const* const stringBase_80394E34 = "pol_effcol2.dat";
SECTION_DEAD static char const* const stringBase_80394E44 = "pol_sound.dat";
SECTION_DEAD static char const* const stringBase_80394E52 = "pol_arg.dat";
SECTION_DEAD static char const* const stringBase_80394E5E = "colordata_tbl.dat";
#pragma pop
/* 801A5C1C-801A5E54 1A055C 0238+00 1/0 0/0 0/0 .text dKy_Create__FPv */
#pragma push
#pragma optimization_level 0
@@ -2322,6 +2421,13 @@ asm void dKy_setLight_nowroom_grass(char param_0, f32 param_1) {
}
#pragma pop
/* ############################################################################################## */
/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394E70 = "D_MN";
#pragma pop
/* 801A6D4C-801A6E9C 1A168C 0150+00 1/1 1/1 0/0 .text dKy_move_room_ratio__FP12dKy_tevstr_cPSc */
#pragma push
#pragma optimization_level 0
@@ -2426,6 +2532,13 @@ asm void dKy_dalkmist_inf_cut(DALKMIST_INFLUENCE* param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394E75 = "\nPOINTLIGHT COUNT OVER!!!\n";
#pragma pop
/* 801A789C-801A792C 1A21DC 0090+00 0/0 0/0 1/1 .text dKy_plight_priority_set__FP15LIGHT_INFLUENCE
*/
#pragma push
@@ -2589,6 +2702,14 @@ static asm void dKy_vrbox_addcol_set(s16 param_0, s16 param_1, s16 param_2, f32
}
#pragma pop
/* ############################################################################################## */
/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394E90 =
"\ndKy_fog_startendz_set ratio error!\n";
#pragma pop
/* 801A80D0-801A8168 1A2A10 0098+00 1/1 0/0 2/2 .text dKy_fog_startendz_set__Ffff */
#pragma push
#pragma optimization_level 0
@@ -2899,7 +3020,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,
};
COMPILER_STRIP_GATE(80394C60, &lit_9035);
COMPILER_STRIP_GATE(0x80394C60, &lit_9035);
/* 80453DAC-80453DB0 0023AC 0004+00 1/1 0/0 0/0 .sdata2 @8975 */
SECTION_SDATA2 static f32 lit_8975 = 50.0f;
@@ -2961,6 +3082,13 @@ asm void dKy_ParticleColor_get_bg(cXyz* param_0, dKy_tevstr_c* param_1, _GXColor
}
#pragma pop
/* ############################################################################################## */
/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394EB5 = "F_SP118";
#pragma pop
/* 801A9D60-801AA664 1A46A0 0904+00 1/1 0/0 17/17 .text dKy_BossLight_set__FP4cXyzP8_GXColorfUc */
#pragma push
#pragma optimization_level 0
@@ -3035,6 +3163,13 @@ static asm void dKy_twilight_camelight_set() {
#pragma pop
/* ############################################################################################## */
/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394EBD = "F_SP109";
SECTION_DEAD static char const* const stringBase_80394EC5 = "F_SP122";
#pragma pop
/* 80453DEC-80453DF0 0023EC 0004+00 1/1 0/0 0/0 .sdata2 @9779 */
SECTION_SDATA2 static f32 lit_9779 = 7.225000381469727f;
@@ -3075,6 +3210,13 @@ asm void dKy_camera_water_in_status_check() {
}
#pragma pop
/* ############################################################################################## */
/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394ECD = "D_MN05A";
#pragma pop
/* 801AB290-801AB3A8 1A5BD0 0118+00 0/0 5/5 0/0 .text dKy_pol_efftype_get__FPC13cBgS_PolyInfo */
#pragma push
#pragma optimization_level 0
@@ -3273,6 +3415,13 @@ asm void dKy_darkworld_check() {
}
#pragma pop
/* ############################################################################################## */
/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394ED5 = "F_SP108";
#pragma pop
/* 801AC5BC-801AC70C 1A6EFC 0150+00 3/3 0/0 0/0 .text dKy_F_SP121Check__FPCciPUci */
#pragma push
#pragma optimization_level 0
@@ -3367,6 +3516,30 @@ asm void dKy_shadow_mode_check(u8 param_0) {
#pragma pop
/* ############################################################################################## */
/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394EDD = "MA06";
SECTION_DEAD static char const* const stringBase_80394EE2 = "MA03";
SECTION_DEAD static char const* const stringBase_80394EE7 = "MA09";
SECTION_DEAD static char const* const stringBase_80394EEC = "MA17";
SECTION_DEAD static char const* const stringBase_80394EF1 = "MA19";
SECTION_DEAD static char const* const stringBase_80394EF6 = "MA07";
SECTION_DEAD static char const* const stringBase_80394EFB = "MA10";
SECTION_DEAD static char const* const stringBase_80394F00 = "MA02";
SECTION_DEAD static char const* const stringBase_80394F05 = "MA00";
SECTION_DEAD static char const* const stringBase_80394F0A = "MA01";
SECTION_DEAD static char const* const stringBase_80394F0F = "MA04";
SECTION_DEAD static char const* const stringBase_80394F14 = "MA16";
SECTION_DEAD static char const* const stringBase_80394F19 = "MA11";
SECTION_DEAD static char const* const stringBase_80394F1E = "MA20";
SECTION_DEAD static char const* const stringBase_80394F23 = "MA13";
SECTION_DEAD static char const* const stringBase_80394F28 = "MA14";
SECTION_DEAD static char const* const stringBase_80394F2D = "Rainbow";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80394F35 = "\0\0";
#pragma pop
/* 80450708-8045070C 000188 0004+00 1/1 0/0 0/0 .sdata l_zmodeUpEnable */
SECTION_SDATA static u32 l_zmodeUpEnable = 0x01030100;
@@ -3470,7 +3643,7 @@ asm void __sinit_d_kankyo_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801ADCA4 = (void*)__sinit_d_kankyo_cpp;
REGISTER_CTORS(0x801ADCA4, __sinit_d_kankyo_cpp);
#pragma pop
/* 801ADD00-801ADD38 1A8640 0038+00 2/2 0/0 0/0 .text dKankyo_DayProc__Fv */
@@ -3490,97 +3663,4 @@ static asm void dKankyo_DayProc() {
extern u8 struct_80451070[8];
u8 struct_80451070[8];
/* 80394C6C-80394F38 0212CC 02C9+03 35/35 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80394C6C = "F_SP115";
SECTION_DEAD static char const* const stringBase_80394C74 = "F_SP113";
SECTION_DEAD static char const* const stringBase_80394C7C = "D_SB10";
SECTION_DEAD static char const* const stringBase_80394C83 = "F_SP112";
SECTION_DEAD static char const* const stringBase_80394C8B = "F_SP126";
SECTION_DEAD static char const* const stringBase_80394C93 = "F_SP114";
SECTION_DEAD static char const* const stringBase_80394C9B = "D_MN05";
SECTION_DEAD static char const* const stringBase_80394CA2 = "D_MN04";
SECTION_DEAD static char const* const stringBase_80394CA9 = "D_SB04";
SECTION_DEAD static char const* const stringBase_80394CB0 = "D_SB05";
SECTION_DEAD static char const* const stringBase_80394CB7 = "D_SB06";
SECTION_DEAD static char const* const stringBase_80394CBE = "D_SB07";
SECTION_DEAD static char const* const stringBase_80394CC5 = "D_SB08";
SECTION_DEAD static char const* const stringBase_80394CCC = "D_SB09";
SECTION_DEAD static char const* const stringBase_80394CD3 = "D_MN10A";
SECTION_DEAD static char const* const stringBase_80394CDB = "D_MN07A";
SECTION_DEAD static char const* const stringBase_80394CE3 = "D_MN10B";
SECTION_DEAD static char const* const stringBase_80394CEB = "D_MN10";
SECTION_DEAD static char const* const stringBase_80394CF2 = "D_MN11A";
SECTION_DEAD static char const* const stringBase_80394CFA = "D_MN11";
SECTION_DEAD static char const* const stringBase_80394D01 = "D_MN11B";
SECTION_DEAD static char const* const stringBase_80394D09 = "D_SB00";
SECTION_DEAD static char const* const stringBase_80394D10 = "D_MN09B";
SECTION_DEAD static char const* const stringBase_80394D18 = "D_MN09C";
SECTION_DEAD static char const* const stringBase_80394D20 = "F_SP116";
SECTION_DEAD static char const* const stringBase_80394D28 = "D_MN06";
SECTION_DEAD static char const* const stringBase_80394D2F = "D_MN07";
SECTION_DEAD static char const* const stringBase_80394D36 = "D_MN09A";
SECTION_DEAD static char const* const stringBase_80394D3E = "D_SB01";
SECTION_DEAD static char const* const stringBase_80394D45 = "R_SP300";
SECTION_DEAD static char const* const stringBase_80394D4D = "R_SP301";
SECTION_DEAD static char const* const stringBase_80394D55 = "D_MN01";
SECTION_DEAD static char const* const stringBase_80394D5C = "D_MN01B";
SECTION_DEAD static char const* const stringBase_80394D64 = "D_MN01A";
SECTION_DEAD static char const* const stringBase_80394D6C = "D_MN08";
SECTION_DEAD static char const* const stringBase_80394D73 = "D_SB02";
SECTION_DEAD static char const* const stringBase_80394D7A = "D_SB03";
SECTION_DEAD static char const* const stringBase_80394D81 = "R_SP01";
SECTION_DEAD static char const* const stringBase_80394D88 = "R_SP108";
SECTION_DEAD static char const* const stringBase_80394D90 = "R_SP209";
SECTION_DEAD static char const* const stringBase_80394D98 = "R_SP116";
SECTION_DEAD static char const* const stringBase_80394DA0 = "R_SP161";
SECTION_DEAD static char const* const stringBase_80394DA8 = "F_SP110";
SECTION_DEAD static char const* const stringBase_80394DB0 = "R_SP107";
SECTION_DEAD static char const* const stringBase_80394DB8 = "R_SP128";
SECTION_DEAD static char const* const stringBase_80394DC0 = "R_SP160";
SECTION_DEAD static char const* const stringBase_80394DC8 = "R_SP127";
SECTION_DEAD static char const* const stringBase_80394DD0 = "R_SP109";
SECTION_DEAD static char const* const stringBase_80394DD8 = "D_MN09";
SECTION_DEAD static char const* const stringBase_80394DDF = "Always";
SECTION_DEAD static char const* const stringBase_80394DE6 = "F_SP127";
SECTION_DEAD static char const* const stringBase_80394DEE = "F_SP200";
SECTION_DEAD static char const* const stringBase_80394DF6 = "D_MN08D";
SECTION_DEAD static char const* const stringBase_80394DFE = "F_SP121";
SECTION_DEAD static char const* const stringBase_80394E06 = "pol_efftbl.dat";
SECTION_DEAD static char const* const stringBase_80394E15 = "pol_effcol.dat";
SECTION_DEAD static char const* const stringBase_80394E24 = "pol_efftbl2.dat";
SECTION_DEAD static char const* const stringBase_80394E34 = "pol_effcol2.dat";
SECTION_DEAD static char const* const stringBase_80394E44 = "pol_sound.dat";
SECTION_DEAD static char const* const stringBase_80394E52 = "pol_arg.dat";
SECTION_DEAD static char const* const stringBase_80394E5E = "colordata_tbl.dat";
SECTION_DEAD static char const* const stringBase_80394E70 = "D_MN";
SECTION_DEAD static char const* const stringBase_80394E75 = "\nPOINTLIGHT COUNT OVER!!!\n";
SECTION_DEAD static char const* const stringBase_80394E90 =
"\ndKy_fog_startendz_set ratio error!\n";
SECTION_DEAD static char const* const stringBase_80394EB5 = "F_SP118";
SECTION_DEAD static char const* const stringBase_80394EBD = "F_SP109";
SECTION_DEAD static char const* const stringBase_80394EC5 = "F_SP122";
SECTION_DEAD static char const* const stringBase_80394ECD = "D_MN05A";
SECTION_DEAD static char const* const stringBase_80394ED5 = "F_SP108";
SECTION_DEAD static char const* const stringBase_80394EDD = "MA06";
SECTION_DEAD static char const* const stringBase_80394EE2 = "MA03";
SECTION_DEAD static char const* const stringBase_80394EE7 = "MA09";
SECTION_DEAD static char const* const stringBase_80394EEC = "MA17";
SECTION_DEAD static char const* const stringBase_80394EF1 = "MA19";
SECTION_DEAD static char const* const stringBase_80394EF6 = "MA07";
SECTION_DEAD static char const* const stringBase_80394EFB = "MA10";
SECTION_DEAD static char const* const stringBase_80394F00 = "MA02";
SECTION_DEAD static char const* const stringBase_80394F05 = "MA00";
SECTION_DEAD static char const* const stringBase_80394F0A = "MA01";
SECTION_DEAD static char const* const stringBase_80394F0F = "MA04";
SECTION_DEAD static char const* const stringBase_80394F14 = "MA16";
SECTION_DEAD static char const* const stringBase_80394F19 = "MA11";
SECTION_DEAD static char const* const stringBase_80394F1E = "MA20";
SECTION_DEAD static char const* const stringBase_80394F23 = "MA13";
SECTION_DEAD static char const* const stringBase_80394F28 = "MA14";
SECTION_DEAD static char const* const stringBase_80394F2D = "Rainbow";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80394F35 = "\0\0";
#pragma pop
/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/kankyo/d_kankyo_data.cpp
+62 -61
View File
@@ -36,6 +36,67 @@ extern "C" extern u8 g_env_light[4880];
//
/* ############################################################################################## */
/* 8037A1C0-8037A1C0 006820 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A1C0 = "R_SP30";
SECTION_DEAD static char const* const stringBase_8037A1C7 = "T_SP05";
SECTION_DEAD static char const* const stringBase_8037A1CE = "T_SP05A";
SECTION_DEAD static char const* const stringBase_8037A1D6 = "T_WARP2";
SECTION_DEAD static char const* const stringBase_8037A1DE = "T_IMAI";
SECTION_DEAD static char const* const stringBase_8037A1E5 = "T_IMAI0";
SECTION_DEAD static char const* const stringBase_8037A1ED = "T_TOMI";
SECTION_DEAD static char const* const stringBase_8037A1F4 = "T_SASA1";
SECTION_DEAD static char const* const stringBase_8037A1FC = "F_SP105";
SECTION_DEAD static char const* const stringBase_8037A204 = "F_SP05";
SECTION_DEAD static char const* const stringBase_8037A20B = "R_SP107";
SECTION_DEAD static char const* const stringBase_8037A213 = "F_SP108";
SECTION_DEAD static char const* const stringBase_8037A21B = "R_SP108";
SECTION_DEAD static char const* const stringBase_8037A223 = "TEST11";
SECTION_DEAD static char const* const stringBase_8037A22A = "F_SP109";
SECTION_DEAD static char const* const stringBase_8037A232 = "F_SP110";
SECTION_DEAD static char const* const stringBase_8037A23A = "R_SP109";
SECTION_DEAD static char const* const stringBase_8037A242 = "F_SP111";
SECTION_DEAD static char const* const stringBase_8037A24A = "F_SP112";
SECTION_DEAD static char const* const stringBase_8037A252 = "F_SP113";
SECTION_DEAD static char const* const stringBase_8037A25A = "F_SP115";
SECTION_DEAD static char const* const stringBase_8037A262 = "F_SP116";
SECTION_DEAD static char const* const stringBase_8037A26A = "F_SP122";
SECTION_DEAD static char const* const stringBase_8037A272 = "F_SP121";
SECTION_DEAD static char const* const stringBase_8037A27A = "F_SP126";
SECTION_DEAD static char const* const stringBase_8037A282 = "R_SP209";
SECTION_DEAD static char const* const stringBase_8037A28A = "R_SP116";
SECTION_DEAD static char const* const stringBase_8037A292 = "D_MN08";
SECTION_DEAD static char const* const stringBase_8037A299 = "D_MN08B";
SECTION_DEAD static char const* const stringBase_8037A2A1 = "D_MN08C";
SECTION_DEAD static char const* const stringBase_8037A2A9 = "D_MN08A";
SECTION_DEAD static char const* const stringBase_8037A2B1 = "D_SB10";
SECTION_DEAD static char const* const stringBase_8037A2B8 = "R_SP01";
SECTION_DEAD static char const* const stringBase_8037A2BF = "R_SP128";
SECTION_DEAD static char const* const stringBase_8037A2C7 = "F_SP114";
SECTION_DEAD static char const* const stringBase_8037A2CF = "F_SP102";
SECTION_DEAD static char const* const stringBase_8037A2D7 = "F_SP123";
SECTION_DEAD static char const* const stringBase_8037A2DF = "R_SP160";
SECTION_DEAD static char const* const stringBase_8037A2E7 = "R_SP161";
SECTION_DEAD static char const* const stringBase_8037A2EF = "F_SP118";
SECTION_DEAD static char const* const stringBase_8037A2F7 = "F_SP124";
SECTION_DEAD static char const* const stringBase_8037A2FF = "F_SP125";
SECTION_DEAD static char const* const stringBase_8037A307 = "R_SP127";
SECTION_DEAD static char const* const stringBase_8037A30F = "D_MN01A";
SECTION_DEAD static char const* const stringBase_8037A317 = "D_MN10A";
SECTION_DEAD static char const* const stringBase_8037A31F = "D_MN06A";
SECTION_DEAD static char const* const stringBase_8037A327 = "D_MN07A";
SECTION_DEAD static char const* const stringBase_8037A32F = "D_MN08D";
SECTION_DEAD static char const* const stringBase_8037A337 = "D_MN09";
SECTION_DEAD static char const* const stringBase_8037A33E = "D_MN09B";
SECTION_DEAD static char const* const stringBase_8037A346 = "D_MN09C";
SECTION_DEAD static char const* const stringBase_8037A34E = "R_SP300";
SECTION_DEAD static char const* const stringBase_8037A356 = "D_SB02";
SECTION_DEAD static char const* const stringBase_8037A35D = "D_SB03";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8037A364 = "\0\0\0";
#pragma pop
/* 803A8E98-803A9198 005FB8 0300+00 1/1 0/0 0/0 .data l_kydata_BloomInf_tbl */
SECTION_DATA static u8 l_kydata_BloomInf_tbl[768] = {
0x01, 0xFF, 0x40, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x28, 0x46, 0x87,
@@ -1003,64 +1064,4 @@ asm void dKyd_BloomInf_tbl_getp(int param_0) {
}
#pragma pop
/* 8037A1C0-8037A368 006820 01A4+04 3/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8037A1C0 = "R_SP30";
SECTION_DEAD static char const* const stringBase_8037A1C7 = "T_SP05";
SECTION_DEAD static char const* const stringBase_8037A1CE = "T_SP05A";
SECTION_DEAD static char const* const stringBase_8037A1D6 = "T_WARP2";
SECTION_DEAD static char const* const stringBase_8037A1DE = "T_IMAI";
SECTION_DEAD static char const* const stringBase_8037A1E5 = "T_IMAI0";
SECTION_DEAD static char const* const stringBase_8037A1ED = "T_TOMI";
SECTION_DEAD static char const* const stringBase_8037A1F4 = "T_SASA1";
SECTION_DEAD static char const* const stringBase_8037A1FC = "F_SP105";
SECTION_DEAD static char const* const stringBase_8037A204 = "F_SP05";
SECTION_DEAD static char const* const stringBase_8037A20B = "R_SP107";
SECTION_DEAD static char const* const stringBase_8037A213 = "F_SP108";
SECTION_DEAD static char const* const stringBase_8037A21B = "R_SP108";
SECTION_DEAD static char const* const stringBase_8037A223 = "TEST11";
SECTION_DEAD static char const* const stringBase_8037A22A = "F_SP109";
SECTION_DEAD static char const* const stringBase_8037A232 = "F_SP110";
SECTION_DEAD static char const* const stringBase_8037A23A = "R_SP109";
SECTION_DEAD static char const* const stringBase_8037A242 = "F_SP111";
SECTION_DEAD static char const* const stringBase_8037A24A = "F_SP112";
SECTION_DEAD static char const* const stringBase_8037A252 = "F_SP113";
SECTION_DEAD static char const* const stringBase_8037A25A = "F_SP115";
SECTION_DEAD static char const* const stringBase_8037A262 = "F_SP116";
SECTION_DEAD static char const* const stringBase_8037A26A = "F_SP122";
SECTION_DEAD static char const* const stringBase_8037A272 = "F_SP121";
SECTION_DEAD static char const* const stringBase_8037A27A = "F_SP126";
SECTION_DEAD static char const* const stringBase_8037A282 = "R_SP209";
SECTION_DEAD static char const* const stringBase_8037A28A = "R_SP116";
SECTION_DEAD static char const* const stringBase_8037A292 = "D_MN08";
SECTION_DEAD static char const* const stringBase_8037A299 = "D_MN08B";
SECTION_DEAD static char const* const stringBase_8037A2A1 = "D_MN08C";
SECTION_DEAD static char const* const stringBase_8037A2A9 = "D_MN08A";
SECTION_DEAD static char const* const stringBase_8037A2B1 = "D_SB10";
SECTION_DEAD static char const* const stringBase_8037A2B8 = "R_SP01";
SECTION_DEAD static char const* const stringBase_8037A2BF = "R_SP128";
SECTION_DEAD static char const* const stringBase_8037A2C7 = "F_SP114";
SECTION_DEAD static char const* const stringBase_8037A2CF = "F_SP102";
SECTION_DEAD static char const* const stringBase_8037A2D7 = "F_SP123";
SECTION_DEAD static char const* const stringBase_8037A2DF = "R_SP160";
SECTION_DEAD static char const* const stringBase_8037A2E7 = "R_SP161";
SECTION_DEAD static char const* const stringBase_8037A2EF = "F_SP118";
SECTION_DEAD static char const* const stringBase_8037A2F7 = "F_SP124";
SECTION_DEAD static char const* const stringBase_8037A2FF = "F_SP125";
SECTION_DEAD static char const* const stringBase_8037A307 = "R_SP127";
SECTION_DEAD static char const* const stringBase_8037A30F = "D_MN01A";
SECTION_DEAD static char const* const stringBase_8037A317 = "D_MN10A";
SECTION_DEAD static char const* const stringBase_8037A31F = "D_MN06A";
SECTION_DEAD static char const* const stringBase_8037A327 = "D_MN07A";
SECTION_DEAD static char const* const stringBase_8037A32F = "D_MN08D";
SECTION_DEAD static char const* const stringBase_8037A337 = "D_MN09";
SECTION_DEAD static char const* const stringBase_8037A33E = "D_MN09B";
SECTION_DEAD static char const* const stringBase_8037A346 = "D_MN09C";
SECTION_DEAD static char const* const stringBase_8037A34E = "R_SP300";
SECTION_DEAD static char const* const stringBase_8037A356 = "D_SB02";
SECTION_DEAD static char const* const stringBase_8037A35D = "D_SB03";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8037A364 = "\0\0\0";
#pragma pop
/* 8037A1C0-8037A1C0 006820 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/kankyo/d_kankyo_rain.cpp
+108 -40
View File
@@ -44,6 +44,13 @@ struct dRes_control_c {
struct dPa_levelEcallBack {};
struct dKy_tevstr_c {};
struct csXyz {
/* 80018BD0 */ ~csXyz();
/* 802673F4 */ csXyz(s16, s16, s16);
};
struct _GXColor {};
struct Vec {};
@@ -53,13 +60,6 @@ struct cXyz {
/* 80266AE4 */ void operator+(Vec const&) const;
};
struct csXyz {
/* 80018BD0 */ ~csXyz();
/* 802673F4 */ csXyz(s16, s16, s16);
};
struct dKy_tevstr_c {};
struct dPa_control_c {
/* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,
@@ -563,7 +563,14 @@ 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,
};
COMPILER_STRIP_GATE(8037A4C0, &sun_chkpnt);
COMPILER_STRIP_GATE(0x8037A4C0, &sun_chkpnt);
/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A578 = "F_SP200";
SECTION_DEAD static char const* const stringBase_8037A580 = "D_MN09B";
#pragma pop
/* 803A9BA0-803A9BAC 006CC0 000C+00 1/1 0/0 0/0 .data sun_color$4213 */
SECTION_DATA static u8 sun_color[12] = {
@@ -668,6 +675,13 @@ asm void dKyr_sun_move() {
}
#pragma pop
/* ############################################################################################## */
/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A588 = "Always";
#pragma pop
/* 8005CC5C-8005CDA8 05759C 014C+00 0/0 1/1 0/0 .text dKyr_rain_init__Fv */
#pragma push
#pragma optimization_level 0
@@ -693,6 +707,12 @@ static asm void rain_bg_chk(dKankyo_rain_Packet* param_0, int param_1) {
#pragma pop
/* ############################################################################################## */
/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A58F = "F_SP122";
#pragma pop
/* 8045227C-80452280 00087C 0004+00 9/9 0/0 0/0 .sdata2 @4467 */
SECTION_SDATA2 static f32 lit_4467 = 50.0f;
@@ -721,6 +741,16 @@ static asm void forward_overhead_bg_chk(cXyz* param_0, f32 param_1) {
#pragma pop
/* ############################################################################################## */
/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A597 = "R_SP30";
SECTION_DEAD static char const* const stringBase_8037A59E = "R_SP107";
SECTION_DEAD static char const* const stringBase_8037A5A6 = "R_SP127";
SECTION_DEAD static char const* const stringBase_8037A5AE = "F_SP113";
SECTION_DEAD static char const* const stringBase_8037A5B6 = "D_MN09";
#pragma pop
/* 80452284-80452288 000884 0004+00 1/1 0/0 0/0 .sdata2 @5096 */
SECTION_SDATA2 static f32 lit_5096 = -2.5f;
@@ -859,6 +889,12 @@ static asm void d_krain_cut_turn_check() {
#pragma pop
/* ############################################################################################## */
/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A5BD = "D_MN08";
#pragma pop
/* 80452320-80452324 000920 0004+00 1/1 0/0 0/0 .sdata2 @5716 */
SECTION_SDATA2 static f32 lit_5716 = -100000000.0f;
@@ -979,6 +1015,12 @@ asm void dKyr_snow_init() {
#pragma pop
/* ############################################################################################## */
/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A5C4 = "F_SP127";
#pragma pop
/* 804523A4-804523A8 0009A4 0004+00 8/8 0/0 0/0 .sdata2 @6355 */
SECTION_SDATA2 static f32 lit_6355 = 100.0f;
@@ -1056,6 +1098,12 @@ asm void dKyr_star_move() {
#pragma pop
/* ############################################################################################## */
/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A5CC = "D_MN05A";
#pragma pop
/* 804523E4-804523E8 0009E4 0004+00 2/2 0/0 0/0 .sdata2 @6720 */
SECTION_SDATA2 static f32 lit_6720 = 0.004999999888241291f;
@@ -1118,6 +1166,12 @@ asm void cloud_shadow_move() {
#pragma pop
/* ############################################################################################## */
/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A5D4 = "D_MN07A";
#pragma pop
/* 80452428-8045242C 000A28 0004+00 1/1 0/0 0/0 .sdata2 @6947 */
SECTION_SDATA2 static f32 lit_6947 = 2500.0f;
@@ -1175,7 +1229,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,
};
COMPILER_STRIP_GATE(8037A4E8, &lit_6991);
COMPILER_STRIP_GATE(0x8037A4E8, &lit_6991);
/* 803A9BB8-803A9BD8 -00001 0020+00 1/1 0/0 0/0 .data @7214 */
SECTION_DATA static void* lit_7214[8] = {
@@ -1223,7 +1277,14 @@ 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,
};
COMPILER_STRIP_GATE(8037A508, &lit_7275);
COMPILER_STRIP_GATE(0x8037A508, &lit_7275);
/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A5DC = "F_SP103";
SECTION_DEAD static char const* const stringBase_8037A5E4 = "APPEAR_HAWKER";
#pragma pop
/* 803A9BD8-803A9BF8 -00001 0020+00 1/1 0/0 0/0 .data @7549 */
SECTION_DATA static void* lit_7549[8] = {
@@ -1265,14 +1326,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,
};
COMPILER_STRIP_GATE(8037A528, &scale_dat);
COMPILER_STRIP_GATE(0x8037A528, &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,
};
COMPILER_STRIP_GATE(8037A548, &col_dat);
COMPILER_STRIP_GATE(0x8037A548, &col_dat);
/* 80450EF0-80450EF4 -00001 0004+00 1/1 0/0 0/0 .sbss None */
/* 80450EF0 0002+00 data_80450EF0 None */
@@ -1411,6 +1472,12 @@ asm void dKyr_drawSibuki(f32 (*param_0)[4], u8** param_1) {
#pragma pop
/* ############################################################################################## */
/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A5F2 = "F_NW01";
#pragma pop
/* 80450F00-80450F04 000400 0004+00 1/1 0/0 0/0 .sbss rot$8366 */
static f32 rot_8366;
@@ -1467,6 +1534,12 @@ asm void dKyr_drawHousi(f32 (*param_0)[4], u8** param_1) {
#pragma pop
/* ############################################################################################## */
/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A5F9 = "D_MN11";
#pragma pop
/* 804249B0-804249BC 0516D0 000C+00 0/1 0/0 0/0 .bss @8942 */
#pragma push
#pragma force_active on
@@ -1589,7 +1662,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,
};
COMPILER_STRIP_GATE(8037A568, &star_col);
COMPILER_STRIP_GATE(0x8037A568, &star_col);
/* 80424A10-80424A1C 051730 000C+00 0/1 0/0 0/0 .bss @9425 */
#pragma push
@@ -1741,6 +1814,12 @@ asm void drawCloudShadow(f32 (*param_0)[4], u8** param_1) {
#pragma pop
/* ############################################################################################## */
/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A600 = "D_MN07";
#pragma pop
/* 80450F28-80450F2C 000428 0004+00 1/1 0/0 0/0 .sbss howa_loop_cnt$10108 */
static f32 howa_loop_cnt;
@@ -1804,6 +1883,12 @@ asm void dKyr_thunder_init() {
#pragma pop
/* ############################################################################################## */
/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A607 = "R_SP";
#pragma pop
/* 804525AC-804525B0 000BAC 0004+00 1/1 0/0 0/0 .sdata2 @10732 */
SECTION_SDATA2 static f32 lit_10732 = 90000.0f;
@@ -1939,6 +2024,15 @@ asm void dKyr_mud_draw(f32 (*param_0)[4], u8** param_1) {
}
#pragma pop
/* ############################################################################################## */
/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A60C = "F_kumolight_01.bti";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8037A61F = "";
#pragma pop
/* 8006D914-8006DA04 068254 00F0+00 0/0 1/1 1/1 .text dKyr_evil_init__Fv */
#pragma push
#pragma optimization_level 0
@@ -2059,30 +2153,4 @@ bool daPy_py_c::getKandelaarFlamePos() {
return false;
}
/* 8037A578-8037A620 006BD8 00A7+01 25/25 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8037A578 = "F_SP200";
SECTION_DEAD static char const* const stringBase_8037A580 = "D_MN09B";
SECTION_DEAD static char const* const stringBase_8037A588 = "Always";
SECTION_DEAD static char const* const stringBase_8037A58F = "F_SP122";
SECTION_DEAD static char const* const stringBase_8037A597 = "R_SP30";
SECTION_DEAD static char const* const stringBase_8037A59E = "R_SP107";
SECTION_DEAD static char const* const stringBase_8037A5A6 = "R_SP127";
SECTION_DEAD static char const* const stringBase_8037A5AE = "F_SP113";
SECTION_DEAD static char const* const stringBase_8037A5B6 = "D_MN09";
SECTION_DEAD static char const* const stringBase_8037A5BD = "D_MN08";
SECTION_DEAD static char const* const stringBase_8037A5C4 = "F_SP127";
SECTION_DEAD static char const* const stringBase_8037A5CC = "D_MN05A";
SECTION_DEAD static char const* const stringBase_8037A5D4 = "D_MN07A";
SECTION_DEAD static char const* const stringBase_8037A5DC = "F_SP103";
SECTION_DEAD static char const* const stringBase_8037A5E4 = "APPEAR_HAWKER";
SECTION_DEAD static char const* const stringBase_8037A5F2 = "F_NW01";
SECTION_DEAD static char const* const stringBase_8037A5F9 = "D_MN11";
SECTION_DEAD static char const* const stringBase_8037A600 = "D_MN07";
SECTION_DEAD static char const* const stringBase_8037A607 = "R_SP";
SECTION_DEAD static char const* const stringBase_8037A60C = "F_kumolight_01.bti";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8037A61F = "";
#pragma pop
/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/kankyo/d_kankyo_wether.cpp
+82 -44
View File
@@ -27,6 +27,10 @@ struct dRes_control_c {
struct dPa_levelEcallBack {};
struct dKy_tevstr_c {};
struct csXyz {};
struct _GXColor {};
struct Vec {};
@@ -42,10 +46,6 @@ struct cXyz {
static f32 Zero[3];
};
struct csXyz {};
struct dKy_tevstr_c {};
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*,
@@ -932,6 +932,13 @@ static asm void dKyw_evil_Draw() {
#pragma pop
/* ############################################################################################## */
/* 8037A368-8037A368 0069C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A368 = "F_SP113";
SECTION_DEAD static char const* const stringBase_8037A370 = "D_MN07";
#pragma pop
/* 804520E0-804520E4 0006E0 0004+00 12/12 0/0 0/0 .sdata2 @4378 */
SECTION_SDATA2 static u8 lit_4378[4] = {
0x00,
@@ -1224,6 +1231,21 @@ asm void dKyw_wether_move() {
#pragma pop
/* ############################################################################################## */
/* 8037A368-8037A368 0069C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A377 = "F_SP200";
SECTION_DEAD static char const* const stringBase_8037A37F = "D_MN09";
SECTION_DEAD static char const* const stringBase_8037A386 = "D_MN09A";
SECTION_DEAD static char const* const stringBase_8037A38E = "F_moon.bti";
SECTION_DEAD static char const* const stringBase_8037A399 = "F_moon_A.bti";
SECTION_DEAD static char const* const stringBase_8037A3A6 = "F_moon_A_A00.bti";
SECTION_DEAD static char const* const stringBase_8037A3B7 = "F_moon_A_A01.bti";
SECTION_DEAD static char const* const stringBase_8037A3C8 = "F_moon_A_A02.bti";
SECTION_DEAD static char const* const stringBase_8037A3D9 = "F_moon_A_A03.bti";
SECTION_DEAD static char const* const stringBase_8037A3EA = "Always";
#pragma pop
/* 804520E8-804520EC 0006E8 0004+00 1/1 0/0 0/0 .sdata2 @4610 */
SECTION_SDATA2 static f32 lit_4610 = 255.0f;
@@ -1241,6 +1263,12 @@ static asm void wether_move_sun() {
#pragma pop
/* ############################################################################################## */
/* 8037A368-8037A368 0069C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A3F1 = "R_SP127";
#pragma pop
/* 804520F0-804520F4 0006F0 0004+00 2/2 0/0 0/0 .sdata2 @4668 */
SECTION_SDATA2 static f32 lit_4668 = -1.0f;
@@ -1271,6 +1299,14 @@ static asm void wether_move_snow() {
#pragma pop
/* ############################################################################################## */
/* 8037A368-8037A368 0069C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A3F9 = "F_SP121";
SECTION_DEAD static char const* const stringBase_8037A401 = "F_SP122";
SECTION_DEAD static char const* const stringBase_8037A409 = "F_SP128";
#pragma pop
/* 80452100-80452104 000700 0004+00 1/1 0/0 0/0 .sdata2 @4761 */
SECTION_SDATA2 static f32 lit_4761 = 330.0f;
@@ -1317,6 +1353,21 @@ static asm void wether_move_star() {
}
#pragma pop
/* ############################################################################################## */
/* 8037A368-8037A368 0069C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A411 = "D_MN08";
SECTION_DEAD static char const* const stringBase_8037A418 = "D_MN08A";
SECTION_DEAD static char const* const stringBase_8037A420 = "D_MN08B";
SECTION_DEAD static char const* const stringBase_8037A428 = "D_MN08C";
SECTION_DEAD static char const* const stringBase_8037A430 = "F_SP115";
SECTION_DEAD static char const* const stringBase_8037A438 = "F_SP108";
SECTION_DEAD static char const* const stringBase_8037A440 = "F_SP116";
SECTION_DEAD static char const* const stringBase_8037A448 = "momiji64s3tc.bti";
SECTION_DEAD static char const* const stringBase_8037A459 = "sakura32ia4.bti";
#pragma pop
/* 80058F18-800593DC 053858 04C4+00 1/1 0/0 0/0 .text wether_move_housi__Fv */
#pragma push
#pragma optimization_level 0
@@ -1348,6 +1399,17 @@ static asm void wether_move_moya() {
#pragma pop
/* ############################################################################################## */
/* 8037A368-8037A368 0069C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A469 = "F_SP114";
SECTION_DEAD static char const* const stringBase_8037A471 = "D_MN09B";
SECTION_DEAD static char const* const stringBase_8037A479 = "F_SP104";
SECTION_DEAD static char const* const stringBase_8037A481 = "cloudtx_01.bti";
SECTION_DEAD static char const* const stringBase_8037A490 = "cloudtx_02.bti";
SECTION_DEAD static char const* const stringBase_8037A49F = "cloudtx_03.bti";
#pragma pop
/* 80424938-80424944 051658 000C+00 1/1 0/0 0/0 .bss @4965 */
static u8 lit_4965[12];
@@ -1423,6 +1485,13 @@ static asm void wether_move_evil() {
}
#pragma pop
/* ############################################################################################## */
/* 8037A368-8037A368 0069C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A4AE = "Name";
#pragma pop
/* 8005A0B8-8005A154 0549F8 009C+00 0/0 1/1 0/0 .text dKyw_wether_move_draw__Fv */
#pragma push
#pragma optimization_level 0
@@ -1464,6 +1533,14 @@ asm void dKyw_wether_draw2() {
#pragma pop
/* ############################################################################################## */
/* 8037A368-8037A368 0069C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8037A4B3 = "F_SP127";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8037A4BB = "\0\0\0\0";
#pragma pop
/* 80452164-80452168 000764 0004+00 1/1 0/0 0/0 .sdata2 @5361 */
SECTION_SDATA2 static f32 lit_5361 = 120.0f;
@@ -1752,43 +1829,4 @@ asm void dKyw_rain_set(int param_0) {
}
#pragma pop
/* 8037A368-8037A4C0 0069C8 0153+05 12/12 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8037A368 = "F_SP113";
SECTION_DEAD static char const* const stringBase_8037A370 = "D_MN07";
SECTION_DEAD static char const* const stringBase_8037A377 = "F_SP200";
SECTION_DEAD static char const* const stringBase_8037A37F = "D_MN09";
SECTION_DEAD static char const* const stringBase_8037A386 = "D_MN09A";
SECTION_DEAD static char const* const stringBase_8037A38E = "F_moon.bti";
SECTION_DEAD static char const* const stringBase_8037A399 = "F_moon_A.bti";
SECTION_DEAD static char const* const stringBase_8037A3A6 = "F_moon_A_A00.bti";
SECTION_DEAD static char const* const stringBase_8037A3B7 = "F_moon_A_A01.bti";
SECTION_DEAD static char const* const stringBase_8037A3C8 = "F_moon_A_A02.bti";
SECTION_DEAD static char const* const stringBase_8037A3D9 = "F_moon_A_A03.bti";
SECTION_DEAD static char const* const stringBase_8037A3EA = "Always";
SECTION_DEAD static char const* const stringBase_8037A3F1 = "R_SP127";
SECTION_DEAD static char const* const stringBase_8037A3F9 = "F_SP121";
SECTION_DEAD static char const* const stringBase_8037A401 = "F_SP122";
SECTION_DEAD static char const* const stringBase_8037A409 = "F_SP128";
SECTION_DEAD static char const* const stringBase_8037A411 = "D_MN08";
SECTION_DEAD static char const* const stringBase_8037A418 = "D_MN08A";
SECTION_DEAD static char const* const stringBase_8037A420 = "D_MN08B";
SECTION_DEAD static char const* const stringBase_8037A428 = "D_MN08C";
SECTION_DEAD static char const* const stringBase_8037A430 = "F_SP115";
SECTION_DEAD static char const* const stringBase_8037A438 = "F_SP108";
SECTION_DEAD static char const* const stringBase_8037A440 = "F_SP116";
SECTION_DEAD static char const* const stringBase_8037A448 = "momiji64s3tc.bti";
SECTION_DEAD static char const* const stringBase_8037A459 = "sakura32ia4.bti";
SECTION_DEAD static char const* const stringBase_8037A469 = "F_SP114";
SECTION_DEAD static char const* const stringBase_8037A471 = "D_MN09B";
SECTION_DEAD static char const* const stringBase_8037A479 = "F_SP104";
SECTION_DEAD static char const* const stringBase_8037A481 = "cloudtx_01.bti";
SECTION_DEAD static char const* const stringBase_8037A490 = "cloudtx_02.bti";
SECTION_DEAD static char const* const stringBase_8037A49F = "cloudtx_03.bti";
SECTION_DEAD static char const* const stringBase_8037A4AE = "Name";
SECTION_DEAD static char const* const stringBase_8037A4B3 = "F_SP127";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8037A4BB = "\0\0\0\0";
#pragma pop
/* 8037A368-8037A368 0069C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/map/d_map.cpp
+21 -15
View File
@@ -386,7 +386,7 @@ SECTION_RODATA static u8 const l_iconSize[68] = {
0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A,
0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A,
};
COMPILER_STRIP_GATE(80378E48, &l_iconSize);
COMPILER_STRIP_GATE(0x80378E48, &l_iconSize);
/* 800284BC-800284D0 022DFC 0014+00 2/0 0/0 0/0 .text getIconSize__15renderingAmap_cCFUc
*/
@@ -654,7 +654,7 @@ SECTION_RODATA static u8 const l_dungeon_offColor[36] = {
0x04, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00,
0x1C, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80378E8C, &l_dungeon_offColor);
COMPILER_STRIP_GATE(0x80378E8C, &l_dungeon_offColor);
#pragma pop
/* 80378EB0-80378ED4 005510 0024+00 0/1 0/0 0/0 .rodata l_dungeon_onColor$3938 */
@@ -665,7 +665,7 @@ SECTION_RODATA static u8 const l_dungeon_onColor[36] = {
0x04, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00,
0x3C, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80378EB0, &l_dungeon_onColor);
COMPILER_STRIP_GATE(0x80378EB0, &l_dungeon_onColor);
#pragma pop
/* 80378ED4-80378EF8 005534 0024+00 0/1 0/0 0/0 .rodata l_dungeon_stayColor$3939 */
@@ -676,7 +676,7 @@ SECTION_RODATA static u8 const l_dungeon_stayColor[36] = {
0x04, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00,
0x5C, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80378ED4, &l_dungeon_stayColor);
COMPILER_STRIP_GATE(0x80378ED4, &l_dungeon_stayColor);
#pragma pop
/* 80028DF4-80028EE4 023734 00F0+00 1/0 0/0 0/0 .text getColor__6dMap_cFi */
@@ -735,7 +735,7 @@ asm void renderingAmap_c::getLineColor(int param_0, int param_1) {
SECTION_RODATA static u8 const colorTable[16] = {
0xBC, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0xC4, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80378EF8, &colorTable);
COMPILER_STRIP_GATE(0x80378EF8, &colorTable);
/* 80028FB4-80029038 0238F4 0084+00 2/0 0/0 0/0 .text getDecoLineColor__15renderingAmap_cFii */
#pragma push
@@ -823,7 +823,7 @@ SECTION_RODATA static u8 const l_stayType[28] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80378F08, &l_stayType);
COMPILER_STRIP_GATE(0x80378F08, &l_stayType);
/* 80029160-80029190 023AA0 0030+00 7/7 0/0 0/0 .text getStayType__15renderingAmap_cCFv
*/
@@ -930,6 +930,12 @@ asm void dMap_c::resCopy() {
#pragma pop
/* ############################################################################################## */
/* 80378F24-80378F24 005584 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80378F24 = "Always";
#pragma pop
/* 803A6F6C-803A6F88 -00001 001C+00 1/1 0/0 0/0 .data @4694 */
SECTION_DATA static void* lit_4694[7] = {
(void*)(((char*)_move__6dMap_cFffif) + 0x350), (void*)(((char*)_move__6dMap_cFffif) + 0x388),
@@ -1190,6 +1196,14 @@ asm void dMap_c::isDrawRoomIcon(int param_0, int param_1) const {
#pragma pop
/* ############################################################################################## */
/* 80378F24-80378F24 005584 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80378F2B = "F_SP121";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80378F33 = "\0\0\0\0";
#pragma pop
/* 80451CEC-80451CF0 0002EC 0004+00 1/1 0/0 0/0 .sdata2 @4688 */
SECTION_SDATA2 static f32 lit_4688 = -3710.0f;
@@ -1425,12 +1439,4 @@ asm renderingDAmap_c::~renderingDAmap_c() {
}
#pragma pop
/* 80378F24-80378F38 005584 000F+05 2/2 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80378F24 = "Always";
SECTION_DEAD static char const* const stringBase_80378F2B = "F_SP121";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80378F33 = "\0\0\0\0";
#pragma pop
/* 80378F24-80378F24 005584 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/map/d_map_path.cpp
+11 -10
View File
@@ -179,7 +179,15 @@ SECTION_RODATA static u8 const data[28] = {
0x00, 0x00, 0x00, 0x4F, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x4D, 0x00, 0x00,
0x00, 0x4E, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x00, 0x00, 0x51, 0x00, 0x00, 0x00, 0x52,
};
COMPILER_STRIP_GATE(80379C30, &data);
COMPILER_STRIP_GATE(0x80379C30, &data);
/* 80379C4C-80379C4C 0062AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379C4C = "Always";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80379C53 = "\0\0\0\0";
#pragma pop
/* 8003C85C-8003C8F4 03719C 0098+00 0/0 1/1 0/0 .text create__Q28dMpath_n18dTexObjAggregate_cFv */
#pragma push
@@ -415,7 +423,7 @@ asm void __sinit_d_map_path_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_8003D6E4 = (void*)__sinit_d_map_path_cpp;
REGISTER_CTORS(0x8003D6E4, __sinit_d_map_path_cpp);
#pragma pop
/* 8003D740-8003D790 038080 0050+00 1/1 0/0 0/0 .text __dt__Q28dMpath_n18dTexObjAggregate_cFv */
@@ -479,11 +487,4 @@ SECTION_DATA extern void* __vt__11dDrawPath_c[16] = {
(void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class,
};
/* 80379C4C-80379C58 0062AC 0007+05 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80379C4C = "Always";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80379C53 = "\0\0\0\0";
#pragma pop
/* 80379C4C-80379C4C 0062AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/map/d_map_path_dmap.cpp
+14 -13
View File
@@ -24,8 +24,6 @@ struct renderingPlusDoor_c {
/* 8004145C */ void beforeDrawPath();
};
struct Vec {};
struct dTres_c {
struct data_s {};
@@ -38,6 +36,8 @@ struct dTres_c {
static u8 mTypeGroupListAll[204 + 4 /* padding */];
};
struct Vec {};
struct renderingPlusDoorAndCursor_c {
/* 8002B008 */ ~renderingPlusDoorAndCursor_c();
/* 800402FC */ void afterDrawPath();
@@ -641,15 +641,12 @@ u8 dMpath_c::isExistMapPathData() {
/* 80450630-80450634 0000B0 0004+00 0/0 1/1 2/2 .sdata mNextRoomNo__10dMapInfo_c */
SECTION_SDATA u32 dMapInfo_c::mNextRoomNo = 0xFFFFFFFF;
/* 80450634-80450638 -00001 0004+00 4/4 0/0 0/0 .sdata None */
SECTION_SDATA static u8 struct_80450634[4] = {
/* 80450634-80450636 -00001 0002+00 3/3 0/0 0/0 .sdata None */
SECTION_SDATA static u8 struct_80450634[2] = {
/* 80450634 0001+00 data_80450634 None */
0x7F,
/* 80450635 0001+00 data_80450635 None */
0x80,
/* 80450636 0002+00 data_80450636 None */
0x01,
0x00,
};
/* 8003F760-8003F7E8 03A0A0 0088+00 0/0 1/1 0/0 .text getTopBottomFloorNo__8dMpath_cFPScPSc */
@@ -703,6 +700,10 @@ asm void dMpath_c::create() {
}
#pragma pop
/* ############################################################################################## */
/* 80450636-80450638 0000B6 0002+00 2/2 0/0 0/0 .sdata None */
SECTION_SDATA static u16 data_80450636 = 0x0100;
/* 8003FBD0-8003FC70 03A510 00A0+00 2/2 0/0 0/0 .text reset__8dMpath_cFv */
#pragma push
#pragma optimization_level 0
@@ -1031,7 +1032,7 @@ SECTION_RODATA static u8 const l_100x100BoxVertexList[48] = {
0xC2, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80379C58, &l_100x100BoxVertexList);
COMPILER_STRIP_GATE(0x80379C58, &l_100x100BoxVertexList);
/* 80451E70-80451E74 000470 0004+00 1/1 0/0 0/0 .sdata2 @4484 */
SECTION_SDATA2 static f32 lit_4484 = 6.0f;
@@ -1135,7 +1136,7 @@ SECTION_RODATA static void* const l_treasureDispList_4524[12] = {
(void*)NULL, (void*)0x00000001, (void*)&l_treasureStartColor,
(void*)0x05000000, (void*)0x00000003, (void*)&l_destinationStartColor,
};
COMPILER_STRIP_GATE(80379C88, &l_treasureDispList_4524);
COMPILER_STRIP_GATE(0x80379C88, &l_treasureDispList_4524);
/* 80451E74-80451E78 000474 0004+00 1/0 0/0 0/0 .sdata2 l_entranceStartColor */
SECTION_SDATA2 static u32 l_entranceStartColor = 0x94000000;
@@ -1227,7 +1228,7 @@ SECTION_RODATA static void* const l_treasureDispList_4606[33] = {
(void*)0x04000000, (void*)0x00000004, (void*)&l_smallKeyStartColor,
(void*)0x03000000, (void*)0x00000004, (void*)&l_bossStartColor,
};
COMPILER_STRIP_GATE(80379CB8, &l_treasureDispList_4606);
COMPILER_STRIP_GATE(0x80379CB8, &l_treasureDispList_4606);
/* 80451EAC-80451EB4 0004AC 0008+00 1/1 0/0 0/0 .sdata2 l_iconTex0$4605 */
SECTION_SDATA2 static u8 l_iconTex0_4605[8] = {
@@ -1259,7 +1260,7 @@ SECTION_RODATA static u8 const l_iconPosData[32] = {
0xC2, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00,
0x42, 0x48, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80379D3C, &l_iconPosData);
COMPILER_STRIP_GATE(0x80379D3C, &l_iconPosData);
/* 80041208-800412C0 03BB48 00B8+00 2/2 0/0 0/0 .text
* drawIconSingle__28renderingPlusDoorAndCursor_cFRC3Vecff */
@@ -1280,7 +1281,7 @@ SECTION_RODATA static u8 const l_offset[36] = {
0xC3, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x70, 0x00, 0x00,
0x43, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x70, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80379D5C, &l_offset);
COMPILER_STRIP_GATE(0x80379D5C, &l_offset);
/* 80450638-80450640 0000B8 0004+04 1/1 0/0 0/0 .sdata l_cursorColor$4709 */
SECTION_SDATA static u8 l_cursorColor[4 + 4 /* padding */] = {
@@ -1331,7 +1332,7 @@ asm void __sinit_d_map_path_dmap_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_80041460 = (void*)__sinit_d_map_path_dmap_cpp;
REGISTER_CTORS(0x80041460, __sinit_d_map_path_dmap_cpp);
#pragma pop
/* ############################################################################################## */
src/d/menu/d_menu_calibration.cpp
+13 -11
View File
@@ -53,10 +53,10 @@ struct dMenu_Calibration_c {
/* 801AFBF4 */ void draw();
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -475,6 +475,15 @@ asm void dMenu_Calibration_c::setCalibrationValue() {
}
#pragma pop
/* ############################################################################################## */
/* 80394F70-80394F70 0215D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80394F70 = "";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80394F71 = "\0\0\0\0\0\0";
#pragma pop
/* 801AF738-801AF7E8 1AA078 00B0+00 6/6 0/0 0/0 .text setAButtonString__19dMenu_Calibration_cFUs
*/
#pragma push
@@ -550,14 +559,7 @@ asm void __sinit_d_menu_calibration_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801AFC14 = (void*)__sinit_d_menu_calibration_cpp;
REGISTER_CTORS(0x801AFC14, __sinit_d_menu_calibration_cpp);
#pragma pop
/* 80394F70-80394F78 0215D0 0001+07 4/4 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80394F70 = "";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80394F71 = "\0\0\0\0\0\0";
#pragma pop
/* 80394F70-80394F70 0215D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_collect.cpp
+64 -58
View File
@@ -19,14 +19,14 @@ struct mDoGph_gInf_c {
static u8 mFader[4];
};
struct J3DMaterialTable {};
struct J3DModelData {};
struct J3DAnmTevRegKey {
/* 8032B87C */ void searchUpdateMaterialID(J3DModelData*);
};
struct J3DMaterialTable {};
struct mDoExt_brkAnm {
/* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16);
/* 8000D7A8 */ void entry(J3DMaterialTable*, f32);
@@ -128,6 +128,8 @@ struct STControl {
/* 800325A0 */ void checkDownTrigger();
};
struct CSTControl {};
struct JKRHeap {
/* 802CE5CC */ void freeAll();
/* 802CE784 */ void getTotalFreeSize();
@@ -137,8 +139,6 @@ struct JKRExpHeap {
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
};
struct CSTControl {};
struct dMenu_Skill_c {
/* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*);
/* 801F7718 */ void _move();
@@ -305,10 +305,10 @@ struct dDlst_list_c {
/* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -709,6 +709,30 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
/* ############################################################################################## */
/* 80395330-80395330 021990 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80395330 = "zelda_collect_soubi_screen.blo";
SECTION_DEAD static char const* const stringBase_8039534F = "zelda_collect_soubi_do_icon_parts.blo";
SECTION_DEAD static char const* const stringBase_80395375 = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_80395385 = "";
SECTION_DEAD static char const* const stringBase_80395386 = "zelda_collect_soubi_screen.btk";
SECTION_DEAD static char const* const stringBase_803953A5 = "md_mask_parts_spin_1.bck";
SECTION_DEAD static char const* const stringBase_803953BE = "md_mask_parts_spin_2.bck";
SECTION_DEAD static char const* const stringBase_803953D7 = "md_mask_parts_spin_3.bck";
SECTION_DEAD static char const* const stringBase_803953F0 = "md_mask_parts_spin_4.bck";
SECTION_DEAD static char const* const stringBase_80395409 = "md_mask_parts_spin_1.brk";
SECTION_DEAD static char const* const stringBase_80395422 = "md_mask_parts_spin_2_3.brk";
SECTION_DEAD static char const* const stringBase_8039543D = "md_mask_parts_spin_4.brk";
SECTION_DEAD static char const* const stringBase_80395456 = "md_mask_UI.bmd";
SECTION_DEAD static char const* const stringBase_80395465 = "kageri_mirrer_spin_1.bck";
SECTION_DEAD static char const* const stringBase_8039547E = "kageri_mirrer_spin_2.bck";
SECTION_DEAD static char const* const stringBase_80395497 = "kageri_mirrer_spin_3.bck";
SECTION_DEAD static char const* const stringBase_803954B0 = "kageri_mirrer_spin_4.bck";
SECTION_DEAD static char const* const stringBase_803954C9 = "kageri_mirrer_spin_1.brk";
SECTION_DEAD static char const* const stringBase_803954E2 = "kageri_mirrer_spin_2_3_4.brk";
#pragma pop
/* 803BC380-803BC38C 0194A0 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1332,7 +1356,7 @@ SECTION_RODATA static u8 const lit_3778[12 + 4 /* padding */] = {
0x00,
0x00,
};
COMPILER_STRIP_GATE(80394F78, &lit_3778);
COMPILER_STRIP_GATE(0x80394F78, &lit_3778);
/* 80394F88-80394FA0 0215E8 0018+00 0/1 0/0 0/0 .rodata text_sv$4768 */
#pragma push
@@ -1341,7 +1365,7 @@ SECTION_RODATA static u8 const text_sv[24] = {
0x00, 0x00, 0x00, 0x73, 0x61, 0x76, 0x5F, 0x30, 0x00, 0x00, 0x00, 0x73,
0x61, 0x76, 0x5F, 0x31, 0x00, 0x00, 0x00, 0x73, 0x61, 0x76, 0x5F, 0x32,
};
COMPILER_STRIP_GATE(80394F88, &text_sv);
COMPILER_STRIP_GATE(0x80394F88, &text_sv);
#pragma pop
/* 80394FA0-80394FB8 021600 0018+00 0/1 0/0 0/0 .rodata text_op$4769 */
@@ -1351,7 +1375,7 @@ SECTION_RODATA static u8 const text_op[24] = {
0x00, 0x00, 0x00, 0x6F, 0x70, 0x74, 0x5F, 0x30, 0x00, 0x00, 0x00, 0x6F,
0x70, 0x74, 0x5F, 0x31, 0x00, 0x00, 0x00, 0x6F, 0x70, 0x74, 0x5F, 0x32,
};
COMPILER_STRIP_GATE(80394FA0, &text_op);
COMPILER_STRIP_GATE(0x80394FA0, &text_op);
#pragma pop
/* 80394FB8-80394FD0 021618 0018+00 0/1 0/0 0/0 .rodata ftext_sv$4770 */
@@ -1361,7 +1385,7 @@ SECTION_RODATA static u8 const ftext_sv[24] = {
0x00, 0x66, 0x5F, 0x73, 0x61, 0x76, 0x5F, 0x30, 0x00, 0x66, 0x5F, 0x73,
0x61, 0x76, 0x5F, 0x31, 0x00, 0x66, 0x5F, 0x73, 0x61, 0x76, 0x5F, 0x32,
};
COMPILER_STRIP_GATE(80394FB8, &ftext_sv);
COMPILER_STRIP_GATE(0x80394FB8, &ftext_sv);
#pragma pop
/* 80394FD0-80394FE8 021630 0018+00 0/1 0/0 0/0 .rodata ftext_op$4771 */
@@ -1371,7 +1395,7 @@ SECTION_RODATA static u8 const ftext_op[24] = {
0x00, 0x66, 0x5F, 0x6F, 0x70, 0x74, 0x5F, 0x30, 0x00, 0x66, 0x5F, 0x6F,
0x70, 0x74, 0x5F, 0x31, 0x00, 0x66, 0x5F, 0x6F, 0x70, 0x74, 0x5F, 0x32,
};
COMPILER_STRIP_GATE(80394FD0, &ftext_op);
COMPILER_STRIP_GATE(0x80394FD0, &ftext_op);
#pragma pop
/* 80394FE8-80395010 021648 0028+00 0/1 0/0 0/0 .rodata text_a_tag$4777 */
@@ -1382,7 +1406,7 @@ SECTION_RODATA static u8 const text_a_tag_4777[40] = {
0x5F, 0x32, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x61, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80394FE8, &text_a_tag_4777);
COMPILER_STRIP_GATE(0x80394FE8, &text_a_tag_4777);
#pragma pop
/* 80395010-80395038 021670 0028+00 0/1 0/0 0/0 .rodata text_b_tag$4778 */
@@ -1393,7 +1417,7 @@ SECTION_RODATA static u8 const text_b_tag_4778[40] = {
0x5F, 0x32, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x62, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80395010, &text_b_tag_4778);
COMPILER_STRIP_GATE(0x80395010, &text_b_tag_4778);
#pragma pop
/* 80453F30-80453F34 002530 0004+00 2/2 0/0 0/0 .sdata2 @5173 */
@@ -1476,7 +1500,7 @@ SECTION_RODATA static u8 const lit_5343[9 + 3 /* padding */] = {
0x00,
0x00,
};
COMPILER_STRIP_GATE(80395038, &lit_5343);
COMPILER_STRIP_GATE(0x80395038, &lit_5343);
/* 80395044-80395050 0216A4 0009+03 1/1 0/0 0/0 .rodata @5344 */
SECTION_RODATA static u8 const lit_5344[9 + 3 /* padding */] = {
@@ -1494,7 +1518,7 @@ SECTION_RODATA static u8 const lit_5344[9 + 3 /* padding */] = {
0x00,
0x00,
};
COMPILER_STRIP_GATE(80395044, &lit_5344);
COMPILER_STRIP_GATE(0x80395044, &lit_5344);
/* 80453F50-80453F54 002550 0004+00 1/1 0/0 0/0 .sdata2 @5402 */
SECTION_SDATA2 static u32 lit_5402 = 0x03020301;
@@ -1615,7 +1639,7 @@ SECTION_RODATA static u8 const smell_tag[40] = {
0x68, 0x69, 0x77, 0x6F, 0x6C, 0x66, 0x5F, 0x66, 0x69, 0x73, 0x77, 0x6F, 0x6C, 0x66,
0x5F, 0x69, 0x72, 0x69, 0x77, 0x6F, 0x6C, 0x66, 0x5F, 0x70, 0x6F, 0x75,
};
COMPILER_STRIP_GATE(80395050, &smell_tag);
COMPILER_STRIP_GATE(0x80395050, &smell_tag);
/* 801B3524-801B3640 1ADE64 011C+00 1/1 0/0 0/0 .text setSmellType__17dMenu_Collect2D_cFv
*/
@@ -1634,7 +1658,7 @@ SECTION_RODATA static u8 const heart_tag[32] = {
0x68, 0x65, 0x61, 0x72, 0x74, 0x5F, 0x31, 0x6E, 0x68, 0x65, 0x61, 0x72, 0x74, 0x5F, 0x32, 0x6E,
0x68, 0x65, 0x61, 0x72, 0x74, 0x5F, 0x33, 0x6E, 0x68, 0x65, 0x61, 0x72, 0x74, 0x5F, 0x34, 0x6E,
};
COMPILER_STRIP_GATE(80395078, &heart_tag);
COMPILER_STRIP_GATE(0x80395078, &heart_tag);
/* 801B3640-801B370C 1ADF80 00CC+00 1/1 0/0 0/0 .text setHeartPiece__17dMenu_Collect2D_cFv */
#pragma push
@@ -1661,7 +1685,7 @@ asm void dMenu_Collect2D_c::setPohMaxNum(u8 param_0) {
SECTION_RODATA static u8 const tag_5980[16] = {
0x00, 0x6B, 0x65, 0x6E, 0x5F, 0x67, 0x5F, 0x30, 0x00, 0x6B, 0x65, 0x6E, 0x5F, 0x67, 0x5F, 0x31,
};
COMPILER_STRIP_GATE(80395098, &tag_5980);
COMPILER_STRIP_GATE(0x80395098, &tag_5980);
/* 801B39D0-801B3CF4 1AE310 0324+00 2/2 0/0 0/0 .text
* setEquipItemFrameColorSword__17dMenu_Collect2D_cFi */
@@ -1679,7 +1703,7 @@ asm void dMenu_Collect2D_c::setEquipItemFrameColorSword(int param_0) {
SECTION_RODATA static u8 const tag_6100[16] = {
0x74, 0x61, 0x74, 0x65, 0x5F, 0x67, 0x5F, 0x30, 0x74, 0x61, 0x74, 0x65, 0x5F, 0x67, 0x5F, 0x31,
};
COMPILER_STRIP_GATE(803950A8, &tag_6100);
COMPILER_STRIP_GATE(0x803950A8, &tag_6100);
/* 801B3CF4-801B3FDC 1AE634 02E8+00 2/2 0/0 0/0 .text
* setEquipItemFrameColorShield__17dMenu_Collect2D_cFi */
@@ -1698,7 +1722,7 @@ SECTION_RODATA static u8 const tag_6213[24] = {
0x66, 0x75, 0x6B, 0x75, 0x5F, 0x67, 0x5F, 0x30, 0x66, 0x75, 0x6B, 0x75,
0x5F, 0x67, 0x5F, 0x31, 0x66, 0x75, 0x6B, 0x75, 0x5F, 0x67, 0x5F, 0x32,
};
COMPILER_STRIP_GATE(803950B8, &tag_6213);
COMPILER_STRIP_GATE(0x803950B8, &tag_6213);
/* 801B3FDC-801B42D8 1AE91C 02FC+00 2/2 0/0 0/0 .text
* setEquipItemFrameColorClothes__17dMenu_Collect2D_cFi */
@@ -1720,7 +1744,7 @@ SECTION_RODATA static u8 const kaz_n[72] = {
0x5F, 0x30, 0x35, 0x00, 0x00, 0x75, 0x7A, 0x75, 0x5F, 0x30, 0x36, 0x00, 0x00, 0x75, 0x7A,
0x75, 0x5F, 0x30, 0x37, 0x00, 0x00, 0x00, 0x68, 0x69, 0x73, 0x68, 0x69,
};
COMPILER_STRIP_GATE(803950D0, &kaz_n);
COMPILER_STRIP_GATE(0x803950D0, &kaz_n);
/* 801B42D8-801B46FC 1AEC18 0424+00 2/2 0/0 0/0 .text setHIO__17dMenu_Collect2D_cFb */
#pragma push
@@ -1757,7 +1781,7 @@ SECTION_RODATA static u8 const itemTag[336] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80395118, &itemTag);
COMPILER_STRIP_GATE(0x80395118, &itemTag);
/* 801B46FC-801B473C 1AF03C 0040+00 3/3 0/0 0/0 .text getItemTag__17dMenu_Collect2D_cFiib
*/
@@ -2204,7 +2228,7 @@ SECTION_RODATA static u8 const text_a_tag_7111[40] = {
0x5F, 0x32, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x61, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80395268, &text_a_tag_7111);
COMPILER_STRIP_GATE(0x80395268, &text_a_tag_7111);
/* 801B5FB4-801B60B8 1B08F4 0104+00 20/20 0/0 0/0 .text setAButtonString__17dMenu_Collect2D_cFUs
*/
@@ -2224,7 +2248,7 @@ SECTION_RODATA static u8 const text_b_tag_7134[40] = {
0x5F, 0x32, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x62, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80395290, &text_b_tag_7134);
COMPILER_STRIP_GATE(0x80395290, &text_b_tag_7134);
/* 801B60B8-801B61BC 1B09F8 0104+00 20/20 0/0 0/0 .text setBButtonString__17dMenu_Collect2D_cFUs
*/
@@ -2423,7 +2447,7 @@ SECTION_RODATA static u8 const m_kamen_offset_x[20] = {
0xC1, 0x60, 0x00, 0x00, 0xC1, 0x60, 0x00, 0x00, 0xC1, 0x60,
0x00, 0x00, 0x3F, 0xA6, 0x66, 0x66, 0x40, 0xD0, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803952B8, &m_kamen_offset_x);
COMPILER_STRIP_GATE(0x803952B8, &m_kamen_offset_x);
#pragma pop
/* 803952CC-803952E0 02192C 0014+00 0/1 0/0 0/0 .rodata m_kamen_offset_y$7579 */
@@ -2433,7 +2457,7 @@ SECTION_RODATA static u8 const m_kamen_offset_y[20] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x41, 0xB0, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803952CC, &m_kamen_offset_y);
COMPILER_STRIP_GATE(0x803952CC, &m_kamen_offset_y);
#pragma pop
/* 803952E0-803952F4 021940 0014+00 0/1 0/0 0/0 .rodata m_kamen_scale$7580 */
@@ -2443,7 +2467,7 @@ SECTION_RODATA static u8 const m_kamen_scale[20] = {
0x40, 0x26, 0x66, 0x66, 0x40, 0x26, 0x66, 0x66, 0x40, 0x0C,
0xCC, 0xCD, 0x3F, 0xE6, 0x66, 0x66, 0x3F, 0xE6, 0x66, 0x66,
};
COMPILER_STRIP_GATE(803952E0, &m_kamen_scale);
COMPILER_STRIP_GATE(0x803952E0, &m_kamen_scale);
#pragma pop
/* 801B7014-801B71C4 1B1954 01B0+00 1/1 0/0 0/0 .text createMaskModel__17dMenu_Collect3D_cFv */
@@ -2464,7 +2488,7 @@ SECTION_RODATA static u8 const m_mirror_offset_x[20] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803952F4, &m_mirror_offset_x);
COMPILER_STRIP_GATE(0x803952F4, &m_mirror_offset_x);
#pragma pop
/* 80395308-8039531C 021968 0014+00 0/1 0/0 0/0 .rodata m_mirror_offset_y$7683 */
@@ -2474,7 +2498,7 @@ SECTION_RODATA static u8 const m_mirror_offset_y[20] = {
0x40, 0x80, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x40, 0x80,
0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80395308, &m_mirror_offset_y);
COMPILER_STRIP_GATE(0x80395308, &m_mirror_offset_y);
#pragma pop
/* 8039531C-80395330 02197C 0014+00 0/1 0/0 0/0 .rodata m_mirror_scale$7684 */
@@ -2484,7 +2508,15 @@ SECTION_RODATA static u8 const m_mirror_scale[20] = {
0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x19,
0x99, 0x9A, 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x19, 0x99, 0x9A,
};
COMPILER_STRIP_GATE(8039531C, &m_mirror_scale);
COMPILER_STRIP_GATE(0x8039531C, &m_mirror_scale);
#pragma pop
/* 80395330-80395330 021990 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803954FF = "kageri_mirrer_UI.bmd";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80395514 = "\0\0\0";
#pragma pop
/* 801B71C4-801B7434 1B1B04 0270+00 1/1 0/0 0/0 .text createMirrorModel__17dMenu_Collect3D_cFv */
@@ -2677,7 +2709,7 @@ asm void __sinit_d_menu_collect_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801B7B14 = (void*)__sinit_d_menu_collect_cpp;
REGISTER_CTORS(0x801B7B14, __sinit_d_menu_collect_cpp);
#pragma pop
/* 801B7EB8-801B7F00 1B27F8 0048+00 1/0 0/0 0/0 .text __dt__20dMenu_Collect2DTop_cFv */
@@ -2700,30 +2732,4 @@ asm void dMenu_Collect2D_c::draw() {
}
#pragma pop
/* 80395330-80395518 021990 01E4+04 13/9 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80395330 = "zelda_collect_soubi_screen.blo";
SECTION_DEAD static char const* const stringBase_8039534F = "zelda_collect_soubi_do_icon_parts.blo";
SECTION_DEAD static char const* const stringBase_80395375 = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_80395385 = "";
SECTION_DEAD static char const* const stringBase_80395386 = "zelda_collect_soubi_screen.btk";
SECTION_DEAD static char const* const stringBase_803953A5 = "md_mask_parts_spin_1.bck";
SECTION_DEAD static char const* const stringBase_803953BE = "md_mask_parts_spin_2.bck";
SECTION_DEAD static char const* const stringBase_803953D7 = "md_mask_parts_spin_3.bck";
SECTION_DEAD static char const* const stringBase_803953F0 = "md_mask_parts_spin_4.bck";
SECTION_DEAD static char const* const stringBase_80395409 = "md_mask_parts_spin_1.brk";
SECTION_DEAD static char const* const stringBase_80395422 = "md_mask_parts_spin_2_3.brk";
SECTION_DEAD static char const* const stringBase_8039543D = "md_mask_parts_spin_4.brk";
SECTION_DEAD static char const* const stringBase_80395456 = "md_mask_UI.bmd";
SECTION_DEAD static char const* const stringBase_80395465 = "kageri_mirrer_spin_1.bck";
SECTION_DEAD static char const* const stringBase_8039547E = "kageri_mirrer_spin_2.bck";
SECTION_DEAD static char const* const stringBase_80395497 = "kageri_mirrer_spin_3.bck";
SECTION_DEAD static char const* const stringBase_803954B0 = "kageri_mirrer_spin_4.bck";
SECTION_DEAD static char const* const stringBase_803954C9 = "kageri_mirrer_spin_1.brk";
SECTION_DEAD static char const* const stringBase_803954E2 = "kageri_mirrer_spin_2_3_4.brk";
SECTION_DEAD static char const* const stringBase_803954FF = "kageri_mirrer_UI.bmd";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80395514 = "\0\0\0";
#pragma pop
/* 80395330-80395330 021990 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_dmap.cpp
+66 -39
View File
@@ -140,8 +140,6 @@ struct dMenu_StageMapCtrl_c {
/* 801C2590 */ void setPlusZoomCenterZ(f32);
};
struct J2DOrthoGraph {};
struct STControl {
/* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16);
/* 8003219C */ void checkTrigger();
@@ -151,6 +149,8 @@ struct STControl {
/* 800325A0 */ void checkDownTrigger();
};
struct J2DOrthoGraph {};
struct JKRExpHeap {
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
};
@@ -291,10 +291,10 @@ struct dDlst_list_c {
/* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
/* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
@@ -602,6 +602,12 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
/* ############################################################################################## */
/* 80395760-80395760 021DC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80395760 = "/res/FieldMap/D_MN10.arc";
#pragma pop
/* 803BC7E0-803BC7EC 019900 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1170,6 +1176,13 @@ asm dMenu_DmapBg_c::dMenu_DmapBg_c(JKRExpHeap* param_0, STControl* param_1) {
#pragma pop
/* ############################################################################################## */
/* 80395760-80395760 021DC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80395779 = "zelda_dungeon_map_map.blo";
SECTION_DEAD static char const* const stringBase_80395793 = "zelda_dungeon_map_map.btk";
#pragma pop
/* 80453FF0-80453FF4 0025F0 0004+00 1/1 0/0 0/0 .sdata2 @4073 */
SECTION_SDATA2 static f32 lit_4073 = -15.0f;
@@ -1243,7 +1256,7 @@ SECTION_RODATA static u8 const cont_at_4145[40] = {
0x74, 0x31, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74,
0x5F, 0x61, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x34,
};
COMPILER_STRIP_GATE(80395518, &cont_at_4145);
COMPILER_STRIP_GATE(0x80395518, &cont_at_4145);
/* 80395540-80395568 021BA0 0028+00 0/1 0/0 0/0 .rodata cont_bt$4146 */
#pragma push
@@ -1253,7 +1266,7 @@ SECTION_RODATA static u8 const cont_bt_4146[40] = {
0x74, 0x31, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74,
0x5F, 0x62, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x34,
};
COMPILER_STRIP_GATE(80395540, &cont_bt_4146);
COMPILER_STRIP_GATE(0x80395540, &cont_bt_4146);
#pragma pop
/* 80395568-80395590 021BC8 0028+00 0/1 0/0 0/0 .rodata font_at$4147 */
@@ -1264,7 +1277,7 @@ SECTION_RODATA static u8 const font_at[40] = {
0x74, 0x31, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74,
0x5F, 0x61, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x34,
};
COMPILER_STRIP_GATE(80395568, &font_at);
COMPILER_STRIP_GATE(0x80395568, &font_at);
#pragma pop
/* 80395590-803955B8 021BF0 0028+00 0/1 0/0 0/0 .rodata font_bt$4148 */
@@ -1275,7 +1288,7 @@ SECTION_RODATA static u8 const font_bt[40] = {
0x74, 0x31, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74,
0x5F, 0x62, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x34,
};
COMPILER_STRIP_GATE(80395590, &font_bt);
COMPILER_STRIP_GATE(0x80395590, &font_bt);
#pragma pop
/* 803955B8-803955C8 021C18 0010+00 0/1 0/0 0/0 .rodata c_tag$4155 */
@@ -1284,7 +1297,14 @@ COMPILER_STRIP_GATE(80395590, &font_bt);
SECTION_RODATA static u8 const c_tag_4155[16] = {
0x66, 0x5F, 0x74, 0x65, 0x78, 0x74, 0x5F, 0x73, 0x00, 0x00, 0x66, 0x5F, 0x74, 0x65, 0x78, 0x74,
};
COMPILER_STRIP_GATE(803955B8, &c_tag_4155);
COMPILER_STRIP_GATE(0x803955B8, &c_tag_4155);
#pragma pop
/* 80395760-80395760 021DC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803957AD = "zelda_dungeon_map_spot_button.blo";
SECTION_DEAD static char const* const stringBase_803957CF = "";
#pragma pop
/* 80454004-80454008 002604 0004+00 1/1 0/0 0/0 .sdata2 @4191 */
@@ -1310,7 +1330,7 @@ SECTION_RODATA static u8 const cont_at_4196[40] = {
0x74, 0x31, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74,
0x5F, 0x61, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x34,
};
COMPILER_STRIP_GATE(803955C8, &cont_at_4196);
COMPILER_STRIP_GATE(0x803955C8, &cont_at_4196);
/* 801B8DE4-801B8EBC 1B3724 00D8+00 7/7 0/0 0/0 .text setAButtonString__14dMenu_DmapBg_cFUl */
#pragma push
@@ -1329,7 +1349,7 @@ SECTION_RODATA static u8 const cont_bt_4211[40] = {
0x74, 0x31, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74,
0x5F, 0x62, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x34,
};
COMPILER_STRIP_GATE(803955F0, &cont_bt_4211);
COMPILER_STRIP_GATE(0x803955F0, &cont_bt_4211);
/* 801B8EBC-801B8F94 1B37FC 00D8+00 8/8 0/0 0/0 .text setBButtonString__14dMenu_DmapBg_cFUl */
#pragma push
@@ -1346,7 +1366,7 @@ asm void dMenu_DmapBg_c::setBButtonString(u32 param_0) {
SECTION_RODATA static u8 const c_tag_4229[16] = {
0x66, 0x5F, 0x74, 0x65, 0x78, 0x74, 0x5F, 0x73, 0x00, 0x00, 0x66, 0x5F, 0x74, 0x65, 0x78, 0x74,
};
COMPILER_STRIP_GATE(80395618, &c_tag_4229);
COMPILER_STRIP_GATE(0x80395618, &c_tag_4229);
/* 80451078-8045107C 000578 0004+00 1/1 0/0 0/0 .sbss player_px */
static f32 player_px;
@@ -1403,6 +1423,13 @@ asm void dMenu_DmapBg_c::deleteExplain() {
#pragma pop
/* ############################################################################################## */
/* 80395760-80395760 021DC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803957D0 = "zelda_dungeon_map_base.blo";
SECTION_DEAD static char const* const stringBase_803957EB = "zelda_dungeon_map_floor_parts.blo";
#pragma pop
/* 80454010-80454014 002610 0004+00 1/1 0/0 0/0 .sdata2 @4312 */
SECTION_SDATA2 static f32 lit_4312 = 19.0f / 20.0f;
@@ -1463,7 +1490,7 @@ SECTION_RODATA static u8 const lit_4325[26 + 6 /* padding */] = {
0x00,
0x00,
};
COMPILER_STRIP_GATE(80395628, &lit_4325);
COMPILER_STRIP_GATE(0x80395628, &lit_4325);
/* 801B944C-801BA0B4 1B3D8C 0C68+00 1/1 0/0 0/0 .text setFloorMessage__14dMenu_DmapBg_cFv
*/
@@ -1575,6 +1602,13 @@ asm void dMenu_DmapBg_c::draw() {
#pragma pop
/* ############################################################################################## */
/* 80395760-80395760 021DC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039580D = "tex/bg.bti";
SECTION_DEAD static char const* const stringBase_80395818 = "spec/spec.dat";
#pragma pop
/* 80454040-80454044 002640 0004+00 1/1 0/0 0/0 .sdata2 @4848 */
SECTION_SDATA2 static f32 lit_4848 = 25.5f;
@@ -1632,7 +1666,7 @@ SECTION_RODATA static u8 const floor_tag[64] = {
0x66, 0x6C, 0x6F, 0x6F, 0x72, 0x33, 0x5F, 0x6E, 0x66, 0x6C, 0x6F, 0x6F, 0x72, 0x34, 0x5F, 0x6E,
0x66, 0x6C, 0x6F, 0x6F, 0x72, 0x35, 0x5F, 0x6E, 0x66, 0x6C, 0x6F, 0x6F, 0x72, 0x36, 0x5F, 0x6E,
};
COMPILER_STRIP_GATE(80395648, &floor_tag);
COMPILER_STRIP_GATE(0x80395648, &floor_tag);
#pragma pop
/* 80395688-803956C8 021CE8 0040+00 0/1 0/0 0/0 .rodata icon_tag$4933 */
@@ -1644,7 +1678,7 @@ SECTION_RODATA static u8 const icon_tag[64] = {
0x69, 0x63, 0x6F, 0x5F, 0x73, 0x65, 0x74, 0x33, 0x69, 0x63, 0x6F, 0x5F, 0x73, 0x65, 0x74, 0x34,
0x69, 0x63, 0x6F, 0x5F, 0x73, 0x65, 0x74, 0x35, 0x69, 0x63, 0x6F, 0x5F, 0x73, 0x65, 0x74, 0x36,
};
COMPILER_STRIP_GATE(80395688, &icon_tag);
COMPILER_STRIP_GATE(0x80395688, &icon_tag);
#pragma pop
/* 803956C8-80395708 021D28 0040+00 0/1 0/0 0/0 .rodata boss_tag$4934 */
@@ -1656,7 +1690,7 @@ SECTION_RODATA static u8 const boss_tag[64] = {
0x69, 0x63, 0x5F, 0x73, 0x74, 0x5F, 0x62, 0x33, 0x69, 0x63, 0x5F, 0x73, 0x74, 0x5F, 0x62, 0x34,
0x69, 0x63, 0x5F, 0x73, 0x74, 0x5F, 0x62, 0x35, 0x69, 0x63, 0x5F, 0x73, 0x74, 0x5F, 0x62, 0x36,
};
COMPILER_STRIP_GATE(803956C8, &boss_tag);
COMPILER_STRIP_GATE(0x803956C8, &boss_tag);
#pragma pop
/* 80395708-80395718 021D68 0010+00 0/1 0/0 0/0 .rodata stay_tag$4935 */
@@ -1665,7 +1699,7 @@ COMPILER_STRIP_GATE(803956C8, &boss_tag);
SECTION_RODATA static u8 const stay_tag[16] = {
0x72, 0x69, 0x6E, 0x6B, 0x5F, 0x6E, 0x75, 0x6C, 0x62, 0x6F, 0x73, 0x73, 0x5F, 0x6E, 0x75, 0x6C,
};
COMPILER_STRIP_GATE(80395708, &stay_tag);
COMPILER_STRIP_GATE(0x80395708, &stay_tag);
#pragma pop
/* 80395718-80395730 021D78 0018+00 0/1 0/0 0/0 .rodata waku_tag$4973 */
@@ -1675,7 +1709,7 @@ SECTION_RODATA static u8 const waku_tag[24] = {
0x67, 0x72, 0x61, 0x79, 0x5F, 0x6D, 0x61, 0x70, 0x67, 0x72, 0x61, 0x79,
0x5F, 0x63, 0x6F, 0x6E, 0x67, 0x72, 0x61, 0x79, 0x5F, 0x6B, 0x65, 0x79,
};
COMPILER_STRIP_GATE(80395718, &waku_tag);
COMPILER_STRIP_GATE(0x80395718, &waku_tag);
#pragma pop
/* 80395730-80395748 021D90 0018+00 0/1 0/0 0/0 .rodata key_tag$5002 */
@@ -1685,7 +1719,7 @@ SECTION_RODATA static u8 const key_tag[24] = {
0x00, 0x00, 0x6B, 0x65, 0x79, 0x5F, 0x30, 0x30, 0x00, 0x00, 0x6B, 0x65,
0x79, 0x5F, 0x30, 0x31, 0x00, 0x00, 0x6B, 0x65, 0x79, 0x5F, 0x30, 0x32,
};
COMPILER_STRIP_GATE(80395730, &key_tag);
COMPILER_STRIP_GATE(0x80395730, &key_tag);
#pragma pop
/* 80395748-80395760 021DA8 0018+00 0/1 0/0 0/0 .rodata item_tag$5040 */
@@ -1695,7 +1729,7 @@ SECTION_RODATA static u8 const item_tag[24] = {
0x00, 0x00, 0x6D, 0x61, 0x70, 0x30, 0x30, 0x30, 0x00, 0x00, 0x63, 0x6F,
0x6E, 0x30, 0x30, 0x30, 0x00, 0x69, 0x5F, 0x6B, 0x65, 0x79, 0x5F, 0x6E,
};
COMPILER_STRIP_GATE(80395748, &item_tag);
COMPILER_STRIP_GATE(0x80395748, &item_tag);
#pragma pop
/* 8045404C-80454050 00264C 0004+00 1/1 0/0 0/0 .sdata2 @5277 */
@@ -1913,6 +1947,16 @@ asm void dMenu_Dmap_c::mapControl() {
}
#pragma pop
/* ############################################################################################## */
/* 80395760-80395760 021DC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80395826 = "/res/FieldMap/res-d.arc";
SECTION_DEAD static char const* const stringBase_8039583E = "dat/data.dat";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039584B = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
#pragma pop
/* 801BE328-801BE670 1B8C68 0348+00 0/0 1/1 0/0 .text isOpen__12dMenu_Dmap_cFv */
#pragma push
#pragma optimization_level 0
@@ -2304,7 +2348,7 @@ asm void __sinit_d_menu_dmap_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801C05C4 = (void*)__sinit_d_menu_dmap_cpp;
REGISTER_CTORS(0x801C05C4, __sinit_d_menu_dmap_cpp);
#pragma pop
/* 801C0844-801C084C 1BB184 0008+00 1/0 0/0 0/0 .text @4@__dt__14dMenu_DmapBg_cFv */
@@ -2317,21 +2361,4 @@ static asm void func_801C0844() {
}
#pragma pop
/* 80395760-80395860 021DC0 00EB+15 10/10 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80395760 = "/res/FieldMap/D_MN10.arc";
SECTION_DEAD static char const* const stringBase_80395779 = "zelda_dungeon_map_map.blo";
SECTION_DEAD static char const* const stringBase_80395793 = "zelda_dungeon_map_map.btk";
SECTION_DEAD static char const* const stringBase_803957AD = "zelda_dungeon_map_spot_button.blo";
SECTION_DEAD static char const* const stringBase_803957CF = "";
SECTION_DEAD static char const* const stringBase_803957D0 = "zelda_dungeon_map_base.blo";
SECTION_DEAD static char const* const stringBase_803957EB = "zelda_dungeon_map_floor_parts.blo";
SECTION_DEAD static char const* const stringBase_8039580D = "tex/bg.bti";
SECTION_DEAD static char const* const stringBase_80395818 = "spec/spec.dat";
SECTION_DEAD static char const* const stringBase_80395826 = "/res/FieldMap/res-d.arc";
SECTION_DEAD static char const* const stringBase_8039583E = "dat/data.dat";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039584B = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
#pragma pop
/* 80395760-80395760 021DC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_dmap_map.cpp
+5 -5
View File
@@ -631,7 +631,7 @@ SECTION_RODATA static void* const l_paletteDmap_m[60] = {
(void*)NULL,
(void*)NULL,
};
COMPILER_STRIP_GATE(80395860, &l_paletteDmap_m);
COMPILER_STRIP_GATE(0x80395860, &l_paletteDmap_m);
/* 80395950-80395974 021FB0 0024+00 0/1 0/0 0/0 .rodata l_dungeon_offColor$3841 */
#pragma push
@@ -641,7 +641,7 @@ SECTION_RODATA static u8 const l_dungeon_offColor[36] = {
0x04, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00,
0x1C, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80395950, &l_dungeon_offColor);
COMPILER_STRIP_GATE(0x80395950, &l_dungeon_offColor);
#pragma pop
/* 80395974-80395998 021FD4 0024+00 0/1 0/0 0/0 .rodata l_dungeon_onColor$3842 */
@@ -652,7 +652,7 @@ SECTION_RODATA static u8 const l_dungeon_onColor[36] = {
0x04, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00,
0x3C, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80395974, &l_dungeon_onColor);
COMPILER_STRIP_GATE(0x80395974, &l_dungeon_onColor);
#pragma pop
/* 80395998-803959C0 021FF8 0024+04 0/1 0/0 0/0 .rodata l_dungeon_stayColor$3843 */
@@ -701,7 +701,7 @@ SECTION_RODATA static u8 const l_dungeon_stayColor[36 + 4 /* padding */] = {
0x00,
0x00,
};
COMPILER_STRIP_GATE(80395998, &l_dungeon_stayColor);
COMPILER_STRIP_GATE(0x80395998, &l_dungeon_stayColor);
#pragma pop
/* 801C0C48-801C0CB8 1BB588 0070+00 1/0 0/0 0/0 .text getColor__15renderingDmap_cFi */
@@ -1511,7 +1511,7 @@ asm void __sinit_d_menu_dmap_map_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801C2644 = (void*)__sinit_d_menu_dmap_map_cpp;
REGISTER_CTORS(0x801C2644, __sinit_d_menu_dmap_map_cpp);
#pragma pop
/* ############################################################################################## */
src/d/menu/d_menu_fishing.cpp
+42 -31
View File
@@ -38,10 +38,10 @@ struct dMeter2Info_c {
struct STControl {};
struct JKRExpHeap {};
struct CSTControl {};
struct JKRExpHeap {};
struct dMenu_Fishing_c {
/* 801C4D54 */ dMenu_Fishing_c(JKRExpHeap*, STControl*, CSTControl*);
/* 801C4D98 */ ~dMenu_Fishing_c();
@@ -309,6 +309,12 @@ asm void dMenu_Fishing_c::init() {
#pragma pop
/* ############################################################################################## */
/* 80396068-80396068 0226C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80396068 = "/res/Layout/fishres.arc";
#pragma pop
/* 80454114-80454118 002714 0004+00 1/1 0/0 0/0 .sdata2 @4010 */
SECTION_SDATA2 static f32 lit_4010 = 1.0f;
@@ -362,7 +368,7 @@ SECTION_RODATA static u8 const fish_n[48] = {
0x66, 0x69, 0x73, 0x68, 0x5F, 0x6E, 0x5F, 0x33, 0x66, 0x69, 0x73, 0x68, 0x5F, 0x6E, 0x5F, 0x31,
0x66, 0x69, 0x73, 0x68, 0x5F, 0x6E, 0x5F, 0x32, 0x66, 0x69, 0x73, 0x68, 0x5F, 0x6E, 0x5F, 0x34,
};
COMPILER_STRIP_GATE(80395D90, &fish_n);
COMPILER_STRIP_GATE(0x80395D90, &fish_n);
/* 80395DC0-80395DF0 022420 0030+00 0/1 0/0 0/0 .rodata fish_p0$4061 */
#pragma push
@@ -372,7 +378,7 @@ SECTION_RODATA static u8 const fish_p0[48] = {
0x66, 0x69, 0x5F, 0x70, 0x61, 0x5F, 0x33, 0x6E, 0x66, 0x69, 0x5F, 0x70, 0x61, 0x5F, 0x31, 0x6E,
0x66, 0x69, 0x5F, 0x70, 0x61, 0x5F, 0x32, 0x6E, 0x66, 0x69, 0x5F, 0x70, 0x61, 0x5F, 0x34, 0x6E,
};
COMPILER_STRIP_GATE(80395DC0, &fish_p0);
COMPILER_STRIP_GATE(0x80395DC0, &fish_p0);
#pragma pop
/* 80395DF0-80395E20 022450 0030+00 0/1 0/0 0/0 .rodata fish_p1$4062 */
@@ -383,7 +389,7 @@ SECTION_RODATA static u8 const fish_p1[48] = {
0x66, 0x69, 0x5F, 0x6E, 0x61, 0x5F, 0x33, 0x6E, 0x66, 0x69, 0x5F, 0x6E, 0x61, 0x5F, 0x31, 0x6E,
0x66, 0x69, 0x5F, 0x6E, 0x61, 0x5F, 0x32, 0x6E, 0x66, 0x69, 0x5F, 0x6E, 0x61, 0x5F, 0x34, 0x6E,
};
COMPILER_STRIP_GATE(80395DF0, &fish_p1);
COMPILER_STRIP_GATE(0x80395DF0, &fish_p1);
#pragma pop
/* 80395E20-80395E50 022480 0030+00 0/1 0/0 0/0 .rodata fish_p2$4063 */
@@ -394,7 +400,7 @@ SECTION_RODATA static u8 const fish_p2[48] = {
0x66, 0x69, 0x5F, 0x6C, 0x69, 0x5F, 0x33, 0x6E, 0x66, 0x69, 0x5F, 0x6C, 0x69, 0x5F, 0x31, 0x6E,
0x66, 0x69, 0x5F, 0x6C, 0x69, 0x5F, 0x32, 0x6E, 0x66, 0x69, 0x5F, 0x6C, 0x69, 0x5F, 0x34, 0x6E,
};
COMPILER_STRIP_GATE(80395E20, &fish_p2);
COMPILER_STRIP_GATE(0x80395E20, &fish_p2);
#pragma pop
/* 80395E50-80395E80 0224B0 0030+00 0/1 0/0 0/0 .rodata fish_p3$4064 */
@@ -405,7 +411,7 @@ SECTION_RODATA static u8 const fish_p3[48] = {
0x62, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x33, 0x6E, 0x62, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x31, 0x6E,
0x62, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x32, 0x6E, 0x62, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x34, 0x6E,
};
COMPILER_STRIP_GATE(80395E50, &fish_p3);
COMPILER_STRIP_GATE(0x80395E50, &fish_p3);
#pragma pop
/* 80395E80-80395EB0 0224E0 0030+00 0/1 0/0 0/0 .rodata fish_p4$4065 */
@@ -416,7 +422,7 @@ SECTION_RODATA static u8 const fish_p4[48] = {
0x72, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x33, 0x6E, 0x72, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x31, 0x6E,
0x72, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x32, 0x6E, 0x72, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x34, 0x6E,
};
COMPILER_STRIP_GATE(80395E80, &fish_p4);
COMPILER_STRIP_GATE(0x80395E80, &fish_p4);
#pragma pop
/* 80395EB0-80395EE0 022510 0030+00 0/1 0/0 0/0 .rodata fish_p5$4066 */
@@ -427,7 +433,7 @@ SECTION_RODATA static u8 const fish_p5[48] = {
0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x33, 0x5F, 0x6E, 0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x31, 0x5F, 0x6E,
0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x32, 0x5F, 0x6E, 0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x34, 0x5F, 0x6E,
};
COMPILER_STRIP_GATE(80395EB0, &fish_p5);
COMPILER_STRIP_GATE(0x80395EB0, &fish_p5);
#pragma pop
/* 80395EE0-80395F10 022540 0030+00 0/1 0/0 0/0 .rodata size_1$4081 */
@@ -438,7 +444,7 @@ SECTION_RODATA static u8 const size_1[48] = {
0x73, 0x69, 0x7A, 0x65, 0x5F, 0x74, 0x5F, 0x33, 0x73, 0x69, 0x7A, 0x65, 0x5F, 0x74, 0x5F, 0x31,
0x73, 0x69, 0x7A, 0x65, 0x5F, 0x74, 0x5F, 0x32, 0x73, 0x69, 0x7A, 0x65, 0x5F, 0x74, 0x5F, 0x34,
};
COMPILER_STRIP_GATE(80395EE0, &size_1);
COMPILER_STRIP_GATE(0x80395EE0, &size_1);
#pragma pop
/* 80395F10-80395F40 022570 0030+00 0/1 0/0 0/0 .rodata size_unit_1$4082 */
@@ -449,7 +455,7 @@ SECTION_RODATA static u8 const size_unit_1[48] = {
0x00, 0x00, 0x63, 0x6D, 0x5F, 0x74, 0x5F, 0x33, 0x00, 0x00, 0x63, 0x6D, 0x5F, 0x74, 0x5F, 0x31,
0x00, 0x00, 0x63, 0x6D, 0x5F, 0x74, 0x5F, 0x32, 0x00, 0x00, 0x63, 0x6D, 0x5F, 0x74, 0x5F, 0x34,
};
COMPILER_STRIP_GATE(80395F10, &size_unit_1);
COMPILER_STRIP_GATE(0x80395F10, &size_unit_1);
#pragma pop
/* 80395F40-80395F70 0225A0 0030+00 0/1 0/0 0/0 .rodata count_1$4083 */
@@ -460,7 +466,7 @@ SECTION_RODATA static u8 const count_1[48] = {
0x63, 0x6F, 0x75, 0x6E, 0x74, 0x5F, 0x74, 0x33, 0x63, 0x6F, 0x75, 0x6E, 0x74, 0x5F, 0x74, 0x31,
0x63, 0x6F, 0x75, 0x6E, 0x74, 0x5F, 0x74, 0x32, 0x63, 0x6F, 0x75, 0x6E, 0x74, 0x5F, 0x74, 0x34,
};
COMPILER_STRIP_GATE(80395F40, &count_1);
COMPILER_STRIP_GATE(0x80395F40, &count_1);
#pragma pop
/* 80395F70-80395FA0 0225D0 0030+00 0/1 0/0 0/0 .rodata count_unit_1$4084 */
@@ -471,7 +477,7 @@ SECTION_RODATA static u8 const count_unit_1[48] = {
0x00, 0x63, 0x6F, 0x75, 0x5F, 0x74, 0x5F, 0x33, 0x00, 0x63, 0x6F, 0x75, 0x5F, 0x74, 0x5F, 0x31,
0x00, 0x63, 0x6F, 0x75, 0x5F, 0x74, 0x5F, 0x32, 0x00, 0x63, 0x6F, 0x75, 0x5F, 0x74, 0x5F, 0x34,
};
COMPILER_STRIP_GATE(80395F70, &count_unit_1);
COMPILER_STRIP_GATE(0x80395F70, &count_unit_1);
#pragma pop
/* 80395FA0-80395FD0 022600 0030+00 0/1 0/0 0/0 .rodata name_0$4085 */
@@ -482,7 +488,7 @@ SECTION_RODATA static u8 const name_0[48] = {
0x00, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x33, 0x00, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x31,
0x00, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x32, 0x00, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x34,
};
COMPILER_STRIP_GATE(80395FA0, &name_0);
COMPILER_STRIP_GATE(0x80395FA0, &name_0);
#pragma pop
/* 80395FD0-80396000 022630 0030+00 0/1 0/0 0/0 .rodata fname_0$4086 */
@@ -493,7 +499,7 @@ SECTION_RODATA static u8 const fname_0[48] = {
0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x33, 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x31,
0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x32, 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x34,
};
COMPILER_STRIP_GATE(80395FD0, &fname_0);
COMPILER_STRIP_GATE(0x80395FD0, &fname_0);
#pragma pop
/* 80396000-80396018 022660 0018+00 0/1 0/0 0/0 .rodata name_id$4087 */
@@ -503,7 +509,15 @@ SECTION_RODATA static u8 const name_id[24] = {
0x00, 0x00, 0x05, 0x9E, 0x00, 0x00, 0x05, 0x9D, 0x00, 0x00, 0x05, 0x9B,
0x00, 0x00, 0x05, 0x99, 0x00, 0x00, 0x05, 0x9A, 0x00, 0x00, 0x05, 0x9C,
};
COMPILER_STRIP_GATE(80396000, &name_id);
COMPILER_STRIP_GATE(0x80396000, &name_id);
#pragma pop
/* 80396068-80396068 0226C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80396080 = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_80396090 = "zelda_fish_window.blo";
SECTION_DEAD static char const* const stringBase_803960A6 = "";
#pragma pop
/* 801C55D8-801C5D3C 1BFF18 0764+00 1/1 0/0 0/0 .text screenSetBase__15dMenu_Fishing_cFv
@@ -524,7 +538,7 @@ SECTION_RODATA static u8 const text_a_tag[40] = {
0x5F, 0x32, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x61, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80396018, &text_a_tag);
COMPILER_STRIP_GATE(0x80396018, &text_a_tag);
/* 80396040-80396068 0226A0 0028+00 1/1 0/0 0/0 .rodata text_b_tag$4168 */
SECTION_RODATA static u8 const text_b_tag[40] = {
@@ -532,7 +546,15 @@ SECTION_RODATA static u8 const text_b_tag[40] = {
0x5F, 0x32, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x62, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80396040, &text_b_tag);
COMPILER_STRIP_GATE(0x80396040, &text_b_tag);
/* 80396068-80396068 0226C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803960A7 = "zelda_collect_soubi_do_icon_parts.blo";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803960CD = "\0\0";
#pragma pop
/* 801C5D3C-801C5EB8 1C067C 017C+00 1/1 0/0 0/0 .text screenSetDoIcon__15dMenu_Fishing_cFv */
#pragma push
@@ -616,18 +638,7 @@ asm void __sinit_d_menu_fishing_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801C65BC = (void*)__sinit_d_menu_fishing_cpp;
REGISTER_CTORS(0x801C65BC, __sinit_d_menu_fishing_cpp);
#pragma pop
/* 80396068-803960D0 0226C8 0065+03 5/5 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80396068 = "/res/Layout/fishres.arc";
SECTION_DEAD static char const* const stringBase_80396080 = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_80396090 = "zelda_fish_window.blo";
SECTION_DEAD static char const* const stringBase_803960A6 = "";
SECTION_DEAD static char const* const stringBase_803960A7 = "zelda_collect_soubi_do_icon_parts.blo";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803960CD = "\0\0";
#pragma pop
/* 80396068-80396068 0226C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_fmap.cpp
+32 -31
View File
@@ -104,12 +104,12 @@ struct STControl {
/* 8003219C */ void checkTrigger();
};
struct CSTControl {};
struct JKRExpHeap {
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
};
struct CSTControl {};
struct dMenu_Fmap_c {
/* 801C66E4 */ dMenu_Fmap_c(JKRExpHeap*, STControl*, CSTControl*, u8, u8, u8, f32, f32, u8);
/* 801C6AC8 */ ~dMenu_Fmap_c();
@@ -328,10 +328,10 @@ struct dDlst_list_c {
/* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -637,6 +637,31 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
/* ############################################################################################## */
/* 803960E8-803960E8 022748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803960E8 = "";
SECTION_DEAD static char const* const stringBase_803960E9 = "dat/field.dat";
SECTION_DEAD static char const* const stringBase_803960F7 = "dat/portal.dat";
SECTION_DEAD static char const* const stringBase_80396106 = "F_SP124";
SECTION_DEAD static char const* const stringBase_8039610E = "/res/FieldMap/res-f.arc";
SECTION_DEAD static char const* const stringBase_80396126 = "dat/data.dat";
SECTION_DEAD static char const* const stringBase_80396133 = "%s/stage.dat";
SECTION_DEAD static char const* const stringBase_80396140 = "%s/room%d.dzs";
SECTION_DEAD static char const* const stringBase_8039614E = "tex/region8.bti";
SECTION_DEAD static char const* const stringBase_8039615E = "tex/region%d.bti";
SECTION_DEAD static char const* const stringBase_8039616F = "F_SP115";
SECTION_DEAD static char const* const stringBase_80396177 = "F_SP113";
SECTION_DEAD static char const* const stringBase_8039617F = "F_SP109";
SECTION_DEAD static char const* const stringBase_80396187 = "F_SP108";
SECTION_DEAD static char const* const stringBase_8039618F = "F_SP104";
SECTION_DEAD static char const* const stringBase_80396197 = "F_SP122";
SECTION_DEAD static char const* const stringBase_8039619F = "F_SP111";
SECTION_DEAD static char const* const stringBase_803961A7 = "F_SP116";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803961AF = "";
#pragma pop
/* 803BD090-803BD09C 01A1B0 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -2647,7 +2672,7 @@ SECTION_RODATA static u8 const i_swBit[24] = {
0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x2A,
0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x32,
};
COMPILER_STRIP_GATE(803960D0, &i_swBit);
COMPILER_STRIP_GATE(0x803960D0, &i_swBit);
/* 801CD814-801CD8B4 1C8154 00A0+00 1/1 0/0 0/0 .text howlArrowPosInit__12dMenu_Fmap_cFv
*/
@@ -2714,31 +2739,7 @@ asm void __sinit_d_menu_fmap_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801CDA74 = (void*)__sinit_d_menu_fmap_cpp;
REGISTER_CTORS(0x801CDA74, __sinit_d_menu_fmap_cpp);
#pragma pop
/* 803960E8-803961B0 022748 00C7+01 9/7 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803960E8 = "";
SECTION_DEAD static char const* const stringBase_803960E9 = "dat/field.dat";
SECTION_DEAD static char const* const stringBase_803960F7 = "dat/portal.dat";
SECTION_DEAD static char const* const stringBase_80396106 = "F_SP124";
SECTION_DEAD static char const* const stringBase_8039610E = "/res/FieldMap/res-f.arc";
SECTION_DEAD static char const* const stringBase_80396126 = "dat/data.dat";
SECTION_DEAD static char const* const stringBase_80396133 = "%s/stage.dat";
SECTION_DEAD static char const* const stringBase_80396140 = "%s/room%d.dzs";
SECTION_DEAD static char const* const stringBase_8039614E = "tex/region8.bti";
SECTION_DEAD static char const* const stringBase_8039615E = "tex/region%d.bti";
SECTION_DEAD static char const* const stringBase_8039616F = "F_SP115";
SECTION_DEAD static char const* const stringBase_80396177 = "F_SP113";
SECTION_DEAD static char const* const stringBase_8039617F = "F_SP109";
SECTION_DEAD static char const* const stringBase_80396187 = "F_SP108";
SECTION_DEAD static char const* const stringBase_8039618F = "F_SP104";
SECTION_DEAD static char const* const stringBase_80396197 = "F_SP122";
SECTION_DEAD static char const* const stringBase_8039619F = "F_SP111";
SECTION_DEAD static char const* const stringBase_803961A7 = "F_SP116";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803961AF = "";
#pragma pop
/* 803960E8-803960E8 022748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_fmap2D.cpp
+46 -40
View File
@@ -196,10 +196,10 @@ struct dMenuMapCommon_c {
/* 801C4600 */ void moveLightDropAnime();
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -445,7 +445,17 @@ SECTION_RODATA static u8 const cur_tag_3868[32] = {
0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x72, 0x75, 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x72, 0x64,
0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x6C, 0x64, 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x6C, 0x75,
};
COMPILER_STRIP_GATE(80396248, &cur_tag_3868);
COMPILER_STRIP_GATE(0x80396248, &cur_tag_3868);
/* 803965D0-803965D0 022C30 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803965D0 = "zelda_map_screen_stone_base.blo";
SECTION_DEAD static char const* const stringBase_803965F0 = "zelda_map_screen_base.blo";
SECTION_DEAD static char const* const stringBase_8039660A = "zelda_map_screen_base.btk";
SECTION_DEAD static char const* const stringBase_80396624 = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_80396634 = "zelda_field_map_point_cursor.blo";
#pragma pop
/* 803BD750-803BD760 01A870 0010+00 2/2 0/0 0/0 .data __vt__17dMenu_Fmap2DTop_c */
SECTION_DATA extern void* __vt__17dMenu_Fmap2DTop_c[4] = {
@@ -508,7 +518,7 @@ SECTION_RODATA static u8 const cur_tag_4092[32] = {
0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x72, 0x75, 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x72, 0x64,
0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x6C, 0x64, 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x6C, 0x75,
};
COMPILER_STRIP_GATE(80396268, &cur_tag_4092);
COMPILER_STRIP_GATE(0x80396268, &cur_tag_4092);
/* 804541DC-804541E0 0027DC 0004+00 6/6 0/0 0/0 .sdata2 @4199 */
SECTION_SDATA2 static f32 lit_4199 = 608.0f;
@@ -1279,7 +1289,7 @@ SECTION_RODATA static u8 const area_name[24] = {
0x69, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x73, 0x00, 0x00, 0x69, 0x5F,
0x6E, 0x61, 0x6D, 0x65, 0x00, 0x69, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x31,
};
COMPILER_STRIP_GATE(80396288, &area_name);
COMPILER_STRIP_GATE(0x80396288, &area_name);
#pragma pop
/* 803962A0-803962B8 022900 0018+00 0/1 0/0 0/0 .rodata farea_name$5815 */
@@ -1289,7 +1299,7 @@ SECTION_RODATA static u8 const farea_name_5815[24] = {
0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x31, 0x00, 0x66, 0x5F, 0x6E,
0x61, 0x6D, 0x65, 0x33, 0x00, 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x32,
};
COMPILER_STRIP_GATE(803962A0, &farea_name_5815);
COMPILER_STRIP_GATE(0x803962A0, &farea_name_5815);
#pragma pop
/* 803962B8-803962F0 022918 0038+00 0/1 0/0 0/0 .rodata sfont_name$5821 */
@@ -1301,7 +1311,7 @@ SECTION_RODATA static u8 const sfont_name[56] = {
0x6E, 0x74, 0x6C, 0x32, 0x00, 0x73, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x30, 0x00, 0x73,
0x66, 0x6F, 0x6E, 0x74, 0x62, 0x31, 0x00, 0x73, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x32,
};
COMPILER_STRIP_GATE(803962B8, &sfont_name);
COMPILER_STRIP_GATE(0x803962B8, &sfont_name);
#pragma pop
/* 803962F0-80396328 022950 0038+00 0/1 0/0 0/0 .rodata ffont_name$5822 */
@@ -1313,7 +1323,7 @@ SECTION_RODATA static u8 const ffont_name_5822[56] = {
0x6E, 0x74, 0x6C, 0x32, 0x00, 0x66, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x30, 0x00, 0x66,
0x66, 0x6F, 0x6E, 0x74, 0x62, 0x33, 0x00, 0x66, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x34,
};
COMPILER_STRIP_GATE(803962F0, &ffont_name_5822);
COMPILER_STRIP_GATE(0x803962F0, &ffont_name_5822);
#pragma pop
/* 80396328-80396350 022988 0028+00 0/1 0/0 0/0 .rodata cont_zt$5828 */
@@ -1324,7 +1334,7 @@ SECTION_RODATA static u8 const cont_zt[40] = {
0x74, 0x31, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74,
0x5F, 0x7A, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x34,
};
COMPILER_STRIP_GATE(80396328, &cont_zt);
COMPILER_STRIP_GATE(0x80396328, &cont_zt);
#pragma pop
/* 80396350-80396378 0229B0 0028+00 0/1 0/0 0/0 .rodata font_zt$5829 */
@@ -1335,7 +1345,7 @@ SECTION_RODATA static u8 const font_zt_5829[40] = {
0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74,
0x5F, 0x7A, 0x74, 0x34, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x35,
};
COMPILER_STRIP_GATE(80396350, &font_zt_5829);
COMPILER_STRIP_GATE(0x80396350, &font_zt_5829);
#pragma pop
/* 80396378-803963A0 0229D8 0028+00 0/1 0/0 0/0 .rodata cont_bt$5835 */
@@ -1346,7 +1356,7 @@ SECTION_RODATA static u8 const cont_bt[40] = {
0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74,
0x5F, 0x62, 0x74, 0x34, 0x00, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74,
};
COMPILER_STRIP_GATE(80396378, &cont_bt);
COMPILER_STRIP_GATE(0x80396378, &cont_bt);
#pragma pop
/* 803963A0-803963C8 022A00 0028+00 0/1 0/0 0/0 .rodata font_bt$5836 */
@@ -1357,7 +1367,7 @@ SECTION_RODATA static u8 const font_bt_5836[40] = {
0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74,
0x5F, 0x62, 0x74, 0x34, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x35,
};
COMPILER_STRIP_GATE(803963A0, &font_bt_5836);
COMPILER_STRIP_GATE(0x803963A0, &font_bt_5836);
#pragma pop
/* 803963C8-803963F0 022A28 0028+00 0/1 0/0 0/0 .rodata cont_at$5842 */
@@ -1368,7 +1378,7 @@ SECTION_RODATA static u8 const cont_at[40] = {
0x74, 0x31, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74,
0x5F, 0x61, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x34,
};
COMPILER_STRIP_GATE(803963C8, &cont_at);
COMPILER_STRIP_GATE(0x803963C8, &cont_at);
#pragma pop
/* 803963F0-80396418 022A50 0028+00 0/1 0/0 0/0 .rodata font_at$5843 */
@@ -1379,7 +1389,7 @@ SECTION_RODATA static u8 const font_at_5843[40] = {
0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74,
0x5F, 0x61, 0x74, 0x34, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x35,
};
COMPILER_STRIP_GATE(803963F0, &font_at_5843);
COMPILER_STRIP_GATE(0x803963F0, &font_at_5843);
#pragma pop
/* 80396418-80396440 022A78 0028+00 0/1 0/0 0/0 .rodata juji_c$5849 */
@@ -1390,7 +1400,7 @@ SECTION_RODATA static u8 const juji_c_5849[40] = {
0x30, 0x31, 0x6A, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x32, 0x6A, 0x75, 0x6A, 0x69,
0x5F, 0x63, 0x30, 0x33, 0x6A, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x34,
};
COMPILER_STRIP_GATE(80396418, &juji_c_5849);
COMPILER_STRIP_GATE(0x80396418, &juji_c_5849);
#pragma pop
/* 80396440-80396468 022AA0 0028+00 0/1 0/0 0/0 .rodata fuji_c$5850 */
@@ -1401,7 +1411,7 @@ SECTION_RODATA static u8 const fuji_c[40] = {
0x30, 0x31, 0x66, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x32, 0x66, 0x75, 0x6A, 0x69,
0x5F, 0x63, 0x30, 0x33, 0x66, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x34,
};
COMPILER_STRIP_GATE(80396440, &fuji_c);
COMPILER_STRIP_GATE(0x80396440, &fuji_c);
#pragma pop
/* 80396468-80396490 022AC8 0028+00 0/1 0/0 0/0 .rodata ast_c$5856 */
@@ -1412,7 +1422,7 @@ SECTION_RODATA static u8 const ast_c_5856[40] = {
0x30, 0x31, 0x00, 0x00, 0x61, 0x73, 0x74, 0x5F, 0x30, 0x32, 0x00, 0x00, 0x61, 0x73,
0x74, 0x5F, 0x30, 0x33, 0x00, 0x00, 0x61, 0x73, 0x74, 0x5F, 0x30, 0x34,
};
COMPILER_STRIP_GATE(80396468, &ast_c_5856);
COMPILER_STRIP_GATE(0x80396468, &ast_c_5856);
#pragma pop
/* 80396490-803964B8 022AF0 0028+00 0/1 0/0 0/0 .rodata fst_c$5857 */
@@ -1423,7 +1433,17 @@ SECTION_RODATA static u8 const fst_c[40] = {
0x30, 0x31, 0x00, 0x00, 0x66, 0x73, 0x74, 0x5F, 0x30, 0x32, 0x00, 0x00, 0x66, 0x73,
0x74, 0x5F, 0x30, 0x33, 0x00, 0x00, 0x66, 0x73, 0x74, 0x5F, 0x30, 0x34,
};
COMPILER_STRIP_GATE(80396490, &fst_c);
COMPILER_STRIP_GATE(0x80396490, &fst_c);
#pragma pop
/* 803965D0-803965D0 022C30 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80396655 = "zelda_map_screen_title.blo";
SECTION_DEAD static char const* const stringBase_80396670 = "zelda_map_screen_title.btk";
SECTION_DEAD static char const* const stringBase_8039668B = "";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039668C = "\0\0\0";
#pragma pop
/* 801D5BD0-801D6700 1D0510 0B30+00 0/0 1/1 0/0 .text
@@ -1506,7 +1526,7 @@ SECTION_RODATA static u8 const ffont_name_6110[56] = {
0x6E, 0x74, 0x6C, 0x32, 0x00, 0x66, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x30, 0x00, 0x66,
0x66, 0x6F, 0x6E, 0x74, 0x62, 0x33, 0x00, 0x66, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x34,
};
COMPILER_STRIP_GATE(803964B8, &ffont_name_6110);
COMPILER_STRIP_GATE(0x803964B8, &ffont_name_6110);
/* 801D6F38-801D7010 1D1878 00D8+00 1/1 1/1 0/0 .text setTitleNameString__17dMenu_Fmap2DTop_cFUl
*/
@@ -1525,7 +1545,7 @@ SECTION_RODATA static u8 const farea_name_6125[24] = {
0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x31, 0x00, 0x66, 0x5F, 0x6E,
0x61, 0x6D, 0x65, 0x33, 0x00, 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x32,
};
COMPILER_STRIP_GATE(803964F0, &farea_name_6125);
COMPILER_STRIP_GATE(0x803964F0, &farea_name_6125);
/* 801D7010-801D70E8 1D1950 00D8+00 0/0 2/2 0/0 .text setAreaNameString__17dMenu_Fmap2DTop_cFUl */
#pragma push
@@ -1544,7 +1564,7 @@ SECTION_RODATA static u8 const font_zt_6148[40] = {
0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74,
0x5F, 0x7A, 0x74, 0x34, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x35,
};
COMPILER_STRIP_GATE(80396508, &font_zt_6148);
COMPILER_STRIP_GATE(0x80396508, &font_zt_6148);
/* 801D70E8-801D7210 1D1A28 0128+00 1/1 12/12 0/0 .text setZButtonString__17dMenu_Fmap2DTop_cFUlUc
*/
@@ -1564,7 +1584,7 @@ SECTION_RODATA static u8 const font_bt_6176[40] = {
0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74,
0x5F, 0x62, 0x74, 0x34, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x35,
};
COMPILER_STRIP_GATE(80396530, &font_bt_6176);
COMPILER_STRIP_GATE(0x80396530, &font_bt_6176);
/* 801D7210-801D72D4 1D1B50 00C4+00 1/1 9/9 0/0 .text setBButtonString__17dMenu_Fmap2DTop_cFUlUc
*/
@@ -1584,7 +1604,7 @@ SECTION_RODATA static u8 const font_at_6194[40] = {
0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74,
0x5F, 0x61, 0x74, 0x34, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x35,
};
COMPILER_STRIP_GATE(80396558, &font_at_6194);
COMPILER_STRIP_GATE(0x80396558, &font_at_6194);
/* 801D72D4-801D7398 1D1C14 00C4+00 1/1 14/14 0/0 .text setAButtonString__17dMenu_Fmap2DTop_cFUlUc
*/
@@ -1604,7 +1624,7 @@ SECTION_RODATA static u8 const juji_c_6209[40] = {
0x30, 0x31, 0x66, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x32, 0x66, 0x75, 0x6A, 0x69,
0x5F, 0x63, 0x30, 0x33, 0x66, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x34,
};
COMPILER_STRIP_GATE(80396580, &juji_c_6209);
COMPILER_STRIP_GATE(0x80396580, &juji_c_6209);
/* 801D7398-801D74EC 1D1CD8 0154+00 1/1 8/8 0/0 .text setCrossLRString__17dMenu_Fmap2DTop_cFUl */
#pragma push
@@ -1623,7 +1643,7 @@ SECTION_RODATA static u8 const ast_c_6233[40] = {
0x30, 0x31, 0x00, 0x00, 0x66, 0x73, 0x74, 0x5F, 0x30, 0x32, 0x00, 0x00, 0x66, 0x73,
0x74, 0x5F, 0x30, 0x33, 0x00, 0x00, 0x66, 0x73, 0x74, 0x5F, 0x30, 0x34,
};
COMPILER_STRIP_GATE(803965A8, &ast_c_6233);
COMPILER_STRIP_GATE(0x803965A8, &ast_c_6233);
/* 801D74EC-801D7640 1D1E2C 0154+00 1/1 10/10 0/0 .text set3DStickString__17dMenu_Fmap2DTop_cFUl
*/
@@ -1788,18 +1808,4 @@ static asm void func_801D810C() {
}
#pragma pop
/* 803965D0-80396690 022C30 00BC+04 6/6 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803965D0 = "zelda_map_screen_stone_base.blo";
SECTION_DEAD static char const* const stringBase_803965F0 = "zelda_map_screen_base.blo";
SECTION_DEAD static char const* const stringBase_8039660A = "zelda_map_screen_base.btk";
SECTION_DEAD static char const* const stringBase_80396624 = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_80396634 = "zelda_field_map_point_cursor.blo";
SECTION_DEAD static char const* const stringBase_80396655 = "zelda_map_screen_title.blo";
SECTION_DEAD static char const* const stringBase_80396670 = "zelda_map_screen_title.btk";
SECTION_DEAD static char const* const stringBase_8039668B = "";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039668C = "\0\0\0";
#pragma pop
/* 803965D0-803965D0 022C30 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_fmap_map.cpp
+14 -12
View File
@@ -297,6 +297,15 @@ asm void renderingFmap_c::entry(dMenu_Fmap_world_data_c* param_0, int param_1, f
}
#pragma pop
/* ############################################################################################## */
/* 8039623C-8039623C 02289C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039623C = "F_SP121";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80396244 = "\0\0\0";
#pragma pop
/* 801CE224-801CE288 1C8B64 0064+00 1/1 0/0 0/0 .text isSwitchSpecialOff__15renderingFmap_cFi */
#pragma push
#pragma optimization_level 0
@@ -523,7 +532,7 @@ SECTION_RODATA static u8 const palNo[32] = {
0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x14,
0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x18,
};
COMPILER_STRIP_GATE(803961B0, &palNo);
COMPILER_STRIP_GATE(0x803961B0, &palNo);
/* 801CEB1C-801CEC24 1C945C 0108+00 1/1 0/0 0/0 .text setPointColor__15dMenu_FmapMap_cFf
*/
@@ -817,7 +826,7 @@ SECTION_RODATA static u8 const l_dungeon_onColor[36] = {
0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
0x18, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803961D0, &l_dungeon_onColor);
COMPILER_STRIP_GATE(0x803961D0, &l_dungeon_onColor);
#pragma pop
/* 803961F4-80396218 022854 0024+00 0/1 0/0 0/0 .rodata l_dungeon_stayColor$4187 */
@@ -828,7 +837,7 @@ SECTION_RODATA static u8 const l_dungeon_stayColor[36] = {
0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00,
0x38, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803961F4, &l_dungeon_stayColor);
COMPILER_STRIP_GATE(0x803961F4, &l_dungeon_stayColor);
#pragma pop
/* 80396218-8039623C 022878 0024+00 0/1 0/0 0/0 .rodata l_dungeon_pointColor$4188 */
@@ -839,7 +848,7 @@ SECTION_RODATA static u8 const l_dungeon_pointColor[36] = {
0x00, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00,
0x58, 0x00, 0x00, 0x00, 0x5C, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80396218, &l_dungeon_pointColor);
COMPILER_STRIP_GATE(0x80396218, &l_dungeon_pointColor);
#pragma pop
/* 801CF2A0-801CF394 1C9BE0 00F4+00 1/0 0/0 0/0 .text getColor__15dMenu_FmapMap_cFi */
@@ -901,11 +910,4 @@ void renderingFmap_c::afterDrawPath() {
/* empty function */
}
/* 8039623C-80396248 02289C 0008+04 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_8039623C = "F_SP121";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80396244 = "\0\0\0";
#pragma pop
/* 8039623C-8039623C 02289C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_insect.cpp
+55 -28
View File
@@ -78,10 +78,10 @@ struct J2DPicture {
/* 802FC708 */ J2DPicture(ResTIMG const*);
};
struct JMSMesgEntry_c {};
struct JUTFont {};
struct JMSMesgEntry_c {};
struct dMeter2Info_c {
/* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*);
/* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*);
@@ -98,10 +98,10 @@ struct STControl {
/* 800325A0 */ void checkDownTrigger();
};
struct JKRExpHeap {};
struct CSTControl {};
struct JKRExpHeap {};
struct dMenu_Insect_c {
/* 801D8114 */ dMenu_Insect_c(JKRExpHeap*, STControl*, CSTControl*, u8);
/* 801D82F4 */ ~dMenu_Insect_c();
@@ -141,10 +141,10 @@ struct dMenu_Insect_c {
/* 801DA630 */ void draw();
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -311,6 +311,12 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
/* ############################################################################################## */
/* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803968C0 = "tt_block8x8.bti";
#pragma pop
/* 803BD780-803BD78C 01A8A0 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -566,6 +572,12 @@ asm void dMenu_Insect_c::init() {
#pragma pop
/* ############################################################################################## */
/* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803968D0 = "/res/Layout/insectRes.arc";
#pragma pop
/* 80454260-80454268 002860 0008+00 2/2 0/0 0/0 .sdata2 @4020 */
SECTION_SDATA2 static f64 lit_4020 = 4503601774854144.0 /* cast s32 to float */;
@@ -614,6 +626,15 @@ asm void dMenu_Insect_c::wait_move() {
#pragma pop
/* ############################################################################################## */
/* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803968EA = ""
"\x1B"
"CR[%d]";
SECTION_DEAD static char const* const stringBase_803968F2 = "";
#pragma pop
/* 8045426C-80454270 00286C 0004+00 1/1 0/0 0/0 .sdata2 @4135 */
SECTION_SDATA2 static f32 lit_4135 = 48.0f;
@@ -718,7 +739,7 @@ SECTION_RODATA static u8 const insect_tag[192] = {
0x00, 0x00, 0x62, 0x61, 0x74, 0x5F, 0x6F, 0x73, 0x00, 0x62, 0x61, 0x74, 0x5F, 0x6D, 0x65, 0x73,
0x00, 0x74, 0x6F, 0x6E, 0x62, 0x5F, 0x6F, 0x73, 0x74, 0x6F, 0x6E, 0x62, 0x5F, 0x6D, 0x65, 0x73,
};
COMPILER_STRIP_GATE(80396690, &insect_tag);
COMPILER_STRIP_GATE(0x80396690, &insect_tag);
/* 80396750-80396810 022DB0 00C0+00 1/1 0/0 0/0 .rodata ageha_tag$4250 */
SECTION_RODATA static u8 const ageha_tag[192] = {
@@ -735,7 +756,13 @@ SECTION_RODATA static u8 const ageha_tag[192] = {
0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x32, 0x30, 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x32, 0x31,
0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x32, 0x32, 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x32, 0x33,
};
COMPILER_STRIP_GATE(80396750, &ageha_tag);
COMPILER_STRIP_GATE(0x80396750, &ageha_tag);
/* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803968F3 = "zelda_gold_insects.blo";
#pragma pop
/* 801D9644-801D98F0 1D3F84 02AC+00 1/1 0/0 0/0 .text screenSetBase__14dMenu_Insect_cFv
*/
@@ -748,6 +775,13 @@ asm void dMenu_Insect_c::screenSetBase() {
}
#pragma pop
/* ############################################################################################## */
/* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039690A = "zelda_gold_insects_info.blo";
#pragma pop
/* 801D98F0-801D9BD0 1D4230 02E0+00 1/1 0/0 0/0 .text screenSetExplain__14dMenu_Insect_cFv */
#pragma push
#pragma optimization_level 0
@@ -765,7 +799,7 @@ SECTION_RODATA static u8 const text_a_tag[40] = {
0x5F, 0x32, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x61, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80396810, &text_a_tag);
COMPILER_STRIP_GATE(0x80396810, &text_a_tag);
/* 80396838-80396860 022E98 0028+00 1/1 0/0 0/0 .rodata text_b_tag$4329 */
SECTION_RODATA static u8 const text_b_tag[40] = {
@@ -773,7 +807,15 @@ SECTION_RODATA static u8 const text_b_tag[40] = {
0x5F, 0x32, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x62, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80396838, &text_b_tag);
COMPILER_STRIP_GATE(0x80396838, &text_b_tag);
/* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80396926 = "zelda_collect_soubi_do_icon_parts.blo";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039694C = "\0\0\0";
#pragma pop
/* 801D9BD0-801D9D4C 1D4510 017C+00 1/1 0/0 0/0 .text screenSetDoIcon__14dMenu_Insect_cFv
*/
@@ -827,7 +869,7 @@ SECTION_RODATA static u8 const i_evtID[96] = {
0x00, 0x00, 0x01, 0xA1, 0x00, 0x00, 0x01, 0xA2, 0x00, 0x00, 0x01, 0x99, 0x00, 0x00, 0x01, 0x9A,
0x00, 0x00, 0x01, 0x97, 0x00, 0x00, 0x01, 0x98, 0x00, 0x00, 0x01, 0xA3, 0x00, 0x00, 0x01, 0xA4,
};
COMPILER_STRIP_GATE(80396860, &i_evtID);
COMPILER_STRIP_GATE(0x80396860, &i_evtID);
/* 801D9E20-801D9E7C 1D4760 005C+00 4/4 0/0 0/0 .text isGiveInsect__14dMenu_Insect_cFii
*/
@@ -958,22 +1000,7 @@ asm void __sinit_d_menu_insect_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801DA650 = (void*)__sinit_d_menu_insect_cpp;
REGISTER_CTORS(0x801DA650, __sinit_d_menu_insect_cpp);
#pragma pop
/* 803968C0-80396950 022F20 008C+04 8/8 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803968C0 = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_803968D0 = "/res/Layout/insectRes.arc";
SECTION_DEAD static char const* const stringBase_803968EA = ""
"\x1B"
"CR[%d]";
SECTION_DEAD static char const* const stringBase_803968F2 = "";
SECTION_DEAD static char const* const stringBase_803968F3 = "zelda_gold_insects.blo";
SECTION_DEAD static char const* const stringBase_8039690A = "zelda_gold_insects_info.blo";
SECTION_DEAD static char const* const stringBase_80396926 = "zelda_collect_soubi_do_icon_parts.blo";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039694C = "\0\0\0";
#pragma pop
/* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_item_explain.cpp
+35 -28
View File
@@ -52,6 +52,10 @@ struct dMsgScrn3Select_c {
/* 8023A97C */ void getCharSpace();
};
struct ResTIMG {};
struct ResTLUT {};
struct JGeometry {
template <typename A1>
struct TBox2 {};
@@ -59,19 +63,15 @@ struct JGeometry {
struct TBox2__template0 {};
};
struct ResTIMG {};
struct ResTLUT {};
struct J2DPicture {
/* 802FC708 */ J2DPicture(ResTIMG const*);
/* 802FC800 */ J2DPicture(u64, JGeometry::TBox2<f32> const&, ResTIMG const*, ResTLUT const*);
};
struct JMSMesgEntry_c {};
struct JUTFont {};
struct JMSMesgEntry_c {};
struct dMeter2Info_c {
/* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*);
/* 8021C7FC */ void getStringLength(JUTFont*, f32, f32, char*);
@@ -79,18 +79,18 @@ struct dMeter2Info_c {
J2DPicture*, void*, J2DPicture*, int);
};
struct J2DOrthoGraph {};
struct STControl {
/* 8003219C */ void checkTrigger();
/* 80032524 */ void checkUpTrigger();
/* 800325A0 */ void checkDownTrigger();
};
struct JKRExpHeap {};
struct JKRArchive {};
struct J2DOrthoGraph {};
struct JKRExpHeap {};
struct dMenu_ItemExplain_c {
/* 801DA754 */ dMenu_ItemExplain_c(JKRExpHeap*, JKRArchive*, STControl*, bool);
/* 801DAFF0 */ ~dMenu_ItemExplain_c();
@@ -126,10 +126,10 @@ struct dKantera_icon_c {
/* 801AEC44 */ void setNowGauge(u16, u16);
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -303,14 +303,22 @@ SECTION_RODATA static u8 const name_tag[32] = {
0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x34, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x35,
0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x36, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x37,
};
COMPILER_STRIP_GATE(80396950, &name_tag);
COMPILER_STRIP_GATE(0x80396950, &name_tag);
/* 80396970-80396990 022FD0 0020+00 1/1 0/0 0/0 .rodata fame_tag$3884 */
SECTION_RODATA static u8 const fame_tag[32] = {
0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x31, 0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x32,
0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x33, 0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x34,
};
COMPILER_STRIP_GATE(80396970, &fame_tag);
COMPILER_STRIP_GATE(0x80396970, &fame_tag);
/* 80396990-80396990 022FF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80396990 = "zelda_item_screen_info.blo";
SECTION_DEAD static char const* const stringBase_803969AB = "";
SECTION_DEAD static char const* const stringBase_803969AC = "tt_block8x8.bti";
#pragma pop
/* 803BD8C8-803BD8D4 01A9E8 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
@@ -631,6 +639,17 @@ asm void dMenu_ItemExplain_c::move_proc() {
}
#pragma pop
/* ############################################################################################## */
/* 80396990-80396990 022FF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803969BC = ""
"\x1B"
"CR[%d]";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803969C4 = "\0\0\0";
#pragma pop
/* 801DBCB4-801DBF44 1D65F4 0290+00 1/0 0/0 0/0 .text move_select_init__19dMenu_ItemExplain_cFv */
#pragma push
#pragma optimization_level 0
@@ -791,19 +810,7 @@ asm void __sinit_d_menu_item_explain_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801DCC8C = (void*)__sinit_d_menu_item_explain_cpp;
REGISTER_CTORS(0x801DCC8C, __sinit_d_menu_item_explain_cpp);
#pragma pop
/* 80396990-803969C8 022FF0 0034+04 2/2 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80396990 = "zelda_item_screen_info.blo";
SECTION_DEAD static char const* const stringBase_803969AB = "";
SECTION_DEAD static char const* const stringBase_803969AC = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_803969BC = ""
"\x1B"
"CR[%d]";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_803969C4 = "\0\0\0";
#pragma pop
/* 80396990-80396990 022FF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_letter.cpp
+74 -41
View File
@@ -45,8 +45,6 @@ struct dSelect_cursor_c {
/* 801952A0 */ void setAlphaRate(f32);
};
struct COutFont_c {};
struct J2DTextBox {
/* 801DFA28 */ void getWhite() const;
/* 801DFA34 */ void getBlack() const;
@@ -56,6 +54,8 @@ struct J2DTextBox {
struct JUTFont {};
struct COutFont_c {};
struct dMsgString_c {
/* 801E1D10 */ void getStringPage(u32, u8, u8, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*,
u8);
@@ -90,10 +90,10 @@ struct STControl {
/* 800325A0 */ void checkDownTrigger();
};
struct JKRExpHeap {};
struct CSTControl {};
struct JKRExpHeap {};
struct dMenu_Letter_c {
/* 801DCDC0 */ dMenu_Letter_c(JKRExpHeap*, STControl*, CSTControl*);
/* 801DCF34 */ ~dMenu_Letter_c();
@@ -143,10 +143,10 @@ struct dMenu_Letter {
static u8 letter_data[512];
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -661,6 +661,12 @@ asm void dMenu_Letter_c::init() {
#pragma pop
/* ############################################################################################## */
/* 80396DC0-80396DC0 023420 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80396DC0 = "/res/Layout/letres.arc";
#pragma pop
/* 80454310-80454318 002910 0008+00 7/7 0/0 0/0 .sdata2 @4171 */
SECTION_SDATA2 static f64 lit_4171 = 4503601774854144.0 /* cast s32 to float */;
@@ -760,6 +766,13 @@ asm void dMenu_Letter_c::slide_left_move() {
}
#pragma pop
/* ############################################################################################## */
/* 80396DC0-80396DC0 023420 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80396DD7 = "%d/%d";
#pragma pop
/* 801DE334-801DE564 1D8C74 0230+00 1/0 0/0 0/0 .text read_open_init__14dMenu_Letter_cFv
*/
#pragma push
@@ -875,7 +888,7 @@ SECTION_RODATA static u8 const tag_sub0[48] = {
0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33, 0x73,
0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x73,
};
COMPILER_STRIP_GATE(803969C8, &tag_sub0);
COMPILER_STRIP_GATE(0x803969C8, &tag_sub0);
/* 803969F8-80396A28 023058 0030+00 0/1 0/0 0/0 .rodata tag_sub1$4611 */
#pragma push
@@ -885,7 +898,7 @@ SECTION_RODATA static u8 const tag_sub1[48] = {
0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33,
0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35,
};
COMPILER_STRIP_GATE(803969F8, &tag_sub1);
COMPILER_STRIP_GATE(0x803969F8, &tag_sub1);
#pragma pop
/* 80396A28-80396A58 023088 0030+00 0/1 0/0 0/0 .rodata tag_name0$4612 */
@@ -896,7 +909,7 @@ SECTION_RODATA static u8 const tag_name0[48] = {
0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x66, 0x38, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x39, 0x73,
0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x30, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x31, 0x73,
};
COMPILER_STRIP_GATE(80396A28, &tag_name0);
COMPILER_STRIP_GATE(0x80396A28, &tag_name0);
#pragma pop
/* 80396A58-80396A88 0230B8 0030+00 0/1 0/0 0/0 .rodata tag_name1$4613 */
@@ -907,7 +920,7 @@ SECTION_RODATA static u8 const tag_name1[48] = {
0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x38, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x39,
0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x30, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x31,
};
COMPILER_STRIP_GATE(80396A58, &tag_name1);
COMPILER_STRIP_GATE(0x80396A58, &tag_name1);
#pragma pop
/* 80396A88-80396AB8 0230E8 0030+00 0/1 0/0 0/0 .rodata ftag_sub0$4614 */
@@ -918,7 +931,7 @@ SECTION_RODATA static u8 const ftag_sub0[48] = {
0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33, 0x73,
0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x73,
};
COMPILER_STRIP_GATE(80396A88, &ftag_sub0);
COMPILER_STRIP_GATE(0x80396A88, &ftag_sub0);
#pragma pop
/* 80396AB8-80396AE8 023118 0030+00 0/1 0/0 0/0 .rodata ftag_sub1$4615 */
@@ -929,7 +942,7 @@ SECTION_RODATA static u8 const ftag_sub1[48] = {
0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33,
0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35,
};
COMPILER_STRIP_GATE(80396AB8, &ftag_sub1);
COMPILER_STRIP_GATE(0x80396AB8, &ftag_sub1);
#pragma pop
/* 80396AE8-80396B18 023148 0030+00 0/1 0/0 0/0 .rodata ftag_name0$4616 */
@@ -940,7 +953,7 @@ SECTION_RODATA static u8 const ftag_name0[48] = {
0x66, 0x65, 0x6E, 0x75, 0x5F, 0x66, 0x38, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x39, 0x73,
0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x30, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x31, 0x73,
};
COMPILER_STRIP_GATE(80396AE8, &ftag_name0);
COMPILER_STRIP_GATE(0x80396AE8, &ftag_name0);
#pragma pop
/* 80396B18-80396B48 023178 0030+00 0/1 0/0 0/0 .rodata ftag_name1$4617 */
@@ -951,7 +964,7 @@ SECTION_RODATA static u8 const ftag_name1[48] = {
0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x38, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x39,
0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x30, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x31,
};
COMPILER_STRIP_GATE(80396B18, &ftag_name1);
COMPILER_STRIP_GATE(0x80396B18, &ftag_name1);
#pragma pop
/* 80396B48-80396B78 0231A8 0030+00 0/1 0/0 0/0 .rodata tag_letter$4628 */
@@ -962,7 +975,7 @@ SECTION_RODATA static u8 const tag_letter[48] = {
0x6C, 0x65, 0x74, 0x5F, 0x30, 0x32, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x33, 0x5F, 0x6E,
0x6C, 0x65, 0x74, 0x5F, 0x30, 0x34, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x35, 0x5F, 0x6E,
};
COMPILER_STRIP_GATE(80396B48, &tag_letter);
COMPILER_STRIP_GATE(0x80396B48, &tag_letter);
#pragma pop
/* 80396B78-80396BA8 0231D8 0030+00 0/1 0/0 0/0 .rodata tag_frame$4635 */
@@ -973,7 +986,7 @@ SECTION_RODATA static u8 const tag_frame[48] = {
0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x32, 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x33,
0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x34, 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x35,
};
COMPILER_STRIP_GATE(80396B78, &tag_frame);
COMPILER_STRIP_GATE(0x80396B78, &tag_frame);
#pragma pop
/* 80396BA8-80396BD8 023208 0030+00 0/1 0/0 0/0 .rodata tag_menu0$4636 */
@@ -984,7 +997,7 @@ SECTION_RODATA static u8 const tag_menu0[48] = {
0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33,
0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35,
};
COMPILER_STRIP_GATE(80396BA8, &tag_menu0);
COMPILER_STRIP_GATE(0x80396BA8, &tag_menu0);
#pragma pop
/* 80396BD8-80396C08 023238 0030+00 0/1 0/0 0/0 .rodata tag_menu1$4637 */
@@ -995,7 +1008,7 @@ SECTION_RODATA static u8 const tag_menu1[48] = {
0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x38, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x39,
0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x30, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x31,
};
COMPILER_STRIP_GATE(80396BD8, &tag_menu1);
COMPILER_STRIP_GATE(0x80396BD8, &tag_menu1);
#pragma pop
/* 80396C08-80396C38 023268 0030+00 0/1 0/0 0/0 .rodata tag_midoku$4638 */
@@ -1006,7 +1019,14 @@ SECTION_RODATA static u8 const tag_midoku[48] = {
0x6D, 0x69, 0x64, 0x6F, 0x6B, 0x75, 0x5F, 0x32, 0x6D, 0x69, 0x64, 0x6F, 0x6B, 0x75, 0x5F, 0x33,
0x6D, 0x69, 0x64, 0x6F, 0x6B, 0x75, 0x5F, 0x34, 0x6D, 0x69, 0x64, 0x6F, 0x6B, 0x75, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80396C08, &tag_midoku);
COMPILER_STRIP_GATE(0x80396C08, &tag_midoku);
#pragma pop
/* 80396DC0-80396DC0 023420 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80396DDD = "zelda_letter_select_6menu.blo";
SECTION_DEAD static char const* const stringBase_80396DFB = "";
#pragma pop
/* 801DF010-801DFA28 1D9950 0A18+00 1/1 0/0 0/0 .text screenSetMenu__14dMenu_Letter_cFv
@@ -1071,7 +1091,7 @@ SECTION_RODATA static u8 const tag_pip[72] = {
0x35, 0x5F, 0x6E, 0x00, 0x70, 0x69, 0x5F, 0x30, 0x36, 0x5F, 0x6E, 0x00, 0x70, 0x69, 0x5F,
0x30, 0x37, 0x5F, 0x6E, 0x00, 0x70, 0x69, 0x5F, 0x30, 0x38, 0x5F, 0x6E,
};
COMPILER_STRIP_GATE(80396C38, &tag_pip);
COMPILER_STRIP_GATE(0x80396C38, &tag_pip);
#pragma pop
/* 80396C80-80396CC8 0232E0 0048+00 0/1 0/0 0/0 .rodata tag_pil$4828 */
@@ -1084,7 +1104,7 @@ SECTION_RODATA static u8 const tag_pil[72] = {
0x5F, 0x30, 0x35, 0x00, 0x70, 0x69, 0x5F, 0x6C, 0x5F, 0x30, 0x36, 0x00, 0x70, 0x69, 0x5F,
0x6C, 0x5F, 0x30, 0x37, 0x00, 0x70, 0x69, 0x5F, 0x6C, 0x5F, 0x30, 0x38,
};
COMPILER_STRIP_GATE(80396C80, &tag_pil);
COMPILER_STRIP_GATE(0x80396C80, &tag_pil);
#pragma pop
/* 80396CC8-80396D10 023328 0048+00 0/1 0/0 0/0 .rodata tag_pii$4829 */
@@ -1097,7 +1117,13 @@ SECTION_RODATA static u8 const tag_pii[72] = {
0x5F, 0x30, 0x35, 0x00, 0x00, 0x00, 0x70, 0x69, 0x5F, 0x30, 0x36, 0x00, 0x00, 0x00, 0x70,
0x69, 0x5F, 0x30, 0x37, 0x00, 0x00, 0x00, 0x70, 0x69, 0x5F, 0x30, 0x38,
};
COMPILER_STRIP_GATE(80396CC8, &tag_pii);
COMPILER_STRIP_GATE(0x80396CC8, &tag_pii);
#pragma pop
/* 80396DC0-80396DC0 023420 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80396DFC = "zelda_letter_select_base.blo";
#pragma pop
/* 801DFA58-801E0330 1DA398 08D8+00 1/1 0/0 0/0 .text screenSetBase__14dMenu_Letter_cFv
@@ -1111,6 +1137,13 @@ asm void dMenu_Letter_c::screenSetBase() {
}
#pragma pop
/* ############################################################################################## */
/* 80396DC0-80396DC0 023420 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80396E19 = "zelda_letter_select_shadow.blo";
#pragma pop
/* 801E0330-801E03D8 1DAC70 00A8+00 1/1 0/0 0/0 .text screenSetShadow__14dMenu_Letter_cFv
*/
#pragma push
@@ -1132,7 +1165,15 @@ SECTION_RODATA static u8 const line_tag[96] = {
0x00, 0x00, 0x6C, 0x69, 0x6E, 0x65, 0x31, 0x37, 0x00, 0x00, 0x6C, 0x69, 0x6E, 0x65, 0x31, 0x38,
0x00, 0x00, 0x6C, 0x69, 0x6E, 0x65, 0x31, 0x39, 0x00, 0x00, 0x6C, 0x69, 0x6E, 0x65, 0x32, 0x30,
};
COMPILER_STRIP_GATE(80396D10, &line_tag);
COMPILER_STRIP_GATE(0x80396D10, &line_tag);
/* 80396DC0-80396DC0 023420 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80396E38 = "zelda_letter_window_base.blo";
SECTION_DEAD static char const* const stringBase_80396E55 = "zelda_letter_window_spot.blo";
SECTION_DEAD static char const* const stringBase_80396E72 = "tt_block8x8.bti";
#pragma pop
/* 801E03D8-801E09A8 1DAD18 05D0+00 1/1 0/0 0/0 .text screenSetLetter__14dMenu_Letter_cFv
*/
@@ -1152,7 +1193,7 @@ SECTION_RODATA static u8 const text_a_tag[40] = {
0x5F, 0x32, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x61, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80396D70, &text_a_tag);
COMPILER_STRIP_GATE(0x80396D70, &text_a_tag);
/* 80396D98-80396DC0 0233F8 0028+00 1/1 0/0 0/0 .rodata text_b_tag$5025 */
SECTION_RODATA static u8 const text_b_tag[40] = {
@@ -1160,7 +1201,13 @@ SECTION_RODATA static u8 const text_b_tag[40] = {
0x5F, 0x32, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x62, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80396D98, &text_b_tag);
COMPILER_STRIP_GATE(0x80396D98, &text_b_tag);
/* 80396DC0-80396DC0 023420 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80396E82 = "zelda_collect_soubi_do_icon_parts.blo";
#pragma pop
/* 801E09A8-801E0B24 1DB2E8 017C+00 1/1 0/0 0/0 .text screenSetDoIcon__14dMenu_Letter_cFv
*/
@@ -1310,21 +1357,7 @@ asm void __sinit_d_menu_letter_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801E1D7C = (void*)__sinit_d_menu_letter_cpp;
REGISTER_CTORS(0x801E1D7C, __sinit_d_menu_letter_cpp);
#pragma pop
/* 80396DC0-80396EA8 023420 00E8+00 10/10 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80396DC0 = "/res/Layout/letres.arc";
SECTION_DEAD static char const* const stringBase_80396DD7 = "%d/%d";
SECTION_DEAD static char const* const stringBase_80396DDD = "zelda_letter_select_6menu.blo";
SECTION_DEAD static char const* const stringBase_80396DFB = "";
SECTION_DEAD static char const* const stringBase_80396DFC = "zelda_letter_select_base.blo";
SECTION_DEAD static char const* const stringBase_80396E19 = "zelda_letter_select_shadow.blo";
SECTION_DEAD static char const* const stringBase_80396E38 = "zelda_letter_window_base.blo";
SECTION_DEAD static char const* const stringBase_80396E55 = "zelda_letter_window_spot.blo";
SECTION_DEAD static char const* const stringBase_80396E72 = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_80396E82 = "zelda_collect_soubi_do_icon_parts.blo";
#pragma pop
/* 80396DC0-80396DC0 023420 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_map_common.cpp
+45 -44
View File
@@ -153,6 +153,50 @@ asm dMenuMapCommon_c::~dMenuMapCommon_c() {
#pragma pop
/* ############################################################################################## */
/* 803959C0-803959C0 022020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803959C0 = "tt_map_icon_boss_s_ci8_16_00.bti";
SECTION_DEAD static char const* const stringBase_803959E1 = "tt_map_icon_boss_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395A00 = "im_map_icon_enter_ci8_24_02.bti";
SECTION_DEAD static char const* const stringBase_80395A20 = "im_map_icon_enter_ci8_02.bti";
SECTION_DEAD static char const* const stringBase_80395A3D = "tt_map_icon_enter_s_ci8_24_00.bti";
SECTION_DEAD static char const* const stringBase_80395A5F = "tt_map_icon_enter_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395A7F = "im_map_icon_warp_24_ci8_00.bti";
SECTION_DEAD static char const* const stringBase_80395A9E = "im_map_icon_warp_32_ci8_00.bti";
SECTION_DEAD static char const* const stringBase_80395ABD = "tt_map_icon_box_s_ci8_24_00.bti";
SECTION_DEAD static char const* const stringBase_80395ADD = "tt_map_icon_box_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395AFB =
"tt_map_icon_s_size_circle_ci4_gray_00.bti";
SECTION_DEAD static char const* const stringBase_80395B25 = "tt_map_icon_key_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395B43 = "tt_map_icon_s_size_circle_ci4_00.bti";
SECTION_DEAD static char const* const stringBase_80395B68 = "st_yuki_M.bti";
SECTION_DEAD static char const* const stringBase_80395B76 = "st_yuki_W.bti";
SECTION_DEAD static char const* const stringBase_80395B84 =
"tt_map_icon_s_size_circle_ci4_yellow_00.bti";
SECTION_DEAD static char const* const stringBase_80395BB0 = "st_gold_wolf.bti";
SECTION_DEAD static char const* const stringBase_80395BC1 = "tt_map_icon_monkey_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395BE2 =
"tt_map_icon_s_size_circle_ci4_blue_00.bti";
SECTION_DEAD static char const* const stringBase_80395C0C = "ni_obacyan.bti";
SECTION_DEAD static char const* const stringBase_80395C1B =
"im_zelda_map_icon_copy_stone_statue_snup_try_00_"
"04.bti";
SECTION_DEAD static char const* const stringBase_80395C52 = "tt_map_icon_link_s_ci8_24_00.bti";
SECTION_DEAD static char const* const stringBase_80395C73 = "tt_map_icon_link_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395C92 = "tt_map_icon_penant_s_ci8_24_00.bti";
SECTION_DEAD static char const* const stringBase_80395CB5 = "tt_map_icon_penant_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395CD6 = "im_black_32.bti";
SECTION_DEAD static char const* const stringBase_80395CE6 =
"im_hikari_no_shizuku_try_10_00_24x24.bti";
SECTION_DEAD static char const* const stringBase_80395D0F = "im_zelda_map_icon_hikari_ball_03.bti";
SECTION_DEAD static char const* const stringBase_80395D34 = "im_map_icon_iron_ball_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395D58 = "im_map_icon_basha_ci8.bti";
SECTION_DEAD static char const* const stringBase_80395D72 = "im_nijumaru_40x40_ind_01.bti";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80395D8F = "";
#pragma pop
/* 804540DC-804540E0 0026DC 0004+00 7/7 0/0 0/0 .sdata2 @3882 */
SECTION_SDATA2 static f32 lit_3882 = 1.0f;
@@ -301,47 +345,4 @@ asm void dMenuMapCommon_c::debugIcon() {
}
#pragma pop
/* 803959C0-80395D90 022020 03CF+01 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803959C0 = "tt_map_icon_boss_s_ci8_16_00.bti";
SECTION_DEAD static char const* const stringBase_803959E1 = "tt_map_icon_boss_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395A00 = "im_map_icon_enter_ci8_24_02.bti";
SECTION_DEAD static char const* const stringBase_80395A20 = "im_map_icon_enter_ci8_02.bti";
SECTION_DEAD static char const* const stringBase_80395A3D = "tt_map_icon_enter_s_ci8_24_00.bti";
SECTION_DEAD static char const* const stringBase_80395A5F = "tt_map_icon_enter_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395A7F = "im_map_icon_warp_24_ci8_00.bti";
SECTION_DEAD static char const* const stringBase_80395A9E = "im_map_icon_warp_32_ci8_00.bti";
SECTION_DEAD static char const* const stringBase_80395ABD = "tt_map_icon_box_s_ci8_24_00.bti";
SECTION_DEAD static char const* const stringBase_80395ADD = "tt_map_icon_box_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395AFB =
"tt_map_icon_s_size_circle_ci4_gray_00.bti";
SECTION_DEAD static char const* const stringBase_80395B25 = "tt_map_icon_key_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395B43 = "tt_map_icon_s_size_circle_ci4_00.bti";
SECTION_DEAD static char const* const stringBase_80395B68 = "st_yuki_M.bti";
SECTION_DEAD static char const* const stringBase_80395B76 = "st_yuki_W.bti";
SECTION_DEAD static char const* const stringBase_80395B84 =
"tt_map_icon_s_size_circle_ci4_yellow_00.bti";
SECTION_DEAD static char const* const stringBase_80395BB0 = "st_gold_wolf.bti";
SECTION_DEAD static char const* const stringBase_80395BC1 = "tt_map_icon_monkey_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395BE2 =
"tt_map_icon_s_size_circle_ci4_blue_00.bti";
SECTION_DEAD static char const* const stringBase_80395C0C = "ni_obacyan.bti";
SECTION_DEAD static char const* const stringBase_80395C1B =
"im_zelda_map_icon_copy_stone_statue_snup_try_00_"
"04.bti";
SECTION_DEAD static char const* const stringBase_80395C52 = "tt_map_icon_link_s_ci8_24_00.bti";
SECTION_DEAD static char const* const stringBase_80395C73 = "tt_map_icon_link_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395C92 = "tt_map_icon_penant_s_ci8_24_00.bti";
SECTION_DEAD static char const* const stringBase_80395CB5 = "tt_map_icon_penant_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395CD6 = "im_black_32.bti";
SECTION_DEAD static char const* const stringBase_80395CE6 =
"im_hikari_no_shizuku_try_10_00_24x24.bti";
SECTION_DEAD static char const* const stringBase_80395D0F = "im_zelda_map_icon_hikari_ball_03.bti";
SECTION_DEAD static char const* const stringBase_80395D34 = "im_map_icon_iron_ball_ci8_32_00.bti";
SECTION_DEAD static char const* const stringBase_80395D58 = "im_map_icon_basha_ci8.bti";
SECTION_DEAD static char const* const stringBase_80395D72 = "im_nijumaru_40x40_ind_01.bti";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80395D8F = "";
#pragma pop
/* 803959C0-803959C0 022020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_option.cpp
+80 -76
View File
@@ -28,8 +28,6 @@ struct mDoCPd_c {
struct dSv_player_config_c {
/* 80034684 */ void getSound();
/* 8003468C */ void setSound(u8);
/* 8003469C */ void setVibration(u8);
};
struct J2DBasePosition {};
@@ -174,14 +172,13 @@ struct dFile_warning_c {
};
struct dComIfG_play_c {
/* 8002B3A8 */ void setNowVibration(u8);
/* 8002B3B0 */ void getNowVibration();
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -896,7 +893,7 @@ SECTION_RODATA static u8 const dMo_soundMode[12 + 4 /* padding */] = {
0x00,
0x00,
};
COMPILER_STRIP_GATE(80396EA8, &dMo_soundMode);
COMPILER_STRIP_GATE(0x80396EA8, &dMo_soundMode);
/* 80396EB8-80396EE0 023518 0028+00 0/1 0/0 0/0 .rodata text_a_tag$3904 */
#pragma push
@@ -906,7 +903,7 @@ SECTION_RODATA static u8 const text_a_tag_3904[40] = {
0x5F, 0x32, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x61, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80396EB8, &text_a_tag_3904);
COMPILER_STRIP_GATE(0x80396EB8, &text_a_tag_3904);
#pragma pop
/* 80396EE0-80396F08 023540 0028+00 0/1 0/0 0/0 .rodata text_b_tag$3905 */
@@ -917,7 +914,7 @@ SECTION_RODATA static u8 const text_b_tag_3905[40] = {
0x5F, 0x32, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x62, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80396EE0, &text_b_tag_3905);
COMPILER_STRIP_GATE(0x80396EE0, &text_b_tag_3905);
#pragma pop
/* 80396F08-80396F18 023568 0010+00 0/1 0/0 0/0 .rodata l_tagName012$3918 */
@@ -926,7 +923,7 @@ COMPILER_STRIP_GATE(80396EE0, &text_b_tag_3905);
SECTION_RODATA static u8 const l_tagName012[16] = {
0x00, 0x00, 0x77, 0x5F, 0x6E, 0x6F, 0x5F, 0x6E, 0x00, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x6E,
};
COMPILER_STRIP_GATE(80396F08, &l_tagName012);
COMPILER_STRIP_GATE(0x80396F08, &l_tagName012);
#pragma pop
/* 80396F18-80396F28 023578 0010+00 0/1 0/0 0/0 .rodata l_tagName013$3919 */
@@ -935,7 +932,7 @@ COMPILER_STRIP_GATE(80396F08, &l_tagName012);
SECTION_RODATA static u8 const l_tagName013[16] = {
0x00, 0x00, 0x77, 0x5F, 0x6E, 0x6F, 0x5F, 0x74, 0x00, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x74,
};
COMPILER_STRIP_GATE(80396F18, &l_tagName013);
COMPILER_STRIP_GATE(0x80396F18, &l_tagName013);
#pragma pop
/* 80396F28-80396F38 023588 0010+00 0/1 0/0 0/0 .rodata l_tagName9$3928 */
@@ -944,7 +941,7 @@ COMPILER_STRIP_GATE(80396F18, &l_tagName013);
SECTION_RODATA static u8 const l_tagName9[16] = {
0x00, 0x00, 0x77, 0x5F, 0x6E, 0x6F, 0x5F, 0x6D, 0x00, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x6D,
};
COMPILER_STRIP_GATE(80396F28, &l_tagName9);
COMPILER_STRIP_GATE(0x80396F28, &l_tagName9);
#pragma pop
/* 80396F38-80396F48 023598 0010+00 0/1 0/0 0/0 .rodata l_tagName10$3929 */
@@ -953,7 +950,7 @@ COMPILER_STRIP_GATE(80396F28, &l_tagName9);
SECTION_RODATA static u8 const l_tagName10[16] = {
0x00, 0x00, 0x77, 0x5F, 0x6E, 0x6F, 0x5F, 0x67, 0x00, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x67,
};
COMPILER_STRIP_GATE(80396F38, &l_tagName10);
COMPILER_STRIP_GATE(0x80396F38, &l_tagName10);
#pragma pop
/* 80396F48-80396F58 0235A8 0010+00 0/1 0/0 0/0 .rodata l_tagName11$3930 */
@@ -962,7 +959,24 @@ COMPILER_STRIP_GATE(80396F38, &l_tagName10);
SECTION_RODATA static u8 const l_tagName11[16] = {
0x00, 0x77, 0x5F, 0x6E, 0x6F, 0x5F, 0x67, 0x72, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x67, 0x72,
};
COMPILER_STRIP_GATE(80396F48, &l_tagName11);
COMPILER_STRIP_GATE(0x80396F48, &l_tagName11);
#pragma pop
/* 803975D8-803975D8 023C38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803975D8 = "zelda_option_select_menu.blo";
SECTION_DEAD static char const* const stringBase_803975F5 = "";
SECTION_DEAD static char const* const stringBase_803975F6 = "zelda_option_base.blo";
SECTION_DEAD static char const* const stringBase_8039760C = "zelda_option_menu_text.blo";
SECTION_DEAD static char const* const stringBase_80397627 = "zelda_option_menu_shadow.blo";
SECTION_DEAD static char const* const stringBase_80397644 = "zelda_option_check.blo";
SECTION_DEAD static char const* const stringBase_8039765B = "zelda_collect_soubi_do_icon_parts.blo";
SECTION_DEAD static char const* const stringBase_80397681 = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_80397691 = "zelda_file_select_yes_no_window.blo";
SECTION_DEAD static char const* const stringBase_803976B5 = "zelda_file_select_yes_no_window.bck";
SECTION_DEAD static char const* const stringBase_803976D9 = "zelda_file_select_yes_no_window.bpk";
SECTION_DEAD static char const* const stringBase_803976FD = "zelda_file_select_yes_no_window.btk";
#pragma pop
/* 80454328-8045432C 002928 0002+02 1/1 0/0 0/0 .sdata2 l_msgNum2$3920 */
@@ -1106,6 +1120,13 @@ asm void dMenu_Option_c::setAnimation() {
}
#pragma pop
/* ############################################################################################## */
/* 803975D8-803975D8 023C38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80397721 = "/res/Layout/optres.arc";
#pragma pop
/* 801E3B98-801E3DE0 1DE4D8 0248+00 0/0 2/2 0/0 .text _open__14dMenu_Option_cFv */
#pragma push
#pragma optimization_level 0
@@ -1449,7 +1470,7 @@ SECTION_RODATA static u8 const tag_frame[48] = {
0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x32, 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x33,
0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x34, 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x35,
};
COMPILER_STRIP_GATE(80396F58, &tag_frame);
COMPILER_STRIP_GATE(0x80396F58, &tag_frame);
#pragma pop
/* 80396F88-80396FB8 0235E8 0030+00 0/1 0/0 0/0 .rodata tag_menu0$5202 */
@@ -1460,7 +1481,7 @@ SECTION_RODATA static u8 const tag_menu0[48] = {
0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33,
0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35,
};
COMPILER_STRIP_GATE(80396F88, &tag_menu0);
COMPILER_STRIP_GATE(0x80396F88, &tag_menu0);
#pragma pop
/* 80396FB8-80396FE8 023618 0030+00 0/1 0/0 0/0 .rodata let_n$5214 */
@@ -1471,7 +1492,7 @@ SECTION_RODATA static u8 const let_n[48] = {
0x6C, 0x65, 0x74, 0x5F, 0x30, 0x32, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x33, 0x5F, 0x6E,
0x6C, 0x65, 0x74, 0x5F, 0x30, 0x34, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x35, 0x5F, 0x6E,
};
COMPILER_STRIP_GATE(80396FB8, &let_n);
COMPILER_STRIP_GATE(0x80396FB8, &let_n);
#pragma pop
/* 80396FE8-80397018 023648 0030+00 0/1 0/0 0/0 .rodata let2_n$5215 */
@@ -1482,7 +1503,7 @@ SECTION_RODATA static u8 const let2_n[48] = {
0x6C, 0x65, 0x74, 0x5F, 0x30, 0x32, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x33, 0x5F, 0x6E,
0x6C, 0x65, 0x74, 0x5F, 0x30, 0x34, 0x5F, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80396FE8, &let2_n);
COMPILER_STRIP_GATE(0x80396FE8, &let2_n);
#pragma pop
/* 80397018-80397048 023678 0030+00 0/1 0/0 0/0 .rodata menu_n$5216 */
@@ -1493,7 +1514,7 @@ SECTION_RODATA static u8 const menu_n[48] = {
0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x6E, 0x32, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x6E, 0x33,
0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x6E, 0x34, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x6E, 0x35,
};
COMPILER_STRIP_GATE(80397018, &menu_n);
COMPILER_STRIP_GATE(0x80397018, &menu_n);
#pragma pop
/* 80397048-80397078 0236A8 0030+00 0/1 0/0 0/0 .rodata menu2_n$5217 */
@@ -1504,7 +1525,7 @@ SECTION_RODATA static u8 const menu2_n[48] = {
0x00, 0x00, 0x6D, 0x77, 0x5F, 0x6E, 0x5F, 0x32, 0x00, 0x00, 0x6D, 0x77, 0x5F, 0x6E, 0x5F, 0x33,
0x00, 0x00, 0x6D, 0x77, 0x5F, 0x6E, 0x5F, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80397048, &menu2_n);
COMPILER_STRIP_GATE(0x80397048, &menu2_n);
#pragma pop
/* 80397078-803970A8 0236D8 0030+00 0/1 0/0 0/0 .rodata al0_n$5218 */
@@ -1515,7 +1536,7 @@ SECTION_RODATA static u8 const al0_n[48] = {
0x73, 0x5F, 0x67, 0x72, 0x72, 0x5F, 0x30, 0x32, 0x73, 0x5F, 0x67, 0x72, 0x72, 0x5F, 0x30, 0x33,
0x73, 0x5F, 0x67, 0x72, 0x72, 0x5F, 0x30, 0x34, 0x73, 0x5F, 0x67, 0x72, 0x72, 0x5F, 0x30, 0x35,
};
COMPILER_STRIP_GATE(80397078, &al0_n);
COMPILER_STRIP_GATE(0x80397078, &al0_n);
#pragma pop
/* 803970A8-803970D8 023708 0030+00 0/1 0/0 0/0 .rodata al1_n$5219 */
@@ -1526,7 +1547,7 @@ SECTION_RODATA static u8 const al1_n[48] = {
0x63, 0x5F, 0x67, 0x72, 0x72, 0x5F, 0x30, 0x32, 0x63, 0x5F, 0x67, 0x72, 0x72, 0x5F, 0x30, 0x33,
0x63, 0x5F, 0x67, 0x72, 0x72, 0x5F, 0x30, 0x34, 0x63, 0x5F, 0x67, 0x72, 0x72, 0x5F, 0x30, 0x35,
};
COMPILER_STRIP_GATE(803970A8, &al1_n);
COMPILER_STRIP_GATE(0x803970A8, &al1_n);
#pragma pop
/* 803970D8-80397108 023738 0030+00 0/1 0/0 0/0 .rodata al2_n$5220 */
@@ -1537,7 +1558,7 @@ SECTION_RODATA static u8 const al2_n[48] = {
0x73, 0x5F, 0x67, 0x72, 0x6C, 0x5F, 0x30, 0x32, 0x73, 0x5F, 0x67, 0x72, 0x6C, 0x5F, 0x30, 0x33,
0x73, 0x5F, 0x67, 0x72, 0x6C, 0x5F, 0x30, 0x34, 0x73, 0x5F, 0x67, 0x72, 0x6C, 0x5F, 0x30, 0x35,
};
COMPILER_STRIP_GATE(803970D8, &al2_n);
COMPILER_STRIP_GATE(0x803970D8, &al2_n);
#pragma pop
/* 80397108-80397138 023768 0030+00 0/1 0/0 0/0 .rodata al3_n$5221 */
@@ -1548,7 +1569,7 @@ SECTION_RODATA static u8 const al3_n[48] = {
0x63, 0x5F, 0x67, 0x72, 0x6C, 0x5F, 0x30, 0x32, 0x63, 0x5F, 0x67, 0x72, 0x6C, 0x5F, 0x30, 0x33,
0x63, 0x5F, 0x67, 0x72, 0x6C, 0x5F, 0x30, 0x34, 0x63, 0x5F, 0x67, 0x72, 0x6C, 0x5F, 0x30, 0x35,
};
COMPILER_STRIP_GATE(80397108, &al3_n);
COMPILER_STRIP_GATE(0x80397108, &al3_n);
#pragma pop
/* 80397138-80397160 023798 0028+00 0/1 0/0 0/0 .rodata haihail_n$5238 */
@@ -1559,7 +1580,7 @@ SECTION_RODATA static u8 const haihail_n[40] = {
0x6C, 0x31, 0x79, 0x5F, 0x73, 0x65, 0x74, 0x5F, 0x6C, 0x32, 0x79, 0x5F, 0x73, 0x65,
0x74, 0x5F, 0x6C, 0x33, 0x79, 0x5F, 0x73, 0x65, 0x74, 0x5F, 0x6C, 0x34,
};
COMPILER_STRIP_GATE(80397138, &haihail_n);
COMPILER_STRIP_GATE(0x80397138, &haihail_n);
#pragma pop
/* 80397160-80397188 0237C0 0028+00 0/1 0/0 0/0 .rodata haihair_n$5239 */
@@ -1570,7 +1591,7 @@ SECTION_RODATA static u8 const haihair_n[40] = {
0x72, 0x31, 0x79, 0x5F, 0x73, 0x65, 0x74, 0x5F, 0x72, 0x32, 0x79, 0x5F, 0x73, 0x65,
0x74, 0x5F, 0x72, 0x33, 0x79, 0x5F, 0x73, 0x65, 0x74, 0x5F, 0x72, 0x34,
};
COMPILER_STRIP_GATE(80397160, &haihair_n);
COMPILER_STRIP_GATE(0x80397160, &haihair_n);
#pragma pop
/* 80397188-803971B8 0237E8 0030+00 0/1 0/0 0/0 .rodata menu3_n$5256 */
@@ -1581,7 +1602,7 @@ SECTION_RODATA static u8 const menu3_n[48] = {
0x6D, 0x65, 0x6E, 0x75, 0x61, 0x70, 0x6E, 0x32, 0x6D, 0x65, 0x6E, 0x75, 0x61, 0x70, 0x6E, 0x33,
0x6D, 0x65, 0x6E, 0x75, 0x61, 0x70, 0x6E, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80397188, &menu3_n);
COMPILER_STRIP_GATE(0x80397188, &menu3_n);
#pragma pop
/* 803971B8-803971E0 023818 0028+00 0/1 0/0 0/0 .rodata tv_btnA$5275 */
@@ -1592,7 +1613,7 @@ SECTION_RODATA static u8 const tv_btnA[40] = {
0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74,
0x5F, 0x61, 0x74, 0x34, 0x00, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74,
};
COMPILER_STRIP_GATE(803971B8, &tv_btnA);
COMPILER_STRIP_GATE(0x803971B8, &tv_btnA);
#pragma pop
/* 803971E0-80397208 023840 0028+00 0/1 0/0 0/0 .rodata ftv_btnA$5276 */
@@ -1603,7 +1624,7 @@ SECTION_RODATA static u8 const ftv_btnA[40] = {
0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74,
0x5F, 0x61, 0x74, 0x34, 0x00, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74,
};
COMPILER_STRIP_GATE(803971E0, &ftv_btnA);
COMPILER_STRIP_GATE(0x803971E0, &ftv_btnA);
#pragma pop
/* 80397208-80397218 023868 0010+00 0/1 0/0 0/0 .rodata fenu_t0$5282 */
@@ -1612,7 +1633,7 @@ COMPILER_STRIP_GATE(803971E0, &ftv_btnA);
SECTION_RODATA static u8 const fenu_t0[16] = {
0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x30, 0x73, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x30,
};
COMPILER_STRIP_GATE(80397208, &fenu_t0);
COMPILER_STRIP_GATE(0x80397208, &fenu_t0);
#pragma pop
/* 80397218-80397228 023878 0010+00 0/1 0/0 0/0 .rodata menu_t0$5283 */
@@ -1621,7 +1642,7 @@ COMPILER_STRIP_GATE(80397208, &fenu_t0);
SECTION_RODATA static u8 const menu_t0[16] = {
0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x30, 0x73, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x30,
};
COMPILER_STRIP_GATE(80397218, &menu_t0);
COMPILER_STRIP_GATE(0x80397218, &menu_t0);
#pragma pop
/* 80397228-80397238 023888 0010+00 0/1 0/0 0/0 .rodata fenu_t2$5289 */
@@ -1630,7 +1651,7 @@ COMPILER_STRIP_GATE(80397218, &menu_t0);
SECTION_RODATA static u8 const fenu_t2[16] = {
0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x73, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31,
};
COMPILER_STRIP_GATE(80397228, &fenu_t2);
COMPILER_STRIP_GATE(0x80397228, &fenu_t2);
#pragma pop
/* 80397238-80397248 023898 0010+00 0/1 0/0 0/0 .rodata menu_t2$5290 */
@@ -1639,7 +1660,7 @@ COMPILER_STRIP_GATE(80397228, &fenu_t2);
SECTION_RODATA static u8 const menu_t2[16] = {
0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x73, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31,
};
COMPILER_STRIP_GATE(80397238, &menu_t2);
COMPILER_STRIP_GATE(0x80397238, &menu_t2);
#pragma pop
/* 80397248-80397258 0238A8 0010+00 0/1 0/0 0/0 .rodata fenu_t3$5296 */
@@ -1648,7 +1669,7 @@ COMPILER_STRIP_GATE(80397238, &menu_t2);
SECTION_RODATA static u8 const fenu_t3[16] = {
0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, 0x73, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32,
};
COMPILER_STRIP_GATE(80397248, &fenu_t3);
COMPILER_STRIP_GATE(0x80397248, &fenu_t3);
#pragma pop
/* 80397258-80397268 0238B8 0010+00 0/1 0/0 0/0 .rodata menu_t3$5297 */
@@ -1657,7 +1678,7 @@ COMPILER_STRIP_GATE(80397248, &fenu_t3);
SECTION_RODATA static u8 const menu_t3[16] = {
0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, 0x73, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32,
};
COMPILER_STRIP_GATE(80397258, &menu_t3);
COMPILER_STRIP_GATE(0x80397258, &menu_t3);
#pragma pop
/* 80397268-80397278 0238C8 0010+00 0/1 0/0 0/0 .rodata fenu_t4$5303 */
@@ -1666,7 +1687,7 @@ COMPILER_STRIP_GATE(80397258, &menu_t3);
SECTION_RODATA static u8 const fenu_t4[16] = {
0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33, 0x73, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33,
};
COMPILER_STRIP_GATE(80397268, &fenu_t4);
COMPILER_STRIP_GATE(0x80397268, &fenu_t4);
#pragma pop
/* 80397278-80397288 0238D8 0010+00 0/1 0/0 0/0 .rodata menu_t4$5304 */
@@ -1675,7 +1696,7 @@ COMPILER_STRIP_GATE(80397268, &fenu_t4);
SECTION_RODATA static u8 const menu_t4[16] = {
0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33, 0x73, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33,
};
COMPILER_STRIP_GATE(80397278, &menu_t4);
COMPILER_STRIP_GATE(0x80397278, &menu_t4);
#pragma pop
/* 80397288-80397298 0238E8 0010+00 0/1 0/0 0/0 .rodata fenu_t1$5310 */
@@ -1684,7 +1705,7 @@ COMPILER_STRIP_GATE(80397278, &menu_t4);
SECTION_RODATA static u8 const fenu_t1[16] = {
0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x73, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34,
};
COMPILER_STRIP_GATE(80397288, &fenu_t1);
COMPILER_STRIP_GATE(0x80397288, &fenu_t1);
#pragma pop
/* 80397298-803972A8 0238F8 0010+00 0/1 0/0 0/0 .rodata menu_t1$5311 */
@@ -1693,7 +1714,7 @@ COMPILER_STRIP_GATE(80397288, &fenu_t1);
SECTION_RODATA static u8 const menu_t1[16] = {
0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x73, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34,
};
COMPILER_STRIP_GATE(80397298, &menu_t1);
COMPILER_STRIP_GATE(0x80397298, &menu_t1);
#pragma pop
/* 803972A8-803972B8 023908 0010+00 0/1 0/0 0/0 .rodata fenu_t5$5317 */
@@ -1702,7 +1723,7 @@ COMPILER_STRIP_GATE(80397298, &menu_t1);
SECTION_RODATA static u8 const fenu_t5[16] = {
0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x73, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35,
};
COMPILER_STRIP_GATE(803972A8, &fenu_t5);
COMPILER_STRIP_GATE(0x803972A8, &fenu_t5);
#pragma pop
/* 803972B8-803972C8 023918 0010+00 0/1 0/0 0/0 .rodata menu_t5$5318 */
@@ -1711,7 +1732,7 @@ COMPILER_STRIP_GATE(803972A8, &fenu_t5);
SECTION_RODATA static u8 const menu_t5[16] = {
0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x73, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35,
};
COMPILER_STRIP_GATE(803972B8, &menu_t5);
COMPILER_STRIP_GATE(0x803972B8, &menu_t5);
#pragma pop
/* 803972C8-803972F8 023928 0030+00 0/1 0/0 0/0 .rodata menut_0$5324 */
@@ -1722,7 +1743,7 @@ SECTION_RODATA static u8 const menut_0[48] = {
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x30, 0x61, 0x32, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x30, 0x61, 0x31,
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x30, 0x61, 0x34, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x30, 0x61, 0x33,
};
COMPILER_STRIP_GATE(803972C8, &menut_0);
COMPILER_STRIP_GATE(0x803972C8, &menut_0);
#pragma pop
/* 803972F8-80397328 023958 0030+00 0/1 0/0 0/0 .rodata fenut_0$5325 */
@@ -1733,7 +1754,7 @@ SECTION_RODATA static u8 const fenut_0[48] = {
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x30, 0x61, 0x38, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x30, 0x61, 0x37,
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x30, 0x61, 0x36, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x30, 0x61, 0x35,
};
COMPILER_STRIP_GATE(803972F8, &fenut_0);
COMPILER_STRIP_GATE(0x803972F8, &fenut_0);
#pragma pop
/* 80397328-80397358 023988 0030+00 0/1 0/0 0/0 .rodata menut_1$5332 */
@@ -1744,7 +1765,7 @@ SECTION_RODATA static u8 const menut_1[48] = {
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x31, 0x61, 0x32, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x31, 0x61, 0x31,
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x31, 0x61, 0x34, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x31, 0x61, 0x33,
};
COMPILER_STRIP_GATE(80397328, &menut_1);
COMPILER_STRIP_GATE(0x80397328, &menut_1);
#pragma pop
/* 80397358-80397388 0239B8 0030+00 0/1 0/0 0/0 .rodata fenut_1$5333 */
@@ -1755,7 +1776,7 @@ SECTION_RODATA static u8 const fenut_1[48] = {
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x31, 0x61, 0x38, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x31, 0x61, 0x37,
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x31, 0x61, 0x36, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x31, 0x61, 0x35,
};
COMPILER_STRIP_GATE(80397358, &fenut_1);
COMPILER_STRIP_GATE(0x80397358, &fenut_1);
#pragma pop
/* 80397388-803973B8 0239E8 0030+00 0/1 0/0 0/0 .rodata menut_2$5340 */
@@ -1766,7 +1787,7 @@ SECTION_RODATA static u8 const menut_2[48] = {
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x32, 0x61, 0x32, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x32, 0x61, 0x31,
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x32, 0x61, 0x34, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x32, 0x61, 0x33,
};
COMPILER_STRIP_GATE(80397388, &menut_2);
COMPILER_STRIP_GATE(0x80397388, &menut_2);
#pragma pop
/* 803973B8-803973E8 023A18 0030+00 0/1 0/0 0/0 .rodata fenut_2$5341 */
@@ -1777,7 +1798,7 @@ SECTION_RODATA static u8 const fenut_2[48] = {
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x32, 0x61, 0x38, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x32, 0x61, 0x37,
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x32, 0x61, 0x36, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x32, 0x61, 0x35,
};
COMPILER_STRIP_GATE(803973B8, &fenut_2);
COMPILER_STRIP_GATE(0x803973B8, &fenut_2);
#pragma pop
/* 803973E8-80397418 023A48 0030+00 0/1 0/0 0/0 .rodata menut_3$5348 */
@@ -1788,7 +1809,7 @@ SECTION_RODATA static u8 const menut_3[48] = {
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x61, 0x37, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x61, 0x38,
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x61, 0x39, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x31, 0x30,
};
COMPILER_STRIP_GATE(803973E8, &menut_3);
COMPILER_STRIP_GATE(0x803973E8, &menut_3);
#pragma pop
/* 80397418-80397448 023A78 0030+00 0/1 0/0 0/0 .rodata fenut_3$5349 */
@@ -1799,7 +1820,7 @@ SECTION_RODATA static u8 const fenut_3[48] = {
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x31, 0x33, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x31, 0x32,
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x31, 0x31, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x30, 0x30, 0x31,
};
COMPILER_STRIP_GATE(80397418, &fenut_3);
COMPILER_STRIP_GATE(0x80397418, &fenut_3);
#pragma pop
/* 80397448-80397478 023AA8 0030+00 0/1 0/0 0/0 .rodata menut_4$5356 */
@@ -1810,7 +1831,7 @@ SECTION_RODATA static u8 const menut_4[48] = {
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x61, 0x32, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x61, 0x31,
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x61, 0x34, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x61, 0x33,
};
COMPILER_STRIP_GATE(80397448, &menut_4);
COMPILER_STRIP_GATE(0x80397448, &menut_4);
#pragma pop
/* 80397478-803974A8 023AD8 0030+00 0/1 0/0 0/0 .rodata fenut_4$5357 */
@@ -1821,7 +1842,7 @@ SECTION_RODATA static u8 const fenut_4[48] = {
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x31, 0x39, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x31, 0x38,
0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x31, 0x37, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x31, 0x36,
};
COMPILER_STRIP_GATE(80397478, &fenut_4);
COMPILER_STRIP_GATE(0x80397478, &fenut_4);
#pragma pop
/* 803974A8-803974D8 023B08 0030+00 0/1 0/0 0/0 .rodata tx$5381 */
@@ -1832,7 +1853,7 @@ SECTION_RODATA static u8 const tx[48] = {
0x77, 0x5F, 0x70, 0x5F, 0x74, 0x65, 0x78, 0x33, 0x77, 0x5F, 0x70, 0x5F, 0x74, 0x65, 0x78, 0x34,
0x66, 0x70, 0x73, 0x5F, 0x74, 0x65, 0x78, 0x31, 0x66, 0x5F, 0x70, 0x5F, 0x74, 0x65, 0x78, 0x31,
};
COMPILER_STRIP_GATE(803974A8, &tx);
COMPILER_STRIP_GATE(0x803974A8, &tx);
#pragma pop
/* 803974D8-803974F8 023B38 0020+00 0/0 0/0 0/0 .rodata op_tx$5393 */
@@ -1842,7 +1863,7 @@ SECTION_RODATA static u8 const op_tx[32] = {
0x77, 0x5F, 0x74, 0x65, 0x78, 0x74, 0x5F, 0x6E, 0x00, 0x77, 0x5F, 0x62, 0x74, 0x6E, 0x5F, 0x6E,
0x00, 0x77, 0x5F, 0x6B, 0x5F, 0x74, 0x5F, 0x6E, 0x77, 0x5F, 0x61, 0x62, 0x74, 0x6E, 0x5F, 0x6E,
};
COMPILER_STRIP_GATE(803974D8, &op_tx);
COMPILER_STRIP_GATE(0x803974D8, &op_tx);
#pragma pop
/* 803974F8-80397510 023B58 0018+00 0/1 0/0 0/0 .rodata z_tx$5399 */
@@ -1852,7 +1873,7 @@ SECTION_RODATA static u8 const z_tx[24] = {
0x00, 0x00, 0x7A, 0x5F, 0x67, 0x63, 0x5F, 0x6E, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803974F8, &z_tx);
COMPILER_STRIP_GATE(0x803974F8, &z_tx);
#pragma pop
/* 80397510-80397560 023B70 0050+00 0/1 0/0 0/0 .rodata txTV$5409 */
@@ -1865,7 +1886,7 @@ SECTION_RODATA static u8 const txTV[80] = {
0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x37, 0x31, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33,
0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x38, 0x31, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34,
};
COMPILER_STRIP_GATE(80397510, &txTV);
COMPILER_STRIP_GATE(0x80397510, &txTV);
#pragma pop
/* 801E5678-801E6FBC 1DFFB8 1944+00 1/1 0/0 0/0 .text screenSet__14dMenu_Option_cFv */
@@ -2014,7 +2035,7 @@ SECTION_RODATA static u8 const txTVhide[40] = {
0x39, 0x6E, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x30, 0x6E, 0x00, 0x6D, 0x65, 0x6E,
0x75, 0x5F, 0x37, 0x6E, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x38, 0x6E,
};
COMPILER_STRIP_GATE(80397560, &txTVhide);
COMPILER_STRIP_GATE(0x80397560, &txTVhide);
#pragma pop
/* 80397588-803975B0 023BE8 0028+00 1/1 0/0 0/0 .rodata text_a_tag$6194 */
@@ -2023,7 +2044,7 @@ SECTION_RODATA static u8 const text_a_tag_6194[40] = {
0x5F, 0x32, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x61, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80397588, &text_a_tag_6194);
COMPILER_STRIP_GATE(0x80397588, &text_a_tag_6194);
/* 801E7E98-801E7F9C 1E27D8 0104+00 11/11 0/0 0/0 .text setAButtonString__14dMenu_Option_cFUs */
#pragma push
@@ -2042,7 +2063,7 @@ SECTION_RODATA static u8 const text_b_tag_6217[40] = {
0x5F, 0x32, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x62, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(803975B0, &text_b_tag_6217);
COMPILER_STRIP_GATE(0x803975B0, &text_b_tag_6217);
/* 801E7F9C-801E80A0 1E28DC 0104+00 11/11 0/0 0/0 .text setBButtonString__14dMenu_Option_cFUs */
#pragma push
@@ -2229,24 +2250,7 @@ asm void __sinit_d_menu_option_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801E8E8C = (void*)__sinit_d_menu_option_cpp;
REGISTER_CTORS(0x801E8E8C, __sinit_d_menu_option_cpp);
#pragma pop
/* 803975D8-80397738 023C38 0160+00 5/5 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803975D8 = "zelda_option_select_menu.blo";
SECTION_DEAD static char const* const stringBase_803975F5 = "";
SECTION_DEAD static char const* const stringBase_803975F6 = "zelda_option_base.blo";
SECTION_DEAD static char const* const stringBase_8039760C = "zelda_option_menu_text.blo";
SECTION_DEAD static char const* const stringBase_80397627 = "zelda_option_menu_shadow.blo";
SECTION_DEAD static char const* const stringBase_80397644 = "zelda_option_check.blo";
SECTION_DEAD static char const* const stringBase_8039765B = "zelda_collect_soubi_do_icon_parts.blo";
SECTION_DEAD static char const* const stringBase_80397681 = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_80397691 = "zelda_file_select_yes_no_window.blo";
SECTION_DEAD static char const* const stringBase_803976B5 = "zelda_file_select_yes_no_window.bck";
SECTION_DEAD static char const* const stringBase_803976D9 = "zelda_file_select_yes_no_window.bpk";
SECTION_DEAD static char const* const stringBase_803976FD = "zelda_file_select_yes_no_window.btk";
SECTION_DEAD static char const* const stringBase_80397721 = "/res/Layout/optres.arc";
#pragma pop
/* 803975D8-803975D8 023C38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_ring.cpp
+28 -27
View File
@@ -71,10 +71,10 @@ struct dMeter2Draw_c {
struct STControl {};
struct JKRExpHeap {};
struct CSTControl {};
struct JKRExpHeap {};
struct dMenu_Ring_c {
/* 801E9118 */ dMenu_Ring_c(JKRExpHeap*, STControl*, CSTControl*, u8);
/* 801EA708 */ ~dMenu_Ring_c();
@@ -400,7 +400,7 @@ SECTION_RODATA static u8 const xy_text[40] = {
0x73, 0x31, 0x79, 0x78, 0x5F, 0x74, 0x65, 0x5F, 0x73, 0x32, 0x79, 0x78, 0x5F, 0x74,
0x65, 0x5F, 0x73, 0x33, 0x79, 0x78, 0x5F, 0x74, 0x65, 0x5F, 0x73, 0x34,
};
COMPILER_STRIP_GATE(80397738, &xy_text);
COMPILER_STRIP_GATE(0x80397738, &xy_text);
/* 80397760-80397788 023DC0 0028+00 0/1 0/0 0/0 .rodata fxy_text$4016 */
#pragma push
@@ -410,7 +410,7 @@ SECTION_RODATA static u8 const fxy_text[40] = {
0x5F, 0x31, 0x66, 0x79, 0x78, 0x5F, 0x74, 0x65, 0x5F, 0x32, 0x66, 0x79, 0x78, 0x5F,
0x74, 0x65, 0x5F, 0x33, 0x66, 0x79, 0x78, 0x5F, 0x74, 0x65, 0x5F, 0x34,
};
COMPILER_STRIP_GATE(80397760, &fxy_text);
COMPILER_STRIP_GATE(0x80397760, &fxy_text);
#pragma pop
/* 80397788-803977B0 023DE8 0028+00 0/1 0/0 0/0 .rodata c_text$4022 */
@@ -421,7 +421,7 @@ SECTION_RODATA static u8 const c_text[40] = {
0x73, 0x31, 0x00, 0x63, 0x5F, 0x74, 0x65, 0x5F, 0x73, 0x32, 0x00, 0x63, 0x5F, 0x74,
0x65, 0x5F, 0x73, 0x33, 0x00, 0x63, 0x5F, 0x74, 0x65, 0x5F, 0x73, 0x34,
};
COMPILER_STRIP_GATE(80397788, &c_text);
COMPILER_STRIP_GATE(0x80397788, &c_text);
#pragma pop
/* 803977B0-803977D8 023E10 0028+00 0/1 0/0 0/0 .rodata fc_text$4023 */
@@ -432,7 +432,7 @@ SECTION_RODATA static u8 const fc_text[40] = {
0x73, 0x31, 0x66, 0x63, 0x5F, 0x74, 0x65, 0x5F, 0x73, 0x32, 0x66, 0x63, 0x5F, 0x74,
0x65, 0x5F, 0x73, 0x33, 0x66, 0x63, 0x5F, 0x74, 0x65, 0x5F, 0x73, 0x34,
};
COMPILER_STRIP_GATE(803977B0, &fc_text);
COMPILER_STRIP_GATE(0x803977B0, &fc_text);
#pragma pop
/* 803977D8-80397800 023E38 0028+00 0/1 0/0 0/0 .rodata c_text1$4029 */
@@ -443,7 +443,7 @@ SECTION_RODATA static u8 const c_text1[40] = {
0x73, 0x31, 0x00, 0x63, 0x5F, 0x74, 0x65, 0x78, 0x73, 0x32, 0x00, 0x63, 0x5F, 0x74,
0x65, 0x78, 0x73, 0x33, 0x00, 0x63, 0x5F, 0x74, 0x65, 0x78, 0x73, 0x34,
};
COMPILER_STRIP_GATE(803977D8, &c_text1);
COMPILER_STRIP_GATE(0x803977D8, &c_text1);
#pragma pop
/* 80397800-80397828 023E60 0028+00 0/1 0/0 0/0 .rodata fc_text1$4030 */
@@ -454,7 +454,7 @@ SECTION_RODATA static u8 const fc_text1[40] = {
0x73, 0x31, 0x66, 0x63, 0x5F, 0x74, 0x65, 0x78, 0x73, 0x32, 0x66, 0x63, 0x5F, 0x74,
0x65, 0x78, 0x73, 0x33, 0x66, 0x63, 0x5F, 0x74, 0x65, 0x78, 0x73, 0x34,
};
COMPILER_STRIP_GATE(80397800, &fc_text1);
COMPILER_STRIP_GATE(0x80397800, &fc_text1);
#pragma pop
/* 80397828-80397850 023E88 0028+00 0/1 0/0 0/0 .rodata t_on$4036 */
@@ -465,7 +465,7 @@ SECTION_RODATA static u8 const t_on[40] = {
0x73, 0x35, 0x67, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x36, 0x67, 0x5F, 0x74, 0x6F,
0x66, 0x5F, 0x73, 0x37, 0x67, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x38,
};
COMPILER_STRIP_GATE(80397828, &t_on);
COMPILER_STRIP_GATE(0x80397828, &t_on);
#pragma pop
/* 80397850-80397878 023EB0 0028+00 0/1 0/0 0/0 .rodata ft_on$4037 */
@@ -476,7 +476,7 @@ SECTION_RODATA static u8 const ft_on[40] = {
0x73, 0x35, 0x66, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x36, 0x66, 0x5F, 0x74, 0x6F,
0x66, 0x5F, 0x73, 0x37, 0x66, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x38,
};
COMPILER_STRIP_GATE(80397850, &ft_on);
COMPILER_STRIP_GATE(0x80397850, &ft_on);
#pragma pop
/* 80397878-803978A0 023ED8 0028+00 0/1 0/0 0/0 .rodata t_off$4043 */
@@ -487,7 +487,7 @@ SECTION_RODATA static u8 const t_off[40] = {
0x73, 0x31, 0x67, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x32, 0x67, 0x5F, 0x74, 0x6F,
0x66, 0x5F, 0x73, 0x33, 0x67, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x34,
};
COMPILER_STRIP_GATE(80397878, &t_off);
COMPILER_STRIP_GATE(0x80397878, &t_off);
#pragma pop
/* 803978A0-803978C8 023F00 0028+00 0/1 0/0 0/0 .rodata ft_off$4044 */
@@ -498,7 +498,21 @@ SECTION_RODATA static u8 const ft_off[40] = {
0x73, 0x31, 0x66, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x32, 0x66, 0x5F, 0x74, 0x6F,
0x66, 0x5F, 0x73, 0x33, 0x66, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x34,
};
COMPILER_STRIP_GATE(803978A0, &ft_off);
COMPILER_STRIP_GATE(0x803978A0, &ft_off);
#pragma pop
/* 803978C8-803978C8 023F28 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803978C8 =
"SCRN/zelda_item_select_icon_message_ver2.blo";
SECTION_DEAD static char const* const stringBase_803978F5 = "";
SECTION_DEAD static char const* const stringBase_803978F6 = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_80397906 = "SCRN/zelda_item_select_icon3_spot.blo";
SECTION_DEAD static char const* const stringBase_8039792C =
"SCRN/zelda_item_select_icon3_center_parts.blo";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039795A = "\0\0\0\0\0";
#pragma pop
/* 803BDE70-803BDE7C 01AF90 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
@@ -1296,7 +1310,7 @@ asm void __sinit_d_menu_ring_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801EF580 = (void*)__sinit_d_menu_ring_cpp;
REGISTER_CTORS(0x801EF580, __sinit_d_menu_ring_cpp);
#pragma pop
/* ############################################################################################## */
@@ -1311,17 +1325,4 @@ SECTION_SDATA2 static u8 pad_80454434[4] = {
};
#pragma pop
/* 803978C8-80397960 023F28 0092+06 2/2 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803978C8 =
"SCRN/zelda_item_select_icon_message_ver2.blo";
SECTION_DEAD static char const* const stringBase_803978F5 = "";
SECTION_DEAD static char const* const stringBase_803978F6 = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_80397906 = "SCRN/zelda_item_select_icon3_spot.blo";
SECTION_DEAD static char const* const stringBase_8039792C =
"SCRN/zelda_item_select_icon3_center_parts.blo";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039795A = "\0\0\0\0\0";
#pragma pop
/* 803978C8-803978C8 023F28 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_save.cpp
+29 -17
View File
@@ -268,10 +268,10 @@ struct Z2SeqMgr {
/* 802B3EAC */ void checkBgmIDPlaying(u32);
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
/* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
@@ -1532,6 +1532,12 @@ asm dMenu_save_c::dMenu_save_c() {
#pragma pop
/* ############################################################################################## */
/* 80397960-80397960 023FC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80397960 = "/res/Layout/saveres.arc";
#pragma pop
/* 8042E840-8042E84C 05B560 000C+00 1/1 0/0 0/0 .bss @3785 */
static u8 lit_3785[12];
@@ -1555,6 +1561,18 @@ asm void dMenu_save_c::_create() {
#pragma pop
/* ############################################################################################## */
/* 80397960-80397960 023FC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80397978 = "zelda_file_select2.blo";
SECTION_DEAD static char const* const stringBase_8039798F = "zelda_file_select2.bck";
SECTION_DEAD static char const* const stringBase_803979A6 = "zelda_file_select2.bpk";
SECTION_DEAD static char const* const stringBase_803979BD = "zelda_file_select2_02.btk";
SECTION_DEAD static char const* const stringBase_803979D7 = "zelda_file_select2.btk";
SECTION_DEAD static char const* const stringBase_803979EE = "zelda_file_select2.brk";
SECTION_DEAD static char const* const stringBase_80397A05 = "";
#pragma pop
/* 80450740-80450744 0001C0 0002+02 1/1 0/0 0/0 .sdata l_msgNum0$3868 */
SECTION_SDATA static u8 l_msgNum0[2 + 2 /* padding */] = {
0x08,
@@ -2121,6 +2139,13 @@ asm void dMenu_save_c::dataWrite() {
}
#pragma pop
/* ############################################################################################## */
/* 80397960-80397960 023FC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80397A06 = "save cmdState %d\n";
#pragma pop
/* 801F28E4-801F298C 1ED224 00A8+00 1/0 0/0 0/0 .text memCardDataSaveWait__12dMenu_save_cFv */
#pragma push
#pragma optimization_level 0
@@ -2923,20 +2948,7 @@ asm void __sinit_d_menu_save_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801F6C1C = (void*)__sinit_d_menu_save_cpp;
REGISTER_CTORS(0x801F6C1C, __sinit_d_menu_save_cpp);
#pragma pop
/* 80397960-80397A18 023FC0 00B8+00 6/6 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80397960 = "/res/Layout/saveres.arc";
SECTION_DEAD static char const* const stringBase_80397978 = "zelda_file_select2.blo";
SECTION_DEAD static char const* const stringBase_8039798F = "zelda_file_select2.bck";
SECTION_DEAD static char const* const stringBase_803979A6 = "zelda_file_select2.bpk";
SECTION_DEAD static char const* const stringBase_803979BD = "zelda_file_select2_02.btk";
SECTION_DEAD static char const* const stringBase_803979D7 = "zelda_file_select2.btk";
SECTION_DEAD static char const* const stringBase_803979EE = "zelda_file_select2.brk";
SECTION_DEAD static char const* const stringBase_80397A05 = "";
SECTION_DEAD static char const* const stringBase_80397A06 = "save cmdState %d\n";
#pragma pop
/* 80397960-80397960 023FC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_skill.cpp
+54 -38
View File
@@ -61,10 +61,10 @@ struct STControl {
/* 800325A0 */ void checkDownTrigger();
};
struct JKRExpHeap {};
struct CSTControl {};
struct JKRExpHeap {};
struct dMenu_Skill_c {
/* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*);
/* 801F7348 */ ~dMenu_Skill_c();
@@ -98,10 +98,10 @@ struct dMenu_Skill_c {
/* 801F9A08 */ void draw();
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -487,6 +487,12 @@ asm void dMenu_Skill_c::init() {
#pragma pop
/* ############################################################################################## */
/* 80397DB8-80397DB8 024418 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80397DB8 = "/res/Layout/skillres.arc";
#pragma pop
/* 804544B0-804544B8 002AB0 0008+00 4/4 0/0 0/0 .sdata2 @4016 */
SECTION_SDATA2 static f64 lit_4016 = 4503601774854144.0 /* cast s32 to float */;
@@ -536,14 +542,14 @@ SECTION_RODATA static u8 const i_id[28] = {
0x00, 0x00, 0x06, 0xB4, 0x00, 0x00, 0x06, 0xB3, 0x00, 0x00, 0x06, 0xB5, 0x00, 0x00,
0x06, 0xB6, 0x00, 0x00, 0x06, 0xB7, 0x00, 0x00, 0x06, 0xB8, 0x00, 0x00, 0x06, 0xB9,
};
COMPILER_STRIP_GATE(80397A18, &i_id);
COMPILER_STRIP_GATE(0x80397A18, &i_id);
/* 80397A34-80397A50 024094 001C+00 1/1 0/0 0/0 .rodata i_id1$4088 */
SECTION_RODATA static u8 const i_id1_4088[28] = {
0x00, 0x00, 0x06, 0xAD, 0x00, 0x00, 0x06, 0xAC, 0x00, 0x00, 0x06, 0xAE, 0x00, 0x00,
0x06, 0xAF, 0x00, 0x00, 0x06, 0xB0, 0x00, 0x00, 0x06, 0xB1, 0x00, 0x00, 0x06, 0xB2,
};
COMPILER_STRIP_GATE(80397A34, &i_id1_4088);
COMPILER_STRIP_GATE(0x80397A34, &i_id1_4088);
/* 801F7F24-801F7FF8 1F2864 00D4+00 1/0 0/0 0/0 .text read_open_init__13dMenu_Skill_cFv
*/
@@ -625,7 +631,7 @@ SECTION_RODATA static u8 const tag_sub0[56] = {
0x5F, 0x74, 0x33, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x73, 0x6D, 0x65,
0x6E, 0x75, 0x5F, 0x74, 0x35, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x31,
};
COMPILER_STRIP_GATE(80397A50, &tag_sub0);
COMPILER_STRIP_GATE(0x80397A50, &tag_sub0);
#pragma pop
/* 80397A88-80397AC0 0240E8 0038+00 0/1 0/0 0/0 .rodata tag_sub1$4149 */
@@ -637,7 +643,7 @@ SECTION_RODATA static u8 const tag_sub1[56] = {
0x75, 0x5F, 0x74, 0x33, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x00, 0x6D,
0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x36,
};
COMPILER_STRIP_GATE(80397A88, &tag_sub1);
COMPILER_STRIP_GATE(0x80397A88, &tag_sub1);
#pragma pop
/* 80397AC0-80397AF8 024120 0038+00 0/1 0/0 0/0 .rodata tag_name0$4150 */
@@ -649,7 +655,7 @@ SECTION_RODATA static u8 const tag_name0[56] = {
0x5F, 0x74, 0x39, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x30, 0x73, 0x6D, 0x65,
0x6E, 0x75, 0x5F, 0x31, 0x31, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x31, 0x32,
};
COMPILER_STRIP_GATE(80397AC0, &tag_name0);
COMPILER_STRIP_GATE(0x80397AC0, &tag_name0);
#pragma pop
/* 80397AF8-80397B30 024158 0038+00 0/1 0/0 0/0 .rodata tag_name1$4151 */
@@ -661,7 +667,7 @@ SECTION_RODATA static u8 const tag_name1[56] = {
0x75, 0x5F, 0x74, 0x39, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x30, 0x6D, 0x65,
0x6E, 0x75, 0x5F, 0x74, 0x31, 0x31, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x30, 0x31,
};
COMPILER_STRIP_GATE(80397AF8, &tag_name1);
COMPILER_STRIP_GATE(0x80397AF8, &tag_name1);
#pragma pop
/* 80397B30-80397B68 024190 0038+00 0/1 0/0 0/0 .rodata ftag_sub0$4152 */
@@ -673,7 +679,7 @@ SECTION_RODATA static u8 const ftag_sub0[56] = {
0x5F, 0x74, 0x33, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x73, 0x66, 0x65,
0x6E, 0x75, 0x5F, 0x74, 0x35, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x36, 0x73,
};
COMPILER_STRIP_GATE(80397B30, &ftag_sub0);
COMPILER_STRIP_GATE(0x80397B30, &ftag_sub0);
#pragma pop
/* 80397B68-80397BA0 0241C8 0038+00 0/1 0/0 0/0 .rodata ftag_sub1$4153 */
@@ -685,7 +691,7 @@ SECTION_RODATA static u8 const ftag_sub1[56] = {
0x75, 0x5F, 0x74, 0x33, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x00, 0x66,
0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x36,
};
COMPILER_STRIP_GATE(80397B68, &ftag_sub1);
COMPILER_STRIP_GATE(0x80397B68, &ftag_sub1);
#pragma pop
/* 80397BA0-80397BD8 024200 0038+00 0/1 0/0 0/0 .rodata ftag_name0$4154 */
@@ -697,7 +703,7 @@ SECTION_RODATA static u8 const ftag_name0[56] = {
0x5F, 0x31, 0x30, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x31, 0x73, 0x66, 0x65,
0x6E, 0x75, 0x5F, 0x31, 0x32, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x33, 0x73,
};
COMPILER_STRIP_GATE(80397BA0, &ftag_name0);
COMPILER_STRIP_GATE(0x80397BA0, &ftag_name0);
#pragma pop
/* 80397BD8-80397C10 024238 0038+00 0/1 0/0 0/0 .rodata ftag_name1$4155 */
@@ -709,7 +715,7 @@ SECTION_RODATA static u8 const ftag_name1[56] = {
0x75, 0x5F, 0x31, 0x30, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x31, 0x00, 0x66,
0x65, 0x6E, 0x75, 0x5F, 0x31, 0x32, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x33,
};
COMPILER_STRIP_GATE(80397BD8, &ftag_name1);
COMPILER_STRIP_GATE(0x80397BD8, &ftag_name1);
#pragma pop
/* 80397C10-80397C48 024270 0038+00 0/1 0/0 0/0 .rodata tag_letter$4166 */
@@ -721,7 +727,7 @@ SECTION_RODATA static u8 const tag_letter[56] = {
0x30, 0x33, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x34, 0x5F, 0x6E, 0x6C, 0x65,
0x74, 0x5F, 0x30, 0x35, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x36, 0x5F, 0x6E,
};
COMPILER_STRIP_GATE(80397C10, &tag_letter);
COMPILER_STRIP_GATE(0x80397C10, &tag_letter);
#pragma pop
/* 80397C48-80397C80 0242A8 0038+00 0/1 0/0 0/0 .rodata tag_frame$4173 */
@@ -733,7 +739,7 @@ SECTION_RODATA static u8 const tag_frame[56] = {
0x65, 0x5F, 0x30, 0x33, 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x34, 0x66, 0x6C,
0x61, 0x6D, 0x65, 0x5F, 0x30, 0x35, 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x36,
};
COMPILER_STRIP_GATE(80397C48, &tag_frame);
COMPILER_STRIP_GATE(0x80397C48, &tag_frame);
#pragma pop
/* 80397C80-80397CB8 0242E0 0038+00 0/1 0/0 0/0 .rodata tag_maki$4174 */
@@ -745,7 +751,7 @@ SECTION_RODATA static u8 const tag_maki[56] = {
0x69, 0x5F, 0x33, 0x6E, 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x34, 0x6E, 0x00, 0x6D,
0x61, 0x6B, 0x69, 0x5F, 0x35, 0x6E, 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x36, 0x6E,
};
COMPILER_STRIP_GATE(80397C80, &tag_maki);
COMPILER_STRIP_GATE(0x80397C80, &tag_maki);
#pragma pop
/* 80397CB8-80397CF0 024318 0038+00 0/1 0/0 0/0 .rodata tag_makic$4175 */
@@ -757,7 +763,14 @@ SECTION_RODATA static u8 const tag_makic[56] = {
0x6B, 0x69, 0x5F, 0x33, 0x00, 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x34, 0x00, 0x00,
0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x35, 0x00, 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x36,
};
COMPILER_STRIP_GATE(80397CB8, &tag_makic);
COMPILER_STRIP_GATE(0x80397CB8, &tag_makic);
#pragma pop
/* 80397DB8-80397DB8 024418 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80397DD1 = "zelda_ougi_window.blo";
SECTION_DEAD static char const* const stringBase_80397DE7 = "";
#pragma pop
/* 801F8388-801F8A18 1F2CC8 0690+00 1/1 0/0 0/0 .text screenSetMenu__13dMenu_Skill_cFv */
@@ -776,14 +789,21 @@ SECTION_RODATA static u8 const name_tag[32] = {
0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x34, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x35,
0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x36, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x37,
};
COMPILER_STRIP_GATE(80397CF0, &name_tag);
COMPILER_STRIP_GATE(0x80397CF0, &name_tag);
/* 80397D10-80397D30 024370 0020+00 1/1 0/0 0/0 .rodata fame_tag$4307 */
SECTION_RODATA static u8 const fame_tag[32] = {
0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x31, 0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x32,
0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x33, 0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x34,
};
COMPILER_STRIP_GATE(80397D10, &fame_tag);
COMPILER_STRIP_GATE(0x80397D10, &fame_tag);
/* 80397DB8-80397DB8 024418 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80397DE8 = "zelda_ougi_info.blo";
SECTION_DEAD static char const* const stringBase_80397DFC = "tt_block8x8.bti";
#pragma pop
/* 801F8A18-801F8D20 1F3358 0308+00 1/1 0/0 0/0 .text screenSetLetter__13dMenu_Skill_cFv
*/
@@ -803,7 +823,7 @@ SECTION_RODATA static u8 const text_a_tag[40] = {
0x5F, 0x32, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x61, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80397D30, &text_a_tag);
COMPILER_STRIP_GATE(0x80397D30, &text_a_tag);
/* 80397D58-80397D80 0243B8 0028+00 1/1 0/0 0/0 .rodata text_b_tag$4366 */
SECTION_RODATA static u8 const text_b_tag[40] = {
@@ -811,7 +831,15 @@ SECTION_RODATA static u8 const text_b_tag[40] = {
0x5F, 0x32, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x62, 0x74, 0x65, 0x78,
0x74, 0x31, 0x5F, 0x34, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35,
};
COMPILER_STRIP_GATE(80397D58, &text_b_tag);
COMPILER_STRIP_GATE(0x80397D58, &text_b_tag);
/* 80397DB8-80397DB8 024418 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80397E0C = "zelda_collect_soubi_do_icon_parts.blo";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80397E32 = "\0\0\0\0\0";
#pragma pop
/* 801F8D20-801F8E9C 1F3660 017C+00 1/1 0/0 0/0 .text screenSetDoIcon__13dMenu_Skill_cFv
*/
@@ -850,14 +878,14 @@ SECTION_RODATA static u8 const i_id0[28] = {
0x00, 0x00, 0x06, 0xA5, 0x00, 0x00, 0x06, 0xA6, 0x00, 0x00, 0x06, 0xA7, 0x00, 0x00,
0x06, 0xA8, 0x00, 0x00, 0x06, 0xA9, 0x00, 0x00, 0x06, 0xAA, 0x00, 0x00, 0x06, 0xAB,
};
COMPILER_STRIP_GATE(80397D80, &i_id0);
COMPILER_STRIP_GATE(0x80397D80, &i_id0);
/* 80397D9C-80397DB8 0243FC 001C+00 1/1 0/0 0/0 .rodata i_id1$4479 */
SECTION_RODATA static u8 const i_id1_4479[28] = {
0x00, 0x00, 0x06, 0xAD, 0x00, 0x00, 0x06, 0xAC, 0x00, 0x00, 0x06, 0xAE, 0x00, 0x00,
0x06, 0xAF, 0x00, 0x00, 0x06, 0xB0, 0x00, 0x00, 0x06, 0xB1, 0x00, 0x00, 0x06, 0xB2,
};
COMPILER_STRIP_GATE(80397D9C, &i_id1_4479);
COMPILER_STRIP_GATE(0x80397D9C, &i_id1_4479);
/* 801F9144-801F9260 1F3A84 011C+00 1/1 0/0 0/0 .text setPageText__13dMenu_Skill_cFv */
#pragma push
@@ -942,19 +970,7 @@ asm void __sinit_d_menu_skill_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801F9A28 = (void*)__sinit_d_menu_skill_cpp;
REGISTER_CTORS(0x801F9A28, __sinit_d_menu_skill_cpp);
#pragma pop
/* 80397DB8-80397E38 024418 007A+06 7/7 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80397DB8 = "/res/Layout/skillres.arc";
SECTION_DEAD static char const* const stringBase_80397DD1 = "zelda_ougi_window.blo";
SECTION_DEAD static char const* const stringBase_80397DE7 = "";
SECTION_DEAD static char const* const stringBase_80397DE8 = "zelda_ougi_info.blo";
SECTION_DEAD static char const* const stringBase_80397DFC = "tt_block8x8.bti";
SECTION_DEAD static char const* const stringBase_80397E0C = "zelda_collect_soubi_do_icon_parts.blo";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80397E32 = "\0\0\0\0\0";
#pragma pop
/* 80397DB8-80397DB8 024418 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_window.cpp
+15 -13
View File
@@ -168,10 +168,10 @@ struct STControl {
/* 8003219C */ void checkTrigger();
};
struct JKRExpHeap {};
struct CSTControl {};
struct JKRExpHeap {};
struct dMenu_Skill_c {
/* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*);
/* 801F7718 */ void _move();
@@ -270,10 +270,10 @@ struct dDlst_MENU_CAPTURE_c {
/* 801FE2E8 */ ~dDlst_MENU_CAPTURE_c();
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -2582,6 +2582,15 @@ asm void dMw_c::markMemSize() {
}
#pragma pop
/* ############################################################################################## */
/* 80397E38-80397E38 024498 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80397E38 = "memory free error!!\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80397E4D = "\0\0";
#pragma pop
/* 801FD0D4-801FD140 1F7A14 006C+00 10/10 0/0 0/0 .text checkMemSize__5dMw_cFv */
#pragma push
#pragma optimization_level 0
@@ -2700,7 +2709,7 @@ asm void __sinit_d_menu_window_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801FD928 = (void*)__sinit_d_menu_window_cpp;
REGISTER_CTORS(0x801FD928, __sinit_d_menu_window_cpp);
#pragma pop
/* ############################################################################################## */
@@ -2727,11 +2736,4 @@ asm dDlst_MENU_CAPTURE_c::~dDlst_MENU_CAPTURE_c() {
}
#pragma pop
/* 80397E38-80397E50 024498 0015+03 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80397E38 = "memory free error!!\n";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80397E4D = "\0\0";
#pragma pop
/* 80397E38-80397E38 024498 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_window_HIO.cpp
+1 -1
View File
@@ -199,5 +199,5 @@ asm void __sinit_d_menu_window_HIO_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_801F9F28 = (void*)__sinit_d_menu_window_HIO_cpp;
REGISTER_CTORS(0x801F9F28, __sinit_d_menu_window_HIO_cpp);
#pragma pop
src/d/meter/d_meter2.cpp
+25 -13
View File
@@ -74,7 +74,6 @@ struct J2DScreen {};
struct dMeterMap_c {
/* 8020D650 */ void isEnableDispMapAndMapDispSizeTypeNo();
/* 8020D75C */ void getMapDispEdgeTop();
/* 8020D8F8 */ void setMapAlpha(u8);
/* 8020D948 */ dMeterMap_c(J2DScreen*);
/* 8020DCE4 */ void _move(u32);
/* 8020DF1C */ void _draw();
@@ -244,10 +243,10 @@ struct Z2StatusMgr {
/* 802B5F70 */ void heartGaugeOn();
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
/* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
@@ -490,6 +489,12 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
/* ############################################################################################## */
/* 80399338-80399338 025998 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80399338 = "F_SP00";
#pragma pop
/* 804549C8-804549CC 002FC8 0004+00 9/9 0/0 0/0 .sdata2 @4662 */
SECTION_SDATA2 static u8 lit_4662[4] = {
0x00,
@@ -804,6 +809,13 @@ asm void dMeter2_c::move2DContents() {
}
#pragma pop
/* ############################################################################################## */
/* 80399338-80399338 025998 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039933F = "F_SP103";
#pragma pop
/* 802237D4-80223BC4 21E114 03F0+00 1/1 0/0 0/0 .text checkSubContents__9dMeter2_cFv */
#pragma push
#pragma optimization_level 0
@@ -905,6 +917,15 @@ asm void dMeter2_c::alphaAnimeLightDrop() {
}
#pragma pop
/* ############################################################################################## */
/* 80399338-80399338 025998 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80399347 = "R_SP127";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039934F = "";
#pragma pop
/* 80224DC0-80224F70 21F700 01B0+00 1/1 0/0 0/0 .text alphaAnimeRupee__9dMeter2_cFv */
#pragma push
#pragma optimization_level 0
@@ -1069,13 +1090,4 @@ SECTION_DATA extern void* g_profile_METER2[10] = {
(void*)0x03010000, (void*)&l_dMeter2_Method,
};
/* 80399338-80399350 025998 0017+01 3/3 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80399338 = "F_SP00";
SECTION_DEAD static char const* const stringBase_8039933F = "F_SP103";
SECTION_DEAD static char const* const stringBase_80399347 = "R_SP127";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039934F = "";
#pragma pop
/* 80399338-80399338 025998 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/meter/d_meter2_draw.cpp
+96 -83
View File
@@ -29,6 +29,10 @@ struct dMsgObject_c {
/* 8023822C */ void getStatus();
};
struct ResTIMG {};
struct ResTLUT {};
struct JGeometry {
template <typename A1>
struct TBox2 {};
@@ -36,10 +40,6 @@ struct JGeometry {
struct TBox2__template0 {};
};
struct ResTIMG {};
struct ResTLUT {};
struct J2DPicture {
/* 802FC708 */ J2DPicture(ResTIMG const*);
/* 802FC800 */ J2DPicture(u64, JGeometry::TBox2<f32> const&, ResTIMG const*, ResTLUT const*);
@@ -56,24 +56,12 @@ struct dMeter2Info_c {
J2DPicture*, void*, J2DPicture*, int);
};
struct J2DRotateAxis {};
struct J2DBasePosition {};
struct J2DPane {
/* 802F666C */ void appendChild(J2DPane*);
/* 802F71DC */ void rotate(f32, f32, J2DRotateAxis, f32);
/* 802F76F8 */ void setBasePosition(J2DBasePosition);
/* 802F79A8 */ void getGlbVtx(u8) const;
/* 802F7FCC */ void animationTransform();
};
struct JKRExpHeap {};
struct JUtility {
struct TColor {};
};
struct JKRExpHeap {};
struct J2DGrafContext {};
struct JKRArchive {
@@ -87,15 +75,6 @@ struct J2DScreen {
/* 802F9690 */ void animation();
};
struct CPaneMgr {
/* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*);
/* 80254458 */ void setBlackWhite(JUtility::TColor, JUtility::TColor);
/* 802545B0 */ void paneTrans(f32, f32);
/* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16);
};
struct J2DAnmColor {};
struct CPaneMgrAlpha {
/* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*);
/* 802555C8 */ void show();
@@ -105,6 +84,27 @@ struct CPaneMgrAlpha {
/* 80255828 */ void getAlphaRate();
};
struct J2DBasePosition {};
struct J2DRotateAxis {};
struct J2DPane {
/* 802F666C */ void appendChild(J2DPane*);
/* 802F71DC */ void rotate(f32, f32, J2DRotateAxis, f32);
/* 802F76F8 */ void setBasePosition(J2DBasePosition);
/* 802F79A8 */ void getGlbVtx(u8) const;
/* 802F7FCC */ void animationTransform();
};
struct CPaneMgr {
/* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*);
/* 80254458 */ void setBlackWhite(JUtility::TColor, JUtility::TColor);
/* 802545B0 */ void paneTrans(f32, f32);
/* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16);
};
struct J2DAnmColor {};
struct dMeter2Draw_c {
/* 8020FAB4 */ dMeter2Draw_c(JKRExpHeap*);
/* 802102F8 */ ~dMeter2Draw_c();
@@ -219,10 +219,10 @@ struct dItem_data {
static void* item_resource[1530];
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
/* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
@@ -462,7 +462,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,
};
COMPILER_STRIP_GATE(80398258, &a_tag);
COMPILER_STRIP_GATE(0x80398258, &a_tag);
/* 80398280-803982A8 0248E0 0028+00 0/1 0/0 0/0 .rodata b_tag$3950 */
#pragma push
@@ -472,7 +472,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,
};
COMPILER_STRIP_GATE(80398280, &b_tag);
COMPILER_STRIP_GATE(0x80398280, &b_tag);
#pragma pop
/* 803982A8-803982D0 024908 0028+00 0/1 0/0 0/0 .rodata z_tag$3951 */
@@ -483,7 +483,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,
};
COMPILER_STRIP_GATE(803982A8, &z_tag);
COMPILER_STRIP_GATE(0x803982A8, &z_tag);
#pragma pop
/* 803982D0-803982F8 024930 0028+00 0/1 0/0 0/0 .rodata x_tag$3952 */
@@ -494,7 +494,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,
};
COMPILER_STRIP_GATE(803982D0, &x_tag);
COMPILER_STRIP_GATE(0x803982D0, &x_tag);
#pragma pop
/* 803982F8-80398320 024958 0028+00 0/1 0/0 0/0 .rodata y_tag$3953 */
@@ -505,7 +505,29 @@ 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,
};
COMPILER_STRIP_GATE(803982F8, &y_tag);
COMPILER_STRIP_GATE(0x803982F8, &y_tag);
#pragma pop
/* 803988D0-803988D0 024F30 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803988D0 = "zel_00.bmg";
SECTION_DEAD static char const* const stringBase_803988DB = "zel_01.bmg";
SECTION_DEAD static char const* const stringBase_803988E6 = "zel_02.bmg";
SECTION_DEAD static char const* const stringBase_803988F1 = "zel_03.bmg";
SECTION_DEAD static char const* const stringBase_803988FC = "zel_04.bmg";
SECTION_DEAD static char const* const stringBase_80398907 = "zel_05.bmg";
SECTION_DEAD static char const* const stringBase_80398912 = "zel_06.bmg";
SECTION_DEAD static char const* const stringBase_8039891D = "zel_07.bmg";
SECTION_DEAD static char const* const stringBase_80398928 = "zel_08.bmg";
SECTION_DEAD static char const* const stringBase_80398933 = "zel_99.bmg";
SECTION_DEAD static char const* const stringBase_8039893E = "zel_unit.bmg";
SECTION_DEAD static char const* const stringBase_8039894B = "zelda_game_image.blo";
SECTION_DEAD static char const* const stringBase_80398960 = "zelda_game_image_kantera.blo";
SECTION_DEAD static char const* const stringBase_8039897D = "zelda_icon_pikari.blo";
SECTION_DEAD static char const* const stringBase_80398993 = "zelda_icon_pikari.bck";
SECTION_DEAD static char const* const stringBase_803989A9 = "zelda_icon_pikari.bpk";
SECTION_DEAD static char const* const stringBase_803989BF = "";
#pragma pop
/* 803BF328-803BF350 -00001 0028+00 1/1 0/0 0/0 .data bmg_filename$3954 */
@@ -811,7 +833,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,
};
COMPILER_STRIP_GATE(80398320, &life_tag);
COMPILER_STRIP_GATE(0x80398320, &life_tag);
#pragma pop
/* 803983C0-80398460 024A20 00A0+00 0/1 0/0 0/0 .rodata mark_tag$4932 */
@@ -829,7 +851,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,
};
COMPILER_STRIP_GATE(803983C0, &mark_tag);
COMPILER_STRIP_GATE(0x803983C0, &mark_tag);
#pragma pop
/* 80398460-80398500 024AC0 00A0+00 0/1 0/0 0/0 .rodata base_tag$4933 */
@@ -847,7 +869,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,
};
COMPILER_STRIP_GATE(80398460, &base_tag);
COMPILER_STRIP_GATE(0x80398460, &base_tag);
#pragma pop
/* 80398500-803985A0 024B60 00A0+00 0/1 0/0 0/0 .rodata lifet1_tag$4934 */
@@ -865,7 +887,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,
};
COMPILER_STRIP_GATE(80398500, &lifet1_tag);
COMPILER_STRIP_GATE(0x80398500, &lifet1_tag);
#pragma pop
/* 803985A0-80398640 024C00 00A0+00 0/1 0/0 0/0 .rodata lifet2_tag$4935 */
@@ -883,7 +905,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,
};
COMPILER_STRIP_GATE(803985A0, &lifet2_tag);
COMPILER_STRIP_GATE(0x803985A0, &lifet2_tag);
#pragma pop
/* 80211BEC-80211E64 20C52C 0278+00 1/1 0/0 0/0 .text initLife__13dMeter2Draw_cFv */
@@ -896,6 +918,15 @@ asm void dMeter2Draw_c::initLife() {
}
#pragma pop
/* ############################################################################################## */
/* 803988D0-803988D0 024F30 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803989C0 = "zelda_game_image_sanso_10percent.bpk";
SECTION_DEAD static char const* const stringBase_803989E5 = "zelda_game_image_sanso_25percent.bpk";
SECTION_DEAD static char const* const stringBase_80398A0A = "zelda_game_image_sanso_50percent.bpk";
#pragma pop
/* 80211E64-80212190 20C7A4 032C+00 1/1 0/0 0/0 .text initMagic__13dMeter2Draw_cFv */
#pragma push
#pragma optimization_level 0
@@ -920,7 +951,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,
};
COMPILER_STRIP_GATE(80398640, &tuta_0);
COMPILER_STRIP_GATE(0x80398640, &tuta_0);
#pragma pop
/* 803986C0-80398740 024D20 0080+00 0/1 0/0 0/0 .rodata tuta_1$5095 */
@@ -936,7 +967,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,
};
COMPILER_STRIP_GATE(803986C0, &tuta_1);
COMPILER_STRIP_GATE(0x803986C0, &tuta_1);
#pragma pop
/* 80398740-803987C0 024DA0 0080+00 0/1 0/0 0/0 .rodata tuta_2$5096 */
@@ -952,7 +983,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,
};
COMPILER_STRIP_GATE(80398740, &tuta_2);
COMPILER_STRIP_GATE(0x80398740, &tuta_2);
#pragma pop
/* 80212190-80212404 20CAD0 0274+00 1/1 0/0 0/0 .text initLightDrop__13dMeter2Draw_cFv */
@@ -973,7 +1004,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,
};
COMPILER_STRIP_GATE(803987C0, &rupeet1_tag);
COMPILER_STRIP_GATE(0x803987C0, &rupeet1_tag);
#pragma pop
/* 803987E0-80398800 024E40 0020+00 0/1 0/0 0/0 .rodata rupeet2_tag$5153 */
@@ -983,7 +1014,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,
};
COMPILER_STRIP_GATE(803987E0, &rupeet2_tag);
COMPILER_STRIP_GATE(0x803987E0, &rupeet2_tag);
#pragma pop
/* 80398800-80398828 024E60 0028+00 0/1 0/0 0/0 .rodata key_tag$5165 */
@@ -994,7 +1025,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,
};
COMPILER_STRIP_GATE(80398800, &key_tag);
COMPILER_STRIP_GATE(0x80398800, &key_tag);
#pragma pop
/* 80212404-802126E4 20CD44 02E0+00 1/1 0/0 0/0 .text initRupeeKey__13dMeter2Draw_cFv */
@@ -1014,7 +1045,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,
};
COMPILER_STRIP_GATE(80398828, &juji_i_tag);
COMPILER_STRIP_GATE(0x80398828, &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] = {
@@ -1022,7 +1053,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,
};
COMPILER_STRIP_GATE(80398850, &juji_m_tag);
COMPILER_STRIP_GATE(0x80398850, &juji_m_tag);
/* 802126E4-8021350C 20D024 0E28+00 1/1 0/0 0/0 .text initButton__13dMeter2Draw_cFv */
#pragma push
@@ -1147,13 +1178,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,
};
COMPILER_STRIP_GATE(80398878, &tag_bigh);
COMPILER_STRIP_GATE(0x80398878, &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,
};
COMPILER_STRIP_GATE(80398898, &tag_du);
COMPILER_STRIP_GATE(0x80398898, &tag_du);
/* 802147CC-802149F4 20F10C 0228+00 1/1 0/0 0/0 .text changeTextureLife__13dMeter2Draw_cFibUc */
#pragma push
@@ -1556,7 +1587,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,
};
COMPILER_STRIP_GATE(803988A8, &tag_7361);
COMPILER_STRIP_GATE(0x803988A8, &tag_7361);
/* 80217AB4-80218238 2123F4 0784+00 1/1 1/1 0/0 .text drawButtonXY__13dMeter2Draw_cFiUcUcbb */
#pragma push
@@ -2112,6 +2143,19 @@ asm void dMeter2Draw_c::getFishingType() {
}
#pragma pop
/* ############################################################################################## */
/* 803988D0-803988D0 024F30 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80398A2F = "tt_heart_00.bti";
SECTION_DEAD static char const* const stringBase_80398A3F = "tt_heart_01.bti";
SECTION_DEAD static char const* const stringBase_80398A4F = "tt_heart_02.bti";
SECTION_DEAD static char const* const stringBase_80398A5F = "tt_heart_03.bti";
SECTION_DEAD static char const* const stringBase_80398A6F = "F_SP127";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80398A77 = "";
#pragma pop
/* 8021BBB4-8021BC24 2164F4 0070+00 2/2 1/1 0/0 .text getCanoeFishing__13dMeter2Draw_cFv
*/
#pragma push
@@ -2185,38 +2229,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,
};
COMPILER_STRIP_GATE(803988B8, &tag_7759);
COMPILER_STRIP_GATE(0x803988B8, &tag_7759);
#pragma pop
/* 803988D0-80398A78 024F30 01A7+01 6/5 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803988D0 = "zel_00.bmg";
SECTION_DEAD static char const* const stringBase_803988DB = "zel_01.bmg";
SECTION_DEAD static char const* const stringBase_803988E6 = "zel_02.bmg";
SECTION_DEAD static char const* const stringBase_803988F1 = "zel_03.bmg";
SECTION_DEAD static char const* const stringBase_803988FC = "zel_04.bmg";
SECTION_DEAD static char const* const stringBase_80398907 = "zel_05.bmg";
SECTION_DEAD static char const* const stringBase_80398912 = "zel_06.bmg";
SECTION_DEAD static char const* const stringBase_8039891D = "zel_07.bmg";
SECTION_DEAD static char const* const stringBase_80398928 = "zel_08.bmg";
SECTION_DEAD static char const* const stringBase_80398933 = "zel_99.bmg";
SECTION_DEAD static char const* const stringBase_8039893E = "zel_unit.bmg";
SECTION_DEAD static char const* const stringBase_8039894B = "zelda_game_image.blo";
SECTION_DEAD static char const* const stringBase_80398960 = "zelda_game_image_kantera.blo";
SECTION_DEAD static char const* const stringBase_8039897D = "zelda_icon_pikari.blo";
SECTION_DEAD static char const* const stringBase_80398993 = "zelda_icon_pikari.bck";
SECTION_DEAD static char const* const stringBase_803989A9 = "zelda_icon_pikari.bpk";
SECTION_DEAD static char const* const stringBase_803989BF = "";
SECTION_DEAD static char const* const stringBase_803989C0 = "zelda_game_image_sanso_10percent.bpk";
SECTION_DEAD static char const* const stringBase_803989E5 = "zelda_game_image_sanso_25percent.bpk";
SECTION_DEAD static char const* const stringBase_80398A0A = "zelda_game_image_sanso_50percent.bpk";
SECTION_DEAD static char const* const stringBase_80398A2F = "tt_heart_00.bti";
SECTION_DEAD static char const* const stringBase_80398A3F = "tt_heart_01.bti";
SECTION_DEAD static char const* const stringBase_80398A4F = "tt_heart_02.bti";
SECTION_DEAD static char const* const stringBase_80398A5F = "tt_heart_03.bti";
SECTION_DEAD static char const* const stringBase_80398A6F = "F_SP127";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80398A77 = "";
#pragma pop
/* 803988D0-803988D0 024F30 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/meter/d_meter2_info.cpp
+53 -47
View File
@@ -64,18 +64,18 @@ struct dMeterMap_c {
/* 8020D900 */ void isMapOpenCheck();
};
struct cXyz {};
struct J2DPicture {};
struct JMSMesgEntry_c {};
struct J2DTextBox {
/* 8021C7F4 */ void getFont() const;
};
struct JMSMesgEntry_c {};
struct JUTFont {};
struct cXyz {};
struct dMeter2Info_c {
/* 8021BDDC */ dMeter2Info_c();
/* 8021BE20 */ ~dMeter2Info_c();
@@ -264,6 +264,35 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384];
//
/* ############################################################################################## */
/* 80399168-80399168 0257C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80399168 = "";
SECTION_DEAD static char const* const stringBase_80399169 = "zel_00.bmg";
SECTION_DEAD static char const* const stringBase_80399174 = "D_MN01";
SECTION_DEAD static char const* const stringBase_8039917B = "D_MN07";
SECTION_DEAD static char const* const stringBase_80399182 =
"im_font_number_32_32_ganshinkyo_0_02.bti";
SECTION_DEAD static char const* const stringBase_803991AB =
"im_font_number_32_32_ganshinkyo_1_02.bti";
SECTION_DEAD static char const* const stringBase_803991D4 =
"im_font_number_32_32_ganshinkyo_2_02.bti";
SECTION_DEAD static char const* const stringBase_803991FD =
"im_font_number_32_32_ganshinkyo_3_02.bti";
SECTION_DEAD static char const* const stringBase_80399226 =
"im_font_number_32_32_ganshinkyo_4_03.bti";
SECTION_DEAD static char const* const stringBase_8039924F =
"im_font_number_32_32_ganshinkyo_5_02.bti";
SECTION_DEAD static char const* const stringBase_80399278 =
"im_font_number_32_32_ganshinkyo_6_02.bti";
SECTION_DEAD static char const* const stringBase_803992A1 =
"im_font_number_32_32_ganshinkyo_7_02.bti";
SECTION_DEAD static char const* const stringBase_803992CA =
"im_font_number_32_32_ganshinkyo_8_02.bti";
SECTION_DEAD static char const* const stringBase_803992F3 =
"im_font_number_32_32_ganshinkyo_9_02.bti";
#pragma pop
/* 803BF760-803BF7F4 -00001 0094+00 1/1 0/0 0/0 .data @4572 */
SECTION_DATA static void* lit_4572[37] = {
(void*)(((char*)get2ndTexture__13dMeter2Info_cFUc) + 0x64),
@@ -733,7 +762,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,
};
COMPILER_STRIP_GATE(80398A78, &black_color_4634);
COMPILER_STRIP_GATE(0x80398A78, &black_color_4634);
/* 80398B0C-80398BA0 02516C 0094+00 0/1 0/0 0/0 .rodata white_color$4635 */
#pragma push
@@ -750,7 +779,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,
};
COMPILER_STRIP_GATE(80398B0C, &white_color_4635);
COMPILER_STRIP_GATE(0x80398B0C, &white_color_4635);
#pragma pop
/* 80398BA0-80398C34 025200 0094+00 0/1 0/0 0/0 .rodata vertex_color_lu$4636 */
@@ -768,7 +797,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,
};
COMPILER_STRIP_GATE(80398BA0, &vertex_color_lu_4636);
COMPILER_STRIP_GATE(0x80398BA0, &vertex_color_lu_4636);
#pragma pop
/* 80398C34-80398CC8 025294 0094+00 0/1 0/0 0/0 .rodata vertex_color_ru$4637 */
@@ -786,7 +815,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,
};
COMPILER_STRIP_GATE(80398C34, &vertex_color_ru_4637);
COMPILER_STRIP_GATE(0x80398C34, &vertex_color_ru_4637);
#pragma pop
/* 80398CC8-80398D5C 025328 0094+00 0/1 0/0 0/0 .rodata vertex_color_ld$4638 */
@@ -804,7 +833,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,
};
COMPILER_STRIP_GATE(80398CC8, &vertex_color_ld_4638);
COMPILER_STRIP_GATE(0x80398CC8, &vertex_color_ld_4638);
#pragma pop
/* 80398D5C-80398DF0 0253BC 0094+00 0/1 0/0 0/0 .rodata vertex_color_rd$4639 */
@@ -822,7 +851,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,
};
COMPILER_STRIP_GATE(80398D5C, &vertex_color_rd_4639);
COMPILER_STRIP_GATE(0x80398D5C, &vertex_color_rd_4639);
#pragma pop
/* 8021D524-8021D644 217E64 0120+00 2/2 0/0 0/0 .text set1stColor__13dMeter2Info_cFUcP10J2DPicture
@@ -852,7 +881,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,
};
COMPILER_STRIP_GATE(80398DF0, &black_color_4675);
COMPILER_STRIP_GATE(0x80398DF0, &black_color_4675);
#pragma pop
/* 80398E84-80398F18 0254E4 0094+00 0/1 0/0 0/0 .rodata white_color$4676 */
@@ -870,7 +899,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,
};
COMPILER_STRIP_GATE(80398E84, &white_color_4676);
COMPILER_STRIP_GATE(0x80398E84, &white_color_4676);
#pragma pop
/* 80398F18-80398FAC 025578 0094+00 0/1 0/0 0/0 .rodata vertex_color_lu$4677 */
@@ -888,7 +917,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,
};
COMPILER_STRIP_GATE(80398F18, &vertex_color_lu_4677);
COMPILER_STRIP_GATE(0x80398F18, &vertex_color_lu_4677);
#pragma pop
/* 80398FAC-80399040 02560C 0094+00 0/1 0/0 0/0 .rodata vertex_color_ru$4678 */
@@ -906,7 +935,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,
};
COMPILER_STRIP_GATE(80398FAC, &vertex_color_ru_4678);
COMPILER_STRIP_GATE(0x80398FAC, &vertex_color_ru_4678);
#pragma pop
/* 80399040-803990D4 0256A0 0094+00 0/1 0/0 0/0 .rodata vertex_color_ld$4679 */
@@ -924,7 +953,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,
};
COMPILER_STRIP_GATE(80399040, &vertex_color_ld_4679);
COMPILER_STRIP_GATE(0x80399040, &vertex_color_ld_4679);
#pragma pop
/* 803990D4-80399168 025734 0094+00 0/1 0/0 0/0 .rodata vertex_color_rd$4680 */
@@ -942,7 +971,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,
};
COMPILER_STRIP_GATE(803990D4, &vertex_color_rd_4680);
COMPILER_STRIP_GATE(0x803990D4, &vertex_color_rd_4680);
#pragma pop
/* 8021D644-8021D764 217F84 0120+00 2/2 0/0 0/0 .text set2ndColor__13dMeter2Info_cFUcP10J2DPicture
@@ -1070,6 +1099,12 @@ asm void dMeter2Info_getNumberTextureName(int param_0) {
#pragma pop
/* ############################################################################################## */
/* 80399168-80399168 0257C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039931C = "im_plus_metal_24ｘ24_00.bti";
#pragma pop
/* 804510B8-804510BC 0005B8 0004+00 1/1 0/0 0/0 .sbss tex_name$5188 */
static u8 tex_name_5188[4];
@@ -1223,36 +1258,7 @@ asm void __sinit_d_meter2_info_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_8021E9D8 = (void*)__sinit_d_meter2_info_cpp;
REGISTER_CTORS(0x8021E9D8, __sinit_d_meter2_info_cpp);
#pragma pop
/* 80399168-80399338 0257C8 01D0+00 7/6 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80399168 = "";
SECTION_DEAD static char const* const stringBase_80399169 = "zel_00.bmg";
SECTION_DEAD static char const* const stringBase_80399174 = "D_MN01";
SECTION_DEAD static char const* const stringBase_8039917B = "D_MN07";
SECTION_DEAD static char const* const stringBase_80399182 =
"im_font_number_32_32_ganshinkyo_0_02.bti";
SECTION_DEAD static char const* const stringBase_803991AB =
"im_font_number_32_32_ganshinkyo_1_02.bti";
SECTION_DEAD static char const* const stringBase_803991D4 =
"im_font_number_32_32_ganshinkyo_2_02.bti";
SECTION_DEAD static char const* const stringBase_803991FD =
"im_font_number_32_32_ganshinkyo_3_02.bti";
SECTION_DEAD static char const* const stringBase_80399226 =
"im_font_number_32_32_ganshinkyo_4_03.bti";
SECTION_DEAD static char const* const stringBase_8039924F =
"im_font_number_32_32_ganshinkyo_5_02.bti";
SECTION_DEAD static char const* const stringBase_80399278 =
"im_font_number_32_32_ganshinkyo_6_02.bti";
SECTION_DEAD static char const* const stringBase_803992A1 =
"im_font_number_32_32_ganshinkyo_7_02.bti";
SECTION_DEAD static char const* const stringBase_803992CA =
"im_font_number_32_32_ganshinkyo_8_02.bti";
SECTION_DEAD static char const* const stringBase_803992F3 =
"im_font_number_32_32_ganshinkyo_9_02.bti";
SECTION_DEAD static char const* const stringBase_8039931C = "im_plus_metal_24ｘ24_00.bti";
#pragma pop
/* 80399168-80399168 0257C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/meter/d_meter_HIO.cpp
+22 -22
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,
};
COMPILER_STRIP_GATE(80397E50, &fipaScale);
COMPILER_STRIP_GATE(0x80397E50, &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,
};
COMPILER_STRIP_GATE(80397E68, &fipaPosX);
COMPILER_STRIP_GATE(0x80397E68, &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,
};
COMPILER_STRIP_GATE(80397E80, &fipaPosY);
COMPILER_STRIP_GATE(0x80397E80, &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,
};
COMPILER_STRIP_GATE(80397E98, &finaScale);
COMPILER_STRIP_GATE(0x80397E98, &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,
};
COMPILER_STRIP_GATE(80397EB0, &finaPosX);
COMPILER_STRIP_GATE(0x80397EB0, &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,
};
COMPILER_STRIP_GATE(80397EC8, &finaPosY);
COMPILER_STRIP_GATE(0x80397EC8, &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,
};
COMPILER_STRIP_GATE(80397EE0, &filiScale);
COMPILER_STRIP_GATE(0x80397EE0, &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,
};
COMPILER_STRIP_GATE(80397EF8, &filiPosX);
COMPILER_STRIP_GATE(0x80397EF8, &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,
};
COMPILER_STRIP_GATE(80397F10, &filiPosY);
COMPILER_STRIP_GATE(0x80397F10, &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,
};
COMPILER_STRIP_GATE(80397F28, &bboxScale);
COMPILER_STRIP_GATE(0x80397F28, &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,
};
COMPILER_STRIP_GATE(80397F40, &bboxPosX);
COMPILER_STRIP_GATE(0x80397F40, &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,
};
COMPILER_STRIP_GATE(80397F58, &bboxPosY);
COMPILER_STRIP_GATE(0x80397F58, &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,
};
COMPILER_STRIP_GATE(80397F70, &rboxScale);
COMPILER_STRIP_GATE(0x80397F70, &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,
};
COMPILER_STRIP_GATE(80397F88, &rboxPosX);
COMPILER_STRIP_GATE(0x80397F88, &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,
};
COMPILER_STRIP_GATE(80397FA0, &rboxPosY);
COMPILER_STRIP_GATE(0x80397FA0, &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,
};
COMPILER_STRIP_GATE(80397FB8, &finfoScale);
COMPILER_STRIP_GATE(0x80397FB8, &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,
};
COMPILER_STRIP_GATE(80397FD0, &finfoPosX);
COMPILER_STRIP_GATE(0x80397FD0, &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,
};
COMPILER_STRIP_GATE(80397FE8, &finfoPosY);
COMPILER_STRIP_GATE(0x80397FE8, &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,
};
COMPILER_STRIP_GATE(80398000, &fishnScale);
COMPILER_STRIP_GATE(0x80398000, &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,
};
COMPILER_STRIP_GATE(80398018, &fishnPosX);
COMPILER_STRIP_GATE(0x80398018, &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,
};
COMPILER_STRIP_GATE(80398030, &fishnPosY);
COMPILER_STRIP_GATE(0x80398030, &fishnPosY);
#pragma pop
/* 80454538-8045453C 002B38 0004+00 1/1 0/0 0/0 .sdata2 @3902 */
@@ -1378,5 +1378,5 @@ asm void __sinit_d_meter_HIO_cpp() {
#pragma push
#pragma force_active on
SECTION_CTORS void* const _ctors_80201284 = (void*)__sinit_d_meter_HIO_cpp;
REGISTER_CTORS(0x80201284, __sinit_d_meter_HIO_cpp);
#pragma pop
src/d/meter/d_meter_button.cpp
+39 -27
View File
@@ -28,10 +28,6 @@ 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*, ...);
@@ -39,6 +35,10 @@ struct J2DTextBox {
struct JUTFont {};
struct COutFont_c {
/* 80225C94 */ COutFont_c(u8);
};
struct dMsgObject_c {
/* 802370A8 */ void isGetItemMessage();
/* 802370BC */ void isKanbanMessage();
@@ -58,8 +58,6 @@ struct J2DPane {
/* 802F7100 */ void getBounds();
};
struct JKRExpHeap {};
struct J2DGrafContext {};
struct JKRArchive {};
@@ -70,6 +68,8 @@ struct J2DScreen {
/* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*);
};
struct JKRExpHeap {};
struct CPaneMgr {
/* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*);
/* 80253930 */ CPaneMgr();
@@ -185,6 +185,10 @@ struct dMeter2Info_c {
J2DPicture*, void*, J2DPicture*, int);
};
struct JUtility {
struct TColor {};
};
struct CPaneMgrAlpha {
/* 802555C8 */ void show();
/* 80255608 */ void hide();
@@ -192,10 +196,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);
@@ -207,10 +207,10 @@ struct dComIfG_play_c {
/* 8002C97C */ void getLayerNo(int);
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -805,7 +805,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,
};
COMPILER_STRIP_GATE(80398048, &text_tag);
COMPILER_STRIP_GATE(0x80398048, &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] = {
@@ -815,7 +815,14 @@ 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,
};
COMPILER_STRIP_GATE(80398098, &ftext_tag);
COMPILER_STRIP_GATE(0x80398098, &ftext_tag);
/* 803980E8-803980E8 024748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803980E8 = "zelda_game_image_button_info.blo";
SECTION_DEAD static char const* const stringBase_80398109 = "";
#pragma pop
/* 80454770-80454774 002D70 0004+00 4/4 0/0 0/0 .sdata2 @5628 */
SECTION_SDATA2 static f32 lit_5628 = 0.5f;
@@ -854,6 +861,14 @@ asm void dMeterButton_c::screenInitButton() {
}
#pragma pop
/* ############################################################################################## */
/* 803980E8-803980E8 024748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039810A = "zelda_message_window_new.blo";
SECTION_DEAD static char const* const stringBase_80398127 = "zelda_message_window_text.blo";
#pragma pop
/* 80205834-80205CA0 200174 046C+00 1/1 0/0 0/0 .text screenInitText__14dMeterButton_cFv
*/
#pragma push
@@ -866,6 +881,15 @@ asm void dMeterButton_c::screenInitText() {
#pragma pop
/* ############################################################################################## */
/* 803980E8-803980E8 024748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80398145 = "F_SP00";
SECTION_DEAD static char const* const stringBase_8039814C = "R_SP161";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80398154 = "\0\0\0";
#pragma pop
/* 80454794-80454798 002D94 0004+00 1/1 0/0 0/0 .sdata2 @6012 */
SECTION_SDATA2 static f32 lit_6012 = -25.0f;
@@ -1539,16 +1563,4 @@ asm void dMeterButton_c::paneTrans(CPaneMgr* param_0, f32 param_1, f32 param_2,
}
#pragma pop
/* 803980E8-80398158 024748 006C+04 4/4 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803980E8 = "zelda_game_image_button_info.blo";
SECTION_DEAD static char const* const stringBase_80398109 = "";
SECTION_DEAD static char const* const stringBase_8039810A = "zelda_message_window_new.blo";
SECTION_DEAD static char const* const stringBase_80398127 = "zelda_message_window_text.blo";
SECTION_DEAD static char const* const stringBase_80398145 = "F_SP00";
SECTION_DEAD static char const* const stringBase_8039814C = "R_SP161";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80398154 = "\0\0\0";
#pragma pop
/* 803980E8-803980E8 024748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/meter/d_meter_haihai.cpp
+12 -11
View File
@@ -15,12 +15,12 @@ struct dMeterSub_c {
/* 80194138 */ bool isDead();
};
struct J2DAnmTextureSRTKey {};
struct J2DAnmColor {};
struct J2DAnmTransformKey {};
struct J2DAnmTextureSRTKey {};
struct dMeterHaihai_c {
/* 8020AE8C */ dMeterHaihai_c(u8);
/* 8020AEF0 */ ~dMeterHaihai_c();
@@ -160,6 +160,15 @@ asm dMeterHaihai_c::~dMeterHaihai_c() {
#pragma pop
/* ############################################################################################## */
/* 80398158-80398158 0247B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80398158 = "zelda_hihi_cursor.blo";
SECTION_DEAD static char const* const stringBase_8039816E = "zelda_hihi_cursor.bck";
SECTION_DEAD static char const* const stringBase_80398184 = "zelda_hihi_cursor.btk";
SECTION_DEAD static char const* const stringBase_8039819A = "zelda_hihi_cursor.bpk";
#pragma pop
/* 804547B0-804547B4 002DB0 0004+00 6/6 0/0 0/0 .sdata2 @3742 */
SECTION_SDATA2 static u8 lit_3742[4] = {
0x00,
@@ -390,12 +399,4 @@ asm void dMeterHaihai_c::playBpkAnime(J2DAnmColor* param_0) {
}
#pragma pop
/* 80398158-803981B0 0247B8 0058+00 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80398158 = "zelda_hihi_cursor.blo";
SECTION_DEAD static char const* const stringBase_8039816E = "zelda_hihi_cursor.bck";
SECTION_DEAD static char const* const stringBase_80398184 = "zelda_hihi_cursor.btk";
SECTION_DEAD static char const* const stringBase_8039819A = "zelda_hihi_cursor.bpk";
#pragma pop
/* 80398158-80398158 0247B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/meter/d_meter_hakusha.cpp
+22 -15
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);
@@ -173,6 +173,14 @@ asm dMeterHakusha_c::~dMeterHakusha_c() {
#pragma pop
/* ############################################################################################## */
/* 803981B0-803981B0 024810 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803981B0 = "zelda_game_image_hakusha_parts.blo";
SECTION_DEAD static char const* const stringBase_803981D3 = "zelda_game_image_hakusha_a_btn.blo";
SECTION_DEAD static char const* const stringBase_803981F6 = "F_SP108";
#pragma pop
/* 80454800-80454804 002E00 0004+00 6/6 0/0 0/0 .sdata2 @3793 */
SECTION_SDATA2 static u8 lit_3793[4] = {
0x00,
@@ -228,6 +236,15 @@ asm void dMeterHakusha_c::_delete() {
}
#pragma pop
/* ############################################################################################## */
/* 803981B0-803981B0 024810 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803981FE = "F_SP00";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80398205 = "\0\0";
#pragma pop
/* 8020CC58-8020CD6C 207598 0114+00 1/1 0/0 0/0 .text alphaAnimeHakusha__15dMeterHakusha_cFUl */
#pragma push
#pragma optimization_level 0
@@ -317,14 +334,4 @@ asm void dMeterHakusha_c::getHakushaNum() {
}
#pragma pop
/* 803981B0-80398208 024810 0055+03 3/3 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_803981B0 = "zelda_game_image_hakusha_parts.blo";
SECTION_DEAD static char const* const stringBase_803981D3 = "zelda_game_image_hakusha_a_btn.blo";
SECTION_DEAD static char const* const stringBase_803981F6 = "F_SP108";
SECTION_DEAD static char const* const stringBase_803981FE = "F_SP00";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80398205 = "\0\0";
#pragma pop
/* 803981B0-803981B0 024810 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/meter/d_meter_map.cpp
+13 -16
View File
@@ -84,10 +84,10 @@ struct dDlst_list_c {
/* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
};
struct Vec {};
struct JAISoundID {};
struct Vec {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
@@ -324,15 +324,10 @@ asm void dMeterMap_c::setDispPosOutsideFlg_SE_On() {
}
#pragma pop
/* 8020D8F8-8020D900 208238 0008+00 0/0 1/1 0/0 .text setMapAlpha__11dMeterMap_cFUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeterMap_c::setMapAlpha(u8 param_0) {
nofralloc
#include "asm/d/meter/d_meter_map/setMapAlpha__11dMeterMap_cFUc.s"
/* 8020D8F8-8020D900 -00001 0008+00 0/0 0/0 0/0 .text setMapAlpha__11dMeterMap_cFUc */
void dMeterMap_c::setMapAlpha(u8 param_0) {
*(u8*)(((u8*)this) + 44) /* this->field_0x2c */ = (u8)(param_0);
}
#pragma pop
/* 8020D900-8020D948 208240 0048+00 3/3 1/1 0/0 .text isMapOpenCheck__11dMeterMap_cFv */
#pragma push
@@ -406,6 +401,13 @@ asm void dMeterMap_c::_delete() {
}
#pragma pop
/* ############################################################################################## */
/* 80398208-80398208 024868 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80398208 = "F_SP115";
#pragma pop
/* 8020DCE4-8020DF1C 208624 0238+00 0/0 1/1 0/0 .text _move__11dMeterMap_cFUl */
#pragma push
#pragma optimization_level 0
@@ -510,9 +512,4 @@ asm void dMeterMap_c::keyCheck() {
}
#pragma pop
/* 80398208-80398210 024868 0008+00 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80398208 = "F_SP115";
#pragma pop
/* 80398208-80398208 024868 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/meter/d_meter_string.cpp
+11 -10
View File
@@ -175,6 +175,16 @@ asm dMeterString_c::~dMeterString_c() {
#pragma pop
/* ############################################################################################## */
/* 80398210-80398210 024870 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80398210 = "zelda_game_image_cow_get_in.blo";
SECTION_DEAD static char const* const stringBase_80398230 = "zelda_game_image_cow_get_in.bck";
SECTION_DEAD static char const* const stringBase_80398250 = "";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80398251 = "\0\0\0\0\0\0";
#pragma pop
/* 80454848-8045484C 002E48 0004+00 1/1 0/0 0/0 .sdata2 @3758 */
SECTION_SDATA2 static f32 lit_3758 = 210.0f;
@@ -303,13 +313,4 @@ asm void dMeterString_c::isLeadByte(int param_0) {
}
#pragma pop
/* 80398210-80398258 024870 0041+07 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80398210 = "zelda_game_image_cow_get_in.blo";
SECTION_DEAD static char const* const stringBase_80398230 = "zelda_game_image_cow_get_in.bck";
SECTION_DEAD static char const* const stringBase_80398250 = "";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80398251 = "\0\0\0\0\0\0";
#pragma pop
/* 80398210-80398210 024870 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/msg/d_msg_class.cpp
+86 -43
View File
@@ -15,16 +15,16 @@ struct mDoCPd_c {
static u8 m_cpadInfo[256];
};
struct jmessage_tControl {
/* 802299EC */ jmessage_tControl();
};
struct Vec {};
struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
};
struct jmessage_tControl {
/* 802299EC */ jmessage_tControl();
};
struct jmessage_tReference {
/* 80228B04 */ jmessage_tReference();
/* 80228CB4 */ ~jmessage_tReference();
@@ -124,16 +124,16 @@ struct jmessage_string_tControl {
/* 802328DC */ ~jmessage_string_tControl();
};
struct COutFont_c {
/* 80226CF8 */ void initialize();
};
struct J2DTextBox {
/* 80300658 */ void getStringPtr() const;
};
struct JUTFont {};
struct COutFont_c {
/* 80226CF8 */ void initialize();
};
struct jmessage_string_tReference {
/* 8022F8C0 */ jmessage_string_tReference();
/* 8022F94C */ ~jmessage_string_tReference();
@@ -728,7 +728,7 @@ SECTION_RODATA static u8 const colorTable_3861[36] = {
0xA0, 0xB4, 0xDC, 0xFF, 0xDC, 0xDC, 0x82, 0xFF, 0xB4, 0xC8, 0xE6, 0xFF,
0xC8, 0xA0, 0xDC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xAA, 0x78, 0xFF,
};
COMPILER_STRIP_GATE(803995C8, &colorTable_3861);
COMPILER_STRIP_GATE(0x803995C8, &colorTable_3861);
/* 802288FC-802289A8 22323C 00AC+00 2/2 0/0 0/0 .text getFontCCColorTable__FUcUc */
#pragma push
@@ -747,7 +747,7 @@ SECTION_RODATA static u8 const colorTable_3877[36] = {
0xA0, 0xB4, 0xDC, 0xFF, 0xDC, 0xDC, 0x82, 0xFF, 0xB4, 0xC8, 0xE6, 0xFF,
0xC8, 0xA0, 0xDC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xAA, 0x78, 0xFF,
};
COMPILER_STRIP_GATE(803995EC, &colorTable_3877);
COMPILER_STRIP_GATE(0x803995EC, &colorTable_3877);
/* 802289A8-80228A54 2232E8 00AC+00 2/2 0/0 0/0 .text getFontGCColorTable__FUcUc */
#pragma push
@@ -2017,6 +2017,14 @@ asm void jmessage_tMeasureProcessor::do_character(int param_0) {
#pragma pop
/* ############################################################################################## */
/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80399610 = "'";
SECTION_DEAD static char const* const stringBase_80399612 = "s";
SECTION_DEAD static char const* const stringBase_80399614 = "%d";
#pragma pop
/* 80454A7C-80454A80 00307C 0004+00 5/5 0/0 0/0 .sdata2 @5151 */
SECTION_SDATA2 static f32 lit_5151 = 100.0f;
@@ -2269,6 +2277,13 @@ void jmessage_tRenderingProcessor::do_reset() {
/* empty function */
}
/* ############################################################################################## */
/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80399617 = "";
#pragma pop
/* 8022CDCC-8022CFD8 22770C 020C+00 1/0 0/0 0/0 .text
* do_begin__28jmessage_tRenderingProcessorFPCvPCc */
#pragma push
@@ -2327,6 +2342,15 @@ asm void jmessage_tRenderingProcessor::resetRendering() {
}
#pragma pop
/* ############################################################################################## */
/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80399618 = ""
"\x1B"
"CR[%d]";
#pragma pop
/* 8022E17C-8022E260 228ABC 00E4+00 2/2 0/0 0/0 .text
* do_widthcenter__28jmessage_tRenderingProcessorFv */
#pragma push
@@ -2349,6 +2373,15 @@ asm void jmessage_tRenderingProcessor::do_selwidthcenter(int param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80399620 = ""
"\x1B"
"CD[%d]";
#pragma pop
/* 8022E318-8022E7CC 228C58 04B4+00 3/2 0/0 0/0 .text
* do_heightcenter__28jmessage_tRenderingProcessorFv */
#pragma push
@@ -2360,6 +2393,17 @@ asm void jmessage_tRenderingProcessor::do_heightcenter() {
}
#pragma pop
/* ############################################################################################## */
/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80399628 = ""
"\x1B"
"CC[%08x]"
"\x1B"
"GC[%08x]";
#pragma pop
/* 8022E7CC-8022E860 22910C 0094+00 2/2 0/0 0/0 .text do_color__28jmessage_tRenderingProcessorFUc
*/
#pragma push
@@ -2371,6 +2415,17 @@ asm void jmessage_tRenderingProcessor::do_color(u8 param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039963B = ""
"\x1B"
"FX[%d]"
"\x1B"
"FY[%d]";
#pragma pop
/* 8022E860-8022E960 2291A0 0100+00 2/2 0/0 0/0 .text do_scale__28jmessage_tRenderingProcessorFf
*/
#pragma push
@@ -2393,6 +2448,15 @@ asm void jmessage_tRenderingProcessor::do_linedown(s16 param_0) {
}
#pragma pop
/* ############################################################################################## */
/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039964A = ""
"\x1B"
"CU[%d]";
#pragma pop
/* 8022E9C0-8022EAE4 229300 0124+00 1/1 0/0 0/0 .text do_transY__28jmessage_tRenderingProcessorFsb
*/
#pragma push
@@ -2464,6 +2528,17 @@ asm void jmessage_tRenderingProcessor::do_rubyset(void const* param_0, u32 param
}
#pragma pop
/* ############################################################################################## */
/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80399652 = ""
"\x1B"
"CL[%d]";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039965A = "\0\0\0\0\0";
#pragma pop
/* 8022F384-8022F53C 229CC4 01B8+00 3/3 0/0 0/0 .text
* do_rubystrcat__28jmessage_tRenderingProcessorFPcPcff */
#pragma push
@@ -3063,36 +3138,4 @@ asm void jmessage_tReference::getActorPos() {
}
#pragma pop
/* 80399610-80399660 025C70 004A+06 22/22 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
#pragma section ".dead"
SECTION_DEAD static char const* const stringBase_80399610 = "'";
SECTION_DEAD static char const* const stringBase_80399612 = "s";
SECTION_DEAD static char const* const stringBase_80399614 = "%d";
SECTION_DEAD static char const* const stringBase_80399617 = "";
SECTION_DEAD static char const* const stringBase_80399618 = ""
"\x1B"
"CR[%d]";
SECTION_DEAD static char const* const stringBase_80399620 = ""
"\x1B"
"CD[%d]";
SECTION_DEAD static char const* const stringBase_80399628 = ""
"\x1B"
"CC[%08x]"
"\x1B"
"GC[%08x]";
SECTION_DEAD static char const* const stringBase_8039963B = ""
"\x1B"
"FX[%d]"
"\x1B"
"FY[%d]";
SECTION_DEAD static char const* const stringBase_8039964A = ""
"\x1B"
"CU[%d]";
SECTION_DEAD static char const* const stringBase_80399652 = ""
"\x1B"
"CL[%d]";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039965A = "\0\0\0\0\0";
#pragma pop
/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */

Some files were not shown because too many files have changed in this diff Show More