mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-12 05:28:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge https://github.com/zeldaret/tp

Browse Source
This commit is contained in:
TakaRikka
2026-03-12 17:56:51 -07:00
parent 875b849c30 bc9bf9d062
commit cb85da153c
931 changed files with 25778 additions and 24285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/GZ2E01/rels/d_a_e_oc/symbols.txt
+2 -1
View File
@@ -237,10 +237,11 @@ m_battle_oc__6E_OC_n = .bss:0x00000048; // type:object size:0x4 scope:global
m_damage_oc__6E_OC_n = .bss:0x0000004C; // type:object size:0x4 scope:global
m_death_oc__6E_OC_n = .bss:0x00000050; // type:object size:0x4 scope:global
m_talk_oc__6E_OC_n = .bss:0x00000054; // type:object size:0x4 scope:global
init$0000 = .bss:0x00000058; // type:object size:0x1 scope:local align:1 data:byte
lbl_216_bss_58 = .bss:0x00000058; // type:object size:0x1 scope:local align:1 data:byte
@3927 = .bss:0x0000005C; // type:object size:0xC scope:local
l_HIO = .bss:0x00000068; // type:object size:0x28 scope:global align:4 data:float
@6203 = .bss:0x00000090; // type:object size:0xC scope:local
init$4239 = .bss:0x0000009C; // type:object size:0x1 scope:local align:1 data:byte
sc$6202 = .bss:0x000000A0; // type:object size:0xC scope:local
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000AC; // type:object size:0x4 scope:global
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000B0; // type:object size:0x4 scope:global
config/GZ2E01/rels/d_a_e_rdy/symbols.txt
+1
View File
@@ -329,6 +329,7 @@ target_info = .bss:0x000000C8; // type:object size:0x28 scope:global
target_info_count = .bss:0x000000F0; // type:object size:0x4 scope:global data:4byte
check_index$4747 = .bss:0x000000F4; // type:object size:0xFF scope:local
c_start = .bss:0x000001F4; // type:object size:0x4 scope:global
data_8077aa20 = .bss:0x000001F8; // type:object size:0x1 scope:global
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000001FC; // type:object size:0x4 scope:global
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000200; // type:object size:0x4 scope:global
sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000204; // type:object size:0x4 scope:global
config/GZ2J01/rels/d_a_e_oc/symbols.txt
+1
View File
@@ -240,6 +240,7 @@ lbl_216_bss_58 = .bss:0x00000058; // type:object size:0x1 data:byte
@3927 = .bss:0x0000005C; // type:object size:0xC scope:local
l_HIO = .bss:0x00000068; // type:object size:0x28 scope:global align:4 data:float
@6203 = .bss:0x00000090; // type:object size:0xC scope:local
init$4239 = .bss:0x0000009C; // type:object size:0x1 scope:local align:1 data:byte
sc$6202 = .bss:0x000000A0; // type:object size:0xC scope:local
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000AC; // type:object size:0x4 scope:global
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000B0; // type:object size:0x4 scope:global
config/GZ2J01/rels/d_a_e_rdy/symbols.txt
+1
View File
@@ -328,6 +328,7 @@ target_info = .bss:0x000000C8; // type:object size:0x28 scope:global
target_info_count = .bss:0x000000F0; // type:object size:0x4 scope:global data:4byte
check_index$4747 = .bss:0x000000F4; // type:object size:0xFF scope:local
c_start = .bss:0x000001F4; // type:object size:0x4 scope:global
data_8077aa20 = .bss:0x000001F8; // type:object size:0x1 scope:global
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000001FC; // type:object size:0x4 scope:global
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000200; // type:object size:0x4 scope:global
sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000204; // type:object size:0x4 scope:global
config/GZ2P01/rels/d_a_e_oc/symbols.txt
+1
View File
@@ -240,6 +240,7 @@ lbl_216_bss_58 = .bss:0x00000058; // type:object size:0x1 data:byte
@3927 = .bss:0x0000005C; // type:object size:0xC scope:local
l_HIO = .bss:0x00000068; // type:object size:0x28 scope:global align:4 data:float
@6203 = .bss:0x00000090; // type:object size:0xC scope:local
init$4239 = .bss:0x0000009C; // type:object size:0x1 scope:local align:1 data:byte
sc$6202 = .bss:0x000000A0; // type:object size:0xC scope:local
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000AC; // type:object size:0x4 scope:global
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000B0; // type:object size:0x4 scope:global
config/GZ2P01/rels/d_a_e_rdy/symbols.txt
+1
View File
@@ -328,6 +328,7 @@ target_info = .bss:0x000000C8; // type:object size:0x28 scope:global
target_info_count = .bss:0x000000F0; // type:object size:0x4 scope:global data:4byte
check_index$4747 = .bss:0x000000F4; // type:object size:0xFF scope:local
c_start = .bss:0x000001F4; // type:object size:0x4 scope:global
data_8077aa20 = .bss:0x000001F8; // type:object size:0x1 scope:global
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000001FC; // type:object size:0x4 scope:global
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000200; // type:object size:0x4 scope:global
sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000204; // type:object size:0x4 scope:global
config/RZDJ01/symbols.txt
+1 -1
View File
@@ -32788,7 +32788,7 @@ j3dDefaultColInfo = .sdata2:0x80524168; // type:object size:0x4 data:byte
j3dDefaultAmbInfo = .sdata2:0x8052416C; // type:object size:0x4 data:byte
j3dDefaultNumChans = .sdata2:0x80524170; // type:object size:0x1 data:byte
j3dDefaultTevOrderInfoNull = .sdata2:0x80524171; // type:object size:0x4 data:4byte
j3dDefaultIndTexOrderNull = .sdata2:0x80524175; // type:object size:0x4
j3dDefaultIndTexOrderNull = .sdata2:0x80524175; // type:object size:0x4 data:4byte
j3dDefaultTevColor = .sdata2:0x8052417A; // type:object size:0x8 scope:global align:2 data:2byte
j3dDefaultTevKColor = .sdata2:0x80524182; // type:object size:0x4 data:byte
j3dDefaultTevSwapModeTable = .sdata2:0x80524186; // type:object size:0x4
config/RZDP01/symbols.txt
+1 -1
View File
@@ -32687,7 +32687,7 @@ j3dDefaultColInfo = .sdata2:0x80526AE0; // type:object size:0x4 data:byte
j3dDefaultAmbInfo = .sdata2:0x80526AE4; // type:object size:0x4 data:byte
j3dDefaultNumChans = .sdata2:0x80526AE8; // type:object size:0x1 data:byte
j3dDefaultTevOrderInfoNull = .sdata2:0x80526AE9; // type:object size:0x4 data:4byte
j3dDefaultIndTexOrderNull = .sdata2:0x80526AED; // type:object size:0x4
j3dDefaultIndTexOrderNull = .sdata2:0x80526AED; // type:object size:0x4 data:4byte
j3dDefaultTevColor = .sdata2:0x80526AF2; // type:object size:0x8 scope:global align:2 data:2byte
j3dDefaultTevKColor = .sdata2:0x80526AFA; // type:object size:0x4 data:byte
j3dDefaultTevSwapModeTable = .sdata2:0x80526AFE; // type:object size:0x4
config/ShieldD/rels/d_a_L7low_drD/symbols.txt
+4 -2
View File
@@ -37,7 +37,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@116853 = .rodata:0x00000038; // type:object size:0x4 scope:local
cNullVec__6Z2Calc = .rodata:0x0000003C; // type:object size:0xC scope:global
@46916 = .rodata:0x00000048; // type:object size:0x4 scope:local
lbl_268_rodata_4C = .rodata:0x0000004C; // type:object size:0x18
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000050; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000058; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x00000060; // type:object size:0x4 align:4 data:float
@116791 = .data:0x00000000; // type:object size:0x8 scope:local data:string
@116914 = .data:0x00000008; // type:object size:0x11 scope:local data:string
@116915 = .data:0x0000001C; // type:object size:0xF scope:local data:string
@@ -48,4 +50,4 @@ lbl_268_rodata_4C = .rodata:0x0000004C; // type:object size:0x18
@116959 = .data:0x00000098; // type:object size:0x2A scope:local
l_daL7lowDr_Method = .data:0x000000C8; // type:object size:0x20 scope:global
g_profile_L7lowDr = .data:0x000000E8; // type:object size:0x30 scope:global
lbl_268_data_118 = .data:0x00000118; // type:object size:0x3 data:string
@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00000118; // type:object size:0x3 data:string
config/ShieldD/rels/d_a_L7op_demo_drD/symbols.txt
+4 -2
View File
@@ -115,7 +115,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@120176 = .rodata:0x0000014C; // type:object size:0x4 scope:local
cNullVec__6Z2Calc = .rodata:0x00000150; // type:object size:0xC scope:global
@46916 = .rodata:0x0000015C; // type:object size:0x4 scope:local
lbl_269_rodata_160 = .rodata:0x00000160; // type:object size:0x14
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000160; // type:object size:0x8
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000168; // type:object size:0x8
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x00000170; // type:object size:0x4
@119468 = .data:0x00000000; // type:object size:0xC scope:local
@119577 = .data:0x0000000C; // type:object size:0xC scope:local data:4byte
@119578 = .data:0x00000018; // type:object size:0xC scope:local data:4byte
@@ -147,4 +149,4 @@ lbl_269_data_160 = .data:0x00000160; // type:object size:0x24
@120220 = .data:0x000002A8; // type:object size:0x9 scope:local data:string
@120221 = .data:0x000002C0; // type:object size:0x11 scope:local data:string
@120222 = .data:0x000002E0; // type:object size:0x10 scope:local data:string
lbl_269_data_2F0 = .data:0x000002F0; // type:object size:0xC
@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x000002F8; // type:object size:0x3 scope:local data:string
config/ShieldD/rels/d_a_bdD/symbols.txt
+3 -1
View File
@@ -97,7 +97,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@122188 = .rodata:0x000000F0; // type:object size:0x4 scope:local data:string
cNullVec__6Z2Calc = .rodata:0x000000F4; // type:object size:0xC scope:global
@46916 = .rodata:0x00000100; // type:object size:0x4 scope:local
lbl_58_rodata_104 = .rodata:0x00000104; // type:object size:0x18
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000108; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000110; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x00000118; // type:object size:0x4 align:4 data:float
@121278 = .data:0x00000000; // type:object size:0x9 scope:local
@121279 = .data:0x0000000C; // type:object size:0xB scope:local
@121282 = .data:0x00000018; // type:object size:0x9 scope:local
config/ShieldD/rels/d_a_bgD/symbols.txt
+3 -1
View File
@@ -44,7 +44,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@121939 = .rodata:0x00000028; // type:object size:0x4 scope:local align:4 data:float
cNullVec__6Z2Calc = .rodata:0x0000002C; // type:object size:0xC scope:global
@46916 = .rodata:0x00000038; // type:object size:0x4 scope:local
lbl_3_rodata_3C = .rodata:0x0000003C; // type:object size:0x18
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000040; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000048; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x00000050; // type:object size:0x4 align:4 data:float
@LOCAL@createHeap__6daBg_cFv@l_modelName = .data:0x00000000; // type:object size:0x42 scope:local
@LOCAL@createHeap__6daBg_cFv@l_modelName2@0 = .data:0x00000044; // type:object size:0x42 scope:local
@LOCAL@createHeap__6daBg_cFv@l_btkName@1 = .data:0x00000088; // type:object size:0x42 scope:local
config/ShieldD/rels/d_a_door_spiralD/symbols.txt
+24 -2
View File
@@ -117,7 +117,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@117952 = .rodata:0x00000084; // type:object size:0x4 scope:local
cNullVec__6Z2Calc = .rodata:0x00000088; // type:object size:0xC scope:global
@46916 = .rodata:0x00000094; // type:object size:0x4 scope:local
lbl_9_rodata_98 = .rodata:0x00000098; // type:object size:0x14
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000098; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x000000A0; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x000000A8; // type:object size:0x4 align:4 data:float
@116830 = .data:0x00000000; // type:object size:0xF scope:local data:string
@116831 = .data:0x00000010; // type:object size:0xF scope:local data:string
@LOCAL@getSpiralDzbName__10daSpiral_cFi@dzb = .data:0x00000020; // type:object size:0x8 scope:local
@@ -170,7 +172,27 @@ lbl_9_rodata_98 = .rodata:0x00000098; // type:object size:0x14
@117894 = .data:0x00000390; // type:object size:0x19 scope:local data:string
l_daSpiral_Method = .data:0x000003B0; // type:object size:0x20 scope:global
g_profile_SPIRAL_DOOR = .data:0x000003D0; // type:object size:0x30 scope:global
lbl_9_data_400 = .data:0x00000400; // type:object size:0x130
@STRING@onStatusFlag__20dStage_roomControl_cFiUc@2 = .data:0x00000400; // type:object size:0x5 scope:local data:string
@STRING@onStatusFlag__20dStage_roomControl_cFiUc@1 = .data:0x00000408; // type:object size:0xA scope:local data:string
@STRING@onStatusFlag__20dStage_roomControl_cFiUc@0 = .data:0x00000414; // type:object size:0x1F scope:local data:string
@STRING@onStatusFlag__20dStage_roomControl_cFiUc = .data:0x00000434; // type:object size:0xA scope:local data:string
@STRING@offStatusFlag__20dStage_roomControl_cFiUc@2 = .data:0x00000440; // type:object size:0x5 scope:local data:string
@STRING@offStatusFlag__20dStage_roomControl_cFiUc@1 = .data:0x00000448; // type:object size:0xA scope:local data:string
@STRING@offStatusFlag__20dStage_roomControl_cFiUc@0 = .data:0x00000454; // type:object size:0x1F scope:local data:string
@STRING@offStatusFlag__20dStage_roomControl_cFiUc = .data:0x00000474; // type:object size:0xA scope:local data:string
@STRING@checkStatusFlag__20dStage_roomControl_cCFiUc@2 = .data:0x00000480; // type:object size:0x5 scope:local data:string
@STRING@checkStatusFlag__20dStage_roomControl_cCFiUc@1 = .data:0x00000488; // type:object size:0xA scope:local data:string
@STRING@checkStatusFlag__20dStage_roomControl_cCFiUc@0 = .data:0x00000494; // type:object size:0x1F scope:local data:string
@STRING@checkStatusFlag__20dStage_roomControl_cCFiUc = .data:0x000004B4; // type:object size:0xA scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@6 = .data:0x000004C0; // type:object size:0x5 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@5 = .data:0x000004C8; // type:object size:0x9 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@4 = .data:0x000004D4; // type:object size:0x16 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@3 = .data:0x000004EC; // type:object size:0x9 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@2 = .data:0x000004F8; // type:object size:0x5 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@1 = .data:0x00000500; // type:object size:0x9 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@0 = .data:0x0000050C; // type:object size:0x14 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi = .data:0x00000520; // type:object size:0x9 scope:local data:string
@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x0000052C; // type:object size:0x3 scope:local data:string
...bss.0 = .bss:0x00000000; // type:label scope:local
l_step_offset = .bss:0x00000000; // type:object size:0xC scope:global
l_dzb_offset = .bss:0x0000000C; // type:object size:0xC scope:global
config/ShieldD/rels/d_a_e_bgD/symbols.txt
+12 -2
View File
@@ -92,7 +92,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@119712 = .rodata:0x000000A8; // type:object size:0x4 scope:local
cNullVec__6Z2Calc = .rodata:0x000000AC; // type:object size:0xC scope:global
@46916 = .rodata:0x000000B8; // type:object size:0x4 scope:local
lbl_165_rodata_BC = .rodata:0x000000BC; // type:object size:0x18
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x000000C0; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x000000C8; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x000000D0; // type:object size:0x4 align:4 data:float
@118750 = .data:0x00000000; // type:object size:0x7 scope:local
@118751 = .data:0x00000008; // type:object size:0x9 scope:local
@118753 = .data:0x00000014; // type:object size:0x9 scope:local
@@ -141,6 +143,14 @@ lbl_165_data_298 = .data:0x00000298; // type:object size:0x24
@119822 = .data:0x00000480; // type:object size:0xC scope:local
@119823 = .data:0x000004A4; // type:object size:0x11 scope:local data:string
@119824 = .data:0x000004CC; // type:object size:0xD scope:local data:string
lbl_165_data_4D9 = .data:0x000004D9; // type:object size:0x93
@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x000004E8; // type:object size:0x5 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x000004F0; // type:object size:0xF scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x00000500; // type:object size:0x14 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x00000514; // type:object size:0xF scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@2 = .data:0x00000524; // type:object size:0x5 scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@1 = .data:0x0000052C; // type:object size:0x14 scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@0 = .data:0x00000540; // type:object size:0x14 scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs = .data:0x00000554; // type:object size:0x14 scope:local data:string
@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00000568; // type:object size:0x3 scope:local data:string
hio_set = .bss:0x00000000; // type:object size:0x1 data:byte
l_HIO = .bss:0x00000004; // type:object size:0x24 scope:global data:byte
config/ShieldD/rels/d_a_e_dfD/splits.txt
+1 -1
View File
@@ -14,4 +14,4 @@ d/actor/d_a_e_df.cpp:
.ctors start:0x00000000 end:0x00000004
.rodata start:0x00000000 end:0x000000DC
.data start:0x00000000 end:0x00000238
.bss start:0x00000004 end:0x00000010
.bss start:0x00000000 end:0x00000010
config/ShieldD/rels/d_a_e_dfD/symbols.txt
+9 -3
View File
@@ -83,7 +83,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@120010 = .rodata:0x000000B0; // type:object size:0x4 scope:local
cNullVec__6Z2Calc = .rodata:0x000000B4; // type:object size:0xC scope:global
@46916 = .rodata:0x000000C0; // type:object size:0x4 scope:local
lbl_176_rodata_C4 = .rodata:0x000000C4; // type:object size:0x18
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x000000C8; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x000000D0; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x000000D8; // type:object size:0x4 align:4 data:float
@LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@e_prim = .data:0x00000000; // type:object size:0x8 scope:local
@LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@e_env@0 = .data:0x00000008; // type:object size:0x8 scope:local
@LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@eff_id@1 = .data:0x00000010; // type:object size:0x6 scope:local
@@ -108,6 +110,10 @@ __RTTI__12daE_DF_HIO_c = .data:0x00000160; // type:object size:0x8 scope:global
@120105 = .data:0x000001A8; // type:object size:0xE scope:local data:string
@120106 = .data:0x000001B8; // type:object size:0xC scope:local
@120107 = .data:0x000001DC; // type:object size:0x11 scope:local data:string
lbl_176_data_1ED = .data:0x000001ED; // type:object size:0x4B
lbl_176_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte
@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x000001F8; // type:object size:0x5 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x00000200; // type:object size:0xF scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x00000210; // type:object size:0x14 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x00000224; // type:object size:0xF scope:local data:string
@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00000234; // type:object size:0x3 scope:local data:string
hio_set = .bss:0x00000000; // type:object size:0x1 scope:global data:byte
l_HIO = .bss:0x00000004; // type:object size:0xC scope:global data:byte
config/ShieldD/rels/d_a_e_dnD/symbols.txt
+13 -3
View File
@@ -178,7 +178,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@120120 = .rodata:0x00000168; // type:object size:0x4 scope:local align:4 data:float
cNullVec__6Z2Calc = .rodata:0x0000016C; // type:object size:0xC scope:global
@46916 = .rodata:0x00000178; // type:object size:0x4 scope:local
lbl_63_rodata_17C = .rodata:0x0000017C; // type:object size:0x18
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000180; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000188; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x00000190; // type:object size:0x4 align:4 data:float
@LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@e_prim = .data:0x00000000; // type:object size:0x8 scope:local
@LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@e_env@0 = .data:0x00000008; // type:object size:0x8 scope:local
@LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@eff_id@1 = .data:0x00000010; // type:object size:0x6 scope:local
@@ -261,8 +263,16 @@ lbl_63_data_720 = .data:0x00000720; // type:object size:0x38
@120221 = .data:0x00000970; // type:object size:0xE scope:local data:string
@120222 = .data:0x00000980; // type:object size:0xC scope:local
@120223 = .data:0x000009A4; // type:object size:0x11 scope:local data:string
lbl_63_data_9B5 = .data:0x000009B5; // type:object size:0x8F
lbl_63_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte
@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x000009C0; // type:object size:0x5 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x000009C8; // type:object size:0xF scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x000009D8; // type:object size:0x14 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x000009EC; // type:object size:0xF scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@2 = .data:0x000009FC; // type:object size:0x5 scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@1 = .data:0x00000A04; // type:object size:0x14 scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@0 = .data:0x00000A18; // type:object size:0x14 scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs = .data:0x00000A2C; // type:object size:0x14 scope:local data:string
@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00000A40; // type:object size:0x3 scope:local data:string
hio_set = .bss:0x00000000; // type:object size:0x1 data:byte
l_HIO = .bss:0x00000008; // type:object size:0x28 scope:global data:byte
target_info = .bss:0x00000030; // type:object size:0x28 scope:global
target_info_count = .bss:0x00000058; // type:object size:0x4 scope:global data:4byte
config/ShieldD/rels/d_a_e_hpD/symbols.txt
+12 -2
View File
@@ -102,7 +102,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@120093 = .rodata:0x000000B8; // type:object size:0x8 scope:local
cNullVec__6Z2Calc = .rodata:0x000000C0; // type:object size:0xC scope:global
@46916 = .rodata:0x000000CC; // type:object size:0x4 scope:local
lbl_191_rodata_D0 = .rodata:0x000000D0; // type:object size:0x14
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x000000D0; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x000000D8; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x000000E0; // type:object size:0x4 align:4 data:float
@LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@e_prim = .data:0x00000000; // type:object size:0x8 scope:local
@LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@e_env@0 = .data:0x00000008; // type:object size:0x8 scope:local
@LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@eff_id@1 = .data:0x00000010; // type:object size:0x6 scope:local
@@ -161,6 +163,14 @@ lbl_191_data_310 = .data:0x00000310; // type:object size:0x24
@120214 = .data:0x00000528; // type:object size:0xE scope:local data:string
@120215 = .data:0x00000538; // type:object size:0xC scope:local
@120216 = .data:0x0000055C; // type:object size:0x11 scope:local data:string
lbl_191_data_56D = .data:0x0000056D; // type:object size:0x8F
@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x00000578; // type:object size:0x5 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x00000580; // type:object size:0xF scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x00000590; // type:object size:0x14 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x000005A4; // type:object size:0xF scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@2 = .data:0x000005B4; // type:object size:0x5 scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@1 = .data:0x000005BC; // type:object size:0x14 scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@0 = .data:0x000005D0; // type:object size:0x14 scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs = .data:0x000005E4; // type:object size:0x14 scope:local data:string
@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x000005F8; // type:object size:0x3 scope:local data:string
hio_set = .bss:0x00000000; // type:object size:0x1 data:byte
l_HIO = .bss:0x00000004; // type:object size:0x14 scope:global data:byte
config/ShieldD/rels/d_a_e_ocD/symbols.txt
+14 -4
View File
@@ -203,7 +203,9 @@ oc_attackc_trans__6E_OC_n = .rodata:0x00000038; // type:object size:0x28 scope:g
@121462 = .rodata:0x000001D0; // type:object size:0x4 scope:local
cNullVec__6Z2Calc = .rodata:0x000001D4; // type:object size:0xC scope:global
@46916 = .rodata:0x000001E0; // type:object size:0x4 scope:local
lbl_207_rodata_1E4 = .rodata:0x000001E4; // type:object size:0x18
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x000001E8; // type:object size:0x8
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x000001F0; // type:object size:0x8
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x000001F8; // type:object size:0x4
@LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@e_prim = .data:0x00000000; // type:object size:0x8 scope:local
@LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@e_env@0 = .data:0x00000008; // type:object size:0x8 scope:local
@LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@eff_id@1 = .data:0x00000010; // type:object size:0x6 scope:local
@@ -263,13 +265,21 @@ lbl_207_data_3F0 = .data:0x000003F0; // type:object size:0x24
@121570 = .data:0x000005E8; // type:object size:0xE scope:local data:string
@121571 = .data:0x000005F8; // type:object size:0xC scope:local
@121572 = .data:0x0000061C; // type:object size:0x11 scope:local data:string
lbl_207_data_62D = .data:0x0000062D; // type:object size:0x8F
@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x00000638; // type:object size:0x5 data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x00000640; // type:object size:0xF data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x00000650; // type:object size:0x14 data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x00000664; // type:object size:0xF data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@2 = .data:0x00000674; // type:object size:0x5 data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@1 = .data:0x0000067C; // type:object size:0x14 data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@0 = .data:0x00000690; // type:object size:0x14 data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs = .data:0x000006A4; // type:object size:0x14 data:string
@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x000006B8; // type:object size:0x3 data:string
...bss.0 = .bss:0x00000000; // type:label scope:local
m_battle_oc__6E_OC_n = .bss:0x00000000; // type:object size:0x4 scope:global
m_damage_oc__6E_OC_n = .bss:0x00000004; // type:object size:0x4 scope:global
m_death_oc__6E_OC_n = .bss:0x00000008; // type:object size:0x4 scope:global
m_talk_oc__6E_OC_n = .bss:0x0000000C; // type:object size:0x4 scope:global
lbl_207_bss_10 = .bss:0x00000010; // type:object size:0x8 data:byte
lbl_216_bss_58 = .bss:0x00000010; // type:object size:0x1 data:byte
l_HIO = .bss:0x00000018; // type:object size:0x28 scope:global align:4 data:float
lbl_207_bss_40 = .bss:0x00000040; // type:object size:0x1 data:byte
@GUARD@setWaterEffect__8daE_OC_cFv@sc = .bss:0x00000040; // type:object size:0x1 data:byte
@LOCAL@setWaterEffect__8daE_OC_cFv@sc = .bss:0x00000044; // type:object size:0xC scope:local
config/ShieldD/rels/d_a_e_rdD/symbols.txt
+20 -10
View File
@@ -375,7 +375,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@129637 = .rodata:0x000003BC; // type:object size:0x4 scope:local align:4 data:float
cNullVec__6Z2Calc = .rodata:0x000003C0; // type:object size:0xC scope:global
@46916 = .rodata:0x000003CC; // type:object size:0x4 scope:local
lbl_68_rodata_3D0 = .rodata:0x000003D0; // type:object size:0x14
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x000003D0; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x000003D8; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x000003E0; // type:object size:0x4 align:4 data:float
@LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@e_prim = .data:0x00000000; // type:object size:0x8 scope:local
@LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@e_env@0 = .data:0x00000008; // type:object size:0x8 scope:local
@LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@eff_id@1 = .data:0x00000010; // type:object size:0x6 scope:local
@@ -494,26 +496,34 @@ lbl_68_data_BA8 = .data:0x00000BA8; // type:object size:0x38
@129754 = .data:0x00000DF8; // type:object size:0xE scope:local data:string
@129755 = .data:0x00000E08; // type:object size:0xC scope:local
@129756 = .data:0x00000E2C; // type:object size:0x11 scope:local data:string
lbl_68_data_E3D = .data:0x00000E3D; // type:object size:0x8F
@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x00000E48; // type:object size:0x5 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x00000E50; // type:object size:0xF scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x00000E60; // type:object size:0x14 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x00000E74; // type:object size:0xF scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@2 = .data:0x00000E84; // type:object size:0x5 scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@1 = .data:0x00000E8C; // type:object size:0x14 scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@0 = .data:0x00000EA0; // type:object size:0x14 scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs = .data:0x00000EB4; // type:object size:0x14 scope:local data:string
@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00000EC8; // type:object size:0x3 scope:local data:string
...bss.0 = .bss:0x00000000; // type:label scope:local
boss = .bss:0x00000000; // type:object size:0x4 scope:global
lbl_68_bss_4 = .bss:0x00000004; // type:object size:0x1 data:byte
hio_set = .bss:0x00000004; // type:object size:0x1 data:byte
l_HIO = .bss:0x00000008; // type:object size:0x50 scope:global data:byte
S_find = .bss:0x00000058; // type:object size:0x2 scope:global data:2byte
lbl_68_bss_5A = .bss:0x0000005A; // type:object size:0x1 data:byte
lbl_70_bss_AE = .bss:0x0000005A; // type:object size:0x1 data:byte
S_find_pos = .bss:0x0000005C; // type:object size:0xC scope:global
lbl_68_bss_68 = .bss:0x00000068; // type:object size:0x1 data:byte
lbl_68_bss_69 = .bss:0x00000069; // type:object size:0x7 data:byte
desert_substage = .bss:0x00000068; // type:object size:0x1 data:byte
data_80519210 = .bss:0x00000069; // type:object size:0x7 data:byte
target_info = .bss:0x00000070; // type:object size:0x28 scope:global data:4byte
target_info_count = .bss:0x00000098; // type:object size:0x4 scope:global data:4byte
data_80519230 = .bss:0x0000009C; // type:object size:0x1 data:byte
@LOCAL@path_check__FP10e_rd_class@check_index = .bss:0x000000A0; // type:object size:0xFF scope:local
rd_count = .bss:0x000001A0; // type:object size:0x4 scope:global data:4byte
lbl_68_bss_1A4 = .bss:0x000001A4; // type:object size:0x1 data:byte
data_80519338 = .bss:0x000001A4; // type:object size:0x1 data:byte
c_start = .bss:0x000001A8; // type:object size:0x4 scope:global data:4byte
lbl_68_bss_1AC = .bss:0x000001AC; // type:object size:0x1 data:byte
@GUARD@ride_game_actor_set__FP10e_rd_class@set_pos = .bss:0x000001AC; // type:object size:0x1 data:byte
@LOCAL@ride_game_actor_set__FP10e_rd_class@set_pos = .bss:0x000001B0; // type:object size:0x48 scope:local
lbl_68_bss_1F8 = .bss:0x000001F8; // type:object size:0x1 data:byte
@GUARD@coach_game_actor_set__FP10e_rd_class@set_pos = .bss:0x000001F8; // type:object size:0x1 data:byte
@LOCAL@coach_game_actor_set__FP10e_rd_class@set_pos = .bss:0x000001FC; // type:object size:0x24 scope:local
jv_offset = .bss:0x00000220; // type:object size:0xC scope:global
lbl_68_bss_22C = .bss:0x0000022C; // type:object size:0x1 data:byte
instanceCount = .bss:0x0000022C; // type:object size:0x1 data:byte
config/ShieldD/rels/d_a_e_rdyD/symbols.txt
+2 -2
View File
@@ -360,7 +360,7 @@ lbl_216_data_A70 = .data:0x00000A70; // type:object size:0x38
@125509 = .data:0x00000CF4; // type:object size:0x11 scope:local data:string
lbl_216_data_D05 = .data:0x00000D05; // type:object size:0xFB
boss = .bss:0x00000000; // type:object size:0x4 scope:global
lbl_216_bss_4 = .bss:0x00000004; // type:object size:0x1 data:byte
hio_set = .bss:0x00000004; // type:object size:0x1 data:byte
l_HIO = .bss:0x00000008; // type:object size:0x50 scope:global data:byte
S_find = .bss:0x00000058; // type:object size:0x2 scope:global data:2byte
S_find_pos = .bss:0x0000005C; // type:object size:0xC scope:global
@@ -369,4 +369,4 @@ target_info_count = .bss:0x00000090; // type:object size:0x4 scope:global data:4
@LOCAL@path_check__FP11e_rdy_class@check_index = .bss:0x00000094; // type:object size:0xFF scope:local
c_start = .bss:0x00000194; // type:object size:0x4 scope:global data:4byte
jv_offset = .bss:0x00000198; // type:object size:0xC scope:global
lbl_216_bss_1A4 = .bss:0x000001A4; // type:object size:0x1 data:byte
data_8077aa20 = .bss:0x000001A4; // type:object size:0x1 data:byte
config/ShieldD/rels/d_a_e_shD/symbols.txt
+12 -2
View File
@@ -115,7 +115,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@120044 = .rodata:0x00000130; // type:object size:0x8 scope:local
cNullVec__6Z2Calc = .rodata:0x00000138; // type:object size:0xC scope:global
@46916 = .rodata:0x00000144; // type:object size:0x4 scope:local
lbl_221_rodata_148 = .rodata:0x00000148; // type:object size:0x14
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000148; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000150; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x00000158; // type:object size:0x4 align:4 data:float
@LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@e_prim = .data:0x00000000; // type:object size:0x8 scope:local
@LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@e_env@0 = .data:0x00000008; // type:object size:0x8 scope:local
@LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@eff_id@1 = .data:0x00000010; // type:object size:0x6 scope:local
@@ -172,6 +174,14 @@ lbl_221_data_340 = .data:0x00000340; // type:object size:0x24
@120142 = .data:0x00000518; // type:object size:0xE scope:local data:string
@120143 = .data:0x00000528; // type:object size:0xC scope:local
@120144 = .data:0x0000054C; // type:object size:0x11 scope:local data:string
lbl_221_data_55D = .data:0x0000055D; // type:object size:0x8F
@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x00000568; // type:object size:0x5 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x00000570; // type:object size:0xF scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x00000580; // type:object size:0x14 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x00000594; // type:object size:0xF scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@2 = .data:0x000005A4; // type:object size:0x5 scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@1 = .data:0x000005AC; // type:object size:0x14 scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@0 = .data:0x000005C0; // type:object size:0x14 scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs = .data:0x000005D4; // type:object size:0x14 scope:local data:string
@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x000005E8; // type:object size:0x3 scope:local data:string
hio_set = .bss:0x00000000; // type:object size:0x1 data:byte
l_HIO = .bss:0x00000004; // type:object size:0x2C scope:global data:byte
config/ShieldD/rels/d_a_e_sm2D/symbols.txt
+9 -1
View File
@@ -212,7 +212,15 @@ lbl_223_data_610 = .data:0x00000610; // type:object size:0x38
@120420 = .data:0x000008A0; // type:object size:0xC scope:local
@120421 = .data:0x000008B8; // type:object size:0x11 scope:local data:string
@120422 = .data:0x000008E4; // type:object size:0xD scope:local data:string
lbl_223_data_8F1 = .data:0x000008F1; // type:object size:0x93
@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x00000900; // type:object size:0x5 data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x00000908; // type:object size:0xF data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x00000918; // type:object size:0x14 data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x0000092C; // type:object size:0xF data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@2 = .data:0x0000093C; // type:object size:0x5 data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@1 = .data:0x00000944; // type:object size:0x14 data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@0 = .data:0x00000958; // type:object size:0x14 data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs = .data:0x0000096C; // type:object size:0x14 data:string
@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00000980; // type:object size:0x3 data:string
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
...bss.0 = .bss:0x00000008; // type:label scope:local
@119109 = .bss:0x00000008; // type:object size:0xC scope:local
config/ShieldD/rels/d_a_e_stD/symbols.txt
+13 -3
View File
@@ -190,7 +190,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@121296 = .rodata:0x000001A8; // type:object size:0x4 scope:local
cNullVec__6Z2Calc = .rodata:0x000001AC; // type:object size:0xC scope:global
@46916 = .rodata:0x000001B8; // type:object size:0x4 scope:local
lbl_224_rodata_1BC = .rodata:0x000001BC; // type:object size:0x18
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x000001C0; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x000001C8; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x000001D0; // type:object size:0x4 align:4 data:float
@LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@e_prim = .data:0x00000000; // type:object size:0x8 scope:local
@LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@e_env@0 = .data:0x00000008; // type:object size:0x8 scope:local
@LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@eff_id@1 = .data:0x00000010; // type:object size:0x6 scope:local
@@ -262,8 +264,16 @@ lbl_224_data_5CF = .data:0x000005CF; // type:object size:0x39
@121292 = .data:0x00000840; // type:object size:0xE scope:local data:string
@121293 = .data:0x00000850; // type:object size:0xC scope:local
@121294 = .data:0x00000874; // type:object size:0x11 scope:local data:string
lbl_224_data_885 = .data:0x00000885; // type:object size:0x8F
@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x00000890; // type:object size:0x5 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x00000898; // type:object size:0xF scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x000008A8; // type:object size:0x14 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x000008BC; // type:object size:0xF scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@2 = .data:0x000008CC; // type:object size:0x5 scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@1 = .data:0x000008D4; // type:object size:0x14 scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@0 = .data:0x000008E8; // type:object size:0x14 scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs = .data:0x000008FC; // type:object size:0x14 scope:local data:string
@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00000910; // type:object size:0x3 scope:local data:string
small = .bss:0x00000000; // type:object size:0x4 scope:global
lbl_224_bss_4 = .bss:0x00000004; // type:object size:0x1 data:byte
hio_set = .bss:0x00000004; // type:object size:0x1 data:byte
l_HIO = .bss:0x00000008; // type:object size:0x24 scope:global data:byte
top_pos_data = .bss:0x00000030; // type:object size:0x30 scope:global
config/ShieldD/rels/d_a_e_ygD/symbols.txt
+15 -3
View File
@@ -130,7 +130,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@119052 = .rodata:0x00000118; // type:object size:0x4 scope:local
cNullVec__6Z2Calc = .rodata:0x0000011C; // type:object size:0xC scope:global
@46916 = .rodata:0x00000128; // type:object size:0x4 scope:local
lbl_241_rodata_12C = .rodata:0x0000012C; // type:object size:0x18
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000130; // type:object size:0x8 scope:local data:float
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000138; // type:object size:0x8 scope:local data:float
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x00000140; // type:object size:0x4 scope:local data:float
@LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@e_prim = .data:0x00000000; // type:object size:0x8 scope:local
@LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@e_env@0 = .data:0x00000008; // type:object size:0x8 scope:local
@LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@eff_id@1 = .data:0x00000010; // type:object size:0x6 scope:local
@@ -179,13 +181,23 @@ __vt__18mDoExt_3DlineMat_c = .data:0x00000360; // type:object size:0x14 scope:gl
@119047 = .data:0x000004A8; // type:object size:0xE scope:local data:string
@119048 = .data:0x000004B8; // type:object size:0xC scope:local
@119049 = .data:0x000004DC; // type:object size:0x11 scope:local data:string
lbl_241_data_4ED = .data:0x000004ED; // type:object size:0x7B
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@6 = .data:0x000004F8; // type:object size:0x5 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@5 = .data:0x00000500; // type:object size:0x9 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@4 = .data:0x0000050C; // type:object size:0x16 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@3 = .data:0x00000524; // type:object size:0x9 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@2 = .data:0x00000530; // type:object size:0x5 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@1 = .data:0x00000538; // type:object size:0x9 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@0 = .data:0x00000544; // type:object size:0x14 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi = .data:0x00000558; // type:object size:0x9 scope:local data:string
@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00000564; // type:object size:0x3 scope:local data:string
...bss.0 = .bss:0x00000000; // type:label scope:local
hio_set = .bss:0x00000000; // type:object size:0x1 scope:global data:byte
l_HIO = .bss:0x00000004; // type:object size:0x1C scope:global data:byte
lbl_241_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte
@GUARD@ms_disappear__FP10e_yg_class@e_pos = .bss:0x00000020; // type:object size:0x1 data:byte
@LOCAL@ms_disappear__FP10e_yg_class@e_pos = .bss:0x00000024; // type:object size:0x24 scope:local
target_info = .bss:0x00000048; // type:object size:0x50 scope:global
target_info_count = .bss:0x00000098; // type:object size:0x4 scope:global data:4byte
ke_p = .bss:0x0000009C; // type:object size:0x9C scope:global
ke_a = .bss:0x00000138; // type:object size:0x4E scope:global
@GUARD@daE_YG_Execute__FP10e_yg_class@sc = .bss:0x00000186; // type:object size:0x1 scope:local
@LOCAL@daE_YG_Execute__FP10e_yg_class@sc = .bss:0x00000188; // type:object size:0xC scope:local
config/ShieldD/rels/d_a_e_yrD/symbols.txt
+16 -2
View File
@@ -129,7 +129,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@120826 = .rodata:0x00000130; // type:object size:0x4 scope:local
cNullVec__6Z2Calc = .rodata:0x00000134; // type:object size:0xC scope:global
@46916 = .rodata:0x00000140; // type:object size:0x4 scope:local
lbl_247_rodata_144 = .rodata:0x00000144; // type:object size:0x18
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000148; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000150; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x00000158; // type:object size:0x4 align:4 data:float
@LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@e_prim = .data:0x00000000; // type:object size:0x8 scope:local
@LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@e_env@0 = .data:0x00000008; // type:object size:0x8 scope:local
@LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@eff_id@1 = .data:0x00000010; // type:object size:0x6 scope:local
@@ -210,7 +212,19 @@ lbl_247_data_610 = .data:0x00000610; // type:object size:0x2C
@120811 = .data:0x00000820; // type:object size:0xE scope:local data:string
@120812 = .data:0x00000830; // type:object size:0xC scope:local
@120813 = .data:0x00000848; // type:object size:0x11 scope:local data:string
lbl_247_data_859 = .data:0x00000859; // type:object size:0xDB
@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x00000888; // type:object size:0x5 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x00000890; // type:object size:0xF scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x000008A0; // type:object size:0x14 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x000008B4; // type:object size:0xF scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@6 = .data:0x000008C4; // type:object size:0x5 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@5 = .data:0x000008CC; // type:object size:0x9 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@4 = .data:0x000008D8; // type:object size:0x16 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@3 = .data:0x000008F0; // type:object size:0x9 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@2 = .data:0x000008FC; // type:object size:0x5 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@1 = .data:0x00000904; // type:object size:0x9 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@0 = .data:0x00000910; // type:object size:0x14 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi = .data:0x00000924; // type:object size:0x9 scope:local data:string
@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00000930; // type:object size:0x3 scope:local data:string
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
@119131 = .bss:0x00000008; // type:object size:0xC scope:local
l_e_yrHIO = .bss:0x00000014; // type:object size:0x7C scope:global align:4 data:float
config/ShieldD/rels/d_a_horseD/symbols.txt
+58 -3
View File
@@ -300,7 +300,9 @@ m__14daHorse_hio_c0 = .rodata:0x00000060; // type:object size:0x124 scope:global
@LOCAL@setReinPos__13daHorseRein_cFi@reinGravity = .rodata:0x000003E0; // type:object size:0x4 scope:local
cNullVec__6Z2Calc = .rodata:0x000003E4; // type:object size:0xC scope:global
@46916 = .rodata:0x000003F0; // type:object size:0x4 scope:local
lbl_253_rodata_3F4 = .rodata:0x000003F4; // type:object size:0x18
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x000003F8; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000400; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x00000408; // type:object size:0x4 align:4 data:float
l_autoUpHeight = .data:0x00000000; // type:object size:0x4 scope:global
@129761 = .data:0x00000004; // type:object size:0x9 scope:local
@129764 = .data:0x00000010; // type:object size:0xB scope:local
@@ -462,23 +464,76 @@ __vt__18mDoExt_3DlineMat_c = .data:0x00000890; // type:object size:0x14 scope:gl
@134169 = .data:0x00000B38; // type:object size:0xC scope:local
@134170 = .data:0x00000B7C; // type:object size:0xB scope:local data:string
@134171 = .data:0x00000B9C; // type:object size:0xD scope:local data:string
lbl_253_data_BA9 = .data:0x00000BA9; // type:object size:0x263
@STRING@getActor__7dDemo_cFUc@2 = .data:0x00000BB8; // type:object size:0x5 scope:local data:string
@STRING@getActor__7dDemo_cFUc@1 = .data:0x00000BC0; // type:object size:0x9 scope:local data:string
@STRING@getActor__7dDemo_cFUc@0 = .data:0x00000BCC; // type:object size:0xE scope:local data:string
@STRING@getActor__7dDemo_cFUc = .data:0x00000BDC; // type:object size:0x9 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x00000BE8; // type:object size:0x5 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x00000BF0; // type:object size:0xF scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x00000C00; // type:object size:0x14 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x00000C14; // type:object size:0xF scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@2 = .data:0x00000C24; // type:object size:0x5 scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@1 = .data:0x00000C2C; // type:object size:0x14 scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@0 = .data:0x00000C40; // type:object size:0x14 scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs = .data:0x00000C54; // type:object size:0x14 scope:local data:string
@STRING@setAnmTransform__10J3DMtxCalcFP15J3DAnmTransform@2 = .data:0x00000C68; // type:object size:0x5 scope:local data:string
@STRING@setAnmTransform__10J3DMtxCalcFP15J3DAnmTransform@1 = .data:0x00000C70; // type:object size:0xB scope:local data:string
@STRING@setAnmTransform__10J3DMtxCalcFP15J3DAnmTransform@0 = .data:0x00000C7C; // type:object size:0x1B scope:local data:string
@STRING@setAnmTransform__10J3DMtxCalcFP15J3DAnmTransform = .data:0x00000C98; // type:object size:0xB scope:local data:string
@STRING@getAnmTransform__10J3DMtxCalcFv@2 = .data:0x00000CA4; // type:object size:0x5 scope:local data:string
@STRING@getAnmTransform__10J3DMtxCalcFv@1 = .data:0x00000CAC; // type:object size:0xB scope:local data:string
@STRING@getAnmTransform__10J3DMtxCalcFv@0 = .data:0x00000CB8; // type:object size:0x1B scope:local data:string
@STRING@getAnmTransform__10J3DMtxCalcFv = .data:0x00000CD4; // type:object size:0xB scope:local data:string
@STRING@setAnmTransform__10J3DMtxCalcFUcP15J3DAnmTransform@2 = .data:0x00000CE0; // type:object size:0x5 scope:local data:string
@STRING@setAnmTransform__10J3DMtxCalcFUcP15J3DAnmTransform@1 = .data:0x00000CE8; // type:object size:0xB scope:local data:string
@STRING@setAnmTransform__10J3DMtxCalcFUcP15J3DAnmTransform@0 = .data:0x00000CF4; // type:object size:0x1B scope:local data:string
@STRING@setAnmTransform__10J3DMtxCalcFUcP15J3DAnmTransform = .data:0x00000D10; // type:object size:0xB scope:local data:string
@STRING@getAnmTransform__10J3DMtxCalcFUc@2 = .data:0x00000D1C; // type:object size:0x5 scope:local data:string
@STRING@getAnmTransform__10J3DMtxCalcFUc@1 = .data:0x00000D24; // type:object size:0xB scope:local data:string
@STRING@getAnmTransform__10J3DMtxCalcFUc@0 = .data:0x00000D30; // type:object size:0x1B scope:local data:string
@STRING@getAnmTransform__10J3DMtxCalcFUc = .data:0x00000D4C; // type:object size:0xB scope:local data:string
@STRING@setWeight__10J3DMtxCalcFUcf@2 = .data:0x00000D58; // type:object size:0x5 scope:local data:string
@STRING@setWeight__10J3DMtxCalcFUcf@1 = .data:0x00000D60; // type:object size:0xB scope:local data:string
@STRING@setWeight__10J3DMtxCalcFUcf@0 = .data:0x00000D6C; // type:object size:0x1B scope:local data:string
@STRING@setWeight__10J3DMtxCalcFUcf = .data:0x00000D88; // type:object size:0xB scope:local data:string
@STRING@getWeight__10J3DMtxCalcCFUc@2 = .data:0x00000D94; // type:object size:0x5 scope:local data:string
@STRING@getWeight__10J3DMtxCalcCFUc@1 = .data:0x00000D9C; // type:object size:0xB scope:local data:string
@STRING@getWeight__10J3DMtxCalcCFUc@0 = .data:0x00000DA8; // type:object size:0x1B scope:local data:string
@STRING@getWeight__10J3DMtxCalcCFUc = .data:0x00000DC4; // type:object size:0xB scope:local data:string
@STRING@getJoint__10J3DMtxCalcFv@2 = .data:0x00000DD0; // type:object size:0x5 scope:local data:string
@STRING@getJoint__10J3DMtxCalcFv@1 = .data:0x00000DD8; // type:object size:0xB scope:local data:string
@STRING@getJoint__10J3DMtxCalcFv@0 = .data:0x00000DE4; // type:object size:0x16 scope:local data:string
@STRING@getJoint__10J3DMtxCalcFv = .data:0x00000DFC; // type:object size:0xB scope:local data:string
@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00000E08; // type:object size:0x3 scope:local data:string
...bss.0 = .bss:0x00000000; // type:label scope:local
l_debugMode = .bss:0x00000000; // type:object size:0x4 scope:global
l_frontFootOffset = .bss:0x00000004; // type:object size:0xC scope:global
l_backFootOffset = .bss:0x00000010; // type:object size:0xC scope:global
lbl_253_bss_1C = .bss:0x0000001C; // type:object size:0x1 data:byte
@GUARD@setBodyPart__9daHorse_cFv@localEyePos = .bss:0x0000001C; // type:object size:0x1 data:byte
@LOCAL@setBodyPart__9daHorse_cFv@localEyePos = .bss:0x00000020; // type:object size:0xC scope:local
@GUARD@setEffect__9daHorse_cFv@runScale = .bss:0x0000002C; // type:object size:0x1 scope:local data:byte
@LOCAL@setEffect__9daHorse_cFv@runScale = .bss:0x00000030; // type:object size:0xC scope:local
@GUARD@setEffect__9daHorse_cFv@landScale@0 = .bss:0x0000003C; // type:object size:0x1 scope:local data:byte
@LOCAL@setEffect__9daHorse_cFv@landScale@0 = .bss:0x00000040; // type:object size:0xC scope:local
@GUARD@setEffect__9daHorse_cFv@grassRunScale@1 = .bss:0x0000004C; // type:object size:0x1 scope:local data:byte
@LOCAL@setEffect__9daHorse_cFv@grassRunScale@1 = .bss:0x00000050; // type:object size:0xC scope:local
@GUARD@setEffect__9daHorse_cFv@waterDirection@2 = .bss:0x0000005C; // type:object size:0x1 scope:local data:byte
@LOCAL@setEffect__9daHorse_cFv@waterDirection@2 = .bss:0x00000060; // type:object size:0xC scope:local
@GUARD@setReinPosMoveInit__9daHorse_cFi@reinLeftStart = .bss:0x0000006C; // type:object size:0x1 scope:local data:byte
@LOCAL@setReinPosMoveInit__9daHorse_cFi@reinLeftStart = .bss:0x00000070; // type:object size:0xC scope:local
@GUARD@setReinPosMoveInit__9daHorse_cFi@reinRightStart@0 = .bss:0x0000007C; // type:object size:0x1 scope:local data:byte
@LOCAL@setReinPosMoveInit__9daHorse_cFi@reinRightStart@0 = .bss:0x00000080; // type:object size:0xC scope:local
@GUARD@setReinPosMoveInit__9daHorse_cFi@localNeckLeft@1 = .bss:0x0000008C; // type:object size:0x1 scope:local data:byte
@LOCAL@setReinPosMoveInit__9daHorse_cFi@localNeckLeft@1 = .bss:0x00000090; // type:object size:0xC scope:local
@GUARD@setReinPosMoveInit__9daHorse_cFi@localNeckRight@2 = .bss:0x0000009C; // type:object size:0x1 scope:local data:byte
@LOCAL@setReinPosMoveInit__9daHorse_cFi@localNeckRight@2 = .bss:0x000000A0; // type:object size:0xC scope:local
@GUARD@setReinPosNormalSubstance__9daHorse_cFv@saddleLeft = .bss:0x000000AC; // type:object size:0x1 scope:local data:byte
@LOCAL@setReinPosNormalSubstance__9daHorse_cFv@saddleLeft = .bss:0x000000B0; // type:object size:0xC scope:local
@GUARD@setReinPosNormalSubstance__9daHorse_cFv@saddleRight@0 = .bss:0x000000BC; // type:object size:0x1 scope:local data:byte
@LOCAL@setReinPosNormalSubstance__9daHorse_cFv@saddleRight@0 = .bss:0x000000C0; // type:object size:0xC scope:local
@GUARD@bgCheck__9daHorse_cFv@localCenterPos = .bss:0x000000CC; // type:object size:0x1 scope:local data:byte
@LOCAL@bgCheck__9daHorse_cFv@localCenterPos = .bss:0x000000D0; // type:object size:0xC scope:local
@GUARD@bgCheck__9daHorse_cFv@localFrontPos@0 = .bss:0x000000DC; // type:object size:0x1 scope:local data:byte
@LOCAL@bgCheck__9daHorse_cFv@localFrontPos@0 = .bss:0x000000E0; // type:object size:0xC scope:local
@GUARD@bgCheck__9daHorse_cFv@localBackPos@1 = .bss:0x000000EC; // type:object size:0x1 scope:local data:byte
@LOCAL@bgCheck__9daHorse_cFv@localBackPos@1 = .bss:0x000000F0; // type:object size:0xC scope:local
config/ShieldD/rels/d_a_kagoD/symbols.txt
+16 -2
View File
@@ -231,7 +231,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@125505 = .rodata:0x00000204; // type:object size:0x4 scope:local
cNullVec__6Z2Calc = .rodata:0x00000208; // type:object size:0xC scope:global
@46916 = .rodata:0x00000214; // type:object size:0x4 scope:local
lbl_256_rodata_218 = .rodata:0x00000218; // type:object size:0x14
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000218; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000220; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x00000228; // type:object size:0x4 align:8 data:float
cc_sph_src__22@unnamed@d_a_kago_cpp@ = .data:0x00000000; // type:object size:0x40 scope:global
@123117 = .data:0x00000040; // type:object size:0x17 scope:local
@123118 = .data:0x00000058; // type:object size:0x2 scope:local data:string
@@ -312,6 +314,18 @@ lbl_256_data_530 = .data:0x00000530; // type:object size:0x24
@125861 = .data:0x00000728; // type:object size:0xE scope:local data:string
@125862 = .data:0x00000738; // type:object size:0xC scope:local
@125863 = .data:0x0000075C; // type:object size:0x11 scope:local data:string
lbl_256_data_76D = .data:0x0000076D; // type:object size:0xB7
@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x00000778; // type:object size:0x5 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x00000780; // type:object size:0xF scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x00000790; // type:object size:0x14 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x000007A4; // type:object size:0xF scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@6 = .data:0x000007B4; // type:object size:0x5 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@5 = .data:0x000007BC; // type:object size:0x9 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@4 = .data:0x000007C8; // type:object size:0x16 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@3 = .data:0x000007E0; // type:object size:0x9 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@2 = .data:0x000007EC; // type:object size:0x5 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@1 = .data:0x000007F4; // type:object size:0x9 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@0 = .data:0x00000800; // type:object size:0x14 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi = .data:0x00000814; // type:object size:0x9 scope:local data:string
@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00000820; // type:object size:0x3 scope:local data:string
hio_set = .bss:0x00000000; // type:object size:0x1 data:byte
l_HIO = .bss:0x00000004; // type:object size:0x5C scope:global data:byte
config/ShieldD/rels/d_a_mg_rodD/symbols.txt
+12 -6
View File
@@ -298,7 +298,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@136138 = .rodata:0x000002C4; // type:object size:0x4 scope:local align:4 data:float
cNullVec__6Z2Calc = .rodata:0x000002C8; // type:object size:0xC scope:global
@46916 = .rodata:0x000002D4; // type:object size:0x4 scope:local
lbl_49_rodata_2D8 = .rodata:0x000002D8; // type:object size:0x14
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x000002D8; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x000002E0; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x000002E8; // type:object size:0x4 align:4 data:float
check_kind = .data:0x00000000; // type:object size:0x8 scope:global
@131865 = .data:0x00000008; // type:object size:0x11 scope:local
@131866 = .data:0x0000001C; // type:object size:0x15 scope:local
@@ -401,18 +403,22 @@ __vt__18mDoExt_3DlineMat_c = .data:0x00000628; // type:object size:0x14 scope:gl
@136240 = .data:0x00000790; // type:object size:0xE scope:local data:string
@136241 = .data:0x000007A0; // type:object size:0xC scope:local
@136242 = .data:0x000007C4; // type:object size:0x11 scope:local data:string
lbl_49_data_7D5 = .data:0x000007D5; // type:object size:0x4B
@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x000007E0; // type:object size:0x5 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x000007E8; // type:object size:0xF scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x000007F8; // type:object size:0x14 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x0000080C; // type:object size:0xF scope:local data:string
@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x0000081C; // type:object size:0x3 scope:local data:string
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
...bss.0 = .bss:0x00000008; // type:label scope:local
henna = .bss:0x00000008; // type:object size:0x4 scope:global data:4byte
lbl_49_bss_C = .bss:0x0000000C; // type:object size:0x1 data:byte
lbl_49_bss_D = .bss:0x0000000D; // type:object size:0x1 data:byte
data_804BBBD4 = .bss:0x0000000C; // type:object size:0x1 data:byte
hio_set = .bss:0x0000000D; // type:object size:0x1 data:byte
l_HIO = .bss:0x00000010; // type:object size:0x28 scope:global data:byte
@132252 = .bss:0x00000038; // type:object size:0xC scope:local
old_line_pos = .bss:0x00000048; // type:object size:0x4B0 scope:global
lbl_49_bss_4F8 = .bss:0x000004F8; // type:object size:0x1 data:byte
@GUARD@sibuki_set__FP13dmg_rod_classfP4cXyzi@sc = .bss:0x000004F8; // type:object size:0x1 data:byte
@LOCAL@sibuki_set__FP13dmg_rod_classfP4cXyzi@sc = .bss:0x000004FC; // type:object size:0xC scope:local
lbl_49_bss_508 = .bss:0x00000508; // type:object size:0x8 data:byte
@GUARD@uki_main__FP13dmg_rod_class@sp_pos = .bss:0x00000508; // type:object size:0x1 data:byte
@LOCAL@uki_main__FP13dmg_rod_class@sp_pos = .bss:0x00000510; // type:object size:0x18 scope:local
@LOCAL@play_camera__FP13dmg_rod_class@old_stick_x = .bss:0x00000528; // type:object size:0x4 scope:local align:4 data:float
@LOCAL@play_camera__FP13dmg_rod_class@old_stick_sx@0 = .bss:0x0000052C; // type:object size:0x4 scope:local align:4 data:float
config/ShieldD/rels/d_a_npc_aruD/symbols.txt
+18 -3
View File
@@ -154,7 +154,9 @@ m__17daNpc_Aru_Param_c = .rodata:0x00000000; // type:object size:0xA0 scope:glob
@123518 = .rodata:0x00000168; // type:object size:0x4 scope:local
cNullVec__6Z2Calc = .rodata:0x0000016C; // type:object size:0xC scope:global
@46916 = .rodata:0x00000178; // type:object size:0x4 scope:local
lbl_276_rodata_17C = .rodata:0x0000017C; // type:object size:0x18
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000180; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000188; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x00000190; // type:object size:0x4 align:4 data:float
@121973 = .data:0x00000000; // type:object size:0x1B scope:local
@121974 = .data:0x0000001C; // type:object size:0x15 scope:local
@121975 = .data:0x00000034; // type:object size:0x15 scope:local
@@ -272,9 +274,22 @@ lbl_276_data_B98 = .data:0x00000B98; // type:object size:0x24
@123847 = .data:0x00000E4C; // type:object size:0xD scope:local data:string
@STRING@__ct__11daNpc_Aru_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc = .data:0x00000E68; // type:object size:0x28 scope:local
@STRING@__ct__8daNpcT_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc = .data:0x00000E90; // type:object size:0x25 scope:local
lbl_276_data_EB5 = .data:0x00000EB5; // type:object size:0xF3
@STRING@__dt__8daNpcT_cFv = .data:0x00000EB8; // type:object size:0x23 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x00000EDC; // type:object size:0x5 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x00000EE4; // type:object size:0xF scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x00000EF4; // type:object size:0x14 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x00000F08; // type:object size:0xF scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@2 = .data:0x00000F18; // type:object size:0x5 scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@1 = .data:0x00000F20; // type:object size:0x14 scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@0 = .data:0x00000F34; // type:object size:0x14 scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs = .data:0x00000F48; // type:object size:0x14 scope:local data:string
@STRING@calc__11J3DTexNoAnmCFPUs@2 = .data:0x00000F5C; // type:object size:0x5 scope:local data:string
@STRING@calc__11J3DTexNoAnmCFPUs@1 = .data:0x00000F64; // type:object size:0x11 scope:local data:string
@STRING@calc__11J3DTexNoAnmCFPUs@0 = .data:0x00000F78; // type:object size:0x16 scope:local data:string
@STRING@calc__11J3DTexNoAnmCFPUs = .data:0x00000F90; // type:object size:0x11 scope:local data:string
@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00000FA4; // type:object size:0x3 scope:local data:string
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
@122030 = .bss:0x00000008; // type:object size:0xC scope:local
l_HIO = .bss:0x00000018; // type:object size:0xA8 scope:global
lbl_276_bss_C0 = .bss:0x000000C0; // type:object size:0x1 data:byte
@GUARD@setAttnPos__11daNpc_Aru_cFv@prtclScl = .bss:0x000000C0; // type:object size:0x1 data:byte
@LOCAL@setAttnPos__11daNpc_Aru_cFv@prtclScl = .bss:0x000000C4; // type:object size:0xC scope:local
config/ShieldD/rels/d_a_npc_cdn3D/symbols.txt
+12 -2
View File
@@ -173,7 +173,9 @@ ActionTable__11daNpcCdn3_c = .rodata:0x00000000; // type:object size:0xC0 scope:
@125635 = .rodata:0x0000010C; // type:object size:0x4 scope:local align:4 data:float
cNullVec__6Z2Calc = .rodata:0x00000110; // type:object size:0xC scope:global
@46916 = .rodata:0x0000011C; // type:object size:0x4 scope:local
lbl_283_rodata_120 = .rodata:0x00000120; // type:object size:0x14
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000120; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000128; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x00000130; // type:object size:0x4 align:4 data:float
@123854 = .data:0x00000000; // type:object size:0x11 scope:local data:string
@123855 = .data:0x00000014; // type:object size:0x16 scope:local data:string
@123856 = .data:0x0000002C; // type:object size:0x5 scope:local data:string
@@ -302,4 +304,12 @@ lbl_283_data_AB8 = .data:0x00000AB8; // type:object size:0x24
@STRING@create__11daNpcCdn3_cFv@1 = .data:0x00000EE8; // type:object size:0x2 scope:local data:string
@STRING@create__11daNpcCdn3_cFv@0 = .data:0x00000EEC; // type:object size:0x11 scope:local data:string
@STRING@create__11daNpcCdn3_cFv = .data:0x00000F00; // type:object size:0x4E scope:local
lbl_283_data_F4E = .data:0x00000F4E; // type:object size:0x72
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@6 = .data:0x00000F50; // type:object size:0x5 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@5 = .data:0x00000F58; // type:object size:0x9 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@4 = .data:0x00000F64; // type:object size:0x16 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@3 = .data:0x00000F7C; // type:object size:0x9 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@2 = .data:0x00000F88; // type:object size:0x5 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@1 = .data:0x00000F90; // type:object size:0x9 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@0 = .data:0x00000F9C; // type:object size:0x14 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi = .data:0x00000FB0; // type:object size:0x9 scope:local data:string
@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00000FBC; // type:object size:0x3 scope:local data:string
config/ShieldD/rels/d_a_npc_chinD/symbols.txt
+16 -2
View File
@@ -208,7 +208,9 @@ m__17daNpcChin_Param_c = .rodata:0x00000014; // type:object size:0x6C scope:glob
@123074 = .rodata:0x00000310; // type:object size:0x4 scope:local
cNullVec__6Z2Calc = .rodata:0x00000314; // type:object size:0xC scope:global
@46916 = .rodata:0x00000320; // type:object size:0x4 scope:local
lbl_285_rodata_324 = .rodata:0x00000324; // type:object size:0x18
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000328; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000330; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x00000338; // type:object size:0x4 align:8 data:float
l_bckGetParamList = .data:0x00000000; // type:object size:0x18C scope:global
l_btpGetParamList = .data:0x0000018C; // type:object size:0xB4 scope:global
l_btkGetParamList = .data:0x00000240; // type:object size:0x6C scope:global data:4byte
@@ -312,7 +314,19 @@ lbl_285_data_90F = .data:0x0000090F; // type:object size:0x2D
@123446 = .data:0x00000B60; // type:object size:0x11 scope:local data:string
@123447 = .data:0x00000B8C; // type:object size:0xC scope:local data:string
@123448 = .data:0x00000BAC; // type:object size:0xD scope:local data:string
lbl_285_data_BB9 = .data:0x00000BB9; // type:object size:0xDB
@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x00000BC8; // type:object size:0x5 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x00000BD0; // type:object size:0xF scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x00000BE0; // type:object size:0x14 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x00000BF4; // type:object size:0xF scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@2 = .data:0x00000C04; // type:object size:0x5 scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@1 = .data:0x00000C0C; // type:object size:0x14 scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@0 = .data:0x00000C20; // type:object size:0x14 scope:local data:string
@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs = .data:0x00000C34; // type:object size:0x14 scope:local data:string
@STRING@calc__11J3DTexNoAnmCFPUs@2 = .data:0x00000C48; // type:object size:0x5 scope:local data:string
@STRING@calc__11J3DTexNoAnmCFPUs@1 = .data:0x00000C50; // type:object size:0x11 scope:local data:string
@STRING@calc__11J3DTexNoAnmCFPUs@0 = .data:0x00000C64; // type:object size:0x16 scope:local data:string
@STRING@calc__11J3DTexNoAnmCFPUs = .data:0x00000C7C; // type:object size:0x11 scope:local data:string
@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00000C90; // type:object size:0x3 scope:local data:string
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
@121430 = .bss:0x00000008; // type:object size:0xC scope:local
l_HIO = .bss:0x00000014; // type:object size:0x74 scope:global
config/ShieldD/rels/d_a_npc_duD/symbols.txt
+9 -3
View File
@@ -63,7 +63,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@119103 = .rodata:0x00000090; // type:object size:0x4 scope:local align:4 data:float
cNullVec__6Z2Calc = .rodata:0x00000094; // type:object size:0xC scope:global
@46916 = .rodata:0x000000A0; // type:object size:0x4 scope:local
lbl_294_rodata_A4 = .rodata:0x000000A4; // type:object size:0x18
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x000000A8; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x000000B0; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x000000B8; // type:object size:0x4 align:4 data:float
@118576 = .data:0x00000000; // type:object size:0x9 scope:local
@118577 = .data:0x0000000C; // type:object size:0xB scope:local
@118602 = .data:0x00000018; // type:object size:0x7 scope:local data:string
@@ -106,6 +108,10 @@ lbl_294_data_218 = .data:0x00000218; // type:object size:0x24
@119196 = .data:0x00000400; // type:object size:0xC scope:local
@119197 = .data:0x00000424; // type:object size:0x11 scope:local data:string
@119198 = .data:0x0000044C; // type:object size:0xD scope:local data:string
lbl_294_data_459 = .data:0x00000459; // type:object size:0x4F
lbl_294_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte
@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x00000468; // type:object size:0x5 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x00000470; // type:object size:0xF scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x00000480; // type:object size:0x14 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x00000494; // type:object size:0xF scope:local data:string
@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x000004A4; // type:object size:0x3 scope:local data:string
hio_set = .bss:0x00000000; // type:object size:0x1 data:byte
l_HIO = .bss:0x00000004; // type:object size:0xC scope:global data:byte
config/ShieldD/rels/d_a_npc_tkj2D/symbols.txt
+9 -3
View File
@@ -84,7 +84,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@118091 = .rodata:0x000000B4; // type:object size:0x4 scope:local align:4 data:float
cNullVec__6Z2Calc = .rodata:0x000000B8; // type:object size:0xC scope:global
@46916 = .rodata:0x000000C4; // type:object size:0x4 scope:local
lbl_364_rodata_C8 = .rodata:0x000000C8; // type:object size:0x14
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x000000C8; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x000000D0; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x000000D8; // type:object size:0x4 align:4 data:float
@117105 = .data:0x00000000; // type:object size:0x17 scope:local
@117106 = .data:0x00000018; // type:object size:0xB scope:local
@117109 = .data:0x00000024; // type:object size:0x13 scope:local
@@ -131,6 +133,10 @@ lbl_364_data_268 = .data:0x00000268; // type:object size:0x38
@118205 = .data:0x000004E8; // type:object size:0xC scope:local
@118206 = .data:0x0000050C; // type:object size:0x11 scope:local data:string
@118207 = .data:0x00000534; // type:object size:0xD scope:local data:string
lbl_364_data_541 = .data:0x00000541; // type:object size:0x4F
lbl_364_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte
@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x00000550; // type:object size:0x5 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x00000558; // type:object size:0xF scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x00000568; // type:object size:0x14 scope:local data:string
@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x0000057C; // type:object size:0xF scope:local data:string
@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x0000058C; // type:object size:0x3 scope:local data:string
hio_set = .bss:0x00000000; // type:object size:0x1 data:byte
l_HIO = .bss:0x00000004; // type:object size:0x14 scope:global data:byte
config/ShieldD/rels/d_a_obj_moveboxD/symbols.txt
+16 -4
View File
@@ -127,7 +127,9 @@ M_attr__Q212daObjMovebox5Act_c = .rodata:0x00000290; // type:object size:0x500 s
@LOCAL@chk_wall_touch__Q212daObjMovebox5Bgc_cFPCQ212daObjMovebox5Act_cPCQ212daObjMovebox8BgcSrc_cs@bgc_add@0 = .rodata:0x000007E8; // type:object size:0x4 scope:local
cNullVec__6Z2Calc = .rodata:0x000007EC; // type:object size:0xC scope:global
@46916 = .rodata:0x000007F8; // type:object size:0x4 scope:local
lbl_21_rodata_7FC = .rodata:0x000007FC; // type:object size:0x18
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000800; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000808; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x00000810; // type:object size:0x4 align:4 data:float
@117078 = .data:0x00000000; // type:object size:0xF scope:local
@117079 = .data:0x00000010; // type:object size:0xF scope:local
@117080 = .data:0x00000020; // type:object size:0x17 scope:local
@@ -221,7 +223,15 @@ lbl_21_data_410 = .data:0x00000410; // type:object size:0x38
@STRING@Mthd_Create__Q212daObjMovebox5Act_cFv@1 = .data:0x000006F0; // type:object size:0x14 scope:local data:string
@STRING@Mthd_Create__Q212daObjMovebox5Act_cFv@0 = .data:0x00000704; // type:object size:0x43 scope:local data:string
@STRING@Mthd_Create__Q212daObjMovebox5Act_cFv = .data:0x00000748; // type:object size:0x14 scope:local data:string
lbl_21_data_75C = .data:0x0000075C; // type:object size:0x70
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@6 = .data:0x0000075C; // type:object size:0x5 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@5 = .data:0x00000764; // type:object size:0x9 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@4 = .data:0x00000770; // type:object size:0x16 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@3 = .data:0x00000788; // type:object size:0x9 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@2 = .data:0x00000794; // type:object size:0x5 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@1 = .data:0x0000079C; // type:object size:0x9 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@0 = .data:0x000007A8; // type:object size:0x14 scope:local data:string
@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi = .data:0x000007BC; // type:object size:0x9 scope:local data:string
@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x000007C8; // type:object size:0x3 scope:local data:string
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
...bss.0 = .bss:0x00000008; // type:label scope:local
@117073 = .bss:0x00000008; // type:object size:0xC scope:local data:byte
@@ -239,11 +249,13 @@ M_gnd_work__Q212daObjMovebox5Bgc_c = .bss:0x00001B9C; // type:object size:0x78C
M_wrt_work__Q212daObjMovebox5Bgc_c = .bss:0x00002334; // type:object size:0x54 scope:global
@117180 = .bss:0x00002388; // type:object size:0xC scope:local
M_wall_work__Q212daObjMovebox5Bgc_c = .bss:0x00002398; // type:object size:0xA10 scope:global
@GUARD@chk_wall_touch__Q212daObjMovebox5Bgc_cFPCQ212daObjMovebox5Act_cPCQ212daObjMovebox8BgcSrc_cs@touch_work = .bss:0x00002DA8; // type:object size:0x1 scope:local data:byte
@117372 = .bss:0x00002DAC; // type:object size:0xC scope:local
@LOCAL@chk_wall_touch__Q212daObjMovebox5Bgc_cFPCQ212daObjMovebox5Act_cPCQ212daObjMovebox8BgcSrc_cs@touch_work = .bss:0x00002DB8; // type:object size:0x70 scope:local
M_hio__Q212daObjMovebox5Act_c = .bss:0x00002E28; // type:object size:0x560 scope:global
lbl_21_bss_3388 = .bss:0x00003388; // type:object size:0x1 data:byte
@GUARD@eff_smoke_slip_start__Q212daObjMovebox5Act_cFv@scl = .bss:0x00003388; // type:object size:0x1 data:byte
@LOCAL@eff_smoke_slip_start__Q212daObjMovebox5Act_cFv@scl = .bss:0x0000338C; // type:object size:0xC scope:local
lbl_21_bss_3398 = .bss:0x00003398; // type:object size:0x8 data:byte
@GUARD@mode_walk__Q212daObjMovebox5Act_cFv@dir_vec = .bss:0x00003398; // type:object size:0x1 data:byte
@LOCAL@mode_walk__Q212daObjMovebox5Act_cFv@dir_vec = .bss:0x000033A0; // type:object size:0x30 scope:local
@GUARD@eff_break__Q212daObjMovebox5Act_cFv@particle_scale = .bss:0x000033D0; // type:object size:0x1 scope:local data:byte
@LOCAL@eff_break__Q212daObjMovebox5Act_cFv@particle_scale = .bss:0x000033D4; // type:object size:0xC scope:local
config/ShieldD/rels/d_a_tag_attack_itemD/symbols.txt
+3 -1
View File
@@ -49,7 +49,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@117049 = .rodata:0x00000010; // type:object size:0x4 scope:local
cNullVec__6Z2Calc = .rodata:0x00000014; // type:object size:0xC scope:global
@46916 = .rodata:0x00000020; // type:object size:0x4 scope:local
lbl_116_rodata_24 = .rodata:0x00000024; // type:object size:0x18
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000028; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000030; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x00000038; // type:object size:0x4 align:4 data:float
l_cyl_src = .data:0x00000000; // type:object size:0x44 scope:global
@116840 = .data:0x00000044; // type:object size:0x11 scope:local
@116841 = .data:0x00000058; // type:object size:0x9 scope:local
config/ShieldD/rels/d_a_tag_attentionD/symbols.txt
+4 -2
View File
@@ -40,7 +40,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@LOCAL@genMessage__12daAttp_HIO_cFP11JORMContext@num@1 = .rodata:0x00000044; // type:object size:0x4 scope:local
cNullVec__6Z2Calc = .rodata:0x00000048; // type:object size:0xC scope:global
@46916 = .rodata:0x00000054; // type:object size:0x4 scope:local
lbl_56_rodata_58 = .rodata:0x00000058; // type:object size:0x14
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000058; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000060; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x00000068; // type:object size:0x4 align:4 data:float
@116757 = .data:0x00000000; // type:object size:0x12 scope:local
@116758 = .data:0x00000018; // type:object size:0x10 scope:local
@116759 = .data:0x00000028; // type:object size:0x10 scope:local
@@ -103,7 +105,7 @@ __RTTI__12daAttp_HIO_c = .data:0x00000430; // type:object size:0x8 scope:global
@117055 = .data:0x00000468; // type:object size:0xE scope:local data:string
@117056 = .data:0x00000478; // type:object size:0xC scope:local
@117057 = .data:0x00000490; // type:object size:0x11 scope:local data:string
lbl_56_data_4A1 = .data:0x000004A1; // type:object size:0x13
@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x000004B0; // type:object size:0x3 data:string
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
@116744 = .bss:0x00000008; // type:object size:0xC scope:local
l_HIO = .bss:0x00000018; // type:object size:0x20 scope:global data:byte
config/ShieldD/rels/d_a_tag_cameraD/symbols.txt
+3 -1
View File
@@ -54,7 +54,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@130279 = .rodata:0x00000070; // type:object size:0x4 scope:local
cNullVec__6Z2Calc = .rodata:0x00000074; // type:object size:0xC scope:global
@46916 = .rodata:0x00000080; // type:object size:0x4 scope:local
lbl_29_rodata_84 = .rodata:0x00000084; // type:object size:0x18
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000088; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000090; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x00000098; // type:object size:0x4 align:4 data:float
l_daTag_Cam_Method = .data:0x00000000; // type:object size:0x20 scope:global
g_profile_TAG_CAMERA = .data:0x00000020; // type:object size:0x30 scope:global
Player__28@unnamed@d_a_tag_camera_cpp@ = .bss:0x00000000; // type:object size:0x4 scope:global
config/ShieldD/rels/d_a_tag_hjumpD/symbols.txt
+3 -1
View File
@@ -40,7 +40,9 @@ l_arcName = .rodata:0x00000000; // type:object size:0x7 scope:global data:string
@118031 = .rodata:0x00000038; // type:object size:0x4 scope:local
cNullVec__6Z2Calc = .rodata:0x0000003C; // type:object size:0xC scope:global
@46916 = .rodata:0x00000048; // type:object size:0x4 scope:local
lbl_120_rodata_4C = .rodata:0x0000004C; // type:object size:0x18
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000050; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000058; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x00000060; // type:object size:0x4 align:4 data:float
@117860 = .data:0x00000000; // type:object size:0x5 scope:local
@117863 = .data:0x00000008; // type:object size:0x7 scope:local
@117921 = .data:0x00000010; // type:object size:0xD scope:local
config/ShieldD/rels/d_a_ykgrD/symbols.txt
+3 -1
View File
@@ -50,7 +50,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@116167 = .rodata:0x00000044; // type:object size:0x4 scope:local
cNullVec__6Z2Calc = .rodata:0x00000048; // type:object size:0xC scope:global
@46916 = .rodata:0x00000054; // type:object size:0x4 scope:local
lbl_128_rodata_58 = .rodata:0x00000058; // type:object size:0x14
@LOCAL@signaling_NaN__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000058; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN_2__Q23std17numeric_limits<d>Fv@x = .rodata:0x00000060; // type:object size:0x8 align:8 data:float
@LOCAL@signaling_NaN__Q23std17numeric_limits<f>Fv@x = .rodata:0x00000068; // type:object size:0x4 align:4 data:float
@115853 = .data:0x00000000; // type:object size:0xE scope:local
@115854 = .data:0x00000010; // type:object size:0xD scope:local
@115855 = .data:0x00000020; // type:object size:0x11 scope:local
config/ShieldD/symbols.txt
+2 -2
View File
@@ -64820,8 +64820,8 @@ sInstance__31JASGlobalInstance<10Z2EnvSeMgr> = .sbss:0x8074CDC0; // type:object
lbl_8074CDC8 = .sbss:0x8074CDC8; // type:object size:0x1 data:byte hash:0x198E0249 dhash:0x5B608565
cNearFarRatio = .sbss:0x8074CDD0; // type:object size:0x4 scope:global align:4 data:float hash:0x3FC3124A
lbl_8074CDD4 = .sbss:0x8074CDD4; // type:object size:0x1 data:byte hash:0x2FD5DAF8 dhash:0x9B6CD1E2
lbl_8074CDD8 = .sbss:0x8074CDD8; // type:object size:0x1 data:byte hash:0xA31DF0B8 dhash:0x0646129E
lbl_8074CDD9 = .sbss:0x8074CDD9; // type:object size:0x1 data:byte hash:0xE4CA1432 dhash:0x0157E254
data_80451358 = .sbss:0x8074CDD8; // type:object size:0x1 data:byte hash:0xA31DF0B8 dhash:0x0646129E
data_80451359 = .sbss:0x8074CDD9; // type:object size:0x1 data:byte hash:0xE4CA1432 dhash:0x0157E254
mLinkPtr__14Z2CreatureLink = .sbss:0x8074CDE0; // type:object size:0x4 scope:global data:4byte hash:0x696E3950 dhash:0xD016AAD5
mAudioMgrPtr__10Z2AudioMgr = .sbss:0x8074CDE8; // type:object size:0x4 scope:global data:4byte hash:0x54526A77 dhash:0x71D35736
lbl_8074CDF0 = .sbss:0x8074CDF0; // type:object size:0x1 data:byte hash:0xBB7CA6C8
include/d/actor/d_a_L7low_dr.h
+1 -1
View File
@@ -28,7 +28,7 @@ public:
/* 0x568 */ request_of_phase_process_class mPhase;
/* 0x570 */ mDoExt_McaMorfSO* mpModelMorf;
/* 0x574 */ Z2CreatureEnemy mSound;
/* 0x618 */ u8 field_0x618[0x624 - 0x618];
/* 0x618 */ cXyz field_0x618;
/* 0x624 */ actionFn mAction;
/* 0x630 */ actionFn field_0x630;
/* 0x63C */ int field_0x63c;
include/d/actor/d_a_alink.h
+10 -10
View File
@@ -3232,7 +3232,7 @@ public:
virtual bool checkChainBlockPushPull();
virtual BOOL checkElecDamage() const { return mProcID == PROC_ELEC_DAMAGE; }
virtual BOOL checkEmptyBottleSwing() const {
return mEquipItem == fpcNm_ITEM_EMPTY_BOTTLE && mProcID == PROC_BOTTLE_SWING;
return mEquipItem == dItemNo_EMPTY_BOTTLE_e && mProcID == PROC_BOTTLE_SWING;
}
virtual BOOL checkBottleSwingMode() const { return mProcID == PROC_BOTTLE_SWING; }
virtual BOOL checkHawkWait() const { return mProcID == PROC_HAWK_SUBJECT; }
@@ -3334,7 +3334,7 @@ public:
virtual u32 checkBoardRide() const;
virtual u32 checkSpinnerRide() const;
virtual bool checkArrowChargeEnd() const;
virtual bool checkNoEquipItem() const { return mEquipItem == fpcNm_ITEM_NONE; }
virtual bool checkNoEquipItem() const { return mEquipItem == dItemNo_NONE_e; }
virtual bool checkKandelaarSwing(int) const;
virtual s16 getBoardCutTurnOffsetAngleY() const {
if (mProcID == PROC_BOARD_CUT_TURN) {
@@ -3402,7 +3402,7 @@ public:
}
virtual BOOL checkWolfDownAttackPullOut() const { return mProcID == PROC_WOLF_DOWN_AT_LAND; }
virtual cXyz* getMidnaAtnPos() const { return (cXyz*)&mMidnaAtnPos; }
virtual bool checkCopyRodEquip() const { return mEquipItem == fpcNm_ITEM_COPY_ROD; }
virtual bool checkCopyRodEquip() const { return mEquipItem == dItemNo_COPY_ROD_e; }
virtual void setKandelaarMtx(Mtx i_mtx, int, int);
virtual bool getStickAngleFromPlayerShape(s16* o_angle) const;
virtual bool checkSpinnerPathMove();
@@ -3487,11 +3487,11 @@ public:
return checkHookshotReadyAnime() || checkHookshotShootAnime();
}
BOOL checkBoomerangReadyAnime() const {
return (mEquipItem == fpcNm_ITEM_BOOMERANG || mEquipItem == 0x102) && checkUpperAnime(dRes_ID_ALANM_BCK_BOOMWAIT_e);
return (mEquipItem == dItemNo_BOOMERANG_e || mEquipItem == 0x102) && checkUpperAnime(dRes_ID_ALANM_BCK_BOOMWAIT_e);
}
bool checkDkCaught2Anime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_WAITHDB_e); }
BOOL checkCopyRodThrowAnime() const {
return mEquipItem == fpcNm_ITEM_COPY_ROD && checkUpperAnime(dRes_ID_ALANM_BCK_BOOMTHROW_e);
return mEquipItem == dItemNo_COPY_ROD_e && checkUpperAnime(dRes_ID_ALANM_BCK_BOOMTHROW_e);
}
BOOL checkCutDashChargeAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_CUTDTP_e); }
BOOL checkBoomerangAnimeAndReturnWait() const { return checkBoomerangAnime(); }
@@ -3526,7 +3526,7 @@ public:
bool checkDashDamageAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_DAMD_e); }
bool checkBoomerangCatchAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_BOOMCATCH_e); }
BOOL checkCopyRodReadyAnime() const {
return mEquipItem == fpcNm_ITEM_COPY_ROD && checkUpperAnime(dRes_ID_ALANM_BCK_BOOMWAIT_e);
return mEquipItem == dItemNo_COPY_ROD_e && checkUpperAnime(dRes_ID_ALANM_BCK_BOOMWAIT_e);
}
BOOL checkCanoeFishingWaitAnime() const {
return checkUpperAnime(dRes_ID_ALANM_BCK_CANOEREELINGR_e) || checkUpperAnime(dRes_ID_ALANM_BCK_WAITFISHR_e);
@@ -3685,12 +3685,12 @@ public:
}
bool checkFisingRodJewl() const {
return (mEquipItem == fpcNm_ITEM_JEWEL_ROD || mEquipItem == fpcNm_ITEM_JEWEL_WORM_ROD) || mEquipItem == fpcNm_ITEM_JEWEL_BEE_ROD;
return (mEquipItem == dItemNo_JEWEL_ROD_e || mEquipItem == dItemNo_JEWEL_WORM_ROD_e) || mEquipItem == dItemNo_JEWEL_BEE_ROD_e;
}
bool checkFisingRodWorm() const { return mItemMode == fpcNm_ITEM_WORM; }
bool checkFisingRodWorm() const { return mItemMode == dItemNo_WORM_e; }
bool checkFisingRodBee() const { return mItemMode == fpcNm_ITEM_BEE_CHILD; }
bool checkFisingRodBee() const { return mItemMode == dItemNo_BEE_CHILD_e; }
void fishingCastWaitAnimeStart() {
if (mProcID == PROC_FISHING_CAST) {
@@ -3772,7 +3772,7 @@ public:
void setGrassCancelStatus(u8 i_status) { setBStatus(i_status); }
void seStartSystem(u32 i_soundID) { mDoAud_seStart(i_soundID, NULL, 0, 0); }
bool checkIronBallEquip() const { return mEquipItem == fpcNm_ITEM_IRONBALL; }
bool checkIronBallEquip() const { return mEquipItem == dItemNo_IRONBALL_e; }
BOOL checkFishingRodEquip() const { return checkFishingRodItem(mEquipItem); }
f32 getAnmSpeedStickRate(f32 param_0, f32 param_1) const {
include/d/actor/d_a_arrow.h
+2 -2
View File
@@ -74,7 +74,7 @@ public:
void deleteArrow() { field_0x93f = 1; }
static fopAc_ac_c* makeArrow(fopAc_ac_c* i_actor, u16 param_1) {
return (fopAc_ac_c*)fopAcM_fastCreate(PROC_ARROW,
return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_ARROW_e,
param_1 << 8,
&i_actor->current.pos,
fopAcM_GetRoomNo(i_actor),
@@ -86,7 +86,7 @@ public:
}
static fopAc_ac_c* makeSlingStone(fopAc_ac_c* i_actor, cXyz* i_pos) {
return (fopAc_ac_c*)fopAcM_fastCreate(PROC_ARROW,
return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_ARROW_e,
0x401,
i_pos,
fopAcM_GetRoomNo(i_actor),
include/d/actor/d_a_bd.h
-17
View File
@@ -87,21 +87,4 @@ public:
STATIC_ASSERT(sizeof(bd_class) == 0x9ec);
class daBd_HIO_c : public JORReflexible {
public:
daBd_HIO_c();
virtual ~daBd_HIO_c() {}
void genMessage(JORMContext*);
/* 0x04 */ s8 id;
/* 0x08 */ f32 mBasicSize;
/* 0x0C */ f32 mFlightSpeed;
/* 0x10 */ f32 mGroundSpeed;
/* 0x14 */ s16 mFlightTime;
/* 0x18 */ f32 mLinkDetectRange;
/* 0x1C */ s16 mChirpDist;
/* 0x1E */ s8 field_0x1E;
};
#endif /* D_A_BD_H */
include/d/actor/d_a_e_bg.h
+1 -18
View File
@@ -42,7 +42,7 @@ public:
int CreateHeap();
int create();
void setBgId(u32 i_bgId) { mBgId = i_bgId; }
void setBgId(unsigned int i_bgId) { mBgId = i_bgId; }
bool isBomb() { return mIsBomb; }
private:
@@ -92,21 +92,4 @@ private:
STATIC_ASSERT(sizeof(daE_BG_c) == 0xbbc);
class daE_BG_HIO_c : public JORReflexible {
public:
daE_BG_HIO_c();
virtual ~daE_BG_HIO_c() {}
void genMessage(JORMContext*);
/* 0x04 */ s8 field_0x4;
/* 0x08 */ f32 mTrackingSpeed;
/* 0x0C */ f32 mRushSpeed;
/* 0x10 */ f32 mWaitDistanceBeforeCharging;
/* 0x14 */ f32 mPlayerSearchDistance;
/* 0x18 */ f32 mAttackRange;
/* 0x1C */ f32 mSwimRange;
/* 0x20 */ f32 mJumpTime;
};
#endif /* D_A_E_BG_H */
include/d/actor/d_a_e_df.h
+1 -1
View File
@@ -51,7 +51,7 @@ public:
void BombEatAction();
void Spid_Out();
void LinkEatAction();
bool Mogu_Mogu();
u8 Mogu_Mogu();
void ObjEatAction();
void EatAction();
void SearchAction();
include/d/actor/d_a_e_rd.h
+50 -48
View File
@@ -8,14 +8,16 @@
#include "d/d_path.h"
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_ext.h"
/**
* @ingroup actors-enemies
* @class e_rd_class
* @brief Bulblin
*
* @details
*
* @brief Rider (Bulblin / King Bulblin on Boar)
*
* @details Bulblin enemy that rides a Bullbo (wild boar). Handles mounting,
* riding, combat, and dismounting behavior, as well as on-foot actions when
* not riding. Bulblins appear as regular riders,
* while King Bulblin serves as the boss variant of the boar rider.
*
*/
class e_rd_class {
public:
@@ -28,11 +30,11 @@ public:
/* 0x05B7 */ u8 arg1;
/* 0x05B8 */ u8 arg2;
/* 0x05B9 */ u8 field_0x5b9;
/* 0x05BA */ u8 field_0x5ba;
/* 0x05BA */ u8 scene_no;
/* 0x05BB */ u8 field_0x5bb;
/* 0x05BC */ u8 weapon_type;
/* 0x05BD */ s8 field_0x5bd;
/* 0x05C0 */ cXyz field_0x5c0;
/* 0x05BD */ s8 armament_flag;
/* 0x05C0 */ cXyz find_pos;
/* 0x05CC */ s16 target_ya;
/* 0x05D0 */ mDoExt_McaMorfSO* anm_p;
/* 0x05D4 */ Z2CreatureEnemy sound;
@@ -40,29 +42,29 @@ public:
/* 0x067C */ int anm;
/* 0x0680 */ int field_0x680;
/* 0x0684 */ dJntCol_c mJntCol;
/* 0x0694 */ J3DModel* arrow;
/* 0x0694 */ J3DModel* arrow_model;
/* 0x0698 */ mDoExt_McaMorfSO* bow_anm;
/* 0x069C */ mDoExt_McaMorf* mpMorfHornAnm;
/* 0x06A0 */ s8 field_0x6a0;
/* 0x06A4 */ cXyz field_0x6a4;
/* 0x06B0 */ cXyz field_0x6b0;
/* 0x06BC */ csXyz field_0x6bc;
/* 0x069C */ mDoExt_McaMorf* horn_anm;
/* 0x06A0 */ s8 horn_mode;
/* 0x06A4 */ cXyz horn_pos;
/* 0x06B0 */ cXyz horn_spd;
/* 0x06BC */ csXyz horn_rot;
/* 0x06C2 */ s8 run_flag;
/* 0x06C3 */ u8 field_0x6c3;
/* 0x06C4 */ J3DModel* eye_model[2];
/* 0x06CC */ f32 field_0x6cc;
/* 0x06D0 */ f32 field_0x6d0;
/* 0x06D4 */ J3DModel* armor_boss_part[14];
/* 0x070C */ s8 field_0x70c[14];
/* 0x071C */ cXyz field_0x71c[14];
/* 0x07C4 */ cXyz field_0x7c4[14];
/* 0x086C */ csXyz field_0x86c[14];
/* 0x070C */ s8 part_break[14];
/* 0x071C */ cXyz part_pos[14];
/* 0x07C4 */ cXyz part_spd[14];
/* 0x086C */ csXyz part_angle[14];
/* 0x08C0 */ u32 armor_break_eff[14][3];
/* 0x0968 */ s8 field_0x968;
/* 0x096C */ f32 field_0x96c;
/* 0x0970 */ s16 counter;
/* 0x0972 */ s16 action;
/* 0x0974 */ s16 prev_action;
/* 0x0974 */ s16 old_action;
/* 0x0978 */ f32 dis;
/* 0x097C */ s16 angleY;
/* 0x0980 */ f32 attack_range;
@@ -76,7 +78,7 @@ public:
/* 0x099E */ s16 attack_timer;
/* 0x09A0 */ s8 field_0x9a0;
/* 0x09A1 */ s8 look_timer;
/* 0x09A2 */ s8 field_0x9a2;
/* 0x09A2 */ s8 arrow_draw;
/* 0x09A3 */ s8 arrow_flag;
/* 0x09A4 */ s8 field_0x9a4;
/* 0x09A5 */ u8 field_0x9a5;
@@ -86,19 +88,19 @@ public:
/* 0x09AB */ s8 field_0x9ab;
/* 0x09AC */ s8 field_0x9ac;
/* 0x09AD */ s8 field_0x9ad;
/* 0x09B0 */ cXyz field_0x9b0;
/* 0x09B0 */ cXyz center_body;
/* 0x09BC */ s8 ride_mode;
/* 0x09BD */ s8 field_0x9bd;
/* 0x09BE */ s8 boar_stand;
/* 0x09BF */ u8 field_0x9bf;
/* 0x09C0 */ f32 field_0x9c0;
/* 0x09C4 */ f32 field_0x9c4;
/* 0x09C8 */ s8 field_0x9c8;
/* 0x09C0 */ f32 mount_jump_y;
/* 0x09C4 */ f32 mount_jump_speed;
/* 0x09C8 */ s8 aim_type;
/* 0x09C9 */ u8 field_0x9c9;
/* 0x09CA */ s16 field_0x9ca;
/* 0x09CC */ s16 field_0x9cc;
/* 0x09CE */ s16 field_0x9ce;
/* 0x09D0 */ s16 field_0x9d0;
/* 0x09CA */ s16 aim_angle_y;
/* 0x09CC */ s16 aim_angle_x;
/* 0x09CE */ s16 head_angle_y;
/* 0x09D0 */ s16 head_shake;
/* 0x09D4 */ cXyz eye;
/* 0x09E0 */ cXyz field_0x9e0; // unused, dbg offset 0xa18
/* 0x09EC */ f32 jump_z;
@@ -111,7 +113,7 @@ public:
/* 0x0A0C */ csXyz jump_angle;
/* 0x0A12 */ csXyz field_0xa12;
/* 0x0A18 */ csXyz field_0xa18;
/* 0x0A1E */ s8 field_0xa1e;
/* 0x0A1E */ s8 jump_timer;
/* 0x0A1F */ s8 field_0xa1f;
/* 0x0A20 */ u32 field_0xa20;
/* 0x0A24 */ f32 field_0xa24;
@@ -139,47 +141,47 @@ public:
/* 0x0AF8 */ s16 field_0xaf8;
/* 0x0AFA */ s8 field_0xafa;
/* 0x0AFB */ s8 field_0xafb;
/* 0x0AFC */ dPath* path;
/* 0x0B00 */ s8 field_0xb00;
/* 0x0B01 */ s8 path_dir;
/* 0x0AFC */ dPath* ppd;
/* 0x0B00 */ s8 jyunkai_no; /* 巡回ポイントNo (Patrol point index) */
/* 0x0B01 */ s8 dir;
/* 0x0B04 */ dBgS_AcchCir AcchCir;
/* 0x0B44 */ dBgS_ObjAcch ObjAcch;
/* 0x0D1C */ dCcD_Stts mStts;
/* 0x0B44 */ dBgS_ObjAcch Bgc;
/* 0x0D1C */ dCcD_Stts Stts;
/* 0x0D58 */ dCcD_Sph cc_sph[3];
/* 0x1100 */ dCcD_Sph at_sph;
/* 0x1238 */ dCcU_AtInfo AtInfo;
/* 0x1238 */ dCcU_AtInfo at_info;
/* 0x125C */ u8 hio_set;
/* 0x125D */ s8 field_0x125d;
/* 0x1260 */ u32 field_0x1260;
/* 0x1264 */ u32 field_0x1264;
/* 0x1268 */ u32 enemy_downWtrA[3];
/* 0x1274 */ u32 fire_eff[2];
/* 0x127C */ cXyz field_0x127c;
/* 0x1288 */ cXyz field_0x1288;
/* 0x1268 */ u32 w_eff_id[3];
/* 0x1274 */ u32 fire_eff_id[2];
/* 0x127C */ cXyz fire_pos;
/* 0x1288 */ cXyz fire_eff;
/* 0x1294 */ s8 field_0x1294;
/* 0x1295 */ s8 one_hit_kill;
/* 0x1296 */ s8 field_0x1296;
/* 0x1297 */ s8 field_0x1297;
/* 0x1298 */ s8 field_0x1298;
/* 0x1299 */ u8 field_0x1299;
/* 0x129A */ s8 actor_set; // 1: Eldin Field, 2 Eldin Bridge, 3 Lake Hylia Bridge, 4 ???
/* 0x129A */ s8 actor_set;
/* 0x129B */ u8 field_0x129b;
/* 0x129C */ s8 field_0x129c;
/* 0x129C */ s8 horn_timer;
/* 0x12A0 */ int sw;
/* 0x12A4 */ s16 demo_mode;
/* 0x12A6 */ s16 demo_timer;
/* 0x12A8 */ cXyz demo_cam_eye;
/* 0x12B4 */ cXyz demo_cam_center;
/* 0x12C0 */ cXyz field_0x12c0;
/* 0x12CC */ cXyz field_0x12cc;
/* 0x12D8 */ cXyz field_0x12d8;
/* 0x12E4 */ cXyz field_0x12e4;
/* 0x12B4 */ cXyz demo_cam_ctr;
/* 0x12C0 */ cXyz demo_cam_way;
/* 0x12CC */ cXyz demo_cam_target;
/* 0x12D8 */ cXyz demo_cam_eye_spd;
/* 0x12E4 */ cXyz demo_cam_way_spd;
/* 0x12F0 */ cXyz field_0x12f0;
/* 0x12FC */ u8 field_0x12fc[0x1300 - 0x12fc];
/* 0x1300 */ f32 field_0x1300;
/* 0x1300 */ f32 demo_cam_eye_z;
/* 0x1304 */ u8 blurRate;
/* 0x1308 */ f32 demo_cam_zoom;
/* 0x130C */ f32 field_0x130c;
/* 0x130C */ f32 demo_cam_morf;
/* 0x1310 */ u8 field_0x1310[0x131c - 0x1310];
/* 0x131C */ dMsgFlow_c MsgFlow;
};
include/d/actor/d_a_e_wb.h
+90 -90
View File
@@ -57,7 +57,7 @@ enum daE_WB_ACT {
};
struct himo_s {
/* 0x0 */ cXyz field_0x0[16];
/* 0x0 */ cXyz node[16];
};
@@ -79,61 +79,61 @@ public:
BOOL checkNormalRideMode() const;
void setRunRideMode();
MtxP getRideMtx() { return mpModelMorf->getModel()->getAnmMtx(15); }
f32 nowAnimeFrame() const { return mpModelMorf->getFrame(); }
s16 getWaitRollAngle() const { return mWaitRollAngle; }
BOOL checkGetOff() const { return mEnemy.speedF < 3.0f; }
f32 rideSpeedRate() const { return mEnemy.speedF / mSpeedRate; }
f32 getAnimeFrameRate() { return mpModelMorf->getFrame() / mpModelMorf->getEndFrame(); }
BOOL checkAnmLoopFrame() { return mpModelMorf->checkFrame(0.0f); }
MtxP getRideMtx() { return anm_p->getModel()->getAnmMtx(15); }
f32 nowAnimeFrame() const { return anm_p->getFrame(); }
s16 getWaitRollAngle() const { return wait_roll_angle; }
BOOL checkGetOff() const { return enemy.speedF < 3.0f; }
f32 rideSpeedRate() const { return enemy.speedF / ride_speed_max; }
f32 getAnimeFrameRate() { return anm_p->getFrame() / anm_p->getEndFrame(); }
BOOL checkAnmLoopFrame() { return anm_p->checkFrame(0.0f); }
J3DModel* getModel() {
if (mpModelMorf != NULL) {
return mpModelMorf->getModel();
if (anm_p != NULL) {
return anm_p->getModel();
}
return NULL;
}
public:
/* 0x0000 */ fopEn_enemy_c mEnemy; ///< @brief Base enemy class instance.
/* 0x05AC */ request_of_phase_process_class mPhase; ///< @brief Phase process request handler.
/* 0x05B4 */ s16 mActionMode; ///< @brief Current sub-action mode within the run action.
/* 0x05B8 */ char* mResName; ///< @brief Resource name for loading models/animations.
/* 0x05BC */ u8 mParam; ///< @brief Creation parameter 1.
/* 0x05BD */ u8 mParam2; ///< @brief Creation parameter 2.
/* 0x0000 */ fopEn_enemy_c enemy; ///< @brief Base enemy class instance.
/* 0x05AC */ request_of_phase_process_class phase; ///< @brief Phase process request handler.
/* 0x05B4 */ s16 ride_mode; ///< @brief Current sub-action mode within the run action.
/* 0x05B8 */ char* resName; ///< @brief Resource name for loading models/animations.
/* 0x05BC */ u8 arg0; ///< @brief Creation parameter 1.
/* 0x05BD */ u8 arg1; ///< @brief Creation parameter 2.
/* 0x05BE */ u8 field_0x5be;
/* 0x05BF */ bool field_0x5bf;
/* 0x05BF */ bool no_draw;
/* 0x05C0 */ u8 field_0x5c0;
/* 0x05C4 */ cXyz field_0x5c4;
/* 0x05C4 */ cXyz eye;
/* 0x05D0 */ cXyz field_0x5d0;
/* 0x05DC */ s16 mTargetFacingAngle; ///< @brief Target facing angle for turning towards path point.
/* 0x05DC */ s16 target_ya; ///< @brief Target facing angle for turning towards path point.
/* 0x05DE */ s16 field_0x5de;
/* 0x05E0 */ mDoExt_McaMorfSO* mpModelMorf; ///< @brief Pointer to model morph animator.
/* 0x05E4 */ f32 mPlaySpeed; ///< @brief Animation playback speed.
/* 0x05E8 */ int mAnmID; ///< @brief Current animation ID.
/* 0x05EC */ Z2CreatureRide mZ2Ride; ///< @brief Z2 sound creature for ride effects.
/* 0x05E0 */ mDoExt_McaMorfSO* anm_p; ///< @brief Pointer to model morph animator.
/* 0x05E4 */ f32 anm_spd; ///< @brief Animation playback speed.
/* 0x05E8 */ int anmID; ///< @brief Current animation ID.
/* 0x05EC */ Z2CreatureRide sound; ///< @brief Z2 sound creature for ride effects.
/* 0x0688 */ int field_0x688;
/* 0x068C */ s8 mPathInitialized; ///< @brief Flag indicating if path has been initialized.
/* 0x068E */ s16 field_0x68e;
/* 0x0690 */ s16 mActionID; ///< @brief High-level action ID.
/* 0x0692 */ s16 field_0x692;
/* 0x0694 */ int mShadowKey; ///< @brief Shadow drawing key.
/* 0x0698 */ s16 field_0x698[4];
/* 0x06A0 */ s16 field_0x6a0;
/* 0x068C */ s8 path_set; ///< @brief Flag indicating if path has been initialized.
/* 0x068E */ s16 counter;
/* 0x0690 */ s16 action; ///< @brief High-level action ID.
/* 0x0692 */ s16 old_action;
/* 0x0694 */ int shadow_key; ///< @brief Shadow drawing key.
/* 0x0698 */ s16 timer[4];
/* 0x06A0 */ s16 wait_timer;
/* 0x06A2 */ u8 field_0x6a2[0x6ae - 0x6a2];
/* 0x06AE */ csXyz field_0x6ae;
/* 0x06B4 */ csXyz field_0x6b4;
/* 0x06BA */ s16 field_0x6ba;
/* 0x06AE */ csXyz rotation;
/* 0x06B4 */ csXyz rotation_spd;
/* 0x06BA */ s16 damage_timer;
/* 0x06BC */ u8 field_0x6bc;
/* 0x06BD */ s8 mPursuitFlag; ///< @brief Flag indicating pursuit mode.
/* 0x06BE */ u16 mStatusFlags; ///< @brief Bitfield for various status flags.
/* 0x06BD */ s8 pursuit_flg; ///< @brief Flag indicating pursuit mode.
/* 0x06BE */ u16 status_flag; ///< @brief Bitfield for various status flags.
/* 0x06C0 */ s8 field_0x6c0;
/* 0x06C4 */ f32 field_0x6c4;
/* 0x06C8 */ int mCurrentPathIndex; ///< @brief Current index in the path points array.
/* 0x06CC */ int mPathDirection; ///< @brief Direction to iterate path points (+1 or -1).
/* 0x06D0 */ s16 field_0x6d0;
/* 0x06D2 */ s16 mTurnStep; ///< @brief Step value for turning angle adjustment.
/* 0x06C4 */ f32 x_check;
/* 0x06C8 */ int path_ten; ///< @brief Current index in the path points array.
/* 0x06CC */ int dir; ///< @brief Direction to iterate path points (+1 or -1).
/* 0x06D0 */ s16 range;
/* 0x06D2 */ s16 turn_step; ///< @brief Step value for turning angle adjustment.
/* 0x06D4 */ s16 field_0x6d4;
/* 0x06D6 */ s16 field_0x6d6;
/* 0x06D8 */ s16 field_0x6d8;
@@ -142,24 +142,24 @@ public:
/* 0x06DE */ csXyz field_0x6de;
/* 0x06E4 */ s8 field_0x6e4;
/* 0x06E5 */ u8 field_0x6e5[0x6ec - 0x6e5];
/* 0x06EC */ csXyz field_0x6ec[0x1d];
/* 0x079A */ s16 mBodyTiltAngle; ///< @brief Body tilt angle based on turning.
/* 0x079C */ u8 field_0x79c;
/* 0x079D */ s8 field_0x79d;
/* 0x079E */ s8 mLapCount; ///< @brief Lap or progress count affecting path generation.
/* 0x079F */ s8 mPathAdjustCounter; ///< @brief Counter for periodic path adjustment.
/* 0x07A0 */ s16 field_0x7a0;
/* 0x07A2 */ s8 field_0x7a2;
/* 0x06EC */ csXyz field_0x6ec[29];
/* 0x079A */ s16 body_angle; ///< @brief Body tilt angle based on turning.
/* 0x079C */ u8 start_timer;
/* 0x079D */ s8 leader;
/* 0x079E */ s8 lap_num; ///< @brief Lap or progress count affecting path generation.
/* 0x079F */ s8 path_adjust_count; ///< @brief Counter for periodic path adjustment.
/* 0x07A0 */ s16 dodge_angle;
/* 0x07A2 */ s8 kiba;
/* 0x07A4 */ s16 field_0x7a4;
/* 0x07A6 */ s8 field_0x7a6;
/* 0x07A7 */ s8 field_0x7a7;
/* 0x07A8 */ f32 field_0x7a8;
/* 0x07AC */ dBgS_AcchCir field_0x7ac;
/* 0x07EC */ dBgS_ObjAcch mAcch;
/* 0x09C4 */ dCcD_Stts mStts;
/* 0x0A00 */ dCcD_Sph field_0xa00[7];
/* 0x1288 */ dCcD_Sph field_0x1288;
/* 0x13C0 */ dCcU_AtInfo field_0x13c0;
/* 0x07A8 */ f32 pass;
/* 0x07AC */ dBgS_AcchCir AcchCir;
/* 0x07EC */ dBgS_ObjAcch Bgc;
/* 0x09C4 */ dCcD_Stts Stts;
/* 0x0A00 */ dCcD_Sph cc_sph[7];
/* 0x1288 */ dCcD_Sph at_sph;
/* 0x13C0 */ dCcU_AtInfo at_info;
/* 0x13E4 */ u8 field_0x13e4;
/* 0x13E8 */ u32 field_0x13e8[2];
/* 0x13F0 */ u32 field_0x13f0;
@@ -173,53 +173,53 @@ public:
/* 0x1414 */ u32 field_0x1414;
/* 0x1418 */ u32 field_0x1418;
/* 0x141C */ u32 field_0x141c;
/* 0x1420 */ u32 field_0x1420[3];
/* 0x142C */ u8 mMovementType; ///< @brief Type of movement (1 for normal, 2 for faster).
/* 0x142D */ u8 mCollisionFlags; ///< @brief Flags for collision states.
/* 0x142E */ u8 mLandingFlag; ///< @brief Flag for landing after jump.
/* 0x142F */ s8 mSpeedCapTimer; ///< @brief Timer to cap speed at 30.
/* 0x1430 */ s8 field_0x1430;
/* 0x1432 */ s16 field_0x1432;
/* 0x1434 */ fpc_ProcID field_0x1434; // Rider actor ID? ///< @brief Process ID of rider actor.
/* 0x1438 */ cXyz field_0x1438[2];
/* 0x1450 */ himo_s field_0x1450[2];
/* 0x15D0 */ mDoExt_3DlineMat1_c field_0x15d0[2];
/* 0x1648 */ mDoExt_3DlineMat1_c field_0x1648;
/* 0x1684 */ f32 mAnimDuration; ///< @brief Duration or timer for animation.
/* 0x1420 */ u32 w_eff_id[3];
/* 0x142C */ u8 movement_type; ///< @brief Type of movement (1 for normal, 2 for faster).
/* 0x142D */ u8 collision_flg; ///< @brief Flags for collision states.
/* 0x142E */ u8 landing_flag; ///< @brief Flag for landing after jump.
/* 0x142F */ s8 gake_flg;
/* 0x1430 */ s8 demo_stop;
/* 0x1432 */ s16 dash_timer;
/* 0x1434 */ fpc_ProcID rd_id; // Rider actor ID? ///< @brief Process ID of rider actor.
/* 0x1438 */ cXyz rein_hand_pos[2];
/* 0x1450 */ himo_s himo[2];
/* 0x15D0 */ mDoExt_3DlineMat1_c himo_mat[2];
/* 0x1648 */ mDoExt_3DlineMat1_c himo_tex;
/* 0x1684 */ f32 anm_time; ///< @brief Duration or timer for animation.
/* 0x1688 */ s16 field_0x1688;
/* 0x168A */ s16 field_0x168a;
/* 0x168C */ f32 field_0x168c;
/* 0x1690 */ f32 field_0x1690;
/* 0x168C */ f32 rein_spd;
/* 0x1690 */ f32 acceleration;
/* 0x1694 */ u8 field_0x1694[0x169e - 0x1694];
/* 0x169E */ s16 field_0x169e;
/* 0x16A0 */ s16 field_0x16a0;
/* 0x16A4 */ cXyz field_0x16a4;
/* 0x16B0 */ cXyz field_0x16b0;
/* 0x16BC */ cXyz field_0x16bc;
/* 0x16C8 */ cXyz field_0x16c8;
/* 0x16D4 */ cXyz field_0x16d4;
/* 0x16E0 */ cXyz field_0x16e0;
/* 0x16EC */ cXyz field_0x16ec;
/* 0x16F8 */ cXyz field_0x16f8;
/* 0x1704 */ s16 field_0x1704;
/* 0x1708 */ f32 field_0x1708;
/* 0x170C */ f32 field_0x170c;
/* 0x1710 */ f32 field_0x1710;
/* 0x1714 */ f32 field_0x1714;
/* 0x169E */ s16 demo_mode;
/* 0x16A0 */ s16 demo_timer;
/* 0x16A4 */ cXyz demo_cam_eye;
/* 0x16B0 */ cXyz demo_cam_eye_mae;
/* 0x16BC */ cXyz demo_cam_ctr;
/* 0x16C8 */ cXyz demo_cam_ctr_mae;
/* 0x16D4 */ cXyz demo_cam_target;
/* 0x16E0 */ cXyz demo_cam_way;
/* 0x16EC */ cXyz demo_cam_eye_spd;
/* 0x16F8 */ cXyz demo_cam_way_spd;
/* 0x1704 */ s16 demo_cam_ya;
/* 0x1708 */ f32 demo_cam_eye_z;
/* 0x170C */ f32 demo_cam_eye_x;
/* 0x1710 */ f32 demo_cam_morf;
/* 0x1714 */ f32 demo_cam_zoom;
/* 0x1718 */ f32 field_0x1718;
/* 0x171C */ f32 field_0x171c;
/* 0x1720 */ s8 field_0x1720;
/* 0x1721 */ s8 field_0x1721;
/* 0x1722 */ s8 field_0x1722;
/* 0x1722 */ s8 saku_burn;
/* 0x1723 */ u8 field_0x1723[0x17c4 - 0x1723];
/* 0x17C4 */ u32 field_0x17c4;
/* 0x17C4 */ u32 anm_se_eff;
/* 0x17C8 */ u8 field_0x17c8[0x17D0 - 0x17C8];
/* 0x17D0 */ u32 field_0x17d0[4];
/* 0x17D0 */ u32 w_eff_id2[4];
/* 0x17E0 */ u8 field_0x17e0;
/* 0x17E1 */ u8 field_0x17e1;
/* 0x17E2 */ s16 mWaitRollAngle; ///< @brief Roll angle during wait state.
/* 0x17E2 */ s16 wait_roll_angle; ///< @brief Roll angle during wait state.
/* 0x17E4 */ u8 field_0x17e4[0x17e8 - 0x17e4];
/* 0x17E8 */ f32 mSpeedRate; ///< @brief Speed rate for riding calculations.
/* 0x17E8 */ f32 ride_speed_max; ///< @brief Speed rate for riding calculations.
};
STATIC_ASSERT(sizeof(e_wb_class) == 0x17EC);
include/d/actor/d_a_e_yr.h
+1 -1
View File
@@ -69,7 +69,7 @@ public:
/* 0x6E9 */ s8 field_0x6e9;
/* 0x6EA */ s8 field_0x6ea;
/* 0x6EB */ s8 field_0x6eb;
/* 0x6EC */ dPath* field_0x6ec;
/* 0x6EC */ dPath* ppd;
/* 0x6F0 */ u8 field_0x6f0;
/* 0x6F2 */ csXyz field_0x6f2;
/* 0x6F8 */ csXyz field_0x6f8;
include/d/actor/d_a_horse.h
+2 -2
View File
@@ -539,10 +539,10 @@ public:
/* 0x0C4 */ f32 boar_jump_height;
/* 0x0C8 */ f32 water_depth_limit;
/* 0x0CC */ f32 enemy_search_range;
/* 0x0D0 */ f32 m0D0;
/* 0x0D0 */ f32 climb_step;
/* 0x0D4 */ f32 floor_angle_limit;
/* 0x0D8 */ f32 dash_anm_speed;
/* 0x0DC */ f32 field_0xdc;
/* 0x0DC */ f32 min_walk_rate;
/* 0x0E0 */ f32 walk_min_speed;
/* 0x0E4 */ f32 cliff_jump_anm_speed;
/* 0x0E8 */ f32 cliff_jump_start_frame;
include/d/actor/d_a_npc_cdn3.h
+1 -15
View File
@@ -285,21 +285,7 @@ public:
}
}
bool isOrchestra() {
if (strcmp(dComIfGp_getStartStageName(), "F_SP116") != 0) {
return 0;
} else {
if (m_seqNum == 17 &&
(getType() == 4 || getType() == 5 || getType() == 6 || getType() == 16))
{
return 1;
} else if (m_seqNum == 37 && getType() == 7) {
return 1;
} else {
return 0;
}
}
}
bool isOrchestra();
int chkEvent() {
attention_info.flags = 0;
include/d/actor/d_a_npc_chin.h
+2 -2
View File
@@ -19,9 +19,9 @@ public:
class daNpcChin_HIO_c : public mDoHIO_entry_c {
public:
daNpcChin_HIO_c();
virtual ~daNpcChin_HIO_c();
void listenPropertyEvent(const JORPropertyEvent*);
void genMessage(JORMContext*);
virtual void genMessage(JORMContext*);
/* 0x08 */ daNpcChin_HIOParam m;
};
include/d/actor/d_a_npc_ins.h
+1 -1
View File
@@ -107,7 +107,7 @@ public:
bool isInsect(int type) {
bool rv = false;
if (type >= fpcNm_ITEM_M_BEETLE && type <= fpcNm_ITEM_F_MAYFLY) {
if (type >= dItemNo_M_BEETLE_e && type <= dItemNo_F_MAYFLY_e) {
rv = true;
}
include/d/actor/d_a_npc_jagar.h
+1 -1
View File
@@ -206,7 +206,7 @@ public:
int crashPumpkin(fopAc_ac_c* pumpkin_p) {
int reg_r30;
if (mType == 0 && fopAcM_GetName(pumpkin_p) == PROC_OBJ_PUMPKIN && !daNpcT_chkEvtBit(0xAE)
if (mType == 0 && fopAcM_GetName(pumpkin_p) == fpcNm_OBJ_PUMPKIN_e && !daNpcT_chkEvtBit(0xAE)
&& daNpcT_chkEvtBit(0x25B) && !daNpcT_chkEvtBit(0x235)) {
++field_0xffc;
reg_r30 = chkPointInArea(pumpkin_p->current.pos, current.pos, mpHIO->m.pumpkin_watch_range,
include/d/actor/d_a_npc_shad.h
+3 -3
View File
@@ -214,15 +214,15 @@ public:
void searchActors() {
if (mMode == 0) {
if (mActorMngr[1].getActorP() == NULL) {
mActorMngr[1].entry(fopAcM_SearchByName(PROC_NPC_ASH));
mActorMngr[1].entry(fopAcM_SearchByName(fpcNm_NPC_ASH_e));
}
if (mActorMngr[2].getActorP() == NULL) {
mActorMngr[2].entry(fopAcM_SearchByName(PROC_NPC_RAFREL));
mActorMngr[2].entry(fopAcM_SearchByName(fpcNm_NPC_RAFREL_e));
}
if (mActorMngr[3].getActorP() == NULL) {
mActorMngr[3].entry(fopAcM_SearchByName(PROC_NPC_MOIR));
mActorMngr[3].entry(fopAcM_SearchByName(fpcNm_NPC_MOIR_e));
}
if (mActorMngr[4].getActorP() == NULL) {
include/d/actor/d_a_npc_tkj2.h
+2 -13
View File
@@ -2,6 +2,7 @@
#define D_A_NPC_TKJ2_H
#include "d/actor/d_a_npc.h"
#include "d/d_cc_uty.h"
/**
* @ingroup actors-npcs
@@ -51,7 +52,7 @@ public:
/* 0x84C */ u8 field_0x84c[0x850 - 0x84c];
/* 0x850 */ dCcD_Stts mStts;
/* 0x88C */ dCcD_Sph field_0x88c;
/* 0x9C4 */ u8 field_0x9c4[0x9e8 - 0x9c4];
/* 0x9C4 */ dCcU_AtInfo field_0x9c4;
/* 0x9E8 */ Z2CreatureEnemy mSound;
/* 0xA8C */ s8 field_0xa8c;
/* 0xA8E */ s16 field_0xa8e;
@@ -64,16 +65,4 @@ public:
STATIC_ASSERT(sizeof(npc_tkj2_class) == 0xaa0);
class daNpc_Tkj2_HIO_c {
public:
daNpc_Tkj2_HIO_c();
virtual ~daNpc_Tkj2_HIO_c() {}
/* 天空人（アクション用）- Sky People (For Action) */
/* 0x04 */ s8 field_0x4;
/* 0x08 */ f32 basic_size; // 基本大きさ - Basic Size
/* 0x0C */ f32 hook_hit_size; // フックヒット大きさ - Hook Hit Size
/* 0x10 */ f32 boots_struggle_sp; // ブーツ時もがきSP - Boots Struggle SP
};
#endif /* D_A_NPC_TKJ2_H */
include/d/actor/d_a_obj_eff.h
+1 -1
View File
@@ -32,7 +32,7 @@ public:
static void make_land_smoke(cXyz* i_pos, f32 i_scale) {
cXyz scale(i_scale, i_scale, i_scale);
scale *= 1.6666666f;
fopAcM_create(PROC_Obj_Eff, 3, i_pos, -1, NULL, &scale, -1);
fopAcM_create(fpcNm_Obj_Eff_e, 3, i_pos, -1, NULL, &scale, -1);
}
};
}; // namespace daObjEff
include/d/actor/d_a_obj_movebox.h
+30 -21
View File
@@ -24,9 +24,13 @@ namespace daObjMovebox {
enum Type_e { pp_field = 3 };
struct Attr_c {
struct sMinMax { // fabricated
s16 min;
s16 max;
struct sMinMax3 { // fabricated
s16 xMin;
s16 xMax;
s16 yMin;
s16 yMax;
s16 zMin;
s16 zMax;
};
/* 0x00 */ s16 mFirstPushStopTime;
/* 0x02 */ s16 mRepeatPushStopTime;
@@ -53,26 +57,24 @@ struct Attr_c {
/* 0x4C */ f32 mMaxTiltPower;
/* 0x50 */ f32 mTiltSpringFactor;
/* 0x54 */ f32 mTiltViscoscityResistance;
/* 0x58 */ int field_0x58;
/* 0x5C */ int field_0x5c;
/* 0x60 */ u32 field_0x60;
/* 0x64 */ f32 field_0x64;
/* 0x58 */ int mModelResIdx;
/* 0x5C */ int mMoveBGIdx;
/* 0x60 */ u32 mHeapSize;
/* 0x64 */ f32 mScaleY;
/* 0x68 */ f32 field_0x68;
/* 0x6C */ f32 field_0x6c;
/* 0x70 */ f32 field_0x70;
/* 0x74 */ f32 field_0x74;
/* 0x6C */ f32 mWaterBobScale; // always the reciprocal of field_0x68
/* 0x70 */ f32 mScaleXZ;
/* 0x74 */ f32 mTiltForceScale; // always the reciprocal of mScaleXZ
/* 0x78 */ f32 field_0x78;
/* 0x7C */ u32 field_0x7c;
/* 0x80 */ u32 field_0x80;
/* 0x84 */ u32 field_0x84;
/* 0x88 */ u32 field_0x88;
/* 0x8C */ int field_0x8c;
/* 0x90 */ sMinMax mCullX;
/* 0x94 */ sMinMax mCullY;
/* 0x98 */ sMinMax mCullZ;
/* 0x9C */ u8 field_0x9c;
/* 0x9D */ u8 field_0x9d;
/* 0x9E */ u8 field_0x9e;
/* 0x7C */ Z2SoundID mSoundSlip;
/* 0x80 */ Z2SoundID mSoundLimit;
/* 0x84 */ Z2SoundID mSoundLand;
/* 0x88 */ Z2SoundID mSoundFallWater;
/* 0x8C */ Z2SoundID mSoundFallMagma;
/* 0x90 */ sMinMax3 mCull;
/* 0x9C */ bool field_0x9c;
/* 0x9D */ bool mDisableShadow;
/* 0x9E */ bool mUseLargeGrid;
};
struct Hio_c : JORReflexible {
@@ -153,7 +155,13 @@ struct Act_c : public dBgS_MoveBgActor {
int prm_get_swSave1() const;
void prmZ_init();
void prmX_init();
// it seems like this signature changed between GCN and Wii?
// GCN only matches with a const reference return type and Wii/Shield only match with non-const
#if PLATFORM_GCN
const daObjMovebox::Attr_c& attr() const;
#else
daObjMovebox::Attr_c& attr() const;
#endif
void set_mtx();
void init_mtx();
void path_init();
@@ -176,6 +184,7 @@ struct Act_c : public dBgS_MoveBgActor {
void sound_land();
void vib_land();
void eff_land_smoke();
void eff_break();
virtual int CreateHeap();
virtual int Create();
include/d/actor/d_a_player.h
+10 -10
View File
@@ -687,8 +687,8 @@ public:
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; }
static BOOL checkShieldGet() { return dComIfGs_getSelectEquipShield() != dItemNo_NONE_e; }
static BOOL checkSwordGet() { return dComIfGs_getSelectEquipSword() != dItemNo_NONE_e; }
cXyz getHeadTopPos() const { return mHeadTopPos; }
u32 checkThrowDamage() const { return checkNoResetFlg1(FLG1_THROW_DAMAGE); }
@@ -1123,40 +1123,40 @@ public:
static int getLastSceneDamage() { return (dComIfGs_getLastSceneMode() >> 4) & 0x7F; }
static u32 getLastSceneSwordAtUpTime() { return (dComIfGs_getLastSceneMode() >> 11) & 0xFF; }
static BOOL checkNormalSwordEquip() { return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_SWORD; }
static BOOL checkNormalSwordEquip() { return dComIfGs_getSelectEquipSword() == dItemNo_SWORD_e; }
static u32 getLastSceneMode() {
return dComIfGs_getLastSceneMode() & 0xF;
}
static bool checkWoodSwordEquip() {
return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_WOOD_STICK;
return dComIfGs_getSelectEquipSword() == dItemNo_WOOD_STICK_e;
}
static bool checkLightMasterSwordEquip() {
return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_LIGHT_SWORD;
return dComIfGs_getSelectEquipSword() == dItemNo_LIGHT_SWORD_e;
}
static bool checkCasualWearFlg() {
return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_WEAR_CASUAL;
return dComIfGs_getSelectEquipClothes() == dItemNo_WEAR_CASUAL_e;
}
static u32 checkNowWolf() { return ((daPy_py_c*)dComIfGp_getLinkPlayer())->checkWolf(); }
static bool checkZoraWearFlg() {
return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_WEAR_ZORA;
return dComIfGs_getSelectEquipClothes() == dItemNo_WEAR_ZORA_e;
}
static bool checkMagicArmorWearFlg() {
return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_ARMOR;
return dComIfGs_getSelectEquipClothes() == dItemNo_ARMOR_e;
}
static bool checkCarvingWoodShieldEquip() {
return dComIfGs_getSelectEquipShield() == fpcNm_ITEM_WOOD_SHIELD;
return dComIfGs_getSelectEquipShield() == dItemNo_WOOD_SHIELD_e;
}
static bool checkShopWoodShieldEquip() {
return dComIfGs_getSelectEquipShield() == fpcNm_ITEM_SHIELD;
return dComIfGs_getSelectEquipShield() == dItemNo_SHIELD_e;
}
static BOOL checkPowerGloveGet() { return false; }
include/d/actor/d_a_tag_lantern.h
+1 -1
View File
@@ -45,7 +45,7 @@ public:
BOOL rt = false;
if (fopAcM_searchPlayerDistanceXZ(this) < scale.x && 0.0f <= var_f31 && var_f31 < scale.y) {
rt = dComIfGp_checkItemGet(fpcNm_ITEM_KANTERA, 1) && dComIfGs_getOil() != 0;
rt = dComIfGp_checkItemGet(dItemNo_KANTERA_e, 1) && dComIfGs_getOil() != 0;
field_0x5f8 = rt == true ? 0 : 1;
} else {
rt = true;
include/d/actor/d_a_tag_mhint.h
+1 -1
View File
@@ -21,7 +21,7 @@ public:
static void createPortalWarpMissTag(u16 param_0, fpc_ProcID i_parentID) {
csXyz sp18(-1, -1, param_0);
fopAcM_createChild(PROC_Tag_Mhint, i_parentID, 0x800FFFFF,
fopAcM_createChild(fpcNm_Tag_Mhint_e, i_parentID, 0x800FFFFF,
&daPy_getLinkPlayerActorClass()->current.pos, dComIfGp_roomControl_getStayNo(), &sp18, NULL, -1,
NULL);
}
include/d/actor/d_a_ykgr.h
+1 -1
View File
@@ -55,7 +55,7 @@ public:
int _create();
int _delete();
int _execute();
int _draw();
bool _draw();
static JPABaseEmitter* m_emitter;
static bool m_flag;
include/d/d_bomb.h
+13 -13
View File
@@ -39,63 +39,63 @@ public:
bool checkStateExplode() { return fopAcM_GetParam(this) == 0; }
static bool checkBombActor(fopAc_ac_c* i_actor) {
return fopAcM_GetName(i_actor) == PROC_NBOMB;
return fopAcM_GetName(i_actor) == fpcNm_NBOMB_e;
}
static fopAc_ac_c* createNormalBombPlayer(cXyz* i_pos) {
return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 8, i_pos, -1, NULL, NULL, -1, NULL, NULL);
return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 8, i_pos, -1, NULL, NULL, -1, NULL, NULL);
}
static fopAc_ac_c* createNormalBombExplode(cXyz* i_pos) {
return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 0, i_pos, -1, NULL, NULL, -1, NULL, NULL);
return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 0, i_pos, -1, NULL, NULL, -1, NULL, NULL);
}
static fopAc_ac_c* createWaterBombPlayer(cXyz* i_pos) {
return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 9, i_pos, -1, NULL, NULL, -1, NULL, NULL);
return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 9, i_pos, -1, NULL, NULL, -1, NULL, NULL);
}
static fopAc_ac_c* createFlowerBomb(cXyz* i_pos, csXyz* i_angle, int param_2) {
return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 4, i_pos, param_2, i_angle, NULL, -1,
return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 4, i_pos, param_2, i_angle, NULL, -1,
NULL, NULL);
}
static fopAc_ac_c* createInsectBombPlayer(cXyz* i_pos) {
return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 10, i_pos, -1, NULL, NULL, -1,
return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 10, i_pos, -1, NULL, NULL, -1,
NULL, NULL);
}
static fopAc_ac_c* createEnemyBombBoomerang(cXyz* i_pos, csXyz* i_angle, int i_roomNo) {
return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 12, i_pos, i_roomNo, i_angle, NULL, -1,
return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 12, i_pos, i_roomNo, i_angle, NULL, -1,
NULL, NULL);
}
static fopAc_ac_c* createWaterBombExplode(cXyz* i_pos) {
return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 18, i_pos, -1, NULL, NULL, -1, NULL,
return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 18, i_pos, -1, NULL, NULL, -1, NULL,
NULL);
}
static fopAc_ac_c* createEnemyWaterBomb(cXyz* i_pos, csXyz* i_angle, int i_roomNo) {
return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 14, i_pos, i_roomNo, i_angle, NULL, -1,
return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 14, i_pos, i_roomNo, i_angle, NULL, -1,
NULL, NULL);
}
static fopAc_ac_c* createEnemyWaterBombHookshot(cXyz* i_pos, csXyz* i_angle, int i_roomNo) {
return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 16, i_pos, i_roomNo, i_angle, NULL, -1,
return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 16, i_pos, i_roomNo, i_angle, NULL, -1,
NULL, NULL);
}
static fopAc_ac_c* createBombCargoCarry(cXyz* i_pos, csXyz* i_angle, int i_roomNo) {
return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 0x11, i_pos, i_roomNo, i_angle, NULL, -1,
return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 0x11, i_pos, i_roomNo, i_angle, NULL, -1,
NULL, NULL);
}
static fopAc_ac_c* createEnemyBombHookshot(cXyz* i_pos, csXyz* i_angle, int i_roomNo) {
return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 13, i_pos, i_roomNo, i_angle, NULL, -1,
return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 13, i_pos, i_roomNo, i_angle, NULL, -1,
NULL, NULL);
}
static fopAc_ac_c* createEnemyBomb(cXyz* i_pos, csXyz* i_angle, int i_roomNo) {
return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 0xB, i_pos, i_roomNo, i_angle, NULL, -1,
return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 0xB, i_pos, i_roomNo, i_angle, NULL, -1,
NULL, NULL);
}
};
include/d/d_com_inf_game.h
+1 -1
View File
@@ -4270,7 +4270,7 @@ inline void dComIfGp_clearItemBombNumCount(u8 i_no) {
}
inline s16 dComIfGp_getItemMaxBombNumCount() {
return g_dComIfG_gameInfo.play.getItemMaxBombNumCount(fpcNm_ITEM_NORMAL_BOMB);
return g_dComIfG_gameInfo.play.getItemMaxBombNumCount(dItemNo_NORMAL_BOMB_e);
}
inline void dComIfGp_setNowVibration(u8 status) {
include/d/d_item_data.h
+259
View File
@@ -91,4 +91,263 @@ struct dItem_data {
static dItem_itemInfo item_info[255];
};
enum {
/* 0x00 */ dItemNo_HEART_e,
/* 0x01 */ dItemNo_GREEN_RUPEE_e,
/* 0x02 */ dItemNo_BLUE_RUPEE_e,
/* 0x03 */ dItemNo_YELLOW_RUPEE_e,
/* 0x04 */ dItemNo_RED_RUPEE_e,
/* 0x05 */ dItemNo_PURPLE_RUPEE_e,
/* 0x06 */ dItemNo_ORANGE_RUPEE_e,
/* 0x07 */ dItemNo_SILVER_RUPEE_e,
/* 0x08 */ dItemNo_S_MAGIC_e,
/* 0x09 */ dItemNo_L_MAGIC_e,
/* 0x0A */ dItemNo_BOMB_5_e,
/* 0x0B */ dItemNo_BOMB_10_e,
/* 0x0C */ dItemNo_BOMB_20_e,
/* 0x0D */ dItemNo_BOMB_30_e,
/* 0x0E */ dItemNo_ARROW_10_e,
/* 0x0F */ dItemNo_ARROW_20_e,
/* 0x10 */ dItemNo_ARROW_30_e,
/* 0x11 */ dItemNo_ARROW_1_e,
/* 0x12 */ dItemNo_PACHINKO_SHOT_e,
/* 0x13 */ dItemNo_NOENTRY_19_e,
/* 0x14 */ dItemNo_NOENTRY_20_e,
/* 0x15 */ dItemNo_NOENTRY_21_e,
/* 0x16 */ dItemNo_WATER_BOMB_5_e,
/* 0x17 */ dItemNo_WATER_BOMB_10_e,
/* 0x18 */ dItemNo_WATER_BOMB_20_e,
/* 0x19 */ dItemNo_WATER_BOMB_30_e,
/* 0x1A */ dItemNo_BOMB_INSECT_5_e,
/* 0x1B */ dItemNo_BOMB_INSECT_10_e,
/* 0x1C */ dItemNo_BOMB_INSECT_20_e,
/* 0x1D */ dItemNo_BOMB_INSECT_30_e,
/* 0x1E */ dItemNo_RECOVERY_FAILY_e,
/* 0x1F */ dItemNo_TRIPLE_HEART_e,
/* 0x20 */ dItemNo_SMALL_KEY_e,
/* 0x21 */ dItemNo_KAKERA_HEART_e,
/* 0x22 */ dItemNo_UTAWA_HEART_e,
/* 0x23 */ dItemNo_MAP_e,
/* 0x24 */ dItemNo_COMPUS_e,
/* 0x25 */ dItemNo_DUNGEON_EXIT_e,
/* 0x26 */ dItemNo_BOSS_KEY_e,
/* 0x27 */ dItemNo_DUNGEON_BACK_e,
/* 0x28 */ dItemNo_SWORD_e,
/* 0x29 */ dItemNo_MASTER_SWORD_e,
/* 0x2A */ dItemNo_WOOD_SHIELD_e,
/* 0x2B */ dItemNo_SHIELD_e,
/* 0x2C */ dItemNo_HYLIA_SHIELD_e,
/* 0x2D */ dItemNo_TKS_LETTER_e,
/* 0x2E */ dItemNo_WEAR_CASUAL_e,
/* 0x2F */ dItemNo_WEAR_KOKIRI_e,
/* 0x30 */ dItemNo_ARMOR_e,
/* 0x31 */ dItemNo_WEAR_ZORA_e,
/* 0x32 */ dItemNo_MAGIC_LV1_e,
/* 0x33 */ dItemNo_DUNGEON_EXIT_2_e,
/* 0x34 */ dItemNo_WALLET_LV1_e,
/* 0x35 */ dItemNo_WALLET_LV2_e,
/* 0x36 */ dItemNo_WALLET_LV3_e,
/* 0x37 */ dItemNo_NOENTRY_55_e,
/* 0x38 */ dItemNo_NOENTRY_56_e,
/* 0x39 */ dItemNo_NOENTRY_57_e,
/* 0x3A */ dItemNo_NOENTRY_58_e,
/* 0x3B */ dItemNo_NOENTRY_59_e,
/* 0x3C */ dItemNo_NOENTRY_60_e,
/* 0x3D */ dItemNo_ZORAS_JEWEL_e,
/* 0x3E */ dItemNo_HAWK_EYE_e,
/* 0x3F */ dItemNo_WOOD_STICK_e,
/* 0x40 */ dItemNo_BOOMERANG_e,
/* 0x41 */ dItemNo_SPINNER_e,
/* 0x42 */ dItemNo_IRONBALL_e,
/* 0x43 */ dItemNo_BOW_e,
/* 0x44 */ dItemNo_HOOKSHOT_e,
/* 0x45 */ dItemNo_HVY_BOOTS_e,
/* 0x46 */ dItemNo_COPY_ROD_e,
/* 0x47 */ dItemNo_W_HOOKSHOT_e,
/* 0x48 */ dItemNo_KANTERA_e,
/* 0x49 */ dItemNo_LIGHT_SWORD_e,
/* 0x4A */ dItemNo_FISHING_ROD_1_e,
/* 0x4B */ dItemNo_PACHINKO_e,
/* 0x4C */ dItemNo_COPY_ROD_2_e,
/* 0x4D */ dItemNo_NOENTRY_77_e,
/* 0x4E */ dItemNo_NOENTRY_78_e,
/* 0x4F */ dItemNo_BOMB_BAG_LV2_e,
/* 0x50 */ dItemNo_BOMB_BAG_LV1_e,
/* 0x51 */ dItemNo_BOMB_IN_BAG_e,
/* 0x52 */ dItemNo_NOENTRY_82_e,
/* 0x53 */ dItemNo_LIGHT_ARROW_e,
/* 0x54 */ dItemNo_ARROW_LV1_e,
/* 0x55 */ dItemNo_ARROW_LV2_e,
/* 0x56 */ dItemNo_ARROW_LV3_e,
/* 0x57 */ dItemNo_NOENTRY_87_e,
/* 0x58 */ dItemNo_LURE_ROD_e,
/* 0x59 */ dItemNo_BOMB_ARROW_e,
/* 0x5A */ dItemNo_HAWK_ARROW_e,
/* 0x5B */ dItemNo_BEE_ROD_e,
/* 0x5C */ dItemNo_JEWEL_ROD_e,
/* 0x5D */ dItemNo_WORM_ROD_e,
/* 0x5E */ dItemNo_JEWEL_BEE_ROD_e,
/* 0x5F */ dItemNo_JEWEL_WORM_ROD_e,
/* 0x60 */ dItemNo_EMPTY_BOTTLE_e,
/* 0x61 */ dItemNo_RED_BOTTLE_e,
/* 0x62 */ dItemNo_GREEN_BOTTLE_e,
/* 0x63 */ dItemNo_BLUE_BOTTLE_e,
/* 0x64 */ dItemNo_MILK_BOTTLE_e,
/* 0x65 */ dItemNo_HALF_MILK_BOTTLE_e,
/* 0x66 */ dItemNo_OIL_BOTTLE_e,
/* 0x67 */ dItemNo_WATER_BOTTLE_e,
/* 0x68 */ dItemNo_OIL_BOTTLE_2_e,
/* 0x69 */ dItemNo_RED_BOTTLE_2_e,
/* 0x6A */ dItemNo_UGLY_SOUP_e,
/* 0x6B */ dItemNo_HOT_SPRING_e,
/* 0x6C */ dItemNo_FAIRY_e,
/* 0x6D */ dItemNo_HOT_SPRING_2_e,
/* 0x6E */ dItemNo_OIL2_e,
/* 0x6F */ dItemNo_OIL_e,
/* 0x70 */ dItemNo_NORMAL_BOMB_e,
/* 0x71 */ dItemNo_WATER_BOMB_e,
/* 0x72 */ dItemNo_POKE_BOMB_e,
/* 0x73 */ dItemNo_FAIRY_DROP_e,
/* 0x74 */ dItemNo_WORM_e,
/* 0x75 */ dItemNo_DROP_BOTTLE_e,
/* 0x76 */ dItemNo_BEE_CHILD_e,
/* 0x77 */ dItemNo_CHUCHU_RARE_e,
/* 0x78 */ dItemNo_CHUCHU_RED_e,
/* 0x79 */ dItemNo_CHUCHU_BLUE_e,
/* 0x7A */ dItemNo_CHUCHU_GREEN_e,
/* 0x7B */ dItemNo_CHUCHU_YELLOW_e,
/* 0x7C */ dItemNo_CHUCHU_PURPLE_e,
/* 0x7D */ dItemNo_LV1_SOUP_e,
/* 0x7E */ dItemNo_LV2_SOUP_e,
/* 0x7F */ dItemNo_LV3_SOUP_e,
/* 0x80 */ dItemNo_LETTER_e,
/* 0x81 */ dItemNo_BILL_e,
/* 0x82 */ dItemNo_WOOD_STATUE_e,
/* 0x83 */ dItemNo_IRIAS_PENDANT_e,
/* 0x84 */ dItemNo_HORSE_FLUTE_e,
/* 0x85 */ dItemNo_NOENTRY_133_e,
/* 0x86 */ dItemNo_NOENTRY_134_e,
/* 0x87 */ dItemNo_NOENTRY_135_e,
/* 0x88 */ dItemNo_NOENTRY_136_e,
/* 0x89 */ dItemNo_NOENTRY_137_e,
/* 0x8A */ dItemNo_NOENTRY_138_e,
/* 0x8B */ dItemNo_NOENTRY_139_e,
/* 0x8C */ dItemNo_NOENTRY_140_e,
/* 0x8D */ dItemNo_NOENTRY_141_e,
/* 0x8E */ dItemNo_NOENTRY_142_e,
/* 0x8F */ dItemNo_NOENTRY_143_e,
/* 0x90 */ dItemNo_RAFRELS_MEMO_e,
/* 0x91 */ dItemNo_ASHS_SCRIBBLING_e,
/* 0x92 */ dItemNo_NOENTRY_146_e,
/* 0x93 */ dItemNo_NOENTRY_147_e,
/* 0x94 */ dItemNo_NOENTRY_148_e,
/* 0x95 */ dItemNo_NOENTRY_149_e,
/* 0x96 */ dItemNo_NOENTRY_150_e,
/* 0x97 */ dItemNo_NOENTRY_151_e,
/* 0x98 */ dItemNo_NOENTRY_152_e,
/* 0x99 */ dItemNo_NOENTRY_153_e,
/* 0x9A */ dItemNo_NOENTRY_154_e,
/* 0x9B */ dItemNo_NOENTRY_155_e,
/* 0x9C */ dItemNo_CHUCHU_YELLOW2_e,
/* 0x9D */ dItemNo_OIL_BOTTLE3_e,
/* 0x9E */ dItemNo_SHOP_BEE_CHILD_e,
/* 0x9F */ dItemNo_CHUCHU_BLACK_e,
/* 0xA0 */ dItemNo_LIGHT_DROP_e,
/* 0xA1 */ dItemNo_DROP_CONTAINER_e,
/* 0xA2 */ dItemNo_DROP_CONTAINER02_e,
/* 0xA3 */ dItemNo_DROP_CONTAINER03_e,
/* 0xA4 */ dItemNo_FILLED_CONTAINER_e,
/* 0xA5 */ dItemNo_MIRROR_PIECE_2_e,
/* 0xA6 */ dItemNo_MIRROR_PIECE_3_e,
/* 0xA7 */ dItemNo_MIRROR_PIECE_4_e,
/* 0xA8 */ dItemNo_NOENTRY_168_e,
/* 0xA9 */ dItemNo_NOENTRY_169_e,
/* 0xAA */ dItemNo_NOENTRY_170_e,
/* 0xAB */ dItemNo_NOENTRY_171_e,
/* 0xAC */ dItemNo_NOENTRY_172_e,
/* 0xAD */ dItemNo_NOENTRY_173_e,
/* 0xAE */ dItemNo_NOENTRY_174_e,
/* 0xAF */ dItemNo_NOENTRY_175_e,
/* 0xB0 */ dItemNo_SMELL_YELIA_POUCH_e,
/* 0xB1 */ dItemNo_SMELL_PUMPKIN_e,
/* 0xB2 */ dItemNo_SMELL_POH_e,
/* 0xB3 */ dItemNo_SMELL_FISH_e,
/* 0xB4 */ dItemNo_SMELL_CHILDREN_e,
/* 0xB5 */ dItemNo_SMELL_MEDICINE_e,
/* 0xB6 */ dItemNo_NOENTRY_182_e,
/* 0xB7 */ dItemNo_NOENTRY_183_e,
/* 0xB8 */ dItemNo_NOENTRY_184_e,
/* 0xB9 */ dItemNo_NOENTRY_185_e,
/* 0xBA */ dItemNo_NOENTRY_186_e,
/* 0xBB */ dItemNo_NOENTRY_187_e,
/* 0xBC */ dItemNo_NOENTRY_188_e,
/* 0xBD */ dItemNo_NOENTRY_189_e,
/* 0xBE */ dItemNo_NOENTRY_190_e,
/* 0xBF */ dItemNo_NOENTRY_191_e,
/* 0xC0 */ dItemNo_M_BEETLE_e,
/* 0xC1 */ dItemNo_F_BEETLE_e,
/* 0xC2 */ dItemNo_M_BUTTERFLY_e,
/* 0xC3 */ dItemNo_F_BUTTERFLY_e,
/* 0xC4 */ dItemNo_M_STAG_BEETLE_e,
/* 0xC5 */ dItemNo_F_STAG_BEETLE_e,
/* 0xC6 */ dItemNo_M_GRASSHOPPER_e,
/* 0xC7 */ dItemNo_F_GRASSHOPPER_e,
/* 0xC8 */ dItemNo_M_NANAFUSHI_e,
/* 0xC9 */ dItemNo_F_NANAFUSHI_e,
/* 0xCA */ dItemNo_M_DANGOMUSHI_e,
/* 0xCB */ dItemNo_F_DANGOMUSHI_e,
/* 0xCC */ dItemNo_M_MANTIS_e,
/* 0xCD */ dItemNo_F_MANTIS_e,
/* 0xCE */ dItemNo_M_LADYBUG_e,
/* 0xCF */ dItemNo_F_LADYBUG_e,
/* 0xD0 */ dItemNo_M_SNAIL_e,
/* 0xD1 */ dItemNo_F_SNAIL_e,
/* 0xD2 */ dItemNo_M_DRAGONFLY_e,
/* 0xD3 */ dItemNo_F_DRAGONFLY_e,
/* 0xD4 */ dItemNo_M_ANT_e,
/* 0xD5 */ dItemNo_F_ANT_e,
/* 0xD6 */ dItemNo_M_MAYFLY_e,
/* 0xD7 */ dItemNo_F_MAYFLY_e,
/* 0xD8 */ dItemNo_NOENTRY_216_e,
/* 0xD9 */ dItemNo_NOENTRY_217_e,
/* 0xDA */ dItemNo_NOENTRY_218_e,
/* 0xDB */ dItemNo_NOENTRY_219_e,
/* 0xDC */ dItemNo_NOENTRY_220_e,
/* 0xDD */ dItemNo_NOENTRY_221_e,
/* 0xDE */ dItemNo_NOENTRY_222_e,
/* 0xDF */ dItemNo_NOENTRY_223_e,
/* 0xE0 */ dItemNo_POU_SPIRIT_e,
/* 0xE1 */ dItemNo_NOENTRY_225_e,
/* 0xE2 */ dItemNo_NOENTRY_226_e,
/* 0xE3 */ dItemNo_NOENTRY_227_e,
/* 0xE4 */ dItemNo_NOENTRY_228_e,
/* 0xE5 */ dItemNo_NOENTRY_229_e,
/* 0xE6 */ dItemNo_NOENTRY_230_e,
/* 0xE7 */ dItemNo_NOENTRY_231_e,
/* 0xE8 */ dItemNo_NOENTRY_232_e,
/* 0xE9 */ dItemNo_ANCIENT_DOCUMENT_e,
/* 0xEA */ dItemNo_AIR_LETTER_e,
/* 0xEB */ dItemNo_ANCIENT_DOCUMENT2_e,
/* 0xEC */ dItemNo_LV7_DUNGEON_EXIT_e,
/* 0xED */ dItemNo_LINKS_SAVINGS_e,
/* 0xEE */ dItemNo_SMALL_KEY2_e,
/* 0xEF */ dItemNo_POU_FIRE1_e,
/* 0xF0 */ dItemNo_POU_FIRE2_e,
/* 0xF1 */ dItemNo_POU_FIRE3_e,
/* 0xF2 */ dItemNo_POU_FIRE4_e,
/* 0xF3 */ dItemNo_BOSSRIDER_KEY_e,
/* 0xF4 */ dItemNo_TOMATO_PUREE_e,
/* 0xF5 */ dItemNo_TASTE_e,
/* 0xF6 */ dItemNo_LV5_BOSS_KEY_e,
/* 0xF7 */ dItemNo_SURFBOARD_e,
/* 0xF8 */ dItemNo_KANTERA2_e,
/* 0xF9 */ dItemNo_L2_KEY_PIECES1_e,
/* 0xFA */ dItemNo_L2_KEY_PIECES2_e,
/* 0xFB */ dItemNo_L2_KEY_PIECES3_e,
/* 0xFC */ dItemNo_KEY_OF_CARAVAN_e,
/* 0xFD */ dItemNo_LV2_BOSS_KEY_e,
/* 0xFE */ dItemNo_KEY_OF_FILONE_e,
/* 0xFF */ dItemNo_NONE_e,
};
#endif /* D_D_ITEM_DATA_H */
include/d/d_k_wmark.h
+1 -1
View File
@@ -16,7 +16,7 @@ public:
static int m_nowID;
static void setFootMark(cXyz* i_pos, s16 param_1, int param_2) {
fopKyM_create(PROC_WMARK, param_2 | (param_1 << 0x10), i_pos, NULL, NULL);
fopKyM_create(fpcNm_WMARK_e, param_2 | (param_1 << 0x10), i_pos, NULL, NULL);
}
/* 0x0F8 */ JKRSolidHeap* mpHeap;
include/d/d_procname.h
-841
View File
@@ -1,841 +0,0 @@
#ifndef D_PROCNAME_H
#define D_PROCNAME_H
#include "global.h"
#if VERSION != VERSION_WII_USA_R0 && VERSION != VERSION_WII_PAL
#define PROCS_NOT_WII \
/* 0x00F */ X(PROC_WARNING_SCENE) \
/* 0x010 */ X(PROC_WARNING2_SCENE)
#else
#define PROCS_NOT_WII
#endif
#define ALL_PROCS \
/* 0x000 */ X(PROC_OVERLAP0) \
/* 0x001 */ X(PROC_OVERLAP1) \
/* 0x002 */ X(PROC_OVERLAP3) \
/* 0x003 */ X(PROC_OVERLAP6) \
/* 0x004 */ X(PROC_OVERLAP7) \
/* 0x005 */ X(PROC_OVERLAP8) \
/* 0x006 */ X(PROC_OVERLAP9) \
/* 0x007 */ X(PROC_OVERLAP10) \
/* 0x008 */ X(PROC_OVERLAP11) \
/* 0x009 */ X(PROC_LOGO_SCENE) \
/* 0x00A */ X(PROC_MENU_SCENE) \
/* 0x00B */ X(PROC_PLAY_SCENE) \
/* 0x00C */ X(PROC_OPENING_SCENE) \
/* 0x00D */ X(PROC_NAME_SCENE) \
/* 0x00E */ X(PROC_NAMEEX_SCENE) \
PROCS_NOT_WII \
/* 0x011 */ X(PROC_OVERLAP2) \
/* 0x012 */ X(PROC_ROOM_SCENE) \
/* 0x013 */ X(PROC_KANKYO) \
/* 0x014 */ X(PROC_ALLDIE) \
/* 0x015 */ X(PROC_ENVSE) \
/* 0x016 */ X(PROC_Obj_Swpush) \
/* 0x017 */ X(PROC_Obj_Swpush2) \
/* 0x018 */ X(PROC_Obj_Swpush5) \
/* 0x019 */ X(PROC_Tag_Gstart) \
/* 0x01A */ X(PROC_NO_CHG_ROOM) \
/* 0x01B */ X(PROC_Obj_Lv6ElevtA) \
/* 0x01C */ X(PROC_OBJ_SO) \
/* 0x01D */ X(PROC_Obj_Movebox) \
/* 0x01E */ X(PROC_Obj_SwTurn) \
/* 0x01F */ X(PROC_Obj_Lv6SwTurn) \
/* 0x020 */ X(PROC_OBJ_SEKIZOA) \
/* 0x021 */ X(PROC_OBJ_GRA) \
/* 0x022 */ X(PROC_TAG_GRA) \
/* 0x023 */ X(PROC_TAG_YAMI) \
/* 0x024 */ X(PROC_Obj_Ladder) \
/* 0x025 */ X(PROC_OBJ_BEF) \
/* 0x026 */ X(PROC_OBJ_FMOBJ) \
/* 0x027 */ X(PROC_OBJ_LBOX) \
/* 0x028 */ X(PROC_OBJ_WEB0) \
/* 0x029 */ X(PROC_OBJ_WEB1) \
/* 0x02A */ X(PROC_OBJ_CB) \
/* 0x02B */ X(PROC_OBJ_MAKI) \
/* 0x02C */ X(PROC_OBJ_BRG) \
/* 0x02D */ X(PROC_OBJ_GB) \
/* 0x02E */ X(PROC_OBJ_GM) \
/* 0x02F */ X(PROC_OBJ_TOBY) \
/* 0x030 */ X(PROC_OBJ_TP) \
/* 0x031 */ X(PROC_TREESH) \
/* 0x032 */ X(PROC_Obj_ZDoor) \
/* 0x033 */ X(PROC_Obj_Pillar) \
/* 0x034 */ X(PROC_Obj_Cdoor) \
/* 0x035 */ X(PROC_GRDWATER) \
/* 0x036 */ X(PROC_Obj_RotBridge) \
/* 0x037 */ X(PROC_Obj_MagLift) \
/* 0x038 */ X(PROC_Obj_MagLiftRot) \
/* 0x039 */ X(PROC_Obj_Lv1Cdl00) \
/* 0x03A */ X(PROC_Obj_Lv1Cdl01) \
/* 0x03B */ X(PROC_Obj_TvCdlst) \
/* 0x03C */ X(PROC_Obj_HsTarget) \
/* 0x03D */ X(PROC_Obj_HeavySw) \
/* 0x03E */ X(PROC_Obj_GoGate) \
/* 0x03F */ X(PROC_Obj_TaFence) \
/* 0x040 */ X(PROC_Obj_Saidan) \
/* 0x041 */ X(PROC_Obj_SpinLift) \
/* 0x042 */ X(PROC_Obj_BmWindow) \
/* 0x043 */ X(PROC_Obj_RfHole) \
/* 0x044 */ X(PROC_Obj_WaterPillar) \
/* 0x045 */ X(PROC_Obj_SyRock) \
/* 0x046 */ X(PROC_Obj_BsGate) \
/* 0x047 */ X(PROC_Obj_AmiShutter) \
/* 0x048 */ X(PROC_Obj_WtGate) \
/* 0x049 */ X(PROC_Obj_Lv2Candle) \
/* 0x04A */ X(PROC_Obj_TogeTrap) \
/* 0x04B */ X(PROC_Obj_RotTrap) \
/* 0x04C */ X(PROC_Obj_SwallShutter) \
/* 0x04D */ X(PROC_Obj_IceWall) \
/* 0x04E */ X(PROC_Obj_Lv5SwIce) \
/* 0x04F */ X(PROC_Obj_Lv5FBoard) \
/* 0x050 */ X(PROC_Obj_Turara) \
/* 0x051 */ X(PROC_Obj_TwGate) \
/* 0x052 */ X(PROC_Obj_Digholl) \
/* 0x053 */ X(PROC_Obj_Digpl) \
/* 0x054 */ X(PROC_Obj_TestCube) \
/* 0x055 */ X(PROC_Obj_Kshutter) \
/* 0x056 */ X(PROC_NPC_COACH) \
/* 0x057 */ X(PROC_NPC_THEB) \
/* 0x058 */ X(PROC_COACH_FIRE) \
/* 0x059 */ X(PROC_COACH2D) \
/* 0x05A */ X(PROC_BALLOON2D) \
/* 0x05B */ X(PROC_SKIP2D) \
/* 0x05C */ X(PROC_Obj_MvStair) \
/* 0x05D */ X(PROC_Obj_Cowdoor) \
/* 0x05E */ X(PROC_Obj_Swpropeller) \
/* 0x05F */ X(PROC_Obj_BoomShutter) \
/* 0x060 */ X(PROC_NPC_KS) \
/* 0x061 */ X(PROC_Obj_Hfuta) \
/* 0x062 */ X(PROC_Obj_BkDoor) \
/* 0x063 */ X(PROC_Obj_Cboard) \
/* 0x064 */ X(PROC_Obj_MGate) \
/* 0x065 */ X(PROC_Obj_Ikada) \
/* 0x066 */ X(PROC_Obj_Ice_l) \
/* 0x067 */ X(PROC_Obj_Ice_s) \
/* 0x068 */ X(PROC_Obj_E_CREATE) \
/* 0x069 */ X(PROC_Obj_Bhbridge) \
/* 0x06A */ X(PROC_Obj_Kaisou) \
/* 0x06B */ X(PROC_Obj_HHASHI) \
/* 0x06C */ X(PROC_Obj_BHASHI) \
/* 0x06D */ X(PROC_OCTHASHI) \
/* 0x06E */ X(PROC_Obj_THASHI) \
/* 0x06F */ X(PROC_Obj_CRVGATE) \
/* 0x070 */ X(PROC_Obj_CRVFENCE) \
/* 0x071 */ X(PROC_Obj_CRVHAHEN) \
/* 0x072 */ X(PROC_Obj_CRVSTEEL) \
/* 0x073 */ X(PROC_Obj_CRVLH_UP) \
/* 0x074 */ X(PROC_Obj_CRVLH_DW) \
/* 0x075 */ X(PROC_Obj_RIVERROCK) \
/* 0x076 */ X(PROC_Obj_DUST) \
/* 0x077 */ X(PROC_Obj_ITA) \
/* 0x078 */ X(PROC_Obj_Window) \
/* 0x079 */ X(PROC_Obj_MetalBox) \
/* 0x07A */ X(PROC_Obj_BBox) \
/* 0x07B */ X(PROC_OBJ_MSIMA) \
/* 0x07C */ X(PROC_OBJ_MYOGAN) \
/* 0x07D */ X(PROC_B_ZANTS) \
/* 0x07E */ X(PROC_Obj_ChainBlock) \
/* 0x07F */ X(PROC_Obj_ChainWall) \
/* 0x080 */ X(PROC_Obj_KkrGate) \
/* 0x081 */ X(PROC_Obj_RiderGate) \
/* 0x082 */ X(PROC_Obj_Onsen) \
/* 0x083 */ X(PROC_Obj_Chest) \
/* 0x084 */ X(PROC_Obj_Bemos) \
/* 0x085 */ X(PROC_Obj_RopeBridge) \
/* 0x086 */ X(PROC_Obj_WellCover) \
/* 0x087 */ X(PROC_Obj_GraveStone) \
/* 0x088 */ X(PROC_Obj_ZraRock) \
/* 0x089 */ X(PROC_Obj_GraRock) \
/* 0x08A */ X(PROC_Obj_GrzRock) \
/* 0x08B */ X(PROC_GRA_WALL) \
/* 0x08C */ X(PROC_OBJ_ONSEN_FIRE) \
/* 0x08D */ X(PROC_Obj_Lv6bemos) \
/* 0x08E */ X(PROC_Obj_Lv6bemos2) \
/* 0x08F */ X(PROC_Obj_BarDesk) \
/* 0x090 */ X(PROC_Obj_DigSnow) \
/* 0x091 */ X(PROC_Obj_Ytaihou) \
/* 0x092 */ X(PROC_Obj_Elevator) \
/* 0x093 */ X(PROC_Obj_Lv6TogeRoll) \
/* 0x094 */ X(PROC_Obj_Lv6TogeTrap) \
/* 0x095 */ X(PROC_Obj_Lv6Tenbin) \
/* 0x096 */ X(PROC_Obj_Lv6SwGate) \
/* 0x097 */ X(PROC_Obj_Lv6Lblock) \
/* 0x098 */ X(PROC_Obj_Lv6ChgGate) \
/* 0x099 */ X(PROC_Obj_Lv6FuriTrap) \
/* 0x09A */ X(PROC_Obj_Lv6SzGate) \
/* 0x09B */ X(PROC_Obj_Lv4EdShutter) \
/* 0x09C */ X(PROC_Obj_Lv4Gate) \
/* 0x09D */ X(PROC_Obj_Lv4PoGate) \
/* 0x09E */ X(PROC_Obj_Lv4SlideWall) \
/* 0x09F */ X(PROC_Obj_Lv4HsTarget) \
/* 0x0A0 */ X(PROC_Obj_Lv7PropY) \
/* 0x0A1 */ X(PROC_Obj_Lv7BsGate) \
/* 0x0A2 */ X(PROC_Obj_Lv8OptiLift) \
/* 0x0A3 */ X(PROC_Obj_Lv8KekkaiTrap) \
/* 0x0A4 */ X(PROC_Obj_Lv8Lift) \
/* 0x0A5 */ X(PROC_Obj_Lv8UdFloor) \
/* 0x0A6 */ X(PROC_Obj_Lv9SwShutter) \
/* 0x0A7 */ X(PROC_Obj_TobyHouse) \
/* 0x0A8 */ X(PROC_Obj_poCandle) \
/* 0x0A9 */ X(PROC_Obj_Lv4DigSand) \
/* 0x0AA */ X(PROC_Obj_FallObj) \
/* 0x0AB */ X(PROC_Obj_SmgDoor) \
/* 0x0AC */ X(PROC_Obj_SwLight) \
/* 0x0AD */ X(PROC_Obj_Avalanche) \
/* 0x0AE */ X(PROC_Obj_MirrorScrew) \
/* 0x0AF */ X(PROC_Obj_MirrorSand) \
/* 0x0B0 */ X(PROC_Obj_MirrorTable) \
/* 0x0B1 */ X(PROC_Obj_MirrorChain) \
/* 0x0B2 */ X(PROC_Obj_Mirror6Pole) \
/* 0x0B3 */ X(PROC_Obj_SwSpinner) \
/* 0x0B4 */ X(PROC_Obj_TDoor) \
/* 0x0B5 */ X(PROC_Obj_Lv7Bridge) \
/* 0x0B6 */ X(PROC_Obj_zrTurara) \
/* 0x0B7 */ X(PROC_Obj_TakaraDai) \
/* 0x0B8 */ X(PROC_Obj_Table) \
/* 0x0B9 */ X(PROC_Obj_CatDoor) \
/* 0x0BA */ X(PROC_Obj_Gake) \
/* 0x0BB */ X(PROC_CSTAF) \
/* 0x0BC */ X(PROC_Obj_Lv4RailWall) \
/* 0x0BD */ X(PROC_Obj_Lv4Sand) \
/* 0x0BE */ X(PROC_Obj_PushDoor) \
/* 0x0BF */ X(PROC_PushDoor) \
/* 0x0C0 */ X(PROC_Obj_GanonWall2) \
/* 0x0C1 */ X(PROC_Obj_Lv4Bridge) \
/* 0x0C2 */ X(PROC_Obj_Lv4Floor) \
/* 0x0C3 */ X(PROC_Tag_Spinner) \
/* 0x0C4 */ X(PROC_Obj_SwHang) \
/* 0x0C5 */ X(PROC_Obj_RotStair) \
/* 0x0C6 */ X(PROC_Obj_MagneArm) \
/* 0x0C7 */ X(PROC_Obj_KWheel00) \
/* 0x0C8 */ X(PROC_Obj_KWheel01) \
/* 0x0C9 */ X(PROC_Obj_Ychndlr) \
/* 0x0CA */ X(PROC_Obj_PRElvtr) \
/* 0x0CB */ X(PROC_Obj_MHasu) \
/* 0x0CC */ X(PROC_Obj_YIblltray) \
/* 0x0CD */ X(PROC_Obj_Lv6EGate) \
/* 0x0CE */ X(PROC_Obj_PDtile) \
/* 0x0CF */ X(PROC_Obj_PDwall) \
/* 0x0D0 */ X(PROC_Obj_Lv4PRwall) \
/* 0x0D1 */ X(PROC_Obj_KLift00) \
/* 0x0D2 */ X(PROC_B_OH) \
/* 0x0D3 */ X(PROC_Obj_Lv4Chan) \
/* 0x0D4 */ X(PROC_Obj_Lv3R10Saka) \
/* 0x0D5 */ X(PROC_Obj_Lv3Water) \
/* 0x0D6 */ X(PROC_Obj_Lv3Water2) \
/* 0x0D7 */ X(PROC_OBJ_LV3WATERB) \
/* 0x0D8 */ X(PROC_Obj_HBombkoya) \
/* 0x0D9 */ X(PROC_Obj_SZbridge) \
/* 0x0DA */ X(PROC_Obj_KakarikoBrg) \
/* 0x0DB */ X(PROC_Obj_OrdinBrg) \
/* 0x0DC */ X(PROC_Obj_BurnBox) \
/* 0x0DD */ X(PROC_Obj_KJgjs) \
/* 0x0DE */ X(PROC_OBJ_IHASI) \
/* 0x0DF */ X(PROC_Obj_IceBlock) \
/* 0x0E0 */ X(PROC_Obj_VolcanicBall) \
/* 0x0E1 */ X(PROC_Obj_VolcanicBomb) \
/* 0x0E2 */ X(PROC_Obj_VolcGnd) \
/* 0x0E3 */ X(PROC_Obj_KKanban) \
/* 0x0E4 */ X(PROC_E_PH) \
/* 0x0E5 */ X(PROC_NPC_ZRA) \
/* 0x0E6 */ X(PROC_Obj_Chandelier) \
/* 0x0E7 */ X(PROC_Obj_Stopper2) \
/* 0x0E8 */ X(PROC_DOOR20) \
/* 0x0E9 */ X(PROC_Tag_Hinit) \
/* 0x0EA */ X(PROC_Tag_Hjump) \
/* 0x0EB */ X(PROC_Tag_AJnot) \
/* 0x0EC */ X(PROC_Tag_Hstop) \
/* 0x0ED */ X(PROC_CANOE) \
/* 0x0EE */ X(PROC_HORSE) \
/* 0x0EF */ X(PROC_E_WB) \
/* 0x0F0 */ X(PROC_OBJ_ITO) \
/* 0x0F1 */ X(PROC_OBJ_SW) \
/* 0x0F2 */ X(PROC_SPINNER) \
/* 0x0F3 */ X(PROC_B_OB) \
/* 0x0F4 */ X(PROC_KAGO) \
/* 0x0F5 */ X(PROC_E_YC) \
/* 0x0F6 */ X(PROC_B_DS) \
/* 0x0F7 */ X(PROC_B_DR) \
/* 0x0F8 */ X(PROC_B_ZANTZ) \
/* 0x0F9 */ X(PROC_B_ZANT) \
/* 0x0FA */ X(PROC_B_ZANTM) \
/* 0x0FB */ X(PROC_TBOX) \
/* 0x0FC */ X(PROC_TBOX2) \
/* 0x0FD */ X(PROC_ALINK) \
/* 0x0FE */ X(PROC_BOOMERANG) \
/* 0x0FF */ X(PROC_MIDNA) \
/* 0x100 */ X(PROC_NPC_TK) \
/* 0x101 */ X(PROC_NPC_WORM) \
/* 0x102 */ X(PROC_PPolamp) \
/* 0x103 */ X(PROC_BkyRock) \
/* 0x104 */ X(PROC_HITOBJ) \
/* 0x105 */ X(PROC_EP) \
/* 0x106 */ X(PROC_COW) \
/* 0x107 */ X(PROC_PERU) \
/* 0x108 */ X(PROC_NI) \
/* 0x109 */ X(PROC_NPC_TKJ2) \
/* 0x10A */ X(PROC_SQ) \
/* 0x10B */ X(PROC_NPC_SQ) \
/* 0x10C */ X(PROC_DO) \
/* 0x10D */ X(PROC_NPC_NE) \
/* 0x10E */ X(PROC_NPC_TR) \
/* 0x10F */ X(PROC_NPC_LF) \
/* 0x110 */ X(PROC_OBJ_FOOD) \
/* 0x111 */ X(PROC_OBJ_KI) \
/* 0x112 */ X(PROC_OBJ_KITA) \
/* 0x113 */ X(PROC_OBJ_KEY) \
/* 0x114 */ X(PROC_OBJ_KEYHOLE) \
/* 0x115 */ X(PROC_Obj_Lv5Key) \
/* 0x116 */ X(PROC_OBJ_LP) \
/* 0x117 */ X(PROC_OBJ_TATIGI) \
/* 0x118 */ X(PROC_OBJ_ROCK) \
/* 0x119 */ X(PROC_OBJ_WFLAG) \
/* 0x11A */ X(PROC_OBJ_KAGE) \
/* 0x11B */ X(PROC_OBJ_KANBAN2) \
/* 0x11C */ X(PROC_OBJ_BALLOON) \
/* 0x11D */ X(PROC_OBJ_SUISYA) \
/* 0x11E */ X(PROC_OBJ_OILTUBO) \
/* 0x11F */ X(PROC_OBJ_ROTEN) \
/* 0x120 */ X(PROC_OBJ_SSDRINK) \
/* 0x121 */ X(PROC_OBJ_SSITEM) \
/* 0x122 */ X(PROC_TAG_SSDRINK) \
/* 0x123 */ X(PROC_TAG_BTLITM) \
/* 0x124 */ X(PROC_TAG_LV5SOUP) \
/* 0x125 */ X(PROC_TAG_MNLIGHT) \
/* 0x126 */ X(PROC_TAG_SHOPCAM) \
/* 0x127 */ X(PROC_TAG_SHOPITM) \
/* 0x128 */ X(PROC_OBJ_NDOOR) \
/* 0x129 */ X(PROC_OBJ_UDOOR) \
/* 0x12A */ X(PROC_OBJ_USAKU) \
/* 0x12B */ X(PROC_Obj_SM_DOOR) \
/* 0x12C */ X(PROC_OBJ_BED) \
/* 0x12D */ X(PROC_OBJ_BOUMATO) \
/* 0x12E */ X(PROC_OBJ_ITAMATO) \
/* 0x12F */ X(PROC_OBJ_NOUGU) \
/* 0x130 */ X(PROC_OBJ_STICK) \
/* 0x131 */ X(PROC_OBJ_MIE) \
/* 0x132 */ X(PROC_OBJ_SEKIDOOR) \
/* 0x133 */ X(PROC_OBJ_SEKIZO) \
/* 0x134 */ X(PROC_OBJ_SMTILE) \
/* 0x135 */ X(PROC_NPC_FISH) \
/* 0x136 */ X(PROC_MG_FISH) \
/* 0x137 */ X(PROC_FSHOP) \
/* 0x138 */ X(PROC_NPC_DU) \
/* 0x139 */ X(PROC_DISAPPEAR) \
/* 0x13A */ X(PROC_Obj_Mato) \
/* 0x13B */ X(PROC_Obj_Flag) \
/* 0x13C */ X(PROC_Obj_Flag2) \
/* 0x13D */ X(PROC_Obj_Flag3) \
/* 0x13E */ X(PROC_Obj_GOMIKABE) \
/* 0x13F */ X(PROC_Obj_Yousei) \
/* 0x140 */ X(PROC_Obj_Kabuto) \
/* 0x141 */ X(PROC_Obj_Cho) \
/* 0x142 */ X(PROC_Obj_Kuw) \
/* 0x143 */ X(PROC_Obj_Nan) \
/* 0x144 */ X(PROC_Obj_Dan) \
/* 0x145 */ X(PROC_Obj_Kam) \
/* 0x146 */ X(PROC_Obj_Ten) \
/* 0x147 */ X(PROC_Obj_Ari) \
/* 0x148 */ X(PROC_Obj_Kag) \
/* 0x149 */ X(PROC_Obj_Batta) \
/* 0x14A */ X(PROC_Obj_Tombo) \
/* 0x14B */ X(PROC_Obj_Kat) \
/* 0x14C */ X(PROC_Obj_H_Saku) \
/* 0x14D */ X(PROC_Obj_Yobikusa) \
/* 0x14E */ X(PROC_Obj_KazeNeko) \
/* 0x14F */ X(PROC_Obj_KznkArm) \
/* 0x150 */ X(PROC_Obj_NamePlate) \
/* 0x151 */ X(PROC_Obj_OnCloth) \
/* 0x152 */ X(PROC_Obj_LndRope) \
/* 0x153 */ X(PROC_Obj_ItaRope) \
/* 0x154 */ X(PROC_Obj_Sakuita) \
/* 0x155 */ X(PROC_Obj_Laundry) \
/* 0x156 */ X(PROC_WarpBug) \
/* 0x157 */ X(PROC_Izumi_Gate) \
/* 0x158 */ X(PROC_Obj_Fchain) \
/* 0x159 */ X(PROC_Obj_Wchain) \
/* 0x15A */ X(PROC_Tag_Attp) \
/* 0x15B */ X(PROC_Obj_Tornado) \
/* 0x15C */ X(PROC_Obj_Tornado2) \
/* 0x15D */ X(PROC_Obj_FirePillar) \
/* 0x15E */ X(PROC_Obj_FirePillar2) \
/* 0x15F */ X(PROC_Obj_InoBone) \
/* 0x160 */ X(PROC_Obj_Stopper) \
/* 0x161 */ X(PROC_Obj_MHole) \
/* 0x162 */ X(PROC_Tag_Magne) \
/* 0x163 */ X(PROC_Obj_BossWarp) \
/* 0x164 */ X(PROC_Obj_WoodPendulum) \
/* 0x165 */ X(PROC_Obj_WdStick) \
/* 0x166 */ X(PROC_Obj_StairBlock) \
/* 0x167 */ X(PROC_Obj_Geyser) \
/* 0x168 */ X(PROC_Tag_KtOnFire) \
/* 0x169 */ X(PROC_Obj_FireWood) \
/* 0x16A */ X(PROC_Obj_FireWood2) \
/* 0x16B */ X(PROC_Obj_GpTaru) \
/* 0x16C */ X(PROC_Obj_OnsenTaru) \
/* 0x16D */ X(PROC_Obj_KiPot) \
/* 0x16E */ X(PROC_TBOX_SW) \
/* 0x16F */ X(PROC_Obj_SwChain) \
/* 0x170 */ X(PROC_Obj_WoodenSword) \
/* 0x171 */ X(PROC_Obj_StoneMark) \
/* 0x172 */ X(PROC_Obj_Lv3Candle) \
/* 0x173 */ X(PROC_Tag_Lv4Candle) \
/* 0x174 */ X(PROC_Tag_Lv4CandleDm) \
/* 0x175 */ X(PROC_Obj_DamCps) \
/* 0x176 */ X(PROC_Obj_Smoke) \
/* 0x177 */ X(PROC_Obj_WaterFall) \
/* 0x178 */ X(PROC_Obj_ZoraCloth) \
/* 0x179 */ X(PROC_Obj_poFire) \
/* 0x17A */ X(PROC_Tag_poFire) \
/* 0x17B */ X(PROC_Obj_glowSphere) \
/* 0x17C */ X(PROC_Tag_LightBall) \
/* 0x17D */ X(PROC_SwLBall) \
/* 0x17E */ X(PROC_SwBall) \
/* 0x17F */ X(PROC_Obj_WaterEff) \
/* 0x180 */ X(PROC_Tag_RiverBack) \
/* 0x181 */ X(PROC_Tag_KagoFall) \
/* 0x182 */ X(PROC_Tag_Lv2PrChk) \
/* 0x183 */ X(PROC_Obj_Lv4Gear) \
/* 0x184 */ X(PROC_Obj_MasterSword) \
/* 0x185 */ X(PROC_Obj_WoodStatue) \
/* 0x186 */ X(PROC_Obj_Fan) \
/* 0x187 */ X(PROC_Obj_IceLeaf) \
/* 0x188 */ X(PROC_Obj_zrTuraraRc) \
/* 0x189 */ X(PROC_Tag_RetRoom) \
/* 0x18A */ X(PROC_Obj_WindStone) \
/* 0x18B */ X(PROC_Tag_WaraHowl) \
/* 0x18C */ X(PROC_Obj_SCannon) \
/* 0x18D */ X(PROC_Obj_SmWStone) \
/* 0x18E */ X(PROC_Obj_SCannonCrs) \
/* 0x18F */ X(PROC_Tag_SnowEff) \
/* 0x190 */ X(PROC_Tag_CstaSw) \
/* 0x191 */ X(PROC_Tag_Lv6CstaSw) \
/* 0x192 */ X(PROC_Obj_awaPlar) \
/* 0x193 */ X(PROC_Obj_poTbox) \
/* 0x194 */ X(PROC_Obj_TimeFire) \
/* 0x195 */ X(PROC_Obj_TMoon) \
/* 0x196 */ X(PROC_Obj_GanonWall) \
/* 0x197 */ X(PROC_Obj_Prop) \
/* 0x198 */ X(PROC_CSTATUE) \
/* 0x199 */ X(PROC_Obj_SwBallA) \
/* 0x19A */ X(PROC_Obj_SwBallB) \
/* 0x19B */ X(PROC_Obj_SnowSoup) \
/* 0x19C */ X(PROC_Obj_Nagaisu) \
/* 0x19D */ X(PROC_Obj_RCircle) \
/* 0x19E */ X(PROC_Obj_Picture) \
/* 0x19F */ X(PROC_Tag_SetBall) \
/* 0x1A0 */ X(PROC_Tag_SmkEmt) \
/* 0x1A1 */ X(PROC_SwTime) \
/* 0x1A2 */ X(PROC_Obj_HFtr) \
/* 0x1A3 */ X(PROC_Obj_HBarrel) \
/* 0x1A4 */ X(PROC_Obj_Crystal) \
/* 0x1A5 */ X(PROC_Obj_SCannonTen) \
/* 0x1A6 */ X(PROC_Obj_SwBallC) \
/* 0x1A7 */ X(PROC_SCENE_EXIT2) \
/* 0x1A8 */ X(PROC_Obj_Hata) \
/* 0x1A9 */ X(PROC_Obj_ToaruMaki) \
/* 0x1AA */ X(PROC_Tag_AttackItem) \
/* 0x1AB */ X(PROC_Tag_RmbitSw) \
/* 0x1AC */ X(PROC_Obj_Sword) \
/* 0x1AD */ X(PROC_Tag_Spring) \
/* 0x1AE */ X(PROC_Tag_Statue) \
/* 0x1AF */ X(PROC_E_AI) \
/* 0x1B0 */ X(PROC_E_GS) \
/* 0x1B1 */ X(PROC_E_GOB) \
/* 0x1B2 */ X(PROC_E_DD) \
/* 0x1B3 */ X(PROC_E_DN) \
/* 0x1B4 */ X(PROC_E_S1) \
/* 0x1B5 */ X(PROC_E_MF) \
/* 0x1B6 */ X(PROC_E_SG) \
/* 0x1B7 */ X(PROC_E_BS) \
/* 0x1B8 */ X(PROC_E_SF) \
/* 0x1B9 */ X(PROC_E_SH) \
/* 0x1BA */ X(PROC_E_DF) \
/* 0x1BB */ X(PROC_E_GM) \
/* 0x1BC */ X(PROC_E_MD) \
/* 0x1BD */ X(PROC_E_SM) \
/* 0x1BE */ X(PROC_E_SM2) \
/* 0x1BF */ X(PROC_E_ST) \
/* 0x1C0 */ X(PROC_E_ST_LINE) \
/* 0x1C1 */ X(PROC_E_SB) \
/* 0x1C2 */ X(PROC_E_TH) \
/* 0x1C3 */ X(PROC_E_CR) \
/* 0x1C4 */ X(PROC_E_CR_EGG) \
/* 0x1C5 */ X(PROC_E_DB) \
/* 0x1C6 */ X(PROC_E_DB_LEAF) \
/* 0x1C7 */ X(PROC_E_GA) \
/* 0x1C8 */ X(PROC_E_GB) \
/* 0x1C9 */ X(PROC_E_HB) \
/* 0x1CA */ X(PROC_E_HB_LEAF) \
/* 0x1CB */ X(PROC_E_HZELDA) \
/* 0x1CC */ X(PROC_E_YD) \
/* 0x1CD */ X(PROC_E_YH) \
/* 0x1CE */ X(PROC_E_YD_LEAF) \
/* 0x1CF */ X(PROC_E_HM) \
/* 0x1D0 */ X(PROC_E_TK) \
/* 0x1D1 */ X(PROC_E_TK2) \
/* 0x1D2 */ X(PROC_E_TK_BALL) \
/* 0x1D3 */ X(PROC_E_RB) \
/* 0x1D4 */ X(PROC_E_RD) \
/* 0x1D5 */ X(PROC_E_RDB) \
/* 0x1D6 */ X(PROC_E_RDY) \
/* 0x1D7 */ X(PROC_E_FM) \
/* 0x1D8 */ X(PROC_E_FS) \
/* 0x1D9 */ X(PROC_E_PM) \
/* 0x1DA */ X(PROC_E_PO) \
/* 0x1DB */ X(PROC_E_MB) \
/* 0x1DC */ X(PROC_E_MK) \
/* 0x1DD */ X(PROC_E_MM) \
/* 0x1DE */ X(PROC_E_FZ) \
/* 0x1DF */ X(PROC_E_ZS) \
/* 0x1E0 */ X(PROC_E_KK) \
/* 0x1E1 */ X(PROC_E_HP) \
/* 0x1E2 */ X(PROC_E_ZH) \
/* 0x1E3 */ X(PROC_E_ZM) \
/* 0x1E4 */ X(PROC_E_PZ) \
/* 0x1E5 */ X(PROC_E_FB) \
/* 0x1E6 */ X(PROC_E_FK) \
/* 0x1E7 */ X(PROC_E_MS) \
/* 0x1E8 */ X(PROC_E_NEST) \
/* 0x1E9 */ X(PROC_E_NZ) \
/* 0x1EA */ X(PROC_E_BA) \
/* 0x1EB */ X(PROC_E_BU) \
/* 0x1EC */ X(PROC_E_BUG) \
/* 0x1ED */ X(PROC_E_BEE) \
/* 0x1EE */ X(PROC_E_IS) \
/* 0x1EF */ X(PROC_E_KG) \
/* 0x1F0 */ X(PROC_E_KR) \
/* 0x1F1 */ X(PROC_E_SW) \
/* 0x1F2 */ X(PROC_E_GE) \
/* 0x1F3 */ X(PROC_Tag_WatchGe) \
/* 0x1F4 */ X(PROC_E_YM) \
/* 0x1F5 */ X(PROC_E_YM_TAG) \
/* 0x1F6 */ X(PROC_E_YMB) \
/* 0x1F7 */ X(PROC_Tag_FWall) \
/* 0x1F8 */ X(PROC_Tag_WaterFall) \
/* 0x1F9 */ X(PROC_E_YK) \
/* 0x1FA */ X(PROC_E_YR) \
/* 0x1FB */ X(PROC_E_YG) \
/* 0x1FC */ X(PROC_E_HZ) \
/* 0x1FD */ X(PROC_E_WS) \
/* 0x1FE */ X(PROC_E_OC) \
/* 0x1FF */ X(PROC_E_OT) \
/* 0x200 */ X(PROC_E_DT) \
/* 0x201 */ X(PROC_E_BG) \
/* 0x202 */ X(PROC_E_OctBg) \
/* 0x203 */ X(PROC_DR) \
/* 0x204 */ X(PROC_L7lowDr) \
/* 0x205 */ X(PROC_L7ODR) \
/* 0x206 */ X(PROC_E_TT) \
/* 0x207 */ X(PROC_E_DK) \
/* 0x208 */ X(PROC_E_VT) \
/* 0x209 */ X(PROC_E_WW) \
/* 0x20A */ X(PROC_E_GI) \
/* 0x20B */ X(PROC_B_BH) \
/* 0x20C */ X(PROC_B_BQ) \
/* 0x20D */ X(PROC_B_GM) \
/* 0x20E */ X(PROC_B_GND) \
/* 0x20F */ X(PROC_B_GO) \
/* 0x210 */ X(PROC_B_OH2) \
/* 0x211 */ X(PROC_B_YO) \
/* 0x212 */ X(PROC_B_YOI) \
/* 0x213 */ X(PROC_B_TN) \
/* 0x214 */ X(PROC_B_GG) \
/* 0x215 */ X(PROC_B_DRE) \
/* 0x216 */ X(PROC_B_MGN) \
/* 0x217 */ X(PROC_E_WAP) \
/* 0x218 */ X(PROC_ITEM) \
/* 0x219 */ X(PROC_Obj_SmallKey) \
/* 0x21A */ X(PROC_Obj_Kantera) \
/* 0x21B */ X(PROC_Obj_LifeContainer) \
/* 0x21C */ X(PROC_Obj_Shield) \
/* 0x21D */ X(PROC_Demo_Item) \
/* 0x21E */ X(PROC_ShopItem) \
/* 0x21F */ X(PROC_Obj_Drop) \
/* 0x220 */ X(PROC_OBJ_RW) \
/* 0x221 */ X(PROC_NBOMB) \
/* 0x222 */ X(PROC_TAG_CSW) \
/* 0x223 */ X(PROC_TAG_QS) \
/* 0x224 */ X(PROC_HOZELDA) \
/* 0x225 */ X(PROC_SWC00) \
/* 0x226 */ X(PROC_KNOB20) \
/* 0x227 */ X(PROC_DBDOOR) \
/* 0x228 */ X(PROC_BOSS_DOOR) \
/* 0x229 */ X(PROC_L1BOSS_DOOR) \
/* 0x22A */ X(PROC_L1MBOSS_DOOR) \
/* 0x22B */ X(PROC_L5BOSS_DOOR) \
/* 0x22C */ X(PROC_DSHUTTER) \
/* 0x22D */ X(PROC_SPIRAL_DOOR) \
/* 0x22E */ X(PROC_Tag_ChgRestart) \
/* 0x22F */ X(PROC_Tag_Restart) \
/* 0x230 */ X(PROC_ANDSW) \
/* 0x231 */ X(PROC_ANDSW2) \
/* 0x232 */ X(PROC_MYNA) \
/* 0x233 */ X(PROC_NPC_GND) \
/* 0x234 */ X(PROC_NPC_GRA) \
/* 0x235 */ X(PROC_NPC_GRC) \
/* 0x236 */ X(PROC_NPC_GRD) \
/* 0x237 */ X(PROC_NPC_GRM) \
/* 0x238 */ X(PROC_NPC_GRMC) \
/* 0x239 */ X(PROC_NPC_GRO) \
/* 0x23A */ X(PROC_NPC_GRR) \
/* 0x23B */ X(PROC_NPC_GRS) \
/* 0x23C */ X(PROC_NPC_GRZ) \
/* 0x23D */ X(PROC_NPC_YAMID) \
/* 0x23E */ X(PROC_NPC_YAMIT) \
/* 0x23F */ X(PROC_NPC_YAMIS) \
/* 0x240 */ X(PROC_NPC_BLUENS) \
/* 0x241 */ X(PROC_NPC_KAKASHI) \
/* 0x242 */ X(PROC_NPC_KDK) \
/* 0x243 */ X(PROC_NPC_ARU) \
/* 0x244 */ X(PROC_NPC_BANS) \
/* 0x245 */ X(PROC_NPC_BESU) \
/* 0x246 */ X(PROC_NPC_BOU) \
/* 0x247 */ X(PROC_NPC_BOU_S) \
/* 0x248 */ X(PROC_NPC_CLERKA) \
/* 0x249 */ X(PROC_NPC_CLERKB) \
/* 0x24A */ X(PROC_NPC_CLERKT) \
/* 0x24B */ X(PROC_NPC_WRESTLER) \
/* 0x24C */ X(PROC_Tag_Arena) \
/* 0x24D */ X(PROC_Tag_Instruction) \
/* 0x24E */ X(PROC_NPC_DOC) \
/* 0x24F */ X(PROC_NPC_GWOLF) \
/* 0x250 */ X(PROC_NPC_LEN) \
/* 0x251 */ X(PROC_NPC_LUD) \
/* 0x252 */ X(PROC_NPC_FAIRY_SEIREI) \
/* 0x253 */ X(PROC_NPC_FAIRY) \
/* 0x254 */ X(PROC_NPC_HANJO) \
/* 0x255 */ X(PROC_NPC_HENNA) \
/* 0x256 */ X(PROC_NPC_HENNA0) \
/* 0x257 */ X(PROC_NPC_HOZ) \
/* 0x258 */ X(PROC_NPC_JAGAR) \
/* 0x259 */ X(PROC_NPC_KKRI) \
/* 0x25A */ X(PROC_NPC_KN) \
/* 0x25B */ X(PROC_KN_BULLET) \
/* 0x25C */ X(PROC_NPC_KNJ) \
/* 0x25D */ X(PROC_NPC_KOLIN) \
/* 0x25E */ X(PROC_NPC_KOLINB) \
/* 0x25F */ X(PROC_NPC_KYURY) \
/* 0x260 */ X(PROC_NPC_MARO) \
/* 0x261 */ X(PROC_NPC_MIDP) \
/* 0x262 */ X(PROC_NPC_MOI) \
/* 0x263 */ X(PROC_NPC_RACA) \
/* 0x264 */ X(PROC_NPC_SARU) \
/* 0x265 */ X(PROC_NPC_SEIB) \
/* 0x266 */ X(PROC_NPC_SEIC) \
/* 0x267 */ X(PROC_NPC_SEID) \
/* 0x268 */ X(PROC_NPC_SEIRA) \
/* 0x269 */ X(PROC_NPC_SERA2) \
/* 0x26A */ X(PROC_NPC_SEIREI) \
/* 0x26B */ X(PROC_NPC_SHAMAN) \
/* 0x26C */ X(PROC_NPC_SMARO) \
/* 0x26D */ X(PROC_NPC_SOLA) \
/* 0x26E */ X(PROC_NPC_TARO) \
/* 0x26F */ X(PROC_NPC_PACHI_BESU) \
/* 0x270 */ X(PROC_NPC_PACHI_TARO) \
/* 0x271 */ X(PROC_NPC_PACHI_MARO) \
/* 0x272 */ X(PROC_TAG_PATI) \
/* 0x273 */ X(PROC_NPC_THE) \
/* 0x274 */ X(PROC_NPC_TKJ) \
/* 0x275 */ X(PROC_NPC_TKS) \
/* 0x276 */ X(PROC_NPC_TKC) \
/* 0x277 */ X(PROC_OBJ_TKS) \
/* 0x278 */ X(PROC_NPC_TOBY) \
/* 0x279 */ X(PROC_NPC_URI) \
/* 0x27A */ X(PROC_NPC_YELIA) \
/* 0x27B */ X(PROC_NPC_YKM) \
/* 0x27C */ X(PROC_NPC_YKW) \
/* 0x27D */ X(PROC_NPC_ZANB) \
/* 0x27E */ X(PROC_NPC_ZANT) \
/* 0x27F */ X(PROC_NPC_ZELDA) \
/* 0x280 */ X(PROC_NPC_ZELR) \
/* 0x281 */ X(PROC_NPC_ZELRO) \
/* 0x282 */ X(PROC_OBJ_ZRAFREEZE) \
/* 0x283 */ X(PROC_NPC_ZRC) \
/* 0x284 */ X(PROC_NPC_ZRZ) \
/* 0x285 */ X(PROC_ZRA_MARK) \
/* 0x286 */ X(PROC_MYNA2) \
/* 0x287 */ X(PROC_TAG_MYNA2) \
/* 0x288 */ X(PROC_NPC_CD3) \
/* 0x289 */ X(PROC_Tag_Schedule) \
/* 0x28A */ X(PROC_Tag_Escape) \
/* 0x28B */ X(PROC_NPC_CHAT) \
/* 0x28C */ X(PROC_NPC_SOLDIERa) \
/* 0x28D */ X(PROC_NPC_SOLDIERb) \
/* 0x28E */ X(PROC_PASSER_MNG) \
/* 0x28F */ X(PROC_NPC_PASSER) \
/* 0x290 */ X(PROC_NPC_PASSER2) \
/* 0x291 */ X(PROC_NPC_POST) \
/* 0x292 */ X(PROC_NPC_POUYA) \
/* 0x293 */ X(PROC_FORMATION_MNG) \
/* 0x294 */ X(PROC_NPC_FGUARD) \
/* 0x295 */ X(PROC_GUARD_MNG) \
/* 0x296 */ X(PROC_TAG_GUARD) \
/* 0x297 */ X(PROC_NPC_GUARD) \
/* 0x298 */ X(PROC_NPC_ASH) \
/* 0x299 */ X(PROC_NPC_ASHB) \
/* 0x29A */ X(PROC_NPC_SHAD) \
/* 0x29B */ X(PROC_NPC_RAFREL) \
/* 0x29C */ X(PROC_NPC_MOIR) \
/* 0x29D */ X(PROC_NPC_IMPAL) \
/* 0x29E */ X(PROC_NPC_SHOE) \
/* 0x29F */ X(PROC_NPC_DOORBOY) \
/* 0x2A0 */ X(PROC_NPC_PRAYER) \
/* 0x2A1 */ X(PROC_NPC_KASIHANA) \
/* 0x2A2 */ X(PROC_NPC_KASIKYU) \
/* 0x2A3 */ X(PROC_NPC_KASIMICH) \
/* 0x2A4 */ X(PROC_NPC_DRSOL) \
/* 0x2A5 */ X(PROC_NPC_CHIN) \
/* 0x2A6 */ X(PROC_NPC_INS) \
/* 0x2A7 */ X(PROC_NPC_SHOP0) \
/* 0x2A8 */ X(PROC_NPC_MK) \
/* 0x2A9 */ X(PROC_NPC_P2) \
/* 0x2AA */ X(PROC_KYTAG00) \
/* 0x2AB */ X(PROC_KYTAG01) \
/* 0x2AC */ X(PROC_KYTAG02) \
/* 0x2AD */ X(PROC_KYTAG03) \
/* 0x2AE */ X(PROC_KYTAG04) \
/* 0x2AF */ X(PROC_KYTAG05) \
/* 0x2B0 */ X(PROC_KYTAG06) \
/* 0x2B1 */ X(PROC_KYTAG07) \
/* 0x2B2 */ X(PROC_KYTAG08) \
/* 0x2B3 */ X(PROC_KYTAG09) \
/* 0x2B4 */ X(PROC_KYTAG10) \
/* 0x2B5 */ X(PROC_KYTAG11) \
/* 0x2B6 */ X(PROC_KYTAG12) \
/* 0x2B7 */ X(PROC_KYTAG13) \
/* 0x2B8 */ X(PROC_KYTAG14) \
/* 0x2B9 */ X(PROC_KYTAG15) \
/* 0x2BA */ X(PROC_KYTAG16) \
/* 0x2BB */ X(PROC_KYTAG17) \
/* 0x2BC */ X(PROC_Ykgr) \
/* 0x2BD */ X(PROC_TALK) \
/* 0x2BE */ X(PROC_Obj_Crope) \
/* 0x2BF */ X(PROC_Obj_Bombf) \
/* 0x2C0 */ X(PROC_Obj_BkLeaf) \
/* 0x2C1 */ X(PROC_Tag_Mhint) \
/* 0x2C2 */ X(PROC_Tag_Mmsg) \
/* 0x2C3 */ X(PROC_Tag_Mwait) \
/* 0x2C4 */ X(PROC_Tag_Mstop) \
/* 0x2C5 */ X(PROC_Tag_Stream) \
/* 0x2C6 */ X(PROC_Tag_Sppath) \
/* 0x2C7 */ X(PROC_Tag_Wljump) \
/* 0x2C8 */ X(PROC_Tag_TWGate) \
/* 0x2C9 */ X(PROC_Tag_Lv6Gate) \
/* 0x2CA */ X(PROC_Tag_Lv7Gate) \
/* 0x2CB */ X(PROC_Tag_Lv8Gate) \
/* 0x2CC */ X(PROC_Tag_TheBHint) \
/* 0x2CD */ X(PROC_Tag_Assist) \
/* 0x2CE */ X(PROC_DEMO00) \
/* 0x2CF */ X(PROC_TAG_CAMERA) \
/* 0x2D0 */ X(PROC_TAG_CHKPOINT) \
/* 0x2D1 */ X(PROC_TAG_EVENT) \
/* 0x2D2 */ X(PROC_TAG_EVT) \
/* 0x2D3 */ X(PROC_TAG_TELOP) \
/* 0x2D4 */ X(PROC_TAG_HOWL) \
/* 0x2D5 */ X(PROC_TAG_MSG) \
/* 0x2D6 */ X(PROC_TAG_LANTERN) \
/* 0x2D7 */ X(PROC_Tag_Mist) \
/* 0x2D8 */ X(PROC_DMIDNA) \
/* 0x2D9 */ X(PROC_KY_THUNDER) \
/* 0x2DA */ X(PROC_VRBOX) \
/* 0x2DB */ X(PROC_VRBOX2) \
/* 0x2DC */ X(PROC_BG) \
/* 0x2DD */ X(PROC_SET_BG_OBJ) \
/* 0x2DE */ X(PROC_BG_OBJ) \
/* 0x2DF */ X(PROC_MIRROR) \
/* 0x2E0 */ X(PROC_MOVIE_PLAYER) \
/* 0x2E1 */ X(PROC_TITLE) \
/* 0x2E2 */ X(PROC_FR) \
/* 0x2E3 */ X(PROC_ECONT) \
/* 0x2E4 */ X(PROC_MG_ROD) \
/* 0x2E5 */ X(PROC_E_ARROW) \
/* 0x2E6 */ X(PROC_BULLET) \
/* 0x2E7 */ X(PROC_SWHIT0) \
/* 0x2E8 */ X(PROC_E_TH_BALL) \
/* 0x2E9 */ X(PROC_TAG_EVTAREA) \
/* 0x2EA */ X(PROC_TAG_EVTMSG) \
/* 0x2EB */ X(PROC_TAG_KMSG) \
/* 0x2EC */ X(PROC_TAG_PUSH) \
/* 0x2ED */ X(PROC_E_MK_BO) \
/* 0x2EE */ X(PROC_E_MM_MT) \
/* 0x2EF */ X(PROC_OBJ_KBOX) \
/* 0x2F0 */ X(PROC_OBJ_FW) \
/* 0x2F1 */ X(PROC_B_GOS) \
/* 0x2F2 */ X(PROC_OBJ_YSTONE) \
/* 0x2F3 */ X(PROC_MANT) \
/* 0x2F4 */ X(PROC_CROD) \
/* 0x2F5 */ X(PROC_OBJ_PLEAF) \
/* 0x2F6 */ X(PROC_OBJ_KBACKET) \
/* 0x2F7 */ X(PROC_OBJ_YBAG) \
/* 0x2F8 */ X(PROC_OBJ_PUMPKIN) \
/* 0x2F9 */ X(PROC_OBJ_AUTOMATA) \
/* 0x2FA */ X(PROC_OBJ_GADGET) \
/* 0x2FB */ X(PROC_OBJ_KAGO) \
/* 0x2FC */ X(PROC_Obj_Carry) \
/* 0x2FD */ X(PROC_Obj_Stone) \
/* 0x2FE */ X(PROC_OBJ_HB) \
/* 0x2FF */ X(PROC_NPC_INKO) \
/* 0x300 */ X(PROC_BD) \
/* 0x301 */ X(PROC_Obj_Eff) \
/* 0x302 */ X(PROC_WPILLAR) \
/* 0x303 */ X(PROC_WMARK) \
/* 0x304 */ X(PROC_E_BI) \
/* 0x305 */ X(PROC_E_BI_LEAF) \
/* 0x306 */ X(PROC_START_AND_GOAL) \
/* 0x307 */ X(PROC_NPC_DF) \
/* 0x308 */ X(PROC_ARROW) \
/* 0x309 */ X(PROC_PATH_LINE) \
/* 0x30A */ X(PROC_TAG_ALLMATO) \
/* 0x30B */ X(PROC_Obj_Timer) \
/* 0x30C */ X(PROC_SCENE_EXIT) \
/* 0x30D */ X(PROC_CAMERA) \
/* 0x30E */ X(PROC_CAMERA2) \
/* 0x30F */ X(PROC_SUSPEND) \
/* 0x310 */ X(PROC_GRASS) \
/* 0x311 */ X(PROC_KYEFF) \
/* 0x312 */ X(PROC_KYEFF2) \
/* 0x313 */ X(PROC_MSG_OBJECT) \
/* 0x314 */ X(PROC_MENUWINDOW) \
/* 0x315 */ X(PROC_TIMER) \
/* 0x316 */ X(PROC_METER2) \
/* 0x317 */ X(PROC_GAMEOVER) \
#define X(name) name,
enum {
ALL_PROCS
PROC_MAX_NUM,
};
#undef X
#if PROCS_DUMP_NAMES
struct ProcName {
unsigned int id;
const char* name;
};
#define X(name) { name, #name },
inline const ProcName procNames[] = {
ALL_PROCS
};
#undef X
inline const char* GetProcName(unsigned int id) {
for (auto procName : procNames) {
if (procName.id == id) {
return procName.name;
}
}
return nullptr;
}
#endif
#undef ALL_PROCS
#endif /* D_PROCNAME_H */
include/d/d_save.h
+2 -2
View File
@@ -5,7 +5,7 @@
#include "SSystem/SComponent/c_xyz.h"
#include <os.h>
#include "global.h"
#include "f_pc/f_pc_name.h"
#include "d/d_item_data.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "JSystem/JHostIO/JORReflexible.h"
#include "dusk/endian.h"
@@ -399,7 +399,7 @@ public:
u8 getPohNum() const { return mPohNum; }
void addPohNum() {
if (mPohNum < 0xFF) {
mPohNum += 1;
mPohNum++;
}
};
include/f_op/f_op_actor.h
+33 -8
View File
@@ -28,13 +28,38 @@ struct actor_process_profile_definition2 {
};
enum fopAc_Status_e {
fopAcStts_NOEXEC_e = 0x00000080,
fopAcStts_CULL_e = 0x00000100,
fopAcStts_FREEZE_e = 0x00000400,
fopAcStts_CARRY_e = 0x00002000,
fopAcStts_NOPAUSE_e = 0x00020000,
fopAcStts_NODRAW_e = 0x01000000,
fopAcStts_BOSS_e = 0x04000000,
fopAcStts_UNK_0x1_e = 1 << 0,
fopAcStts_UNK_0x2_e = 1 << 1,
fopAcStts_UNK_0x4_e = 1 << 2,
fopAcStts_UNK_0x8_e = 1 << 3,
fopAcStts_UNK_0x10_e = 1 << 4,
fopAcStts_UNK_0x20_e = 1 << 5,
fopAcStts_UNK_0x40_e = 1 << 6,
fopAcStts_NOEXEC_e = 1 << 7,
fopAcStts_CULL_e = 1 << 8,
fopAcStts_UNK_0x200_e = 1 << 9,
fopAcStts_FREEZE_e = 1 << 10,
fopAcStts_STAFF_EXTRA_e = 1 << 11, // Actor is an extra participant of an active staff. Usually handled automatically via an "ALL" staff, but can be manually set/unset by an actor?
fopAcStts_STAFF_SHUTTER_e = 1 << 12, // Actor is a primary participant of an active "SHUTTER_DOOR" staff
fopAcStts_CARRY_NOW_e = 1 << 13,
fopAcStts_UNK_0x4000_e = 1 << 14,
fopAcStts_STAFF_PRIMARY_e = 1 << 15, // Actor is a primary participant of an active staff
fopAcStts_UNK_0x10000_e = 1 << 16,
fopAcStts_NOPAUSE_e = 1 << 17,
fopAcStts_UNK_0x40000_e = 1 << 18,
fopAcStts_UNK_0x80000_e = 1 << 19,
fopAcStts_HOOK_CARRY_NOW_e = 1 << 20,
fopAcStts_UNK_0x200000_e = 1 << 21,
fopAcStts_UNK_0x400000_e = 1 << 22,
fopAcStts_UNK_0x800000_e = 1 << 23,
fopAcStts_NODRAW_e = 1 << 24,
fopAcStts_UNK_0x2000000_e = 1 << 25,
fopAcStts_BOSS_e = 1 << 26,
fopAcStts_UNK_0x8000000_e = 1 << 27,
fopAcStts_UNK_0x10000000_e = 1 << 28,
fopAcStts_UNK_0x20000000_e = 1 << 29,
fopAcStts_UNK_0x40000000_e = 1 << 30,
fopAcStts_HAWK_CARRY_NOW_e = 1 << 31,
};
enum fopAc_Group_e {
@@ -323,7 +348,7 @@ public:
fopEn_flag_WolfDownPullEnd = 0x20,
fopEn_flag_WolfBiteDamage = 0x40,
fopEn_flag_HeadLock = 0x80,
fopEn_flag_WolfNoLock = 0x200,
};
include/f_op/f_op_actor_mng.h
+8 -41
View File
@@ -86,7 +86,7 @@ struct fopAcM_search4ev_prm {
void clear() {
name[0] = 0;
event_id = -1;
procname = PROC_PLAY_SCENE;
procname = fpcNm_PLAY_SCENE_e;
argument = 0;
}
@@ -133,39 +133,6 @@ struct DOUBLE_POS {
double x, y, z;
};
enum fopAcM_STATUS {
/* 0x00000001 */ fopAcM_STATUS_UNK_0x1 = 1 << 0,
/* 0x00000002 */ fopAcM_STATUS_UNK_0x2 = 1 << 1,
/* 0x00000004 */ fopAcM_STATUS_UNK_0x4 = 1 << 2,
/* 0x00000008 */ fopAcM_STATUS_UNK_0x8 = 1 << 3,
/* 0x00000010 */ fopAcM_STATUS_UNK_0x10 = 1 << 4,
/* 0x00000020 */ fopAcM_STATUS_UNK_0x20 = 1 << 5,
/* 0x00000040 */ fopAcM_STATUS_UNK_0x40 = 1 << 6,
/* 0x00000080 */ fopAcM_STATUS_UNK_0x80 = 1 << 7,
/* 0x00000100 */ fopAcM_STATUS_UNK_0x100 = 1 << 8,
/* 0x00000200 */ fopAcM_STATUS_UNK_0x200 = 1 << 9,
/* 0x00000400 */ fopAcM_STATUS_UNK_0x400 = 1 << 10,
/* 0x00000800 */ fopAcM_STATUS_UNK_0x800 = 1 << 11,
/* 0x00001000 */ fopAcM_STATUS_UNK_0x1000 = 1 << 12,
/* 0x00002000 */ fopAcM_STATUS_CARRY_NOW = 1 << 13,
/* 0x00004000 */ fopAcM_STATUS_UNK_0x4000 = 1 << 14,
/* 0x00008000 */ fopAcM_STATUS_UNK_0x8000 = 1 << 15,
/* 0x00010000 */ fopAcM_STATUS_UNK_0x10000 = 1 << 16,
/* 0x00020000 */ fopAcM_STATUS_UNK_0x20000 = 1 << 17,
/* 0x00040000 */ fopAcM_STATUS_UNK_0x40000 = 1 << 18,
/* 0x00080000 */ fopAcM_STATUS_UNK_0x80000 = 1 << 19,
/* 0x00100000 */ fopAcM_STATUS_HOOK_CARRY_NOW = 1 << 20,
/* 0x00200000 */ fopAcM_STATUS_UNK_0x200000 = 1 << 21,
/* 0x00400000 */ fopAcM_STATUS_UNK_0x400000 = 1 << 22,
/* 0x00800000 */ fopAcM_STATUS_UNK_0x800000 = 1 << 23,
/* 0x01000000 */ fopAcM_STATUS_UNK_0x1000000 = 1 << 24,
/* 0x02000000 */ fopAcM_STATUS_UNK_0x2000000 = 1 << 25,
/* 0x04000000 */ fopAcM_STATUS_UNK_0x4000000 = 1 << 26,
/* 0x08000000 */ fopAcM_STATUS_UNK_0x8000000 = 1 << 27,
/* 0x80000000 */ fopAcM_STATUS_HAWK_CARRY_NOW = 1 << 31,
};
inline s8 fopAcM_GetRoomNo(const fopAc_ac_c* i_actor) {
return i_actor->current.roomNo;
}
@@ -187,11 +154,11 @@ inline u32 fopAcM_CheckStatus(fopAc_ac_c* i_actor, u32 actor_status) {
}
inline u32 fopAcM_checkCarryNow(fopAc_ac_c* i_actor) {
return i_actor->actor_status & fopAcM_STATUS_CARRY_NOW;
return i_actor->actor_status & fopAcStts_CARRY_NOW_e;
}
inline u32 fopAcM_checkHawkCarryNow(fopAc_ac_c* actor) {
return fopAcM_CheckStatus(actor, 0x80000000);
return fopAcM_CheckStatus(actor, fopAcStts_HAWK_CARRY_NOW_e);
}
enum fopAcM_CARRY {
@@ -211,7 +178,7 @@ inline u32 fopAcM_CheckCarryType(const fopAc_ac_c* actor, fopAcM_CARRY type) {
}
inline u32 fopAcM_checkHookCarryNow(fopAc_ac_c* i_actor) {
return fopAcM_CheckStatus(i_actor, fopAcM_STATUS_HOOK_CARRY_NOW);
return fopAcM_CheckStatus(i_actor, fopAcStts_HOOK_CARRY_NOW_e);
}
inline u32 fopAcM_GetParam(const void* i_actor) {
@@ -307,19 +274,19 @@ inline void fopAcM_SetRoomNo(fopAc_ac_c* actor, s8 roomNo) {
}
inline void fopAcM_setHookCarryNow(fopAc_ac_c* actor) {
fopAcM_OnStatus(actor, fopAcM_STATUS_HOOK_CARRY_NOW);
fopAcM_OnStatus(actor, fopAcStts_HOOK_CARRY_NOW_e);
}
inline void fopAcM_cancelHookCarryNow(fopAc_ac_c* actor) {
fopAcM_OffStatus(actor, fopAcM_STATUS_HOOK_CARRY_NOW);
fopAcM_OffStatus(actor, fopAcStts_HOOK_CARRY_NOW_e);
}
inline void fopAcM_setHawkCarryNow(fopAc_ac_c* actor) {
fopAcM_OnStatus(actor, fopAcM_STATUS_HAWK_CARRY_NOW);
fopAcM_OnStatus(actor, fopAcStts_HAWK_CARRY_NOW_e);
}
inline void fopAcM_cancelHawkCarryNow(fopAc_ac_c* actor) {
fopAcM_OffStatus(actor, fopAcM_STATUS_HAWK_CARRY_NOW);
fopAcM_OffStatus(actor, fopAcStts_HAWK_CARRY_NOW_e);
}
inline s8 fopAcM_GetHomeRoomNo(const fopAc_ac_c* i_actor) {
include/f_pc/f_pc_draw_priority.h
+786
View File
@@ -12,4 +12,790 @@ s16 fpcDwPi_Get(const draw_priority_class* i_drawpriority);
void fpcDwPi_Set(draw_priority_class* i_drawpriority, s16 i_priority);
void fpcDwPi_Init(draw_priority_class* i_drawpriority, s16 i_priority);
enum {
fpcDwPi_CAMERA_e,
fpcDwPi_CAMERA2_e,
fpcDwPi_KANKYO_e,
fpcDwPi_KYEFF2_e,
fpcDwPi_VRBOX2_e,
fpcDwPi_KYEFF_e,
fpcDwPi_KY_THUNDER_e,
fpcDwPi_VRBOX_e,
fpcDwPi_GRASS_e,
fpcDwPi_MOVIE_PLAYER_e,
fpcDwPi_TITLE_e,
fpcDwPi_Obj_Swpush_e,
fpcDwPi_Obj_Swpush2_e,
fpcDwPi_Obj_Swpush5_e,
fpcDwPi_Obj_SwTurn_e,
fpcDwPi_Obj_Lv6SwTurn_e,
fpcDwPi_Obj_RopeBridge_e,
fpcDwPi_Obj_Movebox_e,
fpcDwPi_OBJ_SEKIZOA_e,
fpcDwPi_OBJ_GRA_e,
fpcDwPi_TAG_GRA_e,
fpcDwPi_TAG_YAMI_e,
fpcDwPi_Obj_Timer_e,
fpcDwPi_Obj_Ladder_e,
fpcDwPi_Obj_ZDoor_e,
fpcDwPi_Obj_MvStair_e,
fpcDwPi_Obj_Flag_e,
fpcDwPi_Obj_Flag2_e,
fpcDwPi_Obj_Flag3_e,
fpcDwPi_Obj_Yobikusa_e,
fpcDwPi_Obj_KazeNeko_e,
fpcDwPi_Obj_KznkArm_e,
fpcDwPi_Obj_NamePlate_e,
fpcDwPi_Obj_OnCloth_e,
fpcDwPi_Obj_LndRope_e,
fpcDwPi_Obj_ItaRope_e,
fpcDwPi_Obj_Sakuita_e,
fpcDwPi_Obj_Laundry_e,
fpcDwPi_Izumi_Gate_e,
fpcDwPi_OBJ_BEF_e,
fpcDwPi_OBJ_FMOBJ_e,
fpcDwPi_OBJ_LBOX_e,
fpcDwPi_OBJ_FW_e,
fpcDwPi_OBJ_KBOX_e,
fpcDwPi_OBJ_KEY_e,
fpcDwPi_OBJ_KEYHOLE_e,
fpcDwPi_Obj_Lv5Key_e,
fpcDwPi_OBJ_WEB0_e,
fpcDwPi_OBJ_WEB1_e,
fpcDwPi_OBJ_CB_e,
fpcDwPi_OBJ_MAKI_e,
fpcDwPi_OBJ_MSIMA_e,
fpcDwPi_OBJ_MYOGAN_e,
fpcDwPi_OBJ_WFLAG_e,
fpcDwPi_OBJ_BRG_e,
fpcDwPi_OBJ_SO_e,
fpcDwPi_OBJ_GB_e,
fpcDwPi_OBJ_GM_e,
fpcDwPi_OBJ_TOBY_e,
fpcDwPi_OBJ_TP_e,
fpcDwPi_OBJ_SW_e,
fpcDwPi_OBJ_ITO_e,
fpcDwPi_OBJ_KAGE_e,
fpcDwPi_OBJ_KANBAN2_e,
fpcDwPi_OBJ_BALLOON_e,
fpcDwPi_OBJ_SUISYA_e,
fpcDwPi_OBJ_OILTUBO_e,
fpcDwPi_OBJ_ROTEN_e,
fpcDwPi_OBJ_SSDRINK_e,
fpcDwPi_OBJ_SSITEM_e,
fpcDwPi_TAG_SSDRINK_e,
fpcDwPi_TAG_BTLITM_e,
fpcDwPi_TAG_LV5SOUP_e,
fpcDwPi_TAG_MNLIGHT_e,
fpcDwPi_TAG_SHOPCAM_e,
fpcDwPi_TAG_SHOPITM_e,
fpcDwPi_OBJ_NDOOR_e,
fpcDwPi_OBJ_UDOOR_e,
fpcDwPi_OBJ_USAKU_e,
fpcDwPi_OBJ_BED_e,
fpcDwPi_OBJ_BOUMATO_e,
fpcDwPi_OBJ_AUTOMATA_e,
fpcDwPi_OBJ_GADGET_e,
fpcDwPi_OBJ_ITAMATO_e,
fpcDwPi_OBJ_NOUGU_e,
fpcDwPi_OBJ_STICK_e,
fpcDwPi_OBJ_MIE_e,
fpcDwPi_OBJ_SEKIDOOR_e,
fpcDwPi_OBJ_SEKIZO_e,
fpcDwPi_OBJ_SMTILE_e,
fpcDwPi_HORSE_e,
fpcDwPi_ALINK_e,
fpcDwPi_MIDNA_e,
fpcDwPi_DMIDNA_e,
fpcDwPi_KYTAG00_e,
fpcDwPi_KYTAG01_e,
fpcDwPi_KYTAG02_e,
fpcDwPi_KYTAG03_e,
fpcDwPi_KYTAG04_e,
fpcDwPi_KYTAG05_e,
fpcDwPi_KYTAG06_e,
fpcDwPi_KYTAG07_e,
fpcDwPi_KYTAG08_e,
fpcDwPi_KYTAG09_e,
fpcDwPi_KYTAG10_e,
fpcDwPi_KYTAG11_e,
fpcDwPi_KYTAG12_e,
fpcDwPi_KYTAG13_e,
fpcDwPi_KYTAG14_e,
fpcDwPi_KYTAG15_e,
fpcDwPi_KYTAG16_e,
fpcDwPi_KYTAG17_e,
fpcDwPi_E_AI_e,
fpcDwPi_E_CR_e,
fpcDwPi_E_CR_EGG_e,
fpcDwPi_E_GS_e,
fpcDwPi_E_GOB_e,
fpcDwPi_E_DD_e,
fpcDwPi_E_DN_e,
fpcDwPi_E_GM_e,
fpcDwPi_E_MF_e,
fpcDwPi_E_S1_e,
fpcDwPi_E_SG_e,
fpcDwPi_E_SF_e,
fpcDwPi_E_BS_e,
fpcDwPi_E_SB_e,
fpcDwPi_E_SH_e,
fpcDwPi_E_SM_e,
fpcDwPi_E_SM2_e,
fpcDwPi_E_ST_e,
fpcDwPi_E_DF_e,
fpcDwPi_E_PH_e,
fpcDwPi_E_MD_e,
fpcDwPi_E_ST_LINE_e,
fpcDwPi_E_TH_e,
fpcDwPi_E_TH_BALL_e,
fpcDwPi_E_DB_e,
fpcDwPi_E_DB_LEAF_e,
fpcDwPi_E_GA_e,
fpcDwPi_E_GB_e,
fpcDwPi_E_HB_e,
fpcDwPi_E_HB_LEAF_e,
fpcDwPi_E_HZELDA_e,
fpcDwPi_E_YD_e,
fpcDwPi_E_YH_e,
fpcDwPi_E_YD_LEAF_e,
fpcDwPi_E_HM_e,
fpcDwPi_E_BI_e,
fpcDwPi_E_BI_LEAF_e,
fpcDwPi_E_TK_e,
fpcDwPi_E_TK2_e,
fpcDwPi_E_TK_BALL_e,
fpcDwPi_E_WB_e,
fpcDwPi_E_RB_e,
fpcDwPi_E_RD_e,
fpcDwPi_ECONT_e,
fpcDwPi_E_RDB_e,
fpcDwPi_E_RDY_e,
fpcDwPi_E_FM_e,
fpcDwPi_E_FK_e,
fpcDwPi_E_FS_e,
fpcDwPi_E_PM_e,
fpcDwPi_E_PO_e,
fpcDwPi_E_ARROW_e,
fpcDwPi_E_MB_e,
fpcDwPi_E_MK_e,
fpcDwPi_E_MK_BO_e,
fpcDwPi_E_MM_e,
fpcDwPi_E_MM_MT_e,
fpcDwPi_E_FZ_e,
fpcDwPi_E_ZS_e,
fpcDwPi_E_KK_e,
fpcDwPi_E_HP_e,
fpcDwPi_E_ZH_e,
fpcDwPi_E_ZM_e,
fpcDwPi_E_PZ_e,
fpcDwPi_E_FB_e,
fpcDwPi_E_MS_e,
fpcDwPi_E_NEST_e,
fpcDwPi_E_NZ_e,
fpcDwPi_E_BA_e,
fpcDwPi_E_BU_e,
fpcDwPi_E_BUG_e,
fpcDwPi_E_BEE_e,
fpcDwPi_E_IS_e,
fpcDwPi_E_KG_e,
fpcDwPi_E_KR_e,
fpcDwPi_E_YC_e,
fpcDwPi_E_YK_e,
fpcDwPi_E_YR_e,
fpcDwPi_E_YG_e,
fpcDwPi_E_SW_e,
fpcDwPi_E_GE_e,
fpcDwPi_Tag_WatchGe_e,
fpcDwPi_E_YM_e,
fpcDwPi_E_YM_TAG_e,
fpcDwPi_E_YMB_e,
fpcDwPi_Tag_FWall_e,
fpcDwPi_Tag_WaterFall_e,
fpcDwPi_E_HZ_e,
fpcDwPi_E_WS_e,
fpcDwPi_E_OC_e,
fpcDwPi_E_DT_e,
fpcDwPi_E_OT_e,
fpcDwPi_E_BG_e,
fpcDwPi_E_OctBg_e,
fpcDwPi_DR_e,
fpcDwPi_L7lowDr_e,
fpcDwPi_E_TT_e,
fpcDwPi_E_WW_e,
fpcDwPi_E_GI_e,
fpcDwPi_B_BH_e,
fpcDwPi_B_BQ_e,
fpcDwPi_B_GM_e,
fpcDwPi_B_GND_e,
fpcDwPi_B_GO_e,
fpcDwPi_B_GOS_e,
fpcDwPi_B_OB_e,
fpcDwPi_B_OH_e,
fpcDwPi_B_OH2_e,
fpcDwPi_B_DS_e,
fpcDwPi_B_DR_e,
fpcDwPi_L7ODR_e,
fpcDwPi_B_YO_e,
fpcDwPi_B_YOI_e,
fpcDwPi_B_TN_e,
fpcDwPi_B_ZANT_e,
fpcDwPi_B_ZANTM_e,
fpcDwPi_B_ZANTZ_e,
fpcDwPi_B_ZANTS_e,
fpcDwPi_B_GG_e,
fpcDwPi_B_DRE_e,
fpcDwPi_B_MGN_e,
fpcDwPi_E_WAP_e,
fpcDwPi_MANT_e,
fpcDwPi_FR_e,
fpcDwPi_ITEM_e,
fpcDwPi_Obj_SmallKey_e,
fpcDwPi_Obj_Kantera_e,
fpcDwPi_Obj_LifeContainer_e,
fpcDwPi_Obj_Shield_e,
fpcDwPi_Demo_Item_e,
fpcDwPi_ShopItem_e,
fpcDwPi_Obj_Drop_e,
fpcDwPi_Obj_Carry_e,
fpcDwPi_Obj_Cdoor_e,
fpcDwPi_Obj_Fchain_e,
fpcDwPi_Obj_Wchain_e,
fpcDwPi_Obj_Crope_e,
fpcDwPi_Obj_Digholl_e,
fpcDwPi_Obj_Digpl_e,
fpcDwPi_Obj_Bombf_e,
fpcDwPi_Obj_BkLeaf_e,
fpcDwPi_Obj_WoodPendulum_e,
fpcDwPi_Tag_Mhint_e,
fpcDwPi_Tag_Mmsg_e,
fpcDwPi_Tag_Mwait_e,
fpcDwPi_Tag_Mstop_e,
fpcDwPi_Tag_Sppath_e,
fpcDwPi_Tag_Stream_e,
fpcDwPi_Tag_Wljump_e,
fpcDwPi_Tag_TWGate_e,
fpcDwPi_Tag_Lv6Gate_e,
fpcDwPi_Tag_Lv7Gate_e,
fpcDwPi_Tag_Lv8Gate_e,
fpcDwPi_Tag_TheBHint_e,
fpcDwPi_Tag_Assist_e,
fpcDwPi_Obj_Eff_e,
fpcDwPi_TBOX_e,
fpcDwPi_TBOX2_e,
fpcDwPi_NBOMB_e,
fpcDwPi_CSTATUE_e,
fpcDwPi_CSTAF_e,
fpcDwPi_TAG_CSW_e,
fpcDwPi_TAG_QS_e,
fpcDwPi_HOZELDA_e,
fpcDwPi_SWHIT0_e,
fpcDwPi_SWC00_e,
fpcDwPi_ALLDIE_e,
fpcDwPi_TAG_CAMERA_e,
fpcDwPi_TAG_CHKPOINT_e,
fpcDwPi_TAG_EVENT_e,
fpcDwPi_TAG_TELOP_e,
fpcDwPi_TAG_HOWL_e,
fpcDwPi_TAG_EVT_e,
fpcDwPi_TAG_MSG_e,
fpcDwPi_TAG_LANTERN_e,
fpcDwPi_TAG_EVTAREA_e,
fpcDwPi_TAG_ALLMATO_e,
fpcDwPi_TAG_EVTMSG_e,
fpcDwPi_TAG_KMSG_e,
fpcDwPi_TAG_PUSH_e,
fpcDwPi_Tag_Mist_e,
fpcDwPi_KNOB20_e,
fpcDwPi_DOOR20_e,
fpcDwPi_DBDOOR_e,
fpcDwPi_DSHUTTER_e,
fpcDwPi_BOSS_DOOR_e,
fpcDwPi_L1BOSS_DOOR_e,
fpcDwPi_L1MBOSS_DOOR_e,
fpcDwPi_L5BOSS_DOOR_e,
fpcDwPi_SPIRAL_DOOR_e,
fpcDwPi_ANDSW_e,
fpcDwPi_ANDSW2_e,
fpcDwPi_MYNA_e,
fpcDwPi_NPC_GND_e,
fpcDwPi_NPC_GRA_e,
fpcDwPi_NPC_GRC_e,
fpcDwPi_NPC_GRD_e,
fpcDwPi_NPC_GRM_e,
fpcDwPi_NPC_GRMC_e,
fpcDwPi_NPC_GRO_e,
fpcDwPi_NPC_GRR_e,
fpcDwPi_NPC_GRS_e,
fpcDwPi_NPC_GRZ_e,
fpcDwPi_NPC_YAMID_e,
fpcDwPi_NPC_YAMIT_e,
fpcDwPi_NPC_YAMIS_e,
fpcDwPi_NPC_BLUENS_e,
fpcDwPi_NPC_KAKASHI_e,
fpcDwPi_NPC_KDK_e,
fpcDwPi_NPC_ARU_e,
fpcDwPi_NPC_BANS_e,
fpcDwPi_NPC_BESU_e,
fpcDwPi_NPC_BOU_e,
fpcDwPi_NPC_BOU_S_e,
fpcDwPi_NPC_CLERKA_e,
fpcDwPi_NPC_CLERKB_e,
fpcDwPi_NPC_CLERKT_e,
fpcDwPi_NPC_WRESTLER_e,
fpcDwPi_NPC_COACH_e,
fpcDwPi_NPC_THEB_e,
fpcDwPi_COACH_FIRE_e,
fpcDwPi_Tag_Arena_e,
fpcDwPi_Tag_Instruction_e,
fpcDwPi_NPC_DOC_e,
fpcDwPi_NPC_GWOLF_e,
fpcDwPi_NPC_LEN_e,
fpcDwPi_NPC_LUD_e,
fpcDwPi_NPC_FAIRY_SEIREI_e,
fpcDwPi_NPC_FAIRY_e,
fpcDwPi_NPC_HANJO_e,
fpcDwPi_NPC_HENNA_e,
fpcDwPi_NPC_HENNA0_e,
fpcDwPi_NPC_HOZ_e,
fpcDwPi_NPC_JAGAR_e,
fpcDwPi_NPC_KKRI_e,
fpcDwPi_NPC_KN_e,
fpcDwPi_KN_BULLET_e,
fpcDwPi_NPC_KNJ_e,
fpcDwPi_NPC_KOLIN_e,
fpcDwPi_NPC_KOLINB_e,
fpcDwPi_NPC_KYURY_e,
fpcDwPi_NPC_MARO_e,
fpcDwPi_NPC_MIDP_e,
fpcDwPi_NPC_MOI_e,
fpcDwPi_NPC_RACA_e,
fpcDwPi_NPC_SARU_e,
fpcDwPi_NPC_SEIB_e,
fpcDwPi_NPC_SEIC_e,
fpcDwPi_NPC_SEID_e,
fpcDwPi_NPC_SEIRA_e,
fpcDwPi_NPC_SERA2_e,
fpcDwPi_NPC_SEIREI_e,
fpcDwPi_NPC_SHAMAN_e,
fpcDwPi_NPC_SMARO_e,
fpcDwPi_NPC_SOLA_e,
fpcDwPi_NPC_TARO_e,
fpcDwPi_NPC_PACHI_BESU_e,
fpcDwPi_NPC_PACHI_TARO_e,
fpcDwPi_NPC_PACHI_MARO_e,
fpcDwPi_TAG_PATI_e,
fpcDwPi_NPC_THE_e,
fpcDwPi_NPC_TKJ_e,
fpcDwPi_NPC_TKS_e,
fpcDwPi_NPC_TKC_e,
fpcDwPi_OBJ_TKS_e,
fpcDwPi_NPC_TOBY_e,
fpcDwPi_NPC_URI_e,
fpcDwPi_NPC_YELIA_e,
fpcDwPi_NPC_YKM_e,
fpcDwPi_NPC_YKW_e,
fpcDwPi_NPC_ZANB_e,
fpcDwPi_NPC_ZANT_e,
fpcDwPi_NPC_ZELDA_e,
fpcDwPi_NPC_ZELR_e,
fpcDwPi_NPC_ZELRO_e,
fpcDwPi_NPC_ZRA_e,
fpcDwPi_OBJ_ZRAFREEZE_e,
fpcDwPi_NPC_ZRC_e,
fpcDwPi_NPC_ZRZ_e,
fpcDwPi_START_AND_GOAL_e,
fpcDwPi_ZRA_MARK_e,
fpcDwPi_MYNA2_e,
fpcDwPi_TAG_MYNA2_e,
fpcDwPi_NPC_CD3_e,
fpcDwPi_Tag_Schedule_e,
fpcDwPi_Tag_Escape_e,
fpcDwPi_NPC_CHAT_e,
fpcDwPi_NPC_SOLDIERa_e,
fpcDwPi_NPC_SOLDIERb_e,
fpcDwPi_NPC_PASSER_e,
fpcDwPi_NPC_PASSER2_e,
fpcDwPi_NPC_POST_e,
fpcDwPi_NPC_POUYA_e,
fpcDwPi_PASSER_MNG_e,
fpcDwPi_NPC_GUARD_e,
fpcDwPi_GUARD_MNG_e,
fpcDwPi_TAG_GUARD_e,
fpcDwPi_NPC_FGUARD_e,
fpcDwPi_FORMATION_MNG_e,
fpcDwPi_NPC_ASH_e,
fpcDwPi_NPC_ASHB_e,
fpcDwPi_NPC_SHAD_e,
fpcDwPi_NPC_RAFREL_e,
fpcDwPi_NPC_MOIR_e,
fpcDwPi_NPC_IMPAL_e,
fpcDwPi_NPC_SHOE_e,
fpcDwPi_NPC_DOORBOY_e,
fpcDwPi_NPC_PRAYER_e,
fpcDwPi_NPC_KASIHANA_e,
fpcDwPi_NPC_KASIKYU_e,
fpcDwPi_NPC_KASIMICH_e,
fpcDwPi_NPC_DRSOL_e,
fpcDwPi_NPC_CHIN_e,
fpcDwPi_NPC_INS_e,
fpcDwPi_NPC_SHOP0_e,
fpcDwPi_NPC_MK_e,
fpcDwPi_NPC_P2_e,
fpcDwPi_NPC_WORM_e,
fpcDwPi_Ykgr_e,
fpcDwPi_TREESH_e,
fpcDwPi_Obj_Pillar_e,
fpcDwPi_Tag_Hinit_e,
fpcDwPi_Tag_Hjump_e,
fpcDwPi_Tag_Hstop_e,
fpcDwPi_Tag_AJnot_e,
fpcDwPi_Tag_Gstart_e,
fpcDwPi_MG_ROD_e,
fpcDwPi_NPC_DF_e,
fpcDwPi_Tag_Attp_e,
fpcDwPi_Obj_Mato_e,
fpcDwPi_Obj_TestCube_e,
fpcDwPi_Obj_Kshutter_e,
fpcDwPi_Obj_Tornado_e,
fpcDwPi_Obj_Tornado2_e,
fpcDwPi_Obj_FirePillar_e,
fpcDwPi_Obj_Cowdoor_e,
fpcDwPi_Obj_Swpropeller_e,
fpcDwPi_Obj_BoomShutter_e,
fpcDwPi_Obj_Hfuta_e,
fpcDwPi_Obj_BkDoor_e,
fpcDwPi_Obj_MGate_e,
fpcDwPi_Obj_Cboard_e,
fpcDwPi_Obj_Stopper_e,
fpcDwPi_Obj_Ikada_e,
fpcDwPi_Obj_Ice_l_e,
fpcDwPi_Obj_Ice_s_e,
fpcDwPi_Obj_E_CREATE_e,
fpcDwPi_Obj_Bhbridge_e,
fpcDwPi_Obj_Kaisou_e,
fpcDwPi_Obj_THASHI_e,
fpcDwPi_Obj_HHASHI_e,
fpcDwPi_Obj_BHASHI_e,
fpcDwPi_Obj_H_Saku_e,
fpcDwPi_OCTHASHI_e,
fpcDwPi_Obj_CRVGATE_e,
fpcDwPi_Obj_CRVFENCE_e,
fpcDwPi_Obj_CRVHAHEN_e,
fpcDwPi_Obj_CRVSTEEL_e,
fpcDwPi_Obj_CRVLH_UP_e,
fpcDwPi_Obj_CRVLH_DW_e,
fpcDwPi_Obj_RIVERROCK_e,
fpcDwPi_Obj_DUST_e,
fpcDwPi_Obj_ITA_e,
fpcDwPi_Obj_Yousei_e,
fpcDwPi_Obj_SM_DOOR_e,
fpcDwPi_Obj_Kabuto_e,
fpcDwPi_Obj_Cho_e,
fpcDwPi_Obj_Kuw_e,
fpcDwPi_Obj_Nan_e,
fpcDwPi_Obj_Dan_e,
fpcDwPi_Obj_Kam_e,
fpcDwPi_Obj_Ten_e,
fpcDwPi_Obj_Ari_e,
fpcDwPi_Obj_Kag_e,
fpcDwPi_Obj_Batta_e,
fpcDwPi_Obj_Tombo_e,
fpcDwPi_Obj_Kat_e,
fpcDwPi_GRDWATER_e,
fpcDwPi_Obj_RotBridge_e,
fpcDwPi_Obj_Window_e,
fpcDwPi_Obj_MagLift_e,
fpcDwPi_Obj_MagLiftRot_e,
fpcDwPi_Obj_Lv1Cdl00_e,
fpcDwPi_Obj_Lv1Cdl01_e,
fpcDwPi_Obj_TvCdlst_e,
fpcDwPi_Obj_WdStick_e,
fpcDwPi_Obj_MetalBox_e,
fpcDwPi_Obj_BBox_e,
fpcDwPi_Obj_StairBlock_e,
fpcDwPi_Obj_HsTarget_e,
fpcDwPi_Tag_KtOnFire_e,
fpcDwPi_Obj_HeavySw_e,
fpcDwPi_Obj_GoGate_e,
fpcDwPi_Obj_TaFence_e,
fpcDwPi_Obj_FireWood_e,
fpcDwPi_Obj_FireWood2_e,
fpcDwPi_Obj_Saidan_e,
fpcDwPi_Obj_GpTaru_e,
fpcDwPi_Obj_OnsenTaru_e,
fpcDwPi_Obj_Stone_e,
fpcDwPi_Obj_SpinLift_e,
fpcDwPi_Obj_BmWindow_e,
fpcDwPi_Obj_RfHole_e,
fpcDwPi_Obj_SyRock_e,
fpcDwPi_Obj_SwHang_e,
fpcDwPi_Obj_KiPot_e,
fpcDwPi_Obj_BsGate_e,
fpcDwPi_Obj_GOMIKABE_e,
fpcDwPi_Obj_WaterPillar_e,
fpcDwPi_Obj_AmiShutter_e,
fpcDwPi_Obj_WtGate_e,
fpcDwPi_Obj_Lv2Candle_e,
fpcDwPi_Obj_TogeTrap_e,
fpcDwPi_Obj_RotTrap_e,
fpcDwPi_TBOX_SW_e,
fpcDwPi_Obj_WoodenSword_e,
fpcDwPi_Obj_Lv3R10Saka_e,
fpcDwPi_Obj_FirePillar2_e,
fpcDwPi_Obj_KakarikoBrg_e,
fpcDwPi_Obj_OrdinBrg_e,
fpcDwPi_Obj_BurnBox_e,
fpcDwPi_OBJ_IHASI_e,
fpcDwPi_Obj_StoneMark_e,
fpcDwPi_Obj_IceBlock_e,
fpcDwPi_Obj_IceWall_e,
fpcDwPi_Obj_Lv5SwIce_e,
fpcDwPi_Obj_Lv5FBoard_e,
fpcDwPi_Obj_TwGate_e,
fpcDwPi_Tag_Lv4Candle_e,
fpcDwPi_Tag_Lv4CandleDm_e,
fpcDwPi_Obj_Elevator_e,
fpcDwPi_Obj_WaterFall_e,
fpcDwPi_Obj_ZoraCloth_e,
fpcDwPi_Obj_Turara_e,
fpcDwPi_Obj_TobyHouse_e,
fpcDwPi_Tag_LightBall_e,
fpcDwPi_Obj_KKanban_e,
fpcDwPi_SwLBall_e,
fpcDwPi_SwBall_e,
fpcDwPi_Obj_Lv4DigSand_e,
fpcDwPi_Obj_FallObj_e,
fpcDwPi_Obj_SmgDoor_e,
fpcDwPi_Obj_SwLight_e,
fpcDwPi_Obj_WaterEff_e,
fpcDwPi_Tag_RiverBack_e,
fpcDwPi_Tag_KagoFall_e,
fpcDwPi_Tag_Lv2PrChk_e,
fpcDwPi_Obj_SwSpinner_e,
fpcDwPi_Obj_TDoor_e,
fpcDwPi_Obj_Lv4Gear_e,
fpcDwPi_Obj_MasterSword_e,
fpcDwPi_Obj_WoodStatue_e,
fpcDwPi_Obj_Stopper2_e,
fpcDwPi_Obj_Fan_e,
fpcDwPi_Obj_Lv7Bridge_e,
fpcDwPi_Obj_IceLeaf_e,
fpcDwPi_Obj_Gake_e,
fpcDwPi_Obj_TMoon_e,
fpcDwPi_Obj_GanonWall_e,
fpcDwPi_Obj_SwBallA_e,
fpcDwPi_Obj_SwBallB_e,
fpcDwPi_Obj_Lv4Sand_e,
fpcDwPi_Obj_Lv4RailWall_e,
fpcDwPi_Tag_SetBall_e,
fpcDwPi_SwTime_e,
fpcDwPi_Obj_PushDoor_e,
fpcDwPi_PushDoor_e,
fpcDwPi_Obj_Crystal_e,
fpcDwPi_Obj_GanonWall2_e,
fpcDwPi_Obj_Lv4Bridge_e,
fpcDwPi_Obj_SwBallC_e,
fpcDwPi_SCENE_EXIT2_e,
fpcDwPi_Obj_Lv4Floor_e,
fpcDwPi_Tag_AttackItem_e,
fpcDwPi_Obj_Sword_e,
fpcDwPi_Tag_Spring_e,
fpcDwPi_Tag_Statue_e,
fpcDwPi_Obj_MHole_e,
fpcDwPi_Tag_Magne_e,
fpcDwPi_Tag_ChgRestart_e,
fpcDwPi_Tag_Restart_e,
fpcDwPi_Obj_VolcanicBall_e,
fpcDwPi_Obj_VolcanicBomb_e,
fpcDwPi_Obj_VolcGnd_e,
fpcDwPi_Obj_Geyser_e,
fpcDwPi_Obj_ChainBlock_e,
fpcDwPi_Obj_ChainWall_e,
fpcDwPi_Obj_KkrGate_e,
fpcDwPi_Obj_RiderGate_e,
fpcDwPi_OBJ_YSTONE_e,
fpcDwPi_Obj_Onsen_e,
fpcDwPi_Obj_Chest_e,
fpcDwPi_Obj_Bemos_e,
fpcDwPi_Tag_Spinner_e,
fpcDwPi_Obj_WellCover_e,
fpcDwPi_Obj_GraveStone_e,
fpcDwPi_Obj_ZraRock_e,
fpcDwPi_Obj_GraRock_e,
fpcDwPi_Obj_GrzRock_e,
fpcDwPi_GRA_WALL_e,
fpcDwPi_OBJ_ONSEN_FIRE_e,
fpcDwPi_Obj_RotStair_e,
fpcDwPi_Obj_MagneArm_e,
fpcDwPi_Obj_SwChain_e,
fpcDwPi_Obj_Lv3Water_e,
fpcDwPi_Obj_Lv3Water2_e,
fpcDwPi_OBJ_LV3WATERB_e,
fpcDwPi_Obj_SwallShutter_e,
fpcDwPi_Obj_Lv3Candle_e,
fpcDwPi_Obj_Lv6TogeRoll_e,
fpcDwPi_Obj_Lv6TogeTrap_e,
fpcDwPi_Obj_Lv6Tenbin_e,
fpcDwPi_Obj_Lv6SwGate_e,
fpcDwPi_Obj_Lv6Lblock_e,
fpcDwPi_Obj_Lv6ChgGate_e,
fpcDwPi_Obj_Lv6FuriTrap_e,
fpcDwPi_Obj_Lv6SzGate_e,
fpcDwPi_Obj_DamCps_e,
fpcDwPi_Obj_Lv6bemos_e,
fpcDwPi_Obj_Lv6bemos2_e,
fpcDwPi_Obj_Smoke_e,
fpcDwPi_Obj_BarDesk_e,
fpcDwPi_Obj_DigSnow_e,
fpcDwPi_Obj_Ytaihou_e,
fpcDwPi_Obj_Lv4EdShutter_e,
fpcDwPi_Obj_Lv4Gate_e,
fpcDwPi_Obj_Lv4PoGate_e,
fpcDwPi_Obj_Lv4SlideWall_e,
fpcDwPi_Obj_Lv4HsTarget_e,
fpcDwPi_Obj_Lv7PropY_e,
fpcDwPi_Obj_Lv7BsGate_e,
fpcDwPi_Obj_Lv8OptiLift_e,
fpcDwPi_Obj_Lv8KekkaiTrap_e,
fpcDwPi_Obj_Lv8Lift_e,
fpcDwPi_Obj_Lv8UdFloor_e,
fpcDwPi_Obj_Lv9SwShutter_e,
fpcDwPi_Obj_poFire_e,
fpcDwPi_Tag_poFire_e,
fpcDwPi_Obj_poCandle_e,
fpcDwPi_Obj_glowSphere_e,
fpcDwPi_Obj_zrTurara_e,
fpcDwPi_Obj_zrTuraraRc_e,
fpcDwPi_Obj_TakaraDai_e,
fpcDwPi_Obj_Avalanche_e,
fpcDwPi_Tag_SnowEff_e,
fpcDwPi_Tag_CstaSw_e,
fpcDwPi_Tag_Lv6CstaSw_e,
fpcDwPi_Obj_awaPlar_e,
fpcDwPi_Obj_poTbox_e,
fpcDwPi_Obj_TimeFire_e,
fpcDwPi_Obj_KWheel00_e,
fpcDwPi_Obj_KWheel01_e,
fpcDwPi_Obj_Ychndlr_e,
fpcDwPi_Obj_PRElvtr_e,
fpcDwPi_Obj_MHasu_e,
fpcDwPi_Obj_YIblltray_e,
fpcDwPi_Obj_Lv6EGate_e,
fpcDwPi_Obj_Lv6ElevtA_e,
fpcDwPi_Obj_PDtile_e,
fpcDwPi_Obj_PDwall_e,
fpcDwPi_Obj_Lv4PRwall_e,
fpcDwPi_Obj_KLift00_e,
fpcDwPi_Obj_Lv4Chan_e,
fpcDwPi_Obj_HBombkoya_e,
fpcDwPi_Obj_SZbridge_e,
fpcDwPi_Obj_KJgjs_e,
fpcDwPi_Obj_MirrorScrew_e,
fpcDwPi_Obj_MirrorSand_e,
fpcDwPi_Obj_MirrorTable_e,
fpcDwPi_Obj_MirrorChain_e,
fpcDwPi_Obj_Mirror6Pole_e,
fpcDwPi_Obj_Table_e,
fpcDwPi_Obj_CatDoor_e,
fpcDwPi_DEMO00_e,
fpcDwPi_BOOMERANG_e,
fpcDwPi_SPINNER_e,
fpcDwPi_CROD_e,
fpcDwPi_ENVSE_e,
fpcDwPi_HITOBJ_e,
fpcDwPi_EP_e,
fpcDwPi_COW_e,
fpcDwPi_KAGO_e,
fpcDwPi_PERU_e,
fpcDwPi_NI_e,
fpcDwPi_NPC_TKJ2_e,
fpcDwPi_SQ_e,
fpcDwPi_NPC_SQ_e,
fpcDwPi_DO_e,
fpcDwPi_NPC_NE_e,
fpcDwPi_NPC_KS_e,
fpcDwPi_NPC_LF_e,
fpcDwPi_NPC_TK_e,
fpcDwPi_NPC_INKO_e,
fpcDwPi_OBJ_HB_e,
fpcDwPi_OBJ_KI_e,
fpcDwPi_OBJ_KITA_e,
fpcDwPi_OBJ_LP_e,
fpcDwPi_OBJ_TATIGI_e,
fpcDwPi_OBJ_ROCK_e,
fpcDwPi_OBJ_RW_e,
fpcDwPi_OBJ_FOOD_e,
fpcDwPi_OBJ_PLEAF_e,
fpcDwPi_OBJ_KBACKET_e,
fpcDwPi_OBJ_YBAG_e,
fpcDwPi_OBJ_PUMPKIN_e,
fpcDwPi_OBJ_KAGO_e,
fpcDwPi_BD_e,
fpcDwPi_NPC_FISH_e,
fpcDwPi_MG_FISH_e,
fpcDwPi_FSHOP_e,
fpcDwPi_NPC_DU_e,
fpcDwPi_NPC_TR_e,
fpcDwPi_CANOE_e,
fpcDwPi_DISAPPEAR_e,
fpcDwPi_WarpBug_e,
fpcDwPi_PPolamp_e,
fpcDwPi_BkyRock_e,
fpcDwPi_Obj_InoBone_e,
fpcDwPi_Obj_BossWarp_e,
fpcDwPi_Tag_RetRoom_e,
fpcDwPi_Obj_WindStone_e,
fpcDwPi_Tag_WaraHowl_e,
fpcDwPi_Obj_SCannon_e,
fpcDwPi_Obj_SmWStone_e,
fpcDwPi_Obj_SCannonCrs_e,
fpcDwPi_Obj_Prop_e,
fpcDwPi_Obj_SnowSoup_e,
fpcDwPi_Obj_Nagaisu_e,
fpcDwPi_Obj_RCircle_e,
fpcDwPi_Obj_Chandelier_e,
fpcDwPi_Obj_Picture_e,
fpcDwPi_Tag_SmkEmt_e,
fpcDwPi_Obj_HFtr_e,
fpcDwPi_Obj_HBarrel_e,
fpcDwPi_Obj_SCannonTen_e,
fpcDwPi_Obj_Hata_e,
fpcDwPi_Tag_RmbitSw_e,
fpcDwPi_Obj_ToaruMaki_e,
fpcDwPi_ARROW_e,
fpcDwPi_BULLET_e,
fpcDwPi_BG_OBJ_e,
fpcDwPi_BG_e,
fpcDwPi_SET_BG_OBJ_e,
fpcDwPi_E_DK_e,
fpcDwPi_E_VT_e,
fpcDwPi_MIRROR_e,
fpcDwPi_PATH_LINE_e,
fpcDwPi_WPILLAR_e,
fpcDwPi_WMARK_e,
fpcDwPi_SCENE_EXIT_e,
fpcDwPi_NO_CHG_ROOM_e,
fpcDwPi_SUSPEND_e,
fpcDwPi_COACH2D_e,
fpcDwPi_BALLOON2D_e,
fpcDwPi_TALK_e,
fpcDwPi_MENUWINDOW_e,
fpcDwPi_TIMER_e,
fpcDwPi_METER2_e,
fpcDwPi_MSG_OBJECT_e,
fpcDwPi_GAMEOVER_e,
fpcDwPi_SKIP2D_e,
fpcDwPi_OVERLAP0_e,
fpcDwPi_OVERLAP1_e,
fpcDwPi_OVERLAP2_e,
fpcDwPi_OVERLAP3_e,
fpcDwPi_OVERLAP6_e,
fpcDwPi_OVERLAP7_e,
fpcDwPi_OVERLAP8_e,
fpcDwPi_OVERLAP9_e,
fpcDwPi_OVERLAP10_e,
fpcDwPi_OVERLAP11_e,
};
#endif
include/f_pc/f_pc_leaf.h
+1 -1
View File
@@ -6,7 +6,7 @@
#include "f_pc/f_pc_draw_priority.h"
#include "f_pc/f_pc_method.h"
#include "f_pc/f_pc_profile.h"
#include "d/d_procname.h"
#include "f_pc/f_pc_name.h"
typedef struct leafdraw_method_class {
/* 0x00 */ process_method_class base;
include/f_pc/f_pc_name.h
+834 -263
View File
File diff suppressed because it is too large Load Diff
include/m_Do/m_Do_ext.h
+10
View File
@@ -550,6 +550,16 @@ public:
int init(u16, u16, int);
void update(int, f32, GXColor&, u16, dKy_tevstr_c*);
void update(int, GXColor&, dKy_tevstr_c*);
// some calls to these functions define i_color inline which is illegal in C++ for a non-const
// reference parameter - we add these overloads to enable standard compiler compatibility
#if !__MWERKS__
void update(int param_0, f32 param_1, const GXColor& i_color, u16 param_3, dKy_tevstr_c* i_tevStr) {
update(param_0, param_1, const_cast<GXColor&>(i_color), param_3, i_tevStr);
}
void update(int param_0, const GXColor& i_color, dKy_tevstr_c* i_tevStr) {
update(param_0, const_cast<GXColor&>(i_color), i_tevStr);
}
#endif
virtual int getMaterialID() { return 0; }
virtual void setMaterial();
src/Z2AudioLib/Z2Creature.cpp
+29 -15
View File
@@ -158,11 +158,12 @@ void Z2Creature::stopAnime() {
}
Z2SoundHandlePool* Z2Creature::startCreatureSound(JAISoundID soundID, u32 mapinfo, s8 reverb) {
Z2SoundHandlePool* handle;
switch (soundID) {
case Z2SE_KOSARU_V_KAGO_WAIT:
return mSoundObjSimple1.startSound(soundID, mapinfo, 0);
default:
Z2SoundHandlePool* handle = mSoundObjAnime.startSound(soundID, mapinfo, reverb);
handle = mSoundObjAnime.startSound(soundID, mapinfo, reverb);
if (handle != NULL && *handle) {
switch (soundID) {
case Z2SE_FAIRY_S_FLY:
@@ -181,12 +182,13 @@ Z2SoundHandlePool* Z2Creature::startCreatureSound(JAISoundID soundID, u32 mapinf
Z2SoundHandlePool* Z2Creature::startCreatureSoundLevel(JAISoundID soundID, u32 mapinfo, s8 reverb) {
DUSK_AUDIO_SKIP(NULL);
Z2SoundHandlePool* handle;
switch (soundID) {
case Z2SE_FAIRY_S_LV:
Z2GetAudioMgr()->seStartLevel(soundID, mpPos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
return NULL;
default:
Z2SoundHandlePool* handle = mSoundObjAnime.startLevelSound(soundID, mapinfo, reverb);
handle = mSoundObjAnime.startLevelSound(soundID, mapinfo, reverb);
if (handle != NULL && *handle) {
if (soundID == Z2SE_YM_SNOBO_RIDE || soundID == Z2SE_YW_SNOBO_RIDE) {
f32 volume = 0.0f;
@@ -252,7 +254,7 @@ Z2SoundHandlePool* Z2Creature::startCreatureVoiceLevel(JAISoundID soundID, s8 re
}
}
return mSoundObjSimple1.startLevelSound((u32)soundID, 0, reverb);
return mSoundObjSimple1.startLevelSound(soundID, 0, reverb);
}
Z2SoundHandlePool* Z2Creature::startCreatureExtraSound(JAISoundID soundID, u32 mapinfo, s8 reverb) {
@@ -300,10 +302,10 @@ void Z2CreatureCitizen::setMdlType(s8 param_0, bool param_1, bool param_2) {
if (param_0 == 0) {
field_0xa1 = data_80451358;
data_80451358 = !data_80451358 ? 1 : 0;
data_80451358 = !data_80451358 ? (s8)1 : (s8)0;
} else if (param_0 == 1) {
field_0xa1 = data_80451359;
data_80451359 = !data_80451359 ? 1 : 0;
data_80451359 = !data_80451359 ? (s8)1 : (s8)0;
}
}
@@ -457,8 +459,9 @@ Z2SoundHandlePool* Z2CreatureEnemy::startCreatureSoundLevel(JAISoundID soundID,
switch (mEnemyID) {
case Z2_ENEMY_FZ:
f32 volume; // force extra b instruction on debug by declaring this in the switch scope
if (handle != NULL && *handle && soundID == Z2SE_EN_FZ_MOVE) {
f32 volume = Z2Calc::getParamByExp(mapinfo, 1.0f, 50.0f, 0.4f, 0.1f, 1.1f,
volume = Z2Calc::getParamByExp(mapinfo, 1.0f, 50.0f, 0.4f, 0.1f, 1.1f,
Z2Calc::CURVE_POSITIVE);
(*handle)->getAuxiliary().moveVolume(volume, 0);
}
@@ -611,7 +614,6 @@ Z2SoundHandlePool* Z2CreatureEnemy::startCreatureExtraSoundLevel(JAISoundID soun
}
Z2SoundHandlePool* Z2CreatureEnemy::startCollisionSE(u32 hitID, u32 mapinfo) {
u8 var1;
switch (mEnemyID) {
case Z2_ENEMY_WS:
field_0xa3 = 1;
@@ -637,14 +639,15 @@ Z2SoundHandlePool* Z2CreatureEnemy::startCollisionSE(u32 hitID, u32 mapinfo) {
Z2GetSeqMgr()->onEnemyDamage();
break;
case 0x20:
case 0x24:
case 0x24: {
field_0xa3 = 1;
var1 = Z2Param::ENDING_BLOW_VOL_LOWER_TIME;
u8 var1 = Z2Param::ENDING_BLOW_VOL_LOWER_TIME;
if (hitID == Z2SE_HIT_SWORD || hitID == Z2SE_HIT_SWORD_STAB || hitID == Z2SE_HIT_WOLFBITE) {
var1 = 20;
}
Z2GetSeqMgr()->setBattleLastHit(var1);
break;
}
case 0x21:
if (mEnemyID == Z2_ENEMY_HB) {
field_0xa3 = 1;
@@ -727,7 +730,7 @@ void Z2SoundObjBeeGroup::playBeeGroupSound(JAISoundID soundID, u8 param_1) {
break;
}
Z2SoundHandlePool* handle1 = startLevelSound((u32)soundID, 0, -1);
Z2SoundHandlePool* handle1 = startLevelSound(soundID, 0, -1);
Z2SoundHandlePool* handle2 = startLevelSound(sound_id2, 0, -1);
if (handle1 != NULL && *handle1 != false) {
@@ -794,18 +797,27 @@ Z2SoundHandlePool* Z2CreatureFM::startChainSound(JAISoundID soundID, u8 param_1,
Z2SoundHandlePool* Z2CreatureFM::startChainSoundLevel(JAISoundID soundID, u8 param_1, f32 param_2,
u32 mapinfo, s8 reverb) {
Z2SoundHandlePool* handle;
f32 pitch;
f32 var_f30;
f32 var_f28;
f32 var_f27 = 0.7f;
f32 sp20 = 7.0f;
f32 sp1C = 5.0f;
var_f30 = 0.0f;
Z2SoundHandlePool* handle = NULL;
switch (param_1) {
case 0:
handle = field_0xa4.startLevelSound(soundID, mapinfo, reverb);
if (handle != NULL && *handle) {
if (param_2 > 30.0f) {
var_f28 = 1.0f;
pitch = 1.06f;
} else {
var_f28 = (param_2 * 7.0f) / 100.0f;
pitch = (param_2 * 5.0f) / 100.0f;
}
pitch += Z2Calc::getRandom(0.03f, 1.0f, 0.5f) + 0.7f;
var_f30 = Z2Calc::getRandom(0.03f, 1.0f, 0.5f);
pitch += var_f27 + var_f30;
if (pitch > 1.06f) {
pitch = 1.06f;
}
@@ -817,11 +829,14 @@ Z2SoundHandlePool* Z2CreatureFM::startChainSoundLevel(JAISoundID soundID, u8 par
handle = field_0xa4.startLevelSound(soundID, mapinfo, reverb);
if (handle != NULL && *handle) {
if (param_2 > 30.0f) {
var_f28 = 1.0f;
pitch = 1.06f;
} else {
var_f28 = (param_2 * 7.0f) / 100.0f;
pitch = (param_2 * 5.0f) / 100.0f;
}
pitch += Z2Calc::getRandom(0.03f, 1.0f, 0.5f) + 0.5f;
var_f30 = Z2Calc::getRandom(0.03f, 1.0f, 0.5f);
pitch += var_f27 - 0.2f + var_f30;
if (pitch > 1.06f) {
pitch = 1.06f;
}
@@ -833,9 +848,8 @@ Z2SoundHandlePool* Z2CreatureFM::startChainSoundLevel(JAISoundID soundID, u8 par
return field_0xe4.startLevelSound(soundID, mapinfo, reverb);
case 3:
return field_0x104.startLevelSound(soundID, mapinfo, reverb);
default:
return NULL;
}
return NULL;
}
void Z2CreatureGob::init(Vec* animePosPtr, Vec* simplePosPtr, Vec* simple2PosPtr, u8 animeHandleNum, u8 simpleHandleNum,
src/c/c_damagereaction.cpp
+3 -3
View File
@@ -49,9 +49,9 @@ BOOL cDmrNowMidnaTalk() {
if (dComIfGp_event_runCheck()) {
fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_getTalkEventPartner(daPy_getLinkPlayerActorClass());
if (actor) {
if (fopAcM_GetName(actor) == PROC_MIDNA || fopAcM_GetName(actor) == PROC_Tag_Mhint ||
fopAcM_GetName(actor) == PROC_Tag_Mstop || fopAcM_GetName(actor) == PROC_Tag_Hstop ||
fopAcM_GetName(actor) == PROC_Tag_Mwait || fopAcM_GetName(actor) == PROC_Tag_Wljump) {
if (fopAcM_GetName(actor) == fpcNm_MIDNA_e || fopAcM_GetName(actor) == fpcNm_Tag_Mhint_e ||
fopAcM_GetName(actor) == fpcNm_Tag_Mstop_e || fopAcM_GetName(actor) == fpcNm_Tag_Hstop_e ||
fopAcM_GetName(actor) == fpcNm_Tag_Mwait_e || fopAcM_GetName(actor) == fpcNm_Tag_Wljump_e) {
return 1;
}
}
src/c/c_dylink.cpp
+761 -762
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_L7demo_dr.cpp
+16 -16
View File
@@ -192,7 +192,7 @@ void daDr_c::bridge_destroy() {
camera->mCamera.Set(mDemoCamCenter, mDemoCamEye);
} else if (156.0f == mpModelMorf->getFrame()) {
cXyz sp5C;
daObjLv7Brg_c* brg = (daObjLv7Brg_c*)fopAcM_SearchByName(PROC_Obj_Lv7Bridge);
daObjLv7Brg_c* brg = (daObjLv7Brg_c*)fopAcM_SearchByName(fpcNm_Obj_Lv7Bridge_e);
if (brg != NULL) {
brg->setDestroyAnmA();
}
@@ -221,7 +221,7 @@ void daDr_c::bridge_destroy2() {
daPy_getPlayerActorClass();
if (field_0x654 == 0) {
daObjLv7Brg_c* brg = (daObjLv7Brg_c*)fopAcM_SearchByName(PROC_Obj_Lv7Bridge);
daObjLv7Brg_c* brg = (daObjLv7Brg_c*)fopAcM_SearchByName(fpcNm_Obj_Lv7Bridge_e);
if (brg != NULL) {
brg->setDestroyAnmB();
}
@@ -408,18 +408,18 @@ static actor_method_class l_daDr_Method = {
};
actor_process_profile_definition g_profile_DR = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_DR, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daDr_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
206, // mPriority
&l_daDr_Method, // sub_method
0x00040000, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_DR_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daDr_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_DR_e,
/* Actor SubMtd */ &l_daDr_Method,
/* Status */ fopAcStts_UNK_0x40000_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_L7low_dr.cpp
+14 -14
View File
@@ -198,18 +198,18 @@ static actor_method_class l_daL7lowDr_Method = {
};
actor_process_profile_definition g_profile_L7lowDr = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_L7lowDr, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daL7lowDr_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
207, // mPriority
&l_daL7lowDr_Method, // sub_method
0x00040000, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_L7lowDr_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daL7lowDr_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_L7lowDr_e,
/* Actor SubMtd */ &l_daL7lowDr_Method,
/* Status */ fopAcStts_UNK_0x40000_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_L7op_demo_dr.cpp
+29 -25
View File
@@ -247,9 +247,10 @@ void daL7ODR_c::setZoomOutCamPos(cXyz& param_0, cXyz& param_1, f32 param_2) {
void daL7ODR_c::dr_wait() {
if (field_0x88c == 0) {
cXyz sp8(0.0f, 0.0f, 0.0f);
s16 angle = 0x400;
field_0x8b4 = 1;
current.pos.set(5000.0f * cM_ssin(0x400), 7000.0f, 5000.0f * cM_scos(0x400));
current.pos.set(5000.0f * cM_ssin(angle), 7000.0f, 5000.0f * cM_scos(angle));
current.angle.y = cLib_targetAngleY(&current.pos, &sp8) + 0x4000;
mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_dr", 0x2F), 2, 3.0f, 1.0f, 0.0f, -1.0f);
@@ -260,6 +261,8 @@ void daL7ODR_c::dr_wait() {
speedF = 0.0f;
gravity = 0.0f;
field_0x88c++;
} else if (field_0x88c == -1) {
// empty block
}
}
@@ -272,7 +275,7 @@ void daL7ODR_c::dr_fly() {
if (field_0x88c == 0) {
field_0x8b4 = 0;
mpModelMorf->setPlaySpeed(1.0f);
field_0x898 = 600.0f;
mDemoCamCenter = player->current.pos;
mDemoCamCenter.y += 160.0f;
@@ -340,10 +343,12 @@ void daL7ODR_c::dr_fly() {
mSound.startCreatureSound(Z2SE_EN_DR_WING, 0, -1);
}
if (field_0x898 == temp_f30) {
field_0x89c = 140.0f;
field_0x88c++;
if (field_0x898 != temp_f30) {
return;
}
field_0x89c = 140.0f;
field_0x88c++;
} else if (field_0x88c == 3) {
cXyz sp258;
cLib_chaseAngleS(&current.angle.x, 0x800, 0x10);
@@ -626,7 +631,7 @@ void daL7ODR_c::dr_fly() {
cLib_chaseF(&speedF, 0.0f, field_0x89c);
speed.y = -speedF * cM_ssin(current.angle.x);
mAcch.CrrPos(dComIfG_Bgsp());
s16 sp8 = current.angle.y;
current.angle.y = -0x8000;
fopAcM_posMoveF(this, NULL);
@@ -735,7 +740,7 @@ static int daL7ODR_IsDelete(daL7ODR_c* i_this) {
}
int daL7ODR_c::_delete() {
fopAcM_GetID(this);
fopAcM_RegisterDeleteID(this, "L7ODR");
dComIfG_resDelete(&mPhase, "B_dr");
if (heap != NULL) {
@@ -804,14 +809,13 @@ int daL7ODR_c::create() {
mSound.init(&current.pos, &eyePos, 3, 1);
health = 1;
field_0x560 = 1;
field_0x560 = health = 1;
scale.setall(1.0f);
attention_info.distances[fopAc_attn_BATTLE_e] = 0;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
fopAcM_SetGroup(this, 0);
fopAcM_OffStatus(this, 0);
@@ -840,18 +844,18 @@ static actor_method_class l_daL7ODR_Method = {
};
actor_process_profile_definition g_profile_L7ODR = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_L7ODR, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daL7ODR_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
222, // mPriority
&l_daL7ODR_Method, // sub_method
0x00040100, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_L7ODR_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daL7ODR_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_L7ODR_e,
/* Actor SubMtd */ &l_daL7ODR_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_alink.cpp
+241 -241
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_alink_boom.inc
+8 -8
View File
@@ -73,7 +73,7 @@ fopAc_ac_c* daAlink_c::getBoomerangActor() {
return mThrowBoomerangAcKeep.getActor();
}
if (mEquipItem == fpcNm_ITEM_BOOMERANG) {
if (mEquipItem == dItemNo_BOOMERANG_e) {
return mItemAcKeep.getActor();
}
@@ -130,7 +130,7 @@ BOOL daAlink_c::checkBoomerangAnime() const {
}
BOOL daAlink_c::checkBoomerangThrowAnime() const {
return (mEquipItem == fpcNm_ITEM_BOOMERANG || checkNoResetFlg1(FLG1_UNK_2) || mEquipItem == 0x102) &&
return (mEquipItem == dItemNo_BOOMERANG_e || checkNoResetFlg1(FLG1_UNK_2) || mEquipItem == 0x102) &&
checkUpperAnime(dRes_ID_ALANM_BCK_BOOMTHROW_e);
}
@@ -163,7 +163,7 @@ void daAlink_c::setBoomerangCatchAnime() {
setFacePriBck(dRes_ID_ALANM_BCK_FAT_e);
field_0x2f97 = 254;
if (mEquipItem != fpcNm_ITEM_COPY_ROD) {
if (mEquipItem != dItemNo_COPY_ROD_e) {
seStartOnlyReverb(JA_SE_LK_BOOM_CATCH);
}
}
@@ -173,7 +173,7 @@ void daAlink_c::throwBoomerang() {
onNoResetFlg1(FLG1_UNK_2);
//! @bug `item` pointer is being accessed without checking if NULL first
BOOL boomerang_item = fopAcM_GetName(item) == PROC_BOOMERANG;
BOOL boomerang_item = fopAcM_GetName(item) == fpcNm_BOOMERANG_e;
if (boomerang_item) {
item->setThrow();
item->current.angle.y = shape_angle.y + mBodyAngle.y;
@@ -197,13 +197,13 @@ void daAlink_c::throwBoomerang() {
fopAcM_cancelCarryNow(item);
item = NULL;
mEquipItem = fpcNm_ITEM_NONE;
mEquipItem = dItemNo_NONE_e;
field_0x2f94 = 0xFF;
field_0x2f96 = 0xFE;
}
mItemAcKeep.clearData();
mEquipItem = fpcNm_ITEM_NONE;
mEquipItem = dItemNo_NONE_e;
field_0x2f94 = 0xFF;
field_0x2f96 = 0xFE;
@@ -235,7 +235,7 @@ void daAlink_c::throwBoomerang() {
int daAlink_c::returnBoomerang(int param_0) {
dComIfGp_clearPlayerStatus0(0, 0x400000);
if (mEquipItem == fpcNm_ITEM_NONE
if (mEquipItem == dItemNo_NONE_e
&& !checkMagneBootsOn()
&& mItemAcKeep.getActor() == NULL
#if !PLATFORM_SHIELD
@@ -252,7 +252,7 @@ int daAlink_c::returnBoomerang(int param_0) {
mItemAcKeep = mThrowBoomerangAcKeep;
mThrowBoomerangAcKeep.clearData();
mEquipItem = fpcNm_ITEM_BOOMERANG;
mEquipItem = dItemNo_BOOMERANG_e;
field_0x2f94 = 2;
onNoResetFlg0(FLG0_UNK_20);
src/d/actor/d_a_alink_bottle.inc
+75 -75
View File
@@ -63,21 +63,21 @@ void daAlink_c::setBottleModel(u16 i_itemNo) {
field_0x0718 = loadAramItemBtk(dRes_ID_ALANM_BTK_BOTTLE_YURE_e, mHeldItemModel);
if (i_itemNo == fpcNm_ITEM_FAIRY) {
if (i_itemNo == dItemNo_FAIRY_e) {
J3DAnmTransform* bck = (J3DAnmTransform*)loadAram(dRes_ID_ALANM_BCK_O_GD_NV_e, 0xC00);
mpHookTipModel = initModel(loadAramBmd(dRes_ID_ALANM_BMD_O_GD_NV_e, 0x1400), 0);
if (!mHookTipBck.init(bck, FALSE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) {
JUT_ASSERT(142, FALSE);
}
mHookTipBck.entry(mpHookTipModel->getModelData(), 0.0f);
} else if (i_itemNo == fpcNm_ITEM_WORM) {
} else if (i_itemNo == dItemNo_WORM_e) {
J3DAnmTransform* bck = (J3DAnmTransform*)loadAram(dRes_ID_ALANM_BCK_O_GD_WORM_e, 0xC00);
mpHookTipModel = initModel(loadAramBmd(dRes_ID_ALANM_BMD_O_GD_WORM_e, 0x2400), 0);
if (!mHookTipBck.init(bck, FALSE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) {
JUT_ASSERT(151, FALSE);
}
mHookTipBck.entry(mpHookTipModel->getModelData(), 0.0f);
} else if (i_itemNo == fpcNm_ITEM_BEE_CHILD) {
} else if (i_itemNo == dItemNo_BEE_CHILD_e) {
mpHookTipModel = initModel(loadAramBmd(dRes_ID_ALANM_BMD_O_GD_HK_e, 0x1000), 0);
}
@@ -96,40 +96,40 @@ void daAlink_c::setBottleModel(u16 i_itemNo) {
mItemMode = 0;
}
if ((checkDrinkBottleItem(i_itemNo) && i_itemNo != fpcNm_ITEM_BEE_CHILD) || checkOilBottleItem(i_itemNo)) {
if ((checkDrinkBottleItem(i_itemNo) && i_itemNo != dItemNo_BEE_CHILD_e) || checkOilBottleItem(i_itemNo)) {
item_model_data->getMaterialNodePointer(0)->getShape()->hide();
if (i_itemNo == fpcNm_ITEM_RED_BOTTLE || i_itemNo == fpcNm_ITEM_CHUCHU_RED || i_itemNo == fpcNm_ITEM_RED_BOTTLE_2) {
if (i_itemNo == dItemNo_RED_BOTTLE_e || i_itemNo == dItemNo_CHUCHU_RED_e || i_itemNo == dItemNo_RED_BOTTLE_2_e) {
field_0x0724->setFrame(0.0f);
} else if (i_itemNo == fpcNm_ITEM_GREEN_BOTTLE || i_itemNo == fpcNm_ITEM_CHUCHU_GREEN) {
} else if (i_itemNo == dItemNo_GREEN_BOTTLE_e || i_itemNo == dItemNo_CHUCHU_GREEN_e) {
field_0x0724->setFrame(1.0f);
} else if (i_itemNo == fpcNm_ITEM_BLUE_BOTTLE || i_itemNo == fpcNm_ITEM_CHUCHU_BLUE) {
} else if (i_itemNo == dItemNo_BLUE_BOTTLE_e || i_itemNo == dItemNo_CHUCHU_BLUE_e) {
field_0x0724->setFrame(2.0f);
} else if (checkOilBottleItem(i_itemNo)) {
field_0x0724->setFrame(4.0f);
} else if (i_itemNo == fpcNm_ITEM_HOT_SPRING) {
} else if (i_itemNo == dItemNo_HOT_SPRING_e) {
field_0x0724->setFrame(5.0f);
} else if (i_itemNo == fpcNm_ITEM_CHUCHU_PURPLE) {
} else if (i_itemNo == dItemNo_CHUCHU_PURPLE_e) {
field_0x0724->setFrame(6.0f);
} else if (i_itemNo == fpcNm_ITEM_CHUCHU_RARE) {
} else if (i_itemNo == dItemNo_CHUCHU_RARE_e) {
field_0x0724->setFrame(7.0f);
} else if (i_itemNo == fpcNm_ITEM_UGLY_SOUP || i_itemNo == fpcNm_ITEM_CHUCHU_BLACK) {
} else if (i_itemNo == dItemNo_UGLY_SOUP_e || i_itemNo == dItemNo_CHUCHU_BLACK_e) {
field_0x0724->setFrame(8.0f);
} else if (i_itemNo == fpcNm_ITEM_LV1_SOUP) {
} else if (i_itemNo == dItemNo_LV1_SOUP_e) {
field_0x0724->setFrame(9.0f);
} else if (i_itemNo == fpcNm_ITEM_LV2_SOUP || i_itemNo == fpcNm_ITEM_LV3_SOUP) {
} else if (i_itemNo == dItemNo_LV2_SOUP_e || i_itemNo == dItemNo_LV3_SOUP_e) {
field_0x0724->setFrame(10.0f);
} else if (i_itemNo == fpcNm_ITEM_FAIRY_DROP) {
} else if (i_itemNo == dItemNo_FAIRY_DROP_e) {
field_0x0724->setFrame(11.0f);
} else {
field_0x0724->setFrame(3.0f);
if (i_itemNo == fpcNm_ITEM_HALF_MILK_BOTTLE) {
if (i_itemNo == dItemNo_HALF_MILK_BOTTLE_e) {
field_0x072c->setFrame(1.0f);
}
}
} else if (checkOpenBottleItem(i_itemNo)) {
if (i_itemNo == fpcNm_ITEM_WATER_BOTTLE) {
if (i_itemNo == dItemNo_WATER_BOTTLE_e) {
field_0x0724->setFrame(5.0f);
} else {
field_0x072c->setFrame(2.0f);
@@ -167,29 +167,29 @@ int daAlink_c::commonBottleDrink(BOOL param_0) {
mItemVar0.mBottleItemHealAmount = 0;
if (mEquipItem != fpcNm_ITEM_UGLY_SOUP && mEquipItem != fpcNm_ITEM_CHUCHU_BLACK &&
mEquipItem != fpcNm_ITEM_CHUCHU_PURPLE)
if (mEquipItem != dItemNo_UGLY_SOUP_e && mEquipItem != dItemNo_CHUCHU_BLACK_e &&
mEquipItem != dItemNo_CHUCHU_PURPLE_e)
{
if (mEquipItem == fpcNm_ITEM_LV1_SOUP) {
if (mEquipItem == dItemNo_LV1_SOUP_e) {
dComIfGp_setItemLifeCount(8, 0);
} else if (mEquipItem == fpcNm_ITEM_LV2_SOUP) {
} else if (mEquipItem == dItemNo_LV2_SOUP_e) {
dComIfGp_setItemLifeCount(16, 0);
} else if (mEquipItem == fpcNm_ITEM_LV3_SOUP) {
} else if (mEquipItem == dItemNo_LV3_SOUP_e) {
dComIfGp_setItemLifeCount(32, 0);
} else if (mEquipItem == fpcNm_ITEM_BEE_CHILD) {
} else if (mEquipItem == dItemNo_BEE_CHILD_e) {
field_0x2fd3 = 3;
dComIfGp_setItemLifeCount(dComIfGp_getSelectItemNum(mSelectItemId), 0);
} else if (mEquipItem == fpcNm_ITEM_RED_BOTTLE || mEquipItem == fpcNm_ITEM_CHUCHU_RED ||
mEquipItem == fpcNm_ITEM_RED_BOTTLE_2)
} else if (mEquipItem == dItemNo_RED_BOTTLE_e || mEquipItem == dItemNo_CHUCHU_RED_e ||
mEquipItem == dItemNo_RED_BOTTLE_2_e)
{
dComIfGp_setItemLifeCount(32, 0);
} else if (mEquipItem == fpcNm_ITEM_MILK_BOTTLE || mEquipItem == fpcNm_ITEM_HALF_MILK_BOTTLE) {
} else if (mEquipItem == dItemNo_MILK_BOTTLE_e || mEquipItem == dItemNo_HALF_MILK_BOTTLE_e) {
dComIfGp_setItemLifeCount(12, 0);
} else if (mEquipItem == fpcNm_ITEM_BLUE_BOTTLE || mEquipItem == fpcNm_ITEM_CHUCHU_BLUE ||
mEquipItem == fpcNm_ITEM_HOT_SPRING)
} else if (mEquipItem == dItemNo_BLUE_BOTTLE_e || mEquipItem == dItemNo_CHUCHU_BLUE_e ||
mEquipItem == dItemNo_HOT_SPRING_e)
{
dComIfGp_setItemLifeCount(dComIfGs_getMaxLifeGauge(), 0);
} else if (mEquipItem == fpcNm_ITEM_CHUCHU_RARE || mEquipItem == fpcNm_ITEM_FAIRY_DROP) {
} else if (mEquipItem == dItemNo_CHUCHU_RARE_e || mEquipItem == dItemNo_FAIRY_DROP_e) {
dComIfGp_setItemLifeCount(dComIfGs_getMaxLifeGauge(), 0);
}
}
@@ -202,7 +202,7 @@ int daAlink_c::commonBottleDrink(BOOL param_0) {
if (dComIfGp_getItemNowLife() == dComIfGs_getLife()) {
mpHookTipModel = NULL;
if (mEquipItem == fpcNm_ITEM_MILK_BOTTLE) {
if (mEquipItem == dItemNo_MILK_BOTTLE_e) {
if (param_0) {
setUpperAnimeParam(getMainBckData(ANM_BOTTLE_DRINK_END)->m_upperID, UPPER_2,
&mpHIO->mItem.mBottle.m.mEndDrinkAnm);
@@ -214,13 +214,13 @@ int daAlink_c::commonBottleDrink(BOOL param_0) {
field_0x072c->setFrame(1.0f);
if (mDemo.getDemoType() == daPy_demo_c::DEMO_TYPE_SPECIAL_e) {
dComIfGs_setEquipBottleItemIn(mSelectItemId, fpcNm_ITEM_HALF_MILK_BOTTLE);
dComIfGs_setEquipBottleItemIn(mSelectItemId, dItemNo_HALF_MILK_BOTTLE_e);
}
} else if (mProcVar2.field_0x300c == 0) {
mProcVar2.field_0x300c = 1;
mHeldItemModel->getModelData()->entryTexMtxAnimator(field_0x0720);
} else if (simpleAnmPlay(field_0x0720)) {
if (mEquipItem == fpcNm_ITEM_UGLY_SOUP) {
if (mEquipItem == dItemNo_UGLY_SOUP_e) {
if (dComIfGs_getLife() <= 2) {
mItemVar0.mBottleItemHealAmount = dComIfGs_getMaxLifeGauge();
} else if (dComIfGs_getLife() <= 4) {
@@ -230,7 +230,7 @@ int daAlink_c::commonBottleDrink(BOOL param_0) {
} else {
mItemVar0.mBottleItemHealAmount = 4;
}
} else if (mEquipItem == fpcNm_ITEM_CHUCHU_PURPLE) {
} else if (mEquipItem == dItemNo_CHUCHU_PURPLE_e) {
f32 rnd = cM_rndF(6.0f);
if (rnd < 1.0f) {
mItemVar0.mBottleItemHealAmount = dComIfGs_getMaxLifeGauge();
@@ -244,11 +244,11 @@ int daAlink_c::commonBottleDrink(BOOL param_0) {
} else {
mItemVar0.mBottleItemHealAmount = 4;
}
} else if (mEquipItem == fpcNm_ITEM_CHUCHU_BLACK) {
} else if (mEquipItem == dItemNo_CHUCHU_BLACK_e) {
mItemVar0.mBottleItemHealAmount = -4;
}
if (mItemVar0.mBottleItemHealAmount < 0 || mEquipItem == fpcNm_ITEM_BEE_CHILD) {
if (mItemVar0.mBottleItemHealAmount < 0 || mEquipItem == dItemNo_BEE_CHILD_e) {
if (param_0) {
setUpperAnimeParam(getMainBckData(ANM_BOTTLE_DRINK_NASTY)->m_upperID,
UPPER_2, &mpHIO->mItem.mBottle.m.mDrinkNastyAnm);
@@ -271,7 +271,7 @@ int daAlink_c::commonBottleDrink(BOOL param_0) {
dComIfGs_setEquipBottleItemEmpty(mSelectItemId);
}
if (mEquipItem == fpcNm_ITEM_CHUCHU_RARE || mEquipItem == fpcNm_ITEM_FAIRY_DROP) {
if (mEquipItem == dItemNo_CHUCHU_RARE_e || mEquipItem == dItemNo_FAIRY_DROP_e) {
mSwordUpTimer = 510;
}
}
@@ -283,7 +283,7 @@ int daAlink_c::commonBottleDrink(BOOL param_0) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_42_e) {
setSingleAnimeParam(ANM_PICK_UP, &mpHIO->mItem.mPickUp.m.mPlaceAnm);
} else {
allUnequip(mKeepItem == fpcNm_ITEM_KANTERA);
allUnequip(mKeepItem == dItemNo_KANTERA_e);
}
} else if (frameCtrl_p->checkPass(11.0f)) {
mHeldItemModel->getModelData()->entryTexMtxAnimator(field_0x0718);
@@ -314,9 +314,9 @@ int daAlink_c::commonBottleDrink(BOOL param_0) {
} else if (frameCtrl_p->checkPass(9.0f)) {
returnKeepItemData();
}
} else if (mEquipItem == fpcNm_ITEM_NONE || mEquipItem == fpcNm_ITEM_KANTERA) {
} else if (mEquipItem == dItemNo_NONE_e || mEquipItem == dItemNo_KANTERA_e) {
resetUpperAnime(UPPER_2, 3.0f);
if (mEquipItem == fpcNm_ITEM_NONE) {
if (mEquipItem == dItemNo_NONE_e) {
returnKeepItemData();
}
@@ -342,7 +342,7 @@ fopAc_ac_c* daAlink_c::makeFairy(cXyz* i_pos, u32 i_params) {
i_pos = &fairy_pos;
}
field_0x285c.setData(fopAcM_fastCreate(PROC_Obj_Yousei, i_params, i_pos, fopAcM_GetRoomNo(this),
field_0x285c.setData(fopAcM_fastCreate(fpcNm_Obj_Yousei_e, i_params, i_pos, fopAcM_GetRoomNo(this),
&shape_angle, NULL, -1, NULL, NULL));
onResetFlg0(RFLG0_UNK_400);
@@ -414,13 +414,13 @@ int daAlink_c::procBottleOpenInit(u16 i_itemNo) {
field_0x32cc = -1;
mProcVar0.field_0x3008 = 1;
if (mEquipItem == fpcNm_ITEM_FAIRY) {
if (mEquipItem == dItemNo_FAIRY_e) {
field_0x3194 = 3;
} else {
field_0x3194 = 2;
if (mEquipItem == fpcNm_ITEM_WORM) {
field_0x32cc = fopAcM_create(PROC_NPC_WORM, 2, &current.pos, fopAcM_GetRoomNo(this),
if (mEquipItem == dItemNo_WORM_e) {
field_0x32cc = fopAcM_create(fpcNm_NPC_WORM_e, 2, &current.pos, fopAcM_GetRoomNo(this),
NULL, NULL, -1);
mProcVar0.field_0x3008 = 0;
mProcVar1.field_0x300a = 1;
@@ -434,7 +434,7 @@ int daAlink_c::procBottleOpenInit(u16 i_itemNo) {
field_0x27c8.initialize(current.pos.y + mHeight);
if (i_itemNo == fpcNm_ITEM_WATER_BOTTLE) {
if (i_itemNo == dItemNo_WATER_BOTTLE_e) {
setCylAtParam(AT_TYPE_LANTERN_SWING, dCcG_At_Spl_UNK_0, 0, dCcD_SE_NONE, 0, 30.0f, 30.0f);
}
@@ -459,12 +459,12 @@ int daAlink_c::procBottleOpen() {
if (checkUnderMove0BckNoArc(ANM_BOTTLE_OPEN)) {
if (checkAnmEnd(frameCtrl_p)) {
if (mEquipItem == fpcNm_ITEM_FAIRY) {
if (mEquipItem == dItemNo_FAIRY_e) {
setSingleAnimeBaseMorf(ANM_BOTTLE_FAIRY, -1.0f);
} else {
setSingleAnimeParam(ANM_BOTTLE_POUR, &mpHIO->mItem.mBottle.m.mPourAnm);
if (mEquipItem == fpcNm_ITEM_WATER_BOTTLE) {
if (mEquipItem == dItemNo_WATER_BOTTLE_e) {
if (mWaterY > mLeftHandPos.y) {
mProcVar3.field_0x300e = 0;
} else {
@@ -477,7 +477,7 @@ int daAlink_c::procBottleOpen() {
mProcVar2.field_0x300c = 1;
mHeldItemModel->getModelData()->entryTexMtxAnimator(field_0x071c);
if (mEquipItem == fpcNm_ITEM_FAIRY) {
if (mEquipItem == dItemNo_FAIRY_e) {
cXyz fairyPos;
mDoMtx_multVec(mHeldItemModel->getBaseTRMtx(), &bottleTop, &fairyPos);
@@ -499,7 +499,7 @@ int daAlink_c::procBottleOpen() {
mProcVar2.field_0x300c = 2;
dComIfGs_setEquipBottleItemEmpty(mSelectItemId);
if (mEquipItem == fpcNm_ITEM_WATER_BOTTLE && mProcVar3.field_0x300e != 0) {
if (mEquipItem == dItemNo_WATER_BOTTLE_e && mProcVar3.field_0x300e != 0) {
seStartOnlyReverb(Z2SE_LK_SPRINKLE_WATER);
}
} else if (frameCtrl_p->getFrame() > 16.0f && frameCtrl_p->getFrame() < 31.0f) {
@@ -527,11 +527,11 @@ int daAlink_c::procBottleOpen() {
}
int daAlink_c::procBottleSwingInit(fopAc_ac_c* i_catchActor, int param_1) {
if (i_catchActor != NULL && mEquipItem != fpcNm_ITEM_KANTERA) {
if (i_catchActor != NULL && mEquipItem != dItemNo_KANTERA_e) {
return procPreActionUnequipInit(PROC_BOTTLE_SWING, NULL);
}
if (i_catchActor == NULL && getReadyItem() != fpcNm_ITEM_EMPTY_BOTTLE) {
if (i_catchActor == NULL && getReadyItem() != dItemNo_EMPTY_BOTTLE_e) {
return checkWaitAction();
}
@@ -566,15 +566,15 @@ int daAlink_c::procBottleSwingInit(fopAc_ac_c* i_catchActor, int param_1) {
temp_r3 = false;
}
catchActorName = PROC_ALINK;
catchActorName = fpcNm_ALINK_e;
}
if (catchActorName == PROC_TAG_SSDRINK || catchActorName == PROC_OBJ_OILTUBO ||
catchActorName == PROC_TAG_BTLITM || mEquipItem == fpcNm_ITEM_KANTERA)
if (catchActorName == fpcNm_TAG_SSDRINK_e || catchActorName == fpcNm_OBJ_OILTUBO_e ||
catchActorName == fpcNm_TAG_BTLITM_e || mEquipItem == dItemNo_KANTERA_e)
{
setSingleAnimeParam(ANM_BOTTLE_SCOOP, &mpHIO->mItem.mBottle.m.mScoopAnm);
if (mEquipItem == fpcNm_ITEM_KANTERA) {
if (mEquipItem == dItemNo_KANTERA_e) {
onNoResetFlg2(FLG2_KANDELAAR_LIGHT_OFF);
JPABaseEmitter* emitter_p = dComIfGp_particle_getEmitter(field_0x31c4);
@@ -594,7 +594,7 @@ int daAlink_c::procBottleSwingInit(fopAc_ac_c* i_catchActor, int param_1) {
current.pos.z = catchActor->current.pos.z - cM_scos(shape_angle.y) * 70.0f;
}
if (catchActorName == PROC_OBJ_OILTUBO) {
if (catchActorName == fpcNm_OBJ_OILTUBO_e) {
onModeFlg(0x2000);
}
} else if (temp_r3) {
@@ -636,25 +636,25 @@ int daAlink_c::procBottleSwing() {
mProcVar2.field_0x300c = 1;
offModeFlg(4);
if (mEquipItem != fpcNm_ITEM_KANTERA) {
if (mEquipItem != dItemNo_KANTERA_e) {
u16 bottle_item = dComIfGp_event_getPreItemNo();
if (bottle_item == fpcNm_ITEM_WATER_BOTTLE &&
getMoveBGActorName(mLinkAcch.m_wtr, FALSE) == PROC_Obj_Onsen)
if (bottle_item == dItemNo_WATER_BOTTLE_e &&
getMoveBGActorName(mLinkAcch.m_wtr, FALSE) == fpcNm_Obj_Onsen_e)
{
bottle_item = fpcNm_ITEM_HOT_SPRING;
bottle_item = dItemNo_HOT_SPRING_e;
}
dComIfGs_setEquipBottleItemIn(mSelectItemId, bottle_item);
if (bottle_item == fpcNm_ITEM_BEE_CHILD) {
if (bottle_item == dItemNo_BEE_CHILD_e) {
dComIfGp_setSelectItemNum(mSelectItemId, dComIfGs_getBottleMax());
} else if (bottle_item == fpcNm_ITEM_WATER_BOTTLE) {
} else if (bottle_item == dItemNo_WATER_BOTTLE_e) {
seStartOnlyReverb(Z2SE_LK_SCOOP_WATER);
} else if (checkOilBottleItem(bottle_item)) {
seStartOnlyReverb(Z2SE_AL_SCOOP_OIL);
} else if (bottle_item == fpcNm_ITEM_LV1_SOUP || bottle_item == fpcNm_ITEM_LV2_SOUP ||
bottle_item == fpcNm_ITEM_LV3_SOUP)
} else if (bottle_item == dItemNo_LV1_SOUP_e || bottle_item == dItemNo_LV2_SOUP_e ||
bottle_item == dItemNo_LV3_SOUP_e)
{
seStartOnlyReverb(Z2SE_AL_SCOOP_SOUP);
}
@@ -666,12 +666,12 @@ int daAlink_c::procBottleSwing() {
mDemo.setSpecialDemoType();
}
} else if (frameCtrl_p->getFrame() <= field_0x347c) {
if (getReadyItem() == fpcNm_ITEM_EMPTY_BOTTLE &&
if (getReadyItem() == dItemNo_EMPTY_BOTTLE_e &&
(dComIfGp_att_getCatghTarget() != NULL ||
(field_0x2fbc != 11 && field_0x2fbc != 6 && mWaterY > current.pos.y + 10.0f)))
{
fopAcM_orderCatchEvent(this, dComIfGp_att_getCatghTarget(), 0, 0);
} else if (mEquipItem == fpcNm_ITEM_KANTERA) {
} else if (mEquipItem == dItemNo_KANTERA_e) {
if (field_0x280c.getActor() != NULL) {
fopAcM_orderCatchEvent(this, field_0x280c.getActor(), 0, 0);
}
@@ -698,23 +698,23 @@ int daAlink_c::procBottleGetInit(BOOL param_0) {
commonProcInit(PROC_BOTTLE_GET);
int var_r30;
if (mEquipItem == fpcNm_ITEM_KANTERA) {
if (mEquipItem == dItemNo_KANTERA_e) {
setSingleAnime(ANM_BOTTLE_GET, mpHIO->mItem.mBottle.m.mGetAnm.mSpeed, 40.0f,
mpHIO->mItem.mBottle.m.mGetAnm.mEndFrame,
mpHIO->mItem.mBottle.m.mGetAnm.mInterpolation);
mRightHandIndex = 0xFE;
if (isPrevPickUp) {
execItemGet(fpcNm_ITEM_KANTERA);
var_r30 = fpcNm_ITEM_KANTERA2;
execItemGet(dItemNo_KANTERA_e);
var_r30 = dItemNo_KANTERA2_e;
dComIfGp_setItemOilCount(-dComIfGs_getMaxOil());
} else {
dComIfGp_setItemOilCount(dComIfGs_getMaxOil());
if (param_0) {
var_r30 = fpcNm_ITEM_CHUCHU_YELLOW2;
var_r30 = dItemNo_CHUCHU_YELLOW2_e;
} else {
var_r30 = fpcNm_ITEM_OIL2;
var_r30 = dItemNo_OIL2_e;
}
}
@@ -729,25 +729,25 @@ int daAlink_c::procBottleGetInit(BOOL param_0) {
field_0x3194 = 0;
field_0x32cc = var_r30 + 0x65;
if (mEquipItem == fpcNm_ITEM_KANTERA) {
if (mEquipItem == dItemNo_KANTERA_e) {
field_0x3194 = 12;
}
if (mEquipItem == fpcNm_ITEM_KANTERA) {
if (mEquipItem == dItemNo_KANTERA_e) {
resetBasAnime();
}
u32 id = fopAcM_GetID(this);
dCam_getBody()->StartEventCamera(0x12, id, "Type", 1, &field_0x3194, 0);
if (mEquipItem == fpcNm_ITEM_FAIRY_DROP || mEquipItem == fpcNm_ITEM_CHUCHU_RARE || mEquipItem == fpcNm_ITEM_WORM) {
if (mEquipItem == dItemNo_FAIRY_DROP_e || mEquipItem == dItemNo_CHUCHU_RARE_e || mEquipItem == dItemNo_WORM_e) {
setFaceBasicTexture(FTANM_I_BINGET);
setFaceBasicBck(dRes_ID_ALANM_BCK_FI_e);
} else if (mEquipItem == fpcNm_ITEM_UGLY_SOUP) {
} else if (mEquipItem == dItemNo_UGLY_SOUP_e) {
setFaceBasicBck(dRes_ID_ALANM_BCK_FJ_e);
}
if (mEquipItem == fpcNm_ITEM_BEE_CHILD && dComIfGs_isEventBit(dSv_event_flag_c::F_0700)) {
if (mEquipItem == dItemNo_BEE_CHILD_e && dComIfGs_isEventBit(dSv_event_flag_c::F_0700)) {
dComIfGs_onEventBit(dSv_event_flag_c::F_0618);
}
@@ -761,7 +761,7 @@ int daAlink_c::procBottleGet() {
if (checkAnmEnd(frameCtrl) && checkEndMessage(field_0x32cc)) {
resetFairyEffect();
if (mEquipItem != fpcNm_ITEM_KANTERA) {
if (mEquipItem != dItemNo_KANTERA_e) {
deleteEquipItem(FALSE, FALSE);
}
src/d/actor/d_a_alink_bow.inc
+23 -23
View File
@@ -9,7 +9,7 @@
#include "d/actor/d_a_horse.h"
void daAlink_c::getArrowFlyData(f32* o_distance, f32* o_speed, BOOL i_forceCharge) const {
if (mEquipItem == fpcNm_ITEM_PACHINKO) {
if (mEquipItem == dItemNo_PACHINKO_e) {
*o_distance = mpHIO->mItem.mBow.m.mSlingshotDistance;
*o_speed = mpHIO->mItem.mBow.m.mSlingshotSpeed;
} else if (dComIfGp_checkPlayerStatus0(0, 0x200000)) {
@@ -49,7 +49,7 @@ f32 daAlink_c::getArrowIncAtMax() const {
}
BOOL daAlink_c::checkBowAndSlingItem(int i_itemNo) {
return checkBowItem(i_itemNo) || i_itemNo == fpcNm_ITEM_PACHINKO;
return checkBowItem(i_itemNo) || i_itemNo == dItemNo_PACHINKO_e;
}
void daAlink_c::setSlingModel() {
@@ -68,7 +68,7 @@ void daAlink_c::setSlingModel() {
}
cXyz* daAlink_c::checkBowCameraArrowPosP(s16* o_angleX, s16* o_angleY) {
if (!checkBowAnime() || mEquipItem == fpcNm_ITEM_PACHINKO) {
if (!checkBowAnime() || mEquipItem == dItemNo_PACHINKO_e) {
return NULL;
}
@@ -128,7 +128,7 @@ void daAlink_c::makeArrow() {
void daAlink_c::deleteArrow() {
daArrow_c* arrow_p = (daArrow_c*)mItemAcKeep.getActor();
if (arrow_p != NULL && fopAcM_GetName(arrow_p) == PROC_ARROW) {
if (arrow_p != NULL && fopAcM_GetName(arrow_p) == fpcNm_ARROW_e) {
if (arrow_p->checkBombArrow() &&
(mDamageTimer == mpHIO->mDamage.m.mInvincibleTime || checkModeFlg(8)))
{
@@ -143,7 +143,7 @@ void daAlink_c::deleteArrow() {
}
void daAlink_c::setBowOrSlingStatus() {
if (mEquipItem == fpcNm_ITEM_PACHINKO) {
if (mEquipItem == dItemNo_PACHINKO_e) {
dComIfGp_setPlayerStatus0(0, 0x40);
} else {
dComIfGp_setPlayerStatus0(0, 0x1000);
@@ -151,10 +151,10 @@ void daAlink_c::setBowOrSlingStatus() {
}
void daAlink_c::changeArrowType() {
if (checkCanoeSlider() || (mEquipItem == fpcNm_ITEM_BOW && field_0x301e == 0) ||
(mEquipItem == fpcNm_ITEM_BOMB_ARROW && field_0x301e == 0 &&
if (checkCanoeSlider() || (mEquipItem == dItemNo_BOW_e && field_0x301e == 0) ||
(mEquipItem == dItemNo_BOMB_ARROW_e && field_0x301e == 0 &&
dComIfGp_getSelectItemNum(mSelectItemId) == 0) ||
(mEquipItem == fpcNm_ITEM_HAWK_ARROW && checkAttentionLock()))
(mEquipItem == dItemNo_HAWK_ARROW_e && checkAttentionLock()))
{
return;
}
@@ -162,7 +162,7 @@ void daAlink_c::changeArrowType() {
setItemActionButtonStatus(BUTTON_STATUS_SWITCH);
if (arrowChangeTrigger()) {
if (mEquipItem == fpcNm_ITEM_HAWK_ARROW) {
if (mEquipItem == dItemNo_HAWK_ARROW_e) {
if (dComIfGp_checkPlayerStatus0(0, 0x200000)) {
dComIfGp_clearPlayerStatus0(0, 0x200000);
seStartSystem(Z2SE_AL_HAWK_EYE_PUTOFF);
@@ -203,7 +203,7 @@ BOOL daAlink_c::cancelBowMove() {
void daAlink_c::setBowReadyAnime() {
if (!checkBowAnime()) {
if (mEquipItem == fpcNm_ITEM_BOMB_ARROW) {
if (mEquipItem == dItemNo_BOMB_ARROW_e) {
if (dComIfGp_getSelectItemNum(mSelectItemId) != 0) {
field_0x301e = 1;
} else {
@@ -225,7 +225,7 @@ void daAlink_c::setBowReadyAnime() {
field_0x2f97 = 5;
field_0x2f96 = 4;
if (mEquipItem == fpcNm_ITEM_PACHINKO) {
if (mEquipItem == dItemNo_PACHINKO_e) {
changeItemBck(dRes_ID_ALANM_BCK_PSHOOT_e, -1.0f);
} else {
changeItemBck(dRes_ID_ALANM_BCK_BASHOOT_e, -1.0f);
@@ -237,7 +237,7 @@ void daAlink_c::setBowReloadAnime() {
setFacePriTexture(FTANM_FINISHA);
setFacePriBck(dRes_ID_ALANM_BCK_FARELORD_e);
if (mEquipItem == fpcNm_ITEM_PACHINKO) {
if (mEquipItem == dItemNo_PACHINKO_e) {
changeItemBck(dRes_ID_ALANM_BCK_PRELORD_e, mpHIO->mItem.mBow.m.mLoadAnm.mStartFrame);
field_0x2f97 = 5;
seStartOnlyReverb(Z2SE_AL_PACHINKO_DRAW);
@@ -254,7 +254,7 @@ void daAlink_c::setBowReloadAnime() {
BOOL daAlink_c::checkUpperItemActionBow() {
daPy_frameCtrl_c* frameCtrl_p = &mUpperFrameCtrl[2];
if (mEquipItem == fpcNm_ITEM_PACHINKO) {
if (mEquipItem == dItemNo_PACHINKO_e) {
static const Vec slingLocalPos = {10.0f, 10.0f, 0.0f};
mDoMtx_multVec(getLeftItemMatrix(), &slingLocalPos, &mHeldItemRootPos);
}
@@ -262,7 +262,7 @@ BOOL daAlink_c::checkUpperItemActionBow() {
if (checkBowChargeWaitAnime()) {
daArrow_c* arrow_p = (daArrow_c*)mItemAcKeep.getActor();
if (mEquipItem != fpcNm_ITEM_PACHINKO) {
if (mEquipItem != dItemNo_PACHINKO_e) {
if (field_0x301c > 0) {
field_0x301c--;
@@ -284,7 +284,7 @@ BOOL daAlink_c::checkUpperItemActionBow() {
field_0x2f96 = 0;
u16 bck_res_id;
if (mEquipItem == fpcNm_ITEM_PACHINKO) {
if (mEquipItem == dItemNo_PACHINKO_e) {
bck_res_id = dRes_ID_ALANM_BCK_PSHOOT_e;
if (dComIfGs_getPachinkoNum() != 0 &&
daArrow_c::makeSlingStone(this, &mHeldItemRootPos) != NULL)
@@ -299,7 +299,7 @@ BOOL daAlink_c::checkUpperItemActionBow() {
changeItemBck(bck_res_id, mpHIO->mItem.mBow.m.mShootAnm.mStartFrame);
mItemVar0.field_0x3018 = 0;
} else if (mEquipItem == fpcNm_ITEM_PACHINKO) {
} else if (mEquipItem == dItemNo_PACHINKO_e) {
if (!itemButton()) {
dComIfGp_getVibration().StartShock(VIBMODE_S_POWER1, 1, cXyz(0.0f, 1.0f, 0.0f));
seStartOnlyReverb(Z2SE_AL_PACHINKO_SHOT);
@@ -349,7 +349,7 @@ BOOL daAlink_c::checkUpperItemActionBow() {
mItemVar0.field_0x3018 = 1;
resetFacePriAnime();
if (mEquipItem == fpcNm_ITEM_BOW) {
if (mEquipItem == dItemNo_BOW_e) {
field_0x301e = 0;
}
(void)0;
@@ -363,7 +363,7 @@ BOOL daAlink_c::checkUpperItemActionBow() {
setFacePriTexture(FTANM_ARELORD);
setFacePriBck(dRes_ID_ALANM_BCK_FARELORDTAME_e);
if (mEquipItem != fpcNm_ITEM_PACHINKO) {
if (mEquipItem != dItemNo_PACHINKO_e) {
changeItemBck(dRes_ID_ALANM_BCK_BARELORDTAME_e, 0.0f);
dComIfGp_getVibration().StartQuake(VIBMODE_Q_POWER1, 1, cXyz(0.0f, 1.0f, 0.0f));
onNoResetFlg3(FLG3_UNK_4);
@@ -384,12 +384,12 @@ BOOL daAlink_c::checkUpperItemActionBow() {
{
setBowReloadAnime();
if (mEquipItem == fpcNm_ITEM_PACHINKO) {
if (mEquipItem == dItemNo_PACHINKO_e) {
mItemVar0.field_0x3018 = 0;
} else {
makeArrow();
}
} else if (mEquipItem == fpcNm_ITEM_HAWK_ARROW) {
} else if (mEquipItem == dItemNo_HAWK_ARROW_e) {
changeArrowType();
}
@@ -421,7 +421,7 @@ BOOL daAlink_c::checkUpperItemActionBow() {
}
}
if (checkBowWaitAnime() || (mEquipItem == fpcNm_ITEM_PACHINKO && checkBowChargeWaitAnime())) {
if (checkBowWaitAnime() || (mEquipItem == dItemNo_PACHINKO_e && checkBowChargeWaitAnime())) {
field_0x33dc += mpHIO->mItem.mBow.m.mShootAnm.mSpeed;
} else {
field_0x33dc = mUpperFrameCtrl[2].getFrame();
@@ -457,7 +457,7 @@ int daAlink_c::checkNextActionBow() {
mItemMode = 0;
mItemVar0.field_0x3018 = 1;
if (mEquipItem == fpcNm_ITEM_HAWK_ARROW) {
if (mEquipItem == dItemNo_HAWK_ARROW_e) {
is_hawk_arrow = true;
mFastShotTime = 0;
}
@@ -537,7 +537,7 @@ void daAlink_c::setBowHangAnime() {
void daAlink_c::setBowNormalAnime() {
if (checkBowItem(mEquipItem)) {
changeItemBck(dRes_ID_ALANM_BCK_BVJMPCL_e, -1.0f);
} else if (mEquipItem == fpcNm_ITEM_PACHINKO) {
} else if (mEquipItem == dItemNo_PACHINKO_e) {
changeItemBck(dRes_ID_ALANM_BCK_PWAIT_e, -1.0f);
}
}
src/d/actor/d_a_alink_canoe.inc
+24 -24
View File
@@ -55,7 +55,7 @@ cXyz* daAlink_c::getCanoeLocalPaddleTop() {
static fopAc_ac_c* daAlink_searchCanoe(fopAc_ac_c* i_actor, void* i_data) {
UNUSED(i_data);
if (fopAcM_GetName(i_actor) == PROC_CANOE && ((daCanoe_c*)i_actor)->getModel() != NULL) {
if (fopAcM_GetName(i_actor) == fpcNm_CANOE_e && ((daCanoe_c*)i_actor)->getModel() != NULL) {
return i_actor;
}
@@ -81,9 +81,9 @@ void daAlink_c::initFishingRodHand() {
field_0x2f95 = 0x65;
mItemVar0.field_0x3018 = 1;
if (mEquipItem == fpcNm_ITEM_JEWEL_WORM_ROD || mEquipItem == fpcNm_ITEM_WORM_ROD) {
if (mEquipItem == dItemNo_JEWEL_WORM_ROD_e || mEquipItem == dItemNo_WORM_ROD_e) {
mItemMode = 0x74;
} else if (mEquipItem == fpcNm_ITEM_JEWEL_BEE_ROD || mEquipItem == fpcNm_ITEM_BEE_ROD) {
} else if (mEquipItem == dItemNo_JEWEL_BEE_ROD_e || mEquipItem == dItemNo_BEE_ROD_e) {
mItemMode = 0x76;
} else {
mItemMode = 0xFF;
@@ -129,7 +129,7 @@ BOOL daAlink_c::checkCanoeJumpRide() {
if (speed.y < 0.0f &&
canoe != NULL &&
fopAcM_GetName(canoe) == PROC_CANOE &&
fopAcM_GetName(canoe) == fpcNm_CANOE_e &&
canoe->checkJumpRideFlg() &&
!checkDeadHP() &&
(mProcID != PROC_FALL || mProcVar4.field_0x3010 != 0))
@@ -592,7 +592,7 @@ int daAlink_c::procCanoeWaitInit(int param_0) {
morf = 3.0f;
mProcVar0.field_0x3008 = 0;
if (mEquipItem == fpcNm_ITEM_NONE || (mEquipItem != 0x10B && !checkFisingRodLure())) {
if (mEquipItem == dItemNo_NONE_e || (mEquipItem != 0x10B && !checkFisingRodLure())) {
anm = ANM_WAIT_SIT;
} else if (mProcVar5.field_0x3012 == 0) {
anm = ANM_WAIT_CANOE_LEFT;
@@ -604,7 +604,7 @@ int daAlink_c::procCanoeWaitInit(int param_0) {
setSyncCanoePos();
setSingleAnimeBaseMorf(anm, morf);
if (param_0 && mEquipItem != 0x10B && mEquipItem != fpcNm_ITEM_NONE && !checkFisingRodLure()) {
if (param_0 && mEquipItem != 0x10B && mEquipItem != dItemNo_NONE_e && !checkFisingRodLure()) {
allUnequip(0);
}
@@ -638,7 +638,7 @@ int daAlink_c::procCanoeWait() {
return procCanoePaddlePutInit(1);
}
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
allUnequip(0);
}
@@ -648,7 +648,7 @@ int daAlink_c::procCanoeWait() {
if (checkFisingRodLure()) {
procCanoeFishingWaitInit();
} else if (mEquipItem == fpcNm_ITEM_NONE && ((mThrowBoomerangAcKeep.getActor() == NULL && mProcVar1.field_0x300a == 0) || checkInputOnR())) {
} else if (mEquipItem == dItemNo_NONE_e && ((mThrowBoomerangAcKeep.getActor() == NULL && mProcVar1.field_0x300a == 0) || checkInputOnR())) {
field_0x2fde = 0xFF;
if (mThrowBoomerangAcKeep.getActor() != NULL || mProcVar1.field_0x300a != 0) {
@@ -662,7 +662,7 @@ int daAlink_c::procCanoeWait() {
procCanoePaddleGrabInit();
} else if (checkInputOnR() && mEquipItem == 0x10B) {
procCanoeRowInit(-1);
} else if (mEquipItem != fpcNm_ITEM_NONE && mEquipItem != 0x10B) {
} else if (mEquipItem != dItemNo_NONE_e && mEquipItem != 0x10B) {
if (!checkUnderMove0BckNoArc(ANM_WAIT_SIT) && getNowAnmPackUnder(UNDER_0) != getNowAnmPackUpper(UPPER_0)) {
setSingleAnimeBase(ANM_WAIT_SIT);
} else if (checkInputOnR()) {
@@ -939,7 +939,7 @@ int daAlink_c::procCanoePaddleShift() {
int daAlink_c::procCanoePaddlePutInit(int param_0) {
if (checkCanoeSlider() && mEquipItem == 0x10B) {
if (checkEquipAnime() && checkBowItem(field_0x2fde)) {
mEquipItem = fpcNm_ITEM_NONE;
mEquipItem = dItemNo_NONE_e;
mRightHandIndex = 0xFE;
mLeftHandIndex = 0xFE;
return procCanoeWaitInit(0);
@@ -1006,7 +1006,7 @@ int daAlink_c::procCanoePaddlePut() {
mEquipItem = 0x105;
mRightHandIndex = 5;
} else {
mEquipItem = fpcNm_ITEM_NONE;
mEquipItem = dItemNo_NONE_e;
mRightHandIndex = 0xFE;
}
@@ -1077,7 +1077,7 @@ int daAlink_c::procCanoePaddleGrab() {
int daAlink_c::procCanoeRodGrabInit() {
commonProcInit(PROC_CANOE_ROD_GRAB);
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
allUnequip(0);
mProcVar0.field_0x3008 = 1;
} else {
@@ -1627,7 +1627,7 @@ int daAlink_c::procCanoeKandelaarPour() {
}
void daAlink_c::setGroundFishingRodActor() {
mItemAcKeep.setID(fopAcM_create(PROC_MG_ROD, 0xFFFF011D, &mLeftHandPos, -1, NULL, NULL, -1));
mItemAcKeep.setID(fopAcM_create(fpcNm_MG_ROD_e, 0xFFFF011D, &mLeftHandPos, -1, NULL, NULL, -1));
initFishingRodHand();
}
@@ -1667,10 +1667,10 @@ int daAlink_c::procFishingCast() {
mItemMode = 0xFF;
dComIfGs_setBaitItem(0xFF);
if (mEquipItem == fpcNm_ITEM_JEWEL_WORM_ROD || mEquipItem == fpcNm_ITEM_JEWEL_BEE_ROD) {
mEquipItem = fpcNm_ITEM_JEWEL_ROD;
if (mEquipItem == dItemNo_JEWEL_WORM_ROD_e || mEquipItem == dItemNo_JEWEL_BEE_ROD_e) {
mEquipItem = dItemNo_JEWEL_ROD_e;
} else {
mEquipItem = fpcNm_ITEM_FISHING_ROD_1;
mEquipItem = dItemNo_FISHING_ROD_1_e;
}
}
@@ -1741,15 +1741,15 @@ int daAlink_c::procFishingFood() {
mProcVar2.field_0x300c = 1;
u16 item = dComIfGp_getSelectItem(mProcVar3.field_0x300e);
if (item == fpcNm_ITEM_WORM || dComIfGp_getSelectItemNum(mProcVar3.field_0x300e) == 1) {
if (item == dItemNo_WORM_e || dComIfGp_getSelectItemNum(mProcVar3.field_0x300e) == 1) {
dComIfGs_setEquipBottleItemEmpty(mProcVar3.field_0x300e);
} else {
dComIfGp_addSelectItemNum(mProcVar3.field_0x300e, -1);
}
if (mItemMode != fpcNm_ITEM_NONE) {
if (mItemMode != dItemNo_NONE_e) {
dComIfGs_setEquipBottleItemIn(mProcVar3.field_0x300e, mItemMode);
if (mItemMode == fpcNm_ITEM_BEE_CHILD) {
if (mItemMode == dItemNo_BEE_CHILD_e) {
dComIfGp_setSelectItemNum(mProcVar3.field_0x300e, 1);
}
}
@@ -1757,16 +1757,16 @@ int daAlink_c::procFishingFood() {
mItemMode = item;
BOOL is_jewl = checkFisingRodJewl();
if (item == fpcNm_ITEM_WORM) {
if (item == dItemNo_WORM_e) {
if (is_jewl) {
mEquipItem = fpcNm_ITEM_JEWEL_WORM_ROD;
mEquipItem = dItemNo_JEWEL_WORM_ROD_e;
} else {
mEquipItem = fpcNm_ITEM_WORM_ROD;
mEquipItem = dItemNo_WORM_ROD_e;
}
} else if (is_jewl) {
mEquipItem = fpcNm_ITEM_JEWEL_BEE_ROD;
mEquipItem = dItemNo_JEWEL_BEE_ROD_e;
} else {
mEquipItem = fpcNm_ITEM_BEE_ROD;
mEquipItem = dItemNo_BEE_ROD_e;
}
dComIfGs_setBaitItem(item);
src/d/actor/d_a_alink_copyrod.inc
+5 -5
View File
@@ -178,7 +178,7 @@ int daAlink_c::returnCopyRod() {
offNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER);
BOOL rt;
if (mEquipItem == fpcNm_ITEM_COPY_ROD) {
if (mEquipItem == dItemNo_COPY_ROD_e) {
mItemAcKeep = mCopyRodAcKeep;
onNoResetFlg0(FLG0_UNK_20);
rt = TRUE;
@@ -347,8 +347,8 @@ int daAlink_c::procCopyRodSwingInit() {
daCstatue_c* statue = (daCstatue_c*)getCopyRodControllActor();
if (statue != NULL &&
((fopAcM_GetName(statue) == PROC_CSTATUE && statue->checkNotSmallType()) ||
fopAcM_GetName(statue) != PROC_CSTATUE))
((fopAcM_GetName(statue) == fpcNm_CSTATUE_e && statue->checkNotSmallType()) ||
fopAcM_GetName(statue) != fpcNm_CSTATUE_e))
{
setSingleAnimeParam(ANM_COPYROD_SWING_LARGE, &mpHIO->mItem.mCopyRod.m.mBigSwingAnm);
field_0x3478 = 13.0f;
@@ -408,9 +408,9 @@ int daAlink_c::procCopyRodReviveInit() {
}
if (mDemo.getParam0() == 0) {
if (mEquipItem != fpcNm_ITEM_COPY_ROD) {
if (mEquipItem != dItemNo_COPY_ROD_e) {
deleteEquipItem(FALSE, FALSE);
mEquipItem = fpcNm_ITEM_COPY_ROD;
mEquipItem = dItemNo_COPY_ROD_e;
setCopyRodModel();
}
field_0x0724->setFrame(0.0f);
src/d/actor/d_a_alink_crawl.inc
+3 -6
View File
@@ -393,12 +393,9 @@ void daAlink_c::setCrawlMoveAngle() {
sp2C.set(sp20.x - sp38.x, dComIfG_Bgsp().GroundCross(&mLinkGndChk) - sp38.y,
sp20.z - sp38.z);
#else
// Likely fakematch:
// Fakematch:
// dBgS::GroundCross is implicitly inlined to cBgS::GroundCross, but for some
// reason here that breaks instruction ordering. This is the only place in the code
// where it causes issues.
// It _is_ possible that this is caused by an actual version difference in Shield, given
// that the Wii versions need the cast but Shield prod does not.
// reason here that breaks instruction ordering. See also daHorse_c::checkHorseNoMove.
sp2C.set(sp20.x - sp38.x, ((cBgS&)dComIfG_Bgsp()).GroundCross(&mLinkGndChk) - sp38.y,
sp20.z - sp38.z);
#endif
@@ -476,7 +473,7 @@ void daAlink_c::setCrawlAutoMoveAimPos() {
}
int daAlink_c::procCrawlStartInit() {
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
return procPreActionUnequipInit(PROC_CRAWL_START, NULL);
}
src/d/actor/d_a_alink_cut.inc
+10 -10
View File
@@ -26,14 +26,14 @@ enum daAlink_CutFinishParamType {
static fopAc_ac_c* daAlink_searchNightStalker(fopAc_ac_c* i_actor, void* i_data) {
UNUSED(i_data);
if (fopAcM_GetName(i_actor) == PROC_E_S1) {
if (fopAcM_GetName(i_actor) == fpcNm_E_S1_e) {
daPy_py_c* player_p = daPy_getLinkPlayerActorClass();
if (player_p->current.pos.abs2XZ(i_actor->current.pos) < SQUARE(500.0f) &&
fabsf(player_p->current.pos.y - i_actor->current.pos.y) < 300.0f)
{
return i_actor;
}
} else if (fopAcM_GetName(i_actor) == PROC_B_GND && static_cast<b_gnd_class*>(i_actor)->checkAttackChance()) {
} else if (fopAcM_GetName(i_actor) == fpcNm_B_GND_e && static_cast<b_gnd_class*>(i_actor)->checkAttackChance()) {
return i_actor;
}
@@ -113,7 +113,7 @@ bool daAlink_c::checkCutFastReady() {
fopAc_ac_c* target_p = mAttention->LockonTarget(0);
if (mEquipItem == fpcNm_ITEM_NONE && (dComIfGs_isEventBit(dSv_event_flag_c::F_0342) || checkNoResetFlg3(FLG3_TRANING_CUT_FAST)))
if (mEquipItem == dItemNo_NONE_e && (dComIfGs_isEventBit(dSv_event_flag_c::F_0342) || checkNoResetFlg3(FLG3_TRANING_CUT_FAST)))
{
if (checkModeFlg(1) && !checkRideOn() && checkSwordGet() && checkModeFlg(4) &&
!checkModeFlg(0x40000) && mTargetedActor == NULL && checkEnemyGroup(target_p))
@@ -229,7 +229,7 @@ void daAlink_c::setCylAtParam(u32 i_AtType, dCcG_At_Spl i_spl, u8 i_hitMark, u8
} else {
mtrl = dCcD_MTRL_NONE;
}
} else if (mEquipItem == fpcNm_ITEM_WATER_BOTTLE) {
} else if (mEquipItem == dItemNo_WATER_BOTTLE_e) {
mtrl = dCcD_MTRL_UNK_6;
} else {
mtrl = dCcD_MTRL_NONE;
@@ -309,7 +309,7 @@ void daAlink_c::setSwordAtParam(dCcG_At_Spl i_spl, u8 i_hitMark, u8 i_AtSe, int
BOOL daAlink_c::notSwordHitVibActor(fopAc_ac_c* i_actor) {
if (i_actor != NULL && fopAcM_GetGroup(i_actor) == fopAc_NPC_e) {
s16 name = fopAcM_GetName(i_actor);
if (!checkSpecialNpc(i_actor) && name != PROC_NI && name != PROC_NPC_BLUENS) {
if (!checkSpecialNpc(i_actor) && name != fpcNm_NI_e && name != fpcNm_NPC_BLUENS_e) {
return true;
}
}
@@ -365,11 +365,11 @@ BOOL daAlink_c::checkCutReverseAt(dCcD_GObjInf* i_gobj) {
}
BOOL daAlink_c::changeCutReverseProc(daAlink_c::daAlink_ANM i_anmID) {
if (checkCutReverseAt(&mAtCps[0]) || (mEquipItem != fpcNm_ITEM_COPY_ROD && (checkCutReverseAt(&mAtCps[1]) || checkCutReverseAt(&mAtCps[2])))) {
if (checkCutReverseAt(&mAtCps[0]) || (mEquipItem != dItemNo_COPY_ROD_e && (checkCutReverseAt(&mAtCps[1]) || checkCutReverseAt(&mAtCps[2])))) {
return procCutReverseInit(i_anmID);
}
if (checkNoResetFlg0(FLG0_CUT_AT_FLG) || mEquipItem == fpcNm_ITEM_COPY_ROD) {
if (checkNoResetFlg0(FLG0_CUT_AT_FLG) || mEquipItem == dItemNo_COPY_ROD_e) {
cXyz sp28;
Vec sp1C;
@@ -793,8 +793,8 @@ BOOL daAlink_c::checkDownAttackState() {
&& enemy->getDownPos().abs2(current.pos) < SQUARE(800.0f)
)
|| (checkWolf()
&& (fopAcM_GetName(mTargetedActor) == PROC_E_PO
|| fopAcM_GetName(mTargetedActor) == PROC_E_HP
&& (fopAcM_GetName(mTargetedActor) == fpcNm_E_PO_e
|| fopAcM_GetName(mTargetedActor) == fpcNm_E_HP_e
)
&& enemy->getDownPos().abs2(current.pos) < SQUARE(800.0f)
)
@@ -2042,7 +2042,7 @@ int daAlink_c::procCutDownInit() {
sp2C = static_cast<fopEn_enemy_c*>(mTargetedActor)->getDownPos();
field_0x280c.setData(mTargetedActor);
if (fopAcM_GetName(mTargetedActor) == PROC_B_GND) {
if (fopAcM_GetName(mTargetedActor) == fpcNm_B_GND_e) {
mProcVar3.field_0x300e = 1;
}
} else {
src/d/actor/d_a_alink_damage.inc
+5 -5
View File
@@ -585,7 +585,7 @@ BOOL daAlink_c::checkDamageAction() {
if (tghit_ac != NULL) {
tghit_ac_name = fopAcM_GetName(tghit_ac);
} else {
tghit_ac_name = PROC_ALINK;
tghit_ac_name = fpcNm_ALINK_e;
}
dCcD_GObjInf* tghit_gobj = var_r29->GetTgHitGObj();
@@ -621,7 +621,7 @@ BOOL daAlink_c::checkDamageAction() {
seStartOnlyReverb(Z2SE_AL_BURN_START);
}
if ((mProcID != PROC_GUARD_ATTACK || (tghit_ac_name != PROC_E_TK_BALL && tghit_ac_name != PROC_KN_BULLET)) && !checkModeFlg(0x4000000)) {
if ((mProcID != PROC_GUARD_ATTACK || (tghit_ac_name != fpcNm_E_TK_BALL_e && tghit_ac_name != fpcNm_KN_BULLET_e)) && !checkModeFlg(0x4000000)) {
if (at_spl == 10 || at_spl == 11 || at_spl == 9) {
return procGuardBreakInit();
}
@@ -633,7 +633,7 @@ BOOL daAlink_c::checkDamageAction() {
return procHorseHangInit(var_r29, 0);
}
} else if (at_spl == 8 || checkModeFlg(0x70C52)) {
if (!checkModeFlg(0x400) && mEquipItem != fpcNm_ITEM_IRONBALL) {
if (!checkModeFlg(0x400) && mEquipItem != dItemNo_IRONBALL_e) {
setSmallGuard(var_r29);
}
} else {
@@ -1624,7 +1624,7 @@ int daAlink_c::procCoElecDamageInit(fopAc_ac_c* i_tgHitActor, dCcD_GObjInf* i_tg
}
if (i_tgHitActor != NULL) {
i_tgHitActor->actor_status |= 0x800;
i_tgHitActor->actor_status |= fopAcStts_STAFF_EXTRA_e;
}
commonProcInit(PROC_ELEC_DAMAGE);
@@ -1634,7 +1634,7 @@ int daAlink_c::procCoElecDamageInit(fopAc_ac_c* i_tgHitActor, dCcD_GObjInf* i_tg
daAlink_ANM anm;
daAlink_WANM wolf_anm;
if ((mLinkAcch.ChkGroundHit() && !temp_r27) || checkMagneBootsOn()) {
if (mEquipItem == fpcNm_ITEM_IRONBALL) {
if (mEquipItem == dItemNo_IRONBALL_e) {
setIronBallWaitUpperAnime(1);
}
anm = ANM_ELEC_STUN_GND;
src/d/actor/d_a_alink_demo.inc
+326 -326
View File
@@ -31,7 +31,7 @@ void daAlink_c::createNpcTks(cXyz* i_basePos, int i_roomNo, u32 i_parameters) {
cXyz pos(i_basePos->x + cM_ssin(shape_angle.y) * 200.0f, i_basePos->y,
i_basePos->z + cM_scos(shape_angle.y) * 200.0f);
csXyz angle(0, shape_angle.y + 0x8000, 0);
fopAcM_create(PROC_NPC_TKS, i_parameters, &pos, i_roomNo, &angle, NULL, -1);
fopAcM_create(fpcNm_NPC_TKS_e, i_parameters, &pos, i_roomNo, &angle, NULL, -1);
}
bool daAlink_c::checkSetNpcTks(cXyz* i_basePos, int i_roomNo, int param_2) {
@@ -41,8 +41,8 @@ bool daAlink_c::checkSetNpcTks(cXyz* i_basePos, int i_roomNo, int param_2) {
if (param_2 != 0 && checkDungeon() &&
dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) != dStage_SaveTbl_LV8 &&
dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) != dStage_SaveTbl_LV9 &&
(checkItemGet(fpcNm_ITEM_TKS_LETTER, TRUE) ||
(checkItemGet(fpcNm_ITEM_DUNGEON_BACK, TRUE) && !checkLv7DungeonShop())) &&
(checkItemGet(dItemNo_TKS_LETTER_e, TRUE) ||
(checkItemGet(dItemNo_DUNGEON_BACK_e, TRUE) && !checkLv7DungeonShop())) &&
dComIfGs_isDungeonItemWarp())
{
if (!dComIfGs_isStageBossEnemy()) {
@@ -152,7 +152,7 @@ int daAlink_c::checkDemoAction() {
checkBoarRide() || checkCanoeRide())
{
if (demoMode == daPy_demo_c::DEMO_UNK_6_e && (checkHorseRide() || checkBoarRide())) {
if (mEquipItem != fpcNm_ITEM_NONE && mEquipItem != fpcNm_ITEM_KANTERA && !checkEquipAnime()) {
if (mEquipItem != dItemNo_NONE_e && mEquipItem != dItemNo_KANTERA_e && !checkEquipAnime()) {
allUnequip(1);
}
}
@@ -208,13 +208,13 @@ int daAlink_c::checkDemoAction() {
} else if (mDemo.getParam0() == 4) {
if (!checkFishingRodItem(mEquipItem)) {
deleteEquipItem(FALSE, TRUE);
mEquipItem = fpcNm_ITEM_FISHING_ROD_1;
mEquipItem = dItemNo_FISHING_ROD_1_e;
setGroundFishingRodActor();
}
} else if (mDemo.getParam0() == 3) {
if (!checkCanoeRide()) {
daCanoe_c* canoe_p = (daCanoe_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchCanoe, NULL);
canoe_p->onRodID(fopAcM_create(PROC_MG_ROD, 0xD, &mLeftHandPos, -1, NULL, NULL, -1));
canoe_p->onRodID(fopAcM_create(fpcNm_MG_ROD_e, 0xD, &mLeftHandPos, -1, NULL, NULL, -1));
return procCanoeJumpRideInit(NULL);
}
return 1;
@@ -632,7 +632,7 @@ void daAlink_c::setDemoData() {
freeGrabItem();
if (dComIfGp_evmng_startCheck("R22-opening")) {
if (mEquipItem == fpcNm_ITEM_IRONBALL) {
if (mEquipItem == dItemNo_IRONBALL_e) {
deleteEquipItem(FALSE, FALSE);
}
} else {
@@ -746,7 +746,7 @@ void daAlink_c::setDemoData() {
}
}
if ((mEquipItem == fpcNm_ITEM_IRONBALL || checkFishingRodItem(mEquipItem)) && demo_mode != daPy_demo_c::DEMO_UNK_1_e &&
if ((mEquipItem == dItemNo_IRONBALL_e || checkFishingRodItem(mEquipItem)) && demo_mode != daPy_demo_c::DEMO_UNK_1_e &&
demo_mode != daPy_demo_c::DEMO_UNK_31_e && (mAlinkStaffId != -1 || mDemo.getDemoType() == daPy_demo_c::DEMO_TYPE_ORIGINAL_e) &&
(demo_mode != daPy_demo_c::DEMO_UNK_6_e || (!var_r28 && !checkEquipAnime())))
{
@@ -1004,45 +1004,45 @@ BOOL daAlink_c::checkFlyAtnWait() {
}
void daAlink_c::setGetItemFace(u16 i_itemNo) {
if (i_itemNo == fpcNm_ITEM_SILVER_RUPEE
|| i_itemNo == fpcNm_ITEM_ORANGE_RUPEE
|| i_itemNo == fpcNm_ITEM_KAKERA_HEART
|| i_itemNo == fpcNm_ITEM_UTAWA_HEART
|| i_itemNo == fpcNm_ITEM_WEAR_ZORA
|| i_itemNo == fpcNm_ITEM_WALLET_LV3
|| (i_itemNo >= fpcNm_ITEM_BOOMERANG && i_itemNo <= fpcNm_ITEM_W_HOOKSHOT)
|| i_itemNo == fpcNm_ITEM_FISHING_ROD_1
|| i_itemNo == fpcNm_ITEM_ARROW_LV3
|| i_itemNo == fpcNm_ITEM_LINKS_SAVINGS
|| i_itemNo == fpcNm_ITEM_FAIRY_DROP
|| i_itemNo == fpcNm_ITEM_DROP_BOTTLE
|| i_itemNo == fpcNm_ITEM_ANCIENT_DOCUMENT2
|| i_itemNo == fpcNm_ITEM_DROP_CONTAINER
|| i_itemNo == fpcNm_ITEM_DROP_CONTAINER02
|| i_itemNo == fpcNm_ITEM_DROP_CONTAINER03)
if (i_itemNo == dItemNo_SILVER_RUPEE_e
|| i_itemNo == dItemNo_ORANGE_RUPEE_e
|| i_itemNo == dItemNo_KAKERA_HEART_e
|| i_itemNo == dItemNo_UTAWA_HEART_e
|| i_itemNo == dItemNo_WEAR_ZORA_e
|| i_itemNo == dItemNo_WALLET_LV3_e
|| (i_itemNo >= dItemNo_BOOMERANG_e && i_itemNo <= dItemNo_W_HOOKSHOT_e)
|| i_itemNo == dItemNo_FISHING_ROD_1_e
|| i_itemNo == dItemNo_ARROW_LV3_e
|| i_itemNo == dItemNo_LINKS_SAVINGS_e
|| i_itemNo == dItemNo_FAIRY_DROP_e
|| i_itemNo == dItemNo_DROP_BOTTLE_e
|| i_itemNo == dItemNo_ANCIENT_DOCUMENT2_e
|| i_itemNo == dItemNo_DROP_CONTAINER_e
|| i_itemNo == dItemNo_DROP_CONTAINER02_e
|| i_itemNo == dItemNo_DROP_CONTAINER03_e)
{
setFaceBasicBck(dRes_ID_ALANM_BCK_FI_e);
} else if (i_itemNo == fpcNm_ITEM_DUNGEON_EXIT || i_itemNo == fpcNm_ITEM_LV7_DUNGEON_EXIT) {
} else if (i_itemNo == dItemNo_DUNGEON_EXIT_e || i_itemNo == dItemNo_LV7_DUNGEON_EXIT_e) {
setFaceBasicTexture(FTANM_K_A);
setFaceBasicBck(dRes_ID_ALANM_BCK_FK_e);
} else if (i_itemNo == fpcNm_ITEM_TOMATO_PUREE || i_itemNo == fpcNm_ITEM_TASTE) {
} else if (i_itemNo == dItemNo_TOMATO_PUREE_e || i_itemNo == dItemNo_TASTE_e) {
setFaceBasicBck(dRes_ID_ALANM_BCK_FJ_e);
}
}
BOOL daAlink_c::checkGrabTalkActor(fopAc_ac_c* i_actor) {
s16 name = fopAcM_GetName(i_actor);
return name == PROC_NPC_KYURY || name == PROC_MYNA || name == PROC_OBJ_SSITEM ||
name == PROC_TAG_MSG;
return name == fpcNm_NPC_KYURY_e || name == fpcNm_MYNA_e || name == fpcNm_OBJ_SSITEM_e ||
name == fpcNm_TAG_MSG_e;
}
int daAlink_c::setTalkStartBack(cXyz* param_0) {
fopAc_ac_c* partner_p = fopAcM_getTalkEventPartner(this);
if (partner_p != NULL) {
s16 partner_name = fopAcM_GetName(partner_p);
if (partner_name == PROC_MIDNA || partner_name == PROC_Tag_Wljump ||
partner_name == PROC_Tag_Mhint || partner_name == PROC_Tag_Mstop ||
partner_name == PROC_Tag_Mwait)
if (partner_name == fpcNm_MIDNA_e || partner_name == fpcNm_Tag_Wljump_e ||
partner_name == fpcNm_Tag_Mhint_e || partner_name == fpcNm_Tag_Mstop_e ||
partner_name == fpcNm_Tag_Mwait_e)
{
return 0;
}
@@ -1073,14 +1073,14 @@ void daAlink_c::setShapeAngleToTalkActor() {
if (partner_p != NULL) {
s16 partner_name = fopAcM_GetName(partner_p);
if (partner_name != PROC_MYNA &&
(partner_name != PROC_Tag_Mwait || !static_cast<daTagMwait_c*>(partner_p)->checkEndMessage()) &&
(partner_name != PROC_Tag_Mhint || !static_cast<daTagMhint_c*>(partner_p)->checkNoAttention()) &&
(partner_name != PROC_Tag_Mstop || !static_cast<daTagMstop_c*>(partner_p)->checkNoAttention()) &&
partner_name != PROC_MIDNA)
if (partner_name != fpcNm_MYNA_e &&
(partner_name != fpcNm_Tag_Mwait_e || !static_cast<daTagMwait_c*>(partner_p)->checkEndMessage()) &&
(partner_name != fpcNm_Tag_Mhint_e || !static_cast<daTagMhint_c*>(partner_p)->checkNoAttention()) &&
(partner_name != fpcNm_Tag_Mstop_e || !static_cast<daTagMstop_c*>(partner_p)->checkNoAttention()) &&
partner_name != fpcNm_MIDNA_e)
{
s16 target;
if (partner_name == PROC_Tag_Mhint || partner_name == PROC_Tag_Mstop) {
if (partner_name == fpcNm_Tag_Mhint_e || partner_name == fpcNm_Tag_Mstop_e) {
target = cLib_targetAngleY(&current.pos, &partner_p->eyePos);
} else {
target = fopAcM_searchActorAngleY(this, partner_p);
@@ -1092,7 +1092,7 @@ void daAlink_c::setShapeAngleToTalkActor() {
}
void daAlink_c::setTalkAnime() {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_8_e || mEquipItem == fpcNm_ITEM_KANTERA ||
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_8_e || mEquipItem == dItemNo_KANTERA_e ||
(checkNoResetFlg2(FLG2_UNK_1) && field_0x2fde == 0x48))
{
setDoubleAnime(0.0f, mpHIO->mMove.m.mWaitAnmSpeed,
@@ -1238,7 +1238,7 @@ BOOL daAlink_c::checkRestartDead(int i_dmgAmount, BOOL i_checkZoraMag) {
i_dmgAmount *= (int)damageMagnification(i_checkZoraMag, 1);
if (mProcID != PROC_DEAD && i_dmgAmount >= dComIfGs_getLife() && !checkMagicArmorNoDamage() &&
!dComIfGs_checkBottle(fpcNm_ITEM_FAIRY))
!dComIfGs_checkBottle(dItemNo_FAIRY_e))
{
onNoResetFlg2(FLG2_FORCE_GAMEOVER);
procCoDeadInit(0);
@@ -1261,7 +1261,7 @@ void daAlink_c::setDeadRideSyncPos() {
}
BOOL daAlink_c::checkDeadHP() {
return ((dComIfGs_getLife() == 0 && !checkResetFlg0(RFLG0_UNK_400)) && !dComIfGs_checkBottle(fpcNm_ITEM_FAIRY)) ||
return ((dComIfGs_getLife() == 0 && !checkResetFlg0(RFLG0_UNK_400)) && !dComIfGs_checkBottle(dItemNo_FAIRY_e)) ||
checkNoResetFlg2(FLG2_FORCE_GAMEOVER) ||
(dComIfGp_getOxygenShowFlag() && dComIfGp_getNowOxygen() == 0);
}
@@ -1294,9 +1294,9 @@ BOOL daAlink_c::checkDeadAction(int param_0) {
return commonFallInit(1);
}
} else if (dComIfGs_getLife() == 0 && !checkResetFlg0(RFLG0_UNK_400) && dComIfGs_checkBottle(fpcNm_ITEM_FAIRY)) {
} else if (dComIfGs_getLife() == 0 && !checkResetFlg0(RFLG0_UNK_400) && dComIfGs_checkBottle(dItemNo_FAIRY_e)) {
makeFairy(&current.pos, 0);
dComIfGs_setBottleItemIn(fpcNm_ITEM_FAIRY, fpcNm_ITEM_EMPTY_BOTTLE);
dComIfGs_setBottleItemIn(dItemNo_FAIRY_e, dItemNo_EMPTY_BOTTLE_e);
}
}
@@ -1707,7 +1707,7 @@ int daAlink_c::procCoTalkInit() {
commonProcInit(PROC_TALK);
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_6_e) {
if (mEquipItem != fpcNm_ITEM_KANTERA && mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_KANTERA_e && mEquipItem != dItemNo_NONE_e) {
allUnequip(1);
}
}
@@ -1790,7 +1790,7 @@ int daAlink_c::procCoTalk() {
mNormalSpeed = 0.0f;
}
} else {
if (mEquipItem == fpcNm_ITEM_KANTERA) {
if (mEquipItem == dItemNo_KANTERA_e) {
if (mUpperAnmHeap[0].getIdx() != getMainBckData(ANM_WAIT)->m_upperID) {
setSingleAnimeBaseSpeed(ANM_WAIT, mpHIO->mMove.m.mWaitAnmSpeed, 3.0f);
}
@@ -1896,7 +1896,7 @@ int daAlink_c::procCoUnequipInit() {
setBlendMoveAnime(mpHIO->mBasic.m.mBasicInterpolation);
if (mDemo.getParam1() == 0) {
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
allUnequip(0);
}
} else if (mDemo.getParam1() == 1) {
@@ -1917,7 +1917,7 @@ int daAlink_c::procCoUnequip() {
if (mProcVar2.field_0x300c != 0) {
if (checkAnmEnd(mUnderFrameCtrl)) {
setBlendMoveAnime(3.0f);
itemEquip(fpcNm_ITEM_COPY_ROD);
itemEquip(dItemNo_COPY_ROD_e);
mUpperFrameCtrl[2].setFrame(6.0f);
getNowAnmPackUpper(UPPER_2)->setFrame(6.0f);
@@ -1951,265 +1951,265 @@ void daAlink_c::setGetSubBgm(int i_itemNo) {
};
static const u8 getSeType[255] = {
/* fpcNm_ITEM_HEART */ SETYPE_NONE,
/* fpcNm_ITEM_GREEN_RUPEE */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_BLUE_RUPEE */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_YELLOW_RUPEE */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_RED_RUPEE */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_PURPLE_RUPEE */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_ORANGE_RUPEE */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_SILVER_RUPEE */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_S_MAGIC */ SETYPE_NONE,
/* fpcNm_ITEM_L_MAGIC */ SETYPE_NONE,
/* fpcNm_ITEM_BOMB_5 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_BOMB_10 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_BOMB_20 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_BOMB_30 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_ARROW_10 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_ARROW_20 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_ARROW_30 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_ARROW_1 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_PACHINKO_SHOT */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_NOENTRY_19 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_20 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_21 */ SETYPE_NONE,
/* fpcNm_ITEM_WATER_BOMB_5 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_WATER_BOMB_10 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_WATER_BOMB_20 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_WATER_BOMB_30 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_BOMB_INSECT_5 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_BOMB_INSECT_10 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_BOMB_INSECT_20 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_BOMB_INSECT_30 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_RECOVERY_FAILY */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_TRIPLE_HEART */ SETYPE_NONE,
/* fpcNm_ITEM_SMALL_KEY */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_KAKERA_HEART */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_UTAWA_HEART */ SETYPE_HEART,
/* fpcNm_ITEM_MAP */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_COMPUS */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_DUNGEON_EXIT */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_BOSS_KEY */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_DUNGEON_BACK */ SETYPE_NONE,
/* fpcNm_ITEM_SWORD */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_MASTER_SWORD */ SETYPE_NONE,
/* fpcNm_ITEM_WOOD_SHIELD */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_SHIELD */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_HYLIA_SHIELD */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_TKS_LETTER */ SETYPE_NONE,
/* fpcNm_ITEM_WEAR_CASUAL */ SETYPE_NONE,
/* fpcNm_ITEM_WEAR_KOKIRI */ SETYPE_NONE,
/* fpcNm_ITEM_ARMOR */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_WEAR_ZORA */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_MAGIC_LV1 */ SETYPE_NONE,
/* fpcNm_ITEM_DUNGEON_EXIT_2 */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_WALLET_LV1 */ SETYPE_NONE,
/* fpcNm_ITEM_WALLET_LV2 */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_WALLET_LV3 */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_NOENTRY_55 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_56 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_57 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_58 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_59 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_60 */ SETYPE_NONE,
/* fpcNm_ITEM_ZORAS_JEWEL */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_HAWK_EYE */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_WOOD_STICK */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_BOOMERANG */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_SPINNER */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_IRONBALL */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_BOW */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_HOOKSHOT */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_HVY_BOOTS */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_COPY_ROD */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_W_HOOKSHOT */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_KANTERA */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_LIGHT_SWORD */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_FISHING_ROD_1 */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_PACHINKO */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_COPY_ROD_2 */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_NOENTRY_77 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_78 */ SETYPE_NONE,
/* fpcNm_ITEM_BOMB_BAG_LV2 */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_BOMB_BAG_LV1 */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_BOMB_IN_BAG */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_NOENTRY_82 */ SETYPE_NONE,
/* fpcNm_ITEM_LIGHT_ARROW */ SETYPE_NONE,
/* fpcNm_ITEM_ARROW_LV1 */ SETYPE_NONE,
/* fpcNm_ITEM_ARROW_LV2 */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_ARROW_LV3 */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_NOENTRY_87 */ SETYPE_NONE,
/* fpcNm_ITEM_LURE_ROD */ SETYPE_NONE,
/* fpcNm_ITEM_BOMB_ARROW */ SETYPE_NONE,
/* fpcNm_ITEM_HAWK_ARROW */ SETYPE_NONE,
/* fpcNm_ITEM_BEE_ROD */ SETYPE_NONE,
/* fpcNm_ITEM_JEWEL_ROD */ SETYPE_NONE,
/* fpcNm_ITEM_WORM_ROD */ SETYPE_NONE,
/* fpcNm_ITEM_JEWEL_BEE_ROD */ SETYPE_NONE,
/* fpcNm_ITEM_JEWEL_WORM_ROD */ SETYPE_NONE,
/* fpcNm_ITEM_EMPTY_BOTTLE */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_RED_BOTTLE */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_GREEN_BOTTLE */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_BLUE_BOTTLE */ SETYPE_ITEM_GET_MINI,
/* dItemNo_HEART_e */ SETYPE_NONE,
/* dItemNo_GREEN_RUPEE_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_BLUE_RUPEE_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_YELLOW_RUPEE_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_RED_RUPEE_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_PURPLE_RUPEE_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_ORANGE_RUPEE_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_SILVER_RUPEE_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_S_MAGIC_e */ SETYPE_NONE,
/* dItemNo_L_MAGIC_e */ SETYPE_NONE,
/* dItemNo_BOMB_5_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_BOMB_10_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_BOMB_20_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_BOMB_30_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_ARROW_10_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_ARROW_20_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_ARROW_30_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_ARROW_1_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_PACHINKO_SHOT_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_NOENTRY_19_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_20_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_21_e */ SETYPE_NONE,
/* dItemNo_WATER_BOMB_5_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_WATER_BOMB_10_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_WATER_BOMB_20_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_WATER_BOMB_30_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_BOMB_INSECT_5_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_BOMB_INSECT_10_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_BOMB_INSECT_20_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_BOMB_INSECT_30_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_RECOVERY_FAILY_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_TRIPLE_HEART_e */ SETYPE_NONE,
/* dItemNo_SMALL_KEY_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_KAKERA_HEART_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_UTAWA_HEART_e */ SETYPE_HEART,
/* dItemNo_MAP_e */ SETYPE_ITEM_GET,
/* dItemNo_COMPUS_e */ SETYPE_ITEM_GET,
/* dItemNo_DUNGEON_EXIT_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_BOSS_KEY_e */ SETYPE_ITEM_GET,
/* dItemNo_DUNGEON_BACK_e */ SETYPE_NONE,
/* dItemNo_SWORD_e */ SETYPE_ITEM_GET,
/* dItemNo_MASTER_SWORD_e */ SETYPE_NONE,
/* dItemNo_WOOD_SHIELD_e */ SETYPE_ITEM_GET,
/* dItemNo_SHIELD_e */ SETYPE_ITEM_GET,
/* dItemNo_HYLIA_SHIELD_e */ SETYPE_ITEM_GET,
/* dItemNo_TKS_LETTER_e */ SETYPE_NONE,
/* dItemNo_WEAR_CASUAL_e */ SETYPE_NONE,
/* dItemNo_WEAR_KOKIRI_e */ SETYPE_NONE,
/* dItemNo_ARMOR_e */ SETYPE_ITEM_GET,
/* dItemNo_WEAR_ZORA_e */ SETYPE_ITEM_GET,
/* dItemNo_MAGIC_LV1_e */ SETYPE_NONE,
/* dItemNo_DUNGEON_EXIT_2_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_WALLET_LV1_e */ SETYPE_NONE,
/* dItemNo_WALLET_LV2_e */ SETYPE_ITEM_GET,
/* dItemNo_WALLET_LV3_e */ SETYPE_ITEM_GET,
/* dItemNo_NOENTRY_55_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_56_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_57_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_58_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_59_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_60_e */ SETYPE_NONE,
/* dItemNo_ZORAS_JEWEL_e */ SETYPE_ITEM_GET,
/* dItemNo_HAWK_EYE_e */ SETYPE_ITEM_GET,
/* dItemNo_WOOD_STICK_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_BOOMERANG_e */ SETYPE_ITEM_GET,
/* dItemNo_SPINNER_e */ SETYPE_ITEM_GET,
/* dItemNo_IRONBALL_e */ SETYPE_ITEM_GET,
/* dItemNo_BOW_e */ SETYPE_ITEM_GET,
/* dItemNo_HOOKSHOT_e */ SETYPE_ITEM_GET,
/* dItemNo_HVY_BOOTS_e */ SETYPE_ITEM_GET,
/* dItemNo_COPY_ROD_e */ SETYPE_ITEM_GET,
/* dItemNo_W_HOOKSHOT_e */ SETYPE_ITEM_GET,
/* dItemNo_KANTERA_e */ SETYPE_ITEM_GET,
/* dItemNo_LIGHT_SWORD_e */ SETYPE_ITEM_GET,
/* dItemNo_FISHING_ROD_1_e */ SETYPE_ITEM_GET,
/* dItemNo_PACHINKO_e */ SETYPE_ITEM_GET,
/* dItemNo_COPY_ROD_2_e */ SETYPE_ITEM_GET,
/* dItemNo_NOENTRY_77_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_78_e */ SETYPE_NONE,
/* dItemNo_BOMB_BAG_LV2_e */ SETYPE_ITEM_GET,
/* dItemNo_BOMB_BAG_LV1_e */ SETYPE_ITEM_GET,
/* dItemNo_BOMB_IN_BAG_e */ SETYPE_ITEM_GET,
/* dItemNo_NOENTRY_82_e */ SETYPE_NONE,
/* dItemNo_LIGHT_ARROW_e */ SETYPE_NONE,
/* dItemNo_ARROW_LV1_e */ SETYPE_NONE,
/* dItemNo_ARROW_LV2_e */ SETYPE_ITEM_GET,
/* dItemNo_ARROW_LV3_e */ SETYPE_ITEM_GET,
/* dItemNo_NOENTRY_87_e */ SETYPE_NONE,
/* dItemNo_LURE_ROD_e */ SETYPE_NONE,
/* dItemNo_BOMB_ARROW_e */ SETYPE_NONE,
/* dItemNo_HAWK_ARROW_e */ SETYPE_NONE,
/* dItemNo_BEE_ROD_e */ SETYPE_NONE,
/* dItemNo_JEWEL_ROD_e */ SETYPE_NONE,
/* dItemNo_WORM_ROD_e */ SETYPE_NONE,
/* dItemNo_JEWEL_BEE_ROD_e */ SETYPE_NONE,
/* dItemNo_JEWEL_WORM_ROD_e */ SETYPE_NONE,
/* dItemNo_EMPTY_BOTTLE_e */ SETYPE_ITEM_GET,
/* dItemNo_RED_BOTTLE_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_GREEN_BOTTLE_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_BLUE_BOTTLE_e */ SETYPE_ITEM_GET_MINI,
#if PLATFORM_SHIELD
/* fpcNm_ITEM_MILK_BOTTLE */ SETYPE_ITEM_GET,
/* dItemNo_MILK_BOTTLE_e */ SETYPE_ITEM_GET,
#else
/* fpcNm_ITEM_MILK_BOTTLE */ SETYPE_ITEM_GET_MINI,
/* dItemNo_MILK_BOTTLE_e */ SETYPE_ITEM_GET_MINI,
#endif
/* fpcNm_ITEM_HALF_MILK_BOTTLE */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_OIL_BOTTLE */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_WATER_BOTTLE */ SETYPE_NONE,
/* fpcNm_ITEM_OIL_BOTTLE_2 */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_RED_BOTTLE_2 */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_UGLY_SOUP */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_HOT_SPRING */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_FAIRY */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_HOT_SPRING_2 */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_OIL2 */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_OIL */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_NORMAL_BOMB */ SETYPE_NONE,
/* fpcNm_ITEM_WATER_BOMB */ SETYPE_NONE,
/* fpcNm_ITEM_POKE_BOMB */ SETYPE_NONE,
/* fpcNm_ITEM_FAIRY_DROP */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_WORM */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_DROP_BOTTLE */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_BEE_CHILD */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_CHUCHU_RARE */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_CHUCHU_RED */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_CHUCHU_BLUE */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_CHUCHU_GREEN */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_CHUCHU_YELLOW */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_CHUCHU_PURPLE */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_LV1_SOUP */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_LV2_SOUP */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_LV3_SOUP */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_LETTER */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_BILL */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_WOOD_STATUE */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_IRIAS_PENDANT */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_HORSE_FLUTE */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_133 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_134 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_135 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_136 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_137 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_138 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_139 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_140 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_141 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_142 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_143 */ SETYPE_NONE,
/* fpcNm_ITEM_RAFRELS_MEMO */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_ASHS_SCRIBBLING */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_NOENTRY_146 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_147 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_148 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_149 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_150 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_151 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_152 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_153 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_154 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_155 */ SETYPE_NONE,
/* fpcNm_ITEM_CHUCHU_YELLOW2 */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_OIL_BOTTLE3 */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_SHOP_BEE_CHILD */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_CHUCHU_BLACK */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_LIGHT_DROP */ SETYPE_NONE,
/* fpcNm_ITEM_DROP_CONTAINER */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_DROP_CONTAINER02 */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_DROP_CONTAINER03 */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_FILLED_CONTAINER */ SETYPE_NONE,
/* fpcNm_ITEM_MIRROR_PIECE_2 */ SETYPE_NONE,
/* fpcNm_ITEM_MIRROR_PIECE_3 */ SETYPE_NONE,
/* fpcNm_ITEM_MIRROR_PIECE_4 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_168 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_169 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_170 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_171 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_172 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_173 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_174 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_175 */ SETYPE_NONE,
/* fpcNm_ITEM_SMELL_YELIA_POUCH */ SETYPE_ITEM_GET_SMELL,
/* fpcNm_ITEM_SMELL_PUMPKIN */ SETYPE_ITEM_GET_SMELL,
/* fpcNm_ITEM_SMELL_POH */ SETYPE_ITEM_GET_SMELL,
/* fpcNm_ITEM_SMELL_FISH */ SETYPE_ITEM_GET_SMELL,
/* fpcNm_ITEM_SMELL_CHILDREN */ SETYPE_ITEM_GET_SMELL,
/* fpcNm_ITEM_SMELL_MEDICINE */ SETYPE_ITEM_GET_SMELL,
/* fpcNm_ITEM_NOENTRY_182 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_183 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_184 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_185 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_186 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_187 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_188 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_189 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_190 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_191 */ SETYPE_NONE,
/* fpcNm_ITEM_M_BEETLE */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_F_BEETLE */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_M_BUTTERFLY */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_F_BUTTERFLY */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_M_STAG_BEETLE */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_F_STAG_BEETLE */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_M_GRASSHOPPER */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_F_GRASSHOPPER */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_M_NANAFUSHI */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_F_NANAFUSHI */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_M_DANGOMUSHI */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_F_DANGOMUSHI */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_M_MANTIS */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_F_MANTIS */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_M_LADYBUG */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_F_LADYBUG */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_M_SNAIL */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_F_SNAIL */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_M_DRAGONFLY */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_F_DRAGONFLY */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_M_ANT */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_F_ANT */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_M_MAYFLY */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_F_MAYFLY */ SETYPE_ITEM_GET_INSECT,
/* fpcNm_ITEM_NOENTRY_216 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_217 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_218 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_219 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_220 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_221 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_222 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_223 */ SETYPE_NONE,
/* fpcNm_ITEM_POU_SPIRIT */ SETYPE_ITEM_GET_POU,
/* fpcNm_ITEM_NOENTRY_225 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_226 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_227 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_228 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_229 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_230 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_231 */ SETYPE_NONE,
/* fpcNm_ITEM_NOENTRY_232 */ SETYPE_NONE,
/* fpcNm_ITEM_ANCIENT_DOCUMENT */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_AIR_LETTER */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_ANCIENT_DOCUMENT2 */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_LV7_DUNGEON_EXIT */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_LINKS_SAVINGS */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_SMALL_KEY2 */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_POU_FIRE1 */ SETYPE_NONE,
/* fpcNm_ITEM_POU_FIRE2 */ SETYPE_NONE,
/* fpcNm_ITEM_POU_FIRE3 */ SETYPE_NONE,
/* fpcNm_ITEM_POU_FIRE4 */ SETYPE_NONE,
/* fpcNm_ITEM_BOSSRIDER_KEY */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_TOMATO_PUREE */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_TASTE */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_LV5_BOSS_KEY */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_SURFBOARD */ SETYPE_NONE,
/* fpcNm_ITEM_KANTERA2 */ SETYPE_ITEM_GET_ME,
/* fpcNm_ITEM_L2_KEY_PIECES1 */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_L2_KEY_PIECES2 */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_L2_KEY_PIECES3 */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_KEY_OF_CARAVAN */ SETYPE_ITEM_GET_MINI,
/* fpcNm_ITEM_LV2_BOSS_KEY */ SETYPE_ITEM_GET,
/* fpcNm_ITEM_KEY_OF_FILONE */ SETYPE_ITEM_GET_MINI,
/* dItemNo_HALF_MILK_BOTTLE_e */ SETYPE_ITEM_GET,
/* dItemNo_OIL_BOTTLE_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_WATER_BOTTLE_e */ SETYPE_NONE,
/* dItemNo_OIL_BOTTLE_2_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_RED_BOTTLE_2_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_UGLY_SOUP_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_HOT_SPRING_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_FAIRY_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_HOT_SPRING_2_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_OIL2_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_OIL_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_NORMAL_BOMB_e */ SETYPE_NONE,
/* dItemNo_WATER_BOMB_e */ SETYPE_NONE,
/* dItemNo_POKE_BOMB_e */ SETYPE_NONE,
/* dItemNo_FAIRY_DROP_e */ SETYPE_ITEM_GET,
/* dItemNo_WORM_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_DROP_BOTTLE_e */ SETYPE_ITEM_GET,
/* dItemNo_BEE_CHILD_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_CHUCHU_RARE_e */ SETYPE_ITEM_GET,
/* dItemNo_CHUCHU_RED_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_CHUCHU_BLUE_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_CHUCHU_GREEN_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_CHUCHU_YELLOW_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_CHUCHU_PURPLE_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_LV1_SOUP_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_LV2_SOUP_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_LV3_SOUP_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_LETTER_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_BILL_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_WOOD_STATUE_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_IRIAS_PENDANT_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_HORSE_FLUTE_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_133_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_134_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_135_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_136_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_137_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_138_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_139_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_140_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_141_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_142_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_143_e */ SETYPE_NONE,
/* dItemNo_RAFRELS_MEMO_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_ASHS_SCRIBBLING_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_NOENTRY_146_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_147_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_148_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_149_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_150_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_151_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_152_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_153_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_154_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_155_e */ SETYPE_NONE,
/* dItemNo_CHUCHU_YELLOW2_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_OIL_BOTTLE3_e */ SETYPE_ITEM_GET,
/* dItemNo_SHOP_BEE_CHILD_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_CHUCHU_BLACK_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_LIGHT_DROP_e */ SETYPE_NONE,
/* dItemNo_DROP_CONTAINER_e */ SETYPE_ITEM_GET,
/* dItemNo_DROP_CONTAINER02_e */ SETYPE_ITEM_GET,
/* dItemNo_DROP_CONTAINER03_e */ SETYPE_ITEM_GET,
/* dItemNo_FILLED_CONTAINER_e */ SETYPE_NONE,
/* dItemNo_MIRROR_PIECE_2_e */ SETYPE_NONE,
/* dItemNo_MIRROR_PIECE_3_e */ SETYPE_NONE,
/* dItemNo_MIRROR_PIECE_4_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_168_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_169_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_170_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_171_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_172_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_173_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_174_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_175_e */ SETYPE_NONE,
/* dItemNo_SMELL_YELIA_POUCH_e */ SETYPE_ITEM_GET_SMELL,
/* dItemNo_SMELL_PUMPKIN_e */ SETYPE_ITEM_GET_SMELL,
/* dItemNo_SMELL_POH_e */ SETYPE_ITEM_GET_SMELL,
/* dItemNo_SMELL_FISH_e */ SETYPE_ITEM_GET_SMELL,
/* dItemNo_SMELL_CHILDREN_e */ SETYPE_ITEM_GET_SMELL,
/* dItemNo_SMELL_MEDICINE_e */ SETYPE_ITEM_GET_SMELL,
/* dItemNo_NOENTRY_182_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_183_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_184_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_185_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_186_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_187_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_188_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_189_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_190_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_191_e */ SETYPE_NONE,
/* dItemNo_M_BEETLE_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_F_BEETLE_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_M_BUTTERFLY_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_F_BUTTERFLY_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_M_STAG_BEETLE_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_F_STAG_BEETLE_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_M_GRASSHOPPER_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_F_GRASSHOPPER_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_M_NANAFUSHI_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_F_NANAFUSHI_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_M_DANGOMUSHI_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_F_DANGOMUSHI_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_M_MANTIS_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_F_MANTIS_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_M_LADYBUG_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_F_LADYBUG_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_M_SNAIL_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_F_SNAIL_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_M_DRAGONFLY_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_F_DRAGONFLY_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_M_ANT_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_F_ANT_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_M_MAYFLY_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_F_MAYFLY_e */ SETYPE_ITEM_GET_INSECT,
/* dItemNo_NOENTRY_216_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_217_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_218_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_219_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_220_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_221_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_222_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_223_e */ SETYPE_NONE,
/* dItemNo_POU_SPIRIT_e */ SETYPE_ITEM_GET_POU,
/* dItemNo_NOENTRY_225_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_226_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_227_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_228_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_229_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_230_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_231_e */ SETYPE_NONE,
/* dItemNo_NOENTRY_232_e */ SETYPE_NONE,
/* dItemNo_ANCIENT_DOCUMENT_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_AIR_LETTER_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_ANCIENT_DOCUMENT2_e */ SETYPE_ITEM_GET,
/* dItemNo_LV7_DUNGEON_EXIT_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_LINKS_SAVINGS_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_SMALL_KEY2_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_POU_FIRE1_e */ SETYPE_NONE,
/* dItemNo_POU_FIRE2_e */ SETYPE_NONE,
/* dItemNo_POU_FIRE3_e */ SETYPE_NONE,
/* dItemNo_POU_FIRE4_e */ SETYPE_NONE,
/* dItemNo_BOSSRIDER_KEY_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_TOMATO_PUREE_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_TASTE_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_LV5_BOSS_KEY_e */ SETYPE_ITEM_GET,
/* dItemNo_SURFBOARD_e */ SETYPE_NONE,
/* dItemNo_KANTERA2_e */ SETYPE_ITEM_GET_ME,
/* dItemNo_L2_KEY_PIECES1_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_L2_KEY_PIECES2_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_L2_KEY_PIECES3_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_KEY_OF_CARAVAN_e */ SETYPE_ITEM_GET_MINI,
/* dItemNo_LV2_BOSS_KEY_e */ SETYPE_ITEM_GET,
/* dItemNo_KEY_OF_FILONE_e */ SETYPE_ITEM_GET_MINI,
};
static u32 const bgmLabel[8] = {
@@ -2232,8 +2232,8 @@ void daAlink_c::setGetSubBgm(int i_itemNo) {
BOOL daAlink_c::checkTreasureRupeeReturn(int i_itemNo) const {
static const int dummy = 0;
if (i_itemNo == fpcNm_ITEM_LINKS_SAVINGS) {
i_itemNo = fpcNm_ITEM_PURPLE_RUPEE;
if (i_itemNo == dItemNo_LINKS_SAVINGS_e) {
i_itemNo = dItemNo_PURPLE_RUPEE_e;
}
i_itemNo -= 4;
@@ -2264,9 +2264,9 @@ int daAlink_c::procCoGetItemInit() {
mLinkAcch.ClrWallNone();
if (!checkWolf() && mEquipItem != fpcNm_ITEM_NONE && var_r30 == 0) {
if (!checkWolf() && mEquipItem != dItemNo_NONE_e && var_r30 == 0) {
if (checkModeFlg(0x400) ||
(checkStageName("D_MN05B") && mEquipItem == fpcNm_ITEM_BOOMERANG && !dComIfGs_isItemFirstBit(fpcNm_ITEM_BOOMERANG)))
(checkStageName("D_MN05B") && mEquipItem == dItemNo_BOOMERANG_e && !dComIfGs_isItemFirstBit(dItemNo_BOOMERANG_e)))
{
deleteEquipItem(FALSE, FALSE);
} else {
@@ -2426,8 +2426,8 @@ int daAlink_c::procCoGetItem() {
daItemBase_c* item_partner_p = (daItemBase_c*)fopAcM_getItemEventPartner(this);
#if DEBUG
if (item_partner_p != NULL && fopAcM_GetName(item_partner_p) != PROC_ITEM &&
fopAcM_GetName(item_partner_p) != PROC_Demo_Item)
if (item_partner_p != NULL && fopAcM_GetName(item_partner_p) != fpcNm_ITEM_e &&
fopAcM_GetName(item_partner_p) != fpcNm_Demo_Item_e)
{
// "Get Item is not an item!!! %d\n"
OSReport("ゲットするアイテムがアイテムじゃない！！！　%d\n",
@@ -2559,7 +2559,7 @@ int daAlink_c::procCoGetItem() {
if (checkWolf()) {
setBlendWolfMoveAnime(mpHIO->mWolf.mWlMove.m.mNormalInterpolation);
} else {
if (mEquipItem == fpcNm_ITEM_KANTERA) {
if (mEquipItem == dItemNo_KANTERA_e) {
field_0x2f94 = 0;
}
@@ -2889,7 +2889,7 @@ int daAlink_c::procDemoBoomerangCatchInit() {
mNormalSpeed = 0.0f;
deleteEquipItem(FALSE, FALSE);
mEquipItem = fpcNm_ITEM_BOOMERANG;
mEquipItem = dItemNo_BOOMERANG_e;
setItemActor();
setSingleAnimeParam(ANM_BOOMERANG_CATCH, &mpHIO->mItem.mBoomerang.m.mCatchAnm);
return 1;
@@ -3511,7 +3511,7 @@ int daAlink_c::procCoGetReadySitInit() {
return 1;
}
if (mEquipItem != fpcNm_ITEM_NONE && !checkWolf()) {
if (mEquipItem != dItemNo_NONE_e && !checkWolf()) {
return procPreActionUnequipInit(PROC_GET_READY_SIT, NULL);
}
@@ -3795,8 +3795,8 @@ int daAlink_c::procTradeItemOut() {
daItemBase_c* item_partner_p = (daItemBase_c*)fopAcM_getItemEventPartner(this);
if (item_partner_p != NULL) {
if (!fpcM_IsCreating(fpcM_GetID(item_partner_p))) {
if (fopAcM_GetName(item_partner_p) == PROC_ITEM ||
fopAcM_GetName(item_partner_p) == PROC_Demo_Item)
if (fopAcM_GetName(item_partner_p) == fpcNm_ITEM_e ||
fopAcM_GetName(item_partner_p) == fpcNm_Demo_Item_e)
{
field_0x280c.setData(item_partner_p);
item_partner_p->show();
@@ -3828,8 +3828,8 @@ int daAlink_c::procTradeItemOut() {
}
BOOL daAlink_c::checkLetterItem(int i_itemNo) {
return i_itemNo == fpcNm_ITEM_LETTER || i_itemNo == fpcNm_ITEM_BILL || i_itemNo == fpcNm_ITEM_RAFRELS_MEMO ||
i_itemNo == fpcNm_ITEM_TKS_LETTER || i_itemNo == fpcNm_ITEM_ASHS_SCRIBBLING;
return i_itemNo == dItemNo_LETTER_e || i_itemNo == dItemNo_BILL_e || i_itemNo == dItemNo_RAFRELS_MEMO_e ||
i_itemNo == dItemNo_TKS_LETTER_e || i_itemNo == dItemNo_ASHS_SCRIBBLING_e;
}
int daAlink_c::procNotUseItemInit(int i_itemNo) {
@@ -3871,8 +3871,8 @@ int daAlink_c::procNotUseItem() {
if (mProcVar3.field_0x300e != 0) {
daItemBase_c* item_partner_p = (daItemBase_c*)fopAcM_getItemEventPartner(this);
#if DEBUG
if (item_partner_p != NULL && fopAcM_GetName(item_partner_p) != PROC_ITEM &&
fopAcM_GetName(item_partner_p) != PROC_Demo_Item)
if (item_partner_p != NULL && fopAcM_GetName(item_partner_p) != fpcNm_ITEM_e &&
fopAcM_GetName(item_partner_p) != fpcNm_Demo_Item_e)
{
// "Present Item is not this Item!!! %d\n"
OSReport("差し出すアイテムがアイテムじゃない！！！　%d\n",
@@ -4102,11 +4102,11 @@ int daAlink_c::procDungeonWarpReadyInit() {
}
fpc_ProcID id;
if (checkItemSetButton(fpcNm_ITEM_DUNGEON_EXIT) != 2) {
id = fopAcM_create(PROC_OBJ_TKS, 0, &current.pos, fopAcM_GetRoomNo(this), &shape_angle,
if (checkItemSetButton(dItemNo_DUNGEON_EXIT_e) != 2) {
id = fopAcM_create(fpcNm_OBJ_TKS_e, 0, &current.pos, fopAcM_GetRoomNo(this), &shape_angle,
NULL, -1);
} else {
id = fopAcM_create(PROC_NPC_TKC, 2, &current.pos, fopAcM_GetRoomNo(this), &shape_angle,
id = fopAcM_create(fpcNm_NPC_TKC_e, 2, &current.pos, fopAcM_GetRoomNo(this), &shape_angle,
NULL, -1);
}
@@ -4132,7 +4132,7 @@ int daAlink_c::procDungeonWarpReady() {
if (warpActor != NULL) {
field_0x280c.setData(warpActor);
if (fopAcM_GetName(warpActor) == PROC_OBJ_TKS) {
if (fopAcM_GetName(warpActor) == fpcNm_OBJ_TKS_e) {
((daObjTks_c*)warpActor)->setStart();
} else {
((daNpcTkc_c*)warpActor)->setStart();
@@ -4190,7 +4190,7 @@ int daAlink_c::procDungeonWarp() {
if (scale.x < 0.01f) {
onNoResetFlg0(FLG0_PLAYER_NO_DRAW);
if (checkItemGet(fpcNm_ITEM_DUNGEON_EXIT, 1)) {
if (checkItemGet(dItemNo_DUNGEON_EXIT_e, 1)) {
dStage_changeScene(dStage_stagInfo_GetEscapeWarp(dComIfGp_getStage()->getStagInfo()), 0.0f, 12, -1, shape_angle.y, -1);
dMeter2Info_warpOutProc();
} else {
@@ -4280,7 +4280,7 @@ int daAlink_c::procDungeonWarpSceneStart() {
static fopAc_ac_c* daAlink_searchPortal(fopAc_ac_c* i_actor, void* i_data) {
cXyz* pos = (cXyz*)i_data;
if (fopAcM_GetName(i_actor) == PROC_KYTAG04) {
if (fopAcM_GetName(i_actor) == fpcNm_KYTAG04_e) {
if (i_actor->current.pos.abs2XZ(*pos) < 1.0f) {
return i_actor;
}
@@ -4521,11 +4521,11 @@ int daAlink_c::procCoWarpInit(int param_0, int param_1) {
}
}
if (checkItemGet(fpcNm_ITEM_DUNGEON_EXIT, 1) ||
(checkItemGet(fpcNm_ITEM_DUNGEON_BACK, 1) &&
if (checkItemGet(dItemNo_DUNGEON_EXIT_e, 1) ||
(checkItemGet(dItemNo_DUNGEON_BACK_e, 1) &&
strcmp(stageName, dComIfGs_getWarpStageName()) == 0))
{
dComIfGs_setItem(SLOT_18, fpcNm_ITEM_NONE);
dComIfGs_setItem(SLOT_18, dItemNo_NONE_e);
dComIfGs_resetLastWarpAcceptStage();
}
}
src/d/actor/d_a_alink_effect.inc
+4 -4
View File
@@ -1394,7 +1394,7 @@ void daAlink_c::setWolfBarrierHitEffect(dBgS_LinChk& i_linchk) {
const u16* effNames;
s16 movebg_name = getMoveBGActorName(i_linchk, TRUE);
if (movebg_name == PROC_Obj_GanonWall2 || movebg_name == PROC_OBJ_GB) {
if (movebg_name == fpcNm_Obj_GanonWall2_e || movebg_name == fpcNm_OBJ_GB_e) {
effNames = ganonNameID;
} else {
effNames = normalNameID;
@@ -1665,7 +1665,7 @@ void daAlink_c::setBottleEffect() {
JPABaseEmitter* emitter;
if (mEquipItem == fpcNm_ITEM_FAIRY) {
if (mEquipItem == dItemNo_FAIRY_e) {
if (mpHookTipModel != NULL) {
cXyz pos;
mDoMtx_multVecZero(mpHookTipModel->getAnmMtx(2), &pos);
@@ -1677,7 +1677,7 @@ void daAlink_c::setBottleEffect() {
emitter = setEmitter(&field_0x325c, ID_ZF_J_FAIRYITEM02_STAR, &pos, NULL);
}
} else if (mEquipItem == fpcNm_ITEM_CHUCHU_RARE && mProcID == PROC_BOTTLE_GET) {
} else if (mEquipItem == dItemNo_CHUCHU_RARE_e && mProcID == PROC_BOTTLE_GET) {
if (field_0x072c != NULL && field_0x072c->getFrame() < 2.0f) {
cXyz pos;
mDoMtx_multVec(mHeldItemModel->getAnmMtx(0), &chuchuLocalOffset, &pos);
@@ -1687,7 +1687,7 @@ void daAlink_c::setBottleEffect() {
emitter->setGlobalScale(chuchuScale);
}
}
} else if (mProcID == PROC_BOTTLE_OPEN && mProcVar3.field_0x300e != 0 && mEquipItem == fpcNm_ITEM_WATER_BOTTLE) {
} else if (mProcID == PROC_BOTTLE_OPEN && mProcVar3.field_0x300e != 0 && mEquipItem == dItemNo_WATER_BOTTLE_e) {
emitter = setEmitter(&field_0x325c, ID_ZI_J_LK_BINWATERN_A, &current.pos, NULL);
if (emitter != NULL) {
emitter->setGlobalRTMatrix(mHeldItemModel->getBaseTRMtx());
src/d/actor/d_a_alink_grab.inc
+66 -66
View File
@@ -11,7 +11,7 @@
static bool daAlink_checkLightBallA(fopAc_ac_c* i_actor) {
daObjCarry_c* carry = (daObjCarry_c*)i_actor;
if (fopAcM_GetName(carry) == PROC_Obj_Carry &&
if (fopAcM_GetName(carry) == fpcNm_Obj_Carry_e &&
carry->getType() == daObjCarry_c::TYPE_BALL_S)
{
return true;
@@ -23,7 +23,7 @@ static bool daAlink_checkLightBallA(fopAc_ac_c* i_actor) {
static bool daAlink_checkLightBallB(fopAc_ac_c* i_actor) {
daObjCarry_c* carry = (daObjCarry_c*)i_actor;
if (fopAcM_GetName(carry) == PROC_Obj_Carry &&
if (fopAcM_GetName(carry) == fpcNm_Obj_Carry_e &&
carry->getType() == daObjCarry_c::TYPE_BALL_S_2)
{
return true;
@@ -85,7 +85,7 @@ BOOL daAlink_c::exchangeGrabActor(fopAc_ac_c* i_actor) {
BOOL daAlink_c::setForceGrab(fopAc_ac_c* i_actor, BOOL param_1, BOOL param_2) {
if (((param_1 || !checkEventRun()) && !checkWolf())
&& ((mEquipItem == fpcNm_ITEM_NONE || (param_2 && checkHookshotItem(mEquipItem)))
&& ((mEquipItem == dItemNo_NONE_e || (param_2 && checkHookshotItem(mEquipItem)))
&& ((checkModeFlg(MODE_UNK_10000000)
&& (checkHorseNoUpperAnime() || checkHorseTurnAnime())
)
@@ -133,7 +133,7 @@ BOOL daAlink_c::checkGrabSlowMoveActor() {
daObjCarry_c* carry = (daObjCarry_c*)mGrabItemAcKeep.getActor();
return carry != NULL &&
(fopAcM_CheckCarryType(carry, fopAcM_CARRY_HEAVY) ||
(fopAcM_GetName(carry) == PROC_Obj_Carry
(fopAcM_GetName(carry) == fpcNm_Obj_Carry_e
&& (carry->getType() == daObjCarry_c::TYPE_OOTSUBO || carry->getType() == daObjCarry_c::TYPE_AOTSUBO || carry->getType() == daObjCarry_c::TYPE_TARU)));
}
@@ -177,8 +177,8 @@ void daAlink_c::setGrabUpperAnime(f32 param_0) {
BOOL daAlink_c::checkGrabRooster() {
if (mGrabItemAcKeep.getActor() != NULL &&
(fopAcM_GetName(mGrabItemAcKeep.getActor()) == PROC_NI ||
fopAcM_GetName(mGrabItemAcKeep.getActor()) == PROC_NPC_TKJ2))
(fopAcM_GetName(mGrabItemAcKeep.getActor()) == fpcNm_NI_e ||
fopAcM_GetName(mGrabItemAcKeep.getActor()) == fpcNm_NPC_TKJ2_e))
{
return true;
}
@@ -200,7 +200,7 @@ void daAlink_c::setGrabItemPos() {
grabActor->tevStr.room_no = roomNo;
grabActor->tevStr.YukaCol = tevStr.YukaCol;
fopAcM_SetRoomNo(grabActor, roomNo);
BOOL isGrabCarryActor = checkGrabCarryActor();
s16 spE;
s16 spC;
@@ -211,7 +211,7 @@ void daAlink_c::setGrabItemPos() {
spE = shape_angle.y;
spC = (field_0x2fee + field_0x3082);
}
if (checkGrabSideThrowAnime()) {
mDoMtx_multVecZero(mpLinkModel->getAnmMtx(10), &grabActor->current.pos);
grabActor->shape_angle.y = spE;
@@ -232,7 +232,7 @@ void daAlink_c::setGrabItemPos() {
mDoMtx_stack_c::transM(78.0f, 42.0f, 0.0f);
mDoMtx_stack_c::ZrotM(cM_deg2s(138.0f));
} else {
if (fopAcM_GetName(grabActor) == PROC_OBJ_FOOD) {
if (fopAcM_GetName(grabActor) == fpcNm_OBJ_FOOD_e) {
mDoMtx_stack_c::transM(32.0f, 7.0f, 0.0f);
} else {
mDoMtx_stack_c::transM(30.0f, 12.0f, 0.0f);
@@ -244,7 +244,7 @@ void daAlink_c::setGrabItemPos() {
mDoMtx_stack_c::multVecZero(&grabActor->current.pos);
mDoMtx_MtxToRot(mDoMtx_stack_c::get(), &grabActor->shape_angle);
} else {
BOOL sp14 = fopAcM_GetName(grabActor) == PROC_NPC_TKJ2;
BOOL sp14 = fopAcM_GetName(grabActor) == fpcNm_NPC_TKJ2_e;
if (mProcID == PROC_GRAB_UP) {
cLib_chaseAngleS(&grabActor->shape_angle.y, spE, 0x1000);
@@ -306,7 +306,7 @@ void daAlink_c::setGrabItemPos() {
}
mDoMtx_stack_c::multVec(&sp140, &grabActor->current.pos);
if (checkGrabAnimeSide()) {
static Vec const localSidePos = {2.3f, -15.5f, 15.6f};
mDoMtx_multVec(mpLinkModel->getAnmMtx(10), &localSidePos, &sp140);
@@ -398,7 +398,7 @@ void daAlink_c::freeGrabItem() {
if (grabActor != NULL) {
if (dComIfGp_event_runCheck() || mDemo.getDemoType() == daPy_demo_c::DEMO_TYPE_SPECIAL_e) {
fopAcM_OnStatus(grabActor, fopAcM_STATUS_UNK_0x800);
fopAcM_OnStatus(grabActor, fopAcStts_STAFF_EXTRA_e);
}
fopAcM_cancelCarryNow(grabActor);
@@ -474,7 +474,7 @@ void daAlink_c::setGrabUpperSpeedRate() {
}
cLib_chaseF(&field_0x33e8, var_f31, 0.15f);
daPy_frameCtrl_c* framectrl = &mUpperFrameCtrl[2];
framectrl->setFrame(field_0x33e8 * framectrl->getEnd());
getNowAnmPackUpper(UPPER_2)->setFrame(framectrl->getFrame());
@@ -490,7 +490,7 @@ void daAlink_c::setCarryArmAngle(f32 param_0, f32 param_1) {
field_0x312a[1].set(0, temp_r29 + (2000.0f * param_1), temp_r29 + (2000.0f * param_1));
field_0x3136[1].set(0, 0, temp_r29 - (3500.0f * param_1));
if (param_1 < 0.0f) {
ANGLE_ADD(field_0x312a[0].z, 2500.0f * param_1);
ANGLE_ADD(field_0x3136[0].y, 2000.0f * param_1);
@@ -516,7 +516,7 @@ BOOL daAlink_c::checkNextActionGrab() {
setCarryArmAngle(0.0f, 1.0f);
if (mTargetedActor == NULL && mAttList != NULL && mAttList->mType == fopAc_attn_DOOR_e && fopAcM_CheckStatus(grabActor, fopAcM_STATUS_UNK_0x2000000)) {
if (mTargetedActor == NULL && mAttList != NULL && mAttList->mType == fopAc_attn_DOOR_e && fopAcM_CheckStatus(grabActor, fopAcStts_UNK_0x2000000_e)) {
setDoStatus(BUTTON_STATUS_OPEN);
} else if ((field_0x27f4 == NULL) || !checkGrabTalkActor(field_0x27f4) || !setTalkStatus()) {
if (checkModeFlg(0x400)) {
@@ -539,7 +539,7 @@ BOOL daAlink_c::checkNextActionGrab() {
daNbomb_c* var_r28 = (daNbomb_c*)grabActor;
if (doTrigger()
|| (fopAcM_GetName(grabActor) == PROC_NBOMB
|| (fopAcM_GetName(grabActor) == fpcNm_NBOMB_e
&& var_r28->checkPlayerMake()
&& (checkSetItemTrigger(0x50) || (var_r28->checkWaterBomb() && checkSetItemTrigger(0x71)) || (!var_r28->checkWaterBomb() && checkSetItemTrigger(0x70)))
)
@@ -688,13 +688,13 @@ void daAlink_c::setGrabItemActor(fopAc_ac_c* i_actor) {
mObjGndChk.ClrLink();
s16 name = fopAcM_GetName(i_actor);
if (dBomb_c::checkBombActor(i_actor) || name == PROC_Obj_Stone) {
if (dBomb_c::checkBombActor(i_actor) || name == fpcNm_Obj_Stone_e) {
mObjLinChk.SetBomb();
mObjGndChk.SetBomb();
} else if (name == PROC_CSTATUE) {
} else if (name == fpcNm_CSTATUE_e) {
mObjLinChk.SetStatue();
mObjGndChk.SetStatue();
} else if (name == PROC_Obj_Carry && ((daObjCarry_c*)i_actor)->prm_chk_type_ironball()) {
} else if (name == fpcNm_Obj_Carry_e && ((daObjCarry_c*)i_actor)->prm_chk_type_ironball()) {
mObjLinChk.SetLink();
mObjGndChk.SetLink();
} else {
@@ -708,7 +708,7 @@ int daAlink_c::procGrabReadyInit() {
return checkWaitAction();
}
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
return procPreActionUnequipInit(PROC_GRAB_READY, field_0x27f4);
}
@@ -734,7 +734,7 @@ int daAlink_c::procGrabReadyInit() {
field_0x347c = 1.0f / (9.0f - mpHIO->mGrab.m.mFailAnm.mStartFrame);
f32 var_f31;
if (fopAcM_GetName(mGrabItemAcKeep.getActor()) == PROC_DO) {
if (fopAcM_GetName(mGrabItemAcKeep.getActor()) == fpcNm_DO_e) {
var_f31 = 0.93f;
} else {
var_f31 = 1.0f;
@@ -1182,7 +1182,7 @@ int daAlink_c::procInsectCatchInit() {
return checkWaitAction();
}
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
return procPreActionUnequipInit(PROC_INSECT_CATCH, field_0x27f4);
}
@@ -1220,12 +1220,12 @@ int daAlink_c::procPickUpInit() {
return checkWaitAction();
}
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
return procPreActionUnequipInit(PROC_PICK_UP, field_0x27f4);
}
s16 temp_r3 = fopAcM_GetName(field_0x27f4);
if (temp_r3 == PROC_NPC_KS && !dComIfGp_event_compulsory(this, NULL, 0xFFFF)) {
if (temp_r3 == fpcNm_NPC_KS_e && !dComIfGp_event_compulsory(this, NULL, 0xFFFF)) {
return checkWaitAction();
}
@@ -1248,13 +1248,13 @@ int daAlink_c::procPickUpInit() {
}
BOOL var_r29;
if (temp_r3 == PROC_Obj_Kantera) {
if (temp_r3 == fpcNm_Obj_Kantera_e) {
setSingleAnimeParam(ANM_BOTTLE_SWING, &mpHIO->mItem.mBottle.m.mSwingSideAnm);
mProcVar3.field_0x300e = 1;
field_0x3478 = 7.0f;
mProcVar4.field_0x3010 = 0;
var_r29 = FALSE;
} else if (temp_r3 == PROC_NPC_KS) {
} else if (temp_r3 == fpcNm_NPC_KS_e) {
setSingleAnimeParam(ANM_BOTTLE_SWING_DOWN, &mpHIO->mItem.mBottle.m.mSwingDownAnm);
mProcVar3.field_0x300e = 1;
field_0x3478 = 7.0f;
@@ -1290,7 +1290,7 @@ int daAlink_c::procPickUp() {
onResetFlg0(RFLG0_GRAB_UP_START);
if (mProcVar4.field_0x3010 != 0) {
mEquipItem = fpcNm_ITEM_KANTERA;
mEquipItem = dItemNo_KANTERA_e;
setKandelaarModel();
}
}
@@ -1311,7 +1311,7 @@ int daAlink_c::procPickUp() {
}
int daAlink_c::procPickPutInit(int param_0) {
if (param_0 != 0 && mEquipItem != fpcNm_ITEM_NONE) {
if (param_0 != 0 && mEquipItem != dItemNo_NONE_e) {
return procPreActionUnequipInit(PROC_PICK_PUT, NULL);
}
@@ -1329,7 +1329,7 @@ int daAlink_c::procPickPutInit(int param_0) {
mProcVar2.field_0x300c = param_0;
if (mProcVar2.field_0x300c != 0) {
mEquipItem = fpcNm_ITEM_POKE_BOMB;
mEquipItem = dItemNo_POKE_BOMB_e;
} else {
onResetFlg0(RFLG0_GRAB_PUT_START);
}
@@ -1362,7 +1362,7 @@ int daAlink_c::procPickPut() {
dComIfGp_addSelectItemNum(mSelectItemId, -1);
field_0x2fcf++;
}
mEquipItem = fpcNm_ITEM_NONE;
mEquipItem = dItemNo_NONE_e;
} else {
field_0x3198 = 0;
itemActor->speedF = 0.0f;
@@ -1391,7 +1391,7 @@ s16 daAlink_c::getChainStickAngleY(s16 param_0) const {
u8 daAlink_c::checkChainEmphasys() {
fopAc_ac_c* temp_r3 = field_0x2844.getActor();
if (temp_r3 != NULL && fopAcM_GetName(temp_r3) == PROC_Obj_SwChain && !((daObjSwChain_c*)temp_r3)->checkDispEmphasis()) {
if (temp_r3 != NULL && fopAcM_GetName(temp_r3) == fpcNm_Obj_SwChain_e && !((daObjSwChain_c*)temp_r3)->checkDispEmphasis()) {
return BUTTON_STATUS_FLAG_NONE;
}
@@ -1435,8 +1435,8 @@ bool daAlink_c::checkChainBlockPushPull() {
fopAc_ac_c* actor = field_0x2844.getActor();
if (actor != NULL) {
s16 name = fopAcM_GetName(actor);
if (name == PROC_Obj_ChainBlock || name == PROC_Obj_SwChain ||
name == PROC_Obj_ChainWall)
if (name == fpcNm_Obj_ChainBlock_e || name == fpcNm_Obj_SwChain_e ||
name == fpcNm_Obj_ChainWall_e)
{
return true;
}
@@ -1446,7 +1446,7 @@ bool daAlink_c::checkChainBlockPushPull() {
}
int daAlink_c::procFmChainUpInit() {
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
return procPreActionUnequipInit(PROC_CHAIN_UP, NULL);
}
@@ -1574,7 +1574,7 @@ int daAlink_c::setPushPullKeepData(dBgW_Base::PushPullLabel i_label, BOOL param_
BOOL daAlink_c::checkPushPullTurnBlock() {
s16 name = getMoveBGActorName(mPolyInfo1, 1);
return name == PROC_Obj_SwTurn || name == PROC_Obj_Lv6SwTurn || name == PROC_Obj_PushDoor || name == PROC_PushDoor || name == PROC_Obj_Ytaihou;
return name == fpcNm_Obj_SwTurn_e || name == fpcNm_Obj_Lv6SwTurn_e || name == fpcNm_Obj_PushDoor_e || name == fpcNm_PushDoor_e || name == fpcNm_Obj_Ytaihou_e;
}
BOOL daAlink_c::checkPullBehindWall() {
@@ -1619,12 +1619,12 @@ void daAlink_c::offGoatStopGame() {
BOOL daAlink_c::checkGoatCatchActor(fopAc_ac_c* i_actor) {
s16 name = fopAcM_GetName(i_actor);
return name == PROC_E_GOB || (name == PROC_OBJ_GRA && checkSpecialNpc(i_actor)) ||
name == PROC_COW;
return name == fpcNm_E_GOB_e || (name == fpcNm_OBJ_GRA_e && checkSpecialNpc(i_actor)) ||
name == fpcNm_COW_e;
}
f32 daAlink_c::getGoatCatchDistance2() {
if (fopAcM_GetName(field_0x27f4) == PROC_B_MGN) {
if (fopAcM_GetName(field_0x27f4) == fpcNm_B_MGN_e) {
return SQUARE(1000.0f);
}
@@ -1637,8 +1637,8 @@ int daAlink_c::endPushPull() {
f32 daAlink_c::getPushPullAnimeSpeed() {
f32 speed;
if ((getMoveBGActorName(mPolyInfo1, 0) == PROC_Obj_Movebox && ((daObjMovebox::Act_c*)dComIfG_Bgsp().GetActorPointer(mPolyInfo1))->getType() != 0) ||
getMoveBGActorName(mPolyInfo1, 0) == PROC_Obj_Bemos)
if ((getMoveBGActorName(mPolyInfo1, 0) == fpcNm_Obj_Movebox_e && ((daObjMovebox::Act_c*)dComIfG_Bgsp().GetActorPointer(mPolyInfo1))->getType() != 0) ||
getMoveBGActorName(mPolyInfo1, 0) == fpcNm_Obj_Bemos_e)
{
if (checkWolf()) {
speed = mpHIO->mWolf.mWlPush.m.mHeavyPushAnmSpeed;
@@ -1655,7 +1655,7 @@ f32 daAlink_c::getPushPullAnimeSpeed() {
}
int daAlink_c::procCoPushPullWaitInit(int param_0) {
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
return procPreActionUnequipInit(PROC_PUSH_PULL_WAIT, NULL);
}
@@ -1703,7 +1703,7 @@ int daAlink_c::procCoPushPullWait() {
f32 temp_f31 = cLib_addCalc(&current.pos.x, field_0x37c8.x, 0.5f, 10.0f, 1.0f);
temp_f31 += cLib_addCalc(&current.pos.z, field_0x37c8.z, 0.5f, 10.0f, 1.0f);
if (temp_r28 == 0 && temp_f31 < 5.0f && checkNoUpperAnime()) {
current.pos.x = field_0x37c8.x;
current.pos.z = field_0x37c8.z;
@@ -1717,7 +1717,7 @@ int daAlink_c::procCoPushPullWait() {
} else if (checkInputOnR()) {
int direction = getDirectionFromShapeAngle();
if (direction == DIR_FORWARD) {
procCoPushMoveInit(0, getMoveBGActorName(mPolyInfo1, 1) == PROC_Obj_IceBlock);
procCoPushMoveInit(0, getMoveBGActorName(mPolyInfo1, 1) == fpcNm_Obj_IceBlock_e);
} else if (!checkWolf() && direction == DIR_BACKWARD) {
procPullMoveInit(0);
}
@@ -1968,7 +1968,7 @@ int daAlink_c::procPullMove() {
static fopAc_ac_c* daAlink_searchGoat(fopAc_ac_c* i_actor, void* i_data) {
UNUSED(i_data);
if (fopAcM_GetName(i_actor) == PROC_COW) {
if (fopAcM_GetName(i_actor) == fpcNm_COW_e) {
return i_actor;
}
@@ -1984,9 +1984,9 @@ void daAlink_c::cancelGoronThrowEvent() {
void daAlink_c::setGoatStopGameFail(fopAc_ac_c* i_actor) {
s16 actor_name = fopAcM_GetName(i_actor);
if (actor_name == PROC_OBJ_GRA) {
if (actor_name == fpcNm_OBJ_GRA_e) {
((daObj_GrA_c*)i_actor)->setCrazyDash();
} else if (actor_name == PROC_COW) {
} else if (actor_name == fpcNm_COW_e) {
((daCow_c*)i_actor)->setCrazyDash();
} else {
((fopEn_enemy_c*)i_actor)->setThrowModeDash();
@@ -2004,9 +2004,9 @@ void daAlink_c::setGoatStopGameFail(fopAc_ac_c* i_actor) {
if (checkGoatStopGame()) {
onNoResetFlg0(FLG0_GORON_UP_STOP_CANCEL);
} else {
if (!checkBootsOrArmorHeavy() && actor_name == PROC_OBJ_GRA) {
if (!checkBootsOrArmorHeavy() && actor_name == fpcNm_OBJ_GRA_e) {
setDamagePointNormal(2);
} else if (actor_name != PROC_COW) {
} else if (actor_name != fpcNm_COW_e) {
setDamagePointNormal(1);
}
@@ -2148,7 +2148,7 @@ int daAlink_c::procGoatMove() {
var_f30 = 1.0f;
framectrl->setLoop(framectrl->getStart());
}
framectrl->setRate(var_f30 * (mNormalSpeed / mMaxSpeed));
initBasAnime();
}
@@ -2172,15 +2172,15 @@ int daAlink_c::procGoatCatchInit(fopAc_ac_c* i_actor, f32 param_1) {
setDoStatus(BUTTON_STATUS_NONE);
return 0;
}
deleteEquipItem(TRUE, FALSE);
if (!dComIfGp_event_compulsory(this, NULL, 0xFFEF)) {
return 0;
}
mDemo.setSpecialDemoType();
i_actor->actor_status |= 0x800;
i_actor->actor_status |= fopAcStts_STAFF_EXTRA_e;
}
commonProcInit(PROC_GOAT_CATCH);
@@ -2215,9 +2215,9 @@ int daAlink_c::procGoatCatchInit(fopAc_ac_c* i_actor, f32 param_1) {
setSingleAnimeBase(ANM_COW_CATCH_START);
s16 actor_name = fopAcM_GetName(i_actor);
if (actor_name == PROC_OBJ_GRA) {
if (actor_name == fpcNm_OBJ_GRA_e) {
((daObj_GrA_c*)i_actor)->setCrazyCatch();
} else if (actor_name == PROC_COW) {
} else if (actor_name == fpcNm_COW_e) {
((daCow_c*)i_actor)->setCrazyCatch();
} else {
((fopEn_enemy_c*)i_actor)->setThrowModeCatch();
@@ -2299,7 +2299,7 @@ int daAlink_c::procGoatCatch() {
field_0x2fe4 = shape_angle.y;
}
if (actor_name == PROC_OBJ_GRA) {
if (actor_name == fpcNm_OBJ_GRA_e) {
field_0x2f99 = 0x30;
setSingleAnimeBaseSpeed(ANM_WAIT_B, mpHIO->mMove.m.mWaitAnmSpeed, 3.0f);
offModeFlg(0x8000);
@@ -2351,16 +2351,16 @@ int daAlink_c::procGoatCatch() {
if (checkAnmEnd(framectrl)) {
setSingleAnimeBase(ANM_COW_CATCH);
}
field_0x2f9d = 0x60;
anm = ANM_COW_CATCH;
if (field_0x3198 > 0) {
field_0x3198 += 1;
cLib_chaseF(&mNormalSpeed, 30.0f, 1.0f);
} else {
f32 speed_step = 1.0f;
if ((actor_name == PROC_OBJ_GRA || actor_name == PROC_E_GOB) && !checkBootsOrArmorHeavy()) {
if ((actor_name == fpcNm_OBJ_GRA_e || actor_name == fpcNm_E_GOB_e) && !checkBootsOrArmorHeavy()) {
field_0x3198++;
} else if (checkInputOnR() && direction == DIR_FORWARD) {
speed_step += 1.0f;
@@ -2396,7 +2396,7 @@ int daAlink_c::procGoatCatch() {
field_0x2f99 = 4;
if (checkAnmEnd(framectrl)) {
if (actor_name == PROC_E_GOB && !checkBootsOrArmorHeavy()) {
if (actor_name == fpcNm_E_GOB_e && !checkBootsOrArmorHeavy()) {
setGoatStopGameFail(temp_r3);
return 1;
}
@@ -2406,18 +2406,18 @@ int daAlink_c::procGoatCatch() {
}
if (mProcVar3.field_0x300e == 2) {
if (actor_name == PROC_OBJ_GRA) {
if (actor_name == fpcNm_OBJ_GRA_e) {
((daObj_GrA_c*)temp_r3)->setCrazyThrowLeft();
} else if (actor_name == PROC_COW) {
} else if (actor_name == fpcNm_COW_e) {
((daCow_c*)temp_r3)->setCrazyThrowLeft();
} else {
((fopEn_enemy_c*)temp_r3)->setThrowModeThrowLeft();
}
anm = ANM_COW_THROW_LEFT;
} else {
if (actor_name == PROC_OBJ_GRA) {
if (actor_name == fpcNm_OBJ_GRA_e) {
((daObj_GrA_c*)temp_r3)->setCrazyThrowRight();
} else if (actor_name == PROC_COW) {
} else if (actor_name == fpcNm_COW_e) {
((daCow_c*)temp_r3)->setCrazyThrowRight();
} else {
((fopEn_enemy_c*)temp_r3)->setThrowModeThrowRight();
@@ -2436,7 +2436,7 @@ int daAlink_c::procGoatCatch() {
}
int daAlink_c::procGoatStrokeInit() {
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
return procPreActionUnequipInit(PROC_GOAT_STROKE, field_0x27f4);
}
@@ -2469,7 +2469,7 @@ int daAlink_c::procGoatStroke() {
}
int daAlink_c::procGoronMoveInit() {
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
return procPreActionUnequipInit(PROC_GORON_MOVE, NULL);
}
@@ -2510,7 +2510,7 @@ int daAlink_c::procGoronMove() {
current.angle.y = shape_angle.y + 0x4000;
}
if (checkSetItemTrigger(fpcNm_ITEM_HVY_BOOTS)) {
if (checkSetItemTrigger(dItemNo_HVY_BOOTS_e)) {
return procBootsEquipInit();
}
src/d/actor/d_a_alink_guard.inc
+14 -14
View File
@@ -10,15 +10,15 @@
BOOL daAlink_c::checkEnemyGroup(fopAc_ac_c* i_actor) {
return i_actor != NULL
&& (fopAcM_GetGroup(i_actor) == fopAc_ENEMY_e || fopAcM_GetName(i_actor) == PROC_E_ZH || checkSpecialNpc(i_actor));
&& (fopAcM_GetGroup(i_actor) == fopAc_ENEMY_e || fopAcM_GetName(i_actor) == fpcNm_E_ZH_e || checkSpecialNpc(i_actor));
}
BOOL daAlink_c::checkSpecialNpc(fopAc_ac_c* i_actor) {
s16 name = fopAcM_GetName(i_actor);
return name == PROC_NPC_KAKASHI ||
(name == PROC_NPC_KN && static_cast<daNpc_Kn_c*>(i_actor)->checkBattleMode()) ||
(name == PROC_OBJ_GRA && !static_cast<daObj_GrA_c*>(i_actor)->checkNpcObjGra());
return name == fpcNm_NPC_KAKASHI_e ||
(name == fpcNm_NPC_KN_e && static_cast<daNpc_Kn_c*>(i_actor)->checkBattleMode()) ||
(name == fpcNm_OBJ_GRA_e && !static_cast<daObj_GrA_c*>(i_actor)->checkNpcObjGra());
}
BOOL daAlink_c::checkShieldAttackEmphasys() {
@@ -53,15 +53,15 @@ void daAlink_c::stickArrowIncrement(int param_0) {
if (arrow_num != 0) {
if (checkShieldGet()
#if !PLATFORM_SHIELD
&& checkItemGet(fpcNm_ITEM_BOW, true)
&& checkItemGet(dItemNo_BOW_e, true)
#endif
)
{
int arrow_type;
if (arrow_num == 1) {
arrow_type = fpcNm_ITEM_ARROW_1;
arrow_type = dItemNo_ARROW_1_e;
} else {
arrow_type = fpcNm_ITEM_ARROW_10;
arrow_type = dItemNo_ARROW_10_e;
}
dComIfGp_setItemArrowNumCount(arrow_num);
@@ -101,7 +101,7 @@ void daAlink_c::setArrowShieldActor(fopAc_ac_c* i_actor, int param_1) {
field_0x2f7c[arrow_num] = 10;
dComIfGp_setItemArrowNumCount(1);
fopAcM_createItemForSimpleDemo(&current.pos, fpcNm_ITEM_ARROW_10, -1, NULL, NULL, 0.0f, 0.0f);
fopAcM_createItemForSimpleDemo(&current.pos, dItemNo_ARROW_10_e, -1, NULL, NULL, 0.0f, 0.0f);
}
if (param_1 && field_0x2fcb == 0 && !checkMagicArmorNoDamage()) {
@@ -186,7 +186,7 @@ void daAlink_c::setUpperGuardAnime(f32 param_0) {
void daAlink_c::setShieldGuard() {
f32 var_f31 = mNowAnmPackUpper[2].getRatio();
if ((mProcID == PROC_GUARD_SLIP && mEquipItem != fpcNm_ITEM_IRONBALL) || checkSmallUpperGuardAnime() ||
if ((mProcID == PROC_GUARD_SLIP && mEquipItem != dItemNo_IRONBALL_e) || checkSmallUpperGuardAnime() ||
(checkGuardAccept() && !checkGrabAnime() && !checkUpperReadyThrowAnime() &&
!checkDkCaught2Anime() && !checkKandelaarSwingAnime() && !checkCutDashAnime() &&
!checkCutDashChargeAnime() && (!checkEquipAnime() || checkUpperGuardAnime()) &&
@@ -255,7 +255,7 @@ int daAlink_c::procGuardSlipInit(int i_atSpl, dCcD_GObjInf* i_objinf) {
const daAlinkHIO_anm_c* anmParams;
daAlink_ANM anm;
if (mEquipItem == fpcNm_ITEM_IRONBALL) {
if (mEquipItem == dItemNo_IRONBALL_e) {
setSingleAnimeBase(ANM_IRONBALL_DEF);
setIronBallWaitUpperAnime(1);
mNowAnmPackUpper[2].setRatio(0.0f);
@@ -294,7 +294,7 @@ int daAlink_c::procGuardSlipInit(int i_atSpl, dCcD_GObjInf* i_objinf) {
mProcVar4.field_0x3010 = 0;
mProcVar5.field_0x3012 = 0;
if (i_objinf != NULL && i_objinf->GetTgHitAc() != NULL && fopAcM_GetName(i_objinf->GetTgHitAc()) == PROC_E_MM_MT && i_objinf->GetTgHitAc()->argument == 1) {
if (i_objinf != NULL && i_objinf->GetTgHitAc() != NULL && fopAcM_GetName(i_objinf->GetTgHitAc()) == fpcNm_E_MM_MT_e && i_objinf->GetTgHitAc()->argument == 1) {
if (checkBootsOrArmorHeavy()) {
mNormalSpeed = mpHIO->mGuard.m.mMagneHvyGuardSpeed;
mProcVar5.field_0x3012 = 1;
@@ -322,7 +322,7 @@ int daAlink_c::procGuardSlipInit(int i_atSpl, dCcD_GObjInf* i_objinf) {
}
int daAlink_c::procGuardSlip() {
if (mEquipItem != fpcNm_ITEM_IRONBALL) {
if (mEquipItem != dItemNo_IRONBALL_e) {
setUpperGuardAnime(-1.0f);
}
@@ -356,7 +356,7 @@ int daAlink_c::procGuardSlip() {
onEndResetFlg1(ERFLG1_UNK_20);
}
if (mEquipItem == fpcNm_ITEM_IRONBALL) {
if (mEquipItem == dItemNo_IRONBALL_e) {
mNowAnmPackUpper[2].setRatio(1.0f);
}
@@ -495,7 +495,7 @@ int daAlink_c::procGuardBreakInit() {
commonProcInit(PROC_GUARD_BREAK);
setSingleAnimeParam(ANM_GUARD_BREAK, &mpHIO->mGuard.m.mGuardBreakAnm);
if (mEquipItem == fpcNm_ITEM_IRONBALL) {
if (mEquipItem == dItemNo_IRONBALL_e) {
deleteEquipItem(FALSE, FALSE);
}
src/d/actor/d_a_alink_hang.inc
+7 -7
View File
@@ -776,7 +776,7 @@ int daAlink_c::procHangWallCatch() {
}
int daAlink_c::procHangReadyInit() {
if (field_0x2f91 == 3 && mEquipItem != fpcNm_ITEM_NONE) {
if (field_0x2f91 == 3 && mEquipItem != dItemNo_NONE_e) {
return procPreActionUnequipInit(PROC_HANG_READY, NULL);
} else if (mProcID == PROC_PREACTION_UNEQUIP) {
setFrontWallType();
@@ -822,7 +822,7 @@ int daAlink_c::procHangReady() {
}
int daAlink_c::procHangLeverDownInit() {
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
return procPreActionUnequipInit(PROC_HANG_LEVER_DOWN, field_0x27f4);
}
@@ -881,7 +881,7 @@ int daAlink_c::procHangLeverDown() {
}
void daAlink_c::changeDragonActor(fopAc_ac_c* i_actor) {
if (field_0x280c.getActor() != NULL && fopAcM_GetName(field_0x280c.getActor()) == PROC_B_DR) {
if (field_0x280c.getActor() != NULL && fopAcM_GetName(field_0x280c.getActor()) == fpcNm_B_DR_e) {
field_0x280c.setData(i_actor);
}
}
@@ -892,7 +892,7 @@ int daAlink_c::setDragonHangPos() {
return 0;
}
if (fopAcM_GetName(dragon) == PROC_B_DR) {
if (fopAcM_GetName(dragon) == fpcNm_B_DR_e) {
mDoMtx_stack_c::copy(((daB_DR_c*)dragon)->getMtx());
} else {
mDoMtx_stack_c::copy(((daB_DRE_c*)dragon)->getMtx());
@@ -936,7 +936,7 @@ int daAlink_c::setBossBodyHangPos() {
int daAlink_c::procBossBodyHangInit(fopAc_ac_c* i_actor) {
commonProcInit(PROC_BOSS_BODY_HANG);
if (fopAcM_GetName(i_actor) == PROC_B_DR) {
if (fopAcM_GetName(i_actor) == fpcNm_B_DR_e) {
field_0x32cc = 1;
setSingleAnimeBase(ANM_DRAGON_HANG);
setJumpMode();
@@ -1294,7 +1294,7 @@ int daAlink_c::checkLadderFall() {
}
int daAlink_c::procLadderUpStartInit() {
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
return procPreActionUnequipInit(PROC_LADDER_UP_START, NULL);
}
@@ -1400,7 +1400,7 @@ int daAlink_c::procLadderUpEnd() {
int daAlink_c::procLadderDownStartInit() {
onNoResetFlg3(FLG3_UNK_400000);
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
return procPreActionUnequipInit(PROC_LADDER_DOWN_START, NULL);
}
src/d/actor/d_a_alink_hook.inc
+21 -21
View File
@@ -305,7 +305,7 @@ void daAlink_c::cancelHookshotCarry() {
}
void daAlink_c::changeHookshotDrawModel() {
if (mEquipItem == fpcNm_ITEM_HOOKSHOT && field_0x3020 == 1) {
if (mEquipItem == dItemNo_HOOKSHOT_e && field_0x3020 == 1) {
J3DModel* tmp = mHeldItemModel;
mHeldItemModel = field_0x0710;
field_0x0710 = tmp;
@@ -318,7 +318,7 @@ void daAlink_c::changeHookshotDrawModel() {
BOOL daAlink_c::checkHookshotRoofLv7Boss() {
return mCargoCarryAcKeep.getActor() != NULL &&
fopAcM_GetName(mCargoCarryAcKeep.getActor()) == PROC_B_DR;
fopAcM_GetName(mCargoCarryAcKeep.getActor()) == fpcNm_B_DR_e;
}
BOOL daAlink_c::checkChaseHookshot() {
@@ -335,8 +335,8 @@ BOOL daAlink_c::checkChaseHookshot() {
if (mTargetedActor != NULL) {
s16 actorName = fopAcM_GetName(mTargetedActor);
return field_0x2804 == mTargetedActor &&
(checkBossOctaIealRoom() || actorName == PROC_Obj_FallObj ||
actorName == PROC_B_DR || actorName == PROC_E_PH);
(checkBossOctaIealRoom() || actorName == fpcNm_Obj_FallObj_e ||
actorName == fpcNm_B_DR_e || actorName == fpcNm_E_PH_e);
}
return false;
@@ -416,7 +416,7 @@ void daAlink_c::setHookshotModel() {
resetHookshotMode();
mpHookChain->setUserArea((uintptr_t)this);
field_0x2f94 = 1;
if (mEquipItem == fpcNm_ITEM_W_HOOKSHOT) {
if (mEquipItem == dItemNo_W_HOOKSHOT_e) {
field_0x2f95 = 6;
}
@@ -462,7 +462,7 @@ void daAlink_c::setHookshotSight() {
mSight.onLockFlg();
if (mHookTargetAcKeep.getActor() != NULL &&
fopAcM_GetName(mHookTargetAcKeep.getActor()) == PROC_B_DR)
fopAcM_GetName(mHookTargetAcKeep.getActor()) == fpcNm_B_DR_e)
{
((daB_DR_c*)mHookTargetAcKeep.getActor())->onTarget();
}
@@ -757,14 +757,14 @@ int daAlink_c::setHookshotHangMoveBGCollect() {
field_0x3022 = sp8.y;
s16 movebg_name = getMoveBGActorName(*polyinfo, 1);
if (movebg_name == PROC_Obj_SwHang) {
if (movebg_name == fpcNm_Obj_SwHang_e) {
daObjSwHang_c* swhang = (daObjSwHang_c*)dComIfG_Bgsp().GetActorPointer(*polyinfo);
swhang->setHangPlayer();
f32 prev_y = mIronBallBgChkPos.y;
mIronBallBgChkPos.y = swhang->getHangPos().y;
current.pos.y += mIronBallBgChkPos.y - prev_y;
} else if (movebg_name == PROC_Obj_Chandelier) {
} else if (movebg_name == fpcNm_Obj_Chandelier_e) {
((daObjChandelier_c*)dComIfG_Bgsp().GetActorPointer(*polyinfo))->moveHookOn();
}
}
@@ -991,12 +991,12 @@ void daAlink_c::setHookshotPos() {
mHookshotTopPos = field_0x381c;
targetAc_p = mHookTargetAcKeep.getActor();
if (targetAc_p != NULL && (targetAc_p->actor_status & 0x280000)) {
if (targetAc_p != NULL && (targetAc_p->actor_status & (fopAcStts_UNK_0x200000_e | fopAcStts_UNK_0x80000_e))) {
mHookTargetAcKeep.setData(targetAc_p);
mIronBallCenterPos = mHookshotTopPos - targetAc_p->current.pos;
setHookshotCatchNow();
if (targetAc_p->actor_status & 0x200000) {
if (targetAc_p->actor_status & fopAcStts_UNK_0x200000_e) {
mItemMode = 5;
field_0x316c.set(field_0x301c, field_0x301e, 0);
mDoMtx_stack_c::ZrotS(-targetAc_p->shape_angle.z);
@@ -1338,7 +1338,7 @@ int daAlink_c::checkLandHookshotHang() {
((mProcID != PROC_HOOKSHOT_ROOF_SHOOT && mProcID != PROC_HOOKSHOT_WALL_SHOOT) ||
checkHookshotWait()) &&
(!checkHookshotRoofLv7Boss() || !checkEquipHeavyBoots()) &&
checkSetItemTrigger(fpcNm_ITEM_HVY_BOOTS))
checkSetItemTrigger(dItemNo_HVY_BOOTS_e))
{
if (dComIfGp_checkPlayerStatus1(0, 0x10000)) {
return procHookshotRoofBootsInit(mCargoCarryAcKeep.getActor());
@@ -1522,11 +1522,11 @@ int daAlink_c::procHookshotFly() {
if (targetAc_p != NULL) {
targetAc_name = fopAcM_GetName(targetAc_p);
} else {
targetAc_name = PROC_ALINK;
targetAc_name = fpcNm_ALINK_e;
}
BOOL var_r29 = FALSE;
if (targetAc_name == PROC_Obj_SwHang) {
if (targetAc_name == fpcNm_Obj_SwHang_e) {
int swhang_type = static_cast<daObjSwHang_c*>(targetAc_p)->getType();
if (swhang_type == 3 || swhang_type == 4) {
var_r29 = TRUE;
@@ -1557,15 +1557,15 @@ int daAlink_c::procHookshotFly() {
}
current.pos += field_0x37d4;
if (checkSetItemTrigger(fpcNm_ITEM_W_HOOKSHOT) != 0) {
if (checkSetItemTrigger(dItemNo_W_HOOKSHOT_e) != 0) {
mProcVar5.field_0x3012 = 1;
} else if (mProcVar5.field_0x3012 != 0 && !itemButton()) {
mProcVar5.field_0x3012 = 0;
}
if (mItemMode != 5 && mItemMode != HS_MODE_FLY_e) {
if (targetAc_name == PROC_B_OB ||
(targetAc_name == PROC_B_DR && static_cast<daB_DR_c*>(targetAc_p)->isBack()))
if (targetAc_name == fpcNm_B_OB_e ||
(targetAc_name == fpcNm_B_DR_e && static_cast<daB_DR_c*>(targetAc_p)->isBack()))
{
dComIfGp_getVibration().StartShock(1, 1, cXyz(0.0f, 1.0f, 0.0f));
return procBossBodyHangInit(targetAc_p);
@@ -1619,7 +1619,7 @@ int daAlink_c::procHookshotFly() {
} else if (is_force_fall) {
procFallInit(1, 5.0f);
field_0x2f99 = 0x70;
} else if (targetAc_name == PROC_E_PH || targetAc_name == PROC_B_DR || var_r29) {
} else if (targetAc_name == fpcNm_E_PH_e || targetAc_name == fpcNm_B_DR_e || var_r29) {
procHookshotRoofWaitInit(1, targetAc_p, mProcVar5.field_0x3012);
} else if (var_r28 && dComIfG_Bgsp().GetMonkeyBarsCode(mPolyInfo2)) {
cXyz sp88;
@@ -1739,7 +1739,7 @@ int daAlink_c::procHookshotRoofWait() {
setShapeAngleToAtnActor(0);
if (mProcVar2.field_0x300c == 0) {
if (checkSetItemTrigger(fpcNm_ITEM_W_HOOKSHOT)) {
if (checkSetItemTrigger(dItemNo_W_HOOKSHOT_e)) {
mProcVar5.field_0x3012 = 1;
} else if (mProcVar5.field_0x3012 != 0 && !itemButton()) {
mProcVar5.field_0x3012 = 0;
@@ -1754,7 +1754,7 @@ int daAlink_c::procHookshotRoofWait() {
mProcVar2.field_0x300c = 1;
}
} else if (!checkHookshotRoofLv7Boss()) {
if (checkSetItemTrigger(fpcNm_ITEM_W_HOOKSHOT) || mProcVar5.field_0x3012 != 0) {
if (checkSetItemTrigger(dItemNo_W_HOOKSHOT_e) || mProcVar5.field_0x3012 != 0) {
return procHookshotRoofShootInit(mCargoCarryAcKeep.getActor());
}
hookshotRoofTurn();
@@ -2000,7 +2000,7 @@ int daAlink_c::procHookshotWallWait() {
}
if (mProcVar2.field_0x300c == 0) {
if (checkSetItemTrigger(fpcNm_ITEM_W_HOOKSHOT)) {
if (checkSetItemTrigger(dItemNo_W_HOOKSHOT_e)) {
mProcVar5.field_0x3012 = 1;
} else if (mProcVar5.field_0x3012 != 0 && !itemButton()) {
mProcVar5.field_0x3012 = 0;
@@ -2014,7 +2014,7 @@ int daAlink_c::procHookshotWallWait() {
setHookshotWallWaitAnime();
mProcVar2.field_0x300c = 1;
}
} else if (checkSetItemTrigger(fpcNm_ITEM_W_HOOKSHOT) || mProcVar5.field_0x3012 != 0) {
} else if (checkSetItemTrigger(dItemNo_W_HOOKSHOT_e) || mProcVar5.field_0x3012 != 0) {
return procHookshotWallShootInit();
}
src/d/actor/d_a_alink_horse.inc
+10 -10
View File
@@ -13,7 +13,7 @@
static void* daAlink_searchBoar(fopAc_ac_c* i_actor, void* i_data) {
UNUSED(i_data);
if (fopAcM_GetName(i_actor) == PROC_E_WB) {
if (fopAcM_GetName(i_actor) == fpcNm_E_WB_e) {
if (((e_wb_class*)i_actor)->getModel() != NULL) {
return i_actor;
}
@@ -25,7 +25,7 @@ static void* daAlink_searchBoar(fopAc_ac_c* i_actor, void* i_data) {
static fopAc_ac_c* daAlink_searchCoach(fopAc_ac_c* i_actor, void* i_data) {
UNUSED(i_data);
if (fopAcM_GetName(i_actor) == PROC_NPC_COACH) {
if (fopAcM_GetName(i_actor) == fpcNm_NPC_COACH_e) {
return i_actor;
}
@@ -64,7 +64,7 @@ BOOL daAlink_c::checkCowGame() {
int daAlink_c::getReinRideDirection() {
s16 angle = fopAcM_searchActorAngleY(field_0x27f4, this) - field_0x27f4->shape_angle.y;
if (fopAcM_GetName(field_0x27f4) == PROC_HORSE && abs(angle) > 0x6800) {
if (fopAcM_GetName(field_0x27f4) == fpcNm_HORSE_e && abs(angle) > 0x6800) {
return DIR_BACKWARD;
} else if (angle > 0) {
return DIR_LEFT;
@@ -99,7 +99,7 @@ int daAlink_c::checkReinRideBgCheck() {
int direction = getReinRideDirection();
const Vec* offset_p;
if (fopAcM_GetName(field_0x27f4) == PROC_HORSE) {
if (fopAcM_GetName(field_0x27f4) == fpcNm_HORSE_e) {
if (direction == DIR_BACKWARD) {
offset_p = &horseLocalBack;
} else if (direction == DIR_LEFT) {
@@ -206,7 +206,7 @@ void daAlink_c::rideGetOff() {
seStartOnlyReverb(Z2SE_AL_SPINNER_END);
} else if (checkCanoeRide()) {
if (mEquipItem == 0x10B) {
mEquipItem = fpcNm_ITEM_NONE;
mEquipItem = dItemNo_NONE_e;
}
} else if (checkBoardRide()) {
static_cast<daObjIceLeaf_c*>(mRideAcKeep.getActor())->offRide();
@@ -480,7 +480,7 @@ int daAlink_c::setSyncBoarPos() {
int daAlink_c::setSyncBoarRunPos() {
e_wb_class* boar = (e_wb_class*)mRideAcKeep.getActor();
fopAc_ac_c* boar_actor = &boar->mEnemy;
fopAc_ac_c* boar_actor = &boar->enemy;
if (boar == NULL || boar->checkDownDamage()) {
boarForceGetOff();
@@ -1220,7 +1220,7 @@ int daAlink_c::checkHorseGetOffAndSetDoStatus() {
setDoStatus(BUTTON_STATUS_UNK_140);
}
} else if ((checkHorseNoUpperAnime() || checkEquipAnime()) && mMidnaTalkDelayTimer == 0 && !checkInputOnR() && isGetOff) {
if (mEquipItem == fpcNm_ITEM_NONE) {
if (mEquipItem == dItemNo_NONE_e) {
off_direction = checkHorseGetOffDirection();
if ((off_direction != DIR_LEFT || (checkHorseRide() && horse->checkEnemySearch())) && field_0x2fb4 == 0) {
if (!checkSpecialHorseRide()) {
@@ -1259,7 +1259,7 @@ int daAlink_c::setHorseGetOff(int param_0) {
int daAlink_c::procHorseRideInit() {
BOOL var_r25 = FALSE;
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
if (mEquipItem == 0x103) {
var_r25 = 1;
}
@@ -1272,7 +1272,7 @@ int daAlink_c::procHorseRideInit() {
MtxP rideMtx;
Vec* localRidePos_p;
u32 mode;
if (fopAcM_GetName(field_0x27f4) == PROC_HORSE) {
if (fopAcM_GetName(field_0x27f4) == fpcNm_HORSE_e) {
daHorse_c* horse = (daHorse_c*)field_0x27f4;
horse->onRideStartFlg();
rideMtx = horse->getRootMtx();
@@ -1519,7 +1519,7 @@ int daAlink_c::procHorseGetOffInit(int param_0) {
commonProcInit(PROC_HORSE_GETOFF);
resetUnderAnime(UNDER_2, -1.0f);
if (mEquipItem != fpcNm_ITEM_NONE) {
if (mEquipItem != dItemNo_NONE_e) {
allUnequip(0);
}
src/d/actor/d_a_alink_hvyboots.inc
+1 -1
View File
@@ -133,7 +133,7 @@ void daAlink_c::setMagneBootsMtx(cBgS_PolyInfo* i_polyinfo, int param_1) {
}
} else {
// D_MN54 is the E3 Goron Mines Demo map
if (checkStageName("D_MN54") && getMoveBGActorName(*i_polyinfo, TRUE) == PROC_Obj_MagneArm) {
if (checkStageName("D_MN54") && getMoveBGActorName(*i_polyinfo, TRUE) == fpcNm_Obj_MagneArm_e) {
fopAcM_onSwitch(this, 0x93);
}
src/d/actor/d_a_alink_iceleaf.inc
+2 -2
View File
@@ -10,7 +10,7 @@
static fopAc_ac_c* daAlink_searchIceLeaf(fopAc_ac_c* i_actor, void* i_data) {
UNUSED(i_data);
if (fopAcM_GetName(i_actor) == PROC_Obj_IceLeaf) {
if (fopAcM_GetName(i_actor) == fpcNm_Obj_IceLeaf_e) {
return i_actor;
}
@@ -29,7 +29,7 @@ bool daAlink_c::checkSnowCodePolygon(cBgS_PolyInfo& i_polyinfo) {
bool daAlink_c::checkBoardRestart() {
return (mRideStatus == 0 && mRideAcKeep.getActor() != NULL) &&
fopAcM_GetName(mRideAcKeep.getActor()) == PROC_Obj_IceLeaf;
fopAcM_GetName(mRideAcKeep.getActor()) == fpcNm_Obj_IceLeaf_e;
}
int daAlink_c::boardCommon(BOOL i_canMove) {
src/d/actor/d_a_alink_ironball.inc
+8 -8
View File
@@ -6,7 +6,7 @@
#include "d/actor/d_a_alink.h"
cXyz* daAlink_c::getIronBallCenterPos() {
if (mEquipItem == fpcNm_ITEM_IRONBALL) {
if (mEquipItem == dItemNo_IRONBALL_e) {
return &mIronBallCenterPos;
}
@@ -14,7 +14,7 @@ cXyz* daAlink_c::getIronBallCenterPos() {
}
int daAlink_c::getIronBallBgHit() const {
if (mEquipItem == fpcNm_ITEM_IRONBALL) {
if (mEquipItem == dItemNo_IRONBALL_e) {
return field_0x301c;
}
@@ -22,21 +22,21 @@ int daAlink_c::getIronBallBgHit() const {
}
bool daAlink_c::checkIronBallThrowMode() const {
return mEquipItem == fpcNm_ITEM_IRONBALL &&
return mEquipItem == dItemNo_IRONBALL_e &&
(mItemVar0.field_0x3018 == 4 || mItemVar0.field_0x3018 == 5 || mItemVar0.field_0x3018 == 6 || mItemVar0.field_0x3018 == 3);
}
bool daAlink_c::checkIronBallThrowReturnMode() const {
return mEquipItem == fpcNm_ITEM_IRONBALL && (mItemVar0.field_0x3018 == 4 || mItemVar0.field_0x3018 == 5 || mItemVar0.field_0x3018 == 6 ||
return mEquipItem == dItemNo_IRONBALL_e && (mItemVar0.field_0x3018 == 4 || mItemVar0.field_0x3018 == 5 || mItemVar0.field_0x3018 == 6 ||
mItemVar0.field_0x3018 == 7 || mItemVar0.field_0x3018 == 3);
}
bool daAlink_c::checkIronBallReturn() const {
return mEquipItem == fpcNm_ITEM_IRONBALL && mItemVar0.field_0x3018 == 7;
return mEquipItem == dItemNo_IRONBALL_e && mItemVar0.field_0x3018 == 7;
}
bool daAlink_c::checkIronBallGroundStop() const {
return mEquipItem == fpcNm_ITEM_IRONBALL && mItemVar0.field_0x3018 != 0 && mItemVar0.field_0x3018 != 8 && field_0x301e == 0 &&
return mEquipItem == dItemNo_IRONBALL_e && mItemVar0.field_0x3018 != 0 && mItemVar0.field_0x3018 != 8 && field_0x301e == 0 &&
field_0x301e < 10;
}
@@ -1003,7 +1003,7 @@ int daAlink_c::procIronBallThrowInit() {
int daAlink_c::procIronBallThrow() {
daPy_frameCtrl_c* framectrl = &mUnderFrameCtrl[0];
if (mEquipItem != fpcNm_ITEM_IRONBALL) {
if (mEquipItem != dItemNo_IRONBALL_e) {
return checkWaitAction();
}
@@ -1061,7 +1061,7 @@ int daAlink_c::procIronBallReturnInit() {
int daAlink_c::procIronBallReturn() {
daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
if (mEquipItem != fpcNm_ITEM_IRONBALL) {
if (mEquipItem != dItemNo_IRONBALL_e) {
return checkWaitAction();
}

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