mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-03 01:58:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '46da46b152472c668875d67c336f59ded62d3ecc' into compile

Browse Source
This commit is contained in:
kipcode66
2026-01-23 17:04:18 -05:00
parent b1e20051ce 46da46b152
commit 02ba53f72e
495 changed files with 24331 additions and 21201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/RZDE01_00/splits.txt
+52 -37
View File
@@ -22,7 +22,7 @@ d/d_home_button.cpp:
d/d_cursor_mng.cpp:
.text start:0x800073D4 end:0x8000820C
.data start:0x803F5618 end:0x803F5740
.sdata start:0x80537528 end:0x80537564
.sdata start:0x80537528 end:0x80537560
.sbss start:0x8053A728 end:0x8053A740
.sdata2 start:0x8053B9F8 end:0x8053BA10
@@ -30,15 +30,15 @@ m_Do/m_Do_main.cpp:
.text start:0x8000820C end:0x80008EE8
.data start:0x803F5740 end:0x803F5B28
.bss start:0x80449B80 end:0x80449EA0
.sdata start:0x80537564 end:0x805375C0
.sbss start:0x8053A740 end:0x8053A768
.sdata start:0x80537560 end:0x805375C0
.sbss start:0x8053A740 end:0x8053A760
.sdata2 start:0x8053BA10 end:0x8053BA28
m_Do/m_Do_printf.cpp:
.text start:0x80008EE8 end:0x800095CC
.data start:0x803F5B28 end:0x803F5BE0
.bss start:0x80449EA0 end:0x8044A6A0
.sbss start:0x8053A768 end:0x8053A784
.sbss start:0x8053A760 end:0x8053A780
m_Do/m_Do_audio.cpp:
.text start:0x800095CC end:0x80009F54
@@ -46,7 +46,7 @@ m_Do/m_Do_audio.cpp:
.data start:0x803F5BE0 end:0x803F5E58
.bss start:0x8044A6A0 end:0x8044BA50
.sdata start:0x805375C0 end:0x8053762C
.sbss start:0x8053A784 end:0x8053A7D4
.sbss start:0x8053A780 end:0x8053A7D4
m_Do/m_Do_controller_pad.cpp:
.text start:0x80009F54 end:0x8000A364
@@ -73,7 +73,7 @@ m_Do/m_Do_machine.cpp:
.text start:0x80011A34 end:0x800127A4
.data start:0x803F5E70 end:0x803F61D8
.sdata start:0x80537670 end:0x805376A0
.sbss start:0x8053A844 end:0x8053A878
.sbss start:0x8053A844 end:0x8053A870
.sdata2 start:0x8053BBC0 end:0x8053BBC8
m_Do/m_Do_mtx.cpp:
@@ -82,6 +82,7 @@ m_Do/m_Do_mtx.cpp:
.data start:0x803F61D8 end:0x803F6280
.bss start:0x80453500 end:0x80453968
.sdata start:0x805376A0 end:0x805376B0
.sbss start:0x8053A870 end:0x8053A878
.sdata2 start:0x8053BBC8 end:0x8053BBD8
m_Do/m_Do_ext.cpp:
@@ -102,7 +103,7 @@ m_Do/m_Do_lib.cpp:
m_Do/m_Do_Reset.cpp:
.text start:0x8001A9F8 end:0x8001ABCC
.sbss start:0x8053A8C8 end:0x8053A8E0
.sbss start:0x8053A8C8 end:0x8053A8D0
m_Do/m_Do_dvd_thread.cpp:
.text start:0x8001ABCC end:0x8001B8E8
@@ -110,10 +111,12 @@ m_Do/m_Do_dvd_thread.cpp:
.data start:0x803F6A80 end:0x803F6DC8
.bss start:0x804539E0 end:0x80455D60
.sdata start:0x80537770 end:0x805377B0
.sbss start:0x8053A8D0 end:0x8053A8D8
m_Do/m_Do_DVDError.cpp:
.text start:0x8001B8E8 end:0x8001BA54
.bss start:0x80455D60 end:0x804580C0
.sbss start:0x8053A8D8 end:0x8053A8E0
m_Do/m_Do_MemCard.cpp:
.text start:0x8001BA54 end:0x8001CDAC
@@ -338,7 +341,7 @@ f_pc/f_pc_node_req.cpp:
f_pc/f_pc_priority.cpp:
.text start:0x80027DFC end:0x80028140
.bss start:0x804813F0 end:0x80481400
.sdata start:0x805378D0 end:0x80537908
.sdata start:0x805378D0 end:0x805378D8
f_pc/f_pc_profile.cpp:
.text start:0x80028140 end:0x80028150
@@ -378,7 +381,7 @@ d/d_stage.cpp:
.ctors start:0x803CE268 end:0x803CE26C
.data start:0x803FA5A8 end:0x803FDE58
.bss start:0x80481400 end:0x804928C8
.sdata start:0x80537908 end:0x8053793C
.sdata start:0x805378D8 end:0x80537920
.sbss start:0x8053A988 end:0x8053A9B0
.sdata2 start:0x8053BD28 end:0x8053BD38
@@ -386,7 +389,7 @@ d/d_map.cpp:
.text start:0x8002CC88 end:0x8002F3F4
.rodata start:0x803CFC30 end:0x803CFD10
.data start:0x803FDE58 end:0x803FE258
.sdata start:0x8053793C end:0x80537ACC
.sdata start:0x80537920 end:0x80537ACC
.sbss start:0x8053A9B0 end:0x8053A9B8
.sdata2 start:0x8053BD38 end:0x8053BD98
@@ -2552,21 +2555,22 @@ revolution/homebuttonLib/nw4hbm/ut/ut_TagProcessorBase.cpp:
revolution/homebuttonLib/nw4hbm/ut/ut_TextWriterBase.cpp:
.text start:0x802D92D0 end:0x802E1FB4
.ctors start:0x803CE398 end:0x803CE39C
.data start:0x8042B058 end:0x8042B680
.data start:0x8042B058 end:0x8042B650
.bss start:0x804C2CE0 end:0x804C2CF8
.sdata start:0x8053A158 end:0x8053A168
.sdata start:0x8053A158 end:0x8053A160
.sbss start:0x8053B118 end:0x8053B128
.sdata2 start:0x8053FE60 end:0x8053FE78
JSystem/JKernel/JKRHeap.cpp:
.text start:0x802E1FB4 end:0x802E2BEC
.data start:0x8042B680 end:0x8042B6E0
.sdata start:0x8053A168 end:0x8053A198
.data start:0x8042B650 end:0x8042B6E0
.sdata start:0x8053A160 end:0x8053A170
.sbss start:0x8053B128 end:0x8053B158
JSystem/JKernel/JKRExpHeap.cpp:
.text start:0x802E2BEC end:0x802E47B4
.data start:0x8042B6E0 end:0x8042BA88
.sdata start:0x8053A170 end:0x8053A190
.sbss start:0x8053B158 end:0x8053B170
.sdata2 start:0x8053FE78 end:0x8053FE88
@@ -2586,17 +2590,18 @@ JSystem/JKernel/JKRDisposer.cpp:
JSystem/JKernel/JKRThread.cpp:
.text start:0x802E5294 end:0x802E5F9C
.ctors start:0x803CE39C end:0x803CE3A0
.data start:0x8042BCB0 end:0x8042BDEC
.data start:0x8042BCB0 end:0x8042BDC0
.bss start:0x804C2CF8 end:0x804C2D48
.sdata start:0x8053A190 end:0x8053A198
.sbss start:0x8053B170 end:0x8053B190
.sdata2 start:0x8053FEA0 end:0x8053FEB0
JSystem/JKernel/JKRAram.cpp:
.text start:0x802E5F9C end:0x802E6DBC
.ctors start:0x803CE3A0 end:0x803CE3A4
.data start:0x8042BDEC end:0x8042BE00
.data start:0x8042BDC0 end:0x8042BE00
.bss start:0x804C2D48 end:0x804C2DA8
.sdata start:0x8053A198 end:0x8053A1B4
.sdata start:0x8053A198 end:0x8053A1A0
.sbss start:0x8053B190 end:0x8053B1D0
JSystem/JKernel/JKRAramHeap.cpp:
@@ -2612,12 +2617,12 @@ JSystem/JKernel/JKRAramBlock.cpp:
JSystem/JKernel/JKRAramPiece.cpp:
.text start:0x802E7558 end:0x802E7AD4
.ctors start:0x803CE3A8 end:0x803CE3AC
.data start:0x8042BE20 end:0x8042BEB4
.data start:0x8042BE20 end:0x8042BE88
.bss start:0x804C2DC0 end:0x804C2DF0
JSystem/JKernel/JKRAramStream.cpp:
.text start:0x802E7AD4 end:0x802E804C
.data start:0x8042BEB4 end:0x8042BEC8
.data start:0x8042BE88 end:0x8042BEC8
.bss start:0x804C2DF0 end:0x804C2E20
.sbss start:0x8053B1D0 end:0x8053B1E0
@@ -2626,6 +2631,7 @@ JSystem/JKernel/JKRFileLoader.cpp:
.ctors start:0x803CE3AC end:0x803CE3B0
.data start:0x8042BEC8 end:0x8042BF08
.bss start:0x804C2E20 end:0x804C2E38
.sdata start:0x8053A1A0 end:0x8053A1A8
.sbss start:0x8053B1E0 end:0x8053B1E8
JSystem/JKernel/JKRFileFinder.cpp:
@@ -2635,10 +2641,11 @@ JSystem/JKernel/JKRFileFinder.cpp:
JSystem/JKernel/JKRFileCache.cpp:
.text start:0x802E8950 end:0x802E96E8
.data start:0x8042BF38 end:0x8042BF88
.sdata start:0x8053A1A8 end:0x8053A1B0
JSystem/JKernel/JKRArchivePub.cpp:
.text start:0x802E96E8 end:0x802EA1D8
.data start:0x8042BF88 end:0x8042BFFC
.data start:0x8042BF88 end:0x8042BFD8
JSystem/JKernel/JKRArchivePri.cpp:
.text start:0x802EA1D8 end:0x802EA928
@@ -2646,19 +2653,19 @@ JSystem/JKernel/JKRArchivePri.cpp:
JSystem/JKernel/JKRMemArchive.cpp:
.text start:0x802EA928 end:0x802EAFD8
.data start:0x8042BFFC end:0x8042C078
.data start:0x8042BFD8 end:0x8042C050
JSystem/JKernel/JKRAramArchive.cpp:
.text start:0x802EAFD8 end:0x802EBC00
.data start:0x8042C078 end:0x8042C0C8
.data start:0x8042C050 end:0x8042C0C8
JSystem/JKernel/JKRDvdArchive.cpp:
.text start:0x802EBC00 end:0x802EC74C
.data start:0x8042C0C8 end:0x8042C1C0
.data start:0x8042C0C8 end:0x8042C188
JSystem/JKernel/JKRCompArchive.cpp:
.text start:0x802EC74C end:0x802ED414
.data start:0x8042C1C0 end:0x8042C238
.data start:0x8042C188 end:0x8042C210
JSystem/JKernel/JKRFile.cpp:
.text start:0x802ED414 end:0x802ED480
@@ -2666,7 +2673,7 @@ JSystem/JKernel/JKRFile.cpp:
JSystem/JKernel/JKRDvdFile.cpp:
.text start:0x802ED480 end:0x802EDAAC
.ctors start:0x803CE3B0 end:0x803CE3B4
.data start:0x8042C238 end:0x8042C280
.data start:0x8042C210 end:0x8042C280
.bss start:0x804C2E38 end:0x804C2E50
JSystem/JKernel/JKRDvdRipper.cpp:
@@ -2674,7 +2681,7 @@ JSystem/JKernel/JKRDvdRipper.cpp:
.ctors start:0x803CE3B4 end:0x803CE3B8
.data start:0x8042C280 end:0x8042C2D8
.bss start:0x804C2E50 end:0x804C2E80
.sdata start:0x8053A1B4 end:0x8053A1BC
.sdata start:0x8053A1B0 end:0x8053A1BC
.sbss start:0x8053B1F0 end:0x8053B230
JSystem/JKernel/JKRDvdAramRipper.cpp:
@@ -2688,7 +2695,7 @@ JSystem/JKernel/JKRDecomp.cpp:
.text start:0x802EF438 end:0x802EFB1C
.data start:0x8042C2D8 end:0x8042C2E8
.bss start:0x804C2EB0 end:0x804C2EF0
.sbss start:0x8053B278 end:0x8053B284
.sbss start:0x8053B278 end:0x8053B280
JSystem/JSupport/JSUList.cpp:
.text start:0x802EFB1C end:0x802EFF5C
@@ -2716,7 +2723,7 @@ JSystem/JGadget/std-vector.cpp:
JSystem/JUtility/JUTCacheFont.cpp:
.text start:0x802F0DF4 end:0x802F1CB4
.data start:0x8042C350 end:0x8042C440
.data start:0x8042C350 end:0x8042C410
.sdata2 start:0x8053FEB0 end:0x8053FEB8
JSystem/JUtility/JUTResource.cpp:
@@ -2728,6 +2735,7 @@ JSystem/JUtility/JUTTexture.cpp:
JSystem/JUtility/JUTPalette.cpp:
.text start:0x802F2448 end:0x802F2534
.data start:0x8042C410 end:0x8042C440
JSystem/JUtility/JUTNameTab.cpp:
.text start:0x802F2534 end:0x802F2724
@@ -2736,16 +2744,16 @@ JSystem/JUtility/JUTNameTab.cpp:
JSystem/JUtility/JUTGraphFifo.cpp:
.text start:0x802F2724 end:0x802F28B4
.data start:0x8042C450 end:0x8042C460
.sbss start:0x8053B284 end:0x8053B290
.sbss start:0x8053B280 end:0x8053B290
JSystem/JUtility/JUTFont.cpp:
.text start:0x802F28B4 end:0x802F2B2C
.data start:0x8042C460 end:0x8042C4DC
.data start:0x8042C460 end:0x8042C4A8
JSystem/JUtility/JUTResFont.cpp:
.text start:0x802F2B2C end:0x802F3C3C
.rodata start:0x803EF730 end:0x803EF800
.data start:0x8042C4DC end:0x8042C528
.data start:0x8042C4A8 end:0x8042C528
.sdata2 start:0x8053FED0 end:0x8053FEE8
JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp:
@@ -2753,7 +2761,7 @@ JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp:
JSystem/JUtility/JUTDbPrint.cpp:
.text start:0x802F3C3C end:0x802F4198
.sbss start:0x8053B290 end:0x8053B2A0
.sbss start:0x8053B290 end:0x8053B298
.sdata2 start:0x8053FEE8 end:0x8053FEF8
JSystem/JUtility/JUTGamePad.cpp:
@@ -2761,8 +2769,8 @@ JSystem/JUtility/JUTGamePad.cpp:
.ctors start:0x803CE3BC end:0x803CE3C0
.data start:0x8042C528 end:0x8042C558
.bss start:0x804C2EF0 end:0x804C3090
.sdata start:0x8053A1C0 end:0x8053A218
.sbss start:0x8053B2A0 end:0x8053B2D0
.sdata start:0x8053A1C0 end:0x8053A1D8
.sbss start:0x8053B298 end:0x8053B2D0
.sdata2 start:0x8053FEF8 end:0x8053FF18
JSystem/JUtility/JUTException.cpp:
@@ -2770,17 +2778,20 @@ JSystem/JUtility/JUTException.cpp:
.ctors start:0x803CE3C0 end:0x803CE3C4
.data start:0x8042C558 end:0x8042CA90
.bss start:0x804C3090 end:0x804C3508
.sdata start:0x8053A1D8 end:0x8053A208
.sbss start:0x8053B2D0 end:0x8053B2F8
.sdata2 start:0x8053FF18 end:0x8053FF28
JSystem/JUtility/JUTDirectPrint.cpp:
.text start:0x802F7810 end:0x802F7EF0
.data start:0x8042CA90 end:0x8042CD58
.sdata start:0x8053A208 end:0x8053A210
.sbss start:0x8053B2F8 end:0x8053B300
.sdata2 start:0x8053FF28 end:0x8053FF80
JSystem/JUtility/JUTAssert.cpp:
.text start:0x802F7EF0 end:0x802F81CC
.sdata start:0x8053A210 end:0x8053A218
.sbss start:0x8053B300 end:0x8053B308
.sdata2 start:0x8053FF80 end:0x8053FF98
@@ -2795,18 +2806,19 @@ JSystem/JUtility/JUTXfb.cpp:
JSystem/JUtility/JUTFader.cpp:
.text start:0x802F89DC end:0x802F8CF0
.data start:0x8042CD68 end:0x8042CD8C
.data start:0x8042CD68 end:0x8042CD80
.sdata2 start:0x8053FF98 end:0x8053FFA0
JSystem/JUtility/JUTProcBar.cpp:
.text start:0x802F8CF0 end:0x802FA4A0
.sdata start:0x8053A218 end:0x8053A288
.sdata start:0x8053A218 end:0x8053A220
.sbss start:0x8053B328 end:0x8053B338
.sdata2 start:0x8053FFA0 end:0x8053FFE0
JSystem/JUtility/JUTConsole.cpp:
.text start:0x802FA4A0 end:0x802FB7BC
.data start:0x8042CD8C end:0x8042CD98
.data start:0x8042CD80 end:0x8042CD98
.sdata start:0x8053A220 end:0x8053A228
.sbss start:0x8053B338 end:0x8053B348
.sdata2 start:0x8053FFE0 end:0x80540010
@@ -2873,6 +2885,7 @@ JSystem/J2DGraph/J2DPicture.cpp:
JSystem/J2DGraph/J2DTextBox.cpp:
.text start:0x80311CF4 end:0x803131E4
.data start:0x8042D610 end:0x8042D6D0
.sdata start:0x8053A228 end:0x8053A230
.sdata2 start:0x80540148 end:0x80540168
JSystem/J2DGraph/J2DWindowEx.cpp:
@@ -2891,6 +2904,7 @@ JSystem/J2DGraph/J2DTextBoxEx.cpp:
.text start:0x80319144 end:0x8031A988
.rodata start:0x803F3AA8 end:0x803F3AE0
.data start:0x8042D8F0 end:0x8042D9B0
.sdata start:0x8053A230 end:0x8053A238
.sdata2 start:0x805401A0 end:0x805401C0
JSystem/J2DGraph/J2DAnmLoader.cpp:
@@ -2909,6 +2923,7 @@ JSystem/J2DGraph/J2DManage.cpp:
JSystem/J3DGraphBase/J3DGD.cpp:
.text start:0x8031EBB0 end:0x80320478
.data start:0x8042DAE0 end:0x8042DB88
.sdata start:0x8053A238 end:0x8053A288
.sdata2 start:0x805401F8 end:0x80540238
JSystem/J3DGraphBase/J3DSys.cpp:
config/RZDE01_00/symbols.txt
+68 -52
View File
@@ -23608,8 +23608,33 @@ lbl_8042B650 = .data:0x8042B650; // type:object size:0x24 data:string
lbl_8042B674 = .data:0x8042B674; // type:object size:0xC data:string
__vt__7JKRHeap = .data:0x8042B680; // type:object size:0x60 scope:global align:4
...data.0 = .data:0x8042B6E0; // type:label scope:local align:4
lbl_8042B705 = .data:0x8042B705; // type:object size:0x14 data:string
lbl_8042B719 = .data:0x8042B719; // type:object size:0x30B
lbl_8042B6E0 = .data:0x8042B6E0; // type:object size:0x25 scope:local data:string
lbl_8042B705 = .data:0x8042B705; // type:object size:0x14 scope:local data:string
lbl_8042B719 = .data:0x8042B719; // type:object size:0xF scope:local data:string
lbl_8042B728 = .data:0x8042B728; // type:object size:0x24 scope:local data:string
lbl_8042B74C = .data:0x8042B74C; // type:object size:0xB scope:local data:string
lbl_8042B757 = .data:0x8042B757; // type:object size:0x2A scope:local data:string
lbl_8042B781 = .data:0x8042B781; // type:object size:0x2D scope:local data:string
lbl_8042B7AE = .data:0x8042B7AE; // type:object size:0x2B scope:local data:string
lbl_8042B7D9 = .data:0x8042B7D9; // type:object size:0x29 scope:local data:string
lbl_8042B802 = .data:0x8042B802; // type:object size:0x25 scope:local data:string
lbl_8042B827 = .data:0x8042B827; // type:object size:0x2D scope:local data:string
lbl_8042B854 = .data:0x8042B854; // type:object size:0x26 scope:local data:string
lbl_8042B87A = .data:0x8042B87A; // type:object size:0x37 scope:local data:string
lbl_8042B8B1 = .data:0x8042B8B1; // type:object size:0xF scope:local data:string
lbl_8042B8C0 = .data:0x8042B8C0; // type:object size:0x3A scope:local data:string
lbl_8042B8FA = .data:0x8042B8FA; // type:object size:0x25 scope:local data:string
lbl_8042B91F = .data:0x8042B91F; // type:object size:0xF scope:local data:string
lbl_8042B92E = .data:0x8042B92E; // type:object size:0x2A scope:local data:string
lbl_8042B958 = .data:0x8042B958; // type:object size:0x1C scope:local data:string
lbl_8042B974 = .data:0x8042B974; // type:object size:0x30 scope:local data:string
lbl_8042B9A4 = .data:0x8042B9A4; // type:object size:0x12 scope:local data:string
lbl_8042B9B6 = .data:0x8042B9B6; // type:object size:0x9 scope:local data:string
lbl_8042B9BF = .data:0x8042B9BF; // type:object size:0x1C scope:local data:string
lbl_8042B9DB = .data:0x8042B9DB; // type:object size:0x11 scope:local data:string
lbl_8042B9EC = .data:0x8042B9EC; // type:object size:0x12 scope:local data:string
lbl_8042B9FE = .data:0x8042B9FE; // type:object size:0x11 scope:local data:string
lbl_8042BA0F = .data:0x8042BA0F; // type:object size:0x15 scope:local data:string
__vt__10JKRExpHeap = .data:0x8042BA24; // type:object size:0x60 scope:global align:4
...data.0 = .data:0x8042BA88; // type:label scope:local align:4
lbl_8042BAB9 = .data:0x8042BAB9; // type:object size:0x31 data:string
@@ -25222,7 +25247,7 @@ l_RoomKeepDoorInfo = .bss:0x80481D1C; // type:object size:0x904 scope:global ali
mStatus__20dStage_roomControl_c = .bss:0x8048262C; // type:object size:0x10100 scope:global align:4 data:4byte
mMemoryBlock__20dStage_roomControl_c = .bss:0x8049272C; // type:object size:0x4C scope:global align:4
mDemoArcName__20dStage_roomControl_c = .bss:0x80492778; // type:object size:0xA data:byte
lbl_80492782 = .bss:0x80492782; // type:object size:0x146
mArcBank__20dStage_roomControl_c = .bss:0x80492782; // type:object size:0x146
...bss.0 = .bss:0x804928C8; // type:label scope:local align:4
dComIfG_mTimerInfo = .bss:0x804928C8; // type:object size:0x14 scope:global align:4
@109519 = .bss:0x804928DC; // type:object size:0xC scope:local align:4
@@ -25800,8 +25825,8 @@ exCallbackObject = .bss:0x804C30B0; // type:object size:0x14 scope:global align:
sMapFileList__12JUTException = .bss:0x804C30D0; // type:object size:0xC scope:global align:4 data:4byte
c3bcnt = .bss:0x804C30E0; // type:object size:0x20 scope:global align:4 data:4byte
context$45953 = .bss:0x804C3100; // type:object size:0x2C8 scope:local align:4
lbl_804C33C8 = .bss:0x804C33C8; // type:object size:0x40
lbl_804C3408 = .bss:0x804C3408; // type:object size:0x100
sMessageFileLine__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .bss:0x804C33C8; // type:object size:0x40
sMessageString__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .bss:0x804C3408; // type:object size:0x100
static_mBounds__7J2DPane = .bss:0x804C3508; // type:object size:0x10 scope:global align:4
lbl_804C3518 = .bss:0x804C3518; // type:object size:0x108 data:byte
j3dSys = .bss:0x804C3620; // type:object size:0x11C scope:global align:4
@@ -25994,7 +26019,7 @@ __RTTI__Q310dCsr_mng_c8bloObj_c9paneObj_c = .sdata:0x80537540; // type:object si
__RTTI__Q210dCsr_mng_c5obj_c = .sdata:0x80537548; // type:object size:0x8 scope:global align:4
__RTTI__Q210dCsr_mng_c6list_c = .sdata:0x80537550; // type:object size:0x8 scope:global align:4
__RTTI__Q210dCsr_mng_c6node_c = .sdata:0x80537558; // type:object size:0x8 scope:global align:4
lbl_80537560 = .sdata:0x80537560; // type:object size:0x1 data:byte
developmentMode__7mDoMain = .sdata:0x80537560; // type:object size:0x1 data:byte
memMargin__7mDoMain = .sdata:0x80537564; // type:object size:0x4 scope:global align:4 data:4byte
lbl_80537568 = .sdata:0x80537568; // type:object size:0x1 data:byte
lbl_80537569 = .sdata:0x80537569; // type:object size:0x5 data:string
@@ -26026,7 +26051,7 @@ __RTTI__28JASGlobalInstance<8Z2SeqMgr> = .sdata:0x80537608; // type:object size:
lbl_80537610 = .sdata:0x80537610; // type:object size:0x8 data:string
__RTTI__7Z2SeMgr = .sdata:0x80537618; // type:object size:0x8 scope:global align:4
__RTTI__27JASGlobalInstance<7Z2SeMgr> = .sdata:0x80537620; // type:object size:0x8 scope:global align:4
lbl_80537628 = .sdata:0x80537628; // type:object size:0x1 data:byte
mWide__13mDoGph_gInf_c = .sdata:0x80537628; // type:object size:0x1 data:byte
m_aspect__13mDoGph_gInf_c = .sdata:0x8053762C; // type:object size:0x4 scope:global align:4 data:float
m_scale__13mDoGph_gInf_c = .sdata:0x80537630; // type:object size:0x4 scope:global align:4 data:float
m_invScale__13mDoGph_gInf_c = .sdata:0x80537634; // type:object size:0x4 scope:global align:4 data:float
@@ -26130,7 +26155,7 @@ lbl_805378E8 = .sdata:0x805378E8; // type:object size:0x8 data:string
lbl_805378F0 = .sdata:0x805378F0; // type:object size:0x7 data:string
lbl_805378F7 = .sdata:0x805378F7; // type:object size:0x7 data:string
lbl_805378FE = .sdata:0x805378FE; // type:object size:0x6 data:string
lbl_80537904 = .sdata:0x80537904; // type:object size:0x1 data:byte
mRoomReadId__20dStage_roomControl_c = .sdata:0x80537904; // type:object size:0x1 data:byte
__RTTI__16dStage_stageDt_c = .sdata:0x80537908; // type:object size:0x8 scope:global align:4
__RTTI__15dStage_roomDt_c = .sdata:0x80537910; // type:object size:0x8 scope:global align:4
__RTTI__11dStage_dt_c = .sdata:0x80537918; // type:object size:0x8 scope:global align:4
@@ -26185,7 +26210,7 @@ lbl_80537A93 = .sdata:0x80537A93; // type:object size:0x8 data:string
lbl_80537A9B = .sdata:0x80537A9B; // type:object size:0x7 data:string
lbl_80537AA2 = .sdata:0x80537AA2; // type:object size:0x5 data:string
lbl_80537AA7 = .sdata:0x80537AA7; // type:object size:0x8 data:string
lbl_80537AAF = .sdata:0x80537AAF; // type:object size:0x1 data:byte
g_blackColor = .sdata:0x80537AAF; // type:object size:0x1 data:byte
lbl_80537AB0 = .sdata:0x80537AB0; // type:object size:0x1 data:byte
lbl_80537AB1 = .sdata:0x80537AB1; // type:object size:0x1 data:byte
lbl_80537AB2 = .sdata:0x80537AB2; // type:object size:0x1 data:byte
@@ -27755,10 +27780,10 @@ sMapBufOffset__Q26nw4hbm2db = .sdata:0x8053A130; // type:object size:0x4 scope:g
@9920 = .sdata:0x8053A148; // type:object size:0x4 scope:local align:4 data:wstring
@STRING@GetCharStrmReader__Q36nw4hbm2ut4FontCFv = .sdata:0x8053A14C; // type:object size:0x7 scope:local align:4 data:string
mFormatBufferSize__Q36nw4hbm2ut17TextWriterBase<c> = .sdata:0x8053A158; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8053A160 = .sdata:0x8053A160; // type:object size:0x1 data:byte
sDefaultFillFlag__7JKRHeap = .sdata:0x8053A160; // type:object size:0x1 data:byte
lbl_8053A161 = .sdata:0x8053A161; // type:object size:0x7 data:string
ARALT_AramStartAdr = .sdata:0x8053A168; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8053A16C = .sdata:0x8053A16C; // type:object size:0x3 data:string
@STRING@panic__12JUTExceptionFPCciPCc = .sdata:0x8053A16C; // type:object size:0x3 data:string
lbl_8053A170 = .sdata:0x8053A170; // type:object size:0x7 data:string
lbl_8053A177 = .sdata:0x8053A177; // type:object size:0x6 data:string
lbl_8053A17D = .sdata:0x8053A17D; // type:object size:0x6 data:string
@@ -27769,7 +27794,7 @@ lbl_8053A1A0 = .sdata:0x8053A1A0; // type:object size:0x2 data:string
lbl_8053A1A2 = .sdata:0x8053A1A2; // type:object size:0x2 data:string
lbl_8053A1A8 = .sdata:0x8053A1A8; // type:object size:0x2 data:string
lbl_8053A1AA = .sdata:0x8053A1AA; // type:object size:0x4 data:string
lbl_8053A1B0 = .sdata:0x8053A1B0; // type:object size:0x1 data:byte
errorRetry__12JKRDvdRipper = .sdata:0x8053A1B0; // type:object size:0x1 data:byte
sSZSBufferSize__12JKRDvdRipper = .sdata:0x8053A1B4; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8053A1B8 = .sdata:0x8053A1B8; // type:object size:0x1 data:byte
sSZSBufferSize__16JKRDvdAramRipper = .sdata:0x8053A1BC; // type:object size:0x4 scope:global align:4 data:4byte
@@ -27790,7 +27815,7 @@ lbl_8053A1F9 = .sdata:0x8053A1F9; // type:object size:0x8 data:string
lbl_8053A201 = .sdata:0x8053A201; // type:object size:0x1
lbl_8053A202 = .sdata:0x8053A202; // type:object size:0x5 data:string
lbl_8053A208 = .sdata:0x8053A208; // type:object size:0x3 data:string
lbl_8053A210 = .sdata:0x8053A210; // type:object size:0x1 data:byte
mVisible__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sdata:0x8053A210; // type:object size:0x1 data:byte
oneFrameRate = .sdata:0x8053A218; // type:object size:0x4 scope:global align:4 data:float
oneFrameRateUser = .sdata:0x8053A21C; // type:object size:0x4 scope:global align:4 data:float
lbl_8053A220 = .sdata:0x8053A220; // type:object size:0x4 data:string
@@ -28022,21 +28047,21 @@ lbl_8053A751 = .sbss:0x8053A751; // type:object size:0x1 data:byte
lbl_8053A752 = .sbss:0x8053A752; // type:object size:0x1 data:byte
console_scroll$90837 = .sbss:0x8053A754; // type:object size:0x4 scope:local align:4 data:float
frame$90973 = .sbss:0x8053A758; // type:object size:0x4 scope:local align:4 data:4byte
lbl_8053A760 = .sbss:0x8053A760; // type:object size:0x1 data:byte
lbl_8053A761 = .sbss:0x8053A761; // type:object size:0x1 data:byte
lbl_8053A762 = .sbss:0x8053A762; // type:object size:0x1 data:byte
lbl_8053A763 = .sbss:0x8053A763; // type:object size:0x1 data:byte
lbl_8053A764 = .sbss:0x8053A764; // type:object size:0x1 data:byte
__OSReport_disable = .sbss:0x8053A760; // type:object size:0x1 data:byte
__OSReport_Error_disable = .sbss:0x8053A761; // type:object size:0x1 data:byte
__OSReport_Warning_disable = .sbss:0x8053A762; // type:object size:0x1 data:byte
__OSReport_System_disable = .sbss:0x8053A763; // type:object size:0x1 data:byte
__OSReport_enable = .sbss:0x8053A764; // type:object size:0x1 data:byte
__OSReport_MonopolyThread = .sbss:0x8053A768; // type:object size:0x4 scope:global align:4 data:4byte
print_counts = .sbss:0x8053A76C; // type:object size:0x4 scope:global align:4 data:4byte
print_errors = .sbss:0x8053A770; // type:object size:0x4 scope:global align:4 data:4byte
print_warings = .sbss:0x8053A774; // type:object size:0x4 scope:global align:4 data:4byte
print_systems = .sbss:0x8053A778; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8053A77C = .sbss:0x8053A77C; // type:object size:0x1 data:byte
print_initialized = .sbss:0x8053A77C; // type:object size:0x1 data:byte
lbl_8053A77D = .sbss:0x8053A77D; // type:object size:0x1 data:byte
lbl_8053A780 = .sbss:0x8053A780; // type:object size:0x1 data:byte
lbl_8053A781 = .sbss:0x8053A781; // type:object size:0x1 data:byte
lbl_8053A782 = .sbss:0x8053A782; // type:object size:0x1 data:byte
mInitFlag__17mDoAud_zelAudio_c = .sbss:0x8053A780; // type:object size:0x1 data:byte
mResetFlag__17mDoAud_zelAudio_c = .sbss:0x8053A781; // type:object size:0x1 data:byte
mBgmSet__17mDoAud_zelAudio_c = .sbss:0x8053A782; // type:object size:0x1 data:byte
g_mDoAud_audioHeap = .sbss:0x8053A784; // type:object size:0x4 scope:global align:4 data:4byte
l_affCommand = .sbss:0x8053A788; // type:object size:0x4 scope:global align:4 data:4byte
l_arcCommand = .sbss:0x8053A78C; // type:object size:0x4 scope:global align:4 data:4byte
@@ -28067,21 +28092,15 @@ mZbufferTimg__13mDoGph_gInf_c = .sbss:0x8053A7F4; // type:object size:0x4 scope:
mZbufferTex__13mDoGph_gInf_c = .sbss:0x8053A7F8; // type:object size:0x4 scope:global align:4 data:4byte
mFadeRate__13mDoGph_gInf_c = .sbss:0x8053A7FC; // type:object size:0x4 scope:global align:4 data:float
mFadeSpeed__13mDoGph_gInf_c = .sbss:0x8053A800; // type:object size:0x4 scope:global align:4 data:float
lbl_8053A804 = .sbss:0x8053A804; // type:object size:0x1 data:byte
lbl_8053A805 = .sbss:0x8053A805; // type:object size:0x1 data:byte
lbl_8053A806 = .sbss:0x8053A806; // type:object size:0x1 data:byte
lbl_8053A807 = .sbss:0x8053A807; // type:object size:0x1 data:byte
lbl_8053A808 = .sbss:0x8053A808; // type:object size:0x1 data:byte
lbl_8053A809 = .sbss:0x8053A809; // type:object size:0x1 data:byte
lbl_8053A80A = .sbss:0x8053A80A; // type:object size:0x1 data:byte
lbl_8053A80B = .sbss:0x8053A80B; // type:object size:0x1 data:byte
lbl_8053A80C = .sbss:0x8053A80C; // type:object size:0x1 data:byte
lbl_8053A80D = .sbss:0x8053A80D; // type:object size:0x1 data:byte
lbl_8053A80E = .sbss:0x8053A80E; // type:object size:0x1 data:byte
lbl_8053A80F = .sbss:0x8053A80F; // type:object size:0x1 data:byte
mBackColor__13mDoGph_gInf_c = .sbss:0x8053A804; // type:object size:0x4 data:byte
mFadeColor__13mDoGph_gInf_c = .sbss:0x8053A808; // type:object size:0x4 data:byte
mBlureFlag__13mDoGph_gInf_c = .sbss:0x8053A80C; // type:object size:0x1 data:byte
mBlureRate__13mDoGph_gInf_c = .sbss:0x8053A80D; // type:object size:0x1 data:byte
mFade__13mDoGph_gInf_c = .sbss:0x8053A80E; // type:object size:0x1 data:byte
mAutoForcus__13mDoGph_gInf_c = .sbss:0x8053A80F; // type:object size:0x1 data:byte
lbl_8053A810 = .sbss:0x8053A810; // type:object size:0x1 data:byte
m_blurID__Q213mDoGph_gInf_c5csr_c = .sbss:0x8053A814; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8053A818 = .sbss:0x8053A818; // type:object size:0x1 data:byte
mWideZoom__13mDoGph_gInf_c = .sbss:0x8053A818; // type:object size:0x1 data:byte
m_minX__13mDoGph_gInf_c = .sbss:0x8053A81C; // type:object size:0x4 scope:global align:4 data:4byte
m_minY__13mDoGph_gInf_c = .sbss:0x8053A820; // type:object size:0x4 scope:global align:4 data:4byte
m_minXF__13mDoGph_gInf_c = .sbss:0x8053A824; // type:object size:0x4 scope:global align:4 data:float
@@ -28103,7 +28122,7 @@ lbl_8053A865 = .sbss:0x8053A865; // type:object size:0x1 data:byte
lbl_8053A866 = .sbss:0x8053A866; // type:object size:0x1 data:byte
lbl_8053A867 = .sbss:0x8053A867; // type:object size:0x1 data:byte
l_oldButton$90458 = .sbss:0x8053A868; // type:object size:0x4 scope:local align:4 data:4byte
lbl_8053A870 = .sbss:0x8053A870; // type:object size:0x8
mDoMtx_stack = .sbss:0x8053A870; // type:object size:0x1
AssertHeap = .sbss:0x8053A878; // type:object size:0x4 scope:global align:4 data:4byte
DbPrintHeap = .sbss:0x8053A87C; // type:object size:0x4 scope:global align:4 data:4byte
gameHeap = .sbss:0x8053A880; // type:object size:0x4 scope:global align:4 data:4byte
@@ -28125,9 +28144,9 @@ aram_cache_size = .sbss:0x8053A8BC; // type:object size:0x4 scope:global align:4
mSystemFar__14mDoLib_clipper = .sbss:0x8053A8C0; // type:object size:0x4 scope:global align:4 data:float
mFovyRate__14mDoLib_clipper = .sbss:0x8053A8C4; // type:object size:0x4 scope:global align:4 data:float
mResetData__6mDoRst = .sbss:0x8053A8C8; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8053A8D0 = .sbss:0x8053A8D0; // type:object size:0x1 data:byte
lbl_8053A8D1 = .sbss:0x8053A8D1; // type:object size:0x7 data:byte
lbl_8053A8D8 = .sbss:0x8053A8D8; // type:object size:0x1 data:byte
SyncWidthSound__9mDoDvdThd = .sbss:0x8053A8D0; // type:object size:0x1 data:byte
sDefaultDirection = .sbss:0x8053A8D1; // type:object size:0x1 data:byte
mDoDvdErr_initialized = .sbss:0x8053A8D8; // type:object size:0x1 data:byte
sConsole = .sbss:0x8053A8E0; // type:object size:0x4 scope:global align:4 data:4byte
cDmr_SkipInfo = .sbss:0x8053A8E8; // type:object size:0x1
data_80450C99 = .sbss:0x8053A8E9; // type:object size:0x1
@@ -28168,10 +28187,10 @@ g_fpcPf_ProfileList_p = .sbss:0x8053A980; // type:object size:0x4 scope:global a
tmp_name$50691 = .sbss:0x8053A988; // type:object size:0x8 scope:local align:1 data:byte
mProcID__20dStage_roomControl_c = .sbss:0x8053A990; // type:object size:0x4 scope:global align:4 data:4byte
mStayNo__20dStage_roomControl_c = .sbss:0x8053A994; // type:object size:0x1 data:byte
lbl_8053A995 = .sbss:0x8053A995; // type:object size:0x1 data:byte
lbl_8053A996 = .sbss:0x8053A996; // type:object size:0x1 data:byte
lbl_8053A997 = .sbss:0x8053A997; // type:object size:0x1 data:byte
lbl_8053A998 = .sbss:0x8053A998; // type:object size:0x1 data:byte
mOldStayNo__20dStage_roomControl_c = .sbss:0x8053A995; // type:object size:0x1 data:byte
mNextStayNo__20dStage_roomControl_c = .sbss:0x8053A996; // type:object size:0x1 data:byte
m_time_pass__20dStage_roomControl_c = .sbss:0x8053A997; // type:object size:0x1 data:byte
mNoChangeRoom__20dStage_roomControl_c = .sbss:0x8053A998; // type:object size:0x1 data:byte
mArcBankName__20dStage_roomControl_c = .sbss:0x8053A99C; // type:object size:0x4 scope:global align:4 data:4byte
mArcBankData__20dStage_roomControl_c = .sbss:0x8053A9A0; // type:object size:0x4 scope:global align:4 data:4byte
m_roomDzs__20dStage_roomControl_c = .sbss:0x8053A9A4; // type:object size:0x8 scope:global align:4
@@ -28179,10 +28198,7 @@ m_res__22dMap_HIO_prm_res_dst_s = .sbss:0x8053A9B0; // type:object size:0x4 scop
m_baseCsr__13dComIfG_inf_c = .sbss:0x8053A9B8; // type:object size:0x4 scope:global align:4 data:4byte
m_navi__Q213dComIfG_inf_c9baseCsr_c = .sbss:0x8053A9BC; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8053A9C0 = .sbss:0x8053A9C0; // type:object size:0x1 data:byte
lbl_8053A9C1 = .sbss:0x8053A9C1; // type:object size:0x1 data:byte
lbl_8053A9C2 = .sbss:0x8053A9C2; // type:object size:0x1 data:byte
lbl_8053A9C3 = .sbss:0x8053A9C3; // type:object size:0x1 data:byte
lbl_8053A9C4 = .sbss:0x8053A9C4; // type:object size:0x1 data:byte
g_clearColor = .sbss:0x8053A9C1; // type:object size:0x4 data:byte
g_dComIfAc_gameInfo = .sbss:0x8053A9C8; // type:object size:0x8 scope:global align:4
g_dComIfGoat_gameInfo = .sbss:0x8053A9D0; // type:object size:0x4 scope:global align:4 data:4byte
m_count__9daArrow_c = .sbss:0x8053A9D8; // type:object size:0x2 scope:global align:2
@@ -28690,18 +28706,18 @@ lbl_8053B280 = .sbss:0x8053B280; // type:object size:0x1 data:byte
sCurrentFifo__12JUTGraphFifo = .sbss:0x8053B284; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8053B288 = .sbss:0x8053B288; // type:object size:0x8
sDebugPrint__10JUTDbPrint = .sbss:0x8053B290; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8053B298 = .sbss:0x8053B298; // type:object size:0x1 data:byte
lbl_8053B299 = .sbss:0x8053B299; // type:object size:0x1 data:byte
mListInitialized__10JUTGamePad = .sbss:0x8053B298; // type:object size:0x1 data:byte
mPadAssign__10JUTGamePad = .sbss:0x8053B299; // type:object size:0x4 data:byte
sSuppressPadReset__10JUTGamePad = .sbss:0x8053B2A0; // type:object size:0x4 scope:global align:4 data:4byte
sAnalogMode__10JUTGamePad = .sbss:0x8053B2A4; // type:object size:0x4 scope:global align:4 data:4byte
sRumbleSupported__10JUTGamePad = .sbss:0x8053B2A8; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8053B2AC = .sbss:0x8053B2AC; // type:object size:0x1 data:byte
mStatus__Q210JUTGamePad7CRumble = .sbss:0x8053B2AC; // type:object size:0x4 data:byte
mEnabled__Q210JUTGamePad7CRumble = .sbss:0x8053B2B0; // type:object size:0x4 scope:global align:4 data:4byte
sCallback__Q210JUTGamePad13C3ButtonReset = .sbss:0x8053B2B4; // type:object size:0x4 scope:global align:4 data:4byte
sCallbackArg__Q210JUTGamePad13C3ButtonReset = .sbss:0x8053B2B8; // type:object size:0x4 scope:global align:4 data:4byte
sThreshold__Q210JUTGamePad13C3ButtonReset = .sbss:0x8053B2C0; // type:object size:0x8 scope:global align:4 data:4byte
lbl_8053B2C8 = .sbss:0x8053B2C8; // type:object size:0x1 data:byte
lbl_8053B2C9 = .sbss:0x8053B2C9; // type:object size:0x1 data:byte
sResetSwitchPushing__Q210JUTGamePad13C3ButtonReset = .sbss:0x8053B2C8; // type:object size:0x1 data:byte
sResetOccurred__Q210JUTGamePad13C3ButtonReset = .sbss:0x8053B2C9; // type:object size:0x1 data:byte
sResetOccurredPort__Q210JUTGamePad13C3ButtonReset = .sbss:0x8053B2CC; // type:object size:0x4 scope:global align:4 data:4byte
sErrorManager__12JUTException = .sbss:0x8053B2D0; // type:object size:0x4 scope:global align:4 data:4byte
sPreUserCallback__12JUTException = .sbss:0x8053B2D4; // type:object size:0x4 scope:global align:4 data:4byte
config/RZDE01_02/splits.txt
+52 -37
View File
@@ -22,7 +22,7 @@ d/d_home_button.cpp:
d/d_cursor_mng.cpp:
.text start:0x800073D4 end:0x8000820C
.data start:0x803E0978 end:0x803E0AA0
.sdata start:0x8051D5A8 end:0x8051D5E4
.sdata start:0x8051D5A8 end:0x8051D5E0
.sbss start:0x80520728 end:0x80520740
.sdata2 start:0x805219F8 end:0x80521A10
@@ -31,15 +31,15 @@ m_Do/m_Do_main.cpp:
.ctors start:0x803B8C84 end:0x803B8C88
.data start:0x803E0AA0 end:0x803E0DB8
.bss start:0x80431040 end:0x804314A0
.sdata start:0x8051D5E4 end:0x8051D660
.sbss start:0x80520740 end:0x80520768
.sdata start:0x8051D5E0 end:0x8051D660
.sbss start:0x80520740 end:0x80520760
.sdata2 start:0x80521A10 end:0x80521A28
m_Do/m_Do_printf.cpp:
.text start:0x80009024 end:0x8000973C
.data start:0x803E0DB8 end:0x803E0E70
.bss start:0x804314A0 end:0x80431CA0
.sbss start:0x80520768 end:0x80520784
.sbss start:0x80520760 end:0x80520780
m_Do/m_Do_audio.cpp:
.text start:0x8000973C end:0x8000A0E0
@@ -47,7 +47,7 @@ m_Do/m_Do_audio.cpp:
.data start:0x803E0E70 end:0x803E10E8
.bss start:0x80431CA0 end:0x80433058
.sdata start:0x8051D660 end:0x8051D6CC
.sbss start:0x80520784 end:0x805207D4
.sbss start:0x80520780 end:0x805207D4
m_Do/m_Do_controller_pad.cpp:
.text start:0x8000A0E0 end:0x8000A4F0
@@ -74,7 +74,7 @@ m_Do/m_Do_machine.cpp:
.text start:0x80011B60 end:0x80012854
.data start:0x803E1100 end:0x803E1468
.sdata start:0x8051D710 end:0x8051D740
.sbss start:0x80520844 end:0x80520878
.sbss start:0x80520844 end:0x80520870
.sdata2 start:0x80521BC0 end:0x80521BC8
m_Do/m_Do_mtx.cpp:
@@ -83,6 +83,7 @@ m_Do/m_Do_mtx.cpp:
.data start:0x803E1468 end:0x803E1500
.bss start:0x8043AB08 end:0x8043AF70
.sdata start:0x8051D740 end:0x8051D750
.sbss start:0x80520870 end:0x80520878
.sdata2 start:0x80521BC8 end:0x80521BD8
m_Do/m_Do_ext.cpp:
@@ -103,7 +104,7 @@ m_Do/m_Do_lib.cpp:
m_Do/m_Do_Reset.cpp:
.text start:0x8001AAB0 end:0x8001ACE0
.sbss start:0x805208D0 end:0x805208E8
.sbss start:0x805208D0 end:0x805208D8
m_Do/m_Do_dvd_thread.cpp:
.text start:0x8001ACE0 end:0x8001B9FC
@@ -111,10 +112,12 @@ m_Do/m_Do_dvd_thread.cpp:
.data start:0x803E1D10 end:0x803E2058
.bss start:0x8043AFE0 end:0x8043D360
.sdata start:0x8051D810 end:0x8051D858
.sbss start:0x805208D8 end:0x805208E0
m_Do/m_Do_DVDError.cpp:
.text start:0x8001B9FC end:0x8001BB68
.bss start:0x8043D360 end:0x8043F6C0
.sbss start:0x805208E0 end:0x805208E8
m_Do/m_Do_MemCard.cpp:
.text start:0x8001BB68 end:0x8001CEC0
@@ -338,7 +341,7 @@ f_pc/f_pc_node_req.cpp:
f_pc/f_pc_priority.cpp:
.text start:0x80027F0C end:0x80028250
.bss start:0x804689F8 end:0x80468A08
.sdata start:0x8051D970 end:0x8051D9A8
.sdata start:0x8051D970 end:0x8051D978
f_pc/f_pc_profile.cpp:
.text start:0x80028250 end:0x80028260
@@ -378,7 +381,7 @@ d/d_stage.cpp:
.ctors start:0x803B8CAC end:0x803B8CB0
.data start:0x803E5848 end:0x803E90F8
.bss start:0x80468A08 end:0x80479ED0
.sdata start:0x8051D9A8 end:0x8051D9DC
.sdata start:0x8051D978 end:0x8051D9C0
.sbss start:0x80520990 end:0x805209B8
.sdata2 start:0x80521D28 end:0x80521D38
@@ -386,7 +389,7 @@ d/d_map.cpp:
.text start:0x8002CD10 end:0x8002F47C
.rodata start:0x803BA670 end:0x803BA750
.data start:0x803E90F8 end:0x803E94F8
.sdata start:0x8051D9DC end:0x8051DB6C
.sdata start:0x8051D9C0 end:0x8051DB6C
.sbss start:0x805209B8 end:0x805209C0
.sdata2 start:0x80521D38 end:0x80521D98
@@ -2450,7 +2453,7 @@ revolution/homebuttonLib/nw4hbm/lyt/lyt_textBox.cpp:
.text start:0x802C4164 end:0x802C5794
.ctors start:0x803B8DD4 end:0x803B8DD8
.data start:0x80411760 end:0x804117D8
.sdata start:0x80520168 end:0x80520178
.sdata start:0x80520168 end:0x80520170
.sbss start:0x805210F8 end:0x80521100
.sdata2 start:0x80525E68 end:0x80525E80
@@ -2510,7 +2513,7 @@ revolution/homebuttonLib/nw4hbm/ut/ut_ResFontBase.cpp:
revolution/homebuttonLib/nw4hbm/ut/ut_TagProcessorBase.cpp:
.text start:0x802CA798 end:0x802CAF58
.data start:0x80412AF0 end:0x80412B48
.data start:0x80412AF0 end:0x80412B18
.sdata2 start:0x80525ED8 end:0x80525EE0
revolution/homebuttonLib/nw4hbm/ut/ut_TextWriterBase.cpp:
@@ -2522,13 +2525,14 @@ revolution/homebuttonLib/nw4hbm/ut/ut_TextWriterBase.cpp:
JSystem/JKernel/JKRHeap.cpp:
.text start:0x802CC984 end:0x802CD5BC
.data start:0x80412B48 end:0x80412BA8
.sdata start:0x80520178 end:0x805201A8
.data start:0x80412B18 end:0x80412BA8
.sdata start:0x80520170 end:0x80520180
.sbss start:0x80521120 end:0x80521150
JSystem/JKernel/JKRExpHeap.cpp:
.text start:0x802CD5BC end:0x802CF184
.data start:0x80412BA8 end:0x80412F50
.sdata start:0x80520180 end:0x805201A0
.sbss start:0x80521150 end:0x80521168
.sdata2 start:0x80525EF8 end:0x80525F08
@@ -2548,17 +2552,18 @@ JSystem/JKernel/JKRDisposer.cpp:
JSystem/JKernel/JKRThread.cpp:
.text start:0x802CFC64 end:0x802D096C
.ctors start:0x803B8DE0 end:0x803B8DE4
.data start:0x80413178 end:0x804132B4
.data start:0x80413178 end:0x80413288
.bss start:0x804A8D60 end:0x804A8DB0
.sdata start:0x805201A0 end:0x805201A8
.sbss start:0x80521168 end:0x80521188
.sdata2 start:0x80525F20 end:0x80525F30
JSystem/JKernel/JKRAram.cpp:
.text start:0x802D096C end:0x802D178C
.ctors start:0x803B8DE4 end:0x803B8DE8
.data start:0x804132B4 end:0x804132C8
.data start:0x80413288 end:0x804132C8
.bss start:0x804A8DB0 end:0x804A8E10
.sdata start:0x805201A8 end:0x805201C4
.sdata start:0x805201A8 end:0x805201B0
.sbss start:0x80521188 end:0x805211C8
JSystem/JKernel/JKRAramHeap.cpp:
@@ -2574,12 +2579,12 @@ JSystem/JKernel/JKRAramBlock.cpp:
JSystem/JKernel/JKRAramPiece.cpp:
.text start:0x802D1F28 end:0x802D24A4
.ctors start:0x803B8DEC end:0x803B8DF0
.data start:0x804132E8 end:0x8041337C
.data start:0x804132E8 end:0x80413350
.bss start:0x804A8E28 end:0x804A8E58
JSystem/JKernel/JKRAramStream.cpp:
.text start:0x802D24A4 end:0x802D2A1C
.data start:0x8041337C end:0x80413390
.data start:0x80413350 end:0x80413390
.bss start:0x804A8E58 end:0x804A8E88
.sbss start:0x805211C8 end:0x805211D8
@@ -2588,6 +2593,7 @@ JSystem/JKernel/JKRFileLoader.cpp:
.ctors start:0x803B8DF0 end:0x803B8DF4
.data start:0x80413390 end:0x804133D0
.bss start:0x804A8E88 end:0x804A8EA0
.sdata start:0x805201B0 end:0x805201B8
.sbss start:0x805211D8 end:0x805211E0
JSystem/JKernel/JKRFileFinder.cpp:
@@ -2597,10 +2603,11 @@ JSystem/JKernel/JKRFileFinder.cpp:
JSystem/JKernel/JKRFileCache.cpp:
.text start:0x802D3320 end:0x802D40B8
.data start:0x80413400 end:0x80413450
.sdata start:0x805201B8 end:0x805201C0
JSystem/JKernel/JKRArchivePub.cpp:
.text start:0x802D40B8 end:0x802D4BA8
.data start:0x80413450 end:0x804134C4
.data start:0x80413450 end:0x804134A0
JSystem/JKernel/JKRArchivePri.cpp:
.text start:0x802D4BA8 end:0x802D52F8
@@ -2608,19 +2615,19 @@ JSystem/JKernel/JKRArchivePri.cpp:
JSystem/JKernel/JKRMemArchive.cpp:
.text start:0x802D52F8 end:0x802D59A8
.data start:0x804134C4 end:0x80413540
.data start:0x804134A0 end:0x80413518
JSystem/JKernel/JKRAramArchive.cpp:
.text start:0x802D59A8 end:0x802D65D0
.data start:0x80413540 end:0x80413590
.data start:0x80413518 end:0x80413590
JSystem/JKernel/JKRDvdArchive.cpp:
.text start:0x802D65D0 end:0x802D711C
.data start:0x80413590 end:0x80413688
.data start:0x80413590 end:0x80413650
JSystem/JKernel/JKRCompArchive.cpp:
.text start:0x802D711C end:0x802D7DE4
.data start:0x80413688 end:0x80413700
.data start:0x80413650 end:0x804136D8
JSystem/JKernel/JKRFile.cpp:
.text start:0x802D7DE4 end:0x802D7E50
@@ -2628,7 +2635,7 @@ JSystem/JKernel/JKRFile.cpp:
JSystem/JKernel/JKRDvdFile.cpp:
.text start:0x802D7E50 end:0x802D847C
.ctors start:0x803B8DF4 end:0x803B8DF8
.data start:0x80413700 end:0x80413748
.data start:0x804136D8 end:0x80413748
.bss start:0x804A8EA0 end:0x804A8EB8
JSystem/JKernel/JKRDvdRipper.cpp:
@@ -2636,7 +2643,7 @@ JSystem/JKernel/JKRDvdRipper.cpp:
.ctors start:0x803B8DF8 end:0x803B8DFC
.data start:0x80413748 end:0x804137A0
.bss start:0x804A8EB8 end:0x804A8EE8
.sdata start:0x805201C4 end:0x805201CC
.sdata start:0x805201C0 end:0x805201CC
.sbss start:0x805211E8 end:0x80521228
JSystem/JKernel/JKRDvdAramRipper.cpp:
@@ -2650,7 +2657,7 @@ JSystem/JKernel/JKRDecomp.cpp:
.text start:0x802D9E08 end:0x802DA4EC
.data start:0x804137A0 end:0x804137B0
.bss start:0x804A8F18 end:0x804A8F58
.sbss start:0x80521270 end:0x8052127C
.sbss start:0x80521270 end:0x80521278
JSystem/JSupport/JSUList.cpp:
.text start:0x802DA4EC end:0x802DA92C
@@ -2678,7 +2685,7 @@ JSystem/JGadget/std-vector.cpp:
JSystem/JUtility/JUTCacheFont.cpp:
.text start:0x802DB7C4 end:0x802DC684
.data start:0x80413818 end:0x80413908
.data start:0x80413818 end:0x804138D8
.sdata2 start:0x80525F30 end:0x80525F38
JSystem/JUtility/JUTResource.cpp:
@@ -2690,6 +2697,7 @@ JSystem/JUtility/JUTTexture.cpp:
JSystem/JUtility/JUTPalette.cpp:
.text start:0x802DCE18 end:0x802DCF04
.data start:0x804138D8 end:0x80413908
JSystem/JUtility/JUTNameTab.cpp:
.text start:0x802DCF04 end:0x802DD0F4
@@ -2698,16 +2706,16 @@ JSystem/JUtility/JUTNameTab.cpp:
JSystem/JUtility/JUTGraphFifo.cpp:
.text start:0x802DD0F4 end:0x802DD284
.data start:0x80413918 end:0x80413928
.sbss start:0x8052127C end:0x80521288
.sbss start:0x80521278 end:0x80521288
JSystem/JUtility/JUTFont.cpp:
.text start:0x802DD284 end:0x802DD4FC
.data start:0x80413928 end:0x804139A4
.data start:0x80413928 end:0x80413970
JSystem/JUtility/JUTResFont.cpp:
.text start:0x802DD4FC end:0x802DE60C
.rodata start:0x803DAA78 end:0x803DAB60
.data start:0x804139A4 end:0x804139F0
.data start:0x80413970 end:0x804139F0
.sdata2 start:0x80525F50 end:0x80525F68
JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp:
@@ -2715,7 +2723,7 @@ JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp:
JSystem/JUtility/JUTDbPrint.cpp:
.text start:0x802DE60C end:0x802DEB68
.sbss start:0x80521288 end:0x80521298
.sbss start:0x80521288 end:0x80521290
.sdata2 start:0x80525F68 end:0x80525F78
JSystem/JUtility/JUTGamePad.cpp:
@@ -2723,8 +2731,8 @@ JSystem/JUtility/JUTGamePad.cpp:
.ctors start:0x803B8E00 end:0x803B8E04
.data start:0x804139F0 end:0x80413A20
.bss start:0x804A8F58 end:0x804A90F8
.sdata start:0x805201D0 end:0x80520228
.sbss start:0x80521298 end:0x805212C8
.sdata start:0x805201D0 end:0x805201E8
.sbss start:0x80521290 end:0x805212C8
.sdata2 start:0x80525F78 end:0x80525F98
JSystem/JUtility/JUTException.cpp:
@@ -2732,17 +2740,20 @@ JSystem/JUtility/JUTException.cpp:
.ctors start:0x803B8E04 end:0x803B8E08
.data start:0x80413A20 end:0x80413F58
.bss start:0x804A90F8 end:0x804A9570
.sdata start:0x805201E8 end:0x80520218
.sbss start:0x805212C8 end:0x805212F0
.sdata2 start:0x80525F98 end:0x80525FA8
JSystem/JUtility/JUTDirectPrint.cpp:
.text start:0x802E21E0 end:0x802E28C0
.data start:0x80413F58 end:0x80414220
.sdata start:0x80520218 end:0x80520220
.sbss start:0x805212F0 end:0x805212F8
.sdata2 start:0x80525FA8 end:0x80526000
JSystem/JUtility/JUTAssert.cpp:
.text start:0x802E28C0 end:0x802E2B9C
.sdata start:0x80520220 end:0x80520228
.sbss start:0x805212F8 end:0x80521300
.sdata2 start:0x80526000 end:0x80526018
@@ -2757,18 +2768,19 @@ JSystem/JUtility/JUTXfb.cpp:
JSystem/JUtility/JUTFader.cpp:
.text start:0x802E33AC end:0x802E36C0
.data start:0x80414230 end:0x80414254
.data start:0x80414230 end:0x80414248
.sdata2 start:0x80526018 end:0x80526020
JSystem/JUtility/JUTProcBar.cpp:
.text start:0x802E36C0 end:0x802E4E70
.sdata start:0x80520228 end:0x80520298
.sdata start:0x80520228 end:0x80520230
.sbss start:0x80521320 end:0x80521330
.sdata2 start:0x80526020 end:0x80526060
JSystem/JUtility/JUTConsole.cpp:
.text start:0x802E4E70 end:0x802E618C
.data start:0x80414254 end:0x80414260
.data start:0x80414248 end:0x80414260
.sdata start:0x80520230 end:0x80520238
.sbss start:0x80521330 end:0x80521340
.sdata2 start:0x80526060 end:0x80526090
@@ -2835,6 +2847,7 @@ JSystem/J2DGraph/J2DPicture.cpp:
JSystem/J2DGraph/J2DTextBox.cpp:
.text start:0x802FC6C4 end:0x802FDBB4
.data start:0x80414AD8 end:0x80414B98
.sdata start:0x80520238 end:0x80520240
.sdata2 start:0x805261C8 end:0x805261E8
JSystem/J2DGraph/J2DWindowEx.cpp:
@@ -2853,6 +2866,7 @@ JSystem/J2DGraph/J2DTextBoxEx.cpp:
.text start:0x80303B14 end:0x80305358
.rodata start:0x803DEE08 end:0x803DEE40
.data start:0x80414DB8 end:0x80414E78
.sdata start:0x80520240 end:0x80520248
.sdata2 start:0x80526220 end:0x80526240
JSystem/J2DGraph/J2DAnmLoader.cpp:
@@ -2871,6 +2885,7 @@ JSystem/J2DGraph/J2DManage.cpp:
JSystem/J3DGraphBase/J3DGD.cpp:
.text start:0x80309580 end:0x8030AE48
.data start:0x80414FA8 end:0x80415050
.sdata start:0x80520248 end:0x80520298
.sdata2 start:0x80526278 end:0x805262B8
JSystem/J3DGraphBase/J3DSys.cpp:
config/RZDE01_02/symbols.txt
+38 -47
View File
@@ -24800,8 +24800,8 @@ l_RoomKeepDoorInfo = .bss:0x80469324; // type:object size:0x904 scope:global ali
@97897 = .bss:0x80469C28; // type:object size:0xC scope:local align:4
mStatus__20dStage_roomControl_c = .bss:0x80469C34; // type:object size:0x10100 scope:global align:4 data:4byte
mMemoryBlock__20dStage_roomControl_c = .bss:0x80479D34; // type:object size:0x4C scope:global align:4
lbl_80479D80 = .bss:0x80479D80; // type:object size:0xA data:byte
lbl_80479D8A = .bss:0x80479D8A; // type:object size:0x146
mDemoArcName__20dStage_roomControl_c = .bss:0x80479D80; // type:object size:0xA data:byte
mArcBank__20dStage_roomControl_c = .bss:0x80479D8A; // type:object size:0x146
...bss.0 = .bss:0x80479ED0; // type:label scope:local align:4
dComIfG_mTimerInfo = .bss:0x80479ED0; // type:object size:0x14 scope:global align:4
@109549 = .bss:0x80479EE4; // type:object size:0xC scope:local align:4
@@ -25371,8 +25371,8 @@ exCallbackObject = .bss:0x804A9118; // type:object size:0x14 scope:global align:
sMapFileList__12JUTException = .bss:0x804A9138; // type:object size:0xC scope:global align:4 data:4byte
c3bcnt = .bss:0x804A9148; // type:object size:0x20 scope:global align:4 data:4byte
context$45953 = .bss:0x804A9168; // type:object size:0x2C8 scope:global align:4
lbl_804A9430 = .bss:0x804A9430; // type:object size:0x40
lbl_804A9470 = .bss:0x804A9470; // type:object size:0x100
sMessageFileLine__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .bss:0x804A9430; // type:object size:0x40
sMessageString__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .bss:0x804A9470; // type:object size:0x100
static_mBounds__7J2DPane = .bss:0x804A9570; // type:object size:0x10 scope:global align:4
lbl_804A9580 = .bss:0x804A9580; // type:object size:0x120 data:byte
j3dSys = .bss:0x804A96A0; // type:object size:0x11C scope:global align:4
@@ -25565,7 +25565,7 @@ __RTTI__Q310dCsr_mng_c8bloObj_c9paneObj_c = .sdata:0x8051D5C0; // type:object si
__RTTI__Q210dCsr_mng_c5obj_c = .sdata:0x8051D5C8; // type:object size:0x8 scope:global align:4
__RTTI__Q210dCsr_mng_c6list_c = .sdata:0x8051D5D0; // type:object size:0x8 scope:global align:4
__RTTI__Q210dCsr_mng_c6node_c = .sdata:0x8051D5D8; // type:object size:0x8 scope:global align:4
lbl_8051D5E0 = .sdata:0x8051D5E0; // type:object size:0x1 data:byte
developmentMode__7mDoMain = .sdata:0x8051D5E0; // type:object size:0x1 data:byte
memMargin__7mDoMain = .sdata:0x8051D5E4; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8051D5E8 = .sdata:0x8051D5E8; // type:object size:0x1 data:byte
lbl_8051D5E9 = .sdata:0x8051D5E9; // type:object size:0x3
@@ -25602,7 +25602,7 @@ __RTTI__28JASGlobalInstance<8Z2SeqMgr> = .sdata:0x8051D6A8; // type:object size:
lbl_8051D6B0 = .sdata:0x8051D6B0; // type:object size:0x8 data:string
__RTTI__7Z2SeMgr = .sdata:0x8051D6B8; // type:object size:0x8 scope:global align:4
__RTTI__27JASGlobalInstance<7Z2SeMgr> = .sdata:0x8051D6C0; // type:object size:0x8 scope:global align:4
lbl_8051D6C8 = .sdata:0x8051D6C8; // type:object size:0x1 data:byte
mWide__13mDoGph_gInf_c = .sdata:0x8051D6C8; // type:object size:0x1 data:byte
m_aspect__13mDoGph_gInf_c = .sdata:0x8051D6CC; // type:object size:0x4 scope:global align:4 data:float
m_scale__13mDoGph_gInf_c = .sdata:0x8051D6D0; // type:object size:0x4 scope:global align:4 data:float
m_invScale__13mDoGph_gInf_c = .sdata:0x8051D6D4; // type:object size:0x4 scope:global align:4 data:float
@@ -25706,7 +25706,7 @@ lbl_8051D988 = .sdata:0x8051D988; // type:object size:0x8 data:string
lbl_8051D990 = .sdata:0x8051D990; // type:object size:0x7 data:string
lbl_8051D997 = .sdata:0x8051D997; // type:object size:0x7 data:string
lbl_8051D99E = .sdata:0x8051D99E; // type:object size:0x6 data:string
lbl_8051D9A4 = .sdata:0x8051D9A4; // type:object size:0x1 data:byte
mRoomReadId__20dStage_roomControl_c = .sdata:0x8051D9A4; // type:object size:0x1 data:byte
__RTTI__16dStage_stageDt_c = .sdata:0x8051D9A8; // type:object size:0x8 scope:global align:4
__RTTI__15dStage_roomDt_c = .sdata:0x8051D9B0; // type:object size:0x8 scope:global align:4
__RTTI__11dStage_dt_c = .sdata:0x8051D9B8; // type:object size:0x8 scope:global align:4
@@ -25761,7 +25761,7 @@ lbl_8051DB33 = .sdata:0x8051DB33; // type:object size:0x8 data:string
lbl_8051DB3B = .sdata:0x8051DB3B; // type:object size:0x7 data:string
lbl_8051DB42 = .sdata:0x8051DB42; // type:object size:0x5 data:string
lbl_8051DB47 = .sdata:0x8051DB47; // type:object size:0x8 data:string
lbl_8051DB4F = .sdata:0x8051DB4F; // type:object size:0x1 data:byte
g_blackColor = .sdata:0x8051DB4F; // type:object size:0x1 data:byte
lbl_8051DB50 = .sdata:0x8051DB50; // type:object size:0x1 data:byte
lbl_8051DB51 = .sdata:0x8051DB51; // type:object size:0x1 data:byte
lbl_8051DB52 = .sdata:0x8051DB52; // type:object size:0x1 data:byte
@@ -27304,10 +27304,10 @@ scCursorSRotPaneName__Q210homebutton10HomeButton = .sdata:0x805200C0; // type:ob
@3379 = .sdata:0x80520160; // type:object size:0x2 scope:local align:4 data:string
@3380 = .sdata:0x80520164; // type:object size:0x3 scope:local align:4 data:string
@9572 = .sdata:0x80520168; // type:object size:0x4 scope:local align:4 data:wstring
lbl_80520170 = .sdata:0x80520170; // type:object size:0x1 data:byte
sDefaultFillFlag__7JKRHeap = .sdata:0x80520170; // type:object size:0x1 data:byte
lbl_80520171 = .sdata:0x80520171; // type:object size:0x7 data:string
ARALT_AramStartAdr = .sdata:0x80520178; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8052017C = .sdata:0x8052017C; // type:object size:0x3 data:string
@STRING@panic__12JUTExceptionFPCciPCc = .sdata:0x8052017C; // type:object size:0x3 data:string
lbl_80520180 = .sdata:0x80520180; // type:object size:0x7 data:string
lbl_80520187 = .sdata:0x80520187; // type:object size:0x6 data:string
lbl_8052018D = .sdata:0x8052018D; // type:object size:0x6 data:string
@@ -27318,7 +27318,7 @@ lbl_805201B0 = .sdata:0x805201B0; // type:object size:0x2 data:string
lbl_805201B2 = .sdata:0x805201B2; // type:object size:0x2 data:string
lbl_805201B8 = .sdata:0x805201B8; // type:object size:0x2 data:string
lbl_805201BA = .sdata:0x805201BA; // type:object size:0x4 data:string
lbl_805201C0 = .sdata:0x805201C0; // type:object size:0x1 data:byte
errorRetry__12JKRDvdRipper = .sdata:0x805201C0; // type:object size:0x1 data:byte
sSZSBufferSize__12JKRDvdRipper = .sdata:0x805201C4; // type:object size:0x4 scope:global align:4 data:4byte
lbl_805201C8 = .sdata:0x805201C8; // type:object size:0x1 data:byte
sSZSBufferSize__16JKRDvdAramRipper = .sdata:0x805201CC; // type:object size:0x4 scope:global align:4 data:4byte
@@ -27339,7 +27339,7 @@ lbl_80520209 = .sdata:0x80520209; // type:object size:0x8 data:string
lbl_80520211 = .sdata:0x80520211; // type:object size:0x1
lbl_80520212 = .sdata:0x80520212; // type:object size:0x5 data:string
lbl_80520218 = .sdata:0x80520218; // type:object size:0x3 data:string
lbl_80520220 = .sdata:0x80520220; // type:object size:0x1 data:byte
mVisible__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sdata:0x80520220; // type:object size:0x1 data:byte
oneFrameRate = .sdata:0x80520228; // type:object size:0x4 scope:global align:4 data:float
oneFrameRateUser = .sdata:0x8052022C; // type:object size:0x4 scope:global align:4 data:float
lbl_80520230 = .sdata:0x80520230; // type:object size:0x4 data:string
@@ -27571,21 +27571,21 @@ lbl_80520751 = .sbss:0x80520751; // type:object size:0x1 data:byte
lbl_80520752 = .sbss:0x80520752; // type:object size:0x1 data:byte
console_scroll$90874 = .sbss:0x80520754; // type:object size:0x4 scope:global align:4 data:float
frame$91010 = .sbss:0x80520758; // type:object size:0x4 scope:global align:4 data:4byte
lbl_80520760 = .sbss:0x80520760; // type:object size:0x1 data:byte
lbl_80520761 = .sbss:0x80520761; // type:object size:0x1 data:byte
lbl_80520762 = .sbss:0x80520762; // type:object size:0x1 data:byte
lbl_80520763 = .sbss:0x80520763; // type:object size:0x1 data:byte
lbl_80520764 = .sbss:0x80520764; // type:object size:0x1 data:byte
__OSReport_disable = .sbss:0x80520760; // type:object size:0x1 data:byte
__OSReport_Error_disable = .sbss:0x80520761; // type:object size:0x1 data:byte
__OSReport_Warning_disable = .sbss:0x80520762; // type:object size:0x1 data:byte
__OSReport_System_disable = .sbss:0x80520763; // type:object size:0x1 data:byte
__OSReport_enable = .sbss:0x80520764; // type:object size:0x1 data:byte
__OSReport_MonopolyThread = .sbss:0x80520768; // type:object size:0x4 scope:global align:4 data:4byte
print_counts = .sbss:0x8052076C; // type:object size:0x4 scope:global align:4 data:4byte
print_errors = .sbss:0x80520770; // type:object size:0x4 scope:global align:4 data:4byte
print_warings = .sbss:0x80520774; // type:object size:0x4 scope:global align:4 data:4byte
print_systems = .sbss:0x80520778; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8052077C = .sbss:0x8052077C; // type:object size:0x1 data:byte
print_initialized = .sbss:0x8052077C; // type:object size:0x1 data:byte
lbl_8052077D = .sbss:0x8052077D; // type:object size:0x1 data:byte
lbl_80520780 = .sbss:0x80520780; // type:object size:0x1 data:byte
lbl_80520781 = .sbss:0x80520781; // type:object size:0x1 data:byte
lbl_80520782 = .sbss:0x80520782; // type:object size:0x1 data:byte
mInitFlag__17mDoAud_zelAudio_c = .sbss:0x80520780; // type:object size:0x1 data:byte
mResetFlag__17mDoAud_zelAudio_c = .sbss:0x80520781; // type:object size:0x1 data:byte
mBgmSet__17mDoAud_zelAudio_c = .sbss:0x80520782; // type:object size:0x1 data:byte
g_mDoAud_audioHeap = .sbss:0x80520784; // type:object size:0x4 scope:global align:4 data:4byte
l_affCommand = .sbss:0x80520788; // type:object size:0x4 scope:global align:4 data:4byte
l_arcCommand = .sbss:0x8052078C; // type:object size:0x4 scope:global align:4 data:4byte
@@ -27616,21 +27616,15 @@ mZbufferTimg__13mDoGph_gInf_c = .sbss:0x805207F4; // type:object size:0x4 scope:
mZbufferTex__13mDoGph_gInf_c = .sbss:0x805207F8; // type:object size:0x4 scope:global align:4 data:4byte
mFadeRate__13mDoGph_gInf_c = .sbss:0x805207FC; // type:object size:0x4 scope:global align:4 data:float
mFadeSpeed__13mDoGph_gInf_c = .sbss:0x80520800; // type:object size:0x4 scope:global align:4 data:float
lbl_80520804 = .sbss:0x80520804; // type:object size:0x1 data:byte
lbl_80520805 = .sbss:0x80520805; // type:object size:0x1 data:byte
lbl_80520806 = .sbss:0x80520806; // type:object size:0x1 data:byte
lbl_80520807 = .sbss:0x80520807; // type:object size:0x1 data:byte
lbl_80520808 = .sbss:0x80520808; // type:object size:0x1 data:byte
lbl_80520809 = .sbss:0x80520809; // type:object size:0x1 data:byte
lbl_8052080A = .sbss:0x8052080A; // type:object size:0x1 data:byte
lbl_8052080B = .sbss:0x8052080B; // type:object size:0x1 data:byte
lbl_8052080C = .sbss:0x8052080C; // type:object size:0x1 data:byte
lbl_8052080D = .sbss:0x8052080D; // type:object size:0x1 data:byte
lbl_8052080E = .sbss:0x8052080E; // type:object size:0x1 data:byte
lbl_8052080F = .sbss:0x8052080F; // type:object size:0x1 data:byte
mBackColor__13mDoGph_gInf_c = .sbss:0x80520804; // type:object size:0x4 data:byte
mFadeColor__13mDoGph_gInf_c = .sbss:0x80520808; // type:object size:0x4 data:byte
mBlureFlag__13mDoGph_gInf_c = .sbss:0x8052080C; // type:object size:0x1 data:byte
mBlureRate__13mDoGph_gInf_c = .sbss:0x8052080D; // type:object size:0x1 data:byte
mFade__13mDoGph_gInf_c = .sbss:0x8052080E; // type:object size:0x1 data:byte
mAutoForcus__13mDoGph_gInf_c = .sbss:0x8052080F; // type:object size:0x1 data:byte
lbl_80520810 = .sbss:0x80520810; // type:object size:0x1 data:byte
m_blurID__Q213mDoGph_gInf_c5csr_c = .sbss:0x80520814; // type:object size:0x4 scope:global align:4 data:4byte
lbl_80520818 = .sbss:0x80520818; // type:object size:0x1 data:byte
mWideZoom__13mDoGph_gInf_c = .sbss:0x80520818; // type:object size:0x1 data:byte
m_minX__13mDoGph_gInf_c = .sbss:0x8052081C; // type:object size:0x4 scope:global align:4 data:4byte
m_minY__13mDoGph_gInf_c = .sbss:0x80520820; // type:object size:0x4 scope:global align:4 data:4byte
m_minXF__13mDoGph_gInf_c = .sbss:0x80520824; // type:object size:0x4 scope:global align:4 data:float
@@ -27652,7 +27646,7 @@ lbl_80520865 = .sbss:0x80520865; // type:object size:0x1 data:byte
lbl_80520866 = .sbss:0x80520866; // type:object size:0x1 data:byte
lbl_80520867 = .sbss:0x80520867; // type:object size:0x1 data:byte
l_oldButton$90464 = .sbss:0x80520868; // type:object size:0x4 scope:global align:4 data:4byte
lbl_80520870 = .sbss:0x80520870; // type:object size:0x8
mDoMtx_stack = .sbss:0x80520870; // type:object size:0x1
AssertHeap = .sbss:0x80520878; // type:object size:0x4 scope:global align:4 data:4byte
DbPrintHeap = .sbss:0x8052087C; // type:object size:0x4 scope:global align:4 data:4byte
gameHeap = .sbss:0x80520880; // type:object size:0x4 scope:global align:4 data:4byte
@@ -27675,9 +27669,9 @@ aram_cache_size = .sbss:0x805208C0; // type:object size:0x4 scope:global align:4
mSystemFar__14mDoLib_clipper = .sbss:0x805208C8; // type:object size:0x4 scope:global align:4 data:float
mFovyRate__14mDoLib_clipper = .sbss:0x805208CC; // type:object size:0x4 scope:global align:4 data:float
mResetData__6mDoRst = .sbss:0x805208D0; // type:object size:0x4 scope:global align:4 data:4byte
lbl_805208D8 = .sbss:0x805208D8; // type:object size:0x1 data:byte
lbl_805208D9 = .sbss:0x805208D9; // type:object size:0x7 data:byte
lbl_805208E0 = .sbss:0x805208E0; // type:object size:0x1 data:byte
SyncWidthSound__9mDoDvdThd = .sbss:0x805208D8; // type:object size:0x1 data:byte
sDefaultDirection = .sbss:0x805208D9; // type:object size:0x1 data:byte
mDoDvdErr_initialized = .sbss:0x805208E0; // type:object size:0x1 data:byte
sConsole = .sbss:0x805208E8; // type:object size:0x4 scope:global align:4 data:4byte
cDmr_SkipInfo = .sbss:0x805208F0; // type:object size:0x1
data_80450C99 = .sbss:0x805208F1; // type:object size:0x1
@@ -27729,10 +27723,7 @@ m_res__22dMap_HIO_prm_res_dst_s = .sbss:0x805209B8; // type:object size:0x4 scop
m_baseCsr__13dComIfG_inf_c = .sbss:0x805209C0; // type:object size:0x4 scope:global align:4 data:4byte
m_navi__Q213dComIfG_inf_c9baseCsr_c = .sbss:0x805209C4; // type:object size:0x4 scope:global align:4 data:4byte
lbl_805209C8 = .sbss:0x805209C8; // type:object size:0x1 data:byte
lbl_805209C9 = .sbss:0x805209C9; // type:object size:0x1 data:byte
lbl_805209CA = .sbss:0x805209CA; // type:object size:0x1 data:byte
lbl_805209CB = .sbss:0x805209CB; // type:object size:0x1 data:byte
lbl_805209CC = .sbss:0x805209CC; // type:object size:0x1 data:byte
g_clearColor = .sbss:0x805209C9; // type:object size:0x4 data:byte
g_dComIfAc_gameInfo = .sbss:0x805209D0; // type:object size:0x8 scope:global align:4
g_dComIfGoat_gameInfo = .sbss:0x805209D8; // type:object size:0x4 scope:global align:4 data:4byte
m_count__9daArrow_c = .sbss:0x805209E0; // type:object size:0x2 scope:global align:4
@@ -28235,18 +28226,18 @@ lbl_80521278 = .sbss:0x80521278; // type:object size:0x1 data:byte
sCurrentFifo__12JUTGraphFifo = .sbss:0x8052127C; // type:object size:0x4 scope:global align:4 data:4byte
lbl_80521280 = .sbss:0x80521280; // type:object size:0x8
sDebugPrint__10JUTDbPrint = .sbss:0x80521288; // type:object size:0x4 scope:global align:4 data:4byte
lbl_80521290 = .sbss:0x80521290; // type:object size:0x1 data:byte
lbl_80521291 = .sbss:0x80521291; // type:object size:0x1 data:byte
mListInitialized__10JUTGamePad = .sbss:0x80521290; // type:object size:0x1 data:byte
mPadAssign__10JUTGamePad = .sbss:0x80521291; // type:object size:0x4 data:byte
sSuppressPadReset__10JUTGamePad = .sbss:0x80521298; // type:object size:0x4 scope:global align:4 data:4byte
sAnalogMode__10JUTGamePad = .sbss:0x8052129C; // type:object size:0x4 scope:global align:4 data:4byte
sRumbleSupported__10JUTGamePad = .sbss:0x805212A0; // type:object size:0x4 scope:global align:4 data:4byte
lbl_805212A4 = .sbss:0x805212A4; // type:object size:0x1 data:byte
mStatus__Q210JUTGamePad7CRumble = .sbss:0x805212A4; // type:object size:0x4 data:byte
mEnabled__Q210JUTGamePad7CRumble = .sbss:0x805212A8; // type:object size:0x4 scope:global align:4 data:4byte
sCallback__Q210JUTGamePad13C3ButtonReset = .sbss:0x805212AC; // type:object size:0x4 scope:global align:4 data:4byte
sCallbackArg__Q210JUTGamePad13C3ButtonReset = .sbss:0x805212B0; // type:object size:0x4 scope:global align:4 data:4byte
sThreshold__Q210JUTGamePad13C3ButtonReset = .sbss:0x805212B8; // type:object size:0x8 scope:global align:4 data:4byte
lbl_805212C0 = .sbss:0x805212C0; // type:object size:0x1 data:byte
lbl_805212C1 = .sbss:0x805212C1; // type:object size:0x1 data:byte
sResetSwitchPushing__Q210JUTGamePad13C3ButtonReset = .sbss:0x805212C0; // type:object size:0x1 data:byte
sResetOccurred__Q210JUTGamePad13C3ButtonReset = .sbss:0x805212C1; // type:object size:0x1 data:byte
sResetOccurredPort__Q210JUTGamePad13C3ButtonReset = .sbss:0x805212C4; // type:object size:0x4 scope:global align:4 data:4byte
sErrorManager__12JUTException = .sbss:0x805212C8; // type:object size:0x4 scope:global align:4 data:4byte
sPreUserCallback__12JUTException = .sbss:0x805212CC; // type:object size:0x4 scope:global align:4 data:4byte
config/RZDJ01/splits.txt
+52 -37
View File
@@ -22,7 +22,7 @@ d/d_home_button.cpp:
d/d_cursor_mng.cpp:
.text start:0x800073D4 end:0x8000820C
.data start:0x803DE938 end:0x803DEA60
.sdata start:0x8051B428 end:0x8051B464
.sdata start:0x8051B428 end:0x8051B460
.sbss start:0x8051E5A8 end:0x8051E5C0
.sdata2 start:0x8051F878 end:0x8051F890
@@ -31,15 +31,15 @@ m_Do/m_Do_main.cpp:
.ctors start:0x803BA744 end:0x803BA748
.data start:0x803DEA60 end:0x803DED78
.bss start:0x8042EEC0 end:0x8042F320
.sdata start:0x8051B464 end:0x8051B4E0
.sbss start:0x8051E5C0 end:0x8051E5E8
.sdata start:0x8051B460 end:0x8051B4E0
.sbss start:0x8051E5C0 end:0x8051E5E0
.sdata2 start:0x8051F890 end:0x8051F8A8
m_Do/m_Do_printf.cpp:
.text start:0x80009024 end:0x8000973C
.data start:0x803DED78 end:0x803DEE30
.bss start:0x8042F320 end:0x8042FB20
.sbss start:0x8051E5E8 end:0x8051E604
.sbss start:0x8051E5E0 end:0x8051E600
m_Do/m_Do_audio.cpp:
.text start:0x8000973C end:0x8000A0E0
@@ -47,7 +47,7 @@ m_Do/m_Do_audio.cpp:
.data start:0x803DEE30 end:0x803DF0A8
.bss start:0x8042FB20 end:0x80430ED8
.sdata start:0x8051B4E0 end:0x8051B54C
.sbss start:0x8051E604 end:0x8051E654
.sbss start:0x8051E600 end:0x8051E654
m_Do/m_Do_controller_pad.cpp:
.text start:0x8000A0E0 end:0x8000A4F0
@@ -74,7 +74,7 @@ m_Do/m_Do_machine.cpp:
.text start:0x80011B60 end:0x800128D0
.data start:0x803DF0C0 end:0x803DF428
.sdata start:0x8051B590 end:0x8051B5C0
.sbss start:0x8051E6C4 end:0x8051E6F8
.sbss start:0x8051E6C4 end:0x8051E6F0
.sdata2 start:0x8051FA40 end:0x8051FA48
m_Do/m_Do_mtx.cpp:
@@ -83,6 +83,7 @@ m_Do/m_Do_mtx.cpp:
.data start:0x803DF428 end:0x803DF4C0
.bss start:0x80438988 end:0x80438DF0
.sdata start:0x8051B5C0 end:0x8051B5D0
.sbss start:0x8051E6F0 end:0x8051E6F8
.sdata2 start:0x8051FA48 end:0x8051FA58
m_Do/m_Do_ext.cpp:
@@ -103,7 +104,7 @@ m_Do/m_Do_lib.cpp:
m_Do/m_Do_Reset.cpp:
.text start:0x8001AB2C end:0x8001AD5C
.sbss start:0x8051E750 end:0x8051E768
.sbss start:0x8051E750 end:0x8051E758
m_Do/m_Do_dvd_thread.cpp:
.text start:0x8001AD5C end:0x8001BA78
@@ -111,10 +112,12 @@ m_Do/m_Do_dvd_thread.cpp:
.data start:0x803DFCD0 end:0x803E0018
.bss start:0x80438E60 end:0x8043B1E0
.sdata start:0x8051B690 end:0x8051B6D8
.sbss start:0x8051E758 end:0x8051E760
m_Do/m_Do_DVDError.cpp:
.text start:0x8001BA78 end:0x8001BBE4
.bss start:0x8043B1E0 end:0x8043D540
.sbss start:0x8051E760 end:0x8051E768
m_Do/m_Do_MemCard.cpp:
.text start:0x8001BBE4 end:0x8001CF3C
@@ -338,7 +341,7 @@ f_pc/f_pc_node_req.cpp:
f_pc/f_pc_priority.cpp:
.text start:0x80027F1C end:0x80028260
.bss start:0x80466878 end:0x80466888
.sdata start:0x8051B7E8 end:0x8051B820
.sdata start:0x8051B7E8 end:0x8051B7F0
f_pc/f_pc_profile.cpp:
.text start:0x80028260 end:0x80028270
@@ -378,7 +381,7 @@ d/d_stage.cpp:
.ctors start:0x803BA76C end:0x803BA770
.data start:0x803E37D0 end:0x803E7080
.bss start:0x80466888 end:0x80477D50
.sdata start:0x8051B820 end:0x8051B854
.sdata start:0x8051B7F0 end:0x8051B838
.sbss start:0x8051E810 end:0x8051E838
.sdata2 start:0x8051FBA8 end:0x8051FBB8
@@ -386,7 +389,7 @@ d/d_map.cpp:
.text start:0x8002CD20 end:0x8002F48C
.rodata start:0x803BC130 end:0x803BC210
.data start:0x803E7080 end:0x803E7480
.sdata start:0x8051B854 end:0x8051B9E4
.sdata start:0x8051B838 end:0x8051B9E4
.sbss start:0x8051E838 end:0x8051E840
.sdata2 start:0x8051FBB8 end:0x8051FC18
@@ -2450,7 +2453,7 @@ revolution/homebuttonLib/nw4hbm/lyt/lyt_textBox.cpp:
.text start:0x802C5C84 end:0x802C72B4
.ctors start:0x803BA894 end:0x803BA898
.data start:0x8040F5E0 end:0x8040F658
.sdata start:0x8051DFD8 end:0x8051DFE8
.sdata start:0x8051DFD8 end:0x8051DFE0
.sbss start:0x8051EF68 end:0x8051EF70
.sdata2 start:0x80523CC0 end:0x80523CD8
@@ -2510,7 +2513,7 @@ revolution/homebuttonLib/nw4hbm/ut/ut_ResFontBase.cpp:
revolution/homebuttonLib/nw4hbm/ut/ut_TagProcessorBase.cpp:
.text start:0x802CC2B8 end:0x802CCA78
.data start:0x80410970 end:0x804109C8
.data start:0x80410970 end:0x80410998
.sdata2 start:0x80523D30 end:0x80523D38
revolution/homebuttonLib/nw4hbm/ut/ut_TextWriterBase.cpp:
@@ -2522,13 +2525,14 @@ revolution/homebuttonLib/nw4hbm/ut/ut_TextWriterBase.cpp:
JSystem/JKernel/JKRHeap.cpp:
.text start:0x802CE4A4 end:0x802CF0DC
.data start:0x804109C8 end:0x80410A28
.sdata start:0x8051DFE8 end:0x8051E018
.data start:0x80410998 end:0x80410A28
.sdata start:0x8051DFE0 end:0x8051DFF0
.sbss start:0x8051EF90 end:0x8051EFC0
JSystem/JKernel/JKRExpHeap.cpp:
.text start:0x802CF0DC end:0x802D0CA4
.data start:0x80410A28 end:0x80410DD0
.sdata start:0x8051DFF0 end:0x8051E010
.sbss start:0x8051EFC0 end:0x8051EFD8
.sdata2 start:0x80523D50 end:0x80523D60
@@ -2548,17 +2552,18 @@ JSystem/JKernel/JKRDisposer.cpp:
JSystem/JKernel/JKRThread.cpp:
.text start:0x802D1784 end:0x802D248C
.ctors start:0x803BA8A0 end:0x803BA8A4
.data start:0x80410FF8 end:0x80411134
.data start:0x80410FF8 end:0x80411108
.bss start:0x804A6BE0 end:0x804A6C30
.sdata start:0x8051E010 end:0x8051E018
.sbss start:0x8051EFD8 end:0x8051EFF8
.sdata2 start:0x80523D78 end:0x80523D88
JSystem/JKernel/JKRAram.cpp:
.text start:0x802D248C end:0x802D32AC
.ctors start:0x803BA8A4 end:0x803BA8A8
.data start:0x80411134 end:0x80411148
.data start:0x80411108 end:0x80411148
.bss start:0x804A6C30 end:0x804A6C90
.sdata start:0x8051E018 end:0x8051E034
.sdata start:0x8051E018 end:0x8051E020
.sbss start:0x8051EFF8 end:0x8051F038
JSystem/JKernel/JKRAramHeap.cpp:
@@ -2574,12 +2579,12 @@ JSystem/JKernel/JKRAramBlock.cpp:
JSystem/JKernel/JKRAramPiece.cpp:
.text start:0x802D3A48 end:0x802D3FC4
.ctors start:0x803BA8AC end:0x803BA8B0
.data start:0x80411168 end:0x804111FC
.data start:0x80411168 end:0x804111D0
.bss start:0x804A6CA8 end:0x804A6CD8
JSystem/JKernel/JKRAramStream.cpp:
.text start:0x802D3FC4 end:0x802D453C
.data start:0x804111FC end:0x80411210
.data start:0x804111D0 end:0x80411210
.bss start:0x804A6CD8 end:0x804A6D08
.sbss start:0x8051F038 end:0x8051F048
@@ -2588,6 +2593,7 @@ JSystem/JKernel/JKRFileLoader.cpp:
.ctors start:0x803BA8B0 end:0x803BA8B4
.data start:0x80411210 end:0x80411250
.bss start:0x804A6D08 end:0x804A6D20
.sdata start:0x8051E020 end:0x8051E028
.sbss start:0x8051F048 end:0x8051F050
JSystem/JKernel/JKRFileFinder.cpp:
@@ -2597,10 +2603,11 @@ JSystem/JKernel/JKRFileFinder.cpp:
JSystem/JKernel/JKRFileCache.cpp:
.text start:0x802D4E40 end:0x802D5BD8
.data start:0x80411280 end:0x804112D0
.sdata start:0x8051E028 end:0x8051E030
JSystem/JKernel/JKRArchivePub.cpp:
.text start:0x802D5BD8 end:0x802D66C8
.data start:0x804112D0 end:0x80411344
.data start:0x804112D0 end:0x80411320
JSystem/JKernel/JKRArchivePri.cpp:
.text start:0x802D66C8 end:0x802D6E18
@@ -2608,19 +2615,19 @@ JSystem/JKernel/JKRArchivePri.cpp:
JSystem/JKernel/JKRMemArchive.cpp:
.text start:0x802D6E18 end:0x802D74C8
.data start:0x80411344 end:0x804113C0
.data start:0x80411320 end:0x80411398
JSystem/JKernel/JKRAramArchive.cpp:
.text start:0x802D74C8 end:0x802D80F0
.data start:0x804113C0 end:0x80411410
.data start:0x80411398 end:0x80411410
JSystem/JKernel/JKRDvdArchive.cpp:
.text start:0x802D80F0 end:0x802D8C3C
.data start:0x80411410 end:0x80411508
.data start:0x80411410 end:0x804114D0
JSystem/JKernel/JKRCompArchive.cpp:
.text start:0x802D8C3C end:0x802D9904
.data start:0x80411508 end:0x80411580
.data start:0x804114D0 end:0x80411558
JSystem/JKernel/JKRFile.cpp:
.text start:0x802D9904 end:0x802D9970
@@ -2628,7 +2635,7 @@ JSystem/JKernel/JKRFile.cpp:
JSystem/JKernel/JKRDvdFile.cpp:
.text start:0x802D9970 end:0x802D9F9C
.ctors start:0x803BA8B4 end:0x803BA8B8
.data start:0x80411580 end:0x804115C8
.data start:0x80411558 end:0x804115C8
.bss start:0x804A6D20 end:0x804A6D38
JSystem/JKernel/JKRDvdRipper.cpp:
@@ -2636,7 +2643,7 @@ JSystem/JKernel/JKRDvdRipper.cpp:
.ctors start:0x803BA8B8 end:0x803BA8BC
.data start:0x804115C8 end:0x80411620
.bss start:0x804A6D38 end:0x804A6D68
.sdata start:0x8051E034 end:0x8051E03C
.sdata start:0x8051E030 end:0x8051E03C
.sbss start:0x8051F058 end:0x8051F098
JSystem/JKernel/JKRDvdAramRipper.cpp:
@@ -2650,7 +2657,7 @@ JSystem/JKernel/JKRDecomp.cpp:
.text start:0x802DB928 end:0x802DC00C
.data start:0x80411620 end:0x80411630
.bss start:0x804A6D98 end:0x804A6DD8
.sbss start:0x8051F0E0 end:0x8051F0EC
.sbss start:0x8051F0E0 end:0x8051F0E8
JSystem/JSupport/JSUList.cpp:
.text start:0x802DC00C end:0x802DC44C
@@ -2678,7 +2685,7 @@ JSystem/JGadget/std-vector.cpp:
JSystem/JUtility/JUTCacheFont.cpp:
.text start:0x802DD2E4 end:0x802DE1A4
.data start:0x80411698 end:0x80411788
.data start:0x80411698 end:0x80411758
.sdata2 start:0x80523D88 end:0x80523D90
JSystem/JUtility/JUTResource.cpp:
@@ -2690,6 +2697,7 @@ JSystem/JUtility/JUTTexture.cpp:
JSystem/JUtility/JUTPalette.cpp:
.text start:0x802DE938 end:0x802DEA24
.data start:0x80411758 end:0x80411788
JSystem/JUtility/JUTNameTab.cpp:
.text start:0x802DEA24 end:0x802DEC14
@@ -2698,21 +2706,21 @@ JSystem/JUtility/JUTNameTab.cpp:
JSystem/JUtility/JUTGraphFifo.cpp:
.text start:0x802DEC14 end:0x802DEDA4
.data start:0x80411798 end:0x804117A8
.sbss start:0x8051F0EC end:0x8051F0F8
.sbss start:0x8051F0E8 end:0x8051F0F8
JSystem/JUtility/JUTFont.cpp:
.text start:0x802DEDA4 end:0x802DF01C
.data start:0x804117A8 end:0x80411824
.data start:0x804117A8 end:0x804117F0
JSystem/JUtility/JUTResFont.cpp:
.text start:0x802DF01C end:0x802E012C
.rodata start:0x803D8A38 end:0x803D8B20
.data start:0x80411824 end:0x80411870
.data start:0x804117F0 end:0x80411870
.sdata2 start:0x80523DA8 end:0x80523DC0
JSystem/JUtility/JUTDbPrint.cpp:
.text start:0x802E012C end:0x802E0688
.sbss start:0x8051F0F8 end:0x8051F108
.sbss start:0x8051F0F8 end:0x8051F100
.sdata2 start:0x80523DC0 end:0x80523DD0
JSystem/JUtility/JUTGamePad.cpp:
@@ -2720,8 +2728,8 @@ JSystem/JUtility/JUTGamePad.cpp:
.ctors start:0x803BA8C0 end:0x803BA8C4
.data start:0x80411870 end:0x804118A0
.bss start:0x804A6DD8 end:0x804A6F78
.sdata start:0x8051E040 end:0x8051E098
.sbss start:0x8051F108 end:0x8051F138
.sdata start:0x8051E040 end:0x8051E058
.sbss start:0x8051F100 end:0x8051F138
.sdata2 start:0x80523DD0 end:0x80523DF0
JSystem/JUtility/JUTException.cpp:
@@ -2729,17 +2737,20 @@ JSystem/JUtility/JUTException.cpp:
.ctors start:0x803BA8C4 end:0x803BA8C8
.data start:0x804118A0 end:0x80411DD8
.bss start:0x804A6F78 end:0x804A73F0
.sdata start:0x8051E058 end:0x8051E088
.sbss start:0x8051F138 end:0x8051F160
.sdata2 start:0x80523DF0 end:0x80523E00
JSystem/JUtility/JUTDirectPrint.cpp:
.text start:0x802E3D00 end:0x802E43E0
.data start:0x80411DD8 end:0x804120A0
.sdata start:0x8051E088 end:0x8051E090
.sbss start:0x8051F160 end:0x8051F168
.sdata2 start:0x80523E00 end:0x80523E58
JSystem/JUtility/JUTAssert.cpp:
.text start:0x802E43E0 end:0x802E46BC
.sdata start:0x8051E090 end:0x8051E098
.sbss start:0x8051F168 end:0x8051F170
.sdata2 start:0x80523E58 end:0x80523E70
@@ -2754,18 +2765,19 @@ JSystem/JUtility/JUTXfb.cpp:
JSystem/JUtility/JUTFader.cpp:
.text start:0x802E4ECC end:0x802E51E0
.data start:0x804120B0 end:0x804120D4
.data start:0x804120B0 end:0x804120C8
.sdata2 start:0x80523E70 end:0x80523E78
JSystem/JUtility/JUTProcBar.cpp:
.text start:0x802E51E0 end:0x802E6990
.sdata start:0x8051E098 end:0x8051E108
.sdata start:0x8051E098 end:0x8051E0A0
.sbss start:0x8051F190 end:0x8051F1A0
.sdata2 start:0x80523E78 end:0x80523EB8
JSystem/JUtility/JUTConsole.cpp:
.text start:0x802E6990 end:0x802E7CAC
.data start:0x804120D4 end:0x804120E0
.data start:0x804120C8 end:0x804120E0
.sdata start:0x8051E0A0 end:0x8051E0A8
.sbss start:0x8051F1A0 end:0x8051F1B0
.sdata2 start:0x80523EB8 end:0x80523EE8
@@ -2832,6 +2844,7 @@ JSystem/J2DGraph/J2DPicture.cpp:
JSystem/J2DGraph/J2DTextBox.cpp:
.text start:0x802FE1E4 end:0x802FF6D4
.data start:0x80412958 end:0x80412A18
.sdata start:0x8051E0A8 end:0x8051E0B0
.sdata2 start:0x80524020 end:0x80524040
JSystem/J2DGraph/J2DWindowEx.cpp:
@@ -2849,6 +2862,7 @@ JSystem/J2DGraph/J2DTextBoxEx.cpp:
.text start:0x80305634 end:0x80306E78
.rodata start:0x803DCDC8 end:0x803DCE00
.data start:0x80412C38 end:0x80412CF8
.sdata start:0x8051E0B0 end:0x8051E0B8
.sdata2 start:0x80524078 end:0x80524098
JSystem/J2DGraph/J2DAnmLoader.cpp:
@@ -2867,6 +2881,7 @@ JSystem/J2DGraph/J2DManage.cpp:
JSystem/J3DGraphBase/J3DGD.cpp:
.text start:0x8030B0A0 end:0x8030C968
.data start:0x80412E28 end:0x80412ED0
.sdata start:0x8051E0B8 end:0x8051E108
.sdata2 start:0x805240D0 end:0x80524110
JSystem/J3DGraphBase/J3DSys.cpp:
config/RZDJ01/symbols.txt
+39 -47
View File
@@ -24802,8 +24802,8 @@ l_RoomKeepDoorInfo = .bss:0x804671A4; // type:object size:0x904 scope:global ali
@97897 = .bss:0x80467AA8; // type:object size:0xC scope:local align:4
mStatus__20dStage_roomControl_c = .bss:0x80467AB4; // type:object size:0x10100 scope:global align:4 data:4byte
mMemoryBlock__20dStage_roomControl_c = .bss:0x80477BB4; // type:object size:0x4C scope:global align:4
lbl_80477C00 = .bss:0x80477C00; // type:object size:0xA data:byte
lbl_80477C0A = .bss:0x80477C0A; // type:object size:0x146
mDemoArcName__20dStage_roomControl_c = .bss:0x80477C00; // type:object size:0xA data:byte
mArcBank__20dStage_roomControl_c = .bss:0x80477C0A; // type:object size:0x146
...bss.0 = .bss:0x80477D50; // type:label scope:local align:4
dComIfG_mTimerInfo = .bss:0x80477D50; // type:object size:0x14 scope:global align:4
@109549 = .bss:0x80477D64; // type:object size:0xC scope:local align:4
@@ -25373,8 +25373,8 @@ exCallbackObject = .bss:0x804A6F98; // type:object size:0x14 scope:global align:
sMapFileList__12JUTException = .bss:0x804A6FB8; // type:object size:0xC scope:global align:4 data:4byte
c3bcnt = .bss:0x804A6FC8; // type:object size:0x20 scope:global align:4 data:4byte
context$45953 = .bss:0x804A6FE8; // type:object size:0x2C8 scope:local align:4
lbl_804A72B0 = .bss:0x804A72B0; // type:object size:0x40
lbl_804A72F0 = .bss:0x804A72F0; // type:object size:0x100
sMessageFileLine__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .bss:0x804A72B0; // type:object size:0x40
sMessageString__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .bss:0x804A72F0; // type:object size:0x100
static_mBounds__7J2DPane = .bss:0x804A73F0; // type:object size:0x10 scope:global align:4
lbl_804A7400 = .bss:0x804A7400; // type:object size:0x120 data:byte
j3dSys = .bss:0x804A7520; // type:object size:0x11C scope:global align:4
@@ -25567,7 +25567,7 @@ __RTTI__Q310dCsr_mng_c8bloObj_c9paneObj_c = .sdata:0x8051B440; // type:object si
__RTTI__Q210dCsr_mng_c5obj_c = .sdata:0x8051B448; // type:object size:0x8 scope:global align:4
__RTTI__Q210dCsr_mng_c6list_c = .sdata:0x8051B450; // type:object size:0x8 scope:global align:4
__RTTI__Q210dCsr_mng_c6node_c = .sdata:0x8051B458; // type:object size:0x8 scope:global align:4
lbl_8051B460 = .sdata:0x8051B460; // type:object size:0x1 data:byte
developmentMode__7mDoMain = .sdata:0x8051B460; // type:object size:0x1 data:byte
memMargin__7mDoMain = .sdata:0x8051B464; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8051B468 = .sdata:0x8051B468; // type:object size:0x1 data:byte
lbl_8051B469 = .sdata:0x8051B469; // type:object size:0x3
@@ -25604,7 +25604,7 @@ __RTTI__28JASGlobalInstance<8Z2SeqMgr> = .sdata:0x8051B528; // type:object size:
lbl_8051B530 = .sdata:0x8051B530; // type:object size:0x8 data:string
__RTTI__7Z2SeMgr = .sdata:0x8051B538; // type:object size:0x8 scope:global align:4
__RTTI__27JASGlobalInstance<7Z2SeMgr> = .sdata:0x8051B540; // type:object size:0x8 scope:global align:4
lbl_8051B548 = .sdata:0x8051B548; // type:object size:0x1 data:byte
mWide__13mDoGph_gInf_c = .sdata:0x8051B548; // type:object size:0x1 data:byte
m_aspect__13mDoGph_gInf_c = .sdata:0x8051B54C; // type:object size:0x4 scope:global align:4 data:float
m_scale__13mDoGph_gInf_c = .sdata:0x8051B550; // type:object size:0x4 scope:global align:4 data:float
m_invScale__13mDoGph_gInf_c = .sdata:0x8051B554; // type:object size:0x4 scope:global align:4 data:float
@@ -25707,7 +25707,7 @@ lbl_8051B800 = .sdata:0x8051B800; // type:object size:0x8 data:string
lbl_8051B808 = .sdata:0x8051B808; // type:object size:0x7 data:string
lbl_8051B80F = .sdata:0x8051B80F; // type:object size:0x7 data:string
lbl_8051B816 = .sdata:0x8051B816; // type:object size:0x6 data:string
lbl_8051B81C = .sdata:0x8051B81C; // type:object size:0x1 data:byte
mRoomReadId__20dStage_roomControl_c = .sdata:0x8051B81C; // type:object size:0x1 data:byte
__RTTI__16dStage_stageDt_c = .sdata:0x8051B820; // type:object size:0x8 scope:global align:4
__RTTI__15dStage_roomDt_c = .sdata:0x8051B828; // type:object size:0x8 scope:global align:4
__RTTI__11dStage_dt_c = .sdata:0x8051B830; // type:object size:0x8 scope:global align:4
@@ -25762,7 +25762,7 @@ lbl_8051B9AB = .sdata:0x8051B9AB; // type:object size:0x8 data:string
lbl_8051B9B3 = .sdata:0x8051B9B3; // type:object size:0x7 data:string
lbl_8051B9BA = .sdata:0x8051B9BA; // type:object size:0x5 data:string
lbl_8051B9BF = .sdata:0x8051B9BF; // type:object size:0x8 data:string
lbl_8051B9C7 = .sdata:0x8051B9C7; // type:object size:0x1 data:byte
g_blackColor = .sdata:0x8051B9C7; // type:object size:0x1 data:byte
lbl_8051B9C8 = .sdata:0x8051B9C8; // type:object size:0x1 data:byte
lbl_8051B9C9 = .sdata:0x8051B9C9; // type:object size:0x1 data:byte
lbl_8051B9CA = .sdata:0x8051B9CA; // type:object size:0x1 data:byte
@@ -27310,10 +27310,10 @@ scCursorSRotPaneName__Q210homebutton10HomeButton = .sdata:0x8051DF30; // type:ob
@3379 = .sdata:0x8051DFD0; // type:object size:0x2 scope:local align:4 data:string
@3380 = .sdata:0x8051DFD4; // type:object size:0x3 scope:local align:4 data:string
@9572 = .sdata:0x8051DFD8; // type:object size:0x4 scope:local align:4 data:wstring
lbl_8051DFE0 = .sdata:0x8051DFE0; // type:object size:0x1 data:byte
sDefaultFillFlag__7JKRHeap = .sdata:0x8051DFE0; // type:object size:0x1 data:byte
lbl_8051DFE1 = .sdata:0x8051DFE1; // type:object size:0x7 data:string
ARALT_AramStartAdr = .sdata:0x8051DFE8; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8051DFEC = .sdata:0x8051DFEC; // type:object size:0x3 data:string
@STRING@panic__12JUTExceptionFPCciPCc = .sdata:0x8051DFEC; // type:object size:0x3 data:string
lbl_8051DFF0 = .sdata:0x8051DFF0; // type:object size:0x7 data:string
lbl_8051DFF7 = .sdata:0x8051DFF7; // type:object size:0x6 data:string
lbl_8051DFFD = .sdata:0x8051DFFD; // type:object size:0x6 data:string
@@ -27324,7 +27324,7 @@ lbl_8051E020 = .sdata:0x8051E020; // type:object size:0x2 data:string
lbl_8051E022 = .sdata:0x8051E022; // type:object size:0x2 data:string
lbl_8051E028 = .sdata:0x8051E028; // type:object size:0x2 data:string
lbl_8051E02A = .sdata:0x8051E02A; // type:object size:0x4 data:string
lbl_8051E030 = .sdata:0x8051E030; // type:object size:0x1 data:byte
errorRetry__12JKRDvdRipper = .sdata:0x8051E030; // type:object size:0x1 data:byte
sSZSBufferSize__12JKRDvdRipper = .sdata:0x8051E034; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8051E038 = .sdata:0x8051E038; // type:object size:0x1 data:byte
sSZSBufferSize__16JKRDvdAramRipper = .sdata:0x8051E03C; // type:object size:0x4 scope:global align:4 data:4byte
@@ -27345,7 +27345,7 @@ lbl_8051E079 = .sdata:0x8051E079; // type:object size:0x8 data:string
lbl_8051E081 = .sdata:0x8051E081; // type:object size:0x1
lbl_8051E082 = .sdata:0x8051E082; // type:object size:0x5 data:string
lbl_8051E088 = .sdata:0x8051E088; // type:object size:0x3 data:string
lbl_8051E090 = .sdata:0x8051E090; // type:object size:0x1 data:byte
mVisible__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sdata:0x8051E090; // type:object size:0x1 data:byte
oneFrameRate = .sdata:0x8051E098; // type:object size:0x4 scope:global align:4 data:float
oneFrameRateUser = .sdata:0x8051E09C; // type:object size:0x4 scope:global align:4 data:float
lbl_8051E0A0 = .sdata:0x8051E0A0; // type:object size:0x4 data:string
@@ -27577,21 +27577,21 @@ lbl_8051E5D1 = .sbss:0x8051E5D1; // type:object size:0x1 data:byte
lbl_8051E5D2 = .sbss:0x8051E5D2; // type:object size:0x1 data:byte
console_scroll$90874 = .sbss:0x8051E5D4; // type:object size:0x4 scope:local align:4 data:float
frame$91010 = .sbss:0x8051E5D8; // type:object size:0x4 scope:local align:4 data:4byte
lbl_8051E5E0 = .sbss:0x8051E5E0; // type:object size:0x1 data:byte
lbl_8051E5E1 = .sbss:0x8051E5E1; // type:object size:0x1 data:byte
lbl_8051E5E2 = .sbss:0x8051E5E2; // type:object size:0x1 data:byte
lbl_8051E5E3 = .sbss:0x8051E5E3; // type:object size:0x1 data:byte
lbl_8051E5E4 = .sbss:0x8051E5E4; // type:object size:0x1 data:byte
__OSReport_disable = .sbss:0x8051E5E0; // type:object size:0x1 data:byte
__OSReport_Error_disable = .sbss:0x8051E5E1; // type:object size:0x1 data:byte
__OSReport_Warning_disable = .sbss:0x8051E5E2; // type:object size:0x1 data:byte
__OSReport_System_disable = .sbss:0x8051E5E3; // type:object size:0x1 data:byte
__OSReport_enable = .sbss:0x8051E5E4; // type:object size:0x1 data:byte
__OSReport_MonopolyThread = .sbss:0x8051E5E8; // type:object size:0x4 scope:global align:4 data:4byte
print_counts = .sbss:0x8051E5EC; // type:object size:0x4 scope:global align:4 data:4byte
print_errors = .sbss:0x8051E5F0; // type:object size:0x4 scope:global align:4 data:4byte
print_warings = .sbss:0x8051E5F4; // type:object size:0x4 scope:global align:4 data:4byte
print_systems = .sbss:0x8051E5F8; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8051E5FC = .sbss:0x8051E5FC; // type:object size:0x1 data:byte
print_initialized = .sbss:0x8051E5FC; // type:object size:0x1 data:byte
lbl_8051E5FD = .sbss:0x8051E5FD; // type:object size:0x1 data:byte
lbl_8051E600 = .sbss:0x8051E600; // type:object size:0x1 data:byte
lbl_8051E601 = .sbss:0x8051E601; // type:object size:0x1 data:byte
lbl_8051E602 = .sbss:0x8051E602; // type:object size:0x1 data:byte
mInitFlag__17mDoAud_zelAudio_c = .sbss:0x8051E600; // type:object size:0x1 data:byte
mResetFlag__17mDoAud_zelAudio_c = .sbss:0x8051E601; // type:object size:0x1 data:byte
mBgmSet__17mDoAud_zelAudio_c = .sbss:0x8051E602; // type:object size:0x1 data:byte
g_mDoAud_audioHeap = .sbss:0x8051E604; // type:object size:0x4 scope:global align:4 data:4byte
l_affCommand = .sbss:0x8051E608; // type:object size:0x4 scope:global align:4 data:4byte
l_arcCommand = .sbss:0x8051E60C; // type:object size:0x4 scope:global align:4 data:4byte
@@ -27622,21 +27622,15 @@ mZbufferTimg__13mDoGph_gInf_c = .sbss:0x8051E674; // type:object size:0x4 scope:
mZbufferTex__13mDoGph_gInf_c = .sbss:0x8051E678; // type:object size:0x4 scope:global align:4 data:4byte
mFadeRate__13mDoGph_gInf_c = .sbss:0x8051E67C; // type:object size:0x4 scope:global align:4 data:float
mFadeSpeed__13mDoGph_gInf_c = .sbss:0x8051E680; // type:object size:0x4 scope:global align:4 data:float
lbl_8051E684 = .sbss:0x8051E684; // type:object size:0x1 data:byte
lbl_8051E685 = .sbss:0x8051E685; // type:object size:0x1 data:byte
lbl_8051E686 = .sbss:0x8051E686; // type:object size:0x1 data:byte
lbl_8051E687 = .sbss:0x8051E687; // type:object size:0x1 data:byte
lbl_8051E688 = .sbss:0x8051E688; // type:object size:0x1 data:byte
lbl_8051E689 = .sbss:0x8051E689; // type:object size:0x1 data:byte
lbl_8051E68A = .sbss:0x8051E68A; // type:object size:0x1 data:byte
lbl_8051E68B = .sbss:0x8051E68B; // type:object size:0x1 data:byte
lbl_8051E68C = .sbss:0x8051E68C; // type:object size:0x1 data:byte
lbl_8051E68D = .sbss:0x8051E68D; // type:object size:0x1 data:byte
lbl_8051E68E = .sbss:0x8051E68E; // type:object size:0x1 data:byte
lbl_8051E68F = .sbss:0x8051E68F; // type:object size:0x1 data:byte
mBackColor__13mDoGph_gInf_c = .sbss:0x8051E684; // type:object size:0x4 data:byte
mFadeColor__13mDoGph_gInf_c = .sbss:0x8051E688; // type:object size:0x4 data:byte
mBlureFlag__13mDoGph_gInf_c = .sbss:0x8051E68C; // type:object size:0x1 data:byte
mBlureRate__13mDoGph_gInf_c = .sbss:0x8051E68D; // type:object size:0x1 data:byte
mFade__13mDoGph_gInf_c = .sbss:0x8051E68E; // type:object size:0x1 data:byte
mAutoForcus__13mDoGph_gInf_c = .sbss:0x8051E68F; // type:object size:0x1 data:byte
lbl_8051E690 = .sbss:0x8051E690; // type:object size:0x1 data:byte
m_blurID__Q213mDoGph_gInf_c5csr_c = .sbss:0x8051E694; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8051E698 = .sbss:0x8051E698; // type:object size:0x1 data:byte
mWideZoom__13mDoGph_gInf_c = .sbss:0x8051E698; // type:object size:0x1 data:byte
m_minX__13mDoGph_gInf_c = .sbss:0x8051E69C; // type:object size:0x4 scope:global align:4 data:4byte
m_minY__13mDoGph_gInf_c = .sbss:0x8051E6A0; // type:object size:0x4 scope:global align:4 data:4byte
m_minXF__13mDoGph_gInf_c = .sbss:0x8051E6A4; // type:object size:0x4 scope:global align:4 data:float
@@ -27658,7 +27652,7 @@ lbl_8051E6E5 = .sbss:0x8051E6E5; // type:object size:0x1 data:byte
lbl_8051E6E6 = .sbss:0x8051E6E6; // type:object size:0x1 data:byte
lbl_8051E6E7 = .sbss:0x8051E6E7; // type:object size:0x1 data:byte
l_oldButton$90464 = .sbss:0x8051E6E8; // type:object size:0x4 scope:local align:4 data:4byte
lbl_8051E6F0 = .sbss:0x8051E6F0; // type:object size:0x8
mDoMtx_stack = .sbss:0x8051E6F0; // type:object size:0x1
AssertHeap = .sbss:0x8051E6F8; // type:object size:0x4 scope:global align:4 data:4byte
DbPrintHeap = .sbss:0x8051E6FC; // type:object size:0x4 scope:global align:4 data:4byte
gameHeap = .sbss:0x8051E700; // type:object size:0x4 scope:global align:4 data:4byte
@@ -27681,9 +27675,9 @@ aram_cache_size = .sbss:0x8051E740; // type:object size:0x4 scope:global align:4
mSystemFar__14mDoLib_clipper = .sbss:0x8051E748; // type:object size:0x4 scope:global align:4 data:float
mFovyRate__14mDoLib_clipper = .sbss:0x8051E74C; // type:object size:0x4 scope:global align:4 data:float
mResetData__6mDoRst = .sbss:0x8051E750; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8051E758 = .sbss:0x8051E758; // type:object size:0x1 data:byte
lbl_8051E759 = .sbss:0x8051E759; // type:object size:0x7 data:byte
lbl_8051E760 = .sbss:0x8051E760; // type:object size:0x1 data:byte
SyncWidthSound__9mDoDvdThd = .sbss:0x8051E758; // type:object size:0x1 data:byte
sDefaultDirection = .sbss:0x8051E759; // type:object size:0x1 data:byte
mDoDvdErr_initialized = .sbss:0x8051E760; // type:object size:0x1 data:byte
sConsole = .sbss:0x8051E768; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8051E770 = .sbss:0x8051E770; // type:object size:0x1
lbl_8051E771 = .sbss:0x8051E771; // type:object size:0x1
@@ -27735,10 +27729,7 @@ m_res__22dMap_HIO_prm_res_dst_s = .sbss:0x8051E838; // type:object size:0x4 scop
m_baseCsr__13dComIfG_inf_c = .sbss:0x8051E840; // type:object size:0x4 scope:global align:4 data:4byte
m_navi__Q213dComIfG_inf_c9baseCsr_c = .sbss:0x8051E844; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8051E848 = .sbss:0x8051E848; // type:object size:0x1 data:byte
lbl_8051E849 = .sbss:0x8051E849; // type:object size:0x1 data:byte
lbl_8051E84A = .sbss:0x8051E84A; // type:object size:0x1 data:byte
lbl_8051E84B = .sbss:0x8051E84B; // type:object size:0x1 data:byte
lbl_8051E84C = .sbss:0x8051E84C; // type:object size:0x1 data:byte
g_clearColor = .sbss:0x8051E849; // type:object size:0x4 data:byte
g_dComIfAc_gameInfo = .sbss:0x8051E850; // type:object size:0x8 scope:global align:4
g_dComIfGoat_gameInfo = .sbss:0x8051E858; // type:object size:0x4 scope:global align:4 data:4byte
m_count__9daArrow_c = .sbss:0x8051E860; // type:object size:0x2 scope:global align:4
@@ -27820,6 +27811,7 @@ mParticleTracePCB__13dPa_control_c = .sbss:0x8051E988; // type:object size:0x4 s
mWipe__12dDlst_list_c = .sbss:0x8051E990; // type:object size:0x1 data:byte
mWipeRate__12dDlst_list_c = .sbss:0x8051E994; // type:object size:0x4 scope:global align:4 data:float
mWipeSpeed__12dDlst_list_c = .sbss:0x8051E998; // type:object size:0x4 scope:global align:4 data:float
lbl_8051E99C = .sbss:0x8051E99C; // type:object size:0x4
init$0000 = .sbss:0x8051E9A0; // type:object size:0x1 scope:local data:byte
S_parcent_bak$99593 = .sbss:0x8051E9A8; // type:object size:0x4 scope:local align:4 data:float
S_rot_work1$100794 = .sbss:0x8051E9AC; // type:object size:0x2 scope:local align:4 data:2byte
@@ -28238,18 +28230,18 @@ lbl_8051F0E8 = .sbss:0x8051F0E8; // type:object size:0x1 data:byte
sCurrentFifo__12JUTGraphFifo = .sbss:0x8051F0EC; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8051F0F0 = .sbss:0x8051F0F0; // type:object size:0x8
sDebugPrint__10JUTDbPrint = .sbss:0x8051F0F8; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8051F100 = .sbss:0x8051F100; // type:object size:0x1 data:byte
lbl_8051F101 = .sbss:0x8051F101; // type:object size:0x1 data:byte
mListInitialized__10JUTGamePad = .sbss:0x8051F100; // type:object size:0x1 data:byte
mPadAssign__10JUTGamePad = .sbss:0x8051F101; // type:object size:0x4 data:byte
sSuppressPadReset__10JUTGamePad = .sbss:0x8051F108; // type:object size:0x4 scope:global align:4 data:4byte
sAnalogMode__10JUTGamePad = .sbss:0x8051F10C; // type:object size:0x4 scope:global align:4 data:4byte
sRumbleSupported__10JUTGamePad = .sbss:0x8051F110; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8051F114 = .sbss:0x8051F114; // type:object size:0x1 data:byte
mStatus__Q210JUTGamePad7CRumble = .sbss:0x8051F114; // type:object size:0x4 data:byte
mEnabled__Q210JUTGamePad7CRumble = .sbss:0x8051F118; // type:object size:0x4 scope:global align:4 data:4byte
sCallback__Q210JUTGamePad13C3ButtonReset = .sbss:0x8051F11C; // type:object size:0x4 scope:global align:4 data:4byte
sCallbackArg__Q210JUTGamePad13C3ButtonReset = .sbss:0x8051F120; // type:object size:0x4 scope:global align:4 data:4byte
sThreshold__Q210JUTGamePad13C3ButtonReset = .sbss:0x8051F128; // type:object size:0x8 scope:global align:4 data:4byte
lbl_8051F130 = .sbss:0x8051F130; // type:object size:0x1 data:byte
lbl_8051F131 = .sbss:0x8051F131; // type:object size:0x1 data:byte
sResetSwitchPushing__Q210JUTGamePad13C3ButtonReset = .sbss:0x8051F130; // type:object size:0x1 data:byte
sResetOccurred__Q210JUTGamePad13C3ButtonReset = .sbss:0x8051F131; // type:object size:0x1 data:byte
sResetOccurredPort__Q210JUTGamePad13C3ButtonReset = .sbss:0x8051F134; // type:object size:0x4 scope:global align:4 data:4byte
sErrorManager__12JUTException = .sbss:0x8051F138; // type:object size:0x4 scope:global align:4 data:4byte
sPreUserCallback__12JUTException = .sbss:0x8051F13C; // type:object size:0x4 scope:global align:4 data:4byte
config/RZDP01/splits.txt
+52 -37
View File
@@ -22,7 +22,7 @@ d/d_home_button.cpp:
d/d_cursor_mng.cpp:
.text start:0x800073D4 end:0x8000820C
.data start:0x803E1698 end:0x803E17C0
.sdata start:0x8051DEA8 end:0x8051DEE4
.sdata start:0x8051DEA8 end:0x8051DEE0
.sbss start:0x80520EE8 end:0x80520F00
.sdata2 start:0x805221B8 end:0x805221D0
@@ -31,15 +31,15 @@ m_Do/m_Do_main.cpp:
.ctors start:0x803B9104 end:0x803B9108
.data start:0x803E17C0 end:0x803E1AD8
.bss start:0x80431940 end:0x80431DA0
.sdata start:0x8051DEE4 end:0x8051DF60
.sbss start:0x80520F00 end:0x80520F28
.sdata start:0x8051DEE0 end:0x8051DF60
.sbss start:0x80520F00 end:0x80520F20
.sdata2 start:0x805221D0 end:0x805221E8
m_Do/m_Do_printf.cpp:
.text start:0x80009024 end:0x80009704
.data start:0x803E1AD8 end:0x803E1B90
.bss start:0x80431DA0 end:0x804325A0
.sbss start:0x80520F28 end:0x80520F44
.sbss start:0x80520F20 end:0x80520F40
m_Do/m_Do_audio.cpp:
.text start:0x80009704 end:0x8000A0A8
@@ -47,7 +47,7 @@ m_Do/m_Do_audio.cpp:
.data start:0x803E1B90 end:0x803E1E08
.bss start:0x804325A0 end:0x80433958
.sdata start:0x8051DF60 end:0x8051DFCC
.sbss start:0x80520F44 end:0x80520F94
.sbss start:0x80520F40 end:0x80520F94
m_Do/m_Do_controller_pad.cpp:
.text start:0x8000A0A8 end:0x8000A4B8
@@ -74,7 +74,7 @@ m_Do/m_Do_machine.cpp:
.text start:0x80011B28 end:0x80012844
.data start:0x803E1E20 end:0x803E21C0
.sdata start:0x8051E010 end:0x8051E040
.sbss start:0x80521004 end:0x80521038
.sbss start:0x80521004 end:0x80521030
.sdata2 start:0x80522380 end:0x80522388
m_Do/m_Do_mtx.cpp:
@@ -83,6 +83,7 @@ m_Do/m_Do_mtx.cpp:
.data start:0x803E21C0 end:0x803E2260
.bss start:0x8043B408 end:0x8043B870
.sdata start:0x8051E040 end:0x8051E050
.sbss start:0x80521030 end:0x80521038
.sdata2 start:0x80522388 end:0x80522398
m_Do/m_Do_ext.cpp:
@@ -103,7 +104,7 @@ m_Do/m_Do_lib.cpp:
m_Do/m_Do_Reset.cpp:
.text start:0x8001AAA0 end:0x8001ACD0
.sbss start:0x80521090 end:0x805210A8
.sbss start:0x80521090 end:0x80521098
m_Do/m_Do_dvd_thread.cpp:
.text start:0x8001ACD0 end:0x8001B9EC
@@ -111,10 +112,12 @@ m_Do/m_Do_dvd_thread.cpp:
.data start:0x803E2A70 end:0x803E2DB8
.bss start:0x8043B8E0 end:0x8043DC60
.sdata start:0x8051E110 end:0x8051E158
.sbss start:0x80521098 end:0x805210A0
m_Do/m_Do_DVDError.cpp:
.text start:0x8001B9EC end:0x8001BB58
.bss start:0x8043DC60 end:0x8043FFC0
.sbss start:0x805210A0 end:0x805210A8
m_Do/m_Do_MemCard.cpp:
.text start:0x8001BB58 end:0x8001CEB0
@@ -338,7 +341,7 @@ f_pc/f_pc_node_req.cpp:
f_pc/f_pc_priority.cpp:
.text start:0x80027FC0 end:0x80028304
.bss start:0x804692F0 end:0x80469300
.sdata start:0x8051E270 end:0x8051E2A8
.sdata start:0x8051E270 end:0x8051E278
f_pc/f_pc_profile.cpp:
.text start:0x80028304 end:0x80028314
@@ -378,7 +381,7 @@ d/d_stage.cpp:
.ctors start:0x803B912C end:0x803B9130
.data start:0x803E65F8 end:0x803E9EA8
.bss start:0x80469300 end:0x8047A7C8
.sdata start:0x8051E2A8 end:0x8051E2DC
.sdata start:0x8051E278 end:0x8051E2C0
.sbss start:0x80521150 end:0x80521178
.sdata2 start:0x805224E8 end:0x805224F8
@@ -386,7 +389,7 @@ d/d_map.cpp:
.text start:0x8002CDC4 end:0x8002F530
.rodata start:0x803BAAF0 end:0x803BABD0
.data start:0x803E9EA8 end:0x803EA2A8
.sdata start:0x8051E2DC end:0x8051E46C
.sdata start:0x8051E2C0 end:0x8051E46C
.sbss start:0x80521178 end:0x80521180
.sdata2 start:0x805224F8 end:0x80522558
@@ -2447,7 +2450,7 @@ revolution/homebuttonLib/nw4hbm/lyt/lyt_textBox.cpp:
.text start:0x802C4594 end:0x802C5BC4
.ctors start:0x803B9254 end:0x803B9258
.data start:0x80412070 end:0x804120E8
.sdata start:0x80520910 end:0x80520920
.sdata start:0x80520910 end:0x80520918
.sbss start:0x805218B8 end:0x805218C0
.sdata2 start:0x80526638 end:0x80526650
@@ -2507,7 +2510,7 @@ revolution/homebuttonLib/nw4hbm/ut/ut_ResFontBase.cpp:
revolution/homebuttonLib/nw4hbm/ut/ut_TagProcessorBase.cpp:
.text start:0x802CABC8 end:0x802CB388
.data start:0x80413400 end:0x80413458
.data start:0x80413400 end:0x80413428
.sdata2 start:0x805266A8 end:0x805266B0
revolution/homebuttonLib/nw4hbm/ut/ut_TextWriterBase.cpp:
@@ -2519,13 +2522,14 @@ revolution/homebuttonLib/nw4hbm/ut/ut_TextWriterBase.cpp:
JSystem/JKernel/JKRHeap.cpp:
.text start:0x802CCDB4 end:0x802CD9EC
.data start:0x80413458 end:0x804134B8
.sdata start:0x80520920 end:0x80520950
.data start:0x80413428 end:0x804134B8
.sdata start:0x80520918 end:0x80520928
.sbss start:0x805218E0 end:0x80521910
JSystem/JKernel/JKRExpHeap.cpp:
.text start:0x802CD9EC end:0x802CF5B4
.data start:0x804134B8 end:0x80413860
.sdata start:0x80520928 end:0x80520948
.sbss start:0x80521910 end:0x80521928
.sdata2 start:0x805266C8 end:0x805266D8
@@ -2545,17 +2549,18 @@ JSystem/JKernel/JKRDisposer.cpp:
JSystem/JKernel/JKRThread.cpp:
.text start:0x802D0094 end:0x802D0D9C
.ctors start:0x803B9260 end:0x803B9264
.data start:0x80413A88 end:0x80413BC4
.data start:0x80413A88 end:0x80413B98
.bss start:0x804A9680 end:0x804A96D0
.sdata start:0x80520948 end:0x80520950
.sbss start:0x80521928 end:0x80521948
.sdata2 start:0x805266F0 end:0x80526700
JSystem/JKernel/JKRAram.cpp:
.text start:0x802D0D9C end:0x802D1BBC
.ctors start:0x803B9264 end:0x803B9268
.data start:0x80413BC4 end:0x80413BD8
.data start:0x80413B98 end:0x80413BD8
.bss start:0x804A96D0 end:0x804A9730
.sdata start:0x80520950 end:0x8052096C
.sdata start:0x80520950 end:0x80520958
.sbss start:0x80521948 end:0x80521988
JSystem/JKernel/JKRAramHeap.cpp:
@@ -2571,12 +2576,12 @@ JSystem/JKernel/JKRAramBlock.cpp:
JSystem/JKernel/JKRAramPiece.cpp:
.text start:0x802D2358 end:0x802D28D4
.ctors start:0x803B926C end:0x803B9270
.data start:0x80413BF8 end:0x80413C8C
.data start:0x80413BF8 end:0x80413C60
.bss start:0x804A9748 end:0x804A9778
JSystem/JKernel/JKRAramStream.cpp:
.text start:0x802D28D4 end:0x802D2E4C
.data start:0x80413C8C end:0x80413CA0
.data start:0x80413C60 end:0x80413CA0
.bss start:0x804A9778 end:0x804A97A8
.sbss start:0x80521988 end:0x80521998
@@ -2585,6 +2590,7 @@ JSystem/JKernel/JKRFileLoader.cpp:
.ctors start:0x803B9270 end:0x803B9274
.data start:0x80413CA0 end:0x80413CE0
.bss start:0x804A97A8 end:0x804A97C0
.sdata start:0x80520958 end:0x80520960
.sbss start:0x80521998 end:0x805219A0
JSystem/JKernel/JKRFileFinder.cpp:
@@ -2594,10 +2600,11 @@ JSystem/JKernel/JKRFileFinder.cpp:
JSystem/JKernel/JKRFileCache.cpp:
.text start:0x802D3750 end:0x802D44E8
.data start:0x80413D10 end:0x80413D60
.sdata start:0x80520960 end:0x80520968
JSystem/JKernel/JKRArchivePub.cpp:
.text start:0x802D44E8 end:0x802D4FD8
.data start:0x80413D60 end:0x80413DD4
.data start:0x80413D60 end:0x80413DB0
JSystem/JKernel/JKRArchivePri.cpp:
.text start:0x802D4FD8 end:0x802D5728
@@ -2605,19 +2612,19 @@ JSystem/JKernel/JKRArchivePri.cpp:
JSystem/JKernel/JKRMemArchive.cpp:
.text start:0x802D5728 end:0x802D5DD8
.data start:0x80413DD4 end:0x80413E50
.data start:0x80413DB0 end:0x80413E28
JSystem/JKernel/JKRAramArchive.cpp:
.text start:0x802D5DD8 end:0x802D6A00
.data start:0x80413E50 end:0x80413EA0
.data start:0x80413E28 end:0x80413EA0
JSystem/JKernel/JKRDvdArchive.cpp:
.text start:0x802D6A00 end:0x802D754C
.data start:0x80413EA0 end:0x80413F98
.data start:0x80413EA0 end:0x80413F60
JSystem/JKernel/JKRCompArchive.cpp:
.text start:0x802D754C end:0x802D8214
.data start:0x80413F98 end:0x80414010
.data start:0x80413F60 end:0x80413FE8
JSystem/JKernel/JKRFile.cpp:
.text start:0x802D8214 end:0x802D8280
@@ -2625,7 +2632,7 @@ JSystem/JKernel/JKRFile.cpp:
JSystem/JKernel/JKRDvdFile.cpp:
.text start:0x802D8280 end:0x802D88AC
.ctors start:0x803B9274 end:0x803B9278
.data start:0x80414010 end:0x80414058
.data start:0x80413FE8 end:0x80414058
.bss start:0x804A97C0 end:0x804A97D8
JSystem/JKernel/JKRDvdRipper.cpp:
@@ -2633,7 +2640,7 @@ JSystem/JKernel/JKRDvdRipper.cpp:
.ctors start:0x803B9278 end:0x803B927C
.data start:0x80414058 end:0x804140B0
.bss start:0x804A97D8 end:0x804A9808
.sdata start:0x8052096C end:0x80520974
.sdata start:0x80520968 end:0x80520974
.sbss start:0x805219A8 end:0x805219E8
JSystem/JKernel/JKRDvdAramRipper.cpp:
@@ -2647,7 +2654,7 @@ JSystem/JKernel/JKRDecomp.cpp:
.text start:0x802DA238 end:0x802DA91C
.data start:0x804140B0 end:0x804140C0
.bss start:0x804A9838 end:0x804A9878
.sbss start:0x80521A30 end:0x80521A3C
.sbss start:0x80521A30 end:0x80521A38
JSystem/JSupport/JSUList.cpp:
.text start:0x802DA91C end:0x802DAD5C
@@ -2675,7 +2682,7 @@ JSystem/JGadget/std-vector.cpp:
JSystem/JUtility/JUTCacheFont.cpp:
.text start:0x802DBBF4 end:0x802DCAB4
.data start:0x80414128 end:0x80414218
.data start:0x80414128 end:0x804141E8
.sdata2 start:0x80526700 end:0x80526708
JSystem/JUtility/JUTResource.cpp:
@@ -2687,6 +2694,7 @@ JSystem/JUtility/JUTTexture.cpp:
JSystem/JUtility/JUTPalette.cpp:
.text start:0x802DD248 end:0x802DD334
.data start:0x804141E8 end:0x80414218
JSystem/JUtility/JUTNameTab.cpp:
.text start:0x802DD334 end:0x802DD524
@@ -2695,16 +2703,16 @@ JSystem/JUtility/JUTNameTab.cpp:
JSystem/JUtility/JUTGraphFifo.cpp:
.text start:0x802DD524 end:0x802DD6B4
.data start:0x80414228 end:0x80414238
.sbss start:0x80521A3C end:0x80521A48
.sbss start:0x80521A38 end:0x80521A48
JSystem/JUtility/JUTFont.cpp:
.text start:0x802DD6B4 end:0x802DD92C
.data start:0x80414238 end:0x804142B4
.data start:0x80414238 end:0x80414280
JSystem/JUtility/JUTResFont.cpp:
.text start:0x802DD92C end:0x802DEA3C
.rodata start:0x803DB798 end:0x803DB880
.data start:0x804142B4 end:0x80414300
.data start:0x80414280 end:0x80414300
.sdata2 start:0x80526720 end:0x80526738
JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp:
@@ -2712,7 +2720,7 @@ JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp:
JSystem/JUtility/JUTDbPrint.cpp:
.text start:0x802DEA3C end:0x802DEF98
.sbss start:0x80521A48 end:0x80521A58
.sbss start:0x80521A48 end:0x80521A50
.sdata2 start:0x80526738 end:0x80526748
JSystem/JUtility/JUTGamePad.cpp:
@@ -2720,8 +2728,8 @@ JSystem/JUtility/JUTGamePad.cpp:
.ctors start:0x803B9280 end:0x803B9284
.data start:0x80414300 end:0x80414330
.bss start:0x804A9878 end:0x804A9A18
.sdata start:0x80520978 end:0x805209D0
.sbss start:0x80521A58 end:0x80521A88
.sdata start:0x80520978 end:0x80520990
.sbss start:0x80521A50 end:0x80521A88
.sdata2 start:0x80526748 end:0x80526768
JSystem/JUtility/JUTException.cpp:
@@ -2729,17 +2737,20 @@ JSystem/JUtility/JUTException.cpp:
.ctors start:0x803B9284 end:0x803B9288
.data start:0x80414330 end:0x80414868
.bss start:0x804A9A18 end:0x804A9E90
.sdata start:0x80520990 end:0x805209C0
.sbss start:0x80521A88 end:0x80521AB0
.sdata2 start:0x80526768 end:0x80526778
JSystem/JUtility/JUTDirectPrint.cpp:
.text start:0x802E2610 end:0x802E2CF0
.data start:0x80414868 end:0x80414B30
.sdata start:0x805209C0 end:0x805209C8
.sbss start:0x80521AB0 end:0x80521AB8
.sdata2 start:0x80526778 end:0x805267D0
JSystem/JUtility/JUTAssert.cpp:
.text start:0x802E2CF0 end:0x802E2FCC
.sdata start:0x805209C8 end:0x805209D0
.sbss start:0x80521AB8 end:0x80521AC0
.sdata2 start:0x805267D0 end:0x805267E8
@@ -2754,18 +2765,19 @@ JSystem/JUtility/JUTXfb.cpp:
JSystem/JUtility/JUTFader.cpp:
.text start:0x802E37DC end:0x802E3AF0
.data start:0x80414B40 end:0x80414B64
.data start:0x80414B40 end:0x80414B58
.sdata2 start:0x805267E8 end:0x805267F0
JSystem/JUtility/JUTProcBar.cpp:
.text start:0x802E3AF0 end:0x802E52A0
.sdata start:0x805209D0 end:0x80520A40
.sdata start:0x805209D0 end:0x805209D8
.sbss start:0x80521AE0 end:0x80521AF0
.sdata2 start:0x805267F0 end:0x80526830
JSystem/JUtility/JUTConsole.cpp:
.text start:0x802E52A0 end:0x802E65BC
.data start:0x80414B64 end:0x80414B70
.data start:0x80414B58 end:0x80414B70
.sdata start:0x805209D8 end:0x805209E0
.sbss start:0x80521AF0 end:0x80521B00
.sdata2 start:0x80526830 end:0x80526860
@@ -2832,6 +2844,7 @@ JSystem/J2DGraph/J2DPicture.cpp:
JSystem/J2DGraph/J2DTextBox.cpp:
.text start:0x802FCAF4 end:0x802FDFE4
.data start:0x804153E8 end:0x804154A8
.sdata start:0x805209E0 end:0x805209E8
.sdata2 start:0x80526998 end:0x805269B8
JSystem/J2DGraph/J2DWindowEx.cpp:
@@ -2849,6 +2862,7 @@ JSystem/J2DGraph/J2DTextBoxEx.cpp:
.text start:0x80303F44 end:0x80305788
.rodata start:0x803DFB28 end:0x803DFB60
.data start:0x804156C8 end:0x80415788
.sdata start:0x805209E8 end:0x805209F0
.sdata2 start:0x805269F0 end:0x80526A10
JSystem/J2DGraph/J2DAnmLoader.cpp:
@@ -2867,6 +2881,7 @@ JSystem/J2DGraph/J2DManage.cpp:
JSystem/J3DGraphBase/J3DGD.cpp:
.text start:0x803099B0 end:0x8030B278
.data start:0x804158B8 end:0x80415960
.sdata start:0x805209F0 end:0x80520A40
.sdata2 start:0x80526A48 end:0x80526A88
JSystem/J3DGraphBase/J3DSys.cpp:
config/RZDP01/symbols.txt
+42 -51
View File
@@ -24796,8 +24796,8 @@ l_RoomKeepDoorInfo = .bss:0x80469C1C; // type:object size:0x904 scope:global ali
@97897 = .bss:0x8046A520; // type:object size:0xC scope:local align:4
mStatus__20dStage_roomControl_c = .bss:0x8046A52C; // type:object size:0x10100 scope:global align:4 data:4byte
mMemoryBlock__20dStage_roomControl_c = .bss:0x8047A62C; // type:object size:0x4C scope:global align:4
lbl_8047A678 = .bss:0x8047A678; // type:object size:0xA data:byte
lbl_8047A682 = .bss:0x8047A682; // type:object size:0x146
mDemoArcName__20dStage_roomControl_c = .bss:0x8047A678; // type:object size:0xA data:byte
mArcBank__20dStage_roomControl_c = .bss:0x8047A682; // type:object size:0x146
...bss.0 = .bss:0x8047A7C8; // type:label scope:local align:4
dComIfG_mTimerInfo = .bss:0x8047A7C8; // type:object size:0x14 scope:global align:4
@109549 = .bss:0x8047A7DC; // type:object size:0xC scope:local align:4
@@ -25367,8 +25367,8 @@ exCallbackObject = .bss:0x804A9A38; // type:object size:0x14 scope:global align:
sMapFileList__12JUTException = .bss:0x804A9A58; // type:object size:0xC scope:global align:4 data:4byte
c3bcnt = .bss:0x804A9A68; // type:object size:0x20 scope:global align:4 data:4byte
context$45953 = .bss:0x804A9A88; // type:object size:0x2C8 scope:local align:4
lbl_804A9D50 = .bss:0x804A9D50; // type:object size:0x40
lbl_804A9D90 = .bss:0x804A9D90; // type:object size:0x100
sMessageFileLine__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .bss:0x804A9D50; // type:object size:0x40
sMessageString__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .bss:0x804A9D90; // type:object size:0x100
static_mBounds__7J2DPane = .bss:0x804A9E90; // type:object size:0x10 scope:global align:4
lbl_804A9EA0 = .bss:0x804A9EA0; // type:object size:0x120 data:byte
j3dSys = .bss:0x804A9FC0; // type:object size:0x11C scope:global align:4
@@ -25561,7 +25561,7 @@ __RTTI__Q310dCsr_mng_c8bloObj_c9paneObj_c = .sdata:0x8051DEC0; // type:object si
__RTTI__Q210dCsr_mng_c5obj_c = .sdata:0x8051DEC8; // type:object size:0x8 scope:global align:4
__RTTI__Q210dCsr_mng_c6list_c = .sdata:0x8051DED0; // type:object size:0x8 scope:global align:4
__RTTI__Q210dCsr_mng_c6node_c = .sdata:0x8051DED8; // type:object size:0x8 scope:global align:4
lbl_8051DEE0 = .sdata:0x8051DEE0; // type:object size:0x1 data:byte
developmentMode__7mDoMain = .sdata:0x8051DEE0; // type:object size:0x1 data:byte
memMargin__7mDoMain = .sdata:0x8051DEE4; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8051DEE8 = .sdata:0x8051DEE8; // type:object size:0x1 data:byte
lbl_8051DEE9 = .sdata:0x8051DEE9; // type:object size:0x3
@@ -25598,7 +25598,7 @@ __RTTI__28JASGlobalInstance<8Z2SeqMgr> = .sdata:0x8051DFA8; // type:object size:
lbl_8051DFB0 = .sdata:0x8051DFB0; // type:object size:0x8 data:string
__RTTI__7Z2SeMgr = .sdata:0x8051DFB8; // type:object size:0x8 scope:global align:4
__RTTI__27JASGlobalInstance<7Z2SeMgr> = .sdata:0x8051DFC0; // type:object size:0x8 scope:global align:4
lbl_8051DFC8 = .sdata:0x8051DFC8; // type:object size:0x1 data:byte
mWide__13mDoGph_gInf_c = .sdata:0x8051DFC8; // type:object size:0x1 data:byte
m_aspect__13mDoGph_gInf_c = .sdata:0x8051DFCC; // type:object size:0x4 scope:global align:4 data:float
m_scale__13mDoGph_gInf_c = .sdata:0x8051DFD0; // type:object size:0x4 scope:global align:4 data:float
m_invScale__13mDoGph_gInf_c = .sdata:0x8051DFD4; // type:object size:0x4 scope:global align:4 data:float
@@ -25702,7 +25702,7 @@ lbl_8051E288 = .sdata:0x8051E288; // type:object size:0x8 data:string
lbl_8051E290 = .sdata:0x8051E290; // type:object size:0x7 data:string
lbl_8051E297 = .sdata:0x8051E297; // type:object size:0x7 data:string
lbl_8051E29E = .sdata:0x8051E29E; // type:object size:0x6 data:string
lbl_8051E2A4 = .sdata:0x8051E2A4; // type:object size:0x1 data:byte
mRoomReadId__20dStage_roomControl_c = .sdata:0x8051E2A4; // type:object size:0x1 data:byte
__RTTI__16dStage_stageDt_c = .sdata:0x8051E2A8; // type:object size:0x8 scope:global align:4
__RTTI__15dStage_roomDt_c = .sdata:0x8051E2B0; // type:object size:0x8 scope:global align:4
__RTTI__11dStage_dt_c = .sdata:0x8051E2B8; // type:object size:0x8 scope:global align:4
@@ -25757,7 +25757,7 @@ lbl_8051E433 = .sdata:0x8051E433; // type:object size:0x8 data:string
lbl_8051E43B = .sdata:0x8051E43B; // type:object size:0x7 data:string
lbl_8051E442 = .sdata:0x8051E442; // type:object size:0x5 data:string
lbl_8051E447 = .sdata:0x8051E447; // type:object size:0x8 data:string
lbl_8051E44F = .sdata:0x8051E44F; // type:object size:0x1 data:byte
g_blackColor = .sdata:0x8051E44F; // type:object size:0x1 data:byte
lbl_8051E450 = .sdata:0x8051E450; // type:object size:0x1 data:byte
lbl_8051E451 = .sdata:0x8051E451; // type:object size:0x1 data:byte
lbl_8051E452 = .sdata:0x8051E452; // type:object size:0x1 data:byte
@@ -27195,10 +27195,10 @@ scCursorSRotPaneName__Q210homebutton10HomeButton = .sdata:0x80520868; // type:ob
@3379 = .sdata:0x80520908; // type:object size:0x2 scope:local align:4 data:string
@3380 = .sdata:0x8052090C; // type:object size:0x3 scope:local align:4 data:string
@9572 = .sdata:0x80520910; // type:object size:0x4 scope:local align:4 data:wstring
lbl_80520918 = .sdata:0x80520918; // type:object size:0x1 data:byte
sDefaultFillFlag__7JKRHeap = .sdata:0x80520918; // type:object size:0x1 data:byte
lbl_80520919 = .sdata:0x80520919; // type:object size:0x7 data:string
ARALT_AramStartAdr = .sdata:0x80520920; // type:object size:0x4 scope:global align:4 data:4byte
lbl_80520924 = .sdata:0x80520924; // type:object size:0x3 data:string
@STRING@panic__12JUTExceptionFPCciPCc = .sdata:0x80520924; // type:object size:0x3 data:string
lbl_80520928 = .sdata:0x80520928; // type:object size:0x7 data:string
lbl_8052092F = .sdata:0x8052092F; // type:object size:0x6 data:string
lbl_80520935 = .sdata:0x80520935; // type:object size:0x6 data:string
@@ -27209,7 +27209,7 @@ lbl_80520958 = .sdata:0x80520958; // type:object size:0x2 data:string
lbl_8052095A = .sdata:0x8052095A; // type:object size:0x2 data:string
lbl_80520960 = .sdata:0x80520960; // type:object size:0x2 data:string
lbl_80520962 = .sdata:0x80520962; // type:object size:0x4 data:string
lbl_80520968 = .sdata:0x80520968; // type:object size:0x1 data:byte
errorRetry__12JKRDvdRipper = .sdata:0x80520968; // type:object size:0x1 data:byte
sSZSBufferSize__12JKRDvdRipper = .sdata:0x8052096C; // type:object size:0x4 scope:global align:4 data:4byte
lbl_80520970 = .sdata:0x80520970; // type:object size:0x1 data:byte
sSZSBufferSize__16JKRDvdAramRipper = .sdata:0x80520974; // type:object size:0x4 scope:global align:4 data:4byte
@@ -27230,7 +27230,7 @@ lbl_805209B1 = .sdata:0x805209B1; // type:object size:0x8 data:string
lbl_805209B9 = .sdata:0x805209B9; // type:object size:0x1
lbl_805209BA = .sdata:0x805209BA; // type:object size:0x5 data:string
lbl_805209C0 = .sdata:0x805209C0; // type:object size:0x3 data:string
lbl_805209C8 = .sdata:0x805209C8; // type:object size:0x1 data:byte
mVisible__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sdata:0x805209C8; // type:object size:0x1 data:byte
oneFrameRate = .sdata:0x805209D0; // type:object size:0x4 scope:global align:4 data:float
oneFrameRateUser = .sdata:0x805209D4; // type:object size:0x4 scope:global align:4 data:float
lbl_805209D8 = .sdata:0x805209D8; // type:object size:0x4 data:string
@@ -27462,21 +27462,21 @@ lbl_80520F11 = .sbss:0x80520F11; // type:object size:0x1 data:byte
lbl_80520F12 = .sbss:0x80520F12; // type:object size:0x1 data:byte
console_scroll$90877 = .sbss:0x80520F14; // type:object size:0x4 scope:local align:4 data:float
frame$91013 = .sbss:0x80520F18; // type:object size:0x4 scope:local align:4 data:4byte
lbl_80520F20 = .sbss:0x80520F20; // type:object size:0x1 data:byte
lbl_80520F21 = .sbss:0x80520F21; // type:object size:0x1 data:byte
lbl_80520F22 = .sbss:0x80520F22; // type:object size:0x1 data:byte
lbl_80520F23 = .sbss:0x80520F23; // type:object size:0x1 data:byte
lbl_80520F24 = .sbss:0x80520F24; // type:object size:0x1 data:byte
__OSReport_disable = .sbss:0x80520F20; // type:object size:0x1 data:byte
__OSReport_Error_disable = .sbss:0x80520F21; // type:object size:0x1 data:byte
__OSReport_Warning_disable = .sbss:0x80520F22; // type:object size:0x1 data:byte
__OSReport_System_disable = .sbss:0x80520F23; // type:object size:0x1 data:byte
__OSReport_enable = .sbss:0x80520F24; // type:object size:0x1 data:byte
__OSReport_MonopolyThread = .sbss:0x80520F28; // type:object size:0x4 scope:global align:4 data:4byte
print_counts = .sbss:0x80520F2C; // type:object size:0x4 scope:global align:4 data:4byte
print_errors = .sbss:0x80520F30; // type:object size:0x4 scope:global align:4 data:4byte
print_warings = .sbss:0x80520F34; // type:object size:0x4 scope:global align:4 data:4byte
print_systems = .sbss:0x80520F38; // type:object size:0x4 scope:global align:4 data:4byte
lbl_80520F3C = .sbss:0x80520F3C; // type:object size:0x1 data:byte
print_initialized = .sbss:0x80520F3C; // type:object size:0x1 data:byte
lbl_80520F3D = .sbss:0x80520F3D; // type:object size:0x1 data:byte
lbl_80520F40 = .sbss:0x80520F40; // type:object size:0x1 data:byte
lbl_80520F41 = .sbss:0x80520F41; // type:object size:0x1 data:byte
lbl_80520F42 = .sbss:0x80520F42; // type:object size:0x1 data:byte
mInitFlag__17mDoAud_zelAudio_c = .sbss:0x80520F40; // type:object size:0x1 data:byte
mResetFlag__17mDoAud_zelAudio_c = .sbss:0x80520F41; // type:object size:0x1 data:byte
mBgmSet__17mDoAud_zelAudio_c = .sbss:0x80520F42; // type:object size:0x1 data:byte
g_mDoAud_audioHeap = .sbss:0x80520F44; // type:object size:0x4 scope:global align:4 data:4byte
l_affCommand = .sbss:0x80520F48; // type:object size:0x4 scope:global align:4 data:4byte
l_arcCommand = .sbss:0x80520F4C; // type:object size:0x4 scope:global align:4 data:4byte
@@ -27507,21 +27507,15 @@ mZbufferTimg__13mDoGph_gInf_c = .sbss:0x80520FB4; // type:object size:0x4 scope:
mZbufferTex__13mDoGph_gInf_c = .sbss:0x80520FB8; // type:object size:0x4 scope:global align:4 data:4byte
mFadeRate__13mDoGph_gInf_c = .sbss:0x80520FBC; // type:object size:0x4 scope:global align:4 data:float
mFadeSpeed__13mDoGph_gInf_c = .sbss:0x80520FC0; // type:object size:0x4 scope:global align:4 data:float
lbl_80520FC4 = .sbss:0x80520FC4; // type:object size:0x1 data:byte
lbl_80520FC5 = .sbss:0x80520FC5; // type:object size:0x1 data:byte
lbl_80520FC6 = .sbss:0x80520FC6; // type:object size:0x1 data:byte
lbl_80520FC7 = .sbss:0x80520FC7; // type:object size:0x1 data:byte
lbl_80520FC8 = .sbss:0x80520FC8; // type:object size:0x1 data:byte
lbl_80520FC9 = .sbss:0x80520FC9; // type:object size:0x1 data:byte
lbl_80520FCA = .sbss:0x80520FCA; // type:object size:0x1 data:byte
lbl_80520FCB = .sbss:0x80520FCB; // type:object size:0x1 data:byte
lbl_80520FCC = .sbss:0x80520FCC; // type:object size:0x1 data:byte
lbl_80520FCD = .sbss:0x80520FCD; // type:object size:0x1 data:byte
lbl_80520FCE = .sbss:0x80520FCE; // type:object size:0x1 data:byte
lbl_80520FCF = .sbss:0x80520FCF; // type:object size:0x1 data:byte
mBackColor__13mDoGph_gInf_c = .sbss:0x80520FC4; // type:object size:0x4 data:byte
mFadeColor__13mDoGph_gInf_c = .sbss:0x80520FC8; // type:object size:0x4 data:byte
mBlureFlag__13mDoGph_gInf_c = .sbss:0x80520FCC; // type:object size:0x1 data:byte
mBlureRate__13mDoGph_gInf_c = .sbss:0x80520FCD; // type:object size:0x1 data:byte
mFade__13mDoGph_gInf_c = .sbss:0x80520FCE; // type:object size:0x1 data:byte
mAutoForcus__13mDoGph_gInf_c = .sbss:0x80520FCF; // type:object size:0x1 data:byte
lbl_80520FD0 = .sbss:0x80520FD0; // type:object size:0x1 data:byte
m_blurID__Q213mDoGph_gInf_c5csr_c = .sbss:0x80520FD4; // type:object size:0x4 scope:global align:4 data:4byte
lbl_80520FD8 = .sbss:0x80520FD8; // type:object size:0x1 data:byte
mWideZoom__13mDoGph_gInf_c = .sbss:0x80520FD8; // type:object size:0x1 data:byte
m_minX__13mDoGph_gInf_c = .sbss:0x80520FDC; // type:object size:0x4 scope:global align:4 data:4byte
m_minY__13mDoGph_gInf_c = .sbss:0x80520FE0; // type:object size:0x4 scope:global align:4 data:4byte
m_minXF__13mDoGph_gInf_c = .sbss:0x80520FE4; // type:object size:0x4 scope:global align:4 data:float
@@ -27543,7 +27537,7 @@ lbl_80521025 = .sbss:0x80521025; // type:object size:0x1 data:byte
lbl_80521026 = .sbss:0x80521026; // type:object size:0x1 data:byte
lbl_80521027 = .sbss:0x80521027; // type:object size:0x1 data:byte
l_oldButton$90467 = .sbss:0x80521028; // type:object size:0x4 scope:local align:4 data:4byte
lbl_80521030 = .sbss:0x80521030; // type:object size:0x8
mDoMtx_stack = .sbss:0x80521030; // type:object size:0x1
AssertHeap = .sbss:0x80521038; // type:object size:0x4 scope:global align:4 data:4byte
DbPrintHeap = .sbss:0x8052103C; // type:object size:0x4 scope:global align:4 data:4byte
gameHeap = .sbss:0x80521040; // type:object size:0x4 scope:global align:4 data:4byte
@@ -27566,9 +27560,9 @@ aram_cache_size = .sbss:0x80521080; // type:object size:0x4 scope:global align:4
mSystemFar__14mDoLib_clipper = .sbss:0x80521088; // type:object size:0x4 scope:global align:4 data:float
mFovyRate__14mDoLib_clipper = .sbss:0x8052108C; // type:object size:0x4 scope:global align:4 data:float
mResetData__6mDoRst = .sbss:0x80521090; // type:object size:0x4 scope:global align:4 data:4byte
lbl_80521098 = .sbss:0x80521098; // type:object size:0x1 data:byte
lbl_80521099 = .sbss:0x80521099; // type:object size:0x7 data:byte
lbl_805210A0 = .sbss:0x805210A0; // type:object size:0x1 data:byte
SyncWidthSound__9mDoDvdThd = .sbss:0x80521098; // type:object size:0x1 data:byte
sDefaultDirection = .sbss:0x80521099; // type:object size:0x1 data:byte
mDoDvdErr_initialized = .sbss:0x805210A0; // type:object size:0x1 data:byte
sConsole = .sbss:0x805210A8; // type:object size:0x4 scope:global align:4 data:4byte
lbl_805210B0 = .sbss:0x805210B0; // type:object size:0x1
lbl_805210B1 = .sbss:0x805210B1; // type:object size:0x1
@@ -27609,10 +27603,10 @@ g_fpcPf_ProfileList_p = .sbss:0x80521148; // type:object size:0x4 scope:global a
tmp_name$50691 = .sbss:0x80521150; // type:object size:0x8 scope:local align:1 data:byte
mProcID__20dStage_roomControl_c = .sbss:0x80521158; // type:object size:0x4 scope:global align:4 data:4byte
mStayNo__20dStage_roomControl_c = .sbss:0x8052115C; // type:object size:0x1 data:byte
lbl_8052115D = .sbss:0x8052115D; // type:object size:0x1 data:byte
lbl_8052115E = .sbss:0x8052115E; // type:object size:0x1 data:byte
lbl_8052115F = .sbss:0x8052115F; // type:object size:0x1 data:byte
lbl_80521160 = .sbss:0x80521160; // type:object size:0x1 data:byte
mOldStayNo__20dStage_roomControl_c = .sbss:0x8052115D; // type:object size:0x1 data:byte
mNextStayNo__20dStage_roomControl_c = .sbss:0x8052115E; // type:object size:0x1 data:byte
m_time_pass__20dStage_roomControl_c = .sbss:0x8052115F; // type:object size:0x1 data:byte
mNoChangeRoom__20dStage_roomControl_c = .sbss:0x80521160; // type:object size:0x1 data:byte
mArcBankName__20dStage_roomControl_c = .sbss:0x80521164; // type:object size:0x4 scope:global align:4 data:4byte
mArcBankData__20dStage_roomControl_c = .sbss:0x80521168; // type:object size:0x4 scope:global align:4 data:4byte
m_roomDzs__20dStage_roomControl_c = .sbss:0x8052116C; // type:object size:0x8 scope:global align:4
@@ -27620,10 +27614,7 @@ m_res__22dMap_HIO_prm_res_dst_s = .sbss:0x80521178; // type:object size:0x4 scop
m_baseCsr__13dComIfG_inf_c = .sbss:0x80521180; // type:object size:0x4 scope:global align:4 data:4byte
m_navi__Q213dComIfG_inf_c9baseCsr_c = .sbss:0x80521184; // type:object size:0x4 scope:global align:4 data:4byte
lbl_80521188 = .sbss:0x80521188; // type:object size:0x1 data:byte
lbl_80521189 = .sbss:0x80521189; // type:object size:0x1 data:byte
lbl_8052118A = .sbss:0x8052118A; // type:object size:0x1 data:byte
lbl_8052118B = .sbss:0x8052118B; // type:object size:0x1 data:byte
lbl_8052118C = .sbss:0x8052118C; // type:object size:0x1 data:byte
g_clearColor = .sbss:0x80521189; // type:object size:0x4 data:byte
g_dComIfAc_gameInfo = .sbss:0x80521190; // type:object size:0x8 scope:global align:4
g_dComIfGoat_gameInfo = .sbss:0x80521198; // type:object size:0x4 scope:global align:4 data:4byte
m_count__9daArrow_c = .sbss:0x805211A0; // type:object size:0x2 scope:global align:4
@@ -28126,18 +28117,18 @@ lbl_80521A38 = .sbss:0x80521A38; // type:object size:0x1 data:byte
sCurrentFifo__12JUTGraphFifo = .sbss:0x80521A3C; // type:object size:0x4 scope:global align:4 data:4byte
lbl_80521A40 = .sbss:0x80521A40; // type:object size:0x8
sDebugPrint__10JUTDbPrint = .sbss:0x80521A48; // type:object size:0x4 scope:global align:4 data:4byte
lbl_80521A50 = .sbss:0x80521A50; // type:object size:0x1 data:byte
lbl_80521A51 = .sbss:0x80521A51; // type:object size:0x1 data:byte
mListInitialized__10JUTGamePad = .sbss:0x80521A50; // type:object size:0x1 data:byte
mPadAssign__10JUTGamePad = .sbss:0x80521A51; // type:object size:0x4 data:byte
sSuppressPadReset__10JUTGamePad = .sbss:0x80521A58; // type:object size:0x4 scope:global align:4 data:4byte
sAnalogMode__10JUTGamePad = .sbss:0x80521A5C; // type:object size:0x4 scope:global align:4 data:4byte
sRumbleSupported__10JUTGamePad = .sbss:0x80521A60; // type:object size:0x4 scope:global align:4 data:4byte
lbl_80521A64 = .sbss:0x80521A64; // type:object size:0x1 data:byte
mStatus__Q210JUTGamePad7CRumble = .sbss:0x80521A64; // type:object size:0x4 data:byte
mEnabled__Q210JUTGamePad7CRumble = .sbss:0x80521A68; // type:object size:0x4 scope:global align:4 data:4byte
sCallback__Q210JUTGamePad13C3ButtonReset = .sbss:0x80521A6C; // type:object size:0x4 scope:global align:4 data:4byte
sCallbackArg__Q210JUTGamePad13C3ButtonReset = .sbss:0x80521A70; // type:object size:0x4 scope:global align:4 data:4byte
sThreshold__Q210JUTGamePad13C3ButtonReset = .sbss:0x80521A78; // type:object size:0x8 scope:global align:4 data:4byte
lbl_80521A80 = .sbss:0x80521A80; // type:object size:0x1 data:byte
lbl_80521A81 = .sbss:0x80521A81; // type:object size:0x1 data:byte
sResetSwitchPushing__Q210JUTGamePad13C3ButtonReset = .sbss:0x80521A80; // type:object size:0x1 data:byte
sResetOccurred__Q210JUTGamePad13C3ButtonReset = .sbss:0x80521A81; // type:object size:0x1 data:byte
sResetOccurredPort__Q210JUTGamePad13C3ButtonReset = .sbss:0x80521A84; // type:object size:0x4 scope:global align:4 data:4byte
sErrorManager__12JUTException = .sbss:0x80521A88; // type:object size:0x4 scope:global align:4 data:4byte
sPreUserCallback__12JUTException = .sbss:0x80521A8C; // type:object size:0x4 scope:global align:4 data:4byte
config/Shield/rels/d_a_npc_taro/symbols.txt
+1 -1
View File
@@ -270,5 +270,5 @@ lbl_88_data_1BD8 = .data:0x00001BD8; // type:object size:0x24
@120156 = .data:0x00001DD4; // type:object size:0xC scope:local data:string
@120184 = .data:0x00001DF4; // type:object size:0xD scope:local data:string
l_HIO = .bss:0x00000000; // type:object size:0x4 scope:global
lbl_88_bss_4 = .bss:0x00000004; // type:object size:0x1 data:byte
@GUARD@setAttnPos__12daNpc_Taro_cFv@prtclScl = .bss:0x00000004; // type:object size:0x1 data:byte
@LOCAL@setAttnPos__12daNpc_Taro_cFv@prtclScl = .bss:0x00000008; // type:object size:0xC scope:local align:4 data:float
config/Shield/symbols.txt
+5 -5
View File
@@ -23030,7 +23030,7 @@ g_fpcNd_IsCheckOfDeleteTiming = .sdata:0x80504EF0; // type:object size:0x4 scope
@116401 = .sdata:0x80504F20; // type:object size:0x7 scope:local data:string hash:0xAC942746
@117095 = .sdata:0x80504F28; // type:object size:0x7 scope:local data:string hash:0xAC949B4E
@117096 = .sdata:0x80504F30; // type:object size:0x6 scope:local data:string hash:0xAC949B4D
lbl_80504F36 = .sdata:0x80504F36; // type:object size:0x1 data:byte hash:0x1A63BEEE dhash:0x24126ACC
mRoomReadId__20dStage_roomControl_c = .sdata:0x80504F36; // type:object size:0x1 data:byte hash:0x1A63BEEE dhash:0x24126ACC
__RTTI__16dStage_stageDt_c = .sdata:0x80504F38; // type:object size:0x8 scope:global hash:0x17B0566E dhash:0xF078A7E9
__RTTI__15dStage_roomDt_c = .sdata:0x80504F40; // type:object size:0x8 scope:global hash:0x0033F5F6 dhash:0xF77E0AD2
__RTTI__11dStage_dt_c = .sdata:0x80504F48; // type:object size:0x8 scope:global hash:0x5F98966D dhash:0x6874274D
@@ -25275,10 +25275,10 @@ g_fpcPf_ProfileList_p = .sbss:0x80508B58; // type:object size:0x4 scope:global d
@LOCAL@dStage_getName__FsSc@tmp_name = .sbss:0x80508B60; // type:object size:0x8 scope:local hash:0xDC907C52 dhash:0x0B811DD9
mProcID__20dStage_roomControl_c = .sbss:0x80508B68; // type:object size:0x4 scope:global data:4byte hash:0x24C2F7B2 dhash:0xBF1DEEF0
mStayNo__20dStage_roomControl_c = .sbss:0x80508B6C; // type:object size:0x1 data:byte hash:0x87058A4F dhash:0xB3B700CD
lbl_80508B6D = .sbss:0x80508B6D; // type:object size:0x1 data:byte hash:0x5AF37248 dhash:0x1A945A6A
lbl_80508B6E = .sbss:0x80508B6E; // type:object size:0x1 data:byte hash:0xE957ED68 dhash:0x66C51F6A
lbl_80508B6F = .sbss:0x80508B6F; // type:object size:0x1 data:byte hash:0x88D929D5 dhash:0xB0689D17
lbl_80508B70 = .sbss:0x80508B70; // type:object size:0x1 data:byte hash:0x3F91BE16 dhash:0xDD72DA34
mOldStayNo__20dStage_roomControl_c = .sbss:0x80508B6D; // type:object size:0x1 data:byte hash:0x5AF37248 dhash:0x1A945A6A
mNextStayNo__20dStage_roomControl_c = .sbss:0x80508B6E; // type:object size:0x1 data:byte hash:0xE957ED68 dhash:0x66C51F6A
m_time_pass__20dStage_roomControl_c = .sbss:0x80508B6F; // type:object size:0x1 data:byte hash:0x88D929D5 dhash:0xB0689D17
mNoChangeRoom__20dStage_roomControl_c = .sbss:0x80508B70; // type:object size:0x1 data:byte hash:0x3F91BE16 dhash:0xDD72DA34
mArcBankName__20dStage_roomControl_c = .sbss:0x80508B74; // type:object size:0x4 scope:global data:4byte hash:0x885DF1A0 dhash:0xD2AA5D02
mArcBankData__20dStage_roomControl_c = .sbss:0x80508B78; // type:object size:0x4 scope:global data:4byte hash:0xF1AABD97 dhash:0xD2A70575
m_roomDzs__20dStage_roomControl_c = .sbss:0x80508B80; // type:object size:0x8 scope:global data:byte hash:0x67101B7C dhash:0x0B10A8BE
config/ShieldD/rels/d_a_tag_firewallD/symbols.txt
+1 -1
View File
@@ -30,4 +30,4 @@ game_over_eff_name__11Tag_FWall_n = .data:0x00000040; // type:object size:0x8 sc
l_daTag_FWall_Method = .data:0x00000060; // type:object size:0x20 scope:global
g_profile_Tag_FWall = .data:0x00000080; // type:object size:0x30 scope:global
fire_leader = .bss:0x00000000; // type:object size:0x4 scope:global
lbl_708_bss_4 = .bss:0x00000004; // type:object size:0x1 data:byte
fire_num = .bss:0x00000004; // type:object size:0x1 data:byte
config/ShieldD/rels/d_a_tag_waterfallD/symbols.txt
+1 -1
View File
@@ -61,5 +61,5 @@ __RTTI__20daTagWaterFall_HIO_c = .data:0x000001A0; // type:object size:0x8 scope
@118516 = .data:0x000001A8; // type:object size:0xE scope:local data:string
@118517 = .data:0x000001B8; // type:object size:0xC scope:local
@118518 = .data:0x000001DC; // type:object size:0x11 scope:local data:string
lbl_743_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte
masterWaterfallTagExists = .bss:0x00000000; // type:object size:0x1 data:byte
l_HIO = .bss:0x00000004; // type:object size:0x24 scope:global data:byte
config/ShieldD/splits.txt
+8 -7
View File
@@ -103,18 +103,19 @@ m_Do/m_Do_Reset.cpp:
.text start:0x8002BAE0 end:0x8002BE60
.data start:0x806641F0 end:0x80664238
.sdata start:0x8073F628 end:0x8073F630
.sbss start:0x8074C428 end:0x8074C434
.sbss start:0x8074C428 end:0x8074C430
m_Do/m_Do_dvd_thread.cpp:
.text start:0x8002BE60 end:0x8002D590
.ctors start:0x8062F7DC end:0x8062F7E0
.data start:0x80664238 end:0x80664A10
.sdata start:0x8073F630 end:0x8073F688
.sbss start:0x8074C434 end:0x8074C450
.sbss start:0x8074C430 end:0x8074C448
.bss start:0x80756800 end:0x80758B80
m_Do/m_Do_DVDError.cpp:
.text start:0x8002D590 end:0x8002D740
.sbss start:0x8074C448 end:0x8074C450
.bss start:0x80758B80 end:0x8075AEE0
m_Do/m_Do_MemCard.cpp:
@@ -155,7 +156,7 @@ f_ap/f_ap_game.cpp:
.ctors start:0x8062F7E8 end:0x8062F7EC
.data start:0x80667F90 end:0x80669130
.sdata start:0x8073F6E8 end:0x8073F850
.sbss start:0x8074C47C end:0x8074C4A0
.sbss start:0x8074C47C end:0x8074C498
.sdata2 start:0x8074D920 end:0x8074D950
.bss start:0x80776F20 end:0x8077EF68
@@ -164,7 +165,7 @@ f_op/f_op_actor.cpp:
.ctors start:0x8062F7EC end:0x8062F7F0
.data start:0x80669130 end:0x80669848
.sdata start:0x8073F850 end:0x8073F8B8
.sbss start:0x8074C4A0 end:0x8074C4E0
.sbss start:0x8074C498 end:0x8074C4D8
.sdata2 start:0x8074D950 end:0x8074D998
.bss start:0x8077EF68 end:0x8077EF78
@@ -184,7 +185,7 @@ f_op/f_op_actor_mng.cpp:
.rodata start:0x806311D0 end:0x80631200
.data start:0x80669848 end:0x8066AA10
.sdata start:0x8073F8B8 end:0x8073F970
.sbss start:0x8074C4E0 end:0x8074C4F8
.sbss start:0x8074C4D8 end:0x8074C4F8
.sdata2 start:0x8074D998 end:0x8074D9F0
.bss start:0x8077EF88 end:0x8077F148
@@ -3450,7 +3451,7 @@ JSystem/JUtility/JUTResFont.cpp:
JSystem/JUtility/JUTDbPrint.cpp:
.text start:0x8051C3E0 end:0x8051CB70
.sbss start:0x8074CF90 end:0x8074CF9C
.sbss start:0x8074CF90 end:0x8074CF98
.sdata2 start:0x80752718 end:0x80752728
JSystem/JUtility/JUTGamePad.cpp:
@@ -3458,7 +3459,7 @@ JSystem/JUtility/JUTGamePad.cpp:
.ctors start:0x8062F9C8 end:0x8062F9CC
.data start:0x8070FC90 end:0x8070FD50
.sdata start:0x8074ADA8 end:0x8074ADD8
.sbss start:0x8074CF9C end:0x8074CFD0
.sbss start:0x8074CF98 end:0x8074CFD0
.sdata2 start:0x80752728 end:0x80752748
.bss start:0x807E20B8 end:0x807E2258
config/ShieldD/symbols.txt
+8 -6
View File
@@ -32830,7 +32830,9 @@ __vt__19mDoDvdThd_command_c = .data:0x80664998; // type:object size:0x10 scope:g
@114927 = .data:0x806649A8; // type:object size:0x14 scope:local data:string hash:0xAC9323CD
@114928 = .data:0x806649BC; // type:object size:0xC scope:local hash:0xAC9323C2
@114929 = .data:0x806649C8; // type:object size:0xB scope:local data:string hash:0xAC9323C3
lbl_806649D3 = .data:0x806649D3; // type:object size:0x3D
lbl_806649D4 = .data:0x806649D4; // type:object size:0xD scope:local data:string
lbl_806649E4 = .data:0x806649E4; // type:object size:0x16 scope:local data:string
lbl_806649FC = .data:0x806649FC; // type:object size:0xD scope:local data:string
@114239 = .data:0x80664A10; // type:object size:0x1C scope:local hash:0xAC9305E9
...data.0 = .data:0x80664A10; // type:label scope:local
@114357 = .data:0x80664A2C; // type:object size:0x38 scope:local hash:0xAC930AE0
@@ -64236,8 +64238,8 @@ FstStart__10mDoDvdHack = .sbss:0x8074C438; // type:object size:0x4 scope:global
FstStringStart__10mDoDvdHack = .sbss:0x8074C43C; // type:object size:0x4 scope:global data:4byte hash:0x56901DA1 dhash:0x76F925E0
MaxEntryNum__10mDoDvdHack = .sbss:0x8074C440; // type:object size:0x4 scope:global data:4byte hash:0x143437A3 dhash:0xFB171942
sManager__Q210mDoDvdHack7Manager = .sbss:0x8074C444; // type:object size:0x1 scope:global hash:0x4AE0AFD2 dhash:0xC0BE40C7
lbl_8074C445 = .sbss:0x8074C445; // type:object size:0x1 data:byte hash:0xE347FC69 dhash:0x3FF11AB0
lbl_8074C448 = .sbss:0x8074C448; // type:object size:0x1 data:byte hash:0xEA8D2103
sDefaultDirection = .sbss:0x8074C445; // type:object size:0x1 data:byte hash:0xE347FC69 dhash:0x3FF11AB0
mDoDvdErr_initialized = .sbss:0x8074C448; // type:object size:0x1 data:byte hash:0xEA8D2103
sConsole = .sbss:0x8074C450; // type:object size:0x4 scope:global data:4byte hash:0xCEF7DB41
cDmr_SkipInfo = .sbss:0x8074C458; // type:object size:0x1 hash:0x209D232D
data_80450C99 = .sbss:0x8074C459; // type:object size:0x1 hash:0x73292698
@@ -64312,10 +64314,10 @@ lbl_8074C56C = .sbss:0x8074C56C; // type:object size:0x1 data:byte hash:0x5A01C5
@LOCAL@dStage_getName__FsSc@tmp_name = .sbss:0x8074C570; // type:object size:0x8 scope:local hash:0xDC907C52 dhash:0x0B811DD9
mProcID__20dStage_roomControl_c = .sbss:0x8074C578; // type:object size:0x4 scope:global data:4byte hash:0x24C2F7B2 dhash:0xBF1DEEF0
mStayNo__20dStage_roomControl_c = .sbss:0x8074C57C; // type:object size:0x1 data:byte hash:0x87058A4F dhash:0xB3B700CD
lbl_8074C57D = .sbss:0x8074C57D; // type:object size:0x1 data:byte hash:0x5AF37248 dhash:0x1A945A6A
dStage_roomControl_c::mNextStayNo = .sbss:0x8074C57E; // type:object size:0x1 data:byte hash:0xE957ED68 dhash:0x66C51F6A
mOldStayNo__20dStage_roomControl_c = .sbss:0x8074C57D; // type:object size:0x1 data:byte hash:0x5AF37248 dhash:0x1A945A6A
mNextStayNo__20dStage_roomControl_c = .sbss:0x8074C57E; // type:object size:0x1 data:byte hash:0xE957ED68 dhash:0x66C51F6A
m_time_pass__20dStage_roomControl_c = .sbss:0x8074C57F; // type:object size:0x1 data:byte hash:0x88D929D5 dhash:0xB0689D17
lbl_8074C580 = .sbss:0x8074C580; // type:object size:0x1 data:byte hash:0x3F91BE16 dhash:0xDD72DA34
mNoChangeRoom__20dStage_roomControl_c = .sbss:0x8074C580; // type:object size:0x1 data:byte hash:0x3F91BE16 dhash:0xDD72DA34
mArcBankName__20dStage_roomControl_c = .sbss:0x8074C584; // type:object size:0x4 scope:global data:4byte hash:0x885DF1A0 dhash:0xD2AA5D02
mArcBankData__20dStage_roomControl_c = .sbss:0x8074C588; // type:object size:0x4 scope:global data:4byte hash:0xF1AABD97 dhash:0xD2A70575
m_roomDzs__20dStage_roomControl_c = .sbss:0x8074C590; // type:object size:0x8 scope:global hash:0x67101B7C dhash:0x0B10A8BE
configure.py
+79 -72
View File
@@ -397,6 +397,13 @@ if config.version != "ShieldD":
if config.version in ["RZDE01_00", "RZDE01_02", "RZDP01", "RZDJ01"]:
cflags_framework.extend(["-DSDK_SEP2006"])
cflags_jsystem = [
*cflags_framework
]
if config.version in ["RZDE01_00", "RZDE01_02", "RZDP01", "RZDJ01"]:
cflags_jsystem.extend(["-RTTI off"])
# REL flags
cflags_rel = [
@@ -505,7 +512,7 @@ def JSystemLib(lib_name: str, objects: List[Object], progress_category: str="thi
return {
"lib": lib_name,
"mw_version": MWVersion(config.version),
"cflags": [*cflags_framework],
"cflags": [*cflags_jsystem],
"progress_category": progress_category,
"objects": objects,
}
@@ -716,9 +723,9 @@ config.libs = [
Object(MatchingFor(ALL_GCN, "Shield"), "d/d_bg_plc.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_bg_s.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_bg_s_acch.cpp"),
Object(NonMatching, "d/d_bg_s_capt_poly.cpp"),
Object(MatchingFor(ALL_WII), "d/d_bg_s_capt_poly.cpp"),
Object(MatchingFor(ALL_GCN, "Shield"), "d/d_bg_s_chk.cpp"),
Object(NonMatching, "d/d_bg_s_func.cpp"),
Object(MatchingFor("ShieldD"), "d/d_bg_s_func.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_bg_s_gnd_chk.cpp"), # debug weak func order
Object(MatchingFor(ALL_GCN), "d/d_bg_s_grp_pass_chk.cpp"), # debug weak func order
Object(MatchingFor(ALL_GCN), "d/d_bg_s_lin_chk.cpp"),
@@ -730,7 +737,7 @@ config.libs = [
Object(MatchingFor(ALL_GCN, ALL_SHIELD), "d/d_bg_s_wtr_chk.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_bg_w.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_bg_w_base.cpp"),
Object(NonMatching, "d/d_bg_w_deform.cpp"),
Object(MatchingFor("ShieldD"), "d/d_bg_w_deform.cpp"),
Object(NonMatching, "d/d_bg_w_hf.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_bg_w_kcol.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_bg_w_sv.cpp"),
@@ -1351,7 +1358,7 @@ config.libs = [
Object(MatchingFor(ALL_GCN), "JSystem/J2DGraph/J2DGrafContext.cpp"),
Object(MatchingFor(ALL_GCN), "JSystem/J2DGraph/J2DOrthoGraph.cpp"),
Object(MatchingFor(ALL_GCN), "JSystem/J2DGraph/J2DTevs.cpp"),
Object(Equivalent, "JSystem/J2DGraph/J2DMaterial.cpp"), # weak func order
Object(MatchingFor(ALL_GCN), "JSystem/J2DGraph/J2DMaterial.cpp"),
Object(MatchingFor(ALL_GCN), "JSystem/J2DGraph/J2DMatBlock.cpp"),
Object(MatchingFor(ALL_GCN), "JSystem/J2DGraph/J2DMaterialFactory.cpp"),
Object(MatchingFor(ALL_GCN), "JSystem/J2DGraph/J2DPrint.cpp"),
@@ -2130,19 +2137,19 @@ config.libs = [
ActorRel(MatchingFor(ALL_GCN), "d_a_set_bgobj"),
ActorRel(MatchingFor(ALL_GCN), "d_a_swhit0"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_allmato"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_camera"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_chkpoint"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_event"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_evt"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_evtarea"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_evtmsg"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_howl"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_camera"), # debug extra weak fns
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_chkpoint"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_event"), # TODO: this is part of Rframework in ShieldD
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_evt"), # debug extra weak fns
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_evtarea"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_evtmsg"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_howl"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_kmsg"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_lantern"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mist"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_msg"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_push"),
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_telop"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_lantern"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mist"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_msg"), # TODO: this is part of Rframework in ShieldD
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_push"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_telop"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tbox"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tbox2"),
ActorRel(MatchingFor(ALL_GCN), "d_a_vrbox"),
@@ -2223,19 +2230,19 @@ config.libs = [
ActorRel(MatchingFor(ALL_GCN), "d_a_shop_item"),
ActorRel(MatchingFor(ALL_GCN), "d_a_sq"),
ActorRel(MatchingFor(ALL_GCN), "d_a_swc00"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_CstaSw"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_ajnot"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_attack_item"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_gstart"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_hinit"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_hjump"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_hstop"),
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_lv2prchk"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_magne"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mhint"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mstop"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_spring"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_statue_evt"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_CstaSw"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_ajnot"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_attack_item"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_gstart"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_hinit"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_hjump"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_hstop"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_lv2prchk"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_magne"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mhint"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mstop"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_spring"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_statue_evt"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_ykgr"),
ActorRel(MatchingFor(ALL_GCN), "d_a_L7demo_dr"),
ActorRel(MatchingFor(ALL_GCN), "d_a_L7low_dr"),
@@ -2805,7 +2812,7 @@ config.libs = [
ActorRel(MatchingFor(ALL_GCN), "d_a_obj_zra_freeze"),
ActorRel(MatchingFor(ALL_GCN), "d_a_obj_zra_rock"),
ActorRel(MatchingFor(ALL_GCN), "d_a_passer_mng"),
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_arena"),
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_arena"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_peru"),
ActorRel(MatchingFor(ALL_GCN), "d_a_ppolamp"),
ActorRel(MatchingFor(ALL_GCN), "d_a_skip_2D"),
@@ -2813,49 +2820,49 @@ config.libs = [
ActorRel(MatchingFor(ALL_GCN), "d_a_swBall"),
ActorRel(MatchingFor(ALL_GCN), "d_a_swLBall"),
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_swTime"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_Lv6Gate"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_Lv7Gate"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_Lv8Gate"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_TWgate"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_lv6CstaSw"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_assistance"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_bottle_item"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_chgrestart"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_csw"),
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_escape"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_firewall"),
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_gra"),
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_guard"),
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_instruction"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_kago_fall"),
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_lightball"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_lv5soup"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mmsg"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mwait"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_myna2"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_myna_light"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_pachi"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_poFire"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_Lv6Gate"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_Lv7Gate"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_Lv8Gate"), # debug .data + weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_TWgate"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_lv6CstaSw"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_assistance"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_bottle_item"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_chgrestart"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_csw"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN, ALL_WII, "Shield"), "d_a_tag_escape"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_firewall"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN, ALL_WII, "Shield"), "d_a_tag_gra"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_guard"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN, ALL_WII, "Shield"), "d_a_tag_instruction"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_kago_fall"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_lightball"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_lv5soup"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mmsg"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mwait"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_myna2"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_myna_light"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_pachi"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_poFire"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_qs"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_ret_room"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_river_back"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_rmbit_sw"),
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_schedule"),
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_setBall"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_setrestart"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_shop_camera"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_shop_item"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_smk_emt"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_spinner"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_sppath"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_ss_drink"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_stream"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_theB_hint"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_wara_howl"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_watchge"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_waterfall"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_ret_room"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_river_back"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_rmbit_sw"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN, ALL_WII, "Shield"), "d_a_tag_schedule"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN, ALL_WII, "Shield"), "d_a_tag_setBall"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_setrestart"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_shop_camera"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_shop_item"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_smk_emt"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_spinner"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_sppath"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_ss_drink"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_stream"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_theB_hint"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_wara_howl"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_watchge"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_waterfall"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_wljump"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_yami"),
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_yami"), # debug weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_talk"),
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tboxSw"),
ActorRel(MatchingFor(ALL_GCN), "d_a_title"),
include/JSystem/J2DGraph/J2DOrthoGraph.h
+1 -2
View File
@@ -24,8 +24,7 @@ public:
const JGeometry::TBox2<f32>* getOrtho() const { return &mOrtho; }
void setOrtho(f32 x, f32 y, f32 width, f32 height, f32 far, f32 near) {
JGeometry::TBox2<f32> ortho(x, y, x + width, y + height);
setOrtho(ortho, far, near);
setOrtho(JGeometry::TBox2<f32>(x, y, x + width, y + height), far, near);
}
private:
include/JSystem/J3DGraphAnimator/J3DAnimation.h
-49
View File
@@ -1,7 +1,6 @@
#ifndef J3DANIMATION_H
#define J3DANIMATION_H
#include "JSystem/J3DGraphAnimator/J3DJoint.h"
#include "JSystem/J3DGraphAnimator/J3DModelData.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "JSystem/JUtility/JUTNameTab.h"
@@ -978,52 +977,4 @@ public:
/* 0x10 */ f32 mFrame;
}; // Size: 0x14
struct J3DMtxCalcAnmBase: public J3DMtxCalc {
J3DMtxCalcAnmBase(J3DAnmTransform* pAnmTransform) { mAnmTransform = pAnmTransform; }
~J3DMtxCalcAnmBase() {}
J3DAnmTransform* getAnmTransform() { return mAnmTransform; }
void setAnmTransform(J3DAnmTransform* pAnmTransform) { mAnmTransform = pAnmTransform; }
J3DAnmTransform* mAnmTransform;
};
struct J3DMtxCalcAnimationAdaptorBase {
J3DMtxCalcAnimationAdaptorBase() {}
void change(J3DAnmTransform*) {}
};
template <typename A0>
struct J3DMtxCalcAnimationAdaptorDefault : public J3DMtxCalcAnimationAdaptorBase {
J3DMtxCalcAnimationAdaptorDefault(J3DAnmTransform* pAnmTransform) {}
void calc(J3DMtxCalcAnmBase* pMtxCalc) {
J3DTransformInfo transform;
J3DTransformInfo* transform_p;
if (pMtxCalc->getAnmTransform() != NULL) {
pMtxCalc->getAnmTransform()->getTransform(J3DMtxCalc::getJoint()->getJntNo(), &transform);
transform_p = &transform;
} else {
transform_p = &J3DMtxCalc::getJoint()->getTransformInfo();
}
A0::calcTransform(*transform_p);
}
};
template <typename A0, typename B0>
struct J3DMtxCalcAnimation : public J3DMtxCalcAnmBase {
J3DMtxCalcAnimation(J3DAnmTransform* pAnmTransform) : J3DMtxCalcAnmBase(pAnmTransform), field_0x8(pAnmTransform) {}
~J3DMtxCalcAnimation() {}
void setAnmTransform(J3DAnmTransform* pAnmTransform) {
mAnmTransform = pAnmTransform;
field_0x8.change(pAnmTransform);
}
void init(const Vec& param_0, const Mtx& param_1) { B0::init(param_0, param_1); }
void calc() { field_0x8.calc(this); }
A0 field_0x8;
};
#endif /* J3DANIMATION_H */
include/JSystem/J3DGraphAnimator/J3DJoint.h
+48
View File
@@ -145,6 +145,54 @@ public:
}
};
struct J3DMtxCalcAnmBase: public J3DMtxCalc {
J3DMtxCalcAnmBase(J3DAnmTransform* pAnmTransform) { mAnmTransform = pAnmTransform; }
~J3DMtxCalcAnmBase() {}
J3DAnmTransform* getAnmTransform() { return mAnmTransform; }
void setAnmTransform(J3DAnmTransform* pAnmTransform) { mAnmTransform = pAnmTransform; }
J3DAnmTransform* mAnmTransform;
};
struct J3DMtxCalcAnimationAdaptorBase {
J3DMtxCalcAnimationAdaptorBase() {}
void change(J3DAnmTransform*) {}
};
template <typename A0>
struct J3DMtxCalcAnimationAdaptorDefault : public J3DMtxCalcAnimationAdaptorBase {
J3DMtxCalcAnimationAdaptorDefault(J3DAnmTransform* pAnmTransform) {}
void calc(J3DMtxCalcAnmBase* pMtxCalc) {
J3DTransformInfo transform;
J3DTransformInfo* transform_p;
if (pMtxCalc->getAnmTransform() != NULL) {
pMtxCalc->getAnmTransform()->getTransform(J3DMtxCalc::getJoint()->getJntNo(), &transform);
transform_p = &transform;
} else {
transform_p = &J3DMtxCalc::getJoint()->getTransformInfo();
}
A0::calcTransform(*transform_p);
}
};
template <typename A0, typename B0>
struct J3DMtxCalcAnimation : public J3DMtxCalcAnmBase {
J3DMtxCalcAnimation(J3DAnmTransform* pAnmTransform) : J3DMtxCalcAnmBase(pAnmTransform), field_0x8(pAnmTransform) {}
~J3DMtxCalcAnimation() {}
void setAnmTransform(J3DAnmTransform* pAnmTransform) {
mAnmTransform = pAnmTransform;
field_0x8.change(pAnmTransform);
}
void init(const Vec& param_0, const Mtx& param_1) { B0::init(param_0, param_1); }
void calc() { field_0x8.calc(this); }
A0 field_0x8;
};
/**
* @ingroup jsystem-j3d
*
include/JSystem/J3DGraphAnimator/J3DJointTree.h
+1
View File
@@ -1,6 +1,7 @@
#ifndef J3DJOINTTREE_H
#define J3DJOINTTREE_H
#include "JSystem/J3DAssert.h"
#include "JSystem/J3DGraphBase/J3DTransform.h"
class J3DJoint;
include/JSystem/JHostIO/JORMContext.h
+4 -1
View File
@@ -29,6 +29,8 @@
#define JORM_DEFAULT_WIDTH 0x200
#define JORM_DEFAULT_HEIGHT 0x18
#define JORM_DEFAULT_COMBOBOX_WIDTH 0x100
#define JORM_DEFAULT_COMBOBOX_HEIGHT 0x1a
#define DEFINE_GEN_CHECKBOX(T, kind) \
void genCheckBox(const char* label, T* pSrc, T mask, u32 style = 0, \
@@ -65,7 +67,8 @@
#define DEFINE_START_COMBO_BOX(T, kind) \
void startComboBox(const char* label, T* pSrc, u32 style = 0, \
JOREventListener* pListener = NULL, u16 posX = -1, u16 posY = -1, \
u16 width = JORM_DEFAULT_WIDTH, u16 height = JORM_DEFAULT_HEIGHT) { \
u16 width = JORM_DEFAULT_COMBOBOX_WIDTH, \
u16 height = JORM_DEFAULT_COMBOBOX_HEIGHT) { \
startSelectorSub('CMBX', kind, label, (uintptr_t)pSrc, style, *pSrc, pListener, posX, \
posY, width, height); \
}
include/JSystem/JKernel/JKRMemArchive.h
+1 -1
View File
@@ -32,7 +32,7 @@ public:
static u32 fetchResource_subroutine(u8*, u32, u8*, u32, JKRCompression);
SArcHeader* getArcHeader() { return mArcHeader; }
private:
public:
/* 0x00 */ // vtable
/* 0x04 */ // JKRArchive
/* 0x64 */ SArcHeader* mArcHeader;
include/JSystem/JKernel/JKRThread.h
+23 -4
View File
@@ -65,7 +65,7 @@ public:
JKRThread(OSThread* thread, int message_count);
virtual ~JKRThread();
/* vt[03] */ virtual void* run();
/* vt[03] */ virtual void* run() { return NULL; }
void setCommon_mesgQueue(JKRHeap* heap, int message_count);
void setCommon_heapSpecified(JKRHeap* heap, u32 stack_size, int param_3);
@@ -134,6 +134,15 @@ public:
// static u8 sThreadList[12];
};
class JKRIdleThread : public JKRThread {
public:
virtual void destroy() {}
virtual ~JKRIdleThread() { sThread = NULL; }
virtual void* run() { while (true); }
static void* sThread;
};
typedef void (*JKRThreadSwitch_PreCallback)(OSThread* current, OSThread* next);
typedef void (*JKRThreadSwitch_PostCallback)(OSThread* current, OSThread* next);
@@ -145,8 +154,8 @@ class JKRThreadSwitch {
public:
JKRThreadSwitch(JKRHeap*);
virtual void draw(JKRThreadName_* param_1, JUTConsole* param_2);
virtual void draw(JKRThreadName_* param_1);
virtual ~JKRThreadSwitch();
virtual void draw(JKRThreadName_* thread_name_list) { draw(thread_name_list, NULL); }
virtual ~JKRThreadSwitch() {}
static JKRThreadSwitch* createManager(JKRHeap* heap);
@@ -176,9 +185,19 @@ private:
/* 0x24 */ u32 field_0x24;
};
struct JKRTask {
class JKRTask : public JKRThread {
public:
virtual ~JKRTask();
virtual void* run();
int check();
static JSUList<JKRTask> sTaskList;
static u8 sEndMesgQueue[32];
/* 0x7C */ JSULink<JKRTask> mTaskLink;
/* 0x8C */ u8 field_0x8c[0x94 - 0x8C];
/* 0x94 */ OSMessageQueue* field_0x94;
};
#endif /* JKRTHREAD_H */
include/JSystem/JUtility/JUTConsole.h
+15 -12
View File
@@ -6,6 +6,20 @@
#include "JSystem/JUtility/JUTFont.h"
#include <cstdarg>
class JUTConsole;
extern "C" void JUTConsole_print_f_va_(JUTConsole*, const char*, va_list);
extern "C" void JUTSetReportConsole(JUTConsole*);
extern "C" JUTConsole* JUTGetReportConsole();
extern "C" void JUTSetWarningConsole(JUTConsole*);
extern "C" JUTConsole* JUTGetWarningConsole();
extern "C" void JUTWarningConsole_f_va(const char*, va_list);
extern "C" void JUTReportConsole_f_va(const char*, va_list);
extern "C" void JUTReportConsole_f(const char*, ...);
extern "C" void JUTWarningConsole(const char* message);
extern "C" void JUTWarningConsole_f(const char* message, ...);
extern "C" void JUTReportConsole(const char* message);
/**
* @ingroup jsystem-jutility
*
@@ -95,6 +109,7 @@ public:
void scrollToLastLine() { scroll(mMaxLines); }
void scrollToFirstLine() { scroll(-mMaxLines); }
void print_f_va(const char* fmt, va_list args) { JUTConsole_print_f_va_(this, fmt, args); }
/* 0x18 */ JGadget::TLinkListNode mListNode;
/* 0x20 */ unsigned int field_0x20;
@@ -154,16 +169,4 @@ private:
/* 0x10 */ JUTConsole* mDirectConsole;
}; // Size: 0x14
extern "C" void JUTConsole_print_f_va_(JUTConsole*, const char*, va_list);
extern "C" void JUTSetReportConsole(JUTConsole*);
extern "C" JUTConsole* JUTGetReportConsole();
extern "C" void JUTSetWarningConsole(JUTConsole*);
extern "C" JUTConsole* JUTGetWarningConsole();
extern "C" void JUTWarningConsole_f_va(const char*, va_list);
extern "C" void JUTReportConsole_f_va(const char*, va_list);
extern "C" void JUTReportConsole_f(const char*, ...);
extern "C" void JUTWarningConsole(const char* message);
extern "C" void JUTWarningConsole_f(const char* message, ...);
extern "C" void JUTReportConsole(const char* message);
#endif /* JUTCONSOLE_H */
include/SSystem/SComponent/c_angle.h
+21 -9
View File
@@ -3,19 +3,31 @@
#include "SSystem/SComponent/c_xyz.h"
#define ADD_ANGLE(x, y) ((x) += (s16)(y))
#define SUB_ANGLE(x, y) ((x) -= (s16)(y))
#define MULT_ANGLE(x, y) ((x) *= (s16)(y))
#define ADD_VAR(x, y) ((x) += (y))
#define SUB_VAR(x, y) ((x) -= (y))
#define MULT_VAR(x, y) ((x) *= (y))
#define ADD_VAR_CAST(x, y, t) ((x) += (t)(y))
#define SUB_VAR_CAST(x, y, t) ((x) -= (t)(y))
#define MULT_VAR_CAST(x, y, t) ((x) *= (t)(y))
#define ADD_ANGLE(x, y) ADD_VAR_CAST(x, y, s16)
#define SUB_ANGLE(x, y) SUB_VAR_CAST(x, y, s16)
#define MULT_ANGLE(x, y) MULT_VAR_CAST(x, y, s16)
// There are some angles that weren't sign-extended until the shield version
#if !PLATFORM_SHIELD
#define ADD_ANGLE_2(x, y) ((x) += (y))
#define SUB_ANGLE_2(x, y) ((x) -= (y))
#define MULT_ANGLE_2(x, y) ((x) *= (y))
#define ADD_ANGLE_2 ADD_VAR
#define SUB_ANGLE_2 SUB_VAR
#define MULT_ANGLE_2 MULT_VAR
#define ADD_S8_2 ADD_VAR
#else
#define ADD_ANGLE_2(x, y) ADD_ANGLE(x, y)
#define SUB_ANGLE_2(x, y) SUB_ANGLE(x, y)
#define MULT_ANGLE_2(x, y) MULT_ANGLE(x, y)
#define ADD_ANGLE_2 ADD_ANGLE
#define SUB_ANGLE_2 SUB_ANGLE
#define MULT_ANGLE_2 MULT_ANGLE
#define ADD_S8_2(x, y) ADD_VAR_CAST(x, y, s8)
#endif
#define DEG2S_CONSTANT (0x8000 / 180.0f)
include/SSystem/SComponent/c_cc_d.h
+1 -1
View File
@@ -221,7 +221,7 @@ public:
u32 MskRPrm(u32 mask) const { return mRPrm & mask; }
void OnSPrmBit(u32 flag) { mSPrm |= flag; }
void OffSPrmBit(u32 flag) { mSPrm &= ~flag; }
u32 ChkSPrm(u32 prm) const { return MskSPrm(prm); }
u32 ChkSPrm(u32 prm) const { return MskSPrm(prm) != 0; }
void Set(cCcD_SrcObjCommonBase const& src) { mSPrm = src.mSPrm; }
};
include/Z2AudioLib/Z2AudioMgr.h
+2 -2
View File
@@ -4,14 +4,14 @@
#include "JSystem/JAudio2/JASAudioReseter.h"
#include "Z2AudioLib/Z2Audience.h"
#include "Z2AudioLib/Z2FxLineMgr.h"
#include "Z2AudioLib/Z2SceneMgr.h"
#include "Z2AudioLib/Z2SeMgr.h"
#include "Z2AudioLib/Z2SeqMgr.h"
#include "Z2AudioLib/Z2SceneMgr.h"
#include "Z2AudioLib/Z2StatusMgr.h"
#include "Z2AudioLib/Z2SoundInfo.h"
#include "Z2AudioLib/Z2SoundMgr.h"
#include "Z2AudioLib/Z2SoundObjMgr.h"
#include "Z2AudioLib/Z2SpeechMgr2.h"
#include "Z2AudioLib/Z2StatusMgr.h"
#include "Z2AudioLib/Z2DebugSys.h"
#include "global.h"
include/Z2AudioLib/Z2LinkMgr.h
+2 -1
View File
@@ -58,6 +58,7 @@ public:
void setMarkState(u8 state) { mMarkState = state; }
static Z2CreatureLink* mLinkPtr;
static Z2CreatureLink* getLink() { return mLinkPtr; }
friend class Z2LinkSoundStarter;
friend class Z2RideSoundStarter;
@@ -96,7 +97,7 @@ private:
}; // Size: 0xD0
inline Z2CreatureLink* Z2GetLink() {
return Z2CreatureLink::mLinkPtr;
return Z2CreatureLink::getLink();
}
class Z2CreatureRide;
include/Z2AudioLib/Z2SoundObjMgr.h
+3 -2
View File
@@ -82,7 +82,7 @@ enum Z2EnemyID {
/* 0x3F */ Z2_ENEMY_TN,
};
class Z2SoundObjMgr : public JASGlobalInstance<Z2SoundObjMgr>, protected JSUList<Z2CreatureEnemy> {
class Z2SoundObjMgr : public JASGlobalInstance<Z2SoundObjMgr> {
public:
Z2SoundObjMgr();
void setForceBattleArea(bool forceBattle, u16, u16, u16);
@@ -98,13 +98,14 @@ public:
u8 getEnemyNumNear() const { return enemuNumNear_; }
u8 getEnemyNumVeryFar() const { return enemuNumVeryFar_; }
bool isForceBattle() { return forceBattle_; }
JSUList<Z2CreatureEnemy>* getEnemyList() { return this; }
JSUList<Z2CreatureEnemy>* getEnemyList() { return &field_0x0; }
#if DEBUG
JSUList<Z2SoundObjBase>* getAllList() { return &allList_; }
#endif
private:
/* 0x00 */ JSUList<Z2CreatureEnemy> field_0x0;
#if DEBUG
/* 0x0C */ JSUList<Z2SoundObjBase> allList_;
#endif
include/d/actor/d_a_alink.h
+689 -540
View File
File diff suppressed because it is too large Load Diff
include/d/actor/d_a_b_dr.h
+2 -2
View File
@@ -79,8 +79,8 @@ public:
MtxP getMtx() { return mpModelMorf->getModel()->getAnmMtx(15); }
void onTarget() { mTarget = true; }
bool isBack() { return arg0; }
u8 onTarget() { return mTarget = true; }
u8 isBack() { return arg0; }
private:
/* 0x05AC */ request_of_phase_process_class mPhase;
include/d/actor/d_a_boomerang.h
+1 -1
View File
@@ -116,7 +116,7 @@ public:
void offStateFlg0(daBoomerang_FLG0 flag) { m_stateFlg0 &= ~flag; }
u32 getReturnFlg() const { return checkStateFlg0(FLG0_1); }
void onWindCatch() { onStateFlg0(WIND_CATCH); }
bool checkForceDelete() const { return m_forceDelete; }
u8 checkForceDelete() const { return m_forceDelete; }
void onForceDelete() { m_forceDelete = true; }
bool checkCharge() const { return true; }
void setThrow() { fopAcM_SetParam(this, 1); }
include/d/actor/d_a_canoe.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
J3DModel* getModel() { return mpModel; }
MtxP getModelMtx() { return mpModel->getBaseTRMtx(); }
bool checkTandem() { return fopAcM_GetParam(this) == 2; }
bool checkJumpRideFlg() { return mJumpRideFlg; }
u8 checkJumpRideFlg() const { return mJumpRideFlg; }
void incShapeOffsetY(f32 offset) { mShapeOffsetY += offset; }
void incShapeAngleZ(s16 incZ) { shape_angle.z += incZ; }
void onRodID(fpc_ProcID i_rodID) { mRodID = i_rodID; }
include/d/actor/d_a_cow.h
+10 -10
View File
@@ -194,16 +194,16 @@ public:
daCow_c* getCowP() { return mCowP; }
// cLib_onBit<u16>(mFlags, (mask))
void setCrazyBeforeCatch() { mFlags |= Flag_CrazyBeforeCatch; }
void setCrazyCatch() { mFlags |= Flag_CrazyCatch; }
void setCrazyDash() { mFlags |= Flag_CrazyDash; }
void setCrazyThrowLeft() { mFlags |= Flag_CrazyThrowLeft; }
void setCrazyThrowRight() { mFlags |= Flag_CrazyThrowRight; }
void setCrazyReady() { mFlags |= Flag_CrazyReady; }
void setCrazyGo() { mFlags |= Flag_CrazyGo; }
void setNaderu() { mFlags |= Flag_Naderu; }
void setNaderuFinish() { mFlags |= Flag_NaderuFinish; }
void setCrazyReadyDrawOn() { mFlags |= Flag_CrazyReadyDrawOn; }
void setCrazyBeforeCatch() { mFlags |= (u16)Flag_CrazyBeforeCatch; }
void setCrazyCatch() { mFlags |= (u16)Flag_CrazyCatch; }
void setCrazyDash() { mFlags |= (u16)Flag_CrazyDash; }
void setCrazyThrowLeft() { mFlags |= (u16)Flag_CrazyThrowLeft; }
void setCrazyThrowRight() { mFlags |= (u16)Flag_CrazyThrowRight; }
void setCrazyReady() { mFlags |= (u16)Flag_CrazyReady; }
void setCrazyGo() { mFlags |= (u16)Flag_CrazyGo; }
void setNaderu() { mFlags |= (u16)Flag_Naderu; }
void setNaderuFinish() { mFlags |= (u16)Flag_NaderuFinish; }
void setCrazyReadyDrawOn() { mFlags |= (u16)Flag_CrazyReadyDrawOn; }
u8 getCowIn() { return mCowIn; }
u8 getNoNearCheckTimer() { return mNoNearCheckTimer; }
include/d/actor/d_a_cstatue.h
+16 -16
View File
@@ -5,22 +5,6 @@
#include "d/d_particle_copoly.h"
#include "f_op/f_op_actor.h"
enum daCstatue_FLG0 {
daCstatue_FLG0_1 = 0x1,
daCstatue_FLG0_2 = 0x2,
daCstatue_FLG0_4 = 0x4,
daCstatue_FLG0_8 = 0x8,
daCstatue_FLG0_10 = 0x10,
daCstatue_FLG0_20 = 0x20,
daCstatue_FLG0_Demo = 0x40,
daCstatue_FLG0_80 = 0x80,
daCstatue_FLG0_100 = 0x100,
daCstatue_FLG0_200 = 0x200,
daCstatue_FLG0_400 = 0x400,
daCstatue_FLG0_800 = 0x800,
daCstatue_FLG0_1000 = 0x1000,
};
enum daCstatue_MoveMode {
daCstatue_MoveMode_0,
daCstatue_MoveMode_1,
@@ -58,6 +42,22 @@ enum daCstatueType {
*
*/
class daCstatue_c : public fopAc_ac_c {
enum daCstatue_FLG0 {
daCstatue_FLG0_1 = 0x1,
daCstatue_FLG0_2 = 0x2,
daCstatue_FLG0_4 = 0x4,
daCstatue_FLG0_8 = 0x8,
daCstatue_FLG0_10 = 0x10,
daCstatue_FLG0_20 = 0x20,
daCstatue_FLG0_Demo = 0x40,
daCstatue_FLG0_80 = 0x80,
daCstatue_FLG0_100 = 0x100,
daCstatue_FLG0_200 = 0x200,
daCstatue_FLG0_400 = 0x400,
daCstatue_FLG0_800 = 0x800,
daCstatue_FLG0_1000 = 0x1000,
};
public:
void atHitCallback(fopAc_ac_c*);
int createHeap();
include/d/actor/d_a_horse.h
+1 -1
View File
@@ -277,7 +277,7 @@ public:
u32 checkCutTurnCancel() const { return checkEndResetStateFlg0(ERFLG0_CUT_TURN_CANCEL); }
u32 checkTurnCancelKeep() const { return checkStateFlg0(FLG0_TURN_CANCEL_KEEP); }
u32 checkRodeoLeft() const { return checkStateFlg0(FLG0_RODEO_LEFT); }
u32 checkHorseCallWait() const { return checkStateFlg0(FLG0_NO_DRAW_WAIT); }
u32 checkHorseCallWait() { return checkStateFlg0(FLG0_NO_DRAW_WAIT); }
BOOL checkTurn() const { return m_procID == PROC_TURN_e && field_0x1720 == 0; }
BOOL checkStop() const { return m_procID == PROC_STOP_e; }
BOOL checkJump() const { return m_procID == PROC_JUMP_e; }
include/d/actor/d_a_ni.h
+1 -2
View File
@@ -58,8 +58,7 @@ public:
mDoMtx_stack_c::multVecZero(&newPos);
current.pos = newPos;
old.pos = current.pos;
speed.y = 0.0f;
speedF = 0.0f;
speedF = speed.y = 0.0f;
mpMorf->getModel()->setBaseTRMtx(mtx);
}
include/d/actor/d_a_npc.h
+6
View File
@@ -817,6 +817,12 @@ STATIC_ASSERT(sizeof(daNpcT_c) == 0xE40);
fopAcM_OnCondition(ptr, fopAcCnd_INIT_e); \
}
#if DEBUG
#define NpcT_CHK_ACTION(ClassName) chkAction(&ClassName::test)
#else
#define NpcT_CHK_ACTION(ClassName) FALSE
#endif
BOOL daNpcT_chkEvtBit(u32 i_idx);
BOOL daNpcT_chkPointInArea(cXyz param_0, cXyz param_1, cXyz param_2, s16 param_3, BOOL param_4);
u8 daNpcT_getDistTableIdx(int param_0, int param_1);
include/d/actor/d_a_npc4.h
+1 -1
View File
@@ -388,7 +388,7 @@ public:
}
BOOL checkHide() { return mHide || (mTwilight && !dComIfGs_wolfeye_effect_check()); }
void setIntDemander(fopAc_ac_c* i_actor) { field_0x824.entry(i_actor); }
void setIntFlowNodeNo(int i_flowNodeNo) { mFlowNodeNo = i_flowNodeNo; }
void setIntFlowNodeNo(s32 i_flowNodeNo) { mFlowNodeNo = i_flowNodeNo; }
void setCutType(int i_cutType) { mCutType = i_cutType; }
void onInterrupt(u8 param_0) { field_0x9ef = param_0; }
void onHide() { mHide = true; }
include/d/actor/d_a_npc_aru.h
+5 -7
View File
@@ -153,7 +153,9 @@ public:
char** i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {}
i_arcNames) {
OS_REPORT("|%06d:%x|daNpc_Aru_c -> コンストラクト\n", g_Counter.mCounter0, this);
}
u16 getEyeballMaterialNo() { return ARU_EYEBALL_M; }
s32 getHeadJointNo() { return JNT_HEAD; }
s32 getNeckJointNo() { return JNT_NECK; }
@@ -165,13 +167,9 @@ public:
int getFlowNodeNo() {
u16 nodeNo = home.angle.x;
if (nodeNo == 0xffff) {
return -1;
}
return nodeNo;
return (nodeNo == 0xFFFF) ? -1 : nodeNo;
}
int getPathID() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
u8 getPathID() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
void setLastIn() { mLastGoatIn = true; }
static char* mCutNameList[7];
include/d/actor/d_a_npc_besu.h
+1
View File
@@ -104,6 +104,7 @@ public:
int nurse(void*);
int giveHotWater(void*);
int talk(void*);
BOOL test(void* param_0);
daNpc_Besu_c(
daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
daNpcT_motionAnmData_c const* i_motionAnmData,
include/d/actor/d_a_npc_bou.h
+1 -2
View File
@@ -152,8 +152,7 @@ public:
BOOL speakTo() {
if (mType == 4) {
if (current.pos.absXZ(daPy_getPlayerActorClass()->current.pos) < 1100.0f && strlen(mpEvtData[5].eventName) != 0) {
u32 len = strlen(mpArcNames[mpEvtData[5].num]);
if (len != 0) {
if (strlen(mpArcNames[mpEvtData[5].num]) != 0) {
eventInfo.setArchiveName(mpArcNames[mpEvtData[5].num]);
dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName());
}
include/d/actor/d_a_npc_kn.h
+2
View File
@@ -217,6 +217,8 @@ public:
s8 getActionMode() { return mActionMode; }
void setTalkFlag(u8 i_flag) { field_0x15bd = i_flag; }
bool checkBattleMode() { return true; }
int create();
int CreateHeap();
include/d/actor/d_a_npc_kolin.h
+1 -2
View File
@@ -146,8 +146,7 @@ public:
}
if (strlen(mpEvtData[var_r29].eventName) != 0) {
u32 len = strlen(mpArcNames[mpEvtData[var_r29].num]);
if (len != 0) {
if (strlen(mpArcNames[mpEvtData[var_r29].num]) != 0) {
eventInfo.setArchiveName(mpArcNames[mpEvtData[var_r29].num]);
dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName());
}
include/d/actor/d_a_npc_maro.h
+12 -6
View File
@@ -7,7 +7,7 @@
struct daNpc_Maro_HIOParam {
/* 0x00 */ daNpcT_HIOParam common;
/* 0x8C */ s16 field_0x8c;
/* 0x8C */ s16 tease_interval;
};
class daNpc_Maro_Param_c {
@@ -125,6 +125,7 @@ public:
int arrowTutorial(void*);
int talk(void*);
int shop(void*);
BOOL test(void*);
daNpc_Maro_c(
daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
daNpcT_motionAnmData_c const* i_motionAnmData,
@@ -169,16 +170,21 @@ public:
static char* mCutNameList[17];
static cutFunc mCutList[17];
u8 getGroupId() {
return (fopAcM_GetParam(this) & 0xF0000000) >> 28;
}
u8 getPathID() {
return (fopAcM_GetParam(this) & 0xFF00) >> 8;
}
int getFlowNodeNo() {
u16 nodeNo = home.angle.x;
if (nodeNo == 0xffff) {
return -1;
}
return nodeNo;
return (nodeNo == 0xFFFF) ? -1 : nodeNo;
}
u8 getMaxNumItem() {
return (fopAcM_GetParam(this) & 0xf000000) >> 0x18;
return (fopAcM_GetParam(this) & 0xF000000) >> 24;
}
private:
include/d/actor/d_a_obj_fallobj.h
+5 -3
View File
@@ -44,9 +44,11 @@ public:
int Draw();
int Delete();
u32 getTime() { return fopAcM_GetParamBit(this, 8, 8); }
u32 getPos() { return fopAcM_GetParamBit(this, 0x14, 8); }
static BOOL checkFallStart(fopAc_ac_c* actor) { return actor->speed.y != 0.0f; }
u8 getTime() { return fopAcM_GetParamBit(this, 8, 8); }
u8 getPos() { return fopAcM_GetParamBit(this, 0x14, 8); }
bool checkFallStart() {
return this->speed.y != 0.0f;
};
private:
/* 0x5A0 */ request_of_phase_process_class mPhaseReq;
include/d/actor/d_a_obj_gra2.h
+5 -5
View File
@@ -228,11 +228,11 @@ public:
cXyz getAttentionPos(fopAc_ac_c*);
int standWaitJump(void*);
bool checkNpcObjGra() { return mMode == 1; }
void setCrazyDash() { field_0xa48 |= 4; }
void setCrazyCatch() { field_0xa48 |= 2; }
void setCrazyThrowLeft() { field_0xa48 |= 8; }
void setCrazyThrowRight() { field_0xa48 |= 0x10; }
u8 checkNpcObjGra() { return mMode == 1; }
void setCrazyDash() { field_0xa48 |= (u16)4; }
void setCrazyCatch() { field_0xa48 |= (u16)2; }
void setCrazyThrowLeft() { field_0xa48 |= (u16)8; }
void setCrazyThrowRight() { field_0xa48 |= (u16)0x10; }
static MotionFunc mBaseMotionList[22];
static MotionFunc mFaceMotionList[14];
include/d/actor/d_a_obj_kamakiri.h
+3 -5
View File
@@ -99,13 +99,11 @@ public:
virtual ~daObj_KamHIO_c() {}
void genMessage(JORMContext* context) {
// Golden insect (stag beetle)
context->genLabel("黄金蟲(カブト)", 0x80000001, 0, NULL, -1, -1, 0x200, 0x18);
context->genLabel("黄金蟲(カブト)", 0x80000001);
// Model scale (male)
context->genSlider("モデルスケール(オス)", &mModelScaleMale, 0.1f, 4.0f, 0, NULL, -1, -1, 0x200,
0x18);
context->genSlider("モデルスケール(オス)", &mModelScaleMale, 0.1f, 4.0f);
// Model scale (female)
context->genSlider("モデルスケール(メス)", &mModelScaleFemale, 0.1f, 4.0f, 0, NULL, -1, -1, 0x200,
0x18);
context->genSlider("モデルスケール(メス)", &mModelScaleFemale, 0.1f, 4.0f);
}
s8 field_0x4;
include/d/actor/d_a_obj_katatsumuri.h
+3 -5
View File
@@ -100,13 +100,11 @@ public:
void genMessage(JORMContext* ctx) {
// Golden Snail
ctx->genLabel("黄金蟲(カタツムリ)", 0x80000001, 0, NULL, -1, -1, 0x200, 24);
ctx->genLabel("黄金蟲(カタツムリ)", 0x80000001);
// Model scale (male)
ctx->genSlider("モデルスケール(オス)", &this->mScaleMale, 0.1f, 4.0f, 0, NULL, -1, -1,
0x200, 24);
ctx->genSlider("モデルスケール(オス)", &this->mScaleMale, 0.1f, 4.0f);
// Model scale (female)
ctx->genSlider("モデルスケール(メス)", &this->mScaleFemale, 0.1f, 4.0f, 0, NULL, -1, -1,
0x200, 24);
ctx->genSlider("モデルスケール(メス)", &this->mScaleFemale, 0.1f, 4.0f);
}
s8 field_0x4;
include/d/actor/d_a_obj_sekizoa.h
+14 -25
View File
@@ -229,45 +229,34 @@ public:
}
u8 getType() {
int prm = fopAcM_GetParam(this) >> 0x1C;
int prm = (fopAcM_GetParam(this) & 0xF0000000) >> 28;
u8 type;
switch (argument) {
case 0:
switch (prm) {
case 1:
type = 2;
break;
return 2;
case 2:
type = 4;
break;
return 4;
case 3:
type = 6;
break;
return 6;
default:
type = 0;
break;
return 0;
}
break;
case 1:
switch (prm) {
case 1:
type = 3;
break;
return 3;
case 2:
type = 5;
break;
return 5;
default:
type = 1;
break;
return 1;
}
break;
default:
type = 0;
break;
return 0;
}
return type;
}
u8 getBitSW() { return fopAcM_GetParam(this) & 0xff; }
@@ -304,11 +293,11 @@ public:
/* 0x1124 */ daNpcT_Path_c mPath;
/* 0x114C */ cXyz mCXyzJump;
/* 0x1158 */ int mLatencyTime;
/* 0x115C */ float mJumpHeight;
/* 0x1160 */ float mJumpSpeed;
/* 0x1164 */ float mColsetBlend;
/* 0x1168 */ float mGoalStatueTurnSpeed;
/* 0x116C */ float mGoalStatueAngle;
/* 0x115C */ f32 mJumpHeight;
/* 0x1160 */ f32 mJumpSpeed;
/* 0x1164 */ f32 mColsetBlend;
/* 0x1168 */ f32 mGoalStatueTurnSpeed;
/* 0x116C */ f32 mGoalStatueAngle;
/* 0x1170 */ s16 mPlayerDirection;
/* 0x1172 */ u8 mReset;
/* 0x1173 */ u8 mSetWolfHowling;
include/d/actor/d_a_obj_swhang.h
+2 -1
View File
@@ -65,7 +65,7 @@ public:
cXyz getHangPos() { return mHangPos; }
void setHangPlayer() { mHangPlayer = 1; }
u8 getType() { return mType; }
int getType() { return mType; }
u8 getType_private() { return fopAcM_GetParamBit(this, 28, 4); }
u8 checkType() { return fopAcM_GetParamBit(this, 25, 1); }
u8 getSwNo() { return fopAcM_GetParamBit(this, 0, 8); }
@@ -76,6 +76,7 @@ public:
void clrFlag() { mFlags = 0; }
void onFlag(u16 flag) { mFlags |= flag; }
u16 checkFlag(u16 flag) { return mFlags & flag; }
s16 getAngleY() { return shape_angle.y; }
private:
/* 0x5B0 */ request_of_phase_process_class mPhase;
include/d/actor/d_a_obj_togeTrap.h
+9 -13
View File
@@ -71,26 +71,22 @@ public:
#if DEBUG
void genMessage(JORMContext* ctx) {
// Speed
ctx->genLabel("--- 速 出現時---", 0, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
ctx->genLabel("--- 速 出現時---", 0);
// Initial speed
ctx->genSlider("初速", &mInitialSpeed, 0.0f, 10000.0f, 0, NULL, 0xffff, 0xffff, 0x200,
0x18);
ctx->genSlider("初速", &mInitialSpeed, 0.0f, 10000.0f);
// Max
ctx->genSlider("最大", &mMaxSpeed, 0.0f, 10000.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
ctx->genSlider("最大", &mMaxSpeed, 0.0f, 10000.0f);
// Speed when pulling
ctx->genLabel("--- 速度 引っ込み時---", 0, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
ctx->genSlider("初速", &mInitialDownSpeed, 0.0, 10000.0, 0, NULL, 0xffff, 0xffff, 0x200,
0x18);
ctx->genLabel("--- 速度 引っ込み時---", 0);
ctx->genSlider("初速", &mInitialDownSpeed, 0.0, 10000.0);
// Max
ctx->genSlider("最大", &mMaxDownSpeed, 0.0f, 10000.0f, 0, NULL, 0xffff, 0xffff, 0x200,
0x18);
ctx->genSlider("最大", &mMaxDownSpeed, 0.0f, 10000.0f);
// Range
ctx->genSlider("範囲", &mRange, 0.1f, 1000.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
ctx->genSlider("範囲", &mRange, 0.1f, 1000.0f);
// Spinner speed
ctx->genSlider("スピナｰ速度", &mSpinnerSpeed, 0.0f, 100.0f, 0, NULL, 0xffff, 0xffff, 0x200,
0x18);
ctx->genSlider("スピナｰ速度", &mSpinnerSpeed, 0.0f, 100.0f);
// Vibration
ctx->startComboBox("振動", &mVibration, 0, NULL, 0xffff, 0xffff, 0x100, 0x1a);
ctx->startComboBox("振動", &mVibration);
// Strength 1-8
ctx->genComboBoxItem("強さ１", 1);
ctx->genComboBoxItem("強さ２", 2);
include/d/actor/d_a_obj_wchain.h
+10 -6
View File
@@ -37,21 +37,25 @@ public:
cXyz& getJumpAimPos() { return eyePos; }
cXyz& getTopPos() { return mTopPos; }
cXyz& getRoofPos() { return mRoofPos; }
f32 getPullLength() { return mPullLength; }
f32 getPullLength() const { return mPullLength; }
void setPullLength(f32 i_length) { mPullLength = i_length; }
f32 getInitOutLength() { return mInitOutLength; }
f32 getInitOutLength() const { return mInitOutLength; }
f32 getRealRoofY() { return mRealRoofY; }
f32 getMoveDisRate() { return mPullLength * 0.01f; }
f32 getLastOffset() { return 6.0f; }
f32 getDownOffset() { return 100.0f; }
f32 getSwitchOffset() { return 94.0f; }
static f32 getLastOffset() { return 6.0f; }
static f32 getDownOffset() { return 100.0f; }
static f32 getSwitchOffset() { return 94.0f; }
u8 getSwitchNum() { return mSw; }
void onRide() { mRide = true; }
void offRide() { mRide = false; }
bool checkRideFlg() { return mRide; }
void onEndFlg() { mEnd = true; }
bool getEndFlg() { return mEnd; }
void onNowSwitchFlg() { mDown = mNowSwitch = true; }
void onNowSwitchFlg() {
mNowSwitch = true;
mDown = true;
}
private:
/* 0x568 */ request_of_phase_process_class mPhaseReq;
include/d/actor/d_a_obj_wind_stone.h
+1 -1
View File
@@ -31,7 +31,7 @@ public:
u8 getGoldWolfIdx();
s8 getTuneId() { return fopAcM_GetParamBit(this, 4, 4); }
int getNextSceneId() { return fopAcM_GetParamBit(this, 0, 4); }
s8 getNextSceneId() { return fopAcM_GetParamBit(this, 0, 4); }
u32 getSwBit1() { return home.angle.x & 0xff; }
u32 getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); }
u32 getDelEveFlgId() { return fopAcM_GetParamBit(this, 0x10, 0x10); }
include/d/actor/d_a_obj_yobikusa.h
+4 -1
View File
@@ -82,7 +82,10 @@ public:
const attributes* attr() const { return &M_attr; }
int getType() { return argument & 0x7F; }
u8 getPathID() { return fopAcM_GetParam(this); }
bool isPlayerCorrect() { return (s8)(u8)(fopAcM_GetParam(this) >> 8) > 0; }
bool isPlayerCorrect() {
s8 var_r31 = (fopAcM_GetParam(this) >> 8) & 0xFF;
return var_r31 > 0;
}
private:
/* 0x568 */ J3DModel* mpActiveModel;
include/d/actor/d_a_player.h
+256 -258
View File
@@ -14,28 +14,27 @@ public:
virtual ~daPy_sightPacket_c() {}
void setSight();
void setSightImage(ResTIMG*);
void setSightImage(ResTIMG* i_img);
bool getDrawFlg() { return mDrawFlag; }
u8 getDrawFlg() { return mDrawFlag; }
void onDrawFlg() { mDrawFlag = true; }
void offDrawFlg() { mDrawFlag = false; }
void setPos(const cXyz* i_pos) { mPos = *i_pos; }
cXyz* getPosP() { return &mPos; }
/* 0x04 */ bool mDrawFlag;
/* 0x05 */ u8 field_0x5[3];
/* 0x04 */ u8 mDrawFlag;
/* 0x08 */ cXyz mPos;
/* 0x14 */ Mtx field_0x14;
/* 0x14 */ Mtx mProjMtx;
/* 0x44 */ ResTIMG* mpImg;
/* 0x48 */ u8* mpData;
};
class daPy_boomerangMove_c {
public:
void initOffset(cXyz const*);
void initOffset(cXyz const* xyz, dCcD_GObjInf const*) { initOffset(xyz); }
int posMove(cXyz*, s16*, fopAc_ac_c*, s16);
void bgCheckAfterOffset(cXyz const*);
void initOffset(const cXyz* i_pos);
void initOffset(const cXyz* i_pos, const dCcD_GObjInf*) { initOffset(i_pos); }
int posMove(cXyz* o_pos, s16* o_rotY, fopAc_ac_c* i_objActor, s16 i_rotStep);
void bgCheckAfterOffset(const cXyz* i_pos);
static void initDropAngleY() { m_dropAngleY = 0x4000; }
static void offEventKeepFlg() { m_eventKeepFlg = 0; }
@@ -47,8 +46,8 @@ public:
private:
/* 0x0 */ u8 field_0x0;
/* 0x2 */ s16 field_0x2;
/* 0x4 */ f32 field_0x4;
/* 0x8 */ f32 field_0x8;
/* 0x4 */ f32 m_offsetY;
/* 0x8 */ f32 m_offsetXZ;
}; // Size: 0xC
class daPy_anmHeap_c {
@@ -61,24 +60,24 @@ public:
HEAP_TYPE_5,
};
daPy_anmHeap_c(u32 param_0 = 0);
daPy_anmHeap_c(u32 i_bufferSize = 0);
~daPy_anmHeap_c();
void initData();
void* mallocBuffer();
void createHeap(daPy_anmHeap_c::daAlinkHEAP_TYPE);
void* loadData(u16);
void* loadDataIdx(u16);
void* loadDataPriIdx(u16);
void* loadDataDemoRID(u16, u16);
void createHeap(daAlinkHEAP_TYPE i_heapType);
void* loadData(u16 i_resId);
void* loadDataIdx(u16 i_resId);
void* loadDataPriIdx(u16 i_resId);
void* loadDataDemoRID(u16 i_resID, u16 i_arcNo);
JKRHeap* setAnimeHeap();
u16 getIdx() const { return mIdx; }
void resetIdx() { mIdx = 0xffff; }
void resetPriIdx() { mPriIdx = 0xffff; }
void resetArcNo() { mArcNo = 0xffff; }
void resetIdx() { mIdx = 0xFFFF; }
void resetPriIdx() { mPriIdx = 0xFFFF; }
void resetArcNo() { mArcNo = 0xFFFF; }
bool checkNoSetArcNo() const { return mArcNo == 0xFFFF; }
void setBufferSize(u32 size) { mBufferSize = size; }
void setBuffer(u8* buf) { mBuffer = buf; }
void setBufferSize(u32 i_size) { mBufferSize = i_size; }
void setBuffer(u8* i_buffer) { mBuffer = i_buffer; }
u32 getBufferSize() { return mBufferSize; }
u8* getBuffer() { return mBuffer; }
bool checkNoSetIdx() const { return mIdx == 0xFFFF; }
@@ -86,11 +85,9 @@ public:
u16 getArcNo() const { return mArcNo; }
void setIdx(u16 i_idx) { mIdx = i_idx; }
private:
/* 0x00 */ u16 mIdx;
/* 0x02 */ u16 mPriIdx;
/* 0x04 */ u16 mArcNo;
/* 0x06 */ u16 field_0x06;
/* 0x08 */ u32 mBufferSize;
/* 0x0C */ u8* mBuffer;
/* 0x10 */ JKRSolidHeap* mAnimeHeap;
@@ -101,11 +98,11 @@ public:
daPy_actorKeep_c() { clearData(); }
void setActor();
void setData(fopAc_ac_c*);
void setData(fopAc_ac_c* i_actor);
void clearData();
fpc_ProcID getID() const { return mID; }
void setID(fpc_ProcID id) { mID = id; }
void setID(fpc_ProcID i_id) { mID = i_id; }
fopAc_ac_c* getActor() const { return mActor; }
fopAc_ac_c* getActorConst() const { return mActor; }
@@ -120,10 +117,10 @@ public:
daPy_frameCtrl_c() {}
bool checkAnmEnd();
void updateFrame();
void setFrameCtrl(u8, short, short, f32, f32);
void setFrameCtrl(u8 i_attribute, s16 i_start, s16 i_end, f32 i_rate, f32 i_frame);
u16 getEndFlg() { return mEndFlg; }
u16 getNowSetFlg() { return mNowSetFlg; }
u16 getEndFlg() const { return mEndFlg; }
u16 getNowSetFlg() const { return mNowSetFlg; }
void onEndFlg() { mEndFlg = 1; }
void onNowSetFlg() { mNowSetFlg = 1; }
void offNowSetFlg() { mNowSetFlg = 0; }
@@ -300,8 +297,7 @@ class daPy_py_c : public fopAc_ac_c {
public:
/* 0x0568 */ u8 mCutType;
/* 0x0569 */ u8 mComboCutCount;
/* 0x056A */ u8 mSpecialMode; // maybe needs better name
/* 0x056B */ u8 field_0x56b;
/* 0x056A */ u8 mMode;
/* 0x056C */ s16 mDamageTimer;
/* 0x056E */ u16 mSwordUpTimer;
/* 0x0570 */ u32 mNoResetFlg0;
@@ -313,8 +309,8 @@ public:
/* 0x0588 */ u32 mEndResetFlg0;
/* 0x058C */ u32 mEndResetFlg1;
/* 0x0590 */ u32 mEndResetFlg2;
/* 0x0594 */ f32 field_0x594;
/* 0x0598 */ f32 field_0x598;
/* 0x0594 */ f32 mMaxSpeed;
/* 0x0598 */ f32 mHeight;
/* 0x059C */ csXyz mBodyAngle;
/* 0x05A4 */ cXyz mHeadTopPos;
/* 0x05B0 */ cXyz mItemPos;
@@ -323,24 +319,24 @@ public:
/* 0x05D4 */ cXyz mRightHandPos;
/* 0x05E0 */ cXyz mLeftFootPos;
/* 0x05EC */ cXyz mRightFootPos;
/* 0x05F8 */ cXyz field_0x5f8;
/* 0x05F8 */ cXyz mViewerCurrentPos;
/* 0x0604 */ daPy_demo_c mDemo;
public:
enum daPy_FLG0 {
FLG0_UNK_40000000 = 0x40000000,
FLG0_HEAVY_STATE = 0x40000000,
FLG0_EQUIP_HVY_BOOTS = 0x2000000,
FLG0_PLAYER_NO_DRAW = 0x8000000,
FLG0_UNK_10000000 = 0x10000000,
FLG0_UNK_1000000 = 0x1000000,
FLG0_UNDERWATER = 0x800000,
FLG0_WATER_IN_MOVE = 0x800000,
FLG0_UNK_400000 = 0x400000,
FLG0_UNK_200000 = 0x200000,
FLG0_GORON_UP_STOP_CANCEL = 0x200000,
FLG0_UNK_100000 = 0x100000,
FLG0_UNK_80000 = 0x80000,
FLG0_FAST_SWORD_CUT = 0x80000,
FLG0_UNK_40000 = 0x40000,
FLG0_DK_CAUGHT = 0x20000,
FLG0_UNK_10000 = 0x10000,
FLG0_DK_CAUGHT2 = 0x20000,
FLG0_DEMO_STREAM_ACCEPT = 0x10000,
FLG0_UNK_8000 = 0x8000,
FLG0_UNK_4000 = 0x4000,
FLG0_UNK_2000 = 0x2000,
@@ -349,24 +345,20 @@ public:
FLG0_UNK_400 = 0x400,
FLG0_SWIM_UP = 0x100,
FLG0_UNK_80 = 0x80,
FLG0_UNK_40 = 0x40,
FLG0_CUT_AT_FLG = 0x40,
FLG0_UNK_20 = 0x20,
FLG0_UNK_10 = 0x10,
FLG0_UNK_8 = 0x8,
FLG0_MIDNA_RIDE = 4,
FLG0_UNK_2 = 2,
FLG0_HVY_STATE = FLG0_UNK_40000000 | FLG0_EQUIP_HVY_BOOTS | FLG0_DK_CAUGHT,
FLG0_UNK_14000 = 0x14000,
FLG0_UNK_10400 = 0x10400,
FLG0_UNK_18 = FLG0_UNK_10 | FLG0_UNK_8,
};
enum daPy_FLG1 {
FLG1_UNK_80000000 = 0x80000000,
FLG1_ICE_FREEZE = 0x40000000,
FLG1_FREEZE_DAMAGE = 0x40000000,
FLG1_UNK_20000000 = 0x20000000,
FLG1_UNK_10000000 = 0x10000000,
FLG1_UNK_8000000 = 0x8000000,
FLG1_UNK_4000000 = 0x4000000,
FLG1_IS_WOLF = 0x2000000,
FLG1_UNK_1000000 = 0x1000000,
@@ -378,7 +370,7 @@ public:
FLG1_UNK_40000 = 0x40000,
FLG1_UNK_20000 = 0x20000,
FLG1_UNK_10000 = 0x10000,
FLG1_UNK_8000 = 0x8000,
FLG1_FISHING_ROD_CASTING_END = 0x8000,
FLG1_THROW_DAMAGE = 0x4000,
FLG1_UNK_2000 = 0x2000,
FLG1_UNK_1000 = 0x1000,
@@ -393,22 +385,19 @@ public:
FLG1_UNK_4 = 4,
FLG1_UNK_2 = 2,
FLG1_DK_CAUGHT = 1,
FLG1_UNK_1800 = 0x1800,
FLG1_UNK_10100000 = FLG1_UNK_10000000 | FLG1_UNK_100000,
};
enum daPy_FLG2 {
FLG2_HORSE_ZELDA = 0x40000000,
FLG2_UNK_20000000 = 0x20000000,
FLG2_UNK_10000000 = 0x10000000,
FLG2_FISHING_CAST_WAIT = 0x20000000,
FLG2_KANDELAAR_LIGHT_OFF = 0x10000000,
FLG2_UNK_4080000 = 0x4080000,
FLG2_UNK_4000000 = 0x4000000,
FLG2_UNK_2080000 = 0x2080000,
FLG2_UNK_2000000 = 0x2000000,
FLG2_UNK_8000000 = 0x8000000,
FLG2_UNK_1000000 = 0x1000000,
FLG2_BOAR_SINGLE_BATTLE = 0x800000,
FLG2_BOAR_SINGLE_BATTLE_2ND = 0x1000000,
FLG2_BOAR_SINGLE_BATTLE_1ST = 0x800000,
FLG2_STATUS_WINDOW_DRAW = 0x400000,
FLG2_UNK_280000 = 0x280000,
FLG2_UNK_200000 = 0x200000,
@@ -417,12 +406,12 @@ public:
FLG2_FORCE_GAMEOVER = 0x40000,
FLG2_UNK_20000 = 0x20000,
FLG2_WOLF_DASH_AUTO_JUMP = 0x10000,
FLG2_SCN_CHG_START = 0x8000,
FLG2_UNK_4000 = 0x4000,
FLG2_SCENE_CHANGE_START = 0x8000,
FLG2_FOG_FADE = 0x4000,
FLG2_UNK_2000 = 0x2000,
FLG2_PRESSED_DAMAGE = 0x1000,
FLG2_UNK_800 = 0x800,
FLG2_PLAYER_SHADOW = 0x400,
FLG2_PLAYER_SHADOW_NO_DRAW = 0x400,
FLG2_UNK_200 = 0x200,
FLG2_UNK_100 = 0x100,
FLG2_UNK_80 = 0x80,
@@ -431,11 +420,8 @@ public:
FLG2_UNK_10 = 0x10,
FLG2_UNK_8 = 8,
FLG2_UNK_4 = 4,
FLG2_UNK_2 = 2,
FLG2_COMBO_RESERB = 2,
FLG2_UNK_1 = 1,
FLG2_UNK_58 = FLG2_WOLF_ENEMY_HANG_BITE | FLG2_UNK_10 | FLG2_UNK_8,
FLG2_UNK_10000001 = FLG2_UNK_10000000 | FLG2_UNK_1,
};
enum daPy_FLG3 {
@@ -460,13 +446,13 @@ public:
FLG3_UNK_1000 = 0x1000,
FLG3_UNK_800 = 0x800,
FLG3_UNK_400 = 0x400,
FLG3_UNK_200 = 0x200,
FLG3_UNK_100 = 0x100,
FLG3_UNK_80 = 0x80,
FLG3_UNK_40 = 0x40,
FL3_TRANING_CUT_BACK = 0x20,
FLG3_UNK_10 = 0x10,
FLG3_UNK_8 = 8,
FLG3_TRANING_CUT_LARGE_JUMP = 0x200,
FLG3_TRANING_CUT_LARGE_TURN = 0x100,
FLG3_TRANING_CUT_FAST = 0x80,
FLG3_TRANING_CUT_HEAD = 0x40,
FLG3_TRANING_CUT_BACK = 0x20,
FLG3_TRANING_CUT_DOWN = 0x10,
FLG3_TRANING_SHIELD_ATTACK = 8,
FLG3_UNK_4 = 4,
FLG3_UNK_1 = 1,
};
@@ -477,21 +463,21 @@ public:
ERFLG0_UNK_20000000 = 0x20000000,
ERFLG0_WOLF_FCHAIN_PULL = 0x10000000,
ERFLG0_UNK_8000000 = 0x8000000,
ERFLG0_UNK_4000000 = 0x4000000,
ERFLG0_FISHING_RELEASE = 0x4000000,
ERFLG0_BOSS_ROOM_WAIT = 0x2000000,
ERFLG0_ENEMY_DEAD = 0x1000000,
ERFLG0_UNK_800000 = 0x800000,
ERFLG0_BEE_FOLLOW = 0x400000,
ERFLG0_UNK_200000 = 0x200000,
ERFLG0_LEAF_SE = 0x200000,
ERFLG0_UNK_100000 = 0x100000,
ERFLG0_SINGLE_BOAR_AVOID = 0x80000,
ERFLG0_FISHING_ROD_GET_FISH = 0x40000,
ERFLG0_UNK_20000 = 0x20000,
ERFLG0_UNK_10000 = 0x10000,
ERFLG0_FISHING_ROD_REEL_END = 0x20000,
ERFLG0_FISHING_HIT = 0x10000,
ERFLG0_UNK_4000 = 0x4000,
ERFLG0_UNK_2000 = 0x2000,
ERFLG0_UNK_1000 = 0x1000,
ERFLG0_UNK_400 = 0x400,
ERFLG0_NECK_SEARCH_WIDE = 0x400,
ERFLG0_FORCE_AUTO_JUMP = 0x200,
ERFLG0_UNK_100 = 0x100,
ERFLG0_UNK_80 = 0x80,
@@ -500,31 +486,31 @@ public:
ERFLG0_NOT_HANG = 0x10,
ERFLG0_UNK_8 = 8,
ERFLG0_UNK_4 = 4,
ERFLG0_UNK_2 = 2,
ERFLG0_FORCE_WOLF_CHANGE = 2,
ERFLG0_UNK_1 = 1,
};
enum daPy_ERFLG1 {
ERFLG1_GANON_FINISH = 0x80000000,
ERFLG1_UNK_40000000 = 0x40000000,
ERFLG1_UNK_20000000 = 0x20000000,
ERFLG1_UNK_10000000 = 0x10000000,
ERFLG1_SHIELD_BACKBONE = 0x80000000,
ERFLG1_SWORD_TRIGGER_NON = 0x40000000,
ERFLG1_CANOE_ITEM_CANCEL = 0x20000000,
ERFLG1_DO_PUT_EMPHASYS = 0x10000000,
ERFLG1_LARGE_DAMAGE_UP_STOP = 0x8000000,
ERFLG1_UNK_4000000 = 0x4000000,
ERFLG1_UNK_2000000 = 0x2000000,
ERFLG1_UNK_1000000 = 0x1000000,
ERFLG1_DO_EXCHANGE_PUT_IN = 0x4000000,
ERFLG1_CHAIN_PULL_END = 0x2000000,
ERFLG1_CHAIN_FORCE_PULL = 0x1000000,
ERFLG1_UNK_400000 = 0x400000,
ERFLG1_UNK_200000 = 0x200000,
ERFLG1_UNK_100000 = 0x100000,
ERFLG1_UNK_80000 = 0x80000,
ERFLG1_UNK_40000 = 0x40000,
ERFLG1_UNK_20000 = 0x20000,
ERFLG1_WATER_DROP = 0x20000,
ERFLG1_UNK_10000 = 0x10000,
ERFLG1_UNK_8000 = 0x8000,
ERFLG1_UNK_4000 = 0x4000,
ERFLG1_UNK_2000 = 0x2000,
ERFLG1_UNK_1000 = 0x1000,
ERFLG1_UNK_800 = 0x800,
ERFLG1_WATERFALL_FRONT_HIT = 0x800,
ERFLG1_UNK_400 = 0x400,
ERFLG1_WOLF_EYE_KEEP = 0x200,
ERFLG1_UNK_100 = 0x100,
@@ -535,7 +521,7 @@ public:
ERFLG1_UNK_8 = 8,
ERFLG1_UNK_4 = 4,
ERFLG1_UNK_2 = 2,
ERFLG1_UNK_1 = 1,
ERFLG1_NS_SCREAM = 1,
};
enum daPy_ERFLG2 {
@@ -543,10 +529,10 @@ public:
ERFLG2_PORTAL_WARP_MIDNA_ATN_KEEP = 0x80,
ERFLG2_UNK_40 = 0x40,
ERFLG2_UNK_20 = 0x20,
ERFLG2_UNK_10 = 0x10,
ERFLG2_UNK_8 = 8,
ERFLG2_UNK_2 = 2,
ERFLG2_UNK_1 = 1,
ERFLG2_LIGHT_SWORD_GET_EFFECT = 0x10,
ERFLG2_FORCE_GRAB_REBOUND = 8,
ERFLG2_FORCE_HORSE_GETOFF = 2,
ERFLG2_FISHING_KEEP = 1,
};
enum daPy_RFLG0 {
@@ -556,20 +542,20 @@ public:
RFLG0_UNK_10000000 = 0x10000000,
RFLG0_UNK_8000000 = 0x8000000,
RFLG0_UNK_4000000 = 0x4000000,
RFLG0_UNK_2000000 = 0x2000000,
RFLG0_ITEM_SIGHT_BG_HIT = 0x2000000,
RFLG0_GRAB_PUT_START = 0x400000,
RFLG0_WOLF_GROWL = 0x200000,
RFLG0_UNK_80000 = 0x80000,
RFLG0_UNK_40000 = 0x40000,
RFLG0_UNK_20000 = 0x20000,
RFLG0_UNK_10000 = 0x10000,
RFLG0_UNK_8000 = 0x8000,
RFLG0_CLIMB_END_HANG = 0x40000,
RFLG0_WOLF_TAG_LOCK_JUMP_READY = 0x20000,
RFLG0_ATTENTION_LOCK = 0x10000,
RFLG0_GRAB_UP_START = 0x8000,
RFLG0_UNK_4000 = 0x4000,
RFLG0_FRONT_ROLL_CRASH = 0x2000,
RFLG0_ENEMY_ATTN_LOCK = 0x1000,
RFLG0_UNK_400 = 0x400,
RFLG0_COW_GAME_LEASH = 0x200,
RFLG0_UNK_100 = 0x100,
RFLG0_AUTO_JUMP_START = 0x100,
RFLG0_UNK_80 = 0x80,
RFLG0_UNK_40 = 0x40,
RFLG0_GRAB_UP_END = 0x20,
@@ -577,15 +563,15 @@ public:
RFLG0_UNK_8 = 0x8,
RFLG0_GRAB_THROW = 0x4,
RFLG0_UNK_2 = 0x2,
RFLG0_UNK_1 = 0x1,
RFLG0_STICK_ARROW_RESET = 0x1,
};
enum daPy_RFLG1 {
RFLG1_DAMAGE_IMPACT = 0x400,
RFLG1_UNK_200 = 0x200,
RFLG1_UNK_100 = 0x100,
RFLG1_UNK_80 = 0x80,
RFLG1_UNK_40 = 0x40,
RFLG0_FISHINGROD_USE_ACCEPT = 0x200,
RFLG1_INSECT_RELEASE = 0x100,
RFLG0_FISHINGROD_USE_START = 0x80,
RFLG1_BOARD_NO_FOOT_ANGLE = 0x40,
RFLG1_UNK_30 = 0x30,
RFLG1_UNK_20 = 0x20,
RFLG1_UNK_10 = 0x10,
@@ -593,11 +579,9 @@ public:
RFLG1_UNK_4 = 0x4,
RFLG1_UNK_2 = 0x2,
RFLG1_WOLF_ATTACK_REVERSE = 0x1,
RFLG1_UNK_C = 0xC,
};
enum {
enum daPy_MODE {
/* 0x01 */ SMODE_SUMO_READY = 1,
/* 0x25 */ SMODE_SUMO_LOSE = 37,
/* 0x27 */ SMODE_WOLF_PUZZLE = 39,
@@ -606,7 +590,7 @@ public:
/* 0x2C */ SMODE_CARGO_CARRY,
};
enum CutType {
enum daPy_CUT_TYPE {
/* 0x00 */ CUT_TYPE_NONE,
/* 0x01 */ CUT_TYPE_NM_VERTICAL,
/* 0x02 */ CUT_TYPE_NM_STAB,
@@ -618,13 +602,13 @@ public:
/* 0x08 */ CUT_TYPE_TURN_RIGHT,
/* 0x09 */ CUT_TYPE_UNK_9,
/* 0x0A */ CUT_TYPE_JUMP,
/* 0x0B */ CUT_TYPE_DASH_UNK_B,
/* 0x0C */ CUT_TYPE_DASH_UNK_C,
/* 0x0D */ CUT_TYPE_DASH_UNK_D,
/* 0x0B */ CUT_TYPE_DASH_LEFT_BOARD,
/* 0x0C */ CUT_TYPE_DASH_RIGHT_BOARD,
/* 0x0D */ CUT_TYPE_DASH_CHARGE_BOARD,
/* 0x0E */ CUT_TYPE_UNK_E,
/* 0x0F */ CUT_TYPE_UNK_F,
/* 0x10 */ CUT_TYPE_AIR,
/* 0x11 */ CUT_TYPE_DASH_UNK_11,
/* 0x10 */ CUT_TYPE_DASH_LEFT_SIDESTEP,
/* 0x11 */ CUT_TYPE_DASH_RIGHT_SIDESTEP,
/* 0x12 */ CUT_TYPE_LARGE_JUMP_INIT,
/* 0x13 */ CUT_TYPE_LARGE_JUMP,
/* 0x14 */ CUT_TYPE_LARGE_JUMP_FINISH,
@@ -641,15 +625,15 @@ public:
/* 0x1F */ CUT_TYPE_MORTAL_DRAW_B,
/* 0x20 */ CUT_TYPE_FINISH_STAB,
/* 0x21 */ CUT_TYPE_COMBO_STAB,
/* 0x22 */ CUT_TYPE_HORSE_UNK_22,
/* 0x23 */ CUT_TYPE_HORSE_UNK_23,
/* 0x22 */ CUT_TYPE_HORSE_LEFT_A,
/* 0x23 */ CUT_TYPE_HORSE_LEFT_B,
/* 0x24 */ CUT_TYPE_UNK_24,
/* 0x25 */ CUT_TYPE_DASH_UNK_25,
/* 0x26 */ CUT_TYPE_DASH_UNK_26,
/* 0x25 */ CUT_TYPE_DASH_LEFT,
/* 0x26 */ CUT_TYPE_DASH_RIGHT,
/* 0x27 */ CUT_TYPE_DOWN,
/* 0x28 */ CUT_TYPE_UNK_28,
/* 0x29 */ CUT_TYPE_GUARD_ATTACK,
/* 0x2A */ CUT_TYPE_HORSE_UNK_2A,
/* 0x2A */ CUT_TYPE_HORSE_RIGHT_A,
/* 0x2B */ CUT_TYPE_HORSE_TURN,
/* 0x2C */ CUT_TYPE_WOLF_B_LEFT,
/* 0x2D */ CUT_TYPE_WOLF_B_RIGHT,
@@ -663,32 +647,32 @@ public:
/* 0x35 */ CUT_TYPE_WOLF_UNK_35,
/* 0x36 */ CUT_TYPE_WOLF_LOCK,
/* 0x37 */ CUT_TYPE_WOLF_UNK_37,
/* 0x38 */ CUT_TYPE_DASH_UNK_38,
/* 0x38 */ CUT_TYPE_DASH_CHARGE,
/* 0x39 */ CUT_TYPE_WOLF_JUMP,
};
static u32 setParamData(int, int, int, int);
static BOOL checkFishingRodItem(int);
static BOOL checkBombItem(int);
static BOOL checkBottleItem(int);
static BOOL checkDrinkBottleItem(int);
static BOOL checkOilBottleItem(int);
static BOOL checkOpenBottleItem(int);
static BOOL checkBowItem(int);
static BOOL checkHookshotItem(int);
static BOOL checkTradeItem(int);
static BOOL checkDungeonWarpItem(int);
static u32 setParamData(int i_roomNo, int i_mode, int, int);
static BOOL checkFishingRodItem(int i_itemNo);
static BOOL checkBombItem(int i_itemNo);
static BOOL checkBottleItem(int i_itemNo);
static BOOL checkDrinkBottleItem(int i_itemNo);
static BOOL checkOilBottleItem(int i_itemNo);
static BOOL checkOpenBottleItem(int i_itemNo);
static BOOL checkBowItem(int i_itemNo);
static BOOL checkHookshotItem(int i_itemNo);
static BOOL checkTradeItem(int i_itemNo);
static BOOL checkDungeonWarpItem(int i_itemNo);
static BOOL checkMasterSwordEquip();
static BOOL checkWoodShieldEquip();
static f32 getAttentionOffsetY();
static int checkNowWolfEyeUp();
static void forceRestartRoom(int, u32, int);
static void forceRestartRoom(int i_dmgAmount, u32 i_mode, int);
static BOOL setFmChainPos(fopAc_ac_c*, cXyz*, int);
static void cancelFmChainGrab();
static void setLookPos(cXyz*);
static void setPlayerSe(u32);
static bool linkGrabSubjectNoDraw(fopAc_ac_c*);
static bool wolfGrabSubjectNoDraw(fopAc_ac_c*);
static void setLookPos(cXyz* i_pos);
static void setPlayerSe(u32 i_soundID);
static bool linkGrabSubjectNoDraw(fopAc_ac_c* i_actor);
static bool wolfGrabSubjectNoDraw(fopAc_ac_c* i_actor);
static bool checkRoomRestartStart();
static u32 checkCarryStartLightBallA();
static u32 checkCarryStartLightBallB();
@@ -697,16 +681,18 @@ public:
static bool checkBoomerangCharge();
static bool checkBoomerangChargeTime();
static daBoomerang_c* getThrowBoomerangActor();
static void cancelBoomerangLockActor(fopAc_ac_c*);
static void setPlayerDamage(int, int);
static void setMidnaMotionNum(int);
static void setMidnaFaceNum(int);
static void cancelBoomerangLockActor(fopAc_ac_c* i_actor);
static void setPlayerDamage(int i_dmgAmount, BOOL i_setDmgTimer);
static BOOL checkAcceptDungeonWarp();
static void setMidnaMotionNum(int i_motionNum);
static void setMidnaFaceNum(int i_faceNum);
static BOOL checkShieldGet() { return dComIfGs_getSelectEquipShield() != fpcNm_ITEM_NONE; }
static BOOL checkSwordGet() { return dComIfGs_getSelectEquipSword() != fpcNm_ITEM_NONE; }
cXyz getHeadTopPos() const { return mHeadTopPos; }
u32 checkThrowDamage() const { return checkNoResetFlg1(FLG1_THROW_DAMAGE); }
bool checkGoronSideMove() const { return mSpecialMode == 0x2B; }
bool checkGoronSideMove() const { return mMode == 0x2B; }
cXyz* getRightFootPosP() { return &mRightFootPos; }
cXyz* getLeftFootPosP() { return &mLeftFootPos; }
cXyz getLeftFootPos() const { return mLeftFootPos; }
@@ -717,7 +703,7 @@ public:
const cXyz getLeftHandPos() const { return mLeftHandPos; }
const cXyz getItemPos() const { return mItemPos; }
BOOL getDkCaught() const { return checkNoResetFlg1(FLG1_DK_CAUGHT); }
BOOL getDkCaught2() const { return checkNoResetFlg0(FLG0_DK_CAUGHT); }
BOOL getDkCaught2() const { return checkNoResetFlg0(FLG0_DK_CAUGHT2); }
BOOL getStCaught() const { return checkNoResetFlg1(FLG1_UNK_80000000); }
/* vt 0X008 */ virtual cXyz* getMidnaAtnPos() const { return NULL; }
@@ -790,7 +776,7 @@ public:
/* vt 0X114 */ virtual void voiceStart(u32) {}
/* vt 0X118 */ virtual void seStartOnlyReverb(u32) {}
/* vt 0X11C */ virtual void seStartOnlyReverbLevel(u32) {}
/* vt 0X120 */ virtual void setOutPower(f32, short, int) {}
/* vt 0X120 */ virtual void setOutPower(f32, s16, int) {}
/* vt 0X124 */ virtual void setGrabCollisionOffset(f32, f32, cBgS_PolyInfo*) {}
/* vt 0X128 */ virtual void onMagneGrab(f32, f32) {}
/* vt 0X12C */ virtual void onFrollCrashFlg(u8, int) {}
@@ -803,12 +789,12 @@ public:
/* vt 0X148 */ virtual BOOL checkSingleBoarBattleSecondBowReady() const { return FALSE; }
/* vt 0X14C */ virtual bool checkPointSubWindowMode() const { return FALSE; }
/* vt 0X150 */ virtual void setClothesChange(int) {}
/* vt 0X154 */ virtual void setPlayerPosAndAngle(cXyz const*, short, int) {}
/* vt 0X154 */ virtual void setPlayerPosAndAngle(cXyz const*, s16, int) {}
/* vt 0X158 */ virtual void setPlayerPosAndAngle(cXyz const*, csXyz const*) {}
/* vt 0X15C */ virtual void setPlayerPosAndAngle(f32 (*)[4]) {}
/* vt 0X160 */ virtual bool setThrowDamage(short, f32, f32, int, int, int) { return FALSE; }
/* vt 0X160 */ virtual bool setThrowDamage(s16, f32, f32, int, int, int) { return FALSE; }
/* vt 0X164 */ virtual bool checkSetNpcTks(cXyz*, int, int) { return FALSE; }
/* vt 0X168 */ virtual int setRollJump(f32, f32, short) { return FALSE; }
/* vt 0X168 */ virtual int setRollJump(f32, f32, s16) { return FALSE; }
/* vt 0X16C */ virtual void playerStartCollisionSE(u32, u32) {}
/* vt 0X170 */ virtual void changeTextureAnime(u16, u16, int) {}
/* vt 0X174 */ virtual void cancelChangeTextureAnime() {}
@@ -835,13 +821,13 @@ public:
/* vt 0X1C8 */ virtual cXyz* getKandelaarFlamePos() { return NULL; }
/* vt 0X1CC */ virtual bool checkUseKandelaar(int) { return FALSE; }
/* vt 0X1D0 */ virtual void setDkCaught(fopAc_ac_c*) {}
/* vt 0X1D4 */ virtual void onPressedDamage(cXyz const&, short) {}
/* vt 0X1D4 */ virtual void onPressedDamage(cXyz const&, s16) {}
/* vt 0X1D8 */ virtual bool checkPriActorOwn(fopAc_ac_c const*) const { return FALSE; }
/* vt 0X1DC */ virtual bool onWolfEnemyBiteAll(fopAc_ac_c*, daPy_FLG2) { return FALSE; }
/* vt 0X1E0 */ virtual bool checkWolfEnemyBiteAllOwn(fopAc_ac_c const*) const { return FALSE; }
/* vt 0X1E4 */ virtual void setWolfEnemyHangBiteAngle(short) {}
/* vt 0X1E4 */ virtual void setWolfEnemyHangBiteAngle(s16) {}
/* vt 0X1E8 */ virtual void setKandelaarMtx(f32 (*)[4], int, int) {}
/* vt 0X1EC */ virtual bool getStickAngleFromPlayerShape(short*) const { return FALSE; }
/* vt 0X1EC */ virtual bool getStickAngleFromPlayerShape(s16*) const { return FALSE; }
/* vt 0X1F0 */ virtual bool checkSpinnerPathMove() { return FALSE; }
/* vt 0X1F4 */ virtual bool checkSpinnerTriggerAttack() { return FALSE; }
/* vt 0X1F8 */ virtual void onSpinnerPathForceRemove() {}
@@ -858,7 +844,7 @@ public:
/* vt 0X224 */ virtual s16 checkSumouWithstand() const { return 0; }
/* vt 0X228 */ virtual void cancelGoronThrowEvent() {}
/* vt 0X22C */ virtual void setSumouGraspCancelCount(int) {}
/* vt 0X230 */ virtual void setSumouPushBackDirection(short) {}
/* vt 0X230 */ virtual void setSumouPushBackDirection(s16) {}
/* vt 0X234 */ virtual void setSumouLoseHeadUp() {}
/* vt 0X238 */ virtual s16 getGiantPuzzleAimAngle() const { return shape_angle.y; }
/* vt 0X23C */ virtual void setGoronSideMove(fopAc_ac_c*) {}
@@ -894,7 +880,7 @@ public:
bool getSumouCameraMode() const {
bool sumouCameraMode = false;
if (mSpecialMode != 0 && mSpecialMode < 0x26) {
if (mMode != 0 && mMode < 0x26) {
sumouCameraMode = true;
}
return sumouCameraMode;
@@ -903,7 +889,7 @@ public:
bool getSumouMode() const { return getSumouCameraMode(); }
void cancelOriginalDemo() {
mDemo.setSystemDemoType();
mDemo.setDemoMode(1);
mDemo.setDemoMode(daPy_demo_c::DEMO_UNK_1_e);
}
u32 getDemoMode() const { return mDemo.getDemoMode(); }
@@ -911,80 +897,82 @@ public:
u8 getCutCount() const { return mComboCutCount; }
BOOL checkStatusWindowDraw() const { return checkNoResetFlg2(FLG2_STATUS_WINDOW_DRAW); }
bool checkCargoCarry() const { return mSpecialMode == SMODE_CARGO_CARRY; }
BOOL getHeavyStateAndBoots() { return checkNoResetFlg0(FLG0_HVY_STATE); }
bool checkCargoCarry() const { return mMode == SMODE_CARGO_CARRY; }
BOOL getHeavyStateAndBoots() { return checkNoResetFlg0(daPy_FLG0(FLG0_HEAVY_STATE | FLG0_EQUIP_HVY_BOOTS | FLG0_DK_CAUGHT2)); }
BOOL checkEnemyAttentionLock() const { return checkResetFlg0(RFLG0_ENEMY_ATTN_LOCK); }
BOOL getGrabUpStart() const { return checkResetFlg0(RFLG0_UNK_8000); }
bool checkCanoeSlider() const { return mSpecialMode == 0x2D; }
bool checkGoatStopGame() const { return mSpecialMode == 0x2A; }
void onGoatStopGame() { mSpecialMode = 0x2A; }
BOOL getGrabUpStart() const { return checkResetFlg0(RFLG0_GRAB_UP_START); }
bool checkCanoeSlider() const { return mMode == 0x2D; }
bool checkGoatStopGame() const { return mMode == 0x2A; }
void onGoatStopGame() { mMode = 0x2A; }
u8 getCutType() const { return mCutType; }
u16 getSwordAtUpTime() const { return mSwordUpTimer; }
s16 getDamageWaitTimer() const { return mDamageTimer; }
BOOL checkWaterInMove() const { return checkNoResetFlg0(FLG0_UNDERWATER); }
BOOL checkSceneChangeAreaStart() const { return checkNoResetFlg2(FLG2_SCN_CHG_START); }
BOOL checkWaterInMove() const { return checkNoResetFlg0(FLG0_WATER_IN_MOVE); }
BOOL checkSceneChangeAreaStart() const { return checkNoResetFlg2(FLG2_SCENE_CHANGE_START); }
BOOL checkFrontRollCrash() const { return checkResetFlg0(RFLG0_FRONT_ROLL_CRASH); }
BOOL checkWolfAttackReverse() const { return checkResetFlg1(RFLG1_WOLF_ATTACK_REVERSE); }
BOOL checkFreezeDamage() const { return checkNoResetFlg1(FLG1_ICE_FREEZE); }
BOOL checkWolfTagLockJumpReady() const { return checkResetFlg0(RFLG0_UNK_20000); }
BOOL checkFreezeDamage() const { return checkNoResetFlg1(FLG1_FREEZE_DAMAGE); }
BOOL checkWolfTagLockJumpReady() const { return checkResetFlg0(RFLG0_WOLF_TAG_LOCK_JUMP_READY); }
BOOL checkDamageImpact() const { return checkResetFlg1(RFLG1_DAMAGE_IMPACT); }
BOOL getGrabUpEnd() const { return checkResetFlg0(RFLG0_GRAB_UP_END); }
BOOL getGrabPutStart() const { return checkResetFlg0(RFLG0_GRAB_PUT_START); }
BOOL checkSwimUp() const { return checkNoResetFlg0(FLG0_SWIM_UP); }
BOOL checkHorseZelda() const { return checkNoResetFlg2(FLG2_HORSE_ZELDA); }
BOOL checkSpecialHorseRide() { return checkNoResetFlg2(daPy_FLG2(FLG2_HORSE_ZELDA | FLG2_UNK_1000000 | FLG2_BOAR_SINGLE_BATTLE)); }
BOOL checkBoardNoFootAngle() const { return checkResetFlg1(RFLG1_UNK_40); }
BOOL checkSpecialHorseRide() { return checkNoResetFlg2(daPy_FLG2(FLG2_HORSE_ZELDA | FLG2_BOAR_SINGLE_BATTLE_2ND | FLG2_BOAR_SINGLE_BATTLE_1ST)); }
BOOL checkBoardNoFootAngle() const { return checkResetFlg1(RFLG1_BOARD_NO_FOOT_ANGLE); }
BOOL checkGrabThrow() const { return checkResetFlg0(RFLG0_GRAB_THROW); }
BOOL checkMidnaAtnPos() const { return checkNoResetFlg1(FLG1_MIDNA_ATN_POS); }
BOOL checkMidnaHairAtnPos() const { return checkNoResetFlg1(FLG1_MIDNA_HAIR_ATN_POS); }
BOOL checkAttentionLock() const { return checkResetFlg0(RFLG0_UNK_10000); }
BOOL checkFishingRodUseStart() const { return checkResetFlg1(RFLG1_UNK_80); }
BOOL checkFishingRodUseAccept() const { return checkResetFlg1(RFLG1_UNK_200); }
BOOL checkAttentionLock() const { return checkResetFlg0(RFLG0_ATTENTION_LOCK); }
BOOL checkFishingRodUseStart() const { return checkResetFlg1(RFLG0_FISHINGROD_USE_START); }
BOOL checkFishingRodUseAccept() const { return checkResetFlg1(RFLG0_FISHINGROD_USE_ACCEPT); }
void onBossRoomWait() { onEndResetFlg0(ERFLG0_BOSS_ROOM_WAIT); }
void onBeeFollow() { onEndResetFlg0(ERFLG0_BEE_FOLLOW); }
void onForceAutoJump() { onEndResetFlg0(ERFLG0_FORCE_AUTO_JUMP); }
void onNotAutoJump() { onEndResetFlg0(ERFLG0_NOT_AUTO_JUMP); }
void onNotHang() { onEndResetFlg0(ERFLG0_NOT_HANG); }
void onLeafSe() { onEndResetFlg0(ERFLG0_UNK_200000); }
void onLeafSe() { onEndResetFlg0(ERFLG0_LEAF_SE); }
void onWolfFchainPull() { onEndResetFlg0(ERFLG0_WOLF_FCHAIN_PULL); }
void onFishingRodGetFish() { onEndResetFlg0(ERFLG0_FISHING_ROD_GET_FISH); }
void onSingleBoarAvoid() { onEndResetFlg0(ERFLG0_SINGLE_BOAR_AVOID); }
void onShieldBackBone() { onEndResetFlg1(ERFLG1_GANON_FINISH); }
void onShieldBackBone() { onEndResetFlg1(ERFLG1_SHIELD_BACKBONE); }
void onWolfEyeKeep() { onEndResetFlg1(ERFLG1_WOLF_EYE_KEEP); }
void onPortalWarpMidnaAtnKeep() { onEndResetFlg2(ERFLG2_PORTAL_WARP_MIDNA_ATN_KEEP); }
void onFogFade() { onNoResetFlg2(FLG2_UNK_4000); }
void onDkCaught2() { onNoResetFlg0(FLG0_DK_CAUGHT); }
void onFishingRodCastingEnd() { onNoResetFlg1(FLG1_UNK_8000); }
void onFishingRodReelEnd() { onEndResetFlg0(ERFLG0_UNK_20000); }
void onFishingHit() { onEndResetFlg0(ERFLG0_UNK_10000); }
void onFishingKeep() { onEndResetFlg2(ERFLG2_UNK_1); }
void onTraningCutHead() { onNoResetFlg3(FLG3_UNK_40); }
void onTraningCutFast() { onNoResetFlg3(FLG3_UNK_80); }
void onTraningCutLargeJump() { onNoResetFlg3(FLG3_UNK_200); }
void onTraningCutLargeTurn() { onNoResetFlg3(FLG3_UNK_100); }
void onTraningCutDown() { onNoResetFlg3(FLG3_UNK_10); }
void onTraningShieldAttack() { onNoResetFlg3(FLG3_UNK_8); }
void onFogFade() { onNoResetFlg2(FLG2_FOG_FADE); }
void onDkCaught2() { onNoResetFlg0(FLG0_DK_CAUGHT2); }
void onFishingRodCastingEnd() { onNoResetFlg1(FLG1_FISHING_ROD_CASTING_END); }
void onFishingRodReelEnd() { onEndResetFlg0(ERFLG0_FISHING_ROD_REEL_END); }
void onFishingHit() { onEndResetFlg0(ERFLG0_FISHING_HIT); }
void onFishingKeep() { onEndResetFlg2(ERFLG2_FISHING_KEEP); }
void onTraningCutHead() { onNoResetFlg3(FLG3_TRANING_CUT_HEAD); }
void onTraningCutFast() { onNoResetFlg3(FLG3_TRANING_CUT_FAST); }
void onTraningCutLargeJump() { onNoResetFlg3(FLG3_TRANING_CUT_LARGE_JUMP); }
void onTraningCutLargeTurn() { onNoResetFlg3(FLG3_TRANING_CUT_LARGE_TURN); }
void onTraningCutDown() { onNoResetFlg3(FLG3_TRANING_CUT_DOWN); }
void onTraningShieldAttack() { onNoResetFlg3(FLG3_TRANING_SHIELD_ATTACK); }
void onDemoStreamAccept() { onNoResetFlg0(FLG0_DEMO_STREAM_ACCEPT); }
void offDemoStreamAccept() { offNoResetFlg0(FLG0_DEMO_STREAM_ACCEPT); }
BOOL checkStickArrowReset() const { return checkResetFlg0(RFLG0_UNK_1); }
BOOL getCutAtFlg() const { return checkNoResetFlg0(FLG0_UNK_40); }
BOOL checkBoarSingleBattleFirst() const { return checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE); }
BOOL checkBoarSingleBattleSecond() const { return checkNoResetFlg2(FLG2_UNK_1000000); }
BOOL checkStickArrowReset() const { return checkResetFlg0(RFLG0_STICK_ARROW_RESET); }
BOOL getCutAtFlg() const { return checkNoResetFlg0(FLG0_CUT_AT_FLG); }
BOOL checkBoarSingleBattleFirst() const { return checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE_1ST); }
BOOL checkBoarSingleBattleSecond() const { return checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE_2ND); }
BOOL getFootOnGround() const { return checkResetFlg1(daPy_RFLG1(RFLG1_UNK_10 | RFLG1_UNK_20)); }
void offWolfEnemyHangBite() { offNoResetFlg2(FLG2_WOLF_ENEMY_HANG_BITE); }
bool onWolfEnemyHangBite(fopAc_ac_c* param_0) { return onWolfEnemyBiteAll(param_0, FLG2_WOLF_ENEMY_HANG_BITE); }
bool onWolfEnemyHangBite(fopAc_ac_c* i_enemy) { return onWolfEnemyBiteAll(i_enemy, FLG2_WOLF_ENEMY_HANG_BITE); }
void offHorseZelda() { offNoResetFlg2(FLG2_HORSE_ZELDA); }
void onHorseZelda() { onNoResetFlg2(FLG2_HORSE_ZELDA); }
BOOL checkItemSightBgHit() const { return checkResetFlg0(RFLG0_UNK_2000000); }
BOOL checkItemSightBgHit() const { return checkResetFlg0(RFLG0_ITEM_SIGHT_BG_HIT); }
void setCanoeSlider() { mSpecialMode = 0x2D; }
void setCanoeSlider() { mMode = 0x2D; }
void offCanoeSlider() {
if (checkCanoeSlider()) {
mSpecialMode = 0;
mMode = 0;
}
}
void onMidnaTalkPolySpeed() { onNoResetFlg3(FLG3_MIDNA_TALK_POLY_SPEED); }
@@ -992,28 +980,28 @@ public:
void offCargoCarry() {
if (checkCargoCarry()) {
mSpecialMode = 0;
mMode = 0;
}
}
bool onWolfEnemyCatch(fopAc_ac_c* i_actor) { return onWolfEnemyBiteAll(i_actor, FLG2_UNK_8); }
bool onWolfEnemyCatch(fopAc_ac_c* i_enemy) { return onWolfEnemyBiteAll(i_enemy, FLG2_UNK_8); }
void offGoronSideMove() {
if (checkGoronSideMove()) {
mSpecialMode = 0;
mMode = 0;
}
}
void offGoronUpStopCancel() {
offNoResetFlg0(FLG0_UNK_200000);
offNoResetFlg0(FLG0_GORON_UP_STOP_CANCEL);
}
s16 getBodyAngleX() const { return mBodyAngle.x; }
s16 getBodyAngleY() const { return mBodyAngle.y; }
f32 getHeight() const { return field_0x598; }
f32 getHeight() const { return mHeight; }
BOOL checkMidnaWarp() const { return 0; }
BOOL checkMidnaWarp() const { return FALSE; }
u32 checkNoResetFlg0(daPy_FLG0 i_flag) const { return mNoResetFlg0 & i_flag; }
u32 checkNoResetFlg1(daPy_FLG1 i_flag) const { return mNoResetFlg1 & i_flag; }
@@ -1030,10 +1018,10 @@ public:
void offNoResetFlg2(daPy_FLG2 i_flag) { mNoResetFlg2 &= ~i_flag; }
void offNoResetFlg3(daPy_FLG3 i_flag) { mNoResetFlg3 &= ~i_flag; }
void offResetFlg0(daPy_RFLG0 flag) { mResetFlg0 &= ~flag; }
void offResetFlg1(daPy_RFLG1 flag) { mResetFlg1 &= ~flag; }
void onResetFlg0(daPy_RFLG0 flag) { mResetFlg0 |= flag; }
void onResetFlg1(daPy_RFLG1 flag) { mResetFlg1 |= flag; }
void offResetFlg0(daPy_RFLG0 i_flag) { mResetFlg0 &= ~i_flag; }
void offResetFlg1(daPy_RFLG1 i_flag) { mResetFlg1 &= ~i_flag; }
void onResetFlg0(daPy_RFLG0 i_flag) { mResetFlg0 |= i_flag; }
void onResetFlg1(daPy_RFLG1 i_flag) { mResetFlg1 |= i_flag; }
void onEndResetFlg0(daPy_ERFLG0 i_flag) { mEndResetFlg0 |= i_flag; }
void onEndResetFlg2(daPy_ERFLG2 i_flag) { mEndResetFlg2 |= i_flag; }
@@ -1057,7 +1045,7 @@ public:
u32 checkWolf() const { return checkNoResetFlg1(FLG1_IS_WOLF); }
u32 checkEquipHeavyBoots() const { return checkNoResetFlg0(FLG0_EQUIP_HVY_BOOTS); }
u32 checkMagneBootsOn() const { return checkNoResetFlg0(FLG0_MAGNE_BOOTS_ON); }
BOOL checkFastSwordCut() const { return checkNoResetFlg0(FLG0_UNK_80000); }
BOOL checkFastSwordCut() const { return checkNoResetFlg0(FLG0_FAST_SWORD_CUT); }
u32 checkMidnaRide() const { return checkNoResetFlg0(FLG0_MIDNA_RIDE); }
BOOL checkWolfGrowl() const { return checkResetFlg0(RFLG0_WOLF_GROWL); }
BOOL checkWolfThreat() const { return checkWolfGrowl(); }
@@ -1072,28 +1060,28 @@ public:
void onMidnaRide() { onNoResetFlg0(FLG0_MIDNA_RIDE); }
void offMidnaRide() { offNoResetFlg0(FLG0_MIDNA_RIDE); }
void onMidnaRideShock() { onEndResetFlg1(ERFLG1_MIDNA_RIDE_SHOCK); }
void onPlayerShadowNoDraw() { onNoResetFlg2(FLG2_PLAYER_SHADOW); }
void offPlayerShadowNoDraw() { offNoResetFlg2(FLG2_PLAYER_SHADOW); }
void onLightSwordGetEffect() { onEndResetFlg2(ERFLG2_UNK_10); }
void onPlayerShadowNoDraw() { onNoResetFlg2(FLG2_PLAYER_SHADOW_NO_DRAW); }
void offPlayerShadowNoDraw() { offNoResetFlg2(FLG2_PLAYER_SHADOW_NO_DRAW); }
void onLightSwordGetEffect() { onEndResetFlg2(ERFLG2_LIGHT_SWORD_GET_EFFECT); }
void onForceGameOver() { onNoResetFlg2(FLG2_FORCE_GAMEOVER); }
void onForceWolfChange() { onEndResetFlg0(ERFLG0_UNK_2); }
void onDoPutEmphasys() { onEndResetFlg1(ERFLG1_UNK_10000000); }
void onDoExchangePutIn() { onEndResetFlg1(ERFLG1_UNK_4000000); }
void onNsScream() { onEndResetFlg1(ERFLG1_UNK_1); }
void onNsScreamAnm() { onEndResetFlg1(daPy_ERFLG1(ERFLG1_UNK_1 | ERFLG1_UNK_2)); }
void onForceWolfChange() { onEndResetFlg0(ERFLG0_FORCE_WOLF_CHANGE); }
void onDoPutEmphasys() { onEndResetFlg1(ERFLG1_DO_PUT_EMPHASYS); }
void onDoExchangePutIn() { onEndResetFlg1(ERFLG1_DO_EXCHANGE_PUT_IN); }
void onNsScream() { onEndResetFlg1(ERFLG1_NS_SCREAM); }
void onNsScreamAnm() { onEndResetFlg1(daPy_ERFLG1(ERFLG1_NS_SCREAM | ERFLG1_UNK_2)); }
void onLargeDamageUpStop() { onEndResetFlg1(ERFLG1_LARGE_DAMAGE_UP_STOP); }
void onTraningCutBack() { onNoResetFlg3(FL3_TRANING_CUT_BACK); }
void onNeckSearchWide() { onEndResetFlg0(ERFLG0_UNK_400); }
void onTraningCutBack() { onNoResetFlg3(FLG3_TRANING_CUT_BACK); }
void onNeckSearchWide() { onEndResetFlg0(ERFLG0_NECK_SEARCH_WIDE); }
void offPressedDamage() { offNoResetFlg2(FLG2_PRESSED_DAMAGE); }
void onForceSubjectCancel() { onEndResetFlg0(ERFLG0_FORCE_SUBJECT_CANCEL); }
void onEnemyDead() { onEndResetFlg0(ERFLG0_ENEMY_DEAD); }
void offDkCaught() { offNoResetFlg1(FLG1_DK_CAUGHT); }
void offDkCaught2() { offNoResetFlg0(FLG0_DK_CAUGHT); }
void onWaterFallFrontHit() { onEndResetFlg1(ERFLG1_UNK_800); }
void onCanoeItemCancel() { onEndResetFlg1(ERFLG1_UNK_20000000); }
void onSwordTriggerNon() { onEndResetFlg1(ERFLG1_UNK_40000000); }
void offDkCaught2() { offNoResetFlg0(FLG0_DK_CAUGHT2); }
void onWaterFallFrontHit() { onEndResetFlg1(ERFLG1_WATERFALL_FRONT_HIT); }
void onCanoeItemCancel() { onEndResetFlg1(ERFLG1_CANOE_ITEM_CANCEL); }
void onSwordTriggerNon() { onEndResetFlg1(ERFLG1_SWORD_TRIGGER_NON); }
u32 checkBoarSingleBattle() const { return checkNoResetFlg2(daPy_FLG2(FLG2_UNK_1000000 | FLG2_BOAR_SINGLE_BATTLE)); }
u32 checkBoarSingleBattle() const { return checkNoResetFlg2(daPy_FLG2(FLG2_BOAR_SINGLE_BATTLE_2ND | FLG2_BOAR_SINGLE_BATTLE_1ST)); }
u32 checkWolfDashAutoJump() const { return checkNoResetFlg2(FLG2_WOLF_DASH_AUTO_JUMP); }
void changeOriginalDemo() {
@@ -1108,8 +1096,8 @@ public:
mDemo.setParam2(i_param2);
}
void changeDemoParam0(int i_param1) {
mDemo.setParam0(i_param1);
void changeDemoParam0(int i_param0) {
mDemo.setParam0(i_param0);
}
void changeDemoParam1(int i_param1) {
@@ -1126,7 +1114,7 @@ public:
void setItemPos(cXyz* i_itemPos) { mItemPos = *i_itemPos; }
cXyz* getViewerCurrentPosP() { return &field_0x5f8; }
cXyz* getViewerCurrentPosP() { return &mViewerCurrentPos; }
static bool checkPeepEndSceneChange() { return getLastSceneMode() == 7; }
@@ -1163,8 +1151,17 @@ public:
return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_ARMOR;
}
/* dSv_event_flag_c::M_067 - Main Event - Midna riding / not riding (ON == riding) */
static BOOL checkFirstMidnaDemo() { return dComIfGs_isEventBit(0xc10); }
static bool checkCarvingWoodShieldEquip() {
return dComIfGs_getSelectEquipShield() == fpcNm_ITEM_WOOD_SHIELD;
}
static bool checkShopWoodShieldEquip() {
return dComIfGs_getSelectEquipShield() == fpcNm_ITEM_SHIELD;
}
static BOOL checkPowerGloveGet() { return false; }
static BOOL checkFirstMidnaDemo() { return dComIfGs_isEventBit(dSv_event_flag_c::M_067); }
static int checkNowWolfPowerUp() { return checkNowWolfEyeUp(); }
static daMidna_c* getMidnaActor() { return m_midnaActor; }
@@ -1180,10 +1177,10 @@ public:
}
BOOL checkCowGameLash() const { return checkResetFlg0(RFLG0_COW_GAME_LEASH); }
BOOL checkClimbEndHang() { return checkResetFlg0(RFLG0_UNK_40000); }
BOOL checkClimbEndHang() { return checkResetFlg0(RFLG0_CLIMB_END_HANG); }
void onForceHorseGetOff() {
onEndResetFlg2(ERFLG2_UNK_2);
onEndResetFlg2(ERFLG2_FORCE_HORSE_GETOFF);
}
s16 getFishingRodAngleY() const {
@@ -1191,71 +1188,72 @@ public:
}
void onFishingRelease() {
onEndResetFlg0(ERFLG0_UNK_4000000);
onEndResetFlg0(ERFLG0_FISHING_RELEASE);
}
static daMidna_c* m_midnaActor;
void setGiantPuzzle() { mSpecialMode = SMODE_WOLF_PUZZLE; }
void setGiantPuzzleEnd() { mSpecialMode = 0; }
void setGiantPuzzle() { mMode = SMODE_WOLF_PUZZLE; }
void setGiantPuzzleEnd() { mMode = 0; }
BOOL checkAutoJumpStart() const { return checkResetFlg0(RFLG0_UNK_100); }
BOOL checkAutoJumpStart() const { return checkResetFlg0(RFLG0_AUTO_JUMP_START); }
void onForceGrabRebound() {
onEndResetFlg2(ERFLG2_UNK_8);
onEndResetFlg2(ERFLG2_FORCE_GRAB_REBOUND);
}
void setSumouReadyAcceptButton() { mSpecialMode = 2; }
void setSumouForceStand() { mSpecialMode = 3; }
void setSumouPushFrontStop() { mSpecialMode = 9; }
void setSumouPunchWinEnd() { mSpecialMode = 0xB; }
void setSumouPunchLoseEnd() { mSpecialMode = 0xC; }
void setSumouMoveWinEnd() { mSpecialMode = 0xD; }
void setSumouMoveLoseEnd() { mSpecialMode = 0xE; }
void setSumouReadyAcceptButton() { mMode = 2; }
void setSumouForceStand() { mMode = 3; }
void setSumouPushFrontStop() { mMode = 9; }
void setSumouPunchWinEnd() { mMode = 0xB; }
void setSumouPunchLoseEnd() { mMode = 0xC; }
void setSumouMoveWinEnd() { mMode = 0xD; }
void setSumouMoveLoseEnd() { mMode = 0xE; }
void setSumouForcePunch() {
if (mSpecialMode == 0x1F) {
mSpecialMode = 0x21;
if (mMode == 0x1F) {
mMode = 0x21;
} else {
mSpecialMode = 0x1C;
mMode = 0x1C;
}
}
void setSumouForceTackle() { mSpecialMode = 0x1B; }
void setSumouForceGraspCancel() { mSpecialMode = 0x24; }
void setSumouForceTackle() { mMode = 0x1B; }
void setSumouForceGraspCancel() { mMode = 0x24; }
bool checkSumouPushFront() const { return mSpecialMode == 7; }
bool checkSumouPushBack() const { return mSpecialMode == 8; }
bool checkSumouTackleSuccess() const { return mSpecialMode == 0xF; }
bool checkSumouTackleSuccessPunch() const { return mSpecialMode == 0x10; }
bool checkSumouTackleMiss() const { return mSpecialMode == 0x11; }
bool checkSumouTackleDraw() const { return mSpecialMode == 0x12; }
bool checkSumouPunchSuccess() const { return mSpecialMode == 0x13; }
bool checkSumouPunchMiss() const { return mSpecialMode == 0x14; }
bool checkSumouPunchDraw() const { return mSpecialMode == 0x15; }
bool checkSumouWait() const { return mSpecialMode == 0x16; }
bool checkSumouLeftMove() const { return mSpecialMode == 0x17; }
bool checkSumouRightMove() const { return mSpecialMode == 0x18; }
bool checkSumouSlideLeft() const { return mSpecialMode == 0x19; }
bool checkSumouSlideRight() const { return mSpecialMode == 0x1A; }
bool checkSumouPunchStagger() const { return mSpecialMode == 0x1F; }
bool checkSumouTackleStagger() const { return mSpecialMode == 0x20; }
bool checkSumouGraspRelease() const { return mSpecialMode == 0x23; }
bool checkSumouPushFront() const { return mMode == 7; }
bool checkSumouPushBack() const { return mMode == 8; }
bool checkSumouTackleSuccess() const { return mMode == 0xF; }
bool checkSumouTackleSuccessPunch() const { return mMode == 0x10; }
bool checkSumouTackleMiss() const { return mMode == 0x11; }
bool checkSumouTackleDraw() const { return mMode == 0x12; }
bool checkSumouPunchSuccess() const { return mMode == 0x13; }
bool checkSumouPunchMiss() const { return mMode == 0x14; }
bool checkSumouPunchDraw() const { return mMode == 0x15; }
bool checkSumouWait() const { return mMode == 0x16; }
bool checkSumouLeftMove() const { return mMode == 0x17; }
bool checkSumouRightMove() const { return mMode == 0x18; }
bool checkSumouSlideLeft() const { return mMode == 0x19; }
bool checkSumouSlideRight() const { return mMode == 0x1A; }
bool checkSumouPunchStagger() const { return mMode == 0x1F; }
bool checkSumouTackleStagger() const { return mMode == 0x20; }
bool checkSumouGraspRelease() const { return mMode == 0x23; }
void onHeavyState() { onNoResetFlg0(FLG0_UNK_40000000); }
void onHeavyState() { onNoResetFlg0(FLG0_HEAVY_STATE); }
void onHeavyStateMidnaPanic() {
onHeavyState();
onEndResetFlg1(ERFLG1_UNK_40000);
}
BOOL checkInsectRelease() { return checkResetFlg1(RFLG1_UNK_100); }
BOOL checkInsectRelease() { return checkResetFlg1(RFLG1_INSECT_RELEASE); }
void onChainForcePull() { onEndResetFlg1(ERFLG1_UNK_1000000); }
void onChainPullEnd() { onEndResetFlg1(ERFLG1_UNK_2000000); }
void onChainForcePull() { onEndResetFlg1(ERFLG1_CHAIN_FORCE_PULL); }
void onChainPullEnd() { onEndResetFlg1(ERFLG1_CHAIN_PULL_END); }
void onWaterDrop() { onEndResetFlg1(ERFLG1_UNK_20000); }
void forceKandelaarLightOff() { onNoResetFlg2(FLG2_UNK_10000000); }
void onWaterDrop() { onEndResetFlg1(ERFLG1_WATER_DROP); }
void forceKandelaarLightOff() { onNoResetFlg2(FLG2_KANDELAAR_LIGHT_OFF); }
};
int daPy_addCalcShort(s16* param_0, s16 param_1, s16 param_2, s16 param_3, s16 param_4);
void daPy_aramBufferCheck(void* i_buffer, u32 i_size);
int daPy_addCalcShort(s16* i_value, s16 i_target, s16 i_scale, s16 i_maxStep, s16 i_minStep);
inline daPy_py_c* daPy_getPlayerActorClass() {
return (daPy_py_c*)dComIfGp_getPlayer(0);
include/d/actor/d_a_spinner.h
+1
View File
@@ -48,6 +48,7 @@ public:
dPath* checkPathMoveNow() { return mpPathMove; }
static u32 getWaitArg() { return 0; }
static int getWaterSinkLimit() { return 50; }
BOOL getDeleteFlg() const { return mDeleteFlg; }
include/d/actor/d_a_tag_CstaSw.h
+3 -3
View File
@@ -14,7 +14,7 @@ public:
int Draw();
int Delete();
u8 getSw() { return fopAcM_GetParamBit(this, 0, 8); }
u32 getSw() { return fopAcM_GetParamBit(this, 0, 8); }
private:
/* 0x568 */ u8 mSwitch;
@@ -25,11 +25,11 @@ private:
class daTagCstaSw_HIO_c : public mDoHIO_entry_c {
public:
daTagCstaSw_HIO_c();
virtual ~daTagCstaSw_HIO_c();
virtual ~daTagCstaSw_HIO_c() {}
void genMessage(JORMContext*);
u8 unk_0x4;
u8 show_range;
};
#endif /* D_A_TAG_CSTASW_H */
include/d/actor/d_a_tag_Lv6Gate.h
+1 -1
View File
@@ -6,7 +6,7 @@
class daTagLv6Gate_c : public fopAc_ac_c {
public:
int createHeap();
inline int createHeap();
int create();
inline int execute();
int draw();
include/d/actor/d_a_tag_Lv7Gate.h
+6 -6
View File
@@ -6,23 +6,23 @@
class daTagLv7Gate_c : public fopAc_ac_c {
public:
int create();
void create_init();
int execute();
inline void create_init();
inline int execute();
void calcFly();
inline ~daTagLv7Gate_c();
inline int createHeap();
inline void setPath(u8 i_path_ID);
inline int setPath(int i_path_ID);
inline void initBaseMtx();
inline void setBaseMtx();
inline void flyAnime();
inline bool checkPoint(f32 i_speed);
inline bool checkPoint(cXyz& i_point, f32 i_speed);
inline bool setNextPoint();
inline int draw();
u8 getPathID() { return fopAcM_GetParam(this) >> 0x10; }
u16 getFlowNodeNo() { return fopAcM_GetParam(this); }
u8 getPathID() { return (fopAcM_GetParam(this) >> 16) & 0xFF; }
s16 getFlowNodeNo() { return (u16)fopAcM_GetParam(this); }
/* 0x568 */ J3DModel* mpModel;
/* 0x56C */ mDoExt_bckAnm* mpBck;
include/d/actor/d_a_tag_Lv8Gate.h
+2 -2
View File
@@ -10,8 +10,8 @@ class daTagLv8Gate_c : public fopAc_ac_c {
public:
inline ~daTagLv8Gate_c();
int createHeap();
int execute();
inline int createHeap();
inline int execute();
void initBaseMtx();
void create_init();
include/d/actor/d_a_tag_TWgate.h
+43 -40
View File
@@ -8,6 +8,26 @@
class daTagTWGate_c;
typedef void (daTagTWGate_c::*actionFunc)();
struct daTagTWGate_Attr_c {
/* 0x00 */ u8 show_range;
};
class daTagTWGate_Hio_c : public mDoHIO_entry_c {
public:
daTagTWGate_Hio_c();
inline void ct();
inline void dt();
void default_set();
inline void genMessage(JORMContext*);
/* 0x08 */ int field_0x8;
/* 0x0C */ daTagTWGate_Attr_c attr;
};
class daTagTWGate_c : public fopAc_ac_c {
public:
enum EType {
@@ -31,6 +51,7 @@ public:
/* 0x0A */ ACT_DEMO_HYRAL_1,
/* 0x0B */ ACT_DEMO_HYRAL_2,
/* 0x0C */ ACT_DEMO_HYRAL_3,
/* 0x0D */ MODE_MAX_e,
};
inline ~daTagTWGate_c();
@@ -62,65 +83,47 @@ public:
void initDemoHyral3();
void executeDemoHyral3();
void initBaseMtx();
int downloadModels();
inline int downloadModels();
void initTalk(int, fopAc_ac_c**);
bool talkProc(int*, int, fopAc_ac_c**);
static int createHeapCallBack(fopAc_ac_c*);
int CreateHeap();
u8 getSwitch() { return fopAcM_GetParam(this) >> 8; }
u8 getSwitch() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
u8 getType() { return fopAcM_GetParam(this); }
inline int create();
void create_init() {
field_0x5e0 = 0;
mActionID = 0;
mAction = &ActionTable[mActionID][0];
(this->**mAction)();
inline void create_init();
inline void callExecute();
inline int execute();
inline int draw();
#if DEBUG
daTagTWGate_Attr_c& attr() const {
return mHio.attr;
}
#endif
void callExecute() {
(this->*mAction[1])();
mDoAud_seStartLevel(Z2SE_OBJ_DARK_GATE, &current.pos, 0, 0);
}
inline void callInit();
int execute() {
callExecute();
inline void setAction(Mode_e i_action);
if (field_0x5e0 != 0) {
mpMorf->play(0, 0);
mpMorf->modelCalc();
}
return 1;
}
int draw() {
if (field_0x5e0 != 0) {
mpMorf->entryDL();
}
return 1;
}
void callInit() {
(this->*(*mAction))();
}
void setAction(Mode_e action) {
mActionID = action;
mAction = ActionTable[mActionID];
callInit();
}
static u8 const mAttr[1];
static actionFunc ActionTable[13][2];
static daTagTWGate_Attr_c const mAttr;
#if DEBUG
static daTagTWGate_Hio_c mHio;
#endif
static const actionFunc ActionTable[][2];
private:
/* 0x568 */ mDoExt_McaMorfSO* mpMorf;
/* 0x56C */ request_of_phase_process_class mPhaseZevArc;
/* 0x574 */ request_of_phase_process_class mPhaseMdRes;
/* 0x57C */ request_of_phase_process_class mPhasePyRes;
/* 0x584 */ actionFunc* mAction;
/* 0x584 */ const actionFunc* mAction;
/* 0x588 */ int mActionID;
/* 0x58C */ dMsgFlow_c mMsgFlow;
/* 0x5D8 */ u8 field_0x5d8[4];
include/d/actor/d_a_tag_assistance.h
+3 -15
View File
@@ -5,21 +5,9 @@
class daTagAssist_c : public fopAc_ac_c {
public:
void create_init() {
attention_info.flags = 0;
field_0x570 = -1;
}
int create() {
fopAcM_ct(this, daTagAssist_c);
create_init();
return cPhs_COMPLEATE_e;
}
int execute() {
fopAcM_searchPlayerDistanceXZ(this);
return 1;
}
inline void create_init();
inline int create();
inline int execute();
u8 field_0x568[8];
s16 field_0x570;
include/d/actor/d_a_tag_attack_item.h
+1
View File
@@ -16,6 +16,7 @@ public:
void action();
BOOL checkHit();
void createItem();
int draw();
int _delete();
virtual ~daTagAtkItem_c() {}
include/d/actor/d_a_tag_attention.h
+33 -12
View File
@@ -4,6 +4,22 @@
#include "d/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
class daAttp_HIO_c : public mDoHIO_entry_c {
public:
daAttp_HIO_c();
void genMessage(JORMContext*);
/* 0x06 */ u8 enable_type_switching;
/* 0x07 */ u8 type_spec;
/* 0x08 */ u8 enable_distance_display;
/* 0x0C */ f32 dist_max;
/* 0x10 */ f32 dist_max_release;
/* 0x14 */ f32 dist_adjust;
/* 0x18 */ f32 upper_y;
/* 0x1C */ f32 lower_y;
};
class daAttp_c : public fopAc_ac_c {
public:
int Create();
@@ -11,28 +27,33 @@ public:
int execute();
int draw();
int _delete();
#if DEBUG
Mtx field_0x568;
u8 field_0x598;
#endif
}; // Size: 0x568
namespace daAttp_prm {
static inline u32 getArg0(daAttp_c* pActor) {
return fopAcM_GetParam(pActor) & 3;
static inline u8 getArg0(daAttp_c* pActor) {
return fopAcM_GetParam(pActor) & 0x3;
}
static inline u32 getArg1(daAttp_c* pActor) {
return (fopAcM_GetParam(pActor) >> 2) & 3;
static inline u8 getArg1(daAttp_c* pActor) {
return (fopAcM_GetParam(pActor) >> 2) & 0x3;
}
static inline u32 getArg2(daAttp_c* pActor) {
return (fopAcM_GetParam(pActor) >> 4) & 7;
static inline u8 getArg2(daAttp_c* pActor) {
return (fopAcM_GetParam(pActor) >> 4) & 0x7;
}
static inline u32 getArg3(daAttp_c* pActor) {
return (fopAcM_GetParam(pActor) >> 7) & 1;
static inline u8 getArg3(daAttp_c* pActor) {
return (fopAcM_GetParam(pActor) >> 7) & 0x1;
}
static inline u32 getArg4(daAttp_c* pActor) {
return (fopAcM_GetParam(pActor) >> 8) & 1;
static inline u8 getArg4(daAttp_c* pActor) {
return (fopAcM_GetParam(pActor) >> 8) & 0x1;
}
static inline u32 getSw1(daAttp_c* pActor) {
static inline u8 getSw1(daAttp_c* pActor) {
return (fopAcM_GetParam(pActor) >> 0x10) & 0xff;
}
static inline u32 getSw2(daAttp_c* pActor) {
static inline u8 getSw2(daAttp_c* pActor) {
return (fopAcM_GetParam(pActor) >> 0x18);
}
} // namespace daAttp_prm
include/d/actor/d_a_tag_bottle_item.h
+6 -6
View File
@@ -14,18 +14,18 @@ private:
/* 0x0576 */ u8 mBottleItemType;
public:
s32 create();
s32 Delete();
s32 Execute();
s32 Draw();
int create();
int Delete();
int Execute();
int Draw();
void setTypeFromParam();
void restart();
void initialize();
int checkProcess(ProcessFunc);
int setProcess(ProcessFunc);
void setAttnPos();
s32 chkEvent();
s32 orderEvent();
int chkEvent();
int orderEvent();
void makeSoup();
int wait(void*);
virtual ~daTag_BottleItem_c();
include/d/actor/d_a_tag_camera.h
+1
View File
@@ -14,6 +14,7 @@ public:
u16 getAreaType();
u16 getAreaNoChk();
int execute();
int draw();
inline int create();
include/d/actor/d_a_tag_chgrestart.h
+11 -6
View File
@@ -6,10 +6,11 @@
class daTagChgRestart_c : public fopAc_ac_c {
public:
daTagChgRestart_c() {}
s32 Create();
s32 create();
s32 execute();
s32 _delete();
int Create();
int create();
int execute();
int draw();
int _delete();
/* 0x0568 */ cXyz mVertices[4];
};
@@ -17,8 +18,12 @@ public:
STATIC_ASSERT(sizeof(daTagChgRestart_c) == 0x598);
namespace daTagChgRestart_prm {
inline u8 getSwNo(daTagChgRestart_c* p_chgRestart) { return fopAcM_GetParam(p_chgRestart) >> 8; }
inline u8 getPlayerNo(daTagChgRestart_c* p_chgRestart) { return fopAcM_GetParam(p_chgRestart); }
inline u8 getSwNo(daTagChgRestart_c* p_chgRestart) {
return (fopAcM_GetParam(p_chgRestart) >> 8) & 0xFF;
}
inline u8 getPlayerNo(daTagChgRestart_c* p_chgRestart) {
return fopAcM_GetParam(p_chgRestart);
}
}; // namespace daTagChgRestart_prm
#endif /* D_A_TAG_CHGRESTART_H */
include/d/actor/d_a_tag_chkpoint.h
+9 -5
View File
@@ -7,11 +7,12 @@
class daTag_Chk_c : public fopAc_ac_c {
public:
int execute();
int draw();
u16 getAreaType() { return home.angle.z & 0x100; }
u16 getHeight() { return fopAcM_GetParam(this) & 0xff; }
u8 getSwBit() { return fopAcM_GetParam(this) >> 8; }
u8 getSwBit2() { return fopAcM_GetParam(this) >> 16; }
u8 getHeight() { return fopAcM_GetParam(this) & 0xff; }
u8 getSwBit() { return (fopAcM_GetParam(this) & 0xff00) >> 8; }
u8 getSwBit2() { return (fopAcM_GetParam(this) & 0xff0000) >> 16; }
int create() {
fopAcM_ct(this, daTag_Chk_c);
@@ -34,8 +35,11 @@ public:
attention_info.position = current.pos;
u16 height = getHeight();
height != 0xff ? attention_info.position.y += height * 10.0f : attention_info.position.y += scale.y * 0.5f;
if (getHeight() != 0xff) {
attention_info.position.y += getHeight() * 10.0f;
} else {
attention_info.position.y += scale.y * 0.5f;
}
eyePos = attention_info.position;
return cPhs_COMPLEATE_e;
include/d/actor/d_a_tag_csw.h
+1 -1
View File
@@ -23,7 +23,7 @@ struct daTagCsw_c : public fopAc_ac_c, public request_of_phase_process_class {
int getSw2() { return fopAcM_GetParamBit(this, 9, 8); }
int getType() { return fopAcM_GetParamBit(this, 0, 1); }
int getParam(int param_1, int param_2, int param_3) {
return (1 << param_3) - 1U & param_1 >> (param_2 & 0x3fU);
return (1 << param_3) - 1U & param_1 >> param_2;
}
int getArg0() { return getParam(current.angle.x, 0, 8); }
int getItemBit() { return fopAcM_GetParamBit(this, 17, 8); }
include/d/actor/d_a_tag_escape.h
+1 -2
View File
@@ -5,8 +5,7 @@
class daTagEscape_c : public fopAc_ac_c {
public:
daTagEscape_c() {}
~daTagEscape_c() {}
inline int create();
u8 getPathID() { return fopAcM_GetParam(this) & 0xff; }
};
include/d/actor/d_a_tag_guard.h
+1 -1
View File
@@ -9,7 +9,7 @@ public:
int getAppearPoint(Vec*);
void createGuard(u32);
u8 getPathID() { return fopAcM_GetParam(this) >> 8; }
u8 getPathID() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
inline int create();
inline void create_init();
include/d/actor/d_a_tag_howl.h
+1 -1
View File
@@ -14,7 +14,7 @@ public:
int destroy();
int execute();
int draw();
u8 isAreaCheck();
bool isAreaCheck();
int getParam();
u8 getSwitchBit();
virtual ~daTag_Howl_c() {}
include/d/actor/d_a_tag_kmsg.h
+2 -2
View File
@@ -45,9 +45,9 @@ public:
}
int getType() {
int param = fopAcM_GetParam(this) >> 0x18;
int type;
u32 param = (fopAcM_GetParam(this) & 0xFF000000) >> 0x18;
int type;
if (param == 0xFF) {
type = 0;
} else {
include/d/actor/d_a_tag_lantern.h
+1 -1
View File
@@ -5,7 +5,7 @@
#include "d/d_msg_flow.h"
struct daTag_Lantern_HIOParam {
u8 field_0x0;
u8 enable_debug_info;
};
class daTag_Lantern_Param_c {
include/d/actor/d_a_tag_lightball.h
+2 -2
View File
@@ -13,8 +13,8 @@ public:
int draw();
int _delete();
u8 getSwBit() { return fopAcM_GetParamBit(this, 0, 8); }
u32 getType() { return fopAcM_GetParamBit(this, 8, 4); }
u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
u8 getType() { return fopAcM_GetParamBit(this, 8, 4); }
/* 0x568 */ DALKMIST_INFLUENCE mInfluence;
/* 0x57C */ u8 field_0x57c;
include/d/actor/d_a_tag_lv6CstaSw.h
+3 -3
View File
@@ -14,7 +14,7 @@ public:
int Draw();
int Delete();
u8 getSw() { return fopAcM_GetParamBit(this, 0, 8); }
u32 getSw() { return fopAcM_GetParamBit(this, 0, 8); }
private:
/* 0x568 */ u8 mSwitch;
@@ -24,11 +24,11 @@ private:
class daLv6CstaSw_HIO_c : public mDoHIO_entry_c {
public:
daLv6CstaSw_HIO_c();
virtual ~daLv6CstaSw_HIO_c();
virtual ~daLv6CstaSw_HIO_c() {}
void genMessage(JORMContext*);
u8 unk_0x4;
u8 show_range;
};
#endif /* D_A_TAG_LV6CSTASW_H */
include/d/actor/d_a_tag_mist.h
+5 -4
View File
@@ -11,6 +11,7 @@ public:
int Create();
int create();
int execute();
int draw();
int _delete();
static u8 getPlayerNo();
@@ -28,18 +29,18 @@ public:
namespace daTagMist_prm {
inline u8 getSwNoNum(daTagMist_c* i_this) {
return fopAcM_GetParam(i_this) >> 0x10;
return (fopAcM_GetParam(i_this) >> 16) & 0xFF;
}
inline u8 getMySwNo(daTagMist_c* i_this) {
return fopAcM_GetParam(i_this) >> 0x8;
return (fopAcM_GetParam(i_this) >> 8) & 0xFF;
}
inline u8 getTopSwNo(daTagMist_c* i_this) {
return fopAcM_GetParam(i_this);
}
inline u8 getExitNo(daTagMist_c* i_this) {
return (fopAcM_GetParam(i_this) >> 0x18) & 0x3F;
return (fopAcM_GetParam(i_this) >> 24) & 0x3F;
}
inline int getSwNo2(daTagMist_c* i_this) {
inline u8 getSwNo2(daTagMist_c* i_this) {
return i_this->field_0x5a2 & 0xFF;
}
} // namespace daTagMist_prm
include/d/actor/d_a_tag_mmsg.h
+2 -2
View File
@@ -12,13 +12,13 @@ public:
int execute();
void onUseFlg() { mUseFlg = true; }
bool checkNoAttention() { return mAttention == 0xFF; }
bool checkNoAttention() const { return mAttention == 0xFF; }
private:
/* 0x568 */ u8 field_0x568;
/* 0x569 */ u8 field_0x569;
/* 0x56A */ u8 mAttention;
/* 0x56B */ bool field_0x56b;
/* 0x56B */ u8 field_0x56b;
/* 0x56C */ bool mUseFlg;
/* 0x56D */ u8 field_0x56d[3];
/* 0x570 */ u16 field_0x570;
include/d/actor/d_a_tag_msg.h
+20 -3
View File
@@ -16,6 +16,23 @@ public:
static const daTag_Msg_HIO_Param_c m;
};
#if DEBUG
class daTag_Msg_HIO_c : public JORReflexible {
public:
daTag_Msg_HIO_c();
~daTag_Msg_HIO_c();
void genMessage(JORMContext*);
s8 mChild;
daTag_Msg_HIO_Param_c m;
};
#define TAG_MSG_HIO_CLASS daTag_Msg_HIO_c
#else
#define TAG_MSG_HIO_CLASS daTag_Msg_Param_c
#endif
class daTag_Msg_c : public fopAc_ac_c {
public:
virtual ~daTag_Msg_c();
@@ -39,9 +56,9 @@ public:
/* 0x5CC */ int mOrderEvtNum;
/* 0x5D0 */ s16 mEventIdx;
/* 0x5D2 */ u8 field_0x5D2[0x5D8 - 0x5D2];
/* 0x5D8 */ daTag_Msg_Param_c* mParam;
/* 0x5DC */ u8 field_0x5dc;
/* 0x5DD */ u8 field_0x5dd;
/* 0x5D8 */ TAG_MSG_HIO_CLASS* mpHIO;
/* 0x5DC */ bool field_0x5dc;
/* 0x5DD */ bool field_0x5dd;
/* 0x5DE */ u8 mOnSwitch;
/* 0x5DF */ u8 mOffSwitch;
/* 0x5E0 */ u16 mOnSaveLabel;
include/d/actor/d_a_tag_myna2.h
+2 -2
View File
@@ -8,8 +8,8 @@ public:
s32 create();
s32 execute();
u8 getSwBit() { return fopAcM_GetParam(this) >> 8; }
u8 getMode() { return fopAcM_GetParam(this); }
u8 getSwBit() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
int getMode() { return fopAcM_GetParam(this) & 0xFF; }
f32 getExtent() { return scale.x * 100.0f;}
private:
include/d/actor/d_a_tag_myna_light.h
+2 -2
View File
@@ -10,8 +10,8 @@ public:
int Execute();
int Draw();
bool setTurnOnOffChange();
u32 getTurnOnTime();
u32 getTurnOffTime();
u8 getTurnOnTime();
u8 getTurnOffTime();
void initialize();
virtual ~daTag_MynaLight_c();
include/d/actor/d_a_tag_push.h
+4 -7
View File
@@ -14,17 +14,14 @@ public:
int isDelete();
int chkPointInArea(cXyz);
u32 getId() {
u32 id = fopAcM_GetParam(this) >> 0x18;
if (id != 0xFF) {
return id;
}
return -1;
int getId() {
u16 id = (fopAcM_GetParam(this) & 0xFF000000) >> 24;
return id == 0xFF ? -1 : id;
}
u8 getBitSW() { return fopAcM_GetParam(this) & 0xFF; }
u8 getBitSW2() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
u8 getBitSW2() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
u32 getFlowNodeNo() {
if (home.angle.x != 0xFFFF) {
include/d/actor/d_a_tag_qs.h
+1 -1
View File
@@ -17,7 +17,7 @@ public:
int execute();
int draw();
u8 getType() { return fopAcM_GetParamBit(this, 0, 1); }
u32 getType() { return fopAcM_GetParamBit(this, 0, 1); }
int getSwNo() { return fopAcM_GetParamBit(this, 1, 8); }
/* 0x568 */ f32 field_0x568;
include/d/actor/d_a_tag_ret_room.h
+1 -1
View File
@@ -13,7 +13,7 @@ public:
int draw();
int execute();
void init();
u8 chkPlyrInTag();
bool chkPlyrInTag();
/* 0x56C */ f32 field_0x56c;
/* 0x570 */ f32 field_0x570;
include/d/actor/d_a_tag_river_back.h
+4 -2
View File
@@ -31,9 +31,11 @@ public:
void setAction(u8 i_action) { mAction = i_action; }
u8 getSwBit() { return fopAcM_GetParamBit(this, 8, 8); }
u8 getSwbit() { return fopAcM_GetParamBit(this, 8, 8); }
u8 getSwBit2() { return fopAcM_GetParamBit(this, 0x10, 8); }
u8 getSwbit2() { return fopAcM_GetParamBit(this, 0x10, 8); }
u8 getNextSceneNo() { return fopAcM_GetParamBit(this, 0, 8); }
/* 0x568 */ request_of_phase_process_class mPhase;
/* 0x570 */ u8 mTimer;
include/d/actor/d_a_tag_rmbit_sw.h
+2 -2
View File
@@ -12,13 +12,13 @@ public:
int draw();
int execute();
void init();
u8 chkPlyrInTag();
bool chkPlyrInTag();
s8 getArg0_RoomSaveTableNo() { return fopAcM_GetParamBit(this, 0, 8); }
s8 getArg1_RoomNo() { return fopAcM_GetParamBit(this, 8, 8); }
u8 getArg2_CngBitVal() { return fopAcM_GetParamBit(this, 16, 1); }
u8 getArg3_CngBitFlg() { return fopAcM_GetParamBit(this, 17, 1); }
u8 getSwBit() { return fopAcM_GetParamBit(this, 24, 8); }
int getSwBit() { return fopAcM_GetParamBit(this, 24, 8); }
/* 0x56C */ f32 field_0x56c;
/* 0x570 */ f32 field_0x570;
include/d/actor/d_a_tag_setrestart.h
+1
View File
@@ -8,6 +8,7 @@ public:
int Create();
int create();
int execute();
int draw();
int _delete();
/* 0x568 */ s8 mPlayerRoomNo;
include/d/actor/d_a_tag_spinner.h
+1
View File
@@ -14,6 +14,7 @@ public:
int CreateHeap();
int create();
int execute();
int draw();
int _delete();
f32 GetR() { return mRadius; }
};
include/d/actor/d_a_tag_spring.h
+3 -2
View File
@@ -10,10 +10,11 @@ public:
int Create();
int create();
int execute();
u8 checkArea();
bool checkArea();
int draw();
int _delete();
u32 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
/* 0x568 */ u8 mTimer;
}; // Size: 0x56C
include/d/actor/d_a_tag_ss_drink.h
+1 -2
View File
@@ -14,7 +14,7 @@ public:
int Delete();
int Execute();
int Draw();
int getTypeFromParam();
u8 getTypeFromParam();
u8 getSwitchFromParam();
u16 getFlowNodeNum();
u16 getValue();
@@ -29,7 +29,6 @@ public:
int talk(void*);
~daTag_SSDrink_c();
s32 fopAcM_seenPlayerAngleY() { return fopAcM_seenActorAngleY(this, dComIfGp_getPlayer(0)); }
bool checkShopOil() const { return field_0x5D2 == 4; }
/* 0x578 */ dMsgFlow_c field_0x578;
include/d/actor/d_a_tag_statue_evt.h
+9 -5
View File
@@ -21,7 +21,7 @@ public:
void endParticle();
BOOL checkStartDemo();
BOOL checkOnEffect();
s32 getLetterCount();
int getLetterCount();
int draw();
int _delete();
@@ -38,7 +38,7 @@ private:
/* 0x596 */ u8 mMapToolId;
/* 0x597 */ u8 mSkyCharacterEventBitIdIndex;
/* 0x598 */ s16 mEventId;
/* 0x59C */ u32 mTreasureDemoItemId;
/* 0x59C */ u32 mItemId;
/* 0x5A0 */ s32 mOwlStatueId;
enum Action_e {
@@ -63,19 +63,23 @@ private:
TAG_LOCATION_RUINED_THEATRE
};
void setAction(Action_e action) {
void setAction(u8 action) {
mCurrentAction = action;
}
u32 getSwbit() {
u8 getSwbit() {
return fopAcM_GetParamBit(this, 0, 8);
}
// Returns whether player has obtained a Sky Character from the tag
u32 getSwbit2() {
u8 getSwbit2() {
return fopAcM_GetParamBit(this, 12, 8);
}
u8 getType() {
return fopAcM_GetParamBit(this, 8, 4);
}
};
#endif /* D_A_TAG_STATUE_EVT_H */
include/d/actor/d_a_tag_stream.h
+1 -1
View File
@@ -5,7 +5,7 @@
class daTagStream_c : public fopAc_ac_c {
public:
u8 getPriority() {
u8 getPriority() const {
return mPriority;
}
include/d/actor/d_a_tag_theB_hint.h
+4 -75
View File
@@ -1,61 +1,16 @@
#ifndef D_A_TAG_THEB_HINT_H
#define D_A_TAG_THEB_HINT_H
// #include "d/actor/d_a_npc_theB.h"
#include "d/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
// needs to be pulled from d_a_npc_theB.h eventually
struct daNpcTheB_c {
daNpcTheB_c();
~daNpcTheB_c();
void create();
void CreateHeap();
void Delete();
void Execute();
void Draw();
void ctrlJoint(J3DJoint*, J3DModel*);
void createHeapCallBack(fopAc_ac_c*);
void ctrlJointCallBack(J3DJoint*, int);
void getHandPos1(int);
void getHandPos2(int);
void setHintEvent(s32, u16, int);
void main();
void setParam();
void ctrlBtk();
void setAttnPos();
void setExpressionAnm(int, bool);
void setExpressionBtp(int);
bool setMotionAnm(int, f32);
bool drawDbgInfo();
void reset();
void playExpression();
void playMotion();
void doNormalAction();
void doEvent();
void lookat();
void wait(void*);
void setMotion(int, f32, int);
void setExpression(int, f32);
void talk(void*);
void EvCut_PersonalCombatIntro(int);
void EvCut_PersonalCombatRevenge(int);
void EvCut_PersonalCombatAfter();
void EvCut_AnnulationFieldRace(int);
void EvCut_TheBHint(int);
void EvCut_CoachGuardGameOver(int);
static u8 mEvtSeqList[72];
};
class daTagTheBHint_c : public fopAc_ac_c {
public:
u8 getSwitchNo() {
u32 getSwitchNo() {
return shape_angle.x & 0xff;
}
u16 getMessageNo() {
u32 getMessageNo() {
return shape_angle.z & 0xffff;
}
@@ -65,37 +20,11 @@ public:
s8 getRoomNo() {
return fopAcM_GetParam(this) >> 24;
}
int create() {
fopAcM_ct(this, daTagTheBHint_c);
field_0x568 = pow(scale.x * 100.0f,2.0f);
return cPhs_COMPLEATE_e;
}
int execute() {
if (fopAcM_isSwitch(this,getSwitchNo())) {
fopAcM_delete(this);
return 1;
} else {
f32 distance = fopAcM_searchPlayerDistanceXZ2(this);
inline int create();
inline int execute();
if (distance < field_0x568) {
daNpcTheB_c* the_b = (daNpcTheB_c*)fpcM_SearchByName(PROC_NPC_THEB);
if (the_b) {
s8 roomNo = getRoomNo();
if (roomNo == 0xFF) {
roomNo = fopAcM_GetRoomNo(this);
}
the_b->setHintEvent(getMessageNo(),getLinkID(),roomNo);
}
}
}
return 1;
}
/* 0x568 */ f32 field_0x568;
};
include/d/actor/d_a_tag_waterfall.h
+15 -15
View File
@@ -29,31 +29,31 @@ private:
/* 0x574 */ f32 mFogNear;
/* 0x578 */ f32 mFogFar;
/* 0x57C */ f32 mColorBlend;
/* 0x580 */ bool mPrevCameraInWaterfall;
/* 0x580 */ u8 mPrevCameraInWaterfall;
/* 0x581 */ u8 mFrameCountdown;
/* 0x582 */ u8 mColpat;
/* 0x583 */ u8 mIsMasterWaterfallTag;
};
struct daTagWaterFall_HIO_c {
struct daTagWaterFall_HIO_c : public JORReflexible {
public:
daTagWaterFall_HIO_c();
virtual ~daTagWaterFall_HIO_c();
virtual ~daTagWaterFall_HIO_c() {}
void genMessage(JORMContext*);
/* 0x00 */ /* vtable */
/* 0x04 */ s8 field_0x04;
/* 0x05 */ bool mShouldModifyFog;
/* 0x06 */ u8 pad0[2];
/* 0x08 */ f32 mBaseFogNear;
/* 0x0C */ f32 mBaseFogFar;
/* 0x10 */ f32 mColorBlendStepDivisor;
/* 0x14 */ u8 field_0x14;
/* 0x15 */ u8 field_0x15;
/* 0x16 */ u8 pad1[2];
/* 0x18 */ f32 field_0x18;
/* 0x1C */ f32 field_0x1C;
/* 0x20 */ f32 field_0x20;
/* 0x04 */ s8 child;
/* 0x05 */ u8 enable_fog_adjust;
/* 0x08 */ f32 base_fog_far;
/* 0x0C */ f32 base_fog_near;
/* 0x10 */ f32 color_blend_step_divisor;
/* 0x14 */ u8 draw_ellipse;
/* 0x15 */ u8 enable_ellipse_adjust;
/* 0x18 */ f32 ellipse_radius_a;
/* 0x1C */ f32 ellipse_radius_b;
/* 0x20 */ f32 ellipse_rotate;
};
#endif /* D_A_TAG_WATERFALL_H */
include/d/actor/d_a_tag_yami.h
+2 -2
View File
@@ -16,8 +16,8 @@ public:
void offMidnaTagSw2();
void setCoC(cXyz i_coC) { mCoC = i_coC; }
u8 get_MTagSw() { return fopAcM_GetParamBit(this, 8, 8); }
u8 get_MTagSw2() { return fopAcM_GetParamBit(this, 16, 8); }
int get_MTagSw() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
int get_MTagSw2() { return (fopAcM_GetParam(this) >> 16) & 0xFF; }
s32 get_prm() { return fopAcM_GetParam(this) & 0xff; }
int is_CoHit() { return mIsCoHit; }
include/d/d_bg_parts.h
+2
View File
@@ -9,6 +9,8 @@ public:
void draw(fopAc_ac_c*);
int execute(bool);
void releaseBg();
static void setPointer(void*);
};
#endif /* D_D_BG_PARTS */
include/d/d_bg_s_capt_poly.h
+18
View File
@@ -0,0 +1,18 @@
#ifndef _D_BG_S_CAPT_POLY_H
#define _D_BG_S_CAPT_POLY_H
#include "d/d_bg_s_chk.h"
#include "SSystem/SComponent/c_m3d_g_aab.h"
#include "SSystem/SComponent/c_xyz.h"
class dBgS_CaptPoly : public cBgS_Chk, public dBgS_Chk {
public:
dBgS_CaptPoly();
~dBgS_CaptPoly() {}
void Set(cXyz&, cXyz&);
/* 0x24 */ cM3dGAab aab;
/* 0x48 */ int field_0x48;
};
#endif /* _D_BG_S_CAPT_POLY_H */
include/d/d_bg_w.h
+1 -1
View File
@@ -219,7 +219,7 @@ public:
MtxP GetBaseMtxP() { return pm_base; }
bool ChkNoCalcVtx() { return mFlags & NO_CALC_VTX_e; }
bool ChkFlush() { return field_0x91 & 8; }
void SetLock() { mFlags |= LOCK_e; }
void SetLock() { mFlags |= (u8)LOCK_e; }
void OffRoofRegist() { field_0x91 |= 0x4; }
void OnRoofRegist() { field_0x91 &= ~0x04; }
bool ChkRoofRegist() { return field_0x91 & 4;}
include/d/d_camera.h
+4 -4
View File
@@ -1043,9 +1043,9 @@ public:
int Set(cXyz, cXyz);
int Set(cXyz, cXyz, f32, s16);
int Set(cXyz, cXyz, s16, f32);
void Reset(cXyz, cXyz);
int Reset(cXyz, cXyz);
int Reset();
void Reset(cXyz, cXyz, f32, s16);
int Reset(cXyz, cXyz, f32, s16);
f32 shakeCamera();
int StartShake(s32, u8*, s32, cXyz);
int StopShake();
@@ -1092,8 +1092,8 @@ public:
i_info->field_0x1e = param_1;
}
void EventFlag(int i_flag) {
mEventData.field_0x24 = i_flag;
int EventFlag(int i_flag) {
return mEventData.field_0x24 = i_flag;
}
void Att() {
include/d/d_cc_d.h
+5 -5
View File
@@ -146,7 +146,7 @@ public:
u32 GetRPrm() const { return mRPrm; }
u32 MskSPrm(u32 mask) const { return mGFlag & mask; }
u32 MskRPrm(u32 mask) const { return mRPrm & mask; }
bool ChkSPrm(u32 mask) const { return MskSPrm(mask); }
bool ChkSPrm(u32 mask) { return MskSPrm(mask); }
void OnSPrm(u32 flag) { mGFlag |= flag; }
void OnRPrm(u32 flag) { mRPrm |= flag; }
void OffSPrm(u32 flag) { mGFlag &= ~flag; }
@@ -169,7 +169,7 @@ public:
void SetHitMark(u8 mark) { mHitMark = mark; }
void SetSe(u8 se) { mSe = se; }
void SetMtrl(u8 mtrl) { mMtrl = mtrl; }
void SetAtSpl(dCcG_At_Spl spl) { mSpl = spl; }
void SetSpl(dCcG_At_Spl spl) { mSpl = spl; }
u8 GetSe() { return mSe; }
dCcG_At_Spl GetSpl() { return (dCcG_At_Spl)mSpl; }
u8 GetMtrl() { return mMtrl; }
@@ -311,7 +311,7 @@ public:
void SetAtVec(cXyz& vec) { mGObjAt.SetVec(vec); }
void SetTgVec(cXyz& vec) { mGObjTg.SetVec(vec); }
bool ChkAtNoMass() const { return mGObjAt.ChkSPrm(8); }
bool ChkAtNoMass() { return mGObjAt.ChkSPrm(8); }
void OnAtNoHitMark() { mGObjAt.OnSPrm(2); }
void OffAtNoHitMark() { mGObjAt.OffSPrm(2); }
void OnTgNoHitMark() { mGObjTg.OnSPrm(4); }
@@ -331,7 +331,7 @@ public:
bool ChkAtShieldHit() { return mGObjAt.ChkRPrm(1); }
cXyz* GetAtVecP() { return mGObjAt.GetVecP(); }
cXyz* GetTgVecP() { return mGObjTg.GetVecP(); }
void SetAtSpl(dCcG_At_Spl spl) { mGObjAt.SetAtSpl(spl); }
void SetAtSpl(dCcG_At_Spl spl) { mGObjAt.SetSpl(spl); }
void SetAtHitCallback(dCcD_HitCallback callback) { mGObjAt.SetHitCallback(callback); }
void SetTgHitCallback(dCcD_HitCallback callback) { mGObjTg.SetHitCallback(callback); }
void SetCoHitCallback(dCcD_HitCallback callback) { mGObjCo.SetHitCallback(callback); }
@@ -415,7 +415,7 @@ public:
void SetTgHitPos(cXyz& pos) { mGObjTg.SetHitPos(pos); }
void SetAtHitPos(cXyz& pos) { mGObjAt.SetHitPos(pos); }
u8 GetTgSe() { return mGObjTg.GetSe(); }
u32 GetTgHitObjHitSeID(int i_soundID) { return getHitSeID(GetTgHitObjSe(),i_soundID); }
u32 GetTgHitObjHitSeID(BOOL i_isRebound) { return getHitSeID(GetTgHitObjSe(), i_isRebound); }
cXyz* GetAtHitPosP() { return mGObjAt.GetHitPosP(); }
cXyz* GetTgHitPosP() { return mGObjTg.GetHitPosP(); }
cXyz* GetTgRVecP() { return mGObjTg.GetRVecP(); }

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