diff --git a/config/GZ2E01/rels/d_a_e_oc/symbols.txt b/config/GZ2E01/rels/d_a_e_oc/symbols.txt index 28127c03b5..f1b477b5bd 100644 --- a/config/GZ2E01/rels/d_a_e_oc/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_oc/symbols.txt @@ -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 diff --git a/config/GZ2E01/rels/d_a_e_rdy/symbols.txt b/config/GZ2E01/rels/d_a_e_rdy/symbols.txt index 8e5315363b..e40b3a4db1 100644 --- a/config/GZ2E01/rels/d_a_e_rdy/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_rdy/symbols.txt @@ -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 diff --git a/config/GZ2J01/rels/d_a_e_oc/symbols.txt b/config/GZ2J01/rels/d_a_e_oc/symbols.txt index 8e41485d59..b250dcbaf2 100644 --- a/config/GZ2J01/rels/d_a_e_oc/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_oc/symbols.txt @@ -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 diff --git a/config/GZ2J01/rels/d_a_e_rdy/symbols.txt b/config/GZ2J01/rels/d_a_e_rdy/symbols.txt index c398d8ed8a..1099c4a486 100644 --- a/config/GZ2J01/rels/d_a_e_rdy/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_rdy/symbols.txt @@ -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 diff --git a/config/GZ2P01/rels/d_a_e_oc/symbols.txt b/config/GZ2P01/rels/d_a_e_oc/symbols.txt index 8e41485d59..b250dcbaf2 100644 --- a/config/GZ2P01/rels/d_a_e_oc/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_oc/symbols.txt @@ -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 diff --git a/config/GZ2P01/rels/d_a_e_rdy/symbols.txt b/config/GZ2P01/rels/d_a_e_rdy/symbols.txt index c398d8ed8a..1099c4a486 100644 --- a/config/GZ2P01/rels/d_a_e_rdy/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_rdy/symbols.txt @@ -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 diff --git a/config/RZDJ01/symbols.txt b/config/RZDJ01/symbols.txt index 20ca53baba..582b2df19f 100644 --- a/config/RZDJ01/symbols.txt +++ b/config/RZDJ01/symbols.txt @@ -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 diff --git a/config/RZDP01/symbols.txt b/config/RZDP01/symbols.txt index 8abf2d0d10..027738678d 100644 --- a/config/RZDP01/symbols.txt +++ b/config/RZDP01/symbols.txt @@ -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 diff --git a/config/ShieldD/rels/d_a_L7low_drD/symbols.txt b/config/ShieldD/rels/d_a_L7low_drD/symbols.txt index 22c8135848..9d257fbf21 100644 --- a/config/ShieldD/rels/d_a_L7low_drD/symbols.txt +++ b/config/ShieldD/rels/d_a_L7low_drD/symbols.txt @@ -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_limitsFv@x = .rodata:0x00000050; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000058; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/rels/d_a_L7op_demo_drD/symbols.txt b/config/ShieldD/rels/d_a_L7op_demo_drD/symbols.txt index 24bc5a2de2..b5e9ded0fb 100644 --- a/config/ShieldD/rels/d_a_L7op_demo_drD/symbols.txt +++ b/config/ShieldD/rels/d_a_L7op_demo_drD/symbols.txt @@ -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_limitsFv@x = .rodata:0x00000160; // type:object size:0x8 +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000168; // type:object size:0x8 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/rels/d_a_bdD/symbols.txt b/config/ShieldD/rels/d_a_bdD/symbols.txt index c0a76ede04..9a6e132032 100644 --- a/config/ShieldD/rels/d_a_bdD/symbols.txt +++ b/config/ShieldD/rels/d_a_bdD/symbols.txt @@ -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_limitsFv@x = .rodata:0x00000108; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000110; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/rels/d_a_bgD/symbols.txt b/config/ShieldD/rels/d_a_bgD/symbols.txt index db371b7051..09f72708a2 100644 --- a/config/ShieldD/rels/d_a_bgD/symbols.txt +++ b/config/ShieldD/rels/d_a_bgD/symbols.txt @@ -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_limitsFv@x = .rodata:0x00000040; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000048; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/rels/d_a_door_spiralD/symbols.txt b/config/ShieldD/rels/d_a_door_spiralD/symbols.txt index 9b074e73d8..35360cc5f2 100644 --- a/config/ShieldD/rels/d_a_door_spiralD/symbols.txt +++ b/config/ShieldD/rels/d_a_door_spiralD/symbols.txt @@ -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_limitsFv@x = .rodata:0x00000098; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x000000A0; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/rels/d_a_e_bgD/symbols.txt b/config/ShieldD/rels/d_a_e_bgD/symbols.txt index 9be5600189..78ca319fe3 100644 --- a/config/ShieldD/rels/d_a_e_bgD/symbols.txt +++ b/config/ShieldD/rels/d_a_e_bgD/symbols.txt @@ -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_limitsFv@x = .rodata:0x000000C0; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x000000C8; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/rels/d_a_e_dfD/splits.txt b/config/ShieldD/rels/d_a_e_dfD/splits.txt index cacf8e3d71..b7d893b02c 100644 --- a/config/ShieldD/rels/d_a_e_dfD/splits.txt +++ b/config/ShieldD/rels/d_a_e_dfD/splits.txt @@ -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 diff --git a/config/ShieldD/rels/d_a_e_dfD/symbols.txt b/config/ShieldD/rels/d_a_e_dfD/symbols.txt index cb3278833b..aef375b5b5 100644 --- a/config/ShieldD/rels/d_a_e_dfD/symbols.txt +++ b/config/ShieldD/rels/d_a_e_dfD/symbols.txt @@ -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_limitsFv@x = .rodata:0x000000C8; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x000000D0; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/rels/d_a_e_dnD/symbols.txt b/config/ShieldD/rels/d_a_e_dnD/symbols.txt index 560729a9f9..790a31b4ab 100644 --- a/config/ShieldD/rels/d_a_e_dnD/symbols.txt +++ b/config/ShieldD/rels/d_a_e_dnD/symbols.txt @@ -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_limitsFv@x = .rodata:0x00000180; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000188; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/rels/d_a_e_hpD/symbols.txt b/config/ShieldD/rels/d_a_e_hpD/symbols.txt index 8a8f39a6db..9bfe786f0e 100644 --- a/config/ShieldD/rels/d_a_e_hpD/symbols.txt +++ b/config/ShieldD/rels/d_a_e_hpD/symbols.txt @@ -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_limitsFv@x = .rodata:0x000000D0; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x000000D8; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/rels/d_a_e_ocD/symbols.txt b/config/ShieldD/rels/d_a_e_ocD/symbols.txt index 8a373710eb..2e95f19654 100644 --- a/config/ShieldD/rels/d_a_e_ocD/symbols.txt +++ b/config/ShieldD/rels/d_a_e_ocD/symbols.txt @@ -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_limitsFv@x = .rodata:0x000001E8; // type:object size:0x8 +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x000001F0; // type:object size:0x8 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/rels/d_a_e_rdD/symbols.txt b/config/ShieldD/rels/d_a_e_rdD/symbols.txt index f0d5879231..9626870032 100644 --- a/config/ShieldD/rels/d_a_e_rdD/symbols.txt +++ b/config/ShieldD/rels/d_a_e_rdD/symbols.txt @@ -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_limitsFv@x = .rodata:0x000003D0; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x000003D8; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/rels/d_a_e_rdyD/symbols.txt b/config/ShieldD/rels/d_a_e_rdyD/symbols.txt index 7c47be2c16..56bb1c65ba 100644 --- a/config/ShieldD/rels/d_a_e_rdyD/symbols.txt +++ b/config/ShieldD/rels/d_a_e_rdyD/symbols.txt @@ -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 diff --git a/config/ShieldD/rels/d_a_e_shD/symbols.txt b/config/ShieldD/rels/d_a_e_shD/symbols.txt index c65c7b006b..fbda2bb744 100644 --- a/config/ShieldD/rels/d_a_e_shD/symbols.txt +++ b/config/ShieldD/rels/d_a_e_shD/symbols.txt @@ -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_limitsFv@x = .rodata:0x00000148; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000150; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/rels/d_a_e_sm2D/symbols.txt b/config/ShieldD/rels/d_a_e_sm2D/symbols.txt index 22702befc2..5578b6bf49 100644 --- a/config/ShieldD/rels/d_a_e_sm2D/symbols.txt +++ b/config/ShieldD/rels/d_a_e_sm2D/symbols.txt @@ -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 diff --git a/config/ShieldD/rels/d_a_e_stD/symbols.txt b/config/ShieldD/rels/d_a_e_stD/symbols.txt index f771bbef80..f81da0a5cf 100644 --- a/config/ShieldD/rels/d_a_e_stD/symbols.txt +++ b/config/ShieldD/rels/d_a_e_stD/symbols.txt @@ -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_limitsFv@x = .rodata:0x000001C0; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x000001C8; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/rels/d_a_e_ygD/symbols.txt b/config/ShieldD/rels/d_a_e_ygD/symbols.txt index a584ccaf6b..9f3b203108 100644 --- a/config/ShieldD/rels/d_a_e_ygD/symbols.txt +++ b/config/ShieldD/rels/d_a_e_ygD/symbols.txt @@ -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_limitsFv@x = .rodata:0x00000130; // type:object size:0x8 scope:local data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000138; // type:object size:0x8 scope:local data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/rels/d_a_e_yrD/symbols.txt b/config/ShieldD/rels/d_a_e_yrD/symbols.txt index b337017063..315ad123b9 100644 --- a/config/ShieldD/rels/d_a_e_yrD/symbols.txt +++ b/config/ShieldD/rels/d_a_e_yrD/symbols.txt @@ -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_limitsFv@x = .rodata:0x00000148; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000150; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/rels/d_a_horseD/symbols.txt b/config/ShieldD/rels/d_a_horseD/symbols.txt index c5066d3619..2313093997 100644 --- a/config/ShieldD/rels/d_a_horseD/symbols.txt +++ b/config/ShieldD/rels/d_a_horseD/symbols.txt @@ -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_limitsFv@x = .rodata:0x000003F8; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000400; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/rels/d_a_kagoD/symbols.txt b/config/ShieldD/rels/d_a_kagoD/symbols.txt index e13fe98947..db1f554ede 100644 --- a/config/ShieldD/rels/d_a_kagoD/symbols.txt +++ b/config/ShieldD/rels/d_a_kagoD/symbols.txt @@ -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_limitsFv@x = .rodata:0x00000218; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000220; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/rels/d_a_mg_rodD/symbols.txt b/config/ShieldD/rels/d_a_mg_rodD/symbols.txt index 771c641680..ed1fd64e11 100644 --- a/config/ShieldD/rels/d_a_mg_rodD/symbols.txt +++ b/config/ShieldD/rels/d_a_mg_rodD/symbols.txt @@ -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_limitsFv@x = .rodata:0x000002D8; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x000002E0; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/rels/d_a_npc_aruD/symbols.txt b/config/ShieldD/rels/d_a_npc_aruD/symbols.txt index f3075f3cf2..8a5bb0a30f 100644 --- a/config/ShieldD/rels/d_a_npc_aruD/symbols.txt +++ b/config/ShieldD/rels/d_a_npc_aruD/symbols.txt @@ -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_limitsFv@x = .rodata:0x00000180; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000188; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/rels/d_a_npc_cdn3D/symbols.txt b/config/ShieldD/rels/d_a_npc_cdn3D/symbols.txt index 2c8f0e332f..15e44e91c6 100644 --- a/config/ShieldD/rels/d_a_npc_cdn3D/symbols.txt +++ b/config/ShieldD/rels/d_a_npc_cdn3D/symbols.txt @@ -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_limitsFv@x = .rodata:0x00000120; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000128; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/rels/d_a_npc_chinD/symbols.txt b/config/ShieldD/rels/d_a_npc_chinD/symbols.txt index 128d5c79ee..32c1c0a37f 100644 --- a/config/ShieldD/rels/d_a_npc_chinD/symbols.txt +++ b/config/ShieldD/rels/d_a_npc_chinD/symbols.txt @@ -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_limitsFv@x = .rodata:0x00000328; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000330; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/rels/d_a_npc_duD/symbols.txt b/config/ShieldD/rels/d_a_npc_duD/symbols.txt index 8372515ead..d5ae89d32d 100644 --- a/config/ShieldD/rels/d_a_npc_duD/symbols.txt +++ b/config/ShieldD/rels/d_a_npc_duD/symbols.txt @@ -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_limitsFv@x = .rodata:0x000000A8; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x000000B0; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/rels/d_a_npc_tkj2D/symbols.txt b/config/ShieldD/rels/d_a_npc_tkj2D/symbols.txt index 003f37ddd5..d961649354 100644 --- a/config/ShieldD/rels/d_a_npc_tkj2D/symbols.txt +++ b/config/ShieldD/rels/d_a_npc_tkj2D/symbols.txt @@ -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_limitsFv@x = .rodata:0x000000C8; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x000000D0; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/rels/d_a_obj_moveboxD/symbols.txt b/config/ShieldD/rels/d_a_obj_moveboxD/symbols.txt index 8129c3fdbc..35836218a0 100644 --- a/config/ShieldD/rels/d_a_obj_moveboxD/symbols.txt +++ b/config/ShieldD/rels/d_a_obj_moveboxD/symbols.txt @@ -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_limitsFv@x = .rodata:0x00000800; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000808; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/rels/d_a_tag_attack_itemD/symbols.txt b/config/ShieldD/rels/d_a_tag_attack_itemD/symbols.txt index 5f8dcd53be..3b015fae28 100644 --- a/config/ShieldD/rels/d_a_tag_attack_itemD/symbols.txt +++ b/config/ShieldD/rels/d_a_tag_attack_itemD/symbols.txt @@ -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_limitsFv@x = .rodata:0x00000028; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000030; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/rels/d_a_tag_attentionD/symbols.txt b/config/ShieldD/rels/d_a_tag_attentionD/symbols.txt index 75875d2e1d..963c89f028 100644 --- a/config/ShieldD/rels/d_a_tag_attentionD/symbols.txt +++ b/config/ShieldD/rels/d_a_tag_attentionD/symbols.txt @@ -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_limitsFv@x = .rodata:0x00000058; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000060; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/rels/d_a_tag_cameraD/symbols.txt b/config/ShieldD/rels/d_a_tag_cameraD/symbols.txt index 9a52b03f06..1f83007d4f 100644 --- a/config/ShieldD/rels/d_a_tag_cameraD/symbols.txt +++ b/config/ShieldD/rels/d_a_tag_cameraD/symbols.txt @@ -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_limitsFv@x = .rodata:0x00000088; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000090; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/rels/d_a_tag_hjumpD/symbols.txt b/config/ShieldD/rels/d_a_tag_hjumpD/symbols.txt index 8de7564908..034bd48f4c 100644 --- a/config/ShieldD/rels/d_a_tag_hjumpD/symbols.txt +++ b/config/ShieldD/rels/d_a_tag_hjumpD/symbols.txt @@ -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_limitsFv@x = .rodata:0x00000050; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000058; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/rels/d_a_ykgrD/symbols.txt b/config/ShieldD/rels/d_a_ykgrD/symbols.txt index ce362b40df..ea83dbea91 100644 --- a/config/ShieldD/rels/d_a_ykgrD/symbols.txt +++ b/config/ShieldD/rels/d_a_ykgrD/symbols.txt @@ -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_limitsFv@x = .rodata:0x00000058; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000060; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@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 diff --git a/config/ShieldD/symbols.txt b/config/ShieldD/symbols.txt index 8dd1951290..91a37aa732 100644 --- a/config/ShieldD/symbols.txt +++ b/config/ShieldD/symbols.txt @@ -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 diff --git a/include/d/actor/d_a_L7low_dr.h b/include/d/actor/d_a_L7low_dr.h index 95fbf98ed1..0bf9142bd8 100644 --- a/include/d/actor/d_a_L7low_dr.h +++ b/include/d/actor/d_a_L7low_dr.h @@ -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; diff --git a/include/d/actor/d_a_alink.h b/include/d/actor/d_a_alink.h index ced12d318e..7c70ea54e5 100644 --- a/include/d/actor/d_a_alink.h +++ b/include/d/actor/d_a_alink.h @@ -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 { diff --git a/include/d/actor/d_a_arrow.h b/include/d/actor/d_a_arrow.h index 66b4a9d901..682ffd43d7 100644 --- a/include/d/actor/d_a_arrow.h +++ b/include/d/actor/d_a_arrow.h @@ -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), diff --git a/include/d/actor/d_a_bd.h b/include/d/actor/d_a_bd.h index cce29c4687..1d165f3f94 100644 --- a/include/d/actor/d_a_bd.h +++ b/include/d/actor/d_a_bd.h @@ -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 */ diff --git a/include/d/actor/d_a_e_bg.h b/include/d/actor/d_a_e_bg.h index 4e2422d7d1..c14b0cf533 100644 --- a/include/d/actor/d_a_e_bg.h +++ b/include/d/actor/d_a_e_bg.h @@ -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 */ diff --git a/include/d/actor/d_a_e_df.h b/include/d/actor/d_a_e_df.h index be69e48798..80a2e6c39f 100644 --- a/include/d/actor/d_a_e_df.h +++ b/include/d/actor/d_a_e_df.h @@ -51,7 +51,7 @@ public: void BombEatAction(); void Spid_Out(); void LinkEatAction(); - bool Mogu_Mogu(); + u8 Mogu_Mogu(); void ObjEatAction(); void EatAction(); void SearchAction(); diff --git a/include/d/actor/d_a_e_rd.h b/include/d/actor/d_a_e_rd.h index e4d38a4b0b..ad27501841 100644 --- a/include/d/actor/d_a_e_rd.h +++ b/include/d/actor/d_a_e_rd.h @@ -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; }; diff --git a/include/d/actor/d_a_e_wb.h b/include/d/actor/d_a_e_wb.h index e1297d97a2..dd36474025 100644 --- a/include/d/actor/d_a_e_wb.h +++ b/include/d/actor/d_a_e_wb.h @@ -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); diff --git a/include/d/actor/d_a_e_yr.h b/include/d/actor/d_a_e_yr.h index cf1c173f7a..dc5e0052e2 100644 --- a/include/d/actor/d_a_e_yr.h +++ b/include/d/actor/d_a_e_yr.h @@ -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; diff --git a/include/d/actor/d_a_horse.h b/include/d/actor/d_a_horse.h index 1a5f1d784b..37e4bac70f 100644 --- a/include/d/actor/d_a_horse.h +++ b/include/d/actor/d_a_horse.h @@ -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; diff --git a/include/d/actor/d_a_npc_cdn3.h b/include/d/actor/d_a_npc_cdn3.h index 6a2e9d7b55..84a98ebd74 100644 --- a/include/d/actor/d_a_npc_cdn3.h +++ b/include/d/actor/d_a_npc_cdn3.h @@ -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; diff --git a/include/d/actor/d_a_npc_chin.h b/include/d/actor/d_a_npc_chin.h index 24e8173c9d..e4bfdb6a61 100644 --- a/include/d/actor/d_a_npc_chin.h +++ b/include/d/actor/d_a_npc_chin.h @@ -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; }; diff --git a/include/d/actor/d_a_npc_ins.h b/include/d/actor/d_a_npc_ins.h index 0437a01e30..3f8b40a9a0 100644 --- a/include/d/actor/d_a_npc_ins.h +++ b/include/d/actor/d_a_npc_ins.h @@ -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; } diff --git a/include/d/actor/d_a_npc_jagar.h b/include/d/actor/d_a_npc_jagar.h index 63891084fc..fbedc8ca1e 100644 --- a/include/d/actor/d_a_npc_jagar.h +++ b/include/d/actor/d_a_npc_jagar.h @@ -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, diff --git a/include/d/actor/d_a_npc_shad.h b/include/d/actor/d_a_npc_shad.h index 0afc724746..ba94bbe74e 100644 --- a/include/d/actor/d_a_npc_shad.h +++ b/include/d/actor/d_a_npc_shad.h @@ -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) { diff --git a/include/d/actor/d_a_npc_tkj2.h b/include/d/actor/d_a_npc_tkj2.h index fa50456945..ae42bb4da7 100644 --- a/include/d/actor/d_a_npc_tkj2.h +++ b/include/d/actor/d_a_npc_tkj2.h @@ -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 */ diff --git a/include/d/actor/d_a_obj_eff.h b/include/d/actor/d_a_obj_eff.h index 4df3d0502b..79309d84a6 100644 --- a/include/d/actor/d_a_obj_eff.h +++ b/include/d/actor/d_a_obj_eff.h @@ -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 diff --git a/include/d/actor/d_a_obj_movebox.h b/include/d/actor/d_a_obj_movebox.h index e64436e13d..0e8bf4e87a 100644 --- a/include/d/actor/d_a_obj_movebox.h +++ b/include/d/actor/d_a_obj_movebox.h @@ -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(); diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h index 0b3dbed490..e81bce0a94 100644 --- a/include/d/actor/d_a_player.h +++ b/include/d/actor/d_a_player.h @@ -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; } diff --git a/include/d/actor/d_a_tag_lantern.h b/include/d/actor/d_a_tag_lantern.h index 54e1e5cf22..c0e0c0d152 100644 --- a/include/d/actor/d_a_tag_lantern.h +++ b/include/d/actor/d_a_tag_lantern.h @@ -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; diff --git a/include/d/actor/d_a_tag_mhint.h b/include/d/actor/d_a_tag_mhint.h index 29086d4ddf..e4c5260079 100644 --- a/include/d/actor/d_a_tag_mhint.h +++ b/include/d/actor/d_a_tag_mhint.h @@ -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); } diff --git a/include/d/actor/d_a_ykgr.h b/include/d/actor/d_a_ykgr.h index d9f2ff5d04..472ceefc4a 100644 --- a/include/d/actor/d_a_ykgr.h +++ b/include/d/actor/d_a_ykgr.h @@ -55,7 +55,7 @@ public: int _create(); int _delete(); int _execute(); - int _draw(); + bool _draw(); static JPABaseEmitter* m_emitter; static bool m_flag; diff --git a/include/d/d_bomb.h b/include/d/d_bomb.h index 79e0d90f08..66256dacf8 100644 --- a/include/d/d_bomb.h +++ b/include/d/d_bomb.h @@ -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); } }; diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index 0c8752eb44..5f578dd658 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -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) { diff --git a/include/d/d_item_data.h b/include/d/d_item_data.h index a7e658c1a3..a1770be241 100644 --- a/include/d/d_item_data.h +++ b/include/d/d_item_data.h @@ -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 */ diff --git a/include/d/d_k_wmark.h b/include/d/d_k_wmark.h index 10be281182..0190c94467 100644 --- a/include/d/d_k_wmark.h +++ b/include/d/d_k_wmark.h @@ -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; diff --git a/include/d/d_procname.h b/include/d/d_procname.h deleted file mode 100644 index 6c15c741f0..0000000000 --- a/include/d/d_procname.h +++ /dev/null @@ -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 */ diff --git a/include/d/d_save.h b/include/d/d_save.h index 6643028f7c..4b21e6673e 100644 --- a/include/d/d_save.h +++ b/include/d/d_save.h @@ -5,7 +5,7 @@ #include "SSystem/SComponent/c_xyz.h" #include #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++; } }; diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index 6d24ed130d..b8918eae57 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -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, }; diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index ac6afb8f42..2251a23aea 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -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) { diff --git a/include/f_pc/f_pc_draw_priority.h b/include/f_pc/f_pc_draw_priority.h index 467d53ced2..3c189a6d17 100644 --- a/include/f_pc/f_pc_draw_priority.h +++ b/include/f_pc/f_pc_draw_priority.h @@ -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 diff --git a/include/f_pc/f_pc_leaf.h b/include/f_pc/f_pc_leaf.h index 413cdae871..33d7e85d29 100644 --- a/include/f_pc/f_pc_leaf.h +++ b/include/f_pc/f_pc_leaf.h @@ -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; diff --git a/include/f_pc/f_pc_name.h b/include/f_pc/f_pc_name.h index 1a837d3807..d16892fc6e 100644 --- a/include/f_pc/f_pc_name.h +++ b/include/f_pc/f_pc_name.h @@ -1,270 +1,841 @@ - #ifndef F_PC_NAME_H_ #define F_PC_NAME_H_ -/** - * This is a made up header based on a debug assert from d_a_obj_item: - * "OS_REPORT_ERROR("fpcNm_(ITEM)では扱わないアイテムです<%d>\n", m_itemNo)" - * Making an assumption that `Nm` is shorthand for `Name` - */ +#include "global.h" -enum fpcNm_ITEM { - /* 0x00 */ fpcNm_ITEM_HEART, - /* 0x01 */ fpcNm_ITEM_GREEN_RUPEE, - /* 0x02 */ fpcNm_ITEM_BLUE_RUPEE, - /* 0x03 */ fpcNm_ITEM_YELLOW_RUPEE, - /* 0x04 */ fpcNm_ITEM_RED_RUPEE, - /* 0x05 */ fpcNm_ITEM_PURPLE_RUPEE, - /* 0x06 */ fpcNm_ITEM_ORANGE_RUPEE, - /* 0x07 */ fpcNm_ITEM_SILVER_RUPEE, - /* 0x08 */ fpcNm_ITEM_S_MAGIC, - /* 0x09 */ fpcNm_ITEM_L_MAGIC, - /* 0x0A */ fpcNm_ITEM_BOMB_5, - /* 0x0B */ fpcNm_ITEM_BOMB_10, - /* 0x0C */ fpcNm_ITEM_BOMB_20, - /* 0x0D */ fpcNm_ITEM_BOMB_30, - /* 0x0E */ fpcNm_ITEM_ARROW_10, - /* 0x0F */ fpcNm_ITEM_ARROW_20, - /* 0x10 */ fpcNm_ITEM_ARROW_30, - /* 0x11 */ fpcNm_ITEM_ARROW_1, - /* 0x12 */ fpcNm_ITEM_PACHINKO_SHOT, - /* 0x13 */ fpcNm_ITEM_NOENTRY_19, - /* 0x14 */ fpcNm_ITEM_NOENTRY_20, - /* 0x15 */ fpcNm_ITEM_NOENTRY_21, - /* 0x16 */ fpcNm_ITEM_WATER_BOMB_5, - /* 0x17 */ fpcNm_ITEM_WATER_BOMB_10, - /* 0x18 */ fpcNm_ITEM_WATER_BOMB_20, - /* 0x19 */ fpcNm_ITEM_WATER_BOMB_30, - /* 0x1A */ fpcNm_ITEM_BOMB_INSECT_5, - /* 0x1B */ fpcNm_ITEM_BOMB_INSECT_10, - /* 0x1C */ fpcNm_ITEM_BOMB_INSECT_20, - /* 0x1D */ fpcNm_ITEM_BOMB_INSECT_30, - /* 0x1E */ fpcNm_ITEM_RECOVERY_FAILY, - /* 0x1F */ fpcNm_ITEM_TRIPLE_HEART, - /* 0x20 */ fpcNm_ITEM_SMALL_KEY, - /* 0x21 */ fpcNm_ITEM_KAKERA_HEART, - /* 0x22 */ fpcNm_ITEM_UTAWA_HEART, - /* 0x23 */ fpcNm_ITEM_MAP, - /* 0x24 */ fpcNm_ITEM_COMPUS, - /* 0x25 */ fpcNm_ITEM_DUNGEON_EXIT, - /* 0x26 */ fpcNm_ITEM_BOSS_KEY, - /* 0x27 */ fpcNm_ITEM_DUNGEON_BACK, - /* 0x28 */ fpcNm_ITEM_SWORD, - /* 0x29 */ fpcNm_ITEM_MASTER_SWORD, - /* 0x2A */ fpcNm_ITEM_WOOD_SHIELD, - /* 0x2B */ fpcNm_ITEM_SHIELD, - /* 0x2C */ fpcNm_ITEM_HYLIA_SHIELD, - /* 0x2D */ fpcNm_ITEM_TKS_LETTER, - /* 0x2E */ fpcNm_ITEM_WEAR_CASUAL, - /* 0x2F */ fpcNm_ITEM_WEAR_KOKIRI, - /* 0x30 */ fpcNm_ITEM_ARMOR, - /* 0x31 */ fpcNm_ITEM_WEAR_ZORA, - /* 0x32 */ fpcNm_ITEM_MAGIC_LV1, - /* 0x33 */ fpcNm_ITEM_DUNGEON_EXIT_2, - /* 0x34 */ fpcNm_ITEM_WALLET_LV1, - /* 0x35 */ fpcNm_ITEM_WALLET_LV2, - /* 0x36 */ fpcNm_ITEM_WALLET_LV3, - /* 0x37 */ fpcNm_ITEM_NOENTRY_55, - /* 0x38 */ fpcNm_ITEM_NOENTRY_56, - /* 0x39 */ fpcNm_ITEM_NOENTRY_57, - /* 0x3A */ fpcNm_ITEM_NOENTRY_58, - /* 0x3B */ fpcNm_ITEM_NOENTRY_59, - /* 0x3C */ fpcNm_ITEM_NOENTRY_60, - /* 0x3D */ fpcNm_ITEM_ZORAS_JEWEL, - /* 0x3E */ fpcNm_ITEM_HAWK_EYE, - /* 0x3F */ fpcNm_ITEM_WOOD_STICK, - /* 0x40 */ fpcNm_ITEM_BOOMERANG, - /* 0x41 */ fpcNm_ITEM_SPINNER, - /* 0x42 */ fpcNm_ITEM_IRONBALL, - /* 0x43 */ fpcNm_ITEM_BOW, - /* 0x44 */ fpcNm_ITEM_HOOKSHOT, - /* 0x45 */ fpcNm_ITEM_HVY_BOOTS, - /* 0x46 */ fpcNm_ITEM_COPY_ROD, - /* 0x47 */ fpcNm_ITEM_W_HOOKSHOT, - /* 0x48 */ fpcNm_ITEM_KANTERA, - /* 0x49 */ fpcNm_ITEM_LIGHT_SWORD, - /* 0x4A */ fpcNm_ITEM_FISHING_ROD_1, - /* 0x4B */ fpcNm_ITEM_PACHINKO, - /* 0x4C */ fpcNm_ITEM_COPY_ROD_2, - /* 0x4D */ fpcNm_ITEM_NOENTRY_77, - /* 0x4E */ fpcNm_ITEM_NOENTRY_78, - /* 0x4F */ fpcNm_ITEM_BOMB_BAG_LV2, - /* 0x50 */ fpcNm_ITEM_BOMB_BAG_LV1, - /* 0x51 */ fpcNm_ITEM_BOMB_IN_BAG, - /* 0x52 */ fpcNm_ITEM_NOENTRY_82, - /* 0x53 */ fpcNm_ITEM_LIGHT_ARROW, - /* 0x54 */ fpcNm_ITEM_ARROW_LV1, - /* 0x55 */ fpcNm_ITEM_ARROW_LV2, - /* 0x56 */ fpcNm_ITEM_ARROW_LV3, - /* 0x57 */ fpcNm_ITEM_NOENTRY_87, - /* 0x58 */ fpcNm_ITEM_LURE_ROD, - /* 0x59 */ fpcNm_ITEM_BOMB_ARROW, - /* 0x5A */ fpcNm_ITEM_HAWK_ARROW, - /* 0x5B */ fpcNm_ITEM_BEE_ROD, - /* 0x5C */ fpcNm_ITEM_JEWEL_ROD, - /* 0x5D */ fpcNm_ITEM_WORM_ROD, - /* 0x5E */ fpcNm_ITEM_JEWEL_BEE_ROD, - /* 0x5F */ fpcNm_ITEM_JEWEL_WORM_ROD, - /* 0x60 */ fpcNm_ITEM_EMPTY_BOTTLE, - /* 0x61 */ fpcNm_ITEM_RED_BOTTLE, - /* 0x62 */ fpcNm_ITEM_GREEN_BOTTLE, - /* 0x63 */ fpcNm_ITEM_BLUE_BOTTLE, - /* 0x64 */ fpcNm_ITEM_MILK_BOTTLE, - /* 0x65 */ fpcNm_ITEM_HALF_MILK_BOTTLE, - /* 0x66 */ fpcNm_ITEM_OIL_BOTTLE, - /* 0x67 */ fpcNm_ITEM_WATER_BOTTLE, - /* 0x68 */ fpcNm_ITEM_OIL_BOTTLE_2, - /* 0x69 */ fpcNm_ITEM_RED_BOTTLE_2, - /* 0x6A */ fpcNm_ITEM_UGLY_SOUP, - /* 0x6B */ fpcNm_ITEM_HOT_SPRING, - /* 0x6C */ fpcNm_ITEM_FAIRY, - /* 0x6D */ fpcNm_ITEM_HOT_SPRING_2, - /* 0x6E */ fpcNm_ITEM_OIL2, - /* 0x6F */ fpcNm_ITEM_OIL, - /* 0x70 */ fpcNm_ITEM_NORMAL_BOMB, - /* 0x71 */ fpcNm_ITEM_WATER_BOMB, - /* 0x72 */ fpcNm_ITEM_POKE_BOMB, - /* 0x73 */ fpcNm_ITEM_FAIRY_DROP, - /* 0x74 */ fpcNm_ITEM_WORM, - /* 0x75 */ fpcNm_ITEM_DROP_BOTTLE, - /* 0x76 */ fpcNm_ITEM_BEE_CHILD, - /* 0x77 */ fpcNm_ITEM_CHUCHU_RARE, - /* 0x78 */ fpcNm_ITEM_CHUCHU_RED, - /* 0x79 */ fpcNm_ITEM_CHUCHU_BLUE, - /* 0x7A */ fpcNm_ITEM_CHUCHU_GREEN, - /* 0x7B */ fpcNm_ITEM_CHUCHU_YELLOW, - /* 0x7C */ fpcNm_ITEM_CHUCHU_PURPLE, - /* 0x7D */ fpcNm_ITEM_LV1_SOUP, - /* 0x7E */ fpcNm_ITEM_LV2_SOUP, - /* 0x7F */ fpcNm_ITEM_LV3_SOUP, - /* 0x80 */ fpcNm_ITEM_LETTER, - /* 0x81 */ fpcNm_ITEM_BILL, - /* 0x82 */ fpcNm_ITEM_WOOD_STATUE, - /* 0x83 */ fpcNm_ITEM_IRIAS_PENDANT, - /* 0x84 */ fpcNm_ITEM_HORSE_FLUTE, - /* 0x85 */ fpcNm_ITEM_NOENTRY_133, - /* 0x86 */ fpcNm_ITEM_NOENTRY_134, - /* 0x87 */ fpcNm_ITEM_NOENTRY_135, - /* 0x88 */ fpcNm_ITEM_NOENTRY_136, - /* 0x89 */ fpcNm_ITEM_NOENTRY_137, - /* 0x8A */ fpcNm_ITEM_NOENTRY_138, - /* 0x8B */ fpcNm_ITEM_NOENTRY_139, - /* 0x8C */ fpcNm_ITEM_NOENTRY_140, - /* 0x8D */ fpcNm_ITEM_NOENTRY_141, - /* 0x8E */ fpcNm_ITEM_NOENTRY_142, - /* 0x8F */ fpcNm_ITEM_NOENTRY_143, - /* 0x90 */ fpcNm_ITEM_RAFRELS_MEMO, - /* 0x91 */ fpcNm_ITEM_ASHS_SCRIBBLING, - /* 0x92 */ fpcNm_ITEM_NOENTRY_146, - /* 0x93 */ fpcNm_ITEM_NOENTRY_147, - /* 0x94 */ fpcNm_ITEM_NOENTRY_148, - /* 0x95 */ fpcNm_ITEM_NOENTRY_149, - /* 0x96 */ fpcNm_ITEM_NOENTRY_150, - /* 0x97 */ fpcNm_ITEM_NOENTRY_151, - /* 0x98 */ fpcNm_ITEM_NOENTRY_152, - /* 0x99 */ fpcNm_ITEM_NOENTRY_153, - /* 0x9A */ fpcNm_ITEM_NOENTRY_154, - /* 0x9B */ fpcNm_ITEM_NOENTRY_155, - /* 0x9C */ fpcNm_ITEM_CHUCHU_YELLOW2, - /* 0x9D */ fpcNm_ITEM_OIL_BOTTLE3, - /* 0x9E */ fpcNm_ITEM_SHOP_BEE_CHILD, - /* 0x9F */ fpcNm_ITEM_CHUCHU_BLACK, - /* 0xA0 */ fpcNm_ITEM_LIGHT_DROP, - /* 0xA1 */ fpcNm_ITEM_DROP_CONTAINER, - /* 0xA2 */ fpcNm_ITEM_DROP_CONTAINER02, - /* 0xA3 */ fpcNm_ITEM_DROP_CONTAINER03, - /* 0xA4 */ fpcNm_ITEM_FILLED_CONTAINER, - /* 0xA5 */ fpcNm_ITEM_MIRROR_PIECE_2, - /* 0xA6 */ fpcNm_ITEM_MIRROR_PIECE_3, - /* 0xA7 */ fpcNm_ITEM_MIRROR_PIECE_4, - /* 0xA8 */ fpcNm_ITEM_NOENTRY_168, - /* 0xA9 */ fpcNm_ITEM_NOENTRY_169, - /* 0xAA */ fpcNm_ITEM_NOENTRY_170, - /* 0xAB */ fpcNm_ITEM_NOENTRY_171, - /* 0xAC */ fpcNm_ITEM_NOENTRY_172, - /* 0xAD */ fpcNm_ITEM_NOENTRY_173, - /* 0xAE */ fpcNm_ITEM_NOENTRY_174, - /* 0xAF */ fpcNm_ITEM_NOENTRY_175, - /* 0xB0 */ fpcNm_ITEM_SMELL_YELIA_POUCH, - /* 0xB1 */ fpcNm_ITEM_SMELL_PUMPKIN, - /* 0xB2 */ fpcNm_ITEM_SMELL_POH, - /* 0xB3 */ fpcNm_ITEM_SMELL_FISH, - /* 0xB4 */ fpcNm_ITEM_SMELL_CHILDREN, - /* 0xB5 */ fpcNm_ITEM_SMELL_MEDICINE, - /* 0xB6 */ fpcNm_ITEM_NOENTRY_182, - /* 0xB7 */ fpcNm_ITEM_NOENTRY_183, - /* 0xB8 */ fpcNm_ITEM_NOENTRY_184, - /* 0xB9 */ fpcNm_ITEM_NOENTRY_185, - /* 0xBA */ fpcNm_ITEM_NOENTRY_186, - /* 0xBB */ fpcNm_ITEM_NOENTRY_187, - /* 0xBC */ fpcNm_ITEM_NOENTRY_188, - /* 0xBD */ fpcNm_ITEM_NOENTRY_189, - /* 0xBE */ fpcNm_ITEM_NOENTRY_190, - /* 0xBF */ fpcNm_ITEM_NOENTRY_191, - /* 0xC0 */ fpcNm_ITEM_M_BEETLE, - /* 0xC1 */ fpcNm_ITEM_F_BEETLE, - /* 0xC2 */ fpcNm_ITEM_M_BUTTERFLY, - /* 0xC3 */ fpcNm_ITEM_F_BUTTERFLY, - /* 0xC4 */ fpcNm_ITEM_M_STAG_BEETLE, - /* 0xC5 */ fpcNm_ITEM_F_STAG_BEETLE, - /* 0xC6 */ fpcNm_ITEM_M_GRASSHOPPER, - /* 0xC7 */ fpcNm_ITEM_F_GRASSHOPPER, - /* 0xC8 */ fpcNm_ITEM_M_NANAFUSHI, - /* 0xC9 */ fpcNm_ITEM_F_NANAFUSHI, - /* 0xCA */ fpcNm_ITEM_M_DANGOMUSHI, - /* 0xCB */ fpcNm_ITEM_F_DANGOMUSHI, - /* 0xCC */ fpcNm_ITEM_M_MANTIS, - /* 0xCD */ fpcNm_ITEM_F_MANTIS, - /* 0xCE */ fpcNm_ITEM_M_LADYBUG, - /* 0xCF */ fpcNm_ITEM_F_LADYBUG, - /* 0xD0 */ fpcNm_ITEM_M_SNAIL, - /* 0xD1 */ fpcNm_ITEM_F_SNAIL, - /* 0xD2 */ fpcNm_ITEM_M_DRAGONFLY, - /* 0xD3 */ fpcNm_ITEM_F_DRAGONFLY, - /* 0xD4 */ fpcNm_ITEM_M_ANT, - /* 0xD5 */ fpcNm_ITEM_F_ANT, - /* 0xD6 */ fpcNm_ITEM_M_MAYFLY, - /* 0xD7 */ fpcNm_ITEM_F_MAYFLY, - /* 0xD8 */ fpcNm_ITEM_NOENTRY_216, - /* 0xD9 */ fpcNm_ITEM_NOENTRY_217, - /* 0xDA */ fpcNm_ITEM_NOENTRY_218, - /* 0xDB */ fpcNm_ITEM_NOENTRY_219, - /* 0xDC */ fpcNm_ITEM_NOENTRY_220, - /* 0xDD */ fpcNm_ITEM_NOENTRY_221, - /* 0xDE */ fpcNm_ITEM_NOENTRY_222, - /* 0xDF */ fpcNm_ITEM_NOENTRY_223, - /* 0xE0 */ fpcNm_ITEM_POU_SPIRIT, - /* 0xE1 */ fpcNm_ITEM_NOENTRY_225, - /* 0xE2 */ fpcNm_ITEM_NOENTRY_226, - /* 0xE3 */ fpcNm_ITEM_NOENTRY_227, - /* 0xE4 */ fpcNm_ITEM_NOENTRY_228, - /* 0xE5 */ fpcNm_ITEM_NOENTRY_229, - /* 0xE6 */ fpcNm_ITEM_NOENTRY_230, - /* 0xE7 */ fpcNm_ITEM_NOENTRY_231, - /* 0xE8 */ fpcNm_ITEM_NOENTRY_232, - /* 0xE9 */ fpcNm_ITEM_ANCIENT_DOCUMENT, - /* 0xEA */ fpcNm_ITEM_AIR_LETTER, - /* 0xEB */ fpcNm_ITEM_ANCIENT_DOCUMENT2, - /* 0xEC */ fpcNm_ITEM_LV7_DUNGEON_EXIT, - /* 0xED */ fpcNm_ITEM_LINKS_SAVINGS, - /* 0xEE */ fpcNm_ITEM_SMALL_KEY2, - /* 0xEF */ fpcNm_ITEM_POU_FIRE1, - /* 0xF0 */ fpcNm_ITEM_POU_FIRE2, - /* 0xF1 */ fpcNm_ITEM_POU_FIRE3, - /* 0xF2 */ fpcNm_ITEM_POU_FIRE4, - /* 0xF3 */ fpcNm_ITEM_BOSSRIDER_KEY, - /* 0xF4 */ fpcNm_ITEM_TOMATO_PUREE, - /* 0xF5 */ fpcNm_ITEM_TASTE, - /* 0xF6 */ fpcNm_ITEM_LV5_BOSS_KEY, - /* 0xF7 */ fpcNm_ITEM_SURFBOARD, - /* 0xF8 */ fpcNm_ITEM_KANTERA2, - /* 0xF9 */ fpcNm_ITEM_L2_KEY_PIECES1, - /* 0xFA */ fpcNm_ITEM_L2_KEY_PIECES2, - /* 0xFB */ fpcNm_ITEM_L2_KEY_PIECES3, - /* 0xFC */ fpcNm_ITEM_KEY_OF_CARAVAN, - /* 0xFD */ fpcNm_ITEM_LV2_BOSS_KEY, - /* 0xFE */ fpcNm_ITEM_KEY_OF_FILONE, - /* 0xFF */ fpcNm_ITEM_NONE, +#if VERSION != VERSION_WII_USA_R0 && VERSION != VERSION_WII_PAL +#define PROCS_NOT_WII \ +/* 0x00F */ X(fpcNm_WARNING_SCENE_e) \ +/* 0x010 */ X(fpcNm_WARNING2_SCENE_e) +#else +#define PROCS_NOT_WII +#endif + +#define ALL_PROCS \ +/* 0x000 */ X(fpcNm_OVERLAP0_e) \ +/* 0x001 */ X(fpcNm_OVERLAP1_e) \ +/* 0x002 */ X(fpcNm_OVERLAP3_e) \ +/* 0x003 */ X(fpcNm_OVERLAP6_e) \ +/* 0x004 */ X(fpcNm_OVERLAP7_e) \ +/* 0x005 */ X(fpcNm_OVERLAP8_e) \ +/* 0x006 */ X(fpcNm_OVERLAP9_e) \ +/* 0x007 */ X(fpcNm_OVERLAP10_e) \ +/* 0x008 */ X(fpcNm_OVERLAP11_e) \ +/* 0x009 */ X(fpcNm_LOGO_SCENE_e) \ +/* 0x00A */ X(fpcNm_MENU_SCENE_e) \ +/* 0x00B */ X(fpcNm_PLAY_SCENE_e) \ +/* 0x00C */ X(fpcNm_OPENING_SCENE_e) \ +/* 0x00D */ X(fpcNm_NAME_SCENE_e) \ +/* 0x00E */ X(fpcNm_NAMEEX_SCENE_e) \ +PROCS_NOT_WII \ +/* 0x011 */ X(fpcNm_OVERLAP2_e) \ +/* 0x012 */ X(fpcNm_ROOM_SCENE_e) \ +/* 0x013 */ X(fpcNm_KANKYO_e) \ +/* 0x014 */ X(fpcNm_ALLDIE_e) \ +/* 0x015 */ X(fpcNm_ENVSE_e) \ +/* 0x016 */ X(fpcNm_Obj_Swpush_e) \ +/* 0x017 */ X(fpcNm_Obj_Swpush2_e) \ +/* 0x018 */ X(fpcNm_Obj_Swpush5_e) \ +/* 0x019 */ X(fpcNm_Tag_Gstart_e) \ +/* 0x01A */ X(fpcNm_NO_CHG_ROOM_e) \ +/* 0x01B */ X(fpcNm_Obj_Lv6ElevtA_e) \ +/* 0x01C */ X(fpcNm_OBJ_SO_e) \ +/* 0x01D */ X(fpcNm_Obj_Movebox_e) \ +/* 0x01E */ X(fpcNm_Obj_SwTurn_e) \ +/* 0x01F */ X(fpcNm_Obj_Lv6SwTurn_e) \ +/* 0x020 */ X(fpcNm_OBJ_SEKIZOA_e) \ +/* 0x021 */ X(fpcNm_OBJ_GRA_e) \ +/* 0x022 */ X(fpcNm_TAG_GRA_e) \ +/* 0x023 */ X(fpcNm_TAG_YAMI_e) \ +/* 0x024 */ X(fpcNm_Obj_Ladder_e) \ +/* 0x025 */ X(fpcNm_OBJ_BEF_e) \ +/* 0x026 */ X(fpcNm_OBJ_FMOBJ_e) \ +/* 0x027 */ X(fpcNm_OBJ_LBOX_e) \ +/* 0x028 */ X(fpcNm_OBJ_WEB0_e) \ +/* 0x029 */ X(fpcNm_OBJ_WEB1_e) \ +/* 0x02A */ X(fpcNm_OBJ_CB_e) \ +/* 0x02B */ X(fpcNm_OBJ_MAKI_e) \ +/* 0x02C */ X(fpcNm_OBJ_BRG_e) \ +/* 0x02D */ X(fpcNm_OBJ_GB_e) \ +/* 0x02E */ X(fpcNm_OBJ_GM_e) \ +/* 0x02F */ X(fpcNm_OBJ_TOBY_e) \ +/* 0x030 */ X(fpcNm_OBJ_TP_e) \ +/* 0x031 */ X(fpcNm_TREESH_e) \ +/* 0x032 */ X(fpcNm_Obj_ZDoor_e) \ +/* 0x033 */ X(fpcNm_Obj_Pillar_e) \ +/* 0x034 */ X(fpcNm_Obj_Cdoor_e) \ +/* 0x035 */ X(fpcNm_GRDWATER_e) \ +/* 0x036 */ X(fpcNm_Obj_RotBridge_e) \ +/* 0x037 */ X(fpcNm_Obj_MagLift_e) \ +/* 0x038 */ X(fpcNm_Obj_MagLiftRot_e) \ +/* 0x039 */ X(fpcNm_Obj_Lv1Cdl00_e) \ +/* 0x03A */ X(fpcNm_Obj_Lv1Cdl01_e) \ +/* 0x03B */ X(fpcNm_Obj_TvCdlst_e) \ +/* 0x03C */ X(fpcNm_Obj_HsTarget_e) \ +/* 0x03D */ X(fpcNm_Obj_HeavySw_e) \ +/* 0x03E */ X(fpcNm_Obj_GoGate_e) \ +/* 0x03F */ X(fpcNm_Obj_TaFence_e) \ +/* 0x040 */ X(fpcNm_Obj_Saidan_e) \ +/* 0x041 */ X(fpcNm_Obj_SpinLift_e) \ +/* 0x042 */ X(fpcNm_Obj_BmWindow_e) \ +/* 0x043 */ X(fpcNm_Obj_RfHole_e) \ +/* 0x044 */ X(fpcNm_Obj_WaterPillar_e) \ +/* 0x045 */ X(fpcNm_Obj_SyRock_e) \ +/* 0x046 */ X(fpcNm_Obj_BsGate_e) \ +/* 0x047 */ X(fpcNm_Obj_AmiShutter_e) \ +/* 0x048 */ X(fpcNm_Obj_WtGate_e) \ +/* 0x049 */ X(fpcNm_Obj_Lv2Candle_e) \ +/* 0x04A */ X(fpcNm_Obj_TogeTrap_e) \ +/* 0x04B */ X(fpcNm_Obj_RotTrap_e) \ +/* 0x04C */ X(fpcNm_Obj_SwallShutter_e) \ +/* 0x04D */ X(fpcNm_Obj_IceWall_e) \ +/* 0x04E */ X(fpcNm_Obj_Lv5SwIce_e) \ +/* 0x04F */ X(fpcNm_Obj_Lv5FBoard_e) \ +/* 0x050 */ X(fpcNm_Obj_Turara_e) \ +/* 0x051 */ X(fpcNm_Obj_TwGate_e) \ +/* 0x052 */ X(fpcNm_Obj_Digholl_e) \ +/* 0x053 */ X(fpcNm_Obj_Digpl_e) \ +/* 0x054 */ X(fpcNm_Obj_TestCube_e) \ +/* 0x055 */ X(fpcNm_Obj_Kshutter_e) \ +/* 0x056 */ X(fpcNm_NPC_COACH_e) \ +/* 0x057 */ X(fpcNm_NPC_THEB_e) \ +/* 0x058 */ X(fpcNm_COACH_FIRE_e) \ +/* 0x059 */ X(fpcNm_COACH2D_e) \ +/* 0x05A */ X(fpcNm_BALLOON2D_e) \ +/* 0x05B */ X(fpcNm_SKIP2D_e) \ +/* 0x05C */ X(fpcNm_Obj_MvStair_e) \ +/* 0x05D */ X(fpcNm_Obj_Cowdoor_e) \ +/* 0x05E */ X(fpcNm_Obj_Swpropeller_e) \ +/* 0x05F */ X(fpcNm_Obj_BoomShutter_e) \ +/* 0x060 */ X(fpcNm_NPC_KS_e) \ +/* 0x061 */ X(fpcNm_Obj_Hfuta_e) \ +/* 0x062 */ X(fpcNm_Obj_BkDoor_e) \ +/* 0x063 */ X(fpcNm_Obj_Cboard_e) \ +/* 0x064 */ X(fpcNm_Obj_MGate_e) \ +/* 0x065 */ X(fpcNm_Obj_Ikada_e) \ +/* 0x066 */ X(fpcNm_Obj_Ice_l_e) \ +/* 0x067 */ X(fpcNm_Obj_Ice_s_e) \ +/* 0x068 */ X(fpcNm_Obj_E_CREATE_e) \ +/* 0x069 */ X(fpcNm_Obj_Bhbridge_e) \ +/* 0x06A */ X(fpcNm_Obj_Kaisou_e) \ +/* 0x06B */ X(fpcNm_Obj_HHASHI_e) \ +/* 0x06C */ X(fpcNm_Obj_BHASHI_e) \ +/* 0x06D */ X(fpcNm_OCTHASHI_e) \ +/* 0x06E */ X(fpcNm_Obj_THASHI_e) \ +/* 0x06F */ X(fpcNm_Obj_CRVGATE_e) \ +/* 0x070 */ X(fpcNm_Obj_CRVFENCE_e) \ +/* 0x071 */ X(fpcNm_Obj_CRVHAHEN_e) \ +/* 0x072 */ X(fpcNm_Obj_CRVSTEEL_e) \ +/* 0x073 */ X(fpcNm_Obj_CRVLH_UP_e) \ +/* 0x074 */ X(fpcNm_Obj_CRVLH_DW_e) \ +/* 0x075 */ X(fpcNm_Obj_RIVERROCK_e) \ +/* 0x076 */ X(fpcNm_Obj_DUST_e) \ +/* 0x077 */ X(fpcNm_Obj_ITA_e) \ +/* 0x078 */ X(fpcNm_Obj_Window_e) \ +/* 0x079 */ X(fpcNm_Obj_MetalBox_e) \ +/* 0x07A */ X(fpcNm_Obj_BBox_e) \ +/* 0x07B */ X(fpcNm_OBJ_MSIMA_e) \ +/* 0x07C */ X(fpcNm_OBJ_MYOGAN_e) \ +/* 0x07D */ X(fpcNm_B_ZANTS_e) \ +/* 0x07E */ X(fpcNm_Obj_ChainBlock_e) \ +/* 0x07F */ X(fpcNm_Obj_ChainWall_e) \ +/* 0x080 */ X(fpcNm_Obj_KkrGate_e) \ +/* 0x081 */ X(fpcNm_Obj_RiderGate_e) \ +/* 0x082 */ X(fpcNm_Obj_Onsen_e) \ +/* 0x083 */ X(fpcNm_Obj_Chest_e) \ +/* 0x084 */ X(fpcNm_Obj_Bemos_e) \ +/* 0x085 */ X(fpcNm_Obj_RopeBridge_e) \ +/* 0x086 */ X(fpcNm_Obj_WellCover_e) \ +/* 0x087 */ X(fpcNm_Obj_GraveStone_e) \ +/* 0x088 */ X(fpcNm_Obj_ZraRock_e) \ +/* 0x089 */ X(fpcNm_Obj_GraRock_e) \ +/* 0x08A */ X(fpcNm_Obj_GrzRock_e) \ +/* 0x08B */ X(fpcNm_GRA_WALL_e) \ +/* 0x08C */ X(fpcNm_OBJ_ONSEN_FIRE_e) \ +/* 0x08D */ X(fpcNm_Obj_Lv6bemos_e) \ +/* 0x08E */ X(fpcNm_Obj_Lv6bemos2_e) \ +/* 0x08F */ X(fpcNm_Obj_BarDesk_e) \ +/* 0x090 */ X(fpcNm_Obj_DigSnow_e) \ +/* 0x091 */ X(fpcNm_Obj_Ytaihou_e) \ +/* 0x092 */ X(fpcNm_Obj_Elevator_e) \ +/* 0x093 */ X(fpcNm_Obj_Lv6TogeRoll_e) \ +/* 0x094 */ X(fpcNm_Obj_Lv6TogeTrap_e) \ +/* 0x095 */ X(fpcNm_Obj_Lv6Tenbin_e) \ +/* 0x096 */ X(fpcNm_Obj_Lv6SwGate_e) \ +/* 0x097 */ X(fpcNm_Obj_Lv6Lblock_e) \ +/* 0x098 */ X(fpcNm_Obj_Lv6ChgGate_e) \ +/* 0x099 */ X(fpcNm_Obj_Lv6FuriTrap_e) \ +/* 0x09A */ X(fpcNm_Obj_Lv6SzGate_e) \ +/* 0x09B */ X(fpcNm_Obj_Lv4EdShutter_e) \ +/* 0x09C */ X(fpcNm_Obj_Lv4Gate_e) \ +/* 0x09D */ X(fpcNm_Obj_Lv4PoGate_e) \ +/* 0x09E */ X(fpcNm_Obj_Lv4SlideWall_e) \ +/* 0x09F */ X(fpcNm_Obj_Lv4HsTarget_e) \ +/* 0x0A0 */ X(fpcNm_Obj_Lv7PropY_e) \ +/* 0x0A1 */ X(fpcNm_Obj_Lv7BsGate_e) \ +/* 0x0A2 */ X(fpcNm_Obj_Lv8OptiLift_e) \ +/* 0x0A3 */ X(fpcNm_Obj_Lv8KekkaiTrap_e) \ +/* 0x0A4 */ X(fpcNm_Obj_Lv8Lift_e) \ +/* 0x0A5 */ X(fpcNm_Obj_Lv8UdFloor_e) \ +/* 0x0A6 */ X(fpcNm_Obj_Lv9SwShutter_e) \ +/* 0x0A7 */ X(fpcNm_Obj_TobyHouse_e) \ +/* 0x0A8 */ X(fpcNm_Obj_poCandle_e) \ +/* 0x0A9 */ X(fpcNm_Obj_Lv4DigSand_e) \ +/* 0x0AA */ X(fpcNm_Obj_FallObj_e) \ +/* 0x0AB */ X(fpcNm_Obj_SmgDoor_e) \ +/* 0x0AC */ X(fpcNm_Obj_SwLight_e) \ +/* 0x0AD */ X(fpcNm_Obj_Avalanche_e) \ +/* 0x0AE */ X(fpcNm_Obj_MirrorScrew_e) \ +/* 0x0AF */ X(fpcNm_Obj_MirrorSand_e) \ +/* 0x0B0 */ X(fpcNm_Obj_MirrorTable_e) \ +/* 0x0B1 */ X(fpcNm_Obj_MirrorChain_e) \ +/* 0x0B2 */ X(fpcNm_Obj_Mirror6Pole_e) \ +/* 0x0B3 */ X(fpcNm_Obj_SwSpinner_e) \ +/* 0x0B4 */ X(fpcNm_Obj_TDoor_e) \ +/* 0x0B5 */ X(fpcNm_Obj_Lv7Bridge_e) \ +/* 0x0B6 */ X(fpcNm_Obj_zrTurara_e) \ +/* 0x0B7 */ X(fpcNm_Obj_TakaraDai_e) \ +/* 0x0B8 */ X(fpcNm_Obj_Table_e) \ +/* 0x0B9 */ X(fpcNm_Obj_CatDoor_e) \ +/* 0x0BA */ X(fpcNm_Obj_Gake_e) \ +/* 0x0BB */ X(fpcNm_CSTAF_e) \ +/* 0x0BC */ X(fpcNm_Obj_Lv4RailWall_e) \ +/* 0x0BD */ X(fpcNm_Obj_Lv4Sand_e) \ +/* 0x0BE */ X(fpcNm_Obj_PushDoor_e) \ +/* 0x0BF */ X(fpcNm_PushDoor_e) \ +/* 0x0C0 */ X(fpcNm_Obj_GanonWall2_e) \ +/* 0x0C1 */ X(fpcNm_Obj_Lv4Bridge_e) \ +/* 0x0C2 */ X(fpcNm_Obj_Lv4Floor_e) \ +/* 0x0C3 */ X(fpcNm_Tag_Spinner_e) \ +/* 0x0C4 */ X(fpcNm_Obj_SwHang_e) \ +/* 0x0C5 */ X(fpcNm_Obj_RotStair_e) \ +/* 0x0C6 */ X(fpcNm_Obj_MagneArm_e) \ +/* 0x0C7 */ X(fpcNm_Obj_KWheel00_e) \ +/* 0x0C8 */ X(fpcNm_Obj_KWheel01_e) \ +/* 0x0C9 */ X(fpcNm_Obj_Ychndlr_e) \ +/* 0x0CA */ X(fpcNm_Obj_PRElvtr_e) \ +/* 0x0CB */ X(fpcNm_Obj_MHasu_e) \ +/* 0x0CC */ X(fpcNm_Obj_YIblltray_e) \ +/* 0x0CD */ X(fpcNm_Obj_Lv6EGate_e) \ +/* 0x0CE */ X(fpcNm_Obj_PDtile_e) \ +/* 0x0CF */ X(fpcNm_Obj_PDwall_e) \ +/* 0x0D0 */ X(fpcNm_Obj_Lv4PRwall_e) \ +/* 0x0D1 */ X(fpcNm_Obj_KLift00_e) \ +/* 0x0D2 */ X(fpcNm_B_OH_e) \ +/* 0x0D3 */ X(fpcNm_Obj_Lv4Chan_e) \ +/* 0x0D4 */ X(fpcNm_Obj_Lv3R10Saka_e) \ +/* 0x0D5 */ X(fpcNm_Obj_Lv3Water_e) \ +/* 0x0D6 */ X(fpcNm_Obj_Lv3Water2_e) \ +/* 0x0D7 */ X(fpcNm_OBJ_LV3WATERB_e) \ +/* 0x0D8 */ X(fpcNm_Obj_HBombkoya_e) \ +/* 0x0D9 */ X(fpcNm_Obj_SZbridge_e) \ +/* 0x0DA */ X(fpcNm_Obj_KakarikoBrg_e) \ +/* 0x0DB */ X(fpcNm_Obj_OrdinBrg_e) \ +/* 0x0DC */ X(fpcNm_Obj_BurnBox_e) \ +/* 0x0DD */ X(fpcNm_Obj_KJgjs_e) \ +/* 0x0DE */ X(fpcNm_OBJ_IHASI_e) \ +/* 0x0DF */ X(fpcNm_Obj_IceBlock_e) \ +/* 0x0E0 */ X(fpcNm_Obj_VolcanicBall_e) \ +/* 0x0E1 */ X(fpcNm_Obj_VolcanicBomb_e) \ +/* 0x0E2 */ X(fpcNm_Obj_VolcGnd_e) \ +/* 0x0E3 */ X(fpcNm_Obj_KKanban_e) \ +/* 0x0E4 */ X(fpcNm_E_PH_e) \ +/* 0x0E5 */ X(fpcNm_NPC_ZRA_e) \ +/* 0x0E6 */ X(fpcNm_Obj_Chandelier_e) \ +/* 0x0E7 */ X(fpcNm_Obj_Stopper2_e) \ +/* 0x0E8 */ X(fpcNm_DOOR20_e) \ +/* 0x0E9 */ X(fpcNm_Tag_Hinit_e) \ +/* 0x0EA */ X(fpcNm_Tag_Hjump_e) \ +/* 0x0EB */ X(fpcNm_Tag_AJnot_e) \ +/* 0x0EC */ X(fpcNm_Tag_Hstop_e) \ +/* 0x0ED */ X(fpcNm_CANOE_e) \ +/* 0x0EE */ X(fpcNm_HORSE_e) \ +/* 0x0EF */ X(fpcNm_E_WB_e) \ +/* 0x0F0 */ X(fpcNm_OBJ_ITO_e) \ +/* 0x0F1 */ X(fpcNm_OBJ_SW_e) \ +/* 0x0F2 */ X(fpcNm_SPINNER_e) \ +/* 0x0F3 */ X(fpcNm_B_OB_e) \ +/* 0x0F4 */ X(fpcNm_KAGO_e) \ +/* 0x0F5 */ X(fpcNm_E_YC_e) \ +/* 0x0F6 */ X(fpcNm_B_DS_e) \ +/* 0x0F7 */ X(fpcNm_B_DR_e) \ +/* 0x0F8 */ X(fpcNm_B_ZANTZ_e) \ +/* 0x0F9 */ X(fpcNm_B_ZANT_e) \ +/* 0x0FA */ X(fpcNm_B_ZANTM_e) \ +/* 0x0FB */ X(fpcNm_TBOX_e) \ +/* 0x0FC */ X(fpcNm_TBOX2_e) \ +/* 0x0FD */ X(fpcNm_ALINK_e) \ +/* 0x0FE */ X(fpcNm_BOOMERANG_e) \ +/* 0x0FF */ X(fpcNm_MIDNA_e) \ +/* 0x100 */ X(fpcNm_NPC_TK_e) \ +/* 0x101 */ X(fpcNm_NPC_WORM_e) \ +/* 0x102 */ X(fpcNm_PPolamp_e) \ +/* 0x103 */ X(fpcNm_BkyRock_e) \ +/* 0x104 */ X(fpcNm_HITOBJ_e) \ +/* 0x105 */ X(fpcNm_EP_e) \ +/* 0x106 */ X(fpcNm_COW_e) \ +/* 0x107 */ X(fpcNm_PERU_e) \ +/* 0x108 */ X(fpcNm_NI_e) \ +/* 0x109 */ X(fpcNm_NPC_TKJ2_e) \ +/* 0x10A */ X(fpcNm_SQ_e) \ +/* 0x10B */ X(fpcNm_NPC_SQ_e) \ +/* 0x10C */ X(fpcNm_DO_e) \ +/* 0x10D */ X(fpcNm_NPC_NE_e) \ +/* 0x10E */ X(fpcNm_NPC_TR_e) \ +/* 0x10F */ X(fpcNm_NPC_LF_e) \ +/* 0x110 */ X(fpcNm_OBJ_FOOD_e) \ +/* 0x111 */ X(fpcNm_OBJ_KI_e) \ +/* 0x112 */ X(fpcNm_OBJ_KITA_e) \ +/* 0x113 */ X(fpcNm_OBJ_KEY_e) \ +/* 0x114 */ X(fpcNm_OBJ_KEYHOLE_e) \ +/* 0x115 */ X(fpcNm_Obj_Lv5Key_e) \ +/* 0x116 */ X(fpcNm_OBJ_LP_e) \ +/* 0x117 */ X(fpcNm_OBJ_TATIGI_e) \ +/* 0x118 */ X(fpcNm_OBJ_ROCK_e) \ +/* 0x119 */ X(fpcNm_OBJ_WFLAG_e) \ +/* 0x11A */ X(fpcNm_OBJ_KAGE_e) \ +/* 0x11B */ X(fpcNm_OBJ_KANBAN2_e) \ +/* 0x11C */ X(fpcNm_OBJ_BALLOON_e) \ +/* 0x11D */ X(fpcNm_OBJ_SUISYA_e) \ +/* 0x11E */ X(fpcNm_OBJ_OILTUBO_e) \ +/* 0x11F */ X(fpcNm_OBJ_ROTEN_e) \ +/* 0x120 */ X(fpcNm_OBJ_SSDRINK_e) \ +/* 0x121 */ X(fpcNm_OBJ_SSITEM_e) \ +/* 0x122 */ X(fpcNm_TAG_SSDRINK_e) \ +/* 0x123 */ X(fpcNm_TAG_BTLITM_e) \ +/* 0x124 */ X(fpcNm_TAG_LV5SOUP_e) \ +/* 0x125 */ X(fpcNm_TAG_MNLIGHT_e) \ +/* 0x126 */ X(fpcNm_TAG_SHOPCAM_e) \ +/* 0x127 */ X(fpcNm_TAG_SHOPITM_e) \ +/* 0x128 */ X(fpcNm_OBJ_NDOOR_e) \ +/* 0x129 */ X(fpcNm_OBJ_UDOOR_e) \ +/* 0x12A */ X(fpcNm_OBJ_USAKU_e) \ +/* 0x12B */ X(fpcNm_Obj_SM_DOOR_e) \ +/* 0x12C */ X(fpcNm_OBJ_BED_e) \ +/* 0x12D */ X(fpcNm_OBJ_BOUMATO_e) \ +/* 0x12E */ X(fpcNm_OBJ_ITAMATO_e) \ +/* 0x12F */ X(fpcNm_OBJ_NOUGU_e) \ +/* 0x130 */ X(fpcNm_OBJ_STICK_e) \ +/* 0x131 */ X(fpcNm_OBJ_MIE_e) \ +/* 0x132 */ X(fpcNm_OBJ_SEKIDOOR_e) \ +/* 0x133 */ X(fpcNm_OBJ_SEKIZO_e) \ +/* 0x134 */ X(fpcNm_OBJ_SMTILE_e) \ +/* 0x135 */ X(fpcNm_NPC_FISH_e) \ +/* 0x136 */ X(fpcNm_MG_FISH_e) \ +/* 0x137 */ X(fpcNm_FSHOP_e) \ +/* 0x138 */ X(fpcNm_NPC_DU_e) \ +/* 0x139 */ X(fpcNm_DISAPPEAR_e) \ +/* 0x13A */ X(fpcNm_Obj_Mato_e) \ +/* 0x13B */ X(fpcNm_Obj_Flag_e) \ +/* 0x13C */ X(fpcNm_Obj_Flag2_e) \ +/* 0x13D */ X(fpcNm_Obj_Flag3_e) \ +/* 0x13E */ X(fpcNm_Obj_GOMIKABE_e) \ +/* 0x13F */ X(fpcNm_Obj_Yousei_e) \ +/* 0x140 */ X(fpcNm_Obj_Kabuto_e) \ +/* 0x141 */ X(fpcNm_Obj_Cho_e) \ +/* 0x142 */ X(fpcNm_Obj_Kuw_e) \ +/* 0x143 */ X(fpcNm_Obj_Nan_e) \ +/* 0x144 */ X(fpcNm_Obj_Dan_e) \ +/* 0x145 */ X(fpcNm_Obj_Kam_e) \ +/* 0x146 */ X(fpcNm_Obj_Ten_e) \ +/* 0x147 */ X(fpcNm_Obj_Ari_e) \ +/* 0x148 */ X(fpcNm_Obj_Kag_e) \ +/* 0x149 */ X(fpcNm_Obj_Batta_e) \ +/* 0x14A */ X(fpcNm_Obj_Tombo_e) \ +/* 0x14B */ X(fpcNm_Obj_Kat_e) \ +/* 0x14C */ X(fpcNm_Obj_H_Saku_e) \ +/* 0x14D */ X(fpcNm_Obj_Yobikusa_e) \ +/* 0x14E */ X(fpcNm_Obj_KazeNeko_e) \ +/* 0x14F */ X(fpcNm_Obj_KznkArm_e) \ +/* 0x150 */ X(fpcNm_Obj_NamePlate_e) \ +/* 0x151 */ X(fpcNm_Obj_OnCloth_e) \ +/* 0x152 */ X(fpcNm_Obj_LndRope_e) \ +/* 0x153 */ X(fpcNm_Obj_ItaRope_e) \ +/* 0x154 */ X(fpcNm_Obj_Sakuita_e) \ +/* 0x155 */ X(fpcNm_Obj_Laundry_e) \ +/* 0x156 */ X(fpcNm_WarpBug_e) \ +/* 0x157 */ X(fpcNm_Izumi_Gate_e) \ +/* 0x158 */ X(fpcNm_Obj_Fchain_e) \ +/* 0x159 */ X(fpcNm_Obj_Wchain_e) \ +/* 0x15A */ X(fpcNm_Tag_Attp_e) \ +/* 0x15B */ X(fpcNm_Obj_Tornado_e) \ +/* 0x15C */ X(fpcNm_Obj_Tornado2_e) \ +/* 0x15D */ X(fpcNm_Obj_FirePillar_e) \ +/* 0x15E */ X(fpcNm_Obj_FirePillar2_e) \ +/* 0x15F */ X(fpcNm_Obj_InoBone_e) \ +/* 0x160 */ X(fpcNm_Obj_Stopper_e) \ +/* 0x161 */ X(fpcNm_Obj_MHole_e) \ +/* 0x162 */ X(fpcNm_Tag_Magne_e) \ +/* 0x163 */ X(fpcNm_Obj_BossWarp_e) \ +/* 0x164 */ X(fpcNm_Obj_WoodPendulum_e) \ +/* 0x165 */ X(fpcNm_Obj_WdStick_e) \ +/* 0x166 */ X(fpcNm_Obj_StairBlock_e) \ +/* 0x167 */ X(fpcNm_Obj_Geyser_e) \ +/* 0x168 */ X(fpcNm_Tag_KtOnFire_e) \ +/* 0x169 */ X(fpcNm_Obj_FireWood_e) \ +/* 0x16A */ X(fpcNm_Obj_FireWood2_e) \ +/* 0x16B */ X(fpcNm_Obj_GpTaru_e) \ +/* 0x16C */ X(fpcNm_Obj_OnsenTaru_e) \ +/* 0x16D */ X(fpcNm_Obj_KiPot_e) \ +/* 0x16E */ X(fpcNm_TBOX_SW_e) \ +/* 0x16F */ X(fpcNm_Obj_SwChain_e) \ +/* 0x170 */ X(fpcNm_Obj_WoodenSword_e) \ +/* 0x171 */ X(fpcNm_Obj_StoneMark_e) \ +/* 0x172 */ X(fpcNm_Obj_Lv3Candle_e) \ +/* 0x173 */ X(fpcNm_Tag_Lv4Candle_e) \ +/* 0x174 */ X(fpcNm_Tag_Lv4CandleDm_e) \ +/* 0x175 */ X(fpcNm_Obj_DamCps_e) \ +/* 0x176 */ X(fpcNm_Obj_Smoke_e) \ +/* 0x177 */ X(fpcNm_Obj_WaterFall_e) \ +/* 0x178 */ X(fpcNm_Obj_ZoraCloth_e) \ +/* 0x179 */ X(fpcNm_Obj_poFire_e) \ +/* 0x17A */ X(fpcNm_Tag_poFire_e) \ +/* 0x17B */ X(fpcNm_Obj_glowSphere_e) \ +/* 0x17C */ X(fpcNm_Tag_LightBall_e) \ +/* 0x17D */ X(fpcNm_SwLBall_e) \ +/* 0x17E */ X(fpcNm_SwBall_e) \ +/* 0x17F */ X(fpcNm_Obj_WaterEff_e) \ +/* 0x180 */ X(fpcNm_Tag_RiverBack_e) \ +/* 0x181 */ X(fpcNm_Tag_KagoFall_e) \ +/* 0x182 */ X(fpcNm_Tag_Lv2PrChk_e) \ +/* 0x183 */ X(fpcNm_Obj_Lv4Gear_e) \ +/* 0x184 */ X(fpcNm_Obj_MasterSword_e) \ +/* 0x185 */ X(fpcNm_Obj_WoodStatue_e) \ +/* 0x186 */ X(fpcNm_Obj_Fan_e) \ +/* 0x187 */ X(fpcNm_Obj_IceLeaf_e) \ +/* 0x188 */ X(fpcNm_Obj_zrTuraraRc_e) \ +/* 0x189 */ X(fpcNm_Tag_RetRoom_e) \ +/* 0x18A */ X(fpcNm_Obj_WindStone_e) \ +/* 0x18B */ X(fpcNm_Tag_WaraHowl_e) \ +/* 0x18C */ X(fpcNm_Obj_SCannon_e) \ +/* 0x18D */ X(fpcNm_Obj_SmWStone_e) \ +/* 0x18E */ X(fpcNm_Obj_SCannonCrs_e) \ +/* 0x18F */ X(fpcNm_Tag_SnowEff_e) \ +/* 0x190 */ X(fpcNm_Tag_CstaSw_e) \ +/* 0x191 */ X(fpcNm_Tag_Lv6CstaSw_e) \ +/* 0x192 */ X(fpcNm_Obj_awaPlar_e) \ +/* 0x193 */ X(fpcNm_Obj_poTbox_e) \ +/* 0x194 */ X(fpcNm_Obj_TimeFire_e) \ +/* 0x195 */ X(fpcNm_Obj_TMoon_e) \ +/* 0x196 */ X(fpcNm_Obj_GanonWall_e) \ +/* 0x197 */ X(fpcNm_Obj_Prop_e) \ +/* 0x198 */ X(fpcNm_CSTATUE_e) \ +/* 0x199 */ X(fpcNm_Obj_SwBallA_e) \ +/* 0x19A */ X(fpcNm_Obj_SwBallB_e) \ +/* 0x19B */ X(fpcNm_Obj_SnowSoup_e) \ +/* 0x19C */ X(fpcNm_Obj_Nagaisu_e) \ +/* 0x19D */ X(fpcNm_Obj_RCircle_e) \ +/* 0x19E */ X(fpcNm_Obj_Picture_e) \ +/* 0x19F */ X(fpcNm_Tag_SetBall_e) \ +/* 0x1A0 */ X(fpcNm_Tag_SmkEmt_e) \ +/* 0x1A1 */ X(fpcNm_SwTime_e) \ +/* 0x1A2 */ X(fpcNm_Obj_HFtr_e) \ +/* 0x1A3 */ X(fpcNm_Obj_HBarrel_e) \ +/* 0x1A4 */ X(fpcNm_Obj_Crystal_e) \ +/* 0x1A5 */ X(fpcNm_Obj_SCannonTen_e) \ +/* 0x1A6 */ X(fpcNm_Obj_SwBallC_e) \ +/* 0x1A7 */ X(fpcNm_SCENE_EXIT2_e) \ +/* 0x1A8 */ X(fpcNm_Obj_Hata_e) \ +/* 0x1A9 */ X(fpcNm_Obj_ToaruMaki_e) \ +/* 0x1AA */ X(fpcNm_Tag_AttackItem_e) \ +/* 0x1AB */ X(fpcNm_Tag_RmbitSw_e) \ +/* 0x1AC */ X(fpcNm_Obj_Sword_e) \ +/* 0x1AD */ X(fpcNm_Tag_Spring_e) \ +/* 0x1AE */ X(fpcNm_Tag_Statue_e) \ +/* 0x1AF */ X(fpcNm_E_AI_e) \ +/* 0x1B0 */ X(fpcNm_E_GS_e) \ +/* 0x1B1 */ X(fpcNm_E_GOB_e) \ +/* 0x1B2 */ X(fpcNm_E_DD_e) \ +/* 0x1B3 */ X(fpcNm_E_DN_e) \ +/* 0x1B4 */ X(fpcNm_E_S1_e) \ +/* 0x1B5 */ X(fpcNm_E_MF_e) \ +/* 0x1B6 */ X(fpcNm_E_SG_e) \ +/* 0x1B7 */ X(fpcNm_E_BS_e) \ +/* 0x1B8 */ X(fpcNm_E_SF_e) \ +/* 0x1B9 */ X(fpcNm_E_SH_e) \ +/* 0x1BA */ X(fpcNm_E_DF_e) \ +/* 0x1BB */ X(fpcNm_E_GM_e) \ +/* 0x1BC */ X(fpcNm_E_MD_e) \ +/* 0x1BD */ X(fpcNm_E_SM_e) \ +/* 0x1BE */ X(fpcNm_E_SM2_e) \ +/* 0x1BF */ X(fpcNm_E_ST_e) \ +/* 0x1C0 */ X(fpcNm_E_ST_LINE_e) \ +/* 0x1C1 */ X(fpcNm_E_SB_e) \ +/* 0x1C2 */ X(fpcNm_E_TH_e) \ +/* 0x1C3 */ X(fpcNm_E_CR_e) \ +/* 0x1C4 */ X(fpcNm_E_CR_EGG_e) \ +/* 0x1C5 */ X(fpcNm_E_DB_e) \ +/* 0x1C6 */ X(fpcNm_E_DB_LEAF_e) \ +/* 0x1C7 */ X(fpcNm_E_GA_e) \ +/* 0x1C8 */ X(fpcNm_E_GB_e) \ +/* 0x1C9 */ X(fpcNm_E_HB_e) \ +/* 0x1CA */ X(fpcNm_E_HB_LEAF_e) \ +/* 0x1CB */ X(fpcNm_E_HZELDA_e) \ +/* 0x1CC */ X(fpcNm_E_YD_e) \ +/* 0x1CD */ X(fpcNm_E_YH_e) \ +/* 0x1CE */ X(fpcNm_E_YD_LEAF_e) \ +/* 0x1CF */ X(fpcNm_E_HM_e) \ +/* 0x1D0 */ X(fpcNm_E_TK_e) \ +/* 0x1D1 */ X(fpcNm_E_TK2_e) \ +/* 0x1D2 */ X(fpcNm_E_TK_BALL_e) \ +/* 0x1D3 */ X(fpcNm_E_RB_e) \ +/* 0x1D4 */ X(fpcNm_E_RD_e) \ +/* 0x1D5 */ X(fpcNm_E_RDB_e) \ +/* 0x1D6 */ X(fpcNm_E_RDY_e) \ +/* 0x1D7 */ X(fpcNm_E_FM_e) \ +/* 0x1D8 */ X(fpcNm_E_FS_e) \ +/* 0x1D9 */ X(fpcNm_E_PM_e) \ +/* 0x1DA */ X(fpcNm_E_PO_e) \ +/* 0x1DB */ X(fpcNm_E_MB_e) \ +/* 0x1DC */ X(fpcNm_E_MK_e) \ +/* 0x1DD */ X(fpcNm_E_MM_e) \ +/* 0x1DE */ X(fpcNm_E_FZ_e) \ +/* 0x1DF */ X(fpcNm_E_ZS_e) \ +/* 0x1E0 */ X(fpcNm_E_KK_e) \ +/* 0x1E1 */ X(fpcNm_E_HP_e) \ +/* 0x1E2 */ X(fpcNm_E_ZH_e) \ +/* 0x1E3 */ X(fpcNm_E_ZM_e) \ +/* 0x1E4 */ X(fpcNm_E_PZ_e) \ +/* 0x1E5 */ X(fpcNm_E_FB_e) \ +/* 0x1E6 */ X(fpcNm_E_FK_e) \ +/* 0x1E7 */ X(fpcNm_E_MS_e) \ +/* 0x1E8 */ X(fpcNm_E_NEST_e) \ +/* 0x1E9 */ X(fpcNm_E_NZ_e) \ +/* 0x1EA */ X(fpcNm_E_BA_e) \ +/* 0x1EB */ X(fpcNm_E_BU_e) \ +/* 0x1EC */ X(fpcNm_E_BUG_e) \ +/* 0x1ED */ X(fpcNm_E_BEE_e) \ +/* 0x1EE */ X(fpcNm_E_IS_e) \ +/* 0x1EF */ X(fpcNm_E_KG_e) \ +/* 0x1F0 */ X(fpcNm_E_KR_e) \ +/* 0x1F1 */ X(fpcNm_E_SW_e) \ +/* 0x1F2 */ X(fpcNm_E_GE_e) \ +/* 0x1F3 */ X(fpcNm_Tag_WatchGe_e) \ +/* 0x1F4 */ X(fpcNm_E_YM_e) \ +/* 0x1F5 */ X(fpcNm_E_YM_TAG_e) \ +/* 0x1F6 */ X(fpcNm_E_YMB_e) \ +/* 0x1F7 */ X(fpcNm_Tag_FWall_e) \ +/* 0x1F8 */ X(fpcNm_Tag_WaterFall_e) \ +/* 0x1F9 */ X(fpcNm_E_YK_e) \ +/* 0x1FA */ X(fpcNm_E_YR_e) \ +/* 0x1FB */ X(fpcNm_E_YG_e) \ +/* 0x1FC */ X(fpcNm_E_HZ_e) \ +/* 0x1FD */ X(fpcNm_E_WS_e) \ +/* 0x1FE */ X(fpcNm_E_OC_e) \ +/* 0x1FF */ X(fpcNm_E_OT_e) \ +/* 0x200 */ X(fpcNm_E_DT_e) \ +/* 0x201 */ X(fpcNm_E_BG_e) \ +/* 0x202 */ X(fpcNm_E_OctBg_e) \ +/* 0x203 */ X(fpcNm_DR_e) \ +/* 0x204 */ X(fpcNm_L7lowDr_e) \ +/* 0x205 */ X(fpcNm_L7ODR_e) \ +/* 0x206 */ X(fpcNm_E_TT_e) \ +/* 0x207 */ X(fpcNm_E_DK_e) \ +/* 0x208 */ X(fpcNm_E_VT_e) \ +/* 0x209 */ X(fpcNm_E_WW_e) \ +/* 0x20A */ X(fpcNm_E_GI_e) \ +/* 0x20B */ X(fpcNm_B_BH_e) \ +/* 0x20C */ X(fpcNm_B_BQ_e) \ +/* 0x20D */ X(fpcNm_B_GM_e) \ +/* 0x20E */ X(fpcNm_B_GND_e) \ +/* 0x20F */ X(fpcNm_B_GO_e) \ +/* 0x210 */ X(fpcNm_B_OH2_e) \ +/* 0x211 */ X(fpcNm_B_YO_e) \ +/* 0x212 */ X(fpcNm_B_YOI_e) \ +/* 0x213 */ X(fpcNm_B_TN_e) \ +/* 0x214 */ X(fpcNm_B_GG_e) \ +/* 0x215 */ X(fpcNm_B_DRE_e) \ +/* 0x216 */ X(fpcNm_B_MGN_e) \ +/* 0x217 */ X(fpcNm_E_WAP_e) \ +/* 0x218 */ X(fpcNm_ITEM_e) \ +/* 0x219 */ X(fpcNm_Obj_SmallKey_e) \ +/* 0x21A */ X(fpcNm_Obj_Kantera_e) \ +/* 0x21B */ X(fpcNm_Obj_LifeContainer_e) \ +/* 0x21C */ X(fpcNm_Obj_Shield_e) \ +/* 0x21D */ X(fpcNm_Demo_Item_e) \ +/* 0x21E */ X(fpcNm_ShopItem_e) \ +/* 0x21F */ X(fpcNm_Obj_Drop_e) \ +/* 0x220 */ X(fpcNm_OBJ_RW_e) \ +/* 0x221 */ X(fpcNm_NBOMB_e) \ +/* 0x222 */ X(fpcNm_TAG_CSW_e) \ +/* 0x223 */ X(fpcNm_TAG_QS_e) \ +/* 0x224 */ X(fpcNm_HOZELDA_e) \ +/* 0x225 */ X(fpcNm_SWC00_e) \ +/* 0x226 */ X(fpcNm_KNOB20_e) \ +/* 0x227 */ X(fpcNm_DBDOOR_e) \ +/* 0x228 */ X(fpcNm_BOSS_DOOR_e) \ +/* 0x229 */ X(fpcNm_L1BOSS_DOOR_e) \ +/* 0x22A */ X(fpcNm_L1MBOSS_DOOR_e) \ +/* 0x22B */ X(fpcNm_L5BOSS_DOOR_e) \ +/* 0x22C */ X(fpcNm_DSHUTTER_e) \ +/* 0x22D */ X(fpcNm_SPIRAL_DOOR_e) \ +/* 0x22E */ X(fpcNm_Tag_ChgRestart_e) \ +/* 0x22F */ X(fpcNm_Tag_Restart_e) \ +/* 0x230 */ X(fpcNm_ANDSW_e) \ +/* 0x231 */ X(fpcNm_ANDSW2_e) \ +/* 0x232 */ X(fpcNm_MYNA_e) \ +/* 0x233 */ X(fpcNm_NPC_GND_e) \ +/* 0x234 */ X(fpcNm_NPC_GRA_e) \ +/* 0x235 */ X(fpcNm_NPC_GRC_e) \ +/* 0x236 */ X(fpcNm_NPC_GRD_e) \ +/* 0x237 */ X(fpcNm_NPC_GRM_e) \ +/* 0x238 */ X(fpcNm_NPC_GRMC_e) \ +/* 0x239 */ X(fpcNm_NPC_GRO_e) \ +/* 0x23A */ X(fpcNm_NPC_GRR_e) \ +/* 0x23B */ X(fpcNm_NPC_GRS_e) \ +/* 0x23C */ X(fpcNm_NPC_GRZ_e) \ +/* 0x23D */ X(fpcNm_NPC_YAMID_e) \ +/* 0x23E */ X(fpcNm_NPC_YAMIT_e) \ +/* 0x23F */ X(fpcNm_NPC_YAMIS_e) \ +/* 0x240 */ X(fpcNm_NPC_BLUENS_e) \ +/* 0x241 */ X(fpcNm_NPC_KAKASHI_e) \ +/* 0x242 */ X(fpcNm_NPC_KDK_e) \ +/* 0x243 */ X(fpcNm_NPC_ARU_e) \ +/* 0x244 */ X(fpcNm_NPC_BANS_e) \ +/* 0x245 */ X(fpcNm_NPC_BESU_e) \ +/* 0x246 */ X(fpcNm_NPC_BOU_e) \ +/* 0x247 */ X(fpcNm_NPC_BOU_S_e) \ +/* 0x248 */ X(fpcNm_NPC_CLERKA_e) \ +/* 0x249 */ X(fpcNm_NPC_CLERKB_e) \ +/* 0x24A */ X(fpcNm_NPC_CLERKT_e) \ +/* 0x24B */ X(fpcNm_NPC_WRESTLER_e) \ +/* 0x24C */ X(fpcNm_Tag_Arena_e) \ +/* 0x24D */ X(fpcNm_Tag_Instruction_e) \ +/* 0x24E */ X(fpcNm_NPC_DOC_e) \ +/* 0x24F */ X(fpcNm_NPC_GWOLF_e) \ +/* 0x250 */ X(fpcNm_NPC_LEN_e) \ +/* 0x251 */ X(fpcNm_NPC_LUD_e) \ +/* 0x252 */ X(fpcNm_NPC_FAIRY_SEIREI_e) \ +/* 0x253 */ X(fpcNm_NPC_FAIRY_e) \ +/* 0x254 */ X(fpcNm_NPC_HANJO_e) \ +/* 0x255 */ X(fpcNm_NPC_HENNA_e) \ +/* 0x256 */ X(fpcNm_NPC_HENNA0_e) \ +/* 0x257 */ X(fpcNm_NPC_HOZ_e) \ +/* 0x258 */ X(fpcNm_NPC_JAGAR_e) \ +/* 0x259 */ X(fpcNm_NPC_KKRI_e) \ +/* 0x25A */ X(fpcNm_NPC_KN_e) \ +/* 0x25B */ X(fpcNm_KN_BULLET_e) \ +/* 0x25C */ X(fpcNm_NPC_KNJ_e) \ +/* 0x25D */ X(fpcNm_NPC_KOLIN_e) \ +/* 0x25E */ X(fpcNm_NPC_KOLINB_e) \ +/* 0x25F */ X(fpcNm_NPC_KYURY_e) \ +/* 0x260 */ X(fpcNm_NPC_MARO_e) \ +/* 0x261 */ X(fpcNm_NPC_MIDP_e) \ +/* 0x262 */ X(fpcNm_NPC_MOI_e) \ +/* 0x263 */ X(fpcNm_NPC_RACA_e) \ +/* 0x264 */ X(fpcNm_NPC_SARU_e) \ +/* 0x265 */ X(fpcNm_NPC_SEIB_e) \ +/* 0x266 */ X(fpcNm_NPC_SEIC_e) \ +/* 0x267 */ X(fpcNm_NPC_SEID_e) \ +/* 0x268 */ X(fpcNm_NPC_SEIRA_e) \ +/* 0x269 */ X(fpcNm_NPC_SERA2_e) \ +/* 0x26A */ X(fpcNm_NPC_SEIREI_e) \ +/* 0x26B */ X(fpcNm_NPC_SHAMAN_e) \ +/* 0x26C */ X(fpcNm_NPC_SMARO_e) \ +/* 0x26D */ X(fpcNm_NPC_SOLA_e) \ +/* 0x26E */ X(fpcNm_NPC_TARO_e) \ +/* 0x26F */ X(fpcNm_NPC_PACHI_BESU_e) \ +/* 0x270 */ X(fpcNm_NPC_PACHI_TARO_e) \ +/* 0x271 */ X(fpcNm_NPC_PACHI_MARO_e) \ +/* 0x272 */ X(fpcNm_TAG_PATI_e) \ +/* 0x273 */ X(fpcNm_NPC_THE_e) \ +/* 0x274 */ X(fpcNm_NPC_TKJ_e) \ +/* 0x275 */ X(fpcNm_NPC_TKS_e) \ +/* 0x276 */ X(fpcNm_NPC_TKC_e) \ +/* 0x277 */ X(fpcNm_OBJ_TKS_e) \ +/* 0x278 */ X(fpcNm_NPC_TOBY_e) \ +/* 0x279 */ X(fpcNm_NPC_URI_e) \ +/* 0x27A */ X(fpcNm_NPC_YELIA_e) \ +/* 0x27B */ X(fpcNm_NPC_YKM_e) \ +/* 0x27C */ X(fpcNm_NPC_YKW_e) \ +/* 0x27D */ X(fpcNm_NPC_ZANB_e) \ +/* 0x27E */ X(fpcNm_NPC_ZANT_e) \ +/* 0x27F */ X(fpcNm_NPC_ZELDA_e) \ +/* 0x280 */ X(fpcNm_NPC_ZELR_e) \ +/* 0x281 */ X(fpcNm_NPC_ZELRO_e) \ +/* 0x282 */ X(fpcNm_OBJ_ZRAFREEZE_e) \ +/* 0x283 */ X(fpcNm_NPC_ZRC_e) \ +/* 0x284 */ X(fpcNm_NPC_ZRZ_e) \ +/* 0x285 */ X(fpcNm_ZRA_MARK_e) \ +/* 0x286 */ X(fpcNm_MYNA2_e) \ +/* 0x287 */ X(fpcNm_TAG_MYNA2_e) \ +/* 0x288 */ X(fpcNm_NPC_CD3_e) \ +/* 0x289 */ X(fpcNm_Tag_Schedule_e) \ +/* 0x28A */ X(fpcNm_Tag_Escape_e) \ +/* 0x28B */ X(fpcNm_NPC_CHAT_e) \ +/* 0x28C */ X(fpcNm_NPC_SOLDIERa_e) \ +/* 0x28D */ X(fpcNm_NPC_SOLDIERb_e) \ +/* 0x28E */ X(fpcNm_PASSER_MNG_e) \ +/* 0x28F */ X(fpcNm_NPC_PASSER_e) \ +/* 0x290 */ X(fpcNm_NPC_PASSER2_e) \ +/* 0x291 */ X(fpcNm_NPC_POST_e) \ +/* 0x292 */ X(fpcNm_NPC_POUYA_e) \ +/* 0x293 */ X(fpcNm_FORMATION_MNG_e) \ +/* 0x294 */ X(fpcNm_NPC_FGUARD_e) \ +/* 0x295 */ X(fpcNm_GUARD_MNG_e) \ +/* 0x296 */ X(fpcNm_TAG_GUARD_e) \ +/* 0x297 */ X(fpcNm_NPC_GUARD_e) \ +/* 0x298 */ X(fpcNm_NPC_ASH_e) \ +/* 0x299 */ X(fpcNm_NPC_ASHB_e) \ +/* 0x29A */ X(fpcNm_NPC_SHAD_e) \ +/* 0x29B */ X(fpcNm_NPC_RAFREL_e) \ +/* 0x29C */ X(fpcNm_NPC_MOIR_e) \ +/* 0x29D */ X(fpcNm_NPC_IMPAL_e) \ +/* 0x29E */ X(fpcNm_NPC_SHOE_e) \ +/* 0x29F */ X(fpcNm_NPC_DOORBOY_e) \ +/* 0x2A0 */ X(fpcNm_NPC_PRAYER_e) \ +/* 0x2A1 */ X(fpcNm_NPC_KASIHANA_e) \ +/* 0x2A2 */ X(fpcNm_NPC_KASIKYU_e) \ +/* 0x2A3 */ X(fpcNm_NPC_KASIMICH_e) \ +/* 0x2A4 */ X(fpcNm_NPC_DRSOL_e) \ +/* 0x2A5 */ X(fpcNm_NPC_CHIN_e) \ +/* 0x2A6 */ X(fpcNm_NPC_INS_e) \ +/* 0x2A7 */ X(fpcNm_NPC_SHOP0_e) \ +/* 0x2A8 */ X(fpcNm_NPC_MK_e) \ +/* 0x2A9 */ X(fpcNm_NPC_P2_e) \ +/* 0x2AA */ X(fpcNm_KYTAG00_e) \ +/* 0x2AB */ X(fpcNm_KYTAG01_e) \ +/* 0x2AC */ X(fpcNm_KYTAG02_e) \ +/* 0x2AD */ X(fpcNm_KYTAG03_e) \ +/* 0x2AE */ X(fpcNm_KYTAG04_e) \ +/* 0x2AF */ X(fpcNm_KYTAG05_e) \ +/* 0x2B0 */ X(fpcNm_KYTAG06_e) \ +/* 0x2B1 */ X(fpcNm_KYTAG07_e) \ +/* 0x2B2 */ X(fpcNm_KYTAG08_e) \ +/* 0x2B3 */ X(fpcNm_KYTAG09_e) \ +/* 0x2B4 */ X(fpcNm_KYTAG10_e) \ +/* 0x2B5 */ X(fpcNm_KYTAG11_e) \ +/* 0x2B6 */ X(fpcNm_KYTAG12_e) \ +/* 0x2B7 */ X(fpcNm_KYTAG13_e) \ +/* 0x2B8 */ X(fpcNm_KYTAG14_e) \ +/* 0x2B9 */ X(fpcNm_KYTAG15_e) \ +/* 0x2BA */ X(fpcNm_KYTAG16_e) \ +/* 0x2BB */ X(fpcNm_KYTAG17_e) \ +/* 0x2BC */ X(fpcNm_Ykgr_e) \ +/* 0x2BD */ X(fpcNm_TALK_e) \ +/* 0x2BE */ X(fpcNm_Obj_Crope_e) \ +/* 0x2BF */ X(fpcNm_Obj_Bombf_e) \ +/* 0x2C0 */ X(fpcNm_Obj_BkLeaf_e) \ +/* 0x2C1 */ X(fpcNm_Tag_Mhint_e) \ +/* 0x2C2 */ X(fpcNm_Tag_Mmsg_e) \ +/* 0x2C3 */ X(fpcNm_Tag_Mwait_e) \ +/* 0x2C4 */ X(fpcNm_Tag_Mstop_e) \ +/* 0x2C5 */ X(fpcNm_Tag_Stream_e) \ +/* 0x2C6 */ X(fpcNm_Tag_Sppath_e) \ +/* 0x2C7 */ X(fpcNm_Tag_Wljump_e) \ +/* 0x2C8 */ X(fpcNm_Tag_TWGate_e) \ +/* 0x2C9 */ X(fpcNm_Tag_Lv6Gate_e) \ +/* 0x2CA */ X(fpcNm_Tag_Lv7Gate_e) \ +/* 0x2CB */ X(fpcNm_Tag_Lv8Gate_e) \ +/* 0x2CC */ X(fpcNm_Tag_TheBHint_e) \ +/* 0x2CD */ X(fpcNm_Tag_Assist_e) \ +/* 0x2CE */ X(fpcNm_DEMO00_e) \ +/* 0x2CF */ X(fpcNm_TAG_CAMERA_e) \ +/* 0x2D0 */ X(fpcNm_TAG_CHKPOINT_e) \ +/* 0x2D1 */ X(fpcNm_TAG_EVENT_e) \ +/* 0x2D2 */ X(fpcNm_TAG_EVT_e) \ +/* 0x2D3 */ X(fpcNm_TAG_TELOP_e) \ +/* 0x2D4 */ X(fpcNm_TAG_HOWL_e) \ +/* 0x2D5 */ X(fpcNm_TAG_MSG_e) \ +/* 0x2D6 */ X(fpcNm_TAG_LANTERN_e) \ +/* 0x2D7 */ X(fpcNm_Tag_Mist_e) \ +/* 0x2D8 */ X(fpcNm_DMIDNA_e) \ +/* 0x2D9 */ X(fpcNm_KY_THUNDER_e) \ +/* 0x2DA */ X(fpcNm_VRBOX_e) \ +/* 0x2DB */ X(fpcNm_VRBOX2_e) \ +/* 0x2DC */ X(fpcNm_BG_e) \ +/* 0x2DD */ X(fpcNm_SET_BG_OBJ_e) \ +/* 0x2DE */ X(fpcNm_BG_OBJ_e) \ +/* 0x2DF */ X(fpcNm_MIRROR_e) \ +/* 0x2E0 */ X(fpcNm_MOVIE_PLAYER_e) \ +/* 0x2E1 */ X(fpcNm_TITLE_e) \ +/* 0x2E2 */ X(fpcNm_FR_e) \ +/* 0x2E3 */ X(fpcNm_ECONT_e) \ +/* 0x2E4 */ X(fpcNm_MG_ROD_e) \ +/* 0x2E5 */ X(fpcNm_E_ARROW_e) \ +/* 0x2E6 */ X(fpcNm_BULLET_e) \ +/* 0x2E7 */ X(fpcNm_SWHIT0_e) \ +/* 0x2E8 */ X(fpcNm_E_TH_BALL_e) \ +/* 0x2E9 */ X(fpcNm_TAG_EVTAREA_e) \ +/* 0x2EA */ X(fpcNm_TAG_EVTMSG_e) \ +/* 0x2EB */ X(fpcNm_TAG_KMSG_e) \ +/* 0x2EC */ X(fpcNm_TAG_PUSH_e) \ +/* 0x2ED */ X(fpcNm_E_MK_BO_e) \ +/* 0x2EE */ X(fpcNm_E_MM_MT_e) \ +/* 0x2EF */ X(fpcNm_OBJ_KBOX_e) \ +/* 0x2F0 */ X(fpcNm_OBJ_FW_e) \ +/* 0x2F1 */ X(fpcNm_B_GOS_e) \ +/* 0x2F2 */ X(fpcNm_OBJ_YSTONE_e) \ +/* 0x2F3 */ X(fpcNm_MANT_e) \ +/* 0x2F4 */ X(fpcNm_CROD_e) \ +/* 0x2F5 */ X(fpcNm_OBJ_PLEAF_e) \ +/* 0x2F6 */ X(fpcNm_OBJ_KBACKET_e) \ +/* 0x2F7 */ X(fpcNm_OBJ_YBAG_e) \ +/* 0x2F8 */ X(fpcNm_OBJ_PUMPKIN_e) \ +/* 0x2F9 */ X(fpcNm_OBJ_AUTOMATA_e) \ +/* 0x2FA */ X(fpcNm_OBJ_GADGET_e) \ +/* 0x2FB */ X(fpcNm_OBJ_KAGO_e) \ +/* 0x2FC */ X(fpcNm_Obj_Carry_e) \ +/* 0x2FD */ X(fpcNm_Obj_Stone_e) \ +/* 0x2FE */ X(fpcNm_OBJ_HB_e) \ +/* 0x2FF */ X(fpcNm_NPC_INKO_e) \ +/* 0x300 */ X(fpcNm_BD_e) \ +/* 0x301 */ X(fpcNm_Obj_Eff_e) \ +/* 0x302 */ X(fpcNm_WPILLAR_e) \ +/* 0x303 */ X(fpcNm_WMARK_e) \ +/* 0x304 */ X(fpcNm_E_BI_e) \ +/* 0x305 */ X(fpcNm_E_BI_LEAF_e) \ +/* 0x306 */ X(fpcNm_START_AND_GOAL_e) \ +/* 0x307 */ X(fpcNm_NPC_DF_e) \ +/* 0x308 */ X(fpcNm_ARROW_e) \ +/* 0x309 */ X(fpcNm_PATH_LINE_e) \ +/* 0x30A */ X(fpcNm_TAG_ALLMATO_e) \ +/* 0x30B */ X(fpcNm_Obj_Timer_e) \ +/* 0x30C */ X(fpcNm_SCENE_EXIT_e) \ +/* 0x30D */ X(fpcNm_CAMERA_e) \ +/* 0x30E */ X(fpcNm_CAMERA2_e) \ +/* 0x30F */ X(fpcNm_SUSPEND_e) \ +/* 0x310 */ X(fpcNm_GRASS_e) \ +/* 0x311 */ X(fpcNm_KYEFF_e) \ +/* 0x312 */ X(fpcNm_KYEFF2_e) \ +/* 0x313 */ X(fpcNm_MSG_OBJECT_e) \ +/* 0x314 */ X(fpcNm_MENUWINDOW_e) \ +/* 0x315 */ X(fpcNm_TIMER_e) \ +/* 0x316 */ X(fpcNm_METER2_e) \ +/* 0x317 */ X(fpcNm_GAMEOVER_e) \ + +#define X(name) name, +enum { + ALL_PROCS + + fpcNm_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 /* F_PC_NAME_H_ */ diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index ed96e63276..e6973dc782 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -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(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(i_color), i_tevStr); + } +#endif virtual int getMaterialID() { return 0; } virtual void setMaterial(); diff --git a/src/Z2AudioLib/Z2Creature.cpp b/src/Z2AudioLib/Z2Creature.cpp index 3d18bfdda4..a17e3d516c 100644 --- a/src/Z2AudioLib/Z2Creature.cpp +++ b/src/Z2AudioLib/Z2Creature.cpp @@ -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, diff --git a/src/c/c_damagereaction.cpp b/src/c/c_damagereaction.cpp index 95781ba7e9..b8da6e4535 100644 --- a/src/c/c_damagereaction.cpp +++ b/src/c/c_damagereaction.cpp @@ -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; } } diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp index 26a1e7a1ce..e6417ebbf8 100644 --- a/src/c/c_dylink.cpp +++ b/src/c/c_dylink.cpp @@ -21,791 +21,790 @@ static DynamicNameTableEntry const DynamicNameTable[] = { #if !TARGET_PC - {PROC_ALLDIE, "d_a_alldie"}, - {PROC_Obj_Swpush, "d_a_obj_swpush"}, - {PROC_Obj_Swpush2, "d_a_obj_swpush2"}, - {PROC_Obj_Swpush5, "d_a_obj_swpush5"}, - {PROC_Tag_Gstart, "d_a_tag_gstart"}, + {fpcNm_ALLDIE_e, "d_a_alldie"}, + {fpcNm_Obj_Swpush_e, "d_a_obj_swpush"}, + {fpcNm_Obj_Swpush2_e, "d_a_obj_swpush2"}, + {fpcNm_Obj_Swpush5_e, "d_a_obj_swpush5"}, + {fpcNm_Tag_Gstart_e, "d_a_tag_gstart"}, #if PLATFORM_WII || PLATFORM_SHIELD - {PROC_NO_CHG_ROOM, "d_a_no_chg_room"}, + {fpcNm_NO_CHG_ROOM_e, "d_a_no_chg_room"}, #endif - {PROC_Obj_Lv6ElevtA, "d_a_obj_lv6elevta"}, - {PROC_OBJ_SO, "d_a_obj_so"}, - {PROC_Obj_Movebox, "d_a_obj_movebox"}, - {PROC_Obj_SwTurn, "d_a_obj_swturn"}, - {PROC_Obj_Lv6SwTurn, "d_a_obj_lv6swturn"}, - {PROC_OBJ_SEKIZOA, "d_a_obj_sekizoa"}, - {PROC_OBJ_GRA, "d_a_obj_gra2"}, - {PROC_TAG_GRA, "d_a_tag_gra"}, - {PROC_TAG_YAMI, "d_a_tag_yami"}, - {PROC_Obj_Ladder, "d_a_obj_ladder"}, - {PROC_OBJ_BEF, "d_a_obj_brakeeff"}, - {PROC_OBJ_FMOBJ, "d_a_obj_fmobj"}, - {PROC_OBJ_LBOX, "d_a_obj_lbox"}, - {PROC_OBJ_WEB0, "d_a_obj_web0"}, - {PROC_OBJ_WEB1, "d_a_obj_web1"}, - {PROC_OBJ_CB, "d_a_obj_cb"}, - {PROC_OBJ_MAKI, "d_a_obj_maki"}, - {PROC_OBJ_BRG, "d_a_obj_brg"}, - {PROC_OBJ_GB, "d_a_obj_gb"}, - {PROC_OBJ_GM, "d_a_obj_gm"}, - {PROC_OBJ_TOBY, "d_a_obj_toby"}, - {PROC_OBJ_TP, "d_a_obj_tp"}, - {PROC_TREESH, "d_a_obj_treesh"}, - {PROC_Obj_ZDoor, "d_a_obj_zdoor"}, - {PROC_Obj_Pillar, "d_a_obj_pillar"}, - {PROC_Obj_Cdoor, "d_a_obj_cdoor"}, - {PROC_GRDWATER, "d_a_obj_groundwater"}, - {PROC_Obj_RotBridge, "d_a_obj_rotBridge"}, - {PROC_Obj_MagLift, "d_a_obj_magLift"}, - {PROC_Obj_MagLiftRot, "d_a_obj_magLiftRot"}, - {PROC_Obj_Lv1Cdl00, "d_a_obj_lv1Candle00"}, - {PROC_Obj_Lv1Cdl01, "d_a_obj_lv1Candle01"}, - {PROC_Obj_TvCdlst, "d_a_obj_TvCdlst"}, - {PROC_Obj_HsTarget, "d_a_obj_hsTarget"}, - {PROC_Obj_HeavySw, "d_a_obj_heavySw"}, - {PROC_Obj_GoGate, "d_a_obj_goGate"}, - {PROC_Obj_TaFence, "d_a_obj_taFence"}, - {PROC_Obj_Saidan, "d_a_obj_saidan"}, - {PROC_Obj_SpinLift, "d_a_obj_spinLift"}, - {PROC_Obj_BmWindow, "d_a_obj_bmWindow"}, - {PROC_Obj_RfHole, "d_a_obj_rfHole"}, - {PROC_Obj_WaterPillar, "d_a_obj_waterPillar"}, - {PROC_Obj_SyRock, "d_a_obj_syRock"}, - {PROC_Obj_BsGate, "d_a_obj_bsGate"}, - {PROC_Obj_AmiShutter, "d_a_obj_amiShutter"}, - {PROC_Obj_WtGate, "d_a_obj_waterGate"}, - {PROC_Obj_Lv2Candle, "d_a_obj_lv2Candle"}, - {PROC_Obj_TogeTrap, "d_a_obj_togeTrap"}, - {PROC_Obj_RotTrap, "d_a_obj_rotTrap"}, - {PROC_Obj_SwallShutter, "d_a_obj_sWallShutter"}, - {PROC_Obj_IceWall, "d_a_obj_lv5IceWall"}, - {PROC_Obj_Lv5SwIce, "d_a_obj_lv5SwIce"}, - {PROC_Obj_Lv5FBoard, "d_a_obj_lv5FloorBoard"}, - {PROC_Obj_Turara, "d_a_obj_Turara"}, - {PROC_Obj_TwGate, "d_a_obj_twGate"}, - {PROC_Obj_Digholl, "d_a_obj_digholl"}, - {PROC_Obj_Digpl, "d_a_obj_digplace"}, - {PROC_Obj_TestCube, "d_a_obj_testcube"}, - {PROC_Obj_Kshutter, "d_a_obj_kshutter"}, - {PROC_NPC_COACH, "d_a_npc_coach"}, - {PROC_NPC_THEB, "d_a_npc_theB"}, - {PROC_COACH_FIRE, "d_a_coach_fire"}, - {PROC_COACH2D, "d_a_coach_2D"}, - {PROC_BALLOON2D, "d_a_balloon_2D"}, - {PROC_SKIP2D, "d_a_skip_2D"}, - {PROC_Obj_MvStair, "d_a_obj_mvstair"}, - {PROC_Obj_Cowdoor, "d_a_obj_cowdoor"}, - {PROC_Obj_Swpropeller, "d_a_obj_swpropeller"}, - {PROC_Obj_BoomShutter, "d_a_obj_bmshutter"}, - {PROC_NPC_KS, "d_a_npc_ks"}, - {PROC_Obj_Hfuta, "d_a_obj_hfuta"}, - {PROC_Obj_BkDoor, "d_a_obj_bkdoor"}, - {PROC_Obj_Cboard, "d_a_obj_cboard"}, - {PROC_Obj_MGate, "d_a_obj_mgate"}, + {fpcNm_Obj_Lv6ElevtA_e, "d_a_obj_lv6elevta"}, + {fpcNm_OBJ_SO_e, "d_a_obj_so"}, + {fpcNm_Obj_Movebox_e, "d_a_obj_movebox"}, + {fpcNm_Obj_SwTurn_e, "d_a_obj_swturn"}, + {fpcNm_Obj_Lv6SwTurn_e, "d_a_obj_lv6swturn"}, + {fpcNm_OBJ_SEKIZOA_e, "d_a_obj_sekizoa"}, + {fpcNm_OBJ_GRA_e, "d_a_obj_gra2"}, + {fpcNm_TAG_GRA_e, "d_a_tag_gra"}, + {fpcNm_TAG_YAMI_e, "d_a_tag_yami"}, + {fpcNm_Obj_Ladder_e, "d_a_obj_ladder"}, + {fpcNm_OBJ_BEF_e, "d_a_obj_brakeeff"}, + {fpcNm_OBJ_FMOBJ_e, "d_a_obj_fmobj"}, + {fpcNm_OBJ_LBOX_e, "d_a_obj_lbox"}, + {fpcNm_OBJ_WEB0_e, "d_a_obj_web0"}, + {fpcNm_OBJ_WEB1_e, "d_a_obj_web1"}, + {fpcNm_OBJ_CB_e, "d_a_obj_cb"}, + {fpcNm_OBJ_MAKI_e, "d_a_obj_maki"}, + {fpcNm_OBJ_BRG_e, "d_a_obj_brg"}, + {fpcNm_OBJ_GB_e, "d_a_obj_gb"}, + {fpcNm_OBJ_GM_e, "d_a_obj_gm"}, + {fpcNm_OBJ_TOBY_e, "d_a_obj_toby"}, + {fpcNm_OBJ_TP_e, "d_a_obj_tp"}, + {fpcNm_TREESH_e, "d_a_obj_treesh"}, + {fpcNm_Obj_ZDoor_e, "d_a_obj_zdoor"}, + {fpcNm_Obj_Pillar_e, "d_a_obj_pillar"}, + {fpcNm_Obj_Cdoor_e, "d_a_obj_cdoor"}, + {fpcNm_GRDWATER_e, "d_a_obj_groundwater"}, + {fpcNm_Obj_RotBridge_e, "d_a_obj_rotBridge"}, + {fpcNm_Obj_MagLift_e, "d_a_obj_magLift"}, + {fpcNm_Obj_MagLiftRot_e, "d_a_obj_magLiftRot"}, + {fpcNm_Obj_Lv1Cdl00_e, "d_a_obj_lv1Candle00"}, + {fpcNm_Obj_Lv1Cdl01_e, "d_a_obj_lv1Candle01"}, + {fpcNm_Obj_TvCdlst_e, "d_a_obj_TvCdlst"}, + {fpcNm_Obj_HsTarget_e, "d_a_obj_hsTarget"}, + {fpcNm_Obj_HeavySw_e, "d_a_obj_heavySw"}, + {fpcNm_Obj_GoGate_e, "d_a_obj_goGate"}, + {fpcNm_Obj_TaFence_e, "d_a_obj_taFence"}, + {fpcNm_Obj_Saidan_e, "d_a_obj_saidan"}, + {fpcNm_Obj_SpinLift_e, "d_a_obj_spinLift"}, + {fpcNm_Obj_BmWindow_e, "d_a_obj_bmWindow"}, + {fpcNm_Obj_RfHole_e, "d_a_obj_rfHole"}, + {fpcNm_Obj_WaterPillar_e, "d_a_obj_waterPillar"}, + {fpcNm_Obj_SyRock_e, "d_a_obj_syRock"}, + {fpcNm_Obj_BsGate_e, "d_a_obj_bsGate"}, + {fpcNm_Obj_AmiShutter_e, "d_a_obj_amiShutter"}, + {fpcNm_Obj_WtGate_e, "d_a_obj_waterGate"}, + {fpcNm_Obj_Lv2Candle_e, "d_a_obj_lv2Candle"}, + {fpcNm_Obj_TogeTrap_e, "d_a_obj_togeTrap"}, + {fpcNm_Obj_RotTrap_e, "d_a_obj_rotTrap"}, + {fpcNm_Obj_SwallShutter_e, "d_a_obj_sWallShutter"}, + {fpcNm_Obj_IceWall_e, "d_a_obj_lv5IceWall"}, + {fpcNm_Obj_Lv5SwIce_e, "d_a_obj_lv5SwIce"}, + {fpcNm_Obj_Lv5FBoard_e, "d_a_obj_lv5FloorBoard"}, + {fpcNm_Obj_Turara_e, "d_a_obj_Turara"}, + {fpcNm_Obj_TwGate_e, "d_a_obj_twGate"}, + {fpcNm_Obj_Digholl_e, "d_a_obj_digholl"}, + {fpcNm_Obj_Digpl_e, "d_a_obj_digplace"}, + {fpcNm_Obj_TestCube_e, "d_a_obj_testcube"}, + {fpcNm_Obj_Kshutter_e, "d_a_obj_kshutter"}, + {fpcNm_NPC_COACH_e, "d_a_npc_coach"}, + {fpcNm_NPC_THEB_e, "d_a_npc_theB"}, + {fpcNm_COACH_FIRE_e, "d_a_coach_fire"}, + {fpcNm_COACH2D_e, "d_a_coach_2D"}, + {fpcNm_BALLOON2D_e, "d_a_balloon_2D"}, + {fpcNm_SKIP2D_e, "d_a_skip_2D"}, + {fpcNm_Obj_MvStair_e, "d_a_obj_mvstair"}, + {fpcNm_Obj_Cowdoor_e, "d_a_obj_cowdoor"}, + {fpcNm_Obj_Swpropeller_e, "d_a_obj_swpropeller"}, + {fpcNm_Obj_BoomShutter_e, "d_a_obj_bmshutter"}, + {fpcNm_NPC_KS_e, "d_a_npc_ks"}, + {fpcNm_Obj_Hfuta_e, "d_a_obj_hfuta"}, + {fpcNm_Obj_BkDoor_e, "d_a_obj_bkdoor"}, + {fpcNm_Obj_Cboard_e, "d_a_obj_cboard"}, + {fpcNm_Obj_MGate_e, "d_a_obj_mgate"}, #if VERSION != VERSION_SHIELD_DEBUG - {PROC_Obj_Ikada, "d_a_obj_ikada"}, + {fpcNm_Obj_Ikada_e, "d_a_obj_ikada"}, #endif - {PROC_Obj_Ice_l, "d_a_obj_ice_l"}, - {PROC_Obj_Ice_s, "d_a_obj_ice_s"}, - {PROC_Obj_E_CREATE, "d_a_obj_enemy_create"}, - {PROC_Obj_Bhbridge, "d_a_obj_bhbridge"}, - {PROC_Obj_Kaisou, "d_a_obj_kaisou"}, - {PROC_Obj_HHASHI, "d_a_obj_hhashi"}, - {PROC_Obj_BHASHI, "d_a_obj_bhashi"}, - {PROC_OCTHASHI, "d_a_obj_octhashi"}, - {PROC_Obj_THASHI, "d_a_obj_thashi"}, - {PROC_Obj_CRVGATE, "d_a_obj_crvgate"}, - {PROC_Obj_CRVFENCE, "d_a_obj_crvfence"}, - {PROC_Obj_CRVHAHEN, "d_a_obj_crvhahen"}, - {PROC_Obj_CRVSTEEL, "d_a_obj_crvsteel"}, - {PROC_Obj_CRVLH_UP, "d_a_obj_crvlh_up"}, - {PROC_Obj_CRVLH_DW, "d_a_obj_crvlh_down"}, - {PROC_Obj_RIVERROCK, "d_a_obj_riverrock"}, - {PROC_Obj_DUST, "d_a_obj_dust"}, - {PROC_Obj_ITA, "d_a_obj_ita"}, - {PROC_Obj_Window, "d_a_obj_window"}, - {PROC_Obj_MetalBox, "d_a_obj_metalbox"}, - {PROC_Obj_BBox, "d_a_obj_bbox"}, - {PROC_OBJ_MSIMA, "d_a_obj_msima"}, - {PROC_OBJ_MYOGAN, "d_a_obj_myogan"}, - {PROC_B_ZANTS, "d_a_b_zant_sima"}, - {PROC_Obj_ChainBlock, "d_a_obj_cblock"}, - {PROC_Obj_ChainWall, "d_a_obj_cwall"}, - {PROC_Obj_KkrGate, "d_a_obj_kgate"}, - {PROC_Obj_RiderGate, "d_a_obj_rgate"}, - {PROC_Obj_Onsen, "d_a_obj_onsen"}, - {PROC_Obj_Chest, "d_a_obj_chest"}, - {PROC_Obj_Bemos, "d_a_obj_bemos"}, - {PROC_Obj_RopeBridge, "d_a_obj_rope_bridge"}, - {PROC_Obj_WellCover, "d_a_obj_well_cover"}, - {PROC_Obj_GraveStone, "d_a_obj_grave_stone"}, - {PROC_Obj_ZraRock, "d_a_obj_zra_rock"}, - {PROC_Obj_GraRock, "d_a_obj_gra_rock"}, - {PROC_Obj_GrzRock, "d_a_obj_grz_rock"}, - {PROC_GRA_WALL, "d_a_obj_graWall"}, - {PROC_OBJ_ONSEN_FIRE, "d_a_obj_onsenFire"}, - {PROC_Obj_Lv6bemos, "d_a_obj_lv6bemos"}, - {PROC_Obj_Lv6bemos2, "d_a_obj_lv6bemos2"}, - {PROC_Obj_BarDesk, "d_a_obj_barDesk"}, - {PROC_Obj_DigSnow, "d_a_obj_digsnow"}, - {PROC_Obj_Ytaihou, "d_a_obj_Y_taihou"}, - {PROC_Obj_Elevator, "d_a_obj_dmelevator"}, - {PROC_Obj_Lv6TogeRoll, "d_a_obj_lv6TogeRoll"}, - {PROC_Obj_Lv6TogeTrap, "d_a_obj_lv6TogeTrap"}, - {PROC_Obj_Lv6Tenbin, "d_a_obj_lv6Tenbin"}, - {PROC_Obj_Lv6SwGate, "d_a_obj_lv6SwGate"}, - {PROC_Obj_Lv6Lblock, "d_a_obj_lv6Lblock"}, - {PROC_Obj_Lv6ChgGate, "d_a_obj_lv6ChangeGate"}, - {PROC_Obj_Lv6FuriTrap, "d_a_obj_lv6FurikoTrap"}, - {PROC_Obj_Lv6SzGate, "d_a_obj_lv6SzGate"}, - {PROC_Obj_Lv4EdShutter, "d_a_obj_lv4EdShutter"}, - {PROC_Obj_Lv4Gate, "d_a_obj_lv4Gate"}, - {PROC_Obj_Lv4PoGate, "d_a_obj_lv4PoGate"}, - {PROC_Obj_Lv4SlideWall, "d_a_obj_lv4SlideWall"}, - {PROC_Obj_Lv4HsTarget, "d_a_obj_lv4HsTarget"}, - {PROC_Obj_Lv7PropY, "d_a_obj_lv7PropellerY"}, - {PROC_Obj_Lv7BsGate, "d_a_obj_lv7BsGate"}, - {PROC_Obj_Lv8OptiLift, "d_a_obj_lv8OptiLift"}, - {PROC_Obj_Lv8KekkaiTrap, "d_a_obj_lv8KekkaiTrap"}, - {PROC_Obj_Lv8Lift, "d_a_obj_lv8Lift"}, - {PROC_Obj_Lv8UdFloor, "d_a_obj_lv8UdFloor"}, - {PROC_Obj_Lv9SwShutter, "d_a_obj_lv9SwShutter"}, - {PROC_Obj_TobyHouse, "d_a_obj_tobyhouse"}, - {PROC_Obj_poCandle, "d_a_obj_poCandle"}, - {PROC_Obj_Lv4DigSand, "d_a_obj_lv4digsand"}, - {PROC_Obj_FallObj, "d_a_obj_fallobj"}, - {PROC_Obj_SmgDoor, "d_a_obj_smgdoor"}, - {PROC_Obj_SwLight, "d_a_obj_swLight"}, - {PROC_Obj_Avalanche, "d_a_obj_avalanche"}, - {PROC_Obj_MirrorScrew, "d_a_obj_mirror_screw"}, - {PROC_Obj_MirrorSand, "d_a_obj_mirror_sand"}, - {PROC_Obj_MirrorTable, "d_a_obj_mirror_table"}, - {PROC_Obj_MirrorChain, "d_a_obj_mirror_chain"}, - {PROC_Obj_Mirror6Pole, "d_a_obj_mirror_6pole"}, - {PROC_Obj_SwSpinner, "d_a_obj_swspinner"}, - {PROC_Obj_TDoor, "d_a_obj_thdoor"}, - {PROC_Obj_Lv7Bridge, "d_a_obj_lv7bridge"}, - {PROC_Obj_zrTurara, "d_a_obj_zrTurara"}, - {PROC_Obj_TakaraDai, "d_a_obj_takaraDai"}, - {PROC_Obj_Table, "d_a_obj_table"}, - {PROC_Obj_CatDoor, "d_a_obj_catdoor"}, - {PROC_Obj_Gake, "d_a_obj_tgake"}, - {PROC_CSTAF, "d_a_cstaF"}, - {PROC_Obj_Lv4RailWall, "d_a_obj_lv4RailWall"}, - {PROC_Obj_Lv4Sand, "d_a_obj_lv4sand"}, - {PROC_Obj_PushDoor, "d_a_obj_pdoor"}, - {PROC_PushDoor, "d_a_door_push"}, - {PROC_Obj_GanonWall2, "d_a_obj_ganonwall2"}, - {PROC_Obj_Lv4Bridge, "d_a_obj_lv4bridge"}, - {PROC_Obj_Lv4Floor, "d_a_obj_lv4floor"}, - {PROC_Tag_Spinner, "d_a_tag_spinner"}, - {PROC_Obj_SwHang, "d_a_obj_swhang"}, - {PROC_Obj_RotStair, "d_a_obj_rstair"}, - {PROC_Obj_MagneArm, "d_a_obj_magne_arm"}, - {PROC_Obj_KWheel00, "d_a_obj_kwheel00"}, - {PROC_Obj_KWheel01, "d_a_obj_kwheel01"}, - {PROC_Obj_Ychndlr, "d_a_obj_lv5ychndlr"}, - {PROC_Obj_PRElvtr, "d_a_obj_lv4prelvtr"}, - {PROC_Obj_MHasu, "d_a_obj_hasu2"}, - {PROC_Obj_YIblltray, "d_a_obj_lv5yiblltray"}, - {PROC_Obj_Lv6EGate, "d_a_obj_lv6egate"}, - {PROC_Obj_PDtile, "d_a_obj_pdtile"}, - {PROC_Obj_PDwall, "d_a_obj_pdwall"}, - {PROC_Obj_Lv4PRwall, "d_a_obj_lv4prwall"}, - {PROC_Obj_KLift00, "d_a_obj_klift00"}, - {PROC_B_OH, "d_a_b_oh"}, - {PROC_Obj_Lv4Chan, "d_a_obj_lv4chandelier"}, - {PROC_Obj_Lv3R10Saka, "d_a_obj_lv3saka00"}, - {PROC_Obj_Lv3Water, "d_a_obj_lv3Water"}, - {PROC_Obj_Lv3Water2, "d_a_obj_lv3Water2"}, - {PROC_OBJ_LV3WATERB, "d_a_obj_lv3WaterB"}, - {PROC_Obj_HBombkoya, "d_a_obj_hbombkoya"}, - {PROC_Obj_SZbridge, "d_a_obj_szbridge"}, - {PROC_Obj_KakarikoBrg, "d_a_obj_warp_kbrg"}, - {PROC_Obj_OrdinBrg, "d_a_obj_warp_obrg"}, - {PROC_Obj_BurnBox, "d_a_obj_burnbox"}, - {PROC_Obj_KJgjs, "d_a_obj_kjgjs"}, - {PROC_OBJ_IHASI, "d_a_obj_ihasi"}, - {PROC_Obj_IceBlock, "d_a_obj_iceblock"}, - {PROC_Obj_VolcanicBall, "d_a_obj_volcball"}, - {PROC_Obj_VolcanicBomb, "d_a_obj_volcbom"}, - {PROC_Obj_VolcGnd, "d_a_obj_vground"}, - {PROC_Obj_KKanban, "d_a_obj_kkanban"}, - {PROC_E_PH, "d_a_e_ph"}, - {PROC_NPC_ZRA, "d_a_npc_zra"}, - {PROC_Obj_Chandelier, "d_a_obj_chandelier"}, - {PROC_Obj_Stopper2, "d_a_obj_stopper2"}, - {PROC_DOOR20, "d_a_door_shutter"}, - {PROC_Tag_Hinit, "d_a_tag_hinit"}, - {PROC_Tag_Hjump, "d_a_tag_hjump"}, - {PROC_Tag_AJnot, "d_a_tag_ajnot"}, - {PROC_Tag_Hstop, "d_a_tag_hstop"}, - {PROC_CANOE, "d_a_canoe"}, - {PROC_HORSE, "d_a_horse"}, - {PROC_E_WB, "d_a_e_wb"}, - {PROC_OBJ_ITO, "d_a_obj_ito"}, - {PROC_OBJ_SW, "d_a_obj_sw"}, - {PROC_SPINNER, "d_a_spinner"}, - {PROC_B_OB, "d_a_b_ob"}, - {PROC_KAGO, "d_a_kago"}, - {PROC_E_YC, "d_a_e_yc"}, - {PROC_B_DS, "d_a_b_ds"}, - {PROC_B_DR, "d_a_b_dr"}, - {PROC_B_ZANTZ, "d_a_b_zant_mobile"}, - {PROC_B_ZANT, "d_a_b_zant"}, - {PROC_B_ZANTM, "d_a_b_zant_magic"}, - {PROC_TBOX, "d_a_tbox"}, - {PROC_TBOX2, "d_a_tbox2"}, - {PROC_BOOMERANG, "d_a_boomerang"}, - {PROC_MIDNA, "d_a_midna"}, - {PROC_NPC_TK, "d_a_npc_tk"}, - {PROC_NPC_WORM, "d_a_npc_worm"}, - {PROC_PPolamp, "d_a_ppolamp"}, - {PROC_BkyRock, "d_a_obj_bky_rock"}, - {PROC_HITOBJ, "d_a_hitobj"}, - {PROC_EP, "d_a_ep"}, - {PROC_COW, "d_a_cow"}, - {PROC_PERU, "d_a_peru"}, - {PROC_NI, "d_a_ni"}, - {PROC_NPC_TKJ2, "d_a_npc_tkj2"}, - {PROC_SQ, "d_a_sq"}, - {PROC_NPC_SQ, "d_a_npc_sq"}, - {PROC_DO, "d_a_do"}, - {PROC_NPC_NE, "d_a_npc_ne"}, - {PROC_NPC_TR, "d_a_npc_tr"}, - {PROC_NPC_LF, "d_a_npc_lf"}, - {PROC_OBJ_FOOD, "d_a_obj_food"}, - {PROC_OBJ_KI, "d_a_obj_ki"}, - {PROC_OBJ_KITA, "d_a_obj_kita"}, - {PROC_OBJ_KEY, "d_a_obj_key"}, - {PROC_OBJ_KEYHOLE, "d_a_obj_keyhole"}, - {PROC_Obj_Lv5Key, "d_a_obj_Lv5Key"}, - {PROC_OBJ_LP, "d_a_obj_lp"}, - {PROC_OBJ_TATIGI, "d_a_obj_tatigi"}, - {PROC_OBJ_ROCK, "d_a_obj_rock"}, - {PROC_OBJ_WFLAG, "d_a_obj_wflag"}, - {PROC_OBJ_KAGE, "d_a_obj_kage"}, - {PROC_OBJ_KANBAN2, "d_a_obj_kanban2"}, - {PROC_OBJ_BALLOON, "d_a_obj_balloon"}, - {PROC_OBJ_SUISYA, "d_a_obj_suisya"}, - {PROC_OBJ_OILTUBO, "d_a_obj_oiltubo"}, - {PROC_OBJ_ROTEN, "d_a_obj_roten"}, - {PROC_OBJ_SSDRINK, "d_a_obj_ss_drink"}, - {PROC_OBJ_SSITEM, "d_a_obj_ss_item"}, - {PROC_TAG_SSDRINK, "d_a_tag_ss_drink"}, - {PROC_TAG_BTLITM, "d_a_tag_bottle_item"}, - {PROC_TAG_LV5SOUP, "d_a_tag_lv5soup"}, - {PROC_TAG_MNLIGHT, "d_a_tag_myna_light"}, - {PROC_TAG_SHOPCAM, "d_a_tag_shop_camera"}, - {PROC_TAG_SHOPITM, "d_a_tag_shop_item"}, - {PROC_OBJ_NDOOR, "d_a_obj_ndoor"}, - {PROC_OBJ_UDOOR, "d_a_obj_udoor"}, - {PROC_OBJ_USAKU, "d_a_obj_usaku"}, - {PROC_Obj_SM_DOOR, "d_a_obj_sm_door"}, - {PROC_OBJ_BED, "d_a_obj_bed"}, - {PROC_OBJ_BOUMATO, "d_a_obj_boumato"}, - {PROC_OBJ_ITAMATO, "d_a_obj_itamato"}, - {PROC_OBJ_NOUGU, "d_a_obj_nougu"}, - {PROC_OBJ_STICK, "d_a_obj_stick"}, - {PROC_OBJ_MIE, "d_a_obj_mie"}, - {PROC_OBJ_SEKIDOOR, "d_a_obj_sekidoor"}, - {PROC_OBJ_SEKIZO, "d_a_obj_sekizo"}, - {PROC_OBJ_SMTILE, "d_a_obj_smtile"}, - {PROC_NPC_FISH, "d_a_npc_fish"}, - {PROC_MG_FISH, "d_a_mg_fish"}, - {PROC_FSHOP, "d_a_mg_fshop"}, - {PROC_NPC_DU, "d_a_npc_du"}, - {PROC_DISAPPEAR, "d_a_disappear"}, - {PROC_Obj_Mato, "d_a_obj_mato"}, - {PROC_Obj_Flag, "d_a_obj_flag"}, - {PROC_Obj_Flag2, "d_a_obj_flag2"}, - {PROC_Obj_Flag3, "d_a_obj_flag3"}, - {PROC_Obj_GOMIKABE, "d_a_obj_gomikabe"}, - {PROC_Obj_Yousei, "d_a_obj_yousei"}, - {PROC_Obj_Kabuto, "d_a_obj_kabuto"}, - {PROC_Obj_Cho, "d_a_obj_cho"}, - {PROC_Obj_Kuw, "d_a_obj_kuwagata"}, - {PROC_Obj_Nan, "d_a_obj_nan"}, - {PROC_Obj_Dan, "d_a_obj_dan"}, - {PROC_Obj_Kam, "d_a_obj_kamakiri"}, - {PROC_Obj_Ten, "d_a_obj_ten"}, - {PROC_Obj_Ari, "d_a_obj_ari"}, - {PROC_Obj_Kag, "d_a_obj_kag"}, - {PROC_Obj_Batta, "d_a_obj_batta"}, - {PROC_Obj_Tombo, "d_a_obj_tombo"}, - {PROC_Obj_Kat, "d_a_obj_katatsumuri"}, - {PROC_Obj_H_Saku, "d_a_obj_h_saku"}, - {PROC_Obj_Yobikusa, "d_a_obj_yobikusa"}, - {PROC_Obj_KazeNeko, "d_a_obj_kazeneko"}, - {PROC_Obj_KznkArm, "d_a_obj_kznkarm"}, - {PROC_Obj_NamePlate, "d_a_obj_nameplate"}, - {PROC_Obj_OnCloth, "d_a_obj_ornament_cloth"}, - {PROC_Obj_LndRope, "d_a_obj_laundry_rope"}, - {PROC_Obj_ItaRope, "d_a_obj_sakuita_rope"}, - {PROC_Obj_Sakuita, "d_a_obj_sakuita"}, - {PROC_Obj_Laundry, "d_a_obj_laundry"}, - {PROC_WarpBug, "d_a_warp_bug"}, - {PROC_Izumi_Gate, "d_a_izumi_gate"}, - {PROC_Obj_Fchain, "d_a_obj_fchain"}, - {PROC_Obj_Wchain, "d_a_obj_wchain"}, - {PROC_Tag_Attp, "d_a_tag_attention"}, - {PROC_Obj_Tornado, "d_a_obj_tornado"}, - {PROC_Obj_Tornado2, "d_a_obj_tornado2"}, - {PROC_Obj_FirePillar, "d_a_obj_firepillar"}, - {PROC_Obj_FirePillar2, "d_a_obj_firepillar2"}, - {PROC_Obj_InoBone, "d_a_obj_inobone"}, - {PROC_Obj_Stopper, "d_a_obj_stopper"}, - {PROC_Obj_MHole, "d_a_obj_mhole"}, - {PROC_Tag_Magne, "d_a_tag_magne"}, - {PROC_Obj_BossWarp, "d_a_obj_bosswarp"}, - {PROC_Obj_WoodPendulum, "d_a_obj_wood_pendulum"}, - {PROC_Obj_WdStick, "d_a_obj_wdStick"}, - {PROC_Obj_StairBlock, "d_a_obj_stairBlock"}, - {PROC_Obj_Geyser, "d_a_obj_geyser"}, - {PROC_Tag_KtOnFire, "d_a_obj_ktOnFire"}, - {PROC_Obj_FireWood, "d_a_obj_fireWood"}, - {PROC_Obj_FireWood2, "d_a_obj_fireWood2"}, - {PROC_Obj_GpTaru, "d_a_obj_gpTaru"}, - {PROC_Obj_OnsenTaru, "d_a_obj_onsenTaru"}, - {PROC_Obj_KiPot, "d_a_obj_kiPot"}, - {PROC_TBOX_SW, "d_a_tboxSw"}, - {PROC_Obj_SwChain, "d_a_obj_swchain"}, - {PROC_Obj_WoodenSword, "d_a_obj_wsword"}, - {PROC_Obj_StoneMark, "d_a_obj_stoneMark"}, - {PROC_Obj_Lv3Candle, "d_a_obj_lv3Candle"}, - {PROC_Tag_Lv4Candle, "d_a_obj_lv4CandleTag"}, - {PROC_Tag_Lv4CandleDm, "d_a_obj_lv4CandleDemoTag"}, - {PROC_Obj_DamCps, "d_a_obj_damCps"}, - {PROC_Obj_Smoke, "d_a_obj_smoke"}, - {PROC_Obj_WaterFall, "d_a_obj_waterfall"}, - {PROC_Obj_ZoraCloth, "d_a_obj_zcloth"}, - {PROC_Obj_poFire, "d_a_obj_poFire"}, - {PROC_Tag_poFire, "d_a_tag_poFire"}, - {PROC_Obj_glowSphere, "d_a_obj_glowSphere"}, - {PROC_Tag_LightBall, "d_a_tag_lightball"}, - {PROC_SwLBall, "d_a_swLBall"}, - {PROC_SwBall, "d_a_swBall"}, - {PROC_Obj_WaterEff, "d_a_obj_lv3waterEff"}, - {PROC_Tag_RiverBack, "d_a_tag_river_back"}, - {PROC_Tag_KagoFall, "d_a_tag_kago_fall"}, - {PROC_Tag_Lv2PrChk, "d_a_tag_lv2prchk"}, - {PROC_Obj_Lv4Gear, "d_a_obj_lv4gear"}, - {PROC_Obj_MasterSword, "d_a_obj_master_sword"}, - {PROC_Obj_WoodStatue, "d_a_obj_wood_statue"}, - {PROC_Obj_Fan, "d_a_obj_fan"}, - {PROC_Obj_IceLeaf, "d_a_obj_iceleaf"}, - {PROC_Obj_zrTuraraRc, "d_a_obj_zrTuraraRock"}, - {PROC_Tag_RetRoom, "d_a_tag_ret_room"}, - {PROC_Obj_WindStone, "d_a_obj_wind_stone"}, - {PROC_Tag_WaraHowl, "d_a_tag_wara_howl"}, - {PROC_Obj_SCannon, "d_a_obj_scannon"}, - {PROC_Obj_SmWStone, "d_a_obj_smw_stone"}, - {PROC_Obj_SCannonCrs, "d_a_obj_scannon_crs"}, - {PROC_Tag_SnowEff, "d_a_obj_snowEffTag"}, - {PROC_Tag_CstaSw, "d_a_tag_CstaSw"}, - {PROC_Tag_Lv6CstaSw, "d_a_tag_lv6CstaSw"}, - {PROC_Obj_awaPlar, "d_a_obj_bubblePilar"}, - {PROC_Obj_poTbox, "d_a_obj_poTbox"}, - {PROC_Obj_TimeFire, "d_a_obj_timeFire"}, - {PROC_Obj_TMoon, "d_a_obj_tmoon"}, - {PROC_Obj_GanonWall, "d_a_obj_ganonwall"}, - {PROC_Obj_Prop, "d_a_obj_prop"}, - {PROC_CSTATUE, "d_a_cstatue"}, - {PROC_Obj_SwBallA, "d_a_obj_swBallA"}, - {PROC_Obj_SwBallB, "d_a_obj_swBallB"}, - {PROC_Obj_SnowSoup, "d_a_obj_snow_soup"}, - {PROC_Obj_Nagaisu, "d_a_obj_nagaisu"}, - {PROC_Obj_RCircle, "d_a_obj_rcircle"}, - {PROC_Obj_Picture, "d_a_obj_picture"}, - {PROC_Tag_SetBall, "d_a_tag_setBall"}, - {PROC_Tag_SmkEmt, "d_a_tag_smk_emt"}, - {PROC_SwTime, "d_a_swTime"}, - {PROC_Obj_HFtr, "d_a_obj_hakai_ftr"}, - {PROC_Obj_HBarrel, "d_a_obj_hakai_brl"}, - {PROC_Obj_Crystal, "d_a_obj_crystal"}, - {PROC_Obj_SCannonTen, "d_a_obj_scannon_ten"}, - {PROC_Obj_SwBallC, "d_a_obj_swBallC"}, - {PROC_SCENE_EXIT2, "d_a_scene_exit2"}, - {PROC_Obj_Hata, "d_a_obj_hata"}, - {PROC_Obj_ToaruMaki, "d_a_obj_toaru_maki"}, - {PROC_Tag_AttackItem, "d_a_tag_attack_item"}, - {PROC_Tag_RmbitSw, "d_a_tag_rmbit_sw"}, - {PROC_Obj_Sword, "d_a_obj_sword"}, - {PROC_Tag_Spring, "d_a_tag_spring"}, - {PROC_Tag_Statue, "d_a_tag_statue_evt"}, - {PROC_E_AI, "d_a_e_ai"}, - {PROC_E_GS, "d_a_e_gs"}, - {PROC_E_GOB, "d_a_e_gob"}, - {PROC_E_DD, "d_a_e_dd"}, - {PROC_E_DN, "d_a_e_dn"}, - {PROC_E_S1, "d_a_e_s1"}, - {PROC_E_MF, "d_a_e_mf"}, - {PROC_E_SG, "d_a_e_sg"}, - {PROC_E_BS, "d_a_e_bs"}, - {PROC_E_SF, "d_a_e_sf"}, - {PROC_E_SH, "d_a_e_sh"}, - {PROC_E_DF, "d_a_e_df"}, - {PROC_E_GM, "d_a_e_gm"}, - {PROC_E_MD, "d_a_e_md"}, - {PROC_E_SM, "d_a_e_sm"}, - {PROC_E_SM2, "d_a_e_sm2"}, - {PROC_E_ST, "d_a_e_st"}, - {PROC_E_ST_LINE, "d_a_e_st_line"}, - {PROC_E_SB, "d_a_e_sb"}, - {PROC_E_TH, "d_a_e_th"}, - {PROC_E_CR, "d_a_e_cr"}, - {PROC_E_CR_EGG, "d_a_e_cr_egg"}, - {PROC_E_DB, "d_a_e_db"}, - {PROC_E_DB_LEAF, "d_a_e_db_leaf"}, - {PROC_E_GA, "d_a_e_ga"}, - {PROC_E_GB, "d_a_e_gb"}, - {PROC_E_HB, "d_a_e_hb"}, - {PROC_E_HB_LEAF, "d_a_e_hb_leaf"}, - {PROC_E_HZELDA, "d_a_e_hzelda"}, - {PROC_E_YD, "d_a_e_yd"}, - {PROC_E_YH, "d_a_e_yh"}, - {PROC_E_YD_LEAF, "d_a_e_yd_leaf"}, - {PROC_E_HM, "d_a_e_hm"}, - {PROC_E_TK, "d_a_e_tk"}, - {PROC_E_TK2, "d_a_e_tk2"}, - {PROC_E_TK_BALL, "d_a_e_tk_ball"}, - {PROC_E_RB, "d_a_e_rb"}, - {PROC_E_RD, "d_a_e_rd"}, - {PROC_E_RDB, "d_a_e_rdb"}, - {PROC_E_RDY, "d_a_e_rdy"}, - {PROC_E_FM, "d_a_e_fm"}, - {PROC_E_FS, "d_a_e_fs"}, - {PROC_E_PM, "d_a_e_pm"}, - {PROC_E_PO, "d_a_e_po"}, - {PROC_E_MB, "d_a_e_mb"}, - {PROC_E_MK, "d_a_e_mk"}, - {PROC_E_MM, "d_a_e_mm"}, - {PROC_E_FZ, "d_a_e_fz"}, - {PROC_E_ZS, "d_a_e_zs"}, - {PROC_E_KK, "d_a_e_kk"}, - {PROC_E_HP, "d_a_e_hp"}, - {PROC_E_ZH, "d_a_e_zh"}, - {PROC_E_ZM, "d_a_e_zm"}, - {PROC_E_PZ, "d_a_e_pz"}, - {PROC_E_FB, "d_a_e_fb"}, - {PROC_E_FK, "d_a_e_fk"}, - {PROC_E_MS, "d_a_e_ms"}, - {PROC_E_NEST, "d_a_e_nest"}, - {PROC_E_NZ, "d_a_e_nz"}, - {PROC_E_BA, "d_a_e_ba"}, - {PROC_E_BU, "d_a_e_bu"}, - {PROC_E_BUG, "d_a_e_bug"}, - {PROC_E_BEE, "d_a_e_bee"}, - {PROC_E_IS, "d_a_e_is"}, - {PROC_E_KG, "d_a_e_kg"}, - {PROC_E_KR, "d_a_e_kr"}, - {PROC_E_SW, "d_a_e_sw"}, - {PROC_E_GE, "d_a_e_ge"}, - {PROC_Tag_WatchGe, "d_a_tag_watchge"}, - {PROC_E_YM, "d_a_e_ym"}, - {PROC_E_YM_TAG, "d_a_e_ym_tag"}, - {PROC_E_YMB, "d_a_e_ymb"}, - {PROC_Tag_FWall, "d_a_tag_firewall"}, - {PROC_Tag_WaterFall, "d_a_tag_waterfall"}, - {PROC_E_YK, "d_a_e_yk"}, - {PROC_E_YR, "d_a_e_yr"}, - {PROC_E_YG, "d_a_e_yg"}, - {PROC_E_HZ, "d_a_e_hz"}, - {PROC_E_WS, "d_a_e_ws"}, - {PROC_E_OC, "d_a_e_oc"}, - {PROC_E_OT, "d_a_e_ot"}, - {PROC_E_DT, "d_a_e_dt"}, - {PROC_E_BG, "d_a_e_bg"}, - {PROC_E_OctBg, "d_a_e_oct_bg"}, - {PROC_DR, "d_a_L7demo_dr"}, - {PROC_L7lowDr, "d_a_L7low_dr"}, - {PROC_L7ODR, "d_a_L7op_demo_dr"}, - {PROC_E_TT, "d_a_e_tt"}, - {PROC_E_DK, "d_a_e_dk"}, - {PROC_E_VT, "d_a_e_vt"}, - {PROC_E_WW, "d_a_e_ww"}, - {PROC_E_GI, "d_a_e_gi"}, - {PROC_B_BH, "d_a_b_bh"}, - {PROC_B_BQ, "d_a_b_bq"}, - {PROC_B_GM, "d_a_b_gm"}, - {PROC_B_GND, "d_a_b_gnd"}, - {PROC_B_GO, "d_a_b_go"}, - {PROC_B_OH2, "d_a_b_oh2"}, - {PROC_B_YO, "d_a_b_yo"}, - {PROC_B_YOI, "d_a_b_yo_ice"}, - {PROC_B_TN, "d_a_b_tn"}, - {PROC_B_GG, "d_a_b_gg"}, - {PROC_B_DRE, "d_a_b_dre"}, - {PROC_B_MGN, "d_a_b_mgn"}, - {PROC_E_WAP, "d_a_e_warpappear"}, - {PROC_Obj_SmallKey, "d_a_obj_smallkey"}, - {PROC_Obj_Kantera, "d_a_obj_kantera"}, - {PROC_Obj_LifeContainer, "d_a_obj_life_container"}, - {PROC_Obj_Shield, "d_a_obj_shield"}, - {PROC_Demo_Item, "d_a_demo_item"}, + {fpcNm_Obj_Ice_l_e, "d_a_obj_ice_l"}, + {fpcNm_Obj_Ice_s_e, "d_a_obj_ice_s"}, + {fpcNm_Obj_E_CREATE_e, "d_a_obj_enemy_create"}, + {fpcNm_Obj_Bhbridge_e, "d_a_obj_bhbridge"}, + {fpcNm_Obj_Kaisou_e, "d_a_obj_kaisou"}, + {fpcNm_Obj_HHASHI_e, "d_a_obj_hhashi"}, + {fpcNm_Obj_BHASHI_e, "d_a_obj_bhashi"}, + {fpcNm_OCTHASHI_e, "d_a_obj_octhashi"}, + {fpcNm_Obj_THASHI_e, "d_a_obj_thashi"}, + {fpcNm_Obj_CRVGATE_e, "d_a_obj_crvgate"}, + {fpcNm_Obj_CRVFENCE_e, "d_a_obj_crvfence"}, + {fpcNm_Obj_CRVHAHEN_e, "d_a_obj_crvhahen"}, + {fpcNm_Obj_CRVSTEEL_e, "d_a_obj_crvsteel"}, + {fpcNm_Obj_CRVLH_UP_e, "d_a_obj_crvlh_up"}, + {fpcNm_Obj_CRVLH_DW_e, "d_a_obj_crvlh_down"}, + {fpcNm_Obj_RIVERROCK_e, "d_a_obj_riverrock"}, + {fpcNm_Obj_DUST_e, "d_a_obj_dust"}, + {fpcNm_Obj_ITA_e, "d_a_obj_ita"}, + {fpcNm_Obj_Window_e, "d_a_obj_window"}, + {fpcNm_Obj_MetalBox_e, "d_a_obj_metalbox"}, + {fpcNm_Obj_BBox_e, "d_a_obj_bbox"}, + {fpcNm_OBJ_MSIMA_e, "d_a_obj_msima"}, + {fpcNm_OBJ_MYOGAN_e, "d_a_obj_myogan"}, + {fpcNm_B_ZANTS_e, "d_a_b_zant_sima"}, + {fpcNm_Obj_ChainBlock_e, "d_a_obj_cblock"}, + {fpcNm_Obj_ChainWall_e, "d_a_obj_cwall"}, + {fpcNm_Obj_KkrGate_e, "d_a_obj_kgate"}, + {fpcNm_Obj_RiderGate_e, "d_a_obj_rgate"}, + {fpcNm_Obj_Onsen_e, "d_a_obj_onsen"}, + {fpcNm_Obj_Chest_e, "d_a_obj_chest"}, + {fpcNm_Obj_Bemos_e, "d_a_obj_bemos"}, + {fpcNm_Obj_RopeBridge_e, "d_a_obj_rope_bridge"}, + {fpcNm_Obj_WellCover_e, "d_a_obj_well_cover"}, + {fpcNm_Obj_GraveStone_e, "d_a_obj_grave_stone"}, + {fpcNm_Obj_ZraRock_e, "d_a_obj_zra_rock"}, + {fpcNm_Obj_GraRock_e, "d_a_obj_gra_rock"}, + {fpcNm_Obj_GrzRock_e, "d_a_obj_grz_rock"}, + {fpcNm_GRA_WALL_e, "d_a_obj_graWall"}, + {fpcNm_OBJ_ONSEN_FIRE_e, "d_a_obj_onsenFire"}, + {fpcNm_Obj_Lv6bemos_e, "d_a_obj_lv6bemos"}, + {fpcNm_Obj_Lv6bemos2_e, "d_a_obj_lv6bemos2"}, + {fpcNm_Obj_BarDesk_e, "d_a_obj_barDesk"}, + {fpcNm_Obj_DigSnow_e, "d_a_obj_digsnow"}, + {fpcNm_Obj_Ytaihou_e, "d_a_obj_Y_taihou"}, + {fpcNm_Obj_Elevator_e, "d_a_obj_dmelevator"}, + {fpcNm_Obj_Lv6TogeRoll_e, "d_a_obj_lv6TogeRoll"}, + {fpcNm_Obj_Lv6TogeTrap_e, "d_a_obj_lv6TogeTrap"}, + {fpcNm_Obj_Lv6Tenbin_e, "d_a_obj_lv6Tenbin"}, + {fpcNm_Obj_Lv6SwGate_e, "d_a_obj_lv6SwGate"}, + {fpcNm_Obj_Lv6Lblock_e, "d_a_obj_lv6Lblock"}, + {fpcNm_Obj_Lv6ChgGate_e, "d_a_obj_lv6ChangeGate"}, + {fpcNm_Obj_Lv6FuriTrap_e, "d_a_obj_lv6FurikoTrap"}, + {fpcNm_Obj_Lv6SzGate_e, "d_a_obj_lv6SzGate"}, + {fpcNm_Obj_Lv4EdShutter_e, "d_a_obj_lv4EdShutter"}, + {fpcNm_Obj_Lv4Gate_e, "d_a_obj_lv4Gate"}, + {fpcNm_Obj_Lv4PoGate_e, "d_a_obj_lv4PoGate"}, + {fpcNm_Obj_Lv4SlideWall_e, "d_a_obj_lv4SlideWall"}, + {fpcNm_Obj_Lv4HsTarget_e, "d_a_obj_lv4HsTarget"}, + {fpcNm_Obj_Lv7PropY_e, "d_a_obj_lv7PropellerY"}, + {fpcNm_Obj_Lv7BsGate_e, "d_a_obj_lv7BsGate"}, + {fpcNm_Obj_Lv8OptiLift_e, "d_a_obj_lv8OptiLift"}, + {fpcNm_Obj_Lv8KekkaiTrap_e, "d_a_obj_lv8KekkaiTrap"}, + {fpcNm_Obj_Lv8Lift_e, "d_a_obj_lv8Lift"}, + {fpcNm_Obj_Lv8UdFloor_e, "d_a_obj_lv8UdFloor"}, + {fpcNm_Obj_Lv9SwShutter_e, "d_a_obj_lv9SwShutter"}, + {fpcNm_Obj_TobyHouse_e, "d_a_obj_tobyhouse"}, + {fpcNm_Obj_poCandle_e, "d_a_obj_poCandle"}, + {fpcNm_Obj_Lv4DigSand_e, "d_a_obj_lv4digsand"}, + {fpcNm_Obj_FallObj_e, "d_a_obj_fallobj"}, + {fpcNm_Obj_SmgDoor_e, "d_a_obj_smgdoor"}, + {fpcNm_Obj_SwLight_e, "d_a_obj_swLight"}, + {fpcNm_Obj_Avalanche_e, "d_a_obj_avalanche"}, + {fpcNm_Obj_MirrorScrew_e, "d_a_obj_mirror_screw"}, + {fpcNm_Obj_MirrorSand_e, "d_a_obj_mirror_sand"}, + {fpcNm_Obj_MirrorTable_e, "d_a_obj_mirror_table"}, + {fpcNm_Obj_MirrorChain_e, "d_a_obj_mirror_chain"}, + {fpcNm_Obj_Mirror6Pole_e, "d_a_obj_mirror_6pole"}, + {fpcNm_Obj_SwSpinner_e, "d_a_obj_swspinner"}, + {fpcNm_Obj_TDoor_e, "d_a_obj_thdoor"}, + {fpcNm_Obj_Lv7Bridge_e, "d_a_obj_lv7bridge"}, + {fpcNm_Obj_zrTurara_e, "d_a_obj_zrTurara"}, + {fpcNm_Obj_TakaraDai_e, "d_a_obj_takaraDai"}, + {fpcNm_Obj_Table_e, "d_a_obj_table"}, + {fpcNm_Obj_CatDoor_e, "d_a_obj_catdoor"}, + {fpcNm_Obj_Gake_e, "d_a_obj_tgake"}, + {fpcNm_CSTAF_e, "d_a_cstaF"}, + {fpcNm_Obj_Lv4RailWall_e, "d_a_obj_lv4RailWall"}, + {fpcNm_Obj_Lv4Sand_e, "d_a_obj_lv4sand"}, + {fpcNm_Obj_PushDoor_e, "d_a_obj_pdoor"}, + {fpcNm_PushDoor_e, "d_a_door_push"}, + {fpcNm_Obj_GanonWall2_e, "d_a_obj_ganonwall2"}, + {fpcNm_Obj_Lv4Bridge_e, "d_a_obj_lv4bridge"}, + {fpcNm_Obj_Lv4Floor_e, "d_a_obj_lv4floor"}, + {fpcNm_Tag_Spinner_e, "d_a_tag_spinner"}, + {fpcNm_Obj_SwHang_e, "d_a_obj_swhang"}, + {fpcNm_Obj_RotStair_e, "d_a_obj_rstair"}, + {fpcNm_Obj_MagneArm_e, "d_a_obj_magne_arm"}, + {fpcNm_Obj_KWheel00_e, "d_a_obj_kwheel00"}, + {fpcNm_Obj_KWheel01_e, "d_a_obj_kwheel01"}, + {fpcNm_Obj_Ychndlr_e, "d_a_obj_lv5ychndlr"}, + {fpcNm_Obj_PRElvtr_e, "d_a_obj_lv4prelvtr"}, + {fpcNm_Obj_MHasu_e, "d_a_obj_hasu2"}, + {fpcNm_Obj_YIblltray_e, "d_a_obj_lv5yiblltray"}, + {fpcNm_Obj_Lv6EGate_e, "d_a_obj_lv6egate"}, + {fpcNm_Obj_PDtile_e, "d_a_obj_pdtile"}, + {fpcNm_Obj_PDwall_e, "d_a_obj_pdwall"}, + {fpcNm_Obj_Lv4PRwall_e, "d_a_obj_lv4prwall"}, + {fpcNm_Obj_KLift00_e, "d_a_obj_klift00"}, + {fpcNm_B_OH_e, "d_a_b_oh"}, + {fpcNm_Obj_Lv4Chan_e, "d_a_obj_lv4chandelier"}, + {fpcNm_Obj_Lv3R10Saka_e, "d_a_obj_lv3saka00"}, + {fpcNm_Obj_Lv3Water_e, "d_a_obj_lv3Water"}, + {fpcNm_Obj_Lv3Water2_e, "d_a_obj_lv3Water2"}, + {fpcNm_OBJ_LV3WATERB_e, "d_a_obj_lv3WaterB"}, + {fpcNm_Obj_HBombkoya_e, "d_a_obj_hbombkoya"}, + {fpcNm_Obj_SZbridge_e, "d_a_obj_szbridge"}, + {fpcNm_Obj_KakarikoBrg_e, "d_a_obj_warp_kbrg"}, + {fpcNm_Obj_OrdinBrg_e, "d_a_obj_warp_obrg"}, + {fpcNm_Obj_BurnBox_e, "d_a_obj_burnbox"}, + {fpcNm_Obj_KJgjs_e, "d_a_obj_kjgjs"}, + {fpcNm_OBJ_IHASI_e, "d_a_obj_ihasi"}, + {fpcNm_Obj_IceBlock_e, "d_a_obj_iceblock"}, + {fpcNm_Obj_VolcanicBall_e, "d_a_obj_volcball"}, + {fpcNm_Obj_VolcanicBomb_e, "d_a_obj_volcbom"}, + {fpcNm_Obj_VolcGnd_e, "d_a_obj_vground"}, + {fpcNm_Obj_KKanban_e, "d_a_obj_kkanban"}, + {fpcNm_E_PH_e, "d_a_e_ph"}, + {fpcNm_NPC_ZRA_e, "d_a_npc_zra"}, + {fpcNm_Obj_Chandelier_e, "d_a_obj_chandelier"}, + {fpcNm_Obj_Stopper2_e, "d_a_obj_stopper2"}, + {fpcNm_DOOR20_e, "d_a_door_shutter"}, + {fpcNm_Tag_Hinit_e, "d_a_tag_hinit"}, + {fpcNm_Tag_Hjump_e, "d_a_tag_hjump"}, + {fpcNm_Tag_AJnot_e, "d_a_tag_ajnot"}, + {fpcNm_Tag_Hstop_e, "d_a_tag_hstop"}, + {fpcNm_CANOE_e, "d_a_canoe"}, + {fpcNm_HORSE_e, "d_a_horse"}, + {fpcNm_E_WB_e, "d_a_e_wb"}, + {fpcNm_OBJ_ITO_e, "d_a_obj_ito"}, + {fpcNm_OBJ_SW_e, "d_a_obj_sw"}, + {fpcNm_SPINNER_e, "d_a_spinner"}, + {fpcNm_B_OB_e, "d_a_b_ob"}, + {fpcNm_KAGO_e, "d_a_kago"}, + {fpcNm_E_YC_e, "d_a_e_yc"}, + {fpcNm_B_DS_e, "d_a_b_ds"}, + {fpcNm_B_DR_e, "d_a_b_dr"}, + {fpcNm_B_ZANTZ_e, "d_a_b_zant_mobile"}, + {fpcNm_B_ZANT_e, "d_a_b_zant"}, + {fpcNm_B_ZANTM_e, "d_a_b_zant_magic"}, + {fpcNm_TBOX_e, "d_a_tbox"}, + {fpcNm_TBOX2_e, "d_a_tbox2"}, + {fpcNm_BOOMERANG_e, "d_a_boomerang"}, + {fpcNm_MIDNA_e, "d_a_midna"}, + {fpcNm_NPC_TK_e, "d_a_npc_tk"}, + {fpcNm_NPC_WORM_e, "d_a_npc_worm"}, + {fpcNm_PPolamp_e, "d_a_ppolamp"}, + {fpcNm_BkyRock_e, "d_a_obj_bky_rock"}, + {fpcNm_HITOBJ_e, "d_a_hitobj"}, + {fpcNm_EP_e, "d_a_ep"}, + {fpcNm_COW_e, "d_a_cow"}, + {fpcNm_PERU_e, "d_a_peru"}, + {fpcNm_NI_e, "d_a_ni"}, + {fpcNm_NPC_TKJ2_e, "d_a_npc_tkj2"}, + {fpcNm_SQ_e, "d_a_sq"}, + {fpcNm_NPC_SQ_e, "d_a_npc_sq"}, + {fpcNm_DO_e, "d_a_do"}, + {fpcNm_NPC_NE_e, "d_a_npc_ne"}, + {fpcNm_NPC_TR_e, "d_a_npc_tr"}, + {fpcNm_NPC_LF_e, "d_a_npc_lf"}, + {fpcNm_OBJ_FOOD_e, "d_a_obj_food"}, + {fpcNm_OBJ_KI_e, "d_a_obj_ki"}, + {fpcNm_OBJ_KITA_e, "d_a_obj_kita"}, + {fpcNm_OBJ_KEY_e, "d_a_obj_key"}, + {fpcNm_OBJ_KEYHOLE_e, "d_a_obj_keyhole"}, + {fpcNm_Obj_Lv5Key_e, "d_a_obj_Lv5Key"}, + {fpcNm_OBJ_LP_e, "d_a_obj_lp"}, + {fpcNm_OBJ_TATIGI_e, "d_a_obj_tatigi"}, + {fpcNm_OBJ_ROCK_e, "d_a_obj_rock"}, + {fpcNm_OBJ_WFLAG_e, "d_a_obj_wflag"}, + {fpcNm_OBJ_KAGE_e, "d_a_obj_kage"}, + {fpcNm_OBJ_KANBAN2_e, "d_a_obj_kanban2"}, + {fpcNm_OBJ_BALLOON_e, "d_a_obj_balloon"}, + {fpcNm_OBJ_SUISYA_e, "d_a_obj_suisya"}, + {fpcNm_OBJ_OILTUBO_e, "d_a_obj_oiltubo"}, + {fpcNm_OBJ_ROTEN_e, "d_a_obj_roten"}, + {fpcNm_OBJ_SSDRINK_e, "d_a_obj_ss_drink"}, + {fpcNm_OBJ_SSITEM_e, "d_a_obj_ss_item"}, + {fpcNm_TAG_SSDRINK_e, "d_a_tag_ss_drink"}, + {fpcNm_TAG_BTLITM_e, "d_a_tag_bottle_item"}, + {fpcNm_TAG_LV5SOUP_e, "d_a_tag_lv5soup"}, + {fpcNm_TAG_MNLIGHT_e, "d_a_tag_myna_light"}, + {fpcNm_TAG_SHOPCAM_e, "d_a_tag_shop_camera"}, + {fpcNm_TAG_SHOPITM_e, "d_a_tag_shop_item"}, + {fpcNm_OBJ_NDOOR_e, "d_a_obj_ndoor"}, + {fpcNm_OBJ_UDOOR_e, "d_a_obj_udoor"}, + {fpcNm_OBJ_USAKU_e, "d_a_obj_usaku"}, + {fpcNm_Obj_SM_DOOR_e, "d_a_obj_sm_door"}, + {fpcNm_OBJ_BED_e, "d_a_obj_bed"}, + {fpcNm_OBJ_BOUMATO_e, "d_a_obj_boumato"}, + {fpcNm_OBJ_ITAMATO_e, "d_a_obj_itamato"}, + {fpcNm_OBJ_NOUGU_e, "d_a_obj_nougu"}, + {fpcNm_OBJ_STICK_e, "d_a_obj_stick"}, + {fpcNm_OBJ_MIE_e, "d_a_obj_mie"}, + {fpcNm_OBJ_SEKIDOOR_e, "d_a_obj_sekidoor"}, + {fpcNm_OBJ_SEKIZO_e, "d_a_obj_sekizo"}, + {fpcNm_OBJ_SMTILE_e, "d_a_obj_smtile"}, + {fpcNm_NPC_FISH_e, "d_a_npc_fish"}, + {fpcNm_MG_FISH_e, "d_a_mg_fish"}, + {fpcNm_FSHOP_e, "d_a_mg_fshop"}, + {fpcNm_NPC_DU_e, "d_a_npc_du"}, + {fpcNm_DISAPPEAR_e, "d_a_disappear"}, + {fpcNm_Obj_Mato_e, "d_a_obj_mato"}, + {fpcNm_Obj_Flag_e, "d_a_obj_flag"}, + {fpcNm_Obj_Flag2_e, "d_a_obj_flag2"}, + {fpcNm_Obj_Flag3_e, "d_a_obj_flag3"}, + {fpcNm_Obj_GOMIKABE_e, "d_a_obj_gomikabe"}, + {fpcNm_Obj_Yousei_e, "d_a_obj_yousei"}, + {fpcNm_Obj_Kabuto_e, "d_a_obj_kabuto"}, + {fpcNm_Obj_Cho_e, "d_a_obj_cho"}, + {fpcNm_Obj_Kuw_e, "d_a_obj_kuwagata"}, + {fpcNm_Obj_Nan_e, "d_a_obj_nan"}, + {fpcNm_Obj_Dan_e, "d_a_obj_dan"}, + {fpcNm_Obj_Kam_e, "d_a_obj_kamakiri"}, + {fpcNm_Obj_Ten_e, "d_a_obj_ten"}, + {fpcNm_Obj_Ari_e, "d_a_obj_ari"}, + {fpcNm_Obj_Kag_e, "d_a_obj_kag"}, + {fpcNm_Obj_Batta_e, "d_a_obj_batta"}, + {fpcNm_Obj_Tombo_e, "d_a_obj_tombo"}, + {fpcNm_Obj_Kat_e, "d_a_obj_katatsumuri"}, + {fpcNm_Obj_H_Saku_e, "d_a_obj_h_saku"}, + {fpcNm_Obj_Yobikusa_e, "d_a_obj_yobikusa"}, + {fpcNm_Obj_KazeNeko_e, "d_a_obj_kazeneko"}, + {fpcNm_Obj_KznkArm_e, "d_a_obj_kznkarm"}, + {fpcNm_Obj_NamePlate_e, "d_a_obj_nameplate"}, + {fpcNm_Obj_OnCloth_e, "d_a_obj_ornament_cloth"}, + {fpcNm_Obj_LndRope_e, "d_a_obj_laundry_rope"}, + {fpcNm_Obj_ItaRope_e, "d_a_obj_sakuita_rope"}, + {fpcNm_Obj_Sakuita_e, "d_a_obj_sakuita"}, + {fpcNm_Obj_Laundry_e, "d_a_obj_laundry"}, + {fpcNm_WarpBug_e, "d_a_warp_bug"}, + {fpcNm_Izumi_Gate_e, "d_a_izumi_gate"}, + {fpcNm_Obj_Fchain_e, "d_a_obj_fchain"}, + {fpcNm_Obj_Wchain_e, "d_a_obj_wchain"}, + {fpcNm_Tag_Attp_e, "d_a_tag_attention"}, + {fpcNm_Obj_Tornado_e, "d_a_obj_tornado"}, + {fpcNm_Obj_Tornado2_e, "d_a_obj_tornado2"}, + {fpcNm_Obj_FirePillar_e, "d_a_obj_firepillar"}, + {fpcNm_Obj_FirePillar2_e, "d_a_obj_firepillar2"}, + {fpcNm_Obj_InoBone_e, "d_a_obj_inobone"}, + {fpcNm_Obj_Stopper_e, "d_a_obj_stopper"}, + {fpcNm_Obj_MHole_e, "d_a_obj_mhole"}, + {fpcNm_Tag_Magne_e, "d_a_tag_magne"}, + {fpcNm_Obj_BossWarp_e, "d_a_obj_bosswarp"}, + {fpcNm_Obj_WoodPendulum_e, "d_a_obj_wood_pendulum"}, + {fpcNm_Obj_WdStick_e, "d_a_obj_wdStick"}, + {fpcNm_Obj_StairBlock_e, "d_a_obj_stairBlock"}, + {fpcNm_Obj_Geyser_e, "d_a_obj_geyser"}, + {fpcNm_Tag_KtOnFire_e, "d_a_obj_ktOnFire"}, + {fpcNm_Obj_FireWood_e, "d_a_obj_fireWood"}, + {fpcNm_Obj_FireWood2_e, "d_a_obj_fireWood2"}, + {fpcNm_Obj_GpTaru_e, "d_a_obj_gpTaru"}, + {fpcNm_Obj_OnsenTaru_e, "d_a_obj_onsenTaru"}, + {fpcNm_Obj_KiPot_e, "d_a_obj_kiPot"}, + {fpcNm_TBOX_SW_e, "d_a_tboxSw"}, + {fpcNm_Obj_SwChain_e, "d_a_obj_swchain"}, + {fpcNm_Obj_WoodenSword_e, "d_a_obj_wsword"}, + {fpcNm_Obj_StoneMark_e, "d_a_obj_stoneMark"}, + {fpcNm_Obj_Lv3Candle_e, "d_a_obj_lv3Candle"}, + {fpcNm_Tag_Lv4Candle_e, "d_a_obj_lv4CandleTag"}, + {fpcNm_Tag_Lv4CandleDm_e, "d_a_obj_lv4CandleDemoTag"}, + {fpcNm_Obj_DamCps_e, "d_a_obj_damCps"}, + {fpcNm_Obj_Smoke_e, "d_a_obj_smoke"}, + {fpcNm_Obj_WaterFall_e, "d_a_obj_waterfall"}, + {fpcNm_Obj_ZoraCloth_e, "d_a_obj_zcloth"}, + {fpcNm_Obj_poFire_e, "d_a_obj_poFire"}, + {fpcNm_Tag_poFire_e, "d_a_tag_poFire"}, + {fpcNm_Obj_glowSphere_e, "d_a_obj_glowSphere"}, + {fpcNm_Tag_LightBall_e, "d_a_tag_lightball"}, + {fpcNm_SwLBall_e, "d_a_swLBall"}, + {fpcNm_SwBall_e, "d_a_swBall"}, + {fpcNm_Obj_WaterEff_e, "d_a_obj_lv3waterEff"}, + {fpcNm_Tag_RiverBack_e, "d_a_tag_river_back"}, + {fpcNm_Tag_KagoFall_e, "d_a_tag_kago_fall"}, + {fpcNm_Tag_Lv2PrChk_e, "d_a_tag_lv2prchk"}, + {fpcNm_Obj_Lv4Gear_e, "d_a_obj_lv4gear"}, + {fpcNm_Obj_MasterSword_e, "d_a_obj_master_sword"}, + {fpcNm_Obj_WoodStatue_e, "d_a_obj_wood_statue"}, + {fpcNm_Obj_Fan_e, "d_a_obj_fan"}, + {fpcNm_Obj_IceLeaf_e, "d_a_obj_iceleaf"}, + {fpcNm_Obj_zrTuraraRc_e, "d_a_obj_zrTuraraRock"}, + {fpcNm_Tag_RetRoom_e, "d_a_tag_ret_room"}, + {fpcNm_Obj_WindStone_e, "d_a_obj_wind_stone"}, + {fpcNm_Tag_WaraHowl_e, "d_a_tag_wara_howl"}, + {fpcNm_Obj_SCannon_e, "d_a_obj_scannon"}, + {fpcNm_Obj_SmWStone_e, "d_a_obj_smw_stone"}, + {fpcNm_Obj_SCannonCrs_e, "d_a_obj_scannon_crs"}, + {fpcNm_Tag_SnowEff_e, "d_a_obj_snowEffTag"}, + {fpcNm_Tag_CstaSw_e, "d_a_tag_CstaSw"}, + {fpcNm_Tag_Lv6CstaSw_e, "d_a_tag_lv6CstaSw"}, + {fpcNm_Obj_awaPlar_e, "d_a_obj_bubblePilar"}, + {fpcNm_Obj_poTbox_e, "d_a_obj_poTbox"}, + {fpcNm_Obj_TimeFire_e, "d_a_obj_timeFire"}, + {fpcNm_Obj_TMoon_e, "d_a_obj_tmoon"}, + {fpcNm_Obj_GanonWall_e, "d_a_obj_ganonwall"}, + {fpcNm_Obj_Prop_e, "d_a_obj_prop"}, + {fpcNm_CSTATUE_e, "d_a_cstatue"}, + {fpcNm_Obj_SwBallA_e, "d_a_obj_swBallA"}, + {fpcNm_Obj_SwBallB_e, "d_a_obj_swBallB"}, + {fpcNm_Obj_SnowSoup_e, "d_a_obj_snow_soup"}, + {fpcNm_Obj_Nagaisu_e, "d_a_obj_nagaisu"}, + {fpcNm_Obj_RCircle_e, "d_a_obj_rcircle"}, + {fpcNm_Obj_Picture_e, "d_a_obj_picture"}, + {fpcNm_Tag_SetBall_e, "d_a_tag_setBall"}, + {fpcNm_Tag_SmkEmt_e, "d_a_tag_smk_emt"}, + {fpcNm_SwTime_e, "d_a_swTime"}, + {fpcNm_Obj_HFtr_e, "d_a_obj_hakai_ftr"}, + {fpcNm_Obj_HBarrel_e, "d_a_obj_hakai_brl"}, + {fpcNm_Obj_Crystal_e, "d_a_obj_crystal"}, + {fpcNm_Obj_SCannonTen_e, "d_a_obj_scannon_ten"}, + {fpcNm_Obj_SwBallC_e, "d_a_obj_swBallC"}, + {fpcNm_SCENE_EXIT2_e, "d_a_scene_exit2"}, + {fpcNm_Obj_Hata_e, "d_a_obj_hata"}, + {fpcNm_Obj_ToaruMaki_e, "d_a_obj_toaru_maki"}, + {fpcNm_Tag_AttackItem_e, "d_a_tag_attack_item"}, + {fpcNm_Tag_RmbitSw_e, "d_a_tag_rmbit_sw"}, + {fpcNm_Obj_Sword_e, "d_a_obj_sword"}, + {fpcNm_Tag_Spring_e, "d_a_tag_spring"}, + {fpcNm_Tag_Statue_e, "d_a_tag_statue_evt"}, + {fpcNm_E_AI_e, "d_a_e_ai"}, + {fpcNm_E_GS_e, "d_a_e_gs"}, + {fpcNm_E_GOB_e, "d_a_e_gob"}, + {fpcNm_E_DD_e, "d_a_e_dd"}, + {fpcNm_E_DN_e, "d_a_e_dn"}, + {fpcNm_E_S1_e, "d_a_e_s1"}, + {fpcNm_E_MF_e, "d_a_e_mf"}, + {fpcNm_E_SG_e, "d_a_e_sg"}, + {fpcNm_E_BS_e, "d_a_e_bs"}, + {fpcNm_E_SF_e, "d_a_e_sf"}, + {fpcNm_E_SH_e, "d_a_e_sh"}, + {fpcNm_E_DF_e, "d_a_e_df"}, + {fpcNm_E_GM_e, "d_a_e_gm"}, + {fpcNm_E_MD_e, "d_a_e_md"}, + {fpcNm_E_SM_e, "d_a_e_sm"}, + {fpcNm_E_SM2_e, "d_a_e_sm2"}, + {fpcNm_E_ST_e, "d_a_e_st"}, + {fpcNm_E_ST_LINE_e, "d_a_e_st_line"}, + {fpcNm_E_SB_e, "d_a_e_sb"}, + {fpcNm_E_TH_e, "d_a_e_th"}, + {fpcNm_E_CR_e, "d_a_e_cr"}, + {fpcNm_E_CR_EGG_e, "d_a_e_cr_egg"}, + {fpcNm_E_DB_e, "d_a_e_db"}, + {fpcNm_E_DB_LEAF_e, "d_a_e_db_leaf"}, + {fpcNm_E_GA_e, "d_a_e_ga"}, + {fpcNm_E_GB_e, "d_a_e_gb"}, + {fpcNm_E_HB_e, "d_a_e_hb"}, + {fpcNm_E_HB_LEAF_e, "d_a_e_hb_leaf"}, + {fpcNm_E_HZELDA_e, "d_a_e_hzelda"}, + {fpcNm_E_YD_e, "d_a_e_yd"}, + {fpcNm_E_YH_e, "d_a_e_yh"}, + {fpcNm_E_YD_LEAF_e, "d_a_e_yd_leaf"}, + {fpcNm_E_HM_e, "d_a_e_hm"}, + {fpcNm_E_TK_e, "d_a_e_tk"}, + {fpcNm_E_TK2_e, "d_a_e_tk2"}, + {fpcNm_E_TK_BALL_e, "d_a_e_tk_ball"}, + {fpcNm_E_RB_e, "d_a_e_rb"}, + {fpcNm_E_RD_e, "d_a_e_rd"}, + {fpcNm_E_RDB_e, "d_a_e_rdb"}, + {fpcNm_E_RDY_e, "d_a_e_rdy"}, + {fpcNm_E_FM_e, "d_a_e_fm"}, + {fpcNm_E_FS_e, "d_a_e_fs"}, + {fpcNm_E_PM_e, "d_a_e_pm"}, + {fpcNm_E_PO_e, "d_a_e_po"}, + {fpcNm_E_MB_e, "d_a_e_mb"}, + {fpcNm_E_MK_e, "d_a_e_mk"}, + {fpcNm_E_MM_e, "d_a_e_mm"}, + {fpcNm_E_FZ_e, "d_a_e_fz"}, + {fpcNm_E_ZS_e, "d_a_e_zs"}, + {fpcNm_E_KK_e, "d_a_e_kk"}, + {fpcNm_E_HP_e, "d_a_e_hp"}, + {fpcNm_E_ZH_e, "d_a_e_zh"}, + {fpcNm_E_ZM_e, "d_a_e_zm"}, + {fpcNm_E_PZ_e, "d_a_e_pz"}, + {fpcNm_E_FB_e, "d_a_e_fb"}, + {fpcNm_E_FK_e, "d_a_e_fk"}, + {fpcNm_E_MS_e, "d_a_e_ms"}, + {fpcNm_E_NEST_e, "d_a_e_nest"}, + {fpcNm_E_NZ_e, "d_a_e_nz"}, + {fpcNm_E_BA_e, "d_a_e_ba"}, + {fpcNm_E_BU_e, "d_a_e_bu"}, + {fpcNm_E_BUG_e, "d_a_e_bug"}, + {fpcNm_E_BEE_e, "d_a_e_bee"}, + {fpcNm_E_IS_e, "d_a_e_is"}, + {fpcNm_E_KG_e, "d_a_e_kg"}, + {fpcNm_E_KR_e, "d_a_e_kr"}, + {fpcNm_E_SW_e, "d_a_e_sw"}, + {fpcNm_E_GE_e, "d_a_e_ge"}, + {fpcNm_Tag_WatchGe_e, "d_a_tag_watchge"}, + {fpcNm_E_YM_e, "d_a_e_ym"}, + {fpcNm_E_YM_TAG_e, "d_a_e_ym_tag"}, + {fpcNm_E_YMB_e, "d_a_e_ymb"}, + {fpcNm_Tag_FWall_e, "d_a_tag_firewall"}, + {fpcNm_Tag_WaterFall_e, "d_a_tag_waterfall"}, + {fpcNm_E_YK_e, "d_a_e_yk"}, + {fpcNm_E_YR_e, "d_a_e_yr"}, + {fpcNm_E_YG_e, "d_a_e_yg"}, + {fpcNm_E_HZ_e, "d_a_e_hz"}, + {fpcNm_E_WS_e, "d_a_e_ws"}, + {fpcNm_E_OC_e, "d_a_e_oc"}, + {fpcNm_E_OT_e, "d_a_e_ot"}, + {fpcNm_E_DT_e, "d_a_e_dt"}, + {fpcNm_E_BG_e, "d_a_e_bg"}, + {fpcNm_E_OctBg_e, "d_a_e_oct_bg"}, + {fpcNm_DR_e, "d_a_L7demo_dr"}, + {fpcNm_L7lowDr_e, "d_a_L7low_dr"}, + {fpcNm_L7ODR_e, "d_a_L7op_demo_dr"}, + {fpcNm_E_TT_e, "d_a_e_tt"}, + {fpcNm_E_DK_e, "d_a_e_dk"}, + {fpcNm_E_VT_e, "d_a_e_vt"}, + {fpcNm_E_WW_e, "d_a_e_ww"}, + {fpcNm_E_GI_e, "d_a_e_gi"}, + {fpcNm_B_BH_e, "d_a_b_bh"}, + {fpcNm_B_BQ_e, "d_a_b_bq"}, + {fpcNm_B_GM_e, "d_a_b_gm"}, + {fpcNm_B_GND_e, "d_a_b_gnd"}, + {fpcNm_B_GO_e, "d_a_b_go"}, + {fpcNm_B_OH2_e, "d_a_b_oh2"}, + {fpcNm_B_YO_e, "d_a_b_yo"}, + {fpcNm_B_YOI_e, "d_a_b_yo_ice"}, + {fpcNm_B_TN_e, "d_a_b_tn"}, + {fpcNm_B_GG_e, "d_a_b_gg"}, + {fpcNm_B_DRE_e, "d_a_b_dre"}, + {fpcNm_B_MGN_e, "d_a_b_mgn"}, + {fpcNm_E_WAP_e, "d_a_e_warpappear"}, + {fpcNm_Obj_SmallKey_e, "d_a_obj_smallkey"}, + {fpcNm_Obj_Kantera_e, "d_a_obj_kantera"}, + {fpcNm_Obj_LifeContainer_e, "d_a_obj_life_container"}, + {fpcNm_Obj_Shield_e, "d_a_obj_shield"}, + {fpcNm_Demo_Item_e, "d_a_demo_item"}, #if VERSION != VERSION_SHIELD_DEBUG - {PROC_ShopItem, "d_a_shop_item"}, + {fpcNm_ShopItem_e, "d_a_shop_item"}, #endif - {PROC_Obj_Drop, "d_a_obj_drop"}, - {PROC_OBJ_RW, "d_a_obj_rw"}, - {PROC_NBOMB, "d_a_nbomb"}, - {PROC_TAG_CSW, "d_a_tag_csw"}, - {PROC_TAG_QS, "d_a_tag_qs"}, - {PROC_HOZELDA, "d_a_hozelda"}, + {fpcNm_Obj_Drop_e, "d_a_obj_drop"}, + {fpcNm_OBJ_RW_e, "d_a_obj_rw"}, + {fpcNm_NBOMB_e, "d_a_nbomb"}, + {fpcNm_TAG_CSW_e, "d_a_tag_csw"}, + {fpcNm_TAG_QS_e, "d_a_tag_qs"}, + {fpcNm_HOZELDA_e, "d_a_hozelda"}, #if VERSION != VERSION_SHIELD_DEBUG - {PROC_SWC00, "d_a_swc00"}, + {fpcNm_SWC00_e, "d_a_swc00"}, #endif - {PROC_KNOB20, "d_a_door_knob00"}, - {PROC_DBDOOR, "d_a_door_dbdoor00"}, - {PROC_BOSS_DOOR, "d_a_door_boss"}, - {PROC_L1BOSS_DOOR, "d_a_door_bossL1"}, - {PROC_L1MBOSS_DOOR, "d_a_door_mbossL1"}, - {PROC_L5BOSS_DOOR, "d_a_door_bossL5"}, - {PROC_DSHUTTER, "d_a_dshutter"}, - {PROC_SPIRAL_DOOR, "d_a_door_spiral"}, - {PROC_Tag_ChgRestart, "d_a_tag_chgrestart"}, - {PROC_Tag_Restart, "d_a_tag_setrestart"}, - {PROC_ANDSW, "d_a_andsw"}, + {fpcNm_KNOB20_e, "d_a_door_knob00"}, + {fpcNm_DBDOOR_e, "d_a_door_dbdoor00"}, + {fpcNm_BOSS_DOOR_e, "d_a_door_boss"}, + {fpcNm_L1BOSS_DOOR_e, "d_a_door_bossL1"}, + {fpcNm_L1MBOSS_DOOR_e, "d_a_door_mbossL1"}, + {fpcNm_L5BOSS_DOOR_e, "d_a_door_bossL5"}, + {fpcNm_DSHUTTER_e, "d_a_dshutter"}, + {fpcNm_SPIRAL_DOOR_e, "d_a_door_spiral"}, + {fpcNm_Tag_ChgRestart_e, "d_a_tag_chgrestart"}, + {fpcNm_Tag_Restart_e, "d_a_tag_setrestart"}, + {fpcNm_ANDSW_e, "d_a_andsw"}, #if VERSION != VERSION_SHIELD_DEBUG - {PROC_ANDSW2, "d_a_andsw2"}, + {fpcNm_ANDSW2_e, "d_a_andsw2"}, #endif - {PROC_MYNA, "d_a_myna"}, - {PROC_NPC_GND, "d_a_npc_gnd"}, - {PROC_NPC_GRA, "d_a_npc_gra"}, - {PROC_NPC_GRC, "d_a_npc_grc"}, - {PROC_NPC_GRD, "d_a_npc_grd"}, - {PROC_NPC_GRM, "d_a_npc_grm"}, - {PROC_NPC_GRMC, "d_a_npc_grmc"}, - {PROC_NPC_GRO, "d_a_npc_gro"}, - {PROC_NPC_GRR, "d_a_npc_grr"}, - {PROC_NPC_GRS, "d_a_npc_grs"}, - {PROC_NPC_GRZ, "d_a_npc_grz"}, - {PROC_NPC_YAMID, "d_a_npc_yamid"}, - {PROC_NPC_YAMIT, "d_a_npc_yamit"}, - {PROC_NPC_YAMIS, "d_a_npc_yamis"}, - {PROC_NPC_BLUENS, "d_a_npc_blue_ns"}, - {PROC_NPC_KAKASHI, "d_a_npc_kakashi"}, - {PROC_NPC_KDK, "d_a_npc_kdk"}, - {PROC_NPC_ARU, "d_a_npc_aru"}, - {PROC_NPC_BANS, "d_a_npc_bans"}, - {PROC_NPC_BESU, "d_a_npc_besu"}, - {PROC_NPC_BOU, "d_a_npc_bou"}, - {PROC_NPC_BOU_S, "d_a_npc_bouS"}, - {PROC_NPC_CLERKA, "d_a_npc_clerka"}, - {PROC_NPC_CLERKB, "d_a_npc_clerkb"}, - {PROC_NPC_CLERKT, "d_a_npc_clerkt"}, - {PROC_NPC_WRESTLER, "d_a_npc_wrestler"}, - {PROC_Tag_Arena, "d_a_tag_arena"}, - {PROC_Tag_Instruction, "d_a_tag_instruction"}, - {PROC_NPC_DOC, "d_a_npc_doc"}, - {PROC_NPC_GWOLF, "d_a_npc_gwolf"}, - {PROC_NPC_LEN, "d_a_npc_len"}, - {PROC_NPC_LUD, "d_a_npc_lud"}, - {PROC_NPC_FAIRY_SEIREI, "d_a_npc_fairy_seirei"}, - {PROC_NPC_FAIRY, "d_a_npc_fairy"}, - {PROC_NPC_HANJO, "d_a_npc_hanjo"}, - {PROC_NPC_HENNA, "d_a_npc_henna"}, - {PROC_NPC_HENNA0, "d_a_npc_henna0"}, - {PROC_NPC_HOZ, "d_a_npc_hoz"}, - {PROC_NPC_JAGAR, "d_a_npc_jagar"}, - {PROC_NPC_KKRI, "d_a_npc_kkri"}, - {PROC_NPC_KN, "d_a_npc_kn"}, - {PROC_KN_BULLET, "d_a_obj_knBullet"}, - {PROC_NPC_KNJ, "d_a_npc_knj"}, - {PROC_NPC_KOLIN, "d_a_npc_kolin"}, - {PROC_NPC_KOLINB, "d_a_npc_kolinb"}, - {PROC_NPC_KYURY, "d_a_npc_kyury"}, - {PROC_NPC_MARO, "d_a_npc_maro"}, - {PROC_NPC_MIDP, "d_a_npc_midp"}, - {PROC_NPC_MOI, "d_a_npc_moi"}, - {PROC_NPC_RACA, "d_a_npc_raca"}, - {PROC_NPC_SARU, "d_a_npc_saru"}, - {PROC_NPC_SEIB, "d_a_npc_seib"}, - {PROC_NPC_SEIC, "d_a_npc_seic"}, - {PROC_NPC_SEID, "d_a_npc_seid"}, - {PROC_NPC_SEIRA, "d_a_npc_seira"}, - {PROC_NPC_SERA2, "d_a_npc_seira2"}, - {PROC_NPC_SEIREI, "d_a_npc_seirei"}, - {PROC_NPC_SHAMAN, "d_a_npc_shaman"}, - {PROC_NPC_SMARO, "d_a_npc_shop_maro"}, - {PROC_NPC_SOLA, "d_a_npc_sola"}, - {PROC_NPC_TARO, "d_a_npc_taro"}, - {PROC_NPC_PACHI_BESU, "d_a_npc_pachi_besu"}, - {PROC_NPC_PACHI_TARO, "d_a_npc_pachi_taro"}, - {PROC_NPC_PACHI_MARO, "d_a_npc_pachi_maro"}, - {PROC_TAG_PATI, "d_a_tag_pachi"}, - {PROC_NPC_THE, "d_a_npc_the"}, - {PROC_NPC_TKJ, "d_a_npc_tkj"}, - {PROC_NPC_TKS, "d_a_npc_tks"}, - {PROC_NPC_TKC, "d_a_npc_tkc"}, - {PROC_OBJ_TKS, "d_a_obj_tks"}, - {PROC_NPC_TOBY, "d_a_npc_toby"}, - {PROC_NPC_URI, "d_a_npc_uri"}, - {PROC_NPC_YELIA, "d_a_npc_yelia"}, - {PROC_NPC_YKM, "d_a_npc_ykm"}, - {PROC_NPC_YKW, "d_a_npc_ykw"}, - {PROC_NPC_ZANB, "d_a_npc_zanb"}, - {PROC_NPC_ZANT, "d_a_npc_zant"}, - {PROC_NPC_ZELDA, "d_a_npc_zelda"}, - {PROC_NPC_ZELR, "d_a_npc_zelR"}, - {PROC_NPC_ZELRO, "d_a_npc_zelRo"}, - {PROC_OBJ_ZRAFREEZE, "d_a_obj_zra_freeze"}, - {PROC_NPC_ZRC, "d_a_npc_zrc"}, - {PROC_NPC_ZRZ, "d_a_npc_zrz"}, - {PROC_ZRA_MARK, "d_a_obj_zraMark"}, - {PROC_MYNA2, "d_a_npc_myna2"}, - {PROC_TAG_MYNA2, "d_a_tag_myna2"}, - {PROC_NPC_CD3, "d_a_npc_cdn3"}, - {PROC_Tag_Schedule, "d_a_tag_schedule"}, - {PROC_Tag_Escape, "d_a_tag_escape"}, - {PROC_NPC_CHAT, "d_a_npc_chat"}, - {PROC_NPC_SOLDIERa, "d_a_npc_soldierA"}, - {PROC_NPC_SOLDIERb, "d_a_npc_soldierB"}, - {PROC_PASSER_MNG, "d_a_passer_mng"}, - {PROC_NPC_PASSER, "d_a_npc_passer"}, - {PROC_NPC_PASSER2, "d_a_npc_passer2"}, - {PROC_NPC_POST, "d_a_npc_post"}, - {PROC_NPC_POUYA, "d_a_npc_pouya"}, - {PROC_FORMATION_MNG, "d_a_formation_mng"}, - {PROC_NPC_FGUARD, "d_a_npc_fguard"}, - {PROC_GUARD_MNG, "d_a_guard_mng"}, - {PROC_TAG_GUARD, "d_a_tag_guard"}, - {PROC_NPC_GUARD, "d_a_npc_guard"}, - {PROC_NPC_ASH, "d_a_npc_ash"}, - {PROC_NPC_ASHB, "d_a_npc_ashB"}, - {PROC_NPC_SHAD, "d_a_npc_shad"}, - {PROC_NPC_RAFREL, "d_a_npc_rafrel"}, - {PROC_NPC_MOIR, "d_a_npc_moir"}, - {PROC_NPC_IMPAL, "d_a_npc_impal"}, - {PROC_NPC_SHOE, "d_a_npc_shoe"}, - {PROC_NPC_DOORBOY, "d_a_npc_doorboy"}, - {PROC_NPC_PRAYER, "d_a_npc_prayer"}, - {PROC_NPC_KASIHANA, "d_a_npc_kasi_hana"}, - {PROC_NPC_KASIKYU, "d_a_npc_kasi_kyu"}, - {PROC_NPC_KASIMICH, "d_a_npc_kasi_mich"}, - {PROC_NPC_DRSOL, "d_a_npc_drainSol"}, - {PROC_NPC_CHIN, "d_a_npc_chin"}, - {PROC_NPC_INS, "d_a_npc_ins"}, - {PROC_NPC_SHOP0, "d_a_npc_shop0"}, + {fpcNm_MYNA_e, "d_a_myna"}, + {fpcNm_NPC_GND_e, "d_a_npc_gnd"}, + {fpcNm_NPC_GRA_e, "d_a_npc_gra"}, + {fpcNm_NPC_GRC_e, "d_a_npc_grc"}, + {fpcNm_NPC_GRD_e, "d_a_npc_grd"}, + {fpcNm_NPC_GRM_e, "d_a_npc_grm"}, + {fpcNm_NPC_GRMC_e, "d_a_npc_grmc"}, + {fpcNm_NPC_GRO_e, "d_a_npc_gro"}, + {fpcNm_NPC_GRR_e, "d_a_npc_grr"}, + {fpcNm_NPC_GRS_e, "d_a_npc_grs"}, + {fpcNm_NPC_GRZ_e, "d_a_npc_grz"}, + {fpcNm_NPC_YAMID_e, "d_a_npc_yamid"}, + {fpcNm_NPC_YAMIT_e, "d_a_npc_yamit"}, + {fpcNm_NPC_YAMIS_e, "d_a_npc_yamis"}, + {fpcNm_NPC_BLUENS_e, "d_a_npc_blue_ns"}, + {fpcNm_NPC_KAKASHI_e, "d_a_npc_kakashi"}, + {fpcNm_NPC_KDK_e, "d_a_npc_kdk"}, + {fpcNm_NPC_ARU_e, "d_a_npc_aru"}, + {fpcNm_NPC_BANS_e, "d_a_npc_bans"}, + {fpcNm_NPC_BESU_e, "d_a_npc_besu"}, + {fpcNm_NPC_BOU_e, "d_a_npc_bou"}, + {fpcNm_NPC_BOU_S_e, "d_a_npc_bouS"}, + {fpcNm_NPC_CLERKA_e, "d_a_npc_clerka"}, + {fpcNm_NPC_CLERKB_e, "d_a_npc_clerkb"}, + {fpcNm_NPC_CLERKT_e, "d_a_npc_clerkt"}, + {fpcNm_NPC_WRESTLER_e, "d_a_npc_wrestler"}, + {fpcNm_Tag_Arena_e, "d_a_tag_arena"}, + {fpcNm_Tag_Instruction_e, "d_a_tag_instruction"}, + {fpcNm_NPC_DOC_e, "d_a_npc_doc"}, + {fpcNm_NPC_GWOLF_e, "d_a_npc_gwolf"}, + {fpcNm_NPC_LEN_e, "d_a_npc_len"}, + {fpcNm_NPC_LUD_e, "d_a_npc_lud"}, + {fpcNm_NPC_FAIRY_SEIREI_e, "d_a_npc_fairy_seirei"}, + {fpcNm_NPC_FAIRY_e, "d_a_npc_fairy"}, + {fpcNm_NPC_HANJO_e, "d_a_npc_hanjo"}, + {fpcNm_NPC_HENNA_e, "d_a_npc_henna"}, + {fpcNm_NPC_HENNA0_e, "d_a_npc_henna0"}, + {fpcNm_NPC_HOZ_e, "d_a_npc_hoz"}, + {fpcNm_NPC_JAGAR_e, "d_a_npc_jagar"}, + {fpcNm_NPC_KKRI_e, "d_a_npc_kkri"}, + {fpcNm_NPC_KN_e, "d_a_npc_kn"}, + {fpcNm_KN_BULLET_e, "d_a_obj_knBullet"}, + {fpcNm_NPC_KNJ_e, "d_a_npc_knj"}, + {fpcNm_NPC_KOLIN_e, "d_a_npc_kolin"}, + {fpcNm_NPC_KOLINB_e, "d_a_npc_kolinb"}, + {fpcNm_NPC_KYURY_e, "d_a_npc_kyury"}, + {fpcNm_NPC_MARO_e, "d_a_npc_maro"}, + {fpcNm_NPC_MIDP_e, "d_a_npc_midp"}, + {fpcNm_NPC_MOI_e, "d_a_npc_moi"}, + {fpcNm_NPC_RACA_e, "d_a_npc_raca"}, + {fpcNm_NPC_SARU_e, "d_a_npc_saru"}, + {fpcNm_NPC_SEIB_e, "d_a_npc_seib"}, + {fpcNm_NPC_SEIC_e, "d_a_npc_seic"}, + {fpcNm_NPC_SEID_e, "d_a_npc_seid"}, + {fpcNm_NPC_SEIRA_e, "d_a_npc_seira"}, + {fpcNm_NPC_SERA2_e, "d_a_npc_seira2"}, + {fpcNm_NPC_SEIREI_e, "d_a_npc_seirei"}, + {fpcNm_NPC_SHAMAN_e, "d_a_npc_shaman"}, + {fpcNm_NPC_SMARO_e, "d_a_npc_shop_maro"}, + {fpcNm_NPC_SOLA_e, "d_a_npc_sola"}, + {fpcNm_NPC_TARO_e, "d_a_npc_taro"}, + {fpcNm_NPC_PACHI_BESU_e, "d_a_npc_pachi_besu"}, + {fpcNm_NPC_PACHI_TARO_e, "d_a_npc_pachi_taro"}, + {fpcNm_NPC_PACHI_MARO_e, "d_a_npc_pachi_maro"}, + {fpcNm_TAG_PATI_e, "d_a_tag_pachi"}, + {fpcNm_NPC_THE_e, "d_a_npc_the"}, + {fpcNm_NPC_TKJ_e, "d_a_npc_tkj"}, + {fpcNm_NPC_TKS_e, "d_a_npc_tks"}, + {fpcNm_NPC_TKC_e, "d_a_npc_tkc"}, + {fpcNm_OBJ_TKS_e, "d_a_obj_tks"}, + {fpcNm_NPC_TOBY_e, "d_a_npc_toby"}, + {fpcNm_NPC_URI_e, "d_a_npc_uri"}, + {fpcNm_NPC_YELIA_e, "d_a_npc_yelia"}, + {fpcNm_NPC_YKM_e, "d_a_npc_ykm"}, + {fpcNm_NPC_YKW_e, "d_a_npc_ykw"}, + {fpcNm_NPC_ZANB_e, "d_a_npc_zanb"}, + {fpcNm_NPC_ZANT_e, "d_a_npc_zant"}, + {fpcNm_NPC_ZELDA_e, "d_a_npc_zelda"}, + {fpcNm_NPC_ZELR_e, "d_a_npc_zelR"}, + {fpcNm_NPC_ZELRO_e, "d_a_npc_zelRo"}, + {fpcNm_OBJ_ZRAFREEZE_e, "d_a_obj_zra_freeze"}, + {fpcNm_NPC_ZRC_e, "d_a_npc_zrc"}, + {fpcNm_NPC_ZRZ_e, "d_a_npc_zrz"}, + {fpcNm_ZRA_MARK_e, "d_a_obj_zraMark"}, + {fpcNm_MYNA2_e, "d_a_npc_myna2"}, + {fpcNm_TAG_MYNA2_e, "d_a_tag_myna2"}, + {fpcNm_NPC_CD3_e, "d_a_npc_cdn3"}, + {fpcNm_Tag_Schedule_e, "d_a_tag_schedule"}, + {fpcNm_Tag_Escape_e, "d_a_tag_escape"}, + {fpcNm_NPC_CHAT_e, "d_a_npc_chat"}, + {fpcNm_NPC_SOLDIERa_e, "d_a_npc_soldierA"}, + {fpcNm_NPC_SOLDIERb_e, "d_a_npc_soldierB"}, + {fpcNm_PASSER_MNG_e, "d_a_passer_mng"}, + {fpcNm_NPC_PASSER_e, "d_a_npc_passer"}, + {fpcNm_NPC_PASSER2_e, "d_a_npc_passer2"}, + {fpcNm_NPC_POST_e, "d_a_npc_post"}, + {fpcNm_NPC_POUYA_e, "d_a_npc_pouya"}, + {fpcNm_FORMATION_MNG_e, "d_a_formation_mng"}, + {fpcNm_NPC_FGUARD_e, "d_a_npc_fguard"}, + {fpcNm_GUARD_MNG_e, "d_a_guard_mng"}, + {fpcNm_TAG_GUARD_e, "d_a_tag_guard"}, + {fpcNm_NPC_GUARD_e, "d_a_npc_guard"}, + {fpcNm_NPC_ASH_e, "d_a_npc_ash"}, + {fpcNm_NPC_ASHB_e, "d_a_npc_ashB"}, + {fpcNm_NPC_SHAD_e, "d_a_npc_shad"}, + {fpcNm_NPC_RAFREL_e, "d_a_npc_rafrel"}, + {fpcNm_NPC_MOIR_e, "d_a_npc_moir"}, + {fpcNm_NPC_IMPAL_e, "d_a_npc_impal"}, + {fpcNm_NPC_SHOE_e, "d_a_npc_shoe"}, + {fpcNm_NPC_DOORBOY_e, "d_a_npc_doorboy"}, + {fpcNm_NPC_PRAYER_e, "d_a_npc_prayer"}, + {fpcNm_NPC_KASIHANA_e, "d_a_npc_kasi_hana"}, + {fpcNm_NPC_KASIKYU_e, "d_a_npc_kasi_kyu"}, + {fpcNm_NPC_KASIMICH_e, "d_a_npc_kasi_mich"}, + {fpcNm_NPC_DRSOL_e, "d_a_npc_drainSol"}, + {fpcNm_NPC_CHIN_e, "d_a_npc_chin"}, + {fpcNm_NPC_INS_e, "d_a_npc_ins"}, + {fpcNm_NPC_SHOP0_e, "d_a_npc_shop0"}, #if VERSION != VERSION_SHIELD_DEBUG - {PROC_NPC_MK, "d_a_npc_mk"}, + {fpcNm_NPC_MK_e, "d_a_npc_mk"}, #endif - {PROC_NPC_P2, "d_a_npc_p2"}, - {PROC_KYTAG00, "d_a_kytag00"}, + {fpcNm_NPC_P2_e, "d_a_npc_p2"}, + {fpcNm_KYTAG00_e, "d_a_kytag00"}, #if VERSION != VERSION_SHIELD_DEBUG - {PROC_KYTAG01, "d_a_kytag01"}, + {fpcNm_KYTAG01_e, "d_a_kytag01"}, #endif - {PROC_KYTAG02, "d_a_kytag02"}, - {PROC_KYTAG03, "d_a_kytag03"}, - {PROC_KYTAG04, "d_a_kytag04"}, - {PROC_KYTAG05, "d_a_kytag05"}, - {PROC_KYTAG06, "d_a_kytag06"}, - {PROC_KYTAG07, "d_a_kytag07"}, - {PROC_KYTAG08, "d_a_kytag08"}, - {PROC_KYTAG09, "d_a_kytag09"}, - {PROC_KYTAG10, "d_a_kytag10"}, - {PROC_KYTAG11, "d_a_kytag11"}, - {PROC_KYTAG12, "d_a_kytag12"}, - {PROC_KYTAG13, "d_a_kytag13"}, - {PROC_KYTAG14, "d_a_kytag14"}, - {PROC_KYTAG15, "d_a_kytag15"}, - {PROC_KYTAG16, "d_a_kytag16"}, - {PROC_KYTAG17, "d_a_kytag17"}, - {PROC_Ykgr, "d_a_ykgr"}, - {PROC_TALK, "d_a_talk"}, - {PROC_Obj_Crope, "d_a_obj_crope"}, - {PROC_Obj_Bombf, "d_a_obj_bombf"}, - {PROC_Obj_BkLeaf, "d_a_obj_bk_leaf"}, - {PROC_Tag_Mhint, "d_a_tag_mhint"}, - {PROC_Tag_Mmsg, "d_a_tag_mmsg"}, - {PROC_Tag_Mwait, "d_a_tag_mwait"}, - {PROC_Tag_Mstop, "d_a_tag_mstop"}, - {PROC_Tag_Stream, "d_a_tag_stream"}, - {PROC_Tag_Sppath, "d_a_tag_sppath"}, - {PROC_Tag_Wljump, "d_a_tag_wljump"}, - {PROC_Tag_TWGate, "d_a_tag_TWgate"}, - {PROC_Tag_Lv6Gate, "d_a_tag_Lv6Gate"}, - {PROC_Tag_Lv7Gate, "d_a_tag_Lv7Gate"}, - {PROC_Tag_Lv8Gate, "d_a_tag_Lv8Gate"}, - {PROC_Tag_TheBHint, "d_a_tag_theB_hint"}, - {PROC_Tag_Assist, "d_a_tag_assistance"}, - {PROC_DEMO00, "d_a_demo00"}, - {PROC_TAG_CAMERA, "d_a_tag_camera"}, - {PROC_TAG_CHKPOINT, "d_a_tag_chkpoint"}, + {fpcNm_KYTAG02_e, "d_a_kytag02"}, + {fpcNm_KYTAG03_e, "d_a_kytag03"}, + {fpcNm_KYTAG04_e, "d_a_kytag04"}, + {fpcNm_KYTAG05_e, "d_a_kytag05"}, + {fpcNm_KYTAG06_e, "d_a_kytag06"}, + {fpcNm_KYTAG07_e, "d_a_kytag07"}, + {fpcNm_KYTAG08_e, "d_a_kytag08"}, + {fpcNm_KYTAG09_e, "d_a_kytag09"}, + {fpcNm_KYTAG10_e, "d_a_kytag10"}, + {fpcNm_KYTAG11_e, "d_a_kytag11"}, + {fpcNm_KYTAG12_e, "d_a_kytag12"}, + {fpcNm_KYTAG13_e, "d_a_kytag13"}, + {fpcNm_KYTAG14_e, "d_a_kytag14"}, + {fpcNm_KYTAG15_e, "d_a_kytag15"}, + {fpcNm_KYTAG16_e, "d_a_kytag16"}, + {fpcNm_KYTAG17_e, "d_a_kytag17"}, + {fpcNm_Ykgr_e, "d_a_ykgr"}, + {fpcNm_TALK_e, "d_a_talk"}, + {fpcNm_Obj_Crope_e, "d_a_obj_crope"}, + {fpcNm_Obj_Bombf_e, "d_a_obj_bombf"}, + {fpcNm_Obj_BkLeaf_e, "d_a_obj_bk_leaf"}, + {fpcNm_Tag_Mhint_e, "d_a_tag_mhint"}, + {fpcNm_Tag_Mmsg_e, "d_a_tag_mmsg"}, + {fpcNm_Tag_Mwait_e, "d_a_tag_mwait"}, + {fpcNm_Tag_Mstop_e, "d_a_tag_mstop"}, + {fpcNm_Tag_Stream_e, "d_a_tag_stream"}, + {fpcNm_Tag_Sppath_e, "d_a_tag_sppath"}, + {fpcNm_Tag_Wljump_e, "d_a_tag_wljump"}, + {fpcNm_Tag_TWGate_e, "d_a_tag_TWgate"}, + {fpcNm_Tag_Lv6Gate_e, "d_a_tag_Lv6Gate"}, + {fpcNm_Tag_Lv7Gate_e, "d_a_tag_Lv7Gate"}, + {fpcNm_Tag_Lv8Gate_e, "d_a_tag_Lv8Gate"}, + {fpcNm_Tag_TheBHint_e, "d_a_tag_theB_hint"}, + {fpcNm_Tag_Assist_e, "d_a_tag_assistance"}, + {fpcNm_DEMO00_e, "d_a_demo00"}, + {fpcNm_TAG_CAMERA_e, "d_a_tag_camera"}, + {fpcNm_TAG_CHKPOINT_e, "d_a_tag_chkpoint"}, #if VERSION != VERSION_SHIELD_DEBUG - {PROC_TAG_EVENT, "d_a_tag_event"}, + {fpcNm_TAG_EVENT_e, "d_a_tag_event"}, #endif - {PROC_TAG_EVT, "d_a_tag_evt"}, - {PROC_TAG_TELOP, "d_a_tag_telop"}, - {PROC_TAG_HOWL, "d_a_tag_howl"}, + {fpcNm_TAG_EVT_e, "d_a_tag_evt"}, + {fpcNm_TAG_TELOP_e, "d_a_tag_telop"}, + {fpcNm_TAG_HOWL_e, "d_a_tag_howl"}, #if VERSION != VERSION_SHIELD_DEBUG - {PROC_TAG_MSG, "d_a_tag_msg"}, - + {fpcNm_TAG_MSG_e, "d_a_tag_msg"}, #endif - {PROC_TAG_LANTERN, "d_a_tag_lantern"}, - {PROC_Tag_Mist, "d_a_tag_mist"}, - {PROC_DMIDNA, "d_a_dmidna"}, - {PROC_VRBOX, "d_a_vrbox"}, - {PROC_VRBOX2, "d_a_vrbox2"}, - {PROC_BG, "d_a_bg"}, - {PROC_SET_BG_OBJ, "d_a_set_bgobj"}, - {PROC_BG_OBJ, "d_a_bg_obj"}, - {PROC_MIRROR, "d_a_mirror"}, - {PROC_MOVIE_PLAYER, "d_a_movie_player"}, + {fpcNm_TAG_LANTERN_e, "d_a_tag_lantern"}, + {fpcNm_Tag_Mist_e, "d_a_tag_mist"}, + {fpcNm_DMIDNA_e, "d_a_dmidna"}, + {fpcNm_VRBOX_e, "d_a_vrbox"}, + {fpcNm_VRBOX2_e, "d_a_vrbox2"}, + {fpcNm_BG_e, "d_a_bg"}, + {fpcNm_SET_BG_OBJ_e, "d_a_set_bgobj"}, + {fpcNm_BG_OBJ_e, "d_a_bg_obj"}, + {fpcNm_MIRROR_e, "d_a_mirror"}, + {fpcNm_MOVIE_PLAYER_e, "d_a_movie_player"}, #if VERSION != VERSION_SHIELD_DEBUG - {PROC_TITLE, "d_a_title"}, + {fpcNm_TITLE_e, "d_a_title"}, #endif - {PROC_FR, "d_a_fr"}, - {PROC_ECONT, "d_a_econt"}, - {PROC_MG_ROD, "d_a_mg_rod"}, - {PROC_E_ARROW, "d_a_e_arrow"}, - {PROC_BULLET, "d_a_bullet"}, - {PROC_SWHIT0, "d_a_swhit0"}, - {PROC_E_TH_BALL, "d_a_e_th_ball"}, - {PROC_TAG_EVTAREA, "d_a_tag_evtarea"}, - {PROC_TAG_EVTMSG, "d_a_tag_evtmsg"}, - {PROC_TAG_KMSG, "d_a_tag_kmsg"}, - {PROC_TAG_PUSH, "d_a_tag_push"}, - {PROC_E_MK_BO, "d_a_e_mk_bo"}, - {PROC_E_MM_MT, "d_a_e_mm_mt"}, - {PROC_OBJ_KBOX, "d_a_obj_kbox"}, - {PROC_OBJ_FW, "d_a_obj_fw"}, - {PROC_B_GOS, "d_a_b_gos"}, - {PROC_OBJ_YSTONE, "d_a_obj_ystone"}, - {PROC_MANT, "d_a_mant"}, - {PROC_CROD, "d_a_crod"}, - {PROC_OBJ_PLEAF, "d_a_obj_pleaf"}, - {PROC_OBJ_KBACKET, "d_a_obj_kbacket"}, - {PROC_OBJ_YBAG, "d_a_obj_yel_bag"}, - {PROC_OBJ_PUMPKIN, "d_a_obj_pumpkin"}, - {PROC_OBJ_AUTOMATA, "d_a_obj_automata"}, - {PROC_OBJ_GADGET, "d_a_obj_gadget"}, - {PROC_OBJ_KAGO, "d_a_obj_kago"}, - {PROC_Obj_Carry, "d_a_obj_carry"}, - {PROC_Obj_Stone, "d_a_obj_stone"}, - {PROC_OBJ_HB, "d_a_obj_hb"}, - {PROC_NPC_INKO, "d_a_npc_inko"}, - {PROC_BD, "d_a_bd"}, - {PROC_Obj_Eff, "d_a_obj_eff"}, - {PROC_E_BI, "d_a_e_bi"}, - {PROC_E_BI_LEAF, "d_a_e_bi_leaf"}, - {PROC_START_AND_GOAL, "d_a_startAndGoal"}, - {PROC_NPC_DF, "d_a_npc_df"}, - {PROC_ARROW, "d_a_arrow"}, - {PROC_PATH_LINE, "d_a_path_line"}, - {PROC_TAG_ALLMATO, "d_a_tag_allmato"}, - {PROC_Obj_Timer, "d_a_obj_timer"}, - {PROC_SCENE_EXIT, "d_a_scene_exit"}, - {PROC_SUSPEND, "d_a_suspend"}, + {fpcNm_FR_e, "d_a_fr"}, + {fpcNm_ECONT_e, "d_a_econt"}, + {fpcNm_MG_ROD_e, "d_a_mg_rod"}, + {fpcNm_E_ARROW_e, "d_a_e_arrow"}, + {fpcNm_BULLET_e, "d_a_bullet"}, + {fpcNm_SWHIT0_e, "d_a_swhit0"}, + {fpcNm_E_TH_BALL_e, "d_a_e_th_ball"}, + {fpcNm_TAG_EVTAREA_e, "d_a_tag_evtarea"}, + {fpcNm_TAG_EVTMSG_e, "d_a_tag_evtmsg"}, + {fpcNm_TAG_KMSG_e, "d_a_tag_kmsg"}, + {fpcNm_TAG_PUSH_e, "d_a_tag_push"}, + {fpcNm_E_MK_BO_e, "d_a_e_mk_bo"}, + {fpcNm_E_MM_MT_e, "d_a_e_mm_mt"}, + {fpcNm_OBJ_KBOX_e, "d_a_obj_kbox"}, + {fpcNm_OBJ_FW_e, "d_a_obj_fw"}, + {fpcNm_B_GOS_e, "d_a_b_gos"}, + {fpcNm_OBJ_YSTONE_e, "d_a_obj_ystone"}, + {fpcNm_MANT_e, "d_a_mant"}, + {fpcNm_CROD_e, "d_a_crod"}, + {fpcNm_OBJ_PLEAF_e, "d_a_obj_pleaf"}, + {fpcNm_OBJ_KBACKET_e, "d_a_obj_kbacket"}, + {fpcNm_OBJ_YBAG_e, "d_a_obj_yel_bag"}, + {fpcNm_OBJ_PUMPKIN_e, "d_a_obj_pumpkin"}, + {fpcNm_OBJ_AUTOMATA_e, "d_a_obj_automata"}, + {fpcNm_OBJ_GADGET_e, "d_a_obj_gadget"}, + {fpcNm_OBJ_KAGO_e, "d_a_obj_kago"}, + {fpcNm_Obj_Carry_e, "d_a_obj_carry"}, + {fpcNm_Obj_Stone_e, "d_a_obj_stone"}, + {fpcNm_OBJ_HB_e, "d_a_obj_hb"}, + {fpcNm_NPC_INKO_e, "d_a_npc_inko"}, + {fpcNm_BD_e, "d_a_bd"}, + {fpcNm_Obj_Eff_e, "d_a_obj_eff"}, + {fpcNm_E_BI_e, "d_a_e_bi"}, + {fpcNm_E_BI_LEAF_e, "d_a_e_bi_leaf"}, + {fpcNm_START_AND_GOAL_e, "d_a_startAndGoal"}, + {fpcNm_NPC_DF_e, "d_a_npc_df"}, + {fpcNm_ARROW_e, "d_a_arrow"}, + {fpcNm_PATH_LINE_e, "d_a_path_line"}, + {fpcNm_TAG_ALLMATO_e, "d_a_tag_allmato"}, + {fpcNm_Obj_Timer_e, "d_a_obj_timer"}, + {fpcNm_SCENE_EXIT_e, "d_a_scene_exit"}, + {fpcNm_SUSPEND_e, "d_a_suspend"}, #if VERSION != VERSION_SHIELD_DEBUG - {PROC_GRASS, "d_a_grass"}, + {fpcNm_GRASS_e, "d_a_grass"}, #endif #endif {-1, NULL}, }; -static DynamicModuleControlBase* DMC[PROC_MAX_NUM]; +static DynamicModuleControlBase* DMC[fpcNm_MAX_NUM]; static bool DMC_initialized; @@ -820,7 +819,7 @@ int cCc_Init() { #else JKRHeap* parentHeap = DynamicModuleControlBase::getHeap(); #endif - u32 dmcHeapSize = sizeof(DynamicModuleControl) * PROC_MAX_NUM; + u32 dmcHeapSize = sizeof(DynamicModuleControl) * fpcNm_MAX_NUM; JKRSolidHeap* dmcHeap = JKRCreateSolidHeap(dmcHeapSize, parentHeap, false); JKRHeap* prevHeap = JKRSetCurrentHeap(dmcHeap); @@ -997,8 +996,8 @@ static int cDyl_InitCallback(void* param_0) { #endif cDyl_Initialized = true; - fopScnM_CreateReq(PROC_LOGO_SCENE, 0x7FFF, 0, 0); - DuskLog.debug("cDyl_InitCallback: PROC_LOGO_SCENE created, DONE"); + fopScnM_CreateReq(fpcNm_LOGO_SCENE_e, 0x7FFF, 0, 0); + DuskLog.debug("cDyl_InitCallback: fpcNm_LOGO_SCENE_e created, DONE"); return 1; } diff --git a/src/d/actor/d_a_L7demo_dr.cpp b/src/d/actor/d_a_L7demo_dr.cpp index 1d52f77263..468675cd09 100644 --- a/src/d/actor/d_a_L7demo_dr.cpp +++ b/src/d/actor/d_a_L7demo_dr.cpp @@ -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, }; diff --git a/src/d/actor/d_a_L7low_dr.cpp b/src/d/actor/d_a_L7low_dr.cpp index eb09d83c73..6afb2e63e9 100644 --- a/src/d/actor/d_a_L7low_dr.cpp +++ b/src/d/actor/d_a_L7low_dr.cpp @@ -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, }; diff --git a/src/d/actor/d_a_L7op_demo_dr.cpp b/src/d/actor/d_a_L7op_demo_dr.cpp index be116c9bea..7881507271 100644 --- a/src/d/actor/d_a_L7op_demo_dr.cpp +++ b/src/d/actor/d_a_L7op_demo_dr.cpp @@ -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(¤t.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(¤t.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(¤t.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, }; diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index 90813c95f6..93bfd80296 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -203,8 +203,8 @@ static f32 const l_wolfFootOnFrame[6][4] = { }; static s16 const l_insectNameList[12] = { - PROC_Obj_Kabuto, PROC_Obj_Cho, PROC_Obj_Kuw, PROC_Obj_Batta, PROC_Obj_Nan, PROC_Obj_Dan, - PROC_Obj_Kam, PROC_Obj_Ten, PROC_Obj_Kat, PROC_Obj_Tombo, PROC_Obj_Ari, PROC_Obj_Kag, + fpcNm_Obj_Kabuto_e, fpcNm_Obj_Cho_e, fpcNm_Obj_Kuw_e, fpcNm_Obj_Batta_e, fpcNm_Obj_Nan_e, fpcNm_Obj_Dan_e, + fpcNm_Obj_Kam_e, fpcNm_Obj_Ten_e, fpcNm_Obj_Kat_e, fpcNm_Obj_Tombo_e, fpcNm_Obj_Ari_e, fpcNm_Obj_Kag_e, }; #if DEBUG @@ -2068,7 +2068,7 @@ void daAlink_c::tgHitCallback(fopAc_ac_c* i_atActor, dCcD_GObjInf* i_tgObjInf, d void daAlink_c::coHitCallback(fopAc_ac_c* i_coHitActor, dCcD_GObjInf* i_coHitObj) { if (!checkWolf() && !checkNoResetFlg3(FLG3_UNK_20000000)) { if (((mProcID != PROC_CUT_HEAD && mProcID != PROC_CUT_DOWN) || i_coHitActor != field_0x280c.getActor()) - && (!checkModeFlg(0x10040) || fopAcM_GetName(i_coHitActor) == PROC_CSTAF)) + && (!checkModeFlg(0x10040) || fopAcM_GetName(i_coHitActor) == fpcNm_CSTAF_e)) { field_0x372c += *mCcStts.GetCCMoveP(); } @@ -2076,7 +2076,7 @@ void daAlink_c::coHitCallback(fopAc_ac_c* i_coHitActor, dCcD_GObjInf* i_coHitObj field_0x30fe++; } - if (fopAcM_GetName(i_coHitActor) == PROC_Obj_WaterFall) { + if (fopAcM_GetName(i_coHitActor) == fpcNm_Obj_WaterFall_e) { if (checkWolf()) { if (i_coHitObj == &mTgCyls[0]) { onEndResetFlg1(ERFLG1_WATERFALL_FRONT_HIT); @@ -2661,7 +2661,7 @@ void daAlink_c::setHatAngle() { if (!checkNoResetFlg0(FLG0_SWIM_UP)) { sp9C.y -= 2.0f; - } else if (checkMagneBootsOn() && getMoveBGActorName(mMagneLineChk, FALSE) == PROC_Obj_MagneArm) { + } else if (checkMagneBootsOn() && getMoveBGActorName(mMagneLineChk, FALSE) == fpcNm_Obj_MagneArm_e) { sp9C.y += 5.0f; } else { sp9C.y -= 5.0f; @@ -2906,7 +2906,7 @@ bool daAlink_c::checkActorPosAngle(fopAc_ac_c* i_actor, cXyz** o_ppos) { field_0x311c = 0x50; } - if (actor_name == PROC_Obj_Wchain || (actor_name == PROC_B_MGN && !((daB_MGN_c*)i_actor)->isDown())) { + if (actor_name == fpcNm_Obj_Wchain_e || (actor_name == fpcNm_B_MGN_e && !((daB_MGN_c*)i_actor)->isDown())) { onNoResetFlg1(FLG1_MIDNA_HAIR_ATN_POS); mMidnaHairAtnPos = i_actor->eyePos; } @@ -2939,22 +2939,22 @@ cXyz* daAlink_c::getNeckAimPos(cXyz* param_0, int* param_1, int param_2) { daMidna_c* midna = (daMidna_c*)getMidnaActor(); s16 actor_name = fopAcM_GetName(look_actor); - if (actor_name == PROC_MIDNA - || actor_name == PROC_Tag_Wljump - || (actor_name == PROC_Tag_Mhint && ((daTagMhint_c*)look_actor)->checkNoAttention()) - || (actor_name == PROC_Tag_Mstop && ((daTagMstop_c*)look_actor)->checkNoAttention()) - || (actor_name == PROC_Tag_Mwait && ((daTagMwait_c*)look_actor)->checkEndMessage())) + if (actor_name == fpcNm_MIDNA_e + || actor_name == fpcNm_Tag_Wljump_e + || (actor_name == fpcNm_Tag_Mhint_e && ((daTagMhint_c*)look_actor)->checkNoAttention()) + || (actor_name == fpcNm_Tag_Mstop_e && ((daTagMstop_c*)look_actor)->checkNoAttention()) + || (actor_name == fpcNm_Tag_Mwait_e && ((daTagMwait_c*)look_actor)->checkEndMessage())) { *param_1 = 1; return &midna->eyePos; } - if (actor_name == PROC_Tag_Mhint || actor_name == PROC_Tag_Mstop) { + if (actor_name == fpcNm_Tag_Mhint_e || actor_name == fpcNm_Tag_Mstop_e) { midna->setForceNeckAimPos(look_actor->eyePos); } } } - } else if (mProcID == PROC_BOTTLE_OPEN && mEquipItem == fpcNm_ITEM_FAIRY) { + } else if (mProcID == PROC_BOTTLE_OPEN && mEquipItem == dItemNo_FAIRY_e) { look_actor = field_0x285c.getActor(); } else if (mProcID == PROC_FISHING_CAST || mProcID == PROC_CANOE_FISHING_WAIT || mProcID == PROC_CANOE_FISHING_REEL || mProcID == PROC_CANOE_FISHING_GET) { look_actor = mItemAcKeep.getActor(); @@ -3021,13 +3021,13 @@ cXyz* daAlink_c::getNeckAimPos(cXyz* param_0, int* param_1, int param_2) { } if (dComIfGp_att_getLookTarget() != NULL) { - if (fopAcM_GetName(dComIfGp_att_getLookTarget()) == PROC_E_NZ) { + if (fopAcM_GetName(dComIfGp_att_getLookTarget()) == fpcNm_E_NZ_e) { *param_1 = 0; } return &dComIfGp_att_getLookTarget()->eyePos; } - if ((checkActorPosAngle(field_0x27f0, &sp1C) && (field_0x27f0 == NULL || fopAcM_GetName(field_0x27f0) != PROC_Tag_WaraHowl)) + if ((checkActorPosAngle(field_0x27f0, &sp1C) && (field_0x27f0 == NULL || fopAcM_GetName(field_0x27f0) != fpcNm_Tag_WaraHowl_e)) || checkActorPosAngle(spC, &sp1C) || checkActorPosAngle(field_0x27f8, &sp1C)) { @@ -3131,7 +3131,7 @@ cXyz* daAlink_c::getNeckAimPos(cXyz* param_0, int* param_1, int param_2) { || demoMode == daPy_demo_c::DEMO_UNEQUIP_e) { spC = getDemoLookActor(); - if (spC != NULL && fopAcM_GetName(spC) == PROC_MIDNA) { + if (spC != NULL && fopAcM_GetName(spC) == fpcNm_MIDNA_e) { return &spC->eyePos; } @@ -3435,7 +3435,7 @@ bool daAlink_c::commonLineCheck(cXyz* i_startPos, cXyz* i_endPos) { * * @param i_polyinf The polygon info to check * @param i_forceCheck Forces the check to happen regardless of if the poly is safe or not - * @return The actor name of the actor associated with the polygon info. defaults to PROC_ALINK + * @return The actor name of the actor associated with the polygon info. defaults to fpcNm_ALINK_e */ s16 daAlink_c::getMoveBGActorName(cBgS_PolyInfo& i_polyinf, BOOL i_forceCheck) { if ((i_forceCheck || dComIfG_Bgsp().ChkPolySafe(i_polyinf)) && @@ -3444,11 +3444,11 @@ s16 daAlink_c::getMoveBGActorName(cBgS_PolyInfo& i_polyinf, BOOL i_forceCheck) { return fopAcM_GetName(dComIfG_Bgsp().GetActorPointer(i_polyinf)); } - return PROC_ALINK; + return fpcNm_ALINK_e; } fopAc_ac_c* daAlink_c::checkGoronRide() { - if (mLinkAcch.ChkGroundHit() && getMoveBGActorName(mLinkAcch.m_gnd, FALSE) == PROC_OBJ_GRA) { + if (mLinkAcch.ChkGroundHit() && getMoveBGActorName(mLinkAcch.m_gnd, FALSE) == fpcNm_OBJ_GRA_e) { return dComIfG_Bgsp().GetActorPointer(mLinkAcch.m_gnd); } @@ -4421,8 +4421,8 @@ BOOL daAlink_c::checkCanoeStart() { void daAlink_c::playerInit() { mHeavySpeedMultiplier = 1.0f; - if (!checkDungeon() && !checkBossRoom() && checkItemGet(fpcNm_ITEM_DUNGEON_EXIT, 1)) { - dComIfGs_setItem(SLOT_18, fpcNm_ITEM_TKS_LETTER); + if (!checkDungeon() && !checkBossRoom() && checkItemGet(dItemNo_DUNGEON_EXIT_e, 1)) { + dComIfGs_setItem(SLOT_18, dItemNo_TKS_LETTER_e); } u16 i; @@ -4556,7 +4556,7 @@ void daAlink_c::playerInit() { field_0x33b8 = -G_CM3D_F_INF; field_0x33bc = -G_CM3D_F_INF; - mEquipItem = fpcNm_ITEM_NONE; + mEquipItem = dItemNo_NONE_e; offSwordModel(); mAlinkStaffId = -1; @@ -4667,7 +4667,7 @@ int daAlink_c::setStartProcInit() { setFaceBasicAnime(ANM_WAIT); } else { mEquipItem = (dComIfGs_getLastSceneMode() >> 0x18) & 0xFF; - if (mEquipItem == fpcNm_ITEM_SWORD) { + if (mEquipItem == dItemNo_SWORD_e) { mEquipItem = 0x103; } else if (checkStageName("D_MN09B") && last_mode != 8 && start_mode == 2) { mEquipItem = 0x103; @@ -4680,12 +4680,12 @@ int daAlink_c::setStartProcInit() { || (isHorseStart && mEquipItem != 0x103 && !checkBowAndSlingItem(mEquipItem) - && mEquipItem != fpcNm_ITEM_BOOMERANG - && mEquipItem != fpcNm_ITEM_KANTERA + && mEquipItem != dItemNo_BOOMERANG_e + && mEquipItem != dItemNo_KANTERA_e && !checkHookshotItem(mEquipItem)) ) { - mEquipItem = fpcNm_ITEM_NONE; + mEquipItem = dItemNo_NONE_e; } else { setItemModel(); } @@ -4870,22 +4870,22 @@ int daAlink_c::create() { if (!bgWaitFlg) { #if DEBUG if (g_playerKind == 2) { - dComIfGs_setSelectEquipClothes(fpcNm_ITEM_WEAR_CASUAL); + dComIfGs_setSelectEquipClothes(dItemNo_WEAR_CASUAL_e); } else if (g_playerKind == 3) { - dComIfGs_setSelectEquipClothes(fpcNm_ITEM_WEAR_KOKIRI); + dComIfGs_setSelectEquipClothes(dItemNo_WEAR_KOKIRI_e); } else if (g_playerKind == 4) { - dComIfGs_setSelectEquipClothes(fpcNm_ITEM_WEAR_ZORA); + dComIfGs_setSelectEquipClothes(dItemNo_WEAR_ZORA_e); } else if (g_playerKind == 5) { - dComIfGs_setSelectEquipClothes(fpcNm_ITEM_ARMOR); + dComIfGs_setSelectEquipClothes(dItemNo_ARMOR_e); } else #endif // Event Flag: Finished Sewers if (checkCasualWearFlg() && dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[47])) { - dComIfGs_setSelectEquipClothes(fpcNm_ITEM_WEAR_KOKIRI); + dComIfGs_setSelectEquipClothes(dItemNo_WEAR_KOKIRI_e); } if (isEnteringLV7 && checkMagicArmorHeavy()) { - dComIfGs_setSelectEquipClothes(fpcNm_ITEM_WEAR_KOKIRI); + dComIfGs_setSelectEquipClothes(dItemNo_WEAR_KOKIRI_e); } dComIfGp_setPlayer(0, this); @@ -4959,10 +4959,10 @@ int daAlink_c::create() { bgWaitFlg = TRUE; if (checkCanoeStart()) { - mRideActorID = fopAcM_create(PROC_CANOE, 0, ¤t.pos, fopAcM_GetRoomNo(this), + mRideActorID = fopAcM_create(fpcNm_CANOE_e, 0, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1); } else if (sceneMode == 11) { - mRideActorID = fopAcM_create(PROC_Obj_IceLeaf, 0x1FFFF, ¤t.pos, + mRideActorID = fopAcM_create(fpcNm_Obj_IceLeaf_e, 0x1FFFF, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1); } else { mRideActorID = fpcM_ERROR_PROCESS_ID_e; @@ -5065,7 +5065,7 @@ int daAlink_c::create() { l_jumpTop = 0.0f; #endif - fopAcM_create(PROC_MIDNA, midna_prm, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1); + fopAcM_create(fpcNm_MIDNA_e, midna_prm, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1); checkSetNpcTks(¤t.pos, fopAcM_GetRoomNo(this), 1); if (startPoint == -4 && dComIfGp_TargetWarpPt_get() != 0xFF && !dComIfGp_TransportWarp_check()) { @@ -5073,8 +5073,8 @@ int daAlink_c::create() { } if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) == dStage_SaveTbl_LV2) { - if (!dComIfGs_isItemFirstBit(fpcNm_ITEM_HYLIA_SHIELD) && !dComIfGs_isItemFirstBit(fpcNm_ITEM_SHIELD) && - !dComIfGs_isItemFirstBit(fpcNm_ITEM_WOOD_SHIELD)) + if (!dComIfGs_isItemFirstBit(dItemNo_HYLIA_SHIELD_e) && !dComIfGs_isItemFirstBit(dItemNo_SHIELD_e) && + !dComIfGs_isItemFirstBit(dItemNo_WOOD_SHIELD_e)) { fopAcM_onSwitch(this, 0x6F); } else { @@ -5837,7 +5837,7 @@ void daAlink_c::setSwordPos() { if (mEquipItem == 0x10B) { mDoMtx_multVec(getCanoePaddleMatrix(), getCanoeLocalPaddleTop(), &field_0x3720); - } else if (mEquipItem == fpcNm_ITEM_COPY_ROD) { + } else if (mEquipItem == dItemNo_COPY_ROD_e) { mDoMtx_multVec(mHeldItemModel->getBaseTRMtx(), ©RodTop, &field_0x3720); } else { field_0x3720 = mSwordTopPos; @@ -5879,7 +5879,7 @@ void daAlink_c::setItemMatrix(int param_0) { if (mShieldChangeWaitTimer == 0) { if (param_0 != 0 - || (checkPlayerGuardAndAttack() && mEquipItem != fpcNm_ITEM_IRONBALL && !checkModeFlg(0x400)) + || (checkPlayerGuardAndAttack() && mEquipItem != dItemNo_IRONBALL_e && !checkModeFlg(0x400)) || checkNoResetFlg0(FLG0_UNK_2) || (mProcID == PROC_TOOL_DEMO && mProcVar4.field_0x3010 != 0) || (mProcID == PROC_CUT_REVERSE && mProcVar2.field_0x300c != 0) @@ -5998,10 +5998,10 @@ void daAlink_c::setItemMatrix(int param_0) { } } else if (checkHookshotItem(mEquipItem)) { setHookshotPos(); - } else if (mEquipItem == fpcNm_ITEM_IRONBALL) { + } else if (mEquipItem == dItemNo_IRONBALL_e) { setIronBallPos(); } else { - if (mEquipItem == fpcNm_ITEM_COPY_ROD && mProcID != PROC_COPY_ROD_REVIVE) { + if (mEquipItem == dItemNo_COPY_ROD_e && mProcID != PROC_COPY_ROD_REVIVE) { if (checkCopyRodTopUse()) { field_0x0724->setFrame(field_0x0724->getFrameMax() - 0.001f); } else { @@ -6027,7 +6027,7 @@ void daAlink_c::setItemMatrix(int param_0) { simpleAnmPlay(mpKanteraGlowBtk); if (mProcID != PROC_OPEN_TREASURE && !checkEndResetFlg1(ERFLG1_UNK_4) && (mProcID != PROC_GET_ITEM || mProcVar4.field_0x3010 == 0)) { - if (mEquipItem == fpcNm_ITEM_KANTERA || checkOilBottleItemNotGet(mEquipItem)) { + if (mEquipItem == dItemNo_KANTERA_e || checkOilBottleItemNotGet(mEquipItem)) { mDoMtx_stack_c::copy(mpLinkModel->getAnmMtx(mLeftItemJntNo)); mDoMtx_stack_c::transM(-2.0f, -0.1f, -0.7f); mDoMtx_stack_c::XYZrotM(cM_deg2s(100.0f), cM_deg2s(9.3f), cM_deg2s(183.0f)); @@ -6338,7 +6338,7 @@ void daAlink_c::setAtCollision() { mAtCps[0].SetAtVec(spA4); dComIfG_Ccsp()->Set(&mAtCps[0]); } else if (mProcID == PROC_BOTTLE_OPEN) { - if (mEquipItem == fpcNm_ITEM_WATER_BOTTLE && mProcVar4.field_0x3010 != 0) { + if (mEquipItem == dItemNo_WATER_BOTTLE_e && mProcVar4.field_0x3010 != 0) { mDoMtx_multVec(mHeldItemModel->getBaseTRMtx(), &bottleTopPos, &spC8); if (field_0x27c8.getKeepMinY() < spC8.y) { @@ -6460,7 +6460,7 @@ void daAlink_c::setAtCollision() { } else { mAtSph.ResetAtHit(); } - } else if (mEquipItem == fpcNm_ITEM_IRONBALL) { + } else if (mEquipItem == dItemNo_IRONBALL_e) { if (mItemVar0.field_0x3018 == 2 || mItemVar0.field_0x3018 == 3 || mItemVar0.field_0x3018 == 4 || mItemVar0.field_0x3018 == 5 || mItemVar0.field_0x3018 == 7 || mItemVar0.field_0x3018 == 6) { #if DEBUG @@ -6866,7 +6866,7 @@ const daAlink_BckData* daAlink_c::getMainBckData(daAlink_c::daAlink_ANM i_anmID) {dRes_ID_ALANM_BCK_WAITHS_e, dRes_ID_ALANM_BCK_WAITHK_e}, }; - if (mEquipItem == fpcNm_ITEM_KANTERA) { + if (mEquipItem == dItemNo_KANTERA_e) { if (i_anmID == ANM_WAIT) { return &kandelaarAnm[0]; } @@ -6881,7 +6881,7 @@ const daAlink_BckData* daAlink_c::getMainBckData(daAlink_c::daAlink_ANM i_anmID) } if ((mEquipItem == 0x103 && i_anmID < ANM_STEP_TURN && i_anmID >= ANM_ATN_WAIT_LEFT) || - (i_anmID == ANM_SWIM_WAIT && mEquipItem != fpcNm_ITEM_NONE)) + (i_anmID == ANM_SWIM_WAIT && mEquipItem != dItemNo_NONE_e)) { return &m_mainBckSword[i_anmID - ANM_ATN_WAIT_LEFT]; } @@ -9152,7 +9152,7 @@ void daAlink_c::setSandShapeOffset() { } bool daAlink_c::checkLv2MiddleBossBgRide(s16 i_procName) { - return i_procName == PROC_OBJ_MSIMA || i_procName == PROC_B_ZANTS; + return i_procName == fpcNm_OBJ_MSIMA_e || i_procName == fpcNm_B_ZANTS_e; } bool daAlink_c::getSlidePolygon(cM3dGPla* o_tripla) { @@ -9168,7 +9168,7 @@ bool daAlink_c::getSlidePolygon(cM3dGPla* o_tripla) { s16 movebg_actorName = getMoveBGActorName(mLinkAcch.m_gnd, TRUE); if (dComIfG_Bgsp().GetTriPla(mLinkAcch.m_gnd, o_tripla) - && (!checkBootsOrArmorHeavy() || (movebg_actorName != PROC_Obj_RotStair && movebg_actorName != PROC_Obj_Lv3R10Saka)) + && (!checkBootsOrArmorHeavy() || (movebg_actorName != fpcNm_Obj_RotStair_e && movebg_actorName != fpcNm_Obj_Lv3R10Saka_e)) && ((mGroundCode != 8 && (mGndPolySpecialCode == 1 || (o_tripla->mNormal.y < field_0x3470 && mGndPolySpecialCode != 2))) || (mGndPolySpecialCode == 5 && !checkWolf() && (!checkInputOnR() || mProcID == PROC_SLIDE) && (o_tripla->mNormal.y < cM_scos(field_0x3122))) || (!checkEquipHeavyBoots() @@ -9632,8 +9632,8 @@ BOOL daAlink_c::checkAtnWaitAnime() { if ((mTargetedActor != NULL && (checkEnemyGroup(mTargetedActor) || checkGoatCatchActor(mTargetedActor) - || fopAcM_GetName(mTargetedActor) == PROC_CROD - || fopAcM_GetName(mTargetedActor) == PROC_BOOMERANG + || fopAcM_GetName(mTargetedActor) == fpcNm_CROD_e + || fopAcM_GetName(mTargetedActor) == fpcNm_BOOMERANG_e ) ) || (checkGrabAnimeUp() @@ -10227,7 +10227,7 @@ BOOL daAlink_c::setTalkStatus() { if (field_0x27f4->attention_info.flags & fopAc_AttnFlag_UNK_0x800000) { setDoStatus(BUTTON_STATUS_LISTEN); } else if (field_0x27f4->attention_info.flags & fopAc_AttnFlag_TALKCHECK_e) { - if (fopAcM_GetName(field_0x27f4) == PROC_OBJ_SSDRINK) { + if (fopAcM_GetName(field_0x27f4) == fpcNm_OBJ_SSDRINK_e) { setDoStatus(BUTTON_STATUS_DRINK); } else { setDoStatus(BUTTON_STATUS_CHECK); @@ -10261,7 +10261,7 @@ void daAlink_c::decideCommonDoStatus() { if (checkRoomOnly() && !checkWolf() && !isFshopStage) { if ((checkNoUpperAnime() || checkIronBallWaitAnime()) && - (mEquipItem != fpcNm_ITEM_NONE && checkModeFlg(4) && mEquipItem != 0x102)) + (mEquipItem != dItemNo_NONE_e && checkModeFlg(4) && mEquipItem != 0x102)) { if (checkCopyRodControllAnime()) { setDoStatus(BUTTON_STATUS_QUIT); @@ -10281,7 +10281,7 @@ void daAlink_c::decideCommonDoStatus() { setDoStatusEmphasys(BUTTON_STATUS_JUMP); } else { if (mTargetedActor != NULL) { - if (fopAcM_GetName(mTargetedActor) == PROC_Tag_Wljump) { + if (fopAcM_GetName(mTargetedActor) == fpcNm_Tag_Wljump_e) { if (static_cast(mTargetedActor)->getLockPos() != NULL) { if (!getMidnaActor()->checkNoInput()) { setDoStatus(BUTTON_STATUS_UNK_147); @@ -10346,7 +10346,7 @@ void daAlink_c::decideCommonDoStatus() { } } else if (((checkNoUpperAnime()) || checkIronBallWaitAnime() || checkCopyRodControllAnime()) && - mEquipItem != fpcNm_ITEM_NONE && checkModeFlg(4) && mStickValue <= frontRollRate) + mEquipItem != dItemNo_NONE_e && checkModeFlg(4) && mStickValue <= frontRollRate) { if (mEquipItem == 0x102) { if (checkAttentionState()) { @@ -10426,34 +10426,34 @@ void daAlink_c::decideDoStatus() { (!checkWolf() || static_cast(field_0x27f4)->checkSmallTbox()))) { setDoStatus(BUTTON_STATUS_OPEN); - } else if (mAttList->mType == fopAc_attn_ETC_e && actor_name == PROC_KYTAG05) { + } else if (mAttList->mType == fopAc_attn_ETC_e && actor_name == fpcNm_KYTAG05_e) { setDoStatus(BUTTON_STATUS_UNK_137); } else if (checkWolf()) { if (mAttList->mType == fopAc_attn_CARRY_e && !fopAcM_checkCarryNow(field_0x27f4) && fopAcM_CheckCarryType(field_0x27f4, fopAcM_CARRY_LIGHT)) { - if (actor_name == PROC_B_MGN) { + if (actor_name == fpcNm_B_MGN_e) { setDoStatus(BUTTON_STATUS_UNK_145); - } else if (actor_name == PROC_Obj_Yobikusa) { + } else if (actor_name == fpcNm_Obj_Yobikusa_e) { setDoStatusEmphasys(BUTTON_STATUS_HOWL); - } else if (actor_name == PROC_Obj_Stone) { + } else if (actor_name == fpcNm_Obj_Stone_e) { setDoStatus(BUTTON_STATUS_ROLL); - } else if (actor_name == PROC_Obj_Drop || actor_name == PROC_Obj_Sword || - actor_name == PROC_Obj_SmallKey) + } else if (actor_name == fpcNm_Obj_Drop_e || actor_name == fpcNm_Obj_Sword_e || + actor_name == fpcNm_Obj_SmallKey_e) { setDoStatusEmphasys(BUTTON_STATUS_UNK_57); } else if (!checkGoatCatchActor(field_0x27f4) && !checkGrabLineCheck()) { setDoStatusEmphasys(BUTTON_STATUS_PICK_UP); } } else if (mTargetedActor != NULL && - fopAcM_GetName(mTargetedActor) == PROC_B_MGN && + fopAcM_GetName(mTargetedActor) == fpcNm_B_MGN_e && mAttention->getActionBtnB() != NULL && mAttention->getActionBtnB()->mType == fopAc_attn_CARRY_e && mAttention->getActionBtnB()->getActor() == mTargetedActor) { setDoStatus(BUTTON_STATUS_UNK_145); } else if (mTargetedActor != NULL && - fopAcM_GetName(mTargetedActor) == PROC_E_YM && + fopAcM_GetName(mTargetedActor) == fpcNm_E_YM_e && mAttention->getActionBtnB() != NULL && mAttention->getActionBtnB()->mType == fopAc_attn_ETC_e && mAttention->getActionBtnB()->getActor() == mTargetedActor) @@ -10463,25 +10463,25 @@ void daAlink_c::decideDoStatus() { setWolfDigStatus(BUTTON_STATUS_FLAG_EMPHASIS); } } else if (mAttList->mType == fopAc_attn_ETC_e && field_0x27f4 != NULL) { - if (actor_name == PROC_Obj_Digpl || actor_name == PROC_Obj_Digholl || - actor_name == PROC_Obj_DigSnow || actor_name == PROC_Obj_Lv4DigSand || - actor_name == PROC_E_YM) + if (actor_name == fpcNm_Obj_Digpl_e || actor_name == fpcNm_Obj_Digholl_e || + actor_name == fpcNm_Obj_DigSnow_e || actor_name == fpcNm_Obj_Lv4DigSand_e || + actor_name == fpcNm_E_YM_e) { onEndResetFlg1(ERFLG1_UNK_100000); if (mWolfEyeUp != 0) { setWolfDigStatus(BUTTON_STATUS_FLAG_EMPHASIS); } - } else if (actor_name == PROC_TAG_HOWL || - actor_name == PROC_Obj_WindStone || - actor_name == PROC_Obj_SmWStone || - actor_name == PROC_Tag_WaraHowl) + } else if (actor_name == fpcNm_TAG_HOWL_e || + actor_name == fpcNm_Obj_WindStone_e || + actor_name == fpcNm_Obj_SmWStone_e || + actor_name == fpcNm_Tag_WaraHowl_e) { setDoStatusEmphasys(BUTTON_STATUS_HOWL); - } else if (actor_name == PROC_KYTAG03) { + } else if (actor_name == fpcNm_KYTAG03_e) { setDoStatusEmphasys(BUTTON_STATUS_SNIFF); } } else if (mTargetedActor != NULL && field_0x27f4 == mTargetedActor && - actor_name == PROC_Obj_Wchain) + actor_name == fpcNm_Obj_Wchain_e) { setDoStatusEmphasys(BUTTON_STATUS_UNK_123); } else { @@ -10489,17 +10489,17 @@ void daAlink_c::decideDoStatus() { } } else if (mAttList->mType == fopAc_attn_ETC_e) { if ((!checkMagicArmorHeavy() && - (actor_name == PROC_HORSE || actor_name == PROC_E_WB) && + (actor_name == fpcNm_HORSE_e || actor_name == fpcNm_E_WB_e) && checkReinRideBgCheck()) || - actor_name == PROC_CANOE || actor_name == PROC_Obj_IceLeaf) + actor_name == fpcNm_CANOE_e || actor_name == fpcNm_Obj_IceLeaf_e) { setDoStatus(BUTTON_STATUS_GET_ON); - } else if (actor_name == PROC_COW) { + } else if (actor_name == fpcNm_COW_e) { setDoStatus(BUTTON_STATUS_PET); - } else if (actor_name == PROC_Obj_YIblltray) { + } else if (actor_name == fpcNm_Obj_YIblltray_e) { setDoStatusEmphasys(BUTTON_STATUS_UNK_153); - } else if (actor_name == PROC_Tag_Lv6Gate || - (actor_name == PROC_TAG_KMSG && + } else if (actor_name == fpcNm_Tag_Lv6Gate_e || + (actor_name == fpcNm_TAG_KMSG_e && static_cast(field_0x27f4)->getType() == 3)) { if (!checkEquipAnime() && checkMasterSwordEquip()) { @@ -10519,15 +10519,15 @@ void daAlink_c::decideDoStatus() { } else if (!checkMagneBootsOn()) { if (checkInsectActorName(field_0x27f4)) { setDoStatusEmphasys(BUTTON_STATUS_UNK_152); - } else if (actor_name == PROC_Obj_SmallKey) { + } else if (actor_name == fpcNm_Obj_SmallKey_e) { setDoStatusEmphasys(BUTTON_STATUS_UNK_57); } else if (!checkGrabLineCheck()) { - if (actor_name == PROC_Obj_Yobikusa) { + if (actor_name == fpcNm_Obj_Yobikusa_e) { setDoStatus(BUTTON_STATUS_PICK); } else if (fopAcM_CheckCarryType(field_0x27f4, fopAcM_CARRY_TYPE_8)) { setDoStatusEmphasys(BUTTON_STATUS_UNK_52); - } else if (actor_name != PROC_B_MGN) { + } else if (actor_name != fpcNm_B_MGN_e) { setDoStatusEmphasys(BUTTON_STATUS_UNK_31); } } @@ -10832,7 +10832,7 @@ BOOL daAlink_c::checkAutoJumpAction() { sp18 = 60.0f; } - if (dComIfGs_getLife() != 0 || dComIfGs_checkBottle(fpcNm_ITEM_FAIRY)) { + if (dComIfGs_getLife() != 0 || dComIfGs_checkBottle(dItemNo_FAIRY_e)) { if (!checkGoronSideMove() && (!checkNotAutoJumpStage() || checkWolf())) { if (field_0x3178 != 3 && !checkEndResetFlg0(ERFLG0_NOT_AUTO_JUMP)) { if (sp14 >= sp10 @@ -11064,9 +11064,9 @@ BOOL daAlink_c::checkFrontWallTypeAction() { int daAlink_c::checkItemActionInitStart() { if (checkBowAndSlingItem(mEquipItem)) { return checkNextActionBow(); - } else if (mEquipItem == fpcNm_ITEM_BOOMERANG) { + } else if (mEquipItem == dItemNo_BOOMERANG_e) { return checkNextActionBoomerang(); - } else if (mEquipItem == fpcNm_ITEM_COPY_ROD) { + } else if (mEquipItem == dItemNo_COPY_ROD_e) { if (mCopyRodAcKeep.getActor() == NULL) { return checkNextActionCopyRod(); } @@ -11077,13 +11077,13 @@ int daAlink_c::checkItemActionInitStart() { } else if (checkFishingRodItem(mEquipItem)) { onResetFlg1(RFLG0_FISHINGROD_USE_START); return 1; - } else if (mEquipItem == fpcNm_ITEM_IRONBALL) { + } else if (mEquipItem == dItemNo_IRONBALL_e) { if (!checkIronBallAnime()) { return checkNextActionIronBall(); } - } else if (mEquipItem == fpcNm_ITEM_EMPTY_BOTTLE) { + } else if (mEquipItem == dItemNo_EMPTY_BOTTLE_e) { return procBottleSwingInit(NULL, 0); - } else if (mEquipItem == fpcNm_ITEM_KANTERA) { + } else if (mEquipItem == dItemNo_KANTERA_e) { if (!checkModeFlg(0x400)) { return procKandelaarSwingInit(); } @@ -11143,7 +11143,7 @@ int daAlink_c::cancelUpperItemReadyAnime(BOOL param_0) { { seStartSystem(Z2SE_SY_ITEM_USE_CANCEL); - if (mEquipItem == fpcNm_ITEM_IRONBALL) { + if (mEquipItem == dItemNo_IRONBALL_e) { mItemVar0.field_0x3018 = 8; procIronBallReturnInit(); } else { @@ -11164,7 +11164,7 @@ BOOL daAlink_c::checkItemActorPointer() { mItemAcKeep.clearData(); resetUpperAnime(UPPER_2, -1.0f); - mEquipItem = fpcNm_ITEM_NONE; + mEquipItem = dItemNo_NONE_e; if (checkModeFlg(MODE_RIDING)) { if (checkCanoeRide()) { @@ -11210,9 +11210,9 @@ bool daAlink_c::checkSwordTwirlAction() { BOOL daAlink_c::checkUpperItemActionFly() { if (checkBowAndSlingItem(mEquipItem)) { checkUpperItemActionBowFly(); - } else if (mEquipItem == fpcNm_ITEM_BOOMERANG) { + } else if (mEquipItem == dItemNo_BOOMERANG_e) { checkUpperItemActionBoomerangFly(); - } else if (mEquipItem == fpcNm_ITEM_COPY_ROD) { + } else if (mEquipItem == dItemNo_COPY_ROD_e) { checkUpperItemActionCopyRodFly(); } @@ -11220,7 +11220,7 @@ BOOL daAlink_c::checkUpperItemActionFly() { } void daAlink_c::checkItemButtonChange() { - if (mProcID != PROC_CANOE_PADDLE_PUT && mEquipItem != fpcNm_ITEM_NONE && !checkEquipAnime()) { + if (mProcID != PROC_CANOE_PADDLE_PUT && mEquipItem != dItemNo_NONE_e && !checkEquipAnime()) { u8 temp_r0; for (u8 i = 0; i < 2; i++) { temp_r0 = (i + 1) % 2; @@ -11236,9 +11236,9 @@ void daAlink_c::checkItemButtonChange() { BOOL daAlink_c::checkUpperItemAction() { if (checkNoUpperAnime()) { if (checkModeFlg(0x1000)) { - if (mEquipItem == fpcNm_ITEM_IRONBALL) { + if (mEquipItem == dItemNo_IRONBALL_e) { setIronBallWaitUpperAnime(0); - } else if (mEquipItem == fpcNm_ITEM_COPY_ROD) { + } else if (mEquipItem == dItemNo_COPY_ROD_e) { setCopyRodControllAnime(); } } @@ -11350,9 +11350,9 @@ BOOL daAlink_c::checkUpperItemAction() { if (checkUpperItemActionIronBall()) { return true; } - } else if (mEquipItem == fpcNm_ITEM_IRONBALL) { + } else if (mEquipItem == dItemNo_IRONBALL_e) { setIronBallWaitUpperAnime(0); - } else if (mEquipItem == fpcNm_ITEM_COPY_ROD) { + } else if (mEquipItem == dItemNo_COPY_ROD_e) { setCopyRodControllAnime(); } @@ -11412,7 +11412,7 @@ int daAlink_c::orderTalk(int i_checkZTalk) { static void* daAlink_searchBouDoor(fopAc_ac_c* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_GetName(i_actor) == PROC_NPC_BOU && ((daNpc_Bou_c*)i_actor)->speakTo()) { + if (fopAcM_GetName(i_actor) == fpcNm_NPC_BOU_e && ((daNpc_Bou_c*)i_actor)->speakTo()) { return i_actor; } @@ -11422,7 +11422,7 @@ static void* daAlink_searchBouDoor(fopAc_ac_c* i_actor, void* i_data) { static void* daAlink_searchKolin(fopAc_ac_c* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_GetName(i_actor) == PROC_NPC_KOLIN && ((daNpc_Kolin_c*)i_actor)->orderNoRideEvt()) { + if (fopAcM_GetName(i_actor) == fpcNm_NPC_KOLIN_e && ((daNpc_Kolin_c*)i_actor)->orderNoRideEvt()) { return i_actor; } @@ -11459,7 +11459,7 @@ int daAlink_c::orderZTalk() { ) { if (zhint != NULL) { - if (fopAcM_GetName(zhint) == PROC_Tag_Mhint && ((daTagMhint_c*)zhint)->checkEventID()) { + if (fopAcM_GetName(zhint) == fpcNm_Tag_Mhint_e && ((daTagMhint_c*)zhint)->checkEventID()) { fopAcM_orderOtherEventId(zhint, ((daTagMhint_c*)zhint)->getEventID(), ((daTagMhint_c*)zhint)->getToolEventID(), 0xFFFF, 0, 1); } else { fopAcM_orderTalkEvent(this, zhint, 0, 0); @@ -11528,11 +11528,11 @@ int daAlink_c::checkNormalAction() { } if (dComIfGp_getDoStatus() == BUTTON_STATUS_GET_ON) { - if (fopAcM_GetName(field_0x27f4) == PROC_Obj_IceLeaf) { + if (fopAcM_GetName(field_0x27f4) == fpcNm_Obj_IceLeaf_e) { return procBoardRideInit(); } - if (fopAcM_GetName(field_0x27f4) == PROC_CANOE) { + if (fopAcM_GetName(field_0x27f4) == fpcNm_CANOE_e) { if (checkModeFlg(0x40000)) { return procCanoeRideInit(); } else { @@ -11585,7 +11585,7 @@ int daAlink_c::checkNormalAction() { } if (dComIfGp_getDoStatus() == BUTTON_STATUS_STRIKE) { - if (fopAcM_GetName(field_0x27f4) == PROC_Tag_Lv6Gate) { + if (fopAcM_GetName(field_0x27f4) == fpcNm_Tag_Lv6Gate_e) { static_cast(field_0x27f4)->stabMasterSword(); } else { static_cast(field_0x27f4)->stabMasterSword(); @@ -11662,7 +11662,7 @@ int daAlink_c::checkNormalAction() { bool daAlink_c::checkReadyItem() { #if PLATFORM_GCN - if (mEquipItem == fpcNm_ITEM_NONE) { + if (mEquipItem == dItemNo_NONE_e) { return false; } #endif @@ -11693,7 +11693,7 @@ BOOL daAlink_c::checkItemAction() { } if ((checkEndResetFlg1(ERFLG1_UNK_100000) || mTargetedActor == NULL) && wolfClawTrigger()) { - if (checkEndResetFlg1(ERFLG1_UNK_100000) && field_0x27f4 != NULL && fopAcM_GetName(field_0x27f4) == PROC_Obj_Digholl) { + if (checkEndResetFlg1(ERFLG1_UNK_100000) && field_0x27f4 != NULL && fopAcM_GetName(field_0x27f4) == fpcNm_Obj_Digholl_e) { return procWolfDigThroughInit(0); } @@ -11974,7 +11974,7 @@ void daAlink_c::swordUnequip() { } void daAlink_c::itemEquip(u16 i_itemID) { - if (mThrowBoomerangAcKeep.getActor() == NULL || i_itemID != fpcNm_ITEM_BOOMERANG) { + if (mThrowBoomerangAcKeep.getActor() == NULL || i_itemID != dItemNo_BOOMERANG_e) { field_0x2fde = i_itemID; dComIfGp_clearPlayerStatus0(0, 0x400000); offNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER); @@ -11992,8 +11992,8 @@ void daAlink_c::itemUnequip(u16 i_itemID, f32 i_playSpeed) { u16 anm_id; const daAlinkHIO_anm_c* anm_data; - if (i_itemID == fpcNm_ITEM_BOOMERANG || i_itemID == fpcNm_ITEM_COPY_ROD || i_itemID == fpcNm_ITEM_KANTERA || - i_itemID == fpcNm_ITEM_HOOKSHOT || checkBottleItem(i_itemID)) + if (i_itemID == dItemNo_BOOMERANG_e || i_itemID == dItemNo_COPY_ROD_e || i_itemID == dItemNo_KANTERA_e || + i_itemID == dItemNo_HOOKSHOT_e || checkBottleItem(i_itemID)) { anm_id = dRes_ID_ALANM_BCK_TAKEL_e; anm_data = &mpHIO->mItem.m.mOneHandEquipAnm; @@ -12030,14 +12030,14 @@ bool daAlink_c::checkFastUnequip() { void daAlink_c::allUnequip(BOOL param_0) { if (checkNoResetFlg2(FLG2_UNK_1) && param_0 && !checkCanoeRide() && - mEquipItem != fpcNm_ITEM_KANTERA) + mEquipItem != dItemNo_KANTERA_e) { for (u8 i = 0; i < 2; i++) { - if (dComIfGp_getSelectItem(i) == fpcNm_ITEM_KANTERA) { + if (dComIfGp_getSelectItem(i) == dItemNo_KANTERA_e) { mSelectItemId = i; } } - itemEquip(fpcNm_ITEM_KANTERA); + itemEquip(dItemNo_KANTERA_e); onNoResetFlg1(FLG1_UNK_40); return; } else if (mEquipItem == 0x103) { @@ -12062,7 +12062,7 @@ BOOL daAlink_c::checkItemChangeFromButton() { { if ( #if PLATFORM_GCN - dComIfGs_getSelectEquipSword() != fpcNm_ITEM_NONE && + dComIfGs_getSelectEquipSword() != dItemNo_NONE_e && #endif !checkNotBattleStage() && !checkCanoeRide() @@ -12093,7 +12093,7 @@ BOOL daAlink_c::checkItemChangeFromButton() { } if (doTrigger() && dComIfGp_getDoStatus() == BUTTON_STATUS_PUT_AWAY) { - if (mEquipItem != fpcNm_ITEM_KANTERA && checkNoResetFlg2(FLG2_UNK_1)) { + if (mEquipItem != dItemNo_KANTERA_e && checkNoResetFlg2(FLG2_UNK_1)) { offKandelaarModel(); } else if (mSwordFlourishTimer != 0 && mEquipItem == 0x103 && !checkWoodSwordEquip() && !checkModeFlg(0x402)) @@ -12102,18 +12102,18 @@ BOOL daAlink_c::checkItemChangeFromButton() { } else { allUnequip(TRUE); } - } else if (mEquipItem == fpcNm_ITEM_NONE && mThrowBoomerangAcKeep.getActor() == NULL && + } else if (mEquipItem == dItemNo_NONE_e && mThrowBoomerangAcKeep.getActor() == NULL && !checkCanoeRide() && checkNoUpperAnime() && checkNoResetFlg2(FLG2_UNK_1)) { for (i = 0; i < 2; i++) { - if (dComIfGp_getSelectItem(i) == fpcNm_ITEM_KANTERA) { + if (dComIfGp_getSelectItem(i) == dItemNo_KANTERA_e) { mSelectItemId = i; } } - itemEquip(fpcNm_ITEM_KANTERA); + itemEquip(dItemNo_KANTERA_e); onNoResetFlg1(FLG1_UNK_40); - } else if (mEquipItem != 0x103 && mEquipItem != fpcNm_ITEM_NONE && mEquipItem != 0x10B && + } else if (mEquipItem != 0x103 && mEquipItem != dItemNo_NONE_e && mEquipItem != 0x10B && mEquipItem != 0x102 && (!checkCanoeRide() || !checkFisingRodLure())) { if (!checkEventRun() || strcmp(dComIfGp_getEventManager().getRunEventName(), "ANGER") != 0) { @@ -12358,11 +12358,11 @@ int daAlink_c::checkNextAction(int param_0) { } void daAlink_c::commonChangeItem() { - if (mEquipItem == fpcNm_ITEM_KANTERA && field_0x2fde == 0xFF && (mProcID != PROC_PREACTION_UNEQUIP || mProcVar4.field_0x3010 != 0)) { + if (mEquipItem == dItemNo_KANTERA_e && field_0x2fde == 0xFF && (mProcID != PROC_PREACTION_UNEQUIP || mProcVar4.field_0x3010 != 0)) { offKandelaarModel(); } - if ((mEquipItem == fpcNm_ITEM_NONE && field_0x2fde != 0x103) || (mEquipItem == 0x103 && field_0x2fde != 0xFF)) { + if ((mEquipItem == dItemNo_NONE_e && field_0x2fde != 0x103) || (mEquipItem == 0x103 && field_0x2fde != 0xFF)) { seStartOnlyReverb(Z2SE_AL_ITEM_TAKEOUT); } @@ -12380,7 +12380,7 @@ void daAlink_c::commonChangeItem() { } BOOL var_r30; - if (mEquipItem != fpcNm_ITEM_NONE) { + if (mEquipItem != dItemNo_NONE_e) { var_r30 = true; deleteEquipItem(TRUE, FALSE); } else { @@ -12388,7 +12388,7 @@ void daAlink_c::commonChangeItem() { } mEquipItem = field_0x2fde; - field_0x2fde = fpcNm_ITEM_NONE; + field_0x2fde = dItemNo_NONE_e; if (checkReinRide()) { field_0x2060->initOldFrameMorf(3.0f, 0, 0x23); @@ -12419,7 +12419,7 @@ void daAlink_c::commonChangeItem() { } void daAlink_c::setItemAction() { - if (mEquipItem == fpcNm_ITEM_IRONBALL) { + if (mEquipItem == dItemNo_IRONBALL_e) { checkIronBallDelete(); } @@ -13455,13 +13455,13 @@ void daAlink_c::setLastSceneMode(u32* o_mode) { *o_mode |= 0x800000; } - if (checkNoResetFlg2(FLG2_UNK_1) && mEquipItem != fpcNm_ITEM_KANTERA) { + if (checkNoResetFlg2(FLG2_UNK_1) && mEquipItem != dItemNo_KANTERA_e) { *o_mode |= 0x200000; } if (mEquipItem == 0x103) { *o_mode |= 0x28000000; - } else if (mEquipItem < fpcNm_ITEM_NONE) { + } else if (mEquipItem < dItemNo_NONE_e) { *o_mode |= mEquipItem << 0x18; } @@ -13541,7 +13541,7 @@ void daAlink_c::checkRoofRestart() { && (mProcID != PROC_CRAWL_START && mProcID != PROC_CRAWL_END && !checkCoachGuardGame())) { s16 bg_actorName = getMoveBGActorName(mLinkAcch.m_roof, TRUE); - if (bg_actorName == PROC_OBJ_SO || bg_actorName == PROC_Obj_SCannon) { + if (bg_actorName == fpcNm_OBJ_SO_e || bg_actorName == fpcNm_Obj_SCannon_e) { return; } @@ -13807,7 +13807,7 @@ int daAlink_c::checkSceneChange(int i_exitID) { (int)fopAcM_GetRoomNo(this), shape_angle.y, -1); if (isScnChange) { onNoResetFlg2(FLG2_SCENE_CHANGE_START); - if (mpScnChg != NULL && fopAcM_GetName(mpScnChg) == PROC_SCENE_EXIT) { + if (mpScnChg != NULL && fopAcM_GetName(mpScnChg) == fpcNm_SCENE_EXIT_e) { mpScnChg->setSceneChangeOK(); } } @@ -13972,7 +13972,7 @@ BOOL daAlink_c::checkSightLine(f32 i_maxDist, cXyz* o_sightPos) { cXyz sp3C; cXyz sp30(mHeldItemRootPos); - if (checkHookshotItem(mEquipItem) || mEquipItem == fpcNm_ITEM_PACHINKO) { + if (checkHookshotItem(mEquipItem) || mEquipItem == dItemNo_PACHINKO_e) { line_start_pos = &sp30; } else if (checkBowItem(mEquipItem) && mItemAcKeep.getActor() != NULL) { line_start_pos = &mItemAcKeep.getActor()->current.pos; @@ -13999,12 +13999,12 @@ BOOL daAlink_c::checkSightLine(f32 i_maxDist, cXyz* o_sightPos) { } sp30 -= sp3C * 100.0f; - } else if (mEquipItem == fpcNm_ITEM_COPY_ROD) { + } else if (mEquipItem == dItemNo_COPY_ROD_e) { return 0; } dBgS_LinChk* linechk; - if (mEquipItem == fpcNm_ITEM_BOOMERANG) { + if (mEquipItem == dItemNo_BOOMERANG_e) { linechk = &mBoomerangLinChk; } else if (mProcID == PROC_HAWK_SUBJECT) { linechk = &mLinkLinChk; @@ -14054,7 +14054,7 @@ void daAlink_c::keepItemData() { void daAlink_c::returnKeepItemData() { deleteEquipItem(FALSE, FALSE); mEquipItem = mKeepItem; - mKeepItem = fpcNm_ITEM_NONE; + mKeepItem = dItemNo_NONE_e; makeItemType(); } @@ -14064,12 +14064,12 @@ BOOL daAlink_c::setItemModel() { return 1; } - if (mEquipItem == fpcNm_ITEM_PACHINKO) { + if (mEquipItem == dItemNo_PACHINKO_e) { setSlingModel(); return 1; } - if (mEquipItem == fpcNm_ITEM_COPY_ROD) { + if (mEquipItem == dItemNo_COPY_ROD_e) { setCopyRodModel(); if (mCopyRodAcKeep.getActor() == NULL) { return FALSE; @@ -14078,12 +14078,12 @@ BOOL daAlink_c::setItemModel() { } } - if (mEquipItem == fpcNm_ITEM_KANTERA) { + if (mEquipItem == dItemNo_KANTERA_e) { setKandelaarModel(); return 1; } - if (mEquipItem == fpcNm_ITEM_EMPTY_BOTTLE) { + if (mEquipItem == dItemNo_EMPTY_BOTTLE_e) { setBottleModel(mEquipItem); return 1; } @@ -14098,7 +14098,7 @@ BOOL daAlink_c::setItemModel() { return 1; } - if (mEquipItem == fpcNm_ITEM_IRONBALL) { + if (mEquipItem == dItemNo_IRONBALL_e) { setIronBallModel(); setIronBallWaitUpperAnime(1); if (mItemAcKeep.getActor() == NULL) { @@ -14113,8 +14113,8 @@ BOOL daAlink_c::setItemModel() { BOOL daAlink_c::setItemActor() { fopAc_ac_c* actor; - if (mEquipItem == fpcNm_ITEM_BOOMERANG) { - actor = (fopAc_ac_c*)fopAcM_fastCreate(PROC_BOOMERANG, 0, ¤t.pos, -1, + if (mEquipItem == dItemNo_BOOMERANG_e) { + actor = (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_BOOMERANG_e, 0, ¤t.pos, -1, NULL, NULL, -1, NULL, NULL); if (actor == NULL) { deleteEquipItem(FALSE, FALSE); @@ -14126,8 +14126,8 @@ BOOL daAlink_c::setItemActor() { return 1; } - if (mEquipItem == fpcNm_ITEM_COPY_ROD) { - actor = (fopAc_ac_c*)fopAcM_fastCreate(PROC_CROD, 0, ¤t.pos, -1, NULL, + if (mEquipItem == dItemNo_COPY_ROD_e) { + actor = (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_CROD_e, 0, ¤t.pos, -1, NULL, NULL, -1, NULL, NULL); if (actor == NULL) { deleteEquipItem(FALSE, FALSE); @@ -14139,7 +14139,7 @@ BOOL daAlink_c::setItemActor() { return 1; } - if (mEquipItem == fpcNm_ITEM_IRONBALL) { + if (mEquipItem == dItemNo_IRONBALL_e) { actor = daCrod_c::makeIronBallDummy(this); if (actor == NULL) { @@ -14157,7 +14157,7 @@ BOOL daAlink_c::setItemActor() { } if (checkFisingRodLure()) { - mItemAcKeep.setID(fopAcM_create(PROC_MG_ROD, 0x10D, &mLeftHandPos, -1, NULL, NULL, 0xFF)); + mItemAcKeep.setID(fopAcM_create(fpcNm_MG_ROD_e, 0x10D, &mLeftHandPos, -1, NULL, NULL, 0xFF)); initFishingRodHand(); return 1; } @@ -14175,7 +14175,7 @@ BOOL daAlink_c::setItemActor() { #endif ) { - mEquipItem = fpcNm_ITEM_NONE; + mEquipItem = dItemNo_NONE_e; return 1; } } @@ -14183,7 +14183,7 @@ BOOL daAlink_c::setItemActor() { cXyz create_pos = (mLeftHandPos + mRightHandPos) * 0.5f; if (checkReadyItem()) { fopAc_ac_c* actor; - if (mEquipItem == fpcNm_ITEM_NORMAL_BOMB) { + if (mEquipItem == dItemNo_NORMAL_BOMB_e) { actor = dBomb_c::createNormalBombPlayer(&create_pos); } else { actor = dBomb_c::createWaterBombPlayer(&create_pos); @@ -14197,7 +14197,7 @@ BOOL daAlink_c::setItemActor() { setGrabUpperAnime(mpHIO->mBasic.m.mBasicInterpolation); } } - mEquipItem = fpcNm_ITEM_NONE; + mEquipItem = dItemNo_NONE_e; return 1; } @@ -14309,7 +14309,7 @@ BOOL daAlink_c::checkGroupItem(int i_itemNo, int i_selItem) const { int daAlink_c::checkSetItemTrigger(int i_itemNo) { for (u8 i = 0; i < 2; i++) { if (checkGroupItem(i_itemNo, dComIfGp_getSelectItem(i)) && itemTriggerCheck(1 << i)) { - if (i_itemNo != fpcNm_ITEM_HVY_BOOTS) { + if (i_itemNo != dItemNo_HVY_BOOTS_e) { mSelectItemId = i; } return 1; @@ -14385,13 +14385,13 @@ bool daAlink_c::checkNotAutoJumpStage() { bool daAlink_c::checkCastleTownUseItem(u16 i_itemNo) { if (checkNotBattleStage()) { - if (i_itemNo == fpcNm_ITEM_KANTERA + if (i_itemNo == dItemNo_KANTERA_e || checkTradeItem(i_itemNo) - || (i_itemNo == fpcNm_ITEM_DUNGEON_BACK && checkLv7DungeonShop()) - || (checkRoomSpecial() && (i_itemNo == fpcNm_ITEM_EMPTY_BOTTLE || checkDungeonWarpItem(i_itemNo))) - || (checkStageName("R_SP128") && i_itemNo == fpcNm_ITEM_COPY_ROD) - || (checkLv2DungeonRoomSpecial() && i_itemNo == fpcNm_ITEM_HVY_BOOTS) - || (checkBottleItem(i_itemNo) && i_itemNo != fpcNm_ITEM_EMPTY_BOTTLE)) + || (i_itemNo == dItemNo_DUNGEON_BACK_e && checkLv7DungeonShop()) + || (checkRoomSpecial() && (i_itemNo == dItemNo_EMPTY_BOTTLE_e || checkDungeonWarpItem(i_itemNo))) + || (checkStageName("R_SP128") && i_itemNo == dItemNo_COPY_ROD_e) + || (checkLv2DungeonRoomSpecial() && i_itemNo == dItemNo_HVY_BOOTS_e) + || (checkBottleItem(i_itemNo) && i_itemNo != dItemNo_EMPTY_BOTTLE_e)) { return true; } else { @@ -14468,13 +14468,13 @@ int daAlink_c::changeItemTriggerKeepProc(u8 i_selItemIdx, int i_procType) { } else if (i_procType == ITEM_PROC_OFF_KANDELAAR) { offKandelaarModel(); } else if (i_procType == ITEM_PROC_COMMON_CHANGE_ITEM) { - field_0x2fde = fpcNm_ITEM_NONE; + field_0x2fde = dItemNo_NONE_e; itemEquip(sel_item); if (dComIfGp_checkPlayerStatus0(0, 0x2000) && ((checkBowAndSlingItem(field_0x2fde) || checkHookshotItem(field_0x2fde) || - field_0x2fde == fpcNm_ITEM_COPY_ROD) || - field_0x2fde == fpcNm_ITEM_BOOMERANG)) + field_0x2fde == dItemNo_COPY_ROD_e) || + field_0x2fde == dItemNo_BOOMERANG_e)) { commonChangeItem(); resetUpperAnime(UPPER_2, -1.0f); @@ -14495,30 +14495,30 @@ int daAlink_c::checkNewItemChange(u8 i_selItemIdx) { u16 sel_item = dComIfGp_getSelectItem(i_selItemIdx); if (checkSpinnerRide() - || sel_item == fpcNm_ITEM_BOMB_BAG_LV1 - || ((sel_item == fpcNm_ITEM_KANTERA || checkOilBottleItem(sel_item)) && checkWaterInKandelaarOffset(mWaterY)) + || sel_item == dItemNo_BOMB_BAG_LV1_e + || ((sel_item == dItemNo_KANTERA_e || checkOilBottleItem(sel_item)) && checkWaterInKandelaarOffset(mWaterY)) || (checkCanoeRide() && checkStageName("F_SP127")) || checkCloudSea() || ((checkModeFlg(0x40000) || checkNoResetFlg0(FLG0_WATER_IN_MOVE)) && !checkAcceptUseItemInWater(sel_item)) - || (checkModeFlg(0x40000) && sel_item == fpcNm_ITEM_WATER_BOMB) + || (checkModeFlg(0x40000) && sel_item == dItemNo_WATER_BOMB_e) || !checkCastleTownUseItem(sel_item) || (checkBoardRide() && sel_item != 0x103) - || (checkModeFlg(0x400) && (sel_item == fpcNm_ITEM_EMPTY_BOTTLE || sel_item == fpcNm_ITEM_POKE_BOMB || sel_item == fpcNm_ITEM_IRONBALL || sel_item == fpcNm_ITEM_COPY_ROD || checkFishingRodItem(sel_item))) - || ((mGndPolySpecialCode == dBgW_SPCODE_HEAVY_SNOW || mGndPolyAtt1 == 1 || mGndPolyAtt1 == 2 || mWaterY - current.pos.y > (daSpinner_c::getWaterSinkLimit() - 5.0f) || (field_0x2fbc == 6 && mWaterY - current.pos.y >= 0.0f) || mGndPolyAtt1 == 3) && sel_item == fpcNm_ITEM_SPINNER) + || (checkModeFlg(0x400) && (sel_item == dItemNo_EMPTY_BOTTLE_e || sel_item == dItemNo_POKE_BOMB_e || sel_item == dItemNo_IRONBALL_e || sel_item == dItemNo_COPY_ROD_e || checkFishingRodItem(sel_item))) + || ((mGndPolySpecialCode == dBgW_SPCODE_HEAVY_SNOW || mGndPolyAtt1 == 1 || mGndPolyAtt1 == 2 || mWaterY - current.pos.y > (daSpinner_c::getWaterSinkLimit() - 5.0f) || (field_0x2fbc == 6 && mWaterY - current.pos.y >= 0.0f) || mGndPolyAtt1 == 3) && sel_item == dItemNo_SPINNER_e) || (checkBossRoom() && checkDungeonWarpItem(sel_item)) - || (sel_item == fpcNm_ITEM_DUNGEON_EXIT && (checkLv7DungeonShop() || (checkStageName("D_MN07") && fopAcM_isSwitch(this, 0x4D) && !fopAcM_isSwitch(this, 0x18)) || (checkStageName("D_MN10") && fopAcM_GetRoomNo(this) == 15))) - || (checkMagneBootsOn() && sel_item != 0x103 && !checkDrinkBottleItem(sel_item) && sel_item != fpcNm_ITEM_HVY_BOOTS && !checkBowItem(sel_item)) + || (sel_item == dItemNo_DUNGEON_EXIT_e && (checkLv7DungeonShop() || (checkStageName("D_MN07") && fopAcM_isSwitch(this, 0x4D) && !fopAcM_isSwitch(this, 0x18)) || (checkStageName("D_MN10") && fopAcM_GetRoomNo(this) == 15))) + || (checkMagneBootsOn() && sel_item != 0x103 && !checkDrinkBottleItem(sel_item) && sel_item != dItemNo_HVY_BOOTS_e && !checkBowItem(sel_item)) ) { return ITEM_PROC_NONE; - } else if (sel_item == fpcNm_ITEM_HVY_BOOTS + } else if (sel_item == dItemNo_HVY_BOOTS_e || checkDungeonWarpItem(sel_item) || checkTradeItem(sel_item) - || (checkBottleItem(sel_item) && sel_item != fpcNm_ITEM_EMPTY_BOTTLE) - || sel_item == fpcNm_ITEM_SPINNER - || sel_item == fpcNm_ITEM_POKE_BOMB - || sel_item == fpcNm_ITEM_HORSE_FLUTE - || sel_item == fpcNm_ITEM_HAWK_EYE + || (checkBottleItem(sel_item) && sel_item != dItemNo_EMPTY_BOTTLE_e) + || sel_item == dItemNo_SPINNER_e + || sel_item == dItemNo_POKE_BOMB_e + || sel_item == dItemNo_HORSE_FLUTE_e + || sel_item == dItemNo_HAWK_EYE_e ) { if (checkReinRide() || checkCanoeRide()) { @@ -14526,10 +14526,10 @@ int daAlink_c::checkNewItemChange(u8 i_selItemIdx) { return ITEM_PROC_BOTTLE_DRINK; } - if (checkOilBottleItem(sel_item) && checkItemSetButton(fpcNm_ITEM_KANTERA) != 2) { + if (checkOilBottleItem(sel_item) && checkItemSetButton(dItemNo_KANTERA_e) != 2) { return ITEM_PROC_KANDELAAR_POUR; } - } else if (sel_item == fpcNm_ITEM_HVY_BOOTS) { + } else if (sel_item == dItemNo_HVY_BOOTS_e) { if (!checkBoardRide()) { if ((mLinkAcch.ChkGroundHit() && !checkModeFlg(0x70C52)) || (checkMagneBootsOn() && cBgW_CheckBGround(mMagneBootsTopVec.y)) || @@ -14545,7 +14545,7 @@ int daAlink_c::checkNewItemChange(u8 i_selItemIdx) { } } else if (mLinkAcch.ChkGroundHit()) { if (!checkModeFlg(0x70C52)) { - if (sel_item == fpcNm_ITEM_SPINNER) { + if (sel_item == dItemNo_SPINNER_e) { cXyz sp38(current.pos.x, current.pos.y + l_autoUpHeight, current.pos.z); cXyz sp2C(sp38); cXyz sp20; @@ -14572,17 +14572,17 @@ int daAlink_c::checkNewItemChange(u8 i_selItemIdx) { } else if (checkDungeonWarpItem(sel_item)) { return ITEM_PROC_DUNGEON_WARP_READY; } else if (checkItemSetButton(0x108) != 2 && - (sel_item == fpcNm_ITEM_WORM || sel_item == fpcNm_ITEM_BEE_CHILD)) + (sel_item == dItemNo_WORM_e || sel_item == dItemNo_BEE_CHILD_e)) { int itemNo = dComIfGp_getSelectItem(checkItemSetButton(0x108)); - if (itemNo == fpcNm_ITEM_WORM_ROD || itemNo == fpcNm_ITEM_JEWEL_WORM_ROD) { - if (sel_item == fpcNm_ITEM_BEE_CHILD) { + if (itemNo == dItemNo_WORM_ROD_e || itemNo == dItemNo_JEWEL_WORM_ROD_e) { + if (sel_item == dItemNo_BEE_CHILD_e) { return ITEM_PROC_BOTTLE_DRINK; } return ITEM_PROC_NONE; } - if (sel_item == fpcNm_ITEM_BEE_CHILD && - (itemNo == fpcNm_ITEM_BEE_ROD || itemNo == fpcNm_ITEM_JEWEL_BEE_ROD)) + if (sel_item == dItemNo_BEE_CHILD_e && + (itemNo == dItemNo_BEE_ROD_e || itemNo == dItemNo_JEWEL_BEE_ROD_e)) { return ITEM_PROC_BOTTLE_DRINK; } @@ -14593,15 +14593,15 @@ int daAlink_c::checkNewItemChange(u8 i_selItemIdx) { return ITEM_PROC_BOTTLE_OPEN; } else if (checkTradeItem(sel_item)) { return ITEM_PROC_NOT_USE_ITEM; - } else if (sel_item == fpcNm_ITEM_HORSE_FLUTE) { + } else if (sel_item == dItemNo_HORSE_FLUTE_e) { return ITEM_PROC_GRASS_WHISTLE; } else if (checkOilBottleItem(sel_item) && checkItemSetButton(0x48) != 2) { return ITEM_PROC_KANDELAAR_POUR; - } else if (sel_item == fpcNm_ITEM_HAWK_EYE) { + } else if (sel_item == dItemNo_HAWK_EYE_e) { if (acceptSubjectModeChange()) { return ITEM_PROC_SUBJECTIVITY; } - } else if (sel_item == fpcNm_ITEM_POKE_BOMB && dComIfGp_getSelectItemNum(i_selItemIdx) && + } else if (sel_item == dItemNo_POKE_BOMB_e && dComIfGp_getSelectItemNum(i_selItemIdx) && field_0x2fcf < 2) { return ITEM_PROC_PICK_PUT; @@ -14610,18 +14610,18 @@ int daAlink_c::checkNewItemChange(u8 i_selItemIdx) { (void)0; } } - } else if (sel_item != fpcNm_ITEM_NONE && mEquipItem != sel_item) { + } else if (sel_item != dItemNo_NONE_e && mEquipItem != sel_item) { if ((checkBombItem(sel_item) && !dComIfGp_getSelectItemNum(i_selItemIdx)) - || ((sel_item == fpcNm_ITEM_NORMAL_BOMB || sel_item == fpcNm_ITEM_WATER_BOMB) && mActiveBombNum >= 3) - || (sel_item == fpcNm_ITEM_IRONBALL && (!mLinkAcch.ChkGroundHit() || checkModeFlg(0x70C52))) - || (sel_item == fpcNm_ITEM_KANTERA && (checkNoResetFlg0(FLG0_WATER_IN_MOVE) || checkEndResetFlg1(ERFLG1_UNK_4) || checkModeFlg(0x40000)))) + || ((sel_item == dItemNo_NORMAL_BOMB_e || sel_item == dItemNo_WATER_BOMB_e) && mActiveBombNum >= 3) + || (sel_item == dItemNo_IRONBALL_e && (!mLinkAcch.ChkGroundHit() || checkModeFlg(0x70C52))) + || (sel_item == dItemNo_KANTERA_e && (checkNoResetFlg0(FLG0_WATER_IN_MOVE) || checkEndResetFlg1(ERFLG1_UNK_4) || checkModeFlg(0x40000)))) { return ITEM_PROC_NONE; } return ITEM_PROC_COMMON_CHANGE_ITEM; } - if (mEquipItem == sel_item && mSelectItemId != i_selItemIdx && mEquipItem == fpcNm_ITEM_EMPTY_BOTTLE) { + if (mEquipItem == sel_item && mSelectItemId != i_selItemIdx && mEquipItem == dItemNo_EMPTY_BOTTLE_e) { return ITEM_PROC_BOTTLE_SWING; } @@ -14631,11 +14631,11 @@ int daAlink_c::checkNewItemChange(u8 i_selItemIdx) { void daAlink_c::deleteEquipItem(BOOL i_isPlaySound, BOOL i_isDeleteKantera) { if (i_isDeleteKantera || mProcID == PROC_UNEQUIP) { offKandelaarModel(); - } else if (mEquipItem == fpcNm_ITEM_KANTERA && checkNoResetFlg2(FLG2_UNK_1)) { + } else if (mEquipItem == dItemNo_KANTERA_e && checkNoResetFlg2(FLG2_UNK_1)) { mZ2Link.setKanteraState(2); } - if (mEquipItem == fpcNm_ITEM_NONE || mEquipItem == 0x10B) { + if (mEquipItem == dItemNo_NONE_e || mEquipItem == 0x10B) { return; } @@ -14648,7 +14648,7 @@ void daAlink_c::deleteEquipItem(BOOL i_isPlaySound, BOOL i_isDeleteKantera) { } else { seStartOnlyReverb(Z2SE_AL_SWORD_PUTIN); } - } else if (mEquipItem < fpcNm_ITEM_NONE) { + } else if (mEquipItem < dItemNo_NONE_e) { seStartOnlyReverb(Z2SE_AL_ITEM_TAKEOUT); } } @@ -14671,16 +14671,16 @@ void daAlink_c::deleteEquipItem(BOOL i_isPlaySound, BOOL i_isDeleteKantera) { fopAcM_delete(item_actor); } - if (mEquipItem == fpcNm_ITEM_IRONBALL) { + if (mEquipItem == dItemNo_IRONBALL_e) { mZ2Link.setUsingIronBall(false); } else if (checkHookshotItem(mEquipItem)) { cancelHookshotCarry(); } - if (((mEquipItem == fpcNm_ITEM_BOOMERANG || mEquipItem == 0x102) && checkBoomerangAnime()) || - (mEquipItem == fpcNm_ITEM_COPY_ROD && checkCopyRodAnime()) || + if (((mEquipItem == dItemNo_BOOMERANG_e || mEquipItem == 0x102) && checkBoomerangAnime()) || + (mEquipItem == dItemNo_COPY_ROD_e && checkCopyRodAnime()) || (checkHookshotItem(mEquipItem) && checkHookshotAnime()) || - (mEquipItem == fpcNm_ITEM_IRONBALL && (checkIronBallAnime() || checkIronBallWaitAnime())) || + (mEquipItem == dItemNo_IRONBALL_e && (checkIronBallAnime() || checkIronBallWaitAnime())) || (checkBowAndSlingItem(mEquipItem) && checkBowAnime())) { resetUpperAnime(UPPER_2, -1.0f); @@ -14691,7 +14691,7 @@ void daAlink_c::deleteEquipItem(BOOL i_isPlaySound, BOOL i_isDeleteKantera) { } mItemAcKeep.clearData(); - mEquipItem = fpcNm_ITEM_NONE; + mEquipItem = dItemNo_NONE_e; mHeldItemModel = NULL; mpHookTipModel = NULL; field_0x0710 = NULL; @@ -15213,7 +15213,7 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { } if (checkBombItem(mEquipItem)) { - mEquipItem = fpcNm_ITEM_NONE; + mEquipItem = dItemNo_NONE_e; } } @@ -15311,9 +15311,9 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { if (actor != NULL && prev_flg_20000 && !checkModeFlg(MODE_ROPE_WALK)) { field_0x280c.clearData(); - if (fopAcM_GetName(actor) == PROC_Obj_Crope) { + if (fopAcM_GetName(actor) == fpcNm_Obj_Crope_e) { static_cast(actor)->offRide(); - } else if (fopAcM_GetName(actor) == PROC_Obj_Wchain) { + } else if (fopAcM_GetName(actor) == fpcNm_Obj_Wchain_e) { static_cast(actor)->offRide(); } } @@ -15339,8 +15339,8 @@ BOOL daAlink_c::commonProcInitNotSameProc(daAlink_PROC i_procID) { field_0x280c.setData(param_1); mProcVar3.field_0x300e = 1; - if (fopAcM_GetName(param_1) == PROC_Tag_Lv8Gate) { - if (mEquipItem == fpcNm_ITEM_KANTERA) { + if (fopAcM_GetName(param_1) == fpcNm_Tag_Lv8Gate_e) { + if (mEquipItem == dItemNo_KANTERA_e) { mProcVar4.field_0x3010 = 1; } else if (checkNoResetFlg2(FLG2_UNK_1)) { offKandelaarModel(); @@ -15902,7 +15902,7 @@ int daAlink_c::procSlideInit(s16 param_0) { field_0x3090 = 8; current.angle.y = param_0; - if (getMoveBGActorName(mLinkAcch.m_gnd, FALSE) == PROC_Obj_Lv3R10Saka) { + if (getMoveBGActorName(mLinkAcch.m_gnd, FALSE) == fpcNm_Obj_Lv3R10Saka_e) { mProcVar3.field_0x300e = 1; } else { mProcVar3.field_0x300e = 0; @@ -16164,8 +16164,8 @@ int daAlink_c::procFrontRoll() { if (checkNoResetFlg0(FLG0_UNK_10) || (mLinkAcch.ChkWallHit() && mAcchCir[0].ChkWallHit() && - (getMoveBGActorName(mAcchCir[0], FALSE) == PROC_Obj_Pillar || - getMoveBGActorName(mAcchCir[0], FALSE) == PROC_Obj_TaFence))) + (getMoveBGActorName(mAcchCir[0], FALSE) == fpcNm_Obj_Pillar_e || + getMoveBGActorName(mAcchCir[0], FALSE) == fpcNm_Obj_TaFence_e))) { procFrontRollSuccessInit(); } else { @@ -16607,7 +16607,7 @@ int daAlink_c::procAutoJumpInit(int param_0) { deleteEquipItem(TRUE, FALSE); } - if (field_0x27f4 != NULL && fopAcM_GetName(field_0x27f4) == PROC_CANOE) { + if (field_0x27f4 != NULL && fopAcM_GetName(field_0x27f4) == fpcNm_CANOE_e) { return procSmallJumpInit(1); } @@ -16641,14 +16641,14 @@ int daAlink_c::procAutoJumpInit(int param_0) { if (mGrabItemAcKeep.getActor() != NULL) { grab_actor_name = fopAcM_GetName(mGrabItemAcKeep.getActor()); } else { - grab_actor_name = PROC_ALINK; + grab_actor_name = fpcNm_ALINK_e; } s16 angle = mpHIO->mAutoJump.m.mJumpAngle; BOOL isCuccoJump = false; field_0x3478 = -10.0f; - if (grab_actor_name == PROC_NI || grab_actor_name == PROC_NPC_TKJ2) { - if (grab_actor_name == PROC_NI && + if (grab_actor_name == fpcNm_NI_e || grab_actor_name == fpcNm_NPC_TKJ2_e) { + if (grab_actor_name == fpcNm_NI_e && ((ni_class*)mGrabItemAcKeep.getActor())->checkGold() == true) { mMaxSpeed = 30.0f; @@ -16707,8 +16707,8 @@ int daAlink_c::procAutoJump() { #if VERSION == VERSION_SHIELD_DEBUG if (!checkStageName("F_SP115") && mGrabItemAcKeep.getActor() != NULL) { - if ((fopAcM_GetName(mGrabItemAcKeep.getActor()) == PROC_NI && ((ni_class*)mGrabItemAcKeep.getActor())->checkGold() != TRUE) || - (fopAcM_GetName(mGrabItemAcKeep.getActor()) == PROC_NPC_TKJ2)) + if ((fopAcM_GetName(mGrabItemAcKeep.getActor()) == fpcNm_NI_e && ((ni_class*)mGrabItemAcKeep.getActor())->checkGold() != TRUE) || + (fopAcM_GetName(mGrabItemAcKeep.getActor()) == fpcNm_NPC_TKJ2_e)) { mMaxSpeed = mpHIO->mAutoJump.m.mCuccoJumpMaxSpeed; field_0x3478 = mpHIO->mAutoJump.m.mCuccoFallMaxSpeed; @@ -16732,7 +16732,7 @@ int daAlink_c::procAutoJump() { setLandPassiveData(); - if (!checkModeFlg(4) && checkSetItemTrigger(fpcNm_ITEM_HVY_BOOTS)) { + if (!checkModeFlg(4) && checkSetItemTrigger(dItemNo_HVY_BOOTS_e)) { setHeavyBoots(1); } @@ -16750,7 +16750,7 @@ int daAlink_c::procAutoJump() { for (int i = 0; i < 3; i++, cyl_p++) { hit_ac = cyl_p->GetCoHitAc(); if (cyl_p->ChkCoHit() && hit_ac != NULL) { - if (fopAcM_GetName(hit_ac) == PROC_Obj_SwHang) { + if (fopAcM_GetName(hit_ac) == fpcNm_Obj_SwHang_e) { return procRoofSwitchHangInit(hit_ac); } } @@ -17703,8 +17703,8 @@ int daAlink_c::execute() { #endif if (checkNoResetFlg2(FLG2_UNK_1) != FALSE && - mEquipItem != fpcNm_ITEM_KANTERA && - checkItemSetButton(fpcNm_ITEM_KANTERA) == 2) { + mEquipItem != dItemNo_KANTERA_e && + checkItemSetButton(dItemNo_KANTERA_e) == 2) { offKandelaarModel(); } @@ -17746,7 +17746,7 @@ int daAlink_c::execute() { dComIfG_Bgsp().MoveBgCrrPos(mMagneLineChk, true, &old.pos, NULL, NULL, false, false); - if (getMoveBGActorName(mMagneLineChk, FALSE) == PROC_Obj_MagneArm) { + if (getMoveBGActorName(mMagneLineChk, FALSE) == fpcNm_Obj_MagneArm_e) { field_0x34c8.y += current.pos.y - pos_y; } else { field_0x34c8.y += (current.pos.y - pos_y) * 0.1f; @@ -18007,7 +18007,7 @@ int daAlink_c::execute() { fopAc_ac_c* item_actor = mGrabItemAcKeep.getActor(); if (item_actor != NULL && (!fopAcM_checkCarryNow(item_actor) || (checkNoResetFlg0(FLG0_WATER_IN_MOVE) && - (checkGrabRooster() || fopAcM_GetName(item_actor) == PROC_E_NEST || + (checkGrabRooster() || fopAcM_GetName(item_actor) == fpcNm_E_NEST_e || checkGrabCarryActor())))) { freeGrabItem(); @@ -18076,7 +18076,7 @@ int daAlink_c::execute() { } if (checkEquipHeavyBoots()) { - int itemButton = checkItemSetButton(fpcNm_ITEM_HVY_BOOTS); + int itemButton = checkItemSetButton(dItemNo_HVY_BOOTS_e); if (itemButton == 2 || checkNotHeavyBootsStage()) { if (!dComIfGp_checkPlayerStatus1(0, 0x10000) || !checkHookshotRoofLv7Boss()) { setHeavyBoots(0); @@ -18127,7 +18127,7 @@ int daAlink_c::execute() { resetUpperAnime(UPPER_2, 5.0f); } - if (mEquipItem == fpcNm_ITEM_KANTERA && checkNoUpperAnime() && !checkKandelaarEquipAnime() && + if (mEquipItem == dItemNo_KANTERA_e && checkNoUpperAnime() && !checkKandelaarEquipAnime() && (checkModeFlg(MODE_UNK_1000) || mProcID == PROC_CROUCH)) { if (checkReinRide()) { @@ -18404,7 +18404,7 @@ int daAlink_c::execute() { field_0x2fcb--; if (field_0x2fcb == 0) { - dMeter2Info_setShield(fpcNm_ITEM_NONE, true); + dMeter2Info_setShield(dItemNo_NONE_e, true); stickArrowIncrement(1); setWoodShieldBurnOutEffect(); @@ -18412,7 +18412,7 @@ int daAlink_c::execute() { dMeter2Info_setFloatingMessage(2047, 90, false); if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) == dStage_SaveTbl_LV2 && - !dComIfGs_isItemFirstBit(fpcNm_ITEM_HYLIA_SHIELD)) + !dComIfGs_isItemFirstBit(dItemNo_HYLIA_SHIELD_e)) { fopAcM_onSwitch(this, 0x6F); } @@ -18509,7 +18509,7 @@ int daAlink_c::execute() { if (!checkEventRun() && checkNoResetFlg0(FLG0_UNK_80) && (mWaterY > current.pos.y + 40.0f || checkModeFlg(MODE_SWIMMING)) && - getMoveBGActorName(mLinkAcch.m_wtr, TRUE) == PROC_Obj_Onsen) + getMoveBGActorName(mLinkAcch.m_wtr, TRUE) == fpcNm_Obj_Onsen_e) { if (mHotspringRecoverTimer != 0) { mHotspringRecoverTimer--; @@ -18593,8 +18593,8 @@ int daAlink_c::execute() { u8 tmp; for (u8 i = 0; i < 2; i++) { tmp = (i + 1) % 2; - if (dComIfGp_getSelectItem(i) == fpcNm_ITEM_EMPTY_BOTTLE && (mUseButtonFlags & (1 << i)) && - dComIfGp_getSelectItem(tmp) == fpcNm_ITEM_EMPTY_BOTTLE) + if (dComIfGp_getSelectItem(i) == dItemNo_EMPTY_BOTTLE_e && (mUseButtonFlags & (1 << i)) && + dComIfGp_getSelectItem(tmp) == dItemNo_EMPTY_BOTTLE_e) { mUseButtonFlags |= (u8)(1 << tmp); } @@ -18658,7 +18658,7 @@ int daAlink_c::execute() { if (checkWolf() || (field_0x27f4 != NULL && (field_0x27f4->speedF > 0.1f || - (checkGoatCatchActor(field_0x27f4) && fopAcM_GetName(field_0x27f4) != PROC_COW)))) + (checkGoatCatchActor(field_0x27f4) && fopAcM_GetName(field_0x27f4) != fpcNm_COW_e)))) { setDoStatusEmphasys(BUTTON_STATUS_GRAB); } else { @@ -18675,8 +18675,8 @@ int daAlink_c::execute() { { setDoStatus(BUTTON_STATUS_JUMP); } else if (dComIfGp_getDoStatus() == BUTTON_STATUS_HOWL && field_0x27f4 != NULL && - (fopAcM_GetName(field_0x27f4) == PROC_Obj_WindStone || - fopAcM_GetName(field_0x27f4) == PROC_Obj_SmWStone)) + (fopAcM_GetName(field_0x27f4) == fpcNm_Obj_WindStone_e || + fopAcM_GetName(field_0x27f4) == fpcNm_Obj_SmWStone_e)) { setDoStatusEmphasys(BUTTON_STATUS_LISTEN); } else if (dComIfGp_getDoStatus() == BUTTON_STATUS_PLACE) { @@ -18710,7 +18710,7 @@ int daAlink_c::execute() { } if (dComIfGp_att_getCatghTarget() != NULL && !checkWolf()) { - if (!checkRideOn() && checkCastleTownUseItem(fpcNm_ITEM_EMPTY_BOTTLE)) { + if (!checkRideOn() && checkCastleTownUseItem(dItemNo_EMPTY_BOTTLE_e)) { dComIfGp_setBottleStatus(BUTTON_STATUS_SCOOP, 0); } } @@ -18901,7 +18901,7 @@ bool daAlink_c::checkShieldDraw() { } bool daAlink_c::checkItemDraw() { - if (mHeldItemModel != NULL && (mEquipItem != fpcNm_ITEM_IRONBALL || !checkSwordEquipAnime())) { + if (mHeldItemModel != NULL && (mEquipItem != dItemNo_IRONBALL_e || !checkSwordEquipAnime())) { if (!checkBowAndSlingItem(mEquipItem) || checkBowGrabLeftHand() || !checkShieldGet() || field_0x2e44.checkPassNum(15)) { @@ -18936,7 +18936,7 @@ int daAlink_c::initShadowScaleLight() { BOOL var_r28; f32 var_f31; - if (talkActor != NULL && ((fopAcM_GetName(talkActor) == PROC_Tag_Mhint && !((daTagMhint_c*)talkActor)->checkNoAttention()) || (fopAcM_GetName(talkActor) == PROC_Tag_Mstop && !((daTagMstop_c*)talkActor)->checkNoAttention()))) { + if (talkActor != NULL && ((fopAcM_GetName(talkActor) == fpcNm_Tag_Mhint_e && !((daTagMhint_c*)talkActor)->checkNoAttention()) || (fopAcM_GetName(talkActor) == fpcNm_Tag_Mstop_e && !((daTagMstop_c*)talkActor)->checkNoAttention()))) { field_0x2ff8 = cLib_targetAngleY(&talkActor->eyePos, ¤t.pos); var_r28 = 1; } else { @@ -19119,12 +19119,12 @@ void daAlink_c::shadowDraw() { dComIfGd_addRealShadow(shadowID, mpDemoHRTmpModel); } - if (mEquipItem == fpcNm_ITEM_BOOMERANG) { + if (mEquipItem == dItemNo_BOOMERANG_e) { if (mItemAcKeep.getActor() != NULL) { dComIfGd_addRealShadow(shadowID, mItemAcKeep.getActor()->model); } } else if (checkItemDraw()) { - if (mEquipItem == fpcNm_ITEM_IRONBALL) { + if (mEquipItem == dItemNo_IRONBALL_e) { if (mItemVar0.field_0x3018 == 0 || mItemVar0.field_0x3018 == 8) { dComIfGd_addRealShadow(shadowID, mHeldItemModel); } else if (fopAcM_gc_c::gndCheck(&mIronBallBgChkPos)) { @@ -19143,7 +19143,7 @@ void daAlink_c::shadowDraw() { dComIfGd_addRealShadow(shadowID, mpHookTipModel); } - if (mEquipItem == fpcNm_ITEM_W_HOOKSHOT && + if (mEquipItem == dItemNo_W_HOOKSHOT_e && !checkPlayerGuardAndAttack() && !checkNoResetFlg0(FLG0_UNK_2)) { dComIfGd_addRealShadow(shadowID, field_0x0710); @@ -19558,7 +19558,7 @@ int daAlink_c::draw() { modelDraw(mpHookTipModel, isPlayerNoDraw); } - if (mEquipItem == fpcNm_ITEM_W_HOOKSHOT && !checkPlayerGuardAndAttack() && + if (mEquipItem == dItemNo_W_HOOKSHOT_e && !checkPlayerGuardAndAttack() && !checkNoResetFlg0(FLG0_UNK_2)) { if (field_0x0710 != NULL) { @@ -19574,7 +19574,7 @@ int daAlink_c::draw() { if (mpHookChain != NULL && !isPlayerNoDraw && ((checkHookshotItem(mEquipItem) && (mHeldItemRootPos.abs(mHookshotTopPos) > 1.0f || field_0x3810.abs(mIronBallBgChkPos) > 1.0f)) - || mEquipItem == fpcNm_ITEM_IRONBALL) + || mEquipItem == dItemNo_IRONBALL_e) ) { dComIfGd_getOpaListDark()->entryImm(mpHookChain, 0); @@ -19688,18 +19688,18 @@ static actor_method_class l_daAlink_Method = { }; actor_process_profile_definition g_profile_ALINK = { - (u32)fpcLy_CURRENT_e, - 5, - fpcPi_CURRENT_e, - PROC_ALINK, - &g_fpcLf_Method.base, - sizeof(daAlink_c), - 0, - 0, - &g_fopAc_Method.base, - 91, - &l_daAlink_Method, - 0x60400, - fopAc_PLAYER_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 5, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ALINK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daAlink_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_ALINK_e, + /* Actor SubMtd */ &l_daAlink_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_FREEZE_e, + /* Group */ fopAc_PLAYER_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_alink_boom.inc b/src/d/actor/d_a_alink_boom.inc index 6fb5c67051..6750bdaa84 100644 --- a/src/d/actor/d_a_alink_boom.inc +++ b/src/d/actor/d_a_alink_boom.inc @@ -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); diff --git a/src/d/actor/d_a_alink_bottle.inc b/src/d/actor/d_a_alink_bottle.inc index b3a39c3498..65670e0fd2 100644 --- a/src/d/actor/d_a_alink_bottle.inc +++ b/src/d/actor/d_a_alink_bottle.inc @@ -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, ¤t.pos, fopAcM_GetRoomNo(this), + if (mEquipItem == dItemNo_WORM_e) { + field_0x32cc = fopAcM_create(fpcNm_NPC_WORM_e, 2, ¤t.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); } diff --git a/src/d/actor/d_a_alink_bow.inc b/src/d/actor/d_a_alink_bow.inc index 207f463cd7..600dcae2f4 100644 --- a/src/d/actor/d_a_alink_bow.inc +++ b/src/d/actor/d_a_alink_bow.inc @@ -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); } } diff --git a/src/d/actor/d_a_alink_canoe.inc b/src/d/actor/d_a_alink_canoe.inc index 92802f8075..efe6f4551a 100644 --- a/src/d/actor/d_a_alink_canoe.inc +++ b/src/d/actor/d_a_alink_canoe.inc @@ -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); diff --git a/src/d/actor/d_a_alink_copyrod.inc b/src/d/actor/d_a_alink_copyrod.inc index c268e6e6b9..45548514e2 100644 --- a/src/d/actor/d_a_alink_copyrod.inc +++ b/src/d/actor/d_a_alink_copyrod.inc @@ -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); diff --git a/src/d/actor/d_a_alink_crawl.inc b/src/d/actor/d_a_alink_crawl.inc index 5f46d5e557..4a657c1de8 100644 --- a/src/d/actor/d_a_alink_crawl.inc +++ b/src/d/actor/d_a_alink_crawl.inc @@ -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); } diff --git a/src/d/actor/d_a_alink_cut.inc b/src/d/actor/d_a_alink_cut.inc index 24b4f143c4..4e9dd18aee 100644 --- a/src/d/actor/d_a_alink_cut.inc +++ b/src/d/actor/d_a_alink_cut.inc @@ -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(i_actor)->checkAttackChance()) { + } else if (fopAcM_GetName(i_actor) == fpcNm_B_GND_e && static_cast(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(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 { diff --git a/src/d/actor/d_a_alink_damage.inc b/src/d/actor/d_a_alink_damage.inc index 56229e2e4f..3863551c62 100644 --- a/src/d/actor/d_a_alink_damage.inc +++ b/src/d/actor/d_a_alink_damage.inc @@ -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; diff --git a/src/d/actor/d_a_alink_demo.inc b/src/d/actor/d_a_alink_demo.inc index 2a1c262d35..dbea0add91 100644 --- a/src/d/actor/d_a_alink_demo.inc +++ b/src/d/actor/d_a_alink_demo.inc @@ -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(partner_p)->checkEndMessage()) && - (partner_name != PROC_Tag_Mhint || !static_cast(partner_p)->checkNoAttention()) && - (partner_name != PROC_Tag_Mstop || !static_cast(partner_p)->checkNoAttention()) && - partner_name != PROC_MIDNA) + if (partner_name != fpcNm_MYNA_e && + (partner_name != fpcNm_Tag_Mwait_e || !static_cast(partner_p)->checkEndMessage()) && + (partner_name != fpcNm_Tag_Mhint_e || !static_cast(partner_p)->checkNoAttention()) && + (partner_name != fpcNm_Tag_Mstop_e || !static_cast(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(¤t.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(¤t.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, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, + if (checkItemSetButton(dItemNo_DUNGEON_EXIT_e) != 2) { + id = fopAcM_create(fpcNm_OBJ_TKS_e, 0, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1); } else { - id = fopAcM_create(PROC_NPC_TKC, 2, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, + id = fopAcM_create(fpcNm_NPC_TKC_e, 2, ¤t.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(); } } diff --git a/src/d/actor/d_a_alink_effect.inc b/src/d/actor/d_a_alink_effect.inc index 133a615cc0..6e76280ff6 100644 --- a/src/d/actor/d_a_alink_effect.inc +++ b/src/d/actor/d_a_alink_effect.inc @@ -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, ¤t.pos, NULL); if (emitter != NULL) { emitter->setGlobalRTMatrix(mHeldItemModel->getBaseTRMtx()); diff --git a/src/d/actor/d_a_alink_grab.inc b/src/d/actor/d_a_alink_grab.inc index 5f9a02e8e9..b94f4dafbc 100644 --- a/src/d/actor/d_a_alink_grab.inc +++ b/src/d/actor/d_a_alink_grab.inc @@ -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(¤t.pos.x, field_0x37c8.x, 0.5f, 10.0f, 1.0f); temp_f31 += cLib_addCalc(¤t.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(); } diff --git a/src/d/actor/d_a_alink_guard.inc b/src/d/actor/d_a_alink_guard.inc index e5bb97e737..17bb1cde07 100644 --- a/src/d/actor/d_a_alink_guard.inc +++ b/src/d/actor/d_a_alink_guard.inc @@ -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(i_actor)->checkBattleMode()) || - (name == PROC_OBJ_GRA && !static_cast(i_actor)->checkNpcObjGra()); + return name == fpcNm_NPC_KAKASHI_e || + (name == fpcNm_NPC_KN_e && static_cast(i_actor)->checkBattleMode()) || + (name == fpcNm_OBJ_GRA_e && !static_cast(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(¤t.pos, fpcNm_ITEM_ARROW_10, -1, NULL, NULL, 0.0f, 0.0f); + fopAcM_createItemForSimpleDemo(¤t.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); } diff --git a/src/d/actor/d_a_alink_hang.inc b/src/d/actor/d_a_alink_hang.inc index 563bb9c905..b99fe71c85 100644 --- a/src/d/actor/d_a_alink_hang.inc +++ b/src/d/actor/d_a_alink_hang.inc @@ -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); } diff --git a/src/d/actor/d_a_alink_hook.inc b/src/d/actor/d_a_alink_hook.inc index db1f91c386..7e2f3628b9 100644 --- a/src/d/actor/d_a_alink_hook.inc +++ b/src/d/actor/d_a_alink_hook.inc @@ -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(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(targetAc_p)->isBack())) + if (targetAc_name == fpcNm_B_OB_e || + (targetAc_name == fpcNm_B_DR_e && static_cast(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(); } diff --git a/src/d/actor/d_a_alink_horse.inc b/src/d/actor/d_a_alink_horse.inc index e9ce673c98..6d56929288 100644 --- a/src/d/actor/d_a_alink_horse.inc +++ b/src/d/actor/d_a_alink_horse.inc @@ -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(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); } diff --git a/src/d/actor/d_a_alink_hvyboots.inc b/src/d/actor/d_a_alink_hvyboots.inc index cd069c69f3..0edee19cf2 100644 --- a/src/d/actor/d_a_alink_hvyboots.inc +++ b/src/d/actor/d_a_alink_hvyboots.inc @@ -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); } diff --git a/src/d/actor/d_a_alink_iceleaf.inc b/src/d/actor/d_a_alink_iceleaf.inc index 46d70785d3..e2c4773c9e 100644 --- a/src/d/actor/d_a_alink_iceleaf.inc +++ b/src/d/actor/d_a_alink_iceleaf.inc @@ -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) { diff --git a/src/d/actor/d_a_alink_ironball.inc b/src/d/actor/d_a_alink_ironball.inc index 2d2cb53586..0838085436 100644 --- a/src/d/actor/d_a_alink_ironball.inc +++ b/src/d/actor/d_a_alink_ironball.inc @@ -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(); } diff --git a/src/d/actor/d_a_alink_kandelaar.inc b/src/d/actor/d_a_alink_kandelaar.inc index a284b0f6d9..cd25a66d7e 100644 --- a/src/d/actor/d_a_alink_kandelaar.inc +++ b/src/d/actor/d_a_alink_kandelaar.inc @@ -13,7 +13,7 @@ static fopAc_ac_c* daAlink_searchTagKandelaar(fopAc_ac_c* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_GetName(i_actor) == PROC_TAG_LANTERN) { + if (fopAcM_GetName(i_actor) == fpcNm_TAG_LANTERN_e) { return i_actor; } @@ -24,7 +24,7 @@ static fopAc_ac_c* daAlink_searchTagKtOnFire(fopAc_ac_c* i_actor, void* i_data) UNUSED(i_data); daAlink_c* player_p = daAlink_getAlinkActorClass(); - if (fopAcM_GetName(i_actor) == PROC_Tag_KtOnFire && + if (fopAcM_GetName(i_actor) == fpcNm_Tag_KtOnFire_e && i_actor->current.pos.abs2(player_p->current.pos) < SQUARE(150.0f) && fopAcM_seenActorAngleY(player_p, i_actor) < 0x3000) { @@ -66,7 +66,7 @@ BOOL daAlink_c::checkWaterInKandelaarOffset(f32 param_0) { void daAlink_c::checkWaterInKandelaar(f32 param_0) { if (checkNoResetFlg2(FLG2_UNK_1) && checkWaterInKandelaarOffset(param_0)) { - if (mEquipItem == fpcNm_ITEM_KANTERA) { + if (mEquipItem == dItemNo_KANTERA_e) { deleteEquipItem(TRUE, TRUE); } else { offKandelaarModel(); @@ -82,7 +82,7 @@ void daAlink_c::offKandelaarModel() { bool daAlink_c::checkUseKandelaar(int param_0) { return (param_0 == 0 && checkNoResetFlg2(FLG2_UNK_1)) || - (param_0 != 0 && mEquipItem == fpcNm_ITEM_KANTERA); + (param_0 != 0 && mEquipItem == dItemNo_KANTERA_e); } bool daAlink_c::checkKandelaarSwing(int param_0) const { @@ -236,7 +236,7 @@ void daAlink_c::resetOilBottleModel() { if (mProcVar3.field_0x300e != 0) { setKandelaarModel(); - mEquipItem = fpcNm_ITEM_KANTERA; + mEquipItem = dItemNo_KANTERA_e; } returnKeepItemData(); @@ -321,7 +321,7 @@ int daAlink_c::commonKandelaarPour(int param_0) { } void daAlink_c::initKandelaarSwing() { - if (mEquipItem == fpcNm_ITEM_KANTERA) { + if (mEquipItem == dItemNo_KANTERA_e) { if (dComIfGs_getOil() != 0) { mZ2Link.getKantera().startSound(Z2SE_AL_KANTERA_SWING, 0, mVoiceReverbIntensity); } else { @@ -349,10 +349,10 @@ int daAlink_c::procKandelaarSwingInit() { fopAc_ac_c* catch_target_p = dComIfGp_att_getCatghTarget(); if (catch_target_p != NULL) { s16 name = fopAcM_GetName(catch_target_p); - BOOL is_sm2 = name == PROC_E_SM2; + BOOL is_sm2 = name == fpcNm_E_SM2_e; - if (name == PROC_OBJ_OILTUBO || - (name == PROC_TAG_SSDRINK && ((daTag_SSDrink_c*)catch_target_p)->checkShopOil()) || + if (name == fpcNm_OBJ_OILTUBO_e || + (name == fpcNm_TAG_SSDRINK_e && ((daTag_SSDrink_c*)catch_target_p)->checkShopOil()) || (is_sm2 && ((e_sm2_class*)catch_target_p)->checkYellow())) { return procBottleSwingInit(catch_target_p, is_sm2); @@ -366,7 +366,7 @@ int daAlink_c::procKandelaarSwingInit() { mNormalSpeed = 0.0f; current.angle.y = shape_angle.y; - if ((mLinkAcch.ChkGroundHit() && getMoveBGActorName(mLinkAcch.m_gnd, FALSE) == PROC_OBJ_WEB1) || + if ((mLinkAcch.ChkGroundHit() && getMoveBGActorName(mLinkAcch.m_gnd, FALSE) == fpcNm_OBJ_WEB1_e) || (checkStageName("F_SP108") && fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchTagKtOnFire, NULL) != NULL)) { diff --git a/src/d/actor/d_a_alink_link.inc b/src/d/actor/d_a_alink_link.inc index 7fd3b3685f..3b61cdfd96 100644 --- a/src/d/actor/d_a_alink_link.inc +++ b/src/d/actor/d_a_alink_link.inc @@ -130,7 +130,7 @@ BOOL daAlink_c::setBodyAngleToCamera() { } s16 var_r29; - if (!dComIfGp_checkPlayerStatus0(0, 0x202000) && mEquipItem == fpcNm_ITEM_IRONBALL) { + if (!dComIfGp_checkPlayerStatus0(0, 0x202000) && mEquipItem == dItemNo_IRONBALL_e) { var_r29 = -10000; } else { var_r29 = mpHIO->mItem.m.mItemFPUpMaxUnk; @@ -164,7 +164,7 @@ BOOL daAlink_c::subjectCancelTrigger() { BOOL daAlink_c::checkSubjectEnd(BOOL i_isPlaySe) { setDoStatus(BUTTON_STATUS_BACK); - if (checkEventRun() || checkEquipAnime() || doTrigger() || checkSetItemTrigger(fpcNm_ITEM_HAWK_EYE) || subjectCancelTrigger() || checkEndResetFlg0(ERFLG0_FORCE_SUBJECT_CANCEL) || dComIfGp_checkCameraAttentionStatus(field_0x317c, 0x2000)) { + if (checkEventRun() || checkEquipAnime() || doTrigger() || checkSetItemTrigger(dItemNo_HAWK_EYE_e) || subjectCancelTrigger() || checkEndResetFlg0(ERFLG0_FORCE_SUBJECT_CANCEL) || dComIfGp_checkCameraAttentionStatus(field_0x317c, 0x2000)) { if (i_isPlaySe) { seStartSystem(Z2SE_SUBJ_VIEW_OUT); } @@ -177,7 +177,7 @@ BOOL daAlink_c::checkSubjectEnd(BOOL i_isPlaySe) { } void daAlink_c::searchPeepObj(fopAc_ac_c* i_actor, void* i_data) { - if (fopAcM_GetName(i_actor) == PROC_KYTAG05) { + if (fopAcM_GetName(i_actor) == fpcNm_KYTAG05_e) { f32 var_f31 = current.pos.abs2(i_actor->current.pos); if (var_f31 < field_0x3478) { field_0x3478 = var_f31; @@ -220,7 +220,7 @@ int daAlink_c::procCoSubjectivity() { return 1; } - if (checkSubjectEnd(FALSE) || (dComIfGp_checkPlayerStatus0(0, 0x200000) && checkSetItemTrigger(fpcNm_ITEM_HAWK_EYE))) { + if (checkSubjectEnd(FALSE) || (dComIfGp_checkPlayerStatus0(0, 0x200000) && checkSetItemTrigger(dItemNo_HAWK_EYE_e))) { seStartSystem(Z2SE_SUBJ_VIEW_OUT); checkWaitAction(); } else if (!checkWolf() && (checkItemAction() || checkItemChangeFromButton())) { diff --git a/src/d/actor/d_a_alink_spinner.inc b/src/d/actor/d_a_alink_spinner.inc index d309a6ceb8..a93e712760 100644 --- a/src/d/actor/d_a_alink_spinner.inc +++ b/src/d/actor/d_a_alink_spinner.inc @@ -96,7 +96,7 @@ void daAlink_c::setSpinnerSyncPos() { int daAlink_c::procSpinnerReadyInit() { fopAc_ac_c* spinner = (fopAc_ac_c*)fopAcM_fastCreate( - PROC_SPINNER, daSpinner_c::getWaitArg(), ¤t.pos, fopAcM_GetRoomNo(this), + fpcNm_SPINNER_e, daSpinner_c::getWaitArg(), ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL, NULL); if (spinner == NULL) { @@ -191,7 +191,7 @@ int daAlink_c::procSpinnerWait() { return procSmallJumpInit(2); } - int itemSetBtn = checkItemSetButton(fpcNm_ITEM_SPINNER); + int itemSetBtn = checkItemSetButton(dItemNo_SPINNER_e); if (mProcVar2.field_0x300c == 0) { if (!itemButton()) { mProcVar2.field_0x300c = 1; @@ -211,7 +211,7 @@ int daAlink_c::procSpinnerWait() { mProcVar3.field_0x300e = shape_angle.y; } } else { - if (checkSetItemTrigger(fpcNm_ITEM_SPINNER) || swordSwingTrigger() || itemSetBtn == 2) { + if (checkSetItemTrigger(dItemNo_SPINNER_e) || swordSwingTrigger() || itemSetBtn == 2) { if (swordSwingTrigger()) { swordEquip(0); } diff --git a/src/d/actor/d_a_alink_swim.inc b/src/d/actor/d_a_alink_swim.inc index aa7cd98350..038d710e80 100644 --- a/src/d/actor/d_a_alink_swim.inc +++ b/src/d/actor/d_a_alink_swim.inc @@ -12,7 +12,7 @@ BOOL daAlink_c::checkZoraWearMaskDraw() { } BOOL daAlink_c::checkAcceptUseItemInWater(u16 i_itemNo) const { - return i_itemNo == fpcNm_ITEM_HVY_BOOTS || i_itemNo == fpcNm_ITEM_WATER_BOMB || checkHookshotItem(i_itemNo); + return i_itemNo == dItemNo_HVY_BOOTS_e || i_itemNo == dItemNo_WATER_BOMB_e || checkHookshotItem(i_itemNo); } void daAlink_c::swimDeleteItem() { @@ -324,7 +324,7 @@ int daAlink_c::checkNextActionSwim() { } if (mAttList != NULL && mAttList->mType == fopAc_attn_ETC_e && checkNoResetFlg0(FLG0_SWIM_UP) && - fopAcM_GetName(field_0x27f4) == PROC_CANOE) + fopAcM_GetName(field_0x27f4) == fpcNm_CANOE_e) { setDoStatus(BUTTON_STATUS_GET_ON); @@ -346,7 +346,7 @@ int daAlink_c::checkNextActionSwim() { int daAlink_c::checkSwimAction(int param_0) { f32 var_f31; if (checkWolf()) { - if (getMoveBGActorName(mLinkAcch.m_gnd, 0) == PROC_Obj_ITA) { + if (getMoveBGActorName(mLinkAcch.m_gnd, 0) == fpcNm_Obj_ITA_e) { var_f31 = 200.0f; } else { var_f31 = mpHIO->mWolf.mWlSwim.m.mStartHeight; @@ -761,7 +761,7 @@ void daAlink_c::setSwimMoveAnime() { if (checkBootsOrArmorHeavy()) { anm = ANM_SWIM_WAIT; mMaxSpeed = mpHIO->mSwim.m.mUnderwaterFallMaxSpeed; - if (mEquipItem != fpcNm_ITEM_NONE && !checkHookshotAnime()) { + if (mEquipItem != dItemNo_NONE_e && !checkHookshotAnime()) { setDoStatus(BUTTON_STATUS_PUT_AWAY); } } @@ -921,7 +921,7 @@ int daAlink_c::procSwimUp() { setNormalSpeedF(0.0f, mpHIO->mSwim.m.mDeceleration); - if (checkSetItemTrigger(fpcNm_ITEM_HVY_BOOTS)) { + if (checkSetItemTrigger(dItemNo_HVY_BOOTS_e)) { setHeavyBoots(1); } @@ -1014,7 +1014,7 @@ int daAlink_c::procSwimWait() { setSwimUpDownOffset(); - if (checkEquipHeavyBoots() && mEquipItem != fpcNm_ITEM_NONE) { + if (checkEquipHeavyBoots() && mEquipItem != dItemNo_NONE_e) { setDoStatus(BUTTON_STATUS_PUT_AWAY); } @@ -1373,7 +1373,7 @@ int daAlink_c::procSwimDamageInit(dCcD_GObjInf* i_hitObj) { BOOL bvar4 = checkNoResetFlg0(FLG0_SWIM_UP) || ((i_hitObj != NULL && i_hitObj->GetTgHitAc() != NULL) - && fopAcM_GetName(i_hitObj->GetTgHitAc()) == PROC_E_SG); + && fopAcM_GetName(i_hitObj->GetTgHitAc()) == fpcNm_E_SG_e); if (!getZoraSwim() && bvar4 && mProcID != PROC_SWIM_WAIT) { return 1; diff --git a/src/d/actor/d_a_alink_whistle.inc b/src/d/actor/d_a_alink_whistle.inc index 43780cf58c..eabff6d408 100644 --- a/src/d/actor/d_a_alink_whistle.inc +++ b/src/d/actor/d_a_alink_whistle.inc @@ -5,7 +5,7 @@ #include "d/actor/d_a_alink.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/actor/d_a_horse.h" #include "d/actor/d_a_npc_tk.h" #include "d/actor/d_a_obj_yobikusa.h" @@ -23,7 +23,7 @@ static fopAc_ac_c* daAlink_searchWhistle(fopAc_ac_c* i_actor, void* i_data) { static fopAc_ac_c* daAlink_searchHawk(fopAc_ac_c* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_GetName(i_actor) == PROC_NPC_TK) { + if (fopAcM_GetName(i_actor) == fpcNm_NPC_TK_e) { return i_actor; } @@ -57,12 +57,12 @@ void daAlink_c::setHorseWhistleModel() { mHeldItemModel = initModel(loadAramBmd(dRes_ID_ALANM_BMD_AL_PEND_e, 0x3000), 0); mDoExt_setCurrentHeap(prev_heap); - mEquipItem = fpcNm_ITEM_HORSE_FLUTE; + mEquipItem = dItemNo_HORSE_FLUTE_e; field_0x2f94 = 2; } int daAlink_c::procGrassWhistleGetInit() { - if (mEquipItem != fpcNm_ITEM_NONE) { + if (mEquipItem != dItemNo_NONE_e) { return procPreActionUnequipInit(PROC_GRASS_WHISTLE_GET, field_0x27f4); } @@ -93,7 +93,7 @@ int daAlink_c::procGrassWhistleGet() { if (checkAnmEnd(frameCtrl_p)) { procGrassWhistleWaitInit(mProcVar2.field_0x300c, mProcVar3.field_0x300e, mProcVar4.field_0x3010, mProcVar5.field_0x3012, &field_0x37c8); - } else if (mEquipItem == fpcNm_ITEM_NONE && frameCtrl_p->getFrame() >= 9.0f) { + } else if (mEquipItem == dItemNo_NONE_e && frameCtrl_p->getFrame() >= 9.0f) { setGrassWhistleModel(mProcVar2.field_0x300c); if (field_0x280c.getActor() != NULL) { @@ -129,7 +129,7 @@ int daAlink_c::procGrassWhistleWaitInit(int param_0, int param_1, int param_2, s field_0x32cc = 0x532; } else { setSingleAnimeBase(ANM_WAIT); - mKeepItem = fpcNm_ITEM_NONE; + mKeepItem = dItemNo_NONE_e; if (param_0 == 0) { field_0x3198 = 0x100; diff --git a/src/d/actor/d_a_alink_wolf.inc b/src/d/actor/d_a_alink_wolf.inc index 7e87b519b1..6f40a55cdb 100644 --- a/src/d/actor/d_a_alink_wolf.inc +++ b/src/d/actor/d_a_alink_wolf.inc @@ -824,7 +824,7 @@ void daAlink_c::setSpeedAndAngleWolfAtn() { BOOL daAlink_c::checkWolfAtnWait() { if ((checkEnemyGroup(mTargetedActor) || mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_23_e) || - (mTargetedActor != NULL && fopAcM_GetName(mTargetedActor) == PROC_NPC_MOI && + (mTargetedActor != NULL && fopAcM_GetName(mTargetedActor) == fpcNm_NPC_MOI_e && ((daNpc_Moi_c*)mTargetedActor)->chkSFight())) { return true; @@ -1586,7 +1586,7 @@ BOOL daAlink_c::checkWolfBarrierWallHit(cBgS_PolyInfo& i_polyinfo) { } s16 bg_name = getMoveBGActorName(i_polyinfo, TRUE); - if (bg_name == PROC_OBJ_TP || bg_name == PROC_OBJ_GB || bg_name == PROC_Obj_GanonWall2) { + if (bg_name == fpcNm_OBJ_TP_e || bg_name == fpcNm_OBJ_GB_e || bg_name == fpcNm_Obj_GanonWall2_e) { return true; } @@ -3813,7 +3813,7 @@ int daAlink_c::procWolfSlopeStart() { static fopAc_ac_c* daAlink_searchGoldWolf(fopAc_ac_c* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_GetName(i_actor) == PROC_NPC_GWOLF) { + if (fopAcM_GetName(i_actor) == fpcNm_NPC_GWOLF_e) { return i_actor; } @@ -3825,10 +3825,10 @@ static void* daAlink_searchWolfHowl(fopAc_ac_c* i_actor, void* i_data) { fopAc_ac_c** var_r30 = (fopAc_ac_c**)i_data; daAlink_c* player_p = daAlink_getAlinkActorClass(); - if ((actor_name == PROC_KAGO && dComIfGs_isEventBit(dSv_event_flag_c::M_051)) || - (actor_name == PROC_E_PM && + if ((actor_name == fpcNm_KAGO_e && dComIfGs_isEventBit(dSv_event_flag_c::M_051)) || + (actor_name == fpcNm_E_PM_e && player_p->current.pos.abs2XZ(i_actor->current.pos) < SQUARE(3000.0f)) || - actor_name == PROC_OBJ_SEKIZOA || + actor_name == fpcNm_OBJ_SEKIZOA_e || (*var_r30 == NULL && actor_name == player_p->getGrassHowlEventActor())) { *var_r30 = i_actor; @@ -3869,10 +3869,10 @@ int daAlink_c::procWolfHowlDemoInit() { if (field_0x27f4 != NULL) { name = fopAcM_GetName(field_0x27f4); } else { - name = PROC_ALINK; + name = fpcNm_ALINK_e; } - if (name == PROC_Tag_WaraHowl) { + if (name == fpcNm_Tag_WaraHowl_e) { shape_angle.y = field_0x27f4->shape_angle.y; current.angle.y = shape_angle.y; } else { @@ -3916,8 +3916,8 @@ int daAlink_c::procWolfHowlDemoInit() { mProcVar4.field_0x3010 = 0; mProcVar0.field_0x3008 = -1; - if (name != PROC_ALINK) { - if (name == PROC_Obj_Yobikusa) { + if (name != fpcNm_ALINK_e) { + if (name == fpcNm_Obj_Yobikusa_e) { daObjYobikusa_c* yobikusa_p = (daObjYobikusa_c*)field_0x27f4; mZ2WolfHowlMgr.setCorrectCurve(yobikusa_p->getType()); @@ -3930,16 +3930,16 @@ int daAlink_c::procWolfHowlDemoInit() { } else if (yobikusa_p->getType() == 1) { field_0x3198 = 0xEE; } - } else if (name == PROC_TAG_HOWL) { + } else if (name == fpcNm_TAG_HOWL_e) { mZ2WolfHowlMgr.setCorrectCurve(static_cast(field_0x27f4)->getCurveID()); - } else if (name == PROC_Obj_WindStone) { + } else if (name == fpcNm_Obj_WindStone_e) { mZ2WolfHowlMgr.setCorrectCurve(static_cast(field_0x27f4)->getTuneId()); mProcVar0.field_0x3008 = static_cast(field_0x27f4)->getNextSceneId(); mProcVar4.field_0x3010 = 1; - } else if (name == PROC_Obj_SmWStone) { + } else if (name == fpcNm_Obj_SmWStone_e) { mZ2WolfHowlMgr.setCorrectCurve(static_cast(field_0x27f4)->getTuneId()); mProcVar4.field_0x3010 = 1; - } else if (name == PROC_Tag_WaraHowl) { + } else if (name == fpcNm_Tag_WaraHowl_e) { mZ2WolfHowlMgr.setCorrectCurve(static_cast(field_0x27f4)->getTuneId()); } else { mZ2WolfHowlMgr.setCorrectCurve(-1); @@ -4101,14 +4101,14 @@ int daAlink_c::procWolfHowlDemo() { fopAcM_OnStatus(actor_p, 0x800); s16 actorName = fopAcM_GetName(actor_p); - if (actorName == PROC_KAGO) { + if (actorName == fpcNm_KAGO_e) { static_cast(actor_p)->setEvent(); static_cast(actor_p)->setKagoPath(mProcVar5.field_0x3012); - } else if (actorName == PROC_OBJ_SEKIZOA) { + } else if (actorName == fpcNm_OBJ_SEKIZOA_e) { static_cast(actor_p)->setWolfHowling(); - } else if (actorName == PROC_E_PM) { + } else if (actorName == fpcNm_E_PM_e) { static_cast(actor_p)->AppearSet(); - } else if (actorName == PROC_HORSE) { + } else if (actorName == fpcNm_HORSE_e) { daHorse_c* horse = static_cast(actor_p); int ret = horse->callHorse(¤t.pos); if (ret == 1 || ret == 2) { @@ -4120,7 +4120,7 @@ int daAlink_c::procWolfHowlDemo() { setWolfHowlNotHappen(isSkipEdge); return 1; } - } else if (actorName == PROC_NPC_TK) { + } else if (actorName == fpcNm_NPC_TK_e) { static_cast(actor_p)->setEventWolf(); static_cast(actor_p)->setHawkPath(mProcVar5.field_0x3012); } @@ -4176,14 +4176,14 @@ int daAlink_c::procWolfHowlDemo() { BOOL daAlink_c::checkWolfRope() { return checkModeFlg(0x20000) && field_0x280c.getActor() != NULL && - fopAcM_GetName(field_0x280c.getActor()) == PROC_Obj_Crope; + fopAcM_GetName(field_0x280c.getActor()) == fpcNm_Obj_Crope_e; } fopAc_ac_c* daAlink_c::checkWolfRopeHit(dCcD_GObjInf* i_collider, cXyz const* param_1, int param_2) const { daObjCrope_c* rope_p = (daObjCrope_c*)i_collider->GetCoHitAc(); - if (i_collider->ChkCoHit() && rope_p != NULL && fopAcM_GetName(rope_p) == PROC_Obj_Crope) { + if (i_collider->ChkCoHit() && rope_p != NULL && fopAcM_GetName(rope_p) == fpcNm_Obj_Crope_e) { if (param_2) { if (rope_p->getRopeStartPos()->abs2XZ(*param_1) > SQUARE(100.0f)) { if (rope_p->getRopeEndPos()->abs2XZ(*param_1) > SQUARE(100.0f)) { @@ -4987,9 +4987,9 @@ const cXyz* daAlink_c::checkMidnaLockJumpPoint() const { if (mProcID == PROC_WOLF_TAG_JUMP && field_0x280c.getActorConst() != NULL) { wljump_p = field_0x280c.getActorConst(); - } else if (field_0x27f4 != NULL && fopAcM_GetName(field_0x27f4) == PROC_Tag_Wljump) { + } else if (field_0x27f4 != NULL && fopAcM_GetName(field_0x27f4) == fpcNm_Tag_Wljump_e) { wljump_p = field_0x27f4; - } else if (partner_p != NULL && fopAcM_GetName(partner_p) == PROC_Tag_Wljump) { + } else if (partner_p != NULL && fopAcM_GetName(partner_p) == fpcNm_Tag_Wljump_e) { wljump_p = partner_p; } @@ -5225,7 +5225,7 @@ int daAlink_c::procWolfTagJumpLand() { static fopAc_ac_c* daAlink_searchGiant(fopAc_ac_c* i_actor, void* i_data) { cXyz* gnd_chk_pos = static_cast(i_data); - if (fopAcM_GetName(i_actor) == PROC_OBJ_SEKIZOA && + if (fopAcM_GetName(i_actor) == fpcNm_OBJ_SEKIZOA_e && i_actor->current.pos.abs2(*gnd_chk_pos) < SQUARE(200.0f)) { return i_actor; @@ -5237,7 +5237,7 @@ static fopAc_ac_c* daAlink_searchGiant(fopAc_ac_c* i_actor, void* i_data) { static void* daAlink_searchGiantTalk(fopAc_ac_c* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_GetName(i_actor) == PROC_OBJ_SEKIZOA && + if (fopAcM_GetName(i_actor) == fpcNm_OBJ_SEKIZOA_e && static_cast(i_actor)->getType() == 0) { return i_actor; @@ -6039,8 +6039,8 @@ BOOL daAlink_c::checkWolfLieContinue(int param_0) { if ((param_0 || ((mTargetedActor != NULL && (mTargetedActor->attention_info.flags & fopAc_AttnFlag_UNK_0x800000)) && - (fopAcM_GetName(mTargetedActor) == PROC_NPC_JAGAR || - fopAcM_GetName(mTargetedActor) == PROC_NPC_BOU))) && + (fopAcM_GetName(mTargetedActor) == fpcNm_NPC_JAGAR_e || + fopAcM_GetName(mTargetedActor) == fpcNm_NPC_BOU_e))) && !getSlidePolygon(&slide_poly) && !checkWolfLieWaterIn()) { return true; @@ -6485,7 +6485,7 @@ int daAlink_c::decideDoStatusSwimWolf() { return 1; } - if (field_0x27f4 != NULL && fopAcM_GetName(field_0x27f4) == PROC_Obj_Drop) { + if (field_0x27f4 != NULL && fopAcM_GetName(field_0x27f4) == fpcNm_Obj_Drop_e) { setDoStatus(BUTTON_STATUS_UNK_57); if (doTrigger()) { fopAcM_setCarryNow(field_0x27f4, 0); @@ -7946,7 +7946,7 @@ int daAlink_c::procWolfLockAttackInit(int param_0) { commonProcInit(PROC_WOLF_LOCK_ATTACK); setSingleAnimeWolfParam(WANM_ATTACK_A_START, &mpHIO->mWolf.mWlAttack.mWlAtNjump.m.mAerialAttackAnm); - if (fopAcM_GetName(mWolfLockAcKeep[0].getActor()) == PROC_E_YMB) { + if (fopAcM_GetName(mWolfLockAcKeep[0].getActor()) == fpcNm_E_YMB_e) { mProcVar5.field_0x3012 = 1; if (param_0 == 0) { @@ -8019,7 +8019,7 @@ int daAlink_c::procWolfLockAttack() { // early return checks for colliding with at shields or if the actor hit is not freezard if (isAtShieldHit || (checkAtShieldHit(mAtCyl) && (mAtCyl.GetAtHitAc() == NULL || - fopAcM_GetName(mAtCyl.GetAtHitAc()) != PROC_E_FB))) + fopAcM_GetName(mAtCyl.GetAtHitAc()) != fpcNm_E_FB_e))) { return procCoLargeDamageInit(-4, TRUE, 0, 0, NULL, 2); } @@ -8082,7 +8082,7 @@ int daAlink_c::procWolfLockAttackTurnInit(int param_0) { } if (mWolfLockAcKeep[0].getActor() != NULL && - fopAcM_GetName(mWolfLockAcKeep[0].getActor()) == PROC_E_YMB) + fopAcM_GetName(mWolfLockAcKeep[0].getActor()) == fpcNm_E_YMB_e) { mProcVar5.field_0x3012 = 1; } else { @@ -8344,7 +8344,7 @@ int daAlink_c::procWolfGrabUpInit() { return checkNextActionWolf(0); } - if (fopAcM_GetName(field_0x27f4) == PROC_Obj_MasterSword) { + if (fopAcM_GetName(field_0x27f4) == fpcNm_Obj_MasterSword_e) { setGrabItemActor(field_0x27f4); return 1; } @@ -8371,8 +8371,8 @@ int daAlink_c::procWolfGrabUpInit() { field_0x37c8 = field_0x27f4->current.pos - field_0x3510; mProcVar3.field_0x300e = 0; - if (fopAcM_GetName(field_0x27f4) != PROC_Obj_Drop && - fopAcM_GetName(field_0x27f4) != PROC_Obj_Sword) + if (fopAcM_GetName(field_0x27f4) != fpcNm_Obj_Drop_e && + fopAcM_GetName(field_0x27f4) != fpcNm_Obj_Sword_e) { f32 prev_x = current.pos.x; f32 prev_z = current.pos.z; @@ -8577,7 +8577,7 @@ int daAlink_c::procWolfPush() { static fopAc_ac_c* daAlink_searchEnemyCargo(fopAc_ac_c* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_GetName(i_actor) == PROC_E_YC) { + if (fopAcM_GetName(i_actor) == fpcNm_E_YC_e) { return i_actor; } @@ -8699,7 +8699,7 @@ int daAlink_c::procWolfGanonCatchInit() { } mDemo.setSpecialDemoType(); - field_0x27f4->actor_status |= 0x800; + field_0x27f4->actor_status |= fopAcStts_STAFF_EXTRA_e; commonProcInit(PROC_WOLF_GANON_CATCH); field_0x280c.setData(field_0x27f4); @@ -8952,7 +8952,7 @@ int daAlink_c::procWolfChainWait() { int daAlink_c::procWolfDigInit() { BOOL var_r28 = TRUE; - if (checkEndResetFlg1(ERFLG1_UNK_100000) && field_0x27f4 != NULL && fopAcM_GetName(field_0x27f4) == PROC_Obj_Digpl) { + if (checkEndResetFlg1(ERFLG1_UNK_100000) && field_0x27f4 != NULL && fopAcM_GetName(field_0x27f4) == fpcNm_Obj_Digpl_e) { int type = ((daObjDigpl_c*)field_0x27f4)->getType(); if (type == 0 || type == 2 || type == 3) { var_r28 = FALSE; @@ -8977,11 +8977,11 @@ int daAlink_c::procWolfDigInit() { if (field_0x27f4 != NULL) { mProcVar1.mDigActorName = fopAcM_GetName(field_0x27f4); } else { - mProcVar1.mDigActorName = PROC_ALINK; + mProcVar1.mDigActorName = fpcNm_ALINK_e; } fopAc_ac_c* var_r29; - if (checkEndResetFlg1(ERFLG1_UNK_100000) && mProcVar1.mDigActorName != PROC_Obj_Lv4DigSand && mProcVar1.mDigActorName != PROC_Obj_DigSnow) { + if (checkEndResetFlg1(ERFLG1_UNK_100000) && mProcVar1.mDigActorName != fpcNm_Obj_Lv4DigSand_e && mProcVar1.mDigActorName != fpcNm_Obj_DigSnow_e) { var_r29 = field_0x27f4; } else { var_r29 = NULL; @@ -8991,7 +8991,7 @@ int daAlink_c::procWolfDigInit() { mProcVar4.mDigExitID = 0; if (var_r29 != NULL) { - if (fopAcM_GetName(var_r29) == PROC_Obj_Digpl) { + if (fopAcM_GetName(var_r29) == fpcNm_Obj_Digpl_e) { mProcVar2.mDigType = ((daObjDigpl_c*)var_r29)->getType(); mProcVar4.mDigExitID = ((daObjDigpl_c*)var_r29)->getSceneNum(); field_0x280c.setData(var_r29); @@ -9015,9 +9015,9 @@ int daAlink_c::procWolfDigInit() { mProcVar2.mDigType = 4; if (checkEndResetFlg1(ERFLG1_UNK_100000)) { - if (mProcVar1.mDigActorName == PROC_Obj_DigSnow) { + if (mProcVar1.mDigActorName == fpcNm_Obj_DigSnow_e) { ((daObjDigSnow_c* )field_0x27f4)->startDig(); - } else if (mProcVar1.mDigActorName == PROC_Obj_Lv4DigSand) { + } else if (mProcVar1.mDigActorName == fpcNm_Obj_Lv4DigSand_e) { ((daObjL4DigSand_c*)field_0x27f4)->startDig(); } field_0x280c.setData(field_0x27f4); @@ -9119,9 +9119,9 @@ int daAlink_c::procWolfDig() { setWolfDigEffect(); } else { if (field_0x280c.getActor() != NULL) { - if (mProcVar1.mDigActorName == PROC_Obj_DigSnow) { + if (mProcVar1.mDigActorName == fpcNm_Obj_DigSnow_e) { ((daObjDigSnow_c*)field_0x280c.getActor())->endDig(); - } else if (mProcVar1.mDigActorName == PROC_Obj_Lv4DigSand) { + } else if (mProcVar1.mDigActorName == fpcNm_Obj_Lv4DigSand_e) { ((daObjL4DigSand_c*)field_0x280c.getActor())->endDig(); } } @@ -9284,21 +9284,21 @@ int daAlink_c::procWolfDigThrough() { } void daAlink_c::setSmellSave() { - if (dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_MEDICINE) { + if (dComIfGs_getCollectSmell() == dItemNo_SMELL_MEDICINE_e) { dComIfGs_offEventBit(dSv_event_flag_c::F_0387); } dMsgObject_setSmellType(mProcVar5.field_0x3012); - if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_MEDICINE) { + if (mProcVar5.field_0x3012 == dItemNo_SMELL_MEDICINE_e) { dComIfGs_onEventBit(dSv_event_flag_c::F_0387); - } else if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_CHILDREN) { + } else if (mProcVar5.field_0x3012 == dItemNo_SMELL_CHILDREN_e) { fopAcM_onSwitch(this, 102); - } else if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_YELIA_POUCH) { + } else if (mProcVar5.field_0x3012 == dItemNo_SMELL_YELIA_POUCH_e) { fopAcM_onSwitch(this, 103); - } else if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_FISH) { + } else if (mProcVar5.field_0x3012 == dItemNo_SMELL_FISH_e) { dComIfGs_onEventBit(dSv_event_flag_c::F_0801); - } else if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_POH) { + } else if (mProcVar5.field_0x3012 == dItemNo_SMELL_POH_e) { dComIfGs_onEventBit(dSv_event_flag_c::F_0810); } @@ -9331,7 +9331,7 @@ int daAlink_c::procWolfGetSmellInit() { dComIfGp_setPlayerStatus1(0, 0x4000000); mProcVar2.field_0x300c = 0; - if (dComIfGs_getCollectSmell() == fpcNm_ITEM_NONE) { + if (dComIfGs_getCollectSmell() == dItemNo_NONE_e) { field_0x3198 = 0xBBC; } else { field_0x3198 = 0xBBB; @@ -9339,9 +9339,9 @@ int daAlink_c::procWolfGetSmellInit() { field_0x319c = -1; - if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_YELIA_POUCH) { + if (mProcVar5.field_0x3012 == dItemNo_SMELL_YELIA_POUCH_e) { field_0x319c = 0x2220; - } else if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_CHILDREN) { + } else if (mProcVar5.field_0x3012 == dItemNo_SMELL_CHILDREN_e) { field_0x319c = 0x2240; } @@ -9364,7 +9364,7 @@ int daAlink_c::procWolfGetSmell() { dComIfGp_getEvent()->reset(this); dComIfGp_clearPlayerStatus1(0, 0x4000000); - if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_YELIA_POUCH) { + if (mProcVar5.field_0x3012 == dItemNo_SMELL_YELIA_POUCH_e) { fopAcM_orderOtherEvent(this, "SMELL_1st", 0xFFFF, 0x400, 1); } else { fopAcM_orderOtherEvent(this, "SMELL_Child", 0xFFFF, 0x400, 1); diff --git a/src/d/actor/d_a_alldie.cpp b/src/d/actor/d_a_alldie.cpp index 376f439561..092e86143b 100644 --- a/src/d/actor/d_a_alldie.cpp +++ b/src/d/actor/d_a_alldie.cpp @@ -188,18 +188,18 @@ static actor_method_class l_daAlldie_Method = { }; actor_process_profile_definition g_profile_ALLDIE = { - fpcLy_CURRENT_e, - 2, - fpcPi_CURRENT_e, - PROC_ALLDIE, - &g_fpcLf_Method.base, - sizeof(daAlldie_c), - 0, - 0, - &g_fopAc_Method.base, - 278, - &l_daAlldie_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_6_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 2, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ALLDIE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daAlldie_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_ALLDIE_e, + /* Actor SubMtd */ &l_daAlldie_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_andsw.cpp b/src/d/actor/d_a_andsw.cpp index 463f2b852c..097d7096c5 100644 --- a/src/d/actor/d_a_andsw.cpp +++ b/src/d/actor/d_a_andsw.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_andsw.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #if DEBUG daAndsw_HIO_c l_HIO; @@ -113,18 +113,18 @@ static actor_method_class l_daAndsw_Method = { }; actor_process_profile_definition g_profile_ANDSW = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_ANDSW, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daAndsw_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 302, // mPriority - &l_daAndsw_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ANDSW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daAndsw_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_ANDSW_e, + /* Actor SubMtd */ &l_daAndsw_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_andsw2.cpp b/src/d/actor/d_a_andsw2.cpp index 9ad44d4877..146dcb5929 100644 --- a/src/d/actor/d_a_andsw2.cpp +++ b/src/d/actor/d_a_andsw2.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_andsw2.h" #include "d/d_com_inf_game.h" #include "d/d_lib.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" u8 daAndsw2_c::getEventNo() { return home.angle.x & 0xFF; @@ -343,18 +343,18 @@ static actor_method_class l_daAndsw2_Method = { }; actor_process_profile_definition g_profile_ANDSW2 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_ANDSW2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daAndsw2_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 303, // mPriority - &l_daAndsw2_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_6_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ANDSW2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daAndsw2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_ANDSW2_e, + /* Actor SubMtd */ &l_daAndsw2_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index 809dadb994..769c3273e9 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -82,7 +82,7 @@ const static dCcD_SrcSph l_coSphSrc = { void daArrow_c::atHitCallBack(dCcD_GObjInf* i_atObjInf, fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf) { if (i_tgObjInf->ChkTgArrowThrough()) { - if (i_tgActor != NULL && fopAcM_GetName(i_tgActor) == PROC_E_PZ) { + if (i_tgActor != NULL && fopAcM_GetName(i_tgActor) == fpcNm_E_PZ_e) { ((daE_PZ_c*)i_tgActor)->onBombArrowHit(); } } else if (i_tgActor != NULL && fopAcM_IsActor(i_tgActor)) { @@ -457,7 +457,7 @@ void daArrow_c::setBombMoveEffect() { bool daArrow_c::checkReget() { if (field_0x7cc.ChkCoHit()) { dComIfGp_setItemArrowNumCount(1); - fopAcM_createItemForSimpleDemo(¤t.pos, fpcNm_ITEM_ARROW_1, -1, NULL, NULL, 0.0f, 0.0f); + fopAcM_createItemForSimpleDemo(¤t.pos, dItemNo_ARROW_1_e, -1, NULL, NULL, 0.0f, 0.0f); mDoAud_seStart(Z2SE_CONSUMP_ITEM_GET, 0, 0, 0); field_0x93f = 1; return true; @@ -632,7 +632,7 @@ int daArrow_c::procMove() { } if (mArrowType == 4) { - if (field_0x688.GetAtHitAc() != NULL && fopAcM_GetName(field_0x688.GetAtHitAc()) == PROC_E_PZ) { + if (field_0x688.GetAtHitAc() != NULL && fopAcM_GetName(field_0x688.GetAtHitAc()) == fpcNm_E_PZ_e) { iVar3 = 0; } else { procSlingHitInit(field_0x688.GetAtHitPosP(), &field_0x688); @@ -1125,7 +1125,7 @@ static int daArrow_draw(daArrow_c* i_this) { } static void* daAlink_searchHorseZelda(fopAc_ac_c* param_0, void* param_1) { - if (fopAcM_GetName(param_0) == PROC_HOZELDA) { + if (fopAcM_GetName(param_0) == fpcNm_HOZELDA_e) { return param_0; } @@ -1221,18 +1221,18 @@ static actor_method_class l_daArrowMethodTable = { }; actor_process_profile_definition g_profile_ARROW = { - fpcLy_CURRENT_e, // mLayerID - 9, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_ARROW, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daArrow_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 750, // mPriority - &l_daArrowMethodTable, // sub_method - 0x00060000, // mStatus - fopAc_UNK_GROUP_5_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 9, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ARROW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daArrow_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_ARROW_e, + /* Actor SubMtd */ &l_daArrowMethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_b_bh.cpp b/src/d/actor/d_a_b_bh.cpp index 8434f9ab43..e2c35acca0 100644 --- a/src/d/actor/d_a_b_bh.cpp +++ b/src/d/actor/d_a_b_bh.cpp @@ -1577,20 +1577,20 @@ static actor_method_class l_daB_BH_Method = { }; actor_process_profile_definition g_profile_B_BH = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_B_BH, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(b_bh_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 211, // mPriority - &l_daB_BH_Method, // sub_method - 0x00044000, // 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_B_BH_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(b_bh_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_BH_e, + /* Actor SubMtd */ &l_daB_BH_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_b_bq.cpp b/src/d/actor/d_a_b_bq.cpp index 1dae7be2d5..07b2ca4439 100644 --- a/src/d/actor/d_a_b_bq.cpp +++ b/src/d/actor/d_a_b_bq.cpp @@ -335,7 +335,7 @@ static int daB_BQ_Draw(b_bq_class* i_this) { } static void* s_fw_sub0(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_FW) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_FW_e) { static_cast(i_actor)->field_0x58c = 0.0f; } @@ -345,7 +345,7 @@ static void* s_fw_sub0(void* i_actor, void* i_data) { static void* s_fw_sub1(void* i_actor, void* i_data) { fopAc_ac_c* data = (fopAc_ac_c*)i_data; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_FW) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_FW_e) { obj_fw_class* fw = static_cast(i_actor); fw->field_0x567 = 1; @@ -382,7 +382,7 @@ static s8 data_805BAD70; static void* s_fw_sub2(void* i_actor, void* i_data) { fopAc_ac_c* data = (fopAc_ac_c*)i_data; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_FW) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_FW_e) { obj_fw_class* fw = static_cast(i_actor); fw->field_0x567 = 2; @@ -409,7 +409,7 @@ static void* s_fw_sub2(void* i_actor, void* i_data) { } static void* s_fw_del_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_FW) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_FW_e) { fopAcM_delete((fopAc_ac_c*)i_actor); } @@ -418,7 +418,7 @@ static void* s_fw_del_sub(void* i_actor, void* i_data) { static void* s_bi_del_sub(void* i_actor, void* i_data) { if (fopAcM_IsActor(i_actor) && - (fopAcM_GetName(i_actor) == PROC_E_BI || fopAcM_GetName(i_actor) == PROC_E_BI_LEAF)) + (fopAcM_GetName(i_actor) == fpcNm_E_BI_e || fopAcM_GetName(i_actor) == fpcNm_E_BI_LEAF_e)) { fopAcM_delete((fopAc_ac_c*)i_actor); } @@ -1189,7 +1189,7 @@ static void fish_set(b_bq_class* i_this) { pos.y = -200.0f; pos.z = lf_pos[i].pos_z; - fopAcM_create(PROC_NPC_LF, lf_pos[i].param, &pos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1); + fopAcM_create(fpcNm_NPC_LF_e, lf_pos[i].param, &pos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1); } } @@ -1921,7 +1921,7 @@ static void demo_camera(b_bq_class* i_this) { dComIfGp_getVibration().StartShock(5, 1, cXyz(0.0f, 1.0f, 0.0f)); cXyz sp120(1.0f, 1.0f, 1.0f); - fopAcM_createItemForBoss(&i_this->field_0x5cc, fpcNm_ITEM_UTAWA_HEART, + fopAcM_createItemForBoss(&i_this->field_0x5cc, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(a_this), &a_this->shape_angle, &sp120, 0.0f, 0.0f, -1); @@ -2079,13 +2079,13 @@ static void demo_camera(b_bq_class* i_this) { spFC += player->current.pos; OS_REPORT("///YSTONE POS %d,%d,%d\n", (int)spFC.x, (int)spFC.y, (int)spFC.z); - fopAcM_create(PROC_OBJ_YSTONE, 0, &spFC, fopAcM_GetRoomNo(a_this), NULL, NULL, -1); + fopAcM_create(fpcNm_OBJ_YSTONE_e, 0, &spFC, fopAcM_GetRoomNo(a_this), NULL, NULL, -1); } if (i_this->mDemoModeTimer == 120) { i_this->field_0x1151 = 1; - obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE); + obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e); if (ystone != NULL) { ystone->field_0x59b = 0; } @@ -2111,7 +2111,7 @@ static void demo_camera(b_bq_class* i_this) { cLib_addCalc2(&i_this->field_0x1298, 210.0f, 0.05f, 0.5f); - obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE); + obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e); if (ystone != NULL) { ystone->setCurrentPos(spFC); } @@ -2378,7 +2378,7 @@ static int daB_BQ_Execute(b_bq_class* i_this) { if (i_this->field_0x1394 == 10) { fpcM_Search(s_fw_del_sub, i_this); } else if (i_this->field_0x1394 == 0) { - fopAcM_createChild(PROC_E_BI, fopAcM_GetID(a_this), 0xFFFFFF35, &a_this->current.pos, + fopAcM_createChild(fpcNm_E_BI_e, fopAcM_GetID(a_this), 0xFFFFFF35, &a_this->current.pos, fopAcM_GetRoomNo(a_this), NULL, NULL, -1, NULL); } } @@ -2497,7 +2497,7 @@ static int daB_BQ_Create(fopAc_ac_c* i_this) { if (!dComIfGs_isStageLife()) { cXyz scale(1.0f, 1.0f, 1.0f); pos.set(60.0f, 0.0f, 1778.0f); - fopAcM_createItemForBoss(&pos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(i_this), + fopAcM_createItemForBoss(&pos, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, &scale, 0.0f, 0.0f, -1); } @@ -2626,13 +2626,13 @@ static int daB_BQ_Create(fopAc_ac_c* i_this) { tentacle_pos += i_this->current.pos; a_this->mTentacleIDs[i] = - fopAcM_createChild(PROC_B_BH, fopAcM_GetID(i_this), params | i, &tentacle_pos, + fopAcM_createChild(fpcNm_B_BH_e, fopAcM_GetID(i_this), params | i, &tentacle_pos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1, NULL); offset.x *= -1.0f; } a_this->mMonkeyBombID = - fopAcM_createChild(PROC_E_MB, fopAcM_GetID(i_this), 0xFFFFFFFF, &i_this->current.pos, + fopAcM_createChild(fpcNm_E_MB_e, fopAcM_GetID(i_this), 0xFFFFFFFF, &i_this->current.pos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1, NULL); if (dComIfG_play_c::getLayerNo(0) == 4) { @@ -2673,18 +2673,18 @@ static actor_method_class l_daB_BQ_Method = { }; actor_process_profile_definition g_profile_B_BQ = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_B_BQ, - &g_fpcLf_Method.base, - sizeof(b_bq_class), - 0, - 0, - &g_fopAc_Method.base, - 212, - &l_daB_BQ_Method, - 0x44000, - fopAc_ENEMY_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_BQ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(b_bq_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_BQ_e, + /* Actor SubMtd */ &l_daB_BQ_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_b_dr.cpp b/src/d/actor/d_a_b_dr.cpp index 4317585bbc..1d172cf8d1 100644 --- a/src/d/actor/d_a_b_dr.cpp +++ b/src/d/actor/d_a_b_dr.cpp @@ -527,18 +527,18 @@ void daB_DR_c::mStatusONOFF(int i_status) { attention_info.distances[fopAc_attn_BATTLE_e] = 0; attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e; fopAcM_OffStatus(this, 0); - fopAcM_OffStatus(this, 0x200000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e); return; case 1: attention_info.distances[fopAc_attn_BATTLE_e] = 85; attention_info.flags |= fopAc_AttnFlag_BATTLE_e; fopAcM_OnStatus(this, 0); - fopAcM_OnStatus(this, 0x200000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x200000_e); return; case 2: attention_info.distances[fopAc_attn_BATTLE_e] = 60; fopAcM_OnStatus(this, 0); - fopAcM_OffStatus(this, 0x200000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e); attention_info.flags |= fopAc_AttnFlag_BATTLE_e; return; } @@ -842,7 +842,7 @@ void daB_DR_c::chkPartCreate(bool param_0) { prm |= (BREAK_PARTS_DT[part_no].prm << 8); size.x = size.y = size.z = BREAK_PARTS_DT[part_no].size; - fopAcM_create(PROC_B_DR, prm, &pos, fopAcM_GetRoomNo(this), &rot, &size, -1); + fopAcM_create(fpcNm_B_DR_e, prm, &pos, fopAcM_GetRoomNo(this), &rot, &size, -1); field_0x7e0++; part_no++; @@ -988,7 +988,7 @@ void daB_DR_c::tail_hit_check() { if (health > 0) { daPy_getPlayerActorClass()->onBossRoomWait(); - if (fopAcM_CheckStatus(this, 0x200000) && cLib_calcTimer(&field_0x7d0) == 0 && mActionMode != ACTION_TAIL_HIT && field_0x7d1 != 2) { + if (fopAcM_CheckStatus(this, fopAcStts_UNK_0x200000_e) && cLib_calcTimer(&field_0x7d0) == 0 && mActionMode != ACTION_TAIL_HIT && field_0x7d1 != 2) { if (mTailCc.ChkTgHit()) { speedF = 0.0f; dComIfGs_onZoneSwitch(21, fopAcM_GetRoomNo(this)); @@ -1004,7 +1004,7 @@ void daB_DR_c::week_hit_check() { if (mWeekCc.ChkTgSet()) { daPy_getPlayerActorClass()->onBossRoomWait(); - if (health > 0 && fopAcM_CheckStatus(this, 0x200000) && cLib_calcTimer(&field_0x7d0) == 0 && mActionMode != ACTION_WEEK_HIT && field_0x7d1 == 2) { + if (health > 0 && fopAcM_CheckStatus(this, fopAcStts_UNK_0x200000_e) && cLib_calcTimer(&field_0x7d0) == 0 && mActionMode != ACTION_WEEK_HIT && field_0x7d1 == 2) { if (mWeekCc.ChkTgHit() && mWeekCc.GetTgHitObj()->ChkAtType(AT_TYPE_HOOKSHOT)) { speedF = 0.0f; Z2GetAudioMgr()->changeBgmStatus(2); @@ -1624,7 +1624,7 @@ void daB_DR_c::executeTailHit() { mMoveMode++; case 15: ato = current.pos + mBoot_c_trance; - parentActorID = fopAcM_createChild(PROC_B_DRE, fopAcM_GetID(this), 1, &ato, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); + parentActorID = fopAcM_createChild(fpcNm_B_DRE_e, fopAcM_GetID(this), 1, &ato, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); Z2GetAudioMgr()->subBgmStart(Z2BGM_DRAGON_D02); dComIfGs_onZoneSwitch(23, fopAcM_GetRoomNo(this)); @@ -1836,7 +1836,7 @@ void daB_DR_c::executeWeekHit() { sp44.z = 0.0f; sp44.x = 0.0f; - parentActorID = fopAcM_createChild(PROC_B_DRE, fopAcM_GetID(this), 0, &sp44, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); + parentActorID = fopAcM_createChild(fpcNm_B_DRE_e, fopAcM_GetID(this), 0, &sp44, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); mTimer[0] = BREG_S(3) + 20; mMoveMode = 1000; return; @@ -2008,7 +2008,7 @@ void daB_DR_c::mBreathSet() { sp1C.x = NREG_S(8) - 1000; mTimer[1] = 3; - fopAcM_createChild(PROC_B_DR, fopAcM_GetID(this), 10, &field_0x760, fopAcM_GetRoomNo(this), &sp1C, NULL, -1, NULL); + fopAcM_createChild(fpcNm_B_DR_e, fopAcM_GetID(this), 10, &field_0x760, fopAcM_GetRoomNo(this), &sp1C, NULL, -1, NULL); } } @@ -4085,7 +4085,7 @@ int daB_DR_c::create() { mSound.init(¤t.pos, &eyePos, 3, 1); mColliderStts.Init(0x19, 0, this); - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); if (arg0 == 0x14) { setActionMode(0xF, 0); @@ -4108,7 +4108,7 @@ int daB_DR_c::create() { angle.x = angle.y = angle.z = 0; pos.set(224.0f, 0.0f, 762.0f); - fopAcM_createItemForBoss(&pos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(this), &angle, &size, 0.0f, 0.0f, -1); + fopAcM_createItemForBoss(&pos, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(this), &angle, &size, 0.0f, 0.0f, -1); } dScnKy_env_light_c* kankyo = dKy_getEnvlight(); @@ -4248,10 +4248,10 @@ int daB_DR_c::create() { mTimer[0] = 2; if (BREG_S(5) == 0) { - parentActorID = fopAcM_createChild(PROC_L7ODR, fopAcM_GetID(this), 0, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); + parentActorID = fopAcM_createChild(fpcNm_L7ODR_e, fopAcM_GetID(this), 0, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); mStatusONOFF(0); } else if (BREG_S(0) != 0) { - parentActorID = fopAcM_createChild(PROC_B_DRE, fopAcM_GetID(this), 0, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); + parentActorID = fopAcM_createChild(fpcNm_B_DRE_e, fopAcM_GetID(this), 0, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); } dScnKy_env_light_c* kankyo = dKy_getEnvlight(); @@ -4294,20 +4294,20 @@ static actor_method_class l_daB_DR_Method = { }; actor_process_profile_definition g_profile_B_DR = { - fpcLy_CURRENT_e, // mLayerID - 4, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_B_DR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daB_DR_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 221, // mPriority - &l_daB_DR_Method, // sub_method - 0x04040000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_DR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daB_DR_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_DR_e, + /* Actor SubMtd */ &l_daB_DR_Method, + /* Status */ fopAcStts_BOSS_e | fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_b_dre.cpp b/src/d/actor/d_a_b_dre.cpp index f11d6fa312..c25b187b76 100644 --- a/src/d/actor/d_a_b_dre.cpp +++ b/src/d/actor/d_a_b_dre.cpp @@ -564,14 +564,14 @@ void daB_DRE_c::DrAction() { sp90 = current.pos; sp1C.set(0, shape_angle.y + 0x1000, 0); - fopAcM_createItemForBoss(&sp90, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(this), &sp1C, + fopAcM_createItemForBoss(&sp90, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(this), &sp1C, NULL, 6.0f + TREG_F(9), 20.0f + TREG_F(10), -1); mTimers[0] = 30; } break; case 6: fopAc_ac_c* lifecon; - fopAcM_SearchByName(PROC_Obj_LifeContainer, &lifecon); + fopAcM_SearchByName(fpcNm_Obj_LifeContainer_e, &lifecon); if (lifecon != NULL) { dComIfGp_event_setTalkPartner(lifecon); player->changeDemoMode(0x2F, 3, 0, 0); @@ -597,7 +597,7 @@ void daB_DRE_c::DrAction() { cXyz sp6C(0.0f, 0.0f, 0.0f); sp90.set(150.0f + aREG_F(0), 400.0f + XREG_F(4), 800.0f); cLib_offsetPos(&sp90, &sp90, shape_angle.y + 0x5000, &sp6C); - fopAcM_create(PROC_OBJ_YSTONE, 0, &sp90, fopAcM_GetRoomNo(this), NULL, NULL, -1); + fopAcM_create(fpcNm_OBJ_YSTONE_e, 0, &sp90, fopAcM_GetRoomNo(this), NULL, NULL, -1); sp90.set(-325.0f, 0.0f, 215.0f); sp1C.set(0, 0, 0); @@ -618,7 +618,7 @@ void daB_DRE_c::DrAction() { } fopAc_ac_c* ystone; - fopAcM_SearchByName(PROC_OBJ_YSTONE, &ystone); + fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e, &ystone); if (ystone != NULL && field_0x638 == 0) { field_0x638 = 1; @@ -944,20 +944,20 @@ static actor_method_class l_daB_DRE_Method = { }; actor_process_profile_definition g_profile_B_DRE = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_B_DRE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daB_DRE_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 231, // mPriority - &l_daB_DRE_Method, // sub_method - 0x00044100, // 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_B_DRE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daB_DRE_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_DRE_e, + /* Actor SubMtd */ &l_daB_DRE_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_b_ds.cpp b/src/d/actor/d_a_b_ds.cpp index 630cc428b9..487addd826 100644 --- a/src/d/actor/d_a_b_ds.cpp +++ b/src/d/actor/d_a_b_ds.cpp @@ -773,7 +773,7 @@ void daB_DS_c::mCreateTrap(bool param_0) { angle.x = 0; angle.y = 0; angle.z = 0; - mTrapID[i] = fopAcM_createChild(PROC_Obj_Lv6TogeTrap, fopAcM_GetID(this), params, + mTrapID[i] = fopAcM_createChild(fpcNm_Obj_Lv6TogeTrap_e, fopAcM_GetID(this), params, ¤t.pos, fopAcM_GetRoomNo(this), &angle, &trap_scale, -1, NULL); trap_count++; @@ -810,7 +810,7 @@ void daB_DS_c::mCreateTrap(bool param_0) { } mTrapID[i] = - fopAcM_createChild(PROC_Obj_Lv6TogeTrap, fopAcM_GetID(this), 0x27104DFF, &pos, + fopAcM_createChild(fpcNm_Obj_Lv6TogeTrap_e, fopAcM_GetID(this), 0x27104DFF, &pos, fopAcM_GetRoomNo(this), &angle, &trap_scale, -1, NULL); if (mBackboneLevel == 2) { angle.y += 0x2AAA; @@ -833,7 +833,7 @@ void daB_DS_c::mCreateTrap(bool param_0) { angle.y = mBirthAngle02_dt[i] + mBirthAngle01_dt[j * 2]; pos.y = mBirthYpos02_dt[i]; mTrapID[idx] = - fopAcM_createChild(PROC_Obj_Lv6TogeTrap, fopAcM_GetID(this), params, &pos, + fopAcM_createChild(fpcNm_Obj_Lv6TogeTrap_e, fopAcM_GetID(this), params, &pos, fopAcM_GetRoomNo(this), &angle, &trap_scale, -1, NULL); } } @@ -1282,7 +1282,7 @@ void daB_DS_c::executeOpeningDemo() { dComIfGp_event_reset(); dComIfGs_onZoneSwitch(0, fopAcM_GetRoomNo(this)); - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); mMode++; // fallthrough } @@ -2062,7 +2062,7 @@ void daB_DS_c::executeDamage() { if (mStaltroopID[i] == 0) { mStaltroopID[i] = - fopAcM_createChild(PROC_E_ZS, fopAcM_GetID(this), 1, &sp1B0, + fopAcM_createChild(fpcNm_E_ZS_e, fopAcM_GetID(this), 1, &sp1B0, fopAcM_GetRoomNo(this), &angle, NULL, -1, NULL); } } @@ -2071,7 +2071,7 @@ void daB_DS_c::executeDamage() { for (int i = 0; i < 5; i++) { if (mStaltroop2ID[i] == 0) { mStaltroop2ID[i] = - fopAcM_createChild(PROC_E_ZS, fopAcM_GetID(this), 2, ¤t.pos, + fopAcM_createChild(fpcNm_E_ZS_e, fopAcM_GetID(this), 2, ¤t.pos, fopAcM_GetRoomNo(this), NULL, NULL, -1, NULL); } } @@ -2298,7 +2298,7 @@ void daB_DS_c::executeDamage() { p2_angle.y = 0; p2_angle.x = 0; - fopAcM_create(PROC_B_DS, param | TYPE_BATTLE_2, ¤t.pos, fopAcM_GetRoomNo(this), + fopAcM_create(fpcNm_B_DS_e, param | TYPE_BATTLE_2, ¤t.pos, fopAcM_GetRoomNo(this), &p2_angle, NULL, 0xff); mMode = 101; // fallthrough @@ -2413,7 +2413,7 @@ void daB_DS_c::breath_smokeSet() { cXyz bullet_pos = mBulletPos; - fopAcM_create(PROC_B_DS, TYPE_BULLET_A, &bullet_pos, fopAcM_GetRoomNo(this), &bullet_angle, + fopAcM_create(fpcNm_B_DS_e, TYPE_BULLET_A, &bullet_pos, fopAcM_GetRoomNo(this), &bullet_angle, NULL, 0xff); } } @@ -2919,7 +2919,7 @@ void daB_DS_c::mFuwafuwaSet(bool param_0) { } void daB_DS_c::mBattle2BreathFireSet(u32 i_params) { - fopAcM_createChild(PROC_B_DS, fopAcM_GetID(this), i_params, &mMouthPos, fopAcM_GetRoomNo(this), + fopAcM_createChild(fpcNm_B_DS_e, fopAcM_GetID(this), i_params, &mMouthPos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); mCreateFireBreath = false; } @@ -5447,7 +5447,7 @@ cPhs_Step daB_DS_c::create() { angle.x = angle.y = angle.z = 0; pos.set(-400.0f, 1775.0f, -4132.0f); - fopAcM_createItemForBoss(&pos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(this), &angle, &scale, + fopAcM_createItemForBoss(&pos, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(this), &angle, &scale, 0.0f, 0.0f, -1); } @@ -5492,7 +5492,7 @@ cPhs_Step daB_DS_c::create() { mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), NULL, NULL); mAcch.CrrPos(dComIfG_Bgsp()); - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } setActionMode(8, 0); @@ -5603,7 +5603,7 @@ cPhs_Step daB_DS_c::create() { fopAcM_onSwitch(this, bitSw); } - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); if (cDmr_SkipInfo == 0 && !dComIfGs_isZoneSwitch(5, fopAcM_GetRoomNo(this))) { mDrawZant = false; @@ -5687,20 +5687,20 @@ static actor_method_class l_daB_DS_Method = { }; actor_process_profile_definition g_profile_B_DS = { - fpcLy_CURRENT_e, - 4, - fpcPi_CURRENT_e, - PROC_B_DS, - &g_fpcLf_Method.base, - sizeof(daB_DS_c), - 0, - 0, - &g_fopAc_Method.base, - 0xDC, - &l_daB_DS_Method, - 0x4040000, - fopAc_ENEMY_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_DS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daB_DS_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_DS_e, + /* Actor SubMtd */ &l_daB_DS_Method, + /* Status */ fopAcStts_BOSS_e | fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; #ifndef __MWERKS__ diff --git a/src/d/actor/d_a_b_gg.cpp b/src/d/actor/d_a_b_gg.cpp index c491aebd83..69c2060bf2 100644 --- a/src/d/actor/d_a_b_gg.cpp +++ b/src/d/actor/d_a_b_gg.cpp @@ -1191,8 +1191,8 @@ void daB_GG_c::Md_DemoAction() { } else if (mpModelMorf->getFrame() > 18.0f && mAnm == BCK_GGB_TAKE_OFF) { var_r29 = 1; } else if (mAnm == BCK_GGB_WAIT_B && mTimers[0] == 0) { - fopAcM_OffStatus(this, 0x200000); - fopAcM_OnStatus(this, 0x80000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e); + fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e); SetAnm(BCK_GGB_TAKE_OFF, 0, 5.0f, 1.0f); mSound.startCreatureVoice(Z2SE_EN_GG_V_TAKE_OFF, -1); @@ -1802,7 +1802,7 @@ void daB_GG_c::F_AttackAction() { speedF = field_0x5bc; field_0x5c0 = (100.0f + (s_LinkPos->y - current.pos.y)) / ((0.9f * var_f31) / speedF); speed.y = field_0x5c0; - fopAcM_OffStatus(this, 0x80000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x80000_e); } break; case 1: { @@ -1842,7 +1842,7 @@ void daB_GG_c::F_AttackAction() { } } else if (current.pos.y - field_0x648 > 500.0f || (field_0x650 == current.pos.y - field_0x648 && mAnm == BCK_GGA_ATTACK_4)) { mCcHookCyl.OnTgSetBit(); - fopAcM_OnStatus(this, 0x80000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e); if (field_0x5b6 != 0) { SetAnm(BCK_GGA_ATTACK_2, 2, 5.0f, 1.0f); @@ -1887,8 +1887,8 @@ void daB_GG_c::F_AttackAction() { mCcHookCyl.OnTgSetBit(); SetAnm(BCK_GGA_PREPARATION, 2, 5.0f, 1.0f); - fopAcM_OffStatus(this, 0x200000); - fopAcM_OnStatus(this, 0x80000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e); + fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e); if (field_0x6ba != 0) { mTimers[0] = l_HIO.fly_attack_wait_time * 0.5f; @@ -2002,8 +2002,8 @@ void daB_GG_c::F_DamageAction() { if (mTimers[0] == 1 && mAnm == BCK_GGA_PULL) { mMode++; fopAcM_cancelHookCarryNow(this); - fopAcM_OffStatus(this, 0x80000); - fopAcM_OnStatus(this, 0x200000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x80000_e); + fopAcM_OnStatus(this, fopAcStts_UNK_0x200000_e); mTimers[0] = 5; } break; @@ -2031,8 +2031,8 @@ void daB_GG_c::F_DamageAction() { s_M_Action = 0; s_W_Action = 0; - fopAcM_OffStatus(this, 0x80000); - fopAcM_OnStatus(this, 0x200000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x80000_e); + fopAcM_OnStatus(this, fopAcStts_UNK_0x200000_e); } else { cXyz* hookshot_top = player->getHookshotTopPos(); cXyz sp24(0.0f, 0.0f, 0.0f); @@ -2046,8 +2046,8 @@ void daB_GG_c::F_DamageAction() { if (mAcch.ChkWallHit() && mTimers[0] == 0) { SetAction(ACTION_FLY, SUBACT_MOVE, 0); - fopAcM_OffStatus(this, 0x200000); - fopAcM_OnStatus(this, 0x80000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e); + fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e); SetAnm(BCK_GGA_WAIT, 2, 5.0f + BREG_F(12), 1.0f); @@ -2084,8 +2084,8 @@ void daB_GG_c::F_DamageAction() { } } else if (current.pos.y < (field_0x648 - 50.0f)) { SetAction(ACTION_FLY, SUBACT_MOVE, 0); - fopAcM_OffStatus(this, 0x200000); - fopAcM_OnStatus(this, 0x80000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e); + fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e); SetAnm(BCK_GGA_WAIT, 2, 5.0f + BREG_F(12), 1.0f); @@ -2546,8 +2546,8 @@ void daB_GG_c::G_MoveAction() { mTimers[1] = 0; gravity = 0.0f; - fopAcM_OffStatus(this, 0x200000); - fopAcM_OnStatus(this, 0x80000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e); + fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e); SetAnm(BCK_GGA_WAIT, 2, 5.0f, 1.0f); @@ -2576,8 +2576,8 @@ void daB_GG_c::FallChk() { if (current.pos.y < (field_0x648 - 10.0f) && field_0x5b6 != 0) { if (!mAcch.ChkGroundHit()) { SetAction(ACTION_FLY, SUBACT_MOVE, 0); - fopAcM_OffStatus(this, 0x200000); - fopAcM_OnStatus(this, 0x80000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e); + fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e); SetAnm(BCK_GGA_WAIT, 2, 5.0f + BREG_F(12), 1.0f); @@ -2615,8 +2615,8 @@ void daB_GG_c::FallChk() { } else if (current.pos.y < (field_0x648 - 10.0f)) { SpeedClear(); SetAction(ACTION_FLY, SUBACT_MOVE, 0); - fopAcM_OffStatus(this, 0x200000); - fopAcM_OnStatus(this, 0x80000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e); + fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e); SetAnm(BCK_GGA_WAIT, 2, 5.0f + BREG_F(12), 1.0f); @@ -4409,7 +4409,7 @@ int daB_GG_c::Create() { mMode = 0; SetAnm(BCK_GG_WAIT, 2, 5.0f, 1.0f); - fopAcM_OnStatus(this, 0x200000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x200000_e); if (-G_CM3D_F_INF != mAcch.GetGroundH()) { current.pos.y = mAcch.GetGroundH(); @@ -4462,20 +4462,20 @@ static actor_method_class l_daB_GG_Method = { }; actor_process_profile_definition g_profile_B_GG = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_B_GG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daB_GG_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 230, // mPriority - &l_daB_GG_Method, // sub_method - 0x000C0100, // 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_B_GG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daB_GG_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_GG_e, + /* Actor SubMtd */ &l_daB_GG_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_b_gm.cpp b/src/d/actor/d_a_b_gm.cpp index 411ab4bad1..0f9304e22a 100644 --- a/src/d/actor/d_a_b_gm.cpp +++ b/src/d/actor/d_a_b_gm.cpp @@ -221,7 +221,7 @@ static int daB_GM_Draw(b_gm_class* i_this) { } static void* s_ko_del(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_GM && fopAcM_GetParam(i_actor) == 0) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_GM_e && fopAcM_GetParam(i_actor) == 0) { ((daE_GM_c*)i_actor)->InstantKill(); } @@ -341,7 +341,7 @@ static BOOL bg_check(b_gm_class* i_this) { static int ko_ct; static void* s_ko_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_GM) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_GM_e) { ko_ct++; } @@ -349,7 +349,7 @@ static void* s_ko_sub(void* i_actor, void* i_data) { } static void* s_ko2_move(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_GM && fopAcM_GetParam(i_actor) == 3) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_GM_e && fopAcM_GetParam(i_actor) == 3) { ((daE_GM_c*)i_actor)->MoveStart(0); return i_actor; } @@ -358,7 +358,7 @@ static void* s_ko2_move(void* i_actor, void* i_data) { } static void* s_ko2_get(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_GM && fopAcM_GetParam(i_actor) == 3) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_GM_e && fopAcM_GetParam(i_actor) == 3) { return i_actor; } @@ -366,7 +366,7 @@ static void* s_ko2_get(void* i_actor, void* i_data) { } static void* s_ko_move(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_GM && fopAcM_GetParam(i_actor) == 1) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_GM_e && fopAcM_GetParam(i_actor) == 1) { ((daE_GM_c*)i_actor)->MoveStart(cM_rndF(15.0f)); } @@ -615,7 +615,7 @@ static void b_gm_kogoma(b_gm_class* i_this) { fpcM_Search(s_ko_sub, a_this); if (ko_ct < 100) { csXyz angle(0, a_this->shape_angle.y, 0); - fopAcM_createChild(PROC_E_GM, fopAcM_GetID(a_this), 0, &kogoma_pos, fopAcM_GetRoomNo(a_this), &angle, NULL, -1, 0); + fopAcM_createChild(fpcNm_E_GM_e, fopAcM_GetID(a_this), 0, &kogoma_pos, fopAcM_GetRoomNo(a_this), &angle, NULL, -1, 0); } } @@ -1343,7 +1343,7 @@ static void demo_camera(b_gm_class* i_this) { spBC += a_this->eyePos; csXyz angle(0, cM_rndF(0x10000), 0); - fopAcM_createChild(PROC_E_GM, fopAcM_GetID(a_this), params, &spBC, fopAcM_GetRoomNo(a_this), &angle, NULL, -1, NULL); + fopAcM_createChild(fpcNm_E_GM_e, fopAcM_GetID(a_this), params, &spBC, fopAcM_GetRoomNo(a_this), &angle, NULL, -1, NULL); } if (i_this->mDemoModeTimer == 90) { @@ -1447,12 +1447,12 @@ static void demo_camera(b_gm_class* i_this) { if (i_this->mDemoModeTimer == 160) { csXyz angle(0, player->shape_angle.y - 0x4000, 0); - fopAcM_createItemForBoss(&i_this->field_0x1cec, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(a_this), &angle, NULL, 10.0f, 30.0f, -1); + fopAcM_createItemForBoss(&i_this->field_0x1cec, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(a_this), &angle, NULL, 10.0f, 30.0f, -1); } if (i_this->mDemoModeTimer == 190) { i_this->field_0x1cec.y += 600.0f; - fopAcM_create(PROC_OBJ_YSTONE, 0, &i_this->field_0x1cec, fopAcM_GetRoomNo(a_this), NULL, NULL, -1); + fopAcM_create(fpcNm_OBJ_YSTONE_e, 0, &i_this->field_0x1cec, fopAcM_GetRoomNo(a_this), NULL, NULL, -1); i_this->mDemoMode = 42; i_this->mDemoModeTimer = 0; } @@ -1479,7 +1479,7 @@ static void demo_camera(b_gm_class* i_this) { cLib_addCalc2(&i_this->field_0x1cec.y, 100.0f, 0.05f, 0.7f); } - obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE); + obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e); if (ystone != NULL) { if (i_this->mDemoModeTimer > 200) { cLib_addCalc2(&i_this->field_0x1cec.y, 100.0f, 0.05f, 1.0f); @@ -2103,7 +2103,7 @@ static int daB_GM_Create(fopAc_ac_c* i_this) { if (!dComIfGs_isStageLife()) { cXyz size(1.0f, 1.0f, 1.0f); pos.set(400.0f, 0.0f, 0.0f); - fopAcM_createItemForBoss(&pos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, &size, 0.0f, 0.0f, -1); + fopAcM_createItemForBoss(&pos, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, &size, 0.0f, 0.0f, -1); } return phase_state; @@ -2232,20 +2232,20 @@ static actor_method_class l_daB_GM_Method = { }; actor_process_profile_definition g_profile_B_GM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_B_GM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(b_gm_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 213, // mPriority - &l_daB_GM_Method, // sub_method - 0x00044000, // 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_B_GM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(b_gm_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_GM_e, + /* Actor SubMtd */ &l_daB_GM_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_b_gnd.cpp b/src/d/actor/d_a_b_gnd.cpp index cf36e35952..2272c35376 100644 --- a/src/d/actor/d_a_b_gnd.cpp +++ b/src/d/actor/d_a_b_gnd.cpp @@ -372,7 +372,7 @@ static int daB_GND_Draw(b_gnd_class* i_this) { } static void* shot_s_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_ARROW && + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_ARROW_e && (fopAcM_GetParam(i_actor) == 1 || fopAcM_GetParam(i_actor) == 2)) { cXyz vec_to_arrow = ((fopAc_ac_c*)i_data)->current.pos - ((fopAc_ac_c*)i_actor)->current.pos; @@ -1235,7 +1235,7 @@ static void b_gnd_g_wait(b_gnd_class* i_this) { s16 angle_step = 0x400; mant_class* mant_p = (mant_class*)fopAcM_SearchByID(i_this->mMantChildID); - dmg_rod_class* mgrod_p = (dmg_rod_class*)fopAcM_SearchByName(PROC_MG_ROD); + dmg_rod_class* mgrod_p = (dmg_rod_class*)fopAcM_SearchByName(fpcNm_MG_ROD_e); if (mgrod_p != NULL && mgrod_p->action != 0) { if (i_this->mMoveMode < 5 && i_this->mPlayerDistXZ < 600.0f) { @@ -2331,7 +2331,7 @@ static void eff_set(b_gnd_class* i_this) { } static void* s_fkdel_sub(void* i_actor, void* i_data) { - if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_FK) { + if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_FK_e) { fopAcM_delete((fopAc_ac_c*)i_actor); } @@ -2339,7 +2339,7 @@ static void* s_fkdel_sub(void* i_actor, void* i_data) { } static void* s_objgbdel_sub(void* i_actor, void* i_data) { - if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_GB) { + if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_GB_e) { fopAcM_delete((fopAc_ac_c*)i_actor); } @@ -3184,7 +3184,7 @@ static void demo_camera(b_gnd_class* i_this) { i_this->mDemoCamMode = 45; i_this->mDemoCamTimer = 0; sp108.set(0.0f, 1100.0f, 0.0f); - fopAcM_create(PROC_OBJ_GB, 0xF0069600, &sp108, fopAcM_GetRoomNo(a_this), 0, 0, -1); + fopAcM_create(fpcNm_OBJ_GB_e, 0xF0069600, &sp108, fopAcM_GetRoomNo(a_this), 0, 0, -1); } cLib_addCalc0(&a_this->speedF, 1.0f, 0.7f); @@ -3645,7 +3645,7 @@ static void demo_camera(b_gnd_class* i_this) { case 92: if (i_this->mDemoCamTimer == 1) { sp108.set(0.0f, 1100.0f, 0.0f); - fopAcM_create(PROC_OBJ_GB, 0xF0069600, &sp108, fopAcM_GetRoomNo(a_this), NULL, NULL, -1); + fopAcM_create(fpcNm_OBJ_GB_e, 0xF0069600, &sp108, fopAcM_GetRoomNo(a_this), NULL, NULL, -1); } if (i_this->mDemoCamTimer == 5) { @@ -3681,7 +3681,7 @@ static void demo_camera(b_gnd_class* i_this) { a_this->shape_angle.y = a_this->current.angle.y = 0x37FE; sp108.set(0.0f, 1100.0f, 0.0f); - fopAcM_create(PROC_OBJ_GB, 0xF0069600, &sp108, fopAcM_GetRoomNo(a_this), NULL, NULL, -1); + fopAcM_create(fpcNm_OBJ_GB_e, 0xF0069600, &sp108, fopAcM_GetRoomNo(a_this), NULL, NULL, -1); break; case 96: i_this->mDemoCamTimer++; @@ -4440,7 +4440,7 @@ static int daB_GND_Execute(b_gnd_class* i_this) { sp118 = (player->current.pos - i_this->mLightBallPos[i]); fk_angle.y = (s16)cM_atan2s(sp118.x, sp118.z); - fopAcM_create(PROC_E_FK, i | 0xFFFFFF00, &i_this->mLightBallPos[i], fopAcM_GetRoomNo(a_this), &fk_angle, NULL, -1); + fopAcM_create(fpcNm_E_FK_e, i | 0xFFFFFF00, &i_this->mLightBallPos[i], fopAcM_GetRoomNo(a_this), &fk_angle, NULL, -1); i_this->mLightBallSound[i].startSound(Z2SE_EN_GND_LIGHTBALL_SUB_HIT, 0, -1); } } else if (i_this->field_0x1e56[i] == 2) { @@ -4811,7 +4811,7 @@ static int daB_GND_Create(fopAc_ac_c* a_this) { b_path[i].z = sp30.z; } - i_this->mMantChildID = fopAcM_createChild(PROC_MANT, fopAcM_GetID(a_this), + i_this->mMantChildID = fopAcM_createChild(fpcNm_MANT_e, fopAcM_GetID(a_this), 0, &a_this->current.pos, fopAcM_GetRoomNo(a_this), NULL, NULL, -1, 0); a_this->health = 24; i_this->field_0x560 = 24; @@ -4957,20 +4957,20 @@ static actor_method_class l_daB_GND_Method = { }; actor_process_profile_definition g_profile_B_GND = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_B_GND, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(b_gnd_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 214, // mPriority - &l_daB_GND_Method, // sub_method - 0x00044000, // 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_B_GND_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(b_gnd_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_GND_e, + /* Actor SubMtd */ &l_daB_GND_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; static int unk_bss_0xF0; diff --git a/src/d/actor/d_a_b_go.cpp b/src/d/actor/d_a_b_go.cpp index 5189a6e9b6..04d16d2c09 100644 --- a/src/d/actor/d_a_b_go.cpp +++ b/src/d/actor/d_a_b_go.cpp @@ -274,7 +274,7 @@ static int daB_GO_Create(fopAc_ac_c* i_this) { child_angle.y = cM_rndF(0x10000); a_this->mGoronChildIDs[i] = - fopAcM_createChild(PROC_B_GOS, fopAcM_GetID(a_this), i, &child_pos, + fopAcM_createChild(fpcNm_B_GOS_e, fopAcM_GetID(a_this), i, &child_pos, fopAcM_GetRoomNo(a_this), &child_angle, NULL, -1, NULL); } } @@ -291,18 +291,18 @@ static actor_method_class l_daB_GO_Method = { }; actor_process_profile_definition g_profile_B_GO = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_B_GO, - &g_fpcLf_Method.base, - sizeof(b_go_class), - 0, - 0, - &g_fopAc_Method.base, - 215, - &l_daB_GO_Method, - 0x40100, - fopAc_ENEMY_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_GO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(b_go_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_GO_e, + /* Actor SubMtd */ &l_daB_GO_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_b_gos.cpp b/src/d/actor/d_a_b_gos.cpp index 076a40ba3a..65a1bd85b7 100644 --- a/src/d/actor/d_a_b_gos.cpp +++ b/src/d/actor/d_a_b_gos.cpp @@ -418,18 +418,18 @@ static actor_method_class l_daB_GOS_Method = { }; actor_process_profile_definition g_profile_B_GOS = { - fpcLy_CURRENT_e, - 8, - fpcPi_CURRENT_e, - PROC_B_GOS, - &g_fpcLf_Method.base, - sizeof(b_gos_class), - 0, - 0, - &g_fopAc_Method.base, - 216, - &l_daB_GOS_Method, - 0x40100, - fopAc_ENEMY_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_GOS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(b_gos_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_GOS_e, + /* Actor SubMtd */ &l_daB_GOS_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_b_mgn.cpp b/src/d/actor/d_a_b_mgn.cpp index 6707c2c745..e9c2235039 100644 --- a/src/d/actor/d_a_b_mgn.cpp +++ b/src/d/actor/d_a_b_mgn.cpp @@ -351,7 +351,7 @@ static int daB_MGN_Draw(daB_MGN_c* i_this) { static void* s_obj_sub(void* i_actor, void* i_data) { if (fopAcM_IsActor(i_actor)) { - if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_ARROW) { + if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_ARROW_e) { if (fopAcM_searchActorDistance((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_data) < 1500.0f + nREG_F(9)) { if (fopAcM_GetSpeedF((fopAc_ac_c*)i_actor)) { s16 var_r29 = ((fopAc_ac_c*)i_actor)->current.angle.y; @@ -919,7 +919,7 @@ void daB_MGN_c::offBodySlideAt() { bool daB_MGN_c::checkHitSlideAt() { for (int i = 0; i < 15; i++) { if (mBodyCcSph[i].ChkAtHit() && !mBodyCcSph[i].ChkAtShieldHit()) { - if (fopAcM_GetName(dCc_GetAc(mBodyCcSph[i].GetAtHitObj()->GetAc())) == PROC_ALINK) { + if (fopAcM_GetName(dCc_GetAc(mBodyCcSph[i].GetAtHitObj()->GetAc())) == fpcNm_ALINK_e) { return true; } } @@ -1526,7 +1526,7 @@ void daB_MGN_c::executeDash() { if (dComIfG_Bgsp().LineCross(&spE8)) { var_r27 = dComIfG_Bgsp().GetActorPointer(spE8); - if (!var_r27 || fopAcM_GetName(var_r27) != PROC_Obj_BHASHI) { + if (!var_r27 || fopAcM_GetName(var_r27) != fpcNm_Obj_BHASHI_e) { attention_info.flags = 0; field_0x20f4[0].OffTgSetBit(); mAtSph.OffAtSetBit(); @@ -1537,7 +1537,7 @@ void daB_MGN_c::executeDash() { } else { if (mAcch.ChkWallHit()) { var_r27 = dComIfG_Bgsp().GetActorPointer(mAcchCir); - if (!var_r27 || fopAcM_GetName(var_r27) != PROC_Obj_BHASHI) { + if (!var_r27 || fopAcM_GetName(var_r27) != fpcNm_Obj_BHASHI_e) { if (abs((s16)(mAcchCir.GetWallAngleY() - shape_angle.y)) > 0x6000) { field_0x20f4[0].OffTgSetBit(); mAtSph.OffAtSetBit(); @@ -2548,7 +2548,7 @@ void daB_MGN_c::executeOpening() { return; } - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); player->changeOriginalDemo(); player->setPlayerPosAndAngle(&pos, 0, 0); @@ -3169,7 +3169,7 @@ void daB_MGN_c::action() { if (mBodyCcSph[0].ChkAtSPrm(1) && mAcch.ChkWallHit()) { daObjBHASHI_c* pillar = (daObjBHASHI_c*)dComIfG_Bgsp().GetActorPointer(mAcchCir); - if (pillar != NULL && fopAcM_GetName(pillar) == PROC_Obj_BHASHI) { + if (pillar != NULL && fopAcM_GetName(pillar) == fpcNm_Obj_BHASHI_e) { pillar->Obj_Damage(current.pos); } } @@ -3582,18 +3582,18 @@ static actor_method_class l_daB_MGN_Method = { }; actor_process_profile_definition g_profile_B_MGN = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_B_MGN, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daB_MGN_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 232, // mPriority - &l_daB_MGN_Method, // sub_method - 0x00044000, // 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_B_MGN_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daB_MGN_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_MGN_e, + /* Actor SubMtd */ &l_daB_MGN_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_b_ob.cpp b/src/d/actor/d_a_b_ob.cpp index 78975ef231..e697b180ac 100644 --- a/src/d/actor/d_a_b_ob.cpp +++ b/src/d/actor/d_a_b_ob.cpp @@ -595,7 +595,7 @@ static void core_hand_move(b_ob_class* i_this) { static int bf_ct; static void* s_bf_sub(void* i_this, void* i_data) { - if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_E_OctBg) { + if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == fpcNm_E_OctBg_e) { bf_ct++; } @@ -603,7 +603,7 @@ static void* s_bf_sub(void* i_this, void* i_data) { } static void* s_bfdel_sub(void* i_this, void* i_data) { - if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_E_OctBg) { + if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == fpcNm_E_OctBg_e) { fopAcM_delete((fopAc_ac_c*)i_this); } @@ -611,7 +611,7 @@ static void* s_bfdel_sub(void* i_this, void* i_data) { } static void* s_kaisoudel_sub(void* i_this, void* i_data) { - if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_Obj_Kaisou) { + if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == fpcNm_Obj_Kaisou_e) { fopAcM_delete((fopAc_ac_c*)i_this); } @@ -647,7 +647,7 @@ static void bombfishset(b_ob_class* i_this) { csXyz angle(-0x3800, 0, 0); angle.y = cM_rndF(0x10000); - fopAcM_createChild(PROC_E_OctBg, fopAcM_GetID(a_this), 0xFFFFFFFF, &pos, + fopAcM_createChild(fpcNm_E_OctBg_e, fopAcM_GetID(a_this), 0xFFFFFFFF, &pos, fopAcM_GetRoomNo(a_this), &angle, NULL, -1, NULL); i_this->mOISound.startCreatureVoice(Z2SE_EN_OI_BG_APPEAR, -1); } @@ -862,7 +862,7 @@ static void core_end(b_ob_class* i_this) { for (int i = 0; i < 8; i++) { i_this->mTentacleActorIDs[i] = - fopAcM_createChild(PROC_B_OH2, fopAcM_GetID(a_this), i, &a_this->current.pos, + fopAcM_createChild(fpcNm_B_OH2_e, fopAcM_GetID(a_this), i, &a_this->current.pos, fopAcM_GetRoomNo(a_this), NULL, NULL, -1, NULL); } } @@ -1493,7 +1493,7 @@ static int fish_end(b_ob_class* i_this) { i_this->mDemoActionTimer = 1; obj_lv3WaterB_class* water = - (obj_lv3WaterB_class*)fopAcM_SearchByName(PROC_OBJ_LV3WATERB); + (obj_lv3WaterB_class*)fopAcM_SearchByName(fpcNm_OBJ_LV3WATERB_e); water->mAction = LV3WATERB_ACT_REMOVE; a_this->home.pos.set(0.0f, -23580.0f, 10300.0f); @@ -1986,7 +1986,7 @@ static void cam_3d_morf(b_ob_class* i_this, f32 i_scale) { } static void* s_hasidel_sub(void* i_this, void* i_data) { - if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_OCTHASHI) { + if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == fpcNm_OCTHASHI_e) { fopAcM_delete((fopAc_ac_c*)i_this); } @@ -2602,7 +2602,7 @@ static void demo_camera(b_ob_class* i_this) { i_this->mDemoActionTimer = 0; i_this->field_0x5dd8 = 4; - obj_lv3WaterB_class* water = (obj_lv3WaterB_class*)fopAcM_SearchByName(PROC_OBJ_LV3WATERB); + obj_lv3WaterB_class* water = (obj_lv3WaterB_class*)fopAcM_SearchByName(fpcNm_OBJ_LV3WATERB_e); water->mAction = LV3WATERB_ACT_END; water->field_0x586 = 0; var_r27 = 2; @@ -2645,7 +2645,7 @@ static void demo_camera(b_ob_class* i_this) { csXyz sp17C(player->shape_angle); sp17C.y += KREG_S(3) + -0x7060; - fopAcM_createItemForBoss(&a_this->eyePos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(a_this), &sp17C, + fopAcM_createItemForBoss(&a_this->eyePos, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(a_this), &sp17C, NULL, KREG_F(19) + 10.0f, 10.0f, -1); dComIfGp_getVibration().StartShock(5, 1, cXyz(0.0f, 1.0f, 0.0f)); } @@ -2749,11 +2749,11 @@ static void demo_camera(b_ob_class* i_this) { sp64 += player->current.pos; OS_REPORT("///YSTONE POS %d,%d,%d\n", sp64.x, sp64.y, sp64.z); - fopAcM_create(PROC_OBJ_YSTONE, 0, &sp64, fopAcM_GetRoomNo(a_this), NULL, NULL, -1); + fopAcM_create(fpcNm_OBJ_YSTONE_e, 0, &sp64, fopAcM_GetRoomNo(a_this), NULL, NULL, -1); } if (i_this->mDemoActionTimer == 120) { - obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE); + obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e); if (ystone != NULL) { ystone->field_0x59b = 0; } @@ -2782,7 +2782,7 @@ static void demo_camera(b_ob_class* i_this) { cLib_addCalc2(&i_this->field_0x5cd8, 210.0f, 0.05f, 0.5f); - obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE); + obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e); if (ystone != NULL) { ystone->setCurrentPos(sp64); } @@ -3494,7 +3494,7 @@ static int daB_OB_Create(fopAc_ac_c* i_this) { if (!dComIfGs_isStageLife()) { cXyz scale(1.0f, 1.0f, 1.0f); pos.set(-916.0f, -23954.0f, 8916.0f); - fopAcM_createItemForBoss(&pos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(a_this), + fopAcM_createItemForBoss(&pos, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(a_this), &a_this->shape_angle, &scale, 0.0f, 0.0f, -1); } @@ -3610,7 +3610,7 @@ static int daB_OB_Create(fopAc_ac_c* i_this) { for (int i = 0; i < 8; i++) { a_this->mTentacleActorIDs[i] = - fopAcM_createChild(PROC_B_OH, fopAcM_GetID(i_this), i, &i_this->current.pos, + fopAcM_createChild(fpcNm_B_OH_e, fopAcM_GetID(i_this), i, &i_this->current.pos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1, NULL); } @@ -3649,18 +3649,18 @@ static actor_method_class l_daB_OB_Method = { }; actor_process_profile_definition g_profile_B_OB = { - fpcLy_CURRENT_e, - 4, - fpcPi_CURRENT_e, - PROC_B_OB, - &g_fpcLf_Method.base, - sizeof(b_ob_class), - 0, - 0, - &g_fopAc_Method.base, - 217, - &l_daB_OB_Method, - 0xC4000, - fopAc_ENEMY_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_OB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(b_ob_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_OB_e, + /* Actor SubMtd */ &l_daB_OB_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_b_oh.cpp b/src/d/actor/d_a_b_oh.cpp index f453d9909d..e52b965b65 100644 --- a/src/d/actor/d_a_b_oh.cpp +++ b/src/d/actor/d_a_b_oh.cpp @@ -263,7 +263,7 @@ static void attack(b_oh_class* i_this) { for (int i = 7; i < 15; i++) { if (i_this->mColliders[i].ChkCoHit()) { cCcD_Obj* obj_p = i_this->mColliders[i].GetCoHitObj(); - if (fopAcM_GetName(obj_p->GetAc()) == PROC_ALINK && + if (fopAcM_GetName(obj_p->GetAc()) == fpcNm_ALINK_e && !dComIfGp_event_runCheck()) { if (!player_p->checkHookshotShootReturnMode() && @@ -831,18 +831,18 @@ static actor_method_class l_daB_OH_Method = { }; actor_process_profile_definition g_profile_B_OH = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_B_OH, - &g_fpcLf_Method.base, - sizeof(b_oh_class), - 0, - 0, - &g_fopAc_Method.base, - 218, - &l_daB_OH_Method, - 0x00044000, - fopAc_ENEMY_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_OH_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(b_oh_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_OH_e, + /* Actor SubMtd */ &l_daB_OH_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_b_oh2.cpp b/src/d/actor/d_a_b_oh2.cpp index b124e13a1d..2e2619d155 100644 --- a/src/d/actor/d_a_b_oh2.cpp +++ b/src/d/actor/d_a_b_oh2.cpp @@ -10,7 +10,7 @@ #include "SSystem/SComponent/c_math.h" #include "c/c_damagereaction.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_actor_mng.h" static int nodeCallBack(J3DJoint* i_joint, int param_1) { @@ -300,18 +300,18 @@ static actor_method_class l_daB_OH2_Method = { }; actor_process_profile_definition g_profile_B_OH2 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_B_OH2, - &g_fpcLf_Method.base, - sizeof(b_oh2_class), - 0, - 0, - &g_fopAc_Method.base, - 219, - &l_daB_OH2_Method, - 0x44000, - fopAc_ENEMY_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_OH2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(b_oh2_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_OH2_e, + /* Actor SubMtd */ &l_daB_OH2_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_b_tn.cpp b/src/d/actor/d_a_b_tn.cpp index 3dacaa507f..17f6616314 100644 --- a/src/d/actor/d_a_b_tn.cpp +++ b/src/d/actor/d_a_b_tn.cpp @@ -1594,16 +1594,16 @@ static void* s_obj_sub(void* i_actor, void* i_data) { f32 mActorDistance = fopAcM_searchActorDistanceXZ((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_data); if (mActorDistance < 300.0f && fopAcM_GetSpeed((fopAc_ac_c*)i_actor).y) { - if (fopAcM_GetName(i_actor) == PROC_Obj_Carry) { + if (fopAcM_GetName(i_actor) == fpcNm_Obj_Carry_e) { return i_actor; } - if (fopAcM_GetName((fopAc_ac_c*)i_actor) == PROC_NBOMB) { + if (fopAcM_GetName((fopAc_ac_c*)i_actor) == fpcNm_NBOMB_e) { return i_actor; } } - if (mActorDistance < 300.0f && fopAcM_GetName(i_actor) == PROC_NBOMB) { + if (mActorDistance < 300.0f && fopAcM_GetName(i_actor) == fpcNm_NBOMB_e) { daNbomb_c* mNBomb = (daNbomb_c*)i_actor; if (mNBomb->checkInsectBombMove((fopAc_ac_c*)i_actor)) { return i_actor; @@ -1614,7 +1614,7 @@ static void* s_obj_sub(void* i_actor, void* i_data) { } } - if ((mActorDistance < 700.0f && fopAcM_GetName(i_actor) == PROC_ARROW) && + if ((mActorDistance < 700.0f && fopAcM_GetName(i_actor) == fpcNm_ARROW_e) && fopAcM_GetSpeedF((fopAc_ac_c*)i_actor)) { s16 mAngleY = ((fopAc_ac_c*)i_actor)->current.angle.y; @@ -1690,7 +1690,7 @@ void daB_TN_c::executeRoomDemo() { } mBlendStatus = 0; - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); camera->mCamera.Stop(); camera->mCamera.SetTrimSize(3); @@ -5147,7 +5147,7 @@ int daB_TN_c::create() { } } - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); setActionMode(ACT_WAITH, ACTION2_0_e); } @@ -5175,20 +5175,20 @@ static actor_method_class l_daB_TN_Method = { }; actor_process_profile_definition g_profile_B_TN = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_B_TN, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daB_TN_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 225, // mPriority - &l_daB_TN_Method, // sub_method - 0x00044000, // 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_B_TN_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daB_TN_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_TN_e, + /* Actor SubMtd */ &l_daB_TN_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_b_yo.cpp b/src/d/actor/d_a_b_yo.cpp index 188e2ce76e..58f77ca5c2 100644 --- a/src/d/actor/d_a_b_yo.cpp +++ b/src/d/actor/d_a_b_yo.cpp @@ -454,7 +454,7 @@ void daB_YO_c::damage_check() { mCcIronStts.Move(); if (mAction == ACT_CHASE && mAtCyl.ChkAtHit() - && fopAcM_GetName(mAtCyl.GetAtHitObj()->GetAc()) == PROC_ALINK) + && fopAcM_GetName(mAtCyl.GetAtHitObj()->GetAc()) == fpcNm_ALINK_e) { reflectFreeMove(); mActionTimer2 = 90; @@ -537,7 +537,7 @@ void daB_YO_c::setBreakFrizad() { angle.set(0, shape_angle.y + cM_rndFX(4000.0f), 0); pos.set(current.pos.x + cM_rndF(50.0f), current.pos.y + (cM_rndF(100.0f) + 100.0f), current.pos.z + cM_rndF(50.0f)); - fopAcM_createChild(PROC_E_FZ, fopAcM_GetID(this), mFreezardNo << 8 | 3, &pos, + fopAcM_createChild(fpcNm_E_FZ_e, fopAcM_GetID(this), mFreezardNo << 8 | 3, &pos, fopAcM_GetRoomNo(this), &angle, NULL, -1, NULL); } } @@ -715,7 +715,7 @@ void daB_YO_c::setApperEffect2() { static void* s_frizad_delete(void* param_0, void* param_1) { if (fopAcM_IsActor(param_0) && !fpcM_IsCreating(fopAcM_GetID(param_0)) - && fopAcM_GetName(param_0) == PROC_E_FZ) { + && fopAcM_GetName(param_0) == fpcNm_E_FZ_e) { static_cast(param_0)->demoDelete(); } return NULL; @@ -771,7 +771,7 @@ void daB_YO_c::executeOpening() { return; } Z2GetAudioMgr()->seStart(Z2SE_EN_YO_DEMO_OP1, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); field_0xfb5 = 3; setBck(ANM_WAIT_A, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); mMode = 1; @@ -788,7 +788,7 @@ void daB_YO_c::executeOpening() { shape_angle.y = -0x1000; setYoMessage(0x234E); ystone_pos.set(0.0f, 0.0f, 3000.0f); - mYstoneID = fopAcM_create(PROC_OBJ_YSTONE, 5, &ystone_pos, fopAcM_GetRoomNo(this), + mYstoneID = fopAcM_create(fpcNm_OBJ_YSTONE_e, 5, &ystone_pos, fopAcM_GetRoomNo(this), NULL, NULL, 0xff); Z2GetAudioMgr()->subBgmStart(Z2BGM_BOSS_SNOWWOMAN_D1); mAcch.CrrPos(dComIfG_Bgsp()); @@ -1653,7 +1653,7 @@ void daB_YO_c::executeSeriousDemo() { mIceCenterPos.y -= 100.0f; mIceAngle = 0; for (int i = 0; i < 10; i++) { - mIcicleID[i] = fopAcM_createChild(PROC_B_YOI, fopAcM_GetID(this), i, ¤t.pos, + mIcicleID[i] = fopAcM_createChild(fpcNm_B_YOI_e, fopAcM_GetID(this), i, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); } @@ -1750,7 +1750,7 @@ void daB_YO_c::createIcecleRevival(u8 param_0) { } if (icicle == NULL) { if (param_0 != 0) { - mIcicleID[i] = fopAcM_createChild(PROC_B_YOI, fopAcM_GetID(this), i | 0x10000, + mIcicleID[i] = fopAcM_createChild(fpcNm_B_YOI_e, fopAcM_GetID(this), i | 0x10000, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); } @@ -1985,7 +1985,7 @@ void daB_YO_c::executeAttackYose() { void daB_YO_c::checkDamageWithIceBreak() { s16 player_angle = fopAcM_searchPlayerAngleY(this); - if (mAtCyl.ChkAtHit() && fopAcM_GetName(mAtCyl.GetAtHitObj()->GetAc()) == PROC_ALINK) { + if (mAtCyl.ChkAtHit() && fopAcM_GetName(mAtCyl.GetAtHitObj()->GetAc()) == fpcNm_ALINK_e) { for (int i = 0; i < 10; i++) { s16 angle_diff = mIceAngle + 0x1999 * i - player_angle; if (abs(angle_diff) < 0xccc && mIcicleID[i] != -1) { @@ -2160,11 +2160,11 @@ void daB_YO_c::executeDemoRevival() { fopAcM_SearchByID(mIcicleID[i], (fopAc_ac_c**)&icicle); } if (icicle == NULL) { - mIcicleID[i] = fopAcM_createChild(PROC_B_YOI, fopAcM_GetID(this), i | 0x20000, + mIcicleID[i] = fopAcM_createChild(fpcNm_B_YOI_e, fopAcM_GetID(this), i | 0x20000, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); } else { - fopAcM_OnStatus(icicle, 0x4000); + fopAcM_OnStatus(icicle, fopAcStts_UNK_0x4000_e); } field_0xfb0++; } @@ -2184,7 +2184,7 @@ void daB_YO_c::executeDemoRevival() { if (mIcicleID[i] != -1) { fopAcM_SearchByID(mIcicleID[i], (fopAc_ac_c**)&icicle); if (icicle != NULL) { - fopAcM_OffStatus(icicle, 0x4000); + fopAcM_OffStatus(icicle, fopAcStts_UNK_0x4000_e); } } } @@ -2292,7 +2292,7 @@ void daB_YO_c::executeDeath() { eventInfo.onCondition(dEvtCnd_CANDEMO_e); return; } - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); gravity = 0.0f; speed.y = 0.0f; camera->mCamera.Stop(); @@ -3371,7 +3371,7 @@ cPhs_Step daB_YO_c::create() { } cXyz pos(0.0f, 0.0f, 3000.0f); - mYstoneID = fopAcM_create(PROC_OBJ_YSTONE, 5, &pos, fopAcM_GetRoomNo(this), + mYstoneID = fopAcM_create(fpcNm_OBJ_YSTONE_e, 5, &pos, fopAcM_GetRoomNo(this), NULL, NULL, 0xff); mRoomType = 1; @@ -3388,7 +3388,7 @@ cPhs_Step daB_YO_c::create() { g_env_light.mColpatWeather = 2; g_env_light.wether_pat0 = 2; g_env_light.wether_pat1 = 2; - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); } else { mRoomType = 0; @@ -3435,20 +3435,20 @@ static actor_method_class l_daB_YO_Method = { }; actor_process_profile_definition g_profile_B_YO = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_B_YO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daB_YO_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 223, // mPriority - &l_daB_YO_Method, // sub_method - 0x00044000, // 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_B_YO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daB_YO_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_YO_e, + /* Actor SubMtd */ &l_daB_YO_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_b_yo_ice.cpp b/src/d/actor/d_a_b_yo_ice.cpp index ca2c8e130b..ee55b8c9f2 100644 --- a/src/d/actor/d_a_b_yo_ice.cpp +++ b/src/d/actor/d_a_b_yo_ice.cpp @@ -158,7 +158,7 @@ void daB_YOI_c::damage_check() { if (pos.y < 50.0f) { pos.y = 50.0f; } - fopAcM_createItem(&pos, fpcNm_ITEM_HEART, -1, -1, NULL, NULL, 0); + fopAcM_createItem(&pos, dItemNo_HEART_e, -1, -1, NULL, NULL, 0); } } } @@ -175,7 +175,7 @@ void daB_YOI_c::setOperate(int param_0) { setActionMode(ACT_RISE_UP, 1); break; case 3: - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); setActionMode(ACT_RISE_UP, 8); break; case 4: @@ -197,7 +197,7 @@ void daB_YOI_c::setOperate(int param_0) { if (pos.y < 50.0f) { pos.y = 50.0f; } - fopAcM_createItem(&pos, fpcNm_ITEM_HEART, -1, -1, NULL, NULL, 0); + fopAcM_createItem(&pos, dItemNo_HEART_e, -1, -1, NULL, NULL, 0); } break; case 8: @@ -207,7 +207,7 @@ void daB_YOI_c::setOperate(int param_0) { setActionMode(ACT_DAMAGE, 0); break; case 10: - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); setActionMode(ACT_DEATH, 0); break; } @@ -1069,7 +1069,7 @@ cPhs_Step daB_YOI_c::create() { setActionMode(ACT_FIRST, 0); break; case 1: - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); setActionMode(ACT_RISE_UP, 9); break; case 2: @@ -1100,18 +1100,18 @@ static actor_method_class l_daB_YOI_Method = { }; actor_process_profile_definition g_profile_B_YOI = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_B_YOI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daB_YOI_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 224, // mPriority - &l_daB_YOI_Method, // sub_method - 0x00044000, // 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_B_YOI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daB_YOI_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_YOI_e, + /* Actor SubMtd */ &l_daB_YOI_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_b_zant.cpp b/src/d/actor/d_a_b_zant.cpp index b36dc76e92..3c590fe101 100644 --- a/src/d/actor/d_a_b_zant.cpp +++ b/src/d/actor/d_a_b_zant.cpp @@ -379,7 +379,7 @@ void daB_ZANT_c::setDamageSe(dCcD_Sph* i_hitSph, int i_dmgAmount) { BOOL var_r29; u8 at_se = ((dCcD_GObjInf*)mAtInfo.mpCollider)->GetAtSe(); - if (mAtInfo.mpCollider->ChkAtType(AT_TYPE_HOOKSHOT) && !fopAcM_CheckStatus(this, 0x280000)) { + if (mAtInfo.mpCollider->ChkAtType(AT_TYPE_HOOKSHOT) && !fopAcM_CheckStatus(this, fopAcStts_UNK_0x200000_e | fopAcStts_UNK_0x80000_e)) { var_r29 = 1; } else { var_r29 = 0; @@ -745,20 +745,20 @@ static void* s_obj_sub(void* i_actor, void* i_data) { if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && !fopAcM_checkCarryNow((fopAc_ac_c*)i_actor)) { f32 obj_dist = fopAcM_searchActorDistanceXZ((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_data); if (obj_dist < 300.0f && fopAcM_GetSpeed((fopAc_ac_c*)i_actor).y) { - if (fopAcM_GetName(i_actor) == PROC_Obj_Carry) { + if (fopAcM_GetName(i_actor) == fpcNm_Obj_Carry_e) { return i_actor; } - if (fopAcM_GetName(i_actor) == PROC_NBOMB) { + if (fopAcM_GetName(i_actor) == fpcNm_NBOMB_e) { return i_actor; } } - if (obj_dist < 300.0f && fopAcM_GetName(i_actor) == PROC_NBOMB && ((daNbomb_c*)i_actor)->getExTime() < 10) { + if (obj_dist < 300.0f && fopAcM_GetName(i_actor) == fpcNm_NBOMB_e && ((daNbomb_c*)i_actor)->getExTime() < 10) { return i_actor; } - if (obj_dist < 700.0f && fopAcM_GetName(i_actor) == PROC_ARROW && fopAcM_GetSpeedF((fopAc_ac_c*)i_actor)) { + if (obj_dist < 700.0f && fopAcM_GetName(i_actor) == fpcNm_ARROW_e && fopAcM_GetSpeedF((fopAc_ac_c*)i_actor)) { s16 actor_angle = ((fopAc_ac_c*)i_actor)->current.angle.y; s16 angle_to_boss = fopAcM_searchActorAngleY((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_data); if (abs((s16)(actor_angle - angle_to_boss)) < 0x2000) { @@ -946,7 +946,7 @@ static int target_info_count; static void* s_pillar_sub(void* i_actor, void* i_data) { if (fopAcM_IsActor(i_actor)) { - if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_Obj_Pillar) { + if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_Obj_Pillar_e) { if (((daPillar_c*)i_actor)->getMdlType() != 0) { ((daB_ZANT_c*)i_data)->mPillarIDs[8] = fopAcM_GetID(i_actor); } else { @@ -1051,7 +1051,7 @@ void daB_ZANT_c::executeSmallAttack() { parameter = 6; } - fopAcM_createChild(PROC_B_ZANTM, fopAcM_GetID(this), parameter, &sp44, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); + fopAcM_createChild(fpcNm_B_ZANTM_e, fopAcM_GetID(this), parameter, &sp44, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); dComIfGp_particle_set(0x886B, &sp44, &shape_angle, NULL); field_0x6fd++; @@ -1343,7 +1343,7 @@ void daB_ZANT_c::executeOpening() { } Z2GetAudioMgr()->setDemoName("force_start"); - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); sp34.set(0.0f, 0.0f, -700.0f); player->setPlayerPosAndAngle(&sp34, 0, 0); @@ -1886,7 +1886,7 @@ void daB_ZANT_c::executeHook() { setBck(BCK_ZAN_HOOK_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); } case 3: - if (!fopAcM_CheckStatus(this, 0x100000)) { + if (!fopAcM_CheckStatus(this, fopAcStts_HOOK_CARRY_NOW_e)) { setTgHitBit(TRUE); setCoHitBit(TRUE); setActionMode(ACT_SWIM, 10); @@ -4049,7 +4049,7 @@ void daB_ZANT_c::executeLastAttack() { mRollCc.ClrAtHit(); } - if (sp48 != NULL && fopAcM_GetName(dCc_GetAc(sp48->GetAc())) == PROC_ALINK) { + if (sp48 != NULL && fopAcM_GetName(dCc_GetAc(sp48->GetAc())) == fpcNm_ALINK_e) { sp3C = 1; field_0x6fd++; @@ -4335,7 +4335,7 @@ void daB_ZANT_c::executeLastDamage() { static void* s_del_tp(void* i_actor, void* i_data) { if (fopAcM_IsActor(i_actor)) { - if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_OBJ_TP) { + if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_OBJ_TP_e) { fopAcM_delete((fopAc_ac_c*)i_actor); } } @@ -4589,18 +4589,18 @@ void daB_ZANT_c::initNextRoom() { fopAcM_SearchByID(mMobileIDs[0], &pmobile); if (mFightPhase == PHASE_OI) { - fopAcM_OnStatus(this, 0x80000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e); if (pmobile == NULL) { cXyz pos(0.0f, -3300.0f, 0.0f); for (int i = 0; i < 4; i++) { - mMobileIDs[i] = fopAcM_create(PROC_B_ZANTZ, i | 0xFFFFFF00, &pos, warp_next_room[mFightPhase], &shape_angle, NULL, -1); + mMobileIDs[i] = fopAcM_create(fpcNm_B_ZANTZ_e, i | 0xFFFFFF00, &pos, warp_next_room[mFightPhase], &shape_angle, NULL, -1); } mCorrectMobileNo = 0; } } else { - fopAcM_OffStatus(this, 0x80000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x80000_e); if (pmobile != NULL) { fopAcM_delete(pmobile); @@ -5600,20 +5600,20 @@ static actor_method_class l_daB_ZANT_Method = { }; actor_process_profile_definition g_profile_B_ZANT = { - fpcLy_CURRENT_e, // mLayerID - 4, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_B_ZANT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daB_ZANT_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 226, // mPriority - &l_daB_ZANT_Method, // sub_method - 0x00040000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_ZANT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daB_ZANT_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_ZANT_e, + /* Actor SubMtd */ &l_daB_ZANT_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_b_zant_magic.cpp b/src/d/actor/d_a_b_zant_magic.cpp index f107187429..97eeec2c4c 100644 --- a/src/d/actor/d_a_b_zant_magic.cpp +++ b/src/d/actor/d_a_b_zant_magic.cpp @@ -277,18 +277,18 @@ static actor_method_class l_daB_ZANTM_Method = { }; actor_process_profile_definition g_profile_B_ZANTM = { - fpcLy_CURRENT_e, // mLayerID - 4, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_B_ZANTM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daB_ZANTM_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 227, // mPriority - &l_daB_ZANTM_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_ZANTM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daB_ZANTM_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_ZANTM_e, + /* Actor SubMtd */ &l_daB_ZANTM_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_b_zant_mobile.cpp b/src/d/actor/d_a_b_zant_mobile.cpp index 75834871b4..5ac969969b 100644 --- a/src/d/actor/d_a_b_zant_mobile.cpp +++ b/src/d/actor/d_a_b_zant_mobile.cpp @@ -109,7 +109,7 @@ void daB_ZANTZ_c::calcSnortEffect() { } if (var_r28 != NULL) { - if (fopAcM_GetName(dCc_GetAc(var_r28->GetAc())) == PROC_ALINK) { + if (fopAcM_GetName(dCc_GetAc(var_r28->GetAc())) == fpcNm_ALINK_e) { daPy_py_c* player = daPy_getPlayerActorClass(); s16 var_r26 = cLib_targetAngleY(¤t.pos, &player->current.pos); player->setThrowDamage(var_r26, 30.0f, 10.0f, 0, 0, 2); @@ -509,18 +509,18 @@ static actor_method_class l_daB_ZANTZ_Method = { }; actor_process_profile_definition g_profile_B_ZANTZ = { - fpcLy_CURRENT_e, // mLayerID - 4, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_B_ZANTZ, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daB_ZANTZ_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 228, // mPriority - &l_daB_ZANTZ_Method, // sub_method - 0x00040000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_ZANTZ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daB_ZANTZ_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_ZANTZ_e, + /* Actor SubMtd */ &l_daB_ZANTZ_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_b_zant_sima.cpp b/src/d/actor/d_a_b_zant_sima.cpp index d73919e6af..83429a84a0 100644 --- a/src/d/actor/d_a_b_zant_sima.cpp +++ b/src/d/actor/d_a_b_zant_sima.cpp @@ -31,10 +31,10 @@ static int daB_ZANTS_Draw(daB_ZANTS_c* i_this) { } static void zants_ride_call_back(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_target) { - if (fopAcM_GetName(i_target) == PROC_ALINK) { + if (fopAcM_GetName(i_target) == fpcNm_ALINK_e) { ((daB_ZANTS_c*)i_this)->mPlayerID = fopAcM_GetID(i_target); ((daB_ZANTS_c*)i_this)->mSinkTimers[TIMER_PLAYER] = 3; - } else if (fopAcM_GetName(i_target) == PROC_B_ZANT) { + } else if (fopAcM_GetName(i_target) == fpcNm_B_ZANT_e) { ((daB_ZANTS_c*)i_this)->mBossID = fopAcM_GetID(i_target); ((daB_ZANTS_c*)i_this)->mSinkTimers[TIMER_ZANT] = 3; } @@ -228,18 +228,18 @@ static actor_method_class l_daB_ZANTS_Method = { }; actor_process_profile_definition g_profile_B_ZANTS = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_B_ZANTS, - &g_fpcLf_Method.base, - sizeof(daB_ZANTS_c), - 0, - 0, - &g_fopAc_Method.base, - 229, - &l_daB_ZANTS_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_ZANTS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daB_ZANTS_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_ZANTS_e, + /* Actor SubMtd */ &l_daB_ZANTS_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_balloon_2D.cpp b/src/d/actor/d_a_balloon_2D.cpp index d4c82f85aa..d23a64965a 100644 --- a/src/d/actor/d_a_balloon_2D.cpp +++ b/src/d/actor/d_a_balloon_2D.cpp @@ -671,18 +671,18 @@ static actor_method_class daBalloon2D_METHODS = { }; actor_process_profile_definition g_profile_BALLOON2D = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_BALLOON2D, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daBalloon2D_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 765, // mPriority - &daBalloon2D_METHODS, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType - }; + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BALLOON2D_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBalloon2D_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_BALLOON2D_e, + /* Actor SubMtd */ &daBalloon2D_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, +}; diff --git a/src/d/actor/d_a_bd.cpp b/src/d/actor/d_a_bd.cpp index ccde129de0..ea786a60a1 100644 --- a/src/d/actor/d_a_bd.cpp +++ b/src/d/actor/d_a_bd.cpp @@ -15,7 +15,46 @@ #include "Z2AudioLib/Z2Instances.h" #include +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; +}; + +daBd_HIO_c::daBd_HIO_c() { + id = -1; + mBasicSize = 1.2f; + mFlightSpeed = 20.0f; + mGroundSpeed = 3.0f; + mFlightTime = 400; + mLinkDetectRange = 300.0f; + mChirpDist = 60; + field_0x1E = 0; +} + +#if DEBUG +/* daBd_HIO_c::genMessage (JORMContext *) */ +void daBd_HIO_c::genMessage(JORMContext* mctx) { + mctx->genLabel("　小鳥　", 0x80000001); + mctx->genSlider("基本大きさ", &mBasicSize, 0.0f, 5.0f); + mctx->genSlider("飛行速度", &mFlightSpeed, 0.0f, 50.0f); + mctx->genSlider("地上速度", &mGroundSpeed, 0.0f, 20.0f); + mctx->genSlider("飛行時間（およそ）", &mFlightTime, 0, 30000); + mctx->genSlider("リンク認識距離", &mLinkDetectRange, 0.0f, 2000.0f); + mctx->genSlider("羽LevelSE鳴る距離", &mChirpDist, 0, 1000); +} +#endif struct land_pos { /* 0x00 */ s32 unk; @@ -44,7 +83,11 @@ static land_pos land_pos127[20] = { {0, -2302.0f, 1216.0f, -242.0f}, {-1, 0.0f, 0.0f, 0.0f}, }; -static int wait_bck[3] = {ANM_PITA_LEFTUP, ANM_PITA_RIGHT, ANM_PITA_DOWN}; +static void anm_init(bd_class* i_this, int i_anmID, f32 i_morf, u8 i_attr, f32 i_speed) { + i_this->mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Bd", i_anmID), i_attr, i_morf, + i_speed, 0.0f, -1.0f, NULL); + i_this->mAnmID = i_anmID; +} static u8 hio_set; static daBd_HIO_c l_HIO; @@ -58,37 +101,6 @@ static cXyz land_sp_pos[4] = { static int rope_pt; -daBd_HIO_c::daBd_HIO_c() { - id = -1; - mBasicSize = 1.2f; - mFlightSpeed = 20.0f; - mGroundSpeed = 3.0f; - mFlightTime = 400; - mLinkDetectRange = 300.0f; - mChirpDist = 60; - field_0x1E = 0; -} - -#if DEBUG -/* daBd_HIO_c::genMessage (JORMContext *) */ -void daBd_HIO_c::genMessage(JORMContext* mctx) { - mctx->genLabel("小鳥", 0x80000001); - mctx->genSlider("基本大きさ", &mBasicSize, 0.0f, 5.0f); - mctx->genSlider("飛行速度", &mFlightSpeed, 0.0f, 50.0f); - mctx->genSlider("地上速度", &mGroundSpeed, 0.0f, 20.0f); - mctx->genSlider("飛行時間（およそ）", &mFlightTime, 0, 30000); - mctx->genSlider("リンク認識距離", &mLinkDetectRange, 0.0f, 2000.0f); - mctx->genSlider("羽LevelSE鳴る距離", &mChirpDist, 0, 1000); -} -#endif - - -static void anm_init(bd_class* i_this, int i_anmID, f32 i_morf, u8 i_attr, f32 i_speed) { - i_this->mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Bd", i_anmID), i_attr, i_morf, - i_speed, 0.0f, -1.0f, NULL); - i_this->mAnmID = i_anmID; -} - static int daBd_Draw(bd_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this; @@ -100,7 +112,6 @@ static int daBd_Draw(bd_class* i_this) { return 1; } - static int way_bg_check(bd_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this; @@ -123,22 +134,23 @@ static int way_bg_check(bd_class* i_this) { return 0; } - static void* s_a_sub(void* i_target, void* i_bird) { - fopAc_ac_c* a_target = (fopAc_ac_c*)i_target; - bd_class* b_bird = (bd_class*)i_bird; - fopEn_enemy_c* a_bird = (fopEn_enemy_c*)i_bird; + UNUSED(i_bird); - if ((fopAcM_IsActor(i_target) && fopAcM_GetGroup(a_target) == fopAc_ENEMY_e) || - fopAcM_GetGroup(a_target) == fopAc_NPC_e || fopAcM_GetName(i_target) == PROC_OBJ_KANBAN2 || - fopAcM_GetName(i_target) == PROC_OBJ_FOOD) + if ((fopAcM_IsActor(i_target) && fopAcM_GetGroup((fopAc_ac_c*)i_target) == fopAc_ENEMY_e) || + fopAcM_GetGroup((fopAc_ac_c*)i_target) == fopAc_NPC_e || fopAcM_GetName(i_target) == fpcNm_OBJ_KANBAN2_e || + fopAcM_GetName(i_target) == fpcNm_OBJ_FOOD_e) { - cXyz distance = a_bird->current.pos - a_target->current.pos; + fopEn_enemy_c* birdEnemy = (fopEn_enemy_c*)i_bird; + fopAc_ac_c* a_target = (fopAc_ac_c*)i_target; + + cXyz distance = birdEnemy->current.pos - a_target->current.pos; if (distance.abs() < l_HIO.mLinkDetectRange + 10.0f * fabsf(a_target->speedF)) { return i_target; } - distance = b_bird->field_0x5C4 - a_target->current.pos; + bd_class* bird = (bd_class*)birdEnemy; + distance = bird->field_0x5C4 - a_target->current.pos; if (distance.abs() < l_HIO.mLinkDetectRange + 10.0f * fabsf(a_target->speedF)) { return i_target; } @@ -146,9 +158,7 @@ static void* s_a_sub(void* i_target, void* i_bird) { return NULL; } - static void pl_check(bd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); f32 var_f30; @@ -161,7 +171,7 @@ static void pl_check(bd_class* i_this) { } if ((i_this->field_0x618 & 0xF) == 0) { - var_r28 = (u32)(uintptr_t)fpcM_Search(s_a_sub, a_this); + var_r28 = (u32)(uintptr_t)fpcM_Search(s_a_sub, i_this); } if (daPy_getPlayerActorClass()->checkHorseRide()) { @@ -201,23 +211,22 @@ static int pointBgCheck(cXyz* param_0, cXyz* param_1) { return 0; } - static int land_check(bd_class* i_this) { - int land_pos_len; - land_pos* land_pos; - s8 temp_r1[112]; + s8 sp3C[108]; int sp20 = g_Counter.mCounter0 + fopAcM_GetID(i_this); if ((sp20 & 7) != 0) { return -1; } - fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this; - camera_process_class* camera = dComIfGp_getCamera(0); + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; + camera_class* camera = (camera_class*)dComIfGp_getCamera(0); cXyz sp30; sp30 = camera->view.lookat.center - camera->view.lookat.eye; s16 spA = cM_atan2s(sp30.x, sp30.z); + int land_pos_len; + land_pos* land_pos; if (strcmp(dComIfGp_getStartStageName(), "F_SP103") == 0) { land_pos_len = 20; land_pos = land_pos103; @@ -227,7 +236,7 @@ static int land_check(bd_class* i_this) { } for (int i = 0; i < land_pos_len; i++) { - temp_r1[i] = 0; + sp3C[i] = 0; } f32 var_f31 = 1000.0f; for (int i = 0; i < 5; i++) { @@ -235,7 +244,7 @@ static int land_check(bd_class* i_this) { if (land_pos[j].unk < 0) { break; } - if (temp_r1[j] != 0) { + if (sp3C[j] != 0) { continue; } sp30.x = land_pos[j].x - camera->view.lookat.eye.x; @@ -256,8 +265,8 @@ static int land_check(bd_class* i_this) { sp30.x = land_pos[j].x; sp30.y = land_pos[j].y + 5.0f; sp30.z = land_pos[j].z; - if (pointBgCheck(&a_this->current.pos, &sp30)) { - temp_r1[j] = 1; + if (pointBgCheck(&enemy->current.pos, &sp30)) { + sp3C[j] = 1; } else { return j; } @@ -267,6 +276,7 @@ static int land_check(bd_class* i_this) { return -1; } +static int wait_bck[3] = {ANM_PITA_LEFTUP, ANM_PITA_RIGHT, ANM_PITA_DOWN}; static void drop_check(bd_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this; @@ -278,14 +288,12 @@ static void drop_check(bd_class* i_this) { } } - static void turn_set(bd_class* i_this) { + fopEn_enemy_c* enemy = &i_this->enemy; s16 angle_table[3] = {-0x8000, 0x4000, -0x4000}; - s16 angle = angle_table[(int)cM_rndF(2.99f)]; - i_this->mTargetAngleY = i_this->enemy.current.angle.y + angle; + i_this->mTargetAngleY = enemy->current.angle.y + angle_table[(int)cM_rndF(2.99f)]; } - static void bd_ground(bd_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); @@ -394,7 +402,6 @@ static void bd_ground(bd_class* i_this) { } } - static void bd_fly(bd_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); @@ -514,7 +521,6 @@ static void bd_fly(bd_class* i_this) { } } - static void bd_landing(bd_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); @@ -604,7 +610,6 @@ static void bd_landing2(bd_class* i_this) { TREG_S(7) + 1000); } - static void bd_landing3(bd_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); @@ -647,7 +652,6 @@ static void bd_landing3(bd_class* i_this) { } } - static void bd_rope(bd_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this; @@ -735,7 +739,6 @@ static void bd_drop(bd_class* i_this) { } } - static void action(bd_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this; @@ -851,18 +854,19 @@ static void action(bd_class* i_this) { } } - static int daBd_Execute(bd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this; + //TODO: almost definitely a fakematch, forces debug to use .rodata pool + (void)1.2f; + + fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->enemy; daNpc_Kkri_c* kkri; - daCow_c* cow; if (i_this->field_0x5B6 >= 1) { if (i_this->field_0x642 != 0) { i_this->field_0x642--; } - fopAcM_SearchByName(PROC_NPC_KKRI, (fopAc_ac_c**)&kkri); + fopAcM_SearchByName(fpcNm_NPC_KKRI_e, (fopAc_ac_c**)&kkri); if (kkri != NULL && i_this->field_0x642 == 0) { if (i_this->field_0x5B6 == 1) { MTXCopy(kkri->getBd1Mtx(), *calc_mtx); @@ -889,8 +893,8 @@ static int daBd_Execute(bd_class* i_this) { action(i_this); mDoMtx_stack_c::transS(a_this->current.pos.x, a_this->current.pos.y + i_this->field_0x620, a_this->current.pos.z); - mDoMtx_stack_c::YrotM(a_this->shape_angle.y); - mDoMtx_stack_c::XrotM(a_this->shape_angle.x); + mDoMtx_stack_c::YrotM((s16)a_this->shape_angle.y); + mDoMtx_stack_c::XrotM((s16)a_this->shape_angle.x); mDoMtx_stack_c::ZrotM(a_this->shape_angle.z); mDoMtx_stack_c::scaleM(l_HIO.mBasicSize, l_HIO.mBasicSize, l_HIO.mBasicSize); J3DModel* model_p = i_this->mpMorf->getModel(); @@ -908,7 +912,7 @@ static int daBd_Execute(bd_class* i_this) { i_this->mSound.framework(0, dComIfGp_getReverb(fopAcM_GetRoomNo(a_this))); if (i_this->field_0x656 == 0 && dComIfGp_event_runCheck()) { - cow = (daCow_c*)fopAcM_SearchByName(PROC_COW); + fopAc_ac_c* cow = (fopAc_ac_c*)fopAcM_SearchByName(fpcNm_COW_e); if (cow != NULL && cow->speedF > 1.0f) { i_this->field_0x656 = 1; i_this->mActionID = ACT_GROUND; @@ -965,10 +969,9 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 1; } - static int daBd_Create(fopAc_ac_c* i_act_this) { bd_class* i_this = (bd_class*)i_act_this; - fopAcM_ct(i_act_this, bd_class); + fopAcM_ct(&i_this->enemy, bd_class); int phase_state = dComIfG_resLoad(&i_this->mPhase, "Bd"); if (phase_state == cPhs_COMPLEATE_e) { @@ -998,8 +1001,7 @@ static int daBd_Create(fopAc_ac_c* i_act_this) { i_act_this, 1, &i_this->mAcchCir, fopAcM_GetSpeed_p(i_act_this), NULL, NULL); i_this->mAcchCir.SetWall(10.0f, 10.0f); - i_act_this->health = 1; - i_act_this->field_0x560 = 1; + i_act_this->field_0x560 = i_act_this->health = 1; i_this->mStts.Init(100, 0, i_act_this); static dCcD_SrcSph cc_sph_src = { @@ -1038,7 +1040,7 @@ static int daBd_Create(fopAc_ac_c* i_act_this) { if (i_this->field_0x5B4 != 0xFF && i_this->field_0x5B4 != 0 && i_this->field_0x5B4 != 1) { for (int i = 0; i < i_this->field_0x5B4 - 1; i++) { fopAcM_createChild( - PROC_BD, fopAcM_GetID(i_act_this), fopAcM_GetParam(i_act_this) & 0xFFFFFF00, + fpcNm_BD_e, fopAcM_GetID(i_act_this), fopAcM_GetParam(i_act_this) & 0xFFFFFF00, &i_act_this->current.pos, fopAcM_GetRoomNo(i_act_this), &sp1C, NULL, -1, NULL); } } @@ -1053,20 +1055,20 @@ static actor_method_class l_daBd_Method = { }; actor_process_profile_definition g_profile_BD = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_BD, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(bd_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 718, // mPriority - &l_daBd_Method, // sub_method - 0x000C4100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BD_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(bd_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_BD_e, + /* Actor SubMtd */ &l_daBd_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp index 1eb617d659..2cc6f1f192 100644 --- a/src/d/actor/d_a_bg.cpp +++ b/src/d/actor/d_a_bg.cpp @@ -42,9 +42,11 @@ static int createMatAnm(J3DModelData* i_modelData, u16 i_materialID) { return 1; } +#if PLATFORM_GCN static u8 const lit_3756[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +#endif int daBg_btkAnm_c::create(J3DModelData* i_modelData, J3DAnmTextureSRTKey* i_btk, int i_anmPlay) { mpBtk = JKR_NEW mDoExt_btkAnm(); @@ -243,6 +245,12 @@ int daBg_c::createHeap() { return 1; } +#if DEBUG +static void dummy() { + GXColor color = {0xC0, 0x00, 0x00, 0x00}; +} +#endif + daBg_c::~daBg_c() { int roomNo = fopAcM_GetParam(this); @@ -252,7 +260,7 @@ daBg_c::~daBg_c() { } if (heap != NULL && mpBgW != NULL) { - dComIfG_Bgsp().Release((dBgW_Base*)mpBgW); + dComIfG_Bgsp().Release(mpBgW); dStage_roomControl_c::setBgW(roomNo, NULL); } @@ -626,19 +634,19 @@ static actor_method_class l_daBg_Method = { }; actor_process_profile_definition2 g_profile_BG = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_BG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daBg_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 753, // mPriority - &l_daBg_Method, // sub_method - 0x00060000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType - 0, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBg_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_BG_e, + /* Actor SubMtd */ &l_daBg_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, + /* Unknown */ 0, }; diff --git a/src/d/actor/d_a_bg_obj.cpp b/src/d/actor/d_a_bg_obj.cpp index 7559d5966c..8c98c23b94 100644 --- a/src/d/actor/d_a_bg_obj.cpp +++ b/src/d/actor/d_a_bg_obj.cpp @@ -317,7 +317,7 @@ void daBgObj_c::initAtt() { (ce5_val << 2) | (cd3_val); - fopAc_ac_c* actor = fopAcM_fastCreate(PROC_Tag_Attp, actor_params, ¤t.pos, fopAcM_GetRoomNo(this), + fopAc_ac_c* actor = fopAcM_fastCreate(fpcNm_Tag_Attp_e, actor_params, ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle, &scale, -1, NULL, NULL); if (actor != NULL) { @@ -1363,18 +1363,18 @@ static actor_method_class daBgObj_METHODS = { }; actor_process_profile_definition g_profile_BG_OBJ = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_BG_OBJ, - &g_fpcLf_Method.base, - sizeof(daBgObj_c), - 0, - 0, - &g_fopAc_Method.base, - 752, - &daBgObj_METHODS, - 0x10044100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BG_OBJ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBgObj_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_BG_OBJ_e, + /* Actor SubMtd */ &daBgObj_METHODS, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp index 445792acc1..590897640e 100644 --- a/src/d/actor/d_a_boomerang.cpp +++ b/src/d/actor/d_a_boomerang.cpp @@ -495,8 +495,8 @@ static int daBoomerang_Draw(daBoomerang_c* i_this) { } void daBoomerang_c::lockLineCallback(fopAc_ac_c* i_actor) { - if (i_actor != NULL && fopAcM_GetName(i_actor) != PROC_Obj_glowSphere && - fopAcM_GetName(i_actor) != PROC_E_VT && fopAcM_GetName(i_actor) != PROC_OBJ_BRG) + if (i_actor != NULL && fopAcM_GetName(i_actor) != fpcNm_Obj_glowSphere_e && + fopAcM_GetName(i_actor) != fpcNm_E_VT_e && fopAcM_GetName(i_actor) != fpcNm_OBJ_BRG_e) { setLockActor(i_actor, TRUE); } @@ -1498,20 +1498,20 @@ static actor_method_class l_daBoomerang_Method = { }; actor_process_profile_definition g_profile_BOOMERANG = { - fpcLy_CURRENT_e, // mLayerID - 6, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_BOOMERANG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daBoomerang_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 686, // mPriority - &l_daBoomerang_Method, // sub_method - 0x00060000, // mStatus - fopAc_UNK_GROUP_5_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 6, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BOOMERANG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBoomerang_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_BOOMERANG_e, + /* Actor SubMtd */ &l_daBoomerang_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_bullet.cpp b/src/d/actor/d_a_bullet.cpp index ecce710fca..cac505a0bb 100644 --- a/src/d/actor/d_a_bullet.cpp +++ b/src/d/actor/d_a_bullet.cpp @@ -276,18 +276,18 @@ static actor_method_class daBullet_MethodTable = { }; actor_process_profile_definition g_profile_BULLET = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_BULLET, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daBullet_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 751, // mPriority - &daBullet_MethodTable, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BULLET_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBullet_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_BULLET_e, + /* Actor SubMtd */ &daBullet_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_canoe.cpp b/src/d/actor/d_a_canoe.cpp index 7a0e4706e6..7f393263f7 100644 --- a/src/d/actor/d_a_canoe.cpp +++ b/src/d/actor/d_a_canoe.cpp @@ -21,7 +21,7 @@ static BOOL l_debugMode; #endif static BOOL daCanoe_searchTagWaterFall(fopAc_ac_c* i_actor, void* i_data) { - if (fopAcM_GetName(i_actor) == PROC_Tag_WaterFall) { + if (fopAcM_GetName(i_actor) == fpcNm_Tag_WaterFall_e) { if (((daTagWaterFall_c*)i_actor)->checkHitWaterFall(*(cXyz*)i_data)) { daAlink_getAlinkActorClass()->onWaterFallFrontHit(); } @@ -328,7 +328,7 @@ void daCanoe_c::posMove() { } void daCanoe_c::checkGomikabe(cBgS_PolyInfo& i_polyinfo) { - if (daAlink_c::getMoveBGActorName(i_polyinfo, 1) == PROC_Obj_GOMIKABE) { + if (daAlink_c::getMoveBGActorName(i_polyinfo, 1) == fpcNm_Obj_GOMIKABE_e) { ((daObjGOMIKABE_c*)dComIfG_Bgsp().GetActorPointer(i_polyinfo))->BreakSet(); } } @@ -918,20 +918,20 @@ static actor_method_class l_daCanoe_Method = { }; actor_process_profile_definition g_profile_CANOE = { - fpcLy_CURRENT_e, // mLayerID - 4, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_CANOE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daCanoe_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 724, // mPriority - &l_daCanoe_Method, // sub_method - 0x00044100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_CANOE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daCanoe_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_CANOE_e, + /* Actor SubMtd */ &l_daCanoe_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_coach_2D.cpp b/src/d/actor/d_a_coach_2D.cpp index c10dfc47fa..7c53aa1f10 100644 --- a/src/d/actor/d_a_coach_2D.cpp +++ b/src/d/actor/d_a_coach_2D.cpp @@ -356,18 +356,18 @@ static actor_method_class daCoach2D_METHODS = { }; actor_process_profile_definition g_profile_COACH2D = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_COACH2D, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daCoach2D_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 764, // mPriority - &daCoach2D_METHODS, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_COACH2D_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daCoach2D_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_COACH2D_e, + /* Actor SubMtd */ &daCoach2D_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_coach_fire.cpp b/src/d/actor/d_a_coach_fire.cpp index c4d5e79700..8ffc1b1105 100644 --- a/src/d/actor/d_a_coach_fire.cpp +++ b/src/d/actor/d_a_coach_fire.cpp @@ -164,18 +164,18 @@ static actor_method_class l_daCoachFire_Method = { }; actor_process_profile_definition g_profile_COACH_FIRE = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_COACH_FIRE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daCoachFire_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 332, // mPriority - &l_daCoachFire_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_COACH_FIRE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daCoachFire_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_COACH_FIRE_e, + /* Actor SubMtd */ &l_daCoachFire_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_cow.cpp b/src/d/actor/d_a_cow.cpp index ba803a9148..bdb3ab08da 100644 --- a/src/d/actor/d_a_cow.cpp +++ b/src/d/actor/d_a_cow.cpp @@ -445,7 +445,7 @@ static s16 m_view_angle_wide; static s16 m_view_angle; -#define IS_COW(actor) (fopAcM_GetName((actor)) == PROC_COW) +#define IS_COW(actor) (fopAcM_GetName((actor)) == fpcNm_COW_e) #define IS_VALID_COW_INTERACTION(cow_1, actor) \ (fopAcM_IsActor((cow_1)) && !fpcM_IsCreating(fopAcM_GetID((cow_1))) && IS_COW((cow_1)) && \ (cow_1) != (actor)) @@ -965,7 +965,7 @@ void daCow_c::checkBeforeBg() { if (cLib_calcTimer(&mTimer6)) { return; } - + s16 sVar2; if (planeTri[1] && planeTri[2]) { switch (mAction) { @@ -1458,7 +1458,7 @@ void daCow_c::action_enter() { mEnterTimerDone) { daNpc_Aru_c* aru; - fopAcM_SearchByName(PROC_NPC_ARU, (fopAc_ac_c**)&aru); + fopAcM_SearchByName(fpcNm_NPC_ARU_e, (fopAc_ac_c**)&aru); if (aru) { aru->setLastIn(); } @@ -1660,7 +1660,7 @@ void daCow_c::action_angry() { if (!mDealDamageTimer) { if (!player->checkHorseRide() && mSph[0].ChkCoHit()) { fopAc_ac_c* a = dCc_GetAc(mSph[0].GetCoHitObj()->GetAc()); - if (fopAcM_GetName(a) == PROC_ALINK) { + if (fopAcM_GetName(a) == fpcNm_ALINK_e) { // if touched link who is not on a horse s16 sangle = shape_angle.y; cXyz pos = daPy_getPlayerActorClass()->current.pos; @@ -1893,7 +1893,7 @@ void daCow_c::executeCrazyWait() { mAcchCir.SetWall(100.0f, 110.0f); mTimer1 = 30; - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); } } @@ -2392,7 +2392,7 @@ void daCow_c::executeCrazyBack() { } break; case daCow_c::Action_4: - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OnStatus(this, fopAcStts_CULL_e); if (fopAcM_CheckCondition(this, fopAcCnd_NODRAW_e)) { fopAcM_delete(this); } @@ -2464,19 +2464,19 @@ void daCow_c::action_crazy() { dComIfGoat_SetThrow(this); mMode = daCow_c::Mode_1; - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OnStatus(this, fopAcStts_CULL_e); break; case daCow_c::Mode_1: TICK_TIMER(mForgetCowPTimer); TICK_TIMER(mTimer1); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); if (dComIfGp_event_runCheck() && strcmp(dComIfGp_getEventManager().getRunEventName(), "WILDGOAT") && strcmp(dComIfGp_getEventManager().getRunEventName(), "WILDGOAT_SUCCESS") && strcmp(dComIfGp_getEventManager().getRunEventName(), "WILDGOAT_FAILURE")) { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); } switch (mCrazy) { @@ -2648,7 +2648,7 @@ bool daCow_c::checkWolfBusters() { } daNpc_Aru_c* aru; - fopAcM_SearchByName(PROC_NPC_ARU, (fopAc_ac_c**)&aru); + fopAcM_SearchByName(fpcNm_NPC_ARU_e, (fopAc_ac_c**)&aru); if (!aru) { return false; } @@ -2675,7 +2675,7 @@ void daCow_c::action_wolf() { daPy_py_c* player = daPy_getPlayerActorClass(); daNpc_Aru_c* aru; - fopAcM_SearchByName(PROC_NPC_ARU, (fopAc_ac_c**)&aru); + fopAcM_SearchByName(fpcNm_NPC_ARU_e, (fopAc_ac_c**)&aru); if (!aru) { return; } @@ -2684,7 +2684,7 @@ void daCow_c::action_wolf() { s16 aruAngle = cLib_targetAngleY(¤t.pos, &aru->current.pos); s16 sp14; s16 ang2; - + switch (mMode) { case daCow_c::Mode_0: mMode = daCow_c::Mode_1; @@ -2693,7 +2693,7 @@ void daCow_c::action_wolf() { attention_info.flags |= fopAc_AttnFlag_LOCK_e; mSound.startCreatureVoice(Z2SE_GOAT_V_ANGRY, -1); mTimer10 = cM_rndF(90.0f) + 90.0f; - + break; case daCow_c::Mode_1: sp14 = 0; @@ -2807,7 +2807,7 @@ void daCow_c::action_damage() { mChangeRedTev = 0; speedF = 0.0f; break; - + case daCow_c::Mode_1: setRedTev(); if (mpMorf->isStop()) { @@ -3030,7 +3030,7 @@ bool daCow_c::initialize() { } fopAcM_setCullSizeBox(this, -100.0f, -100.0f, -200.0f, 100.0f, 250.0f, 200.0f); - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); mAcch.CrrPos(dComIfG_Bgsp()); @@ -3050,7 +3050,7 @@ bool daCow_c::initialize() { mPrm0 = 4; setCowInCage(); } - + u8 prm1; switch (mPrm0) { case 3: { @@ -3288,20 +3288,20 @@ static actor_method_class daCow_MethodTable = { }; actor_process_profile_definition g_profile_COW = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_COW, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daCow_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 692, // mPriority - &daCow_MethodTable, // sub_method - 0x00040100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_COW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daCow_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_COW_e, + /* Actor SubMtd */ &daCow_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_crod.cpp b/src/d/actor/d_a_crod.cpp index 25f41b7714..0aecb4ab0e 100644 --- a/src/d/actor/d_a_crod.cpp +++ b/src/d/actor/d_a_crod.cpp @@ -221,15 +221,15 @@ int daCrod_c::execute() { fopAc_ac_c* hit_ac = mAtCps.GetAtHitAc(); if (player->checkCopyRodEquip() && hit_ac != NULL && - (fopAcM_GetName(hit_ac) == PROC_CSTATUE || - fopAcM_GetName(hit_ac) == PROC_CSTAF)) + (fopAcM_GetName(hit_ac) == fpcNm_CSTATUE_e || + fopAcM_GetName(hit_ac) == fpcNm_CSTAF_e)) { fopAcM_SetParam(this, 4); mControllActorKeep.setData(hit_ac); mCameraActorKeep.setData(hit_ac); u16 anm_id; - if (fopAcM_GetName(hit_ac) == PROC_CSTATUE && + if (fopAcM_GetName(hit_ac) == fpcNm_CSTATUE_e && static_cast(hit_ac)->checkBossType()) { anm_id = ANM_WAIT_C; @@ -322,7 +322,7 @@ int daCrod_c::execute() { if (fopAcM_GetParam(this) == 4) { fopAc_ac_c* control_actor = mControllActorKeep.getActor(); - if (fopAcM_GetName(control_actor) == PROC_CSTATUE) { + if (fopAcM_GetName(control_actor) == fpcNm_CSTATUE_e) { current.pos = static_cast(control_actor)->getBallPos(); } else { current.pos = static_cast(control_actor)->getBallPos(); @@ -383,18 +383,18 @@ static actor_method_class l_daCrod_Method = { }; actor_process_profile_definition g_profile_CROD = { - fpcLy_CURRENT_e, - 8, - fpcPi_CURRENT_e, - PROC_CROD, - &g_fpcLf_Method.base, - sizeof(daCrod_c), - 0, - 0, - &g_fopAc_Method.base, - 688, - &l_daCrod_Method, - 0x60000, - 5, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_CROD_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daCrod_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_CROD_e, + /* Actor SubMtd */ &l_daCrod_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_cstaF.cpp b/src/d/actor/d_a_cstaF.cpp index 00fd0f2b63..76b83c8243 100644 --- a/src/d/actor/d_a_cstaF.cpp +++ b/src/d/actor/d_a_cstaF.cpp @@ -580,18 +580,18 @@ static actor_method_class l_daCstaF_Method = { }; actor_process_profile_definition g_profile_CSTAF = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_CSTAF, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daCstaF_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 272, // mPriority - &l_daCstaF_Method, // sub_method - 0x00040520, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_CSTAF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daCstaF_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_CSTAF_e, + /* Actor SubMtd */ &l_daCstaF_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_FREEZE_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_cstatue.cpp b/src/d/actor/d_a_cstatue.cpp index 27d763c89a..7dd3ea8a32 100644 --- a/src/d/actor/d_a_cstatue.cpp +++ b/src/d/actor/d_a_cstatue.cpp @@ -122,7 +122,7 @@ static dCcD_SrcSph l_sphSrc = { }; void daCstatue_c::atHitCallback(fopAc_ac_c* actor) { - if (fopAcM_GetName(actor) == PROC_B_GM) { + if (fopAcM_GetName(actor) == fpcNm_B_GM_e) { onStateFlg0(daCstatue_FLG0_100); } } @@ -358,7 +358,7 @@ int daCstatue_c::create() { mControlDistanceOffset = JMAFastSqrt(4825.0f); mTargetFrame = 21.0f; } else { - fopAcM_OffStatus(this, 0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); mCyl1.SetR(300.0f); mCyl1.SetH(600.0f); mAcchCir[0].SetWall(30.01f, 300.0f); @@ -1156,10 +1156,10 @@ int daCstatue_c::execute() { fopAcM_GetRoomNo(this), 1.0f, speedF); if (fopAcM_checkCarryNow(this)) { onStateFlg0(daCstatue_FLG0_2); - fopAcM_OffStatus(this, 0x400); + fopAcM_OffStatus(this, fopAcStts_FREEZE_e); } else { offStateFlg0(daCstatue_FLG0_2); - fopAcM_OnStatus(this, 0x400); + fopAcM_OnStatus(this, fopAcStts_FREEZE_e); } if (mParam2 != 0x3f) { dTres_c::setIconPositionOfCstatue(mParam2, ¤t.pos); @@ -1215,20 +1215,20 @@ static actor_method_class l_daCstatue_Method = { }; actor_process_profile_definition g_profile_CSTATUE = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_CSTATUE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daCstatue_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 271, // mPriority - &l_daCstatue_Method, // sub_method - 0x00060520, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_CSTATUE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daCstatue_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_CSTATUE_e, + /* Actor SubMtd */ &l_daCstatue_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_FREEZE_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_demo00.cpp b/src/d/actor/d_a_demo00.cpp index 71e046f5a6..c0e3da3121 100644 --- a/src/d/actor/d_a_demo00.cpp +++ b/src/d/actor/d_a_demo00.cpp @@ -1096,7 +1096,7 @@ inline int daDemo00_c::execute() { case 2: { u16 sp0A = sp0E & 0x3FFF; if ((sp0E & 0xC000) == 0) { - fopAcM_create(PROC_MOVIE_PLAYER, sp0A, NULL, fopAcM_GetRoomNo(this), NULL, NULL, 0xFF); + fopAcM_create(fpcNm_MOVIE_PLAYER_e, sp0A, NULL, fopAcM_GetRoomNo(this), NULL, NULL, 0xFF); mDoGph_gInf_c::fadeOut(1.0f); } else { switch (sp0A) { @@ -1896,18 +1896,18 @@ static actor_method_class l_daDemo00_Method = { }; actor_process_profile_definition g_profile_DEMO00 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_DEMO00, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daDemo00_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 685, // mPriority - &l_daDemo00_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DEMO00_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daDemo00_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_DEMO00_e, + /* Actor SubMtd */ &l_daDemo00_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp index 0c69f34b52..6168a6b7e8 100644 --- a/src/d/actor/d_a_demo_item.cpp +++ b/src/d/actor/d_a_demo_item.cpp @@ -113,11 +113,11 @@ void daDitem_c::actionStart() { OS_REPORT("ゲットアイテム：エフェクトライトセット＆表示スタート！\n"); } - if (m_itemNo == fpcNm_ITEM_DUNGEON_EXIT || m_itemNo == fpcNm_ITEM_DUNGEON_EXIT_2) { + if (m_itemNo == dItemNo_DUNGEON_EXIT_e || m_itemNo == dItemNo_DUNGEON_EXIT_2_e) { current.angle.y = dComIfGp_getPlayer(0)->shape_angle.y; } - if (m_itemNo == fpcNm_ITEM_UTAWA_HEART || m_itemNo == fpcNm_ITEM_KAKERA_HEART) { + if (m_itemNo == dItemNo_UTAWA_HEART_e || m_itemNo == dItemNo_KAKERA_HEART_e) { JPABaseEmitter* emitter = field_0x96c.getEmitter(); if (emitter == NULL) { dComIfGp_particle_set(0x8DE, ¤t.pos, NULL, NULL, 0xFF, &field_0x96c, -1, NULL, NULL, NULL); @@ -131,22 +131,22 @@ void daDitem_c::actionStart() { mParticleAlpha = 0xFF; } - if ((m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) && field_0x96c.getEmitter() == NULL) { + if ((m_itemNo == dItemNo_ORANGE_RUPEE_e || m_itemNo == dItemNo_SILVER_RUPEE_e) && field_0x96c.getEmitter() == NULL) { cXyz scale(0.55f, 0.55f, 0.55f); dComIfGp_particle_set(0xC14, &field_0x99c, NULL, &scale, 0xFF, &field_0x96c, -1, NULL, NULL, NULL); } - if (m_itemNo == fpcNm_ITEM_WALLET_LV3 && field_0x96c.getEmitter() == NULL) { + if (m_itemNo == dItemNo_WALLET_LV3_e && field_0x96c.getEmitter() == NULL) { cXyz scale(1.2f, 1.2f, 1.2f); dComIfGp_particle_set(0xC14, &field_0x99c, NULL, &scale, 0xFF, &field_0x96c, -1, NULL, NULL, NULL); } - if (m_itemNo == fpcNm_ITEM_CHUCHU_RARE && field_0x96c.getEmitter() == NULL) { + if (m_itemNo == dItemNo_CHUCHU_RARE_e && field_0x96c.getEmitter() == NULL) { cXyz scale(0.8f, 0.8f, 0.8f); dComIfGp_particle_set(0xC14, &field_0x99c, NULL, &scale, 0xFF, &field_0x96c, -1, NULL, NULL, NULL); } - if ((m_itemNo == fpcNm_ITEM_FAIRY_DROP || m_itemNo == fpcNm_ITEM_DROP_BOTTLE) && field_0x96c.getEmitter() == NULL) { + if ((m_itemNo == dItemNo_FAIRY_DROP_e || m_itemNo == dItemNo_DROP_BOTTLE_e) && field_0x96c.getEmitter() == NULL) { dComIfGp_particle_set(0x8C15, &field_0x99c, NULL, NULL, 0xFF, &field_0x96c, -1, NULL, NULL, NULL); } @@ -164,7 +164,7 @@ void daDitem_c::actionEvent() { cLib_addCalc2(&mLight.mPow, mLightStrength, 0.1f, 1.0f); } - if (m_itemNo == fpcNm_ITEM_POU_SPIRIT) { + if (m_itemNo == dItemNo_POU_SPIRIT_e) { mSound.startLevelSound(Z2SE_EN_PO_SOUL, 0, -1); } @@ -173,7 +173,7 @@ void daDitem_c::actionEvent() { execItemGet(m_itemNo); } - if (m_itemNo == fpcNm_ITEM_KAKERA_HEART) { + if (m_itemNo == dItemNo_KAKERA_HEART_e) { int room_no = dComIfGp_roomControl_getStayNo(); if (strcmp(dComIfGp_getStartStageName(), "F_SP116") == 0 && room_no == 2) { @@ -266,7 +266,7 @@ void daDitem_c::actionEvent() { void daDitem_c::actionWaitLightEnd() { BOOL particle_hidden = TRUE; - if (m_itemNo == fpcNm_ITEM_UTAWA_HEART || m_itemNo == fpcNm_ITEM_KAKERA_HEART) { + if (m_itemNo == dItemNo_UTAWA_HEART_e || m_itemNo == dItemNo_KAKERA_HEART_e) { particle_hidden = cLib_chaseUC(&mParticleAlpha, 0, 26); JPABaseEmitter* emitter = field_0x96c.getEmitter(); @@ -403,7 +403,7 @@ void daDitem_c::settingEffectLight() { void daDitem_c::set_mtx() { mpModel->setBaseScale(scale); - if (m_itemNo != fpcNm_ITEM_DUNGEON_EXIT && m_itemNo != fpcNm_ITEM_DUNGEON_BACK && m_itemNo != fpcNm_ITEM_LV7_DUNGEON_EXIT && m_itemNo != fpcNm_ITEM_DUNGEON_EXIT_2) { + if (m_itemNo != dItemNo_DUNGEON_EXIT_e && m_itemNo != dItemNo_DUNGEON_BACK_e && m_itemNo != dItemNo_LV7_DUNGEON_EXIT_e && m_itemNo != dItemNo_DUNGEON_EXIT_2_e) { s16 var_r28 = 0xFFFF / 250; fopAcM_addAngleY(this, current.angle.y + var_r28, var_r28); } @@ -438,12 +438,12 @@ int daDitem_c::Delete() { dKy_efplight_cut(&mLight); } - if (m_itemNo == fpcNm_ITEM_UTAWA_HEART || m_itemNo == fpcNm_ITEM_KAKERA_HEART) { + if (m_itemNo == dItemNo_UTAWA_HEART_e || m_itemNo == dItemNo_KAKERA_HEART_e) { field_0x96c.remove(); field_0x980.remove(); } - if (m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE || m_itemNo == fpcNm_ITEM_WALLET_LV3 || m_itemNo == fpcNm_ITEM_FAIRY_DROP || m_itemNo == fpcNm_ITEM_DROP_BOTTLE || m_itemNo == fpcNm_ITEM_CHUCHU_RARE) { + if (m_itemNo == dItemNo_ORANGE_RUPEE_e || m_itemNo == dItemNo_SILVER_RUPEE_e || m_itemNo == dItemNo_WALLET_LV3_e || m_itemNo == dItemNo_FAIRY_DROP_e || m_itemNo == dItemNo_DROP_BOTTLE_e || m_itemNo == dItemNo_CHUCHU_RARE_e) { field_0x96c.remove(); } @@ -475,7 +475,7 @@ int daDitem_c::create() { OS_REPORT_ERROR("ゲット用モデルのアーカイブ名がありません！[%d]\n", m_itemNo); } - m_itemNo = fpcNm_ITEM_GREEN_RUPEE; + m_itemNo = dItemNo_GREEN_RUPEE_e; } int phase_state = dComIfG_resLoad(&mPhase, dItem_data::getArcName(m_itemNo)); @@ -519,13 +519,13 @@ int daDitem_c::execute() { eyePos = current.pos; eyePos.y += mpModel->getModelData()->getJointNodePointer(0)->getMax()->y * 0.5f; - if (m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) { + if (m_itemNo == dItemNo_ORANGE_RUPEE_e || m_itemNo == dItemNo_SILVER_RUPEE_e) { field_0x99c = current.pos; field_0x99c.y += 10.0f; - } else if (m_itemNo == fpcNm_ITEM_WALLET_LV3 || m_itemNo == fpcNm_ITEM_CHUCHU_RARE) { + } else if (m_itemNo == dItemNo_WALLET_LV3_e || m_itemNo == dItemNo_CHUCHU_RARE_e) { field_0x99c = current.pos; field_0x99c.y += 15.0f; - } else if (m_itemNo == fpcNm_ITEM_FAIRY_DROP || m_itemNo == fpcNm_ITEM_DROP_BOTTLE) { + } else if (m_itemNo == dItemNo_FAIRY_DROP_e || m_itemNo == dItemNo_DROP_BOTTLE_e) { field_0x99c = current.pos; } @@ -539,7 +539,7 @@ static int daDitem_Execute(daDitem_c* i_this) { int daDitem_c::draw() { switch (m_itemNo) { - case fpcNm_ITEM_WOOD_STICK: + case dItemNo_WOOD_STICK_e: draw_WOOD_STICK(); break; } @@ -561,20 +561,20 @@ static actor_method_class l_daDitem_Method = { }; actor_process_profile_definition g_profile_Demo_Item = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Demo_Item, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daDitem_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 241, // mPriority - &l_daDitem_Method, // sub_method - 0x00060000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Demo_Item_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daDitem_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Demo_Item_e, + /* Actor SubMtd */ &l_daDitem_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp index 48efd5a3ce..2aec26258f 100644 --- a/src/d/actor/d_a_disappear.cpp +++ b/src/d/actor/d_a_disappear.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_disappear.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static int daDisappear_Draw(disappear_class* i_this) { return 1; @@ -16,7 +16,7 @@ static int daDisappear_Draw(disappear_class* i_this) { static void* s_ks_sub(void* i_actor, void*) { fopAc_ac_c* actor_p = (fopAc_ac_c*)i_actor; - if (fopAcM_IsActor(actor_p) && fopAcM_GetName(actor_p) == PROC_NPC_KS) { + if (fopAcM_IsActor(actor_p) && fopAcM_GetName(actor_p) == fpcNm_NPC_KS_e) { actor_p->health = 1; } @@ -123,18 +123,18 @@ static actor_method_class l_daDisappear_Method = { }; actor_process_profile_definition g_profile_DISAPPEAR = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_DISAPPEAR, - &g_fpcLf_Method.base, - sizeof(disappear_class), - 0, - 0, - &g_fopAc_Method.base, - 725, - &l_daDisappear_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DISAPPEAR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(disappear_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_DISAPPEAR_e, + /* Actor SubMtd */ &l_daDisappear_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_dmidna.cpp b/src/d/actor/d_a_dmidna.cpp index 1f096b090f..09d6187d21 100644 --- a/src/d/actor/d_a_dmidna.cpp +++ b/src/d/actor/d_a_dmidna.cpp @@ -89,18 +89,18 @@ static actor_method_class l_daDmidna_Method = { }; actor_process_profile_definition g_profile_DMIDNA = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_DMIDNA, - &g_fpcLf_Method.base, - sizeof(daDmidna_c), - 0, - 0, - &g_fopAc_Method.base, - 93, - &l_daDmidna_Method, - 0x60000, - fopAc_ENV_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DMIDNA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daDmidna_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_DMIDNA_e, + /* Actor SubMtd */ &l_daDmidna_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_do.cpp b/src/d/actor/d_a_do.cpp index 9944ed9755..ffe31165fa 100644 --- a/src/d/actor/d_a_do.cpp +++ b/src/d/actor/d_a_do.cpp @@ -152,7 +152,7 @@ static BOOL target_bgc[5]; static void* s_w_sub(void* i_proc, void* i_this) { if (fopAcM_IsActor(i_proc) && - (fopAcM_GetName(i_proc) == PROC_OBJ_FOOD || fopAcM_GetName(i_proc) == PROC_OBJ_KANBAN2) && + (fopAcM_GetName(i_proc) == fpcNm_OBJ_FOOD_e || fopAcM_GetName(i_proc) == fpcNm_OBJ_KANBAN2_e) && fopAcM_checkCarryNow(static_cast(i_proc)) && target_info_count < 5) { target_info[target_info_count] = static_cast(i_proc); @@ -978,7 +978,7 @@ static s16 hang_set(do_class* i_this) { cXyz vec1, vec2, vec3[2]; vec1 = _this->old.pos - _this->current.pos; cMtx_YrotS(*calc_mtx, cM_atan2s(vec1.x, vec1.z)); - + vec1.x = 0.0f; vec1.y = 0.0f; vec1.z = -100.0f; @@ -1198,7 +1198,7 @@ case1and2: i_this->mpMorf->setPlaySpeed(i_this->mAnmSpeed); cLib_addCalc2(&i_this->speedF, i_this->mAnmSpeed * l_HIO.mRunSpeed, 1.0f, 0.2f * l_HIO.mRunSpeed); - + vec = food->current.pos - i_this->current.pos; angle_step = 0x1000; if (vec.abs() < 120.0f * i_this->mScale.z) { @@ -1235,15 +1235,15 @@ case1and2: if (get_item) { int item_no; if (dComIfGs_getLife() <= 4) { - item_no = fpcNm_ITEM_HEART; + item_no = dItemNo_HEART_e; } else { int rnd = cM_rndF(11.0f); if (rnd <= 5) { - item_no = fpcNm_ITEM_HEART; + item_no = dItemNo_HEART_e; } else if (rnd <= 9) { - item_no = fpcNm_ITEM_GREEN_RUPEE; + item_no = dItemNo_GREEN_RUPEE_e; } else { - item_no = fpcNm_ITEM_BLUE_RUPEE; + item_no = dItemNo_BLUE_RUPEE_e; } } @@ -1342,7 +1342,7 @@ static void do_swim(do_class* i_this) { } static void* s_c_sub(void* param_0, void* param_1) { - if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_CANOE) { + if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == fpcNm_CANOE_e) { return param_0; } return 0; @@ -1412,7 +1412,7 @@ static void do_help(do_class* i_this) { } cLib_addCalc2(&i_this->speedF, target_speed, 1.0f, 2.0f); - + if (!daPy_getLinkPlayerActorClass()->checkCanoeRide() && i_this->mDistFromPlayer < 200.0f) { i_this->mAction = ACT_WAIT_1; i_this->mMode = 0; @@ -1492,7 +1492,7 @@ static s8 do_boat(do_class* i_this) { fabsf(i_this->field_0x698.x) + 2.0f); cLib_addCalc2(&i_this->current.pos.z, i_this->field_0x68c.z, 1.0f, fabsf(i_this->field_0x698.z) + 2.0f); - + if (_this->speed.y <= -80.0f) { _this->speed.y = -80.0f; } @@ -1699,7 +1699,7 @@ static s8 do_carry(do_class* i_this) { i_this->mCcDisableTimer = 5; _this->speed.y = 0.0f; _this->speedF = 0.0f; - + switch (i_this->mMode) { case 0: anm_init(i_this, ANM_TO_CARRY_B, 1.0f, 0, @@ -1726,7 +1726,7 @@ static s8 do_carry(do_class* i_this) { if (!fopAcM_checkCarryNow(_this)) { i_this->mAction = ACT_WAIT_1; i_this->mMode = 0; - + dBgS_GndChk gnd_chk; cXyz vec = _this->current.pos; vec.y += 50.0f; @@ -2266,7 +2266,7 @@ static int daDo_Execute(do_class* i_this) { MtxPosition(&vec, &i_this->eyePos); i_this->attention_info.position = i_this->eyePos; i_this->attention_info.position.y += i_this->mScale.y * 16.0f; - + vec.set(-15.0f, -15.0f, 0.0f); MtxPosition(&vec, ¢er); if (i_this->mCcDisableTimer != 0) { @@ -2300,7 +2300,7 @@ static int daDo_Execute(do_class* i_this) { MtxTrans(20.0f, -24.0f, 0.0f, 1); vec.set(0.0f, 0.0f, 0.0f); MtxPosition(&vec, &item->current.pos); - + item->shape_angle = i_this->shape_angle; item->current.angle = item->shape_angle; item->speed.zero(); @@ -2312,7 +2312,7 @@ static int daDo_Execute(do_class* i_this) { obj_food_class* food = static_cast(fopAcM_SearchByID(i_this->mFoodActorID)); if (food != NULL) { - if (fopAcM_GetName(food) == PROC_OBJ_FOOD) { + if (fopAcM_GetName(food) == fpcNm_OBJ_FOOD_e) { MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(10), *calc_mtx); cMtx_YrotM(*calc_mtx, 0x4000); MtxTrans(0.0f, -7.0f, 25.0f, 1); @@ -2482,7 +2482,7 @@ static cPhs_Step daDo_Create(fopAc_ac_c* i_this) { noFallCheck = true; _this->mParam2 = 200; } - + _this->mItemActorID = -1; daDo_Execute(_this); } @@ -2501,18 +2501,18 @@ static actor_method_class l_daDo_Method = { }; actor_process_profile_definition g_profile_DO = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_DO, - &g_fpcLf_Method.base, - sizeof(do_class), - 0, - 0, - &g_fopAc_Method.base, - 0x2BB, - &l_daDo_Method, - 0x8044000, - fopAc_NPC_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(do_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_DO_e, + /* Actor SubMtd */ &l_daDo_Method, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_door_boss.cpp b/src/d/actor/d_a_door_boss.cpp index 973e11475e..c1a135d42a 100644 --- a/src/d/actor/d_a_door_boss.cpp +++ b/src/d/actor/d_a_door_boss.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_door_boss.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_door_param2.h" #include "SSystem/SComponent/c_math.h" @@ -338,7 +338,7 @@ int daBdoor_c::execute() { &daBdoor_c::actionOpen, &daBdoor_c::actionEnd, }; - if (fopAcM_CheckStatus(this, 0x1000)) { + if (fopAcM_CheckStatus(this, fopAcStts_STAFF_SHUTTER_e)) { mStaffID = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); demoProc(); } else { @@ -417,18 +417,18 @@ static actor_method_class l_daBdoor_Method = { }; actor_process_profile_definition g_profile_BOSS_DOOR = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_BOSS_DOOR, - &g_fpcLf_Method.base, - sizeof(daBdoor_c), - 0, - 0, - &g_fopAc_Method.base, - 0x129, - &l_daBdoor_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_6_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BOSS_DOOR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBdoor_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_BOSS_DOOR_e, + /* Actor SubMtd */ &l_daBdoor_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_door_bossL1.cpp b/src/d/actor/d_a_door_bossL1.cpp index 7e80efd2a3..f187412a0b 100644 --- a/src/d/actor/d_a_door_bossL1.cpp +++ b/src/d/actor/d_a_door_bossL1.cpp @@ -775,7 +775,7 @@ int daBdoorL1_c::createKey() { int actorParams = getNowLevel(); int flags = ~0xFF; flags |= actorParams; - mKeyHoleId = fopAcM_createChildFromOffset(PROC_OBJ_KEYHOLE, fopAcM_GetID(this), flags, + mKeyHoleId = fopAcM_createChildFromOffset(fpcNm_OBJ_KEYHOLE_e, fopAcM_GetID(this), flags, &cStack_30, fopAcM_GetRoomNo(this), 0, &scale, -1, 0); current.pos = cStack_24; @@ -907,7 +907,7 @@ int daBdoorL1_c::actionEnd() { int daBdoorL1_c::execute() { static actionFunc l_action[4] = {&daBdoorL1_c::actionWait, &daBdoorL1_c::actionCloseWait, &daBdoorL1_c::actionOpen, &daBdoorL1_c::actionEnd}; - if (fopAcM_CheckStatus(this, 0x1000)) { + if (fopAcM_CheckStatus(this, fopAcStts_STAFF_SHUTTER_e)) { field_0x5a0 = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0); dMeter2Info_onGameStatus(2); demoProc(); @@ -977,18 +977,18 @@ static actor_method_class l_daBdoorL1_Method = { }; actor_process_profile_definition g_profile_L1BOSS_DOOR = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_L1BOSS_DOOR, - &g_fpcLf_Method.base, - sizeof(daBdoorL1_c), - 0, - 0, - &g_fopAc_Method.base, - 0x12A, - &l_daBdoorL1_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_6_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_L1BOSS_DOOR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBdoorL1_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_L1BOSS_DOOR_e, + /* Actor SubMtd */ &l_daBdoorL1_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_door_bossL5.cpp b/src/d/actor/d_a_door_bossL5.cpp index 8c1f0e4850..3299c91216 100644 --- a/src/d/actor/d_a_door_bossL5.cpp +++ b/src/d/actor/d_a_door_bossL5.cpp @@ -325,7 +325,7 @@ int daBdoorL5_c::createKey() { cXyz prevPos(current.pos); current.pos = home.pos; cXyz pos(0.0f, 0.0f, 50.0f); - mKeyHoleId = fopAcM_createChildFromOffset(PROC_OBJ_KEYHOLE, fopAcM_GetID(this), 0xffffff05, + mKeyHoleId = fopAcM_createChildFromOffset(fpcNm_OBJ_KEYHOLE_e, fopAcM_GetID(this), 0xffffff05, &pos, fopAcM_GetRoomNo(this), &shape_angle, &scale, -1, 0); current.pos = prevPos; @@ -443,7 +443,7 @@ int daBdoorL5_c::actionEnd() { int daBdoorL5_c::execute() { static actionFunc l_action[4] = {&daBdoorL5_c::actionWait, &daBdoorL5_c::actionCloseWait, &daBdoorL5_c::actionOpen, &daBdoorL5_c::actionEnd}; field_0x59c = -1; - if (fopAcM_CheckStatus(this, 0x1000)) { + if (fopAcM_CheckStatus(this, fopAcStts_STAFF_SHUTTER_e)) { field_0x59c = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0); dMeter2Info_onGameStatus(2); demoProc(); @@ -503,18 +503,18 @@ static actor_method_class l_daBdoorL5_Method = { }; actor_process_profile_definition g_profile_L5BOSS_DOOR = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_L5BOSS_DOOR, - &g_fpcLf_Method.base, - sizeof(daBdoorL5_c), - 0, - 0, - &g_fopAc_Method.base, - 0x12C, - &l_daBdoorL5_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_6_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_L5BOSS_DOOR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBdoorL5_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_L5BOSS_DOOR_e, + /* Actor SubMtd */ &l_daBdoorL5_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_door_dbdoor00.cpp b/src/d/actor/d_a_door_dbdoor00.cpp index 520e395045..c659a47cb2 100644 --- a/src/d/actor/d_a_door_dbdoor00.cpp +++ b/src/d/actor/d_a_door_dbdoor00.cpp @@ -415,18 +415,18 @@ static actor_method_class l_daDbdoor00_Method = { }; actor_process_profile_definition g_profile_DBDOOR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_DBDOOR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daDbDoor00_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 295, // mPriority - &l_daDbdoor00_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_6_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DBDOOR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daDbDoor00_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_DBDOOR_e, + /* Actor SubMtd */ &l_daDbdoor00_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_door_knob00.cpp b/src/d/actor/d_a_door_knob00.cpp index 6fab6cb36d..50d5723261 100644 --- a/src/d/actor/d_a_door_knob00.cpp +++ b/src/d/actor/d_a_door_knob00.cpp @@ -646,7 +646,7 @@ int daKnob20_c::execute() { setActionFromFlow(); field_0x60f = frontCheck(); - if (fopAcM_CheckStatus(this, 0x1000)) { + if (fopAcM_CheckStatus(this, fopAcStts_STAFF_SHUTTER_e)) { startDemoProc(); demoProc(); dMeter2Info_onGameStatus(2); @@ -701,18 +701,18 @@ static actor_method_class l_daKnob20_Method = { }; actor_process_profile_definition g_profile_KNOB20 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_KNOB20, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daKnob20_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 293, // mPriority - &l_daKnob20_Method, // sub_method - 0x44100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_6_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KNOB20_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daKnob20_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KNOB20_e, + /* Actor SubMtd */ &l_daKnob20_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_door_mbossL1.cpp b/src/d/actor/d_a_door_mbossL1.cpp index 958bd063c4..a42aabd022 100644 --- a/src/d/actor/d_a_door_mbossL1.cpp +++ b/src/d/actor/d_a_door_mbossL1.cpp @@ -21,7 +21,7 @@ static int getNowLevel(fopAc_ac_c* i_this) { static void* searchStop(void* param_1, void* param_2) { if (param_1 != NULL && fopAcM_IsActor(param_1) && - fopAcM_GetProfName(param_1) == PROC_Obj_Stopper) + fopAcM_GetProfName(param_1) == fpcNm_Obj_Stopper_e) { return param_1; } @@ -414,7 +414,7 @@ int daMBdoorL1_c::createKey() { cStack_30.y = 0; unaff_r29 = (u8)door_param2_c::getFRoomNo(this); } - mKeyHoleId = fopAcM_createChildFromOffset(PROC_OBJ_KEYHOLE, fopAcM_GetID(this), 0xffffffff, + mKeyHoleId = fopAcM_createChildFromOffset(fpcNm_OBJ_KEYHOLE_e, fopAcM_GetID(this), 0xffffffff, &cStack_28, unaff_r29, &cStack_30, &scale, -1, NULL); current.pos = cStack_1c; @@ -953,7 +953,7 @@ int daMBdoorL1_c::openInit() { } } } - if (fopAcM_CheckStatus(this, 0x1000)) { + if (fopAcM_CheckStatus(this, fopAcStts_STAFF_SHUTTER_e)) { fopAcM_onSwitch(this, swBit3); } field_0x5e1 = 1; @@ -1598,7 +1598,7 @@ int daMBdoorL1_c::actionOpen() { } int daMBdoorL1_c::actionInit() { - if (fopAcM_CheckStatus(this, 0x1000)) { + if (fopAcM_CheckStatus(this, fopAcStts_STAFF_SHUTTER_e)) { setAction(ACTION_START_DEMO); actionStartDemo(); } else { @@ -1623,7 +1623,7 @@ int daMBdoorL1_c::actionInit() { int daMBdoorL1_c::actionStartDemo() { field_0x5e8 = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); demoProc(); - if (!fopAcM_CheckStatus(this, 0x1000)) { + if (!fopAcM_CheckStatus(this, fopAcStts_STAFF_SHUTTER_e)) { setAction(ACTION_CLOSE_WAIT); } return 1; @@ -1728,18 +1728,18 @@ static actor_method_class l_daMBdoorL1_Method = { }; actor_process_profile_definition g_profile_L1MBOSS_DOOR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_L1MBOSS_DOOR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daMBdoorL1_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 299, // mPriority - &l_daMBdoorL1_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_6_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_L1MBOSS_DOOR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daMBdoorL1_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_L1MBOSS_DOOR_e, + /* Actor SubMtd */ &l_daMBdoorL1_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_door_push.cpp b/src/d/actor/d_a_door_push.cpp index a37d9b2ed5..aac4ebde8b 100644 --- a/src/d/actor/d_a_door_push.cpp +++ b/src/d/actor/d_a_door_push.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_door_push.h" #include "SSystem/SComponent/c_math.h" #include "d/d_bg_w.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_actor_mng.h" static void PPCallBack(fopAc_ac_c* i_this, fopAc_ac_c* i_unused, s16 i_unused2, @@ -367,18 +367,18 @@ static actor_method_class daDoorPush_METHODS = { }; actor_process_profile_definition g_profile_PushDoor = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_PushDoor, - &g_fpcLf_Method.base, - sizeof(daDoorPush_c), - 0, - 0, - &g_fopAc_Method.base, - 578, - &daDoorPush_METHODS, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_PushDoor_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daDoorPush_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_PushDoor_e, + /* Actor SubMtd */ &daDoorPush_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_door_shutter.cpp b/src/d/actor/d_a_door_shutter.cpp index c627a6ab18..a481762132 100644 --- a/src/d/actor/d_a_door_shutter.cpp +++ b/src/d/actor/d_a_door_shutter.cpp @@ -1379,7 +1379,7 @@ int daDoor20_c::createKey() { roomNo = door_param2_c::getBRoomNo(this); } field_0x5ec = - fopAcM_createChildFromOffset(PROC_Obj_Lv5Key, fopAcM_GetID(this), 0xffffffff, + fopAcM_createChildFromOffset(fpcNm_Obj_Lv5Key_e, fopAcM_GetID(this), 0xffffffff, &cStack_28, roomNo, &cStack_30, &scale, -1, 0); break; default: @@ -1398,7 +1398,7 @@ int daDoor20_c::createKey() { } } field_0x5ec = - fopAcM_createChildFromOffset(PROC_OBJ_KEYHOLE, fopAcM_GetID(this), 0xffffffff, + fopAcM_createChildFromOffset(fpcNm_OBJ_KEYHOLE_e, fopAcM_GetID(this), 0xffffffff, &cStack_28, roomNo, &cStack_30, &scale, -1, 0); } @@ -1492,7 +1492,7 @@ int daDoor20_c::drawCheck(int param_1) { int daDoor20_c::checkExecute() { field_0x68c = frontCheck(); - if (fopAcM_CheckStatus(this, 0x1000)) { + if (fopAcM_CheckStatus(this, fopAcStts_STAFF_SHUTTER_e)) { return 1; } if (eventInfo.checkCommandDemoAccrpt() || eventInfo.checkCommandDoor()) { @@ -2147,18 +2147,18 @@ static actor_method_class l_daDoor20_Method = { }; actor_process_profile_definition g_profile_DOOR20 = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_DOOR20, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daDoor20_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 294, // mPriority - &l_daDoor20_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DOOR20_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daDoor20_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_DOOR20_e, + /* Actor SubMtd */ &l_daDoor20_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_door_spiral.cpp b/src/d/actor/d_a_door_spiral.cpp index ea550063d7..b7c7567787 100644 --- a/src/d/actor/d_a_door_spiral.cpp +++ b/src/d/actor/d_a_door_spiral.cpp @@ -47,7 +47,7 @@ void* searchSpiralSub(void* i_actor, void* i_data) { fopAc_ac_c* other = (fopAc_ac_c*)i_data; if (actor != NULL && fopAcM_IsActor(actor)) { - if (fopAcM_GetProfName(actor) == PROC_SPIRAL_DOOR && actor != other) { + if (fopAcM_GetProfName(actor) == fpcNm_SPIRAL_DOOR_e && actor != other) { if (door_param2_c::getBRoomNo(actor) == door_param2_c::getBRoomNo(other)) { return actor; } @@ -209,7 +209,6 @@ int daSpiral_c::create() { return cPhs_COMPLEATE_e; } -// DEBUG NONMATCHING - regalloc int daSpiral_c::CreateHeap() { J3DModelData* modelData = getModelData(); JUT_ASSERT(338, modelData != NULL); @@ -223,35 +222,38 @@ int daSpiral_c::CreateHeap() { return 0; } - cBgD_t* bgd = (cBgD_t*)dComIfG_getObjectRes(getAlwaysArcName(), getSpiralDzbName(mType)); - JUT_ASSERT(356, bgd != NULL); - bool spiral_rt = mpSpiralDzb->Set(bgd, 1, &mSpiralBgMtx); - if (spiral_rt == true) { - return 0; + { + cBgD_t* bgd = (cBgD_t*)dComIfG_getObjectRes(getAlwaysArcName(), getSpiralDzbName(mType)); + JUT_ASSERT(356, bgd != NULL); + bool spiral_rt = mpSpiralDzb->Set(bgd, 1, &mSpiralBgMtx); + if (spiral_rt == true) { + return 0; + } + + mDoorDarkDzb = JKR_NEW dBgW(); + if (mDoorDarkDzb == NULL) { + return 0; + } } - mDoorDarkDzb = JKR_NEW dBgW(); - if (mDoorDarkDzb == NULL) { - return 0; - } + { + cBgD_t* bgd = (cBgD_t*)dComIfG_getObjectRes(getAlwaysArcName(), getDzb()); + JUT_ASSERT(375, bgd != NULL); - bgd = (cBgD_t*)dComIfG_getObjectRes(getAlwaysArcName(), getDzb()); - JUT_ASSERT(375, bgd != NULL); + cXyz dzb_pos(l_dzb_offset); + mDoMtx_stack_c::YrotS(home.angle.y); + mDoMtx_stack_c::multVec(&dzb_pos, &dzb_pos); + mDoMtx_stack_c::transS(current.pos.x + dzb_pos.x, current.pos.y + dzb_pos.y, current.pos.z + dzb_pos.z); + mDoMtx_stack_c::YrotM(home.angle.y); + cMtx_copy(mDoMtx_stack_c::get(), mDoorDarkBgMtx); - cXyz dzb_pos(l_dzb_offset); - mDoMtx_stack_c::YrotS(home.angle.y); - mDoMtx_stack_c::multVec(&dzb_pos, &dzb_pos); - mDoMtx_stack_c::transS(current.pos.x + dzb_pos.x, current.pos.y + dzb_pos.y, current.pos.z + dzb_pos.z); - mDoMtx_stack_c::YrotM(home.angle.y); - cMtx_copy(mDoMtx_stack_c::get(), mDoorDarkBgMtx); - - bool dark_rt = mDoorDarkDzb->Set(bgd, 1, &mDoorDarkBgMtx); - if (dark_rt == true) { - return 0; + bool dark_rt = mDoorDarkDzb->Set(bgd, 1, &mDoorDarkBgMtx); + if (dark_rt == true) { + return 0; + } } if (checkMakeStop() && !mStop.create(this)) { - int _; return 0; } @@ -637,7 +639,7 @@ void daSpiral_c::setPartner() { JUT_ASSERT(1065, actor); dComIfGp_event_setDoorPartner(actor); - fopAcM_OnStatus(actor, 0x8000); + fopAcM_OnStatus(actor, fopAcStts_STAFF_PRIMARY_e); } void daSpiral_c::clrPartner() { @@ -805,11 +807,8 @@ BOOL daSpiral_c::drawCheck(int) { } #if DEBUG -// DEBUG NONMATCHING - stack void daSpiral_c::debugDraw() { - GXColor spC = {0xFF, 0xFF, 0xFF, 0xFF}; - GXColor sp8 = spC; - GXColor color = sp8; + GXColor color = (GXColor){0xFF, 0xFF, 0xFF, 0xFF}; cXyz sp68[4]; cXyz sp38[4]; @@ -843,7 +842,7 @@ void daSpiral_c::debugDraw() { } if (KREG_S(9) == 1000) { - dDbVw_drawQuadOpa(sp68, spC, TRUE); + dDbVw_drawQuadOpa(sp68, color, TRUE); dDbVw_drawSphereXlu(current.pos, 30.0f, color, TRUE); } @@ -1193,18 +1192,18 @@ static actor_method_class l_daSpiral_Method = { #endif actor_process_profile_definition g_profile_SPIRAL_DOOR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_SPIRAL_DOOR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSpiral_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 301, // mPriority - DASPIRAL_METHODS, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_6_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SPIRAL_DOOR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSpiral_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_SPIRAL_DOOR_e, + /* Actor SubMtd */ DASPIRAL_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_dshutter.cpp b/src/d/actor/d_a_dshutter.cpp index 78d5ca6f0d..4a0cf397f4 100644 --- a/src/d/actor/d_a_dshutter.cpp +++ b/src/d/actor/d_a_dshutter.cpp @@ -246,21 +246,19 @@ static actor_method_class l_daDsh_Method = { }; actor_process_profile_definition2 g_profile_DSHUTTER = { - { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_DSHUTTER, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daDsh_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 296, // mPriority - &l_daDsh_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType - }, - 0, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DSHUTTER_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daDsh_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_DSHUTTER_e, + /* Actor SubMtd */ &l_daDsh_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, + /* Unknown */ 0, }; diff --git a/src/d/actor/d_a_e_ai.cpp b/src/d/actor/d_a_e_ai.cpp index a6688c9b79..d9f0c5fadd 100644 --- a/src/d/actor/d_a_e_ai.cpp +++ b/src/d/actor/d_a_e_ai.cpp @@ -951,18 +951,18 @@ static actor_method_class l_daE_AI_Method = { }; actor_process_profile_definition g_profile_E_AI = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_AI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_ai_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 112, // mPriority - &l_daE_AI_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_E_AI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_ai_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_AI_e, + /* Actor SubMtd */ &l_daE_AI_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_arrow.cpp b/src/d/actor/d_a_e_arrow.cpp index b3d1a7b26e..11746e3a76 100644 --- a/src/d/actor/d_a_e_arrow.cpp +++ b/src/d/actor/d_a_e_arrow.cpp @@ -161,7 +161,7 @@ static void hit_check(e_arrow_class* i_this) { dComIfG_Ccsp()->Set(&i_this->mCcTgSph); if (i_this->mCcAtSph.ChkAtShieldHit() && i_this->mCcAtSph.GetAtHitAc() != NULL && - fopAcM_GetName(i_this->mCcAtSph.GetAtHitAc()) == PROC_ALINK && + fopAcM_GetName(i_this->mCcAtSph.GetAtHitAc()) == fpcNm_ALINK_e && daAlink_getAlinkActorClass()->checkWoodShieldEquipNotIronBall()) { i_this->mAction = ACTION_ARROW_SHIELD; @@ -253,7 +253,7 @@ static void e_arrow_shot(e_arrow_class* i_this) { } case 1: if (i_this->mFlags & 0x20) { - fopAc_ac_c* coach_p = fopAcM_SearchByName(PROC_NPC_COACH); + fopAc_ac_c* coach_p = fopAcM_SearchByName(fpcNm_NPC_COACH_e); if (coach_p != NULL) { cXyz sp30; @@ -291,9 +291,9 @@ static void e_arrow_bg(e_arrow_class* i_this) { i_this->mMode = 1; i_this->mTimers[0] = 100; case 1: - if (checkItemGet(fpcNm_ITEM_BOW, 1) && fopAcM_searchPlayerDistance(i_this) < 30.0f) { + if (checkItemGet(dItemNo_BOW_e, 1) && fopAcM_searchPlayerDistance(i_this) < 30.0f) { dComIfGp_setItemArrowNumCount(1); - fopAcM_createItemForSimpleDemo(&i_this->current.pos, fpcNm_ITEM_ARROW_1, -1, NULL, NULL, 0.0f, + fopAcM_createItemForSimpleDemo(&i_this->current.pos, dItemNo_ARROW_1_e, -1, NULL, NULL, 0.0f, 0.0f); mDoAud_seStart(Z2SE_CONSUMP_ITEM_GET, NULL, 0, 0); @@ -331,7 +331,7 @@ static void e_arrow_spin(e_arrow_class* i_this) { static void* s_limit_sub(void* i_actor, void* i_data) { if (fopAcM_IsActor(i_actor) != FALSE && i_actor != i_data && - fopAcM_GetName(i_actor) == PROC_E_ARROW && + fopAcM_GetName(i_actor) == fpcNm_E_ARROW_e && static_cast(i_actor)->mAction == ACTION_ARROW_FIRE && fabsf(static_cast(i_actor)->field_0xa00.z - static_cast(i_data)->field_0xa00.z) < 300.0f) @@ -429,7 +429,7 @@ static void e_arrow_demo_fire(e_arrow_class* i_this) { static void atHit_CB(fopAc_ac_c* i_atActor, dCcD_GObjInf* i_atObjInf, fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf) { - if (i_tgActor != NULL && fopAcM_GetName(i_tgActor) == PROC_ALINK) { + if (i_tgActor != NULL && fopAcM_GetName(i_tgActor) == fpcNm_ALINK_e) { if (daAlink_getAlinkActorClass()->checkWoodShieldEquipNotIronBall()) { daAlink_getAlinkActorClass()->getArrowShieldOffset( &i_atActor->current.pos, &i_atActor->shape_angle, @@ -754,20 +754,20 @@ static actor_method_class l_daE_ARROW_Method = { }; actor_process_profile_definition g_profile_E_ARROW = { - fpcLy_CURRENT_e, - 8, - fpcPi_CURRENT_e, - PROC_E_ARROW, - &g_fpcLf_Method.base, - sizeof(e_arrow_class), - 0, - 0, - &g_fopAc_Method.base, - 163, - &l_daE_ARROW_Method, - 0x44100, - fopAc_ENEMY_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_ARROW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_arrow_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_ARROW_e, + /* Actor SubMtd */ &l_daE_ARROW_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_ba.cpp b/src/d/actor/d_a_e_ba.cpp index 7238a1d5bf..65aeb2e442 100644 --- a/src/d/actor/d_a_e_ba.cpp +++ b/src/d/actor/d_a_e_ba.cpp @@ -11,7 +11,7 @@ #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_actor_enemy.h" class daE_BA_HIO_c { @@ -67,7 +67,7 @@ static int daE_BA_Draw(e_ba_class* i_this) { } static void* shot_b_sub(void* i_proc, void* i_this) { - if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_BOOMERANG + if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_BOOMERANG_e && !dComIfGp_checkPlayerStatus0(0, 0x80000) && daPy_py_c::checkBoomerangCharge() && fopAcM_GetParam(i_proc) == 1) { @@ -818,7 +818,7 @@ static void action(e_ba_class* i_this) { if (i_this->mKnockbackSpeed <= 1.0f || i_this->mAcch.ChkWallHit()) { fopAcM_delete(a_this); if (i_this->mHomeType == e_ba_class::HOME_APPEAR) { - // should be fpcNm_ITEM_HEART : fpcNm_ITEM_ARROW_10 but that gives incorrect code + // should be dItemNo_HEART_e : dItemNo_ARROW_10_e but that gives incorrect code int item_no = dComIfGs_getLife() <= 4 ? 0 : 0xE; fopAcM_createItem(&a_this->current.pos, item_no, -1, -1, NULL, NULL, 0); fopAcM_createDisappear(a_this, &a_this->current.pos, 6, 0, 0xff); @@ -1032,7 +1032,7 @@ static cPhs_Step daE_BA_Create(fopAc_ac_c* i_this) { } _this->mFightFlyDistance = (f32)_this->mDistanceParam * 100.0f; - if (fopAcM_SearchByName(PROC_E_PZ) != NULL) { + if (fopAcM_SearchByName(fpcNm_E_PZ_e) != NULL) { _this->mFightFlyDistance = 100000.0f; } @@ -1105,18 +1105,18 @@ static actor_method_class l_daE_BA_Method = { }; actor_process_profile_definition g_profile_E_BA = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_E_BA, - &g_fpcLf_Method.base, - sizeof(e_ba_class), - 0, - 0, - &g_fopAc_Method.base, - 0xB4, - &l_daE_BA_Method, - 0x10050100, - fopAc_ENEMY_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_BA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_ba_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_BA_e, + /* Actor SubMtd */ &l_daE_BA_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_bee.cpp b/src/d/actor/d_a_e_bee.cpp index 947767da63..d3d308c418 100644 --- a/src/d/actor/d_a_e_bee.cpp +++ b/src/d/actor/d_a_e_bee.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_e_nest.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_s_play.h" #include "f_op/f_op_camera_mng.h" #include "SSystem/SComponent/c_math.h" @@ -135,12 +135,12 @@ static int bee_fly_action(e_bee_class* i_this, bee_s* i_bee) { i_bee->mTarget.z = cM_rndFX(100.0f); i_bee->mSpeedF = cM_rndF(5.0f) + 17.0f; } - if (fopAcM_GetName(hit_actor) != PROC_ALINK) { + if (fopAcM_GetName(hit_actor) != fpcNm_ALINK_e) { vec = hit_actor->current.pos - i_bee->mPos; vec.y += 125.0f; vec += i_bee->mTarget; if (i_bee->mHomeTimer == 0) { - if (fopAcM_GetName(hit_actor) == PROC_NPC_TK) { + if (fopAcM_GetName(hit_actor) == fpcNm_NPC_TK_e) { i_bee->mAction = bee_s::ACT_DEAD; } else { i_bee->mAction = bee_s::ACT_FLY_HOME_A; @@ -616,7 +616,7 @@ static void bee_control(e_bee_class* i_this) { if (i_this->mCcSph.ChkAtHit()) { cCcD_Obj* hitObj = i_this->mCcSph.GetAtHitObj(); fopAc_ac_c* hit_actor = dCc_GetAc(hitObj->GetAc()); - if (hit_actor != NULL && fopAcM_GetName(hit_actor) == PROC_ALINK) { + if (hit_actor != NULL && fopAcM_GetName(hit_actor) == fpcNm_ALINK_e) { dComIfGp_getVibration().StartShock(4, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); } } @@ -816,20 +816,20 @@ static actor_method_class l_daE_Bee_Method = { }; actor_process_profile_definition g_profile_E_BEE = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_E_BEE, - &g_fpcLf_Method.base, - sizeof(e_bee_class), - 0, - 0, - &g_fopAc_Method.base, - 0xB7, - &l_daE_Bee_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_BEE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_bee_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_BEE_e, + /* Actor SubMtd */ &l_daE_Bee_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_bg.cpp b/src/d/actor/d_a_e_bg.cpp index a9bfcd0272..1b1ec722ca 100644 --- a/src/d/actor/d_a_e_bg.cpp +++ b/src/d/actor/d_a_e_bg.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_bg.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -16,6 +16,23 @@ #include "d/d_s_play.h" #include "f_op/f_op_camera_mng.h" +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; +}; + daE_BG_HIO_c::daE_BG_HIO_c() { field_0x4 = -1; mTrackingSpeed = 8.0f; @@ -227,7 +244,7 @@ void daE_BG_c::setSparkEffect() { } fopAc_ac_c* daE_BG_c::search_esa() { - dmg_rod_class* rod = (dmg_rod_class*)fopAcM_SearchByName(PROC_MG_ROD); + dmg_rod_class* rod = (dmg_rod_class*)fopAcM_SearchByName(fpcNm_MG_ROD_e); if (rod != NULL && rod->kind == 1 && rod->action != 5 && rod->is_hook_in_water != 0 && rod->actor.current.pos.y < rod->water_surface_y - 20.0f) { return &rod->actor; @@ -286,7 +303,7 @@ void daE_BG_c::executeBorn() { } if (field_0x68f == 0) { - mBgId = fopAcM_createChild(PROC_E_BG, fopAcM_GetID(this), 0xffffff02, ¤t.pos, + mBgId = fopAcM_createChild(fpcNm_E_BG_e, fopAcM_GetID(this), 0xffffff02, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); mMoveMode = 3; } @@ -328,14 +345,15 @@ void daE_BG_c::executeSwim() { setActionMode(2, 0); return; } - } else if (dComIfGp_checkPlayerStatus0(0, fopAcM_STATUS_HOOK_CARRY_NOW)) { + } else if (dComIfGp_checkPlayerStatus0(0, fopAcStts_HOOK_CARRY_NOW_e)) { setActionMode(2, 0); return; } } } - if (search_esa() != NULL) { + fopAc_ac_c* search_actor = search_esa(); + if (search_actor != NULL) { setActionMode(7, 0); return; } @@ -380,8 +398,8 @@ void daE_BG_c::executeSwim() { field_0x6ac = field_0x69a - shape_angle.y; cLib_addCalcAngleS(&shape_angle.y, field_0x69a, 0x10, 0x400, 0x100); - s32 targetAngleX = cLib_targetAngleX(¤t.pos, &field_0x660); - cLib_addCalcAngleS(&shape_angle.x, targetAngleX, 0x10, 0x400, 0x100); + cLib_addCalcAngleS(&shape_angle.x, (s16)cLib_targetAngleX(¤t.pos, &field_0x660), + 0x10, 0x400, 0x100); cLib_chaseF(&speedF, cM_scos(shape_angle.x) * 4.0f, 0.2f); cLib_chaseF(&speed.y, cM_ssin(shape_angle.x) * 4.0f, 0.2f); @@ -446,7 +464,7 @@ void daE_BG_c::executeAttack() { return; } } else { - if (!dComIfGp_checkPlayerStatus0(0, fopAcM_STATUS_HOOK_CARRY_NOW)) { + if (!dComIfGp_checkPlayerStatus0(0, fopAcStts_HOOK_CARRY_NOW_e)) { setActionMode(1, 0); return; } @@ -471,7 +489,7 @@ void daE_BG_c::executeAttack() { cLib_chaseF(&speedF, l_HIO.mTrackingSpeed * cM_scos(shape_angle.x), 1.0f); cLib_chaseF(&speed.y, l_HIO.mTrackingSpeed * cM_ssin(shape_angle.x), 1.0f); - if (!dComIfGp_checkPlayerStatus0(0, fopAcM_STATUS_HOOK_CARRY_NOW)) { + if (!dComIfGp_checkPlayerStatus0(0, fopAcStts_HOOK_CARRY_NOW_e)) { if (daPy_getPlayerActorClass()->checkEquipHeavyBoots()) { mMoveMode = 1; field_0x69a = cM_rndFX(8192.0f); @@ -480,7 +498,7 @@ void daE_BG_c::executeAttack() { if (mAtSphere.ChkAtHit()) { fopAc_ac_c* hitActor = dCc_GetAc(mAtSphere.GetAtHitObj()->GetAc()); - if (fopAcM_GetName(hitActor) == PROC_ALINK) { + if (fopAcM_GetName(hitActor) == fpcNm_ALINK_e) { mMoveMode = 10; field_0x68f = 30; speedF = cM_rndFX(1.0f) + -5.0f; @@ -542,7 +560,7 @@ void daE_BG_c::executeAttack() { field_0x6ae = 0; } - if (dComIfGp_checkPlayerStatus0(0, fopAcM_STATUS_HOOK_CARRY_NOW)) { + if (dComIfGp_checkPlayerStatus0(0, fopAcStts_HOOK_CARRY_NOW_e)) { mMoveMode = 0; break; } @@ -583,7 +601,7 @@ void daE_BG_c::executeAttack() { cLib_chaseF(&speedF, 0.0f, 1.0f); cLib_chaseF(&speed.y, 0.0f, 1.0f); - if (dComIfGp_checkPlayerStatus0(0, fopAcM_STATUS_HOOK_CARRY_NOW)) { + if (dComIfGp_checkPlayerStatus0(0, fopAcStts_HOOK_CARRY_NOW_e)) { mMoveMode = 0; } else { if (field_0x68f == 0) { @@ -635,7 +653,7 @@ void daE_BG_c::executeAttack() { if (mAtSphere.ChkAtHit()) { fopAc_ac_c* hitActor = dCc_GetAc(mAtSphere.GetAtHitObj()->GetAc()); - if (fopAcM_GetName(hitActor) == PROC_ALINK) { + if (fopAcM_GetName(hitActor) == fpcNm_ALINK_e) { mMoveMode = 5; field_0x68f = 30; @@ -743,8 +761,8 @@ bool daE_BG_c::setBombCarry(int param_0) { fopAcM_GetRoomNo(this)); } + fopAc_ac_c* unkActor1; if (bomb != NULL) { - fopAc_ac_c* unkActor1; fopAcM_SearchByID(fopAcM_GetLinkId(this), &unkActor1); if (unkActor1 != NULL) { ((daE_BG_c*)unkActor1)->setBgId(fopAcM_GetID(bomb)); @@ -935,6 +953,8 @@ void daE_BG_c::executeEat() { field_0x6a2 = nREG_S(0) + 0xc00; field_0x69c += field_0x6a0; + f32 targetSpeedX; + f32 targetSpeedY; switch (this->mMoveMode) { case 0: field_0x660.y = rodPos.y + cM_rndFX(100.0f); @@ -1038,10 +1058,8 @@ void daE_BG_c::executeEat() { cLib_addCalcAngleS(&shape_angle.x, 0, 0x10, 0x400, 0x100); if (rodPos.abs(current.pos) > 70.0f) { - cM_scos(shape_angle.x); - cLib_chaseF(&speedF, 0.0f, 0.1f); - cM_ssin(shape_angle.x); - cLib_chaseF(&speed.y, 0.0f, 0.1f); + cLib_chaseF(&speedF, cM_scos(shape_angle.x) * 0.0f, 0.1f); + cLib_chaseF(&speed.y, cM_ssin(shape_angle.x) * 0.0f, 0.1f); } else { cLib_chaseF(&speedF, cM_scos(shape_angle.x) * -1.0f, 0.3f); cLib_chaseF(&speed.y, cM_ssin(shape_angle.x) * -1.0f, 0.3f); @@ -1286,7 +1304,7 @@ static int daE_BG_Delete(daE_BG_c* i_this) { int daE_BG_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_BG", 10); - JUT_ASSERT(0, modelData != NULL); + JUT_ASSERT(1890, modelData != NULL); mpMorfSO = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_BG", 7), 0, 1.0f, 0, @@ -1420,18 +1438,18 @@ static actor_method_class l_daE_BG_Method = { }; actor_process_profile_definition g_profile_E_BG = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_BG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_BG_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 204, // mPriority - &l_daE_BG_Method, // sub_method - 0x000D0100, // 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_E_BG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_BG_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_BG_e, + /* Actor SubMtd */ &l_daE_BG_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/src/d/actor/d_a_e_bi.cpp b/src/d/actor/d_a_e_bi.cpp index 72c02ae1c4..c9284aa356 100644 --- a/src/d/actor/d_a_e_bi.cpp +++ b/src/d/actor/d_a_e_bi.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_bi.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -76,7 +76,7 @@ static int daE_BI_Draw(e_bi_class* i_this) { if (i_this->ride_time == 0) { return 1; } - + g_env_light.settingTevStruct(0, &actor->current.pos, &actor->tevStr); J3DModel* model = i_this->anm_p->getModel(); g_env_light.setLightTevColorType_MAJI(model, &actor->tevStr); @@ -403,7 +403,7 @@ static void e_bi_ex(e_bi_class* i_this) { i_this->ex_eff[i] = dComIfGp_particle_set(i_this->ex_eff[i], ex_eff_id[i], &actor->current.pos, &actor->tevStr, &actor->shape_angle, NULL, 0xFF, NULL, -1, NULL, NULL, NULL); JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(i_this->ex_eff[i]); - + if (emitter != NULL) { MTXCopy(i_this->anm_p->getModel()->getAnmMtx(0), *calc_mtx); emitter->setGlobalRTMatrix(*calc_mtx); @@ -646,7 +646,7 @@ static void action(e_bi_class* i_this) { } static void* s_fw_sub(void* i_actor, void* i_data) { - if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_FW) { + if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_FW_e) { cXyz sp28 = ((fopAc_ac_c*)i_actor)->current.pos - ((fopAc_ac_c*)i_data)->current.pos; if (sp28.abs() < XREG_F(18) + 500.0f) { return i_actor; @@ -705,7 +705,7 @@ static int daE_BI_Execute(e_bi_class* i_this) { } cXyz mae, ato; - + i_this->counter++; for (int i = 0; i < 3; i++) { @@ -787,7 +787,7 @@ static int daE_BI_Execute(e_bi_class* i_this) { actor->attention_info.position.y += KREG_F(3) + 45.0f; f32 center = 0.0f; - if (dComIfGp_checkPlayerStatus0(0, fopAcM_STATUS_UNK_0x80000)) { + if (dComIfGp_checkPlayerStatus0(0, fopAcStts_UNK_0x80000_e)) { center = 100.0f; } @@ -838,9 +838,9 @@ static int daE_BI_IsDelete(e_bi_class* i_this) { static int daE_BI_Delete(e_bi_class* i_this) { fopAc_ac_c* actor = &i_this->actor; - + dComIfG_resDelete(&i_this->phase, "E_BI"); - + if (i_this->hio_init != 0) { hio_set = 0; } @@ -881,7 +881,7 @@ static cPhs_Step daE_BI_Create(fopAc_ac_c* actor) { if (!fopAcM_entrySolidHeap(actor, useHeapInit, 0x27A0)) { OS_REPORT("//////////////E_BI SET NON !!\n"); - + return cPhs_ERROR_e; } @@ -950,7 +950,7 @@ static cPhs_Step daE_BI_Create(fopAc_ac_c* actor) { i_this->at_info.mpSound = &i_this->sound; i_this->at_info.mPowerType = 1; i_this->sound.setEnemyName("E_bi"); - + i_this->counter = cM_rndF(65535.0f); actor->attention_info.distances[fopAc_attn_CARRY_e] = 42; @@ -967,7 +967,7 @@ static cPhs_Step daE_BI_Create(fopAc_ac_c* actor) { } } - i_this->child_no = fopAcM_createChild(PROC_E_BI_LEAF, fopAcM_GetID(actor), i_this->arg1, &actor->current.pos, + i_this->child_no = fopAcM_createChild(fpcNm_E_BI_LEAF_e, fopAcM_GetID(actor), i_this->arg1, &actor->current.pos, fopAcM_GetRoomNo(actor), &actor->shape_angle, NULL, -1, NULL); } else { i_this->mode = -2; @@ -996,18 +996,18 @@ static actor_method_class l_daE_BI_Method = { }; actor_process_profile_definition g_profile_E_BI = { - fpcLy_CURRENT_e, // mLayerID - 9, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_BI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_bi_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 147, // mPriority - &l_daE_BI_Method, // sub_method - 0x100D0100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 9, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_BI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_bi_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_BI_e, + /* Actor SubMtd */ &l_daE_BI_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_bi_leaf.cpp b/src/d/actor/d_a_e_bi_leaf.cpp index c273b36b42..ed2000b3c5 100644 --- a/src/d/actor/d_a_e_bi_leaf.cpp +++ b/src/d/actor/d_a_e_bi_leaf.cpp @@ -42,7 +42,7 @@ static void action(e_bi_leaf_class* i_this) { i_this->action = 0; i_this->parentActorID = - fopAcM_createChild(PROC_E_BI, fopAcM_GetID(i_this), (i_this->type << 8) | 1, + fopAcM_createChild(fpcNm_E_BI_e, fopAcM_GetID(i_this), (i_this->type << 8) | 1, &i_this->current.pos, fopAcM_GetRoomNo(i_this), &i_this->current.angle, NULL, -1, NULL); i_this->timer = 20; @@ -123,18 +123,18 @@ static actor_method_class l_daE_BI_LEAF_Method = { }; actor_process_profile_definition g_profile_E_BI_LEAF = { - fpcLy_CURRENT_e, - 9, - fpcPi_CURRENT_e, - PROC_E_BI_LEAF, - &g_fpcLf_Method.base, - sizeof(e_bi_leaf_class), - 0, - 0, - &g_fopAc_Method.base, - 148, - &l_daE_BI_LEAF_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 9, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_BI_LEAF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_bi_leaf_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_BI_LEAF_e, + /* Actor SubMtd */ &l_daE_BI_LEAF_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_bs.cpp b/src/d/actor/d_a_e_bs.cpp index b20ebdcd5f..64350e0264 100644 --- a/src/d/actor/d_a_e_bs.cpp +++ b/src/d/actor/d_a_e_bs.cpp @@ -403,7 +403,7 @@ static void e_bs_attack(e_bs_class* i_this) { if (i_this->is_wep_attack) { fopAc_ac_c* at_hit_actor = at_hit_check(i_this); - if (at_hit_actor != NULL && fopAcM_GetName(at_hit_actor) == PROC_ALINK && daPy_getPlayerActorClass()->checkPlayerGuard()) { + if (at_hit_actor != NULL && fopAcM_GetName(at_hit_actor) == fpcNm_ALINK_e && daPy_getPlayerActorClass()->checkPlayerGuard()) { i_this->modelMorf->setPlaySpeed(0.0f); i_this->action = ACTION_FIGHT_RUN; i_this->mode = 0; @@ -929,18 +929,18 @@ static actor_method_class l_daE_BS_Method = { }; actor_process_profile_definition g_profile_E_BS = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_BS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_bs_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 124, // mPriority - &l_daE_BS_Method, // sub_method - 0x10040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_BS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_bs_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_BS_e, + /* Actor SubMtd */ &l_daE_BS_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_bu.cpp b/src/d/actor/d_a_e_bu.cpp index 0dd49746da..cd8a3cf766 100644 --- a/src/d/actor/d_a_e_bu.cpp +++ b/src/d/actor/d_a_e_bu.cpp @@ -1137,18 +1137,18 @@ static actor_method_class l_daE_BU_Method = { }; actor_process_profile_definition g_profile_E_BU = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_BU, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_bu_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 181, // mPriority - &l_daE_BU_Method, // sub_method - 0x100C0120, // 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_E_BU_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_bu_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_BU_e, + /* Actor SubMtd */ &l_daE_BU_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_bug.cpp b/src/d/actor/d_a_e_bug.cpp index ec098f20b4..e9ad4ab32c 100644 --- a/src/d/actor/d_a_e_bug.cpp +++ b/src/d/actor/d_a_e_bug.cpp @@ -686,7 +686,7 @@ static void bug_control(e_bug_class* a_this) { } static void* s_boom_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_BOOMERANG && daPy_py_c::checkBoomerangCharge() && fopAcM_GetParam(i_actor) == 1) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_BOOMERANG_e && daPy_py_c::checkBoomerangCharge() && fopAcM_GetParam(i_actor) == 1) { data_80697E8D = 1; at_pos = ((fopAc_ac_c*)i_actor)->current.pos; return i_actor; @@ -902,18 +902,18 @@ static actor_method_class l_daE_Bug_Method = { }; actor_process_profile_definition g_profile_E_BUG = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_BUG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_bug_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 182, // mPriority - &l_daE_Bug_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_BUG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_bug_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_BUG_e, + /* Actor SubMtd */ &l_daE_Bug_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_cr.cpp b/src/d/actor/d_a_e_cr.cpp index 7c29177787..ac245c6985 100644 --- a/src/d/actor/d_a_e_cr.cpp +++ b/src/d/actor/d_a_e_cr.cpp @@ -228,7 +228,7 @@ static void e_cr_move(e_cr_class* a_this) { cXyz egg_pos(actor->current.pos); egg_pos.y += 35.0f * l_HIO.base_size; - fopAcM_createChild(PROC_E_CR_EGG, fopAcM_GetID(actor), 0, &egg_pos, fopAcM_GetRoomNo(actor), &actor->shape_angle, NULL, -1, NULL); + fopAcM_createChild(fpcNm_E_CR_EGG_e, fopAcM_GetID(actor), 0, &egg_pos, fopAcM_GetRoomNo(actor), &actor->shape_angle, NULL, -1, NULL); a_this->sound.startCreatureSound(Z2SE_EN_CR_LAYEGG, 0, -1); } break; @@ -309,7 +309,7 @@ static void e_cr_damage(e_cr_class* a_this) { if (a_this->timers[0] == 0) { fopAcM_createDisappear(actor, &actor->eyePos, 6, 0, 0xFF); - fopAcM_create(PROC_NPC_WORM, 0xFFFFFF01, &actor->eyePos, fopAcM_GetRoomNo(actor), NULL, NULL, -1); + fopAcM_create(fpcNm_NPC_WORM_e, 0xFFFFFF01, &actor->eyePos, fopAcM_GetRoomNo(actor), NULL, NULL, -1); fopAcM_delete(actor); } } @@ -546,18 +546,18 @@ static actor_method_class l_daE_CR_Method = { }; actor_process_profile_definition g_profile_E_CR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_CR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_cr_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 113, // mPriority - &l_daE_CR_Method, // sub_method - 0x10040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_CR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_cr_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_CR_e, + /* Actor SubMtd */ &l_daE_CR_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_cr_egg.cpp b/src/d/actor/d_a_e_cr_egg.cpp index 1ef1231f62..fa3c60f270 100644 --- a/src/d/actor/d_a_e_cr_egg.cpp +++ b/src/d/actor/d_a_e_cr_egg.cpp @@ -224,18 +224,18 @@ static actor_method_class l_daE_CR_EGG_Method = { }; actor_process_profile_definition g_profile_E_CR_EGG = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_CR_EGG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_cr_egg_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 114, // mPriority - &l_daE_CR_EGG_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_CR_EGG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_cr_egg_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_CR_EGG_e, + /* Actor SubMtd */ &l_daE_CR_EGG_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_db.cpp b/src/d/actor/d_a_e_db.cpp index fd7e276fda..cbd21176b9 100644 --- a/src/d/actor/d_a_e_db.cpp +++ b/src/d/actor/d_a_e_db.cpp @@ -1752,7 +1752,7 @@ static void action(e_db_class* i_this) { spA = TRUE; actor->field_0x566 = 1; sound_pl_search = TRUE; - fopAcM_OffStatus(actor, 0x10000); + fopAcM_OffStatus(actor, fopAcStts_UNK_0x10000_e); break; case ACTION_E_DEAD: e_db_e_dead(i_this); @@ -2190,7 +2190,7 @@ static int daE_DB_Create(fopAc_ac_c* i_this) { a_this->field_0x850 = 1; } - a_this->leaf_actor_id = fopAcM_createChild(PROC_E_DB_LEAF, fopAcM_GetID(i_this), 0, &i_this->current.pos, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, NULL, -1, NULL); + a_this->leaf_actor_id = fopAcM_createChild(fpcNm_E_DB_LEAF_e, fopAcM_GetID(i_this), 0, &i_this->current.pos, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, NULL, -1, NULL); daE_DB_Execute(a_this); } @@ -2206,18 +2206,18 @@ static actor_method_class l_daE_DB_Method = { }; actor_process_profile_definition g_profile_E_DB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_DB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_db_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 136, // mPriority - &l_daE_DB_Method, // sub_method - 0x10050120, // 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_E_DB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_db_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_DB_e, + /* Actor SubMtd */ &l_daE_DB_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_db_leaf.cpp b/src/d/actor/d_a_e_db_leaf.cpp index 9c6b3f10ae..c712a437fa 100644 --- a/src/d/actor/d_a_e_db_leaf.cpp +++ b/src/d/actor/d_a_e_db_leaf.cpp @@ -3,7 +3,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_db_leaf.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static int daE_DB_LEAF_Draw(e_db_leaf_class* i_this) { g_env_light.settingTevStruct(0,&i_this->current.pos,&i_this->tevStr); @@ -68,18 +68,18 @@ static actor_method_class l_daE_DB_LEAF_Method = { }; actor_process_profile_definition g_profile_E_DB_LEAF = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_E_DB_LEAF, - &g_fpcLf_Method.base, - sizeof(e_db_leaf_class), - 0, - 0, - &g_fopAc_Method.base, - 137, - &l_daE_DB_LEAF_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_DB_LEAF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_db_leaf_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_DB_LEAF_e, + /* Actor SubMtd */ &l_daE_DB_LEAF_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_dd.cpp b/src/d/actor/d_a_e_dd.cpp index 8801595ef7..360fa65442 100644 --- a/src/d/actor/d_a_e_dd.cpp +++ b/src/d/actor/d_a_e_dd.cpp @@ -1784,18 +1784,18 @@ actor_method_class l_daE_DD_Method = { }; actor_process_profile_definition g_profile_E_DD = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_DD, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_dd_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 117, // mPriority - &l_daE_DD_Method, // sub_method - 0x10040100, // 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_E_DD_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_dd_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_DD_e, + /* Actor SubMtd */ &l_daE_DD_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_df.cpp b/src/d/actor/d_a_e_df.cpp index d9ca2a3bca..1039e2ddf7 100644 --- a/src/d/actor/d_a_e_df.cpp +++ b/src/d/actor/d_a_e_df.cpp @@ -13,7 +13,7 @@ class daE_DF_HIO_c : public JORReflexible { public: daE_DF_HIO_c(); - virtual ~daE_DF_HIO_c() {}; + virtual ~daE_DF_HIO_c() {} void genMessage(JORMContext*); @@ -23,18 +23,18 @@ public: STATIC_ASSERT(sizeof(daE_DF_HIO_c) == 0xC); -#if DEBUG -inline void daE_DF_HIO_c::genMessage(JORMContext* i_ctx) { - i_ctx->genLabel("デクレシア", 0x80000001); - i_ctx->genSlider("速度", &field_0x8, 0.0f, 100.0f); -} -#endif - daE_DF_HIO_c::daE_DF_HIO_c() { mNo = -1; field_0x8 = 0.0f; } +#if DEBUG +void daE_DF_HIO_c::genMessage(JORMContext* i_ctx) { + i_ctx->genLabel("デクレシア", 0x80000001); + i_ctx->genSlider("速度", &field_0x8, 0.0f, 100.0f); +} +#endif + int daE_DF_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_DF", 0xD); JUT_ASSERT(161, modelData != NULL); @@ -101,13 +101,13 @@ void daE_DF_c::CameraSet(f32 i_posz) { cXyz vec(0.0f, 0.0f, i_posz); dBgS_LinChk line_chk; - u16 angle = 0; + s16 angle = 0; for (s16 i = 0; i < 4; i++) { - cLib_offsetPos(&end, &start, angle, &vec); + cLib_offsetPos(&end, &start, (s16)angle, &vec); line_chk.Set(&start, &end, NULL); if (dComIfG_Bgsp().LineCross(&line_chk) == 0) { - cLib_offsetPos(&end, ¢er, angle, &vec); + cLib_offsetPos(&end, ¢er, (s16)angle, &vec); end.y += 400.0f; camera->mCamera.Set(center, end, mFovY, 0); @@ -116,7 +116,7 @@ void daE_DF_c::CameraSet(f32 i_posz) { break; } - angle += 0x10000 - 0x8000; + ANGLE_ADD_2(angle, 0x8000); } } @@ -409,10 +409,10 @@ void daE_DF_c::LinkEatAction() { cLib_chaseAngleS(&mChaseAngle.z, 0, 0x100); } -bool daE_DF_c::Mogu_Mogu() { +u8 daE_DF_c::Mogu_Mogu() { if (mMoguCount > 4) { mMoguCount = 0; - return true; + return 1; } if (mpMorfSO->isLoop()) { @@ -428,10 +428,10 @@ bool daE_DF_c::Mogu_Mogu() { } else { mCreatureSound.startCreatureSound(Z2SE_EN_DF_EAT_WAIT, 0, -1); } - return false; + return 0; } - return false; + return 0; } void daE_DF_c::ObjEatAction() { @@ -492,22 +492,23 @@ void daE_DF_c::SearchAction() { daObjCarry_c* obj_carry = (daObjCarry_c*)fpcM_Search(s_obj_sub, this); if (obj_carry != NULL) { - if (fopAcM_GetName(obj_carry) == PROC_Obj_Carry) { + if (fopAcM_GetName(obj_carry) == fpcNm_Obj_Carry_e) { mEatObjType = EAT_TYPE_OBJ; - mCarryType = obj_carry->getType(); + daObjCarry_c* obj_carry_copy = obj_carry; + mCarryType = obj_carry_copy->getType(); fopAcM_delete(obj_carry); cXyz* obj_pos = &fopAcM_GetPosition(obj_carry); Set_Angle(obj_pos); mAction = ACT_EAT; - } else if (fopAcM_GetName(obj_carry) == PROC_ALINK && mTimer == 0) { + } else if (fopAcM_GetName(obj_carry) == fpcNm_ALINK_e && mTimer == 0) { mEatObjType = EAT_TYPE_LINK; Set_Angle(player_pos); mTargetAngle = cLib_targetAngleY(¤t.pos, player_pos); mAction = ACT_EAT; dComIfGp_getVibration().StartShock(5, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); - } else if (fopAcM_GetName(obj_carry) == PROC_NBOMB) { + } else if (fopAcM_GetName(obj_carry) == fpcNm_NBOMB_e) { cXyz* obj_pos = &fopAcM_GetPosition(obj_carry); Set_Angle(obj_pos); mEatObjType = EAT_TYPE_BOMB; @@ -697,7 +698,7 @@ int daE_DF_c::Create() { } } - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); daE_DF_Execute(this); } @@ -717,18 +718,18 @@ static actor_method_class l_daE_DF_Method = { }; actor_process_profile_definition g_profile_E_DF = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_DF, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_DF_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 130, // mPriority - &l_daE_DF_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_DF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_DF_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_DF_e, + /* Actor SubMtd */ &l_daE_DF_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_dk.cpp b/src/d/actor/d_a_e_dk.cpp index 28420ad828..82fa722157 100644 --- a/src/d/actor/d_a_e_dk.cpp +++ b/src/d/actor/d_a_e_dk.cpp @@ -550,7 +550,7 @@ void daE_DK_c::executeAttack() { mCoreSphere.SetTgSpl(1); setElectricEffect(); field_0x6a3 = 1; - fopAcM_OffStatus(this, 0x80000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x80000_e); if (mMoveMode == 2) { if (field_0x698 == 0) { field_0x69c = 150; @@ -652,7 +652,7 @@ void daE_DK_c::executeDeath() { mSphere.OffCoSetBit(); mSphere.OffTgSetBit(); mCoreSphere.OffTgSetBit(); - fopAcM_OffStatus(this, 0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); field_0x68e = 0; @@ -697,7 +697,7 @@ void daE_DK_c::executeDeath() { BodyDeathMove(); - if (fopAcM_CheckStatus(this, 0x100000) == 0) { + if (fopAcM_CheckStatus(this, fopAcStts_HOOK_CARRY_NOW_e) == 0) { mMoveMode = 3; mpMorfSO->setPlaySpeed(1.0f); @@ -764,7 +764,7 @@ void daE_DK_c::action() { damage_check(); - fopAcM_OnStatus(this, 0x80000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e); if (fopAcM_searchPlayerDistance(this) > l_HIO.first_attack_range) { field_0x690 = 0x0; @@ -1082,18 +1082,18 @@ static actor_method_class l_daE_DK_Method = { }; actor_process_profile_definition g_profile_E_DK = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_DK, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_DK_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 755, // mPriority - &l_daE_DK_Method, // sub_method - 0x000C0100, // 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_E_DK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_DK_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_DK_e, + /* Actor SubMtd */ &l_daE_DK_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_dn.cpp b/src/d/actor/d_a_e_dn.cpp index e03c1adf2e..d7d0e056ef 100644 --- a/src/d/actor/d_a_e_dn.cpp +++ b/src/d/actor/d_a_e_dn.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_dn.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -186,51 +186,53 @@ static void anm_init(e_dn_class* i_this, int i_anm_id, f32 i_morf, u8 i_attr, f3 static int nodeCallBack(J3DJoint* i_joint, int param_2) { if (param_2 == 0) { - int jointNo = i_joint->getJntNo(); + J3DJoint* joint = i_joint; + int jointNo = joint->getJntNo(); J3DModel* model = j3dSys.getModel(); - e_dn_class* i_this = (e_dn_class*)model->getUserArea(); - if (i_this != NULL) { + e_dn_class* dn = (e_dn_class*)model->getUserArea(); + void* dn_v = (void*)dn; + if (dn != NULL) { MTXCopy(model->getAnmMtx(jointNo), *calc_mtx); if (jointNo != JNT_WORLD_ROOT) { if (jointNo == JNT_WAIST) { - cMtx_YrotM(*calc_mtx, (s16)i_this->field_0x830.y); - cMtx_ZrotM(*calc_mtx, i_this->jnt_waist_z_rot + (-i_this->field_0x762[2].x + i_this->field_0x830.x)); + cMtx_YrotM(*calc_mtx, (s16)dn->field_0x830.y); + cMtx_ZrotM(*calc_mtx, dn->jnt_waist_z_rot + (-dn->field_0x762[2].x + dn->field_0x830.x)); } else if (jointNo == JNT_LEGL1) { - cMtx_YrotM(*calc_mtx, i_this->jnt_legl1_y_rot); + cMtx_YrotM(*calc_mtx, dn->jnt_legl1_y_rot); } else if (jointNo == JNT_LEGL2) { - cMtx_ZrotM(*calc_mtx, i_this->field_0x7fc[0]); + cMtx_ZrotM(*calc_mtx, dn->field_0x7fc[0]); } else if (jointNo == JNT_LEGR1) { - cMtx_YrotM(*calc_mtx, i_this->field_0x7fc[1]); + cMtx_YrotM(*calc_mtx, dn->field_0x7fc[1]); } else if (jointNo == JNT_LEGR2) { - cMtx_ZrotM(*calc_mtx, i_this->field_0x7fc[2]); + cMtx_ZrotM(*calc_mtx, dn->field_0x7fc[2]); } else if (jointNo == JNT_BACKBONE02) { - cMtx_YrotM(*calc_mtx, (i_this->field_0x6fa / 2) + (-i_this->field_0x6f6 + i_this->field_0x762[1].y)); - cMtx_ZrotM(*calc_mtx, i_this->field_0x762[1].x + i_this->field_0x7ec[1]); + cMtx_YrotM(*calc_mtx, (dn->field_0x6fa / 2) + (-dn->field_0x6f6 + dn->field_0x762[1].y)); + cMtx_ZrotM(*calc_mtx, dn->field_0x762[1].x + dn->field_0x7ec[1]); } else if (jointNo == JNT_NECK01 || jointNo == JNT_NECK02) { - cMtx_YrotM(*calc_mtx, i_this->field_0x762[0].y + (-i_this->field_0x6f6 + i_this->field_0x6fa)); - cMtx_ZrotM(*calc_mtx, i_this->field_0x7ec[0] + (-i_this->field_0x6f8 + i_this->field_0x762[0].x)); + cMtx_YrotM(*calc_mtx, dn->field_0x762[0].y + (-dn->field_0x6f6 + dn->field_0x6fa)); + cMtx_ZrotM(*calc_mtx, dn->field_0x7ec[0] + (-dn->field_0x6f8 + dn->field_0x762[0].x)); } else if (jointNo == JNT_ARML1) { - cMtx_ZrotM(*calc_mtx, i_this->field_0x762[3].y + i_this->jnt_arml1_z_rot_offset); + cMtx_ZrotM(*calc_mtx, dn->field_0x762[3].y + dn->jnt_arml1_z_rot_offset); } else if (jointNo == JNT_ARML2) { - cMtx_ZrotM(*calc_mtx, i_this->field_0x762[4].y + i_this->jnt_arml2_z_rot_offset); + cMtx_ZrotM(*calc_mtx, dn->field_0x762[4].y + dn->jnt_arml2_z_rot_offset); } else if (jointNo == JNT_ARMR1) { - cMtx_ZrotM(*calc_mtx, i_this->field_0x762[5].y + i_this->jnt_armr1_z_rot_offset); + cMtx_ZrotM(*calc_mtx, dn->field_0x762[5].y + dn->jnt_armr1_z_rot_offset); } else if (jointNo == JNT_ARMR2) { - cMtx_ZrotM(*calc_mtx, i_this->field_0x762[6].y + i_this->jnt_armr2_z_rot_offset); + cMtx_ZrotM(*calc_mtx, dn->field_0x762[6].y + dn->jnt_armr2_z_rot_offset); } else if (jointNo >= JNT_TAIL01 && jointNo <= JNT_TAIL04) { - cMtx_YrotM(*calc_mtx, i_this->field_0x80e[jointNo - 31].y + i_this->jnt_tail_y_rot_offset); - cMtx_ZrotM(*calc_mtx, (s16)i_this->field_0x80e[jointNo - 31].x); + cMtx_YrotM(*calc_mtx, dn->field_0x80e[jointNo - 31].y + dn->jnt_tail_y_rot_offset); + cMtx_ZrotM(*calc_mtx, (s16)dn->field_0x80e[jointNo - 31].x); } } - if (i_this->death_jnt_rot != 0) { + if (dn->death_jnt_rot != 0) { if ((jointNo & 1) != 0) { - cMtx_YrotM(*calc_mtx, i_this->death_jnt_rot); + cMtx_YrotM(*calc_mtx, dn->death_jnt_rot); } else if ((jointNo & 2) != 0) { - cMtx_XrotM(*calc_mtx, i_this->death_jnt_rot); + cMtx_XrotM(*calc_mtx, dn->death_jnt_rot); } else if ((jointNo & 4) != 0) { - cMtx_ZrotM(*calc_mtx, i_this->death_jnt_rot); + cMtx_ZrotM(*calc_mtx, dn->death_jnt_rot); } } @@ -270,6 +272,7 @@ static int daE_DN_Draw(e_dn_class* i_this) { g_env_light.settingTevStruct(0, &actor->current.pos, &actor->tevStr); g_env_light.setLightTevColorType_MAJI(model, &actor->tevStr); + J3DMaterial* matNode_p; if (i_this->death_flag != 0) { J3DModelData* modelData = model->getModelData(); for (u16 i = 0; i < modelData->getMaterialNum(); i++) { @@ -285,7 +288,7 @@ static int daE_DN_Draw(e_dn_class* i_this) { if (i_this->death_flag != 0) { J3DModelData* modelData = model->getModelData(); for (u16 i = 0; i < modelData->getMaterialNum(); i++) { - J3DMaterial* matNode_p = modelData->getMaterialNodePointer(i); + matNode_p = modelData->getMaterialNodePointer(i); matNode_p->getTevColor(0)->r = 0; matNode_p->getTevColor(0)->g = 0; matNode_p->getTevColor(0)->b = 0; @@ -305,16 +308,16 @@ static int daE_DN_Draw(e_dn_class* i_this) { cXyz shadow_pos; shadow_pos.set(actor->current.pos.x, actor->current.pos.y + 50.0f + BREG_F(18), actor->current.pos.z); - i_this->shadow_key = dComIfGd_setShadow(i_this->shadow_key, 1, model, &shadow_pos, BREG_F(19) + 950.0f, 0.0f, - actor->current.pos.y, i_this->objacch.GetGroundH(), - i_this->objacch.m_gnd, &i_this->actor.tevStr, 0, 1.0f, + i_this->shadow_key = dComIfGd_setShadow(i_this->shadow_key, 1, model, &shadow_pos, BREG_F(19) + 950.0f, 0.0f, + actor->current.pos.y, i_this->objacch.GetGroundH(), + i_this->objacch.m_gnd, &i_this->actor.tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); dComIfGd_addRealShadow(i_this->shadow_key, i_this->knife_model); if (i_this->skull_model != NULL) { dComIfGd_addRealShadow(i_this->shadow_key, i_this->skull_model); } dComIfGd_addRealShadow(i_this->shadow_key, i_this->tate_model); - + return 1; } @@ -364,6 +367,7 @@ static fopAc_ac_c* target_info[10]; static int target_info_count; static void* s_b_sub(void* i_actor, void* i_data) { + UNUSED(i_data); if (fopAcM_IsActor(i_actor) && dBomb_c::checkBombActor((fopAc_ac_c*)i_actor) && !((dBomb_c*)i_actor)->checkStateExplode() && target_info_count < 10) { target_info[target_info_count] = (fopAc_ac_c*)i_actor; target_info_count++; @@ -436,7 +440,7 @@ static dBomb_c* search_bomb(e_dn_class* i_this, int param_2) { } else { return NULL; } - + return NULL; } @@ -458,7 +462,7 @@ static BOOL player_way_check(e_dn_class* i_this) { way = way * -1; } - if ((u32)((s16)way & 0xFFFF) < 0x6000) { + if ((u16)way < 0x6000) { return FALSE; } @@ -475,7 +479,7 @@ static int pl_check(e_dn_class* i_this, f32 search_area, s16 search_angle) { return 1; } } - + for (int i = 0; i <= 2; i++) { if (i_this->cc_sph[i].ChkCoHit() != 0) { if (player == dCc_GetAc(i_this->cc_sph[i].GetCoHitObj()->GetAc())) { @@ -483,7 +487,7 @@ static int pl_check(e_dn_class* i_this, f32 search_area, s16 search_angle) { } } } - + return 0; } @@ -521,15 +525,14 @@ static BOOL jump_pos_check(e_dn_class* i_this, cXyz* i_pos) { work.x = 0.0f; work.y = 200.0f; - int i = 0; - while (i < KREG_S(7) + 10) { + for (int i = 0; i < KREG_S(7) + 10; i++) { work.z = z_offset; MtxPosition(&work, &new_pos); new_pos += actor->current.pos; gnd_chk.SetPos(&new_pos); new_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if ((actor->current.pos.y - new_pos.y) < 200.0f) { + if (actor->current.pos.y - new_pos.y < 200.0f) { *i_pos = new_pos; work.z += KREG_F(18) + 200.0f; MtxPosition(&work, &new_pos); @@ -537,15 +540,13 @@ static BOOL jump_pos_check(e_dn_class* i_this, cXyz* i_pos) { gnd_chk.SetPos(&new_pos); new_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if ((actor->current.pos.y - new_pos.y) < 200.0f) { + if (actor->current.pos.y - new_pos.y < 200.0f) { *i_pos = new_pos; } return TRUE; } - z_offset += 50.0f; - i++; } return FALSE; @@ -709,7 +710,6 @@ static void e_dn_otoreac(e_dn_class* i_this) { static void e_dn_bomb_action(e_dn_class* i_this) { fopEn_enemy_c* actor = (fopEn_enemy_c*)&i_this->actor; - s16 angle; cXyz work, bomb_pos_target; dBomb_c* bomb = bomb_check(i_this); if (bomb == NULL) { @@ -748,23 +748,24 @@ static void e_dn_bomb_action(e_dn_class* i_this) { } break; - case 4: + case 4: { if (i_this->arg1 == 1 && bomb->speedF < 0.1f && !bomb->checkStateCarry() && JMAFastSqrt(work.x * work.x + work.z * work.z) < 250.0f) { - angle = i_this->search_angle_y - actor->shape_angle.y; + s16 angle = i_this->search_angle_y - actor->shape_angle.y; if (angle < 0x4000 && angle > -0x4000) { // ±90° i_this->mode = 10; break; } } - target_angle_y += 0x8000; // 180° + ANGLE_ADD_2(target_angle_y, 0x8000); // 180° dash_speed = l_HIO.dash_speed; if (JMAFastSqrt(work.x * work.x + work.z * work.z) > 600.0f) { i_this->mode = 5; anm_init(i_this, ANM_WAIT_01, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); } - + break; + } case 5: i_this->sound.startCreatureSoundLevel(Z2SE_EN_DN_V_LOOK_BOMB, 0, -1); @@ -863,7 +864,7 @@ static void e_dn_normal(e_dn_class* i_this) { case 3: movement_speed = l_HIO.movement_speed; - angle = actor->current.angle.y; + s16 angle = actor->current.angle.y; cLib_addCalcAngleS2(&actor->current.angle.y, i_this->cur_angle_y_target, 2, 0x400); /* If the actor is facing roughly 22.5° from the target y, stop moving */ @@ -887,7 +888,7 @@ static void e_dn_normal(e_dn_class* i_this) { cLib_addCalcAngleS2(&i_this->jnt_tail_y_rot_offset, angle, 2, 0x400); - if (i_this->timer[0] == 0 || + if (i_this->timer[0] == 0 || (i_this->timer[1] == 0 && (fopAcM_wayBgCheck(actor, 200.0f, 50.0f) || move_gake_check(i_this, 200.0f, 0)))) { i_this->mode = 2; i_this->timer[0] = cM_rndF(100.0f) + 50.0f; @@ -947,8 +948,9 @@ static void e_dn_drawback(e_dn_class* i_this) { } static void e_dn_wolfbite(e_dn_class* i_this) { - fopEn_enemy_c* actor = (fopEn_enemy_c*)&i_this->actor; + fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + fopEn_enemy_c* enemy = (fopEn_enemy_c*)actor; i_this->invulnerability_timer = 10; cLib_addCalc0(&actor->speedF, 1.0f, 2.0f); @@ -975,8 +977,8 @@ static void e_dn_wolfbite(e_dn_class* i_this) { } } - if (actor->health <= 0 || actor->checkWolfBiteDamage()) { - actor->offWolfBiteDamage(); + if (actor->health <= 0 || enemy->checkWolfBiteDamage()) { + enemy->offWolfBiteDamage(); anm_init(i_this, ANM_HANGED_DAMAGE, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f); S16_SUB(actor->health, 10); if (actor->health <= 0) { @@ -1032,13 +1034,17 @@ static int way_check(e_dn_class* i_this) { int learn_check; static void* shot_s_sub(void* i_actor, void* i_data) { - e_dn_class* i_this = (e_dn_class*)i_data; - fopEn_enemy_c* actor = (fopEn_enemy_c*)&i_this->actor; - if ((fopAcM_IsActor(i_actor) && (learn_check & 0x80000000) != 0 && fopAcM_GetName(i_actor) == PROC_ARROW && (fopAcM_GetParam(i_actor) == 1 || - fopAcM_GetParam(i_actor) == 2))) { - cXyz sp28(actor->current.pos - ((fopAc_ac_c*)i_actor)->current.pos); - if (sp28.abs() < 1000.0f) { - return i_actor; + UNUSED(i_data); + if (fopAcM_IsActor(i_actor)) { + if ((learn_check & 0x80000000) != 0 && + fopAcM_GetName(i_actor) == fpcNm_ARROW_e && + (fopAcM_GetParam(i_actor) == 1 || fopAcM_GetParam(i_actor) == 2)) { + fopAc_ac_c* arrowActor = (fopAc_ac_c*)i_actor; + e_dn_class* dn = (e_dn_class*)i_data; + cXyz sp28(dn->actor.current.pos - arrowActor->current.pos); + if (sp28.abs() < 1000.0f) { + return i_actor; + } } } @@ -1050,7 +1056,6 @@ static void e_dn_fight_run(e_dn_class* i_this) { cXyz sp4c, sp58; f32 fVar1 = 0.0f; int frame = i_this->anm_p->getFrame(); - BOOL wayCheck; s8 sVar4 = 1; if (pl_check(i_this, i_this->pl_range + 50.0f, 0x7FFF) == 0 && i_this->timer[0] == 0) { @@ -1199,7 +1204,7 @@ static void e_dn_fight_run(e_dn_class* i_this) { return; } } else if ( - dComIfGp_checkPlayerStatus1(0, 0x2000000) != 0 || + dComIfGp_checkPlayerStatus1(0, 0x2000000) != 0 || (((i_this->search_angle_x < 0x1000 && i_this->search_angle_x > -0x1000) || def != 0) && player_way_check(i_this)) ) { if ( @@ -1223,8 +1228,9 @@ static void e_dn_fight_run(e_dn_class* i_this) { i_this->timer[2] = JREG_F(1) + (cM_rndF(30.0f) + 30.0f); f32 fVar1 = 1.0f; if (cM_rndF(1.0f) < fVar1) { - wayCheck = way_check(i_this); - if (!wayCheck && cM_rndF(1.0f) < 0.75f) { + //TOOD: probably fakematch (debug) + BOOL wayCheck; + if (!(wayCheck = way_check(i_this)) && cM_rndF(1.0f) < 0.75f) { if (i_this->pl_dir < (l_HIO.attack_init_range - 100.0f) + TREG_F(7)) { i_this->action = ACTION_ATTACK_0; } else { @@ -1282,7 +1288,7 @@ static void e_dn_fight_run(e_dn_class* i_this) { static void e_dn_jump(e_dn_class* i_this) { fopEn_enemy_c* actor = (fopEn_enemy_c*)&i_this->actor; - + i_this->field_0x6f4 = 1; switch (i_this->mode) { case 0: @@ -1442,13 +1448,16 @@ static void e_dn_gakejump(e_dn_class* i_this) { static fopAc_ac_c* at_hit_check(e_dn_class* i_this) { fopEn_enemy_c* actor = (fopEn_enemy_c*)&i_this->actor; fopAc_ac_c* player = dComIfGp_getPlayer(0); - + if (i_this->mode >= 10) { return NULL; } - + + fopAc_ac_c* rv; if (i_this->at_sph.ChkAtHit() != 0) { - return dCc_GetAc(i_this->at_sph.GetAtHitObj()->GetAc()); + cCcD_Obj* atHitObj = i_this->at_sph.GetAtHitObj(); + rv = dCc_GetAc(atHitObj->GetAc()); + return rv; } return NULL; @@ -1482,7 +1491,7 @@ static void e_dn_attack_0(e_dn_class* i_this) { if (i_this->at_chk_flag != 0) { fopAc_ac_c* actor_p = at_hit_check(i_this); - if (actor_p != NULL && fopAcM_GetName(actor_p) == PROC_ALINK && daPy_getPlayerActorClass()->checkPlayerGuard()) { + if (actor_p != NULL && fopAcM_GetName(actor_p) == fpcNm_ALINK_e && daPy_getPlayerActorClass()->checkPlayerGuard()) { dComIfGp_getVibration().StartShock(3, 31, cXyz(0.0f, 1.0f, 0.0f)); } } @@ -1541,7 +1550,8 @@ static void e_dn_attack(e_dn_class* i_this) { cLib_addCalc0(&actor->speedF, 1.0f, 5.0f); if (i_this->at_chk_flag != 0) { fopAc_ac_c* actor_p = at_hit_check(i_this); - if (actor_p != NULL && fopAcM_GetName(actor_p) == PROC_ALINK && daPy_getPlayerActorClass()->checkPlayerGuard()) { + UNUSED(actor_p); // maybe debug fakematch? + if (actor_p != NULL && fopAcM_GetName(actor_p) == fpcNm_ALINK_e && daPy_getPlayerActorClass()->checkPlayerGuard()) { i_this->anm_p->setPlaySpeed(0.0f); i_this->action = ACTION_FIGHT_RUN; i_this->mode = 0; @@ -1759,7 +1769,8 @@ static BOOL body_gake(e_dn_class* i_this) { } static void e_dn_damage(e_dn_class* i_this) { - fopEn_enemy_c* actor = (fopEn_enemy_c*)&i_this->actor; + fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)actor; cXyz sp34, sp40; if (actor->health <= 0) { @@ -1768,7 +1779,7 @@ static void e_dn_damage(e_dn_class* i_this) { } if (daPy_py_c::checkNowWolf() != 0) { - if (i_this->field_0x6f3 == 0 && actor->checkWolfDownStartFlg()) { + if (i_this->field_0x6f3 == 0 && enemy->checkWolfDownStartFlg()) { if (i_this->timer[0] > 40) { i_this->timer[0] = 90; OS_REPORT(" DN WOLFHIT LONG \n"); @@ -1790,13 +1801,13 @@ static void e_dn_damage(e_dn_class* i_this) { } } - } else if (actor != NULL && actor->checkCutDownHitFlg()) { - actor->offCutDownHitFlg(); + } else if (enemy != NULL && enemy->checkCutDownHitFlg()) { + enemy->offCutDownHitFlg(); i_this->mode = 3; actor->health = 0; i_this->timer[0] = 100; i_this->timer[1] = 46; - actor->offDownFlg(); + enemy->offDownFlg(); actor->health = 0; i_this->sound.startCreatureVoice(Z2SE_EN_DN_V_DEATH, -1); i_this->death_flag = 1; @@ -1824,15 +1835,16 @@ static void e_dn_damage(e_dn_class* i_this) { case 1: if (i_this->objacch.ChkWallHit() != 0 && i_this->timer[0] == 0) { - int kado_kabe = kado_check(i_this); - if (kado_kabe != 0) { + //TODO: probably fakematch (debug) + int kado_kabe; + if ((kado_kabe = kado_check(i_this)) != 0) { OS_REPORT(" ..KADO KABE ..%x\n", kado_kabe); if (kado_kabe == 2) { i_this->field_0x70e = 0xC00; - i_this->field_0x724.y += TREG_S(8) + -7000; + ANGLE_ADD_2(i_this->field_0x724.y, TREG_S(8) + -7000); } else { i_this->field_0x70e = -0xC00; - i_this->field_0x724.y += -(TREG_S(8) - 7000); + ANGLE_ADD_2(i_this->field_0x724.y, -(TREG_S(8) - 7000)); } i_this->field_0x7e8 = BREG_F(10) + 8000.0f; @@ -1844,7 +1856,7 @@ static void e_dn_damage(e_dn_class* i_this) { i_this->mode = 10; actor->speed.y = 0.0f; i_this->field_0x704 *= 0.2f; - i_this->field_0x724.y += 0x8000; + ANGLE_ADD_2(i_this->field_0x724.y, 0x8000); i_this->field_0x7e8 = BREG_F(10) + 8000.0f; i_this->unk_timer_5 = BREG_S(7) + 5; i_this->field_0x754 = BREG_F(4) + 100.0f; @@ -1908,7 +1920,7 @@ static void e_dn_damage(e_dn_class* i_this) { if (i_this->objacch.ChkGroundHit()) { if (actor->health > 0 && !daPy_py_c::checkNowWolf()) { - actor->onDownFlg(); + enemy->onDownFlg(); } dKy_Sound_set(actor->current.pos, 100, fopAcM_GetID(&i_this->actor), 5); @@ -1958,7 +1970,7 @@ static void e_dn_damage(e_dn_class* i_this) { MTXCopy(i_this->anm_p->getModel()->getAnmMtx(JNT_BACKBONE02), *calc_mtx); sp34.set(0.0f, 0.0f, 0.0f); MtxPosition(&sp34, &sp40); - + s8 unused = 0; dn_disappear(i_this); @@ -1976,8 +1988,8 @@ static void e_dn_damage(e_dn_class* i_this) { i_this->sound.startCreatureVoice(Z2SE_EN_DN_V_UP, -1); - if (actor != NULL) { - actor->offDownFlg(); + if (enemy != NULL) { + enemy->offDownFlg(); } } break; @@ -2018,8 +2030,8 @@ static void e_dn_damage(e_dn_class* i_this) { i_this->timer[0] = 5; i_this->mode = 21; - if (actor != NULL) { - actor->offDownFlg(); + if (enemy != NULL) { + enemy->offDownFlg(); } } break; @@ -2036,7 +2048,7 @@ static void e_dn_damage(e_dn_class* i_this) { break; case 30: - if (!actor->checkWolfDownPullFlg()) { + if (!enemy->checkWolfDownPullFlg()) { i_this->timer[1] = 0; } @@ -2051,8 +2063,8 @@ static void e_dn_damage(e_dn_class* i_this) { i_this->sound.startCreatureVoice(Z2SE_EN_DN_V_UP, -1); i_this->timer[0] = 10; } else if (i_this->timer[1] == 1) { - actor->onWolfDownPullEndFlg(); - actor->offCutDownHitFlg(); + enemy->onWolfDownPullEndFlg(); + enemy->offCutDownHitFlg(); actor->health = 0; i_this->timer[0] = 1000; i_this->timer[1] = 35; @@ -2062,13 +2074,13 @@ static void e_dn_damage(e_dn_class* i_this) { case 31: if (i_this->timer[0] == 0) { - actor->offDownFlg(); + enemy->offDownFlg(); i_this->mode = 20; i_this->field_0x6f3 = 0; } } - if (actor != NULL && actor->checkDownFlg()) { + if (enemy != NULL && enemy->checkDownFlg()) { i_this->field_0x6f2 = 0; } @@ -2167,7 +2179,7 @@ static void e_dn_reg(e_dn_class* i_this) { cXyz sp34, sp40; f32 dash_speed = 0.0f; int frame = i_this->anm_p->getFrame(); - + i_this->field_0x6f2 = 0; i_this->invulnerability_timer = 10; @@ -2237,9 +2249,11 @@ static void e_dn_reg(e_dn_class* i_this) { break; } + s16 sp0A = actor->current.angle.y; cLib_addCalcAngleS2(&actor->current.angle.y, i_this->cur_angle_y_target, 2, 0x800); - s16 sVar1 = actor->current.angle.y - i_this->cur_angle_y_target; - if (sVar1 > 0x800 || sVar1 < -0x800) { + sp0A -= actor->current.angle.y; + s16 sp08 = actor->current.angle.y - i_this->cur_angle_y_target; + if (sp08 > 0x800 || sp08 < -0x800) { dash_speed = 0.0f; } @@ -2343,7 +2357,8 @@ static void damage_check(e_dn_class* i_this) { i_this->invulnerability_timer = 1000; } else { at_power_check(&i_this->at_info); - s16 sVar1 = actor->health; + s16 oldHealth1 = actor->health; + s16 oldHealth2 = actor->health; cc_at_check(actor, &i_this->at_info); if (daPy_getPlayerActorClass()->getCutType() == daPy_py_c::CUT_TYPE_HEAD_JUMP) { @@ -2362,7 +2377,7 @@ static void damage_check(e_dn_class* i_this) { i_this->learn |= i_this->at_info.mHitBit; if (i_this->at_info.mHitType == 16 || i_this->at_info.mpCollider->ChkAtType(AT_TYPE_HOOKSHOT)) { - actor->health = sVar1; + actor->health = oldHealth2; i_this->action = ACTION_DRAWBACK; i_this->mode = 0; @@ -2425,7 +2440,7 @@ static void action(e_dn_class* i_this) { s8 pl_search = 0; s8 bVar2 = 1; - actor->offHeadLockFlg(); + i_this->actor.offHeadLockFlg(); if (fopAcM_otherBgCheck(player, actor)) { fopAcM_OffStatus(actor, 0); actor->attention_info.flags = 0; @@ -2561,15 +2576,15 @@ static void action(e_dn_class* i_this) { MtxPosition(&work, &sp24c); actor->current.pos += sp24c; work = i_this->field_0x5bc - i_this->field_0x5c8; - f32 fVar1 = work.abs(); + f32 var_f28 = work.abs(); work = i_this->field_0x5bc - actor->current.pos; - f32 fVar2 = work.abs(); - f32 fVar3 = fVar1 * (NREG_F(19) + 0.3f); - if (fVar3 > NREG_F(18) + 250.0f) { - fVar3 = NREG_F(18) + 250.0f; + f32 var_f25 = work.abs(); + f32 var_f30 = var_f28 * (NREG_F(19) + 0.3f); + if (var_f30 > NREG_F(18) + 250.0f) { + var_f30 = NREG_F(18) + 250.0f; } - i_this->cur_pos_y_offset = fVar3 * cM_ssin((fVar2 / fVar1) * 32768.0f); + i_this->cur_pos_y_offset = var_f30 * cM_ssin((var_f25 / var_f28) * 32768.0f); i_this->field_0x5d8 = 0; } else { cLib_addCalc0(&i_this->cur_pos_y_offset, 1.0f, 30.0f); @@ -2621,9 +2636,9 @@ static void action(e_dn_class* i_this) { } } - s16 max_step, sVar2, sVar3; - sVar2 = 0; - sVar3 = 0; + s16 sp14, sp12, max_step; + sp14 = 0; + sp12 = 0; max_step = 0x800; if (i_this->field_0x700 != 0) { i_this->field_0x700--; @@ -2657,22 +2672,22 @@ static void action(e_dn_class* i_this) { } work.y += -(TREG_F(2) + 150.0f) * l_HIO.model_size; - sVar2 = cM_atan2s(work.x, work.z) - actor->shape_angle.y; - sVar3 = actor->shape_angle.x + cM_atan2s(work.y, JMAFastSqrt(work.x * work.x + work.z * work.z)); - if (sVar2 > 0x2710) { - sVar2 = 10000; - } else if (sVar2 < -10000) { - sVar2 = -10000; + sp14 = cM_atan2s(work.x, work.z) - actor->shape_angle.y; + sp12 = actor->shape_angle.x + cM_atan2s(work.y, JMAFastSqrt(work.x * work.x + work.z * work.z)); + if (sp14 > 0x2710) { + sp14 = 10000; + } else if (sp14 < -10000) { + sp14 = -10000; } - if (sVar3 > 0x2710) { - sVar3 = 10000; - } else if (sVar3 < -20000) { - sVar3 = -20000; + if (sp12 > 0x2710) { + sp12 = 10000; + } else if (sp12 < -20000) { + sp12 = -20000; } - cLib_addCalcAngleS2(&i_this->field_0x6f6, sVar2 / 2, 2, max_step); - cLib_addCalcAngleS2(&i_this->field_0x6f8, sVar3 / 2, 2, max_step); + cLib_addCalcAngleS2(&i_this->field_0x6f6, sp14 / 2, 2, max_step); + cLib_addCalcAngleS2(&i_this->field_0x6f8, sp12 / 2, 2, max_step); } i_this->field_0x6fc = 0; @@ -2698,7 +2713,7 @@ static void action(e_dn_class* i_this) { work.z = 15000.0f; } MtxPosition(&work, &sp24c); - + i_this->field_0x7a4[0].y = sp24c.x; i_this->field_0x7a4[0].x = sp24c.z; i_this->field_0x7a4[1].y = sp24c.x; @@ -2710,13 +2725,13 @@ static void action(e_dn_class* i_this) { i_this->field_0x7a4[1].x = i_this->field_0x75c * cM_scos(i_this->field_0x760) * (BREG_F(0) + 70.0f); i_this->field_0x7a4[2].x += i_this->field_0x7a4[1].x; cLib_addCalc0(&i_this->field_0x75c, 1.0f, BREG_F(1) + 3.0f); - i_this->field_0x760 += BREG_S(0) + 4000; + ANGLE_ADD_2(i_this->field_0x760, BREG_S(0) + 4000); } if (fabsf(i_this->field_0x754) > 1.0f) { i_this->field_0x7a4[0].x = i_this->field_0x754 * cM_scos(i_this->field_0x758) * (BREG_F(2) + 70.0f); cLib_addCalc0(&i_this->field_0x754, 1.0f, BREG_F(3) + 3.0f); - i_this->field_0x758 += BREG_S(1) + 4000; + ANGLE_ADD_2(i_this->field_0x758, BREG_S(1) + 4000); } if (actor->speed.y < 0.0f && i_this->objacch.ChkGroundHit()) { @@ -2725,48 +2740,48 @@ static void action(e_dn_class* i_this) { } if (i_this->field_0x704) { - s16 sVar4 = i_this->field_0x724.y - actor->shape_angle.y; - i_this->field_0x7a4[3].y = 0x4000 + -sVar4; + sp14 = i_this->field_0x724.y - actor->shape_angle.y; + i_this->field_0x7a4[3].y = 0x4000 + -sp14; if (i_this->field_0x7a4[3].y > 6000) { // ~33° i_this->field_0x7a4[3].y = 6000; } else if (i_this->field_0x7a4[3].y < -9000) { // ~49.4° i_this->field_0x7a4[3].y = -9000; } - i_this->field_0x7a4[4].y = 0x4000 + -sVar4; + i_this->field_0x7a4[4].y = 0x4000 + -sp14; if (i_this->field_0x7a4[4].y > 17000) { // ~93.4° i_this->field_0x7a4[4].y = 17000; } else if (i_this->field_0x7a4[4].y < 0) { i_this->field_0x7a4[4].y = 0; } - i_this->field_0x7a4[5].y = sVar4 + 0x4000; + i_this->field_0x7a4[5].y = sp14 + 0x4000; if (i_this->field_0x7a4[5].y > 6000) { i_this->field_0x7a4[5].y = 6000; } else if (i_this->field_0x7a4[5].y < -9000) { i_this->field_0x7a4[5].y = -9000; } - i_this->field_0x7a4[6].y = sVar4 + 0x4000; + i_this->field_0x7a4[6].y = sp14 + 0x4000; if (i_this->field_0x7a4[6].y > 17000) { i_this->field_0x7a4[6].y = 17000; } else if (i_this->field_0x7a4[6].y < 0) { i_this->field_0x7a4[6].y = 0; } - cMtx_YrotS(*calc_mtx, sVar4); + cMtx_YrotS(*calc_mtx, sp14); work.x = 0.0f; work.y = 0.0f; work.z = BREG_F(8) + 12000.0f; MtxPosition(&work, &sp24c); i_this->field_0x836.y = -sp24c.x; i_this->field_0x836.x = -sp24c.z * 1.3f; - + if (i_this->field_0x836.x > (s16)(BREG_S(6) + 10000)) { i_this->field_0x836.x = BREG_S(6) + 10000; } - i_this->field_0x836.x += BREG_S(7) + 6000; + ANGLE_ADD_2(i_this->field_0x836.x, BREG_S(7) + 6000); } static s16 j_spd[11] = { @@ -2812,15 +2827,15 @@ static void action(e_dn_class* i_this) { i_this->unk_timer_4--; } - f32 fVar1 = i_this->unk_timer_4 * (DREG_F(13) + 1.0f); - if (fVar1 > 30.0f) { - fVar1 = 30.0f; + f32 var_f31 = i_this->unk_timer_4 * (DREG_F(13) + 1.0f); + if (var_f31 > 30.0f) { + var_f31 = 30.0f; } - fVar1 *= fVar1; + var_f31 *= var_f31; for (int i = 0; i < 4; i++) { - i_this->field_0x80e[i].x = fVar1 * (cM_ssin(i_this->frame_counter * (DREG_S(5) + 5000) + i * (DREG_S(7) + -15000)) * (DREG_F(18) + 5.0f)); - i_this->field_0x80e[i].y = fVar1 * (cM_ssin(i_this->frame_counter * (DREG_S(5) + 0x12C0) + i * (DREG_S(7) + -13000)) * (DREG_F(18) + 5.0f)); + i_this->field_0x80e[i].x = var_f31 * (cM_ssin(i_this->frame_counter * (DREG_S(5) + 5000) + i * (DREG_S(7) + -15000)) * (DREG_F(18) + 5.0f)); + i_this->field_0x80e[i].y = var_f31 * (cM_ssin(i_this->frame_counter * (DREG_S(5) + 0x12C0) + i * (DREG_S(7) + -13000)) * (DREG_F(18) + 5.0f)); } cLib_addCalcAngleS2(&i_this->jnt_tail_y_rot_offset, 0, 4, 0x100); @@ -2830,10 +2845,10 @@ static void action(e_dn_class* i_this) { Vec sp258; cXyz sp264, sp270; dBgS_GndChk gnd_chk; - s16 sVar6, sVar7; - sVar6 = 0; - sVar7 = 0; - fVar1 = 100.0f; + s16 sp0C, sp0A; + sp0C = 0; + sp0A = 0; + f32 var_f27 = 100.0f; MTXCopy(i_this->anm_p->getModel()->getAnmMtx(JNT_BACKBONE02), *calc_mtx); work.set(0.0f, 0.0f, 0.0f); @@ -2846,32 +2861,31 @@ static void action(e_dn_class* i_this) { if (sp264.y != -G_CM3D_F_INF) { sp258.x = sp264.x; sp258.y = sp264.y + 100.0f; - sp258.z = sp264.z + fVar1; + sp258.z = sp264.z + var_f27; gnd_chk.SetPos(&sp258); sp258.y = dComIfG_Bgsp().GroundCross(&gnd_chk); + f32 x, y, z; if (sp258.y != -G_CM3D_F_INF) { - f32 z, y; y = sp258.y - sp264.y; z = sp258.z - sp264.z; - sVar7 = -cM_atan2s(y, z); - if (sVar7 > 0x3000 || sVar7 < -0x3000) { - sVar7 = 0; + sp0A = -cM_atan2s(y, z); + if (sp0A > 0x3000 || sp0A < -0x3000) { + sp0A = 0; } } - sp258.x = sp264.x + fVar1; + sp258.x = sp264.x + var_f27; sp258.y = sp264.y + 100.0f; sp258.z = sp264.z; gnd_chk.SetPos(&sp258); sp258.y = dComIfG_Bgsp().GroundCross(&gnd_chk); if (sp258.y != -G_CM3D_F_INF) { - f32 x, y; y = sp258.y - sp264.y; x = sp258.x - sp264.x; - sVar6 = (s16)cM_atan2s(y, x); - if (sVar6 > 0x3000 || sVar6 < -0x3000) { - sVar6 = 0; + sp0C = (s16)cM_atan2s(y, x); + if (sp0C > 0x3000 || sp0C < -0x3000) { + sp0C = 0; } } } @@ -2898,8 +2912,8 @@ static void action(e_dn_class* i_this) { actor->current.pos += sp24c; } - i_this->field_0x730.x = sVar7; - i_this->field_0x730.z = sVar6; + i_this->field_0x730.x = sp0A; + i_this->field_0x730.z = sp0C; } } @@ -2986,7 +3000,7 @@ static int daE_DN_Execute(e_dn_class* i_this) { return 1; } - if (c_start == 0 && dComIfGp_event_runCheck() && + if (c_start == 0 && dComIfGp_event_runCheck() && (fopAcM_getTalkEventPartner((fopAc_ac_c*)daPy_getLinkPlayerActorClass()) == daPy_py_c::getMidnaActor() || daPy_getPlayerActorClass()->eventInfo.checkCommandDoor())) { return 1; } @@ -3109,7 +3123,7 @@ static int daE_DN_Execute(e_dn_class* i_this) { } else { i_this->cc_sph[0].SetR(50.0f); } - + actor->attention_info.position = actor->eyePos; actor->attention_info.position.y += 70.0f + BREG_F(7); @@ -3175,7 +3189,7 @@ static int daE_DN_Execute(e_dn_class* i_this) { i_this->skull_model->setBaseTRMtx(mDoMtx_stack_c::get()); } - + MTXCopy(i_this->anm_p->getModel()->getAnmMtx(JNT_ARML2), *calc_mtx); i_this->tate_model->setBaseTRMtx(*calc_mtx); @@ -3362,7 +3376,7 @@ static int useHeapInit(fopAc_ac_c* actor) { static cPhs_Step daE_DN_Create(fopAc_ac_c* actor) { e_dn_class* i_this = (e_dn_class*)actor; - fopAcM_ct(actor, e_dn_class); + fopAcM_ct(&i_this->actor, e_dn_class); cPhs_Step phase = dComIfG_resLoad(&i_this->phase, "E_dn"); if (phase == cPhs_COMPLEATE_e) { @@ -3402,7 +3416,7 @@ static cPhs_Step daE_DN_Create(fopAc_ac_c* actor) { l_HIO.no = mDoHIO_CREATE_CHILD("リザードマン", &l_HIO); } - fopAcM_OnStatus(actor, fopAcM_STATUS_UNK_0x100); + fopAcM_OnStatus(actor, fopAcStts_CULL_e); actor->attention_info.flags = fopAc_AttnFlag_BATTLE_e; fopAcM_SetMtx(actor, i_this->anm_p->getModel()->getBaseTRMtx()); fopAcM_SetMin(actor, -200.0f, -200.0f, -200.0f); @@ -3472,7 +3486,7 @@ static cPhs_Step daE_DN_Create(fopAc_ac_c* actor) { if ((i_this->arg0 == 13 || i_this->arg0 == 14) || (i_this->arg0 == 15 || i_this->arg0 == 16)) { i_this->status = 1; i_this->action = ACTION_REG; - fopAcM_OnStatus(actor, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(actor, fopAcStts_UNK_0x4000_e); i_this->acchcir.SetWall(80.0f, 2.0f); } @@ -3501,18 +3515,18 @@ static actor_method_class l_daE_DN_Method = { }; actor_process_profile_definition g_profile_E_DN = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_DN, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_dn_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 118, // mPriority - &l_daE_DN_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_E_DN_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_dn_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_DN_e, + /* Actor SubMtd */ &l_daE_DN_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_dt.cpp b/src/d/actor/d_a_e_dt.cpp index 3f1d793390..3d88065113 100644 --- a/src/d/actor/d_a_e_dt.cpp +++ b/src/d/actor/d_a_e_dt.cpp @@ -706,7 +706,7 @@ int E_DT_n::mDt_OtamaNo[20]; static void* s_otama_todo(void* i_proc, void* i_this) { if (fopAcM_IsActor(i_proc) && !fpcM_IsCreating(fopAcM_GetID(i_proc)) - && fopAcM_GetName(i_proc) == PROC_E_OT) + && fopAcM_GetName(i_proc) == fpcNm_E_OT_e) { daE_OT_c* otama = static_cast(i_proc); E_DT_n::mDt_OtamaNum++; @@ -730,7 +730,7 @@ int E_DT_n::m_fall_no; static void* s_fall_otama(void* i_proc, void* i_this) { if (fopAcM_IsActor(i_proc) && !fpcM_IsCreating(fopAcM_GetID(i_proc)) - && fopAcM_GetName(i_proc) == PROC_E_OT) + && fopAcM_GetName(i_proc) == fpcNm_E_OT_e) { daE_OT_c* otama = static_cast(i_proc); if (E_DT_n::m_fall_no == otama->getChildNo() @@ -764,10 +764,10 @@ void daE_DT_c::setStayOtamaDelete() { static void* s_demo_otama(void* i_proc, void* i_this) { if (fopAcM_IsActor(i_proc) && !fpcM_IsCreating(fopAcM_GetID(i_proc)) - && fopAcM_GetName(i_proc) == PROC_E_OT) + && fopAcM_GetName(i_proc) == fpcNm_E_OT_e) { daE_OT_c* otama = static_cast(i_proc); - fopAcM_OffStatus(otama, 0x8000); + fopAcM_OffStatus(otama, fopAcStts_STAFF_PRIMARY_e); } return NULL; } @@ -799,7 +799,7 @@ bool daE_DT_c::checkBombEat() { bool daE_DT_c::isShutterOpen() { daAmiShutter_c* shutter; - fopAcM_SearchByName(PROC_Obj_AmiShutter, (fopAc_ac_c**)&shutter); + fopAcM_SearchByName(fpcNm_Obj_AmiShutter_e, (fopAc_ac_c**)&shutter); if (shutter != NULL && shutter->isShutterOpen()) { return true; } else { @@ -884,7 +884,7 @@ void daE_DT_c::executeCry() { getNumberOfOtama(); for (int i = 0; i < 20; i++) { if (E_DT_n::mDt_OtamaNo[i] == 0) { - fopAcM_create(PROC_E_OT, i, ¤t.pos, fopAcM_GetRoomNo(this), + fopAcM_create(fpcNm_E_OT_e, i, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, 0xff); } } @@ -1145,14 +1145,14 @@ void daE_DT_c::executeJump() { switch (field_0x704) { case 0: if (mBodyCcSph[0].ChkCoHit()) { - if (fopAcM_GetName(dCc_GetAc(mBodyCcSph[0].GetCoHitObj()->GetAc())) == PROC_ALINK) + if (fopAcM_GetName(dCc_GetAc(mBodyCcSph[0].GetCoHitObj()->GetAc())) == fpcNm_ALINK_e) { field_0x704 = 2; mLinkPressed = true; } } if (mBodyCcSph[1].ChkCoHit()) { - if (fopAcM_GetName(dCc_GetAc(mBodyCcSph[1].GetCoHitObj()->GetAc())) == PROC_ALINK) + if (fopAcM_GetName(dCc_GetAc(mBodyCcSph[1].GetCoHitObj()->GetAc())) == fpcNm_ALINK_e) { field_0x704 = 2; mLinkPressed = true; @@ -1602,7 +1602,7 @@ void daE_DT_c::executeOpening() { attention_info.flags = 0; if (getNumberOfOtama() == 0) { for (i = 0; i < 20; i++) { - fopAcM_create(PROC_E_OT, i | 0xff030000, ¤t.pos, fopAcM_GetRoomNo(this), + fopAcM_create(fpcNm_E_OT_e, i | 0xff030000, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, 0xff); } } @@ -1656,7 +1656,7 @@ void daE_DT_c::executeOpening() { } if (create_otama) { vec1.set(0.0f, 2000.0f, 0.0f); - fopAcM_create(PROC_E_OT, 0xff01ffff, &vec1, fopAcM_GetRoomNo(this), + fopAcM_create(fpcNm_E_OT_e, 0xff01ffff, &vec1, fopAcM_GetRoomNo(this), &shape_angle, NULL, 0xff); } if (mpMorf->isStop() && getNumberOfOtama() <= 20) { @@ -1846,7 +1846,7 @@ void daE_DT_c::executeOpening() { getNumberOfOtama(); for (int i = 0; i < 20; i++) { if (E_DT_n::mDt_OtamaNo[i] == 0) { - mDemoID = fopAcM_create(PROC_E_OT, i | 0xff030000, ¤t.pos, + mDemoID = fopAcM_create(fpcNm_E_OT_e, i | 0xff030000, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, 0xff); } } @@ -2561,20 +2561,20 @@ static actor_method_class l_daE_DT_Method = { }; actor_process_profile_definition g_profile_E_DT = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_DT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_DT_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 202, // mPriority - &l_daE_DT_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_E_DT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_DT_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_DT_e, + /* Actor SubMtd */ &l_daE_DT_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_e_fb.cpp b/src/d/actor/d_a_e_fb.cpp index 57949be764..937eb801fb 100644 --- a/src/d/actor/d_a_e_fb.cpp +++ b/src/d/actor/d_a_e_fb.cpp @@ -473,7 +473,7 @@ void daE_FB_c::executeAttack() { child_type = 11; } - fopAcM_createChild(PROC_E_FB, fopAcM_GetID(this), child_type, &child_pos, + fopAcM_createChild(fpcNm_E_FB_e, fopAcM_GetID(this), child_type, &child_pos, fopAcM_GetRoomNo(this), &sp_0x28, NULL, -1, NULL); } } @@ -590,7 +590,7 @@ void daE_FB_c::executeDamage() { mini_pos.x += cM_rndF(50.0f); mini_pos.y += cM_rndF(100.0f) + 100.0f; mini_pos.z += cM_rndF(50.0f); - fopAcM_create(PROC_E_FZ, 1, &mini_pos, fopAcM_GetRoomNo(this), &mini_angle, NULL, -1); + fopAcM_create(fpcNm_E_FZ_e, 1, &mini_pos, fopAcM_GetRoomNo(this), &mini_angle, NULL, -1); } dead_eff_set(); @@ -1002,20 +1002,20 @@ static actor_method_class l_daE_FB_Method = { }; actor_process_profile_definition g_profile_E_FB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_FB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_FB_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 176, // mPriority - &l_daE_FB_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_E_FB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_FB_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_FB_e, + /* Actor SubMtd */ &l_daE_FB_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_fk.cpp b/src/d/actor/d_a_e_fk.cpp index bc0cf94458..5840df0495 100644 --- a/src/d/actor/d_a_e_fk.cpp +++ b/src/d/actor/d_a_e_fk.cpp @@ -812,18 +812,18 @@ static actor_method_class l_daE_FK_Method = { }; actor_process_profile_definition g_profile_E_FK = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_FK, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_FK_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 159, // mPriority - &l_daE_FK_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_E_FK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_FK_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_FK_e, + /* Actor SubMtd */ &l_daE_FK_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_fm.cpp b/src/d/actor/d_a_e_fm.cpp index 88b3d2c786..ca01f73c29 100644 --- a/src/d/actor/d_a_e_fm.cpp +++ b/src/d/actor/d_a_e_fm.cpp @@ -227,7 +227,7 @@ daE_FM_HIO_c::daE_FM_HIO_c() { } static void* s_fmobj_del(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_FMOBJ) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_FMOBJ_e) { fopAcM_delete((fopAc_ac_c*)i_actor); } @@ -247,7 +247,7 @@ static f32 h_power; static s8 h_unk; static void* s_hasira_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_HHASHI) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_HHASHI_e) { ((daObjHHASHI_c*)i_actor)->Rolling(&h_pos, h_range, h_power, h_unk); } @@ -255,7 +255,7 @@ static void* s_hasira_sub(void* i_actor, void* i_data) { } static void* s_hasira_poscheck(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_HHASHI) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_HHASHI_e) { f32 x = ((fopAc_ac_c*)i_actor)->current.pos.x - ((fopAc_ac_c*)i_data)->current.pos.x; f32 z = ((fopAc_ac_c*)i_actor)->current.pos.z - ((fopAc_ac_c*)i_data)->current.pos.z; if (JMAFastSqrt((x * x) + (z * z)) < 500.0f) { @@ -272,7 +272,7 @@ static void* s_hasira_poscheck(void* i_actor, void* i_data) { static f32 fire_range; static void* s_hasira_eff_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_HHASHI) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_HHASHI_e) { daObjHHASHI_c* a_actor = (daObjHHASHI_c*)i_actor; for (int i = 0; i < 10; i++) { if (((e_fm_class*)i_data)->mHashiraActors[i] == a_actor) { @@ -1697,11 +1697,11 @@ static void demo_camera(e_fm_class* i_this) { spE0 += player->current.pos; OS_REPORT("///YSTONE POS %d,%d,%d\n", (int)spE0.x, (int)spE0.y, (int)spE0.z); - fopAcM_create(PROC_OBJ_YSTONE, 0, &spE0, fopAcM_GetRoomNo(actor), NULL, NULL, -1); + fopAcM_create(fpcNm_OBJ_YSTONE_e, 0, &spE0, fopAcM_GetRoomNo(actor), NULL, NULL, -1); } if (i_this->mDemoCamTimer == VREG_S(1) + 120) { - obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE); + obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e); if (ystone != NULL) { ystone->field_0x59b = 0; } @@ -1733,7 +1733,7 @@ static void demo_camera(e_fm_class* i_this) { cLib_addCalc2(&i_this->field_0x1b05c, 210.0f, 0.05f, 0.5f); - obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE); + obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e); if (ystone != NULL) { ystone->setCurrentPos(spE0); } @@ -1744,7 +1744,7 @@ static void demo_camera(e_fm_class* i_this) { fopAcM_createWarpHole(&warp_pos, &warp_rot, fopAcM_GetRoomNo(actor), 0, 1, 0xFF); spEC = actor->current.pos; - fopAcM_create(PROC_NPC_GRZ, 0xFFFFFF01, &spEC, fopAcM_GetRoomNo(actor), &actor->shape_angle, NULL, -1); + fopAcM_create(fpcNm_NPC_GRZ_e, 0xFFFFFF01, &spEC, fopAcM_GetRoomNo(actor), &actor->shape_angle, NULL, -1); i_this->mDrawDemoModel = FALSE; } @@ -2565,7 +2565,7 @@ static void chain_control3(e_fm_class* i_this, chain_s* i_chain_s, int param_2) static int ba_count; static void* s_ba_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_BA) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_BA_e) { ba_count++; } @@ -2755,7 +2755,7 @@ static void action(e_fm_class* i_this) { rot.x = JREG_S(8); for (int i = 0; i < create_num; i++) { - fopAcM_createChild(PROC_E_BA, fopAcM_GetID(actor), 0xFFFF1F02, &actor->eyePos, fopAcM_GetRoomNo(actor), &rot, NULL, -1, NULL); + fopAcM_createChild(fpcNm_E_BA_e, fopAcM_GetID(actor), 0xFFFF1F02, &actor->eyePos, fopAcM_GetRoomNo(actor), &rot, NULL, -1, NULL); ANGLE_ADD(rot.y, 0x10000 / create_num); } } @@ -3345,7 +3345,7 @@ static int daE_FM_Execute(e_fm_class* i_this) { csXyz rot(actor->shape_angle); rot.y += 0x800; - fopAcM_createItemForBoss(&actor->eyePos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(actor), &rot, NULL, 10.0f + KREG_F(19), 30.0f, -1); + fopAcM_createItemForBoss(&actor->eyePos, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(actor), &rot, NULL, 10.0f + KREG_F(19), 30.0f, -1); } if (i_this->field_0x182c == 3) { @@ -3740,7 +3740,7 @@ static int daE_FM_Create(fopAc_ac_c* i_this) { if (!dComIfGs_isStageLife()) { cXyz size(1.0f, 1.0f, 1.0f); pos.set(209.0f, 0.0f, 861.0f); - fopAcM_createItemForBoss(&pos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, &size, 0.0f, 0.0f, -1); + fopAcM_createItemForBoss(&pos, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, &size, 0.0f, 0.0f, -1); } g_env_light.mColpatWeather = 2; @@ -3880,20 +3880,20 @@ static actor_method_class l_daE_FM_Method = { }; actor_process_profile_definition g_profile_E_FM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_FM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_fm_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 158, // mPriority - &l_daE_FM_Method, // sub_method - 0x00044000, // 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_E_FM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_fm_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_FM_e, + /* Actor SubMtd */ &l_daE_FM_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_fs.cpp b/src/d/actor/d_a_e_fs.cpp index f3c39bcb53..3ed859c686 100644 --- a/src/d/actor/d_a_e_fs.cpp +++ b/src/d/actor/d_a_e_fs.cpp @@ -474,7 +474,7 @@ static bool checkViewArea(cXyz* i_pos) { static void e_fs_demowait(e_fs_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->mEnemy; cXyz delta; - npc_ks_class* monkey = (npc_ks_class*)fopAcM_SearchByName(PROC_NPC_KS); + npc_ks_class* monkey = (npc_ks_class*)fopAcM_SearchByName(fpcNm_NPC_KS_e); switch (i_this->mMode) { case 0: @@ -853,18 +853,18 @@ static actor_method_class l_daE_Fs_Method = { }; actor_process_profile_definition g_profile_E_FS = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_FS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_fs_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 160, // mPriority - &l_daE_Fs_Method, // sub_method - 0x00040120, // 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_E_FS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_fs_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_FS_e, + /* Actor SubMtd */ &l_daE_Fs_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_fz.cpp b/src/d/actor/d_a_e_fz.cpp index 5ebea3988f..6fa54a0ffe 100644 --- a/src/d/actor/d_a_e_fz.cpp +++ b/src/d/actor/d_a_e_fz.cpp @@ -84,7 +84,7 @@ daE_FZ_HIO_c::daE_FZ_HIO_c() { } s32 daE_FZ_c::draw() { - if (field_0x714 == 2 && !checkItemGet(fpcNm_ITEM_IRONBALL,1)) { + if (field_0x714 == 2 && !checkItemGet(dItemNo_IRONBALL_e,1)) { return 1; } @@ -180,11 +180,11 @@ void daE_FZ_c::damage_check() { if (field_0x712 == 0) { pos.set(dComIfGp_getPlayer(0)->current.pos); mStts.Move(); - + if (field_0x714 == 3) { if (mTgCoSph.ChkTgHit()) { mAtInfo.mpCollider = mTgCoSph.GetTgHitObj(); - + if (mTgCoSph.GetTgHitObj()->ChkAtType(AT_TYPE_IRON_BALL)) { deadnextSet(false); } @@ -192,7 +192,7 @@ void daE_FZ_c::damage_check() { } else { if (mTgCoSph.ChkTgHit()) { mAtInfo.mpCollider = mTgCoSph.GetTgHitObj(); - + if (mTgCoSph.GetTgHitObj()->ChkAtType(AT_TYPE_40) || mTgCoSph.GetTgHitObj()->ChkAtType(AT_TYPE_BOOMERANG)) { current.angle.y = fopAcM_searchPlayerAngleY(this) + 32768; f32 tmp_l_hio = l_HIO.field_0x28; @@ -205,7 +205,7 @@ void daE_FZ_c::damage_check() { pos2 = current.pos - *mTgCoSph.GetTgHitPosP(); pos3.set(*mTgCoSph.GetTgHitPosP()); - + s_pos.x = 0; s_pos.y = pos2.atan2sX_Z(); s_pos.z = 0; @@ -223,13 +223,13 @@ void daE_FZ_c::damage_check() { cXyz cStack_54(l_HIO.field_0x0c, l_HIO.field_0x0c, l_HIO.field_0x0c); dComIfGp_particle_set(0x85ba, ¤t.pos, &shape_angle, &cStack_54); - + if (mTgCoSph.GetTgHitObj()->ChkAtType(AT_TYPE_HOOKSHOT)) { health -= 20; if (1 < health) { current.angle.y = fopAcM_searchPlayerAngleY(this) + 32768; - + f32 tmp_l_hio = l_HIO.field_0x28; speedF = tmp_l_hio; field_0x6fc = tmp_l_hio; @@ -278,12 +278,12 @@ void daE_FZ_c::damage_check() { } deadnextSet(true); - return; - } else { + return; + } else { if (mObjAcch.ChkGroundHit() && mTgCoSph.ChkCoHit()) { fopAc_ac_c* co_hit_actor = mTgCoSph.GetCoHitAc(); - if (fopAcM_IsActor(co_hit_actor) && fopAcM_GetName(co_hit_actor) == PROC_E_FZ) { + if (fopAcM_IsActor(co_hit_actor) && fopAcM_GetName(co_hit_actor) == fpcNm_E_FZ_e) { pos = current.pos - mTgCoSph.GetCoHitAc()->current.pos; mTgCoSph.ClrCoHit(); f32 co_hit_actor_speed = co_hit_actor->speedF; @@ -310,7 +310,7 @@ void daE_FZ_c::damage_check() { } } } - + if (mAtSph.ChkAtHit()) { fopAc_ac_c* player = dComIfGp_getPlayer(0); fopAc_ac_c* at_hit_actor = mAtSph.GetAtHitAc(); @@ -325,7 +325,7 @@ void daE_FZ_c::damage_check() { speedF = l_hio_28; field_0x6fc = l_hio_28; setActionMode(ACT_DAMAGE,1); - + } else { if (mActionMode != ACT_DAMAGE) { field_0x712 = 10; @@ -345,7 +345,7 @@ void daE_FZ_c::damage_check() { bool daE_FZ_c::way_gake_check() { cXyz pos; dBgS_GndChk gnd_chk; - + if (mObjAcch.ChkWallHit()) { return false; } @@ -361,7 +361,7 @@ bool daE_FZ_c::way_gake_check() { field_0x6dc += current.pos; field_0x6e8.set(field_0x6dc); gnd_chk.SetPos(&field_0x6e8); - + field_0x6e8.y = dComIfG_Bgsp().GroundCross(&gnd_chk); if (field_0x6e8.y == -G_CM3D_F_INF) { field_0x6e8.y = current.pos.y; @@ -378,19 +378,19 @@ void daE_FZ_c::executeWait() { cXyz pos2; s16 angle; f32 tmp = l_HIO.field_0x14; - + switch (mActionPhase) { case 0: if (fopAcM_wayBgCheck(this,200.0f,50.0f)) { angle = cM_rndFX(10000.0f) + 32768.0f; } else { - + pos2.x = home.pos.x + cM_rndFX(l_HIO.field_0x10); pos2.y = home.pos.y; pos2.z = home.pos.z + cM_rndFX(l_HIO.field_0x10); - + pos = pos2 - current.pos; - + angle = pos.atan2sX_Z() - current.angle.y; if (angle > 12288) { @@ -424,21 +424,21 @@ void daE_FZ_c::executeWait() { if (mObjAcch.ChkGroundHit() && dComIfG_Bgsp().GetPolyAtt0(mObjAcch.m_gnd) == 8) { angle = shape_angle.y - mAngleFromPlayer; - + if (abs(angle) < 512 && field_0x710 == 0) { cLib_addCalc0(&speedF, 0.1f, 0.1f); - } + } } else { cLib_addCalc0(&speedF,0.1f,l_HIO.field_0x2c); } - + if (field_0x710 == 0 && speedF < 0.2f) { angle = shape_angle.y - mAngleFromPlayer; if (abs(angle) < 512) { current.angle.y = shape_angle.y; setActionMode(ACT_MOVE,0); - } + } } } @@ -456,11 +456,11 @@ void daE_FZ_c::executeMove() { switch (mActionPhase) { case 0: field_0x710 = l_HIO.field_0x08 + cM_rndFX(l_HIO.field_0x34); - mActionPhase = 1; + mActionPhase = 1; case 1: cLib_addCalcAngleS2(¤t.angle.y,mAngleFromPlayer,8,256); cLib_addCalc2(&speedF,l_HIO.field_0x1c,1.0f,3.0f); - + if (fopAcM_wayBgCheck(this, 200.0f,50.0f) != 0 || field_0x710 == 0) { setActionMode(ACT_WAIT,0); } @@ -470,7 +470,7 @@ void daE_FZ_c::executeMove() { setActionMode(ACT_WAIT,0); } else { shape_angle.y = current.angle.y; - + if (fopAcM_searchPlayerDistance(this) <= l_HIO.field_0x14) { setActionMode(ACT_ATTACK,0); } @@ -520,7 +520,7 @@ void daE_FZ_c::executeDamage() { fopAcM_delete(this); break; case 1: - tmp = l_HIO.field_0x28; + tmp = l_HIO.field_0x28; speedF = tmp; field_0x6fc = tmp; case 5: @@ -577,10 +577,10 @@ void daE_FZ_c::executeDamage() { s16 value = 4096.0f - (4096.0f / field_0x6fc) * (field_0x6fc - speedF); shape_angle.y += value; } - + cLib_addCalcAngleS2(¤t.angle.y,mAngleFromPlayer,1,512); cLib_addCalc0(&speedF,0.1f,0.1f); - + if (mObjAcch.ChkWallHit()) { mLastWallHitAngle = mAcchCir.GetWallAngleY(); setReflectAngle(); @@ -603,7 +603,7 @@ void daE_FZ_c::executeDamage() { void daE_FZ_c::executeRollMove() { if (fopAcM_SearchByID(fopAcM_GetLinkId(this),&mpBlizzetaActor) == 0 || !mpBlizzetaActor) return; u32 model_no = static_cast(mpBlizzetaActor)->getModelNo(); - + if (model_no < 4 || 6 < model_no) { fopAcM_delete(this); return; @@ -645,7 +645,7 @@ void daE_FZ_c::executeRollMove() { case 2: cLib_chaseF(&mRadiusBase,1.0,0.1); cLib_chaseAngleS(&field_0x704,512,16); - + if (mObjAcch.ChkWallHit() || !mObjAcch.ChkGroundHit()) { setActionMode(ACT_DAMAGE,0); mCreature.startCreatureSound(Z2SE_EN_FZ_DEATH,0,-1); @@ -654,7 +654,7 @@ void daE_FZ_c::executeRollMove() { if (mAtSph.ChkAtHit()) { fopAc_ac_c* at_hit_actor = mAtSph.GetAtHitAc(); - if ((fopAcM_GetName(at_hit_actor) == PROC_ALINK) || mAtSph.ChkAtShieldHit()) { + if ((fopAcM_GetName(at_hit_actor) == fpcNm_ALINK_e) || mAtSph.ChkAtShieldHit()) { setActionMode(ACT_DAMAGE,0); return; } @@ -669,7 +669,7 @@ void daE_FZ_c::action() { int i; if (field_0x714 == 1 && mObjAcch.ChkGroundHit()) { - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); field_0x714 = 0; } @@ -733,7 +733,7 @@ void daE_FZ_c::action() { } if (1 < health && mAcchCir.ChkWallHit()) { - if (fopAcM_GetName(dComIfG_Bgsp().GetActorPointer(mAcchCir)) != PROC_BG) { + if (fopAcM_GetName(dComIfG_Bgsp().GetActorPointer(mAcchCir)) != fpcNm_BG_e) { dBgS_LinChk lin_chk; dBgS_LinChk lin_chk2; @@ -812,7 +812,7 @@ void daE_FZ_c::cc_set() { mTgCoSph.SetR(mRadiusBase * 60.0f); dComIfG_Ccsp()->Set(&mTgCoSph); - + mDoMtx_stack_c::copy(mpModel->getBaseTRMtx()); pos.set(0.0f,25.0f,0.0f); @@ -826,7 +826,7 @@ void daE_FZ_c::cc_set() { s32 daE_FZ_c::execute() { if (field_0x714 == 2) { - if (checkItemGet(fpcNm_ITEM_IRONBALL,1) == 0) { + if (checkItemGet(dItemNo_IRONBALL_e,1) == 0) { return 1; } @@ -940,7 +940,7 @@ s32 daE_FZ_c::create() { attention_info.flags = fopAc_AttnFlag_BATTLE_e; attention_info.distances[fopAc_attn_BATTLE_e] = 69; - + fopAcM_SetMtx(this,mpModel->getBaseTRMtx()); fopAcM_SetMin(this,-200.0f,-200.0f,-200.0f); fopAcM_SetMax(this,200.0f,200.0f,200.0f); @@ -951,22 +951,22 @@ s32 daE_FZ_c::create() { field_0x714 = fopAcM_GetParam(this); field_0x715 = fopAcM_GetParam(this) >> 8; - + if (field_0x714 == 255) field_0x714 = 0; - + if (field_0x714 == 1 || field_0x714 == 3) { speed.y = cM_rndFX(10.0f) + 30.0f; f32 rng = cM_rndFX(1.0f); speedF = rng + 4.0f; field_0x6fc = rng + 4.0f; if (field_0x714 == 1) { - fopAcM_OnStatus(this,fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this,fopAcStts_UNK_0x4000_e); } } mObjAcch.Set(fopAcM_GetPosition_p(this),fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), 0, 0); - + if (field_0x714 == 3) { mAcchCir.SetWall(35.0f,70.0f); } @@ -992,18 +992,18 @@ s32 daE_FZ_c::create() { shape_angle.z = 0; shape_angle.x = 0; - + s16 random = cM_rndFX(10000.0f); shape_angle.y = random; current.angle.y = random; field_0x670.set(current.pos); - + for (int i = 0; i < 4; i++) { field_0x67c[i].set(current.pos); } - if (field_0x714 == 2 && !checkItemGet(fpcNm_ITEM_IRONBALL,1)) { + if (field_0x714 == 2 && !checkItemGet(dItemNo_IRONBALL_e,1)) { attention_info.distances[fopAc_attn_BATTLE_e] = 0; fopAcM_SetGroup(this,0); fopAcM_OffStatus(this,0); @@ -1041,18 +1041,18 @@ static actor_method_class l_daE_FZ_Method = { }; actor_process_profile_definition g_profile_E_FZ = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_FZ, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_FZ_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 169, // mPriority - &l_daE_FZ_Method, // sub_method - 0x00040120, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_FZ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_FZ_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_FZ_e, + /* Actor SubMtd */ &l_daE_FZ_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_ga.cpp b/src/d/actor/d_a_e_ga.cpp index 84d4a1f155..f5405f6a6b 100644 --- a/src/d/actor/d_a_e_ga.cpp +++ b/src/d/actor/d_a_e_ga.cpp @@ -265,18 +265,18 @@ static actor_method_class l_daE_Ga_Method = { }; actor_process_profile_definition g_profile_E_GA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_GA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_ga_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 138, // mPriority - &l_daE_Ga_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_GA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_ga_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_GA_e, + /* Actor SubMtd */ &l_daE_Ga_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_gb.cpp b/src/d/actor/d_a_e_gb.cpp index 5f05872ce6..4ef42d2d9b 100644 --- a/src/d/actor/d_a_e_gb.cpp +++ b/src/d/actor/d_a_e_gb.cpp @@ -1007,7 +1007,7 @@ static void e_gf_end(e_gb_class* i_this) { } if (i_this->timer[0] == 0) { - daKey_c* key_p = (daKey_c*)fopAcM_SearchByName(PROC_Obj_SmallKey); + daKey_c* key_p = (daKey_c*)fopAcM_SearchByName(fpcNm_Obj_SmallKey_e); cXyz pos(actor->home.pos); pos.z += YREG_F(12); if (key_p != NULL) { @@ -1081,7 +1081,7 @@ static void action2(e_gb_class* i_this) { } if (i_this->keyStatus != 0) { - daKey_c* key_p = (daKey_c*)fopAcM_SearchByName(PROC_Obj_SmallKey); + daKey_c* key_p = (daKey_c*)fopAcM_SearchByName(fpcNm_Obj_SmallKey_e); if (key_p != NULL) { key_p->seStartTwinkle(Z2SE_OBJ_KEY_TWINKLE, &i_this->keyPos); } @@ -1730,18 +1730,18 @@ static actor_method_class l_daE_GB_Method = { }; actor_process_profile_definition g_profile_E_GB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_GB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_gb_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 139, // mPriority - &l_daE_GB_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_E_GB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_gb_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_GB_e, + /* Actor SubMtd */ &l_daE_GB_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_ge.cpp b/src/d/actor/d_a_e_ge.cpp index 3e01743046..5159649d54 100644 --- a/src/d/actor/d_a_e_ge.cpp +++ b/src/d/actor/d_a_e_ge.cpp @@ -117,7 +117,7 @@ bool daE_GE_c::checkBeforeBg(int param_0, f32 param_1) { static void* s_arrow_sub(void* i_actor, void* i_data) { if (fopAcM_IsActor(i_actor)) { - if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_ARROW) { + if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_ARROW_e) { if (fopAcM_GetSpeedF((fopAc_ac_c*)i_actor) && fopAcM_searchActorDistance((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_data) < l_HIO.arrow_recognition_distance) @@ -131,7 +131,7 @@ static void* s_arrow_sub(void* i_actor, void* i_data) { static void* s_ge_surprise(void* i_actor, void* i_data) { if (fopAcM_IsActor(i_actor)) { - if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_E_GE) { + if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_E_GE_e) { if (fopAcM_searchActorDistance((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_data) < l_HIO.peer_recognition_distance && static_cast(i_actor)->getSurpriseTime() == 0) @@ -145,7 +145,7 @@ static void* s_ge_surprise(void* i_actor, void* i_data) { static void* s_ge_caw(void* i_actor, void* i_data) { if (fopAcM_IsActor(i_actor)) { - if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_E_GE) { + if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_E_GE_e) { if (i_actor != i_data && fopAcM_searchActorDistance((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_data) < l_HIO.peer_recognition_distance) @@ -161,7 +161,7 @@ static s32 target_count; static void* s_ge_attack(void* i_actor, void* i_data) { if (fopAcM_IsActor(i_actor)) { - if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_E_GE) { + if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_E_GE_e) { if (static_cast(i_actor)->getActionMode() == 2) { target_count++; } @@ -172,7 +172,7 @@ static void* s_ge_attack(void* i_actor, void* i_data) { static void* s_ge_attack2(void* i_actor, void* i_data) { if (fopAcM_IsActor(i_actor)) { - if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_E_GE) { + if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_E_GE_e) { if (static_cast(i_actor)->checkOtherAttacker()) { target_count++; return NULL; @@ -800,7 +800,7 @@ void daE_GE_c::executeDown() { mSphere.OffTgSetBit(); mSphere2.OffTgSetBit(); #endif - fopAcM_OffStatus(this, 0x20); + fopAcM_OffStatus(this, fopAcStts_UNK_0x20_e); field_0xb9e = 0; attention_info.flags = 0; bckSet(4, 3.0f, 2, 1.0f); @@ -1377,18 +1377,18 @@ static actor_method_class l_daE_GE_Method = { }; actor_process_profile_definition g_profile_E_GE = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_GE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_GE_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 192, // mPriority - &l_daE_GE_Method, // sub_method - 0x00050120, // 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_E_GE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_GE_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_GE_e, + /* Actor SubMtd */ &l_daE_GE_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_gi.cpp b/src/d/actor/d_a_e_gi.cpp index 607bb1388e..9f2033cdbb 100644 --- a/src/d/actor/d_a_e_gi.cpp +++ b/src/d/actor/d_a_e_gi.cpp @@ -353,7 +353,7 @@ void daE_GI_c::setDamageEffect() { } static void* s_other_gi(void* i_actor, void* i_other) { - if (i_actor != i_other && fopAcM_IsActor(i_actor) && !fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_E_GI && + if (i_actor != i_other && fopAcM_IsActor(i_actor) && !fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_E_GI_e && fopAcM_searchActorDistance((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_other) < 1000.0f) { return i_actor; @@ -363,7 +363,7 @@ static void* s_other_gi(void* i_actor, void* i_other) { } static void* s_battle_gi(void* i_actor, void* i_other) { - if (i_actor != i_other && fopAcM_IsActor(i_actor) && !fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_E_GI && + if (i_actor != i_other && fopAcM_IsActor(i_actor) && !fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_E_GI_e && ((daE_GI_c*)i_actor)->isBattleOn() && fopAcM_searchActorDistance((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_other) < 500.0f) { return i_actor; @@ -1112,18 +1112,18 @@ static actor_method_class l_daE_GI_Method = { }; actor_process_profile_definition g_profile_E_GI = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_GI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_GI_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 210, // mPriority - &l_daE_GI_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_E_GI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_GI_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_GI_e, + /* Actor SubMtd */ &l_daE_GI_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_gm.cpp b/src/d/actor/d_a_e_gm.cpp index 0232d04ae6..c9a326804c 100644 --- a/src/d/actor/d_a_e_gm.cpp +++ b/src/d/actor/d_a_e_gm.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_gm.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -172,7 +172,7 @@ void daE_GM_c::action() { } static void* s_obj_sub2(void* i_actor, void* i_data) { - if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_CSTATUE && + if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_CSTATUE_e && fopAcM_searchActorDistanceXZ((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_data) < 4000.0f && ((daCstatue_c*)i_actor)->checkBossAtGroundHit()) { return i_actor; } @@ -260,7 +260,7 @@ void daE_GM_c::egg_wait() { return; } } - + if (mType == TYPE_1) { cLib_addCalcAngleS(&field_0xa5c, 0, 8, 0x100, 4); current.angle.x += field_0xa5c; @@ -407,12 +407,12 @@ void daE_GM_c::create_item() { switch ((int)cM_rndF(fVar1)) { case 0: - fopAcM_createItem(¤t.pos, fpcNm_ITEM_HEART, -1, -1, NULL, NULL, 0); + fopAcM_createItem(¤t.pos, dItemNo_HEART_e, -1, -1, NULL, NULL, 0); break; case 1: case 2: - fopAcM_createItem(¤t.pos, fpcNm_ITEM_ARROW_1, -1, -1, NULL, NULL, 0); + fopAcM_createItem(¤t.pos, dItemNo_ARROW_1_e, -1, -1, NULL, NULL, 0); break; } } @@ -475,7 +475,7 @@ void daE_GM_c::wait() { if (fopAcM_SearchByID(fopAcM_GetLinkId(this), (fopAc_ac_c**)&actor_p) == 0 || actor_p == NULL) { return; } - + if (actor_p->mDemoMode != 0x15) { setAction(&daE_GM_c::walk); } @@ -828,7 +828,7 @@ void daE_GM_c::hook() { } else if (mMode == -1) { field_0xa72 = 10; mSph.SetTgType(0xD8FBFDFF); - } else if (!fopAcM_CheckStatus(this, fopAcM_STATUS_HOOK_CARRY_NOW)) { + } else if (!fopAcM_CheckStatus(this, fopAcStts_HOOK_CARRY_NOW_e)) { setAction(&daE_GM_c::core_escape); } } @@ -974,7 +974,7 @@ void daE_GM_c::walk2() { speedF = l_coreSpeedF + field_0xa40; mpModelMorf->setPlaySpeed(speedF / 9.0f); field_0xa6e += (int)(speedF / 9.0f); - + if (field_0xa6e >= 4) { field_0xa6e = 0; mSound.startCreatureSound(Z2SE_EN_GBA_FOOTNOTE, 0, -1); @@ -1037,7 +1037,7 @@ void daE_GM_c::core_wait() { field_0xa71 = false; current.angle.y = cLib_targetAngleY(&player->current.pos, ¤t.pos); fopAcM_SetCullSize(this, 7); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x80000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e); mSph.SetTgType(0xD8FBFDFF); mMode++; } else if (mMode != -1) { @@ -1777,8 +1777,8 @@ cPhs_Step daE_GM_c::create() { if (mType == TYPE_NORMAL) { mSound.init(¤t.pos, NULL, 2, 1); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x10000); - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x10000_e); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); setAction(&daE_GM_c::normal_wait); } else if (mType == TYPE_GOMA) { mSound.init(¤t.pos, &eyePos, 3, 1); @@ -1794,7 +1794,7 @@ cPhs_Step daE_GM_c::create() { setAction(&daE_GM_c::core_wait); } else { mSound.init(¤t.pos, NULL, 2, 1); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x10000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x10000_e); field_0xa50 = hREG_F(7) + 0.1f; field_0xa66 = cM_rndFX(100.0f) + 1000.0f; field_0xa64 = field_0xa66; @@ -1824,18 +1824,18 @@ static actor_method_class l_daE_GM_Method = { }; actor_process_profile_definition g_profile_E_GM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_GM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_GM_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 119, // mPriority - &l_daE_GM_Method, // sub_method - 0x00044100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_GM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_GM_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_GM_e, + /* Actor SubMtd */ &l_daE_GM_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_gob.cpp b/src/d/actor/d_a_e_gob.cpp index da54db1c43..6824263328 100644 --- a/src/d/actor/d_a_e_gob.cpp +++ b/src/d/actor/d_a_e_gob.cpp @@ -2013,8 +2013,8 @@ static int daE_GOB_Execute(e_gob_class* i_this) { cXyz sp48; cXyz sp3C; - ms = (obj_msima_class*)fopAcM_SearchByName(PROC_OBJ_MSIMA); - my = (obj_myogan_class*)fopAcM_SearchByName(PROC_OBJ_MYOGAN); + ms = (obj_msima_class*)fopAcM_SearchByName(fpcNm_OBJ_MSIMA_e); + my = (obj_myogan_class*)fopAcM_SearchByName(fpcNm_OBJ_MYOGAN_e); i_this->mCounter++; for (int i = 0; i < 5; i++) { @@ -2403,20 +2403,20 @@ static actor_method_class l_daE_GOB_Method = { }; actor_process_profile_definition g_profile_E_GOB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_GOB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_gob_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 116, // mPriority - &l_daE_GOB_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_E_GOB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_gob_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_GOB_e, + /* Actor SubMtd */ &l_daE_GOB_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_e_gs.cpp b/src/d/actor/d_a_e_gs.cpp index 07696af21a..16000f554b 100644 --- a/src/d/actor/d_a_e_gs.cpp +++ b/src/d/actor/d_a_e_gs.cpp @@ -233,18 +233,18 @@ static actor_method_class l_daE_GS_Method = { }; actor_process_profile_definition g_profile_E_GS = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_GS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_gs_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 115, // mPriority - &l_daE_GS_Method, // sub_method - 0x00044100, // 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_E_GS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_gs_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_GS_e, + /* Actor SubMtd */ &l_daE_GS_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_hb.cpp b/src/d/actor/d_a_e_hb.cpp index d278a2d535..d3177ba0f6 100644 --- a/src/d/actor/d_a_e_hb.cpp +++ b/src/d/actor/d_a_e_hb.cpp @@ -1492,7 +1492,7 @@ static int daE_HB_Create(fopAc_ac_c* i_this) { a_this->field_0x851 = 1; } - a_this->leaf_actor_id = fopAcM_createChild(PROC_E_HB_LEAF, fopAcM_GetID(i_this), 0, &i_this->current.pos, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, NULL, -1, NULL); + a_this->leaf_actor_id = fopAcM_createChild(fpcNm_E_HB_LEAF_e, fopAcM_GetID(i_this), 0, &i_this->current.pos, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, NULL, -1, NULL); i_this->field_0x565 = (fopAcM_GetParam(i_this) & 0xFF0000) >> 0x10; i_this->field_0x564 = (fopAcM_GetParam(i_this) & 0xFF000000) >> 0x18; @@ -1511,18 +1511,18 @@ static actor_method_class l_daE_HB_Method = { }; actor_process_profile_definition g_profile_E_HB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_HB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_hb_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 140, // mPriority - &l_daE_HB_Method, // sub_method - 0x10050100, // 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_E_HB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_hb_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_HB_e, + /* Actor SubMtd */ &l_daE_HB_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_hb_leaf.cpp b/src/d/actor/d_a_e_hb_leaf.cpp index 21d1c0b262..99d45d6ea3 100644 --- a/src/d/actor/d_a_e_hb_leaf.cpp +++ b/src/d/actor/d_a_e_hb_leaf.cpp @@ -87,18 +87,18 @@ static actor_method_class l_daE_HB_LEAF_Method = { }; actor_process_profile_definition g_profile_E_HB_LEAF = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_E_HB_LEAF, - &g_fpcLf_Method.base, - sizeof(e_hb_leaf_class), - 0, - 0, - &g_fopAc_Method.base, - 141, - &l_daE_HB_LEAF_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_HB_LEAF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_hb_leaf_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_HB_LEAF_e, + /* Actor SubMtd */ &l_daE_HB_LEAF_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_hm.cpp b/src/d/actor/d_a_e_hm.cpp index a3c0b19c5f..77641117ab 100644 --- a/src/d/actor/d_a_e_hm.cpp +++ b/src/d/actor/d_a_e_hm.cpp @@ -497,7 +497,7 @@ void daE_HM_c::CreateExecute() { field_0x5b8 = 300; } if (field_0x5c4 == fpcM_ERROR_PROCESS_ID_e && field_0x5b8 == 0) { - field_0x5c4 = fopAcM_createChild(PROC_E_HM, fopAcM_GetID(this), 0xfffff05, ¤t.pos, + field_0x5c4 = fopAcM_createChild(fpcNm_E_HM_e, fopAcM_GetID(this), 0xfffff05, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); } } @@ -1603,18 +1603,18 @@ static actor_method_class l_daE_HM_Method = { }; actor_process_profile_definition g_profile_E_HM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_HM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_HM_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 146, // mPriority - &l_daE_HM_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_E_HM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_HM_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_HM_e, + /* Actor SubMtd */ &l_daE_HM_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_hp.cpp b/src/d/actor/d_a_e_hp.cpp index 97cff99445..633795ab39 100644 --- a/src/d/actor/d_a_e_hp.cpp +++ b/src/d/actor/d_a_e_hp.cpp @@ -28,52 +28,6 @@ public: u8 rangeDisplay; }; -namespace { -static dCcD_SrcCyl cc_hp_src = { - { - {0, {{0x0, 0x0, 0x0}, {0xd8000000, 0x3}, 0x0}}, - {dCcD_SE_13, 0, 0, 0, {0}}, - {dCcD_SE_NONE, 0, 0, 0, {6}}, - {0}, - }, - { - { - {0.0f, 0.0f, 0.0f}, - 50.0f, - 300.0f, - } - } -}; - -static dCcD_SrcSph cc_lamp_src = { - { - {0x0, {{0x0, 0x0, 0x0}, {0xD8FBFDFF, 0x43}, 0x75}}, // mObj - {dCcD_SE_13, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x6}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf - { - {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph - } // mSphAttr -}; - -static dCcD_SrcCyl cc_hp_at_src = { - { - {0, {{0x400, 0x1, 0xd}, {0x0, 0x0}, 0x0}}, - {dCcD_SE_METAL, 0, 1, 0, {0}}, - {dCcD_SE_NONE, 0, 0, 0, {2}}, - {0}, - }, - { - { - {0.0f, 0.0f, 0.0f}, - 50.0f, - 300.0f, - } - } -}; -} // namespace - daE_HP_HIO_c::daE_HP_HIO_c() { mChild = -1; modelSize = 1.2f; @@ -95,6 +49,52 @@ void daE_HP_HIO_c::genMessage(JORMContext* ctx) { } #endif +namespace { +static dCcD_SrcCyl cc_hp_src = { + { + {0, {{0x0, 0x0, 0x0}, {0xd8000000, 0x3}, 0x0}}, + {dCcD_SE_13, 0, 0, 0, {0}}, + {dCcD_SE_NONE, 0, 0, 0, {6}}, + {0}, + }, + { + { + {0.0f, 0.0f, 0.0f}, + 50.0f, + 300.0f, + } + } +}; + +static dCcD_SrcSph cc_lamp_src = { + { + {0x0, {{0x0, 0x0, 0x0}, {0xD8FBFDFF, 0x43}, 0x75}}, // mObj + {dCcD_SE_13, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x6}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph + } // mSphAttr +}; + +static dCcD_SrcCyl cc_hp_at_src = { + { + {0, {{0x400, 0x1, 0xd}, {0x0, 0x0}, 0x0}}, + {dCcD_SE_METAL, 0, 1, 0, {0}}, + {dCcD_SE_NONE, 0, 0, 0, {2}}, + {0}, + }, + { + { + {0.0f, 0.0f, 0.0f}, + 50.0f, + 300.0f, + } + } +}; +} // namespace + int daE_HP_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { J3DJoint* joint = i_joint; s32 jointNo = joint->getJntNo(); @@ -230,7 +230,8 @@ int daE_HP_c::draw() { mDoMtx_stack_c::multVec(&unkXyz1, &field_0x75c); mDoMtx_stack_c::transS(field_0x75c); - unkXyz1 = dComIfGp_getCamera(0)->view.lookat.eye - field_0x75c; + camera_class* camera = (camera_class*)dComIfGp_getCamera(0); + unkXyz1 = camera->view.lookat.eye - field_0x75c; mDoMtx_stack_c::YrotM(unkXyz1.atan2sX_Z()); mDoMtx_stack_c::XrotM((s16)unkXyz1.atan2sY_XZ()); mDoMtx_stack_c::scaleM(l_HIO.modelSize, l_HIO.modelSize, l_HIO.modelSize); @@ -250,7 +251,7 @@ int daE_HP_c::draw() { } } - mpMorf->getModel(); + model = mpMorf->getModel(); mpMorf->entryDL(); if (checkDownFlg()) { @@ -302,7 +303,8 @@ void daE_HP_c::setActionMode(int param_0, int i_mode) { } bool daE_HP_c::mChkDistance(f32 param_0) { - cXyz vecToPlayer = dComIfGp_getPlayer(0)->current.pos - current.pos; + fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0); + cXyz vecToPlayer = player->current.pos - current.pos; if (vecToPlayer.abs() < param_0) { return true; } else { @@ -677,8 +679,7 @@ void daE_HP_c::executeDown() { field_0x772.z = 0; unkXyz1 = home.pos - current.pos; - latDist = unkXyz1.atan2sX_Z(); - cMtx_YrotS(*calc_mtx, latDist); + cMtx_YrotS(*calc_mtx, unkXyz1.atan2sX_Z()); unkXyz1.x = 0.0f; unkXyz1.y = 100.0f; @@ -756,7 +757,7 @@ void daE_HP_c::executeDead() { fopAcM_delete(this); } else { if (field_0x784 == -1) { - field_0x784 = fopAcM_createItemForPresentDemo(¤t.pos, fpcNm_ITEM_POU_SPIRIT, 0, -1, + field_0x784 = fopAcM_createItemForPresentDemo(¤t.pos, dItemNo_POU_SPIRIT_e, 0, -1, -1, 0, 0); } @@ -812,7 +813,8 @@ void daE_HP_c::action() { break; } - if (checkBallModelDraw()) { + fopEn_enemy_c* enemy = this; + if (enemy->checkBallModelDraw()) { mSound2.startCreatureSoundLevel(Z2SE_EN_PO_SOUL, 0, -1); } @@ -841,7 +843,7 @@ void daE_HP_c::action() { } field_0x772.x = -cM_atan2s(planeNormal->z, planeNormal->y); - field_0x772.z = cM_atan2s(planeNormal->x, planeNormal->y); + field_0x772.z = (s16)cM_atan2s(planeNormal->x, planeNormal->y); } } else if (mAction != 1 && mAction != 3) { gravity = 0.0f; @@ -1318,18 +1320,18 @@ static actor_method_class l_daE_HP_Method = { }; actor_process_profile_definition g_profile_E_HP = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_HP, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_HP_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 172, // mPriority - &l_daE_HP_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_E_HP_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_HP_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_HP_e, + /* Actor SubMtd */ &l_daE_HP_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_hz.cpp b/src/d/actor/d_a_e_hz.cpp index 7b72c955ab..86a0260e91 100644 --- a/src/d/actor/d_a_e_hz.cpp +++ b/src/d/actor/d_a_e_hz.cpp @@ -181,19 +181,19 @@ static void* s_obj_sub(void* i_actor, void* i_data) { if (actor_dist < 100.0f && !fopAcM_GetSpeedF((fopAc_ac_c*)i_actor) && !fopAcM_GetSpeed((fopAc_ac_c*)i_actor).y) { - if (fopAcM_GetName(i_actor) == PROC_Obj_Carry) { + if (fopAcM_GetName(i_actor) == fpcNm_Obj_Carry_e) { m_near_carry = (fopAc_ac_c*)i_actor; - } else if (fopAcM_GetName(i_actor) == PROC_NBOMB) { + } else if (fopAcM_GetName(i_actor) == fpcNm_NBOMB_e) { m_near_bomb = (fopAc_ac_c*)i_actor; } } - if (actor_dist < 500.0f && (fopAcM_GetName(i_actor) == PROC_BOOMERANG || - fopAcM_GetName(i_actor) == PROC_NBOMB)) + if (actor_dist < 500.0f && (fopAcM_GetName(i_actor) == fpcNm_BOOMERANG_e || + fopAcM_GetName(i_actor) == fpcNm_NBOMB_e)) { m_near_weapon = static_cast(i_actor); } - if (actor_dist < 700.0f && fopAcM_GetName(i_actor) == PROC_ARROW && + if (actor_dist < 700.0f && fopAcM_GetName(i_actor) == fpcNm_ARROW_e && fopAcM_GetSpeedF((fopAc_ac_c*)i_actor)) { m_near_weapon = static_cast(i_actor); @@ -2105,20 +2105,20 @@ static actor_method_class l_daE_HZ_Method = { }; actor_process_profile_definition g_profile_E_HZ = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_HZ, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_HZ_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 199, // mPriority - &l_daE_HZ_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_E_HZ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_HZ_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_HZ_e, + /* Actor SubMtd */ &l_daE_HZ_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_hzelda.cpp b/src/d/actor/d_a_e_hzelda.cpp index 8f17db3939..4217e26781 100644 --- a/src/d/actor/d_a_e_hzelda.cpp +++ b/src/d/actor/d_a_e_hzelda.cpp @@ -181,7 +181,7 @@ static int daE_HZELDA_Draw(e_hzelda_class* i_this) { } static void* shot_s_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_ARROW && (fopAcM_GetParam(i_actor) == 1 || fopAcM_GetParam(i_actor) == 2)) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_ARROW_e && (fopAcM_GetParam(i_actor) == 1 || fopAcM_GetParam(i_actor) == 2)) { cXyz vec = ((fopAc_ac_c*)i_data)->current.pos - ((fopAc_ac_c*)i_actor)->current.pos; if (vec.abs() < 1000.0f) { return i_actor; @@ -1078,7 +1078,7 @@ static int daE_HZELDA_Execute(e_hzelda_class* i_this) { cCcD_Obj* hitobj = i_this->mBallSphAt.GetAtHitObj(); fopAc_ac_c* hit_actor = dCc_GetAc(hitobj->GetAc()); - if (fopAcM_GetName(hit_actor) == PROC_ALINK) { + if (fopAcM_GetName(hit_actor) == fpcNm_ALINK_e) { if (!daPy_getPlayerActorClass()->checkPlayerGuard()) { i_this->mSound.startCreatureVoice(Z2SE_EN_HZE_V_LAUGH, -1); sp64 = 1; @@ -1535,18 +1535,18 @@ static actor_method_class l_daE_HZELDA_Method = { }; actor_process_profile_definition g_profile_E_HZELDA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_HZELDA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_hzelda_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 142, // mPriority - &l_daE_HZELDA_Method, // sub_method - 0x00044000, // 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_E_HZELDA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_hzelda_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_HZELDA_e, + /* Actor SubMtd */ &l_daE_HZELDA_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_is.cpp b/src/d/actor/d_a_e_is.cpp index 505406a6d5..2e7764a352 100644 --- a/src/d/actor/d_a_e_is.cpp +++ b/src/d/actor/d_a_e_is.cpp @@ -87,7 +87,7 @@ static BOOL pl_check(e_is_class* a_this, f32 i_srchRange, s16 i_srchAngle) { } static void* s_stop_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_IS && i_data != i_actor && + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_IS_e && i_data != i_actor && ((e_is_class*)i_actor)->action == ACTION_POWEROFF && ((e_is_class*)i_actor)->mode == 10) { ((e_is_class*)i_actor)->action = ACTION_BREAK; @@ -755,18 +755,18 @@ static actor_method_class l_daE_IS_Method = { }; actor_process_profile_definition g_profile_E_IS = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_IS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_is_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 184, // mPriority - &l_daE_IS_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_E_IS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_is_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_IS_e, + /* Actor SubMtd */ &l_daE_IS_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_kg.cpp b/src/d/actor/d_a_e_kg.cpp index db90f9175d..013e330090 100644 --- a/src/d/actor/d_a_e_kg.cpp +++ b/src/d/actor/d_a_e_kg.cpp @@ -744,18 +744,18 @@ static actor_method_class l_daE_KG_Method = { }; actor_process_profile_definition g_profile_E_KG = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_KG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_kg_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 185, // mPriority - &l_daE_KG_Method, // sub_method - 0x100C0120, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_KG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_kg_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_KG_e, + /* Actor SubMtd */ &l_daE_KG_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_kk.cpp b/src/d/actor/d_a_e_kk.cpp index 99e5a50711..6cc792428e 100644 --- a/src/d/actor/d_a_e_kk.cpp +++ b/src/d/actor/d_a_e_kk.cpp @@ -111,7 +111,7 @@ int daE_KK_c::JointCallBack(J3DJoint* i_joint, int param_1) { } int daE_KK_c::draw() { - if (field_0x679 == 2 && !checkItemGet(fpcNm_ITEM_IRONBALL, 1)) { + if (field_0x679 == 2 && !checkItemGet(dItemNo_IRONBALL_e, 1)) { return 1; } else { cXyz position; @@ -465,7 +465,7 @@ void daE_KK_c::executeIcicleWait() { field_0x67d = 0; field_0x76c = 0; nextActionCheck(); - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); } } } @@ -567,7 +567,7 @@ void daE_KK_c::executeSpearThrow() { } } if ((s32)mpMorfSO->getFrame() == 0x17) { - fopAcM_createChild(PROC_E_KK, fopAcM_GetID(this), 0xFF0001, &field_0x698, + fopAcM_createChild(fpcNm_E_KK_e, fopAcM_GetID(this), 0xFF0001, &field_0x698, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); field_0x67d = 1; mCyl.OffTgNoHitMark(); @@ -1262,7 +1262,7 @@ void daE_KK_c::cc_set() { int daE_KK_c::execute() { if (field_0x679 == 2) { - if (!checkItemGet(fpcNm_ITEM_IRONBALL, 1)) { + if (!checkItemGet(dItemNo_IRONBALL_e, 1)) { return 1; } @@ -1448,7 +1448,7 @@ int daE_KK_c::create() { if (field_0x679 != 3) { setActionMode(0, 0); } else { - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); field_0x67d = 1; s16 player_angle = fopAcM_searchPlayerAngleY(this); shape_angle.y = player_angle; @@ -1460,7 +1460,7 @@ int daE_KK_c::create() { fopAcM_SetMin(this, -600.0f, -600.0f, -600.0f); fopAcM_SetMax(this, 600.0f, 600.0f, 600.0f); - if (field_0x679 == 2 && !checkItemGet(fpcNm_ITEM_IRONBALL, 1)) { + if (field_0x679 == 2 && !checkItemGet(dItemNo_IRONBALL_e, 1)) { attention_info.distances[fopAc_attn_BATTLE_e] = 0; fopAcM_SetGroup(this, 0); fopAcM_OffStatus(this, 0); @@ -1493,18 +1493,18 @@ static actor_method_class l_daE_KK_Method = { }; actor_process_profile_definition g_profile_E_KK = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_KK, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_KK_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 171, // mPriority - &l_daE_KK_Method, // sub_method - 0x00040120, // 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_E_KK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_KK_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_KK_e, + /* Actor SubMtd */ &l_daE_KK_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_kr.cpp b/src/d/actor/d_a_e_kr.cpp index 3e64a1ec0d..de277a0e33 100644 --- a/src/d/actor/d_a_e_kr.cpp +++ b/src/d/actor/d_a_e_kr.cpp @@ -393,7 +393,7 @@ static void e_kr_ground_pos_move(e_kr_class* i_this) { } static BOOL coach_path_check(e_kr_class* i_this) { - fopAc_ac_c* coach = fopAcM_SearchByName(PROC_NPC_COACH); + fopAc_ac_c* coach = fopAcM_SearchByName(fpcNm_NPC_COACH_e); if (coach == NULL) { return FALSE; } @@ -2391,18 +2391,18 @@ static actor_method_class l_daE_Kr_Method = { }; actor_process_profile_definition g_profile_E_KR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_KR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_kr_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 186, // mPriority - &l_daE_Kr_Method, // sub_method - 0x10040120, // 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_E_KR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_kr_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_KR_e, + /* Actor SubMtd */ &l_daE_Kr_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_mb.cpp b/src/d/actor/d_a_e_mb.cpp index 0febef285f..939b253475 100644 --- a/src/d/actor/d_a_e_mb.cpp +++ b/src/d/actor/d_a_e_mb.cpp @@ -743,20 +743,20 @@ static actor_method_class l_daE_MB_Method = { }; actor_process_profile_definition g_profile_E_MB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_MB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_mb_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 164, // mPriority - &l_daE_MB_Method, // sub_method - 0x00044000, // 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_E_MB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_mb_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_MB_e, + /* Actor SubMtd */ &l_daE_MB_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_md.cpp b/src/d/actor/d_a_e_md.cpp index 8fd0ea3797..19baf66f5f 100644 --- a/src/d/actor/d_a_e_md.cpp +++ b/src/d/actor/d_a_e_md.cpp @@ -154,7 +154,7 @@ void daE_MD_c::CheckHit() { UNUSED(hit_obj); UNUSED(hit_actor); - if ((hit_obj->ChkAtType(AT_TYPE_IRON_BALL) || fopAcM_GetName(hit_actor) == PROC_E_TH_BALL || fopAcM_GetName(hit_actor) == PROC_B_TN) && (mType == TYPE_DUMMY || mType == TYPE_LV9)) { + if ((hit_obj->ChkAtType(AT_TYPE_IRON_BALL) || fopAcM_GetName(hit_actor) == fpcNm_E_TH_BALL_e || fopAcM_GetName(hit_actor) == fpcNm_B_TN_e) && (mType == TYPE_DUMMY || mType == TYPE_LV9)) { if (mAction == ACTION_WAIT) { mCyl.OffTgIronBallRebound(); mAction = ACTION_HALF_BREAK; @@ -173,7 +173,7 @@ void daE_MD_c::CheckHit() { u32 bu_params = (mSwbit << 0x18) | 0xFF2FFF; if (mCanCreateBu && mType == TYPE_DUMMY) { - fopAcM_create(PROC_E_BU, bu_params, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1); + fopAcM_create(fpcNm_E_BU_e, bu_params, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1); } } else if (mAction == ACTION_HALF_BREAK) { mCyl.OffTgSetBit(); @@ -464,18 +464,18 @@ static actor_method_class l_daE_MD_Method = { }; actor_process_profile_definition g_profile_E_MD = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_MD, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_MD_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 132, // mPriority - &l_daE_MD_Method, // sub_method - 0x00044100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType - }; + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_MD_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_MD_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_MD_e, + /* Actor SubMtd */ &l_daE_MD_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/src/d/actor/d_a_e_mf.cpp b/src/d/actor/d_a_e_mf.cpp index da009ebc0d..594b9aa2d8 100644 --- a/src/d/actor/d_a_e_mf.cpp +++ b/src/d/actor/d_a_e_mf.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_mf.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -243,13 +243,13 @@ static int daE_MF_Draw(e_mf_class* i_this) { cXyz sp50; sp50.set(a_this->current.pos.x, a_this->current.pos.y + 50.0f, a_this->current.pos.z); - i_this->mShadowKey = dComIfGd_setShadow(i_this->mShadowKey, 1, model, &sp50, 1150.0f, 0.0f, - a_this->current.pos.y, i_this->mObjAcch.GetGroundH(), - i_this->mObjAcch.m_gnd, &a_this->tevStr, 0, 1.0f, + i_this->mShadowKey = dComIfGd_setShadow(i_this->mShadowKey, 1, model, &sp50, 1150.0f, 0.0f, + a_this->current.pos.y, i_this->mObjAcch.GetGroundH(), + i_this->mObjAcch.m_gnd, &a_this->tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); dComIfGd_addRealShadow(i_this->mShadowKey, i_this->mpAxeModel); dComIfGd_addRealShadow(i_this->mShadowKey, i_this->mpShieldModel); - + return 1; } @@ -402,7 +402,7 @@ static int pl_check(e_mf_class* i_this, f32 param_2, s16 param_3) { return 1; } } - + for (int i = 0; i <= 2; i++) { if (i_this->field_0xa7c[i].ChkCoHit() != 0) { if (player == dCc_GetAc(i_this->field_0xa7c[i].GetCoHitObj()->GetAc())) { @@ -410,7 +410,7 @@ static int pl_check(e_mf_class* i_this, f32 param_2, s16 param_3) { } } } - + return 0; } @@ -690,7 +690,7 @@ static void e_mf_bomb_action(e_mf_class* i_this) { i_this->field_0x5b4 = 5; anm_init(i_this, ANM_WAIT_01, 5.0f, 2, 1.0f); } - + break; case 5: @@ -807,7 +807,7 @@ static void e_mf_normal(e_mf_class* i_this) { cLib_addCalcAngleS2(&i_this->field_0x806, sVar2, 2, 0x400); - if (i_this->field_0x6c0[0] == 0 || + if (i_this->field_0x6c0[0] == 0 || (i_this->field_0x6c0[1] == 0 && (fopAcM_wayBgCheck(a_this, 200.0f, 50.0f) || move_gake_check(i_this, 200.0f, 0)))) { i_this->field_0x5b4 = 2; i_this->field_0x6c0[0] = cM_rndF(100.0f) + 50.0f; @@ -960,8 +960,8 @@ static int way_check(e_mf_class* i_this) { static void* shot_s_sub(void* i_actor, void* i_data) { e_mf_class* i_this = (e_mf_class*)i_data; fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_ARROW && (fopAcM_GetParam(i_actor) == 1 || fopAcM_GetParam(i_actor) == 2)) || - fopAcM_GetName(i_actor) == PROC_BOOMERANG && dComIfGp_checkPlayerStatus0(0, 0x80000) == 0 && daPy_py_c::checkBoomerangCharge() && fopAcM_GetParam(i_actor) == 1) { + if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_ARROW_e && (fopAcM_GetParam(i_actor) == 1 || fopAcM_GetParam(i_actor) == 2)) || + fopAcM_GetName(i_actor) == fpcNm_BOOMERANG_e && dComIfGp_checkPlayerStatus0(0, 0x80000) == 0 && daPy_py_c::checkBoomerangCharge() && fopAcM_GetParam(i_actor) == 1) { cXyz sp28(a_this->current.pos - ((fopAc_ac_c*)i_actor)->current.pos); if (sp28.abs() < 1000.0f) { return i_actor; @@ -1132,8 +1132,8 @@ static void e_mf_fight_run(e_mf_class* i_this) { } } else { if ((sVar3 == 2 || dComIfGp_checkPlayerStatus1(0, 0x2000000) != 0) || (((i_this->mXAngleToPlayer < 0x1000 && i_this->mXAngleToPlayer > -0x1000) || sVar3 != 0) && player_way_check(i_this))) { - if ((sVar3 != 0 || (i_this->mPlayerDistance < l_HIO.battle_init_range && - ((daPy_getPlayerActorClass()->getCutAtFlg() != 0 || daPy_getPlayerActorClass()->getCutType() == daPy_py_c::CUT_TYPE_JUMP) || + if ((sVar3 != 0 || (i_this->mPlayerDistance < l_HIO.battle_init_range && + ((daPy_getPlayerActorClass()->getCutAtFlg() != 0 || daPy_getPlayerActorClass()->getCutType() == daPy_py_c::CUT_TYPE_JUMP) || ((i_this->field_0x6ac & 48) != 0 && daPy_getPlayerActorClass()->getCutType() == daPy_py_c::CUT_TYPE_GUARD_ATTACK)))) && i_this->field_0x72c < 1.0f) { i_this->mAction = 7; if (cc_pl_cut_bit_get() == 0x100) { @@ -1199,7 +1199,7 @@ static void e_mf_fight_run(e_mf_class* i_this) { static void e_mf_jump(e_mf_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - + i_this->field_0x6d4 = 1; switch (i_this->field_0x5b4) { case 0: @@ -1358,7 +1358,7 @@ static fopAc_ac_c* at_hit_check(e_mf_class* i_this) { if (i_this->field_0x5b4 >= 10) { return NULL; } - + if (i_this->field_0xe24.ChkAtHit() != 0) { return dCc_GetAc(i_this->field_0xe24.GetAtHitObj()->GetAc()); } @@ -1422,7 +1422,7 @@ static void e_mf_attack(e_mf_class* i_this) { cLib_addCalc0(&a_this->speedF, 1.0f, 5.0f); if (i_this->field_0x6cf != 0) { fopAc_ac_c* actor_p = at_hit_check(i_this); - if (actor_p != NULL && fopAcM_GetName(actor_p) == PROC_ALINK && daPy_getPlayerActorClass()->checkPlayerGuard()) { + if (actor_p != NULL && fopAcM_GetName(actor_p) == fpcNm_ALINK_e && daPy_getPlayerActorClass()->checkPlayerGuard()) { i_this->mpModelMorf->setPlaySpeed(0.0f); i_this->mAction = 3; i_this->field_0x5b4 = 0; @@ -2501,7 +2501,7 @@ static void action(e_mf_class* i_this) { sp240.z = 15000.0f; } MtxPosition(&sp240, &sp24c); - + i_this->field_0x784[0].y = sp24c.x; i_this->field_0x784[0].x = sp24c.z; i_this->field_0x784[1].y = sp24c.x; @@ -2564,7 +2564,7 @@ static void action(e_mf_class* i_this) { MtxPosition(&sp240, &sp24c); i_this->field_0x816.y = -sp24c.x; i_this->field_0x816.x = -sp24c.z * 1.3f; - + if (i_this->field_0x816.x > 10000) { i_this->field_0x816.x = 10000; } @@ -2779,12 +2779,12 @@ static int c_start; static int daE_MF_Execute(e_mf_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; f32 fVar1 = 0.0f; - + if (i_this->field_0x728 != 0) { return 1; } - if (c_start == 0 && dComIfGp_event_runCheck() && + if (c_start == 0 && dComIfGp_event_runCheck() && (fopAcM_getTalkEventPartner((fopAc_ac_c*)daPy_getLinkPlayerActorClass()) == daPy_py_c::getMidnaActor() || daPy_getPlayerActorClass()->eventInfo.checkCommandDoor())) { return 1; } @@ -2908,7 +2908,7 @@ static int daE_MF_Execute(e_mf_class* i_this) { } else { i_this->field_0xa7c[0].SetR(50.0f); } - + a_this->attention_info.position = a_this->eyePos; a_this->attention_info.position.y += 70.0f; @@ -2959,7 +2959,7 @@ static int daE_MF_Execute(e_mf_class* i_this) { i_this->field_0xe24.SetAtSpl((dCcG_At_Spl)0); } } - + MTXCopy(i_this->mpModelMorf->getModel()->getAnmMtx(12), *calc_mtx); i_this->mpShieldModel->setBaseTRMtx(*calc_mtx); @@ -3181,7 +3181,7 @@ static cPhs_Step daE_MF_Create(fopAc_ac_c* a_this) { l_HIO.field_0x4 = -1; } - fopAcM_OnStatus(a_this, fopAcM_STATUS_UNK_0x100); + fopAcM_OnStatus(a_this, fopAcStts_CULL_e); a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e; fopAcM_SetMtx(a_this, i_this->mpModelMorf->getModel()->getBaseTRMtx()); fopAcM_SetMin(a_this, -200.0f, -200.0f, -200.0f); @@ -3249,7 +3249,7 @@ static cPhs_Step daE_MF_Create(fopAc_ac_c* a_this) { i_this->mAtInfo.mpSound = &i_this->mSound; if (strcmp(dComIfGp_getStartStageName(), "D_MN09") == 0) { - fopAcM_OnStatus(a_this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(a_this, fopAcStts_UNK_0x4000_e); } c_start = 1; @@ -3273,18 +3273,18 @@ actor_method_class l_daE_MF_Method = { }; actor_process_profile_definition g_profile_E_MF = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_MF, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_mf_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 120, // mPriority - &l_daE_MF_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_E_MF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_mf_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_MF_e, + /* Actor SubMtd */ &l_daE_MF_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_mk.cpp b/src/d/actor/d_a_e_mk.cpp index ab45d05ac9..c3a684ea8e 100644 --- a/src/d/actor/d_a_e_mk.cpp +++ b/src/d/actor/d_a_e_mk.cpp @@ -117,10 +117,10 @@ static void* s_obj_delete(void* i_actor, void* i_data) { UNUSED(i_data); if (fopAcM_IsActor(i_actor)) { - if (fopAcM_GetName(i_actor) == PROC_E_DB) { + if (fopAcM_GetName(i_actor) == fpcNm_E_DB_e) { fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; actor->health = 1000; - } else if (fopAcM_GetName(i_actor) == PROC_E_DB_LEAF) { + } else if (fopAcM_GetName(i_actor) == fpcNm_E_DB_LEAF_e) { fopAcM_delete((fopAc_ac_c*)i_actor); } } @@ -149,7 +149,7 @@ static int target_info_count; static void* s_h_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Pillar) && target_info_count < 20) { + if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_Pillar_e) && target_info_count < 20) { target_info[target_info_count] = (daPillar_c*)i_actor; target_info_count++; } @@ -217,7 +217,7 @@ static daPillar_c* search_hasira(e_mk_class* i_this) { static void* s_d_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_DB)) { + if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_DB_e)) { e_db_class* actor = (e_db_class*)i_actor; if (actor->action == 10) { if (actor->mode >= 1 && target_info_count < 20) { @@ -1521,7 +1521,7 @@ static void demo_camera_start(e_mk_class* i_this) { i_this->camCenter = player->current.pos; i_this->camCenter.y += 100.0f; i_this->demoMode = e_mk_class::DEMO_MODE_FINISH; - fopAcM_OffStatus(actor, 0x4000); + fopAcM_OffStatus(actor, fopAcStts_UNK_0x4000_e); Z2GetAudioMgr()->subBgmStart(Z2BGM_BOOMERAMG_MONKEY); } @@ -1936,7 +1936,7 @@ static void demo_camera_end(e_mk_class* i_this) { static void* s_ks_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS) && static_cast(i_actor)->set_id == 0) { + if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KS_e) && static_cast(i_actor)->set_id == 0) { return i_actor; } @@ -1946,7 +1946,7 @@ static void* s_ks_sub(void* i_actor, void* i_data) { static void* s_brg_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_BRG) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_BRG_e) { static_cast(i_actor)->field_0xaef4 = VREG_F(11) + 500.0f; static_cast(i_actor)->mType |= (u8)4; } @@ -1957,7 +1957,7 @@ static void* s_brg_sub(void* i_actor, void* i_data) { static void* s_brg_sub2(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_BRG) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_BRG_e) { #if PLATFORM_SHIELD static_cast(i_actor)->mType &= (u8)~4u; #else @@ -2711,7 +2711,7 @@ static int daE_MK_Execute(e_mk_class* i_this) { parameters = 1; } - i_this->boomerangId = fopAcM_createChild(PROC_E_MK_BO, fopAcM_GetID(actor), parameters, + i_this->boomerangId = fopAcM_createChild(fpcNm_E_MK_BO_e, fopAcM_GetID(actor), parameters, &actor->current.pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1, NULL); i_this->unkFlag4 = 0; @@ -2917,12 +2917,12 @@ static int daE_MK_Create(fopAc_ac_c* i_actor) { mk->action = e_mk_class::ACT_S_DEMO; u32 i_parameters = fopAcM_GetParam(i_actor) & 0xFF000000 | 0xFFFF01; cXyz sp30(-21.0f, 5114.0f, -4941.0f); - mk->dbId1 = fopAcM_createChild(PROC_E_DB, fopAcM_GetID(i_actor), i_parameters, + mk->dbId1 = fopAcM_createChild(fpcNm_E_DB_e, fopAcM_GetID(i_actor), i_parameters, &sp30, fopAcM_GetRoomNo(i_actor), NULL, NULL, -1, NULL); sp30.set(-10.0f, 5114.0f, -4401.0f); - mk->dbId2 = fopAcM_createChild(PROC_E_DB, fopAcM_GetID(i_actor), i_parameters, + mk->dbId2 = fopAcM_createChild(fpcNm_E_DB_e, fopAcM_GetID(i_actor), i_parameters, &sp30, fopAcM_GetRoomNo(i_actor), NULL, NULL, -1, NULL); @@ -2949,18 +2949,18 @@ static actor_method_class l_daE_MK_Method = { }; actor_process_profile_definition g_profile_E_MK = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_MK, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_mk_class), // size - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 165, // mPriority - &l_daE_MK_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_E_MK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_mk_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_MK_e, + /* Actor SubMtd */ &l_daE_MK_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_mk_bo.cpp b/src/d/actor/d_a_e_mk_bo.cpp index 13a94c74b6..e2a075134c 100644 --- a/src/d/actor/d_a_e_mk_bo.cpp +++ b/src/d/actor/d_a_e_mk_bo.cpp @@ -57,7 +57,7 @@ static void hit_check(e_mk_bo_class* i_this) { if (i_this->ccAtSph.ChkAtHit()) { cCcD_Obj* at_hit_obj = i_this->ccAtSph.GetAtHitObj(); fopAc_ac_c* at_hit_actor = dCc_GetAc(at_hit_obj->GetAc()); - if (at_hit_actor != NULL && fopAcM_GetName(at_hit_actor) == PROC_ALINK && daPy_getPlayerActorClass()->checkPlayerGuard()) { + if (at_hit_actor != NULL && fopAcM_GetName(at_hit_actor) == fpcNm_ALINK_e && daPy_getPlayerActorClass()->checkPlayerGuard()) { dComIfGp_getVibration().StartShock(4, 0x1F, cXyz(0.0f, 1.0f, 0.0f)); } } @@ -168,7 +168,7 @@ static s8 e_mk_bo_shot(e_mk_bo_class* i_this) { OS_REPORT("E_MK_BO ANY HIT !!!!\n"); cCcD_Obj* at_hit_obj = i_this->ccAtSph.GetAtHitObj(); - if (fopAcM_GetName(dCc_GetAc(at_hit_obj->GetAc())) == PROC_ALINK) { + if (fopAcM_GetName(dCc_GetAc(at_hit_obj->GetAc())) == fpcNm_ALINK_e) { OS_REPORT("E_MK_BO PL HIT !!!!\n"); e_mk->unkFlag4 = 5; i_this->field_0x5f8 = 10; @@ -813,20 +813,20 @@ static actor_method_class l_daE_MK_BO_Method = { }; actor_process_profile_definition g_profile_E_MK_BO = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_MK_BO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_mk_bo_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 166, // mPriority - &l_daE_MK_BO_Method, // sub_method - 0x00044100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_MK_BO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_mk_bo_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_MK_BO_e, + /* Actor SubMtd */ &l_daE_MK_BO_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_e_mm.cpp b/src/d/actor/d_a_e_mm.cpp index 220fef256b..cfb7cf5491 100644 --- a/src/d/actor/d_a_e_mm.cpp +++ b/src/d/actor/d_a_e_mm.cpp @@ -1122,7 +1122,7 @@ static int daE_MM_Create(fopAc_ac_c* actor) { actor->scale.set(l_HIO.base_size, l_HIO.base_size, l_HIO.base_size); } - i_this->armorChildId = fopAcM_createChild(PROC_E_MM_MT, fopAcM_GetID(actor), 0, &actor->current.pos, fopAcM_GetRoomNo(actor), &actor->shape_angle, &actor->scale, actor->argument, NULL); + i_this->armorChildId = fopAcM_createChild(fpcNm_E_MM_MT_e, fopAcM_GetID(actor), 0, &actor->current.pos, fopAcM_GetRoomNo(actor), &actor->shape_angle, &actor->scale, actor->argument, NULL); i_this->field_0x672 = 1; daE_MM_Execute(i_this); @@ -1140,18 +1140,18 @@ static actor_method_class l_daE_MM_Method = { }; actor_process_profile_definition g_profile_E_MM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_MM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_mm_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 167, // mPriority - &l_daE_MM_Method, // sub_method - 0x00040120, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_MM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_mm_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_MM_e, + /* Actor SubMtd */ &l_daE_MM_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_mm_mt.cpp b/src/d/actor/d_a_e_mm_mt.cpp index cec4a232a3..b745fa31c9 100644 --- a/src/d/actor/d_a_e_mm_mt.cpp +++ b/src/d/actor/d_a_e_mm_mt.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_mm_mt.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -16,10 +16,10 @@ static int daE_MM_MT_Draw(e_mm_mt_class* i_this) { g_env_light.setLightTevColorType_MAJI(i_this->mp_model, &i_this->enemy.tevStr); mDoExt_modelUpdateDL(i_this->mp_model); - + cXyz local_18(i_this->enemy.current.pos.x, i_this->enemy.current.pos.y + 100, i_this->enemy.current.pos.z); - if (!fopAcM_CheckStatus(actor, fopAcM_STATUS_CARRY_NOW)) { + if (!fopAcM_CheckStatus(actor, fopAcStts_CARRY_NOW_e)) { i_this->m_shadowKey = dComIfGd_setShadow( i_this->m_shadowKey, 1, i_this->mp_model, &local_18, 700.0f, 0.0f, i_this->enemy.current.pos.y, i_this->m_acch.GetGroundH(), i_this->m_acch.m_gnd, @@ -42,9 +42,9 @@ static bool e_mm_hookCheck(e_mm_mt_class* i_this) { return false; } - if (i_this->m_sphere.ChkTgHit() + if (i_this->m_sphere.ChkTgHit() && i_this->m_sphere.GetTgHitObj()->ChkAtType(AT_TYPE_HOOKSHOT) - || fopAcM_CheckStatus(actor, 0x100000)) { + || fopAcM_CheckStatus(actor, fopAcStts_HOOK_CARRY_NOW_e)) { i_this->field_0x69C = 0.0f; i_this->field_0x68A[0] = true; cXyz local_24 = i_this->enemy.current.pos; @@ -62,7 +62,7 @@ static bool e_mm_hookCheck(e_mm_mt_class* i_this) { pdVar3->setHookshotCarryOffset(fopAcM_GetID(i_this), &VStack_18); return 1; } - + if (i_this->field_0x68A[0]) { if (daPy_getPlayerActorClass()->setForceGrab(actor, 0, 1)) { @@ -89,8 +89,8 @@ static void e_mm_mt_normal(e_mm_mt_class* i_this) { fopAc_ac_c* helmasaurActor; fopAc_ac_c* actor = (fopAc_ac_c*)i_this; fopAc_ac_c* player = (fopAc_ac_c*) dComIfGp_getPlayer(0); - - + + if (fopAcM_SearchByID(actor->parentActorID, &helmasaurActor)) { actor->scale.x = helmasaurActor->scale.x; e_mm_class* helmasaur = (e_mm_class*)helmasaurActor; @@ -108,16 +108,16 @@ static void e_mm_mt_normal(e_mm_mt_class* i_this) { if (i_this->m_sphere.ChkAtShieldHit()) { i_this->m_invulnerabilityTimer = 15; helmasaur->field_0xb99 |= 1; - i_this->m_atInfo.mpCollider = i_this->m_sphere.GetAtHitObj(); + i_this->m_atInfo.mpCollider = i_this->m_sphere.GetAtHitObj(); i_this->m_sphere.SetAtSe(9); } } else { i_this->m_sphere.OffAtSetBit(); } - if (actor->argument != 1 - && ((i_this->m_sphere.ChkTgHit() - && i_this->m_sphere.GetTgHitObj()->ChkAtType(AT_TYPE_HOOKSHOT)) - || fopAcM_CheckStatus(actor, 0x100000))) { + if (actor->argument != 1 + && ((i_this->m_sphere.ChkTgHit() + && i_this->m_sphere.GetTgHitObj()->ChkAtType(AT_TYPE_HOOKSHOT)) + || fopAcM_CheckStatus(actor, fopAcStts_HOOK_CARRY_NOW_e))) { helmasaur->field_0xb99 |= 4; } if (!helmasaur->field_0x672) { @@ -135,7 +135,7 @@ static void e_mm_mt_normal(e_mm_mt_class* i_this) { fopAcM_OffStatus(actor, 0); actor->attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e; actor->attention_info.distances[fopAc_attn_BATTLE_e] = 0; - fopAcM_OnStatus(actor, 0x400); + fopAcM_OnStatus(actor, fopAcStts_FREEZE_e); s16 actor_angle = player->shape_angle.y + 0x4000; s16 angle = actor->shape_angle.y - actor_angle; if (angle > 0x4000 || angle < -0x4000) { @@ -164,7 +164,7 @@ static void e_mm_mt_hagare(e_mm_mt_class* i_this) { int arg = i_this->m_mode; switch (arg) { case -10: - cLib_addCalc2(&i_this->enemy.speedF, 3.0f, 1.0f, 0.15f); + cLib_addCalc2(&i_this->enemy.speedF, 3.0f, 1.0f, 0.15f); cLib_addCalc2(&i_this->field_0x69C, 2000.0f, 0.1f, 200.0f); if (i_this->enemy.speedF >= 2.95f) { i_this->m_mode = 0; @@ -187,7 +187,7 @@ static void e_mm_mt_hagare(e_mm_mt_class* i_this) { sVar6 = 0x4000; } - cLib_addCalcAngleS2(&i_this->enemy.shape_angle.y, + cLib_addCalcAngleS2(&i_this->enemy.shape_angle.y, player->shape_angle.y + 0x4000 + i_this->m_carryAngle, 4, spA + 0x100); @@ -268,7 +268,7 @@ static s16 wall_angle_get(e_mm_mt_class* i_this) { cMtx_YrotS(*calc_mtx, a_this->current.angle.y); vec1.x = 0.0f; vec1.y = 0.0f; - vec1.z = -50.0f; + vec1.z = -50.0f; MtxPosition(&vec1, &vec2); vec2 += a_this->current.pos; vec1.x = 5.0f; @@ -287,7 +287,7 @@ static s16 wall_angle_get(e_mm_mt_class* i_this) { } } - vec1 = vec3[1] - vec3[0]; + vec1 = vec3[1] - vec3[0]; return vec1.atan2sX_Z() + 0x4000; } @@ -311,7 +311,7 @@ static void e_mm_mt_drop(e_mm_mt_class* i_this) { if (!i_this->m_timer[0] && i_this->m_acch.ChkWallHit()) { s16 wall_angle = wall_angle_get(i_this); if (wall_angle != 0x23) { - wall_angle = i_this->enemy.current.angle.y - wall_angle; + wall_angle = i_this->enemy.current.angle.y - wall_angle; i_this->m_spin = wall_angle * (TREG_F(6) + -0.3f); ANGLE_ADD(i_this->enemy.current.angle.y, 0x8000 - (wall_angle << 1)); if (i_this->m_acch.ChkWaterHit()) { @@ -336,8 +336,8 @@ static void e_mm_mt_drop(e_mm_mt_class* i_this) { mDoAud_seStart(Z2SE_EN_MM_MET_BOUND_LND, &i_this->enemy.current.pos, (u32)(i_this->enemy.speed.y), 0); } i_this->field_0x69C = NREG_F(0) + 3500.0f; - cXyz local_40 = i_this->enemy.current.pos; - cXyz local_4c(1.5f, 1.5f, 1.5f); + cXyz local_40 = i_this->enemy.current.pos; + cXyz local_4c(1.5f, 1.5f, 1.5f); if (!i_this->m_spin ) { i_this->m_spin = cM_rndFX(1300.0f); } @@ -347,7 +347,7 @@ static void e_mm_mt_drop(e_mm_mt_class* i_this) { mDoAud_seStart(Z2SE_EN_MM_MET_BOUND_WTR, &i_this->enemy.current.pos, 0, 0); } else { mDoAud_seStart(Z2SE_EN_MM_MET_BOUND_LND, &i_this->enemy.current.pos, 0, 0); - } + } } } break; @@ -356,11 +356,11 @@ static void e_mm_mt_drop(e_mm_mt_class* i_this) { break; } cMtx_YrotS(*calc_mtx, i_this->enemy.current.angle.y); - + local_28.x = 0.0f; - local_28.y = 0.0f; + local_28.y = 0.0f; local_28.z = i_this->enemy.speedF; - + MtxPosition(&local_28, &local_34); i_this->enemy.speed.x = local_34.x; i_this->enemy.speed.z = local_34.z; @@ -386,7 +386,7 @@ static void e_mm_mt_drop(e_mm_mt_class* i_this) { } else { i_this->m_sphere.OffAtSetBit(); } - if (fopAcM_checkCarryNow(actor)) { + if (fopAcM_checkCarryNow(actor)) { i_this->m_action = 2; i_this->m_mode = 0; i_this->m_carryAngleSpeed = \ @@ -398,8 +398,8 @@ static void e_mm_mt_drop(e_mm_mt_class* i_this) { } i_this->m_sphere.OffAtSetBit(); return; - } - if (fopAcM_CheckStatus(actor, 0x200) && !i_this->m_invulnerabilityTimer) { + } + if (fopAcM_CheckStatus(actor, fopAcStts_UNK_0x200_e) && !i_this->m_invulnerabilityTimer) { i_this->m_action = 1; i_this->m_mode = -10; i_this->field_0x68A[0] = false; @@ -412,7 +412,7 @@ static void e_mm_mt_drop(e_mm_mt_class* i_this) { if (sVar1 > 0x4000 || sVar1 < -0x4000) { i_this-> m_carryAngle = -0x8000; return; - } + } i_this->m_carryAngle = 0; } } @@ -713,7 +713,7 @@ static int daE_MM_MT_Execute(e_mm_mt_class* i_this) { i_this->m_invulnerabilityTimer--; } action(i_this); - fopAcM_OffStatus(actor, fopAcM_STATUS_UNK_0x200); + fopAcM_OffStatus(actor, fopAcStts_UNK_0x200_e); i_this->m_sound.framework(0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); return true; } @@ -753,7 +753,7 @@ static int daE_MM_MT_Create(fopAc_ac_c* i_this) { cPhs_Step cVar1; bool bVar2; f32 fVar3; - + e_mm_mt_class* helmasaurShell = (e_mm_mt_class*) i_this; fopAc_ac_c* actor = (fopAc_ac_c*) i_this; @@ -764,7 +764,7 @@ static int daE_MM_MT_Create(fopAc_ac_c* i_this) { OS_REPORT("E_MM_MT PARAM %x\n", fopAcM_GetParam(i_this)); helmasaurShell->parameters = fopAcM_GetParam(i_this); OS_REPORT("E_MM_MT//////////////E_MM_MT SET 1 !!\n"); - + if (!fopAcM_entrySolidHeap(i_this, useHeapInit, 0x850)) { OS_REPORT("//////////////E_MM_MT SET NON !!\n"); @@ -786,7 +786,7 @@ static int daE_MM_MT_Create(fopAc_ac_c* i_this) { i_this->field_0x560 = 2000; static dCcD_SrcSph cc_sph_src = { { - {0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0xd}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj + {0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0xd}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj {dCcD_SE_METAL, 0x0, 0x1, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x2, 0x0, 0x0, 0x407}, // mGObjTg {0x0}, // mGObjCo @@ -813,14 +813,14 @@ static int daE_MM_MT_Create(fopAc_ac_c* i_this) { } else { static dCcD_SrcSph hk_sph_src = { { - {0x0, {{0x0, 0x0, 0x0}, {0x4080, 0x3}, 0x0}}, // mObj + {0x0, {{0x0, 0x0, 0x0}, {0x4080, 0x3}, 0x0}}, // mObj {dCcD_SE_13, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x406}, // mGObjTg {0x0}, // mGObjCo }, // mObjInf { {{0.0f, 0.0f, 0.0f}, 40.0f} // m_sphere - } + } }; helmasaurShell->m_stts.SetWeight(200); helmasaurShell->m_sph.Set(hk_sph_src); @@ -836,7 +836,7 @@ static int daE_MM_MT_Create(fopAc_ac_c* i_this) { i_this->attention_info.distances[fopAc_attn_CARRY_e] = 7; helmasaurShell->m_lifetime = cM_rndF(65535.0f); daE_MM_MT_Execute(helmasaurShell); - } + } return phase; } @@ -849,18 +849,18 @@ static actor_method_class l_daE_MM_MT_Method = { }; actor_process_profile_definition g_profile_E_MM_MT = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_MM_MT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_mm_mt_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 168, // mPriority - &l_daE_MM_MT_Method, // sub_method - 0x000C0100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_MM_MT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_mm_mt_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_MM_MT_e, + /* Actor SubMtd */ &l_daE_MM_MT_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_ms.cpp b/src/d/actor/d_a_e_ms.cpp index bd4d8a01bb..5b43781d66 100644 --- a/src/d/actor/d_a_e_ms.cpp +++ b/src/d/actor/d_a_e_ms.cpp @@ -119,7 +119,7 @@ static int target_info_count; static void* s_d_sub(void* param_1, void* param_2) { daObjCarry_c* i_this = (daObjCarry_c*)param_1; - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_Carry && i_this->getType() == daObjCarry_c::TYPE_DOKURO && + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_Obj_Carry_e && i_this->getType() == daObjCarry_c::TYPE_DOKURO && target_info_count < 20) { target_info[target_info_count] = (fopAc_ac_c*)param_1; @@ -1063,20 +1063,20 @@ static actor_method_class l_daE_MS_Method = { }; actor_process_profile_definition g_profile_E_MS = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_MS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_ms_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 177, // mPriority - &l_daE_MS_Method, // sub_method - 0x00050100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_MS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_ms_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_MS_e, + /* Actor SubMtd */ &l_daE_MS_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_nest.cpp b/src/d/actor/d_a_e_nest.cpp index d3988cec46..25055c4bd6 100644 --- a/src/d/actor/d_a_e_nest.cpp +++ b/src/d/actor/d_a_e_nest.cpp @@ -4,7 +4,7 @@ */ #include "d/dolzel_rel.h" // IWYU pragma: keep - + #include "d/d_s_play.h" #include "d/actor/d_a_e_nest.h" #include "d/actor/d_a_npc_tk.h" @@ -12,7 +12,7 @@ #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" #include "d/d_bomb.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_camera_mng.h" #include @@ -57,7 +57,7 @@ static void hahen_normal(e_nest_class* i_this, nest_hahen_s* i_debris) { fopAc_ac_c* a_this = static_cast(i_this); dBgS_LinChk lin_chk; dBgS_ObjGndChk_Spl gnd_chk; - + i_debris->mCounter++; if (i_debris->mTimer != 0) { i_debris->mTimer--; @@ -189,7 +189,7 @@ static int daE_Nest_Draw(e_nest_class* i_this) { cXyz vec; f32 scale = l_HIO.mScale * i_this->scale.x; vec.set(i_this->current.pos.x, i_this->current.pos.y + 50.0f, i_this->current.pos.z); - i_this->mShadowKey = + i_this->mShadowKey = dComIfGd_setShadow(i_this->mShadowKey, 1, i_this->mpModel, &vec, scale * 500.0f, 0.0f, i_this->current.pos.y, i_this->mAcch.GetGroundH(), i_this->mAcch.m_gnd, &i_this->tevStr, 0, 1.0f, @@ -315,7 +315,7 @@ static void e_nest_normal(e_nest_class* i_this) { i_this->mHitActorID = fopAcM_GetID(daPy_getPlayerActorClass()); /* dSv_event_flag_c::F_0073 - Ordon Village - Attacked after charging at large beehive */ dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[172]); - } else if (fopAcM_GetName(actor) == PROC_NPC_TK) { + } else if (fopAcM_GetName(actor) == fpcNm_NPC_TK_e) { daNPC_TK_c* hawk = static_cast(actor); hawk->setBump(); i_this->mHitActorID = fopAcM_GetID(hawk); @@ -437,7 +437,7 @@ static s8 e_nest_carry(e_nest_class* i_this) { fopAc_ac_c* player = dComIfGp_getPlayer(0); a_this->speed.y = 0.0f; s8 ret = true; - + switch (i_this->mMode) { case 0: { cLib_offBit(a_this->attention_info.flags, fopAc_AttnFlag_CARRY_e); @@ -538,7 +538,7 @@ static void e_nest_float(e_nest_class* i_this) { if (i_this->current.pos.y + 60.0f > vec.y) { fopAcM_effHamonSet(&i_this->mRippleKey, &vec, i_this->scale.x, 0.05f); } - + cLib_addCalc2(&i_this->current.pos.y, i_this->mWaterHeight - 40.0f + i_this->mBob * 0.004f * cM_ssin(i_this->mFrame * 900), 0.1f, 10.0f); i_this->mRotation.x = i_this->mBob * cM_ssin(i_this->mFrame * 1000); @@ -776,7 +776,7 @@ static void bee_nest_action(e_nest_class* i_this) { static void* shot_b_sub(void* i_actor, void* i_data) { daPy_py_c* player = static_cast(dComIfGp_getPlayer(0)); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_BOOMERANG + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_BOOMERANG_e && !dComIfGp_checkPlayerStatus0(0, 0x80000) && player->checkBoomerangCharge() && fopAcM_GetParam(i_actor) == 1) { return i_actor; @@ -787,7 +787,7 @@ static void* shot_b_sub(void* i_actor, void* i_data) { static void demo_camera(e_nest_class* i_this) { camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); s8 end_demo = false; - + switch (i_this->mDemoStage) { case 0: break; @@ -923,7 +923,7 @@ static int daE_Nest_IsDelete(e_nest_class* param_0) { static int daE_Nest_Delete(e_nest_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "E_nest"); - + if (i_this->mHIOInit) { hio_set = false; } @@ -956,7 +956,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { _this->mSound.init(&_this->current.pos, 1); _this->mBeeSound.init(&_this->current.pos, 2); - + return 1; } @@ -995,7 +995,7 @@ static cPhs_Step daE_Nest_Create(fopAc_ac_c* i_this) { _this->mParamScale = 10; } _this->scale.x = _this->mParamScale * 0.1f; - + _this->mRotation.y = _this->current.angle.y; if (_this->mBrokenSwitch != 0xff @@ -1047,7 +1047,7 @@ static cPhs_Step daE_Nest_Create(fopAc_ac_c* i_this) { _this->mCcCyl.SetStts(&_this->mCcStts); if (_this->mParamType == e_nest_class::TYPE_BEE) { - fopAcM_createChild(PROC_E_BEE, fopAcM_GetID(_this), + fopAcM_createChild(fpcNm_E_BEE_e, fopAcM_GetID(_this), _this->mParamScale << 16 | 0x100 | _this->mParam1, &_this->current.pos, fopAcM_GetRoomNo(_this), NULL, NULL, -1, NULL); @@ -1055,11 +1055,11 @@ static cPhs_Step daE_Nest_Create(fopAc_ac_c* i_this) { &_this->mAcchCir, &_this->speed, NULL, NULL); _this->mAcchCir.SetWall(_this->scale.x * 50.0f, _this->scale.x * 50.0f); } else if (_this->mParamType == e_nest_class::TYPE_BUG) { - fopAcM_createChild(PROC_E_BUG, fopAcM_GetID(_this), + fopAcM_createChild(fpcNm_E_BUG_e, fopAcM_GetID(_this), _this->mParam1 | 0xff000000, &_this->current.pos, fopAcM_GetRoomNo(_this), NULL, NULL, -1, NULL); } - + mtx_cc_set(_this); _this->mHitActorID = -1; } @@ -1075,18 +1075,18 @@ static actor_method_class l_daE_Nest_Method = { }; actor_process_profile_definition g_profile_E_NEST = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_E_NEST, - &g_fpcLf_Method.base, - sizeof(e_nest_class), - 0, - 0, - &g_fopAc_Method.base, - 0xB2, - &l_daE_Nest_Method, - 0xD4100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_NEST_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_nest_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_NEST_e, + /* Actor SubMtd */ &l_daE_Nest_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_nz.cpp b/src/d/actor/d_a_e_nz.cpp index e4958c5c7b..e9960c393d 100644 --- a/src/d/actor/d_a_e_nz.cpp +++ b/src/d/actor/d_a_e_nz.cpp @@ -744,18 +744,18 @@ static actor_method_class l_daE_NZ_Method = { }; actor_process_profile_definition g_profile_E_NZ = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_NZ, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_nz_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 179, // mPriority - &l_daE_NZ_Method, // sub_method - 0x10044120, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_NZ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_nz_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_NZ_e, + /* Actor SubMtd */ &l_daE_NZ_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_oc.cpp b/src/d/actor/d_a_e_oc.cpp index 47afc8e658..0403896e70 100644 --- a/src/d/actor/d_a_e_oc.cpp +++ b/src/d/actor/d_a_e_oc.cpp @@ -208,7 +208,7 @@ static daE_OC_HIO_c l_HIO; static void* s_other_oc(void* arg_lhs, void* arg_rhs) { f32 dist; if (arg_lhs != arg_rhs && fopAcM_IsActor(arg_lhs)) { - if (fpcM_IsCreating(fopAcM_GetID(arg_lhs)) == 0 && fopAcM_GetName(arg_lhs) == PROC_E_OC) { + if (fpcM_IsCreating(fopAcM_GetID(arg_lhs)) == 0 && fopAcM_GetName(arg_lhs) == fpcNm_E_OC_e) { if (((daE_OC_c*) arg_lhs)->isBattleOn()) { dist = fopAcM_searchActorDistance((fopAc_ac_c*) arg_lhs, (fopAc_ac_c*) arg_rhs); if (dist < l_HIO.battle_participation_radius) { @@ -331,7 +331,7 @@ bool daE_OC_c::searchPlayer() { static void* s_obj_sub(void* arg_lhs, void* arg_rhs) { if (fopAcM_IsActor(arg_lhs)) { - if (fpcM_IsCreating(fopAcM_GetID(arg_lhs)) == 0 && fopAcM_GetName(arg_lhs) == PROC_Obj_RotBridge) { + if (fpcM_IsCreating(fopAcM_GetID(arg_lhs)) == 0 && fopAcM_GetName(arg_lhs) == fpcNm_Obj_RotBridge_e) { if (fopAcM_GetRoomNo((fopAc_ac_c*) arg_lhs) == fopAcM_GetRoomNo((fopAc_ac_c*) arg_rhs)) { return arg_lhs; } @@ -429,7 +429,7 @@ bool daE_OC_c::searchSound() { static void* s_demo_oc(void* arg_lhs, void* arg_rhs) { (void) arg_rhs; if (fopAcM_IsActor(arg_lhs)) { - if (fpcM_IsCreating(fopAcM_GetID(arg_lhs)) == 0 && fopAcM_GetName(arg_lhs) == PROC_E_OC + if (fpcM_IsCreating(fopAcM_GetID(arg_lhs)) == 0 && fopAcM_GetName(arg_lhs) == fpcNm_E_OC_e && (fopAcM_GetParam(arg_lhs) & 0xFF) == 4) { return arg_lhs; } @@ -1129,7 +1129,7 @@ void daE_OC_c::executeFind() { f32 pl_dist = fopAcM_searchPlayerDistance(this); if (mOcState < 3 || !setWatchMode()) { if (field_0x6b4 == 2 && !dComIfGp_event_runCheck()) { - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); field_0x6b4 = 0; } @@ -1286,7 +1286,7 @@ void daE_OC_c::executeFind() { // Forest Temple - Entrance fopAc_ac_c* ks_actor; // Caged girl monkey in 1st room: - fopAcM_SearchByName(PROC_NPC_KS, &ks_actor); + fopAcM_SearchByName(fpcNm_NPC_KS_e, &ks_actor); if (ks_actor) { mWatchPos = ks_actor->current.pos; mWatchPos.y += 100.0f; @@ -1448,14 +1448,14 @@ void daE_OC_c::executeAttack() { fopAc_ac_c* hit_actor; if (mSphs_at[0].ChkAtHit()) { hit_actor = dCc_GetAc(mSphs_at[0].GetAtHitObj()->GetAc()); - if (fopAcM_GetName(hit_actor) == PROC_ALINK) { + if (fopAcM_GetName(hit_actor) == fpcNm_ALINK_e) { my_bool = 1; } } if (mSphs_at[1].ChkAtHit()) { hit_actor = dCc_GetAc(mSphs_at[1].GetAtHitObj()->GetAc()); - if (fopAcM_GetName(hit_actor) == PROC_ALINK) { + if (fopAcM_GetName(hit_actor) == fpcNm_ALINK_e) { my_bool = 1; } } @@ -2370,18 +2370,19 @@ void daE_OC_c::executeMoveOut() { bool daE_OC_c::checkWaterSurface() { dBgS_ObjGndChk_Spl gnd_chk_spl; - cXyz my_vec_0 = current.pos; + Vec my_vec_0; + my_vec_0 = current.pos; my_vec_0.y += 500.0f; - gnd_chk_spl.SetPos((Vec*)&my_vec_0); + gnd_chk_spl.SetPos(&my_vec_0); mWaterLvl = dComIfG_Bgsp().GroundCross(&gnd_chk_spl); if (mAcch.ChkGroundHit()) { mWaterLvl = -G_CM3D_F_INF; } if (mWaterLvl > (current.pos.y - 140.0f)) { - return 1; + return true; } else { - return 0; + return false; } } @@ -2593,7 +2594,7 @@ int daE_OC_c::execute() { camera->mCamera.Start(); camera->mCamera.SetTrimSize(0); dComIfGp_event_reset(); - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); fopAc_ac_c* search_actor = (fopAc_ac_c*)fpcM_Search(s_demo_oc, this); if (search_actor) { fopAcM_OffStatus(search_actor, 0x4000); @@ -2758,7 +2759,7 @@ cPhs_Step daE_OC_c::create() { if (mName == "E_OC") { mSphs_at[0].SetAtAtp(1); mSphs_at[1].SetAtAtp(1); - fopAcM_OnStatus(this, 0x10000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x10000_e); } else { mSphs_at[0].SetAtAtp(2); mSphs_at[1].SetAtAtp(2); @@ -2785,7 +2786,7 @@ cPhs_Step daE_OC_c::create() { setActionMode(E_OC_ACTION_DEMO_CHILD, 0); break; default: - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); break; } @@ -2809,20 +2810,20 @@ static actor_method_class l_daE_OC_Method = { }; actor_process_profile_definition g_profile_E_OC = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_OC, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_OC_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 201, // mPriority - &l_daE_OC_Method, // sub_method - 0x00044100, // 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_E_OC_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_OC_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_OC_e, + /* Actor SubMtd */ &l_daE_OC_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_oct_bg.cpp b/src/d/actor/d_a_e_oct_bg.cpp index aee083e1d7..14a421a3b6 100644 --- a/src/d/actor/d_a_e_oct_bg.cpp +++ b/src/d/actor/d_a_e_oct_bg.cpp @@ -352,7 +352,7 @@ bool daE_OctBg_c::checkCoreFishAttack() { if (fopAcM_SearchByID(fopAcM_GetLinkId(this), &actor) == 0 || actor == NULL) { return false; } - if (fopAcM_CheckStatus(actor, 0x100000) == 0) { + if (fopAcM_CheckStatus(actor, fopAcStts_HOOK_CARRY_NOW_e) == 0) { return false; } return true; @@ -887,20 +887,20 @@ static actor_method_class l_daE_OctBg_Method = { }; actor_process_profile_definition g_profile_E_OctBg = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_OctBg, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_OctBg_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 0xCD, // mPriority - &l_daE_OctBg_Method, // sub_method - 0xC4100, // 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_E_OctBg_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_OctBg_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_OctBg_e, + /* Actor SubMtd */ &l_daE_OctBg_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_ot.cpp b/src/d/actor/d_a_e_ot.cpp index 8a364fa486..3debc44c44 100644 --- a/src/d/actor/d_a_e_ot.cpp +++ b/src/d/actor/d_a_e_ot.cpp @@ -161,7 +161,7 @@ void daE_OT_c::damage_check() { if (mCcSph.ChkCoHit()) { fopAc_ac_c* hit_actor = dCc_GetAc(mCcSph.GetCoHitObj()->GetAc()); - if (fopAcM_GetName(dCc_GetAc(hit_actor)) == PROC_E_DT + if (fopAcM_GetName(dCc_GetAc(hit_actor)) == fpcNm_E_DT_e && static_cast(hit_actor)->isFlyingAttack()) { setActionMode(ACT_DAMAGE, 10); @@ -530,7 +530,7 @@ void daE_OT_c::executeDamage() { } fopAcM_delete(this); if (cM_rnd() < l_HIO.mHeartDropRate) { - fopAcM_createItem(¤t.pos, fpcNm_ITEM_HEART, -1, -1, NULL, NULL, 0); + fopAcM_createItem(¤t.pos, dItemNo_HEART_e, -1, -1, NULL, NULL, 0); } } break; @@ -567,14 +567,14 @@ void daE_OT_c::executeDamage() { } fopAcM_delete(this); if (cM_rnd() < l_HIO.mHeartDropRate) { - fopAcM_createItem(¤t.pos, fpcNm_ITEM_HEART, -1, -1, NULL, NULL, 0); + fopAcM_createItem(¤t.pos, dItemNo_HEART_e, -1, -1, NULL, NULL, 0); } break; } } void daE_OT_c::action() { - fopAcM_SearchByName(PROC_E_DT, (fopAc_ac_c**)&mpToadActor); + fopAcM_SearchByName(fpcNm_E_DT_e, (fopAc_ac_c**)&mpToadActor); if (mpToadActor == NULL || fpcM_IsCreating(fopAcM_GetID(mpToadActor)) || mpToadActor->isDead() == 2) @@ -777,7 +777,7 @@ cPhs_Step daE_OT_c::create() { mAtInfo.mpSound = &mSound; mAtInfo.mPowerType = 1; gravity = 0.0f; - fopAcM_SearchByName(PROC_E_DT, (fopAc_ac_c**)&mpToadActor); + fopAcM_SearchByName(fpcNm_E_DT_e, (fopAc_ac_c**)&mpToadActor); mChildNo = fopAcM_GetParam(this) & 0xffff; mDemoMode = (fopAcM_GetParam(this) >> 0x10) & 0xff; @@ -787,7 +787,7 @@ cPhs_Step daE_OT_c::create() { switch (mDemoMode) { case 3: - fopAcM_OnStatus(this, 0x8000); + fopAcM_OnStatus(this, fopAcStts_STAFF_PRIMARY_e); // fallthrough case 0: @@ -838,20 +838,20 @@ static actor_method_class l_daE_OT_Method = { }; actor_process_profile_definition g_profile_E_OT = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_OT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_OT_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 203, // mPriority - &l_daE_OT_Method, // sub_method - 0x00050100, // 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_E_OT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_OT_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_OT_e, + /* Actor SubMtd */ &l_daE_OT_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_e_ph.cpp b/src/d/actor/d_a_e_ph.cpp index f2195b41d9..dc20cb2361 100644 --- a/src/d/actor/d_a_e_ph.cpp +++ b/src/d/actor/d_a_e_ph.cpp @@ -1280,7 +1280,7 @@ int daE_PH_c::create() { l_HIO.mSpeed = mMoveSpeed; mCamAction = 0; - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); daE_PH_Execute(this); } @@ -1298,18 +1298,18 @@ static actor_method_class l_daE_PH_Method = { }; actor_process_profile_definition g_profile_E_PH = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_E_PH, - &g_fpcLf_Method.base, - sizeof(daE_PH_c), - 0, - 0, - &g_fopAc_Method.base, - 131, - &l_daE_PH_Method, - 0x244100, - fopAc_ENEMY_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_PH_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_PH_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_PH_e, + /* Actor SubMtd */ &l_daE_PH_Method, + /* Status */ fopAcStts_UNK_0x200000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_pm.cpp b/src/d/actor/d_a_e_pm.cpp index 81d2422985..c994995591 100644 --- a/src/d/actor/d_a_e_pm.cpp +++ b/src/d/actor/d_a_e_pm.cpp @@ -222,7 +222,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } static void* s_pm_sub(void* i_proc, void* i_data) { - if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_PM + if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_E_PM_e && static_cast(i_proc)->SwitchChk() == 1) { return i_proc; } @@ -504,7 +504,7 @@ void daE_PM_c::Ap_StartAction() { break; case Mode1: - if (fopAcM_SearchByName(PROC_Obj_SmWStone, (fopAc_ac_c**)&stone) && stone != NULL) { + if (fopAcM_SearchByName(fpcNm_Obj_SmWStone_e, (fopAc_ac_c**)&stone) && stone != NULL) { stone->deleteStone(); } @@ -547,16 +547,16 @@ void daE_PM_c::Ap_StartAction() { mParticleKey = dComIfGp_particle_set(mParticleKey, 0x880C, ¤t.pos, &tevStr, ¤t.angle, &scale, 0xff, NULL, -1, NULL, NULL, NULL); - + if (mAnm == ANM_APPEAR02 && mpMorf->isStop()) { SetAnm(ANM_WAIT01, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f); mCreatureSound.startCreatureVoice(Z2SE_EN_PM_V_LAUGH, -1); } - + if (mCamCenter.y >= current.pos.y) { mCamCenterTarget.y = current.pos.y; } - + if (mAcch.ChkGroundHit() && mTimer[0] == 0) { SetAnm(ANM_APPEAR02, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f); mTargetHeadAngleX = 0x2000; @@ -572,7 +572,7 @@ void daE_PM_c::Ap_StartAction() { cLib_offsetPos(&mCamEyeTarget, &eye, shape_angle.y, &offset); mCamCenterTarget.y = current.pos.y + 100.0f; } - + if (mCamCenterTarget.y <= mAcch.GetGroundH() + 100.0f) { mCamCenterTarget.y = mAcch.GetGroundH() + 100.0f; } @@ -592,7 +592,7 @@ void daE_PM_c::Ap_StartAction() { static void* s_obj_sub(void* i_proc, void* i_data) { for (int i = 0; i < 5; i++) { - if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_PM && i_proc != NULL + if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_E_PM_e && i_proc != NULL && static_cast(i_proc)->SwitchChk() == 0) { return i_proc; } @@ -626,7 +626,7 @@ void daE_PM_c::Ap_CreateAction() { case 1: mCreatureSound.startCreatureSoundLevel(Z2SE_EN_PM_TRUMPET, 0, -1); - + if (mTimer[0] == 2 && mAnm == ANM_FOGBLOW_LP) { vec2.set(500.0f, 150.0f, 0.0f); mCamCenter.set(-11239.0f, 1850.0f, 16932.0f); @@ -644,7 +644,7 @@ void daE_PM_c::Ap_CreateAction() { for (int i = 0; i < 2; i++) { vec5.set(i * 100.0f + 500.0f, 150.0f, -(i * 100.0f)); cLib_offsetPos(&vec2, ¤t.pos, shape_angle.y, &vec5); - mPuppetID[i] = fopAcM_createChild(PROC_E_FS, fopAcM_GetID(this), 0, &vec2, + mPuppetID[i] = fopAcM_createChild(fpcNm_E_FS_e, fopAcM_GetID(this), 0, &vec2, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); } @@ -674,7 +674,7 @@ void daE_PM_c::Ap_CreateAction() { for (int i = 2; i < 4; i++) { vec5.set(-500.0f - (i - 2) * 100.0f, 150.0f, -((i - 2) * 100.0f)); cLib_offsetPos(&vec2, ¤t.pos, shape_angle.y, &vec5); - mPuppetID[i] = fopAcM_createChild(PROC_E_FS, fopAcM_GetID(this), 0, &vec2, + mPuppetID[i] = fopAcM_createChild(fpcNm_E_FS_e, fopAcM_GetID(this), 0, &vec2, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); } @@ -720,13 +720,13 @@ void daE_PM_c::Ap_EscapeAction() { mBossLightOn = true; mTargetHeadAngleX = s_TargetAngle; cLib_addCalcAngleS2(&mHeadAngleZ, -0x500, 4, 0x600); - + if (mTimer[0] == 0) { SetAnm(ANM_RUN, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f); mMode++; mTargetSpeed = 13.0f; } - + mDoorAction = 0; break; @@ -736,11 +736,11 @@ void daE_PM_c::Ap_EscapeAction() { } else { mCreatureSound.startCreatureSound(Z2SE_EN_PM_FN_R, 0, -1); } - + point.set(mPoint.x, mPoint.y, mPoint.z); mTargetAngleY = cLib_targetAngleY(¤t.pos, &point); cLib_addCalc2(&speedF, mTargetSpeed, 0.05f, 10.0f); - + if (mPointIndex == 7 && mDoorAction == 0) { mCamCenter = *s_LinkPos; mCamCenter.y += 200.0f; @@ -865,7 +865,7 @@ void daE_PM_c::DemoBeforeEscape() { MtxPosition(&vec2, &vec2); mParticleKey = dComIfGp_particle_set(mParticleKey, 0x880C, &vec2, &tevStr, ¤t.angle, &scale, 0xff, NULL, -1, NULL, NULL, NULL); - + if (mpMorf->isStop()) { if (mSwBit != 0xff && !dComIfGs_isSwitch(mSwBit, fopAcM_GetRoomNo(this))) { dComIfGs_onSwitch(mSwBit, fopAcM_GetRoomNo(this)); @@ -1294,7 +1294,7 @@ void daE_PM_c::DemoBossStart2() { vec1.set(current.pos.x, 1900.0f, current.pos.z); SetStopCam(vec1, 500.0f, 0.0f, s_TargetAngle); mCamEye.set(mCamEyeTarget); - actor_status &= ~0x100; + actor_status &= ~fopAcStts_CULL_e; } if (mSecondEncounter) { player->mDemo.setDemoType(daPy_demo_c::DEMO_TYPE_ORIGINAL_e); @@ -1699,7 +1699,7 @@ static void* s_boss_sub(void* i_actor, void* param_1) { fopAc_ac_c* actor = static_cast(i_actor); cXyz& actor_pos = fopAcM_GetPosition(actor); cXyz& player_pos = fopAcM_GetPosition(player); - if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_SM_DOOR) { + if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_SM_DOOR_e) { u8 prm = (fopAcM_GetParam(actor) & 0xF0) >> 4; if (player_pos.absXZ(actor_pos) < 16000.0f && prm == 1) { return i_actor; @@ -2070,7 +2070,7 @@ int daE_PM_c::Execute() { } Yazirushi(); - + if (mStage == 4) { BossAction(); } else if (mStage == 0) { @@ -2145,7 +2145,7 @@ void daE_PM_c::StartAction() { mMode++; mTimer[0] = 240; } - + } else if (mStage == 4) { SearchNearP(); mCcStts.Init(0xFA, 0xFF, this); @@ -2276,7 +2276,7 @@ void daE_PM_c::GakkiLoopAction(cXyz param_0, f32 param_1) { s16 angle = shape_angle.y + step * i; cLib_offsetPos(&vec1, ¶m_0, angle, &vec2); if (!way_bg_check2(this, vec3, vec1) || mStage == 4) { - mPuppetID[i] = fopAcM_createChild(PROC_E_FS, fopAcM_GetID(this), 0xFFFFFFF, + mPuppetID[i] = fopAcM_createChild(fpcNm_E_FS_e, fopAcM_GetID(this), 0xFFFFFFF, &vec1, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); } @@ -2624,7 +2624,7 @@ int daE_PM_c::Draw() { int daE_PM_c::Delete() { dComIfG_resDelete(&mPhase, "E_PM"); - + if (mHIOInit) { hio_set = false; } @@ -2716,7 +2716,7 @@ void daE_PM_c::SkipChk() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(shape_angle.y); mDoMtx_stack_c::multVec(&vec1, &vec1); - mPuppetID[i] = fopAcM_createChild(PROC_E_FS, fopAcM_GetID(this), 0, &vec1, + mPuppetID[i] = fopAcM_createChild(fpcNm_E_FS_e, fopAcM_GetID(this), 0, &vec1, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); } @@ -2728,7 +2728,7 @@ void daE_PM_c::SkipChk() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(shape_angle.y); mDoMtx_stack_c::multVec(&vec1, &vec1); - mPuppetID[i] = fopAcM_createChild(PROC_E_FS, fopAcM_GetID(this), 0, &vec1, + mPuppetID[i] = fopAcM_createChild(fpcNm_E_FS_e, fopAcM_GetID(this), 0, &vec1, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); } @@ -2870,18 +2870,18 @@ static actor_method_class l_daE_PM_Method = { }; actor_process_profile_definition g_profile_E_PM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_PM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_PM_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 161, // mPriority - &l_daE_PM_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_E_PM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_PM_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_PM_e, + /* Actor SubMtd */ &l_daE_PM_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_po.cpp b/src/d/actor/d_a_e_po.cpp index 186323e400..4899fc0376 100644 --- a/src/d/actor/d_a_e_po.cpp +++ b/src/d/actor/d_a_e_po.cpp @@ -1115,7 +1115,7 @@ static void e_po_dead(e_po_class* i_this) { if (var_r0) { u32 param = 0xFFFFF000; param |= i_this->mArg0; - i_this->field_0x5B8 = fopAcM_create(PROC_Obj_poFire, param, &i_this->field_0x788, + i_this->field_0x5B8 = fopAcM_create(fpcNm_Obj_poFire_e, param, &i_this->field_0x788, fopAcM_GetRoomNo(a_this), NULL, NULL, -1); i_this->mType = 7; i_this->field_0x74A[1] = 50; @@ -1187,7 +1187,7 @@ static void e_po_dead(e_po_class* i_this) { return; } scale.x = 6.0f; - fopAcM_create(PROC_KYTAG03, 0x10000B2, &i_this->field_0x7B8, fopAcM_GetRoomNo(a_this), + fopAcM_create(fpcNm_KYTAG03_e, 0x10000B2, &i_this->field_0x7B8, fopAcM_GetRoomNo(a_this), &a_this->shape_angle, &scale, -1); i_this->mType = 10; @@ -1472,7 +1472,7 @@ static void e_po_limbering(e_po_class* i_this) { param |= i_this->BitSW << 8; param |= mRollCount << 16; param |= i_this->BitSW3 << 24; - fopAcM_create(PROC_E_PO, param, &a_this->current.pos, fopAcM_GetRoomNo(a_this), + fopAcM_create(fpcNm_E_PO_e, param, &a_this->current.pos, fopAcM_GetRoomNo(a_this), &a_this->shape_angle, NULL, -1); i_this->field_0x7E2 += 1; } @@ -1484,7 +1484,7 @@ static void e_po_limbering(e_po_class* i_this) { param |= i_this->BitSW << 8; param |= (mRollCount + (i + 1) * 0x3F) << 16; param |= i_this->BitSW3 << 24; - fopAcM_create(PROC_E_PO, param, &a_this->current.pos, fopAcM_GetRoomNo(a_this), + fopAcM_create(fpcNm_E_PO_e, param, &a_this->current.pos, fopAcM_GetRoomNo(a_this), &a_this->shape_angle, NULL, -1); } mRollPlus = 0; @@ -1514,7 +1514,7 @@ static void e_po_limbering(e_po_class* i_this) { dComIfGp_event_reset(); daPy_getPlayerActorClass()->cancelOriginalDemo(); mRollDemoFlag = 2; - fopAcM_OffStatus(a_this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(a_this, fopAcStts_UNK_0x4000_e); i_this->field_0x74A[2] = 0; i_this->mActionID = ACT_ROLL_MOVE; i_this->mType = 0; @@ -1570,7 +1570,7 @@ static void e_po_roll_move(e_po_class* i_this) { if (mRollDemoFlag != 0) { anm_init(i_this, ANM_WAIT02, 10.0f, 2, 1.0f); i_this->field_0x74A[1] = 2; - fopAcM_OffStatus(a_this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(a_this, fopAcStts_UNK_0x4000_e); } else { anm_init(i_this, ANM_RUN_AFTER2, 10.0f, 2, 1.0f); i_this->field_0x74A[1] = 20; @@ -1601,7 +1601,7 @@ static void e_po_roll_move(e_po_class* i_this) { if (mRollPlus != 0) { if (i_this->mAnmID == ANM_AWAKE) { anm_init(i_this, ANM_WAIT02, 10.0f, 2, 1.0f); - fopAcM_OffStatus(a_this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(a_this, fopAcStts_UNK_0x4000_e); } i_this->field_0x7D4 = 0.0f; i_this->mType = 2; @@ -1828,7 +1828,7 @@ static void e_po_holl_demo(e_po_class* i_this) { a_this->current.pos.set(mKPosInit_dt[0]); for (int i = 1; i < 4; i++) { param = i - 0xFFF9; - fopAcM_create(PROC_E_PO, param, &a_this->current.pos, fopAcM_GetRoomNo(a_this), + fopAcM_create(fpcNm_E_PO_e, param, &a_this->current.pos, fopAcM_GetRoomNo(a_this), &a_this->shape_angle, NULL, -1); } a_this->health = 2; @@ -2225,7 +2225,7 @@ static void e_po_holl_demo(e_po_class* i_this) { i_this->field_0x838.set(mKeyeInit_dt[i + 10]); i_this->field_0x7E2 ^= local_100; i_this->field_0x7DE += 1; - fopAcM_createChild(PROC_E_PO, fopAcM_GetID(a_this), param, + fopAcM_createChild(fpcNm_E_PO_e, fopAcM_GetID(a_this), param, &mKPosInit_dt[i + 14], fopAcM_GetRoomNo(a_this), &a_this->shape_angle, NULL, -1, NULL); if (i == 0) { @@ -3164,20 +3164,20 @@ static actor_method_class l_daE_PO_Method = { }; actor_process_profile_definition g_profile_E_PO = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_PO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_po_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 162, // mPriority - &l_daE_PO_Method, // sub_method - 0x00044100, // 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_E_PO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_po_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_PO_e, + /* Actor SubMtd */ &l_daE_PO_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_pz.cpp b/src/d/actor/d_a_e_pz.cpp index 6b19d21abd..6bc42128f5 100644 --- a/src/d/actor/d_a_e_pz.cpp +++ b/src/d/actor/d_a_e_pz.cpp @@ -220,7 +220,7 @@ void daE_PZ_c::mEnemyScaleSet() { for (int i = 0; i < 25; i++) { fopAc_ac_c* spC; if (field_0x7dc[i] != 0 && fopAcM_SearchByID(field_0x7dc[i], &spC) && spC != NULL) { - fopAcM_OnStatus(spC, 0x4000); + fopAcM_OnStatus(spC, fopAcStts_UNK_0x4000_e); if (field_0x7d8 == 2 && field_0x843 == 0) { Z2GetAudioMgr()->seStart(Z2SE_EN_PZ_DKBB_VANISH, &spC->current.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); @@ -381,7 +381,7 @@ void daE_PZ_c::damage_check() { } static void* s_PointSearch(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_PZ && ((daE_PZ_c*)i_actor)->arg0 == 10) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_PZ_e && ((daE_PZ_c*)i_actor)->arg0 == 10) { ((daE_PZ_c*)i_data)->mPointPos[((daE_PZ_c*)i_data)->mPointNum].set(((daE_PZ_c*)i_actor)->current.pos); ((daE_PZ_c*)i_data)->field_0x780[((daE_PZ_c*)i_data)->mPointNum] = (fopAcM_GetParam(i_actor) & 0xFF00) >> 8; @@ -629,7 +629,7 @@ void daE_PZ_c::executeOpeningDemo() { if (mAnm != 0xD) { setBck(0xD, 2, 3.0f, 1.0f); // fakematch, fpcM_GetID should be fopAcM_GetID - parentActorID = fopAcM_createChild(PROC_E_PZ, fpcM_GetID(this), sp28 + arg0, &field_0x7a8, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); + parentActorID = fopAcM_createChild(fpcNm_E_PZ_e, fpcM_GetID(this), sp28 + arg0, &field_0x7a8, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); } lbl_222_bss_71 = field_0x7d8 = 0; @@ -783,7 +783,7 @@ void daE_PZ_c::executeOpeningDemo() { for (int i = 0; i < 25; i++) { if (field_0x7dc[i] != 0 && fopAcM_SearchByID(field_0x7dc[i], &parent) && parent != NULL) { - fopAcM_OnStatus(parent, 0x4000); + fopAcM_OnStatus(parent, fopAcStts_UNK_0x4000_e); } } @@ -829,7 +829,7 @@ void daE_PZ_c::executeOpeningDemo() { for (int i = 0; i < 25; i++) { if (field_0x7dc[i] != 0 && fopAcM_SearchByID(field_0x7dc[i], &parent) && parent != NULL) { - fopAcM_OnStatus(parent, 0x4000); + fopAcM_OnStatus(parent, fopAcStts_UNK_0x4000_e); } } @@ -854,7 +854,7 @@ void daE_PZ_c::executeOpeningDemo() { for (int i = 0; i < 25; i++) { if (field_0x7dc[i] != 0 && fopAcM_SearchByID(field_0x7dc[i], &parent) && parent != NULL) { - fopAcM_OffStatus(parent, 0x4000); + fopAcM_OffStatus(parent, fopAcStts_UNK_0x4000_e); } } @@ -985,7 +985,7 @@ void daE_PZ_c::executeOpeningDemo() { if (mAnm == 0xB && mpModelMorf->isStop()) { setBck(0xD, 2, 3.0f, 1.0f); // fakematch, fpcM_GetID should be fopAcM_GetID - parentActorID = fopAcM_createChild(PROC_E_PZ, fpcM_GetID(this), sp28 + arg0, &field_0x7a8, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); + parentActorID = fopAcM_createChild(fpcNm_E_PZ_e, fpcM_GetID(this), sp28 + arg0, &field_0x7a8, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); lbl_222_bss_71 = field_0x7d8 = 2; } @@ -1138,7 +1138,7 @@ void daE_PZ_c::executeOpeningDemo() { mDemoCameraEye.set(mPzEyeInit_dt[4]); // fakematch, fpcM_GetID should be fopAcM_GetID - parentActorID = fopAcM_createChild(PROC_E_PZ, fpcM_GetID(this), sp28 + arg0, &field_0x7a8, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); + parentActorID = fopAcM_createChild(fpcNm_E_PZ_e, fpcM_GetID(this), sp28 + arg0, &field_0x7a8, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); setBck(0xC, 0, 10.0f, 1.0f); daPy_getPlayerActorClass()->changeDemoMode(0x10, 0, 0, 0); @@ -1407,7 +1407,7 @@ void daE_PZ_c::executeAttack() { break; case 1: if (mpModelMorf->isStop()) { - parentActorID = fopAcM_createChild(PROC_E_PZ, fopAcM_GetID(this), sp20 + arg0, &field_0x7a8, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); + parentActorID = fopAcM_createChild(fpcNm_E_PZ_e, fopAcM_GetID(this), sp20 + arg0, &field_0x7a8, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); if (mAnm == 0xB) { setBck(0xC, 0, 3.0f, 1.0f); @@ -1662,7 +1662,7 @@ void daE_PZ_c::executeDead() { sp68.set(current.pos); sp68.y = mAcch.GetGroundH(); - fopAcM_create(PROC_KYTAG12, 1, &sp68, fopAcM_GetRoomNo(this), NULL, NULL, -1); + fopAcM_create(fpcNm_KYTAG12_e, 1, &sp68, fopAcM_GetRoomNo(this), NULL, NULL, -1); field_0x7c4 = 0.0f; field_0x7d0 = 140; @@ -1758,12 +1758,12 @@ static const struct { u32 parameters; int unk_0x8; } BIRTH_DT[] = { - {PROC_E_YK, 0xFFFFFF01, 20}, - {PROC_E_YG, 0xFFFFFF00, 20}, - {PROC_E_PZ, 0xFFFF001E, 12}, - {PROC_E_S1, 0xFFFFEF00, 8}, - {PROC_E_YH, 0xFF1FFF00, 12}, - {PROC_E_PZ, 0xFFFFFF28, 3}, + {fpcNm_E_YK_e, 0xFFFFFF01, 20}, + {fpcNm_E_YG_e, 0xFFFFFF00, 20}, + {fpcNm_E_PZ_e, 0xFFFF001E, 12}, + {fpcNm_E_S1_e, 0xFFFFEF00, 8}, + {fpcNm_E_YH_e, 0xFF1FFF00, 12}, + {fpcNm_E_PZ_e, 0xFFFFFF28, 3}, }; static const s16 mDBaBa_birthAngle_dt[] = { @@ -2507,7 +2507,7 @@ int daE_PZ_c::create() { } else { if ((arg0 == 0 || arg0 == 1) && bitSw != 0xFF && fopAcM_isSwitch( this, bitSw)) { cXyz pos(0.0f, 0.0f, -1300.0f); - fopAcM_create(PROC_KYTAG12, 1, &pos, fopAcM_GetRoomNo(this), NULL, NULL, -1); + fopAcM_create(fpcNm_KYTAG12_e, 1, &pos, fopAcM_GetRoomNo(this), NULL, NULL, -1); return cPhs_ERROR_e; } @@ -2619,7 +2619,7 @@ int daE_PZ_c::create() { } else if (arg0 != 30 && arg0 != 40) { if (arg0 == 22 || arg0 == 23) { arg0 -= 2; - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } field_0x7c8 = 1.0f; setActionMode(6, 0); @@ -2657,20 +2657,20 @@ static actor_method_class l_daE_PZ_Method = { }; actor_process_profile_definition g_profile_E_PZ = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_PZ, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_PZ_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 175, // mPriority - &l_daE_PZ_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_E_PZ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_PZ_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_PZ_e, + /* Actor SubMtd */ &l_daE_PZ_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_rb.cpp b/src/d/actor/d_a_e_rb.cpp index 1976e43c0f..11d0b52863 100644 --- a/src/d/actor/d_a_e_rb.cpp +++ b/src/d/actor/d_a_e_rb.cpp @@ -508,7 +508,7 @@ static int target_info_count; static void* s_s_sub(void* i_actor, void* i_data) { fopAc_ac_c* parent; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RB && + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RB_e && fopAcM_SearchByID(((fopAc_ac_c*)i_actor)->parentActorID, &parent) && parent != NULL && (fopAc_ac_c*)i_data == parent && target_info_count < 10) { @@ -644,7 +644,7 @@ static void e_rb_base_1(e_rb_class* i_this) { i_this->mode = 0; for (int i = 0; i < i_this->childNum; i++) { - fopAcM_createChild(PROC_E_RB, fopAcM_GetID(enemy), 1, &enemy->current.pos, fopAcM_GetRoomNo(enemy), NULL, NULL, -1, NULL); + fopAcM_createChild(fpcNm_E_RB_e, fopAcM_GetID(enemy), 1, &enemy->current.pos, fopAcM_GetRoomNo(enemy), NULL, NULL, -1, NULL); } } } @@ -793,7 +793,7 @@ static int daE_RB_Create(fopAc_ac_c* i_this) { } for (int i = 0; i < a_this->childNum; i++) { - fopAcM_createChild(PROC_E_RB, fopAcM_GetID(i_this), 1, &i_this->current.pos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1, NULL); + fopAcM_createChild(fpcNm_E_RB_e, fopAcM_GetID(i_this), 1, &i_this->current.pos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1, NULL); } a_this->appearRange = (fopAcM_GetParam(i_this) & 0xFF0000) >> 0x10; @@ -870,18 +870,18 @@ static actor_method_class l_daE_RB_Method = { }; actor_process_profile_definition g_profile_E_RB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_RB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_rb_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 153, // mPriority - &l_daE_RB_Method, // sub_method - 0x10040120, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_RB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_rb_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_RB_e, + /* Actor SubMtd */ &l_daE_RB_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_rd.cpp b/src/d/actor/d_a_e_rd.cpp index 54dec13127..3067cc456a 100644 --- a/src/d/actor/d_a_e_rd.cpp +++ b/src/d/actor/d_a_e_rd.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_rd.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -33,7 +33,7 @@ public: void genMessage(JORMContext*); - /* 0x00 */ s8 field_0x4; + /* 0x00 */ s8 no; /* ライダー (Rider) */ /* 0x08 */ f32 model_size; // 基本サイズ (Basic size) @@ -204,8 +204,29 @@ enum Joint { /* 0x19 */ JNT_YUBIR, }; +#define WEAPON_TYPE_NONE 0 // No weapon (unarmed) +#define WEAPON_TYPE_CLUB 1 // Club / mace +#define WEAPON_TYPE_BOW 2 // Bow (normal arrows) +#define WEAPON_TYPE_FIRE_BOW 3 // Bow (fire arrows) +#define WEAPON_TYPE_BARROW 4 // Bow (bomb arrows) + +#define RIDE_MODE_OFF 0 // On foot (not riding) +#define RIDE_MODE_INIT 1 // Riding (transition to boar) +#define RIDE_MODE_RIDE 2 // Rided (actively riding boar) + + +#define ACTOR_SET_NONE 0 +#define ACTOR_SET_E3_2005 1 // Eldin Field +#define ACTOR_SET_IKKI 2 // Eldin Bridge +#define ACTOR_SET_IKKI2 3 // Lake Hylia Bridge +#define ACTOR_SET_LV9 4 // Hyrule Castle + +#define HORN_MODE_NONE 0 // No horn model active +#define HORN_MODE_PLAY 1 // Horn playing +#define HORN_MODE_SHOOT 2 // Horn shot off + daE_RD_HIO_c::daE_RD_HIO_c() { - field_0x4 = -1; + no = -1; model_size = 1.2f; leader_size_ratio = 1.2f; movement_speed = 3.5f; @@ -284,7 +305,7 @@ void daE_RD_HIO_c::genMessage(JORMContext* ctext) { static fopAc_ac_c* get_pla(fopAc_ac_c* actor) { fopAc_ac_c* pla = dComIfGp_getPlayer(0); // "coach" refers to the Ilia/Telma transport wagon: - fopAc_ac_c* coach = fopAcM_SearchByName(PROC_NPC_COACH); + fopAc_ac_c* coach = fopAcM_SearchByName(fpcNm_NPC_COACH_e); if (coach == NULL) { return dComIfGp_getPlayer(0); @@ -305,7 +326,7 @@ static fopAc_ac_c* get_pla(fopAc_ac_c* actor) { static void anm_init(e_rd_class* i_this, int i_no, f32 i_morf, u8 i_mode, f32 i_speed) { if (i_this->field_0x680 == 0) { - if (i_this->actor_set != 0) { + if (i_this->actor_set != ACTOR_SET_NONE) { if (i_no < 73) { i_this->anm_p->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_rdb", i_no), i_mode, i_morf, i_speed, 0.0f, -1.0f); @@ -324,8 +345,8 @@ static void anm_init(e_rd_class* i_this, int i_no, f32 i_morf, u8 i_mode, f32 i_ } static void horn_anm_init(e_rd_class* i_this, int i_anmID, f32 i_morf, u8 i_mode, f32 i_speed) { - if (i_this->field_0x6a0 != 0) { - i_this->mpMorfHornAnm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_rdb", i_anmID), + if (i_this->horn_mode != HORN_MODE_NONE) { + i_this->horn_anm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_rdb", i_anmID), i_mode, i_morf, i_speed, 0.0f, -1.0f, NULL); } } @@ -340,12 +361,12 @@ static int nodeCallBack(J3DJoint* i_joint, int param_2) { if (i_this != NULL) { MTXCopy(model->getAnmMtx(jointNo), *calc_mtx); if (jointNo == JNT_KOSI) { - if (i_this->field_0x9c8 == 3) { - cMtx_YrotM(*calc_mtx, s16(i_this->field_0x9ca)); + if (i_this->aim_type == 3) { + cMtx_YrotM(*calc_mtx, s16(i_this->aim_angle_y)); } } else if (jointNo == JNT_HIP1) { - if (i_this->field_0x9c8 == 3) { - cMtx_XrotM(*calc_mtx, i_this->field_0x9ca); + if (i_this->aim_type == 3) { + cMtx_XrotM(*calc_mtx, i_this->aim_angle_y); } cMtx_YrotM(*calc_mtx, s16(i_this->field_0xade.y)); @@ -360,33 +381,33 @@ static int nodeCallBack(J3DJoint* i_joint, int param_2) { cMtx_ZrotM(*calc_mtx, i_this->field_0xacc[2]); } else if (jointNo == JNT_MUNE2) { cMtx_YrotM(*calc_mtx, i_this->field_0xa32[1].y); - if (i_this->field_0x9c8 == 3) { - cMtx_XrotM(*calc_mtx, i_this->field_0x9ca); + if (i_this->aim_type == 3) { + cMtx_XrotM(*calc_mtx, i_this->aim_angle_y); } cMtx_ZrotM(*calc_mtx, i_this->field_0xa32[1].x + i_this->field_0xabc[1]); - if (i_this->field_0x9c8 == 4) { - f32 fVarTemp = i_this->field_0x9cc * -1.0f; - cMtx_YrotM(*calc_mtx, fVarTemp); - fVarTemp = i_this->field_0x9cc * 0.3f; - cMtx_XrotM(*calc_mtx, fVarTemp); + if (i_this->aim_type == 4) { + f32 r = i_this->aim_angle_x * -1.0f; + cMtx_YrotM(*calc_mtx, r); + r = i_this->aim_angle_x * 0.3f; + cMtx_XrotM(*calc_mtx, r); } - if (i_this->field_0x9c8 == 3) { - cMtx_ZrotM(*calc_mtx, i_this->field_0x9cc); + if (i_this->aim_type == 3) { + cMtx_ZrotM(*calc_mtx, i_this->aim_angle_x); } } else if (jointNo == JNT_HEAD) { - if (i_this->field_0x9c8 != 3 && i_this->field_0x9c8 != 4) { - cMtx_YrotM(*calc_mtx, (-i_this->field_0x9ca + i_this->field_0x9ce) / 2); - cMtx_ZrotM(*calc_mtx, (-i_this->field_0x9cc + i_this->field_0xa32[0].x + i_this->field_0xabc[0]) / 2); + if (i_this->aim_type != 3 && i_this->aim_type != 4) { + cMtx_YrotM(*calc_mtx, (-i_this->aim_angle_y + i_this->head_angle_y) / 2); + cMtx_ZrotM(*calc_mtx, (-i_this->aim_angle_x + i_this->field_0xa32[0].x + i_this->field_0xabc[0]) / 2); } } else if (jointNo == JNT_KUBI) { cMtx_YrotM(*calc_mtx, i_this->field_0xa32[0].y); - if (i_this->field_0x9c8 != 3 && i_this->field_0x9c8 != 4) { - cMtx_YrotM(*calc_mtx, (-i_this->field_0x9ca + i_this->field_0x9ce) / 2); - cMtx_ZrotM(*calc_mtx, (-i_this->field_0x9cc + i_this->field_0xa32[0].x + i_this->field_0xabc[0]) / 2); + if (i_this->aim_type != 3 && i_this->aim_type != 4) { + cMtx_YrotM(*calc_mtx, (-i_this->aim_angle_y + i_this->head_angle_y) / 2); + cMtx_ZrotM(*calc_mtx, (-i_this->aim_angle_x + i_this->field_0xa32[0].x + i_this->field_0xabc[0]) / 2); } else { cMtx_ZrotM(*calc_mtx, i_this->field_0xa32[0].x + i_this->field_0xabc[0]); } @@ -429,9 +450,9 @@ static int nodeCallBack_B(J3DJoint* i_joint, int param_2) { MTXCopy(model->getAnmMtx(jointNo), *calc_mtx); if (jointNo == JNT_HIP1 || jointNo == JNT_KOKAL) { - cMtx_XrotM(*calc_mtx, i_this->field_0x9ca / 8); + cMtx_XrotM(*calc_mtx, i_this->aim_angle_y / 8); } else if (jointNo == JNT_ASIL || jointNo == JNT_KOKAR) { - cMtx_YrotM(*calc_mtx, -(i_this->field_0x9ca / 3)); + cMtx_YrotM(*calc_mtx, -(i_this->aim_angle_y / 3)); } model->setAnmMtx(jointNo, *calc_mtx); @@ -475,7 +496,7 @@ static int daE_RD_Draw(e_rd_class* i_this) { g_env_light.settingTevStruct(0, &enemy->current.pos, &enemy->tevStr); g_env_light.setLightTevColorType_MAJI(model, &enemy->tevStr); - if (i_this->actor_set == 0 && i_this->field_0x968 != 0) { + if (i_this->actor_set == ACTOR_SET_NONE && i_this->field_0x968 != 0) { model_data = model->getModelData(); for (u16 i = 0; i < model_data->getMaterialNum(); i++) { J3DMaterial* mat_node_p = model_data->getMaterialNodePointer(i); @@ -485,7 +506,7 @@ static int daE_RD_Draw(e_rd_class* i_this) { } } - if (i_this->actor_set == 3) { + if (i_this->actor_set == ACTOR_SET_IKKI2) { J3DShape* shape = model->getModelData()->getMaterialNodePointer(3)->getShape(); if (shape != NULL) { shape->hide(); @@ -494,7 +515,7 @@ static int daE_RD_Draw(e_rd_class* i_this) { i_this->anm_p->entryDL(); - if (i_this->actor_set == 0 && i_this->field_0x968 != 0) { + if (i_this->actor_set == ACTOR_SET_NONE && i_this->field_0x968 != 0) { J3DModelData* modelData = model->getModelData(); for (u16 i = 0; i < modelData->getMaterialNum(); i++) { matNode_p = modelData->getMaterialNodePointer(i); @@ -504,20 +525,20 @@ static int daE_RD_Draw(e_rd_class* i_this) { } } - if (i_this->weapon_type == 1) { - g_env_light.setLightTevColorType_MAJI(i_this->arrow, &enemy->tevStr); - mDoExt_modelUpdateDL(i_this->arrow); - } else if (i_this->weapon_type >= 2) { + if (i_this->weapon_type == WEAPON_TYPE_CLUB) { + g_env_light.setLightTevColorType_MAJI(i_this->arrow_model, &enemy->tevStr); + mDoExt_modelUpdateDL(i_this->arrow_model); + } else if (i_this->weapon_type >= WEAPON_TYPE_BOW) { g_env_light.setLightTevColorType_MAJI(i_this->bow_anm->getModel(), &enemy->tevStr); i_this->bow_anm->entryDL(); - if (i_this->field_0x9a2 != 0) { - g_env_light.setLightTevColorType_MAJI(i_this->arrow, &enemy->tevStr); - mDoExt_modelUpdateDL(i_this->arrow); + if (i_this->arrow_draw != 0) { + g_env_light.setLightTevColorType_MAJI(i_this->arrow_model, &enemy->tevStr); + mDoExt_modelUpdateDL(i_this->arrow_model); } } - if (i_this->actor_set != 0) { + if (i_this->actor_set != ACTOR_SET_NONE) { for (int i = 0; i < 14; i++) { if (i_this->armor_boss_part[i] != NULL) { g_env_light.setLightTevColorType_MAJI(i_this->armor_boss_part[i], &enemy->tevStr); @@ -525,9 +546,9 @@ static int daE_RD_Draw(e_rd_class* i_this) { } } - if (i_this->field_0x6a0 != 0) { - g_env_light.setLightTevColorType_MAJI(i_this->mpMorfHornAnm->getModel(), &enemy->tevStr); - i_this->mpMorfHornAnm->entryDL(); + if (i_this->horn_mode != HORN_MODE_NONE) { + g_env_light.setLightTevColorType_MAJI(i_this->horn_anm->getModel(), &enemy->tevStr); + i_this->horn_anm->entryDL(); } } @@ -546,16 +567,16 @@ static int daE_RD_Draw(e_rd_class* i_this) { } } - if (i_this->ride_mode != 2) { + if (i_this->ride_mode != RIDE_MODE_RIDE) { cXyz pos; pos.set(enemy->current.pos.x, enemy->current.pos.y + 100.0f, enemy->current.pos.z); i_this->shadow_key = dComIfGd_setShadow(i_this->shadow_key, 1, model, &pos, 1200.0f + BREG_F(19), 0.0f, enemy->current.pos.y, - i_this->ObjAcch.GetGroundH(), i_this->ObjAcch.m_gnd, + i_this->Bgc.GetGroundH(), i_this->Bgc.m_gnd, &i_this->enemy.tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); - if (i_this->weapon_type == 1) { - dComIfGd_addRealShadow(i_this->shadow_key, i_this->arrow); + if (i_this->weapon_type == WEAPON_TYPE_CLUB) { + dComIfGd_addRealShadow(i_this->shadow_key, i_this->arrow_model); } } @@ -571,21 +592,21 @@ static int daE_RD_Draw(e_rd_class* i_this) { return 1; } -static BOOL other_bg_check(e_rd_class* i_this, fopAc_ac_c* i_other) { +static BOOL other_bg_check(e_rd_class* i_this, fopAc_ac_c* actor) { fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; dBgS_LinChk lin_chk; cXyz unused_vec; cXyz start; cXyz end; - end = i_other->current.pos; + end = actor->current.pos; end.y += 130.0f; start = enemy->current.pos; start.y = enemy->eyePos.y; lin_chk.Set(&start, &end, enemy); if (dComIfG_Bgsp().LineCross(&lin_chk)) { - if (i_other != dComIfG_Bgsp().GetActorPointer(lin_chk)) { + if (actor != dComIfG_Bgsp().GetActorPointer(lin_chk)) { return TRUE; } } @@ -594,22 +615,22 @@ static BOOL other_bg_check(e_rd_class* i_this, fopAc_ac_c* i_other) { } static BOOL otoCheck(fopAc_ac_c* i_actor, f32 param_2) { - SND_INFLUENCE* sound = dKy_Sound_get(); + SND_INFLUENCE* oto = dKy_Sound_get(); fpc_ProcID uVar1; - if (sound->actor_id != fpcM_ERROR_PROCESS_ID_e && sound->actor_id != fopAcM_GetID(i_actor)) { - cXyz sp8c = sound->position - i_actor->current.pos; + if (oto->actor_id != fpcM_ERROR_PROCESS_ID_e && oto->actor_id != fopAcM_GetID(i_actor)) { + cXyz sp8c = oto->position - i_actor->current.pos; if (sp8c.abs() < param_2) { dBgS_LinChk lin_chk; cXyz start, end; - end = sound->position; + end = oto->position; end.y += 100.0f; start = i_actor->current.pos; start.y += 100.0f; lin_chk.Set(&start, &end, i_actor); if (!dComIfG_Bgsp().LineCross(&lin_chk)) { - return sound->field_0xc; + return oto->field_0xc; } } } @@ -617,16 +638,16 @@ static BOOL otoCheck(fopAc_ac_c* i_actor, f32 param_2) { return FALSE; } -static BOOL pl_pass_check(e_rd_class* i_this, f32 param_2) { +static BOOL pl_pass_check(e_rd_class* i_this, f32 pass) { fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; - fopAc_ac_c* actor = get_pla(enemy); + fopAc_ac_c* pl = get_pla(enemy); cXyz mae, ato; - mae = enemy->current.pos - actor->current.pos; - cMtx_YrotS(*calc_mtx, -(actor->shape_angle.y)); + mae = enemy->current.pos - pl->current.pos; + cMtx_YrotS(*calc_mtx, -(pl->shape_angle.y)); MtxPosition(&mae, &ato); - if (ato.z > param_2) { + if (ato.z > pass) { return TRUE; } @@ -657,7 +678,7 @@ static s8 data_80519230; static void* s_b_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && dBomb_c::checkBombActor((fopAc_ac_c*)i_actor) && + if (fopAcM_IsActor(i_actor) && dBomb_c::checkBombActor((fopAc_ac_c*)i_actor) && !((dBomb_c*)i_actor)->checkStateExplode() && target_info_count < 10) { target_info[target_info_count] = (fopAc_ac_c*)i_actor; target_info_count++; @@ -770,29 +791,29 @@ static void ride_off(e_rd_class* i_this) { e_wb_class* boar = (e_wb_class*)fopAcM_SearchByID(i_this->boar_id); if (boar != NULL) { - UNSET_FLAG(boar->mStatusFlags, i_this->boar_stand, u16); + UNSET_FLAG(boar->status_flag, i_this->boar_stand, u16); i_this->boar_stand = 0; - if (boar->mActionID != 22 && boar->mActionID != 23 && boar->mActionID != 24) { - if (boar->mActionID == 1) { - if ((boar->mStatusFlags & 3) != 0) { - boar->mActionID = 6; + if (boar->action != 22 && boar->action != 23 && boar->action != 24) { + if (boar->action == 1) { + if ((boar->status_flag & 3) != 0) { + boar->action = 6; } else { - boar->mActionID = 0; + boar->action = 0; } - boar->mActionMode = 0; - } else if (boar->mActionID == 21) { - boar->mActionMode = 0; - } else if ((boar->mStatusFlags & 1) == 0) { - if (boar->mActionID == 6 && (boar->mActionMode == 2 || boar->mActionMode == 3)) { - boar->mActionMode = 1; + boar->ride_mode = 0; + } else if (boar->action == 21) { + boar->ride_mode = 0; + } else if ((boar->status_flag & 1) == 0) { + if (boar->action == 6 && (boar->ride_mode == 2 || boar->ride_mode == 3)) { + boar->ride_mode = 1; } else { - boar->mActionMode = 0; + boar->ride_mode = 0; } - boar->mActionID = 7; - boar->field_0x698[1] = cM_rndF(30.0f) + 80.0f; + boar->action = 7; + boar->timer[1] = cM_rndF(30.0f) + 80.0f; } } @@ -800,7 +821,7 @@ static void ride_off(e_rd_class* i_this) { i_this->boar_id = -1; } - i_this->ride_mode = 0; + i_this->ride_mode = RIDE_MODE_OFF; if (i_this->bow_anm != NULL) { i_this->bow_anm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->resName, 10), 0, 1.0f, 1.0f, 0.0f, -1.0f); @@ -811,13 +832,13 @@ static void ride_off(e_rd_class* i_this) { } static void* s_wb_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_WB_e) { e_wb_class* boar = (e_wb_class*) i_actor; e_rd_class* i_this = (e_rd_class*)i_data; - if (boar->mActionID != ACTION_DROP && boar->mActionID != ACTION_DAMAGE - && boar->mActionID != ACTION_A_DAMAGE && boar->mActionID != ACTION_STAND) { - if (i_this->actor_set == boar->field_0x79d && - (data_80519230 != 0 || (boar->mStatusFlags & 3) != 3) && target_info_count < 10) { + if (boar->action != ACTION_DROP && boar->action != ACTION_DAMAGE + && boar->action != ACTION_A_DAMAGE && boar->action != ACTION_STAND) { + if (i_this->actor_set == boar->leader && + (data_80519230 != 0 || (boar->status_flag & 3) != 3) && target_info_count < 10) { target_info[target_info_count] = (fopAc_ac_c*)i_actor; target_info_count++; } @@ -899,11 +920,11 @@ static void wb_check(e_rd_class* i_this, s16 param_2) { boar = (e_wb_class*)fopAcM_SearchByID(i_this->boar_id); if (boar != NULL) { if (desert_substage != 0) { - if (i_this->weapon_type != 1) { - if ((boar->mStatusFlags & 1) == 0) { + if (i_this->weapon_type != WEAPON_TYPE_CLUB) { + if ((boar->status_flag & 1) == 0) { return; } - } else if ((boar->mStatusFlags & 1) != 0) { + } else if ((boar->status_flag & 1) != 0) { return; } } @@ -911,11 +932,11 @@ static void wb_check(e_rd_class* i_this, s16 param_2) { i_this->action = ACTION_WB_SEARCH; i_this->mode = 0; - if ((boar->mStatusFlags & 1) == 0) { - boar->mStatusFlags |= (u16) 1; + if ((boar->status_flag & 1) == 0) { + boar->status_flag |= (u16) 1; i_this->boar_stand = 1; - } else if ((boar->mStatusFlags & 2) == 0) { - boar->mStatusFlags |= (u16) 2; + } else if ((boar->status_flag & 2) == 0) { + boar->status_flag |= (u16) 2; i_this->boar_stand = 2; } } @@ -929,13 +950,13 @@ static BOOL wb_init_ride(e_rd_class* i_this) { if (boar != NULL) { i_this->action = ACTION_WB_RIDE; i_this->mode = 0; - i_this->ride_mode = 2; + i_this->ride_mode = RIDE_MODE_RIDE; i_this->boar_stand = i_this->arg0; - boar->mStatusFlags |= (s8)i_this->arg0; - boar->mActionID = 1; + boar->status_flag |= (s8)i_this->arg0; + boar->action = 1; - if (i_this->weapon_type != 0 && i_this->boar_stand == 1) { - i_this->field_0x5bd = 1; + if (i_this->weapon_type != WEAPON_TYPE_NONE && i_this->boar_stand == 1) { + i_this->armament_flag = 1; } return TRUE; @@ -947,14 +968,14 @@ static BOOL wb_init_ride(e_rd_class* i_this) { static BOOL pl_check(e_rd_class* i_this, f32 range, s16 angle) { fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; - fopAc_ac_c* actor = get_pla(enemy); + fopAc_ac_c* pl = get_pla(enemy); if ((desert_substage == 0 && dComIfGp_event_runCheck())) { return FALSE; } // Hidden Village - if (strcmp(dComIfGp_getStartStageName(), "F_SP128") == 0 && actor->current.pos.z < -9800.0f) { + if (strcmp(dComIfGp_getStartStageName(), "F_SP128") == 0 && pl->current.pos.z < -9800.0f) { return FALSE; } @@ -964,7 +985,7 @@ static BOOL pl_check(e_rd_class* i_this, f32 range, s16 angle) { if (i_this->dis < range) { s16 target = enemy->shape_angle.y - i_this->angleY; - if (target < angle && target > (s16)-angle && !other_bg_check(i_this, actor)) { + if (target < angle && target > (s16)-angle && !other_bg_check(i_this, pl)) { return TRUE; } @@ -1061,8 +1082,8 @@ static BOOL path_check(e_rd_class* i_this) { start = enemy->current.pos; start.y += WREG_F(0) + 10.0f; - dPnt* points = i_this->path->m_points; - for (int i = 0; i < i_this->path->m_num; i++, points++) { + dPnt* points = i_this->ppd->m_points; + for (int i = 0; i < i_this->ppd->m_num; i++, points++) { if (i < 0xFF) { end.x = points->m_position.x; end.y = points->m_position.y + 10.0f + WREG_F(1); @@ -1081,14 +1102,14 @@ static BOOL path_check(e_rd_class* i_this) { bool found = false; f32 reg_f27; // unused for (int i = 0; i < 100;) { - points = i_this->path->m_points; - for (int j = 0; j < i_this->path->m_num; j++, points++) { + points = i_this->ppd->m_points; + for (int j = 0; j < i_this->ppd->m_num; j++, points++) { if (j < 0xFF && check_index[j] != 0) { x = enemy->current.pos.x - points->m_position.x; y = enemy->current.pos.y - points->m_position.y; z = enemy->current.pos.z - points->m_position.z; - if (JMAFastSqrt(x * x + y * y + z * z) < dist) { - i_this->field_0xb00 = j; + if (JMAFastSqrt(SQUARE(x) + SQUARE(y) + SQUARE(z)) < dist) { + i_this->jyunkai_no = j; found = true; break; } @@ -1108,9 +1129,9 @@ static BOOL path_check(e_rd_class* i_this) { } if (cM_rndF(1.0f) < 0.5f) { - i_this->path_dir = 1; // forward + i_this->dir = 1; // forward } else { - i_this->path_dir = 0xFF; // backward + i_this->dir = -1; // backward } return TRUE; @@ -1136,7 +1157,7 @@ static void e_rd_normal(e_rd_class* i_this) { switch (i_this->mode) { case 0: - if (i_this->field_0x5bd != 0) { + if (i_this->armament_flag != 0) { anm_init(i_this, BCK_RD_ARMAMENT, 2.0f, 0, 1.0f); i_this->mode = 1; } else { @@ -1146,7 +1167,7 @@ static void e_rd_normal(e_rd_class* i_this) { case 1: if ((int)i_this->anm_p->getFrame() == 11) { - i_this->field_0x5bd = 0; + i_this->armament_flag = 0; } if (i_this->anm_p->isStop()) { @@ -1156,7 +1177,7 @@ static void e_rd_normal(e_rd_class* i_this) { case 2: if (i_this->timer[0] == 0) { - if (i_this->path != NULL && path_check(i_this)) { + if (i_this->ppd != NULL && path_check(i_this)) { i_this->action = ACTION_JYUNKAI; i_this->mode = 0; return; @@ -1190,7 +1211,7 @@ static void e_rd_normal(e_rd_class* i_this) { break; case 4: - i_this->field_0x9c8 = 0xFF; + i_this->aim_type = -1; if (i_this->timer[0] == 0) { i_this->target_ya = enemy->current.angle.y + 0x8000 + (s16)cM_rndFX(4000.0f); anm_init(i_this, BCK_RD_WALK, 10.0f, 2, 1.0f); @@ -1224,11 +1245,11 @@ static void e_rd_normal(e_rd_class* i_this) { wb_check(i_this, angle); } else { if (pl_check(i_this, range, angle)) { - if (i_this->weapon_type == 1) { + if (i_this->weapon_type == WEAPON_TYPE_CLUB) { i_this->action = ACTION_FIGHT_RUN; i_this->mode = -10; i_this->timer[0] = 60; - } else if (i_this->weapon_type >= 2) { + } else if (i_this->weapon_type >= WEAPON_TYPE_BOW) { i_this->action = ACTION_BOW_RUN; i_this->mode = -10; } @@ -1264,8 +1285,8 @@ static void e_rd_fight_run(e_rd_class* i_this) { dash_speed = l_HIO.dash_speed; } - if (i_this->weapon_type != 1) { - if (i_this->weapon_type >= 2) { + if (i_this->weapon_type != WEAPON_TYPE_CLUB) { + if (i_this->weapon_type >= WEAPON_TYPE_BOW) { i_this->action = ACTION_BOW_RUN; } else { i_this->action = ACTION_NORMAL; @@ -1280,7 +1301,7 @@ static void e_rd_fight_run(e_rd_class* i_this) { switch (i_this->mode) { case -20: if ((int)i_this->anm_p->getFrame() == 11) { - i_this->field_0x5bd = 0; + i_this->armament_flag = 0; } if (i_this->anm_p->isStop()) { @@ -1291,7 +1312,7 @@ static void e_rd_fight_run(e_rd_class* i_this) { case -10: anm_init(i_this, BCK_RD_WAIT01, 7.0f, 2, 1.0f); i_this->timer[1] = cM_rndF(10.0f) + 15.0f; - i_this->mode = 0xFFF7; + i_this->mode = -9; break; case -9: @@ -1301,9 +1322,9 @@ static void e_rd_fight_run(e_rd_class* i_this) { break; case 0: - if (i_this->field_0x5bd != 0) { + if (i_this->armament_flag != 0) { anm_init(i_this, BCK_RD_ARMAMENT, 2.0f, 0, 1.0f); - i_this->mode = 0xFFEC; + i_this->mode = -20; } else if (i_this->timer[1] == 0) { anm_init(i_this, BCK_RD_RUN, 5.0f, 2, cM_rndFX(0.05f) + 1.0f); i_this->mode = 1; @@ -1336,7 +1357,7 @@ static void e_rd_fight_run(e_rd_class* i_this) { case 5: if (i_this->timer[3] != 0) { - i_this->field_0x9c8 = 0xFF; + i_this->aim_type = -1; } speed = 0.0f; @@ -1382,7 +1403,7 @@ static void e_rd_fight_run(e_rd_class* i_this) { i_this->action = ACTION_AVOID; i_this->mode = 0; i_this->damage_timer = 20; - } else if (i_this->field_0x5bd == 0 && i_this->dis < l_HIO.attack_init_range && i_this->timer[2] == 0) { + } else if (i_this->armament_flag == 0 && i_this->dis < l_HIO.attack_init_range && i_this->timer[2] == 0) { i_this->timer[2] = cM_rndF(20.0f) + 20.0f; f32 rnd = 0.5f; if (cM_rndF(1.0f) < rnd) { @@ -1400,8 +1421,8 @@ static void e_rd_fight_run(e_rd_class* i_this) { } } - if (i_this->action == ACTION_FIGHT_RUN && i_this->field_0x9c8 >= 0) { - i_this->field_0x9c8 = 1; + if (i_this->action == ACTION_FIGHT_RUN && i_this->aim_type >=0) { + i_this->aim_type = 1; } } } @@ -1414,8 +1435,8 @@ static fopAc_ac_c* at_hit_check(e_rd_class* i_this) { } if (i_this->at_sph.ChkAtHit()) { - cCcD_Obj* at_hit_obj_p = i_this->at_sph.GetAtHitObj(); - actor = dCc_GetAc(at_hit_obj_p->GetAc()); + cCcD_Obj* at_hit = i_this->at_sph.GetAtHitObj(); + actor = dCc_GetAc(at_hit->GetAc()); return actor; } @@ -1514,7 +1535,7 @@ static void e_rd_fight(e_rd_class* i_this) { cLib_addCalc0(&enemy->speedF, 1.0f, 3.0f); if (i_this->field_0x9ab != 0) { fopAc_ac_c* actor = at_hit_check(i_this); - if (actor != NULL && fopAcM_GetName(actor) == PROC_ALINK) { + if (actor != NULL && fopAcM_GetName(actor) == fpcNm_ALINK_e) { if (daPy_getPlayerActorClass()->checkPlayerGuard()) { i_this->anm_p->setPlaySpeed(-1.0f); dComIfGp_getVibration().StartShock(4, 31, cXyz(0.0f, 1.0f, 0.0f)); @@ -1542,7 +1563,7 @@ static void e_rd_bow_run(e_rd_class* i_this) { switch (i_this->mode) { case -20: if ((int)i_this->anm_p->getFrame() == 11) { - i_this->field_0x5bd = 0; + i_this->armament_flag = 0; } if (i_this->anm_p->isStop()) { @@ -1553,20 +1574,20 @@ static void e_rd_bow_run(e_rd_class* i_this) { case -10: anm_init(i_this, BCK_RD_WAIT01, 5.0f, 2, 1.0f); i_this->timer[0] = cM_rndF(10.0f) + 15.0f; - i_this->mode = 0xFFF7; + i_this->mode = -9; break; case -9: - i_this->field_0x9c8 = 1; + i_this->aim_type = 1; if (i_this->timer[0] == 0) { i_this->mode = 0; } break; case 0: - if (i_this->field_0x5bd != 0) { + if (i_this->armament_flag != 0) { anm_init(i_this, BCK_RD_ARMAMENT, 2.0f, 0, 1.0f); - i_this->mode = 0xFFEC; + i_this->mode = -20; } else { anm_init(i_this, BCK_RD_RUN, 5.0f, 2, 1.0f); i_this->timer[0] = cM_rndF(50.0f) + 20.0f; @@ -1583,7 +1604,7 @@ static void e_rd_bow_run(e_rd_class* i_this) { case 1: speed = dash_speed; ANGLE_ADD_2(target_angle, 0x8000); - if (i_this->dis > l_HIO.attack_range || i_this->timer[0] == 0 || i_this->ObjAcch.ChkWallHit() || move_gake_check(i_this, 100.0f)) { + if (i_this->dis > l_HIO.attack_range || i_this->timer[0] == 0 || i_this->Bgc.ChkWallHit() || move_gake_check(i_this, 100.0f)) { bVar1 = 1; } @@ -1603,7 +1624,7 @@ static void e_rd_bow_run(e_rd_class* i_this) { cLib_addCalcAngleS2(&enemy->current.angle.y, target_angle, 4, 0x1000); } - if (i_this->field_0x5bd == 0 && bVar1) { + if (i_this->armament_flag == 0 && bVar1) { if (i_this->arg2 == 3) { i_this->action = ACTION_BOW2; } else { @@ -1626,7 +1647,7 @@ static void e_rd_bow_run(e_rd_class* i_this) { } if (i_this->action != ACTION_BOW_RUN) { - i_this->field_0x9c8 = 0; + i_this->aim_type = 0; } } @@ -1645,9 +1666,9 @@ static void e_rd_bow(e_rd_class* i_this) { break; case 1: - i_this->field_0x9c8 = 4; + i_this->aim_type = 4; if (frame >= 10) { - i_this->field_0x9a2 = 1; + i_this->arrow_draw = TRUE; } if (frame == 20) { @@ -1662,7 +1683,7 @@ static void e_rd_bow(e_rd_class* i_this) { break; case 2: - i_this->field_0x9c8 = 4; + i_this->aim_type = 4; if (i_this->timer[0] == 0) { if (i_this->field_0x9a4 == 0 && !dMsgObject_isTalkNowCheck()) { anm_init(i_this, BCK_RD_SHOOT, 1.0f, 0, 1.0f); @@ -1674,13 +1695,13 @@ static void e_rd_bow(e_rd_class* i_this) { } } - i_this->field_0x9a2 = 1; + i_this->arrow_draw = TRUE; break; case 3: if (frame <= 3 + XREG_S(5)) { - i_this->field_0x9a2 = 1; - i_this->field_0x9c8 = 4; + i_this->arrow_draw = TRUE; + i_this->aim_type = 4; } if (frame == 2 + XREG_S(7)) { @@ -1705,7 +1726,7 @@ static void e_rd_bow(e_rd_class* i_this) { } static void* s_command3_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && i_actor != i_data && ((e_rd_class*)i_actor)->action == ACTION_COMMANDER) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RD_e && i_actor != i_data && ((e_rd_class*)i_actor)->action == ACTION_COMMANDER) { return i_actor; } @@ -1753,9 +1774,9 @@ static s8 e_rd_bow2(e_rd_class* i_this) { break; case 3: - i_this->field_0x9c8 = 4; + i_this->aim_type = 4; if (frame >= 10) { - i_this->field_0x9a2 = 1; + i_this->arrow_draw = TRUE; } if (frame == 20) { @@ -1770,7 +1791,7 @@ static s8 e_rd_bow2(e_rd_class* i_this) { break; case 4: - i_this->field_0x9c8 = 4; + i_this->aim_type = 4; if (i_this->timer[0] == 0) { if (i_this->dis > i_this->attack_range || other_bg_check(i_this, actor)) { i_this->mode = 0; @@ -1784,13 +1805,13 @@ static s8 e_rd_bow2(e_rd_class* i_this) { } } - i_this->field_0x9a2 = 1; + i_this->arrow_draw = TRUE; break; case 5: if (frame <= 3 + XREG_S(5)) { - i_this->field_0x9a2 = 1; - i_this->field_0x9c8 = 4; + i_this->arrow_draw = TRUE; + i_this->aim_type = 4; } if (frame == 2 + XREG_S(7)) { @@ -1832,7 +1853,7 @@ static void e_rd_bow_ikki(e_rd_class* i_this) { case 1: if (frame >= 10) { - i_this->field_0x9a2 = 1; + i_this->arrow_draw = TRUE; } if (frame == 20) { @@ -1852,16 +1873,16 @@ static void e_rd_bow_ikki(e_rd_class* i_this) { i_this->mode = 3; } - i_this->field_0x9a2 = 1; + i_this->arrow_draw = TRUE; break; case 3: if (frame <= 3 + XREG_S(5)) { - i_this->field_0x9a2 = 1; + i_this->arrow_draw = TRUE; } if (frame == 2 + XREG_S(7)) { - i_this->arrow_flag = 1; + i_this->arrow_flag = TRUE; } if (i_this->anm_p->isStop()) { @@ -1871,7 +1892,7 @@ static void e_rd_bow_ikki(e_rd_class* i_this) { break; } - i_this->field_0x9c8 = 14; + i_this->aim_type = 14; i_this->eye.set(34800.0f, 100.0f, -14900.0f); vec_0x24 = i_this->eye - enemy->current.pos; enemy->current.angle.y = cM_atan2s(vec_0x24.x, vec_0x24.z); @@ -1898,7 +1919,7 @@ static void e_rd_avoid(e_rd_class* i_this) { break; case 2: - if (i_this->ObjAcch.ChkGroundHit()) { + if (i_this->Bgc.ChkGroundHit()) { i_this->anm_p->setPlaySpeed(1.0f); i_this->mode = 3; } @@ -1924,20 +1945,20 @@ static void e_rd_wb_search(e_rd_class* i_this) { if (actor == NULL) { bVar1 = 1; } else { - if (boar->mActionID == 22 || boar->mActionID == 21 || boar->mActionID == 23 || boar->mActionID == 24) { + if (boar->action == 22 || boar->action == 21 || boar->action == 23 || boar->action == 24) { bVar1 = 1; } else if (i_this->mode <= 3) { for (int i = 0; i <= 2; i++) { if (i_this->cc_sph[i].ChkCoHit()) { cCcD_Obj* co_hit_obj_p = i_this->cc_sph[i].GetCoHitObj(); fopAc_ac_c* hit_actor = dCc_GetAc(co_hit_obj_p->GetAc()); - if (hit_actor != NULL && hit_actor != actor && fopAcM_GetName(hit_actor) == PROC_E_WB) { + if (hit_actor != NULL && hit_actor != actor && fopAcM_GetName(hit_actor) == fpcNm_E_WB_e) { bVar1 = 1; } } } - if (i_this->ObjAcch.ChkWallHit()) { + if (i_this->Bgc.ChkWallHit()) { bVar1 = 1; } } @@ -1948,9 +1969,9 @@ static void e_rd_wb_search(e_rd_class* i_this) { i_this->mode = 0; ride_off(i_this); } else { - if (i_this->mode >= 2 && boar->mActionID != 1) { - boar->mActionID = 1; - boar->mActionMode = 0; + if (i_this->mode >= 2 && boar->action != 1) { + boar->action = 1; + boar->ride_mode = 0; } switch (i_this->mode) { @@ -1960,7 +1981,7 @@ static void e_rd_wb_search(e_rd_class* i_this) { i_this->timer[0] = cM_rndF(15.0f) + 15.0f; // fallthrough case 1: - i_this->field_0x9c8 = 11; + i_this->aim_type = 11; if (i_this->timer[0] == 0) { i_this->mode = 2; if (actor->speedF > 5.0f) { @@ -1976,7 +1997,7 @@ static void e_rd_wb_search(e_rd_class* i_this) { case 2: mae = actor->current.pos - enemy->current.pos; cLib_addCalcAngleS2(&enemy->current.angle.y, cM_atan2s(mae.x, mae.z), 4, 0x800); - i_this->field_0x9c8 = 11; + i_this->aim_type = 11; if (i_this->timer[0] == 0 && actor->speedF < 1.0f) { cXyz sp6c, sp78; @@ -2054,15 +2075,15 @@ static void e_rd_wb_search(e_rd_class* i_this) { } else { mae.z = -20.0f; } - MtxPosition(&mae, &i_this->field_0x5c0); + MtxPosition(&mae, &i_this->find_pos); - i_this->field_0x5c0 += actor->current.pos; - mae = i_this->field_0x5c0 - enemy->current.pos; + i_this->find_pos += actor->current.pos; + mae = i_this->find_pos - enemy->current.pos; cLib_addCalcAngleS2(&enemy->current.angle.y, (s16)cM_atan2s(mae.x, mae.z), 2, 0x1000); - if (i_this->weapon_type != 0 && i_this->boar_stand == 1) { + if (i_this->weapon_type != WEAPON_TYPE_NONE && i_this->boar_stand == 1) { if ((int)i_this->anm_p->getFrame() == 11) { - i_this->field_0x5bd = 1; + i_this->armament_flag = 1; } if (i_this->anm_p->isStop()) { @@ -2081,18 +2102,18 @@ static void e_rd_wb_search(e_rd_class* i_this) { if (i_this->anm_p->isStop()) { i_this->mode = 6; anm_init(i_this, BCK_RD_JUMP_B, 10.0f, 0, 1.0f); - i_this->ride_mode = 1; - i_this->field_0x9c4 = 30.0f; + i_this->ride_mode = RIDE_MODE_INIT; + i_this->mount_jump_speed = 30.0f; i_this->timer[3] = 20; } break; case 6: - if (i_this->field_0x9c0 <= 0.0f) { + if (i_this->mount_jump_y <= 0.0f) { i_this->action = ACTION_WB_RIDE; i_this->mode = 0; - boar->mActionID = 4; - boar->mActionMode = 0; + boar->action = 4; + boar->ride_mode = 0; } } @@ -2114,10 +2135,10 @@ static void e_rd_wb_ride(e_rd_class* i_this) { } e_wb_class* boar = (e_wb_class*) actor; - if ((boar->mStatusFlags & 3) == 0) { + if ((boar->status_flag & 3) == 0) { OS_REPORT("......BOSS DL !!!!\n"); - if (boar->mActionID == 1) { - boar->mActionID = 0; + if (boar->action == 1) { + boar->action = 0; } fopAcM_delete(enemy); return; @@ -2126,44 +2147,44 @@ static void e_rd_wb_ride(e_rd_class* i_this) { switch (i_this->mode) { case 0: { i_this->mode = 1; - if (i_this->actor_set == 0) { + if (i_this->actor_set == ACTOR_SET_NONE) { anm_init(i_this, BCK_RD_JUMP_C, 1.0f, 0, 1.0f); } } // fallthrough case 1: { - if (i_this->anm_p->isStop() || i_this->actor_set != 0) { - if (i_this->actor_set != 0) { - boar->mActionMode = 0; + if (i_this->anm_p->isStop() || i_this->actor_set != ACTOR_SET_NONE) { + if (i_this->actor_set != ACTOR_SET_NONE) { + boar->ride_mode = 0; i_this->mode = 0; - if (i_this->actor_set == 3) { - boar->mActionID = 17; + if (i_this->actor_set == ACTOR_SET_IKKI2) { + boar->action = 17; // Hyrule Field if (strcmp(dComIfGp_getStartStageName(), "F_SP121") == 0) { - boar->mActionMode = -100; + boar->ride_mode = -100; i_this->action = ACTION_IKKI2_START; } else { i_this->action = ACTION_WB_RUN; } - } else if (i_this->actor_set == 2) { - boar->mActionID = 15; + } else if (i_this->actor_set == ACTOR_SET_IKKI) { + boar->action = 15; i_this->action = ACTION_WB_RUN; - } else if (i_this->actor_set == 4) { - boar->mActionID = 19; + } else if (i_this->actor_set == ACTOR_SET_LV9) { + boar->action = 19; i_this->action = ACTION_LV9_END; } else if (cDmr_SkipInfo == 0) { i_this->action = ACTION_KIBA_START; - boar->mActionID = 30; + boar->action = 30; } else { - boar->mActionID = 8; + boar->action = 8; i_this->action = ACTION_WB_RUN; - boar->field_0x79c = 10; + boar->start_timer = 10; Z2GetAudioMgr()->subBgmStart(Z2BGM_HORSE_BATTLE); } } else { - boar->mActionID = 6; - boar->mActionMode = 0; + boar->action = 6; + boar->ride_mode = 0; i_this->action = ACTION_WB_RUN; i_this->mode = 0; } @@ -2187,7 +2208,7 @@ static void e_rd_wb_run(e_rd_class* i_this) { fopAcM_setStageLayer(enemy); } - if ((boar->mStatusFlags & 3) == 0) { + if ((boar->status_flag & 3) == 0) { fopAcM_delete(enemy); return; } @@ -2199,7 +2220,7 @@ static void e_rd_wb_run(e_rd_class* i_this) { } } - if ((boar->mStatusFlags & 1) == 0 && boar->mActionID == ACTION_BOW2 && i_this->mode != 40) { + if ((boar->status_flag & 1) == 0 && boar->action == ACTION_BOW2 && i_this->mode != 40) { anm_init(i_this, BCK_RD_RRUN02_BACK, 5.0f, 2, 1.0f); i_this->mode = 40; @@ -2214,9 +2235,9 @@ static void e_rd_wb_run(e_rd_class* i_this) { switch (i_this->mode) { case 0: - if ((boar->mStatusFlags & 4) != 0) { + if ((boar->status_flag & 4) != 0) { if (i_this->boar_stand == 1) { - if (boar->field_0x6d0 < 0) { + if (boar->range < 0) { anm_init(i_this, BCK_RD_RSTEP_L, 10.0f, 2, 1.0f); } else { anm_init(i_this, BCK_RD_RSTEP_R, 10.0f, 2, 1.0f); @@ -2225,7 +2246,7 @@ static void e_rd_wb_run(e_rd_class* i_this) { anm_init(i_this, BCK_RD_RSTEP_BACK, 10.0f, 2, 1.0f); } } else { - if ((boar->mStatusFlags & 8) != 0) { + if ((boar->status_flag & 8) != 0) { if (i_this->boar_stand == 1) { anm_init(i_this, BCK_RD_RDAMAGE, 3.0f, 0, 1.0f); } else { @@ -2234,14 +2255,14 @@ static void e_rd_wb_run(e_rd_class* i_this) { i_this->timer[1] = cM_rndF(50.0f) + 50.0f; } else { - if ((boar->mStatusFlags & 16) != 0) { + if ((boar->status_flag & 16) != 0) { if (i_this->boar_stand == 1) { anm_init(i_this, BCK_RD_RRUN, 5.0f, 2, 1.0f); } else { anm_init(i_this, BCK_RD_RRUN_BACK, 5.0f, 2, 1.0f); } } else { - if ((boar->mStatusFlags & 32) != 0) { + if ((boar->status_flag & 32) != 0) { if (i_this->boar_stand == 1) { anm_init(i_this, BCK_RD_RWAIT, 5.0f, 2, 1.0f); } else { @@ -2252,13 +2273,13 @@ static void e_rd_wb_run(e_rd_class* i_this) { } } - i_this->anm_p->setPlaySpeed(boar->mpModelMorf->getPlaySpeed()); + i_this->anm_p->setPlaySpeed(boar->anm_p->getPlaySpeed()); if (i_this->boar_stand == 1) { - i_this->field_0x9c8 = 2; + i_this->aim_type = 2; } else { - i_this->field_0x9c8 = 1; - if (i_this->weapon_type == 1 && actor->speedF > 10.0f) { + i_this->aim_type = 1; + if (i_this->weapon_type == WEAPON_TYPE_CLUB && actor->speedF > 10.0f) { if (player_dist < TREG_F(11) + 850.0f && player_dist < TREG_F(11) + 750.0f && i_this->timer[2] == 0) { s16 range = enemy->shape_angle.y - i_this->angleY; @@ -2273,7 +2294,7 @@ static void e_rd_wb_run(e_rd_class* i_this) { } } } else { - if (i_this->timer[1] == 0 && i_this->weapon_type >= 2) { + if (i_this->timer[1] == 0 && i_this->weapon_type >= WEAPON_TYPE_BOW) { anm_init(i_this, BCK_RD_RSHOOT_READY, 5.0f, 0, 1.0f); i_this->bow_anm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->resName, BCK_RD_BOW_RREADY), 0, 5.0f, 1.0f, 0.0f, -1.0f); i_this->mode = 30; @@ -2349,7 +2370,7 @@ static void e_rd_wb_run(e_rd_class* i_this) { break; case 30: - i_this->field_0x9c8 = 3; + i_this->aim_type = 3; if (frame == 14) { i_this->sound.startCreatureSound(Z2SE_OBJ_ARROW_DRAW_NORMAL, 0, -1); } @@ -2359,11 +2380,11 @@ static void e_rd_wb_run(e_rd_class* i_this) { anm_init(i_this, BCK_RD_RSHOOT_WAIT, 4.0f, 2, 1.0f); } - i_this->field_0x9a2 = 1; + i_this->arrow_draw = 1; break; case 31: - i_this->field_0x9c8 = 3; + i_this->aim_type = 3; if (i_this->timer[1] == 0 && i_this->dis < l_HIO.mounted_launch_distance && i_this->field_0x9a4 == 0 && !dComIfGp_event_runCheck()) { anm_init(i_this, BCK_RD_RSHOOT, 1.0f, 0, 1.0f); @@ -2372,19 +2393,19 @@ static void e_rd_wb_run(e_rd_class* i_this) { i_this->mode = 32; } - i_this->field_0x9a2 = 1; + i_this->arrow_draw = TRUE; break; case 32: if (frame <= 3 + XREG_S(5)) { - i_this->field_0x9a2 = 1; + i_this->arrow_draw = TRUE; } if (frame == 2 + XREG_S(7)) { - i_this->arrow_flag = 1; + i_this->arrow_flag = TRUE; } - i_this->field_0x9c8 = 3; + i_this->aim_type = 3; if (i_this->anm_p->isStop()) { anm_init(i_this, BCK_RD_RSHOOT_READY, 5.0f, 0, 1.0f); @@ -2392,7 +2413,7 @@ static void e_rd_wb_run(e_rd_class* i_this) { 0, 5.0f, 1.0f, 0.0f, -1.0f); i_this->mode = 30; - if (i_this->ride_mode == 2 && i_this->field_0x5bb != 0) { + if (i_this->ride_mode == RIDE_MODE_RIDE && i_this->field_0x5bb != 0) { i_this->timer[1] = cM_rndF(30.0f) + 20.0f; } else { i_this->timer[1] = cM_rndF(50.0f) + 30.0f; @@ -2401,7 +2422,7 @@ static void e_rd_wb_run(e_rd_class* i_this) { break; case 40: - if (boar->mActionID != 7) { + if (boar->action != 7) { i_this->mode = 0; anm_init(i_this, BCK_RD_RWAIT_BACK, 5.0f, 2, 1.0f); } @@ -2425,11 +2446,11 @@ static void e_rd_wb_run(e_rd_class* i_this) { } static void* s_wbrun_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_WB_e) { e_wb_class* boar = (e_wb_class*)i_actor; fopAc_ac_c* actor = (fopAc_ac_c*)i_data; - if (boar->field_0x79d == 0) { - cXyz sp24(boar->mEnemy.current.pos - actor->current.pos); + if (boar->leader == 0) { + cXyz sp24(boar->enemy.current.pos - actor->current.pos); if (sp24.abs() > KREG_F(11) + 7000.0f) { return i_actor; } @@ -2446,7 +2467,7 @@ static void e_rd_wb_run_B(e_rd_class* i_this) { dAttention_c* attention; if (actor != NULL) { - if (i_this->actor_set == 2 || i_this->actor_set == 3) { + if (i_this->actor_set == ACTOR_SET_IKKI || i_this->actor_set == ACTOR_SET_IKKI2) { fopAcM_OffStatus(enemy, 0); enemy->attention_info.flags = 0; } @@ -2461,20 +2482,20 @@ static void e_rd_wb_run_B(e_rd_class* i_this) { switch (i_this->mode) { case 0: { - if ((boar->mStatusFlags & 0x400) != 0) { + if ((boar->status_flag & 0x400) != 0) { anm_init(i_this, e_rdb_class::BCK_RB_RSTARTLOOP, 10.0f, 2, 1.0f); - } else if ((boar->mStatusFlags & 0x800) != 0) { + } else if ((boar->status_flag & 0x800) != 0) { anm_init(i_this, e_rdb_class::BCK_RB_RSTART, 10.0f, 2, 1.0f); } - i_this->anm_p->setPlaySpeed(boar->mpModelMorf->getPlaySpeed()); + i_this->anm_p->setPlaySpeed(boar->anm_p->getPlaySpeed()); break; } } if (i_this->anm == e_rdb_class::BCK_RB_RGUARD_F || i_this->anm == e_rdb_class::BCK_RB_RDAMAGEB || i_this->anm == e_rdb_class::BCK_RB_RGUARD_L || i_this->anm == e_rdb_class::BCK_RB_RGUARD_R) { - i_this->field_0x9c8 = 0; + i_this->aim_type = 0; if (i_this->anm_p->isStop()) { anm_init(i_this, e_rdb_class::BCK_RB_RRUN, 5.0f, 2, 1.0f); @@ -2491,14 +2512,14 @@ static void e_rd_wb_run_B(e_rd_class* i_this) { } if (i_this->timer[2] != 0) { - i_this->field_0x9c8 = 1; + i_this->aim_type = 1; } if (enemy->speedF < 5.0f) { anm_init(i_this, e_rdb_class::BCK_RB_RWAIT, 5.0f, 2, 1.0f); } } else { - i_this->field_0x9c8 = 1; + i_this->aim_type = 1; if (i_this->timer[3] < 200) { i_this->timer[3] = cM_rndF(100.0f) + 200.0f; } @@ -2515,7 +2536,7 @@ static void e_rd_wb_run_B(e_rd_class* i_this) { } // check if we need to jump a fence - if ((boar->mStatusFlags & 0x100) != 0) { + if ((boar->status_flag & 0x100) != 0) { i_this->action = ACTION_WB_BJUMP; i_this->mode = 0; } @@ -2553,7 +2574,7 @@ static void e_rd_wb_bjump(e_rd_class* i_this) { break; case 2: - if ((boar->mStatusFlags & 0x200) != 0) { + if ((boar->status_flag & 0x200) != 0) { anm_init(i_this, BCK_RD_RUN02, 2.0f, 0, 1.0f); i_this->mode = 3; } @@ -2600,7 +2621,7 @@ static void e_rd_bomb_action(e_rd_class* i_this) { case 2: if (bomb->speedF < 0.1f && !bomb->checkStateCarry()) { - if (JMAFastSqrt(mae.x * mae.x + mae.z * mae.z) < 250.0f) { + if (JMAFastSqrt(SQUARE(mae.x) + SQUARE(mae.z)) < 250.0f) { range = i_this->angleY - enemy->shape_angle.y; if (range < 0x4000 && range > -0x4000) { i_this->mode = 5; @@ -2611,7 +2632,7 @@ static void e_rd_bomb_action(e_rd_class* i_this) { ANGLE_ADD_2(angle, 0x8000); speed = l_HIO.dash_speed; - if (JMAFastSqrt(mae.x * mae.x + mae.z * mae.z) > 600.0f) { + if (JMAFastSqrt(SQUARE(mae.x) + SQUARE(mae.z)) > 600.0f) { i_this->mode = 3; anm_init(i_this, BCK_RD_WAIT01, 5.0f, 2, 1.0f); } @@ -2619,7 +2640,7 @@ static void e_rd_bomb_action(e_rd_class* i_this) { case 3: angle = i_this->angleY; - if (JMAFastSqrt(mae.x * mae.x + mae.z * mae.z) < 500.0f) { + if (JMAFastSqrt(SQUARE(mae.x) + SQUARE(mae.z)) < 500.0f) { i_this->mode = 0; } break; @@ -2629,7 +2650,7 @@ static void e_rd_bomb_action(e_rd_class* i_this) { i_this->field_0x9ad = 0; if (bomb->speedF > 0.1f) { i_this->mode = 0; - } else if (JMAFastSqrt(mae.x * mae.x + mae.z * mae.z) < 100.0f) { + } else if (JMAFastSqrt(SQUARE(mae.x) + SQUARE(mae.z)) < 100.0f) { i_this->timer[0] = 20; i_this->mode = 6; anm_init(i_this, BCK_RD_KICK, 3.0f, 0, 1.0f); @@ -2663,7 +2684,7 @@ static void e_rd_bomb_action(e_rd_class* i_this) { cLib_addCalc2(&enemy->speedF, speed, 1.0f, 5.0f); cLib_addCalcAngleS2(&enemy->current.angle.y, angle, 4, 0x1000); - i_this->field_0x9c8 = 11; + i_this->aim_type = 11; i_this->eye = bomb->current.pos; } @@ -2678,7 +2699,7 @@ static void e_rd_s_damage(e_rd_class* i_this) { if (i_this->boar_stand != 0) { e_wb_class* boar = (e_wb_class*)fopAcM_SearchByID(i_this->boar_id); if (boar != NULL) { - UNSET_FLAG(boar->mStatusFlags, i_this->boar_stand, u16); + UNSET_FLAG(boar->status_flag, i_this->boar_stand, u16); } i_this->boar_stand = 0; @@ -2693,9 +2714,9 @@ static void e_rd_s_damage(e_rd_class* i_this) { if (i_this->anm_p->isStop()) { fopAc_ac_c* actor; - if (i_this->prev_action == 7) { + if (i_this->old_action == 7) { i_this->action = ACTION_BOW2; - } else if (i_this->prev_action == 26) { + } else if (i_this->old_action == 26) { i_this->action = ACTION_BOW3; } else if (!other_bg_check(i_this, actor = dComIfGp_getPlayer(0))) { i_this->action = ACTION_FIGHT_RUN; @@ -2762,7 +2783,7 @@ static void rd_disappear(e_rd_class* i_this) { MtxPosition(&mae, &ato); u8 type = 0; - if (fopAcM_SearchByName(PROC_NPC_COACH) != NULL) { + if (fopAcM_SearchByName(fpcNm_NPC_COACH_e) != NULL) { fopAcM_createDisappear(enemy, &ato, 10, type, 51); } else { fopAcM_createDisappear(enemy, &ato, 10, type, 11); @@ -2778,9 +2799,9 @@ static void rd_disappear(e_rd_class* i_this) { if (i_this->boar_stand != 0) { e_wb_class* boar = (e_wb_class*)fopAcM_SearchByID(i_this->boar_id); if (boar != NULL) { - UNSET_FLAG(boar->mStatusFlags, i_this->boar_stand, u16); - if (boar->mActionID == 1) { - boar->mActionID = 0; + UNSET_FLAG(boar->status_flag, i_this->boar_stand, u16); + if (boar->action == 1) { + boar->action = 0; } } } @@ -2864,7 +2885,7 @@ static void e_rd_damage(e_rd_class* i_this) { daPy_getPlayerActorClass()->onEnemyDead(); if (desert_substage != 0) { - i_this->field_0x5ba = 0; + i_this->scene_no = 0; } } else { i_this->sound.startCreatureVoice(Z2SE_EN_RD_V_DAMAGE, -1); @@ -2874,7 +2895,7 @@ static void e_rd_damage(e_rd_class* i_this) { break; case 1: - if (i_this->ObjAcch.ChkWallHit() != 0 && i_this->timer[0] == 0) { + if (i_this->Bgc.ChkWallHit() != 0 && i_this->timer[0] == 0) { int kado_kabe; if ((kado_kabe = kado_check(i_this)) != 0) { OS_REPORT(" ..KADO KABE ..%x\n", kado_kabe); @@ -2906,8 +2927,8 @@ static void e_rd_damage(e_rd_class* i_this) { actor->current.angle.y += i_this->field_0x9f6; actor->shape_angle.y = actor->current.angle.y; - if (i_this->jump_angle.x <= -0x3000 && i_this->ObjAcch.ChkGroundHit()) { - i_this->field_0xa1e = 10; + if (i_this->jump_angle.x <= -0x3000 && i_this->Bgc.ChkGroundHit()) { + i_this->jump_timer = 10; if (i_this->field_0x1294 != 0) { i_this->sound.startCreatureSound(Z2SE_CM_BODYFALL_ASASE_M, 0, -1); @@ -2955,13 +2976,13 @@ static void e_rd_damage(e_rd_class* i_this) { actor->shape_angle.y = actor->current.angle.y; cLib_addCalcAngleS2(&i_this->jump_angle.x, -0x4000, 1, 0x300 + BREG_S(4)); - if (i_this->ObjAcch.ChkGroundHit()) { + if (i_this->Bgc.ChkGroundHit()) { if (actor->health > 0 && daPy_py_c::checkNowWolf() == 0) { enemy->onDownFlg(); } dKy_Sound_set(actor->current.pos, 100, fopAcM_GetID(i_this), 5); - i_this->field_0xa1e = 10; + i_this->jump_timer = 10; if (i_this->field_0xa1f == 0) { anm_init(i_this, BCK_RD_DIEA, 3.0f, 0, 1.0f); @@ -3027,7 +3048,7 @@ static void e_rd_damage(e_rd_class* i_this) { cLib_addCalcAngleS2(&i_this->jump_angle.x, 0, 1, 0x300 + BREG_S(4)); } else { cLib_addCalcAngleS2(&i_this->jump_angle.x, -0x4000, 1, 0x800 + BREG_S(5)); - if (i_this->ObjAcch.ChkGroundHit()) { + if (i_this->Bgc.ChkGroundHit()) { i_this->mode = 2; if (i_this->field_0xa1f == 0) { anm_init(i_this, BCK_RD_DIEA, 3.0f, 0, 1.0f); @@ -3171,7 +3192,7 @@ static s16 gake_check(e_rd_class* i_this, f32 param_2) { } static void* s_bikkuri_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && i_actor != i_data) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RD_e && i_actor != i_data) { if (((e_rd_class*)i_actor)->action == ACTION_BOW3 && ((e_rd_class*)i_actor)->mode <= 2) { cXyz sp28 = ((fopAc_ac_c*)i_actor)->current.pos - ((fopAc_ac_c*)i_data)->current.pos; if (sp28.abs() < KREG_F(11) + 350.0f) { @@ -3186,7 +3207,7 @@ static void* s_bikkuri_sub(void* i_actor, void* i_data) { } static void* s_saku_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_H_Saku) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_H_Saku_e) { cXyz sp14 = ((daObjH_Saku_c*)i_actor)->field_0x5e0 - ((fopAc_ac_c*)i_data)->current.pos; if (sp14.abs() < 200.0f) { return i_actor; @@ -3279,14 +3300,14 @@ static void e_rd_drop(e_rd_class* i_this) { cLib_addCalcAngleS2(&i_this->field_0xaf8, 0x800, 1, 0x50); i_this->field_0x9ab = 2; - if (i_this->timer[0] == 0 && enemy->current.pos.y <= i_this->ObjAcch.GetGroundH() + 100.0f + KREG_F(17)) { + if (i_this->timer[0] == 0 && enemy->current.pos.y <= i_this->Bgc.GetGroundH() + 100.0f + KREG_F(17)) { if (i_this->arg1 == 13 || i_this->arg1 == 14) { i_this->action = ACTION_REG; i_this->mode = 1; i_this->field_0xafb = 1; i_this->field_0xaf2 = 0; } else { - enemy->current.pos.y = i_this->ObjAcch.GetGroundH() + 100.0f + KREG_F(17); + enemy->current.pos.y = i_this->Bgc.GetGroundH() + 100.0f + KREG_F(17); i_this->jump_angle.x = -0x4000; i_this->action = ACTION_DAMAGE; i_this->mode = 0; @@ -3314,7 +3335,7 @@ static void e_rd_a_damage(e_rd_class* i_this) { i_this->timer[0] = 80; if (desert_substage != 0) { - i_this->field_0x5ba = 0; + i_this->scene_no = 0; } dKy_Sound_set(enemy->current.pos, 100, fopAcM_GetID(i_this), 5); @@ -3380,7 +3401,7 @@ static void e_rd_stand(e_rd_class* i_this) { return; } - if (((i_this->counter & 7) == 0 || search_check) && pl_check(i_this, range, angle) && i_this->weapon_type == 1) { + if (((i_this->counter & 7) == 0 || search_check) && pl_check(i_this, range, angle) && i_this->weapon_type == WEAPON_TYPE_CLUB) { OS_REPORT(" <<<<<<<<<<<<<< RD RIDE 4\n"); i_this->action = ACTION_FIGHT_RUN; i_this->mode = -10; @@ -3445,9 +3466,9 @@ static s8 e_rd_bow3(e_rd_class* i_this) { break; case 11: - i_this->field_0x9c8 = 4; + i_this->aim_type = 4; if (frame >= 10) { - i_this->field_0x9a2 = 1; + i_this->arrow_draw = TRUE; } if (frame == 20) { @@ -3462,7 +3483,7 @@ static s8 e_rd_bow3(e_rd_class* i_this) { break; case 12: - i_this->field_0x9c8 = 4; + i_this->aim_type = 4; if (i_this->timer[0] == 0 && !dMsgObject_isTalkNowCheck() && i_this->field_0x9a4 == 0) { anm_init(i_this, BCK_RD_SHOOT, 1.0f, 0, 1.0f); @@ -3470,17 +3491,17 @@ static s8 e_rd_bow3(e_rd_class* i_this) { i_this->mode = 13; } - i_this->field_0x9a2 = 1; + i_this->arrow_draw = TRUE; break; case 13: if (frame <= 3 + XREG_S(5)) { - i_this->field_0x9a2 = 1; - i_this->field_0x9c8 = 4; + i_this->arrow_draw = TRUE; + i_this->aim_type = 4; } if (frame == 2 + XREG_S(7)) { - i_this->arrow_flag = 1; + i_this->arrow_flag = TRUE; } if (i_this->anm_p->isStop()) { @@ -3503,7 +3524,7 @@ static s8 e_rd_bow3(e_rd_class* i_this) { static void* s_command2_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RD_e && ((e_rd_class*)i_actor)->action == ACTION_BOW3 && ((e_rd_class*)i_actor)->mode < 10) { ((e_rd_class*)i_actor)->timer[0] = cM_rndF(10.0f) + 10.0f; ((e_rd_class*)i_actor)->mode = 10; @@ -3513,7 +3534,7 @@ static void* s_command2_sub(void* i_actor, void* i_data) { } static void* s_command4_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && i_actor != i_data && ((e_rd_class*)i_actor)->action == ACTION_BOW3) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RD_e && i_actor != i_data && ((e_rd_class*)i_actor)->action == ACTION_BOW3) { return i_actor; } @@ -3640,11 +3661,11 @@ static void e_rd_excite(e_rd_class* i_this) { i_this->mode = 1; i_this->timer[0] = cM_rndF(20.0f) + 20.0f; i_this->target_ya = enemy->current.angle.y; - i_this->field_0x5c0 = S_find_pos; + i_this->find_pos = S_find_pos; break; case 1: - i_this->field_0x9c8 = 11; + i_this->aim_type = 11; i_this->eye = S_find_pos; if (i_this->timer[0] == 0) { @@ -3658,16 +3679,16 @@ static void e_rd_excite(e_rd_class* i_this) { i_this->timer[0] = cM_rndF(15.0f) + 30.0f; } - sp40 = i_this->field_0x5c0 - enemy->current.pos; + sp40 = i_this->find_pos - enemy->current.pos; i_this->target_ya = (s16) cM_atan2s(sp40.x, sp40.z); } break; case 2: - i_this->field_0x9c8 = 11; - i_this->eye = i_this->field_0x5c0; + i_this->aim_type = 11; + i_this->eye = i_this->find_pos; speed = l_HIO.dash_speed; - sp40 = i_this->field_0x5c0 - enemy->current.pos; + sp40 = i_this->find_pos - enemy->current.pos; if (i_this->timer[0] == 0 || move_gake_check(i_this, 100.0f) || sp40.abs() < 100.0f) { i_this->mode = 3; anm_init(i_this, BCK_RD_KYORO2, 5.0f, 2, 1.3f); @@ -3677,7 +3698,7 @@ static void e_rd_excite(e_rd_class* i_this) { case 3: if (i_this->timer[0] == 0) { - i_this->action = i_this->prev_action; + i_this->action = i_this->old_action; if (i_this->action == ACTION_STAND) { i_this->action = ACTION_NORMAL; } @@ -3749,7 +3770,7 @@ static void e_rd_kiba_start(e_rd_class* i_this) { case 0: anm_init(i_this, e_rdb_class::BCK_RB_RWAIT02, 1.0f, 2, 1.0f); i_this->mode++; - i_this->field_0x6a0 = 0; + i_this->horn_mode = HORN_MODE_NONE; break; case 2: @@ -3765,7 +3786,7 @@ static void e_rd_kiba_start(e_rd_class* i_this) { break; case 5: - i_this->field_0x6a0 = 1; + i_this->horn_mode = HORN_MODE_PLAY; anm_init(i_this, e_rdb_class::BCK_RB_RPLAY_STOP2, 20.0f, 0, 1.0f); horn_anm_init(i_this, 6, 2.0f, 0, 1.0f); i_this->mode++; @@ -3797,7 +3818,7 @@ static void e_rd_ikki2_start(e_rd_class* i_this) { anm_init(i_this, e_rdb_class::BCK_RB_ROP_DEMO2_WAIT, 1.0f, 2, 1.0f); i_this->mode++; break; - + case 2: anm_init(i_this, e_rdb_class::BCK_RB_ROP_DEMO2_EXCITE, 5.0f, 0, 1.0f); i_this->sound.startCreatureVoice(Z2SE_EN_RDB_V_DEMO_EXCITE, -1); @@ -3830,7 +3851,7 @@ static void e_rd_kiba_end(e_rd_class* i_this) { anm_init(i_this, BCK_RD_RSHOOT_WAIT, 1.0f, 0, 1.0f); i_this->mode++; i_this->timer[0] = 14; - boar->field_0x7a2 = 1; + boar->kiba = 1; break; case 1: @@ -3840,14 +3861,14 @@ static void e_rd_kiba_end(e_rd_class* i_this) { mae.x = BREG_F(8) + 40.0f; mae.y = BREG_F(9) + 20.0f; mae.z = BREG_F(10) + 57.0f; - MtxPosition(&mae, &i_this->field_0x6b0); - i_this->field_0x6bc.y = enemy->shape_angle.y + BREG_S(0); + MtxPosition(&mae, &i_this->horn_spd); + i_this->horn_rot.y = enemy->shape_angle.y + BREG_S(0); mae.x = BREG_F(11) + 80.0f; mae.y = BREG_F(12); mae.z = BREG_F(13); MtxPosition(&mae, &ato); - i_this->field_0x6a4 += ato; - i_this->field_0x6a0 = 2; + i_this->horn_pos += ato; + i_this->horn_mode = HORN_MODE_SHOOT; } if (i_this->anm_p->isStop()) { @@ -3868,7 +3889,7 @@ static void e_rd_kiba_end(e_rd_class* i_this) { case 3: if (i_this->timer[0] == 0) { - boar->field_0x7a2 = 0; + boar->kiba = 0; } if (i_this->anm_p->isStop()) { @@ -3880,10 +3901,10 @@ static void e_rd_kiba_end(e_rd_class* i_this) { case 4: if (i_this->timer[0] != 0) { - i_this->field_0x9c8 = 1; + i_this->aim_type = 1; } - if ((boar->mStatusFlags & 0x100) != 0) { + if ((boar->status_flag & 0x100) != 0) { i_this->action = ACTION_WB_BJUMP; i_this->mode = 0; i_this->timer[1] = 2000; @@ -3900,20 +3921,20 @@ static void e_rd_ikki_end(e_rd_class* i_this) { fopAcM_OffStatus(enemy, 0); enemy->attention_info.flags = 0; i_this->damage_timer = 10; - boar->field_0x1434 = fopAcM_GetID(i_this); + boar->rd_id = fopAcM_GetID(i_this); switch (i_this->mode) { case 0: anm_init(i_this, BCK_RD_RRUN02_BACK, 1.0f, 0, 1.0f); i_this->mode++; - i_this->ride_mode = 0; + i_this->ride_mode = RIDE_MODE_OFF; if (daPy_getPlayerActorClass()->checkHorseRide() && boar != NULL) { - UNSET_FLAG(boar->mStatusFlags, i_this->boar_stand, u16); + UNSET_FLAG(boar->status_flag, i_this->boar_stand, u16); i_this->boar_stand = 0; - boar->mActionID = 16; - boar->mActionMode = 0; - boar->field_0x169e = 10; + boar->action = 16; + boar->ride_mode = 0; + boar->demo_mode = 10; } enemy->speedF = 0.0f; @@ -3951,16 +3972,16 @@ static void e_rd_ikki2_end(e_rd_class* i_this) { fopAcM_OffStatus(enemy, 0); enemy->attention_info.flags = 0; i_this->damage_timer = 10; - boar->field_0x1434 = fopAcM_GetID(i_this); + boar->rd_id = fopAcM_GetID(i_this); switch (i_this->mode) { case 0: if (daPy_getPlayerActorClass()->checkHorseRide()) { anm_init(i_this, BCK_RD_RRUN_BACK, 0.0f, 0, 1.0f); i_this->mode = 1; - boar->mActionID = 18; - boar->mActionMode = 0; - boar->field_0x169e = 90; + boar->action = 18; + boar->ride_mode = 0; + boar->demo_mode = 90; mDoAud_bgmStop(30); } break; @@ -3974,10 +3995,10 @@ static void e_rd_ikki2_end(e_rd_class* i_this) { case 10: anm_init(i_this, BCK_RD_RSHOOT, 2.0f, 0, 1.0f); i_this->mode = 11; - i_this->ride_mode = 0; + i_this->ride_mode = RIDE_MODE_OFF; if (boar != NULL) { - UNSET_FLAG(boar->mStatusFlags, i_this->boar_stand, u16); + UNSET_FLAG(boar->status_flag, i_this->boar_stand, u16); i_this->boar_stand = 0; } @@ -3999,7 +4020,7 @@ static void e_rd_ikki2_end(e_rd_class* i_this) { static void* s_rdb_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RDB) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RDB_e) { return i_actor; } @@ -4019,14 +4040,14 @@ static void e_rd_lv9_end(e_rd_class* i_this) { break; case 1: - if ((boar->mStatusFlags & 8) != 0) { + if ((boar->status_flag & 8) != 0) { anm_init(i_this, e_rdb_class::BCK_RB_RWAIT, 10.0f, 2, 1.0f); i_this->mode = 2; } break; case 2: - if ((boar->mStatusFlags & 8) != 0) { + if ((boar->status_flag & 8) != 0) { anm_init(i_this, e_rdb_class::BCK_RB_LV9_END03, 5.0f, 0, 1.0f); i_this->sound.startCreatureVoice(Z2SE_EN_RDB_V_LV9_END03, -1); i_this->mode = 3; @@ -4042,7 +4063,7 @@ static void e_rd_lv9_end(e_rd_class* i_this) { e_rdb_class* rdb = (e_rdb_class*)fpcM_Search(s_rdb_sub, i_this); if (rdb != NULL && rdb->mDemoMode == 14) { anm_init(i_this, e_rdb_class::BCK_RB_RNEIGH, 3.0f, 0, 1.0f); - boar->mActionMode++; + boar->ride_mode++; i_this->mode = 4; } } @@ -4062,7 +4083,7 @@ static void e_rd_lv9_end(e_rd_class* i_this) { static void* s_boom_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RD_e) { e_rd_class* i_this = (e_rd_class*) i_actor; if (i_this->field_0x99a != 0) { return i_this; @@ -4093,7 +4114,7 @@ static void big_damage(e_rd_class* i_this) { i_this->mode = 0; enemy->speed.y = l_HIO.jump_y + 2.0f; - if (i_this->ride_mode == 2) { + if (i_this->ride_mode == RIDE_MODE_RIDE) { fopAc_ac_c* actor = fopAcM_SearchByID(i_this->boar_id); if (actor != NULL && actor->speedF >= 20.0f) { i_this->jump_z = actor->speedF; @@ -4106,24 +4127,24 @@ static void big_damage(e_rd_class* i_this) { i_this->jump_angle.y = enemy->shape_angle.y + (s16)cM_rndFX(3000.0f); } else { - i_this->jump_angle.y = i_this->AtInfo.mHitDirection.y; + i_this->jump_angle.y = i_this->at_info.mHitDirection.y; i_this->jump_z = -l_HIO.jump_z; } - if ((i_this->AtInfo.mHitBit & 0x80) != 0) { + if ((i_this->at_info.mHitBit & 0x80) != 0) { OS_REPORT("SPIN CUT HIT !!\n"); i_this->field_0x9f6 = cM_rndFX(2000.0f) + 4000.0f; - } else if ((i_this->AtInfo.mHitBit & 0x800) != 0) { + } else if ((i_this->at_info.mHitBit & 0x800) != 0) { OS_REPORT("SPIN CUT L HIT !!\n"); i_this->field_0x9f6 = -(cM_rndFX(2000.0f) + 4000.0f); } else { - if (i_this->ride_mode != 0) { + if (i_this->ride_mode != RIDE_MODE_OFF) { i_this->field_0x9f6 = cM_rndFX(3000.0f); } else { - if (fopAcM_GetName(i_this->AtInfo.mpActor) == PROC_E_WB) { + if (fopAcM_GetName(i_this->at_info.mpActor) == fpcNm_E_WB_e) { i_this->field_0x9f6 = cM_rndFX(8000.0f); enemy->speed.y = cM_rndF(15.0f) + (35.0f + TREG_F(17)); - i_this->jump_z = -(i_this->AtInfo.mpActor->speedF * 0.5f); + i_this->jump_z = -(i_this->at_info.mpActor->speedF * 0.5f); } else { i_this->field_0x9f6 = cM_rndFX(1000.0f); } @@ -4139,7 +4160,7 @@ static void small_damage(e_rd_class* i_this, int param_2) { fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; if (i_this->action != ACTION_S_DAMAGE) { - i_this->prev_action = i_this->action; + i_this->old_action = i_this->action; } i_this->action = ACTION_S_DAMAGE; @@ -4160,7 +4181,7 @@ static void small_damage(e_rd_class* i_this, int param_2) { } i_this->field_0x9f0 = 20.0f + TREG_F(10); - i_this->field_0x9f4 = i_this->AtInfo.mHitDirection.y; + i_this->field_0x9f4 = i_this->at_info.mHitDirection.y; } static void part_break(e_rd_class* i_this) { @@ -4168,28 +4189,28 @@ static void part_break(e_rd_class* i_this) { cXyz unused_vec_0, unused_vec_1; for (int i = 0; i < 14; i++) { - if (i_this->field_0x70c[i] == 0) { - i_this->field_0x70c[i] = 1; + if (i_this->part_break[i] == 0) { + i_this->part_break[i] = 1; i_this->sound.startCreatureSound(Z2SE_EN_RDB_BREAK_ARMOR, 0, -1); - cXyz sp54 = i_this->field_0x71c[i] - enemy->current.pos; + cXyz sp54 = i_this->part_pos[i] - enemy->current.pos; cMtx_YrotS(*calc_mtx, cM_atan2s(sp54.x, sp54.z)); sp54.x = cM_rndFX(10.0f); sp54.y = cM_rndF(5.0f) + 20.0f; sp54.z = cM_rndF(10.0f) + 30.0f; - MtxPosition(&sp54, &i_this->field_0x7c4[i]); + MtxPosition(&sp54, &i_this->part_spd[i]); - i_this->field_0x86c[i].y = cM_rndF(65536.0f); - i_this->field_0x86c[i].x = cM_rndF(65536.0f); + i_this->part_angle[i].y = cM_rndF(65536.0f); + i_this->part_angle[i].x = cM_rndF(65536.0f); - u16 uVar1; - if (i_this->AtInfo.mHitStatus != 0) { - uVar1 = 3; + u16 hit; + if (i_this->at_info.mHitStatus != 0) { + hit = 3; } else { - uVar1 = 1; + hit = 1; } - dComIfGp_setHitMark(uVar1, enemy, &i_this->field_0x71c[i], &enemy->shape_angle, NULL, 0); + dComIfGp_setHitMark(hit, enemy, &i_this->part_pos[i], &enemy->shape_angle, NULL, 0); return; } } @@ -4201,7 +4222,7 @@ static void damage_check(e_rd_class* i_this) { fopAc_ac_c* actor = fopAcM_SearchByID(i_this->boar_id); e_wb_class* boar = (e_wb_class*)actor; - if (i_this->ride_mode == 2 && boar != NULL && (boar->mStatusFlags & 0xC0) != 0) { + if (i_this->ride_mode == RIDE_MODE_RIDE && boar != NULL && (boar->status_flag & 0xC0) != 0) { if (i_this->action == ACTION_IKKI2_END) { i_this->mode = 10; } else { @@ -4209,7 +4230,7 @@ static void damage_check(e_rd_class* i_this) { i_this->mode = 0; i_this->damage_timer = 1000; - if ((boar->mStatusFlags & 0x80) != 0) { + if ((boar->status_flag & 0x80) != 0) { i_this->jump_angle.y = enemy->shape_angle.y + 0x8000 + (s16)cM_rndFX(3000.0f); i_this->field_0x9f6 = (s16)cM_rndFX(1000.0f); } else { @@ -4224,10 +4245,10 @@ static void damage_check(e_rd_class* i_this) { return; } - i_this->mStts.Move(); + i_this->Stts.Move(); if (i_this->damage_timer == 0) { - if (i_this->actor_set != 0 + if (i_this->actor_set != ACTOR_SET_NONE #if DEBUG || l_HIO.invulnerable #endif @@ -4238,29 +4259,29 @@ static void damage_check(e_rd_class* i_this) { for (int i = 0; i <= 2; i++) { if (i_this->cc_sph[i].ChkTgHit() != 0) { i_this->damage_timer = 6; - i_this->AtInfo.mpCollider = i_this->cc_sph[i].GetTgHitObj(); - if (i_this->actor_set == 3) { + i_this->at_info.mpCollider = i_this->cc_sph[i].GetTgHitObj(); + if (i_this->actor_set == ACTOR_SET_IKKI2) { s16 range = enemy->shape_angle.y - i_this->angleY; - at_power_check(&i_this->AtInfo); - if (i_this->AtInfo.mpCollider->ChkAtType(AT_TYPE_ARROW) || i_this->AtInfo.mpCollider->ChkAtType(AT_TYPE_BOMB)) { + at_power_check(&i_this->at_info); + if (i_this->at_info.mpCollider->ChkAtType(AT_TYPE_ARROW) || i_this->at_info.mpCollider->ChkAtType(AT_TYPE_BOMB)) { u16 uVar1; if (dComIfGp_getHorseActor()->speedF > 20.0f || range > 0x7800 || range < -0x7800) { - cc_at_check(enemy, &i_this->AtInfo); + cc_at_check(enemy, &i_this->at_info); dScnPly_c::setPauseTimer(0); - boar->mLapCount++; - if (boar->mLapCount >= 3) { + boar->lap_num++; + if (boar->lap_num >= 3) { mDoAud_bgmStop(30); i_this->action = ACTION_IKKI2_END; i_this->mode = 0; i_this->sound.startCreatureVoice(Z2SE_EN_RDB_V_DAMAGE_L, -1); } else { - boar->field_0x169e = 25; + boar->demo_mode = 25; anm_init(i_this, e_rdb_class::BCK_RB_RDAMAGEB, 2.0f, 0, 1.0f); i_this->sound.startCreatureVoice(Z2SE_EN_RDB_V_DAMAGE, -1); } uVar1 = 3; - boar->field_0x698[3] = 100; + boar->timer[3] = 100; dComIfGs_onSaveDunSwitch(7); } else { uVar1 = 2; @@ -4275,9 +4296,9 @@ static void damage_check(e_rd_class* i_this) { ato += enemy->current.pos; cXyz sc(2.0f, 2.0f, 2.0f); dComIfGp_setHitMark(uVar1, enemy, &ato, NULL, &sc, 0); - } else if (i_this->AtInfo.mHitType == 1) { + } else if (i_this->at_info.mHitType == 1) { anm_init(i_this, e_rdb_class::BCK_RB_RGUARD_F, 2.0f, 0, 1.0f); - boar->field_0x169e = 25; + boar->demo_mode = 25; dScnPly_c::setPauseTimer(0); cXyz mae, ato; @@ -4303,21 +4324,21 @@ static void damage_check(e_rd_class* i_this) { return; } - i_this->field_0x129c = 3; + i_this->horn_timer = 3; - if (i_this->AtInfo.mpCollider->ChkAtType(AT_TYPE_10000000)) { + if (i_this->at_info.mpCollider->ChkAtType(AT_TYPE_10000000)) { wolfkick_damage(i_this); break; } - at_power_check(&i_this->AtInfo); - if (i_this->AtInfo.mpCollider->ChkAtType(AT_TYPE_SHIELD_ATTACK)) { + at_power_check(&i_this->at_info); + if (i_this->at_info.mpCollider->ChkAtType(AT_TYPE_SHIELD_ATTACK)) { i_this->timer[1] = 30; } else { i_this->timer[1] = 1; } - if (i_this->ride_mode == 2 && i_this->AtInfo.mAttackPower <= 10) { + if (i_this->ride_mode == RIDE_MODE_RIDE && i_this->at_info.mAttackPower <= 10) { if (fpcM_Search(s_boom_sub, i_this) != NULL) { return; } @@ -4326,74 +4347,74 @@ static void damage_check(e_rd_class* i_this) { } s16 cur_health = enemy->health; // unused - OS_REPORT(" HIT AT %d\n", i_this->AtInfo.mAttackPower); - if (i_this->one_hit_kill != 0 && (i_this->AtInfo.mpCollider->ChkAtType(AT_TYPE_SLINGSHOT) || - (i_this->AtInfo.mHitType != 1 && i_this->AtInfo.mHitType != 16 && i_this->AtInfo.mHitType != 2))) { + OS_REPORT(" HIT AT %d\n", i_this->at_info.mAttackPower); + if (i_this->one_hit_kill != 0 && (i_this->at_info.mpCollider->ChkAtType(AT_TYPE_SLINGSHOT) || + (i_this->at_info.mHitType != 1 && i_this->at_info.mHitType != 16 && i_this->at_info.mHitType != 2))) { i_this->damage_timer = 1000; i_this->action = ACTION_DROP; i_this->mode = 0; enemy->health = 0; - cc_at_check(enemy, &i_this->AtInfo); + cc_at_check(enemy, &i_this->at_info); return; } - if (i_this->AtInfo.mHitType == 15) { + if (i_this->at_info.mHitType == 15) { enemy->health = 0; - if (i_this->ride_mode == 0) { + if (i_this->ride_mode == RIDE_MODE_OFF) { i_this->action = ACTION_A_DAMAGE; i_this->mode = 0; i_this->sound.startCreatureVoice(Z2SE_EN_RD_V_DAMAGE, -1); enemy->health = 0; - cc_at_check(enemy, &i_this->AtInfo); + cc_at_check(enemy, &i_this->at_info); return; } } - cc_at_check(enemy, &i_this->AtInfo); + cc_at_check(enemy, &i_this->at_info); if (daPy_getPlayerActorClass()->getCutType() == daPy_py_c::CUT_TYPE_HEAD_JUMP) { enemy->health = 0; } - if (i_this->AtInfo.mpCollider->ChkAtType(AT_TYPE_UNK)) { + if (i_this->at_info.mpCollider->ChkAtType(AT_TYPE_UNK)) { i_this->damage_timer = 20; } else { i_this->damage_timer = 10; } - if (i_this->AtInfo.mAttackPower <= 1) { + if (i_this->at_info.mAttackPower <= 1) { i_this->damage_timer = 10 + KREG_S(8); } - i_this->field_0xa20 |= i_this->AtInfo.mHitBit; + i_this->field_0xa20 |= i_this->at_info.mHitBit; - if (daPy_getPlayerActorClass()->checkHorseRide() != 0 && dComIfGp_getHorseActor()->speedF >= 20.0f && i_this->AtInfo.mHitType == 1) { - i_this->AtInfo.mAttackPower = 20; + if (daPy_getPlayerActorClass()->checkHorseRide() != 0 && dComIfGp_getHorseActor()->speedF >= 20.0f && i_this->at_info.mHitType == 1) { + i_this->at_info.mAttackPower = 20; } - if (enemy->health <= 0 || i_this->AtInfo.mHitStatus != 0 || i_this->ride_mode != 0) { + if (enemy->health <= 0 || i_this->at_info.mHitStatus != 0 || i_this->ride_mode != RIDE_MODE_OFF) { if (pla->getCutType() == daPy_py_c::CUT_TYPE_JUMP && pla->checkCutJumpCancelTurn()) { small_damage(i_this, i); i_this->damage_timer = 3 + NREG_S(7); } else { - if (i_this->actor_set != 0 && boar != NULL) { + if (i_this->actor_set != ACTOR_SET_NONE && boar != NULL) { i_this->damage_timer = 20; - if (i_this->actor_set == 2) { - boar->mLapCount++; - if (boar->mLapCount == 1) { + if (i_this->actor_set == ACTOR_SET_IKKI) { + boar->lap_num++; + if (boar->lap_num == 1) { enemy->health = 0; /* dSv_event_flag_c::M_055 - Main Event - Did damage at least once during joust/one-on-one battle */ dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[0x58]); part_break(i_this); - boar->field_0x169e = 20; + boar->demo_mode = 20; dScnPly_c::setPauseTimer(0); } - if (l_HIO.one_hit_kill != 0 || boar->mLapCount >= 2) { + if (l_HIO.one_hit_kill != 0 || boar->lap_num >= 2) { mDoAud_bgmStop(30); i_this->action = ACTION_IKKI_END; i_this->mode = 0; - if ((i_this->AtInfo.mHitBit & 0x80) != 0) { + if ((i_this->at_info.mHitBit & 0x80) != 0) { i_this->field_0x9f6 = 0x300 + YREG_S(0); } else { i_this->field_0x9f6 = cM_rndFX(100.0f); @@ -4413,30 +4434,30 @@ static void damage_check(e_rd_class* i_this) { return; } - boar->mLapCount++; - boar->mPathAdjustCounter++; + boar->lap_num++; + boar->path_adjust_count++; part_break(i_this); - if (boar->mLapCount == 1 || boar->mLapCount == 2 || boar->mLapCount == 3 || - boar->mLapCount == 4 || boar->mLapCount == 6) { + if (boar->lap_num == 1 || boar->lap_num == 2 || boar->lap_num == 3 || + boar->lap_num == 4 || boar->lap_num == 6) { part_break(i_this); } - s8 life = 8 - boar->mLapCount; + s8 life = 8 - boar->lap_num; if (life > 8) { life = 8; } dComIfGs_BossLife_public_Set(life); - if (boar->mLapCount == 5) { + if (boar->lap_num == 5) { Z2GetAudioMgr()->changeSubBgmStatus(2); } - if (boar->mLapCount >= 8) { + if (boar->lap_num >= 8) { i_this->action = ACTION_KIBA_END; i_this->mode = 0; mDoAud_seStart(Z2SE_EN_RDB_V_FAINT, 0, 0, 0); - boar->mActionID = 31; - boar->mActionMode = 0; + boar->action = 31; + boar->ride_mode = 0; mDoAud_bgmStop(30); return; } @@ -4451,26 +4472,26 @@ static void damage_check(e_rd_class* i_this) { if (i_this->field_0x680 == 0) { i_this->timer[3] = cM_rndF(100.0f) + 200.0f; - int anm_no = i_this->anm; + int anmID = i_this->anm; - s16 angle_diff = enemy->shape_angle.y - i_this->angleY; - if (angle_diff < 0) { + s16 dmg_angle = enemy->shape_angle.y - i_this->angleY; + if (dmg_angle < 0) { anm_init(i_this, e_rdb_class::BCK_RB_RDAMAGEL, 2.0f, 0, 1.0f); } else { anm_init(i_this, e_rdb_class::BCK_RB_RDAMAGER, 2.0f, 0, 1.0f); } - i_this->field_0x680 = anm_no; + i_this->field_0x680 = anmID; } if (i_this->action != ACTION_WB_RUN) { i_this->action = ACTION_WB_RUN; i_this->mode = 0; } - break; + break; } - if (i_this->ride_mode != 0 && i_this->AtInfo.mpCollider->ChkAtType(AT_TYPE_BOOMERANG)) { + if (i_this->ride_mode != RIDE_MODE_OFF && i_this->at_info.mpCollider->ChkAtType(AT_TYPE_BOOMERANG)) { i_this->damage_timer = 20; if (i_this->action == ACTION_WB_RUN) { anm_init(i_this, BCK_RD_RRUN02_BACK, 5.0f, 2, 1.0f); @@ -4483,7 +4504,7 @@ static void damage_check(e_rd_class* i_this) { } } else { int iVar2 = i; - if (i_this->AtInfo.mHitType == 16) { + if (i_this->at_info.mHitType == 16) { iVar2 = 0; } @@ -4508,7 +4529,7 @@ static void damage_check(e_rd_class* i_this) { static void* s_other_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && ((e_rd_class*)i_actor)->arg1 != 6) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RD_e && ((e_rd_class*)i_actor)->arg1 != 6) { return i_actor; } @@ -4517,14 +4538,14 @@ static void* s_other_sub(void* i_actor, void* i_data) { static void* s_ep_sub(void* i_actor, void* i_data) { UNUSED(i_data); - fopAc_ac_c* player = dComIfGp_getPlayer(0); - - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Lv1Cdl00) { + fopAc_ac_c* pla = dComIfGp_getPlayer(0); + + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_Lv1Cdl00_e) { if (!fopAcM_isSwitch((fopAc_ac_c*)i_actor, fopAcM_GetParam(i_actor) & 0xFF)) { f32 x, z; - x = ((fopAc_ac_c*)i_actor)->current.pos.x - player->current.pos.x; - z = ((fopAc_ac_c*)i_actor)->current.pos.z - player->current.pos.z; - if (JMAFastSqrt(x * x + z * z) < NREG_F(17) + 600.0f) { + x = ((fopAc_ac_c*)i_actor)->current.pos.x - pla->current.pos.x; + z = ((fopAc_ac_c*)i_actor)->current.pos.z - pla->current.pos.z; + if (JMAFastSqrt(SQUARE(x) + SQUARE(z)) < NREG_F(17) + 600.0f) { return i_actor; } } @@ -4571,7 +4592,7 @@ static s8 e_rd_yagura(e_rd_class* i_this) { break; case 5: - i_this->field_0x9c8 = 4; + i_this->aim_type = 4; if (i_this->timer[0] == 0) { anm_init(i_this, BCK_RD_SHOUT, 5.0f, 0, 1.0f); @@ -4592,10 +4613,10 @@ static s8 e_rd_yagura(e_rd_class* i_this) { break; case 11: - i_this->field_0x9c8 = 4; + i_this->aim_type = 4; if (frame >= 10) { - i_this->field_0x9a2 = 1; + i_this->arrow_draw = TRUE; } if (frame == 20) { @@ -4610,7 +4631,7 @@ static s8 e_rd_yagura(e_rd_class* i_this) { break; case 12: - i_this->field_0x9c8 = 4; + i_this->aim_type = 4; if (i_this->timer[0] == 0 && i_this->field_0x9a4 == 0) { anm_init(i_this, BCK_RD_SHOOT, 1.0f, 0, 1.0f); @@ -4618,13 +4639,13 @@ static s8 e_rd_yagura(e_rd_class* i_this) { i_this->mode = 13; } - i_this->field_0x9a2 = 1; + i_this->arrow_draw = TRUE; break; case 13: if (frame <= 3 + XREG_S(5)) { - i_this->field_0x9a2 = 1; - i_this->field_0x9c8 = 4; + i_this->arrow_draw = TRUE; + i_this->aim_type = 4; } if (frame == 2 + XREG_S(7)) { @@ -4646,7 +4667,7 @@ static s8 e_rd_yagura(e_rd_class* i_this) { break; } - if (fabsf(i_this->ObjAcch.GetGroundH() - enemy->home.pos.y) > 10.0f) { + if (fabsf(i_this->Bgc.GetGroundH() - enemy->home.pos.y) > 10.0f) { i_this->action = ACTION_DAMAGE; i_this->mode = 0; i_this->jump_angle.y = s16(enemy->shape_angle.y); @@ -4687,30 +4708,30 @@ static void e_rd_jyunkai(e_rd_class* i_this) { case 0: { anm_init(i_this, BCK_RD_WALK, 10.0f, 2, 1.0f); i_this->mode = 1; - dPnt* pnt_p = i_this->path->m_points; - pnt_p += i_this->field_0xb00; - i_this->field_0x5c0.x = pnt_p->m_position.x; - i_this->field_0x5c0.y = pnt_p->m_position.y; - i_this->field_0x5c0.z = pnt_p->m_position.z; + dPnt* point = i_this->ppd->m_points; + point += i_this->jyunkai_no; + i_this->find_pos.x = point->m_position.x; + i_this->find_pos.y = point->m_position.y; + i_this->find_pos.z = point->m_position.z; } // fallthrough case 1: speed = l_HIO.movement_speed; - vec = i_this->field_0x5c0 - enemy->current.pos; + vec = i_this->find_pos - enemy->current.pos; i_this->target_ya = cM_atan2s(vec.x, vec.z); if (vec.abs() < 50.0f) { - i_this->field_0xb00 += i_this->path_dir; - if (i_this->field_0xb00 >= (i_this->path->m_num & 0xFF)) { - if (dPath_ChkClose(i_this->path)) { - i_this->field_0xb00 = 0; + i_this->jyunkai_no += i_this->dir; + if (i_this->jyunkai_no >= (i_this->ppd->m_num & 0xFF)) { + if (dPath_ChkClose(i_this->ppd)) { + i_this->jyunkai_no = 0; } else { - i_this->path_dir = 0xFF; - i_this->field_0xb00 = i_this->path->m_num - 2; + i_this->dir = -1; + i_this->jyunkai_no = i_this->ppd->m_num - 2; } - } else if (i_this->field_0xb00 < 0) { - i_this->path_dir = 1; - i_this->field_0xb00 = 1; + } else if (i_this->jyunkai_no < 0) { + i_this->dir = 1; + i_this->jyunkai_no = 1; } i_this->mode = 2; @@ -4755,11 +4776,11 @@ static void e_rd_jyunkai(e_rd_class* i_this) { cLib_addCalc2(&enemy->speedF, speed, 1.0f, 3.0f); f32 range = i_this->attack_range; - BOOL bVar1 = FALSE; + BOOL search_check = FALSE; if (i_this->look_timer == 1|| S_find != 0) { if (i_this->look_timer == 1) { - bVar1 = TRUE; + search_check = TRUE; } range = 10000.0f; @@ -4767,7 +4788,7 @@ static void e_rd_jyunkai(e_rd_class* i_this) { } if (i_this->mode < 10) { - if (bVar1) { + if (search_check) { i_this->mode = 2; i_this->timer[0] = cM_rndF(100.0f) + 100.0f; anm_init(i_this, BCK_RD_KYORO2, 10.0f, 2, 1.0f); @@ -4787,18 +4808,18 @@ static void e_rd_sleep(e_rd_class* i_this) { fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; int frame = i_this->anm_p->getFrame(); f32 range = i_this->attack_range; - s16 sVar1 = 0x4000; - BOOL look_check = FALSE; + s16 angle = 0x4000; + BOOL search_check = FALSE; if (i_this->look_timer == 1 || S_find != 0) { if (i_this->look_timer == 1) { - look_check = TRUE; + search_check = TRUE; } else if ((i_this->counter & 15) == 0) { - look_check = TRUE; + search_check = TRUE; } range = 5000.0f; - sVar1 = 0x7FFF; + angle = 0x7FFF; } s8 find = 0; @@ -4811,7 +4832,7 @@ static void e_rd_sleep(e_rd_class* i_this) { break; case 1: - if (look_check || i_this->timer[0] == 0) { + if (search_check || i_this->timer[0] == 0) { anm_init(i_this, BCK_RD_SLEEP_LOOKAROUND, 5.0f, 0, 1.0f); i_this->mode = 2; } @@ -4823,8 +4844,8 @@ static void e_rd_sleep(e_rd_class* i_this) { } if (fopAcM_GetRoomNo(enemy) == 0) { - if (look_check) { - wb_check(i_this, sVar1); + if (search_check) { + wb_check(i_this, angle); } if (i_this->dis > 600.0f) { @@ -4832,7 +4853,7 @@ static void e_rd_sleep(e_rd_class* i_this) { } } - if (frame > 60 && frame < 200 && (((i_this->counter & 7) == 0) || look_check) && pl_check(i_this, range, sVar1)) { + if (frame > 60 && frame < 200 && (((i_this->counter & 7) == 0) || search_check) && pl_check(i_this, range, angle)) { find = 1; } break; @@ -4902,7 +4923,7 @@ static int rd_count; static void* s_tag_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && ((e_rd_class*)i_actor)->field_0x5ba != 0) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RD_e && ((e_rd_class*)i_actor)->scene_no != 0) { rd_count++; } @@ -4939,7 +4960,7 @@ static void e_rd_tag(e_rd_class* i_this) { } else { parameter = 0xFF011123; } - fopAcM_createChild(PROC_E_RD, fopAcM_GetID(enemy), parameter, &pos, fopAcM_GetRoomNo(enemy), &angl, NULL, -1, NULL); + fopAcM_createChild(fpcNm_E_RD_e, fopAcM_GetID(enemy), parameter, &pos, fopAcM_GetRoomNo(enemy), &angl, NULL, -1, NULL); } } } @@ -4981,7 +5002,7 @@ static void action(e_rd_class* i_this) { fopAc_ac_c* actor = get_pla(enemy); cXyz mae, ato; - i_this->field_0x9c8 = 0; + i_this->aim_type = 0; if (actor == dComIfGp_getPlayer(0)) { i_this->dis = fopAcM_searchPlayerDistance(enemy); @@ -5013,14 +5034,14 @@ static void action(e_rd_class* i_this) { damage_check(i_this); if (curr_action == ACTION_WB_SEARCH && i_this->action != ACTION_WB_SEARCH) { e_wb_class* boar = (e_wb_class*)fopAcM_SearchByID(i_this->boar_id); - if (boar != NULL && boar->mActionID == 1) { - boar->mActionID = 0; + if (boar != NULL && boar->action == 1) { + boar->action = 0; } } - u8 cVar1 = i_this->field_0x5ba; - s8 cVar2 = 0; - s8 bVar1 = 1; + u8 scene_check = i_this->scene_no; + s8 search_check = 0; + s8 water_check = 1; s8 cVar3 = 0; i_this->enemy.offHeadLockFlg(); @@ -5032,32 +5053,32 @@ static void action(e_rd_class* i_this) { case ACTION_FIGHT_RUN: e_rd_fight_run(i_this); - cVar2 = 1; + search_check = 1; break; case ACTION_FIGHT: e_rd_fight(i_this); - cVar2 = 1; + search_check = 1; break; case ACTION_BOW_RUN: e_rd_bow_run(i_this); - cVar2 = 1; + search_check = 1; break; case ACTION_BOW: e_rd_bow(i_this); - cVar2 = 1; + search_check = 1; break; case ACTION_BOW2: cVar3 = e_rd_bow2(i_this); - cVar2 = 1; + search_check = 1; break; case ACTION_BOW_IKKI: e_rd_bow_ikki(i_this); - bVar1 = 0; + water_check = 0; break; case ACTION_AVOID: @@ -5070,7 +5091,7 @@ static void action(e_rd_class* i_this) { case ACTION_WB_RIDE: e_rd_wb_ride(i_this); - cVar1 = 0; + scene_check = 0; break; case ACTION_WB_RUN: @@ -5079,12 +5100,12 @@ static void action(e_rd_class* i_this) { } else { e_rd_wb_run(i_this); } - cVar1 = 0; + scene_check = 0; break; case ACTION_WB_BJUMP: e_rd_wb_bjump(i_this); - cVar1 = 0; + scene_check = 0; break; case ACTION_BOMB: @@ -5114,12 +5135,12 @@ static void action(e_rd_class* i_this) { case ACTION_COMMANDER: e_rd_commander(i_this); - cVar2 = 1; + search_check = 1; break; case ACTION_BOW3: cVar3 = e_rd_bow3(i_this); - cVar2 = 1; + search_check = 1; break; case ACTION_EXCITE: @@ -5128,17 +5149,17 @@ static void action(e_rd_class* i_this) { case ACTION_WATER: e_rd_water(i_this); - bVar1 = 0; + water_check = 0; break; case ACTION_KIBA_START: e_rd_kiba_start(i_this); - cVar1 = 0; + scene_check = 0; break; case ACTION_KIBA_END: e_rd_kiba_end(i_this); - cVar1 = 0; + scene_check = 0; break; case ACTION_IKKI_END: @@ -5158,7 +5179,7 @@ static void action(e_rd_class* i_this) { break; case ACTION_YAGURA: - cVar2 = e_rd_yagura(i_this); + search_check = e_rd_yagura(i_this); break; case ACTION_JYUNKAI: @@ -5178,19 +5199,19 @@ static void action(e_rd_class* i_this) { } if (cVar3 != 0 && otoCheck(enemy, 1500.0f)) { - SND_INFLUENCE* sound = dKy_Sound_get(); + SND_INFLUENCE* snd = dKy_Sound_get(); if (!pl_check(i_this, 500.0f, 0x7FFF)) { - mae = sound->position - enemy->current.pos; - if (mae.abs() < sound->field_0xc * 120) { - i_this->prev_action = i_this->action; + mae = snd->position - enemy->current.pos; + if (mae.abs() < snd->field_0xc * 120) { + i_this->old_action = i_this->action; i_this->action = ACTION_EXCITE; i_this->mode = 0; - S_find_pos = sound->position; + S_find_pos = snd->position; } } } - if (bVar1) { + if (water_check) { dBgS_ObjGndChk obj_gnd_chk; dBgS_ObjGndChk_Spl spl_chk; mae = enemy->current.pos; @@ -5213,7 +5234,7 @@ static void action(e_rd_class* i_this) { } } - if (cVar2 != 0) { + if (search_check != 0) { i_this->sound.setLinkSearch(true); if (desert_substage != 0 && (i_this->arg1 == 6 || i_this->arg1 == 7 || i_this->arg1 == 8)) { S_find = 20; @@ -5222,7 +5243,7 @@ static void action(e_rd_class* i_this) { i_this->sound.setLinkSearch(false); } - if (cVar1) { + if (scene_check) { if (desert_substage != 0) { if (!dComIfGp_event_runCheck() && i_this->yagura_timer == 0 && i_this->dis > 700.0f && i_this->field_0x5bb != 0) { fopAcM_delete(enemy); @@ -5267,15 +5288,15 @@ static void action(e_rd_class* i_this) { } if (i_this->field_0x9ad != 0) { - cXyz* pcVar1 = i_this->mStts.GetCCMoveP(); - if (pcVar1 != NULL) { - enemy->current.pos.x += pcVar1->x; - enemy->current.pos.z += pcVar1->z; + cXyz* moveP = i_this->Stts.GetCCMoveP(); + if (moveP != NULL) { + enemy->current.pos.x += moveP->x; + enemy->current.pos.z += moveP->z; } } - cLib_addCalc0(&i_this->field_0x9c0, 1.0f, 3.0f); - + cLib_addCalc0(&i_this->mount_jump_y, 1.0f, 3.0f); + if (i_this->field_0x9f0 > 0.1f) { mae.x = 0.0f; mae.y = 0.0f; @@ -5304,9 +5325,9 @@ static void action(e_rd_class* i_this) { e_wb_class* boar = (e_wb_class*)actor; if (i_this->boar_stand == 1) { - MTXCopy(boar->mpModelMorf->getModel()->getAnmMtx(boar->field_0x688 + 15), *calc_mtx); + MTXCopy(boar->anm_p->getModel()->getAnmMtx(boar->field_0x688 + 15), *calc_mtx); } else { - MTXCopy(boar->mpModelMorf->getModel()->getAnmMtx(boar->field_0x688 + 16), *calc_mtx); + MTXCopy(boar->anm_p->getModel()->getAnmMtx(boar->field_0x688 + 16), *calc_mtx); } if (i_this->actor_set != 0) { @@ -5314,33 +5335,33 @@ static void action(e_rd_class* i_this) { } else { mae.set(0.0f, BREG_F(4) + -45.0f, 0.0f); } - MtxPosition(&mae, &i_this->field_0x9b0); + MtxPosition(&mae, &i_this->center_body); if (i_this->ride_mode == 2) { - enemy->current.pos = i_this->field_0x9b0; + enemy->current.pos = i_this->center_body; enemy->shape_angle = enemy->current.angle = actor->shape_angle; mae.x = 10.0f; MtxPosition(&mae, &ato); - mae = ato - i_this->field_0x9b0; + mae = ato - i_this->center_body; ANGLE_ADD(enemy->current.angle.x, - -cM_atan2s(mae.y, JMAFastSqrt(mae.x * mae.x + mae.z * mae.z))); + -cM_atan2s(mae.y, JMAFastSqrt(SQUARE(mae.x) + SQUARE(mae.z)))); enemy->shape_angle.x = enemy->current.angle.x; if (i_this->boar_stand == 1) { - boar->field_0x1434 = fopAcM_GetID(i_this); + boar->rd_id = fopAcM_GetID(i_this); } } else { - mae = i_this->field_0x9b0 - enemy->current.pos; + mae = i_this->center_body - enemy->current.pos; cMtx_YrotS(*calc_mtx, cM_atan2s(mae.x, mae.z)); - cMtx_XrotM(*calc_mtx, -cM_atan2s(mae.y, JMAFastSqrt(mae.x * mae.x + mae.z * mae.z))); + cMtx_XrotM(*calc_mtx, -cM_atan2s(mae.y, JMAFastSqrt(SQUARE(mae.x) + SQUARE(mae.z)))); mae.x = 0.0f; mae.y = 0.0f; mae.z = TREG_F(3) + 20.0f; MtxPosition(&mae, &ato); enemy->current.pos += ato; - mae = i_this->field_0x9b0 - enemy->current.pos; + mae = i_this->center_body - enemy->current.pos; if (mae.abs() < 30.0f || i_this->timer[3] == 0) { i_this->ride_mode = 2; } @@ -5348,12 +5369,12 @@ static void action(e_rd_class* i_this) { cLib_addCalcAngleS2(&enemy->current.angle.y, actor->shape_angle.y, 4, 0x800); } - i_this->field_0x9c0 += i_this->field_0x9c4; - i_this->field_0x9c4 -= 4.5f + TREG_F(5); + i_this->mount_jump_y += i_this->mount_jump_speed; + i_this->mount_jump_speed -= 4.5f + TREG_F(5); - if (i_this->field_0x9c0 <= 0.0f) { - i_this->field_0x9c0 = 0.0f; - i_this->field_0x9c4 = 0.0f; + if (i_this->mount_jump_y <= 0.0f) { + i_this->mount_jump_y = 0.0f; + i_this->mount_jump_speed = 0.0f; } } @@ -5364,7 +5385,7 @@ static void action(e_rd_class* i_this) { cXyz ato2; s16 sp_0x24 = 0x1000; - if (i_this->field_0x9c8 == -1) { + if (i_this->aim_type == -1) { cMtx_YrotS(*calc_mtx, enemy->shape_angle.y); mae.x = 0.0f; mae.y = KREG_F(8) + 70.0f; @@ -5372,10 +5393,10 @@ static void action(e_rd_class* i_this) { MtxPosition(&mae, &ato2); ato2 += enemy->current.pos; - i_this->field_0x9c8 = 2; + i_this->aim_type = 2; sp_0x24 = KREG_S(7) + 0x800; - } else if (i_this->field_0x9c8 >= 11) { - i_this->field_0x9c8 -= (s8) 10; + } else if (i_this->aim_type >= 11) { + i_this->aim_type -= (s8) 10; ato2 = i_this->eye; } else { ato2 = actor->eyePos; @@ -5385,12 +5406,12 @@ static void action(e_rd_class* i_this) { sp_0x24 = 0x1000; } - if (i_this->field_0x9c8 != 0) { + if (i_this->aim_type != 0) { mae = ato2 - enemy->current.pos; mae.y += TREG_F(2) + -150.0f; sp_0x2a = cM_atan2s(mae.x, mae.z) - enemy->shape_angle.y; - sp_0x28 = enemy->shape_angle.x + cM_atan2s(mae.y, JMAFastSqrt(mae.x * mae.x + mae.z * mae.z)); - if (i_this->field_0x9c8 <= 2) { + sp_0x28 = enemy->shape_angle.x + cM_atan2s(mae.y, JMAFastSqrt(SQUARE(mae.x) + SQUARE(mae.z))); + if (i_this->aim_type <= 2) { if (sp_0x2a > sp_0x26) { sp_0x2a = sp_0x26; } else if (sp_0x2a < (s16) -sp_0x26) { @@ -5403,10 +5424,10 @@ static void action(e_rd_class* i_this) { sp_0x28 = -sp_0x26; } - cLib_addCalcAngleS2(&i_this->field_0x9ca, sp_0x2a, 2, sp_0x24); - } else if (i_this->field_0x9c8 == 5) { + cLib_addCalcAngleS2(&i_this->aim_angle_y, sp_0x2a, 2, sp_0x24); + } else if (i_this->aim_type == 5) { if ((i_this->counter & 15) == 0 && cM_rndF2(1.0f) < 0.3f) { - i_this->field_0x9d0 = cM_rndFX2(2000.0f); + i_this->head_shake = cM_rndFX2(2000.0f); } } else { sp_0x26 = XREG_S(5) + 30000; @@ -5419,8 +5440,8 @@ static void action(e_rd_class* i_this) { i_this->field_0x9a4 = 1; } - cLib_addCalcAngleS2(&i_this->field_0x9ca, sp_0x2a / 2, 2, 0x1000); - sp_0x28 = -cM_atan2s(mae.y, JMAFastSqrt(mae.x * mae.x + mae.z * mae.z)); + cLib_addCalcAngleS2(&i_this->aim_angle_y, sp_0x2a / 2, 2, 0x1000); + sp_0x28 = -cM_atan2s(mae.y, JMAFastSqrt(SQUARE(mae.x) + SQUARE(mae.z))); if (sp_0x28 > 0x2AF8) { sp_0x28 = 11000; i_this->field_0x9a4 = 1; @@ -5430,12 +5451,12 @@ static void action(e_rd_class* i_this) { } } } else { - cLib_addCalcAngleS2(&i_this->field_0x9ca, 0, 2, 0x1000); - i_this->field_0x9d0 = 0; + cLib_addCalcAngleS2(&i_this->aim_angle_y, 0, 2, 0x1000); + i_this->head_shake = 0; } - cLib_addCalcAngleS2(&i_this->field_0x9cc, sp_0x28, 2, sp_0x24); - cLib_addCalcAngleS2(&i_this->field_0x9ce, i_this->field_0x9d0, 4, 0x500); + cLib_addCalcAngleS2(&i_this->aim_angle_x, sp_0x28, 2, sp_0x24); + cLib_addCalcAngleS2(&i_this->head_angle_y, i_this->head_shake, 4, 0x500); if (fabsf(i_this->field_0xa2c) > 1.0f) { i_this->field_0xa74[1].x = i_this->field_0xa2c * cM_scos(i_this->field_0xa30) * (BREG_F(0) + 70.0f); @@ -5450,7 +5471,7 @@ static void action(e_rd_class* i_this) { i_this->field_0xa28 += s16(4000 + BREG_S(1)); } - if (enemy->speed.y < 0.0f && i_this->ObjAcch.ChkGroundHit()) { + if (enemy->speed.y < 0.0f && i_this->Bgc.ChkGroundHit()) { cLib_addCalc0(&i_this->field_0xa2c, 1.0f, 30.0f); cLib_addCalc0(&i_this->field_0xa24, 1.0f, 30.0f); } @@ -5540,8 +5561,8 @@ static void action(e_rd_class* i_this) { s16 sVar4 = 0; s16 sVar5 = 0; - if (i_this->field_0xa1e != 0) { - i_this->field_0xa1e--; + if (i_this->jump_timer != 0) { + i_this->jump_timer--; if (i_this->jump_angle.x != 0) { Vec sp280; cXyz sp28c, sp298; @@ -5619,9 +5640,9 @@ static void action(e_rd_class* i_this) { cLib_addCalcAngleS2(&i_this->field_0xa12.x, i_this->field_0xa18.x, 1, 0x400); cLib_addCalcAngleS2(&i_this->field_0xa12.z, i_this->field_0xa18.z, 1, 0x400); - if (i_this->field_0x129c != 0) { - i_this->field_0x129c--; - if (i_this->field_0x129c == 0) { + if (i_this->horn_timer != 0) { + i_this->horn_timer--; + if (i_this->horn_timer == 0) { dComIfGp_particle_set(ID_ZI_J_TUBA00, &enemy->eyePos, &enemy->shape_angle, NULL); } } @@ -5647,7 +5668,7 @@ static void action(e_rd_class* i_this) { cXyz sc(scale, scale, scale); csXyz rot(0, 0, 0); for (int i = 0; i < 3; i++) { - i_this->enemy_downWtrA[i] = dComIfGp_particle_set(i_this->enemy_downWtrA[i], w_eff_name[i], &ato, &enemy->tevStr, + i_this->w_eff_id[i] = dComIfGp_particle_set(i_this->w_eff_id[i], w_eff_name[i], &ato, &enemy->tevStr, &rot, &sc, 0xFF, 0, -1, NULL, NULL, NULL); } } else { @@ -5661,25 +5682,26 @@ static void action(e_rd_class* i_this) { setMidnaBindEffect(enemy, &i_this->sound, &enemy->eyePos, &size); } + static void fire_eff_set(e_rd_class* i_this) { fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; cXyz mae, ato; - int iVar1; - u16 uVar1[2]; + int num; + u16 fire_eff_name[2]; f32 scale; - if (i_this->weapon_type == 4) { - iVar1 = 2; - uVar1[0] = 0x1DF; - uVar1[1] = 0x1DE; + if (i_this->weapon_type == WEAPON_TYPE_BARROW) { + num = 2; + fire_eff_name[0] = ID_ZI_J_ARWB_SMOKE_A; + fire_eff_name[1] = ID_ZI_J_ARWB_HIBANA_A; i_this->sound.startCreatureSoundLevel(Z2SE_OBJ_BOMB_IGNITION, 0, -1); scale = NREG_F(18) + 2.0f; mae.x = NREG_F(0) + 62.0f; mae.y = NREG_F(1) + 22.0f; mae.z = NREG_F(2) + -50.0f; } else { - iVar1 = 1; - uVar1[0] = 0x8113; + num = 1; + fire_eff_name[0] = dPa_RM(ID_ZI_S_RD_ARROWFIRE_A); i_this->sound.startCreatureSoundLevel(Z2SE_OBJ_ARROW_FIRE_READY, 0, -1); scale = 1.0f; mae.x = NREG_F(0) + 90.0f; @@ -5688,26 +5710,26 @@ static void fire_eff_set(e_rd_class* i_this) { } MtxPosition(&mae, &ato); - i_this->field_0x1288 = ato - i_this->field_0x127c; - i_this->field_0x1288 *= 0.9f; - i_this->field_0x127c = ato; + i_this->fire_eff = ato - i_this->fire_pos; + i_this->fire_eff *= 0.9f; + i_this->fire_pos = ato; cXyz sc(scale, scale, scale); - for (int i = 0 ; i < iVar1; i++) { - i_this->fire_eff[i] = dComIfGp_particle_set(i_this->fire_eff[i], uVar1[i], &ato, &enemy->shape_angle, &sc); + for (int i = 0 ; i < num; i++) { + i_this->fire_eff_id[i] = dComIfGp_particle_set(i_this->fire_eff_id[i], fire_eff_name[i], &ato, &enemy->shape_angle, &sc); if (i == 0) { - JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(i_this->fire_eff[i]); + JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(i_this->fire_eff_id[i]); if (emitter != NULL) { emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB()); - emitter->setUserWork((uintptr_t)&i_this->field_0x1288); + emitter->setUserWork((uintptr_t)&i_this->fire_eff); } } } } static void* s_wb_sub2(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_WB_e) { e_wb_class* boar = (e_wb_class*) i_actor; fopAc_ac_c* actor = (fopAc_ac_c*) i_data; if (target_info_count < 2) { @@ -5721,7 +5743,7 @@ static void* s_wb_sub2(void* i_actor, void* i_data) { static void* s_lv9dn_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_DN && ((e_dn_class*)i_actor)->status != 0) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_DN_e && ((e_dn_class*)i_actor)->status != 0) { ((e_dn_class*)i_actor)->status = 0; return i_actor; } @@ -5731,17 +5753,17 @@ static void* s_lv9dn_sub(void* i_actor, void* i_data) { static void* s_lv9dn_sub2(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_DN && ((e_dn_class*)i_actor)->status == 0) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_DN_e && ((e_dn_class*)i_actor)->status == 0) { ((e_dn_class*)i_actor)->status = 1; ((e_dn_class*)i_actor)->mode = 0; } - + return NULL; } static void* s_lv9dn_sub3(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_DN) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_DN_e) { ((e_dn_class*)i_actor)->mode = 2; } @@ -5750,7 +5772,7 @@ static void* s_lv9dn_sub3(void* i_actor, void* i_data) { static void* s_lv9rd_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && ((e_rd_class*)i_actor)->field_0xafb != 0) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RD_e && ((e_rd_class*)i_actor)->field_0xafb != 0) { ((e_rd_class*)i_actor)->field_0xafb = 0; } @@ -5761,7 +5783,7 @@ static u8 data_80519338; static void* s_lv9rd_sub2(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RD_e && ((e_rd_class*)i_actor)->arg1 == data_80519338 && ((e_rd_class*)i_actor)->action != ACTION_DROP) { ((e_rd_class*)i_actor)->action = ACTION_DROP; ((e_rd_class*)i_actor)->mode = 2; @@ -5778,7 +5800,7 @@ static void* s_lv9rd_sub2(void* i_actor, void* i_data) { static void* s_lv9rd_sub3(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RD_e && (((e_rd_class*)i_actor)->arg1 == 13 || ((e_rd_class*)i_actor)->arg1 == 14)) { ((e_rd_class*)i_actor)->field_0x9a4 = 1; ((e_rd_class*)i_actor)->attack_range = 50000.0f; @@ -5789,7 +5811,7 @@ static void* s_lv9rd_sub3(void* i_actor, void* i_data) { static void* s_lv9arrow_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_ARROW) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_ARROW_e) { ((e_arrow_class*)i_actor)->field_0xa14 = 1; } @@ -5798,7 +5820,7 @@ static void* s_lv9arrow_sub(void* i_actor, void* i_data) { static void* s_lv9arrow_sub2(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_ARROW) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_ARROW_e) { ((e_arrow_class*)i_actor)->field_0xa14 = 0; ((e_arrow_class*)i_actor)->mAction = ACTION_BOW_RUN; ((e_arrow_class*)i_actor)->mMode = 0; @@ -5807,36 +5829,36 @@ static void* s_lv9arrow_sub2(void* i_actor, void* i_data) { return NULL; } -static void cam_3d_morf(e_rd_class* i_this, f32 param_2) { - cLib_addCalc2(&i_this->demo_cam_center.x, i_this->field_0x12cc.x, param_2, i_this->field_0x12e4.x * i_this->field_0x130c); - cLib_addCalc2(&i_this->demo_cam_center.y, i_this->field_0x12cc.y, param_2, i_this->field_0x12e4.y * i_this->field_0x130c); - cLib_addCalc2(&i_this->demo_cam_center.z, i_this->field_0x12cc.z, param_2, i_this->field_0x12e4.z * i_this->field_0x130c); - cLib_addCalc2(&i_this->demo_cam_eye.x, i_this->field_0x12c0.x, param_2, i_this->field_0x12d8.x * i_this->field_0x130c); - cLib_addCalc2(&i_this->demo_cam_eye.y, i_this->field_0x12c0.y, param_2, i_this->field_0x12d8.y * i_this->field_0x130c); - cLib_addCalc2(&i_this->demo_cam_eye.z, i_this->field_0x12c0.z, param_2, i_this->field_0x12d8.z * i_this->field_0x130c); +static void cam_3d_morf(e_rd_class* i_this, f32 i_scale) { + cLib_addCalc2(&i_this->demo_cam_ctr.x, i_this->demo_cam_target.x, i_scale, i_this->demo_cam_way_spd.x * i_this->demo_cam_morf); + cLib_addCalc2(&i_this->demo_cam_ctr.y, i_this->demo_cam_target.y, i_scale, i_this->demo_cam_way_spd.y * i_this->demo_cam_morf); + cLib_addCalc2(&i_this->demo_cam_ctr.z, i_this->demo_cam_target.z, i_scale, i_this->demo_cam_way_spd.z * i_this->demo_cam_morf); + cLib_addCalc2(&i_this->demo_cam_eye.x, i_this->demo_cam_way.x, i_scale, i_this->demo_cam_eye_spd.x * i_this->demo_cam_morf); + cLib_addCalc2(&i_this->demo_cam_eye.y, i_this->demo_cam_way.y, i_scale, i_this->demo_cam_eye_spd.y * i_this->demo_cam_morf); + cLib_addCalc2(&i_this->demo_cam_eye.z, i_this->demo_cam_way.z, i_scale, i_this->demo_cam_eye_spd.z * i_this->demo_cam_morf); } static void cam_spd_set(e_rd_class* i_this) { - i_this->field_0x12d8.x = fabsf(i_this->field_0x12c0.x - i_this->demo_cam_eye.x); - i_this->field_0x12d8.y = fabsf(i_this->field_0x12c0.y - i_this->demo_cam_eye.y); - i_this->field_0x12d8.z = fabsf(i_this->field_0x12c0.z - i_this->demo_cam_eye.z); - i_this->field_0x12e4.x = fabsf(i_this->field_0x12cc.x - i_this->demo_cam_center.x); - i_this->field_0x12e4.y = fabsf(i_this->field_0x12cc.y - i_this->demo_cam_center.y); - i_this->field_0x12e4.z = fabsf(i_this->field_0x12cc.z - i_this->demo_cam_center.z); - i_this->field_0x130c = 0.0f; + i_this->demo_cam_eye_spd.x = fabsf(i_this->demo_cam_way.x - i_this->demo_cam_eye.x); + i_this->demo_cam_eye_spd.y = fabsf(i_this->demo_cam_way.y - i_this->demo_cam_eye.y); + i_this->demo_cam_eye_spd.z = fabsf(i_this->demo_cam_way.z - i_this->demo_cam_eye.z); + i_this->demo_cam_way_spd.x = fabsf(i_this->demo_cam_target.x - i_this->demo_cam_ctr.x); + i_this->demo_cam_way_spd.y = fabsf(i_this->demo_cam_target.y - i_this->demo_cam_ctr.y); + i_this->demo_cam_way_spd.z = fabsf(i_this->demo_cam_target.z - i_this->demo_cam_ctr.z); + i_this->demo_cam_morf = 0.0f; } static void demo_camera(e_rd_class* i_this) { fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; daPy_py_c* pla = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_process_class* camera = (camera_process_class*) dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = (camera_class*) dComIfGp_getCamera(0); - daNPC_TK_c* taka = (daNPC_TK_c*) fopAcM_SearchByName(PROC_NPC_TK); + camera_process_class* cam = (camera_process_class*) dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_class* cam0 = (camera_class*) dComIfGp_getCamera(0); + daNPC_TK_c* taka = (daNPC_TK_c*) fopAcM_SearchByName(fpcNm_NPC_TK_e); fopAc_ac_c* actor = taka; cXyz mae, ato, sp50, target; bool sp_0x9 = true; // unused - s8 bVar1 = false; - s16 sVar1 = 0; + s8 demo_set = FALSE; + s16 bank = 0; switch (i_this->demo_mode + 1) { case 2: @@ -5846,15 +5868,15 @@ static void demo_camera(e_rd_class* i_this) { return; } - camera->mCamera.Stop(); + cam->mCamera.Stop(); i_this->demo_mode = 2; i_this->demo_timer = 0; i_this->demo_cam_zoom = 55.0f; - camera->mCamera.SetTrimSize(3); + cam->mCamera.SetTrimSize(3); - i_this->demo_cam_center = enemy->current.pos; - i_this->demo_cam_center.y = enemy->eyePos.y - 80.0f + 60.0f + TREG_F(5); - i_this->field_0x1300 = 2000.0f; + i_this->demo_cam_ctr = enemy->current.pos; + i_this->demo_cam_ctr.y = enemy->eyePos.y - 80.0f + 60.0f + TREG_F(5); + i_this->demo_cam_eye_z = 2000.0f; enemy->current.angle.y = i_this->angleY; // fallthrough case 3: @@ -5863,11 +5885,11 @@ static void demo_camera(e_rd_class* i_this) { mDoMtx_stack_c::XrotM(0x640); mae.x = 0.0f; mae.y = TREG_F(3); - mae.z = i_this->field_0x1300; + mae.z = i_this->demo_cam_eye_z; mDoMtx_stack_c::multVec(&mae, &i_this->demo_cam_eye); i_this->demo_cam_eye += enemy->current.pos; - cLib_addCalc2(&i_this->demo_cam_center.y, enemy->eyePos.y - 80.0f + 60.0f + TREG_F(5), 0.1f, 20.0f); - cLib_addCalc2(&i_this->field_0x1300, 400.0f, 0.5f, 150.0f); + cLib_addCalc2(&i_this->demo_cam_ctr.y, enemy->eyePos.y - 80.0f + 60.0f + TREG_F(5), 0.1f, 20.0f); + cLib_addCalc2(&i_this->demo_cam_eye_z, 400.0f, 0.5f, 150.0f); } else if (desert_substage == 124) { // main Gerudo Desert lbl_70_bss_AE = true; @@ -5879,25 +5901,25 @@ static void demo_camera(e_rd_class* i_this) { fpcM_Search(s_wb_sub2, i_this); if (target_info[0] != NULL && target_info[1] != NULL) { - i_this->demo_cam_center = target_info[0]->current.pos + ((target_info[1]->current.pos - target_info[0]->current.pos) * 0.5f); - i_this->demo_cam_center.y += 200.0f + BREG_F(7); + i_this->demo_cam_ctr = target_info[0]->current.pos + ((target_info[1]->current.pos - target_info[0]->current.pos) * 0.5f); + i_this->demo_cam_ctr.y += 200.0f + BREG_F(7); if (i_this->demo_timer == 85) { - i_this->demo_cam_eye = i_this->demo_cam_center; + i_this->demo_cam_eye = i_this->demo_cam_ctr; i_this->demo_cam_eye.y += 100.0f + VREG_F(8); i_this->demo_cam_eye.z += 900.0f + VREG_F(9); } else { - cLib_addCalc2(&i_this->demo_cam_eye.x, i_this->demo_cam_center.x, 0.2f, 100.0f); - cLib_addCalc2(&i_this->demo_cam_eye.y, i_this->demo_cam_center.y + 100.0f + VREG_F(8), 0.2f, 100.0f); - cLib_addCalc2(&i_this->demo_cam_eye.z, i_this->demo_cam_center.z + 900.0f + VREG_F(9), 0.2f, 100.0f); + cLib_addCalc2(&i_this->demo_cam_eye.x, i_this->demo_cam_ctr.x, 0.2f, 100.0f); + cLib_addCalc2(&i_this->demo_cam_eye.y, i_this->demo_cam_ctr.y + 100.0f + VREG_F(8), 0.2f, 100.0f); + cLib_addCalc2(&i_this->demo_cam_eye.z, i_this->demo_cam_ctr.z + 900.0f + VREG_F(9), 0.2f, 100.0f); } } if (i_this->demo_timer == 220) { - bVar1 = true; + demo_set = true; } } else if (i_this->demo_timer == 140) { - bVar1 = true; + demo_set = true; } break; @@ -5908,31 +5930,31 @@ static void demo_camera(e_rd_class* i_this) { return; } - camera->mCamera.Stop(); + cam->mCamera.Stop(); i_this->demo_mode = 11; i_this->demo_timer = 0; i_this->demo_cam_zoom = 55.0f; dComIfGp_offCameraAttentionStatus(0, 8); - camera->mCamera.SetTrimSize(3); + cam->mCamera.SetTrimSize(3); - i_this->demo_cam_center = enemy->current.pos; - i_this->demo_cam_center.y = (enemy->eyePos.y - 80.0f) + 60.0f + TREG_F(5); - i_this->demo_cam_eye = camera0->view.lookat.eye; + i_this->demo_cam_ctr = enemy->current.pos; + i_this->demo_cam_ctr.y = (enemy->eyePos.y - 80.0f) + 60.0f + TREG_F(5); + i_this->demo_cam_eye = cam0->view.lookat.eye; enemy->current.angle.y = i_this->angleY; - i_this->field_0x1300 = 2000.0f; + i_this->demo_cam_eye_z = 2000.0f; // fallthrough case 12: mDoMtx_stack_c::YrotS(s16(enemy->current.angle.y)); mDoMtx_stack_c::XrotM(0x640); mae.x = 0.0f; mae.y = TREG_F(3); - mae.z = i_this->field_0x1300; + mae.z = i_this->demo_cam_eye_z; mDoMtx_stack_c::multVec(&mae, &ato); ato.x += enemy->current.pos.x; ato.z += enemy->current.pos.z; ato.y += enemy->home.pos.y; - cLib_addCalc2(&i_this->field_0x1300, 400.0f, 0.5f, 150.0f); + cLib_addCalc2(&i_this->demo_cam_eye_z, 400.0f, 0.5f, 150.0f); if (i_this->demo_timer < 20) { i_this->demo_cam_eye = ato; @@ -5941,12 +5963,12 @@ static void demo_camera(e_rd_class* i_this) { cLib_addCalc2(&i_this->demo_cam_eye.z, ato.z, 0.1f, 10.0f); } - cLib_addCalc2(&i_this->demo_cam_center.x, enemy->eyePos.x, 0.1f, 10.0f); - cLib_addCalc2(&i_this->demo_cam_center.z, enemy->eyePos.z, 0.1f, 10.0f); - cLib_addCalc2(&i_this->demo_cam_center.y, enemy->eyePos.y - 80.0f + 60.0f + TREG_F(5), 0.1f, 100.0f); + cLib_addCalc2(&i_this->demo_cam_ctr.x, enemy->eyePos.x, 0.1f, 10.0f); + cLib_addCalc2(&i_this->demo_cam_ctr.z, enemy->eyePos.z, 0.1f, 10.0f); + cLib_addCalc2(&i_this->demo_cam_ctr.y, enemy->eyePos.y - 80.0f + 60.0f + TREG_F(5), 0.1f, 100.0f); if (i_this->demo_timer == s16(100 + KREG_S(8))) { - bVar1 = true; + demo_set = true; } break; @@ -5964,18 +5986,18 @@ static void demo_camera(e_rd_class* i_this) { return; } - camera->mCamera.Stop(); + cam->mCamera.Stop(); i_this->demo_mode = 21; i_this->demo_timer = 0; i_this->demo_cam_zoom = 55.0f; - camera->mCamera.SetTrimSize(3); + cam->mCamera.SetTrimSize(3); - i_this->demo_cam_center = camera0->view.lookat.center; - i_this->demo_cam_eye = camera0->view.lookat.eye; - i_this->field_0x12cc.set(-7875.0f, 2125.0f, 7895.0f); - i_this->field_0x12c0.set(-7527.0f, 2084.0f, 7552.0f); + i_this->demo_cam_ctr = cam0->view.lookat.center; + i_this->demo_cam_eye = cam0->view.lookat.eye; + i_this->demo_cam_target.set(-7875.0f, 2125.0f, 7895.0f); + i_this->demo_cam_way.set(-7527.0f, 2084.0f, 7552.0f); cam_spd_set(i_this); - i_this->field_0x12e4 *= 2.0f; + i_this->demo_cam_way_spd *= 2.0f; i_this->field_0x12f0 = pla->current.pos; i_this->field_0x12f0.y = 2000.0f; @@ -5995,7 +6017,7 @@ static void demo_camera(e_rd_class* i_this) { } cam_3d_morf(i_this, BREG_F(17) + 0.2f); - cLib_addCalc2(&i_this->field_0x130c, BREG_F(16) + 0.1f, 1.0f, BREG_F(17) + 0.002f); + cLib_addCalc2(&i_this->demo_cam_morf, BREG_F(16) + 0.1f, 1.0f, BREG_F(17) + 0.002f); if (i_this->demo_timer == 70) { dComIfGs_onSwitch(75, fopAcM_GetRoomNo(enemy)); @@ -6003,7 +6025,7 @@ static void demo_camera(e_rd_class* i_this) { if (i_this->demo_timer >= 70) { ato.set(-5182.0f, 2000.0f, 5237.0f); - daPy_getPlayerActorClass()->setPlayerPosAndAngle(&ato, -8111, 0); + daPy_getPlayerActorClass()->setPlayerPosAndAngle(&ato,0xE051, 0); } if (i_this->demo_timer == 120 || i_this->demo_timer == 130 @@ -6018,8 +6040,8 @@ static void demo_camera(e_rd_class* i_this) { } if (i_this->demo_timer == 180) { - i_this->field_0x12cc.set(-7241.0f, 4310.0f, 7269.0f); - i_this->field_0x12c0.set(-6913.0f, 4139.0f, 6948.0f); + i_this->demo_cam_target.set(-7241.0f, 4310.0f, 7269.0f); + i_this->demo_cam_way.set(-6913.0f, 4139.0f, 6948.0f); cam_spd_set(i_this); i_this->demo_mode = 22; i_this->demo_timer = 0; @@ -6031,7 +6053,7 @@ static void demo_camera(e_rd_class* i_this) { case 23: cam_3d_morf(i_this, BREG_F(17) + 0.2f); - cLib_addCalc2(&i_this->field_0x130c, BREG_F(16) + 0.15f, 1.0f, BREG_F(17) + 0.005f); + cLib_addCalc2(&i_this->demo_cam_morf, BREG_F(16) + 0.15f, 1.0f, BREG_F(17) + 0.005f); cLib_addCalc2(&i_this->demo_cam_zoom, 55.0f, 0.1f, 0.5f); if (i_this->demo_timer == 13) { @@ -6043,7 +6065,7 @@ static void demo_camera(e_rd_class* i_this) { } if (i_this->demo_timer == 55) { - i_this->demo_cam_center.set(-8330.0f, 4359.0f, 8449.0f); + i_this->demo_cam_ctr.set(-8330.0f, 4359.0f, 8449.0f); i_this->demo_cam_eye.set(-8183.0f, 4264.0f, 7991.0f); i_this->demo_cam_zoom = 55.0f; i_this->demo_mode = 23; @@ -6063,7 +6085,7 @@ static void demo_camera(e_rd_class* i_this) { } if (i_this->demo_timer == 40) { - i_this->demo_cam_center.set(-8033.0f, 4259.0f, 8143.0f); + i_this->demo_cam_ctr.set(-8033.0f, 4259.0f, 8143.0f); i_this->demo_cam_eye.set(-8337.0f, 4488.0f, 8451.0f); } @@ -6075,8 +6097,8 @@ static void demo_camera(e_rd_class* i_this) { i_this->field_0x9a4 = 0; i_this->demo_mode = 24; i_this->demo_timer = 0; - i_this->field_0x12cc.set(-4910.0f, 2012.0f, 4976.0f); - i_this->field_0x12c0.set(-5235.0f, 2179.0f, 5302.0f); + i_this->demo_cam_target.set(-4910.0f, 2012.0f, 4976.0f); + i_this->demo_cam_way.set(-5235.0f, 2179.0f, 5302.0f); cam_spd_set(i_this); } break; @@ -6087,8 +6109,8 @@ static void demo_camera(e_rd_class* i_this) { if (i_this->demo_timer >= 4) { i_this->blurRate = 200 + VREG_S(7); - sVar1 = cM_scos(i_this->demo_timer * 0x500) * 2500.0f; - i_this->field_0x130c = 0.03f + BREG_F(16); + bank = cM_scos(i_this->demo_timer * 0x500) * 2500.0f; + i_this->demo_cam_morf = 0.03f + BREG_F(16); cam_3d_morf(i_this, 0.5f + BREG_F(17)); if (i_this->demo_timer == 4) { @@ -6121,10 +6143,10 @@ static void demo_camera(e_rd_class* i_this) { if (i_this->demo_timer == 40) { mDoGph_gInf_c::fadeIn(0.5f, g_blackColor); i_this->demo_cam_zoom = 55.0f; - i_this->demo_cam_center.set(-5197.0f, 1712.0f, 5039.0f); + i_this->demo_cam_ctr.set(-5197.0f, 1712.0f, 5039.0f); i_this->demo_cam_eye.set(-5215.0f, 2108.0f, 5327.0f); - i_this->field_0x12cc.set(-5025.0f, 2270.0f, 4909.0f); - i_this->field_0x12c0.set(-5215.0f, 2108.0f, 5327.0f); + i_this->demo_cam_target.set(-5025.0f, 2270.0f, 4909.0f); + i_this->demo_cam_way.set(-5215.0f, 2108.0f, 5327.0f); cam_spd_set(i_this); fpcM_Search(s_lv9arrow_sub2, i_this); } @@ -6138,13 +6160,13 @@ static void demo_camera(e_rd_class* i_this) { case 27: cam_3d_morf(i_this, BREG_F(17) + 0.2f); - cLib_addCalc2(&i_this->field_0x130c, BREG_F(16) + 0.5f, 1.0f, BREG_F(17) + 0.01f); + cLib_addCalc2(&i_this->demo_cam_morf, BREG_F(16) + 0.5f, 1.0f, BREG_F(17) + 0.01f); if (i_this->demo_timer == 55) { - i_this->demo_cam_center.set(-5529.0f, 2457.0f, 5589.0f); + i_this->demo_cam_ctr.set(-5529.0f, 2457.0f, 5589.0f); i_this->demo_cam_eye.set(-5232.0f, 2201.0f, 5295.0f); - i_this->field_0x12cc.set(-5580.0f, 2188.0f, 5640.0f); - i_this->field_0x12c0.set(-5232.0f, 2201.0f, 5295.0f); + i_this->demo_cam_target.set(-5580.0f, 2188.0f, 5640.0f); + i_this->demo_cam_way.set(-5232.0f, 2201.0f, 5295.0f); cam_spd_set(i_this); i_this->demo_mode = 27; i_this->demo_timer = 0; @@ -6171,7 +6193,7 @@ static void demo_camera(e_rd_class* i_this) { } else if (i_this->demo_timer >= 120) { cLib_addCalc2(&i_this->demo_cam_zoom, 55.0f, 0.05f, 0.4f); cam_3d_morf(i_this, BREG_F(17) + 0.2f); - cLib_addCalc2(&i_this->field_0x130c, BREG_F(16) + 0.1f, 1.0f, BREG_F(17) + 0.01f); + cLib_addCalc2(&i_this->demo_cam_morf, BREG_F(16) + 0.1f, 1.0f, BREG_F(17) + 0.01f); if (i_this->demo_timer == 177) { ato.set(-5821.0f, 2000.0f, 5850.0f); @@ -6191,8 +6213,8 @@ static void demo_camera(e_rd_class* i_this) { i_this->demo_mode = 28; i_this->demo_timer = 0; - i_this->field_0x12cc.set(-5406.0f, 2168.0f, 5468.0f); - i_this->field_0x12c0.set(-5058.0f, 2181.0f, 5124.0f); + i_this->demo_cam_target.set(-5406.0f, 2168.0f, 5468.0f); + i_this->demo_cam_way.set(-5058.0f, 2181.0f, 5124.0f); cam_spd_set(i_this); // fallthrough case 29: @@ -6202,22 +6224,22 @@ static void demo_camera(e_rd_class* i_this) { if (i_this->demo_timer < 25) { cam_3d_morf(i_this, BREG_F(17) + 0.2f); - cLib_addCalc2(&i_this->field_0x130c, BREG_F(16) + 0.2f, 1.0f, BREG_F(17) + 0.01f); + cLib_addCalc2(&i_this->demo_cam_morf, BREG_F(16) + 0.2f, 1.0f, BREG_F(17) + 0.01f); if (i_this->demo_timer == 23) { taka->setResistanceDemo(); } } else { if (i_this->demo_timer == 25) { - i_this->field_0x130c = 0.0f; + i_this->demo_cam_morf = 0.0f; } target = actor->current.pos; - cLib_addCalc2(&i_this->demo_cam_center.x, target.x, 0.2f, i_this->field_0x130c * 100.0f); - cLib_addCalc2(&i_this->demo_cam_center.y, target.y + BREG_F(13), 0.2f, i_this->field_0x130c * 100.0f); - cLib_addCalc2(&i_this->demo_cam_center.z, target.z, 0.2f, i_this->field_0x130c * 100.0f); + cLib_addCalc2(&i_this->demo_cam_ctr.x, target.x, 0.2f, i_this->demo_cam_morf * 100.0f); + cLib_addCalc2(&i_this->demo_cam_ctr.y, target.y + BREG_F(13), 0.2f, i_this->demo_cam_morf * 100.0f); + cLib_addCalc2(&i_this->demo_cam_ctr.z, target.z, 0.2f, i_this->demo_cam_morf * 100.0f); - cLib_addCalc2(&i_this->field_0x130c, 1.0f, 1.0f, 0.03f); + cLib_addCalc2(&i_this->demo_cam_morf, 1.0f, 1.0f, 0.03f); if (i_this->demo_timer >= 55) { if (i_this->demo_timer == 110) { @@ -6245,15 +6267,15 @@ static void demo_camera(e_rd_class* i_this) { target = actor->current.pos; if (i_this->demo_timer == 0) { - i_this->demo_cam_center = target; + i_this->demo_cam_ctr = target; } else { - cLib_addCalc2(&i_this->demo_cam_center.x, target.x, 0.2f, 100.0f); - cLib_addCalc2(&i_this->demo_cam_center.y, target.y, 0.2f, 100.0f); - cLib_addCalc2(&i_this->demo_cam_center.z, target.z, 0.2f, 100.0f); + cLib_addCalc2(&i_this->demo_cam_ctr.x, target.x, 0.2f, 100.0f); + cLib_addCalc2(&i_this->demo_cam_ctr.y, target.y, 0.2f, 100.0f); + cLib_addCalc2(&i_this->demo_cam_ctr.z, target.z, 0.2f, 100.0f); if (i_this->demo_timer == 140) { - i_this->field_0x12cc.set(-4080.0f, 134.0f, 8190.0f); - i_this->field_0x12c0 = i_this->demo_cam_eye; + i_this->demo_cam_target.set(-4080.0f, 134.0f, 8190.0f); + i_this->demo_cam_way = i_this->demo_cam_eye; cam_spd_set(i_this); i_this->demo_mode = 30; i_this->demo_timer = 0; @@ -6263,13 +6285,13 @@ static void demo_camera(e_rd_class* i_this) { case 31: cam_3d_morf(i_this, BREG_F(17) + 0.1f); - cLib_addCalc2(&i_this->field_0x130c, BREG_F(16) + 0.1f, 1.0f, BREG_F(17) + 0.002f); + cLib_addCalc2(&i_this->demo_cam_morf, BREG_F(16) + 0.1f, 1.0f, BREG_F(17) + 0.002f); if (i_this->demo_timer == 70) { - i_this->demo_cam_center.set(-4527.0f, 143.0f, 8305.0f); + i_this->demo_cam_ctr.set(-4527.0f, 143.0f, 8305.0f); i_this->demo_cam_eye.set(-4676.0f, 161.0f, 8282.0f); - i_this->field_0x12cc.set(-4552.0f, 143.0f, 8461.0f); - i_this->field_0x12c0.set(-4701.0f, 161.0f, 8438.0f); + i_this->demo_cam_target.set(-4552.0f, 143.0f, 8461.0f); + i_this->demo_cam_way.set(-4701.0f, 161.0f, 8438.0f); cam_spd_set(i_this); i_this->demo_mode = 31; i_this->demo_timer = 0; @@ -6280,12 +6302,12 @@ static void demo_camera(e_rd_class* i_this) { case 32: cam_3d_morf(i_this, BREG_F(17) + 0.05f); - cLib_addCalc2(&i_this->field_0x130c, BREG_F(16) + 0.05f, 1.0f, BREG_F(17) + 0.001f); + cLib_addCalc2(&i_this->demo_cam_morf, BREG_F(16) + 0.05f, 1.0f, BREG_F(17) + 0.001f); if (i_this->demo_timer == 70) { i_this->demo_mode = 32; i_this->demo_timer = 0; - i_this->demo_cam_center.set(-5275.0f, 2327.0f, 5812.0f); + i_this->demo_cam_ctr.set(-5275.0f, 2327.0f, 5812.0f); i_this->demo_cam_eye.set(-5367.0f, 2689.0f, 5495.0f); i_this->demo_cam_zoom = 30.0f; } @@ -6293,10 +6315,11 @@ static void demo_camera(e_rd_class* i_this) { case 33: if (i_this->demo_timer == 60) { - i_this->demo_cam_center.set(-3906.0f, 42.0f, 8198.0f); + i_this->demo_cam_ctr.set(-3906.0f, 42.0f, 8198.0f); i_this->demo_cam_eye.set(-4274.0f, 272.0f, 7969.0f); i_this->demo_mode = 33; i_this->demo_timer = 0; + /* Rusl waves at Link Flag*/ dComIfGs_onTmpBit((u16) dSv_event_tmp_flag_c::tempBitLabels[0x75]); } break; @@ -6307,7 +6330,7 @@ static void demo_camera(e_rd_class* i_this) { } if (i_this->demo_timer == 70) { - i_this->demo_cam_center.set(-5712.0f, 2308.0f, 5828.0f); + i_this->demo_cam_ctr.set(-5712.0f, 2308.0f, 5828.0f); i_this->demo_cam_eye.set(-5286.0f, 2104.0f, 5957.0f); i_this->demo_cam_zoom = 45.0f; i_this->demo_mode = 34; @@ -6318,7 +6341,7 @@ static void demo_camera(e_rd_class* i_this) { case 35: cLib_addCalc2(&i_this->demo_cam_zoom, 40.0f, 0.05f, 0.02f); if (i_this->demo_timer == 80) { - i_this->demo_cam_center.set(-4712.0f, 870.0f, 7432.0f); + i_this->demo_cam_ctr.set(-4712.0f, 870.0f, 7432.0f); i_this->demo_cam_eye.set(-4852.0f, 1171.0f, 7072.0f); i_this->demo_cam_zoom = 55.0f; i_this->demo_mode = 35; @@ -6330,7 +6353,7 @@ static void demo_camera(e_rd_class* i_this) { case 36: if (i_this->demo_timer == 120) { - bVar1 = true; + demo_set = true; int bitsw = (fopAcM_GetParam(enemy) & 0xFF000000) >> 24; if (bitsw != 0xFF) { dComIfGs_onSwitch(bitsw, fopAcM_GetRoomNo(enemy)); @@ -6339,9 +6362,9 @@ static void demo_camera(e_rd_class* i_this) { break; } - if (bVar1) { - camera->mCamera.Start(); - camera->mCamera.SetTrimSize(0); + if (demo_set) { + cam->mCamera.Start(); + cam->mCamera.SetTrimSize(0); dComIfGp_event_reset(); daPy_getPlayerActorClass()->cancelOriginalDemo(); i_this->demo_mode = -1; @@ -6349,9 +6372,9 @@ static void demo_camera(e_rd_class* i_this) { if (i_this->demo_mode > 0) { cXyz center, eye; - center = i_this->demo_cam_center; + center = i_this->demo_cam_ctr; eye = i_this->demo_cam_eye; - camera->mCamera.Set(center, eye, sVar1, i_this->demo_cam_zoom); + cam->mCamera.Set(center, eye, bank, i_this->demo_cam_zoom); i_this->demo_timer++; } } @@ -6383,7 +6406,7 @@ static int daE_RD_Execute(e_rd_class* i_this) { i_this->counter++; - if (i_this->actor_set == 0) { + if (i_this->actor_set == ACTOR_SET_NONE) { i_this->field_0x1297 = i_this->field_0x1298; } else { fopAc_ac_c* pla = dComIfGp_getPlayer(0); @@ -6432,15 +6455,15 @@ static int daE_RD_Execute(e_rd_class* i_this) { i_this->look_timer--; } - i_this->field_0x9a2 = 0; + i_this->arrow_draw = FALSE; i_this->field_0x9ad = 1; action(i_this); - if (i_this->ride_mode != 0) { + if (i_this->ride_mode != RIDE_MODE_OFF) { i_this->field_0x9ad = 0; } - if (i_this->ride_mode != 2 && i_this->field_0xaf0 == 0 && i_this->action != ACTION_IKKI_END) { + if (i_this->ride_mode != RIDE_MODE_RIDE && i_this->field_0xaf0 == 0 && i_this->action != ACTION_IKKI_END) { ato.set(0.0f, 0.0f, 0.0f); if (i_this->jump_z) { cMtx_YrotS(*calc_mtx, i_this->jump_angle.y); @@ -6459,14 +6482,14 @@ static int daE_RD_Execute(e_rd_class* i_this) { enemy->current.pos += ato; enemy->old.pos += ato; - i_this->ObjAcch.CrrPos(dComIfG_Bgsp()); + i_this->Bgc.CrrPos(dComIfG_Bgsp()); enemy->current.pos -= ato; enemy->old.pos -= ato; - if (!i_this->ObjAcch.ChkGroundHit()) { + if (!i_this->Bgc.ChkGroundHit()) { if (enemy->speed.y < -10.0f) { i_this->field_0xaf2++; - if (i_this->field_0xaf2 == 20 && i_this->actor_set == 0) { + if (i_this->field_0xaf2 == 20 && i_this->actor_set == ACTOR_SET_NONE) { i_this->sound.startCreatureVoice(Z2SE_EN_RD_V_DEATH, -1); } } @@ -6486,13 +6509,13 @@ static int daE_RD_Execute(e_rd_class* i_this) { i_this->field_0x1294 = 0; - if (i_this->ObjAcch.GetGroundH() != -G_CM3D_F_INF && i_this->ObjAcch.ChkWaterHit() && i_this->ObjAcch.m_wtr.GetHeight() > enemy->current.pos.y) { + if (i_this->Bgc.GetGroundH() != -G_CM3D_F_INF && i_this->Bgc.ChkWaterHit() && i_this->Bgc.m_wtr.GetHeight() > enemy->current.pos.y) { i_this->field_0x1294 = 1; } } if (i_this->field_0xafb == 0) { - mDoMtx_stack_c::transS(enemy->current.pos.x, enemy->current.pos.y + i_this->field_0x9c0, enemy->current.pos.z); + mDoMtx_stack_c::transS(enemy->current.pos.x, enemy->current.pos.y + i_this->mount_jump_y, enemy->current.pos.z); mDoMtx_stack_c::XrotM((s16) i_this->field_0xa12.x); mDoMtx_stack_c::ZrotM((s16) i_this->field_0xa12.z); mDoMtx_stack_c::YrotM((s16) i_this->jump_angle.y); @@ -6503,7 +6526,7 @@ static int daE_RD_Execute(e_rd_class* i_this) { mDoMtx_stack_c::ZrotM(enemy->shape_angle.z); f32 scale = l_HIO.model_size * enemy->scale.x; - if (i_this->actor_set != 0) { + if (i_this->actor_set != ACTOR_SET_NONE) { scale *= l_HIO.leader_size_ratio; } mDoMtx_stack_c::scaleM(scale, scale, scale); @@ -6534,7 +6557,7 @@ static int daE_RD_Execute(e_rd_class* i_this) { } } - if (i_this->actor_set != 0) { + if (i_this->actor_set != ACTOR_SET_NONE) { if (i_this->anm == e_rdb_class::BCK_RB_RCOMEON) { if (i_this->anm_p->checkFrame(30.0f)) { i_this->sound.startCreatureVoice(Z2SE_EN_RDB_V_LAUGH, -1); @@ -6567,7 +6590,7 @@ static int daE_RD_Execute(e_rd_class* i_this) { i_this->field_0x6d0 = 1.0f; MTXCopy(model->getAnmMtx(13), *calc_mtx); camera_class* camera = (camera_class*) dComIfGp_getCamera(0); - + static f32 time_scale[25] = { 1.2f, 1.2f, 1.1f, 1.0f, 0.8f, 0.6f, 0.4f, 0.2f, @@ -6593,7 +6616,7 @@ static int daE_RD_Execute(e_rd_class* i_this) { mae = camera->view.lookat.eye - ato; y = cM_atan2s(mae.x, mae.z); - x = -cM_atan2s(mae.y, JMAFastSqrt(mae.x * mae.x + mae.z * mae.z)); + x = -cM_atan2s(mae.y, JMAFastSqrt(SQUARE(mae.x) + SQUARE(mae.z))); scale = mae.abs() * (0.001f + JREG_F(8)); if (scale > 2.0f + JREG_F(17)) { scale = 2.0f + JREG_F(17); @@ -6639,7 +6662,7 @@ static int daE_RD_Execute(e_rd_class* i_this) { cr.set(-20000.0f, 200000.0f, 30000.0f); } - if (i_this->actor_set != 0) { + if (i_this->actor_set != ACTOR_SET_NONE) { MTXCopy(model->getAnmMtx(AREG_S(9) + 6), *calc_mtx); } else { MTXCopy(model->getAnmMtx(13), *calc_mtx); @@ -6657,11 +6680,11 @@ static int daE_RD_Execute(e_rd_class* i_this) { i_this->cc_sph[0].SetR(35.0f); } - if (i_this->ride_mode == 2) { + if (i_this->ride_mode == RIDE_MODE_RIDE) { enemy->attention_info.position = enemy->current.pos; enemy->attention_info.position.y += 190.0f + JREG_F(8); - if (i_this->actor_set != 0) { + if (i_this->actor_set != ACTOR_SET_NONE) { enemy->attention_info.position.y += 120.0f + JREG_F(9); } } else { @@ -6669,10 +6692,10 @@ static int daE_RD_Execute(e_rd_class* i_this) { enemy->attention_info.position.y += 30.0f; } - if (i_this->actor_set != 0) { + if (i_this->actor_set != ACTOR_SET_NONE) { f32 rad = 60.0f; f32 size = 0.0f; - if (i_this->actor_set == 2) { + if (i_this->actor_set == ACTOR_SET_IKKI) { rad = 90.0f; size = l_HIO.ikki_boss_size; } @@ -6711,13 +6734,13 @@ static int daE_RD_Execute(e_rd_class* i_this) { dComIfG_Ccsp()->Set(&i_this->cc_sph[i]); - if (i_this->actor_set == 1 && i_this->ride_mode == 2) { + if (i_this->actor_set == ACTOR_SET_E3_2005 && i_this->ride_mode == RIDE_MODE_RIDE) { i_this->cc_sph[i].OnTgNoHitMark(); } else { i_this->cc_sph[i].OffTgNoHitMark(); } - if (i_this->actor_set == 3) { + if (i_this->actor_set == ACTOR_SET_IKKI2) { for (int j = 0; j <= 2; j++) { i_this->cc_sph[j].SetTgType(0x2022); i_this->cc_sph[j].OnTgNoHitMark(); @@ -6736,8 +6759,8 @@ static int daE_RD_Execute(e_rd_class* i_this) { i_this->field_0x9ab = 0; } - if (i_this->weapon_type == 1) { - if (i_this->field_0x5bd == 0) { + if (i_this->weapon_type == WEAPON_TYPE_CLUB) { + if (i_this->armament_flag == 0) { MTXCopy(i_this->anm_p->getModel()->getAnmMtx(24), *calc_mtx); } else { MTXCopy(i_this->anm_p->getModel()->getAnmMtx(11), *calc_mtx); @@ -6747,7 +6770,7 @@ static int daE_RD_Execute(e_rd_class* i_this) { MtxTrans(-30.0f, -50.0f, 20.0f, 1); } - i_this->arrow->setBaseTRMtx(*calc_mtx); + i_this->arrow_model->setBaseTRMtx(*calc_mtx); if (i_this->field_0x9ab != 0) { if (daPy_getPlayerActorClass()->checkHorseRide() || daPy_getPlayerActorClass()->checkBoarRide()) { @@ -6778,7 +6801,7 @@ static int daE_RD_Execute(e_rd_class* i_this) { dComIfG_Ccsp()->Set(&i_this->at_sph); } - if (i_this->weapon_type >= 2) { + if (i_this->weapon_type >= WEAPON_TYPE_BOW) { J3DModel* model = i_this->anm_p->getModel(); if (i_this->bow_shake_timer != 0) { @@ -6788,7 +6811,7 @@ static int daE_RD_Execute(e_rd_class* i_this) { i_this->field_0x9a8 = i_this->bow_shake_timer * cM_ssin(i_this->bow_shake_timer * (TREG_S(9) + 0x7800)) * (TREG_F(5) + 100.0f); model = i_this->bow_anm->getModel(); - if (i_this->field_0x5bd == 0) { + if (i_this->armament_flag == 0) { model->setBaseTRMtx(i_this->anm_p->getModel()->getAnmMtx(19)); } else { MTXCopy(i_this->anm_p->getModel()->getAnmMtx(11), *calc_mtx); @@ -6802,21 +6825,21 @@ static int daE_RD_Execute(e_rd_class* i_this) { i_this->bow_anm->play(0, 0); i_this->bow_anm->modelCalc(); - if (i_this->field_0x9a2 != 0) { + if (i_this->arrow_draw != 0) { MTXCopy(i_this->anm_p->getModel()->getAnmMtx(24), *calc_mtx); - i_this->arrow->setBaseTRMtx(*calc_mtx); + i_this->arrow_model->setBaseTRMtx(*calc_mtx); - if (i_this->weapon_type >= 3) { - if (i_this->ride_mode != 2 || i_this->timer[1] <= 18) { + if (i_this->weapon_type >= WEAPON_TYPE_FIRE_BOW) { + if (i_this->ride_mode != RIDE_MODE_RIDE || i_this->timer[1] <= 18) { fire_eff_set(i_this); } } else { - i_this->field_0x127c.set(-200000.0f, -200000.0f, -200000.0f); + i_this->fire_pos.set(-200000.0f, -200000.0f, -200000.0f); } } if (i_this->arrow_flag) { - if (i_this->weapon_type == 3) { + if (i_this->weapon_type == WEAPON_TYPE_FIRE_BOW) { i_this->sound.startCreatureSound(Z2SE_OBJ_ARROW_SHOT_FIRE, 0, -1); } else { i_this->sound.startCreatureSound(Z2SE_OBJ_ARROW_SHOT_NORMAL, 0, -1); @@ -6834,7 +6857,7 @@ static int daE_RD_Execute(e_rd_class* i_this) { if (i_this->action == ACTION_BOW_IKKI) { mae = i_this->eye - ato; angl.y = cM_atan2s(mae.x, mae.z); - angl.x = -cM_atan2s(mae.y, JMAFastSqrt(mae.x * mae.x + mae.z * mae.z)); + angl.x = -cM_atan2s(mae.y, JMAFastSqrt(SQUARE(mae.x) + SQUARE(mae.z))); } else { fopAc_ac_c* actor = get_pla(enemy); if (actor != dComIfGp_getPlayer(0)) { @@ -6844,16 +6867,16 @@ static int daE_RD_Execute(e_rd_class* i_this) { mae = actor->eyePos; if (i_this->field_0x1296 != 0) { - f32 mult_fact = TREG_F(7) + 15.0f; - mae.x += actor->speed.x * mult_fact; - mae.z += actor->speed.z * mult_fact; + f32 sc = TREG_F(7) + 15.0f; + mae.x += actor->speed.x * sc; + mae.z += actor->speed.z * sc; } mae -= ato; mae.y -= 30.0f; angl.y = cM_atan2s(mae.x, mae.z); - if (i_this->ride_mode == 2 && !pl_pass_check(i_this, YREG_F(18))) { + if (i_this->ride_mode == RIDE_MODE_RIDE && !pl_pass_check(i_this, YREG_F(18))) { s16 sVar3 = cM_rndF(1000.0f) + 2000.0f; if (cM_rndF(1.0f) < 0.5f) { sVar3 *= -1; @@ -6862,7 +6885,7 @@ static int daE_RD_Execute(e_rd_class* i_this) { angl.y += sVar3; } - angl.x = -cM_atan2s(mae.y, JMAFastSqrt(mae.x * mae.x + mae.z * mae.z)); + angl.x = -cM_atan2s(mae.y, JMAFastSqrt(SQUARE(mae.x) + SQUARE(mae.z))); // NOT Hyrule Field if (strcmp(dComIfGp_getStartStageName(), "F_SP121") != 0 && i_this->field_0x1296 == 0) { @@ -6872,9 +6895,9 @@ static int daE_RD_Execute(e_rd_class* i_this) { } angl.z = 0; - if (i_this->weapon_type == 3) { + if (i_this->weapon_type == WEAPON_TYPE_FIRE_BOW) { parameter |= 1; - } else if (i_this->weapon_type == 4) { + } else if (i_this->weapon_type == WEAPON_TYPE_BARROW) { parameter |= 2; } @@ -6882,7 +6905,7 @@ static int daE_RD_Execute(e_rd_class* i_this) { parameter |= 16; } - fopAcM_createChild(PROC_E_ARROW, fopAcM_GetID(enemy), parameter, &ato, fopAcM_GetRoomNo(enemy), &angl, NULL, -1, NULL); + fopAcM_createChild(fpcNm_E_ARROW_e, fopAcM_GetID(enemy), parameter, &ato, fopAcM_GetRoomNo(enemy), &angl, NULL, -1, NULL); i_this->arrow_flag = 0; i_this->bow_shake_timer = TREG_S(8) + 15; } @@ -6905,11 +6928,11 @@ static int daE_RD_Execute(e_rd_class* i_this) { dPa_RM(ID_ZM_S_RB_BREAKARMOR02), }; - if (i_this->actor_set != 0) { + if (i_this->actor_set != ACTOR_SET_NONE) { for (int i = 0; i < 14; i++) { if (i_this->armor_boss_part[i] != NULL) { - if (i_this->field_0x70c[i] == 0) { - if (i_this->actor_set == 3) { + if (i_this->part_break[i] == 0) { + if (i_this->actor_set == ACTOR_SET_IKKI2) { MTXCopy(i_this->anm_p->getModel()->getAnmMtx(ikki2_boss_part_idx[i]), *calc_mtx); } else { MTXCopy(i_this->anm_p->getModel()->getAnmMtx(boss_part_idx[i]), *calc_mtx); @@ -6917,16 +6940,16 @@ static int daE_RD_Execute(e_rd_class* i_this) { i_this->armor_boss_part[i]->setBaseTRMtx(*calc_mtx); mae.set(0.0f, 0.0f, 0.0f); - MtxPosition(&mae, &i_this->field_0x71c[i]); + MtxPosition(&mae, &i_this->part_pos[i]); } else { - i_this->field_0x71c[i] += i_this->field_0x7c4[i]; - i_this->field_0x7c4[i].y -= 3.0f; - ANGLE_ADD(i_this->field_0x86c[i].y, 0x900); - ANGLE_ADD(i_this->field_0x86c[i].x, 0xB00); + i_this->part_pos[i] += i_this->part_spd[i]; + i_this->part_spd[i].y -= 3.0f; + ANGLE_ADD(i_this->part_angle[i].y, 0x900); + ANGLE_ADD(i_this->part_angle[i].x, 0xB00); - mDoMtx_stack_c::transS(i_this->field_0x71c[i].x, i_this->field_0x71c[i].y, i_this->field_0x71c[i].z); - mDoMtx_stack_c::YrotM(i_this->field_0x86c[i].y); - mDoMtx_stack_c::XrotM(i_this->field_0x86c[i].x); + mDoMtx_stack_c::transS(i_this->part_pos[i].x, i_this->part_pos[i].y, i_this->part_pos[i].z); + mDoMtx_stack_c::YrotM(i_this->part_angle[i].y); + mDoMtx_stack_c::XrotM(i_this->part_angle[i].x); f32 my_scale = l_HIO.leader_size_ratio * (l_HIO.model_size * enemy->scale.x); mDoMtx_stack_c::scaleM(my_scale, my_scale, my_scale); @@ -6934,37 +6957,37 @@ static int daE_RD_Execute(e_rd_class* i_this) { for (int j = 0; j < 3; j++) { i_this->armor_break_eff[i][j] = dComIfGp_particle_set(i_this->armor_break_eff[i][j], eno[j], - &i_this->field_0x71c[i], NULL, NULL); + &i_this->part_pos[i], NULL, NULL); } - if (i_this->field_0x71c[i].y < enemy->current.pos.y - 200.0f) { + if (i_this->part_pos[i].y < enemy->current.pos.y - 200.0f) { i_this->armor_boss_part[i] = NULL; } } } } - if (i_this->field_0x6a0 != 0) { - if (i_this->field_0x6a0 == 1) { + if (i_this->horn_mode != HORN_MODE_NONE) { + if (i_this->horn_mode == HORN_MODE_PLAY) { MTXCopy(i_this->anm_p->getModel()->getAnmMtx(YREG_S(3) + 15), *calc_mtx); mae.set(0.0f, 0.0f, 0.0f); - MtxPosition(&mae, &i_this->field_0x6a4); + MtxPosition(&mae, &i_this->horn_pos); } else { - i_this->field_0x6a4 += i_this->field_0x6b0; - i_this->field_0x6b0.y -= 5.0f; - MtxTrans(i_this->field_0x6a4.x, i_this->field_0x6a4.y, i_this->field_0x6a4.z, 0); + i_this->horn_pos += i_this->horn_spd; + i_this->horn_spd.y -= 5.0f; + MtxTrans(i_this->horn_pos.x, i_this->horn_pos.y, i_this->horn_pos.z, 0); f32 scale = l_HIO.leader_size_ratio * ( l_HIO.model_size * enemy->scale.x); MtxScale(scale, scale, scale, 1); MtxTrans(BREG_F(5) + 80.0f, BREG_F(6) + 50.0f, BREG_F(7), 1); - cMtx_YrotM(*calc_mtx, i_this->field_0x6bc.y); + cMtx_YrotM(*calc_mtx, i_this->horn_rot.y); cMtx_XrotM(*calc_mtx, 0x7FFF); - cMtx_ZrotM(*calc_mtx, i_this->field_0x6bc.z); + cMtx_ZrotM(*calc_mtx, i_this->horn_rot.z); MtxTrans(-(BREG_F(5) + 80.0f), -(BREG_F(6) + 50.0f), -(BREG_F(7) + 0.0f), 1); - ANGLE_ADD(i_this->field_0x6bc.y, 0x200); - ANGLE_ADD(i_this->field_0x6bc.z, 0xF00); + ANGLE_ADD(i_this->horn_rot.y, 0x200); + ANGLE_ADD(i_this->horn_rot.z, 0xF00); } - i_this->mpMorfHornAnm->getModel()->setBaseTRMtx(*calc_mtx); + i_this->horn_anm->getModel()->setBaseTRMtx(*calc_mtx); } if (i_this->run_flag) { @@ -6989,19 +7012,19 @@ static int daE_RD_Execute(e_rd_class* i_this) { } } - if (i_this->field_0x6a0 != 0) { - i_this->mpMorfHornAnm->play(NULL, 0, 0); - i_this->mpMorfHornAnm->modelCalc(); + if (i_this->horn_mode != HORN_MODE_NONE) { + i_this->horn_anm->play(NULL, 0, 0); + i_this->horn_anm->modelCalc(); } } - if (i_this->actor_set == 0 && i_this->ride_mode == 0) { - fopAc_ac_c* player = dComIfGp_getPlayer(0); + if (i_this->actor_set == ACTOR_SET_NONE && i_this->ride_mode == RIDE_MODE_OFF) { + fopAc_ac_c* pla = dComIfGp_getPlayer(0); MTXCopy(i_this->anm_p->getModel()->getAnmMtx(11), mDoMtx_stack_c::get()); mDoMtx_stack_c::multVecZero(&ato); - mae = player->current.pos - ato; - s16 atan_val = cM_atan2s(mae.x, mae.z); - cMtx_YrotS(*calc_mtx, atan_val); + mae = pla->current.pos - ato; + s16 ya = cM_atan2s(mae.x, mae.z); + cMtx_YrotS(*calc_mtx, ya); mae.x = 0.0f; mae.y = 0.0f; mae.z = (BREG_F(12) + 40.0f) - 30.0f; @@ -7010,9 +7033,9 @@ static int daE_RD_Execute(e_rd_class* i_this) { i_this->enemy.setDownPos(&ato2); } - cXyz spd4(enemy->eyePos); - spd4.y += NREG_F(7) + 130.0f; - i_this->enemy.setHeadLockPos(&spd4); + cXyz eye(enemy->eyePos); + eye.y += NREG_F(7) + 130.0f; + i_this->enemy.setHeadLockPos(&eye); demo_camera(i_this); i_this->field_0x5bb = 1; enemy->attention_info.flags |= fopAc_AttnFlag_UNK_0x200000; @@ -7035,7 +7058,7 @@ static int daE_RD_Delete(e_rd_class* i_this) { dComIfG_resDelete(&i_this->phase, i_this->resName); if (i_this->hio_set != 0) { hio_set = 0; - mDoHIO_DELETE_CHILD(l_HIO.field_0x4); + mDoHIO_DELETE_CHILD(l_HIO.no); } if (enemy->heap != NULL) { @@ -7046,7 +7069,7 @@ static int daE_RD_Delete(e_rd_class* i_this) { } static void ride_game_actor_set(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->enemy; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; fopAc_ac_c* pla = dComIfGp_getPlayer(0); cXyz mae, ato; csXyz angl; @@ -7064,12 +7087,12 @@ static void ride_game_actor_set(e_rd_class* i_this) { dBgS_GndChk gnd_chk; u32 parameter; int num = 6; - if (i_this->actor_set >= 2) { + if (i_this->actor_set >= ACTOR_SET_IKKI) { num = 1; } for (int i = 0; i < num; i++) { - if (i_this->actor_set == 1) { + if (i_this->actor_set == ACTOR_SET_E3_2005) { cMtx_YrotS(*calc_mtx, pla->shape_angle.y); mae = set_pos[i]; @@ -7084,30 +7107,30 @@ static void ride_game_actor_set(e_rd_class* i_this) { angl = pla->shape_angle; ANGLE_ADD(angl.y, 0x4000); parameter = 0x80000005; - } else if (i_this->actor_set == 2) { + } else if (i_this->actor_set == ACTOR_SET_IKKI) { ato.set(34789.0f, -290.0f, -36177.0f); angl.set(0, 0, 0); parameter = 0x80000007; - } else if (i_this->actor_set == 3) { + } else if (i_this->actor_set == ACTOR_SET_IKKI2) { ato.set(-93620.0f, -5750.0f, 49650.0f); angl.set(0, -0x8000, 0); parameter = 0x80000008; - } else if (i_this->actor_set == 4) { - ato = a_this->home.pos; - angl = a_this->home.angle; + } else if (i_this->actor_set == ACTOR_SET_LV9) { + ato = enemy->home.pos; + angl = enemy->home.angle; parameter = 0x80000009; } if (i == 0) { - a_this->home.pos = ato; - a_this->current.pos = a_this->home.pos; - a_this->old.pos = a_this->home.pos; + enemy->home.pos = ato; + enemy->current.pos = enemy->home.pos; + enemy->old.pos = enemy->home.pos; } else { angl = pla->shape_angle; parameter = (i << 8 | 0x80000006); } - fopAcM_create(PROC_E_WB, parameter, &ato, fopAcM_GetRoomNo(a_this), &angl, NULL, -1); + fopAcM_create(fpcNm_E_WB_e, parameter, &ato, fopAcM_GetRoomNo(enemy), &angl, NULL, -1); } } @@ -7130,7 +7153,7 @@ static void coach_game_actor_set(e_rd_class* i_this) { angl.y = pla->shape_angle.y; for (int i = 0; i < NREG_S(7) + 3; i++) { - fopAcM_create(PROC_E_WB, (i + 1) * 0x100 | 0x8000000a, &set_pos[i], fopAcM_GetRoomNo(enemy), &angl, NULL, -1); + fopAcM_create(fpcNm_E_WB_e, (i + 1) * 0x100 | 0x8000000a, &set_pos[i], fopAcM_GetRoomNo(enemy), &angl, NULL, -1); } } @@ -7141,7 +7164,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { J3DModelData* modelData; J3DModel* model; - if (i_this->actor_set != 0) { + if (i_this->actor_set != ACTOR_SET_NONE) { i_this->anm_p = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_rdb", e_rdb_class::BMDR_RB), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_rdb", e_rdb_class::BCK_RB_RWAIT), 2, 1.0f, 0, -1, &i_this->sound, 0x80000, 0x11000084); @@ -7156,31 +7179,31 @@ static int useHeapInit(fopAc_ac_c* a_this) { model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack_B); } - if (i_this->actor_set == 1) { - i_this->mpMorfHornAnm = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_rdb", e_rdb_class::BMDR_RB_HORN), + if (i_this->actor_set == ACTOR_SET_E3_2005) { + i_this->horn_anm = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_rdb", e_rdb_class::BMDR_RB_HORN), NULL, NULL, NULL, 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000084); - if (i_this->mpMorfHornAnm == NULL || i_this->mpMorfHornAnm->getModel() == NULL) { + if (i_this->horn_anm == NULL || i_this->horn_anm->getModel() == NULL) { return 0; } - i_this->field_0x6a0 = 1; + i_this->horn_mode = HORN_MODE_PLAY; } static int boss_part_bmd[14] = { - e_rdb_class::BMDR_SHOULDERL_ARMOR, e_rdb_class::BMDR_LEGR_ARMOR, - e_rdb_class::BMDR_SHOULDERR_ARMOR, e_rdb_class::BMDR_LEGL_ARMOR, - e_rdb_class::BMDR_MUNE2_ARMOR, e_rdb_class::BMDR_SENA2_ARMOR, - e_rdb_class::BMDR_ARML_ARMOR, e_rdb_class::BMDR_ARML2_ARMOR, - e_rdb_class::BMDR_FACE_ARMOR, e_rdb_class::BMDR_ARMR_ARMOR, - e_rdb_class::BMDR_ARMR2_ARMOR, e_rdb_class::BMDR_SENA_ARMOR, + e_rdb_class::BMDR_SHOULDERL_ARMOR, e_rdb_class::BMDR_LEGR_ARMOR, + e_rdb_class::BMDR_SHOULDERR_ARMOR, e_rdb_class::BMDR_LEGL_ARMOR, + e_rdb_class::BMDR_MUNE2_ARMOR, e_rdb_class::BMDR_SENA2_ARMOR, + e_rdb_class::BMDR_ARML_ARMOR, e_rdb_class::BMDR_ARML2_ARMOR, + e_rdb_class::BMDR_FACE_ARMOR, e_rdb_class::BMDR_ARMR_ARMOR, + e_rdb_class::BMDR_ARMR2_ARMOR, e_rdb_class::BMDR_SENA_ARMOR, e_rdb_class::BMDR_HEAD_ARMOR, e_rdb_class::BMDR_MUNE_ARMOR, }; static int ikki2_boss_part_bmd[2] = { - 86, 87, + e_rdb_class::BMDR_RB_SHIELDL, e_rdb_class::BMDR_RB_SHIELDR, }; for (int i = 0; i < 14; i++) { - if (i_this->actor_set == 3) { + if (i_this->actor_set == ACTOR_SET_IKKI2) { if (i < 2) { modelData = (J3DModelData*)dComIfG_getObjectRes("E_rdb", ikki2_boss_part_bmd[i]); JUT_ASSERT(10672, modelData != NULL); @@ -7189,9 +7212,9 @@ static int useHeapInit(fopAc_ac_c* a_this) { return 0; } } else { - i_this->field_0x70c[i] = 1; + i_this->part_break[i] = 1; } - } else if (i_this->actor_set == 1 || i == 13) { + } else if (i_this->actor_set == ACTOR_SET_E3_2005 || i == 13) { modelData = (J3DModelData*)dComIfG_getObjectRes("E_rdb", boss_part_bmd[i]); JUT_ASSERT(10687, modelData != NULL); i_this->armor_boss_part[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); @@ -7199,7 +7222,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { return 0; } } else { - i_this->field_0x70c[i] = 1; + i_this->part_break[i] = 1; } } } else { @@ -7210,16 +7233,16 @@ static int useHeapInit(fopAc_ac_c* a_this) { return 0; } - J3DModel* model2 = i_this->anm_p->getModel(); - model2->setUserArea((uintptr_t)i_this); + J3DModel* bow_model = i_this->anm_p->getModel(); + bow_model->setUserArea((uintptr_t)i_this); mDoMtx_stack_c::scaleS(0.0f, 0.0f, 0.0f); - model2->setBaseTRMtx(mDoMtx_stack_c::get()); + bow_model->setBaseTRMtx(mDoMtx_stack_c::get()); - for (u16 i = 0; i < model2->getModelData()->getJointNum(); i++) { - model2->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack); + for (u16 i = 0; i < bow_model->getModelData()->getJointNum(); i++) { + bow_model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack); } - if (i_this->weapon_type == 1) { + if (i_this->weapon_type == WEAPON_TYPE_CLUB) { if (boss != NULL) { modelData = (J3DModelData*)dComIfG_getObjectRes(i_this->resName, BMDR_RD_CLUBB); } else { @@ -7228,13 +7251,13 @@ static int useHeapInit(fopAc_ac_c* a_this) { JUT_ASSERT(10762, modelData != NULL); - i_this->arrow = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); - if (i_this->arrow == NULL) { + i_this->arrow_model = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (i_this->arrow_model == NULL) { return 0; } - i_this->arrow->setBaseTRMtx(mDoMtx_stack_c::get()); - } else if (i_this->weapon_type >= 2) { + i_this->arrow_model->setBaseTRMtx(mDoMtx_stack_c::get()); + } else if (i_this->weapon_type >= WEAPON_TYPE_BOW) { i_this->bow_anm = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes(i_this->resName, BMDR_RD_BOW), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes(i_this->resName, BCK_RD_BOW_SHOOT), 0, 1.0f, 0, -1, NULL, 0x80000, 0x11000084); @@ -7242,17 +7265,17 @@ static int useHeapInit(fopAc_ac_c* a_this) { return 0; } - model2 = i_this->bow_anm->getModel(); - model2->setUserArea((uintptr_t)i_this); - model2->setBaseTRMtx(mDoMtx_stack_c::get()); + bow_model = i_this->bow_anm->getModel(); + bow_model->setUserArea((uintptr_t)i_this); + bow_model->setBaseTRMtx(mDoMtx_stack_c::get()); - for (u16 i = 0; i < model2->getModelData()->getJointNum(); i++) { + for (u16 i = 0; i < bow_model->getModelData()->getJointNum(); i++) { if (i == 2 || i == 3) { - model2->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack_bow); + bow_model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack_bow); } } - if (i_this->weapon_type == 4) { + if (i_this->weapon_type == WEAPON_TYPE_BARROW) { modelData = (J3DModelData*)dComIfG_getObjectRes(i_this->resName, BMDR_RD_BARROW); } else { modelData = (J3DModelData*)dComIfG_getObjectRes(i_this->resName, BMDR_RD_ARROW); @@ -7260,12 +7283,12 @@ static int useHeapInit(fopAc_ac_c* a_this) { JUT_ASSERT(10810, modelData != NULL); - i_this->arrow = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); - if (i_this->arrow == NULL) { + i_this->arrow_model = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (i_this->arrow_model == NULL) { return 0; } - i_this->arrow->setBaseTRMtx(mDoMtx_stack_c::get()); + i_this->arrow_model->setBaseTRMtx(mDoMtx_stack_c::get()); } modelData = (J3DModelData*)dComIfG_getObjectRes(i_this->resName, BMDR_RD_EYE); @@ -7297,13 +7320,13 @@ static cPhs_Step daE_RD_Create(fopAc_ac_c* actor) { if (((i_this->arg0 == 4 || i_this->arg0 == 5) || i_this->arg0 == 11) || i_this->arg0 == 12) { if (i_this->arg0 == 4) { - i_this->actor_set = 1; + i_this->actor_set = ACTOR_SET_E3_2005; } else if (i_this->arg0 == 5) { - i_this->actor_set = 2; + i_this->actor_set = ACTOR_SET_IKKI; } else if (i_this->arg0 == 11) { - i_this->actor_set = 3; + i_this->actor_set = ACTOR_SET_IKKI2; } else if (i_this->arg0 == 12) { - i_this->actor_set = 4; + i_this->actor_set = ACTOR_SET_LV9; } i_this->resName = "E_rdb"; @@ -7337,26 +7360,26 @@ static cPhs_Step daE_RD_Create(fopAc_ac_c* actor) { return cPhs_ERROR_e; } - if (i_this->actor_set != 0) { + if (i_this->actor_set != ACTOR_SET_NONE) { boss = i_this; i_this->arg0 = 1; } i_this->weapon_type = (fopAcM_GetParam(actor) & 0xF00) >> 8; if (i_this->weapon_type == 15) { - i_this->weapon_type = 0; + i_this->weapon_type = WEAPON_TYPE_NONE; } - if (i_this->weapon_type >= 4) { + if (i_this->weapon_type >= WEAPON_TYPE_BARROW) { return cPhs_ERROR_e; } - i_this->field_0x5ba = (fopAcM_GetParam(actor) & 0xFF0000) >> 16; - if (i_this->field_0x5ba == 0xFF) { - i_this->field_0x5ba = 0; + i_this->scene_no = (fopAcM_GetParam(actor) & 0xFF0000) >> 16; + if (i_this->scene_no == 0xFF) { + i_this->scene_no = 0; } - if (i_this->field_0x5ba == 2) { + if (i_this->scene_no == 2) { fopAcM_setStageLayer(actor); } @@ -7390,7 +7413,7 @@ static cPhs_Step daE_RD_Create(fopAc_ac_c* actor) { i_this->action = ACTION_BOW_IKKI; i_this->timer[0] = 142 + XREG_S(2); } else if (i_this->arg2 == 11) { - fopAcM_create(PROC_E_RDY, fopAcM_GetParam(actor), &actor->home.pos, + fopAcM_create(fpcNm_E_RDY_e, fopAcM_GetParam(actor), &actor->home.pos, fopAcM_GetRoomNo(actor), &actor->home.angle, NULL, -1); } @@ -7406,7 +7429,7 @@ static cPhs_Step daE_RD_Create(fopAc_ac_c* actor) { i_this->sw = 0; } - fopAcM_OnStatus(actor, fopAcM_STATUS_UNK_0x100); + fopAcM_OnStatus(actor, fopAcStts_CULL_e); actor->attention_info.flags = fopAc_AttnFlag_BATTLE_e; if (i_this->arg0 == 6) { @@ -7422,15 +7445,15 @@ static cPhs_Step daE_RD_Create(fopAc_ac_c* actor) { i_this->action = ACTION_NORMAL; u8 path_no = actor->home.angle.x & 0xFF; if ((u32)(path_no) != 0xFF) { - i_this->path = dPath_GetRoomPath(path_no, fopAcM_GetRoomNo(actor)); - OS_REPORT("//////////////E_RD PPD %x!!\n", i_this->path); - if (i_this->path == NULL) { + i_this->ppd = dPath_GetRoomPath(path_no, fopAcM_GetRoomNo(actor)); + OS_REPORT("//////////////E_RD PPD %x!!\n", i_this->ppd); + if (i_this->ppd == NULL) { OS_REPORT("......RD NONONONONONO PATH !!!!\n"); return cPhs_ERROR_e; } - dPnt* pnt_p = i_this->path->m_points; - OS_REPORT("//////////////E_RD P0.y %f\n", pnt_p->m_position.y); + dPnt* pnt = i_this->ppd->m_points; + OS_REPORT("//////////////E_RD P0.y %f\n", pnt->m_position.y); } } else if (i_this->arg0 == 8) { i_this->action = ACTION_SLEEP; @@ -7447,7 +7470,7 @@ static cPhs_Step daE_RD_Create(fopAc_ac_c* actor) { i_this->yagura_timer = 200; } - if (i_this->weapon_type == 1 && i_this->arg0 == 0) { + if (i_this->weapon_type == WEAPON_TYPE_CLUB && i_this->arg0 == 0) { i_this->action = ACTION_STAND; i_this->mode = 0; } @@ -7456,7 +7479,7 @@ static cPhs_Step daE_RD_Create(fopAc_ac_c* actor) { i_this->action = ACTION_REG; i_this->mode = 0; i_this->field_0xafb = 1; - fopAcM_OffStatus(actor, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(actor, fopAcStts_CULL_e); } if (i_this->arg0 > 2) { @@ -7467,11 +7490,11 @@ static cPhs_Step daE_RD_Create(fopAc_ac_c* actor) { = actor->home.angle.x = actor->current.angle.x = actor->shape_angle.x = 0; u32 size; - if (i_this->actor_set == 1) { + if (i_this->actor_set == ACTOR_SET_E3_2005) { size = 0xAD60; - } else if (i_this->actor_set == 2) { + } else if (i_this->actor_set == ACTOR_SET_IKKI) { size = 0x3C00; - } else if (i_this->actor_set == 3) { + } else if (i_this->actor_set == ACTOR_SET_IKKI2) { size = 0x4400; } else { size = 0x4FF0; @@ -7482,7 +7505,7 @@ static cPhs_Step daE_RD_Create(fopAc_ac_c* actor) { return cPhs_ERROR_e; } - if (i_this->actor_set != 0) { + if (i_this->actor_set != ACTOR_SET_NONE) { ride_game_actor_set(i_this); } @@ -7490,19 +7513,19 @@ static cPhs_Step daE_RD_Create(fopAc_ac_c* actor) { i_this->hio_set = 1; hio_set = 1; // "rider" - l_HIO.field_0x4 = mDoHIO_CREATE_CHILD("ライダー", &l_HIO); + l_HIO.no = mDoHIO_CREATE_CHILD("ライダー", &l_HIO); } fopAcM_SetMtx(actor, i_this->anm_p->getModel()->getBaseTRMtx()); fopAcM_SetMin(actor, -200.0f, -200.0f, -200.0f); fopAcM_SetMax(actor, 200.0f, 200.0f, 200.0f); - i_this->ObjAcch.Set(fopAcM_GetPosition_p(actor), fopAcM_GetOldPosition_p(actor), actor, 1, + i_this->Bgc.Set(fopAcM_GetPosition_p(actor), fopAcM_GetOldPosition_p(actor), actor, 1, &i_this->AcchCir, fopAcM_GetSpeed_p(actor), NULL, NULL); i_this->AcchCir.SetWall(50.0f, 50.0f); actor->field_0x560 = actor->health = 40; - i_this->mStts.Init(150, 0, actor); + i_this->Stts.Init(150, 0, actor); static dCcD_SrcSph cc_sph_src = { { @@ -7517,9 +7540,9 @@ static cPhs_Step daE_RD_Create(fopAc_ac_c* actor) { }; for (int i = 0; i <= 2; i++) { i_this->cc_sph[i].Set(cc_sph_src); - i_this->cc_sph[i].SetStts(&i_this->mStts); + i_this->cc_sph[i].SetStts(&i_this->Stts); - if (i_this->actor_set != 0) { + if (i_this->actor_set != ACTOR_SET_NONE) { i_this->cc_sph[i].SetTgType(0xD8FAFD3F); } } @@ -7536,21 +7559,21 @@ static cPhs_Step daE_RD_Create(fopAc_ac_c* actor) { } // mSphAttr }; i_this->at_sph.Set(at_sph_src); - i_this->at_sph.SetStts(&i_this->mStts); + i_this->at_sph.SetStts(&i_this->Stts); i_this->counter = instanceCount | (u16(cM_rndF(65535.0f)) & 0xFF00); instanceCount++; i_this->sound.init(&actor->current.pos, &actor->eyePos, 3, 1); - if (i_this->actor_set != 0) { + if (i_this->actor_set != ACTOR_SET_NONE) { i_this->sound.setEnemyName("E_rdb"); } else { i_this->sound.setEnemyName("E_rd"); } - i_this->AtInfo.mPowerType = 2; - i_this->AtInfo.mpSound = &i_this->sound; + i_this->at_info.mPowerType = 2; + i_this->at_info.mpSound = &i_this->sound; if (boss != NULL) { fopAcM_setCullSizeFar(actor, 30000.0f); @@ -7565,17 +7588,17 @@ static cPhs_Step daE_RD_Create(fopAc_ac_c* actor) { if (desert_substage != 0 || strcmp(dComIfGp_getStartStageName(), "F_SP115") == 0 || (strcmp(dComIfGp_getStartStageName(), "F_SP121") == 0 && fopAcM_GetRoomNo(actor) == 0)) { // Lake Hylia or Hyrule Field - fopAcM_OffStatus(actor, fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(actor, fopAcStts_UNK_0x4000_e); } - } else if (i_this->actor_set != 4) { - fopAcM_OffStatus(actor, fopAcM_STATUS_UNK_0x4000); + } else if (i_this->actor_set != ACTOR_SET_LV9) { + fopAcM_OffStatus(actor, fopAcStts_UNK_0x4000_e); } if (strcmp(dComIfGp_getStartStageName(), "F_SP121") == 0 && fopAcM_GetRoomNo(actor) == 0) { // Hyrule Field - Bridge of Eldin - data_80519201 = 1; + data_80519201 = TRUE; } else { - data_80519201 = 0; + data_80519201 = FALSE; } c_start = 1; @@ -7604,18 +7627,18 @@ static actor_method_class l_daE_RD_Method = { }; actor_process_profile_definition g_profile_E_RD = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_RD, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_rd_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 154, // mPriority - &l_daE_RD_Method, // sub_method - 0x00044000, // 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_E_RD_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_rd_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_RD_e, + /* Actor SubMtd */ &l_daE_RD_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_rdb.cpp b/src/d/actor/d_a_e_rdb.cpp index 2c4a96753f..d5348475cd 100644 --- a/src/d/actor/d_a_e_rdb.cpp +++ b/src/d/actor/d_a_e_rdb.cpp @@ -521,7 +521,7 @@ static void e_rdb_damage(e_rdb_class* i_this) { static void e_rdb_end(e_rdb_class* i_this) { fopAc_ac_c* player = dComIfGp_getPlayer(0); - e_wb_class* actor = (e_wb_class*)fopAcM_SearchByName(PROC_E_WB); + e_wb_class* actor = (e_wb_class*)fopAcM_SearchByName(fpcNm_E_WB_e); int frame = i_this->mpModelMorf->getFrame(); cXyz sp40; f32 fVar1 = 0.0f; @@ -531,7 +531,7 @@ static void e_rdb_end(e_rdb_class* i_this) { anm_init(i_this, e_rdb_class::BCK_RB_ED_DEMO_DOWN, 2.0f, 0, 1.0f); i_this->mMode = 1; if (actor != NULL) { - actor->field_0x169e = 60; + actor->demo_mode = 60; } break; @@ -580,12 +580,12 @@ static void e_rdb_end(e_rdb_class* i_this) { break; case 10: - if ((((actor->mActionID == 102 && actor->mEnemy.speedF > 40.0f) && + if ((((actor->action == 102 && actor->enemy.speedF > 40.0f) && player->current.pos.x > 1470.0f && player->current.pos.x < 2130.0f)) && ((player->current.pos.z < 200.0f) && (player->shape_angle.y > 0x7000 || player->shape_angle.y < -0x7000))) { - actor->field_0x169e = 80; + actor->demo_mode = 80; i_this->mMode = 11; } // [[fallthrough]] @@ -864,7 +864,7 @@ static void damage_check(e_rdb_class* i_this) { } static void* shot_s_sub(void* i_actor, void* i_data) { - if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_ARROW) && + if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_ARROW_e) && (fopAcM_GetParam(i_actor) == 1 || fopAcM_GetParam(i_actor) == 2)) { cXyz sp28 = static_cast(i_data)->current.pos - @@ -1285,7 +1285,7 @@ static void demo_camera(e_rdb_class* i_this) { csXyz i_angle(0, cM_atan2s(sp28.x, sp28.z), 0); sp58 = a_this->current.pos; sp58.y += 2000.0f; - fopAcM_create(PROC_E_RD, 12, &sp58, fopAcM_GetRoomNo(a_this), &i_angle, NULL, -1); + fopAcM_create(fpcNm_E_RD_e, 12, &sp58, fopAcM_GetRoomNo(a_this), &i_angle, NULL, -1); sp34.set(-7530.0f, 50.0f, -5451.0f); player->setPlayerPosAndAngle(&sp34, -0x5F3B, 0); i_this->mDemoCamCenter.set(-7661.0f, 323.0f, -5684.0f); @@ -1295,7 +1295,7 @@ static void demo_camera(e_rdb_class* i_this) { } if (i_this->field_0x10aa >= 40) { - e_rd_class* bulblin_p = (e_rd_class*)fopAcM_SearchByName(PROC_E_RD); + e_rd_class* bulblin_p = (e_rd_class*)fopAcM_SearchByName(fpcNm_E_RD_e); if (bulblin_p != NULL) { a_this->current.pos = bulblin_p->enemy.current.pos; a_this->eyePos = bulblin_p->enemy.eyePos; @@ -1342,8 +1342,8 @@ static void demo_camera(e_rdb_class* i_this) { if (i_this->field_0x10aa == 180) { sVar1 = 1; fopAcM_delete(a_this); - fopAcM_delete(fopAcM_SearchByName(PROC_E_RD)); - fopAcM_delete(fopAcM_SearchByName(PROC_E_WB)); + fopAcM_delete(fopAcM_SearchByName(fpcNm_E_RD_e)); + fopAcM_delete(fopAcM_SearchByName(fpcNm_E_WB_e)); dComIfGs_onStageMiddleBoss(); int swBit = fopAcM_GetParam(a_this) >> 24; if (swBit != 0xFF) { @@ -1921,18 +1921,18 @@ static actor_method_class l_daE_RDB_Method = { }; actor_process_profile_definition g_profile_E_RDB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_RDB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_rdb_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 156, // mPriority - &l_daE_RDB_Method, // sub_method - 0x00044100, // 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_E_RDB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_rdb_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_RDB_e, + /* Actor SubMtd */ &l_daE_RDB_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_rdy.cpp b/src/d/actor/d_a_e_rdy.cpp index 0b193c813a..4e13d7e3ed 100644 --- a/src/d/actor/d_a_e_rdy.cpp +++ b/src/d/actor/d_a_e_rdy.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_rdy.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -154,7 +154,7 @@ enum Animation { /* 0x4C */ ANM_WAIT01, /* 0x4D */ ANM_WALK, }; - + enum Joint { /* 0x00 */ JNT_KOSI, /* 0x01 */ JNT_HIP1, @@ -383,7 +383,7 @@ static int daE_RDY_Draw(e_rdy_class* i_this) { && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[239])) { return 1; } - + if (i_this->mKargarokDeleteTimer != 0) { return 1; } @@ -522,7 +522,7 @@ static dBomb_c* search_bomb(e_rdy_class* i_this, BOOL param_1) { vec2.z = bomb->current.pos.z - a_this->current.pos.z; f32 dist1 = JMAFastSqrt(vec1.x * vec1.x + vec1.z * vec1.z); f32 dist2 = JMAFastSqrt(vec2.x * vec2.x + vec2.z * vec2.z); - + if (dist1 < threshold && !(dist2 > i_this->mPlayerDist + 30.0f) && (!other_bg_check(i_this, bomb) || !param_1)) { @@ -530,7 +530,7 @@ static dBomb_c* search_bomb(e_rdy_class* i_this, BOOL param_1) { f32 abs_res = fabsf(50.0f + bomb->current.pos.y - a_this->eyePos.y); if (abs_res <= 300.0f) { s16 ang_y = a_this->shape_angle.y - cM_atan2s(vec1.x, vec1.z); - + if (ang_y < 0) { ang_y = (-1 * ang_y); } @@ -1104,7 +1104,7 @@ static void e_rdy_fight(e_rdy_class* i_this) { if (i_this->field_0xa7b != 0) { fopAc_ac_c* hit_actor = at_hit_check(i_this); - if (hit_actor != NULL && fopAcM_GetName(hit_actor) == PROC_ALINK + if (hit_actor != NULL && fopAcM_GetName(hit_actor) == fpcNm_ALINK_e && daPy_getPlayerActorClass()->checkPlayerGuard()) { i_this->mpMorf->setPlaySpeed(-1.0f); @@ -1293,7 +1293,7 @@ static void e_rdy_bow(e_rdy_class* i_this) { } static void* s_command3_sub(void* i_proc, void* i_this) { - if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_RDY) { + if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_E_RDY_e) { if (i_proc != i_this && ((e_rdy_class*)i_proc)->mAction == ACT_COMMANDER) { return i_proc; } @@ -1550,7 +1550,7 @@ static void e_rdy_avoid(e_rdy_class* i_this) { } static void* s_kusa_sub(void* i_proc, void* i_this) { - if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_Obj_Yobikusa) { + if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_Obj_Yobikusa_e) { cXyz delta = ((fopAc_ac_c*)i_proc)->current.pos - ((fopAc_ac_c*)i_this)->current.pos; if (delta.abs() < 1000.0f) { return i_proc; @@ -1566,7 +1566,7 @@ static void e_rdy_tkusa(e_rdy_class* i_this) { i_this->mIFrameTimer = 20; if (i_this->mKargarokID == fpcM_ERROR_PROCESS_ID_e) { - i_this->mKargarokID = fopAcM_GetID(fopAcM_SearchByName(PROC_E_YC)); + i_this->mKargarokID = fopAcM_GetID(fopAcM_SearchByName(fpcNm_E_YC_e)); } fopAc_ac_c* a_karg = (fopAc_ac_c*) fopAcM_SearchByID(i_this->mKargarokID); @@ -1788,10 +1788,10 @@ static void e_rdy_yc_ride(e_rdy_class* i_this) { i_this->mIFrameTimer = 20; if (kargarok2 == NULL) { - i_this->mKargarokID = fopAcM_GetID((e_yc_class*)fopAcM_SearchByName(PROC_E_YC)); + i_this->mKargarokID = fopAcM_GetID((e_yc_class*)fopAcM_SearchByName(fpcNm_E_YC_e)); return; } - + if (i_this->field_0xa6e != 0) { return; } @@ -2029,7 +2029,7 @@ static void e_rdy_s_damage(e_rdy_class* i_this) { i_this->mMode = 0; } } - + cLib_addCalc0(&a_this->speedF, 1.0f, 3.0f); } @@ -2039,7 +2039,7 @@ static int kado_check(e_rdy_class* i_this) { cXyz vec1, vec2, vec3; int ret = 0; cMtx_YrotS(*calc_mtx, i_this->field_0xadc.y); - + static int kado_bit[2] = {1, 2}; static f32 kado_check_x[2] = {80.0f, -80.0f}; @@ -2057,7 +2057,7 @@ static int kado_check(e_rdy_class* i_this) { vec1.x = kado_check_x[i] * (1.0f + JREG_F(6)); MtxPosition(&vec1, &vec3); vec3 += vec2; - + lin_chk.Set(&vec2, &vec3, _this); if (dComIfG_Bgsp().LineCross(&lin_chk)) { ret |= kado_bit[i]; @@ -2423,7 +2423,7 @@ static s16 gake_check(e_rdy_class* i_this, f32 i_dist) { } static void* s_bikkuri_sub(void* i_proc, void* i_this) { - if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_RDY) { + if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_E_RDY_e) { if (i_proc != i_this && ((e_rdy_class*)i_proc)->mAction == ACT_BOW3 && ((e_rdy_class*)i_proc)->mMode <= 2) { cXyz delta = ((fopAc_ac_c*)i_proc)->current.pos - ((fopAc_ac_c*)i_this)->current.pos; if (delta.abs() < 350.0f + KREG_F(11)) { @@ -2680,7 +2680,7 @@ static s8 e_rdy_bow3(e_rdy_class* i_this) { static void* s_command2_sub(void* i_proc, void* i_this) { UNUSED(i_this); - if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_RDY) { + if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_E_RDY_e) { if (((e_rdy_class*)i_proc)->mAction == ACT_BOW3 && ((e_rdy_class*)i_proc)->mMode < 10) { ((e_rdy_class*)i_proc)->mTimer[0] = cM_rndF(10.0f) + 10.0f; ((e_rdy_class*)i_proc)->mMode = 10; @@ -2690,7 +2690,7 @@ static void* s_command2_sub(void* i_proc, void* i_this) { } static void* s_command4_sub(void* i_proc, void* i_this) { - if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_RDY) { + if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_E_RDY_e) { if (((e_rdy_class*)i_proc) != i_this && ((e_rdy_class*)i_proc)->mAction == ACT_BOW3) { return i_proc; } @@ -2912,7 +2912,7 @@ static void e_rdy_jyunkai(e_rdy_class* i_this) { case 0: { anm_init(i_this, ANM_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); i_this->mMode = 1; - + dPnt* point = i_this->mpPath->m_points; point += i_this->mPathIndex; @@ -3048,7 +3048,7 @@ static void big_damage(e_rdy_class* i_this) { i_this->field_0xac6 = -(cM_rndFX(2000.0f) + 4000.0f); } else if (i_this->mRideState != 0) { i_this->field_0xac6 = cM_rndFX(3000.0f); - } else if (fopAcM_GetName(i_this->mAtInfo.mpActor) == PROC_E_WB) { + } else if (fopAcM_GetName(i_this->mAtInfo.mpActor) == fpcNm_E_WB_e) { i_this->field_0xac6 = cM_rndFX(8000.0f); a_this->speed.y = cM_rndF(15.0f) + (35.0f + TREG_F(17)); i_this->field_0xabc = -(i_this->mAtInfo.mpActor->speedF * 0.5f); @@ -3784,12 +3784,13 @@ static void cam_3d_morf(e_rdy_class* i_this, f32 i_scale) { static void* s_adel_sub(void* i_proc, void* i_this) { UNUSED(i_this); - if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_ARROW) { + if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_E_ARROW_e) { fopAcM_delete((fopAc_ac_c*)i_proc); } return NULL; } +// DEBUG NONMATCHING: regalloc hell static void demo_camera(e_rdy_class* i_this) { fopAc_ac_c* a_this = &i_this->actor; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); @@ -4186,7 +4187,7 @@ static void demo_camera(e_rdy_class* i_this) { i_this->mDemoTimer = 0; i_this->mMode = 4; i_this->mCamDist = 0.0f; - e_arrow_class* arrow = (e_arrow_class*)fopAcM_SearchByName(PROC_E_ARROW); + e_arrow_class* arrow = (e_arrow_class*)fopAcM_SearchByName(fpcNm_E_ARROW_e); arrow->field_0xa00.z = 30000.0f + AREG_F(18); cVar12 = 0; } @@ -4238,7 +4239,7 @@ static void demo_camera(e_rdy_class* i_this) { } if (cVar12 != 0) { - fopAc_ac_c* a_arr = (fopAc_ac_c*) fopAcM_SearchByName(PROC_E_ARROW); + fopAc_ac_c* a_arr = (fopAc_ac_c*)fopAcM_SearchByName(fpcNm_E_ARROW_e); if (a_arr != NULL) { e_arrow_class* arrow = (e_arrow_class*) a_arr; if (cVar12 == 3) { @@ -4285,17 +4286,17 @@ static void demo_camera(e_rdy_class* i_this) { vec2.set(-93666.0f, -5951.0f, 39000.0f); player->setPlayerPosAndAngle(&vec2, 0, 0); fpcM_Search(s_adel_sub, i_this); -#if VERSION != VERSION_SHIELD_DEBUG +#if PLATFORM_GCN i_this->mMode = 2; anm_init(i_this, ANM_WAIT01, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); #endif u32 child_params = 0x80000011; csXyz angle(0, 0x4000, 0); vec2.set(-93652.0f, -5875.0f, 46674.0f); - fopAcM_createChild(PROC_E_ARROW, fopAcM_GetID(a_this), child_params, &vec2, + fopAcM_createChild(fpcNm_E_ARROW_e, fopAcM_GetID(a_this), child_params, &vec2, fopAcM_GetRoomNo(a_this), &angle, NULL, -1, NULL); vec2.set(-93659.0f, -5875.0f, 32500.0f); - fopAcM_createChild(PROC_E_ARROW, fopAcM_GetID(a_this), child_params, &vec2, + fopAcM_createChild(fpcNm_E_ARROW_e, fopAcM_GetID(a_this), child_params, &vec2, fopAcM_GetRoomNo(a_this), &angle, NULL, -1, NULL); Z2GetAudioMgr()->bgmStop(30, 0); mDoGph_gInf_c::fadeOut(1.0f, g_blackColor); @@ -4353,7 +4354,7 @@ static int daE_RDY_Execute(e_rdy_class* i_this) { if (i_this->mKargarokDeleteTimer != 0) { i_this->mKargarokDeleteTimer--; if (i_this->mKargarokDeleteTimer == 0) { - daKago_c* kago = (daKago_c*)fopAcM_SearchByName(PROC_KAGO); + daKago_c* kago = (daKago_c*)fopAcM_SearchByName(fpcNm_KAGO_e); kago->setEvent2(); fopAcM_delete(a_this); fopAcM_delete(fopAcM_SearchByID(i_this->mKargarokID)); @@ -4702,7 +4703,7 @@ static int daE_RDY_Execute(e_rdy_class* i_this) { if (i_this->field_0x5b8 == 11) { params |= 0x10; } - fopAcM_createChild(PROC_E_ARROW, fopAcM_GetID(a_this), params, &vec2, + fopAcM_createChild(fpcNm_E_ARROW_e, fopAcM_GetID(a_this), params, &vec2, fopAcM_GetRoomNo(a_this), &arrow_angle, NULL, -1, NULL); i_this->mArrowFired = false; i_this->mBowRotationTimer = 15 + TREG_S(8); @@ -4795,7 +4796,7 @@ static dJntColData_c jc_data[11] = { static int useHeapInit(fopAc_ac_c* i_this) { e_rdy_class* _this = (e_rdy_class*)i_this; - + _this->mpMorf = JKR_NEW mDoExt_McaMorfSO( (J3DModelData*)dComIfG_getObjectRes(_this->mpArcName, 81), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes(_this->mpArcName, 76), @@ -4943,7 +4944,7 @@ static cPhs_Step daE_RDY_Create(fopAc_ac_c* i_this) { pos.y += 5000.0f + YREG_F(0); } _this->mKargarokID = fpcM_ERROR_PROCESS_ID_e; - fopAcM_create(PROC_E_YC, 0xffffff00, &pos, fopAcM_GetRoomNo(i_this), + fopAcM_create(fpcNm_E_YC_e, 0xffffff00, &pos, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, NULL, 0xff); } @@ -5078,18 +5079,18 @@ static actor_method_class l_daE_RDY_Method = { }; actor_process_profile_definition g_profile_E_RDY = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_RDY, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_rdy_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 157, // mPriority - &l_daE_RDY_Method, // sub_method - 0x00044000, // 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_E_RDY_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_rdy_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_RDY_e, + /* Actor SubMtd */ &l_daE_RDY_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_s1.cpp b/src/d/actor/d_a_e_s1.cpp index 28f8b23e4a..48cd7d6800 100644 --- a/src/d/actor/d_a_e_s1.cpp +++ b/src/d/actor/d_a_e_s1.cpp @@ -268,7 +268,7 @@ static void* s_last_sub(void* i_actor, void* i_data) { fopAc_ac_c* a_actor = (fopAc_ac_c*)i_actor; fopAc_ac_c* a_data = (fopAc_ac_c*)i_data; - if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == PROC_E_S1) { + if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == fpcNm_E_S1_e) { e_s1_class* e_data = (e_s1_class*)a_data; e_s1_class* e_actor = (e_s1_class*)a_actor; @@ -781,7 +781,7 @@ static void* s_down_sub(void* i_actor, void* i_data) { fopAc_ac_c* a_actor = (fopAc_ac_c*)i_actor; fopAc_ac_c* a_data = (fopAc_ac_c*)i_data; - if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == PROC_E_S1) { + if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == fpcNm_E_S1_e) { e_s1_class* e_data = (e_s1_class*)a_data; e_s1_class* e_actor = (e_s1_class*)a_actor; @@ -805,7 +805,7 @@ static void* s_fail_sub(void* i_actor, void* i_data) { fopAc_ac_c* a_actor = (fopAc_ac_c*)i_actor; fopAc_ac_c* a_data = (fopAc_ac_c*)i_data; - if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == PROC_E_S1) { + if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == fpcNm_E_S1_e) { e_s1_class* e_data = (e_s1_class*)a_data; e_s1_class* e_actor = (e_s1_class*)a_actor; @@ -835,7 +835,7 @@ static void* s_allfail_sub(void* i_actor, void* i_data) { fopAc_ac_c* a_actor = (fopAc_ac_c*)i_actor; fopAc_ac_c* a_data = (fopAc_ac_c*)i_data; - if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == PROC_E_S1) { + if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == fpcNm_E_S1_e) { e_s1_class* e_data = (e_s1_class*)a_data; e_s1_class* e_actor = (e_s1_class*)a_actor; @@ -857,7 +857,7 @@ static void* s_allwakeup_sub(void* i_actor, void* i_data) { fopAc_ac_c* a_actor = (fopAc_ac_c*)i_actor; fopAc_ac_c* a_data = (fopAc_ac_c*)i_data; - if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == PROC_E_S1) { + if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == fpcNm_E_S1_e) { e_s1_class* e_data = (e_s1_class*)a_data; e_s1_class* e_actor = (e_s1_class*)a_actor; @@ -888,7 +888,7 @@ static void* s_posrevise_sub(void* i_actor, void* i_data) { fopAc_ac_c* a_actor = (fopAc_ac_c*)i_actor; fopAc_ac_c* a_data = (fopAc_ac_c*)i_data; - if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == PROC_E_S1) { + if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == fpcNm_E_S1_e) { e_s1_class* e_data = (e_s1_class*)a_data; e_s1_class* e_actor = (e_s1_class*)a_actor; @@ -2250,20 +2250,20 @@ static actor_method_class l_daE_S1_Method = { }; actor_process_profile_definition g_profile_E_S1 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_S1, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_s1_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 121, // mPriority - &l_daE_S1_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_E_S1_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_s1_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_S1_e, + /* Actor SubMtd */ &l_daE_S1_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_sb.cpp b/src/d/actor/d_a_e_sb.cpp index 317d11e161..59d5b87bfd 100644 --- a/src/d/actor/d_a_e_sb.cpp +++ b/src/d/actor/d_a_e_sb.cpp @@ -207,7 +207,7 @@ static void* s_obj_sub(void* arg0, void* arg1) { return arg0; } - } else if (fopAcM_GetName(arg0) == PROC_E_BG) { + } else if (fopAcM_GetName(arg0) == fpcNm_E_BG_e) { // bomb fish: if (arg0 != NULL && ((daE_BG_c*) arg0)->isBomb()) { if (arg1 != NULL) { @@ -217,7 +217,7 @@ static void* s_obj_sub(void* arg0, void* arg1) { return arg0; } - } else if (fopAcM_GetName(arg0) == PROC_NBOMB) { + } else if (fopAcM_GetName(arg0) == fpcNm_NBOMB_e) { // generic bomb: if (arg1 != NULL) { ((daE_SB_c*) arg1)->field_0x5f0 = fopAcM_searchActorDistanceXZ((fopAc_ac_c*) arg0, (fopAc_ac_c*) arg1); @@ -231,7 +231,7 @@ static void* s_obj_sub(void* arg0, void* arg1) { } static void* s_bomb_sub(void* arg0, void* arg1) { - if (fopAcM_GetName(arg0) == PROC_E_BG) { + if (fopAcM_GetName(arg0) == fpcNm_E_BG_e) { // bomb fish: if (arg0 != NULL && ((daE_BG_c*) arg0)->isBomb()) { if (arg1 != NULL) { @@ -241,7 +241,7 @@ static void* s_bomb_sub(void* arg0, void* arg1) { return arg0; } - } else if (fopAcM_GetName(arg0) == PROC_NBOMB) { + } else if (fopAcM_GetName(arg0) == fpcNm_NBOMB_e) { // generic bomb: if (arg1 != NULL) { ((daE_SB_c*) arg1)->field_0x5f0 = fopAcM_searchActorDistanceXZ((fopAc_ac_c*) arg0, (fopAc_ac_c*) arg1); @@ -1169,20 +1169,20 @@ static actor_method_class l_daE_SB_Method = { }; actor_process_profile_definition g_profile_E_SB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_SB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_SB_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 125, // mPriority - &l_daE_SB_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_E_SB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_SB_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_SB_e, + /* Actor SubMtd */ &l_daE_SB_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_sf.cpp b/src/d/actor/d_a_e_sf.cpp index 21ca6b8b18..0dcc405b49 100644 --- a/src/d/actor/d_a_e_sf.cpp +++ b/src/d/actor/d_a_e_sf.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_sf.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -369,7 +369,7 @@ static void e_sf_normal(e_sf_class* i_this) { angle = 0x7000; } break; - + case NORMAL_PHASE_WAIT: target = l_HIO.move_spd; cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mAngleYOffset, 8, 0x400); @@ -410,7 +410,7 @@ static void e_sf_drawback(e_sf_class* i_this) { i_this->mSound.startCreatureVoice(Z2SE_EN_SF_V_DRAWBACK, -1); i_this->mAngleYOffset = player->shape_angle.y + 0x8000; break; - + case DRAWBACK_PHASE_END: a_this->onHeadLockFlg(); cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mAngleYOffset, 4, 0x400); @@ -448,7 +448,7 @@ static void e_sf_fight_run(e_sf_class* i_this) { i_this->mActionPhase = FIGHT_RUN_PHASE_0; } break; - + case FIGHT_RUN_PHASE_0: if (i_this->mType == 0) { anm_init(i_this, BCK_SF_WALK02, 5.0f, J3DFrameCtrl::EMode_LOOP, cM_rndFX(0.05f) + 1.0f); @@ -577,7 +577,7 @@ static void e_sf_attack_0(e_sf_class* i_this) { if (i_this->mHitCheckFlag) { fopAc_ac_c* actor_p = at_hit_check(i_this); - if (actor_p != NULL && fopAcM_GetName(actor_p) == PROC_ALINK) { + if (actor_p != NULL && fopAcM_GetName(actor_p) == fpcNm_ALINK_e) { if (daPy_getPlayerActorClass()->checkPlayerGuard()) { i_this->mpModelMorf->setPlaySpeed(0.0f); i_this->mAction = ACTION_FIGHT_RUN; @@ -630,7 +630,7 @@ static void e_sf_attack(e_sf_class* i_this) { if (i_this->mHitCheckFlag) { fopAc_ac_c* actor_p = at_hit_check(i_this); - if (actor_p != NULL && fopAcM_GetName(actor_p) == PROC_ALINK) { + if (actor_p != NULL && fopAcM_GetName(actor_p) == fpcNm_ALINK_e) { if (daPy_getPlayerActorClass()->checkPlayerGuard()) { i_this->mpModelMorf->setPlaySpeed(0.0f); i_this->mAction = ACTION_FIGHT_RUN; @@ -672,7 +672,7 @@ static int e_sf_guard(e_sf_class* i_this) { cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mPlayerAngleY, 2, 0x800); break; - + case GUARD_PHASE_RECOVER: if (cc_pl_cut_bit_get() == 0x100 || cc_pl_cut_bit_get() == 0x80 || cc_pl_cut_bit_get() == 0x400) { i_this->mTimers[0] = KREG_S(0) + 20; @@ -709,7 +709,7 @@ static void e_sf_s_damage(e_sf_class* i_this) { i_this->mSound.startCreatureVoice(Z2SE_EN_SF_V_DAMAGE, -1); i_this->mSound.startCreatureSound(Z2SE_EN_SF_SHAKE_BONES, 0, -1); break; - + case S_DAMAGE_PHASE_END: if (i_this->mpModelMorf->isStop()) { if (i_this->mTimers[1] != 0) { @@ -753,7 +753,7 @@ static void e_sf_crash(e_sf_class* i_this) { a_this->attention_info.flags = 0; cXyz scale(l_HIO.basic_size, l_HIO.basic_size, l_HIO.basic_size); dComIfGp_particle_set(dPa_RM(ID_ZI_S_SF_BARASMOKE_A), &a_this->current.pos, &a_this->shape_angle, &scale); - + if (dComIfG_Bgsp().GetPolyAtt0(i_this->mBgc.m_gnd) == 4) { dComIfGp_particle_set(dPa_RM(ID_ZI_S_SF_BARAKUSA_A), &a_this->current.pos, &a_this->shape_angle, &scale); } @@ -762,7 +762,7 @@ static void e_sf_crash(e_sf_class* i_this) { i_this->mSound.startCreatureSound(Z2SE_EN_SF_BREAK_DOWN, 0, -1); break; } - + case CRASH_PHASE_WAIT: if (i_this->mpModelMorf->isStop()) { i_this->mTimers[0] = cM_rndF(50.0f) + 300.0f; @@ -781,7 +781,7 @@ static void e_sf_crash(e_sf_class* i_this) { if (i_this->mTimers[0] == 0) { i_this->mAction = ACTION_GETUP; i_this->mActionPhase = PHASE_INIT; - + ret_ct++; if (ret_ct >= 3) { dComIfGs_onOneZoneSwitch(5, -1); @@ -843,7 +843,7 @@ static s16 e_sf_sitwait(e_sf_class* i_this) { i_this->mDemoMode = 1; } break; - + case SITWAIT_PHASE_END: rv = 0xFF; i_this->mSound.startCreatureVoiceLevel(Z2SE_EN_SF_V_FIRST_DEMO, -1); @@ -891,7 +891,7 @@ static s16 e_sf_getup(e_sf_class* i_this) { i_this->mSound.startCreatureSound(Z2SE_EN_SF_BUILD_UP, 0, -1); } break; - + case GETUP_PHASE_WAIT: if (i_this->mpModelMorf->isStop()) { if (i_this->mType == 0) { @@ -1078,7 +1078,7 @@ static void action(e_sf_class* i_this) { if (e_sf_guard(i_this) != 0) { unkFlag1 = 1; } - + isLinkSearch = 1; break; @@ -1190,7 +1190,7 @@ static void action(e_sf_class* i_this) { a_this->current.pos += spd8; cLib_addCalc0(&i_this->field_0x6c4, 1.0f, TREG_F(12) + 7.0f); } - + i_this->mBgc.CrrPos(dComIfG_Bgsp()); if (i_this->field_0x6ae > 0) { @@ -1372,7 +1372,7 @@ static void demo_camera(e_sf_class* i_this) { switch (i_this->mDemoMode) { case 0: break; - + case 1: if (!a_this->eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(a_this, 2, 0xFFFF, 0); @@ -1411,7 +1411,7 @@ static void demo_camera(e_sf_class* i_this) { cLib_addCalc2(&i_this->mDemoCamFovy, 55.0f, 0.05f, 0.25f); } break; - + case 10: if (!a_this->eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(a_this, 2, 0xFFFF, 0); @@ -1557,7 +1557,7 @@ static int daE_SF_Execute(e_sf_class* i_this) { MtxPosition(&sp2c, &sp38); i_this->mCcSphs[1].SetC(sp38 + sp50); i_this->mCcSphs[1].SetR(l_HIO.basic_size * 35.0f); - + MTXCopy(model->getAnmMtx(JNT_WAIST), *calc_mtx); sp2c.set(BREG_F(14) + 30.0f, BREG_F(15), BREG_F(16)); MtxPosition(&sp2c, &sp38); @@ -1608,7 +1608,7 @@ static int daE_SF_Execute(e_sf_class* i_this) { } else { i_this->mHitCheckFlag = 0; } - + dComIfG_Ccsp()->Set(&i_this->mAtSph); if (i_this->field_0x6ab != 0) { @@ -1719,7 +1719,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_sf", wepon_data[i_this->mType]); JUT_ASSERT(2752, modelData != NULL); - + i_this->mSwordModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->mSwordModel == NULL) { return 0; @@ -1793,9 +1793,9 @@ static cPhs_Step daE_SF_Create(fopAc_ac_c* a_this) { l_HIO.id = -1; } - fopAcM_OnStatus(a_this, fopAcM_STATUS_UNK_0x100); + fopAcM_OnStatus(a_this, fopAcStts_CULL_e); a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e; - + fopAcM_SetMtx(a_this, i_this->mpModelMorf->getModel()->getBaseTRMtx()); fopAcM_SetMin(a_this, -200.0f, -200.0f, -200.0f); fopAcM_SetMax(a_this, 200.0f, 200.0f, 200.0f); @@ -1885,18 +1885,18 @@ static actor_method_class l_daE_SF_Method = { }; actor_process_profile_definition g_profile_E_SF = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_SF, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_sf_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 123, // mPriority - &l_daE_SF_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_E_SF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_sf_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_SF_e, + /* Actor SubMtd */ &l_daE_SF_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_sg.cpp b/src/d/actor/d_a_e_sg.cpp index 8581638454..efec965a3e 100644 --- a/src/d/actor/d_a_e_sg.cpp +++ b/src/d/actor/d_a_e_sg.cpp @@ -156,7 +156,7 @@ static cXyz bg_cross[10]; static int target_info_count; static void* s_box_sub(void* i_ac, void*) { - if (fopAcM_IsActor(i_ac) && fopAcM_GetName(i_ac) == PROC_OBJ_KBOX && target_info_count < 10) { + if (fopAcM_IsActor(i_ac) && fopAcM_GetName(i_ac) == fpcNm_OBJ_KBOX_e && target_info_count < 10) { target_info[target_info_count] = (obj_kbox_class*)i_ac; target_info_count++; } @@ -213,7 +213,7 @@ static obj_kbox_class* search_box(e_sg_class* i_this) { } static dmg_rod_class* search_esa(e_sg_class* i_this) { - dmg_rod_class* rod = (dmg_rod_class*)fopAcM_SearchByName(PROC_MG_ROD); + dmg_rod_class* rod = (dmg_rod_class*)fopAcM_SearchByName(fpcNm_MG_ROD_e); if (rod != NULL && rod->kind == 1 && rod->action != 5 && rod->is_hook_in_water != 0 && rod->actor.current.pos.y < rod->water_surface_y - 20.0f) @@ -736,7 +736,7 @@ static void e_sg_drop(e_sg_class* i_this) { local_48.x += i_this->current.pos.x; local_48.z += i_this->current.pos.z; local_48.y = i_this->mGroundY + 10.0f; - fopAcM_createItem(&local_48, fpcNm_ITEM_HEART, -1, -1, NULL, NULL, 0); + fopAcM_createItem(&local_48, dItemNo_HEART_e, -1, -1, NULL, NULL, 0); } } } @@ -1224,7 +1224,7 @@ static int daE_SG_Create(fopAc_ac_c* i_this) { child_angle.y = cM_rndF(65536.0f); - fopAcM_createChild(PROC_E_SG, fopAcM_GetID(i_this), parameters, &child_pos, + fopAcM_createChild(fpcNm_E_SG_e, fopAcM_GetID(i_this), parameters, &child_pos, fopAcM_GetRoomNo(i_this), &child_angle, 0, -1, 0); } a_this->mArg0 = false; @@ -1253,18 +1253,18 @@ static actor_method_class l_daE_SG_Method = { }; actor_process_profile_definition g_profile_E_SG = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_SG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_sg_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 122, // mPriority - &l_daE_SG_Method, // sub_method - 0x000D0100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_SG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_sg_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_SG_e, + /* Actor SubMtd */ &l_daE_SG_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_sh.cpp b/src/d/actor/d_a_e_sh.cpp index af88039e29..8bd95fcf5d 100644 --- a/src/d/actor/d_a_e_sh.cpp +++ b/src/d/actor/d_a_e_sh.cpp @@ -748,21 +748,26 @@ static void action(e_sh_class* i_this) { if (unkFlag1) { fopAcM_OnStatus(enemy, 0); - i_this->enemy.attention_info.flags = fopAc_attn_CARRY_e; + //TODO: was this maybe hardcoded as just "4"? +#if PLATFORM_GCN + enemy->attention_info.flags = fopAc_attn_CARRY_e; +#else + enemy->attention_info.flags = fopAc_attn_UNK_4; +#endif } else { fopAcM_OffStatus(enemy, 0); - i_this->enemy.attention_info.flags = fopAc_attn_LOCK_e; + enemy->attention_info.flags = fopAc_attn_LOCK_e; } - cMtx_YrotS(*calc_mtx, i_this->enemy.current.angle.y); + cMtx_YrotS(*calc_mtx, enemy->current.angle.y); baseVec.x = 0.0f; baseVec.y = 0.0f; - baseVec.z = i_this->enemy.speedF; + baseVec.z = enemy->speedF; MtxPosition(&baseVec, &finalVec); - i_this->enemy.speed.x = finalVec.x; - i_this->enemy.speed.z = finalVec.z; - i_this->enemy.current.pos += enemy->speed; - i_this->enemy.speed.y = i_this->enemy.speed.y - (JREG_F(5) + 5.0f); + enemy->speed.x = finalVec.x; + enemy->speed.z = finalVec.z; + enemy->current.pos += enemy->speed; + enemy->speed.y = enemy->speed.y - (JREG_F(5) + 5.0f); cXyz* ccMoveP = i_this->mStts.GetCCMoveP(); if (ccMoveP != NULL) { @@ -777,10 +782,10 @@ static void action(e_sh_class* i_this) { baseVec.z = -i_this->field_0x6a4; cMtx_YrotS(*calc_mtx, i_this->field_0x6a8); MtxPosition(&baseVec, &finalVec); - i_this->enemy.current.pos += finalVec; + enemy->current.pos += finalVec; cLib_addCalc0(&i_this->field_0x6a4, 1.0f, 6.0f); - i_this->enemy.speedF = 0.0f; + enemy->speedF = 0.0f; } i_this->mObjAcch.CrrPos(dComIfG_Bgsp()); @@ -1187,7 +1192,7 @@ static int daE_SH_Create(fopAc_ac_c* i_this) { int resLoadResult = dComIfG_resLoad(&sh->mPhase, "E_sh"); if (resLoadResult == cPhs_COMPLEATE_e) { - OS_REPORT("", fopAcM_GetParam(i_this)); + OS_REPORT("E_sh PARAM %x\n", fopAcM_GetParam(i_this)); sh->field_0x5b4 = (u8)fopAcM_GetParam(i_this); u8 bVar1 = (fopAcM_GetParam(i_this) & 0xff00) >> 8; @@ -1205,21 +1210,26 @@ static int daE_SH_Create(fopAc_ac_c* i_this) { sh->field_0x6b8 = (f32)bVar2 * 100.0f; } - OS_REPORT(""); + OS_REPORT("E_sh//////////////E_SH SET 1 !!\n"); if (!fopAcM_entrySolidHeap(i_this, useHeapInit, 0x2960)) { - OS_REPORT(""); + OS_REPORT("//////////////E_SH SET NON !!\n"); return cPhs_ERROR_e; } - OS_REPORT(""); + OS_REPORT("//////////////E_SH SET 2 !!\n"); if (!hio_set) { sh->mInitState = 1; hio_set = true; - l_HIO.mChild = mDoHIO_CREATE_CHILD("E_sh", &l_HIO); + l_HIO.mChild = mDoHIO_CREATE_CHILD("スタルハウンド", &l_HIO); } + //TODO: was this maybe hardcoded as just "4"? +#if PLATFORM_GCN i_this->attention_info.flags = fopAc_attn_CARRY_e; +#else + i_this->attention_info.flags = fopAc_attn_UNK_4; +#endif fopAcM_SetMtx(i_this, sh->mAnm_p->getModel()->getBaseTRMtx()); fopAcM_SetMin(i_this, -200.0f, -200.0f, -200.0f); @@ -1263,18 +1273,18 @@ static actor_method_class l_daE_SH_Method = { }; actor_process_profile_definition g_profile_E_SH = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_SH, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_sh_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 126, // mPriority - &l_daE_SH_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_E_SH_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_sh_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_SH_e, + /* Actor SubMtd */ &l_daE_SH_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_sm.cpp b/src/d/actor/d_a_e_sm.cpp index d50a676406..b85e22e640 100644 --- a/src/d/actor/d_a_e_sm.cpp +++ b/src/d/actor/d_a_e_sm.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_sm.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -77,7 +77,7 @@ public: /* スライム - Slime */ /* 0x04 */ s8 field_0x4; /* 0x08 */ f32 basic_size; // 基本大きさ - Basic Size - /* 0x0C */ f32 pl_notice_dist; // PL認識距離 - PL Notice Distance + /* 0x0C */ f32 pl_notice_dist; // PL認識距離 - PL Notice Distance /* 0x10 */ f32 core_size; // コア大きさ - Core Size }; @@ -186,7 +186,7 @@ static BOOL pl_check(daE_SM_c* i_this, f32 param_2) { static void move_check(daE_SM_c* i_this, int* param_2) { *param_2 = -1; - + if (pl_check(i_this, i_this->field_0x970)) { *param_2 = 0; } @@ -199,7 +199,7 @@ void daE_SM_c::Particle_Set(u16 i_resID, cXyz i_scale, cXyz i_pos, csXyz i_rotat void daE_SM_c::ArrowCheck() { cXyz* tgHitPosP = mCoSm.GetTgHitPosP(); field_0x6d4 = 10; - + if (((daArrow_c*)mAtInfo.mpActor)->changeActorControll()) { field_0x6f9[field_0x6f8] = 1; daArrow_c* arrow_p; @@ -347,7 +347,7 @@ void daE_SM_c::SmDamageCheck() { mSound.startCreatureVoice(Z2SE_EN_SC_V_WHISTLE, -1); } } - + field_0x6be = 0; field_0x6c0[0] = 50; field_0x685 = false; @@ -433,7 +433,7 @@ void daE_SM_c::SmDamageCheck() { cXyz sp34(field_0x990); sp34.y += 100.0f; - + if (!(sp34.abs(*hookshotTopPos) < field_0x6f0 * 100.0f)) { return; } @@ -493,7 +493,7 @@ void daE_SM_c::E_SM_Normal() { if (field_0xa10) { field_0x9b0.y = s_TargetAngle; - + if (way_bg_check(this, scale.x * 100.0f, field_0x990, field_0x9b0.y)) { field_0x9b0.y += 0x100; } @@ -647,7 +647,7 @@ void daE_SM_c::E_SM_Attack() { field_0x6dc = 0.041f; } break; - + case 1: if (field_0x6dc > 0.041f) { field_0x6dc = 0.041f; @@ -698,7 +698,7 @@ void daE_SM_c::Action() { case ACTION_NORMAL: E_SM_Normal(); break; - + case ACTION_MOVE: E_SM_Move(); break; @@ -741,7 +741,7 @@ void daE_SM_c::Action() { field_0x9b8.z = sp38.z; field_0x990 += field_0x9b8; field_0x9b8.y -= 5.0f; - + cXyz* ccMoveP = field_0xe8c.GetCCMoveP(); if (ccMoveP != NULL) { field_0x990 += *ccMoveP; @@ -781,7 +781,7 @@ void daE_SM_c::E_SM_C_Near_Escape() { field_0x6d8 = s_TargetAngle + 0x8000; } break; - + case 0: field_0x6b6 = 3; cLib_chaseAngleS(¤t.angle.y, field_0x6d8, 0x2000); @@ -1054,7 +1054,7 @@ void daE_SM_c::E_SM_C_Escape() { case 0: E_SM_C_Near_Escape(); break; - + case 1: E_SM_C_Far_Escape(); break; @@ -1108,7 +1108,7 @@ void daE_SM_c::E_SM_C_Free() { field_0x6d8 = s_TargetAngle + 0x8000; } break; - + case 1: E_SM_C_Escape(); break; @@ -1143,7 +1143,7 @@ void daE_SM_c::E_SM_C_Death() { speed.set(0.0f, 0.0f, 0.0f); } break; - + case 2: speedF = 0.0f; @@ -1445,7 +1445,7 @@ void daE_SM_c::DemoStart() { field_0xe8c.SetWeight(254); } break; - + case 1: if (field_0x6c0[0] == 0) { mDemoMode++; @@ -1480,7 +1480,7 @@ void daE_SM_c::DemoMid() { SetStopingCam(); mDemoMode++; break; - + case 1: sp1c = current.pos; sp1c.y += 80.0f; @@ -1530,7 +1530,7 @@ void daE_SM_c::E_SM_C_Demo() { case 0: DemoStart(); break; - + case 1: DemoMid(); break; @@ -1603,7 +1603,7 @@ void daE_SM_c::CoreAction() { } field_0xa60.CrrPos(dComIfG_Bgsp()); - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); } } @@ -1674,7 +1674,7 @@ int daE_SM_c::Execute() { field_0x6d6--; } - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OnStatus(this, fopAcStts_CULL_e); Action(); CoreAction(); cXyz i_effSize(1.0f, 1.0f, 1.0f); @@ -2018,18 +2018,18 @@ static actor_method_class l_daE_SM_Method = { }; actor_process_profile_definition g_profile_E_SM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_SM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_SM_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 127, // mPriority - &l_daE_SM_Method, // sub_method - 0x000C0100, // 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_E_SM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_SM_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_SM_e, + /* Actor SubMtd */ &l_daE_SM_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_sm2.cpp b/src/d/actor/d_a_e_sm2.cpp index cd28399840..fdbc338670 100644 --- a/src/d/actor/d_a_e_sm2.cpp +++ b/src/d/actor/d_a_e_sm2.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_sm2.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -53,10 +53,11 @@ void daE_SM2_HIO_c::genMessage(JORMContext* ctx) { static int nodeCallBack(J3DJoint* i_joint, int param_1) { if (param_1 == 0) { - int jnt_no = i_joint->getJntNo(); + J3DJoint* joint = i_joint; + int jnt_no = joint->getJntNo(); J3DModel* model = j3dSys.getModel(); e_sm2_class* a_this = (e_sm2_class*)model->getUserArea(); - + if (a_this != NULL && jnt_no >= 1) { MtxTrans(a_this->jnt_pos[jnt_no].x, a_this->jnt_pos[jnt_no].y, a_this->jnt_pos[jnt_no].z, 0); cMtx_YrotM(*calc_mtx, a_this->field_0x7f8[jnt_no].y); @@ -79,8 +80,9 @@ static int daE_SM2_Draw(e_sm2_class* i_this) { fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->enemy; g_env_light.settingTevStruct(0, &actor->current.pos, &actor->tevStr); + J3DModel* model; if (!i_this->isPiece) { - J3DModel* model = i_this->modelMorf->getModel(); + model = i_this->modelMorf->getModel(); g_env_light.setLightTevColorType_MAJI(model, &actor->tevStr); J3DMaterial* material = model->getModelData()->getMaterialNodePointer(0); @@ -95,16 +97,20 @@ static int daE_SM2_Draw(e_sm2_class* i_this) { if (i_this->shadowId != 353535) { cXyz pos; pos.set(actor->current.pos.x, 50.0f + actor->current.pos.y + BREG_F(18), actor->current.pos.z); - - f32 var_f31 = i_this->size * (2500.0f + BREG_F(19)) * i_this->field_0x830; + + f32 var_f31 = (2500.0f + BREG_F(19)) * i_this->size * i_this->field_0x830; if (var_f31 < 700.0f) { var_f31 = 700.0f; } - i_this->shadowId = dComIfGd_setShadow(i_this->shadowId, 1, model, &pos, var_f31, 0.0f, actor->current.pos.y, i_this->acch.GetGroundH(), i_this->acch.m_gnd, &actor->tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); + i_this->shadowId = + dComIfGd_setShadow(i_this->shadowId, 1, model, &pos, var_f31, 0.0f, + actor->current.pos.y, i_this->acch.GetGroundH(), + i_this->acch.m_gnd, &i_this->enemy.tevStr, 0, 1.0f, + dDlst_shadowControl_c::getSimpleTex()); } } else { - J3DModel* model = i_this->pieceModelMorf->getModel(); + model = i_this->pieceModelMorf->getModel(); J3DMaterial* material = model->getModelData()->getMaterialNodePointer(0); material->getTevKColor(1)->r = i_this->color_R; @@ -136,7 +142,7 @@ static void sm2_delete(e_sm2_class* i_this) { if (!i_this->is_roof) { fopAcM_delete(actor); - + int swbit = (fopAcM_GetParam(actor) & 0xFF000000) >> 0x18; if (swbit != 0xFF) { dComIfGs_onSwitch(swbit, fopAcM_GetRoomNo(actor)); @@ -186,7 +192,7 @@ static void cc_stts_init(e_sm2_class* i_this) { static void* s_s_sub(void* i_actor, void* i_data) { cXyz pos_delta; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_SM2) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_SM2_e) { e_sm2_class* pother = (e_sm2_class*)i_data; e_sm2_class* pactor = (e_sm2_class*)i_actor; @@ -668,22 +674,22 @@ static void fail(e_sm2_class* i_this) { i_this->timers[0] = KREG_S(7) + 9; } else { static u8 item_no[] = { - fpcNm_ITEM_CHUCHU_GREEN, - fpcNm_ITEM_CHUCHU_RED, - fpcNm_ITEM_CHUCHU_BLUE, - fpcNm_ITEM_CHUCHU_YELLOW, - fpcNm_ITEM_CHUCHU_PURPLE, - fpcNm_ITEM_CHUCHU_RARE, - fpcNm_ITEM_CHUCHU_BLACK, + dItemNo_CHUCHU_GREEN_e, + dItemNo_CHUCHU_RED_e, + dItemNo_CHUCHU_BLUE_e, + dItemNo_CHUCHU_YELLOW_e, + dItemNo_CHUCHU_PURPLE_e, + dItemNo_CHUCHU_RARE_e, + dItemNo_CHUCHU_BLACK_e, }; dComIfGp_att_CatchRequest(actor, item_no[i_this->type], 100.0f, 50.0f, -150.0f, 0x5000, 1); actor->eventInfo.onCondition(0x40); } - + return; } - + if (i_this->mode == 2 && i_this->timers[0] == 1) { MTXCopy(daPy_getPlayerActorClass()->getLeftItemMatrix(), *calc_mtx); work.set(0.0f, 0.0f, 0.0f); @@ -909,7 +915,7 @@ static void damage_check(e_sm2_class* i_this) { pos = i_this->field_0x708[j_d[j]]; pos.y += cM_rndF(y_ad[i_this->sizetype]); - fopAcM_createChild(PROC_E_SM2, fopAcM_GetID(actor), 0xFFFFFF00 | (i_this->type << 4) | 0xB, &pos, fopAcM_GetRoomNo(actor), &rotation, NULL, -1, NULL); + fopAcM_createChild(fpcNm_E_SM2_e, fopAcM_GetID(actor), 0xFFFFFF00 | (i_this->type << 4) | 0xB, &pos, fopAcM_GetRoomNo(actor), &rotation, NULL, -1, NULL); } i_this->field_0xfd4 = 1; @@ -944,7 +950,7 @@ static void damage_check(e_sm2_class* i_this) { pos = work; } - fopAcM_createChild(PROC_E_SM2, fopAcM_GetID(actor), parameters, &pos, fopAcM_GetRoomNo(actor), &rotation, NULL, -1, NULL); + fopAcM_createChild(fpcNm_E_SM2_e, fopAcM_GetID(actor), parameters, &pos, fopAcM_GetRoomNo(actor), &rotation, NULL, -1, NULL); } i_this->sound.startCreatureSound(Z2SE_EN_SM_HIT2, 0, -1); @@ -957,7 +963,7 @@ static void damage_check(e_sm2_class* i_this) { i_this->isPiece = TRUE; actor->speed.y = 20.0f + BREG_F(6); i_this->field_0xfd4 = 1; - fopAcM_OffStatus(actor, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(actor, fopAcStts_CULL_e); } return; } @@ -1187,8 +1193,9 @@ static void action(e_sm2_class* i_this) { } } + J3DModel* model; if (!i_this->isPiece) { - J3DModel* model = i_this->modelMorf->getModel(); + model = i_this->modelMorf->getModel(); mDoMtx_stack_c::transS(i_this->field_0x840.x, i_this->field_0x840.y, i_this->field_0x840.z); mDoMtx_stack_c::YrotM(i_this->field_0x84c.y); @@ -1214,13 +1221,14 @@ static void action(e_sm2_class* i_this) { i_this->modelMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); i_this->modelMorf->modelCalc(); } else { - J3DModel* model = i_this->pieceModelMorf->getModel(); + model = i_this->pieceModelMorf->getModel(); mDoMtx_stack_c::transS(actor->current.pos.x, actor->current.pos.y, actor->current.pos.z); mDoMtx_stack_c::YrotM(actor->shape_angle.y + (i_this->counter * -400)); - f32 temp_f27 = (0.5f / i_this->field_0x6b0) * (1.0f + ((0.007f + NREG_F(16)) * (i_this->timers[1] * cM_ssin(i_this->counter * (ZREG_S(1) + 8000))))); - mDoMtx_stack_c::scaleM((1.08f + KREG_F(7)) * temp_f27, i_this->field_0x6b0, temp_f27); + f32 var_f25 = 1.0f + ((0.007f + NREG_F(16)) * (i_this->timers[1] * cM_ssin(i_this->counter * (ZREG_S(1) + 8000)))); + f32 var_f27 = (0.5f / i_this->field_0x6b0) * var_f25; + mDoMtx_stack_c::scaleM((1.08f + KREG_F(7)) * var_f27, i_this->field_0x6b0, var_f27); mDoMtx_stack_c::YrotM(i_this->counter * 400); model->setBaseTRMtx(mDoMtx_stack_c::get()); @@ -1293,7 +1301,8 @@ static void action(e_sm2_class* i_this) { cLib_addCalc0(&i_this->field_0x82c, 0.1f, 0.2f); if (i_this->field_0xfd4 != 0) { - eff_set(i_this, &i_this->field_0x708[3], (2.0f + TREG_F(12)) * i_this->size); + f32 size = (2.0f + TREG_F(12)) * i_this->size; + eff_set(i_this, &i_this->field_0x708[3], size); i_this->field_0xfd4 = 0; } } @@ -1385,7 +1394,7 @@ static int daE_SM2_Execute(e_sm2_class* i_this) { if (actor->home.pos.y - actor->current.pos.y > 5000.0f) { fopAcM_delete(actor); - + int bitsw = (fopAcM_GetParam(actor) & 0xFF000000) >> 0x18; if (bitsw != 0xFF) { dComIfGs_onSwitch(bitsw, fopAcM_GetRoomNo(actor)); @@ -1406,7 +1415,7 @@ static int daE_SM2_Delete(e_sm2_class* i_this) { #if DEBUG l_HIO.removeHIO(i_this->enemy); #endif - + dComIfG_resDelete(&i_this->phase, "E_sm2"); if (actor->heap != NULL) { @@ -1471,27 +1480,27 @@ static int daE_SM2_Create(fopAc_ac_c* i_this) { if (swbit != 0xFF && dComIfGs_isSwitch(swbit, fopAcM_GetRoomNo(i_this))) { return cPhs_ERROR_e; } - + a_this->field_0x5b4 = fopAcM_GetParam(i_this) & 0xF; if (a_this->field_0x5b4 == 0xF) { a_this->field_0x5b4 = 0; } - + a_this->type = (fopAcM_GetParam(i_this) & 0xF0) >> 4; if (a_this->type == 0xF) { a_this->type = TYPE_GREEN; } - - if (!dComIfGs_isItemFirstBit(fpcNm_ITEM_ARMOR) && a_this->type == TYPE_GREEN) { + + if (!dComIfGs_isItemFirstBit(dItemNo_ARMOR_e) && a_this->type == TYPE_GREEN) { return cPhs_ERROR_e; } - + if (a_this->field_0x5b4 < 10) { if (strcmp(dComIfGp_getStartStageName(), "T_ENEMY") == 0) { a_this->type = cM_rndF(6.999f); } } - + if (a_this->type == TYPE_RANDOM) { int num = (g_Counter.mCounter0 & 7); if (num == 0) { @@ -1502,15 +1511,15 @@ static int daE_SM2_Create(fopAc_ac_c* i_this) { a_this->type = TYPE_BLUE; } } - - if (a_this->type == TYPE_RARE && checkItemGet(fpcNm_ITEM_CHUCHU_RARE, 1)) { + + if (a_this->type == TYPE_RARE && checkItemGet(dItemNo_CHUCHU_RARE_e, 1)) { if (cM_rndF(1.0f) <= 0.5f) { a_this->type = TYPE_RED; } else { a_this->type = TYPE_BLUE; } } - + col_set(a_this, 1); a_this->sizetype = (fopAcM_GetParam(i_this) & 0xFF00) >> 8; @@ -1529,14 +1538,14 @@ static int daE_SM2_Create(fopAc_ac_c* i_this) { a_this->field_0x5b8 = i_this->home.angle.z & 0xFF; i_this->current.angle.z = i_this->shape_angle.z = 0; a_this->size = size_get(a_this->sizetype); - + OS_REPORT("E_SM2//////////////E_SM2 SET 1 !!\n"); if (!fopAcM_entrySolidHeap(i_this, useHeapInit, 0x20D0)) { OS_REPORT("//////////////E_SM2 SET NON !!\n"); return cPhs_ERROR_e; } - + OS_REPORT("//////////////E_SM2 SET 2 !!\n"); a_this->sound.init(&i_this->current.pos, &i_this->current.pos, 3, 1); @@ -1552,7 +1561,7 @@ static int daE_SM2_Create(fopAc_ac_c* i_this) { a_this->jnt_pos[i] = i_this->current.pos; a_this->field_0x6c8[i] = 1.0f; } - + #if DEBUG l_HIO.entryHIO("スライム(豪華）"); #endif @@ -1637,20 +1646,20 @@ static actor_method_class l_daE_SM2_Method = { }; actor_process_profile_definition g_profile_E_SM2 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_SM2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_sm2_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 128, // mPriority - &l_daE_SM2_Method, // sub_method - 0x00040120, // 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_E_SM2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_sm2_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_SM2_e, + /* Actor SubMtd */ &l_daE_SM2_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_e_st.cpp b/src/d/actor/d_a_e_st.cpp index 30dc9665cc..fe12756de1 100644 --- a/src/d/actor/d_a_e_st.cpp +++ b/src/d/actor/d_a_e_st.cpp @@ -334,20 +334,20 @@ static int daE_ST_Draw(e_st_class* i_this) { pos.set(a_this->current.pos.x, a_this->current.pos.y + 400.0f + BREG_F(18), a_this->current.pos.z); if (fopAcM_gc_c::gndCheck(&pos)) { pos.y = TREG_F(7) + fopAcM_gc_c::getGroundY(); - i_this->mShadowKey = dComIfGd_setShadow(i_this->mShadowKey, 1, model, &pos, l_HIO.basic_size * 700.0f, 0.0f, - a_this->current.pos.y, fopAcM_gc_c::getGroundY(), *fopAcM_gc_c::getGroundCheck(), - &a_this->tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); + i_this->mShadowKey = + dComIfGd_setShadow(i_this->mShadowKey, 1, model, &pos, l_HIO.basic_size * 700.0f, 0.0f, + a_this->current.pos.y, fopAcM_gc_c::getGroundY(), + *fopAcM_gc_c::getGroundCheck(), &i_this->actor.tevStr, 0, 1.0f, + dDlst_shadowControl_c::getSimpleTex()); } if (i_this->field_0x720 != 0) { - u8 uVar1 = JREG_S(5) + 180; - GXColor color = {uVar1, uVar1, uVar1, 0xFF}; - i_this->mLineMat1.update(20, color, &a_this->tevStr); + u8 brightness = JREG_S(5) + 180; + i_this->mLineMat1.update(20, COMPOUND_LITERAL(GXColor){brightness, brightness, brightness, 0xFF}, &a_this->tevStr); dComIfGd_set3DlineMat(&i_this->mLineMat1); if (i_this->field_0x760 != 0) { - GXColor color2 = {uVar1, uVar1, uVar1, 0xFF}; - i_this->mLineMat2.update(20, color2, &a_this->tevStr); + i_this->mLineMat2.update(20, COMPOUND_LITERAL(GXColor){brightness, brightness, brightness, 0xFF}, &a_this->tevStr); dComIfGd_set3DlineMat(&i_this->mLineMat2); } } @@ -863,7 +863,7 @@ static void e_st_shoot(e_st_class* i_this) { if (frame >= 0x1E && frame <= 0x2A) { for (int i = 0; i < TREG_S(2) + 5; i++) { - fopAcM_createChild(PROC_E_ST_LINE, fopAcM_GetID(a_this), i_this->mParameters, + fopAcM_createChild(fpcNm_E_ST_LINE_e, fopAcM_GetID(a_this), i_this->mParameters, &i_this->field_0x704, fopAcM_GetRoomNo(a_this), NULL, NULL, -1, NULL); i_this->mParameters++; } @@ -1249,7 +1249,7 @@ static void e_st_hang_shoot(e_st_class* i_this) { if (frame >= 0x1E && frame <= 0x2A) { for (int i = 0; i < TREG_S(2) + 5; i++) { - fopAcM_createChild(PROC_E_ST_LINE, fopAcM_GetID(a_this), i_this->mParameters, + fopAcM_createChild(fpcNm_E_ST_LINE_e, fopAcM_GetID(a_this), i_this->mParameters, &i_this->field_0x704, fopAcM_GetRoomNo(a_this), NULL, NULL, -1, NULL); i_this->mParameters++; } @@ -1490,7 +1490,7 @@ static void e_st_hang_2_shoot(e_st_class* i_this) { if (frame >= 0x1E && frame <= 0x2A) { for (int i = 0; i < TREG_S(2) + 5; i++) { - fopAcM_createChild(PROC_E_ST_LINE, fopAcM_GetID(a_this), i_this->mParameters, + fopAcM_createChild(fpcNm_E_ST_LINE_e, fopAcM_GetID(a_this), i_this->mParameters, &i_this->field_0x704, fopAcM_GetRoomNo(a_this), NULL, NULL, -1, NULL); i_this->mParameters++; } @@ -1924,7 +1924,7 @@ static s8 e_st_g_fight(e_st_class* i_this) { if (i_this->mAtSph.ChkAtHit()) { cCcD_Obj* at_hit_obj_p = i_this->mAtSph.GetAtHitObj(); fopAc_ac_c* actor_p = dCc_GetAc(at_hit_obj_p->GetAc()); - if (actor_p != NULL && fopAcM_GetName(actor_p) == PROC_ALINK) { + if (actor_p != NULL && fopAcM_GetName(actor_p) == fpcNm_ALINK_e) { dComIfGp_getVibration().StartShock(VIBMODE_S_POWER4, 31, cXyz(0.0f, 1.0f, 0.0f)); } } @@ -3207,18 +3207,18 @@ static actor_method_class l_daE_ST_Method = { }; actor_process_profile_definition g_profile_E_ST = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_ST, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_st_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 129, // mPriority - &l_daE_ST_Method, // sub_method - 0x10040100, // 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_E_ST_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_st_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_ST_e, + /* Actor SubMtd */ &l_daE_ST_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_st_line.cpp b/src/d/actor/d_a_e_st_line.cpp index bc832b7a57..eaed9eb259 100644 --- a/src/d/actor/d_a_e_st_line.cpp +++ b/src/d/actor/d_a_e_st_line.cpp @@ -123,18 +123,18 @@ static actor_method_class l_daE_ST_LINE_Method = { }; actor_process_profile_definition g_profile_E_ST_LINE = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_E_ST_LINE, - &g_fpcLf_Method.base, - sizeof(e_st_line_class), - 0, - 0, - &g_fopAc_Method.base, - 133, - &l_daE_ST_LINE_Method, - 0x44000, - fopAc_ENEMY_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_ST_LINE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_st_line_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_ST_LINE_e, + /* Actor SubMtd */ &l_daE_ST_LINE_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_sw.cpp b/src/d/actor/d_a_e_sw.cpp index 86ae7252cc..cab3337753 100644 --- a/src/d/actor/d_a_e_sw.cpp +++ b/src/d/actor/d_a_e_sw.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_sw.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -136,8 +136,8 @@ int daE_SW_c::draw() { if (field_0x6e4 == 0) { cXyz i_pos; i_pos.set(current.pos.x, current.pos.y + 100.0f, current.pos.z); - mShadowKey = dComIfGd_setShadow(mShadowKey, 1, model, &i_pos, 700.0f, 0.0f, current.pos.y, - mBgc.GetGroundH(), mBgc.m_gnd, &tevStr, 0, 1.0f, + mShadowKey = dComIfGd_setShadow(mShadowKey, 1, model, &i_pos, 700.0f, 0.0f, current.pos.y, + mBgc.GetGroundH(), mBgc.m_gnd, &tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); } @@ -210,7 +210,7 @@ void daE_SW_c::setActionMode(s16 i_actionMode, s16 i_moveMode) { } static void* s_b_sub(void* i_actor, void* i_data) { - if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NBOMB && + if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NBOMB_e && !fopAcM_checkCarryNow((fopAc_ac_c*)i_actor) && !((dBomb_c*)i_actor)->checkStateExplode()) { f32 fVar1 = fopAcM_searchActorDistance((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_data); if (fVar1 < target_dist) { @@ -275,7 +275,7 @@ void daE_SW_c::checkFall() { f32 fVar1 = dComIfG_Bgsp().GroundCross(&gnd_chk); if (speed.y < 0.0f) { - if (fVar1 == -G_CM3D_F_INF || std::abs(fVar1 - current.pos.y) > 1000.0f || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 4 || + if (fVar1 == -G_CM3D_F_INF || std::abs(fVar1 - current.pos.y) > 1000.0f || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 4 || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 10 || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 5) { setActionMode(13, 0); } @@ -385,7 +385,7 @@ void daE_SW_c::executeChaseSlow() { if (fVar1 < 15.0f) { fVar1 = 15.0f; } - + if (fVar1 > 70.0f) { fVar1 = 70.0f; } @@ -451,7 +451,7 @@ void daE_SW_c::executeChaseSlow() { bVar1 = 1; } } - + if (((s16)cLib_distanceAngleS(fopCamM_GetAngleY(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0))), field_0x6cc) > 0x6000 || bVar1) && data_807B0200 == 0) { field_0x6ea = 60; data_807B0200 = 1; @@ -695,7 +695,7 @@ void daE_SW_c::executeAttack() { s16 sVar1; f32 fVar1; cXyz sp54, sp60; - + switch (mMoveMode) { case 0: field_0x98c.SetTgType(0xd8fbfdff); @@ -769,7 +769,7 @@ void daE_SW_c::executeAttack() { mMoveMode = 2; } break; - + case 2: setJumpEffect(); cLib_chaseAngleS(&shape_angle.x, 0x4000, 0x400); @@ -889,7 +889,7 @@ void daE_SW_c::executeHook() { cLib_addCalcAngleS(&shape_angle.y, (s16)(field_0x6cc + field_0x6a4), 4, 0x1000, 0x100); current.angle.y = shape_angle.y; - if (!fopAcM_CheckStatus(this, 0x100000)) { + if (!fopAcM_CheckStatus(this, fopAcStts_HOOK_CARRY_NOW_e)) { setActionMode(7, 10); } break; @@ -961,7 +961,7 @@ void daE_SW_c::executeChance() { // fallthrough case 2: if ((field_0x6bc & 1) != 0 && mBgc.ChkGroundHit()) { - field_0xae8 = dComIfGp_particle_set(field_0xae8, ZLM_SAND00_IA_6, &field_0x674, &tevStr, &shape_angle, NULL, + field_0xae8 = dComIfGp_particle_set(field_0xae8, ZLM_SAND00_IA_6, &field_0x674, &tevStr, &shape_angle, NULL, 0xFF, NULL, -1, NULL, NULL, NULL); } @@ -1148,7 +1148,7 @@ void daE_SW_c::executeDie() { } static void* s_child_sub(void* i_actor, void* i_data) { - if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_SW) { + if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_SW_e) { if (fopAcM_GetLinkId((fopAc_ac_c*)i_actor) == fopAcM_GetID(i_data)) { data_807B0201++; } @@ -1160,7 +1160,7 @@ static void* s_child_sub(void* i_actor, void* i_data) { void daE_SW_c::executeMaster() { camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); attention_info.flags = 0; field_0x98c.OffTgSetBit(); field_0x98c.OffCoSetBit(); @@ -1169,7 +1169,7 @@ void daE_SW_c::executeMaster() { field_0x6ea = 30; if ((field_0x684 == 0 || !(field_0x6c8 < 1000.0f)) && !(field_0x6c8 > 10000.0f)) { int iVar1 = abs((s16)(fopCamM_GetAngleY(camera) - (fopAcM_searchPlayerAngleY(this) + 0x8000))); - + if (iVar1 < 0x2000) { data_807B0201 = 0; fpcM_Search(s_child_sub, this); @@ -1184,7 +1184,7 @@ void daE_SW_c::executeMaster() { } u32 param = (iVar1 << 24) | ((fopAcM_GetParam(this) & 0xFFF) | 0x3000); - fopAcM_createChild(PROC_E_SW, fopAcM_GetID(this), param, + fopAcM_createChild(fpcNm_E_SW_e, fopAcM_GetID(this), param, &home.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); } } @@ -1362,7 +1362,7 @@ void daE_SW_c::action() { case ACTION_EXECUTE_DIE: executeDie(); break; - + case ACTION_EXECUTE_MASTER: executeMaster(); break; @@ -1389,7 +1389,7 @@ void daE_SW_c::mtx_set() { mDoMtx_stack_c::ZXYrotM(shape_angle); f32 fVar1 = field_0x6dc; - + if (l_HIO.basic_size != 1.0f) { fVar1 = l_HIO.basic_size; } @@ -1403,7 +1403,7 @@ void daE_SW_c::mtx_set() { void daE_SW_c::cc_set() { if (mpModelMorf != NULL) { J3DModel* model = mpModelMorf->getModel(); - + if (field_0x694 != 1) { MTXCopy(model->getAnmMtx(1), mDoMtx_stack_c::get()); mDoMtx_stack_c::multVecZero(&eyePos); @@ -1451,7 +1451,7 @@ void daE_SW_c::damage_check() { if (field_0x98c.ChkAtShieldHit()) { field_0x98c.OffAtShieldHit(); - + if (daPy_getPlayerActorClass()->checkPlayerGuard()) { setActionMode(ACTION_EXECUTE_CHANCE, 0); cc_at_check(this, &mAtInfo); @@ -1668,7 +1668,7 @@ cPhs_Step daE_SW_c::create() { uVar2 = 0; } field_0x6e8 = uVar2; - + field_0xaf8 = 0; if (field_0x694 == 0) { @@ -1803,20 +1803,20 @@ static actor_method_class l_daE_SW_Method = { }; actor_process_profile_definition g_profile_E_SW = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_SW, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_SW_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 191, // mPriority - &l_daE_SW_Method, // sub_method - 0x000C0100, // 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_E_SW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_SW_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_SW_e, + /* Actor SubMtd */ &l_daE_SW_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; void daE_SW_c::d_checkFall() { @@ -1835,7 +1835,7 @@ void daE_SW_c::d_checkFall() { f32 fVar1 = dComIfG_Bgsp().GroundCross(&gnd_chk); if (speed.y < 0.0f) { - if ((fVar1 == -G_CM3D_F_INF || std::abs(fVar1 - current.pos.y) > 1000.0f) || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 4 || + if ((fVar1 == -G_CM3D_F_INF || std::abs(fVar1 - current.pos.y) > 1000.0f) || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 4 || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 10 || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 5) { d_setAction(&daE_SW_c::d_fall); } @@ -2109,7 +2109,7 @@ bool daE_SW_c::d_chaseCheck() { camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); s16 sVar1 = cLib_distanceAngleS(fopCamM_GetAngleY(camera), field_0x6cc); - if (bVar1 || (sVar1 > 0x6000 && (abs((s16)(current.angle.y - field_0x6cc)) < 0x2000 || + if (bVar1 || (sVar1 > 0x6000 && (abs((s16)(current.angle.y - field_0x6cc)) < 0x2000 || fVar1 < l_HIO.human_attack_init_range))) { return true; } @@ -2142,12 +2142,12 @@ void daE_SW_c::d_chase() { d_setAction(&daE_SW_c::d_wait); return; } - + if (player->current.pos.absXZ(current.pos) < l_HIO.human_attack_init_range) { d_setAction(&daE_SW_c::d_attk); return; } - + if (field_0x6ec == 0) { if (mBgc.ChkWallHit()) { if (field_0x6f8[0].ChkWallHit()) { @@ -2164,7 +2164,7 @@ void daE_SW_c::d_chase() { field_0x69e = field_0x6cc; } } - + cLib_addCalcAngleS2(¤t.angle.y, field_0x69e, 8, 0x400); cLib_chaseF(&speedF, 15.0f, 1.0f); break; @@ -2172,7 +2172,7 @@ void daE_SW_c::d_chase() { default: return; } - + shape_angle.y = current.angle.y; if (field_0x6ea != 0) { @@ -2257,7 +2257,7 @@ void daE_SW_c::d_attk() { field_0x6e5 = 1; shape_angle.x = 0; f32 fVar1; - + if (player->checkHorseRide() == 0) { fVar1 = 19.0f; } else { @@ -2292,7 +2292,7 @@ void daE_SW_c::d_attk() { fopAcM_delete(this); return; } - + current.pos.y = fopAcM_gc_c::getGroundY(); } // fallthrough @@ -2461,7 +2461,7 @@ void daE_SW_c::d_damage() { if (mBgc.ChkGroundHit()) { speed.y = cM_rndF(3.0f) + 28.0f; speedF = cM_rndF(3.0f) + 8.0f; - mMoveMode++; + mMoveMode++; } shape_angle.x = (int)shape_angle.x - 1500.0f; @@ -2471,7 +2471,7 @@ void daE_SW_c::d_damage() { field_0xae8 = dComIfGp_particle_set(field_0xae8, ZLM_SAND00_IA_6, &field_0x674, &tevStr, &shape_angle, NULL, 0xFF, NULL, -1, NULL, NULL, NULL); cLib_addCalcAngleS(&shape_angle.z, 0, 8, 0x800, 0x10); - + if (!mBgc.ChkGroundHit()) { break; } @@ -2498,7 +2498,7 @@ void daE_SW_c::d_damage() { if (mBgc.ChkWallHit()) { speedF = 0.0f; - + if (speed.y > 0.0f) { speed.y *= 0.5f; } @@ -2599,8 +2599,8 @@ void daE_SW_c::d_hook() { case 1: cLib_addCalcAngleS(&shape_angle.y, (s16)(field_0x6cc + field_0x6a4), 4, 0x1000, 0x100); current.angle.y = shape_angle.y; - - if (!fopAcM_CheckStatus(this, 0x100000)) { + + if (!fopAcM_CheckStatus(this, fopAcStts_HOOK_CARRY_NOW_e)) { speed.y = 20.0f; speedF = -10.0f; gravity = -5.0f; @@ -2666,11 +2666,11 @@ int daE_SW_c::d_execute() { if (field_0x6ee != 0) { field_0x6ee--; } - + if (field_0x6f0 != 0) { field_0x6f0--; } - + if (field_0x6f2 != 0) { field_0x6f2--; } diff --git a/src/d/actor/d_a_e_th.cpp b/src/d/actor/d_a_e_th.cpp index 211d31eebf..f963350da4 100644 --- a/src/d/actor/d_a_e_th.cpp +++ b/src/d/actor/d_a_e_th.cpp @@ -46,7 +46,7 @@ daE_TH_HIO_c::daE_TH_HIO_c() { } static void* s_md_sub1(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_MD && (fopAcM_GetParam(i_actor) & 0xFF00) == 0xFF00 && ((fopAc_ac_c*)i_actor)->current.pos.z == 560.0f) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_MD_e && (fopAcM_GetParam(i_actor) & 0xFF00) == 0xFF00 && ((fopAc_ac_c*)i_actor)->current.pos.z == 560.0f) { fopAcM_delete((fopAc_ac_c*)i_actor); } @@ -54,7 +54,7 @@ static void* s_md_sub1(void* i_actor, void* i_data) { } static void* s_md_sub2(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_MD && (fopAcM_GetParam(i_actor) & 0xFF00) != 0xFF00 && ((fopAc_ac_c*)i_actor)->current.pos.z == -950.0f) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_MD_e && (fopAcM_GetParam(i_actor) & 0xFF00) != 0xFF00 && ((fopAc_ac_c*)i_actor)->current.pos.z == -950.0f) { fopAcM_delete((fopAc_ac_c*)i_actor); } @@ -1203,7 +1203,7 @@ static int daE_TH_Create(fopAc_ac_c* a_this) { OS_REPORT("E_th PARAM %x\n", fopAcM_GetParam(a_this)); i_this->field_0x5b6 = fopAcM_GetParam(a_this); - if (i_this->field_0x5b6 == 2 && dComIfGs_isStageMiddleBoss() && checkItemGet(fpcNm_ITEM_IRONBALL, TRUE)) { + if (i_this->field_0x5b6 == 2 && dComIfGs_isStageMiddleBoss() && checkItemGet(dItemNo_IRONBALL_e, TRUE)) { return cPhs_ERROR_e; } @@ -1267,7 +1267,7 @@ static int daE_TH_Create(fopAc_ac_c* a_this) { i_this->mSound.init(&i_this->current.pos, &i_this->eyePos, 3, 1); i_this->mAtInfo.mpSound = &i_this->mSound; - i_this->mBallID = fopAcM_createChild(PROC_E_TH_BALL, fopAcM_GetID(i_this), 0, &i_this->current.pos, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, NULL, -1, NULL); + i_this->mBallID = fopAcM_createChild(fpcNm_E_TH_BALL_e, fopAcM_GetID(i_this), 0, &i_this->current.pos, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, NULL, -1, NULL); if (i_this->field_0x5b6 == 2 && dComIfGs_isStageMiddleBoss()) { i_this->mAction = ACTION_END; @@ -1308,18 +1308,18 @@ static actor_method_class l_daE_TH_Method = { }; actor_process_profile_definition g_profile_E_TH = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_TH, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_th_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 134, // mPriority - &l_daE_TH_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_E_TH_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_th_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_TH_e, + /* Actor SubMtd */ &l_daE_TH_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_th_ball.cpp b/src/d/actor/d_a_e_th_ball.cpp index c2995c2030..8e6c24f09c 100644 --- a/src/d/actor/d_a_e_th_ball.cpp +++ b/src/d/actor/d_a_e_th_ball.cpp @@ -114,7 +114,7 @@ static void chain_control_01(e_th_ball_class* i_this) { dBgS_GndChk gndchk; th_chain_s* chain_s = &i_this->field_0x65c; - if (master != NULL && fopAcM_GetName(master) == PROC_E_TH && master->mNoDraw == 0) { + if (master != NULL && fopAcM_GetName(master) == fpcNm_E_TH_e && master->mNoDraw == 0) { chain_s->m_pos[0] = master->mHandR_Pos1; } @@ -895,7 +895,7 @@ static void action(e_th_ball_class* i_this) { fopAc_ac_c* at_hit_actor = dCc_GetAc(at_hit_obj->GetAc()); if (i_this->mAction == ACTION_SPIN) { - if (fopAcM_GetName(at_hit_actor) == PROC_Obj_THASHI) { + if (fopAcM_GetName(at_hit_actor) == fpcNm_Obj_THASHI_e) { i_this->speedF = 30.0f + TREG_F(18); cXyz sp20 = i_this->current.pos - master->current.pos; @@ -910,7 +910,7 @@ static void action(e_th_ball_class* i_this) { master->mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_th", 0x1B), 2, 10.0f, 1.0f, 0.0f, -1.0f); master->mAnm = 0x1B; } - } else if (i_this->mAction == ACTION_SHOT && i_this->speedF > 0.0f && fopAcM_GetName(at_hit_actor) == PROC_E_MD) { + } else if (i_this->mAction == ACTION_SHOT && i_this->speedF > 0.0f && fopAcM_GetName(at_hit_actor) == fpcNm_E_MD_e) { i_this->current.angle.y -= 0x8000; i_this->speedF *= 0.3f + AREG_F(14); i_this->mAction = ACTION_RETURN; @@ -931,7 +931,7 @@ static void get_demo(e_th_ball_class* i_this) { case 0: break; case 1: - demo_id = fopAcM_createItemForTrBoxDemo(&i_this->current.pos, fpcNm_ITEM_IRONBALL, -1, fopAcM_GetRoomNo(i_this), NULL, NULL); + demo_id = fopAcM_createItemForTrBoxDemo(&i_this->current.pos, dItemNo_IRONBALL_e, -1, fopAcM_GetRoomNo(i_this), NULL, NULL); JUT_ASSERT(1670, demo_id != fpcM_ERROR_PROCESS_ID_e); i_this->mDemoMode = 2; break; @@ -1124,18 +1124,18 @@ static actor_method_class l_daE_TH_BALL_Method = { }; actor_process_profile_definition g_profile_E_TH_BALL = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_TH_BALL, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_th_ball_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 135, // mPriority - &l_daE_TH_BALL_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_TH_BALL_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_th_ball_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_TH_BALL_e, + /* Actor SubMtd */ &l_daE_TH_BALL_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_tk.cpp b/src/d/actor/d_a_e_tk.cpp index 392b9591f4..040394acb5 100644 --- a/src/d/actor/d_a_e_tk.cpp +++ b/src/d/actor/d_a_e_tk.cpp @@ -375,7 +375,7 @@ static void e_tk_attack(e_tk_class* i_this) { if (pl_y_check(i_this)) { if ((int)i_this->mpMorf->getFrame() == 24) { i_this->mBallID = - fopAcM_createChild(PROC_E_TK_BALL, fopAcM_GetID(actor), 0, &actor->eyePos, + fopAcM_createChild(fpcNm_E_TK_BALL_e, fopAcM_GetID(actor), 0, &actor->eyePos, fopAcM_GetRoomNo(actor), &actor->shape_angle, 0, -1, 0); } if ((int)i_this->mpMorf->getFrame() == 28) { @@ -813,18 +813,18 @@ static actor_method_class l_daE_TK_Method = { }; actor_process_profile_definition g_profile_E_TK = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_TK, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_tk_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 149, // mPriority - &l_daE_TK_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_E_TK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_tk_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_TK_e, + /* Actor SubMtd */ &l_daE_TK_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_tk2.cpp b/src/d/actor/d_a_e_tk2.cpp index 51bfe24ab8..f0bbc2fe6c 100644 --- a/src/d/actor/d_a_e_tk2.cpp +++ b/src/d/actor/d_a_e_tk2.cpp @@ -289,7 +289,7 @@ static void e_tk2_attack(e_tk2_class* i_this) { case MODE_TK2_APPEAR: if ((int)i_this->mpMorf->getFrame() == 0x18) { i_this->mBallID = - fopAcM_createChild(PROC_E_TK_BALL, fopAcM_GetID(actor), 1, &actor->eyePos, + fopAcM_createChild(fpcNm_E_TK_BALL_e, fopAcM_GetID(actor), 1, &actor->eyePos, fopAcM_GetRoomNo(actor), &actor->shape_angle, 0, -1, 0); } if ((int)i_this->mpMorf->getFrame() == 0x1c) { @@ -615,18 +615,18 @@ static actor_method_class l_daE_TK2_Method = { }; actor_process_profile_definition g_profile_E_TK2 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_TK2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_tk2_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 150, // mPriority - &l_daE_TK2_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_E_TK2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_tk2_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_TK2_e, + /* Actor SubMtd */ &l_daE_TK2_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_tk_ball.cpp b/src/d/actor/d_a_e_tk_ball.cpp index fb719a4240..1ed6a0db0c 100644 --- a/src/d/actor/d_a_e_tk_ball.cpp +++ b/src/d/actor/d_a_e_tk_ball.cpp @@ -477,18 +477,18 @@ static actor_method_class l_daE_TK_BALL_Method = { }; actor_process_profile_definition g_profile_E_TK_BALL = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_TK_BALL, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_tk_ball_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 151, // mPriority - &l_daE_TK_BALL_Method, // sub_method - 0x00040120, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_TK_BALL_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_tk_ball_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_TK_BALL_e, + /* Actor SubMtd */ &l_daE_TK_BALL_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_tt.cpp b/src/d/actor/d_a_e_tt.cpp index c75277bbe6..fb2a8bf8a5 100644 --- a/src/d/actor/d_a_e_tt.cpp +++ b/src/d/actor/d_a_e_tt.cpp @@ -1320,20 +1320,20 @@ static actor_method_class l_daE_TT_Method = { }; actor_process_profile_definition g_profile_E_TT = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_TT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_TT_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 208, // mPriority - &l_daE_TT_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_E_TT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_TT_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_TT_e, + /* Actor SubMtd */ &l_daE_TT_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_vt.cpp b/src/d/actor/d_a_e_vt.cpp index c474cad11b..d92992f22b 100644 --- a/src/d/actor/d_a_e_vt.cpp +++ b/src/d/actor/d_a_e_vt.cpp @@ -3903,20 +3903,20 @@ static actor_method_class l_daE_VA_Method = { }; actor_process_profile_definition g_profile_E_VT = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_VT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_VA_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 756, // mPriority - &l_daE_VA_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_E_VT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_VA_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_VT_e, + /* Actor SubMtd */ &l_daE_VA_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_warpappear.cpp b/src/d/actor/d_a_e_warpappear.cpp index b6c5c627e6..d752b727a6 100644 --- a/src/d/actor/d_a_e_warpappear.cpp +++ b/src/d/actor/d_a_e_warpappear.cpp @@ -33,7 +33,7 @@ static e_s1_class* master_ns[3]; static void* s_s1_sub(void* i_actor, void* i_data) { e_s1_class* ns = (e_s1_class*)i_actor; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_S1) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_S1_e) { ns->mAction = 20; ns->mMode = 0; @@ -68,7 +68,7 @@ static void* s_s1_sub(void* i_actor, void* i_data) { static void* s_s1drop_sub(void* i_actor, void* i_data) { e_s1_class* ns = (e_s1_class*)i_actor; fopAc_ac_c* actor = (fopAc_ac_c*)i_data; - if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_S1) && + if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_S1_e) && ns->mMode != 2) { ns->current.pos = actor->current.pos; @@ -82,7 +82,7 @@ static void* s_s1drop_sub(void* i_actor, void* i_data) { } static void* s_s1riv_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_S1) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_S1_e) { e_s1_class* ns = (e_s1_class*)i_actor; ns->current.pos = master_ns[0]->home.pos; ns->old = ns->current; @@ -103,7 +103,7 @@ static void* s_s1riv_sub(void* i_actor, void* i_data) { } static void* s_s1fight_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_S1) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_S1_e) { e_s1_class* ns = (e_s1_class*)i_actor; ns->mMode = 20; } @@ -114,7 +114,7 @@ static void* s_s1fight_sub(void* i_actor, void* i_data) { static int entry_no; static void* s_s1entry_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_S1) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_S1_e) { e_s1_class* ns = (e_s1_class*)i_actor; e_warpappear_class* i_this = (e_warpappear_class*)i_data; @@ -138,7 +138,7 @@ static void* s_s1drop2_sub(void* i_actor, void* i_data) { e_s1_class* ns = (e_s1_class*)i_actor; e_warpappear_class* i_this = (e_warpappear_class*)i_data; - if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_S1) && + if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_S1_e) && i_this->target_info_count == ns->mEntryNo) { ns->current.pos = i_this->current.pos; @@ -160,7 +160,7 @@ static void* s_s1Yangset_sub(void* i_actor, void* i_data) { e_s1_class* ns = (e_s1_class*)i_actor; e_warpappear_class* i_this = (e_warpappear_class*)i_data; - if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_S1) && + if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_S1_e) && i_this->target_info_count == ns->mEntryNo) { ns->shape_angle.y = ns->current.angle.y = ew_s1angy; @@ -172,7 +172,7 @@ static void* s_s1Yangset_sub(void* i_actor, void* i_data) { } static void* s_s1start_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_S1) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_S1_e) { e_s1_class* ns = (e_s1_class*)i_actor; fopAc_ac_c* actor = (fopAc_ac_c*)i_data; @@ -666,7 +666,7 @@ static void demo_camera(e_warpappear_class* i_this) { } if (i_this->demo_timer >= 180) { - obj_ihasi_class* ihasi = (obj_ihasi_class*)fopAcM_SearchByName(PROC_OBJ_IHASI); + obj_ihasi_class* ihasi = (obj_ihasi_class*)fopAcM_SearchByName(fpcNm_OBJ_IHASI_e); sp54.set(34800.0f, i_this->field_0x5ec + -300.0f, -26735.0f); ihasi->mParticleKey = @@ -914,18 +914,18 @@ static actor_method_class l_daE_Warpappear_Method = { }; actor_process_profile_definition g_profile_E_WAP = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_WAP, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_warpappear_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 233, // mPriority - &l_daE_Warpappear_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_WAP_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_warpappear_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_WAP_e, + /* Actor SubMtd */ &l_daE_Warpappear_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_wb.cpp b/src/d/actor/d_a_e_wb.cpp index e078e09c22..6ff349c4a6 100644 --- a/src/d/actor/d_a_e_wb.cpp +++ b/src/d/actor/d_a_e_wb.cpp @@ -60,6 +60,17 @@ STATIC_ASSERT(sizeof(daE_WB_HIO_c) == 0x5C); static u8 const lit_3882[12] = {0}; #endif +#define LEADER_NONE 0 // Normal boar, no King bulblin +#define LEADER_B_WAIT 1 // Boss on boar, waiting +#define LEADER_B_IKKI 2 // King bulblin cavalry battle 1 +#define LEADER_B_IKKI2 3 // King bulblin cavalry battle 2 +#define LEADER_B_LV9 4 // King bulblin Hyrule Castle + +#define GAKE_FLG_NONE 0 // No cliff detected +#define GAKE_FLG_DROP 1 // Cliff/drop ahead +#define GAKE_FLG_TURN 2 // Near race turn +#define GAKE_FLG_WRONG_DIR -1 // Near checkpoint but facing wrong direction + daE_WB_HIO_c::daE_WB_HIO_c() { mId = -1; base_size = 1.2f; @@ -117,14 +128,14 @@ void daE_WB_HIO_c::genMessage(JORMContext* ctx) { } #endif -static void anm_init(e_wb_class* i_actor, int i_anmId, f32 i_morf, u8 i_attr, f32 i_rate) { - i_actor->mAnmID = i_anmId; +static void anm_init(e_wb_class* i_this, int i_anmId, f32 i_morf, u8 i_attr, f32 i_rate) { + i_this->anmID = i_anmId; - if (i_actor->field_0x79d != 0 && i_actor->field_0x79d >= 2 && i_anmId == 0x20) { - i_anmId = 0x21; + if (i_this->leader != LEADER_NONE && i_this->leader >= LEADER_B_IKKI && i_anmId == 32) { + i_anmId = 33; } - i_actor->mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_actor->mResName, i_anmId), + i_this->anm_p->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->resName, i_anmId), i_attr, i_morf, i_rate, 0.0f, -1.0f); } @@ -133,29 +144,29 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) { J3DJoint* joint = i_joint; int joint_no = joint->getJntNo(); J3DModel* model = j3dSys.getModel(); - e_wb_class* bullbo_p = (e_wb_class*)model->getUserArea(); - e_wb_class* bullbo_p2 = bullbo_p; + e_wb_class* i_this = (e_wb_class*)model->getUserArea(); + e_wb_class* bullbo_p2 = i_this; - if (bullbo_p) { + if (i_this) { MTXCopy(model->getAnmMtx(joint_no), *calc_mtx); if (joint_no == 0) { - cMtx_ZrotM(*calc_mtx, bullbo_p->mBodyTiltAngle); - } else if (joint_no == 2 || joint_no == bullbo_p->field_0x688 + 0xb) { - cMtx_YrotM(*calc_mtx, bullbo_p->field_0x6d8); + cMtx_ZrotM(*calc_mtx, i_this->body_angle); + } else if (joint_no == 2 || joint_no == i_this->field_0x688 + 0xb) { + cMtx_YrotM(*calc_mtx, i_this->field_0x6d8); } else if (joint_no == 4 || joint_no == 8 || - (joint_no == 0x13 && bullbo_p->field_0x79d == 0) || - (joint_no == 0x17 && bullbo_p->field_0x79d == 0) || - (joint_no == 0x16 && bullbo_p->field_0x79d != 0) || - (joint_no == 0x1B && bullbo_p->field_0x79d != 0)) + (joint_no == 19 && i_this->leader == 0) || + (joint_no == 23 && i_this->leader == 0) || + (joint_no == 22 && i_this->leader != 0) || + (joint_no == 27 && i_this->leader != 0)) { - cMtx_YrotM(*calc_mtx, bullbo_p->mBodyTiltAngle << 1); + cMtx_YrotM(*calc_mtx, i_this->body_angle << 1); } - if (bullbo_p->field_0x79d && joint_no == 0xd) { - cMtx_YrotM(*calc_mtx, bullbo_p->field_0x6de.y); - cMtx_XrotM(*calc_mtx, bullbo_p->field_0x6de.x); - cMtx_ZrotM(*calc_mtx, bullbo_p->field_0x6de.z); + if (i_this->leader && joint_no == 13) { + cMtx_YrotM(*calc_mtx, i_this->field_0x6de.y); + cMtx_XrotM(*calc_mtx, i_this->field_0x6de.x); + cMtx_ZrotM(*calc_mtx, i_this->field_0x6de.z); } model->setAnmMtx(joint_no, *calc_mtx); @@ -173,177 +184,177 @@ static bool hio_set; static daE_WB_HIO_c l_HIO; -static void himo_control1(e_wb_class* i_this, cXyz* i_pos, int i_idx, s8 param_3) { - fopEn_enemy_c* a_this = &i_this->mEnemy; - cXyz sp60, sp54; +static void himo_control1(e_wb_class* i_this, cXyz* i_pos, int i_no, s8 param_3) { + fopEn_enemy_c* enemy = &i_this->enemy; + cXyz mae, ato; int i; - s16 sp10; - s16 spE; + s16 rx; + s16 ry; - cXyz* sp18 = i_this->field_0x1450[i_idx].field_0x0; - cXyz* r30 = sp18; - *r30 = *i_pos; + cXyz* nodes = i_this->himo[i_no].node; + cXyz* node = nodes; + *node = *i_pos; - cXyz sp48; - cMtx_YrotS(*calc_mtx, a_this->shape_angle.y); - cMtx_XrotM(*calc_mtx, a_this->shape_angle.x); + cXyz ato2; + cMtx_YrotS(*calc_mtx, enemy->shape_angle.y); + cMtx_XrotM(*calc_mtx, enemy->shape_angle.x); - sp60.x = 20.0f + YREG_F(17); - if (i_idx == 0) { - sp60.x *= -1.0f; + mae.x = 20.0f + YREG_F(17); + if (i_no == 0) { + mae.x *= -1.0f; } - sp60.y = 0.0f; - sp60.z = 0.0f; - MtxPosition(&sp60, &sp48); + mae.y = 0.0f; + mae.z = 0.0f; + MtxPosition(&mae, &ato2); cXyz sp3C; - cXyz sp30; - cXyz sp24; + cXyz ato3; + cXyz ato4; - sp60.x = 0.0f; - sp60.y = i_this->mAnimDuration * (1.0f + YREG_F(4)); - sp60.z = i_this->mAnimDuration * (1.0f + YREG_F(5)); - MtxPosition(&sp60, &sp30); + mae.x = 0.0f; + mae.y = i_this->anm_time * (1.0f + YREG_F(4)); + mae.z = i_this->anm_time * (1.0f + YREG_F(5)); + MtxPosition(&mae, &ato3); - if (a_this->speedF > 20.0f) { - sp60.x = i_this->mAnimDuration * (0.4f + YREG_F(9)); + if (enemy->speedF > 20.0f) { + mae.x = i_this->anm_time * (0.4f + YREG_F(9)); } else { - sp60.x = i_this->mAnimDuration * (0.1f + YREG_F(9)); + mae.x = i_this->anm_time * (0.1f + YREG_F(9)); } - if (i_idx == 0) { - sp60.x *= -1.0f; + if (i_no == 0) { + mae.x *= -1.0f; } - sp60.y = 0.0f; - sp60.z = 0.0f; - MtxPosition(&sp60, &sp24); + mae.y = 0.0f; + mae.z = 0.0f; + MtxPosition(&mae, &ato4); - sp60.x = 0.0f; - sp60.y = 0.0f; + mae.x = 0.0f; + mae.y = 0.0f; if (param_3 != 0) { - sp60.z = 15.0f + YREG_F(6); + mae.z = 15.0f + YREG_F(6); } else { - sp60.z = 20.0f + YREG_F(7); + mae.z = 20.0f + YREG_F(7); } - if (i_this->field_0x79d != 0) { - sp60.z *= l_HIO.leader_size_ratio; - sp48 *= l_HIO.leader_size_ratio; - sp30 *= l_HIO.leader_size_ratio; - sp24 *= l_HIO.leader_size_ratio; + if (i_this->leader != LEADER_NONE) { + mae.z *= l_HIO.leader_size_ratio; + ato2 *= l_HIO.leader_size_ratio; + ato3 *= l_HIO.leader_size_ratio; + ato4 *= l_HIO.leader_size_ratio; } - f32 var_f29, var_f31, var_f28, var_f30; + f32 r, x, y, z; - r30++; - for (i = 1; i < 16; i++, r30++) { - sp3C.x = sp30.x * cM_ssin(i_this->field_0x1688 + i * 6000); - sp3C.y = sp30.y * cM_ssin(i_this->field_0x1688 + i * 6000); - sp3C.z = sp30.z * cM_ssin(i_this->field_0x1688 + i * 6000); + node++; + for (i = 1; i < 16; i++, node++) { + sp3C.x = ato3.x * cM_ssin(i_this->field_0x1688 + i * 0x1770); + sp3C.y = ato3.y * cM_ssin(i_this->field_0x1688 + i * 0x1770); + sp3C.z = ato3.z * cM_ssin(i_this->field_0x1688 + i * 0x1770); - var_f29 = 1.0f; - var_f31 = sp24.x + (sp3C.x + ((r30[0].x - r30[-1].x) + (sp48.x * var_f29))); - var_f28 = sp3C.y + ((r30[0].y - r30[-1].y) - 20.0f + YREG_F(16)); - var_f30 = sp24.z + (sp3C.z + ((r30[0].z - r30[-1].z) + (sp48.z * var_f29))); + r = 1.0f; + x = ato4.x + (sp3C.x + ((node[0].x - node[-1].x) + (ato2.x * r))); + y = sp3C.y + ((node[0].y - node[-1].y) - 20.0f + YREG_F(16)); + z = ato4.z + (sp3C.z + ((node[0].z - node[-1].z) + (ato2.z * r))); - spE = (s16)cM_atan2s(var_f31, var_f30); - sp10 = -cM_atan2s(var_f28, JMAFastSqrt(var_f31 * var_f31 + var_f30 * var_f30)); + ry = (s16)cM_atan2s(x, z); + rx = -cM_atan2s(y, JMAFastSqrt(SQUARE(x) + SQUARE(z))); - cMtx_YrotS(*calc_mtx, spE); - cMtx_XrotM(*calc_mtx, sp10); - MtxPosition(&sp60, &sp54); + cMtx_YrotS(*calc_mtx, ry); + cMtx_XrotM(*calc_mtx, rx); + MtxPosition(&mae, &ato); - r30[0].x = r30[-1].x + sp54.x; - r30[0].y = r30[-1].y + sp54.y; - r30[0].z = r30[-1].z + sp54.z; + node[0].x = node[-1].x + ato.x; + node[0].y = node[-1].y + ato.y; + node[0].z = node[-1].z + ato.z; } } -static void himo_control2(e_wb_class* i_this, cXyz* i_pos, int i_idx, s8 param_3) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - cXyz sp30; - cXyz sp24; +static void himo_control2(e_wb_class* i_this, cXyz* i_pos, int i_no, s8 param_3) { + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; + cXyz mae; + cXyz ato; int i; - s16 sp10; - s16 spE; - himo_s* sp1C = &i_this->field_0x1450[i_idx]; - cXyz* temp_r31 = &sp1C->field_0x0[15]; - *temp_r31 = *i_pos; + s16 rx; + s16 ry; + himo_s* himo = &i_this->himo[i_no]; + cXyz* node = &himo->node[15]; + *node = *i_pos; - sp30.x = 0.0f; - sp30.y = 0.0f; + mae.x = 0.0f; + mae.y = 0.0f; if (param_3 != 0) { - sp30.z = 15.0f + YREG_F(6); + mae.z = 15.0f + YREG_F(6); } else { - sp30.z = 20.0f + YREG_F(7); + mae.z = 20.0f + YREG_F(7); } - f32 temp_f31, temp_f29, temp_f30; - temp_r31--; - for (i = 14; i >= 1; i--, temp_r31--) { - temp_f31 = temp_r31[0].x - temp_r31[1].x; - temp_f29 = temp_r31[0].y - temp_r31[1].y; - temp_f30 = temp_r31[0].z - temp_r31[1].z; - spE = (s16)cM_atan2s(temp_f31, temp_f30); - sp10 = -cM_atan2s(temp_f29, JMAFastSqrt((temp_f31 * temp_f31) + (temp_f30 * temp_f30))); + f32 x, y, z; + node--; + for (i = 14; i >= 1; i--, node--) { + x = node[0].x - node[1].x; + y = node[0].y - node[1].y; + z = node[0].z - node[1].z; + ry = (s16)cM_atan2s(x, z); + rx = -cM_atan2s(y, JMAFastSqrt(SQUARE(x) + SQUARE(z))); - cMtx_YrotS(*calc_mtx, spE); - cMtx_XrotM(*calc_mtx, sp10); - MtxPosition(&sp30, &sp24); + cMtx_YrotS(*calc_mtx, ry); + cMtx_XrotM(*calc_mtx, rx); + MtxPosition(&mae, &ato); - temp_r31[0].x = temp_r31[1].x + sp24.x; - temp_r31[0].y = temp_r31[1].y + sp24.y; - temp_r31[0].z = temp_r31[1].z + sp24.z; + node[0].x = node[1].x + ato.x; + node[0].y = node[1].y + ato.y; + node[0].z = node[1].z + ato.z; } - temp_r31 = sp1C->field_0x0; - cXyz* var_r29 = i_this->field_0x15d0[i_idx].getPos(0); - for (i = 0; i < 16; i++, var_r29++, temp_r31++) { - *var_r29 = *temp_r31; + node = himo->node; + cXyz* himo_pos = i_this->himo_mat[i_no].getPos(0); + for (i = 0; i < 16; i++, himo_pos++, node++) { + *himo_pos = *node; } - var_r29 = i_this->field_0x1648.getPos(0); - var_r29[i_idx] = i_this->field_0x1450[i_idx].field_0x0[15]; + himo_pos = i_this->himo_tex.getPos(0); + himo_pos[i_no] = i_this->himo[i_no].node[15]; } static int e_wb_lr_wall_check(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; dBgS_LinChk linChk; - cXyz pos1; - cXyz pos2; - cXyz pos3; + cXyz mae; + cXyz start; + cXyz ato; - pos2 = a_this->current.pos; - pos2.y += 300.0f; + start = actor->current.pos; + start.y += 300.0f; - cMtx_YrotS(*calc_mtx, a_this->shape_angle.y); - pos1.x = -400.0f; - pos1.y = 300.0f; - pos1.z = 400.0f + BREG_F(11); + cMtx_YrotS(*calc_mtx, actor->shape_angle.y); + mae.x = -400.0f; + mae.y = 300.0f; + mae.z = 400.0f + BREG_F(11); - MtxPosition(&pos1, &pos3); - pos3 += a_this->current.pos; - linChk.Set(&pos2, &pos3, a_this); + MtxPosition(&mae, &ato); + ato += actor->current.pos; + linChk.Set(&start, &ato, actor); - fopAc_ac_c* r30; + fopAc_ac_c* wall; if (dComIfG_Bgsp().LineCross(&linChk)) { - r30 = dComIfG_Bgsp().GetActorPointer(linChk); - if (fopAcM_GetName(r30) == PROC_BG) { + wall = dComIfG_Bgsp().GetActorPointer(linChk); + if (fopAcM_GetName(wall) == fpcNm_BG_e) { return -1; } } - pos1.x *= -1.0f; - MtxPosition(&pos1, &pos3); - pos3 += a_this->current.pos; + mae.x *= -1.0f; + MtxPosition(&mae, &ato); + ato += actor->current.pos; if (dComIfG_Bgsp().LineCross(&linChk)) { - r30 = dComIfG_Bgsp().GetActorPointer(linChk); - if (fopAcM_GetName(r30) == PROC_BG) { + wall = dComIfG_Bgsp().GetActorPointer(linChk); + if (fopAcM_GetName(wall) == fpcNm_BG_e) { return 1; } } @@ -358,298 +369,296 @@ static int daE_WB_Draw(e_wb_class* i_this) { 0x00, 0xFF, }; - f32 fVar9; + f32 size; - if (i_this->field_0x1430 != 0 || i_this->mActionID == ACT_EVENT) { + if (i_this->demo_stop != 0 || i_this->action == ACT_EVENT) { return 1; } - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; - cXyz local_3c; - cXyz local_48; + cXyz mae; + cXyz ato; - J3DModel* model = i_this->mpModelMorf->getModel(); - g_env_light.settingTevStruct(0, &a_this->current.pos, &a_this->tevStr); - g_env_light.setLightTevColorType_MAJI(model, &a_this->tevStr); - i_this->mpModelMorf->entryDL(); + J3DModel* model = i_this->anm_p->getModel(); + g_env_light.settingTevStruct(0, &actor->current.pos, &actor->tevStr); + g_env_light.setLightTevColorType_MAJI(model, &actor->tevStr); + i_this->anm_p->entryDL(); - cXyz cStack_54; - cStack_54.set(a_this->current.pos.x, a_this->current.pos.y + 100.0f + BREG_F(0x12), - a_this->current.pos.z); + cXyz pos; + pos.set(actor->current.pos.x, actor->current.pos.y + 100.0f + BREG_F(0x12), + actor->current.pos.z); - if (i_this->field_0x79d != 0) { - fVar9 = a_this->scale.z * 1000.0f + BREG_F(19); + if (i_this->leader != 0) { + size = actor->scale.z * 1000.0f + BREG_F(19); } else { - fVar9 = a_this->scale.z * 800.0f + BREG_F(19); + size = actor->scale.z * 800.0f + BREG_F(19); } - i_this->mShadowKey = - dComIfGd_setShadow(i_this->mShadowKey, 1, model, &cStack_54, fVar9, 0.0f, - a_this->current.pos.y, i_this->mAcch.GetGroundH(), i_this->mAcch.m_gnd, - &i_this->mEnemy.tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); + i_this->shadow_key = + dComIfGd_setShadow(i_this->shadow_key, 1, model, &pos, size, 0.0f, + actor->current.pos.y, i_this->Bgc.GetGroundH(), i_this->Bgc.m_gnd, + &i_this->enemy.tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); if (l_HIO.mNoReins == 0) { MTXCopy(model->getAnmMtx((i_this->field_0x688 + 0xb) + YREG_S(3)), *calc_mtx); MtxPush(); - s8 cVar7 = 0; - e_rd_class* pfVar4 = (e_rd_class*)fopAcM_SearchByID(i_this->field_0x1434); + s8 ride_check = 0; + e_rd_class* rd = (e_rd_class*)fopAcM_SearchByID(i_this->rd_id); - if ((i_this->mStatusFlags & 1) != 0) { - if (pfVar4 && pfVar4->ride_mode == 2) { - if (i_this->field_0x7a2 == 0) { - model = pfVar4->anm_p->getModel(); - cVar7 = 1; + if ((i_this->status_flag & 1) != 0) { + if (rd && rd->ride_mode == 2) { + if (i_this->kiba == 0) { + model = rd->anm_p->getModel(); + ride_check = 1; } } else { - if (daAlink_getAlinkActorClass()->checkBoarRideOwn(a_this)) { + if (daAlink_getAlinkActorClass()->checkBoarRideOwn(actor)) { if (!daAlink_getAlinkActorClass()->checkHorseNotGrab()) { - cVar7 = 1; + ride_check = 1; } } } } - local_3c.x = 80.0f + YREG_F(0); - local_3c.y = -20.0f + YREG_F(1); + mae.x = 80.0f + YREG_F(0); + mae.y = -20.0f + YREG_F(1); - if (i_this->field_0x79d != 0) { - local_3c.z = 47.0f + YREG_F(12); + if (i_this->leader != 0) { + mae.z = 47.0f + YREG_F(12); } else { - local_3c.z = 42.0f + YREG_F(2); + mae.z = 42.0f + YREG_F(2); } - MtxPosition(&local_3c, &local_48); - himo_control1(i_this, &local_48, 0, cVar7); - local_3c.z *= -1.0f; + MtxPosition(&mae, &ato); + himo_control1(i_this, &ato, 0, ride_check); + mae.z *= -1.0f; MtxPull(); - MtxPosition(&local_3c, &local_48); - himo_control1(i_this, &local_48, 1, cVar7); + MtxPosition(&mae, &ato); + himo_control1(i_this, &ato, 1, ride_check); - if (cVar7 != 0) { - cXyz local_60; - daAlink_c* sp10; - int spc; - int sp8; - if (daAlink_getAlinkActorClass()->checkBoarRideOwn(a_this)) { - sp10 = daAlink_getAlinkActorClass(); - sp10->getHorseReinHandPos(&local_60, &local_48); - i_this->field_0x1438[0] = local_48; - i_this->field_0x1438[1] = local_60; + if (ride_check != 0) { + cXyz ato2; + daAlink_c* link; + int hand_jnt_r; + int hand_jnt_l; + if (daAlink_getAlinkActorClass()->checkBoarRideOwn(actor)) { + link = daAlink_getAlinkActorClass(); + link->getHorseReinHandPos(&ato2, &ato); + i_this->rein_hand_pos[0] = ato; + i_this->rein_hand_pos[1] = ato2; } else { - if (pfVar4->actor_set != 0) { - sp8 = 0xf; - spc = 0x14; + if (rd->actor_set != 0) { + hand_jnt_l = 15; + hand_jnt_r = 20; } else { - sp8 = 0x13; - spc = 0x18; + hand_jnt_l = 19; + hand_jnt_r = 24; } - MTXCopy(model->getAnmMtx(spc), *calc_mtx); - local_3c.x = XREG_F(13) + 15.0f; - local_3c.y = XREG_F(14); - local_3c.z = XREG_F(15); - MtxPosition(&local_3c, &local_48); + MTXCopy(model->getAnmMtx(hand_jnt_r), *calc_mtx); + mae.x = XREG_F(13) + 15.0f; + mae.y = XREG_F(14); + mae.z = XREG_F(15); + MtxPosition(&mae, &ato); - MTXCopy(model->getAnmMtx(sp8), *calc_mtx); - local_3c.x = XREG_F(16) + 15.0f; - local_3c.y = XREG_F(17); - local_3c.z = XREG_F(18); - MtxPosition(&local_3c, &local_60); + MTXCopy(model->getAnmMtx(hand_jnt_l), *calc_mtx); + mae.x = XREG_F(16) + 15.0f; + mae.y = XREG_F(17); + mae.z = XREG_F(18); + MtxPosition(&mae, &ato2); } - if (i_this->field_0x168c > 100.0f) { - i_this->field_0x1438[0] = local_48; - i_this->field_0x1438[1] = local_60; + if (i_this->rein_spd > 100.0f) { + i_this->rein_hand_pos[0] = ato; + i_this->rein_hand_pos[1] = ato2; } else { - cLib_addCalc2(&i_this->field_0x1438[0].x, local_48.x, 1.0f, i_this->field_0x168c); - cLib_addCalc2(&i_this->field_0x1438[0].y, local_48.y, 1.0f, i_this->field_0x168c); - cLib_addCalc2(&i_this->field_0x1438[0].z, local_48.z, 1.0f, i_this->field_0x168c); - cLib_addCalc2(&i_this->field_0x1438[1].x, local_60.x, 1.0f, i_this->field_0x168c); - cLib_addCalc2(&i_this->field_0x1438[1].y, local_60.y, 1.0f, i_this->field_0x168c); - cLib_addCalc2(&i_this->field_0x1438[1].z, local_60.z, 1.0f, i_this->field_0x168c); - cLib_addCalc2(&i_this->field_0x168c, 1000.0f, 1.0f, 10.0f); - local_3c = i_this->field_0x1438[0] - local_48; + cLib_addCalc2(&i_this->rein_hand_pos[0].x, ato.x, 1.0f, i_this->rein_spd); + cLib_addCalc2(&i_this->rein_hand_pos[0].y, ato.y, 1.0f, i_this->rein_spd); + cLib_addCalc2(&i_this->rein_hand_pos[0].z, ato.z, 1.0f, i_this->rein_spd); + cLib_addCalc2(&i_this->rein_hand_pos[1].x, ato2.x, 1.0f, i_this->rein_spd); + cLib_addCalc2(&i_this->rein_hand_pos[1].y, ato2.y, 1.0f, i_this->rein_spd); + cLib_addCalc2(&i_this->rein_hand_pos[1].z, ato2.z, 1.0f, i_this->rein_spd); + cLib_addCalc2(&i_this->rein_spd, 1000.0f, 1.0f, 10.0f); + mae = i_this->rein_hand_pos[0] - ato; - if (local_3c.abs() > 500.0f) { - i_this->field_0x1438[0] = local_48; - i_this->field_0x1438[1] = local_60; + if (mae.abs() > 500.0f) { + i_this->rein_hand_pos[0] = ato; + i_this->rein_hand_pos[1] = ato2; } } } else { - i_this->field_0x168c = 0.0f; + i_this->rein_spd = 0.0f; MTXCopy(model->getAnmMtx(i_this->field_0x688 + 0xe), *calc_mtx); - local_3c.x = YREG_F(3) + 50.0f; - local_3c.y = YREG_F(4) + 60.0f; - local_3c.z = YREG_F(5); - MtxPosition(&local_3c, &i_this->field_0x1438[0]); - i_this->field_0x1438[1] = i_this->field_0x1438[0]; + mae.x = YREG_F(3) + 50.0f; + mae.y = YREG_F(4) + 60.0f; + mae.z = YREG_F(5); + MtxPosition(&mae, &i_this->rein_hand_pos[0]); + i_this->rein_hand_pos[1] = i_this->rein_hand_pos[0]; } - himo_control2(i_this, &i_this->field_0x1438[0], 0, cVar7); - himo_control2(i_this, &i_this->field_0x1438[1], 1, cVar7); - i_this->field_0x15d0[0].update(0x10, l_color, &a_this->tevStr); - dComIfGd_set3DlineMat(&i_this->field_0x15d0[0]); - i_this->field_0x15d0[1].update(0x10, l_color, &a_this->tevStr); - dComIfGd_set3DlineMat(&i_this->field_0x15d0[1]); - i_this->field_0x1648.update(2, l_color, &a_this->tevStr); - dComIfGd_set3DlineMat(&i_this->field_0x1648); + himo_control2(i_this, &i_this->rein_hand_pos[0], 0, ride_check); + himo_control2(i_this, &i_this->rein_hand_pos[1], 1, ride_check); + i_this->himo_mat[0].update(0x10, l_color, &actor->tevStr); + dComIfGd_set3DlineMat(&i_this->himo_mat[0]); + i_this->himo_mat[1].update(0x10, l_color, &actor->tevStr); + dComIfGd_set3DlineMat(&i_this->himo_mat[1]); + i_this->himo_tex.update(2, l_color, &actor->tevStr); + dComIfGd_set3DlineMat(&i_this->himo_tex); } return 1; } static s16 e_wb_wall_check(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; dBgS_LinChk linChk; - cXyz local_a0; - cXyz cStack_ac; - cXyz cStack_b8; + cXyz mae; + cXyz start; + cXyz ato; - cMtx_YrotS(*calc_mtx, a_this->shape_angle.y); - local_a0.x = 10.0f; - local_a0.y = 120.0f; - local_a0.z = 250.0f + BREG_F(8); - MtxPosition(&local_a0, &cStack_b8); - cStack_b8 += a_this->current.pos; - cStack_ac = a_this->current.pos; - cStack_ac.y += 200.0f; - linChk.Set(&cStack_ac, &cStack_b8, a_this); + cMtx_YrotS(*calc_mtx, actor->shape_angle.y); + mae.x = 10.0f; + mae.y = 120.0f; + mae.z = 250.0f + BREG_F(8); + MtxPosition(&mae, &ato); + ato += actor->current.pos; + start = actor->current.pos; + start.y += 200.0f; + linChk.Set(&start, &ato, actor); if (dComIfG_Bgsp().LineCross(&linChk)) { - fopAc_ac_c* uVar3 = dComIfG_Bgsp().GetActorPointer(linChk); - if (fopAcM_GetName(uVar3) != PROC_BG) { + fopAc_ac_c* wall = dComIfG_Bgsp().GetActorPointer(linChk); + if (fopAcM_GetName(wall) != fpcNm_BG_e) { return 0; } cXyz cStack_c4(linChk.GetCross()); cXyz cStack_d0; - local_a0.x *= -1.0f; - MtxPosition(&local_a0, &cStack_b8); - cStack_b8 += a_this->current.pos; - linChk.Set(&cStack_ac, &cStack_b8, a_this); + mae.x *= -1.0f; + MtxPosition(&mae, &ato); + ato += actor->current.pos; + linChk.Set(&start, &ato, actor); if (!dComIfG_Bgsp().LineCross(&linChk) == 0) { cStack_d0 = linChk.GetCross(); } else { return 0; } - local_a0 = cStack_d0 - cStack_c4; - s16 sVar5 = (cM_atan2s(local_a0.x, local_a0.z) + 0x4000) - a_this->shape_angle.y; - if (sVar5 == 0) { - sVar5 = 1; + mae = cStack_d0 - cStack_c4; + s16 chk = (cM_atan2s(mae.x, mae.z) + 0x4000) - actor->shape_angle.y; + if (chk == 0) { + chk = 1; } - return sVar5; + return chk; } return 0; } static s8 gake_check(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - dBgS_GndChk dStack_70; - cXyz local_7c; - cXyz cStack_88; + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; + dBgS_GndChk gnd_chk; + cXyz mae; + cXyz ato; static f32 chk_x[4] = {14257.0f, 34775.0f, -22864.0f, -11627.0f}; static f32 chk_z[4] = {20075.0f, -16467.0f, 9823.0f, 22601.0f}; if (lbl_244_bss_46 != 0) { - if (!daAlink_getAlinkActorClass()->checkBoarRideOwn(a_this) && - a_this->current.pos.y < -5000.0f) + if (!daAlink_getAlinkActorClass()->checkBoarRideOwn(actor) && + actor->current.pos.y < -5000.0f) { OS_REPORT(" WB NARAKU DOWN 2\n"); - fopAcM_delete(a_this); - return 0; + fopAcM_delete(actor); + return GAKE_FLG_NONE; } for (int i = 0; i < 4; i++) { - local_7c.x = nREG_F(3) + chk_x[i] - a_this->current.pos.x; - local_7c.z = nREG_F(4) + chk_z[i] - a_this->current.pos.z; - s16 sVar1 = cM_atan2s(local_7c.x, local_7c.z) - a_this->shape_angle.y; - if (JMAFastSqrt(local_7c.x * local_7c.x + local_7c.z * local_7c.z) < - nREG_F(8) + 2000.0f) - { - if (sVar1 < 0x4000 && sVar1 > -0x4000) { - return 2; + mae.x = nREG_F(3) + chk_x[i] - actor->current.pos.x; + mae.z = nREG_F(4) + chk_z[i] - actor->current.pos.z; + s16 range = cM_atan2s(mae.x, mae.z) - actor->shape_angle.y; + if (JMAFastSqrt(SQUARE(mae.x) + SQUARE(mae.z)) < nREG_F(8) + 2000.0f) { + if (range < 0x4000 && range > -0x4000) { + return GAKE_FLG_TURN; } - return -1; + return GAKE_FLG_WRONG_DIR; } } } - cMtx_YrotS(*calc_mtx, a_this->shape_angle.y); - local_7c.x = 500.0f; - local_7c.y = 1000.0f; - local_7c.z = 1000.0f + WREG_F(0); - MtxPosition(&local_7c, &cStack_88); - cStack_88 += a_this->current.pos; - dStack_70.SetPos(&cStack_88); + cMtx_YrotS(*calc_mtx, actor->shape_angle.y); + mae.x = 500.0f; + mae.y = 1000.0f; + mae.z = 1000.0f + WREG_F(0); + MtxPosition(&mae, &ato); + ato += actor->current.pos; + gnd_chk.SetPos(&ato); - if (a_this->current.pos.y - dComIfG_Bgsp().GroundCross(&dStack_70) > 2000.0f) { - return 1; + if (actor->current.pos.y - dComIfG_Bgsp().GroundCross(&gnd_chk) > 2000.0f) { + return GAKE_FLG_DROP; } else { - local_7c.x = -500.0f; - MtxPosition(&local_7c, &cStack_88); - cStack_88 += a_this->current.pos; - dStack_70.SetPos(&cStack_88); + mae.x = -500.0f; + MtxPosition(&mae, &ato); + ato += actor->current.pos; + gnd_chk.SetPos(&ato); - if (a_this->current.pos.y - dComIfG_Bgsp().GroundCross(&dStack_70) > 2000.0f) { - return 1; + if (actor->current.pos.y - dComIfG_Bgsp().GroundCross(&gnd_chk) > 2000.0f) { + return GAKE_FLG_DROP; } else { - local_7c.x = 0.0f; - local_7c.y = 1000.0f; - local_7c.z = 2000.0f + WREG_F(1); - MtxPosition(&local_7c, &cStack_88); - cStack_88 += a_this->current.pos; - dStack_70.SetPos(&cStack_88); + mae.x = 0.0f; + mae.y = 1000.0f; + mae.z = 2000.0f + WREG_F(1); + MtxPosition(&mae, &ato); + ato += actor->current.pos; + gnd_chk.SetPos(&ato); - if (a_this->current.pos.y - dComIfG_Bgsp().GroundCross(&dStack_70) > 2000.0f) { - return 1; + if (actor->current.pos.y - dComIfG_Bgsp().GroundCross(&gnd_chk) > 2000.0f) { + return GAKE_FLG_DROP; } else { - return 0; + return GAKE_FLG_NONE; } } } } static BOOL e_wb_saku_jump_check(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - dBgS_LinChk dStack_98; - cXyz local_a8; - cXyz cStack_b4; - cXyz cStack_c0; - cMtx_YrotS(*calc_mtx, a_this->shape_angle.y); - cMtx_XrotM(*calc_mtx, a_this->shape_angle.x); - local_a8.x = 10.0f; - local_a8.y = 150.0f; - local_a8.z = KREG_F(8) + 500.0f; - MtxPosition(&local_a8, &cStack_c0); - cStack_c0 += a_this->current.pos; - cStack_b4 = a_this->current.pos; - cStack_b4.y += 100.0f; - dStack_98.Set(&cStack_b4, &cStack_c0, a_this); + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; + dBgS_LinChk linkChk; + cXyz mae; + cXyz start; + cXyz ato; + cMtx_YrotS(*calc_mtx, actor->shape_angle.y); + cMtx_XrotM(*calc_mtx, actor->shape_angle.x); + mae.x = 10.0f; + mae.y = 150.0f; + mae.z = KREG_F(8) + 500.0f; + MtxPosition(&mae, &ato); + ato += actor->current.pos; + start = actor->current.pos; + start.y += 100.0f; + linkChk.Set(&start, &ato, actor); - if (dComIfG_Bgsp().LineCross(&dStack_98)) { - cXyz cStack_cc(dStack_98.GetCross()); - cXyz cStack_d8; + if (dComIfG_Bgsp().LineCross(&linkChk)) { + cXyz cross(linkChk.GetCross()); + cXyz cross2; - local_a8.x *= -1.0f; - MtxPosition(&local_a8, &cStack_c0); - cStack_c0 += a_this->current.pos; - dStack_98.Set(&cStack_b4, &cStack_c0, a_this); + mae.x *= -1.0f; + MtxPosition(&mae, &ato); + ato += actor->current.pos; + linkChk.Set(&start, &ato, actor); - if (dComIfG_Bgsp().LineCross(&dStack_98)) { - cStack_d8 = dStack_98.GetCross(); + if (dComIfG_Bgsp().LineCross(&linkChk)) { + cross2 = linkChk.GetCross(); } else { return 0; } - local_a8 = cStack_d8 - cStack_cc; - s16 sVar1 = (cM_atan2s(local_a8.x, local_a8.z) + 0x4000) - a_this->shape_angle.y; + mae = cross2 - cross; + s16 range = (cM_atan2s(mae.x, mae.z) + 0x4000) - actor->shape_angle.y; - if (sVar1 > -0x3000 && sVar1 < 0x3000) { + if (range > -0x3000 && range < 0x3000) { return 1; } } @@ -657,33 +666,33 @@ static BOOL e_wb_saku_jump_check(e_wb_class* i_this) { return 0; } -static int e_wb_saku_check_sub(e_wb_class* i_this, s16 param_1) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - dBgS_GndChk dStack_90; - dBgS_LinChk dStack_100; - cXyz local_10c; - cXyz cStack_118; - cXyz cStack_124; +static int e_wb_saku_check_sub(e_wb_class* i_this, s16 yaa) { + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; + dBgS_GndChk gnd_chk; + dBgS_LinChk link_chk; + cXyz mae; + cXyz start; + cXyz ato; - f32 iVar2 = (i_this->field_0x68e & 7) * 400.0f; + f32 za = (i_this->counter & 7) * 400.0f; - cMtx_YrotS(*calc_mtx, a_this->shape_angle.y + param_1); - local_10c.x = 0.0f; - local_10c.y = 2000.0f; - local_10c.z = iVar2; - MtxPosition(&local_10c, &cStack_118); - cStack_118 += a_this->current.pos; - dStack_90.SetPos(&cStack_118); - cStack_118.y = dComIfG_Bgsp().GroundCross(&dStack_90) + 150.0f; - local_10c.x = 0.0f; - local_10c.y = 0.0f; - local_10c.z = 410.0f; + cMtx_YrotS(*calc_mtx, actor->shape_angle.y + yaa); + mae.x = 0.0f; + mae.y = 2000.0f; + mae.z = za; + MtxPosition(&mae, &start); + start += actor->current.pos; + gnd_chk.SetPos(&start); + start.y = dComIfG_Bgsp().GroundCross(&gnd_chk) + 150.0f; + mae.x = 0.0f; + mae.y = 0.0f; + mae.z = 410.0f; - MtxPosition(&local_10c, &cStack_124); - cStack_124 += cStack_118; - dStack_100.Set(&cStack_118, &cStack_124, a_this); + MtxPosition(&mae, &ato); + ato += start; + link_chk.Set(&start, &ato, actor); - if (dComIfG_Bgsp().LineCross(&dStack_100)) { + if (dComIfG_Bgsp().LineCross(&link_chk)) { return 1; } @@ -692,47 +701,47 @@ static int e_wb_saku_check_sub(e_wb_class* i_this, s16 param_1) { static int e_wb_saku_check(e_wb_class* i_this) { e_wb_class* unused = i_this; - int uVar2 = false; + int saku = false; static s16 yaa[3] = {0, -4096, 4096}; static u32 saku_bit[3] = {1, 2, 4}; for (int i = 0; i < 3; i++) { if (e_wb_saku_check_sub(i_this, yaa[i])) { - uVar2 |= saku_bit[i]; + saku |= saku_bit[i]; } } - return uVar2; + return saku; } static void e_wb_wait(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; cXyz unused1, unused2; - switch (i_this->mActionMode) { + switch (i_this->ride_mode) { case 0: anm_init(i_this, 0x25, 3.0f, 2, 1.0f); - i_this->mActionMode = 1; + i_this->ride_mode = 1; case 1: - if (a_this->speedF > 15.0f) { - i_this->mMovementType = 2; - i_this->mZ2Ride.startCreatureSoundLevel(Z2SE_EN_WB_L_SLIP, 0, -1); + if (actor->speedF > 15.0f) { + i_this->movement_type = 2; + i_this->sound.startCreatureSoundLevel(Z2SE_EN_WB_L_SLIP, 0, -1); } else { anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); - i_this->mActionMode = 2; - i_this->mStatusFlags |= (u16)0x20; + i_this->ride_mode = 2; + i_this->status_flag |= (u16)0x20; } case 2: default: - cLib_addCalc0(&a_this->speedF, 1.0f, 1.0f); + cLib_addCalc0(&actor->speedF, 1.0f, 1.0f); } } static void e_wb_ride(e_wb_class* i_this) { e_wb_class* unused = i_this; - switch (i_this->mActionMode) { + switch (i_this->ride_mode) { case 0: anm_init(i_this, 0x1f, 3.0f, 0, 1.0f); - i_this->mActionMode = 1; + i_this->ride_mode = 1; case 1: default: return; @@ -740,28 +749,28 @@ static void e_wb_ride(e_wb_class* i_this) { } static void e_wb_pl_ride_now(e_wb_class* i_this) { - if (i_this->mAnmID != 0x2a) { + if (i_this->anmID != 42) { anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); } } static void e_wb_pl_ride(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - f32 fVar11; - f32 fVar2; + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; + f32 max_speed; + f32 speed; - if (i_this->field_0x1432 != 0) { - fVar11 = 50.0f; - if (i_this->field_0x1432 == 1) { - i_this->mActionID = ACT_PL_RIDE; + if (i_this->dash_timer != 0) { + max_speed = 50.0f; + if (i_this->dash_timer == 1) { + i_this->action = ACT_PL_RIDE; } - if (i_this->mAnmID == 0x1b) { - if (i_this->mpModelMorf->isStop()) { + if (i_this->anmID == 27) { + if (i_this->anm_p->isStop()) { anm_init(i_this, 0x20, 2.0f, 2, 2.0f); - a_this->speedF = 1.0; + actor->speedF = 1.0; } else { - if (i_this->mpModelMorf->checkFrame(22.0f) || i_this->mpModelMorf->checkFrame(42.0)) + if (i_this->anm_p->checkFrame(22.0f) || i_this->anm_p->checkFrame(42.0)) { dComIfGp_getVibration().StartShock(5, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); } @@ -770,26 +779,26 @@ static void e_wb_pl_ride(e_wb_class* i_this) { } if ( #if PLATFORM_GCN - (i_this->field_0x1432 & 0x7) == 0 + (i_this->dash_timer & 0x7) == 0 #else - (i_this->field_0x1432 & 0xf) == 0 + (i_this->dash_timer & 0xf) == 0 #endif ) { dComIfGp_getVibration().StartShock(3, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); } } else { - fVar11 = l_HIO.mPlayerMountedMaxSpeed; + max_speed = l_HIO.mPlayerMountedMaxSpeed; } - if (i_this->mAnmID == 0x25) { - cLib_chaseF(&a_this->speedF, 0.0f, 2.0f); - if (a_this->speedF < 0.01f) { + if (i_this->anmID == 37) { + cLib_chaseF(&actor->speedF, 0.0f, 2.0f); + if (actor->speedF < 0.01f) { anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); } - if (a_this->speedF > 10.0f) { - i_this->mMovementType = 2; + if (actor->speedF > 10.0f) { + i_this->movement_type = 2; } return; } else { @@ -801,11 +810,11 @@ static void e_wb_pl_ride(e_wb_class* i_this) { f32 fVar1 = 1.5; s16 stick_angle; - if (i_this->mActionID == 0x65) { - fVar2 = stick_value; + if (i_this->action == 101) { + speed = stick_value; stick_angle = mDoCPd_c::getStickAngle3D(0); } else { - fVar2 = 1.0; + speed = 1.0; fVar1 = 10.0; if (dComIfGp_event_runCheck()) { @@ -819,228 +828,228 @@ static void e_wb_pl_ride(e_wb_class* i_this) { } } - s16 angle_y = dCam_getControledAngleY(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0))) + + s16 angle = dCam_getControledAngleY(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0))) + 0x10000 + stick_angle - 0x8000; - int iVar4 = 0; - s16 angle_delta = angle_y - a_this->current.angle.y; + int dir = 0; + s16 ya = angle - actor->current.angle.y; - if (i_this->mActionID == 0x65) { - if (abs(angle_delta) > 0x6000) { - iVar4 = 1; - } else if (angle_delta >= 0x2000) { - iVar4 = 2; - } else if (angle_delta <= -0x2000) { - iVar4 = 3; + if (i_this->action == ACT_PL_RIDE) { + if (abs(ya) > 0x6000) { + dir = 1; + } else if (ya >= 0x2000) { + dir = 2; + } else if (ya <= -0x2000) { + dir = 3; } - } else if (angle_delta >= 0x2000) { - iVar4 = 2; - } else if (angle_delta <= -0x2000) { - iVar4 = 3; + } else if (ya >= 0x2000) { + dir = 2; + } else if (ya <= -0x2000) { + dir = 3; } - if (i_this->mSpeedCapTimer == 2) { - if (a_this->speedF < 0.1f) { - if (iVar4 == 0) { - fVar2 = 0.0; + if (i_this->gake_flg == GAKE_FLG_TURN) { + if (actor->speedF < 0.1f) { + if (dir == 0) { + speed = 0.0f; } } else { - iVar4 = 1; + dir = 1; } - if (i_this->mActionID != ACT_PL_RIDE) { - i_this->mActionID = ACT_PL_RIDE; - i_this->field_0x1432 = 0; + if (i_this->action != ACT_PL_RIDE) { + i_this->action = ACT_PL_RIDE; + i_this->dash_timer = 0; - if (a_this->speedF > l_HIO.mPlayerMountedMaxSpeed) { - a_this->speedF = l_HIO.mPlayerMountedMaxSpeed; + if (actor->speedF > l_HIO.mPlayerMountedMaxSpeed) { + actor->speedF = l_HIO.mPlayerMountedMaxSpeed; } } - } else if (i_this->mSpeedCapTimer < 0 && iVar4 == 1) { - fVar2 = 0.0f; + } else if (i_this->gake_flg < 0 && dir == 1) { + speed = 0.0f; } // Bulblin Camp, Outside Arbiter's Grounds Room if ((strcmp(dComIfGp_getStartStageName(), "F_SP118") == 0 && - fopAcM_GetRoomNo(a_this) == 3 && dComIfGp_event_runCheck()) || + fopAcM_GetRoomNo(actor) == 3 && dComIfGp_event_runCheck()) || dComIfGp_checkPlayerStatus0(0, 0x2000)) { - fVar2 = 0.0f; + speed = 0.0f; } - i_this->mWaitRollAngle = 0; - if (iVar4 != 1 && fVar2 > 0.01f) { - s16 curr_angle_y = a_this->current.angle.y; + i_this->wait_roll_angle = 0; + if (dir != 1 && speed > 0.01f) { + s16 curr_angle_y = actor->current.angle.y; - if (i_this->mActionID == ACT_PL_RIDE) { - cLib_addCalcAngleS2(&a_this->current.angle.y, angle_y, 4, 500); - i_this->mTurnStep = 0; + if (i_this->action == ACT_PL_RIDE) { + cLib_addCalcAngleS2(&actor->current.angle.y, angle, 4, 0x1F4); + i_this->turn_step = 0; } else { - s16 local_94 = 0; - s16 local_96 = 0x40 + KREG_S(3); + s16 target_turn = 0; + s16 turn_rate = 0x40 + KREG_S(3); - if (iVar4 == 2) { - local_94 = 0x300 + KREG_S(2); - } else if (iVar4 == 3) { - local_94 = -(0x300 + KREG_S(2)); + if (dir == 2) { + target_turn = 0x300 + KREG_S(2); + } else if (dir == 3) { + target_turn = -(0x300 + KREG_S(2)); } else { - local_96 = 0x10 + KREG_S(4); + turn_rate = 0x10 + KREG_S(4); } - cLib_addCalcAngleS2(&i_this->mTurnStep, local_94, 4, local_96); - a_this->current.angle.y += i_this->mTurnStep; + cLib_addCalcAngleS2(&i_this->turn_step, target_turn, 4, turn_rate); + actor->current.angle.y += i_this->turn_step; } - i_this->mWaitRollAngle = a_this->current.angle.y - curr_angle_y; - s16 temAngle = i_this->mWaitRollAngle * (TREG_S(7) - 8); - f32 fVar10 = temAngle * a_this->speedF / (l_HIO.mPlayerMountedMaxSpeed + 1.0f); + i_this->wait_roll_angle = actor->current.angle.y - curr_angle_y; + s16 work = i_this->wait_roll_angle * (TREG_S(7) - 8); + f32 speed = work * actor->speedF / (l_HIO.mPlayerMountedMaxSpeed + 1.0f); - if (fVar10 > NREG_F(0x11) + 4500.0f) { - fVar10 = NREG_F(0x11) + 4500.0f; - } else if (fVar10 < -(4500.0f + NREG_F(0x11))) { - fVar10 = -(4500.0f + NREG_F(0x11)); + if (speed > NREG_F(0x11) + 4500.0f) { + speed = NREG_F(0x11) + 4500.0f; + } else if (speed < -(4500.0f + NREG_F(0x11))) { + speed = -(4500.0f + NREG_F(0x11)); } - cLib_addCalcAngleS2(&i_this->mBodyTiltAngle, (s16)fVar10, 8, 0x140); + cLib_addCalcAngleS2(&i_this->body_angle, (s16)speed, 8, 0x140); } - if (a_this->speedF < 0.01f) { - if (fVar2 > 0.01f) { - if (iVar4 == 0) { - i_this->mWaitRollAngle = 0; - a_this->speedF = fVar1; + if (actor->speedF < 0.01f) { + if (speed > 0.01f) { + if (dir == 0) { + i_this->wait_roll_angle = 0; + actor->speedF = fVar1; } else { - if (iVar4 == 1) { - i_this->mWaitRollAngle = 0; - cLib_chaseF(&a_this->speedF, fVar11 * fVar2 * -0.2f, 1.0f); + if (dir == 1) { + i_this->wait_roll_angle = 0; + cLib_chaseF(&actor->speedF, max_speed * speed * -0.2f, 1.0f); } - if (i_this->mAnmID != 0x28) { + if (i_this->anmID != 40) { anm_init(i_this, 0x28, 5.0f, 2, 1.5f); } } - } else if (fabsf(a_this->speedF) < 0.01f) { - if (i_this->mAnmID != 0x2a) { + } else if (fabsf(actor->speedF) < 0.01f) { + if (i_this->anmID != 42) { anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); } } else { - cLib_chaseF(&a_this->speedF, 0.0f, 0.5f); + cLib_chaseF(&actor->speedF, 0.0f, 0.5f); } } else { - i_this->mWaitRollAngle = 0; + i_this->wait_roll_angle = 0; - if (fVar2 > 0.01f) { - if (iVar4 == 1) { - if (a_this->speedF > fVar11 * 0.3f && i_this->mAnmID != 0x25) { + if (speed > 0.01f) { + if (dir == 1) { + if (actor->speedF > max_speed * 0.3f && i_this->anmID != 37) { anm_init(i_this, 0x25, 3.0f, 2, 1.0f); } - cLib_chaseF(&a_this->speedF, 0.0f, 2.0f); + cLib_chaseF(&actor->speedF, 0.0f, 2.0f); } else { - cLib_chaseF(&a_this->speedF, fVar11 * fVar2, fVar1); + cLib_chaseF(&actor->speedF, max_speed * speed, fVar1); - if (a_this->speedF < TREG_F(3) + 20.0f) { - if (i_this->mAnmID != 0x2b) { + if (actor->speedF < TREG_F(3) + 20.0f) { + if (i_this->anmID != 43) { anm_init(i_this, 0x2b, 5.0f, 2, 1.0f); } - } else if (i_this->mAnmID != 0x20) { + } else if (i_this->anmID != 32) { anm_init(i_this, 0x20, 5.0f, 2, 1.0f); } } } else { - cLib_chaseF(&a_this->speedF, 0.0f, 0.5); + cLib_chaseF(&actor->speedF, 0.0f, 0.5); - if (i_this->mAnmID == 0x20 && a_this->speedF < TREG_F(3) + 20.0f) { + if (i_this->anmID == 32 && actor->speedF < TREG_F(3) + 20.0f) { anm_init(i_this, 0x2b, 5.0f, 2, 1.0f); } } } - if (i_this->mAnmID == 0x20) { - i_this->mpModelMorf->setPlaySpeed( + if (i_this->anmID == 32) { + i_this->anm_p->setPlaySpeed( BREG_F(0) + 0.4f + - (l_HIO.mPlayerMountedMotionPlaybackSpeed * a_this->speedF) / + (l_HIO.mPlayerMountedMotionPlaybackSpeed * actor->speedF) / l_HIO.mPlayerMountedMaxSpeed); - i_this->mMovementType = 1; - i_this->mPursuitFlag = 1; - } else if (i_this->mAnmID == 0x2b) { - i_this->mpModelMorf->setPlaySpeed(TREG_F(4) + 0.7f + - (TREG_F(5) + 0.05f) * a_this->speedF); + i_this->movement_type = 1; + i_this->pursuit_flg = 1; + } else if (i_this->anmID == 43) { + i_this->anm_p->setPlaySpeed(TREG_F(4) + 0.7f + + (TREG_F(5) + 0.05f) * actor->speedF); } } } static void e_wb_f_wait(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - s16 new_angle = fopAcM_searchPlayerAngleY(a_this); + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; + s16 target_angle = fopAcM_searchPlayerAngleY(actor); - switch (i_this->mActionMode) { + switch (i_this->ride_mode) { case 0: - if (lbl_244_bss_45 != 0 && (i_this->mParam2 == 1 || i_this->mParam2 == 2)) { - i_this->mActionMode = 10; + if (lbl_244_bss_45 != 0 && (i_this->arg1 == 1 || i_this->arg1 == 2)) { + i_this->ride_mode = 10; anm_init(i_this, 0x28, 5.0f, 2, 1.5f); if (cM_rndF(1.0) < 0.5f) { - i_this->field_0x7a0 = 0x3000; + i_this->dodge_angle = 0x3000; } else { - i_this->field_0x7a0 = -0x3000; + i_this->dodge_angle = -0x3000; } break; } else { anm_init(i_this, 0x28, 5.0f, 2, 1.5f); - i_this->mActionMode = 1; - i_this->mStatusFlags |= (u16)4; + i_this->ride_mode = 1; + i_this->status_flag |= (u16)4; } // fallthrough case 1: - cLib_addCalcAngleS2(&a_this->current.angle.y, new_angle, 8, 0x200); - i_this->field_0x6d0 = new_angle - a_this->current.angle.y; + cLib_addCalcAngleS2(&actor->current.angle.y, target_angle, 8, 0x200); + i_this->range = target_angle - actor->current.angle.y; - if (i_this->field_0x6d0 < 0x800 && i_this->field_0x6d0 > -0x800) { - if (i_this->mSpeedCapTimer > 0) { - if (i_this->mAnmID != 0x2a) { + if (i_this->range < 0x800 && i_this->range > -0x800) { + if (i_this->gake_flg > GAKE_FLG_NONE) { + if (i_this->anmID != 42) { anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); } } else { fopAc_ac_c* player = dComIfGp_getPlayer(0); - i_this->mActionID = ACT_C_F_RUN; - i_this->mActionMode = 0; + i_this->action = ACT_C_F_RUN; + i_this->ride_mode = 0; i_this->field_0x5d0 = player->current.pos; } break; - } else if (i_this->mAnmID != 0x28) { + } else if (i_this->anmID != 40) { anm_init(i_this, 0x28, 5.0f, 2, 1.0f); } break; case 10: - new_angle += i_this->field_0x7a0; + target_angle += i_this->dodge_angle; - cLib_addCalcAngleS2(&a_this->current.angle.y, new_angle, 8, 0x200); - i_this->field_0x6d0 = new_angle - a_this->current.angle.y; + cLib_addCalcAngleS2(&actor->current.angle.y, target_angle, 8, 0x200); + i_this->range = target_angle - actor->current.angle.y; - if (i_this->field_0x6d0 < 0x800 && i_this->field_0x6d0 > -0x800) { + if (i_this->range < 0x800 && i_this->range > -0x800) { anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); - i_this->mActionMode = 11; + i_this->ride_mode = 11; } break; case 11: - new_angle += i_this->field_0x7a0; - i_this->field_0x6d0 = new_angle - a_this->current.angle.y; + target_angle += i_this->dodge_angle; + i_this->range = target_angle - actor->current.angle.y; - if (i_this->field_0x6d0 > 0x1000 || i_this->field_0x6d0 < -0x1000) { - i_this->mActionMode = 10; + if (i_this->range > 0x1000 || i_this->range < -0x1000) { + i_this->ride_mode = 10; anm_init(i_this, 0x28, 5.0f, 2, 1.5f); } break; } - cLib_addCalc0(&a_this->speedF, 1.0f, 2.0f); + cLib_addCalc0(&actor->speedF, 1.0f, 2.0f); - if (i_this->mActionMode >= 10) { - f32 dist = fopAcM_searchPlayerDistanceXZ(a_this); + if (i_this->ride_mode >= 10) { + f32 dist = fopAcM_searchPlayerDistanceXZ(actor); if (!(dist < 500.0f) && !(dist > 1500.0f)) { if (!daPy_getPlayerActorClass()->checkHorseRide()) { @@ -1052,25 +1061,25 @@ static void e_wb_f_wait(e_wb_class* i_this) { } } - if (i_this->mSpeedCapTimer == 0) { - i_this->mActionID = ACT_C_F_RUN; - i_this->mActionMode = 0; + if (i_this->gake_flg == GAKE_FLG_NONE) { + i_this->action = ACT_C_F_RUN; + i_this->ride_mode = 0; } } } -static int pl_pass_check(e_wb_class* i_this, f32 param_1) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - fopAc_ac_c* player = dComIfGp_getPlayer(0); +static int pl_pass_check(e_wb_class* i_this, f32 pass) { + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; + fopAc_ac_c* pl = dComIfGp_getPlayer(0); - cXyz pos_delta; - cXyz cStack_24; + cXyz mae; + cXyz ato; - pos_delta = a_this->current.pos - player->current.pos; + mae = actor->current.pos - pl->current.pos; - cMtx_YrotS(*calc_mtx, -player->shape_angle.y); - MtxPosition(&pos_delta, &cStack_24); - if (cStack_24.z > param_1) { + cMtx_YrotS(*calc_mtx, -pl->shape_angle.y); + MtxPosition(&mae, &ato); + if (ato.z > pass) { return 1; } else { return 0; @@ -1078,191 +1087,191 @@ static int pl_pass_check(e_wb_class* i_this, f32 param_1) { } static void e_wb_f_run(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - fopAc_ac_c* local_8c = dComIfGp_getPlayer(0); - cXyz local_70; - cXyz cStack_7c; - f32 dVar13 = fopAcM_searchPlayerDistanceXZ(a_this); - f32 dVar16 = 0.0f; - f32 uVar15 = 1.0f; - if ((i_this->mStatusFlags & 1) == 0) { - i_this->mActionID = ACT_A_RUN; - i_this->mActionMode = 0; + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; + fopAc_ac_c* pla = dComIfGp_getPlayer(0); + cXyz mae; + cXyz ato; + f32 dist = fopAcM_searchPlayerDistanceXZ(actor); + f32 speed = 0.0f; + f32 acceleration = 1.0f; + if ((i_this->status_flag & 1) == 0) { + i_this->action = ACT_A_RUN; + i_this->ride_mode = 0; } else { - e_rd_class* local_90 = (e_rd_class*)fopAcM_SearchByID(i_this->field_0x1434); - int local_94; - if (local_94 = e_wb_saku_check(i_this)) { + e_rd_class* local_90 = (e_rd_class*)fopAcM_SearchByID(i_this->rd_id); + int saku; + if (saku = e_wb_saku_check(i_this)) { i_this->field_0x6d4 = 60; - if ((local_94 & 2) != 0) { + if ((saku & 2) != 0) { i_this->field_0x6d6 = 0x3000; } else { i_this->field_0x6d6 = -0x3000; } } - cLib_addCalcAngleS2(&i_this->field_0x6d6, 0, 1, 100); - s8 bVar7 = false; + cLib_addCalcAngleS2(&i_this->field_0x6d6, 0, 1, 0x64); + s8 run_check = false; if (daPy_getPlayerActorClass()->checkHorseRide() && dComIfGp_getHorseActor()->speedF >= 30.0f) { - bVar7 = true; + run_check = true; } - s16 sVar2 = a_this->current.angle.y; + s16 angle = actor->current.angle.y; - switch (i_this->mActionMode) { + switch (i_this->ride_mode) { case 0: if (i_this->field_0x7a6 == 0) { anm_init(i_this, 0x1b, 3.0f, 0, 1.0f); - i_this->mActionMode = 1; - i_this->mAnimDuration = 40.0f; - i_this->mStatusFlags |= (u16)8; + i_this->ride_mode = 1; + i_this->anm_time = 40.0f; + i_this->status_flag |= (u16)8; } else { i_this->field_0x7a6 = 0; anm_init(i_this, 0x20, 5.0f, 2, 1.0f); - i_this->mpModelMorf->setFrame(cM_rndF(10.0f)); - i_this->mActionMode = 2; - i_this->mStatusFlags |= (u16)0x10; - i_this->mZ2Ride.startCreatureSound(Z2SE_EN_WB_KICK_GROUND, 0, -1); + i_this->anm_p->setFrame(cM_rndF(10.0f)); + i_this->ride_mode = 2; + i_this->status_flag |= (u16)0x10; + i_this->sound.startCreatureSound(Z2SE_EN_WB_KICK_GROUND, 0, -1); } break; case 1: - if (i_this->mpModelMorf->checkFrame(3.0f)) { - i_this->mCollisionFlags |= (u8)2; - i_this->mMovementType = 10; - } else if (i_this->mpModelMorf->checkFrame(15.0f)) { - i_this->mCollisionFlags |= (u8)3; + if (i_this->anm_p->checkFrame(3.0f)) { + i_this->collision_flg |= (u8)2; + i_this->movement_type = 10; + } else if (i_this->anm_p->checkFrame(15.0f)) { + i_this->collision_flg |= (u8)3; } - if (i_this->mpModelMorf->isStop()) { + if (i_this->anm_p->isStop()) { anm_init(i_this, 0x20, 5.0f, 2, 1.0f); - i_this->mActionMode = 2; - i_this->mStatusFlags |= (u16)0x10; - i_this->mZ2Ride.startCreatureSound(Z2SE_EN_WB_KICK_GROUND, 0, -1); + i_this->ride_mode = 2; + i_this->status_flag |= (u16)0x10; + i_this->sound.startCreatureSound(Z2SE_EN_WB_KICK_GROUND, 0, -1); } break; case 2: - i_this->mPursuitFlag = 1; - if (bVar7) { - dVar16 = dComIfGp_getHorseActor()->speedF; - if (dVar16 > l_HIO.cavalry_battle_max_speed) { - dVar16 = l_HIO.cavalry_battle_max_speed; - } else if (dVar16 < l_HIO.max_speed) { - dVar16 = l_HIO.max_speed; + i_this->pursuit_flg = 1; + if (run_check) { + speed = dComIfGp_getHorseActor()->speedF; + if (speed > l_HIO.cavalry_battle_max_speed) { + speed = l_HIO.cavalry_battle_max_speed; + } else if (speed < l_HIO.max_speed) { + speed = l_HIO.max_speed; } - s16 local_a4 = 0x80; + s16 local_a4 = 128; if (i_this->field_0x6c0 != 0) { - i_this->mTargetFacingAngle = local_8c->shape_angle.y; + i_this->target_ya = pla->shape_angle.y; i_this->field_0x5de = 0; - uVar15 = 0.5f; + acceleration = 0.5f; } else { - if (i_this->field_0x698[2] == 0) { - i_this->field_0x698[2] = cM_rndF(10.0f) + 3.0f; - local_70.x = i_this->field_0x6c4; - local_70.y = 0.0f; - local_70.z = 1500.0f; - cMtx_YrotS(*calc_mtx, local_8c->shape_angle.y); - MtxPosition(&local_70, &cStack_7c); - cStack_7c += local_8c->current.pos; - local_70 = cStack_7c - a_this->current.pos; - i_this->mTargetFacingAngle = cM_atan2s(local_70.x, local_70.z); + if (i_this->timer[2] == 0) { + i_this->timer[2] = cM_rndF(10.0f) + 3.0f; + mae.x = i_this->x_check; + mae.y = 0.0f; + mae.z = 1500.0f; + cMtx_YrotS(*calc_mtx, pla->shape_angle.y); + MtxPosition(&mae, &ato); + ato += pla->current.pos; + mae = ato - actor->current.pos; + i_this->target_ya = cM_atan2s(mae.x, mae.z); } - if (pl_pass_check(i_this, i_this->field_0x7a8)) { - dVar16 *= 0.95f + TREG_F(7); - uVar15 = 0.5f; + if (pl_pass_check(i_this, i_this->pass)) { + speed *= 0.95f + TREG_F(7); + acceleration = 0.5f; } else { - dVar16 *= 1.35f + TREG_F(8); - uVar15 = 0.5f; + speed *= 1.35f + TREG_F(8); + acceleration = 0.5f; } local_a4 = 0x200; } - if (local_90 != NULL && local_90->anm == 0x27) { + if (local_90 != NULL && local_90->anm == 39) { i_this->field_0x6d6 = - (5000.0f + BREG_F(16)) * cM_ssin(i_this->field_0x68e * (1000 + BREG_S(7))); + (5000.0f + BREG_F(16)) * cM_ssin(i_this->counter * (0x3E8 + BREG_S(7))); local_a4 = 0x400; } - cLib_addCalcAngleS2(&a_this->current.angle.y, - i_this->mTargetFacingAngle + i_this->field_0x5de + + cLib_addCalcAngleS2(&actor->current.angle.y, + i_this->target_ya + i_this->field_0x5de + i_this->field_0x6d6, 8, local_a4); - cLib_addCalcAngleS2(&i_this->field_0x5de, 0, 1, 100); - f32 fVar1 = a_this->speedF / 40.0f; - if (fVar1 < 1.0f) { - fVar1 = 1.0f; + cLib_addCalcAngleS2(&i_this->field_0x5de, 0, 1, 0x64); + f32 spd = actor->speedF / 40.0f; + if (spd < 1.0f) { + spd = 1.0f; } - if (fVar1 > 1.3f) { - fVar1 = 1.3f; + if (spd > 1.3f) { + spd = 1.3f; } - i_this->mpModelMorf->setPlaySpeed(fVar1); + i_this->anm_p->setPlaySpeed(spd); } else { - i_this->mpModelMorf->setPlaySpeed(1.0); - uVar15 = 3.0f; - dVar16 = l_HIO.max_speed; - if (dVar13 > 700.0f) { - cLib_addCalcAngleS2(&a_this->current.angle.y, - i_this->field_0x6d6 + fopAcM_searchPlayerAngleY(a_this), 8, + i_this->anm_p->setPlaySpeed(1.0); + acceleration = 3.0f; + speed = l_HIO.max_speed; + if (dist > 700.0f) { + cLib_addCalcAngleS2(&actor->current.angle.y, + i_this->field_0x6d6 + fopAcM_searchPlayerAngleY(actor), 8, 0x200); } - if (dVar13 < 400.0f) { - i_this->mActionMode = 3; - i_this->field_0x698[0] = 40; + if (dist < 400.0f) { + i_this->ride_mode = 3; + i_this->timer[0] = 40; } } - i_this->mMovementType = 1; + i_this->movement_type = 1; break; case 3: - i_this->mPursuitFlag = 1; - dVar16 = l_HIO.max_speed; - uVar15 = 3.0f; - if (i_this->field_0x698[0] == 15) { - i_this->mStatusFlags |= (u16)0x20; + i_this->pursuit_flg = 1; + speed = l_HIO.max_speed; + acceleration = 3.0f; + if (i_this->timer[0] == 15) { + i_this->status_flag |= (u16)0x20; } - if (i_this->field_0x698[0] == 0) { - i_this->mActionMode = 4; + if (i_this->timer[0] == 0) { + i_this->ride_mode = 4; anm_init(i_this, 0x25, 3.0f, 2, 1.0f); } - i_this->mMovementType = 1; + i_this->movement_type = 1; break; case ACT_RIDE: - if (a_this->speedF > 15.0f) { - i_this->mMovementType = 2; - i_this->mZ2Ride.startCreatureSoundLevel(Z2SE_EN_WB_L_SLIP, 0, -1); + if (actor->speedF > 15.0f) { + i_this->movement_type = 2; + i_this->sound.startCreatureSoundLevel(Z2SE_EN_WB_L_SLIP, 0, -1); } - if (a_this->speedF < 1.0f) { - i_this->mActionID = ACT_F_WAIT; - i_this->mActionMode = 0; + if (actor->speedF < 1.0f) { + i_this->action = ACT_F_WAIT; + i_this->ride_mode = 0; return; } break; } - cLib_addCalc2(&a_this->speedF, dVar16, 1.0f, uVar15); - s16 spA = (-8 + TREG_S(7)) * (a_this->current.angle.y - sVar2); - cLib_addCalcAngleS2(&i_this->mBodyTiltAngle, spA, 8, 0x200); - if (i_this->mActionMode < 4 && i_this->mSpeedCapTimer > 0) { - i_this->mStatusFlags |= (u16)0x20; + cLib_addCalc2(&actor->speedF, speed, 1.0f, acceleration); + s16 ya = (-8 + TREG_S(7)) * (actor->current.angle.y - angle); + cLib_addCalcAngleS2(&i_this->body_angle, ya, 8, 0x200); + if (i_this->ride_mode < 4 && i_this->gake_flg > GAKE_FLG_NONE) { + i_this->status_flag |= (u16)0x20; anm_init(i_this, 0x25, 3.0f, 2, 1.0f); - if (a_this->speedF > 30.0f) { - a_this->speedF = 30.0f; + if (actor->speedF > 30.0f) { + actor->speedF = 30.0f; } - i_this->mActionMode = 4; + i_this->ride_mode = 4; } } } static void* s_wbstart_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_WB_e) { e_wb_class* wb = static_cast(i_actor); - if (wb->field_0x79d == 0) { + if (wb->leader == 0) { wb->field_0x7a6 = 1; wb->field_0x7a7 = 1; } @@ -1271,51 +1280,51 @@ static void* s_wbstart_sub(void* i_actor, void* i_data) { } static void e_wb_b_wait(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - f32 dVar7 = fopAcM_searchPlayerDistanceXZ(a_this); - s16 sVar5 = fopAcM_searchPlayerAngleY(a_this); - if (i_this->field_0x79c != 0) { - i_this->field_0x79c--; - if (i_this->field_0x79c == 0) { + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; + f32 dist = fopAcM_searchPlayerDistanceXZ(actor); + s16 target_angle = fopAcM_searchPlayerAngleY(actor); + if (i_this->start_timer != 0) { + i_this->start_timer--; + if (i_this->start_timer == 0) { fpcM_Search(s_wbstart_sub, i_this); } } - switch (i_this->mActionMode) { + switch (i_this->ride_mode) { case 0: anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); - i_this->mActionMode = 1; - i_this->field_0x698[0] = cM_rndF(100.0f) + 100.0f; - i_this->mStatusFlags |= (u16)0x20; + i_this->ride_mode = 1; + i_this->timer[0] = cM_rndF(100.0f) + 100.0f; + i_this->status_flag |= (u16)0x20; // fallthrough case 1: - if (i_this->field_0x698[0] == 0 && i_this->mPathInitialized != 0) { - i_this->mActionMode = 2; - } else if (dVar7 < 2000.0f) { - i_this->mActionID = ACT_B_RUN; - i_this->mActionMode = 0; - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_RDB_V_HOICK, -1); + if (i_this->timer[0] == 0 && i_this->path_set != 0) { + i_this->ride_mode = 2; + } else if (dist < 2000.0f) { + i_this->action = ACT_B_RUN; + i_this->ride_mode = 0; + i_this->sound.startCreatureVoice(Z2SE_EN_RDB_V_HOICK, -1); } break; case 2: - cLib_addCalcAngleS2(&a_this->current.angle.y, sVar5, 8, 0x200); - i_this->field_0x6d0 = sVar5 - a_this->current.angle.y; - if (i_this->field_0x6d0 < 0x800 && i_this->field_0x6d0 > -0x800) { - if (i_this->mSpeedCapTimer > 0) { - if (i_this->mAnmID != 0x2a) { + cLib_addCalcAngleS2(&actor->current.angle.y, target_angle, 8, 0x200); + i_this->range = target_angle - actor->current.angle.y; + if (i_this->range < 0x800 && i_this->range > -0x800) { + if (i_this->gake_flg > GAKE_FLG_NONE) { + if (i_this->anmID != 42) { anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); } } else { - i_this->mActionID = ACT_B_WAIT2; - i_this->mActionMode = 0; + i_this->action = ACT_B_WAIT2; + i_this->ride_mode = 0; } - } else if (i_this->mAnmID != 0x28) { + } else if (i_this->anmID != 40) { anm_init(i_this, 0x28, 5.0f, 2, 1.0f); } break; } - cLib_addCalc0(&a_this->speedF, 1.0f, 2.0f); + cLib_addCalc0(&actor->speedF, 1.0f, 2.0f); } static cXyz b_path[8]; @@ -1323,177 +1332,177 @@ static cXyz b_path[8]; static cXyz b_path2[8]; static void e_wb_b_run2(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - fopAc_ac_c* player_p = dComIfGp_getPlayer(0); - cXyz pos1; - cXyz pos2; - f32 dist = fopAcM_searchPlayerDistanceXZ(a_this); - f32 fVar10 = 0.0f; - f32 fVar1 = 1.0f; - s16 curr_angle = a_this->current.angle.y; - f32 target = 1.0f; + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; + fopAc_ac_c* pla = dComIfGp_getPlayer(0); + cXyz mae; + cXyz ato; + f32 dist = fopAcM_searchPlayerDistanceXZ(actor); + f32 speed = 0.0f; + f32 acceleration = 1.0f; + s16 angle = actor->current.angle.y; + f32 target_spd = 1.0f; - switch (i_this->mActionMode) { + switch (i_this->ride_mode) { case 0: anm_init(i_this, 0x1b, 3.0f, 0, 1.0f); - i_this->mActionMode = 1; - i_this->mStatusFlags |= (u16)8; - i_this->mAnimDuration = 40.0f; - i_this->mPlaySpeed = 1.0f; + i_this->ride_mode = 1; + i_this->status_flag |= (u16)8; + i_this->anm_time = 40.0f; + i_this->anm_spd = 1.0f; break; case 1: - if (i_this->mpModelMorf->checkFrame(3.0f) != 0) { - i_this->mCollisionFlags |= (u8)2; - i_this->mMovementType = 10; + if (i_this->anm_p->checkFrame(3.0f) != 0) { + i_this->collision_flg |= (u8)2; + i_this->movement_type = 10; } else { - if (i_this->mpModelMorf->checkFrame(15.0f) != 0) { - i_this->mCollisionFlags |= (u8)3; + if (i_this->anm_p->checkFrame(15.0f) != 0) { + i_this->collision_flg |= (u8)3; } } - if (i_this->mpModelMorf->isStop()) { + if (i_this->anm_p->isStop()) { anm_init(i_this, 0x20, 5.0f, 2, 1.0f); - i_this->mActionMode = 2; - cXyz loop_pos1; - cXyz loop_pos2; - int local_e0 = 0; + i_this->ride_mode = 2; + cXyz path; + cXyz path2; + int ten = 0; for (int i = 1; i < 8; i++) { - loop_pos1 = b_path2[local_e0] - a_this->current.pos; - loop_pos2 = b_path2[i] - a_this->current.pos; + path = b_path2[ten] - actor->current.pos; + path2 = b_path2[i] - actor->current.pos; - if (loop_pos1.abs() > loop_pos2.abs()) { - local_e0 = i; + if (path.abs() > path2.abs()) { + ten = i; } } - i_this->mCurrentPathIndex = local_e0; - i_this->field_0x698[0] = cM_rndF(100.0f) + 100.0f; + i_this->path_ten = ten; + i_this->timer[0] = cM_rndF(100.0f) + 100.0f; } break; case 2: - i_this->mPursuitFlag = 1; + i_this->pursuit_flg = 1; for (int i = 0; i < 8; i++) { - cMtx_YrotS(*calc_mtx, i << 0xd); - pos1.z = 3000.0f + ZREG_F(10); - MtxPosition(&pos1, &pos2); - pos2 += player_p->current.pos; - b_path2[i] = pos2; + cMtx_YrotS(*calc_mtx, i << 13); + mae.z = 3000.0f + ZREG_F(10); + MtxPosition(&mae, &ato); + ato += pla->current.pos; + b_path2[i] = ato; } - pos1 = b_path2[i_this->mCurrentPathIndex] - a_this->current.pos; - pos1.y = 0.0f; + mae = b_path2[i_this->path_ten] - actor->current.pos; + mae.y = 0.0f; - if (pos1.abs() < 600.0f) { - int local_ec = 1; - pos1 = b_path2[(i_this->mCurrentPathIndex + 1) & 7] - a_this->current.pos; + if (mae.abs() < 600.0f) { + int dir = 1; + mae = b_path2[(i_this->path_ten + 1) & 7] - actor->current.pos; - s16 tmp = a_this->current.angle.y - cM_atan2s(pos1.x, pos1.z); + s16 range = actor->current.angle.y - cM_atan2s(mae.x, mae.z); - if (tmp < 0x4000 && tmp > -0x4000) { - i_this->mCurrentPathIndex += local_ec; + if (range < 0x4000 && range > -0x4000) { + i_this->path_ten += dir; } else { - i_this->mCurrentPathIndex -= local_ec; + i_this->path_ten -= dir; } - i_this->mCurrentPathIndex &= 7; - i_this->mTurnStep = 0; + i_this->path_ten &= 7; + i_this->turn_step = 0; } - pos1 = b_path2[i_this->mCurrentPathIndex] - a_this->current.pos; - i_this->mTargetFacingAngle = cM_atan2s(pos1.x, pos1.z); + mae = b_path2[i_this->path_ten] - actor->current.pos; + i_this->target_ya = cM_atan2s(mae.x, mae.z); - cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mTargetFacingAngle, 8, - i_this->mTurnStep); - cLib_addCalcAngleS2(&i_this->mTurnStep, 0x400, 1, 0x10); + cLib_addCalcAngleS2(&actor->current.angle.y, i_this->target_ya, 8, + i_this->turn_step); + cLib_addCalcAngleS2(&i_this->turn_step, 0x400, 1, 0x10); - fVar1 = 3.0f; - fVar10 = l_HIO.leader_max_speed; - i_this->mMovementType = 1; + acceleration = 3.0f; + speed = l_HIO.leader_max_speed; + i_this->movement_type = 1; - if (i_this->field_0x698[0] == 0 && dist < 5000.0f) { + if (i_this->timer[0] == 0 && dist < 5000.0f) { anm_init(i_this, 0x25, 3.0f, 2, 1.0f); - i_this->mActionMode = 3; + i_this->ride_mode = 3; } break; case 3: - if (a_this->speedF > 15.0f) { - i_this->mMovementType = 2; + if (actor->speedF > 15.0f) { + i_this->movement_type = 2; } - if (a_this->speedF < 1.0f) { - i_this->mActionID = ACT_B_WAIT; - i_this->mActionMode = 0; + if (actor->speedF < 1.0f) { + i_this->action = ACT_B_WAIT; + i_this->ride_mode = 0; return; } } - cLib_addCalc2(&a_this->speedF, fVar10, 1.0f, fVar1); - s16 sp8 = (-4 + TREG_S(7)) * (a_this->current.angle.y - curr_angle); - cLib_addCalcAngleS2(&i_this->mBodyTiltAngle, sp8, 8, 0x200); - i_this->mpModelMorf->setPlaySpeed(i_this->mPlaySpeed); - cLib_addCalc2(&i_this->mPlaySpeed, target, 1.0f, 0.1f); + cLib_addCalc2(&actor->speedF, speed, 1.0f, acceleration); + s16 ya = (-4 + TREG_S(7)) * (actor->current.angle.y - angle); + cLib_addCalcAngleS2(&i_this->body_angle, ya, 8, 0x200); + i_this->anm_p->setPlaySpeed(i_this->anm_spd); + cLib_addCalc2(&i_this->anm_spd, target_spd, 1.0f, 0.1f); if (dist < 1000.0f) { - i_this->mActionID = ACT_B_RUN; + i_this->action = ACT_B_RUN; - if (i_this->mAnmID == 0x20) { - i_this->mActionMode = 2; + if (i_this->anmID == 32) { + i_this->ride_mode = 2; } else { - i_this->mActionMode = 0; - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_RDB_V_HOICK, -1); + i_this->ride_mode = 0; + i_this->sound.startCreatureVoice(Z2SE_EN_RDB_V_HOICK, -1); } } - if (i_this->mActionMode < 3 && i_this->mSpeedCapTimer > 0) { + if (i_this->ride_mode < 3 && i_this->gake_flg > GAKE_FLG_NONE) { anm_init(i_this, 0x25, 3.0f, 2, 1.0f); - if (a_this->speedF > 30.0f) - a_this->speedF = 30.0f; + if (actor->speedF > 30.0f) + actor->speedF = 30.0f; - i_this->mActionMode = 3; + i_this->ride_mode = 3; } } static void e_wb_b_wait2(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - fopAc_ac_c* player_p = dComIfGp_getPlayer(0); + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; + fopAc_ac_c* pla = dComIfGp_getPlayer(0); cXyz cStack_38; cXyz cStack_44; - f32 dVar7 = fopAcM_searchPlayerDistanceXZ(a_this); - s16 sVar5 = fopAcM_searchPlayerAngleY(a_this); + f32 dist = fopAcM_searchPlayerDistanceXZ(actor); + s16 target_angle = fopAcM_searchPlayerAngleY(actor); - switch (i_this->mActionMode) { + switch (i_this->ride_mode) { case 0: if (cM_rndF(1.0f) < 0.5f) { - i_this->mTargetFacingAngle = sVar5 + 0x4000; + i_this->target_ya = target_angle + 0x4000; } else { - i_this->mTargetFacingAngle = sVar5 - 0x4000; + i_this->target_ya = target_angle - 0x4000; } - i_this->mActionMode = 1; + i_this->ride_mode = 1; // fallthrough case 1: - cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mTargetFacingAngle, 8, 0x200); - i_this->field_0x6d0 = i_this->mTargetFacingAngle - a_this->current.angle.y; - if (i_this->field_0x6d0 < 0x800 && i_this->field_0x6d0 > -0x800) { + cLib_addCalcAngleS2(&actor->current.angle.y, i_this->target_ya, 8, 0x200); + i_this->range = i_this->target_ya - actor->current.angle.y; + if (i_this->range < 0x800 && i_this->range > -0x800) { anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); - i_this->mActionMode = 2; - } else if (i_this->mAnmID != 0x28) { + i_this->ride_mode = 2; + } else if (i_this->anmID != 40) { anm_init(i_this, 0x28, 5.0f, 2, 1.0f); } break; case 2: - if (dVar7 < 4000.0f) { - i_this->mActionID = ACT_B_RUN; - i_this->mActionMode = 0; - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_RDB_V_HOICK, -1); + if (dist < 4000.0f) { + i_this->action = ACT_B_RUN; + i_this->ride_mode = 0; + i_this->sound.startCreatureVoice(Z2SE_EN_RDB_V_HOICK, -1); } break; } - cLib_addCalc0(&a_this->speedF, 1.0f, 1.0f); + cLib_addCalc0(&actor->speedF, 1.0f, 1.0f); } /** @@ -1509,17 +1518,17 @@ static void e_wb_b_wait2(e_wb_class* i_this) { * @param i_this Pointer to the Bullbo instance (e_wb_class). */ static void e_wb_b_run(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - fopAc_ac_c* player = dComIfGp_getPlayer(0); - cXyz target_vector; - cXyz rotated_position; - f32 player_xz_distance = fopAcM_searchPlayerDistanceXZ(a_this); - f32 target_speed = 0.0; + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; + fopAc_ac_c* pla = dComIfGp_getPlayer(0); + cXyz mae; + cXyz ato; + f32 dist = fopAcM_searchPlayerDistanceXZ(actor); + f32 speed = 0.0; f32 acceleration = 1.0; - if ((i_this->mStatusFlags & 1) == 0) { - i_this->mActionID = ACT_A_RUN; - i_this->mActionMode = 0; + if ((i_this->status_flag & 1) == 0) { + i_this->action = ACT_A_RUN; + i_this->ride_mode = 0; } else { s8 is_player_on_fast_horse = false; if (daPy_getPlayerActorClass()->checkHorseRide() && @@ -1528,245 +1537,244 @@ static void e_wb_b_run(e_wb_class* i_this) { is_player_on_fast_horse = true; } - s16 initial_facing_angle = a_this->current.angle.y; - f32 anim_speed_factor = 1.0f; + s16 initial_facing_angle = actor->current.angle.y; + f32 anm_spd = 1.0f; s8 regenerate_path = false; - switch (i_this->mActionMode) { + switch (i_this->ride_mode) { case 0: - i_this->mStatusFlags |= (u16)8; + i_this->status_flag |= (u16)8; case 1: // path initialization - i_this->mAnimDuration = 30.0f; - i_this->mPlaySpeed = 1.0f; + i_this->anm_time = 30.0f; + i_this->anm_spd = 1.0f; anm_init(i_this, 0x20, 5.0f, 2, 1.0f); - i_this->mActionMode = 2; - i_this->mStatusFlags |= (u16)0x10; - i_this->mZ2Ride.startCreatureSound(Z2SE_EN_WB_KICK_GROUND, 0, -1); + i_this->ride_mode = 2; + i_this->status_flag |= (u16)0x10; + i_this->sound.startCreatureSound(Z2SE_EN_WB_KICK_GROUND, 0, -1); - if (i_this->mPathInitialized != 0) { - cXyz dist_to_point; - cXyz dist_to_other; - int closest_index = 0; + if (i_this->path_set != 0) { + cXyz path; + cXyz path2; + int ten = 0; for (int i = 1; i < 8; i++) { - dist_to_point = b_path[closest_index] - a_this->current.pos; - dist_to_other = b_path[i] - a_this->current.pos; + path = b_path[ten] - actor->current.pos; + path2 = b_path[i] - actor->current.pos; - if (dist_to_point.abs() > dist_to_other.abs()) { - closest_index = i; + if (path.abs() > path2.abs()) { + ten = i; } } - i_this->mCurrentPathIndex = closest_index; + i_this->path_ten = ten; } else { if (lbl_244_bss_45 == 1) { - i_this->mCurrentPathIndex = 6 + TREG_S(6); + i_this->path_ten = 6 + TREG_S(6); } else { - i_this->mCurrentPathIndex = 2 + TREG_S(6); + i_this->path_ten = 2 + TREG_S(6); } - i_this->mPathDirection = 1; - i_this->mPathInitialized = 1; + i_this->dir = 1; + i_this->path_set = 1; } break; case 2: // path following - i_this->mPursuitFlag = 1; - target_vector = b_path[i_this->mCurrentPathIndex] - a_this->current.pos; - target_vector.y = 0.0; + i_this->pursuit_flg = 1; + mae = b_path[i_this->path_ten] - actor->current.pos; + mae.y = 0.0; - if (target_vector.abs() < 800.0f) { - if (i_this->mLapCount >= 4 && cM_rndF(1.0f) < 0.05f) { - i_this->mPathDirection = cM_rndF(6.0f) + 1.0f; + if (mae.abs() < 800.0f) { + if (i_this->lap_num >= 4 && cM_rndF(1.0f) < 0.05f) { + i_this->dir = cM_rndF(6.0f) + 1.0f; } - target_vector = b_path[(i_this->mCurrentPathIndex + 1) & 7] - a_this->current.pos; - s16 angle_to_next = - a_this->current.angle.y - cM_atan2s(target_vector.x, target_vector.z); + mae = b_path[(i_this->path_ten + 1) & 7] - actor->current.pos; + s16 range = actor->current.angle.y - cM_atan2s(mae.x, mae.z); - if (angle_to_next < 0x4000 && angle_to_next > -0x4000) { - i_this->mPathDirection = 1; + if (range < 0x4000 && range > -0x4000) { + i_this->dir = 1; } else { - i_this->mPathDirection = -1; + i_this->dir = -1; } - OS_REPORT(" PT %d\n", i_this->mCurrentPathIndex); - OS_REPORT(" DIR %d\n", i_this->mPathDirection); + OS_REPORT(" PT %d\n", i_this->path_ten); // "パス点" (path point) + OS_REPORT(" DIR %d\n", i_this->dir); - i_this->mCurrentPathIndex += i_this->mPathDirection; - i_this->mCurrentPathIndex &= 7; + i_this->path_ten += i_this->dir; + i_this->path_ten &= 7; regenerate_path = true; - i_this->mTurnStep = 0; + i_this->turn_step = 0; } else { - if (i_this->mPathAdjustCounter >= 3) { - i_this->mPathAdjustCounter = 0; + if (i_this->path_adjust_count >= 3) { + i_this->path_adjust_count = 0; if (cM_rndF(1.0f) < 0.5f) { - i_this->mCurrentPathIndex += 3; + i_this->path_ten += 3; } else { - i_this->mCurrentPathIndex -= 3; + i_this->path_ten -= 3; } - i_this->mCurrentPathIndex &= 7; + i_this->path_ten &= 7; regenerate_path = true; } } - target_vector = b_path[i_this->mCurrentPathIndex] - a_this->current.pos; - i_this->mTargetFacingAngle = cM_atan2s(target_vector.x, target_vector.z); - cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mTargetFacingAngle, 8, - i_this->mTurnStep); - cLib_addCalcAngleS2(&i_this->mTurnStep, 0x400, 1, 0x10); + mae = b_path[i_this->path_ten] - actor->current.pos; + i_this->target_ya = cM_atan2s(mae.x, mae.z); + cLib_addCalcAngleS2(&actor->current.angle.y, i_this->target_ya, 8, + i_this->turn_step); + cLib_addCalcAngleS2(&i_this->turn_step, 0x400, 1, 0x10); if (is_player_on_fast_horse) { - target_speed = dComIfGp_getHorseActor()->speedF; + speed = dComIfGp_getHorseActor()->speedF; - if (target_speed > l_HIO.leader_cavalry_battle_max_speed) { - target_speed = l_HIO.leader_cavalry_battle_max_speed; + if (speed > l_HIO.leader_cavalry_battle_max_speed) { + speed = l_HIO.leader_cavalry_battle_max_speed; } else { - if (target_speed < l_HIO.leader_max_speed) { - target_speed = l_HIO.leader_max_speed; + if (speed < l_HIO.leader_max_speed) { + speed = l_HIO.leader_max_speed; } } - if (fopAcM_searchPlayerDistanceXZ(a_this) < 2000.0f + KREG_F(0)) { - target_speed *= 1.2f; + if (fopAcM_searchPlayerDistanceXZ(actor) < 2000.0f + KREG_F(0)) { + speed *= 1.2f; - if (a_this->speedF < l_HIO.max_speed) { + if (actor->speedF < l_HIO.max_speed) { acceleration = 1.5f; } else { acceleration = 0.5f; } } - anim_speed_factor = a_this->speedF / 40.0f; + anm_spd = actor->speedF / 40.0f; - if (anim_speed_factor < 1.0f) - anim_speed_factor = 1.0f; + if (anm_spd < 1.0f) + anm_spd = 1.0f; - if (anim_speed_factor > 1.2f) - anim_speed_factor = 1.2f; + if (anm_spd > 1.2f) + anm_spd = 1.2f; } else { acceleration = 3.0; - target_speed = l_HIO.leader_max_speed; + speed = l_HIO.leader_max_speed; } - if (player_xz_distance > 6000.0f) { - i_this->mActionMode = 3; - i_this->field_0x698[0] = 13; + if (dist > 6000.0f) { + i_this->ride_mode = 3; + i_this->timer[0] = 13; } - i_this->mMovementType = 1; + i_this->movement_type = 1; break; case 3: - i_this->mPursuitFlag = 1; - target_speed = l_HIO.max_speed; + i_this->pursuit_flg = 1; + speed = l_HIO.max_speed; acceleration = 3.0f; - if (i_this->field_0x698[0] == 10) { - i_this->mStatusFlags |= (u16)0x20; + if (i_this->timer[0] == 10) { + i_this->status_flag |= (u16)0x20; } - if (i_this->field_0x698[0] == 0) { - i_this->mActionMode = 4; + if (i_this->timer[0] == 0) { + i_this->ride_mode = 4; anm_init(i_this, 0x25, 3.0f, 2, 1.0f); } - i_this->mMovementType = 1; + i_this->movement_type = 1; break; case 4: // decelerating back to wait action - if (a_this->speedF > 15.0f) { - i_this->mMovementType = 2; + if (actor->speedF > 15.0f) { + i_this->movement_type = 2; } - if (a_this->speedF < 1.0f) { - i_this->mActionID = ACT_B_WAIT2; - i_this->mActionMode = 0; + if (actor->speedF < 1.0f) { + i_this->action = ACT_B_WAIT2; + i_this->ride_mode = 0; } break; case 10: // jumping a fence / hit wall - target_speed = l_HIO.max_speed; + speed = l_HIO.max_speed; acceleration = 3.0f; - if (i_this->mAnmID == 0x18) { - if (a_this->speed.y < 10.0f) { + if (i_this->anmID == 24) { + if (actor->speed.y < 10.0f) { anm_init(i_this, 0x19, 10.0f, 0, 1.0f); } - } else if (i_this->mAnmID == 0x19) { - if (a_this->speed.y < (-30.0f + JREG_F(9)) || i_this->mAcch.ChkGroundHit()) { + } else if (i_this->anmID == 25) { + if (actor->speed.y < (-30.0f + JREG_F(9)) || i_this->Bgc.ChkGroundHit()) { anm_init(i_this, 0x1a, 2.0f, 0, 1.0f); - i_this->mCollisionFlags |= (u8)0xc; - i_this->mLandingFlag = 1; - i_this->mStatusFlags |= (u16)0x200; + i_this->collision_flg |= (u8)0xc; + i_this->landing_flag = 1; + i_this->status_flag |= (u16)0x200; } - } else if (i_this->mAnmID == 0x1a) { - i_this->mMovementType = 1; + } else if (i_this->anmID == 26) { + i_this->movement_type = 1; - if (i_this->mpModelMorf->isStop()) { - anm_init(i_this, 0x20, 2.0f, 2, i_this->mPlaySpeed); - i_this->mAnimDuration = 30.0f; - i_this->mActionMode = 2; + if (i_this->anm_p->isStop()) { + anm_init(i_this, 0x20, 2.0f, 2, i_this->anm_spd); + i_this->anm_time = 30.0f; + i_this->ride_mode = 2; } } } - if (i_this->mActionMode < 10) { - cLib_addCalc2(&a_this->speedF, target_speed, 1.0f, acceleration); - s16 targetAngle = (TREG_S(7) - 4) * (a_this->current.angle.y - initial_facing_angle); - cLib_addCalcAngleS2(&i_this->mBodyTiltAngle, + if (i_this->ride_mode < 10) { + cLib_addCalc2(&actor->speedF, speed, 1.0f, acceleration); + s16 targetAngle = (TREG_S(7) - 4) * (actor->current.angle.y - initial_facing_angle); + cLib_addCalcAngleS2(&i_this->body_angle, targetAngle, 8, 0x200); - i_this->mpModelMorf->setPlaySpeed(i_this->mPlaySpeed); - cLib_addCalc2(&i_this->mPlaySpeed, anim_speed_factor, 1.0f, 0.1f); + i_this->anm_p->setPlaySpeed(i_this->anm_spd); + cLib_addCalc2(&i_this->anm_spd, anm_spd, 1.0f, 0.1f); - if (a_this->speedF >= 30.0f && i_this->mAcch.ChkGroundHit()) { - if (i_this->mAcch.ChkWallHit() || e_wb_saku_jump_check(i_this)) { - i_this->mActionMode = 10; - a_this->speed.y = 55.0f + WREG_F(1); + if (actor->speedF >= 30.0f && i_this->Bgc.ChkGroundHit()) { + if (i_this->Bgc.ChkWallHit() || e_wb_saku_jump_check(i_this)) { + i_this->ride_mode = 10; + actor->speed.y = 55.0f + WREG_F(1); anm_init(i_this, 0x18, 2.0f, 0, 1.0f); - i_this->mStatusFlags |= (u16)0x100; + i_this->status_flag |= (u16)0x100; } } } if (regenerate_path) { - target_vector.x = 0.0f; - target_vector.y = 1000.0f; + mae.x = 0.0f; + mae.y = 1000.0f; for (int i = 0; i < 8; i++) { - cMtx_YrotS(*calc_mtx, i << 0xd); + cMtx_YrotS(*calc_mtx, i << 13); if (lbl_244_bss_45 == 1) { - target_vector.z = cM_rndF(3000.0f) + 12000.0f; - MtxPosition(&target_vector, &rotated_position); - } else if (i_this->mLapCount >= 4) { - target_vector.z = cM_rndF(1000.0f) + 9000.0f; - MtxPosition(&target_vector, &rotated_position); - rotated_position.x += 28108.0f; - rotated_position.z += 6640.0f; + mae.z = cM_rndF(3000.0f) + 12000.0f; + MtxPosition(&mae, &ato); + } else if (i_this->lap_num >= 4) { + mae.z = cM_rndF(1000.0f) + 9000.0f; + MtxPosition(&mae, &ato); + ato.x += 28108.0f; + ato.z += 6640.0f; } else { - target_vector.z = cM_rndF(3000.0f) + 12000.0f; - MtxPosition(&target_vector, &rotated_position); - rotated_position.x += -2989.0f; - rotated_position.z += 1364.0f; + mae.z = cM_rndF(3000.0f) + 12000.0f; + MtxPosition(&mae, &ato); + ato.x += -2989.0f; + ato.z += 1364.0f; } - b_path[i] = rotated_position; + b_path[i] = ato; } } - if (i_this->mSpeedCapTimer > 0 && a_this->speedF > 30.0f) { - a_this->speedF = 30.0f; + if (i_this->gake_flg > GAKE_FLG_NONE && actor->speedF > 30.0f) { + actor->speedF = 30.0f; } } return; } static void arrow_rd_set(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; static cXyz arrow_rd_pos[1] = {cXyz(36460.0f, 1040.0f, -17020.0f)}; for (int i = 0; i < 1; i++) { - fopAcM_create(PROC_E_RD, 0xff00a3ff, &arrow_rd_pos[i], fopAcM_GetRoomNo(a_this), 0, 0, -1); + fopAcM_create(fpcNm_E_RD_e, 0xff00a3ff, &arrow_rd_pos[i], fopAcM_GetRoomNo(actor), 0, 0, -1); } } @@ -1778,234 +1786,234 @@ static void e_wb_b_ikki(e_wb_class* i_this) { static cXyz ikki_pos[2] = {cXyz(34789.0f, -290.0f, -36200.0f), cXyz(34789.0f, -290.0f, -16600.0f)}; - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - fopAc_ac_c* local_ac = dComIfGp_getPlayer(0); - cXyz local_88; - cXyz local_94; - f32 dVar14 = fopAcM_searchPlayerDistanceXZ(a_this); - s16 sVar11_ = fopAcM_searchPlayerAngleY(a_this); - s16 sVar11 = sVar11_ - a_this->current.angle.y; - f32 dVar17 = 0.0; - f32 dVar16 = 1.0; - s16 local_d6 = 0x400; + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; + fopAc_ac_c* pla = dComIfGp_getPlayer(0); + cXyz mae; + cXyz ato; + f32 dist = fopAcM_searchPlayerDistanceXZ(actor); + s16 target_angle = fopAcM_searchPlayerAngleY(actor); + s16 range = target_angle - actor->current.angle.y; + f32 speed = 0.0; + f32 acceleration = 1.0; + s16 angle = 0x400; s16 local_d8 = 0; - int local_b0 = i_this->mpModelMorf->getFrame(); + int frame = i_this->anm_p->getFrame(); - switch (i_this->mActionMode) { + switch (i_this->ride_mode) { case -100: anm_init(i_this, 0x27, 5.0f, 2, 1.0f); - i_this->mActionMode = -99; - i_this->mStatusFlags |= (u16)0x400; + i_this->ride_mode = -99; + i_this->status_flag |= (u16)0x400; break; case -99: - if (i_this->mpModelMorf->checkFrame(10.0f) || i_this->mpModelMorf->checkFrame(31.0f)) { - i_this->mCollisionFlags |= (u8)1; - i_this->mMovementType = 10; + if (i_this->anm_p->checkFrame(10.0f) || i_this->anm_p->checkFrame(31.0f)) { + i_this->collision_flg |= (u8)1; + i_this->movement_type = 10; } break; case -98: anm_init(i_this, 0x26, 10.0f, 0, 1.0f); - i_this->mActionMode = 0xff9f; - i_this->mStatusFlags |= (u16)0x800; + i_this->ride_mode = -97; + i_this->status_flag |= (u16)0x800; break; case -97: - if (i_this->mpModelMorf->checkFrame(38.0f) || i_this->mpModelMorf->checkFrame(50.0f) || - i_this->mpModelMorf->checkFrame(65.0f) || i_this->mpModelMorf->checkFrame(108.0f)) + if (i_this->anm_p->checkFrame(38.0f) || i_this->anm_p->checkFrame(50.0f) || + i_this->anm_p->checkFrame(65.0f) || i_this->anm_p->checkFrame(108.0f)) { - i_this->mCollisionFlags |= (u8)1; - i_this->mMovementType = 10; - } else if (i_this->mpModelMorf->checkFrame(82.0f)) { - i_this->mCollisionFlags |= (u8)3; - } else if (i_this->mpModelMorf->checkFrame(106.0f)) { - i_this->mCollisionFlags |= (u8)2; - i_this->mMovementType = 10; + i_this->collision_flg |= (u8)1; + i_this->movement_type = 10; + } else if (i_this->anm_p->checkFrame(82.0f)) { + i_this->collision_flg |= (u8)3; + } else if (i_this->anm_p->checkFrame(106.0f)) { + i_this->collision_flg |= (u8)2; + i_this->movement_type = 10; } - if (local_b0 >= 0x70) { - if (local_b0 == 0x70) { - i_this->mStatusFlags |= (u16)0x10; - i_this->mZ2Ride.startCreatureSound(Z2SE_EN_WB_KICK_GROUND, 0, -1); - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_RDB_V_HOICK, -1); - i_this->mAnimDuration = 40.0f; + if (frame >= 112) { + if (frame == 112) { + i_this->status_flag |= (u16)0x10; + i_this->sound.startCreatureSound(Z2SE_EN_WB_KICK_GROUND, 0, -1); + i_this->sound.startCreatureVoice(Z2SE_EN_RDB_V_HOICK, -1); + i_this->anm_time = 40.0f; } - dVar17 = l_HIO.mSingleRiderSpeed; - dVar16 = l_HIO.mSingleRiderSpeed * 0.2f; - i_this->mMovementType = 1; + speed = l_HIO.mSingleRiderSpeed; + acceleration = l_HIO.mSingleRiderSpeed * 0.2f; + i_this->movement_type = 1; } - if (i_this->mpModelMorf->isStop()) { + if (i_this->anm_p->isStop()) { anm_init(i_this, 0x20, 1.0f, 2, 1.0f); - i_this->mActionMode = 4; - i_this->field_0x1690 = 0; - i_this->mCurrentPathIndex = 1; - i_this->field_0x5c4 = ikki_pos[i_this->mCurrentPathIndex]; + i_this->ride_mode = 4; + i_this->acceleration = 0; + i_this->path_ten = 1; + i_this->eye = ikki_pos[i_this->path_ten]; } break; case 0: anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); - i_this->mActionMode = 1; - i_this->field_0x698[3] = 10; + i_this->ride_mode = 1; + i_this->timer[3] = 10; break; case 1: - if (i_this->field_0x698[3] == 0 && !dComIfGp_event_runCheck()) { - i_this->mActionMode = 2; - i_this->mCurrentPathIndex = 1; + if (i_this->timer[3] == 0 && !dComIfGp_event_runCheck()) { + i_this->ride_mode = 2; + i_this->path_ten = 1; } break; case 2: - if (!i_this->field_0x5bf) { + if (!i_this->no_draw) { anm_init(i_this, 0x1b, 3.0f, 0, 1.0f); - i_this->mStatusFlags |= (u16)8; - i_this->mAnimDuration = 40.0f; - i_this->field_0x5c4 = ikki_pos[i_this->mCurrentPathIndex]; - i_this->mActionMode = 3; + i_this->status_flag |= (u16)8; + i_this->anm_time = 40.0f; + i_this->eye = ikki_pos[i_this->path_ten]; + i_this->ride_mode = 3; } break; case 3: - if (i_this->mpModelMorf->checkFrame(3.0f)) { - i_this->mCollisionFlags |= (u8)2; - i_this->mMovementType = 10; - } else if (i_this->mpModelMorf->checkFrame(15.0)) { - i_this->mCollisionFlags |= (u8)3; + if (i_this->anm_p->checkFrame(3.0f)) { + i_this->collision_flg |= (u8)2; + i_this->movement_type = 10; + } else if (i_this->anm_p->checkFrame(15.0)) { + i_this->collision_flg |= (u8)3; } - if (i_this->mpModelMorf->isStop()) { + if (i_this->anm_p->isStop()) { anm_init(i_this, 0x20, 5.0f, 2, 1.0f); - i_this->mActionMode = 4; - i_this->mStatusFlags |= (u8)0x10; - i_this->mZ2Ride.startCreatureSound(Z2SE_EN_WB_KICK_GROUND, 0, -1); - i_this->field_0x1690 = 0; + i_this->ride_mode = 4; + i_this->status_flag |= (u8)0x10; + i_this->sound.startCreatureSound(Z2SE_EN_WB_KICK_GROUND, 0, -1); + i_this->acceleration = 0; } break; case 4: { - dVar17 = l_HIO.mSingleRiderSpeed; - dVar16 = 5.0f; - i_this->mMovementType = 1; - if (sVar11 < 0x3000 && sVar11 > -0x3000 && dVar14 < 4000.0f + VREG_F(16) && - dVar14 > 600.0f + VREG_F(17)) + speed = l_HIO.mSingleRiderSpeed; + acceleration = 5.0f; + i_this->movement_type = 1; + if (range < 0x3000 && range > -0x3000 && dist < 4000.0f + VREG_F(16) && + dist > 600.0f + VREG_F(17)) { i_this->field_0x6dc = 13 + VREG_S(5); - } else if (sVar11 < 0x800 && sVar11 > -0x800) { + } else if (range < 0x800 && range > -0x800) { i_this->field_0x6da = 1; - } else if (sVar11 > 0) { + } else if (range > 0) { i_this->field_0x6da = 3; } else { i_this->field_0x6da = 2; } - f32 fVar2; - f32 fVar1; - if (i_this->mLapCount == 0) { - fVar2 = l_HIO.mSearchIgnoreDistance2; - fVar1 = l_HIO.mGuidanceDisplayDistance2; + f32 search_dist; + f32 guidance_dist; + if (i_this->lap_num == 0) { + search_dist = l_HIO.mSearchIgnoreDistance2; + guidance_dist = l_HIO.mGuidanceDisplayDistance2; } else { - fVar2 = l_HIO.mSearchIgnoreDistance1; - fVar1 = l_HIO.mGuidanceDisplayDistance1; + search_dist = l_HIO.mSearchIgnoreDistance1; + guidance_dist = l_HIO.mGuidanceDisplayDistance1; } - if (sVar11 < 0x3000 && sVar11 > -0x3000) { - if (dVar14 > fVar2) { - cLib_addCalc2(&a_this->current.pos.x, local_ac->current.pos.x, 0.05f, - a_this->speedF * i_this->field_0x1690); - cLib_addCalc2(&i_this->field_0x1690, 0.6f, 1.0f, 0.06f); - cMtx_YrotS(*calc_mtx, a_this->current.angle.y); - local_88.x = a_this->current.pos.x - local_ac->current.pos.x; - local_88.y = local_88.z = 0.0f; - MtxPosition(&local_88, &local_94); - local_d8 = local_94.x * (-20.0f + XREG_F(12)); + if (range < 0x3000 && range > -0x3000) { + if (dist > search_dist) { + cLib_addCalc2(&actor->current.pos.x, pla->current.pos.x, 0.05f, + actor->speedF * i_this->acceleration); + cLib_addCalc2(&i_this->acceleration, 0.6f, 1.0f, 0.06f); + cMtx_YrotS(*calc_mtx, actor->current.angle.y); + mae.x = actor->current.pos.x - pla->current.pos.x; + mae.y = mae.z = 0.0f; + MtxPosition(&mae, &ato); + local_d8 = ato.x * (-20.0f + XREG_F(12)); if (local_d8 > 0x1000) { local_d8 = 0x1000; } else if (local_d8 < -0x1000) { local_d8 = -0x1000; } } - if (dVar14 < fVar1) { + if (dist < guidance_dist) { daPy_getPlayerActorClass()->onSingleBoarAvoid(); } } - local_88 = i_this->field_0x5c4 - a_this->current.pos; - i_this->mTargetFacingAngle = (s16)cM_atan2s(local_88.x, local_88.z); - if (local_88.abs() < 600.0f + AREG_F(8)) { + mae = i_this->eye - actor->current.pos; + i_this->target_ya = (s16)cM_atan2s(mae.x, mae.z); + if (mae.abs() < 600.0f + AREG_F(8)) { anm_init(i_this, 0x25, 3.0f, 2, 1.0f); - i_this->mActionMode = 5; - i_this->mStatusFlags |= (u16)0x20; + i_this->ride_mode = 5; + i_this->status_flag |= (u16)0x20; } - local_d6 = 0x800 + XREG_S(1); + angle = 2048 + XREG_S(1); break; } case 5: - if (a_this->speedF > 15.0f) { - i_this->mMovementType = 2; - i_this->mZ2Ride.startCreatureSoundLevel(Z2SE_EN_WB_L_SLIP, 0, -1); - } else if (a_this->speedF < 1.0f) { + if (actor->speedF > 15.0f) { + i_this->movement_type = 2; + i_this->sound.startCreatureSoundLevel(Z2SE_EN_WB_L_SLIP, 0, -1); + } else if (actor->speedF < 1.0f) { anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); - i_this->mActionMode = 6; - ANGLE_ADD(i_this->mTargetFacingAngle, 0x8000); + i_this->ride_mode = 6; + ANGLE_ADD(i_this->target_ya, 0x8000); } break; case 6: - local_d6 = 0x200; - i_this->field_0x6d0 = i_this->mTargetFacingAngle - a_this->current.angle.y; - if (i_this->field_0x6d0 < 0x800 && i_this->field_0x6d0 > -0x800) { - i_this->mActionMode = 2; - i_this->mCurrentPathIndex = 1 - i_this->mCurrentPathIndex; - } else if (i_this->mAnmID != 0x28) { + angle = 0x200; + i_this->range = i_this->target_ya - actor->current.angle.y; + if (i_this->range < 0x800 && i_this->range > -0x800) { + i_this->ride_mode = 2; + i_this->path_ten = 1 - i_this->path_ten; + } else if (i_this->anmID != 40) { anm_init(i_this, 0x28, 5.0f, 2, 1.5f); } break; } - cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mTargetFacingAngle, 2, local_d6); - cLib_addCalcAngleS2(&i_this->field_0x7a4, local_d8, 8, i_this->field_0x1690 + 10000.0f); - cLib_addCalc2(&a_this->speedF, dVar17, 1.0f, dVar16); - if (a_this->current.pos.x > 35350.0f) { - a_this->current.pos.x = 35350.0f; - } else if (a_this->current.pos.x < 34243.0f) { - a_this->current.pos.x = 34243.0f; + cLib_addCalcAngleS2(&actor->current.angle.y, i_this->target_ya, 2, angle); + cLib_addCalcAngleS2(&i_this->field_0x7a4, local_d8, 8, i_this->acceleration + 10000.0f); + cLib_addCalc2(&actor->speedF, speed, 1.0f, acceleration); + if (actor->current.pos.x > 35350.0f) { + actor->current.pos.x = 35350.0f; + } else if (actor->current.pos.x < 34243.0f) { + actor->current.pos.x = 34243.0f; } - if (i_this->mActionMode == 4 && (sVar11 > 0x4000 || sVar11 < -0x4000) && i_this->field_0x5bf) { - if (i_this->mCurrentPathIndex == 1 && local_ac->current.pos.z < ikki_pos[0].z + 12000.0f && - a_this->current.pos.z > ikki_pos[1].z - 12000.0f) + if (i_this->ride_mode == 4 && (range > 16384 || range < -0x4000) && i_this->no_draw) { + if (i_this->path_ten == 1 && pla->current.pos.z < ikki_pos[0].z + 12000.0f && + actor->current.pos.z > ikki_pos[1].z - 12000.0f) { - a_this->current.pos.z = ikki_pos[1].z; - i_this->mActionMode = 5; - a_this->speedF = 0.0f; + actor->current.pos.z = ikki_pos[1].z; + i_this->ride_mode = 5; + actor->speedF = 0.0f; OS_REPORT(" WB CULL !!\n"); } else { - if (i_this->mCurrentPathIndex == 0 && - local_ac->current.pos.z > ikki_pos[1].z - 12000.0f && - a_this->current.pos.z < ikki_pos[0].z + 12000.0f) + if (i_this->path_ten == 0 && + pla->current.pos.z > ikki_pos[1].z - 12000.0f && + actor->current.pos.z < ikki_pos[0].z + 12000.0f) { - a_this->current.pos.z = ikki_pos[0].z; - i_this->mActionMode = 5; - a_this->speedF = 0.0f; + actor->current.pos.z = ikki_pos[0].z; + i_this->ride_mode = 5; + actor->speedF = 0.0f; OS_REPORT(" WB CULL !!\n"); } } } - if (i_this->field_0x1722 != 0) { - if (i_this->field_0x1722 == 1) { + if (i_this->saku_burn != 0) { + if (i_this->saku_burn == 1) { static cXyz f_pos[2] = {cXyz(34800.0f, -300.0f, -15150.0f), cXyz(34800.0f, -300.0f, -37200.0f)}; - csXyz cStack_a8; + csXyz angl; for (int i = 0; i < 2; i++) { static s16 f_ya[2] = { -0x8000, 0x0000, }; - cStack_a8.set(0, f_ya[i], 0); + angl.set(0, f_ya[i], 0); for (int j = 0; j < 2; j++) { static u16 f_id[2] = { dPa_RM(ID_ZI_S_UMASAKU_BURN_A), dPa_RM(ID_ZI_S_UMASAKU_BURN_B), }; - dComIfGp_particle_set(f_id[j], &f_pos[i], 0, &cStack_a8, NULL); + dComIfGp_particle_set(f_id[j], &f_pos[i], 0, &angl, NULL); } } - i_this->field_0x1722++; + i_this->saku_burn++; } Z2GetAudioMgr()->seStartLevel(Z2SE_OBJ_STRAWFENCE_BURNING, &saku_p, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); @@ -2015,27 +2023,27 @@ static void e_wb_b_ikki(e_wb_class* i_this) { } static void e_wb_b_ikki_end(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; - f32 target = 0.0; - f32 maxStep = 1.0f; + f32 speed = 0.0; + f32 acceleration = 1.0f; - switch (i_this->mActionMode) { + switch (i_this->ride_mode) { case 0: anm_init(i_this, 0x20, 1.0f, 2, 1.0f); - i_this->mActionMode = 1; + i_this->ride_mode = 1; break; case 1: - target = l_HIO.mSingleRiderSpeed; - maxStep = 5.0f; + speed = l_HIO.mSingleRiderSpeed; + acceleration = 5.0f; break; } - cLib_addCalc2(&a_this->speedF, target, 1.0f, maxStep); - if (a_this->current.pos.x > 35350.0f) { - a_this->current.pos.x = 35350.0f; - } else if (a_this->current.pos.x < 34243.0f) { - a_this->current.pos.x = 34243.0f; + cLib_addCalc2(&actor->speedF, speed, 1.0f, acceleration); + if (actor->current.pos.x > 35350.0f) { + actor->current.pos.x = 35350.0f; + } else if (actor->current.pos.x < 34243.0f) { + actor->current.pos.x = 34243.0f; } } @@ -2043,102 +2051,102 @@ static void e_wb_b_ikki2(e_wb_class* i_this) { static cXyz ikki2_pos[2] = {cXyz(-93620.0f, -5750.0f, 48944.0f), cXyz(-93620.0f, -5750.0f, 28423.0f)}; - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - fopAc_ac_c* player = dComIfGp_getPlayer(0); - cXyz local_78; - cXyz local_84; - f32 dist = fopAcM_searchPlayerDistanceXZ(a_this); - s16 angle_diff_ = fopAcM_searchPlayerAngleY(a_this); - s16 angle_diff = angle_diff_ - a_this->current.angle.y; + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; + fopAc_ac_c* pla = dComIfGp_getPlayer(0); + cXyz mae; + cXyz ato; + f32 dist = fopAcM_searchPlayerDistanceXZ(actor); + s16 target_angle = fopAcM_searchPlayerAngleY(actor); + s16 range = target_angle - actor->current.angle.y; f32 target_speed = 0.0f; - f32 speed_step = 1.0f; - s16 turn_speed = 0x400; + f32 acceleration = 1.0f; + s16 angle = 0x400; s16 local_b8 = 0; int local_b6; - int frame = i_this->mpModelMorf->getFrame(); - e_rd_class* rider = (e_rd_class*)fopAcM_SearchByID(i_this->field_0x1434); + int frame = i_this->anm_p->getFrame(); + e_rd_class* rider = (e_rd_class*)fopAcM_SearchByID(i_this->rd_id); - switch (i_this->mActionMode) { + switch (i_this->ride_mode) { case -100: { int local_a0 = dComIfGp_getEventManager().getMyStaffId("RiderBoss", NULL, 0); if (local_a0 != -1) { dComIfGp_getEventManager().cutEnd(local_a0); - i_this->mActionMode = 0xff9d; + i_this->ride_mode = -99; anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); } } break; case -99: { - a_this->current.angle.y = 0x58f0 + JREG_S(7); - turn_speed = 0; - int local_a4 = dComIfGp_getEventManager().getMyStaffId("RiderBoss", NULL, 0); - if (local_a4 != -1 ) { - int* p = dComIfGp_evmng_getMyIntegerP(local_a4, "action"); + actor->current.angle.y = 0x58F0 + JREG_S(7); + angle = 0; + int staffId = dComIfGp_getEventManager().getMyStaffId("RiderBoss", NULL, 0); + if (staffId != -1 ) { + int* p = dComIfGp_evmng_getMyIntegerP(staffId, "action"); if (p) { rider->mode = 2; - i_this->mActionMode = -98; + i_this->ride_mode = -98; } } } break; case -98: - turn_speed = 0; + angle = 0; break; case 0: anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); - i_this->mActionMode = 1; - i_this->field_0x698[3] = 10; + i_this->ride_mode = 1; + i_this->timer[3] = 10; break; case 1: - if (i_this->field_0x698[3] == 0 && !dComIfGp_event_runCheck()) { - i_this->mActionMode = 2; - i_this->mCurrentPathIndex = 1; + if (i_this->timer[3] == 0 && !dComIfGp_event_runCheck()) { + i_this->ride_mode = 2; + i_this->path_ten = 1; Z2GetAudioMgr()->subBgmStart(Z2BGM_FACE_OFF_BATTLE); } break; case 2: - if (!i_this->field_0x5bf) { + if (!i_this->no_draw) { anm_init(i_this, 0x1b, 3.0f, 0, 1.0f); - i_this->mStatusFlags |= (u16)8; - i_this->mAnimDuration = 40.0f; - i_this->field_0x5c4 = ikki2_pos[i_this->mCurrentPathIndex]; - i_this->mActionMode = 3; + i_this->status_flag |= (u16)8; + i_this->anm_time = 40.0f; + i_this->eye = ikki2_pos[i_this->path_ten]; + i_this->ride_mode = 3; } break; case 3: { if (frame < 15 + JREG_S(4)) { - turn_speed = 0; + angle = 0; } - if (i_this->mpModelMorf->checkFrame(3.0f)) { - i_this->mCollisionFlags |= (u8)2; - i_this->mMovementType = 10; - } else if (i_this->mpModelMorf->checkFrame(15.0f)) { - i_this->mCollisionFlags |= (u8)3; + if (i_this->anm_p->checkFrame(3.0f)) { + i_this->collision_flg |= (u8)2; + i_this->movement_type = 10; + } else if (i_this->anm_p->checkFrame(15.0f)) { + i_this->collision_flg |= (u8)3; } - if (i_this->mpModelMorf->isStop()) { + if (i_this->anm_p->isStop()) { anm_init(i_this, 0x20, 5.0f, 2, 1.0f); - i_this->mActionMode = 4; - i_this->mStatusFlags |= (u8)0x10; - i_this->mZ2Ride.startCreatureSound(Z2SE_EN_WB_KICK_GROUND, 0, -1); - i_this->field_0x1690 = 0.0f; + i_this->ride_mode = 4; + i_this->status_flag |= (u8)0x10; + i_this->sound.startCreatureSound(Z2SE_EN_WB_KICK_GROUND, 0, -1); + i_this->acceleration = 0.0f; } } break; case 4: { target_speed = l_HIO.mSingleRiderSpeed; - speed_step = 5.0f; - i_this->mMovementType = 1; + acceleration = 5.0f; + i_this->movement_type = 1; - if (angle_diff < 0x3000 && angle_diff > -0x3000 && dist < 4000.0f + VREG_F(16) && + if (range < 0x3000 && range > -0x3000 && dist < 4000.0f + VREG_F(16) && dist > 600.0f + VREG_F(17)) { i_this->field_0x6dc = 13 + VREG_S(5); - } else if (angle_diff < 0x800 && angle_diff > -0x800) { + } else if (range < 0x800 && range > -0x800) { i_this->field_0x6da = 1; - } else if (angle_diff > 0) { + } else if (range > 0) { i_this->field_0x6da = 3; } else { i_this->field_0x6da = 2; @@ -2146,7 +2154,7 @@ static void e_wb_b_ikki2(e_wb_class* i_this) { f32 ignore_dist; f32 guidance_dist; - if (i_this->mLapCount == 0) { + if (i_this->lap_num == 0) { ignore_dist = l_HIO.mSearchIgnoreDistance2; guidance_dist = l_HIO.mGuidanceDisplayDistance2; } else { @@ -2154,20 +2162,20 @@ static void e_wb_b_ikki2(e_wb_class* i_this) { guidance_dist = l_HIO.mGuidanceDisplayDistance1; } - if (i_this->field_0x698[3] == 0 && angle_diff < 0x3000 && angle_diff > -0x3000) { + if (i_this->timer[3] == 0 && range < 0x3000 && range > -0x3000) { if (dist > ignore_dist) { - cLib_addCalc2(&a_this->current.pos.x, player->current.pos.x, 0.05f, - a_this->speedF * i_this->field_0x1690); - cLib_addCalc2(&i_this->field_0x1690, 0.6f, 1.0f, 0.06f); + cLib_addCalc2(&actor->current.pos.x, pla->current.pos.x, 0.05f, + actor->speedF * i_this->acceleration); + cLib_addCalc2(&i_this->acceleration, 0.6f, 1.0f, 0.06f); - cMtx_YrotS(*calc_mtx, a_this->current.angle.y); - local_78.x = a_this->current.pos.x - player->current.pos.x; - local_78.y = local_78.z = 0.0f; - MtxPosition(&local_78, &local_84); + cMtx_YrotS(*calc_mtx, actor->current.angle.y); + mae.x = actor->current.pos.x - pla->current.pos.x; + mae.y = mae.z = 0.0f; + MtxPosition(&mae, &ato); - local_b8 = (s16)(local_84.x * (-20.0f + XREG_F(12))); - if (local_b8 > 0x1000) { - local_b8 = 0x1000; + local_b8 = (s16)(ato.x * (-20.0f + XREG_F(12))); + if (local_b8 > 4096) { + local_b8 = 4096; } else if (local_b8 < -0x1000) { local_b8 = -0x1000; } @@ -2178,303 +2186,303 @@ static void e_wb_b_ikki2(e_wb_class* i_this) { daPy_getPlayerActorClass()->onSingleBoarAvoid(); } - local_78 = i_this->field_0x5c4 - a_this->current.pos; - i_this->mTargetFacingAngle = (s16)cM_atan2s(local_78.x, local_78.z); + mae = i_this->eye - actor->current.pos; + i_this->target_ya = (s16)cM_atan2s(mae.x, mae.z); - if (i_this->mLapCount >= 2) { - i_this->mTargetFacingAngle += - (s16)(cM_ssin(i_this->field_0x68e * (800 + KREG_S(4))) * (2500.0f + BREG_F(16))); + if (i_this->lap_num >= 2) { + i_this->target_ya += + (s16)(cM_ssin(i_this->counter * (0x320 + KREG_S(4))) * (2500.0f + BREG_F(16))); } - if (local_78.abs() < 700.0f + AREG_F(8)) { + if (mae.abs() < 700.0f + AREG_F(8)) { anm_init(i_this, 0x25, 3.0f, 2, 1.0f); - i_this->mActionMode = 5; - i_this->mStatusFlags |= (u16)0x20; + i_this->ride_mode = 5; + i_this->status_flag |= (u16)0x20; } - turn_speed = 0x800 + XREG_S(1); + angle = 2048 + XREG_S(1); } break; case 5: { - if (a_this->speedF > 15.0f) { - i_this->mMovementType = 2; - i_this->mZ2Ride.startCreatureSoundLevel(Z2SE_EN_WB_L_SLIP, 0, -1); - } else if (a_this->speedF < 1.0f) { + if (actor->speedF > 15.0f) { + i_this->movement_type = 2; + i_this->sound.startCreatureSoundLevel(Z2SE_EN_WB_L_SLIP, 0, -1); + } else if (actor->speedF < 1.0f) { anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); - i_this->mActionMode = 6; - ANGLE_ADD(i_this->mTargetFacingAngle, 0x8000); + i_this->ride_mode = 6; + ANGLE_ADD(i_this->target_ya, 0x8000); } } break; case 6: { - turn_speed = 0x200; - i_this->field_0x6d0 = i_this->mTargetFacingAngle - a_this->current.angle.y; + angle = 0x200; + i_this->range = i_this->target_ya - actor->current.angle.y; - if (i_this->field_0x6d0 < 0x800 && i_this->field_0x6d0 > -0x800) { - i_this->mActionMode = 2; - i_this->mCurrentPathIndex = 1 - i_this->mCurrentPathIndex; - } else if (i_this->mAnmID != 0x28) { + if (i_this->range < 0x800 && i_this->range > -0x800) { + i_this->ride_mode = 2; + i_this->path_ten = 1 - i_this->path_ten; + } else if (i_this->anmID != 40) { anm_init(i_this, 0x28, 5.0f, 2, 1.5f); } } break; } - cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mTargetFacingAngle, 2, turn_speed); - cLib_addCalcAngleS2(&i_this->field_0x7a4, local_b8, 8, i_this->field_0x1690 + 10000.0f); - cLib_addCalc2(&a_this->speedF, target_speed, 1.0f, speed_step); + cLib_addCalcAngleS2(&actor->current.angle.y, i_this->target_ya, 2, angle); + cLib_addCalcAngleS2(&i_this->field_0x7a4, local_b8, 8, i_this->acceleration + 10000.0f); + cLib_addCalc2(&actor->speedF, target_speed, 1.0f, acceleration); // Handle position culling logic - if (i_this->mActionMode == 4 && (angle_diff > 0x4000 || angle_diff < -0x4000) && - i_this->field_0x5bf) + if (i_this->ride_mode == 4 && (range > 0x4000 || range < -0x4000) && + i_this->no_draw) { - if (i_this->mCurrentPathIndex == 1 && player->current.pos.z < ikki2_pos[0].z + 12000.0f && - a_this->current.pos.z > ikki2_pos[1].z - 12000.0f) + if (i_this->path_ten == 1 && pla->current.pos.z < ikki2_pos[0].z + 12000.0f && + actor->current.pos.z > ikki2_pos[1].z - 12000.0f) { - a_this->current.pos.z = ikki2_pos[1].z; - i_this->mActionMode = 5; - a_this->speedF = 0.0f; + actor->current.pos.z = ikki2_pos[1].z; + i_this->ride_mode = 5; + actor->speedF = 0.0f; OS_REPORT(" WB CULL !!\n"); - } else if (i_this->mCurrentPathIndex == 0 && - player->current.pos.z > ikki2_pos[1].z - 12000.0f && - a_this->current.pos.z < ikki2_pos[0].z + 12000.0f) + } else if (i_this->path_ten == 0 && + pla->current.pos.z > ikki2_pos[1].z - 12000.0f && + actor->current.pos.z < ikki2_pos[0].z + 12000.0f) { - a_this->current.pos.z = ikki2_pos[0].z; - i_this->mActionMode = 5; - a_this->speedF = 0.0f; + actor->current.pos.z = ikki2_pos[0].z; + i_this->ride_mode = 5; + actor->speedF = 0.0f; OS_REPORT(" WB CULL !!\n"); } } } static void e_wb_b_ikki2_end(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; - switch (i_this->mActionMode) { + switch (i_this->ride_mode) { case 0: - a_this->current.pos.x = -93620.0f; + actor->current.pos.x = -93620.0f; anm_init(i_this, 0x20, 1.0f, 2, 1.0f); - i_this->mActionMode = 1; - i_this->field_0x68e = 0; + i_this->ride_mode = 1; + i_this->counter = 0; // fallthrough case 1: - if (i_this->field_0x68e > (s16)(170 + KREG_S(6)) && i_this->mAcch.ChkWallHit()) { - i_this->mActionID = ACT_BG_DAMAGE; - i_this->mActionMode = 0; - i_this->mAnimDuration = 50.0f; - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_WB_V_DAMAGE, -1); + if (i_this->counter > (s16)(170 + KREG_S(6)) && i_this->Bgc.ChkWallHit()) { + i_this->action = ACT_BG_DAMAGE; + i_this->ride_mode = 0; + i_this->anm_time = 50.0f; + i_this->sound.startCreatureVoice(Z2SE_EN_WB_V_DAMAGE, -1); dComIfGp_getVibration().StartShock(8, 0x4f, cXyz(0.0f, 1.0f, 0.0f)); - i_this->mLandingFlag = 1; + i_this->landing_flag = 1; } break; } - a_this->speedF = l_HIO.mSingleRiderSpeed; + actor->speedF = l_HIO.mSingleRiderSpeed; - if (i_this->field_0x68e == (s16)(180 + KREG_S(7))) { - i_this->field_0x7ac.SetWall(100.0f, 300.0f + BREG_F(8)); + if (i_this->counter == (s16)(180 + KREG_S(7))) { + i_this->AcchCir.SetWall(100.0f, 300.0f + BREG_F(8)); } - s16 angle_offset; - if (i_this->field_0x68e > (s16)(170 + KREG_S(6))) { - angle_offset = -15000; + s16 yaa; + if (i_this->counter > (s16)(170 + KREG_S(6))) { + yaa = -0x3A98; } else { - angle_offset = (s16)(3000.0f * cM_ssin(i_this->field_0x68e * (1000 + KREG_S(4)))); + yaa = (s16)(3000.0f * cM_ssin(i_this->counter * (0x3E8 + KREG_S(4)))); } - s16 curr_angle = a_this->current.angle.y; - cLib_addCalcAngleS2(&a_this->current.angle.y, angle_offset + 0x8000, 2, 0x800); - s16 r26 = (TREG_S(7) - 13) * (a_this->current.angle.y - curr_angle); - cLib_addCalcAngleS2(&i_this->mBodyTiltAngle, r26, 8, 0x800); + s16 angle = actor->current.angle.y; + cLib_addCalcAngleS2(&actor->current.angle.y, yaa + 0x8000, 2, 0x800); + s16 target_yaa = (TREG_S(7) - 13) * (actor->current.angle.y - angle); + cLib_addCalcAngleS2(&i_this->body_angle, target_yaa, 8, 0x800); } static void e_wb_b_lv9_end(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; cXyz local_44; - f32 target_speed = 0.0f; - f32 speed_step = 0.5f; - s16 curr_angle = a_this->current.angle.y; + f32 speed = 0.0f; + f32 acceleration = 0.5f; + s16 angle = actor->current.angle.y; - switch (i_this->mActionMode) { + switch (i_this->ride_mode) { case 0: - i_this->field_0x698[0] = 30; - i_this->mActionMode = 1; + i_this->timer[0] = 30; + i_this->ride_mode = 1; anm_init(i_this, 0x2b, 0.0f, 2, 1.0f); - a_this->current.pos.set(-7080.0f, 50.0f, -6634.0f); - local_44.x = -10008.0f - a_this->current.pos.x; - local_44.z = -2729.0f - a_this->current.pos.z; - a_this->current.angle.y = cM_atan2s(local_44.x, local_44.z); - a_this->shape_angle.y = a_this->current.angle.y; - i_this->mTargetFacingAngle = a_this->current.angle.y; + actor->current.pos.set(-7080.0f, 50.0f, -6634.0f); + local_44.x = -10008.0f - actor->current.pos.x; + local_44.z = -2729.0f - actor->current.pos.z; + actor->current.angle.y = cM_atan2s(local_44.x, local_44.z); + actor->shape_angle.y = actor->current.angle.y; + i_this->target_ya = actor->current.angle.y; // fallthrough case 1: - if (i_this->field_0x698[0] == 0) { - i_this->mActionMode = 2; - i_this->field_0x698[0] = KREG_S(6) + 65; + if (i_this->timer[0] == 0) { + i_this->ride_mode = 2; + i_this->timer[0] = KREG_S(6) + 65; } break; case 2: - target_speed = KREG_F(6) + 15.0f; - if (i_this->field_0x698[0] == 0) { + speed = KREG_F(6) + 15.0f; + if (i_this->timer[0] == 0) { anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); - i_this->mActionMode = 3; - i_this->mStatusFlags |= (u16)8; - i_this->field_0x698[0] = 40; + i_this->ride_mode = 3; + i_this->status_flag |= (u16)8; + i_this->timer[0] = 40; } break; case 3: - if (i_this->field_0x698[0] == 1) { - i_this->mStatusFlags |= (u16)8; + if (i_this->timer[0] == 1) { + i_this->status_flag |= (u16)8; } break; case 4: anm_init(i_this, 0x1b, 3.0f, 0, 1.0f); - i_this->mActionMode = 5; + i_this->ride_mode = 5; break; case 5: - if (i_this->mpModelMorf->isStop()) { + if (i_this->anm_p->isStop()) { anm_init(i_this, 0x20, 2.0f, 2, 1.0f); - i_this->mActionMode = 6; - i_this->field_0x698[0] = 80; + i_this->ride_mode = 6; + i_this->timer[0] = 80; } break; case 6: - target_speed = KREG_F(7) + 40.0f; - speed_step = 5.0f; - if (i_this->field_0x698[0] < 30) { - i_this->mMovementType = 1; + speed = KREG_F(7) + 40.0f; + acceleration = 5.0f; + if (i_this->timer[0] < 30) { + i_this->movement_type = 1; } - if (i_this->field_0x698[0] == 0) { - local_44.x = -12682.0f - a_this->current.pos.x; - local_44.z = -2701.0f - a_this->current.pos.z; - i_this->mTargetFacingAngle = cM_atan2s(local_44.x, local_44.z); + if (i_this->timer[0] == 0) { + local_44.x = -12682.0f - actor->current.pos.x; + local_44.z = -2701.0f - actor->current.pos.z; + i_this->target_ya = cM_atan2s(local_44.x, local_44.z); } break; } - cLib_addCalc2(&a_this->speedF, target_speed, 1.0f, speed_step); - cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mTargetFacingAngle, 4, 0x100); - s16 sp8 = (TREG_S(7) + -8) * (a_this->current.angle.y - curr_angle); - cLib_addCalcAngleS2(&i_this->mBodyTiltAngle, sp8, 8, 0x200); + cLib_addCalc2(&actor->speedF, speed, 1.0f, acceleration); + cLib_addCalcAngleS2(&actor->current.angle.y, i_this->target_ya, 4, 0x100); + s16 ya = (TREG_S(7) + -8) * (actor->current.angle.y - angle); + cLib_addCalcAngleS2(&i_this->body_angle, ya, 8, 0x200); } static void e_wb_a_run(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; cXyz sp18, spC; - s16 curr_angle_y = a_this->current.angle.y; - s16 r27; + s16 angle = actor->current.angle.y; + s16 ya; - switch (i_this->mActionMode) { + switch (i_this->ride_mode) { case 0: anm_init(i_this, 0x20, 5.0f, 2, 1.399999976158142f); - i_this->mActionMode = 1; - i_this->mTargetFacingAngle = a_this->current.angle.y; - i_this->field_0x698[1] = cM_rndF(30.0f) + 80.0f; + i_this->ride_mode = 1; + i_this->target_ya = actor->current.angle.y; + i_this->timer[1] = cM_rndF(30.0f) + 80.0f; case 1: - i_this->mPursuitFlag = 1; - i_this->mMovementType = 1; + i_this->pursuit_flg = 1; + i_this->movement_type = 1; - if (i_this->field_0x698[0] == 0) { - i_this->field_0x698[0] = cM_rndF(30.0f) + 10.0f; - ANGLE_ADD(i_this->mTargetFacingAngle, cM_rndFX(10000.0f)); + if (i_this->timer[0] == 0) { + i_this->timer[0] = cM_rndF(30.0f) + 10.0f; + ANGLE_ADD(i_this->target_ya, cM_rndFX(10000.0f)); } - if (i_this->field_0x698[1] == 1 || i_this->mSpeedCapTimer == 2) { - i_this->mActionID = ACT_LR_DAMAGE; - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_WB_V_DAMAGE, -1); - i_this->mActionMode = 0; + if (i_this->timer[1] == 1 || i_this->gake_flg == GAKE_FLG_TURN) { + i_this->action = ACT_LR_DAMAGE; + i_this->sound.startCreatureVoice(Z2SE_EN_WB_V_DAMAGE, -1); + i_this->ride_mode = 0; } default: - cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mTargetFacingAngle, 8, 0x800); - cLib_addCalc2(&a_this->speedF, l_HIO.max_speed * 1.2f, 1.0f, 2.0f); - r27 = (TREG_S(7) - 8) * (a_this->current.angle.y - curr_angle_y); - cLib_addCalcAngleS2(&i_this->mBodyTiltAngle, r27, 8, 0x200); + cLib_addCalcAngleS2(&actor->current.angle.y, i_this->target_ya, 8, 0x800); + cLib_addCalc2(&actor->speedF, l_HIO.max_speed * 1.2f, 1.0f, 2.0f); + ya = (TREG_S(7) - 8) * (actor->current.angle.y - angle); + cLib_addCalcAngleS2(&i_this->body_angle, ya, 8, 0x200); } } static void e_wb_s_damage(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; cXyz cStack_1c; cXyz cStack_28; - i_this->field_0x6a0 = 10; - switch (i_this->mActionMode) { + i_this->wait_timer = 10; + switch (i_this->ride_mode) { case 0: - if (a_this->speedF <= 5.0f) { - if ((i_this->mStatusFlags & 3) != 0) { + if (actor->speedF <= 5.0f) { + if ((i_this->status_flag & 3) != 0) { anm_init(i_this, 9, 2.0f, 0, 1.0f); } else { anm_init(i_this, 8, 2.0f, 0, 1.0f); - i_this->mAnimDuration = 50.0f; - i_this->field_0x168a = 5000; + i_this->anm_time = 50.0f; + i_this->field_0x168a = 0x1388; } } else { anm_init(i_this, 0x22, 2.0f, 0, 1.0f); } - i_this->mActionMode = 1; + i_this->ride_mode = 1; break; case 1: - if (i_this->mpModelMorf->isStop()) { - if ((i_this->mStatusFlags & 3) != 0) { - i_this->mActionID = i_this->field_0x692; - if (i_this->mActionID == ACT_WAIT2) { - i_this->mActionID = ACT_C_F_RUN; - } else if (i_this->mActionID == ACT_C_F_RUN) { - i_this->mActionMode = 1; + if (i_this->anm_p->isStop()) { + if ((i_this->status_flag & 3) != 0) { + i_this->action = i_this->old_action; + if (i_this->action == ACT_WAIT2) { + i_this->action = ACT_C_F_RUN; + } else if (i_this->action == ACT_C_F_RUN) { + i_this->ride_mode = 1; } else { - if (i_this->mActionID == ACT_PL_RIDE) { - i_this->mActionID = ACT_PL_RIDE2; - i_this->field_0x1432 = l_HIO.mPlayerMountedDashTime; - a_this->speedF = 0.0f; + if (i_this->action == ACT_PL_RIDE) { + i_this->action = ACT_PL_RIDE2; + i_this->dash_timer = l_HIO.mPlayerMountedDashTime; + actor->speedF = 0.0f; anm_init(i_this, 0x1b, 3.0f, 0, 1.0f); - i_this->mAnimDuration = 40.0f; + i_this->anm_time = 40.0f; OS_REPORT(" RIDE RUN START \n"); return; } - i_this->mActionMode = 0; + i_this->ride_mode = 0; } } else { - i_this->mActionID = ACT_A_RUN; - i_this->mActionMode = 0; + i_this->action = ACT_A_RUN; + i_this->ride_mode = 0; } } break; } - cLib_addCalc0(&a_this->speedF, 1.0f, 1.0f); + cLib_addCalc0(&actor->speedF, 1.0f, 1.0f); } static int e_wb_damage(e_wb_class* i_this) { - fopEn_enemy_c* a_this = &i_this->mEnemy; + fopEn_enemy_c* enemy = &i_this->enemy; cXyz local_2c; cXyz local_38; - i_this->field_0x6a0 = 10; - BOOL local_48 = FALSE; + i_this->wait_timer = 10; + BOOL rt = FALSE; - switch (i_this->mActionMode) { + switch (i_this->ride_mode) { case 0: - dKy_Sound_set(a_this->current.pos, 100, fopAcM_GetID(&i_this->mEnemy), 5); + dKy_Sound_set(enemy->current.pos, 100, fopAcM_GetID(&i_this->enemy), 5); anm_init(i_this, 8, 1.0f, 0, 1.0f); - i_this->mActionMode = 1; - a_this->speedF = -15.0f + YREG_F(0); - a_this->speed.y = 50.0f + YREG_F(1) + cM_rndF(20.0f); - ANGLE_ADD(a_this->current.angle.y, cM_rndFX(3000.0f)); - i_this->mStatusFlags |= (u16)0x40; + i_this->ride_mode = 1; + enemy->speedF = -15.0f + YREG_F(0); + enemy->speed.y = 50.0f + YREG_F(1) + cM_rndF(20.0f); + ANGLE_ADD(enemy->current.angle.y, cM_rndFX(3000.0f)); + i_this->status_flag |= (u16)0x40; break; case 1: - if (i_this->mAcch.ChkGroundHit()) { - i_this->mActionMode = 2; - a_this->speedF *= 0.5f; - a_this->speed.y = 40.0f + YREG_F(2); + if (i_this->Bgc.ChkGroundHit()) { + i_this->ride_mode = 2; + enemy->speedF *= 0.5f; + enemy->speed.y = 40.0f + YREG_F(2); anm_init(i_this, 0x22, 2.0f, 0, 1.0f); - i_this->field_0x6b4.y = (s16)cM_rndFX(2000.0f + YREG_F(4)); + i_this->rotation_spd.y = (s16)cM_rndFX(2000.0f + YREG_F(4)); } break; case 2: - if (i_this->mpModelMorf->isStop()) { - i_this->mActionMode = 3; + if (i_this->anm_p->isStop()) { + i_this->ride_mode = 3; if (cM_rndF(1.0f) < 0.5f) { anm_init(i_this, 0xc, 2.0f, 0, 1.0f); i_this->field_0x6e4 = 0; @@ -2482,111 +2490,111 @@ static int e_wb_damage(e_wb_class* i_this) { anm_init(i_this, 0xd, 2.0f, 0, 1.0f); i_this->field_0x6e4 = 1; } - i_this->field_0x698[0] = (s16)(cM_rndF(40.0f) + 70.0f); + i_this->timer[0] = (s16)(cM_rndF(40.0f) + 70.0f); } break; case 3: - local_48 = TRUE; - if (i_this->mpModelMorf->isStop()) { - if (i_this->mAnmID == 0xc) { + rt = TRUE; + if (i_this->anm_p->isStop()) { + if (i_this->anmID == 12) { anm_init(i_this, 0x12, 3.0f, 2, 1.0f); - } else if (i_this->mAnmID == 0xd) { + } else if (i_this->anmID == 13) { anm_init(i_this, 0x13, 3.0f, 2, 1.0f); } } - if (i_this->mAcch.ChkGroundHit()) { - a_this->speedF = 0.0f; - cLib_addCalcAngleS2(&i_this->field_0x6b4.y, 0, 1, 0x96 + YREG_S(3)); + if (i_this->Bgc.ChkGroundHit()) { + enemy->speedF = 0.0f; + cLib_addCalcAngleS2(&i_this->rotation_spd.y, 0, 1, 0x96 + YREG_S(3)); } - if (i_this->field_0x698[0] == 0 && i_this->field_0x6ae.x > -0x200) { + if (i_this->timer[0] == 0 && i_this->rotation.x > -0x200) { if (i_this->field_0x6e4 == 0) { anm_init(i_this, 0x10, 2.0f, 0, 1.0f); } else { anm_init(i_this, 0x11, 2.0f, 0, 1.0f); } - i_this->mActionMode = 4; + i_this->ride_mode = 4; } break; case 4: - if (i_this->mpModelMorf->isStop()) { - i_this->mActionID = ACT_WAIT; - i_this->mActionMode = 0; - i_this->field_0x6ae.x = 0; - a_this->current.angle.y += i_this->field_0x6ae.y; - a_this->shape_angle.y = a_this->current.angle.y; - i_this->field_0x6ae.y = i_this->field_0x6b4.y = 0; + if (i_this->anm_p->isStop()) { + i_this->action = ACT_WAIT; + i_this->ride_mode = 0; + i_this->rotation.x = 0; + enemy->current.angle.y += i_this->rotation.y; + enemy->shape_angle.y = enemy->current.angle.y; + i_this->rotation.y = i_this->rotation_spd.y = 0; } break; } - i_this->field_0x6ae.y += i_this->field_0x6b4.y; + i_this->rotation.y += i_this->rotation_spd.y; - if (i_this->mActionMode >= 3) { - cLib_addCalcAngleS2(&i_this->field_0x6ae.x, 0, 1, 0x600); + if (i_this->ride_mode >= 3) { + cLib_addCalcAngleS2(&i_this->rotation.x, 0, 1, 0x600); } else { - cLib_addCalcAngleS2(&i_this->field_0x6ae.x, -(YREG_S(6) + 0x4000), 1, YREG_S(1) + 0x200); + cLib_addCalcAngleS2(&i_this->rotation.x, -(YREG_S(6) + 0x4000), 1, YREG_S(1) + 0x200); } - return local_48; + return rt; } static int e_wb_bg_damage(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; cXyz local_30, unused; - BOOL return_value = FALSE; + BOOL rt = FALSE; - i_this->field_0x6a0 = 10; + i_this->wait_timer = 10; - switch (i_this->mActionMode) { + switch (i_this->ride_mode) { case 0: - dKy_Sound_set(a_this->current.pos, 100, fopAcM_GetID(&i_this->mEnemy), 5); + dKy_Sound_set(actor->current.pos, 100, fopAcM_GetID(&i_this->enemy), 5); anm_init(i_this, 5, 2.0f, 0, 1.0f); - i_this->mActionMode = 1; - a_this->speedF = 0.0f; - i_this->mStatusFlags |= (u16)0x80; - i_this->field_0x1432 = 0; + i_this->ride_mode = 1; + actor->speedF = 0.0f; + i_this->status_flag |= (u16)0x80; + i_this->dash_timer = 0; break; case 1: - if (i_this->mpModelMorf->isStop()) { - i_this->mActionMode = 2; + if (i_this->anm_p->isStop()) { + i_this->ride_mode = 2; anm_init(i_this, 7, 2.0f, 2, 1.0f); - i_this->field_0x698[0] = (s16)(cM_rndF(60.0f) + 150.0f); + i_this->timer[0] = (s16)(cM_rndF(60.0f) + 150.0f); } break; case 2: - return_value = TRUE; - if (i_this->field_0x698[0] == 0) { + rt = TRUE; + if (i_this->timer[0] == 0) { anm_init(i_this, 6, 3.0f, 0, 1.0f); - i_this->mActionMode = 3; + i_this->ride_mode = 3; } break; case 3: - if (i_this->mpModelMorf->isStop()) { - i_this->mActionID = ACT_WAIT; - i_this->mActionMode = 0; + if (i_this->anm_p->isStop()) { + i_this->action = ACT_WAIT; + i_this->ride_mode = 0; } break; } - return return_value; + return rt; } static int e_wb_lr_damage(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; cXyz local_2c; cXyz local_38; - BOOL return_value = FALSE; + BOOL rt = FALSE; - i_this->field_0x6a0 = 10; + i_this->wait_timer = 10; - switch (i_this->mActionMode) { + switch (i_this->ride_mode) { case 0: { if (cM_rndF(1.0f) < 0.5f || i_this->field_0x1720 != 0) { anm_init(i_this, 0xc, 2.0f, 0, 1.0f); @@ -2595,42 +2603,42 @@ static int e_wb_lr_damage(e_wb_class* i_this) { anm_init(i_this, 0xd, 2.0f, 0, 1.0f); i_this->field_0x6e4 = 1; } - i_this->mActionMode = 1; - i_this->mStatusFlags |= (u16)0x40; - i_this->field_0x698[0] = (s16)(cM_rndF(60.0f) + 150.0f); - i_this->field_0x698[1] = 15 + TREG_S(5); + i_this->ride_mode = 1; + i_this->status_flag |= (u16)0x40; + i_this->timer[0] = (s16)(cM_rndF(60.0f) + 150.0f); + i_this->timer[1] = 15 + TREG_S(5); if (i_this->field_0x1720 != 0) { - a_this->speedF = -50.0f + JREG_F(16); - i_this->field_0x6b4.y = JREG_S(7) - 0x640; + actor->speedF = -50.0f + JREG_F(16); + i_this->rotation_spd.y = JREG_S(7) - 0x640; } else { - i_this->field_0x6b4.y = (s16)cM_rndFX(a_this->speedF * (50.0f + YREG_F(4))); + i_this->rotation_spd.y = (s16)cM_rndFX(actor->speedF * (50.0f + YREG_F(4))); } } break; case 1: { - if ((int)i_this->mpModelMorf->getFrame() == 10) { - i_this->mAnimDuration = 40.0f; + if ((int)i_this->anm_p->getFrame() == 10) { + i_this->anm_time = 40.0f; i_this->field_0x168a = 4000; - if (a_this->speedF > 30.0f) { + if (actor->speedF > 30.0f) { if (i_this->field_0x6e4 == 0) { anm_init(i_this, 0xe, 2.0f, 2, 1.0f); } else { anm_init(i_this, 0xf, 2.0f, 2, 1.0f); } - i_this->mActionMode = 2; - a_this->speedF = 30.0f; + i_this->ride_mode = 2; + actor->speedF = 30.0f; } - i_this->mLandingFlag = 1; - dKy_Sound_set(a_this->current.pos, 100, fopAcM_GetID(&i_this->mEnemy), 5); + i_this->landing_flag = 1; + dKy_Sound_set(actor->current.pos, 100, fopAcM_GetID(&i_this->enemy), 5); } - if (i_this->mpModelMorf->isStop()) { - i_this->mActionMode = 3; - if (i_this->mAnmID == 0xc) { + if (i_this->anm_p->isStop()) { + i_this->ride_mode = 3; + if (i_this->anmID == 12) { anm_init(i_this, 0x12, 3.0f, 2, 1.0f); - } else if (i_this->mAnmID == 0xd) { + } else if (i_this->anmID == 13) { anm_init(i_this, 0x13, 3.0f, 2, 1.0f); } } @@ -2638,196 +2646,196 @@ static int e_wb_lr_damage(e_wb_class* i_this) { goto case3; case 2: - if (a_this->speedF < 5.0f) { - if (i_this->mAnmID == 14) { + if (actor->speedF < 5.0f) { + if (i_this->anmID == 14) { anm_init(i_this, 0x12, 3.0f, 2, 1.0f); - } else if (i_this->mAnmID == 15) { + } else if (i_this->anmID == 15) { anm_init(i_this, 0x13, 3.0f, 2, 1.0f); } - i_this->mActionMode = 3; + i_this->ride_mode = 3; } // fallthrough case 3: { case3: - if (i_this->field_0x698[1] == 0) { - return_value = TRUE; + if (i_this->timer[1] == 0) { + rt = TRUE; } - if (a_this->speedF > 15.0f) { - i_this->mMovementType = 2; + if (actor->speedF > 15.0f) { + i_this->movement_type = 2; } - if (i_this->field_0x698[0] == 0 && i_this->field_0x1720 == 0) { + if (i_this->timer[0] == 0 && i_this->field_0x1720 == 0) { if (i_this->field_0x6e4 == 0) { anm_init(i_this, 0x10, 3.0f, 0, 1.0f); } else { anm_init(i_this, 0x11, 3.0f, 0, 1.0f); } - i_this->mActionMode = 4; + i_this->ride_mode = 4; } - cLib_addCalcAngleS2(&i_this->field_0x6b4.y, 0, 1, 100 + YREG_S(3)); + cLib_addCalcAngleS2(&i_this->rotation_spd.y, 0, 1, 0x64 + YREG_S(3)); } break; case 4: { - if (i_this->mpModelMorf->isStop()) { - i_this->mActionID = ACT_WAIT; - i_this->mActionMode = 0; - a_this->current.angle.y += i_this->field_0x6ae.y; - a_this->shape_angle.y = a_this->current.angle.y; - i_this->field_0x6ae.y = i_this->field_0x6b4.y = 0; + if (i_this->anm_p->isStop()) { + i_this->action = ACT_WAIT; + i_this->ride_mode = 0; + actor->current.angle.y += i_this->rotation.y; + actor->shape_angle.y = actor->current.angle.y; + i_this->rotation.y = i_this->rotation_spd.y = 0; } } break; } - cLib_addCalc0(&a_this->speedF, 1.0f, 1.5f + YREG_F(11)); - i_this->field_0x6ae.y += i_this->field_0x6b4.y; + cLib_addCalc0(&actor->speedF, 1.0f, 1.5f + YREG_F(11)); + i_this->rotation.y += i_this->rotation_spd.y; - return return_value; + return rt; } static void e_wb_kiba_start(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - f32 target = 0.0f; - switch (i_this->mActionMode) { + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; + f32 speed = 0.0f; + switch (i_this->ride_mode) { case 0: anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); - i_this->field_0x169e = 0x1e; - i_this->mActionMode = 1; - i_this->field_0x7a2 = 1; + i_this->demo_mode = 30; + i_this->ride_mode = 1; + i_this->kiba = 1; break; case 1: default: break; } - cLib_addCalc2(&a_this->speedF, target, 1.0f, 5.0f); + cLib_addCalc2(&actor->speedF, speed, 1.0f, 5.0f); } static void e_wb_kiba_end(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; - i_this->field_0x6a0 = 10; + i_this->wait_timer = 10; - switch (i_this->mActionMode) { + switch (i_this->ride_mode) { case 0: - if (i_this->mAnmID != 0x20) { + if (i_this->anmID != 32) { anm_init(i_this, 0x20, 1.0f, 2, 1.0f); } - i_this->mActionMode = 1; - i_this->field_0x169e = 1; + i_this->ride_mode = 1; + i_this->demo_mode = 1; break; case 1: - i_this->mMovementType = 1; - i_this->mAnimDuration = 60.0f + YREG_F(10); - i_this->field_0x168a = 5000 + YREG_S(7); + i_this->movement_type = 1; + i_this->anm_time = 60.0f + YREG_F(10); + i_this->field_0x168a = 0x1388 + YREG_S(7); - if (a_this->current.pos.x > 34000.0f && a_this->current.pos.x < 35500.0f && - a_this->current.pos.z < -14500.0f + KREG_F(13)) + if (actor->current.pos.x > 34000.0f && actor->current.pos.x < 35500.0f && + actor->current.pos.z < -14500.0f + KREG_F(13)) { - a_this->speed.y = 55.0f + WREG_F(1); + actor->speed.y = 55.0f + WREG_F(1); anm_init(i_this, 0x18, 2.0f, 0, 1.0f); - i_this->mActionMode = 2; - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_RDB_V_HOICK, -1); - i_this->mStatusFlags |= (u16)0x100; + i_this->ride_mode = 2; + i_this->sound.startCreatureVoice(Z2SE_EN_RDB_V_HOICK, -1); + i_this->status_flag |= (u16)0x100; } break; case 2: - if (a_this->speed.y < 10.0f) { + if (actor->speed.y < 10.0f) { anm_init(i_this, 0x19, 10.0f, 0, 1.0f); - i_this->mActionMode = 3; + i_this->ride_mode = 3; } break; case 3: - if (i_this->mAnmID == 0x19) { - if (a_this->speed.y < -30.0f + JREG_F(9) || i_this->mAcch.ChkGroundHit()) { + if (i_this->anmID == 25) { + if (actor->speed.y < -30.0f + JREG_F(9) || i_this->Bgc.ChkGroundHit()) { anm_init(i_this, 0x1a, 2.0f, 0, 1.0f); - i_this->mCollisionFlags |= (u8)0xc; - i_this->mLandingFlag = 1; - i_this->mStatusFlags |= (u16)0x200; + i_this->collision_flg |= (u8)0xc; + i_this->landing_flag = 1; + i_this->status_flag |= (u16)0x200; } - } else if (i_this->mAnmID == 0x1a && i_this->mpModelMorf->isStop()) { + } else if (i_this->anmID == 26 && i_this->anm_p->isStop()) { anm_init(i_this, 0x20, 2.0f, 2, 1.0f); - i_this->mActionMode = 4; + i_this->ride_mode = 4; } break; case 4: break; } - cLib_addCalc2(&a_this->speedF, 40.0f, 1.0f, 5.0f); + cLib_addCalc2(&actor->speedF, 40.0f, 1.0f, 5.0f); } static void damage_check(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - fopAc_ac_c* player = dComIfGp_getPlayer(0); + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; + fopAc_ac_c* pla = dComIfGp_getPlayer(0); - a_this->health = 100; + actor->health = 100; - if (i_this->field_0x6ba != 0) { - i_this->field_0x6ba--; + if (i_this->damage_timer != 0) { + i_this->damage_timer--; } for (int i = 0; i <= 2; i++) { - if (i_this->field_0xa00[i].ChkCoHit()) { - fopAc_ac_c* hit_actor = dCc_GetAc(i_this->field_0xa00[i].GetCoHitObj()->GetAc()); + if (i_this->cc_sph[i].ChkCoHit()) { + fopAc_ac_c* hit_actor = dCc_GetAc(i_this->cc_sph[i].GetCoHitObj()->GetAc()); - if (!daAlink_getAlinkActorClass()->checkBoarRideOwn(a_this) && - i_this->field_0x6a0 == 0 && a_this->speedF < 1.0f && - fopAcM_GetName(hit_actor) == PROC_ALINK) { - ANGLE_ADD(i_this->field_0x6ba, 2); - if (i_this->field_0x6ba >= 150) { - i_this->field_0x692 = i_this->mActionID; - i_this->mActionID = ACT_S_DAMAGE; - i_this->mActionMode = 0; - i_this->field_0x6a0 = 20; + if (!daAlink_getAlinkActorClass()->checkBoarRideOwn(actor) && + i_this->wait_timer == 0 && actor->speedF < 1.0f && + fopAcM_GetName(hit_actor) == fpcNm_ALINK_e) { + ANGLE_ADD(i_this->damage_timer, 2); + if (i_this->damage_timer >= 150) { + i_this->old_action = i_this->action; + i_this->action = ACT_S_DAMAGE; + i_this->ride_mode = 0; + i_this->wait_timer = 20; return; } } if ((lbl_244_bss_47 != 0 || lbl_244_bss_45 != 0) && - fopAcM_GetName(hit_actor) == PROC_E_WB) + fopAcM_GetName(hit_actor) == fpcNm_E_WB_e) { e_wb_class* wb = (e_wb_class*)hit_actor; - if (i_this->field_0x6a0 == 0) { - if (wb->field_0x6a0 == 0 && i_this->field_0x79d == 0 && wb->field_0x79d == 0) { - u8 temp = wb->mParam2; - wb->mParam2 = i_this->mParam2; - i_this->mParam2 = temp; - i_this->field_0x6a0 = 10; + if (i_this->wait_timer == 0) { + if (wb->wait_timer == 0 && i_this->leader == 0 && wb->leader == 0) { + u8 work = wb->arg1; + wb->arg1 = i_this->arg1; + i_this->arg1 = work; + i_this->wait_timer = 10; } } } - if (i_this->field_0x79d >= 2 && a_this->speedF >= 30.0f) { - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_RDB_V_RUNDOWN, -1); - i_this->mZ2Ride.startCreatureSound(Z2SE_EN_BB_RUNDOWN, 0, -1); + if (i_this->leader >= LEADER_B_IKKI && actor->speedF >= 30.0f) { + i_this->sound.startCreatureVoice(Z2SE_EN_RDB_V_RUNDOWN, -1); + i_this->sound.startCreatureSound(Z2SE_EN_BB_RUNDOWN, 0, -1); - e_rd_class* rider = (e_rd_class*)fopAcM_SearchByID(i_this->field_0x1434); + e_rd_class* rider = (e_rd_class*)fopAcM_SearchByID(i_this->rd_id); rider->damage_timer = 20; } else { - if (i_this->field_0x79d == 0 || i_this->mSpeedCapTimer == 0) { + if (i_this->leader == 0 || i_this->gake_flg == GAKE_FLG_NONE) { fopAc_ac_c* hit_actor = - dCc_GetAc(i_this->field_0xa00[i].GetCoHitObj()->GetAc()); + dCc_GetAc(i_this->cc_sph[i].GetCoHitObj()->GetAc()); - if (a_this->speedF >= 20.0f) { - if (i_this->field_0xa00[i].GetCoHitObj()->GetStts()->GetWeightUc() > 100 && - (i_this->mActionID == ACT_C_F_RUN || i_this->mActionID == ACT_B_RUN) && + if (actor->speedF >= 20.0f) { + if (i_this->cc_sph[i].GetCoHitObj()->GetStts()->GetWeightUc() > 100 && + (i_this->action == ACT_C_F_RUN || i_this->action == ACT_B_RUN) && hit_actor->speedF >= 20.0f) { - cXyz pos_diff = hit_actor->current.pos - a_this->current.pos; - s16 angle = cM_atan2s(pos_diff.x, pos_diff.z) - a_this->shape_angle.y; + cXyz pos_diff = hit_actor->current.pos - actor->current.pos; + s16 angle = cM_atan2s(pos_diff.x, pos_diff.z) - actor->shape_angle.y; if (angle < 0) { i_this->field_0x5de = 0x1000; - ANGLE_ADD(a_this->current.angle.y, 0x800); + ANGLE_ADD(actor->current.angle.y, 0x800); } else { i_this->field_0x5de = -0x1000; - ANGLE_SUB(a_this->current.angle.y, 0x800); + ANGLE_SUB(actor->current.angle.y, 0x800); } } } @@ -2836,45 +2844,45 @@ static void damage_check(e_wb_class* i_this) { } } - i_this->mStts.Move(); + i_this->Stts.Move(); - if (i_this->field_0x6a0 == 0) { + if (i_this->wait_timer == 0) { dCcU_AtInfo at_info; for (int i = 0; i <= 6; i++) { - if (i_this->field_0xa00[i].ChkTgHit()) { - i_this->field_0x13c0.mpCollider = i_this->field_0xa00[i].GetTgHitObj(); + if (i_this->cc_sph[i].ChkTgHit()) { + i_this->at_info.mpCollider = i_this->cc_sph[i].GetTgHitObj(); - if (i_this->field_0x79d != 0 || (daPy_getPlayerActorClass()->checkHorseRide() && - (i_this->mStatusFlags & 3) != 0)) { - if (i_this->field_0x79d != 0) { - def_se_set(&i_this->mZ2Ride, i_this->field_0x13c0.mpCollider, 0x28, NULL); + if (i_this->leader != 0 || (daPy_getPlayerActorClass()->checkHorseRide() && + (i_this->status_flag & 3) != 0)) { + if (i_this->leader != 0) { + def_se_set(&i_this->sound, i_this->at_info.mpCollider, 0x28, NULL); } } else { - at_power_check(&i_this->field_0x13c0); - cc_at_check(a_this, &i_this->field_0x13c0); + at_power_check(&i_this->at_info); + cc_at_check(actor, &i_this->at_info); - if ((i_this->mStatusFlags & 3) != 0) { - if (i_this->field_0x13c0.mAttackPower < 30) { - i_this->field_0x692 = i_this->mActionID; - i_this->mActionID = ACT_S_DAMAGE; + if ((i_this->status_flag & 3) != 0) { + if (i_this->at_info.mAttackPower < 30) { + i_this->old_action = i_this->action; + i_this->action = ACT_S_DAMAGE; } else { - i_this->mActionID = ACT_LR_DAMAGE; + i_this->action = ACT_LR_DAMAGE; } - i_this->mActionMode = 0; + i_this->ride_mode = 0; } else { - i_this->mActionID = ACT_S_DAMAGE; - i_this->mActionMode = 0; + i_this->action = ACT_S_DAMAGE; + i_this->ride_mode = 0; } } - if (i_this->field_0x13c0.mpCollider->ChkAtType(AT_TYPE_UNK)) { - i_this->field_0x6a0 = 20; + if (i_this->at_info.mpCollider->ChkAtType(AT_TYPE_UNK)) { + i_this->wait_timer = 20; } else { - i_this->field_0x6a0 = 10; + i_this->wait_timer = 10; } - i_this->mAnimDuration = 30.0f; + i_this->anm_time = 30.0f; return; } } @@ -2882,34 +2890,34 @@ static void damage_check(e_wb_class* i_this) { } static void effect_set(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - cXyz pos; - cXyz effect_pos; + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; + cXyz mae; + cXyz ato; dBgS_GndChk gnd_chk; dBgS_ObjGndChk_Spl obj_gnd_chk; - pos = a_this->current.pos; - pos.y += 100.0f; - gnd_chk.SetPos(&pos); - obj_gnd_chk.SetPos(&pos); + mae = actor->current.pos; + mae.y += 100.0f; + gnd_chk.SetPos(&mae); + obj_gnd_chk.SetPos(&mae); s8 is_water = false; s8 in_water = false; - f32 ground_y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (dComIfG_Bgsp().GroundCross(&obj_gnd_chk) - ground_y > 0.0f) { + f32 waterY = dComIfG_Bgsp().GroundCross(&gnd_chk); + if (dComIfG_Bgsp().GroundCross(&obj_gnd_chk) - waterY > 0.0f) { is_water = true; } - if (i_this->mMovementType == 1) { - if (i_this->mpModelMorf->checkFrame(11.0f)) { - i_this->mCollisionFlags |= (u8)4; - } else if (i_this->mpModelMorf->checkFrame(13.0f)) { - i_this->mCollisionFlags |= (u8)8; + if (i_this->movement_type == 1) { + if (i_this->anm_p->checkFrame(11.0f)) { + i_this->collision_flg |= (u8)4; + } else if (i_this->anm_p->checkFrame(13.0f)) { + i_this->collision_flg |= (u8)8; } - } else if (i_this->mMovementType == 2) { - pos.set(0.0f, 0.0f, 0.0f); - J3DModel* model = i_this->mpModelMorf->getModel(); - int foot_idx = (i_this->field_0x68e & 2) >> 1; + } else if (i_this->movement_type == 2) { + mae.set(0.0f, 0.0f, 0.0f); + J3DModel* model = i_this->anm_p->getModel(); + int foot_idx = (i_this->counter & 2) >> 1; static int footd[2] = { 6, @@ -2921,104 +2929,104 @@ static void effect_set(e_wb_class* i_this) { 10, }; - if (i_this->field_0x79d != 0) { + if (i_this->leader != 0) { MTXCopy(model->getAnmMtx(footd_B[foot_idx]), *calc_mtx); } else { MTXCopy(model->getAnmMtx(footd[foot_idx]), *calc_mtx); } - MtxPosition(&pos, &effect_pos); + MtxPosition(&mae, &ato); if (is_water) { in_water = true; - } else if ((i_this->field_0x68e & 1) == 0) { + } else if ((i_this->counter & 1) == 0) { fopAcM_effSmokeSet2(&i_this->field_0x13e8[foot_idx], - &i_this->field_0x1408[foot_idx], &effect_pos, &a_this->shape_angle, a_this->scale.z * 2.0f, &a_this->tevStr); + &i_this->field_0x1408[foot_idx], &ato, &actor->shape_angle, actor->scale.z * 2.0f, &actor->tevStr); } } - if (i_this->mCollisionFlags != 0) { - J3DModel* model = i_this->mpModelMorf->getModel(); - pos.set(0.0f, 0.0f, 0.0f); + if (i_this->collision_flg != 0) { + J3DModel* model = i_this->anm_p->getModel(); + mae.set(0.0f, 0.0f, 0.0f); - if ((i_this->mCollisionFlags & 1) != 0) { + if ((i_this->collision_flg & 1) != 0) { MTXCopy(model->getAnmMtx(10), *calc_mtx); - MtxPosition(&pos, &effect_pos); + MtxPosition(&mae, &ato); if (is_water) { in_water = true; } else { fopAcM_effSmokeSet2(i_this->field_0x13e8 + 1, - i_this->field_0x1408 + 1, &effect_pos, &a_this->shape_angle, a_this->scale.z * 2.0f, &a_this->tevStr); - if (i_this->mMovementType != 0) { + i_this->field_0x1408 + 1, &ato, &actor->shape_angle, actor->scale.z * 2.0f, &actor->tevStr); + if (i_this->movement_type != 0) { i_this->field_0x13fc = dComIfGp_particle_set(i_this->field_0x13fc, dPa_RM(ID_ZI_S_WBCLOD_A), - &effect_pos, &a_this->shape_angle, 0); + &ato, &actor->shape_angle, 0); } } } - if ((i_this->mCollisionFlags & 2) != 0) { + if ((i_this->collision_flg & 2) != 0) { MTXCopy(model->getAnmMtx(6), *calc_mtx); - MtxPosition(&pos, &effect_pos); + MtxPosition(&mae, &ato); if (is_water) { in_water = true; } else { fopAcM_effSmokeSet2(i_this->field_0x13e8, - i_this->field_0x1408, &effect_pos, &a_this->shape_angle, a_this->scale.z * 2.0f, &a_this->tevStr); - if (i_this->mMovementType != 0) { + i_this->field_0x1408, &ato, &actor->shape_angle, actor->scale.z * 2.0f, &actor->tevStr); + if (i_this->movement_type != 0) { i_this->field_0x13f8 = dComIfGp_particle_set(i_this->field_0x13f8, dPa_RM(ID_ZI_S_WBCLOD_A), - &effect_pos, &a_this->shape_angle, 0); + &ato, &actor->shape_angle, 0); } } } - if ((i_this->mCollisionFlags & 4) != 0) { - if (i_this->field_0x79d != 0) { + if ((i_this->collision_flg & 4) != 0) { + if (i_this->leader != 0) { MTXCopy(model->getAnmMtx(29), *calc_mtx); } else { MTXCopy(model->getAnmMtx(25), *calc_mtx); } - MtxPosition(&pos, &effect_pos); + MtxPosition(&mae, &ato); if (is_water) { in_water = true; } else { fopAcM_effSmokeSet2(&i_this->field_0x13f0, - &i_this->field_0x1410, &effect_pos, &a_this->shape_angle, a_this->scale.z * 2.0f, &a_this->tevStr); - if (i_this->mMovementType != 0) { + &i_this->field_0x1410, &ato, &actor->shape_angle, actor->scale.z * 2.0f, &actor->tevStr); + if (i_this->movement_type != 0) { i_this->field_0x1400 = dComIfGp_particle_set(i_this->field_0x1400, dPa_RM(ID_ZI_S_WBCLOD_A), - &effect_pos, &a_this->shape_angle, 0); + &ato, &actor->shape_angle, 0); } } } - if ((i_this->mCollisionFlags & 8) != 0) { - if (i_this->field_0x79d != 0) { + if ((i_this->collision_flg & 8) != 0) { + if (i_this->leader != 0) { MTXCopy(model->getAnmMtx(24), *calc_mtx); } else { MTXCopy(model->getAnmMtx(21), *calc_mtx); } - MtxPosition(&pos, &effect_pos); + MtxPosition(&mae, &ato); if (is_water) { in_water = true; } else { fopAcM_effSmokeSet2(&i_this->field_0x13f4, - &i_this->field_0x1414, &effect_pos, &a_this->shape_angle, a_this->scale.z * 2.0f, &a_this->tevStr); - if (i_this->mMovementType != 0) { + &i_this->field_0x1414, &ato, &actor->shape_angle, actor->scale.z * 2.0f, &actor->tevStr); + if (i_this->movement_type != 0) { i_this->field_0x1404 = dComIfGp_particle_set(i_this->field_0x1404, dPa_RM(ID_ZI_S_WBCLOD_A), - &effect_pos, &a_this->shape_angle, 0); + &ato, &actor->shape_angle, 0); } } } } - if (i_this->mLandingFlag != 0) { + if (i_this->landing_flag != 0) { if (is_water) { in_water = true; } else { - pos.set(JREG_F(0), JREG_F(1), JREG_F(2)); - MTXCopy(i_this->mpModelMorf->getModel()->getAnmMtx(i_this->field_0x688 + 0xb), + mae.set(JREG_F(0), JREG_F(1), JREG_F(2)); + MTXCopy(i_this->anm_p->getModel()->getAnmMtx(i_this->field_0x688 + 0xb), *calc_mtx); - MtxPosition(&pos, &effect_pos); + MtxPosition(&mae, &ato); fopAcM_effSmokeSet1(&i_this->field_0x1418, - &i_this->field_0x141c, &effect_pos, NULL, a_this->scale.z * 2.0f, &a_this->tevStr, 1); + &i_this->field_0x141c, &ato, NULL, actor->scale.z * 2.0f, &actor->tevStr, 1); } } @@ -3038,14 +3046,14 @@ static void effect_set(e_wb_class* i_this) { dPa_RM(ID_ZI_S_ENEMY_DOWNWTRA_B), dPa_RM(ID_ZI_S_ENEMY_DOWNWTRA_C), }; - + for (int i = 0; i < 3; i++) { - if (i_this->mMovementType == 2) { - i_this->field_0x1420[i] = dComIfGp_particle_set(i_this->field_0x1420[i], - w_eff_name2[i], &effect_pos, &a_this->tevStr, &angle, &scale, 0xff, 0, -1, 0, 0, 0); + if (i_this->movement_type == 2) { + i_this->w_eff_id[i] = dComIfGp_particle_set(i_this->w_eff_id[i], + w_eff_name2[i], &ato, &actor->tevStr, &angle, &scale, 0xff, 0, -1, 0, 0, 0); } else { - i_this->field_0x1420[i] = dComIfGp_particle_set(i_this->field_0x1420[i], - w_eff_name[i], &effect_pos, &a_this->tevStr, &angle, &scale, 0xff, 0, -1, 0, 0, 0); + i_this->w_eff_id[i] = dComIfGp_particle_set(i_this->w_eff_id[i], + w_eff_name[i], &ato, &actor->tevStr, &angle, &scale, 0xff, 0, -1, 0, 0, 0); } } } @@ -3061,50 +3069,50 @@ static void effect_set(e_wb_class* i_this) { ID_ZI_J_DOWNWTRA_D, }; - i_this->field_0x17d0[i] = dComIfGp_particle_set(i_this->field_0x17d0[i], - w_eff_id[i], &a_this->current.pos, &a_this->tevStr, &a_this->shape_angle, + i_this->w_eff_id2[i] = dComIfGp_particle_set(i_this->w_eff_id2[i], + w_eff_id[i], &actor->current.pos, &actor->tevStr, &actor->shape_angle, &sc, 0xff, 0, -1, 0, 0, 0); } i_this->field_0x1721 = 0; } - i_this->mMovementType = 0; - i_this->mCollisionFlags = 0; - i_this->mLandingFlag = 0; + i_this->movement_type = 0; + i_this->collision_flg = 0; + i_this->landing_flag = 0; } static void wb_rd_reset(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - fopAc_ac_c* player = dComIfGp_getPlayer(0); - cXyz pos = a_this->current.pos; + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; + fopAc_ac_c* pla = dComIfGp_getPlayer(0); + cXyz pos = actor->current.pos; - if (i_this->mParam2 == 1 || i_this->mParam2 == 2) { - fopAcM_create(PROC_E_RD, 0xff010301, &pos, fopAcM_GetRoomNo(a_this), &player->shape_angle, 0, -1); - fopAcM_create(PROC_E_RD, 0xff010302, &pos, fopAcM_GetRoomNo(a_this), &player->shape_angle, 0, -1); - } else if (i_this->mParam2 >= 3) { - fopAcM_create(PROC_E_RD, 0xff010101, &pos, fopAcM_GetRoomNo(a_this), &player->shape_angle, 0, -1); - fopAcM_create(PROC_E_RD, 0xff010102, &pos, fopAcM_GetRoomNo(a_this), &player->shape_angle, 0, -1); + if (i_this->arg1 == 1 || i_this->arg1 == 2) { + fopAcM_create(fpcNm_E_RD_e, 0xff010301, &pos, fopAcM_GetRoomNo(actor), &pla->shape_angle, 0, -1); + fopAcM_create(fpcNm_E_RD_e, 0xff010302, &pos, fopAcM_GetRoomNo(actor), &pla->shape_angle, 0, -1); + } else if (i_this->arg1 >= 3) { + fopAcM_create(fpcNm_E_RD_e, 0xff010101, &pos, fopAcM_GetRoomNo(actor), &pla->shape_angle, 0, -1); + fopAcM_create(fpcNm_E_RD_e, 0xff010102, &pos, fopAcM_GetRoomNo(actor), &pla->shape_angle, 0, -1); } } static void wb_c_rd_reset(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - fopAc_ac_c* player = dComIfGp_getPlayer(0); - u32 param = 0xff010300; + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; + fopAc_ac_c* pla = dComIfGp_getPlayer(0); + u32 parameter = 0xFF010300; if (i_this->field_0x17e1 != 0) { - param = 0xff020300; + parameter = 0xFF020300; } - cXyz pos = a_this->current.pos; - fopAcM_create(PROC_E_RD, param | 1, &pos, fopAcM_GetRoomNo(a_this), 0, 0, -1); - fopAcM_create(PROC_E_RD, param | 2, &pos, fopAcM_GetRoomNo(a_this), 0, 0, -1); + cXyz pos = actor->current.pos; + fopAcM_create(fpcNm_E_RD_e, parameter | 1, &pos, fopAcM_GetRoomNo(actor), 0, 0, -1); + fopAcM_create(fpcNm_E_RD_e, parameter | 2, &pos, fopAcM_GetRoomNo(actor), 0, 0, -1); } -static void* s_rddel_sub(void* param_0, void* param_1) { - UNUSED(param_1); - if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_E_RD) { - e_rd_class* rd = (e_rd_class*)param_0; +static void* s_rddel_sub(void* i_actor, void* i_data) { + UNUSED(i_data); + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RD_e) { + e_rd_class* rd = (e_rd_class*)i_actor; if (rd->actor_set == 0) { - fopAcM_delete((fopAc_ac_c*)param_0); + fopAcM_delete((fopAc_ac_c*)i_actor); } } return NULL; @@ -3114,7 +3122,7 @@ static int rd_count; static void* s_rdcount_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RD_e) { if (((e_rd_class*)i_actor)->actor_set == 0 && (((e_rd_class*)i_actor)->arg1 == 1 || ((e_rd_class*)i_actor)->arg1 == 2)) { @@ -3126,10 +3134,10 @@ static void* s_rdcount_sub(void* i_actor, void* i_data) { static void* s_rddel2_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RD_e) { e_rd_class* rd = ((e_rd_class*)i_actor); - fopAc_ac_c* r28 = fopAcM_SearchByID(rd->boar_id); - if (r28 == i_data) { + fopAc_ac_c* actor = fopAcM_SearchByID(rd->boar_id); + if (actor == i_data) { fopAcM_delete((fopAc_ac_c*)i_actor); } } @@ -3137,29 +3145,29 @@ static void* s_rddel2_sub(void* i_actor, void* i_data) { } static void e_wb_crv_wait(e_wb_class* i_this) { - fopEn_enemy_c* a_this = &i_this->mEnemy; + fopEn_enemy_c* enemy = &i_this->enemy; cXyz unused, unused2; - fopAc_ac_c* player = dComIfGp_getPlayer(0); - fopAc_ac_c* king_bulblin = fopAcM_SearchByName(PROC_E_RDB); - i_this->field_0x6a0 = 0x14; + fopAc_ac_c* pla = dComIfGp_getPlayer(0); + fopAc_ac_c* rdb = fopAcM_SearchByName(fpcNm_E_RDB_e); + i_this->wait_timer = 20; - switch (i_this->mActionMode) { + switch (i_this->ride_mode) { case 0: anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); - i_this->mActionMode = 1; + i_this->ride_mode = 1; // fallthrough case 1: - if (player->current.pos.x > 482.0f && player->current.pos.x < 3100.0f && - player->current.pos.z > 0.0f && player->current.pos.z < 1500.0f) + if (pla->current.pos.x > 482.0f && pla->current.pos.x < 3100.0f && + pla->current.pos.z > 0.0f && pla->current.pos.z < 1500.0f) { - i_this->field_0x169e = 0x46; - i_this->mActionMode = 2; + i_this->demo_mode = 70; + i_this->ride_mode = 2; } break; case 2: - if (i_this->field_0x169e == 0 && player->current.pos.z > 550.0f) { - i_this->field_0x169e = 0x32; - i_this->mActionMode = 3; + if (i_this->demo_mode == 0 && pla->current.pos.z > 550.0f) { + i_this->demo_mode = 50; + i_this->ride_mode = 3; } break; case 3: @@ -3168,64 +3176,64 @@ static void e_wb_crv_wait(e_wb_class* i_this) { } static s8 e_wb_c_run(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - fopAc_ac_c* player = dComIfGp_getPlayer(0); - fopAc_ac_c* coach_ = fopAcM_SearchByName(PROC_NPC_COACH); - fopAc_ac_c* coach = coach_; - e_rd_class* rider = (e_rd_class*)fopAcM_SearchByID(i_this->field_0x1434); + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; + fopAc_ac_c* pla = dComIfGp_getPlayer(0); + fopAc_ac_c* coach = fopAcM_SearchByName(fpcNm_NPC_COACH_e); + fopAc_ac_c* coach_ = coach; + e_rd_class* rider = (e_rd_class*)fopAcM_SearchByID(i_this->rd_id); - cXyz sp94; - cXyz sp88; - f32 target_speed = 0.0f; - f32 f26 = 1.0f; + cXyz start; + cXyz end; + f32 speed = 0.0f; + f32 step_speed = 1.0f; int wall_check; s8 far_from_point = false; - s8 return_value = false; - f32 dist_x = -46137.0f - a_this->current.pos.x; - f32 dist_z = 81549.0f - a_this->current.pos.z; + s8 rt = false; + f32 x = -46137.0f - actor->current.pos.x; + f32 z = 81549.0f - actor->current.pos.z; - if (JMAFastSqrt(dist_x * dist_x + dist_z * dist_z) < KREG_F(7) + 5000.0f) { - far_from_point = true; + if (JMAFastSqrt(SQUARE(x) + SQUARE(z)) < KREG_F(7) + 5000.0f) { + far_from_point = true; } else { - dist_x = -7650.0f - a_this->current.pos.x; - dist_z = 56877.0f - a_this->current.pos.z; + x = -7650.0f - actor->current.pos.x; + z = 56877.0f - actor->current.pos.z; - if (JMAFastSqrt(dist_x * dist_x + dist_z * dist_z) < KREG_F(7) + 5000.0f) { - far_from_point = true; - } + if (JMAFastSqrt(SQUARE(x) + SQUARE(z)) < KREG_F(7) + 5000.0f) { + far_from_point = true; } +} wall_check = e_wb_lr_wall_check(i_this); - if ((i_this->mStatusFlags & 1) == 0) { - i_this->mActionID = ACT_A_RUN; - i_this->mActionMode = 0; - return return_value; + if ((i_this->status_flag & 1) == 0) { + i_this->action = ACT_A_RUN; + i_this->ride_mode = 0; + return rt; } - s16 sp10 = a_this->current.angle.y; - s16 turn_speed = 0x200; - s16 spC; + s16 angle = actor->current.angle.y; + s16 yaa = 0x200; + s16 ya; dBgS_LinChk lin_chk; - switch (i_this->mActionMode) { + switch (i_this->ride_mode) { case 0: { anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); - i_this->mActionMode = 1; - i_this->mStatusFlags |= (u16)0x20; + i_this->ride_mode = 1; + i_this->status_flag |= (u16)0x20; } // fallthrough case 1: { cXyz target_pos(-62943.0f, -9045.0f, 70997.0f); - sp94 = target_pos - a_this->current.pos; - a_this->current.angle.y = cM_atan2s(sp94.x, sp94.z); - sp94 = target_pos - coach_->current.pos; + start = target_pos - actor->current.pos; + actor->current.angle.y = cM_atan2s(start.x, start.z); + start = target_pos - coach->current.pos; - if (i_this->field_0x7a7 == 0 || JMAFastSqrt(sp94.x * sp94.x + sp94.z * sp94.z) < 500.0f) { - i_this->mActionMode = 2; + if (i_this->field_0x7a7 == 0 || JMAFastSqrt(start.x * start.x + start.z * start.z) < 500.0f) { + i_this->ride_mode = 2; i_this->field_0x7a7 = 0; - fopAcM_setStageLayer(a_this); + fopAcM_setStageLayer(actor); i_this->field_0x17e1 = 1; } } break; @@ -3233,59 +3241,59 @@ static s8 e_wb_c_run(e_wb_class* i_this) { case 2: { if (i_this->field_0x7a6 == 0) { anm_init(i_this, 0x1b, 3.0f, 0, 1.0f); - i_this->mActionMode = 0xb; - i_this->mAnimDuration = 40.0f; - i_this->mStatusFlags |= (u16)8; + i_this->ride_mode = 11; + i_this->anm_time = 40.0f; + i_this->status_flag |= (u16)8; } else { i_this->field_0x7a6 = 0; anm_init(i_this, 0x20, 5.0f, 2, 1.0f); - i_this->mpModelMorf->setFrame(cM_rndF(10.0f)); - i_this->mActionMode = 0xc; - i_this->mStatusFlags |= (u16)0x10; - i_this->mZ2Ride.startCreatureSound(Z2SE_EN_WB_KICK_GROUND, 0, -1); + i_this->anm_p->setFrame(cM_rndF(10.0f)); + i_this->ride_mode = 12; + i_this->status_flag |= (u16)0x10; + i_this->sound.startCreatureSound(Z2SE_EN_WB_KICK_GROUND, 0, -1); } } break; - case 0xb: { - if (i_this->mpModelMorf->checkFrame(3.0f)) { - i_this->mCollisionFlags |= (u8)2; - i_this->mMovementType = 10; - } else if (i_this->mpModelMorf->checkFrame(15.0f)) { - i_this->mCollisionFlags |= (u8)3; + case 11: { + if (i_this->anm_p->checkFrame(3.0f)) { + i_this->collision_flg |= (u8)2; + i_this->movement_type = 10; + } else if (i_this->anm_p->checkFrame(15.0f)) { + i_this->collision_flg |= (u8)3; } - if (i_this->mpModelMorf->isStop()) { + if (i_this->anm_p->isStop()) { anm_init(i_this, 0x20, 5.0f, 2, 1.0f); - i_this->mActionMode = 0xc; - i_this->mStatusFlags |= (u8)0x10; - i_this->mZ2Ride.startCreatureSound(Z2SE_EN_WB_KICK_GROUND, 0, -1); + i_this->ride_mode = 12; + i_this->status_flag |= (u8)0x10; + i_this->sound.startCreatureSound(Z2SE_EN_WB_KICK_GROUND, 0, -1); } } break; - case 0xc: { - i_this->mActionMode = 0xd; + case 12: { + i_this->ride_mode = 13; } // fallthrough - case 0xd: { - sp94 = a_this->current.pos; - sp94.y += 500.0f; - sp88 = coach_->eyePos; - sp88.y += 500.0f; - lin_chk.Set(&sp94, &sp88, a_this); + case 13: { + start = actor->current.pos; + start.y += 500.0f; + end = coach->eyePos; + end.y += 500.0f; + lin_chk.Set(&start, &end, actor); s8 behind_obstacle = false; if (dComIfG_Bgsp().LineCross(&lin_chk)) { - cXyz diff_field = i_this->field_0x5d0 - a_this->current.pos; - sp94 = player->eyePos - a_this->current.pos; - if (diff_field.abs() < sp94.abs()) { - sp88 = i_this->field_0x5d0; + cXyz diff_field = i_this->field_0x5d0 - actor->current.pos; + start = pla->eyePos - actor->current.pos; + if (diff_field.abs() < start.abs()) { + end = i_this->field_0x5d0; behind_obstacle = true; } else { - cMtx_YrotS(*calc_mtx, player->shape_angle.y); - sp88 = player->eyePos; + cMtx_YrotS(*calc_mtx, pla->shape_angle.y); + end = pla->eyePos; } } else { - cMtx_YrotS(*calc_mtx, coach_->shape_angle.y); - sp88 = coach_->current.pos; - i_this->field_0x5d0 = sp88; + cMtx_YrotS(*calc_mtx, coach->shape_angle.y); + end = coach->current.pos; + i_this->field_0x5d0 = end; } @@ -3303,134 +3311,134 @@ static s8 e_wb_c_run(e_wb_class* i_this) { }; if (far_from_point || wall_check != 0) { - sp94 = sh_posH[i_this->mParam2 - 1]; + start = sh_posH[i_this->arg1 - 1]; } else { - sp94 = sh_pos[i_this->mParam2 - 1]; - sp94.x += i_this->field_0x6c4; - sp94.z += i_this->field_0x7a8; + start = sh_pos[i_this->arg1 - 1]; + start.x += i_this->x_check; + start.z += i_this->pass; - if ((i_this->field_0x68e & 0x3f) == 0 && cM_rndF(1.0f) < 0.5f) { - i_this->field_0x7a8 = -cM_rndF(200.0f); - i_this->field_0x6c4 = cM_rndFX(100.0f); + if ((i_this->counter & 0x3f) == 0 && cM_rndF(1.0f) < 0.5f) { + i_this->pass = -cM_rndF(200.0f); + i_this->x_check = cM_rndFX(100.0f); } } } else { - sp94.set(0.0f, 0.0f, 0.0f); + start.set(0.0f, 0.0f, 0.0f); } - MtxPosition(&sp94, &i_this->field_0x5c4); - i_this->field_0x5c4 += sp88; + MtxPosition(&start, &i_this->eye); + i_this->eye += end; - sp94 = i_this->field_0x5c4 - a_this->current.pos; + start = i_this->eye - actor->current.pos; - f32 dist = JMAFastSqrt(sp94.x * sp94.x + sp94.z * sp94.z); + f32 dist = JMAFastSqrt(SQUARE(start.x) + SQUARE(start.z)); if (dist < 500.0f) { - target_speed = l_HIO.normal_speed_vi; - } else if (dist > 3000.0f && i_this->field_0x5bf) { - target_speed = l_HIO.mMaxSpeedVi; + speed = l_HIO.normal_speed_vi; + } else if (dist > 3000.0f && i_this->no_draw) { + speed = l_HIO.mMaxSpeedVi; } else { - target_speed = l_HIO.medium_speed_vi; + speed = l_HIO.medium_speed_vi; } - if ((i_this->mStatusFlags & 2) == 0) { - target_speed = 20.0f; - return_value = 1; + if ((i_this->status_flag & 2) == 0) { + speed = 20.0f; + rt = 1; } - turn_speed = 0x200; - i_this->mTargetFacingAngle = cM_atan2s(sp94.x, sp94.z); + yaa = 0x200; + i_this->target_ya = cM_atan2s(start.x, start.z); - if (rider && rider->anm == 0x27) { - ANGLE_ADD(i_this->mTargetFacingAngle, - (BREG_F(16) + 5000.0f) * cM_ssin(i_this->field_0x68e * (BREG_S(7) + 1000))); - turn_speed = 0x400; + if (rider && rider->anm == 39) { + ANGLE_ADD(i_this->target_ya, + (BREG_F(16) + 5000.0f) * cM_ssin(i_this->counter * (BREG_S(7) + 0x3E8))); + yaa = 0x400; } else if (wall_check != 0) { - ANGLE_ADD(i_this->mTargetFacingAngle, (BREG_S(8) + -8000) * wall_check); + ANGLE_ADD(i_this->target_ya, (BREG_S(8) + -0x1F40) * wall_check); } - cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mTargetFacingAngle, 8, turn_speed); - f32 anim_speed = a_this->speedF / 40.0f; + cLib_addCalcAngleS2(&actor->current.angle.y, i_this->target_ya, 8, yaa); + f32 anim_spd = actor->speedF / 40.0f; - if (anim_speed < 1.0f) { - anim_speed = 1.0f; + if (anim_spd < 1.0f) { + anim_spd = 1.0f; } - if (anim_speed > 1.3f) { - anim_speed = 1.3f; + if (anim_spd > 1.3f) { + anim_spd = 1.3f; } - i_this->mpModelMorf->setPlaySpeed(anim_speed); - i_this->mMovementType = 1; - i_this->mPursuitFlag = 1; + i_this->anm_p->setPlaySpeed(anim_spd); + i_this->movement_type = 1; + i_this->pursuit_flg = 1; } break; - case 0x14: { + case 20: { anm_init(i_this, 0x25, 3.0f, 2, 1.0f); - i_this->mActionMode = 0x15; + i_this->ride_mode = 21; } // fallthrough - case 0x15: + case 21: int unused; // needs to be here to match debug { - if (a_this->speedF > 15.0f) { - i_this->mMovementType = 2; - i_this->mZ2Ride.startCreatureSoundLevel(Z2SE_EN_WB_L_SLIP, 0, -1); + if (actor->speedF > 15.0f) { + i_this->movement_type = 2; + i_this->sound.startCreatureSoundLevel(Z2SE_EN_WB_L_SLIP, 0, -1); } else { anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); - i_this->mActionMode = 0x16; - i_this->mStatusFlags |= (u16)0x20; + i_this->ride_mode = 22; + i_this->status_flag |= (u16)0x20; } } break; } - if (i_this->mActionMode < 0x14) { - sp94.x = 4025.0f - coach_->current.pos.x; - sp94.z = 52319.0f - coach_->current.pos.z; + if (i_this->ride_mode < 20) { + start.x = 4025.0f - coach->current.pos.x; + start.z = 52319.0f - coach->current.pos.z; - if (coach_->speedF < 1.0f || - JMAFastSqrt(sp94.x * sp94.x + sp94.z * sp94.z) < 1500.0f) + if (coach->speedF < 1.0f || + JMAFastSqrt(SQUARE(start.x) + SQUARE(start.z)) < 1500.0f) { - sp94 = coach_->current.pos - a_this->current.pos; + start = coach->current.pos - actor->current.pos; - if (sp94.abs() < 1000.0f) { - i_this->mActionMode = 0x14; + if (start.abs() < 1000.0f) { + i_this->ride_mode = 20; } } } - cLib_addCalc2(&a_this->speedF, target_speed, 1.0f, f26); - spC = (TREG_S(7) + -8) * (a_this->current.angle.y - sp10); - cLib_addCalcAngleS2(&i_this->mBodyTiltAngle, spC, 8, 0x200); + cLib_addCalc2(&actor->speedF, speed, 1.0f, step_speed); + ya = (TREG_S(7) + -8) * (actor->current.angle.y - angle); + cLib_addCalcAngleS2(&i_this->body_angle, ya, 8, 0x200); - return return_value; + return rt; } static void action(e_wb_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this; - cXyz pos1; - cXyz pos2; - cLib_addCalcAngleS2(&i_this->mBodyTiltAngle, 0, 8, 0x100); + fopEn_enemy_c* actor = (fopEn_enemy_c*)i_this; + cXyz mae; + cXyz ato; + cLib_addCalcAngleS2(&i_this->body_angle, 0, 8, 0x100); - if (i_this->mActionID != 0x67) { + if (i_this->action != 103) { damage_check(i_this); } s8 cVar8 = false; - fopEn_enemy_c* a_this2 = a_this; - a_this2->offDownFlg(); + fopEn_enemy_c* enemy = actor; + enemy->offDownFlg(); if (lbl_244_bss_45 != 0 || lbl_244_bss_46 != 0) { - i_this->mSpeedCapTimer = gake_check(i_this); + i_this->gake_flg = gake_check(i_this); } - switch (i_this->mActionID) { + switch (i_this->action) { case ACT_WAIT: case ACT_WAIT2: e_wb_wait(i_this); - if (i_this->field_0x6a0 == 0) { + if (i_this->wait_timer == 0) { cVar8 = true; } @@ -3442,13 +3450,13 @@ static void action(e_wb_class* i_this) { e_wb_f_wait(i_this); break; case ACT_C_F_RUN: - if (i_this->mParam == 10) { + if (i_this->arg0 == 10) { cVar8 = e_wb_c_run(i_this); - fopAc_ac_c* v = dComIfGp_getPlayer(0); // unusued? + fopAc_ac_c* pla = dComIfGp_getPlayer(0); // unusued? - if (a_this->home.pos.y - a_this->current.pos.y > 4500.0f) { + if (actor->home.pos.y - actor->current.pos.y > 4500.0f) { OS_REPORT(" WB NARAKU DOWN \n"); - fopAcM_delete(a_this); + fopAcM_delete(actor); } } else { e_wb_f_run(i_this); @@ -3490,21 +3498,21 @@ static void action(e_wb_class* i_this) { break; case ACT_DAMAGE: if (e_wb_damage(i_this)) { - a_this2->onDownFlg(); + enemy->onDownFlg(); } cVar8 = true; break; case ACT_BG_DAMAGE: if (e_wb_bg_damage(i_this)) { - a_this2->onDownFlg(); + enemy->onDownFlg(); } cVar8 = true; break; case ACT_LR_DAMAGE: if (e_wb_lr_damage(i_this)) { - a_this2->onDownFlg(); + enemy->onDownFlg(); } cVar8 = true; @@ -3534,33 +3542,33 @@ static void action(e_wb_class* i_this) { e_wb_crv_wait(i_this); } - if (a_this->speedF > 10.0f) { - if (i_this->field_0x13e4 != 0xfd) { - i_this->field_0x13e4 = 0xfd; - i_this->mStts.Init(0xfd, 0, a_this); + if (actor->speedF > 10.0f) { + if (i_this->field_0x13e4 != 253) { + i_this->field_0x13e4 = 253; + i_this->Stts.Init(0xfd, 0, actor); } - } else if (i_this->field_0x13e4 != 0xdc) { - i_this->field_0x13e4 = 0xdc; - i_this->mStts.Init(0xdc, 0, a_this); + } else if (i_this->field_0x13e4 != 220) { + i_this->field_0x13e4 = 220; + i_this->Stts.Init(0xdc, 0, actor); } - a_this->attention_info.flags &= ~fopAc_AttnFlag_CARRY_e; + actor->attention_info.flags &= ~fopAc_AttnFlag_CARRY_e; if (lbl_244_bss_45 != 0) { - if (i_this->field_0x7a7 != 0 || (cVar8 && daPy_getPlayerActorClass()->checkHorseRide() && (dComIfGp_getHorseActor()->speedF >= 30.0f || i_this->field_0x7a6 != 0) && i_this->field_0x5bf != 0)) { + if (i_this->field_0x7a7 != 0 || (cVar8 && daPy_getPlayerActorClass()->checkHorseRide() && (dComIfGp_getHorseActor()->speedF >= 30.0f || i_this->field_0x7a6 != 0) && i_this->no_draw != 0)) { fpcM_Search(s_rddel2_sub, i_this); rd_count = 0; fpcM_Search(s_rdcount_sub, i_this); if (rd_count <= 8) { i_this->field_0x7a7 = 0; - i_this->mActionID = ACT_WAIT2; - i_this->mActionMode = 0; - i_this->field_0x6a0 = 0x1e; - i_this->mStatusFlags = 3; - i_this->field_0x6ae.set(0, 0, 0); + i_this->action = ACT_WAIT2; + i_this->ride_mode = 0; + i_this->wait_timer = 30; + i_this->status_flag = 3; + i_this->rotation.set(0, 0, 0); wb_rd_reset(i_this); - if (i_this->field_0x79d) { + if (i_this->leader) { OS_REPORT(" BB RESET \n"); } else { OS_REPORT(" WB RESET \n"); @@ -3571,39 +3579,39 @@ static void action(e_wb_class* i_this) { if (lbl_244_bss_47 != 0) { if (i_this->field_0x7a6 != 0 || (daPy_getPlayerActorClass()->checkHorseRide() && - dComIfGp_getHorseActor()->speedF >= 20.0f && cVar8 && i_this->field_0x5bf != 0)) { + dComIfGp_getHorseActor()->speedF >= 20.0f && cVar8 && i_this->no_draw != 0)) { fpcM_Search(s_rddel2_sub, i_this); rd_count = 0; fpcM_Search(s_rdcount_sub, i_this); if (rd_count <= 4) { i_this->field_0x7a6 = 0; - i_this->mActionID = ACT_WAIT2; - i_this->mActionMode = 0; - i_this->field_0x6a0 = 0x1e; - i_this->mStatusFlags = 3; - i_this->field_0x6ae.set(0, 0, 0); + i_this->action = ACT_WAIT2; + i_this->ride_mode = 0; + i_this->wait_timer = 30; + i_this->status_flag = 3; + i_this->rotation.set(0, 0, 0); wb_c_rd_reset(i_this); - i_this->field_0x68e = (s16)cM_rndF(65535.0f); + i_this->counter = (s16)cM_rndF(65535.0f); } } } - cMtx_YrotS(*calc_mtx, a_this->current.angle.y); - pos1.x = 0.0f; - pos1.y = 0.0f; - pos1.z = a_this->speedF; + cMtx_YrotS(*calc_mtx, actor->current.angle.y); + mae.x = 0.0f; + mae.y = 0.0f; + mae.z = actor->speedF; - MtxPosition(&pos1, &pos2); - a_this->speed.x = pos2.x; - a_this->speed.z = pos2.z; - a_this->current.pos += a_this->speed; - a_this->speed.y -= 5.0f; + MtxPosition(&mae, &ato); + actor->speed.x = ato.x; + actor->speed.z = ato.z; + actor->current.pos += actor->speed; + actor->speed.y -= 5.0f; - if (a_this->speed.y < -120.0f) - a_this->speed.y = -120.0f; + if (actor->speed.y < -120.0f) + actor->speed.y = -120.0f; - if (i_this->mActionID == ACT_WAIT && (i_this->mStatusFlags & 3) == 0 && + if (i_this->action == ACT_WAIT && (i_this->status_flag & 3) == 0 && // Bulblin Camp (strcmp(dComIfGp_getStartStageName(), "F_SP118") == 0 || // Gerudo Desert @@ -3611,42 +3619,42 @@ static void action(e_wb_class* i_this) { // Hyrule Castle strcmp(dComIfGp_getStartStageName(), "D_MN09") == 0)) { - int target_angle = abs((s16)(cLib_targetAngleY(&a_this->attention_info.position, + int range = abs((s16)(cLib_targetAngleY(&actor->attention_info.position, &dComIfGp_getPlayer(0)->current.pos) - - a_this->shape_angle.y)); + actor->shape_angle.y)); - if (target_angle < 0x6000 && target_angle > 0x3000) { - a_this->attention_info.flags |= fopAc_AttnFlag_ETC_e; + if (range < 0x6000 && range > 0x3000) { + actor->attention_info.flags |= fopAc_AttnFlag_ETC_e; } else { - a_this->attention_info.flags &= ~fopAc_AttnFlag_ETC_e; + actor->attention_info.flags &= ~fopAc_AttnFlag_ETC_e; } } else { - a_this->attention_info.flags &= ~fopAc_AttnFlag_ETC_e; + actor->attention_info.flags &= ~fopAc_AttnFlag_ETC_e; } s16 angle = 0; - if (i_this->mAnmID == 0x28) { - angle = (a_this->current.angle.y - a_this->old.angle.y) * (7 + VREG_S(2)); + if (i_this->anmID == 40) { + angle = (actor->current.angle.y - actor->old.angle.y) * (7 + VREG_S(2)); } cLib_addCalcAngleS2(&i_this->field_0x6d8, angle, 8, 0x400); - if (lbl_244_bss_45 != 0 && a_this->home.pos.y - a_this->current.pos.y > 5000.0f) { - i_this->mActionID = ACT_EVENT; - i_this->mActionMode = 0; - i_this->mStatusFlags |= (u16)0x40; - a_this->current.pos = a_this->home.pos; - a_this->old = a_this->current; + if (lbl_244_bss_45 != 0 && actor->home.pos.y - actor->current.pos.y > 5000.0f) { + i_this->action = ACT_EVENT; + i_this->ride_mode = 0; + i_this->status_flag |= (u16)0x40; + actor->current.pos = actor->home.pos; + actor->old = actor->current; } } static void* s_wbZrevise_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB) { - e_wb_class* a_this = static_cast(i_actor); - if (a_this->field_0x79d == 0) { - a_this->mEnemy.current.pos = a_this->mEnemy.home.pos; + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_WB_e) { + e_wb_class* i_this = static_cast(i_actor); + if (i_this->leader == 0) { + i_this->enemy.current.pos = i_this->enemy.home.pos; } } @@ -3655,10 +3663,10 @@ static void* s_wbZrevise_sub(void* i_actor, void* i_data) { static void* s_spd0_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB) { - e_wb_class* a_this = static_cast(i_actor); - if (a_this->field_0x79d == 0) { - a_this->mEnemy.speedF = 0.0f; + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_WB_e) { + e_wb_class* i_this = static_cast(i_actor); + if (i_this->leader == 0) { + i_this->enemy.speedF = 0.0f; } } @@ -3667,9 +3675,9 @@ static void* s_spd0_sub(void* i_actor, void* i_data) { static void* s_wbdel_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB) { - e_wb_class* a_this = static_cast(i_actor); - if (a_this->field_0x79d == 0) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_WB_e) { + e_wb_class* i_this = static_cast(i_actor); + if (i_this->leader == 0) { fopAcM_delete((fopAc_ac_c*)i_actor); } } @@ -3679,10 +3687,10 @@ static void* s_wbdel_sub(void* i_actor, void* i_data) { static void* s_rdArrowWait_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD) { - e_rd_class* a_this = static_cast(i_actor); - if (a_this->weapon_type == 2 || a_this->weapon_type == 3) { - a_this->timer[1] = cM_rndF(20.0) + 3.0f; + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RD_e) { + e_rd_class* i_this = static_cast(i_actor); + if (i_this->weapon_type == 2 || i_this->weapon_type == 3) { + i_this->timer[1] = cM_rndF(20.0) + 3.0f; } } @@ -3690,650 +3698,651 @@ static void* s_rdArrowWait_sub(void* i_actor, void* i_data) { } static void cam_3d_morf(e_wb_class* i_this, f32 i_scale) { - cLib_addCalc2(&i_this->field_0x16bc.x, i_this->field_0x16e0.x, i_scale, - i_this->field_0x16f8.x * i_this->field_0x1710); - cLib_addCalc2(&i_this->field_0x16bc.y, i_this->field_0x16e0.y, i_scale, - i_this->field_0x16f8.y * i_this->field_0x1710); - cLib_addCalc2(&i_this->field_0x16bc.z, i_this->field_0x16e0.z, i_scale, - i_this->field_0x16f8.z * i_this->field_0x1710); - cLib_addCalc2(&i_this->field_0x16a4.x, i_this->field_0x16d4.x, i_scale, - i_this->field_0x16ec.x * i_this->field_0x1710); - cLib_addCalc2(&i_this->field_0x16a4.y, i_this->field_0x16d4.y, i_scale, - i_this->field_0x16ec.y * i_this->field_0x1710); - cLib_addCalc2(&i_this->field_0x16a4.z, i_this->field_0x16d4.z, i_scale, - i_this->field_0x16ec.z * i_this->field_0x1710); + cLib_addCalc2(&i_this->demo_cam_ctr.x, i_this->demo_cam_way.x, i_scale, + i_this->demo_cam_way_spd.x * i_this->demo_cam_morf); + cLib_addCalc2(&i_this->demo_cam_ctr.y, i_this->demo_cam_way.y, i_scale, + i_this->demo_cam_way_spd.y * i_this->demo_cam_morf); + cLib_addCalc2(&i_this->demo_cam_ctr.z, i_this->demo_cam_way.z, i_scale, + i_this->demo_cam_way_spd.z * i_this->demo_cam_morf); + cLib_addCalc2(&i_this->demo_cam_eye.x, i_this->demo_cam_target.x, i_scale, + i_this->demo_cam_eye_spd.x * i_this->demo_cam_morf); + cLib_addCalc2(&i_this->demo_cam_eye.y, i_this->demo_cam_target.y, i_scale, + i_this->demo_cam_eye_spd.y * i_this->demo_cam_morf); + cLib_addCalc2(&i_this->demo_cam_eye.z, i_this->demo_cam_target.z, i_scale, + i_this->demo_cam_eye_spd.z * i_this->demo_cam_morf); } static void demo_camera(e_wb_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this; - camera_process_class* local_184 = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_process_class* local_188 = dComIfGp_getCamera(0); - daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + fopEn_enemy_c* enemy = (fopEn_enemy_c*)i_this; + camera_process_class* cam = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* cam0 = dComIfGp_getCamera(0); + daPy_py_c* pla = (daPy_py_c*)dComIfGp_getPlayer(0); daHorse_c* horse; - e_rd_class* local_194; - e_rdb_class* rdb; - if (i_this->field_0x169e != 0) { + e_rd_class* rider; + e_rdb_class* boss; + if (i_this->demo_mode != 0) { horse = (daHorse_c*)dComIfGp_getHorseActor(); - local_194 = (e_rd_class*)fopAcM_SearchByID(i_this->field_0x1434); - rdb = (e_rdb_class*)fopAcM_SearchByName(PROC_E_RDB); + rider = (e_rd_class*)fopAcM_SearchByID(i_this->rd_id); + boss = (e_rdb_class*)fopAcM_SearchByName(fpcNm_E_RDB_e); } - cXyz local_3c, cStack_48, cStack_54, cStack_60; + cXyz mae, ato, eye, center; - switch (i_this->field_0x169e) { + switch (i_this->demo_mode) { case 1: { - if (!a_this->eventInfo.checkCommandDemoAccrpt()) { - fopAcM_orderPotentialEvent(a_this, 2, 0xffff, 0); - a_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e); + if (!enemy->eventInfo.checkCommandDemoAccrpt()) { + fopAcM_orderPotentialEvent(enemy, 2, 0xffff, 0); + enemy->eventInfo.onCondition(dEvtCnd_CANDEMO_e); return; } - local_184->mCamera.Stop(); - i_this->field_0x169e = 2; - i_this->field_0x16a0 = 0; - i_this->field_0x1714 = 55.0f; - i_this->field_0x16a0 = 0; - i_this->field_0x1708 = 800.0f + ZREG_F(1); - local_184->mCamera.SetTrimSize(3); - a_this->current.pos.set(34800.0f, -66.0f, -604.0f); - a_this->current.angle.y = 0x8000; - a_this->shape_angle = a_this->current.angle; - a_this->old = a_this->current; - i_this->field_0x1704 = 0x2000 + XREG_S(0); + cam->mCamera.Stop(); + i_this->demo_mode = 2; + i_this->demo_timer = 0; + i_this->demo_cam_zoom = 55.0f; + i_this->demo_timer = 0; + i_this->demo_cam_eye_z = 800.0f + ZREG_F(1); + cam->mCamera.SetTrimSize(3); + enemy->current.pos.set(34800.0f, -66.0f, -604.0f); + enemy->current.angle.y = 0x8000; + enemy->shape_angle = enemy->current.angle; + enemy->old = enemy->current; + i_this->demo_cam_ya = 0x2000 + XREG_S(0); daPy_getPlayerActorClass()->changeOriginalDemo(); horse->changeOriginalDemo(); fpcM_Search(s_wbdel_sub, i_this); - dComIfGp_getEvent()->startCheckSkipEdge(a_this); + dComIfGp_getEvent()->startCheckSkipEdge(enemy); } // fallthrough case 2: { - if (i_this->field_0x16a0 == 160 + JREG_S(5)) { - cStack_48.set(34700.0f, -66.0f, 7896.0f + JREG_F(18)); - horse->setHorsePosAndAngle(&cStack_48, -0x8000); + if (i_this->demo_timer == 160 + JREG_S(5)) { + ato.set(34700.0f, -66.0f, 7896.0f + JREG_F(18)); + horse->setHorsePosAndAngle(&ato, -0x8000); horse->changeDemoMode(4, 0); - cStack_48.set(34900.0f, -280.0f, -18048.0f); - horse->changeDemoPos0(&cStack_48); + ato.set(34900.0f, -280.0f, -18048.0f); + horse->changeDemoPos0(&ato); } - cLib_addCalc2(&i_this->field_0x1708, 1200.0f + ZREG_F(3), 0.05f, 3.0f); - mDoMtx_stack_c::YrotS(a_this->shape_angle.y + i_this->field_0x1704); - local_3c.x = 0.0f; - local_3c.y = 300.0f + ZREG_F(0); - local_3c.z = i_this->field_0x1708; - mDoMtx_stack_c::multVec(&local_3c, &i_this->field_0x16a4); - i_this->field_0x16a4 += a_this->current.pos; - cLib_addCalcAngleS2(&i_this->field_0x1704, 0x7800, 0x20, 0xa0); - if (i_this->field_0x16a0 == 0) { - i_this->field_0x16bc = a_this->current.pos; - i_this->field_0x16bc.y += 400.0f + ZREG_F(2); + cLib_addCalc2(&i_this->demo_cam_eye_z, 1200.0f + ZREG_F(3), 0.05f, 3.0f); + mDoMtx_stack_c::YrotS(enemy->shape_angle.y + i_this->demo_cam_ya); + mae.x = 0.0f; + mae.y = 300.0f + ZREG_F(0); + mae.z = i_this->demo_cam_eye_z; + mDoMtx_stack_c::multVec(&mae, &i_this->demo_cam_eye); + i_this->demo_cam_eye += enemy->current.pos; + cLib_addCalcAngleS2(&i_this->demo_cam_ya, 0x7800, 0x20, 0xa0); + if (i_this->demo_timer == 0) { + i_this->demo_cam_ctr = enemy->current.pos; + i_this->demo_cam_ctr.y += 400.0f + ZREG_F(2); } else { - cLib_addCalc2(&i_this->field_0x16bc.x, a_this->current.pos.x, 0.5f, 200.0f); - cLib_addCalc2(&i_this->field_0x16bc.y, - 200.0f + a_this->current.pos.y + 200.0f + ZREG_F(2), 0.5f, 200.0f); - cLib_addCalc2(&i_this->field_0x16bc.z, a_this->current.pos.z, 0.5f, 200.0f); + cLib_addCalc2(&i_this->demo_cam_ctr.x, enemy->current.pos.x, 0.5f, 200.0f); + cLib_addCalc2(&i_this->demo_cam_ctr.y, + 200.0f + enemy->current.pos.y + 200.0f + ZREG_F(2), 0.5f, 200.0f); + cLib_addCalc2(&i_this->demo_cam_ctr.z, enemy->current.pos.z, 0.5f, 200.0f); } - if (i_this->field_0x16a0 == 0xdc) { - i_this->field_0x169e = 3; - i_this->field_0x16a0 = 0; - i_this->field_0x1708 = 1100.0f + ZREG_F(9); - i_this->field_0x1704 = 0x1000 + XREG_S(8); + if (i_this->demo_timer == 220) { + i_this->demo_mode = 3; + i_this->demo_timer = 0; + i_this->demo_cam_eye_z = 1100.0f + ZREG_F(9); + i_this->demo_cam_ya = 0x1000 + XREG_S(8); } } break; case 3: { - mDoMtx_stack_c::YrotS(player->shape_angle.y + i_this->field_0x1704); - local_3c.x = 0.0f; - local_3c.y = 0.0f + ZREG_F(10); - local_3c.z = i_this->field_0x1708; - mDoMtx_stack_c::multVec(&local_3c, &i_this->field_0x16a4); - i_this->field_0x16a4 += player->current.pos; - i_this->field_0x16bc = player->current.pos; - i_this->field_0x16bc.y += ZREG_F(11) - 50.0f; - cLib_addCalc2(&i_this->field_0x1708, 500.0f, 0.05f, 10.0f); - if (i_this->field_0x16a0 != 0x46) { + mDoMtx_stack_c::YrotS(pla->shape_angle.y + i_this->demo_cam_ya); + mae.x = 0.0f; + mae.y = 0.0f + ZREG_F(10); + mae.z = i_this->demo_cam_eye_z; + mDoMtx_stack_c::multVec(&mae, &i_this->demo_cam_eye); + i_this->demo_cam_eye += pla->current.pos; + i_this->demo_cam_ctr = pla->current.pos; + i_this->demo_cam_ctr.y += ZREG_F(11) - 50.0f; + cLib_addCalc2(&i_this->demo_cam_eye_z, 500.0f, 0.05f, 10.0f); + if (i_this->demo_timer != 70) { break; } - i_this->field_0x169e = 4; - i_this->field_0x16a0 = 0; + i_this->demo_mode = 4; + i_this->demo_timer = 0; } // fallthrough case 4: { - i_this->field_0x1708 = 1200.0f + ZREG_F(3); - mDoMtx_stack_c::YrotS(a_this->shape_angle.y - 0x7800); - local_3c.x = 0.0f; - local_3c.y = 300.0f + ZREG_F(0); - local_3c.z = i_this->field_0x1708; - mDoMtx_stack_c::multVec(&local_3c, &i_this->field_0x16a4); - i_this->field_0x16a4.x += a_this->current.pos.x; - i_this->field_0x16a4.y += -300.0f; - i_this->field_0x16a4.z += a_this->current.pos.z; - i_this->field_0x16bc.x = a_this->current.pos.x; - i_this->field_0x16bc.z = a_this->current.pos.z; - if (i_this->field_0x16a0 == 0) { - i_this->field_0x16bc.y = a_this->current.pos.y + 200.0f + 200.0f + ZREG_F(2); + i_this->demo_cam_eye_z = 1200.0f + ZREG_F(3); + mDoMtx_stack_c::YrotS(enemy->shape_angle.y - 0x7800); + mae.x = 0.0f; + mae.y = 300.0f + ZREG_F(0); + mae.z = i_this->demo_cam_eye_z; + mDoMtx_stack_c::multVec(&mae, &i_this->demo_cam_eye); + i_this->demo_cam_eye.x += enemy->current.pos.x; + i_this->demo_cam_eye.y += -300.0f; + i_this->demo_cam_eye.z += enemy->current.pos.z; + i_this->demo_cam_ctr.x = enemy->current.pos.x; + i_this->demo_cam_ctr.z = enemy->current.pos.z; + if (i_this->demo_timer == 0) { + i_this->demo_cam_ctr.y = enemy->current.pos.y + 200.0f + 200.0f + ZREG_F(2); } else { - cLib_addCalc2(&i_this->field_0x16bc.y, - a_this->current.pos.y + 200.0f + 200.0f + ZREG_F(2), 0.1f, 20.0f); + cLib_addCalc2(&i_this->demo_cam_ctr.y, + enemy->current.pos.y + 200.0f + 200.0f + ZREG_F(2), 0.1f, 20.0f); } - if (i_this->field_0x16a0 != 0x8c) { + if (i_this->demo_timer != 140) { break; } - i_this->field_0x169e = 5; - i_this->field_0x16a0 = 0; - i_this->field_0x1708 = 350.0f + ZREG_F(9); - i_this->field_0x170c = 50.0f; + i_this->demo_mode = 5; + i_this->demo_timer = 0; + i_this->demo_cam_eye_z = 350.0f + ZREG_F(9); + i_this->demo_cam_eye_x = 50.0f; } // fallthrough case 5: case 6: { - i_this->field_0x1704 = 0x7800 + XREG_S(3); - mDoMtx_stack_c::YrotS(player->shape_angle.y + i_this->field_0x1704); - local_3c.x = i_this->field_0x170c; - local_3c.y = 0.0f; - local_3c.z = i_this->field_0x1708; - mDoMtx_stack_c::multVec(&local_3c, &i_this->field_0x16a4); - i_this->field_0x16a4.x += player->current.pos.x; - i_this->field_0x16a4.z += player->current.pos.z; - i_this->field_0x16a4.y = 50.0f + ZREG_F(10); - if (i_this->field_0x16a0 == 0) { - i_this->field_0x16bc = player->current.pos; - i_this->field_0x16bc.y += ZREG_F(11) - 50.0f + 50.0f; + i_this->demo_cam_ya = 0x7800 + XREG_S(3); + mDoMtx_stack_c::YrotS(pla->shape_angle.y + i_this->demo_cam_ya); + mae.x = i_this->demo_cam_eye_x; + mae.y = 0.0f; + mae.z = i_this->demo_cam_eye_z; + mDoMtx_stack_c::multVec(&mae, &i_this->demo_cam_eye); + i_this->demo_cam_eye.x += pla->current.pos.x; + i_this->demo_cam_eye.z += pla->current.pos.z; + i_this->demo_cam_eye.y = 50.0f + ZREG_F(10); + if (i_this->demo_timer == 0) { + i_this->demo_cam_ctr = pla->current.pos; + i_this->demo_cam_ctr.y += ZREG_F(11) - 50.0f + 50.0f; } else { - i_this->field_0x16bc.x = player->current.pos.x; - i_this->field_0x16bc.z = player->current.pos.z; - f32 dVar13 = player->current.pos.y + ZREG_F(11) - 50.0f + 50.0f; - if (dVar13 > 150.0f) { - dVar13 = 150.0f; + i_this->demo_cam_ctr.x = pla->current.pos.x; + i_this->demo_cam_ctr.z = pla->current.pos.z; + f32 y = pla->current.pos.y + ZREG_F(11) - 50.0f + 50.0f; + if (y > 150.0f) { + y = 150.0f; } - cLib_addCalc2(&i_this->field_0x16bc.y, dVar13, 0.2f + ZREG_F(12), 30.0f + ZREG_F(13)); + cLib_addCalc2(&i_this->demo_cam_ctr.y, y, 0.2f + ZREG_F(12), 30.0f + ZREG_F(13)); } - cLib_addCalc2(&i_this->field_0x1708, 800.0f, 0.05f, 5.0f); - cLib_addCalc2(&i_this->field_0x170c, -50.0f, 0.05f, 1.2f); - if (i_this->field_0x169e == 5 && player->current.pos.z < -14500.0f + KREG_F(12)) { + cLib_addCalc2(&i_this->demo_cam_eye_z, 800.0f, 0.05f, 5.0f); + cLib_addCalc2(&i_this->demo_cam_eye_x, -50.0f, 0.05f, 1.2f); + if (i_this->demo_mode == 5 && pla->current.pos.z < -14500.0f + KREG_F(12)) { horse->changeDemoMode(7, 0); horse->onDemoJumpDistance(600.0f + BREG_F(18), 100.0f + BREG_F(19)); - i_this->field_0x169e = 6; + i_this->demo_mode = 6; } - if (i_this->field_0x16a0 == 0x4b) { + if (i_this->demo_timer == 75) { dComIfGp_setNextStage("F_SP102", 1, 0, 4); } } break; case 10: { - if (!a_this->eventInfo.checkCommandDemoAccrpt()) { - fopAcM_orderPotentialEvent(a_this, 2, 0xffff, 0); - a_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e); + if (!enemy->eventInfo.checkCommandDemoAccrpt()) { + fopAcM_orderPotentialEvent(enemy, 2, 0xffff, 0); + enemy->eventInfo.onCondition(dEvtCnd_CANDEMO_e); return; } - local_184->mCamera.Stop(); - local_184->mCamera.SetTrimSize(3); - i_this->field_0x169e = 0xb; - i_this->field_0x16a0 = 0; - i_this->field_0x1714 = 55.0f + KREG_F(7); - i_this->field_0x16a0 = 0; - s16 sp16 = local_194->enemy.shape_angle.y + - (local_194->jump_angle.y - local_194->enemy.shape_angle.y) / 2; - mDoMtx_stack_c::YrotS(sp16); - local_3c.x = NREG_F(0); - local_3c.y = NREG_F(1) + 500.0f; - local_3c.z = NREG_F(2) - 500.0f; - mDoMtx_stack_c::multVec(&local_3c, &i_this->field_0x16a4); - i_this->field_0x16a4 += local_194->enemy.current.pos; - i_this->field_0x1710 = 10.0f; - i_this->field_0x16bc = local_194->enemy.current.pos; - i_this->field_0x16bc.y += 200.0f + KREG_F(11); + cam->mCamera.Stop(); + cam->mCamera.SetTrimSize(3); + i_this->demo_mode = 11; + i_this->demo_timer = 0; + i_this->demo_cam_zoom = 55.0f + KREG_F(7); + i_this->demo_timer = 0; + s16 ya = rider->enemy.shape_angle.y + + (rider->jump_angle.y - rider->enemy.shape_angle.y) / 2; + mDoMtx_stack_c::YrotS(ya); + mae.x = NREG_F(0); + mae.y = NREG_F(1) + 500.0f; + mae.z = NREG_F(2) - 500.0f; + mDoMtx_stack_c::multVec(&mae, &i_this->demo_cam_eye); + i_this->demo_cam_eye += rider->enemy.current.pos; + i_this->demo_cam_morf = 10.0f; + i_this->demo_cam_ctr = rider->enemy.current.pos; + i_this->demo_cam_ctr.y += 200.0f + KREG_F(11); daPy_getPlayerActorClass()->changeOriginalDemo(); horse->changeOriginalDemo(); } // fallthrough - case 0xb: { - cLib_addCalc2(&i_this->field_0x1710, 1000.0f, 1.0f, 100.0f + KREG_F(10)); - cLib_addCalc2(&i_this->field_0x16bc.x, local_194->enemy.current.pos.x, 0.5f + KREG_F(8), - i_this->field_0x1710); - cLib_addCalc2(&i_this->field_0x16bc.y, local_194->enemy.current.pos.y + 200.0f + KREG_F(11), - 0.5f + KREG_F(8), i_this->field_0x1710); - cLib_addCalc2(&i_this->field_0x16bc.z, local_194->enemy.current.pos.z, 0.5f + KREG_F(8), - i_this->field_0x1710); - cLib_addCalc2(&i_this->field_0x16a4.x, local_194->enemy.current.pos.x, 0.05f, + case 11: { + cLib_addCalc2(&i_this->demo_cam_morf, 1000.0f, 1.0f, 100.0f + KREG_F(10)); + cLib_addCalc2(&i_this->demo_cam_ctr.x, rider->enemy.current.pos.x, 0.5f + KREG_F(8), + i_this->demo_cam_morf); + cLib_addCalc2(&i_this->demo_cam_ctr.y, rider->enemy.current.pos.y + 200.0f + KREG_F(11), + 0.5f + KREG_F(8), i_this->demo_cam_morf); + cLib_addCalc2(&i_this->demo_cam_ctr.z, rider->enemy.current.pos.z, 0.5f + KREG_F(8), + i_this->demo_cam_morf); + cLib_addCalc2(&i_this->demo_cam_eye.x, rider->enemy.current.pos.x, 0.05f, 12.0f + NREG_F(3)); - if (i_this->field_0x16a0 == 0x28) { - if (a_this->shape_angle.y < 0x4000 && -0x4000 < a_this->shape_angle.y) { - cStack_48.set(34800.0f, -300.0f, -26400.0f); - horse->setHorsePosAndAngle(&cStack_48, player->shape_angle.y); + if (i_this->demo_timer == 40) { + if (enemy->shape_angle.y < 0x4000 && -0x4000 < enemy->shape_angle.y) { + ato.set(34800.0f, -300.0f, -26400.0f); + horse->setHorsePosAndAngle(&ato, pla->shape_angle.y); horse->changeDemoMode(3, 0); - cStack_48.set(34800.0f, -300.0f, -36400.0f); - horse->changeDemoPos0(&cStack_48); + ato.set(34800.0f, -300.0f, -36400.0f); + horse->changeDemoPos0(&ato); } else { - cStack_48.set(34800.0f, -300.0f, -26400.0f); - horse->setHorsePosAndAngle(&cStack_48, player->shape_angle.y); + ato.set(34800.0f, -300.0f, -26400.0f); + horse->setHorsePosAndAngle(&ato, pla->shape_angle.y); horse->changeDemoMode(3, 0); - cStack_48.set(34800.0f, -300.0f, -16400.0f); - horse->changeDemoPos0(&cStack_48); + ato.set(34800.0f, -300.0f, -16400.0f); + horse->changeDemoPos0(&ato); } } - if (i_this->field_0x16a0 >= 40 && i_this->field_0x16a0 < 87) { - a_this->current.pos.y = 5000.0f; - a_this->current.pos.z = -18000.0f; - a_this->speedF = 0.0f; + if (i_this->demo_timer >= 40 && i_this->demo_timer < 87) { + enemy->current.pos.y = 5000.0f; + enemy->current.pos.z = -18000.0f; + enemy->speedF = 0.0f; } - if (i_this->field_0x16a0 == 0x57) { - a_this->current.pos.y = -300.0f; - if (a_this->shape_angle.y < 0x4000 && -0x4000 < a_this->shape_angle.y) { - a_this->current.pos.z = -25000.0f - KREG_F(16); + if (i_this->demo_timer == 87) { + enemy->current.pos.y = -300.0f; + if (enemy->shape_angle.y < 0x4000 && -0x4000 < enemy->shape_angle.y) { + enemy->current.pos.z = -25000.0f - KREG_F(16); } else { - a_this->current.pos.z = -27800.0f + KREG_F(16); + enemy->current.pos.z = -27800.0f + KREG_F(16); } - a_this->speedF = l_HIO.mSingleRiderSpeed; + enemy->speedF = l_HIO.mSingleRiderSpeed; } - if (i_this->field_0x16a0 == 0x5a) { - i_this->field_0x16bc.set(48545.0f, -1884.0f, -27557.0f); - i_this->field_0x16a4.set(49099.0f, -1884.0f, -27626.0f); - i_this->field_0x169e = 0xc; - i_this->field_0x16a0 = 0; - i_this->field_0x1714 = 45.0f; - fopAc_ac_c* local_19c = fopAcM_SearchByID(i_this->field_0x1434); - local_19c->current.pos.z = -26400.0f; - local_19c->current.pos.y = -3500.0f + KREG_F(18); - local_19c->current.pos.x = 34800.0f; - local_19c->speed.set(0.0f, -50.0f, 0.0f); - local_19c->speedF = 0.0f; + if (i_this->demo_timer == 90) { + i_this->demo_cam_ctr.set(48545.0f, -1884.0f, -27557.0f); + i_this->demo_cam_eye.set(49099.0f, -1884.0f, -27626.0f); + i_this->demo_mode = 12; + i_this->demo_timer = 0; + i_this->demo_cam_zoom = 45.0f; + fopAc_ac_c* rd = fopAcM_SearchByID(i_this->rd_id); + rd->current.pos.z = -26400.0f; + rd->current.pos.y = -3500.0f + KREG_F(18); + rd->current.pos.x = 34800.0f; + rd->speed.set(0.0f, -50.0f, 0.0f); + rd->speedF = 0.0f; } if (!daPy_getPlayerActorClass()->checkHorseRide()) { - local_184->mCamera.Start(); - local_184->mCamera.SetTrimSize(0); + cam->mCamera.Start(); + cam->mCamera.SetTrimSize(0); dComIfGp_event_reset(); daPy_getPlayerActorClass()->cancelOriginalDemo(); - i_this->field_0x169e = 0; + i_this->demo_mode = 0; } } break; - case 0xc: { - cLib_addCalc2(&i_this->field_0x1714, 55.0f, 0.05f, 0.1f); - if (i_this->field_0x16a0 == 0x5a) { + case 12: { + cLib_addCalc2(&i_this->demo_cam_zoom, 55.0f, 0.05f, 0.1f); + if (i_this->demo_timer == 90) { Z2GetAudioMgr()->bgmStreamPrepare(0x2000010); Z2GetAudioMgr()->bgmStreamPlay(); + /*Horseback battle clear*/ dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[85]); dComIfGp_setNextStage("F_SP102", 0x14, 0, 8); } } break; - case 0x14: { - if (!a_this->eventInfo.checkCommandDemoAccrpt()) { - fopAcM_orderPotentialEvent(a_this, 2, 0xffff, 0); - a_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e); + case 20: { + if (!enemy->eventInfo.checkCommandDemoAccrpt()) { + fopAcM_orderPotentialEvent(enemy, 2, 0xffff, 0); + enemy->eventInfo.onCondition(dEvtCnd_CANDEMO_e); return; } - local_184->mCamera.Stop(); - local_184->mCamera.SetTrimSize(3); - i_this->field_0x169e = 0x15; - i_this->field_0x16a0 = 0; - i_this->field_0x1714 = 55.0f; - i_this->field_0x16a0 = 0; - mDoMtx_stack_c::YrotS(player->shape_angle.y); - local_3c.x = -500.0f + ZREG_F(8); - local_3c.y = 100.0f + ZREG_F(9); - local_3c.z = 0.0f + ZREG_F(10); - mDoMtx_stack_c::multVec(&local_3c, &i_this->field_0x16a4); - i_this->field_0x16a4 += player->current.pos; - i_this->field_0x1710 = 0; - i_this->field_0x16bc = a_this->current.pos; - i_this->field_0x16bc.y += 300.0f + ZREG_F(11); + cam->mCamera.Stop(); + cam->mCamera.SetTrimSize(3); + i_this->demo_mode = 21; + i_this->demo_timer = 0; + i_this->demo_cam_zoom = 55.0f; + i_this->demo_timer = 0; + mDoMtx_stack_c::YrotS(pla->shape_angle.y); + mae.x = -500.0f + ZREG_F(8); + mae.y = 100.0f + ZREG_F(9); + mae.z = 0.0f + ZREG_F(10); + mDoMtx_stack_c::multVec(&mae, &i_this->demo_cam_eye); + i_this->demo_cam_eye += pla->current.pos; + i_this->demo_cam_morf = 0; + i_this->demo_cam_ctr = enemy->current.pos; + i_this->demo_cam_ctr.y += 300.0f + ZREG_F(11); horse->changeOriginalDemo(); horse->changeDemoMode(6, 0); } // fallthrough - case 0x15: { - s16 local_1cc; + case 21: { + s16 angle; if (horse->shape_angle.y < 0x4000 && -0x4000 < horse->shape_angle.y) { - local_1cc = 0; + angle = 0; } else { - local_1cc = -0x8000; + angle = -0x8000; } - horse->setHorsePosAndAngle(&horse->current.pos, local_1cc); - cLib_addCalc2(&i_this->field_0x16bc.x, a_this->current.pos.x, 0.8f, 100.0f); - cLib_addCalc2(&i_this->field_0x16bc.y, (a_this->current.pos.y + 300.0f + ZREG_F(11)), 0.8f, + horse->setHorsePosAndAngle(&horse->current.pos, angle); + cLib_addCalc2(&i_this->demo_cam_ctr.x, enemy->current.pos.x, 0.8f, 100.0f); + cLib_addCalc2(&i_this->demo_cam_ctr.y, (enemy->current.pos.y + 300.0f + ZREG_F(11)), 0.8f, 100.0f); - cLib_addCalc2(&i_this->field_0x16bc.z, a_this->current.pos.z, 0.8f, 100.0f); - if (i_this->field_0x16a0 == (s16)(20 + ZREG_S(8))) { - local_184->mCamera.Start(); - local_184->mCamera.SetTrimSize(0); + cLib_addCalc2(&i_this->demo_cam_ctr.z, enemy->current.pos.z, 0.8f, 100.0f); + if (i_this->demo_timer == (s16)(20 + ZREG_S(8))) { + cam->mCamera.Start(); + cam->mCamera.SetTrimSize(0); dComIfGp_event_reset(); - i_this->field_0x169e = 0; + i_this->demo_mode = 0; } break; } - case 0x19: { - if (!a_this->eventInfo.checkCommandDemoAccrpt()) { - fopAcM_orderPotentialEvent(a_this, 2, 0xffff, 0); - a_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e); + case 25: { + if (!enemy->eventInfo.checkCommandDemoAccrpt()) { + fopAcM_orderPotentialEvent(enemy, 2, 0xffff, 0); + enemy->eventInfo.onCondition(dEvtCnd_CANDEMO_e); return; } - local_184->mCamera.Stop(); - local_184->mCamera.SetTrimSize(3); - i_this->field_0x169e = 0x1a; - i_this->field_0x16a0 = 0; - i_this->field_0x1714 = 55.0f; - i_this->field_0x16a0 = 0; + cam->mCamera.Stop(); + cam->mCamera.SetTrimSize(3); + i_this->demo_mode = 26; + i_this->demo_timer = 0; + i_this->demo_cam_zoom = 55.0f; + i_this->demo_timer = 0; horse->changeOriginalDemo(); horse->changeDemoMode(6, 0); - s16 angleDiff = a_this->shape_angle.y - fopAcM_searchPlayerAngleY(a_this); + s16 angleDiff = enemy->shape_angle.y - fopAcM_searchPlayerAngleY(enemy); if (angleDiff < 0) { - i_this->field_0x170c = 200.0f; + i_this->demo_cam_eye_x = 200.0f; } else { - i_this->field_0x170c = -200.0f; + i_this->demo_cam_eye_x = -200.0f; } } // fallthrough - case 0x1a: { - mDoMtx_stack_c::YrotS(a_this->shape_angle.y); - local_3c.x = i_this->field_0x170c; - local_3c.y = 300.0f + ZREG_F(9); - local_3c.z = 300.0f + ZREG_F(10); - mDoMtx_stack_c::multVec(&local_3c, &i_this->field_0x16a4); - i_this->field_0x16a4 += a_this->current.pos; - i_this->field_0x16bc = a_this->current.pos; - i_this->field_0x16bc.y += 400.0f + ZREG_F(11); - if (i_this->field_0x16a0 == (s16)(15 + ZREG_S(8))) { - cMtx_YrotS(*calc_mtx, player->shape_angle.y); - local_3c.x = 0.0f; - local_3c.y = 400.0f + JREG_F(1); - local_3c.z = -600.0f + JREG_F(2); - MtxPosition(&local_3c, &i_this->field_0x16a4); - i_this->field_0x16a4 += player->current.pos; - i_this->field_0x16bc = player->current.pos; - i_this->field_0x16bc.y += 120.0f; - local_184->mCamera.Reset(i_this->field_0x16bc, i_this->field_0x16a4, - i_this->field_0x1714, 0); - local_184->mCamera.Start(); - local_184->mCamera.SetTrimSize(0); + case 26: { + mDoMtx_stack_c::YrotS(enemy->shape_angle.y); + mae.x = i_this->demo_cam_eye_x; + mae.y = 300.0f + ZREG_F(9); + mae.z = 300.0f + ZREG_F(10); + mDoMtx_stack_c::multVec(&mae, &i_this->demo_cam_eye); + i_this->demo_cam_eye += enemy->current.pos; + i_this->demo_cam_ctr = enemy->current.pos; + i_this->demo_cam_ctr.y += 400.0f + ZREG_F(11); + if (i_this->demo_timer == (s16)(15 + ZREG_S(8))) { + cMtx_YrotS(*calc_mtx, pla->shape_angle.y); + mae.x = 0.0f; + mae.y = 400.0f + JREG_F(1); + mae.z = -600.0f + JREG_F(2); + MtxPosition(&mae, &i_this->demo_cam_eye); + i_this->demo_cam_eye += pla->current.pos; + i_this->demo_cam_ctr = pla->current.pos; + i_this->demo_cam_ctr.y += 120.0f; + cam->mCamera.Reset(i_this->demo_cam_ctr, i_this->demo_cam_eye, + i_this->demo_cam_zoom, 0); + cam->mCamera.Start(); + cam->mCamera.SetTrimSize(0); dComIfGp_event_reset(); - i_this->field_0x169e = 0; + i_this->demo_mode = 0; } } break; - case 0x1e: { - if (!a_this->eventInfo.checkCommandDemoAccrpt()) { - fopAcM_orderPotentialEvent(a_this, 2, 0xffff, 0); - a_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e); + case 30: { + if (!enemy->eventInfo.checkCommandDemoAccrpt()) { + fopAcM_orderPotentialEvent(enemy, 2, 0xffff, 0); + enemy->eventInfo.onCondition(dEvtCnd_CANDEMO_e); return; } - local_184->mCamera.Stop(); - local_184->mCamera.SetTrimSize(3); - i_this->field_0x169e = 0x1f; - i_this->field_0x16a0 = 0; - i_this->field_0x1714 = 55.0f; - i_this->field_0x16a0 = 0; - i_this->field_0x1710 = 0; - i_this->field_0x16bc.set(-8592.0f, 342.0f, -139.0f); - i_this->field_0x16a4.set(-8844.0f, 317.0f, 512.0f); - i_this->field_0x16e0.set(-8416.0f, 345.0f, 6.0f); - i_this->field_0x16d4.set(-8994.0f, 326.0f, 400.0f); - i_this->field_0x16ec.x = fabsf(i_this->field_0x16d4.x - i_this->field_0x16a4.x); - i_this->field_0x16ec.y = fabsf(i_this->field_0x16d4.y - i_this->field_0x16a4.y); - i_this->field_0x16ec.z = fabsf(i_this->field_0x16d4.z - i_this->field_0x16a4.z); - i_this->field_0x16f8.x = fabsf(i_this->field_0x16e0.x - i_this->field_0x16bc.x); - i_this->field_0x16f8.y = fabsf(i_this->field_0x16e0.y - i_this->field_0x16bc.y); - i_this->field_0x16f8.z = fabsf(i_this->field_0x16e0.z - i_this->field_0x16bc.z); + cam->mCamera.Stop(); + cam->mCamera.SetTrimSize(3); + i_this->demo_mode = 31; + i_this->demo_timer = 0; + i_this->demo_cam_zoom = 55.0f; + i_this->demo_timer = 0; + i_this->demo_cam_morf = 0; + i_this->demo_cam_ctr.set(-8592.0f, 342.0f, -139.0f); + i_this->demo_cam_eye.set(-8844.0f, 317.0f, 512.0f); + i_this->demo_cam_way.set(-8416.0f, 345.0f, 6.0f); + i_this->demo_cam_target.set(-8994.0f, 326.0f, 400.0f); + i_this->demo_cam_eye_spd.x = fabsf(i_this->demo_cam_target.x - i_this->demo_cam_eye.x); + i_this->demo_cam_eye_spd.y = fabsf(i_this->demo_cam_target.y - i_this->demo_cam_eye.y); + i_this->demo_cam_eye_spd.z = fabsf(i_this->demo_cam_target.z - i_this->demo_cam_eye.z); + i_this->demo_cam_way_spd.x = fabsf(i_this->demo_cam_way.x - i_this->demo_cam_ctr.x); + i_this->demo_cam_way_spd.y = fabsf(i_this->demo_cam_way.y - i_this->demo_cam_ctr.y); + i_this->demo_cam_way_spd.z = fabsf(i_this->demo_cam_way.z - i_this->demo_cam_ctr.z); daPy_getPlayerActorClass()->changeOriginalDemo(); horse->changeOriginalDemo(); - cStack_48.set(-10775.0f + ZREG_F(0) + 350.0f, 60.0f, 75.0f); - horse->setHorsePosAndAngle(&cStack_48, horse->shape_angle.y); + ato.set(-10775.0f + ZREG_F(0) + 350.0f, 60.0f, 75.0f); + horse->setHorsePosAndAngle(&ato, horse->shape_angle.y); horse->changeDemoMode(3, 0); - cStack_48.set(-8705.0f, 213.0f, 75.0f); - horse->changeDemoPos0(&cStack_48); + ato.set(-8705.0f, 213.0f, 75.0f); + horse->changeDemoPos0(&ato); dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[86]); Z2GetAudioMgr()->bgmStreamPrepare(0x200000f); Z2GetAudioMgr()->bgmStreamPlay(); } // fallthrough - case 0x1f: { - if (i_this->field_0x16a0 > 50 + JREG_S(3)) { + case 31: { + if (i_this->demo_timer > 50 + JREG_S(3)) { cam_3d_morf(i_this, 0.1f); - cLib_addCalc2(&i_this->field_0x1710, 0.02f, 1.0f, 0.001f); + cLib_addCalc2(&i_this->demo_cam_morf, 0.02f, 1.0f, 0.001f); } - if (i_this->field_0x16a0 == 40 + JREG_S(0)) { + if (i_this->demo_timer == 40 + JREG_S(0)) { horse->changeDemoMode(8, 0); - dComIfGp_getEvent()->startCheckSkipEdge(a_this); + dComIfGp_getEvent()->startCheckSkipEdge(enemy); } - if (i_this->field_0x16a0 == 80 + JREG_S(1)) { + if (i_this->demo_timer == 80 + JREG_S(1)) { horse->changeDemoMode(9, 0); } - if (i_this->field_0x16a0 == 143 + JREG_S(2)) { + if (i_this->demo_timer == 143 + JREG_S(2)) { dKy_change_colpat(4); } - if (i_this->field_0x16a0 == 144 + JREG_S(2)) { - i_this->field_0x169e = 0x20; - i_this->field_0x16a0 = 0; + if (i_this->demo_timer == 144 + JREG_S(2)) { + i_this->demo_mode = 32; + i_this->demo_timer = 0; horse->changeDemoMode(1, 0); - i_this->field_0x16bc.set(-9224.0f, 500.0f, 300.0f); - i_this->field_0x16a4.set(-8586.0f, 447.0f, 18.0f); - i_this->field_0x1714 = 40.0f; + i_this->demo_cam_ctr.set(-9224.0f, 500.0f, 300.0f); + i_this->demo_cam_eye.set(-8586.0f, 447.0f, 18.0f); + i_this->demo_cam_zoom = 40.0f; } } break; - case 0x20: { - if (i_this->field_0x16a0 == 10) { - player->changeDemoParam2(1); + case 32: { + if (i_this->demo_timer == 10) { + pla->changeDemoParam2(1); } - if (i_this->field_0x16a0 != 0x23) { + if (i_this->demo_timer != 35) { break; } - i_this->field_0x169e = 0x21; - i_this->field_0x16a0 = 0; - i_this->field_0x1714 = 85.0f; - i_this->field_0x1710 = 0; + i_this->demo_mode = 33; + i_this->demo_timer = 0; + i_this->demo_cam_zoom = 85.0f; + i_this->demo_cam_morf = 0; dKy_change_colpat(5); } // fallthrough - case 0x21: { - i_this->field_0x16b0.set(400.0f + JREG_F(6), 400.0f + JREG_F(7), 500.0f + JREG_F(8)); - i_this->field_0x16c8.set(-10.0f + JREG_F(9), 700.0f + JREG_F(10), 180.0f + JREG_F(11)); - cMtx_YrotS(*calc_mtx, a_this->shape_angle.y); - MtxPosition(&i_this->field_0x16b0, &cStack_48); - i_this->field_0x16a4 = a_this->current.pos + cStack_48; - MtxPosition(&i_this->field_0x16c8, &cStack_48); - i_this->field_0x16bc = a_this->current.pos + cStack_48; - if (i_this->field_0x16a0 > 25) { - cLib_addCalc2(&i_this->field_0x1714, 55.0f + JREG_F(12) - 30.0f, 0.8f, 6.0f); + case 33: { + i_this->demo_cam_eye_mae.set(400.0f + JREG_F(6), 400.0f + JREG_F(7), 500.0f + JREG_F(8)); + i_this->demo_cam_ctr_mae.set(-10.0f + JREG_F(9), 700.0f + JREG_F(10), 180.0f + JREG_F(11)); + cMtx_YrotS(*calc_mtx, enemy->shape_angle.y); + MtxPosition(&i_this->demo_cam_eye_mae, &ato); + i_this->demo_cam_eye = enemy->current.pos + ato; + MtxPosition(&i_this->demo_cam_ctr_mae, &ato); + i_this->demo_cam_ctr = enemy->current.pos + ato; + if (i_this->demo_timer > 25) { + cLib_addCalc2(&i_this->demo_cam_zoom, 55.0f + JREG_F(12) - 30.0f, 0.8f, 6.0f); } - if (i_this->field_0x16a0 == 95) { - i_this->field_0x169e = 0x22; - i_this->field_0x16a0 = 0; - i_this->field_0x16d4.set(700.0f, 100.0f, 0.0f); - i_this->field_0x16e0.set(-10.0f, 350.0f, 80.0f); - i_this->field_0x16ec.x = fabsf(i_this->field_0x16d4.x - i_this->field_0x16b0.x); - i_this->field_0x16ec.y = fabsf(i_this->field_0x16d4.y - i_this->field_0x16b0.y); - i_this->field_0x16ec.z = fabsf(i_this->field_0x16d4.z - i_this->field_0x16b0.z); - i_this->field_0x16f8.x = fabsf(i_this->field_0x16e0.x - i_this->field_0x16c8.x); - i_this->field_0x16f8.y = fabsf(i_this->field_0x16e0.y - i_this->field_0x16c8.y); - i_this->field_0x16f8.z = fabsf(i_this->field_0x16e0.z - i_this->field_0x16c8.z); - i_this->field_0x1710 = 0; + if (i_this->demo_timer == 95) { + i_this->demo_mode = 34; + i_this->demo_timer = 0; + i_this->demo_cam_target.set(700.0f, 100.0f, 0.0f); + i_this->demo_cam_way.set(-10.0f, 350.0f, 80.0f); + i_this->demo_cam_eye_spd.x = fabsf(i_this->demo_cam_target.x - i_this->demo_cam_eye_mae.x); + i_this->demo_cam_eye_spd.y = fabsf(i_this->demo_cam_target.y - i_this->demo_cam_eye_mae.y); + i_this->demo_cam_eye_spd.z = fabsf(i_this->demo_cam_target.z - i_this->demo_cam_eye_mae.z); + i_this->demo_cam_way_spd.x = fabsf(i_this->demo_cam_way.x - i_this->demo_cam_ctr_mae.x); + i_this->demo_cam_way_spd.y = fabsf(i_this->demo_cam_way.y - i_this->demo_cam_ctr_mae.y); + i_this->demo_cam_way_spd.z = fabsf(i_this->demo_cam_way.z - i_this->demo_cam_ctr_mae.z); + i_this->demo_cam_morf = 0; } } break; - case 0x22: { - cLib_addCalc2(&i_this->field_0x1714, 55.0f, 0.05f, 0.3f); - cLib_addCalc2(&i_this->field_0x16c8.x, i_this->field_0x16e0.x, 0.05f, - i_this->field_0x16f8.x * i_this->field_0x1710); - cLib_addCalc2(&i_this->field_0x16c8.y, i_this->field_0x16e0.y, 0.05f, - i_this->field_0x16f8.y * i_this->field_0x1710); - cLib_addCalc2(&i_this->field_0x16c8.z, i_this->field_0x16e0.z, 0.05f, - i_this->field_0x16f8.z * i_this->field_0x1710); - cLib_addCalc2(&i_this->field_0x16b0.x, i_this->field_0x16d4.x, 0.05f, - (i_this->field_0x16ec.x * i_this->field_0x1710)); - cLib_addCalc2(&i_this->field_0x16b0.y, i_this->field_0x16d4.y, 0.05f, - (i_this->field_0x16ec.y * i_this->field_0x1710)); - cLib_addCalc2(&i_this->field_0x16b0.z, i_this->field_0x16d4.z, 0.05f, - (i_this->field_0x16ec.z * i_this->field_0x1710)); - cLib_addCalc2(&i_this->field_0x1710, 0.01f, 1.0f, 0.0005f); - cMtx_YrotS(*calc_mtx, a_this->shape_angle.y); - MtxPosition(&i_this->field_0x16b0, &i_this->field_0x16a4); - i_this->field_0x16a4 += a_this->current.pos; - MtxPosition(&i_this->field_0x16c8, &i_this->field_0x16bc); - i_this->field_0x16bc += a_this->current.pos; - if (i_this->field_0x16a0 == 130) { - local_194->mode++; - player->changeDemoParam2(0); + case 34: { + cLib_addCalc2(&i_this->demo_cam_zoom, 55.0f, 0.05f, 0.3f); + cLib_addCalc2(&i_this->demo_cam_ctr_mae.x, i_this->demo_cam_way.x, 0.05f, + i_this->demo_cam_way_spd.x * i_this->demo_cam_morf); + cLib_addCalc2(&i_this->demo_cam_ctr_mae.y, i_this->demo_cam_way.y, 0.05f, + i_this->demo_cam_way_spd.y * i_this->demo_cam_morf); + cLib_addCalc2(&i_this->demo_cam_ctr_mae.z, i_this->demo_cam_way.z, 0.05f, + i_this->demo_cam_way_spd.z * i_this->demo_cam_morf); + cLib_addCalc2(&i_this->demo_cam_eye_mae.x, i_this->demo_cam_target.x, 0.05f, + (i_this->demo_cam_eye_spd.x * i_this->demo_cam_morf)); + cLib_addCalc2(&i_this->demo_cam_eye_mae.y, i_this->demo_cam_target.y, 0.05f, + (i_this->demo_cam_eye_spd.y * i_this->demo_cam_morf)); + cLib_addCalc2(&i_this->demo_cam_eye_mae.z, i_this->demo_cam_target.z, 0.05f, + (i_this->demo_cam_eye_spd.z * i_this->demo_cam_morf)); + cLib_addCalc2(&i_this->demo_cam_morf, 0.01f, 1.0f, 0.0005f); + cMtx_YrotS(*calc_mtx, enemy->shape_angle.y); + MtxPosition(&i_this->demo_cam_eye_mae, &i_this->demo_cam_eye); + i_this->demo_cam_eye += enemy->current.pos; + MtxPosition(&i_this->demo_cam_ctr_mae, &i_this->demo_cam_ctr); + i_this->demo_cam_ctr += enemy->current.pos; + if (i_this->demo_timer == 130) { + rider->mode++; + pla->changeDemoParam2(0); } - if (i_this->field_0x16a0 == 220) { - i_this->field_0x169e = 0x23; - i_this->field_0x16a0 = 0; + if (i_this->demo_timer == 220) { + i_this->demo_mode = 35; + i_this->demo_timer = 0; dKy_change_colpat(4); } } break; - case 0x23: { - i_this->field_0x1714 = 55.0f; - i_this->field_0x16bc.set(-9110.0f, 492.0f, 331.0f); - i_this->field_0x16a4.set(-8469.0f, 372.0f, -54.0f); - if (i_this->field_0x16a0 == 10) { + case 35: { + i_this->demo_cam_zoom = 55.0f; + i_this->demo_cam_ctr.set(-9110.0f, 492.0f, 331.0f); + i_this->demo_cam_eye.set(-8469.0f, 372.0f, -54.0f); + if (i_this->demo_timer == 10) { daPy_getPlayerActorClass()->changeDemoMode(0x17, 1, 2, 0); } - if (i_this->field_0x16a0 == 50) { - i_this->field_0x169e = 0x24; - i_this->field_0x16a0 = 0; + if (i_this->demo_timer == 50) { + i_this->demo_mode = 36; + i_this->demo_timer = 0; } } break; - case 0x24: { - i_this->field_0x16b0.set(700.0f + JREG_F(0), 100.0f + JREG_F(1), 500.0f + JREG_F(2)); - i_this->field_0x16c8.set(-10.0f + JREG_F(3), 350.0f + JREG_F(4), 80.0f + JREG_F(5)); - cMtx_YrotS(*calc_mtx, a_this->shape_angle.y); - MtxPosition(&i_this->field_0x16b0, &i_this->field_0x16a4); - i_this->field_0x16a4 += a_this->current.pos; - MtxPosition(&i_this->field_0x16c8, &i_this->field_0x16bc); - i_this->field_0x16bc += a_this->current.pos; - if (i_this->field_0x16a0 == 20) { - local_194->mode++; + case 36: { + i_this->demo_cam_eye_mae.set(700.0f + JREG_F(0), 100.0f + JREG_F(1), 500.0f + JREG_F(2)); + i_this->demo_cam_ctr_mae.set(-10.0f + JREG_F(3), 350.0f + JREG_F(4), 80.0f + JREG_F(5)); + cMtx_YrotS(*calc_mtx, enemy->shape_angle.y); + MtxPosition(&i_this->demo_cam_eye_mae, &i_this->demo_cam_eye); + i_this->demo_cam_eye += enemy->current.pos; + MtxPosition(&i_this->demo_cam_ctr_mae, &i_this->demo_cam_ctr); + i_this->demo_cam_ctr += enemy->current.pos; + if (i_this->demo_timer == 20) { + rider->mode++; } - if (i_this->field_0x16a0 != (s16)(92 + KREG_S(8))) { + if (i_this->demo_timer != (s16)(92 + KREG_S(8))) { break; } - i_this->field_0x169e = 0x25; - i_this->field_0x16a0 = 0; + i_this->demo_mode = 37; + i_this->demo_timer = 0; fpcM_Search(s_wbstart_sub, i_this); - i_this->field_0x16bc.set(-12800.0f, 153.0f, 51.0f); - i_this->field_0x16a4.set(-12022.0f, 82.0f, 51.0f); - i_this->field_0x16e0.set(-13168.0f, 163.0f, -200.0f); - i_this->field_0x16d4.set(-12500.0f, 83.0f, -593.0f); - i_this->field_0x16ec.x = fabsf(i_this->field_0x16d4.x - i_this->field_0x16a4.x); - i_this->field_0x16ec.y = fabsf(i_this->field_0x16d4.y - i_this->field_0x16a4.y); - i_this->field_0x16ec.z = fabsf(i_this->field_0x16d4.z - i_this->field_0x16a4.z); - i_this->field_0x16f8.x = fabsf(i_this->field_0x16e0.x - i_this->field_0x16bc.x); - i_this->field_0x16f8.y = fabsf(i_this->field_0x16e0.y - i_this->field_0x16bc.y); - i_this->field_0x16f8.z = fabsf(i_this->field_0x16e0.z - i_this->field_0x16bc.z); - i_this->field_0x1710 = 0; + i_this->demo_cam_ctr.set(-12800.0f, 153.0f, 51.0f); + i_this->demo_cam_eye.set(-12022.0f, 82.0f, 51.0f); + i_this->demo_cam_way.set(-13168.0f, 163.0f, -200.0f); + i_this->demo_cam_target.set(-12500.0f, 83.0f, -593.0f); + i_this->demo_cam_eye_spd.x = fabsf(i_this->demo_cam_target.x - i_this->demo_cam_eye.x); + i_this->demo_cam_eye_spd.y = fabsf(i_this->demo_cam_target.y - i_this->demo_cam_eye.y); + i_this->demo_cam_eye_spd.z = fabsf(i_this->demo_cam_target.z - i_this->demo_cam_eye.z); + i_this->demo_cam_way_spd.x = fabsf(i_this->demo_cam_way.x - i_this->demo_cam_ctr.x); + i_this->demo_cam_way_spd.y = fabsf(i_this->demo_cam_way.y - i_this->demo_cam_ctr.y); + i_this->demo_cam_way_spd.z = fabsf(i_this->demo_cam_way.z - i_this->demo_cam_ctr.z); + i_this->demo_cam_morf = 0; } // fallthrough - case 0x25: { - if (i_this->field_0x16a0 < 110) { + case 37: { + if (i_this->demo_timer < 110) { fpcM_Search(s_spd0_sub, i_this); } - if (i_this->field_0x16a0 < 0xd2) { + if (i_this->demo_timer < 210) { fpcM_Search(s_rdArrowWait_sub, i_this); } - if (i_this->field_0x16a0 > (s16)(165 + BREG_S(6))) { + if (i_this->demo_timer > (s16)(165 + BREG_S(6))) { cam_3d_morf(i_this, 0.1f + BREG_F(17)); - cLib_addCalc2(&i_this->field_0x1710, 0.01f + BREG_F(18), 1.0f, 0.00015f + BREG_F(19)); + cLib_addCalc2(&i_this->demo_cam_morf, 0.01f + BREG_F(18), 1.0f, 0.00015f + BREG_F(19)); } - if (i_this->field_0x16a0 == 245) { + if (i_this->demo_timer == 245) { dComIfGp_getVibration().StartQuake(4 + TREG_S(5), 0x1f, cXyz(0.0f, 1.0f, 0.0f)); } - if (i_this->field_0x16a0 == 295) { + if (i_this->demo_timer == 295) { dComIfGp_getVibration().StopQuake(0x1f); } - if (i_this->field_0x16a0 > 250 && i_this->field_0x16a0 < 285) { + if (i_this->demo_timer > 250 && i_this->demo_timer < 285) { cLib_addCalc2(&i_this->field_0x171c, 35.0f + BREG_F(7) - 10.0f, 1.0f, 3.0f + BREG_F(6)); } - if (i_this->field_0x16a0 == 325) { + if (i_this->demo_timer == 325) { fpcM_Search(s_wbZrevise_sub, i_this); } - if (i_this->field_0x16a0 == 0x14f) { - i_this->field_0x169e = 0x26; - i_this->field_0x16a0 = 0; - i_this->field_0x7a2 = 0; - i_this->mActionID = ACT_B_RUN; - i_this->mActionMode = 0; - i_this->field_0x16bc.set(-8416.0f, 345.0f, 6.0f); - i_this->field_0x16a4.set(-8994.0f, 326.0f, 400.0f); - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_RDB_V_HOICK, -1); - local_194->timer[3] = 700; + if (i_this->demo_timer == 335) { + i_this->demo_mode = 38; + i_this->demo_timer = 0; + i_this->kiba = 0; + i_this->action = ACT_B_RUN; + i_this->ride_mode = 0; + i_this->demo_cam_ctr.set(-8416.0f, 345.0f, 6.0f); + i_this->demo_cam_eye.set(-8994.0f, 326.0f, 400.0f); + i_this->sound.startCreatureVoice(Z2SE_EN_RDB_V_HOICK, -1); + rider->timer[3] = 700; } } break; - case 0x26: { - if (i_this->field_0x16a0 == 50) { - local_184->mCamera.Reset(i_this->field_0x16bc, i_this->field_0x16a4); - local_184->mCamera.Start(); - local_184->mCamera.SetTrimSize(0); + case 38: { + if (i_this->demo_timer == 50) { + cam->mCamera.Reset(i_this->demo_cam_ctr, i_this->demo_cam_eye); + cam->mCamera.Start(); + cam->mCamera.SetTrimSize(0); dComIfGp_event_reset(); daPy_getPlayerActorClass()->cancelOriginalDemo(); horse->cancelOriginalDemo(); - i_this->field_0x169e = 0; + i_this->demo_mode = 0; Z2GetAudioMgr()->subBgmStart(Z2BGM_HORSE_BATTLE); dKy_change_colpat(3); } } break; - case 0x28: { - if (!a_this->eventInfo.checkCommandDemoAccrpt()) { - fopAcM_orderPotentialEvent(a_this, 2, 0xffff, 0); - a_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e); + case 40: { + if (!enemy->eventInfo.checkCommandDemoAccrpt()) { + fopAcM_orderPotentialEvent(enemy, 2, 0xffff, 0); + enemy->eventInfo.onCondition(dEvtCnd_CANDEMO_e); return; } - local_184->mCamera.Stop(); - local_184->mCamera.SetTrimSize(3); - i_this->field_0x169e = 0x29; - i_this->field_0x1714 = 55.0f; - i_this->field_0x16a0 = 0; - i_this->field_0x1710 = 0; - i_this->field_0x16bc.set(36156.0f, 985.0f, -16931.0f); - i_this->field_0x16a4.set(36496.0f, 1358.0f, -17344.0f); - i_this->field_0x16e0.set(36453.0f, 1116.0f, -16995.0f); - i_this->field_0x16d4.set(35835.0f, 955.0f, -16867.0f); - i_this->field_0x16ec.x = fabsf(i_this->field_0x16d4.x - i_this->field_0x16a4.x) * 0.3f; - i_this->field_0x16ec.y = fabsf(i_this->field_0x16d4.y - i_this->field_0x16a4.y) * 0.3f; - i_this->field_0x16ec.z = fabsf(i_this->field_0x16d4.z - i_this->field_0x16a4.z) * 0.3f; - i_this->field_0x16f8.x = fabsf(i_this->field_0x16e0.x - i_this->field_0x16bc.x); - i_this->field_0x16f8.y = fabsf(i_this->field_0x16e0.y - i_this->field_0x16bc.y); - i_this->field_0x16f8.z = fabsf(i_this->field_0x16e0.z - i_this->field_0x16bc.z); + cam->mCamera.Stop(); + cam->mCamera.SetTrimSize(3); + i_this->demo_mode = 41; + i_this->demo_cam_zoom = 55.0f; + i_this->demo_timer = 0; + i_this->demo_cam_morf = 0; + i_this->demo_cam_ctr.set(36156.0f, 985.0f, -16931.0f); + i_this->demo_cam_eye.set(36496.0f, 1358.0f, -17344.0f); + i_this->demo_cam_way.set(36453.0f, 1116.0f, -16995.0f); + i_this->demo_cam_target.set(35835.0f, 955.0f, -16867.0f); + i_this->demo_cam_eye_spd.x = fabsf(i_this->demo_cam_target.x - i_this->demo_cam_eye.x) * 0.3f; + i_this->demo_cam_eye_spd.y = fabsf(i_this->demo_cam_target.y - i_this->demo_cam_eye.y) * 0.3f; + i_this->demo_cam_eye_spd.z = fabsf(i_this->demo_cam_target.z - i_this->demo_cam_eye.z) * 0.3f; + i_this->demo_cam_way_spd.x = fabsf(i_this->demo_cam_way.x - i_this->demo_cam_ctr.x); + i_this->demo_cam_way_spd.y = fabsf(i_this->demo_cam_way.y - i_this->demo_cam_ctr.y); + i_this->demo_cam_way_spd.z = fabsf(i_this->demo_cam_way.z - i_this->demo_cam_ctr.z); daPy_getPlayerActorClass()->changeOriginalDemo(); horse->changeOriginalDemo(); - cStack_48.set(34800.0f, -300.0f, -15200.0f); - horse->setHorsePosAndAngle(&cStack_48, -0x8000); + ato.set(34800.0f, -300.0f, -15200.0f); + horse->setHorsePosAndAngle(&ato, -0x8000); horse->changeDemoMode(3, 0); - cStack_48.set(34800.0f, -300.0f, -20000.0f); - horse->changeDemoPos0(&cStack_48); + ato.set(34800.0f, -300.0f, -20000.0f); + horse->changeDemoPos0(&ato); dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[87]); Z2GetAudioMgr()->bgmStart(Z2BGM_HORSE_BATTLE_D02, 0, 0); - dComIfGp_getEvent()->startCheckSkipEdge(a_this); + dComIfGp_getEvent()->startCheckSkipEdge(enemy); } // fallthrough - case 0x29: { - if (i_this->field_0x16a0 == (30 + JREG_S(0))) { + case 41: { + if (i_this->demo_timer == (30 + JREG_S(0))) { horse->changeDemoMode(8, 0); } - if (i_this->field_0x16a0 > (70 + JREG_S(3))) { + if (i_this->demo_timer > (70 + JREG_S(3))) { cam_3d_morf(i_this, 0.2f); - cLib_addCalc2(&i_this->field_0x1710, 0.2f, 1.0f, 0.01f); - if (i_this->field_0x16a0 == (150 + JREG_S(4))) { - i_this->field_0x16bc.set(35528.0f, 316.0f, -16987.0f); - i_this->field_0x16a4.set(35059.0f, -128.0f, -16992.0f); - i_this->field_0x16ec.set(0.0f, 0.0f, 0.0f); - i_this->field_0x16e0.set(34973.0f, -148.0f, -16346.0f); - i_this->field_0x16f8.x = fabsf(i_this->field_0x16e0.x - i_this->field_0x16bc.x); - i_this->field_0x16f8.y = fabsf(i_this->field_0x16e0.y - i_this->field_0x16bc.y); - i_this->field_0x16f8.z = fabsf(i_this->field_0x16e0.z - i_this->field_0x16bc.z); - i_this->field_0x1710 = 0; - i_this->field_0x169e = 0x2a; - i_this->field_0x16a0 = 0; + cLib_addCalc2(&i_this->demo_cam_morf, 0.2f, 1.0f, 0.01f); + if (i_this->demo_timer == (150 + JREG_S(4))) { + i_this->demo_cam_ctr.set(35528.0f, 316.0f, -16987.0f); + i_this->demo_cam_eye.set(35059.0f, -128.0f, -16992.0f); + i_this->demo_cam_eye_spd.set(0.0f, 0.0f, 0.0f); + i_this->demo_cam_way.set(34973.0f, -148.0f, -16346.0f); + i_this->demo_cam_way_spd.x = fabsf(i_this->demo_cam_way.x - i_this->demo_cam_ctr.x); + i_this->demo_cam_way_spd.y = fabsf(i_this->demo_cam_way.y - i_this->demo_cam_ctr.y); + i_this->demo_cam_way_spd.z = fabsf(i_this->demo_cam_way.z - i_this->demo_cam_ctr.z); + i_this->demo_cam_morf = 0; + i_this->demo_mode = 42; + i_this->demo_timer = 0; } } } break; - case 0x2a: { - i_this->field_0x1710 = 0.075f + JREG_F(7); + case 42: { + i_this->demo_cam_morf = 0.075f + JREG_F(7); cam_3d_morf(i_this, 0.5f); - if (i_this->field_0x16a0 == 20 + JREG_S(5)) { - i_this->field_0x1722 = 1; + if (i_this->demo_timer == 20 + JREG_S(5)) { + i_this->saku_burn = 1; i_this->field_0x1718 = 0.0f; Z2GetAudioMgr()->seStart(Z2SE_OBJ_STRAWFENCE_IGNITION, &saku_p, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); @@ -4341,493 +4350,493 @@ static void demo_camera(e_wb_class* i_this) { -1.0f, -1.0f, 0); } - if (i_this->field_0x16a0 == 23 + JREG_S(6)) { + if (i_this->demo_timer == 23 + JREG_S(6)) { horse->changeDemoMode(9, 0); } - if (i_this->field_0x16a0 == 83) { - i_this->field_0x16bc.set(34800.0f, 15.7f, -16820.0f); - i_this->field_0x16a4.set(34800.0f, 10.0f, -16170.0f); - i_this->field_0x1710 = 0; - i_this->field_0x1714 = 55.0f; - i_this->field_0x169e = 0x2b; - i_this->field_0x16a0 = 0; - i_this->mActionMode = -100; + if (i_this->demo_timer == 83) { + i_this->demo_cam_ctr.set(34800.0f, 15.7f, -16820.0f); + i_this->demo_cam_eye.set(34800.0f, 10.0f, -16170.0f); + i_this->demo_cam_morf = 0; + i_this->demo_cam_zoom = 55.0f; + i_this->demo_mode = 43; + i_this->demo_timer = 0; + i_this->ride_mode = -100; } } break; - case 0x2b: { - if (i_this->field_0x16a0 == 5) { + case 43: { + if (i_this->demo_timer == 5) { horse->changeDemoMode(1, 0); daPy_getPlayerActorClass()->changeDemoMode(0x17, 1, 2, 0); fpcM_Search(s_rddel_sub, i_this); } - if (i_this->field_0x16a0 > 40) { - cLib_addCalc2(&i_this->field_0x1714, 4.5f, 0.4f, 3.5f); - if (i_this->field_0x16a0 == 130) { - i_this->field_0x16bc.set(34843.0f, -92.7f, -35956.0f); - i_this->field_0x16a4.set(35167.0f, -202.0f, -35403.0f); - i_this->field_0x16e0.set(34740.0f, -92.7f, -35966.0f); - i_this->field_0x16d4.set(34320.0, -202.0, -35490.0); - i_this->field_0x16ec.x = fabsf(i_this->field_0x16d4.x - i_this->field_0x16a4.x); - i_this->field_0x16ec.y = fabsf(i_this->field_0x16d4.y - i_this->field_0x16a4.y); - i_this->field_0x16ec.z = fabsf(i_this->field_0x16d4.z - i_this->field_0x16a4.z); - i_this->field_0x16f8.x = fabsf(i_this->field_0x16e0.x - i_this->field_0x16bc.x); - i_this->field_0x16f8.y = fabsf(i_this->field_0x16e0.y - i_this->field_0x16bc.y); - i_this->field_0x16f8.z = fabsf(i_this->field_0x16e0.z - i_this->field_0x16bc.z); - i_this->field_0x1714 = 55.0f; - i_this->field_0x169e = 0x2c; - i_this->field_0x16a0 = 0; - i_this->field_0x698[0] = 0x14; + if (i_this->demo_timer > 40) { + cLib_addCalc2(&i_this->demo_cam_zoom, 4.5f, 0.4f, 3.5f); + if (i_this->demo_timer == 130) { + i_this->demo_cam_ctr.set(34843.0f, -92.7f, -35956.0f); + i_this->demo_cam_eye.set(35167.0f, -202.0f, -35403.0f); + i_this->demo_cam_way.set(34740.0f, -92.7f, -35966.0f); + i_this->demo_cam_target.set(34320.0, -202.0, -35490.0); + i_this->demo_cam_eye_spd.x = fabsf(i_this->demo_cam_target.x - i_this->demo_cam_eye.x); + i_this->demo_cam_eye_spd.y = fabsf(i_this->demo_cam_target.y - i_this->demo_cam_eye.y); + i_this->demo_cam_eye_spd.z = fabsf(i_this->demo_cam_target.z - i_this->demo_cam_eye.z); + i_this->demo_cam_way_spd.x = fabsf(i_this->demo_cam_way.x - i_this->demo_cam_ctr.x); + i_this->demo_cam_way_spd.y = fabsf(i_this->demo_cam_way.y - i_this->demo_cam_ctr.y); + i_this->demo_cam_way_spd.z = fabsf(i_this->demo_cam_way.z - i_this->demo_cam_ctr.z); + i_this->demo_cam_zoom = 55.0f; + i_this->demo_mode = 44; + i_this->demo_timer = 0; + i_this->timer[0] = 20; } } } break; - case 0x2c: { + case 44: { cam_3d_morf(i_this, 0.05f); - cLib_addCalc2(&i_this->field_0x1710, 0.005f, 1.0f, 0.0002f); - if (i_this->field_0x16a0 == 170) { - i_this->mActionMode++; + cLib_addCalc2(&i_this->demo_cam_morf, 0.005f, 1.0f, 0.0002f); + if (i_this->demo_timer == 170) { + i_this->ride_mode++; } - if (i_this->field_0x16a0 == 258) { - cStack_48.set(34800.0f, -300.0f, -18700.0f); - horse->setHorsePosAndAngle(&cStack_48, horse->shape_angle.y); + if (i_this->demo_timer == 258) { + ato.set(34800.0f, -300.0f, -18700.0f); + horse->setHorsePosAndAngle(&ato, horse->shape_angle.y); } - if (i_this->field_0x16a0 == 306 + NREG_S(6)) { - local_184->mCamera.Reset(i_this->field_0x16bc, i_this->field_0x16a4); - local_184->mCamera.Start(); - local_184->mCamera.SetTrimSize(0); + if (i_this->demo_timer == 306 + NREG_S(6)) { + cam->mCamera.Reset(i_this->demo_cam_ctr, i_this->demo_cam_eye); + cam->mCamera.Start(); + cam->mCamera.SetTrimSize(0); dComIfGp_event_reset(); daPy_getPlayerActorClass()->cancelOriginalDemo(); horse->cancelOriginalDemo(); - i_this->field_0x169e = 0; + i_this->demo_mode = 0; Z2GetAudioMgr()->subBgmStart(Z2BGM_FACE_OFF_BATTLE2); } } break; - case 0x32: { - if (!rdb->enemy.eventInfo.checkCommandDemoAccrpt()) { - fopAcM_orderPotentialEvent(&rdb->enemy, 2, 0xffff, 0); - rdb->enemy.eventInfo.onCondition(dEvtCnd_CANDEMO_e); + case 50: { + if (!boss->enemy.eventInfo.checkCommandDemoAccrpt()) { + fopAcM_orderPotentialEvent(&boss->enemy, 2, 0xffff, 0); + boss->enemy.eventInfo.onCondition(dEvtCnd_CANDEMO_e); return; } - local_184->mCamera.Stop(); - local_184->mCamera.SetTrimSize(3); - i_this->field_0x169e = 0x33; - i_this->field_0x1714 = 55.0f; - i_this->field_0x16a0 = 0; - i_this->field_0x1710 = 0; - i_this->field_0x16bc.set(1679.0, 100.0, 852.0); - i_this->field_0x16a4.set(1873.0, 64.0, 527.0); + cam->mCamera.Stop(); + cam->mCamera.SetTrimSize(3); + i_this->demo_mode = 51; + i_this->demo_cam_zoom = 55.0f; + i_this->demo_timer = 0; + i_this->demo_cam_morf = 0; + i_this->demo_cam_ctr.set(1679.0, 100.0, 852.0); + i_this->demo_cam_eye.set(1873.0, 64.0, 527.0); daPy_getPlayerActorClass()->changeOriginalDemo(); - dComIfGp_getEvent()->startCheckSkipEdge(a_this); + dComIfGp_getEvent()->startCheckSkipEdge(enemy); dComIfGs_onOneZoneSwitch(4, -1); } // fallthrough - case 0x33: { - if (i_this->field_0x16a0 < 30) { - cStack_48.set(1787.0f, 1.75f, 484.0f); - player->setPlayerPosAndAngle(&cStack_48, -0x12c3, 0); + case 51: { + if (i_this->demo_timer < 30) { + ato.set(1787.0f, 1.75f, 484.0f); + pla->setPlayerPosAndAngle(&ato, -0x12c3, 0); } - if (i_this->field_0x16a0 == 30) { - player->changeDemoMode(2, 1, 0, 0); - cStack_48.set(1634.0, 1.4, 811.0); - player->changeDemoPos0(&cStack_48); + if (i_this->demo_timer == 30) { + pla->changeDemoMode(2, 1, 0, 0); + ato.set(1634.0, 1.4, 811.0); + pla->changeDemoPos0(&ato); } - if (i_this->field_0x16a0 == 139) { - rdb->field_0x6d8 = 2; + if (i_this->demo_timer == 139) { + boss->field_0x6d8 = 2; } - if (i_this->field_0x16a0 == 0x8c) { - i_this->field_0x169e = 0x34; - i_this->field_0x16a0 = 0; - cMtx_YrotS(*calc_mtx, rdb->enemy.shape_angle.y); - local_3c.x = 0.0f; - local_3c.y = 150.0f + JREG_F(7); - local_3c.z = 800.0f + JREG_F(8); - MtxPosition(&local_3c, &i_this->field_0x16a4); - i_this->field_0x16a4 += rdb->enemy.current.pos; - i_this->field_0x16bc = rdb->enemy.current.pos; - i_this->field_0x16bc.y += 150.0f + JREG_F(9); - rdb->mMode = 2; - rdb->field_0x6b8[0] = 0x28; + if (i_this->demo_timer == 140) { + i_this->demo_mode = 52; + i_this->demo_timer = 0; + cMtx_YrotS(*calc_mtx, boss->enemy.shape_angle.y); + mae.x = 0.0f; + mae.y = 150.0f + JREG_F(7); + mae.z = 800.0f + JREG_F(8); + MtxPosition(&mae, &i_this->demo_cam_eye); + i_this->demo_cam_eye += boss->enemy.current.pos; + i_this->demo_cam_ctr = boss->enemy.current.pos; + i_this->demo_cam_ctr.y += 150.0f + JREG_F(9); + boss->mMode = 2; + boss->field_0x6b8[0] = 40; } else { break; } } // fallthrough - case 0x34: { - cLib_addCalc0(&rdb->field_0x6e0, 1.0f, 0.3f + KREG_F(3)); - if (i_this->field_0x16a0 == 145) { - rdb->field_0x6d8 = 3; + case 52: { + cLib_addCalc0(&boss->field_0x6e0, 1.0f, 0.3f + KREG_F(3)); + if (i_this->demo_timer == 145) { + boss->field_0x6d8 = 3; } - if (i_this->field_0x16a0 == 0xaf) { - rdb->mMode = 4; + if (i_this->demo_timer == 175) { + boss->mMode = 4; } - if (i_this->field_0x16a0 == 0x138) { - i_this->mActionID = 0x18; - i_this->mActionMode = 0; - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_WB_V_DAMAGE, -1); - cXyz cStack_6c(a_this->current.pos); - cStack_6c.y += 150.0f; - dComIfGp_setHitMark(3, 0, &cStack_6c, &a_this->shape_angle, 0, 0); + if (i_this->demo_timer == 312) { + i_this->action = 24; + i_this->ride_mode = 0; + i_this->sound.startCreatureVoice(Z2SE_EN_WB_V_DAMAGE, -1); + cXyz pos(enemy->current.pos); + pos.y += 150.0f; + dComIfGp_setHitMark(3, 0, &pos, &enemy->shape_angle, 0, 0); } - if (i_this->field_0x16a0 == 315) { - i_this->field_0x16bc.set(1717.0f, 96.0f, 910.0f); - i_this->field_0x16a4.set(2226.0f, 56.0f, 751.0f); - i_this->field_0x16e0.set(1780.0f, 92.0f, 967.0f); - i_this->field_0x16d4.set(1988.0f, 69.0f, 475.0f); - i_this->field_0x16ec.x = fabsf(i_this->field_0x16d4.x - i_this->field_0x16a4.x); - i_this->field_0x16ec.y = fabsf(i_this->field_0x16d4.y - i_this->field_0x16a4.y); - i_this->field_0x16ec.z = fabsf(i_this->field_0x16d4.z - i_this->field_0x16a4.z); - i_this->field_0x16f8.x = fabsf(i_this->field_0x16e0.x - i_this->field_0x16bc.x); - i_this->field_0x16f8.y = fabsf(i_this->field_0x16e0.y - i_this->field_0x16bc.y); - i_this->field_0x16f8.z = fabsf(i_this->field_0x16e0.z - i_this->field_0x16bc.z); - i_this->field_0x1710 = 0; - player->setPlayerPosAndAngle(&player->current.pos, player->shape_angle.y - 4000, 0); + if (i_this->demo_timer == 315) { + i_this->demo_cam_ctr.set(1717.0f, 96.0f, 910.0f); + i_this->demo_cam_eye.set(2226.0f, 56.0f, 751.0f); + i_this->demo_cam_way.set(1780.0f, 92.0f, 967.0f); + i_this->demo_cam_target.set(1988.0f, 69.0f, 475.0f); + i_this->demo_cam_eye_spd.x = fabsf(i_this->demo_cam_target.x - i_this->demo_cam_eye.x); + i_this->demo_cam_eye_spd.y = fabsf(i_this->demo_cam_target.y - i_this->demo_cam_eye.y); + i_this->demo_cam_eye_spd.z = fabsf(i_this->demo_cam_target.z - i_this->demo_cam_eye.z); + i_this->demo_cam_way_spd.x = fabsf(i_this->demo_cam_way.x - i_this->demo_cam_ctr.x); + i_this->demo_cam_way_spd.y = fabsf(i_this->demo_cam_way.y - i_this->demo_cam_ctr.y); + i_this->demo_cam_way_spd.z = fabsf(i_this->demo_cam_way.z - i_this->demo_cam_ctr.z); + i_this->demo_cam_morf = 0; + pla->setPlayerPosAndAngle(&pla->current.pos, pla->shape_angle.y - 4000, 0); } - if (i_this->field_0x16a0 == 345) { - daPy_getPlayerActorClass()->setThrowDamage(rdb->enemy.shape_angle.y - 8000 + TREG_S(8), + if (i_this->demo_timer == 345) { + daPy_getPlayerActorClass()->setThrowDamage(boss->enemy.shape_angle.y - 8000 + TREG_S(8), 40.0f, 25.0f + KREG_F(14), 0, 1, 0); daPy_getPlayerActorClass()->changeDemoMode(1, 0, 0, 0); - cXyz cStack_78(player->current.pos); - cStack_78.y += 150.0f; - dComIfGp_setHitMark(3, 0, &cStack_78, &player->shape_angle, 0, 0); + cXyz pos(pla->current.pos); + pos.y += 150.0f; + dComIfGp_setHitMark(3, 0, &pos, &pla->shape_angle, 0, 0); } - if (i_this->field_0x16a0 == 418) { + if (i_this->demo_timer == 418) { daPy_getPlayerActorClass()->changeDemoMode(0x17, 1, 2, 0); } - if (i_this->field_0x16a0 >= 378) { + if (i_this->demo_timer >= 378) { cam_3d_morf(i_this, 0.1f + BREG_F(17)); - cLib_addCalc2(&i_this->field_0x1710, 0.05f + BREG_F(18), 1.0f, 0.001f + BREG_F(19)); + cLib_addCalc2(&i_this->demo_cam_morf, 0.05f + BREG_F(18), 1.0f, 0.001f + BREG_F(19)); } - if (i_this->field_0x16a0 >= 490) { - local_184->mCamera.Reset(i_this->field_0x16bc, i_this->field_0x16a4); - local_184->mCamera.Start(); - local_184->mCamera.SetTrimSize(0); + if (i_this->demo_timer >= 490) { + cam->mCamera.Reset(i_this->demo_cam_ctr, i_this->demo_cam_eye); + cam->mCamera.Start(); + cam->mCamera.SetTrimSize(0); dComIfGp_event_reset(); daPy_getPlayerActorClass()->cancelOriginalDemo(); - i_this->field_0x169e = 0; - rdb->mMode = 7; + i_this->demo_mode = 0; + boss->mMode = 7; Z2GetAudioMgr()->subBgmStart(Z2BGM_FACE_OFF_BATTLE3); } } break; - case 0x3c: { - if (!rdb->enemy.eventInfo.checkCommandDemoAccrpt()) { - fopAcM_orderPotentialEvent(&rdb->enemy, 2, 0xffff, 0); - rdb->enemy.eventInfo.onCondition(dEvtCnd_CANDEMO_e); + case 60: { + if (!boss->enemy.eventInfo.checkCommandDemoAccrpt()) { + fopAcM_orderPotentialEvent(&boss->enemy, 2, 0xffff, 0); + boss->enemy.eventInfo.onCondition(dEvtCnd_CANDEMO_e); return; } - local_184->mCamera.Stop(); - local_184->mCamera.SetTrimSize(3); - i_this->field_0x169e = 0x3d; - i_this->field_0x1714 = 55.0f; - i_this->field_0x16a0 = 0; - i_this->field_0x1710 = 0; - i_this->field_0x16bc.set(2297.0f, 81.0f, 1668.0f); - i_this->field_0x16a4.set(2285.0f, 95.0f, 1988.0f); - rdb->enemy.current.pos.set(2341.0f, 1.0f, 1292.0f); - rdb->enemy.shape_angle.y = rdb->enemy.current.angle.y = 0x958; + cam->mCamera.Stop(); + cam->mCamera.SetTrimSize(3); + i_this->demo_mode = 61; + i_this->demo_cam_zoom = 55.0f; + i_this->demo_timer = 0; + i_this->demo_cam_morf = 0; + i_this->demo_cam_ctr.set(2297.0f, 81.0f, 1668.0f); + i_this->demo_cam_eye.set(2285.0f, 95.0f, 1988.0f); + boss->enemy.current.pos.set(2341.0f, 1.0f, 1292.0f); + boss->enemy.shape_angle.y = boss->enemy.current.angle.y = 2392; daPy_getPlayerActorClass()->changeOriginalDemo(); daPy_getPlayerActorClass()->changeDemoMode(0x17, 1, 2, 0); dComIfGs_onOneZoneSwitch(5, -1); } // fallthrough - case 0x3d: { - if (i_this->field_0x16a0 == 170) { + case 61: { + if (i_this->demo_timer == 170) { daPy_getPlayerActorClass()->changeDemoMode(0xc, 0, 0, 0); } - cStack_48.set(2120.0f + BREG_F(2), player->current.pos.y, 1200.0f + BREG_F(3)); - player->setPlayerPosAndAngle(&cStack_48, 5300, 0); - cStack_60.y = rdb->enemy.eyePos.y + BREG_F(16); - if (cStack_60.y < 81.0f) { - cStack_60.y = 81.0f; + ato.set(2120.0f + BREG_F(2), pla->current.pos.y, 1200.0f + BREG_F(3)); + pla->setPlayerPosAndAngle(&ato, 5300, 0); + center.y = boss->enemy.eyePos.y + BREG_F(16); + if (center.y < 81.0f) { + center.y = 81.0f; } - if (cStack_60.y > 120.0f + BREG_F(15)) { - cStack_60.y = 120.0f + BREG_F(15); + if (center.y > 120.0f + BREG_F(15)) { + center.y = 120.0f + BREG_F(15); } - cLib_addCalc2(&i_this->field_0x16bc.y, cStack_60.y, 0.1f, 10.0f); - if (i_this->field_0x16a0 == 260) { - rdb->mMode = 3; + cLib_addCalc2(&i_this->demo_cam_ctr.y, center.y, 0.1f, 10.0f); + if (i_this->demo_timer == 260) { + boss->mMode = 3; } - if (i_this->field_0x16a0 == 630) { - i_this->field_0x16bc.set(2272.0f, 136.0f, 1555.0f); - i_this->field_0x16a4.set(2056.0f, 160.0f, 1318.0f); - i_this->field_0x169e = 0x3e; - i_this->field_0x16a0 = 0; + if (i_this->demo_timer == 630) { + i_this->demo_cam_ctr.set(2272.0f, 136.0f, 1555.0f); + i_this->demo_cam_eye.set(2056.0f, 160.0f, 1318.0f); + i_this->demo_mode = 62; + i_this->demo_timer = 0; } } break; - case 0x3e: { - daObjCRVSTEEL_c* crvSteel = (daObjCRVSTEEL_c*)fopAcM_SearchByName(PROC_Obj_CRVSTEEL); - if (i_this->field_0x16a0 == (s16)(20 + AREG_S(4))) { - crvSteel->OpenSet(20.0f + AREG_F(3), 350.0f + AREG_F(4)); - Z2GetAudioMgr()->seStart(Z2SE_OBJ_CRVN_URA_GATE, &crvSteel->current.pos, 0, 0, 1.0f, + case 62: { + daObjCRVSTEEL_c* crtSteel = (daObjCRVSTEEL_c*)fopAcM_SearchByName(fpcNm_Obj_CRVSTEEL_e); + if (i_this->demo_timer == (s16)(20 + AREG_S(4))) { + crtSteel->OpenSet(20.0f + AREG_F(3), 350.0f + AREG_F(4)); + Z2GetAudioMgr()->seStart(Z2SE_OBJ_CRVN_URA_GATE, &crtSteel->current.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); } - if (i_this->field_0x16a0 == (s16)(130 + AREG_S(5))) { - crvSteel->CloseSet(-40.0f + AREG_F(5)); + if (i_this->demo_timer == (s16)(130 + AREG_S(5))) { + crtSteel->CloseSet(-40.0f + AREG_F(5)); } - if (i_this->field_0x16a0 == (s16)(140 + AREG_S(5))) { + if (i_this->demo_timer == (s16)(140 + AREG_S(5))) { dComIfGp_getVibration().StartShock(5, 0x4f, cXyz(0.0f, 1.0f, 0.0f)); } - if (i_this->field_0x16a0 != 170) { + if (i_this->demo_timer != 170) { break; } - rdb->mMode = 10; - rdb->field_0x680 = 0; - i_this->field_0x16e0.set(2834.0f, 490.0f, 1584.0f); - i_this->field_0x16d4.set(1978.0f, 87.0f, 1225.0f); - i_this->field_0x16ec.x = fabsf(i_this->field_0x16d4.x - i_this->field_0x16a4.x); - i_this->field_0x16ec.y = fabsf(i_this->field_0x16d4.y - i_this->field_0x16a4.y); - i_this->field_0x16ec.z = fabsf(i_this->field_0x16d4.z - i_this->field_0x16a4.z); - i_this->field_0x16f8.x = fabsf(i_this->field_0x16e0.x - i_this->field_0x16bc.x); - i_this->field_0x16f8.y = fabsf(i_this->field_0x16e0.y - i_this->field_0x16bc.y); - i_this->field_0x16f8.z = fabsf(i_this->field_0x16e0.z - i_this->field_0x16bc.z); - i_this->field_0x1710 = 0; - i_this->field_0x169e = 0x3f; - i_this->field_0x16a0 = 0; + boss->mMode = 10; + boss->field_0x680 = 0; + i_this->demo_cam_way.set(2834.0f, 490.0f, 1584.0f); + i_this->demo_cam_target.set(1978.0f, 87.0f, 1225.0f); + i_this->demo_cam_eye_spd.x = fabsf(i_this->demo_cam_target.x - i_this->demo_cam_eye.x); + i_this->demo_cam_eye_spd.y = fabsf(i_this->demo_cam_target.y - i_this->demo_cam_eye.y); + i_this->demo_cam_eye_spd.z = fabsf(i_this->demo_cam_target.z - i_this->demo_cam_eye.z); + i_this->demo_cam_way_spd.x = fabsf(i_this->demo_cam_way.x - i_this->demo_cam_ctr.x); + i_this->demo_cam_way_spd.y = fabsf(i_this->demo_cam_way.y - i_this->demo_cam_ctr.y); + i_this->demo_cam_way_spd.z = fabsf(i_this->demo_cam_way.z - i_this->demo_cam_ctr.z); + i_this->demo_cam_morf = 0; + i_this->demo_mode = 63; + i_this->demo_timer = 0; // fallthrough } - case 0x3f: { - if (i_this->field_0x16a0 == 40) { - rdb->field_0xfe4 = 1; + case 63: { + if (i_this->demo_timer == 40) { + boss->field_0xfe4 = 1; Z2GetAudioMgr()->bgmStart(Z2BGM_EVENT02, 0, 0); } - if (i_this->field_0x16a0 == 60) { - rdb->field_0x6d8 = 4; + if (i_this->demo_timer == 60) { + boss->field_0x6d8 = 4; } - if (i_this->field_0x16a0 > 60) { + if (i_this->demo_timer > 60) { cam_3d_morf(i_this, 0.05f + BREG_F(17)); - cLib_addCalc2(&i_this->field_0x1710, 0.05f + BREG_F(18), 1.0f, 0.0002f + BREG_F(19)); + cLib_addCalc2(&i_this->demo_cam_morf, 0.05f + BREG_F(18), 1.0f, 0.0002f + BREG_F(19)); } - if (i_this->field_0x16a0 == 110) { + if (i_this->demo_timer == 110) { daPy_getPlayerActorClass()->changeDemoMode(0x14, 0, 0, 0); } - if (i_this->field_0x16a0 != 220) { + if (i_this->demo_timer != 220) { break; } - i_this->field_0x16bc.set(1425.0f, 259.0f, 1583.0f); - i_this->field_0x16a4.set(2265.0f, 127.0f, 1011.0f); - i_this->field_0x16e0.set(1267.0f, 259.0f, 821.0f); - i_this->field_0x16d4.set(2265.0f, 127.0f, 1011.0f); - i_this->field_0x16ec.x = fabsf(i_this->field_0x16d4.x - i_this->field_0x16a4.x); - i_this->field_0x16ec.y = fabsf(i_this->field_0x16d4.y - i_this->field_0x16a4.y); - i_this->field_0x16ec.z = fabsf(i_this->field_0x16d4.z - i_this->field_0x16a4.z); - i_this->field_0x16f8.x = fabsf(i_this->field_0x16e0.x - i_this->field_0x16bc.x); - i_this->field_0x16f8.y = fabsf(i_this->field_0x16e0.y - i_this->field_0x16bc.y); - i_this->field_0x16f8.z = fabsf(i_this->field_0x16e0.z - i_this->field_0x16bc.z); - i_this->field_0x1710 = 0; - i_this->field_0x1714 = 60.0f; - i_this->field_0x169e = 0x40; - i_this->field_0x16a0 = 0; + i_this->demo_cam_ctr.set(1425.0f, 259.0f, 1583.0f); + i_this->demo_cam_eye.set(2265.0f, 127.0f, 1011.0f); + i_this->demo_cam_way.set(1267.0f, 259.0f, 821.0f); + i_this->demo_cam_target.set(2265.0f, 127.0f, 1011.0f); + i_this->demo_cam_eye_spd.x = fabsf(i_this->demo_cam_target.x - i_this->demo_cam_eye.x); + i_this->demo_cam_eye_spd.y = fabsf(i_this->demo_cam_target.y - i_this->demo_cam_eye.y); + i_this->demo_cam_eye_spd.z = fabsf(i_this->demo_cam_target.z - i_this->demo_cam_eye.z); + i_this->demo_cam_way_spd.x = fabsf(i_this->demo_cam_way.x - i_this->demo_cam_ctr.x); + i_this->demo_cam_way_spd.y = fabsf(i_this->demo_cam_way.y - i_this->demo_cam_ctr.y); + i_this->demo_cam_way_spd.z = fabsf(i_this->demo_cam_way.z - i_this->demo_cam_ctr.z); + i_this->demo_cam_morf = 0; + i_this->demo_cam_zoom = 60.0f; + i_this->demo_mode = 64; + i_this->demo_timer = 0; daPy_getPlayerActorClass()->changeDemoMode(0x14, 0, 0, 0); } // fallthrough - case 0x40: { - if (i_this->field_0x16a0 > 60) { + case 64: { + if (i_this->demo_timer > 60) { cam_3d_morf(i_this, 0.05f + BREG_F(17)); - cLib_addCalc2(&i_this->field_0x1710, 0.05f + BREG_F(18), 1.0f, 0.0002f + BREG_F(19)); + cLib_addCalc2(&i_this->demo_cam_morf, 0.05f + BREG_F(18), 1.0f, 0.0002f + BREG_F(19)); } - if (i_this->field_0x16a0 == 170) { + if (i_this->demo_timer == 170) { i_this->field_0x1720 = 0; } - if (i_this->field_0x16a0 == 250) { - local_184->mCamera.Reset(i_this->field_0x16bc, i_this->field_0x16a4); - local_184->mCamera.Start(); - local_184->mCamera.SetTrimSize(0); + if (i_this->demo_timer == 250) { + cam->mCamera.Reset(i_this->demo_cam_ctr, i_this->demo_cam_eye); + cam->mCamera.Start(); + cam->mCamera.SetTrimSize(0); dComIfGp_event_reset(); daPy_getPlayerActorClass()->cancelOriginalDemo(); - i_this->field_0x169e = 0; + i_this->demo_mode = 0; } } break; - case 0x46: { - if (!rdb->enemy.eventInfo.checkCommandDemoAccrpt()) { - fopAcM_orderPotentialEvent(&rdb->enemy, 2, 0xffff, 0); - rdb->enemy.eventInfo.onCondition(dEvtCnd_CANDEMO_e); + case 70: { + if (!boss->enemy.eventInfo.checkCommandDemoAccrpt()) { + fopAcM_orderPotentialEvent(&boss->enemy, 2, 0xffff, 0); + boss->enemy.eventInfo.onCondition(dEvtCnd_CANDEMO_e); return; } - local_184->mCamera.Stop(); - local_184->mCamera.SetTrimSize(3); - i_this->field_0x169e = 0x47; - i_this->field_0x1714 = 55.0f; - i_this->field_0x16a0 = 0; - i_this->field_0x1710 = 0; - i_this->field_0x16bc.set(1895.0, 159.0, -129.0); - i_this->field_0x16a4.set(1984.0, 151.0, 158.0); + cam->mCamera.Stop(); + cam->mCamera.SetTrimSize(3); + i_this->demo_mode = 71; + i_this->demo_cam_zoom = 55.0f; + i_this->demo_timer = 0; + i_this->demo_cam_morf = 0; + i_this->demo_cam_ctr.set(1895.0, 159.0, -129.0); + i_this->demo_cam_eye.set(1984.0, 151.0, 158.0); daPy_getPlayerActorClass()->changeOriginalDemo(); fpcM_Search(s_rddel_sub, i_this); - rdb->field_0x6d8 = 1; + boss->field_0x6d8 = 1; } // fallthrough - case 0x47: { - cStack_48.set(1800.0f, player->current.pos.y, -192.0f); - player->setPlayerPosAndAngle(&cStack_48, 0, 0); - if (i_this->field_0x16a0 == (s16)(2 + VREG_S(1))) { - daObjCRVGATE_c* crvGate = (daObjCRVGATE_c*)fopAcM_SearchByName(PROC_Obj_CRVGATE); - crvGate->SetB_Close(); + case 71: { + ato.set(1800.0f, pla->current.pos.y, -192.0f); + pla->setPlayerPosAndAngle(&ato, 0, 0); + if (i_this->demo_timer == (s16)(2 + VREG_S(1))) { + daObjCRVGATE_c* crtGate = (daObjCRVGATE_c*)fopAcM_SearchByName(fpcNm_Obj_CRVGATE_e); + crtGate->SetB_Close(); } - if (i_this->field_0x16a0 == (s16)(25 + VREG_S(0))) { + if (i_this->demo_timer == (s16)(25 + VREG_S(0))) { daPy_getPlayerActorClass()->changeDemoMode(0x19, 0, 0, 0); } - if (i_this->field_0x16a0 == 73) { - local_184->mCamera.Reset(i_this->field_0x16bc, i_this->field_0x16a4); - local_184->mCamera.Start(); - local_184->mCamera.SetTrimSize(0); + if (i_this->demo_timer == 73) { + cam->mCamera.Reset(i_this->demo_cam_ctr, i_this->demo_cam_eye); + cam->mCamera.Start(); + cam->mCamera.SetTrimSize(0); dComIfGp_event_reset(); daPy_getPlayerActorClass()->cancelOriginalDemo(); - i_this->field_0x169e = 0; + i_this->demo_mode = 0; } } break; - case 0x50: { - if (!a_this->eventInfo.checkCommandDemoAccrpt()) { - fopAcM_orderPotentialEvent(a_this, 2, 0xffff, 0); - a_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e); + case 80: { + if (!enemy->eventInfo.checkCommandDemoAccrpt()) { + fopAcM_orderPotentialEvent(enemy, 2, 0xffff, 0); + enemy->eventInfo.onCondition(dEvtCnd_CANDEMO_e); return; } - local_184->mCamera.Stop(); - local_184->mCamera.SetTrimSize(3); - i_this->field_0x169e = 0x51; - i_this->field_0x1714 = 55.0f; - i_this->field_0x16a0 = 0; - i_this->field_0x1710 = 0.0f; - a_this->current.pos.x = 1800.0f; - a_this->current.pos.z = 0.0f; - i_this->field_0x16bc.set(1631.0f, 195.0f, -224.0f); - i_this->field_0x16a4.set(1233.0f, 167.0f, 195.0f); + cam->mCamera.Stop(); + cam->mCamera.SetTrimSize(3); + i_this->demo_mode = 81; + i_this->demo_cam_zoom = 55.0f; + i_this->demo_timer = 0; + i_this->demo_cam_morf = 0.0f; + enemy->current.pos.x = 1800.0f; + enemy->current.pos.z = 0.0f; + i_this->demo_cam_ctr.set(1631.0f, 195.0f, -224.0f); + i_this->demo_cam_eye.set(1233.0f, 167.0f, 195.0f); daPy_getPlayerActorClass()->changeOriginalDemo(); } // fallthrough - case 0x51: { - a_this->current.angle.y = 0x8000; - a_this->shape_angle.y = 0x8000; - i_this->mTurnStep = 0; - cLib_addCalc2(&i_this->field_0x16bc.x, a_this->eyePos.x, 0.2f, 200.0f); - cLib_addCalc2(&i_this->field_0x16bc.y, a_this->eyePos.y, 0.2f, 200.0f); - cLib_addCalc2(&i_this->field_0x16bc.z, a_this->eyePos.z, 0.2f, 200.0f); - if (i_this->field_0x16a0 > 20) { - if (i_this->field_0x16a0 >= 52) { - if (i_this->field_0x16a0 == 52) { - i_this->field_0x16a4 = a_this->current.pos; - i_this->field_0x16a4.x += 300.0f + VREG_F(8); - i_this->field_0x16a4.y += 150.0f + VREG_F(9); - i_this->field_0x16a4.z -= 1400.0f + VREG_F(10); + case 81: { + enemy->current.angle.y = 0x8000; + enemy->shape_angle.y = 0x8000; + i_this->turn_step = 0; + cLib_addCalc2(&i_this->demo_cam_ctr.x, enemy->eyePos.x, 0.2f, 200.0f); + cLib_addCalc2(&i_this->demo_cam_ctr.y, enemy->eyePos.y, 0.2f, 200.0f); + cLib_addCalc2(&i_this->demo_cam_ctr.z, enemy->eyePos.z, 0.2f, 200.0f); + if (i_this->demo_timer > 20) { + if (i_this->demo_timer >= 52) { + if (i_this->demo_timer == 52) { + i_this->demo_cam_eye = enemy->current.pos; + i_this->demo_cam_eye.x += 300.0f + VREG_F(8); + i_this->demo_cam_eye.y += 150.0f + VREG_F(9); + i_this->demo_cam_eye.z -= 1400.0f + VREG_F(10); } } else { - i_this->field_0x16a4 = a_this->current.pos; - i_this->field_0x16a4.y += 400.0f + VREG_F(6); - i_this->field_0x16a4.z += 700.0f + VREG_F(7); + i_this->demo_cam_eye = enemy->current.pos; + i_this->demo_cam_eye.y += 400.0f + VREG_F(6); + i_this->demo_cam_eye.z += 700.0f + VREG_F(7); } } - if (i_this->field_0x16a0 == 140) { + if (i_this->demo_timer == 140) { dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[90]); dComIfGp_setNextStage("F_SP118", 0, 3, 0, 0.0f, 0, 1, 0, 0, 1, 0); } } break; - case 0x5a: { - if (!a_this->eventInfo.checkCommandDemoAccrpt()) { - fopAcM_orderPotentialEvent(a_this, 2, 0xffff, 0); - a_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e); + case 90: { + if (!enemy->eventInfo.checkCommandDemoAccrpt()) { + fopAcM_orderPotentialEvent(enemy, 2, 0xffff, 0); + enemy->eventInfo.onCondition(dEvtCnd_CANDEMO_e); return; } - local_184->mCamera.Stop(); - local_184->mCamera.SetTrimSize(3); - i_this->field_0x169e = 0x5b; - i_this->field_0x16a0 = 0; - i_this->field_0x1714 = 55.0f + KREG_F(7); - i_this->field_0x16a0 = 0; - i_this->field_0x1710 = 0; + cam->mCamera.Stop(); + cam->mCamera.SetTrimSize(3); + i_this->demo_mode = 91; + i_this->demo_timer = 0; + i_this->demo_cam_zoom = 55.0f + KREG_F(7); + i_this->demo_timer = 0; + i_this->demo_cam_morf = 0; daPy_getPlayerActorClass()->changeOriginalDemo(); horse->changeOriginalDemo(); - a_this->current.pos.set(-93640.0f, a_this->current.pos.y, 44000.0f); - a_this->current.angle.y = a_this->shape_angle.y = 0x8000; - i_this->field_0x16bc = a_this->current.pos; - i_this->field_0x16bc.y = a_this->eyePos.y + 200.0f + VREG_F(0); - i_this->field_0x16a4 = a_this->current.pos; - i_this->field_0x16a4.y += 300.0f + VREG_F(1); - i_this->field_0x16a4.z += 500.0f + VREG_F(2); + enemy->current.pos.set(-93640.0f, enemy->current.pos.y, 44000.0f); + enemy->current.angle.y = enemy->shape_angle.y = 0x8000; + i_this->demo_cam_ctr = enemy->current.pos; + i_this->demo_cam_ctr.y = enemy->eyePos.y + 200.0f + VREG_F(0); + i_this->demo_cam_eye = enemy->current.pos; + i_this->demo_cam_eye.y += 300.0f + VREG_F(1); + i_this->demo_cam_eye.z += 500.0f + VREG_F(2); horse->changeDemoMode(1, 0); daPy_getPlayerActorClass()->changeDemoMode(1, 0, 0, 0); } // fallthrough - case 0x5b: { - cStack_48.set(-93335.0f + JREG_F(17), horse->current.pos.y, 44500.0f); - horse->setHorsePosAndAngle(&cStack_48, 0); - cLib_addCalc2(&i_this->field_0x16bc.x, a_this->eyePos.x, 0.2f, 200.0f); - cLib_addCalc2(&i_this->field_0x16bc.y, 150.0f + a_this->eyePos.y + VREG_F(0), 0.2f, 200.0f); - cLib_addCalc2(&i_this->field_0x16bc.z, a_this->eyePos.z, 0.2f, 200.0f); - i_this->field_0x16a4.z += a_this->speed.z * (0.8f + VREG_F(3)); - if (i_this->field_0x16a0 == 111) { - i_this->field_0x169e = 0x5c; - i_this->field_0x16a0 = 0; - i_this->field_0x16a4 = a_this->current.pos; - i_this->field_0x16a4.x += -300.0f + VREG_F(5); - i_this->field_0x16a4.y += 100.0f + VREG_F(6); - i_this->field_0x16a4.z += -1300.0f + VREG_F(7); + case 91: { + ato.set(-93335.0f + JREG_F(17), horse->current.pos.y, 44500.0f); + horse->setHorsePosAndAngle(&ato, 0); + cLib_addCalc2(&i_this->demo_cam_ctr.x, enemy->eyePos.x, 0.2f, 200.0f); + cLib_addCalc2(&i_this->demo_cam_ctr.y, 150.0f + enemy->eyePos.y + VREG_F(0), 0.2f, 200.0f); + cLib_addCalc2(&i_this->demo_cam_ctr.z, enemy->eyePos.z, 0.2f, 200.0f); + i_this->demo_cam_eye.z += enemy->speed.z * (0.8f + VREG_F(3)); + if (i_this->demo_timer == 111) { + i_this->demo_mode = 92; + i_this->demo_timer = 0; + i_this->demo_cam_eye = enemy->current.pos; + i_this->demo_cam_eye.x += -300.0f + VREG_F(5); + i_this->demo_cam_eye.y += 100.0f + VREG_F(6); + i_this->demo_cam_eye.z += -1300.0f + VREG_F(7); } i_this->field_0x171c = 23.0f + JREG_F(7); if (!daPy_getPlayerActorClass()->checkHorseRide()) { - local_184->mCamera.Start(); - local_184->mCamera.SetTrimSize(0); + cam->mCamera.Start(); + cam->mCamera.SetTrimSize(0); dComIfGp_event_reset(); daPy_getPlayerActorClass()->cancelOriginalDemo(); - i_this->field_0x169e = 0; + i_this->demo_mode = 0; } } break; - case 0x5c: { - cLib_addCalc2(&i_this->field_0x16bc.x, a_this->eyePos.x, 0.2f, 200.0f); - cLib_addCalc2(&i_this->field_0x16bc.y, a_this->eyePos.y + 100.0f + VREG_F(8), 0.2f, 200.0f); - cLib_addCalc2(&i_this->field_0x16bc.z, a_this->eyePos.z, 0.2f, 200.0f); - if (i_this->field_0x16a0 != 60) { + case 92: { + cLib_addCalc2(&i_this->demo_cam_ctr.x, enemy->eyePos.x, 0.2f, 200.0f); + cLib_addCalc2(&i_this->demo_cam_ctr.y, enemy->eyePos.y + 100.0f + VREG_F(8), 0.2f, 200.0f); + cLib_addCalc2(&i_this->demo_cam_ctr.z, enemy->eyePos.z, 0.2f, 200.0f); + if (i_this->demo_timer != 60) { break; } - i_this->field_0x169e = 0x5d; - i_this->field_0x16a0 = 0; - i_this->field_0x16a4 = a_this->current.pos; - i_this->field_0x16a4.x += 100.0f + VREG_F(8); - i_this->field_0x16a4.y += 600.0f + VREG_F(9); - i_this->field_0x16a4.z += -500.0f + VREG_F(10); - i_this->field_0x16bc = local_194->enemy.current.pos; - i_this->field_0x16bc.y = local_194->enemy.current.pos.y + 100.0f + KREG_F(11); + i_this->demo_mode = 93; + i_this->demo_timer = 0; + i_this->demo_cam_eye = enemy->current.pos; + i_this->demo_cam_eye.x += 100.0f + VREG_F(8); + i_this->demo_cam_eye.y += 600.0f + VREG_F(9); + i_this->demo_cam_eye.z += -500.0f + VREG_F(10); + i_this->demo_cam_ctr = rider->enemy.current.pos; + i_this->demo_cam_ctr.y = rider->enemy.current.pos.y + 100.0f + KREG_F(11); } // fallthrough - case 0x5d: { - if (local_194 != NULL) { - cLib_addCalc2(&i_this->field_0x1710, 1000.0f, 1.0f, 100.0f + KREG_F(10)); - cLib_addCalc2(&i_this->field_0x16bc.x, local_194->enemy.current.pos.x, 0.5f + KREG_F(8), - i_this->field_0x1710); - cLib_addCalc2(&i_this->field_0x16bc.y, - local_194->enemy.current.pos.y + 100.0f + KREG_F(11), 0.5f + KREG_F(8), - i_this->field_0x1710); - cLib_addCalc2(&i_this->field_0x16bc.z, local_194->enemy.current.pos.z, 0.5f + KREG_F(8), - i_this->field_0x1710); - cLib_addCalc2(&i_this->field_0x16a4.x, local_194->enemy.current.pos.x - 10.0f, 0.05f, + case 93: { + if (rider != NULL) { + cLib_addCalc2(&i_this->demo_cam_morf, 1000.0f, 1.0f, 100.0f + KREG_F(10)); + cLib_addCalc2(&i_this->demo_cam_ctr.x, rider->enemy.current.pos.x, 0.5f + KREG_F(8), + i_this->demo_cam_morf); + cLib_addCalc2(&i_this->demo_cam_ctr.y, + rider->enemy.current.pos.y + 100.0f + KREG_F(11), 0.5f + KREG_F(8), + i_this->demo_cam_morf); + cLib_addCalc2(&i_this->demo_cam_ctr.z, rider->enemy.current.pos.z, 0.5f + KREG_F(8), + i_this->demo_cam_morf); + cLib_addCalc2(&i_this->demo_cam_eye.x, rider->enemy.current.pos.x - 10.0f, 0.05f, 12.0f + NREG_F(3)); - if (i_this->field_0x16a0 >= 40) { - if (i_this->field_0x16a0 == 40) { - i_this->field_0x5c4 = local_194->enemy.current.pos; + if (i_this->demo_timer >= 40) { + if (i_this->demo_timer == 40) { + i_this->eye = rider->enemy.current.pos; } for (int i = 0; i < 2; i++) { @@ -4835,155 +4844,153 @@ static void demo_camera(e_wb_class* i_this) { dPa_RM(ID_ZM_S_KEYLIGHT00), dPa_RM(ID_ZM_S_KEYLIGHT01), }; - i_this->field_0x17d0[i] = dComIfGp_particle_set( - i_this->field_0x17d0[i], key_eno[i], &i_this->field_0x5c4, 0, 0); + i_this->w_eff_id2[i] = dComIfGp_particle_set( + i_this->w_eff_id2[i], key_eno[i], &i_this->eye, 0, 0); } - local_3c = player->eyePos - i_this->field_0x5c4; - cMtx_YrotS(*calc_mtx, cM_atan2s(local_3c.x, local_3c.z)); - cMtx_XrotM(*calc_mtx, -cM_atan2s(local_3c.y, JMAFastSqrt(local_3c.x * local_3c.x + - local_3c.z * local_3c.z))); - local_3c.x = 0.0f; - local_3c.y = 0.0f; - local_3c.z = 30.0f + VREG_F(11); - MtxPosition(&local_3c, &cStack_48); - i_this->field_0x5c4 += cStack_48; + mae = pla->eyePos - i_this->eye; + cMtx_YrotS(*calc_mtx, cM_atan2s(mae.x, mae.z)); + cMtx_XrotM(*calc_mtx, -cM_atan2s(mae.y, JMAFastSqrt(SQUARE(mae.x) + SQUARE(mae.z)))); + mae.x = 0.0f; + mae.y = 0.0f; + mae.z = 30.0f + VREG_F(11); + MtxPosition(&mae, &ato); + i_this->eye += ato; } - if (i_this->field_0x16a0 == 100) { - i_this->field_0x169e = 0x5e; - i_this->field_0x16a0 = 0; - i_this->field_0x16a4.set(-93217.0f, -5783.0f, 44734.0f); - i_this->field_0x16bc.set(-92351.0f, -4742.0f, 43295.0f); - i_this->field_0x5c4 = i_this->field_0x16bc; - i_this->field_0x1430 = 1; - a_this->current.angle.y = player->shape_angle.y; - fopAcM_delete(&local_194->enemy); + if (i_this->demo_timer == 100) { + i_this->demo_mode = 94; + i_this->demo_timer = 0; + i_this->demo_cam_eye.set(-93217.0f, -5783.0f, 44734.0f); + i_this->demo_cam_ctr.set(-92351.0f, -4742.0f, 43295.0f); + i_this->eye = i_this->demo_cam_ctr; + i_this->demo_stop = 1; + enemy->current.angle.y = pla->shape_angle.y; + fopAcM_delete(&rider->enemy); } } } break; - case 0x5e: { + case 94: { for (int i = 0; i < 2; i++) { static u16 key_eno[2] = { dPa_RM(ID_ZM_S_KEYLIGHT00), dPa_RM(ID_ZM_S_KEYLIGHT01), }; - i_this->field_0x17d0[i] = dComIfGp_particle_set(i_this->field_0x17d0[i], key_eno[i], - &i_this->field_0x5c4, 0, 0); + i_this->w_eff_id2[i] = dComIfGp_particle_set(i_this->w_eff_id2[i], key_eno[i], + &i_this->eye, 0, 0); } - local_3c = player->eyePos - i_this->field_0x5c4; - if (local_3c.abs() < 50.0f) { - i_this->field_0x169e = 0x5f; - i_this->field_0x16a0 = 0; - daPy_getPlayerActorClass()->changeDemoMode(0x3b, 0, 0, 0); - i_this->field_0x5c4 = player->eyePos; + mae = pla->eyePos - i_this->eye; + if (mae.abs() < 50.0f) { + i_this->demo_mode = 95; + i_this->demo_timer = 0; + daPy_getPlayerActorClass()->changeDemoMode(59, 0, 0, 0); + i_this->eye = pla->eyePos; } else { - cMtx_YrotS(*calc_mtx, cM_atan2s(local_3c.x, local_3c.z)); - cMtx_XrotM(*calc_mtx, -cM_atan2s(local_3c.y, JMAFastSqrt(local_3c.x * local_3c.x + - local_3c.z * local_3c.z))); - local_3c.x = 0.0f; - local_3c.y = 0.0f; - local_3c.z = 30.0f + VREG_F(11); - MtxPosition(&local_3c, &cStack_48); - i_this->field_0x5c4 += cStack_48; + cMtx_YrotS(*calc_mtx, cM_atan2s(mae.x, mae.z)); + cMtx_XrotM(*calc_mtx, -cM_atan2s(mae.y, JMAFastSqrt(SQUARE(mae.x) + SQUARE(mae.z)))); + mae.x = 0.0f; + mae.y = 0.0f; + mae.z = 30.0f + VREG_F(11); + MtxPosition(&mae, &ato); + i_this->eye += ato; } } // fallthrough - case 0x5f: { - cLib_addCalc2(&i_this->field_0x16bc.x, i_this->field_0x5c4.x, 0.2f, 100.0f); - cLib_addCalc2(&i_this->field_0x16bc.y, i_this->field_0x5c4.y, 0.2f, 100.0f); - cLib_addCalc2(&i_this->field_0x16bc.z, i_this->field_0x5c4.z, 0.2f, 100.0f); - if (i_this->field_0x169e == 95) { - if (i_this->field_0x16a0 == 50) { + case 95: { + cLib_addCalc2(&i_this->demo_cam_ctr.x, i_this->eye.x, 0.2f, 100.0f); + cLib_addCalc2(&i_this->demo_cam_ctr.y, i_this->eye.y, 0.2f, 100.0f); + cLib_addCalc2(&i_this->demo_cam_ctr.z, i_this->eye.z, 0.2f, 100.0f); + if (i_this->demo_mode == 95) { + if (i_this->demo_timer == 50) { daPy_getPlayerActorClass()->changeDemoMode(0xb, 0xf3, 0, 0); } - if (i_this->field_0x16a0 >= 60) { - cLib_addCalc2(&i_this->field_0x1714, 30.0f, 0.2f, 1.5f); + if (i_this->demo_timer >= 60) { + cLib_addCalc2(&i_this->demo_cam_zoom, 30.0f, 0.2f, 1.5f); } - if (i_this->field_0x16a0 >= 120 && !dMsgObject_isTalkNowCheck()) { - i_this->field_0x169e = 0x60; - i_this->field_0x16a0 = 0; + if (i_this->demo_timer >= 120 && !dMsgObject_isTalkNowCheck()) { + i_this->demo_mode = 96; + i_this->demo_timer = 0; daPy_getPlayerActorClass()->changeDemoMode(1, 1, 0, 0); - i_this->field_0x16bc.set(-93375.0f, -5700.0f, 44622.0f); - i_this->field_0x16a4.set(-93153.0f, -5635.0f, 44717.0f); - i_this->field_0x1714 = 55.0f; - a_this->current.pos = player->current.pos; - a_this->current.pos.z += 3000.0f; + i_this->demo_cam_ctr.set(-93375.0f, -5700.0f, 44622.0f); + i_this->demo_cam_eye.set(-93153.0f, -5635.0f, 44717.0f); + i_this->demo_cam_zoom = 55.0f; + enemy->current.pos = pla->current.pos; + enemy->current.pos.z += 3000.0f; } } } break; - case 0x60: { - if (i_this->field_0x16a0 >= 100) { - fopAc_ac_c* local_1b0 = fopAcM_SearchByName(PROC_NPC_COACH); - a_this->current.pos = local_1b0->eyePos; - a_this->current.pos.z = a_this->current.pos.z - VREG_F(17); + case 96: { + if (i_this->demo_timer >= 100) { + fopAc_ac_c* coach = fopAcM_SearchByName(fpcNm_NPC_COACH_e); + enemy->current.pos = coach->eyePos; + enemy->current.pos.z = enemy->current.pos.z - VREG_F(17); } - if (i_this->field_0x16a0 >= 220 && !dMsgObject_isTalkNowCheck()) { - i_this->field_0x169e = 0x61; - i_this->field_0x16a0 = 0; + if (i_this->demo_timer >= 220 && !dMsgObject_isTalkNowCheck()) { + i_this->demo_mode = 97; + i_this->demo_timer = 0; } } break; - case 0x61: { - fopAc_ac_c* local_1b4 = fopAcM_SearchByName(PROC_NPC_COACH); - a_this->current.pos = local_1b4->eyePos; - a_this->current.pos.z = a_this->current.pos.z - VREG_F(17); - if (i_this->field_0x16a0 == 120) { + case 97: { + fopAc_ac_c* coach = fopAcM_SearchByName(fpcNm_NPC_COACH_e); + enemy->current.pos = coach->eyePos; + enemy->current.pos.z = enemy->current.pos.z - VREG_F(17); + if (i_this->demo_timer == 120) { dComIfGp_setNextStage("F_SP121", 99, 13, 2, 0.0f, 0, 1, 0, 0, 1, 0); } } break; } - if (i_this->field_0x169e != 0) { - cStack_60 = i_this->field_0x16bc; - cStack_54 = i_this->field_0x16a4; - s16 local_1d0 = 0; + if (i_this->demo_mode != 0) { + center = i_this->demo_cam_ctr; + eye = i_this->demo_cam_eye; + s16 bank = 0; if (i_this->field_0x171c > 0.0f) { - i_this->field_0x16bc.y += i_this->field_0x171c * cM_ssin(i_this->field_0x16a0 * 0x2400); - local_1d0 = (10.0f + BREG_F(4)) * - (i_this->field_0x171c * cM_scos(i_this->field_0x16a0 * 0x2100)); + i_this->demo_cam_ctr.y += i_this->field_0x171c * cM_ssin(i_this->demo_timer * 0x2400); + bank = (10.0f + BREG_F(4)) * + (i_this->field_0x171c * cM_scos(i_this->demo_timer * 0x2100)); cLib_addCalc0(&i_this->field_0x171c, 1.0f, 1.5f + BREG_F(5)); } - local_184->mCamera.Set(cStack_60, cStack_54, local_1d0, i_this->field_0x1714); - i_this->field_0x16a0++; - if (i_this->field_0x16a0 > 10000) { - i_this->field_0x16a0 = 10000; + cam->mCamera.Set(center, eye, bank, i_this->demo_cam_zoom); + i_this->demo_timer++; + if (i_this->demo_timer > 10000) { + i_this->demo_timer = 10000; } - if (i_this->field_0x169e < 10 || (i_this->field_0x169e >= 30 && i_this->field_0x169e < 60)) { + if (i_this->demo_mode < 10 || (i_this->demo_mode >= 30 && i_this->demo_mode < 60)) { if (dComIfGp_getEvent()->checkSkipEdge()) { - cDmr_SkipInfo = 0x28; + cDmr_SkipInfo = 40; Z2GetAudioMgr()->bgmStop(0, 0); - if (i_this->field_0x169e < 10 || dComIfG_play_c::getLayerNo(0) == 4) { + if (i_this->demo_mode < 10 || dComIfG_play_c::getLayerNo(0) == 4) { dComIfGp_setNextStage("F_SP102", 1, 0, 4, 0.0f, 0, 1, 13, 0, 1, 0); Z2GetAudioMgr()->bgmStreamStop(0x1e); - if (i_this->field_0x169e < 10) { + if (i_this->demo_mode < 10) { cDmr_SkipInfo = 0; } - i_this->field_0x169e = 1000; - } else if (i_this->field_0x169e < 50) { + i_this->demo_mode = 1000; + } else if (i_this->demo_mode < 50) { dComIfGp_setNextStage("F_SP102", 0, 0, 0, 0.0f, 0, 1, 13, 0, 1, 0); Z2GetAudioMgr()->bgmStreamStop(0x1e); - i_this->field_0x169e = 1000; + i_this->demo_mode = 1000; } else { cDmr_SkipInfo = 0; mDoGph_gInf_c::fadeIn(0.066, g_blackColor); - i_this->mActionID = ACT_LR_DAMAGE; + i_this->action = ACT_LR_DAMAGE; anm_init(i_this, 0x12, 0.0f, 2, 1.0); - i_this->mActionMode = 3; - a_this->current.pos.x = 828.0f; - a_this->current.pos.z = 554.0f; - a_this->current.angle.y = a_this->shape_angle.y = 0x800; - rdb->mMode = 7; - rdb->field_0xfcf = 0; - rdb->field_0x6e0 = 0; - rdb->field_0x6d8 = 3; - local_184->mCamera.Reset(i_this->field_0x16bc, i_this->field_0x16a4); - local_184->mCamera.Start(); - local_184->mCamera.SetTrimSize(0); + i_this->ride_mode = 3; + enemy->current.pos.x = 828.0f; + enemy->current.pos.z = 554.0f; + enemy->current.angle.y = enemy->shape_angle.y = 2048; + boss->mMode = 7; + boss->field_0xfcf = 0; + boss->field_0x6e0 = 0; + boss->field_0x6d8 = 3; + cam->mCamera.Reset(i_this->demo_cam_ctr, i_this->demo_cam_eye); + cam->mCamera.Start(); + cam->mCamera.SetTrimSize(0); dComIfGp_event_reset(); daPy_getPlayerActorClass()->cancelOriginalDemo(); - i_this->field_0x169e = 0; + i_this->demo_mode = 0; Z2GetAudioMgr()->subBgmStart(Z2BGM_FACE_OFF_BATTLE3); } } @@ -4992,117 +4999,117 @@ static void demo_camera(e_wb_class* i_this) { } static void anm_se_eff_set(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - J3DModel* model = i_this->mpModelMorf->getModel(); + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; + J3DModel* model = i_this->anm_p->getModel(); - if (i_this->mAnmID == 12 || i_this->mAnmID == 13) { - if (i_this->mpModelMorf->checkFrame(9.0f)) { - i_this->mZ2Ride.startCreatureSound(Z2SE_CM_BODYFALL_L, 0, -1); + if (i_this->anmID == 12 || i_this->anmID == 13) { + if (i_this->anm_p->checkFrame(9.0f)) { + i_this->sound.startCreatureSound(Z2SE_CM_BODYFALL_L, 0, -1); i_this->field_0x1721 = 1; } - } else if (i_this->mAnmID == 38) { - i_this->field_0x17c4 = dComIfGp_particle_set( - i_this->field_0x17c4, dPa_RM(ID_ZI_S_BB_STARTHANAIKI), - &a_this->current.pos, &a_this->tevStr); + } else if (i_this->anmID == 38) { + i_this->anm_se_eff = dComIfGp_particle_set( + i_this->anm_se_eff, dPa_RM(ID_ZI_S_BB_STARTHANAIKI), + &actor->current.pos, &actor->tevStr); - JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(i_this->field_0x17c4); + JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(i_this->anm_se_eff); if (emitter != NULL) { emitter->setGlobalSRTMatrix(model->getAnmMtx(15)); } - if (i_this->mpModelMorf->checkFrame(1.0f)) { - cXyz scale(a_this->scale.z, a_this->scale.z, a_this->scale.z); - dComIfGp_particle_set(dPa_RM(ID_ZI_S_BB_STARTCLOD), &a_this->current.pos, - &a_this->tevStr, &a_this->shape_angle, &scale); - dComIfGp_particle_set(dPa_RM(ID_ZI_S_BB_STARTFOOTMARK), &a_this->current.pos, - &a_this->tevStr, &a_this->shape_angle, &scale); + if (i_this->anm_p->checkFrame(1.0f)) { + cXyz sc(actor->scale.z, actor->scale.z, actor->scale.z); + dComIfGp_particle_set(dPa_RM(ID_ZI_S_BB_STARTCLOD), &actor->current.pos, + &actor->tevStr, &actor->shape_angle, &sc); + dComIfGp_particle_set(dPa_RM(ID_ZI_S_BB_STARTFOOTMARK), &actor->current.pos, + &actor->tevStr, &actor->shape_angle, &sc); } - } else if (i_this->mAnmID == 5) { - if (i_this->mpModelMorf->checkFrame(1.0f)) { - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_WB_V_CRASH, -1); - i_this->mZ2Ride.startCreatureSound(Z2SE_EN_WB_RUNDOWN, 0, -1); - } else if (i_this->mpModelMorf->checkFrame(15.0f)) { - i_this->mZ2Ride.startCreatureSound(Z2SE_CM_BODYFALL_L, 0, -1); + } else if (i_this->anmID == 5) { + if (i_this->anm_p->checkFrame(1.0f)) { + i_this->sound.startCreatureVoice(Z2SE_EN_WB_V_CRASH, -1); + i_this->sound.startCreatureSound(Z2SE_EN_WB_RUNDOWN, 0, -1); + } else if (i_this->anm_p->checkFrame(15.0f)) { + i_this->sound.startCreatureSound(Z2SE_CM_BODYFALL_L, 0, -1); } - } else if (i_this->mAnmID == 6) { - if (i_this->mpModelMorf->checkFrame(2.0f)) { - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_WB_V_UP, -1); + } else if (i_this->anmID == 6) { + if (i_this->anm_p->checkFrame(2.0f)) { + i_this->sound.startCreatureVoice(Z2SE_EN_WB_V_UP, -1); } - } else if (i_this->mAnmID == 7) { - if (i_this->mpModelMorf->checkFrame(18.0f) || i_this->mpModelMorf->checkFrame(40.0f)) { - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_WB_V_BREATH, -1); + } else if (i_this->anmID == 7) { + if (i_this->anm_p->checkFrame(18.0f) || i_this->anm_p->checkFrame(40.0f)) { + i_this->sound.startCreatureVoice(Z2SE_EN_WB_V_BREATH, -1); } - } else if (i_this->mAnmID == 8) { - if (i_this->mpModelMorf->checkFrame(4.0f)) { - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_WB_V_INANAKI_DMG, -1); + } else if (i_this->anmID == 8) { + if (i_this->anm_p->checkFrame(4.0f)) { + i_this->sound.startCreatureVoice(Z2SE_EN_WB_V_INANAKI_DMG, -1); } - } else if (i_this->mAnmID == 12) { - if (i_this->mpModelMorf->checkFrame(1.0f)) { - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_WB_V_DOWN, -1); + } else if (i_this->anmID == 12) { + if (i_this->anm_p->checkFrame(1.0f)) { + i_this->sound.startCreatureVoice(Z2SE_EN_WB_V_DOWN, -1); } - } else if (i_this->mAnmID == 13) { - if (i_this->mpModelMorf->checkFrame(1.0f)) { - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_WB_V_DOWN, -1); + } else if (i_this->anmID == 13) { + if (i_this->anm_p->checkFrame(1.0f)) { + i_this->sound.startCreatureVoice(Z2SE_EN_WB_V_DOWN, -1); } - } else if (i_this->mAnmID == 16) { - if (i_this->mpModelMorf->checkFrame(12.0f)) { - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_WB_V_BREATH, -1); + } else if (i_this->anmID == 16) { + if (i_this->anm_p->checkFrame(12.0f)) { + i_this->sound.startCreatureVoice(Z2SE_EN_WB_V_BREATH, -1); } - } else if (i_this->mAnmID == 17) { - if (i_this->mpModelMorf->checkFrame(16.0f)) { - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_WB_V_BREATH, -1); + } else if (i_this->anmID == 17) { + if (i_this->anm_p->checkFrame(16.0f)) { + i_this->sound.startCreatureVoice(Z2SE_EN_WB_V_BREATH, -1); } - } else if (i_this->mAnmID == 9) { - if (i_this->mpModelMorf->checkFrame(1.0f)) { - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_WB_V_DAMAGE, -1); + } else if (i_this->anmID == 9) { + if (i_this->anm_p->checkFrame(1.0f)) { + i_this->sound.startCreatureVoice(Z2SE_EN_WB_V_DAMAGE, -1); } - } else if (i_this->mAnmID == 27) { - if (i_this->mpModelMorf->checkFrame(14.0f)) { - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_WB_V_INANAKI, -1); + } else if (i_this->anmID == 27) { + if (i_this->anm_p->checkFrame(14.0f)) { + i_this->sound.startCreatureVoice(Z2SE_EN_WB_V_INANAKI, -1); } - } else if (i_this->mAnmID == 31) { - if (i_this->mpModelMorf->checkFrame(2.0f)) { - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_WB_V_RIDE, -1); + } else if (i_this->anmID == 31) { + if (i_this->anm_p->checkFrame(2.0f)) { + i_this->sound.startCreatureVoice(Z2SE_EN_WB_V_RIDE, -1); } - } else if (i_this->mAnmID == 32 || i_this->mAnmID == 33) { - if (i_this->mpModelMorf->checkFrame(7.5f) || i_this->mpModelMorf->checkFrame(12.5f)) { - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_WB_V_BREATH, -1); + } else if (i_this->anmID == 32 || i_this->anmID == 33) { + if (i_this->anm_p->checkFrame(7.5f) || i_this->anm_p->checkFrame(12.5f)) { + i_this->sound.startCreatureVoice(Z2SE_EN_WB_V_BREATH, -1); } - } else if (i_this->mAnmID == 34) { - if (i_this->mpModelMorf->checkFrame(3.0f)) { - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_WB_V_DAMAGE, -1); + } else if (i_this->anmID == 34) { + if (i_this->anm_p->checkFrame(3.0f)) { + i_this->sound.startCreatureVoice(Z2SE_EN_WB_V_DAMAGE, -1); } - } else if (i_this->mAnmID == 40) { - if (i_this->mpModelMorf->checkFrame(6.0f)) { - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_WB_V_BREATH, -1); + } else if (i_this->anmID == 40) { + if (i_this->anm_p->checkFrame(6.0f)) { + i_this->sound.startCreatureVoice(Z2SE_EN_WB_V_BREATH, -1); } - } else if (i_this->mAnmID == 42) { - if (i_this->mpModelMorf->checkFrame(11.0f)) { - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_WB_V_BREATH, -1); + } else if (i_this->anmID == 42) { + if (i_this->anm_p->checkFrame(11.0f)) { + i_this->sound.startCreatureVoice(Z2SE_EN_WB_V_BREATH, -1); } - } else if (i_this->mAnmID == 43) { - if (i_this->mpModelMorf->checkFrame(25.0f)) { - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_WB_V_BREATH, -1); + } else if (i_this->anmID == 43) { + if (i_this->anm_p->checkFrame(25.0f)) { + i_this->sound.startCreatureVoice(Z2SE_EN_WB_V_BREATH, -1); } } // Special sound effects for the leader Bulblin - if (i_this->field_0x79d != 0) { - if (i_this->mAnmID == 0x20 || i_this->mAnmID == 0x21) { - if (i_this->mpModelMorf->checkFrame(4.0f)) { - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_BB_V_BREATH, -1); + if (i_this->leader != 0) { + if (i_this->anmID == 32 || i_this->anmID == 33) { + if (i_this->anm_p->checkFrame(4.0f)) { + i_this->sound.startCreatureVoice(Z2SE_EN_BB_V_BREATH, -1); } - } else if (i_this->mAnmID == 0x2B) { - if (i_this->mpModelMorf->checkFrame(14.0f)) { - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_BB_V_BREATH, -1); + } else if (i_this->anmID == 43) { + if (i_this->anm_p->checkFrame(14.0f)) { + i_this->sound.startCreatureVoice(Z2SE_EN_BB_V_BREATH, -1); } - } else if (i_this->mAnmID == 0x2A) { - if (i_this->mpModelMorf->checkFrame(6.0f)) { - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_BB_V_BREATH, -1); + } else if (i_this->anmID == 42) { + if (i_this->anm_p->checkFrame(6.0f)) { + i_this->sound.startCreatureVoice(Z2SE_EN_BB_V_BREATH, -1); } - } else if (i_this->mAnmID == 0x1B) { - if (i_this->mpModelMorf->checkFrame(17.0f)) { - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_BB_V_INANAKI, -1); + } else if (i_this->anmID == 27) { + if (i_this->anm_p->checkFrame(17.0f)) { + i_this->sound.startCreatureVoice(Z2SE_EN_BB_V_INANAKI, -1); } } } @@ -5123,188 +5130,188 @@ static int daE_WB_Execute(e_wb_class* i_this) { } } - if (i_this->field_0x169e == 1000) { + if (i_this->demo_mode == 1000) { return 1; } - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; - cXyz local_130; - cXyz local_13c; + cXyz mae; + cXyz ato; - a_this->scale.z = l_HIO.base_size; + actor->scale.z = l_HIO.base_size; - if (fopAcM_CheckCondition(a_this, fopAcCnd_NODRAW_e)) { - i_this->field_0x5bf = 1; + if (fopAcM_CheckCondition(actor, fopAcCnd_NODRAW_e)) { + i_this->no_draw = 1; } else { - i_this->field_0x5bf = 0; + i_this->no_draw = 0; } - if (i_this->field_0x79d != 0) { - a_this->scale.z = a_this->scale.z * l_HIO.leader_size_ratio; + if (i_this->leader != LEADER_NONE) { + actor->scale.z = actor->scale.z * l_HIO.leader_size_ratio; } - i_this->field_0x68e++; + i_this->counter++; - if (i_this->field_0x1430 == 0) { - fopAcM_OffStatus(a_this, 0); - a_this->attention_info.flags = 0; - i_this->mStatusFlags &= (u16)3; + if (i_this->demo_stop == 0) { + fopAcM_OffStatus(actor, 0); + actor->attention_info.flags = 0; + i_this->status_flag &= (u16)3; for (int i = 0; i < 4; i++) { - if (i_this->field_0x698[i] != 0) { - i_this->field_0x698[i]--; + if (i_this->timer[i] != 0) { + i_this->timer[i]--; } } - if (i_this->field_0x6a0 != 0) { - i_this->field_0x6a0--; + if (i_this->wait_timer != 0) { + i_this->wait_timer--; } - if (i_this->field_0x1432 != 0) { - i_this->field_0x1432--; + if (i_this->dash_timer != 0) { + i_this->dash_timer--; } action(i_this); } - if (i_this->field_0x79d != 0 || i_this->field_0x169e != 0) { + if (i_this->leader != 0 || i_this->demo_mode != 0) { demo_camera(i_this); } - if (i_this->field_0x1430 != 0) { - a_this->eyePos = a_this->current.pos; + if (i_this->demo_stop != 0) { + actor->eyePos = actor->current.pos; return 1; } - if (i_this->field_0x79d == 0 || i_this->mSpeedCapTimer == 0) { - cXyz* move_p = i_this->mStts.GetCCMoveP(); + if (i_this->leader == 0 || i_this->gake_flg == GAKE_FLG_NONE) { + cXyz* move_p = i_this->Stts.GetCCMoveP(); if (move_p != NULL) { f32 move_scale = TREG_F(19) + 0.3f; - a_this->current.pos.x += move_p->x * move_scale; - a_this->current.pos.y += move_p->y * move_scale; - a_this->current.pos.z += move_p->z * move_scale; + actor->current.pos.x += move_p->x * move_scale; + actor->current.pos.y += move_p->y * move_scale; + actor->current.pos.z += move_p->z * move_scale; } } - if ((i_this->field_0x5bf == 0) && !dComIfGp_event_runCheck()) { + if ((i_this->no_draw == 0) && !dComIfGp_event_runCheck()) { s16 wall_check = e_wb_wall_check(i_this); if (wall_check != 0 && wall_check > -0x2000 && wall_check < 0x2000) { - if ((i_this->mActionID == ACT_C_F_RUN || i_this->mActionID == ACT_PL_RIDE2 || - i_this->mActionID == ACT_A_RUN) && - (a_this->speedF >= 5.0f)) + if ((i_this->action == ACT_C_F_RUN || i_this->action == ACT_PL_RIDE2 || + i_this->action == ACT_A_RUN) && + (actor->speedF >= 5.0f)) { - if (a_this->speedF > l_HIO.max_speed - 5.0f) { - if (i_this->mActionID == ACT_PL_RIDE2) { + if (actor->speedF > l_HIO.max_speed - 5.0f) { + if (i_this->action == ACT_PL_RIDE2) { dComIfGp_getVibration().StartShock(8, 0x4f, cXyz(0.0f, 1.0f, 0.0f)); } - i_this->mActionID = ACT_BG_DAMAGE; - i_this->mActionMode = 0; - i_this->mAnimDuration = 50.0f; - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_WB_V_DAMAGE, -1); + i_this->action = ACT_BG_DAMAGE; + i_this->ride_mode = 0; + i_this->anm_time = 50.0f; + i_this->sound.startCreatureVoice(Z2SE_EN_WB_V_DAMAGE, -1); } else { - if (i_this->mActionID != ACT_PL_RIDE2) { - if (i_this->mActionID == ACT_C_F_RUN) { - i_this->mActionID = ACT_F_WAIT; + if (i_this->action != ACT_PL_RIDE2) { + if (i_this->action == ACT_C_F_RUN) { + i_this->action = ACT_F_WAIT; } else { - i_this->mActionID = ACT_WAIT; + i_this->action = ACT_WAIT; } - i_this->mActionMode = 0; + i_this->ride_mode = 0; } } - if (i_this->mActionID != ACT_PL_RIDE2) { - a_this->current.pos = a_this->old.pos; + if (i_this->action != ACT_PL_RIDE2) { + actor->current.pos = actor->old.pos; } } dBgS_LinChk linChk; - cXyz pos1; - pos1 = a_this->current.pos; - pos1.y += 100.0f; - linChk.Set(&pos1, &a_this->eyePos, a_this); + cXyz start; + start = actor->current.pos; + start.y += 100.0f; + linChk.Set(&start, &actor->eyePos, actor); if (dComIfG_Bgsp().LineCross(&linChk)) { - cMtx_YrotS(*calc_mtx, a_this->shape_angle.y); - local_130.x = 0.0f; - local_130.y = 0.0f; - local_130.z = KREG_F(11) + -20.0f; - MtxPosition(&local_130, &local_13c); - a_this->current.pos += local_13c; + cMtx_YrotS(*calc_mtx, actor->shape_angle.y); + mae.x = 0.0f; + mae.y = 0.0f; + mae.z = KREG_F(11) + -20.0f; + MtxPosition(&mae, &ato); + actor->current.pos += ato; - if (i_this->mActionID != ACT_PL_RIDE2) { - a_this->speedF = 0.0f; + if (i_this->action != ACT_PL_RIDE2) { + actor->speedF = 0.0f; } } } } - i_this->mAcch.CrrPos(dComIfG_Bgsp()); - cLib_addCalcAngleS2(&a_this->shape_angle.y, a_this->current.angle.y, 4, 0x2000); + i_this->Bgc.CrrPos(dComIfG_Bgsp()); + cLib_addCalcAngleS2(&actor->shape_angle.y, actor->current.angle.y, 4, 0x2000); - if (i_this->mAcch.ChkGroundHit()) { + if (i_this->Bgc.ChkGroundHit()) { dBgS_GndChk gndChk; - Vec local_154; - cXyz pos2; + Vec pos; + cXyz ato2; - cMtx_YrotS(*calc_mtx, a_this->shape_angle.y); - local_130.x = 0.0f; - local_130.y = 200.0f; - local_130.z = 100.0f; - MtxPosition(&local_130, &local_13c); - local_13c += a_this->current.pos; + cMtx_YrotS(*calc_mtx, actor->shape_angle.y); + mae.x = 0.0f; + mae.y = 200.0f; + mae.z = 100.0f; + MtxPosition(&mae, &ato); + ato += actor->current.pos; - local_130.z = -100.0f; - MtxPosition(&local_130, &pos2); - pos2 += a_this->current.pos; + mae.z = -100.0f; + MtxPosition(&mae, &ato2); + ato2 += actor->current.pos; - local_154.x = local_13c.x; - local_154.y = local_13c.y; - local_154.z = local_13c.z; + pos.x = ato.x; + pos.y = ato.y; + pos.z = ato.z; - gndChk.SetPos(&local_154); - local_13c.y = dComIfG_Bgsp().GroundCross(&gndChk); + gndChk.SetPos(&pos); + ato.y = dComIfG_Bgsp().GroundCross(&gndChk); - local_154.x = pos2.x; - local_154.y = pos2.y; - local_154.z = pos2.z; + pos.x = ato2.x; + pos.y = ato2.y; + pos.z = ato2.z; - gndChk.SetPos(&local_154); - pos2.y = dComIfG_Bgsp().GroundCross(&gndChk); + gndChk.SetPos(&pos); + ato2.y = dComIfG_Bgsp().GroundCross(&gndChk); - if (fabsf(local_13c.y - pos2.y) <= 200.0f) { - a_this->current.angle.x = -cM_atan2s(local_13c.y - pos2.y, 200.0f); + if (fabsf(ato.y - ato2.y) <= 200.0f) { + actor->current.angle.x = -cM_atan2s(ato.y - ato2.y, 200.0f); } - a_this->speed.y = -20.0f; + actor->speed.y = -20.0f; } - cLib_addCalcAngleS2(&a_this->shape_angle.x, a_this->current.angle.x, 4, 0x1000); - cLib_addCalcAngleS2(&a_this->shape_angle.z, a_this->current.angle.z, 4, 0x1000); + cLib_addCalcAngleS2(&actor->shape_angle.x, actor->current.angle.x, 4, 0x1000); + cLib_addCalcAngleS2(&actor->shape_angle.z, actor->current.angle.z, 4, 0x1000); - mDoMtx_stack_c::transS(a_this->current.pos.x, a_this->current.pos.y, a_this->current.pos.z); - mDoMtx_stack_c::YrotM(a_this->shape_angle.y + i_this->field_0x7a4); - mDoMtx_stack_c::XrotM((s16)a_this->shape_angle.x); - mDoMtx_stack_c::ZrotM(a_this->shape_angle.z); + mDoMtx_stack_c::transS(actor->current.pos.x, actor->current.pos.y, actor->current.pos.z); + mDoMtx_stack_c::YrotM(actor->shape_angle.y + i_this->field_0x7a4); + mDoMtx_stack_c::XrotM((s16)actor->shape_angle.x); + mDoMtx_stack_c::ZrotM(actor->shape_angle.z); mDoMtx_stack_c::transM(0.0f, 150.0f, 0.0f); - mDoMtx_stack_c::YrotM((s16)i_this->field_0x6ae.y); - mDoMtx_stack_c::XrotM((s16)i_this->field_0x6ae.x); + mDoMtx_stack_c::YrotM((s16)i_this->rotation.y); + mDoMtx_stack_c::XrotM((s16)i_this->rotation.x); mDoMtx_stack_c::transM(0.0f, -150.0f, -50.0f); - f32 scale = a_this->scale.z; + f32 scale = actor->scale.z; mDoMtx_stack_c::scaleM(scale, scale, scale); - J3DModel* model = i_this->mpModelMorf->getModel(); + J3DModel* model = i_this->anm_p->getModel(); model->setBaseTRMtx(mDoMtx_stack_c::get()); int soundParam; - if (-G_CM3D_F_INF != i_this->mAcch.GetGroundH()) { - if (i_this->mAcch.ChkWaterHit() && i_this->mAcch.m_wtr.GetHeight() > a_this->current.pos.y) + if (-G_CM3D_F_INF != i_this->Bgc.GetGroundH()) { + if (i_this->Bgc.ChkWaterHit() && i_this->Bgc.m_wtr.GetHeight() > actor->current.pos.y) { - soundParam = dKy_pol_sound_get(&i_this->mAcch.m_wtr); - } else if (i_this->mAcch.ChkGroundHit()) { - soundParam = dKy_pol_sound_get(&i_this->mAcch.m_gnd); + soundParam = dKy_pol_sound_get(&i_this->Bgc.m_wtr); + } else if (i_this->Bgc.ChkGroundHit()) { + soundParam = dKy_pol_sound_get(&i_this->Bgc.m_gnd); } else { soundParam = 0; } @@ -5312,68 +5319,68 @@ static int daE_WB_Execute(e_wb_class* i_this) { soundParam = 0; } - i_this->mpModelMorf->play(soundParam, dComIfGp_getReverb(fopAcM_GetRoomNo(a_this))); - i_this->mpModelMorf->modelCalc(); + i_this->anm_p->play(soundParam, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); + i_this->anm_p->modelCalc(); anm_se_eff_set(i_this); - if (i_this->mActionID != ACT_EVENT) { + if (i_this->action != ACT_EVENT) { f32 size_scale = 1.0f; - if (i_this->field_0x79d >= 2) { + if (i_this->leader >= 2) { size_scale += JREG_F(15) + 1.1f; } MTXCopy(model->getAnmMtx(i_this->field_0x688 + 0xd), *calc_mtx); - local_130.set(KREG_F(13) + -20.0f, KREG_F(14) + -30.0f, KREG_F(15)); - MtxPosition(&local_130, &a_this->eyePos); + mae.set(KREG_F(13) + -20.0f, KREG_F(14) + -30.0f, KREG_F(15)); + MtxPosition(&mae, &actor->eyePos); - a_this->attention_info.position.set( - a_this->current.pos.x - cM_ssin(a_this->shape_angle.y) * 30.0f, - a_this->current.pos.y + 150.0f, - a_this->current.pos.z - cM_scos(a_this->shape_angle.y) * 30.0f); + actor->attention_info.position.set( + actor->current.pos.x - cM_ssin(actor->shape_angle.y) * 30.0f, + actor->current.pos.y + 150.0f, + actor->current.pos.z - cM_scos(actor->shape_angle.y) * 30.0f); - i_this->field_0xa00[0].SetC(a_this->eyePos); - i_this->field_0xa00[0].SetR((KREG_F(16) + 40.0f) * l_HIO.base_size * size_scale); + i_this->cc_sph[0].SetC(actor->eyePos); + i_this->cc_sph[0].SetR((KREG_F(16) + 40.0f) * l_HIO.base_size * size_scale); u32 tg_group; - if (i_this->mActionID == ACT_PL_RIDE) { + if (i_this->action == ACT_PL_RIDE) { tg_group = 4; } else { tg_group = 2; } for (int i = 0; i < 7; i++) { - i_this->field_0xa00[i].SetTgGrp(tg_group); + i_this->cc_sph[i].SetTgGrp(tg_group); } - dComIfG_Ccsp()->Set(&i_this->field_0xa00[0]); + dComIfG_Ccsp()->Set(&i_this->cc_sph[0]); - if (i_this->mPursuitFlag != 0) { + if (i_this->pursuit_flg != 0) { - local_130.set(KREG_F(10) + -30.0f, KREG_F(11) + -50.0f, KREG_F(12)); - MtxPosition(&local_130, &local_13c); - i_this->field_0x1288.SetC(local_13c); - i_this->field_0x1288.SetR((KREG_F(8) + 55.0f) * l_HIO.base_size); + mae.set(KREG_F(10) + -30.0f, KREG_F(11) + -50.0f, KREG_F(12)); + MtxPosition(&mae, &ato); + i_this->at_sph.SetC(ato); + i_this->at_sph.SetR((KREG_F(8) + 55.0f) * l_HIO.base_size); - dComIfG_Ccsp()->Set(&i_this->field_0x1288); + dComIfG_Ccsp()->Set(&i_this->at_sph); - if ((i_this->mActionID == ACT_PL_RIDE) || (i_this->mActionID == ACT_PL_RIDE2)) { - i_this->field_0x1288.SetAtType(AT_TYPE_NORMAL_SWORD); + if ((i_this->action == ACT_PL_RIDE) || (i_this->action == ACT_PL_RIDE2)) { + i_this->at_sph.SetAtType(AT_TYPE_NORMAL_SWORD); } else { - i_this->field_0x1288.SetAtType(AT_TYPE_1000); + i_this->at_sph.SetAtType(AT_TYPE_1000); } - if (a_this->speedF > l_HIO.max_speed - 2.0f) { - i_this->field_0x1288.SetAtSpl(dCcG_At_Spl_UNK_7); + if (actor->speedF > l_HIO.max_speed - 2.0f) { + i_this->at_sph.SetAtSpl(dCcG_At_Spl_UNK_7); - if (i_this->field_0x1288.ChkAtHit()) { - cCcD_Obj* hit_obj = i_this->field_0x1288.GetAtHitObj(); + if (i_this->at_sph.ChkAtHit()) { + cCcD_Obj* hit_obj = i_this->at_sph.GetAtHitObj(); fopAc_ac_c* hit_actor = dCc_GetAc(hit_obj->GetAc()); if (hit_actor != NULL) { - if (fopAcM_GetName(hit_actor) == PROC_E_RD) { - i_this->mZ2Ride.startCreatureSound(Z2SE_EN_WB_RUNDOWN, 0, -1); - } else if (fopAcM_GetName(hit_actor) == PROC_ALINK) { + if (fopAcM_GetName(hit_actor) == fpcNm_E_RD_e) { + i_this->sound.startCreatureSound(Z2SE_EN_WB_RUNDOWN, 0, -1); + } else if (fopAcM_GetName(hit_actor) == fpcNm_ALINK_e) { if (daPy_getPlayerActorClass()->checkPlayerGuard()) { dComIfGp_getVibration().StartShock(4, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); } @@ -5381,69 +5388,69 @@ static int daE_WB_Execute(e_wb_class* i_this) { } } } else { - i_this->field_0x1288.SetAtSpl(dCcG_At_Spl_UNK_0); + i_this->at_sph.SetAtSpl(dCcG_At_Spl_UNK_0); } if (daPy_getPlayerActorClass()->checkHorseRide()) { - i_this->field_0x1288.OffAtVsPlayerBit(); + i_this->at_sph.OffAtVsPlayerBit(); } else { - i_this->field_0x1288.OnAtVsPlayerBit(); + i_this->at_sph.OnAtVsPlayerBit(); } - i_this->mPursuitFlag = 0; + i_this->pursuit_flg = 0; } else { - cXyz temp_pos(-200000.0f, -200000.0f, 200000.0f); - i_this->field_0x1288.SetC(temp_pos); + cXyz cr(-200000.0f, -200000.0f, 200000.0f); + i_this->at_sph.SetC(cr); } - local_130.set(JREG_F(0) + -30.0f, JREG_F(1), JREG_F(2)); + mae.set(JREG_F(0) + -30.0f, JREG_F(1), JREG_F(2)); MTXCopy(model->getAnmMtx(i_this->field_0x688 + 0xb), *calc_mtx); - MtxPosition(&local_130, &local_13c); - i_this->field_0xa00[1].SetC(local_13c); - i_this->field_0xa00[1].SetR(l_HIO.base_size * 50.0f); + MtxPosition(&mae, &ato); + i_this->cc_sph[1].SetC(ato); + i_this->cc_sph[1].SetR(l_HIO.base_size * 50.0f); MTXCopy(model->getAnmMtx(i_this->field_0x688 + 0x11), *calc_mtx); - local_130.set(JREG_F(3) + 10.0f, JREG_F(4) + 20.0f, JREG_F(5)); - MtxPosition(&local_130, &local_13c); - i_this->field_0xa00[2].SetC(local_13c); - i_this->field_0xa00[2].SetR(l_HIO.base_size * 40.0f + 20.0f + JREG_F(6)); + mae.set(JREG_F(3) + 10.0f, JREG_F(4) + 20.0f, JREG_F(5)); + MtxPosition(&mae, &ato); + i_this->cc_sph[2].SetC(ato); + i_this->cc_sph[2].SetR(l_HIO.base_size * 40.0f + 20.0f + JREG_F(6)); - dComIfG_Ccsp()->Set(&i_this->field_0xa00[1]); - dComIfG_Ccsp()->Set(&i_this->field_0xa00[2]); + dComIfG_Ccsp()->Set(&i_this->cc_sph[1]); + dComIfG_Ccsp()->Set(&i_this->cc_sph[2]); - local_130.set(0.0f, 0.0f, 0.0f); + mae.set(0.0f, 0.0f, 0.0f); for (int i = 0; i < 4; i++) { static int foot_no[4] = {5, 24, 9, 20}; static int foot_no_B[4] = {5, 28, 9, 23}; - if (i_this->field_0x79d != 0) { + if (i_this->leader != 0) { MTXCopy(model->getAnmMtx(foot_no_B[i]), *calc_mtx); } else { MTXCopy(model->getAnmMtx(foot_no[i]), *calc_mtx); } - MtxPosition(&local_130, &local_13c); - i_this->field_0xa00[i + 3].SetC(local_13c); - i_this->field_0xa00[i + 3].SetR(l_HIO.base_size * 20.0f); + MtxPosition(&mae, &ato); + i_this->cc_sph[i + 3].SetC(ato); + i_this->cc_sph[i + 3].SetR(l_HIO.base_size * 20.0f); - dComIfG_Ccsp()->Set(&i_this->field_0xa00[i + 3]); + dComIfG_Ccsp()->Set(&i_this->cc_sph[i + 3]); } for (int i = 0; i < 6; i++) { - if (i_this->field_0x79d == 0) { - i_this->field_0xa00[i + 1].OnTgSetBit(); + if (i_this->leader == 0) { + i_this->cc_sph[i + 1].OnTgSetBit(); } else { - i_this->field_0xa00[i + 1].OffTgSetBit(); + i_this->cc_sph[i + 1].OffTgSetBit(); } } } i_this->field_0x1688 += i_this->field_0x168a; - cLib_addCalcAngleS2(&i_this->field_0x168a, a_this->speedF * 50.0f + 1500.0f, 1, 0x3c); + cLib_addCalcAngleS2(&i_this->field_0x168a, actor->speedF * 50.0f + 1500.0f, 1, 0x3c); - cLib_addCalc2(&i_this->mAnimDuration, a_this->speedF * (YREG_F(8) + 1.5f) + BREG_F(6), 1.0f, BREG_F(7) + 0.9f); + cLib_addCalc2(&i_this->anm_time, actor->speedF * (YREG_F(8) + 1.5f) + BREG_F(6), 1.0f, BREG_F(7) + 0.9f); - i_this->field_0x1434 = fpcM_ERROR_PROCESS_ID_e; + i_this->rd_id = fpcM_ERROR_PROCESS_ID_e; effect_set(i_this); i_this->field_0x6c0 = 0; @@ -5456,34 +5463,34 @@ static int daE_WB_IsDelete(e_wb_class* i_this) { } static int daE_WB_Delete(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; fopAcM_RegisterDeleteID(i_this, "E_WB"); - dComIfG_resDelete(&i_this->mPhase, i_this->mResName); + dComIfG_resDelete(&i_this->phase, i_this->resName); if (i_this->field_0x17e0 != 0) { hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.mId); } - if (a_this->heap != NULL) { - i_this->mpModelMorf->stopZelAnime(); + if (actor->heap != NULL) { + i_this->anm_p->stopZelAnime(); } return 1; } -static int useHeapInit(fopAc_ac_c* a_this) { - e_wb_class* i_this = (e_wb_class*)a_this; +static int useHeapInit(fopAc_ac_c* actor) { + e_wb_class* i_this = (e_wb_class*)actor; - i_this->mpModelMorf = - JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes(i_this->mResName, 0x2e), NULL, - NULL, (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mResName, 0x28), - 0, 1.0f, 0, -1, &i_this->mZ2Ride, 0x80000, 0x11000084); + i_this->anm_p = + JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes(i_this->resName, 0x2e), NULL, + NULL, (J3DAnmTransform*)dComIfG_getObjectRes(i_this->resName, 0x28), + 0, 1.0f, 0, -1, &i_this->sound, 0x80000, 0x11000084); - if (i_this->mpModelMorf == NULL || i_this->mpModelMorf->getModel() == NULL) { + if (i_this->anm_p == NULL || i_this->anm_p->getModel() == NULL) { return 0; } - J3DModel* model = i_this->mpModelMorf->getModel(); + J3DModel* model = i_this->anm_p->getModel(); model->setUserArea((uintptr_t)i_this); for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) { @@ -5492,15 +5499,15 @@ static int useHeapInit(fopAc_ac_c* a_this) { f32* size; for (int i = 0; i < 2; i++) { - if (i_this->field_0x79d != 0) { - if (!i_this->field_0x15d0[i].init( + if (i_this->leader != 0) { + if (!i_this->himo_mat[i].init( 1, 0x10, (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_ROPE_e), 1)) { return 0; } } else { - if (!i_this->field_0x15d0[i].init( + if (!i_this->himo_mat[i].init( 1, 0x10, (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_ROPE_e), 1)) { @@ -5508,9 +5515,9 @@ static int useHeapInit(fopAc_ac_c* a_this) { } } - size = i_this->field_0x15d0[i].getSize(0); + size = i_this->himo_mat[i].getSize(0); for (int j = 0; j < 16; j++, size++) { - if (i_this->field_0x79d != 0) { + if (i_this->leader != 0) { *size = 5.0f + XREG_S(1) * 0.1f; } else { *size = 3.0f + XREG_S(0) * 0.1f; @@ -5518,19 +5525,19 @@ static int useHeapInit(fopAc_ac_c* a_this) { } } - if (i_this->field_0x79d != 0) { - if (!i_this->field_0x1648.init(1, 2, (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_ROPE_e), 1)) { + if (i_this->leader != 0) { + if (!i_this->himo_tex.init(1, 2, (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_ROPE_e), 1)) { return 0; } } else { - if (!i_this->field_0x1648.init(1, 2, (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_ROPE_e), 1)) { + if (!i_this->himo_tex.init(1, 2, (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_ROPE_e), 1)) { return 0; } } - size = i_this->field_0x1648.getSize(0); + size = i_this->himo_tex.getSize(0); for (int i = 0; i < 2; i++, size++) { - if (i_this->field_0x79d != 0) { + if (i_this->leader != 0) { *size = 5.0f + XREG_S(1) * 0.1f; } else { *size = 3.0f + XREG_S(0) * 0.1f; @@ -5540,21 +5547,21 @@ static int useHeapInit(fopAc_ac_c* a_this) { return 1; } -static int daE_WB_Create(fopAc_ac_c* i_this) { - e_wb_class* a_this = (e_wb_class*)i_this; - fopAcM_ct(&a_this->mEnemy, e_wb_class); +static int daE_WB_Create(fopAc_ac_c* actor) { + e_wb_class* i_this = (e_wb_class*)actor; + fopAcM_ct(&i_this->enemy, e_wb_class); OS_REPORT("//////////////E_WB SET 555 !!\n"); - a_this->mParam = fopAcM_GetParam(i_this); + i_this->arg0 = fopAcM_GetParam(actor); - if (a_this->mParam == 5 || a_this->mParam == 7 || a_this->mParam == 8 || a_this->mParam == 9) { - a_this->mResName = "E_bb"; + if (i_this->arg0 == 5 || i_this->arg0 == 7 || i_this->arg0 == 8 || i_this->arg0 == 9) { + i_this->resName = "E_bb"; } else { - a_this->mResName = "E_wb"; + i_this->resName = "E_wb"; } - int phase = dComIfG_resLoad(&a_this->mPhase, a_this->mResName); + int phase_state = dComIfG_resLoad(&i_this->phase, i_this->resName); lbl_244_bss_47 = lbl_244_bss_45 = lbl_244_bss_46 = 0; // Title Screen @@ -5563,85 +5570,85 @@ static int daE_WB_Create(fopAc_ac_c* i_this) { } // Hyrule Field, Bridge of Eldin area - if (!strcmp(dComIfGp_getStartStageName(), "F_SP121") && fopAcM_GetRoomNo(i_this) == 0) { + if (!strcmp(dComIfGp_getStartStageName(), "F_SP121") && fopAcM_GetRoomNo(actor) == 0) { lbl_244_bss_46 = 1; } - if (phase == cPhs_COMPLEATE_e) { - a_this->mActionID = ACT_WAIT; + if (phase_state == cPhs_COMPLEATE_e) { + i_this->action = ACT_WAIT; - if (a_this->mParam == 0xff) { - a_this->mParam = 0; - } else if (a_this->mParam == 5) { - a_this->field_0x79d = 1; - a_this->mActionID = ACT_B_WAIT; - } else if (a_this->mParam == 7) { - a_this->field_0x79d = 2; - a_this->mActionID = ACT_B_IKKI; + if (i_this->arg0 == 0xff) { + i_this->arg0 = 0; + } else if (i_this->arg0 == 5) { + i_this->leader = LEADER_B_WAIT; + i_this->action = ACT_B_WAIT; + } else if (i_this->arg0 == 7) { + i_this->leader = LEADER_B_IKKI; + i_this->action = ACT_B_IKKI; if (cDmr_SkipInfo == 0) { - a_this->field_0x169e = 0x28; - arrow_rd_set(a_this); + i_this->demo_mode = 40; + arrow_rd_set(i_this); } else { Z2GetAudioMgr()->subBgmStart(Z2BGM_FACE_OFF_BATTLE2); - a_this->field_0x1722 = 1; + i_this->saku_burn = 1; } - } else if (a_this->mParam == 8) { - a_this->field_0x79d = 3; - a_this->mActionID = ACT_B_IKKI2; + } else if (i_this->arg0 == 8) { + i_this->leader = LEADER_B_IKKI2; + i_this->action = ACT_B_IKKI2; // Hyrule Field if (!strcmp(dComIfGp_getStartStageName(), "F_SP121")) { - a_this->mActionMode = -100; + i_this->ride_mode = -100; } - a_this->mTargetFacingAngle = 0x8000; - } else if (a_this->mParam == 6) { - a_this->mActionID = ACT_EVENT; - } else if (a_this->mParam == 10) { - a_this->mActionID = ACT_C_F_RUN; - a_this->field_0x7a6 = 1; - a_this->field_0x7a7 = 1; + i_this->target_ya = 0x8000; + } else if (i_this->arg0 == 6) { + i_this->action = ACT_EVENT; + } else if (i_this->arg0 == 10) { + i_this->action = ACT_C_F_RUN; + i_this->field_0x7a6 = 1; + i_this->field_0x7a7 = 1; - if (fopAcM_gc_c::gndCheck(&i_this->current.pos)) { - i_this->current.pos.y = fopAcM_gc_c::getGroundY(); + if (fopAcM_gc_c::gndCheck(&actor->current.pos)) { + actor->current.pos.y = fopAcM_gc_c::getGroundY(); } OS_REPORT(" C_RD RESET 00\n"); - } else if (a_this->mParam == 9) { - a_this->field_0x79d = 4; - a_this->mActionID = ACT_B_LV9_END; - a_this->mActionMode = 0; + } else if (i_this->arg0 == 9) { + i_this->leader = LEADER_B_LV9; + i_this->action = ACT_B_LV9_END; + i_this->ride_mode = 0; } - a_this->mParam2 = (fopAcM_GetParam(i_this) & 0xff00) >> 8; + i_this->arg1 = (fopAcM_GetParam(actor) & 0xff00) >> 8; - if (a_this->field_0x79d != 0) { - a_this->field_0x688 = 2; - cXyz local_38; - cXyz local_44; - local_38.x = 0.0f; - local_38.y = 1000.0f; + if (i_this->leader != LEADER_NONE) { + i_this->field_0x688 = 2; + cXyz mae; + cXyz ato; + mae.x = 0.0f; + mae.y = 1000.0f; for (int i = 0; i < 8; i++) { - cMtx_YrotS(*calc_mtx, i << 0xd); + cMtx_YrotS(*calc_mtx, i << 13); if (lbl_244_bss_45 == 1) { - local_38.z = cM_rndF(3000.0f) + 12000.0f; - MtxPosition(&local_38, &local_44); + mae.z = cM_rndF(3000.0f) + 12000.0f; + MtxPosition(&mae, &ato); } else { - local_38.z = 13000.0f; - MtxPosition(&local_38, &local_44); - local_44.x += -2989.0f; - local_44.z += 1364.0f; + mae.z = 13000.0f; + MtxPosition(&mae, &ato); + ato.x += -2989.0f; + ato.z += 1364.0f; } - b_path[i] = local_44; + b_path[i] = ato; } - if (a_this->field_0x79d == 1 || a_this->field_0x79d == 2) { - fopAcM_createChild(PROC_OBJ_WFLAG, fopAcM_GetID(i_this), 0, &i_this->current.pos, - fopAcM_GetRoomNo(i_this), 0, 0, -1, 0); + if (i_this->leader == LEADER_B_WAIT || i_this->leader == LEADER_B_IKKI) { + fopAcM_createChild(fpcNm_OBJ_WFLAG_e, fopAcM_GetID(actor), 0, &actor->current.pos, + fopAcM_GetRoomNo(actor), 0, 0, -1, 0); } static f32 pass_r[6] = { @@ -5652,50 +5659,50 @@ static int daE_WB_Create(fopAc_ac_c* i_this) { 600.0f, -800.0f, 800.0f, -300.0f, 0.0f, 300.0f, }; - a_this->field_0x7a8 = pass_r[a_this->mParam2]; - a_this->field_0x6c4 = x_check_off[a_this->mParam2]; + i_this->pass = pass_r[i_this->arg1]; + i_this->x_check = x_check_off[i_this->arg1]; } - u32 local_50; + u32 size; - if (a_this->field_0x79d != 0) { - local_50 = 0x4300; + if (i_this->leader != 0) { + size = 0x4300; } else { - local_50 = 0x3740; + size = 0x3740; } - if (!fopAcM_entrySolidHeap(i_this, useHeapInit, local_50)) { + if (!fopAcM_entrySolidHeap(actor, useHeapInit, size)) { OS_REPORT("//////////////E_WB SET NON !!\n"); return cPhs_ERROR_e; } else { if (!hio_set) { - a_this->field_0x17e0 = 1; + i_this->field_0x17e0 = 1; hio_set = true; l_HIO.mId = mDoHIO_CREATE_CHILD("イノシシ", &l_HIO); } - fopAcM_OnStatus(i_this, 0); + fopAcM_OnStatus(actor, 0); - i_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e; - i_this->attention_info.distances[fopAc_attn_ETC_e] = 0xe; + actor->attention_info.flags = fopAc_AttnFlag_BATTLE_e; + actor->attention_info.distances[fopAc_attn_ETC_e] = 0xe; - fopAcM_SetMtx(i_this, a_this->mpModelMorf->getModel()->getBaseTRMtx()); - fopAcM_SetMin(i_this, -800.0f, -400.0f, -800.0f); - fopAcM_SetMax(i_this, 800.0f, 400.0f, 800.0f); + fopAcM_SetMtx(actor, i_this->anm_p->getModel()->getBaseTRMtx()); + fopAcM_SetMin(actor, -800.0f, -400.0f, -800.0f); + fopAcM_SetMax(actor, 800.0f, 400.0f, 800.0f); - fopAcM_setCullSizeFar(i_this, 30000.0f); + fopAcM_setCullSizeFar(actor, 30000.0f); - a_this->mAcch.Set(fopAcM_GetPosition_p(i_this), fopAcM_GetOldPosition_p(i_this), i_this, - 1, &a_this->field_0x7ac, fopAcM_GetSpeed_p(i_this), 0, 0); - a_this->field_0x7ac.SetWall(100.0f, 100.0f + BREG_F(8)); - a_this->mAcch.ClrWaterNone(); + i_this->Bgc.Set(fopAcM_GetPosition_p(actor), fopAcM_GetOldPosition_p(actor), actor, + 1, &i_this->AcchCir, fopAcM_GetSpeed_p(actor), 0, 0); + i_this->AcchCir.SetWall(100.0f, 100.0f + BREG_F(8)); + i_this->Bgc.ClrWaterNone(); - i_this->field_0x560 = i_this->health = 10; + actor->field_0x560 = actor->health = 10; - if (a_this->field_0x79d != 0) { - a_this->mStts.Init(0xfe, 0, i_this); + if (i_this->leader != 0) { + i_this->Stts.Init(0xfe, 0, actor); } else { - a_this->mStts.Init(0xfd, 0, i_this); + i_this->Stts.Init(0xfd, 0, actor); } for (int i = 0; i <= 6; i++) { @@ -5711,12 +5718,12 @@ static int daE_WB_Create(fopAc_ac_c* i_this) { } // mSphAttr }; - a_this->field_0xa00[i].Set(cc_sph_src); - a_this->field_0xa00[i].SetStts(&a_this->mStts); + i_this->cc_sph[i].Set(cc_sph_src); + i_this->cc_sph[i].SetStts(&i_this->Stts); - if (a_this->field_0x79d != 0) { - a_this->field_0xa00[i].OnTgShield(); - a_this->field_0xa00[i].SetTgHitMark(CcG_Tg_UNK_MARK_2); + if (i_this->leader != 0) { + i_this->cc_sph[i].OnTgShield(); + i_this->cc_sph[i].SetTgHitMark(CcG_Tg_UNK_MARK_2); } } @@ -5732,64 +5739,64 @@ static int daE_WB_Create(fopAc_ac_c* i_this) { } // mSphAttr }; - a_this->field_0x1288.Set(at_sph_src); - a_this->field_0x1288.SetStts(&a_this->mStts); + i_this->at_sph.Set(at_sph_src); + i_this->at_sph.SetStts(&i_this->Stts); - i_this->attention_info.distances[fopAc_attn_CARRY_e] = 0x28; - i_this->attention_info.distances[fopAc_attn_LOCK_e] = 0x16; - i_this->attention_info.distances[fopAc_attn_ETC_e] = 0x30; - i_this->attention_info.flags = 0; - a_this->field_0x68e = (s16)cM_rndF(65535.0f); + actor->attention_info.distances[fopAc_attn_CARRY_e] = 40; + actor->attention_info.distances[fopAc_attn_LOCK_e] = 22; + actor->attention_info.distances[fopAc_attn_ETC_e] = 48; + actor->attention_info.flags = 0; + i_this->counter = (s16)cM_rndF(65535.0f); for (int i = 0; i < 2; i++) { for (int j = 0; j < 16; j++) { - a_this->field_0x1450[i].field_0x0[j] = i_this->current.pos; + i_this->himo[i].node[j] = actor->current.pos; } } - a_this->field_0x1438[1] = a_this->field_0x1438[0] = i_this->current.pos; + i_this->rein_hand_pos[1] = i_this->rein_hand_pos[0] = actor->current.pos; - a_this->mZ2Ride.init(&i_this->current.pos, &i_this->eyePos, 6, 1); - a_this->field_0x13c0.mpSound = &a_this->mZ2Ride; + i_this->sound.init(&actor->current.pos, &actor->eyePos, 6, 1); + i_this->at_info.mpSound = &i_this->sound; // Bulblin Camp if (!strcmp(dComIfGp_getStartStageName(), "F_SP118")) { - if (fopAcM_GetRoomNo(i_this) == 1) { - i_this->current.pos.set(1500.0f, 0.0f, 1100.0f); - i_this->current.angle.y = 0x2000; - a_this->mActionID = ACT_CRV_WAIT; - a_this->field_0x1720 = 1; + if (fopAcM_GetRoomNo(actor) == 1) { + actor->current.pos.set(1500.0f, 0.0f, 1100.0f); + actor->current.angle.y = 0x2000; + i_this->action = ACT_CRV_WAIT; + i_this->field_0x1720 = 1; } else { - if (fopAcM_GetRoomNo(i_this) == 2) { - a_this->mActionID = ACT_LR_DAMAGE; - anm_init(a_this, 0x12, 0.0f, 2, 1.0f); - a_this->mActionMode = 3; - i_this->current.pos.x = 828.0f; - i_this->current.pos.z = 554.0f; - i_this->current.angle.y = i_this->shape_angle.y = 0x800; - a_this->field_0x1720 = 1; + if (fopAcM_GetRoomNo(actor) == 2) { + i_this->action = ACT_LR_DAMAGE; + anm_init(i_this, 0x12, 0.0f, 2, 1.0f); + i_this->ride_mode = 3; + actor->current.pos.x = 828.0f; + actor->current.pos.z = 554.0f; + actor->current.angle.y = actor->shape_angle.y = 2048; + i_this->field_0x1720 = 1; } } } - if (a_this->mParam == 10) { + if (i_this->arg0 == 10) { lbl_244_bss_47 = 1; } - fopAcM_setCullSizeFar(i_this, 30000.0f); - a_this->mSpeedRate = l_HIO.mPlayerMountedMaxSpeed; + fopAcM_setCullSizeFar(actor, 30000.0f); + i_this->ride_speed_max = l_HIO.mPlayerMountedMaxSpeed; c_start = 1; - daE_WB_Execute(a_this); + daE_WB_Execute(i_this); c_start = 0; if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[88])) { - a_this->mLapCount = 1; + i_this->lap_num = 1; } } } - return phase; + return phase_state; } static actor_method_class l_daE_WB_Method = { @@ -5799,20 +5806,20 @@ static actor_method_class l_daE_WB_Method = { }; actor_process_profile_definition g_profile_E_WB = { - fpcLy_CURRENT_e, // mLayerID - 4, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_WB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_wb_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 152, // mPriority - &l_daE_WB_Method, // sub_method - 0x00044100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_WB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_wb_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_WB_e, + /* Actor SubMtd */ &l_daE_WB_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_ws.cpp b/src/d/actor/d_a_e_ws.cpp index 4f5e229cc7..2be149e917 100644 --- a/src/d/actor/d_a_e_ws.cpp +++ b/src/d/actor/d_a_e_ws.cpp @@ -358,7 +358,7 @@ void daE_WS_c::executeAttack() { } if (mCcSph.ChkAtHit()) { cCcD_Obj* r27 = mCcSph.GetAtHitObj(); - if (fopAcM_GetName(dCc_GetAc(r27->GetAc())) == PROC_ALINK) { + if (fopAcM_GetName(dCc_GetAc(r27->GetAc())) == fpcNm_ALINK_e) { r28 = true; } } @@ -596,7 +596,7 @@ void daE_WS_c::damage_check() { mSound.startCreatureSound(Z2SE_EN_ST_SHELL_BREAK, 0, -1); } else if (mAtInfo.mpCollider->ChkAtType(AT_TYPE_THROW_OBJ)) { fopAc_ac_c* throwobj_p = dCc_GetAc(mAtInfo.mpCollider->GetAc()); - if (fopAcM_GetName(throwobj_p) == PROC_Obj_Carry && ((daObjCarry_c*)throwobj_p)->getType() == daObjCarry_c::TYPE_BOKKURI) { + if (fopAcM_GetName(throwobj_p) == fpcNm_Obj_Carry_e && ((daObjCarry_c*)throwobj_p)->getType() == daObjCarry_c::TYPE_BOKKURI) { mSound.startCreatureSound(Z2SE_EN_ST_SHELL_BREAK, 0, -1); } } @@ -985,18 +985,18 @@ static actor_method_class l_daE_WS_Method = { }; actor_process_profile_definition g_profile_E_WS = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_WS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_WS_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 200, // mPriority - &l_daE_WS_Method, // sub_method - 0x00050100, // 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_E_WS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_WS_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_WS_e, + /* Actor SubMtd */ &l_daE_WS_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_ww.cpp b/src/d/actor/d_a_e_ww.cpp index e77b8b2028..5f378b60f9 100644 --- a/src/d/actor/d_a_e_ww.cpp +++ b/src/d/actor/d_a_e_ww.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_ww.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -108,7 +108,7 @@ public: /* ホワイトウルフォス - White Werewolf */ /* 0x04 */ s8 field_0x04; - /* 0x08 */ f32 model_size; // モデルサイズ - Model Size + /* 0x08 */ f32 model_size; // モデルサイズ - Model Size /* 0x0C */ f32 attack_interval; // 攻撃間隔 - Attack Interval /* 0x10 */ f32 run_anm; // 走りアニメーション - Run Animation /* 0x14 */ f32 walk_anm; // 歩きアニメーション - Walk Animation @@ -130,7 +130,7 @@ namespace { {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph } // mSphAttr }; - + dCcD_SrcSph cc_ww_tg_src = { { {0x0, {{0x0, 0x1, 0x0}, {0xD8FBFDFF, 0x43}, 0x0}}, // mObj @@ -260,7 +260,7 @@ int daE_WW_c::draw() { #endif return 1; } - + J3DModel* model_p = mpModelMorf->getModel(); g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); g_env_light.setLightTevColorType_MAJI(model_p, &tevStr); @@ -320,7 +320,7 @@ void daE_WW_c::damage_check() { if (var_r29 != NULL) { mAtInfo.mpCollider = var_r29; if (mAtInfo.mpCollider->ChkAtType(AT_TYPE_IRON_BALL) != 0) { - if (fopAcM_GetName(dCc_GetAc(mAtInfo.mpCollider->GetAc())) == PROC_Obj_Carry) { + if (fopAcM_GetName(dCc_GetAc(mAtInfo.mpCollider->GetAc())) == fpcNm_Obj_Carry_e) { S16_ADD(health, 150); } else if (dComIfGp_checkPlayerStatus0(0, 0x400) != 0) { S16_ADD(health, 180); @@ -410,7 +410,7 @@ void daE_WW_c::setGroundAngle() { sp14.y = mObjAcch.GetGroundH(); dBgS_GndChk gnd_chk; Vec gnd_pos; - + if (field_0x75c == 0) { gnd_pos.x = sp14.x + 100.0f * cM_ssin(shape_angle.y); gnd_pos.y = 150.0f + sp14.y; @@ -528,7 +528,7 @@ void daE_WW_c::setAppearEffect() { static void* s_child_ww(void* i_actor, void* i_data) { if (i_actor != i_data && fopAcM_IsActor(i_actor) - && fopAcM_GetName(i_actor) == PROC_E_WW && !fpcM_IsCreating(fopAcM_GetID(i_actor))) { + && fopAcM_GetName(i_actor) == fpcNm_E_WW_e && !fpcM_IsCreating(fopAcM_GetID(i_actor))) { if (fopAcM_GetLinkId((fopAc_ac_c*)i_actor) == fopAcM_GetID(i_data)) { lbl_237_bss_30++; } @@ -545,22 +545,22 @@ static void* s_obj_sub(void* i_proc, void* i_data) { if (fVar2 == fVar3) { f32 fVar4 = fopAcM_GetSpeed((fopAc_ac_c *) i_proc).y; if (fVar4 == fVar3) { - if (fopAcM_GetName(i_proc) == PROC_Obj_Carry) { + if (fopAcM_GetName(i_proc) == fpcNm_Obj_Carry_e) { return i_proc; } - if (fopAcM_GetName(i_proc) == PROC_NBOMB) { + if (fopAcM_GetName(i_proc) == fpcNm_NBOMB_e) { return i_proc; } } } } - if (dist < 500.0f && (fopAcM_GetName(i_proc) == PROC_BOOMERANG || fopAcM_GetName(i_proc) == PROC_NBOMB)) { + if (dist < 500.0f && (fopAcM_GetName(i_proc) == fpcNm_BOOMERANG_e || fopAcM_GetName(i_proc) == fpcNm_NBOMB_e)) { return i_proc; } - - if (dist < 700.0f && fopAcM_GetName(i_proc) == PROC_ARROW) { + + if (dist < 700.0f && fopAcM_GetName(i_proc) == fpcNm_ARROW_e) { f32 fVar5 = fopAcM_GetSpeedF((fopAc_ac_c *) i_proc); f32 fVar6 = 0.0f; if (fVar5 != fVar6) { @@ -603,7 +603,7 @@ bool daE_WW_c::checkSideStep() { } static void* s_attack_ww(void* i_actor, void* i_data) { - if (i_actor != i_data && fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WW && !fpcM_IsCreating(fopAcM_GetID(i_actor)) && ((daE_WW_c*)i_actor)->isAttack() != 0) { + if (i_actor != i_data && fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_WW_e && !fpcM_IsCreating(fopAcM_GetID(i_actor)) && ((daE_WW_c*)i_actor)->isAttack() != 0) { return i_actor; } @@ -628,7 +628,7 @@ void daE_WW_c::createWolf(cXyz param_0, u8 param_1) { var_r28 = 1; } - mChildID[var_r29] = fopAcM_createChild(PROC_E_WW, var_r30, (var_r28 << 24) | (field_0x6b4 | (0xF0FF0000 | 0xF000) | (temp_r27 * 0x10)), ¶m_0, fopAcM_GetRoomNo(this), &sp14, NULL, -1, NULL); + mChildID[var_r29] = fopAcM_createChild(fpcNm_E_WW_e, var_r30, (var_r28 << 24) | (field_0x6b4 | (0xF0FF0000 | 0xF000) | (temp_r27 * 0x10)), ¶m_0, fopAcM_GetRoomNo(this), &sp14, NULL, -1, NULL); } static cXyz create_pos[15] = { @@ -655,7 +655,7 @@ void daE_WW_c::executeMaster() { f32 temp_f30 = sp48.absXZ(current.pos); cXyz sp3C; cXyz sp30; - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); field_0x724 = 10; switch (mActionMode) { case ACTION_MODE_0: @@ -786,7 +786,7 @@ void daE_WW_c::executeMaster() { void daE_WW_c::executeWait() { switch (mActionMode) { case ACTION_MODE_0: - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); setBck(BCK_WW_APPEAR, J3DFrameCtrl::EMode_NONE, 0.0f, 1.0f); mActionMode = ACTION_MODE_1; break; @@ -806,7 +806,7 @@ void daE_WW_c::executeWait() { mActionMode = ACTION_MODE_10; return; } - + setBck(BCK_WW_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); return; } @@ -826,7 +826,7 @@ void daE_WW_c::executeWait() { } } - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); if (var_r28) { setActionMode(ACTION_ATTACK, ACTION_MODE_0); field_0x756 = 1; @@ -871,7 +871,7 @@ int daE_WW_c::calcJumpSpeed() { void daE_WW_c::executeAttack() { daPy_py_c* player_p = daPy_getPlayerActorClass(); - + switch (mActionMode) { case ACTION_MODE_0: setBck(BCK_WW_RUN, J3DFrameCtrl::EMode_LOOP, 3.0f, l_HIO.run_anm); // Change BCK index to enum ? @@ -913,7 +913,7 @@ void daE_WW_c::executeAttack() { return; } break; - + case ACTION_MODE_10: field_0x6cc = fopAcM_searchPlayerAngleY(this); shape_angle.y = field_0x6cc; @@ -951,7 +951,7 @@ void daE_WW_c::executeAttack() { if (player_p->getSpeedF() >= 18.0f) { var_f31 = 1000.0f + nREG_F(18) + mDistCheckModifier; } - + if (fopAcM_searchPlayerDistance(this) < var_f31 && checkAttackWall() != 0) { mActionMode = ACTION_MODE_20; setBck(BCK_WW_JUMPATTACKA, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); // Change to ANM_JUMP ? @@ -1090,7 +1090,7 @@ void daE_WW_c::executeChase() { s16 sp8; cXyz sp28 = daPy_getPlayerActorClass()->current.pos; f32 temp_f31 = sp28.absXZ(current.pos); - + switch (mActionMode) { case ACTION_MODE_5: if (temp_f31 > 1500.0f + nREG_F(18) + mDistCheckModifier) { @@ -1171,7 +1171,7 @@ void daE_WW_c::executeChase() { field_0x75a = 1; cLib_addCalcAngleS(&shape_angle.y, getNearPlayerAngle(), 4, 0x800, 0x100); current.angle.y = shape_angle.y; - + f32 fVar5 = daPy_getPlayerActorClass()->speedF; f32 fVar6 = 0.0f; if (fVar5 != fVar6) { @@ -1476,7 +1476,7 @@ void daE_WW_c::executeMoveOut() { mActionMode = ACTION_MODE_11; } } else if (fVar1 > nREG_F(18) + 3000.0f + mDistCheckModifier) { - if (fopAcM_CheckCondition(this, fopAcM_STATUS_UNK_0x4)) { + if (fopAcM_CheckCondition(this, fopAcStts_UNK_0x4_e)) { fopAcM_delete(this); break; } @@ -1538,7 +1538,7 @@ void daE_WW_c::executeMoveOut() { speedF = l_HIO.run_speed; mActionMode = ACTION_MODE_16; field_0x728 = 60; - + if ((s16)(cLib_targetAngleY(¤t.pos, &field_0x668) - fopAcM_searchPlayerAngleY(this)) < 0) { field_0x6cc = 0x2000; } else { @@ -1656,7 +1656,7 @@ bool daE_WW_c::checkWalkStart() { u8 uVar1 = 0; spdc.set(0.0f, 100.0f, nREG_F(18) + 1500.0f + 100.0f); cLib_offsetPos(&spd0, &spe8, (s16)(angleY + 0x1400 + cM_rndFX(1024.0f)), &spdc); - + f32 fVar1 = checkCreateBg(spd0); if (fVar1 != -G_CM3D_F_INF) { uVar1 = 1; @@ -1756,7 +1756,7 @@ void daE_WW_c::executeWalk() { if (checkMoveOut()) return; break; } - + case ACTION_MODE_10: setBck(BCK_WW_RUN, J3DFrameCtrl::EMode_LOOP, 3.0f, l_HIO.run_anm); mActionMode = ACTION_MODE_11; @@ -1908,7 +1908,7 @@ void daE_WW_c::mtx_set() { mDoMtx_stack_c::ZXYrotM(shape_angle); mDoMtx_stack_c::XrotM(field_0x6ce); mDoMtx_stack_c::scaleM(l_HIO.model_size, l_HIO.model_size, l_HIO.model_size); - + mpModelMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get()); mpModelMorf->modelCalc(); } @@ -1930,7 +1930,7 @@ void daE_WW_c::cc_set() { mSph2[0].SetC(sp8); mSph2[0].SetR(70.0f + nREG_F(17)); dComIfG_Ccsp()->Set(&mSph2[0]); - mDoMtx_stack_c::copy(model_p->getAnmMtx(JNT_HEAD)), + mDoMtx_stack_c::copy(model_p->getAnmMtx(JNT_HEAD)), mDoMtx_stack_c::transM(-10.0f, -20.0f, 0.0f); mDoMtx_stack_c::multVecZero(&sp8); mSph1[1].SetC(sp8); @@ -2138,7 +2138,7 @@ int daE_WW_c::_delete() { if (heap != 0) { mSound.deleteObject(); } - + return 1; } @@ -2184,7 +2184,7 @@ int daE_WW_c::create() { if (field_0x6b4 == 0xF) { field_0x6b4 = 0; } - + u8 var_r26 = fopAcM_GetParam(this) >> 4; // Arg1 ? if (var_r26 == 0xFF || var_r26 == 0) { var_r26 = 30; @@ -2224,7 +2224,7 @@ int daE_WW_c::create() { var_r27 = 10; } } - + field_0x6ac = 100.0f * var_r27; shape_angle.x = 0; current.angle.x = 0; @@ -2256,7 +2256,7 @@ int daE_WW_c::create() { health = 100; field_0x560 = 100; } - + mCcStts.Init(0xFE, 0, this); field_0x75d = 1; attention_info.flags = fopAc_AttnFlag_BATTLE_e; @@ -2306,20 +2306,20 @@ static actor_method_class l_daE_WW_Method = { }; actor_process_profile_definition g_profile_E_WW = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_WW, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_WW_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 209, // mPriority - &l_daE_WW_Method, // sub_method - 0x00044100, // 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_E_WW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_WW_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_WW_e, + /* Actor SubMtd */ &l_daE_WW_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_yc.cpp b/src/d/actor/d_a_e_yc.cpp index 9e9a5d4c82..c14e710e47 100644 --- a/src/d/actor/d_a_e_yc.cpp +++ b/src/d/actor/d_a_e_yc.cpp @@ -12,7 +12,7 @@ #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/actor/d_a_e_rdy.h" static f32 S_area_dis; @@ -835,18 +835,18 @@ static actor_method_class l_daE_YC_Method = { }; actor_process_profile_definition g_profile_E_YC = { - fpcLy_CURRENT_e, - 4, - fpcPi_CURRENT_e, - PROC_E_YC, - &g_fpcLf_Method.base, - sizeof(e_yc_class), - 0, - 0, - &g_fopAc_Method.base, - 0xBB, - &l_daE_YC_Method, - 0x40100, - fopAc_ENEMY_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_YC_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_yc_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_YC_e, + /* Actor SubMtd */ &l_daE_YC_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_yd.cpp b/src/d/actor/d_a_e_yd.cpp index e56167154c..bdcd044eed 100644 --- a/src/d/actor/d_a_e_yd.cpp +++ b/src/d/actor/d_a_e_yd.cpp @@ -1472,7 +1472,7 @@ static int daE_YD_Create(fopAc_ac_c* i_this) { leafRoomNo = fopAcM_GetRoomNo(i_this); - a_this->mLeafId = fopAcM_createChild(PROC_E_YD_LEAF, fopAcM_GetID(i_this), 0, + a_this->mLeafId = fopAcM_createChild(fpcNm_E_YD_LEAF_e, fopAcM_GetID(i_this), 0, &i_this->current.pos, leafRoomNo, &i_this->shape_angle, NULL, -1, NULL); i_this->field_0x565 = fopAcM_GetParam(i_this) >> 16; @@ -1493,18 +1493,18 @@ static actor_method_class l_daE_YD_Method = { }; actor_process_profile_definition g_profile_E_YD = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_YD, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_yd_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 143, // mPriority - &l_daE_YD_Method, // sub_method - 0x10050100, // 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_E_YD_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_yd_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_YD_e, + /* Actor SubMtd */ &l_daE_YD_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_yd_leaf.cpp b/src/d/actor/d_a_e_yd_leaf.cpp index c6ba61eddf..750842e144 100644 --- a/src/d/actor/d_a_e_yd_leaf.cpp +++ b/src/d/actor/d_a_e_yd_leaf.cpp @@ -95,18 +95,18 @@ static actor_method_class l_daE_YD_LEAF_Method = { }; actor_process_profile_definition g_profile_E_YD_LEAF = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_E_YD_LEAF, - &g_fpcLf_Method.base, - sizeof(e_yd_leaf_class), - 0, - 0, - &g_fopAc_Method.base, - 145, - &l_daE_YD_LEAF_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_YD_LEAF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_yd_leaf_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_YD_LEAF_e, + /* Actor SubMtd */ &l_daE_YD_LEAF_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_yg.cpp b/src/d/actor/d_a_e_yg.cpp index 1fa8227af1..6e02f7cb0b 100644 --- a/src/d/actor/d_a_e_yg.cpp +++ b/src/d/actor/d_a_e_yg.cpp @@ -244,10 +244,12 @@ static fopAc_ac_c* target_info[20]; static int target_info_count; static void* s_d_sub(void* i_actor, void* i_data) { - daObjCarry_c* actor = (daObjCarry_c*)i_actor; - - if (fopAcM_IsActor(actor) && fopAcM_GetName(actor) == PROC_Obj_Carry && actor->getType() == 5 && target_info_count < 20) { - target_info[target_info_count] = actor; + UNUSED(i_data); + + if (fopAcM_IsActor(i_actor) && + fopAcM_GetName(i_actor) == fpcNm_Obj_Carry_e && + ((daObjCarry_c*)i_actor)->getType() == 5 && target_info_count < 20) { + target_info[target_info_count] = (fopAc_ac_c*)i_actor; target_info_count++; } @@ -441,7 +443,7 @@ static s8 e_yg_attack(e_yg_class* i_this) { if (i_this->mPlayerDist < TREG_F(4) + 300.0f) { /* If Phantom Zant actor exists */ - if (fopAcM_SearchByName(PROC_E_PZ) != NULL) { + if (fopAcM_SearchByName(fpcNm_E_PZ_e) != NULL) { i_this->mTimers[0] = fopAcM_GetID(actor) & 0x1F; i_this->mActionMode = ATTACK_MODE_23; anm_init(i_this, BCK_YG_WAIT, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); @@ -637,51 +639,52 @@ static void e_yg_dokuro(e_yg_class* i_this) { if (skull_p == NULL || i_this->mBgc.ChkWallHit() || fopAcM_checkCarryNow(skull_p)) { i_this->mAction = ACTION_NORMAL; i_this->mActionMode = MODE_INIT; - } else { - cXyz pos_delta(skull_p->current.pos - actor->current.pos); - f32 abs_val = pos_delta.abs(); - i_this->mCurrentAngleYTarget = (s16)cM_atan2s(pos_delta.x, pos_delta.z); - f32 target = 0.0f; + return; + } - switch (i_this->mActionMode) { - case MODE_INIT: - anm_init(i_this, BCK_YG_FIND, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f); - i_this->mActionMode = DOKURO_MODE_RUN; - break; + cXyz pos_delta(skull_p->current.pos - actor->current.pos); + f32 abs_val = pos_delta.abs(); + i_this->mCurrentAngleYTarget = (s16)cM_atan2s(pos_delta.x, pos_delta.z); + f32 target = 0.0f; - case DOKURO_MODE_RUN: - if (i_this->mpMorf->isStop()) { - anm_init(i_this, BCK_YG_RUN, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); - i_this->mActionMode = DOKURO_MODE_2; - } - break; - - case DOKURO_MODE_2: - if (abs_val < TREG_F(14) + 75.0f) { - anm_init(i_this, BCK_YG_GNAW, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); - i_this->mTimers[0] = cM_rndF(60.0f) + 90.0f; - i_this->mActionMode = DOKURO_MODE_3; - } else { - target = l_HIO.movement_spd; - } - break; + switch (i_this->mActionMode) { + case MODE_INIT: + anm_init(i_this, BCK_YG_FIND, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f); + i_this->mActionMode = DOKURO_MODE_RUN; + break; - case DOKURO_MODE_3: - if (abs_val < TREG_F(15) + 65.0f) { - target = -2.0f; - } else if (abs_val > TREG_F(16) + 70.0f) { - target = 2.0f; - } - break; + case DOKURO_MODE_RUN: + if (i_this->mpMorf->isStop()) { + anm_init(i_this, BCK_YG_RUN, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); + i_this->mActionMode = DOKURO_MODE_2; } + break; - cLib_addCalcAngleS2(&actor->current.angle.y, i_this->mCurrentAngleYTarget, 2, 0x2000); - cLib_addCalc2(&actor->speedF, target, 1.0f, 10.0f); - - if (pl_check(i_this, i_this->mDistance)) { - i_this->mAction = ACTION_ATTACK; - i_this->mActionMode = MODE_INIT; + case DOKURO_MODE_2: + if (abs_val < TREG_F(14) + 75.0f) { + anm_init(i_this, BCK_YG_GNAW, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); + i_this->mTimers[0] = cM_rndF(60.0f) + 90.0f; + i_this->mActionMode = DOKURO_MODE_3; + } else { + target = l_HIO.movement_spd; } + break; + + case DOKURO_MODE_3: + if (abs_val < TREG_F(15) + 65.0f) { + target = -2.0f; + } else if (abs_val > TREG_F(16) + 70.0f) { + target = 2.0f; + } + break; + } + + cLib_addCalcAngleS2(&actor->current.angle.y, i_this->mCurrentAngleYTarget, 2, 0x2000); + cLib_addCalc2(&actor->speedF, target, 1.0f, 10.0f); + + if (pl_check(i_this, i_this->mDistance)) { + i_this->mAction = ACTION_ATTACK; + i_this->mActionMode = MODE_INIT; } } @@ -831,6 +834,8 @@ static void damage_check(e_yg_class* i_this) { } static void ke_control(e_yg_class* i_this, yg_ke_s* yg_p, int param_3, f32 i_posZ) { + UNUSED(param_3); + cXyz work, pos_offset; int i; cXyz* pcVar1 = &yg_p->field_0x0[1]; @@ -841,46 +846,52 @@ static void ke_control(e_yg_class* i_this, yg_ke_s* yg_p, int param_3, f32 i_pos work.z = i_posZ; cXyz spc4; - f32 fVar2, fVar3, fVar4; - f32 fVar1; + f32 var_f30; + f32 sp24; + f32 var_f25; if (i_this->mWaterFlag) { - fVar1 = ZREG_F(9) + -5.0f; + var_f25 = ZREG_F(9) + -5.0f; } else { - fVar1 = ZREG_F(8) + -12.0f; + var_f25 = ZREG_F(8) + -12.0f; } - s16 sVar1 = cM_rndF2(65536.0f); - - fVar2 = JREG_F(8) + 3.0f; - f32 fVar5 = JREG_F(5) + (i_this->mBgc.GetGroundH() + 3.0f); - if (fVar5 < i_this->mGroundCross) { - fVar5 = i_this->mGroundCross; - } - - f32 fVar6 = JREG_F(17) + 0.8f; + s16 x_rot; + s16 y_rot; + s16 sp10 = cM_rndF2(65536.0f); + f32 var_f24 = JREG_F(8) + 3.0f; + f32 var_f31 = JREG_F(5) + (i_this->mBgc.GetGroundH() + 3.0f); + if (var_f31 < i_this->mGroundCross) { + var_f31 = i_this->mGroundCross; + } + + f32 sp20; + f32 sp1C; + f32 var_f29; + f32 var_f28; + f32 var_f27; + f32 var_f26 = JREG_F(17) + 0.8f; for (i = 1; i < 10; i++, pcVar1++, pcVar2++) { - f32 fVar7 = fVar2 * cM_ssin(sVar1 + i * 7000); - f32 fVar8 = fVar2 * cM_ssin(sVar1 + 10000 + i * 6000); - f32 fVar9 = (10 - i) * 0.1f; + sp20 = var_f24 * cM_ssin(sp10 + i * 7000); + sp1C = var_f24 * cM_ssin(sp10 + 10000 + i * 6000); + var_f27 = (10 - i) * 0.1f; - spc4.x = pcVar2->x + (fVar7 + yg_p->field_0xf0.x * fVar9); - spc4.y = pcVar2->y + yg_p->field_0xf0.y * fVar9; - spc4.z = pcVar2->z + (fVar8 + yg_p->field_0xf0.z * fVar9); - - fVar3 = spc4.x + (pcVar1->x - pcVar1[-1].x); - - f32 fVar10; - f32 fVar11 = spc4.z + (pcVar1->z - pcVar1[-1].z); + spc4.x = pcVar2->x + (sp20 + yg_p->field_0xf0.x * var_f27); + spc4.y = pcVar2->y + yg_p->field_0xf0.y * var_f27; + spc4.z = pcVar2->z + (sp1C + yg_p->field_0xf0.z * var_f27); - fVar4 = fVar1 + (pcVar1->y + spc4.y); - if (fVar4 < fVar5) { - fVar4 = fVar5; + sp24 = spc4.x + (pcVar1->x - pcVar1[-1].x); + + var_f29 = spc4.z + (pcVar1->z - pcVar1[-1].z); + + var_f28 = var_f25 + (pcVar1->y + spc4.y); + if (var_f28 < var_f31) { + var_f28 = var_f31; } - fVar10 = fVar4 - pcVar1[-1].y; - s16 x_rot = -cM_atan2s(fVar10, fVar11); - s16 y_rot = (s16)cM_atan2s(fVar3, JMAFastSqrt(fVar10 * fVar10 + fVar11 * fVar11)); + var_f30 = var_f28 - pcVar1[-1].y; + x_rot = -cM_atan2s(var_f30, var_f29); + y_rot = (s16)cM_atan2s(sp24, JMAFastSqrt(var_f30 * var_f30 + var_f29 * var_f29)); cMtx_XrotS(*calc_mtx, x_rot); cMtx_YrotM(*calc_mtx, y_rot); MtxPosition(&work, &pos_offset); @@ -891,9 +902,9 @@ static void ke_control(e_yg_class* i_this, yg_ke_s* yg_p, int param_3, f32 i_pos pcVar1->y = pcVar1[-1].y + pos_offset.y; pcVar1->z = pcVar1[-1].z + pos_offset.z; - pcVar2->x = fVar6 * (pcVar1->x - pcVar2->x); - pcVar2->y = fVar6 * (pcVar1->y - pcVar2->y); - pcVar2->z = fVar6 * (pcVar1->z - pcVar2->z); + pcVar2->x = var_f26 * (pcVar1->x - pcVar2->x); + pcVar2->y = var_f26 * (pcVar1->y - pcVar2->y); + pcVar2->z = var_f26 * (pcVar1->z - pcVar2->z); } } @@ -971,7 +982,7 @@ static void ke_set(e_yg_class* i_this) { work.set(0.0f, ZREG_F(4) + 15.0f, 0.0f); } MtxPosition(&work, &i_this->mYgKes[i].field_0xf0); - + i_this->mYgKes[i].field_0xf0 -= i_this->mYgKes[i].field_0x0[0]; ke_move(i_this, &i_this->mLineMat, &i_this->mYgKes[i], i, pos_z); MtxPull(); @@ -1224,7 +1235,7 @@ static int daE_YG_Execute(e_yg_class* i_this) { MTXCopy(daPy_getLinkPlayerActorClass()->getWolfMouthMatrix(), mDoMtx_stack_c::get()); mDoMtx_stack_c::multVecZero(&actor->current.pos); mDoMtx_stack_c::YrotM(KREG_S(0)); - mDoMtx_stack_c::XrotM(KREG_S(1) + (s16)0x8000); + mDoMtx_stack_c::XrotM(KREG_S(1) + 0x8000); mDoMtx_stack_c::ZrotM(KREG_S(2) + 2500); mDoMtx_stack_c::transM(KREG_F(0) + 10.0f, KREG_F(1) + -60.0f, KREG_F(2) + -20.0f); model->setBaseTRMtx(mDoMtx_stack_c::get()); @@ -1425,7 +1436,7 @@ static cPhs_Step daE_YG_Create(fopAc_ac_c* actor) { i_this->mDistance = l_HIO.pl_recognition_dist; /* If Phantom Zant actor exists */ - if (fopAcM_SearchByName(PROC_E_PZ) != 0) { + if (fopAcM_SearchByName(fpcNm_E_PZ_e) != 0) { i_this->mDistance = 10000.0f; i_this->mUnkFlag2 = 1; } @@ -1447,18 +1458,18 @@ static actor_method_class l_daE_YG_Method = { }; actor_process_profile_definition g_profile_E_YG = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_YG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_yg_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 190, // mPriority - &l_daE_YG_Method, // sub_method - 0x00050120, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_YG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_yg_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_YG_e, + /* Actor SubMtd */ &l_daE_YG_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_yh.cpp b/src/d/actor/d_a_e_yh.cpp index 2c974a9add..d37bdd1749 100644 --- a/src/d/actor/d_a_e_yh.cpp +++ b/src/d/actor/d_a_e_yh.cpp @@ -2236,7 +2236,7 @@ static int daE_YH_Create(fopAc_ac_c* a_this) { } i_this->mChildID = - fopAcM_createChild(PROC_E_YD_LEAF, fopAcM_GetID(a_this), 0, &a_this->current.pos, fopAcM_GetRoomNo(a_this), + fopAcM_createChild(fpcNm_E_YD_LEAF_e, fopAcM_GetID(a_this), 0, &a_this->current.pos, fopAcM_GetRoomNo(a_this), &a_this->shape_angle, 0, -1, 0); daE_YH_Execute(i_this); } @@ -2253,18 +2253,18 @@ static actor_method_class l_daE_YH_Method = { }; actor_process_profile_definition g_profile_E_YH = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_YH, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_yh_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 144, // mPriority - &l_daE_YH_Method, // sub_method - 0x10050120, // 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_E_YH_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_yh_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_YH_e, + /* Actor SubMtd */ &l_daE_YH_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_yk.cpp b/src/d/actor/d_a_e_yk.cpp index 01ad370b34..e42af49348 100644 --- a/src/d/actor/d_a_e_yk.cpp +++ b/src/d/actor/d_a_e_yk.cpp @@ -150,7 +150,7 @@ static int daE_YK_Draw(e_yk_class* i_this) { * * Checks if the given actor is: * - A valid actor - * - A boomerang (PROC_BOOMERANG) + * - A boomerang (fpcNm_BOOMERANG_e) * - Player is not in a certain state (0x80000) * - Boomerang is charged * - Boomerang parameter is 1 @@ -159,7 +159,7 @@ static int daE_YK_Draw(e_yk_class* i_this) { * by a charged boomerang's wind effect. */ static void* shot_b_sub(void* i_actor, void* param_1) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_BOOMERANG && + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_BOOMERANG_e && !dComIfGp_checkPlayerStatus0(0,0x80000) && daPy_py_c::checkBoomerangCharge() && fopAcM_GetParam(i_actor) == 1) { @@ -1473,7 +1473,7 @@ static int daE_YK_Create(fopAc_ac_c* i_this) { yk->mPlayerTrigger = 100.0f * yk->mPlayerTriggerBase; - if (fopAcM_SearchByName(PROC_E_PZ)) { + if (fopAcM_SearchByName(fpcNm_E_PZ_e)) { // For phantom zant fights. Used in pl_check above yk->mPlayerTrigger = 100000.0f; } @@ -1558,18 +1558,18 @@ static actor_method_class l_daE_YK_Method = { }; actor_process_profile_definition g_profile_E_YK = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_YK, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_yk_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 188, // mPriority - &l_daE_YK_Method, // sub_method - 0x10050100, // 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_E_YK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_yk_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_YK_e, + /* Actor SubMtd */ &l_daE_YK_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_ym.cpp b/src/d/actor/d_a_e_ym.cpp index 515cb8214b..a5544b4041 100644 --- a/src/d/actor/d_a_e_ym.cpp +++ b/src/d/actor/d_a_e_ym.cpp @@ -206,7 +206,7 @@ static f32 m_obj_dist; static void* s_obj_sub(void* param_0, void* param_1) { f32 obj_dist, abs_dist_to_player; - if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_Obj_Carry) { + if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == fpcNm_Obj_Carry_e) { if (!fpcM_IsCreating(fopAcM_GetID(param_0))) { obj_dist = fopAcM_searchActorDistanceXZ((fopAc_ac_c*)param_0, (fopAc_ac_c*)param_1); @@ -498,7 +498,7 @@ bool daE_YM_c::checkSurpriseNear() { if (mDistToPlayer < my_val) { if (mSphCc.ChkCoHit()) { cCcD_Obj* hit_obj = mSphCc.GetCoHitObj(); - if (fopAcM_GetName(dCc_GetAc(hit_obj->GetAc())) == PROC_ALINK) { + if (fopAcM_GetName(dCc_GetAc(hit_obj->GetAc())) == fpcNm_ALINK_e) { if (mType == 4) { return checkRailSurprise(); } @@ -711,7 +711,7 @@ void daE_YM_c::executeWait() { field_0x6f0 = 0x14; mMode = 3; field_0x6a6 = 0; - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } } } @@ -857,7 +857,7 @@ void daE_YM_c::executeEscape() { } } if (!dComIfGp_event_runCheck()) { - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); } switch (mMode) { case 0: @@ -1681,7 +1681,7 @@ bool daE_YM_c::setAttackMotion() { if (mSphCc.ChkAtHit()) { cCcD_Obj* at_hit_obj = mSphCc.GetAtHitObj(); - if (fopAcM_GetName(dCc_GetAc(at_hit_obj->GetAc())) == PROC_ALINK) { + if (fopAcM_GetName(dCc_GetAc(at_hit_obj->GetAc())) == fpcNm_ALINK_e) { if (mAction != ACT_ATTACK_WALL) { setActionMode(ACT_ATTACK_WALL); } else if (mMode == 4) { @@ -2156,7 +2156,7 @@ void daE_YM_c::executeFlyAttack() { cLib_chaseF(&speedF, l_HIO.mFlyAttackSpeed * cM_ssin(tan_val), 3.0f); if (mSphCc.ChkAtHit()) { fopAc_ac_c* hit_actor = dCc_GetAc(mSphCc.GetAtHitObj()->GetAc()); - if (fopAcM_GetName(hit_actor) == PROC_ALINK) { + if (fopAcM_GetName(hit_actor) == fpcNm_ALINK_e) { bckSetFly(7, 0, 0.0f, 1.0f); speedF = speed.y = 0.0f; mMode = 4; @@ -2245,7 +2245,7 @@ bool daE_YM_c::checkRailDig() { field_0x6f0 = 0x14; mMode = 3; mAcchCir.SetWall(40.0f, 60.0f); - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); return true; } } @@ -2923,7 +2923,7 @@ void daE_YM_c::executeRiver() { mSound.startCreatureSoundLevel(Z2SE_EN_YM_FLY, 0, -1); if (mSphCc.ChkTgHit()) { cCcD_Obj * tg_hit_obj = mSphCc.GetTgHitObj(); - if (fopAcM_GetName(dCc_GetAc(tg_hit_obj->GetAc())) == PROC_KAGO) { + if (fopAcM_GetName(dCc_GetAc(tg_hit_obj->GetAc())) == fpcNm_KAGO_e) { if (mpKago == tg_hit_obj->GetAc()) { if (mpKago->getLockActor() == this) { mpKago->setLockActor(NULL); @@ -2968,7 +2968,7 @@ void daE_YM_c::executeRiver() { } static void* s_ym_sub(void* main_p, void* other_p) { - if (fopAcM_IsActor(main_p) && fopAcM_GetName(main_p) == PROC_E_YM) { + if (fopAcM_IsActor(main_p) && fopAcM_GetName(main_p) == fpcNm_E_YM_e) { if (!fpcM_IsCreating(fopAcM_GetID(main_p)) && main_p != other_p && ((daE_YM_c*)main_p)->current.pos == ((daE_YM_c*)other_p)->current.pos) { @@ -3721,18 +3721,18 @@ static actor_method_class l_daE_YM_Method = { }; actor_process_profile_definition g_profile_E_YM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_YM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_YM_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 194, // mPriority - &l_daE_YM_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_E_YM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_YM_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_YM_e, + /* Actor SubMtd */ &l_daE_YM_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_ym_tag.cpp b/src/d/actor/d_a_e_ym_tag.cpp index fd607a778e..501c80bd3b 100644 --- a/src/d/actor/d_a_e_ym_tag.cpp +++ b/src/d/actor/d_a_e_ym_tag.cpp @@ -13,7 +13,7 @@ static int daE_YM_TAG_Draw(daE_YM_TAG_c* i_this) { } static void* s_e_ym(void* i_actorP1, void* i_actorP2) { - if (fopAcM_IsActor(i_actorP1) && fopAcM_GetName(i_actorP1) == PROC_E_YM) { + if (fopAcM_IsActor(i_actorP1) && fopAcM_GetName(i_actorP1) == fpcNm_E_YM_e) { if (fpcM_IsCreating(fopAcM_GetID(i_actorP1)) == 0) { if (static_cast(i_actorP1)->getTagNo() == (u8)fopAcM_GetParam(i_actorP2)) { return i_actorP1; @@ -69,18 +69,18 @@ static actor_method_class l_daE_YM_TAG_Method = { }; actor_process_profile_definition g_profile_E_YM_TAG = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_YM_TAG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_YM_TAG_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 195, // mPriority - &l_daE_YM_TAG_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_YM_TAG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_YM_TAG_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_YM_TAG_e, + /* Actor SubMtd */ &l_daE_YM_TAG_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_ymb.cpp b/src/d/actor/d_a_e_ymb.cpp index 2e6dea2e33..7a18b75a2c 100644 --- a/src/d/actor/d_a_e_ymb.cpp +++ b/src/d/actor/d_a_e_ymb.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_ymb.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -301,7 +301,7 @@ int daE_YMB_c::JointCallBack(J3DJoint* i_joint, int param_2) { } static void rideCallBack(dBgW* param_1, fopAc_ac_c* aActor_p, fopAc_ac_c* param_3) { - if (fopAcM_GetName(param_3) == PROC_ALINK) { + if (fopAcM_GetName(param_3) == fpcNm_ALINK_e) { ((daE_YMB_c*)aActor_p)->field_0x724 = 20; } } @@ -362,8 +362,8 @@ int daE_YMB_c::draw() { cXyz sp58; sp58.set(current.pos.x, current.pos.y + 100.0f, current.pos.z); tevStr.field_0x344 = (tevStr.field_0x344 * field_0x6d8) / 255.0f; - mShadowKey = dComIfGd_setShadow(mShadowKey, 0, model, &sp58, 2500.0f, 0.0f, - current.pos.y, field_0x6d4, mGndChk, &tevStr, 0, + mShadowKey = dComIfGd_setShadow(mShadowKey, 0, model, &sp58, 2500.0f, 0.0f, + current.pos.y, field_0x6d4, mGndChk, &tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); return 1; @@ -762,7 +762,7 @@ void daE_YMB_c::setDeathEffect() { } static void* search_drop(void* i_actor, void* i_data) { - if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Drop) { + if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_Drop_e) { if (!fpcM_IsCreating(fopAcM_GetID(i_actor))) { u8 switchBit = ((daE_YMB_c*)i_data)->getSwitchBit(); if (switchBit == 0xFF) { @@ -1075,7 +1075,7 @@ void daE_YMB_c::executeFlyAttack() { if (field_0x1324.ChkAtHit()) { actor = dCc_GetAc(field_0x1324.GetAtHitObj()->GetAc()); - if (fopAcM_GetName(actor) == PROC_ALINK) { + if (fopAcM_GetName(actor) == fpcNm_ALINK_e) { field_0x6fc = 30; speed.y = 0.0f; speedF = 0.0f; @@ -1597,7 +1597,7 @@ void daE_YMB_c::executeWaterJump() { case 5: mSound.startCreatureSoundLevel(Z2SE_EN_YB_FLY, 0, -1); - + if (field_0x6fc == 0 && cLib_chaseF(&speed.y, 0.0f, 3.0f) != 0 && mpModelMorf->isStop()) { setActionMode(1, 1); } @@ -1696,7 +1696,7 @@ void daE_YMB_c::executeDamage() { if (!(u8)checkBck(BCK_YB_FLY_WAIT)) { cLib_addCalcAngleS(&shape_angle.y, cLib_targetAngleY(¤t.pos, &YMB_DOWN_POS[field_0x711]) + 0x8000, 8, 0x200, 0x80); } - + if (field_0x6fc == 0) { cLib_chaseF(&speed.y, 0.0f, 5.0f); } @@ -2057,7 +2057,7 @@ void daE_YMB_c::setCreateDrop() { mDoMtx_stack_c::multVecZero(&sp1c); drop->setPos(sp1c); drop->setAppear(); - fopAcM_OnStatus(drop, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(drop, fopAcStts_UNK_0x4000_e); } field_0x721 = 1; @@ -2157,7 +2157,7 @@ void daE_YMB_c::executeDeath() { case 4: cLib_chaseF(&field_0x75c, -5.0f, 1.0f); mDemoCamCenter.y += field_0x75c; - + camera->mCamera.Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); if (field_0x6fc == 0) { @@ -2477,7 +2477,7 @@ void daE_YMB_c::executeStartDemo() { if (field_0x6fc >= 95) { setBoilEffect(1); - + if (field_0x6fc == 95) { dComIfGp_getVibration().StopQuake(31); } @@ -2942,7 +2942,7 @@ void daE_YMB_c::setAttentionPos() { if (field_0x6f4 == 0) { mDoMtx_stack_c::copy(model->getAnmMtx(1)); - + if (daPy_getPlayerActorClass()->getCutType() == daPy_py_c::CUT_TYPE_WOLF_JUMP || mAction == 7) { mDoMtx_stack_c::transM(200.0f, 50.0f, 0.0f); } else { @@ -2983,7 +2983,7 @@ void daE_YMB_c::setAttentionPos() { void daE_YMB_c::cc_set() { cXyz sp28; J3DModel* model = mpModelMorf->getModel(); - + setAttentionPos(); mDoMtx_stack_c::copy(model->getAnmMtx(1)); mDoMtx_stack_c::multVecZero(&sp28); @@ -3149,7 +3149,7 @@ int daE_YMB_c::CreateHeap() { } mpBgW->SetCrrFunc(dBgS_MoveBGProc_Typical); - + return 1; } @@ -3248,18 +3248,18 @@ static actor_method_class l_daE_YMB_Method = { }; actor_process_profile_definition g_profile_E_YMB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_YMB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_YMB_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 196, // mPriority - &l_daE_YMB_Method, // sub_method - 0x00044000, // 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_E_YMB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_YMB_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_YMB_e, + /* Actor SubMtd */ &l_daE_YMB_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_yr.cpp b/src/d/actor/d_a_e_yr.cpp index 4504c5c8cc..dfd07b6797 100644 --- a/src/d/actor/d_a_e_yr.cpp +++ b/src/d/actor/d_a_e_yr.cpp @@ -16,8 +16,8 @@ public: e_yrHIO_c() { mInvulnerable = 0; mStationary = 0; - field_0x8 = 20.0f; - field_0xc = 2500.0f; + field_0x0c = 20.0f; + mTurningRadius = 2500.0f; mModelScale = 1.0f; mAttackAMinTime = 2000; mAttackAMaxTime = 2500; @@ -51,68 +51,68 @@ public: virtual ~e_yrHIO_c() {} #if DEBUG - void genMessage(JORMContext*); + virtual void genMessage(JORMContext*); #endif - /* 0x04 */ u8 mInvulnerable; - /* 0x05 */ u8 mStationary; - /* 0x06 */ u8 mSuddenAttack; - /* 0x08 */ f32 field_0x8; - /* 0x0C */ f32 field_0xc; + /* 0x06 */ u8 mInvulnerable; + /* 0x07 */ u8 mStationary; + /* 0x08 */ u8 mSuddenAttack; + /* 0x0C */ f32 field_0x0c; /* 0x10 */ f32 mTurningRadius; - /* 0x14 */ f32 mModelScale; - /* 0x18 */ s16 mAttackAMinTime; - /* 0x1A */ s16 mAttackAMaxTime; - /* 0x1C */ s16 mAttackBMinTime; - /* 0x1E */ s16 mAttackBMaxTime; - /* 0x20 */ f32 mAttackMoveSpeed; - /* 0x24 */ f32 mAttackFrequency; - /* 0x28 */ f32 mFlyPlaybackSpeed; - /* 0x2C */ f32 mHoveringPlaybackSpeed; - /* 0x30 */ f32 mAttackPlaybackSpeed; - /* 0x34 */ s16 mChanceTime; - /* 0x38 */ f32 field_0x38; - /* 0x3C */ f32 mChancePlaybackSpeed; - /* 0x40 */ s16 field_0x40; - /* 0x44 */ f32 field_0x44; - /* 0x48 */ f32 field_0x48; - /* 0x4C */ f32 field_0x4c; - /* 0x50 */ s16 mBrakeStartDist; - /* 0x54 */ f32 field_0x54; - /* 0x58 */ f32 mLargeDamage; - /* 0x5C */ f32 mSmallDamage; - /* 0x60 */ s16 mHitOccurrenceFrame; - /* 0x64 */ f32 mDetectDistSky; - /* 0x68 */ f32 mDetectDistGround; - /* 0x6C */ s16 mDetectAngleSky; - /* 0x6E */ s16 mDetectAngleGround; - /* 0x70 */ f32 mDetectHeightSky; - /* 0x74 */ f32 mDetectHeightGround; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 mModelScale; + /* 0x1C */ s16 mAttackAMinTime; + /* 0x1E */ s16 mAttackAMaxTime; + /* 0x20 */ s16 mAttackBMinTime; + /* 0x22 */ s16 mAttackBMaxTime; + /* 0x24 */ f32 mAttackMoveSpeed; + /* 0x28 */ f32 mAttackFrequency; + /* 0x2C */ f32 mFlyPlaybackSpeed; + /* 0x30 */ f32 mHoveringPlaybackSpeed; + /* 0x34 */ f32 mAttackPlaybackSpeed; + /* 0x38 */ s16 mChanceTime; + /* 0x3C */ f32 field_0x38; + /* 0x40 */ f32 mChancePlaybackSpeed; + /* 0x44 */ s16 field_0x40; + /* 0x48 */ f32 field_0x44; + /* 0x4C */ f32 field_0x48; + /* 0x50 */ f32 field_0x4c; + /* 0x54 */ s16 mBrakeStartDist; + /* 0x58 */ f32 field_0x54; + /* 0x5C */ f32 mLargeDamage; + /* 0x60 */ f32 mSmallDamage; + /* 0x64 */ s16 mHitOccurrenceFrame; + /* 0x68 */ f32 mDetectDistSky; + /* 0x6C */ f32 mDetectDistGround; + /* 0x70 */ s16 mDetectAngleSky; + /* 0x72 */ s16 mDetectAngleGround; + /* 0x74 */ f32 mDetectHeightSky; + /* 0x78 */ f32 mDetectHeightGround; }; #if DEBUG void e_yrHIO_c::genMessage(JORMContext* ctx) { // "Kagarok" - ctx->genLabel("\u3000闇カーゴロック", 0x80000001); + ctx->genLabel("　闇カーゴロック", 0x80000001); ctx->genCheckBox("不死身", &mInvulnerable, 0x1); ctx->genCheckBox("静止", &mStationary, 0x1); ctx->genCheckBox("いきなり攻撃", &mSuddenAttack, 0x1); - ctx->genSlider("旋回半径", &mTurningRadius, 0.0, 10000.0f); - ctx->genSlider("モデルスケール", &mModelScale, 0.0, 10.0f); + ctx->genSlider("旋回半径", &mTurningRadius, 0.0f, 10000.0f); + ctx->genSlider("モデルスケール", &mModelScale, 0.0f, 10.0f); ctx->genSlider("Ａ攻時間（最短）", &mAttackAMinTime, 0, 15000); ctx->genSlider("Ａ攻時間（最長）", &mAttackAMaxTime, 0, 15000); ctx->genSlider("Ｂ攻時間（最短）", &mAttackBMinTime, 0, 15000); ctx->genSlider("Ｂ攻時間（最長）", &mAttackBMaxTime, 0, 15000); - ctx->genSlider("攻撃移動速度", &mAttackMoveSpeed, 0.0, 2.0f); - ctx->genSlider("攻撃頻度", &mAttackFrequency, 0.0, 10.0f); - ctx->genSlider("fly再生速度", &mFlyPlaybackSpeed, 0.0, 3.0f); - ctx->genSlider("hovering再生速度", &mHoveringPlaybackSpeed, 0.0, 3.0f); - ctx->genSlider("atack再生速度", &mAttackPlaybackSpeed, 0.0, 3.0f); - ctx->genSlider("chance再生速度", &mChancePlaybackSpeed, 0.0, 3.0f); + ctx->genSlider("攻撃移動速度", &mAttackMoveSpeed, 0.0f, 2.0f); + ctx->genSlider("攻撃頻度", &mAttackFrequency, 0.0f, 10.0f); + ctx->genSlider("fly再生速度", &mFlyPlaybackSpeed, 0.0f, 3.0f); + ctx->genSlider("hovering再生速度", &mHoveringPlaybackSpeed, 0.0f, 3.0f); + ctx->genSlider("atack再生速度", &mAttackPlaybackSpeed, 0.0f, 3.0f); + ctx->genSlider("chance再生速度", &mChancePlaybackSpeed, 0.0f, 3.0f); ctx->genSlider("chance時間", &mChanceTime, 0, 200); ctx->genSlider("brake開始距離", &mBrakeStartDist, 0, 3000); - ctx->genSlider("大ダメージ力", &mLargeDamage, 0.0, 150.0f); - ctx->genSlider("小ダメージ力", &mSmallDamage, 0.0, 150.0f); + ctx->genSlider("大ダメージ力", &mLargeDamage, 0.0f, 150.0f); + ctx->genSlider("小ダメージ力", &mSmallDamage, 0.0f, 150.0f); ctx->genSlider("ＨＩＴ発生フレーム", &mHitOccurrenceFrame, 0, 5); ctx->genSlider("プ認距離（空）", &mDetectDistSky, 0.0f, 10000.0f); ctx->genSlider("プ認高さ（空）", &mDetectHeightSky, 0.0f, 5000.0f); @@ -299,7 +299,7 @@ static int e_yr_player_view_check(e_yr_class* i_this) { if (vDistToPlayer < detectHeight) { s16 r28 = actor->current.angle.y - i_this->field_0xe84 - i_this->mYawToPlayer; if (r28 < 0) { - r28 = -r28; + r28 = r28 * -1; } if ((u16)r28 < detectAngle) { return 1; @@ -311,7 +311,7 @@ static int e_yr_player_view_check(e_yr_class* i_this) { static void path_check(e_yr_class* i_this) { static u8 check_index[255]; - if (i_this->field_0x6ec != 0) { + if (i_this->ppd != 0) { dPnt* point; fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->mEnemy; @@ -322,8 +322,8 @@ static void path_check(e_yr_class* i_this) { unkXyz1 = actor->current.pos; unkXyz1.y += 100.0f; - point = i_this->field_0x6ec->m_points; - for (s32 i = 0; i < i_this->field_0x6ec->m_num; i++, point++) { + point = i_this->ppd->m_points; + for (s32 i = 0; i < i_this->ppd->m_num; i++, point++) { unkXyz2.x = point->m_position.x; unkXyz2.y = point->m_position.y + 100.0f; unkXyz2.z = point->m_position.z; @@ -343,8 +343,8 @@ static void path_check(e_yr_class* i_this) { f32 unkFloat1 = 0.0f; bool unkFlag1 = false; for (s32 i = 0; i < 100; i++, unkFloat1 += 50.0f) { - point = i_this->field_0x6ec->m_points; - for (s32 j = 0; j < i_this->field_0x6ec->m_num; j++, point++) { + point = i_this->ppd->m_points; + for (s32 j = 0; j < i_this->ppd->m_num; j++, point++) { if (check_index[j] != 0) { xDist = actor->current.pos.x - point->m_position.x; yDist = actor->current.pos.y - point->m_position.y; @@ -352,8 +352,8 @@ static void path_check(e_yr_class* i_this) { if (JMAFastSqrt(xDist * xDist + yDist * yDist + zDist * zDist) < unkFloat1) { i_this->field_0x6ea = j - (s32)i_this->field_0x6eb; - if (i_this->field_0x6ea >= (s8)i_this->field_0x6ec->m_num) { - i_this->field_0x6ea = i_this->field_0x6ec->m_num; + if (i_this->field_0x6ea >= (s8)i_this->ppd->m_num) { + i_this->field_0x6ea = i_this->ppd->m_num; } else { if (i_this->field_0x6ea < 0) { i_this->field_0x6ea = 0; @@ -396,10 +396,11 @@ static void daE_Yr_shadowDraw(e_yr_class* i_this) { cXyz unkXyz1; unkXyz1.set(actor->current.pos.x, actor->current.pos.y + 150.0f + BREG_F(18), actor->current.pos.z); - i_this->mShadowKey = dComIfGd_setShadow(i_this->mShadowKey, 1, model, &unkXyz1, - 800.0f + BREG_F(19), 40.0f + BREG_F(17), actor->current.pos.y, - i_this->mAcch.GetGroundH(), i_this->mAcch.m_gnd, &actor->tevStr, - 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); + i_this->mShadowKey = + dComIfGd_setShadow(i_this->mShadowKey, 1, model, &unkXyz1, + 800.0f + BREG_F(19), 40.0f + BREG_F(17), actor->current.pos.y, + i_this->mAcch.GetGroundH(), i_this->mAcch.m_gnd, &i_this->mEnemy.tevStr, + 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); } static int daE_Yr_Draw(e_yr_class* i_this) { @@ -435,18 +436,18 @@ static void e_yr_pos_move(e_yr_class* i_this) { f32 zDiff = i_this->field_0x680.z - actor->current.pos.z; s16 yaw = cM_atan2s(xDiff, zDiff); s16 pitch = -cM_atan2s(yDiff, JMAFastSqrt(xDiff * xDiff + zDiff * zDiff)); - s16 angleY = actor->current.angle.y; + s16 curAngleY = actor->current.angle.y; cLib_addCalcAngleS2(&actor->current.angle.y, yaw, 10 + TREG_S(3), i_this->field_0x69c * i_this->field_0x694); - angleY = (angleY - actor->current.angle.y) * 0x20; + s16 targetAngleY = (curAngleY - actor->current.angle.y) * 0x20; s16 limit = 5500 + TREG_S(1); - if (angleY > limit) { - angleY = limit; - } else if (angleY < -limit) { - angleY = -limit; + if (targetAngleY > limit) { + targetAngleY = limit; + } else if (targetAngleY < -limit) { + targetAngleY = -limit; } - cLib_addCalcAngleS2(&actor->current.angle.z, angleY, 10 + TREG_S(3), + cLib_addCalcAngleS2(&actor->current.angle.z, targetAngleY, 10 + TREG_S(3), i_this->field_0x69c * i_this->field_0x694 * 0.5f); cLib_addCalcAngleS2(&actor->current.angle.x, pitch, 10 + TREG_S(3), @@ -512,8 +513,10 @@ static void e_yr_path_move(e_yr_class* i_this) { s32 frame; switch (i_this->field_0x67c) { - case 0: - frame = i_this->mpMorfSO->getFrame(); + case 0: { + // this case uses a different stack address than others in debug - + // it seems plausible that the frame variable was inadvertently shadowed here + s32 frame = i_this->mpMorfSO->getFrame(); if (actor->current.pos.y > i_this->field_0x680.y && frame == 9 + TREG_S(0)) { @@ -522,6 +525,7 @@ static void e_yr_path_move(e_yr_class* i_this) { } break; + } case 1: if (actor->current.pos.y <= (i_this->field_0x680).y) { i_this->field_0x67c = 0; @@ -531,6 +535,7 @@ static void e_yr_path_move(e_yr_class* i_this) { break; case 10: default: + (void)0; break; } @@ -542,18 +547,18 @@ static void e_yr_path_move(e_yr_class* i_this) { switch (i_this->field_0x67d) { case 0: { i_this->field_0x6ea += i_this->field_0x6eb; - if (i_this->field_0x6ea >= (s8)i_this->field_0x6ec->m_num) { - if (dPath_ChkClose(i_this->field_0x6ec)) { + if (i_this->field_0x6ea >= (s8)i_this->ppd->m_num) { + if (dPath_ChkClose(i_this->ppd)) { i_this->field_0x6ea = 0; } else { i_this->field_0x6eb = -1; - i_this->field_0x6ea = i_this->field_0x6ec->m_num - 2; + i_this->field_0x6ea = i_this->ppd->m_num - 2; } - s32 nextId = i_this->field_0x6ec->m_nextID; + s32 nextId = i_this->ppd->m_nextID; if (nextId != 0xffff) { - i_this->field_0x6ec = dPath_GetRoomPath(nextId, fopAcM_GetRoomNo(actor)); - JUT_ASSERT(0x451, i_this->field_0x6ec != NULL); + i_this->ppd = dPath_GetRoomPath(nextId, fopAcM_GetRoomNo(actor)); + JUT_ASSERT(0x451, i_this->ppd != NULL); } } else { if (i_this->field_0x6ea < 0) { @@ -565,7 +570,7 @@ static void e_yr_path_move(e_yr_class* i_this) { case -1: { i_this->field_0x67d = 1; - point = i_this->field_0x6ec->m_points; + point = i_this->ppd->m_points; point = &point[i_this->field_0x6ea]; if (i_this->field_0x6f0 != 0) { @@ -623,7 +628,7 @@ static void e_yr_path_move(e_yr_class* i_this) { } if (dist < 10.0f * TREG_F(10) + 300.0f) { i_this->field_0x67d = 0; - point = i_this->field_0x6ec->m_points; + point = i_this->ppd->m_points; point = &point[i_this->field_0x6ea]; if (point->mArg0 == 5) { i_this->field_0x66c = 1; @@ -682,11 +687,11 @@ static void e_yr_path_move(e_yr_class* i_this) { unkChar1 = 1; if (i_this->field_0x6a4[2] == 0) { i_this->field_0x6ea++; - if (i_this->field_0x6ea >= i_this->field_0x6ec->m_num) { + if (i_this->field_0x6ea >= i_this->ppd->m_num) { i_this->field_0x6ea = 0; } - point = i_this->field_0x6ec->m_points; + point = i_this->ppd->m_points; point = &point[i_this->field_0x6ea]; i_this->field_0x680.x = point->m_position.x; i_this->field_0x680.y = point->m_position.y; @@ -719,7 +724,7 @@ static void e_yr_path_move(e_yr_class* i_this) { zDiff = i_this->field_0x680.z - actor->current.pos.z; if (JMAFastSqrt(xDiff * xDiff + zDiff * zDiff) < 50.0f) { i_this->field_0x67d = 22; - point = i_this->field_0x6ec->m_points; + point = i_this->ppd->m_points; point = &point[i_this->field_0x6ea]; if (point->mArg0 == 3) { i_this->field_0x6a4[2] = cM_rndF(50.0f) + 50.0f; @@ -806,9 +811,9 @@ static void e_yr_auto_move(e_yr_class* i_this) { case 0: if (i_this->field_0x6a4[1] == 0) { xDiff = - actor->home.pos.x + cM_rndFX(l_e_yrHIO.field_0xc) - actor->current.pos.x; + actor->home.pos.x + cM_rndFX(l_e_yrHIO.mTurningRadius) - actor->current.pos.x; zDiff = - actor->home.pos.z + cM_rndFX(l_e_yrHIO.field_0xc) - actor->current.pos.z; + actor->home.pos.z + cM_rndFX(l_e_yrHIO.mTurningRadius) - actor->current.pos.z; if (JMAFastSqrt(xDiff * xDiff + zDiff * zDiff) > 200.0f) { i_this->field_0x6a4[1] = cM_rndF(150.0f) + 50.0f; @@ -1101,6 +1106,9 @@ static void e_yr_atack_move(e_yr_class* i_this) { cLib_addCalc2(&actor->current.pos.y, i_this->mAcch.GetGroundH() + 100.0f + TREG_F(17), 0.05f, 5.0f); + break; + default: + (void)0; break; } } @@ -1164,6 +1172,7 @@ static void e_yr_horse_move(e_yr_class* i_this) { f32 horseSpeed = dComIfGp_getHorseActor()->speedF; if (horseSpeed > 60.0f) { + int dummy; // force stack pointer into r31 for debug horseSpeed = 60.0f; } else { if (horseSpeed < 30.0f) { @@ -1302,6 +1311,9 @@ static void e_yr_horse_move(e_yr_class* i_this) { i_this->field_0x6a4[3] = cM_rndF(100.0f) + 60.0f; } + break; + default: + (void)0; break; } @@ -1526,12 +1538,12 @@ static void e_yr_wait_move(e_yr_class* i_this) { } static void e_yr_su_wait_move(e_yr_class* i_this) { - s32 old_0x6e0; - fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->mEnemy; fopAc_ac_c* playerActor = dComIfGp_getPlayer(0); daPy_py_c* player = (daPy_py_c*)playerActor; + s32 old_0x6e0; + cXyz unkXyz1; cXyz unkXyz2; @@ -1934,8 +1946,7 @@ static void ground_angle_set(e_yr_class* i_this) { dBgS_GndChk gndChk; f32 unkFloat1 = 75.0f; - model = i_this->mpMorfSO->getModel(); - MTXCopy(model->getAnmMtx(0), *calc_mtx); + MTXCopy(i_this->mpMorfSO->getModel()->getAnmMtx(0), *calc_mtx); unkXyz1.set(0.0f, 0.0f, 0.0f); MtxPosition(&unkXyz1, &unkXyz3); @@ -2009,9 +2020,12 @@ static void ground_angle_set(e_yr_class* i_this) { cLib_addCalcAngleS2(&i_this->field_0x6f8.z, unkShort1, 1, 0x400); } -static int daE_Yr_Execute(e_yr_class* i_this) { +// stripped function, inferred from its local static variable (which is not stripped) +static inline void wing_smoke_set(e_yr_class* i_this) { static s32 wing_j[4] = {12, 13, 17, 18}; +} +static int daE_Yr_Execute(e_yr_class* i_this) { fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->mEnemy; fopAc_ac_c* playerActor = dComIfGp_getPlayer(0); @@ -2456,6 +2470,8 @@ static int daE_Yr_Create(fopAc_ac_c* i_this) { fopAcM_ct(i_this, e_yr_class); if (loadResult == cPhs_COMPLEATE_e) { + int dummy; // force stack pointer into r31 for debug + // "It won't reset because it's already been defeated" OS_REPORT("PARAM %x\n", fopAcM_GetParam(i_this)); @@ -2485,8 +2501,8 @@ static int daE_Yr_Create(fopAc_ac_c* i_this) { i_this->home.pos = i_this->current.pos; if (yr->field_0x666 != 0xff) { - yr->field_0x6ec = dPath_GetRoomPath(yr->field_0x666, fopAcM_GetRoomNo(i_this)); - if (yr->field_0x6ec == 0) { + yr->ppd = dPath_GetRoomPath(yr->field_0x666, fopAcM_GetRoomNo(i_this)); + if (yr->ppd == 0) { return cPhs_ERROR_e; } @@ -2553,20 +2569,20 @@ static actor_method_class l_daE_Yr_Method = { }; actor_process_profile_definition g_profile_E_YR = { - (u32)fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_YR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_yr_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 189, // mPriority - &l_daE_Yr_Method, // sub_method - 0x10040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ (u32)fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_YR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_yr_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_YR_e, + /* Actor SubMtd */ &l_daE_Yr_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; e_yr_class::e_yr_class() { diff --git a/src/d/actor/d_a_e_zh.cpp b/src/d/actor/d_a_e_zh.cpp index 9fa95b6abc..fb64be0f5e 100644 --- a/src/d/actor/d_a_e_zh.cpp +++ b/src/d/actor/d_a_e_zh.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_zh.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -231,7 +231,7 @@ int daE_ZH_c::draw() { #if DEBUG mBgc.DrawWall(dComIfG_Bgsp()); #endif - + if (arg0 == 1) { g_env_light.settingTevStruct(8, ¤t.pos, &tevStr); g_env_light.setLightTevColorType_MAJI(mEntranceModel, &tevStr); @@ -256,7 +256,7 @@ int daE_ZH_c::draw() { } J3DModel* model = mpModelMorf->getModel(); - + g_env_light.settingTevStruct(8, ¤t.pos, &tevStr); g_env_light.setLightTevColorType_MAJI(model, &tevStr); @@ -288,7 +288,7 @@ static int daE_ZH_Draw(daE_ZH_c* i_this) { } void daE_ZH_c::setBck(int i_anm, u8 i_attr, f32 i_morf, f32 i_rate) { - mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_ZH", i_anm), i_attr, i_morf, + mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_ZH", i_anm), i_attr, i_morf, i_rate, 0.0f, -1.0f); mAnm = i_anm; } @@ -299,7 +299,7 @@ void daE_ZH_c::setActionMode(int i_action, int i_mode) { } static void* s_BallSearch(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Carry && ((daObjCarry_c*)i_actor)->prm_chk_type_lightball() && + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_Carry_e && ((daObjCarry_c*)i_actor)->prm_chk_type_lightball() && ((((daE_ZH_c*)i_data)->bitSw == 16 && ((daObjCarry_c*)i_actor)->getType() == 8) || (((daE_ZH_c*)i_data)->bitSw == 17 && ((daObjCarry_c*)i_actor)->getType() == 9))) { return i_actor; } @@ -308,7 +308,7 @@ static void* s_BallSearch(void* i_actor, void* i_data) { } static void* s_BallSearch_Tag(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Carry && ((daObjCarry_c*)i_actor)->prm_chk_type_lightball()) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_Carry_e && ((daObjCarry_c*)i_actor)->prm_chk_type_lightball()) { return i_actor; } @@ -638,7 +638,7 @@ struct eff_dt { void daE_ZH_c::mStartParticleSet() { static eff_dt const START_EFF_DT[11] = { {ZL2_HAHEN_1, 0, 7}, {ZL2_SMOKE00_1, 0, 7}, {ZL2_HAHEN_2, 0, 9}, {ZL2_SMOKE00_2, 0, 9}, - {ZL2_HAHEN_3, 0, 16}, {ZL2_SMOKE00_3, 0, 16}, {ZL2_HAHEN_4, 0, 4}, {ZL2_SMOKE00_4, 0, 4}, + {ZL2_HAHEN_3, 0, 16}, {ZL2_SMOKE00_3, 0, 16}, {ZL2_HAHEN_4, 0, 4}, {ZL2_SMOKE00_4, 0, 4}, {ZL2_SMOKE00_5, 0, 5}, {ZL2_HAHEN_5, 0, 5}, {ZL2_SMOKE00_6, 0, 5}, }; @@ -699,7 +699,7 @@ void daE_ZH_c::damage_check() { local_28.y = sp20.atan2sX_Z(); local_28.z = 0; - if (mActionMode != ACTION_EXECUTE_DEAD_STOP && mActionMode != ACTION_EXECUTE_DAMAGE && mActionMode != ACTION_EXECUTE_OPEN_START && + if (mActionMode != ACTION_EXECUTE_DEAD_STOP && mActionMode != ACTION_EXECUTE_DAMAGE && mActionMode != ACTION_EXECUTE_OPEN_START && !mAtInfo.mpCollider->ChkAtType(AT_TYPE_SLINGSHOT) && mAnm != BCK_ZH_OPEN && mAnm != BCK_ZH_START) { dComIfGp_setHitMark(1, this, &sp20, &local_28, NULL, 0); cc_at_check(this, &mAtInfo); @@ -773,7 +773,7 @@ void daE_ZH_c::executeStartDemo() { fVar1 = cLib_addCalcPos(&mDemoCamCenter, sp48, 0.7f, ZREG_F(10) + 10.0f, ZREG_F(11) + 2.0f); sp48.set(-15.0f, 350.0f, -3620.0f); fVar2 = cLib_addCalcPos(&mDemoCamEye, sp48, 0.7f, ZREG_F(10) + 10.0f, ZREG_F(11) + 2.0f); - + if (fVar1 > 4.0f || fVar2 > 4.0f) { break; } @@ -790,7 +790,7 @@ void daE_ZH_c::executeStartDemo() { camera->mCamera.SetTrimSize(0); dComIfGp_event_reset(); fopAcM_onSwitch(this, 0x12); - fopAcM_OffStatus(this , fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(this , fopAcStts_UNK_0x4000_e); setActionMode(ACTION_EXECUTE_WAIT, 1); } break; @@ -982,7 +982,7 @@ void daE_ZH_c::executeOpenStart() { setActionMode(ACTION_EXECUTE_FLY_DELETE, 0); break; } - + field_0x794[0] = BREG_S(8) + 6 & 0xFF; mMoveMode = 1; break; @@ -1123,7 +1123,7 @@ void daE_ZH_c::executeSearchMove() { cXyz ato; ato.y = mS_Ball->current.pos.y + 600.0f; - + if (mBgc.GetGroundH() != -G_CM3D_F_INF && mBgc.GetGroundH() + 500.0f > ato.y) { ato.y = mBgc.GetGroundH() + 500.0f; } @@ -1322,7 +1322,7 @@ void daE_ZH_c::executeCatchMove() { field_0xddc[i] = dComIfGp_particle_set(field_0xddc[i], effId[i], &field_0x668, NULL, NULL); } - field_0xde8 = dComIfGp_particle_setPolyColor(field_0xde8, effId[3], mBgc.m_gnd, &field_0x668, &tevStr, + field_0xde8 = dComIfGp_particle_setPolyColor(field_0xde8, effId[3], mBgc.m_gnd, &field_0x668, &tevStr, &shape_angle, &sp54, 0, NULL, -1, NULL); if (mAnm == BCK_ZH_CATCH02) { @@ -1493,7 +1493,7 @@ void daE_ZH_c::executeCatchFlyMove() { case 5: if (!mColorSet(false, 5.0f, 5.0f)) break; - + setActionMode(ACTION_EXECUTE_WAIT, 0); // fallthrough case 12: @@ -1933,7 +1933,7 @@ void daE_ZH_c::action() { if (mActionMode != ACTION_EXECUTE_SEARCH_MOVE && mActionMode != ACTION_EXECUTE_CATCH_MOVE && mActionMode != ACTION_EXECUTE_CATCH_FLY_MOVE) { Z2GetAudioMgr()->changeBgmStatus(99); } - + if (NREG_S(0) != 0) { OS_REPORT("\n\n\n"); OS_REPORT("mActionMode %d\n", mActionMode); @@ -2142,8 +2142,8 @@ int daE_ZH_c::CreateHeap() { return 0; } - if (!mpBtkAnm->init(mpModelMorf->getModel()->getModelData(), - (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("E_ZH", BTK_ZH_LOOP), 1, 2, + if (!mpBtkAnm->init(mpModelMorf->getModel()->getModelData(), + (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("E_ZH", BTK_ZH_LOOP), 1, 2, 1.0f, 0, -1)) { return 0; } @@ -2289,7 +2289,7 @@ cPhs_Step daE_ZH_c::create() { attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e; if (fopAcM_GetRoomNo(this) == 0x33 && !fopAcM_isSwitch(this, 18)) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); setActionMode(ACTION_EXECUTE_START_DEMO, 0); } else { setActionMode(ACTION_EXECUTE_WAIT, 1); @@ -2336,18 +2336,18 @@ static actor_method_class l_daE_ZH_Method = { }; actor_process_profile_definition g_profile_E_ZH = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_ZH, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_ZH_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 173, // mPriority - &l_daE_ZH_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_ZH_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_ZH_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_ZH_e, + /* Actor SubMtd */ &l_daE_ZH_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_zm.cpp b/src/d/actor/d_a_e_zm.cpp index 4943bf3123..dd7e0db5ba 100644 --- a/src/d/actor/d_a_e_zm.cpp +++ b/src/d/actor/d_a_e_zm.cpp @@ -294,7 +294,7 @@ bool daE_ZM_c::mCutTypeCheck() { } static void* s_PointSearch(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_ZM && ((daE_ZM_c*)i_actor)->arg0 == 10 && + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_ZM_e && ((daE_ZM_c*)i_actor)->arg0 == 10 && ((daE_ZM_c*)i_data)->arg2 == ((daE_ZM_c*)i_actor)->arg2) { ((daE_ZM_c*)i_data)->field_0x66c[((daE_ZM_c*)i_data)->field_0x6e5] = ((daE_ZM_c*)i_actor)->current.pos; ((daE_ZM_c*)i_data)->field_0x6e5++; @@ -474,7 +474,7 @@ void daE_ZM_c::executeAttack() { sp50 -= sp44; angle.x = sp50.atan2sY_XZ(); - parentActorID = fopAcM_createChild(PROC_E_ZM, fopAcM_GetID(this), 20, &sp44, fopAcM_GetRoomNo(this), &angle, NULL, -1, NULL); + parentActorID = fopAcM_createChild(fpcNm_E_ZM_e, fopAcM_GetID(this), 20, &sp44, fopAcM_GetRoomNo(this), &angle, NULL, -1, NULL); dComIfGp_particle_set(dPa_RM(ID_ZI_S_ZM_HASSYA_A), &sp44, &shape_angle, &i_scale); mSound.startCreatureSound(Z2SE_EN_ZM_BALL_OUT, 0, -1); setBck(BCK_ZM_MOUTHOPEN, J3DFrameCtrl::EMode_NONE, 3.0f, -1.0f); @@ -1034,18 +1034,18 @@ static actor_method_class l_daE_ZM_Method = { }; actor_process_profile_definition g_profile_E_ZM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_ZM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_ZM_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 174, // mPriority - &l_daE_ZM_Method, // sub_method - 0x00040120, // 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_E_ZM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_ZM_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_ZM_e, + /* Actor SubMtd */ &l_daE_ZM_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_zs.cpp b/src/d/actor/d_a_e_zs.cpp index 840c27697b..46a1050855 100644 --- a/src/d/actor/d_a_e_zs.cpp +++ b/src/d/actor/d_a_e_zs.cpp @@ -221,13 +221,13 @@ void daE_ZS_c::executeAppear() { if (field_0x65c > -2.0f) { field_0x65c = 0.0f; offWolfNoLock(); - fopAcM_OnStatus(this, 0x200000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x200000_e); setActionMode(1, 0); } } else { if (mpMorf->isStop()) { offWolfNoLock(); - fopAcM_OnStatus(this, 0x200000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x200000_e); setActionMode(1, 0); } } @@ -348,7 +348,7 @@ void daE_ZS_c::executeDrive() { } onWolfNoLock(); - fopAcM_OffStatus(this, 0x200000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e); mSound.startCreatureSound(Z2SE_EN_ZS_DISAPPEAR, 0, -1); field_0x673 = 1; mCyl.OffTgSetBit(); @@ -570,18 +570,18 @@ static actor_method_class l_daE_ZS_Method = { }; actor_process_profile_definition g_profile_E_ZS = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_ZS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_ZS_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 170, // mPriority - &l_daE_ZS_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_E_ZS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_ZS_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_ZS_e, + /* Actor SubMtd */ &l_daE_ZS_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_econt.cpp b/src/d/actor/d_a_econt.cpp index 1e0b69a82d..ea976d6ee9 100644 --- a/src/d/actor/d_a_econt.cpp +++ b/src/d/actor/d_a_econt.cpp @@ -17,7 +17,7 @@ static int daEcont_Draw(econt_class* i_this) { } static void* s_rd_sub(void* i_this, void* param_1) { - if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_E_RD) { + if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == fpcNm_E_RD_e) { data_805197E0[0]++; } return 0; @@ -80,18 +80,18 @@ static actor_method_class l_daEcont_Method = { }; actor_process_profile_definition g_profile_ECONT = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_ECONT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(econt_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 155, // mPriority - &l_daEcont_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ECONT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(econt_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_ECONT_e, + /* Actor SubMtd */ &l_daEcont_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_ep.cpp b/src/d/actor/d_a_ep.cpp index 7b86e201a8..312bd08ea4 100644 --- a/src/d/actor/d_a_ep.cpp +++ b/src/d/actor/d_a_ep.cpp @@ -957,18 +957,18 @@ static actor_method_class l_daEp_Method = { }; actor_process_profile_definition g_profile_EP = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_EP, - &g_fpcLf_Method.base, - sizeof(ep_class), - 0, - 0, - &g_fopAc_Method.base, - 691, - &l_daEp_Method, - 0x10244000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_EP_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(ep_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_EP_e, + /* Actor SubMtd */ &l_daEp_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x200000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_formation_mng.cpp b/src/d/actor/d_a_formation_mng.cpp index 7e96c6c169..c4a9127627 100644 --- a/src/d/actor/d_a_formation_mng.cpp +++ b/src/d/actor/d_a_formation_mng.cpp @@ -395,18 +395,18 @@ static actor_method_class l_daFmtMng_Method = { }; actor_process_profile_definition g_profile_FORMATION_MNG = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_FORMATION_MNG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daFmtMng_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 410, // mPriority - &l_daFmtMng_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_FORMATION_MNG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daFmtMng_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_FORMATION_MNG_e, + /* Actor SubMtd */ &l_daFmtMng_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_fr.cpp b/src/d/actor/d_a_fr.cpp index f5db025cfd..9280a93013 100644 --- a/src/d/actor/d_a_fr.cpp +++ b/src/d/actor/d_a_fr.cpp @@ -85,7 +85,7 @@ static void sibuki_set(fr_class* i_this) { static void* s_wd_sub(void* param_1, void* param_2) { UNUSED(param_2); - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_OBJ_LP) { + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_OBJ_LP_e) { return param_1; } @@ -741,18 +741,18 @@ static actor_method_class l_daFr_Method = { }; actor_process_profile_definition g_profile_FR = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_FR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(fr_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 235, // mPriority - &l_daFr_Method, // sub_method - 0x08040100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_FR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(fr_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_FR_e, + /* Actor SubMtd */ &l_daFr_Method, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_grass.cpp b/src/d/actor/d_a_grass.cpp index 16e8b78fd9..1cb84ef06f 100644 --- a/src/d/actor/d_a_grass.cpp +++ b/src/d/actor/d_a_grass.cpp @@ -311,7 +311,7 @@ int daGrass_c::create() { (num >= 16 && num <= 21 && i >= 16) || (num >= 4 && num <= 7 && i >= 4)) { - newGrassData(pos, fopAcM_GetRoomNo(this), fpcNm_ITEM_NONE, 0xFF, add_col, temp_r26); + newGrassData(pos, fopAcM_GetRoomNo(this), dItemNo_NONE_e, 0xFF, add_col, temp_r26); } else { newGrassData(pos, fopAcM_GetRoomNo(this), itemNo, itemBitNo, add_col, temp_r26); } @@ -401,20 +401,20 @@ static actor_method_class daGrass_METHODS = { }; actor_process_profile_definition g_profile_GRASS = { - fpcLy_CURRENT_e, // mLayerID - 11, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_GRASS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daGrass_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 8, // mPriority - &daGrass_METHODS, // sub_method - 0x00060000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 11, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_GRASS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daGrass_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_GRASS_e, + /* Actor SubMtd */ &daGrass_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_guard_mng.cpp b/src/d/actor/d_a_guard_mng.cpp index e70f82388f..141b390c38 100644 --- a/src/d/actor/d_a_guard_mng.cpp +++ b/src/d/actor/d_a_guard_mng.cpp @@ -10,10 +10,10 @@ static void* s_sub(void* i_actorP, void* i_this) { if (fopAcM_IsActor(i_actorP)) { - if (fopAcM_GetName(i_actorP) == PROC_NPC_CD3 || fopAcM_GetName(i_actorP) == PROC_NPC_PASSER || fopAcM_GetName(i_actorP) == PROC_NPC_FGUARD) { + if (fopAcM_GetName(i_actorP) == fpcNm_NPC_CD3_e || fopAcM_GetName(i_actorP) == fpcNm_NPC_PASSER_e || fopAcM_GetName(i_actorP) == fpcNm_NPC_FGUARD_e) { static_cast(i_this)->countMerchantNum(); } else { - if (fopAcM_GetName(i_actorP) == PROC_TAG_GUARD) { + if (fopAcM_GetName(i_actorP) == fpcNm_TAG_GUARD_e) { static_cast(i_this)->checkAppearTag((daTagGuard_c *)i_actorP); } } @@ -67,18 +67,18 @@ static actor_method_class l_daGuardMng_Method = { }; actor_process_profile_definition g_profile_GUARD_MNG = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_GUARD_MNG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daGuardMng_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 407, // mPriority - &l_daGuardMng_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_GUARD_MNG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daGuardMng_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_GUARD_MNG_e, + /* Actor SubMtd */ &l_daGuardMng_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_hitobj.cpp b/src/d/actor/d_a_hitobj.cpp index 1e39edf37f..d8f3aae581 100644 --- a/src/d/actor/d_a_hitobj.cpp +++ b/src/d/actor/d_a_hitobj.cpp @@ -74,18 +74,18 @@ static actor_method_class l_daHitobj_Method = { }; actor_process_profile_definition g_profile_HITOBJ = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_HITOBJ, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(hitobj_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 690, // mPriority - &l_daHitobj_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_HITOBJ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(hitobj_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_HITOBJ_e, + /* Actor SubMtd */ &l_daHitobj_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_horse.cpp b/src/d/actor/d_a_horse.cpp index 0a80fc54bd..08a6642626 100644 --- a/src/d/actor/d_a_horse.cpp +++ b/src/d/actor/d_a_horse.cpp @@ -51,11 +51,9 @@ #define ANM_HS_WALK_FAST 34 #define ANM_HS_WALK_SLOW 35 -static void strippedFunc() -{ - extern void F(f32*); - f32 v[3] = {0.0f}; - F(v); +static f32* strippedFunc() { + f32 v[3] = {}; + return v; } static char const l_arcName[] = "Horse"; @@ -66,6 +64,94 @@ const u16 daHorse_c::m_footJointTable[] = { const f32 daHorse_c::m_callLimitDistance2 = 640000.0f; +static f32 l_autoUpHeight = 50.0f; + +#if DEBUG +void daHorse_hio_c::genMessage(JORMContext* ctx) { + ctx->genSlider("最高速度", &m.max_speed, 0.0f, 100.0f); + ctx->genSlider("待機Ａ速度", &m.wait_anm_speed, 0.0f, 10.0f); + ctx->genSlider("歩きＡ速度", &m.walk_anm_speed, 0.0f, 10.0f); + ctx->genSlider("速歩Ａ速度", &m.fast_walk_anm_speed, 0.0f, 10.0f); + ctx->genSlider("走りＡ速度", &m.run_anm_speed, 0.0f, 10.0f); + ctx->genSlider("速走Ａ速度", &m.fast_run_anm_speed, 0.0, 10.0f); + ctx->genSlider("後歩Ａ速度", &m.backwalk_anm_speed, 0.0f, 10.0f); + ctx->genSlider("待機→歩き率", &m.wait_to_walk_rate, 0.0f, 1.0f); + ctx->genSlider("歩き→速歩率", &m.walk_to_fastwalk_rate, 0.0f, 1.0f); + ctx->genSlider("速歩→走り率", &m.fastwalk_to_run_rate, 0.0f, 1.0f); + ctx->genSlider("走り→速走率", &m.run_to_fastrun_rate, 0.0f, 1.1f); + ctx->genSlider("歩き最低合成率", &m.min_walk_rate, 0.0f, 1.0f); + ctx->genSlider("歩き最低速度", &m.walk_min_speed, 0.0f, 10.0f); + ctx->genSlider("歩き走り補間", &m.walk_run_interpolation, 0.0f, 30.0f); + ctx->genSlider("ダッシュＡ速度", &m.dash_anm_speed, 0.0f, 10.0f); + ctx->genSlider("旋回最大", &m.max_turn, 0, 0x7fff); + ctx->genSlider("旋回最小", &m.min_turn, 0, 0x7fff); + ctx->genSlider("加速", &m.acceleration, 0.0f, 10.0f); + ctx->genSlider("減速", &m.deceleration, 0.0f, 10.0f); + ctx->genSlider("停止減速", &m.stopping_deceleration, 0.0f, 10.0f); + ctx->genSlider("後退最大速度", &m.max_backward_speed, 0.0f, 100.0f); + ctx->genSlider("後退加速最大", &m.max_backward_acceleration, 0.0f, 10.0f); + ctx->genSlider("後退待機→歩き率", &m.backward_idle_to_walk_rate, 0.0f, 1.1f); + ctx->genSlider("急停止Ａ速度", &m.faststop_anm_speed, 0.0f, 10.0f); + ctx->genSlider("急停止補間", &m.faststop_interpolation, 0.0f, 10.0f); + ctx->genSlider("急停止ＣＦ", &m.fast_stop_cancel_frame, 0.0f, 54.0f); + ctx->genSlider("急停止立Ａ速度", &m.faststop_stand_anm_speed, 0.0f, 10.0f); + ctx->genSlider("急停止立ＣＦ", &m.faststop_stand_cancel_frame, 0.0f, 130.0f); + ctx->genSlider("急停止減速（遅）", &m.faststop_deceleration_slow, 0.0f, 20.0f); + ctx->genSlider("急停止減速（速）", &m.faststop_deceleration, 0.0f, 20.0f); + ctx->genSlider("立Ａ速度", &m.stand_anm_speed, 0.0f, 10.0f); + ctx->genSlider("立ＣＦ", &m.stand_cancel_frame, 0.0f, 120.0f); + ctx->genSlider("立補間", &m.stand_interpolation, 0.0f, 10.0f); + ctx->genSlider("鞭加速時間", &m.lash_acceleration_time, 0, 0x7fff); + ctx->genSlider("鞭追加速度", &m.add_lash_speed, 0.0f, 100.0f); + ctx->genSlider("鞭加速度", &m.lash_acceleration, 0.0f, 20.0f); + ctx->genSlider("鞭最低速度", &m.min_lash_speed, 0.0f, 100.0f); + ctx->genSlider("ジャンプＡ速度", &m.jump_anm_speed, 0.0f, 10.0f); + ctx->genSlider("ジャンプ開始Ｆ", &m.jump_start_frame, 0.0f, 7.0f); + ctx->genSlider("ジャンプ終了Ｆ", &m.jump_end_frame, 0, 7); + ctx->genSlider("ジャンプ補間", &m.jump_interpolation, 0.0f, 10.0f); + ctx->genSlider("空中開始Ｆ", &m.air_start_frame, 0.0f, 5.0f); + ctx->genSlider("空中終了Ｆ", &m.air_end_frame, 6, 14); + ctx->genSlider("空中補間", &m.air_interpolation, 0.0f, 20.0f); + ctx->genSlider("着地Ａ速度", &m.land_anm_speed, 0.0f, 10.0f); + ctx->genSlider("着地開始Ｆ", &m.land_start_frame, 0.0f, 8.0f); + ctx->genSlider("着地終了Ｆ", &m.land_end_frame, 0, 8); + ctx->genSlider("着地ＣＦ", &m.land_cancel_frame, 0.0f, 9.0f); + ctx->genSlider("着地補間", &m.land_interpolation, 0.0f, 10.0f); + ctx->genSlider("拍車回復時間", &m.spur_recovery_time, 0, 0x7fff); + ctx->genSlider("全拍車回復時間", &m.full_spur_recovery_time, 0, 0x7fff); + ctx->genSlider("連続拍車回復時間", &m.continuous_spur_recovery_time, 0, 0x7fff); + ctx->genSlider("猪ジャンプ水平", &m.boar_jump_horizontal, 0.0f, 1000.0f); + ctx->genSlider("猪ジャンプ高さ", &m.boar_jump_height, 0.0f, 1000.0f); + ctx->genSlider("崖立ち上がり速度", &m.cliff_rise_rate, 0.0f, 100.0f); + ctx->genSlider("限界床角度", &m.floor_angle_limit, 0.0f, 90.0f); + ctx->genSlider("限界水深", &m.water_depth_limit, 0.0f, 200.0f); + ctx->genSlider("敵検索範囲", &m.enemy_search_range, 0.0f, 2000.0f); + ctx->genSlider("段差登り", &m.climb_step, 0.0f, 100.0f); + ctx->genSlider("崖ジャンプ水平", &m.cliff_jump_horizontal, 0.0f, 1000.0f); + ctx->genSlider("崖ジャンプ垂直", &m.cliff_jump_vertical, 0.0f, 1000.0f); + ctx->genSlider("ジャンプＡ速度(崖)", &m.cliff_jump_anm_speed, 0.0f, 10.0f); + ctx->genSlider("ジャンプ開始Ｆ(崖)", &m.cliff_jump_start_frame, 0.0f, 7.0f); + ctx->genSlider("ジャンプ終了Ｆ(崖)", &m.cliff_jump_end_frame, 0, 7); + ctx->genSlider("ジャンプ補間(崖)", &m.cliff_jump_interpolation, 0.0f, 10.0f); + ctx->genSlider("空中Ａ速度(崖)", &m.cliff_air_anm_speed, 0.0f, 10.0f); + ctx->genSlider("空中開始Ｆ(崖)", &m.cliff_air_start_frame, 0.0f, 14.0f); + ctx->genSlider("空中終了Ｆ(崖)", &m.cliff_air_end_frame, 0, 14); + ctx->genSlider("空中補間(崖)", &m.cliff_air_interpolation, 0.0f, 20.0f); + ctx->genSlider("着地Ａ速度(崖)", &m.cliff_land_anm_speed, 0.0f, 10.0f); + ctx->genSlider("着地開始Ｆ(崖)", &m.cliff_land_start_frame, 0.0f, 8.0f); + ctx->genSlider("着地終了Ｆ(崖)", &m.cliff_land_end_frame, 0, 8); + ctx->genSlider("着地ＣＦ(崖)", &m.cliff_land_cancel_frame, 0.0f, 9.0f); + ctx->genSlider("着地補間(崖)", &m.cliff_land_interpolation, 0.0f, 10.0f); + ctx->genSlider("ジャンプ最低時間", &m.min_jump_time, 1, 30); + ctx->genLabel("カカリコ村内", 0x4000001); + ctx->genSlider("最高速度", &m.kakariko_max_speed, 0.0f, 100.0f); + ctx->genSlider("走りＡ速度", &m.kakariko_run_anm_speed, 0.0f, 10.0f); + ctx->genSlider("速走Ａ速度", &m.kakariko_fastrun_anm_speed, 0.0f, 10.0f); + ctx->genSlider("鞭加速時間", &m.kakariko_lash_acceleration_time, 0, 0x7fff); + ctx->genSlider("鞭追加速度", &m.kakariko_add_lash_speed, 0.0f, 100.0f); +} +#endif + const daHorse_hio_c1 daHorse_hio_c0::m = { 600, 50, @@ -150,6 +236,14 @@ const daHorse_hio_c1 daHorse_hio_c0::m = { }; void daHorseRein_c::setReinPos(int param_0) { + static const f32 reinGravity = -4.5f; + static const f32 topPowerRate = 5.5f; + static const f32 reinLength = 5.5f; + static const f32 reinRate = 1.2f; + static const f32 kansei = 0.2f; + static const f32 frontRate = 3.0f; + static const f32 decNeckRate = 20.0f / 17.0f; + cXyz* var_r27 = &field_0x0[0][param_0] + 1; cXyz spE0 = *field_0x0[0] - *var_r27; @@ -158,9 +252,9 @@ void daHorseRein_c::setReinPos(int param_0) { f32 var_f31 = (f32)param_0 / (f32)field_0x8[0]; f32 var_f30 = var_f31 * var_f31; - spE0 *= (1.0f - var_f30) * 3.0f; + spE0 *= (1.0f - var_f30) * frontRate; - spE0.y += -4.5f; + spE0.y += reinGravity; spE0.x += var_f30 * field_0x10; spE0.z += var_f30 * field_0x14; @@ -175,22 +269,22 @@ void daHorseRein_c::setReinPos(int param_0) { spBC.normalizeZP(); spC8 += spBC * field_0x18; - field_0x18 -= 1.1764706f; + field_0x18 -= decNeckRate; } spC8.normalizeZP(); - *var_r28 = *var_r27 + (spC8 * 5.5f); + *var_r28 = *var_r27 + (spC8 * reinLength); spC8 = *var_r28 - *field_0x0[0]; f32 var_f29 = spC8.abs(); - f32 var_f28 = (f32)param_0 * 5.5f * 1.2f; + f32 var_f28 = (f32)param_0 * topPowerRate * reinRate; if (var_f29 > var_f28) { spC8 *= var_f28 / var_f29; *var_r28 = ((*field_0x0[0] + spC8) * (1.0f - var_f31)) + (*var_r28 * var_f31); } - *var_r25 = (*var_r28 - spD4) * 0.2f; + *var_r25 = (*var_r28 - spD4) * kansei; } void daHorseRein_c::setReinPosPart(int param_0) { @@ -213,8 +307,6 @@ void daHorseRein_c::setReinPosPart(int param_0) { } } -static f32 l_autoUpHeight = 50.0f; - static dCcD_SrcCyl l_cylSrc = { { {0x0, {{AT_TYPE_HORSE, 0x1, 0x12}, {0xd8fbfdff, 0x9}, 0x79}}, // mObj @@ -246,7 +338,7 @@ static dCcD_SrcSph l_sphSrc = { void daHorse_c::coHitCallbackBoarJump(fopAc_ac_c* i_hitActor) { if (!dComIfGp_event_runCheck() && !checkEndResetStateFlg0(daHorse_ERFLG0(ERFLG0_UNK_4 | ERFLG0_UNK_2 | ERFLG0_UNK_1)) && - fopAcM_GetName(i_hitActor) == PROC_E_WB && + fopAcM_GetName(i_hitActor) == fpcNm_E_WB_e && ((fopEn_enemy_c*)i_hitActor)->checkDownFlg()) { f32 sin_y = cM_ssin(current.angle.y); @@ -303,7 +395,7 @@ void daHorse_c::coHitCallbackBoarHit(fopAc_ac_c* i_hitActor, dCcD_GObjInf* i_hit if (!dComIfGp_event_runCheck() && ((m_procID == PROC_MOVE_e && speedF > 5.0f) || checkStateFlg0(daHorse_FLG0(FLG0_UNK_200000 | FLG0_UNK_100000))) && checkStateFlg0(FLG0_UNK_1) && - fopAcM_GetName(i_hitActor) == PROC_E_WB && + fopAcM_GetName(i_hitActor) == fpcNm_E_WB_e && !((fopEn_enemy_c*)i_hitActor)->checkDownFlg()) { if (checkStateFlg0(daHorse_FLG0(FLG0_UNK_200000 | FLG0_UNK_100000))) { @@ -332,7 +424,7 @@ void daHorse_c::coHitCallbackBoarHit(fopAc_ac_c* i_hitActor, dCcD_GObjInf* i_hit } void daHorse_c::coHitCallbackCowHit(fopAc_ac_c* i_hitActor) { - if ((fopAcM_GetName(i_hitActor) == PROC_COW) && ((daCow_c*)i_hitActor)->isAngry()) { + if ((fopAcM_GetName(i_hitActor) == fpcNm_COW_e) && ((daCow_c*)i_hitActor)->isAngry()) { ((daCow_c*)i_hitActor)->setAngryHit(); if (!dComIfGp_event_runCheck() && checkStateFlg0(FLG0_UNK_1)) { @@ -345,7 +437,7 @@ void daHorse_c::coHitCallbackCowHit(fopAc_ac_c* i_hitActor) { m_cowHit = 5; } - } else if (fopAcM_GetName(i_hitActor) == PROC_ALINK) { + } else if (fopAcM_GetName(i_hitActor) == fpcNm_ALINK_e) { if (daAlink_getAlinkActorClass()->checkSlideMode()) { onEndResetStateFlg0(ERFLG0_UNK_800); } @@ -380,7 +472,7 @@ static void* daHorse_searchEnemy(fopAc_ac_c* i_actor, void* i_data) { daHorse_c* horse_p = dComIfGp_getHorseActor(); f32 search_dist = *(f32*)i_data; - if (fopAcM_GetGroup(i_actor) == fopAc_ENEMY_e && fopAcM_GetName(i_actor) != PROC_E_WS && horse_p->current.pos.abs2XZ(i_actor->current.pos) < search_dist * search_dist) { + if (fopAcM_GetGroup(i_actor) == fopAc_ENEMY_e && fopAcM_GetName(i_actor) != fpcNm_E_WS_e && horse_p->current.pos.abs2XZ(i_actor->current.pos) < search_dist * search_dist) { return i_actor; } @@ -479,7 +571,7 @@ static int daHorse_modelCallBack(J3DJoint* i_joint, int param_1) { } static void* daHorse_searchSingleBoar(fopAc_ac_c* i_actor, void* i_data) { - if (fopAcM_GetName(i_actor) == PROC_E_WB) { + if (fopAcM_GetName(i_actor) == fpcNm_E_WB_e) { fopAc_ac_c** ppActor = (fopAc_ac_c**)i_data; *ppActor = i_actor; } @@ -1562,7 +1654,7 @@ void daHorse_c::setMoveAnime(f32 i_morf) { } else { ratio = var_f31 / m_hio->m.wait_to_walk_rate; if (m_procID != PROC_WAIT_e && speedF > 0.05f) { - ratio = m_hio->m.field_0xdc + (ratio * (1.0f - m_hio->m.field_0xdc)); + ratio = m_hio->m.min_walk_rate + (ratio * (1.0f - m_hio->m.min_walk_rate)); } setDoubleAnime(ratio, m_hio->m.wait_anm_speed, m_hio->m.walk_anm_speed, ANM_HS_WAIT_01, ANM_HS_WALK_SLOW, i_morf); } @@ -1631,7 +1723,7 @@ void daHorse_c::setMoveAnime(f32 i_morf) { } } -int daHorse_c::checkHorseNoMove(int param_0) { +int daHorse_c::checkHorseNoMove(BOOL forward) { cXyz sp50; cXyz sp44; @@ -1644,7 +1736,7 @@ int daHorse_c::checkHorseNoMove(int param_0) { } s16 spA; - if (daAlink_c::getMoveBGActorName(m_acch.m_gnd, 0) == PROC_OBJ_BRG) { + if (daAlink_c::getMoveBGActorName(m_acch.m_gnd, 0) == fpcNm_OBJ_BRG_e) { spA = 0; } else if (m_procID == PROC_TURN_e && dComIfG_Bgsp().ChkPolySafe(m_acch.m_gnd)) { spA = fopAcM_getPolygonAngle(m_acch.m_gnd, shape_angle.y); @@ -1658,9 +1750,18 @@ int daHorse_c::checkHorseNoMove(int param_0) { f32 var_f27; f32 var_f31; f32 var_f30; - - if (param_0 != 0) { - if (checkEndResetStateFlg0(ERFLG0_UNK_200) || (checkStateFlg0(FLG0_UNK_100000) && (m_procID == PROC_MOVE_e || m_procID == PROC_TURN_e || m_procID == PROC_STOP_e) && ((current.pos.z < -33500.0f && abs(shape_angle.y) > 0x4000) || (current.pos.z > -20500.0f && abs(shape_angle.y) < 0x4000)))) { + + static const f32 noMoveCresDis = 500.0f; + static const f32 noMoveStopDis = 100.0f; + static const f32 noMoveCresBackDis = 200.0f; + static const f32 checkOffsetY = 200.0f; + + if (forward) { + if (checkEndResetStateFlg0(ERFLG0_UNK_200) || + (checkStateFlg0(FLG0_UNK_100000) && + (m_procID == PROC_MOVE_e || m_procID == PROC_TURN_e || m_procID == PROC_STOP_e) && + ((current.pos.z < -33500.0f && abs(shape_angle.y) > 0x4000) || + (current.pos.z > -20500.0f && abs(shape_angle.y) < 0x4000)))) { return 3; } @@ -1672,6 +1773,7 @@ int daHorse_c::checkHorseNoMove(int param_0) { } var_f31 *= var_f31; + // not sure if these floats should be/be derived from named constants var_f31 = 200.0f + (300.0f * var_f31); var_f29 = cM_ssin(current.angle.y); var_f28 = cM_scos(current.angle.y); @@ -1680,15 +1782,15 @@ int daHorse_c::checkHorseNoMove(int param_0) { } else { var_f29 = -cM_ssin(current.angle.y); var_f28 = -cM_scos(current.angle.y); - sp28 = 200.0f * cM_ssin(spA); - var_f27 = 200.0f * cM_scos(spA); + sp28 = noMoveCresBackDis * cM_ssin(spA); + var_f27 = noMoveCresBackDis * cM_scos(spA); } daAlink_c* player = daAlink_getAlinkActorClass(); cXyz start(current.pos.x, current.pos.y + m_acchcir[0].GetWallH(), current.pos.z); - if (daAlink_c::getMoveBGActorName(m_acch.m_gnd, 0) == PROC_OBJ_BRG) { - start.y = 200.0f + current.pos.y; + if (daAlink_c::getMoveBGActorName(m_acch.m_gnd, 0) == fpcNm_OBJ_BRG_e) { + start.y = checkOffsetY + current.pos.y; } cXyz end(start.x + (var_f27 * var_f29), start.y + sp28, start.z + (var_f27 * var_f28)); @@ -1701,6 +1803,7 @@ int daHorse_c::checkHorseNoMove(int param_0) { // An alternative way to match the instruction order is by changing dBgS::LineCross's return // type to BOOL while keeping cBgS::LineCross's return type as bool, but that breaks other // functions that call dBgS::LineCross. + // See also daAlink_c::setCrawlMoveAngle. BOOL line_cross = dComIfG_Bgsp().cBgS::LineCross(&m_linechk); offStateFlg0(FLG0_UNK_100); @@ -1709,9 +1812,11 @@ int daHorse_c::checkHorseNoMove(int param_0) { dComIfG_Bgsp().GetTriPla(m_linechk, &plane); sp50 = m_linechk.GetCross(); - if (cBgW_CheckBWall(plane.mNormal.y) && ((param_0 != 0 && cLib_distanceAngleS(plane.mNormal.atan2sX_Z(), shape_angle.y) > 0x6000) || (param_0 == 0 && cLib_distanceAngleS(plane.mNormal.atan2sX_Z(), shape_angle.y) < 0x2000))) { + if (cBgW_CheckBWall(plane.mNormal.y) && + ((forward != 0 && cLib_distanceAngleS(plane.mNormal.atan2sX_Z(), shape_angle.y) > 0x6000) || + (forward == 0 && cLib_distanceAngleS(plane.mNormal.atan2sX_Z(), shape_angle.y) < 0x2000))) { m_linechk.Set(&start, &end, this); - if (m_procID == PROC_MOVE_e && param_0 != 0 && !dComIfG_Bgsp().LineCross(&m_linechk)) { + if (m_procID == PROC_MOVE_e && forward != 0 && !dComIfG_Bgsp().LineCross(&m_linechk)) { if (sp50.abs2(start) < 23716.0f) { return 4; } @@ -1731,13 +1836,13 @@ int daHorse_c::checkHorseNoMove(int param_0) { var_f30 = 50.0f; } - sp50.y = 200.0f + current.pos.y; + sp50.y = checkOffsetY + current.pos.y; f32 sp18; - if (param_0 != 0 && speedF > (0.5f * m_normalMaxSpeedF)) { - sp18 = 500.0; + if (forward != 0 && speedF > (0.5f * m_normalMaxSpeedF)) { + sp18 = noMoveCresDis; } else { - sp18 = 200.0f; + sp18 = noMoveCresBackDis; } while (var_f30 < sp18) { @@ -1754,8 +1859,8 @@ int daHorse_c::checkHorseNoMove(int param_0) { if (!checkStateFlg0(FLG0_UNK_1)) { for (int i = 0; i < m_scnChg_num; i++) { if (m_scnChg_buffer[i]->checkArea(&sp50)) { - if (var_f30 <= 101.0f) { - if (param_0 != 0 && !player->checkHorseGetOffMode()) { + if (var_f30 <= noMoveStopDis + 1) { + if (forward != 0 && !player->checkHorseGetOffMode()) { onStateFlg0(FLG0_UNK_40000); field_0x1704 = 30; } @@ -1768,10 +1873,11 @@ int daHorse_c::checkHorseNoMove(int param_0) { if (fopAcM_gc_c::getHorseNoEntry() || (!checkStateFlg0(FLG0_UNK_1) && dComIfG_Bgsp().GetExitId(*fopAcM_gc_c::getGroundCheck()) != 0x3F) || - (sp8 > sp14 && daAlink_c::getMoveBGActorName(*fopAcM_gc_c::getGroundCheck(), 1) != PROC_OBJ_BRG && dComIfG_Bgsp().GetSpecialCode(*fopAcM_gc_c::getGroundCheck()) != 2)) + (sp8 > sp14 && daAlink_c::getMoveBGActorName(*fopAcM_gc_c::getGroundCheck(), 1) != fpcNm_OBJ_BRG_e && + dComIfG_Bgsp().GetSpecialCode(*fopAcM_gc_c::getGroundCheck()) != 2)) { - if (var_f30 <= 101.0f) { - if (sp8 > sp14 && param_0 != 0) { + if (var_f30 <= noMoveStopDis + 1) { + if (sp8 > sp14 && forward != 0) { onStateFlg0(FLG0_UNK_40000); field_0x1704 = 30; } @@ -1782,8 +1888,8 @@ int daHorse_c::checkHorseNoMove(int param_0) { if (fopAcM_wt_c::waterCheck(&sp50)) { if (fopAcM_wt_c::getWaterY() - fopAcM_gc_c::getGroundY() > m_hio->m.water_depth_limit) { - if (var_f30 <= 101.0f) { - if (param_0 != 0) { + if (var_f30 <= noMoveStopDis + 1) { + if (forward != 0) { onStateFlg0(FLG0_UNK_40000); field_0x1704 = 30; } @@ -1799,13 +1905,15 @@ int daHorse_c::checkHorseNoMove(int param_0) { if (hstop->getActiveFlg()) { fpoAcM_relativePos(hstop, &sp50, &sp44); - if (sp44.y >= -200.0f && sp44.y <= (400.0f + hstop->scale.y) && fabsf(sp44.x) <= hstop->scale.x && fabsf(sp44.z) <= hstop->scale.z) { - if (param_0 != 0 && speedF > 0.0f && m_procID == PROC_MOVE_e) { + if (sp44.y >= -checkOffsetY && + sp44.y <= (checkOffsetY * 2 + hstop->scale.y) && + fabsf(sp44.x) <= hstop->scale.x && fabsf(sp44.z) <= hstop->scale.z) { + if (forward != 0 && speedF > 0.0f && m_procID == PROC_MOVE_e) { onStateFlg0(FLG0_UNK_200); hstop->onTagStop(); } - if (var_f30 <= 101.0f) { + if (var_f30 <= noMoveStopDis + 1) { return 2; } return 1; @@ -1817,7 +1925,7 @@ int daHorse_c::checkHorseNoMove(int param_0) { var_f30 += 25.0f; } - return rt; + return rt; } BOOL daHorse_c::checkTurnPlayerState() { @@ -1826,7 +1934,7 @@ BOOL daHorse_c::checkTurnPlayerState() { } int daHorse_c::setSpeedAndAngle() { - int var_r28 = checkHorseNoMove(1); + int var_r28 = checkHorseNoMove(TRUE); if (var_r28 == 3) { if (checkStateFlg0(FLG0_UNK_2)) { return 3; @@ -1856,7 +1964,7 @@ int daHorse_c::setSpeedAndAngle() { ) { if (speedF < 0.0f) { - var_r28 = checkHorseNoMove(0); + var_r28 = checkHorseNoMove(FALSE); if (var_r28 == 2) { speedF = 0.0f; } else if (var_r28 == 1) { @@ -2011,7 +2119,7 @@ int daHorse_c::setSpeedAndAngle() { field_0x1704--; if (field_0x1704 == 0) { offStateFlg0(FLG0_UNK_40000); - } else if (checkHorseNoMove(0) == 2) { + } else if (checkHorseNoMove(FALSE) == 2) { offStateFlg0(FLG0_UNK_40000); field_0x1704 = 0; speedF = 0.0f; @@ -2023,7 +2131,7 @@ int daHorse_c::setSpeedAndAngle() { } else if (!checkStateFlg0(FLG0_UNK_8) && (checkTurnInput() || checkStateFlg0(daHorse_FLG0(FLG0_UNK_100000 | FLG0_UNK_200000))) && checkTurnPlayerState() && speedF > (0.2f * -m_hio->m.max_backward_speed)) { return 1; } else { - int spC = checkHorseNoMove(0); + int spC = checkHorseNoMove(FALSE); if (spC == 0) { if (!checkStateFlg0(daHorse_FLG0(FLG0_UNK_100000 | FLG0_UNK_200000))) { cLib_chaseF(&speedF, -m_hio->m.max_backward_speed, m_hio->m.max_backward_acceleration); @@ -2167,12 +2275,14 @@ void daHorse_c::setMatrix() { } if (checkStateFlg0(FLG0_UNK_1) && checkStateFlg0(FLG0_RODEO_MODE) && m_procID == PROC_MOVE_e) { + static const s16 rodeoRunAngleZ = 1500; + if (checkStateFlg0(FLG0_RODEO_LEFT)) { - if (var_r29 < 1500) { - var_r29 = 1500; + if (var_r29 < rodeoRunAngleZ) { + var_r29 = rodeoRunAngleZ; } - } else if (var_r29 > -1500) { - var_r29 = -1500; + } else if (var_r29 > -rodeoRunAngleZ) { + var_r29 = -rodeoRunAngleZ; } } @@ -2697,9 +2807,9 @@ void daHorse_c::footBgCheck() { footdata_p = m_footData; mDoMtx_multVec(m_model->getAnmMtx(6), &l_frontFootOffset, &m_footData[0].field_0xc); - mDoMtx_multVec(m_model->getAnmMtx(0xA), &l_frontFootOffset, &m_footData[1].field_0xc); - mDoMtx_multVec(m_model->getAnmMtx(0x1E), &l_backFootOffset, &m_footData[2].field_0xc); - mDoMtx_multVec(m_model->getAnmMtx(0x22), &l_backFootOffset, &m_footData[3].field_0xc); + mDoMtx_multVec(m_model->getAnmMtx(10), &l_frontFootOffset, &m_footData[1].field_0xc); + mDoMtx_multVec(m_model->getAnmMtx(30), &l_backFootOffset, &m_footData[2].field_0xc); + mDoMtx_multVec(m_model->getAnmMtx(34), &l_backFootOffset, &m_footData[3].field_0xc); cXyz sp7C = current.pos - old.pos; @@ -2778,11 +2888,13 @@ void daHorse_c::footBgCheck() { if (checkResetStateFlg0(RFLG0_TURN_STAND)) { spA = 0; } else { + static const s16 shapeLimitAngle = 0x1C72; + spA = field_0x1714; - if (spA > 0x1C72) { - spA = 0x1C72; - } else if (spA < -0x1C72) { - spA = -0x1C72; + if (spA > shapeLimitAngle) { + spA = shapeLimitAngle; + } else if (spA < -shapeLimitAngle) { + spA = -shapeLimitAngle; } } @@ -2817,11 +2929,15 @@ void daHorse_c::setReinPosMoveInit(int param_0) { static cXyz localNeckLeft(10.0f, 10.0f, 35.0f); static cXyz localNeckRight(10.0f, 10.0f, -35.0f); + static const f32 sideOffset = 10.0f; + static const f32 onHandSideOffset = 1.0f; + static const f32 neckSideOffset = 10.0f; + mDoMtx_multVec(m_model->getAnmMtx(0xF), &reinLeftStart, m_rein[0].field_0x0[0]); mDoMtx_multVec(m_model->getAnmMtx(0xF), &reinRightStart, m_rein[1].field_0x0[0]); s16 spC = field_0x170e + 0x4000; - f32 var_f31 = 10.0f; + f32 var_f31 = sideOffset; f32 var_f30; f32 temp_f28 = cM_ssin(spC); f32 temp_f27 = cM_scos(spC); @@ -2832,7 +2948,7 @@ void daHorse_c::setReinPosMoveInit(int param_0) { } if (param_0 != 3) { - var_f31 += 1.0f; + var_f31 += onHandSideOffset; } var_f30 = var_f31; @@ -2841,12 +2957,12 @@ void daHorse_c::setReinPosMoveInit(int param_0) { if (field_0x1712 > 0) { mDoMtx_multVec(m_model->getAnmMtx(0xB), &localNeckRight, &m_rein[1].field_0x1c); - m_rein[1].field_0x18 = 20.0f * temp_f29; - var_f30 += 10.0f * temp_f29; + m_rein[1].field_0x18 = sideOffset * 2 * temp_f29; + var_f30 += neckSideOffset * temp_f29; } else if (field_0x1712 < 0) { mDoMtx_multVec(m_model->getAnmMtx(0xB), &localNeckLeft, &m_rein[0].field_0x1c); - m_rein[0].field_0x18 = 20.0f * temp_f29; - var_f31 += 10.0f * temp_f29; + m_rein[0].field_0x18 = sideOffset * 2 * temp_f29; + var_f31 += neckSideOffset * temp_f29; } m_rein[0].field_0x10 = var_f31 * temp_f28; @@ -2902,6 +3018,9 @@ void daHorse_c::copyReinPos() { } void daHorse_c::setReinPosHandSubstance(int param_0) { + static const int handSideCnt = 20; + static const int oneHandSideCnt = 24; + static const Vec zeldaLocalLeft = {3.0f, -0.5f, -5.0f}; static const Vec zeldaLocalRight = {3.0f, -0.5f, 5.0f}; @@ -2916,15 +3035,15 @@ void daHorse_c::setReinPosHandSubstance(int param_0) { int var_r25; int var_r24; if (param_0 & 1) { - var_r25 = var_r29 + 20; + var_r25 = var_r29 + handSideCnt; } else { - var_r25 = var_r29 + 24; + var_r25 = var_r29 + oneHandSideCnt; } if (param_0 & 2) { - var_r24 = 20 - var_r29; + var_r24 = handSideCnt - var_r29; } else { - var_r24 = 24 - var_r29; + var_r24 = oneHandSideCnt - var_r29; } if (param_0 & 4) { @@ -2975,6 +3094,7 @@ void daHorse_c::setReinPosHandSubstance(int param_0) { void daHorse_c::setReinPosNormalSubstance() { static cXyz saddleLeft(29.0f, -2.0f, 30.0f); static cXyz saddleRight(29.0f, 2.0f, 30.0f); + static const int sideCount = 24; if (!checkStateFlg0(FLG0_UNK_1) && getZeldaActor() != NULL) { if (((daHoZelda_c*)getZeldaActor())->checkSingleRide()) { @@ -2985,20 +3105,20 @@ void daHorse_c::setReinPosNormalSubstance() { setReinPosMoveInit(0); - mDoMtx_multVec(m_model->getAnmMtx(0x15), &saddleLeft, m_rein[0].field_0x0[0] + 24); - m_rein[0].setReinPosPart(24); + mDoMtx_multVec(m_model->getAnmMtx(0x15), &saddleLeft, m_rein[0].field_0x0[0] + sideCount); + m_rein[0].setReinPosPart(sideCount); - mDoMtx_multVec(m_model->getAnmMtx(0x15), &saddleRight, m_rein[1].field_0x0[0] + 24); - m_rein[1].setReinPosPart(24); + mDoMtx_multVec(m_model->getAnmMtx(0x15), &saddleRight, m_rein[1].field_0x0[0] + sideCount); + m_rein[1].setReinPosPart(sideCount); - *m_rein[2].field_0x0[0] = m_rein[0].field_0x0[0][24]; + *m_rein[2].field_0x0[0] = m_rein[0].field_0x0[0][sideCount]; m_rein[2].setReinPosPart(0); if (checkResetStateFlg0(RFLG0_UNK_1)) { for (int i = 0; i < 5; i++) { - m_rein[0].setReinPosPart(24); - m_rein[1].setReinPosPart(24); - *m_rein[2].field_0x0[0] = m_rein[0].field_0x0[0][24]; + m_rein[0].setReinPosPart(sideCount); + m_rein[1].setReinPosPart(sideCount); + *m_rein[2].field_0x0[0] = m_rein[0].field_0x0[0][sideCount]; m_rein[2].setReinPosPart(0); } } @@ -3123,7 +3243,7 @@ BOOL daHorse_c::checkTurnAfterFastMove(f32 param_0) { return procTurnInit(0); } - if (temp_r29 < 0x2000 && !checkHorseNoMove(1)) { + if (temp_r29 < 0x2000 && !checkHorseNoMove(TRUE)) { speedF = m_hio->m.fastwalk_to_run_rate * m_normalMaxSpeedF; return procMoveInit(); } @@ -3301,6 +3421,8 @@ void daHorse_c::savePos() { } int daHorse_c::callHorseSubstance(cXyz const* i_pos) { + static const f32 initDistance2 = SQUARE(2000.0f); + int room_no = dComIfGp_roomControl_getStayNo(); if (checkStateFlg0(FLG0_RODEO_MODE) || (daAlink_c::checkStageName("F_SP108") && (room_no == 5 || room_no == 6 || room_no == 11 || room_no == 14)) || @@ -3323,7 +3445,7 @@ int daHorse_c::callHorseSubstance(cXyz const* i_pos) { } } - if (m_path != NULL && (checkStateFlg0(FLG0_NO_DRAW_WAIT) || dist_xz2 > SQUARE(2000.0f))) { + if (m_path != NULL && (checkStateFlg0(FLG0_NO_DRAW_WAIT) || dist_xz2 > initDistance2)) { daAlink_c* player = daAlink_getAlinkActorClass(); BE(Vec)* farthest_pos; BE(Vec)* path_pnt_pos; @@ -3340,7 +3462,7 @@ int daHorse_c::callHorseSubstance(cXyz const* i_pos) { f32 sqdist = (x_dist * x_dist) + (z_dist * z_dist); - if (i == 0 || (farthest_sqdist > sqdist && sqdist > SQUARE(2000.0f))) { + if (i == 0 || (farthest_sqdist > sqdist && sqdist > initDistance2)) { farthest_sqdist = sqdist; farthest_pos = path_pnt_pos; } @@ -3715,9 +3837,12 @@ int daHorse_c::procStop() { {7, 18, 26} }; + static const f32 stopEffEndFrame = 29.0f; + static const f32 stopStandEffEndFrame = 32.0f; + const unk_foot_eff_t* var_r29; daPy_frameCtrl_c* frame_ctrl = &m_frameCtrl[0]; - int var_r25 = checkHorseNoMove(1); + int var_r25 = checkHorseNoMove(TRUE); if (var_r25 == 2) { speedF = 0.0f; @@ -3768,10 +3893,10 @@ int daHorse_c::procStop() { field_0x16b7 = 2; } var_r29 = stopStandFootEffectFrame; - var_f30 = 32.0f; + var_f30 = stopStandEffEndFrame; } else { var_r29 = stopFootEffectFrame; - var_f30 = 29.0f; + var_f30 = stopEffEndFrame; } } @@ -3794,6 +3919,9 @@ int daHorse_c::procStop() { } int daHorse_c::procTurnInit(int param_0) { + static const f32 turnRateStop = DEG_TO_RAD(6); + static const f32 turnRateStand = DEG_TO_RAD(45.0f / 8.0f); + if (checkEndResetStateFlg0(ERFLG0_RIDE_RUN_FLG)) { speedF = 0.0f; return 0; @@ -3806,7 +3934,7 @@ int daHorse_c::procTurnInit(int param_0) { setSingleAnime(ANM_HS_STAND, m_hio->m.stand_anm_speed, 0.0f, -1, m_hio->m.stand_interpolation, 0); field_0x1774 = 52.0f; - field_0x1778 = 0.09817477f; + field_0x1778 = turnRateStand; field_0x177C = m_hio->m.stand_cancel_frame; field_0x1780 = 20.0f; field_0x1784 = 53.0f; @@ -3862,7 +3990,7 @@ int daHorse_c::procTurn() { onResetStateFlg0(RFLG0_ENEMY_SEARCH); } - int sp14 = checkHorseNoMove(1); + int sp14 = checkHorseNoMove(TRUE); if (m_anmIdx[0] == ANM_HS_STAND) { if (frame_ctrl->checkPass(8.0f) && !checkInputOnR()) { @@ -3950,7 +4078,7 @@ int daHorse_c::procTurn() { s16 spA = shape_angle.x; for (int i = 0; i < 8; i++) { - if (checkHorseNoMove(1) == 2) { + if (checkHorseNoMove(TRUE) == 2) { current.pos = old.pos; break; } @@ -4104,7 +4232,7 @@ int daHorse_c::procLandInit(f32 i_speedF, BOOL param_1) { int daHorse_c::procLand() { daPy_frameCtrl_c* frame_ctrl = &m_frameCtrl[0]; - int temp_r3 = checkHorseNoMove(1); + int temp_r3 = checkHorseNoMove(TRUE); if (temp_r3 == 2) { speedF = 0.0f; @@ -4211,7 +4339,7 @@ int daHorse_c::procToolDemo() { } void daHorse_c::searchSceneChangeArea(fopAc_ac_c* i_scnChg) { - if (fopAcM_GetName(i_scnChg) == PROC_SCENE_EXIT) { + if (fopAcM_GetName(i_scnChg) == fpcNm_SCENE_EXIT_e) { if (m_scnChg_num == 50) { // "Exceeded buffer!!!!!\n" OS_PANIC(0x1CD6, "バッファ越え！！！！！\n"); @@ -4247,7 +4375,7 @@ int daHorse_c::execute() { daAlink_c* player_p = daAlink_getAlinkActorClass(); #if PLATFORM_SHIELD || PLATFORM_WII - l_autoUpHeight = m_hio->m.m0D0; + l_autoUpHeight = m_hio->m.climb_step; m_acchcir[0].SetWall(l_autoUpHeight + 0.1f, 60.0f); if (checkStateFlg0(FLG0_UNK_2000)) { m_normalMaxSpeedF = m_hio->m.kakariko_max_speed; @@ -4346,7 +4474,7 @@ int daHorse_c::execute() { s16 old_angle_y = current.angle.y; for (int i = 0; i < 8; i++) { - if (checkHorseNoMove(1) == 2) { + if (checkHorseNoMove(TRUE) == 2) { current.pos -= *m_cc_stts.GetCCMoveP(); break; } @@ -4554,20 +4682,20 @@ static actor_method_class l_daHorse_Method = { }; actor_process_profile_definition g_profile_HORSE = { - fpcLy_CURRENT_e, // mLayerID - 4, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_HORSE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daHorse_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 90, // mPriority - &l_daHorse_Method, // sub_method - 0x00060000, // mStatus - fopAc_UNK_GROUP_5_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_HORSE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daHorse_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_HORSE_e, + /* Actor SubMtd */ &l_daHorse_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_hozelda.cpp b/src/d/actor/d_a_hozelda.cpp index f09edf88ae..364654c1c1 100644 --- a/src/d/actor/d_a_hozelda.cpp +++ b/src/d/actor/d_a_hozelda.cpp @@ -24,7 +24,7 @@ void daHoZelda_hio_c::genMessage(JORMContext* context) { static void* daHoZelda_searchGanon(fopAc_ac_c* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_GetName(i_actor) == PROC_B_GND) { + if (fopAcM_GetName(i_actor) == fpcNm_B_GND_e) { return i_actor; } @@ -939,18 +939,18 @@ static actor_method_class l_daHoZelda_Method = { }; actor_process_profile_definition g_profile_HOZELDA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_HOZELDA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daHoZelda_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 275, // mPriority - &l_daHoZelda_Method, // sub_method - 0x00060000, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_HOZELDA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daHoZelda_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_HOZELDA_e, + /* Actor SubMtd */ &l_daHoZelda_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_izumi_gate.cpp b/src/d/actor/d_a_izumi_gate.cpp index a7b79021df..d9e8b2a0dc 100644 --- a/src/d/actor/d_a_izumi_gate.cpp +++ b/src/d/actor/d_a_izumi_gate.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_izumi_gate.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" void daIzumiGate_c::initBaseMtx() { setBaseMtx(); @@ -93,18 +93,18 @@ static actor_method_class l_daIzumiGate_Method = { }; actor_process_profile_definition g_profile_Izumi_Gate = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Izumi_Gate, - &g_fpcLf_Method.base, - sizeof(daIzumiGate_c), - 0, - 0, - &g_fopAc_Method.base, - 38, - &l_daIzumiGate_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Izumi_Gate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daIzumiGate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Izumi_Gate_e, + /* Actor SubMtd */ &l_daIzumiGate_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_kago.cpp b/src/d/actor/d_a_kago.cpp index e478a650f3..147a031f7e 100644 --- a/src/d/actor/d_a_kago.cpp +++ b/src/d/actor/d_a_kago.cpp @@ -234,10 +234,10 @@ int daKago_c::executeBalloonMenu() { fopAcM_orderPotentialEvent(this, 1, 0xffff, 0); eventInfo.onCondition(dEvtCnd_CANDEMO_e); - #if VERSION == VERSION_SHIELD_DEBUG - return 0; - #else + #if PLATFORM_GCN break; + #else + return 0; #endif } @@ -368,7 +368,7 @@ f32 daKago_c::checkGroundHeight(cXyz i_pos, f32* o_step) { gnd_height = gndCrossMag; field_0x6e0 = 1; - if (current.pos.y < gndCrossMag) { + if (current.pos.y < gnd_height) { mGroundHeight = current.pos.y; } else { mGroundHeight = mGroundFlyHeight; @@ -417,7 +417,7 @@ f32 daKago_c::checkRoofHeight(cXyz i_pos) { if (std::abs(current.pos.y - roof_height) < 310.0f) { fopAc_ac_c* actor = dComIfG_Bgsp().GetActorPointer(roofChk); - if (actor != NULL && fopAcM_GetName(actor) == PROC_Obj_RIVERROCK) { + if (actor != NULL && fopAcM_GetName(actor) == fpcNm_Obj_RIVERROCK_e) { if (((daObjRIVERROCK_c*)actor)->mBreakSubAction == daObjRIVERROCK_c::BREAK_MOVE) { field_0x6e5 = 1; } @@ -636,24 +636,26 @@ s8 daKago_c::searchNearPassPoint() { cXyz pointPos; cXyz playerPos(daPy_getPlayerActorClass()->current.pos); - f32 prev_nearest_distXZ, nearest_distXZ; - nearest_distXZ = prev_nearest_distXZ = 100000.0f; - int nearest_point_no; + f32 nearest_DistXZ[2]; + nearest_DistXZ[0] = nearest_DistXZ[1] = 100000.0f; + int nearest_point_no[2]; for (int i = 0; i < mpPath1->m_num; i++) { pointPos = dPath_GetPnt(mpPath1, i)->m_position; f32 player_pnt_distXZ = playerPos.absXZ(pointPos); - if (player_pnt_distXZ < nearest_distXZ) { - prev_nearest_distXZ = nearest_distXZ; - nearest_distXZ = player_pnt_distXZ; - nearest_point_no = i; - } else if (player_pnt_distXZ < prev_nearest_distXZ) { - prev_nearest_distXZ = player_pnt_distXZ; + if (player_pnt_distXZ < nearest_DistXZ[0]) { + nearest_DistXZ[1] = nearest_DistXZ[0]; + nearest_point_no[1] = nearest_point_no[0]; + nearest_DistXZ[0] = player_pnt_distXZ; + nearest_point_no[0] = i; + } else if (player_pnt_distXZ < nearest_DistXZ[1]) { + nearest_DistXZ[1] = player_pnt_distXZ; + nearest_point_no[1] = i; } } - int next_point_no = nearest_point_no + mPathStep; + int next_point_no = nearest_point_no[0] + mPathStep; if (next_point_no < 0) { next_point_no = 1; } else if (next_point_no >= mpPath1->m_num) { @@ -697,7 +699,7 @@ int daKago_c::setSceneChange(int i_mode) { void daKago_c::createBalloonScore() { if (mType != TYPE_TWILIGHT && mBalloon2DId == fpcM_ERROR_PROCESS_ID_e) { - mBalloon2DId = fopAcM_create(PROC_BALLOON2D, 0, NULL, -1, NULL, NULL, -1); + mBalloon2DId = fopAcM_create(fpcNm_BALLOON2D_e, 0, NULL, -1, NULL, NULL, -1); field_0x6e9 = 1; } } @@ -724,7 +726,7 @@ void daKago_c::endBalloonScore() { ((daBalloon2D_c*)balloon2D)->hide(); } - fopAcM_SearchByName(PROC_OBJ_BALLOON, &balloonObj); + fopAcM_SearchByName(fpcNm_OBJ_BALLOON_e, &balloonObj); if (balloonObj != NULL) { ((daObj_Balloon_c*)balloonObj)->saveBestScore(); } @@ -1479,13 +1481,16 @@ void daKago_c::executeWait() { setActionMode(ACTION_LANDING_e, 0); executeLanding(); } + + return; } - return; + +#if DEBUG + mPathDir = 1; +#endif } #if DEBUG - mPathDir = 1; - if (mDoCPd_c::getHoldL(PAD_1) && mDoCPd_c::getHoldR(PAD_1) && mDoCPd_c::getTrigB(PAD_1)) { @@ -1498,9 +1503,10 @@ void daKago_c::executeWait() { if (mSceneType == SCENE_TYPE_RIVER) { createBalloonScore(); - return; } } + + return; } #endif } @@ -1575,7 +1581,7 @@ void daKago_c::executeAttack() { mpLockActor = NULL; if (dComIfGp_getAttention()->LockonTruth()) { fopAc_ac_c* ym = dComIfGp_getAttention()->LockonTarget(0); - if (fopAcM_GetName(ym) != PROC_E_YM) { + if (fopAcM_GetName(ym) != fpcNm_E_YM_e) { break; } @@ -2334,6 +2340,7 @@ void daKago_c::initFirstDemo() { cXyz cStack_34; daPy_py_c* player = daPy_getPlayerActorClass(); + s16 targetYaw; s16 playerYaw = player->shape_angle.y; cXyz playerPos = player->current.pos; @@ -2343,7 +2350,6 @@ void daKago_c::initFirstDemo() { midnaPos = midna->current.pos; } - s16 targetYaw; switch (mDemoMode) { case 0: { Z2GetAudioMgr()->setDemoName(mDemoName); @@ -2356,9 +2362,9 @@ void daKago_c::initFirstDemo() { shape_angle.y = current.angle.y = cLib_targetAngleY(&playerPos, &field_0x6a4); cStack_34.set(-300.0f, 400.0f, -1000.0f); cLib_offsetPos(¤t.pos, &playerPos, shape_angle.y, &cStack_34); - targetYaw = cLib_targetAngleY(&playerPos, ¤t.pos); + playerYaw = cLib_targetAngleY(&playerPos, ¤t.pos); - player->setPlayerPosAndAngle(&playerPos, targetYaw, 0); + player->setPlayerPosAndAngle(&playerPos, playerYaw, 0); if (midna != NULL) { midna->current.pos = playerPos; midnaPos = midna->current.pos; @@ -2497,8 +2503,7 @@ bool daKago_c::executeFirstDemo() { cXyz playerPos = player->current.pos; int unkFlag1; - int mode = mDemoMode; // fakematch - switch (mode) { + switch (mDemoMode) { case 0: dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 2); @@ -2739,11 +2744,11 @@ bool daKago_c::executeFirstDemo() { case 8: unkFlag1 = 0; - if (mode == 7 || field_0x6e8 == 0) { + if (mDemoMode == 7 || field_0x6e8 == 0) { if (field_0x728 == 110) { unkFlag1 = 1; } - } else if (mode == 8 && field_0x728 == 140) { + } else if (mDemoMode == 8 && field_0x728 == 140) { unkFlag1 = 1; } @@ -3445,7 +3450,9 @@ void daKago_c::setWaterFallEffect() { } static void* s_waterfall(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Tag_WaterFall) { + UNUSED(i_data); + + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Tag_WaterFall_e) { if (!fpcM_IsCreating(fopAcM_GetID(i_actor))) { if (((daTagWaterFall_c*)i_actor)->checkHitWaterFall(((fopAc_ac_c*)i_data)->current.pos)) { @@ -3888,18 +3895,18 @@ static actor_method_class l_daKago_Method = { }; actor_process_profile_definition g_profile_KAGO = { - fpcLy_CURRENT_e, // mLayerID - 4, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_KAGO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daKago_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 693, // mPriority - &l_daKago_Method, // sub_method - 0x00044000, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KAGO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daKago_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KAGO_e, + /* Actor SubMtd */ &l_daKago_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_kytag00.cpp b/src/d/actor/d_a_kytag00.cpp index 1bebf6216c..31c21d28b2 100644 --- a/src/d/actor/d_a_kytag00.cpp +++ b/src/d/actor/d_a_kytag00.cpp @@ -466,18 +466,18 @@ static actor_method_class l_daKytag00_Method = { }; actor_process_profile_definition g_profile_KYTAG00 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG00, - &g_fpcLf_Method.base, - sizeof(kytag00_class), - 0, - 0, - &g_fopAc_Method.base, - 94, - &l_daKytag00_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG00_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag00_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG00_e, + /* Actor SubMtd */ &l_daKytag00_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag01.cpp b/src/d/actor/d_a_kytag01.cpp index 05f55eb5c5..33c14c373f 100644 --- a/src/d/actor/d_a_kytag01.cpp +++ b/src/d/actor/d_a_kytag01.cpp @@ -222,18 +222,18 @@ static actor_method_class l_daKytag01_Method = { }; actor_process_profile_definition g_profile_KYTAG01 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG01, - &g_fpcLf_Method.base, - sizeof(kytag01_class), - 0, - 0, - &g_fopAc_Method.base, - 95, - &l_daKytag01_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG01_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag01_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG01_e, + /* Actor SubMtd */ &l_daKytag01_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag02.cpp b/src/d/actor/d_a_kytag02.cpp index c8df0868b6..cb2b05cf01 100644 --- a/src/d/actor/d_a_kytag02.cpp +++ b/src/d/actor/d_a_kytag02.cpp @@ -137,18 +137,18 @@ static actor_method_class l_daKytag02_Method = { }; actor_process_profile_definition g_profile_KYTAG02 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG02, - &g_fpcLf_Method.base, - sizeof(kytag02_class), - 0, - 0, - &g_fopAc_Method.base, - 96, - &l_daKytag02_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG02_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag02_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG02_e, + /* Actor SubMtd */ &l_daKytag02_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag03.cpp b/src/d/actor/d_a_kytag03.cpp index 9b4beda087..73a83b40cb 100644 --- a/src/d/actor/d_a_kytag03.cpp +++ b/src/d/actor/d_a_kytag03.cpp @@ -301,7 +301,7 @@ static int daKytag03_Execute(kytag03_class* i_this) { cLib_addCalc(&i_this->field_0x578, 1.0f, 0.1f, 0.025f, 0.000001f); if (i_this->field_0x585 == 0xB5) { - fopAc_ac_c* actor = (fopAc_ac_c*)fpcM_SearchByName(PROC_Obj_Movebox); + fopAc_ac_c* actor = (fopAc_ac_c*)fpcM_SearchByName(fpcNm_Obj_Movebox_e); if (actor != NULL && actor->current.pos.x < 7425.0f) { i_this->field_0x578 = 0.0f; var_r28 = true; @@ -462,18 +462,18 @@ static actor_method_class l_daKytag03_Method = { }; actor_process_profile_definition g_profile_KYTAG03 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG03, - &g_fpcLf_Method.base, - sizeof(kytag03_class), - 0, - 0, - &g_fopAc_Method.base, - 97, - &l_daKytag03_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG03_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag03_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG03_e, + /* Actor SubMtd */ &l_daKytag03_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag04.cpp b/src/d/actor/d_a_kytag04.cpp index b246ce93e5..21f6d85b93 100644 --- a/src/d/actor/d_a_kytag04.cpp +++ b/src/d/actor/d_a_kytag04.cpp @@ -361,18 +361,18 @@ static actor_method_class l_daKytag04_Method = { }; actor_process_profile_definition g_profile_KYTAG04 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG04, - &g_fpcLf_Method.base, - sizeof(kytag04_class), - 0, - 0, - &g_fopAc_Method.base, - 98, - &l_daKytag04_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG04_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag04_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG04_e, + /* Actor SubMtd */ &l_daKytag04_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag05.cpp b/src/d/actor/d_a_kytag05.cpp index fe66630bdd..1322057075 100644 --- a/src/d/actor/d_a_kytag05.cpp +++ b/src/d/actor/d_a_kytag05.cpp @@ -47,18 +47,18 @@ static actor_method_class l_daKytag05_Method = { }; actor_process_profile_definition g_profile_KYTAG05 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG05, - &g_fpcLf_Method.base, - sizeof(kytag05_class), - 0, - 0, - &g_fopAc_Method.base, - 99, - &l_daKytag05_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG05_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag05_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG05_e, + /* Actor SubMtd */ &l_daKytag05_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp index 45b52b9999..bc7510c9d4 100644 --- a/src/d/actor/d_a_kytag06.cpp +++ b/src/d/actor/d_a_kytag06.cpp @@ -9,7 +9,7 @@ #include "SSystem/SComponent/c_counter.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_camera_mng.h" #include "Z2AudioLib/Z2Instances.h" #include @@ -1195,20 +1195,20 @@ static actor_method_class l_daKytag06_Method = { }; actor_process_profile_definition g_profile_KYTAG06 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG06, - &g_fpcLf_Method.base, - sizeof(kytag06_class), - 0, - 0, - &g_fopAc_Method.base, - 100, - &l_daKytag06_Method, - 0x60000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG06_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag06_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG06_e, + /* Actor SubMtd */ &l_daKytag06_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_kytag07.cpp b/src/d/actor/d_a_kytag07.cpp index aa98dea057..2895963994 100644 --- a/src/d/actor/d_a_kytag07.cpp +++ b/src/d/actor/d_a_kytag07.cpp @@ -68,18 +68,18 @@ static actor_method_class l_daKytag07_Method = { (process_method_func)daKytag07_Draw}; actor_process_profile_definition g_profile_KYTAG07 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_KYTAG07, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(kytag07_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 101, // mPriority - &l_daKytag07_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG07_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag07_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG07_e, + /* Actor SubMtd */ &l_daKytag07_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag08.cpp b/src/d/actor/d_a_kytag08.cpp index 3343b08c7e..44f4bf5f9a 100644 --- a/src/d/actor/d_a_kytag08.cpp +++ b/src/d/actor/d_a_kytag08.cpp @@ -274,18 +274,18 @@ static actor_method_class l_daKytag08_Method = { }; actor_process_profile_definition g_profile_KYTAG08 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG08, - &g_fpcLf_Method.base, - sizeof(kytag08_class), - 0, - 0, - &g_fopAc_Method.base, - 102, - &l_daKytag08_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG08_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag08_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG08_e, + /* Actor SubMtd */ &l_daKytag08_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag09.cpp b/src/d/actor/d_a_kytag09.cpp index 39a6edbed7..2b2218e8ee 100644 --- a/src/d/actor/d_a_kytag09.cpp +++ b/src/d/actor/d_a_kytag09.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_kytag09.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static int daKytag09_Draw(kytag09_class* i_this) { J3DModelData* modelData = i_this->mpModel->getModelData(); @@ -145,18 +145,18 @@ static actor_method_class l_daKytag09_Method = { }; actor_process_profile_definition g_profile_KYTAG09 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG09, - &g_fpcLf_Method.base, - sizeof(kytag09_class), - 0, - 0, - &g_fopAc_Method.base, - 103, - &l_daKytag09_Method, - 0x60000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG09_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag09_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG09_e, + /* Actor SubMtd */ &l_daKytag09_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag10.cpp b/src/d/actor/d_a_kytag10.cpp index b0d7d55023..a63ff88c52 100644 --- a/src/d/actor/d_a_kytag10.cpp +++ b/src/d/actor/d_a_kytag10.cpp @@ -207,18 +207,18 @@ static actor_method_class l_daKytag10_Method = { }; actor_process_profile_definition g_profile_KYTAG10 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG10, - &g_fpcLf_Method.base, - sizeof(kytag10_class), - 0, - 0, - &g_fopAc_Method.base, - 104, - &l_daKytag10_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG10_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag10_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG10_e, + /* Actor SubMtd */ &l_daKytag10_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag11.cpp b/src/d/actor/d_a_kytag11.cpp index baa4776485..b6b1d3fc63 100644 --- a/src/d/actor/d_a_kytag11.cpp +++ b/src/d/actor/d_a_kytag11.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag11.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_kankyo_static.h" static int daKytag11_Draw(kytag11_class* i_this) { @@ -114,18 +114,18 @@ static actor_method_class l_daKytag11_Method = { }; actor_process_profile_definition g_profile_KYTAG11 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG11, - &g_fpcLf_Method.base, - sizeof(kytag11_class), - 0, - 0, - &g_fopAc_Method.base, - 105, - &l_daKytag11_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG11_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag11_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG11_e, + /* Actor SubMtd */ &l_daKytag11_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag12.cpp b/src/d/actor/d_a_kytag12.cpp index 062828d5dc..f10c5774f0 100644 --- a/src/d/actor/d_a_kytag12.cpp +++ b/src/d/actor/d_a_kytag12.cpp @@ -46,7 +46,7 @@ static int daKytag12_Draw(kytag12_class* param_0) { static void daKytag12_light_swprd_proc(kytag12_class* i_this) { daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - if (dComIfGs_getSelectEquipSword() == fpcNm_ITEM_LIGHT_SWORD) { + if (dComIfGs_getSelectEquipSword() == dItemNo_LIGHT_SWORD_e) { if (player->getCutType() != daPy_py_c::CUT_TYPE_NONE) { if (i_this->field_0x576 == 0) { cXyz sp28(player->current.pos); @@ -869,7 +869,7 @@ static int daKytag12_Execute_R00(kytag12_class* i_this) { sp80.y = player->current.pos.y; if (player->current.pos.abs(sp80) < 600.0f && - dComIfGs_getSelectEquipSword() == fpcNm_ITEM_LIGHT_SWORD && player->getCutType() != daPy_py_c::CUT_TYPE_NONE && + dComIfGs_getSelectEquipSword() == dItemNo_LIGHT_SWORD_e && player->getCutType() != daPy_py_c::CUT_TYPE_NONE && d_kytag12_cut_turn_check()) { i_this->field_0x575 = 1; @@ -1032,18 +1032,18 @@ static actor_method_class l_daKytag12_Method = { }; actor_process_profile_definition g_profile_KYTAG12 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_KYTAG12, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(kytag12_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 106, // mPriority - &l_daKytag12_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG12_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag12_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG12_e, + /* Actor SubMtd */ &l_daKytag12_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag13.cpp b/src/d/actor/d_a_kytag13.cpp index d6e90889b7..d54932c0fb 100644 --- a/src/d/actor/d_a_kytag13.cpp +++ b/src/d/actor/d_a_kytag13.cpp @@ -389,18 +389,18 @@ static actor_method_class l_daKytag13_Method = { }; actor_process_profile_definition g_profile_KYTAG13 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_KYTAG13, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(kytag13_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 107, // mPriority - &l_daKytag13_Method, // sub_method - 0x00060000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG13_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag13_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG13_e, + /* Actor SubMtd */ &l_daKytag13_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag14.cpp b/src/d/actor/d_a_kytag14.cpp index 66343d2656..e179da4523 100644 --- a/src/d/actor/d_a_kytag14.cpp +++ b/src/d/actor/d_a_kytag14.cpp @@ -109,18 +109,18 @@ static actor_method_class l_daKytag14_Method = { }; actor_process_profile_definition g_profile_KYTAG14 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG14, - &g_fpcLf_Method.base, - sizeof(kytag14_class), - 0, - 0, - &g_fopAc_Method.base, - 108, - &l_daKytag14_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG14_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag14_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG14_e, + /* Actor SubMtd */ &l_daKytag14_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag15.cpp b/src/d/actor/d_a_kytag15.cpp index 4483f376b9..3287f45a6a 100644 --- a/src/d/actor/d_a_kytag15.cpp +++ b/src/d/actor/d_a_kytag15.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_kytag15.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include static int daKytag15_Draw(kytag15_class* i_this) { @@ -130,18 +130,18 @@ static actor_method_class l_daKytag15_Method = { }; actor_process_profile_definition g_profile_KYTAG15 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG15, - &g_fpcLf_Method.base, - sizeof(kytag15_class), - 0, - 0, - &g_fopAc_Method.base, - 109, - &l_daKytag15_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG15_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag15_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG15_e, + /* Actor SubMtd */ &l_daKytag15_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag16.cpp b/src/d/actor/d_a_kytag16.cpp index 0216dc67b5..addbc046fa 100644 --- a/src/d/actor/d_a_kytag16.cpp +++ b/src/d/actor/d_a_kytag16.cpp @@ -9,7 +9,7 @@ #include "SSystem/SComponent/c_counter.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include static int daKytag16_Draw(kytag16_class* i_this) { @@ -167,18 +167,18 @@ static actor_method_class l_daKytag16_Method = { }; actor_process_profile_definition g_profile_KYTAG16 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG16, - &g_fpcLf_Method.base, - sizeof(kytag16_class), - 0, - 0, - &g_fopAc_Method.base, - 110, - &l_daKytag16_Method, - 0x60000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG16_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag16_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG16_e, + /* Actor SubMtd */ &l_daKytag16_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag17.cpp b/src/d/actor/d_a_kytag17.cpp index 128763f2c2..6f8eaabccc 100644 --- a/src/d/actor/d_a_kytag17.cpp +++ b/src/d/actor/d_a_kytag17.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag17.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static int daKytag17_Draw(kytag17_class* i_this) { return 1; @@ -40,18 +40,18 @@ static actor_method_class l_daKytag17_Method = { (process_method_func)daKytag17_Draw}; actor_process_profile_definition g_profile_KYTAG17 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_KYTAG17, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(kytag17_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 111, // mPriority - &l_daKytag17_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG17_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag17_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG17_e, + /* Actor SubMtd */ &l_daKytag17_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_mant.cpp b/src/d/actor/d_a_mant.cpp index 4388b52c84..c1c5e4b297 100644 --- a/src/d/actor/d_a_mant.cpp +++ b/src/d/actor/d_a_mant.cpp @@ -813,18 +813,18 @@ static actor_method_class l_daMant_Method = { }; actor_process_profile_definition g_profile_MANT = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_MANT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(mant_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 234, // mPriority - &l_daMant_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MANT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(mant_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_MANT_e, + /* Actor SubMtd */ &l_daMant_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_mg_fish.cpp b/src/d/actor/d_a_mg_fish.cpp index d1e2fb2ae3..90781345ad 100644 --- a/src/d/actor/d_a_mg_fish.cpp +++ b/src/d/actor/d_a_mg_fish.cpp @@ -119,7 +119,7 @@ static f32 dummy_3759() { static void* s_hitfish_sub(void* a, void* b) { if (fopAc_IsActor(a)) { mg_fish_class* fish = (mg_fish_class*)a; - if (fopAcM_GetName(fish) == PROC_MG_FISH && fish->mCurAction == ACTION_MG_FISH_MF_HIT) { + if (fopAcM_GetName(fish) == fpcNm_MG_FISH_e && fish->mCurAction == ACTION_MG_FISH_MF_HIT) { return &LEAFDRAW_BASE(&fish->actor); } } @@ -171,7 +171,7 @@ static void mouth_close(mg_fish_class* i_this) { static void* s_lure_sub(void* a, void* b) { if (fopAc_IsActor(a)) { - if (fopAcM_GetName(a) == PROC_MG_ROD) { + if (fopAcM_GetName(a) == fpcNm_MG_ROD_e) { dmg_rod_class* rod = (dmg_rod_class*)a; if (rod->kind == 0 && rod->action == 4 && @@ -186,7 +186,7 @@ static void* s_lure_sub(void* a, void* b) { static void* s_esa_sub(void* a, void* b) { if (fopAc_IsActor(a)) { - if (fopAcM_GetName(a) == PROC_MG_ROD) { + if (fopAcM_GetName(a) == fpcNm_MG_ROD_e) { dmg_rod_class* rod = (dmg_rod_class*)a; if (rod->kind == 1 && rod->action != 5 && @@ -201,7 +201,7 @@ static void* s_esa_sub(void* a, void* b) { static void* s_bait_sub(void* a, void* b) { if (fopAc_IsActor(a)) { - if (fopAcM_GetName(a) == PROC_FR) { + if (fopAcM_GetName(a) == fpcNm_FR_e) { fr_class* fr = (fr_class*)a; if (fr->field_0x5ec != 0 && fr->speedF > 1.0f) { @@ -219,7 +219,7 @@ static daMg_Fish_HIO_c l_HIO; static s32 s_fish_ct; static void* s_other_search_sub(void* a, void* b) { - if (fopAc_IsActor(a) && b != a && fopAcM_GetName(a) == PROC_MG_FISH) { + if (fopAc_IsActor(a) && b != a && fopAcM_GetName(a) == fpcNm_MG_FISH_e) { mg_fish_class* fish = (mg_fish_class*)a; if (fish->mCurAction == ACTION_MG_FISH_MF_LURE_SEARCH) { s_fish_ct += 1; @@ -341,7 +341,7 @@ static PathNode swim_path[43] = { }; static void* s_other_bait_sub(void* a, void* b) { - if (fopAc_IsActor(a) && b != a && fopAcM_GetName(a) == PROC_MG_FISH) { + if (fopAc_IsActor(a) && b != a && fopAcM_GetName(a) == fpcNm_MG_FISH_e) { mg_fish_class* fish = (mg_fish_class*)a; if (fish->mCurAction == ACTION_MG_FISH_MF_BAIT_SEARCH && fish->mBaitId == ((mg_fish_class*)b)->mBaitId) { @@ -494,7 +494,7 @@ static int nodeCallBackBB(J3DJoint* joint, int param_1) { } static void* s_bt_sub(void* a, void* b) { - if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_MG_FISH) { + if (fopAc_IsActor(a) && fopAcM_GetName(a) == fpcNm_MG_FISH_e) { mg_fish_class* fish = (mg_fish_class*)a; if (fish->mGedouKind == GEDOU_KIND_BT) { return fish; @@ -504,7 +504,7 @@ static void* s_bt_sub(void* a, void* b) { } static void* s_sp_sub(void* a, void* b) { - if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_MG_FISH) { + if (fopAc_IsActor(a) && fopAcM_GetName(a) == fpcNm_MG_FISH_e) { mg_fish_class* fish = (mg_fish_class*)a; if (fish->mGedouKind == GEDOU_KIND_SP) { return fish; @@ -514,7 +514,7 @@ static void* s_sp_sub(void* a, void* b) { } static void* s_lh_sub(void* a, void* b) { - if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_MG_FISH) { + if (fopAc_IsActor(a) && fopAcM_GetName(a) == fpcNm_MG_FISH_e) { mg_fish_class* fish = (mg_fish_class*)a; if (fish->mGedouKind == GEDOU_KIND_LH) { fish->field_0x74c = ((mg_fish_class*)b)->field_0x74c; @@ -525,7 +525,7 @@ static void* s_lh_sub(void* a, void* b) { } static void* s_bin_sub(void* a, void* b) { - if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_MG_FISH) { + if (fopAc_IsActor(a) && fopAcM_GetName(a) == fpcNm_MG_FISH_e) { mg_fish_class* fish = (mg_fish_class*)a; if (fish->mGedouKind == GEDOU_KIND_O_GD_BOTT) { return fish; @@ -535,7 +535,7 @@ static void* s_bin_sub(void* a, void* b) { } static void* s_kn_sub(void* a, void* b) { - if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_MG_FISH) { + if (fopAc_IsActor(a) && fopAcM_GetName(a) == fpcNm_MG_FISH_e) { mg_fish_class* fish = (mg_fish_class*)a; if (fish->mGedouKind == GEDOU_KIND_KN) { return fish; @@ -545,7 +545,7 @@ static void* s_kn_sub(void* a, void* b) { } static void* s_ed_sub(void* a, void* b) { - if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_MG_FISH) { + if (fopAc_IsActor(a) && fopAcM_GetName(a) == fpcNm_MG_FISH_e) { mg_fish_class* fish = (mg_fish_class*)a; if (fish->mGedouKind == GEDOU_KIND_ED) { return fish; @@ -555,7 +555,7 @@ static void* s_ed_sub(void* a, void* b) { } static void* s_sy_sub(void* a, void* b) { - if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_MG_FISH) { + if (fopAc_IsActor(a) && fopAcM_GetName(a) == fpcNm_MG_FISH_e) { mg_fish_class* fish = (mg_fish_class*)a; if (fish->mGedouKind == GEDOU_KIND_SY) { return fish; @@ -565,7 +565,7 @@ static void* s_sy_sub(void* a, void* b) { } static void* s_bb_sub(void* a, void* b) { - if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_MG_FISH) { + if (fopAc_IsActor(a) && fopAcM_GetName(a) == fpcNm_MG_FISH_e) { mg_fish_class* fish = (mg_fish_class*)a; if (fish->mGedouKind == GEDOU_KIND_BB) { return fish; @@ -575,14 +575,14 @@ static void* s_bb_sub(void* a, void* b) { } static void* s_bb2_sub(void* a, void* b) { - if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_E_BG) { + if (fopAc_IsActor(a) && fopAcM_GetName(a) == fpcNm_E_BG_e) { return a; } return NULL; } static void* s_sg_sub(void* a, void* b) { - if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_E_SG) { + if (fopAc_IsActor(a) && fopAcM_GetName(a) == fpcNm_E_SG_e) { return a; } return NULL; @@ -936,7 +936,7 @@ static void mf_swim_s(mg_fish_class* i_this) { fpcEx_Search(s_bb2_sub, i_this) != NULL) { if (fpcEx_Search(s_bb2_sub, i_this) != NULL && fpcEx_Search(s_bb_sub, i_this) == NULL) { - fopAcM_create(PROC_MG_FISH, 0x17, &i_this->actor.current.pos, + fopAcM_create(fpcNm_MG_FISH_e, 0x17, &i_this->actor.current.pos, fopAcM_GetRoomNo(&i_this->actor), NULL, NULL, -1); } } else { @@ -1962,7 +1962,7 @@ static void mf_jump(mg_fish_class* i_this) { } case 10: { if (i_this->mGedouKind == GEDOU_KIND_KS_2) { - i_this->mBaitId = fopAcM_createChild(PROC_KYTAG03, fopAcM_GetID(i_this), 0x10000b3, + i_this->mBaitId = fopAcM_createChild(fpcNm_KYTAG03_e, fopAcM_GetID(i_this), 0x10000b3, &commonXyz2, fopAcM_GetRoomNo(&i_this->actor), NULL, NULL, -1, 0); } i_this->mActionPhase = 0xb; @@ -3120,7 +3120,7 @@ static void action(mg_fish_class* i_this) { i_this->mActionPhase = 0; i_this->field_0x624[1] = cM_rndF(30.0f) + 50.0f; - fopAc_ac_c* henna = fopAcM_SearchByName(PROC_NPC_HENNA); + fopAc_ac_c* henna = fopAcM_SearchByName(fpcNm_NPC_HENNA_e); if (henna != NULL) { ((npc_henna_class*)henna)->field_0x7b5 = 20; } @@ -4061,20 +4061,20 @@ static actor_method_class l_daMg_Fish_Method = { }; actor_process_profile_definition g_profile_MG_FISH = { - (u32)fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_MG_FISH, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(mg_fish_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 720, // mPriority - &l_daMg_Fish_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ (u32)fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MG_FISH_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(mg_fish_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_MG_FISH_e, + /* Actor SubMtd */ &l_daMg_Fish_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_mg_fshop.cpp b/src/d/actor/d_a_mg_fshop.cpp index 30d0d6562e..cb9cc12dea 100644 --- a/src/d/actor/d_a_mg_fshop.cpp +++ b/src/d/actor/d_a_mg_fshop.cpp @@ -506,7 +506,7 @@ static void rod_set(fshop_class* i_this) { static void* s_fish_sub(void* i_actor, void* i_data) { (void) i_data; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_MG_FISH) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_MG_FISH_e) { if (((mg_fish_class*)i_actor)->actor.speedF > 0.1f) { fs_weed_s* weed = (fs_weed_s*)i_data; f32 x_dist = ((mg_fish_class*)i_actor)->actor.current.pos.x - weed->field_0x00[0].x; @@ -550,7 +550,7 @@ static void tsubo_set(fshop_class* i_this) { pTsubo->field_0x20 = cM_rndF(65536.0f); pTsubo->field_0x22 = cM_rndF(65536.0f); - npc_henna_class* henna = (npc_henna_class*)fopAcM_SearchByName(PROC_NPC_HENNA); + npc_henna_class* henna = (npc_henna_class*)fopAcM_SearchByName(fpcNm_NPC_HENNA_e); if (henna != NULL) { henna->field_0x7b5 = 60; } @@ -682,7 +682,7 @@ static void koro2_mtx_set(fshop_class* i_this) { static void* s_sel_sub(void* i_actor, void* i_data) { (void) i_data; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_FSHOP) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_FSHOP_e) { if (((fshop_class*)i_actor)->field_0x400e == (u8)((((fshop_class*)i_data)->field_0x400c & 7) + 1)) { return i_actor; } @@ -693,7 +693,7 @@ static void* s_sel_sub(void* i_actor, void* i_data) { static void* s_ball_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_FSHOP && (fopAcM_GetParam(i_actor) & 0xFF) == 0x23) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_FSHOP_e && (fopAcM_GetParam(i_actor) & 0xFF) == 0x23) { return i_actor; } @@ -915,7 +915,7 @@ static int daFshop_Execute(fshop_class* i_this) { actor->field_0x567 = 1; } - npc_henna_class* henna = (npc_henna_class*)fopAcM_SearchByName(PROC_NPC_HENNA); + npc_henna_class* henna = (npc_henna_class*)fopAcM_SearchByName(fpcNm_NPC_HENNA_e); if (henna != NULL && henna->field_0x7b9 != 0 && (actor->field_0x567 == 1 || dTimer_getRestTimeMs() == 0)) { BOOL bVar5 = FALSE; for (int i = 0; i < 100; i++) { @@ -945,7 +945,7 @@ static int daFshop_Execute(fshop_class* i_this) { || mDoCPd_c::getTrigZ(PAD_1) #endif ) { - npc_henna_class* henna = (npc_henna_class*)fopAcM_SearchByName(PROC_NPC_HENNA); + npc_henna_class* henna = (npc_henna_class*)fopAcM_SearchByName(fpcNm_NPC_HENNA_e); if (henna != NULL) { BOOL bVar5 = FALSE; for (int i = 0; i < 100; i++) { @@ -1696,10 +1696,10 @@ static int daFshop_Create(fopAc_ac_c* actor) { i_this->field_0x6b7c = 1; for (int i = 0; i < 8; i++) { - fopAcM_createChild(PROC_FSHOP, fopAcM_GetID(actor), i - 155, &actor->current.pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1, NULL); + fopAcM_createChild(fpcNm_FSHOP_e, fopAcM_GetID(actor), i - 155, &actor->current.pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1, NULL); } - fopAcM_createChild(PROC_FSHOP, fopAcM_GetID(actor), 0xFFFFFF23, &actor->current.pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1, NULL); + fopAcM_createChild(fpcNm_FSHOP_e, fopAcM_GetID(actor), 0xFFFFFF23, &actor->current.pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1, NULL); u8 sp10; #if VERSION == VERSION_GCN_PAL || VERSION == VERSION_WII_PAL @@ -1740,24 +1740,24 @@ static int daFshop_Create(fopAc_ac_c* actor) { if (sp24 >= 10) { parameters = (sp24 << 8) | 0xFFFF0000 | i; - fopAcM_create(PROC_MG_FISH, parameters, &actor->current.pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1); + fopAcM_create(fpcNm_MG_FISH_e, parameters, &actor->current.pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1); } } cXyz work_pos(-648.0f + YREG_F(7), 215.0f + YREG_F(8), 380.0f + YREG_F(9)); csXyz work_angle(0, 0, 0); - fopAcM_create(PROC_OBJ_KAGE, 0xFFFFFF01, &work_pos, fopAcM_GetRoomNo(actor), &work_angle, NULL, -1); + fopAcM_create(fpcNm_OBJ_KAGE_e, 0xFFFFFF01, &work_pos, fopAcM_GetRoomNo(actor), &work_angle, NULL, -1); for (int i = 0; i < 8; i++) { - fopAcM_create(PROC_MG_FISH, 0xFFFF2005, &actor->current.pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1); + fopAcM_create(fpcNm_MG_FISH_e, 0xFFFF2005, &actor->current.pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1); } work_pos.set(-131.0f, 3000.0f + nREG_F(7), -4500.0f); - fopAcM_create(PROC_NPC_TK, -1, &work_pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1); + fopAcM_create(fpcNm_NPC_TK_e, -1, &work_pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1); for (int i = 0; i < 5; i++) { work_pos.set(-450.0f, 0.0f, -878.0f); - fopAcM_create(PROC_BD, 0xFFFFFFFF, &work_pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1); + fopAcM_create(fpcNm_BD_e, 0xFFFFFFFF, &work_pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1); } } @@ -1773,20 +1773,20 @@ static actor_method_class l_daFshop_Method = { }; actor_process_profile_definition g_profile_FSHOP = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_FSHOP, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(fshop_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 721, // mPriority - &l_daFshop_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_FSHOP_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(fshop_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_FSHOP_e, + /* Actor SubMtd */ &l_daFshop_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_mg_rod.cpp b/src/d/actor/d_a_mg_rod.cpp index 827afa9fbd..1fae2979fe 100644 --- a/src/d/actor/d_a_mg_rod.cpp +++ b/src/d/actor/d_a_mg_rod.cpp @@ -291,9 +291,9 @@ static void rod_control(dmg_rod_class* i_this) { s16 segPitch, segYaw, rodPitchAdj, rodRollAdj; f32 var_f31; - f32 var_f29; f32 var_f26; f32 var_f30; + f32 var_f29; f32 var_f25; rodJointPos = i_this->mg_rod.field_0x0; @@ -1036,7 +1036,7 @@ static void sibuki_set(dmg_rod_class* i_this, f32 i_size, cXyz* i_pos, BOOL para } static void* s_boat_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_CANOE) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_CANOE_e) { cXyz spC = ((fopAc_ac_c*)i_actor)->current.pos - ((fopAc_ac_c*)i_data)->current.pos; return i_actor; } @@ -1491,7 +1491,7 @@ static int simple_bg_check(dmg_rod_class* i_this, f32 param_1) { static void* s_wd_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_LP) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_LP_e) { return i_actor; } @@ -2833,7 +2833,7 @@ static void lure_heart(dmg_rod_class* i_this) { sp8.y = 0; sp8.z = i_this->field_0x10b0; - fopAc_ac_c* obj_life = (fopAc_ac_c*)fopAcM_SearchByName(PROC_Obj_LifeContainer); + fopAc_ac_c* obj_life = (fopAc_ac_c*)fopAcM_SearchByName(fpcNm_Obj_LifeContainer_e); if (obj_life != NULL) { fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0); cXyz sp10; @@ -2900,7 +2900,7 @@ static void lure_heart(dmg_rod_class* i_this) { if (obj_life != NULL) { fopAcM_delete(obj_life); fopAcM_onItem(obj_life, 0x80); - execItemGet(fpcNm_ITEM_KAKERA_HEART); + execItemGet(dItemNo_KAKERA_HEART_e); u8 eventReg = dComIfGs_getEventReg(0xECFF); eventReg |= (u8)0x40; dComIfGs_setEventReg(0xECFF, eventReg); @@ -3912,11 +3912,11 @@ static int bb_get(dmg_rod_class* i_this) { fopAc_ac_c* actor = (fopAc_ac_c*)i_this; for (int i = 0; i < 3; i++) { u8 itemno = dComIfGs_getItem(i + 15, false); - if (itemno != fpcNm_ITEM_NONE) { - if (itemno == fpcNm_ITEM_BOMB_BAG_LV1) { - dComIfGs_setEmptyBombBagItemIn(fpcNm_ITEM_WATER_BOMB, 1, true); + if (itemno != dItemNo_NONE_e) { + if (itemno == dItemNo_BOMB_BAG_LV1_e) { + dComIfGs_setEmptyBombBagItemIn(dItemNo_WATER_BOMB_e, 1, true); return 1; - } else if (itemno == fpcNm_ITEM_WATER_BOMB) { + } else if (itemno == dItemNo_WATER_BOMB_e) { if (dComIfGs_getBombNum(i) < dComIfGs_getBombMax(itemno)) { dComIfGp_setItemBombNumCount(i, 1); return 1; @@ -4124,7 +4124,7 @@ static void uki_catch(dmg_rod_class* i_this) { static void* s_sg_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_SG && ((fopAc_ac_c*)i_actor)->current.pos.y < ((dmg_rod_class*)i_data)->water_surface_y - 50.0f) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_SG_e && ((fopAc_ac_c*)i_actor)->current.pos.y < ((dmg_rod_class*)i_data)->water_surface_y - 50.0f) { return i_actor; } @@ -4132,7 +4132,7 @@ static void* s_sg_sub(void* i_actor, void* i_data) { } static void* s_bb_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_BG && ((fopAc_ac_c*)i_actor)->current.pos.y < ((dmg_rod_class*)i_data)->water_surface_y - 50.0f) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_BG_e && ((fopAc_ac_c*)i_actor)->current.pos.y < ((dmg_rod_class*)i_data)->water_surface_y - 50.0f) { return i_actor; } @@ -4141,7 +4141,7 @@ static void* s_bb_sub(void* i_actor, void* i_data) { static void* s_lh_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_MG_FISH) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_MG_FISH_e) { mg_fish_class* fish = (mg_fish_class*)i_actor; if (fish->mGedouKind == 21) { if ((fish->actor.current.pos - ((fopAc_ac_c*)i_data)->current.pos).abs() < fish->mJointScale) { @@ -4155,7 +4155,7 @@ static void* s_lh_sub(void* i_actor, void* i_data) { static void* s_bt_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_MG_FISH) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_MG_FISH_e) { mg_fish_class* fish = (mg_fish_class*)i_actor; if (fish->mGedouKind == 20) { if ((fish->actor.current.pos - ((fopAc_ac_c*)i_data)->current.pos).abs() < fish->mJointScale) { @@ -4228,7 +4228,9 @@ static void uki_main(dmg_rod_class* i_this) { break; } - if (i_this->rod_substick_y <= -0.5f && (i_this->rod_substick_y - i_this->prev_rod_substick_y) <= -0.5f && i_this->action == ACTION_UKI_STANDBY) { + if (i_this->rod_substick_y <= -0.5f && + i_this->rod_substick_y - i_this->prev_rod_substick_y <= -0.5f && + i_this->action == ACTION_UKI_STANDBY) { if (i_this->is_hook_in_water != 0) { daAlink_getAlinkActorClass()->seStartOnlyReverb(Z2SE_AL_ROD_SWING_LURE); } @@ -4376,7 +4378,7 @@ static void uki_main(dmg_rod_class* i_this) { mDoMtx_stack_c::XrotM(spC); mDoMtx_stack_c::scaleM(l_HIO.field_0xc, l_HIO.field_0xc, l_HIO.field_0xc); mDoMtx_stack_c::transM(0.0f, 0.0f, l_HIO.field_0x10); - mDoMtx_stack_c::XrotM(XREG_S(8)); + mDoMtx_stack_c::XrotM((s16)XREG_S(8)); i_this->uki_model->setBaseTRMtx(mDoMtx_stack_c::get()); mDoMtx_stack_c::transM(0.0f, 0.0f, l_HIO.field_0x14); @@ -4491,6 +4493,8 @@ static void play_camera(dmg_rod_class* i_this) { f32 sp60; f32 sp5C; camera_class* sp58; + // debug indicates these case bodies are likely unscoped despite containing declarations + // (due to extra an b instruction at the end) switch (i_this->play_cam_mode) { case 0: if (dComIfGp_checkPlayerStatus0(0, 0x2000) || dComIfGp_event_runCheck()) { @@ -4522,7 +4526,7 @@ static void play_camera(dmg_rod_class* i_this) { } } break; - case 1: { + case 1: i_this->play_cam_mode = 2; camera->mCamera.Stop(); i_this->play_cam_timer = 0; @@ -4540,8 +4544,7 @@ static void play_camera(dmg_rod_class* i_this) { camera->mCamera.SetTrimSize(1); i_this->play_cam_fovy = 55.0f; /* fallthrough */ - } - case 2: { + case 2: sp70 = 1; sp6C = 0.3f + NREG_F(3); sp68 = i_this->field_0x1420; @@ -4605,7 +4608,6 @@ static void play_camera(dmg_rod_class* i_this) { i_this->field_0x141a = i_this->field_0x1418 - daAlink_getAlinkActorClass()->getFishingRodAngleY(); i_this->field_0x140c = i_this->play_cam_fovy; break; - } case 5: { sp70 = 1; cLib_addCalc2(&i_this->field_0x141c, 400.0f + BREG_F(7), 0.1f, (20.0f + YREG_F(8)) * i_this->camera_morf_rate); @@ -5314,6 +5316,8 @@ static void play_camera_u(dmg_rod_class* i_this) { int sp14 = 0; f32 var_f31; + // debug indicates these case bodies are likely unscoped despite containing declarations + // (due to extra an b instruction at the end) switch (i_this->play_cam_mode) { case 0: break; @@ -5493,6 +5497,7 @@ static void play_camera_u(dmg_rod_class* i_this) { cLib_addCalc2(&i_this->play_cam_fovy, 55.0f, 0.1f, 10.0f); break; } + // debug indicates this case body is unscoped despite containing declarations case 20: case 21: { if (!actor->eventInfo.checkCommandDemoAccrpt()) { @@ -5647,6 +5652,7 @@ static void play_camera_u(dmg_rod_class* i_this) { i_this->field_0xf64 = -30.0f; daAlink_getAlinkActorClass()->changeFishGetFace(0); } + (void)0; break; } case 90: @@ -5759,7 +5765,7 @@ static int dmg_rod_Execute(dmg_rod_class* i_this) { if (strcmp(dComIfGp_getStartStageName(), "F_SP127") == 0 && i_this->kind == 0) { } - henna = (npc_henna_class*)fopAcM_SearchByName(PROC_NPC_HENNA); + henna = (npc_henna_class*)fopAcM_SearchByName(fpcNm_NPC_HENNA_e); if (henna != NULL && henna->field_0x734 != 0) { henna = NULL; } @@ -5986,7 +5992,7 @@ static int dmg_rod_Execute(dmg_rod_class* i_this) { i_this->field_0x1406 = i_this->play_cam_fovy; if (i_this->kind == MG_ROD_KIND_LURE) { - daObjLife_c* obj_life = (daObjLife_c*)fopAcM_SearchByName(PROC_Obj_LifeContainer); + daObjLife_c* obj_life = (daObjLife_c*)fopAcM_SearchByName(fpcNm_Obj_LifeContainer_e); if (obj_life != NULL) { if (i_this->field_0x10a9 != 0) { if (i_this->field_0x10a9 == 2) { @@ -6412,20 +6418,20 @@ static actor_method_class l_dmg_rod_Method = { }; actor_process_profile_definition g_profile_MG_ROD = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_MG_ROD, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(dmg_rod_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 438, // mPriority - &l_dmg_rod_Method, // sub_method - 0x00060000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MG_ROD_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dmg_rod_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_MG_ROD_e, + /* Actor SubMtd */ &l_dmg_rod_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_midna.cpp b/src/d/actor/d_a_midna.cpp index 85f15051b8..dcdb2f43ff 100644 --- a/src/d/actor/d_a_midna.cpp +++ b/src/d/actor/d_a_midna.cpp @@ -3170,8 +3170,8 @@ int daMidna_c::execute() { if ( checkStateFlg0(FLG0_NO_DRAW) && (eventInfo.checkCommandTalk() || checkStateFlg0(FLG0_WOLF_NO_POS) || mDemoMode == 2 || (dComIfGp_event_runCheck() && talk_partner != NULL && (checkStateFlg0(FLG0_UNK_2000000) || - fopAcM_GetName(talk_partner) == PROC_Tag_Mhint || fopAcM_GetName(talk_partner) == PROC_Tag_Mstop || - fopAcM_GetName(talk_partner) == PROC_Tag_Mwait))) + fopAcM_GetName(talk_partner) == fpcNm_Tag_Mhint_e || fopAcM_GetName(talk_partner) == fpcNm_Tag_Mstop_e || + fopAcM_GetName(talk_partner) == fpcNm_Tag_Mwait_e))) ) { if ( mDemoMode == 3 || mDemoMode == 0x10 || mDemoMode == 4 || mDemoMode == 6 || @@ -3598,18 +3598,18 @@ static actor_method_class l_daMidna_Method = { }; actor_process_profile_definition g_profile_MIDNA = { - fpcLy_CURRENT_e, - 6, - fpcPi_CURRENT_e, - PROC_MIDNA, - &g_fpcLf_Method.base, - sizeof(daMidna_c), - 0, - 0, - &g_fopAc_Method.base, - 0x5C, - &l_daMidna_Method, - 0x60000, - fopAc_ENV_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 6, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MIDNA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daMidna_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_MIDNA_e, + /* Actor SubMtd */ &l_daMidna_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_mirror.cpp b/src/d/actor/d_a_mirror.cpp index e3c0332925..b66a095d5c 100644 --- a/src/d/actor/d_a_mirror.cpp +++ b/src/d/actor/d_a_mirror.cpp @@ -622,18 +622,18 @@ static actor_method_class daMirror_METHODS = { }; actor_process_profile_definition g_profile_MIRROR = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_MIRROR, - &g_fpcLf_Method.base, - sizeof(daMirror_c), - 0, - 0, - &g_fopAc_Method.base, - 757, - &daMirror_METHODS, - 0x60000, - fopAc_UNK_GROUP_5_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MIRROR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daMirror_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_MIRROR_e, + /* Actor SubMtd */ &daMirror_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_movie_player.cpp b/src/d/actor/d_a_movie_player.cpp index 3e14df69bb..c2d1c394c0 100644 --- a/src/d/actor/d_a_movie_player.cpp +++ b/src/d/actor/d_a_movie_player.cpp @@ -526,7 +526,11 @@ static u8 __THPReadHuffmanTableSpecification() { __THPHuffmanCodeTab = (u16*)((uintptr_t)__THPWorkArea + 256 + 1); length = (u16)((__THPInfo->c)[0] << 8 | (__THPInfo->c)[1]); __THPInfo->c += 2; +#if PLATFORM_SHIELD + length -= (u16)2; +#else length -= 2; +#endif for (;;) { i = (*(__THPInfo->c)++); @@ -545,8 +549,12 @@ static u8 __THPReadHuffmanTableSpecification() { __THPHuffGenerateSizeTable(); __THPHuffGenerateCodeTable(); __THPHuffGenerateDecoderTables(tab_index); - __THPInfo->validHuffmanTabs |= 1 << tab_index; - length -= 17 + num_Vij; +#if PLATFORM_SHIELD + __THPInfo->validHuffmanTabs |= (u8)(1 << tab_index); +#else + __THPInfo->validHuffmanTabs |= (1 << tab_index); +#endif + U16_SUB_2(length, (17 + num_Vij)); if (length == 0) { break; @@ -1629,7 +1637,7 @@ static void __THPHuffDecodeDCTCompY(__REGISTER THPFileInfo* info, THPCoeff* bloc } if (__cntlzw((u32)diff) > 32 - t) { - diff += ((0xFFFFFFFF << t) + 1); + S16_ADD_2(diff, (0xFFFFFFFF << t) + 1); } }; @@ -2333,7 +2341,7 @@ static void __THPHuffDecodeDCTCompU(__REGISTER THPFileInfo* info, THPCoeff* bloc ASSERTLINE(5070, info->cnt <=33); if (__cntlzw((u32)diff) > 32 - t) { - diff += ((0xFFFFFFFF << t) + 1); + S16_ADD_2(diff, (0xFFFFFFFF << t) + 1); } } @@ -2477,7 +2485,7 @@ static void __THPHuffDecodeDCTCompV(__REGISTER THPFileInfo* info, THPCoeff* bloc ASSERTLINE(5255, info->cnt <=33); if (__cntlzw((u32)diff) > 32 - t) { - diff += ((0xFFFFFFFF << t) + 1); + S16_ADD_2(diff, (0xFFFFFFFF << t) + 1); } } @@ -4199,20 +4207,20 @@ static actor_method_class daMP_METHODS = { }; actor_process_profile_definition g_profile_MOVIE_PLAYER = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_MOVIE_PLAYER, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daMP_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 9, // mPriority - &daMP_METHODS, // sub_method - 0x0006C000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MOVIE_PLAYER_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daMP_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_MOVIE_PLAYER_e, + /* Actor SubMtd */ &daMP_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_STAFF_PRIMARY_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_myna.cpp b/src/d/actor/d_a_myna.cpp index b7412cc52c..af26d5e3a2 100644 --- a/src/d/actor/d_a_myna.cpp +++ b/src/d/actor/d_a_myna.cpp @@ -200,15 +200,15 @@ static daTag_MynaLight_c* daMyna_LightActor; static int daMyna_actor_count; static void* daMyna_searchSSItem(void* param_0, void* param_1) { - if (fopAcM_IsActor(param_0) && (fopAcM_GetName(param_0) == PROC_OBJ_SSITEM || - fopAcM_GetName(param_0) == PROC_OBJ_SSDRINK || - fopAcM_GetName(param_0) == PROC_TAG_SSDRINK)) + if (fopAcM_IsActor(param_0) && (fopAcM_GetName(param_0) == fpcNm_OBJ_SSITEM_e || + fopAcM_GetName(param_0) == fpcNm_OBJ_SSDRINK_e || + fopAcM_GetName(param_0) == fpcNm_TAG_SSDRINK_e)) { if ((fopAcM_GetParam(param_1) & 0xF0000000) == (fopAcM_GetParam(param_0) & 0xF0000000) && daMyna_actor_count < 10) { fopAc_ac_c* pfVar4 = static_cast(param_0); - if (fopAcM_GetName(param_0) == PROC_OBJ_SSITEM) { + if (fopAcM_GetName(param_0) == fpcNm_OBJ_SSITEM_e) { pfVar4 = static_cast(param_0)->getExchangeItemPtr(); } if (pfVar4 != NULL) { @@ -223,7 +223,7 @@ static void* daMyna_searchSSItem(void* param_0, void* param_1) { static void* daMyna_searchLight(void* i_mynaLightTagActor, void* param_1) { if (fopAcM_IsActor(i_mynaLightTagActor) && - fopAcM_GetName(i_mynaLightTagActor) == PROC_TAG_MNLIGHT) + fopAcM_GetName(i_mynaLightTagActor) == fpcNm_TAG_MNLIGHT_e) { if ((fopAcM_GetParam(param_1) & 0xF0000000) == (fopAcM_GetParam(i_mynaLightTagActor) & 0xF0000000)) @@ -239,7 +239,7 @@ static fopAc_ac_c* daMyna_evtTagActor0; static fopAc_ac_c* daMyna_evtTagActor1; static void* daMyna_searchEvtTag(void* i_evtTagActor, void* param_1) { - if (fopAcM_IsActor(i_evtTagActor) && fopAcM_GetName(i_evtTagActor) == PROC_TAG_EVT) { + if (fopAcM_IsActor(i_evtTagActor) && fopAcM_GetName(i_evtTagActor) == fpcNm_TAG_EVT_e) { if (((fopAcM_GetParam(i_evtTagActor) & 0xF000000) >> 24) == 0) { // Event range tag 0 search daMyna_evtTagActor0 = static_cast(i_evtTagActor); @@ -1519,7 +1519,7 @@ u8 daMyna_c::getItemType(void* param_0) { u8 itemType = 0xF; u8 uVar1 = fopAcM_GetParam(param_0) & 0xFF; - if (fopAcM_GetName(param_0) == PROC_OBJ_SSITEM) { + if (fopAcM_GetName(param_0) == fpcNm_OBJ_SSITEM_e) { switch (uVar1) { case 0: itemType = 1; @@ -1531,7 +1531,7 @@ u8 daMyna_c::getItemType(void* param_0) { itemType = 0; break; } - } else if (fopAcM_GetName(param_0) == PROC_OBJ_SSDRINK) { + } else if (fopAcM_GetName(param_0) == fpcNm_OBJ_SSDRINK_e) { switch (uVar1) { case 0: itemType = 3; @@ -1552,7 +1552,7 @@ u8 daMyna_c::getItemType(void* param_0) { itemType = 8; break; } - } else if (fopAcM_GetName(param_0) == PROC_TAG_SSDRINK) { + } else if (fopAcM_GetName(param_0) == fpcNm_TAG_SSDRINK_e) { switch (uVar1) { case 0: itemType = 9; @@ -1815,20 +1815,20 @@ static actor_method_class daMyna_MethodTable = { }; actor_process_profile_definition g_profile_MYNA = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_MYNA, - &g_fpcLf_Method.base, - sizeof(daMyna_c), - 0, - 0, - &g_fopAc_Method.base, - 0x0130, - &daMyna_MethodTable, - 0x40000, - 0, - fopAc_CULLBOX_0_e + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MYNA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daMyna_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_MYNA_e, + /* Actor SubMtd */ &daMyna_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_nbomb.cpp b/src/d/actor/d_a_nbomb.cpp index fea345e07e..070fdc2c7f 100644 --- a/src/d/actor/d_a_nbomb.cpp +++ b/src/d/actor/d_a_nbomb.cpp @@ -49,7 +49,7 @@ void daNbomb_c::tgHitCallback(dCcD_GObjInf* i_hitObj) { { procBoomerangMoveInit(i_hitObj); } - } else if (i_hitObj->ChkAtType(AT_TYPE_HOOKSHOT) && fopAcM_CheckStatus(this, 0x80000)) { + } else if (i_hitObj->ChkAtType(AT_TYPE_HOOKSHOT) && fopAcM_CheckStatus(this, fopAcStts_UNK_0x80000_e)) { if (fopAcM_checkCarryNow(this)) { fopAcM_cancelCarryNow(this); } @@ -350,7 +350,7 @@ int daNbomb_c::create() { mDoMtx_stack_c::transS(current.pos); if (!checkStateFlg0(FLG0_INSECT_BOMB)) { - fopAcM_OnStatus(this, 0x80000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e); } mDoMtx_stack_c::ZXYrotM(0, shape_angle.y, shape_angle.z); @@ -607,7 +607,7 @@ void daNbomb_c::setHitPolygon(BOOL param_0) { } BOOL daNbomb_c::procExplodeInit() { - fopAcM_OnStatus(this, 0x20000); + fopAcM_OnStatus(this, fopAcStts_NOPAUSE_e); daAlink_c* player = daAlink_getAlinkActorClass(); scale.x = player->getBombEffScale(); @@ -1685,18 +1685,18 @@ static actor_method_class l_daNbombMethod = { }; actor_process_profile_definition g_profile_NBOMB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NBOMB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNbomb_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 270, // mPriority - &l_daNbombMethod, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NBOMB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNbomb_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NBOMB_e, + /* Actor SubMtd */ &l_daNbombMethod, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_ni.cpp b/src/d/actor/d_a_ni.cpp index 6f83d51715..8d97925078 100644 --- a/src/d/actor/d_a_ni.cpp +++ b/src/d/actor/d_a_ni.cpp @@ -138,7 +138,7 @@ static int daNi_Draw(ni_class* i_this) { } static void* s_play_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NI) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NI_e) { ni_class* a_actor = (ni_class*)i_actor; if (a_actor->mAction == ACTION_PLAY_e) { @@ -212,7 +212,7 @@ static fopAc_ac_c* target_info[10]; static int target_info_count; static void* s_t_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_NE && target_info_count < 10) + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_NE_e && target_info_count < 10) { target_info[target_info_count] = (fopAc_ac_c*)i_actor; target_info_count++; @@ -378,7 +378,7 @@ static void ni_normal(ni_class* i_this) { } } - fopAc_ac_c* cow = fopAcM_SearchByName(PROC_COW); + fopAc_ac_c* cow = fopAcM_SearchByName(fpcNm_COW_e); if (cow != NULL && cow->speedF > 1.0f) { sp50 = cow->current.pos - a_this->current.pos; f32 var_f30 = sp50.abs(); @@ -755,7 +755,7 @@ static void ni_damage(ni_class* i_this) { static void* s_b_sub(void* i_actor, void* i_data) { fopAc_ac_c* player = dComIfGp_getPlayer(0); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_BOOMERANG && + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_BOOMERANG_e && daPy_py_c::checkBoomerangCharge() && fopAcM_GetParam(i_actor) == 1) { return i_actor; @@ -807,7 +807,7 @@ static void ni_windspin(ni_class* i_this) { static int ni_demo0(ni_class* i_this) { cXyz sp28; cXyz sp34; - daNpcMoiR_c* moi = (daNpcMoiR_c*)fopAcM_SearchByName(PROC_NPC_MOIR); + daNpcMoiR_c* moi = (daNpcMoiR_c*)fopAcM_SearchByName(fpcNm_NPC_MOIR_e); if (i_this->mTimers[0] == 0 && moi != NULL) { mDoMtx_stack_c::copy(moi->getHandRMtx()); @@ -1998,18 +1998,18 @@ static actor_method_class l_daNi_Method = { }; actor_process_profile_definition g_profile_NI = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(ni_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 695, // mPriority - &l_daNi_Method, // sub_method - 0x80c4000, // mStatus - fopAc_NPC_e, // mActorType - fopAc_ACTOR_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(ni_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NI_e, + /* Actor SubMtd */ &l_daNi_Method, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_ACTOR_e, }; diff --git a/src/d/actor/d_a_no_chg_room.cpp b/src/d/actor/d_a_no_chg_room.cpp index f2ec6e4b82..3a2e788a96 100644 --- a/src/d/actor/d_a_no_chg_room.cpp +++ b/src/d/actor/d_a_no_chg_room.cpp @@ -157,18 +157,18 @@ static actor_method_class daNocrm_METHODS = { }; actor_process_profile_definition g_profile_NO_CHG_ROOM = { - fpcLy_CURRENT_e, - 2, - fpcPi_CURRENT_e, - PROC_NO_CHG_ROOM, - &g_fpcLf_Method.base, - sizeof(daNocrm_c), - 0, - 0, - &g_fopAc_Method.base, - 762, - &daNocrm_METHODS, - 0x60000, - fopAc_UNK_GROUP_5_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 2, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NO_CHG_ROOM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNocrm_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NO_CHG_ROOM_e, + /* Actor SubMtd */ &daNocrm_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc.cpp b/src/d/actor/d_a_npc.cpp index de72aae604..123bf66800 100644 --- a/src/d/actor/d_a_npc.cpp +++ b/src/d/actor/d_a_npc.cpp @@ -1242,7 +1242,7 @@ void daNpcT_c::tgHitCallBack(fopAc_ac_c* i_actor1, dCcD_GObjInf* i_obj1, fopAc_a fopAc_ac_c* actor1 = i_actor1; u8 cut_type = 0; if (i_actor2 != NULL) { - if (fopAcM_GetProfName(i_actor2) == PROC_ALINK) { + if (fopAcM_GetProfName(i_actor2) == fpcNm_ALINK_e) { cut_type = static_cast(i_actor2)->getCutType(); } else { cut_type = daPy_py_c::CUT_TYPE_NM_VERTICAL; @@ -2235,7 +2235,7 @@ fopAc_ac_c* daNpcT_c::hitChk(dCcD_GObjInf* i_objInf, u32 param_1) { if (mDamageTimer == 0) { hit_actor_p = i_objInf->GetTgHitAc(); if (hit_actor_p != NULL) { - if (fopAcM_GetName(hit_actor_p) == PROC_NPC_TK && (param_1 & 1)) { + if (fopAcM_GetName(hit_actor_p) == fpcNm_NPC_TK_e && (param_1 & 1)) { ((daNPC_TK_c*)hit_actor_p)->setBump(); return hit_actor_p; } @@ -2403,7 +2403,7 @@ BOOL daNpcT_c::srchPlayerActor() { cXyz daNpcT_c::getAttnPos(fopAc_ac_c* i_actor) { cXyz attn_pos = i_actor->attention_info.position; - if (fopAcM_GetName(i_actor) == PROC_ALINK) { + if (fopAcM_GetName(i_actor) == fpcNm_ALINK_e) { attn_pos.y -= daPy_py_c::getAttentionOffsetY(); if (daPy_py_c::checkNowWolf()) { attn_pos = i_actor->current.pos; @@ -2610,7 +2610,7 @@ fopAc_ac_c* daNpcT_c::getEvtAreaTagP(int i_type, int i_no) { f32 var_f31 = G_CM3D_F_INF; mFindCount = 0; - mSrchName = PROC_TAG_EVTAREA; + mSrchName = fpcNm_TAG_EVTAREA_e; fpcM_Search(srchActor, this); for (int i = 0; i < mFindCount; i++) { @@ -2625,7 +2625,7 @@ fopAc_ac_c* daNpcT_c::getEvtAreaTagP(int i_type, int i_no) { fopAc_ac_c* daNpcT_c::getShopItemTagP() { int unusedInt1 = 0; mFindCount = 0; - mSrchName = PROC_TAG_SHOPITM; + mSrchName = fpcNm_TAG_SHOPITM_e; fpcM_Search(srchActor, this); for (s32 i = 0; i < mFindCount; i++) { diff --git a/src/d/actor/d_a_npc4.cpp b/src/d/actor/d_a_npc4.cpp index 2af71470c2..858cf579d9 100644 --- a/src/d/actor/d_a_npc4.cpp +++ b/src/d/actor/d_a_npc4.cpp @@ -697,7 +697,7 @@ int daNpcF_c::draw(BOOL i_isTest, BOOL param_1, f32 i_shadowDepth, GXColorS10* i void daNpcF_c::tgHitCallBack(fopAc_ac_c* i_this, dCcD_GObjInf* param_1, fopAc_ac_c* i_actor, dCcD_GObjInf* param_3) { - if (i_actor != NULL && fopAcM_GetProfName(i_actor) == PROC_ALINK) { + if (i_actor != NULL && fopAcM_GetProfName(i_actor) == fpcNm_ALINK_e) { daNpcF_c* npc = static_cast(i_this); if (daPy_getPlayerActorClass() == i_actor) { npc->setCutType(static_cast(i_actor)->getCutType()); @@ -735,9 +735,9 @@ void* daNpcF_c::srchAttnActor1(void* i_proc, void* param_1) { void* param_1_copy = param_1; fopAc_ac_c* actor = NULL; if (mFindCount < 100 && fopAcM_IsActor(i_proc) - && (fopAcM_GetName(i_proc) == PROC_NI || fopAcM_GetName(i_proc) == PROC_COW - || fopAcM_GetName(i_proc) == PROC_NPC_NE || fopAcM_GetName(i_proc) == PROC_DO - || fopAcM_GetName(i_proc) == PROC_SQ || fopAcM_GetName(i_proc) == PROC_BD)) + && (fopAcM_GetName(i_proc) == fpcNm_NI_e || fopAcM_GetName(i_proc) == fpcNm_COW_e + || fopAcM_GetName(i_proc) == fpcNm_NPC_NE_e || fopAcM_GetName(i_proc) == fpcNm_DO_e + || fopAcM_GetName(i_proc) == fpcNm_SQ_e || fopAcM_GetName(i_proc) == fpcNm_BD_e)) { actor = static_cast(i_proc); mFindActorPList[mFindCount] = actor; @@ -1196,7 +1196,7 @@ BOOL daNpcF_c::hitChk2(dCcD_Cyl* i_ccCyl, BOOL param_1, BOOL param_2) { if (hit_actor != NULL) { actorAngleY = fopAcM_searchActorAngleY(this, hit_actor); field_0x990 = actorAngleY - mCurAngle.y; - if (fopAcM_GetName(hit_actor) == PROC_NPC_TK) { + if (fopAcM_GetName(hit_actor) == fpcNm_NPC_TK_e) { if (param_1) { static_cast(hit_actor)->setBump(); return true; @@ -1509,7 +1509,7 @@ fopAc_ac_c* daNpcF_c::getEvtAreaTagP(int i_type, int i_no) { int r29 = 0; f32 f31 = G_CM3D_F_INF; mFindCount = 0; - mSrchActorName = PROC_TAG_EVTAREA; + mSrchActorName = fpcNm_TAG_EVTAREA_e; fpcM_Search(this->srchActor, this); for (int i = 0; i < mFindCount; i++) { @@ -1658,7 +1658,7 @@ BOOL daNpcF_c::chkPointInArea(cXyz i_point, cXyz i_center, cXyz i_bounds, s16 i_ cXyz daNpcF_c::getAttentionPos(fopAc_ac_c* i_actor_p) { cXyz pos = i_actor_p->attention_info.position; - if (fopAcM_GetName(i_actor_p) == PROC_ALINK) { + if (fopAcM_GetName(i_actor_p) == fpcNm_ALINK_e) { pos.y -= daPy_py_c::getAttentionOffsetY(); } diff --git a/src/d/actor/d_a_npc_aru.cpp b/src/d/actor/d_a_npc_aru.cpp index 37371629ed..a730afa9cd 100644 --- a/src/d/actor/d_a_npc_aru.cpp +++ b/src/d/actor/d_a_npc_aru.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_aru.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -531,7 +531,7 @@ void* daNpc_Aru_c::srchCow(void* i_actor, void* i_data) { if (mFindCount < 50) { fopAc_ac_c* actor_p = (fopAc_ac_c*) i_actor; if (actor_p != NULL && actor_p != data_p) { - if (fopAcM_IsExecuting(fopAcM_GetID(actor_p)) && fopAcM_GetName(actor_p) == PROC_COW && !((daCow_c*)actor_p)->isGuardFad()) { + if (fopAcM_IsExecuting(fopAcM_GetID(actor_p)) && fopAcM_GetName(actor_p) == fpcNm_COW_e && !((daCow_c*)actor_p)->isGuardFad()) { mFindActorPtrs[mFindCount] = actor_p; mFindCount++; } @@ -546,7 +546,7 @@ void* daNpc_Aru_c::srchUDoor(void* i_actor, void* i_data) { if (mFindCount < 50) { fopAc_ac_c* actor_p = (fopAc_ac_c*) i_actor; if (actor_p != NULL && actor_p != data_p) { - if (fopAcM_IsExecuting(fopAcM_GetID(actor_p)) && fopAcM_GetName(actor_p) == PROC_OBJ_UDOOR) { + if (fopAcM_IsExecuting(fopAcM_GetID(actor_p)) && fopAcM_GetName(actor_p) == fpcNm_OBJ_UDOOR_e) { mFindActorPtrs[mFindCount] = (fopAc_ac_c*) actor_p; mFindCount++; } @@ -574,7 +574,7 @@ BOOL daNpc_Aru_c::chkThrust(fopAc_ac_c* actor_p) { } } - if (fopAcM_GetName(actor_p) == PROC_ALINK && daPy_py_c::checkNowWolf() && actorDistance < mpHIO->m.warning_range) { + if (fopAcM_GetName(actor_p) == fpcNm_ALINK_e && daPy_py_c::checkNowWolf() && actorDistance < mpHIO->m.warning_range) { return TRUE; } } @@ -621,7 +621,7 @@ fopAc_ac_c* daNpc_Aru_c::getCowP(int param_1) { fopAc_ac_c* daNpc_Aru_c::getUDoor_l_P() { fopAc_ac_c* rv = NULL; f32 fVar1 = G_CM3D_F_INF; - + mFindCount = 0; fopAcM_Search(srchUDoor, this); @@ -638,7 +638,7 @@ fopAc_ac_c* daNpc_Aru_c::getUDoor_l_P() { fopAc_ac_c* daNpc_Aru_c::getUDoor_r_P() { fopAc_ac_c* rv = NULL; f32 fVar1 = G_CM3D_F_INF; - + mFindCount = 0; fopAcM_Search(srchUDoor, this); @@ -683,7 +683,7 @@ BOOL daNpc_Aru_c::isDelete() { case TYPE_1: return FALSE; - + case TYPE_2: /* dSv_event_flag_c::M_013 - Misc. - First heard about Twilight gate from Midna */ return daNpcT_chkEvtBit(45) == FALSE; @@ -724,7 +724,7 @@ void daNpc_Aru_c::reset() { mPlayerActorMngr.entry(daPy_getPlayerActorClass()); mEventTimer = 30; break; - + case TYPE_2: mTimerID = fpcM_ERROR_PROCESS_ID_e; mPlayerActorMngr.entry(daPy_getPlayerActorClass()); @@ -739,7 +739,7 @@ void daNpc_Aru_c::reset() { } } break; - + case TYPE_4: mTimerID = fpcM_ERROR_PROCESS_ID_e; mEventTimer = 30; @@ -869,7 +869,7 @@ void daNpc_Aru_c::setAfterTalkMotion() { case FACE_WORRY: i_index = FACE_H_WORRY; break; - + case FACE_BITTERSMILE: i_index = FACE_H_BITTERSMILE; break; @@ -901,7 +901,7 @@ void daNpc_Aru_c::srchActors() { mActorMngrs[1].entry(getUDoor_r_P()); } break; - + case TYPE_2: if (chkBullRunningStage() && mTimerID == fpcM_ERROR_PROCESS_ID_e) { mTimerID = dTimer_createTimer(2, 0x989298, 3, 0, 210.0f, 410.0f, 32.0f, 419.0f); @@ -996,10 +996,10 @@ void daNpc_Aru_c::action() { } void daNpc_Aru_c::beforeMove() { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw) { @@ -1021,7 +1021,7 @@ void daNpc_Aru_c::setAttnPos() { mpHIO->m.common.head_angleY_min, mpHIO->m.common.head_angleY_max, mpHIO->m.common.neck_rotation_ratio, rad, &sp4c); mJntAnm.calcJntRad(0.2f, 1.0f, rad); - + setMtx(); mDoMtx_stack_c::copy(mpMorf[0]->getModel()->getAnmMtx(getHeadJointNo())); mDoMtx_stack_c::multVec(&sp40, &eyePos); @@ -1258,6 +1258,7 @@ void daNpc_Aru_c::adjustMoveDir() { } } + s16 sVar4; if (bVar1[1] != 0 && bVar1[2] != 0) { mTimer = mpHIO->m.no_turn_time; @@ -1294,7 +1295,7 @@ void daNpc_Aru_c::adjustMoveDir() { field_0xfca = 2; } } else { - s16 sVar4 = sVar3[0] - mCurAngle.y; + sVar4 = sVar3[0] - mCurAngle.y; if (abs(sVar4) > 0x7800) { if (mActorDirection == 1 || mActorDirection == 2 || mActorDirection == 3) { @@ -1504,7 +1505,7 @@ int daNpc_Aru_c::cutRideOnHorse(int i_staffID) { step(mPlayerAngle, 12, 11, 15, 0); } break; - + case 1: if (talkProc(NULL, FALSE, NULL, FALSE) && mFlow.checkEndFlow()) { rv = 1; @@ -1714,7 +1715,7 @@ int daNpc_Aru_c::cutSpeakTo(int i_staffID) { mStepMode = 0; } break; - + case 1: mFaceMotionSeqMngr.setNo(FACE_NONE, -1.0f, FALSE, 0); mMotionSeqMngr.setNo(MOT_WAIT_A, -1.0f, FALSE, 0); @@ -1733,7 +1734,7 @@ int daNpc_Aru_c::cutSpeakTo(int i_staffID) { step(mPlayerAngle, 12, 11, 15, 0); } break; - + case 1: if (talkProc(NULL, FALSE, NULL, FALSE)) { int itemNo; @@ -2063,7 +2064,7 @@ int daNpc_Aru_c::skipFence(void* param_1) { field_0xe33 = true; } break; - + case TYPE_4: if (daNpcT_chkTmpBit(177) && // dSv_event_tmp_flag_c::T_0177 - Ordon Ranch - 1st day: Asked to jump gate by Fado !daNpcT_chkTmpBit(178)) { // dSv_event_tmp_flag_c::T_0178 - Ordon Ranch - 1st day: Spoke with Fado while jumping over gate @@ -2121,7 +2122,7 @@ int daNpc_Aru_c::talk(void*) { evtChange(); } break; - + case 23: if (mType == TYPE_0) { dStage_changeScene(9, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1); @@ -2214,18 +2215,18 @@ static actor_method_class daNpc_Aru_MethodTable = { }; actor_process_profile_definition g_profile_NPC_ARU = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_ARU, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Aru_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 321, // mPriority - &daNpc_Aru_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_ARU_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Aru_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_ARU_e, + /* Actor SubMtd */ &daNpc_Aru_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_ash.cpp b/src/d/actor/d_a_npc_ash.cpp index bc985489e9..4bb33c5352 100644 --- a/src/d/actor/d_a_npc_ash.cpp +++ b/src/d/actor/d_a_npc_ash.cpp @@ -69,16 +69,16 @@ void daNpcAsh_c::setLookMode(int i_lookMode, fopAc_ac_c* i_talkPartner) { void daNpcAsh_c::searchActors() { if (!mActorMngr[1].getActorP()) { - mActorMngr[1].entry(fopAcM_SearchByName(PROC_NPC_SHAD)); + mActorMngr[1].entry(fopAcM_SearchByName(fpcNm_NPC_SHAD_e)); } if (!mActorMngr[2].getActorP()) { - mActorMngr[2].entry(fopAcM_SearchByName(PROC_NPC_RAFREL)); + mActorMngr[2].entry(fopAcM_SearchByName(fpcNm_NPC_RAFREL_e)); } if (!mActorMngr[3].getActorP()) { - mActorMngr[3].entry(fopAcM_SearchByName(PROC_NPC_MOIR)); + mActorMngr[3].entry(fopAcM_SearchByName(fpcNm_NPC_MOIR_e)); } if (isMap() && !mActorMngr[4].getActorP()) { - mActorMngr[4].entry(fopAcM_SearchByName(PROC_Obj_Table)); + mActorMngr[4].entry(fopAcM_SearchByName(fpcNm_Obj_Table_e)); } if (!mActorMngr[5].getActorP()) { mActorMngr[5].entry(getEvtAreaTagP(17, 0)); @@ -240,7 +240,7 @@ cPhs_Step daNpcAsh_c::Create() { if (dComIfGs_isSaveSwitch(0x14)) { return cPhs_ERROR_e; } - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); mType = TYPE_CASTLE; } @@ -592,7 +592,7 @@ void daNpcAsh_c::reset() { } if (isSneaking()) { - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } if (mType == TYPE_BAR) { @@ -1336,18 +1336,18 @@ static actor_method_class daNpcAsh_MethodTable = { }; actor_process_profile_definition g_profile_NPC_ASH = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_NPC_ASH, - &g_fpcLf_Method.base, - sizeof(daNpcAsh_c), - 0, - 0, - &g_fopAc_Method.base, - 411, - &daNpcAsh_MethodTable, - 0x40100, - fopAc_NPC_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_ASH_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcAsh_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_ASH_e, + /* Actor SubMtd */ &daNpcAsh_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_ashB.cpp b/src/d/actor/d_a_npc_ashB.cpp index 691da6e755..25194fb71e 100644 --- a/src/d/actor/d_a_npc_ashB.cpp +++ b/src/d/actor/d_a_npc_ashB.cpp @@ -760,7 +760,7 @@ bool daNpcAshB_c::wait(void* param_0) { return true; } else { u8 preitemno = dComIfGp_event_getPreItemNo(); - if (preitemno == fpcNm_ITEM_ASHS_SCRIBBLING) { + if (preitemno == dItemNo_ASHS_SCRIBBLING_e) { mFlowID = 504; setAction(&daNpcAshB_c::talk); } else { @@ -1194,18 +1194,18 @@ static actor_method_class daNpcAshB_MethodTable = { }; actor_process_profile_definition g_profile_NPC_ASHB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_ASHB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcAshB_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 412, // mPriority - &daNpcAshB_MethodTable, // sub_method - 0x00040100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_ASHB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcAshB_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_ASHB_e, + /* Actor SubMtd */ &daNpcAshB_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_bans.cpp b/src/d/actor/d_a_npc_bans.cpp index 756de1db84..e2d3eedad7 100644 --- a/src/d/actor/d_a_npc_bans.cpp +++ b/src/d/actor/d_a_npc_bans.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_bans.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -574,7 +574,7 @@ u8 daNpc_Bans_c::getType() { case 1: return TYPE_TWILIGHT; // Eldin Twilight - + case 2: return TYPE_COLIN_KIDNAPPED; // After Colin kidnapped but before horseback battle cleared @@ -604,7 +604,7 @@ BOOL daNpc_Bans_c::isDelete() { Do not delete if TYPE_TWILIGHT */ return FALSE; - + case TYPE_COLIN_KIDNAPPED: /* Delete if TYPE_COLIN_KIDNAPPED and: @@ -639,7 +639,7 @@ void daNpc_Bans_c::reset() { if (mpMatAnm[0] != NULL) { mpMatAnm[0]->initialize(); } - + initialize(); for (int i = 0; i < 8; i++) { @@ -789,7 +789,7 @@ void daNpc_Bans_c::srchActors() { } } break; - + case TYPE_TWILIGHT: for (int i = 0; i < 2; i++) { if (mActorMngrs[i + 5].getActorP() == NULL) { @@ -798,7 +798,7 @@ void daNpc_Bans_c::srchActors() { } if (mActorMngrs[3].getActorP() == NULL) { - mActorMngrs[3].entry(getNearestActorP(PROC_NPC_LEN)); + mActorMngrs[3].entry(getNearestActorP(fpcNm_NPC_LEN_e)); } break; @@ -894,10 +894,10 @@ void daNpc_Bans_c::action() { } void daNpc_Bans_c::beforeMove() { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkPlayerIn2ndFloorOfBombShop()) { @@ -1062,7 +1062,7 @@ int daNpc_Bans_c::drawDbgInfo() { dDbVw_drawSphereXlu(attention_info.position, 9.0f, (GXColor){0x80, 0x80, 0x80, 0xA0}, 1); } #endif - + return 0; } @@ -1146,12 +1146,12 @@ BOOL daNpc_Bans_c::selectAction() { return TRUE; } #endif - + switch (mType) { case TYPE_SHOP: mNextAction = &daNpc_Bans_c::tend; break; - + default: mNextAction = &daNpc_Bans_c::wait; break; @@ -1205,7 +1205,7 @@ fopAc_ac_c* daNpc_Bans_c::getKMsgTagP() { int reg_r29 = 0; // unused f32 fVar1 = G_CM3D_F_INF; mFindCount = 0; - mSrchName = PROC_TAG_KMSG; + mSrchName = fpcNm_TAG_KMSG_e; fopAcM_Search(srchActor, this); for (int i = 0; i < mFindCount; i++) { @@ -1254,7 +1254,7 @@ int daNpc_Bans_c::cutAnger(int i_staffId) { initTalk(12, NULL); break; - + case 2: if (mType == TYPE_MAKING_BOMBS) { mFaceMotionSeqMngr.setNo(FACE_BLINK, -1.0f, FALSE, 0); @@ -1272,7 +1272,7 @@ int daNpc_Bans_c::cutAnger(int i_staffId) { mEventTimer = timer; mDropWaterTimer = 20; break; - + case 4: mEventTimer = timer; break; @@ -1281,7 +1281,7 @@ int daNpc_Bans_c::cutAnger(int i_staffId) { mFaceMotionSeqMngr.setNo(FACE_BLINK, -1.0f, FALSE, 0); mMotionSeqMngr.setNo(MOT_ANGRY_C, -1.0f, FALSE, 0); break; - + case 6: mFaceMotionSeqMngr.setNo(FACE_TALK_A, -1.0f, FALSE, 0); mMotionSeqMngr.setNo(MOT_REST, -1.0f, FALSE, 0); @@ -1303,7 +1303,7 @@ int daNpc_Bans_c::cutAnger(int i_staffId) { step(mPlayerAngle, -1, -1, 15, 0); } break; - + case 2: if (mMotionSeqMngr.getNo() == MOT_ANGRY_A || mMotionSeqMngr.getNo() == MOT_ANGRY_C) { if (mMotionSeqMngr.checkEndSequence()) { @@ -1347,7 +1347,7 @@ int daNpc_Bans_c::cutAnger(int i_staffId) { rv = 1; } break; - + case 4: action(); if (cLib_calcTimer(&mEventTimer) == 0) { @@ -1490,7 +1490,7 @@ int daNpc_Bans_c::wait(void*) { mFaceMotionSeqMngr.setNo(FACE_NONE, -1.0f, FALSE, 0); mMotionSeqMngr.setNo(MOT_WAIT_TW, -1.0f, FALSE, 0); break; - + case TYPE_COLIN_KIDNAPPED: mFaceMotionSeqMngr.setNo(FACE_BLINK, -1.0f, FALSE, 0); mMotionSeqMngr.setNo(MOT_FAINT, -1.0f, FALSE, 0); @@ -1523,7 +1523,7 @@ int daNpc_Bans_c::wait(void*) { daNpcT_chkEvtBit(60) && // dSv_event_flag_c::M_027 - Cutscene - [cutscene: 13] kids in the church (beast eyes) !dComIfGp_event_runCheck() ) { - mDemo13Flag = 0; + mDemo13Flag = 0; } } @@ -1654,7 +1654,7 @@ int daNpc_Bans_c::tend(void*) { if (actor_p != NULL) { cXyz attnPos = getAttnPos(daPy_getPlayerActorClass()); BOOL bVar2 = NULL != mPlayerActorMngr.getActorP(); - + int i_no = actor_p->attention_info.distances[fopAc_attn_SPEAK_e]; f32 dist_max = dComIfGp_getAttention()->getDistTable(i_no).mDistMax; f32 neg_lower_y = dComIfGp_getAttention()->getDistTable(i_no).mLowerY * -1.0f; @@ -1810,7 +1810,7 @@ int daNpc_Bans_c::shop(void*) { int daNpc_Bans_c::test(void*) { int rv = 0; - + switch (mMode) { case 0: case 1: @@ -1861,18 +1861,18 @@ static actor_method_class daNpc_Bans_MethodTable = { }; actor_process_profile_definition g_profile_NPC_BANS = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_BANS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Bans_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 322, // mPriority - &daNpc_Bans_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BANS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Bans_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_BANS_e, + /* Actor SubMtd */ &daNpc_Bans_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_besu.cpp b/src/d/actor/d_a_npc_besu.cpp index 0f86035d4d..ea52cd896a 100644 --- a/src/d/actor/d_a_npc_besu.cpp +++ b/src/d/actor/d_a_npc_besu.cpp @@ -1195,65 +1195,65 @@ void daNpc_Besu_c::srchActors() { switch (mType) { case 0: if (mActorMngr[0].getActorP() == NULL) { - mActorMngr[0].entry(getNearestActorP(PROC_NPC_TARO)); + mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_TARO_e)); } if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(getNearestActorP(PROC_NPC_MARO)); + mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_MARO_e)); return; } break; case 2: if (mActorMngr[3].getActorP() == NULL) { // LEN is Renaldo - mActorMngr[3].entry(getNearestActorP(PROC_NPC_LEN)); + mActorMngr[3].entry(getNearestActorP(fpcNm_NPC_LEN_e)); return; } break; case 11: if (mActorMngr[0].getActorP() == NULL) { - mActorMngr[0].entry(getNearestActorP(PROC_NPC_TARO)); + mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_TARO_e)); } if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(getNearestActorP(PROC_NPC_MARO)); + mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_MARO_e)); return; } break; case 12: if (mActorMngr[0].getActorP() == NULL) { - mActorMngr[0].entry(getNearestActorP(PROC_NPC_TARO)); + mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_TARO_e)); } if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(getNearestActorP(PROC_NPC_MARO)); + mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_MARO_e)); return; } break; case 13: if (mActorMngr[0].getActorP() == NULL) { - mActorMngr[0].entry(getNearestActorP(PROC_NPC_TARO)); + mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_TARO_e)); } if (mActorMngr[2].getActorP() == NULL) { - mActorMngr[2].entry(getNearestActorP(PROC_NPC_KOLIN)); + mActorMngr[2].entry(getNearestActorP(fpcNm_NPC_KOLIN_e)); } if (mActorMngr[4].getActorP() == NULL) { - mActorMngr[4].entry(getNearestActorP(PROC_NPC_SARU)); + mActorMngr[4].entry(getNearestActorP(fpcNm_NPC_SARU_e)); return; } break; case 14: if (mActorMngr[0].getActorP() == NULL) { - mActorMngr[0].entry(getNearestActorP(PROC_NPC_TARO)); + mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_TARO_e)); } if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(getNearestActorP(PROC_NPC_MARO)); + mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_MARO_e)); return; } break; case 17: if (mActorMngr[5].getActorP() == NULL) { - mActorMngr[5].entry(getNearestActorP(PROC_NPC_HANJO)); + mActorMngr[5].entry(getNearestActorP(fpcNm_NPC_HANJO_e)); } if (mActorMngr[6].getActorP() == NULL) { - mActorMngr[6].entry(getNearestActorP(PROC_NPC_SEIRA)); + mActorMngr[6].entry(getNearestActorP(fpcNm_NPC_SEIRA_e)); } break; } @@ -1329,9 +1329,9 @@ void daNpc_Besu_c::action() { } void daNpc_Besu_c::beforeMove() { - fopAcM_OffStatus(this, 0x08000000U); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, 0x08000000U); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw) { @@ -3069,18 +3069,18 @@ static actor_method_class daNpc_Besu_MethodTable = { }; actor_process_profile_definition g_profile_NPC_BESU = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_BESU, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Besu_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 323, // mPriority - &daNpc_Besu_MethodTable, // sub_method - 0x00040108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BESU_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Besu_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_BESU_e, + /* Actor SubMtd */ &daNpc_Besu_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_blue_ns.cpp b/src/d/actor/d_a_npc_blue_ns.cpp index 7f2de16d50..1a90f4542d 100644 --- a/src/d/actor/d_a_npc_blue_ns.cpp +++ b/src/d/actor/d_a_npc_blue_ns.cpp @@ -305,9 +305,9 @@ void daNpcBlueNS_c::callEvt_changeYami() { fpc_ProcID daNpcBlueNS_c::create_Yamijin(int param_0) { static const s16 sNameYami[] = { - PROC_NPC_YAMIS, - PROC_NPC_YAMID, - PROC_NPC_YAMIT, + fpcNm_NPC_YAMIS_e, + fpcNm_NPC_YAMID_e, + fpcNm_NPC_YAMIT_e, }; int var_r30 = mType / 3; @@ -509,7 +509,7 @@ void* daNpcBlueNS_c::_search_Tag(void* i_actor, void* i_data) { return NULL; } - if (fopAcM_GetName(i_actor) == PROC_TAG_YAMI && ((daNpcBlueNS_c*)i_data)->_chk_TagPrm((fopAc_ac_c*)i_actor)) { + if (fopAcM_GetName(i_actor) == fpcNm_TAG_YAMI_e && ((daNpcBlueNS_c*)i_data)->_chk_TagPrm((fopAc_ac_c*)i_actor)) { return i_actor; } @@ -525,7 +525,7 @@ void* daNpcBlueNS_c::_search_HollyBall_Y(void* i_actor, void* i_data) { return NULL; } - if (fopAcM_GetName(i_actor) != PROC_Obj_Carry) { + if (fopAcM_GetName(i_actor) != fpcNm_Obj_Carry_e) { return NULL; } @@ -549,7 +549,7 @@ void* daNpcBlueNS_c::_search_HollyBall_G(void* i_actor, void* i_data) { return NULL; } - if (fopAcM_GetName(i_actor) != PROC_Obj_Carry) { + if (fopAcM_GetName(i_actor) != fpcNm_Obj_Carry_e) { return NULL; } @@ -1428,18 +1428,18 @@ static actor_method_class daNpcBlueNS_MethodTable = { }; actor_process_profile_definition g_profile_NPC_BLUENS = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_BLUENS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcBlueNS_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 318, // mPriority - &daNpcBlueNS_MethodTable, // sub_method - 0x08044180, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BLUENS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcBlueNS_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_BLUENS_e, + /* Actor SubMtd */ &daNpcBlueNS_MethodTable, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_bou.cpp b/src/d/actor/d_a_npc_bou.cpp index ffe2b8bc60..f5b94392e5 100644 --- a/src/d/actor/d_a_npc_bou.cpp +++ b/src/d/actor/d_a_npc_bou.cpp @@ -314,7 +314,7 @@ int daNpc_Bou_c::ctrlJointCallBack(J3DJoint* param_0, int param_1) { void* daNpc_Bou_c::srchCow(void* arg0, void* arg1) { if (mFindCount < 50 && arg0 != NULL && arg0 != arg1) { - if (fopAcM_IsExecuting(fopAcM_GetID(arg0)) && fopAcM_GetName(arg0) == PROC_COW) { + if (fopAcM_IsExecuting(fopAcM_GetID(arg0)) && fopAcM_GetName(arg0) == fpcNm_COW_e) { mFindActorPtrs[mFindCount] = (fopAc_ac_c*)arg0; mFindCount++; } @@ -652,9 +652,9 @@ void daNpc_Bou_c::action() { } void daNpc_Bou_c::beforeMove() { - fopAcM_OffStatus(this, 0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw != 0) { @@ -1674,18 +1674,18 @@ static actor_method_class daNpc_Bou_MethodTable = { }; actor_process_profile_definition g_profile_NPC_BOU = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_BOU, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Bou_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 324, // mPriority - &daNpc_Bou_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BOU_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Bou_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_BOU_e, + /* Actor SubMtd */ &daNpc_Bou_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_bouS.cpp b/src/d/actor/d_a_npc_bouS.cpp index e2111e87a6..66a1cf02bc 100644 --- a/src/d/actor/d_a_npc_bouS.cpp +++ b/src/d/actor/d_a_npc_bouS.cpp @@ -673,7 +673,7 @@ BOOL daNpcBouS_c::setAction(actionFunc action) { static void* s_sub(void* i_actor, void* i_data) { if ( - fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Tag_Instruction && + fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Tag_Instruction_e && ((daNpcBouS_c*)i_data)->checkInstructionTag((fopAc_ac_c*)i_actor) ) { return i_actor; @@ -1035,7 +1035,7 @@ bool daNpcBouS_c::wait(void* param_1) { } } - if (!checkItemGet(fpcNm_ITEM_HVY_BOOTS, 1) && dComIfGs_isTbox(2)) { + if (!checkItemGet(dItemNo_HVY_BOOTS_e, 1) && dComIfGs_isTbox(2)) { mForcibleTalk = 1; } @@ -1143,7 +1143,7 @@ bool daNpcBouS_c::talk(void* param_1) { if (itemNo == 1) { setAction(&daNpcBouS_c::instruction); } else { - parentActorID = fopAcM_createChild(PROC_NPC_WRESTLER, fopAcM_GetID(this), + parentActorID = fopAcM_createChild(fpcNm_NPC_WRESTLER_e, fopAcM_GetID(this), (itemNo << 24) | (getArenaNo() | 0x700), &l_createPos, fopAcM_GetRoomNo(this), NULL, NULL, getType(), NULL); setAngle(home.angle.y); @@ -1291,7 +1291,7 @@ bool daNpcBouS_c::instruction(void* param_1) { case 2: if (talkProc(NULL, TRUE, NULL)) { mActorMngrs[0].entry(daPy_getPlayerActorClass()); - parentActorID = fopAcM_createChild(PROC_NPC_WRESTLER, fopAcM_GetID(this), + parentActorID = fopAcM_createChild(fpcNm_NPC_WRESTLER_e, fopAcM_GetID(this), getArenaNo() | 0x700 | 0x2000000, &l_createPos, fopAcM_GetRoomNo(this), NULL, NULL, getType(), NULL); mInstructionMode++; @@ -1556,7 +1556,7 @@ int daNpcBouS_c::EvCut_BousIntroSumo3(int i_staffId) { if (itemNo == 1) { setAction((&daNpcBouS_c::instruction)); } else { - parentActorID = fopAcM_createChild(PROC_NPC_WRESTLER, fopAcM_GetID(this), + parentActorID = fopAcM_createChild(fpcNm_NPC_WRESTLER_e, fopAcM_GetID(this), (itemNo << 24) | (getArenaNo() | 0x700), &l_createPos, fopAcM_GetRoomNo(this), NULL, NULL, getType(), NULL); setAngle(home.angle.y); @@ -1625,18 +1625,18 @@ static actor_method_class daNpcBouS_MethodTable = { }; actor_process_profile_definition g_profile_NPC_BOU_S = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_BOU_S, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcBouS_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 325, // mPriority - &daNpcBouS_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BOU_S_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcBouS_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_BOU_S_e, + /* Actor SubMtd */ &daNpcBouS_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_cd2.cpp b/src/d/actor/d_a_npc_cd2.cpp index c54f72fab4..cf3f07ef10 100644 --- a/src/d/actor/d_a_npc_cd2.cpp +++ b/src/d/actor/d_a_npc_cd2.cpp @@ -1088,12 +1088,12 @@ int PathTrace_c::decIndex(int param_1) { static void* s_sub(void* param_1, void* param_2) { if (fopAcM_IsActor(param_1) && - ((fopAcM_GetName(param_1) == PROC_ALINK && !dKy_darkworld_check()) || - fopAcM_GetName(param_1) == PROC_NPC_CD3 || fopAcM_GetName(param_1) == PROC_NPC_PASSER || - fopAcM_GetName(param_1) == PROC_NPC_GUARD || fopAcM_GetName(param_1) == PROC_NPC_FGUARD || - fopAcM_GetName(param_1) == PROC_NPC_SHOE || fopAcM_GetName(param_1) == PROC_NPC_KASIHANA || - fopAcM_GetName(param_1) == PROC_NPC_KASIKYU || - fopAcM_GetName(param_1) == PROC_NPC_KASIMICH)) + ((fopAcM_GetName(param_1) == fpcNm_ALINK_e && !dKy_darkworld_check()) || + fopAcM_GetName(param_1) == fpcNm_NPC_CD3_e || fopAcM_GetName(param_1) == fpcNm_NPC_PASSER_e || + fopAcM_GetName(param_1) == fpcNm_NPC_GUARD_e || fopAcM_GetName(param_1) == fpcNm_NPC_FGUARD_e || + fopAcM_GetName(param_1) == fpcNm_NPC_SHOE_e || fopAcM_GetName(param_1) == fpcNm_NPC_KASIHANA_e || + fopAcM_GetName(param_1) == fpcNm_NPC_KASIKYU_e || + fopAcM_GetName(param_1) == fpcNm_NPC_KASIMICH_e)) { static_cast(param_2)->checkObstacleSub((fopAc_ac_c*)param_1); } diff --git a/src/d/actor/d_a_npc_cdn3.cpp b/src/d/actor/d_a_npc_cdn3.cpp index ff0e484c8d..8d63fa1347 100644 --- a/src/d/actor/d_a_npc_cdn3.cpp +++ b/src/d/actor/d_a_npc_cdn3.cpp @@ -368,231 +368,80 @@ void daNpcCdn3_c::initEscape() { dComIfGs_onSaveDunSwitch(0x3c); } -daNpcCdn3_c::seqFunc* daNpcCdn3_c::m_funcTbl[44] = { - m_seq00_funcTbl, m_seq01_funcTbl, - m_seq02_funcTbl, m_seq03_funcTbl, - m_seq04_funcTbl, m_seq05_funcTbl, - m_seq06_funcTbl, m_seq07_funcTbl, - m_seq08_funcTbl, m_seq09_funcTbl, - m_seq10_funcTbl, m_seq11_funcTbl, - m_seq12_funcTbl, m_seq13_funcTbl, - m_seq14_funcTbl, m_seq15_funcTbl, - m_seq16_funcTbl, m_seq17_funcTbl, - m_seq18_funcTbl, m_seq19_funcTbl, - m_seq20_funcTbl, m_seq21_funcTbl, - m_seq22_funcTbl, m_seq23_funcTbl, - m_seq24_funcTbl, m_seq25_funcTbl, - m_seq26_funcTbl, m_seq27_funcTbl, - m_seq28_funcTbl, m_seq29_funcTbl, - m_seq30_funcTbl, m_seq31_funcTbl, - m_seq32_funcTbl, m_seq33_funcTbl, - m_seq34_funcTbl, m_seq35_funcTbl, - m_seq36_funcTbl, m_seq37_funcTbl, - m_seq38_funcTbl, m_seq39_funcTbl, - m_seq40_funcTbl, m_seq41_funcTbl, - m_seq42_funcTbl, m_seq43_funcTbl, -}; +inline int daNpcCdn3_c::create() { + fopAcM_ct(this, daNpcCdn3_c); + mIsDarkWorld = dKy_darkworld_check(); + m_type = getType(); + mObjNum = getObjNum(); + m_seqNum = getSeqNum(); + mFlowNodeNum = getFlowNodeNum(); + if (m_seqNum < 0 || 44 <= m_seqNum) { + // "Castle town townspeople map tool setting error + // Argument 1 motion sequence = %d is abnormal" + OSReport_Error("城下町の町人 マップツール設定値異常 引数1モーションシーケンス=%dが異常です。\n", m_seqNum); + JUT_ASSERT(175, FALSE); + } + int rv = loadResrc(m_type, mObjNum); + if (rv == cPhs_COMPLEATE_e) { + int heapSize = 0x2890; +#if DEBUG + heapSize |= fopAcM::HeapSkipMargin; +#else + heapSize |= 0x80000000; +#endif + if (fopAcM_entrySolidHeap(this, createHeapCallBack, heapSize) == 0) { + // "Actor creation failed!" + OS_REPORT("アクター生成失敗しました！\n"); + return cPhs_ERROR_e; + } + create_init(); + } + return rv; +} -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq00_funcTbl[2] = {&daNpcCdn3_c::walka, NULL}; +inline void daNpcCdn3_c::create_init() { +#if DEBUG + // "NPC(C class,D class)HighPoly" + l_Cd2_HIO.entryHIO("NPC(C級,D級)HighPoly"); +#endif -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq01_funcTbl[2] = {&daNpcCdn3_c::runa, NULL}; + gravity = -3.0f; + initTimeSchedule(); + fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + fopAcM_setCullSizeBox(this, -40.0f, -10.0f, -40.0f, 40.0f, 190.0f, 40.0f); + mAcchCir.SetWall(Cd2_HIO_chkWallH(m_type), Cd2_HIO_chkWallR(m_type)); + mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, + fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this)); + mAcch.SetRoofNone(); + mAcch.SetWaterNone(); + mAcch.CrrPos(dComIfG_Bgsp()); + setEnvTevCol(); + setRoomNo(); + initCollision(); + if (strcmp(dComIfGp_getStartStageName(), "F_SP116") == 0 && + dComIfGp_getStartStageRoomNo() == 3 && getType() == 7) + { + attention_info.distances[fopAc_attn_SPEAK_e] = 0xda; + attention_info.distances[fopAc_attn_TALK_e] = 0xda; + } else { + attention_info.distances[fopAc_attn_SPEAK_e] = 0xd9; + attention_info.distances[fopAc_attn_TALK_e] = 0xd9; + } -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq02_funcTbl[2] = {&daNpcCdn3_c::waita, NULL}; + if (isInShop()) { + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); + } -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq03_funcTbl[2] = {&daNpcCdn3_c::talka, NULL}; + if (m_path.setPath(getPathID(), fopAcM_GetRoomNo(this), 1, ¤t.pos, false)) { + setAction(MODE_PATH); + } else { + setAction(MODE_WAIT); + } -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq04_funcTbl[2] = {&daNpcCdn3_c::runb, NULL}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq05_funcTbl[4] = {&daNpcCdn3_c::turnr, &daNpcCdn3_c::waita, - &daNpcCdn3_c::talka, NULL}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq06_funcTbl[4] = {&daNpcCdn3_c::turnl, &daNpcCdn3_c::waita, - &daNpcCdn3_c::talka, NULL}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq07_funcTbl[2] = {&daNpcCdn3_c::waitwall, NULL}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq08_funcTbl[7] = { - &daNpcCdn3_c::talkwall, - &daNpcCdn3_c::waitwall, - &daNpcCdn3_c::talkbwall, - &daNpcCdn3_c::waitwall, - &daNpcCdn3_c::talkwall, - &daNpcCdn3_c::talkbwall, - NULL, -}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq09_funcTbl[2] = {&daNpcCdn3_c::talkb, NULL}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq10_funcTbl[2] = {&daNpcCdn3_c::talkc, NULL}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq11_funcTbl[6] = {&daNpcCdn3_c::talka, &daNpcCdn3_c::waita, - &daNpcCdn3_c::talkb, &daNpcCdn3_c::waitb, - &daNpcCdn3_c::talkc, NULL}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq12_funcTbl[2] = {&daNpcCdn3_c::waitb, NULL}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq13_funcTbl[6] = { - &daNpcCdn3_c::browsea, &daNpcCdn3_c::browseb, &daNpcCdn3_c::talka, - &daNpcCdn3_c::talkb, &daNpcCdn3_c::waita, NULL}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq14_funcTbl[2] = {&daNpcCdn3_c::walkb, NULL}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq15_funcTbl[2] = {&daNpcCdn3_c::sitwaita, NULL}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq16_funcTbl[7] = { - &daNpcCdn3_c::sittalka, - &daNpcCdn3_c::sitwaita, - &daNpcCdn3_c::sittalkab, - &daNpcCdn3_c::sitwaita, - &daNpcCdn3_c::sittalka, - &daNpcCdn3_c::sittalkab, - NULL, -}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq17_funcTbl[2] = { - &daNpcCdn3_c::playm, - NULL, -}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq18_funcTbl[2] = {&daNpcCdn3_c::sitwaitb, NULL}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq19_funcTbl[7] = { - &daNpcCdn3_c::sittalkb, - &daNpcCdn3_c::sitwaitb, - &daNpcCdn3_c::sittalkbb, - &daNpcCdn3_c::sitwaitb, - &daNpcCdn3_c::sittalkb, - &daNpcCdn3_c::sittalkbb, - NULL, -}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq20_funcTbl[2] = {&daNpcCdn3_c::looka, NULL}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq21_funcTbl[2] = {&daNpcCdn3_c::lookb, NULL}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq22_funcTbl[4] = {&daNpcCdn3_c::looka, &daNpcCdn3_c::lookb, - &daNpcCdn3_c::waita, NULL}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq23_funcTbl[7] = { - &daNpcCdn3_c::talka, - &daNpcCdn3_c::waita, - &daNpcCdn3_c::talkb, - &daNpcCdn3_c::waita, - &daNpcCdn3_c::talka, - &daNpcCdn3_c::talkb, - NULL, -}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq24_funcTbl[5] = { - &daNpcCdn3_c::talkb, &daNpcCdn3_c::talka, &daNpcCdn3_c::talkc, &daNpcCdn3_c::waita, NULL, -}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq25_funcTbl[7] = { - &daNpcCdn3_c::browsea, - &daNpcCdn3_c::browseb, - &daNpcCdn3_c::talka, - &daNpcCdn3_c::talkb, - &daNpcCdn3_c::talkc, - &daNpcCdn3_c::waita, - NULL, -}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq26_funcTbl[3] = { - &daNpcCdn3_c::browsea, - &daNpcCdn3_c::browseb, - NULL, -}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq27_funcTbl[2] = {&daNpcCdn3_c::dance, NULL}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq28_funcTbl[3] = { - &daNpcCdn3_c::ladytalka, - &daNpcCdn3_c::normtalka, - NULL, -}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq29_funcTbl[3] = { - &daNpcCdn3_c::ladytalkb, - &daNpcCdn3_c::normtalkb, - NULL, -}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq30_funcTbl[6] = { - &daNpcCdn3_c::talka, &daNpcCdn3_c::ladytalka, &daNpcCdn3_c::waita, - &daNpcCdn3_c::talkb, &daNpcCdn3_c::waita, NULL, -}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq31_funcTbl[6] = { - &daNpcCdn3_c::waita, &daNpcCdn3_c::ladytalkb, &daNpcCdn3_c::talka, - &daNpcCdn3_c::waita, &daNpcCdn3_c::talkb, NULL, -}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq32_funcTbl[7] = { - &daNpcCdn3_c::talka, - &daNpcCdn3_c::ladytalka, - &daNpcCdn3_c::waita, - &daNpcCdn3_c::talkb, - &daNpcCdn3_c::waita, - &daNpcCdn3_c::normtalka, - NULL, -}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq33_funcTbl[7] = { - &daNpcCdn3_c::waita, - &daNpcCdn3_c::ladytalkb, - &daNpcCdn3_c::talka, - &daNpcCdn3_c::waita, - &daNpcCdn3_c::talkb, - &daNpcCdn3_c::normtalkb, - NULL, -}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq34_funcTbl[9] = { - &daNpcCdn3_c::talka, &daNpcCdn3_c::ladytalka, &daNpcCdn3_c::ladytalkb, - &daNpcCdn3_c::waita, &daNpcCdn3_c::talkb, &daNpcCdn3_c::waita, - &daNpcCdn3_c::normtalka, &daNpcCdn3_c::normtalkb, NULL, -}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq35_funcTbl[2] = { - &daNpcCdn3_c::sellme, - NULL, -}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq36_funcTbl[4] = { - &daNpcCdn3_c::ladytalkb, - &daNpcCdn3_c::talka, - &daNpcCdn3_c::waita, - NULL, -}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq37_funcTbl[2] = { - &daNpcCdn3_c::sing, NULL, -}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq38_funcTbl[2] = { - &daNpcCdn3_c::sittalka, NULL, -}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq39_funcTbl[2] = { - &daNpcCdn3_c::sittalkab, NULL, -}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq40_funcTbl[3] = { - &daNpcCdn3_c::sittalka, &daNpcCdn3_c::sittalkab, NULL, -}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq41_funcTbl[2] = { - &daNpcCdn3_c::sittalkb, NULL, -}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq42_funcTbl[2] = { - &daNpcCdn3_c::sittalkbb, NULL, - -}; - -daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq43_funcTbl[3] = { - &daNpcCdn3_c::sittalkb, &daNpcCdn3_c::sittalkbb, NULL, -}; + mpMorf->setMorf(0.0f); + field_0xb64 = current.pos.y = mAcch.GetGroundH(); + setMtx(); +} void daNpcCdn3_c::executeEscape() { if (field_0xb68 == 0) { @@ -834,7 +683,7 @@ int daNpcCdn3_c::ctrlMsgAnm() { } static void* s_sub1(void* param_1, void* param_2) { - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Tag_Schedule && + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_Tag_Schedule_e && static_cast(param_2)->searchNextScheduleTagSub( static_cast(param_1))) { @@ -872,7 +721,7 @@ bool daNpcCdn3_c::searchNextScheduleTagSub(fopAc_ac_c* param_1) { } static void* s_sub2(void* param_1, void* param_2) { - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Tag_Schedule && + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_Tag_Schedule_e && static_cast(param_2)->searchFirstScheduleTagSub( static_cast(param_1))) { @@ -1005,11 +854,19 @@ void daNpcCdn3_c::setSchedule(daTagSchedule_c* param_1) { } inline bool daNpcCdn3_c::isInShop() { - u8 rv = FALSE; - if (strcmp(dComIfGp_getStartStageName(), "R_SP160") == 0 && dComIfG_play_c::getLayerNo(0) <= 1) { - rv = TRUE; + return (bool)(strcmp(dComIfGp_getStartStageName(), "R_SP160") == 0 && dComIfG_play_c::getLayerNo(0) <= 1); +} + +inline bool daNpcCdn3_c::isOrchestra() { + if (strcmp(dComIfGp_getStartStageName(), "F_SP116") != 0) { + return false; + } else if (m_seqNum == 17 && (getType() == 4 || getType() == 5 || getType() == 6 || getType() == 16)) { + return true; + } else if (m_seqNum == 37 && getType() == 7) { + return true; + } else { + return false; } - return rv; } bool daNpcCdn3_c::isChairStyle() { @@ -1456,74 +1313,6 @@ int daNpcCdn3_c::sing(void* param_0) { return field_0xaa0 == 0; } -int daNpcCdn3_c::create() { - fopAcM_ct(this, daNpcCdn3_c); - mIsDarkWorld = dKy_darkworld_check(); - m_type = getType(); - mObjNum = getObjNum(); - m_seqNum = getSeqNum(); - mFlowNodeNum = getFlowNodeNum(); - if (m_seqNum < 0 || 44 <= m_seqNum) { - OSReport_Error("城下町の町人 マップツール設定値異常 引数1モーションシーケンス=%dが異常です。\n", m_seqNum); - JUT_ASSERT(175, FALSE); - } - int rv = loadResrc(m_type, mObjNum); - if (rv == cPhs_COMPLEATE_e) { - int msb = 0x80000000; - int heapSize = 0x2890; - heapSize |= msb; - if (fopAcM_entrySolidHeap(this, createHeapCallBack, heapSize) == 0) { - OS_REPORT("アクター生成失敗しました！\n"); - return cPhs_ERROR_e; - } - create_init(); - } - return rv; -} - -void daNpcCdn3_c::create_init() { -#if DEBUG - l_Cd2_HIO.entryHIO("NPC(C級,D級)HighPoly"); -#endif - - gravity = -3.0f; - initTimeSchedule(); - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); - fopAcM_setCullSizeBox(this, -40.0f, -10.0f, -40.0f, 40.0f, 190.0f, 40.0f); - mAcchCir.SetWall(Cd2_HIO_chkWallH(m_type), Cd2_HIO_chkWallR(m_type)); - mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, - fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this)); - mAcch.SetRoofNone(); - mAcch.SetWaterNone(); - mAcch.CrrPos(dComIfG_Bgsp()); - setEnvTevCol(); - setRoomNo(); - initCollision(); - if (strcmp(dComIfGp_getStartStageName(), "F_SP116") == 0 && - dComIfGp_getStartStageRoomNo() == 3 && getType() == 7) - { - attention_info.distances[fopAc_attn_SPEAK_e] = 0xda; - attention_info.distances[fopAc_attn_TALK_e] = 0xda; - } else { - attention_info.distances[fopAc_attn_SPEAK_e] = 0xd9; - attention_info.distances[fopAc_attn_TALK_e] = 0xd9; - } - - if (isInShop()) { - fopAcM_OnStatus(this, 0x4000); - } - - if (m_path.setPath(getPathID(), fopAcM_GetRoomNo(this), 1, ¤t.pos, false)) { - setAction(MODE_PATH); - } else { - setAction(MODE_WAIT); - } - - mpMorf->setMorf(0.0f); - field_0xb64 = current.pos.y = mAcch.GetGroundH(); - setMtx(); -} - void daNpcCdn3_c::setMtx() { mDoMtx_stack_c::transS(current.pos.x, field_0xb64, current.pos.z); mDoMtx_stack_c::YrotM(shape_angle.y); @@ -1589,9 +1378,9 @@ int daNpcCdn3_c::execute() { mAcchCir.SetWallR(Cd2_HIO_chkWallR(m_type)); checkTimeSchedule(); if (field_0xb95 != 0) { - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } else { - fopAcM_OffStatus(this, 0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); } if (field_0xb95 != 0) { if (!mIsDarkWorld && daPy_py_c::checkNowWolf()) { @@ -1711,6 +1500,232 @@ inline int daNpcCdn3_c::draw() { return 1; } +daNpcCdn3_c::seqFunc* daNpcCdn3_c::m_funcTbl[44] = { + m_seq00_funcTbl, m_seq01_funcTbl, + m_seq02_funcTbl, m_seq03_funcTbl, + m_seq04_funcTbl, m_seq05_funcTbl, + m_seq06_funcTbl, m_seq07_funcTbl, + m_seq08_funcTbl, m_seq09_funcTbl, + m_seq10_funcTbl, m_seq11_funcTbl, + m_seq12_funcTbl, m_seq13_funcTbl, + m_seq14_funcTbl, m_seq15_funcTbl, + m_seq16_funcTbl, m_seq17_funcTbl, + m_seq18_funcTbl, m_seq19_funcTbl, + m_seq20_funcTbl, m_seq21_funcTbl, + m_seq22_funcTbl, m_seq23_funcTbl, + m_seq24_funcTbl, m_seq25_funcTbl, + m_seq26_funcTbl, m_seq27_funcTbl, + m_seq28_funcTbl, m_seq29_funcTbl, + m_seq30_funcTbl, m_seq31_funcTbl, + m_seq32_funcTbl, m_seq33_funcTbl, + m_seq34_funcTbl, m_seq35_funcTbl, + m_seq36_funcTbl, m_seq37_funcTbl, + m_seq38_funcTbl, m_seq39_funcTbl, + m_seq40_funcTbl, m_seq41_funcTbl, + m_seq42_funcTbl, m_seq43_funcTbl, +}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq00_funcTbl[2] = {&daNpcCdn3_c::walka, NULL}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq01_funcTbl[2] = {&daNpcCdn3_c::runa, NULL}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq02_funcTbl[2] = {&daNpcCdn3_c::waita, NULL}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq03_funcTbl[2] = {&daNpcCdn3_c::talka, NULL}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq04_funcTbl[2] = {&daNpcCdn3_c::runb, NULL}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq05_funcTbl[4] = {&daNpcCdn3_c::turnr, &daNpcCdn3_c::waita, + &daNpcCdn3_c::talka, NULL}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq06_funcTbl[4] = {&daNpcCdn3_c::turnl, &daNpcCdn3_c::waita, + &daNpcCdn3_c::talka, NULL}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq07_funcTbl[2] = {&daNpcCdn3_c::waitwall, NULL}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq08_funcTbl[7] = { + &daNpcCdn3_c::talkwall, + &daNpcCdn3_c::waitwall, + &daNpcCdn3_c::talkbwall, + &daNpcCdn3_c::waitwall, + &daNpcCdn3_c::talkwall, + &daNpcCdn3_c::talkbwall, + NULL, +}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq09_funcTbl[2] = {&daNpcCdn3_c::talkb, NULL}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq10_funcTbl[2] = {&daNpcCdn3_c::talkc, NULL}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq11_funcTbl[6] = {&daNpcCdn3_c::talka, &daNpcCdn3_c::waita, + &daNpcCdn3_c::talkb, &daNpcCdn3_c::waitb, + &daNpcCdn3_c::talkc, NULL}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq12_funcTbl[2] = {&daNpcCdn3_c::waitb, NULL}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq13_funcTbl[6] = { + &daNpcCdn3_c::browsea, &daNpcCdn3_c::browseb, &daNpcCdn3_c::talka, + &daNpcCdn3_c::talkb, &daNpcCdn3_c::waita, NULL}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq14_funcTbl[2] = {&daNpcCdn3_c::walkb, NULL}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq15_funcTbl[2] = {&daNpcCdn3_c::sitwaita, NULL}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq16_funcTbl[7] = { + &daNpcCdn3_c::sittalka, + &daNpcCdn3_c::sitwaita, + &daNpcCdn3_c::sittalkab, + &daNpcCdn3_c::sitwaita, + &daNpcCdn3_c::sittalka, + &daNpcCdn3_c::sittalkab, + NULL, +}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq17_funcTbl[2] = { + &daNpcCdn3_c::playm, + NULL, +}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq18_funcTbl[2] = {&daNpcCdn3_c::sitwaitb, NULL}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq19_funcTbl[7] = { + &daNpcCdn3_c::sittalkb, + &daNpcCdn3_c::sitwaitb, + &daNpcCdn3_c::sittalkbb, + &daNpcCdn3_c::sitwaitb, + &daNpcCdn3_c::sittalkb, + &daNpcCdn3_c::sittalkbb, + NULL, +}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq20_funcTbl[2] = {&daNpcCdn3_c::looka, NULL}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq21_funcTbl[2] = {&daNpcCdn3_c::lookb, NULL}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq22_funcTbl[4] = {&daNpcCdn3_c::looka, &daNpcCdn3_c::lookb, + &daNpcCdn3_c::waita, NULL}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq23_funcTbl[7] = { + &daNpcCdn3_c::talka, + &daNpcCdn3_c::waita, + &daNpcCdn3_c::talkb, + &daNpcCdn3_c::waita, + &daNpcCdn3_c::talka, + &daNpcCdn3_c::talkb, + NULL, +}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq24_funcTbl[5] = { + &daNpcCdn3_c::talkb, &daNpcCdn3_c::talka, &daNpcCdn3_c::talkc, &daNpcCdn3_c::waita, NULL, +}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq25_funcTbl[7] = { + &daNpcCdn3_c::browsea, + &daNpcCdn3_c::browseb, + &daNpcCdn3_c::talka, + &daNpcCdn3_c::talkb, + &daNpcCdn3_c::talkc, + &daNpcCdn3_c::waita, + NULL, +}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq26_funcTbl[3] = { + &daNpcCdn3_c::browsea, + &daNpcCdn3_c::browseb, + NULL, +}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq27_funcTbl[2] = {&daNpcCdn3_c::dance, NULL}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq28_funcTbl[3] = { + &daNpcCdn3_c::ladytalka, + &daNpcCdn3_c::normtalka, + NULL, +}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq29_funcTbl[3] = { + &daNpcCdn3_c::ladytalkb, + &daNpcCdn3_c::normtalkb, + NULL, +}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq30_funcTbl[6] = { + &daNpcCdn3_c::talka, &daNpcCdn3_c::ladytalka, &daNpcCdn3_c::waita, + &daNpcCdn3_c::talkb, &daNpcCdn3_c::waita, NULL, +}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq31_funcTbl[6] = { + &daNpcCdn3_c::waita, &daNpcCdn3_c::ladytalkb, &daNpcCdn3_c::talka, + &daNpcCdn3_c::waita, &daNpcCdn3_c::talkb, NULL, +}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq32_funcTbl[7] = { + &daNpcCdn3_c::talka, + &daNpcCdn3_c::ladytalka, + &daNpcCdn3_c::waita, + &daNpcCdn3_c::talkb, + &daNpcCdn3_c::waita, + &daNpcCdn3_c::normtalka, + NULL, +}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq33_funcTbl[7] = { + &daNpcCdn3_c::waita, + &daNpcCdn3_c::ladytalkb, + &daNpcCdn3_c::talka, + &daNpcCdn3_c::waita, + &daNpcCdn3_c::talkb, + &daNpcCdn3_c::normtalkb, + NULL, +}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq34_funcTbl[9] = { + &daNpcCdn3_c::talka, &daNpcCdn3_c::ladytalka, &daNpcCdn3_c::ladytalkb, + &daNpcCdn3_c::waita, &daNpcCdn3_c::talkb, &daNpcCdn3_c::waita, + &daNpcCdn3_c::normtalka, &daNpcCdn3_c::normtalkb, NULL, +}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq35_funcTbl[2] = { + &daNpcCdn3_c::sellme, + NULL, +}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq36_funcTbl[4] = { + &daNpcCdn3_c::ladytalkb, + &daNpcCdn3_c::talka, + &daNpcCdn3_c::waita, + NULL, +}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq37_funcTbl[2] = { + &daNpcCdn3_c::sing, NULL, +}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq38_funcTbl[2] = { + &daNpcCdn3_c::sittalka, NULL, +}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq39_funcTbl[2] = { + &daNpcCdn3_c::sittalkab, NULL, +}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq40_funcTbl[3] = { + &daNpcCdn3_c::sittalka, &daNpcCdn3_c::sittalkab, NULL, +}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq41_funcTbl[2] = { + &daNpcCdn3_c::sittalkb, NULL, +}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq42_funcTbl[2] = { + &daNpcCdn3_c::sittalkbb, NULL, + +}; + +daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq43_funcTbl[3] = { + &daNpcCdn3_c::sittalkb, &daNpcCdn3_c::sittalkbb, NULL, +}; + static int daNpcCdn3_Create(void* i_this) { return static_cast(i_this)->create(); } @@ -1741,18 +1756,18 @@ static actor_method_class daNpcCdn3_METHODS = { }; actor_process_profile_definition g_profile_NPC_CD3 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_CD3, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcCdn3_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 395, // mPriority - &daNpcCdn3_METHODS, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_CD3_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcCdn3_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_CD3_e, + /* Actor SubMtd */ &daNpcCdn3_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_chat.cpp b/src/d/actor/d_a_npc_chat.cpp index 5722ef257c..8a963d2497 100644 --- a/src/d/actor/d_a_npc_chat.cpp +++ b/src/d/actor/d_a_npc_chat.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_chat.cpp - * + * */ #include "d/dolzel_rel.h" @@ -1408,7 +1408,7 @@ static jntTblMPrm a_jntTbl_M[16] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, -0.3f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, -0x0014, 0, 0, @@ -1430,7 +1430,7 @@ static jntTblMPrm a_jntTbl_M[16] = { 0.0f, 0.0f, 0.0f, 0, -0x000A, 0xB, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 1, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1452,7 +1452,7 @@ static jntTblMPrm a_jntTbl_M[16] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1474,7 +1474,7 @@ static jntTblMPrm a_jntTbl_M[16] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1496,7 +1496,7 @@ static jntTblMPrm a_jntTbl_M[16] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1518,7 +1518,7 @@ static jntTblMPrm a_jntTbl_M[16] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1540,7 +1540,7 @@ static jntTblMPrm a_jntTbl_M[16] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1562,7 +1562,7 @@ static jntTblMPrm a_jntTbl_M[16] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1584,7 +1584,7 @@ static jntTblMPrm a_jntTbl_M[16] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, -0.3f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, -0x0014, 0, 0, @@ -1606,7 +1606,7 @@ static jntTblMPrm a_jntTbl_M[16] = { 0.0f, 0.0f, 0.0f, 0, -0x000A, 0xB, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 1, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1628,7 +1628,7 @@ static jntTblMPrm a_jntTbl_M[16] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1650,7 +1650,7 @@ static jntTblMPrm a_jntTbl_M[16] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1672,7 +1672,7 @@ static jntTblMPrm a_jntTbl_M[16] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1826,7 +1826,7 @@ static jntTblWPrm a_jntTbl_W[14] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1850,7 +1850,7 @@ static jntTblWPrm a_jntTbl_W[14] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1874,7 +1874,7 @@ static jntTblWPrm a_jntTbl_W[14] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, -0.3f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, -0x0014, 0, 0, @@ -1898,7 +1898,7 @@ static jntTblWPrm a_jntTbl_W[14] = { 0.0f, 0.0f, 0.0f, 0, 0, 1, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1922,7 +1922,7 @@ static jntTblWPrm a_jntTbl_W[14] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1946,7 +1946,7 @@ static jntTblWPrm a_jntTbl_W[14] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1970,7 +1970,7 @@ static jntTblWPrm a_jntTbl_W[14] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1994,7 +1994,7 @@ static jntTblWPrm a_jntTbl_W[14] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -2018,7 +2018,7 @@ static jntTblWPrm a_jntTbl_W[14] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -2042,7 +2042,7 @@ static jntTblWPrm a_jntTbl_W[14] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, -0.3f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, -0x0014, 0, 0, @@ -2066,7 +2066,7 @@ static jntTblWPrm a_jntTbl_W[14] = { 0.0f, 0.0f, 0.0f, 0, 0, 1, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -2090,7 +2090,7 @@ static jntTblWPrm a_jntTbl_W[14] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -2464,7 +2464,7 @@ J3DModel* daNpcChat_c::ObjCreate(int param_1) { J3DModel* daNpcChat_c::ChairCreate(f32 i_scale) { const char* i_arcName = mTwilight ? "objectTW" : "object"; int i_index = isM_() ? ((mTwilight != 0) ? 4 : 4) : ((mTwilight != 0) ? 5 : 5); - + J3DModelData* a_mdlData_p = (J3DModelData*)dComIfG_getObjectRes(i_arcName, i_index); if (a_mdlData_p != NULL) { J3DModel* model = mDoExt_J3DModel__create(a_mdlData_p, 0x80000, 0x11000084); @@ -2480,7 +2480,7 @@ J3DModel* daNpcChat_c::ChairCreate(f32 i_scale) { return model; } - + return NULL; } @@ -2512,7 +2512,7 @@ cPhs_Step daNpcChat_c::loadResrc(int idx, int param_2) { if (rv != cPhs_COMPLEATE_e) { return rv; } - + if (param_2 != 0 || field_0xe51 == 1) { rv = dComIfG_resLoad(&mPhase3, l_resNameTbl[idx][3]); if (rv != cPhs_COMPLEATE_e) { @@ -2929,7 +2929,7 @@ int daNpcChat_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) { } static void* s_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_CHAT) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_CHAT_e) { ((daNpcChat_c*)i_data)->setTalkMember((daNpcChat_c*)i_actor); } @@ -2941,7 +2941,7 @@ BOOL daNpcChat_c::searchGroup() { case 0: field_0xe38 = 1; return FALSE; - + case 1: fpcM_Search(s_sub, this); int iVar1 = 0; @@ -3036,7 +3036,7 @@ BOOL daNpcChat_c::appearCheck() { if (iVar1 == mTalkMemberNum) { for (int i = 0; i < mTalkMemberNum; i++) { mTalkMembers[i]->offHide(); - fopAcM_OffStatus(mTalkMembers[i], fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(mTalkMembers[i], fopAcStts_UNK_0x8000000_e); } } } @@ -3053,7 +3053,7 @@ BOOL daNpcChat_c::appearCheck() { if (iVar2 == mTalkMemberNum) { for (int i = 0; i < mTalkMemberNum; i++) { mTalkMembers[i]->onHide(); - fopAcM_OnStatus(mTalkMembers[i], fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(mTalkMembers[i], fopAcStts_UNK_0x8000000_e); } } } @@ -3386,7 +3386,7 @@ void daNpcChat_c::setMotionAnm(int i_index, f32 i_morf) { case OBJ_KAGOM: case OBJ_KAGOW: break; - + case OBJ_GUITAR: case OBJ_FLUTE: index = ANM_PLAYM; @@ -3430,7 +3430,7 @@ void daNpcChat_c::setMotionAnm(int i_index, f32 i_morf) { case ANM_2LADYTALK_B: mSound.playVoice(4); break; - + case ANM_SURPRISE: mSound.playVoice(1); break; @@ -3588,7 +3588,7 @@ void daNpcChat_c::reset() { mHide = false; } else { mHide = true; - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } setAction(&daNpcChat_c::wait); @@ -3928,7 +3928,7 @@ bool daNpcChat_c::wait(void* param_1) { setMotion(mTalkMotionNo, -1.0f, 1); mTurnMode = 0; } - + orderEvent(mOrderSpeakEvt, l_evtNames[mOrderEvtNo], 0xFFFF, 0x28, 0xFF, 1); } } @@ -3953,7 +3953,7 @@ bool daNpcChat_c::fear(void* param_1) { dComIfGs_onSaveDunSwitch(60); mMode = 2; break; - + case 2: if (mMotionAnm == ANM_SURPRISE) { if (mAnm_p->isStop()) { @@ -4002,7 +4002,7 @@ bool daNpcChat_c::talk(void* param_1) { mMode = 2; break; - + case 2: if (mLookPlayerCheck == 1) { if (mCurAngle.y == fopAcM_searchPlayerAngleY(this)) { @@ -4012,7 +4012,7 @@ bool daNpcChat_c::talk(void* param_1) { } else { int msgTimer, i_expression, i_motion; msgTimer = mMsgTimer; - + if (ctrlMsgAnm(i_expression, i_motion, this, FALSE) != 0) { setMotion(i_motion, -1.0f, 0); } @@ -4076,7 +4076,7 @@ bool daNpcChat_c::demo(void* param_1) { case 0: mMode = 2; break; - + case 2: if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk() == false) { @@ -4144,18 +4144,18 @@ static actor_method_class daNpcChat_MethodTable = { }; actor_process_profile_definition g_profile_NPC_CHAT = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_CHAT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcChat_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 398, // mPriority - &daNpcChat_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_CHAT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcChat_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_CHAT_e, + /* Actor SubMtd */ &daNpcChat_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_chin.cpp b/src/d/actor/d_a_npc_chin.cpp index 86ca857125..bd1a4731d4 100644 --- a/src/d/actor/d_a_npc_chin.cpp +++ b/src/d/actor/d_a_npc_chin.cpp @@ -150,6 +150,9 @@ daNpcChin_HIO_c::daNpcChin_HIO_c() { m = daNpcChin_Param_c::m; } +daNpcChin_HIO_c::~daNpcChin_HIO_c() { +} + void daNpcChin_HIO_c::genMessage(JORMContext* ctx) { daNpcF_commonGenMessage(ctx, &m.common); } @@ -1216,9 +1219,9 @@ bool daNpcChin_c::wait(void* param_0) { u16 eventMask = 0xffff; if (mOrderEvtNo == EVT_CHIN_APPEAR) { - // maybe fakematch? this still doesn't quite match for debug but it's closer + //TODO: maybe fakematch? #if PLATFORM_SHIELD - eventMask = eventMask & 0xff7f; + eventMask &= (u16)~0x80; #else eventMask &= ~0x80; #endif @@ -1360,6 +1363,8 @@ bool daNpcChin_c::demo(void* param_0) { Event_DT(); } + (void)0; + break; } default: { @@ -1434,6 +1439,8 @@ bool daNpcChin_c::watch_game(void* param_0) { } } + (void)0; + break; } default: { @@ -2116,18 +2123,18 @@ static actor_method_class daNpcChin_MethodTable = { }; actor_process_profile_definition g_profile_NPC_CHIN = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_CHIN, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcChin_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 424, // mPriority - &daNpcChin_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType - }; + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_CHIN_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcChin_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_CHIN_e, + /* Actor SubMtd */ &daNpcChin_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/src/d/actor/d_a_npc_clerka.cpp b/src/d/actor/d_a_npc_clerka.cpp index 23393a301b..b127f591c4 100644 --- a/src/d/actor/d_a_npc_clerka.cpp +++ b/src/d/actor/d_a_npc_clerka.cpp @@ -790,18 +790,18 @@ static actor_method_class daNpc_clerkA_MethodTable = { }; actor_process_profile_definition g_profile_NPC_CLERKA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_CLERKA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_clerkA_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 326, // mPriority - &daNpc_clerkA_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_CLERKA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_clerkA_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_CLERKA_e, + /* Actor SubMtd */ &daNpc_clerkA_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_clerkb.cpp b/src/d/actor/d_a_npc_clerkb.cpp index 1a3f1bfade..8b3f89aba6 100644 --- a/src/d/actor/d_a_npc_clerkb.cpp +++ b/src/d/actor/d_a_npc_clerkb.cpp @@ -942,18 +942,18 @@ static actor_method_class daNpc_clerkB_MethodTable = { }; actor_process_profile_definition g_profile_NPC_CLERKB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_CLERKB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_clerkB_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 327, // mPriority - &daNpc_clerkB_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_CLERKB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_clerkB_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_CLERKB_e, + /* Actor SubMtd */ &daNpc_clerkB_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_clerkt.cpp b/src/d/actor/d_a_npc_clerkt.cpp index 8d6f6f7bcf..b15322a6e2 100644 --- a/src/d/actor/d_a_npc_clerkt.cpp +++ b/src/d/actor/d_a_npc_clerkt.cpp @@ -703,18 +703,18 @@ static actor_method_class daNpcClerkt_MethodTable = { }; actor_process_profile_definition g_profile_NPC_CLERKT = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_CLERKT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcClerkT_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 328, // mPriority - &daNpcClerkt_MethodTable, // sub_method - 0x08044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_CLERKT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcClerkT_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_CLERKT_e, + /* Actor SubMtd */ &daNpcClerkt_MethodTable, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_coach.cpp b/src/d/actor/d_a_npc_coach.cpp index 89d1e72112..abd3dac290 100644 --- a/src/d/actor/d_a_npc_coach.cpp +++ b/src/d/actor/d_a_npc_coach.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_coach.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -275,7 +275,7 @@ static int jointCoachCallBack(J3DJoint* i_joint, int param_2) { } static void arrowStickCallBack(dBgW* i_bgw, fopAc_ac_c* a_this, fopAc_ac_c* i_actor, cXyz& i_pos) { - if (fopAcM_GetName(i_actor) == PROC_E_ARROW) { + if (fopAcM_GetName(i_actor) == fpcNm_E_ARROW_e) { if (!daPy_getPlayerActorClass()->checkBoarSingleBattleSecond()) { ((daNpcCoach_c*)a_this)->hitFireArrow(i_pos); fopAcM_delete(i_actor); @@ -294,7 +294,7 @@ void daNpcCoach_c::hitFireArrow(cXyz i_pos) { cXyz work; mDoMtx_stack_c::copy(mChCoach.field_0x598); mDoMtx_stack_c::multVec(&i_pos, &work); - field_0x247c[i] = fopAcM_createChild(PROC_COACH_FIRE, fopAcM_GetID(this), + field_0x247c[i] = fopAcM_createChild(fpcNm_COACH_FIRE_e, fopAcM_GetID(this), 0, &work, fopAcM_GetRoomNo(this), NULL, NULL, -1, NULL); mChCoach.mSound.startSound(Z2SE_COACH_HIT_ARROW, 0, -1); @@ -410,12 +410,12 @@ void daNpcCoach_c::initCoachPosition(Vec& i_pos, SVec& i_angle) { work.set(mChCoach.field_0x5e0.x, mChCoach.field_0x5e0.y + 500.0f, mChCoach.field_0x5e0.z); if (fopAcM_gc_c::gndCheck(&work)) { - mChCoach.field_0x5e0.y = fopAcM_gc_c::getGroundY(); + mChCoach.field_0x5e0.y = fopAcM_gc_c::getGroundY(); } } static void* s_sub(void* i_actor, void* i_data) { - if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_KR && ((e_kr_class*)i_actor)->getId() >= 0) { + if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_KR_e && ((e_kr_class*)i_actor)->getId() >= 0) { return i_actor; } @@ -749,7 +749,7 @@ int daNpcCoach_c::createHeap() { } modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, BMDR_HARNESS); - + JUT_ASSERT(2762, modelData != NULL); mChHarness.mHarnessModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); @@ -775,9 +775,9 @@ int daNpcCoach_c::createHeap() { JUT_ASSERT(2782, FALSE); } - + modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, BMDR_COACH); - + JUT_ASSERT(2787, modelData != NULL); mChCoach.mCoachModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); @@ -807,7 +807,7 @@ int daNpcCoach_c::createHeap() { } modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, BMDR_YELIA); - + JUT_ASSERT(2816, modelData != NULL); mChYelia.mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, BCK_YELIA_WAIT), @@ -948,7 +948,7 @@ void daNpcCoach_c::checkCoachDamage() { ((daCoach2D_c*)fpcM_SearchByID(field_0x2554))->setHitCount((mTotalDmgRecv / (attr().damage_durability / 20))); if (mTotalDmgRecv >= attr().damage_durability) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); mChHorse.field_0x784 = 0.0f; daNpcTheB_c* telmaB_p = (daNpcTheB_c*)fpcM_SearchByID(parentActorID); @@ -1472,7 +1472,7 @@ void daNpcCoach_c::calcHarnessMotion() { void daNpcCoach_c::calcFrontWheelRotate() { if (speedF != 0.0f) { f32 fVar1 = mChHarness.field_0x6ec.absXZ(mChHarness.field_0x6e0); - int dist_ang = cLib_distanceAngleS(mChHarness.field_0x700.y, + int dist_ang = cLib_distanceAngleS(mChHarness.field_0x700.y, cLib_targetAngleY(&mChHarness.field_0x6ec, &mChHarness.field_0x6e0)); f32 fVar2 = (dist_ang < 0x4000) ? fVar1 / 345.5751953125f : -(fVar1 / 345.5751953125f); @@ -1612,9 +1612,9 @@ void daNpcCoach_c::setHorseAnm(int i_index) { if (mChHorse.field_0x788 != i_index) { mChHorse.field_0x788 = i_index; - J3DAnmTransform* anm = (J3DAnmTransform*)(l_horseAnmParam[i_index].field_0x0 >= 0 ? + J3DAnmTransform* anm = (J3DAnmTransform*)(l_horseAnmParam[i_index].field_0x0 >= 0 ? dComIfG_getObjectRes(l_arcName, l_horseAnmParam[i_index].field_0x0) : NULL); - J3DAnmTransform* anm_2 = l_horseAnmParam[i_index].field_0xc >= 0 ? + J3DAnmTransform* anm_2 = l_horseAnmParam[i_index].field_0xc >= 0 ? (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, l_horseAnmParam[i_index].field_0xc) : NULL; f32 frame = mChHorse.mpModelMorf->getFrame(); @@ -2027,7 +2027,7 @@ cPhs_Step daNpcCoach_c::create() { void daNpcCoach_c::create_init() { if (strcmp(dComIfGp_getStartStageName(), "F_SP123") == 0) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } fopAcM_setStageLayer(this); @@ -2099,8 +2099,8 @@ void daNpcCoach_c::create_init() { mDoMtx_stack_c::multVecZero(&i_pos); mDoMtx_MtxToRot(mDoMtx_stack_c::get(), &i_angle); int msg_no = getMessageNo(); - parentActorID = fopAcM_createChild(PROC_NPC_THEB, fopAcM_GetID(this), msg_no, &i_pos, fopAcM_GetRoomNo(this), &i_angle, NULL, -1, NULL); - field_0x2554 = fopAcM_createChild(PROC_COACH2D, fopAcM_GetID(this), 0, ¤t.pos, fopAcM_GetRoomNo(this), NULL, NULL, -1, NULL); + parentActorID = fopAcM_createChild(fpcNm_NPC_THEB_e, fopAcM_GetID(this), msg_no, &i_pos, fopAcM_GetRoomNo(this), &i_angle, NULL, -1, NULL); + field_0x2554 = fopAcM_createChild(fpcNm_COACH2D_e, fopAcM_GetID(this), 0, ¤t.pos, fopAcM_GetRoomNo(this), NULL, NULL, -1, NULL); field_0x2558 = 0; field_0x2559 = 0; @@ -2177,18 +2177,18 @@ static actor_method_class l_daNpcCoach_Method = { }; actor_process_profile_definition g_profile_NPC_COACH = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_COACH, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcCoach_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 330, // mPriority - &l_daNpcCoach_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_COACH_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcCoach_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_COACH_e, + /* Actor SubMtd */ &l_daNpcCoach_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_df.cpp b/src/d/actor/d_a_npc_df.cpp index daba4eb8df..545cb04ff1 100644 --- a/src/d/actor/d_a_npc_df.cpp +++ b/src/d/actor/d_a_npc_df.cpp @@ -250,7 +250,7 @@ static void df_rod(npc_df_class* i_this, df_s* df_p) { cLib_addCalc2(&df_p->field_0x5c, df_p->field_0x60, 0.8f, 0.1f); - npc_henna_class* henna_p = (npc_henna_class*)fopAcM_SearchByName(PROC_NPC_HENNA); + npc_henna_class* henna_p = (npc_henna_class*)fopAcM_SearchByName(fpcNm_NPC_HENNA_e); if (henna_p != NULL) { henna_p->field_0x7b8 = 10; } @@ -305,7 +305,7 @@ static void df_control(npc_df_class* i_this) { } static void* s_rod_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_MG_ROD) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_MG_ROD_e) { return i_actor; } @@ -422,18 +422,18 @@ static actor_method_class l_daNpc_Df_Method = { }; actor_process_profile_definition g_profile_NPC_DF = { - fpcLy_CURRENT_e, // mLayerID - 9, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_DF, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(npc_df_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 439, // mPriority - &l_daNpc_Df_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 9, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_DF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(npc_df_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_DF_e, + /* Actor SubMtd */ &l_daNpc_Df_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_doc.cpp b/src/d/actor/d_a_npc_doc.cpp index 43ec3422d9..c752b5f4c5 100644 --- a/src/d/actor/d_a_npc_doc.cpp +++ b/src/d/actor/d_a_npc_doc.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_doc.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -193,7 +193,7 @@ int daNpc_Doc_c::create() { #endif reset(); - + mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this)); mCcStts.Init(mpHIO->m.common.weight, 0, this); @@ -385,7 +385,7 @@ void daNpc_Doc_c::setParam() { if (daPy_py_c::checkNowWolf()) { attn_flags |= fopAc_AttnFlag_UNK_0x800000; } - + attention_info.flags = attn_flags; scale.set(mpHIO->m.common.scale, mpHIO->m.common.scale, mpHIO->m.common.scale); @@ -409,11 +409,11 @@ BOOL daNpc_Doc_c::checkChangeEvt() { if (dComIfGp_evmng_ChkPresentEnd()) { mPreItemNo = dComIfGp_event_getPreItemNo(); if (mType == 1) { - if (mPreItemNo == fpcNm_ITEM_WOOD_STATUE) { + if (mPreItemNo == dItemNo_WOOD_STATUE_e) { return 0; } - if (!daNpcT_chkEvtBit(0x141) && mPreItemNo == fpcNm_ITEM_BILL) { + if (!daNpcT_chkEvtBit(0x141) && mPreItemNo == dItemNo_BILL_e) { return 0; } } @@ -508,10 +508,10 @@ void daNpc_Doc_c::beforeMove() { } } - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw) { @@ -524,7 +524,7 @@ void daNpc_Doc_c::setAttnPos() { mStagger.calc(FALSE); f32 rad = cM_s2rad((s16)(mCurAngle.y - field_0xd7e.y)); - + mJntAnm.setParam(this, mpMorf[0]->getModel(), &pos, getBackboneJointNo(), getNeckJointNo(), getHeadJointNo(), mpHIO->m.common.body_angleX_min, mpHIO->m.common.body_angleX_max, mpHIO->m.common.body_angleY_min, mpHIO->m.common.body_angleY_max, mpHIO->m.common.head_angleX_min, mpHIO->m.common.head_angleX_max, mpHIO->m.common.head_angleY_min, mpHIO->m.common.head_angleY_max, @@ -756,9 +756,9 @@ int daNpc_Doc_c::talk(void* param_0) { case MODE_ENTER: case MODE_INIT: if (!mStagger.checkStagger()) { - if (mPreItemNo == fpcNm_ITEM_BILL) { + if (mPreItemNo == dItemNo_BILL_e) { initTalk(0x43F, NULL); - } else if (mPreItemNo == fpcNm_ITEM_WOOD_STATUE) { + } else if (mPreItemNo == dItemNo_WOOD_STATUE_e) { initTalk(0x447, NULL); } else { initTalk(mFlowNodeNo, NULL); @@ -786,9 +786,9 @@ int daNpc_Doc_c::talk(void* param_0) { if (mMotionSeqMngr.getNo() != 10 || mMotionSeqMngr.checkEndSequence()) { int sp8[] = {-1, -1}; - if (mPreItemNo == fpcNm_ITEM_BILL) { + if (mPreItemNo == dItemNo_BILL_e) { sp8[0] = 0x1457; - } else if (mPreItemNo == fpcNm_ITEM_WOOD_STATUE) { + } else if (mPreItemNo == dItemNo_WOOD_STATUE_e) { sp8[0] = 0x146E; if (daNpcT_chkEvtBit(0x163)) { sp8[0] = 0x1472; @@ -874,20 +874,20 @@ static actor_method_class daNpc_Doc_MethodTable = { }; actor_process_profile_definition g_profile_NPC_DOC = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_DOC, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Doc_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 335, // mPriority - &daNpc_Doc_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_DOC_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Doc_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_DOC_e, + /* Actor SubMtd */ &daNpc_Doc_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_npc_doorboy.cpp b/src/d/actor/d_a_npc_doorboy.cpp index af2cafb2dd..17ba417cd5 100644 --- a/src/d/actor/d_a_npc_doorboy.cpp +++ b/src/d/actor/d_a_npc_doorboy.cpp @@ -886,18 +886,18 @@ static actor_method_class daNpcDoorBoy_MethodTable = { }; actor_process_profile_definition g_profile_NPC_DOORBOY = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_DOORBOY, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcDoorBoy_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 418, // mPriority - &daNpcDoorBoy_MethodTable, // sub_method - 0x00044187, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_DOORBOY_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcDoorBoy_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_DOORBOY_e, + /* Actor SubMtd */ &daNpcDoorBoy_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_drainSol.cpp b/src/d/actor/d_a_npc_drainSol.cpp index 5002050a83..84fe3c9ca1 100644 --- a/src/d/actor/d_a_npc_drainSol.cpp +++ b/src/d/actor/d_a_npc_drainSol.cpp @@ -466,18 +466,18 @@ static actor_method_class daNpcDrSol_MethodTable = { }; actor_process_profile_definition g_profile_NPC_DRSOL = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_DRSOL, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcDrSol_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 423, // mPriority - &daNpcDrSol_MethodTable, // sub_method - 0x00044187, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_DRSOL_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcDrSol_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_DRSOL_e, + /* Actor SubMtd */ &daNpcDrSol_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_du.cpp b/src/d/actor/d_a_npc_du.cpp index 01358eb4e1..3d2574604a 100644 --- a/src/d/actor/d_a_npc_du.cpp +++ b/src/d/actor/d_a_npc_du.cpp @@ -98,13 +98,15 @@ static void anm_init(npc_du_class* i_this, int i_index, f32 i_morf, u8 i_mode, f static int nodeCallBack(J3DJoint* i_joint, int param_2) { if (param_2 == 0) { - int jntNo = i_joint->getJntNo(); + J3DJoint* joint = i_joint; + int jntNo = joint->getJntNo(); J3DModel* model = j3dSys.getModel(); npc_du_class* actor = (npc_du_class*)model->getUserArea(); + npc_du_class* actor_copy = actor; if (actor != NULL) { if (jntNo == JNT_NECK2) { MTXCopy(model->getAnmMtx(jntNo), *calc_mtx); - + cMtx_XrotM(*calc_mtx, actor->mNeck2XRot); model->setAnmMtx(jntNo, *calc_mtx); @@ -600,8 +602,8 @@ static int daNpc_Du_Delete(npc_du_class* i_this) { return 1; } -static int useHeapInit(fopAc_ac_c* actor) { - npc_du_class* i_this = (npc_du_class*)actor; +static int useHeapInit(fopAc_ac_c* i_actor) { + npc_du_class* i_this = (npc_du_class*)i_actor; i_this->mpMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Npc_Du", 0xA), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("Npc_Du", 6), 0, 1.0f, 0, -1, 1, NULL, @@ -611,7 +613,7 @@ static int useHeapInit(fopAc_ac_c* actor) { } J3DModel* model = i_this->mpMorf->getModel(); - model->setUserArea((uintptr_t)actor); + model->setUserArea((uintptr_t)i_this); for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) { model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack); } @@ -632,45 +634,45 @@ static int useHeapInit(fopAc_ac_c* actor) { return 1; } -static cPhs_Step daNpc_Du_Create(fopAc_ac_c* a_this) { - npc_du_class* i_this = (npc_du_class*)a_this; - fopAcM_ct(a_this, npc_du_class); +static cPhs_Step daNpc_Du_Create(fopAc_ac_c* i_this) { + npc_du_class* du = (npc_du_class*)i_this; + fopAcM_ct(&du->actor, npc_du_class); - cPhs_Step phase = dComIfG_resLoad(&i_this->mPhase, "Npc_Du"); + cPhs_Step phase = dComIfG_resLoad(&du->mPhase, "Npc_Du"); if (phase == cPhs_COMPLEATE_e) { - OS_REPORT("NPC_DU PARAM %x\n", fopAcM_GetParam(a_this)); - i_this->arg0 = fopAcM_GetParam(a_this); - i_this->arg1 = (fopAcM_GetParam(a_this) & 0xFF00) >> 8; - i_this->mMsgFNo = a_this->current.angle.x; - a_this->current.angle.x = a_this->shape_angle.x = 0; + OS_REPORT("NPC_DU PARAM %x\n", fopAcM_GetParam(i_this)); + du->arg0 = fopAcM_GetParam(i_this); + du->arg1 = (fopAcM_GetParam(i_this) & 0xFF00) >> 8; + du->mMsgFNo = i_this->current.angle.x; + i_this->current.angle.x = i_this->shape_angle.x = 0; - if (i_this->arg0 == 1) { - i_this->mMsgFNo = 0x2EF; + if (du->arg0 == 1) { + du->mMsgFNo = 0x2EF; } else { - i_this->mMsgFNo = 0x2F0; + du->mMsgFNo = 0x2F0; } OS_REPORT("NPC_DU//////////////NPC_DU SET 1 !!\n"); - if (!fopAcM_entrySolidHeap(a_this, useHeapInit, 0x1280)) { + if (!fopAcM_entrySolidHeap(i_this, useHeapInit, 0x1280)) { OS_REPORT("//////////////NPC_DU SET NON !!\n"); return cPhs_ERROR_e; } OS_REPORT("//////////////NPC_DU SET 2 !!\n"); if (!hio_set) { - i_this->mIsFirstSpawn = 1; + du->mIsFirstSpawn = 1; hio_set = true; l_HIO.id = mDoHIO_CREATE_CHILD("アヒル", &l_HIO); } - i_this->mAction = ACTION_NORMAL; + du->mAction = ACTION_NORMAL; - fopAcM_SetMtx(a_this, i_this->mpMorf->getModel()->getBaseTRMtx()); - i_this->mBgc.Set(fopAcM_GetPosition_p(a_this), fopAcM_GetOldPosition_p(a_this), a_this, 1, &i_this->mAcchCir, - fopAcM_GetSpeed_p(a_this), NULL, NULL); - i_this->mAcchCir.SetWall(20.0f, 25.0f); - i_this->mStts.Init(100, 0, a_this); + fopAcM_SetMtx(i_this, du->mpMorf->getModel()->getBaseTRMtx()); + du->mBgc.Set(fopAcM_GetPosition_p(i_this), fopAcM_GetOldPosition_p(i_this), i_this, 1, &du->mAcchCir, + fopAcM_GetSpeed_p(i_this), NULL, NULL); + du->mAcchCir.SetWall(20.0f, 25.0f); + du->mStts.Init(100, 0, i_this); static dCcD_SrcSph cc_sph_src = { { @@ -684,11 +686,11 @@ static cPhs_Step daNpc_Du_Create(fopAc_ac_c* a_this) { } // mSphAttr }; - i_this->mSph.Set(cc_sph_src); - i_this->mSph.SetStts(&i_this->mStts); - i_this->mFrameCounter = cM_rndF(65536.0f); - a_this->gravity = -5.0f; - daNpc_Du_Execute(i_this); + du->mSph.Set(cc_sph_src); + du->mSph.SetStts(&du->mStts); + du->mFrameCounter = cM_rndF(65536.0f); + i_this->gravity = -5.0f; + daNpc_Du_Execute(du); } return phase; @@ -703,18 +705,18 @@ static actor_method_class l_daNpc_Du_Method = { }; actor_process_profile_definition g_profile_NPC_DU = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_DU, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(npc_du_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 722, // mPriority - &l_daNpc_Du_Method, // sub_method - 0x08044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_DU_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(npc_du_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_DU_e, + /* Actor SubMtd */ &l_daNpc_Du_Method, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_fairy.cpp b/src/d/actor/d_a_npc_fairy.cpp index 397891c28e..c228d969d5 100644 --- a/src/d/actor/d_a_npc_fairy.cpp +++ b/src/d/actor/d_a_npc_fairy.cpp @@ -3060,18 +3060,18 @@ static actor_method_class daNpc_Fairy_MethodTable = { }; actor_process_profile_definition g_profile_NPC_FAIRY = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_FAIRY, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Fairy_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 340, // mPriority - &daNpc_Fairy_MethodTable, // sub_method - 0x08044108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_FAIRY_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Fairy_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_FAIRY_e, + /* Actor SubMtd */ &daNpc_Fairy_MethodTable, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_fairy_seirei.cpp b/src/d/actor/d_a_npc_fairy_seirei.cpp index df6fc76ebb..f6c91551dd 100644 --- a/src/d/actor/d_a_npc_fairy_seirei.cpp +++ b/src/d/actor/d_a_npc_fairy_seirei.cpp @@ -418,18 +418,18 @@ static actor_method_class daNpc_FairySeirei_MethodTable = { }; actor_process_profile_definition g_profile_NPC_FAIRY_SEIREI = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_FAIRY_SEIREI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_FairySeirei_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 339, // mPriority - &daNpc_FairySeirei_MethodTable, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_FAIRY_SEIREI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_FairySeirei_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_FAIRY_SEIREI_e, + /* Actor SubMtd */ &daNpc_FairySeirei_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_fguard.cpp b/src/d/actor/d_a_npc_fguard.cpp index 228cf38b7d..5b75b2a91c 100644 --- a/src/d/actor/d_a_npc_fguard.cpp +++ b/src/d/actor/d_a_npc_fguard.cpp @@ -162,9 +162,9 @@ int daNpcFgd_c::execute() { mAcchCir.SetWallR(Cd2_HIO_chkWallR(m_type)); if (mFlag) { - fopAcM_OffStatus(this, 0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); } else { - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); return 1; } @@ -209,18 +209,18 @@ static actor_method_class daNpcFgd_METHODS = { }; actor_process_profile_definition g_profile_NPC_FGUARD = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_FGUARD, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcFgd_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 409, // mPriority - &daNpcFgd_METHODS, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_FGUARD_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcFgd_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_FGUARD_e, + /* Actor SubMtd */ &daNpcFgd_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e // cullType, }; diff --git a/src/d/actor/d_a_npc_fish.cpp b/src/d/actor/d_a_npc_fish.cpp index 8e023bd44a..4113fd3289 100644 --- a/src/d/actor/d_a_npc_fish.cpp +++ b/src/d/actor/d_a_npc_fish.cpp @@ -36,7 +36,7 @@ static void fish_set(fopAc_ac_c* i_this, fish_data_s* data) { param = 2; } param |= data->field_0x10 << 8; - fopAcM_create(PROC_MG_FISH, param, &pos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1); + fopAcM_create(fpcNm_MG_FISH_e, param, &pos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1); } } @@ -120,7 +120,7 @@ static int daNpc_Fish_Create(fopAc_ac_c* i_this) { } if (param != 0) { pos.set(-3382.0f, 0.0f, -7473.0f); - fopAcM_create(PROC_OBJ_LP, 0xFF010E00 | param, &pos, fopAcM_GetRoomNo(i_this), NULL, + fopAcM_create(fpcNm_OBJ_LP_e, 0xFF010E00 | param, &pos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1); } } @@ -128,7 +128,7 @@ static int daNpc_Fish_Create(fopAc_ac_c* i_this) { for (int i = 0; i < 4; i++) { pos.set(cM_rndFX(700.0f) + -2936.0f, 0.0f, cM_rndFX(700.0f) + -7865.0f); csXyz angle(0, 0, -1); - fopAcM_create(PROC_FR, 0, &pos, fopAcM_GetRoomNo(i_this), &angle, NULL, -1); + fopAcM_create(fpcNm_FR_e, 0, &pos, fopAcM_GetRoomNo(i_this), &angle, NULL, -1); } } @@ -139,7 +139,7 @@ static int daNpc_Fish_Create(fopAc_ac_c* i_this) { fish_set(i_this, fish_d127_S); for (int i = 0; i < 12; i++) { pos.set(lf_pos[i].pos_x, -180.0f, lf_pos[i].pos_z); - fopAcM_create(PROC_NPC_LF, lf_pos[i].param, &pos, fopAcM_GetRoomNo(i_this), NULL, NULL, + fopAcM_create(fpcNm_NPC_LF_e, lf_pos[i].param, &pos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1); } } @@ -153,18 +153,18 @@ static actor_method_class l_daNpc_Fish_Method = { }; actor_process_profile_definition g_profile_NPC_FISH = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_NPC_FISH, - &g_fpcLf_Method.base, - sizeof(npc_fish_class), - 0, - 0, - &g_fopAc_Method.base, - 719, - &l_daNpc_Fish_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_6_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_FISH_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(npc_fish_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_FISH_e, + /* Actor SubMtd */ &l_daNpc_Fish_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_npc_gnd.cpp b/src/d/actor/d_a_npc_gnd.cpp index 689bfc870a..10a20a179e 100644 --- a/src/d/actor/d_a_npc_gnd.cpp +++ b/src/d/actor/d_a_npc_gnd.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_gnd.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -39,9 +39,9 @@ static daNpcT_motionAnmData_c l_motionAnmData[1] = { }; static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { - {0, -1, 0}, - {-1, 0, 0}, - {-1, 0, 0}, + {0, -1, 0}, + {-1, 0, 0}, + {-1, 0, 0}, {-1, 0, 0}, }; @@ -139,7 +139,7 @@ int daNpc_Gnd_c::create() { J3DModelData* modelData = mpMorf[0]->getModel()->getModelData(); fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); mSound.init(¤t.pos, &eyePos, 3, 1); #if DEBUG mpHIO = &l_HIO; @@ -514,7 +514,7 @@ bool daNpc_Gnd_c::afterSetMotionAnm(int param_0, int param_1, f32 param_2, int p } bpkAnmData[] = { {0x0E, 1}, }; - + J3DAnmTevRegKey* brk = NULL; J3DAnmColor* bpk = NULL; @@ -685,18 +685,18 @@ static actor_method_class daNpc_Gnd_MethodTable = { }; actor_process_profile_definition g_profile_NPC_GND = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_GND, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Gnd_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 305, // mPriority - &daNpc_Gnd_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_GND_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Gnd_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_GND_e, + /* Actor SubMtd */ &daNpc_Gnd_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_gra.cpp b/src/d/actor/d_a_npc_gra.cpp index 701bd7e358..03c6e2279b 100644 --- a/src/d/actor/d_a_npc_gra.cpp +++ b/src/d/actor/d_a_npc_gra.cpp @@ -592,7 +592,7 @@ BOOL daNpc_grA_c::setHomeJump() { static void* s_sub(void* i_actor, void* i_this) { // a bit ugly, but the debug version can't have any local variables - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_TAG_GRA) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_TAG_GRA_e) { if (((daNpc_grA_c*)i_this)->checkTagGraSub((fopAc_ac_c*)i_actor)) { return i_actor; } @@ -613,7 +613,7 @@ bool daNpc_grA_c::checkTagGraSub(fopAc_ac_c* i_this) { static void* s_sub2(void* i_actor, void* i_this) { // a bit ugly, but the debug version can't have any local variables - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_TAG_GRA) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_TAG_GRA_e) { if (((daNpc_grA_c*)i_this)->checkTagGraSub2((fopAc_ac_c*)i_actor)) { return i_actor; } @@ -634,7 +634,7 @@ bool daNpc_grA_c::checkTagGraSub2(fopAc_ac_c* i_this) { static void* s_subShop(void* i_actor, void* i_this) { UNUSED(i_this); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_GRM) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_GRM_e) { return i_actor; } return NULL; @@ -642,7 +642,7 @@ static void* s_subShop(void* i_actor, void* i_this) { static void* s_subGRD(void* i_actor, void* i_this) { UNUSED(i_this); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_WRESTLER) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_WRESTLER_e) { return i_actor; } return NULL; @@ -650,7 +650,7 @@ static void* s_subGRD(void* i_actor, void* i_this) { static void *s_subOnsenTaru(void* i_actor, void* i_this) { UNUSED(i_this); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_OnsenTaru && + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_OnsenTaru_e && !fpcM_IsCreating(fopAcM_GetID((i_actor)))) { return i_actor; @@ -659,14 +659,14 @@ static void *s_subOnsenTaru(void* i_actor, void* i_this) { } static void *s_subCarry(void* i_actor, void* i_this) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Carry) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_Carry_e) { ((daNpc_grA_c*)i_this)->addCarryNum(); } return NULL; } static void *s_subCrashed(void* i_actor, void* i_this) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_TAG_GRA && + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_TAG_GRA_e && ((daNpc_grA_c*)i_this)->checkTagGraSubCrashed((fopAc_ac_c*)i_actor)) { return i_actor; @@ -3631,7 +3631,7 @@ BOOL daNpc_grA_c::waitSpaWater(void*) { if (field_0xC98.ChkTgHit()) { daOnsTaru_c* hit = (daOnsTaru_c*)field_0xC98.GetTgHitAc(); if (fopAcM_GetName(hit) == 0x16c) { - fopAcM_OnStatus(hit, 0x4000); + fopAcM_OnStatus(hit, fopAcStts_UNK_0x4000_e); if (hit->getTempStat()) { mOrderEvtNo = 7; } else { @@ -4107,20 +4107,20 @@ static actor_method_class daNpc_grA_MethodTable = { }; actor_process_profile_definition g_profile_NPC_GRA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_GRA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_grA_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 306, // mPriority - &daNpc_grA_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_GRA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_grA_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_GRA_e, + /* Actor SubMtd */ &daNpc_grA_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_npc_grc.cpp b/src/d/actor/d_a_npc_grc.cpp index fab87179cc..cf4a2b58a7 100644 --- a/src/d/actor/d_a_npc_grc.cpp +++ b/src/d/actor/d_a_npc_grc.cpp @@ -1574,18 +1574,18 @@ static actor_method_class daNpc_grC_MethodTable = { }; actor_process_profile_definition g_profile_NPC_GRC = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_GRC, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_grC_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 307, // mPriority - &daNpc_grC_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_GRC_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_grC_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_GRC_e, + /* Actor SubMtd */ &daNpc_grC_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_grd.cpp b/src/d/actor/d_a_npc_grd.cpp index c8176cf824..5075c0b22a 100644 --- a/src/d/actor/d_a_npc_grd.cpp +++ b/src/d/actor/d_a_npc_grd.cpp @@ -1106,7 +1106,7 @@ int daNpc_Grd_c::test(void* param_1) { } static void* s_sub1(void* i_actor, void* i_data) { - if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_GRZ) { + if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_GRZ_e) { return i_actor; } @@ -1114,7 +1114,7 @@ static void* s_sub1(void* i_actor, void* i_data) { } static void* s_sub2(void* i_actor, void* i_data) { - if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_YELIA) { + if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_YELIA_e) { return i_actor; } @@ -1249,20 +1249,20 @@ static actor_method_class daNpc_Grd_MethodTable = { }; actor_process_profile_definition g_profile_NPC_GRD = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_GRD, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Grd_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 308, // mPriority - &daNpc_Grd_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_GRD_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Grd_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_GRD_e, + /* Actor SubMtd */ &daNpc_Grd_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_npc_grm.cpp b/src/d/actor/d_a_npc_grm.cpp index 64e8a16c4d..4869ef254b 100644 --- a/src/d/actor/d_a_npc_grm.cpp +++ b/src/d/actor/d_a_npc_grm.cpp @@ -819,18 +819,18 @@ static actor_method_class daNpc_grM_MethodTable = { }; actor_process_profile_definition g_profile_NPC_GRM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_GRM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_grM_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 309, // mPriority - &daNpc_grM_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_GRM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_grM_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_GRM_e, + /* Actor SubMtd */ &daNpc_grM_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_grmc.cpp b/src/d/actor/d_a_npc_grmc.cpp index 7c1f75603c..71a1f62ebd 100644 --- a/src/d/actor/d_a_npc_grmc.cpp +++ b/src/d/actor/d_a_npc_grmc.cpp @@ -811,18 +811,18 @@ static actor_method_class daNpc_grMC_MethodTable = { }; actor_process_profile_definition g_profile_NPC_GRMC = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_GRMC, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_grMC_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 310, // mPriority - &daNpc_grMC_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_GRMC_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_grMC_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_GRMC_e, + /* Actor SubMtd */ &daNpc_grMC_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_gro.cpp b/src/d/actor/d_a_npc_gro.cpp index 8db8f7349f..7b20d908d4 100644 --- a/src/d/actor/d_a_npc_gro.cpp +++ b/src/d/actor/d_a_npc_gro.cpp @@ -1722,7 +1722,7 @@ int daNpc_grO_c::talk(void* param_1) { } static void* s_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_MARO) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_MARO_e) { return i_actor; } @@ -1913,18 +1913,18 @@ static actor_method_class daNpc_grO_MethodTable = { }; actor_process_profile_definition g_profile_NPC_GRO = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_GRO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_grO_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 311, // mPriority - &daNpc_grO_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_GRO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_grO_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_GRO_e, + /* Actor SubMtd */ &daNpc_grO_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_grr.cpp b/src/d/actor/d_a_npc_grr.cpp index 854aee437c..4942aec8ae 100644 --- a/src/d/actor/d_a_npc_grr.cpp +++ b/src/d/actor/d_a_npc_grr.cpp @@ -1440,18 +1440,18 @@ static actor_method_class daNpc_grR_MethodTable = { }; actor_process_profile_definition g_profile_NPC_GRR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_GRR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_grR_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 312, // mPriority - &daNpc_grR_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_GRR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_grR_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_GRR_e, + /* Actor SubMtd */ &daNpc_grR_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_grs.cpp b/src/d/actor/d_a_npc_grs.cpp index 8182b9ca6c..1ab19544cf 100644 --- a/src/d/actor/d_a_npc_grs.cpp +++ b/src/d/actor/d_a_npc_grs.cpp @@ -1300,20 +1300,20 @@ static actor_method_class daNpc_grS_MethodTable = { }; actor_process_profile_definition g_profile_NPC_GRS = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_GRS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_grS_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 313, // mPriority - &daNpc_grS_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_GRS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_grS_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_GRS_e, + /* Actor SubMtd */ &daNpc_grS_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_npc_grz.cpp b/src/d/actor/d_a_npc_grz.cpp index ee27fcbfed..e417f1d47b 100644 --- a/src/d/actor/d_a_npc_grz.cpp +++ b/src/d/actor/d_a_npc_grz.cpp @@ -1791,7 +1791,7 @@ int daNpc_Grz_c::wait(void* param_1) { } static void* s_sub(void* i_actor, void* i_data) { - if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_GrzRock) { + if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_GrzRock_e) { return i_actor; } @@ -1799,7 +1799,7 @@ static void* s_sub(void* i_actor, void* i_data) { } static void* s_sub2(void* i_actor, void* i_data) { - if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_YELIA) { + if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_YELIA_e) { return i_actor; } @@ -1807,7 +1807,7 @@ static void* s_sub2(void* i_actor, void* i_data) { } static void* s_sub3(void* i_actor, void* i_data) { - if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_GRD) { + if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_GRD_e) { return i_actor; } @@ -2537,18 +2537,18 @@ static actor_method_class daNpc_Grz_MethodTable = { }; actor_process_profile_definition g_profile_NPC_GRZ = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_GRZ, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Grz_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 314, // mPriority - &daNpc_Grz_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_GRZ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Grz_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_GRZ_e, + /* Actor SubMtd */ &daNpc_Grz_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_guard.cpp b/src/d/actor/d_a_npc_guard.cpp index ab82f88ee9..60c6597cd9 100644 --- a/src/d/actor/d_a_npc_guard.cpp +++ b/src/d/actor/d_a_npc_guard.cpp @@ -610,18 +610,18 @@ static actor_method_class daNpcGuard_METHODS = { }; actor_process_profile_definition g_profile_NPC_GUARD = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_GUARD, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcGuard_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 406, // mPriority - &daNpcGuard_METHODS, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_GUARD_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcGuard_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_GUARD_e, + /* Actor SubMtd */ &daNpcGuard_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_gwolf.cpp b/src/d/actor/d_a_npc_gwolf.cpp index f7a074c0dd..45c1025e0e 100644 --- a/src/d/actor/d_a_npc_gwolf.cpp +++ b/src/d/actor/d_a_npc_gwolf.cpp @@ -1922,18 +1922,18 @@ static actor_method_class daNpc_GWolf_MethodTable = { }; actor_process_profile_definition g_profile_NPC_GWOLF = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_GWOLF, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_GWolf_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 336, // mPriority - &daNpc_GWolf_MethodTable, // sub_method - 0x08044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_GWOLF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_GWolf_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_GWOLF_e, + /* Actor SubMtd */ &daNpc_GWolf_MethodTable, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_hanjo.cpp b/src/d/actor/d_a_npc_hanjo.cpp index 52002f98e4..ef5d1671d0 100644 --- a/src/d/actor/d_a_npc_hanjo.cpp +++ b/src/d/actor/d_a_npc_hanjo.cpp @@ -610,7 +610,7 @@ void daNpc_Hanjo_c::action() { fopAc_ac_c* hitActor = hitChk(&mCyl1, 0xffffffff); if (hitActor != NULL) { cCcD_Obj* hitObj = mCyl1.GetTgHitObj(); - if (hitObj->ChkAtType(AT_TYPE_THROW_OBJ) && (fopAcM_GetName(hitActor) != PROC_NPC_TK || mType != TYPE_1)) + if (hitObj->ChkAtType(AT_TYPE_THROW_OBJ) && (fopAcM_GetName(hitActor) != fpcNm_NPC_TK_e || mType != TYPE_1)) { mStagger.setParam(this, hitActor, mCurAngle.y); @@ -638,9 +638,9 @@ void daNpc_Hanjo_c::action() { void daNpc_Hanjo_c::beforeMove() { cXyz oldPos; cXyz pos; - fopAcM_OffStatus(this, 0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw != 0) { attention_info.flags = 0; @@ -1248,7 +1248,7 @@ int daNpc_Hanjo_c::cutPursuitBee(int param_1) { if (mStones[i].getSphP()->ChkCoHit()) { fopAc_ac_c* hitActor = mStones[i].getSphP()->GetCoHitObj()->GetAc(); fopAc_ac_c* hitActor2 = dCc_GetAc(hitActor); - if (hitActor2 != NULL && fopAcM_GetName(hitActor2) == PROC_E_NEST) { + if (hitActor2 != NULL && fopAcM_GetName(hitActor2) == fpcNm_E_NEST_e) { mEventTimer = mpHIO->m.field_0xb0; } mStones[i].initialize(); @@ -1960,18 +1960,18 @@ static actor_method_class daNpc_Hanjo_MethodTable = { }; actor_process_profile_definition g_profile_NPC_HANJO = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_HANJO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Hanjo_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 341, // mPriority - &daNpc_Hanjo_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_HANJO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Hanjo_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_HANJO_e, + /* Actor SubMtd */ &daNpc_Hanjo_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_henna.cpp b/src/d/actor/d_a_npc_henna.cpp index 4a352c49bf..59f13ceabe 100644 --- a/src/d/actor/d_a_npc_henna.cpp +++ b/src/d/actor/d_a_npc_henna.cpp @@ -218,7 +218,7 @@ static void dummy_dt_cm3dgpla() { static void* s_npc_sub(void* param_0, void* param_1) { if (fopAcM_IsActor(param_0) && - (fopAcM_GetName(param_0) == PROC_NPC_NE || fopAcM_GetName(param_0) == PROC_NPC_DU)) + (fopAcM_GetName(param_0) == fpcNm_NPC_NE_e || fopAcM_GetName(param_0) == fpcNm_NPC_DU_e)) { cXyz unkXyz1 = ((fopAc_ac_c*)param_0)->current.pos - ((npc_henna_class*)param_1)->actor.current.pos; @@ -231,14 +231,14 @@ static void* s_npc_sub(void* param_0, void* param_1) { static void* s_piro_sub(void* param_0, void* param_1) { UNUSED(param_1); - if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_NPC_INKO) { + if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == fpcNm_NPC_INKO_e) { return param_0; } return NULL; } static void* s_du_sub(void* param_0, void* param_1) { - if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_NPC_DU && + if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == fpcNm_NPC_DU_e && ((npc_du_class*)param_0)->mPlayerDist < 300.0f) { ((npc_henna_class*)param_1)->field_0x7d5 = 70; @@ -249,7 +249,7 @@ static void* s_du_sub(void* param_0, void* param_1) { static void* s_shop_sub(void* param_0, void* param_1) { UNUSED(param_1); - if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_FSHOP && + if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == fpcNm_FSHOP_e && (s32)(fopAcM_GetParam(param_0) & 0xff) < 35) { return param_0; @@ -260,7 +260,7 @@ static void* s_shop_sub(void* param_0, void* param_1) { static void* s_koro2ball_sub(void* param_0, void* param_1) { UNUSED(param_1); if (fopAcM_IsActor(param_0)) { - if (fopAcM_GetName(param_0) == PROC_FSHOP && (fopAcM_GetParam(param_0) & 0xff) == 35) { + if (fopAcM_GetName(param_0) == fpcNm_FSHOP_e && (fopAcM_GetParam(param_0) & 0xff) == 35) { return param_0; } } @@ -413,7 +413,7 @@ static void henna_shop(npc_henna_class* i_this) { static void* s_rod_sub(void* param_0, void* param_1) { UNUSED(param_1); - if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_MG_ROD) { + if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == fpcNm_MG_ROD_e) { return param_0; } return NULL; @@ -422,7 +422,7 @@ static void* s_rod_sub(void* param_0, void* param_1) { static void* s_fish_sub(void* param_0, void* param_1) { (void) param_1; if (fopAcM_IsActor(param_0)) { - if (fopAcM_GetName(param_0) == PROC_NPC_DU || fopAcM_GetName(param_0) == PROC_MG_FISH) { + if (fopAcM_GetName(param_0) == fpcNm_NPC_DU_e || fopAcM_GetName(param_0) == fpcNm_MG_FISH_e) { cXyz offset = ((fopAc_ac_c*)param_0)->current.pos - ((fopAc_ac_c*)param_1)->current.pos; if (offset.abs() < 500.0f + TREG_F(12)) { return param_0; @@ -2259,7 +2259,7 @@ static void message_guide(npc_henna_class* i_this) { static void* s_boat_sub(void* param_0, void* param_1) { UNUSED(param_1); if (fopAcM_IsActor(param_0)) { - if (fopAcM_GetName(param_0) == PROC_CANOE) { + if (fopAcM_GetName(param_0) == fpcNm_CANOE_e) { return param_0; } } @@ -2746,7 +2746,7 @@ static int daNpc_Henna_Create(fopAc_ac_c* i_this) { a_this->field_0x618 = i_this->shape_angle.y = i_this->current.angle.y = newAngle; lbl_82_bss_91 = dComIfGs_getEventReg(0xf63f); daNpc_Henna_Execute(a_this); - fopAcM_create(PROC_FSHOP, -1, &i_this->current.pos, fopAcM_GetRoomNo(i_this), NULL, + fopAcM_create(fpcNm_FSHOP_e, -1, &i_this->current.pos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1); return loadResult; } else { @@ -2760,7 +2760,7 @@ static int daNpc_Henna_Create(fopAc_ac_c* i_this) { fopAc_ac_c* player = dComIfGp_getPlayer(0); npcDfPos.set(player->current.pos.x, player->current.pos.y + 700.0f, player->current.pos.z); - fopAcM_create(PROC_NPC_DF, WREG_S(3) - 0xf4, &npcDfPos, + fopAcM_create(fpcNm_NPC_DF_e, WREG_S(3) - 0xf4, &npcDfPos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1); } f32 rnd = cM_rndF(1.0f); @@ -2771,19 +2771,19 @@ static int daNpc_Henna_Create(fopAc_ac_c* i_this) { } else { npcDfPos.set(2249.0f, 50.0f, -2218.0f); } - fopAcM_create(PROC_NPC_DU, 0xffffff00, &npcDfPos, fopAcM_GetRoomNo(i_this), NULL, + fopAcM_create(fpcNm_NPC_DU_e, 0xffffff00, &npcDfPos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1); npcDfPos.x -= 300.0f; npcDfPos.z += 100.0f; - fopAcM_create(PROC_NPC_DU, 0xffffff01, &npcDfPos, fopAcM_GetRoomNo(i_this), NULL, + fopAcM_create(fpcNm_NPC_DU_e, 0xffffff01, &npcDfPos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1); for (s32 i = 0; i < 5; i++) { npcDfPos.set(0.0f, 45.0f, 8000.0f); - fopAcM_create(PROC_BD, 0xffffffff, &npcDfPos, fopAcM_GetRoomNo(i_this), NULL, + fopAcM_create(fpcNm_BD_e, 0xffffffff, &npcDfPos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1); } npcDfPos.set(-1500.0f, 3000.0f + nREG_F(7), 3000.0f); - fopAcM_create(PROC_NPC_TK, 0xffffffff, &npcDfPos, fopAcM_GetRoomNo(i_this), NULL, + fopAcM_create(fpcNm_NPC_TK_e, 0xffffffff, &npcDfPos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1); data_80450C99 = 0; /* dSv_event_flag_c::F_0463 - Fishing Pond - Reserved for fishing */ @@ -2812,10 +2812,10 @@ static int daNpc_Henna_Create(fopAc_ac_c* i_this) { ato.z = cM_rndF(2300.0f); MtxPosition(&ato, &mae); angl.y = cM_rndF(65536.0f); - fopAcM_create(PROC_MG_FISH, sp_0x18, &mae, fopAcM_GetRoomNo(i_this), + fopAcM_create(fpcNm_MG_FISH_e, sp_0x18, &mae, fopAcM_GetRoomNo(i_this), &angl, NULL, -1); } - fopAcM_create(PROC_NPC_NE, 0xffffff01, &i_this->home.pos, fopAcM_GetRoomNo(i_this), + fopAcM_create(fpcNm_NPC_NE_e, 0xffffff01, &i_this->home.pos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1); } @@ -2845,20 +2845,20 @@ static actor_method_class l_daNpc_Henna_Method = { }; actor_process_profile_definition g_profile_NPC_HENNA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_HENNA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(npc_henna_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 342, // mPriority - &l_daNpc_Henna_Method, // sub_method - 0x00044000, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_HENNA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(npc_henna_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_HENNA_e, + /* Actor SubMtd */ &l_daNpc_Henna_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_npc_henna0.cpp b/src/d/actor/d_a_npc_henna0.cpp index 78b2dae150..2c9b53fe3f 100644 --- a/src/d/actor/d_a_npc_henna0.cpp +++ b/src/d/actor/d_a_npc_henna0.cpp @@ -7,18 +7,18 @@ #include "d/actor/d_a_npc_henna0.h" actor_process_profile_definition g_profile_NPC_HENNA0 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_HENNA0, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(d_a_npc_henna0), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 343, // mPriority - NULL, // sub_method - 0x00044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_HENNA0_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(d_a_npc_henna0), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_HENNA0_e, + /* Actor SubMtd */ NULL, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_hoz.cpp b/src/d/actor/d_a_npc_hoz.cpp index 31f093bb83..e8d537c9fe 100644 --- a/src/d/actor/d_a_npc_hoz.cpp +++ b/src/d/actor/d_a_npc_hoz.cpp @@ -446,7 +446,7 @@ int daNpc_Hoz_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) { } static void* s_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_START_AND_GOAL) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_START_AND_GOAL_e) { return i_actor; } @@ -454,7 +454,7 @@ static void* s_sub(void* i_actor, void* i_data) { } static void* s_subCanoe(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_CANOE) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_CANOE_e) { return i_actor; } @@ -524,7 +524,7 @@ void daNpc_Hoz_c::reset() { } static void* s_subBomb(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_ARROW && ((daArrow_c*)i_actor)->checkBombArrow()) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_ARROW_e && ((daArrow_c*)i_actor)->checkBombArrow()) { return i_actor; } @@ -1695,18 +1695,18 @@ static actor_method_class daNpc_Hoz_MethodTable = { }; actor_process_profile_definition g_profile_NPC_HOZ = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_HOZ, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Hoz_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 344, // mPriority - &daNpc_Hoz_MethodTable, // sub_method - 0x00044108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_HOZ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Hoz_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_HOZ_e, + /* Actor SubMtd */ &daNpc_Hoz_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_impal.cpp b/src/d/actor/d_a_npc_impal.cpp index 38592500f8..3b9a14f524 100644 --- a/src/d/actor/d_a_npc_impal.cpp +++ b/src/d/actor/d_a_npc_impal.cpp @@ -637,7 +637,7 @@ void daNpcImpal_c::lookat() { } static void* s_sub1(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Carry && + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_Carry_e && ((fopAc_ac_c*)i_actor)->current.pos.absXZ(((fopAc_ac_c*)i_data)->current.pos) < 1000.0f) { fopAcM_delete((fopAc_ac_c*)i_actor); @@ -735,7 +735,7 @@ bool daNpcImpal_c::wait(void* param_0) { return true; } u8 preitemno = dComIfGp_event_getPreItemNo(); - if (preitemno == fpcNm_ITEM_ANCIENT_DOCUMENT) { + if (preitemno == dItemNo_ANCIENT_DOCUMENT_e) { mFlowID = 5; setAction(&daNpcImpal_c::talk); } else { @@ -1238,18 +1238,18 @@ static actor_method_class daNpcImpal_MethodTable = { }; actor_process_profile_definition g_profile_NPC_IMPAL = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_IMPAL, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcImpal_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 416, // mPriority - &daNpcImpal_MethodTable, // sub_method - 0x00040100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_IMPAL_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcImpal_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_IMPAL_e, + /* Actor SubMtd */ &daNpcImpal_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_inko.cpp b/src/d/actor/d_a_npc_inko.cpp index 159053691d..3c277085f6 100644 --- a/src/d/actor/d_a_npc_inko.cpp +++ b/src/d/actor/d_a_npc_inko.cpp @@ -325,7 +325,7 @@ static int daNpc_Inko_Execute(npc_inko_class* i_this) { if (daPy_getPlayerActorClass()->checkFrontRollCrash() && temp_f1 < 200.0f) { i_this->field_0x59c[2] = 0; - npc_henna_class* henna = (npc_henna_class*)fopAcM_SearchByName(PROC_NPC_HENNA); + npc_henna_class* henna = (npc_henna_class*)fopAcM_SearchByName(fpcNm_NPC_HENNA_e); if (henna != NULL) { henna->field_0x7b5 = 40; data_80450C9D |= (u8)0x40; @@ -346,7 +346,7 @@ static int daNpc_Inko_Execute(npc_inko_class* i_this) { int flowId; if (cM_rndF(1.0f) < 0.1f) { flowId = 0x361; - npc_henna_class* henna = (npc_henna_class*)fopAcM_SearchByName(PROC_NPC_HENNA); + npc_henna_class* henna = (npc_henna_class*)fopAcM_SearchByName(fpcNm_NPC_HENNA_e); if (henna != NULL) { henna->field_0x7ba = 2; } @@ -489,18 +489,18 @@ static actor_method_class l_daNpc_Inko_Method = { }; actor_process_profile_definition g_profile_NPC_INKO = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_INKO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(npc_inko_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 704, // mPriority - &l_daNpc_Inko_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_INKO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(npc_inko_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_INKO_e, + /* Actor SubMtd */ &l_daNpc_Inko_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_ins.cpp b/src/d/actor/d_a_npc_ins.cpp index 00192fcf29..f3636747b6 100644 --- a/src/d/actor/d_a_npc_ins.cpp +++ b/src/d/actor/d_a_npc_ins.cpp @@ -1246,7 +1246,7 @@ int daNpcIns_c::waitPresent(void* param_1) { checkPlayerSearch(); u8 type = dMeter2Info_getInsectSelectType(); - if (type != fpcNm_ITEM_NONE) { + if (type != dItemNo_NONE_e) { if (type != 0 && !isInsect(type)) { break; } @@ -1605,99 +1605,99 @@ bool daNpcIns_c::isInsectComplete() { const insect_param_data& daNpcIns_c::getInsectParamData(int i_index) { switch (i_index) { - case fpcNm_ITEM_M_BEETLE: + case dItemNo_M_BEETLE_e: i_index = INSECT_M_BEETLE; break; - case fpcNm_ITEM_F_BEETLE: + case dItemNo_F_BEETLE_e: i_index = INSECT_F_BEETLE; break; - case fpcNm_ITEM_M_BUTTERFLY: + case dItemNo_M_BUTTERFLY_e: i_index = INSECT_M_BUTTERFLY; break; - case fpcNm_ITEM_F_BUTTERFLY: + case dItemNo_F_BUTTERFLY_e: i_index = INSECT_F_BUTTERFLY; break; - case fpcNm_ITEM_M_STAG_BEETLE: + case dItemNo_M_STAG_BEETLE_e: i_index = INSECT_M_STAG_BEETLE; break; - case fpcNm_ITEM_F_STAG_BEETLE: + case dItemNo_F_STAG_BEETLE_e: i_index = INSECT_F_STAG_BEETLE; break; - case fpcNm_ITEM_M_GRASSHOPPER: + case dItemNo_M_GRASSHOPPER_e: i_index = INSECT_M_GRASSHOPPER; break; - case fpcNm_ITEM_F_GRASSHOPPER: + case dItemNo_F_GRASSHOPPER_e: i_index = INSECT_F_GRASSHOPPER; break; - case fpcNm_ITEM_M_NANAFUSHI: + case dItemNo_M_NANAFUSHI_e: i_index = INSECT_M_NANAFUSHI; break; - case fpcNm_ITEM_F_NANAFUSHI: + case dItemNo_F_NANAFUSHI_e: i_index = INSECT_F_NANAFUSHI; break; - case fpcNm_ITEM_M_DANGOMUSHI: + case dItemNo_M_DANGOMUSHI_e: i_index = INSECT_M_DANGOMUSHI; break; - case fpcNm_ITEM_F_DANGOMUSHI: + case dItemNo_F_DANGOMUSHI_e: i_index = INSECT_F_DANGOMUSHI; break; - case fpcNm_ITEM_M_MANTIS: + case dItemNo_M_MANTIS_e: i_index = INSECT_M_MANTIS; break; - case fpcNm_ITEM_F_MANTIS: + case dItemNo_F_MANTIS_e: i_index = INSECT_F_MANTIS; break; - case fpcNm_ITEM_M_LADYBUG: + case dItemNo_M_LADYBUG_e: i_index = INSECT_M_LADYBUG; break; - case fpcNm_ITEM_F_LADYBUG: + case dItemNo_F_LADYBUG_e: i_index = INSECT_F_LADYBUG; break; - case fpcNm_ITEM_M_SNAIL: + case dItemNo_M_SNAIL_e: i_index = INSECT_M_SNAIL; break; - case fpcNm_ITEM_F_SNAIL: + case dItemNo_F_SNAIL_e: i_index = INSECT_F_SNAIL; break; - case fpcNm_ITEM_M_DRAGONFLY: + case dItemNo_M_DRAGONFLY_e: i_index = INSECT_M_DRAGONFLY; break; - case fpcNm_ITEM_F_DRAGONFLY: + case dItemNo_F_DRAGONFLY_e: i_index = INSECT_F_DRAGONFLY; break; - case fpcNm_ITEM_M_ANT: + case dItemNo_M_ANT_e: i_index = INSECT_M_ANT; break; - case fpcNm_ITEM_F_ANT: + case dItemNo_F_ANT_e: i_index = INSECT_F_ANT; break; - case fpcNm_ITEM_M_MAYFLY: + case dItemNo_M_MAYFLY_e: i_index = INSECT_M_MAYFLY; break; - case fpcNm_ITEM_F_MAYFLY: + case dItemNo_F_MAYFLY_e: i_index = INSECT_F_MAYFLY; break; @@ -1812,18 +1812,18 @@ static actor_method_class daNpcIns_MethodTable = { }; actor_process_profile_definition g_profile_NPC_INS = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_INS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcIns_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 425, // mPriority - &daNpcIns_MethodTable, // sub_method - 0x00040100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_INS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcIns_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_INS_e, + /* Actor SubMtd */ &daNpcIns_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_jagar.cpp b/src/d/actor/d_a_npc_jagar.cpp index 27119c26ba..29902a3e3e 100644 --- a/src/d/actor/d_a_npc_jagar.cpp +++ b/src/d/actor/d_a_npc_jagar.cpp @@ -761,9 +761,9 @@ void daNpc_Jagar_c::action() { } void daNpc_Jagar_c::beforeMove() { - fopAcM_OffStatus(this, 0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw != 0) { @@ -1792,20 +1792,20 @@ static actor_method_class daNpc_Jagar_MethodTable = { }; actor_process_profile_definition g_profile_NPC_JAGAR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_JAGAR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Jagar_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 345, // mPriority - &daNpc_Jagar_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_JAGAR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Jagar_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_JAGAR_e, + /* Actor SubMtd */ &daNpc_Jagar_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_npc_kakashi.cpp b/src/d/actor/d_a_npc_kakashi.cpp index 96bfc21c33..a285c41b98 100644 --- a/src/d/actor/d_a_npc_kakashi.cpp +++ b/src/d/actor/d_a_npc_kakashi.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_kakashi.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -197,8 +197,8 @@ int daNpc_Kakashi_c::create() { J3DModelData* modelData = mpMorf[0]->getModel()->getModelData(); fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); - + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); + mSound.init(¤t.pos, 3); #if DEBUG @@ -209,7 +209,7 @@ int daNpc_Kakashi_c::create() { reset(); mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this)); - + mCcStts.Init(mpHIO->m.common.weight, 0, this); for (int i = 0; i < 3; i++) { mCcSph[i].Set(mCcDSph); @@ -463,7 +463,7 @@ BOOL daNpc_Kakashi_c::checkChangeEvt() { case 3: case 4: break; - } + } } return 0; @@ -867,8 +867,8 @@ void daNpc_Kakashi_c::setStaggerParam(fopAc_ac_c* i_hitActor) { setPrtcls(0); sp14.y = fopAcM_searchPlayerAngleY(this); - fopAcM_createChild(PROC_OBJ_KBACKET, fopAcM_GetID(this), 0x80000000, &pos, fopAcM_GetRoomNo(this), &sp14, NULL, -1, NULL); - fopAcM_createChild(PROC_OBJ_KBACKET, fopAcM_GetID(this), 0x80000001, &pos, fopAcM_GetRoomNo(this), &sp14, NULL, -1, NULL); + fopAcM_createChild(fpcNm_OBJ_KBACKET_e, fopAcM_GetID(this), 0x80000000, &pos, fopAcM_GetRoomNo(this), &sp14, NULL, -1, NULL); + fopAcM_createChild(fpcNm_OBJ_KBACKET_e, fopAcM_GetID(this), 0x80000001, &pos, fopAcM_GetRoomNo(this), &sp14, NULL, -1, NULL); if (field_0x1393 == 0) { break; @@ -1172,20 +1172,20 @@ static actor_method_class daNpc_Kakashi_MethodTable = { }; actor_process_profile_definition g_profile_NPC_KAKASHI = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_KAKASHI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Kakashi_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 319, // mPriority - &daNpc_Kakashi_MethodTable, // sub_method - 0x00044000, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KAKASHI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Kakashi_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_KAKASHI_e, + /* Actor SubMtd */ &daNpc_Kakashi_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_npc_kasi_hana.cpp b/src/d/actor/d_a_npc_kasi_hana.cpp index 16dec8f5d9..9d2ff8b8b5 100644 --- a/src/d/actor/d_a_npc_kasi_hana.cpp +++ b/src/d/actor/d_a_npc_kasi_hana.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_kasi_hana.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -170,7 +170,7 @@ BOOL daNpcKasi_Mng_c::calcCenterPos() { if (hana_p == NULL || kyu_p == NULL || mich_p == NULL) { return FALSE; } - + cXyz hana_pos(*fopAcM_GetPosition_p(hana_p)); cXyz kyu_pos(*fopAcM_GetPosition_p(kyu_p)); cXyz mich_pos(*fopAcM_GetPosition_p(mich_p)); @@ -378,11 +378,11 @@ BOOL daNpcKasi_Mng_c::createHearts() { i_pos.y += 115.0f; fopAc_ac_c* heart_p = NULL; csXyz i_angle(0, cLib_getRndValue(0, 7) << 13, 0); - heart_p = fopAcM_fastCreateItem(&i_pos, fpcNm_ITEM_HEART, fopAcM_GetRoomNo(actor_p), &i_angle, + heart_p = fopAcM_fastCreateItem(&i_pos, dItemNo_HEART_e, fopAcM_GetRoomNo(actor_p), &i_angle, &i_scale, &i_speedF, &i_speedY, -1, 0, NULL); if (heart_p != NULL) { Z2GetAudioMgr()->seStart(Z2SE_GIRLS_HEART, &i_pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); - fopAcM_OnStatus(heart_p, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(heart_p, fopAcStts_UNK_0x4000_e); } } } @@ -393,34 +393,34 @@ BOOL daNpcKasi_Mng_c::createHearts() { void daNpcKasi_Mng_c::allDemoMove() { daNpcKasiHana_c* hana_p = (daNpcKasiHana_c*)mHanaActorMngr.getActorP(); if (hana_p != NULL) { - fopAcM_OnStatus(hana_p, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(hana_p, fopAcStts_UNK_0x4000_e); } daNpcKasiKyu_c* kyu_p = (daNpcKasiKyu_c*)mKyuActorMngr.getActorP(); if (kyu_p != NULL) { - fopAcM_OnStatus(kyu_p, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(kyu_p, fopAcStts_UNK_0x4000_e); } daNpcKasiMich_c* mich_p = (daNpcKasiMich_c*)mMichActorMngr.getActorP(); if (mich_p != NULL) { - fopAcM_OnStatus(mich_p, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(mich_p, fopAcStts_UNK_0x4000_e); } } void daNpcKasi_Mng_c::allDemoNotMove() { daNpcKasiHana_c* hana_p = (daNpcKasiHana_c*)mHanaActorMngr.getActorP(); if (hana_p != NULL) { - fopAcM_OffStatus(hana_p, fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(hana_p, fopAcStts_UNK_0x4000_e); } daNpcKasiKyu_c* kyu_p = (daNpcKasiKyu_c*)mKyuActorMngr.getActorP(); if (kyu_p != NULL) { - fopAcM_OffStatus(kyu_p, fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(kyu_p, fopAcStts_UNK_0x4000_e); } daNpcKasiMich_c* mich_p = (daNpcKasiMich_c*)mMichActorMngr.getActorP(); if (mich_p != NULL) { - fopAcM_OffStatus(mich_p, fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(mich_p, fopAcStts_UNK_0x4000_e); } } @@ -438,7 +438,7 @@ BOOL daNpcKasi_Mng_c::isMiniGamePlaying() { void daNpcKasi_Mng_c::schMemberActor() { if (mKyuActorMngr.getPId() == fpcM_ERROR_PROCESS_ID_e) { fopAc_ac_c* kyu_p = NULL; - if (fopAcM_SearchByName(PROC_NPC_KASIKYU, (fopAc_ac_c**)&kyu_p) != 0) { + if (fopAcM_SearchByName(fpcNm_NPC_KASIKYU_e, (fopAc_ac_c**)&kyu_p) != 0) { setKyuActor(kyu_p); } } @@ -446,7 +446,7 @@ void daNpcKasi_Mng_c::schMemberActor() { if (mMichActorMngr.getPId() == fpcM_ERROR_PROCESS_ID_e) { fopAc_ac_c* mich_p = NULL; - if (fopAcM_SearchByName(PROC_NPC_KASIMICH, (fopAc_ac_c**)&mich_p) != 0) { + if (fopAcM_SearchByName(fpcNm_NPC_KASIMICH_e, (fopAc_ac_c**)&mich_p) != 0) { setMichActor(mich_p); } } @@ -456,7 +456,7 @@ void daNpcKasi_Mng_c::schDanchoActor() { if (mDanchoActorMngr.getPId() == fpcM_ERROR_PROCESS_ID_e) { fopAc_ac_c* dancho_p = NULL; - if (fopAcM_SearchByName(PROC_NPC_CHIN, (fopAc_ac_c**)&dancho_p) != 0) { + if (fopAcM_SearchByName(fpcNm_NPC_CHIN_e, (fopAc_ac_c**)&dancho_p) != 0) { setDanchoActor(dancho_p); } } @@ -519,7 +519,7 @@ void daNpcKasi_Mng_c::chgWeightLight() { } static daNpc_GetParam2 l_bckGetParamList[15] = { - {BCK_MICH_IYAN_WAIT, J3DFrameCtrl::EMode_LOOP, GIRLS}, + {BCK_MICH_IYAN_WAIT, J3DFrameCtrl::EMode_LOOP, GIRLS}, {BCK_MICH_KYA_TALK, J3DFrameCtrl::EMode_LOOP, GIRLS}, {BCK_MICH_OUEN_WAIT_A, J3DFrameCtrl::EMode_LOOP, GIRLS}, {BCK_MICH_OUEN_WAIT_B, J3DFrameCtrl::EMode_LOOP, GIRLS}, @@ -626,7 +626,7 @@ daNpcKasiHana_c::~daNpcKasiHana_c() { for (int i = 0; i < 3; i++) { dComIfG_resDelete(&mPhases[i], l_arcNames[i]); } - + if (heap != NULL) { mAnm_p->stopZelAnime(); } @@ -938,7 +938,7 @@ void daNpcKasiHana_c::reset() { mPath.setPathInfo(getRailNo(), fopAcM_GetRoomNo(this), 0); mPath.setIdx(6); } else if (mType == TYPE_CHEER) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } field_0x1441 = 0; @@ -1140,8 +1140,8 @@ void daNpcKasiHana_c::lookat() { } else { mLookat.setAttnPos(NULL); } - - mLookat.setParam(body_angleX_min, body_angleX_max, body_angleY_min, body_angleY_max, 0.0f, 0.0f, 0.0f, 0.0f, + + mLookat.setParam(body_angleX_min, body_angleX_max, body_angleY_min, body_angleY_max, 0.0f, 0.0f, 0.0f, 0.0f, head_angleX_min, head_angleX_max, head_angleY_min, head_angleY_max, mCurAngle.y, lookatPos); mLookat.calc(this, model->getBaseTRMtx(), lookatAngle, i_snap, angle_delta, FALSE); } @@ -1382,7 +1382,7 @@ cXyz daNpcKasiHana_c::getChacePos() { cXyz sp3c; mPath.getDstPos(current.pos, sp3c); - + return sp3c; } @@ -1449,7 +1449,7 @@ int daNpcKasiHana_c::fear(int param_1) { case 4: { cXyz sp28; mAnm_p->setPlaySpeed(1.5f); - + if (mPath.getDstPos(current.pos, sp28)) { mEscape = true; mMode = 5; @@ -1486,8 +1486,8 @@ void* daNpcKasiHana_c::_srch_escape_tag(void* i_actor, void* i_data) { if (!fopAcM_IsActor(i_actor)) { return NULL; } - - if (fopAcM_GetName(i_actor) != PROC_Tag_Escape) { + + if (fopAcM_GetName(i_actor) != fpcNm_Tag_Escape_e) { return NULL; } @@ -1498,7 +1498,7 @@ void* daNpcKasiHana_c::_srch_escape_tag(void* i_actor, void* i_data) { mTargetTag = (daTagEscape_c*)i_actor; return NULL; } - + if (iVar1 > 0x4000) { f32 fVar1 = fopAcM_searchActorDistanceXZ2((fopAc_ac_c*)i_data, (fopAc_ac_c*)i_actor); if (fVar1 < mTargetTagDist) { @@ -1784,13 +1784,13 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Appear(int i_index) { } else { return TRUE; } - + if (eventManager.getIsAddvance(i_index)) { _Evt_Kasi_Appear_CutInit(i_cutIndex); } return _Evt_Kasi_Appear_CutMain(i_cutIndex); - + } BOOL daNpcKasiHana_c::_Evt_Kasi_Appear_CutInit(int const& i_cutIndex) { @@ -1800,7 +1800,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Appear_CutInit(int const& i_cutIndex) { setMotion(MOT_W_WAIT_A, -1.0f, 0); field_0x1430 = 20; break; - + case 20: mKasiMng.onSygnal(0x400); setMotion(MOT_MICH_KYA_TALK, -1.0f, 0); @@ -1829,13 +1829,13 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Appear_CutMain(int const& i_cutIndex) { rv = TRUE; } break; - + case 20: if (talkProc(NULL, TRUE, NULL)) { rv = TRUE; } break; - + case 21: if (mMotion == MOT_MICH_KYA_TALK && (mAnm_p->getFrame() == 19.0f || mAnm_p->getFrame() == 1.0f)) { setMotion(MOT_W_WAIT_A, -1.0f, 0); @@ -1874,7 +1874,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Talk(int i_index) { /* dSv_event_flag_c::F_289 - Castle Town - Heard conversation about entering Star Game 1 */ if (daNpcF_chkEvtBit(289)) { - mesNo = dComIfGp_evmng_getMyIntegerP(i_index, "mesNo2"); + mesNo = dComIfGp_evmng_getMyIntegerP(i_index, "mesNo2"); } else { mesNo = dComIfGp_evmng_getMyIntegerP(i_index, "mesNo1"); } @@ -1895,7 +1895,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Talk_CutInit(int const& i_cutIndex) { setMotion(MOT_MICH_KYA_TALK, -1.0f, 0); initTalk(mMessageNo, actors); break; - + case 20: mKasiMng.onSygnal(0x20000); break; @@ -1903,7 +1903,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Talk_CutInit(int const& i_cutIndex) { case 30: mKasiMng.onSygnal(0x40000); break; - + case 31: mKasiMng.onSygnal(0x1000); break; @@ -1925,7 +1925,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Talk_CutMain(int const& i_cutIndex, int param_2) rv = TRUE; } break; - + case 20: if (mMotion == MOT_MICH_KYA_TALK && (mAnm_p->getFrame() == 19.0f || mAnm_p->getFrame() == 1.0f)) { setMotion(MOT_W_WAIT_A, -1.0f, 0); @@ -1943,7 +1943,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Talk_CutMain(int const& i_cutIndex, int param_2) rv = TRUE; } break; - + case 31: rv = TRUE; break; @@ -1985,7 +1985,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_CutInit(int const& i_cutIndex) { mKasiMng.onSygnal(0x400); initTalk(mMessageNo, NULL); break; - + case 21: mKasiMng.onSygnal(0x1000); field_0x1430 = 24; @@ -2036,7 +2036,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_CutMain(int const& i_cutIndex) { case 30: { cXyz sp38(mKasiMng.getCenterPos()); - + if (_turn_pos(sp38, 0xA00)) { rv = TRUE; } @@ -2064,7 +2064,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Cheer(int i_index) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); int i_cutIndex = -1; - + int* cutId = dComIfGp_evmng_getMyIntegerP(i_index, "cutId"); if (cutId != NULL) { i_cutIndex = *cutId; @@ -2136,7 +2136,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Cheer_CutMain(int const& i_cutIndex, int param_2 rv = TRUE; } break; - + case 20: if (field_0x1430 > 0) { field_0x1430--; @@ -2210,7 +2210,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Cheer2_CutInit(int const& i_cutIndex) { field_0x1430 = 86; initTalk(mMessageNo, actors); break; - + case 20: mKasiMng.onSygnal(0x2000); break; @@ -2243,7 +2243,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Cheer2_CutMain(int const& i_cutIndex, int param_ rv = TRUE; } break; - + case 20: if (field_0x1430 > 0) { field_0x1430--; @@ -2310,18 +2310,18 @@ static actor_method_class daNpcKasiHana_MethodTable = { }; actor_process_profile_definition g_profile_NPC_KASIHANA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_KASIHANA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcKasiHana_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 420, // mPriority - &daNpcKasiHana_MethodTable, // sub_method - 0x00040108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KASIHANA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcKasiHana_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_KASIHANA_e, + /* Actor SubMtd */ &daNpcKasiHana_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_kasi_kyu.cpp b/src/d/actor/d_a_npc_kasi_kyu.cpp index 48bdd83016..d3d3782a3f 100644 --- a/src/d/actor/d_a_npc_kasi_kyu.cpp +++ b/src/d/actor/d_a_npc_kasi_kyu.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_kasi_kyu.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -12,7 +12,7 @@ enum kasi_kyu_RES_File_ID { /* BMDR */ /* 0x4 */ BMDR_KYU = 0x4, - + /* BTP */ /* 0x7 */ BTP_KYU = 0x7, }; @@ -483,7 +483,7 @@ void daNpcKasiKyu_c::reset() { mPath.setPathInfo(getRailNo(), fopAcM_GetRoomNo(this), 0); mPath.setIdx(6); } else if (mType == 1) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } field_0x1430 = 0; @@ -689,8 +689,8 @@ void daNpcKasiKyu_c::lookat() { } else { mLookat.setAttnPos(NULL); } - - mLookat.setParam(body_angleX_min, body_angleX_max, body_angleY_min, body_angleY_max, 0.0f, 0.0f, 0.0f, 0.0f, + + mLookat.setParam(body_angleX_min, body_angleX_max, body_angleY_min, body_angleY_max, 0.0f, 0.0f, 0.0f, 0.0f, head_angleX_min, head_angleX_max, head_angleY_min, head_angleY_max, mCurAngle.y, lookatPos); mLookat.calc(this, model->getBaseTRMtx(), lookatAngle, i_snap, angle_delta, FALSE); } @@ -863,7 +863,7 @@ int daNpcKasiKyu_c::fear(int param_1) { case 4: { cXyz sp28; mAnm_p->setPlaySpeed(1.5f); - + if (mPath.getDstPos(current.pos, sp28)) { mEscape = true; mMode = -1; @@ -888,8 +888,8 @@ void* daNpcKasiKyu_c::_srch_escape_tag(void* i_actor, void* i_data) { if (!fopAcM_IsActor(i_actor)) { return NULL; } - - if (fopAcM_GetName(i_actor) != PROC_Tag_Escape) { + + if (fopAcM_GetName(i_actor) != fpcNm_Tag_Escape_e) { return NULL; } @@ -900,7 +900,7 @@ void* daNpcKasiKyu_c::_srch_escape_tag(void* i_actor, void* i_data) { mTargetTag = (daTagEscape_c*)i_actor; return NULL; } - + if (iVar1 > 0x4000) { f32 fVar1 = fopAcM_searchActorDistanceXZ2((fopAc_ac_c*)i_data, (fopAc_ac_c*)i_actor); if (fVar1 < mTargetTagDist) { @@ -1026,7 +1026,7 @@ cXyz daNpcKasiKyu_c::getChacePos() { cXyz chacePos; mPath.getDstPos(current.pos, chacePos); - + return chacePos; } @@ -1170,7 +1170,7 @@ int daNpcKasiKyu_c::kya_stop(int param_1) { switch (mMode) { case -1: break; - + case 0: if (mMotion != MOT_MICH_KYA_TALK) { setAction(&daNpcKasiKyu_c::wait); @@ -1235,14 +1235,14 @@ int daNpcKasiKyu_c::turn_hana(int param_1) { switch (mMode) { case -1: break; - + case 0: setMotion(MOT_W_WAIT_A, -1.0f, 0); speedF = 0.0f; setLookMode(LOOK_NONE); mMode = 1; break; - + case 1: { cXyz pos(-3200.0f, 0.0f, 1500.0f); if (_turn_pos(pos, 0x800)) { @@ -1425,18 +1425,18 @@ static actor_method_class daNpcKasiKyu_MethodTable = { }; actor_process_profile_definition g_profile_NPC_KASIKYU = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_KASIKYU, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcKasiKyu_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 421, // mPriority - &daNpcKasiKyu_MethodTable, // sub_method - 0x00040108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KASIKYU_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcKasiKyu_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_KASIKYU_e, + /* Actor SubMtd */ &daNpcKasiKyu_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_kasi_mich.cpp b/src/d/actor/d_a_npc_kasi_mich.cpp index e10a8d785b..a050bffc01 100644 --- a/src/d/actor/d_a_npc_kasi_mich.cpp +++ b/src/d/actor/d_a_npc_kasi_mich.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_kasi_mich.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -483,7 +483,7 @@ void daNpcKasiMich_c::reset() { mPath.setPathInfo(getRailNo(), fopAcM_GetRoomNo(this), 0); mPath.setIdx(6); } else if (mType == 1) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } field_0x1430 = 0; @@ -689,8 +689,8 @@ void daNpcKasiMich_c::lookat() { } else { mLookat.setAttnPos(NULL); } - - mLookat.setParam(body_angleX_min, body_angleX_max, body_angleY_min, body_angleY_max, 0.0f, 0.0f, 0.0f, 0.0f, + + mLookat.setParam(body_angleX_min, body_angleX_max, body_angleY_min, body_angleY_max, 0.0f, 0.0f, 0.0f, 0.0f, head_angleX_min, head_angleX_max, head_angleY_min, head_angleY_max, mCurAngle.y, lookatPos); mLookat.calc(this, model->getBaseTRMtx(), lookatAngle, i_snap, angle_delta, FALSE); } @@ -862,7 +862,7 @@ int daNpcKasiMich_c::fear(int param_1) { case 4: { cXyz sp28; mAnm_p->setPlaySpeed(1.5f); - + if (mPath.getDstPos(current.pos, sp28)) { mEscape = true; mMode = -1; @@ -887,8 +887,8 @@ void* daNpcKasiMich_c::_srch_escape_tag(void* i_actor, void* i_data) { if (!fopAcM_IsActor(i_actor)) { return NULL; } - - if (fopAcM_GetName(i_actor) != PROC_Tag_Escape) { + + if (fopAcM_GetName(i_actor) != fpcNm_Tag_Escape_e) { return NULL; } @@ -899,7 +899,7 @@ void* daNpcKasiMich_c::_srch_escape_tag(void* i_actor, void* i_data) { mTargetTag = (daTagEscape_c*)i_actor; return NULL; } - + if (iVar1 > 0x4000) { f32 fVar1 = fopAcM_searchActorDistanceXZ2((fopAc_ac_c*)i_data, (fopAc_ac_c*)i_actor); if (fVar1 < mTargetTagDist) { @@ -1021,7 +1021,7 @@ cXyz daNpcKasiMich_c::getChacePos() { cXyz chacePos; mPath.getDstPos(current.pos, chacePos); - + return chacePos; } @@ -1165,7 +1165,7 @@ int daNpcKasiMich_c::kya_stop(int param_1) { switch (mMode) { case -1: break; - + case 0: if (mMotion != MOT_MICH_KYA_TALK) { setAction(&daNpcKasiMich_c::wait); @@ -1350,7 +1350,7 @@ int daNpcKasiMich_c::cheer(int param_1) { BOOL daNpcKasiMich_c::_turn_to_link(s16 param_1) { cXyz pos(*fopAcM_GetPosition_p(daPy_getPlayerActorClass())); return _turn_pos(pos, param_1); - + } BOOL daNpcKasiMich_c::_turn_pos(cXyz const& param_1, s16 param_2) { @@ -1412,18 +1412,18 @@ static actor_method_class daNpcKasiMich_MethodTable = { }; actor_process_profile_definition g_profile_NPC_KASIMICH = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_KASIMICH, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcKasiMich_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 422, // mPriority - &daNpcKasiMich_MethodTable, // sub_method - 0x00040108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KASIMICH_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcKasiMich_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_KASIMICH_e, + /* Actor SubMtd */ &daNpcKasiMich_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_kdk.cpp b/src/d/actor/d_a_npc_kdk.cpp index 1522311e8b..0cbae54ae3 100644 --- a/src/d/actor/d_a_npc_kdk.cpp +++ b/src/d/actor/d_a_npc_kdk.cpp @@ -8,18 +8,18 @@ #include "d/actor/d_a_npc_kdk.h" actor_process_profile_definition g_profile_NPC_KDK = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_KDK, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcKdk_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 320, // mPriority - NULL, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KDK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcKdk_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_KDK_e, + /* Actor SubMtd */ NULL, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_kkri.cpp b/src/d/actor/d_a_npc_kkri.cpp index 49d11700c2..e4687ac2c2 100644 --- a/src/d/actor/d_a_npc_kkri.cpp +++ b/src/d/actor/d_a_npc_kkri.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_kkri.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -300,7 +300,7 @@ daNpc_Kkri_c::~daNpc_Kkri_c() { if (mpMorf[0] != NULL) { mpMorf[0]->stopZelAnime(); } - + #if DEBUG if (mpHIO != NULL) { mpHIO->removeHIO(); @@ -468,7 +468,7 @@ int daNpc_Kkri_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) { void* daNpc_Kkri_c::srchYm(void* i_actor, void* i_data) { if (mFindCount < 50) { daE_YM_c* ym_p = (daE_YM_c*)i_actor; - if (ym_p != NULL && ym_p != i_data && fopAcM_IsExecuting(fopAcM_GetID(ym_p)) && fopAcM_GetName(ym_p) == PROC_E_YM && !ym_p->isHide()) { + if (ym_p != NULL && ym_p != i_data && fopAcM_IsExecuting(fopAcM_GetID(ym_p)) && fopAcM_GetName(ym_p) == fpcNm_E_YM_e && !ym_p->isHide()) { mFindActorPtrs[mFindCount] = ym_p; mFindCount++; } @@ -626,7 +626,7 @@ void daNpc_Kkri_c::srchActors() { switch (mType) { case 0: if (mActorMng[0].getActorP() == NULL) { - mActorMng[0].entry(getNearestActorP(PROC_Tag_KtOnFire)); + mActorMng[0].entry(getNearestActorP(fpcNm_Tag_KtOnFire_e)); } /* fallthrough */ case 1: @@ -677,10 +677,10 @@ void daNpc_Kkri_c::action() { } void daNpc_Kkri_c::beforeMove() { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw) { @@ -1107,7 +1107,7 @@ int daNpc_Kkri_c::fearWait(void*) { } else { mFindCount = 0; fopAcM_Search(srchYm, this); - + int alive_ym_cnt = 0; for (int i = 0; i < mFindCount; i++) { if (mFindActorPtrs[i]->health > 0) { @@ -1246,18 +1246,18 @@ static actor_method_class daNpc_Kkri_MethodTable = { }; actor_process_profile_definition g_profile_NPC_KKRI = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_KKRI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Kkri_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 346, // mPriority - &daNpc_Kkri_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KKRI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Kkri_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_KKRI_e, + /* Actor SubMtd */ &daNpc_Kkri_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_kn.cpp b/src/d/actor/d_a_npc_kn.cpp index 8cad3cb871..3a39a0b196 100644 --- a/src/d/actor/d_a_npc_kn.cpp +++ b/src/d/actor/d_a_npc_kn.cpp @@ -564,7 +564,7 @@ int daNpc_Kn_c::create() { J3DModelData* model_data = mpModelMorf[0]->getModel()->getModelData(); fopAcM_SetMtx(this, mpModelMorf[0]->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); mSound.init(¤t.pos, &eyePos, 3, 1); dKy_tevstr_init(&mTevStr, fopAcM_GetRoomNo(this), 0xFF); @@ -869,7 +869,7 @@ void daNpc_Kn_c::reset() { if (mType <= 6 && (mDivideNo == 0 || mDivideNo > 2)) { field_0xe2c = 1; parentActorID = - fopAcM_createChild(PROC_NPC_GWOLF, fopAcM_GetID(this), 0xFFFFFF02, ¤t.pos, + fopAcM_createChild(fpcNm_NPC_GWOLF_e, fopAcM_GetID(this), 0xFFFFFF02, ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle, 0, -1, 0); } @@ -2361,7 +2361,7 @@ int daNpc_Kn_c::teach05_surpriseAttackWait(void* param_0) { } static void* s_sub6(void* i_actor, void* i_other) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KN && i_actor != i_other) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KN_e && i_actor != i_other) { ((daNpc_Kn_c*)i_actor)->setActionMode(18); } @@ -2369,7 +2369,7 @@ static void* s_sub6(void* i_actor, void* i_other) { } static void* s_subEnd6(void* i_actor, void* i_other) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KN && i_actor != i_other && + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KN_e && i_actor != i_other && ((daNpc_Kn_c*)i_actor)->getActionMode() != 17) { ((daNpc_Kn_c*)i_actor)->setActionMode(17); @@ -2617,7 +2617,7 @@ int daNpc_Kn_c::teach06_superJumpWaitDivide(void* param_0) { if (mCylCc.ChkTgHit()) { if (cut_type == daPy_py_c::CUT_TYPE_LARGE_JUMP || cut_type == daPy_py_c::CUT_TYPE_LARGE_JUMP_FINISH) { mActionMode = 16; - + daNpc_Kn_c* parent_p = (daNpc_Kn_c*)fpcM_SearchByID(parentActorID); if (parent_p != NULL) { parent_p->setTalkFlag(2); @@ -2771,7 +2771,7 @@ int daNpc_Kn_c::teach06_warpDelete(void* param_0) { } static void* s_sub7(void* i_actor, void* i_other) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KN && i_actor != i_other) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KN_e && i_actor != i_other) { ((daNpc_Kn_c*)i_actor)->setActionMode(24); } @@ -2779,7 +2779,7 @@ static void* s_sub7(void* i_actor, void* i_other) { } static void* s_subEnd7(void* i_actor, void* i_other) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KN && i_actor != i_other && + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KN_e && i_actor != i_other && ((daNpc_Kn_c*)i_actor)->getActionMode() != 23) { ((daNpc_Kn_c*)i_actor)->setActionMode(23); @@ -2996,7 +2996,7 @@ int daNpc_Kn_c::teach07_superTurnAttackWaitDivide(void* param_0) { if (mCylCc.ChkTgHit()) { if (cut_type == daPy_py_c::CUT_TYPE_LARGE_TURN_LEFT || cut_type == daPy_py_c::CUT_TYPE_LARGE_TURN_RIGHT) { mActionMode = 22; - + daNpc_Kn_c* parent_p = (daNpc_Kn_c*)fpcM_SearchByID(parentActorID); if (parent_p != NULL) { parent_p->setTalkFlag(2); @@ -3137,7 +3137,7 @@ int daNpc_Kn_c::ECut_secondEncount(int i_idx) { break; case 2: { gwolf_p = (daNpc_GWolf_c*)fpcM_SearchByID(parentActorID); - if (fopAcM_GetName(gwolf_p) == PROC_NPC_GWOLF) { + if (fopAcM_GetName(gwolf_p) == fpcNm_NPC_GWOLF_e) { gwolf_p->setMotion(4, -1.0f, FALSE); } break; @@ -3473,11 +3473,11 @@ int daNpc_Kn_c::ECut_thirdSkillGet(int i_idx) { if (event_manager->getIsAddvance(i_idx)) { switch (prm) { - case 0: + case 0: daNpcT_offTmpBit(0xB); daNpcT_offTmpBit(0xC); break; - case 4: + case 4: mFaceMotionSeqMngr.setNo(1, -1.0f, 0, 0); if (mMotionSeqMngr.getNo() == 0x13) { mMotionSeqMngr.setNo(0x16, -1.0f, 0, 0); @@ -3485,7 +3485,7 @@ int daNpc_Kn_c::ECut_thirdSkillGet(int i_idx) { mMotionSeqMngr.setNo(0x10, -1.0f, 0, 0); } break; - case 6: + case 6: mJntAnm.lookNone(0); break; case 10: { @@ -3522,7 +3522,7 @@ int daNpc_Kn_c::ECut_thirdSkillGet(int i_idx) { } } switch (prm) { - case 0: + case 0: if (speed.y <= 0.0f && mAcch.ChkGroundHit()) { speedF = 0.0f; speed.zero(); @@ -3538,7 +3538,7 @@ int daNpc_Kn_c::ECut_thirdSkillGet(int i_idx) { rt = 1; } break; - case 2: + case 2: if (mMotionSeqMngr.getNo() == 0x13 || mMotionSeqMngr.getNo() == 0xF) { if (mMotionSeqMngr.getStepNo() > 0) { rt = 1; @@ -3547,12 +3547,12 @@ int daNpc_Kn_c::ECut_thirdSkillGet(int i_idx) { } } break; - case 4: + case 4: if ((mMotionSeqMngr.getNo() == 0x16 || mMotionSeqMngr.getNo() == 0x10) && mMotionSeqMngr.getStepNo() > 0) { rt = 1; } break; - case 6: + case 6: if (mCurAngle.y != fopAcM_searchPlayerAngleY(this)) { if (step(fopAcM_searchPlayerAngleY(this), 1, 0x20, 20, 0)) { rt = 1; @@ -3609,10 +3609,10 @@ int daNpc_Kn_c::ECut_fourthSkillExplain(int i_idx) { if (event_manager->getIsAddvance(i_idx)) { switch (prm) { - case 0: + case 0: mActionMode = 9; break; - case 4: + case 4: mFaceMotionSeqMngr.setNo(1, -1.0f, 0, 0); if (mMotionSeqMngr.getNo() == 0x13) { mMotionSeqMngr.setNo(0x16, -1.0f, 0, 0); @@ -3620,10 +3620,10 @@ int daNpc_Kn_c::ECut_fourthSkillExplain(int i_idx) { mMotionSeqMngr.setNo(16, -1.0f, 0, 0); } break; - case 6: + case 6: mJntAnm.lookPlayer(0); break; - case 10: + case 10: mStepMode = 2; initTalk(0x2EF, NULL); break; @@ -3633,7 +3633,7 @@ int daNpc_Kn_c::ECut_fourthSkillExplain(int i_idx) { case 65: { setPos(home.pos); setAngle(home.angle.y); - + cXyz sp64(-10.0f, 0.0f, 375.0f); mDoMtx_stack_c::transS(home.pos); mDoMtx_stack_c::YrotM(home.angle.y); @@ -3786,7 +3786,7 @@ int daNpc_Kn_c::ECut_fourthSkillExplain(int i_idx) { rt = 1; } break; - default: + default: rt = 1; break; } @@ -3948,7 +3948,7 @@ int daNpc_Kn_c::ECut_fifthSkillExplain(int i_idx) { switch (prm) { case 0: break; - case 4: + case 4: mFaceMotionSeqMngr.setNo(1, -1.0f, 0, 0); if (mMotionSeqMngr.getNo() == 0x13) { mMotionSeqMngr.setNo(0x16, -1.0f, 0, 0); @@ -3956,10 +3956,10 @@ int daNpc_Kn_c::ECut_fifthSkillExplain(int i_idx) { mMotionSeqMngr.setNo(16, -1.0f, 0, 0); } break; - case 6: + case 6: mJntAnm.lookPlayer(0); break; - case 10: + case 10: mStepMode = 2; initTalk(0x2E7, NULL); break; @@ -3978,7 +3978,7 @@ int daNpc_Kn_c::ECut_fifthSkillExplain(int i_idx) { setPos(home.pos); setAngle(home.angle.y); - + cXyz sp64(0.0f, 0.0f, 375.0f); mDoMtx_stack_c::transS(home.pos); mDoMtx_stack_c::YrotM(home.angle.y); @@ -4120,7 +4120,7 @@ int daNpc_Kn_c::ECut_fifthSkillExplain(int i_idx) { mActionMode = 12; } break; - default: + default: rt = 1; break; } @@ -4282,7 +4282,7 @@ int daNpc_Kn_c::ECut_sixthSkillExplain(int i_idx) { switch (prm) { case 0: break; - case 4: + case 4: mFaceMotionSeqMngr.setNo(1, -1.0f, 0, 0); if (mMotionSeqMngr.getNo() == 0x13) { mMotionSeqMngr.setNo(0x16, -1.0f, 0, 0); @@ -4290,10 +4290,10 @@ int daNpc_Kn_c::ECut_sixthSkillExplain(int i_idx) { mMotionSeqMngr.setNo(16, -1.0f, 0, 0); } break; - case 6: + case 6: mJntAnm.lookPlayer(0); break; - case 10: + case 10: mStepMode = 2; initTalk(0x2F8, NULL); break; @@ -4303,7 +4303,7 @@ int daNpc_Kn_c::ECut_sixthSkillExplain(int i_idx) { case 65: { setPos(home.pos); setAngle(home.angle.y); - + cXyz sp64(0.0f, 0.0f, 375.0f); mDoMtx_stack_c::transS(home.pos); mDoMtx_stack_c::YrotM(home.angle.y); @@ -4444,7 +4444,7 @@ int daNpc_Kn_c::ECut_sixthSkillExplain(int i_idx) { if (mMotionSeqMngr.getNo() == 0x18 && mMotionSeqMngr.getStepNo() > 0) { rt = 1; for (int i = 0; i < 2; i++) { - fopAcM_createChild(PROC_NPC_KN, fopAcM_GetID(this), ((i + 1) << 8) + 6, ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle, NULL, -1, NULL); + fopAcM_createChild(fpcNm_NPC_KN_e, fopAcM_GetID(this), ((i + 1) << 8) + 6, ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle, NULL, -1, NULL); } } break; @@ -4454,7 +4454,7 @@ int daNpc_Kn_c::ECut_sixthSkillExplain(int i_idx) { mActionMode = 13; } break; - default: + default: rt = 1; break; } @@ -4620,7 +4620,7 @@ int daNpc_Kn_c::ECut_seventhSkillExplain(int i_idx) { switch (prm) { case 0: break; - case 4: + case 4: mFaceMotionSeqMngr.setNo(1, -1.0f, 0, 0); if (mMotionSeqMngr.getNo() == 0x13) { mMotionSeqMngr.setNo(0x16, -1.0f, 0, 0); @@ -4628,10 +4628,10 @@ int daNpc_Kn_c::ECut_seventhSkillExplain(int i_idx) { mMotionSeqMngr.setNo(16, -1.0f, 0, 0); } break; - case 6: + case 6: mJntAnm.lookPlayer(0); break; - case 10: + case 10: mStepMode = 2; initTalk(0x300, NULL); break; @@ -4640,7 +4640,7 @@ int daNpc_Kn_c::ECut_seventhSkillExplain(int i_idx) { setPos(home.pos); setAngle(home.angle.y); - + cXyz sp64(0.0f, 0.0f, 375.0f); mDoMtx_stack_c::transS(home.pos); mDoMtx_stack_c::YrotM(home.angle.y); @@ -4776,7 +4776,7 @@ int daNpc_Kn_c::ECut_seventhSkillExplain(int i_idx) { if (mMotionSeqMngr.getNo() == 0x18 && mMotionSeqMngr.getStepNo() > 0) { rt = 1; for (int i = 0; i < 2; i++) { - fopAcM_createChild(PROC_NPC_KN, fopAcM_GetID(this), ((i + 1) << 8) + 7, ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle, NULL, -1, NULL); + fopAcM_createChild(fpcNm_NPC_KN_e, fopAcM_GetID(this), ((i + 1) << 8) + 7, ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle, NULL, -1, NULL); } } break; @@ -4786,7 +4786,7 @@ int daNpc_Kn_c::ECut_seventhSkillExplain(int i_idx) { mActionMode = 19; } break; - default: + default: rt = 1; break; } @@ -5018,7 +5018,7 @@ void daNpc_Kn_c::calcMagicBallPos() { fopAc_ac_c* actor; if (mType == 1 && fopAcM_SearchByID(parentActorID, &actor) && actor && - fopAcM_GetName(actor) == PROC_KN_BULLET && ((daObjKnBullet_c*)actor)->getActionMode() == 0) + fopAcM_GetName(actor) == fpcNm_KN_BULLET_e && ((daObjKnBullet_c*)actor)->getActionMode() == 0) { cXyz pos(150.0f, 0.0f, 0.0f); mDoMtx_stack_c::copy(mpModelMorf[0]->getModel()->getAnmMtx(13)); @@ -5265,20 +5265,20 @@ static actor_method_class daNpc_Kn_MethodTable = { }; actor_process_profile_definition g_profile_NPC_KN = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_KN, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Kn_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 347, // mPriority - &daNpc_Kn_MethodTable, // sub_method - 0x00044107, // 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_NPC_KN_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Kn_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_KN_e, + /* Actor SubMtd */ &daNpc_Kn_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_npc_kn_base.inc b/src/d/actor/d_a_npc_kn_base.inc index 547a8877e3..79e8349c3b 100644 --- a/src/d/actor/d_a_npc_kn_base.inc +++ b/src/d/actor/d_a_npc_kn_base.inc @@ -8,7 +8,7 @@ void daNpc_Kn_c::tgHitCallBack(fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf, daNpc_Kn_c* kn_actor = (daNpc_Kn_c*)i_tgActor; u8 cut_type = 0; if (i_atActor != NULL) { - if (fopAcM_GetProfName(i_atActor) == PROC_ALINK) { + if (fopAcM_GetProfName(i_atActor) == fpcNm_ALINK_e) { cut_type = ((daPy_py_c*)i_atActor)->getCutType(); } else { cut_type = 1; @@ -1005,7 +1005,7 @@ BOOL daNpc_Kn_c::srchPlayerActor() { cXyz daNpc_Kn_c::getAttnPos(fopAc_ac_c* i_actor) { cXyz attn_pos(i_actor->attention_info.position); - if (fopAcM_GetName(i_actor) == PROC_ALINK) { + if (fopAcM_GetName(i_actor) == fpcNm_ALINK_e) { attn_pos.y -= static_cast(i_actor)->getAttentionOffsetY(); } diff --git a/src/d/actor/d_a_npc_kn_teach02.inc b/src/d/actor/d_a_npc_kn_teach02.inc index e5cd876767..2a51383cc7 100644 --- a/src/d/actor/d_a_npc_kn_teach02.inc +++ b/src/d/actor/d_a_npc_kn_teach02.inc @@ -249,7 +249,7 @@ int daNpc_Kn_c::teach02_shieldReflectWait(void* param_0) { cXyz sp20(150.0f, 0.0f, 0.0f); mDoMtx_stack_c::copy(mpModelMorf[0]->getModel()->getAnmMtx(0xD)); mDoMtx_stack_c::multVec(&sp20, &sp20); - parentActorID = fopAcM_createChild(PROC_KN_BULLET, fopAcM_GetID(this), 0, &sp20, fopAcM_GetRoomNo(this), ¤t.angle, NULL, -1, NULL); + parentActorID = fopAcM_createChild(fpcNm_KN_BULLET_e, fopAcM_GetID(this), 0, &sp20, fopAcM_GetRoomNo(this), ¤t.angle, NULL, -1, NULL); } } else { mMotionSeqMngr.setNo(0x19, -1.0f, 1, 0); @@ -257,7 +257,7 @@ int daNpc_Kn_c::teach02_shieldReflectWait(void* param_0) { } } else { fopAc_ac_c* parent_p; - if (fopAcM_SearchByID(parentActorID, &parent_p) && parent_p != NULL && fopAcM_GetName(parent_p) == PROC_KN_BULLET && ((daObjKnBullet_c*)parent_p)->getActionMode() == 0) { + if (fopAcM_SearchByID(parentActorID, &parent_p) && parent_p != NULL && fopAcM_GetName(parent_p) == fpcNm_KN_BULLET_e && ((daObjKnBullet_c*)parent_p)->getActionMode() == 0) { if (mpModelMorf[0]->getFrame() >= 34.0f && mpModelMorf[0]->getFrame() < 35.0f) { ((daObjKnBullet_c*)parent_p)->setActionMode(1); parent_p->current.angle.y = mCurAngle.y; @@ -270,7 +270,7 @@ int daNpc_Kn_c::teach02_shieldReflectWait(void* param_0) { fopAc_ac_c* aTgHitActor_p = mCylCc.GetTgHitAc(); JUT_ASSERT(437, NULL != aTgHitActor_p); - if (fopAcM_GetName(aTgHitActor_p) == PROC_KN_BULLET) { + if (fopAcM_GetName(aTgHitActor_p) == fpcNm_KN_BULLET_e) { mEvtNo = 0xB; s16 var_r27 = cLib_targetAngleY(&aTgHitActor_p->current.pos, ¤t.pos); diff --git a/src/d/actor/d_a_npc_knj.cpp b/src/d/actor/d_a_npc_knj.cpp index f74d4f6160..d92f09b170 100644 --- a/src/d/actor/d_a_npc_knj.cpp +++ b/src/d/actor/d_a_npc_knj.cpp @@ -534,18 +534,18 @@ static actor_method_class daNpc_Knj_MethodTable = { }; actor_process_profile_definition g_profile_NPC_KNJ = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_KNJ, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Knj_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 349, // mPriority - &daNpc_Knj_MethodTable, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KNJ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Knj_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_KNJ_e, + /* Actor SubMtd */ &daNpc_Knj_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_kolin.cpp b/src/d/actor/d_a_npc_kolin.cpp index ff93ea6ee3..a7dd470d2b 100644 --- a/src/d/actor/d_a_npc_kolin.cpp +++ b/src/d/actor/d_a_npc_kolin.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_kolin.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -49,7 +49,7 @@ enum Kolin_TW_RES_File_ID { }; enum Kolin1_RES_File_ID { - /* BCK */ + /* BCK */ /* 0x06 */ BCK_KOLIN_CLUP = 0x6, /* 0x07 */ BCK_KOLIN_F_CLUP, /* 0x08 */ BCK_KOLIN_F_HAPPY_TALK, @@ -80,7 +80,7 @@ enum Kolin1_RES_File_ID { /* 0x21 */ BTK_KOLIN_NOZOKU, /* 0x22 */ BTK_KOLIN_STONE, /* 0x23 */ BTK_KOLIN_WALK_A, - + /* BTP */ /* 0x26 */ BTP_KOLIN_F_CLUP = 0x26, /* 0x27 */ BTP_KOLIN_F_KIZUKU, @@ -431,7 +431,7 @@ cPhs_Step daNpc_Kolin_c::create() { if (phase == cPhs_COMPLEATE_e) { OS_REPORT("\t(%s:%d) flowNo:%d, PathID:%02x, BitSW:%02x<%08x> ", fopAcM_getProcNameString(this), mType, mFlowNodeNo, (getPathID() >> 32) & 0xFF, getBitSW() & 0xFF, fopAcM_GetParam(this)); - + if (isDelete()) { OS_REPORT("===>isDelete:TRUE\n"); return cPhs_ERROR_e; @@ -725,7 +725,7 @@ void daNpc_Kolin_c::reset() { case 10: field_0x1017 = 1; break; - + case 9: case 11: default: @@ -740,7 +740,7 @@ void daNpc_Kolin_c::reset() { /* dSv_event_flag_c::F_0016 - Ordon Village - On 3rd day, start following Colin who is blocking path */ !daNpcT_chkEvtBit(20))) { /* dSv_event_tmp_flag_c::T_0021 - Ordon Village - Colin follows to Link's house */ - daNpcT_offTmpBit(22); + daNpcT_offTmpBit(22); } field_0x1010 = cM_rnd(); @@ -795,7 +795,7 @@ void daNpc_Kolin_c::setParam() { attention_info.flags = fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e; if (mType == 4) { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); } scale.set(mpHIO->m.common.scale, mpHIO->m.common.scale, mpHIO->m.common.scale); @@ -832,7 +832,7 @@ BOOL daNpc_Kolin_c::checkChangeEvt() { switch (mType) { case 2: break; - + case 3: /* dSv_event_flag_c::F_0019 - Ordon Woods - Spoke with Ilia (Colin is there too) at the spring */ if (daNpcT_chkEvtBit(23)) { @@ -859,7 +859,7 @@ BOOL daNpc_Kolin_c::checkChangeEvt() { void daNpc_Kolin_c::setAfterTalkMotion() { int i_index = FACE_NONE; - + switch (mFaceMotionSeqMngr.getNo()) { case FACE_NORMAL_TALK: i_index = FACE_H_NORMAL_TALK; @@ -894,19 +894,19 @@ void daNpc_Kolin_c::srchActors() { } if (mActorMngr[2].getActorP() == NULL) { - mActorMngr[2].entry(getNearestActorP(PROC_Obj_Hfuta)); + mActorMngr[2].entry(getNearestActorP(fpcNm_Obj_Hfuta_e)); } break; case 3: if (mActorMngr[3].getActorP() == NULL) { - mActorMngr[3].entry(getNearestActorP(PROC_NPC_YELIA)); + mActorMngr[3].entry(getNearestActorP(fpcNm_NPC_YELIA_e)); } break; case 4: if (mActorMngr[4].getActorP() == NULL) { - mActorMngr[4].entry(getNearestActorP(PROC_NPC_LEN)); + mActorMngr[4].entry(getNearestActorP(fpcNm_NPC_LEN_e)); } break; @@ -973,10 +973,10 @@ void daNpc_Kolin_c::action() { } void daNpc_Kolin_c::beforeMove() { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw) { @@ -1000,7 +1000,7 @@ void daNpc_Kolin_c::setAttnPos() { mpHIO->m.common.head_angleY_min, mpHIO->m.common.head_angleY_max, mpHIO->m.common.neck_rotation_ratio, rad_val, NULL); mJntAnm.calcJntRad(0.2f, 1.0f, rad_val); - + setMtx(); mDoMtx_stack_c::copy(mpMorf[0]->getModel()->getAnmMtx(getHeadJointNo())); mDoMtx_stack_c::multVec(&sp3c, &eyePos); @@ -1131,7 +1131,7 @@ int daNpc_Kolin_c::selectAction() { mNextAction = &daNpc_Kolin_c::follow; } break; - + case 10: mNextAction = &daNpc_Kolin_c::clothWait; break; @@ -1386,7 +1386,7 @@ int daNpc_Kolin_c::cutHail(int i_cutIndex) { } iVar1[0] = msgNo; - + if (talkProc(iVar1, FALSE, NULL, FALSE)) { if (msgNo == 0) { if (mFlow.checkEndFlow()) { @@ -1727,7 +1727,7 @@ int daNpc_Kolin_c::cutCacaricoConversation(int i_cutIndex) { rv = 1; } break; - + case 1: mJntAnm.lookPlayer(0); rv = 1; @@ -1803,7 +1803,7 @@ int daNpc_Kolin_c::cutClothTry(int i_cutIndex) { rv = 1; } break; - + case 1: rv = 1; break; @@ -1893,7 +1893,7 @@ int daNpc_Kolin_c::wait(void* param_1) { if (!mStagger.checkStagger()) { if (mType == 4) { mJntAnm.lookNone(0); - + if (getBitSW() != 0xFF) { if (dComIfGs_isSwitch(getBitSW(), fopAcM_GetRoomNo(this)) && mMotionSeqMngr.getNo() != MOT_DEMO_FEAR) { mMode = 1; @@ -1925,7 +1925,7 @@ int daNpc_Kolin_c::wait(void* param_1) { if (!chkActorInSight(mPlayerActorMngr.getActorP(), mAttnFovY, mCurAngle.y)) { mJntAnm.lookNone(0); - + if (mType == 11) { field_0x1018 = 1; } @@ -1964,7 +1964,7 @@ int daNpc_Kolin_c::wait(void* param_1) { switch (mType) { case 3: actor_p = mActorMngr[3].getActorP(); - + if (actor_p != NULL) { mJntAnm.lookActor(actor_p, 0.0f, 0); } @@ -1979,7 +1979,7 @@ int daNpc_Kolin_c::wait(void* param_1) { case 11: daHorse_c* horse_actor = dComIfGp_getHorseActor(); - + if (horse_actor != NULL) { mJntAnm.lookActor(horse_actor, 60.0f, 0); } @@ -2252,18 +2252,18 @@ static actor_method_class daNpc_Kolin_MethodTable = { }; actor_process_profile_definition g_profile_NPC_KOLIN = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_KOLIN, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Kolin_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 350, // mPriority - &daNpc_Kolin_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KOLIN_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Kolin_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_KOLIN_e, + /* Actor SubMtd */ &daNpc_Kolin_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_kolinb.cpp b/src/d/actor/d_a_npc_kolinb.cpp index 5f89f5c852..fa76592483 100644 --- a/src/d/actor/d_a_npc_kolinb.cpp +++ b/src/d/actor/d_a_npc_kolinb.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_kolinb.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -322,11 +322,11 @@ cPhs_Step daNpc_Kolinb_c::create() { mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this)); mCcStts.Init(mpHIO->m.common.weight, 0, this); - + field_0xe44.Set(mCcDCyl); field_0xe44.SetStts(&mCcStts); field_0xe44.SetTgHitCallback(tgHitCallBack); - + mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); @@ -432,7 +432,7 @@ u8 daNpc_Kolinb_c::getType() { switch (fopAcM_GetParam(this) & 0xFF) { case 0: return 0; - + case 1: return 1; @@ -573,10 +573,10 @@ void daNpc_Kolinb_c::action() { } void daNpc_Kolinb_c::beforeMove() { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw) { @@ -636,7 +636,7 @@ BOOL daNpc_Kolinb_c::chkAction(actionFunc action) { int daNpc_Kolinb_c::setAction(actionFunc action) { mMode = 3; - + if (mAction) { (this->*mAction)(NULL); } @@ -944,18 +944,18 @@ static actor_method_class daNpc_Kolinb_MethodTable = { }; actor_process_profile_definition g_profile_NPC_KOLINB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_KOLINB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Kolinb_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 351, // mPriority - &daNpc_Kolinb_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KOLINB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Kolinb_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_KOLINB_e, + /* Actor SubMtd */ &daNpc_Kolinb_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_ks.cpp b/src/d/actor/d_a_npc_ks.cpp index 639cb4167f..7d7dc1802b 100644 --- a/src/d/actor/d_a_npc_ks.cpp +++ b/src/d/actor/d_a_npc_ks.cpp @@ -289,7 +289,7 @@ static int daNpc_Ks_Draw(npc_ks_class* i_this) { static void* s_resq_sub(void* i_actor, void* i_data) { (void) i_data; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KS_e) { ((npc_ks_class*)i_actor)->anm_time = cM_rndF(50.0f) + 220.0f; } return NULL; @@ -528,7 +528,7 @@ static fopAc_ac_c* en_search_test(npc_ks_class* i_this) { static void* s_ori_sub(void* i_actor, void* i_data) { (void) i_data; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_SO) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_SO_e) { return i_actor; } return NULL; @@ -741,7 +741,7 @@ static int npc_ks_ori(npc_ks_class* i_this) { static void* shot_bo_sub(void* i_actor, void* i_data) { (void) i_data; fopAc_ac_c* player = dComIfGp_getPlayer(0); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_BOOMERANG && + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_BOOMERANG_e && dComIfGp_checkPlayerStatus0(0, 0x80000) == 0 && fopAcM_GetParam(i_actor) == 1) { cXyz ato(((daBoomerang_c*)i_actor)->current.pos - ((fopAc_ac_c*)i_data)->current.pos); if (ato.abs() < 1000.0f) { @@ -1053,7 +1053,7 @@ static void npc_ks_home(npc_ks_class* i_this) { } static void* s_sw_sub(void* i_actor, void* i_data) { - if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_SW)) { + if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_SW_e)) { if (fopAcM_GetRoomNo((fopAc_ac_c*)i_data) == 0) { if (((npc_ks_class*)i_data)->set_id == ((obj_sw_class*)i_actor)->field_0x570) { return i_actor; @@ -1067,7 +1067,7 @@ static void* s_sw_sub(void* i_actor, void* i_data) { static void* s_ha_sub(void* i_actor, void* i_data) { (void) i_data; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Pillar) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_Pillar_e) { return i_actor; } return NULL; @@ -1075,7 +1075,7 @@ static void* s_ha_sub(void* i_actor, void* i_data) { static void* s_01_sub(void* i_actor, void* i_data) { (void) i_data; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS && ((npc_ks_class*)i_actor)->action == 4) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KS_e && ((npc_ks_class*)i_actor)->action == 4) { return i_actor; } return NULL; @@ -1097,7 +1097,7 @@ static int npc_ks_demo_02(npc_ks_class* i_this) { int rv = 1; int iVar1 = 0; - obj_so_class* cage_p = (obj_so_class*)fopAcM_SearchByName(PROC_OBJ_SO); + obj_so_class* cage_p = (obj_so_class*)fopAcM_SearchByName(fpcNm_OBJ_SO_e); if (cage_p == NULL) { return 0; } @@ -1388,7 +1388,7 @@ static int npc_ks_demo_02(npc_ks_class* i_this) { static void* s_dn_sub(void* i_actor, void* i_data) { (void) i_data; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_OC) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_OC_e) { return i_actor; } return NULL; @@ -1740,7 +1740,7 @@ static void npc_ks_to_hang(npc_ks_class* i_this) { } static void* s_next_do_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KS_e) { npc_ks_class* mon_data = (npc_ks_class*) i_data; npc_ks_class* monkey_actor = (npc_ks_class*) i_actor; if (monkey_actor->field_0x5b5 != 0 && mon_data->order == (monkey_actor->order - 1 & 0xFF)) { @@ -1753,7 +1753,7 @@ static void* s_next_do_sub(void* i_actor, void* i_data) { } static void* s_next_get_sub(void* actor, void* i_data) { - if (fopAcM_IsActor(actor) && fopAcM_GetName(actor) == PROC_NPC_KS) { + if (fopAcM_IsActor(actor) && fopAcM_GetName(actor) == fpcNm_NPC_KS_e) { npc_ks_class* mon_data = (npc_ks_class*) i_data; npc_ks_class* monkey_actor = (npc_ks_class*) actor; if (monkey_actor->field_0x5b5 != 0 && @@ -2518,7 +2518,7 @@ static void cam_3d_morf(npc_ks_class* i_this, f32 param_2) { static void* s_fs_sub(void* i_actor, void* i_data) { (void) i_data; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_FS) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_FS_e) { ((e_fs_class*)i_actor)->mAction = 10; ((e_fs_class*)i_actor)->mMode = 0; } @@ -2527,7 +2527,7 @@ static void* s_fs_sub(void* i_actor, void* i_data) { static void* s_fsdown_sub(void* i_actor, void* i_data) { (void) i_data; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_FS) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_FS_e) { ((e_fs_class*)i_actor)->mTimer[0] = (fopAcM_GetID(i_actor) & 0x3) << 3; ((e_fs_class*)i_actor)->mMode++; } @@ -5974,7 +5974,7 @@ static int npc_ks_fsdemo(npc_ks_class* i_this) { } } - if ((i_this->mode == 40 || i_this->mode == 41) && fopAcM_SearchByName(PROC_E_FS) == NULL && i_this->demo_mode == 0) { + if ((i_this->mode == 40 || i_this->mode == 41) && fopAcM_SearchByName(fpcNm_E_FS_e) == NULL && i_this->demo_mode == 0) { i_this->mode = 42; i_this->timer[1] = 30; } @@ -6592,7 +6592,7 @@ static void action(npc_ks_class* i_this) { static void* s_kago_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_KAGO) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_KAGO_e) { if (((daObj_Kago_c*)i_actor)->getType() == 0) { return i_actor; } @@ -7243,7 +7243,7 @@ static BOOL start_check(npc_ks_class* i_this) { break; case 20: - fopAcM_OnStatus(actor, 0x20000); + fopAcM_OnStatus(actor, fopAcStts_NOPAUSE_e); i_this->action = 300; i_this->field_0xc17 = 1; iVar2 = 1; @@ -7299,7 +7299,7 @@ static BOOL start_check(npc_ks_class* i_this) { } static void* s_check_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KS_e) { if (fopAcM_GetID(i_actor) != fopAcM_GetID(i_data) && ((npc_ks_class*)i_actor)->set_id == ((npc_ks_class*)i_data)->set_id) { return i_actor; } @@ -7458,18 +7458,18 @@ static actor_method_class l_daNpc_Ks_Method = { }; actor_process_profile_definition g_profile_NPC_KS = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_KS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(npc_ks_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 701, // mPriority - &l_daNpc_Ks_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(npc_ks_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_KS_e, + /* Actor SubMtd */ &l_daNpc_Ks_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_kyury.cpp b/src/d/actor/d_a_npc_kyury.cpp index 66e11f4149..2ca6652468 100644 --- a/src/d/actor/d_a_npc_kyury.cpp +++ b/src/d/actor/d_a_npc_kyury.cpp @@ -503,9 +503,9 @@ void daNpc_Kyury_c::action() { } void daNpc_Kyury_c::beforeMove() { - fopAcM_OffStatus(this, 0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw != 0) { @@ -891,18 +891,18 @@ static actor_method_class daNpc_Kyury_MethodTable = { }; actor_process_profile_definition g_profile_NPC_KYURY = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_KYURY, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Kyury_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 352, // mPriority - &daNpc_Kyury_MethodTable, // sub_method - 0x00040108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KYURY_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Kyury_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_KYURY_e, + /* Actor SubMtd */ &daNpc_Kyury_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_len.cpp b/src/d/actor/d_a_npc_len.cpp index f3b1330f51..f61784592a 100644 --- a/src/d/actor/d_a_npc_len.cpp +++ b/src/d/actor/d_a_npc_len.cpp @@ -550,18 +550,18 @@ void daNpc_Len_c::srchActors() { break; case TYPE_4: if (mActorMngr[0].getActorP() == NULL) { - mActorMngr[0].entry(getNearestActorP(PROC_NPC_KOLINB)); + mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_KOLINB_e)); } break; case TYPE_8: if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(getNearestActorP(PROC_NPC_YELIA)); + mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_YELIA_e)); } if (mActorMngr[2].getActorP() == NULL) { - mActorMngr[2].entry(getNearestActorP(PROC_NPC_GRD)); + mActorMngr[2].entry(getNearestActorP(fpcNm_NPC_GRD_e)); } if (mActorMngr[3].getActorP() == NULL) { - mActorMngr[3].entry(getNearestActorP(PROC_NPC_GRZ)); + mActorMngr[3].entry(getNearestActorP(fpcNm_NPC_GRZ_e)); } break; } @@ -643,9 +643,9 @@ void daNpc_Len_c::action() { } void daNpc_Len_c::beforeMove() { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw != 0) { @@ -1213,7 +1213,7 @@ int daNpc_Len_c::talk(void* param_0) { * control) A */ daNpcT_offTmpBit(0xB); } - if (mPreItemNo == fpcNm_ITEM_WOOD_STATUE) { + if (mPreItemNo == dItemNo_WOOD_STATUE_e) { initTalk(0x28, NULL); } else { initTalk(mFlowNodeNo, NULL); @@ -1297,18 +1297,18 @@ static actor_method_class daNpc_Len_MethodTable = { }; actor_process_profile_definition g_profile_NPC_LEN = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_LEN, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Len_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 337, // mPriority - &daNpc_Len_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_LEN_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Len_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_LEN_e, + /* Actor SubMtd */ &daNpc_Len_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_lf.cpp b/src/d/actor/d_a_npc_lf.cpp index 4ee24c6c5a..30b83fda7a 100644 --- a/src/d/actor/d_a_npc_lf.cpp +++ b/src/d/actor/d_a_npc_lf.cpp @@ -333,18 +333,18 @@ static actor_method_class l_daNPC_LF_Method = { }; actor_process_profile_definition g_profile_NPC_LF = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_LF, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(npc_lf_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 702, // mPriority - &l_daNPC_LF_Method, // sub_method - 0x00040000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_LF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(npc_lf_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_LF_e, + /* Actor SubMtd */ &l_daNPC_LF_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_lud.cpp b/src/d/actor/d_a_npc_lud.cpp index e49570602f..cd15d60d22 100644 --- a/src/d/actor/d_a_npc_lud.cpp +++ b/src/d/actor/d_a_npc_lud.cpp @@ -611,15 +611,15 @@ void daNpc_Lud_c::srchActors() { switch (mType) { case TYPE_1: if (mActorMngr[2].getActorP() == NULL) { - mActorMngr[2].entry(getNearestActorP(PROC_NPC_LEN)); + mActorMngr[2].entry(getNearestActorP(fpcNm_NPC_LEN_e)); } break; case TYPE_5: if (mActorMngr[0].getActorP() == NULL) { - mActorMngr[0].entry(getNearestActorP(PROC_NPC_BESU)); + mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_BESU_e)); } if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(getNearestActorP(PROC_NPC_KOLINB)); + mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_KOLINB_e)); } break; } @@ -684,9 +684,9 @@ void daNpc_Lud_c::action() { } void daNpc_Lud_c::beforeMove() { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw != 0) { @@ -1513,18 +1513,18 @@ static actor_method_class daNpc_Lud_MethodTable = { }; actor_process_profile_definition g_profile_NPC_LUD = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_LUD, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Lud_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 338, // mPriority - &daNpc_Lud_MethodTable, // sub_method - 0x00040108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_LUD_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Lud_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_LUD_e, + /* Actor SubMtd */ &daNpc_Lud_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_maro.cpp b/src/d/actor/d_a_npc_maro.cpp index b96083b7f6..7b2166a1a1 100644 --- a/src/d/actor/d_a_npc_maro.cpp +++ b/src/d/actor/d_a_npc_maro.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_maro.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -429,7 +429,7 @@ void* daNpc_Maro_c::srchArrow(void* arg0, void* arg1) { if (mFindCount < 50) { fopAc_ac_c* fop0 = (fopAc_ac_c*) arg0; if (fop0 != NULL && fop0 != fop1) { - if (fopAcM_IsExecuting(fopAcM_GetID(fop0)) && fopAcM_GetName(fop0) == PROC_ARROW) { + if (fopAcM_IsExecuting(fopAcM_GetID(fop0)) && fopAcM_GetName(fop0) == fpcNm_ARROW_e) { mFindActorPtrs[mFindCount] = fop0; mFindCount++; } @@ -459,7 +459,7 @@ void* daNpc_Maro_c::srchItaMato(void* arg0, void* arg1) { if (mFindCount < 50) { fopAc_ac_c* fop0 = (fopAc_ac_c*) arg0; if (fop0 != NULL && fop0 != fop1) { - if (fopAcM_IsExecuting(fopAcM_GetID(fop0)) && fopAcM_GetName(fop0) == PROC_OBJ_ITAMATO) { + if (fopAcM_IsExecuting(fopAcM_GetID(fop0)) && fopAcM_GetName(fop0) == fpcNm_OBJ_ITAMATO_e) { mFindActorPtrs[mFindCount] = fop0; mFindCount++; } @@ -826,37 +826,37 @@ void daNpc_Maro_c::srchActors() { switch (mType) { case TYPE_0: { if (mActorMngr[0].getActorP() == NULL) { - mActorMngr[0].entry(getNearestActorP(PROC_NPC_KAKASHI)); + mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_KAKASHI_e)); } if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(getNearestActorP(PROC_NPC_TARO)); + mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_TARO_e)); } if (mActorMngr[2].getActorP() == NULL) { - mActorMngr[2].entry(getNearestActorP(PROC_NPC_BESU)); + mActorMngr[2].entry(getNearestActorP(fpcNm_NPC_BESU_e)); } if (mActorMngr[3].getActorP() == NULL) { - mActorMngr[3].entry(getNearestActorP(PROC_NPC_KOLIN)); + mActorMngr[3].entry(getNearestActorP(fpcNm_NPC_KOLIN_e)); } break; } case TYPE_1: { if (mActorMngr[0].getActorP() == NULL) { - mActorMngr[0].entry(getNearestActorP(PROC_NPC_KAKASHI)); + mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_KAKASHI_e)); } if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(getNearestActorP(PROC_NPC_TARO)); + mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_TARO_e)); } break; } case TYPE_3: { if (mActorMngr[8].getActorP() == NULL) { - mActorMngr[8].entry(getNearestActorP(PROC_NPC_LEN)); + mActorMngr[8].entry(getNearestActorP(fpcNm_NPC_LEN_e)); } break; @@ -866,7 +866,7 @@ void daNpc_Maro_c::srchActors() { case TYPE_7: { if (&daNpc_Maro_c::arrowTutorial == field_0x110c) { if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(getNearestActorP(PROC_NPC_TARO)); + mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_TARO_e)); } if (mActorMngr[6].getActorP() == NULL) { @@ -883,7 +883,7 @@ void daNpc_Maro_c::srchActors() { case TYPE_10: { if (mActorMngr[2].getActorP() == NULL) { - mActorMngr[2].entry(getNearestActorP(PROC_NPC_BESU)); + mActorMngr[2].entry(getNearestActorP(fpcNm_NPC_BESU_e)); } break; @@ -891,34 +891,34 @@ void daNpc_Maro_c::srchActors() { case TYPE_12: { if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(getNearestActorP(PROC_NPC_TARO)); + mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_TARO_e)); } if (mActorMngr[3].getActorP() == NULL) { - mActorMngr[3].entry(getNearestActorP(PROC_NPC_KOLIN)); + mActorMngr[3].entry(getNearestActorP(fpcNm_NPC_KOLIN_e)); } if (mActorMngr[7].getActorP() == NULL) { - mActorMngr[7].entry(getNearestActorP(PROC_NPC_SARU)); + mActorMngr[7].entry(getNearestActorP(fpcNm_NPC_SARU_e)); } break; } case TYPE_13: { if (mActorMngr[0].getActorP() == NULL) { - mActorMngr[0].entry(getNearestActorP(PROC_NPC_KAKASHI)); + mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_KAKASHI_e)); } if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(getNearestActorP(PROC_NPC_TARO)); + mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_TARO_e)); } if (mActorMngr[2].getActorP() == NULL) { - mActorMngr[2].entry(getNearestActorP(PROC_NPC_BESU)); + mActorMngr[2].entry(getNearestActorP(fpcNm_NPC_BESU_e)); } if (mActorMngr[3].getActorP() == NULL) { - mActorMngr[3].entry(getNearestActorP(PROC_NPC_KOLIN)); + mActorMngr[3].entry(getNearestActorP(fpcNm_NPC_KOLIN_e)); } break; } @@ -1032,9 +1032,9 @@ void daNpc_Maro_c::action() { } void daNpc_Maro_c::beforeMove() { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw) { attention_info.flags = 0; @@ -2632,7 +2632,7 @@ int daNpc_Maro_c::cutMarosWhisper(int arg0) { actor_p = mActorMngr[0].getActorP(); JUT_ASSERT(4088, NULL != actor_p); angle_y = fopAcM_searchActorAngleY(daPy_getPlayerActorClass(), actor_p); - daPy_getPlayerActorClass()->setPlayerPosAndAngle(&daPy_getPlayerActorClass()->current.pos, + daPy_getPlayerActorClass()->setPlayerPosAndAngle(&daPy_getPlayerActorClass()->current.pos, angle_y, 0); break; } @@ -3516,18 +3516,18 @@ static actor_method_class daNpc_Maro_MethodTable = { }; actor_process_profile_definition g_profile_NPC_MARO = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_MARO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Maro_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 353, // mPriority - &daNpc_Maro_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_MARO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Maro_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_MARO_e, + /* Actor SubMtd */ &daNpc_Maro_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_midp.cpp b/src/d/actor/d_a_npc_midp.cpp index acd11c56dc..4c11c71b75 100644 --- a/src/d/actor/d_a_npc_midp.cpp +++ b/src/d/actor/d_a_npc_midp.cpp @@ -167,7 +167,7 @@ int daNpc_midP_c::create() { J3DModelData* modelData = mpMorf[0]->getModel()->getModelData(); fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); mSound.init(¤t.pos, &eyePos, 3, 1); @@ -647,18 +647,18 @@ static actor_method_class daNpc_midP_MethodTable = { }; actor_process_profile_definition g_profile_NPC_MIDP = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_MIDP, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_midP_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 354, // mPriority - &daNpc_midP_MethodTable, // sub_method - 0x00044108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_MIDP_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_midP_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_MIDP_e, + /* Actor SubMtd */ &daNpc_midP_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_mk.cpp b/src/d/actor/d_a_npc_mk.cpp index 6ba3d54341..9782fa54f9 100644 --- a/src/d/actor/d_a_npc_mk.cpp +++ b/src/d/actor/d_a_npc_mk.cpp @@ -36,18 +36,18 @@ static actor_method_class daNpc_Mk_MethodTable = { }; actor_process_profile_definition g_profile_NPC_MK = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_MK, // mProcName - &g_fpcLf_Method.base, // sub_method - 0x00000001, // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 427, // mPriority - &daNpc_Mk_MethodTable, // sub_method - 0x020C4407, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_MK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ 0x00000001, + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_MK_e, + /* Actor SubMtd */ &daNpc_Mk_MethodTable, + /* Status */ fopAcStts_UNK_0x2000000_e | fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_FREEZE_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_moi.cpp b/src/d/actor/d_a_npc_moi.cpp index 81a60b15e2..c0101e4114 100644 --- a/src/d/actor/d_a_npc_moi.cpp +++ b/src/d/actor/d_a_npc_moi.cpp @@ -622,7 +622,7 @@ void daNpc_Moi_c::setParam() { attention_info.distances[fopAc_attn_SPEAK_e] = daNpcT_getDistTableIdx(talk_distance, talk_angle); attention_info.flags = 0; - fopAcM_OffStatus(this, 0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); } else { attention_info.distances[fopAc_attn_LOCK_e] = daNpcT_getDistTableIdx(attention_distance, attention_angle); @@ -781,7 +781,7 @@ void daNpc_Moi_c::action() { } } - if (mSph.ChkAtHit() && fopAcM_GetProfName(mSph.GetAtHitAc()) == PROC_ALINK) { + if (mSph.ChkAtHit() && fopAcM_GetProfName(mSph.GetAtHitAc()) == fpcNm_ALINK_e) { /* dSv_event_tmp_flag_c::T_0047 - Ordon Village - Right after wrestling with Bo (Used to connect with conversation after wearing clothes) */ @@ -790,9 +790,9 @@ void daNpc_Moi_c::action() { } void daNpc_Moi_c::beforeMove() { - fopAcM_OffStatus(this, 0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw != 0) { @@ -1059,7 +1059,7 @@ int daNpc_Moi_c::setAction(int (daNpc_Moi_c::*param_0)(void*)) { } BOOL daNpc_Moi_c::chkPlayerGetWoodShield() { - return (u8)(dComIfGs_isItemFirstBit(fpcNm_ITEM_WOOD_SHIELD) ? 1 : 0); + return (u8)(dComIfGs_isItemFirstBit(dItemNo_WOOD_SHIELD_e) ? 1 : 0); } void daNpc_Moi_c::setSSlash(int param_1) { @@ -1146,7 +1146,7 @@ void daNpc_Moi_c::torch() { if (actor == NULL && field_0x166f == 0) { if (field_0x15c0 == 0xFFFFFFFF) { field_0x15c0 = - fopAcM_createChild(PROC_EP, fopAcM_GetID(this), -247, &field_0x1628, + fopAcM_createChild(fpcNm_EP_e, fopAcM_GetID(this), -247, &field_0x1628, fopAcM_GetRoomNo(this), &mCurAngle, NULL, -1, NULL); } if (fopAcM_SearchByID(field_0x15c0, &actor) && actor != NULL) { @@ -1991,20 +1991,20 @@ static actor_method_class daNpc_Moi_MethodTable = { }; actor_process_profile_definition g_profile_NPC_MOI = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_MOI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Moi_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 355, // mPriority - &daNpc_Moi_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_MOI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Moi_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_MOI_e, + /* Actor SubMtd */ &daNpc_Moi_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_npc_moir.cpp b/src/d/actor/d_a_npc_moir.cpp index e0c9306364..dde4a7c3bf 100644 --- a/src/d/actor/d_a_npc_moir.cpp +++ b/src/d/actor/d_a_npc_moir.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_moir.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -43,7 +43,7 @@ enum MoiR1_RES_File_ID { }; enum MoiR2_RES_File_ID { - /* BCK */ + /* BCK */ /* 0x04 */ BCK_MOIR_DRIVEAWAY = 0x4, /* 0x05 */ BCK_MOIR_F_DRIVEAWAY, /* 0x06 */ BCK_MOIR_F_FUE, @@ -311,7 +311,7 @@ cPhs_Step daNpcMoiR_c::Create() { return cPhs_ERROR_e; } - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); mMode = MODE_2; } @@ -521,15 +521,15 @@ int daNpcMoiR_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) { void daNpcMoiR_c::searchActors() { 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_SHAD)); + mActorMngr[2].entry(fopAcM_SearchByName(fpcNm_NPC_SHAD_e)); } if (mActorMngr[3].getActorP() == NULL) { - mActorMngr[3].entry(fopAcM_SearchByName(PROC_NPC_RAFREL)); + mActorMngr[3].entry(fopAcM_SearchByName(fpcNm_NPC_RAFREL_e)); } } @@ -941,7 +941,7 @@ void daNpcMoiR_c::lookat() { switch (mLookMode) { case LOOK_NONE: break; - + case LOOK_RESET: bVar1 = TRUE; break; @@ -982,7 +982,7 @@ void daNpcMoiR_c::lookat() { mLookat.setAttnPos(0); } - mLookat.setParam(body_angleX_min, body_angleX_max, body_angleY_min, body_angleY_max, 0.0f, 0.0f, 0.0f, 0.0f, + mLookat.setParam(body_angleX_min, body_angleX_max, body_angleY_min, body_angleY_max, 0.0f, 0.0f, 0.0f, 0.0f, head_angleX_min, head_angleX_max, head_angleY_min, head_angleY_max, mCurAngle.y, spd0); mLookat.calc(this, model->getBaseTRMtx(), local_dc, bVar1, sVar1, FALSE); } @@ -1567,7 +1567,7 @@ bool daNpcMoiR_c::leave(void* param_1) { setMotion(MOT_RUN, -1.0f, 0); mTurnMode = 0; speedF = 0.0f; - fopAcM_SearchByName(PROC_NPC_TK, (fopAc_ac_c**)&actor_p); + fopAcM_SearchByName(fpcNm_NPC_TK_e, (fopAc_ac_c**)&actor_p); if (actor_p != NULL) { actor_p->setAway(); @@ -1721,7 +1721,7 @@ BOOL daNpcMoiR_c::EvCut_Appear2(int i_cutIndex) { setExpression(EXPR_NONE, -1.0f); setMotion(MOT_TAKAJO_NI, -1.0f, 0); mTurnMode = 0; - ni_class* actor_p = (ni_class*)fopAcM_SearchByName(PROC_NI); + ni_class* actor_p = (ni_class*)fopAcM_SearchByName(fpcNm_NI_e); if (actor_p != NULL) { actor_p->changeMode(); @@ -1791,7 +1791,7 @@ BOOL daNpcMoiR_c::EvCut_Appear2(int i_cutIndex) { case '0005': if (talkProc(NULL, TRUE, NULL)) { - ni_class* actor_p = (ni_class*)fopAcM_SearchByName(PROC_NI); + ni_class* actor_p = (ni_class*)fopAcM_SearchByName(fpcNm_NI_e); if (actor_p != NULL) { actor_p->changeMode(); @@ -1986,7 +1986,7 @@ void daNpcMoiR_c::setAttnPos() { sp58.y = current.pos.y; field_0xca0.SetC(sp58); field_0xca0.SetH(mpHIO->m.common.height); - + f32 fVar1; if (mMode == MODE_SIT) { fVar1 = 40.0f; @@ -2020,18 +2020,18 @@ static actor_method_class daNpcMoiR_MethodTable = { }; actor_process_profile_definition g_profile_NPC_MOIR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_MOIR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcMoiR_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 415, // mPriority - &daNpcMoiR_MethodTable, // sub_method - 0x00040100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_MOIR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcMoiR_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_MOIR_e, + /* Actor SubMtd */ &daNpcMoiR_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_myna2.cpp b/src/d/actor/d_a_npc_myna2.cpp index 03eb48944d..f7d8b7f048 100644 --- a/src/d/actor/d_a_npc_myna2.cpp +++ b/src/d/actor/d_a_npc_myna2.cpp @@ -853,7 +853,7 @@ int daNpc_myna2_c::waitHovering(void* param_0) { } static void* s_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_MYNA2 && ((daNpc_myna2_c*)i_actor)->getType() == 1) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_MYNA2_e && ((daNpc_myna2_c*)i_actor)->getType() == 1) { return i_actor; } @@ -1362,20 +1362,20 @@ static actor_method_class daNpc_myna2_MethodTable = { }; actor_process_profile_definition g_profile_MYNA2 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_MYNA2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_myna2_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 393, // mPriority - &daNpc_myna2_MethodTable, // sub_method - 0x08044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MYNA2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_myna2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_MYNA2_e, + /* Actor SubMtd */ &daNpc_myna2_MethodTable, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_npc_ne.cpp b/src/d/actor/d_a_npc_ne.cpp index 6f03de96ce..0ff4c01d41 100644 --- a/src/d/actor/d_a_npc_ne.cpp +++ b/src/d/actor/d_a_npc_ne.cpp @@ -9,7 +9,7 @@ #include "SSystem/SComponent/c_counter.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/actor/d_a_mg_rod.h" #include "d/actor/d_a_mg_fish.h" #include "SSystem/SComponent/c_math.h" @@ -133,7 +133,7 @@ static int daNpc_Ne_Draw(npc_ne_class* i_this) { if (daPy_py_c::linkGrabSubjectNoDraw(i_this)) { return 1; } - + J3DModel* model = i_this->mpMorf->getModel(); if (i_this->mResName == "Npc_net") { if (!dComIfGs_wolfeye_effect_check()) { @@ -219,7 +219,7 @@ static int way_bg_check(npc_ne_class* i_this, s16 i_angle) { return 1; } } - + mDoMtx_YrotS(*calc_mtx, _this->current.angle.y + i_angle); vec3.set(0.0f, 150.0f, 150.0f); MtxPosition(&vec3, &vec2); @@ -313,7 +313,7 @@ static int target_info_count; static void* s_bl_sub(void* i_proc, void* i_this) { if (fopAc_IsActor(i_proc) - && (fopAcM_GetName(i_proc) == PROC_OBJ_FOOD || fopAcM_GetName(i_proc) == PROC_BD) + && (fopAcM_GetName(i_proc) == fpcNm_OBJ_FOOD_e || fopAcM_GetName(i_proc) == fpcNm_BD_e) && target_info_count < 5) { target_info[target_info_count] = static_cast(i_proc); @@ -324,7 +324,7 @@ static void* s_bl_sub(void* i_proc, void* i_this) { static void* s_ss_sub(void* i_proc, void* i_this) { if (fopAc_IsActor(i_proc) - && (fopAcM_GetName(i_proc) == PROC_NI || fopAcM_GetName(i_proc) == PROC_BD) + && (fopAcM_GetName(i_proc) == fpcNm_NI_e || fopAcM_GetName(i_proc) == fpcNm_BD_e) && target_info_count < 5) { target_info[target_info_count] = static_cast(i_proc); @@ -373,7 +373,7 @@ static fopAc_ac_c* search_bird(npc_ne_class* i_this) { } } } - + i++; if (i == target_info_count) { i = 0; @@ -645,7 +645,7 @@ static void npc_ne_away(npc_ne_class* i_this) { } i_this->mBackboneTargetAngleY = ang_y; } - + i_this->mpMorf->setPlaySpeed(i_this->mAnmSpeed); } @@ -690,7 +690,7 @@ static cXyz ground_search(npc_ne_class* i_this) { static void* s_fish_sub(void* i_proc, void* i_this) { npc_ne_class* _this = static_cast(i_this); - if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_MG_FISH) { + if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_MG_FISH_e) { mg_fish_class* fish = (mg_fish_class*)i_proc; if (fish->mCurAction == 0x35 && fish->mActionPhase >= 10) { _this->mFishID = fopAcM_GetID(fish); @@ -825,7 +825,7 @@ static void npc_ne_tame(npc_ne_class* i_this) { i_this->mMode++; i_this->mSound.startSound(Z2SE_CAT_CRY_FAMILIER, 0, -1); // fallthrough - + case 6: i_this->mTargetAngleY = i_this->mAngleToPlayer; angle_max_step = 0xa00; @@ -839,7 +839,7 @@ static void npc_ne_tame(npc_ne_class* i_this) { i_this->mMode = 1; } break; - + case 7: i_this->mAnmSpeed = 1.0f; anm_init(i_this, npc_ne_class::ANM_RUN, 3.0f, 2, i_this->mAnmSpeed); @@ -853,7 +853,7 @@ static void npc_ne_tame(npc_ne_class* i_this) { cLib_addCalc2(&i_this->mAnmSpeed, 1.5f, 1.0f, 0.1f); cLib_addCalc2(&_this->speedF, i_this->mAnmSpeed * l_HIO.mRunSpeed, 1.0f, 0.5f * l_HIO.mRunSpeed); - + if (i_this->mCounter & 1) { ivar7 = way_bg_check(i_this, 0); } @@ -861,7 +861,7 @@ static void npc_ne_tame(npc_ne_class* i_this) { { i_this->mTargetAngleY = i_this->mAngleToPlayer + 0x8000 + (s16)cM_rndFX(4000.0f); - way_check(i_this, i_this->mTargetAngleY); + way_check(i_this, i_this->mTargetAngleY); } if (i_this->mDistToTarget > dist3 + 40.0f) { @@ -870,13 +870,13 @@ static void npc_ne_tame(npc_ne_class* i_this) { i_this->mMode = 1; } break; - + case 10: case 11: i_this->mTargetAngleY = i_this->mAngleToPlayer; cLib_addCalc0(&_this->speedF, 1.0f, 3.0f); angle_diff = _this->current.angle.y - i_this->mTargetAngleY; - + if (i_this->mMode == 10) { if (angle_diff > 0x400 || angle_diff < -0x400) { i_this->mAnmSpeed = 1.0f; @@ -1003,7 +1003,7 @@ static void npc_ne_bird(npc_ne_class* i_this) { i_this->mMode++; i_this->mDistScale = cM_rndFX(0.2f) + 1.0f; // fallthrough - + case 1: max_angle_step = 0x400; i_this->mTailTargetAngle = -15000; @@ -1635,7 +1635,7 @@ static BOOL npc_ne_home(npc_ne_class* i_this) { s16 prev_ang_y = i_this->current.angle.y; cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->mTargetAngleY, 2, i_this->mAngleYStep); cLib_addCalc2(&i_this->mAngleYStep, 5000.0f, 1.0f, 200.0f); - + f32 ang_z = i_this->speedF * (i_this->current.angle.y - prev_ang_y) * -0.5f; if (ang_z > 4000.0f) { ang_z = 4000.0f; @@ -1643,7 +1643,7 @@ static BOOL npc_ne_home(npc_ne_class* i_this) { ang_z = -4000.0f; } i_this->current.angle.z = ang_z; - + if (i_this->mAngleYStep > 1000.0f) { f32 ang_y = i_this->speedF * (i_this->current.angle.y - prev_ang_y) * 0.1f; if (ang_y > 5000.0f) { @@ -2309,7 +2309,7 @@ static void action(npc_ne_class* i_this) { if (bird_check && !i_this->mWantsFish) { fopAc_ac_c* bird_or_ball = search_bird(i_this); if (bird_or_ball != NULL) { - if (fopAcM_GetName(bird_or_ball) == PROC_OBJ_FOOD) { + if (fopAcM_GetName(bird_or_ball) == fpcNm_OBJ_FOOD_e) { i_this->mAction = npc_ne_class::ACT_BALL; i_this->mMode = 0; carry_check = true; @@ -2335,7 +2335,7 @@ static void action(npc_ne_class* i_this) { cXyz vec1, vec2; if (i_this->mWantsFish && i_this->mAction != npc_ne_class::ACT_SANBASI && player->current.pos.z > -2800.0f) { - dmg_rod_class* rod = ((dmg_rod_class*)fopAcM_SearchByName(PROC_MG_ROD)); + dmg_rod_class* rod = ((dmg_rod_class*)fopAcM_SearchByName(fpcNm_MG_ROD_e)); if (rod != NULL && rod->kind == 1 && rod->action != 5 && rod->play_cam_mode != 0 && !i_this->mNoFollow) { if (i_this->mDistToTarget > 500.0f) { @@ -2638,7 +2638,7 @@ static void demo_camera(npc_ne_class* i_this) { case 2: daPy_getPlayerActorClass()->setPlayerPosAndAngle(&player->current.pos, i_this->mAngleToPlayer + 0x8000, 0); - + center = _this->current.pos; eye = _this->current.pos; eye.y += 200.0f; @@ -2664,7 +2664,7 @@ static void demo_camera(npc_ne_class* i_this) { } if (i_this->mDemoCounter == 12) { - fopAc_ac_c* door = fopAcM_SearchByName(PROC_OBJ_NDOOR); + fopAc_ac_c* door = fopAcM_SearchByName(fpcNm_OBJ_NDOOR_e); if (door != NULL) { door->field_0x567 = 10; Z2GetAudioMgr()->seStart(Z2SE_OBJ_CAT_DOOR, &door->current.pos, @@ -2702,7 +2702,7 @@ static void demo_camera(npc_ne_class* i_this) { case 11: daPy_getPlayerActorClass()->setPlayerPosAndAngle(&player->current.pos, i_this->mAngleToPlayer + 0x8000, 0); - + mDoMtx_YrotS(*calc_mtx, _this->current.angle.y); if (i_this->mMode >= 13) { @@ -2838,7 +2838,7 @@ static void demo_camera(npc_ne_class* i_this) { } i_this->mDemoCounter++; - + if (i_this->mDemoMode < 10 && i_this->mAction != npc_ne_class::ACT_HOME) { i_this->mDemoMode = 100; } @@ -2857,7 +2857,7 @@ static int message(npc_ne_class* i_this) { i_this->mIsTalking = 0; if (i_this->mIsGengle == 1 && (i_this->mMsgFlow.getNowMsgNo() == 0x18a1 || i_this->mMsgFlow.getNowMsgNo() == 0x18a2)) { - fopAcM_createItem(&dComIfGp_getPlayer(0)->eyePos, fpcNm_ITEM_SILVER_RUPEE, -1, + fopAcM_createItem(&dComIfGp_getPlayer(0)->eyePos, dItemNo_SILVER_RUPEE_e, -1, fopAcM_GetRoomNo(i_this), NULL, NULL, 3); } } @@ -2897,7 +2897,7 @@ static int daNpc_Ne_Execute(npc_ne_class* i_this) { /* dSv_event_flag_c::F_0470 - Fishing Pond - Reserved for fishing */ if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[470]) && i_this->mDistToTarget < 1500.0f) { - if (fopAcM_SearchByName(PROC_MG_ROD) != NULL) { + if (fopAcM_SearchByName(fpcNm_MG_ROD_e) != NULL) { i_this->mNoFollow = false; } else { i_this->mNoFollow = true; @@ -3114,7 +3114,7 @@ static cPhs_Step daNpc_Ne_Create(fopAc_ac_c* i_this) { _this->mPathIndex = (u8)(fopAcM_GetParam(_this) >> 0x10); _this->mIsGengle = (u8)(fopAcM_GetParam(_this) >> 0x18); - if (_this->mIsGengle == 1 + if (_this->mIsGengle == 1 /* dSv_event_flag_c::F_0457 - Castle Town - Revived cat */ && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[457])) { return cPhs_ERROR_e; @@ -3256,20 +3256,20 @@ static actor_method_class l_daNpc_Ne_Method = { }; actor_process_profile_definition g_profile_NPC_NE = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_NPC_NE, - &g_fpcLf_Method.base, - sizeof(npc_ne_class), - 0, - 0, - &g_fopAc_Method.base, - 0x2BC, - &l_daNpc_Ne_Method, - 0x8044000, - fopAc_NPC_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_NE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(npc_ne_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_NE_e, + /* Actor SubMtd */ &l_daNpc_Ne_Method, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_npc_p2.cpp b/src/d/actor/d_a_npc_p2.cpp index befb665c12..c2dfdf711f 100644 --- a/src/d/actor/d_a_npc_p2.cpp +++ b/src/d/actor/d_a_npc_p2.cpp @@ -36,18 +36,18 @@ static actor_method_class daNpc_P2MethodTable = { }; actor_process_profile_definition g_profile_NPC_P2 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_P2, // mProcName - &g_fpcLf_Method.base, // sub_method - 0x00000001, // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 428, // mPriority - &daNpc_P2MethodTable, // sub_method - 0x020C4407, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_P2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ 0x00000001, + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_P2_e, + /* Actor SubMtd */ &daNpc_P2MethodTable, + /* Status */ fopAcStts_UNK_0x2000000_e | fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_FREEZE_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_pachi_besu.cpp b/src/d/actor/d_a_npc_pachi_besu.cpp index 22e9717c7e..73a7c91027 100644 --- a/src/d/actor/d_a_npc_pachi_besu.cpp +++ b/src/d/actor/d_a_npc_pachi_besu.cpp @@ -831,12 +831,12 @@ void daNpc_Pachi_Besu_c::srchActors() { case TYPE_0: fopAc_ac_c* actor_p = mActorMngrs[0].getActorP(); if (actor_p == NULL) { - mActorMngrs[0].entry(getNearestActorP(PROC_NPC_PACHI_TARO)); + mActorMngrs[0].entry(getNearestActorP(fpcNm_NPC_PACHI_TARO_e)); } actor_p = mActorMngrs[1].getActorP(); if (actor_p == NULL) { - mActorMngrs[1].entry(getNearestActorP(PROC_NPC_PACHI_MARO)); + mActorMngrs[1].entry(getNearestActorP(fpcNm_NPC_PACHI_MARO_e)); } break; } @@ -1563,18 +1563,18 @@ static actor_method_class daNpc_Pachi_Besu_MethodTable = { }; actor_process_profile_definition g_profile_NPC_PACHI_BESU = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_PACHI_BESU, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Pachi_Besu_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 368, // mPriority - &daNpc_Pachi_Besu_MethodTable, // sub_method - 0x00044108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_PACHI_BESU_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Pachi_Besu_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_PACHI_BESU_e, + /* Actor SubMtd */ &daNpc_Pachi_Besu_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_pachi_maro.cpp b/src/d/actor/d_a_npc_pachi_maro.cpp index 587a58346c..b87bfcb32a 100644 --- a/src/d/actor/d_a_npc_pachi_maro.cpp +++ b/src/d/actor/d_a_npc_pachi_maro.cpp @@ -809,11 +809,11 @@ void daNpc_Pachi_Maro_c::srchActors() { switch (mType) { case TYPE_0: if (mActorMngrs[0].getActorP() == NULL) { - mActorMngrs[0].entry(getNearestActorP(PROC_NPC_PACHI_TARO)); + mActorMngrs[0].entry(getNearestActorP(fpcNm_NPC_PACHI_TARO_e)); } if (mActorMngrs[1].getActorP() == NULL) { - mActorMngrs[1].entry(getNearestActorP(PROC_NPC_PACHI_BESU)); + mActorMngrs[1].entry(getNearestActorP(fpcNm_NPC_PACHI_BESU_e)); } break; } @@ -1677,18 +1677,18 @@ static actor_method_class daNpc_Pachi_Maro_MethodTable = { }; actor_process_profile_definition g_profile_NPC_PACHI_MARO = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_PACHI_MARO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Pachi_Maro_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 370, // mPriority - &daNpc_Pachi_Maro_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_PACHI_MARO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Pachi_Maro_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_PACHI_MARO_e, + /* Actor SubMtd */ &daNpc_Pachi_Maro_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_pachi_taro.cpp b/src/d/actor/d_a_npc_pachi_taro.cpp index 525d8387ee..6ceb762239 100644 --- a/src/d/actor/d_a_npc_pachi_taro.cpp +++ b/src/d/actor/d_a_npc_pachi_taro.cpp @@ -1089,11 +1089,11 @@ void daNpc_Pachi_Taro_c::srchActors() { switch (mType) { case TYPE_0: if (mActorMngrs[0].getActorP() == NULL) { - mActorMngrs[0].entry(getNearestActorP(PROC_NPC_PACHI_MARO)); + mActorMngrs[0].entry(getNearestActorP(fpcNm_NPC_PACHI_MARO_e)); } if (mActorMngrs[1].getActorP() == NULL) { - mActorMngrs[1].entry(getNearestActorP(PROC_NPC_PACHI_BESU)); + mActorMngrs[1].entry(getNearestActorP(fpcNm_NPC_PACHI_BESU_e)); } if (mActorMngrs[2].getActorP() == NULL) { @@ -1126,7 +1126,7 @@ void* daNpc_Pachi_Taro_c::_srch_DistTag1_main(void* i_actor, void* i_data) { return NULL; } - if (fopAcM_GetName(i_actor) != PROC_TAG_PATI) { + if (fopAcM_GetName(i_actor) != fpcNm_TAG_PATI_e) { return NULL; } @@ -1148,7 +1148,7 @@ void* daNpc_Pachi_Taro_c::_srch_DistTag2_main(void* i_actor, void* i_data) { return NULL; } - if (fopAcM_GetName(i_actor) != PROC_TAG_PATI) { + if (fopAcM_GetName(i_actor) != fpcNm_TAG_PATI_e) { return NULL; } @@ -1170,7 +1170,7 @@ void* daNpc_Pachi_Taro_c::_srch_EscapeTag1_main(void* i_actor, void* i_data) { return NULL; } - if (fopAcM_GetName(i_actor) != PROC_TAG_PATI) { + if (fopAcM_GetName(i_actor) != fpcNm_TAG_PATI_e) { return NULL; } @@ -1192,7 +1192,7 @@ void* daNpc_Pachi_Taro_c::_srch_EscapeTag2_main(void* i_actor, void* i_data) { return NULL; } - if (fopAcM_GetName(i_actor) != PROC_TAG_PATI) { + if (fopAcM_GetName(i_actor) != fpcNm_TAG_PATI_e) { return NULL; } @@ -2559,18 +2559,18 @@ static actor_method_class daNpc_Pachi_Taro_MethodTable = { }; actor_process_profile_definition g_profile_NPC_PACHI_TARO = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_PACHI_TARO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Pachi_Taro_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 369, // mPriority - &daNpc_Pachi_Taro_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_PACHI_TARO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Pachi_Taro_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_PACHI_TARO_e, + /* Actor SubMtd */ &daNpc_Pachi_Taro_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_passer.cpp b/src/d/actor/d_a_npc_passer.cpp index 4f4462ef82..b7df633f4f 100644 --- a/src/d/actor/d_a_npc_passer.cpp +++ b/src/d/actor/d_a_npc_passer.cpp @@ -1160,18 +1160,18 @@ static actor_method_class daNpcPasser_METHODS = { }; actor_process_profile_definition g_profile_NPC_PASSER = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_PASSER, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcPasser_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 401, // mPriority - &daNpcPasser_METHODS, // sub_method - 0x02040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_PASSER_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcPasser_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_PASSER_e, + /* Actor SubMtd */ &daNpcPasser_METHODS, + /* Status */ fopAcStts_UNK_0x2000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_passer2.cpp b/src/d/actor/d_a_npc_passer2.cpp index 47f9dded36..ea4aae6db5 100644 --- a/src/d/actor/d_a_npc_passer2.cpp +++ b/src/d/actor/d_a_npc_passer2.cpp @@ -379,18 +379,18 @@ static actor_method_class daNpcPasser2_METHODS = { }; actor_process_profile_definition g_profile_NPC_PASSER2 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_PASSER2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcPasser2_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 402, // mPriority - &daNpcPasser2_METHODS, // sub_method - 0x02040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_PASSER2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcPasser2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_PASSER2_e, + /* Actor SubMtd */ &daNpcPasser2_METHODS, + /* Status */ fopAcStts_UNK_0x2000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_post.cpp b/src/d/actor/d_a_npc_post.cpp index 24722e18e3..b6333d699e 100644 --- a/src/d/actor/d_a_npc_post.cpp +++ b/src/d/actor/d_a_npc_post.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_post.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -61,7 +61,7 @@ enum post1_RES_File_ID { /* 0x17 */ BCK_POST_HELLO, /* 0x18 */ BCK_POST_REGRET, /* 0x19 */ BCK_POST_RUN, - + /* BTK */ /* 0x1C */ BTK_POST_HAND = 0x1C, /* 0x1D */ BTK_POST_RUN, @@ -223,7 +223,7 @@ void daNpc_Post_HIO_c::listenPropertyEvent(const JORPropertyEvent* evt) { memset(&buffer, 0, sizeof(buffer)); len = 0; daNpcT_cmnListenPropertyEvent(buffer, &len, &m.common); - + sprintf(buffer + len, "%.3ff,\t// 走り速度\n", m.run_spd); len = strlen(buffer); sprintf(buffer + len, "%d, \t// 頷き間隔\n", m.nod_interval); @@ -405,7 +405,7 @@ cPhs_Step daNpc_Post_c::create() { } OS_REPORT("\n"); - + static int const heapSize[4] = { 0x0, 0x5060, 0x4EC0, 0x0, }; @@ -569,7 +569,7 @@ u8 daNpc_Post_c::getType() { switch (param) { case 0: return TYPE_0; - + case 1: return TYPE_DELIVER; @@ -623,7 +623,7 @@ void daNpc_Post_c::reset() { switch (mType) { case TYPE_0: break; - + case TYPE_DELIVER: mHide = true; break; @@ -709,7 +709,7 @@ void daNpc_Post_c::setAfterTalkMotion() { case FACE_MOT_REGRET: idx = FACE_MOT_H_REGRET; break; - + case FACE_MOT_HAPPY: idx = FACE_MOT_H_HAPPY; break; @@ -717,7 +717,7 @@ void daNpc_Post_c::setAfterTalkMotion() { case FACE_MOT_SAD: idx = FACE_MOT_H_SAD; break; - + case FACE_MOT_ANGRY: idx = FACE_MOT_H_ANGRY; break; @@ -730,7 +730,7 @@ void daNpc_Post_c::srchActors() { switch (mType) { case TYPE_0: break; - + case TYPE_DELIVER: for (int i = 0; i < 4; i++) { if (mActorMngrs[i].getActorP() == NULL) { @@ -812,10 +812,10 @@ void daNpc_Post_c::action() { } void daNpc_Post_c::beforeMove() { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw) { @@ -856,7 +856,7 @@ void daNpc_Post_c::setAttnPos() { mHIO->m.common.head_angleY_min, mHIO->m.common.head_angleY_max, mHIO->m.common.neck_rotation_ratio, rad_val, &sp7c); mJntAnm.calcJntRad(0.2f, 1.0f, rad_val); - + setMtx(); if (mpFlagModelMorf != NULL) { @@ -949,7 +949,7 @@ int daNpc_Post_c::drawDbgInfo() { dDbVw_drawSphereXlu(attention_info.position, 9.0f, (GXColor){0x80, 0x80, 0x80, 0xA0}, 1); } #endif - + return 0; } @@ -1110,7 +1110,7 @@ int daNpc_Post_c::cutDeliver(int i_staffId) { int* piVar1 = NULL; int prm = -1; int timer = 0; - + piVar1 = dComIfGp_evmng_getMyIntegerP(i_staffId, "prm"); if (piVar1 != NULL) { prm = *piVar1; @@ -1130,7 +1130,7 @@ int daNpc_Post_c::cutDeliver(int i_staffId) { current.pos.x = work.x; current.pos.z = work.z; work.y = dComIfG_Bgsp().GroundCross(&mGndChk); - + if (work.y != -1e9f) { current.pos.y = work.y; } @@ -1404,7 +1404,7 @@ int daNpc_Post_c::wait(void* param_1) { actor_p->noEffect(); } else if (daPy_getPlayerActorClass()->eventInfo.chkCondition(1) != FALSE && dMeter2Info_getNewLetterNum()) { mActorPos = actor_p->current.pos; - + f32 fVar2 = player->current.pos.absXZ(actor_p->current.pos); f32 adjustedScale = actor_p->scale.x - 700.0f; if (adjustedScale <= fVar2) { @@ -1430,7 +1430,7 @@ int daNpc_Post_c::wait(void* param_1) { if (mPlayerActorMngr.getActorP() != NULL && !mTwilight) { mJntAnm.lookPlayer(0); - + if (!chkActorInSight(mPlayerActorMngr.getActorP(), mAttnFovY, mCurAngle.y)) { mJntAnm.lookNone(0); } @@ -1507,7 +1507,7 @@ int daNpc_Post_c::talk(void* param_1) { } break; - case MODE_EXIT: + case MODE_EXIT: break; } @@ -1567,18 +1567,18 @@ static actor_method_class daNpc_Post_MethodTable = { }; actor_process_profile_definition g_profile_NPC_POST = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_POST, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Post_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 403, // mPriority - &daNpc_Post_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_POST_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Post_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_POST_e, + /* Actor SubMtd */ &daNpc_Post_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_pouya.cpp b/src/d/actor/d_a_npc_pouya.cpp index 8048b02456..23f9cb490b 100644 --- a/src/d/actor/d_a_npc_pouya.cpp +++ b/src/d/actor/d_a_npc_pouya.cpp @@ -668,9 +668,9 @@ void daNpc_Pouya_c::action() { } void daNpc_Pouya_c::beforeMove() { - fopAcM_OffStatus(this, 0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw) { attention_info.flags = 0; @@ -1199,18 +1199,18 @@ static actor_method_class daNpc_Pouya_MethodTable = { }; actor_process_profile_definition g_profile_NPC_POUYA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_POUYA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Pouya_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 404, // mPriority - &daNpc_Pouya_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_POUYA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Pouya_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_POUYA_e, + /* Actor SubMtd */ &daNpc_Pouya_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_prayer.cpp b/src/d/actor/d_a_npc_prayer.cpp index 1cfc2c18df..7233ccc683 100644 --- a/src/d/actor/d_a_npc_prayer.cpp +++ b/src/d/actor/d_a_npc_prayer.cpp @@ -720,7 +720,7 @@ fpc_ProcID daNpcPray_c::createHeart() { mDoMtx_stack_c::ZXYrotS(rot); mDoMtx_stack_c::multVec(&offset, &offset); pos += offset; - return fopAcM_createItemForBoss(&pos, fpcNm_ITEM_KAKERA_HEART, fopAcM_GetRoomNo(this), &rot, &size, 0.0f, 0.0f, 0); + return fopAcM_createItemForBoss(&pos, dItemNo_KAKERA_HEART_e, fopAcM_GetRoomNo(this), &rot, &size, 0.0f, 0.0f, 0); } BOOL daNpcPray_c::_Evt_GetHeart(int i_staffID) { @@ -846,18 +846,18 @@ static actor_method_class daNpcPray_MethodTable = { }; actor_process_profile_definition g_profile_NPC_PRAYER = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_PRAYER, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcPray_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 419, // mPriority - &daNpcPray_MethodTable, // sub_method - 0x00044187, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_PRAYER_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcPray_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_PRAYER_e, + /* Actor SubMtd */ &daNpcPray_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_raca.cpp b/src/d/actor/d_a_npc_raca.cpp index 07a6b353cb..1db4dff86c 100644 --- a/src/d/actor/d_a_npc_raca.cpp +++ b/src/d/actor/d_a_npc_raca.cpp @@ -365,7 +365,7 @@ int daNpc_Raca_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) { } void* daNpc_Raca_c::srchNi(void* i_actor, void* i_data) { - if (mFindCount < 50 && fopAcM_IsActor(i_actor) && i_actor != (daNpc_Raca_c*)i_data && fopAcM_GetName(i_actor) == PROC_NI) { + if (mFindCount < 50 && fopAcM_IsActor(i_actor) && i_actor != (daNpc_Raca_c*)i_data && fopAcM_GetName(i_actor) == fpcNm_NI_e) { mFindActorPtrs[mFindCount] = (fopAc_ac_c*)i_actor; mFindCount++; } @@ -852,18 +852,18 @@ static actor_method_class daNpc_Raca_MethodTable = { }; actor_process_profile_definition g_profile_NPC_RACA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_RACA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Raca_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 356, // mPriority - &daNpc_Raca_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_RACA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Raca_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_RACA_e, + /* Actor SubMtd */ &daNpc_Raca_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_rafrel.cpp b/src/d/actor/d_a_npc_rafrel.cpp index 065c16330e..dfc6e912fe 100644 --- a/src/d/actor/d_a_npc_rafrel.cpp +++ b/src/d/actor/d_a_npc_rafrel.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_rafrel.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -64,7 +64,7 @@ static int l_loadRes_RAFREL0[] = { static int l_loadRes_RAFREL1[] = { 0, - 1, + 1, -1, }; @@ -204,7 +204,7 @@ int daNpcRafrel_c::Create() { return cPhs_ERROR_e; } - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); mType = 2; } @@ -312,7 +312,7 @@ int daNpcRafrel_c::CreateHeap() { if (mType == 1) { mdlData_p = dComIfG_getObjectRes(l_arcNames[1], 0x15); JUT_ASSERT(438, mdlData_p != NULL); - + mpItemModel = mDoExt_J3DModel__create((J3DModelData*)mdlData_p, J3DMdlFlag_DifferedDLBuffer, BMD_DEFAULT_DIFF_FLAGS); if (mpItemModel == NULL) { return 0; @@ -368,7 +368,7 @@ int daNpcRafrel_c::Draw() { if (mpItemModel != NULL) { enum { JNT_19 = 19, JNT_20 = 20}; int item_jnt_no = mType == 1 ? JNT_20 : JNT_19; - + g_env_light.setLightTevColorType_MAJI(mpItemModel, &tevStr); mpItemModel->setBaseTRMtx(mAnm_p->getModel()->getAnmMtx(item_jnt_no)); mDoExt_modelUpdateDL(mpItemModel); @@ -617,7 +617,7 @@ void daNpcRafrel_c::reset() { } if (isSneaking()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } setWaitAction(); @@ -640,7 +640,7 @@ void daNpcRafrel_c::setParam() { attention_info.distances[fopAc_attn_LOCK_e] = getDistTableIdx(mpHIO->m.common.attention_distance, mpHIO->m.common.attention_angle); attention_info.distances[fopAc_attn_TALK_e] = attention_info.distances[fopAc_attn_LOCK_e]; attention_info.distances[fopAc_attn_SPEAK_e] = getDistTableIdx(mpHIO->m.common.talk_distance, mpHIO->m.common.talk_angle); - + if (mType == 1 && field_0xe15 != 0 && field_0xe16 == 0) { Vec sp8 = {current.pos.x + 150.0f, current.pos.y, current.pos.z - 100.0f}; if (fopAcM_GetPosition(daPy_getPlayerActorClass()).abs(sp8) > 160.0f) { @@ -678,7 +678,7 @@ BOOL daNpcRafrel_c::drawDbgInfo() { if (!mpHIO->m.common.debug_info_ON) { return false; } - + f32 distMax1 = dComIfGp_getAttention() ->getDistTable(attention_info.distances[fopAc_attn_SPEAK_e]) .mDistMax; @@ -769,7 +769,7 @@ void daNpcRafrel_c::playExpression() { void daNpcRafrel_c::playMotion() { daNpcF_anmPlayData anm0_phase1 = {8, mpHIO->m.common.morf_frame, 0}; daNpcF_anmPlayData* anm0[] = {&anm0_phase1}; - + daNpcF_anmPlayData anm1_phase1 = {9, mpHIO->m.common.morf_frame, 0}; daNpcF_anmPlayData* anm1[] = {&anm1_phase1}; @@ -1000,7 +1000,7 @@ bool daNpcRafrel_c::step(s16 i_angY, int param_1, f32 param_2) { setExpression(7, -1.0f); setMotion(param_1, -1.0f, false); } - + mTurnTargetAngle = i_angY; mTurnAmount = 0; @@ -1028,15 +1028,15 @@ bool daNpcRafrel_c::step(s16 i_angY, int param_1, f32 param_2) { void daNpcRafrel_c::searchActors() { if (field_0xc7c[1].getActorP() == NULL) { - field_0xc7c[1].entry(fopAcM_SearchByName(PROC_NPC_ASH)); + field_0xc7c[1].entry(fopAcM_SearchByName(fpcNm_NPC_ASH_e)); } if (field_0xc7c[2].getActorP() == NULL) { - field_0xc7c[2].entry(fopAcM_SearchByName(PROC_NPC_SHAD)); + field_0xc7c[2].entry(fopAcM_SearchByName(fpcNm_NPC_SHAD_e)); } if (field_0xc7c[3].getActorP() == NULL) { - field_0xc7c[3].entry(fopAcM_SearchByName(PROC_NPC_MOIR)); + field_0xc7c[3].entry(fopAcM_SearchByName(fpcNm_NPC_MOIR_e)); } } @@ -1227,7 +1227,7 @@ bool daNpcRafrel_c::wait_type2(void* param_0) { setLookMode(LOOK_NONE, NULL); field_0xe10 = 2; break; - + case 2: switch (field_0xe08) { case 0: @@ -1365,11 +1365,11 @@ bool daNpcRafrel_c::demo(void* param_0) { case 2: if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { evtmgr = &dComIfGp_getEventManager(); - + const int staffId = evtmgr->getMyStaffId(l_myName, NULL, 0); if (staffId != -1) { mStaffID = staffId; - + int actIdx = evtmgr->getMyActIdx(staffId, l_evtNames, ARRAY_SIZE(l_evtNames), 0, 0); if (actIdx > 0 && actIdx < 7) { mOrderEvtNo = actIdx; @@ -1449,7 +1449,7 @@ bool daNpcRafrel_c::leave(void* param_0) { int daNpcRafrel_c::EvCut_Introduction(int i_staffId) { dEvent_manager_c* evtmgr = &dComIfGp_getEventManager(); - + int* idata = dComIfGp_evmng_getMyIntegerP(i_staffId, "prm"); if (idata == NULL) { return 0; @@ -1475,7 +1475,7 @@ int daNpcRafrel_c::EvCut_Introduction(int i_staffId) { int daNpcRafrel_c::EvCut_Meeting(int i_staffId) { dEvent_manager_c* evtmgr = &dComIfGp_getEventManager(); - + int* idata = dComIfGp_evmng_getMyIntegerP(i_staffId, "prm"); if (idata == NULL) { return 0; @@ -1686,7 +1686,7 @@ int daNpcRafrel_c::EvCut_WiretapSponsor(int i_staffId) { int daNpcRafrel_c::EvCut_WiretapEntrant(int i_staffId) { dEvent_manager_c& evtmgr = dComIfGp_getEventManager(); - + int* idata = dComIfGp_evmng_getMyIntegerP(i_staffId, "prm"); if (idata == NULL) { return 0; @@ -1758,18 +1758,18 @@ static actor_method_class daNpcRafrel_MethodTable = { }; actor_process_profile_definition g_profile_NPC_RAFREL = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_RAFREL, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcRafrel_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 414, // mPriority - &daNpcRafrel_MethodTable, // sub_method - 0x00040100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_RAFREL_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcRafrel_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_RAFREL_e, + /* Actor SubMtd */ &daNpcRafrel_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_saru.cpp b/src/d/actor/d_a_npc_saru.cpp index 4da2185851..500daea704 100644 --- a/src/d/actor/d_a_npc_saru.cpp +++ b/src/d/actor/d_a_npc_saru.cpp @@ -436,7 +436,7 @@ int daNpc_Saru_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) { void* daNpc_Saru_c::srchYm(void* i_actor, void* i_data) { if (mFindCount < 50 && i_actor != NULL && i_actor != i_data) { - if (fopAcM_IsExecuting(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_E_YM && ((daE_YM_c*)i_actor)->isHide() == 0) { + if (fopAcM_IsExecuting(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_E_YM_e && ((daE_YM_c*)i_actor)->isHide() == 0) { mFindActorPtrs[mFindCount] = (fopAc_ac_c*)i_actor; mFindCount++; } @@ -647,10 +647,10 @@ void daNpc_Saru_c::action() { } void daNpc_Saru_c::beforeMove() { - fopAcM_OffStatus(this, 0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if ((checkHide() || mNoDraw != 0) && mSpeakEvent == false) { @@ -1232,18 +1232,18 @@ static actor_method_class daNpc_Saru_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SARU = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SARU, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Saru_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 357, // mPriority - &daNpc_Saru_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SARU_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Saru_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SARU_e, + /* Actor SubMtd */ &daNpc_Saru_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_seib.cpp b/src/d/actor/d_a_npc_seib.cpp index ccb87510a4..b87793ea82 100644 --- a/src/d/actor/d_a_npc_seib.cpp +++ b/src/d/actor/d_a_npc_seib.cpp @@ -565,18 +565,18 @@ static actor_method_class daNpc_seiB_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SEIB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SEIB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_seiB_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 358, // mPriority - &daNpc_seiB_MethodTable, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SEIB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_seiB_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SEIB_e, + /* Actor SubMtd */ &daNpc_seiB_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_seic.cpp b/src/d/actor/d_a_npc_seic.cpp index 0961d04bb1..a31eb09d73 100644 --- a/src/d/actor/d_a_npc_seic.cpp +++ b/src/d/actor/d_a_npc_seic.cpp @@ -508,18 +508,18 @@ static actor_method_class daNpc_seiC_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SEIC = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SEIC, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_seiC_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 359, // mPriority - &daNpc_seiC_MethodTable, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SEIC_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_seiC_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SEIC_e, + /* Actor SubMtd */ &daNpc_seiC_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_seid.cpp b/src/d/actor/d_a_npc_seid.cpp index b516ec4c09..74ee8801cf 100644 --- a/src/d/actor/d_a_npc_seid.cpp +++ b/src/d/actor/d_a_npc_seid.cpp @@ -506,18 +506,18 @@ static actor_method_class daNpc_seiD_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SEID = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SEID, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_seiD_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 360, // mPriority - &daNpc_seiD_MethodTable, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SEID_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_seiD_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SEID_e, + /* Actor SubMtd */ &daNpc_seiD_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_seira.cpp b/src/d/actor/d_a_npc_seira.cpp index 678fabc8bb..12cbd6464f 100644 --- a/src/d/actor/d_a_npc_seira.cpp +++ b/src/d/actor/d_a_npc_seira.cpp @@ -560,7 +560,7 @@ void daNpc_Seira_c::srchActors() { case 2: { if (mActorMngr[0].getActorP() == NULL) { // NE means Neko, which means Cat in Japanese: - mActorMngr[0].entry(getNearestActorP(PROC_NPC_NE)); + mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_NE_e)); } break; @@ -569,11 +569,11 @@ void daNpc_Seira_c::srchActors() { case 5: { // The beginning of the game when outside with Beth and Hanch: if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(getNearestActorP(PROC_NPC_HANJO)); + mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_HANJO_e)); } if (mActorMngr[2].getActorP() == NULL) { - mActorMngr[2].entry(getNearestActorP(PROC_NPC_BESU)); + mActorMngr[2].entry(getNearestActorP(fpcNm_NPC_BESU_e)); } break; @@ -1410,18 +1410,18 @@ static actor_method_class daNpc_Seira_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SEIRA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SEIRA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Seira_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 361, // mPriority - &daNpc_Seira_MethodTable, // sub_method - 0x00044108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SEIRA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Seira_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SEIRA_e, + /* Actor SubMtd */ &daNpc_Seira_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_seira2.cpp b/src/d/actor/d_a_npc_seira2.cpp index a12c06e86e..73e7ff44d3 100644 --- a/src/d/actor/d_a_npc_seira2.cpp +++ b/src/d/actor/d_a_npc_seira2.cpp @@ -486,7 +486,7 @@ void daNpc_Seira2_c::srchActors() { case 2: { if (mActorMngr[0].getActorP() == NULL) { // NE means Neko, which means Cat in Japanese: - mActorMngr[0].entry(getNearestActorP(PROC_NPC_NE)); + mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_NE_e)); } break; @@ -1125,18 +1125,18 @@ static actor_method_class daNpc_Seira2_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SERA2 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SERA2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Seira2_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 362, // mPriority - &daNpc_Seira2_MethodTable, // sub_method - 0x00044108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SERA2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Seira2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SERA2_e, + /* Actor SubMtd */ &daNpc_Seira2_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_seirei.cpp b/src/d/actor/d_a_npc_seirei.cpp index e78a255dad..806118cf9f 100644 --- a/src/d/actor/d_a_npc_seirei.cpp +++ b/src/d/actor/d_a_npc_seirei.cpp @@ -824,18 +824,18 @@ static actor_method_class daNpc_Seirei_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SEIREI = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SEIREI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Seirei_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 363, // mPriority - &daNpc_Seirei_MethodTable, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SEIREI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Seirei_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SEIREI_e, + /* Actor SubMtd */ &daNpc_Seirei_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_shad.cpp b/src/d/actor/d_a_npc_shad.cpp index 7f6d35ffc6..3b58c47650 100644 --- a/src/d/actor/d_a_npc_shad.cpp +++ b/src/d/actor/d_a_npc_shad.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_shad.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -13,16 +13,16 @@ #include const daNpcShad_HIOParam daNpcShad_Param_c::m = { - 35.0f, // attention_offset + 35.0f, // attention_offset -3.0f, // gravity - 1.0f, // scale + 1.0f, // scale 400.0f, // real_shadow_size 255.0f, // weight 200.0f, // height 35.0f, // knee_length 30.0f, // width - 0.0f, // body_angleX_max - 0.0f, // body_angleX_min + 0.0f, // body_angleX_max + 0.0f, // body_angleX_min 45.0f, // body_angleY_max -45.0f, // body_angleY_min 30.0f, // head_angleX_max @@ -390,7 +390,7 @@ cPhs_Step daNpcShad_c::Create() { return cPhs_ERROR_e; } - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); mMode = 2; } } @@ -626,7 +626,7 @@ int daNpcShad_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) { if (param_2 == 0) { J3DModel* model = j3dSys.getModel(); daNpcShad_c* i_this = (daNpcShad_c*)model->getUserArea(); - + if (i_this != NULL) { i_this->ctrlJoint(i_joint, model); } @@ -739,7 +739,7 @@ bool daNpcShad_c::setExpressionBtp(int i_idx) { if (i_idx == 0) { mAnmFlags |= ANM_FLAG_800; } - + return true; } @@ -834,7 +834,7 @@ void daNpcShad_c::reset() { mMotionMorfOverride = 0.0f; if (isSneaking()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } setWaitAction(); @@ -1055,7 +1055,7 @@ inline void daNpcShad_c::lookat() { mLookat.setAttnPos(NULL); } - mLookat.setParam(body_angleX_min, body_angleX_max, body_angleY_min, body_angleY_max, 0.0f, 0.0f, 0.0f, 0.0f, head_angleX_min, head_angleX_max, + mLookat.setParam(body_angleX_min, body_angleX_max, body_angleY_min, body_angleY_max, 0.0f, 0.0f, 0.0f, 0.0f, head_angleX_min, head_angleX_max, head_angleY_min, head_angleY_max, mCurAngle.y, spf0); mLookat.calc(this, model->getBaseTRMtx(), (csXyz**)local_fc, iVar1, sVar1, FALSE); } @@ -1533,7 +1533,7 @@ bool daNpcShad_c::talk(void* param_1) { JUT_ASSERT(2042, FALSE); break; } - + return rv; } @@ -1855,9 +1855,9 @@ BOOL daNpcShad_c::EvCut_ToChantSpell2(int i_cutIndex) { mTurnMode = 0; actor = NULL; - fopAcM_SearchByName(PROC_CSTAF, (fopAc_ac_c**)&actor); + fopAcM_SearchByName(fpcNm_CSTAF_e, (fopAc_ac_c**)&actor); if (actor != NULL) { - fopAcM_OnStatus(actor, fopAcM_STATUS_UNK_0x800); + fopAcM_OnStatus(actor, fopAcStts_STAFF_EXTRA_e); } dComIfGp_getEvent()->startCheckSkipEdge(this); @@ -1902,7 +1902,7 @@ BOOL daNpcShad_c::EvCut_ToChantSpell2(int i_cutIndex) { case '0010': statue = NULL; - fopAcM_SearchByName(PROC_CSTAF, (fopAc_ac_c**)&statue); + fopAcM_SearchByName(fpcNm_CSTAF_e, (fopAc_ac_c**)&statue); if (statue != NULL) { statue->onCoverVanishFlg(); } @@ -1993,7 +1993,7 @@ BOOL daNpcShad_c::EvCut_ToChantSpell2(int i_cutIndex) { case '0010': return TRUE; - + default: JUT_ASSERT(2540, FALSE); break; @@ -2303,7 +2303,7 @@ BOOL daNpcShad_c::EvCut_Disappear(int i_cutIndex) { if (pos2 != NULL) { step(cLib_targetAngleY(¤t.pos, pos2), -1, 15.0f); - + if (pos2->x > current.pos.x) { speedF = 0.0f; setMotion(MOT_WAIT_A, -1.0f, FALSE); @@ -2617,7 +2617,7 @@ inline void daNpcShad_c::setAttnPos() { mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_BACKBONE2)); mDoMtx_stack_c::multVecZero(&sp58); sp58.y = current.pos.y; - + field_0xcb0.SetC(sp58); field_0xcb0.SetH(mpHIO->m.common.height); @@ -2647,18 +2647,18 @@ static actor_method_class daNpcShad_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SHAD = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SHAD, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcShad_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 413, // mPriority - &daNpcShad_MethodTable, // sub_method - 0x00040100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SHAD_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcShad_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SHAD_e, + /* Actor SubMtd */ &daNpcShad_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_shaman.cpp b/src/d/actor/d_a_npc_shaman.cpp index 4acc8cd723..76b6acb69f 100644 --- a/src/d/actor/d_a_npc_shaman.cpp +++ b/src/d/actor/d_a_npc_shaman.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_shaman.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -18,7 +18,7 @@ void daNpc_Sha_HIO_c::listenPropertyEvent(const JORPropertyEvent* event) { char buffer[2000]; JORReflexible::listenPropertyEvent(event); - + JORFile jorFile; int len; @@ -255,7 +255,7 @@ cPhs_Step daNpc_Sha_c::create() { } OS_REPORT("\n"); - + static int const heapSize[3] = { 0x3AF0, 0x3AF0, 0x3AF0, }; @@ -274,7 +274,7 @@ cPhs_Step daNpc_Sha_c::create() { #endif reset(); - + mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this)); mCcStts.Init(mpHIO->m.common.weight, 0, this); @@ -369,7 +369,7 @@ u8 daNpc_Sha_c::getType() { switch (param) { case 0: return 0; - + case 1: return 1; @@ -476,7 +476,7 @@ BOOL daNpc_Sha_c::checkChangeEvt() { switch (mType) { case 0: break; - + case 1: if (field_0xfa0 == 0) { mEvtNo = 2; @@ -504,7 +504,7 @@ void daNpc_Sha_c::setAfterTalkMotion() { case 2: idx = 8; break; - + case 3: idx = 5; break; @@ -593,10 +593,10 @@ void daNpc_Sha_c::action() { } void daNpc_Sha_c::beforeMove() { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw) { @@ -610,7 +610,7 @@ void daNpc_Sha_c::setAttnPos() { mStagger.calc(FALSE); f32 rad = cM_s2rad((s16)(mCurAngle.y - field_0xd7e.y)); - + mJntAnm.setParam(this, mpMorf[0]->getModel(), &pos, getBackboneJointNo(), getNeckJointNo(), getHeadJointNo(), mpHIO->m.common.body_angleX_min, mpHIO->m.common.body_angleX_max, mpHIO->m.common.body_angleY_min, mpHIO->m.common.body_angleY_max, mpHIO->m.common.head_angleX_min, mpHIO->m.common.head_angleX_max, mpHIO->m.common.head_angleY_min, mpHIO->m.common.head_angleY_max, @@ -897,7 +897,7 @@ int daNpc_Sha_c::cutPerformAugury(int i_staffId) { dComIfGp_event_offHindFlag(128); initTalk(0x772, NULL); break; - + case 5: dComIfGp_event_offHindFlag(128); initTalk(0x773, NULL); @@ -955,7 +955,7 @@ int daNpc_Sha_c::cutPerformAugury(int i_staffId) { setTempBit(mSceneChangeNoTableIx); } } - + if (mSceneChangeNoTableIx == -2) { mEvtNo = 3; evtChange(); @@ -979,7 +979,7 @@ int daNpc_Sha_c::cutPerformAugury(int i_staffId) { } } break; - + case 2: case 6: case 7: @@ -1251,18 +1251,18 @@ static actor_method_class daNpc_Sha_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SHAMAN = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SHAMAN, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Sha_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 364, // mPriority - &daNpc_Sha_MethodTable, // sub_method - 0x00040108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SHAMAN_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Sha_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SHAMAN_e, + /* Actor SubMtd */ &daNpc_Sha_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_shoe.cpp b/src/d/actor/d_a_npc_shoe.cpp index eb00596bf4..bf3a2b383c 100644 --- a/src/d/actor/d_a_npc_shoe.cpp +++ b/src/d/actor/d_a_npc_shoe.cpp @@ -227,9 +227,9 @@ int daNpcShoe_c::Delete() { int daNpcShoe_c::Execute() { if (field_0xe1b != 0) { - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } else { - fopAcM_OffStatus(this, 0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); } if (fopAcM_CheckCondition(this, fopAcCnd_NODRAW_e)) { @@ -743,18 +743,18 @@ static actor_method_class daNpcShoe_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SHOE = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SHOE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcShoe_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 417, // mPriority - &daNpcShoe_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SHOE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcShoe_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SHOE_e, + /* Actor SubMtd */ &daNpcShoe_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_shop0.cpp b/src/d/actor/d_a_npc_shop0.cpp index 557b836ddc..1dd4b3e31f 100644 --- a/src/d/actor/d_a_npc_shop0.cpp +++ b/src/d/actor/d_a_npc_shop0.cpp @@ -351,18 +351,18 @@ static actor_method_class daNpc_Shop0_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SHOP0 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SHOP0, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Shop0_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 426, // mPriority - &daNpc_Shop0_MethodTable, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SHOP0_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Shop0_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SHOP0_e, + /* Actor SubMtd */ &daNpc_Shop0_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_shop_maro.cpp b/src/d/actor/d_a_npc_shop_maro.cpp index 4ca52f1cb8..d113c06855 100644 --- a/src/d/actor/d_a_npc_shop_maro.cpp +++ b/src/d/actor/d_a_npc_shop_maro.cpp @@ -42,18 +42,18 @@ static actor_method_class daNpc_shopMaro_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SMARO = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SMARO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_shopMaro_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 365, // mPriority - &daNpc_shopMaro_MethodTable, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType - }; + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SMARO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_shopMaro_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SMARO_e, + /* Actor SubMtd */ &daNpc_shopMaro_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, +}; diff --git a/src/d/actor/d_a_npc_sola.cpp b/src/d/actor/d_a_npc_sola.cpp index e705e2d2a0..49568095bc 100644 --- a/src/d/actor/d_a_npc_sola.cpp +++ b/src/d/actor/d_a_npc_sola.cpp @@ -496,18 +496,18 @@ static actor_method_class daNpc_solA_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SOLA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SOLA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_solA_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 366, // mPriority - &daNpc_solA_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SOLA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_solA_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SOLA_e, + /* Actor SubMtd */ &daNpc_solA_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_soldierA.cpp b/src/d/actor/d_a_npc_soldierA.cpp index 8337164b25..54718eb9f7 100644 --- a/src/d/actor/d_a_npc_soldierA.cpp +++ b/src/d/actor/d_a_npc_soldierA.cpp @@ -1150,18 +1150,18 @@ static actor_method_class daNpc_SoldierA_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SOLDIERa = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SOLDIERa, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_SoldierA_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 399, // mPriority - &daNpc_SoldierA_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SOLDIERa_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_SoldierA_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SOLDIERa_e, + /* Actor SubMtd */ &daNpc_SoldierA_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_soldierB.cpp b/src/d/actor/d_a_npc_soldierB.cpp index 24237bdde6..c1eddb23c8 100644 --- a/src/d/actor/d_a_npc_soldierB.cpp +++ b/src/d/actor/d_a_npc_soldierB.cpp @@ -786,7 +786,7 @@ void daNpc_SoldierB_c::lookat() { } static void* s_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_SOLDIERa && + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_SOLDIERa_e && ((daNpc_SoldierA_c*)i_actor)->getType() == 0) { return i_actor; @@ -978,20 +978,20 @@ static actor_method_class daNpc_SoldierB_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SOLDIERb = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SOLDIERb, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_SoldierB_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 400, // mPriority - &daNpc_SoldierB_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SOLDIERb_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_SoldierB_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SOLDIERb_e, + /* Actor SubMtd */ &daNpc_SoldierB_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_npc_sq.cpp b/src/d/actor/d_a_npc_sq.cpp index 8d461aab57..796e682ca1 100644 --- a/src/d/actor/d_a_npc_sq.cpp +++ b/src/d/actor/d_a_npc_sq.cpp @@ -12,7 +12,7 @@ #include "f_op/f_op_camera_mng.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static bool hio_set; @@ -390,18 +390,18 @@ static actor_method_class l_daNpc_Sq_Method = { }; actor_process_profile_definition g_profile_NPC_SQ = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_NPC_SQ, - &g_fpcLf_Method.base, - sizeof(npc_sq_class), - 0, - 0, - &g_fopAc_Method.base, - 0x2BA, - &l_daNpc_Sq_Method, - 0xC0000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SQ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(npc_sq_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SQ_e, + /* Actor SubMtd */ &l_daNpc_Sq_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_taro.cpp b/src/d/actor/d_a_npc_taro.cpp index 9690c365de..1461dc6dba 100644 --- a/src/d/actor/d_a_npc_taro.cpp +++ b/src/d/actor/d_a_npc_taro.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_taro.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -463,7 +463,7 @@ int daNpc_Taro_c::createHeapCallBack(fopAc_ac_c* i_this) { void* daNpc_Taro_c::srchArrow(void* param_1, void* param_2) { if (mFindCount < 50 && param_1 != NULL && param_1 != param_2) { - if (fopAcM_IsExecuting(fopAcM_GetID(param_1)) && fopAcM_GetName(param_1) == PROC_ARROW) { + if (fopAcM_IsExecuting(fopAcM_GetID(param_1)) && fopAcM_GetName(param_1) == fpcNm_ARROW_e) { mFindActorPtrs[mFindCount] = (fopAc_ac_c*)param_1; mFindCount++; } @@ -473,9 +473,9 @@ void* daNpc_Taro_c::srchArrow(void* param_1, void* param_2) { void* daNpc_Taro_c::srchNpc(void* param_1, void* param_2) { if (mFindCount < 50 && param_1 != NULL && param_1 != param_2) { - if (fopAcM_IsExecuting(fopAcM_GetID(param_1)) && - (fopAcM_GetGroup((fopAc_ac_c*)param_1) == 4 || - (fopAcM_GetName(param_1) == PROC_TAG_EVTAREA && ((daTag_EvtArea_c*)param_1)->getType() == 15))) { + if (fopAcM_IsExecuting(fopAcM_GetID(param_1)) && + (fopAcM_GetGroup((fopAc_ac_c*)param_1) == 4 || + (fopAcM_GetName(param_1) == fpcNm_TAG_EVTAREA_e && ((daTag_EvtArea_c*)param_1)->getType() == 15))) { mFindActorPtrs[mFindCount] = (fopAc_ac_c*)param_1; mFindCount++; } @@ -944,7 +944,7 @@ void daNpc_Taro_c::action() { setAction(mAction); } } - + daTag_Push_c* pushTag = (daTag_Push_c*)field_0xba0.getActorP(); if (pushTag != NULL) { switch (pushTag->getId()) { @@ -959,9 +959,9 @@ void daNpc_Taro_c::action() { } void daNpc_Taro_c::beforeMove() { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw) { attention_info.flags = 0; @@ -1116,7 +1116,7 @@ BOOL daNpc_Taro_c::selectAction() { mAction = &daNpc_Taro_c::nurse; break; case TYPE_15: - // daNpcKakashi_chkSwdTutorialStage itself doesn't match when it returns bool + // daNpcKakashi_chkSwdTutorialStage itself doesn't match when it returns bool if ((u8)daNpcKakashi_chkSwdTutorialStage()) { mAction = &daNpc_Taro_c::swdTutorial; } else { @@ -1915,10 +1915,10 @@ int daNpc_Taro_c::cutGiveMeWoodSwd(int param_1) { case 4: case 5: case 6: - case 8: + case 8: { switch(prm) { - case 5: + case 5: case 8: { fopAc_ac_c* actor_p = mActors[2].getActorP(); JUT_ASSERT(4405, NULL != actor_p); @@ -1993,7 +1993,7 @@ int daNpc_Taro_c::cutGetWoodSwd(int param_1) { if (pTimer != NULL) { timer = *pTimer; } - + int* pSend = dComIfGp_evmng_getMyIntegerP(param_1, "send"); if (pSend != NULL) { send = *pSend; @@ -2272,7 +2272,7 @@ int daNpc_Taro_c::cutCacaricoConversation(int param_1) { } int msgNos[2] = {-1, -1}; - + switch (prm) { case 0: mJntAnm.lookPlayer(0); @@ -2512,7 +2512,7 @@ int daNpc_Taro_c::cutCaution(int param_1) { } break; } - + return rv; } @@ -3261,7 +3261,7 @@ int daNpc_Taro_c::practice(void* param_0) { break; } - + return 1; } @@ -3398,18 +3398,18 @@ static actor_method_class daNpc_Taro_MethodTable = { }; actor_process_profile_definition g_profile_NPC_TARO = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_TARO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Taro_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 367, // mPriority - &daNpc_Taro_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_TARO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Taro_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_TARO_e, + /* Actor SubMtd */ &daNpc_Taro_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_the.cpp b/src/d/actor/d_a_npc_the.cpp index 4eba37be20..4e3fd39366 100644 --- a/src/d/actor/d_a_npc_the.cpp +++ b/src/d/actor/d_a_npc_the.cpp @@ -602,7 +602,7 @@ void daNpcThe_c::lookat() { actor = daPy_getPlayerActorClass(); break; case LOOK_ACTOR: - actor = fopAcM_SearchByName(PROC_NPC_ZRC); + actor = fopAcM_SearchByName(fpcNm_NPC_ZRC_e); break; case LOOK_ATTN: break; @@ -1343,18 +1343,18 @@ static actor_method_class daNpcThe_MethodTable = { }; actor_process_profile_definition g_profile_NPC_THE = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_NPC_THE, - &g_fpcLf_Method.base, - sizeof(daNpcThe_c), - 0, - 0, - &g_fopAc_Method.base, - 0x174, - &daNpcThe_MethodTable, - 0x44108, - fopAc_NPC_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_THE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcThe_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_THE_e, + /* Actor SubMtd */ &daNpcThe_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_theB.cpp b/src/d/actor/d_a_npc_theB.cpp index 73731ae198..6cdb85a3fe 100644 --- a/src/d/actor/d_a_npc_theB.cpp +++ b/src/d/actor/d_a_npc_theB.cpp @@ -146,7 +146,7 @@ daNpcTheB_HIO_c::daNpcTheB_HIO_c() { void daNpcTheB_HIO_c::listenPropertyEvent(const JORPropertyEvent* event) { char buffer[2000]; - + JORReflexible::listenPropertyEvent(event); JORFile jorFile; @@ -283,7 +283,7 @@ cPhs_Step daNpcTheB_c::create() { } return phase; - + } int daNpcTheB_c::CreateHeap() { @@ -614,7 +614,7 @@ bool daNpcTheB_c::setExpressionAnm(int i_idx, bool i_modify) { } bool res = false; - + switch (i_idx) { case ANM_NONE: res = setExpressionBtp(EXPR_BTP_THEB); @@ -730,11 +730,11 @@ void daNpcTheB_c::setMotionAnm(int i_idx, f32 i_morf) { case ANM_WHIP: case ANM_WHIP_B: break; - + case ANM_SIT_B: setExpressionAnm(ANM_FH_TALK_B, true); break; - + case ANM_BEND_WAIT: setExpressionAnm(ANM_FH_BEND_WAIT, true); break; @@ -774,7 +774,7 @@ void daNpcTheB_c::reset() { initialize(); if (strcmp(dComIfGp_getStartStageName(), "F_SP123") == 0) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } mpMatAnm->initialize(); @@ -880,7 +880,7 @@ BOOL daNpcTheB_c::doEvent() { e_wb_class* wb_p; BOOL rv = FALSE; s32 staffId; - + if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk()) { if (chkAction(&daNpcTheB_c::talk)) { @@ -890,7 +890,7 @@ BOOL daNpcTheB_c::doEvent() { fopAc_ac_c* actor_p = fopAcM_SearchByID(parentActorID); if (actor_p != NULL) { - fopAcM_OnStatus(actor_p, fopAcM_STATUS_UNK_0x800); + fopAcM_OnStatus(actor_p, fopAcStts_STAFF_EXTRA_e); } } @@ -901,10 +901,10 @@ BOOL daNpcTheB_c::doEvent() { if (staffId != -1) { mStaffID = staffId; JUT_ASSERT(1357, NULL != mEvtSeqList[mOrderEvtNo]); - + actor_p = fopAcM_SearchByID(parentActorID); if (actor_p != NULL) { - fopAcM_OnStatus(actor_p, fopAcM_STATUS_UNK_0x800); + fopAcM_OnStatus(actor_p, fopAcStts_STAFF_EXTRA_e); } if ((this->*mEvtSeqList[mOrderEvtNo])(staffId)) { @@ -917,8 +917,8 @@ BOOL daNpcTheB_c::doEvent() { EvCut_PersonalCombatAfter(); rv = TRUE; } else { - wb_p = (e_wb_class*)fopAcM_SearchByName(PROC_E_WB); - if (wb_p->field_0x169e == 0x60 && wb_p->field_0x16a0 == 1) { + wb_p = (e_wb_class*)fopAcM_SearchByName(fpcNm_E_WB_e); + if (wb_p->demo_mode == 0x60 && wb_p->demo_timer == 1) { mPersonalCombatAfterFlag = 1; EvCut_PersonalCombatAfter(); rv = TRUE; @@ -931,7 +931,7 @@ BOOL daNpcTheB_c::doEvent() { default: break; } - + dComIfGp_event_reset(); mOrderEvtNo = EVT_NONE; mEventIdx = -1; @@ -970,7 +970,7 @@ void daNpcTheB_c::lookat() { switch (mLookMode) { case LOOK_NONE: break; - + case LOOK_RESET: case LOOK_PLAYER: player = daPy_getPlayerActorClass(); @@ -1054,7 +1054,7 @@ int daNpcTheB_c::wait(void* param_1) { mTurnMode = 0; mMode = 2; break; - + case 2: { bool bVar1 = mActorMngrs[0].getActorP() != NULL; @@ -1138,11 +1138,11 @@ int daNpcTheB_c::talk(void* param_1) { mTurnMode = 0; mMode = 2; break; - + case 2: if (talkProc(NULL, TRUE, NULL)) { field_0x9ec = false; - + if (!field_0x9ec) { dComIfGp_event_reset(); } @@ -1402,7 +1402,7 @@ void daNpcTheB_c::EvCut_PersonalCombatAfter() { int daNpcTheB_c::EvCut_AnnulationFieldRace(int i_staffId) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); - daStartAndGoal_c* startAndGoal_p = (daStartAndGoal_c*)fpcM_SearchByName(PROC_START_AND_GOAL); + daStartAndGoal_c* startAndGoal_p = (daStartAndGoal_c*)fpcM_SearchByName(fpcNm_START_AND_GOAL_e); if (startAndGoal_p == NULL) { return 0; @@ -1517,7 +1517,7 @@ int daNpcTheB_c::EvCut_CoachGuardGameOver(int i_staffId) { } case '0003': - ((daCoach2D_c*)fpcM_SearchByName(PROC_COACH2D))->hide(); + ((daCoach2D_c*)fpcM_SearchByName(fpcNm_COACH2D_e))->hide(); break; case '0004': @@ -1576,18 +1576,18 @@ static actor_method_class daNpcTheB_MethodTable = { }; actor_process_profile_definition g_profile_NPC_THEB = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_THEB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcTheB_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 331, // mPriority - &daNpcTheB_MethodTable, // sub_method - 0x00040108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_THEB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcTheB_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_THEB_e, + /* Actor SubMtd */ &daNpcTheB_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_tk.cpp b/src/d/actor/d_a_npc_tk.cpp index 6ac80659ee..c31c0c052c 100644 --- a/src/d/actor/d_a_npc_tk.cpp +++ b/src/d/actor/d_a_npc_tk.cpp @@ -171,7 +171,7 @@ void daNPC_TK_c::setActionMode(int param_0) { field_0x694 = 0; field_0x6c5 = 0; current.angle.y = shape_angle.y; - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } } @@ -311,7 +311,7 @@ static s32 checkRangeOfTake(fopAc_ac_c* param_0, fopAc_ac_c* param_1) { static void* s_obj_sub(void* param_0, void* param_1) { if (fopAcM_IsActor(param_0) != 0 && - (fopAcM_GetName(param_0) == PROC_NI || + (fopAcM_GetName(param_0) == fpcNm_NI_e || fopAcM_CheckCarryType((fopAc_ac_c*)param_0, fopAcM_CARRY_CHICKEN) != 0)) { checkRangeOfTake((fopAc_ac_c*)param_1, (fopAc_ac_c*)param_0); @@ -321,7 +321,7 @@ static void* s_obj_sub(void* param_0, void* param_1) { static void* s_hanjo(void* param_0, void* param_1) { UNUSED(param_1); - if (fopAcM_IsActor(param_0) != 0 && fopAcM_GetName(param_0) == PROC_NPC_HANJO) { + if (fopAcM_IsActor(param_0) != 0 && fopAcM_GetName(param_0) == fpcNm_NPC_HANJO_e) { return param_0; } else { return 0; @@ -567,7 +567,7 @@ bool daNPC_TK_c::executePerchDemo(int param_0) { } current.pos.y = current.pos.y + field_0x67c; - + dPnt* pnt = dPath_GetPnt(mpPath1, mPathStep2); pathPos = pnt->m_position; cLib_addCalcAngleS(¤t.angle.y, cLib_targetAngleY(¤t.pos, &pathPos), 0x20, @@ -947,8 +947,8 @@ void daNPC_TK_c::executeAttack() { if (mSphere.ChkAtHit() != 0) { fopAc_ac_c* local_118 = dCc_GetAc(mSphere.GetAtHitObj()->GetAc()); - if (fopAcM_GetName(local_118) != PROC_ALINK && - fopAcM_GetName(local_118) != PROC_E_ARROW) + if (fopAcM_GetName(local_118) != fpcNm_ALINK_e && + fopAcM_GetName(local_118) != fpcNm_E_ARROW_e) { setAwayAction(0); @@ -979,11 +979,11 @@ void daNPC_TK_c::executeAttack() { field_0x634 = m_near_actor; if (field_0x634 != 0 && current.pos.abs(field_0x634->current.pos) < l_HIO.field_0x34) { - if (fopAcM_GetName(field_0x634) == PROC_NI) { + if (fopAcM_GetName(field_0x634) == fpcNm_NI_e) { mCarryType = 0; - } else if (fopAcM_GetName(field_0x634) == PROC_OBJ_KAGO) { + } else if (fopAcM_GetName(field_0x634) == fpcNm_OBJ_KAGO_e) { mCarryType = 2; - } else if (fopAcM_GetName(field_0x634) == PROC_OBJ_PUMPKIN) { + } else if (fopAcM_GetName(field_0x634) == fpcNm_OBJ_PUMPKIN_e) { mCarryType = 1; } @@ -1287,11 +1287,11 @@ void daNPC_TK_c::executeBack() { fopAcM_setHawkCarryNow(field_0x634); - if (fopAcM_GetName(field_0x634) == PROC_NI) { + if (fopAcM_GetName(field_0x634) == fpcNm_NI_e) { fopAcM_setCarryNow(field_0x634, 0); } - if (fopAcM_GetName(field_0x634) == PROC_OBJ_KAGO && + if (fopAcM_GetName(field_0x634) == fpcNm_OBJ_KAGO_e && /* dSv_event_flag_c::F_0577 - Ordon Village - 2nd Day - Retrieved basket from monkey (hit hawk) */ !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x241])) { @@ -1395,7 +1395,7 @@ void daNPC_TK_c::executeBack() { if (field_0x694 == 10) { if (current.pos.absXZ(playerPos) < 200.0f) { field_0x6b4 = 0; - if (fopAcM_GetName(field_0x634) == PROC_OBJ_KAGO && + if (fopAcM_GetName(field_0x634) == fpcNm_OBJ_KAGO_e && /* dSv_event_flag_c::F_0577 - Ordon Village - 2nd Day - Retrieved basket from monkey (hit hawk) */ !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x241])) { @@ -1436,7 +1436,7 @@ void daNPC_TK_c::executeBack() { field_0x6c3 = 0; fopAcM_cancelHawkCarryNow(field_0x634); - if (fopAcM_GetName(field_0x634) == PROC_NI) { + if (fopAcM_GetName(field_0x634) == fpcNm_NI_e) { fopAcM_cancelCarryNow(field_0x634); } field_0x634 = NULL; @@ -1536,7 +1536,7 @@ void daNPC_TK_c::executeAttackLink() { field_0x694 = 1; setBck(8, 2, 10.0f, 1.0f); mSound.startCreatureVoice(Z2SE_HAWK_V_TAKE_OFF, -1); - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); field_0x6b4 = 0x1e; break; } @@ -1566,12 +1566,12 @@ void daNPC_TK_c::executeAttackLink() { cLib_chaseF(&speed.y, cM_scos(pitch) * (40.0f + nREG_F(5)), 3.0f); cLib_chaseF(&speedF, cM_ssin(pitch) * (40.0f + nREG_F(5)), 3.0f); if (mSphere.ChkAtHit()) { - if (fopAcM_GetName(dCc_GetAc(mSphere.GetAtHitObj()->GetAc())) != PROC_ALINK) { + if (fopAcM_GetName(dCc_GetAc(mSphere.GetAtHitObj()->GetAc())) != fpcNm_ALINK_e) { if (daPy_getPlayerActorClass()->getDamageWaitTimer() == 0) { break; } } - if (fopAcM_GetName(dCc_GetAc(mSphere.GetAtHitObj()->GetAc())) == PROC_ALINK) { + if (fopAcM_GetName(dCc_GetAc(mSphere.GetAtHitObj()->GetAc())) == fpcNm_ALINK_e) { field_0x6c7++; mSphere.ClrAtHit(); } @@ -1603,7 +1603,7 @@ void daNPC_TK_c::executeAttackLink() { mSphere.OnAtSetBit(); field_0x6ae = 1; if (mSphere.ChkAtHit() != 0) { - if (fopAcM_GetName(dCc_GetAc(mSphere.GetAtHitObj()->GetAc())) == PROC_ALINK) { + if (fopAcM_GetName(dCc_GetAc(mSphere.GetAtHitObj()->GetAc())) == fpcNm_ALINK_e) { field_0x6c7++; mSphere.ClrAtHit(); field_0x694 = 4; @@ -1641,8 +1641,8 @@ void daNPC_TK_c::executeAttackLink() { cLib_chaseF(&speed.y, targetSpeedY, 1.0f); cLib_chaseF(&speedF, 30.0f, 3.0f); if (field_0x6b0 == 0) { - if (dComIfGp_checkPlayerStatus0(0, fopAcM_STATUS_HOOK_CARRY_NOW) || - dComIfGp_checkPlayerStatus0(0, fopAcM_STATUS_UNK_0x100) || + if (dComIfGp_checkPlayerStatus0(0, fopAcStts_HOOK_CARRY_NOW_e) || + dComIfGp_checkPlayerStatus0(0, fopAcStts_CULL_e) || daPy_getPlayerActorClass()->checkWolfTagLockJumpReady()) { field_0x6b0 = 10; @@ -1804,7 +1804,7 @@ void daNPC_TK_c::executeAttackDemo() { cLib_chaseF(&speedF, (50.0f + nREG_F(4)) * cM_ssin(pitch), 10.0f); if (mSphere.ChkAtHit()) { - if (fopAcM_GetName(dCc_GetAc(mSphere.GetAtHitObj()->GetAc())) != PROC_ALINK) { + if (fopAcM_GetName(dCc_GetAc(mSphere.GetAtHitObj()->GetAc())) != fpcNm_ALINK_e) { if (daPy_getPlayerActorClass()->getDamageWaitTimer() == 0) { return; } @@ -1815,7 +1815,7 @@ void daNPC_TK_c::executeAttackDemo() { field_0x694 = 2; field_0x6b0 = 0xf; - if (fopAcM_GetName(dCc_GetAc(mSphere.GetAtHitObj()->GetAc())) == PROC_ALINK) { + if (fopAcM_GetName(dCc_GetAc(mSphere.GetAtHitObj()->GetAc())) == fpcNm_ALINK_e) { field_0x6c7++; mSphere.ClrAtHit(); } @@ -2462,7 +2462,7 @@ void daNPC_TK_c::executeWolfPerch() { void daNPC_TK_c::executeResistanceDemo() { daNpcMoiR_c* npcMoiR; - if (fopAcM_SearchByName(PROC_NPC_MOIR, (fopAc_ac_c**)&npcMoiR) == 0 || npcMoiR == NULL) { + if (fopAcM_SearchByName(fpcNm_NPC_MOIR_e, (fopAc_ac_c**)&npcMoiR) == 0 || npcMoiR == NULL) { return; } @@ -3309,20 +3309,20 @@ static actor_method_class l_daNPC_TK_Method = { }; actor_process_profile_definition g_profile_NPC_TK = { - fpcLy_CURRENT_e, // mLayerID - 6, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_TK, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNPC_TK_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 703, // mPriority - &l_daNPC_TK_Method, // sub_method - 0x08044000, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 6, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_TK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNPC_TK_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_TK_e, + /* Actor SubMtd */ &l_daNPC_TK_Method, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_npc_tkc.cpp b/src/d/actor/d_a_npc_tkc.cpp index ef6019b49b..441beb1a5b 100644 --- a/src/d/actor/d_a_npc_tkc.cpp +++ b/src/d/actor/d_a_npc_tkc.cpp @@ -1389,18 +1389,18 @@ static actor_method_class daNpcTkc_MethodTable = { }; actor_process_profile_definition g_profile_NPC_TKC = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_TKC, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcTkc_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 375, // mPriority - &daNpcTkc_MethodTable, // sub_method - 0x08044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_TKC_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcTkc_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_TKC_e, + /* Actor SubMtd */ &daNpcTkc_MethodTable, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_tkj.cpp b/src/d/actor/d_a_npc_tkj.cpp index 33491749f4..af8eaf3d6c 100644 --- a/src/d/actor/d_a_npc_tkj.cpp +++ b/src/d/actor/d_a_npc_tkj.cpp @@ -480,7 +480,7 @@ int daNpcTkj_c::wait(void*) { mJntAnm.lookNone(0); } - if (mItemNo == fpcNm_ITEM_DUNGEON_EXIT_2 && mItemPartnerId == fpcM_ERROR_PROCESS_ID_e) { + if (mItemNo == dItemNo_DUNGEON_EXIT_2_e && mItemPartnerId == fpcM_ERROR_PROCESS_ID_e) { dComIfGs_onDungeonItemWarp(); fopAcM_delete(this); } @@ -691,18 +691,18 @@ static actor_method_class daNpc_Tkj_MethodTable = { }; actor_process_profile_definition g_profile_NPC_TKJ = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_TKJ, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcTkj_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 373, // mPriority - &daNpc_Tkj_MethodTable, // sub_method - 0x08044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_TKJ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcTkj_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_TKJ_e, + /* Actor SubMtd */ &daNpc_Tkj_MethodTable, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_tkj2.cpp b/src/d/actor/d_a_npc_tkj2.cpp index 8885746542..29394659e1 100644 --- a/src/d/actor/d_a_npc_tkj2.cpp +++ b/src/d/actor/d_a_npc_tkj2.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_tkj2.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -10,6 +10,21 @@ #include "d/d_s_play.h" #include +class daNpc_Tkj2_HIO_c : public JORReflexible { +public: + daNpc_Tkj2_HIO_c(); + virtual ~daNpc_Tkj2_HIO_c() {} +#if DEBUG + virtual void genMessage(JORMContext* ctx); +#endif + + /* 天空人（アクション用）- Sky People (For Action) */ + /* 0x04 */ s8 child; + /* 0x08 */ f32 basic_size; // 基本大きさ - Basic Size + /* 0x0C */ f32 hook_hit_size; // フックヒット大きさ - Hook Hit Size + /* 0x10 */ f32 boots_struggle_sp; // ブーツ時もがきSP - Boots Struggle SP +}; + enum Tkj2_RES_File_ID { /* BCK */ /* 0x06 */ BCK_TKJ_FLY = 0x6, @@ -62,12 +77,21 @@ enum Action { }; daNpc_Tkj2_HIO_c::daNpc_Tkj2_HIO_c() { - field_0x4 = -1; + child = -1; basic_size = 1.0f; hook_hit_size = 1.0f; boots_struggle_sp = 2.0f; } +#if DEBUG +void daNpc_Tkj2_HIO_c::genMessage(JORMContext* ctx) { + ctx->genLabel("天空人（アクション用）", 0x80000001); + ctx->genSlider("基本大きさ", &basic_size, 0.0f, 3.0f); + ctx->genSlider("フックヒット大きさ", &hook_hit_size, 0.0f, 5.0f); + ctx->genSlider("ブーツ時もがきSP", &boots_struggle_sp, 0.0f, 100.0f); +} +#endif + static void anm_init(npc_tkj2_class* i_this, int i_index, f32 i_morf, u8 i_attr, f32 i_rate) { i_this->mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Tkj2", i_index), i_attr, i_morf, i_rate, 0.0f, -1.0f); i_this->field_0x5f4 = i_index; @@ -75,9 +99,11 @@ static void anm_init(npc_tkj2_class* i_this, int i_index, f32 i_morf, u8 i_attr, static int nodeCallBack(J3DJoint* i_joint, int param_2) { if (param_2 == 0) { - int jntNo = i_joint->getJntNo(); + J3DJoint* joint = i_joint; + int jntNo = joint->getJntNo(); J3DModel* model = j3dSys.getModel(); npc_tkj2_class* i_this = (npc_tkj2_class*)model->getUserArea(); + int userArea = (int)i_this; if (i_this != NULL) { MTXCopy(model->getAnmMtx(jntNo), *calc_mtx); @@ -100,21 +126,21 @@ static int nodeCallBack(J3DJoint* i_joint, int param_2) { } static int daNpc_Tkj2_Draw(npc_tkj2_class* i_this) { - fopAc_ac_c* a_this = &i_this->actor; + fopAc_ac_c* actor = &i_this->actor; J3DModel* model = i_this->mpModelMorf->getModel(); - g_env_light.settingTevStruct(0, &a_this->current.pos, &a_this->tevStr); - g_env_light.setLightTevColorType_MAJI(model, &a_this->tevStr); + g_env_light.settingTevStruct(0, &actor->current.pos, &actor->tevStr); + g_env_light.setLightTevColorType_MAJI(model, &actor->tevStr); i_this->mpBtkAnm->entry(model->getModelData()); i_this->mpBtpAnm->entry(model->getModelData()); i_this->mpModelMorf->entryDL(); - if (!fopAcM_checkCarryNow(a_this)) { + if (!fopAcM_checkCarryNow(actor)) { cXyz pos; - pos.set(a_this->current.pos.x, a_this->current.pos.y + 100.0f, a_this->current.pos.z); + pos.set(actor->current.pos.x, actor->current.pos.y + 100.0f, actor->current.pos.z); i_this->mShadowKey = dComIfGd_setShadow(i_this->mShadowKey, 1, model, &pos, 400.0f, 40.0f, - a_this->current.pos.y, i_this->mObjAcch.GetGroundH(), i_this->mObjAcch.m_gnd, - &a_this->tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); + actor->current.pos.y, i_this->mObjAcch.GetGroundH(), i_this->mObjAcch.m_gnd, + &i_this->actor.tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); } return 1; @@ -122,13 +148,13 @@ static int daNpc_Tkj2_Draw(npc_tkj2_class* i_this) { static void npc_tkj2_carry_check(npc_tkj2_class* i_this) { fopAc_ac_c* a_this = &i_this->actor; + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); if (fopAcM_checkCarryNow(a_this)) { - cLib_offBit(a_this->attention_info.flags, 0x10); + cLib_offBit(a_this->attention_info.flags, fopAc_AttnFlag_CARRY_e); i_this->mAction = 1; i_this->field_0x60a = 0; - a_this->speed.y = 0.0f; - a_this->speedF = 0.0f; + a_this->speedF = a_this->speed.y = 0.0f; i_this->field_0x630 = 0; i_this->mStts.Init(100, 0, a_this); } @@ -180,7 +206,7 @@ static void Wind_effect(npc_tkj2_class* i_this) { } } - i_this->field_0x5c4 = cM_atan2s(i_this->field_0x5fc.x, i_this->field_0x5fc.z); + i_this->field_0x5c4 = (s16)cM_atan2s(i_this->field_0x5fc.x, i_this->field_0x5fc.z); i_this->field_0x5eb = 1; } } @@ -207,7 +233,7 @@ static void CheckRoof(npc_tkj2_class* i_this) { for (int i = 0; i < 4; i++) { cLib_offsetPos(&end, &a_this->current.pos, a_this->shape_angle.y + i * 0x4000, &spc8); lin_chk.Set(&a_this->current.pos, &end, NULL); - + if (dComIfG_Bgsp().LineCross(&lin_chk)) { cM3dGPla plane; dComIfG_Bgsp().GetTriPla(lin_chk, &plane); @@ -217,7 +243,8 @@ static void CheckRoof(npc_tkj2_class* i_this) { cXyz spec(0.0f, 0.0f, 0.0f); cXyz spf8(0.0f, np->y, np->z); - i_this->field_0x5ec.z = -cM_atan2s(np->x, spec.abs(spf8)); + f32 specAbs = spec.abs(spf8); + i_this->field_0x5ec.z = -cM_atan2s(np->x, specAbs); i_this->field_0x5ec.x = cM_atan2s(np->z, np->y); i_this->field_0x630 = 1; a_this->current.pos = lin_chk.GetCross(); @@ -258,14 +285,16 @@ static bool CheckWall(npc_tkj2_class* i_this, s16 param_2) { cM3dGPla plane; dComIfG_Bgsp().GetTriPla(lin_chk_1, &plane); cXyz* np = plane.GetNP(); + f32 var_f30 = np->y; cXyz sp1e0(0.0f, 0.0f, 0.0f); cXyz sp1ec(0.0f, np->y, np->z); f32 fVar1 = sp1e0.abs(sp1ec); a_this->current.pos = lin_chk_1.GetCross(); - s16 sVar1 = -cM_atan2s(np->x, fVar1); - s16 sVar2 = cM_atan2s(np->z, np->y); - cLib_chaseAngleS(&i_this->field_0x5ec.x, sVar2, 0x150); - cLib_chaseAngleS(&i_this->field_0x5ec.z, sVar1, 0x150); + s16 sp10, sp0E; + sp0E = -cM_atan2s(np->x, fVar1); + sp10 = cM_atan2s(np->z, np->y); + cLib_chaseAngleS(&i_this->field_0x5ec.x, sp10, 0x150); + cLib_chaseAngleS(&i_this->field_0x5ec.z, sp0E, 0x150); return true; } @@ -273,6 +302,7 @@ static bool CheckWall(npc_tkj2_class* i_this, s16 param_2) { } static bool GndCheck2(npc_tkj2_class* i_this) { + fopAc_ac_c* actor = &i_this->actor; dBgS_ObjGndChk obj_gnd_chk; cXyz sp78(i_this->field_0x5b8.x, i_this->field_0x5b8.y + 100.0f, i_this->field_0x5b8.z); obj_gnd_chk.SetPos(&sp78); @@ -302,8 +332,9 @@ static bool GndCheck(npc_tkj2_class* i_this, cXyz param_2) { static void npc_tkj2_normal(npc_tkj2_class* i_this) { fopAc_ac_c* a_this = &i_this->actor; + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); cXyz sp38, sp44; - f32 fVar1 = 0.0f; + f32 var_f31 = 0.0f; cXyz sp50(0.0f, 100.0f, 0.0f); switch (i_this->field_0x60a) { @@ -324,7 +355,7 @@ static void npc_tkj2_normal(npc_tkj2_class* i_this) { sp38 = a_this->home.pos - a_this->current.pos; sp38.x += cM_rndFX(300.0f); sp38.z += cM_rndFX(300.0f); - i_this->field_0x5c4 = cM_atan2s(sp38.x, sp38.z); + i_this->field_0x5c4 = (s16)cM_atan2s(sp38.x, sp38.z); if (GndCheck(i_this, sp50)) { i_this->field_0x5c4 = a_this->current.angle.y + 0x8000 + (s16)cM_rndFX(4000.0f); @@ -347,10 +378,10 @@ static void npc_tkj2_normal(npc_tkj2_class* i_this) { mDoMtx_stack_c::multVec(&sp38, &sp44); sp44.x += cM_rndFX(300.0f); sp44.z += cM_rndFX(300.0f); - i_this->field_0x5c4 = cM_atan2s(sp44.x, sp44.z); + i_this->field_0x5c4 = (s16)cM_atan2s(sp44.x, sp44.z); - if (!CheckWall(i_this, i_this->field_0x5c4)) { - i_this->field_0x5c4 += 0x8000; + if ((u8)CheckWall(i_this, i_this->field_0x5c4) == FALSE) { + ANGLE_ADD_2(i_this->field_0x5c4, 0x8000); } i_this->field_0x610[0] = cM_rndF(60.0f) + 30.0f; @@ -359,9 +390,9 @@ static void npc_tkj2_normal(npc_tkj2_class* i_this) { break; case 10: - fVar1 = 5.0f; + var_f31 = 5.0f; sp50.set(0.0f, 100.0f, 100.0f); - + if (GndCheck(i_this, sp50)) { i_this->field_0x60a = 1; i_this->field_0x610[0] = 0; @@ -369,16 +400,17 @@ static void npc_tkj2_normal(npc_tkj2_class* i_this) { if (i_this->field_0x610[0] == 0) { i_this->field_0x60a = 0; + var_f31 = 0.0f; a_this->speedF = 0.0f; - fVar1 = 3.0f; + var_f31 = 3.0f; } break; case 11: - fVar1 = 5.0f; + var_f31 = 5.0f; - if (!CheckWall(i_this, a_this->current.angle.y)) { - fVar1 = 0.0f; + if ((u8)CheckWall(i_this, a_this->current.angle.y) == FALSE) { + var_f31 = 0.0f; } if (i_this->field_0x610[0] == 0) { @@ -388,10 +420,11 @@ static void npc_tkj2_normal(npc_tkj2_class* i_this) { } cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->field_0x5c4, 8, 0x400); - cLib_addCalc2(&a_this->speedF, fVar1, 1.0f, 5.0f); + cLib_addCalc2(&a_this->speedF, var_f31, 1.0f, 5.0f); } static cXyz return_pos_get(npc_tkj2_class* i_this) { + fopAc_ac_c* actor = &i_this->actor; fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0); dBgS_GndChk gnd_chk; cXyz sp84, sp90; @@ -451,7 +484,8 @@ static s8 npc_tkj2_carry(npc_tkj2_class* i_this) { if (player->checkEquipHeavyBoots() && speed.y != 0.0f) { i_this->mpModelMorf->setPlaySpeed(l_HIO.boots_struggle_sp); } else if (i_this->field_0x88c.ChkTgHit()) { - if (i_this->field_0x88c.GetTgHitGObj()->GetAtMtrl() == dCcD_MTRL_WIND) { + dCcD_GObjInf* tgHitGObj = i_this->field_0x88c.GetTgHitGObj(); + if (tgHitGObj->GetAtMtrl() == dCcD_MTRL_WIND) { i_this->mpModelMorf->setPlaySpeed(2.0f); i_this->field_0x88c.ClrTgHit(); } @@ -464,6 +498,7 @@ static s8 npc_tkj2_carry(npc_tkj2_class* i_this) { } if (!fopAcM_checkCarryNow(a_this)) { + cXyz* playerSpeed = fopAcM_GetSpeed_p(player); if (player->checkGrabThrow()) { i_this->mSound.startCreatureVoice(Z2SE_TKJ_V_THROWN_CRY, -1); i_this->field_0x60a = 0; @@ -488,7 +523,7 @@ static s8 npc_tkj2_carry(npc_tkj2_class* i_this) { a_this->home.pos = return_pos_get(i_this); } - + if (fopAcM_checkCarryNow(a_this)) { if (daPy_getLinkPlayerActorClass()->checkAutoJump()) { if (strcmp(dComIfGp_getStartStageName(), "D_MN07") == 0 && fopAcM_GetRoomNo(a_this) == 1) { @@ -496,7 +531,7 @@ static s8 npc_tkj2_carry(npc_tkj2_class* i_this) { } } } - + return rv; } @@ -513,7 +548,7 @@ static void npc_tkj2_fly(npc_tkj2_class* i_this) { fVar1 = 1.0f; i_this->field_0x5b8 = a_this->home.pos; break; - + case 1: fVar1 = 0.3f; break; @@ -537,7 +572,7 @@ static void npc_tkj2_fly(npc_tkj2_class* i_this) { i_this->field_0x60a = 0; i_this->field_0x5f8 = 0x500; - if (GndCheck2(i_this)) { + if ((u8)GndCheck2(i_this) != FALSE) { i_this->field_0x5b8 = fopAcM_GetPosition(player); } } else if (i_this->mObjAcch.ChkGroundHit()) { @@ -567,7 +602,7 @@ static void npc_tkj2_drop(npc_tkj2_class* i_this) { i_this->field_0x60a = 0; a_this->home.pos = a_this->current.pos; } - + cLib_addCalc2(&a_this->speedF, 20.0f, 0.5f, 10.0f); } static void npc_tkj2_return(npc_tkj2_class* i_this) { @@ -577,8 +612,8 @@ static void npc_tkj2_return(npc_tkj2_class* i_this) { sp4c.x = i_this->field_0x5b8.x - a_this->current.pos.x; sp4c.z = i_this->field_0x5b8.z - a_this->current.pos.z; - i_this->field_0x5c4 = cM_atan2s(sp4c.x, sp4c.z); - JMAFastSqrt(sp4c.x * sp4c.x + sp4c.z * sp4c.z); + i_this->field_0x5c4 = (s16)cM_atan2s(sp4c.x, sp4c.z); + f32 var_f29 = JMAFastSqrt(sp4c.x * sp4c.x + sp4c.z * sp4c.z); f32 fVar1; switch (i_this->field_0x60a) { @@ -625,7 +660,7 @@ static void npc_tkj2_return(npc_tkj2_class* i_this) { } if (fVar2 < 100.0f) { - if (!GndCheck2(i_this)) { + if ((u8)GndCheck2(i_this) == FALSE) { anm_init(i_this, BCK_TKJ_FLY_FALL, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f); i_this->mAction = 6; i_this->field_0x60a = 0; @@ -643,19 +678,24 @@ static void npc_tkj2_return(npc_tkj2_class* i_this) { } static void ObjHit(npc_tkj2_class* i_this) { - fopAc_ac_c* a_this = &i_this->actor; - i_this->field_0x620--; if (i_this->field_0x620 <= 0) { i_this->field_0x620 = 0; } + fopAc_ac_c* a_this = &i_this->actor; + + fopAc_ac_c* player = daPy_getPlayerActorClass(); + u8 cutType = (u8)daPy_getPlayerActorClass()->getCutType(); + if (i_this->field_0x620 > 0) { i_this->field_0x88c.ClrTgHit(); if (i_this->field_0x630 == 0 && a_this->speedF != 0.0f) { cLib_addCalc2(&a_this->speedF, 10.0f, 1.0f, 5.0f); } + + (void)0; } else if (i_this->field_0x88c.ChkTgHit()) { if (a_this->speedF == 0.0f) { i_this->field_0x88c.ClrTgHit(); @@ -693,81 +733,85 @@ static void action(npc_tkj2_class* i_this) { i_this->field_0x5cc = fopAcM_searchPlayerAngleY(a_this); s8 sVar1 = 0; - BOOL bVar1 = FALSE; - s8 sVar2 = 1; + s8 sp0D = 0; + BOOL sp24 = FALSE; + s8 sp0C = 0; + s8 sp0B = 1; + s8 sp0A = 1; cXyz sp50(0.0f, 100.0f, 0.0f); i_this->field_0xa8c = 0; switch (i_this->mAction) { - case ACTION_NORMAL: - npc_tkj2_normal(i_this); - sVar1 = 1; - bVar1 = TRUE; + case ACTION_NORMAL: + npc_tkj2_normal(i_this); + sVar1 = 1; + sp0D = 1; + sp24 = TRUE; - if (i_this->field_0x630 != 0) { - sVar2 = 0; - } + if (i_this->field_0x630 != 0) { + sp0B = 0; + } - if (i_this->field_0x88c.ChkTgHit()) { - cCcD_ObjHitInf* tgHitObj = i_this->field_0x88c.GetTgHitObj(); + if (i_this->field_0x88c.ChkTgHit()) { + cCcD_ObjHitInf* tgHitObj = i_this->field_0x88c.GetTgHitObj(); - if (tgHitObj != NULL) { - if (tgHitObj->ChkAtType(AT_TYPE_BOOMERANG)) { - mode_init_boomCarry(i_this); - } else { - tgHitObj->ChkAtType(AT_TYPE_HOOKSHOT); - } + if (tgHitObj != NULL) { + if (tgHitObj->ChkAtType(AT_TYPE_BOOMERANG)) { + mode_init_boomCarry(i_this); + } else { + tgHitObj->ChkAtType(AT_TYPE_HOOKSHOT); } } + } - ObjHit(i_this); - break; + ObjHit(i_this); + break; - case ACTION_CARRY: - sVar2 = npc_tkj2_carry(i_this); - break; + case ACTION_CARRY: + sp0B = npc_tkj2_carry(i_this); + break; - case ACTION_FLY: - npc_tkj2_fly(i_this); - break; + case ACTION_FLY: + npc_tkj2_fly(i_this); + break; - case ACTION_DROP: - npc_tkj2_drop(i_this); - cLib_addCalc2(&a_this->speedF, 5.0f, 0.3f, 1.0f); + case ACTION_DROP: + npc_tkj2_drop(i_this); + cLib_addCalc2(&a_this->speedF, 5.0f, 0.3f, 1.0f); - if (GndCheck(i_this, sp50)) { - i_this->field_0x5b8 = a_this->home.pos; - i_this->field_0x60a = 0; - a_this->speedF = 5.0f; - a_this->speed.y = 10.0f; - i_this->mAction = 4; + if (GndCheck(i_this, sp50)) { + i_this->field_0x5b8 = a_this->home.pos; + i_this->field_0x60a = 0; + a_this->speedF = 5.0f; + a_this->speed.y = 10.0f; + i_this->mAction = 4; - if (GndCheck2(i_this)) { - i_this->field_0x5b8 = fopAcM_GetPosition(player); - } - - i_this->field_0x5c4 = fopAcM_searchPlayerAngleY(a_this) + 0x8000; - i_this->field_0x5f8 = 0x500; - } - break; - - case ACTION_DROP_2: - npc_tkj2_drop(i_this); - - if (GndCheck2(i_this)) { + if ((u8)GndCheck2(i_this) != FALSE) { i_this->field_0x5b8 = fopAcM_GetPosition(player); - i_this->field_0x60a = 0; - a_this->speedF = 5.0f; - a_this->speed.y = 10.0f; - i_this->mAction = 4; - i_this->field_0x5f8 = 0x500; - i_this->field_0x5c4 = fopAcM_searchPlayerAngleY(a_this) + 0x8000; } - break; - case ACTION_RETURN: - npc_tkj2_return(i_this); - break; + i_this->field_0x5c4 = fopAcM_searchPlayerAngleY(a_this) + 0x8000; + i_this->field_0x5f8 = 0x500; + } + break; + + case ACTION_DROP_2: + npc_tkj2_drop(i_this); + + if ((u8)GndCheck2(i_this) != FALSE) { + i_this->field_0x5b8 = fopAcM_GetPosition(player); + i_this->field_0x60a = 0; + a_this->speedF = 5.0f; + a_this->speed.y = 10.0f; + i_this->mAction = 4; + i_this->field_0x5f8 = 0x500; + i_this->field_0x5c4 = fopAcM_searchPlayerAngleY(a_this) + 0x8000; + } + break; + + case ACTION_RETURN: + npc_tkj2_return(i_this); + break; } Wind_effect(i_this); @@ -777,7 +821,7 @@ static void action(npc_tkj2_class* i_this) { i_this->field_0xa8c = 1; } - if (fopAcM_CheckStatus(a_this, fopAcM_STATUS_HOOK_CARRY_NOW)) { + if (fopAcM_CheckStatus(a_this, fopAcStts_HOOK_CARRY_NOW_e)) { i_this->field_0x5ea = 1; } else if (i_this->field_0x5ea != 0) { i_this->field_0x5ea = 0; @@ -789,7 +833,7 @@ static void action(npc_tkj2_class* i_this) { a_this->speedF = 0.0f; a_this->speed.y = 0.0f; } else if (player->setForceGrab(a_this, 0, 1)) { - cLib_offBit(a_this->attention_info.flags, 0x10); + cLib_offBit(a_this->attention_info.flags, fopAc_AttnFlag_CARRY_e); i_this->mAction = 1; i_this->field_0x630 = 0; i_this->field_0x60a = 0; @@ -809,38 +853,40 @@ static void action(npc_tkj2_class* i_this) { i_this->mAction = 3; i_this->field_0x60a = 0; a_this->speed.y = 0.0f; - bVar1 = TRUE; + sp24 = TRUE; i_this->field_0x610[0] = 15; } } cLib_addCalcAngleS2(&a_this->shape_angle.y, a_this->current.angle.y, 2, 0x2000); - if (i_this->field_0x630 == 0) { - if (i_this->field_0x630 != 0) { - mDoMtx_stack_c::ZXYrotS(i_this->field_0x5ec); - mDoMtx_stack_c::YrotM(a_this->current.angle.y); - } else { - mDoMtx_stack_c::YrotS(a_this->current.angle.y); - } + if (sp0A) { + if (i_this->field_0x630 == 0) { + if (i_this->field_0x630 != 0) { + mDoMtx_stack_c::ZXYrotS(i_this->field_0x5ec); + mDoMtx_stack_c::YrotM(a_this->current.angle.y); + } else { + mDoMtx_stack_c::YrotS(a_this->current.angle.y); + } - sp38.x = 0.0f; - sp38.y = 0.0f; - sp38.z = a_this->speedF; - mDoMtx_stack_c::multVec(&sp38, &sp44); - a_this->speed.x = sp44.x; - a_this->speed.z = sp44.z; - a_this->current.pos += a_this->speed; - a_this->speed.y += a_this->gravity; + sp38.x = 0.0f; + sp38.y = 0.0f; + sp38.z = a_this->speedF; + mDoMtx_stack_c::multVec(&sp38, &sp44); + a_this->speed.x = sp44.x; + a_this->speed.z = sp44.z; + a_this->current.pos += a_this->speed; + a_this->speed.y += a_this->gravity; - if (a_this->speed.y < -80.0f) { - a_this->speed.y = -80.0f; + if (a_this->speed.y < -80.0f) { + a_this->speed.y = -80.0f; + } } } if (!fopAcM_checkCarryNow(a_this)) { cXyz* ccMoveP = i_this->mStts.GetCCMoveP(); - + if (ccMoveP != NULL) { a_this->current.pos.x += ccMoveP->x; a_this->current.pos.y += ccMoveP->y; @@ -848,7 +894,7 @@ static void action(npc_tkj2_class* i_this) { } } - if (sVar2) { + if (sp0B) { i_this->mObjAcch.CrrPos(dComIfG_Bgsp()); } @@ -868,30 +914,30 @@ static void action(npc_tkj2_class* i_this) { i_this->field_0x5e4 = 0.0f; } - s16 sVar3 = 0; - s16 sVar4 = 0; - s16 sVar5 = BREG_S(0) + 6000; - s16 sVar6 = BREG_S(1) + 9000; + s16 sp18 = 0; + s16 sp16 = 0; if (i_this->field_0xa8c != 0) { sp38 = player->eyePos - a_this->current.pos; sp38.y += TREG_F(1) + -110.0f; - s16 sVar7 = a_this->shape_angle.y - i_this->field_0x5cc; + s16 sp14 = a_this->shape_angle.y - i_this->field_0x5cc; - if (sVar7 < 0x4000 && sVar7 > -0x4000) { - sVar3 = cM_atan2s(sp38.x, sp38.z) - a_this->shape_angle.y; - sVar4 = (s16)cM_atan2s(sp38.y, JMAFastSqrt(sp38.x * sp38.x + sp38.z * sp38.z)); - - if (sVar3 > sVar6) { - sVar3 = sVar6; - } else if (sVar3 < -sVar6) { - sVar3 = -sVar6; + if (sp14 < 0x4000 && sp14 > -0x4000) { + sp18 = cM_atan2s(sp38.x, sp38.z) - a_this->shape_angle.y; + sp16 = (s16)cM_atan2s(sp38.y, JMAFastSqrt(sp38.x * sp38.x + sp38.z * sp38.z)); + s16 sp12 = BREG_S(0) + 6000; + s16 sp10 = BREG_S(1) + 9000; + + if (sp18 > sp10) { + sp18 = sp10; + } else if (sp18 < (s16)-sp10) { + sp18 = -sp10; } - if (sVar4 > sVar5) { - sVar4 = sVar5; - } else if (sVar4 < -sVar5) { - sVar4 = -sVar5; + if (sp16 > sp12) { + sp16 = sp12; + } else if (sp16 < (s16)-sp12) { + sp16 = -sp12; } } @@ -903,8 +949,8 @@ static void action(npc_tkj2_class* i_this) { i_this->field_0xa94 = 0; } - cLib_addCalcAngleS2(&i_this->field_0xa8e, sVar3, 2, 0x600); - cLib_addCalcAngleS2(&i_this->field_0xa90, sVar4, 2, 0x600); + cLib_addCalcAngleS2(&i_this->field_0xa8e, sp18, 2, 0x600); + cLib_addCalcAngleS2(&i_this->field_0xa90, sp16, 2, 0x600); cLib_addCalcAngleS2(&i_this->field_0xa92, i_this->field_0xa94, 4, 300); if (i_this->field_0x5f2 != 0) { @@ -921,7 +967,7 @@ static void action(npc_tkj2_class* i_this) { i_this->field_0x5f2 = 0; i_this->field_0x5f3 = 0; } else if (player->setForceGrab(a_this, 0, 1)) { - cLib_offBit(a_this->attention_info.flags, 0x10); + cLib_offBit(a_this->attention_info.flags, fopAc_AttnFlag_CARRY_e); i_this->mAction = 1; i_this->field_0x630 = 0; i_this->field_0x60a = 0; @@ -942,7 +988,7 @@ static void action(npc_tkj2_class* i_this) { i_this->field_0x5f3 = 1; } else if (i_this->mBoomerangMove.posMove(&a_this->current.pos, &a_this->shape_angle.y, NULL, 0x1C00) != 0) { i_this->mBoomerangMove.bgCheckAfterOffset(&a_this->current.pos); - a_this->current.pos.y += 0.5f; + a_this->current.pos.y += 0.5f + yREG_F(19); } } @@ -950,7 +996,7 @@ static void action(npc_tkj2_class* i_this) { npc_tkj2_carry_check(i_this); } - if (bVar1) { + if (sp24) { cLib_onBit(a_this->attention_info.flags, fopAc_AttnFlag_CARRY_e); } else { cLib_offBit(a_this->attention_info.flags, fopAc_AttnFlag_CARRY_e); @@ -986,7 +1032,7 @@ static int daNpc_Tkj2_Execute(npc_tkj2_class* i_this) { mDoMtx_stack_c::ZXYrotM(a_this->shape_angle); mDoMtx_stack_c::scaleM(l_HIO.basic_size, l_HIO.basic_size, l_HIO.basic_size); - + J3DModel* model = i_this->mpModelMorf->getModel(); model->setBaseTRMtx(mDoMtx_stack_c::get()); i_this->mpModelMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(a_this))); @@ -1026,11 +1072,15 @@ static int daNpc_Tkj2_IsDelete(npc_tkj2_class* i_this) { static int daNpc_Tkj2_Delete(npc_tkj2_class* i_this) { fopAc_ac_c* a_this = &i_this->actor; + fopAcM_RegisterDeleteID(i_this, "Npc_Tkj2"); dComIfG_resDelete(&i_this->mPhase, "Tkj2"); if (i_this->field_0xa9c != 0) { hio_set = 0; +#if DEBUG + mDoHIO_deleteChild(l_HIO.child); +#endif } if (a_this->heap != NULL) { @@ -1077,51 +1127,50 @@ static int useHeapInit(fopAc_ac_c* a_this) { return 1; } -static cPhs_Step daNpc_Tkj2_Create(fopAc_ac_c* a_this) { - fopAcM_ct(a_this, npc_tkj2_class); - npc_tkj2_class* i_this = (npc_tkj2_class*)a_this; +static cPhs_Step daNpc_Tkj2_Create(fopAc_ac_c* i_this) { + npc_tkj2_class* tkj2 = (npc_tkj2_class*)i_this; + fopAcM_ct(&tkj2->actor, npc_tkj2_class); - cPhs_Step phase = dComIfG_resLoad(&i_this->mPhase, "Tkj2"); + cPhs_Step phase = dComIfG_resLoad(&tkj2->mPhase, "Tkj2"); if (phase == cPhs_COMPLEATE_e) { - OS_REPORT("NPC_TKJ2 PARAM %x\n", fopAcM_GetParam(a_this)); + OS_REPORT("NPC_TKJ2 PARAM %x\n", fopAcM_GetParam(i_this)); - i_this->field_0x5b4 = fopAcM_GetParam(a_this); - a_this->shape_angle.x = 0; - a_this->current.angle.x = 0; + tkj2->field_0x5b4 = fopAcM_GetParam(i_this); + i_this->current.angle.x = i_this->shape_angle.x = 0; - if (!fopAcM_entrySolidHeap(a_this, useHeapInit, 0x2F00)) { + if (!fopAcM_entrySolidHeap(i_this, useHeapInit, 0x2F00)) { OS_REPORT("//////////////NPC_TKJ2 SET NON !!\n"); return cPhs_ERROR_e; } if (hio_set == 0) { - i_this->field_0xa9c = 1; + tkj2->field_0xa9c = 1; hio_set = 1; - l_HIO.field_0x4 = -1; + // "Sky people (for action)" + l_HIO.child = mDoHIO_CREATE_CHILD("天空人（アクション用）", &l_HIO); } #if DEBUG - fopAcM_OnStatus(a_this, 0); + fopAcM_OnStatus(i_this, 0); #endif - a_this->attention_info.flags = 0; - i_this->mAction = 0; + i_this->attention_info.flags = 0; + tkj2->mAction = 0; - fopAcM_SetMtx(a_this, i_this->mpModelMorf->getModel()->getBaseTRMtx()); - i_this->mObjAcch.Set(fopAcM_GetPosition_p(a_this), fopAcM_GetOldPosition_p(a_this), a_this, 1, &i_this->mAcchCir, - fopAcM_GetSpeed_p(a_this), NULL, NULL); - i_this->mAcchCir.SetWall(70.0f, 80.0f); - a_this->health = 100; - a_this->field_0x560 = 100; + fopAcM_SetMtx(i_this, tkj2->mpModelMorf->getModel()->getBaseTRMtx()); + tkj2->mObjAcch.Set(fopAcM_GetPosition_p(i_this), fopAcM_GetOldPosition_p(i_this), i_this, 1, &tkj2->mAcchCir, + fopAcM_GetSpeed_p(i_this), NULL, NULL); + tkj2->mAcchCir.SetWall(70.0f, 80.0f); + i_this->field_0x560 = i_this->health = 100; - if (i_this->field_0x5b4 == 1) { - CheckRoof(i_this); + if (tkj2->field_0x5b4 == 1) { + CheckRoof(tkj2); } - if (i_this->field_0x630 != 0) { - i_this->mStts.Init(0xFF, 0, a_this); + if (tkj2->field_0x630 != 0) { + tkj2->mStts.Init(0xFF, 0, i_this); } else { - i_this->mStts.Init(100, 0, a_this); + tkj2->mStts.Init(100, 0, i_this); } static dCcD_SrcSph cc_sph_src = { @@ -1136,14 +1185,14 @@ static cPhs_Step daNpc_Tkj2_Create(fopAc_ac_c* a_this) { } // mSphAttr }; - i_this->field_0x88c.Set(cc_sph_src); - i_this->field_0x88c.SetStts(&i_this->mStts); - a_this->attention_info.distances[fopAc_attn_CARRY_e] = 7; + tkj2->field_0x88c.Set(cc_sph_src); + tkj2->field_0x88c.SetStts(&tkj2->mStts); + i_this->attention_info.distances[fopAc_attn_CARRY_e] = 7; - i_this->mSound.init(&a_this->current.pos, &a_this->eyePos, 3, 1); - i_this->field_0x88c.OnTgNoHitMark(); - i_this->field_0x5fc.set(0.0f, 0.0f, 0.0f); - daNpc_Tkj2_Execute(i_this); + tkj2->mSound.init(&i_this->current.pos, &i_this->eyePos, 3, 1); + tkj2->field_0x88c.OnTgNoHitMark(); + tkj2->field_0x5fc.set(0.0f, 0.0f, 0.0f); + daNpc_Tkj2_Execute(tkj2); } return phase; @@ -1158,18 +1207,22 @@ static actor_method_class l_daNpc_Tkj2_Method = { }; actor_process_profile_definition g_profile_NPC_TKJ2 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_TKJ2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(npc_tkj2_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 696, // mPriority - &l_daNpc_Tkj2_Method, // sub_method - 0x000C4000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_TKJ2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(npc_tkj2_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_TKJ2_e, + /* Actor SubMtd */ &l_daNpc_Tkj2_Method, +#if PLATFORM_SHIELD || VERSION == VERSION_WII_USA_R2 || VERSION == VERSION_WII_JPN + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e, +#else + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, +#endif + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_tks.cpp b/src/d/actor/d_a_npc_tks.cpp index cfab685415..1338ba0368 100644 --- a/src/d/actor/d_a_npc_tks.cpp +++ b/src/d/actor/d_a_npc_tks.cpp @@ -669,7 +669,7 @@ void daNpcTks_c::reset() { setAction(&daNpcTks_c::demo_scannon); cXyz i_pos(current.pos); i_pos.y += 60.0f; - parentActorID = fopAcM_createChild(PROC_NPC_TKC, fopAcM_GetID(this), 3, &i_pos, fopAcM_GetRoomNo(this), + parentActorID = fopAcM_createChild(fpcNm_NPC_TKC_e, fopAcM_GetID(this), 3, &i_pos, fopAcM_GetRoomNo(this), &mCurAngle, NULL, -1, NULL); break; } @@ -680,7 +680,7 @@ void daNpcTks_c::reset() { setAction(&daNpcTks_c::demo_Lv6Gate); cXyz i_pos(current.pos); i_pos.y += 60.0f; - parentActorID = fopAcM_createChild(PROC_NPC_TKC, fopAcM_GetID(this), 3, &i_pos, fopAcM_GetRoomNo(this), + parentActorID = fopAcM_createChild(fpcNm_NPC_TKC_e, fopAcM_GetID(this), 3, &i_pos, fopAcM_GetRoomNo(this), &mCurAngle, NULL, -1, NULL); break; } @@ -693,7 +693,7 @@ void daNpcTks_c::reset() { cXyz i_pos(current.pos); csXyz i_angle(0, fopAcM_searchPlayerAngleY(this), 0); i_pos.y += 60.0f; - parentActorID = fopAcM_createChild(PROC_NPC_TKC, fopAcM_GetID(this), 4, &i_pos, fopAcM_GetRoomNo(this), + parentActorID = fopAcM_createChild(fpcNm_NPC_TKC_e, fopAcM_GetID(this), 4, &i_pos, fopAcM_GetRoomNo(this), &i_angle, NULL, -1, NULL); break; } @@ -731,7 +731,7 @@ void daNpcTks_c::reset() { setAction(&daNpcTks_c::waitLv6); cXyz i_pos(current.pos); i_pos.y += 60.0f; - parentActorID = fopAcM_createChild(PROC_NPC_TKC, fopAcM_GetID(this), 4, &i_pos, fopAcM_GetRoomNo(this), + parentActorID = fopAcM_createChild(fpcNm_NPC_TKC_e, fopAcM_GetID(this), 4, &i_pos, fopAcM_GetRoomNo(this), &mCurAngle, NULL, -1, NULL); break; } @@ -2334,7 +2334,7 @@ void daNpcTks_c::demo_Lv7Start() { current.pos.set(120.0f, 3000.0f, 5500.0f); old.pos = current.pos; setAngle(fopAcM_searchPlayerAngleY(this)); - parentActorID = fopAcM_createChild(PROC_NPC_TKC, fopAcM_GetID(this), 3, ¤t.pos, fopAcM_GetRoomNo(this), + parentActorID = fopAcM_createChild(fpcNm_NPC_TKC_e, fopAcM_GetID(this), 3, ¤t.pos, fopAcM_GetRoomNo(this), &mCurAngle, NULL, -1, NULL); dComIfGp_event_setTalkPartner(this); field_0x138b = false; @@ -2528,7 +2528,7 @@ void daNpcTks_c::demo_Lv7Start() { int iVar1[2] = {0x2520, -1}; if (talkProc(iVar1, TRUE, NULL)) { if (!mFlow.checkEndFlow()) { - fopAc_ac_c* actor_p = fopAcM_SearchByName(PROC_Tag_Lv7Gate); + fopAc_ac_c* actor_p = fopAcM_SearchByName(fpcNm_Tag_Lv7Gate_e); if (actor_p != NULL) { setLookMode(LOOK_ACTOR, actor_p); } @@ -3046,18 +3046,18 @@ static actor_method_class daNpcTks_MethodTable = { }; actor_process_profile_definition g_profile_NPC_TKS = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_TKS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcTks_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 374, // mPriority - &daNpcTks_MethodTable, // sub_method - 0x08044108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_TKS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcTks_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_TKS_e, + /* Actor SubMtd */ &daNpcTks_MethodTable, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_toby.cpp b/src/d/actor/d_a_npc_toby.cpp index c15d5bc02e..543d4b9abf 100644 --- a/src/d/actor/d_a_npc_toby.cpp +++ b/src/d/actor/d_a_npc_toby.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_toby.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -441,7 +441,7 @@ void* daNpc_Toby_c::srchToby(void* i_actor, void* i_data) { if (mFindCount < 50) { fopAc_ac_c* actor_p = (fopAc_ac_c*)i_actor; if (actor_p != NULL && actor_p != o_actor) { - if (fopAcM_IsExecuting(fopAcM_GetID(actor_p)) && fopAcM_GetName(actor_p) == PROC_NPC_TOBY) { + if (fopAcM_IsExecuting(fopAcM_GetID(actor_p)) && fopAcM_GetName(actor_p) == fpcNm_NPC_TOBY_e) { mFindActorPtrs[mFindCount] = actor_p; mFindCount++; } @@ -615,7 +615,7 @@ int daNpc_Toby_c::checkChangeEvt() { if (dComIfGp_event_chkTalkXY()) { if (dComIfGp_evmng_ChkPresentEnd()) { mPreItemNo = dComIfGp_event_getPreItemNo(); - if (mPreItemNo == fpcNm_ITEM_RAFRELS_MEMO) { + if (mPreItemNo == dItemNo_RAFRELS_MEMO_e) { return FALSE; } @@ -702,16 +702,16 @@ void daNpc_Toby_c::srchActors() { switch (mType) { case 0: if (mActorMngr[0].getActorP() == NULL) { - mActorMngr[0].entry(getNearestActorP(PROC_Obj_TobyHouse)); + mActorMngr[0].entry(getNearestActorP(fpcNm_Obj_TobyHouse_e)); } if (mActorMngr[1].getActorP() == NULL) { // Fyer's music box that he plays when Link gets shot from the cannon. - mActorMngr[1].entry(getNearestActorP(PROC_OBJ_AUTOMATA)); + mActorMngr[1].entry(getNearestActorP(fpcNm_OBJ_AUTOMATA_e)); } if (mActorMngr[2].getActorP() == NULL) { - mActorMngr[2].entry(getNearestActorP(PROC_Obj_SCannon)); + mActorMngr[2].entry(getNearestActorP(fpcNm_Obj_SCannon_e)); } break; @@ -719,7 +719,7 @@ void daNpc_Toby_c::srchActors() { case 1: if (mActorMngr[3].getActorP() == NULL) { // Shadow Bulbin (drained Lake Hylia Kargorok fight): - mActorMngr[3].entry(getNearestActorP(PROC_E_RDY)); + mActorMngr[3].entry(getNearestActorP(fpcNm_E_RDY_e)); } break; @@ -729,7 +729,7 @@ void daNpc_Toby_c::srchActors() { case 3: if (mActorMngr[2].getActorP() == NULL) { - mActorMngr[2].entry(getNearestActorP(PROC_Obj_SCannon)); + mActorMngr[2].entry(getNearestActorP(fpcNm_Obj_SCannon_e)); } break; @@ -760,7 +760,7 @@ int daNpc_Toby_c::evtCutProc() { } return TRUE; - } + } return FALSE; } @@ -797,9 +797,9 @@ void daNpc_Toby_c::action() { } void daNpc_Toby_c::beforeMove() { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw) { @@ -1072,7 +1072,7 @@ int daNpc_Toby_c::cutTobyHouseFire(int arg0) { retval = 1; break; - case 3: + case 3: if (mMotionSeqMngr.getNo() != 19) { mpMorf[0]->setPlaySpeed(mPlaySpeed); mBckAnm.setPlaySpeed(mPlaySpeed); @@ -1084,7 +1084,7 @@ int daNpc_Toby_c::cutTobyHouseFire(int arg0) { action(); break; - case 4: + case 4: if (cLib_calcTimer(&mEventTimer) == 0) { retval = 1; } @@ -1381,15 +1381,15 @@ int daNpc_Toby_c::cutRepairSCannon(int arg0) { mHide = 0; mMotionSeqMngr.setNo(0x15, 0.0f, 0, 0); break; - case 1: + case 1: mHide = 0; mMotionSeqMngr.setNo(0x16, 0.0f, 0, 0); break; - case 2: + case 2: mHide = 0; mMotionSeqMngr.setNo(0x17, 0.0f, 0, 0); break; - default: + default: mHide = 1; break; } @@ -2098,7 +2098,7 @@ int daNpc_Toby_c::talk(void*) { } #endif - if (mPreItemNo == fpcNm_ITEM_RAFRELS_MEMO) { + if (mPreItemNo == dItemNo_RAFRELS_MEMO_e) { initTalk(2, NULL); } else { initTalk(mFlowNodeNo, NULL); @@ -2112,7 +2112,7 @@ int daNpc_Toby_c::talk(void*) { if (mStagger.checkStagger() == 0) { if (mTwilight || mPlayerAngle == mCurAngle.y) { int spC[3] = {-1, -1, -1}; - if (mPreItemNo == fpcNm_ITEM_RAFRELS_MEMO) { + if (mPreItemNo == dItemNo_RAFRELS_MEMO_e) { spC[0] = 0x1420; spC[1] = 0x142D; } @@ -2206,20 +2206,20 @@ static actor_method_class daNpc_Toby_MethodTable = { }; actor_process_profile_definition g_profile_NPC_TOBY = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_TOBY, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Toby_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 377, // mPriority - &daNpc_Toby_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_TOBY_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Toby_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_TOBY_e, + /* Actor SubMtd */ &daNpc_Toby_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_npc_tr.cpp b/src/d/actor/d_a_npc_tr.cpp index 2aac271a40..3331b7cd2b 100644 --- a/src/d/actor/d_a_npc_tr.cpp +++ b/src/d/actor/d_a_npc_tr.cpp @@ -254,18 +254,18 @@ static actor_method_class l_daNPC_TR_Method = { }; actor_process_profile_definition g_profile_NPC_TR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_TR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(npc_tr_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 723, // mPriority - &l_daNPC_TR_Method, // sub_method - 0x40100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_TR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(npc_tr_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_TR_e, + /* Actor SubMtd */ &l_daNPC_TR_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_uri.cpp b/src/d/actor/d_a_npc_uri.cpp index 0f006d9f33..bb0a561d26 100644 --- a/src/d/actor/d_a_npc_uri.cpp +++ b/src/d/actor/d_a_npc_uri.cpp @@ -712,9 +712,9 @@ void daNpc_Uri_c::action() { } void daNpc_Uri_c::beforeMove() { - fopAcM_OffStatus(this, 0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw != 0) { @@ -952,7 +952,7 @@ BOOL daNpc_Uri_c::chkPlayerCarryBasket() { fopAc_ac_c* actor = NULL; daPy_py_c* player = daPy_getPlayerActorClass(); if (fopAcM_SearchByID(player->getGrabActorID(), &actor) && actor != NULL && - fopAcM_GetName(actor) == PROC_OBJ_KAGO) + fopAcM_GetName(actor) == fpcNm_OBJ_KAGO_e) { return TRUE; } @@ -1920,20 +1920,20 @@ static actor_method_class daNpc_Uri_MethodTable = { }; actor_process_profile_definition g_profile_NPC_URI = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_URI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Uri_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 378, // mPriority - &daNpc_Uri_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_URI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Uri_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_URI_e, + /* Actor SubMtd */ &daNpc_Uri_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_npc_worm.cpp b/src/d/actor/d_a_npc_worm.cpp index 50789f2e80..4c8e31d56c 100644 --- a/src/d/actor/d_a_npc_worm.cpp +++ b/src/d/actor/d_a_npc_worm.cpp @@ -401,18 +401,18 @@ static actor_method_class l_daNPC_WORM_Method = { }; actor_process_profile_definition g_profile_NPC_WORM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_WORM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(npc_worm_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 429, // mPriority - &l_daNPC_WORM_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_WORM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(npc_worm_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_WORM_e, + /* Actor SubMtd */ &l_daNPC_WORM_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_wrestler.cpp b/src/d/actor/d_a_npc_wrestler.cpp index 8b109c8768..40eae8e827 100644 --- a/src/d/actor/d_a_npc_wrestler.cpp +++ b/src/d/actor/d_a_npc_wrestler.cpp @@ -1299,7 +1299,7 @@ int daNpcWrestler_c::setAction(actionFunc action) { } static void* s_sub1(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Tag_Arena + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Tag_Arena_e && ((daNpcWrestler_c*)i_data)->checkArenaSub((daNpcWrestler_c*)i_actor)) { return i_actor; } @@ -1333,7 +1333,7 @@ bool daNpcWrestler_c::checkArenaSub(fopAc_ac_c* actor) { static void* s_sub2(void* i_actor, void* i_data) { (void) i_data; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_GRA) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_GRA_e) { daNpc_grA_c* goron = (daNpc_grA_c*)i_actor; if (goron->getType() == 3) { goron->setTagJump(); @@ -5221,18 +5221,18 @@ static actor_method_class daNpcWrestler_MethodTable = { }; actor_process_profile_definition g_profile_NPC_WRESTLER = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_WRESTLER, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcWrestler_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 329, // mPriority - &daNpcWrestler_MethodTable, // sub_method - 0x00044007, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_WRESTLER_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcWrestler_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_WRESTLER_e, + /* Actor SubMtd */ &daNpcWrestler_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_yamid.cpp b/src/d/actor/d_a_npc_yamid.cpp index e92ac9b553..42668a8342 100644 --- a/src/d/actor/d_a_npc_yamid.cpp +++ b/src/d/actor/d_a_npc_yamid.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_yamid.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -195,7 +195,7 @@ cPhs_Step daNpc_yamiD_c::create() { daNpcT_ct(this, daNpc_yamiD_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData, 4, l_motionSequenceData, 4, l_evtList, l_resNameList); - + mType = getType(); mFlowNodeNo = getFlowNodeNo(); mTwilight = false; @@ -220,7 +220,7 @@ cPhs_Step daNpc_yamiD_c::create() { fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); fopAcM_setCullSizeFar(this, 3.0f); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); mSound.init(¤t.pos, &eyePos, 3, 1); #if DEBUG @@ -232,7 +232,7 @@ cPhs_Step daNpc_yamiD_c::create() { mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this)); mCcStts.Init(mpHIO->m.common.weight, 0, this); - + field_0xe44.Set(mCcDCyl); field_0xe44.SetStts(&mCcStts); field_0xe44.SetTgHitCallback(tgHitCallBack); @@ -329,7 +329,7 @@ int daNpc_yamiD_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) { if (param_2 == 0) { J3DModel* model = j3dSys.getModel(); daNpc_yamiD_c* i_this = (daNpc_yamiD_c*)model->getUserArea(); - + if (i_this != NULL) { i_this->ctrlJoint(i_joint, model); } @@ -394,7 +394,7 @@ void daNpc_yamiD_c::reset() { if (mpMatAnm[0] != NULL) { mpMatAnm[0]->initialize(); } - + if (getPathID() != 0xFF) { mPath.initialize(); mPath.setPathInfo(getPathID(), fopAcM_GetRoomNo(this), 0); @@ -533,7 +533,7 @@ void daNpc_yamiD_c::setAttnPos() { mDoMtx_stack_c::multVec(&work, &eyePos); mJntAnm.setEyeAngleX(eyePos, 1.0f, 0); mJntAnm.setEyeAngleY(eyePos, mCurAngle.y, TRUE, 1.0f, 0); - + attention_info.position = current.pos; attention_info.position.y += mpHIO->m.common.attention_offset; } @@ -558,7 +558,7 @@ void daNpc_yamiD_c::setCollision() { f32 cyl_h = mCylH; f32 wall_r = mWallR; work = current.pos; - + field_0xe44.SetCoSPrm(0x79); field_0xe44.SetTgType(tgType); field_0xe44.SetTgSPrm(tgSPrm); @@ -629,7 +629,7 @@ int daNpc_yamiD_c::wait(void* param_1) { if (chkActorInSight(mPlayerActorMngr.getActorP(), mAttnFovY, mCurAngle.y)) { mJntAnm.lookPlayer(0); - + if (field_0xf82 == 0 && !is_vanish()) { cXyz pos(current.pos); Z2GetAudioMgr()->seStart(Z2SE_YAMI_MURMUR_T, &pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); @@ -796,18 +796,18 @@ static actor_method_class daNpc_yamiD_MethodTable = { }; actor_process_profile_definition g_profile_NPC_YAMID = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_YAMID, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_yamiD_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 315, // mPriority - &daNpc_yamiD_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_YAMID_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_yamiD_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_YAMID_e, + /* Actor SubMtd */ &daNpc_yamiD_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_yamis.cpp b/src/d/actor/d_a_npc_yamis.cpp index 7689bf40a4..51ef99e7f4 100644 --- a/src/d/actor/d_a_npc_yamis.cpp +++ b/src/d/actor/d_a_npc_yamis.cpp @@ -162,7 +162,7 @@ cPhs_Step daNpc_yamiS_c::create() { fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); fopAcM_setCullSizeFar(this, 3.0f); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); mSound.init(¤t.pos, &eyePos, 3, 1); @@ -727,18 +727,18 @@ static actor_method_class daNpc_yamiS_MethodTable = { }; actor_process_profile_definition g_profile_NPC_YAMIS = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_YAMIS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_yamiS_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 317, // mPriority - &daNpc_yamiS_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_YAMIS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_yamiS_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_YAMIS_e, + /* Actor SubMtd */ &daNpc_yamiS_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_yamit.cpp b/src/d/actor/d_a_npc_yamit.cpp index 47acc83d9f..ffedc646f4 100644 --- a/src/d/actor/d_a_npc_yamit.cpp +++ b/src/d/actor/d_a_npc_yamit.cpp @@ -165,7 +165,7 @@ cPhs_Step daNpc_yamiT_c::create() { fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); fopAcM_setCullSizeFar(this, 3.0f); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); mSound.init(¤t.pos, &eyePos, 3, 1); @@ -250,7 +250,7 @@ void* daNpc_yamiT_c::_search_Tag(void* i_actor, void* i_data) { return NULL; } - if (fopAcM_GetName(i_actor) == PROC_TAG_YAMI && + if (fopAcM_GetName(i_actor) == fpcNm_TAG_YAMI_e && ((daNpc_yamiT_c*)i_data)->_chk_TagPrm((fopAc_ac_c*)i_actor)) { return i_actor; @@ -756,18 +756,18 @@ static actor_method_class daNpc_yamiT_MethodTable = { }; actor_process_profile_definition g_profile_NPC_YAMIT = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_YAMIT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_yamiT_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 316, // mPriority - &daNpc_yamiT_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_YAMIT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_yamiT_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_YAMIT_e, + /* Actor SubMtd */ &daNpc_yamiT_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_yelia.cpp b/src/d/actor/d_a_npc_yelia.cpp index 84f97a65da..67b1cbcffc 100644 --- a/src/d/actor/d_a_npc_yelia.cpp +++ b/src/d/actor/d_a_npc_yelia.cpp @@ -642,7 +642,7 @@ BOOL daNpc_Yelia_c::checkChangeEvt() { if (dComIfGp_evmng_ChkPresentEnd()) { mPreItemNo = dComIfGp_event_getPreItemNo(); if (mType == TYPE_WOOD_STATUE && daNpcT_chkEvtBit(0x11f) - && mPreItemNo == fpcNm_ITEM_IRIAS_PENDANT) + && mPreItemNo == dItemNo_IRIAS_PENDANT_e) { if (mPendantTimer >= 70) { dStage_changeScene(10, 0.0f, 0, fopAcM_GetRoomNo(this), 0, @@ -663,7 +663,7 @@ BOOL daNpc_Yelia_c::checkChangeEvt() { mPendantTimer++; } else if (mType == TYPE_KAKARIKO && !daNpcT_chkEvtBit(0x11f) - && mPreItemNo == fpcNm_ITEM_WOOD_STATUE) + && mPreItemNo == dItemNo_WOOD_STATUE_e) { mEvtNo = EVENT_TAKE_WOODSTATUE; evtChange(); @@ -749,23 +749,23 @@ void daNpc_Yelia_c::srchActors() { switch (mType) { case TYPE_KAKARIKO: if (mActorMngr[2].getActorP() == NULL) { - mActorMngr[2].entry(getNearestActorP(PROC_NPC_GRD)); + mActorMngr[2].entry(getNearestActorP(fpcNm_NPC_GRD_e)); } if (mActorMngr[3].getActorP() == NULL) { - mActorMngr[3].entry(getNearestActorP(PROC_NPC_GRZ)); + mActorMngr[3].entry(getNearestActorP(fpcNm_NPC_GRZ_e)); } break; case TYPE_TWILIGHT: if (mActorMngr[0].getActorP() == NULL) { - mActorMngr[0].entry(getNearestActorP(PROC_NPC_THE)); + mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_THE_e)); } if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(getNearestActorP(PROC_NPC_ZRC)); + mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_ZRC_e)); } break; case TYPE_AFTER_ESCORT: if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(getNearestActorP(PROC_NPC_KOLINB)); + mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_KOLINB_e)); } break; case TYPE_HORSE: @@ -817,9 +817,9 @@ void daNpc_Yelia_c::action() { } void daNpc_Yelia_c::beforeMove() { - fopAcM_OffStatus(this, 0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw) { attention_info.flags = 0; @@ -1193,7 +1193,7 @@ BOOL daNpc_Yelia_c::cutTakeWoodStatue(int i_staffId) { if (prm == 13) { if (mItemId == fpcM_ERROR_PROCESS_ID_e) { mItemId = fopAcM_createItemForPresentDemo(¤t.pos, - fpcNm_ITEM_WOOD_STATUE, 9, -1, fopAcM_GetRoomNo(this), &mCurAngle, &scale); + dItemNo_WOOD_STATUE_e, 9, -1, fopAcM_GetRoomNo(this), &mCurAngle, &scale); } if (fopAcM_SearchByID(mItemId, (fopAc_ac_c**)&item) && item != NULL && fopAc_IsActor(item)) { @@ -1589,18 +1589,18 @@ static actor_method_class daNpc_Yelia_MethodTable = { }; actor_process_profile_definition g_profile_NPC_YELIA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_YELIA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Yelia_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 379, // mPriority - &daNpc_Yelia_MethodTable, // sub_method - 0x00040108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_YELIA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Yelia_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_YELIA_e, + /* Actor SubMtd */ &daNpc_Yelia_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_ykm.cpp b/src/d/actor/d_a_npc_ykm.cpp index e3f595deec..1cdba0d9a5 100644 --- a/src/d/actor/d_a_npc_ykm.cpp +++ b/src/d/actor/d_a_npc_ykm.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_ykm.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -803,7 +803,7 @@ void* daNpc_ykM_c::srchGadget(void* i_actor, void* i_data) { if (mFindCount < 50) { fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; if (actor != NULL && actor != data) { - if (fopAcM_IsExecuting(fopAcM_GetID(actor)) && fopAcM_GetName(actor) == PROC_OBJ_GADGET) { + if (fopAcM_IsExecuting(fopAcM_GetID(actor)) && fopAcM_GetName(actor) == fpcNm_OBJ_GADGET_e) { mFindActorPtrs[mFindCount] = actor; mFindCount++; } @@ -852,7 +852,7 @@ void* daNpc_ykM_c::srchYkm(void* i_actor, void* i_data) { if (mFindCount < 50) { fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; if (actor != NULL && actor != data) { - if (fopAcM_IsExecuting(fopAcM_GetID(actor)) && fopAcM_GetName(actor) == PROC_NPC_YKM) { + if (fopAcM_IsExecuting(fopAcM_GetID(actor)) && fopAcM_GetName(actor) == fpcNm_NPC_YKM_e) { mFindActorPtrs[mFindCount] = actor; mFindCount++; } @@ -885,7 +885,7 @@ void* daNpc_ykM_c::srchYkw(void* i_actor, void* i_data) { if (mFindCount < 50) { fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; if (actor != NULL && actor != data) { - if (fopAcM_IsExecuting(fopAcM_GetID(actor)) && fopAcM_GetName(actor) == PROC_NPC_YKW) { + if (fopAcM_IsExecuting(fopAcM_GetID(actor)) && fopAcM_GetName(actor) == fpcNm_NPC_YKW_e) { mFindActorPtrs[mFindCount] = actor; mFindCount++; } @@ -1008,7 +1008,7 @@ void daNpc_ykM_c::reset() { case TYPE_3: mHide = true; - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); break; case TYPE_4: @@ -1017,13 +1017,13 @@ void daNpc_ykM_c::reset() { case TYPE_5: mHide = true; - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); eventInfo.setIdx(1); break; case TYPE_6: mHide = true; - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); eventInfo.setIdx(2); break; } @@ -1095,15 +1095,15 @@ void daNpc_ykM_c::setParam() { mAcchCir.SetWallR(mWallR); mAcchCir.SetWallH(mpHIO->m.common.knee_length); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OnStatus(this, fopAcStts_CULL_e); mRealShadowSize = mpHIO->m.common.real_shadow_size; if (field_0x157b != 0) { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); } if (mType == TYPE_3) { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); mRealShadowSize = 1800.0f; } @@ -1134,14 +1134,14 @@ BOOL daNpc_ykM_c::checkChangeEvt() { case TYPE_COOK: if (!daNpcT_chkEvtBit(4) /* dSv_event_flag_c::TEST_004 - Snowpeak Ruins - Handed over secret ingredient */ - && checkItemGet(fpcNm_ITEM_TASTE, 1)) { + && checkItemGet(dItemNo_TASTE_e, 1)) { mEvtNo = EVENT_GET_TASTE; evtChange(); return TRUE; } - if (!daNpcT_chkEvtBit(3) /* dSv_event_flag_c::TEST_003 - Snowpeak Ruins - Handed over tomato puree */ - && checkItemGet(fpcNm_ITEM_TOMATO_PUREE, 1)) { + if (!daNpcT_chkEvtBit(3) /* dSv_event_flag_c::TEST_003 - Snowpeak Ruins - Handed over tomato puree */ + && checkItemGet(dItemNo_TOMATO_PUREE_e, 1)) { mEvtNo = EVENT_GET_TOMATOPUREE; evtChange(); return TRUE; @@ -1219,7 +1219,7 @@ void daNpc_ykM_c::srchActors() { case TYPE_3: if (mActorMngr[5].getActorP() == NULL) { - mActorMngr[5].entry(getNearestActorP(PROC_NPC_YKW)); + mActorMngr[5].entry(getNearestActorP(fpcNm_NPC_YKW_e)); } break; @@ -1320,10 +1320,10 @@ void daNpc_ykM_c::action() { } void daNpc_ykM_c::beforeMove() { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw) { @@ -1802,7 +1802,7 @@ BOOL daNpc_ykM_c::chkTouchPlayer() { if (field_0xf94[i].ChkCoHit()) { actor = field_0xf94[i].GetCoHitAc(); - if (actor != NULL && fopAcM_GetName(actor) == PROC_ALINK) { + if (actor != NULL && fopAcM_GetName(actor) == fpcNm_ALINK_e) { return TRUE; } } @@ -1811,7 +1811,7 @@ BOOL daNpc_ykM_c::chkTouchPlayer() { if (field_0xe58.ChkCoHit()) { actor = field_0xe58.GetCoHitAc(); - if (actor != NULL && fopAcM_GetName(actor) == PROC_ALINK) { + if (actor != NULL && fopAcM_GetName(actor) == fpcNm_ALINK_e) { return TRUE; } } @@ -1990,7 +1990,7 @@ int daNpc_ykM_c::cutMeetingAgain(int i_cutIndex) { int prm = -1; int timer = 0; int unusedInt1 = 0; - + piVar1 = dComIfGp_evmng_getMyIntegerP(i_cutIndex, "prm"); if (piVar1 != NULL) { prm = *piVar1; @@ -2533,7 +2533,7 @@ int daNpc_ykM_c::cutLv5DungeonClear(int i_cutIndex) { mMotionSeqMngr.setNo(MOTION_WAIT_X, 0.0f, FALSE, 0); mJntAnm.lookNone(1); mHide = false; - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); break; case 1: @@ -2667,7 +2667,7 @@ int daNpc_ykM_c::cutLv5DungeonClear(int i_cutIndex) { } } } - + if (rv == 0 && field_0xe58.ChkCoHit()) { if (daPy_getPlayerActorClass() == field_0xe58.GetCoHitAc()) { rv = 1; @@ -3086,7 +3086,7 @@ int daNpc_ykM_c::cutHug(int i_cutIndex) { void daNpc_ykM_c::setDialogueMotion() { int uVar1 = field_0x154c; uVar1 >>= 1; - + if (0.5f < cM_rnd()) { int dummy; // force r31 to be used for stack pointer instead of r1 if (cM_rnd() - 0.5f < 0.0f) { @@ -3349,7 +3349,7 @@ BOOL daNpc_ykM_c::cook(void* param_1) { } // fallthrough case 2: { - if (!daPy_py_c::checkNowWolf() && !checkItemGet(fpcNm_ITEM_TOMATO_PUREE, 1) && !checkItemGet(fpcNm_ITEM_TASTE, 1) && + if (!daPy_py_c::checkNowWolf() && !checkItemGet(dItemNo_TOMATO_PUREE_e, 1) && !checkItemGet(dItemNo_TASTE_e, 1) && !daNpcT_chkEvtBit(10) /* dSv_event_flag_c::F_0006 - Snowpeak Ruins - First conversation with Yeto in kitchen */) { actor_p = mActorMngr[6].getActorP(); if (actor_p != NULL && @@ -3629,7 +3629,7 @@ BOOL daNpc_ykM_c::talk(void* param_1) { mFaceMotionSeqMngr.setNo(FACE_NONE, -1.0f, FALSE, 0); mMotionSeqMngr.setNo(MOTION_WAIT_A, -1.0f, FALSE, 0); - if (daNpcT_chkEvtBit(10) /* dSv_event_flag_c::F_0006 - Snowpeak Ruins - First conversation with Yeto in kitchen */ + if (daNpcT_chkEvtBit(10) /* dSv_event_flag_c::F_0006 - Snowpeak Ruins - First conversation with Yeto in kitchen */ && !chkContinueAttnPlayer()) { field_0x157f = 1; } @@ -3736,18 +3736,18 @@ static actor_method_class daNpc_ykM_MethodTable = { }; actor_process_profile_definition g_profile_NPC_YKM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_YKM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_ykM_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 380, // mPriority - &daNpc_ykM_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_YKM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_ykM_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_YKM_e, + /* Actor SubMtd */ &daNpc_ykM_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_ykw.cpp b/src/d/actor/d_a_npc_ykw.cpp index deb61d7dba..e2c97df58a 100644 --- a/src/d/actor/d_a_npc_ykw.cpp +++ b/src/d/actor/d_a_npc_ykw.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_ykw.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -479,7 +479,7 @@ void* daNpc_ykW_c::srchItemHeart(void* param_0, void* param_1) { fopAc_ac_c* item = (fopAc_ac_c*)param_0; if (item != NULL && item != npc && fopAcM_IsActor(item)) { - if (fopAcM_IsExecuting(fopAcM_GetID(item)) && fopAcM_GetName(item) == PROC_ITEM && + if (fopAcM_IsExecuting(fopAcM_GetID(item)) && fopAcM_GetName(item) == fpcNm_ITEM_e && ((daItemBase_c*)item)->getItemNo() == 0) { npc->mFindActorPtrs[mFindCount] = item; @@ -494,7 +494,7 @@ void* daNpc_ykW_c::srchYkw(void* param_0, void* param_1) { fopAc_ac_c* actor1 = (fopAc_ac_c*)param_0; fopAc_ac_c* actor2 = (fopAc_ac_c*)param_1; if (mFindCount < 50 && param_0 != NULL && actor1 != actor2) { - if (fopAcM_IsExecuting(fopAcM_GetID(actor1)) && fopAcM_GetName(actor1) == PROC_NPC_YKW) { + if (fopAcM_IsExecuting(fopAcM_GetID(actor1)) && fopAcM_GetName(actor1) == fpcNm_NPC_YKW_e) { mFindActorPtrs[mFindCount] = actor1; mFindCount++; } @@ -523,7 +523,7 @@ void* daNpc_ykW_c::srchYkm(void* param_0, void* param_1) { fopAc_ac_c* actor1 = (fopAc_ac_c*)param_0; fopAc_ac_c* actor2 = (fopAc_ac_c*)param_1; if (mFindCount < 50 && param_0 != NULL && actor1 != actor2) { - if (fopAcM_IsExecuting(fopAcM_GetID(actor1)) && fopAcM_GetName(actor1) == PROC_NPC_YKM) { + if (fopAcM_IsExecuting(fopAcM_GetID(actor1)) && fopAcM_GetName(actor1) == fpcNm_NPC_YKM_e) { mFindActorPtrs[mFindCount] = actor1; mFindCount++; } @@ -653,14 +653,14 @@ void daNpc_ykW_c::reset() { } mHide = true; - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); break; case 5: case 6: eventInfo.setIdx(1); mHide = true; - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); break; default: @@ -737,7 +737,7 @@ void daNpc_ykW_c::setParam() { mRealShadowSize = mpHIO->m.common.real_shadow_size; if (field_0xf80 == 4) { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); mRealShadowSize = 1500.0f; } @@ -878,9 +878,9 @@ void daNpc_ykW_c::action() { } void daNpc_ykW_c::beforeMove() { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw != 0) { attention_info.flags = 0; @@ -1586,7 +1586,7 @@ BOOL daNpc_ykW_c::cutLv5DungeonClear(int param_0) { mHide = false; - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); newPlayerPos.setall(0.0f); @@ -1784,7 +1784,7 @@ BOOL daNpc_ykW_c::cutLv5DungeonClear(int param_0) { mFindCount = 0; fpcM_Search(srchItemHeart, this); for (unkInt1 = 0; unkInt1 < mFindCount; unkInt1++) { - fopAcM_OffStatus(mFindActorPtrs[unkInt1], fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(mFindActorPtrs[unkInt1], fopAcStts_UNK_0x4000_e); } } } @@ -1825,7 +1825,7 @@ BOOL daNpc_ykW_c::cutLv5DungeonClear(int param_0) { &unkXyz1, &unkFloat2, &unkFloat3, -1, 0, NULL); if (unkActor1 != NULL) { mDoAud_seStart(Z2SE_OBJ_YO_HEART_S, &itemPos, 0, 0); - fopAcM_OnStatus(unkActor1, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(unkActor1, fopAcStts_UNK_0x4000_e); } mEventTimer = (int)(unkFloat1 * 1.8000001f) + 6; field_0x1038++; @@ -2296,7 +2296,7 @@ int daNpc_ykW_c::cutHug(int param_0) { &heartScale, &heartSpeed, &heartSpeedY, -1, 0, 0); if (itemActor != NULL) { mDoAud_seStart(Z2SE_OBJ_YO_HEART_S, &heartPos, 0, 0); - fopAcM_OnStatus(itemActor, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(itemActor, fopAcStts_UNK_0x4000_e); } mEventTimer = timer; @@ -2401,7 +2401,7 @@ int daNpc_ykW_c::wait(void* param_0) { case 2: if (field_0x106f != 0) { mHide = true; - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); if (putUtuwaHeart(0, 0.0f, 0.0f, 0x5000, 0)) { fopAcM_delete(this); } @@ -3028,18 +3028,18 @@ static actor_method_class daNpc_ykW_MethodTable = { }; actor_process_profile_definition g_profile_NPC_YKW = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_YKW, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_ykW_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 381, // mPriority - &daNpc_ykW_MethodTable, // sub_method - 0x00040108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType - }; + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_YKW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_ykW_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_YKW_e, + /* Actor SubMtd */ &daNpc_ykW_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/src/d/actor/d_a_npc_zanb.cpp b/src/d/actor/d_a_npc_zanb.cpp index 77aa9deab3..9e4213695e 100644 --- a/src/d/actor/d_a_npc_zanb.cpp +++ b/src/d/actor/d_a_npc_zanb.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_zanb.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -170,7 +170,7 @@ cPhs_Step daNpc_zanB_c::create() { J3DModelData* mdlData_p = mpMorf[0]->getModel()->getModelData(); fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -200.0f, -100.0f, -200.0f, 200.0f, 300.0f, 200.0f); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); mSound.init(¤t.pos, &eyePos, 3, 1); #if DEBUG @@ -192,7 +192,7 @@ cPhs_Step daNpc_zanB_c::create() { mAcch.SetGrndNone(); mAcch.SetWallNone(); } - + mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); @@ -706,18 +706,18 @@ static actor_method_class daNpc_zanB_MethodTable = { }; actor_process_profile_definition g_profile_NPC_ZANB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_ZANB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_zanB_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 382, // mPriority - &daNpc_zanB_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_ZANB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_zanB_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_ZANB_e, + /* Actor SubMtd */ &daNpc_zanB_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_zant.cpp b/src/d/actor/d_a_npc_zant.cpp index 5ffc222843..9dd8839367 100644 --- a/src/d/actor/d_a_npc_zant.cpp +++ b/src/d/actor/d_a_npc_zant.cpp @@ -114,7 +114,7 @@ int daNpc_Zant_c::create() { } else { fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); mSound.init(¤t.pos, &eyePos, 3, 1); @@ -560,18 +560,18 @@ static actor_method_class daNpc_Zant_MethodTable = { }; actor_process_profile_definition g_profile_NPC_ZANT = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_ZANT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Zant_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 383, // mPriority - &daNpc_Zant_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_ZANT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Zant_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_ZANT_e, + /* Actor SubMtd */ &daNpc_Zant_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_zelR.cpp b/src/d/actor/d_a_npc_zelR.cpp index 9bc2766843..9e8bc00ee9 100644 --- a/src/d/actor/d_a_npc_zelR.cpp +++ b/src/d/actor/d_a_npc_zelR.cpp @@ -163,7 +163,7 @@ int daNpc_ZelR_c::create() { J3DModelData* modelData = mpMorf[0]->getModel()->getModelData(); fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); mSound.init(¤t.pos, &eyePos, 3, 1); @@ -632,18 +632,18 @@ static actor_method_class daNpc_ZelR_MethodTable = { }; actor_process_profile_definition g_profile_NPC_ZELR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_ZELR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_ZelR_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 385, // mPriority - &daNpc_ZelR_MethodTable, // sub_method - 0x00044108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_ZELR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_ZelR_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_ZELR_e, + /* Actor SubMtd */ &daNpc_ZelR_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_zelRo.cpp b/src/d/actor/d_a_npc_zelRo.cpp index e03662812e..2732eea27b 100644 --- a/src/d/actor/d_a_npc_zelRo.cpp +++ b/src/d/actor/d_a_npc_zelRo.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_zelRo.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -178,7 +178,7 @@ cPhs_Step daNpc_ZelRo_c::create() { OS_REPORT("\t(%s:%d) flowNo:%d, PathNo:%02x<%08x> ", fopAcM_getProcNameString(this), mType, mFlowNodeNo, (getPath() >> 32) & 0xFF, fopAcM_GetParam(this)); - + if (isDelete()) { OS_REPORT("===>isDelete:TRUE\n"); return cPhs_ERROR_e; @@ -189,7 +189,7 @@ cPhs_Step daNpc_ZelRo_c::create() { fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); mSound.init(¤t.pos, &eyePos, 3, 1); @@ -269,7 +269,7 @@ int daNpc_ZelRo_c::Execute() { int daNpc_ZelRo_c::Draw() { J3DModelData* mdlData_p = mpMorf[0]->getModel()->getModelData(); - + if (mpMatAnm[0] != NULL) { mdlData_p->getMaterialNodePointer(getEyeballLMaterialNo())->setMaterialAnm(mpMatAnm[0]); } @@ -498,7 +498,7 @@ void daNpc_ZelRo_c::beforeMove() { void daNpc_ZelRo_c::setAttnPos() { cXyz sp48(10.0f, -30.0f, 0.0f); - + mStagger.calc(FALSE); mJntAnm.setParam(this, mpMorf[0]->getModel(), &sp48, getBackboneJointNo(), getNeckJointNo(), getHeadJointNo(), mpHIO->m.common.body_angleX_min, mpHIO->m.common.body_angleX_max, @@ -633,7 +633,7 @@ int daNpc_ZelRo_c::talk(void* param_1) { bVar1 = true; } } - + if (bVar1 && talkProc(NULL, FALSE, NULL, FALSE)) { mPlayerActorMngr.entry(daPy_getPlayerActorClass()); dComIfGp_event_reset(); @@ -682,18 +682,18 @@ static actor_method_class daNpc_ZelRo_MethodTable = { }; actor_process_profile_definition g_profile_NPC_ZELRO = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_ZELRO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_ZelRo_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 386, // mPriority - &daNpc_ZelRo_MethodTable, // sub_method - 0x00044108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_ZELRO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_ZelRo_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_ZELRO_e, + /* Actor SubMtd */ &daNpc_ZelRo_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_zelda.cpp b/src/d/actor/d_a_npc_zelda.cpp index 7fb6649645..121d97bb39 100644 --- a/src/d/actor/d_a_npc_zelda.cpp +++ b/src/d/actor/d_a_npc_zelda.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_zelda.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -188,7 +188,7 @@ int daNpc_Zelda_c::create() { J3DModelData* unusedModelData = mpMorf[0]->getModel()->getModelData(); fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -200.0f, -100.0f, -200.0f, 200.0f, 300.0f, 200.0f); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); mSound.init(¤t.pos, &eyePos, 3, 1); #if DEBUG @@ -787,18 +787,18 @@ static actor_method_class daNpc_Zelda_MethodTable = { }; actor_process_profile_definition g_profile_NPC_ZELDA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_ZELDA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Zelda_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 384, // mPriority - &daNpc_Zelda_MethodTable, // sub_method - 0x00040108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_ZELDA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Zelda_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_ZELDA_e, + /* Actor SubMtd */ &daNpc_Zelda_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_zra.cpp b/src/d/actor/d_a_npc_zra.cpp index 2278d7b3ef..ad35527516 100644 --- a/src/d/actor/d_a_npc_zra.cpp +++ b/src/d/actor/d_a_npc_zra.cpp @@ -14,7 +14,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "d/d_com_inf_game.h" #include "d/d_meter2_info.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/actor/d_a_canoe.h" #include "d/actor/d_a_npc_hoz.h" #include "d/actor/d_a_obj_zraMark.h" @@ -1665,7 +1665,7 @@ void daNpc_zrA_c::reset() { speed.setall(0.0f); if ((mType == TYPE_SWIM && mPath.getPathInfo() != NULL) || mType == TYPE_WATERFALL) { - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } mBtkID = 0; @@ -2337,18 +2337,18 @@ static actor_method_class daNpc_zrA_MethodTable = { }; actor_process_profile_definition g_profile_NPC_ZRA = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_NPC_ZRA, - &g_fpcLf_Method.base, - sizeof(daNpc_zrA_c), - 0, - 0, - &g_fopAc_Method.base, - 0x183, - &daNpc_zrA_MethodTable, - 0x44100, - fopAc_NPC_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_ZRA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_zrA_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_ZRA_e, + /* Actor SubMtd */ &daNpc_zrA_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_zra.inc b/src/d/actor/d_a_npc_zra.inc index 8bca2ba0be..2ada4601c8 100644 --- a/src/d/actor/d_a_npc_zra.inc +++ b/src/d/actor/d_a_npc_zra.inc @@ -303,7 +303,7 @@ BOOL daNpc_zrA_c::talk(void* param_0) { } static void* s_subMulti(void* i_proc, void* i_this) { - if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_NPC_ZRA) { + if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_NPC_ZRA_e) { daNpc_zrA_c* _this = static_cast(i_this); daNpc_zrA_c* other = static_cast(i_proc); if (other != _this && other->getType() == daNpc_zrA_c::TYPE_WAIT @@ -1643,14 +1643,14 @@ BOOL daNpc_zrA_c::diveCalc(s16 i_angleStep, s16 i_angleScale, BOOL param_2) { } static void* s_subHoz(void* i_proc, void* i_this) { - if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_NPC_HOZ) { + if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_NPC_HOZ_e) { return i_proc; } return NULL; } static void* s_sub(void* i_proc, void* i_this) { - if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_CANOE) { + if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_CANOE_e) { return i_proc; } return NULL; @@ -2353,9 +2353,9 @@ void daNpc_zrA_c::moveRiverPosCalc(cXyz& o_pos) { void daNpc_zrA_c::createRuppi() { int item; if (cLib_getRndValue(0, 5) < 4) { - item = fpcNm_ITEM_GREEN_RUPEE; + item = dItemNo_GREEN_RUPEE_e; } else { - item = fpcNm_ITEM_BLUE_RUPEE; + item = dItemNo_BLUE_RUPEE_e; } cXyz pos(0.0f, 0.0f, -100.0f); mDoMtx_stack_c::transS(current.pos); @@ -2550,7 +2550,7 @@ BOOL daNpc_zrA_c::ECut_thanksBlast(int i_staffID) { case 1: if (mActorMngr[2].getActorP() != NULL - && fopAcM_GetName(mActorMngr[2].getActorP()) == PROC_CANOE) + && fopAcM_GetName(mActorMngr[2].getActorP()) == fpcNm_CANOE_e) { static_cast(mActorMngr[2].getActorP())->setWaterFallDownSe(); } @@ -2883,7 +2883,7 @@ BOOL daNpc_zrA_c::ECut_resultAnnounce(int i_staffID) { case 1: if (mActorMngr[2].getActorP() != NULL - && fopAcM_GetName(mActorMngr[2].getActorP()) == PROC_CANOE) + && fopAcM_GetName(mActorMngr[2].getActorP()) == fpcNm_CANOE_e) { static_cast(mActorMngr[2].getActorP())->setWaterFallDownSe(); } @@ -3217,7 +3217,7 @@ void daNpc_zrA_c::calcCanoeMove(BOOL param_0) { } static void* s_subMark(void* i_proc, void* i_this) { - if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_ZRA_MARK) { + if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_ZRA_MARK_e) { daObjZraMark_c* zra_mark = static_cast(i_proc); daNpc_zrA_c* _this = static_cast(i_this); if (zra_mark->getMarkNo() == _this->getNoFromParam()) { @@ -3534,7 +3534,7 @@ BOOL daNpc_zrA_c::tobiEnd(void* param_0) { } static void* s_subSP(void* i_proc, void* i_this) { - if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_NPC_ZRA) { + if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_NPC_ZRA_e) { daNpc_zrA_c* other = static_cast(i_proc); daNpc_zrA_c* _this = static_cast(i_this); if (other->getType() == _this->getType() diff --git a/src/d/actor/d_a_npc_zrc.cpp b/src/d/actor/d_a_npc_zrc.cpp index 07599054c6..738f585127 100644 --- a/src/d/actor/d_a_npc_zrc.cpp +++ b/src/d/actor/d_a_npc_zrc.cpp @@ -913,7 +913,7 @@ void daNpc_zrC_c::reset() { speed.setall(0.0f); setLookMode(LOOK_NONE); if (mType == 1) { - fopAcM_OffStatus(this, 0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); } else if (mType == 2) { setExpression(EXPR_PRAY, -1.0f); setMotion(2, -1.0f, FALSE); @@ -1138,7 +1138,7 @@ BOOL daNpc_zrC_c::doEvent() { (this->*mpActionFn)(NULL); } else if (dComIfGp_event_chkTalkXY()) { if (dComIfGp_evmng_ChkPresentEnd()) { - if (mType == 2 && dComIfGp_event_getPreItemNo() == fpcNm_ITEM_ASHS_SCRIBBLING) { + if (mType == 2 && dComIfGp_event_getPreItemNo() == dItemNo_ASHS_SCRIBBLING_e) { mFlowID = 0x35; mOrderEvtNo = EVT_EARRING_GET; changeEvent(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx], @@ -1797,18 +1797,18 @@ static actor_method_class daNpc_zrC_MethodTable = { }; actor_process_profile_definition g_profile_NPC_ZRC = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_ZRC, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_zrC_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 389, // mPriority - &daNpc_zrC_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_ZRC_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_zrC_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_ZRC_e, + /* Actor SubMtd */ &daNpc_zrC_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_zrz.cpp b/src/d/actor/d_a_npc_zrz.cpp index 607f63891f..37656be3bf 100644 --- a/src/d/actor/d_a_npc_zrz.cpp +++ b/src/d/actor/d_a_npc_zrz.cpp @@ -490,21 +490,21 @@ int daNpc_zrZ_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) { } static void* s_sub(void* i_proc, void* i_this) { - if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_Obj_GraveStone) { + if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_Obj_GraveStone_e) { return i_proc; } return NULL; } static void* s_subCloth(void* i_proc, void* i_this) { - if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_Obj_ZoraCloth) { + if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_Obj_ZoraCloth_e) { return i_proc; } return NULL; } static void* s_subRock(void* i_proc, void* i_this) { - if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_Obj_ZraRock) { + if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_Obj_ZraRock_e) { return i_proc; } return NULL; @@ -2452,18 +2452,18 @@ static actor_method_class daNpc_zrZ_MethodTable = { }; actor_process_profile_definition g_profile_NPC_ZRZ = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_ZRZ, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_zrZ_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 390, // mPriority - &daNpc_zrZ_MethodTable, // sub_method - 0x08044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_ZRZ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_zrZ_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_ZRZ_e, + /* Actor SubMtd */ &daNpc_zrZ_MethodTable, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_Lv5Key.cpp b/src/d/actor/d_a_obj_Lv5Key.cpp index f6251271d4..9c3b5c0e4c 100644 --- a/src/d/actor/d_a_obj_Lv5Key.cpp +++ b/src/d/actor/d_a_obj_Lv5Key.cpp @@ -340,18 +340,18 @@ static actor_method_class l_daObjLv5Key_Method = { }; actor_process_profile_definition g_profile_Obj_Lv5Key = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv5Key, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLv5Key_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 46, // mPriority - &l_daObjLv5Key_Method, // sub_method - 0x00044180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv5Key_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLv5Key_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv5Key_e, + /* Actor SubMtd */ &l_daObjLv5Key_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_Turara.cpp b/src/d/actor/d_a_obj_Turara.cpp index 89a98a348c..5e350e0974 100644 --- a/src/d/actor/d_a_obj_Turara.cpp +++ b/src/d/actor/d_a_obj_Turara.cpp @@ -353,7 +353,7 @@ void daTurara_c::init_modeDropEnd2() { current.pos.y -= 100.0f; cXyz first_vec(current.pos); first_vec.y += 100.0f; - mEmID = fopAcM_create(PROC_E_KK, getSwBit1() << 0x10 | 3, &first_vec, fopAcM_GetRoomNo(this), 0, 0, -1); + mEmID = fopAcM_create(fpcNm_E_KK_e, getSwBit1() << 0x10 | 3, &first_vec, fopAcM_GetRoomNo(this), 0, 0, -1); JUT_ASSERT(770, mEmID != fpcM_ERROR_PROCESS_ID_e); cXyz second_vec(0.7f, 0.7f, 0.7f); dComIfGp_particle_set(0x8a8f, &first_vec, NULL, &second_vec); @@ -419,18 +419,18 @@ static actor_method_class l_daTurara_Method = { }; actor_process_profile_definition g_profile_Obj_Turara = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Turara, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTurara_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 545, // mPriority - &l_daTurara_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Turara_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTurara_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Turara_e, + /* Actor SubMtd */ &l_daTurara_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_TvCdlst.cpp b/src/d/actor/d_a_obj_TvCdlst.cpp index fd365f58f8..9df06beddf 100644 --- a/src/d/actor/d_a_obj_TvCdlst.cpp +++ b/src/d/actor/d_a_obj_TvCdlst.cpp @@ -223,18 +223,18 @@ static actor_method_class l_daTvCdlst_Method = { }; actor_process_profile_definition g_profile_Obj_TvCdlst = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_TvCdlst, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTvCdlst_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 496, // mPriority - &l_daTvCdlst_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_TvCdlst_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTvCdlst_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_TvCdlst_e, + /* Actor SubMtd */ &l_daTvCdlst_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_Y_taihou.cpp b/src/d/actor/d_a_obj_Y_taihou.cpp index b2dd4bfd05..ab9d2bf4cf 100644 --- a/src/d/actor/d_a_obj_Y_taihou.cpp +++ b/src/d/actor/d_a_obj_Y_taihou.cpp @@ -60,7 +60,7 @@ static fopAc_ac_c* pushPullcallBack(fopAc_ac_c* param_0, fopAc_ac_c* param_1, s1 static void* searchIronBallCallback(void* i_actor, void* i_data) { daObjYtaihou_c* taihou_rhs = (daObjYtaihou_c*)i_data; - if (fopAcM_GetProfName(i_actor) == PROC_Obj_Carry) { + if (fopAcM_GetProfName(i_actor) == fpcNm_Obj_Carry_e) { daObjCarry_c* pCarry = ((daObjCarry_c*)i_actor); if ( ((daObjCarry_c*)i_actor)->getType() == daObjCarry_c::TYPE_IRON_BALL) { if ( pCarry->isDraw() == 0 @@ -382,20 +382,20 @@ static actor_method_class daObjYtaihou_METHODS = { }; actor_process_profile_definition g_profile_Obj_Ytaihou = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Ytaihou, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjYtaihou_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 635, // mPriority - &daObjYtaihou_METHODS, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Ytaihou_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjYtaihou_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Ytaihou_e, + /* Actor SubMtd */ &daObjYtaihou_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_obj_amiShutter.cpp b/src/d/actor/d_a_obj_amiShutter.cpp index cdd4e2a69a..2150ea48ac 100644 --- a/src/d/actor/d_a_obj_amiShutter.cpp +++ b/src/d/actor/d_a_obj_amiShutter.cpp @@ -294,18 +294,18 @@ actor_method_class l_daAmiShutter_Method = { actor_process_profile_definition g_profile_Obj_AmiShutter = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_AmiShutter, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daAmiShutter_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 521, // mPriority - &l_daAmiShutter_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType - }; + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_AmiShutter_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daAmiShutter_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_AmiShutter_e, + /* Actor SubMtd */ &l_daAmiShutter_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/src/d/actor/d_a_obj_ari.cpp b/src/d/actor/d_a_obj_ari.cpp index 7a5f438a74..267b0003af 100644 --- a/src/d/actor/d_a_obj_ari.cpp +++ b/src/d/actor/d_a_obj_ari.cpp @@ -10,7 +10,7 @@ #include "m_Do/m_Do_lib.h" #include "d/d_com_inf_game.h" #include "d/d_menu_insect.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_camera_mng.h" #include @@ -24,7 +24,7 @@ daObj_AriHIO_c::daObj_AriHIO_c() { mScaleFemale = 2.0f; } -static u8 const l_ari_itemno[2] = {fpcNm_ITEM_M_ANT, fpcNm_ITEM_F_ANT}; +static u8 const l_ari_itemno[2] = {dItemNo_M_ANT_e, dItemNo_F_ANT_e}; void daObjARI_c::InitCcSph() { const static dCcD_SrcSph ccSphSrc = { @@ -615,7 +615,7 @@ cPhs_Step daObjARI_c::create() { if (mLocation == LOC_UNK_2) { field_0x56c = 0; shape_angle.x -= 0x2000; - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } else { mDraw = true; } @@ -740,18 +740,18 @@ static actor_method_class l_daObjARI_Method = { }; actor_process_profile_definition g_profile_Obj_Ari = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_Ari, - &g_fpcLf_Method.base, - sizeof(daObjARI_c), - 0, - 0, - &g_fopAc_Method.base, - 0x1E4, - &l_daObjARI_Method, - 0xC0100, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Ari_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjARI_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Ari_e, + /* Actor SubMtd */ &l_daObjARI_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_automata.cpp b/src/d/actor/d_a_obj_automata.cpp index 3c43af4d69..bb277e015f 100644 --- a/src/d/actor/d_a_obj_automata.cpp +++ b/src/d/actor/d_a_obj_automata.cpp @@ -211,7 +211,7 @@ int daObj_AutoMata_c::createHeapCallBack(fopAc_ac_c* i_this) { } void* daObj_AutoMata_c::srchTHouse(fopAc_ac_c* actor, void* param_1) { - if (fopAcM_GetName(actor) == PROC_Obj_TobyHouse) { + if (fopAcM_GetName(actor) == fpcNm_Obj_TobyHouse_e) { if (fopAcM_IsExecuting(fopAcM_GetID(actor))) { return actor; } @@ -339,18 +339,18 @@ static actor_method_class daObj_AutoMata_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_AUTOMATA = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_AUTOMATA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_AutoMata_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 81, // mPriority - &daObj_AutoMata_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_AUTOMATA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_AutoMata_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_AUTOMATA_e, + /* Actor SubMtd */ &daObj_AutoMata_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_avalanche.cpp b/src/d/actor/d_a_obj_avalanche.cpp index cf0e126f88..4742cf1683 100644 --- a/src/d/actor/d_a_obj_avalanche.cpp +++ b/src/d/actor/d_a_obj_avalanche.cpp @@ -299,18 +299,18 @@ static actor_method_class daObjAvalanche_METHODS = { }; actor_process_profile_definition g_profile_Obj_Avalanche = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Avalanche, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjAvalanche_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 655, // mPriority - &daObjAvalanche_METHODS, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Avalanche_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjAvalanche_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Avalanche_e, + /* Actor SubMtd */ &daObjAvalanche_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_balloon.cpp b/src/d/actor/d_a_obj_balloon.cpp index 94e24bf3dc..41430f97f0 100644 --- a/src/d/actor/d_a_obj_balloon.cpp +++ b/src/d/actor/d_a_obj_balloon.cpp @@ -124,7 +124,7 @@ void daObj_Balloon_c::action() { if (mSph.ChkTgHit()) { cCcD_Obj* hit_obj = mSph.GetTgHitObj(); - if (fopAcM_GetName(dCc_GetAc(hit_obj->GetAc())) == PROC_KAGO) { + if (fopAcM_GetName(dCc_GetAc(hit_obj->GetAc())) == fpcNm_KAGO_e) { cXyz eff_scale(kago_effect_scale[mType], kago_effect_scale[mType], kago_effect_scale[mType]); for (int i = 0; i < 2; i++) { @@ -152,7 +152,7 @@ void daObj_Balloon_c::action() { 1.0f, -1.0f, -1.0f, 0); m_balloon_score += add_score; - daBalloon2D_c* balloon_2d = (daBalloon2D_c*)fopAcM_SearchByName(PROC_BALLOON2D); + daBalloon2D_c* balloon_2d = (daBalloon2D_c*)fopAcM_SearchByName(fpcNm_BALLOON2D_e); if (balloon_2d != NULL) { u8 balloon_size; if (mType == SIZE_SMALL_e) { @@ -296,20 +296,20 @@ static actor_method_class l_daObj_Balloon_Method = { }; actor_process_profile_definition g_profile_OBJ_BALLOON = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_BALLOON, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_Balloon_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 64, // mPriority - &l_daObj_Balloon_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_BALLOON_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Balloon_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_BALLOON_e, + /* Actor SubMtd */ &l_daObj_Balloon_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_obj_barDesk.cpp b/src/d/actor/d_a_obj_barDesk.cpp index 9e0b3a4a8f..8de65413ba 100644 --- a/src/d/actor/d_a_obj_barDesk.cpp +++ b/src/d/actor/d_a_obj_barDesk.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_barDesk.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" @@ -161,18 +161,18 @@ static actor_method_class l_daBarDesk_Method = { }; actor_process_profile_definition g_profile_Obj_BarDesk = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_BarDesk, - &g_fpcLf_Method.base, - sizeof(daBarDesk_c), - 0, - 0, - &g_fopAc_Method.base, - 0x279, - &l_daBarDesk_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_BarDesk_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBarDesk_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_BarDesk_e, + /* Actor SubMtd */ &l_daBarDesk_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_batta.cpp b/src/d/actor/d_a_obj_batta.cpp index 81d3e6a084..87c4114ce4 100644 --- a/src/d/actor/d_a_obj_batta.cpp +++ b/src/d/actor/d_a_obj_batta.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_batta.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -11,7 +11,7 @@ #include "d/d_cc_uty.h" #include "d/d_com_inf_game.h" #include "d/d_menu_insect.h" -#include "f_pc/f_pc_name.h" +#include "d/d_item_data.h" #include class daObj_BattaHIO_c : public JORReflexible { @@ -316,7 +316,7 @@ void daObjBATTA_c::bin_wait() { if (field_0x9e8 == 0) { J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("Bat", 8); mpMorf->setAnm(anm, 2, 4.0f, 1.0f, 0.0f, -1.0f); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); mDraw = false; gravity = 0.0f; maxFallSpeed = 0.0f; @@ -386,7 +386,7 @@ void daObjBATTA_c::hook() { batta_setParticle(); } - if (!fopAcM_CheckStatus(this, fopAcM_STATUS_HOOK_CARRY_NOW)) { + if (!fopAcM_CheckStatus(this, fopAcStts_HOOK_CARRY_NOW_e)) { setAction(&daObjBATTA_c::wait); } } @@ -476,7 +476,7 @@ void daObjBATTA_c::action() { void daObjBATTA_c::hit_check() { dCcU_AtInfo info; mStts.Move(); - + if (mSph.ChkTgHit()) { info.mpCollider = mSph.GetTgHitObj(); if (info.mpCollider->ChkAtType(AT_TYPE_HOOKSHOT)) { @@ -487,7 +487,7 @@ void daObjBATTA_c::hit_check() { } } -static u8 const l_batta_sex[2] = {fpcNm_ITEM_M_GRASSHOPPER, fpcNm_ITEM_F_GRASSHOPPER}; +static u8 const l_batta_sex[2] = {dItemNo_M_GRASSHOPPER_e, dItemNo_F_GRASSHOPPER_e}; int daObjBATTA_c::execute() { if ( ChkGetDemo()) { @@ -497,7 +497,7 @@ int daObjBATTA_c::execute() { batta_setParticle(); return 1; } - + if (field_0x9f2 != 0) { field_0x9f2--; } @@ -592,21 +592,21 @@ int daObjBATTA_c::create() { if (field_0x9f0 == 3) { field_0x9f0 = 0; } - + mSex = (fopAcM_GetParam(this) & 0x10) >> 4; if (mSex != 0) { scale.setall(l_HIO.mModelScaleFemale); } else { scale.setall(l_HIO.mModelScaleMale); } - + if (uVar9 == 15) { uVar9 = 0; } - + setItemNo(l_batta_sex[mSex]); setSaveBitNo(l_musiya_num[mSex]); - + if (field_0x9f0 != 2) { if (uVar9 != 0) { if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_MALE]]) || !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_FEMALE]])) { @@ -629,9 +629,9 @@ int daObjBATTA_c::create() { } } } - + mParticleScale = 0.0f; - + OS_REPORT("/////////////////// BATTA ////////////////////////\n"); if (!fopAcM_entrySolidHeap(this, useHeapInit, 0xb00)) { @@ -639,32 +639,32 @@ int daObjBATTA_c::create() { } OS_REPORT("/////////////////// BATTA SET OK /////////////////\n"); - + if (!hio_set) { hio_set = true; mIsHIOOwner = true; // Golden Bugs l_HIO.mId = mDoHIO_CREATE_CHILD("黄金蟲(バッタ)", &l_HIO); } - + J3DModel* model = mpMorf->getModel(); fopAcM_SetMtx(this, model->getBaseTRMtx()); fopAcM_SetMin(this, -50.0f, -50.0f, -50.0f); fopAcM_SetMax(this, 50.0f, 50.0f, 50.0f); - + attention_info.flags = 0; health = 10; field_0x560 = 10; - + mCreature.init(¤t.pos, &eyePos, 3, 1); - + if (field_0x9f0 == 0) { attention_info.distances[fopAc_attn_CARRY_e] = 0x5d; mStts.Init(100, 0, this); mSph.Set(cc_sph_src); mSph.SetStts(&mStts); } - + if (field_0x9f0 == 2) { setAction(&daObjBATTA_c::bin_wait); } else { @@ -676,7 +676,7 @@ int daObjBATTA_c::create() { current.angle.y = cM_rndFX(32768.0f); setAction(&daObjBATTA_c::wait); } - + daObjBATTA_Execute(this); } return rv; @@ -695,18 +695,18 @@ static actor_method_class l_daObjBATTA_Method = { }; actor_process_profile_definition g_profile_Obj_Batta = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Batta, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjBATTA_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 486, // mPriority - &l_daObjBATTA_Method, // sub_method - 0x000C0120, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Batta_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjBATTA_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Batta_e, + /* Actor SubMtd */ &l_daObjBATTA_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_bbox.cpp b/src/d/actor/d_a_obj_bbox.cpp index 2a645ae557..210932589a 100644 --- a/src/d/actor/d_a_obj_bbox.cpp +++ b/src/d/actor/d_a_obj_bbox.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_bbox.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" const static dCcD_SrcCyl l_cyl_src = { { @@ -136,18 +136,18 @@ static actor_method_class daObjBBox_METHODS = { }; actor_process_profile_definition g_profile_Obj_BBox = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_BBox, - &g_fpcLf_Method.base, - sizeof(daObjBBox_c), - 0, - 0, - &g_fopAc_Method.base, - 0x1F3, - &daObjBBox_METHODS, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_BBox_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjBBox_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_BBox_e, + /* Actor SubMtd */ &daObjBBox_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_bed.cpp b/src/d/actor/d_a_obj_bed.cpp index 77f17a6e62..63c09e78c0 100644 --- a/src/d/actor/d_a_obj_bed.cpp +++ b/src/d/actor/d_a_obj_bed.cpp @@ -10,7 +10,7 @@ #include "d/d_com_inf_game.h" #include "m_Do/m_Do_ext.h" #include "d/actor/d_a_npc.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static char* l_resName = "KH_Bed"; @@ -208,18 +208,18 @@ static actor_method_class daObj_Bed_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_BED = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_OBJ_BED, - &g_fpcLf_Method.base, - sizeof(daObj_Bed_c), - 0, - 0, - &g_fopAc_Method.base, - 0x4F, - &daObj_Bed_MethodTable, - 0x44100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_BED_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Bed_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_BED_e, + /* Actor SubMtd */ &daObj_Bed_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp index 966a80b64b..98b4d9e597 100644 --- a/src/d/actor/d_a_obj_bemos.cpp +++ b/src/d/actor/d_a_obj_bemos.cpp @@ -1950,20 +1950,20 @@ static actor_method_class daObjBm_METHODS = { }; actor_process_profile_definition g_profile_Obj_Bemos = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Bemos, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjBm_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 604, // mPriority - &daObjBm_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Bemos_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjBm_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Bemos_e, + /* Actor SubMtd */ &daObjBm_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_obj_bhashi.cpp b/src/d/actor/d_a_obj_bhashi.cpp index 42b29b43ae..00a35bc158 100644 --- a/src/d/actor/d_a_obj_bhashi.cpp +++ b/src/d/actor/d_a_obj_bhashi.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_bhashi.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -158,12 +158,12 @@ void daObjBHASHI_c::Obj_Damage() { fopAc_ac_c* tg_hit_obj = dCc_GetAc(mCcCyl.GetTgHitObj()->GetAc()); cXyz* tg_hit_pos = mCcCyl.GetTgHitPosP(); s16 rot_y = cLib_targetAngleY(¤t.pos, tg_hit_pos); - if (fopAcM_GetName(tg_hit_obj) == PROC_B_MGN) { + if (fopAcM_GetName(tg_hit_obj) == fpcNm_B_MGN_e) { field_0x5a8++; - + fpc_ProcID tg_hit_id = fopAcM_GetID(tg_hit_obj); fopAc_ac_c* mgn_p; - if (fopAcM_SearchByName(PROC_B_MGN, &mgn_p) && mgn_p != NULL) { + if (fopAcM_SearchByName(fpcNm_B_MGN_e, &mgn_p) && mgn_p != NULL) { field_0x11dc = cLib_targetAngleY(&fopAcM_GetPosition(mgn_p), ¤t.pos); } @@ -184,7 +184,7 @@ void daObjBHASHI_c::Obj_Damage() { } mCcCyl.ResetTgHit(); - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); } } } @@ -207,7 +207,7 @@ void daObjBHASHI_c::Obj_Damage(cXyz param_0) { dComIfGp_particle_set(dPa_RM(ID_ZI_S_LV9PILLAR_BREAK_C), &eff_pos, &tevStr, &eff_rot, NULL); dComIfGp_particle_set(dPa_RM(ID_ZI_S_LV9PILLAR_BREAK_D), &eff_pos, &tevStr, &eff_rot, NULL); - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); } Hahen_c::Hahen_c() { @@ -308,7 +308,7 @@ void Hahen_c::Roll_Set(cXyz* i_pos, f32 param_1, s16 i_no) { f32 speed_x = (-1.0f + nREG_F(12)) * param_1 * cM_ssin(angle); f32 temp_f31 = scale.abs(); temp_f31 = 3.0f / temp_f31; - + f32 speed_y = temp_f30 - 9.0f; f32 speed_z = (-1.0f + nREG_F(13)) * param_1 * cM_scos(angle); @@ -443,7 +443,7 @@ int daObjBHASHI_c::Execute(Mtx** param_0) { } fopAc_ac_c* mgn_p; - if (fopAcM_SearchByName(PROC_B_MGN, &mgn_p) && mgn_p != NULL && ((daB_MGN_c*)mgn_p)->isAppear()) { + if (fopAcM_SearchByName(fpcNm_B_MGN_e, &mgn_p) && mgn_p != NULL && ((daB_MGN_c*)mgn_p)->isAppear()) { Rolling(&fopAcM_GetPosition(mgn_p), 400.0f, 90.0f + yREG_F(0)); } } @@ -503,18 +503,18 @@ static actor_method_class l_daObjBHASHI_Method = { }; actor_process_profile_definition g_profile_Obj_BHASHI = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_BHASHI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjBHASHI_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 463, // mPriority - &l_daObjBHASHI_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_BHASHI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjBHASHI_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_BHASHI_e, + /* Actor SubMtd */ &l_daObjBHASHI_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_bhbridge.cpp b/src/d/actor/d_a_obj_bhbridge.cpp index 9ada8dfdc7..f690ff1087 100644 --- a/src/d/actor/d_a_obj_bhbridge.cpp +++ b/src/d/actor/d_a_obj_bhbridge.cpp @@ -199,18 +199,18 @@ static actor_method_class l_daObjBhbridge_Method = { }; actor_process_profile_definition g_profile_Obj_Bhbridge = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Bhbridge, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjBhbridge_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 459, // mPriority - &l_daObjBhbridge_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Bhbridge_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjBhbridge_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Bhbridge_e, + /* Actor SubMtd */ &l_daObjBhbridge_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_bk_leaf.cpp b/src/d/actor/d_a_obj_bk_leaf.cpp index a2a3251372..7e45e0801f 100644 --- a/src/d/actor/d_a_obj_bk_leaf.cpp +++ b/src/d/actor/d_a_obj_bk_leaf.cpp @@ -17,7 +17,7 @@ void daBkLeaf_c::setBokkuri() { u32 sp10 = 0; csXyz currentAngle(current.angle); daObjCarry_c::make_prm(&sp10, ¤tAngle, 6, getItem(), getItemBit(), 1, 2); - field_0x578 = fopAcM_createChild(PROC_Obj_Carry, fopAcM_GetID(this), 0, ¤t.pos, + field_0x578 = fopAcM_createChild(fpcNm_Obj_Carry_e, fopAcM_GetID(this), 0, ¤t.pos, fopAcM_GetRoomNo(this), ¤tAngle, &scale, -1, 0); } @@ -159,17 +159,19 @@ static actor_method_class l_daBkLeaf_Method = { (process_method_func)daBkLeaf_Draw, }; -actor_process_profile_definition g_profile_Obj_BkLeaf = {fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_BkLeaf, - &g_fpcLf_Method.base, - sizeof(daBkLeaf_c), - 0, - 0, - &g_fopAc_Method.base, - 0xFC, - &l_daBkLeaf_Method, - 0x40100, - 0, - fopAc_CULLBOX_CUSTOM_e}; +actor_process_profile_definition g_profile_Obj_BkLeaf = { + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_BkLeaf_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBkLeaf_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_BkLeaf_e, + /* Actor SubMtd */ &l_daBkLeaf_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/src/d/actor/d_a_obj_bkdoor.cpp b/src/d/actor/d_a_obj_bkdoor.cpp index 8ed051902d..3a4501d971 100644 --- a/src/d/actor/d_a_obj_bkdoor.cpp +++ b/src/d/actor/d_a_obj_bkdoor.cpp @@ -14,7 +14,7 @@ #include "f_op/f_op_actor_mng.h" static void* search_door(void* i_actor, void* i_this) { - if (i_actor != NULL && fopAcM_GetProfName(i_actor) == PROC_Obj_BkDoor && + if (i_actor != NULL && fopAcM_GetProfName(i_actor) == fpcNm_Obj_BkDoor_e && fopAcM_GetParamBit(i_this, 0, 1) != fopAcM_GetParamBit(i_actor, 0, 1)) { return i_actor; @@ -205,18 +205,18 @@ static actor_method_class daObjBkDoor_METHODS = { }; actor_process_profile_definition g_profile_Obj_BkDoor = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_BkDoor, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjBkDoor_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 451, // mPriority - &daObjBkDoor_METHODS, // sub_method - 0x40100, // mStatus - 0, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_BkDoor_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjBkDoor_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_BkDoor_e, + /* Actor SubMtd */ &daObjBkDoor_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_bky_rock.cpp b/src/d/actor/d_a_obj_bky_rock.cpp index cf8b62c895..25869bb0b5 100644 --- a/src/d/actor/d_a_obj_bky_rock.cpp +++ b/src/d/actor/d_a_obj_bky_rock.cpp @@ -425,18 +425,18 @@ static actor_method_class daBkyRock_METHODS = { }; actor_process_profile_definition g_profile_BkyRock = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_BkyRock, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daBkyRock_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 728, // mPriority - &daBkyRock_METHODS, // sub_method - 0x00044100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BkyRock_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBkyRock_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_BkyRock_e, + /* Actor SubMtd */ &daBkyRock_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_bmWindow.cpp b/src/d/actor/d_a_obj_bmWindow.cpp index e16f6a753a..80130e8ccb 100644 --- a/src/d/actor/d_a_obj_bmWindow.cpp +++ b/src/d/actor/d_a_obj_bmWindow.cpp @@ -333,18 +333,18 @@ static actor_method_class l_daBmWindow_Method = { }; actor_process_profile_definition g_profile_Obj_BmWindow = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_BmWindow, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daBmWindow_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 513, // mPriority - &l_daBmWindow_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_BmWindow_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBmWindow_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_BmWindow_e, + /* Actor SubMtd */ &l_daBmWindow_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_bmshutter.cpp b/src/d/actor/d_a_obj_bmshutter.cpp index ace4baefe3..3ab56169fe 100644 --- a/src/d/actor/d_a_obj_bmshutter.cpp +++ b/src/d/actor/d_a_obj_bmshutter.cpp @@ -297,18 +297,18 @@ static actor_method_class l_daObjBmSh_Method = { }; actor_process_profile_definition g_profile_Obj_BoomShutter = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_BoomShutter, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjBmSh_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 449, // mPriority - &l_daObjBmSh_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_BoomShutter_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjBmSh_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_BoomShutter_e, + /* Actor SubMtd */ &l_daObjBmSh_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_bombf.cpp b/src/d/actor/d_a_obj_bombf.cpp index 6e837134bc..bba146781f 100644 --- a/src/d/actor/d_a_obj_bombf.cpp +++ b/src/d/actor/d_a_obj_bombf.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_bombf.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static const char l_arcName[] = "Bombf"; @@ -114,18 +114,18 @@ static actor_method_class l_daObjBombf_Method = { }; actor_process_profile_definition g_profile_Obj_Bombf = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Bombf, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjBombf_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 251, // mPriority - &l_daObjBombf_Method, // sub_method - 0x40100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Bombf_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjBombf_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Bombf_e, + /* Actor SubMtd */ &l_daObjBombf_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_bosswarp.cpp b/src/d/actor/d_a_obj_bosswarp.cpp index 90abc38275..b107971f8f 100644 --- a/src/d/actor/d_a_obj_bosswarp.cpp +++ b/src/d/actor/d_a_obj_bosswarp.cpp @@ -9,7 +9,7 @@ #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_midna.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/actor/d_a_obj_life_container.h" #include "d/actor/d_a_obj_ystone.h" #include @@ -243,7 +243,7 @@ int daObjBossWarp_c::execute() { if (field_0x595 && midna != NULL) { midna->onTagWaitPos(&field_0x620); } - obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE); + obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e); int level = getNowLevel(); if (ystone != NULL && midna != NULL) { @@ -314,7 +314,7 @@ void daObjBossWarp_c::actionWait() { void daObjBossWarp_c::actionOrderEvent() { if (eventInfo.checkCommandDemoAccrpt()) { - dComIfGp_event_setTalkPartner(fopAcM_SearchByName(PROC_OBJ_YSTONE)); + dComIfGp_event_setTalkPartner(fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e)); setAction(ACT_EVENT); mStaffId = dComIfGp_evmng_getMyStaffId("WARPHOLE", NULL, 0); demoProc(); @@ -446,10 +446,10 @@ int daObjBossWarp_c::demoProc() { }; daPy_py_c* player = daPy_getPlayerActorClass(); - obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE); + obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e); cXyz unused(100000.0f, 0.0f, 0.0f); daMidna_c* midna = (daMidna_c*)daPy_py_c::getMidnaActor(); - daObjLife_c* life_container = (daObjLife_c*)fopAcM_SearchByName(PROC_Obj_LifeContainer); + daObjLife_c* life_container = (daObjLife_c*)fopAcM_SearchByName(fpcNm_Obj_LifeContainer_e); cXyz life_pos(900.0f, 0.0f, 0.0f); int act_idx = dComIfGp_evmng_getMyActIdx(mStaffId, action_table, 15, 0, 0); @@ -671,18 +671,18 @@ static actor_method_class l_daObjBossWarp_Method = { }; actor_process_profile_definition g_profile_Obj_BossWarp = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_BossWarp, - &g_fpcLf_Method.base, - sizeof(daObjBossWarp_c), - 0, - 0, - &g_fopAc_Method.base, - 0x2DA, - &l_daObjBossWarp_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_BossWarp_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjBossWarp_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_BossWarp_e, + /* Actor SubMtd */ &l_daObjBossWarp_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_boumato.cpp b/src/d/actor/d_a_obj_boumato.cpp index 85a81d4e39..34677f4112 100644 --- a/src/d/actor/d_a_obj_boumato.cpp +++ b/src/d/actor/d_a_obj_boumato.cpp @@ -246,7 +246,7 @@ void daObj_BouMato_c::tgHitCallBack(fopAc_ac_c* param_1, dCcD_GObjInf* param_2, fopAc_ac_c* param_3, dCcD_GObjInf* param_4) { u8 cutType = 0; if (param_3 != NULL) { - if (fopAcM_GetProfName(param_3) == PROC_ALINK) { + if (fopAcM_GetProfName(param_3) == fpcNm_ALINK_e) { cutType = static_cast(param_3)->getCutType(); } else { cutType = daPy_py_c::CUT_TYPE_NM_VERTICAL; @@ -257,7 +257,7 @@ void daObj_BouMato_c::tgHitCallBack(fopAc_ac_c* param_1, dCcD_GObjInf* param_2, void* daObj_BouMato_c::srchArrow(void* param_1, void* param_2) { if (l_findCount < 100 && param_1 != NULL && param_1 != param_2) { - if (fopAcM_IsExecuting(fopAcM_GetID(param_1)) && fopAcM_GetName(param_1) == PROC_ARROW && + if (fopAcM_IsExecuting(fopAcM_GetID(param_1)) && fopAcM_GetName(param_1) == fpcNm_ARROW_e && static_cast(param_1)->getHitAcID() != -1) { l_findActorPtrs[l_findCount] = (daArrow_c*)param_1; @@ -288,7 +288,7 @@ void daObj_BouMato_c::setSwayParam(fopAc_ac_c* param_1) { field_0xa2a = (fopAcM_searchActorAngleY(this, param_1) - shape_angle.y) + 0x8000; field_0xa10 = 8; mIsCurTurnRight = false; - if (fopAcM_GetProfName(param_1) == PROC_ALINK) { + if (fopAcM_GetProfName(param_1) == fpcNm_ALINK_e) { switch (mCutType) { case daPy_py_c::CUT_TYPE_NM_RIGHT: case daPy_py_c::CUT_TYPE_NM_LEFT: @@ -368,18 +368,18 @@ static actor_method_class daObj_BouMato_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_BOUMATO = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_BOUMATO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_BouMato_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 80, // mPriority - &daObj_BouMato_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_BOUMATO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_BouMato_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_BOUMATO_e, + /* Actor SubMtd */ &daObj_BouMato_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_brakeeff.cpp b/src/d/actor/d_a_obj_brakeeff.cpp index 4ea698c8e2..1b84e2a3ca 100644 --- a/src/d/actor/d_a_obj_brakeeff.cpp +++ b/src/d/actor/d_a_obj_brakeeff.cpp @@ -236,18 +236,18 @@ actor_method_class l_daObj_Brakeeff_Method = { }; actor_process_profile_definition g_profile_OBJ_BEF = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_BEF, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_brakeeff_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 39, // mPriority - &l_daObj_Brakeeff_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_7_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_BEF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_brakeeff_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_BEF_e, + /* Actor SubMtd */ &l_daObj_Brakeeff_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_7_e, }; diff --git a/src/d/actor/d_a_obj_brg.cpp b/src/d/actor/d_a_obj_brg.cpp index c8dd741ca9..a09f215e89 100644 --- a/src/d/actor/d_a_obj_brg.cpp +++ b/src/d/actor/d_a_obj_brg.cpp @@ -53,11 +53,11 @@ static void ride_call_back(dBgW* i_bgw, fopAc_ac_c* i_bgActor, fopAc_ac_c* i_rid i_rideActor->speed.y = -5.0f; f32 var_f29; - if (fopAcM_GetName(i_rideActor) == PROC_ALINK) { + if (fopAcM_GetName(i_rideActor) == fpcNm_ALINK_e) { var_f29 = 100.0f; br_p->field_0x0e4 = -31.0f; a_this->field_0xb1ef = 5; - } else if (fopAcM_GetName(i_rideActor) == PROC_NPC_KS) { + } else if (fopAcM_GetName(i_rideActor) == fpcNm_NPC_KS_e) { var_f29 = 70.0f; br_p->field_0x0e4 = -20.0f; i_rideActor->speed.y = -20.0f; @@ -1831,18 +1831,18 @@ static actor_method_class l_daObj_Brg_Method = { }; actor_process_profile_definition g_profile_OBJ_BRG = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_BRG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_brg_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 54, // mPriority - &l_daObj_Brg_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_BRG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_brg_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_BRG_e, + /* Actor SubMtd */ &l_daObj_Brg_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_bsGate.cpp b/src/d/actor/d_a_obj_bsGate.cpp index 3092b78e94..694ea3c2ce 100644 --- a/src/d/actor/d_a_obj_bsGate.cpp +++ b/src/d/actor/d_a_obj_bsGate.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_bsGate.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" class daBsGate_HIO_c : public mDoHIO_entry_c { public: @@ -236,18 +236,18 @@ static actor_method_class l_daBsGate_Method = { }; actor_process_profile_definition g_profile_Obj_BsGate = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_BsGate, - &g_fpcLf_Method.base, - sizeof(daBsGate_c), - 0, - 0, - &g_fopAc_Method.base, - 0x206, - &l_daBsGate_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_BsGate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBsGate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_BsGate_e, + /* Actor SubMtd */ &l_daBsGate_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_bubblePilar.cpp b/src/d/actor/d_a_obj_bubblePilar.cpp index 7fcf42ae80..a496f253c3 100644 --- a/src/d/actor/d_a_obj_bubblePilar.cpp +++ b/src/d/actor/d_a_obj_bubblePilar.cpp @@ -227,18 +227,18 @@ static actor_method_class l_daBubbPilar_Method = { }; actor_process_profile_definition g_profile_Obj_awaPlar = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_awaPlar, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daBubbPilar_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 659, // mPriority - &l_daBubbPilar_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_awaPlar_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBubbPilar_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_awaPlar_e, + /* Actor SubMtd */ &l_daBubbPilar_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_burnbox.cpp b/src/d/actor/d_a_obj_burnbox.cpp index b1c3f2a9c7..ebd76121f4 100644 --- a/src/d/actor/d_a_obj_burnbox.cpp +++ b/src/d/actor/d_a_obj_burnbox.cpp @@ -193,18 +193,18 @@ actor_method_class daObjBurnBox_METHODS = { }; actor_process_profile_definition g_profile_Obj_BurnBox = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_BurnBox, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjBurnBox_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 532, // mPriority - &daObjBurnBox_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_BurnBox_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjBurnBox_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_BurnBox_e, + /* Actor SubMtd */ &daObjBurnBox_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_carry.cpp b/src/d/actor/d_a_obj_carry.cpp index ad4748c4ca..a8265f69f6 100644 --- a/src/d/actor/d_a_obj_carry.cpp +++ b/src/d/actor/d_a_obj_carry.cpp @@ -766,7 +766,7 @@ static void TgHitCallBackBokkuri(fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf fopAc_ac_c* i_atActor, dCcD_GObjInf* i_atObjInf) { daObjCarry_c* objCarry = (daObjCarry_c*)i_tgActor; if (objCarry != NULL && i_atActor != NULL && i_atObjInf->ChkAtType(AT_TYPE_SHIELD_ATTACK) && - fopAcM_IsActor(i_atActor) && fopAcM_GetName(i_atActor) == PROC_ALINK) + fopAcM_IsActor(i_atActor) && fopAcM_GetName(i_atActor) == fpcNm_ALINK_e) { objCarry->field_0xd5c = 6000.0f + cM_rndF(2000.0f); objCarry->field_0xd60 = 4000.0f + cM_rndF(1500.0f); @@ -801,7 +801,7 @@ static void* s_swA_sub(void* i_actor, void* i_data) { daObjSwBallA_c* swball = (daObjSwBallA_c*)i_actor; daObjCarry_c* objCarry = (daObjCarry_c*)i_data; - if (fopAcM_IsActor(swball) && fopAcM_GetName(swball) == PROC_Obj_SwBallA && swball != NULL && + if (fopAcM_IsActor(swball) && fopAcM_GetName(swball) == fpcNm_Obj_SwBallA_e && swball != NULL && objCarry != NULL) { if (swball->getSwbit() == objCarry->getSwbit2()) { @@ -817,7 +817,7 @@ static int l_sw_id; static void* s_sw_sub(void* i_actor, void* i_data) { daObjSwBallB_c* swball = (daObjSwBallB_c*)i_actor; - if (fopAcM_IsActor(swball) && fopAcM_GetName(swball) == PROC_Obj_SwBallB && swball != NULL && + if (fopAcM_IsActor(swball) && fopAcM_GetName(swball) == fpcNm_Obj_SwBallB_e && swball != NULL && swball->getID() == l_sw_id) { return i_actor; @@ -829,7 +829,7 @@ static void* s_sw_sub(void* i_actor, void* i_data) { static void* s_setA_sub(void* i_actor, void* i_data) { daTagSetBall_c* tagball = (daTagSetBall_c*)i_actor; - if (fopAcM_IsActor(tagball) && fopAcM_GetName(tagball) == PROC_Tag_SetBall && tagball && + if (fopAcM_IsActor(tagball) && fopAcM_GetName(tagball) == fpcNm_Tag_SetBall_e && tagball && i_data != NULL && tagball->getType() == 0xF) { return i_actor; @@ -841,7 +841,7 @@ static void* s_setA_sub(void* i_actor, void* i_data) { static void* s_setB_sub(void* i_actor, void* i_data) { daTagSetBall_c* tagball = (daTagSetBall_c*)i_actor; - if (fopAcM_IsActor(tagball) && fopAcM_GetName(tagball) == PROC_Tag_SetBall && tagball && + if (fopAcM_IsActor(tagball) && fopAcM_GetName(tagball) == fpcNm_Tag_SetBall_e && tagball && i_data != NULL && tagball->getType() == 0) { return i_actor; @@ -1069,7 +1069,7 @@ int daObjCarry_c::Create() { } if (checkCarryHookshot()) { - fopAcM_OnStatus(this, 0x80000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e); mCyl.SetTgType(mCyl.GetTgType() | 0x4000); } @@ -1238,7 +1238,7 @@ int daObjCarry_c::CreateInit_LightBall() { mSound.init(¤t.pos, 1); if (dComIfGp_roomControl_getStayNo()) { - fopAcM_OnStatus(this, 0x2000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x2000000_e); } mDalkmistInf.mPos = current.pos; @@ -1246,7 +1246,7 @@ int daObjCarry_c::CreateInit_LightBall() { dKy_dalkmist_inf_set(&mDalkmistInf); field_0xe0c = 1; - fopAcM_OnStatus(this, 0x20000); + fopAcM_OnStatus(this, fopAcStts_NOPAUSE_e); mCyl.SetTgSe(9); mCyl.SetTgHitMark(CcG_Tg_UNK_MARK_2); @@ -1766,7 +1766,7 @@ int daObjCarry_c::execute() { mode_init_walk(0); } - if (mpCannonActor != NULL && fopAcM_IsActor(mpCannonActor) && fopAcM_GetProfName(mpCannonActor) == PROC_Obj_Ytaihou) { + if (mpCannonActor != NULL && fopAcM_IsActor(mpCannonActor) && fopAcM_GetProfName(mpCannonActor) == fpcNm_Obj_Ytaihou_e) { mStts.ClrCcMove(); mCyl.SetAtAtp(100); mAcch.SetIronBall(); @@ -1868,9 +1868,9 @@ int daObjCarry_c::execute() { field_0xdec = current.pos; if (fopAcM_checkCarryNow(this)) { - fopAcM_OffStatus(this, 0x400); + fopAcM_OffStatus(this, fopAcStts_FREEZE_e); } else { - fopAcM_OnStatus(this, 0x400); + fopAcM_OnStatus(this, fopAcStts_FREEZE_e); } return 1; @@ -3058,7 +3058,7 @@ void daObjCarry_c::mode_init_fit() { mCyl.OnCoSPrmBit(0x10); cLib_offBit(attention_info.flags, fopAc_AttnFlag_CARRY_e); - fopAcM_OffStatus(this, 0x80000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x80000_e); field_0xda8 = 0; speedF = 0.0f; @@ -3529,7 +3529,7 @@ bool daObjCarry_c::cc_damage_proc_kibako() { if (mAcch.ChkGroundHit()) { u32 params; daObjBurnBox_c::make_prm_burnBox(¶ms, 0); - fopAcM_createChild(PROC_Obj_BurnBox, fopAcM_GetID(this), params, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, &scale, -1, NULL); + fopAcM_createChild(fpcNm_Obj_BurnBox_e, fopAcM_GetID(this), params, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, &scale, -1, NULL); break_obj = true; do_break_eff = false; @@ -3565,7 +3565,7 @@ bool daObjCarry_c::cc_damage_proc_ironball() { if (mAcch.ChkGroundHit() && dComIfG_Bgsp().ChkPolySafe(mAcch.m_gnd) && dComIfG_Bgsp().ChkMoveBG_NoDABg(mAcch.m_gnd) && dComIfG_Bgsp().GetActorPointer(mAcch.m_gnd)) { s16 name = fopAcM_GetName(dComIfG_Bgsp().GetActorPointer(mAcch.m_gnd)); - if (name == PROC_Obj_YIblltray) { + if (name == fpcNm_Obj_YIblltray_e) { var_r27 = false; mStts.ClrCcMove(); } @@ -3602,7 +3602,7 @@ bool daObjCarry_c::cc_damage_proc_taru() { if (mAcch.ChkGroundHit()) { u32 params; daObjBurnBox_c::make_prm_burnBox(¶ms, 2); - fopAcM_createChild(PROC_Obj_BurnBox, fopAcM_GetID(this), params, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, &scale, -1, NULL); + fopAcM_createChild(fpcNm_Obj_BurnBox_e, fopAcM_GetID(this), params, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, &scale, -1, NULL); break_obj = true; do_break_eff = false; @@ -4306,18 +4306,18 @@ static actor_method_class l_daObjCarry_Method = { (process_method_func)daObjCarry_Draw}; actor_process_profile_definition g_profile_Obj_Carry = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Carry, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjCarry_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 244, // mPriority - &l_daObjCarry_Method, // sub_method - 0x40500, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Carry_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCarry_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Carry_e, + /* Actor SubMtd */ &l_daObjCarry_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_FREEZE_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_catdoor.cpp b/src/d/actor/d_a_obj_catdoor.cpp index 8967312fe6..e1f3373e87 100644 --- a/src/d/actor/d_a_obj_catdoor.cpp +++ b/src/d/actor/d_a_obj_catdoor.cpp @@ -182,18 +182,18 @@ static actor_method_class l_daObjCatDoor_Method = { }; actor_process_profile_definition g_profile_Obj_CatDoor = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_CatDoor, // mProcName - &g_fpcLf_Method.base, // mSubMtd - sizeof(daObjCatDoor_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // mSubMtd - 684, // mPriority - &l_daObjCatDoor_Method, // mSubMtd - 0x44100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_CatDoor_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCatDoor_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_CatDoor_e, + /* Actor SubMtd */ &l_daObjCatDoor_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_cb.cpp b/src/d/actor/d_a_obj_cb.cpp index fd96759686..6dc552a3eb 100644 --- a/src/d/actor/d_a_obj_cb.cpp +++ b/src/d/actor/d_a_obj_cb.cpp @@ -234,18 +234,18 @@ static actor_method_class l_daObj_Cb_Method = { }; actor_process_profile_definition g_profile_OBJ_CB = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_CB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_cb_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 49, // mPriority - &l_daObj_Cb_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_CB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_cb_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_CB_e, + /* Actor SubMtd */ &l_daObj_Cb_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_cblock.cpp b/src/d/actor/d_a_obj_cblock.cpp index a6d15f3442..1335e84948 100644 --- a/src/d/actor/d_a_obj_cblock.cpp +++ b/src/d/actor/d_a_obj_cblock.cpp @@ -403,18 +403,18 @@ static actor_method_class l_daObjCBlk_Method = { }; actor_process_profile_definition g_profile_Obj_ChainBlock = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_ChainBlock, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjCBlk_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 597, // mPriority - &l_daObjCBlk_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_ChainBlock_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCBlk_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_ChainBlock_e, + /* Actor SubMtd */ &l_daObjCBlk_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_cboard.cpp b/src/d/actor/d_a_obj_cboard.cpp index a918613f4a..2fb01212bc 100644 --- a/src/d/actor/d_a_obj_cboard.cpp +++ b/src/d/actor/d_a_obj_cboard.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_cboard.h" #include "d/d_bg_w.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" void daObjBoard_c::initBaseMtx() { setBaseMtx(); @@ -157,18 +157,18 @@ static actor_method_class daObjBoard_METHODS = { }; actor_process_profile_definition g_profile_Obj_Cboard = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Cboard, - &g_fpcLf_Method.base, - sizeof(daObjBoard_c), - 0, - 0, - &g_fopAc_Method.base, - 453, - &daObjBoard_METHODS, - 0x40000, - fopAc_CULLBOX_0_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Cboard_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjBoard_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Cboard_e, + /* Actor SubMtd */ &daObjBoard_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_cdoor.cpp b/src/d/actor/d_a_obj_cdoor.cpp index fe483fec3f..d1f539a339 100644 --- a/src/d/actor/d_a_obj_cdoor.cpp +++ b/src/d/actor/d_a_obj_cdoor.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_obj_wchain.h" #include "d/d_camera.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static char* l_arcName[2] = { "Cdoor", @@ -42,7 +42,7 @@ int daObjCdoor_c::CreateHeap() { static void* daObjCdoor_searchChain(fopAc_ac_c* i_actor, void* i_this) { daObjCdoor_c* _this = static_cast(i_this); - if (fopAcM_GetName(i_actor) == PROC_Obj_Wchain) { + if (fopAcM_GetName(i_actor) == fpcNm_Obj_Wchain_e) { daObjWchain_c* chain = static_cast(i_actor); if (chain->getSwitchNum() == _this->getSwitchNum()) { _this->setChainID(fopAcM_GetID(chain)); @@ -297,18 +297,18 @@ static actor_method_class l_daObjCdoor_Method = { }; actor_process_profile_definition g_profile_Obj_Cdoor = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Cdoor, - &g_fpcLf_Method.base, - sizeof(daObjCdoor_c), - 0, - 0, - &g_fopAc_Method.base, - 0xF5, - &l_daObjCdoor_Method, - 0x40100, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Cdoor_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCdoor_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Cdoor_e, + /* Actor SubMtd */ &l_daObjCdoor_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_chandelier.cpp b/src/d/actor/d_a_obj_chandelier.cpp index ff512a87eb..46b1d5b748 100644 --- a/src/d/actor/d_a_obj_chandelier.cpp +++ b/src/d/actor/d_a_obj_chandelier.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_chandelier.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static char* l_arcName = "L9Chand"; @@ -257,18 +257,18 @@ static actor_method_class daObjChandelier_METHODS = { }; actor_process_profile_definition g_profile_Obj_Chandelier = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Chandelier, - &g_fpcLf_Method.base, - sizeof(daObjChandelier_c), - 0, - 0, - &g_fopAc_Method.base, - 0x2E5, - &daObjChandelier_METHODS, - 0x40080, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Chandelier_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjChandelier_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Chandelier_e, + /* Actor SubMtd */ &daObjChandelier_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_chest.cpp b/src/d/actor/d_a_obj_chest.cpp index 1e904f28a0..9d5d222d73 100644 --- a/src/d/actor/d_a_obj_chest.cpp +++ b/src/d/actor/d_a_obj_chest.cpp @@ -12,7 +12,7 @@ #include "d/actor/d_a_player.h" #include "d/d_bg_s.h" #include "d/d_bg_w.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/actor/d_a_obj_eff.h" void daObjChest_c::initBaseMtx() { @@ -249,18 +249,18 @@ static actor_method_class l_daObjChest_Method = { }; actor_process_profile_definition g_profile_Obj_Chest = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Chest, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjChest_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 603, // mPriority - &l_daObjChest_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Chest_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjChest_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Chest_e, + /* Actor SubMtd */ &l_daObjChest_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_cho.cpp b/src/d/actor/d_a_obj_cho.cpp index a6662aa58a..8fbc2dbde8 100644 --- a/src/d/actor/d_a_obj_cho.cpp +++ b/src/d/actor/d_a_obj_cho.cpp @@ -10,7 +10,7 @@ #include "m_Do/m_Do_lib.h" #include "d/d_com_inf_game.h" #include "d/d_menu_insect.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_camera_mng.h" #include @@ -277,7 +277,7 @@ void daObjCHO_c::Insect_Release() { mAction = ACT_MOVE; } -static u8 const l_cho_itemno[2] = {fpcNm_ITEM_M_BUTTERFLY, fpcNm_ITEM_F_BUTTERFLY}; +static u8 const l_cho_itemno[2] = {dItemNo_M_BUTTERFLY_e, dItemNo_F_BUTTERFLY_e}; // Some unused function went here. // This fake function is here in its place to make the literals match @@ -538,7 +538,7 @@ cPhs_Step daObjCHO_c::create() { if (mLocation == LOC_UNK_2) { field_0x56c = 0; shape_angle.x -= 0x2000; - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); mTargetSpeedY = -2.0f; mTimers[1] = 20; mTimers[2] = 100; @@ -607,18 +607,18 @@ static actor_method_class l_daObjCHO_Method = { }; actor_process_profile_definition g_profile_Obj_Cho = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_Cho, - &g_fpcLf_Method.base, - sizeof(daObjCHO_c), - 0, - 0, - &g_fopAc_Method.base, - 0x1DE, - &l_daObjCHO_Method, - 0xC0120, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Cho_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCHO_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Cho_e, + /* Actor SubMtd */ &l_daObjCHO_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_cowdoor.cpp b/src/d/actor/d_a_obj_cowdoor.cpp index fe01cc25ed..56c644b247 100644 --- a/src/d/actor/d_a_obj_cowdoor.cpp +++ b/src/d/actor/d_a_obj_cowdoor.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_cowdoor.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" void daCowdoor_c::setBaseMtx() { mDoMtx_stack_c::transS( current.pos.x, current.pos.y, current.pos.z); @@ -100,18 +100,18 @@ static actor_method_class l_daCowdoor_Method = { }; actor_process_profile_definition g_profile_Obj_Cowdoor = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Cowdoor, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daCowdoor_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 447, // mPriority - &l_daCowdoor_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Cowdoor_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daCowdoor_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Cowdoor_e, + /* Actor SubMtd */ &l_daCowdoor_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_crope.cpp b/src/d/actor/d_a_obj_crope.cpp index 17f9676e98..c28ee05ca3 100644 --- a/src/d/actor/d_a_obj_crope.cpp +++ b/src/d/actor/d_a_obj_crope.cpp @@ -380,18 +380,18 @@ static actor_method_class l_daObjCrope_Method = { }; actor_process_profile_definition g_profile_Obj_Crope = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Crope, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjCrope_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 248, // mPriority - &l_daObjCrope_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Crope_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCrope_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Crope_e, + /* Actor SubMtd */ &l_daObjCrope_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_crvfence.cpp b/src/d/actor/d_a_obj_crvfence.cpp index 675647133c..9712205ea3 100644 --- a/src/d/actor/d_a_obj_crvfence.cpp +++ b/src/d/actor/d_a_obj_crvfence.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_crvfence.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -139,7 +139,7 @@ void daObjCRVFENCE_c::BrokenAction() { field_0x5a0 = 1; break; - + case 1: if (field_0x5ee == 0) { FenceMove(field_0x5ee, &field_0x5dc, &field_0x5e8, &field_0x5d0, field_0x5f0); @@ -162,7 +162,7 @@ void daObjCRVFENCE_c::BrokenAction() { } static void* s_obj_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_searchActorDistance((fopAc_ac_c*)i_data, (fopAc_ac_c*)i_actor) < 600.0f && fopAcM_GetName(i_actor) == PROC_E_WB) { + if (fopAcM_IsActor(i_actor) && fopAcM_searchActorDistance((fopAc_ac_c*)i_data, (fopAc_ac_c*)i_actor) < 600.0f && fopAcM_GetName(i_actor) == fpcNm_E_WB_e) { return i_actor; } @@ -172,10 +172,10 @@ static void* s_obj_sub(void* i_actor, void* i_data) { void daObjCRVFENCE_c::NormalAction() { if (!field_0x5f4) { e_wb_class* wb_p = (e_wb_class*)fpcM_Search(s_obj_sub, this); - if (wb_p != NULL && wb_p->mActionID == ACT_PL_RIDE2) { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); + if (wb_p != NULL && wb_p->action == ACT_PL_RIDE2) { + fopAcM_OffStatus(this, fopAcStts_CULL_e); fopAcM_seStartCurrent(this, Z2SE_OBJ_SAKU_BREAK, 0); - cXyz sp5c(fopAcM_GetPosition(&wb_p->mEnemy)); + cXyz sp5c(fopAcM_GetPosition(&wb_p->enemy)); Mtx mtx; mDoMtx_inverse(field_0x65c->getBaseTRMtx(), mtx); mDoMtx_stack_c::copy(mtx); @@ -275,7 +275,7 @@ void daObjCRVFENCE_c::setBaseMtx() { mDoMtx_stack_c::ZXYrotM(field_0x5c4); mDoMtx_stack_c::scaleM(1.0f, 1.2f, 1.0f); field_0x660->setBaseTRMtx(mDoMtx_stack_c::get()); - + mDoMtx_stack_c::transS(field_0x5d0); mDoMtx_stack_c::YrotM(shape_angle.y); mDoMtx_stack_c::ZXYrotM(field_0x5e8); @@ -424,18 +424,18 @@ static actor_method_class l_daObjCRVFENCE_Method = { }; actor_process_profile_definition g_profile_Obj_CRVFENCE = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_CRVFENCE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjCRVFENCE_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 467, // mPriority - &l_daObjCRVFENCE_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_CRVFENCE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCRVFENCE_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_CRVFENCE_e, + /* Actor SubMtd */ &l_daObjCRVFENCE_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_crvgate.cpp b/src/d/actor/d_a_obj_crvgate.cpp index a69083ff06..f0c24eb22b 100644 --- a/src/d/actor/d_a_obj_crvgate.cpp +++ b/src/d/actor/d_a_obj_crvgate.cpp @@ -133,7 +133,7 @@ void daObjCRVGATE_c::actionWaitEvent() { Z2GetAudioMgr()->seStart(Z2SE_OBJ_CRVN_GATE_OPEN, &mPos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); - fopAcM_OffStatus(this, 0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); } else { if (checkOpen() != 0) { eventInfo.onCondition(4); @@ -344,8 +344,8 @@ void daObjCRVGATE_c::CloseAction() { fopAc_ac_c* hitObj = dCc_GetAc(mSph[i].GetCoHitObj()->GetAc()); fopAc_ac_c* boar_ac; - if (fopAcM_GetName(hitObj) == PROC_E_WB && player->checkBoarRun() != 0 && - fopAcM_SearchByName(PROC_E_WB, &boar_ac) != 0) + if (fopAcM_GetName(hitObj) == fpcNm_E_WB_e && player->checkBoarRun() != 0 && + fopAcM_SearchByName(fpcNm_E_WB_e, &boar_ac) != 0) { cXyz* boar_speed = &fopAcM_GetSpeed(boar_ac); daPy_py_c* player = daPy_getPlayerActorClass(); @@ -419,7 +419,7 @@ void daObjCRVGATE_c::OpenAction() { if (mSph[i].ChkCoHit() != 0) { local_3c++; fopAc_ac_c* hitObj = dCc_GetAc(mSph[i].GetCoHitObj()->GetAc()); - if (fopAcM_GetName(hitObj) == PROC_E_WB) { + if (fopAcM_GetName(hitObj) == fpcNm_E_WB_e) { if (mKeyParam == 0xff) { Z2GetAudioMgr()->seStart(Z2SE_OBJ_CRVN_GATE_BREAK, ¤t.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); @@ -483,7 +483,7 @@ void daObjCRVGATE_c::OpenAction() { if (mSph[i].ChkCoHit() != 0) { local_3c++; fopAc_ac_c* hitObj = dCc_GetAc(mSph[i].GetCoHitObj()->GetAc()); - if (fopAcM_GetName(hitObj) == PROC_E_WB) { + if (fopAcM_GetName(hitObj) == fpcNm_E_WB_e) { daPy_py_c* player = daPy_getPlayerActorClass(); mDoorSwingTargetAngle = mDoorAngle - fopAcM_GetSpeedF(player) * 288.0f; @@ -704,7 +704,7 @@ void daObjCRVGATE_c::SetDoor() { mKeyParam = 0x01; // Create the second (identical) part of the door (swinging gate). - mDoorPairProcID = fopAcM_createChild(PROC_Obj_CRVGATE, fopAcM_GetID(this), 1, &child_pos, + mDoorPairProcID = fopAcM_createChild(fpcNm_Obj_CRVGATE_e, fopAcM_GetID(this), 1, &child_pos, fopAcM_GetRoomNo(this), &child_angle, NULL, -1, 0); mDoorY = shape_angle.y; } else { @@ -834,18 +834,18 @@ static actor_method_class l_daObjCRVGATE_Method = { }; actor_process_profile_definition g_profile_Obj_CRVGATE = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_CRVGATE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjCRVGATE_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 466, // mPriority - &l_daObjCRVGATE_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_CRVGATE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCRVGATE_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_CRVGATE_e, + /* Actor SubMtd */ &l_daObjCRVGATE_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_crvhahen.cpp b/src/d/actor/d_a_obj_crvhahen.cpp index fc5b5ee82b..52d180f547 100644 --- a/src/d/actor/d_a_obj_crvhahen.cpp +++ b/src/d/actor/d_a_obj_crvhahen.cpp @@ -242,18 +242,18 @@ static actor_method_class l_daObjCRVHAHEN_Method = { }; actor_process_profile_definition g_profile_Obj_CRVHAHEN = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_CRVHAHEN, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjCRVHAHEN_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 468, // mPriority - &l_daObjCRVHAHEN_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_CRVHAHEN_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCRVHAHEN_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_CRVHAHEN_e, + /* Actor SubMtd */ &l_daObjCRVHAHEN_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_crvlh_down.cpp b/src/d/actor/d_a_obj_crvlh_down.cpp index bc66b5cf50..94e9f4a0c1 100644 --- a/src/d/actor/d_a_obj_crvlh_down.cpp +++ b/src/d/actor/d_a_obj_crvlh_down.cpp @@ -78,7 +78,7 @@ void daObjCRVLH_DW_c::Break() { dComIfGp_particle_set(dPa_RM(ID_ZF_S_CRVYAGURA03_SAND), ¤t.pos, &tevStr, &shape_angle, 0); dComIfGp_particle_set(dPa_RM(ID_ZF_S_CRVYAGURA04_SMK), ¤t.pos, &tevStr, &shape_angle, 0); dComIfGp_getVibration().StartShock(VIBMODE_S_POWER5, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); - field_0x5a4 = fopAcM_createChild(PROC_Obj_CRVHAHEN, fopAcM_GetID(this), 1, ¤t.pos, + field_0x5a4 = fopAcM_createChild(fpcNm_Obj_CRVHAHEN_e, fopAcM_GetID(this), 1, ¤t.pos, fopAcM_GetRoomNo(this), &cStack_2c, NULL, -1, NULL); if (fopAcM_SearchByID(field_0x5a0, &local_30) && local_30 != NULL) { @@ -96,8 +96,8 @@ void daObjCRVLH_DW_c::Obj_Hit() { if (field_0x5b8 == 0) { if (mCyl.ChkCoHit() != 0) { fopAc_ac_c* actor = mCyl.GetCoHitObj()->GetAc(); - if (fopAcM_GetName(dCc_GetAc(actor)) == PROC_E_WB && - ((e_wb_class*)actor)->mActionID == ACT_PL_RIDE2) + if (fopAcM_GetName(dCc_GetAc(actor)) == fpcNm_E_WB_e && + ((e_wb_class*)actor)->action == ACT_PL_RIDE2) { Break(); } @@ -176,7 +176,7 @@ int daObjCRVLH_DW_c::create() { fopAcM_setCullSizeFar(this, 100.0f); fopAcM_setCullSizeBox(this, -500.0f, -500.0f, -500.0f, 500.0f, 1000.0f, 500.0f); daObjCRVLH_DW_Execute(this); - field_0x5a0 = fopAcM_createChild(PROC_Obj_CRVLH_UP, fopAcM_GetID(this), 1, ¤t.pos, + field_0x5a0 = fopAcM_createChild(fpcNm_Obj_CRVLH_UP_e, fopAcM_GetID(this), 1, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); } @@ -240,18 +240,18 @@ static actor_method_class l_daObjCRVLH_DW_Method = { }; actor_process_profile_definition g_profile_Obj_CRVLH_DW = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_CRVLH_DW, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjCRVLH_DW_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 471, // mPriority - &l_daObjCRVLH_DW_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_CRVLH_DW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCRVLH_DW_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_CRVLH_DW_e, + /* Actor SubMtd */ &l_daObjCRVLH_DW_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_crvlh_up.cpp b/src/d/actor/d_a_obj_crvlh_up.cpp index 3facb4d696..ce796b4150 100644 --- a/src/d/actor/d_a_obj_crvlh_up.cpp +++ b/src/d/actor/d_a_obj_crvlh_up.cpp @@ -54,9 +54,9 @@ void daObjCRVLH_UP_c::Hakai() { mDoMtx_stack_c::multVec(&field_0x5ac[i], &field_0x5ac[i]); } - field_0x5a4 = fopAcM_create(PROC_Obj_CRVHAHEN, 1, &field_0x5ac[0], fopAcM_GetRoomNo(this), + field_0x5a4 = fopAcM_create(fpcNm_Obj_CRVHAHEN_e, 1, &field_0x5ac[0], fopAcM_GetRoomNo(this), &cStack_30, 0, -1); - field_0x5a8 = fopAcM_create(PROC_Obj_CRVHAHEN, 1, &field_0x5ac[1], fopAcM_GetRoomNo(this), + field_0x5a8 = fopAcM_create(fpcNm_Obj_CRVHAHEN_e, 1, &field_0x5ac[1], fopAcM_GetRoomNo(this), &cStack_30, 0, -1); dComIfGp_particle_set(dPa_RM(ID_ZF_S_CRVYAGURA05_SMK), &field_0x5ac[1], &tevStr, &cStack_30, 0); @@ -199,18 +199,18 @@ static actor_method_class l_daObjCRVLH_UP_Method = { }; actor_process_profile_definition g_profile_Obj_CRVLH_UP = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_CRVLH_UP, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjCRVLH_UP_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 470, // mPriority - &l_daObjCRVLH_UP_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_CRVLH_UP_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCRVLH_UP_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_CRVLH_UP_e, + /* Actor SubMtd */ &l_daObjCRVLH_UP_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_crvsteel.cpp b/src/d/actor/d_a_obj_crvsteel.cpp index 5e5e4216a5..0dc774ef12 100644 --- a/src/d/actor/d_a_obj_crvsteel.cpp +++ b/src/d/actor/d_a_obj_crvsteel.cpp @@ -149,18 +149,18 @@ static actor_method_class l_daObjCRVSTEEL_Method = { }; actor_process_profile_definition g_profile_Obj_CRVSTEEL = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_CRVSTEEL, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjCRVSTEEL_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 469, // mPriority - &l_daObjCRVSTEEL_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_CRVSTEEL_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCRVSTEEL_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_CRVSTEEL_e, + /* Actor SubMtd */ &l_daObjCRVSTEEL_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_crystal.cpp b/src/d/actor/d_a_obj_crystal.cpp index 0c490dca02..f3d43478d1 100644 --- a/src/d/actor/d_a_obj_crystal.cpp +++ b/src/d/actor/d_a_obj_crystal.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_crystal.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include static int CheckCreateHeap(fopAc_ac_c* i_this) { @@ -138,18 +138,18 @@ static actor_method_class l_daObjCrystal_Method = { }; actor_process_profile_definition g_profile_Obj_Crystal = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_Crystal, - &g_fpcLf_Method.base, - sizeof(daObjCrystal_c), - 0, - 0, - &g_fopAc_Method.base, - 579, - &l_daObjCrystal_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Crystal_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCrystal_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Crystal_e, + /* Actor SubMtd */ &l_daObjCrystal_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_cwall.cpp b/src/d/actor/d_a_obj_cwall.cpp index 7f53d23c05..0b6367505f 100644 --- a/src/d/actor/d_a_obj_cwall.cpp +++ b/src/d/actor/d_a_obj_cwall.cpp @@ -835,20 +835,20 @@ static actor_method_class daObjCwall_METHODS = { }; actor_process_profile_definition g_profile_Obj_ChainWall = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_ChainWall, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjCwall_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 598, // mPriority - &daObjCwall_METHODS, // sub_method - 0x000C0000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_ChainWall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCwall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_ChainWall_e, + /* Actor SubMtd */ &daObjCwall_METHODS, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_obj_damCps.cpp b/src/d/actor/d_a_obj_damCps.cpp index 65b5036b39..5e234a7342 100644 --- a/src/d/actor/d_a_obj_damCps.cpp +++ b/src/d/actor/d_a_obj_damCps.cpp @@ -201,22 +201,22 @@ static actor_method_class l_daObjDamCps_Method = { #endif actor_process_profile_definition g_profile_Obj_DamCps = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_DamCps, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjDamCps_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 629, // mPriority + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_DamCps_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjDamCps_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ fpcDwPi_Obj_DamCps_e, #if DEBUG - &l_daObjDamCps_Method, // sub_method + /* Actor SubMtd */ &l_daObjDamCps_Method, #else - NULL, // sub_method + /* Actor SubMtd */ NULL, #endif - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_dan.cpp b/src/d/actor/d_a_obj_dan.cpp index 2303659997..cc176b9a20 100644 --- a/src/d/actor/d_a_obj_dan.cpp +++ b/src/d/actor/d_a_obj_dan.cpp @@ -10,7 +10,7 @@ #include "m_Do/m_Do_lib.h" #include "d/d_com_inf_game.h" #include "d/d_menu_insect.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_camera_mng.h" #include @@ -261,7 +261,7 @@ void daObjDAN_c::Insect_Release() { mAction = ACT_MOVE; } -static u8 const l_dan_itemno[2] = {fpcNm_ITEM_M_DANGOMUSHI, fpcNm_ITEM_F_DANGOMUSHI}; +static u8 const l_dan_itemno[2] = {dItemNo_M_DANGOMUSHI_e, dItemNo_F_DANGOMUSHI_e}; void daObjDAN_c::Z_BufferChk() { cXyz vec2, vec1; @@ -515,7 +515,7 @@ cPhs_Step daObjDAN_c::create() { if (mLocation == LOC_UNK_2) { field_0x56c = 0; shape_angle.x -= 0x2000; - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } else { mDraw = true; } @@ -603,18 +603,18 @@ static actor_method_class l_daObjDAN_Method = { }; actor_process_profile_definition g_profile_Obj_Dan = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_Dan, - &g_fpcLf_Method.base, - sizeof(daObjDAN_c), - 0, - 0, - &g_fopAc_Method.base, - 0x1E1, - &l_daObjDAN_Method, - 0xC0120, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Dan_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjDAN_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Dan_e, + /* Actor SubMtd */ &l_daObjDAN_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_digholl.cpp b/src/d/actor/d_a_obj_digholl.cpp index d9fa7f3528..b9bfcdca8a 100644 --- a/src/d/actor/d_a_obj_digholl.cpp +++ b/src/d/actor/d_a_obj_digholl.cpp @@ -102,18 +102,18 @@ static actor_method_class l_daObjDigholl_Method = { }; actor_process_profile_definition g_profile_Obj_Digholl = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Digholl, - &g_fpcLf_Method.base, - sizeof(daObjDigholl_c), - 0, - 0, - &g_fopAc_Method.base, - 249, - &l_daObjDigholl_Method, - 0x44100, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Digholl_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjDigholl_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Digholl_e, + /* Actor SubMtd */ &l_daObjDigholl_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_digplace.cpp b/src/d/actor/d_a_obj_digplace.cpp index 8e3eee9fe3..16fa438012 100644 --- a/src/d/actor/d_a_obj_digplace.cpp +++ b/src/d/actor/d_a_obj_digplace.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_digplace.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" int daObjDigpl_c::create() { fopAcM_ct(this, daObjDigpl_c); @@ -17,7 +17,7 @@ int daObjDigpl_c::create() { mSwitch = fopAcM_GetParam(this) & 0xFF; if (mType == 5) { - fopAcM_OffStatus(this, 0x80); + fopAcM_OffStatus(this, fopAcStts_NOEXEC_e); mpDigPoints = dPath_GetRoomPath((fopAcM_GetParam(this) >> 0x14) & 0xFF, fopAcM_GetRoomNo(this)); } @@ -176,18 +176,18 @@ static actor_method_class l_daObjDigpl_Method = { }; actor_process_profile_definition g_profile_Obj_Digpl = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Digpl, - &g_fpcLf_Method.base, - sizeof(daObjDigpl_c), - 0, - 0, - &g_fopAc_Method.base, - 250, - &l_daObjDigpl_Method, - 0x44080, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Digpl_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjDigpl_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Digpl_e, + /* Actor SubMtd */ &l_daObjDigpl_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_digsnow.cpp b/src/d/actor/d_a_obj_digsnow.cpp index 0357ac1dbc..6da13dd5c9 100644 --- a/src/d/actor/d_a_obj_digsnow.cpp +++ b/src/d/actor/d_a_obj_digsnow.cpp @@ -180,18 +180,18 @@ static actor_method_class daObjDigSnow_METHODS = { }; actor_process_profile_definition g_profile_Obj_DigSnow = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_DigSnow, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjDigSnow_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 634, // mPriority - &daObjDigSnow_METHODS, // sub_method - 0x44100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_DigSnow_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjDigSnow_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_DigSnow_e, + /* Actor SubMtd */ &daObjDigSnow_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_dmelevator.cpp b/src/d/actor/d_a_obj_dmelevator.cpp index d478fcf88a..58f863203c 100644 --- a/src/d/actor/d_a_obj_dmelevator.cpp +++ b/src/d/actor/d_a_obj_dmelevator.cpp @@ -506,7 +506,7 @@ void daObjDmElevator_c::actionEvent() { } void daObjDmElevator_c::actionStartEvent() { - if ( fopAcM_CheckStatus(this, 0x1000) != 0) { + if ( fopAcM_CheckStatus(this, fopAcStts_STAFF_SHUTTER_e) != 0) { demoProc(); } else { mAction = 0; @@ -682,20 +682,20 @@ static actor_method_class daObjDmElevator_METHODS = { }; actor_process_profile_definition g_profile_Obj_Elevator = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Elevator, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjDmElevator_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 542, // mPriority - &daObjDmElevator_METHODS, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Elevator_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjDmElevator_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Elevator_e, + /* Actor SubMtd */ &daObjDmElevator_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_obj_drop.cpp b/src/d/actor/d_a_obj_drop.cpp index 0e4c0796c7..64fc1f537d 100644 --- a/src/d/actor/d_a_obj_drop.cpp +++ b/src/d/actor/d_a_obj_drop.cpp @@ -29,13 +29,13 @@ static void* searchParentSub(void* pproc, void* pdata) { fopAc_ac_c* pym = (fopAc_ac_c*)pproc; if (pym != NULL && fopAcM_IsActor(pym)) { - if (fopAcM_GetProfName(pym) == PROC_E_YM) { + if (fopAcM_GetProfName(pym) == fpcNm_E_YM_e) { u8 swbit = ((daE_YM_c*)pym)->getSwitchBit(); if (swbit != 0xFF && swbit == pdrop->getYmSwbit()) { pdrop->field_0x6b7 = 1; return pym; } - } else if (fopAcM_GetProfName(pym) == PROC_E_YMB) { + } else if (fopAcM_GetProfName(pym) == fpcNm_E_YMB_e) { u8 swbit = ((daE_YMB_c*)pym)->getSwitchBit(); if (swbit != 0xFF && swbit == pdrop->getYmSwbit()) { pdrop->field_0x6b7 = 2; @@ -111,7 +111,7 @@ void daObjDrop_c::dropGet() { s8 area = dComIfGp_getStartStageDarkArea(); // "Drop of Light No%d<%d/%d> Get Area<%d>!\n" OS_REPORT("光の雫No%d<%d/%d>ゲットArea<%d>！\n", getSave(), num + 1, need_num, area); - execItemGet(fpcNm_ITEM_HEART); + execItemGet(dItemNo_HEART_e); mSetCollectDrop = false; } } @@ -231,12 +231,12 @@ int daObjDrop_c::modeNoParent() { int daObjDrop_c::modeParentWait() { fopAc_ac_c* pparent = fopAcM_SearchByID(parentActorID); if (pparent != NULL) { - if (fopAcM_GetProfName(pparent) == PROC_E_YM) { + if (fopAcM_GetProfName(pparent) == fpcNm_E_YM_e) { current.pos = pparent->current.pos; return 1; } - if (fopAcM_GetProfName(pparent) == PROC_E_YMB && !mAppear) { + if (fopAcM_GetProfName(pparent) == fpcNm_E_YMB_e && !mAppear) { return 1; } } @@ -489,7 +489,7 @@ int daObjDrop_c::actionCompleateDemo() { u8 need_num = dComIfGp_getNeedLightDropNum(); u8 num = dComIfGs_getLightDropNum(dComIfGp_getStartStageDarkArea()); if (need_num == num) { - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); dComIfGs_onSaveSwitch(13); } } else if (timer == 1) { @@ -585,18 +585,18 @@ static actor_method_class l_daObjDrop_Method = { }; actor_process_profile_definition g_profile_Obj_Drop = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Drop, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjDrop_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 243, // mPriority - &l_daObjDrop_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Drop_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjDrop_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Drop_e, + /* Actor SubMtd */ &l_daObjDrop_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_dust.cpp b/src/d/actor/d_a_obj_dust.cpp index 58429b9774..bd851109fd 100644 --- a/src/d/actor/d_a_obj_dust.cpp +++ b/src/d/actor/d_a_obj_dust.cpp @@ -195,7 +195,7 @@ int daObjDust_c::Execute(Mtx** i_mtx) { cXyz& player_pos = fopAcM_GetPosition(player); cXyz& player_speed = fopAcM_GetSpeed(player); - if (fopAcM_SearchByName(PROC_E_YMB, &e_ymb) && e_ymb != NULL) { + if (fopAcM_SearchByName(fpcNm_E_YMB_e, &e_ymb) && e_ymb != NULL) { e_ymb_Pos = &fopAcM_GetPosition(e_ymb); } @@ -253,18 +253,18 @@ static actor_method_class l_daObjDust_Method = { actor_process_profile_definition g_profile_Obj_DUST = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_DUST, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjDust_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 473, // mPriority - &l_daObjDust_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType - }; + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_DUST_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjDust_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_DUST_e, + /* Actor SubMtd */ &l_daObjDust_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/src/d/actor/d_a_obj_eff.cpp b/src/d/actor/d_a_obj_eff.cpp index 8284980e8f..21c34b7eb2 100644 --- a/src/d/actor/d_a_obj_eff.cpp +++ b/src/d/actor/d_a_obj_eff.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_eff.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" int daObjEff::Act_c::_create() { @@ -56,18 +56,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjEff actor_process_profile_definition g_profile_Obj_Eff = { - fpcLy_CURRENT_e, - 9, - fpcPi_CURRENT_e, - PROC_Obj_Eff, - &g_fpcLf_Method.base, - sizeof(daObjEff::Act_c), - 0, - 0, - &g_fopAc_Method.base, - 267, - &daObjEff::Mthd_Table, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 9, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Eff_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjEff::Act_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Eff_e, + /* Actor SubMtd */ &daObjEff::Mthd_Table, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_enemy_create.cpp b/src/d/actor/d_a_obj_enemy_create.cpp index e99e624b3e..c5ff0c52e7 100644 --- a/src/d/actor/d_a_obj_enemy_create.cpp +++ b/src/d/actor/d_a_obj_enemy_create.cpp @@ -159,34 +159,34 @@ void daObjE_CREATE_c::NameChk() { case ENEMY_NONE: break; case ENEMY_KEESE: - mEnemyProcName = PROC_E_BA; + mEnemyProcName = fpcNm_E_BA_e; break; case ENEMY_RAT: - mEnemyProcName = PROC_E_MS; + mEnemyProcName = fpcNm_E_MS_e; break; case ENEMY_CHU: - mEnemyProcName = PROC_E_SM2; + mEnemyProcName = fpcNm_E_SM2_e; mEnemyParams = 0xFFFFFF1F; break; case ENEMY_CHU2: - mEnemyProcName = PROC_E_SM2; + mEnemyProcName = fpcNm_E_SM2_e; mEnemyParams = 0xFFFFFF3F; break; case ENEMY_BABY_GOHMA: - mEnemyProcName = PROC_E_GM; + mEnemyProcName = fpcNm_E_GM_e; mEnemyParams = 0x000AFF02; break; case ENEMY_BUBBLE: - mEnemyProcName = PROC_E_BU; + mEnemyProcName = fpcNm_E_BU_e; break; case ENEMY_BOKOBLIN: - mEnemyProcName = PROC_E_OC; + mEnemyProcName = fpcNm_E_OC_e; break; case ENEMY_LIZALFOS: - mEnemyProcName = PROC_E_DN; + mEnemyProcName = fpcNm_E_DN_e; break; case ENEMY_SHADOW_BEAST: - mEnemyProcName = PROC_E_S1; + mEnemyProcName = fpcNm_E_S1_e; if (mEnemyNum == 1) { mEnemyParams = 0xFFFFFEF0; @@ -195,15 +195,15 @@ void daObjE_CREATE_c::NameChk() { } break; case ENEMY_SHADOW_VERMIN: - mEnemyProcName = PROC_E_YG; + mEnemyProcName = fpcNm_E_YG_e; mEnemyParams = 0xFFFFFF00; break; case ENEMY_SHADOW_KEESE: - mEnemyProcName = PROC_E_YK; + mEnemyProcName = fpcNm_E_YK_e; mEnemyParams = 0xFFFFFF01; break; case ENEMY_BOKOBLIN2: - mEnemyProcName = PROC_E_OC; + mEnemyProcName = fpcNm_E_OC_e; mEnemyParams = 0xFFFF01FF; mEnemyAngle.set(0x100, shape_angle.y, shape_angle.z); break; @@ -254,18 +254,18 @@ static actor_method_class l_daObjE_CREATE_Method = { }; actor_process_profile_definition g_profile_Obj_E_CREATE = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_E_CREATE, - &g_fpcLf_Method.base, - sizeof(daObjE_CREATE_c), - 0, - 0, - &g_fopAc_Method.base, - 458, - &l_daObjE_CREATE_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_E_CREATE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjE_CREATE_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_E_CREATE_e, + /* Actor SubMtd */ &l_daObjE_CREATE_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_fallobj.cpp b/src/d/actor/d_a_obj_fallobj.cpp index f386a649cc..e310a7925f 100644 --- a/src/d/actor/d_a_obj_fallobj.cpp +++ b/src/d/actor/d_a_obj_fallobj.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_player.h" #include "d/d_bg_w.h" #include "d/d_debug_viewer.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_s_play.h" @@ -66,7 +66,7 @@ int daObjFallObj_c::Create() { cXyz acStack_30(0.0f, -300.0f, 0.0f); u32 params = uVar1 | (getTime() << 8); mChildId = fopAcM_createChildFromOffset( - PROC_Obj_FallObj, fopAcM_GetID(this), params, &acStack_30, fopAcM_GetRoomNo(this), &shape_angle, + fpcNm_Obj_FallObj_e, fopAcM_GetID(this), params, &acStack_30, fopAcM_GetRoomNo(this), &shape_angle, &scale, -1, 0); } else { mChildId = fpcM_ERROR_PROCESS_ID_e; @@ -449,18 +449,18 @@ static actor_method_class daObjFallObj_METHODS = { }; actor_process_profile_definition g_profile_Obj_FallObj = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_FallObj, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjFallObj_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 552, // mPriority - &daObjFallObj_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_FallObj_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjFallObj_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_FallObj_e, + /* Actor SubMtd */ &daObjFallObj_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_fan.cpp b/src/d/actor/d_a_obj_fan.cpp index 981b429fff..bf221bd8aa 100644 --- a/src/d/actor/d_a_obj_fan.cpp +++ b/src/d/actor/d_a_obj_fan.cpp @@ -336,18 +336,18 @@ static actor_method_class daObjFan_METHODS = { }; actor_process_profile_definition g_profile_Obj_Fan = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Fan, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjFan_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 0x235, // mPriority - &daObjFan_METHODS, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Fan_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjFan_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Fan_e, + /* Actor SubMtd */ &daObjFan_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_fchain.cpp b/src/d/actor/d_a_obj_fchain.cpp index 0b0ff0abbd..7352c0657c 100644 --- a/src/d/actor/d_a_obj_fchain.cpp +++ b/src/d/actor/d_a_obj_fchain.cpp @@ -311,18 +311,18 @@ static actor_method_class l_daObjFchain_Method = { }; actor_process_profile_definition g_profile_Obj_Fchain = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Fchain, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjFchain_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 246, // mPriority - &l_daObjFchain_Method, // sub_method - 0x00060000, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Fchain_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjFchain_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Fchain_e, + /* Actor SubMtd */ &l_daObjFchain_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_fireWood.cpp b/src/d/actor/d_a_obj_fireWood.cpp index 7fe9d9c9fa..dd314ed908 100644 --- a/src/d/actor/d_a_obj_fireWood.cpp +++ b/src/d/actor/d_a_obj_fireWood.cpp @@ -191,18 +191,18 @@ static actor_method_class l_daFireWood_Method = { }; actor_process_profile_definition g_profile_Obj_FireWood = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_FireWood, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daFireWood_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 506, // mPriority - &l_daFireWood_Method, // sub_method - 0x00060000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_FireWood_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daFireWood_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_FireWood_e, + /* Actor SubMtd */ &l_daFireWood_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_fireWood2.cpp b/src/d/actor/d_a_obj_fireWood2.cpp index a1d04e396e..1bcc04777b 100644 --- a/src/d/actor/d_a_obj_fireWood2.cpp +++ b/src/d/actor/d_a_obj_fireWood2.cpp @@ -275,18 +275,18 @@ static actor_method_class l_daFireWood2_Method = { }; actor_process_profile_definition g_profile_Obj_FireWood2 = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv1Cdl00, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daFireWood2_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 494, // mPriority - &l_daFireWood2_Method, // sub_method - 0x00060000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv1Cdl00_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daFireWood2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv1Cdl00_e, + /* Actor SubMtd */ &l_daFireWood2_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_firepillar.cpp b/src/d/actor/d_a_obj_firepillar.cpp index 6e84d02107..986762a1fe 100644 --- a/src/d/actor/d_a_obj_firepillar.cpp +++ b/src/d/actor/d_a_obj_firepillar.cpp @@ -222,18 +222,18 @@ static actor_method_class l_daObjFPillar_Method = { }; actor_process_profile_definition g_profile_Obj_FirePillar = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_FirePillar, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjFPillar_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 446, // mPriority - &l_daObjFPillar_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_FirePillar_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjFPillar_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_FirePillar_e, + /* Actor SubMtd */ &l_daObjFPillar_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_firepillar2.cpp b/src/d/actor/d_a_obj_firepillar2.cpp index 1af70c33c3..150f3fc4eb 100644 --- a/src/d/actor/d_a_obj_firepillar2.cpp +++ b/src/d/actor/d_a_obj_firepillar2.cpp @@ -504,18 +504,18 @@ static actor_method_class l_daObjFPillar2_Method = { }; actor_process_profile_definition g_profile_Obj_FirePillar2 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_FirePillar2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjFPillar2_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 529, // mPriority - &l_daObjFPillar2_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_FirePillar2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjFPillar2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_FirePillar2_e, + /* Actor SubMtd */ &l_daObjFPillar2_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_flag.cpp b/src/d/actor/d_a_obj_flag.cpp index b929854067..9e4d238fed 100644 --- a/src/d/actor/d_a_obj_flag.cpp +++ b/src/d/actor/d_a_obj_flag.cpp @@ -306,18 +306,18 @@ static actor_method_class l_daObjFlag_Method = { }; actor_process_profile_definition g_profile_Obj_Flag = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Flag, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjFlag_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 26, // mPriority - &l_daObjFlag_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Flag_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjFlag_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Flag_e, + /* Actor SubMtd */ &l_daObjFlag_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_flag2.cpp b/src/d/actor/d_a_obj_flag2.cpp index 8eb95c1302..b4f89cd39a 100644 --- a/src/d/actor/d_a_obj_flag2.cpp +++ b/src/d/actor/d_a_obj_flag2.cpp @@ -507,18 +507,18 @@ static actor_method_class l_daObjFlag2_Method = { }; actor_process_profile_definition g_profile_Obj_Flag2 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Flag2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjFlag2_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 27, // mPriority - &l_daObjFlag2_Method, // sub_method - 0x00044180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Flag2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjFlag2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Flag2_e, + /* Actor SubMtd */ &l_daObjFlag2_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_flag3.cpp b/src/d/actor/d_a_obj_flag3.cpp index c4431e388b..7337a4b97d 100644 --- a/src/d/actor/d_a_obj_flag3.cpp +++ b/src/d/actor/d_a_obj_flag3.cpp @@ -512,18 +512,18 @@ static actor_method_class l_daObjFlag3_Method = { }; actor_process_profile_definition g_profile_Obj_Flag3 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Flag3, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjFlag3_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 28, // mPriority - &l_daObjFlag3_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Flag3_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjFlag3_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Flag3_e, + /* Actor SubMtd */ &l_daObjFlag3_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_fmobj.cpp b/src/d/actor/d_a_obj_fmobj.cpp index 061032544d..3b0f3b9ecc 100644 --- a/src/d/actor/d_a_obj_fmobj.cpp +++ b/src/d/actor/d_a_obj_fmobj.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_fmobj.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_s_play.h" #include "SSystem/SComponent/c_math.h" #include "f_op/f_op_actor_mng.h" @@ -119,18 +119,18 @@ static actor_method_class l_daObj_Fmobj_Method = { }; actor_process_profile_definition g_profile_OBJ_FMOBJ = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_OBJ_FMOBJ, - &g_fpcLf_Method.base, - sizeof(obj_fmobj_class), - 0, - 0, - &g_fopAc_Method.base, - 40, - &l_daObj_Fmobj_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_7_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_FMOBJ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_fmobj_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_FMOBJ_e, + /* Actor SubMtd */ &l_daObj_Fmobj_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_7_e, }; diff --git a/src/d/actor/d_a_obj_food.cpp b/src/d/actor/d_a_obj_food.cpp index 54e30faf14..bbc9ac14b6 100644 --- a/src/d/actor/d_a_obj_food.cpp +++ b/src/d/actor/d_a_obj_food.cpp @@ -12,7 +12,7 @@ #include "d/d_cc_uty.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static bool hio_set; @@ -502,18 +502,18 @@ static actor_method_class l_daObj_Food_Method = { }; actor_process_profile_definition g_profile_OBJ_FOOD = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_OBJ_FOOD, - &g_fpcLf_Method.base, - sizeof(obj_food_class), - 0, - 0, - &g_fopAc_Method.base, - 0x2C8, - &l_daObj_Food_Method, - 0x44100, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_FOOD_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_food_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_FOOD_e, + /* Actor SubMtd */ &l_daObj_Food_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_fw.cpp b/src/d/actor/d_a_obj_fw.cpp index d4717e7706..9ea82fe945 100644 --- a/src/d/actor/d_a_obj_fw.cpp +++ b/src/d/actor/d_a_obj_fw.cpp @@ -34,7 +34,7 @@ static u8 hio_set; static daObj_Fw_HIO_c l_HIO; static void ride_call_back(dBgW* i_bgw, fopAc_ac_c* a_this, fopAc_ac_c* param_3) { - if (fopAcM_GetName(param_3) == PROC_ALINK) { + if (fopAcM_GetName(param_3) == fpcNm_ALINK_e) { obj_fw_class* i_this = (obj_fw_class*)a_this; if (i_this->field_0x592 == 0) { @@ -306,18 +306,18 @@ static actor_method_class l_daObj_Fw_Method = { }; actor_process_profile_definition g_profile_OBJ_FW = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_FW, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_fw_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 42, // mPriority - &l_daObj_Fw_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_FW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_fw_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_FW_e, + /* Actor SubMtd */ &l_daObj_Fw_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_gadget.cpp b/src/d/actor/d_a_obj_gadget.cpp index 73bcda8a77..1a7c4fed05 100644 --- a/src/d/actor/d_a_obj_gadget.cpp +++ b/src/d/actor/d_a_obj_gadget.cpp @@ -610,18 +610,18 @@ static actor_method_class daObj_Gadget_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_GADGET = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_GADGET, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_Gadget_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 82, // mPriority - &daObj_Gadget_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_GADGET_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Gadget_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_GADGET_e, + /* Actor SubMtd */ &daObj_Gadget_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ganonwall.cpp b/src/d/actor/d_a_obj_ganonwall.cpp index 450e9e6297..f395713d33 100644 --- a/src/d/actor/d_a_obj_ganonwall.cpp +++ b/src/d/actor/d_a_obj_ganonwall.cpp @@ -189,18 +189,18 @@ static actor_method_class l_daObjGWall_Method = { }; actor_process_profile_definition g_profile_Obj_GanonWall = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_GanonWall, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjGWall_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 570, // mPriority - &l_daObjGWall_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_GanonWall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjGWall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_GanonWall_e, + /* Actor SubMtd */ &l_daObjGWall_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ganonwall2.cpp b/src/d/actor/d_a_obj_ganonwall2.cpp index bdfd644875..187210687f 100644 --- a/src/d/actor/d_a_obj_ganonwall2.cpp +++ b/src/d/actor/d_a_obj_ganonwall2.cpp @@ -175,18 +175,18 @@ static actor_method_class daObjGWall2_METHODS = { }; actor_process_profile_definition g_profile_Obj_GanonWall2 = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_GanonWall2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjGWall2_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 580, // mPriority - &daObjGWall2_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_GanonWall2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjGWall2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_GanonWall2_e, + /* Actor SubMtd */ &daObjGWall2_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_gb.cpp b/src/d/actor/d_a_obj_gb.cpp index df923bf76b..2cf002cd65 100644 --- a/src/d/actor/d_a_obj_gb.cpp +++ b/src/d/actor/d_a_obj_gb.cpp @@ -238,18 +238,18 @@ static actor_method_class l_daObj_Gb_Method = { }; actor_process_profile_definition g_profile_OBJ_GB = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_GB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_gb_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 56, // mPriority - &l_daObj_Gb_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_GB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_gb_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_GB_e, + /* Actor SubMtd */ &l_daObj_Gb_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_geyser.cpp b/src/d/actor/d_a_obj_geyser.cpp index 465ce1807a..0f34360a33 100644 --- a/src/d/actor/d_a_obj_geyser.cpp +++ b/src/d/actor/d_a_obj_geyser.cpp @@ -690,18 +690,18 @@ static actor_method_class daObjGeyser_METHODS = { }; actor_process_profile_definition g_profile_Obj_Geyser = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Geyser, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjGeyser_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 596, // mPriority - &daObjGeyser_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Geyser_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjGeyser_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Geyser_e, + /* Actor SubMtd */ &daObjGeyser_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_glowSphere.cpp b/src/d/actor/d_a_obj_glowSphere.cpp index 045d5ec784..b60a1c9aa0 100644 --- a/src/d/actor/d_a_obj_glowSphere.cpp +++ b/src/d/actor/d_a_obj_glowSphere.cpp @@ -463,20 +463,20 @@ static actor_method_class l_daGlwSph_Method = { }; actor_process_profile_definition g_profile_Obj_glowSphere = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_glowSphere, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daGlwSph_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 651, // mPriority - &l_daGlwSph_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_glowSphere_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daGlwSph_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_glowSphere_e, + /* Actor SubMtd */ &l_daGlwSph_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_obj_gm.cpp b/src/d/actor/d_a_obj_gm.cpp index 1b334ac4b3..89419b1e49 100644 --- a/src/d/actor/d_a_obj_gm.cpp +++ b/src/d/actor/d_a_obj_gm.cpp @@ -508,7 +508,7 @@ static void action(obj_gm_class* i_this) { } fopAc_ac_c* actor_p = dCc_GetAc(i_this->mSph.GetTgHitObj()->GetAc()); - if (actor_p != NULL && fopAcM_GetName(actor_p) == PROC_OBJ_GM) { + if (actor_p != NULL && fopAcM_GetName(actor_p) == fpcNm_OBJ_GM_e) { i_this->field_0xae4 |= 2; } } @@ -518,7 +518,7 @@ static void action(obj_gm_class* i_this) { } static void* s_tbox_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_TBOX) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_TBOX_e) { f32 fVar1 = ((fopAc_ac_c*)i_actor)->current.pos.x - ((fopAc_ac_c*)i_data)->current.pos.x; f32 fVar2 = ((fopAc_ac_c*)i_actor)->current.pos.z - ((fopAc_ac_c*)i_data)->current.pos.z; if (fVar1 * fVar1 + fVar2 * fVar2 < 40000.0f) { @@ -530,7 +530,7 @@ static void* s_tbox_sub(void* i_actor, void* i_data) { } static void* s_so_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_SO) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_SO_e) { return i_actor; } @@ -575,7 +575,7 @@ static int daObj_Gm_Execute(obj_gm_class* i_this) { i_this->mSound.startCreatureSound(JA_SE_OBJ_BREAK_CHINA_S, 0, -1); if ((fopAcM_GetParam(a_this) & 0xFF) == 32) { - fopAcM_createItemForMidBoss(&a_this->current.pos, fpcNm_ITEM_SMALL_KEY, fopAcM_GetRoomNo(a_this), NULL, NULL, 0, fopAcM_GetParam(a_this) >> 24); + fopAcM_createItemForMidBoss(&a_this->current.pos, dItemNo_SMALL_KEY_e, fopAcM_GetRoomNo(a_this), NULL, NULL, 0, fopAcM_GetParam(a_this) >> 24); } } else if (i_this->mType == 1) { daObj::make_eff_break_gm_ootubo(a_this); @@ -705,11 +705,11 @@ static cPhs_Step daObj_Gm_Create(fopAc_ac_c* a_this) { daObj_Gm_Execute(i_this); - fopAcM_createChild(PROC_OBJ_ITO, fopAcM_GetID(a_this), i_this->mType << 1, &a_this->current.pos, + fopAcM_createChild(fpcNm_OBJ_ITO_e, fopAcM_GetID(a_this), i_this->mType << 1, &a_this->current.pos, fopAcM_GetRoomNo(a_this), &a_this->current.angle, NULL, -1, NULL); if (i_this->field_0x571 == 1) { - fopAcM_createChild(PROC_OBJ_ITO, fopAcM_GetID(a_this), (i_this->mType << 1) | 1, &a_this->current.pos, + fopAcM_createChild(fpcNm_OBJ_ITO_e, fopAcM_GetID(a_this), (i_this->mType << 1) | 1, &a_this->current.pos, fopAcM_GetRoomNo(a_this), &a_this->current.angle, NULL, -1, NULL); } else { a_this->current.angle.x = 0; @@ -728,18 +728,18 @@ static actor_method_class l_daObj_Gm_Method = { }; actor_process_profile_definition g_profile_OBJ_GM = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_GM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_gm_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 57, // mPriority - &l_daObj_Gm_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_GM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_gm_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_GM_e, + /* Actor SubMtd */ &l_daObj_Gm_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_goGate.cpp b/src/d/actor/d_a_obj_goGate.cpp index f8b85aded1..fc0fef5ba5 100644 --- a/src/d/actor/d_a_obj_goGate.cpp +++ b/src/d/actor/d_a_obj_goGate.cpp @@ -177,18 +177,18 @@ static actor_method_class l_daGoGate_Method = { }; actor_process_profile_definition g_profile_Obj_GoGate = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_GoGate, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daGoGate_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 504, // mPriority - &l_daGoGate_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_GoGate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daGoGate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_GoGate_e, + /* Actor SubMtd */ &l_daGoGate_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_gomikabe.cpp b/src/d/actor/d_a_obj_gomikabe.cpp index c274b737cf..66963f0efd 100644 --- a/src/d/actor/d_a_obj_gomikabe.cpp +++ b/src/d/actor/d_a_obj_gomikabe.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_gomikabe.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -123,7 +123,7 @@ void daObjGOMIKABE_c::BreakSet() { field_0x5a2++; mAction++; Z2GetAudioMgr()->seStart(Z2SE_OBJ_G_KABE_BRK, ¤t.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); if (mpBgW != NULL && mpBgW->ChkUsed()) { dComIfG_Bgsp().Release(mpBgW); } @@ -135,7 +135,7 @@ void daObjGOMIKABE_c::getWaterStream(cXyz& param_1, cXyz& param_2, f32 i_scale) int local_58 = 0; s32 res = fopAcM_getWaterStream(¶m_1, mGndChk, &local_48, &local_58, 0); cXyz local_54(local_58 * local_48.x, local_58 * local_48.y, local_58 * local_48.z); - + if (res != 0) { cLib_addCalc2(¶m_2.x, local_54.x * 0.7f, 0.5f, i_scale); cLib_addCalc2(¶m_2.z, local_54.z * 0.7f, 0.5f, i_scale); @@ -394,18 +394,18 @@ static actor_method_class l_daObjGOMIKABE_Method = { }; actor_process_profile_definition g_profile_Obj_GOMIKABE = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_GOMIKABE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjGOMIKABE_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 519, // mPriority - &l_daObjGOMIKABE_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_GOMIKABE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjGOMIKABE_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_GOMIKABE_e, + /* Actor SubMtd */ &l_daObjGOMIKABE_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_gpTaru.cpp b/src/d/actor/d_a_obj_gpTaru.cpp index 5e01a5bf17..74b0f8cfdf 100644 --- a/src/d/actor/d_a_obj_gpTaru.cpp +++ b/src/d/actor/d_a_obj_gpTaru.cpp @@ -271,7 +271,7 @@ int daGpTaru_c::Execute() { } } else { fopAc_ac_c* tg_hit_actor = dCc_GetAc(mCcCyl.GetTgHitObj()->GetAc()); - if (tg_hit_actor != NULL && fopAcM_GetName(tg_hit_actor) == PROC_E_WB) { + if (tg_hit_actor != NULL && fopAcM_GetName(tg_hit_actor) == fpcNm_E_WB_e) { mode_init_explosion(); } } @@ -279,7 +279,7 @@ int daGpTaru_c::Execute() { if (mCcCyl.ChkCoHit()) { fopAc_ac_c* co_hit_actor = dCc_GetAc(mCcCyl.GetCoHitObj()->GetAc()); - if (co_hit_actor != NULL && fopAcM_GetName(co_hit_actor) == PROC_E_WB) { + if (co_hit_actor != NULL && fopAcM_GetName(co_hit_actor) == fpcNm_E_WB_e) { if (co_hit_actor->speedF >= 7.0f) { mode_init_explosion(); } @@ -590,18 +590,18 @@ static actor_method_class l_daGpTaru_Method = { }; actor_process_profile_definition g_profile_Obj_GpTaru = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_GpTaru, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daGpTaru_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 509, // mPriority - &l_daGpTaru_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_GpTaru_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daGpTaru_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_GpTaru_e, + /* Actor SubMtd */ &l_daGpTaru_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_gra2.cpp b/src/d/actor/d_a_obj_gra2.cpp index 3290224ca7..5f03df755f 100644 --- a/src/d/actor/d_a_obj_gra2.cpp +++ b/src/d/actor/d_a_obj_gra2.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_gra2.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -222,7 +222,7 @@ static int jointCtrlCallBack(J3DJoint* i_joint, int param_2) { void daObj_GrA_c::rideCallBack(dBgW* param_1, fopAc_ac_c* actor_p, fopAc_ac_c* param_3) { daObj_GrA_c* aActor_p = (daObj_GrA_c*) actor_p; JUT_ASSERT(684, NULL != aActor_p); - aActor_p->field_0x10c4 = fopAcM_GetProfName(param_3) == PROC_ALINK; + aActor_p->field_0x10c4 = fopAcM_GetProfName(param_3) == fpcNm_ALINK_e; } daObj_GrA_c::daObj_GrA_c() {} @@ -397,7 +397,7 @@ int daObj_GrA_c::CreateHeap() { field_0x83c = l_entryJntNoList; setFaceAnm(22, false, 0.0f); setBaseAnm(17, 0.0f); - + return 1; } @@ -487,7 +487,7 @@ int daObj_GrA_c::jointCtrl(J3DJoint* i_joint, J3DModel* param_2) { switch (jointNo) { case 1: break; - + case 3: mDoMtx_stack_c::ZXYrotM(field_0x9bc); break; @@ -667,7 +667,7 @@ int daObj_GrA_c::init() { attention_info.distances[fopAc_attn_CARRY_e] = 40; attention_info.distances[fopAc_attn_BATTLE_e] = 22; mAcchCir.SetWall(mpHIO->m.mWallH, mpHIO->m.mWallR); - mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, + mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this)); mCcStts.Init(mpHIO->m.mWeight, 0, this); field_0xf50.Set(mCcDCyl); @@ -704,7 +704,7 @@ int daObj_GrA_c::init() { setRoomNo(); if (mMode == 2) { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); } field_0x1528.setPathInfo(getPathNo(), fopAcM_GetRoomNo(this), 1); @@ -1019,7 +1019,7 @@ void daObj_GrA_c::mainProc() { if (mMode == 0) { if ((home.pos - current.pos).absXZ() > getSrchCircleR()) { cXyz sp3c(0.0f, 0.0f, getSrchCircleR()); - cLib_offsetPos(¤t.pos, &home.pos, + cLib_offsetPos(¤t.pos, &home.pos, cLib_targetAngleY(&home.pos, ¤t.pos), &sp3c); } } @@ -1453,7 +1453,7 @@ int daObj_GrA_c::talk(void* param_1) { setBaseMotion(0, mpHIO->m.field_0x0c); setFaceMotion(0, -1.0f); } - + return 0; } @@ -1542,7 +1542,7 @@ int daObj_GrA_c::ctrlMsgAnm(int& param_1, int& param_2, fopAc_ac_c* param_3) { static void* s_sub(void* i_actor, void* i_data) { daObj_GrA_c* i_this = (daObj_GrA_c*)i_data; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_TAG_GRA && i_this->checkTagGraSub((fopAc_ac_c*)i_actor)) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_TAG_GRA_e && i_this->checkTagGraSub((fopAc_ac_c*)i_actor)) { return i_actor; } return NULL; @@ -1642,10 +1642,10 @@ int daObj_GrA_c::setPrtcl() { for (int i = 0; i < 3; i++) { if (i == 0) { - field_0x2020[i] = dComIfGp_particle_set(field_0x2020[i], l_prticles_id[i], &sp28, &tevStr, ¤t.angle, + field_0x2020[i] = dComIfGp_particle_set(field_0x2020[i], l_prticles_id[i], &sp28, &tevStr, ¤t.angle, &sp34, 0xFF, NULL, -1, NULL, NULL, NULL); } else { - field_0x2020[i] = dComIfGp_particle_setPolyColor(field_0x2020[i], l_prticles_id[i], mAcch.m_gnd, &sp28, + field_0x2020[i] = dComIfGp_particle_setPolyColor(field_0x2020[i], l_prticles_id[i], mAcch.m_gnd, &sp28, &tevStr, ¤t.angle, &sp34, 0, NULL, -1, NULL); } @@ -1783,7 +1783,7 @@ int daObj_GrA_c::base013(int param_1) { } else if (field_0x201c < 10) { field_0x201c++; } - + if (field_0x2010 != field_0x842 && field_0x201c < 10) { mSound.startCreatureSound(Z2SE_GORON_ROLLING, cLib_minMaxLimit(fabsf(mpModelMorf->getPlaySpeed()) * 20.0f, 1.0f, 127.0f), -1); field_0x2010 = field_0x842; @@ -2130,18 +2130,18 @@ static actor_method_class daObj_GrA_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_GRA = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_GRA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_GrA_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 19, // mPriority - &daObj_GrA_MethodTable, // sub_method - 0x00040100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_GRA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_GrA_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_GRA_e, + /* Actor SubMtd */ &daObj_GrA_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_gra2_base.inc b/src/d/actor/d_a_obj_gra2_base.inc index b99ee70315..e646bcded9 100644 --- a/src/d/actor/d_a_obj_gra2_base.inc +++ b/src/d/actor/d_a_obj_gra2_base.inc @@ -4,7 +4,7 @@ static void* s_sub2(void* i_actor, void* i_data) { daObj_GrA_c* i_this = (daObj_GrA_c*)i_data; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_GRA && (u8)i_this->checkGraSub((fopAc_ac_c*)i_actor)) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_GRA_e && (u8)i_this->checkGraSub((fopAc_ac_c*)i_actor)) { return i_actor; } return NULL; @@ -64,9 +64,9 @@ int daObj_GrA_c::waitDemo(void* param_1) { } else { #if DEBUG if (mpHIO->m.field_0x8a) { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); } else { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OnStatus(this, fopAcStts_CULL_e); } #endif @@ -80,7 +80,7 @@ int daObj_GrA_c::waitDemo(void* param_1) { case 2: #if DEBUG - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OnStatus(this, fopAcStts_CULL_e); #endif break; } @@ -150,7 +150,7 @@ int daObj_GrA_c::startDemo(void* param_1) { player->changeOriginalDemo(); gra_p->field_0x204c.entry(this); gra_p->setProcess(&daObj_GrA_c::soldierDemo); - fopAcM_OnStatus(gra_p, fopAcM_STATUS_UNK_0x8000); + fopAcM_OnStatus(gra_p, fopAcStts_STAFF_PRIMARY_e); field_0x2056 = 0; dComIfGp_getEvent()->setSkipProc(this, skipCallBack, 0); dComIfGp_getEvent()->onSkipFade(); @@ -408,7 +408,7 @@ int daObj_GrA_c::startDemo(void* param_1) { } else if (mAcch.ChkGroundHit()) { cXyz spd8(-1482.0f, 3650.0f, -4459.0f); if ((current.pos - spd8).absXZ() > 50.0f) { - cLib_addCalcAngleS2(¤t.angle.y, cLib_targetAngleY(¤t.pos, &spd8), + cLib_addCalcAngleS2(¤t.angle.y, cLib_targetAngleY(¤t.pos, &spd8), 24, mpHIO->m.field_0x88); shape_angle.y = current.angle.y; field_0x91a.y = current.angle.y; @@ -575,7 +575,7 @@ BOOL daObj_GrA_c::chkPointInArea(cXyz param_1, cXyz param_2, f32 param_3, f32 pa sp74.y += var_f31; sp74.y += sp68.y; - return chkPointInArea(param_1, sp74, sp68, param_6); + return chkPointInArea(param_1, sp74, sp68, param_6); } BOOL daObj_GrA_c::chkPointInArea(cXyz param_1, cXyz param_2, cXyz param_3, s16 param_4) { @@ -602,7 +602,7 @@ BOOL daObj_GrA_c::chkActorInSight2(fopAc_ac_c* actor, f32 param_2, s16 param_3) cXyz daObj_GrA_c::getAttentionPos(fopAc_ac_c* i_actor_p) { cXyz pos = i_actor_p->attention_info.position; - if (fopAcM_GetName(i_actor_p) == PROC_ALINK) { + if (fopAcM_GetName(i_actor_p) == fpcNm_ALINK_e) { pos.y -= daPy_py_c::getAttentionOffsetY(); } diff --git a/src/d/actor/d_a_obj_gra2_soldier.inc b/src/d/actor/d_a_obj_gra2_soldier.inc index 05d74f90b9..e36d7ec350 100644 --- a/src/d/actor/d_a_obj_gra2_soldier.inc +++ b/src/d/actor/d_a_obj_gra2_soldier.inc @@ -319,7 +319,7 @@ int daObj_GrA_c::toStone(void* param_1) { } field_0x10c4 = 0; - + return 1; } @@ -954,7 +954,7 @@ int daObj_GrA_c::rollAttack(void* param_1) { cLib_chaseF(&speedF, getSpeed(), mpHIO->m.field_0xa8); if (field_0x201c < 10) { - cLib_addCalcAngleS2(¤t.angle.y, cLib_targetAngleY(¤t.pos, &sp6c), + cLib_addCalcAngleS2(¤t.angle.y, cLib_targetAngleY(¤t.pos, &sp6c), 1, mpHIO->m.field_0x88); shape_angle.y = current.angle.y; field_0x91a.y = current.angle.y; @@ -1053,7 +1053,7 @@ int daObj_GrA_c::rollAttack(void* param_1) { if (field_0x1fe9 == 0 && field_0xf50.ChkCoHit() != 0) { fopAc_ac_c* hitobj_p = dCc_GetAc(field_0xf50.GetCoHitObj()->GetAc()); - if (fopAcM_GetName(hitobj_p) == PROC_ALINK) { + if (fopAcM_GetName(hitobj_p) == fpcNm_ALINK_e) { field_0x1fe9 = 1; player->offGoronSideMove(); player->offGoronUpStopCancel(); @@ -1230,7 +1230,7 @@ int daObj_GrA_c::rollAttacked(void* param_1) { cXyz sp3c = field_0x1528.getPntPos(field_0x1528.getIdx() & 0xFFFF); sVar1 = current.angle.y; cLib_chaseF(&speedF, getSpeed(), mpHIO->m.field_0xa8); - cLib_addCalcAngleS2(¤t.angle.y, cLib_targetAngleY(¤t.pos, &sp3c), + cLib_addCalcAngleS2(¤t.angle.y, cLib_targetAngleY(¤t.pos, &sp3c), 8, field_0x1528.field_0xa14); field_0x1528.field_0xa14 = abs(current.angle.y - sVar1); cLib_addCalcAngleS2(&field_0x1528.field_0xa14, mpHIO->m.field_0x88, @@ -1300,7 +1300,7 @@ int daObj_GrA_c::rollEscape(void* param_1) { } } - if (field_0x2030 == 1 && field_0x2005 == 0 && + if (field_0x2030 == 1 && field_0x2005 == 0 && (fopAcM_otherBgCheck(this, dComIfGp_getPlayer(0)) || fopAcM_CheckCondition(this, 4) != 0)) { if (dComIfGp_getVibration().CheckQuake()) { dComIfGp_getVibration().StopQuake(31); @@ -1329,7 +1329,7 @@ int daObj_GrA_c::rollEscape(void* param_1) { cXyz vec_0x48 = field_0x1528.getPntPos(field_0x1528.getIdx() & 0xFFFF); sVar1 = current.angle.y; cLib_chaseF(&speedF, getSpeed(), mpHIO->m.field_0xa8); - cLib_addCalcAngleS2(¤t.angle.y, cLib_targetAngleY(¤t.pos, &vec_0x48), + cLib_addCalcAngleS2(¤t.angle.y, cLib_targetAngleY(¤t.pos, &vec_0x48), 8, field_0x1528.field_0xa14); field_0x1528.field_0xa14 = abs(current.angle.y - sVar1); cLib_addCalcAngleS2(&field_0x1528.field_0xa14, mpHIO->m.field_0x88, 8, 0x40); @@ -1397,7 +1397,7 @@ int daObj_GrA_c::thrown(void* param_1) { switch (field_0xa7c) { case 0: - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); field_0x1ff0 = 1; mDemoCamMode = 0; field_0x209c = 1; diff --git a/src/d/actor/d_a_obj_graWall.cpp b/src/d/actor/d_a_obj_graWall.cpp index 44b6b034c0..3bff2a8ae2 100644 --- a/src/d/actor/d_a_obj_graWall.cpp +++ b/src/d/actor/d_a_obj_graWall.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_graWall.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" int daObjGraWall_c::Create() { fopAcM_ct(this, daObjGraWall_c); @@ -104,18 +104,18 @@ static actor_method_class l_daObjGraWall_Method = { }; actor_process_profile_definition g_profile_GRA_WALL = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_GRA_WALL, - &g_fpcLf_Method.base, - sizeof(daObjGraWall_c), - 0, - 0, - &g_fopAc_Method.base, - 611, - &l_daObjGraWall_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_GRA_WALL_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjGraWall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_GRA_WALL_e, + /* Actor SubMtd */ &l_daObjGraWall_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_gra_rock.cpp b/src/d/actor/d_a_obj_gra_rock.cpp index 8dc96aa378..e2b1a06f06 100644 --- a/src/d/actor/d_a_obj_gra_rock.cpp +++ b/src/d/actor/d_a_obj_gra_rock.cpp @@ -117,7 +117,7 @@ void daObjGraRock_c::col_set() { dComIfGs_onSwitch(field_0x9c8, fopAcM_GetRoomNo(this)); csXyz local_34(current.angle); local_34.x = 2; - fopAcM_create(PROC_NPC_GRA, 0x5fffff00, &acStack_2c, fopAcM_GetRoomNo(this), &local_34, 0, + fopAcM_create(fpcNm_NPC_GRA_e, 0x5fffff00, &acStack_2c, fopAcM_GetRoomNo(this), &local_34, 0, -1); Z2GetAudioMgr()->seStart(Z2SE_OBJ_ZR_GRN_ROCK_BRK, ¤t.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); @@ -307,18 +307,18 @@ static actor_method_class l_daObjGraRock_Method = { }; actor_process_profile_definition g_profile_Obj_GraRock = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_GraRock, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjGraRock_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 609, // mPriority - &l_daObjGraRock_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_GraRock_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjGraRock_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_GraRock_e, + /* Actor SubMtd */ &l_daObjGraRock_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_grave_stone.cpp b/src/d/actor/d_a_obj_grave_stone.cpp index 6dcb0389c0..771635d589 100644 --- a/src/d/actor/d_a_obj_grave_stone.cpp +++ b/src/d/actor/d_a_obj_grave_stone.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_grave_stone.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_com_inf_game.h" #include "d/d_bg_w.h" @@ -224,18 +224,18 @@ static actor_method_class l_daGraveStone_Method = { }; actor_process_profile_definition g_profile_Obj_GraveStone = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_GraveStone, - &g_fpcLf_Method.base, - sizeof(daGraveStone_c), - 0, - 0, - &g_fopAc_Method.base, - 0x25F, - &l_daGraveStone_Method, - 0x44100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_GraveStone_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daGraveStone_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_GraveStone_e, + /* Actor SubMtd */ &l_daGraveStone_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_groundwater.cpp b/src/d/actor/d_a_obj_groundwater.cpp index 918d179444..2d3d05a36c 100644 --- a/src/d/actor/d_a_obj_groundwater.cpp +++ b/src/d/actor/d_a_obj_groundwater.cpp @@ -344,18 +344,18 @@ static actor_method_class l_daGrdWater_Method = { }; actor_process_profile_definition g_profile_GRDWATER = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_GRDWATER, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daGrdWater_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 489, // mPriority - &l_daGrdWater_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_GRDWATER_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daGrdWater_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_GRDWATER_e, + /* Actor SubMtd */ &l_daGrdWater_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_grz_rock.cpp b/src/d/actor/d_a_obj_grz_rock.cpp index 5bd93e131b..772f7a8cff 100644 --- a/src/d/actor/d_a_obj_grz_rock.cpp +++ b/src/d/actor/d_a_obj_grz_rock.cpp @@ -162,18 +162,18 @@ static actor_method_class l_daObjGrzRock_Method = { }; actor_process_profile_definition g_profile_Obj_GrzRock = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_GrzRock, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjGrzRock_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 610, // mPriority - &l_daObjGrzRock_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_GrzRock_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjGrzRock_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_GrzRock_e, + /* Actor SubMtd */ &l_daObjGrzRock_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_h_saku.cpp b/src/d/actor/d_a_obj_h_saku.cpp index dc814a0fa5..1349e377ea 100644 --- a/src/d/actor/d_a_obj_h_saku.cpp +++ b/src/d/actor/d_a_obj_h_saku.cpp @@ -303,18 +303,18 @@ static actor_method_class l_daObjH_Saku_Method = { }; actor_process_profile_definition g_profile_Obj_H_Saku = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_H_Saku, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjH_Saku_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 464, // mPriority - &l_daObjH_Saku_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_H_Saku_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjH_Saku_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_H_Saku_e, + /* Actor SubMtd */ &l_daObjH_Saku_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_hakai_brl.cpp b/src/d/actor/d_a_obj_hakai_brl.cpp index 1b71ca265c..ea157e4822 100644 --- a/src/d/actor/d_a_obj_hakai_brl.cpp +++ b/src/d/actor/d_a_obj_hakai_brl.cpp @@ -198,18 +198,18 @@ static actor_method_class daObjHBarrel_METHODS = { }; actor_process_profile_definition g_profile_Obj_HBarrel = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_HBarrel, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjHBarrel_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 745, // mPriority - &daObjHBarrel_METHODS, // sub_method - 0x00040180, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_HBarrel_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjHBarrel_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_HBarrel_e, + /* Actor SubMtd */ &daObjHBarrel_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_hakai_ftr.cpp b/src/d/actor/d_a_obj_hakai_ftr.cpp index c3d0914221..c2696234e5 100644 --- a/src/d/actor/d_a_obj_hakai_ftr.cpp +++ b/src/d/actor/d_a_obj_hakai_ftr.cpp @@ -208,18 +208,18 @@ static actor_method_class daObjHFtr_METHODS = { }; actor_process_profile_definition g_profile_Obj_HFtr = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_HFtr, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjHFtr_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 744, // mPriority - &daObjHFtr_METHODS, // sub_method - 0x00040180, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_HFtr_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjHFtr_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_HFtr_e, + /* Actor SubMtd */ &daObjHFtr_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_hasu2.cpp b/src/d/actor/d_a_obj_hasu2.cpp index f67a777e9f..139dfc9bf6 100644 --- a/src/d/actor/d_a_obj_hasu2.cpp +++ b/src/d/actor/d_a_obj_hasu2.cpp @@ -9,7 +9,7 @@ static void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2) { UNUSED(param_0); - if (fopAcM_GetName(param_2) == PROC_ALINK) { + if (fopAcM_GetName(param_2) == fpcNm_ALINK_e) { nObjMHasu::daObjMHasu_c* hasu = (nObjMHasu::daObjMHasu_c*)(param_1); hasu->setRideFlag(true); hasu->setHasuCount(param_2->speedF); @@ -185,18 +185,18 @@ actor_method_class daObjMHasu_METHODS = { }; actor_process_profile_definition g_profile_Obj_MHasu = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_MHasu, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(nObjMHasu::daObjMHasu_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 666, // mPriority - &daObjMHasu_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MHasu_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(nObjMHasu::daObjMHasu_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_MHasu_e, + /* Actor SubMtd */ &daObjMHasu_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_hata.cpp b/src/d/actor/d_a_obj_hata.cpp index 58fcc3dddb..fd4d30cbca 100644 --- a/src/d/actor/d_a_obj_hata.cpp +++ b/src/d/actor/d_a_obj_hata.cpp @@ -181,18 +181,18 @@ static actor_method_class daObjHata_METHODS = { }; actor_process_profile_definition g_profile_Obj_Hata = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Hata, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjHata_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 747, // mPriority - &daObjHata_METHODS, // sub_method - 0x00040180, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Hata_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjHata_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Hata_e, + /* Actor SubMtd */ &daObjHata_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_hb.cpp b/src/d/actor/d_a_obj_hb.cpp index de047bb066..76fee9ab7b 100644 --- a/src/d/actor/d_a_obj_hb.cpp +++ b/src/d/actor/d_a_obj_hb.cpp @@ -697,7 +697,7 @@ static cPhs_Step daOBJ_HB_Create(fopAc_ac_c* a_this) { i_this->mMode = 0; a_this->scale.x = 1.0f; i_this->mChildPlaySpeed = 0.0f; - i_this->mChildActorID = fopAcM_createChild(PROC_E_HB_LEAF, fopAcM_GetID(a_this), 0, &a_this->current.pos, + i_this->mChildActorID = fopAcM_createChild(fpcNm_E_HB_LEAF_e, fopAcM_GetID(a_this), 0, &a_this->current.pos, fopAcM_GetRoomNo(a_this), &a_this->shape_angle, NULL, -1, NULL); i_this->field_0x6b0 = 1; } @@ -719,18 +719,18 @@ static actor_method_class l_daOBJ_HB_Method = { }; actor_process_profile_definition g_profile_OBJ_HB = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_HB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_hb_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 705, // mPriority - &l_daOBJ_HB_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_HB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_hb_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_HB_e, + /* Actor SubMtd */ &l_daOBJ_HB_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_hbombkoya.cpp b/src/d/actor/d_a_obj_hbombkoya.cpp index de659ec008..22868d08cf 100644 --- a/src/d/actor/d_a_obj_hbombkoya.cpp +++ b/src/d/actor/d_a_obj_hbombkoya.cpp @@ -273,18 +273,18 @@ static actor_method_class daObjHBombkoya_METHODS = { }; actor_process_profile_definition g_profile_Obj_HBombkoya = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_HBombkoya, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjHBombkoya_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 675, // mPriority - &daObjHBombkoya_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_HBombkoya_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjHBombkoya_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_HBombkoya_e, + /* Actor SubMtd */ &daObjHBombkoya_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_heavySw.cpp b/src/d/actor/d_a_obj_heavySw.cpp index a6c4dfd7d1..bcfe282ed5 100644 --- a/src/d/actor/d_a_obj_heavySw.cpp +++ b/src/d/actor/d_a_obj_heavySw.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_heavySw.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" daHeavySw_HIO_c::daHeavySw_HIO_c() { field_0x04 = 150.0f; @@ -81,7 +81,7 @@ int daHeavySw_c::create() { } void daHeavySw_c::rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2) { - if (fopAcM_GetName(param_2) == PROC_ALINK) { + if (fopAcM_GetName(param_2) == fpcNm_ALINK_e) { daHeavySw_c* heavySw = static_cast(param_1); heavySw->field_0x5d8 = 1; heavySw->field_0x5dc = @@ -290,18 +290,18 @@ static actor_method_class l_daHeavySw_Method = { }; actor_process_profile_definition g_profile_Obj_HeavySw = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_HeavySw, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daHeavySw_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 503, // mPriority - &l_daHeavySw_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_HeavySw_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daHeavySw_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_HeavySw_e, + /* Actor SubMtd */ &l_daHeavySw_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_hfuta.cpp b/src/d/actor/d_a_obj_hfuta.cpp index b3b2edf4e7..d79a74459a 100644 --- a/src/d/actor/d_a_obj_hfuta.cpp +++ b/src/d/actor/d_a_obj_hfuta.cpp @@ -197,20 +197,20 @@ static actor_method_class daObjFuta_METHODS = { }; actor_process_profile_definition g_profile_Obj_Hfuta = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Hfuta, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjFuta_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 450, // mPriority - &daObjFuta_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Hfuta_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjFuta_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Hfuta_e, + /* Actor SubMtd */ &daObjFuta_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_obj_hhashi.cpp b/src/d/actor/d_a_obj_hhashi.cpp index 1868121f5f..d5ab5558b0 100644 --- a/src/d/actor/d_a_obj_hhashi.cpp +++ b/src/d/actor/d_a_obj_hhashi.cpp @@ -126,7 +126,7 @@ void daObjHHASHI_c::Obj_Damage() { e_fm_class* tgActor = (e_fm_class*)dCc_GetAc(mCyl.GetTgHitObj()->GetAc()); cXyz* tgHitPos = mCyl.GetTgHitPosP(); cLib_targetAngleY(¤t.pos, tgHitPos); - if (fopAcM_GetName(tgActor) == PROC_E_FM) { + if (fopAcM_GetName(tgActor) == fpcNm_E_FM_e) { field_0x5aa++; e_fm_class* fm = (e_fm_class*)fopAcM_SearchByID(fopAcM_GetID(tgActor)); if (fm != NULL) { @@ -382,18 +382,18 @@ static actor_method_class l_daObjHHASHI_Method = { }; actor_process_profile_definition g_profile_Obj_HHASHI = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_HHASHI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjHHASHI_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 462, // mPriority - &l_daObjHHASHI_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_HHASHI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjHHASHI_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_HHASHI_e, + /* Actor SubMtd */ &l_daObjHHASHI_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_hsTarget.cpp b/src/d/actor/d_a_obj_hsTarget.cpp index 4ee973f8f3..ba686bbc34 100644 --- a/src/d/actor/d_a_obj_hsTarget.cpp +++ b/src/d/actor/d_a_obj_hsTarget.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_hsTarget.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static const char* l_resNameIdx[2] = {"hsMato", "L7HsMato"}; @@ -95,18 +95,18 @@ static actor_method_class l_daHsTarget_Method = { }; actor_process_profile_definition g_profile_Obj_HsTarget = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_HsTarget, - &g_fpcLf_Method.base, - sizeof(daHsTarget_c), - 0, - 0, - &g_fopAc_Method.base, - 501, - &l_daHsTarget_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_HsTarget_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daHsTarget_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_HsTarget_e, + /* Actor SubMtd */ &l_daHsTarget_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ice_l.cpp b/src/d/actor/d_a_obj_ice_l.cpp index 69d53f653a..1c7dbc917e 100644 --- a/src/d/actor/d_a_obj_ice_l.cpp +++ b/src/d/actor/d_a_obj_ice_l.cpp @@ -10,7 +10,7 @@ #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_s_play.h" #include @@ -74,7 +74,7 @@ static void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2 cXyz& player_pos = fopAcM_GetPosition(player_p); //!@bug Missing parentheses causes this comparison to always evaluate to false - if (!fopAcM_GetName(param_2) == PROC_ALINK) { + if (!fopAcM_GetName(param_2) == fpcNm_ALINK_e) { ice_p->field_0x5f4 = 0x100; ice_p->field_0x5a4 = -1.0f; ice_p->field_0x5ac = 0x500; @@ -98,7 +98,7 @@ static void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2 ice_p->Check_RideOn(player_pos); } - if (ice_p->field_0x5b1 == 0xFF && fopAcM_GetName(param_2) == PROC_ALINK) { + if (ice_p->field_0x5b1 == 0xFF && fopAcM_GetName(param_2) == fpcNm_ALINK_e) { ice_p->field_0x5f4 = 0x300; ice_p->field_0x5a4 = -6.0f; ice_p->field_0x5ac = 0x1000; @@ -149,7 +149,7 @@ int daObjIce_l_c::create() { } if (field_0x5b0 != 0) { - if (dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_FISH) { + if (dComIfGs_getCollectSmell() == dItemNo_SMELL_FISH_e) { field_0x5b1 = 1; } else { field_0x5b1 = 0xFF; @@ -256,18 +256,18 @@ static actor_method_class l_daObjIce_l_Method = { }; actor_process_profile_definition g_profile_Obj_Ice_l = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Ice_l, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjIce_l_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 456, // mPriority - &l_daObjIce_l_Method, // sub_method - 0x00044180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Ice_l_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjIce_l_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Ice_l_e, + /* Actor SubMtd */ &l_daObjIce_l_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ice_s.cpp b/src/d/actor/d_a_obj_ice_s.cpp index 83bd1b70c8..7387bea34f 100644 --- a/src/d/actor/d_a_obj_ice_s.cpp +++ b/src/d/actor/d_a_obj_ice_s.cpp @@ -123,7 +123,7 @@ static void rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3 cXyz* pBallCenter = player->getIronBallCenterPos(); // !@bug misplaced ! operator. This condition is probably always false - if (!fopAcM_GetName(param_3) == PROC_ALINK) { + if (!fopAcM_GetName(param_3) == fpcNm_ALINK_e) { ice->field_0x5d8 = 0x100; ice->field_0x5a4 = -1.0f; ice->field_0x5ac = 0x500; @@ -147,7 +147,7 @@ static void rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3 ice->field_0x5ac = 0x1000; ice->Check_RideOn(*playerPos); } - if (ice->field_0x5c5 == 0xff && fopAcM_GetName(param_3) == PROC_ALINK) { + if (ice->field_0x5c5 == 0xff && fopAcM_GetName(param_3) == fpcNm_ALINK_e) { ice->field_0x5d8 = 0x300; ice->field_0x5a4 = -11.0f; ice->field_0x5ac = 0x1000; @@ -201,7 +201,7 @@ int daObjIce_s_c::create() { field_0x5c4 = 1; } if (field_0x5c4 != 0) { - if (dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_FISH) { + if (dComIfGs_getCollectSmell() == dItemNo_SMELL_FISH_e) { field_0x5c5 = 1; } else { field_0x5c5 = 0xff; @@ -301,18 +301,18 @@ static actor_method_class l_daObjIce_s_Method = { }; actor_process_profile_definition g_profile_Obj_Ice_s = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Ice_s, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjIce_s_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 457, // mPriority - &l_daObjIce_s_Method, // sub_method - 0x00044180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Ice_s_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjIce_s_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Ice_s_e, + /* Actor SubMtd */ &l_daObjIce_s_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_iceblock.cpp b/src/d/actor/d_a_obj_iceblock.cpp index 3edd81d55d..62a6dbb966 100644 --- a/src/d/actor/d_a_obj_iceblock.cpp +++ b/src/d/actor/d_a_obj_iceblock.cpp @@ -57,7 +57,7 @@ void daObjIceBlk_c::PPCallBack(fopAc_ac_c* i_bgActor, fopAc_ac_c* i_pushActor, s } static void rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_bgActor, fopAc_ac_c* i_rideActor) { - if (fopAcM_GetName(i_rideActor) == PROC_ALINK) { + if (fopAcM_GetName(i_rideActor) == fpcNm_ALINK_e) { ((daObjIceBlk_c*)i_bgActor)->mIsPlayerRide = true; } } @@ -836,18 +836,18 @@ static actor_method_class daObjIceBlk_METHODS = { }; actor_process_profile_definition g_profile_Obj_IceBlock = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_IceBlock, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjIceBlk_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 535, // mPriority - &daObjIceBlk_METHODS, // sub_method - 0x00040500, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_IceBlock_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjIceBlk_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_IceBlock_e, + /* Actor SubMtd */ &daObjIceBlk_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_FREEZE_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_iceleaf.cpp b/src/d/actor/d_a_obj_iceleaf.cpp index 873f5058fb..f4dbfac98a 100644 --- a/src/d/actor/d_a_obj_iceleaf.cpp +++ b/src/d/actor/d_a_obj_iceleaf.cpp @@ -412,18 +412,18 @@ static actor_method_class l_daObjIceLeaf_Method = { }; actor_process_profile_definition g_profile_Obj_IceLeaf = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_IceLeaf, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjIceLeaf_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 567, // mPriority - &l_daObjIceLeaf_Method, // sub_method - 0x00060000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_IceLeaf_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjIceLeaf_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_IceLeaf_e, + /* Actor SubMtd */ &l_daObjIceLeaf_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ihasi.cpp b/src/d/actor/d_a_obj_ihasi.cpp index f07be7aa9b..0a647bbb12 100644 --- a/src/d/actor/d_a_obj_ihasi.cpp +++ b/src/d/actor/d_a_obj_ihasi.cpp @@ -168,15 +168,15 @@ static int daObj_Ihasi_Create(fopAc_ac_c* i_actor) { pos.set(34750.0f, -300.0f, -44000.0f); param1 = fopAcM_GetParam(i_actor) & 0xff000000 | 0xfffe00; - fopAcM_create(PROC_E_S1, param1, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1); + fopAcM_create(fpcNm_E_S1_e, param1, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1); pos.set(35250.0f, -300.0f, -43500.0f); ANGLE_ADD(angle.y, 0x5555); - fopAcM_create(PROC_E_S1, param1, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1); + fopAcM_create(fpcNm_E_S1_e, param1, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1); pos.set(34250.0f, -300.0f, -43500.0f); ANGLE_ADD(angle.y, 0x5555); - fopAcM_create(PROC_E_S1, param1, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1); + fopAcM_create(fpcNm_E_S1_e, param1, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1); return cPhs_ERROR_e; } @@ -196,18 +196,18 @@ static int daObj_Ihasi_Create(fopAc_ac_c* i_actor) { if (!strcmp(dComIfGp_getStartStageName(), "F_SP121") && fopAcM_GetRoomNo(i_actor) == 0) { pos.set(34800.0f, 5700.0f, -26735.0f); - fopAcM_create(PROC_E_WAP, 0xffffff35, &pos, fopAcM_GetRoomNo(i_actor), NULL, NULL, -1); + fopAcM_create(fpcNm_E_WAP_e, 0xffffff35, &pos, fopAcM_GetRoomNo(i_actor), NULL, NULL, -1); angle.set(0x0, -0x8000, 0x0); pos.set(34800.0f, -300.0f, -30340.0f); param2 = fopAcM_GetParam(i_actor) & 0xff000000 | 0xfffe00; - fopAcM_create(PROC_E_S1, param2, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1); + fopAcM_create(fpcNm_E_S1_e, param2, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1); pos.set(35087.0f, -300.0f, -29879.0f); - fopAcM_create(PROC_E_S1, param2, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1); + fopAcM_create(fpcNm_E_S1_e, param2, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1); pos.set(34500.0f, -300.0f, -29879.0f); - fopAcM_create(PROC_E_S1, param2, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1); + fopAcM_create(fpcNm_E_S1_e, param2, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1); } daObj_Ihasi_Execute(i_this); @@ -223,18 +223,18 @@ static actor_method_class l_daObj_Ihasi_Method = { }; actor_process_profile_definition g_profile_OBJ_IHASI = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_IHASI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_ihasi_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 533, // mPriority - &l_daObj_Ihasi_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_IHASI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_ihasi_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_IHASI_e, + /* Actor SubMtd */ &l_daObj_Ihasi_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ikada.cpp b/src/d/actor/d_a_obj_ikada.cpp index ef1f729c09..eb94d61272 100644 --- a/src/d/actor/d_a_obj_ikada.cpp +++ b/src/d/actor/d_a_obj_ikada.cpp @@ -205,18 +205,18 @@ static actor_method_class l_daObjIkada_Method = { }; actor_process_profile_definition g_profile_Obj_Ikada = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Ikada, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjIkada_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 455, // mPriority - &l_daObjIkada_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Ikada_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjIkada_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Ikada_e, + /* Actor SubMtd */ &l_daObjIkada_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_inobone.cpp b/src/d/actor/d_a_obj_inobone.cpp index 64ab337594..d73c5e5f9f 100644 --- a/src/d/actor/d_a_obj_inobone.cpp +++ b/src/d/actor/d_a_obj_inobone.cpp @@ -32,7 +32,7 @@ static void bornCoCallBack(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA, daObjIBone_c* a_coActorA = (daObjIBone_c*)i_coActorA; if (i_coActorA != NULL && i_coActorB != NULL && - fopAcM_GetName(i_coActorB) == PROC_HORSE && + fopAcM_GetName(i_coActorB) == fpcNm_HORSE_e && daPy_getPlayerActorClass()->checkHorseRide()) { a_coActorA->field_0x828 = 1; @@ -76,7 +76,7 @@ static void* s_boar_sub(void* i_actor, void* i_data) { fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; fopAc_ac_c* data = (fopAc_ac_c*)i_data; - if (fopAcM_GetName(actor) == PROC_E_WB) { + if (fopAcM_GetName(actor) == fpcNm_E_WB_e) { f32 xz_dist = fopAcM_searchActorDistanceXZ(data, actor); f32 y_dist = fopAcM_searchActorDistanceY(data, actor); @@ -180,7 +180,7 @@ int daObjIBone_c::execute() { break; case 1: - fopAcM_createItemForDirectGet(¤t.pos, fpcNm_ITEM_HEART, + fopAcM_createItemForDirectGet(¤t.pos, dItemNo_HEART_e, fopAcM_GetRoomNo(this), NULL, NULL, 0.0f, 0.0f); setBreakEffect(); fopAcM_delete(this); @@ -190,7 +190,7 @@ int daObjIBone_c::execute() { case 3: { csXyz angle(0, home.angle.y, 0); - fopAcM_createItem(¤t.pos, fpcNm_ITEM_HEART, -1, + fopAcM_createItem(¤t.pos, dItemNo_HEART_e, -1, fopAcM_GetHomeRoomNo(this), &angle, NULL, 0); setBreakEffect(); fopAcM_delete(this); @@ -286,18 +286,18 @@ static actor_method_class l_daObjIBone_Method = { }; actor_process_profile_definition g_profile_Obj_InoBone = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_InoBone, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjIBone_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 729, // mPriority - &l_daObjIBone_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_InoBone_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjIBone_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_InoBone_e, + /* Actor SubMtd */ &l_daObjIBone_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ita.cpp b/src/d/actor/d_a_obj_ita.cpp index a1dd15fe68..31e696eee4 100644 --- a/src/d/actor/d_a_obj_ita.cpp +++ b/src/d/actor/d_a_obj_ita.cpp @@ -140,7 +140,7 @@ static void rideCallBack(dBgW* param_1, fopAc_ac_c* a_this, fopAc_ac_c* i_player (void) a_this; // it is used, but this is needed for dbg matching daObjIta_c* i_this = (daObjIta_c*)a_this; - if (fopAcM_GetName(i_player) == PROC_ALINK) { + if (fopAcM_GetName(i_player) == fpcNm_ALINK_e) { daPy_py_c* player = daPy_getPlayerActorClass(); if (i_this->field_0x5ac < 0.0f) { i_this->field_0x5a8 = (0.8f + HREG_F(2)) * i_this->field_0x5ac; @@ -232,7 +232,7 @@ int daObjIta_c::Execute(Mtx** mtx) { cXyz& unused_pos = fopAcM_GetPosition(player); cXyz& playerSpeed = fopAcM_GetSpeed(player); - if (fopAcM_SearchByName(PROC_E_YMB, (fopAc_ac_c**)&e_ymb) != 0 && e_ymb != NULL) { + if (fopAcM_SearchByName(fpcNm_E_YMB_e, (fopAc_ac_c**)&e_ymb) != 0 && e_ymb != NULL) { e_ymb_Pos = &fopAcM_GetPosition(e_ymb); } @@ -297,18 +297,18 @@ static actor_method_class l_daObjIta_Method = { }; actor_process_profile_definition g_profile_Obj_ITA = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_ITA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjIta_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 474, // mPriority - &l_daObjIta_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_ITA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjIta_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_ITA_e, + /* Actor SubMtd */ &l_daObjIta_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_itamato.cpp b/src/d/actor/d_a_obj_itamato.cpp index 35f846698e..0538d7c783 100644 --- a/src/d/actor/d_a_obj_itamato.cpp +++ b/src/d/actor/d_a_obj_itamato.cpp @@ -353,7 +353,7 @@ void daObj_ItaMato_c::tgHitCallBack(fopAc_ac_c* param_1, dCcD_GObjInf* param_2, u8 cutType = 0; if (param_3 != NULL) { - if (fopAcM_GetProfName(param_3) == PROC_ALINK) { + if (fopAcM_GetProfName(param_3) == fpcNm_ALINK_e) { cutType = ((daPy_py_c*)param_3)->getCutType(); } else { cutType = daPy_py_c::CUT_TYPE_NM_VERTICAL; @@ -375,7 +375,7 @@ void daObj_ItaMato_c::setSwayParam(fopAc_ac_c* i_actor) { field_0x9e8 = 8; field_0xa17 = 0; - if (fopAcM_GetProfName(i_actor) == PROC_ALINK) { + if (fopAcM_GetProfName(i_actor) == fpcNm_ALINK_e) { switch (mCutType) { case 3: case 4: @@ -474,18 +474,18 @@ static actor_method_class daObj_ItaMato_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_ITAMATO = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_ITAMATO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_ItaMato_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 83, // mPriority - &daObj_ItaMato_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_ITAMATO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_ItaMato_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_ITAMATO_e, + /* Actor SubMtd */ &daObj_ItaMato_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_item.cpp b/src/d/actor/d_a_obj_item.cpp index 97f8029d4b..0db3ac3a55 100644 --- a/src/d/actor/d_a_obj_item.cpp +++ b/src/d/actor/d_a_obj_item.cpp @@ -47,13 +47,13 @@ void daItem_c::setBaseMtx() { mpModel->setBaseScale(scale); switch (m_itemNo) { - case fpcNm_ITEM_GREEN_RUPEE: - case fpcNm_ITEM_BLUE_RUPEE: - case fpcNm_ITEM_YELLOW_RUPEE: - case fpcNm_ITEM_RED_RUPEE: - case fpcNm_ITEM_PURPLE_RUPEE: - case fpcNm_ITEM_ORANGE_RUPEE: - case fpcNm_ITEM_SILVER_RUPEE: + case dItemNo_GREEN_RUPEE_e: + case dItemNo_BLUE_RUPEE_e: + case dItemNo_YELLOW_RUPEE_e: + case dItemNo_RED_RUPEE_e: + case dItemNo_PURPLE_RUPEE_e: + case dItemNo_ORANGE_RUPEE_e: + case dItemNo_SILVER_RUPEE_e: setBaseMtx_1(); break; default: @@ -88,10 +88,10 @@ static void itemGetCoCallBack(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA, if (a_coActorA != NULL) { if (a_coActorA->checkPlayerGet() && i_coActorB != NULL) { if (fopAcM_GetName(i_coActorB) == fopAcM_GetName(dComIfGp_getLinkPlayer()) || - fopAcM_GetName(i_coActorB) == PROC_NPC_P2 || - (fopAcM_GetName(i_coActorB) == PROC_CANOE && + fopAcM_GetName(i_coActorB) == fpcNm_NPC_P2_e || + (fopAcM_GetName(i_coActorB) == fpcNm_CANOE_e && daPy_getPlayerActorClass()->checkCanoeRide()) || - (fopAcM_GetName(i_coActorB) == PROC_HORSE && + (fopAcM_GetName(i_coActorB) == fpcNm_HORSE_e && daPy_getPlayerActorClass()->checkHorseRide())) { a_coActorA->itemGetNextExecute(); @@ -181,9 +181,9 @@ void daItem_c::CreateInit() { initBaseMtx(); animPlay(1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f); - if (m_itemNo == fpcNm_ITEM_BOOMERANG) { + if (m_itemNo == dItemNo_BOOMERANG_e) { itemGetNextExecute(); - } else if ((m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) && + } else if ((m_itemNo == dItemNo_ORANGE_RUPEE_e || m_itemNo == dItemNo_SILVER_RUPEE_e) && mSparkleEmtr.getEmitter() == NULL) { dComIfGp_particle_set(0x0C14, &mSparklePos, NULL, NULL, -1, &mSparkleEmtr, -1, NULL, NULL, @@ -252,15 +252,15 @@ int daItem_c::_daItem_create() { return cPhs_ERROR_e; } - if (m_itemNo == fpcNm_ITEM_SMALL_KEY || m_itemNo == fpcNm_ITEM_KANTERA || m_itemNo == fpcNm_ITEM_LIGHT_DROP || - m_itemNo == fpcNm_ITEM_UTAWA_HEART || m_itemNo == fpcNm_ITEM_KAKERA_HEART) + if (m_itemNo == dItemNo_SMALL_KEY_e || m_itemNo == dItemNo_KANTERA_e || m_itemNo == dItemNo_LIGHT_DROP_e || + m_itemNo == dItemNo_UTAWA_HEART_e || m_itemNo == dItemNo_KAKERA_HEART_e) { - // "fpcNm_ITEM_(ITEM) is an unhandled item<%d>\n" + // "Item is not handled by fpcNm_(ITEM): <%d>\n" OS_REPORT_ERROR("fpcNm_(ITEM)では扱わないアイテムです<%d>\n", m_itemNo); JUT_ASSERT(0, FALSE); return cPhs_ERROR_e; - } else if (m_itemNo == fpcNm_ITEM_BOMB_5 || m_itemNo == fpcNm_ITEM_BOMB_10 || m_itemNo == fpcNm_ITEM_BOMB_20 || - m_itemNo == fpcNm_ITEM_BOMB_30) + } else if (m_itemNo == dItemNo_BOMB_5_e || m_itemNo == dItemNo_BOMB_10_e || m_itemNo == dItemNo_BOMB_20_e || + m_itemNo == dItemNo_BOMB_30_e) { // "Bomb Replenish Items are no longer in use!\n" OS_REPORT_ERROR("補給アイテムの爆弾は使用不可になりました！\n"); @@ -340,7 +340,7 @@ int daItem_c::_daItem_execute() { mLastPos = current.pos; field_0x95f = (fopAcM_checkHookCarryNow(this) >> 0x14) & 1; - if (m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) { + if (m_itemNo == dItemNo_ORANGE_RUPEE_e || m_itemNo == dItemNo_SILVER_RUPEE_e) { mSparklePos = current.pos; mSparklePos.y += 18.0f; } @@ -363,7 +363,7 @@ int daItem_c::_daItem_draw() { int daItem_c::_daItem_delete() { mSound.deleteObject(); - if (m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) { + if (m_itemNo == dItemNo_ORANGE_RUPEE_e || m_itemNo == dItemNo_SILVER_RUPEE_e) { mSparkleEmtr.remove(); } @@ -459,7 +459,7 @@ void daItem_c::procMainSimpleGetDemo() { void daItem_c::procInitGetDemoEvent() { hide(); - if (m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) { + if (m_itemNo == dItemNo_ORANGE_RUPEE_e || m_itemNo == dItemNo_SILVER_RUPEE_e) { mSparkleEmtr.remove(); } @@ -481,7 +481,7 @@ void daItem_c::procWaitGetDemoEvent() { dComIfGp_event_setItemPartnerId(m_item_id); } } else { - if (m_itemNo == fpcNm_ITEM_BOOMERANG) { + if (m_itemNo == dItemNo_BOOMERANG_e) { fopAcM_orderItemEvent(this, 0, 0); eventInfo.onCondition(dEvtCnd_CANGETITEM_e); return; @@ -704,27 +704,27 @@ void daItem_c::mode_wait() { } switch (m_itemNo) { - case fpcNm_ITEM_HEART: + case dItemNo_HEART_e: itemActionForHeart(); break; - case fpcNm_ITEM_ARROW_10: - case fpcNm_ITEM_ARROW_20: - case fpcNm_ITEM_ARROW_30: - case fpcNm_ITEM_ARROW_1: - case fpcNm_ITEM_PACHINKO_SHOT: - case fpcNm_ITEM_LIGHT_ARROW: + case dItemNo_ARROW_10_e: + case dItemNo_ARROW_20_e: + case dItemNo_ARROW_30_e: + case dItemNo_ARROW_1_e: + case dItemNo_PACHINKO_SHOT_e: + case dItemNo_LIGHT_ARROW_e: itemActionForArrow(); break; - case fpcNm_ITEM_BOOMERANG: + case dItemNo_BOOMERANG_e: itemActionForBoomerang(); break; - case fpcNm_ITEM_GREEN_RUPEE: - case fpcNm_ITEM_BLUE_RUPEE: - case fpcNm_ITEM_YELLOW_RUPEE: - case fpcNm_ITEM_RED_RUPEE: - case fpcNm_ITEM_PURPLE_RUPEE: - case fpcNm_ITEM_ORANGE_RUPEE: - case fpcNm_ITEM_SILVER_RUPEE: + case dItemNo_GREEN_RUPEE_e: + case dItemNo_BLUE_RUPEE_e: + case dItemNo_YELLOW_RUPEE_e: + case dItemNo_RED_RUPEE_e: + case dItemNo_PURPLE_RUPEE_e: + case dItemNo_ORANGE_RUPEE_e: + case dItemNo_SILVER_RUPEE_e: default: itemActionForRupee(); break; @@ -748,24 +748,24 @@ void daItem_c::mode_water() { f32 scale = 1.0f; switch (m_itemNo) { - case fpcNm_ITEM_HEART: + case dItemNo_HEART_e: scale = 0.5f; break; - case fpcNm_ITEM_GREEN_RUPEE: - case fpcNm_ITEM_BLUE_RUPEE: - case fpcNm_ITEM_YELLOW_RUPEE: - case fpcNm_ITEM_RED_RUPEE: - case fpcNm_ITEM_PURPLE_RUPEE: - case fpcNm_ITEM_ORANGE_RUPEE: + case dItemNo_GREEN_RUPEE_e: + case dItemNo_BLUE_RUPEE_e: + case dItemNo_YELLOW_RUPEE_e: + case dItemNo_RED_RUPEE_e: + case dItemNo_PURPLE_RUPEE_e: + case dItemNo_ORANGE_RUPEE_e: scale = 1.0f; break; - case fpcNm_ITEM_ARROW_10: - case fpcNm_ITEM_ARROW_20: - case fpcNm_ITEM_ARROW_30: - case fpcNm_ITEM_ARROW_1: + case dItemNo_ARROW_10_e: + case dItemNo_ARROW_20_e: + case dItemNo_ARROW_30_e: + case dItemNo_ARROW_1_e: scale = 1.0f; break; - case fpcNm_ITEM_PACHINKO_SHOT: + case dItemNo_PACHINKO_SHOT_e: scale = 1.0f; break; } @@ -785,22 +785,22 @@ void daItem_c::itemGetNextExecute() { BOOL haveItem = false; switch (m_itemNo) { - case fpcNm_ITEM_HEART: - case fpcNm_ITEM_GREEN_RUPEE: - case fpcNm_ITEM_ARROW_10: - case fpcNm_ITEM_ARROW_20: - case fpcNm_ITEM_ARROW_30: - case fpcNm_ITEM_ARROW_1: + case dItemNo_HEART_e: + case dItemNo_GREEN_RUPEE_e: + case dItemNo_ARROW_10_e: + case dItemNo_ARROW_20_e: + case dItemNo_ARROW_30_e: + case dItemNo_ARROW_1_e: procInitSimpleGetDemo(); itemGet(); break; - case fpcNm_ITEM_BLUE_RUPEE: - case fpcNm_ITEM_YELLOW_RUPEE: - case fpcNm_ITEM_RED_RUPEE: - case fpcNm_ITEM_PURPLE_RUPEE: - case fpcNm_ITEM_ORANGE_RUPEE: - case fpcNm_ITEM_SILVER_RUPEE: - case fpcNm_ITEM_PACHINKO_SHOT: + case dItemNo_BLUE_RUPEE_e: + case dItemNo_YELLOW_RUPEE_e: + case dItemNo_RED_RUPEE_e: + case dItemNo_PURPLE_RUPEE_e: + case dItemNo_ORANGE_RUPEE_e: + case dItemNo_SILVER_RUPEE_e: + case dItemNo_PACHINKO_SHOT_e: if (daPy_getPlayerActorClass()->checkCanoeRide() || daPy_getPlayerActorClass()->checkHorseRide()) { @@ -820,7 +820,7 @@ void daItem_c::itemGetNextExecute() { itemGet(); } break; - case fpcNm_ITEM_BOOMERANG: + case dItemNo_BOOMERANG_e: procInitGetDemoEvent(); break; default: @@ -838,45 +838,45 @@ void daItem_c::itemGetNextExecute() { void daItem_c::itemGet() { switch (m_itemNo) { - case fpcNm_ITEM_HEART: + case dItemNo_HEART_e: mDoAud_seStart(Z2SE_HEART_PIECE_GET, NULL, 0, 0); execItemGet(m_itemNo); break; - case fpcNm_ITEM_GREEN_RUPEE: + case dItemNo_GREEN_RUPEE_e: mDoAud_seStart(Z2SE_GREEN_LUPY_GET, NULL, 0, 0); execItemGet(m_itemNo); break; - case fpcNm_ITEM_BLUE_RUPEE: + case dItemNo_BLUE_RUPEE_e: mDoAud_seStart(Z2SE_BLUE_LUPY_GET, NULL, 0, 0); execItemGet(m_itemNo); break; - case fpcNm_ITEM_YELLOW_RUPEE: + case dItemNo_YELLOW_RUPEE_e: mDoAud_seStart(Z2SE_BLUE_LUPY_GET, NULL, 0, 0); execItemGet(m_itemNo); break; - case fpcNm_ITEM_RED_RUPEE: + case dItemNo_RED_RUPEE_e: mDoAud_seStart(Z2SE_RED_LUPY_GET, NULL, 0, 0); execItemGet(m_itemNo); break; - case fpcNm_ITEM_PURPLE_RUPEE: + case dItemNo_PURPLE_RUPEE_e: mDoAud_seStart(Z2SE_RED_LUPY_GET, NULL, 0, 0); execItemGet(m_itemNo); break; - case fpcNm_ITEM_ORANGE_RUPEE: + case dItemNo_ORANGE_RUPEE_e: mDoAud_seStart(Z2SE_RED_LUPY_GET, NULL, 0, 0); execItemGet(m_itemNo); break; - case fpcNm_ITEM_SILVER_RUPEE: + case dItemNo_SILVER_RUPEE_e: mDoAud_seStart(Z2SE_RED_LUPY_GET, NULL, 0, 0); execItemGet(m_itemNo); break; - case fpcNm_ITEM_BOOMERANG: + case dItemNo_BOOMERANG_e: break; - case fpcNm_ITEM_ARROW_10: - case fpcNm_ITEM_ARROW_20: - case fpcNm_ITEM_ARROW_30: - case fpcNm_ITEM_ARROW_1: - case fpcNm_ITEM_PACHINKO_SHOT: + case dItemNo_ARROW_10_e: + case dItemNo_ARROW_20_e: + case dItemNo_ARROW_30_e: + case dItemNo_ARROW_1_e: + case dItemNo_PACHINKO_SHOT_e: mDoAud_seStart(Z2SE_CONSUMP_ITEM_GET, NULL, 0, 0); execItemGet(m_itemNo); default: @@ -1028,19 +1028,19 @@ void daItem_c::set_bound_se() { } switch (m_itemNo) { - case fpcNm_ITEM_GREEN_RUPEE: - case fpcNm_ITEM_BLUE_RUPEE: - case fpcNm_ITEM_YELLOW_RUPEE: - case fpcNm_ITEM_RED_RUPEE: - case fpcNm_ITEM_PURPLE_RUPEE: - case fpcNm_ITEM_ORANGE_RUPEE: + case dItemNo_GREEN_RUPEE_e: + case dItemNo_BLUE_RUPEE_e: + case dItemNo_YELLOW_RUPEE_e: + case dItemNo_RED_RUPEE_e: + case dItemNo_PURPLE_RUPEE_e: + case dItemNo_ORANGE_RUPEE_e: fopAcM_seStart(this, Z2SE_OBJ_LUPY_BOUND, var_r31); break; - case fpcNm_ITEM_ARROW_10: - case fpcNm_ITEM_ARROW_20: - case fpcNm_ITEM_ARROW_30: - case fpcNm_ITEM_ARROW_1: - case fpcNm_ITEM_LIGHT_ARROW: + case dItemNo_ARROW_10_e: + case dItemNo_ARROW_20_e: + case dItemNo_ARROW_30_e: + case dItemNo_ARROW_1_e: + case dItemNo_LIGHT_ARROW_e: fopAcM_seStart(this, Z2SE_OBJ_ARROW_BOUND, var_r31); break; } @@ -1183,7 +1183,7 @@ void daItem_c::initSpeed(BOOL i_noTypeChk) { u8 type = daItem_prm::getType(this); if (!i_noTypeChk) { - if (type == TYPE_WAIT_e || type == TYPE_BOOM_HIT_e || m_itemNo == fpcNm_ITEM_BOOMERANG) { + if (type == TYPE_WAIT_e || type == TYPE_BOOM_HIT_e || m_itemNo == dItemNo_BOOMERANG_e) { y_speed = 0.0f; speedf = 0.0f; } else if (type == TYPE_LAUNCH_NO_RND_e || type == TYPE_FIXED_PLACE_e) { @@ -1240,18 +1240,18 @@ static actor_method_class l_daItem_Method = { }; actor_process_profile_definition g_profile_ITEM = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_ITEM, - &g_fpcLf_Method.base, - sizeof(daItem_c), - 0, - 0, - &g_fopAc_Method.base, - 236, - &l_daItem_Method, - 0xC0100, - fopAc_ACTOR_e, - fopAc_CULLSPHERE_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ITEM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daItem_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_ITEM_e, + /* Actor SubMtd */ &l_daItem_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLSPHERE_0_e, }; diff --git a/src/d/actor/d_a_obj_ito.cpp b/src/d/actor/d_a_obj_ito.cpp index 967b00815a..02601f7e31 100644 --- a/src/d/actor/d_a_obj_ito.cpp +++ b/src/d/actor/d_a_obj_ito.cpp @@ -690,18 +690,18 @@ static actor_method_class l_daObj_Ito_Method = { }; actor_process_profile_definition g_profile_OBJ_ITO = { - fpcLy_CURRENT_e, // mLayerID - 4, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_ITO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_ito_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 61, // mPriority - &l_daObj_Ito_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_ITO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_ito_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_ITO_e, + /* Actor SubMtd */ &l_daObj_Ito_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kabuto.cpp b/src/d/actor/d_a_obj_kabuto.cpp index 1012e9eb1c..1e923eff24 100644 --- a/src/d/actor/d_a_obj_kabuto.cpp +++ b/src/d/actor/d_a_obj_kabuto.cpp @@ -10,7 +10,7 @@ #include "m_Do/m_Do_lib.h" #include "d/d_com_inf_game.h" #include "d/d_menu_insect.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_camera_mng.h" #include @@ -494,7 +494,7 @@ void daObjKABUTO_c::Insect_Release() { mMode = 0; } -static u8 const l_kab_itemno[2] = {fpcNm_ITEM_M_BEETLE, fpcNm_ITEM_F_BEETLE}; +static u8 const l_kab_itemno[2] = {dItemNo_M_BEETLE_e, dItemNo_F_BEETLE_e}; // Some unused function went here. // This fake function is here in its place to make the literals match @@ -733,7 +733,7 @@ cPhs_Step daObjKABUTO_c::create() { if (mLocation == LOC_UNK_2) { field_0x56c = 0; shape_angle.x -= 0x2000; - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } else { mDraw = true; attention_info.distances[fopAc_attn_CARRY_e] = 0x5D; @@ -864,18 +864,18 @@ static actor_method_class l_daObjKABUTO_Method = { }; actor_process_profile_definition g_profile_Obj_Kabuto = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_Kabuto, - &g_fpcLf_Method.base, - sizeof(daObjKABUTO_c), - 0, - 0, - &g_fopAc_Method.base, - 0x1DD, - &l_daObjKABUTO_Method, - 0xC0120, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Kabuto_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKABUTO_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Kabuto_e, + /* Actor SubMtd */ &l_daObjKABUTO_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kag.cpp b/src/d/actor/d_a_obj_kag.cpp index 49313a7bf5..acfeb88fd2 100644 --- a/src/d/actor/d_a_obj_kag.cpp +++ b/src/d/actor/d_a_obj_kag.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_kag.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -223,7 +223,7 @@ void daObjKAG_c::fly() { if (field_0x85a == 0) { if (flamePos != NULL && current.pos.absXZ(*flamePos) < 1800.0f) { field_0x84e = cLib_targetAngleY(¤t.pos, flamePos) + cM_rndFX(8192.0f); - + if (current.pos.absXZ(*flamePos) < 200.0f) { field_0x85a = cM_rndF(4.0f) + 4.0f; } else { @@ -381,7 +381,7 @@ void daObjKAG_c::walk() { void daObjKAG_c::bin_wait() { if (field_0x83c == 0) { mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("I_Kag", BCK_KAG_FLY), J3DFrameCtrl::EMode_LOOP, 5.0f, 0.0f, 0.0f, -1.0f); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); mDraw = false; gravity = 0.0f; maxFallSpeed = 0.0f; @@ -448,7 +448,7 @@ void daObjKAG_c::hook() { kag_setParticle(); } - if (!fopAcM_CheckStatus(this, fopAcM_STATUS_HOOK_CARRY_NOW)) { + if (!fopAcM_CheckStatus(this, fopAcStts_HOOK_CARRY_NOW_e)) { setAction(&daObjKAG_c::fly); } @@ -459,7 +459,7 @@ void daObjKAG_c::hook() { if (dComIfG_Bgsp().LineCross(&lin_chk)) { cM3dGPla plane; cXyz spbc; - + dComIfG_Bgsp().GetTriPla(lin_chk, &plane); cXyz* pcVar1 = plane.GetNP(); spbc = lin_chk.GetCross(); @@ -648,7 +648,7 @@ cPhs_Step daObjKAG_c::create() { cPhs_Step phase = dComIfG_resLoad(&mPhase, "I_Kag"); if (phase == cPhs_COMPLEATE_e) { OS_REPORT("KAG PARAM %x\n", fopAcM_GetParam(this)); - + field_0x85e = fopAcM_GetParam(this) & 3; if (field_0x85e == 3) { field_0x85e = 0; @@ -769,18 +769,18 @@ static actor_method_class l_daObjKAG_Method = { }; actor_process_profile_definition g_profile_Obj_Kag = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Kag, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjKAG_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 485, // mPriority - &l_daObjKAG_Method, // sub_method - 0x000C0100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Kag_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKAG_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Kag_e, + /* Actor SubMtd */ &l_daObjKAG_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kage.cpp b/src/d/actor/d_a_obj_kage.cpp index b7b794a2be..768ea5f61d 100644 --- a/src/d/actor/d_a_obj_kage.cpp +++ b/src/d/actor/d_a_obj_kage.cpp @@ -113,7 +113,7 @@ static int daObj_Kage_Create(fopAc_ac_c* actor) { fopAcM_SetMin(actor, -200.0f, -200.0f, -200.0f); fopAcM_SetMax(actor, 200.0f, 200.0f, 200.0f); - i_this->inko_child_id = fopAcM_createChild(PROC_NPC_INKO, fopAcM_GetID(actor), 0, &actor->current.pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1, NULL); + i_this->inko_child_id = fopAcM_createChild(fpcNm_NPC_INKO_e, fopAcM_GetID(actor), 0, &actor->current.pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1, NULL); daObj_Kage_Execute(i_this); } @@ -130,18 +130,18 @@ static actor_method_class l_daObj_Kage_Method = { }; actor_process_profile_definition g_profile_OBJ_KAGE = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_KAGE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_kage_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 62, // mPriority - &l_daObj_Kage_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_KAGE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_kage_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_KAGE_e, + /* Actor SubMtd */ &l_daObj_Kage_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kago.cpp b/src/d/actor/d_a_obj_kago.cpp index 904166228e..dc15a05907 100644 --- a/src/d/actor/d_a_obj_kago.cpp +++ b/src/d/actor/d_a_obj_kago.cpp @@ -407,7 +407,7 @@ int daObj_Kago_c::Execute() { for (int i = 0; i < 2; i++) { if (field_0x808[i].ChkCoHit() != 0) { actor_p = field_0x808[i].GetCoHitAc(); - if (actor_p != NULL && fopAcM_GetName(actor_p) == PROC_ALINK) break; + if (actor_p != NULL && fopAcM_GetName(actor_p) == fpcNm_ALINK_e) break; actor_p = NULL; } } @@ -685,18 +685,18 @@ static actor_method_class daObj_Kago_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_KAGO = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_KAGO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_Kago_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 717, // mPriority - &daObj_Kago_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_KAGO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Kago_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_KAGO_e, + /* Actor SubMtd */ &daObj_Kago_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kaisou.cpp b/src/d/actor/d_a_obj_kaisou.cpp index 7899d06e9c..fe2204d8ca 100644 --- a/src/d/actor/d_a_obj_kaisou.cpp +++ b/src/d/actor/d_a_obj_kaisou.cpp @@ -304,18 +304,18 @@ static actor_method_class l_daObjKaisou_Method = { }; actor_process_profile_definition g_profile_Obj_Kaisou = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Kaisou, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjKaisou_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 460, // mPriority - &l_daObjKaisou_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Kaisou_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKaisou_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Kaisou_e, + /* Actor SubMtd */ &l_daObjKaisou_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kamakiri.cpp b/src/d/actor/d_a_obj_kamakiri.cpp index e7fbe844e0..2b641d7769 100644 --- a/src/d/actor/d_a_obj_kamakiri.cpp +++ b/src/d/actor/d_a_obj_kamakiri.cpp @@ -506,7 +506,7 @@ void daObjKAM_c::Insect_Release() { field_0x980 = 1; } -static u8 const l_kam_itemno[2] = {fpcNm_ITEM_M_MANTIS, fpcNm_ITEM_F_MANTIS}; +static u8 const l_kam_itemno[2] = {dItemNo_M_MANTIS_e, dItemNo_F_MANTIS_e}; f32 floatDummy() { return -9.0f; @@ -775,7 +775,7 @@ int daObjKAM_c::create() { if (field_0x9c0 == 2) { field_0x56c = 0; ANGLE_SUB(shape_angle.x, 0x2000); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } else { mDraw = true; } @@ -905,18 +905,18 @@ static actor_method_class l_daObjKAM_Method = { }; actor_process_profile_definition g_profile_Obj_Kam = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Kam, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjKAM_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 482, // mPriority - &l_daObjKAM_Method, // sub_method - 0x000C0120, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Kam_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKAM_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Kam_e, + /* Actor SubMtd */ &l_daObjKAM_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kanban2.cpp b/src/d/actor/d_a_obj_kanban2.cpp index 867152267b..8c1f501755 100644 --- a/src/d/actor/d_a_obj_kanban2.cpp +++ b/src/d/actor/d_a_obj_kanban2.cpp @@ -271,7 +271,7 @@ void daObj_Kanban2_c::setKanbanSE(int i_se) { } void daObj_Kanban2_c::createBreakParts(u32 i_parameters, csXyz i_rot) { - fopAcM_create(PROC_OBJ_KANBAN2, i_parameters, ¤t.pos, fopAcM_GetRoomNo(this), &i_rot, NULL, -1); + fopAcM_create(fpcNm_OBJ_KANBAN2_e, i_parameters, ¤t.pos, fopAcM_GetRoomNo(this), &i_rot, NULL, -1); } void daObj_Kanban2_c::createWallHitBreak() { @@ -432,7 +432,7 @@ void daObj_Kanban2_c::damage_check() { } else if (hit_obj->ChkAtType(AT_TYPE_SHIELD_ATTACK) || hit_obj->ChkAtType(AT_TYPE_BOOMERANG) || hit_obj->ChkAtType(AT_TYPE_COPY_ROD) || hit_obj->ChkAtType(AT_TYPE_1000000) || hit_obj->ChkAtType(AT_TYPE_20000)) { damage_type = DAMAGE_SHAKE; } else if (hit_obj->ChkAtType(AT_TYPE_THROW_OBJ)) { - if (fopAcM_GetName(hit_actor) == PROC_NPC_TK) { + if (fopAcM_GetName(hit_actor) == fpcNm_NPC_TK_e) { ((daNPC_TK_c*)hit_actor)->setBump(); damage_type = DAMAGE_PIECES; } else { @@ -808,7 +808,7 @@ void daObj_Kanban2_c::calcNormalSwing() { if ((mPartFlags & 0xFF) != 0 && mCcSph.ChkCoHit()) { fopAc_ac_c* hit_actor = dCc_GetAc(mCcSph.GetCoHitObj()->GetAc()); - if (fopAcM_GetName(hit_actor) == PROC_HORSE) { + if (fopAcM_GetName(hit_actor) == fpcNm_HORSE_e) { cXyz sp28(current.pos); if (mPartFlags & PARTS_TOP_HALF) { sp28.y += 100.0f; @@ -1444,7 +1444,7 @@ void daObj_Kanban2_c::executeFloat() { if (field_0x62a == 0 && mCcSph.ChkCoHit()) { cCcD_Obj* hit_obj = mCcSph.GetCoHitObj(); - if (fopAcM_GetName(dCc_GetAc(hit_obj->GetAc())) == PROC_ALINK && daPy_getPlayerActorClass()->speedF > 1.0f) { + if (fopAcM_GetName(dCc_GetAc(hit_obj->GetAc())) == fpcNm_ALINK_e && daPy_getPlayerActorClass()->speedF > 1.0f) { field_0x5e8.y = 0x100; field_0x62a = 10; } @@ -1779,20 +1779,20 @@ static actor_method_class l_daObj_Kanban2_Method = { }; actor_process_profile_definition g_profile_OBJ_KANBAN2 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_KANBAN2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_Kanban2_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 63, // mPriority - &l_daObj_Kanban2_Method, // sub_method - 0x00044100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_KANBAN2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Kanban2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_KANBAN2_e, + /* Actor SubMtd */ &l_daObj_Kanban2_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_obj_kantera.cpp b/src/d/actor/d_a_obj_kantera.cpp index 93240748bd..3d38a949af 100644 --- a/src/d/actor/d_a_obj_kantera.cpp +++ b/src/d/actor/d_a_obj_kantera.cpp @@ -12,7 +12,7 @@ #include "d/d_com_inf_game.h" #include "d/d_item.h" #include "d/d_item_data.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_actor_mng.h" const static dCcD_SrcCyl l_cyl_src = { @@ -263,18 +263,18 @@ static actor_method_class l_daItemKantera_Method = { }; actor_process_profile_definition g_profile_Obj_Kantera = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Kantera, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daItemKantera_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 238, // mPriority - &l_daItemKantera_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Kantera_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daItemKantera_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Kantera_e, + /* Actor SubMtd */ &l_daItemKantera_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_katatsumuri.cpp b/src/d/actor/d_a_obj_katatsumuri.cpp index 9b69e2f429..8b85644d80 100644 --- a/src/d/actor/d_a_obj_katatsumuri.cpp +++ b/src/d/actor/d_a_obj_katatsumuri.cpp @@ -49,8 +49,8 @@ void daObj_KatHIO_c::genMessage(JORMContext* ctx) { #endif static u8 const l_kat_itemno[2] = { - fpcNm_ITEM_M_SNAIL, - fpcNm_ITEM_F_SNAIL, + dItemNo_M_SNAIL_e, + dItemNo_F_SNAIL_e, }; void daObjKAT_c::InitCcSph() { @@ -727,7 +727,7 @@ inline int daObjKAT_c::create() { if (field_0x808 == 2) { field_0x56c = 0; ANGLE_ADD(shape_angle.x, -0x2000); - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } else { mDraw = true; } @@ -880,18 +880,18 @@ static actor_method_class l_daObjKAT_Method = { }; actor_process_profile_definition g_profile_Obj_Kat = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Kat, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjKAT_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 488, // mPriority - &l_daObjKAT_Method, // sub_method - 0x000C0100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Kat_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKAT_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Kat_e, + /* Actor SubMtd */ &l_daObjKAT_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kazeneko.cpp b/src/d/actor/d_a_obj_kazeneko.cpp index f758d2ffed..e686683f27 100644 --- a/src/d/actor/d_a_obj_kazeneko.cpp +++ b/src/d/actor/d_a_obj_kazeneko.cpp @@ -162,7 +162,7 @@ inline int daObjKazeNeko_c::execute() { } if (mCyl.ChkTgHit() != 0) { daNPC_TK_c* tk = (daNPC_TK_c*)mCyl.GetTgHitAc(); - if (fopAcM_GetName(tk) == PROC_NPC_TK) { + if (fopAcM_GetName(tk) == fpcNm_NPC_TK_e) { field_0x740 = attr().field_0x0c; tk->setBump(); } @@ -170,7 +170,7 @@ inline int daObjKazeNeko_c::execute() { swingHead(); if (field_0x750 > 0) { if (--field_0x750 <= 0) { - daNPC_TK_c* tk = (daNPC_TK_c*)fopAcM_SearchByName(PROC_NPC_TK); + daNPC_TK_c* tk = (daNPC_TK_c*)fopAcM_SearchByName(fpcNm_NPC_TK_e); if (tk != NULL) { tk->endHawkCamera(); field_0x752 = 1; @@ -228,18 +228,18 @@ static actor_method_class l_daObjKazeNeko_Method = { }; actor_process_profile_definition g_profile_Obj_KazeNeko = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_KazeNeko, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjKazeNeko_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 30, // mPriority - &l_daObjKazeNeko_Method, // sub_method - 0x00044180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_KazeNeko_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKazeNeko_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_KazeNeko_e, + /* Actor SubMtd */ &l_daObjKazeNeko_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kbacket.cpp b/src/d/actor/d_a_obj_kbacket.cpp index f8ab3e8f37..72f74b9496 100644 --- a/src/d/actor/d_a_obj_kbacket.cpp +++ b/src/d/actor/d_a_obj_kbacket.cpp @@ -694,18 +694,18 @@ static actor_method_class daObj_KBacket_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_KBACKET = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_KBACKET, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_KBacket_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 714, // mPriority - &daObj_KBacket_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_KBACKET_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_KBacket_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_KBACKET_e, + /* Actor SubMtd */ &daObj_KBacket_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kbox.cpp b/src/d/actor/d_a_obj_kbox.cpp index 5951a5d4c7..61eb2a6418 100644 --- a/src/d/actor/d_a_obj_kbox.cpp +++ b/src/d/actor/d_a_obj_kbox.cpp @@ -29,7 +29,7 @@ static bool hio_set; static daObj_Kbox_HIO_c l_HIO; static void ride_call_back(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3) { - if (fopAcM_GetName(param_3) == PROC_ALINK) { + if (fopAcM_GetName(param_3) == fpcNm_ALINK_e) { obj_kbox_class* i_this = (obj_kbox_class*) param_2; if (i_this->field_0x5a0 == 0) { i_this->field_0x5a8 = -50.0f; @@ -529,20 +529,20 @@ static actor_method_class l_daObj_Kbox_Method = { }; actor_process_profile_definition g_profile_OBJ_KBOX = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_KBOX, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_kbox_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 43, // mPriority - &l_daObj_Kbox_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_KBOX_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_kbox_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_KBOX_e, + /* Actor SubMtd */ &l_daObj_Kbox_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_obj_key.cpp b/src/d/actor/d_a_obj_key.cpp index c0bcfdaeda..b7814189ed 100644 --- a/src/d/actor/d_a_obj_key.cpp +++ b/src/d/actor/d_a_obj_key.cpp @@ -58,7 +58,7 @@ static daObj_Key_HIO_c l_HIO; static s16 target_info_count; static void* s_count_sub(void* i_actor, void* i_other) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_KEY && ((fopAc_ac_c*)i_actor)->field_0x560 != 0) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_KEY_e && ((fopAc_ac_c*)i_actor)->field_0x560 != 0) { ((fopAc_ac_c*)i_actor)->health = target_info_count; target_info_count++; } @@ -67,13 +67,13 @@ static void* s_count_sub(void* i_actor, void* i_other) { } static void* s_master_sub(void* i_actor, void* i_other) { - if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_DN) || - fopAcM_GetName(i_actor) == PROC_E_RD || - fopAcM_GetName(i_actor) == PROC_E_RDB || - fopAcM_GetName(i_actor) == PROC_E_DB || - fopAcM_GetName(i_actor) == PROC_E_HB || - fopAcM_GetName(i_actor) == PROC_E_OC || - fopAcM_GetName(i_actor) == PROC_ALINK) + if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_DN_e) || + fopAcM_GetName(i_actor) == fpcNm_E_RD_e || + fopAcM_GetName(i_actor) == fpcNm_E_RDB_e || + fopAcM_GetName(i_actor) == fpcNm_E_DB_e || + fopAcM_GetName(i_actor) == fpcNm_E_HB_e || + fopAcM_GetName(i_actor) == fpcNm_E_OC_e || + fopAcM_GetName(i_actor) == fpcNm_ALINK_e) { f32 x_dist = ((fopAc_ac_c*)i_actor)->current.pos.x - ((fopAc_ac_c*)i_other)->current.pos.x; f32 z_dist = ((fopAc_ac_c*)i_actor)->current.pos.z - ((fopAc_ac_c*)i_other)->current.pos.z; @@ -89,7 +89,7 @@ static void* s_master_sub(void* i_actor, void* i_other) { static void masterkey_check(obj_key_class* i_this) { fopAc_ac_c* actor = &i_this->actor; - daKey_c* pkey = (daKey_c*)fopAcM_SearchByName(PROC_Obj_SmallKey); + daKey_c* pkey = (daKey_c*)fopAcM_SearchByName(fpcNm_Obj_SmallKey_e); if (pkey != NULL) { f32 x_dist = actor->current.pos.x - pkey->current.pos.x; f32 z_dist = actor->current.pos.z - pkey->current.pos.z; @@ -278,14 +278,14 @@ static void chain_control_01(obj_key_class* i_this) { u8 sp8 = 0; J3DModel* parent_model; - if (fopAcM_GetName(pparent) == PROC_E_DN) { + if (fopAcM_GetName(pparent) == fpcNm_E_DN_e) { e_dn_class* dn = (e_dn_class*)pparent; parent_model = dn->anm_p->getModel(); MTXCopy(parent_model->getAnmMtx(1), *calc_mtx); spC4.set(5.0f + KREG_F(0), 30.0f + KREG_F(1), 20.0f + KREG_F(2)); MtxPosition(&spC4, &spB8); - } else if (fopAcM_GetName(pparent) == PROC_E_RD) { + } else if (fopAcM_GetName(pparent) == fpcNm_E_RD_e) { e_rd_class* rd = (e_rd_class*)pparent; parent_model = rd->anm_p->getModel(); @@ -293,7 +293,7 @@ static void chain_control_01(obj_key_class* i_this) { spC4.set(12.0f + VREG_F(0), -5.0f + VREG_F(1), VREG_F(2)); MtxPosition(&spC4, &spB8); rd->enemy.field_0x567 = 1; - } else if (fopAcM_GetName(pparent) == PROC_E_RDB) { + } else if (fopAcM_GetName(pparent) == fpcNm_E_RDB_e) { e_rdb_class* rdb = (e_rdb_class*)pparent; parent_model = rdb->mpModelMorf->getModel(); @@ -311,7 +311,7 @@ static void chain_control_01(obj_key_class* i_this) { fopAcM_delete(pkey); fopAcM_delete(actor); } - } else if (fopAcM_GetName(pparent) == PROC_E_OC) { + } else if (fopAcM_GetName(pparent) == fpcNm_E_OC_e) { daE_OC_c* oc = (daE_OC_c*)pparent; parent_model = oc->getOcModel(); @@ -319,7 +319,7 @@ static void chain_control_01(obj_key_class* i_this) { spC4.set(5.0f + nREG_F(0), nREG_F(1), nREG_F(2)); MtxPosition(&spC4, &spB8); sp8 = 1; - } else if (fopAcM_GetName(pparent) == PROC_E_DB || fopAcM_GetName(pparent) == PROC_E_HB) { + } else if (fopAcM_GetName(pparent) == fpcNm_E_DB_e || fopAcM_GetName(pparent) == fpcNm_E_HB_e) { e_db_class* db = (e_db_class*)pparent; if (db->action == 20) { @@ -437,7 +437,7 @@ static void chain_control_01(obj_key_class* i_this) { } s16 spA; - if (fopAcM_GetName(pparent) == PROC_E_RDB) { + if (fopAcM_GetName(pparent) == fpcNm_E_RDB_e) { e_rdb_class* rdb = (e_rdb_class*)pparent; if (rdb->field_0x1104 != 0) { spA = -(pparent->shape_angle.y + TREG_S(7) + 0x4000); @@ -650,18 +650,18 @@ static actor_method_class l_daObj_Key_Method = { }; actor_process_profile_definition g_profile_OBJ_KEY = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_KEY, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_key_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 44, // mPriority - &l_daObj_Key_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_KEY_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_key_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_KEY_e, + /* Actor SubMtd */ &l_daObj_Key_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_keyhole.cpp b/src/d/actor/d_a_obj_keyhole.cpp index e50106aa00..4e58733163 100644 --- a/src/d/actor/d_a_obj_keyhole.cpp +++ b/src/d/actor/d_a_obj_keyhole.cpp @@ -842,20 +842,20 @@ static actor_method_class l_daObj_Keyhole_Method = { }; actor_process_profile_definition g_profile_OBJ_KEYHOLE = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_KEYHOLE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_keyhole_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 45, // mPriority - &l_daObj_Keyhole_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_KEYHOLE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_keyhole_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_KEYHOLE_e, + /* Actor SubMtd */ &l_daObj_Keyhole_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_obj_kgate.cpp b/src/d/actor/d_a_obj_kgate.cpp index 7f2d395f99..ceb677a846 100644 --- a/src/d/actor/d_a_obj_kgate.cpp +++ b/src/d/actor/d_a_obj_kgate.cpp @@ -32,7 +32,7 @@ enum { }; static void* search_coach(void* i_actor, void* i_data) { - if (i_actor != NULL && fopAcM_IsActor(i_actor) && fopAcM_GetProfName(i_actor) == PROC_NPC_COACH) + if (i_actor != NULL && fopAcM_IsActor(i_actor) && fopAcM_GetProfName(i_actor) == fpcNm_NPC_COACH_e) { return i_actor; } @@ -988,18 +988,18 @@ static actor_method_class daObjKGate_METHODS = { }; actor_process_profile_definition g_profile_Obj_KkrGate = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_KkrGate, - &g_fpcLf_Method.base, - sizeof(daObjKGate_c), - 0, - 0, - &g_fopAc_Method.base, - 599, - &daObjKGate_METHODS, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_KkrGate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKGate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_KkrGate_e, + /* Actor SubMtd */ &daObjKGate_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ki.cpp b/src/d/actor/d_a_obj_ki.cpp index 95f68c5a3f..569368a4a6 100644 --- a/src/d/actor/d_a_obj_ki.cpp +++ b/src/d/actor/d_a_obj_ki.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_ki.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static int ki_bmd[2] = {9, 10}; @@ -225,18 +225,18 @@ static actor_method_class l_daObj_Ki_Method = { }; actor_process_profile_definition g_profile_OBJ_KI = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_OBJ_KI, - &g_fpcLf_Method.base, - sizeof(obj_ki_class), - 0, - 0, - &g_fopAc_Method.base, - 0x2C2, - &l_daObj_Ki_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_7_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_KI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_ki_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_KI_e, + /* Actor SubMtd */ &l_daObj_Ki_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_7_e, }; diff --git a/src/d/actor/d_a_obj_kiPot.cpp b/src/d/actor/d_a_obj_kiPot.cpp index eb0ddc56a0..54e01c5a12 100644 --- a/src/d/actor/d_a_obj_kiPot.cpp +++ b/src/d/actor/d_a_obj_kiPot.cpp @@ -66,7 +66,7 @@ void daKiPot_c::init_modeWait() { void daKiPot_c::modeWait() { if (chkEvent() && eventInfo.checkCommandCatch() == 0) { - dComIfGp_att_CatchRequest(this, fpcNm_ITEM_UGLY_SOUP, 100.0f, 50.0f, -50.0f, 0x2000, 1); + dComIfGp_att_CatchRequest(this, dItemNo_UGLY_SOUP_e, 100.0f, 50.0f, -50.0f, 0x2000, 1); eventInfo.onCondition(dEvtCnd_40_e); } } @@ -115,18 +115,18 @@ static actor_method_class l_daKiPot_Method = { }; actor_process_profile_definition g_profile_Obj_KiPot = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_KiPot, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daKiPot_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 517, // mPriority - &l_daKiPot_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_KiPot_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daKiPot_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_KiPot_e, + /* Actor SubMtd */ &l_daKiPot_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kita.cpp b/src/d/actor/d_a_obj_kita.cpp index 41ee61bbf7..7c531310bf 100644 --- a/src/d/actor/d_a_obj_kita.cpp +++ b/src/d/actor/d_a_obj_kita.cpp @@ -263,18 +263,18 @@ static actor_method_class l_daObj_Kita_Method = { }; actor_process_profile_definition g_profile_OBJ_KITA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_KITA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_kita_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 707, // mPriority - &l_daObj_Kita_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_KITA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_kita_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_KITA_e, + /* Actor SubMtd */ &l_daObj_Kita_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kjgjs.cpp b/src/d/actor/d_a_obj_kjgjs.cpp index 40e8514875..2a174669d5 100644 --- a/src/d/actor/d_a_obj_kjgjs.cpp +++ b/src/d/actor/d_a_obj_kjgjs.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_kjgjs.h" #include "d/d_bg_w.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static const u32 l_dzbidx[2] = {8, 9}; static const char* l_arcName = "K_jgjs"; @@ -113,18 +113,18 @@ static actor_method_class daObjKJgjs_METHODS = { }; actor_process_profile_definition g_profile_Obj_KJgjs = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_KJgjs, - &g_fpcLf_Method.base, - sizeof(daObjKJgjs_c), - 0, - 0, - &g_fopAc_Method.base, - 677, - &daObjKJgjs_METHODS, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_KJgjs_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKJgjs_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_KJgjs_e, + /* Actor SubMtd */ &daObjKJgjs_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kkanban.cpp b/src/d/actor/d_a_obj_kkanban.cpp index ccfc068e3d..661b26d1be 100644 --- a/src/d/actor/d_a_obj_kkanban.cpp +++ b/src/d/actor/d_a_obj_kkanban.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_kkanban.h" #include "SSystem/SComponent/c_math.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include static int nodeCallBack(J3DJoint* i_joint, int param_1) { @@ -156,18 +156,18 @@ static actor_method_class daObjKKanban_METHODS = { }; actor_process_profile_definition g_profile_Obj_KKanban = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_KKanban, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjKKanban_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 548, // mPriority - &daObjKKanban_METHODS, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_KKanban_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKKanban_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_KKanban_e, + /* Actor SubMtd */ &daObjKKanban_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_klift00.cpp b/src/d/actor/d_a_obj_klift00.cpp index e62d982077..99b204592e 100644 --- a/src/d/actor/d_a_obj_klift00.cpp +++ b/src/d/actor/d_a_obj_klift00.cpp @@ -496,18 +496,18 @@ static actor_method_class daObjKLift00_METHODS = { }; actor_process_profile_definition g_profile_Obj_KLift00 = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_KLift00, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjKLift00_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 673, // mPriority - &daObjKLift00_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType - }; + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_KLift00_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKLift00_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_KLift00_e, + /* Actor SubMtd */ &daObjKLift00_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/src/d/actor/d_a_obj_knBullet.cpp b/src/d/actor/d_a_obj_knBullet.cpp index 88ebf33240..c4eabe796a 100644 --- a/src/d/actor/d_a_obj_knBullet.cpp +++ b/src/d/actor/d_a_obj_knBullet.cpp @@ -203,18 +203,18 @@ static actor_method_class l_daObjKnBullet_Method = { }; actor_process_profile_definition g_profile_KN_BULLET = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_KN_BULLET, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjKnBullet_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 348, // mPriority - &l_daObjKnBullet_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KN_BULLET_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKnBullet_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KN_BULLET_e, + /* Actor SubMtd */ &l_daObjKnBullet_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kshutter.cpp b/src/d/actor/d_a_obj_kshutter.cpp index 2923578977..5cfa8c719b 100644 --- a/src/d/actor/d_a_obj_kshutter.cpp +++ b/src/d/actor/d_a_obj_kshutter.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_kshutter.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -204,7 +204,7 @@ int daObjKshtr_c::Create() { } if (mType == TYPE_V_SHUTTER) { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); } initBaseMtx(); @@ -299,7 +299,7 @@ void daObjKshtr_c::initKey() { uVar1 = 0xFFFFFFFF; } - mKeyHoleId = fopAcM_createChildFromOffset(PROC_OBJ_KEYHOLE, fopAcM_GetID(this), uVar1, &sp20, fopAcM_GetRoomNo(this), NULL, &scale, -1, NULL); + mKeyHoleId = fopAcM_createChildFromOffset(fpcNm_OBJ_KEYHOLE_e, fopAcM_GetID(this), uVar1, &sp20, fopAcM_GetRoomNo(this), NULL, &scale, -1, NULL); } } } @@ -633,7 +633,7 @@ BOOL daObjKshtr_c::openProc() { default: return openProc_type2(); - + case TYPE_L3BOSS: return openProc_typeL3Boss(); @@ -734,7 +734,7 @@ BOOL daObjKshtr_c::demoJail1() { mDemoMode = 2; } break; - + case 2: anmInit(); mDoAud_seStart(Z2SE_OBJ_WOOD_DOOR_ROLLOPEN2, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); @@ -750,7 +750,7 @@ BOOL daObjKshtr_c::demoJail1() { mDemoMode = 4; } break; - + case 4: break; } @@ -776,7 +776,7 @@ BOOL daObjKshtr_c::demoJail2() { mDemoMode = 2; } break; - + case 2: speedF = 0.0f; mDemoMode = 3; @@ -804,7 +804,7 @@ BOOL daObjKshtr_c::demoJail11() { mDoAud_seStart(Z2SE_OBJ_WOOD_DOOR_ROLLOPEN2, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); offDzb(); break; - + case 1: if (mpBckAnm->play()) { mDemoMode = 2; @@ -972,18 +972,18 @@ static actor_method_class daObjKshtr_METHODS = { }; actor_process_profile_definition g_profile_Obj_Kshutter = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Kshutter, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjKshtr_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 443, // mPriority - &daObjKshtr_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Kshutter_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKshtr_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Kshutter_e, + /* Actor SubMtd */ &daObjKshtr_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ktOnFire.cpp b/src/d/actor/d_a_obj_ktOnFire.cpp index b866dc0811..b11a22c7cf 100644 --- a/src/d/actor/d_a_obj_ktOnFire.cpp +++ b/src/d/actor/d_a_obj_ktOnFire.cpp @@ -203,18 +203,18 @@ static actor_method_class l_daKtOnFire_Method = { }; actor_process_profile_definition g_profile_Tag_KtOnFire = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_KtOnFire, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daKtOnFire_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 502, // mPriority - &l_daKtOnFire_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_KtOnFire_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daKtOnFire_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_KtOnFire_e, + /* Actor SubMtd */ &l_daKtOnFire_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kuwagata.cpp b/src/d/actor/d_a_obj_kuwagata.cpp index 3a097e7bd7..ddb00d443d 100644 --- a/src/d/actor/d_a_obj_kuwagata.cpp +++ b/src/d/actor/d_a_obj_kuwagata.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_kuwagata.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -10,7 +10,7 @@ #include "d/actor/d_a_player.h" #include "d/d_cc_d.h" #include "d/d_menu_insect.h" -#include "f_pc/f_pc_name.h" +#include "d/d_item_data.h" #include class daObj_KuwHIO_c : public JORReflexible{ @@ -72,7 +72,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { int daObjKUW_c::CreateHeap() { J3DModelData* modelData; - + if (mSex == SEX_FEMALE) { modelData = (J3DModelData*)dComIfG_getObjectRes("I_Kuw", 10); JUT_ASSERT(255, modelData != NULL); @@ -80,19 +80,19 @@ int daObjKUW_c::CreateHeap() { modelData = (J3DModelData*)dComIfG_getObjectRes("I_Kuw", 11); JUT_ASSERT(259, modelData != NULL); } - + mpMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("I_Kuw", 7), 2, 1.0f, 0, -1, &mSound, 0, 0x11000284); - + if (mpMorf == NULL || mpMorf->getModel() == NULL) { return 0; } - + J3DModel* model = mpMorf->getModel(); mpBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpBrkAnm == NULL) { return 0; } - + J3DAnmTevRegKey* brkRes; if (mSex == SEX_FEMALE) { brkRes = (J3DAnmTevRegKey*)dComIfG_getObjectRes("I_Kuw", 14); @@ -105,12 +105,12 @@ int daObjKUW_c::CreateHeap() { return 0; } } - + mpBtkAnm = JKR_NEW mDoExt_btkAnm(); if (mpBtkAnm == NULL) { return 0; } - + J3DAnmTextureSRTKey* btkRes; if (mSex == SEX_FEMALE) { btkRes = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("I_Kuw", 18); @@ -123,7 +123,7 @@ int daObjKUW_c::CreateHeap() { return 0; } } - + return 1; } @@ -182,7 +182,7 @@ void daObjKUW_c::WaitAction() { if (mTimers[0] <= 0) { mTimers[0] = 0; } - + if (mTimers[0] == 0) { int randVal = cM_rndF(100.0f); if (randVal < 40) { @@ -203,21 +203,21 @@ void daObjKUW_c::WaitAction() { BOOL daObjKUW_c::WallCheck() { dBgS_LinChk linChk; linChk.SetObj(); - + linChk.Set(&old.pos, ¤t.pos, NULL); - + if (dComIfG_Bgsp().LineCross(&linChk)) { cM3dGPla plane; dComIfG_Bgsp().GetTriPla(linChk, &plane); cXyz* normal = plane.GetNP(); current.pos = linChk.GetCross(); - + cXyz temp1(0.0f, 0.0f, 0.0f); cXyz temp2(0.0f, normal->y, normal->z); field_0x99a.z = -cM_atan2s(normal->x, temp1.abs(temp2)); field_0x99a.x = cM_atan2s(normal->z, normal->y); field_0x9a2 = cM_atan2s(normal->x, normal->z); - + return TRUE; } @@ -228,15 +228,15 @@ void daObjKUW_c::SpeedSet() { speed.y += gravity; cXyz cStack_1c(0.0f, speed.y, speedF); cXyz local_28(0.0f, 0.0f, 0.0f); - + mDoMtx_stack_c::ZXYrotS(field_0x99a); mDoMtx_stack_c::YrotM(current.angle.y); mDoMtx_stack_c::multVec(&cStack_1c, &local_28); - + current.pos.x += local_28.x; current.pos.y += local_28.y; current.pos.z += local_28.z; - + cLib_addCalc2(&speedF, mSpeedFTarget, 0.4f, 10.0f); cLib_addCalc2(&speed.y, mSpeedYTarget, 0.1f, 0.5f); cLib_addCalcAngleS2(¤t.angle.y, mAngleTarget, 0x10, 0x100); @@ -248,36 +248,36 @@ void daObjKUW_c::WallWalk() { cXyz cStack_148(0.0f, 40.0f, 0.0f); cXyz cStack_154(0.0f, 20.0f, 100.0f); cXyz cStack_160; - + dBgS_LinChk linChk; dBgS_LinChk linChk2; - + linChk.SetObj(); linChk2.SetObj(); - + mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(field_0x99a); mDoMtx_stack_c::YrotM(current.angle.y); mDoMtx_stack_c::multVec(&cStack_13c, &cStack_13c); mDoMtx_stack_c::multVec(&cStack_148, &cStack_148); - + linChk.Set(&cStack_148, &cStack_13c, NULL); - + if (dComIfG_Bgsp().LineCross(&linChk)) { speedF = 0.3f; - + cM3dGPla plane; dComIfG_Bgsp().GetTriPla(linChk, &plane); cXyz* normal = plane.GetNP(); - + s16 angleZ = cM_atan2s(normal->x, normal->z); - + cXyz temp1(0.0f, 0.0f, 0.0f); cXyz temp2(0.0f, normal->y, normal->z); f32 normalLen = temp1.abs(temp2); - + cStack_160 = linChk.GetCross(); - + int angleDiff = angleZ - field_0x9a2; if (angleDiff < 0x1000 && angleDiff > -0x1000 && cStack_160.abs(old.pos) < speedF * 3.0f) { @@ -303,7 +303,7 @@ void daObjKUW_c::WalkAction() { mTimers[i] = 0; } } - + switch (mSubAction) { case 0: mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("I_Kuw", 7), 2, 5.0f, 1.0f, 0.0f, -1.0f); @@ -319,10 +319,10 @@ void daObjKUW_c::WalkAction() { mAngleTarget = cM_atan2s(targetDir.x, targetDir.z); mTimers[0] = cM_rndF(50.0f) + 50.0f; } - + if (mTimers[1] == 0) { int randVal = cM_rndF(100.0f); - + if (randVal < 30) { mAction = ACTION_MOVE; mSubAction = 0; @@ -334,7 +334,7 @@ void daObjKUW_c::WalkAction() { } } } - + WallWalk(); } @@ -345,7 +345,7 @@ void daObjKUW_c::MoveAction() { mTimers[i] = 0; } } - + cXyz cStack_ac; cXyz cStack_b8(0.0f, 1.0f, 0.0f); dBgS_LinChk linChk; @@ -353,7 +353,7 @@ void daObjKUW_c::MoveAction() { linChk.SetObj(); cXyz local_c4; cXyz cStack_d0; - + switch (mSubAction) { case 0: mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("I_Kuw", 6), 2, 5.0f, 0.0f, 0.0f, -1.0f); @@ -369,30 +369,30 @@ void daObjKUW_c::MoveAction() { mDoMtx_stack_c::ZXYrotS(field_0x99a); mDoMtx_stack_c::multVec(&cStack_b8, &cStack_b8); mTimers[0] = cM_rndF(30.0f) + 10.0f; - + if (field_0x9c0 == 0) { mTimers[1] = cM_rndF(80.0f) + 80.0f; } else { mTimers[1] = cM_rndF(50.0f) + 50.0f; } - + mSpeedFTarget = cM_rndF(5.0f) + 8.0f; mAngleTarget = field_0x9a2; mSpeedYTarget = 3.0f; speed.y = 5.0f; } - break; + break; case 2: cXyz* flamePos = playerActor->getKandelaarFlamePos(); if (flamePos != NULL) { mAngleTarget = cLib_targetAngleY(¤t.pos, flamePos); - + if (flamePos->abs(current.pos) < 200.0f && speed.y < 0.0f) { cLib_addCalcAngleS2(¤t.angle.y, mAngleTarget, 2, 0x500); } else { cLib_addCalcAngleS2(¤t.angle.y, mAngleTarget, 0x10, 0x200); } - + if (flamePos->abs(current.pos) < 11.0f && fopAcM_GetSpeedF(playerActor) < 1.0f) { local_c4.set(0.0f, 0.0f, 10.0f); if (field_0x9c2 == 0) { @@ -425,7 +425,7 @@ void daObjKUW_c::MoveAction() { } } } - + if (mTimers[0] == 0) { if (flamePos == NULL) { local_c4 = home.pos - current.pos; @@ -436,15 +436,15 @@ void daObjKUW_c::MoveAction() { mTimers[0] = cM_rndF(20.0f) + 20.0f; mSpeedFTarget = cM_rndF(5.0f) + 8.0f; } - + if (mTimers[1] == 0) { mSpeedYTarget = -cM_rndF(3.0f); mTimers[1] = cM_rndF(20.0f) + 20.0f; } - + mpMorf->getFrame(); SpeedSet(); - + if (field_0x9c0 == 0) { cLib_addCalcAngleS2(&field_0x99a.x, 0, 0x10, 0x1000); cLib_addCalcAngleS2(&field_0x99a.z, 0, 0x10, 0x1000); @@ -452,7 +452,7 @@ void daObjKUW_c::MoveAction() { cLib_addCalcAngleS2(&field_0x99a.x, 0, 0x10, 0x100); cLib_addCalcAngleS2(&field_0x99a.z, 0, 0x10, 0x100); } - + if (WallCheck()) { mAction = ACTION_WAIT; mSubAction = 0; @@ -461,17 +461,17 @@ void daObjKUW_c::MoveAction() { shape_angle.x = 0; shape_angle.z = 0; } - + if (field_0x9c0 == 1) { cLib_addCalcAngleS2(¤t.angle.y, mAngleTarget, 0x10, 0x100); } - + if (field_0x9c2 == 0) { cLib_chaseAngleS(&shape_angle.x, 0, 0x400); } break; } - + if (mpMorf->getPlaySpeed() == 1.0f) { mSound.startCreatureSoundLevel(Z2SE_INSCT_BTBT, 0, -1); } @@ -517,7 +517,7 @@ void daObjKUW_c::Insect_Release() { } static u8 const l_kuw_itemno[2] = { - fpcNm_ITEM_M_STAG_BEETLE, fpcNm_ITEM_F_STAG_BEETLE, + dItemNo_M_STAG_BEETLE_e, dItemNo_F_STAG_BEETLE_e, }; static f32 dummyFloat() { return -9.0f; } @@ -525,7 +525,7 @@ static f32 dummyFloat() { return -9.0f; } void daObjKUW_c::Z_BufferChk() { cXyz local_5c; cXyz cStack_68; - + cStack_68 = current.pos; cStack_68.y += 20.0f; mDoLib_project(&cStack_68, &local_5c); @@ -537,22 +537,22 @@ void daObjKUW_c::Z_BufferChk() { } else { trimHeight = 0.0f; } - - if (local_5c.x > 0.0f && local_5c.x < FB_WIDTH && + + if (local_5c.x > 0.0f && local_5c.x < FB_WIDTH && local_5c.y > trimHeight && local_5c.y < FB_HEIGHT - trimHeight) { dComIfGd_peekZ(local_5c.x, local_5c.y, &field_0x9bc); } - + view_class* view = dComIfGd_getView(); f32 nearPlane = view->near_; f32 farPlane = view->far_; - + mDoLib_pos2camera(&cStack_68, &local_5c); local_5c.z += 50.0f; if (local_5c.z > 0.0f) { local_5c.z = 0.0f; } - + field_0x9b8 = ((nearPlane + ((farPlane * nearPlane) / local_5c.z)) / (farPlane - nearPlane) + 1.0f) * 16777215.0f; } @@ -580,7 +580,7 @@ void daObjKUW_c::BoomChk() { home.pos = current.pos; cXyz targetPos = *playerPos; targetPos.y += 100.0f; - + if (mBoomerangMove.posMove(¤t.pos, &shape_angle.y, NULL, 0x1c00)) { mBoomerangMove.bgCheckAfterOffset(¤t.pos); current.pos.y += 0.5f; @@ -588,7 +588,7 @@ void daObjKUW_c::BoomChk() { dBgS_LinChk linChk; linChk.SetObj(); linChk.Set(&targetPos, ¤t.pos, NULL); - + if (dComIfG_Bgsp().LineCross(&linChk)) { cM3dGPla plane; dComIfG_Bgsp().GetTriPla(linChk, &plane); @@ -662,7 +662,7 @@ int daObjKUW_c::Execute() { attention_info.position = current.pos; eyePos = current.pos; eyePos.y += 10.0f; - + switch (field_0x9c0) { case 0: if (!fopAcM_checkHookCarryNow(this)) { @@ -670,7 +670,7 @@ int daObjKUW_c::Execute() { } else { home.pos = current.pos; } - + mParticleKey2 = dComIfGp_particle_set(mParticleKey2, 0xa1c, ¤t.pos, &tevStr, &shape_angle, 0, 0xff, 0, -1, 0, 0, 0); SetCcSph(); ObjHit(); @@ -685,11 +685,11 @@ int daObjKUW_c::Execute() { ShopAction(); break; } - + if (mAction == ACTION_MOVE && mSubAction == 2 && speed.y < 0.0f) { mAcch.CrrPos(dComIfG_Bgsp()); } - + mpBrkAnm->play(); mpBtkAnm->play(); mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); @@ -754,7 +754,7 @@ bool daObjKUW_c::CreateChk() { if (type == 0xf) { type = 0; } - + if (field_0x9c0 != 2) { if (type != 0) { if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[l_musiya_num[0]]) || !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[l_musiya_num[1]])) { @@ -785,7 +785,7 @@ int daObjKUW_c::create() { if (field_0x9c0 == 2) { field_0x56c = 0; shape_angle.x -= 0x2000; - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } else { mDraw = 1; } @@ -901,18 +901,18 @@ static actor_method_class l_daObjKUW_Method = { }; actor_process_profile_definition g_profile_Obj_Kuw = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Kuw, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjKUW_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 479, // mPriority - &l_daObjKUW_Method, // sub_method - 0x000C0100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Kuw_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKUW_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Kuw_e, + /* Actor SubMtd */ &l_daObjKUW_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kwheel00.cpp b/src/d/actor/d_a_obj_kwheel00.cpp index ad63eb2234..5ec012478d 100644 --- a/src/d/actor/d_a_obj_kwheel00.cpp +++ b/src/d/actor/d_a_obj_kwheel00.cpp @@ -67,7 +67,7 @@ static void* searchLv3Water(void* param_0, void* i_this) { daLv3Water_c* const lv3Water = static_cast(param_0); daObjKWheel00_c* const kWheel00 = static_cast(i_this); - if(lv3Water && fopAcM_IsActor(lv3Water) && fopAcM_GetProfName(lv3Water) == PROC_Obj_Lv3Water) { + if(lv3Water && fopAcM_IsActor(lv3Water) && fopAcM_GetProfName(lv3Water) == fpcNm_Obj_Lv3Water_e) { if( (fopAcM_GetRoomNo(kWheel00) == 7 && lv3Water->getType() == 8) || (fopAcM_GetRoomNo(kWheel00) == 11 && lv3Water->getType() == 14) || @@ -356,20 +356,20 @@ static actor_method_class daObjKWheel00_METHODS = { }; actor_process_profile_definition g_profile_Obj_KWheel00 = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_KWheel00, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjKWheel00_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 662, // mPriority - &daObjKWheel00_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_KWheel00_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKWheel00_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_KWheel00_e, + /* Actor SubMtd */ &daObjKWheel00_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; static int daObjKWheel00_create1st(daObjKWheel00_c* i_this) { diff --git a/src/d/actor/d_a_obj_kwheel01.cpp b/src/d/actor/d_a_obj_kwheel01.cpp index d6d0b074ab..b91a01ce23 100644 --- a/src/d/actor/d_a_obj_kwheel01.cpp +++ b/src/d/actor/d_a_obj_kwheel01.cpp @@ -69,7 +69,7 @@ cPhs_Step daObjKWheel01_c::create1st() { if (CHECK_KLIFT_EXISTS(i)) { cXyz kLiftPos; MTXMultVec(mNewBgMtx, &l_pos[i], &kLiftPos); - m_klift_pid[i] = fopAcM_create(PROC_Obj_KLift00, createLiftParameters, &kLiftPos, fopAcM_GetHomeRoomNo(this), 0, 0, -1); + m_klift_pid[i] = fopAcM_create(fpcNm_Obj_KLift00_e, createLiftParameters, &kLiftPos, fopAcM_GetHomeRoomNo(this), 0, 0, -1); JUT_ASSERT(146, m_klift_pid[i] != fpcM_ERROR_PROCESS_ID_e); mCreatedKLifts = true; @@ -192,7 +192,7 @@ int daObjKWheel01_c::Create() { static void* searchKWheel00(void* param_0, void* i_this) { UNUSED(i_this); - if (param_0 && fopAcM_IsActor(param_0) && fopAcM_GetProfName(param_0) == PROC_Obj_KWheel00) { + if (param_0 && fopAcM_IsActor(param_0) && fopAcM_GetProfName(param_0) == fpcNm_Obj_KWheel00_e) { daObjKWheel00_c* const kWheel00 = static_cast(param_0); if (kWheel00->getType() == daObjKWheel00_c::TYPE_LARGE_GOLD) { return param_0; @@ -348,20 +348,20 @@ static actor_method_class daObjKWheel01_METHODS = { }; actor_process_profile_definition g_profile_Obj_KWheel01 = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_KWheel01, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjKWheel01_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 663, // mPriority - &daObjKWheel01_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_KWheel01_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKWheel01_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_KWheel01_e, + /* Actor SubMtd */ &daObjKWheel01_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; static int daObjKWheel01_create1st(daObjKWheel01_c* i_this) { diff --git a/src/d/actor/d_a_obj_kznkarm.cpp b/src/d/actor/d_a_obj_kznkarm.cpp index ef8f97e5bc..2b8828ce03 100644 --- a/src/d/actor/d_a_obj_kznkarm.cpp +++ b/src/d/actor/d_a_obj_kznkarm.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_kznkarm.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -20,8 +20,8 @@ public: void ct(); void dt(); - /* 0x04 */ int mCount; - /* 0x04 */ daObjKznkarm_Attr_c mAttr; + /* 0x04 */ int mCount; + /* 0x04 */ daObjKznkarm_Attr_c mAttr; }; static daObjKznkarm_Hio_c M_hio; @@ -76,7 +76,7 @@ void daObjKznkarm_Hio_c::genMessage(JORMContext* ctx) { daObjKznkarm_Attr_c const daObjKznkarm_c::M_attr = { -5.0f, -30.0f, 0.6f, 0.94f, 40.0f, 40.0f, -60.0f, - -6.0f, -6.0f, -60.0f, 0.0f, + -6.0f, -6.0f, -60.0f, 0.0f, 12.0f, 0, 0x1000, 0, -0x2000, }; @@ -113,13 +113,13 @@ inline daObjKznkarm_Attr_c* daObjKznkarm_c::attr() const { #if DEBUG return &M_hio.mAttr; #else - return (daObjKznkarm_Attr_c*)&M_attr; + return (daObjKznkarm_Attr_c*)&M_attr; #endif } void daObjKznkarm_c::initBroken() { mMode = MODE_BROKEN_e; - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x80); + fopAcM_OffStatus(this, fopAcStts_NOEXEC_e); daObjKazeNeko_c* kazeNeko = (daObjKazeNeko_c*)fpcM_SearchByID(parentActorID); if (kazeNeko != NULL) { kazeNeko->getFirstVec(&speed, fopAcM_GetParam(this)); @@ -148,7 +148,7 @@ void daObjKznkarm_c::executeBroken() { speed *= attr()->bounce_coeff; current.pos.y = gndH; } - + if (speed.abs() < fabsf(gravity)) { speed.zero(); field_0x7a8 = 0; @@ -170,7 +170,7 @@ void daObjKznkarm_c::executeBroken() { void daObjKznkarm_c::initCarry() { mMode = MODE_CARRY_e; - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x80); + fopAcM_OffStatus(this, fopAcStts_NOEXEC_e); cLib_offBit(attention_info.flags, fopAc_AttnFlag_CARRY_e); field_0x7ae = 0; field_0x7af = 0; @@ -203,7 +203,7 @@ void daObjKznkarm_c::executeCarry() { void daObjKznkarm_c::initThrow() { mMode = MODE_THROW_e; - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x80); + fopAcM_OffStatus(this, fopAcStts_NOEXEC_e); speed.zero(); if (speedF > 1.0f) { daPy_py_c* player = daPy_getPlayerActorClass(); @@ -227,12 +227,12 @@ void daObjKznkarm_c::executeThrow() { speed.y = maxFallSpeed; } } - + f32 savedSpeedY = speed.y; fopAcM_posMove(this, 0); mAcch.CrrPos(dComIfG_Bgsp()); speed.y = savedSpeedY; - + if (mAcch.ChkGroundLanding()) { f32 speedAbs = speed.abs(); cM3dGPla groundPla; @@ -249,7 +249,7 @@ void daObjKznkarm_c::executeThrow() { speed.zero(); setAction(MODE_STAY_e); } - + if (mAcch.ChkWallHit()) { f32 speedAbs = speed.abs(); cM3dGPla wallPla; @@ -264,7 +264,7 @@ void daObjKznkarm_c::executeThrow() { } field_0x7ac *= -1; } - + if (field_0x7ae == 0) { if (mAcch.ChkWaterIn()) { cXyz effectPos = current.pos; @@ -280,12 +280,12 @@ void daObjKznkarm_c::executeThrow() { field_0x7ae = 1; } } - + if (field_0x7ae != 0) { speed.x *= attr()->water_drag; speed.z *= attr()->water_drag; } - + f32 fVar1 = (speed.absXZ() / attr()->initial_throwing_force); int angleOffset = (f32)field_0x7ac * fVar1; shape_angle.z += angleOffset; @@ -294,7 +294,7 @@ void daObjKznkarm_c::executeThrow() { void daObjKznkarm_c::initStay() { mMode = MODE_STAY_e; - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x80); + fopAcM_OnStatus(this, fopAcStts_NOEXEC_e); cLib_onBit(attention_info.flags, fopAc_AttnFlag_CARRY_e); speedF = 0.0f; field_0x7a8 = getGroundSlope(shape_angle.y) - 0x4000; @@ -377,7 +377,7 @@ inline int daObjKznkarm_c::draw() { dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); - + cXyz shadowPos = cXyz(current.pos.x, current.pos.y + 50.0f, current.pos.z); mShadowId = dComIfGd_setShadow(mShadowId, 1, mpModel, &shadowPos, 600.0f, 0.0f, current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); @@ -446,18 +446,18 @@ static actor_method_class l_daObjKznkarm_Method = { }; actor_process_profile_definition g_profile_Obj_KznkArm = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_KznkArm, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjKznkarm_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 31, // mPriority - &l_daObjKznkarm_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_KznkArm_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKznkarm_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_KznkArm_e, + /* Actor SubMtd */ &l_daObjKznkarm_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ladder.cpp b/src/d/actor/d_a_obj_ladder.cpp index 0003afebd3..dc88e5cf15 100644 --- a/src/d/actor/d_a_obj_ladder.cpp +++ b/src/d/actor/d_a_obj_ladder.cpp @@ -417,18 +417,18 @@ namespace { } actor_process_profile_definition g_profile_Obj_Ladder = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Ladder, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLadder::Act_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 23, // mPriority - &daObjLadder::Mthd_Table, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Ladder_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLadder::Act_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Ladder_e, + /* Actor SubMtd */ &daObjLadder::Mthd_Table, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_laundry.cpp b/src/d/actor/d_a_obj_laundry.cpp index 54a210cea2..289ed5f1c4 100644 --- a/src/d/actor/d_a_obj_laundry.cpp +++ b/src/d/actor/d_a_obj_laundry.cpp @@ -102,7 +102,7 @@ void daObjLdy_c::setNormalClothPos() { } } else { if (mCyl.ChkCoHit() != 0) { - if (fopAcM_GetName(mCyl.GetCoHitAc()) == PROC_NPC_TK) { + if (fopAcM_GetName(mCyl.GetCoHitAc()) == fpcNm_NPC_TK_e) { cXyz position = fopAcM_GetPosition(dComIfGp_getPlayer(0)) - mJoints[1].mPos1; position.normalizeZP(); position *= 100.0f; @@ -284,18 +284,18 @@ static actor_method_class l_daObjLdy_Method = { }; actor_process_profile_definition g_profile_Obj_Laundry = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Laundry, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLdy_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 37, // mPriority - &l_daObjLdy_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Laundry_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLdy_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Laundry_e, + /* Actor SubMtd */ &l_daObjLdy_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_laundry_rope.cpp b/src/d/actor/d_a_obj_laundry_rope.cpp index 33c186529b..5dc3ff8f92 100644 --- a/src/d/actor/d_a_obj_laundry_rope.cpp +++ b/src/d/actor/d_a_obj_laundry_rope.cpp @@ -76,7 +76,7 @@ void daObjLndRope_c::create_init() { csXyz childAngle(0, cLib_targetAngleY(ropePosition, ropePosition + 1) + 0x4000, -cLib_targetAngleX(ropePosition, ropePosition + 1)); *procId = - fopAcM_createChild(PROC_Obj_Laundry, fopAcM_GetID(this), *laundryEntry, + fopAcM_createChild(fpcNm_Obj_Laundry_e, fopAcM_GetID(this), *laundryEntry, ropePosition, fopAcM_GetRoomNo(this), &childAngle, NULL, -1, 0); } @@ -289,18 +289,18 @@ static actor_method_class l_daObjLndRope_Method = { }; actor_process_profile_definition g_profile_Obj_LndRope = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_LndRope, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLndRope_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 34, // mPriority - &l_daObjLndRope_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_LndRope_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLndRope_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_LndRope_e, + /* Actor SubMtd */ &l_daObjLndRope_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lbox.cpp b/src/d/actor/d_a_obj_lbox.cpp index 9dff68dfeb..96f2f29bd2 100644 --- a/src/d/actor/d_a_obj_lbox.cpp +++ b/src/d/actor/d_a_obj_lbox.cpp @@ -196,18 +196,18 @@ static actor_method_class l_daObj_Lbox_Method = { (process_method_func)daObj_Lbox_Draw}; actor_process_profile_definition g_profile_OBJ_LBOX = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_OBJ_LBOX, - &g_fpcLf_Method.base, - sizeof(obj_lbox_class), - 0, - 0, - &g_fopAc_Method.base, - 0x29, - &l_daObj_Lbox_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_LBOX_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_lbox_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_LBOX_e, + /* Actor SubMtd */ &l_daObj_Lbox_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_life_container.cpp b/src/d/actor/d_a_obj_life_container.cpp index 8365818ea3..221f106d67 100644 --- a/src/d/actor/d_a_obj_life_container.cpp +++ b/src/d/actor/d_a_obj_life_container.cpp @@ -144,7 +144,7 @@ int daObjLife_c::create() { } m_itemNo = getItemNo(); - if (m_itemNo != fpcNm_ITEM_KAKERA_HEART && m_itemNo != fpcNm_ITEM_UTAWA_HEART) { + if (m_itemNo != dItemNo_KAKERA_HEART_e && m_itemNo != dItemNo_UTAWA_HEART_e) { // "Heart Container: Item No is incorrect!<%d>\n" OS_REPORT_ERROR("ハートの器：アイテム番号が不正です！<%d>\n", m_itemNo); } @@ -153,7 +153,7 @@ int daObjLife_c::create() { return cPhs_ERROR_e; } - if (m_itemNo == fpcNm_ITEM_UTAWA_HEART && dComIfGs_isStageLife()) { + if (m_itemNo == dItemNo_UTAWA_HEART_e && dComIfGs_isStageLife()) { return cPhs_ERROR_e; } @@ -328,7 +328,7 @@ int daObjLife_c::actionGetDemo() { fopAcM_onItem(this, savebit); } - if (m_itemNo == fpcNm_ITEM_KAKERA_HEART) { + if (m_itemNo == dItemNo_KAKERA_HEART_e) { if (strcmp(dComIfGp_getStartStageName(), "F_SP121") == 0) { if (fopAcM_GetRoomNo(this) == 0) { if (savebit == 128) { @@ -372,7 +372,7 @@ int daObjLife_c::actionInitBoomerangCarry() { } int daObjLife_c::actionBoomerangCarry() { - fopAc_ac_c* boomerang = fopAcM_SearchByName(PROC_BOOMERANG); + fopAc_ac_c* boomerang = fopAcM_SearchByName(fpcNm_BOOMERANG_e); if (boomerang != NULL) { current.pos = boomerang->current.pos; } else { @@ -511,18 +511,18 @@ static actor_method_class l_daObjLife_Method = { }; actor_process_profile_definition g_profile_Obj_LifeContainer = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_LifeContainer, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLife_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 239, // mPriority - &l_daObjLife_Method, // sub_method - 0x000C4100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_LifeContainer_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLife_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_LifeContainer_e, + /* Actor SubMtd */ &l_daObjLife_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lp.cpp b/src/d/actor/d_a_obj_lp.cpp index 9f748b316c..2d688ac3de 100644 --- a/src/d/actor/d_a_obj_lp.cpp +++ b/src/d/actor/d_a_obj_lp.cpp @@ -495,20 +495,20 @@ static actor_method_class l_daObj_Lp_Method = { }; actor_process_profile_definition g_profile_OBJ_LP = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_LP, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_lp_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 708, // mPriority - &l_daObj_Lp_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_LP_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_lp_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_LP_e, + /* Actor SubMtd */ &l_daObj_Lp_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_obj_lv1Candle00.cpp b/src/d/actor/d_a_obj_lv1Candle00.cpp index 40394300a3..12582c32af 100644 --- a/src/d/actor/d_a_obj_lv1Candle00.cpp +++ b/src/d/actor/d_a_obj_lv1Candle00.cpp @@ -6,7 +6,7 @@ #include "d/actor/d_a_obj_lv1Candle00.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static daLv1Cdl00_HIO_c l_HIO; @@ -210,7 +210,7 @@ int daLv1Cdl00_c::Execute() { cCcD_Obj* obj = mCyl.GetTgHitObj(); if (obj != NULL) { bool bvar1 = true; - if (fopAcM_GetName(obj->GetAc()) == PROC_ALINK) { + if (fopAcM_GetName(obj->GetAc()) == fpcNm_ALINK_e) { if (mCyl.GetTgHitGObj()->ChkAtType(AT_TYPE_NORMAL_SWORD) && mTgHit) { bvar1 = false; } @@ -276,18 +276,18 @@ static actor_method_class l_daLv1Cdl00_Method = { }; actor_process_profile_definition g_profile_Obj_Lv1Cdl00 = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Lv1Cdl00, - &g_fpcLf_Method.base, - sizeof(daLv1Cdl00_c), - 0, - 0, - &g_fopAc_Method.base, - 0x1EE, - &l_daLv1Cdl00_Method, - 0x60000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv1Cdl00_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv1Cdl00_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv1Cdl00_e, + /* Actor SubMtd */ &l_daLv1Cdl00_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv1Candle01.cpp b/src/d/actor/d_a_obj_lv1Candle01.cpp index 135f74f742..9e1cabfebb 100644 --- a/src/d/actor/d_a_obj_lv1Candle01.cpp +++ b/src/d/actor/d_a_obj_lv1Candle01.cpp @@ -6,7 +6,7 @@ #include "d/actor/d_a_obj_lv1Candle01.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static daLv1Cdl01_HIO_c l_HIO; @@ -164,7 +164,7 @@ int daLv1Cdl01_c::Execute(Mtx** param_0) { cCcD_Obj* obj = mCyl.GetTgHitObj(); if (obj != NULL) { bool bvar1 = true; - if (fopAcM_GetName(obj->GetAc()) == PROC_ALINK) { + if (fopAcM_GetName(obj->GetAc()) == fpcNm_ALINK_e) { if (mCyl.GetTgHitGObj()->ChkAtType(AT_TYPE_NORMAL_SWORD) && mTgHit) { bvar1 = false; } @@ -230,18 +230,18 @@ static actor_method_class l_daLv1Cdl01_Method = { }; actor_process_profile_definition g_profile_Obj_Lv1Cdl01 = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Lv1Cdl01, - &g_fpcLf_Method.base, - sizeof(daLv1Cdl01_c), - 0, - 0, - &g_fopAc_Method.base, - 0x1EF, - &l_daLv1Cdl01_Method, - 0x60000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv1Cdl01_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv1Cdl01_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv1Cdl01_e, + /* Actor SubMtd */ &l_daLv1Cdl01_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv2Candle.cpp b/src/d/actor/d_a_obj_lv2Candle.cpp index f8c7dc7ab0..e93a4d05ed 100644 --- a/src/d/actor/d_a_obj_lv2Candle.cpp +++ b/src/d/actor/d_a_obj_lv2Candle.cpp @@ -150,7 +150,7 @@ int daLv2Candle_c::createHeapCallBack(fopAc_ac_c* i_this) { void* daLv2Candle_c::searchDemoTagAct(void* i_actor, void* param_1) { if (i_actor != NULL && fopAc_IsActor(i_actor) && - fopAcM_GetProfName(i_actor) == PROC_Tag_Lv4Candle) { + fopAcM_GetProfName(i_actor) == fpcNm_Tag_Lv4Candle_e) { return i_actor; } return NULL; @@ -316,13 +316,13 @@ int daLv2Candle_c::Execute() { fopAc_ac_c* actor = obj->GetAc(); bool bvar1 = true; if (actor != NULL) { - if (fopAcM_GetName(actor) == PROC_E_HP && mTgHit) { + if (fopAcM_GetName(actor) == fpcNm_E_HP_e && mTgHit) { bvar1 = false; } - if (fopAcM_GetName(actor) == PROC_E_DD) { + if (fopAcM_GetName(actor) == fpcNm_E_DD_e) { bvar1 = false; } - if (fopAcM_GetName(actor) == PROC_ALINK) { + if (fopAcM_GetName(actor) == fpcNm_ALINK_e) { if (mCyl.GetTgHitGObj()->ChkAtType(AT_TYPE_NORMAL_SWORD) && mTgHit) { bvar1 = false; } @@ -395,18 +395,18 @@ static actor_method_class l_daLv2Candle_Method = { }; actor_process_profile_definition g_profile_Obj_Lv2Candle = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Lv2Candle, - &g_fpcLf_Method.base, - sizeof(daLv2Candle_c), - 0, - 0, - &g_fopAc_Method.base, - 0x20B, - &l_daLv2Candle_Method, - 0x60000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv2Candle_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv2Candle_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv2Candle_e, + /* Actor SubMtd */ &l_daLv2Candle_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv3Candle.cpp b/src/d/actor/d_a_obj_lv3Candle.cpp index 708ac0045b..784af3210b 100644 --- a/src/d/actor/d_a_obj_lv3Candle.cpp +++ b/src/d/actor/d_a_obj_lv3Candle.cpp @@ -162,7 +162,7 @@ int daLv3Candle_c::Execute() { if (obj != NULL) { u8 play_sound = true; fopAc_ac_c* actor = dCc_GetAc(obj->GetAc()); - if (fopAcM_GetName(actor) == PROC_ALINK) { + if (fopAcM_GetName(actor) == fpcNm_ALINK_e) { dCcD_GObjInf* gobj = mSph.GetTgHitGObj(); if (gobj->GetAtType() & AT_TYPE_NORMAL_SWORD && mTgHit != 0) { play_sound = false; @@ -245,18 +245,18 @@ static actor_method_class l_daLv3Candle_Method = { }; actor_process_profile_definition g_profile_Obj_Lv3Candle = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv3Candle, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv3Candle_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 620, // mPriority - &l_daLv3Candle_Method, // sub_method - 0x60000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv3Candle_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv3Candle_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv3Candle_e, + /* Actor SubMtd */ &l_daLv3Candle_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv3Water.cpp b/src/d/actor/d_a_obj_lv3Water.cpp index e9b17c3ad6..a228b2cbc8 100644 --- a/src/d/actor/d_a_obj_lv3Water.cpp +++ b/src/d/actor/d_a_obj_lv3Water.cpp @@ -9,7 +9,7 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_msg_mng.h" @@ -460,18 +460,18 @@ static actor_method_class l_daLv3Water_Method = { }; actor_process_profile_definition g_profile_Obj_Lv3Water = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv3Water, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv3Water_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 616, // mPriority - &l_daLv3Water_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv3Water_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv3Water_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv3Water_e, + /* Actor SubMtd */ &l_daLv3Water_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv3Water2.cpp b/src/d/actor/d_a_obj_lv3Water2.cpp index 098b585aa0..b6814875cc 100644 --- a/src/d/actor/d_a_obj_lv3Water2.cpp +++ b/src/d/actor/d_a_obj_lv3Water2.cpp @@ -293,18 +293,18 @@ static actor_method_class l_daLv3Water2_Method = { }; actor_process_profile_definition g_profile_Obj_Lv3Water2 = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv3Water2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv3Water2_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 617, // mPriority - &l_daLv3Water2_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv3Water2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv3Water2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv3Water2_e, + /* Actor SubMtd */ &l_daLv3Water2_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv3WaterB.cpp b/src/d/actor/d_a_obj_lv3WaterB.cpp index 763b77034c..f4ad49685d 100644 --- a/src/d/actor/d_a_obj_lv3WaterB.cpp +++ b/src/d/actor/d_a_obj_lv3WaterB.cpp @@ -220,18 +220,18 @@ static actor_method_class l_daObj_Lv3waterB_Method = { }; actor_process_profile_definition g_profile_OBJ_LV3WATERB = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_OBJ_LV3WATERB, - &g_fpcLf_Method.base, - sizeof(obj_lv3WaterB_class), - 0, - 0, - &g_fopAc_Method.base, - 618, - &l_daObj_Lv3waterB_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_LV3WATERB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_lv3WaterB_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_LV3WATERB_e, + /* Actor SubMtd */ &l_daObj_Lv3waterB_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv3saka00.cpp b/src/d/actor/d_a_obj_lv3saka00.cpp index b772ba5599..792747c664 100644 --- a/src/d/actor/d_a_obj_lv3saka00.cpp +++ b/src/d/actor/d_a_obj_lv3saka00.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_lv3saka00.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "m_Do/m_Do_mtx.h" static char* l_arcName[] = {"Obj_saka", "Obj_saka2"}; @@ -184,18 +184,18 @@ static actor_method_class daObjLv3saka_METHODS = { (process_method_func)daObjLv3saka_MoveBGDraw}; actor_process_profile_definition g_profile_Obj_Lv3R10Saka = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv3R10Saka, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLv3saka_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 528, // mPriority - &daObjLv3saka_METHODS, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv3R10Saka_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLv3saka_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv3R10Saka_e, + /* Actor SubMtd */ &daObjLv3saka_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv3waterEff.cpp b/src/d/actor/d_a_obj_lv3waterEff.cpp index 28a43141a6..07b3dfb7bc 100644 --- a/src/d/actor/d_a_obj_lv3waterEff.cpp +++ b/src/d/actor/d_a_obj_lv3waterEff.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_lv3waterEff.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_actor_mng.h" static u16 const l_eff_id[] = { @@ -101,18 +101,18 @@ static actor_method_class l_daObjWaterEff_Method = { }; actor_process_profile_definition g_profile_Obj_WaterEff = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_WaterEff, - &g_fpcLf_Method.base, - sizeof(daObjWaterEff_c), - 0, - 0, - &g_fopAc_Method.base, - 555, - &l_daObjWaterEff_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_WaterEff_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjWaterEff_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_WaterEff_e, + /* Actor SubMtd */ &l_daObjWaterEff_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp b/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp index ea74e61b26..7212b0f492 100644 --- a/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp +++ b/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp @@ -115,7 +115,7 @@ void dalv4CandleDemoTag_c::init_modeEnemyCreate() { pos.y = pnt->m_position.y; pos.z = pnt->m_position.z; - fopAcM_create(PROC_E_BS, 0xFFFFFEFF, &pos, fopAcM_GetRoomNo(this), NULL, NULL, -1); + fopAcM_create(fpcNm_E_BS_e, 0xFFFFFEFF, &pos, fopAcM_GetRoomNo(this), NULL, NULL, -1); } mMode = 1; @@ -154,7 +154,7 @@ bool dalv4CandleDemoTag_c::eventStart() { void* dalv4CandleDemoTag_c::searchShutterAct(void* param_0, void* param_1) { if (param_0 != NULL && fopAcM_IsActor(param_0) && - fopAcM_GetProfName(param_0) == PROC_Obj_Lv4EdShutter) + fopAcM_GetProfName(param_0) == fpcNm_Obj_Lv4EdShutter_e) { return param_0; } @@ -195,18 +195,18 @@ static actor_method_class l_dalv4CandleDemoTag_Method = { }; actor_process_profile_definition g_profile_Tag_Lv4CandleDm = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Lv4CandleDm, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(dalv4CandleDemoTag_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 541, // mPriority - &l_dalv4CandleDemoTag_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Lv4CandleDm_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dalv4CandleDemoTag_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Lv4CandleDm_e, + /* Actor SubMtd */ &l_dalv4CandleDemoTag_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4CandleTag.cpp b/src/d/actor/d_a_obj_lv4CandleTag.cpp index 8f924aa186..e25c5f1cd1 100644 --- a/src/d/actor/d_a_obj_lv4CandleTag.cpp +++ b/src/d/actor/d_a_obj_lv4CandleTag.cpp @@ -149,18 +149,18 @@ static actor_method_class l_dalv4CandleTag_Method = { }; actor_process_profile_definition g_profile_Tag_Lv4Candle = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Lv4Candle, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(dalv4CandleTag_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 540, // mPriority - &l_dalv4CandleTag_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Lv4Candle_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dalv4CandleTag_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Lv4Candle_e, + /* Actor SubMtd */ &l_dalv4CandleTag_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4EdShutter.cpp b/src/d/actor/d_a_obj_lv4EdShutter.cpp index edc31c8641..64868f15b2 100644 --- a/src/d/actor/d_a_obj_lv4EdShutter.cpp +++ b/src/d/actor/d_a_obj_lv4EdShutter.cpp @@ -223,18 +223,18 @@ static actor_method_class l_daLv4EdShutter_Method = { }; actor_process_profile_definition g_profile_Obj_Lv4EdShutter = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv4EdShutter, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv4EdShutter_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 636, // mPriority - &l_daLv4EdShutter_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv4EdShutter_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv4EdShutter_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv4EdShutter_e, + /* Actor SubMtd */ &l_daLv4EdShutter_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4Gate.cpp b/src/d/actor/d_a_obj_lv4Gate.cpp index 82e5300225..3d1ff0a730 100644 --- a/src/d/actor/d_a_obj_lv4Gate.cpp +++ b/src/d/actor/d_a_obj_lv4Gate.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_lv4Gate.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static daLv4Gate_HIO_c l_HIO; @@ -180,18 +180,18 @@ static actor_method_class l_daLv4Gate_Method = { }; actor_process_profile_definition g_profile_Obj_Lv4Gate = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Lv4Gate, - &g_fpcLf_Method.base, - sizeof(daLv4Gate_c), - 0, - 0, - &g_fopAc_Method.base, - 637, - &l_daLv4Gate_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv4Gate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv4Gate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv4Gate_e, + /* Actor SubMtd */ &l_daLv4Gate_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4HsTarget.cpp b/src/d/actor/d_a_obj_lv4HsTarget.cpp index 320b6e4d49..ed66cdddb4 100644 --- a/src/d/actor/d_a_obj_lv4HsTarget.cpp +++ b/src/d/actor/d_a_obj_lv4HsTarget.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_lv4HsTarget.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" daLv4HsTarget_HIO_c::daLv4HsTarget_HIO_c() {} @@ -91,18 +91,18 @@ static actor_method_class l_daLv4HsTarget_Method = { }; actor_process_profile_definition g_profile_Obj_Lv4HsTarget = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Lv4HsTarget, - &g_fpcLf_Method.base, - sizeof(daLv4HsTarget_c), - 0, - 0, - &g_fopAc_Method.base, - 640, - &l_daLv4HsTarget_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv4HsTarget_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv4HsTarget_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv4HsTarget_e, + /* Actor SubMtd */ &l_daLv4HsTarget_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4PoGate.cpp b/src/d/actor/d_a_obj_lv4PoGate.cpp index 4c9a72d40e..eb0b5442ec 100644 --- a/src/d/actor/d_a_obj_lv4PoGate.cpp +++ b/src/d/actor/d_a_obj_lv4PoGate.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_lv4PoGate.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" daLv4PoGate_HIO_c::daLv4PoGate_HIO_c() { mOpenSpeed = 10.0f; @@ -260,18 +260,18 @@ static actor_method_class l_daLv4PoGate_Method = { }; actor_process_profile_definition g_profile_Obj_Lv4PoGate = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Lv4PoGate, - &g_fpcLf_Method.base, - sizeof(daLv4PoGate_c), - 0, - 0, - &g_fopAc_Method.base, - 638, - &l_daLv4PoGate_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv4PoGate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv4PoGate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv4PoGate_e, + /* Actor SubMtd */ &l_daLv4PoGate_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4RailWall.cpp b/src/d/actor/d_a_obj_lv4RailWall.cpp index 7df09f85b3..9128376496 100644 --- a/src/d/actor/d_a_obj_lv4RailWall.cpp +++ b/src/d/actor/d_a_obj_lv4RailWall.cpp @@ -13,7 +13,7 @@ static char* l_arcName = "P_L4Rwall"; static void* s_BossSearch(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_B_DS) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_B_DS_e) { return i_actor; } @@ -49,7 +49,7 @@ int daObjLv4Wall_c::Create() { cXyz swpos(current.pos); swpos.y -= 1700.0f; - fopAcM_createChild(PROC_Obj_SwSpinner, fopAcM_GetID(this), getSwbit() << 8, &swpos, fopAcM_GetRoomNo(this), NULL, NULL, -1, NULL); + fopAcM_createChild(fpcNm_Obj_SwSpinner_e, fopAcM_GetID(this), getSwbit() << 8, &swpos, fopAcM_GetRoomNo(this), NULL, NULL, -1, NULL); mpSwSpinner = NULL; return 1; } @@ -79,7 +79,7 @@ int daObjLv4Wall_c::create1st() { int daObjLv4Wall_c::Execute(Mtx** param_0) { if (mpSwSpinner == NULL) { - mpSwSpinner = (daObjSwSpinner_c*)fopAcM_SearchByName(PROC_Obj_SwSpinner); + mpSwSpinner = (daObjSwSpinner_c*)fopAcM_SearchByName(fpcNm_Obj_SwSpinner_e); } if (mpSwSpinner == NULL) { @@ -250,18 +250,18 @@ static actor_method_class daObjLv4Wall_METHODS = { }; actor_process_profile_definition g_profile_Obj_Lv4RailWall = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv4RailWall, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLv4Wall_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 574, // mPriority - &daObjLv4Wall_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv4RailWall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLv4Wall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv4RailWall_e, + /* Actor SubMtd */ &daObjLv4Wall_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4SlideWall.cpp b/src/d/actor/d_a_obj_lv4SlideWall.cpp index 26efe7a77e..2742339487 100644 --- a/src/d/actor/d_a_obj_lv4SlideWall.cpp +++ b/src/d/actor/d_a_obj_lv4SlideWall.cpp @@ -176,18 +176,18 @@ static actor_method_class l_daSldWall_Method = { }; actor_process_profile_definition g_profile_Obj_Lv4SlideWall = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv4SlideWall, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSldWall_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 639, // mPriority - &l_daSldWall_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv4SlideWall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSldWall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv4SlideWall_e, + /* Actor SubMtd */ &l_daSldWall_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4bridge.cpp b/src/d/actor/d_a_obj_lv4bridge.cpp index 3a1e293dd1..b11fa22d55 100644 --- a/src/d/actor/d_a_obj_lv4bridge.cpp +++ b/src/d/actor/d_a_obj_lv4bridge.cpp @@ -171,18 +171,18 @@ static actor_method_class daObjLv4Brg_METHODS = { }; actor_process_profile_definition g_profile_Obj_Lv4Bridge = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv4Bridge, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLv4Brg_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 581, // mPriority - &daObjLv4Brg_METHODS, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv4Bridge_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLv4Brg_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv4Bridge_e, + /* Actor SubMtd */ &daObjLv4Brg_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4chandelier.cpp b/src/d/actor/d_a_obj_lv4chandelier.cpp index 4f75c20421..fbd0cf2fe0 100644 --- a/src/d/actor/d_a_obj_lv4chandelier.cpp +++ b/src/d/actor/d_a_obj_lv4chandelier.cpp @@ -251,7 +251,7 @@ int daObjLv4Chan_c::CreateHeap() { static void* searchSwChain(void* i_actor, void* i_this) { if (i_actor != NULL && fopAcM_IsActor(i_actor) && - fopAcM_GetProfName(i_actor) == PROC_Obj_SwChain) + fopAcM_GetProfName(i_actor) == fpcNm_Obj_SwChain_e) { if (((daObjSwChain_c*)i_actor)->getChainID() == ((daObjLv4Chan_c*)i_this)->getArg0()) { return i_actor; @@ -878,18 +878,18 @@ static actor_method_class daObjLv4Chan_METHODS = { }; actor_process_profile_definition g_profile_Obj_Lv4Chan = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv4Chan, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLv4Chan_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 674, // mPriority - &daObjLv4Chan_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv4Chan_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLv4Chan_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv4Chan_e, + /* Actor SubMtd */ &daObjLv4Chan_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4digsand.cpp b/src/d/actor/d_a_obj_lv4digsand.cpp index feb4dbd8ca..53a1e05511 100644 --- a/src/d/actor/d_a_obj_lv4digsand.cpp +++ b/src/d/actor/d_a_obj_lv4digsand.cpp @@ -64,7 +64,7 @@ int daObjL4DigSand_c::create1st() { } int daObjL4DigSand_c::Execute(Mtx** param_0) { - if (daPy_py_c::checkNowWolf() && checkItemGet(fpcNm_ITEM_SMELL_POH, 1)) { + if (daPy_py_c::checkNowWolf() && checkItemGet(dItemNo_SMELL_POH_e, 1)) { attention_info.flags = fopAc_AttnFlag_ETC_e; } else { attention_info.flags = 0; @@ -180,18 +180,18 @@ static actor_method_class daObjL4DigSand_METHODS = { }; actor_process_profile_definition g_profile_Obj_Lv4DigSand = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv4DigSand, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjL4DigSand_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 551, // mPriority - &daObjL4DigSand_METHODS, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv4DigSand_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjL4DigSand_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv4DigSand_e, + /* Actor SubMtd */ &daObjL4DigSand_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4floor.cpp b/src/d/actor/d_a_obj_lv4floor.cpp index b4122862b8..ab04768a0a 100644 --- a/src/d/actor/d_a_obj_lv4floor.cpp +++ b/src/d/actor/d_a_obj_lv4floor.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_lv4floor.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" void daObjLv4Floor_c::initBaseMtx() { mpModel->setBaseScale(scale); @@ -141,18 +141,18 @@ static actor_method_class daObjLv4Floor_METHODS = { }; actor_process_profile_definition g_profile_Obj_Lv4Floor = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Lv4Floor, - &g_fpcLf_Method.base, - sizeof(daObjLv4Floor_c), - 0, - 0, - &g_fopAc_Method.base, - 584, - &daObjLv4Floor_METHODS, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv4Floor_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLv4Floor_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv4Floor_e, + /* Actor SubMtd */ &daObjLv4Floor_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4gear.cpp b/src/d/actor/d_a_obj_lv4gear.cpp index 75f19496a4..02ea392cb9 100644 --- a/src/d/actor/d_a_obj_lv4gear.cpp +++ b/src/d/actor/d_a_obj_lv4gear.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv4gear.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static int CheckCreateHeap(fopAc_ac_c* i_this) { return static_cast(i_this)->CreateHeap(); @@ -16,7 +16,7 @@ static void* searchSwSpinSub(void* i_actor, void* i_data) { daObjSwSpinner_c* sw = (daObjSwSpinner_c*)i_actor; daObjLv4Gear_c* gear = (daObjLv4Gear_c*)i_data; - if (sw != NULL && fopAc_IsActor(sw) && fpcM_GetProfName(sw) == PROC_Obj_SwSpinner) { + if (sw != NULL && fopAc_IsActor(sw) && fpcM_GetProfName(sw) == fpcNm_Obj_SwSpinner_e) { u8 sw_bit = sw->getSwbit(); if (sw_bit != 0xFF && sw_bit == gear->getSwBit()) { return sw; @@ -161,18 +161,18 @@ static actor_method_class l_daObjLv4Gear_Method = { }; actor_process_profile_definition g_profile_Obj_Lv4Gear = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv4Gear, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLv4Gear_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 561, // mPriority - &l_daObjLv4Gear_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv4Gear_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLv4Gear_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv4Gear_e, + /* Actor SubMtd */ &l_daObjLv4Gear_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4prelvtr.cpp b/src/d/actor/d_a_obj_lv4prelvtr.cpp index 5cbc543dd6..a8f9a9061a 100644 --- a/src/d/actor/d_a_obj_lv4prelvtr.cpp +++ b/src/d/actor/d_a_obj_lv4prelvtr.cpp @@ -50,7 +50,7 @@ int daObjPRElvtr_c::Create() { static fopAc_ac_c* searchObjSwTurn(void* i_actor1, void* i_actor2) { if (i_actor1 != NULL && fopAcM_IsActor(i_actor1) && - fopAcM_GetProfName(i_actor1) == PROC_Obj_SwTurn) + fopAcM_GetProfName(i_actor1) == fpcNm_Obj_SwTurn_e) { if (((daObjSwTurn_c*)i_actor1)->getSwNo() == ((daObjPRElvtr_c*)i_actor2)->getSwNo()) { return (fopAc_ac_c*)i_actor1; @@ -116,18 +116,18 @@ static actor_method_class daObjPRElvtr_METHODS = { }; actor_process_profile_definition g_profile_Obj_PRElvtr = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_PRElvtr, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjPRElvtr_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 665, // mPriority - &daObjPRElvtr_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_PRElvtr_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjPRElvtr_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_PRElvtr_e, + /* Actor SubMtd */ &daObjPRElvtr_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4prwall.cpp b/src/d/actor/d_a_obj_lv4prwall.cpp index d904dc5771..76e24dd16f 100644 --- a/src/d/actor/d_a_obj_lv4prwall.cpp +++ b/src/d/actor/d_a_obj_lv4prwall.cpp @@ -119,7 +119,7 @@ int daObjLv4PRwall_c::Create() { static void* searchObjSwTurn(void* i_actor, void* i_data) { daObjSwTurn_c* swturn = (daObjSwTurn_c*)i_actor; daObjLv4PRwall_c* prwall = (daObjLv4PRwall_c*)i_data; - if (swturn != NULL && fopAcM_IsActor(swturn) && fopAcM_GetProfName(swturn) == PROC_Obj_SwTurn) { + if (swturn != NULL && fopAcM_IsActor(swturn) && fopAcM_GetProfName(swturn) == fpcNm_Obj_SwTurn_e) { if (swturn->getSwNo() == prwall->getSwNo()) { return i_actor; } @@ -303,18 +303,18 @@ static actor_method_class daObjLv4PRwall_METHODS = { }; actor_process_profile_definition g_profile_Obj_Lv4PRwall = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv4PRwall, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLv4PRwall_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 672, // mPriority - &daObjLv4PRwall_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv4PRwall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLv4PRwall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv4PRwall_e, + /* Actor SubMtd */ &daObjLv4PRwall_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4sand.cpp b/src/d/actor/d_a_obj_lv4sand.cpp index 7aa0f51a39..13f08b6534 100644 --- a/src/d/actor/d_a_obj_lv4sand.cpp +++ b/src/d/actor/d_a_obj_lv4sand.cpp @@ -171,18 +171,18 @@ static actor_method_class daObjLv4Sand_METHODS = { }; actor_process_profile_definition g_profile_Obj_Lv4Sand = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv4Sand, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLv4Sand_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 573, // mPriority - &daObjLv4Sand_METHODS, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv4Sand_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLv4Sand_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv4Sand_e, + /* Actor SubMtd */ &daObjLv4Sand_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv5FloorBoard.cpp b/src/d/actor/d_a_obj_lv5FloorBoard.cpp index 74206ac37b..fc3819cf08 100644 --- a/src/d/actor/d_a_obj_lv5FloorBoard.cpp +++ b/src/d/actor/d_a_obj_lv5FloorBoard.cpp @@ -190,18 +190,18 @@ static actor_method_class l_daFlorBoad_Method = { }; actor_process_profile_definition g_profile_Obj_Lv5FBoard = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv5FBoard, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daFlorBoad_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 538, // mPriority - &l_daFlorBoad_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv5FBoard_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daFlorBoad_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv5FBoard_e, + /* Actor SubMtd */ &l_daFlorBoad_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv5IceWall.cpp b/src/d/actor/d_a_obj_lv5IceWall.cpp index 7eedee6c61..dc17845331 100644 --- a/src/d/actor/d_a_obj_lv5IceWall.cpp +++ b/src/d/actor/d_a_obj_lv5IceWall.cpp @@ -296,18 +296,18 @@ static actor_method_class l_daIceWall_Method = { }; actor_process_profile_definition g_profile_Obj_IceWall = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_IceWall, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daIceWall_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 536, // mPriority - &l_daIceWall_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_IceWall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daIceWall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_IceWall_e, + /* Actor SubMtd */ &l_daIceWall_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv5SwIce.cpp b/src/d/actor/d_a_obj_lv5SwIce.cpp index e4a644a5fe..2ff52396c0 100644 --- a/src/d/actor/d_a_obj_lv5SwIce.cpp +++ b/src/d/actor/d_a_obj_lv5SwIce.cpp @@ -200,18 +200,18 @@ static actor_method_class l_daLv5SwIce_Method = { }; actor_process_profile_definition g_profile_Obj_Lv5SwIce = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv5SwIce, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv5SwIce_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 537, // mPriority - &l_daLv5SwIce_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv5SwIce_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv5SwIce_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv5SwIce_e, + /* Actor SubMtd */ &l_daLv5SwIce_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv5ychndlr.cpp b/src/d/actor/d_a_obj_lv5ychndlr.cpp index 0bd3dcdb97..22eaac0e15 100644 --- a/src/d/actor/d_a_obj_lv5ychndlr.cpp +++ b/src/d/actor/d_a_obj_lv5ychndlr.cpp @@ -361,18 +361,18 @@ static actor_method_class daObjYchndlr_METHODS = { }; actor_process_profile_definition g_profile_Obj_Ychndlr = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Ychndlr, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjYchndlr_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 664, // mPriority - &daObjYchndlr_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Ychndlr_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjYchndlr_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Ychndlr_e, + /* Actor SubMtd */ &daObjYchndlr_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv5yiblltray.cpp b/src/d/actor/d_a_obj_lv5yiblltray.cpp index 29af54398d..7a9aa47e22 100644 --- a/src/d/actor/d_a_obj_lv5yiblltray.cpp +++ b/src/d/actor/d_a_obj_lv5yiblltray.cpp @@ -179,7 +179,7 @@ int daObjYIblltray_c::Create() { } void daObjYIblltray_c::rideActor(fopAc_ac_c* i_actor) { - if (mBallID == fpcM_ERROR_PROCESS_ID_e && fopAcM_GetProfName(i_actor) == PROC_Obj_Carry && + if (mBallID == fpcM_ERROR_PROCESS_ID_e && fopAcM_GetProfName(i_actor) == fpcNm_Obj_Carry_e && ((daObjCarry_c*)i_actor)->getType() == daObjCarry_c::TYPE_IRON_BALL) { mBallID = fopAcM_GetID(i_actor); @@ -201,7 +201,7 @@ void daObjYIblltray_c::sendBall(fpc_ProcID i_ID) { static fopAc_ac_c* searchObjYIblltray(void* i_trayB, void* i_trayA) { if (i_trayB != NULL && fopAcM_IsActor(i_trayB) && - fopAcM_GetProfName(i_trayB) == PROC_Obj_YIblltray && i_trayB != i_trayA) + fopAcM_GetProfName(i_trayB) == fpcNm_Obj_YIblltray_e && i_trayB != i_trayA) { if (((daObjYIblltray_c*)i_trayA)->getSwNo() == ((daObjYIblltray_c*)i_trayB)->getSwNo()) { return (fopAc_ac_c*)i_trayB; @@ -212,7 +212,7 @@ static fopAc_ac_c* searchObjYIblltray(void* i_trayB, void* i_trayA) { } static fopAc_ac_c* searchNearIronball(void* i_ball, void* i_tray) { - if (i_ball != NULL && fopAcM_IsActor(i_ball) && fopAcM_GetProfName(i_ball) == PROC_Obj_Carry && + if (i_ball != NULL && fopAcM_IsActor(i_ball) && fopAcM_GetProfName(i_ball) == fpcNm_Obj_Carry_e && ((daObjCarry_c*)i_ball)->getType() == daObjCarry_c::TYPE_IRON_BALL && VECSquareDistance(&((daObjCarry_c*)i_ball)->current.pos, &((daObjYIblltray_c*)i_tray)->mInBallPos) < 900.0f) @@ -224,7 +224,7 @@ static fopAc_ac_c* searchNearIronball(void* i_ball, void* i_tray) { } static fopAc_ac_c* searchNearBackTrayIronball(void* i_ball, void* i_tray) { - if (i_ball != NULL && fopAcM_IsActor(i_ball) && fopAcM_GetProfName(i_ball) == PROC_Obj_Carry && + if (i_ball != NULL && fopAcM_IsActor(i_ball) && fopAcM_GetProfName(i_ball) == fpcNm_Obj_Carry_e && ((daObjCarry_c*)i_ball)->getType() == daObjCarry_c::TYPE_IRON_BALL && VECSquareDistance(&((daObjCarry_c*)i_ball)->current.pos, &((daObjYIblltray_c*)i_tray)->mBackPos) < 900.0f) @@ -581,18 +581,18 @@ static actor_method_class daObjYIblltray_METHODS = { }; actor_process_profile_definition g_profile_Obj_YIblltray = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_YIblltray, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjYIblltray_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 667, // mPriority - &daObjYIblltray_METHODS, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_YIblltray_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjYIblltray_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_YIblltray_e, + /* Actor SubMtd */ &daObjYIblltray_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv6ChangeGate.cpp b/src/d/actor/d_a_obj_lv6ChangeGate.cpp index da9f2efe23..a725b4bdf8 100644 --- a/src/d/actor/d_a_obj_lv6ChangeGate.cpp +++ b/src/d/actor/d_a_obj_lv6ChangeGate.cpp @@ -311,18 +311,18 @@ static actor_method_class l_daLv6ChangeGate_Method = { }; actor_process_profile_definition g_profile_Obj_Lv6ChgGate = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6ChgGate, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv6ChangeGate_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 626, // mPriority - &l_daLv6ChangeGate_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv6ChgGate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv6ChangeGate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv6ChgGate_e, + /* Actor SubMtd */ &l_daLv6ChangeGate_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv6FurikoTrap.cpp b/src/d/actor/d_a_obj_lv6FurikoTrap.cpp index bb3c4cf015..ae0828e248 100644 --- a/src/d/actor/d_a_obj_lv6FurikoTrap.cpp +++ b/src/d/actor/d_a_obj_lv6FurikoTrap.cpp @@ -194,18 +194,18 @@ static actor_method_class l_daLv6FurikoTrap_Method = { }; actor_process_profile_definition g_profile_Obj_Lv6FuriTrap = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6FuriTrap, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv6FurikoTrap_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 627, // mPriority - &l_daLv6FurikoTrap_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv6FuriTrap_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv6FurikoTrap_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv6FuriTrap_e, + /* Actor SubMtd */ &l_daLv6FurikoTrap_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv6Lblock.cpp b/src/d/actor/d_a_obj_lv6Lblock.cpp index 7d18d28af3..dbb701b0b1 100644 --- a/src/d/actor/d_a_obj_lv6Lblock.cpp +++ b/src/d/actor/d_a_obj_lv6Lblock.cpp @@ -180,18 +180,18 @@ static actor_method_class l_daLv6Lblock_Method = { }; actor_process_profile_definition g_profile_Obj_Lv6Lblock = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6Lblock, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv6Lblock_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 625, // mPriority - &l_daLv6Lblock_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv6Lblock_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv6Lblock_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv6Lblock_e, + /* Actor SubMtd */ &l_daLv6Lblock_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv6SwGate.cpp b/src/d/actor/d_a_obj_lv6SwGate.cpp index 0549e3c9c5..c8b4b62b61 100644 --- a/src/d/actor/d_a_obj_lv6SwGate.cpp +++ b/src/d/actor/d_a_obj_lv6SwGate.cpp @@ -323,18 +323,18 @@ static actor_method_class l_daLv6SwGate_Method = { }; actor_process_profile_definition g_profile_Obj_Lv6SwGate = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6SwGate, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv6SwGate_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 624, // mPriority - &l_daLv6SwGate_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv6SwGate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv6SwGate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv6SwGate_e, + /* Actor SubMtd */ &l_daLv6SwGate_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv6SzGate.cpp b/src/d/actor/d_a_obj_lv6SzGate.cpp index 269a4f24f6..b5c02b197d 100644 --- a/src/d/actor/d_a_obj_lv6SzGate.cpp +++ b/src/d/actor/d_a_obj_lv6SzGate.cpp @@ -257,18 +257,18 @@ static actor_method_class l_daLv6SzGate_Method = { }; actor_process_profile_definition g_profile_Obj_Lv6SzGate = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6SzGate, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv6SzGate_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 628, // mPriority - &l_daLv6SzGate_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv6SzGate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv6SzGate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv6SzGate_e, + /* Actor SubMtd */ &l_daLv6SzGate_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv6Tenbin.cpp b/src/d/actor/d_a_obj_lv6Tenbin.cpp index 92e0c7678a..4f36a4ffbf 100644 --- a/src/d/actor/d_a_obj_lv6Tenbin.cpp +++ b/src/d/actor/d_a_obj_lv6Tenbin.cpp @@ -157,25 +157,25 @@ void daTenbin_c::rideCallBackRight(dBgW* i_dBgW, fopAc_ac_c* i_act1, fopAc_ac_c* UNUSED(i_dBgW); daTenbin_c* i_tenbin = (daTenbin_c*)i_act1; daPy_py_c* player = dComIfGp_getLinkPlayer(); - if (fopAcM_GetName(i_act2) == PROC_SPINNER) { + if (fopAcM_GetName(i_act2) == fpcNm_SPINNER_e) { if (player->checkSpinnerRide()) { i_tenbin->field_0x5B2 += (u16)2; } } - if (fopAcM_GetName(i_act2) == PROC_ALINK && dComIfGp_checkPlayerStatus0(0, 0x100) == 0) { + if (fopAcM_GetName(i_act2) == fpcNm_ALINK_e && dComIfGp_checkPlayerStatus0(0, 0x100) == 0) { i_tenbin->field_0x5B2 += (u16)2; if (player->checkBootsOrArmorHeavy()) { i_tenbin->field_0x5B2 += (u16)60000; } if (player->getGrabActorID() != -1) { fopAc_ac_c* found = fopAcM_SearchByID(player->getGrabActorID()); - if (fopAcM_GetName(found) == PROC_CSTATUE) { + if (fopAcM_GetName(found) == fpcNm_CSTATUE_e) { i_tenbin->field_0x5B2++; i_tenbin->field_0x650 = fopAcM_GetID(found); } } } - if (fopAcM_GetName(i_act2) == PROC_CSTATUE) { + if (fopAcM_GetName(i_act2) == fpcNm_CSTATUE_e) { daCstatue_c* i_statue = (daCstatue_c*)i_act2; if (i_statue->checkNormalType()) { i_tenbin->field_0x5B2 += (u16)4; @@ -189,25 +189,25 @@ void daTenbin_c::rideCallBackLeft(dBgW* i_dBgW, fopAc_ac_c* i_act1, fopAc_ac_c* UNUSED(i_dBgW); daTenbin_c* i_tenbin = (daTenbin_c*)i_act1; daPy_py_c* player = dComIfGp_getLinkPlayer(); - if (fopAcM_GetName(i_act2) == PROC_SPINNER) { + if (fopAcM_GetName(i_act2) == fpcNm_SPINNER_e) { if (player->checkSpinnerRide()) { i_tenbin->field_0x5B4 += (u16)2; } } - if (fopAcM_GetName(i_act2) == PROC_ALINK && dComIfGp_checkPlayerStatus0(0, 0x100) == 0) { + if (fopAcM_GetName(i_act2) == fpcNm_ALINK_e && dComIfGp_checkPlayerStatus0(0, 0x100) == 0) { i_tenbin->field_0x5B4 += (u16)2; if (player->checkEquipHeavyBoots()) { i_tenbin->field_0x5B4 += (u16)60000; } if (player->getGrabActorID() != -1) { fopAc_ac_c* found = fopAcM_SearchByID(player->getGrabActorID()); - if (fopAcM_GetName(found) == PROC_CSTATUE) { + if (fopAcM_GetName(found) == fpcNm_CSTATUE_e) { i_tenbin->field_0x5B4++; i_tenbin->field_0x650 = fopAcM_GetID(found); } } } - if (fopAcM_GetName(i_act2) == PROC_CSTATUE) { + if (fopAcM_GetName(i_act2) == fpcNm_CSTATUE_e) { daCstatue_c* i_statue = (daCstatue_c*)i_act2; if (i_statue->checkNormalType()) { i_tenbin->field_0x5B4 += (u16)4; @@ -355,18 +355,18 @@ static actor_method_class l_daTenbin_Method = { }; actor_process_profile_definition g_profile_Obj_Lv6Tenbin = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6Tenbin, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTenbin_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 623, // mPriority - &l_daTenbin_Method, // sub_method - 0x00060100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv6Tenbin_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTenbin_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv6Tenbin_e, + /* Actor SubMtd */ &l_daTenbin_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv6TogeRoll.cpp b/src/d/actor/d_a_obj_lv6TogeRoll.cpp index 2ee3dbd334..386a9e5ea0 100644 --- a/src/d/actor/d_a_obj_lv6TogeRoll.cpp +++ b/src/d/actor/d_a_obj_lv6TogeRoll.cpp @@ -152,7 +152,7 @@ int daTogeRoll_c::Execute(Mtx** i_mtx) { bool bVar1 = true; if (hit_actor != NULL) { - if (fopAcM_GetName(hit_actor) == PROC_ALINK && gobj->GetAtType() & 2 && field_0x1158) { + if (fopAcM_GetName(hit_actor) == fpcNm_ALINK_e && gobj->GetAtType() & 2 && field_0x1158) { bVar1 = false; } if (bVar1) { @@ -210,7 +210,7 @@ void daTogeRoll_c::moveTogeRoll() { for (int i = 0; i < 8; i++) { if (mSph[i].ChkCoHit()) { fopAc_ac_c* hit_actor = dCc_GetAc(mSph[i].GetCoHitObj()->GetAc()); - if (hit_actor != NULL && fopAcM_GetName(hit_actor) == PROC_CSTATUE) { + if (hit_actor != NULL && fopAcM_GetName(hit_actor) == fpcNm_CSTATUE_e) { field_0x5e0 = hit_actor->current.pos; cXyz pos1 = current.pos - hit_actor->current.pos; cXyz pos2 = current.pos - field_0x5b0; @@ -439,18 +439,18 @@ static actor_method_class l_daTogeRoll_Method = { }; actor_process_profile_definition g_profile_Obj_Lv6TogeRoll = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6TogeRoll, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTogeRoll_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 621, // mPriority - &l_daTogeRoll_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv6TogeRoll_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTogeRoll_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv6TogeRoll_e, + /* Actor SubMtd */ &l_daTogeRoll_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv6TogeTrap.cpp b/src/d/actor/d_a_obj_lv6TogeTrap.cpp index 9cd5e04f80..24e41124bf 100644 --- a/src/d/actor/d_a_obj_lv6TogeTrap.cpp +++ b/src/d/actor/d_a_obj_lv6TogeTrap.cpp @@ -253,7 +253,7 @@ int daLv6TogeTrap_c::create() { } void* daLv6TogeTrap_c::searchSekizoAct(void* i_actor, void* i_data) { - if (i_actor != NULL && fopAcM_IsActor(i_actor) && fopAcM_GetProfName(i_actor) == PROC_CSTATUE) { + if (i_actor != NULL && fopAcM_IsActor(i_actor) && fopAcM_GetProfName(i_actor) == fpcNm_CSTATUE_e) { return i_actor; } @@ -270,7 +270,7 @@ int daLv6TogeTrap_c::Execute(Mtx** param_0) { u8 var_r26 = TRUE; if (hitactor != NULL) { - if (fopAcM_GetName(hitactor) == PROC_ALINK && (mCcSph.GetTgHitGObj()->GetAtType() & AT_TYPE_NORMAL_SWORD) && field_0x8d0 != 0) { + if (fopAcM_GetName(hitactor) == fpcNm_ALINK_e && (mCcSph.GetTgHitGObj()->GetAtType() & AT_TYPE_NORMAL_SWORD) && field_0x8d0 != 0) { var_r26 = FALSE; } @@ -357,7 +357,7 @@ void daLv6TogeTrap_c::moveLift() { void daLv6TogeTrap_c::executeType1() { if (field_0x60b == 0 && mCcSph.ChkCoHit()) { fopAc_ac_c* co_hitactor = mCcSph.GetCoHitAc(); - if (co_hitactor != NULL && fopAcM_GetProfName(co_hitactor) == PROC_CSTATUE) { + if (co_hitactor != NULL && fopAcM_GetProfName(co_hitactor) == fpcNm_CSTATUE_e) { cXyz sp14 = current.pos - co_hitactor->current.pos; cXyz sp8 = current.pos - field_0x5b0; @@ -515,7 +515,7 @@ void daLv6TogeTrap_c::executeType2() { if (mCcSph.ChkCoHit()) { fopAc_ac_c* co_hitactor = mCcSph.GetCoHitAc(); - if (co_hitactor != NULL && fopAcM_GetProfName(co_hitactor) == PROC_CSTATUE) { + if (co_hitactor != NULL && fopAcM_GetProfName(co_hitactor) == fpcNm_CSTATUE_e) { cXyz sp28 = current.pos - co_hitactor->current.pos; cXyz sp1C = current.pos - field_0x5b0; @@ -642,7 +642,7 @@ void daLv6TogeTrap_c::init_modeRotate() { void daLv6TogeTrap_c::modeRotate() { if (mCcSph.ChkCoHit()) { fopAc_ac_c* co_hitactor = mCcSph.GetCoHitAc(); - if (co_hitactor != NULL && fopAcM_GetProfName(co_hitactor) == PROC_CSTATUE) { + if (co_hitactor != NULL && fopAcM_GetProfName(co_hitactor) == fpcNm_CSTATUE_e) { mRotateDirection *= -1; } } @@ -773,18 +773,18 @@ static actor_method_class l_daLv6TogeTrap_Method = { }; actor_process_profile_definition g_profile_Obj_Lv6TogeTrap = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6TogeTrap, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv6TogeTrap_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 622, // mPriority - &l_daLv6TogeTrap_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv6TogeTrap_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv6TogeTrap_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv6TogeTrap_e, + /* Actor SubMtd */ &l_daLv6TogeTrap_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv6bemos.cpp b/src/d/actor/d_a_obj_lv6bemos.cpp index 15dea7088d..760f09efb3 100644 --- a/src/d/actor/d_a_obj_lv6bemos.cpp +++ b/src/d/actor/d_a_obj_lv6bemos.cpp @@ -416,18 +416,18 @@ static actor_method_class daObjL6Bm_METHODS = { }; actor_process_profile_definition g_profile_Obj_Lv6bemos = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6bemos, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjL6Bm_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 630, // mPriority - &daObjL6Bm_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv6bemos_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjL6Bm_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv6bemos_e, + /* Actor SubMtd */ &daObjL6Bm_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv6bemos2.cpp b/src/d/actor/d_a_obj_lv6bemos2.cpp index f49d31e00d..be86aa46e6 100644 --- a/src/d/actor/d_a_obj_lv6bemos2.cpp +++ b/src/d/actor/d_a_obj_lv6bemos2.cpp @@ -400,7 +400,7 @@ void daObjLv6Bm_c::action() { if (field_0x87c.ChkTgHit()) { hitObj = field_0x87c.GetTgHitObj(); if (hitObj != NULL && hitObj->ChkAtType(AT_TYPE_CSTATUE_SWING)) { - if (fopAcM_GetName(field_0x87c.GetTgHitAc()) == PROC_CSTATUE) { + if (fopAcM_GetName(field_0x87c.GetTgHitAc()) == fpcNm_CSTATUE_e) { for (int i = 0; i < 3; i++) { dComIfGp_particle_set(l_particle_id[i], ¤t.pos, NULL, &scale, 0xFF, NULL, -1, NULL, NULL, NULL); } @@ -1176,18 +1176,18 @@ static actor_method_class daObjLv6Bm_METHODS = { }; actor_process_profile_definition g_profile_Obj_Lv6bemos2 = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6bemos2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLv6Bm_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 631, // mPriority - &daObjLv6Bm_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv6bemos2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLv6Bm_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv6bemos2_e, + /* Actor SubMtd */ &daObjLv6Bm_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv6egate.cpp b/src/d/actor/d_a_obj_lv6egate.cpp index c123578767..1d81549d6a 100644 --- a/src/d/actor/d_a_obj_lv6egate.cpp +++ b/src/d/actor/d_a_obj_lv6egate.cpp @@ -235,18 +235,18 @@ static actor_method_class daObjLv6EGate_METHODS = { }; actor_process_profile_definition g_profile_Obj_Lv6EGate = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6EGate, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLv6EGate_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 668, // mPriority - &daObjLv6EGate_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv6EGate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLv6EGate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv6EGate_e, + /* Actor SubMtd */ &daObjLv6EGate_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv6elevta.cpp b/src/d/actor/d_a_obj_lv6elevta.cpp index 97495730e0..a4126f0213 100644 --- a/src/d/actor/d_a_obj_lv6elevta.cpp +++ b/src/d/actor/d_a_obj_lv6elevta.cpp @@ -87,7 +87,7 @@ int daObjLv6ElevtA_c::Create() { static void* searchObjLv6SwTurn(void* i_turn, void* i_elevta) { if (i_turn != NULL && fopAcM_IsActor(i_turn) && - fopAcM_GetProfName(i_turn) == PROC_Obj_Lv6SwTurn) + fopAcM_GetProfName(i_turn) == fpcNm_Obj_Lv6SwTurn_e) { daObjLv6SwTurn_c* this_turn = (daObjLv6SwTurn_c*)i_turn; daObjLv6ElevtA_c* this_elevta = (daObjLv6ElevtA_c*)i_elevta; @@ -272,18 +272,18 @@ static actor_method_class daObjLv6ElevtA_METHODS = { }; actor_process_profile_definition g_profile_Obj_Lv6ElevtA = { - fpcLy_CURRENT_e, // mLayerID - 2, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6ElevtA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLv6ElevtA_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 669, // mPriority - &daObjLv6ElevtA_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 2, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv6ElevtA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLv6ElevtA_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv6ElevtA_e, + /* Actor SubMtd */ &daObjLv6ElevtA_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv6swturn.cpp b/src/d/actor/d_a_obj_lv6swturn.cpp index c3fec295ae..d512118bb5 100644 --- a/src/d/actor/d_a_obj_lv6swturn.cpp +++ b/src/d/actor/d_a_obj_lv6swturn.cpp @@ -344,18 +344,18 @@ static actor_method_class daObjLv6SwTurn_METHODS = { }; actor_process_profile_definition g_profile_Obj_Lv6SwTurn = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6SwTurn, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLv6SwTurn_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 15, // mPriority - &daObjLv6SwTurn_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv6SwTurn_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLv6SwTurn_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv6SwTurn_e, + /* Actor SubMtd */ &daObjLv6SwTurn_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv7BsGate.cpp b/src/d/actor/d_a_obj_lv7BsGate.cpp index a3335f2bd1..811b301f81 100644 --- a/src/d/actor/d_a_obj_lv7BsGate.cpp +++ b/src/d/actor/d_a_obj_lv7BsGate.cpp @@ -208,18 +208,18 @@ static actor_method_class l_daLv7BsGate_Method = { }; actor_process_profile_definition g_profile_Obj_Lv7BsGate = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv7BsGate, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv7BsGate_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 642, // mPriority - &l_daLv7BsGate_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv7BsGate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv7BsGate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv7BsGate_e, + /* Actor SubMtd */ &l_daLv7BsGate_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv7PropellerY.cpp b/src/d/actor/d_a_obj_lv7PropellerY.cpp index c1458bb9e0..f7933b263b 100644 --- a/src/d/actor/d_a_obj_lv7PropellerY.cpp +++ b/src/d/actor/d_a_obj_lv7PropellerY.cpp @@ -298,18 +298,18 @@ static actor_method_class l_daPropY_Method = { }; actor_process_profile_definition g_profile_Obj_Lv7PropY = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv7PropY, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daPropY_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 641, // mPriority - &l_daPropY_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv7PropY_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daPropY_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv7PropY_e, + /* Actor SubMtd */ &l_daPropY_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv7bridge.cpp b/src/d/actor/d_a_obj_lv7bridge.cpp index 3e5632dcbd..193796ebab 100644 --- a/src/d/actor/d_a_obj_lv7bridge.cpp +++ b/src/d/actor/d_a_obj_lv7bridge.cpp @@ -36,7 +36,7 @@ static void* searchSwSpinner(void* i_actor, void* i_data) { fopAc_ac_c* swspinner = (fopAc_ac_c*)i_actor; fopAc_ac_c* brg = (fopAc_ac_c*)i_data; - if (swspinner != NULL && fopAcM_IsActor(swspinner) && fopAcM_GetProfName(swspinner) == PROC_Obj_SwSpinner) { + if (swspinner != NULL && fopAcM_IsActor(swspinner) && fopAcM_GetProfName(swspinner) == fpcNm_Obj_SwSpinner_e) { if (((daObjLv7Brg_c*)brg)->getSwbit() == ((daObjSwSpinner_c*)swspinner)->getSwbit()) { return swspinner; } @@ -474,18 +474,18 @@ static actor_method_class daObjLv7Brg_METHODS = { }; actor_process_profile_definition g_profile_Obj_Lv7Bridge = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv7Bridge, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLv7Brg_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 566, // mPriority - &daObjLv7Brg_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv7Bridge_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLv7Brg_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv7Bridge_e, + /* Actor SubMtd */ &daObjLv7Brg_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp b/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp index f74ca42dc2..557a39aa32 100644 --- a/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp +++ b/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp @@ -212,18 +212,18 @@ static actor_method_class l_daKekaiTrap_Method = { }; actor_process_profile_definition g_profile_Obj_Lv8KekkaiTrap = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv8KekkaiTrap, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daKekaiTrap_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 644, // mPriority - &l_daKekaiTrap_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv8KekkaiTrap_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daKekaiTrap_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv8KekkaiTrap_e, + /* Actor SubMtd */ &l_daKekaiTrap_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv8Lift.cpp b/src/d/actor/d_a_obj_lv8Lift.cpp index 4542c6f41e..4f475a626c 100644 --- a/src/d/actor/d_a_obj_lv8Lift.cpp +++ b/src/d/actor/d_a_obj_lv8Lift.cpp @@ -129,7 +129,7 @@ void daL8Lift_c::lightSet() { } void daL8Lift_c::rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_rideActor) { - if (fopAcM_GetName(i_rideActor) == PROC_ALINK) { + if (fopAcM_GetName(i_rideActor) == fpcNm_ALINK_e) { ((daL8Lift_c*)i_this)->mPlayerRide = true; } } @@ -445,18 +445,18 @@ static actor_method_class l_daL8Lift_Method = { }; actor_process_profile_definition g_profile_Obj_Lv8Lift = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv8Lift, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daL8Lift_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 645, // mPriority - &l_daL8Lift_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv8Lift_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daL8Lift_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv8Lift_e, + /* Actor SubMtd */ &l_daL8Lift_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv8OptiLift.cpp b/src/d/actor/d_a_obj_lv8OptiLift.cpp index b8a040c615..a8610989a7 100644 --- a/src/d/actor/d_a_obj_lv8OptiLift.cpp +++ b/src/d/actor/d_a_obj_lv8OptiLift.cpp @@ -124,7 +124,7 @@ void daOptiLift_c::lightSet() { } void daOptiLift_c::rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_rideActor) { - if (fopAcM_GetName(i_rideActor) == PROC_ALINK) { + if (fopAcM_GetName(i_rideActor) == fpcNm_ALINK_e) { ((daOptiLift_c*)i_this)->mPlayerRide = true; } } @@ -477,18 +477,18 @@ static actor_method_class l_daOptiLift_Method = { }; actor_process_profile_definition g_profile_Obj_Lv8OptiLift = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv8OptiLift, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daOptiLift_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 643, // mPriority - &l_daOptiLift_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv8OptiLift_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daOptiLift_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv8OptiLift_e, + /* Actor SubMtd */ &l_daOptiLift_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv8UdFloor.cpp b/src/d/actor/d_a_obj_lv8UdFloor.cpp index 3015e52846..920ff92fa4 100644 --- a/src/d/actor/d_a_obj_lv8UdFloor.cpp +++ b/src/d/actor/d_a_obj_lv8UdFloor.cpp @@ -288,18 +288,18 @@ static actor_method_class l_daUdFloor_Method = { }; actor_process_profile_definition g_profile_Obj_Lv8UdFloor = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv8UdFloor, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daUdFloor_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 646, // mPriority - &l_daUdFloor_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv8UdFloor_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daUdFloor_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv8UdFloor_e, + /* Actor SubMtd */ &l_daUdFloor_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv9SwShutter.cpp b/src/d/actor/d_a_obj_lv9SwShutter.cpp index 9f49edaa40..0a034ea6bd 100644 --- a/src/d/actor/d_a_obj_lv9SwShutter.cpp +++ b/src/d/actor/d_a_obj_lv9SwShutter.cpp @@ -194,18 +194,18 @@ static actor_method_class l_daLv9SwShutter_Method = { }; actor_process_profile_definition g_profile_Obj_Lv9SwShutter = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv9SwShutter, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv9SwShutter_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 647, // mPriority - &l_daLv9SwShutter_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv9SwShutter_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv9SwShutter_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv9SwShutter_e, + /* Actor SubMtd */ &l_daLv9SwShutter_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_magLift.cpp b/src/d/actor/d_a_obj_magLift.cpp index 9f82a8f8c4..6e677b5f34 100644 --- a/src/d/actor/d_a_obj_magLift.cpp +++ b/src/d/actor/d_a_obj_magLift.cpp @@ -243,18 +243,18 @@ static actor_method_class l_daMagLift_Method = { }; actor_process_profile_definition g_profile_Obj_MagLift = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_MagLift, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daMagLift_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 492, // mPriority - &l_daMagLift_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MagLift_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daMagLift_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_MagLift_e, + /* Actor SubMtd */ &l_daMagLift_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_magLiftRot.cpp b/src/d/actor/d_a_obj_magLiftRot.cpp index 9f07a93386..f55368de37 100644 --- a/src/d/actor/d_a_obj_magLiftRot.cpp +++ b/src/d/actor/d_a_obj_magLiftRot.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_magLiftRot.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #if DEBUG #include "m_Do/m_Do_hostIO.h" #endif @@ -363,18 +363,18 @@ static actor_method_class l_daMagLiftRot_Method = { }; actor_process_profile_definition g_profile_Obj_MagLiftRot = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_MagLiftRot, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daMagLiftRot_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 493, // mPriority - &l_daMagLiftRot_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MagLiftRot_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daMagLiftRot_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_MagLiftRot_e, + /* Actor SubMtd */ &l_daMagLiftRot_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_magne_arm.cpp b/src/d/actor/d_a_obj_magne_arm.cpp index f15f6506f9..1c1c152c00 100644 --- a/src/d/actor/d_a_obj_magne_arm.cpp +++ b/src/d/actor/d_a_obj_magne_arm.cpp @@ -136,7 +136,7 @@ void daObjMarm_c::setBaseMtx() { } void rideCallBack(dBgW* param_0, fopAc_ac_c* i_this, fopAc_ac_c* i_rideActor) { - if (fopAcM_GetName(i_rideActor) == PROC_ALINK) { + if (fopAcM_GetName(i_rideActor) == fpcNm_ALINK_e) { static_cast(i_this)->mPlayerRide = TRUE; } } @@ -347,7 +347,7 @@ cPhs_Step daObjMarm_c::phase_0() { cPhs_Step daObjMarm_c::phase_1() { cXyz scale(1.0f, 1.0f, 1.0f); - mID = fopAcM_create(PROC_Obj_MHole, 0x12FF, ¤t.pos, fopAcM_GetRoomNo(this), + mID = fopAcM_create(fpcNm_Obj_MHole_e, 0x12FF, ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle, &scale, -1); if (mID == fpcM_ERROR_PROCESS_ID_e) { @@ -1099,20 +1099,20 @@ static actor_method_class daObjMarm_METHODS = { }; actor_process_profile_definition g_profile_Obj_MagneArm = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_MagneArm, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjMarm_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 614, // mPriority - &daObjMarm_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MagneArm_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjMarm_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_MagneArm_e, + /* Actor SubMtd */ &daObjMarm_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_obj_maki.cpp b/src/d/actor/d_a_obj_maki.cpp index b1d77887b3..f207b2f7f0 100644 --- a/src/d/actor/d_a_obj_maki.cpp +++ b/src/d/actor/d_a_obj_maki.cpp @@ -244,18 +244,18 @@ actor_method_class l_daObj_Maki_Method = { }; actor_process_profile_definition g_profile_OBJ_MAKI = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_MAKI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_maki_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 50, // mPriority - &l_daObj_Maki_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_MAKI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_maki_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_MAKI_e, + /* Actor SubMtd */ &l_daObj_Maki_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_master_sword.cpp b/src/d/actor/d_a_obj_master_sword.cpp index 9c8082bb8f..cc00bc91f4 100644 --- a/src/d/actor/d_a_obj_master_sword.cpp +++ b/src/d/actor/d_a_obj_master_sword.cpp @@ -45,7 +45,7 @@ void daObjMasterSword_c::executeWait() { } if (fopAcM_checkCarryNow(this)) { - dMeter2Info_setCloth(fpcNm_ITEM_WEAR_KOKIRI, false); + dMeter2Info_setCloth(dItemNo_WEAR_KOKIRI_e, false); fopAcM_orderMapToolEvent(this, getEventID(), 0xFF, 0xFFFF, 1, 0); } } @@ -186,9 +186,9 @@ int daObjMasterSword_c::execute() { mBrk.play(); if (dComIfGs_isTmpBit(dSv_event_tmp_flag_c::tempBitLabels[73])) { - dComIfGs_onItemFirstBit(fpcNm_ITEM_MASTER_SWORD); - dMeter2Info_setSword(fpcNm_ITEM_MASTER_SWORD, false); - dComIfGs_setSelectEquipSword(fpcNm_ITEM_MASTER_SWORD); + dComIfGs_onItemFirstBit(dItemNo_MASTER_SWORD_e); + dMeter2Info_setSword(dItemNo_MASTER_SWORD_e, false); + dComIfGs_setSelectEquipSword(dItemNo_MASTER_SWORD_e); dComIfGp_setItemLifeCount(dComIfGs_getMaxLife(), 0); dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[getFlagNo()]); @@ -245,18 +245,18 @@ static actor_method_class l_daObjMasterSword_Method = { }; actor_process_profile_definition g_profile_Obj_MasterSword = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_MasterSword, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjMasterSword_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 562, // mPriority - &l_daObjMasterSword_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MasterSword_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjMasterSword_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_MasterSword_e, + /* Actor SubMtd */ &l_daObjMasterSword_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_mato.cpp b/src/d/actor/d_a_obj_mato.cpp index 91788372f4..f45df05570 100644 --- a/src/d/actor/d_a_obj_mato.cpp +++ b/src/d/actor/d_a_obj_mato.cpp @@ -102,7 +102,7 @@ void daObjMATO_c::hit_check() { mData[i].ccStts.Move(); if (mData[i].ccCyl.ChkCoHit()) { fopAc_ac_c* a_pCoHitAc = dCc_GetAc(mData[i].ccCyl.GetCoHitObj()->GetAc()); - if (fopAcM_GetName(a_pCoHitAc) == PROC_ALINK) { + if (fopAcM_GetName(a_pCoHitAc) == fpcNm_ALINK_e) { mData[i].is_hit = TRUE; getRupee(i); setAction(&daObjMATO_c::disappear, i); @@ -139,13 +139,13 @@ void daObjMATO_c::wait(int i_no) { } static const int l_rupee_itemno_table[] = { - fpcNm_ITEM_GREEN_RUPEE, - fpcNm_ITEM_BLUE_RUPEE, - fpcNm_ITEM_YELLOW_RUPEE, - fpcNm_ITEM_RED_RUPEE, - fpcNm_ITEM_PURPLE_RUPEE, - fpcNm_ITEM_ORANGE_RUPEE, - fpcNm_ITEM_SILVER_RUPEE, + dItemNo_GREEN_RUPEE_e, + dItemNo_BLUE_RUPEE_e, + dItemNo_YELLOW_RUPEE_e, + dItemNo_RED_RUPEE_e, + dItemNo_PURPLE_RUPEE_e, + dItemNo_ORANGE_RUPEE_e, + dItemNo_SILVER_RUPEE_e, }; static const u8 l_rupee_count_table[] = { @@ -374,18 +374,18 @@ static actor_method_class l_daObjMATO_Method = { }; actor_process_profile_definition g_profile_Obj_Mato = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Mato, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjMATO_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 441, // mPriority - &l_daObjMATO_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Mato_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjMATO_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Mato_e, + /* Actor SubMtd */ &l_daObjMATO_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_metalbox.cpp b/src/d/actor/d_a_obj_metalbox.cpp index c769c8af8e..41ca666474 100644 --- a/src/d/actor/d_a_obj_metalbox.cpp +++ b/src/d/actor/d_a_obj_metalbox.cpp @@ -107,18 +107,18 @@ static actor_method_class l_daObjMBox_Method = { }; actor_process_profile_definition g_profile_Obj_MetalBox = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_MetalBox, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjMBox_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 498, // mPriority - &l_daObjMBox_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MetalBox_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjMBox_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_MetalBox_e, + /* Actor SubMtd */ &l_daObjMBox_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_mgate.cpp b/src/d/actor/d_a_obj_mgate.cpp index e8a56dff01..8a09785678 100644 --- a/src/d/actor/d_a_obj_mgate.cpp +++ b/src/d/actor/d_a_obj_mgate.cpp @@ -9,7 +9,7 @@ #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" #include "d/d_lib.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static Vec const l_key_offset[2] = { {205.0f, 180.0f, 0.0f}, @@ -242,18 +242,18 @@ static actor_method_class daObjMGate_METHODS = { }; actor_process_profile_definition g_profile_Obj_MGate = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_MGate, - &g_fpcLf_Method.base, - sizeof(daObjMGate_c), - 0, - 0, - &g_fopAc_Method.base, - 452, - &daObjMGate_METHODS, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MGate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjMGate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_MGate_e, + /* Actor SubMtd */ &daObjMGate_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_mhole.cpp b/src/d/actor/d_a_obj_mhole.cpp index 2baf2058b7..0b3093d388 100644 --- a/src/d/actor/d_a_obj_mhole.cpp +++ b/src/d/actor/d_a_obj_mhole.cpp @@ -67,7 +67,7 @@ static void* searchParentSub(void* i_magLift, void* i_mhole) { fopAc_ac_c* mag_lift = (fopAc_ac_c*)i_magLift; if (mag_lift != NULL && fopAcM_IsActor(mag_lift) && - fopAcM_GetProfName(mag_lift) == PROC_Obj_MagLift && + fopAcM_GetProfName(mag_lift) == fpcNm_Obj_MagLift_e && mag_lift->home.pos.abs(mhole->home.pos) < 10.0f) { return mag_lift; @@ -384,18 +384,18 @@ static actor_method_class l_daObjMHole_Method = { }; actor_process_profile_definition g_profile_Obj_MHole = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_MHole, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjMHole_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 589, // mPriority - &l_daObjMHole_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MHole_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjMHole_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_MHole_e, + /* Actor SubMtd */ &l_daObjMHole_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_mie.cpp b/src/d/actor/d_a_obj_mie.cpp index fb41e1edb8..dc55c589e8 100644 --- a/src/d/actor/d_a_obj_mie.cpp +++ b/src/d/actor/d_a_obj_mie.cpp @@ -380,7 +380,7 @@ int daObj_Mie_c::createHeapCallBack(fopAc_ac_c* a_this) { void* daObj_Mie_c::srchPouyaa(void* param_1, void* param_2) { if (fopAcM_IsActor(param_1) && param_1 != param_2 && - fopAcM_GetName(param_1) == PROC_NPC_POUYA && + fopAcM_GetName(param_1) == fpcNm_NPC_POUYA_e && static_cast(param_1)->getType() == 1) { return param_1; @@ -521,18 +521,18 @@ static actor_method_class daObj_Mie_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_MIE = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_MIE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_Mie_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 86, // mPriority - &daObj_Mie_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_MIE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Mie_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_MIE_e, + /* Actor SubMtd */ &daObj_Mie_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_mirror_6pole.cpp b/src/d/actor/d_a_obj_mirror_6pole.cpp index 6e679cc1e2..bec22c08f2 100644 --- a/src/d/actor/d_a_obj_mirror_6pole.cpp +++ b/src/d/actor/d_a_obj_mirror_6pole.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_mirror_6pole.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_actor_mng.h" static char* l_arcName = "MR-6Pole"; @@ -174,18 +174,18 @@ static actor_method_class l_daObjMirror6Pole_Method = { }; actor_process_profile_definition g_profile_Obj_Mirror6Pole = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Mirror6Pole, - &g_fpcLf_Method.base, - sizeof(daObjMirror6Pole_c), - 0, - 0, - &g_fopAc_Method.base, - 682, - &l_daObjMirror6Pole_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Mirror6Pole_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjMirror6Pole_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Mirror6Pole_e, + /* Actor SubMtd */ &l_daObjMirror6Pole_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_mirror_chain.cpp b/src/d/actor/d_a_obj_mirror_chain.cpp index 3787cd954e..92c062f7c8 100644 --- a/src/d/actor/d_a_obj_mirror_chain.cpp +++ b/src/d/actor/d_a_obj_mirror_chain.cpp @@ -505,18 +505,18 @@ static actor_method_class l_daObjMirrorChain_Method = { }; actor_process_profile_definition g_profile_Obj_MirrorChain = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_MirrorChain, - &g_fpcLf_Method.base, - sizeof(daObjMirrorChain_c), - 0, - 0, - &g_fopAc_Method.base, - 0x2A9, - &l_daObjMirrorChain_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MirrorChain_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjMirrorChain_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_MirrorChain_e, + /* Actor SubMtd */ &l_daObjMirrorChain_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_mirror_sand.cpp b/src/d/actor/d_a_obj_mirror_sand.cpp index 128708577a..38d9ce0cf5 100644 --- a/src/d/actor/d_a_obj_mirror_sand.cpp +++ b/src/d/actor/d_a_obj_mirror_sand.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_mirror_sand.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static char* l_arcName = "MR-Sand"; @@ -170,18 +170,18 @@ static actor_method_class l_daObjMirrorSand_Method = { }; actor_process_profile_definition g_profile_Obj_MirrorSand = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_MirrorSand, - &g_fpcLf_Method.base, - sizeof(daObjMirrorSand_c), - 0, - 0, - &g_fopAc_Method.base, - 679, - &l_daObjMirrorSand_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MirrorSand_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjMirrorSand_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_MirrorSand_e, + /* Actor SubMtd */ &l_daObjMirrorSand_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_mirror_screw.cpp b/src/d/actor/d_a_obj_mirror_screw.cpp index eafd4740e2..4d8432f1c4 100644 --- a/src/d/actor/d_a_obj_mirror_screw.cpp +++ b/src/d/actor/d_a_obj_mirror_screw.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_mirror_screw.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static char const* l_arcName = "MR-Screw"; @@ -192,7 +192,7 @@ int daObjMirrorScrew_c::Create() { initBaseMtx(); cXyz sw_pos(current.pos.x, current.pos.y + 2636.121f, current.pos.z); - fopAcM_createChild(PROC_Obj_SwSpinner, fopAcM_GetID(this), getSwitchNo() << 8, &sw_pos, + fopAcM_createChild(fpcNm_Obj_SwSpinner_e, fopAcM_GetID(this), getSwitchNo() << 8, &sw_pos, fopAcM_GetRoomNo(this), NULL, NULL, -1, NULL); mpSwSpinner = NULL; @@ -208,27 +208,27 @@ int daObjMirrorScrew_c::Create() { int daObjMirrorScrew_c::Execute(Mtx** i_mtxP) { if (mpSwSpinner == NULL) { - mpSwSpinner = static_cast(fopAcM_SearchByName(PROC_Obj_SwSpinner)); + mpSwSpinner = static_cast(fopAcM_SearchByName(fpcNm_Obj_SwSpinner_e)); } if (mpSpPath == NULL) { - mpSpPath = static_cast(fopAcM_SearchByName(PROC_Tag_Sppath)); + mpSpPath = static_cast(fopAcM_SearchByName(fpcNm_Tag_Sppath_e)); } if (mpChain == NULL) { - mpChain = static_cast(fopAcM_SearchByName(PROC_Obj_MirrorChain)); + mpChain = static_cast(fopAcM_SearchByName(fpcNm_Obj_MirrorChain_e)); } if (mpTable == NULL) { - mpTable = static_cast(fopAcM_SearchByName(PROC_Obj_MirrorTable)); + mpTable = static_cast(fopAcM_SearchByName(fpcNm_Obj_MirrorTable_e)); } if (mp6Pole == NULL) { - mp6Pole = static_cast(fopAcM_SearchByName(PROC_Obj_Mirror6Pole)); + mp6Pole = static_cast(fopAcM_SearchByName(fpcNm_Obj_Mirror6Pole_e)); } if (mpSand == NULL) { - mpSand = static_cast(fopAcM_SearchByName(PROC_Obj_MirrorSand)); + mpSand = static_cast(fopAcM_SearchByName(fpcNm_Obj_MirrorSand_e)); } callExecute(); @@ -259,18 +259,18 @@ static actor_method_class l_daObjMirrorScrew_Method = { }; actor_process_profile_definition g_profile_Obj_MirrorScrew = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_MirrorScrew, - &g_fpcLf_Method.base, - sizeof(daObjMirrorScrew_c), - 0, - 0, - &g_fopAc_Method.base, - 0x2A6, - &l_daObjMirrorScrew_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MirrorScrew_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjMirrorScrew_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_MirrorScrew_e, + /* Actor SubMtd */ &l_daObjMirrorScrew_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_mirror_table.cpp b/src/d/actor/d_a_obj_mirror_table.cpp index 341bc4a027..ec77a7ac91 100644 --- a/src/d/actor/d_a_obj_mirror_table.cpp +++ b/src/d/actor/d_a_obj_mirror_table.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_mirror.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include static char const* l_arcName = "MR-Table"; @@ -202,13 +202,13 @@ void daObjMirrorTable_c::checkOnPanel() { } static void rideCallBack1(dBgW* i_bgW, fopAc_ac_c* i_this, fopAc_ac_c* i_actor) { - if (fopAcM_GetName(i_actor) == PROC_ALINK) { + if (fopAcM_GetName(i_actor) == fpcNm_ALINK_e) { static_cast(i_this)->checkOnPanel(); } } static void rideCallBack2(dBgW* i_bgW, fopAc_ac_c* i_this, fopAc_ac_c* i_actor) { - if (fopAcM_GetName(i_actor) == PROC_ALINK) { + if (fopAcM_GetName(i_actor) == fpcNm_ALINK_e) { static_cast(i_this)->field_0x875 = 15; } } @@ -443,7 +443,7 @@ void daObjMirrorTable_c::create_init() { cXyz pos(1760.0f, 4714.3f, -20624.0f); csXyz angle(0, 0x8000, 0); cXyz scale(1.35f, 1.35f, 1.0f); - fopAcM_create(PROC_MIRROR, daMirror_c::getMirrorRoomPrm(), + fopAcM_create(fpcNm_MIRROR_e, daMirror_c::getMirrorRoomPrm(), &pos, current.roomNo, &angle, &scale, 0xff); } } @@ -463,18 +463,18 @@ static actor_method_class l_daObjMirrorTable_Method = { }; actor_process_profile_definition g_profile_Obj_MirrorTable = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_MirrorTable, - &g_fpcLf_Method.base, - sizeof(daObjMirrorTable_c), - 0, - 0, - &g_fopAc_Method.base, - 0x2A8, - &l_daObjMirrorTable_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MirrorTable_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjMirrorTable_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_MirrorTable_e, + /* Actor SubMtd */ &l_daObjMirrorTable_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index 97396cb349..0392c33d79 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -17,12 +17,6 @@ #include "d/actor/d_a_player.h" #include "d/d_path.h" -#define ATTR_F32(x) (*((f32*)&attr().x)) -#define ATTR_S16(x) (*((s16*)&attr().x)) -// There are a lot of attr() problems in debug, -// they seem to be fixed by casting, like `((daObjMovebox::Attr_c*)&attr())->field` -// but sometimes breaks in release - #if DEBUG const char* const daObjMovebox::Hio_c::M_name[8] = { "押引・木・1.5m", // Push-pull type, wood, 1.5m @@ -36,36 +30,6 @@ const char* const daObjMovebox::Hio_c::M_name[8] = { }; #endif -const daObjMovebox::BgcSrc_c daObjMovebox::Bgc_c::M_lin5[] = { - {0.0f, 0.0f, 0.0f, 0.0f}, {-0.5f, -0.5f, 1.0f, 1.0f}, {0.5f, -0.5f, -1.0f, 1.0f}, - {0.5f, 0.5f, -1.0f, -1.0f}, {-0.5f, 0.5f, 1.0f, -1.0f}, -}; - -const daObjMovebox::BgcSrc_c daObjMovebox::Bgc_c::M_lin20[] = { - {0.0f, 0.0f, 0.0f, 0.0f}, {-0.25f, -0.25f, 0.0f, 0.0f}, {-0.5f, -0.5f, 1.0f, 1.0f}, - {0.0f, -0.5f, -1.0f, 1.0f}, {0.0f, 0.0f, -1.0f, -1.0f}, {-0.5f, 0.0f, 1.0f, -1.0f}, - {0.25f, -0.25f, 0.0f, 0.0f}, {0.0f, -0.5f, 1.0f, 1.0f}, {0.5f, -0.5f, -1.0f, 1.0f}, - {0.5f, 0.0f, -1.0f, -1.0f}, {0.0f, 0.0f, 1.0f, -1.0f}, {0.25f, 0.25f, 0.0f, 0.0f}, - {0.0f, 0.0f, 1.0f, 1.0f}, {0.5f, 0.0f, -1.0f, 1.0f}, {0.5f, 0.5f, -1.0f, -1.0f}, - {0.0f, 0.5f, 1.0f, -1.0f}, {-0.25f, 0.25f, 0.0f, 0.0f}, {-0.5f, 0.0f, 1.0f, 1.0f}, - {0.0f, 0.0f, -1.0f, 1.0f}, {0.0f, 0.5f, -1.0f, -1.0f}, {-0.5f, 0.5f, 1.0f, -1.0f}, - {-0.75f, 0.25f, 0.0f, 0.0f}, {-0.75f, -0.25f, 0.0f, 0.0f}, -}; - -daObjMovebox::Bgc_c::Bgc_c() { - for (int i = 0; i < 23; i++) { - field_0x0[i] = 0.0f; - field_0x64[i] = cXyz::Zero; - } - - field_0x5c = 0xFFFFFFFF; - field_0x178 = 0xFFFFFFFF; - field_0x17c = FLT_MAX; - field_0x60 = 0.0f; - mState = STATE_0_e; -} - - #if DEBUG namespace daObjMovebox { namespace { @@ -135,13 +99,42 @@ void daObjMovebox::Hio_c::genMessage(JORMContext* context) { #endif +const daObjMovebox::BgcSrc_c daObjMovebox::Bgc_c::M_lin5[] = { + {0.0f, 0.0f, 0.0f, 0.0f}, {-0.5f, -0.5f, 1.0f, 1.0f}, {0.5f, -0.5f, -1.0f, 1.0f}, + {0.5f, 0.5f, -1.0f, -1.0f}, {-0.5f, 0.5f, 1.0f, -1.0f}, +}; + +const daObjMovebox::BgcSrc_c daObjMovebox::Bgc_c::M_lin20[] = { + {0.0f, 0.0f, 0.0f, 0.0f}, {-0.25f, -0.25f, 0.0f, 0.0f}, {-0.5f, -0.5f, 1.0f, 1.0f}, + {0.0f, -0.5f, -1.0f, 1.0f}, {0.0f, 0.0f, -1.0f, -1.0f}, {-0.5f, 0.0f, 1.0f, -1.0f}, + {0.25f, -0.25f, 0.0f, 0.0f}, {0.0f, -0.5f, 1.0f, 1.0f}, {0.5f, -0.5f, -1.0f, 1.0f}, + {0.5f, 0.0f, -1.0f, -1.0f}, {0.0f, 0.0f, 1.0f, -1.0f}, {0.25f, 0.25f, 0.0f, 0.0f}, + {0.0f, 0.0f, 1.0f, 1.0f}, {0.5f, 0.0f, -1.0f, 1.0f}, {0.5f, 0.5f, -1.0f, -1.0f}, + {0.0f, 0.5f, 1.0f, -1.0f}, {-0.25f, 0.25f, 0.0f, 0.0f}, {-0.5f, 0.0f, 1.0f, 1.0f}, + {0.0f, 0.0f, -1.0f, 1.0f}, {0.0f, 0.5f, -1.0f, -1.0f}, {-0.5f, 0.5f, 1.0f, -1.0f}, + {-0.75f, 0.25f, 0.0f, 0.0f}, {-0.75f, -0.25f, 0.0f, 0.0f}, +}; + +daObjMovebox::Bgc_c::Bgc_c() { + for (int i = 0; i < 23; i++) { + field_0x0[i] = 0.0f; + field_0x64[i] = cXyz::Zero; + } + + field_0x5c = 0xFFFFFFFF; + field_0x178 = 0xFFFFFFFF; + field_0x17c = FLT_MAX; + field_0x60 = 0.0f; + mState = STATE_0_e; +} + dBgS_ObjGndChk daObjMovebox::Bgc_c::M_gnd_work[23]; void daObjMovebox::Bgc_c::gnd_pos(const daObjMovebox::Act_c* i_actor, const daObjMovebox::BgcSrc_c* i_bgcSrc, int i_checkNum, f32 param_3) { - cXyz sp50; - cXyz sp5C; + cXyz sp20; + cXyz sp14; f32 var_f31 = -G_CM3D_F_INF; mDoMtx_stack_c::transS(i_actor->current.pos); @@ -149,20 +142,20 @@ void daObjMovebox::Bgc_c::gnd_pos(const daObjMovebox::Act_c* i_actor, field_0x5c = -1; for (int i = 0; i < i_checkNum; i++, i_bgcSrc++) { - sp50.set(i_bgcSrc->field_0xc + i_bgcSrc->field_0x4 * i_actor->attr().field_0x70, param_3, + sp20.set(i_bgcSrc->field_0xc + i_bgcSrc->field_0x4 * i_actor->attr().mScaleXZ, param_3, i_bgcSrc->field_0x8 + i_bgcSrc->field_0x0 * i_actor->attr().field_0x78); - mDoMtx_stack_c::multVec(&sp50, &sp5C); - M_gnd_work[i].SetPos(&sp5C); - M_gnd_work[i].SetActorPid(fopAcM_GetID(i_actor)); + mDoMtx_stack_c::multVec(&sp20, &sp14); + M_gnd_work[i].SetPos(&sp14); + M_gnd_work[i].SetActorPid(i_actor->id); field_0x0[i] = dComIfG_Bgsp().GroundCross(&M_gnd_work[i]); #if DEBUG - L_gnd_start[i_actor->mType][i].set(sp50); + L_gnd_start[i_actor->mType][i].set(sp14); L_gnd_flag[i_actor->mType][i] = 1; #endif if (field_0x0[i] > var_f31) { fopAc_ac_c* bg_actor = dComIfG_Bgsp().GetActorPointer(M_gnd_work[i]); - if (bg_actor == NULL || fopAcM_GetName(bg_actor) != PROC_Obj_Movebox || + if (bg_actor == NULL || fopAcM_GetName(bg_actor) != fpcNm_Obj_Movebox_e || ((daObjMovebox::Act_c*)bg_actor)->field_0x5ac != 2) { var_f31 = field_0x0[i]; @@ -222,9 +215,9 @@ void daObjMovebox::Bgc_c::wall_pos(daObjMovebox::Act_c const* i_actor, mDoMtx_stack_c::YrotS(sp8C); mDoMtx_stack_c::transM(sp60); - mDoMtx_stack_c::scaleM(i_actor->attr().field_0x70, - i_actor->attr().field_0x64, - i_actor->attr().field_0x70); + mDoMtx_stack_c::scaleM(i_actor->attr().mScaleXZ, + i_actor->attr().mScaleY, + i_actor->attr().mScaleXZ); mDoMtx_stack_c::transM(0.0f, 0.5f, 0.0f); mDoMtx_stack_c::XrotM(0x4000); @@ -261,8 +254,8 @@ void daObjMovebox::Bgc_c::proc_vertical(daObjMovebox::Act_c* i_actor) { State_e var_r29 = mState; mState = STATE_0_e; - gnd_pos(i_actor, i_actor->attr().field_0x9e ? M_lin20 : M_lin5, - i_actor->attr().field_0x9e ? 21 : 5, 100.0f); + gnd_pos(i_actor, i_actor->attr().mUseLargeGrid ? M_lin20 : M_lin5, + i_actor->attr().mUseLargeGrid ? 21 : 5, 100.0f); if (field_0x5c >= 0 && field_0x0[field_0x5c] > i_actor->current.pos.y) { i_actor->current.pos.y = field_0x0[field_0x5c]; @@ -305,6 +298,7 @@ bool daObjMovebox::Bgc_c::chk_wall_pre(daObjMovebox::Act_c const* i_actor, bool daObjMovebox::Bgc_c::chk_wall_touch(daObjMovebox::Act_c const* i_actor, daObjMovebox::BgcSrc_c const* i_bgcSrc, s16 param_2) { static dBgS_ObjLinChk touch_work; + static const f32 bgc_add = 10.0f; const s16 sp8C = i_actor->home.angle.y + param_2; @@ -318,7 +312,7 @@ bool daObjMovebox::Bgc_c::chk_wall_touch(daObjMovebox::Act_c const* i_actor, mDoMtx_stack_c::XrotM(0x4000); sp50.set(i_bgcSrc->field_0xc, 0.0f, i_bgcSrc->field_0x8); mDoMtx_stack_c::multVec(&cXyz::BaseY, &sp68); - sp68 *= i_actor->attr().field_0x70 * 0.5f + 10.0f; + sp68 *= i_actor->attr().mScaleXZ * 0.5f + 10.0f; mDoMtx_stack_c::XrotM(0x4000); sp50.set(i_bgcSrc->field_0xc, 0.0f, i_bgcSrc->field_0x8); @@ -326,10 +320,10 @@ bool daObjMovebox::Bgc_c::chk_wall_touch(daObjMovebox::Act_c const* i_actor, mDoMtx_stack_c::YrotS(sp8C); mDoMtx_stack_c::transM(sp5C); - - mDoMtx_stack_c::scaleM(i_actor->attr().field_0x70, - i_actor->attr().field_0x64, - i_actor->attr().field_0x70); + + mDoMtx_stack_c::scaleM(i_actor->attr().mScaleXZ, + i_actor->attr().mScaleY, + i_actor->attr().mScaleXZ); mDoMtx_stack_c::transM(0.0f, 0.5f, 0.0f); mDoMtx_stack_c::XrotM(0x4000); @@ -436,77 +430,179 @@ const dCcD_SrcCyl daObjMovebox::Act_c::M_cyl_src = { } }; -// __declspec(section ".rodata") const daObjMovebox::Attr_c daObjMovebox::Act_c::M_attr[8] = { { - 0x6, 0xE, 0xA, 0x6, 0xE, 0xA, 75.0f, 90.0f, - -3.0f, 0.005f, 0.001f, 0.0f, 1.8f, 3.9f, -0.39f, -0.2f, - 0.02f, 1000, 0.04f, 0.013f, 0.15f, 0.1f, 0.1f, 0.06f, - 0.075f, 4, 7, 0xC00, 150.0f, 150.0f, 0.0066666668f, 150.0f, - 0.0066666668f, 150.0f, 0x8013C, 0x8013D, 0x80151, 0x8002A, 0x8002D, {-90, -1}, - {-90, 90}, {151, 90}, 0, 0, 0, + // Timing + 6, 14, 10, 6, 14, 10, + // Misc + 75.0f, 90.0f, -3.0f, 0.005f, 0.001f, 0.0f, 1.8f, 3.9f, -0.39f, -0.2f, + // Water + 0.02f, 1000, 0.04f, 0.013f, + // Tilt + 0.15f, 0.1f, 0.1f, 0.06f, 0.075f, + // Scales/Limits + 4, 7, 0xC00, + 150.0f, 150.0f, 1.0f / 150.0f, 150.0f, 1.0f / 150.0f, 150.0f, + // Sound effects + Z2SE_OBJ_MOVE_WBLOCK, Z2SE_OBJ_MOVE_WBLOCK_LIMIT, Z2SE_OBJ_WBOX_FALL_NORMAL, + Z2SE_OBJ_FALL_WATER_M, JA_SE_OBJ_FALL_MAGMA_M, + // Cull + {-90, -1, -90, 90, 151, 90}, + // Flags + false, false, false }, { - 0x8, 0x13, 0xD, 0x8, 0x13, 0xD, 75.0f, 90.0f, - -5.0f, 0.005f, 0.001f, 0.0f, 1.8f, 4.5f, -0.5f, -0.2f, - 0.02f, 1000, 0.04f, 0.013f, 0.15f, 0.1f, 0.1f, 0.06f, - 0.075f, 4, 7, 0xC00, 150.0f, 150.0f, 0.0066666668f, 150.0f, - 0.0066666668f, 150.0f, 0x20038, 0x20039, 0x8002F, 0x8002B, 0x8002E, {-90, -1}, - {-90, 90}, {151, 90}, 0, 0, 0, + // Timing + 8, 19, 13, 8, 19, 13, + // Misc + 75.0f, 90.0f, -5.0f, 0.005f, 0.001f, 0.0f, 1.8f, 4.5f, -0.5f, -0.2f, + // Water + 0.02f, 1000, 0.04f, 0.013f, + // Tilt + 0.15f, 0.1f, 0.1f, 0.06f, 0.075f, + // Scales/Limits + 4, 7, 0xC00, + 150.0f, 150.0f, 1.0f / 150.0f, 150.0f, 1.0f / 150.0f, 150.0f, + // Sound effects + JA_SE_LK_MOVE_ROCK, JA_SE_LK_MOVE_ROCK_LIMIT, JA_SE_OBJ_BLOCK_FALL_NORMAL, + Z2SE_OBJ_FALL_WATER_L, JA_SE_OBJ_FALL_MAGMA_L, + // Cull + {-90, -1, -90, 90, 151, 90}, + // Flags + false, false, false }, { - 0x8, 0x13, 0xD, 0x8, 0x13, 0xD, 50.0f, 110.0f, -5.0f, - 0.005f, 0.001f, 0.0f, 1.8f, 4.5f, -0.5f, -0.2f, 0.02f, 1000, - 0.04f, 0.013f, 0.15f, 0.1f, 0.1f, 0.06f, 0.075f, 4, 7, - 0x1000, 200.0f, 200.0f, 0.005f, 200.0f, 0.005f, 200.0f, 0x80154, 0x80155, - 0x8002F, 0x8002B, 0x8002E, {-110, -1}, {-110, 110}, {210, 110}, 0, 1, 0, + // Timing + 8, 19, 13, 8, 19, 13, + // Misc + 50.0f, 110.0f, -5.0f, 0.005f, 0.001f, 0.0f, 1.8f, 4.5f, -0.5f, -0.2f, + // Water + 0.02f, 1000, 0.04f, 0.013f, + // Tilt + 0.15f, 0.1f, 0.1f, 0.06f, 0.075f, + // Scales/Limits + 4, 7, 0x1000, + 200.0f, 200.0f, 1 / 200.0f, 200.0f, 1.0f / 200.0f, 200.0f, + // Sound effects + Z2SE_OBJ_MOVE_ROCK, Z2SE_OBJ_MOVE_ROCK_LIMIT, JA_SE_OBJ_BLOCK_FALL_NORMAL, + Z2SE_OBJ_FALL_WATER_L, JA_SE_OBJ_FALL_MAGMA_L, + // Cull + {-110, -1, -110, 110, 210, 110}, + // Flags + false, true, false }, { - 0x8, 0x13, 0xD, 0x8, 0x13, 0xD, 75.0f, 180.0f, - -5.0f, 0.005f, 0.001f, 0.0f, 1.8f, 4.5f, -0.5f, -0.2f, - 0.02f, 1000, 0.04f, 0.013f, 0.15f, 0.1f, 0.1f, 0.06f, - 0.075f, 4, 7, 0xC00, 300.0f, 300.0f, 0.0033333334f, 300.0f, - 0.0033333334f, 300.0f, 0x20038, 0x20039, 0x8002F, 0x8002B, 0x8002E, {-180, -1}, - {-180, 180}, {310, 180}, 0, 0, 0, + // Timing + 8, 19, 13, 8, 19, 13, + // Misc + 75.0f, 180.0f, -5.0f, 0.005f, 0.001f, 0.0f, 1.8f, 4.5f, -0.5f, -0.2f, + // Water + 0.02f, 1000, 0.04f, 0.013f, + // Tilt + 0.15f, 0.1f, 0.1f, 0.06f, 0.075f, + // Scales/Limits + 4, 7, 0xC00, + 300.0f, 300.0f, 1.0f / 300.0f, 300.0f, 1.0f / 300.0f, 300.0f, + // Sound effects + JA_SE_LK_MOVE_ROCK, JA_SE_LK_MOVE_ROCK_LIMIT, JA_SE_OBJ_BLOCK_FALL_NORMAL, + Z2SE_OBJ_FALL_WATER_L, JA_SE_OBJ_FALL_MAGMA_L, + // Cull + {-180, -1, -180, 180, 310, 180}, + // Flags + false, false, false }, { - 0x8, 0x13, 0xD, 0x8, 0x13, 0xD, 75.0f, 180.0f, - -5.0f, 0.005f, 0.001f, 0.0f, 1.8f, 4.5f, -0.5f, -0.2f, - 0.02f, 1000, 0.04f, 0.013f, 0.15f, 0.1f, 0.1f, 0.06f, - 0.075f, 4, 7, 0x2670, 300.0f, 300.0f, 0.0033333334f, 300.0f, - 0.0033333334f, 300.0f, 0x20038, 0x20039, 0x8002F, 0x8002B, 0x8002E, {-180, -1}, - {-180, 180}, {310, 180}, 0, 0, 0, + // Timing + 8, 19, 13, 8, 19, 13, + // Misc + 75.0f, 180.0f, -5.0f, 0.005f, 0.001f, 0.0f, 1.8f, 4.5f, -0.5f, -0.2f, + // Water + 0.02f, 1000, 0.04f, 0.013f, + // Tilt + 0.15f, 0.1f, 0.1f, 0.06f, 0.075f, + // Scales/Limits + 4, 7, 0x2670, + 300.0f, 300.0f, 1.0f / 300.0f, 300.0f, 1.0f / 300.0f, 300.0f, + // Sound effects + JA_SE_LK_MOVE_ROCK, JA_SE_LK_MOVE_ROCK_LIMIT, JA_SE_OBJ_BLOCK_FALL_NORMAL, + Z2SE_OBJ_FALL_WATER_L, JA_SE_OBJ_FALL_MAGMA_L, + // Cull + {-180, -1, -180, 180, 310, 180}, + // Flags + false, false, false }, { - 0x8, 0x13, 0xD, 0x8, 0x13, 0xD, 75.0f, 90.0f, - -5.0f, 0.005f, 0.001f, 0.0f, 1.8f, 4.5f, -0.5f, -0.2f, - 0.02f, 1000, 0.04f, 0.013f, 0.15f, 0.1f, 0.1f, 0.06f, - 0.075f, 4, 7, 0xC00, 150.0f, 150.0f, 0.0066666668f, 150.0f, - 0.0066666668f, 150.0f, 0x20038, 0x20039, 0x8002F, 0x8002B, 0x8002E, {-90, -1}, - {-90, 90}, {360, 90}, 0, 0, 0, + // Timing + 8, 19, 13, 8, 19, 13, + // Misc + 75.0f, 90.0f, -5.0f, 0.005f, 0.001f, 0.0f, 1.8f, 4.5f, -0.5f, -0.2f, + // Water + 0.02f, 1000, 0.04f, 0.013f, + // Tilt + 0.15f, 0.1f, 0.1f, 0.06f, 0.075f, + // Scales/Limits + 4, 7, 0xC00, + 150.0f, 150.0f, 1.0f / 150.0f, 150.0f, 1.0f / 150.0f, 150.0f, + // Sound effects + JA_SE_LK_MOVE_ROCK, JA_SE_LK_MOVE_ROCK_LIMIT, JA_SE_OBJ_BLOCK_FALL_NORMAL, + Z2SE_OBJ_FALL_WATER_L, JA_SE_OBJ_FALL_MAGMA_L, + // Cull + {-90, -1, -90, 90, 360, 90}, + // Flags + false, false, false }, { - 0x8, 0x13, 0xD, 0x8, 0x13, 0xD, 50.0f, 90.0f, -3.0f, - 0.005f, 0.001f, 0.0f, 1.8f, 3.9f, -0.39f, -0.2f, 0.02f, 1000, - 0.04f, 0.013f, 0.15f, 0.1f, 0.1f, 0.06f, 0.075f, 4, 7, - 0x1620, 200.0f, 200.0f, 0.005f, 230.0f, 0.0043478259f, 100.0f, 0x8013C, 0x8013D, - 0x80151, 0x8002A, 0x8002D, {-130, -10}, {-60, 130}, {210, 60}, 0, 1, 0, + // Timing + 8, 19, 13, 8, 19, 13, + // Misc + 50.0f, 90.0f, -3.0f, 0.005f, 0.001f, 0.0f, 1.8f, 3.9f, -0.39f, -0.2f, + // Water + 0.02f, 1000, 0.04f, 0.013f, + // Tilt + 0.15f, 0.1f, 0.1f, 0.06f, 0.075f, + // Scales/Limits + 4, 7, 0x1620, + 200.0f, 200.0f, 1 / 200.0f, 230.0f, 1.0f / 230.0f, 100.0f, + // Sound effects + Z2SE_OBJ_MOVE_WBLOCK, Z2SE_OBJ_MOVE_WBLOCK_LIMIT, Z2SE_OBJ_WBOX_FALL_NORMAL, + Z2SE_OBJ_FALL_WATER_M, JA_SE_OBJ_FALL_MAGMA_M, + // Cull + {-130, -10, -60, 130, 210, 60}, + // Flags + false, true, false }, { - 0x4, 0x4, 0x14, 0x4, 0x4, 0x14, 75.0f, 90.0f, - -3.0f, 0.005f, 0.001f, 0.0f, 1.8f, 3.9f, -0.39f, -0.2f, - 0.02f, 1000, 0.04f, 0.013f, 0.15f, 0.1f, 0.1f, 0.06f, - 0.075f, 4, 7, 0x1620, 150.0f, 150.0f, 0.0066666668f, 150.0f, - 0.0066666668f, 150.0f, 0x8013C, 0x8013D, 0x80151, 0x8002A, 0x8002D, {-90, -1}, - {-90, 90}, {151, 90}, 0, 0, 0, + // Timing + 4, 4, 20, 4, 4, 20, + // Misc + 75.0f, 90.0f, -3.0f, 0.005f, 0.001f, 0.0f, 1.8f, 3.9f, -0.39f, -0.2f, + // Water + 0.02f, 1000, 0.04f, 0.013f, + // Tilt + 0.15f, 0.1f, 0.1f, 0.06f, 0.075f, + // Scales/Limits + 4, 7, 0x1620, + 150.0f, 150.0f, 1.0f / 150.0f, 150.0f, 1.0f / 150.0f, 150.0f, + // Sound effects + Z2SE_OBJ_MOVE_WBLOCK, Z2SE_OBJ_MOVE_WBLOCK_LIMIT, Z2SE_OBJ_WBOX_FALL_NORMAL, + Z2SE_OBJ_FALL_WATER_M, JA_SE_OBJ_FALL_MAGMA_M, + // Cull + {-90, -1, -90, 90, 151, 90}, + // Flags + false, false, false }, }; -const inline daObjMovebox::Attr_c& daObjMovebox::Act_c::attr() const { -#if DEBUG - return daObjMovebox::Act_c::M_hio[mType].mAttr; +// see comment in header +#if PLATFORM_GCN +inline const daObjMovebox::Attr_c& daObjMovebox::Act_c::attr() const { #else - return M_attr[mType]; +inline daObjMovebox::Attr_c& daObjMovebox::Act_c::attr() const { +#endif +#if DEBUG + return M_hio[mType].mAttr; +#else + return const_cast(M_attr[mType]); #endif } @@ -630,9 +726,9 @@ void daObjMovebox::Act_c::path_save() { int daObjMovebox::Act_c::CreateHeap() { BOOL var_r29 = true; - if (attr().field_0x58 >= 0) { + if (attr().mModelResIdx >= 0) { J3DModelData* modelData = - (J3DModelData*)dComIfG_getObjectRes(M_arcname[mType], attr().field_0x58); + (J3DModelData*)dComIfG_getObjectRes(M_arcname[mType], attr().mModelResIdx); JUT_ASSERT(1403, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); @@ -660,16 +756,16 @@ void daObjMovebox::Act_c::RideCallBack(dBgW* i_bgw, fopAc_ac_c* i_actor, fopAc_a var_f29 = i_rideActor->current.pos.x - a_this->current.pos.x; var_f28 = i_rideActor->current.pos.z - a_this->current.pos.z; - if (fopAcM_GetProfName(i_rideActor) == PROC_ALINK) { + if (fopAcM_GetProfName(i_rideActor) == fpcNm_ALINK_e) { var_f30 = a_this->attr().mPlayerGravity; - var_f27 = a_this->attr().field_0x74 * a_this->attr().mPlayerTiltPower; + var_f27 = a_this->attr().mTiltForceScale * a_this->attr().mPlayerTiltPower; } else { var_f30 = a_this->attr().mMiscGravity; - var_f27 = a_this->attr().field_0x74 * a_this->attr().mMiscTiltPower; + var_f27 = a_this->attr().mTiltForceScale * a_this->attr().mMiscTiltPower; } var_f31 = 1.0f - (JMAFastSqrt(var_f29 * var_f29 + var_f28 * var_f28) * - a_this->attr().field_0x74); + a_this->attr().mTiltForceScale); var_f31 = (var_f31 * 0.9f) + 0.1f; if (var_f31 < 0.0f) { var_f31 = 0.0f; @@ -684,7 +780,7 @@ void daObjMovebox::Act_c::RideCallBack(dBgW* i_bgw, fopAc_ac_c* i_actor, fopAc_a a_this->field_0x8c0 += var_f27 * var_f29; a_this->field_0x8c4 += var_f27 * var_f28; - } else if (fopAcM_GetProfName(i_rideActor) == PROC_Obj_Movebox) { + } else if (fopAcM_GetProfName(i_rideActor) == fpcNm_Obj_Movebox_e) { cLib_onBit(a_this->mBgc.mState, daObjMovebox::Bgc_c::STATE_40_e); } @@ -698,26 +794,28 @@ enum MOVE_DIR { }; fopAc_ac_c* daObjMovebox::Act_c::PPCallBack(fopAc_ac_c* i_bgActor, fopAc_ac_c* i_pushActor, - s16 i_angle, dBgW_Base::PushPullLabel pp_label) { + s16 i_angle, dBgW_Base::PushPullLabel i_pp_label) { UNUSED(i_pushActor); - dBgW::PushPullLabel var_r26 = cLib_checkBit( - pp_label, (dBgW::PushPullLabel)(dBgW::PPLABEL_PUSH | dBgW::PPLABEL_PULL)); + static const int pp_field = 3; + + dBgW::PushPullLabel pp_label = cLib_checkBit( + i_pp_label, (dBgW::PushPullLabel)(dBgW::PPLABEL_PUSH | dBgW::PPLABEL_PULL)); Act_c* a_this = (Act_c*)i_bgActor; bool sp_e = - a_this->attr().field_0x9e ? - (cLib_checkBit(pp_label, dBgW::PPLABEL_HEAVY) ? true : false) : + a_this->attr().mUseLargeGrid ? + (cLib_checkBit(i_pp_label, dBgW::PPLABEL_HEAVY) ? true : false) : true; - if (var_r26 && sp_e) { + if (pp_label && sp_e) { s16 sp10 = - cLib_checkBit(var_r26, dBgW::PPLABEL_PULL) ? i_angle - 0x8000 : i_angle; + cLib_checkBit(pp_label, dBgW::PPLABEL_PULL) ? i_angle - 0x8000 : i_angle; s16 dir = sp10 - a_this->home.angle.y; JUT_ASSERT(1499, pp_label != pp_field); - a_this->mPPLabel = pp_label; + a_this->mPPLabel = i_pp_label; int move_dir; if (dir >= -0x2000 && dir < 0x2000) { move_dir = DIR_SOUTH; @@ -778,10 +876,10 @@ int daObjMovebox::Act_c::Create() { fopAcM_SetMtx(this, mBgMtx); - fopAcM_setCullSizeBox(this, attr().mCullX.min, attr().mCullX.max, attr().mCullY.min, - attr().mCullY.max, attr().mCullZ.min, attr().mCullZ.max); + fopAcM_setCullSizeBox(this, attr().mCull.xMin, attr().mCull.xMax, attr().mCull.yMin, + attr().mCull.yMax, attr().mCull.zMin, attr().mCull.zMax); fopAcM_SetSpeedF(this, 0.0f); - fopAcM_SetGravity(this, ATTR_F32(mGravity)); + fopAcM_SetGravity(this, attr().mGravity); fopAcM_posMoveF(this, NULL); mBgc.proc_vertical(this); @@ -820,17 +918,13 @@ int daObjMovebox::Act_c::Create() { void daObjMovebox::Act_c::afl_sway() { bool var_r22; bool var_r21; - + f32 var_f31 = field_0x8c0 * field_0x8c0 + field_0x8c4 * field_0x8c4; f32 var_f29 = attr().mMaxTiltPower * attr().mMaxTiltPower; - const BgcSrc_c* pbgc; - if (attr().field_0x9e) { - pbgc = mBgc.M_lin20; - } else { - pbgc = mBgc.M_lin5; - } - s32 check_num = attr().field_0x9e ? 21 : 5; + //TODO: possible fakematch, the const_cast is very suspicious + BgcSrc_c* pbgc = const_cast(attr().mUseLargeGrid ? mBgc.M_lin20 : mBgc.M_lin5); + s32 check_num = attr().mUseLargeGrid ? 21 : 5; var_r22 = mBgc.chk_wall_touch2(this, pbgc, check_num, M_dir_base[0]) || mBgc.chk_wall_touch2(this, pbgc, check_num, M_dir_base[2]); @@ -900,8 +994,8 @@ int daObjMovebox::Act_c::check_to_walk() { for (int i = 0; i < 4; i++) { if (field_0x8f0[i] >= (s16)var_r28) { - const BgcSrc_c* pbgc = attr().field_0x9e ? mBgc.M_lin20 : mBgc.M_lin5; - int check_num = attr().field_0x9e ? 21 : 5; + const BgcSrc_c* pbgc = attr().mUseLargeGrid ? mBgc.M_lin20 : mBgc.M_lin5; + int check_num = attr().mUseLargeGrid ? 21 : 5; if (!mBgc.chk_wall_pre(this, pbgc, check_num, M_dir_base[i])) { var_r27 = i; @@ -950,7 +1044,7 @@ void daObjMovebox::Act_c::eff_smoke_slip_start() { void daObjMovebox::Act_c::mode_wait_init() { fopAcM_SetSpeedF(this, 0.0f); - fopAcM_SetGravity(this, ATTR_F32(mGravity)); + fopAcM_SetGravity(this, attr().mGravity); mpBgW->SetCrrFunc(dBgS_MoveBGProc_Trans); clr_moment_cnt(); field_0x8e8 = -1; @@ -970,8 +1064,8 @@ void daObjMovebox::Act_c::mode_wait() { path_save(); } - daObj::posMoveF_stream(this, NULL, &cXyz::Zero, ATTR_F32(mViscosityResistance), - ATTR_F32(mInertiaResistance)); + daObj::posMoveF_stream(this, NULL, &cXyz::Zero, attr().mViscosityResistance, + attr().mInertiaResistance); cXyz sp48; mDoMtx_stack_c::transS(home.pos); @@ -991,10 +1085,10 @@ void daObjMovebox::Act_c::mode_wait() { mode_walk_init(); if (cLib_checkBit(mPPLabel, dBgW::PPLABEL_PULL)) { - field_0x8f8 = ATTR_S16(mPullMoveTime); + field_0x8f8 = attr().mPullMoveTime; field_0x8e4 = 32768.0f / attr().mPullMoveTime; } else { - field_0x8f8 = ATTR_S16(mPushMoveTime); + field_0x8f8 = attr().mPushMoveTime; field_0x8e4 = 32768.0f / attr().mPushMoveTime; } } @@ -1032,16 +1126,16 @@ void daObjMovebox::Act_c::mode_walk() { sound_slip(); if (var_r28) { - const BgcSrc_c* pbgc = attr().field_0x9e ? mBgc.M_lin20 : mBgc.M_lin5; - int check_num = attr().field_0x9e ? 21 : 5; + const BgcSrc_c* pbgc = attr().mUseLargeGrid ? mBgc.M_lin20 : mBgc.M_lin5; + int check_num = attr().mUseLargeGrid ? 21 : 5; if (mBgc.chk_wall_pre(this, pbgc, check_num, M_dir_base[field_0x8e8])) { sound_limit(); } } - daObj::posMoveF_stream(this, NULL, &cXyz::Zero, ATTR_F32(mViscosityResistance), - ATTR_F32(mInertiaResistance)); + daObj::posMoveF_stream(this, NULL, &cXyz::Zero, attr().mViscosityResistance, + attr().mInertiaResistance); current.pos.x = sp78.x; current.pos.z = sp78.z; @@ -1080,7 +1174,7 @@ void daObjMovebox::Act_c::mode_afl() { } else if (var_f30 <= -attr().field_0x68) { var_f31 = 1.0f; } else { - var_f31 = -var_f30 * attr().field_0x6c; + var_f31 = -var_f30 * attr().mWaterBobScale; } S16_ADD(field_0x8b8, attr().mWaterOscillationAngleSpeed * (cM_rnd() + 1.0f)); @@ -1114,7 +1208,7 @@ static void dummy() { void daObjMovebox::Act_c::mode_proc_call() { typedef void (daObjMovebox::Act_c::*modeFunc)(); - static modeFunc mode_proc[] = { + static const modeFunc mode_proc[] = { &daObjMovebox::Act_c::mode_wait, &daObjMovebox::Act_c::mode_walk, &daObjMovebox::Act_c::mode_afl, @@ -1133,7 +1227,7 @@ void daObjMovebox::Act_c::sound_slip() { } } - mDoAud_seStartLevel(attr().field_0x7c, &eyePos, var_r29, mReverb); + mDoAud_seStartLevel(attr().mSoundSlip, &eyePos, var_r29, mReverb); } void daObjMovebox::Act_c::sound_limit() { @@ -1146,7 +1240,7 @@ void daObjMovebox::Act_c::sound_limit() { } } - mDoAud_seStart(attr().field_0x80, &eyePos, var_r29, mReverb); + mDoAud_seStart(attr().mSoundLimit, &eyePos, var_r29, mReverb); } void daObjMovebox::Act_c::sound_land() { @@ -1159,7 +1253,7 @@ void daObjMovebox::Act_c::sound_land() { } } - mDoAud_seStart(attr().field_0x84, &eyePos, var_r29, mReverb); + mDoAud_seStart(attr().mSoundLand, &eyePos, var_r29, mReverb); } void daObjMovebox::Act_c::vib_land() { @@ -1171,10 +1265,10 @@ f32 dummy_literal(f32 x) { } void daObjMovebox::Act_c::eff_land_smoke() { - daObjEff::Act_c::make_land_smoke(¤t.pos, ATTR_F32(mLandSmokeScale)); + daObjEff::Act_c::make_land_smoke(¤t.pos, attr().mLandSmokeScale); } -void dummy_static() { +void daObjMovebox::Act_c::eff_break() { static cXyz particle_scale; } @@ -1203,12 +1297,12 @@ int daObjMovebox::Act_c::Execute(Mtx** param_0) { u32 params; daObjBurnBox_c::make_prm_burnBox(¶ms, 1); - fopAcM_createChild(PROC_Obj_BurnBox, fopAcM_GetID(this), params, ¤t.pos, + fopAcM_createChild(fpcNm_Obj_BurnBox_e, fopAcM_GetID(this), params, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, &scale, -1, NULL); field_0x908 = 5; } else if (hit_obj->ChkAtType(AT_TYPE_BOMB) || hit_obj->ChkAtType(AT_TYPE_IRON_BALL)) { fopAc_ac_c* hit_ac = mCcCyl.GetTgHitAc(); - if (hit_ac != NULL && fopAcM_GetProfName(hit_ac) != PROC_Obj_Carry) { + if (hit_ac != NULL && fopAcM_GetProfName(hit_ac) != fpcNm_Obj_Carry_e) { cXyz sp48(current.pos); J3DModelData* kibako_bmd = (J3DModelData*)dComIfG_getObjectRes("Always", "BreakWoodBox.bmd"); @@ -1235,7 +1329,7 @@ int daObjMovebox::Act_c::Execute(Mtx** param_0) { if (cLib_checkBit(mBgc.mState, daObjMovebox::Bgc_c::STATE_20_e)) { - mDoAud_seStart(attr().field_0x88, &eyePos, 0, mReverb); + mDoAud_seStart(attr().mSoundFallWater, &eyePos, 0, mReverb); } if (field_0x5ac == 0) { @@ -1305,13 +1399,13 @@ int daObjMovebox::Act_c::Draw() { dComIfGd_setList(); } - if (attr().field_0x9d == 0 && mBgc.field_0x5c >= 0) { + if (attr().mDisableShadow == 0 && mBgc.field_0x5c >= 0) { int index = mBgc.field_0x5c; f32 var_f31 = mBgc.field_0x0[index]; cM3dGPla sp40; bool b = dComIfG_Bgsp().GetTriPla(mBgc.M_gnd_work[index], &sp40); if (b && var_f31 != -G_CM3D_F_INF) { - dComIfGd_setSimpleShadow(¤t.pos, var_f31, ATTR_F32(mShadowSize), &sp40.mNormal, + dComIfGd_setSimpleShadow(¤t.pos, var_f31, attr().mShadowSize, &sp40.mNormal, shape_angle.y, -0.4f, NULL); } } @@ -1365,12 +1459,12 @@ int daObjMovebox::Act_c::Mthd_Create() { int phase_state = dComIfG_resLoad(&mPhase, M_arcname[mType]); if (phase_state == cPhs_COMPLEATE_e) { - u32 heap_size = attr().field_0x60; + u32 heap_size = attr().mHeapSize; path_init(); - phase_state = MoveBGCreate(M_arcname[mType], attr().field_0x5c, dBgS_MoveBGProc_Trans, + phase_state = MoveBGCreate(M_arcname[mType], attr().mMoveBGIdx, dBgS_MoveBGProc_Trans, heap_size, NULL); - JUT_ASSERT(0, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); + JUT_ASSERT(1663, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); } return phase_state; @@ -1413,18 +1507,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjMovebox actor_process_profile_definition g_profile_Obj_Movebox = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Movebox, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjMovebox::Act_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 17, // mPriority - &daObjMovebox::Mthd_Table, // sub_method - 0x00040504, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Movebox_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjMovebox::Act_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Movebox_e, + /* Actor SubMtd */ &daObjMovebox::Mthd_Table, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_FREEZE_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_msima.cpp b/src/d/actor/d_a_obj_msima.cpp index 5b5b6dbbac..fadc177a4c 100644 --- a/src/d/actor/d_a_obj_msima.cpp +++ b/src/d/actor/d_a_obj_msima.cpp @@ -38,11 +38,11 @@ void daObj_Msima_HIO_c::genMessage(JORMContext* context) { #endif static void ride_call_back(dBgW* i_bgw, fopAc_ac_c* a_this, fopAc_ac_c* param_3) { - if (fopAcM_GetName(param_3) == PROC_ALINK || fopAcM_GetName(param_3) == PROC_E_GOB || - fopAcM_GetName(param_3) == PROC_B_ZANT) + if (fopAcM_GetName(param_3) == fpcNm_ALINK_e || fopAcM_GetName(param_3) == fpcNm_E_GOB_e || + fopAcM_GetName(param_3) == fpcNm_B_ZANT_e) { int idx = 0; - if (fopAcM_GetName(param_3) != PROC_ALINK) { + if (fopAcM_GetName(param_3) != fpcNm_ALINK_e) { idx = 1; } @@ -487,7 +487,7 @@ static int daObj_Msima_Create(fopAc_ac_c* a_this) { a_this->shape_angle.y = 0x2000; daObj_Msima_Execute(i_this); cXyz cStack_2c(0.0f, 0.0f, 0.0f); - fopAcM_createChild(PROC_OBJ_MYOGAN, fopAcM_GetID(a_this), 0, &cStack_2c, + fopAcM_createChild(fpcNm_OBJ_MYOGAN_e, fopAcM_GetID(a_this), 0, &cStack_2c, fopAcM_GetRoomNo(a_this), 0, 0, -1, 0); } else { for (int i = 0; i < 4; i++) { @@ -509,20 +509,20 @@ static actor_method_class l_daObj_Msima_Method = { }; actor_process_profile_definition g_profile_OBJ_MSIMA = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_MSIMA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_msima_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 51, // mPriority - &l_daObj_Msima_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_MSIMA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_msima_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_MSIMA_e, + /* Actor SubMtd */ &l_daObj_Msima_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_obj_mvstair.cpp b/src/d/actor/d_a_obj_mvstair.cpp index e2525d22a7..330695d16f 100644 --- a/src/d/actor/d_a_obj_mvstair.cpp +++ b/src/d/actor/d_a_obj_mvstair.cpp @@ -463,18 +463,18 @@ static actor_method_class daObjStair_METHODS = { }; actor_process_profile_definition g_profile_Obj_MvStair = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_MvStair, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjStair_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 25, // mPriority - &daObjStair_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MvStair_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjStair_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_MvStair_e, + /* Actor SubMtd */ &daObjStair_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_myogan.cpp b/src/d/actor/d_a_obj_myogan.cpp index dfdab85bb1..745b4e21b5 100644 --- a/src/d/actor/d_a_obj_myogan.cpp +++ b/src/d/actor/d_a_obj_myogan.cpp @@ -9,7 +9,7 @@ #include "SSystem/SComponent/c_math.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" daObj_Myogan_HIO_c::daObj_Myogan_HIO_c() { field_0x4 = -1; @@ -168,18 +168,18 @@ static actor_method_class l_daObj_Myogan_Method = { }; actor_process_profile_definition g_profile_OBJ_MYOGAN = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_OBJ_MYOGAN, - &g_fpcLf_Method.base, - sizeof(obj_myogan_class), - 0, - 0, - &g_fopAc_Method.base, - 52, - &l_daObj_Myogan_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_MYOGAN_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_myogan_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_MYOGAN_e, + /* Actor SubMtd */ &l_daObj_Myogan_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_nagaisu.cpp b/src/d/actor/d_a_obj_nagaisu.cpp index e2153b4bd8..bc1b3c1b53 100644 --- a/src/d/actor/d_a_obj_nagaisu.cpp +++ b/src/d/actor/d_a_obj_nagaisu.cpp @@ -321,18 +321,18 @@ static actor_method_class daObjNagaisu_METHODS = { }; actor_process_profile_definition g_profile_Obj_Nagaisu = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Nagaisu, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjNagaisu_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 739, // mPriority - &daObjNagaisu_METHODS, // sub_method - 0x00040000, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Nagaisu_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjNagaisu_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Nagaisu_e, + /* Actor SubMtd */ &daObjNagaisu_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_nameplate.cpp b/src/d/actor/d_a_obj_nameplate.cpp index 586d6451a1..e72cc6553c 100644 --- a/src/d/actor/d_a_obj_nameplate.cpp +++ b/src/d/actor/d_a_obj_nameplate.cpp @@ -307,18 +307,18 @@ static actor_method_class l_daObjNameplate_Method = { }; actor_process_profile_definition g_profile_Obj_NamePlate = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_NamePlate, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjNameplate_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 32, // mPriority - &l_daObjNameplate_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_NamePlate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjNameplate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_NamePlate_e, + /* Actor SubMtd */ &l_daObjNameplate_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_nan.cpp b/src/d/actor/d_a_obj_nan.cpp index 4666850fbe..c830433453 100644 --- a/src/d/actor/d_a_obj_nan.cpp +++ b/src/d/actor/d_a_obj_nan.cpp @@ -313,7 +313,7 @@ void daObjNAN_c::walk() { void daObjNAN_c::bin_wait() { if (field_0x7d0 == 0) { - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); mDraw = false; field_0x7d0++; } else if (field_0x7d0 != -1 && field_0x56c != 0) { @@ -406,7 +406,7 @@ void daObjNAN_c::hook() { if (mDraw) { nan_setParticle(); } - if (!fopAcM_CheckStatus(this, 0x100000)) { + if (!fopAcM_CheckStatus(this, fopAcStts_HOOK_CARRY_NOW_e)) { setAction(&daObjNAN_c::drop); } dBgS_LinChk linkChk; @@ -538,7 +538,7 @@ void daObjNAN_c::action() { } static u8 const l_nan_itemno[2] = { - fpcNm_ITEM_M_NANAFUSHI, fpcNm_ITEM_F_NANAFUSHI, + dItemNo_M_NANAFUSHI_e, dItemNo_F_NANAFUSHI_e, }; int daObjNAN_c::execute() { @@ -729,18 +729,18 @@ static actor_method_class l_daObjNAN_Method = { }; actor_process_profile_definition g_profile_Obj_Nan = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Nan, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjNAN_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 480, // mPriority - &l_daObjNAN_Method, // sub_method - 0x000C0120, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Nan_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjNAN_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Nan_e, + /* Actor SubMtd */ &l_daObjNAN_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ndoor.cpp b/src/d/actor/d_a_obj_ndoor.cpp index 053488884b..c57cb162a7 100644 --- a/src/d/actor/d_a_obj_ndoor.cpp +++ b/src/d/actor/d_a_obj_ndoor.cpp @@ -132,18 +132,18 @@ static actor_method_class l_daObj_Ndoor_Method = { }; actor_process_profile_definition g_profile_OBJ_NDOOR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_NDOOR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_ndoor_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 76, // mPriority - &l_daObj_Ndoor_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_NDOOR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_ndoor_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_NDOOR_e, + /* Actor SubMtd */ &l_daObj_Ndoor_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_nougu.cpp b/src/d/actor/d_a_obj_nougu.cpp index f7fcddf3d5..ae3ee5bba9 100644 --- a/src/d/actor/d_a_obj_nougu.cpp +++ b/src/d/actor/d_a_obj_nougu.cpp @@ -236,18 +236,18 @@ static actor_method_class daObj_Nougu_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_NOUGU = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_NOUGU, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_Nougu_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 84, // mPriority - &daObj_Nougu_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_NOUGU_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Nougu_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_NOUGU_e, + /* Actor SubMtd */ &daObj_Nougu_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_octhashi.cpp b/src/d/actor/d_a_obj_octhashi.cpp index 592f2bcb9f..6f38f99b2d 100644 --- a/src/d/actor/d_a_obj_octhashi.cpp +++ b/src/d/actor/d_a_obj_octhashi.cpp @@ -385,18 +385,18 @@ static actor_method_class l_daObjOCTHASHI_Method = { }; actor_process_profile_definition g_profile_OCTHASHI = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OCTHASHI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjOCTHASHI_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 465, // mPriority - &l_daObjOCTHASHI_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OCTHASHI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjOCTHASHI_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OCTHASHI_e, + /* Actor SubMtd */ &l_daObjOCTHASHI_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_oiltubo.cpp b/src/d/actor/d_a_obj_oiltubo.cpp index b21f980aff..a2110168f4 100644 --- a/src/d/actor/d_a_obj_oiltubo.cpp +++ b/src/d/actor/d_a_obj_oiltubo.cpp @@ -252,7 +252,7 @@ int daObj_Oiltubo_c::wait(void* unused) { switch (mMode) { case 1: if (!eventInfo.checkCommandCatch()) { - dComIfGp_att_CatchRequest(this, fpcNm_ITEM_OIL_BOTTLE_2, 100.0f, 50.0f, -50.0f, 0x2000, 1); + dComIfGp_att_CatchRequest(this, dItemNo_OIL_BOTTLE_2_e, 100.0f, 50.0f, -50.0f, 0x2000, 1); eventInfo.onCondition(dEvtCnd_40_e); } break; @@ -291,18 +291,18 @@ static actor_method_class daObj_Oiltubo_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_OILTUBO = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_OBJ_OILTUBO, - &g_fpcLf_Method.base, - sizeof(daObj_Oiltubo_c), - 0, - 0, - &g_fopAc_Method.base, - 66, - &daObj_Oiltubo_MethodTable, - 0x44100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_OILTUBO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Oiltubo_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_OILTUBO_e, + /* Actor SubMtd */ &daObj_Oiltubo_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_onsen.cpp b/src/d/actor/d_a_obj_onsen.cpp index 891cd048cf..de484230c7 100644 --- a/src/d/actor/d_a_obj_onsen.cpp +++ b/src/d/actor/d_a_obj_onsen.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_onsen.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" void daObjOnsen_c::initBaseMtx() { mpModel[0]->setBaseScale(scale); @@ -128,18 +128,18 @@ static actor_method_class daObjOnsen_METHODS = { }; actor_process_profile_definition g_profile_Obj_Onsen = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Onsen, - &g_fpcLf_Method.base, - sizeof(daObjOnsen_c), - 0, - 0, - &g_fopAc_Method.base, - 602, - &daObjOnsen_METHODS, - 0x44100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Onsen_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjOnsen_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Onsen_e, + /* Actor SubMtd */ &daObjOnsen_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_onsenFire.cpp b/src/d/actor/d_a_obj_onsenFire.cpp index 44e0937896..9adfca491d 100644 --- a/src/d/actor/d_a_obj_onsenFire.cpp +++ b/src/d/actor/d_a_obj_onsenFire.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_onsenFire.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" int daObjOnsenFire_c::create() { fopAcM_ct(this, daObjOnsenFire_c); @@ -45,18 +45,18 @@ static actor_method_class l_daObjOnsenFire_Method = { }; actor_process_profile_definition g_profile_OBJ_ONSEN_FIRE = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_ONSEN_FIRE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjOnsenFire_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 612, // mPriority - &l_daObjOnsenFire_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_ONSEN_FIRE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjOnsenFire_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_ONSEN_FIRE_e, + /* Actor SubMtd */ &l_daObjOnsenFire_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_onsenTaru.cpp b/src/d/actor/d_a_obj_onsenTaru.cpp index cc6f4dd16b..c83aa24b0d 100644 --- a/src/d/actor/d_a_obj_onsenTaru.cpp +++ b/src/d/actor/d_a_obj_onsenTaru.cpp @@ -386,18 +386,18 @@ static actor_method_class l_daOnsTaru_Method = { }; actor_process_profile_definition g_profile_Obj_OnsenTaru = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_OnsenTaru, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daOnsTaru_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 510, // mPriority - &l_daOnsTaru_Method, // sub_method - 0x00040020, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_OnsenTaru_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daOnsTaru_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_OnsenTaru_e, + /* Actor SubMtd */ &l_daOnsTaru_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ornament_cloth.cpp b/src/d/actor/d_a_obj_ornament_cloth.cpp index 64e45d1d1a..32569f300d 100644 --- a/src/d/actor/d_a_obj_ornament_cloth.cpp +++ b/src/d/actor/d_a_obj_ornament_cloth.cpp @@ -320,18 +320,18 @@ static actor_method_class l_daObjOnCloth_Method = { }; actor_process_profile_definition g_profile_Obj_OnCloth = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_OnCloth, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjOnCloth_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 33, // mPriority - &l_daObjOnCloth_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_OnCloth_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjOnCloth_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_OnCloth_e, + /* Actor SubMtd */ &l_daObjOnCloth_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_pdoor.cpp b/src/d/actor/d_a_obj_pdoor.cpp index ba07ba88dc..cffabcd90e 100644 --- a/src/d/actor/d_a_obj_pdoor.cpp +++ b/src/d/actor/d_a_obj_pdoor.cpp @@ -279,18 +279,18 @@ static actor_method_class daObjPDoor_METHODS = { }; actor_process_profile_definition g_profile_Obj_PushDoor = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_PushDoor, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjPDoor_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 577, // mPriority - &daObjPDoor_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_PushDoor_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjPDoor_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_PushDoor_e, + /* Actor SubMtd */ &daObjPDoor_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_pdtile.cpp b/src/d/actor/d_a_obj_pdtile.cpp index 8159fecb41..79bbb7d80e 100644 --- a/src/d/actor/d_a_obj_pdtile.cpp +++ b/src/d/actor/d_a_obj_pdtile.cpp @@ -125,7 +125,7 @@ void daObjPDtile_c::setMtx() { void daObjPDtile_c::rideActor(fopAc_ac_c* param_1) { if (param_1 == daPy_getLinkPlayerActorClass() || - fopAcM_GetProfName(param_1) == PROC_B_GG) + fopAcM_GetProfName(param_1) == fpcNm_B_GG_e) { if (mType == TYPE_0) { field_0x7b0 = 200; @@ -315,7 +315,7 @@ int daObjPDtile_c::Execute(Mtx** param_1) { } if (mType == TYPE_2 || mType == TYPE_4) { field_0x610 = 4; - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } } else { field_0x7b8 = 0; @@ -523,18 +523,18 @@ static actor_method_class daObjPDtile_METHODS = { }; actor_process_profile_definition g_profile_Obj_PDtile = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_PDtile, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjPDtile_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 670, // mPriority - &daObjPDtile_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_PDtile_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjPDtile_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_PDtile_e, + /* Actor SubMtd */ &daObjPDtile_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_pdwall.cpp b/src/d/actor/d_a_obj_pdwall.cpp index 22f42602c6..cfdf2dfc32 100644 --- a/src/d/actor/d_a_obj_pdwall.cpp +++ b/src/d/actor/d_a_obj_pdwall.cpp @@ -201,18 +201,18 @@ static actor_method_class daObjPDwall_METHODS = { }; actor_process_profile_definition g_profile_Obj_PDwall = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_PDwall, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjPDwall_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 671, // mPriority - &daObjPDwall_METHODS, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_PDwall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjPDwall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_PDwall_e, + /* Actor SubMtd */ &daObjPDwall_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_picture.cpp b/src/d/actor/d_a_obj_picture.cpp index a35c7aec0b..800650d4f0 100644 --- a/src/d/actor/d_a_obj_picture.cpp +++ b/src/d/actor/d_a_obj_picture.cpp @@ -557,18 +557,18 @@ static actor_method_class daObjPicture_METHODS = { }; actor_process_profile_definition g_profile_Obj_Picture = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Picture, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjPicture_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 742, // mPriority - &daObjPicture_METHODS, // sub_method - 0x00040180, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Picture_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjPicture_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Picture_e, + /* Actor SubMtd */ &daObjPicture_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_pillar.cpp b/src/d/actor/d_a_obj_pillar.cpp index 4640d5693c..965b93fc4d 100644 --- a/src/d/actor/d_a_obj_pillar.cpp +++ b/src/d/actor/d_a_obj_pillar.cpp @@ -76,7 +76,7 @@ daPillar_HIO_c::daPillar_HIO_c() { static void rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_rideActor) { daPy_py_c* player = dComIfGp_getLinkPlayer(); - if (((daPillar_c*)i_this)->mIsRollAttack && fopAcM_GetName(i_rideActor) == PROC_Obj_Carry) { + if (((daPillar_c*)i_this)->mIsRollAttack && fopAcM_GetName(i_rideActor) == fpcNm_Obj_Carry_e) { s16 var_r28 = cM_rndF(1300.0f) + 8192.0f; if (cM_rndFX(1.0f) < 0.0f) { var_r28 = -var_r28; @@ -488,18 +488,18 @@ static actor_method_class daPillar_METHODS = { }; actor_process_profile_definition g_profile_Obj_Pillar = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Pillar, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daPillar_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 432, // mPriority - &daPillar_METHODS, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Pillar_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daPillar_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Pillar_e, + /* Actor SubMtd */ &daPillar_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_pleaf.cpp b/src/d/actor/d_a_obj_pleaf.cpp index ad6f39ab2c..b714bbd870 100644 --- a/src/d/actor/d_a_obj_pleaf.cpp +++ b/src/d/actor/d_a_obj_pleaf.cpp @@ -179,18 +179,18 @@ static actor_method_class daObj_Pleaf_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_PLEAF = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_PLEAF, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_Pleaf_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 713, // mPriority - &daObj_Pleaf_MethodTable, // sub_method - 0x44100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_PLEAF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Pleaf_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_PLEAF_e, + /* Actor SubMtd */ &daObj_Pleaf_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_poCandle.cpp b/src/d/actor/d_a_obj_poCandle.cpp index 0b477c49b0..70f914bb25 100644 --- a/src/d/actor/d_a_obj_poCandle.cpp +++ b/src/d/actor/d_a_obj_poCandle.cpp @@ -250,18 +250,18 @@ static actor_method_class l_daPoCandle_Method = { }; actor_process_profile_definition g_profile_Obj_poCandle = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_poCandle, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daPoCandle_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 650, // mPriority - &l_daPoCandle_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_poCandle_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daPoCandle_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_poCandle_e, + /* Actor SubMtd */ &l_daPoCandle_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_poFire.cpp b/src/d/actor/d_a_obj_poFire.cpp index c4ad41b2fd..4c2f9d9ac0 100644 --- a/src/d/actor/d_a_obj_poFire.cpp +++ b/src/d/actor/d_a_obj_poFire.cpp @@ -73,8 +73,8 @@ void daPoFire_c::setBaseMtx() { } -static u8 const itemNo[4] = {fpcNm_ITEM_POU_FIRE1, fpcNm_ITEM_POU_FIRE2, fpcNm_ITEM_POU_FIRE3, - fpcNm_ITEM_POU_FIRE4}; +static u8 const itemNo[4] = {dItemNo_POU_FIRE1_e, dItemNo_POU_FIRE2_e, dItemNo_POU_FIRE3_e, + dItemNo_POU_FIRE4_e}; int daPoFire_c::create() { fopAcM_ct(this, daPoFire_c); @@ -157,7 +157,7 @@ void* daPoFire_c::searchCandle(void* i_actor, void* i_this) { daPoFire_c* _this = static_cast(i_this); daPoCandle_c* _actor = static_cast(i_actor); if (_actor != NULL && fopAcM_IsActor(_actor) && - fopAcM_GetProfName(_actor) == PROC_Obj_poCandle && + fopAcM_GetProfName(_actor) == fpcNm_Obj_poCandle_e && _this->mActorID == ((daPoCandle_c*)_actor)->getIDNum()) { return _actor; @@ -168,7 +168,7 @@ void* daPoFire_c::searchCandle(void* i_actor, void* i_this) { void* daPoFire_c::searchFireTag(void* i_actor, void* i_this) { daPoFire_c* _this = static_cast(i_this); daTagPoFire_c* _actor = static_cast(i_actor); - if (_actor != NULL && fopAcM_IsActor(_actor) && fopAcM_GetProfName(_actor) == PROC_Tag_poFire) { + if (_actor != NULL && fopAcM_IsActor(_actor) && fopAcM_GetProfName(_actor) == fpcNm_Tag_poFire_e) { return _actor; } return NULL; @@ -438,18 +438,18 @@ static actor_method_class l_daPoFire_Method = { }; actor_process_profile_definition g_profile_Obj_poFire = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Lv4Candle, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daPoFire_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 540, // mPriority - &l_daPoFire_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Lv4Candle_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daPoFire_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Lv4Candle_e, + /* Actor SubMtd */ &l_daPoFire_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_poTbox.cpp b/src/d/actor/d_a_obj_poTbox.cpp index f660e6114e..9ef2bfde09 100644 --- a/src/d/actor/d_a_obj_poTbox.cpp +++ b/src/d/actor/d_a_obj_poTbox.cpp @@ -304,18 +304,18 @@ static actor_method_class l_daPoTbox_Method = { }; actor_process_profile_definition g_profile_Obj_poTbox = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_poTbox, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daPoTbox_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 660, // mPriority - &l_daPoTbox_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_poTbox_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daPoTbox_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_poTbox_e, + /* Actor SubMtd */ &l_daPoTbox_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_prop.cpp b/src/d/actor/d_a_obj_prop.cpp index 273e03b5f1..393bd02c7e 100644 --- a/src/d/actor/d_a_obj_prop.cpp +++ b/src/d/actor/d_a_obj_prop.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_prop.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static bool daObjProp_c_createHeap(fopAc_ac_c* i_this) { return static_cast(i_this)->createHeap(); @@ -100,18 +100,18 @@ static actor_method_class daObjProp_METHODS = { }; actor_process_profile_definition g_profile_Obj_Prop = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_Prop, - &g_fpcLf_Method.base, - sizeof(daObjProp_c), - 0, - 0, - &g_fopAc_Method.base, - 737, - &daObjProp_METHODS, - 0x40000, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Prop_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjProp_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Prop_e, + /* Actor SubMtd */ &daObjProp_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_pumpkin.cpp b/src/d/actor/d_a_obj_pumpkin.cpp index 2d77fbaa4d..ff90ed6a74 100644 --- a/src/d/actor/d_a_obj_pumpkin.cpp +++ b/src/d/actor/d_a_obj_pumpkin.cpp @@ -347,7 +347,7 @@ int daObj_Pumpkin_c::Execute() { } } else if (field_0xBAD && cM3d_IsZero(speedF) == 0 && mCyl0.ChkCoHit()) { fopAc_ac_c* actor_p = dCc_GetAc(mCyl0.GetCoHitObj()->GetAc()); - if (fopAcM_GetName(actor_p) != PROC_ALINK) { + if (fopAcM_GetName(actor_p) != fpcNm_ALINK_e) { sp_0x28 = 1; } } @@ -841,7 +841,7 @@ void daObj_Pumpkin_c::setHamonPrtcl() { void daObj_Pumpkin_c::crash() { fopAc_ac_c* actor_p = NULL; s32 reg_r30 = 0; - reg_r30 = fopAcM_SearchByName(PROC_NPC_JAGAR, &actor_p); + reg_r30 = fopAcM_SearchByName(fpcNm_NPC_JAGAR_e, &actor_p); if (reg_r30 && actor_p != NULL) { ((daNpc_Jagar_c*)actor_p)->crashPumpkin(this); } @@ -891,18 +891,18 @@ static actor_method_class daObj_Pumpkin_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_PUMPKIN = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_PUMPKIN, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_Pumpkin_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 716, // mPriority - &daObj_Pumpkin_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_PUMPKIN_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Pumpkin_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_PUMPKIN_e, + /* Actor SubMtd */ &daObj_Pumpkin_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_rcircle.cpp b/src/d/actor/d_a_obj_rcircle.cpp index 9da3f620f7..6beb12110c 100644 --- a/src/d/actor/d_a_obj_rcircle.cpp +++ b/src/d/actor/d_a_obj_rcircle.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_rcircle.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static int daObjRCircle_c_createHeap(fopAc_ac_c* i_this) { return static_cast(i_this)->createHeap(); @@ -123,18 +123,18 @@ static actor_method_class daObjRCircle_METHODS = { }; actor_process_profile_definition g_profile_Obj_RCircle = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_RCircle, - &g_fpcLf_Method.base, - sizeof(daObjRCircle_c), - 0, - 0, - &g_fopAc_Method.base, - 740, - &daObjRCircle_METHODS, - 0x44180, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_RCircle_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjRCircle_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_RCircle_e, + /* Actor SubMtd */ &daObjRCircle_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_rfHole.cpp b/src/d/actor/d_a_obj_rfHole.cpp index 6433549b88..7cec9644c1 100644 --- a/src/d/actor/d_a_obj_rfHole.cpp +++ b/src/d/actor/d_a_obj_rfHole.cpp @@ -60,7 +60,7 @@ int daRfHole_c::create() { } void daRfHole_c::rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3) { - if (fopAcM_GetName(param_3) == PROC_ALINK && static_cast(param_2)->playerAreaCheck()) { + if (fopAcM_GetName(param_3) == fpcNm_ALINK_e && static_cast(param_2)->playerAreaCheck()) { static_cast(param_2)->field_0x5ae = 1; } } @@ -202,18 +202,18 @@ static actor_method_class l_daRfHole_Method = { }; actor_process_profile_definition g_profile_Obj_RfHole = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_RfHole, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daRfHole_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 514, // mPriority - &l_daRfHole_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_RfHole_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daRfHole_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_RfHole_e, + /* Actor SubMtd */ &l_daRfHole_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_rgate.cpp b/src/d/actor/d_a_obj_rgate.cpp index 13d2b8c54b..a652eb6a03 100644 --- a/src/d/actor/d_a_obj_rgate.cpp +++ b/src/d/actor/d_a_obj_rgate.cpp @@ -35,7 +35,7 @@ enum { }; static void* search_coach(void* i_actor, void* i_data) { - if (i_actor != NULL && fopAcM_IsActor(i_actor) && fopAcM_GetProfName(i_actor) == PROC_NPC_COACH) + if (i_actor != NULL && fopAcM_IsActor(i_actor) && fopAcM_GetProfName(i_actor) == fpcNm_NPC_COACH_e) { return i_actor; } @@ -879,18 +879,18 @@ static actor_method_class daObjRgate_METHODS = { }; actor_process_profile_definition g_profile_Obj_RiderGate = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_RiderGate, - &g_fpcLf_Method.base, - sizeof(daObjRgate_c), - 0, - 0, - &g_fopAc_Method.base, - 600, - &daObjRgate_METHODS, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_RiderGate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjRgate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_RiderGate_e, + /* Actor SubMtd */ &daObjRgate_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_riverrock.cpp b/src/d/actor/d_a_obj_riverrock.cpp index 23df94e990..4b530882a1 100644 --- a/src/d/actor/d_a_obj_riverrock.cpp +++ b/src/d/actor/d_a_obj_riverrock.cpp @@ -321,18 +321,18 @@ static actor_method_class l_daObjRIVERROCK_Method = { }; actor_process_profile_definition g_profile_Obj_RIVERROCK = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_RIVERROCK, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjRIVERROCK_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 472, // mPriority - &l_daObjRIVERROCK_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_RIVERROCK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjRIVERROCK_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_RIVERROCK_e, + /* Actor SubMtd */ &l_daObjRIVERROCK_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_rock.cpp b/src/d/actor/d_a_obj_rock.cpp index 997d160466..6bf1bf84e1 100644 --- a/src/d/actor/d_a_obj_rock.cpp +++ b/src/d/actor/d_a_obj_rock.cpp @@ -201,18 +201,18 @@ static actor_method_class l_daObj_Rock_Method = { (process_method_func)daObj_Rock_Draw}; actor_process_profile_definition g_profile_OBJ_ROCK = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_ROCK, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_rock_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 710, // mPriority - &l_daObj_Rock_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_ROCK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_rock_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_ROCK_e, + /* Actor SubMtd */ &l_daObj_Rock_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_rope_bridge.cpp b/src/d/actor/d_a_obj_rope_bridge.cpp index 08b01e3c17..7d5ff20af5 100644 --- a/src/d/actor/d_a_obj_rope_bridge.cpp +++ b/src/d/actor/d_a_obj_rope_bridge.cpp @@ -638,18 +638,18 @@ static actor_method_class daObjRBridge_METHODS = { }; actor_process_profile_definition g_profile_Obj_RopeBridge = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_RopeBridge, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjRBridge_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 16, // mPriority - &daObjRBridge_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_RopeBridge_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjRBridge_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_RopeBridge_e, + /* Actor SubMtd */ &daObjRBridge_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_rotBridge.cpp b/src/d/actor/d_a_obj_rotBridge.cpp index bb9ce07e06..e024eedb9a 100644 --- a/src/d/actor/d_a_obj_rotBridge.cpp +++ b/src/d/actor/d_a_obj_rotBridge.cpp @@ -133,7 +133,7 @@ int daRotBridge_c::create() { } void daRotBridge_c::rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_bgActor, fopAc_ac_c* i_rideActor) { - if (fopAcM_GetName(i_rideActor) == PROC_ALINK) { + if (fopAcM_GetName(i_rideActor) == fpcNm_ALINK_e) { ((daRotBridge_c*)i_bgActor)->mIsPlayerRide = TRUE; } } @@ -261,18 +261,18 @@ static actor_method_class l_daRotBridge_Method = { }; actor_process_profile_definition g_profile_Obj_RotBridge = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_RotBridge, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daRotBridge_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 490, // mPriority - &l_daRotBridge_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_RotBridge_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daRotBridge_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_RotBridge_e, + /* Actor SubMtd */ &l_daRotBridge_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_rotTrap.cpp b/src/d/actor/d_a_obj_rotTrap.cpp index 452ff01684..095b2e457d 100644 --- a/src/d/actor/d_a_obj_rotTrap.cpp +++ b/src/d/actor/d_a_obj_rotTrap.cpp @@ -320,18 +320,18 @@ static actor_method_class l_daRotTrap_Method = { }; actor_process_profile_definition g_profile_Obj_RotTrap = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_RotTrap, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daRotTrap_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 525, // mPriority - &l_daRotTrap_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_RotTrap_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daRotTrap_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_RotTrap_e, + /* Actor SubMtd */ &l_daRotTrap_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_roten.cpp b/src/d/actor/d_a_obj_roten.cpp index 1e5d6ebc69..dbbe609654 100644 --- a/src/d/actor/d_a_obj_roten.cpp +++ b/src/d/actor/d_a_obj_roten.cpp @@ -178,18 +178,18 @@ static actor_method_class daObj_Roten_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_ROTEN = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_ROTEN, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_Roten_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 67, // mPriority - &daObj_Roten_MethodTable, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_ROTEN_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Roten_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_ROTEN_e, + /* Actor SubMtd */ &daObj_Roten_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_rstair.cpp b/src/d/actor/d_a_obj_rstair.cpp index 802697e8d0..609a0cf7b8 100644 --- a/src/d/actor/d_a_obj_rstair.cpp +++ b/src/d/actor/d_a_obj_rstair.cpp @@ -363,18 +363,18 @@ static actor_method_class daObjRotStair_METHODS = { }; actor_process_profile_definition g_profile_Obj_RotStair = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_RotStair, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjRotStair_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 613, // mPriority - &daObjRotStair_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_RotStair_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjRotStair_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_RotStair_e, + /* Actor SubMtd */ &daObjRotStair_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_rw.cpp b/src/d/actor/d_a_obj_rw.cpp index 52eb092e24..94ea6350c4 100644 --- a/src/d/actor/d_a_obj_rw.cpp +++ b/src/d/actor/d_a_obj_rw.cpp @@ -110,7 +110,7 @@ static void damage_check(obj_rw_class* i_this) { sp2C.z = 0.0f; MtxPosition(&sp2C, &pos); pos += actor->current.pos; - fopAcM_createItem(&pos, fpcNm_ITEM_HEART, -1, -1, NULL, NULL, 0); + fopAcM_createItem(&pos, dItemNo_HEART_e, -1, -1, NULL, NULL, 0); } i_this->field_0x674 = 15; @@ -122,7 +122,7 @@ static void damage_check(obj_rw_class* i_this) { fopAcM_createDisappear(actor, &pos, 20, 0, actor->field_0x564); cXyz scale(1.0f, 1.0f, 1.0f); - fopAcM_createItemForBoss(&pos, fpcNm_ITEM_KAKERA_HEART, fopAcM_GetRoomNo(actor), &actor->shape_angle, &scale, 0.0f, 0.0f, actor->field_0x564); + fopAcM_createItemForBoss(&pos, dItemNo_KAKERA_HEART_e, fopAcM_GetRoomNo(actor), &actor->shape_angle, &scale, 0.0f, 0.0f, actor->field_0x564); int swbit = (fopAcM_GetParam(actor) & 0xFF000000) >> 0x18; if (swbit != 0xFF) { @@ -373,9 +373,9 @@ static int daOBJ_RW_Create(fopAc_ac_c* actor) { if (swbit != 0xFF && dComIfGs_isSwitch(swbit, fopAcM_GetRoomNo(actor))) { i_this->field_0xe38 = 1; cXyz scale(1.0f, 1.0f, 1.0f); - fopAcM_createItemForBoss(&actor->current.pos, fpcNm_ITEM_KAKERA_HEART, fopAcM_GetRoomNo(actor), &actor->shape_angle, &scale, 0.0f, 0.0f, actor->field_0x564); + fopAcM_createItemForBoss(&actor->current.pos, dItemNo_KAKERA_HEART_e, fopAcM_GetRoomNo(actor), &actor->shape_angle, &scale, 0.0f, 0.0f, actor->field_0x564); } else { - fopAcM_createChild(PROC_OBJ_MAKI, fopAcM_GetID(actor), 0xFFFFFF01, &actor->home.pos, fopAcM_GetRoomNo(actor), &actor->home.angle, NULL, -1, NULL); + fopAcM_createChild(fpcNm_OBJ_MAKI_e, fopAcM_GetID(actor), 0xFFFFFF01, &actor->home.pos, fopAcM_GetRoomNo(actor), &actor->home.angle, NULL, -1, NULL); fopAcM_OnStatus(actor, 0); actor->attention_info.flags = fopAc_AttnFlag_BATTLE_e; } @@ -395,18 +395,18 @@ static actor_method_class l_daOBJ_RW_Method = { }; actor_process_profile_definition g_profile_OBJ_RW = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_RW, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_rw_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 711, // mPriority - &l_daOBJ_RW_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_OBJ_RW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_rw_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_RW_e, + /* Actor SubMtd */ &l_daOBJ_RW_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_sWallShutter.cpp b/src/d/actor/d_a_obj_sWallShutter.cpp index 6f54f9ee57..7c7f2b0c63 100644 --- a/src/d/actor/d_a_obj_sWallShutter.cpp +++ b/src/d/actor/d_a_obj_sWallShutter.cpp @@ -238,18 +238,18 @@ static actor_method_class l_daSwShutter_Method = { }; actor_process_profile_definition g_profile_Obj_SwallShutter = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SwallShutter, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSwShutter_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 619, // mPriority - &l_daSwShutter_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SwallShutter_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSwShutter_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SwallShutter_e, + /* Actor SubMtd */ &l_daSwShutter_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_saidan.cpp b/src/d/actor/d_a_obj_saidan.cpp index 05c64f23ba..ed4818e0f5 100644 --- a/src/d/actor/d_a_obj_saidan.cpp +++ b/src/d/actor/d_a_obj_saidan.cpp @@ -155,18 +155,18 @@ static actor_method_class l_daSaidan_Method = { }; actor_process_profile_definition g_profile_Obj_Saidan = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Saidan, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSaidan_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 508, // mPriority - &l_daSaidan_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Saidan_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSaidan_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Saidan_e, + /* Actor SubMtd */ &l_daSaidan_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_sakuita.cpp b/src/d/actor/d_a_obj_sakuita.cpp index 87073326d1..d81e2a6825 100644 --- a/src/d/actor/d_a_obj_sakuita.cpp +++ b/src/d/actor/d_a_obj_sakuita.cpp @@ -214,18 +214,18 @@ static actor_method_class l_daObjSakuita_Method = { }; actor_process_profile_definition g_profile_Obj_Sakuita = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Sakuita, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSakuita_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 36, // mPriority - &l_daObjSakuita_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Sakuita_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSakuita_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Sakuita_e, + /* Actor SubMtd */ &l_daObjSakuita_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_sakuita_rope.cpp b/src/d/actor/d_a_obj_sakuita_rope.cpp index 8c0026d236..87beb7066f 100644 --- a/src/d/actor/d_a_obj_sakuita_rope.cpp +++ b/src/d/actor/d_a_obj_sakuita_rope.cpp @@ -385,18 +385,18 @@ static actor_method_class l_daObjItaRope_Method = { }; actor_process_profile_definition g_profile_Obj_ItaRope = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_ItaRope, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjItaRope_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 35, // mPriority - &l_daObjItaRope_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_ItaRope_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjItaRope_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_ItaRope_e, + /* Actor SubMtd */ &l_daObjItaRope_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_scannon.cpp b/src/d/actor/d_a_obj_scannon.cpp index 0a910358fe..29c36b85fc 100644 --- a/src/d/actor/d_a_obj_scannon.cpp +++ b/src/d/actor/d_a_obj_scannon.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_scannon.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -393,7 +393,7 @@ void daSCannon_c::exeModeWait() { mMode = MODE_ORDER_EVT; if (!fopAcM_isSwitch(this, getSw2())) { cXyz pos(TKS_SET_POS); - fopAcM_create(PROC_NPC_TKS, 1, &pos, fopAcM_GetRoomNo(this), NULL, NULL, -1); + fopAcM_create(fpcNm_NPC_TKS_e, 1, &pos, fopAcM_GetRoomNo(this), NULL, NULL, -1); } } break; @@ -626,7 +626,7 @@ void daSCannon_c::demoInitFinish() { #endif fopAcM_seStartCurrent(this, Z2SE_OBJ_BOMB_EXPLODE, 0); - fopAcM_OffStatus(this, 0x80); + fopAcM_OffStatus(this, fopAcStts_NOEXEC_e); dComIfGp_getVibration().StopQuake(0x1F); dComIfGp_getVibration().StartShock(8, 0x1F, cXyz(0.0f, 1.0f, 0.0f)); @@ -665,7 +665,7 @@ void daSCannon_c::demoInitWarpEndWait() { } mpPtlBtk->setPlaySpeed(1.0f); - + daPy_py_c* player_p = (daPy_py_c*)dComIfGp_getPlayer(0); if (player_p != NULL) { cXyz pos(-101987.7f, -18470.0f, 55863.813f); @@ -709,7 +709,7 @@ void daSCannon_c::changeScene() { dComIfGp_getVibration().StopQuake(0x1F); } - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x80); + fopAcM_OnStatus(this, fopAcStts_NOEXEC_e); if (field_0x619 == 0) { field_0x619 = 1; @@ -851,18 +851,18 @@ static actor_method_class daSCannon_METHODS = { }; actor_process_profile_definition g_profile_Obj_SCannon = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SCannon, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSCannon_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 734, // mPriority - &daSCannon_METHODS, // sub_method - 0x00044180, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SCannon_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSCannon_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SCannon_e, + /* Actor SubMtd */ &daSCannon_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_scannon_crs.cpp b/src/d/actor/d_a_obj_scannon_crs.cpp index 6a593edd1a..28d91740b1 100644 --- a/src/d/actor/d_a_obj_scannon_crs.cpp +++ b/src/d/actor/d_a_obj_scannon_crs.cpp @@ -518,18 +518,18 @@ static actor_method_class daSCannonCrs_METHODS = { }; actor_process_profile_definition g_profile_Obj_SCannonCrs = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SCannonCrs, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSCannonCrs_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 736, // mPriority - &daSCannonCrs_METHODS, // sub_method - 0x00044180, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SCannonCrs_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSCannonCrs_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SCannonCrs_e, + /* Actor SubMtd */ &daSCannonCrs_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_scannon_ten.cpp b/src/d/actor/d_a_obj_scannon_ten.cpp index b804951698..17a3f5e61f 100644 --- a/src/d/actor/d_a_obj_scannon_ten.cpp +++ b/src/d/actor/d_a_obj_scannon_ten.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_scannon_ten.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -225,7 +225,7 @@ void daObjSCannonTen_c::demoExe() { "FIRE_END", "FINISH", }; - + int act_idx = dComIfGp_evmng_getMyActIdx(mStaffId, CUT_TYPE_TABLE_FIRE_SECOND, ARRAY_SIZE(CUT_TYPE_TABLE_FIRE_SECOND), 0, 0); if (act_idx != -1) { if (dComIfGp_evmng_getIsAddvance(mStaffId)) { @@ -330,7 +330,7 @@ void daObjSCannonTen_c::demoInitFinish() { mDoAud_seStart(Z2SE_AL_V_CANON_JUMP, NULL, 0, 0); initEmtLine(); - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x80); + fopAcM_OffStatus(this, fopAcStts_NOEXEC_e); int* timer_p = dComIfGp_evmng_getMyIntegerP(mStaffId, "Timer"); if (timer_p != NULL) { @@ -367,7 +367,7 @@ void daObjSCannonTen_c::changeScene() { dComIfGp_getVibration().StopQuake(0x1F); } - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x80); + fopAcM_OnStatus(this, fopAcStts_NOEXEC_e); const int a_exit_id = 1; dStage_changeScene(a_exit_id, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1); @@ -469,18 +469,18 @@ static actor_method_class daObjSCannonTen_METHODS = { }; actor_process_profile_definition g_profile_Obj_SCannonTen = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SCannonTen, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSCannonTen_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 746, // mPriority - &daObjSCannonTen_METHODS, // sub_method - 0x00040180, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SCannonTen_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSCannonTen_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SCannonTen_e, + /* Actor SubMtd */ &daObjSCannonTen_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_sekidoor.cpp b/src/d/actor/d_a_obj_sekidoor.cpp index c12f4782c6..7be65ab45b 100644 --- a/src/d/actor/d_a_obj_sekidoor.cpp +++ b/src/d/actor/d_a_obj_sekidoor.cpp @@ -276,18 +276,18 @@ static actor_method_class daObj_SekiDoor_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_SEKIDOOR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_SEKIDOOR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_SekiDoor_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 87, // mPriority - &daObj_SekiDoor_MethodTable, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType - }; + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_SEKIDOOR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_SekiDoor_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_SEKIDOOR_e, + /* Actor SubMtd */ &daObj_SekiDoor_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/src/d/actor/d_a_obj_sekizo.cpp b/src/d/actor/d_a_obj_sekizo.cpp index cfc74ef949..6c73025257 100644 --- a/src/d/actor/d_a_obj_sekizo.cpp +++ b/src/d/actor/d_a_obj_sekizo.cpp @@ -155,18 +155,18 @@ static actor_method_class daObj_Sekizo_MethodTable = { (process_method_func)daObj_Sekizo_Draw}; actor_process_profile_definition g_profile_OBJ_SEKIZO = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_SEKIZO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_Sekizo_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // mSubMtd - 88, // mPriority - &daObj_Sekizo_MethodTable, // mSubMtd - 0x44000, // status - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_SEKIZO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Sekizo_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_SEKIZO_e, + /* Actor SubMtd */ &daObj_Sekizo_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_sekizoa.cpp b/src/d/actor/d_a_obj_sekizoa.cpp index a94531ecf5..7a32754658 100644 --- a/src/d/actor/d_a_obj_sekizoa.cpp +++ b/src/d/actor/d_a_obj_sekizoa.cpp @@ -345,7 +345,7 @@ int daObj_Sekizoa_c::createHeapCallBack(fopAc_ac_c* i_this) { void* daObj_Sekizoa_c::srchSekizoa(void* i_actor, void* i_this) { if (mFindCount < 50 && i_actor != NULL && i_actor != i_this) { - if (fopAcM_IsExecuting(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_OBJ_SEKIZOA) { + if (fopAcM_IsExecuting(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_OBJ_SEKIZOA_e) { mFindActorPtrs[mFindCount] = (fopAc_ac_c*)i_actor; mFindCount++; } @@ -2447,20 +2447,20 @@ static actor_method_class daObj_Sekizoa_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_SEKIZOA = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_SEKIZOA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_Sekizoa_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 0x12, // mPriority - &daObj_Sekizoa_MethodTable, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_SEKIZOA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Sekizoa_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_SEKIZOA_e, + /* Actor SubMtd */ &daObj_Sekizoa_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_obj_shield.cpp b/src/d/actor/d_a_obj_shield.cpp index 26e74a6e66..953c578888 100644 --- a/src/d/actor/d_a_obj_shield.cpp +++ b/src/d/actor/d_a_obj_shield.cpp @@ -108,7 +108,7 @@ int daItemShield_c::__CreateHeap() { int daItemShield_c::create() { fopAcM_ct(this, daItemShield_c); - m_itemNo = fpcNm_ITEM_WOOD_SHIELD; + m_itemNo = dItemNo_WOOD_SHIELD_e; if (fopAcM_isSwitch(this, getSwBit2())) { OS_REPORT("木の盾：もう取ったので出ません\n"); return cPhs_ERROR_e; @@ -370,18 +370,18 @@ static actor_method_class l_daItemShield_Method = { }; actor_process_profile_definition g_profile_Obj_Shield = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Shield, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daItemShield_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 240, // mPriority - &l_daItemShield_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Shield_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daItemShield_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Shield_e, + /* Actor SubMtd */ &l_daItemShield_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_sm_door.cpp b/src/d/actor/d_a_obj_sm_door.cpp index b1d032b50a..e1d490d10c 100644 --- a/src/d/actor/d_a_obj_sm_door.cpp +++ b/src/d/actor/d_a_obj_sm_door.cpp @@ -28,7 +28,7 @@ static void* s_obj_sub(void* i_actor, void* i_this) { fopAc_ac_c* _this = static_cast(i_this); cXyz& actor_pos = fopAcM_GetPosition(actor); cXyz& pos = fopAcM_GetPosition(_this); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_PM + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_PM_e && actor_pos.absXZ(pos) < 800.0f) { return i_actor; @@ -293,18 +293,18 @@ static actor_method_class l_daObjSM_DOOR_Method = { }; actor_process_profile_definition g_profile_Obj_SM_DOOR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SM_DOOR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSM_DOOR_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 476, // mPriority - &l_daObjSM_DOOR_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SM_DOOR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSM_DOOR_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SM_DOOR_e, + /* Actor SubMtd */ &l_daObjSM_DOOR_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_smallkey.cpp b/src/d/actor/d_a_obj_smallkey.cpp index 01319f599d..e5d31c214c 100644 --- a/src/d/actor/d_a_obj_smallkey.cpp +++ b/src/d/actor/d_a_obj_smallkey.cpp @@ -34,18 +34,18 @@ static void* searchParentSub(void* i_actor, void* i_data) { fopAc_ac_c* a_other = (fopAc_ac_c*)i_data; if (a_actor != NULL && fopAcM_IsActor(a_actor)) { - if (fopAcM_GetProfName(a_actor) == PROC_OBJ_GM) { + if (fopAcM_GetProfName(a_actor) == fpcNm_OBJ_GM_e) { if (a_other->home.pos.abs(a_actor->home.pos) < 1.0f) { return a_actor; } - } else if (fopAcM_GetProfName(a_actor) == PROC_E_GB) { + } else if (fopAcM_GetProfName(a_actor) == fpcNm_E_GB_e) { if (a_other->home.pos.abs(a_actor->home.pos) < 50.0f) { return a_actor; } // “Small Key: position isn't synced with Big Baba!\n” OS_REPORT("\x1b[43;30m小さい鍵：デカババと位置がずれています！\n\x1b[m"); - } else if (fopAcM_GetProfName(a_actor) == PROC_E_ZM) { + } else if (fopAcM_GetProfName(a_actor) == fpcNm_E_ZM_e) { f32 other_dist = a_other->home.pos.abs(a_actor->home.pos); u8 temp_r27 = fopAcM_GetParamBit(a_actor, 0, 8); if (other_dist < 10.0f && temp_r27 < 10) { @@ -155,7 +155,7 @@ int daKey_c::create() { mIsPrmInit = TRUE; } - m_itemNo = fpcNm_ITEM_SMALL_KEY; + m_itemNo = dItemNo_SMALL_KEY_e; if (strcmp(dComIfGp_getStartStageName(), "F_SP118") == 0) { OS_REPORT(" SMKEY 0\n"); @@ -222,10 +222,10 @@ int daKey_c::actionInit() { void* pparent = fpcM_Search(searchParentSub, this); if (pparent != NULL) { parentActorID = fopAcM_GetID(pparent); - if (fopAcM_GetProfName(pparent) == PROC_OBJ_GM || fopAcM_GetProfName(pparent) == PROC_E_ZM) { + if (fopAcM_GetProfName(pparent) == fpcNm_OBJ_GM_e || fopAcM_GetProfName(pparent) == fpcNm_E_ZM_e) { hide(); actionParentWaitInit(); - } else if (fopAcM_GetProfName(pparent) == PROC_E_GB) { + } else if (fopAcM_GetProfName(pparent) == fpcNm_E_GB_e) { show(); actionInitE_GB(); } @@ -250,7 +250,7 @@ int daKey_c::actionParentWait() { if (pparent == NULL) { show(); actionWaitInit(); - } else if (fopAcM_GetProfName(pparent) == PROC_E_ZM) { + } else if (fopAcM_GetProfName(pparent) == fpcNm_E_ZM_e) { current.pos = pparent->home.pos; } else { current.pos = pparent->current.pos; @@ -399,7 +399,7 @@ int daKey_c::actionInitBoomerangCarry() { } int daKey_c::actionBoomerangCarry() { - fopAc_ac_c* pboomerang = fopAcM_SearchByName(PROC_BOOMERANG); + fopAc_ac_c* pboomerang = fopAcM_SearchByName(fpcNm_BOOMERANG_e); if (pboomerang != NULL) { current.pos = pboomerang->current.pos; } else { @@ -559,18 +559,18 @@ static actor_method_class l_daKey_Method = { }; actor_process_profile_definition g_profile_Obj_SmallKey = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SmallKey, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daKey_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 237, // mPriority - &l_daKey_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SmallKey_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daKey_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SmallKey_e, + /* Actor SubMtd */ &l_daKey_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_smgdoor.cpp b/src/d/actor/d_a_obj_smgdoor.cpp index e380b3dc12..42777605fb 100644 --- a/src/d/actor/d_a_obj_smgdoor.cpp +++ b/src/d/actor/d_a_obj_smgdoor.cpp @@ -426,18 +426,18 @@ static actor_method_class daObjSmgDoor_METHODS = { }; actor_process_profile_definition g_profile_Obj_SmgDoor = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SmgDoor, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSmgDoor_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 553, // mPriority - &daObjSmgDoor_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SmgDoor_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSmgDoor_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SmgDoor_e, + /* Actor SubMtd */ &daObjSmgDoor_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_smoke.cpp b/src/d/actor/d_a_obj_smoke.cpp index 7edb5fe4c8..18631fd32a 100644 --- a/src/d/actor/d_a_obj_smoke.cpp +++ b/src/d/actor/d_a_obj_smoke.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_smoke.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" void daObjSmoke_c::initBaseMtx() { setBaseMtx(); @@ -73,18 +73,18 @@ static actor_method_class l_daObjSmoke_Method = { }; actor_process_profile_definition g_profile_Obj_Smoke = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Smoke, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSmoke_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 632, // mPriority - &l_daObjSmoke_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Smoke_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSmoke_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Smoke_e, + /* Actor SubMtd */ &l_daObjSmoke_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_smtile.cpp b/src/d/actor/d_a_obj_smtile.cpp index 6738908a2f..0cdd9f0077 100644 --- a/src/d/actor/d_a_obj_smtile.cpp +++ b/src/d/actor/d_a_obj_smtile.cpp @@ -349,18 +349,18 @@ static actor_method_class daObj_SMTile_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_SMTILE = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_SMTILE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_SMTile_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 89, // mPriority - &daObj_SMTile_MethodTable, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_SMTILE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_SMTile_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_SMTILE_e, + /* Actor SubMtd */ &daObj_SMTile_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_smw_stone.cpp b/src/d/actor/d_a_obj_smw_stone.cpp index 3db70885a5..f214bd7a67 100644 --- a/src/d/actor/d_a_obj_smw_stone.cpp +++ b/src/d/actor/d_a_obj_smw_stone.cpp @@ -196,18 +196,18 @@ static actor_method_class daSmWStone_METHODS = { }; actor_process_profile_definition g_profile_Obj_SmWStone = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SmWStone, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSmWStone_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 735, // mPriority - &daSmWStone_METHODS, // sub_method - 0x00044100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SmWStone_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSmWStone_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SmWStone_e, + /* Actor SubMtd */ &daSmWStone_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_snowEffTag.cpp b/src/d/actor/d_a_obj_snowEffTag.cpp index eef00f6a5e..09287aeddb 100644 --- a/src/d/actor/d_a_obj_snowEffTag.cpp +++ b/src/d/actor/d_a_obj_snowEffTag.cpp @@ -9,7 +9,7 @@ #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" daSnowEffTag_HIO_c::daSnowEffTag_HIO_c() { field_0x4 = 20; @@ -131,18 +131,18 @@ static actor_method_class l_daSnowEffTag_Method = { }; actor_process_profile_definition g_profile_Tag_SnowEff = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_SnowEff, - &g_fpcLf_Method.base, - sizeof(daSnowEffTag_c), - 0, - 0, - &g_fopAc_Method.base, - 656, - &l_daSnowEffTag_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_SnowEff_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSnowEffTag_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_SnowEff_e, + /* Actor SubMtd */ &l_daSnowEffTag_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_snow_soup.cpp b/src/d/actor/d_a_obj_snow_soup.cpp index 7a2d491b63..027d0bd8c8 100644 --- a/src/d/actor/d_a_obj_snow_soup.cpp +++ b/src/d/actor/d_a_obj_snow_soup.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_snow_soup.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include static int daObjSnowSoup_c_createHeap(fopAc_ac_c* i_this) { @@ -194,18 +194,18 @@ static actor_method_class daObjSnowSoup_METHODS = { }; actor_process_profile_definition g_profile_Obj_SnowSoup = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_SnowSoup, - &g_fpcLf_Method.base, - sizeof(daObjSnowSoup_c), - 0, - 0, - &g_fopAc_Method.base, - 0x2E2, - &daObjSnowSoup_METHODS, - 0x44100, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SnowSoup_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSnowSoup_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SnowSoup_e, + /* Actor SubMtd */ &daObjSnowSoup_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_so.cpp b/src/d/actor/d_a_obj_so.cpp index 37c95200bd..537db9d0ad 100644 --- a/src/d/actor/d_a_obj_so.cpp +++ b/src/d/actor/d_a_obj_so.cpp @@ -65,7 +65,7 @@ static void ride_call_back_1(dBgW* i_BgW, fopAc_ac_c* a_this, fopAc_ac_c* param_ static void so_hasira(obj_so_class* i_this) { fopAc_ac_c* a_this = &i_this->actor; - daPillar_c* pillar_p = (daPillar_c*)fopAcM_SearchByName(PROC_Obj_Pillar); + daPillar_c* pillar_p = (daPillar_c*)fopAcM_SearchByName(fpcNm_Obj_Pillar_e); if (pillar_p != NULL) { mDoMtx_stack_c::transS(pillar_p->current.pos.x, pillar_p->current.pos.y, pillar_p->current.pos.z); mDoMtx_stack_c::YrotM(pillar_p->mRotY); @@ -849,10 +849,10 @@ static void demo_camera(obj_so_class* i_this) { cXyz sp48(-4264.0f, 302.0f, -2330.0f); cXyz sp54(16400.0f, 3529.0f, 8385.0f); sp54 += sp48; - fpc_ProcID i_parentID = fopAcM_create(PROC_E_OC, 0xFFFF0103, &sp54, fopAcM_GetRoomNo(a_this), &i_angle, 0, -1); + fpc_ProcID i_parentID = fopAcM_create(fpcNm_E_OC_e, 0xFFFF0103, &sp54, fopAcM_GetRoomNo(a_this), &i_angle, 0, -1); sp54.set(16200.0f, 3481.0f, 8418.0f); sp54 += sp48; - fopAcM_createChild(PROC_E_OC, i_parentID, 0xFFFF0104, &sp54, fopAcM_GetRoomNo(a_this), &i_angle, NULL, -1, NULL); + fopAcM_createChild(fpcNm_E_OC_e, i_parentID, 0xFFFF0104, &sp54, fopAcM_GetRoomNo(a_this), &i_angle, NULL, -1, NULL); } else if (i_this->field_0x1ba2 == 125) { i_this->mDemoMode = 100; } @@ -1063,7 +1063,7 @@ static int daObj_So_Create(fopAc_ac_c* a_this) { i_this->field_0xdae = 3; if (fopAcM_GetRoomNo(a_this) == 4) { cXyz sp2c(-5374.0f, 4280.0f, -2342.0f); - i_this->field_0x1b94 = fopAcM_create(PROC_OBJ_GM, 0x600, &sp2c, fopAcM_GetRoomNo(a_this), + i_this->field_0x1b94 = fopAcM_create(fpcNm_OBJ_GM_e, 0x600, &sp2c, fopAcM_GetRoomNo(a_this), NULL, NULL, -1); } } @@ -1089,18 +1089,18 @@ static actor_method_class l_daObj_So_Method = { }; actor_process_profile_definition g_profile_OBJ_SO = { - fpcLy_CURRENT_e, // mLayerID - 2, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_SO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_so_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 55, // mPriority - &l_daObj_So_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 2, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_SO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_so_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_SO_e, + /* Actor SubMtd */ &l_daObj_So_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_spinLift.cpp b/src/d/actor/d_a_obj_spinLift.cpp index 5802b0b8d6..9c59768e26 100644 --- a/src/d/actor/d_a_obj_spinLift.cpp +++ b/src/d/actor/d_a_obj_spinLift.cpp @@ -279,18 +279,18 @@ static actor_method_class l_daSpinLift_Method = { }; actor_process_profile_definition g_profile_Obj_SpinLift = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SpinLift, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSpinLift_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 512, // mPriority - &l_daSpinLift_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SpinLift_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSpinLift_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SpinLift_e, + /* Actor SubMtd */ &l_daSpinLift_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ss_drink.cpp b/src/d/actor/d_a_obj_ss_drink.cpp index 3df4d49b18..1327de2255 100644 --- a/src/d/actor/d_a_obj_ss_drink.cpp +++ b/src/d/actor/d_a_obj_ss_drink.cpp @@ -485,18 +485,18 @@ static actor_method_class daObj_SSDrink_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_SSDRINK = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_SSDRINK, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_SSDrink_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 68, // mPriority - &daObj_SSDrink_MethodTable, // sub_method - 0x00064100, // mStatus - fopAc_UNK_GROUP_5_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_SSDRINK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_SSDrink_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_SSDRINK_e, + /* Actor SubMtd */ &daObj_SSDrink_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ss_item.cpp b/src/d/actor/d_a_obj_ss_item.cpp index d395c234bb..4c354878ae 100644 --- a/src/d/actor/d_a_obj_ss_item.cpp +++ b/src/d/actor/d_a_obj_ss_item.cpp @@ -48,7 +48,7 @@ int daObj_SSItem_c::create() { field_0xB04 = -1; if (field_0xB0E == 2) { - field_0xB04 = fopAcM_create(PROC_OBJ_PUMPKIN, 0x10000319, ¤t.pos, + field_0xB04 = fopAcM_create(fpcNm_OBJ_PUMPKIN_e, 0x10000319, ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle, NULL, -1); return cPhs_COMPLEATE_e; } else { @@ -372,18 +372,18 @@ static actor_method_class daObj_SSItem_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_SSITEM = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_OBJ_SSITEM, - &g_fpcLf_Method.base, - sizeof(daObj_SSItem_c), - 0, - 0, - &g_fopAc_Method.base, - 0x45, - &daObj_SSItem_MethodTable, - 0x44100, - 0, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_SSITEM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_SSItem_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_SSITEM_e, + /* Actor SubMtd */ &daObj_SSItem_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_stairBlock.cpp b/src/d/actor/d_a_obj_stairBlock.cpp index 377d3438b8..9ca15c8477 100644 --- a/src/d/actor/d_a_obj_stairBlock.cpp +++ b/src/d/actor/d_a_obj_stairBlock.cpp @@ -175,18 +175,18 @@ static actor_method_class l_daStairBlock_Method = { }; actor_process_profile_definition g_profile_Obj_StairBlock = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_StairBlock, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daStairBlock_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 500, // mPriority - &l_daStairBlock_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_StairBlock_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daStairBlock_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_StairBlock_e, + /* Actor SubMtd */ &l_daStairBlock_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_stick.cpp b/src/d/actor/d_a_obj_stick.cpp index c393ce61d2..2e448c1579 100644 --- a/src/d/actor/d_a_obj_stick.cpp +++ b/src/d/actor/d_a_obj_stick.cpp @@ -227,18 +227,18 @@ static actor_method_class daObj_Stick_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_STICK = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_STICK, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_Stick_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 85, // mPriority - &daObj_Stick_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_STICK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Stick_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_STICK_e, + /* Actor SubMtd */ &daObj_Stick_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_stone.cpp b/src/d/actor/d_a_obj_stone.cpp index 7c67edea15..5cf5716873 100644 --- a/src/d/actor/d_a_obj_stone.cpp +++ b/src/d/actor/d_a_obj_stone.cpp @@ -212,7 +212,7 @@ int daObjStone_c::Create() { pos.y += 1.0f; // Create the mark actor that goes under the stone - fopAcM_createChild(PROC_Obj_StoneMark, fopAcM_GetID(this), stoneType, &pos, + fopAcM_createChild(fpcNm_Obj_StoneMark_e, fopAcM_GetID(this), stoneType, &pos, fopAcM_GetRoomNo(this), &shape_angle, &scale, -1, 0); mSound.init(¤t.pos, 1); @@ -299,7 +299,7 @@ void daObjStone_c::mode_proc_call() { cCcD_Obj* tgHitObj = mCollider.GetTgHitObj(); if (tgHitObj != NULL) { fopAc_ac_c* tgHitActor = mCollider.GetTgHitAc(); - if (fopAcM_GetName(tgHitActor) == PROC_OBJ_GRA) { + if (fopAcM_GetName(tgHitActor) == fpcNm_OBJ_GRA_e) { init_modeBreak(); } else { if (tgHitObj->ChkAtType(AT_TYPE_BOMB)) { @@ -308,7 +308,7 @@ void daObjStone_c::mode_proc_call() { if (tgHitObj->ChkAtType(AT_TYPE_IRON_BALL) && tgHitObj->GetAtAtp() != 1) { init_modeBreak(); } else if (tgHitObj->ChkAtType(AT_TYPE_CSTATUE_SWING) && - (fopAcM_GetName(tgHitActor) == PROC_Obj_VolcanicBomb)) + (fopAcM_GetName(tgHitActor) == fpcNm_Obj_VolcanicBomb_e)) { init_modeBreak(); } @@ -1022,18 +1022,18 @@ static actor_method_class l_daObjStone_Method = { }; actor_process_profile_definition g_profile_Obj_Stone = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Stone, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjStone_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 511, // mPriority - &l_daObjStone_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLSPHERE_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Stone_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjStone_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Stone_e, + /* Actor SubMtd */ &l_daObjStone_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLSPHERE_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_stoneMark.cpp b/src/d/actor/d_a_obj_stoneMark.cpp index e8f08bc5f9..9c4e3a063e 100644 --- a/src/d/actor/d_a_obj_stoneMark.cpp +++ b/src/d/actor/d_a_obj_stoneMark.cpp @@ -84,18 +84,18 @@ static actor_method_class l_daObjSMark_Method = { }; actor_process_profile_definition g_profile_Obj_StoneMark = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_StoneMark, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSMark_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 534, // mPriority - &l_daObjSMark_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLSPHERE_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_StoneMark_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSMark_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_StoneMark_e, + /* Actor SubMtd */ &l_daObjSMark_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLSPHERE_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_stopper.cpp b/src/d/actor/d_a_obj_stopper.cpp index 97f978f6a0..75ef504d63 100644 --- a/src/d/actor/d_a_obj_stopper.cpp +++ b/src/d/actor/d_a_obj_stopper.cpp @@ -515,20 +515,20 @@ static actor_method_class l_daObjStopper_Method = { }; actor_process_profile_definition g_profile_Obj_Stopper = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Stopper, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjStopper_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 454, // mPriority - &l_daObjStopper_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Stopper_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjStopper_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Stopper_e, + /* Actor SubMtd */ &l_daObjStopper_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_obj_stopper2.cpp b/src/d/actor/d_a_obj_stopper2.cpp index 5375998958..a65969bc22 100644 --- a/src/d/actor/d_a_obj_stopper2.cpp +++ b/src/d/actor/d_a_obj_stopper2.cpp @@ -308,18 +308,18 @@ static actor_method_class l_daObjStopper2_Method = { }; actor_process_profile_definition g_profile_Obj_Stopper2 = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Stopper2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjStopper2_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 564, // mPriority - &l_daObjStopper2_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Stopper2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjStopper2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Stopper2_e, + /* Actor SubMtd */ &l_daObjStopper2_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_suisya.cpp b/src/d/actor/d_a_obj_suisya.cpp index ee3a3fa56b..f14ff36706 100644 --- a/src/d/actor/d_a_obj_suisya.cpp +++ b/src/d/actor/d_a_obj_suisya.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_suisya.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" int daObj_Suisya_c::draw() { g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); @@ -105,18 +105,18 @@ static actor_method_class l_daObj_Suisya_Method = { }; actor_process_profile_definition g_profile_OBJ_SUISYA = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_OBJ_SUISYA, - &g_fpcLf_Method.base, - sizeof(daObj_Suisya_c), - 0, - 0, - &g_fopAc_Method.base, - 65, - &l_daObj_Suisya_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_SUISYA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Suisya_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_SUISYA_e, + /* Actor SubMtd */ &l_daObj_Suisya_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_sw.cpp b/src/d/actor/d_a_obj_sw.cpp index 73c13d1db3..647272c840 100644 --- a/src/d/actor/d_a_obj_sw.cpp +++ b/src/d/actor/d_a_obj_sw.cpp @@ -52,7 +52,7 @@ static int daObj_Sw_Draw(obj_sw_class* i_this) { static int saru_ct; static void* s_ks_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KS_e) { int swBit = fopAcM_GetParam(i_actor) >> 24; if (swBit != 0xFF) { if (dComIfGs_isSwitch(swBit, fopAcM_GetRoomNo((fopAc_ac_c*)i_actor))) { @@ -91,7 +91,7 @@ static path sc_path[17] = { }; static void* s_ksdel_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KS_e) { fopAcM_delete((fopAc_ac_c*)i_actor); ((obj_sw_class*)i_data)->field_0x5a8[saru_ct].field_0x4.x = sc_path[7 - saru_ct].field_0x4; @@ -794,14 +794,14 @@ static int daObj_Sw_Create(fopAc_ac_c* a_this) { i_this->field_0xd8c = (i_this->field_0x91c * 63) / 8; if (fopAcM_GetRoomNo(a_this) == 2 || fopAcM_GetRoomNo(a_this) == 4) { - fopAcM_createChild(PROC_OBJ_BRG, fopAcM_GetID(a_this), swBit << 24 | 0xFFFFFF, + fopAcM_createChild(fpcNm_OBJ_BRG_e, fopAcM_GetID(a_this), swBit << 24 | 0xFFFFFF, &a_this->current.pos, fopAcM_GetRoomNo(a_this), &a_this->current.angle, NULL, -1, NULL); } if (fopAcM_GetRoomNo(a_this) == 4 && swBit != 0xFF) { if (!dComIfGs_isSwitch(swBit, fopAcM_GetRoomNo(a_this))) { - fopAcM_createChild(PROC_E_MK, fopAcM_GetID(a_this), swBit << 16 | 1, + fopAcM_createChild(fpcNm_E_MK_e, fopAcM_GetID(a_this), swBit << 16 | 1, &a_this->current.pos, fopAcM_GetRoomNo(a_this), &a_this->current.angle, NULL, -1, NULL); return cPhs_ERROR_e; @@ -819,18 +819,18 @@ static actor_method_class l_daObj_Sw_Method = { }; actor_process_profile_definition g_profile_OBJ_SW = { - fpcLy_CURRENT_e, // mLayerID - 4, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_SW, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_sw_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 60, // mPriority - &l_daObj_Sw_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_SW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_sw_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_SW_e, + /* Actor SubMtd */ &l_daObj_Sw_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_swBallA.cpp b/src/d/actor/d_a_obj_swBallA.cpp index af9237be3c..19c1a81995 100644 --- a/src/d/actor/d_a_obj_swBallA.cpp +++ b/src/d/actor/d_a_obj_swBallA.cpp @@ -17,7 +17,7 @@ static daObjCarry_c* l_target_info[8]; static int l_target_info_count; static void* s_ball_sub(void* param_1, void* param_2) { - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_Carry && + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_Obj_Carry_e && ((daObjCarry_c*)param_1)->getType() == daObjCarry_c::TYPE_LV8_BALL) { if (l_target_info_count < 8) { @@ -228,7 +228,7 @@ void daObjSwBallA_c::PutCrrPos() { daObjCarry_c* carryObj = (daObjCarry_c*)fopAcM_SearchByID(player->getGrabActorID()); if (carryObj != NULL && fopAcM_IsActor(carryObj) - && fopAcM_GetName(carryObj) == PROC_Obj_Carry && + && fopAcM_GetName(carryObj) == fpcNm_Obj_Carry_e && carryObj->getType() == daObjCarry_c::TYPE_LV8_BALL) { player->setForcePutPos(current.pos); @@ -348,18 +348,18 @@ static actor_method_class l_daObjSwBallA_Method = { }; actor_process_profile_definition g_profile_Obj_SwBallA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SwBallA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSwBallA_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 571, // mPriority - &l_daObjSwBallA_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SwBallA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSwBallA_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SwBallA_e, + /* Actor SubMtd */ &l_daObjSwBallA_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_swBallB.cpp b/src/d/actor/d_a_obj_swBallB.cpp index 7b53115c02..0b516eecc1 100644 --- a/src/d/actor/d_a_obj_swBallB.cpp +++ b/src/d/actor/d_a_obj_swBallB.cpp @@ -17,7 +17,7 @@ static daObjCarry_c* l_target_info[2]; static int l_target_info_count; static void* s_ball_sub(void* param_1, void* param_2) { - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_Carry && + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_Obj_Carry_e && ((daObjCarry_c*)param_1)->prm_chk_type_lightball()) { if (l_target_info_count < 2) { @@ -293,7 +293,7 @@ void daObjSwBallB_c::PutCrrPos() { if (fopAcM_searchPlayerDistanceXZ(this) < 150.0f && sVar5 < 0x4000 && sVar5 > -0x4000) { daObjCarry_c* carryObj = (daObjCarry_c*)fopAcM_SearchByID(player->getGrabActorID()); if (carryObj != NULL && fopAcM_IsActor(carryObj) && - fopAcM_GetName(carryObj) == PROC_Obj_Carry && carryObj->prm_chk_type_lightball()) + fopAcM_GetName(carryObj) == fpcNm_Obj_Carry_e && carryObj->prm_chk_type_lightball()) { player->setForcePutPos(current.pos); if (!dComIfGp_event_runCheck()) { @@ -411,18 +411,18 @@ static actor_method_class l_daObjSwBallB_Method = { }; actor_process_profile_definition g_profile_Obj_SwBallB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SwBallB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSwBallB_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 572, // mPriority - &l_daObjSwBallB_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SwBallB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSwBallB_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SwBallB_e, + /* Actor SubMtd */ &l_daObjSwBallB_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_swBallC.cpp b/src/d/actor/d_a_obj_swBallC.cpp index e4ceb8e3ee..560edd9ec4 100644 --- a/src/d/actor/d_a_obj_swBallC.cpp +++ b/src/d/actor/d_a_obj_swBallC.cpp @@ -20,7 +20,7 @@ static int CheckCreateHeap(fopAc_ac_c* param_0) { } static void* s_swb_sub(void* param_1, void* param_2) { - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_SwBallB && + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_Obj_SwBallB_e && (u32)((daObjSwBallB_c*)param_1)->getID() == ((daObjSwBallC_c*)param_2)->field_0x582) { return param_1; @@ -29,7 +29,7 @@ static void* s_swb_sub(void* param_1, void* param_2) { } static void* s_ballA_sub(void* param_1, void* param_2) { - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_Carry && + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_Obj_Carry_e && ((daObjCarry_c*)param_1)->getType() == daObjCarry_c::TYPE_BALL_S) { return param_1; @@ -38,7 +38,7 @@ static void* s_ballA_sub(void* param_1, void* param_2) { } static void* s_ballB_sub(void* param_1, void* param_2) { - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_Carry && + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_Obj_Carry_e && ((daObjCarry_c*)param_1)->getType() == daObjCarry_c::TYPE_BALL_S_2) { return param_1; @@ -237,7 +237,7 @@ int daObjSwBallC_c::demoProc() { break; case 10: field_0x584 = 1; - execItemGet(fpcNm_ITEM_LIGHT_SWORD); + execItemGet(dItemNo_LIGHT_SWORD_e); break; } } @@ -344,14 +344,14 @@ int daObjSwBallC_c::calcLightBallScale() { int uVar3 = 0; fopAc_ac_c* ball = (fopAc_ac_c*)fpcM_Search(s_ballA_sub, this); if (ball != NULL) { - fopAcM_OnStatus(ball, 0x800); + fopAcM_OnStatus(ball, fopAcStts_STAFF_EXTRA_e); uVar3 = cLib_chaseF(&ball->scale.x, 0.0f, 0.05f); ball->scale.y = ball->scale.x; ball->scale.z = ball->scale.x; } ball = (fopAc_ac_c*)fpcM_Search(s_ballB_sub, this); if (ball != NULL) { - fopAcM_OnStatus(ball, 0x800); + fopAcM_OnStatus(ball, fopAcStts_STAFF_EXTRA_e); uVar3 &= cLib_chaseF(&ball->scale.x, 0.0f, 0.05f); ball->scale.y = ball->scale.x; ball->scale.z = ball->scale.x; @@ -411,18 +411,18 @@ static actor_method_class l_daObjSwBallC_Method = { }; actor_process_profile_definition g_profile_Obj_SwBallC = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_SwBallC, - &g_fpcLf_Method.base, - sizeof(daObjSwBallC_c), - 0, - 0, - &g_fopAc_Method.base, - 0x246, - &l_daObjSwBallC_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SwBallC_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSwBallC_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SwBallC_e, + /* Actor SubMtd */ &l_daObjSwBallC_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_swLight.cpp b/src/d/actor/d_a_obj_swLight.cpp index c127fffa5f..6883fe8ba8 100644 --- a/src/d/actor/d_a_obj_swLight.cpp +++ b/src/d/actor/d_a_obj_swLight.cpp @@ -477,18 +477,18 @@ static actor_method_class daObjSwLight_METHODS = { }; actor_process_profile_definition g_profile_Obj_SwLight = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SwLight, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSwLight_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 554, // mPriority - &daObjSwLight_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SwLight_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSwLight_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SwLight_e, + /* Actor SubMtd */ &daObjSwLight_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_swchain.cpp b/src/d/actor/d_a_obj_swchain.cpp index d3ec334bb3..a9c3ff42ac 100644 --- a/src/d/actor/d_a_obj_swchain.cpp +++ b/src/d/actor/d_a_obj_swchain.cpp @@ -119,7 +119,7 @@ static s16 GetActorName(cBgS_PolyInfo& param_0) { } } - return PROC_Obj_SwChain; + return fpcNm_Obj_SwChain_e; } static char* l_arcName = "P_Chain"; @@ -495,7 +495,7 @@ void daObjSwChain_c::chain_control() { pos.y += 100.0f; chains_p1->field_0x4c = 0; - if (fopAcM_gc_c::gndCheck(&pos) && GetActorName(*fopAcM_gc_c::getGroundCheck()) != PROC_Obj_Lv4DigSand) { + if (fopAcM_gc_c::gndCheck(&pos) && GetActorName(*fopAcM_gc_c::getGroundCheck()) != fpcNm_Obj_Lv4DigSand_e) { fVar1 = fopAcM_gc_c::getGroundY() + 15.0f; if (fVar1 > pcVar2->y) { pcVar2->y = fVar1; @@ -651,7 +651,7 @@ void daObjSwChain_c::chain_control2() { cXyz spc0(*pcVar2); spc0.y += 100.0f; - if (fopAcM_gc_c::gndCheck(&spc0) && GetActorName(*fopAcM_gc_c::getGroundCheck()) != PROC_Obj_Lv4DigSand) { + if (fopAcM_gc_c::gndCheck(&spc0) && GetActorName(*fopAcM_gc_c::getGroundCheck()) != fpcNm_Obj_Lv4DigSand_e) { f32 fVar2 = fopAcM_gc_c::getGroundY() + 15.0f; if (fVar2 > pcVar2->y) { pcVar2->y = fVar2; @@ -1191,18 +1191,18 @@ static actor_method_class l_daObjSwChain_Method = { }; actor_process_profile_definition g_profile_Obj_SwChain = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SwChain, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSwChain_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 615, // mPriority - &l_daObjSwChain_Method, // sub_method - 0x000C0000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SwChain_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSwChain_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SwChain_e, + /* Actor SubMtd */ &l_daObjSwChain_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_swhang.cpp b/src/d/actor/d_a_obj_swhang.cpp index 00acbfd056..7fd34fc3ee 100644 --- a/src/d/actor/d_a_obj_swhang.cpp +++ b/src/d/actor/d_a_obj_swhang.cpp @@ -134,7 +134,7 @@ int daObjSwHang_c::Create() { case TYPE_3: case TYPE_4: mCcSph.Set(l_sph_src2); - fopAcM_OnStatus(this, 0x200000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x200000_e); break; } mCcSph.SetStts(&mCcStts); @@ -502,18 +502,18 @@ static actor_method_class daObjSwHang_METHODS = { }; actor_process_profile_definition g_profile_Obj_SwHang = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SwHang, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSwHang_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 516, // mPriority - &daObjSwHang_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SwHang_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSwHang_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SwHang_e, + /* Actor SubMtd */ &daObjSwHang_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_sword.cpp b/src/d/actor/d_a_obj_sword.cpp index e9141a3998..bb34eb6d8d 100644 --- a/src/d/actor/d_a_obj_sword.cpp +++ b/src/d/actor/d_a_obj_sword.cpp @@ -147,18 +147,18 @@ static actor_method_class l_daObjSword_Method = { }; actor_process_profile_definition g_profile_Obj_Sword = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Sword, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSword_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 586, // mPriority - &l_daObjSword_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Sword_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSword_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Sword_e, + /* Actor SubMtd */ &l_daObjSword_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_swpropeller.cpp b/src/d/actor/d_a_obj_swpropeller.cpp index 4dfa188862..f43d1dd516 100644 --- a/src/d/actor/d_a_obj_swpropeller.cpp +++ b/src/d/actor/d_a_obj_swpropeller.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_swpropeller.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include #define MODEL_K_PURO 0 @@ -332,18 +332,18 @@ static actor_method_class l_daObjSwPr_Method = { }; actor_process_profile_definition g_profile_Obj_Swpropeller = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Swpropeller, - &g_fpcLf_Method.base, - sizeof(daObjSwPr_c), - 0, - 0, - &g_fopAc_Method.base, - 448, - &l_daObjSwPr_Method, - 0x44100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Swpropeller_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSwPr_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Swpropeller_e, + /* Actor SubMtd */ &l_daObjSwPr_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_swpush.cpp b/src/d/actor/d_a_obj_swpush.cpp index a74fad8287..e71033b979 100644 --- a/src/d/actor/d_a_obj_swpush.cpp +++ b/src/d/actor/d_a_obj_swpush.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_swpush.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -264,7 +264,7 @@ cPhs_Step daObjSwpush::Act_c::Mthd_Create() { field_0x5e4 = 0; field_0x5f2 = 0; field_0x5f3 = 0; - + set_btp_frame(); bool is_toggle = cLib_checkBit(attr().flags, FLAG_IS_TOGGLE); @@ -272,7 +272,7 @@ cPhs_Step daObjSwpush::Act_c::Mthd_Create() { bool flg20 = cLib_checkBit(attr().flags, FLAG_UNK20); bool is_sw = is_switch(); bool is_sw2 = is_switch2(); - + if ((is_toggle || (!is_sw && !on_is_up) || (is_sw && on_is_up)) && (!flg20 || !is_sw2)) { mTargetHFrac = 1.0f; mCurHFrac = 1.0f; @@ -384,18 +384,18 @@ void daObjSwpush::Act_c::rideCB(dBgW* i_bgw, fopAc_ac_c* i_ac, fopAc_ac_c* i_pt) i_this->mRidingMode = 1; } - bool is_player = fopAcM_GetProfName(i_pt) == PROC_ALINK; + bool is_player = fopAcM_GetProfName(i_pt) == fpcNm_ALINK_e; if (is_player) { i_this->mVibTimer = 4; } - + if (is_player) { if (((daPy_py_c*)i_pt)->checkEquipHeavyBoots()) { i_this->mHeavyRiding = true; } } - if (fopAcM_GetProfName(i_pt) == PROC_E_MM_MT) { + if (fopAcM_GetProfName(i_pt) == fpcNm_E_MM_MT_e) { i_this->field_0x5c5 = 1; break; } @@ -442,7 +442,7 @@ void daObjSwpush::Act_c::calc_top_pos() { } else { field_0x5e8 = field_0x5dc; } - + mTopPos = (1.0f - field_0x5e8) * -35.5f; if (mTopPos < field_0x5d8) { @@ -659,7 +659,7 @@ void daObjSwpush::Act_c::mode_l_u() { } else if (strcmp(dComIfGp_getStartStageName(), "D_MN11") == 0 || strcmp(dComIfGp_getStartStageName(), "D_MN06") == 0) { fopAcM_seStart(this, Z2SE_OBJ_LV3_FLR_SW_OFF, 0); } - + mode_upper_init(); } } @@ -744,9 +744,9 @@ void daObjSwpush::Act_c::demo_runSw() { } bool daObjSwpush::Act_c::check_ride_couple(s16 param_1) { - if (param_1 == PROC_ALINK) { + if (param_1 == fpcNm_ALINK_e) { field_0x5f2 |= 1; - } else if (param_1 == PROC_NPC_P2) { + } else if (param_1 == fpcNm_NPC_P2_e) { field_0x5f2 |= 2; } @@ -799,7 +799,7 @@ int daObjSwpush::Act_c::Mthd_Execute() { mpBgW->CopyBackVtx(); cBgD_Vtx_t* vtx_tbl = mpBgW->GetVtxTbl(); int i_max = mpBgW->GetVtxNum(); - + for (int i = 0; i < 4; i++) { JUT_ASSERT(1552, M_op_vtx[i] < i_max); @@ -852,11 +852,11 @@ namespace { int Mthd_IsDelete(void* i_this) { return 1; } - + static actor_method_class Mthd_Table = { - (process_method_func)Mthd_Create, - (process_method_func)Mthd_Delete, - (process_method_func)Mthd_Execute, + (process_method_func)Mthd_Create, + (process_method_func)Mthd_Delete, + (process_method_func)Mthd_Execute, (process_method_func)Mthd_IsDelete, (process_method_func)Mthd_Draw, }; @@ -866,18 +866,18 @@ namespace { AUDIO_INSTANCES; actor_process_profile_definition g_profile_Obj_Swpush = { - fpcLy_CURRENT_e, // mLayerID - 2, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Swpush, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSwpush::Act_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 11, // mPriority - &daObjSwpush::Mthd_Table, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 2, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Swpush_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSwpush::Act_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Swpush_e, + /* Actor SubMtd */ &daObjSwpush::Mthd_Table, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_swpush2.cpp b/src/d/actor/d_a_obj_swpush2.cpp index e97638bbaa..cb59f80d1f 100644 --- a/src/d/actor/d_a_obj_swpush2.cpp +++ b/src/d/actor/d_a_obj_swpush2.cpp @@ -361,7 +361,7 @@ void daObjSwpush2::Act_c::rideCB(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_ a_this->mRideType = 1; } - bool is_player_ride = fopAcM_GetProfName(i_rideActor) == PROC_ALINK; + bool is_player_ride = fopAcM_GetProfName(i_rideActor) == fpcNm_ALINK_e; if (is_player_ride) { a_this->mShockTimer = 4; } @@ -715,18 +715,18 @@ actor_method_class Mthd_Table = { } actor_process_profile_definition g_profile_Obj_Swpush2 = { - fpcLy_CURRENT_e, // mLayerID - 2, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Swpush2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSwpush2::Act_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 12, // mPriority - &daObjSwpush2::Mthd_Table, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 2, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Swpush2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSwpush2::Act_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Swpush2_e, + /* Actor SubMtd */ &daObjSwpush2::Mthd_Table, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_swpush5.cpp b/src/d/actor/d_a_obj_swpush5.cpp index 6374368885..ab0844c9dd 100644 --- a/src/d/actor/d_a_obj_swpush5.cpp +++ b/src/d/actor/d_a_obj_swpush5.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_swpush5.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -16,7 +16,7 @@ static void rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_bgActor, fopAc_ac_c* i_rideA daObjSw5_c* i_this = (daObjSw5_c*)i_bgActor; daPy_py_c* player_p = daPy_getPlayerActorClass(); - if (i_this->checkPushable() && fopAcM_CheckStatus(i_rideActor, fopAcM_STATUS_UNK_0x400) && fopAcM_GetName(i_rideActor) == PROC_ALINK) { + if (i_this->checkPushable() && fopAcM_CheckStatus(i_rideActor, fopAcStts_FREEZE_e) && fopAcM_GetName(i_rideActor) == fpcNm_ALINK_e) { static cXyz l_push_check_pos[4] = { cXyz(-50.0f, 0.0f, -50.0f), cXyz(50.0f, 0.0f, -50.0f), @@ -298,7 +298,7 @@ void daObjSw5_c::modeWaitLower() { bool var_r30 = false; bool do_pause = false; daPy_py_c* player = daPy_getPlayerActorClass(); - + if (field_0x5b1 != 0) { var_r30 = true; } @@ -418,20 +418,20 @@ static actor_method_class l_daObjSw5_Method = { }; actor_process_profile_definition g_profile_Obj_Swpush5 = { - fpcLy_CURRENT_e, // mLayerID - 2, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Swpush5, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSw5_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 13, // mPriority - &l_daObjSw5_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 2, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Swpush5_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSw5_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Swpush5_e, + /* Actor SubMtd */ &l_daObjSw5_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_obj_swspinner.cpp b/src/d/actor/d_a_obj_swspinner.cpp index 964f9a7376..e7966e7735 100644 --- a/src/d/actor/d_a_obj_swspinner.cpp +++ b/src/d/actor/d_a_obj_swspinner.cpp @@ -6,13 +6,13 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_swspinner.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static void* search_spinner_sub(void* i_actor, void* i_data) { daSpinner_c* spinner = (daSpinner_c*)i_actor; daObjSwSpinner_c* sw = (daObjSwSpinner_c*)i_data; - if (spinner != NULL && fopAc_IsActor(spinner) && fpcM_GetProfName(spinner) == PROC_SPINNER) { + if (spinner != NULL && fopAc_IsActor(spinner) && fpcM_GetProfName(spinner) == fpcNm_SPINNER_e) { if (spinner->current.pos.absXZ(sw->current.pos) < sw->GetR()) { if (!sw->mSpinnerIn) { sw->mSpinnerIn = true; @@ -225,18 +225,18 @@ static actor_method_class daObjSwSpinner_METHODS = { }; actor_process_profile_definition g_profile_Obj_SwSpinner = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SwSpinner, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSwSpinner_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 559, // mPriority - &daObjSwSpinner_METHODS, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SwSpinner_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSwSpinner_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SwSpinner_e, + /* Actor SubMtd */ &daObjSwSpinner_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_swturn.cpp b/src/d/actor/d_a_obj_swturn.cpp index 4acb54bf03..6db58daf07 100644 --- a/src/d/actor/d_a_obj_swturn.cpp +++ b/src/d/actor/d_a_obj_swturn.cpp @@ -437,18 +437,18 @@ static actor_method_class daObjSwTurn_METHODS = { }; actor_process_profile_definition g_profile_Obj_SwTurn = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SwTurn, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSwTurn_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 14, // mPriority - &daObjSwTurn_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SwTurn_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSwTurn_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SwTurn_e, + /* Actor SubMtd */ &daObjSwTurn_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_syRock.cpp b/src/d/actor/d_a_obj_syRock.cpp index 5432f01d6c..e419725eb3 100644 --- a/src/d/actor/d_a_obj_syRock.cpp +++ b/src/d/actor/d_a_obj_syRock.cpp @@ -378,7 +378,7 @@ void* daSyRock_c::searchWaterPillar(void* i_proc, void* i_this) { daSyRock_c* const syRock = static_cast(i_this); daWtPillar_c* const wtPillar = static_cast(i_proc); - if (wtPillar && fopAcM_IsActor(wtPillar) && fopAcM_GetProfName(wtPillar) == PROC_Obj_WaterPillar) { + if (wtPillar && fopAcM_IsActor(wtPillar) && fopAcM_GetProfName(wtPillar) == fpcNm_Obj_WaterPillar_e) { const cXyz vectorFromWaterPillar = syRock->current.pos - wtPillar->current.pos; const f32 horizontalDistanceToWaterPillar = vectorFromWaterPillar.absXZ(); @@ -616,18 +616,18 @@ static actor_method_class l_daSyRock_Method = { }; actor_process_profile_definition g_profile_Obj_SyRock = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SyRock, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSyRock_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 515, // mPriority - &l_daSyRock_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SyRock_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSyRock_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SyRock_e, + /* Actor SubMtd */ &l_daSyRock_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_szbridge.cpp b/src/d/actor/d_a_obj_szbridge.cpp index e66eb5c1a8..c362e5720a 100644 --- a/src/d/actor/d_a_obj_szbridge.cpp +++ b/src/d/actor/d_a_obj_szbridge.cpp @@ -173,18 +173,18 @@ static actor_method_class daObjSZbridge_METHODS = { }; actor_process_profile_definition g_profile_Obj_SZbridge = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SZbridge, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSZbridge_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 676, // mPriority - &daObjSZbridge_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SZbridge_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSZbridge_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SZbridge_e, + /* Actor SubMtd */ &daObjSZbridge_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_taFence.cpp b/src/d/actor/d_a_obj_taFence.cpp index ff6823ff43..42d436bddd 100644 --- a/src/d/actor/d_a_obj_taFence.cpp +++ b/src/d/actor/d_a_obj_taFence.cpp @@ -416,18 +416,18 @@ static actor_method_class l_daTaFence_Method = { }; actor_process_profile_definition g_profile_Obj_TaFence = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_TaFence, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTaFence_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 505, // mPriority - &l_daTaFence_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_TaFence_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTaFence_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_TaFence_e, + /* Actor SubMtd */ &l_daTaFence_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_table.cpp b/src/d/actor/d_a_obj_table.cpp index 6ebb9f556d..eb6b0e5896 100644 --- a/src/d/actor/d_a_obj_table.cpp +++ b/src/d/actor/d_a_obj_table.cpp @@ -9,7 +9,7 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_meter2_info.h" #include "d/d_msg_object.h" @@ -198,18 +198,18 @@ static actor_method_class l_daObjTable_Method = { }; actor_process_profile_definition g_profile_Obj_Table = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Table, - &g_fpcLf_Method.base, - sizeof(daObjTable_c), - 0, - 0, - &g_fopAc_Method.base, - 0x02AB, - &l_daObjTable_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Table_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjTable_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Table_e, + /* Actor SubMtd */ &l_daObjTable_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_takaraDai.cpp b/src/d/actor/d_a_obj_takaraDai.cpp index 58e2ca31fe..b33111f137 100644 --- a/src/d/actor/d_a_obj_takaraDai.cpp +++ b/src/d/actor/d_a_obj_takaraDai.cpp @@ -203,18 +203,18 @@ static actor_method_class l_daTkraDai_Method = { }; actor_process_profile_definition g_profile_Obj_TakaraDai = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_TakaraDai, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTkraDai_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 654, // mPriority - &l_daTkraDai_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_TakaraDai_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTkraDai_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_TakaraDai_e, + /* Actor SubMtd */ &l_daTkraDai_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_tatigi.cpp b/src/d/actor/d_a_obj_tatigi.cpp index 5d91ed7e53..93c07f409a 100644 --- a/src/d/actor/d_a_obj_tatigi.cpp +++ b/src/d/actor/d_a_obj_tatigi.cpp @@ -215,18 +215,18 @@ static actor_method_class l_daObj_Tatigi_Method = { }; actor_process_profile_definition g_profile_OBJ_TATIGI = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_TATIGI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_tatigi_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 709, // mPriority - &l_daObj_Tatigi_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_TATIGI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_tatigi_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_TATIGI_e, + /* Actor SubMtd */ &l_daObj_Tatigi_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ten.cpp b/src/d/actor/d_a_obj_ten.cpp index be3bb229b5..fbedd6a8c9 100644 --- a/src/d/actor/d_a_obj_ten.cpp +++ b/src/d/actor/d_a_obj_ten.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_ten.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -270,9 +270,9 @@ void daObjTEN_c::MoveAction() { linkchk.SetObj(); cXyz cStack_c8; cXyz cStack_d4; - + switch (field_0x5e9) { - case 0: + case 0: { J3DAnmTransform* anmTransform = (J3DAnmTransform*)dComIfG_getObjectRes("I_Ten", 6); mMorf->setAnm(anmTransform, 2, 5.0f, 0.0f, 0.0f, -1.0f); @@ -300,7 +300,7 @@ void daObjTEN_c::MoveAction() { speed.y = 5.0f; } break; - case 2: + case 2: { cXyz local_e0; cXyz* flamePos = player->getKandelaarFlamePos(); @@ -703,7 +703,7 @@ int daObjTEN_c::create() { if (field_0x624 == 2) { field_0x56c = 0; shape_angle.x -= 0x2000; - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } else { mDraw = true; } @@ -810,18 +810,18 @@ static actor_method_class l_daObjTEN_Method = { }; actor_process_profile_definition g_profile_Obj_Ten = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Ten, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjTEN_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 483, // mPriority - &l_daObjTEN_Method, // sub_method - 0x000C0120, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Ten_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjTEN_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Ten_e, + /* Actor SubMtd */ &l_daObjTEN_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_testcube.cpp b/src/d/actor/d_a_obj_testcube.cpp index 0a1a41ec36..a9469551b4 100644 --- a/src/d/actor/d_a_obj_testcube.cpp +++ b/src/d/actor/d_a_obj_testcube.cpp @@ -367,18 +367,18 @@ static actor_method_class l_daObjCube_Method = { #endif actor_process_profile_definition g_profile_Obj_TestCube = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_TestCube, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjCube_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 442, // mPriority - OBJCUBE_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_TestCube_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCube_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_TestCube_e, + /* Actor SubMtd */ OBJCUBE_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_tgake.cpp b/src/d/actor/d_a_obj_tgake.cpp index 4e2074b56b..18ca94f97b 100644 --- a/src/d/actor/d_a_obj_tgake.cpp +++ b/src/d/actor/d_a_obj_tgake.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_tgake.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" void daObjGake_c::initBaseMtx() { mpModel->setBaseScale(scale); @@ -132,18 +132,18 @@ static actor_method_class daObjGake_METHODS = { }; actor_process_profile_definition g_profile_Obj_Gake = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Gake, - &g_fpcLf_Method.base, - sizeof(daObjGake_c), - 0, - 0, - &g_fopAc_Method.base, - 568, - &daObjGake_METHODS, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Gake_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjGake_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Gake_e, + /* Actor SubMtd */ &daObjGake_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_thashi.cpp b/src/d/actor/d_a_obj_thashi.cpp index 9d1d899677..48aa05a435 100644 --- a/src/d/actor/d_a_obj_thashi.cpp +++ b/src/d/actor/d_a_obj_thashi.cpp @@ -248,20 +248,20 @@ static actor_method_class l_daObjTHASHI_Method = { }; actor_process_profile_definition g_profile_Obj_THASHI = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_THASHI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjTHASHI_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 461, // mPriority - &l_daObjTHASHI_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_THASHI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjTHASHI_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_THASHI_e, + /* Actor SubMtd */ &l_daObjTHASHI_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; int daObjTHASHI_c::Create() { diff --git a/src/d/actor/d_a_obj_thdoor.cpp b/src/d/actor/d_a_obj_thdoor.cpp index 4eaf0e247d..3a84a59cb8 100644 --- a/src/d/actor/d_a_obj_thdoor.cpp +++ b/src/d/actor/d_a_obj_thdoor.cpp @@ -364,18 +364,18 @@ static actor_method_class daObjThDoor_METHODS = { }; actor_process_profile_definition g_profile_Obj_TDoor = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_TDoor, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjThDoor_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 560, // mPriority - &daObjThDoor_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_TDoor_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjThDoor_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_TDoor_e, + /* Actor SubMtd */ &daObjThDoor_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_timeFire.cpp b/src/d/actor/d_a_obj_timeFire.cpp index e86e092cdd..8b7b2ba730 100644 --- a/src/d/actor/d_a_obj_timeFire.cpp +++ b/src/d/actor/d_a_obj_timeFire.cpp @@ -155,18 +155,18 @@ static actor_method_class l_daTimeFire_Method = { }; actor_process_profile_definition g_profile_Obj_TimeFire = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_TimeFire, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTimeFire_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 661, // mPriority - &l_daTimeFire_Method, // sub_method - 0x00060000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_TimeFire_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTimeFire_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_TimeFire_e, + /* Actor SubMtd */ &l_daTimeFire_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_timer.cpp b/src/d/actor/d_a_obj_timer.cpp index 3f5bd30269..0bdb9f769b 100644 --- a/src/d/actor/d_a_obj_timer.cpp +++ b/src/d/actor/d_a_obj_timer.cpp @@ -132,18 +132,18 @@ namespace { }; // namespace daObjTimer actor_process_profile_definition g_profile_Obj_Timer = { - fpcLy_CURRENT_e, // mLayerID - 10, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Timer, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjTimer::Act_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 22, // mPriority - &daObjTimer::l_daTimer_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 10, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Timer_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjTimer::Act_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Timer_e, + /* Actor SubMtd */ &daObjTimer::l_daTimer_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_tks.cpp b/src/d/actor/d_a_obj_tks.cpp index f2a25ecc72..7add35570e 100644 --- a/src/d/actor/d_a_obj_tks.cpp +++ b/src/d/actor/d_a_obj_tks.cpp @@ -555,7 +555,7 @@ void daObjTks_c::talk() { if (field_0xde1 != 0 && parentActorID == fpcM_ERROR_PROCESS_ID_e && daNpcF_chkEvtBit(0x147)) { cXyz pos(current.pos); pos.y += 30.0f; - parentActorID = fopAcM_createChild(PROC_NPC_TKC, fopAcM_GetID(this), 1, &pos, fopAcM_GetRoomNo(this), &mCurAngle, NULL, -1, NULL); + parentActorID = fopAcM_createChild(fpcNm_NPC_TKC_e, fopAcM_GetID(this), 1, &pos, fopAcM_GetRoomNo(this), &mCurAngle, NULL, -1, NULL); } if (talkProc(NULL, TRUE, NULL)) { @@ -629,7 +629,7 @@ void daObjTks_c::demo() { case '0002': cXyz pos(current.pos); pos.y += 30.0f; - parentActorID = fopAcM_createChild(PROC_NPC_TKC, fopAcM_GetID(this), 0, &pos, fopAcM_GetRoomNo(this), &mCurAngle, NULL, -1, NULL); + parentActorID = fopAcM_createChild(fpcNm_NPC_TKC_e, fopAcM_GetID(this), 0, &pos, fopAcM_GetRoomNo(this), &mCurAngle, NULL, -1, NULL); Z2GetAudioMgr()->subBgmStart(Z2BGM_OBACHAN); Z2GetAudioMgr()->bgmAllUnMute(0); @@ -905,18 +905,18 @@ static actor_method_class daObjTks_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_TKS = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_TKS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjTks_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 376, // mPriority - &daObjTks_MethodTable, // sub_method - 0x08044008, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_TKS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjTks_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_TKS_e, + /* Actor SubMtd */ &daObjTks_MethodTable, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_tmoon.cpp b/src/d/actor/d_a_obj_tmoon.cpp index d7ffe9fbdb..58b9a5b4c7 100644 --- a/src/d/actor/d_a_obj_tmoon.cpp +++ b/src/d/actor/d_a_obj_tmoon.cpp @@ -102,18 +102,18 @@ static actor_method_class l_daObjTMoon_Method = { }; actor_process_profile_definition g_profile_Obj_TMoon = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_TMoon, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjTMoon_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 569, // mPriority - &l_daObjTMoon_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_TMoon_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjTMoon_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_TMoon_e, + /* Actor SubMtd */ &l_daObjTMoon_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_toaru_maki.cpp b/src/d/actor/d_a_obj_toaru_maki.cpp index 5c776f541d..8bacb9ba53 100644 --- a/src/d/actor/d_a_obj_toaru_maki.cpp +++ b/src/d/actor/d_a_obj_toaru_maki.cpp @@ -129,18 +129,18 @@ static actor_method_class daObjToaruMaki_METHODS = { }; actor_process_profile_definition g_profile_Obj_ToaruMaki = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_ToaruMaki, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjToaruMaki_c),// mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 749, // mPriority - &daObjToaruMaki_METHODS, // sub_method - 0x00040000, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_ToaruMaki_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjToaruMaki_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_ToaruMaki_e, + /* Actor SubMtd */ &daObjToaruMaki_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_toby.cpp b/src/d/actor/d_a_obj_toby.cpp index 4c432de9b9..ade90bcdf7 100644 --- a/src/d/actor/d_a_obj_toby.cpp +++ b/src/d/actor/d_a_obj_toby.cpp @@ -126,12 +126,12 @@ static void* s_bomb_sub(void* param_1, void* param_2) { static void* shot_b_sub(void* param_1, void* param_2) { fopAc_ac_c* player = dComIfGp_getPlayer(0); if (fopAcM_IsActor(param_1)) { - if (fopAcM_GetName(param_1) == PROC_BOOMERANG && daPy_py_c::checkBoomerangCharge() && + if (fopAcM_GetName(param_1) == fpcNm_BOOMERANG_e && daPy_py_c::checkBoomerangCharge() && fopAcM_GetParam(param_1) == 1) { return param_1; } - if (fopAcM_GetName(param_1) == PROC_E_MK_BO && (((fopAc_ac_c*)param_1)->field_0x560 != 0)) + if (fopAcM_GetName(param_1) == fpcNm_E_MK_BO_e && (((fopAc_ac_c*)param_1)->field_0x560 != 0)) { return param_1; } @@ -149,7 +149,7 @@ static f32 hz_check_pos_z; static void* s_hz_sub(void* param_1, void* param_2) { if (fopAcM_IsActor(param_1)) { - if (fopAcM_GetName(param_1) == PROC_E_HZ) { + if (fopAcM_GetName(param_1) == fpcNm_E_HZ_e) { daE_HZ_c* hz = (daE_HZ_c*)param_1; if (hz->isWait() == true) { f32 xDiff = hz_check_pos_x - hz->current.pos.x; @@ -705,18 +705,18 @@ static actor_method_class l_daObj_Toby_Method = { }; actor_process_profile_definition g_profile_OBJ_TOBY = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_TOBY, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_toby_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 58, // mPriority - &l_daObj_Toby_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_TOBY_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_toby_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_TOBY_e, + /* Actor SubMtd */ &l_daObj_Toby_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_tobyhouse.cpp b/src/d/actor/d_a_obj_tobyhouse.cpp index 30d5d76306..2e83318c9d 100644 --- a/src/d/actor/d_a_obj_tobyhouse.cpp +++ b/src/d/actor/d_a_obj_tobyhouse.cpp @@ -64,7 +64,7 @@ static void* s_b_sub(void* i_actor, void* i_data) { bomb->deleteBombAndEffect(); } } else { - if (fopAcM_GetName(i_actor) == PROC_Obj_Carry) { + if (fopAcM_GetName(i_actor) == fpcNm_Obj_Carry_e) { daObjCarry_c* carry = (daObjCarry_c*)i_actor; if (carry != NULL && data != NULL && carry->getType() == 2 && carry->current.pos.absXZ(data->current.pos) < 1000.0f) @@ -326,7 +326,7 @@ void daObjTobyHouse_c::demoProc() { static Vec l_shotSmokeOffset = {0.0f, 2500.0f, -600.0f}; cXyz cStack_24; csXyz cStack_98; - fopAcM_SearchByName(PROC_NPC_TOBY); + fopAcM_SearchByName(fpcNm_NPC_TOBY_e); cXyz cStack_30(-600.0f, 70.0f, 380.0f); camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz* pCamEye = fopCamM_GetEye_p(camera); @@ -601,20 +601,20 @@ static actor_method_class daObjTobyHouse_METHODS = { }; actor_process_profile_definition g_profile_Obj_TobyHouse = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_TobyHouse, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjTobyHouse_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 546, // mPriority - &daObjTobyHouse_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_TobyHouse_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjTobyHouse_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_TobyHouse_e, + /* Actor SubMtd */ &daObjTobyHouse_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_obj_togeTrap.cpp b/src/d/actor/d_a_obj_togeTrap.cpp index fb3b050364..c1aec26441 100644 --- a/src/d/actor/d_a_obj_togeTrap.cpp +++ b/src/d/actor/d_a_obj_togeTrap.cpp @@ -106,7 +106,7 @@ int daTogeTrap_c::create() { } void daTogeTrap_c::rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3) { - if (fopAcM_GetName(param_3) == PROC_Obj_Movebox) { + if (fopAcM_GetName(param_3) == fpcNm_Obj_Movebox_e) { ((daTogeTrap_c*)param_2)->field_0xadd = 1; } } @@ -302,18 +302,18 @@ static actor_method_class l_daTogeTrap_Method = { }; actor_process_profile_definition g_profile_Obj_TogeTrap = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_TogeTrap, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTogeTrap_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 524, // mPriority - &l_daTogeTrap_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_TogeTrap_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTogeTrap_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_TogeTrap_e, + /* Actor SubMtd */ &l_daTogeTrap_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_tombo.cpp b/src/d/actor/d_a_obj_tombo.cpp index 85e0ae47ee..092b1c46c3 100644 --- a/src/d/actor/d_a_obj_tombo.cpp +++ b/src/d/actor/d_a_obj_tombo.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_tombo.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -11,7 +11,7 @@ #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_camera_mng.h" -#include "f_pc/f_pc_name.h" +#include "d/d_item_data.h" #include "m_Do/m_Do_lib.h" #include @@ -47,7 +47,7 @@ daObj_TomHIO_c::daObj_TomHIO_c() { } static u8 const l_tom_itemno[2] = { - fpcNm_ITEM_M_DRAGONFLY, fpcNm_ITEM_F_DRAGONFLY, + dItemNo_M_DRAGONFLY_e, dItemNo_F_DRAGONFLY_e, }; void daObjTOMBO_c::InitCcSph() { @@ -595,7 +595,7 @@ bool daObjTOMBO_c::CreateChk() { if (dMenu_Insect_c::isCatchNotGiveInsect(l_tom_itemno[mSex])) { return 0; } - + if ((mSex == SEX_MALE && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]])) || (mSex == SEX_FEMALE && @@ -617,7 +617,7 @@ int daObjTOMBO_c::create() { if (field_0x75c == 2) { field_0x56c = 0; shape_angle.x -= 0x2000; - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } else { mDraw = true; } @@ -682,18 +682,18 @@ static actor_method_class l_daObjTOMBO_Method = { }; actor_process_profile_definition g_profile_Obj_Tombo = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Tombo, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjTOMBO_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 487, // mPriority - &l_daObjTOMBO_Method, // sub_method - 0x000C0100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Tombo_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjTOMBO_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Tombo_e, + /* Actor SubMtd */ &l_daObjTOMBO_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_tornado.cpp b/src/d/actor/d_a_obj_tornado.cpp index 9f996ccab1..b7e8ce3725 100644 --- a/src/d/actor/d_a_obj_tornado.cpp +++ b/src/d/actor/d_a_obj_tornado.cpp @@ -227,18 +227,18 @@ static actor_method_class l_daObjTrnd_Method = { }; actor_process_profile_definition g_profile_Obj_Tornado = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Tornado, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjTrnd_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 444, // mPriority - &l_daObjTrnd_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Tornado_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjTrnd_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Tornado_e, + /* Actor SubMtd */ &l_daObjTrnd_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_tornado2.cpp b/src/d/actor/d_a_obj_tornado2.cpp index 460459fa32..4b9a8fe38e 100644 --- a/src/d/actor/d_a_obj_tornado2.cpp +++ b/src/d/actor/d_a_obj_tornado2.cpp @@ -399,18 +399,18 @@ static actor_method_class l_daObjTrnd2_Method = { }; actor_process_profile_definition g_profile_Obj_Tornado2 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Tornado2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjTrnd2_c), // mDefaultRadius - 0, // mDefaultRadiusOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 0x1BD, // mPriority - &l_daObjTrnd2_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Tornado2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjTrnd2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Tornado2_e, + /* Actor SubMtd */ &l_daObjTrnd2_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_tp.cpp b/src/d/actor/d_a_obj_tp.cpp index d899ef5c25..2690de3e04 100644 --- a/src/d/actor/d_a_obj_tp.cpp +++ b/src/d/actor/d_a_obj_tp.cpp @@ -72,7 +72,7 @@ static void anm_init(obj_tp_class* i_this, int param_2, f32 param_3, u8 param_4, } static void* s_tp_sub(void* param_1, void* param_2) { - if ((fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_OBJ_TP) && + if ((fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_OBJ_TP_e) && ((fopAc_ac_c*)param_1)->parentActorID == ((fopAc_ac_c*)param_2)->parentActorID && ((obj_tp_class*)param_2)->field_0x5a0 == ((obj_tp_class*)param_1)->field_0x59c) { @@ -457,7 +457,7 @@ static int daObj_Tp_Create(fopAc_ac_c* i_this) { } else { parameters |= (i + 1) << 4; } - fopAcM_createChild(PROC_OBJ_TP, fopAcM_GetID(tp), parameters, &cStack_28, + fopAcM_createChild(fpcNm_OBJ_TP_e, fopAcM_GetID(tp), parameters, &cStack_28, fopAcM_GetRoomNo(tp), &cStack_30, 0, -1, 0); } tp->field_0x5a4 = 1; @@ -499,18 +499,18 @@ static actor_method_class l_daObj_Tp_Method = { }; actor_process_profile_definition g_profile_OBJ_TP = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_TP, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_tp_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 59, // mPriority - &l_daObj_Tp_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_TP_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_tp_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_TP_e, + /* Actor SubMtd */ &l_daObj_Tp_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_treesh.cpp b/src/d/actor/d_a_obj_treesh.cpp index 29cd0a83af..dea5b1ed78 100644 --- a/src/d/actor/d_a_obj_treesh.cpp +++ b/src/d/actor/d_a_obj_treesh.cpp @@ -160,18 +160,18 @@ static actor_method_class daTreeSh_METHODS = { }; actor_process_profile_definition g_profile_TREESH = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_TREESH, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTreeSh_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 431, // mPriority - &daTreeSh_METHODS, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TREESH_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTreeSh_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TREESH_e, + /* Actor SubMtd */ &daTreeSh_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_twGate.cpp b/src/d/actor/d_a_obj_twGate.cpp index 11eeecaccc..1003f97a7e 100644 --- a/src/d/actor/d_a_obj_twGate.cpp +++ b/src/d/actor/d_a_obj_twGate.cpp @@ -231,18 +231,18 @@ static actor_method_class l_daTwGate_Method = { }; actor_process_profile_definition g_profile_Obj_TwGate = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_TwGate, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTwGate_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 539, // mPriority - &l_daTwGate_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_TwGate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTwGate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_TwGate_e, + /* Actor SubMtd */ &l_daTwGate_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_udoor.cpp b/src/d/actor/d_a_obj_udoor.cpp index ed1ea90cf8..ea4f79adfc 100644 --- a/src/d/actor/d_a_obj_udoor.cpp +++ b/src/d/actor/d_a_obj_udoor.cpp @@ -165,18 +165,18 @@ static actor_method_class l_daObj_Udoor_Method = { }; actor_process_profile_definition g_profile_OBJ_UDOOR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_UDOOR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_udoor_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 77, // mPriority - &l_daObj_Udoor_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_UDOOR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_udoor_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_UDOOR_e, + /* Actor SubMtd */ &l_daObj_Udoor_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_usaku.cpp b/src/d/actor/d_a_obj_usaku.cpp index a91a7c9fa6..07561ec0a3 100644 --- a/src/d/actor/d_a_obj_usaku.cpp +++ b/src/d/actor/d_a_obj_usaku.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_usaku.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static int daObj_Usaku_Draw(obj_usaku_class* i_this) { fopAc_ac_c* a_this = static_cast(i_this); @@ -117,18 +117,18 @@ static actor_method_class l_daObj_Usaku_Method = { }; actor_process_profile_definition g_profile_OBJ_USAKU = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_OBJ_USAKU, - &g_fpcLf_Method.base, - sizeof(obj_usaku_class), - 0, - 0, - &g_fopAc_Method.base, - 78, - &l_daObj_Usaku_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_USAKU_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_usaku_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_USAKU_e, + /* Actor SubMtd */ &l_daObj_Usaku_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_vground.cpp b/src/d/actor/d_a_obj_vground.cpp index 7c4ece9e07..9041b3da92 100644 --- a/src/d/actor/d_a_obj_vground.cpp +++ b/src/d/actor/d_a_obj_vground.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_vground.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static int CheckCreateHeap(fopAc_ac_c* a_this) { daObjVGnd_c* i_this = static_cast(a_this); @@ -137,18 +137,18 @@ static actor_method_class l_daObjVGnd_Method = { }; actor_process_profile_definition g_profile_Obj_VolcGnd = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_VolcGnd, - &g_fpcLf_Method.base, - sizeof(daObjVGnd_c), - 0, - 0, - &g_fopAc_Method.base, - 595, - &l_daObjVGnd_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_VolcGnd_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjVGnd_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_VolcGnd_e, + /* Actor SubMtd */ &l_daObjVGnd_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_volcball.cpp b/src/d/actor/d_a_obj_volcball.cpp index 6c02a2311b..0997d36900 100644 --- a/src/d/actor/d_a_obj_volcball.cpp +++ b/src/d/actor/d_a_obj_volcball.cpp @@ -36,7 +36,7 @@ static int CheckCreateHeap(fopAc_ac_c* i_this) { static void* search_big_volc(void* i_actor, void*) { if (i_actor != NULL && fopAcM_IsActor(i_actor) && - fopAcM_GetProfName(i_actor) == PROC_Obj_VolcanicBomb) + fopAcM_GetProfName(i_actor) == fpcNm_Obj_VolcanicBomb_e) { return i_actor; } @@ -613,18 +613,18 @@ static actor_method_class l_daObjVolcBall_Method = { }; actor_process_profile_definition g_profile_Obj_VolcanicBall = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_VolcanicBall, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjVolcBall_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 593, // mPriority - &l_daObjVolcBall_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_VolcanicBall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjVolcBall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_VolcanicBall_e, + /* Actor SubMtd */ &l_daObjVolcBall_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_volcbom.cpp b/src/d/actor/d_a_obj_volcbom.cpp index 66669a8e76..6399071bfe 100644 --- a/src/d/actor/d_a_obj_volcbom.cpp +++ b/src/d/actor/d_a_obj_volcbom.cpp @@ -884,18 +884,18 @@ static actor_method_class daObjVolcBom_METHODS = { }; actor_process_profile_definition g_profile_Obj_VolcanicBomb = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_VolcanicBomb, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjVolcBom_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 594, // mPriority - &daObjVolcBom_METHODS, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_VolcanicBomb_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjVolcBom_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_VolcanicBomb_e, + /* Actor SubMtd */ &daObjVolcBom_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_warp_kbrg.cpp b/src/d/actor/d_a_obj_warp_kbrg.cpp index d1d28a4faf..246bad9686 100644 --- a/src/d/actor/d_a_obj_warp_kbrg.cpp +++ b/src/d/actor/d_a_obj_warp_kbrg.cpp @@ -824,18 +824,18 @@ static actor_method_class daObjWarpKBrg_METHODS = { }; actor_process_profile_definition g_profile_Obj_KakarikoBrg = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_KakarikoBrg, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjWarpKBrg_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 530, // mPriority - &daObjWarpKBrg_METHODS, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_KakarikoBrg_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjWarpKBrg_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_KakarikoBrg_e, + /* Actor SubMtd */ &daObjWarpKBrg_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_warp_obrg.cpp b/src/d/actor/d_a_obj_warp_obrg.cpp index 4b7a88188b..65662d37c0 100644 --- a/src/d/actor/d_a_obj_warp_obrg.cpp +++ b/src/d/actor/d_a_obj_warp_obrg.cpp @@ -600,18 +600,18 @@ static actor_method_class daObjWarpOBrg_METHODS = { }; actor_process_profile_definition g_profile_Obj_OrdinBrg = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_OrdinBrg, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjWarpOBrg_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 531, // mPriority - &daObjWarpOBrg_METHODS, // sub_method - 0x00040000, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_OrdinBrg_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjWarpOBrg_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_OrdinBrg_e, + /* Actor SubMtd */ &daObjWarpOBrg_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_waterGate.cpp b/src/d/actor/d_a_obj_waterGate.cpp index e20204e937..2f2b623dd1 100644 --- a/src/d/actor/d_a_obj_waterGate.cpp +++ b/src/d/actor/d_a_obj_waterGate.cpp @@ -215,18 +215,18 @@ static actor_method_class l_daWtGate_Method = { }; actor_process_profile_definition g_profile_Obj_WtGate = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_WtGate, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daWtGate_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 522, // mPriority - &l_daWtGate_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_WtGate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daWtGate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_WtGate_e, + /* Actor SubMtd */ &l_daWtGate_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_waterPillar.cpp b/src/d/actor/d_a_obj_waterPillar.cpp index fc4d80e8ec..67d454bc9a 100644 --- a/src/d/actor/d_a_obj_waterPillar.cpp +++ b/src/d/actor/d_a_obj_waterPillar.cpp @@ -703,18 +703,18 @@ actor_method_class l_daWtPillar_Method = { }; actor_process_profile_definition g_profile_Obj_WaterPillar = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_WaterPillar, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daWtPillar_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 520, // mPriority - &l_daWtPillar_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_WaterPillar_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daWtPillar_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_WaterPillar_e, + /* Actor SubMtd */ &l_daWtPillar_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_waterfall.cpp b/src/d/actor/d_a_obj_waterfall.cpp index b91a03311e..851e95080f 100644 --- a/src/d/actor/d_a_obj_waterfall.cpp +++ b/src/d/actor/d_a_obj_waterfall.cpp @@ -116,7 +116,7 @@ static void* s_b_sub(void* param_0, void* unused) { static void* s_a_sub(void* param_0, void* unused) { UNUSED(unused); - if(fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_ARROW) { + if(fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == fpcNm_ARROW_e) { if(target_info_count < MAX_TARGET_INFO_COUNT) { target_info[target_info_count] = static_cast(param_0); target_info_count++; @@ -400,18 +400,18 @@ static actor_method_class l_daObjWaterFall_Method = { }; actor_process_profile_definition g_profile_Obj_WaterFall = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_WaterFall, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjWaterFall_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 543, // mPriority - &l_daObjWaterFall_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_WaterFall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjWaterFall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_WaterFall_e, + /* Actor SubMtd */ &l_daObjWaterFall_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_wchain.cpp b/src/d/actor/d_a_obj_wchain.cpp index f7c736fee9..92cb2048e5 100644 --- a/src/d/actor/d_a_obj_wchain.cpp +++ b/src/d/actor/d_a_obj_wchain.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_wchain.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "SSystem/SComponent/c_math.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "JSystem/J3DGraphBase/J3DDrawBuffer.h" @@ -384,18 +384,18 @@ static actor_method_class l_daObjWchain_Method = { }; actor_process_profile_definition g_profile_Obj_Wchain = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Wchain, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjWchain_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 247, // mPriority - &l_daObjWchain_Method, // sub_method - 0x00060100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Wchain_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjWchain_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Wchain_e, + /* Actor SubMtd */ &l_daObjWchain_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_wdStick.cpp b/src/d/actor/d_a_obj_wdStick.cpp index be060df460..d26f3aae4b 100644 --- a/src/d/actor/d_a_obj_wdStick.cpp +++ b/src/d/actor/d_a_obj_wdStick.cpp @@ -508,18 +508,18 @@ static actor_method_class l_daWdStick_Method = { }; actor_process_profile_definition g_profile_Obj_WdStick = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_WdStick, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daWdStick_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 497, // mPriority - &l_daWdStick_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_WdStick_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daWdStick_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_WdStick_e, + /* Actor SubMtd */ &l_daWdStick_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_web0.cpp b/src/d/actor/d_a_obj_web0.cpp index 128f53aee1..2ad9351ee6 100644 --- a/src/d/actor/d_a_obj_web0.cpp +++ b/src/d/actor/d_a_obj_web0.cpp @@ -287,18 +287,18 @@ static actor_method_class l_daObj_Web0_Method = { }; actor_process_profile_definition g_profile_OBJ_WEB0 = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_OBJ_WEB0, - &g_fpcLf_Method.base, - sizeof(obj_web0_class), - 0, - 0, - &g_fopAc_Method.base, - 47, - &l_daObj_Web0_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_WEB0_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_web0_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_WEB0_e, + /* Actor SubMtd */ &l_daObj_Web0_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_web1.cpp b/src/d/actor/d_a_obj_web1.cpp index 20cd899aea..104191ad1b 100644 --- a/src/d/actor/d_a_obj_web1.cpp +++ b/src/d/actor/d_a_obj_web1.cpp @@ -9,7 +9,7 @@ #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" #include "d/d_bg_w.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_actor_mng.h" daObj_Web1_HIO_c::daObj_Web1_HIO_c() { @@ -33,7 +33,7 @@ static void ride_call_back(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_actor) _this->mDistToActor = JMAFastSqrt((x_diff * x_diff) + (z_diff * z_diff)); if (_this->mDistToActor < 140.0f) { - if (fopAcM_GetName(i_actor) == PROC_ALINK || fopAcM_GetName(i_actor) == PROC_ALINK) { + if (fopAcM_GetName(i_actor) == fpcNm_ALINK_e || fopAcM_GetName(i_actor) == fpcNm_ALINK_e) { if (_this->field_0x5aa == 0) { _this->mReboundTimer = 60; } @@ -43,7 +43,7 @@ static void ride_call_back(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_actor) } else { _this->field_0x5aa = 6; } - } else if (fopAcM_GetName(i_actor) == PROC_OBJ_GM) { + } else if (fopAcM_GetName(i_actor) == fpcNm_OBJ_GM_e) { _this->field_0x5aa = 120; } else { _this->field_0x5aa = 3; @@ -316,18 +316,18 @@ static actor_method_class l_daObj_Web1_Method = { }; actor_process_profile_definition g_profile_OBJ_WEB1 = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_OBJ_WEB1, - &g_fpcLf_Method.base, - sizeof(obj_web1_class), - 0, - 0, - &g_fopAc_Method.base, - 48, - &l_daObj_Web1_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_WEB1_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_web1_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_WEB1_e, + /* Actor SubMtd */ &l_daObj_Web1_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_well_cover.cpp b/src/d/actor/d_a_obj_well_cover.cpp index a39b7d73f3..34b5253978 100644 --- a/src/d/actor/d_a_obj_well_cover.cpp +++ b/src/d/actor/d_a_obj_well_cover.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_well_cover.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/actor/d_a_player.h" void daObjWCover_c::initBaseMtx() { @@ -147,18 +147,18 @@ static actor_method_class l_daObjWCover_Method = { }; actor_process_profile_definition g_profile_Obj_WellCover = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_WellCover, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjWCover_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 0x25E, // mPriority - &l_daObjWCover_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_WellCover_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjWCover_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_WellCover_e, + /* Actor SubMtd */ &l_daObjWCover_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_wflag.cpp b/src/d/actor/d_a_obj_wflag.cpp index 9bfe15abb1..abf45cb0c3 100644 --- a/src/d/actor/d_a_obj_wflag.cpp +++ b/src/d/actor/d_a_obj_wflag.cpp @@ -215,18 +215,18 @@ static actor_method_class l_daObj_Wflag_Method = { }; actor_process_profile_definition g_profile_OBJ_WFLAG = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_WFLAG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_wflag_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 53, // mPriority - &l_daObj_Wflag_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_WFLAG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_wflag_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_WFLAG_e, + /* Actor SubMtd */ &l_daObj_Wflag_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_wind_stone.cpp b/src/d/actor/d_a_obj_wind_stone.cpp index dfa67bab1a..3158b93848 100644 --- a/src/d/actor/d_a_obj_wind_stone.cpp +++ b/src/d/actor/d_a_obj_wind_stone.cpp @@ -248,18 +248,18 @@ static actor_method_class daWindStone_METHODS = { }; actor_process_profile_definition g_profile_Obj_WindStone = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_WindStone, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daWindStone_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 732, // mPriority - &daWindStone_METHODS, // sub_method - 0x40100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_WindStone_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daWindStone_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_WindStone_e, + /* Actor SubMtd */ &daWindStone_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_window.cpp b/src/d/actor/d_a_obj_window.cpp index e51f4f55a2..3b6f258942 100644 --- a/src/d/actor/d_a_obj_window.cpp +++ b/src/d/actor/d_a_obj_window.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_window.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static char* l_arcName = "J_KazeD"; @@ -178,18 +178,18 @@ static actor_method_class daObjWindow_METHODS = { }; actor_process_profile_definition g_profile_Obj_Window = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Window, - &g_fpcLf_Method.base, - sizeof(daObjWindow_c), - 0, - 0, - &g_fopAc_Method.base, - 0x1EB, - &daObjWindow_METHODS, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Window_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjWindow_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Window_e, + /* Actor SubMtd */ &daObjWindow_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_wood_pendulum.cpp b/src/d/actor/d_a_obj_wood_pendulum.cpp index b762f6d1ce..b01504b480 100644 --- a/src/d/actor/d_a_obj_wood_pendulum.cpp +++ b/src/d/actor/d_a_obj_wood_pendulum.cpp @@ -169,18 +169,18 @@ static actor_method_class l_daObjWPndlm_Method = { }; actor_process_profile_definition g_profile_Obj_WoodPendulum = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_WoodPendulum, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjWPndlm_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 253, // mPriority - &l_daObjWPndlm_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_WoodPendulum_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjWPndlm_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_WoodPendulum_e, + /* Actor SubMtd */ &l_daObjWPndlm_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_wood_statue.cpp b/src/d/actor/d_a_obj_wood_statue.cpp index 23bcad36f7..208ccd2729 100644 --- a/src/d/actor/d_a_obj_wood_statue.cpp +++ b/src/d/actor/d_a_obj_wood_statue.cpp @@ -103,7 +103,7 @@ static void lifeGetCoCallBack(fopAc_ac_c* i_this, dCcD_GObjInf* param_2, fopAc_a static void* s_sh_sub(void* param_1, void* param_2) { UNUSED(param_2); - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_E_SH) { + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_E_SH_e) { return param_1; } return NULL; @@ -158,7 +158,7 @@ int daObjWStatue_c::__CreateHeap() { int daObjWStatue_c::create() { fopAcM_ct(this, daObjWStatue_c); - m_itemNo = fpcNm_ITEM_WOOD_STATUE; + m_itemNo = dItemNo_WOOD_STATUE_e; if (fopAcM_isSwitch(this, getSwbit2())) { return cPhs_ERROR_e; } @@ -338,7 +338,7 @@ int daObjWStatue_c::actionInitBoomerangCarry() { } int daObjWStatue_c::actionBoomerangCarry() { - fopAc_ac_c* boomerang = fopAcM_SearchByName(PROC_BOOMERANG); + fopAc_ac_c* boomerang = fopAcM_SearchByName(fpcNm_BOOMERANG_e); if (boomerang != NULL) { current.pos = boomerang->current.pos; } else { @@ -485,18 +485,18 @@ static actor_method_class l_daObjWStatue_Method = { }; actor_process_profile_definition g_profile_Obj_WoodStatue = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_WoodStatue, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjWStatue_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 563, // mPriority - &l_daObjWStatue_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_WoodStatue_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjWStatue_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_WoodStatue_e, + /* Actor SubMtd */ &l_daObjWStatue_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_wsword.cpp b/src/d/actor/d_a_obj_wsword.cpp index 97f9272470..8598371674 100644 --- a/src/d/actor/d_a_obj_wsword.cpp +++ b/src/d/actor/d_a_obj_wsword.cpp @@ -115,18 +115,18 @@ static actor_method_class l_daObjWSword_Method = { }; actor_process_profile_definition g_profile_Obj_WoodenSword = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_WoodenSword, - &g_fpcLf_Method.base, - sizeof(daObjWSword_c), - 0, - 0, - &g_fopAc_Method.base, - 0x20F, - &l_daObjWSword_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_WoodenSword_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjWSword_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_WoodenSword_e, + /* Actor SubMtd */ &l_daObjWSword_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_yel_bag.cpp b/src/d/actor/d_a_obj_yel_bag.cpp index 7978853190..a4ddd1ee60 100644 --- a/src/d/actor/d_a_obj_yel_bag.cpp +++ b/src/d/actor/d_a_obj_yel_bag.cpp @@ -543,20 +543,20 @@ static actor_method_class daObj_YBag_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_YBAG = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_YBAG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_YBag_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 715, // mPriority - &daObj_YBag_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_YBAG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_YBag_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_YBAG_e, + /* Actor SubMtd */ &daObj_YBag_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_obj_yobikusa.cpp b/src/d/actor/d_a_obj_yobikusa.cpp index bfe75c439e..a880f28a45 100644 --- a/src/d/actor/d_a_obj_yobikusa.cpp +++ b/src/d/actor/d_a_obj_yobikusa.cpp @@ -335,7 +335,7 @@ int daObjYobikusa_c::execute() { (!dComIfGp_event_runCheck() || eventInfo.checkCommandTalk()))) { mpActiveModel = mpModelTypeA; - fopAcM_OnStatus(this, 0x80); + fopAcM_OnStatus(this, fopAcStts_NOEXEC_e); } else { return TRUE; } @@ -344,7 +344,7 @@ int daObjYobikusa_c::execute() { if (mCcCyl.ChkTgHit()) { mpActiveModel = mpModelTypeB; - fopAcM_OffStatus(this, 0x80); + fopAcM_OffStatus(this, fopAcStts_NOEXEC_e); cLib_offBit(attention_info.flags, fopAc_AttnFlag_CARRY_e); if (getType() == CALL_TYPE_FLY) { @@ -419,18 +419,18 @@ static actor_method_class l_daObjYobikusa_Method = { }; actor_process_profile_definition g_profile_Obj_Yobikusa = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Yobikusa, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjYobikusa_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 29, // mPriority - &l_daObjYobikusa_Method, // sub_method - 0x40180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Yobikusa_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjYobikusa_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Yobikusa_e, + /* Actor SubMtd */ &l_daObjYobikusa_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_yousei.cpp b/src/d/actor/d_a_obj_yousei.cpp index 68c16b5271..7bd087157a 100644 --- a/src/d/actor/d_a_obj_yousei.cpp +++ b/src/d/actor/d_a_obj_yousei.cpp @@ -93,7 +93,7 @@ void daObjYOUSEI_c::MoveAction() { break; case 1: if (field_0x5d6 == 100 && mPrm != 0) { - execItemGet(fpcNm_ITEM_RECOVERY_FAILY); + execItemGet(dItemNo_RECOVERY_FAILY_e); } f32 var_f31 = (25.0f + yREG_F(16)) / field_0x5d6; @@ -372,7 +372,7 @@ void daObjYOUSEI_c::WaitAction() { data_804D1830 = 0; fopAcM_delete(this); } else { - dComIfGp_att_CatchRequest(this, fpcNm_ITEM_FAIRY, 150.0f, 50.0f, -100.0f, 0x5000, 1); + dComIfGp_att_CatchRequest(this, dItemNo_FAIRY_e, 150.0f, 50.0f, -100.0f, 0x5000, 1); eventInfo.onCondition(0x40); } @@ -530,7 +530,7 @@ void daObjYOUSEI_c::LinkAction() { data_804D1830 = 0; fopAcM_delete(this); } else { - dComIfGp_att_CatchRequest(this, fpcNm_ITEM_FAIRY, 150.0f, 50.0f, -100.0f, 0x5000, 1); + dComIfGp_att_CatchRequest(this, dItemNo_FAIRY_e, 150.0f, 50.0f, -100.0f, 0x5000, 1); eventInfo.onCondition(0x40); } @@ -833,7 +833,7 @@ int daObjYOUSEI_c::create() { mSound.init(¤t.pos, &eyePos, 3, 1); if (mPrm == 0) { - execItemGet(fpcNm_ITEM_RECOVERY_FAILY); + execItemGet(dItemNo_RECOVERY_FAILY_e); CareAction(); scale.set(0.2f, 0.2f, 0.2f); } else { @@ -860,20 +860,20 @@ static actor_method_class l_daObjYOUSEI_Method = { }; actor_process_profile_definition g_profile_Obj_Yousei = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Yousei, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjYOUSEI_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 475, // mPriority - &l_daObjYOUSEI_Method, // sub_method - 0x000C0100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Yousei_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjYOUSEI_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Yousei_e, + /* Actor SubMtd */ &l_daObjYOUSEI_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_obj_ystone.cpp b/src/d/actor/d_a_obj_ystone.cpp index e3d8465aca..50f751d987 100644 --- a/src/d/actor/d_a_obj_ystone.cpp +++ b/src/d/actor/d_a_obj_ystone.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_ystone.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include static char const* l_arcName[7] = { @@ -293,18 +293,18 @@ static actor_method_class l_daObj_Ystone_Method = { }; actor_process_profile_definition g_profile_OBJ_YSTONE = { - fpcLy_CURRENT_e, - 8, - fpcPi_CURRENT_e, - PROC_OBJ_YSTONE, - &g_fpcLf_Method.base, - sizeof(obj_ystone_class), - 0, - 0, - &g_fopAc_Method.base, - 0x259, - &l_daObj_Ystone_Method, - 0x44100, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_YSTONE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_ystone_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_YSTONE_e, + /* Actor SubMtd */ &l_daObj_Ystone_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_zcloth.cpp b/src/d/actor/d_a_obj_zcloth.cpp index 363ebe28ab..c2eb40be00 100644 --- a/src/d/actor/d_a_obj_zcloth.cpp +++ b/src/d/actor/d_a_obj_zcloth.cpp @@ -9,7 +9,7 @@ #include "d/d_com_inf_game.h" #include "d/d_item_data.h" #include "d/d_a_itembase_static.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" void daObjZCloth_c::initBaseMtx() { mpModel->setBaseScale(scale); @@ -87,18 +87,18 @@ static actor_method_class l_daObjZCloth_Method = { }; actor_process_profile_definition g_profile_Obj_ZoraCloth = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_ZoraCloth, - &g_fpcLf_Method.base, - sizeof(daObjZCloth_c), - 0, - 0, - &g_fopAc_Method.base, - 0x220, - &l_daObjZCloth_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_ZoraCloth_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjZCloth_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_ZoraCloth_e, + /* Actor SubMtd */ &l_daObjZCloth_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_zdoor.cpp b/src/d/actor/d_a_obj_zdoor.cpp index 9c57124eca..5787a6f7b8 100644 --- a/src/d/actor/d_a_obj_zdoor.cpp +++ b/src/d/actor/d_a_obj_zdoor.cpp @@ -386,18 +386,18 @@ static actor_method_class daZdoor_METHODS = { }; actor_process_profile_definition g_profile_Obj_ZDoor = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_ZDoor, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daZdoor_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 24, // mPriority - &daZdoor_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_ZDoor_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daZdoor_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_ZDoor_e, + /* Actor SubMtd */ &daZdoor_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_zrTurara.cpp b/src/d/actor/d_a_obj_zrTurara.cpp index 0cb710e4a1..956508f375 100644 --- a/src/d/actor/d_a_obj_zrTurara.cpp +++ b/src/d/actor/d_a_obj_zrTurara.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_zrTurara.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "SSystem/SComponent/c_math.h" daZrTurara_HIO_c::daZrTurara_HIO_c() { @@ -193,7 +193,7 @@ void daZrTurara_c::modeBreak() { pos.y -= 200.0f; pos.x += l_HIO.mDebrisRange * cM_rndFX(1.0f); pos.y += l_HIO.mDebrisRange * cM_rndFX(1.0f); - fopAcM_create(PROC_Obj_zrTuraraRc, getScale(), &pos, + fopAcM_create(fpcNm_Obj_zrTuraraRc_e, getScale(), &pos, fopAcM_GetRoomNo(this), NULL, NULL, 0xff); mDebrisCount++; mBreakTimer = cM_rndF(1.0f) * 20.0f; @@ -261,18 +261,18 @@ static actor_method_class l_daZrTurara_Method = { }; actor_process_profile_definition g_profile_Obj_zrTurara = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_zrTurara, - &g_fpcLf_Method.base, - sizeof(daZrTurara_c), - 0, - 0, - &g_fopAc_Method.base, - 0x28C, - &l_daZrTurara_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_zrTurara_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daZrTurara_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_zrTurara_e, + /* Actor SubMtd */ &l_daZrTurara_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_zrTuraraRock.cpp b/src/d/actor/d_a_obj_zrTuraraRock.cpp index b4706929da..cf004c7339 100644 --- a/src/d/actor/d_a_obj_zrTuraraRock.cpp +++ b/src/d/actor/d_a_obj_zrTuraraRock.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_zrTuraraRock.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static daZrTuraRc_HIO_c l_HIO; @@ -178,18 +178,18 @@ static actor_method_class l_daZrTuraRc_Method = { }; actor_process_profile_definition g_profile_Obj_zrTuraraRc = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_zrTuraraRc, - &g_fpcLf_Method.base, - sizeof(daZrTuraRc_c), - 0, - 0, - &g_fopAc_Method.base, - 0x28D, - &l_daZrTuraRc_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_zrTuraraRc_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daZrTuraRc_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_zrTuraraRc_e, + /* Actor SubMtd */ &l_daZrTuraRc_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_zraMark.cpp b/src/d/actor/d_a_obj_zraMark.cpp index 1519380276..81332dad8c 100644 --- a/src/d/actor/d_a_obj_zraMark.cpp +++ b/src/d/actor/d_a_obj_zraMark.cpp @@ -300,7 +300,7 @@ void daObjZraMark_c::col_set() { daNpc_Hoz_c* daObjZraMark_c::schHoz() { fopAc_ac_c* hoz = NULL; - if (fopAcM_SearchByName(PROC_NPC_HOZ, &hoz) && hoz != NULL) { + if (fopAcM_SearchByName(fpcNm_NPC_HOZ_e, &hoz) && hoz != NULL) { return (daNpc_Hoz_c*)hoz; } @@ -321,7 +321,7 @@ void daObjZraMark_c::informBlast() { if (field_0x72c != 0) { for (int i = 0; i < field_0x72c; i++) { fopAc_ac_c* actorp = mActorMngr[i].getActorP(); - if (actorp != NULL && fopAcM_GetName(actorp) == PROC_NPC_ZRA) { + if (actorp != NULL && fopAcM_GetName(actorp) == fpcNm_NPC_ZRA_e) { ((daNpc_zrA_c*)actorp)->setBlastFlag(1); } } @@ -538,18 +538,18 @@ static actor_method_class l_daObjZraMark_Method = { }; actor_process_profile_definition g_profile_ZRA_MARK = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_ZRA_MARK, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjZraMark_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 392, // mPriority - &l_daObjZraMark_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ZRA_MARK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjZraMark_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_ZRA_MARK_e, + /* Actor SubMtd */ &l_daObjZraMark_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_zra_freeze.cpp b/src/d/actor/d_a_obj_zra_freeze.cpp index 9c0ed17e93..1525bdb572 100644 --- a/src/d/actor/d_a_obj_zra_freeze.cpp +++ b/src/d/actor/d_a_obj_zra_freeze.cpp @@ -10,7 +10,7 @@ #include "m_Do/m_Do_lib.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static char* l_arcName = "zrF"; @@ -200,18 +200,18 @@ static actor_method_class l_daZraFreeze_Method = { }; actor_process_profile_definition g_profile_OBJ_ZRAFREEZE = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_OBJ_ZRAFREEZE, - &g_fpcLf_Method.base, - sizeof(daZraFreeze_c), - 0, - 0, - &g_fopAc_Method.base, - 0x184, - &l_daZraFreeze_Method, - 0x44100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_ZRAFREEZE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daZraFreeze_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_ZRAFREEZE_e, + /* Actor SubMtd */ &l_daZraFreeze_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_zra_rock.cpp b/src/d/actor/d_a_obj_zra_rock.cpp index 91eea51192..df8b9333a7 100644 --- a/src/d/actor/d_a_obj_zra_rock.cpp +++ b/src/d/actor/d_a_obj_zra_rock.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_zra_rock.h" #include "d/d_com_inf_game.h" #include "d/d_bg_w.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static char const* l_arcName = "H_ZraRock"; @@ -150,18 +150,18 @@ static actor_method_class l_daObjZraRock_Method = { }; actor_process_profile_definition g_profile_Obj_ZraRock = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_ZraRock, - &g_fpcLf_Method.base, - sizeof(daObjZraRock_c), - 0, - 0, - &g_fopAc_Method.base, - 0x260, - &l_daObjZraRock_Method, - 0x44100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_ZraRock_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjZraRock_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_ZraRock_e, + /* Actor SubMtd */ &l_daObjZraRock_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_passer_mng.cpp b/src/d/actor/d_a_passer_mng.cpp index d52b4d294e..51eb0d1894 100644 --- a/src/d/actor/d_a_passer_mng.cpp +++ b/src/d/actor/d_a_passer_mng.cpp @@ -518,7 +518,7 @@ int daPasserMng_c::create() { } void daPasserMng_c::create_init() { - npcId = getDetailLevel() == 0 ? PROC_NPC_PASSER : PROC_NPC_PASSER2; + npcId = getDetailLevel() == 0 ? fpcNm_NPC_PASSER_e : fpcNm_NPC_PASSER2_e; mPath = dPath_GetRoomPath(getPathID(), fopAcM_GetHomeRoomNo(this)); JUT_ASSERT(542, mPath != NULL); dPnt* pnt0 = dPath_GetPnt(mPath, 0); @@ -602,18 +602,18 @@ static actor_method_class l_daPasserMng_Method = { }; actor_process_profile_definition g_profile_PASSER_MNG = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_PASSER_MNG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daPasserMng_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 405, // mPriority - &l_daPasserMng_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_PASSER_MNG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daPasserMng_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_PASSER_MNG_e, + /* Actor SubMtd */ &l_daPasserMng_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_path_line.cpp b/src/d/actor/d_a_path_line.cpp index 3a4cc4ef60..23048b4e87 100644 --- a/src/d/actor/d_a_path_line.cpp +++ b/src/d/actor/d_a_path_line.cpp @@ -9,19 +9,19 @@ #include "f_op/f_op_actor_mng.h" actor_process_profile_definition2 g_profile_PATH_LINE = { - fpcLy_CURRENT_e, // mLayerID - 9, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_PATH_LINE, // mProcName - &g_fpcLf_Method.base, // sub_method - 0x00000574, // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 758, // mPriority - NULL, // sub_method - 0x00060000, // mStatus - fopAc_UNK_GROUP_5_e, // mActorType - fopAc_CULLBOX_0_e, // cullType - 0 // field_0x30 + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 9, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_PATH_LINE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ 0x00000574, + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_PATH_LINE_e, + /* Actor SubMtd */ NULL, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_0_e, + /* Unknown */ 0 // field_0x30, }; diff --git a/src/d/actor/d_a_peru.cpp b/src/d/actor/d_a_peru.cpp index 399dcb850d..ea3c104b66 100644 --- a/src/d/actor/d_a_peru.cpp +++ b/src/d/actor/d_a_peru.cpp @@ -402,7 +402,7 @@ void daPeru_c::srchActors() { if (mActors[1].getActorP() == NULL) { fopAc_ac_c* local_18 = NULL; - if (fopAcM_SearchByName(PROC_Obj_CatDoor, &local_18) != 0) { + if (fopAcM_SearchByName(fpcNm_Obj_CatDoor_e, &local_18) != 0) { mActors[1].entry(local_18); } } @@ -1008,7 +1008,7 @@ int daPeru_c::_cutAppear_Init(int const& param_1) { { mFaceMotionSeqMngr.setNo(2, -1.0f, 0, 0); fopAc_ac_c* midna = NULL; - if (fopAcM_SearchByName(PROC_MIDNA, &midna) != 0) { + if (fopAcM_SearchByName(fpcNm_MIDNA_e, &midna) != 0) { if (midna == NULL) { OS_REPORT("---- there is no midna!!\n"); JUT_ASSERT(2446, FALSE); @@ -1269,18 +1269,18 @@ static actor_method_class daPeru_MethodTable = { }; actor_process_profile_definition g_profile_PERU = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_PERU, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daPeru_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 694, // mPriority - &daPeru_MethodTable, // sub_method - 0x08044108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_PERU_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daPeru_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_PERU_e, + /* Actor SubMtd */ &daPeru_MethodTable, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_player.cpp b/src/d/actor/d_a_player.cpp index 7790ba93b7..e5034369c1 100644 --- a/src/d/actor/d_a_player.cpp +++ b/src/d/actor/d_a_player.cpp @@ -133,61 +133,61 @@ u32 daPy_py_c::setParamData(int i_roomNo, int i_mode, int param_2, int param_3) } BOOL daPy_py_c::checkFishingRodItem(int i_itemNo) { - return i_itemNo == fpcNm_ITEM_FISHING_ROD_1 || (i_itemNo >= fpcNm_ITEM_BEE_ROD && i_itemNo <= fpcNm_ITEM_JEWEL_WORM_ROD); + return i_itemNo == dItemNo_FISHING_ROD_1_e || (i_itemNo >= dItemNo_BEE_ROD_e && i_itemNo <= dItemNo_JEWEL_WORM_ROD_e); } BOOL daPy_py_c::checkBombItem(int i_itemNo) { - return i_itemNo == fpcNm_ITEM_NORMAL_BOMB || i_itemNo == fpcNm_ITEM_WATER_BOMB || i_itemNo == fpcNm_ITEM_POKE_BOMB; + return i_itemNo == dItemNo_NORMAL_BOMB_e || i_itemNo == dItemNo_WATER_BOMB_e || i_itemNo == dItemNo_POKE_BOMB_e; } BOOL daPy_py_c::checkBottleItem(int i_itemNo) { - return (i_itemNo >= fpcNm_ITEM_EMPTY_BOTTLE && i_itemNo <= fpcNm_ITEM_FAIRY) - || i_itemNo == fpcNm_ITEM_BEE_CHILD - || i_itemNo == fpcNm_ITEM_WORM - || i_itemNo == fpcNm_ITEM_FAIRY_DROP - || i_itemNo == fpcNm_ITEM_CHUCHU_BLACK - || (i_itemNo >= fpcNm_ITEM_CHUCHU_RARE && i_itemNo <= fpcNm_ITEM_LV3_SOUP); + return (i_itemNo >= dItemNo_EMPTY_BOTTLE_e && i_itemNo <= dItemNo_FAIRY_e) + || i_itemNo == dItemNo_BEE_CHILD_e + || i_itemNo == dItemNo_WORM_e + || i_itemNo == dItemNo_FAIRY_DROP_e + || i_itemNo == dItemNo_CHUCHU_BLACK_e + || (i_itemNo >= dItemNo_CHUCHU_RARE_e && i_itemNo <= dItemNo_LV3_SOUP_e); } BOOL daPy_py_c::checkDrinkBottleItem(int i_itemNo) { - return (i_itemNo >= fpcNm_ITEM_RED_BOTTLE && i_itemNo <= fpcNm_ITEM_HALF_MILK_BOTTLE) - || i_itemNo == fpcNm_ITEM_RED_BOTTLE_2 - || i_itemNo == fpcNm_ITEM_UGLY_SOUP - || i_itemNo == fpcNm_ITEM_HOT_SPRING - || i_itemNo == fpcNm_ITEM_BEE_CHILD - || i_itemNo == fpcNm_ITEM_CHUCHU_BLACK - || i_itemNo == fpcNm_ITEM_FAIRY_DROP - || (i_itemNo >= fpcNm_ITEM_CHUCHU_RARE && i_itemNo != fpcNm_ITEM_CHUCHU_YELLOW && i_itemNo <= fpcNm_ITEM_LV3_SOUP); + return (i_itemNo >= dItemNo_RED_BOTTLE_e && i_itemNo <= dItemNo_HALF_MILK_BOTTLE_e) + || i_itemNo == dItemNo_RED_BOTTLE_2_e + || i_itemNo == dItemNo_UGLY_SOUP_e + || i_itemNo == dItemNo_HOT_SPRING_e + || i_itemNo == dItemNo_BEE_CHILD_e + || i_itemNo == dItemNo_CHUCHU_BLACK_e + || i_itemNo == dItemNo_FAIRY_DROP_e + || (i_itemNo >= dItemNo_CHUCHU_RARE_e && i_itemNo != dItemNo_CHUCHU_YELLOW_e && i_itemNo <= dItemNo_LV3_SOUP_e); } BOOL daPy_py_c::checkOilBottleItem(int i_itemNo) { - return i_itemNo == fpcNm_ITEM_CHUCHU_YELLOW || i_itemNo == fpcNm_ITEM_OIL_BOTTLE_2 || i_itemNo == fpcNm_ITEM_OIL_BOTTLE; + return i_itemNo == dItemNo_CHUCHU_YELLOW_e || i_itemNo == dItemNo_OIL_BOTTLE_2_e || i_itemNo == dItemNo_OIL_BOTTLE_e; } BOOL daPy_py_c::checkOpenBottleItem(int i_itemNo) { - return i_itemNo == fpcNm_ITEM_WATER_BOTTLE || i_itemNo == fpcNm_ITEM_WORM || i_itemNo == fpcNm_ITEM_FAIRY; + return i_itemNo == dItemNo_WATER_BOTTLE_e || i_itemNo == dItemNo_WORM_e || i_itemNo == dItemNo_FAIRY_e; } BOOL daPy_py_c::checkBowItem(int i_itemNo) { - return i_itemNo == fpcNm_ITEM_BOW || i_itemNo == fpcNm_ITEM_BOMB_ARROW || i_itemNo == fpcNm_ITEM_HAWK_ARROW; + return i_itemNo == dItemNo_BOW_e || i_itemNo == dItemNo_BOMB_ARROW_e || i_itemNo == dItemNo_HAWK_ARROW_e; } BOOL daPy_py_c::checkHookshotItem(int i_itemNo) { - return i_itemNo == fpcNm_ITEM_HOOKSHOT || i_itemNo == fpcNm_ITEM_W_HOOKSHOT; + return i_itemNo == dItemNo_HOOKSHOT_e || i_itemNo == dItemNo_W_HOOKSHOT_e; } BOOL daPy_py_c::checkTradeItem(int i_itemNo) { - return (i_itemNo >= fpcNm_ITEM_LETTER && i_itemNo <= fpcNm_ITEM_IRIAS_PENDANT) - || i_itemNo == fpcNm_ITEM_ANCIENT_DOCUMENT - || i_itemNo == fpcNm_ITEM_AIR_LETTER - || i_itemNo == fpcNm_ITEM_ANCIENT_DOCUMENT2 - || 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_IRIAS_PENDANT_e) + || i_itemNo == dItemNo_ANCIENT_DOCUMENT_e + || i_itemNo == dItemNo_AIR_LETTER_e + || i_itemNo == dItemNo_ANCIENT_DOCUMENT2_e + || i_itemNo == dItemNo_RAFRELS_MEMO_e + || i_itemNo == dItemNo_TKS_LETTER_e + || i_itemNo == dItemNo_ASHS_SCRIBBLING_e; } BOOL daPy_py_c::checkDungeonWarpItem(int i_itemNo) { - return i_itemNo == fpcNm_ITEM_DUNGEON_EXIT || i_itemNo == fpcNm_ITEM_DUNGEON_BACK; + return i_itemNo == dItemNo_DUNGEON_EXIT_e || i_itemNo == dItemNo_DUNGEON_BACK_e; } void daPy_actorKeep_c::setActor() { @@ -410,12 +410,12 @@ void daPy_sightPacket_c::setSightImage(ResTIMG* i_img) { BOOL daPy_py_c::checkMasterSwordEquip() { u16 equipSword = dComIfGs_getSelectEquipSword(); - return equipSword == fpcNm_ITEM_MASTER_SWORD || equipSword == fpcNm_ITEM_LIGHT_SWORD; + return equipSword == dItemNo_MASTER_SWORD_e || equipSword == dItemNo_LIGHT_SWORD_e; } BOOL daPy_py_c::checkWoodShieldEquip() { u16 equipShield = dComIfGs_getSelectEquipShield(); - return equipShield == fpcNm_ITEM_WOOD_SHIELD || equipShield == fpcNm_ITEM_SHIELD; + return equipShield == dItemNo_WOOD_SHIELD_e || equipShield == dItemNo_SHIELD_e; } f32 daPy_py_c::getAttentionOffsetY() { diff --git a/src/d/actor/d_a_ppolamp.cpp b/src/d/actor/d_a_ppolamp.cpp index 7f479801b7..829712f23a 100644 --- a/src/d/actor/d_a_ppolamp.cpp +++ b/src/d/actor/d_a_ppolamp.cpp @@ -183,20 +183,20 @@ static actor_method_class daPPolamp_METHODS = { }; actor_process_profile_definition g_profile_PPolamp = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_PPolamp, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daPPolamp_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 727, // mPriority - &daPPolamp_METHODS, // sub_method - 0x00040180, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_12_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_PPolamp_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daPPolamp_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_PPolamp_e, + /* Actor SubMtd */ &daPPolamp_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_12_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_scene_exit.cpp b/src/d/actor/d_a_scene_exit.cpp index 80c3a11f21..ce328480d8 100644 --- a/src/d/actor/d_a_scene_exit.cpp +++ b/src/d/actor/d_a_scene_exit.cpp @@ -105,19 +105,19 @@ static actor_method_class l_daScex_Method = { }; actor_process_profile_definition2 g_profile_SCENE_EXIT = { - fpcLy_CURRENT_e, // mLayerID - 10, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_SCENE_EXIT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daScex_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 761, // mPriority - &l_daScex_Method, // sub_method - 0x00060000, // mStatus - fopAc_UNK_GROUP_5_e, // mActorType - fopAc_CULLBOX_0_e, // cullType - 0 // field_0x30 + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 10, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SCENE_EXIT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daScex_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_SCENE_EXIT_e, + /* Actor SubMtd */ &l_daScex_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_0_e, + /* Unknown */ 0 // field_0x30, }; diff --git a/src/d/actor/d_a_scene_exit2.cpp b/src/d/actor/d_a_scene_exit2.cpp index a9defc6591..5e9032d9b6 100644 --- a/src/d/actor/d_a_scene_exit2.cpp +++ b/src/d/actor/d_a_scene_exit2.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_scene_exit2.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" void daScExit_c::initBaseMtx() { setBaseMtx(); @@ -173,18 +173,18 @@ static actor_method_class l_daScExit_Method = { }; actor_process_profile_definition g_profile_SCENE_EXIT2 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_SCENE_EXIT2, - &g_fpcLf_Method.base, - sizeof(daScExit_c), - 0, - 0, - &g_fopAc_Method.base, - 583, - &l_daScExit_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SCENE_EXIT2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daScExit_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_SCENE_EXIT2_e, + /* Actor SubMtd */ &l_daScExit_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_set_bgobj.cpp b/src/d/actor/d_a_set_bgobj.cpp index 9334b04cd7..792f14840a 100644 --- a/src/d/actor/d_a_set_bgobj.cpp +++ b/src/d/actor/d_a_set_bgobj.cpp @@ -13,7 +13,7 @@ static const char l_specName[] = "spec.dat"; int daSetBgObj_c::CreateInit() { static s16 l_bg_profName[5] = { - PROC_BG_OBJ, PROC_BG_OBJ, PROC_BG_OBJ, PROC_Obj_Flag2, PROC_Obj_Flag3, + fpcNm_BG_OBJ_e, fpcNm_BG_OBJ_e, fpcNm_BG_OBJ_e, fpcNm_Obj_Flag2_e, fpcNm_Obj_Flag3_e, }; BE(u16)* spec_data_p = (BE(u16)*)dComIfG_getObjectRes(mArcName, l_specName); @@ -56,18 +56,18 @@ static actor_method_class l_daSetBgObj_Method = { }; actor_process_profile_definition g_profile_SET_BG_OBJ = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_SET_BG_OBJ, - &g_fpcLf_Method.base, - sizeof(daSetBgObj_c), - 0, - 0, - &g_fopAc_Method.base, - 754, - &l_daSetBgObj_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SET_BG_OBJ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSetBgObj_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_SET_BG_OBJ_e, + /* Actor SubMtd */ &l_daSetBgObj_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp index 09ef16cb70..09f99c1ca7 100644 --- a/src/d/actor/d_a_shop_item.cpp +++ b/src/d/actor/d_a_shop_item.cpp @@ -13,75 +13,75 @@ const char* daShopItem_c::getShopArcname() { switch (m_itemNo) { - case fpcNm_ITEM_NONE: + case dItemNo_NONE_e: if (strcmp("R_SP160", dComIfGp_getStartStageName()) == 0) { mShopItemID = SHOP_ITEMNO_ARMOR_SOLD; } else { mShopItemID = SHOP_ITEMNO_SOLD; } break; - case fpcNm_ITEM_OIL_BOTTLE: + case dItemNo_OIL_BOTTLE_e: mShopItemID = SHOP_ITEMNO_OIL; break; - case fpcNm_ITEM_MILK_BOTTLE: + case dItemNo_MILK_BOTTLE_e: mShopItemID = SHOP_ITEMNO_MILK; break; - case fpcNm_ITEM_HALF_MILK_BOTTLE: + case dItemNo_HALF_MILK_BOTTLE_e: mShopItemID = SHOP_ITEMNO_HALF_MILK; break; - case fpcNm_ITEM_RED_BOTTLE: + case dItemNo_RED_BOTTLE_e: mShopItemID = SHOP_ITEMNO_RED; break; - case fpcNm_ITEM_GREEN_BOTTLE: + case dItemNo_GREEN_BOTTLE_e: mShopItemID = SHOP_ITEMNO_GREEN; break; - case fpcNm_ITEM_BLUE_BOTTLE: + case dItemNo_BLUE_BOTTLE_e: mShopItemID = SHOP_ITEMNO_BLUE; break; - case fpcNm_ITEM_DROP_BOTTLE: + case dItemNo_DROP_BOTTLE_e: mShopItemID = SHOP_ITEMNO_DROP; break; - case fpcNm_ITEM_ARROW_10: - case fpcNm_ITEM_ARROW_20: - case fpcNm_ITEM_ARROW_30: + case dItemNo_ARROW_10_e: + case dItemNo_ARROW_20_e: + case dItemNo_ARROW_30_e: mShopItemID = SHOP_ITEMNO_ARROW; break; - case fpcNm_ITEM_SHIELD: + case dItemNo_SHIELD_e: mShopItemID = SHOP_ITEMNO_SHIELD_B; break; - case fpcNm_ITEM_HYLIA_SHIELD: + case dItemNo_HYLIA_SHIELD_e: mShopItemID = SHOP_ITEMNO_SHIELD_A; break; - case fpcNm_ITEM_NORMAL_BOMB: - case fpcNm_ITEM_BOMB_5: - case fpcNm_ITEM_BOMB_10: - case fpcNm_ITEM_BOMB_20: - case fpcNm_ITEM_BOMB_30: + case dItemNo_NORMAL_BOMB_e: + case dItemNo_BOMB_5_e: + case dItemNo_BOMB_10_e: + case dItemNo_BOMB_20_e: + case dItemNo_BOMB_30_e: mShopItemID = SHOP_ITEMNO_BOMB; break; - case fpcNm_ITEM_WATER_BOMB: + case dItemNo_WATER_BOMB_e: mShopItemID = SHOP_ITEMNO_WATER_BOMB; break; - case fpcNm_ITEM_POKE_BOMB: + case dItemNo_POKE_BOMB_e: mShopItemID = SHOP_ITEMNO_POKE_BOMB; break; - case fpcNm_ITEM_BOMB_BAG_LV1: - case fpcNm_ITEM_BOMB_IN_BAG: + case dItemNo_BOMB_BAG_LV1_e: + case dItemNo_BOMB_IN_BAG_e: mShopItemID = SHOP_ITEMNO_BOMB_BAG; break; - case fpcNm_ITEM_BOMB_BAG_LV2: + case dItemNo_BOMB_BAG_LV2_e: mShopItemID = SHOP_ITEMNO_BOMB_BAG_LV2; break; - case fpcNm_ITEM_BEE_CHILD: + case dItemNo_BEE_CHILD_e: mShopItemID = SHOP_ITEMNO_BEE_CHILD; break; - case fpcNm_ITEM_PACHINKO: + case dItemNo_PACHINKO_e: mShopItemID = SHOP_ITEMNO_PACHINKO; break; - case fpcNm_ITEM_HAWK_EYE: + case dItemNo_HAWK_EYE_e: mShopItemID = SHOP_ITEMNO_HAWKEYE; break; - case fpcNm_ITEM_ARMOR: + case dItemNo_ARMOR_e: mShopItemID = SHOP_ITEMNO_ARMOR; break; default: @@ -180,7 +180,7 @@ bool daShopItem_c::_draw() { void daShopItem_c::setListStart() {} void daShopItem_c::setShadow() { - if (m_itemNo != fpcNm_ITEM_NONE) { + if (m_itemNo != dItemNo_NONE_e) { daItemBase_c::setShadow(); } else { mShadowKey = dComIfGd_setShadow(mShadowKey, 1, mpModel, ¤t.pos, 80.0f, 0.0f, @@ -223,7 +223,7 @@ int daShopItem_c::_create() { if (getShopArcname() == NULL) { // "Display model archive name doesn't exist![%d]\n" OS_REPORT("陳列用モデルのアーカイブ名がありません！[%d]\n", m_itemNo); - m_itemNo = fpcNm_ITEM_NONE; + m_itemNo = dItemNo_NONE_e; } int phase_state = dComIfG_resLoad(&mPhase, getShopArcname()); @@ -276,18 +276,18 @@ static actor_method_class daShopItemMethodTable = { }; actor_process_profile_definition g_profile_ShopItem = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_ShopItem, - &g_fpcLf_Method.base, - sizeof(daShopItem_c), - 0, - 0, - &g_fopAc_Method.base, - 242, - &daShopItemMethodTable, - 0x60100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ShopItem_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daShopItem_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_ShopItem_e, + /* Actor SubMtd */ &daShopItemMethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_skip_2D.cpp b/src/d/actor/d_a_skip_2D.cpp index 08e4b91040..b4edbf6136 100644 --- a/src/d/actor/d_a_skip_2D.cpp +++ b/src/d/actor/d_a_skip_2D.cpp @@ -79,18 +79,18 @@ static actor_method_class daSkip2D_MethodTable = { }; actor_process_profile_definition g_profile_SKIP2D = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_SKIP2D, - &g_fpcLf_Method.base, - sizeof(daSkip2D_c), - 0, - 0, - &g_fopAc_Method.base, - 772, - &daSkip2D_MethodTable, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SKIP2D_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSkip2D_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_SKIP2D_e, + /* Actor SubMtd */ &daSkip2D_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_spinner.cpp b/src/d/actor/d_a_spinner.cpp index 9d43468e1f..b879c919b0 100644 --- a/src/d/actor/d_a_spinner.cpp +++ b/src/d/actor/d_a_spinner.cpp @@ -483,7 +483,7 @@ int daSpinner_c::checkPathMove() { daTagSppath_c* sppath_tag = (daTagSppath_c*)mCyl.GetAtHitAc(); - if (mCyl.ChkAtHit() && mSpinnerTag == TAG_NONE && sppath_tag != NULL && fopAcM_GetName(sppath_tag) == PROC_Tag_Sppath) { + if (mCyl.ChkAtHit() && mSpinnerTag == TAG_NONE && sppath_tag != NULL && fopAcM_GetName(sppath_tag) == fpcNm_Tag_Sppath_e) { if (sppath_tag->getKeepPath() == field_0xa68) { return 0; } @@ -677,7 +677,7 @@ int daSpinner_c::execute() { move_angle = (mDoCPd_c::getStickAngle3D(PAD_1) + 0x10000 + dCam_getControledAngleY(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)))) - 0x8000; #if PLATFORM_WII || VERSION == VERSION_SHIELD_DEBUG - if (dComIfG_getTrigB(PAD_1) && dComIfGp_getSelectItem(3) == fpcNm_ITEM_SPINNER) { + if (dComIfG_getTrigB(PAD_1) && dComIfGp_getSelectItem(3) == dItemNo_SPINNER_e) { #else if (dComIfG_getTrigA(PAD_1)) { #endif @@ -942,20 +942,20 @@ static actor_method_class l_daSpinner_Method = { }; actor_process_profile_definition g_profile_SPINNER = { - fpcLy_CURRENT_e, // mLayerID - 4, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_SPINNER, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSpinner_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 687, // mPriority - &l_daSpinner_Method, // sub_method - 0x00060000, // mStatus - fopAc_UNK_GROUP_5_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SPINNER_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSpinner_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_SPINNER_e, + /* Actor SubMtd */ &l_daSpinner_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_sq.cpp b/src/d/actor/d_a_sq.cpp index cc9b120e0f..ee0aafa1be 100644 --- a/src/d/actor/d_a_sq.cpp +++ b/src/d/actor/d_a_sq.cpp @@ -11,7 +11,7 @@ #include "d/actor/d_a_player.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static bool hio_set; @@ -498,7 +498,7 @@ static cPhs_Step daSq_Create(fopAc_ac_c* i_this) { if (step == cPhs_COMPLEATE_e) { _this->mParam0 = fopAcM_GetParam(_this) & 0xff; if (_this->mParam0 == 1) { - fopAcM_create(PROC_NPC_SQ, fopAcM_GetParam(_this), &_this->home.pos, + fopAcM_create(fpcNm_NPC_SQ_e, fopAcM_GetParam(_this), &_this->home.pos, fopAcM_GetRoomNo(_this), &_this->home.angle, NULL, 0xff); return cPhs_ERROR_e; } @@ -586,18 +586,18 @@ static actor_method_class l_daSq_Method = { }; actor_process_profile_definition g_profile_SQ = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_SQ, - &g_fpcLf_Method.base, - sizeof(sq_class), - 0, - 0, - &g_fopAc_Method.base, - 0x2B9, - &l_daSq_Method, - 0xC0000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SQ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(sq_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_SQ_e, + /* Actor SubMtd */ &l_daSq_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_startAndGoal.cpp b/src/d/actor/d_a_startAndGoal.cpp index 66ef5a6de6..53d5a3f007 100644 --- a/src/d/actor/d_a_startAndGoal.cpp +++ b/src/d/actor/d_a_startAndGoal.cpp @@ -189,18 +189,18 @@ static actor_method_class l_daStartAndGoal_Method = { }; actor_process_profile_definition g_profile_START_AND_GOAL = { - fpcLy_CURRENT_e, - 9, - fpcPi_CURRENT_e, - PROC_START_AND_GOAL, - &g_fpcLf_Method.base, - sizeof(daStartAndGoal_c), - 0, - 0, - &g_fopAc_Method.base, - 391, - &l_daStartAndGoal_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 9, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_START_AND_GOAL_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daStartAndGoal_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_START_AND_GOAL_e, + /* Actor SubMtd */ &l_daStartAndGoal_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_suspend.cpp b/src/d/actor/d_a_suspend.cpp index 3c4a01a318..25e7a3934a 100644 --- a/src/d/actor/d_a_suspend.cpp +++ b/src/d/actor/d_a_suspend.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_suspend.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" int daSus_c::create() { s8 roomNo = fopAcM_GetRoomNo(this); @@ -43,18 +43,18 @@ static actor_method_class daSus_METHODS = { }; actor_process_profile_definition g_profile_SUSPEND = { - fpcLy_CURRENT_e, - 11, - fpcPi_CURRENT_e, - PROC_SUSPEND, - &g_fpcLf_Method.base, - sizeof(daSus_c), - 0, - 0, - &g_fopAc_Method.base, - 763, - &daSus_METHODS, - 0x60000, - 5, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 11, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SUSPEND_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSus_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_SUSPEND_e, + /* Actor SubMtd */ &daSus_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_swBall.cpp b/src/d/actor/d_a_swBall.cpp index f12c06a2f7..02580416cb 100644 --- a/src/d/actor/d_a_swBall.cpp +++ b/src/d/actor/d_a_swBall.cpp @@ -16,7 +16,7 @@ static fopAc_ac_c* l_target_info[8]; static int l_target_info_count; static void* s_ball_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Carry && ((daObjCarry_c*)i_actor)->getType() == daObjCarry_c::TYPE_LV8_BALL) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_Carry_e && ((daObjCarry_c*)i_actor)->getType() == daObjCarry_c::TYPE_LV8_BALL) { if (l_target_info_count < 8) { l_target_info[l_target_info_count] = (fopAc_ac_c*)i_actor; l_target_info_count++; @@ -203,7 +203,7 @@ void daSwBall_c::PutCrrPos() { if (fopAcM_searchPlayerDistanceXZ(this) < 300.0f + KREG_F(0) && spA < 0x4000) { fopAc_ac_c* grab_actor = fopAcM_SearchByID(player->getGrabActorID()); - if (grab_actor != NULL && fopAcM_IsActor(grab_actor) && fopAcM_GetName(grab_actor) == PROC_Obj_Carry) { + if (grab_actor != NULL && fopAcM_IsActor(grab_actor) && fopAcM_GetName(grab_actor) == fpcNm_Obj_Carry_e) { daObjCarry_c* carry_obj = (daObjCarry_c*)grab_actor; if (carry_obj->getType() == daObjCarry_c::TYPE_LV8_BALL) { player->setForcePutPos(current.pos); @@ -277,18 +277,18 @@ static actor_method_class l_daSwBall_Method = { }; actor_process_profile_definition g_profile_SwBall = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_SwBall, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSwBall_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 550, // mPriority - &l_daSwBall_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SwBall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSwBall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_SwBall_e, + /* Actor SubMtd */ &l_daSwBall_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_swLBall.cpp b/src/d/actor/d_a_swLBall.cpp index a2b3cb55f1..12fe142cef 100644 --- a/src/d/actor/d_a_swLBall.cpp +++ b/src/d/actor/d_a_swLBall.cpp @@ -18,7 +18,7 @@ static daObjCarry_c* l_target_info[2]; static int l_target_info_count; static void* s_lb_sub(void* param_1, void* param_2) { - if ((fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_Carry) && + if ((fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_Obj_Carry_e) && static_cast(param_1)->prm_chk_type_lightball()) { if (l_target_info_count < 2) { @@ -190,7 +190,7 @@ void daSwLBall_c::PutCrrPos() { if (fopAcM_searchPlayerDistanceXZ(this) < 300.0f && angleDiff < 0x4000) { fopAc_ac_c* carryObj = (fopAc_ac_c*)fopAcM_SearchByID(player->getGrabActorID()); if (carryObj != NULL && fopAcM_IsActor(carryObj) && - fopAcM_GetName(carryObj) == PROC_Obj_Carry && + fopAcM_GetName(carryObj) == fpcNm_Obj_Carry_e && static_cast(carryObj)->prm_chk_type_lightball()) { player->setForcePutPos(current.pos); @@ -255,18 +255,18 @@ static actor_method_class l_daSwLBall_Method = { }; actor_process_profile_definition g_profile_SwLBall = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_SwLBall, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSwLBall_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 549, // mPriority - &l_daSwLBall_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SwLBall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSwLBall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_SwLBall_e, + /* Actor SubMtd */ &l_daSwLBall_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_swTime.cpp b/src/d/actor/d_a_swTime.cpp index 949c60b239..2d867109d4 100644 --- a/src/d/actor/d_a_swTime.cpp +++ b/src/d/actor/d_a_swTime.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_swTime.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" int daSwTime_c::Create() { @@ -59,18 +59,18 @@ static actor_method_class l_daSwTime_Method = { }; actor_process_profile_definition g_profile_SwTime = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_SwTime, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSwTime_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 576, // mPriority - &l_daSwTime_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SwTime_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSwTime_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_SwTime_e, + /* Actor SubMtd */ &l_daSwTime_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_swc00.cpp b/src/d/actor/d_a_swc00.cpp index 35b4cb9f50..0925ae0829 100644 --- a/src/d/actor/d_a_swc00.cpp +++ b/src/d/actor/d_a_swc00.cpp @@ -337,18 +337,18 @@ static actor_method_class l_daSwc00_Method = { }; actor_process_profile_definition g_profile_SWC00 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_SWC00, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSwc00_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 277, // mPriority - &l_daSwc00_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SWC00_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSwc00_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_SWC00_e, + /* Actor SubMtd */ &l_daSwc00_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp index 43c7256176..416a635c7f 100644 --- a/src/d/actor/d_a_swhit0.cpp +++ b/src/d/actor/d_a_swhit0.cpp @@ -478,18 +478,18 @@ static actor_method_class l_daSwhit0_Method = { }; actor_process_profile_definition g_profile_SWHIT0 = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_SWHIT0, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSwhit0_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 276, // mPriority - &l_daSwhit0_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SWHIT0_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSwhit0_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_SWHIT0_e, + /* Actor SubMtd */ &l_daSwhit0_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tag_CstaSw.cpp b/src/d/actor/d_a_tag_CstaSw.cpp index 03a07e7a99..bd945ec07f 100644 --- a/src/d/actor/d_a_tag_CstaSw.cpp +++ b/src/d/actor/d_a_tag_CstaSw.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_tag_CstaSw.h" #include "d/d_debug_viewer.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static daTagCstaSw_HIO_c l_HIO; @@ -44,7 +44,7 @@ int daTagCstaSw_c::create() { fopAc_ac_c* daTagCstaSw_c::searchSekizoAct(void* i_actor, void* param_1) { fopAc_ac_c* actor2 = (fopAc_ac_c*)param_1; fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; - if (actor && fopAcM_IsActor(actor) && fopAcM_GetProfName(actor) == PROC_CSTAF) { + if (actor && fopAcM_IsActor(actor) && fopAcM_GetProfName(actor) == fpcNm_CSTAF_e) { return actor; } return NULL; @@ -128,18 +128,18 @@ static actor_method_class l_daTagCstaSw_Method = { }; actor_process_profile_definition g_profile_Tag_CstaSw = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_CstaSw, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagCstaSw_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 657, // mPriority - &l_daTagCstaSw_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_CstaSw_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagCstaSw_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_CstaSw_e, + /* Actor SubMtd */ &l_daTagCstaSw_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_Lv6Gate.cpp b/src/d/actor/d_a_tag_Lv6Gate.cpp index e00d893413..8f9a282d9f 100644 --- a/src/d/actor/d_a_tag_Lv6Gate.cpp +++ b/src/d/actor/d_a_tag_Lv6Gate.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_tag_Lv6Gate.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static f32 const l_minRelative[] = {-700.0f, -300.0f, -2000.0f}; @@ -106,7 +106,7 @@ inline bool daTagLv6Gate_c::checkOpenArea() { for (int i = 0; i < 2; i++) { actor = - (i == 0) ? daPy_getPlayerActorClass() : fopAcM_SearchByName(PROC_NPC_TKS); + (i == 0) ? daPy_getPlayerActorClass() : fopAcM_SearchByName(fpcNm_NPC_TKS_e); if (actor != NULL) { mDoMtx_stack_c::push(); mDoMtx_stack_c::multVec(fopAcM_GetPosition_p(actor), &pos); @@ -172,7 +172,7 @@ inline int daTagLv6Gate_c::execute() { #if PLATFORM_GCN actor2 = NULL; - fopAcM_SearchByName(PROC_NPC_TKC, &actor2); + fopAcM_SearchByName(fpcNm_NPC_TKC_e, &actor2); if (actor2 == NULL) { break; @@ -295,7 +295,7 @@ void daTagLv6Gate_c::create_init() { if (!fopAcM_isSwitch(this, getSwitchNo1())) { cXyz i_pos(-13.272481f, 2887.0f, -10373.718f); csXyz i_angle(0, 0x7FFF, 0); - parentActorID = fopAcM_create(PROC_NPC_TKS, 2, &i_pos, + parentActorID = fopAcM_create(fpcNm_NPC_TKS_e, 2, &i_pos, fopAcM_GetRoomNo(this), &i_angle, NULL, -1); } } @@ -379,18 +379,18 @@ static actor_method_class l_daTagLv6Gate_Method = { }; actor_process_profile_definition g_profile_Tag_Lv6Gate = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Lv6Gate, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagLv6Gate_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 262, // mPriority - &l_daTagLv6Gate_Method, // sub_method - 0x40000, // mStatus - 0, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Lv6Gate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagLv6Gate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Lv6Gate_e, + /* Actor SubMtd */ &l_daTagLv6Gate_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_Lv7Gate.cpp b/src/d/actor/d_a_tag_Lv7Gate.cpp index d53ce4b2d1..4bb0fc7691 100644 --- a/src/d/actor/d_a_tag_Lv7Gate.cpp +++ b/src/d/actor/d_a_tag_Lv7Gate.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_tag_Lv7Gate.h" #include "d/actor/d_a_player.h" #include "d/d_path.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static char* l_arcName = "Lv7Gate"; @@ -147,13 +147,13 @@ void daTagLv7Gate_c::create_init() { csXyz local_54(getFlowNodeNo(), -0x4000, 0); - fopAcM_create(PROC_NPC_TKS, 7, &pos, fopAcM_GetRoomNo(this), &local_54, NULL, -1); + fopAcM_create(fpcNm_NPC_TKS_e, 7, &pos, fopAcM_GetRoomNo(this), &local_54, NULL, -1); pos.set(2603.315f, -200.0f, 5485.9224f); local_54.set(0, -0x4000, 0); - fopAcM_create(PROC_NPC_TKJ, 0, &pos, fopAcM_GetRoomNo(this), &local_54, NULL, -1); + fopAcM_create(fpcNm_NPC_TKJ_e, 0, &pos, fopAcM_GetRoomNo(this), &local_54, NULL, -1); } } eventInfo.setArchiveName(l_arcName); @@ -360,18 +360,18 @@ static actor_method_class l_daTagLv7Gate_Method = { }; actor_process_profile_definition g_profile_Tag_Lv7Gate = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Lv7Gate, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagLv7Gate_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 263, // mPriority - &l_daTagLv7Gate_Method, // sub_method - 0x40000, // mStatus - 0, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Lv7Gate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagLv7Gate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Lv7Gate_e, + /* Actor SubMtd */ &l_daTagLv7Gate_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_Lv8Gate.cpp b/src/d/actor/d_a_tag_Lv8Gate.cpp index ba07c7fd86..a2214ec750 100644 --- a/src/d/actor/d_a_tag_Lv8Gate.cpp +++ b/src/d/actor/d_a_tag_Lv8Gate.cpp @@ -5,7 +5,7 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/actor/d_a_obj_mirror_table.h" #include @@ -136,7 +136,7 @@ int daTagLv8Gate_c::execute() { daPy_getPlayerActorClass()->setPlayerPosAndAngle(¤t.pos, shape_angle.y, 0); - fopAc_ac_c* mirror_table = fopAcM_SearchByName(PROC_Obj_MirrorTable); + fopAc_ac_c* mirror_table = fopAcM_SearchByName(fpcNm_Obj_MirrorTable_e); if (mirror_table != NULL) { static_cast(mirror_table)->setEffect(); } @@ -235,18 +235,18 @@ static actor_method_class l_daTagLv8Gate_Method = { }; actor_process_profile_definition g_profile_Tag_Lv8Gate = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Lv8Gate, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagLv8Gate_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 0x108, // mPriority - &l_daTagLv8Gate_Method, // sub_method - 0x40000, // mStatus - 0, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Lv8Gate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagLv8Gate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Lv8Gate_e, + /* Actor SubMtd */ &l_daTagLv8Gate_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_TWgate.cpp b/src/d/actor/d_a_tag_TWgate.cpp index 697ceeeaef..8eba989b7e 100644 --- a/src/d/actor/d_a_tag_TWgate.cpp +++ b/src/d/actor/d_a_tag_TWgate.cpp @@ -1177,18 +1177,18 @@ static actor_method_class l_daTagTWGate_Method = { }; actor_process_profile_definition g_profile_Tag_TWGate = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_TWGate, - &g_fpcLf_Method.base, - sizeof(daTagTWGate_c), - 0, - 0, - &g_fopAc_Method.base, - 0x105, - &l_daTagTWGate_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_TWGate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagTWGate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_TWGate_e, + /* Actor SubMtd */ &l_daTagTWGate_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_ajnot.cpp b/src/d/actor/d_a_tag_ajnot.cpp index 988af1ff42..6634e7c334 100644 --- a/src/d/actor/d_a_tag_ajnot.cpp +++ b/src/d/actor/d_a_tag_ajnot.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_tag_ajnot.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" int daTagAJnot_c::create() { fopAcM_ct(this, daTagAJnot_c); @@ -66,18 +66,18 @@ static actor_method_class l_daTagAJnot_Method = { }; actor_process_profile_definition g_profile_Tag_AJnot = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Tag_AJnot, - &g_fpcLf_Method.base, - sizeof(daTagAJnot_c), - 0, - 0, - &g_fopAc_Method.base, - 436, - &l_daTagAJnot_Method, - 0x44000, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_AJnot_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagAJnot_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_AJnot_e, + /* Actor SubMtd */ &l_daTagAJnot_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_allmato.cpp b/src/d/actor/d_a_tag_allmato.cpp index 2a2c94acfb..c9414bf755 100644 --- a/src/d/actor/d_a_tag_allmato.cpp +++ b/src/d/actor/d_a_tag_allmato.cpp @@ -273,7 +273,7 @@ void* daTag_AllMato_c::srchBouMato(void* i_actor, void* i_data) { if (l_findCount < 100) { fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; if (actor != NULL && actor != data) { - if (fopAcM_IsExecuting(fopAcM_GetID(actor)) && fopAcM_GetName(i_actor) == PROC_OBJ_BOUMATO) { + if (fopAcM_IsExecuting(fopAcM_GetID(actor)) && fopAcM_GetName(i_actor) == fpcNm_OBJ_BOUMATO_e) { l_findActorPtrs[l_findCount] = actor; l_findCount++; } @@ -288,7 +288,7 @@ void* daTag_AllMato_c::srchItaMato(void* i_actor, void* i_data) { if (l_findCount < 100) { fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; if (actor != NULL && actor != data) { - if (fopAcM_IsExecuting(fopAcM_GetID(actor)) && fopAcM_GetName(i_actor) == PROC_OBJ_ITAMATO) { + if (fopAcM_IsExecuting(fopAcM_GetID(actor)) && fopAcM_GetName(i_actor) == fpcNm_OBJ_ITAMATO_e) { l_findActorPtrs[l_findCount] = actor; l_findCount++; } @@ -303,7 +303,7 @@ void* daTag_AllMato_c::srchTaro(void* i_actor, void* i_data) { if (l_findCount < 100) { fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; if (actor != NULL && actor != data) { - if (fopAcM_IsExecuting(fopAcM_GetID(actor)) && fopAcM_GetName(i_actor) == PROC_NPC_TARO) { + if (fopAcM_IsExecuting(fopAcM_GetID(actor)) && fopAcM_GetName(i_actor) == fpcNm_NPC_TARO_e) { l_findActorPtrs[l_findCount] = actor; l_findCount++; } @@ -318,7 +318,7 @@ void* daTag_AllMato_c::srchArrow(void* i_actor, void* i_data) { if (l_findCount < 100) { fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; if (actor != NULL && actor != data) { - if (fopAcM_IsExecuting(fopAcM_GetID(actor)) && fopAcM_GetName(i_actor) == PROC_ARROW) { + if (fopAcM_IsExecuting(fopAcM_GetID(actor)) && fopAcM_GetName(i_actor) == fpcNm_ARROW_e) { l_findActorPtrs[l_findCount] = actor; l_findCount++; } @@ -593,18 +593,18 @@ static actor_method_class daTag_AllMato_MethodTable = { }; actor_process_profile_definition g_profile_TAG_ALLMATO = { - fpcLy_CURRENT_e, // mLayerID - 10, // mListID - fpcPi_CURRENT_e, // mListPri - PROC_TAG_ALLMATO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTag_AllMato_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 288, // mPriority - &daTag_AllMato_MethodTable, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 10, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_ALLMATO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_AllMato_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_ALLMATO_e, + /* Actor SubMtd */ &daTag_AllMato_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_arena.cpp b/src/d/actor/d_a_tag_arena.cpp index 24ba2b1c86..f8eaef153c 100644 --- a/src/d/actor/d_a_tag_arena.cpp +++ b/src/d/actor/d_a_tag_arena.cpp @@ -25,18 +25,18 @@ static actor_method_class l_daTagArena_Method = { }; actor_process_profile_definition g_profile_Tag_Arena = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Arena, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagArena_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 333, // mPriority - &l_daTagArena_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Arena_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagArena_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Arena_e, + /* Actor SubMtd */ &l_daTagArena_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_assistance.cpp b/src/d/actor/d_a_tag_assistance.cpp index 62fdc624f9..a78a43f264 100644 --- a/src/d/actor/d_a_tag_assistance.cpp +++ b/src/d/actor/d_a_tag_assistance.cpp @@ -53,18 +53,18 @@ static actor_method_class l_daTagAssist_Method = { }; actor_process_profile_definition g_profile_Tag_Assist = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Assist, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagAssist_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 266, // mPriority - &l_daTagAssist_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Assist_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagAssist_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Assist_e, + /* Actor SubMtd */ &l_daTagAssist_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_attack_item.cpp b/src/d/actor/d_a_tag_attack_item.cpp index b0efb7fa6f..3c61256e3b 100644 --- a/src/d/actor/d_a_tag_attack_item.cpp +++ b/src/d/actor/d_a_tag_attack_item.cpp @@ -37,6 +37,11 @@ static dCcD_SrcCyl l_cyl_src = { }; #if DEBUG +daTagAtkItem_HIO_c::daTagAtkItem_HIO_c() { + field_0x8 = 0.0f; + show_range = 0; +} + void daTagAtkItem_HIO_c::genMessage(JORMContext* ctx) { // "Attack reaction item" ctx->genLabel("攻撃反応アイテム", 0); @@ -61,11 +66,6 @@ int daTagAtkItem_c::Create() { return 1; } -daTagAtkItem_HIO_c::daTagAtkItem_HIO_c() { - field_0x8 = 0.0f; - show_range = 0; -} - int daTagAtkItem_c::create() { fopAcM_ct(this, daTagAtkItem_c); @@ -208,18 +208,18 @@ static actor_method_class l_daTagAtkItem_Method = { }; actor_process_profile_definition g_profile_Tag_AttackItem = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_AttackItem, - &g_fpcLf_Method.base, - sizeof(daTagAtkItem_c), - 0, - 0, - &g_fopAc_Method.base, - 585, - &l_daTagAtkItem_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_AttackItem_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagAtkItem_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_AttackItem_e, + /* Actor SubMtd */ &l_daTagAtkItem_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_attention.cpp b/src/d/actor/d_a_tag_attention.cpp index 270fc030a8..a0b8bf0339 100644 --- a/src/d/actor/d_a_tag_attention.cpp +++ b/src/d/actor/d_a_tag_attention.cpp @@ -13,6 +13,11 @@ #if DEBUG daAttp_HIO_c l_HIO; +daAttp_HIO_c::daAttp_HIO_c() { + type_spec = 0; + dist_max = dist_max_release = dist_adjust = upper_y = lower_y = 0.0f; +} + void daAttp_HIO_c::genMessage(JORMContext* ctx) { static const char* l_type_name[37] = { "注目なし - ダミー", // No focus - dummy @@ -258,11 +263,6 @@ int daAttp_c::_delete() { return 1; } -daAttp_HIO_c::daAttp_HIO_c() { - type_spec = 0; - dist_max = dist_max_release = dist_adjust = upper_y = lower_y = 0.0f; -} - static int daAttp_Draw(daAttp_c* i_this) { return i_this->draw(); } @@ -273,13 +273,13 @@ static int daAttp_Execute(daAttp_c* i_this) { } static int daAttp_Delete(daAttp_c* i_this) { - fpc_ProcID id = fopAcM_GetID(i_this); + fopAcM_RegisterDeleteID(i_this, "Attp"); return i_this->_delete(); } static int daAttp_Create(fopAc_ac_c* i_this) { daAttp_c* attp = static_cast(i_this); - fpc_ProcID id = fopAcM_GetID(i_this); + fopAcM_RegisterCreateID(i_this, "Attp"); return attp->create(); } @@ -290,18 +290,18 @@ static actor_method_class l_daAttp_Method = { }; actor_process_profile_definition g_profile_Tag_Attp = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Attp, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daAttp_c), // mSize - 0, // mSizeOther - 0, // mParameter - &g_fopAc_Method.base, // sub_method - 440, // mPriority - &l_daAttp_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Attp_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daAttp_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Attp_e, + /* Actor SubMtd */ &l_daAttp_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tag_bottle_item.cpp b/src/d/actor/d_a_tag_bottle_item.cpp index 77128dee7b..1cfd2447a8 100644 --- a/src/d/actor/d_a_tag_bottle_item.cpp +++ b/src/d/actor/d_a_tag_bottle_item.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_player.h" #include "d/actor/d_a_tag_bottle_item.h" #include "d/d_item.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_s_play.h" int daTag_BottleItem_c::create() { @@ -113,15 +113,15 @@ int daTag_BottleItem_c::chkEvent() { int daTag_BottleItem_c::orderEvent() { makeSoup(); - if (!daPy_py_c::checkNowWolf() && mBottleItemType != fpcNm_ITEM_EMPTY_BOTTLE) { + if (!daPy_py_c::checkNowWolf() && mBottleItemType != dItemNo_EMPTY_BOTTLE_e) { attention_info.flags = (fopAc_AttnFlag_TALKCHECK_e | fopAc_AttnFlag_SPEAK_e); } else { attention_info.flags = 0; } if (attention_info.flags == (fopAc_AttnFlag_TALKCHECK_e | fopAc_AttnFlag_SPEAK_e)) { - attention_info.distances[fopAc_attn_TALK_e] = fpcNm_ITEM_EMPTY_BOTTLE; - attention_info.distances[fopAc_attn_SPEAK_e] = fpcNm_ITEM_EMPTY_BOTTLE; + attention_info.distances[fopAc_attn_TALK_e] = dItemNo_EMPTY_BOTTLE_e; + attention_info.distances[fopAc_attn_SPEAK_e] = dItemNo_EMPTY_BOTTLE_e; eventInfo.onCondition(dEvtCnd_CANTALK_e); } @@ -129,16 +129,16 @@ int daTag_BottleItem_c::orderEvent() { } void daTag_BottleItem_c::makeSoup() { - if (mBottleItemType == fpcNm_ITEM_LV1_SOUP + if (mBottleItemType == dItemNo_LV1_SOUP_e /* dSv_event_flag_c::F_0003 - Snowpeak Ruins - Handed over tomato puree and left room */ && dComIfGs_isEventBit(2)) { - mBottleItemType = fpcNm_ITEM_LV2_SOUP; + mBottleItemType = dItemNo_LV2_SOUP_e; } - if (mBottleItemType == fpcNm_ITEM_LV2_SOUP + if (mBottleItemType == dItemNo_LV2_SOUP_e /* dSv_event_flag_c::F_0004 - Snowpeak Ruins - Handed over secret ingredient and left room */ && dComIfGs_isEventBit(1)) { - mBottleItemType = fpcNm_ITEM_LV3_SOUP; + mBottleItemType = dItemNo_LV3_SOUP_e; } } @@ -192,18 +192,18 @@ static actor_method_class daTag_BottleItem_MethodTable = { }; actor_process_profile_definition g_profile_TAG_BTLITM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPri - PROC_TAG_SSDRINK, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTag_BottleItem_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 70, // mPriority - &daTag_BottleItem_MethodTable, // sub_method - 0x64100, // mStatus - 5, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_SSDRINK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_BottleItem_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_SSDRINK_e, + /* Actor SubMtd */ &daTag_BottleItem_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_camera.cpp b/src/d/actor/d_a_tag_camera.cpp index 5378ff1182..ce5a929c9c 100644 --- a/src/d/actor/d_a_tag_camera.cpp +++ b/src/d/actor/d_a_tag_camera.cpp @@ -136,9 +136,11 @@ u16 daTag_Cam_c::getAreaNoChk() { return home.angle.z & 0x200; } +#if PLATFORM_GCN static u8 const lit_3874[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +#endif int daTag_Cam_c::create() { fopAcM_ct(this, daTag_Cam_c); @@ -331,18 +333,18 @@ static actor_method_class l_daTag_Cam_Method = { }; actor_process_profile_definition g_profile_TAG_CAMERA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_TAG_CAMERA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTag_Cam_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 279, // mPriority - &l_daTag_Cam_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_6_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_CAMERA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_Cam_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_CAMERA_e, + /* Actor SubMtd */ &l_daTag_Cam_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_tag_chgrestart.cpp b/src/d/actor/d_a_tag_chgrestart.cpp index 626f268847..352341051e 100644 --- a/src/d/actor/d_a_tag_chgrestart.cpp +++ b/src/d/actor/d_a_tag_chgrestart.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_tag_chgrestart.h" #include "d/d_debug_viewer.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" class daTagChgRestart_HIO_c : public mDoHIO_entry_c { public: @@ -188,18 +188,18 @@ static actor_method_class l_daTagChgRestart_Method = { }; actor_process_profile_definition g_profile_Tag_ChgRestart = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_ChgRestart, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagChgRestart_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 591, // mPriority - &l_daTagChgRestart_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_ChgRestart_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagChgRestart_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_ChgRestart_e, + /* Actor SubMtd */ &l_daTagChgRestart_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_chkpoint.cpp b/src/d/actor/d_a_tag_chkpoint.cpp index 6b79abf81a..56df12bd53 100644 --- a/src/d/actor/d_a_tag_chkpoint.cpp +++ b/src/d/actor/d_a_tag_chkpoint.cpp @@ -135,18 +135,18 @@ static actor_method_class l_daTag_Chk_Method = { (process_method_func)daTag_Chk_Draw}; actor_process_profile_definition g_profile_TAG_CHKPOINT = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_TAG_CHKPOINT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTag_Chk_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 280, // mPriority - &l_daTag_Chk_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_6_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_CHKPOINT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_Chk_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_CHKPOINT_e, + /* Actor SubMtd */ &l_daTag_Chk_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_tag_csw.cpp b/src/d/actor/d_a_tag_csw.cpp index bf5b174f0b..106785a9c0 100644 --- a/src/d/actor/d_a_tag_csw.cpp +++ b/src/d/actor/d_a_tag_csw.cpp @@ -248,7 +248,7 @@ int daTagCsw_c::create() { static void* searchTagCswOut(void* param_0, void* param_1) { UNUSED(param_1); - if (param_0 != NULL && fopAcM_IsActor(param_0) && fopAcM_GetProfName(param_0) == PROC_TAG_CSW) { + if (param_0 != NULL && fopAcM_IsActor(param_0) && fopAcM_GetProfName(param_0) == fpcNm_TAG_CSW_e) { daTagCsw_c* csw1 = static_cast(param_0); daTagCsw_c* csw2 = static_cast(param_1); if (csw1->getType() == 1) { @@ -262,7 +262,7 @@ static void* searchTagCswOut(void* param_0, void* param_1) { static void* searchCStatue(void* param_0, void* param_1) { UNUSED(param_1); - if (param_0 != NULL && fopAcM_IsActor(param_0) && fopAcM_GetProfName(param_0) == PROC_CSTATUE) { + if (param_0 != NULL && fopAcM_IsActor(param_0) && fopAcM_GetProfName(param_0) == fpcNm_CSTATUE_e) { daCstatue_c* cstatue = static_cast(param_0); if (cstatue->checkNormalType()) { return param_0; @@ -550,18 +550,18 @@ static actor_method_class l_daTagCsw_Method = { }; actor_process_profile_definition g_profile_TAG_CSW = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_TAG_CSW, - &g_fpcLf_Method.base, - sizeof(daTagCsw_c), - 0, - 0, - &g_fopAc_Method.base, - 0x111, - &l_daTagCsw_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_CSW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagCsw_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_CSW_e, + /* Actor SubMtd */ &l_daTagCsw_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tag_escape.cpp b/src/d/actor/d_a_tag_escape.cpp index 7b18f747d1..7300968c4d 100644 --- a/src/d/actor/d_a_tag_escape.cpp +++ b/src/d/actor/d_a_tag_escape.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_escape.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" int daTagEscape_c::create() { fopAcM_ct(this, daTagEscape_c); @@ -34,18 +34,18 @@ static actor_method_class l_daTagEscape_Method = { }; actor_process_profile_definition g_profile_Tag_Escape = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_Escape, - &g_fpcLf_Method.base, - sizeof(daTagEscape_c), - 0, - 0, - &g_fopAc_Method.base, - 397, - &l_daTagEscape_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Escape_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagEscape_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Escape_e, + /* Actor SubMtd */ &l_daTagEscape_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_event.cpp b/src/d/actor/d_a_tag_event.cpp index f772ebc349..adcef6c611 100644 --- a/src/d/actor/d_a_tag_event.cpp +++ b/src/d/actor/d_a_tag_event.cpp @@ -370,18 +370,18 @@ static actor_method_class l_daTag_Event_Method = { }; actor_process_profile_definition g_profile_TAG_EVENT = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_TAG_EVENT, - &g_fpcLf_Method.base, - sizeof(daTag_Event_c), - 0, - 0, - &g_fopAc_Method.base, - 281, - &l_daTag_Event_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_6_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_EVENT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_Event_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_EVENT_e, + /* Actor SubMtd */ &l_daTag_Event_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_tag_evt.cpp b/src/d/actor/d_a_tag_evt.cpp index 47606b7e02..2552f59e24 100644 --- a/src/d/actor/d_a_tag_evt.cpp +++ b/src/d/actor/d_a_tag_evt.cpp @@ -242,18 +242,18 @@ static actor_method_class daTag_Evt_MethodTable = { }; actor_process_profile_definition g_profile_TAG_EVT = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_TAG_EVT, - &g_fpcLf_Method.base, - sizeof(daTag_Evt_c), - 0, - 0, - &g_fopAc_Method.base, - 0x011C, - &daTag_Evt_MethodTable, - 0x40000, - 0, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_EVT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_Evt_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_EVT_e, + /* Actor SubMtd */ &daTag_Evt_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_evtarea.cpp b/src/d/actor/d_a_tag_evtarea.cpp index 1a60b4f867..a3f403eb94 100644 --- a/src/d/actor/d_a_tag_evtarea.cpp +++ b/src/d/actor/d_a_tag_evtarea.cpp @@ -6,7 +6,7 @@ #include "d/actor/d_a_tag_evtarea.h" #include "d/actor/d_a_npc.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" cPhs_Step daTag_EvtArea_c::create() { int var_r28 = 0; @@ -232,18 +232,18 @@ static actor_method_class daTag_EvtArea_MethodTable = { }; actor_process_profile_definition g_profile_TAG_EVTAREA = { - fpcLy_CURRENT_e, - 8, - fpcPi_CURRENT_e, - PROC_TAG_EVTAREA, - &g_fpcLf_Method.base, - sizeof(daTag_EvtArea_c), - 0, - 0, - &g_fopAc_Method.base, - 287, - &daTag_EvtArea_MethodTable, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_EVTAREA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_EvtArea_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_EVTAREA_e, + /* Actor SubMtd */ &daTag_EvtArea_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_evtmsg.cpp b/src/d/actor/d_a_tag_evtmsg.cpp index 26d64f664b..8a2035f147 100644 --- a/src/d/actor/d_a_tag_evtmsg.cpp +++ b/src/d/actor/d_a_tag_evtmsg.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_tag_evtmsg.h" #include "d/actor/d_a_npc4.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" enum evt_cut_e { EVT_CUT_NONE_e, @@ -242,18 +242,18 @@ static actor_method_class daTag_EvtMsg_MethodTable = { }; actor_process_profile_definition g_profile_TAG_EVTMSG = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_TAG_MSG, - &g_fpcLf_Method.base, - sizeof(daTag_EvtMsg_c), - 0, - 0, - &g_fopAc_Method.base, - 285, - &daTag_EvtMsg_MethodTable, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_MSG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_EvtMsg_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_MSG_e, + /* Actor SubMtd */ &daTag_EvtMsg_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_firewall.cpp b/src/d/actor/d_a_tag_firewall.cpp index 29212c89c0..34264045bb 100644 --- a/src/d/actor/d_a_tag_firewall.cpp +++ b/src/d/actor/d_a_tag_firewall.cpp @@ -219,18 +219,18 @@ static actor_method_class l_daTag_FWall_Method = { }; actor_process_profile_definition g_profile_Tag_FWall = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_FWall, - &g_fpcLf_Method.base, - sizeof(daTag_FWall_c), - 0, - 0, - &g_fopAc_Method.base, - 197, - &l_daTag_FWall_Method, - 0x60100, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_FWall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_FWall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_FWall_e, + /* Actor SubMtd */ &l_daTag_FWall_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tag_gra.cpp b/src/d/actor/d_a_tag_gra.cpp index fe5b3dd91d..d42cfdd26e 100644 --- a/src/d/actor/d_a_tag_gra.cpp +++ b/src/d/actor/d_a_tag_gra.cpp @@ -25,18 +25,18 @@ static actor_method_class l_daTagGra_Method = { }; actor_process_profile_definition g_profile_TAG_GRA = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_TAG_GRA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagGra_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 20, // mPriority - &l_daTagGra_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_GRA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagGra_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_GRA_e, + /* Actor SubMtd */ &l_daTagGra_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_gstart.cpp b/src/d/actor/d_a_tag_gstart.cpp index dbf64577b6..d982cb1c51 100644 --- a/src/d/actor/d_a_tag_gstart.cpp +++ b/src/d/actor/d_a_tag_gstart.cpp @@ -62,18 +62,18 @@ static actor_method_class l_daTagGstart_Method = { }; actor_process_profile_definition g_profile_Tag_Gstart = { - fpcLy_CURRENT_e, - 2, - fpcPi_CURRENT_e, - PROC_Tag_Gstart, - &g_fpcLf_Method.base, - sizeof(daTagGstart_c), - 0, - 0, - &g_fopAc_Method.base, - 437, - &l_daTagGstart_Method, - 0x60000, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 2, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Gstart_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagGstart_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Gstart_e, + /* Actor SubMtd */ &l_daTagGstart_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_guard.cpp b/src/d/actor/d_a_tag_guard.cpp index 7b28c3df1a..237c873444 100644 --- a/src/d/actor/d_a_tag_guard.cpp +++ b/src/d/actor/d_a_tag_guard.cpp @@ -27,7 +27,7 @@ void daTagGuard_c::createGuard(u32 i_parameters) { i_parameters |= getPathID() << 0x10; } - fopAcM_createChild(PROC_NPC_GUARD, fopAcM_GetID(this), i_parameters, &pos, + fopAcM_createChild(fpcNm_NPC_GUARD_e, fopAcM_GetID(this), i_parameters, &pos, fopAcM_GetRoomNo(this), ¤t.angle, NULL, -1, NULL); } @@ -81,18 +81,18 @@ static actor_method_class l_daTagGuard_Method = { }; actor_process_profile_definition g_profile_TAG_GUARD = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_TAG_GUARD, - &g_fpcLf_Method.base, - sizeof(daTagGuard_c), - 0, - 0, - &g_fopAc_Method.base, - 408, - &l_daTagGuard_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_GUARD_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagGuard_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_GUARD_e, + /* Actor SubMtd */ &l_daTagGuard_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_hinit.cpp b/src/d/actor/d_a_tag_hinit.cpp index 6f9207cf07..80f598515e 100644 --- a/src/d/actor/d_a_tag_hinit.cpp +++ b/src/d/actor/d_a_tag_hinit.cpp @@ -74,18 +74,18 @@ static actor_method_class l_daTagHinit_Method = { }; actor_process_profile_definition g_profile_Tag_Hinit = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Tag_Hinit, - &g_fpcLf_Method.base, - sizeof(daTagHinit_c), - 0, - 0, - &g_fopAc_Method.base, - 433, - &l_daTagHinit_Method, - 0x60000, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Hinit_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagHinit_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Hinit_e, + /* Actor SubMtd */ &l_daTagHinit_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_hjump.cpp b/src/d/actor/d_a_tag_hjump.cpp index 0692347e80..36613aaaee 100644 --- a/src/d/actor/d_a_tag_hjump.cpp +++ b/src/d/actor/d_a_tag_hjump.cpp @@ -26,6 +26,11 @@ static char const l_arcName[] = "Hfence"; #if DEBUG daTagHjump_HIO_c l_HIO; +daTagHjump_HIO_c::daTagHjump_HIO_c() { + height = 350.0f; + depth = 400.0f; +} + void daTagHjump_HIO_c::genMessage(JORMContext* ctx) { ctx->genSlider("高さ", &height, 0.0f, 500.0f); ctx->genSlider("奥行き", &depth, 0.0f, 1000.0f); @@ -109,11 +114,6 @@ int daTagHjump_c::create() { return phase; } -daTagHjump_HIO_c::daTagHjump_HIO_c() { - height = 350.0f; - depth = 400.0f; -} - static int daTagHjump_Create(fopAc_ac_c* i_this) { daTagHjump_c* hJump = static_cast(i_this); int id = fopAcM_GetID(i_this); @@ -229,18 +229,18 @@ static actor_method_class l_daTagHjump_Method = { }; actor_process_profile_definition g_profile_Tag_Hjump = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Tag_Hjump, - &g_fpcLf_Method.base, - sizeof(daTagHjump_c), - 0, - 0, - &g_fopAc_Method.base, - 434, - &l_daTagHjump_Method, - 0x44100, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Hjump_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagHjump_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Hjump_e, + /* Actor SubMtd */ &l_daTagHjump_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_howl.cpp b/src/d/actor/d_a_tag_howl.cpp index a93a9584f9..ea1e2b013e 100644 --- a/src/d/actor/d_a_tag_howl.cpp +++ b/src/d/actor/d_a_tag_howl.cpp @@ -99,18 +99,18 @@ static actor_method_class daTag_Howl_MethodTable = { }; actor_process_profile_definition g_profile_TAG_HOWL = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_TAG_HOWL, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTag_Howl_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 283, // mPriority - &daTag_Howl_MethodTable, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_HOWL_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_Howl_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_HOWL_e, + /* Actor SubMtd */ &daTag_Howl_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_hstop.cpp b/src/d/actor/d_a_tag_hstop.cpp index 54b5d4a3dd..589fb71b29 100644 --- a/src/d/actor/d_a_tag_hstop.cpp +++ b/src/d/actor/d_a_tag_hstop.cpp @@ -206,18 +206,18 @@ static actor_method_class l_daTagHstop_Method = { }; actor_process_profile_definition g_profile_Tag_Hstop = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Tag_Hstop, - &g_fpcLf_Method.base, - sizeof(daTagHstop_c), - 0, - 0, - &g_fopAc_Method.base, - 435, - &l_daTagHstop_Method, - 0x40000, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Hstop_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagHstop_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Hstop_e, + /* Actor SubMtd */ &l_daTagHstop_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_instruction.cpp b/src/d/actor/d_a_tag_instruction.cpp index cfee3518c0..e59488c37b 100644 --- a/src/d/actor/d_a_tag_instruction.cpp +++ b/src/d/actor/d_a_tag_instruction.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_instruction.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static int daTagInst_Create(fopAc_ac_c* i_this) { int id = fopAcM_GetID(i_this); @@ -29,18 +29,18 @@ static actor_method_class l_daTagInst_Method = { }; actor_process_profile_definition g_profile_Tag_Instruction = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_Instruction, - &g_fpcLf_Method.base, - sizeof(daTagInst_c), - 0, - 0, - &g_fopAc_Method.base, - 334, - &l_daTagInst_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Instruction_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagInst_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Instruction_e, + /* Actor SubMtd */ &l_daTagInst_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_kago_fall.cpp b/src/d/actor/d_a_tag_kago_fall.cpp index 369ff1aba5..2ce69dabf9 100644 --- a/src/d/actor/d_a_tag_kago_fall.cpp +++ b/src/d/actor/d_a_tag_kago_fall.cpp @@ -6,7 +6,7 @@ #include "d/d_camera.h" #include "d/d_com_inf_game.h" #include "d/d_msg_object.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_s_play.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_graphic.h" @@ -275,18 +275,18 @@ static actor_method_class l_daTagKagoFall_Method = { }; actor_process_profile_definition g_profile_Tag_KagoFall = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_KagoFall, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagKagoFall_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 557, // mPriority - &l_daTagKagoFall_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_KagoFall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagKagoFall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_KagoFall_e, + /* Actor SubMtd */ &l_daTagKagoFall_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_kmsg.cpp b/src/d/actor/d_a_tag_kmsg.cpp index 8c2d036149..760884bc3a 100644 --- a/src/d/actor/d_a_tag_kmsg.cpp +++ b/src/d/actor/d_a_tag_kmsg.cpp @@ -270,18 +270,18 @@ static actor_method_class daTag_KMsg_MethodTable = { }; actor_process_profile_definition g_profile_TAG_KMSG = { - fpcLy_CURRENT_e, - 8, - fpcPi_CURRENT_e, - PROC_TAG_KMSG, - &g_fpcLf_Method.base, - sizeof(daTag_KMsg_c), - 0, - 0, - &g_fopAc_Method.base, - 0x122, - &daTag_KMsg_MethodTable, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_KMSG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_KMsg_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_KMSG_e, + /* Actor SubMtd */ &daTag_KMsg_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_lantern.cpp b/src/d/actor/d_a_tag_lantern.cpp index 7475077177..264a0c1987 100644 --- a/src/d/actor/d_a_tag_lantern.cpp +++ b/src/d/actor/d_a_tag_lantern.cpp @@ -9,7 +9,7 @@ #include "JSystem/JHostIO/JORFile.h" #include "d/d_debug_viewer.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include static TAG_LANTERN_HIO_CLASS l_HIO; @@ -169,18 +169,18 @@ static actor_method_class daTag_Lantern_MethodTable = { }; actor_process_profile_definition g_profile_TAG_LANTERN = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_TAG_LANTERN, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTag_Lantern_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 286, // mPriority - &daTag_Lantern_MethodTable, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_LANTERN_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_Lantern_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_LANTERN_e, + /* Actor SubMtd */ &daTag_Lantern_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_lightball.cpp b/src/d/actor/d_a_tag_lightball.cpp index e26b245b02..e6bc73ed78 100644 --- a/src/d/actor/d_a_tag_lightball.cpp +++ b/src/d/actor/d_a_tag_lightball.cpp @@ -4,7 +4,7 @@ #include "d/actor/d_a_tag_lightball.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" void daTagLightBall_c::initBaseMtx() { setBaseMtx(); @@ -119,18 +119,18 @@ static actor_method_class l_daTagLightBall_Method = { }; actor_process_profile_definition g_profile_Tag_LightBall = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_LightBall, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagLightBall_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 547, // mPriority - &l_daTagLightBall_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_LightBall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagLightBall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_LightBall_e, + /* Actor SubMtd */ &l_daTagLightBall_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_lv2prchk.cpp b/src/d/actor/d_a_tag_lv2prchk.cpp index 8b074baa8a..dbea932afd 100644 --- a/src/d/actor/d_a_tag_lv2prchk.cpp +++ b/src/d/actor/d_a_tag_lv2prchk.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_tag_lv2prchk.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" int daTagLv2PrChk_c::Create() { mSwbit2 = getSwbit2(); @@ -189,18 +189,18 @@ static actor_method_class l_daTagLv2PrChk_Method = { }; actor_process_profile_definition g_profile_Tag_Lv2PrChk = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_Lv2PrChk, - &g_fpcLf_Method.base, - sizeof(daTagLv2PrChk_c), - 0, - 0, - &g_fopAc_Method.base, - 558, - &l_daTagLv2PrChk_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Lv2PrChk_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagLv2PrChk_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Lv2PrChk_e, + /* Actor SubMtd */ &l_daTagLv2PrChk_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_lv5soup.cpp b/src/d/actor/d_a_tag_lv5soup.cpp index dfd532d615..6039804791 100644 --- a/src/d/actor/d_a_tag_lv5soup.cpp +++ b/src/d/actor/d_a_tag_lv5soup.cpp @@ -83,18 +83,18 @@ static actor_method_class daTag_Lv5Soup_MethodTable = { }; actor_process_profile_definition g_profile_TAG_LV5SOUP = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - 0x122, - &g_fpcLf_Method.base, - sizeof(daTag_Lv5Soup_c), - 0, - 0, - &g_fopAc_Method.base, - 70, - &daTag_Lv5Soup_MethodTable, - 0x64100, - 5, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_SSDRINK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_Lv5Soup_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_SSDRINK_e, + /* Actor SubMtd */ &daTag_Lv5Soup_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_lv6CstaSw.cpp b/src/d/actor/d_a_tag_lv6CstaSw.cpp index 14150299eb..843bc68294 100644 --- a/src/d/actor/d_a_tag_lv6CstaSw.cpp +++ b/src/d/actor/d_a_tag_lv6CstaSw.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_tag_lv6CstaSw.h" #include "d/d_debug_viewer.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static daLv6CstaSw_HIO_c l_HIO; @@ -43,7 +43,7 @@ int daLv6CstaSw_c::create() { fopAc_ac_c* daLv6CstaSw_c::searchSekizoAct(void* i_actor, void* param_1) { fopAc_ac_c* actor2 = (fopAc_ac_c*)param_1; fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; - if (actor != NULL && fopAcM_IsActor(actor) && fopAcM_GetProfName(actor) == PROC_CSTATUE) { + if (actor != NULL && fopAcM_IsActor(actor) && fopAcM_GetProfName(actor) == fpcNm_CSTATUE_e) { return actor; } @@ -128,18 +128,18 @@ static actor_method_class l_daLv6CstaSw_Method = { }; actor_process_profile_definition g_profile_Tag_Lv6CstaSw = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_Lv6CstaSw, - &g_fpcLf_Method.base, - sizeof(daLv6CstaSw_c), - 0, - 0, - &g_fopAc_Method.base, - 658, - &l_daLv6CstaSw_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Lv6CstaSw_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv6CstaSw_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Lv6CstaSw_e, + /* Actor SubMtd */ &l_daLv6CstaSw_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_magne.cpp b/src/d/actor/d_a_tag_magne.cpp index 0ade82b3e4..8b47511eeb 100644 --- a/src/d/actor/d_a_tag_magne.cpp +++ b/src/d/actor/d_a_tag_magne.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_magne.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" int daTagMagne_c::Create() { if (mTagMagne != NULL) { @@ -64,18 +64,18 @@ static actor_method_class l_daTagMagne_Method = { }; actor_process_profile_definition g_profile_Tag_Magne = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_Magne, - &g_fpcLf_Method.base, - sizeof(daTagMagne_c), - 0, - 0, - &g_fopAc_Method.base, - 590, - &l_daTagMagne_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Magne_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagMagne_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Magne_e, + /* Actor SubMtd */ &l_daTagMagne_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_mhint.cpp b/src/d/actor/d_a_tag_mhint.cpp index d1ac38d8ad..c1afbde4e4 100644 --- a/src/d/actor/d_a_tag_mhint.cpp +++ b/src/d/actor/d_a_tag_mhint.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_midna.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_meter2_info.h" #include @@ -240,18 +240,18 @@ static actor_method_class l_daTagMhint_Method = { }; actor_process_profile_definition g_profile_Tag_Mhint = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_Mhint, - &g_fpcLf_Method.base, - sizeof(daTagMhint_c), - 0, - 0, - &g_fopAc_Method.base, - 254, - &l_daTagMhint_Method, - 0x44000, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Mhint_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagMhint_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Mhint_e, + /* Actor SubMtd */ &l_daTagMhint_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_mist.cpp b/src/d/actor/d_a_tag_mist.cpp index 5b55240b58..de8756a971 100644 --- a/src/d/actor/d_a_tag_mist.cpp +++ b/src/d/actor/d_a_tag_mist.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_tag_mist.h" #include "d/d_com_inf_game.h" #include "d/d_debug_viewer.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" class daTagMist_HIO_c : public mDoHIO_entry_c { public: @@ -211,18 +211,18 @@ static actor_method_class l_daTagMist_Method = { }; actor_process_profile_definition g_profile_Tag_Mist = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_Mist, - &g_fpcLf_Method.base, - sizeof(daTagMist_c), - 0, - 0, - &g_fopAc_Method.base, - 292, - &l_daTagMist_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Mist_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagMist_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Mist_e, + /* Actor SubMtd */ &l_daTagMist_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_mmsg.cpp b/src/d/actor/d_a_tag_mmsg.cpp index 11bf28eb00..f5da6c8ab0 100644 --- a/src/d/actor/d_a_tag_mmsg.cpp +++ b/src/d/actor/d_a_tag_mmsg.cpp @@ -99,18 +99,18 @@ static actor_method_class l_daTagMmsg_Method = { }; actor_process_profile_definition g_profile_Tag_Mmsg = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Mmsg, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagMmsg_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 255, // mPriority - &l_daTagMmsg_Method, // sub_method - 0x44000, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Mmsg_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagMmsg_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Mmsg_e, + /* Actor SubMtd */ &l_daTagMmsg_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp index 6759531caa..6e052f74ea 100644 --- a/src/d/actor/d_a_tag_msg.cpp +++ b/src/d/actor/d_a_tag_msg.cpp @@ -276,18 +276,18 @@ static actor_method_class daTag_Msg_MethodTable = { }; actor_process_profile_definition g_profile_TAG_MSG = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_TAG_MSG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTag_Msg_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 285, // mPriority - &daTag_Msg_MethodTable, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_MSG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_Msg_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_MSG_e, + /* Actor SubMtd */ &daTag_Msg_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_mstop.cpp b/src/d/actor/d_a_tag_mstop.cpp index 5094221a06..d3fecddebf 100644 --- a/src/d/actor/d_a_tag_mstop.cpp +++ b/src/d/actor/d_a_tag_mstop.cpp @@ -173,18 +173,18 @@ static actor_method_class l_daTagMstop_Method = { (process_method_func)daTagMstop_Execute, NULL, (process_method_func)daTagMstop_Draw}; actor_process_profile_definition g_profile_Tag_Mstop = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Mstop, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagMstop_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 257 , // mPriority - &l_daTagMstop_Method, // sub_method - 0x44000, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Mstop_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagMstop_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Mstop_e, + /* Actor SubMtd */ &l_daTagMstop_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_mwait.cpp b/src/d/actor/d_a_tag_mwait.cpp index 198c2e9fdb..c8ea32413b 100644 --- a/src/d/actor/d_a_tag_mwait.cpp +++ b/src/d/actor/d_a_tag_mwait.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_tag_mwait.h" #include "d/actor/d_a_midna.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" int daTagMwait_c::create() { fopAcM_ct(this, daTagMwait_c); @@ -159,18 +159,18 @@ static actor_method_class l_daTagMwait_Method = { }; actor_process_profile_definition g_profile_Tag_Mwait = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_Mwait, - &g_fpcLf_Method.base, - sizeof(daTagMwait_c), - 0, - 0, - &g_fopAc_Method.base, - 256, - &l_daTagMwait_Method, - 0x44000, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Mwait_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagMwait_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Mwait_e, + /* Actor SubMtd */ &l_daTagMwait_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_myna2.cpp b/src/d/actor/d_a_tag_myna2.cpp index 1c048d20af..ec518c48ea 100644 --- a/src/d/actor/d_a_tag_myna2.cpp +++ b/src/d/actor/d_a_tag_myna2.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_player.h" #include "d/actor/d_a_tag_myna2.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" s32 daTagMyna2_c::create() { fopAcM_ct(this, daTagMyna2_c); @@ -33,7 +33,7 @@ s32 daTagMyna2_c::execute() { u32 var_r29 = 0xffff0001; if (mTimer == 0) { - if (fopAcM_create(PROC_MYNA2, var_r29 | mSwitchNo << 8, &actor_pos, + if (fopAcM_create(fpcNm_MYNA2_e, var_r29 | mSwitchNo << 8, &actor_pos, fopAcM_GetRoomNo(this), &actor_angle, 0, -1) != fpcM_ERROR_PROCESS_ID_e) { dComIfGs_onSwitch(mSwitchNo,fopAcM_GetRoomNo(this)); @@ -73,18 +73,18 @@ static actor_method_class l_daTagMyna2_Method = { }; actor_process_profile_definition g_profile_TAG_MYNA2 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_TAG_MYNA2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagMyna2_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 394, // mPriority - &l_daTagMyna2_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_MYNA2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagMyna2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_MYNA2_e, + /* Actor SubMtd */ &l_daTagMyna2_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_myna_light.cpp b/src/d/actor/d_a_tag_myna_light.cpp index e4748364f9..84dd0da316 100644 --- a/src/d/actor/d_a_tag_myna_light.cpp +++ b/src/d/actor/d_a_tag_myna_light.cpp @@ -159,18 +159,18 @@ static actor_method_class daTag_MynaLight_MethodTable = { }; actor_process_profile_definition g_profile_TAG_MNLIGHT = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_TAG_MNLIGHT, - &g_fpcLf_Method.base, - sizeof(daTag_MynaLight_c), - 0, - 0, - &g_fopAc_Method.base, - 0x49, - &daTag_MynaLight_MethodTable, - 0x64100, - 0x05, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_MNLIGHT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_MynaLight_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_MNLIGHT_e, + /* Actor SubMtd */ &daTag_MynaLight_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_pachi.cpp b/src/d/actor/d_a_tag_pachi.cpp index 949ffd6902..cb7c3b3399 100644 --- a/src/d/actor/d_a_tag_pachi.cpp +++ b/src/d/actor/d_a_tag_pachi.cpp @@ -2,7 +2,7 @@ #include "d/actor/d_a_tag_pachi.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_s_play.h" daTagPati_c::~daTagPati_c() {} @@ -87,18 +87,18 @@ static actor_method_class l_daTagPati_Method = { }; actor_process_profile_definition g_profile_TAG_PATI = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_TAG_PATI, - &g_fpcLf_Method.base, - sizeof(daTagPati_c), - 0, - 0, - &g_fopAc_Method.base, - 0x173, - &l_daTagPati_Method, - 0x40000, - 0, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_PATI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagPati_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_PATI_e, + /* Actor SubMtd */ &l_daTagPati_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_poFire.cpp b/src/d/actor/d_a_tag_poFire.cpp index 6c1d8cdc05..a801209578 100644 --- a/src/d/actor/d_a_tag_poFire.cpp +++ b/src/d/actor/d_a_tag_poFire.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_poFire.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" daTagPoFire_HIO_c::daTagPoFire_HIO_c() { unk_0x4 = 0x14; @@ -77,18 +77,18 @@ static actor_method_class l_daTagPoFire_Method = { }; actor_process_profile_definition g_profile_Tag_poFire = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_poFire, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagPoFire_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 649, // mPriority - &l_daTagPoFire_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_poFire_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagPoFire_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_poFire_e, + /* Actor SubMtd */ &l_daTagPoFire_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_push.cpp b/src/d/actor/d_a_tag_push.cpp index 10530f1da6..336477613b 100644 --- a/src/d/actor/d_a_tag_push.cpp +++ b/src/d/actor/d_a_tag_push.cpp @@ -2,7 +2,7 @@ #include "d/actor/d_a_tag_push.h" #include "d/actor/d_a_npc4.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" void* daTag_Push_c::srchActor(void* param_0, void* param_1) { daTag_Push_c* push = (daTag_Push_c*)param_0; @@ -12,31 +12,31 @@ void* daTag_Push_c::srchActor(void* param_0, void* param_1) { int id = ((daTag_Push_c*)param_1)->getId(); switch (id) { case 1: - bVar1 = fopAcM_GetName(push) == PROC_NPC_TARO; + bVar1 = fopAcM_GetName(push) == fpcNm_NPC_TARO_e; break; case 2: - bVar1 = fopAcM_GetName(push) == PROC_NPC_JAGAR; + bVar1 = fopAcM_GetName(push) == fpcNm_NPC_JAGAR_e; break; case 3: - bVar1 = fopAcM_GetName(push) == PROC_NPC_LEN; + bVar1 = fopAcM_GetName(push) == fpcNm_NPC_LEN_e; break; case 4: - bVar1 = fopAcM_GetName(push) == PROC_NPC_TARO; + bVar1 = fopAcM_GetName(push) == fpcNm_NPC_TARO_e; break; case 5: - bVar1 = fopAcM_GetName(push) == PROC_NPC_MARO; + bVar1 = fopAcM_GetName(push) == fpcNm_NPC_MARO_e; break; case 6: - bVar1 = fopAcM_GetName(push) == PROC_NPC_BESU; + bVar1 = fopAcM_GetName(push) == fpcNm_NPC_BESU_e; break; case 7: - bVar1 = fopAcM_GetName(push) == PROC_NPC_BOU; + bVar1 = fopAcM_GetName(push) == fpcNm_NPC_BOU_e; break; case 8: - bVar1 = fopAcM_GetName(push) == PROC_NPC_GRS; + bVar1 = fopAcM_GetName(push) == fpcNm_NPC_GRS_e; break; case 9: - bVar1 = fopAcM_GetName(push) == PROC_NPC_GRO; + bVar1 = fopAcM_GetName(push) == fpcNm_NPC_GRO_e; break; } } @@ -74,8 +74,8 @@ int daTag_Push_c::Execute() { if (home.roomNo == dComIfGp_roomControl_getStayNo()) { fopAc_ac_c* actor = mActorMngr.getActorP(); if (isDelete()) { - if (actor != NULL && fopAcM_GetName(actor) != PROC_NPC_JAGAR && - fopAcM_GetName(actor) != PROC_NPC_GRS && fopAcM_GetName(actor) != PROC_NPC_GRO) + if (actor != NULL && fopAcM_GetName(actor) != fpcNm_NPC_JAGAR_e && + fopAcM_GetName(actor) != fpcNm_NPC_GRS_e && fopAcM_GetName(actor) != fpcNm_NPC_GRO_e) { static_cast(actor)->setCommander(NULL); } @@ -93,8 +93,8 @@ int daTag_Push_c::Execute() { daPy_getPlayerActorClass()->eventInfo.chkCondition(dEvtCnd_CANTALK_e) != false) { if (chkPointInArea(cXyz(daPy_getPlayerActorClass()->current.pos))) { - if (fopAcM_GetName(actor) == PROC_NPC_GRS || - fopAcM_GetName(actor) == PROC_NPC_GRO) + if (fopAcM_GetName(actor) == fpcNm_NPC_GRS_e || + fopAcM_GetName(actor) == fpcNm_NPC_GRO_e) { static_cast(actor)->setIntDemander(this); static_cast(actor)->setIntFlowNodeNo(getFlowNodeNo()); @@ -165,18 +165,18 @@ static actor_method_class daTag_Push_MethodTable = { }; actor_process_profile_definition g_profile_TAG_PUSH = { - fpcLy_CURRENT_e, - 8, - fpcPi_CURRENT_e, - PROC_TAG_PUSH, - &g_fpcLf_Method.base, - sizeof(daTag_Push_c), - 0, - 0, - &g_fopAc_Method.base, - 0x123, - &daTag_Push_MethodTable, - 0x44000, - 0, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_PUSH_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_Push_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_PUSH_e, + /* Actor SubMtd */ &daTag_Push_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_qs.cpp b/src/d/actor/d_a_tag_qs.cpp index b1e8204bdf..76a5dec8b9 100644 --- a/src/d/actor/d_a_tag_qs.cpp +++ b/src/d/actor/d_a_tag_qs.cpp @@ -282,7 +282,7 @@ static void* search(void* param_1, void* param_2) { return NULL; } - if (fopAcM_GetProfName(param_1) == PROC_ITEM) { + if (fopAcM_GetProfName(param_1) == fpcNm_ITEM_e) { daItem_c* item = (daItem_c*)target; // somehow this condition is supposed to produce a double `li r0, 0x1` instruction, // this only produces one and is likely a fakematch anyway @@ -298,7 +298,7 @@ static void* search(void* param_1, void* param_2) { return NULL; } - if (fopAcM_GetProfName(param_1) == PROC_Obj_Carry) { + if (fopAcM_GetProfName(param_1) == fpcNm_Obj_Carry_e) { daObjCarry_c* carry = (daObjCarry_c*)target; if (carry->getType() == 7 || carry->getType() == 1 || carry->getType() == 5) { int sp10 = hikiyose(&qs->current.pos, &carry->current.pos, &carry->old.pos, @@ -410,18 +410,18 @@ static actor_method_class l_daTagQs_Method = { }; actor_process_profile_definition g_profile_TAG_QS = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_TAG_QS, - &g_fpcLf_Method.base, - sizeof(daTagQs_c), - 0, - 0, - &g_fopAc_Method.base, - 274, - &l_daTagQs_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_QS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagQs_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_QS_e, + /* Actor SubMtd */ &l_daTagQs_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tag_ret_room.cpp b/src/d/actor/d_a_tag_ret_room.cpp index 7e7a411236..382476b96a 100644 --- a/src/d/actor/d_a_tag_ret_room.cpp +++ b/src/d/actor/d_a_tag_ret_room.cpp @@ -165,18 +165,18 @@ static actor_method_class daTagRetRm_METHODS = { }; actor_process_profile_definition g_profile_Tag_RetRoom = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_RetRoom, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagRetRm_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 731, // mPriority - &daTagRetRm_METHODS, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_RetRoom_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagRetRm_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_RetRoom_e, + /* Actor SubMtd */ &daTagRetRm_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_river_back.cpp b/src/d/actor/d_a_tag_river_back.cpp index d8c15ae527..3a31d7f505 100644 --- a/src/d/actor/d_a_tag_river_back.cpp +++ b/src/d/actor/d_a_tag_river_back.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_river_back.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static char* l_arcName = "RvBack"; @@ -158,18 +158,18 @@ static actor_method_class l_daTagRiverBack_Method = {(process_method_func)daTagR (process_method_func)daTagRiverBack_Execute}; actor_process_profile_definition g_profile_Tag_RiverBack = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_RiverBack, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagRiverBack_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 556, // mPriority - &l_daTagRiverBack_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_RiverBack_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagRiverBack_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_RiverBack_e, + /* Actor SubMtd */ &l_daTagRiverBack_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_rmbit_sw.cpp b/src/d/actor/d_a_tag_rmbit_sw.cpp index e3def0a333..43106c773d 100644 --- a/src/d/actor/d_a_tag_rmbit_sw.cpp +++ b/src/d/actor/d_a_tag_rmbit_sw.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_tag_rmbit_sw.h" #include "d/d_debug_viewer.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" class daTagRmbitSw_HIO_c : public mDoHIO_entry_c { public: @@ -204,18 +204,18 @@ static actor_method_class daTagRmbitSw_METHODS = { }; actor_process_profile_definition g_profile_Tag_RmbitSw = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_RmbitSw, - &g_fpcLf_Method.base, - sizeof(daTagRmbitSw_c), - 0, - 0, - &g_fopAc_Method.base, - 748, - &daTagRmbitSw_METHODS, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_RmbitSw_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagRmbitSw_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_RmbitSw_e, + /* Actor SubMtd */ &daTagRmbitSw_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_schedule.cpp b/src/d/actor/d_a_tag_schedule.cpp index 5e567a56f4..b1efb05c10 100644 --- a/src/d/actor/d_a_tag_schedule.cpp +++ b/src/d/actor/d_a_tag_schedule.cpp @@ -25,18 +25,18 @@ static actor_method_class l_daTagSchedule_Method = { }; actor_process_profile_definition g_profile_Tag_Schedule = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Schedule, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagSchedule_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 396, // mPriority - &l_daTagSchedule_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Schedule_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagSchedule_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Schedule_e, + /* Actor SubMtd */ &l_daTagSchedule_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_setBall.cpp b/src/d/actor/d_a_tag_setBall.cpp index 75ef80c1be..bffd6bfdc8 100644 --- a/src/d/actor/d_a_tag_setBall.cpp +++ b/src/d/actor/d_a_tag_setBall.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_setBall.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" void daTagSetBall_c::initBaseMtx() { setBaseMtx(); @@ -61,18 +61,18 @@ static actor_method_class l_daTagSetBall_Method = { }; actor_process_profile_definition g_profile_Tag_SetBall = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_SetBall, - &g_fpcLf_Method.base, - sizeof(daTagSetBall_c), - 0, - 0, - &g_fopAc_Method.base, - 575, - &l_daTagSetBall_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_SetBall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagSetBall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_SetBall_e, + /* Actor SubMtd */ &l_daTagSetBall_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_setrestart.cpp b/src/d/actor/d_a_tag_setrestart.cpp index e76afad4ed..c7134fbae4 100644 --- a/src/d/actor/d_a_tag_setrestart.cpp +++ b/src/d/actor/d_a_tag_setrestart.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_tag_setrestart.h" #include "d/d_com_inf_game.h" #include "d/d_debug_viewer.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" class daTagRestart_HIO_c : public mDoHIO_entry_c { public: @@ -186,18 +186,18 @@ static actor_method_class l_daTagRestart_Method = { }; actor_process_profile_definition g_profile_Tag_Restart = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_Restart, - &g_fpcLf_Method.base, - sizeof(daTagRestart_c), - 0, - 0, - &g_fopAc_Method.base, - 592, - &l_daTagRestart_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Restart_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagRestart_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Restart_e, + /* Actor SubMtd */ &l_daTagRestart_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_shop_camera.cpp b/src/d/actor/d_a_tag_shop_camera.cpp index 07c8d931ba..021ac7f276 100644 --- a/src/d/actor/d_a_tag_shop_camera.cpp +++ b/src/d/actor/d_a_tag_shop_camera.cpp @@ -61,18 +61,18 @@ static actor_method_class daTag_ShopCamera_MethodTable = { }; actor_process_profile_definition g_profile_TAG_SHOPCAM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_TAG_SHOPCAM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTag_ShopCamera_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 74, // mPriority - &daTag_ShopCamera_MethodTable, // sub_method - 0x64100, // mStatus - 5, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_SHOPCAM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_ShopCamera_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_SHOPCAM_e, + /* Actor SubMtd */ &daTag_ShopCamera_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_shop_item.cpp b/src/d/actor/d_a_tag_shop_item.cpp index d4c9a9cad1..302b6d1503 100644 --- a/src/d/actor/d_a_tag_shop_item.cpp +++ b/src/d/actor/d_a_tag_shop_item.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_shop_item.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include int daTag_ShopItem_c::create() { @@ -80,7 +80,7 @@ int daTag_ShopItem_c::Execute() { if (mProcessID == fpcM_ERROR_PROCESS_ID_e) { if (mCreateTimer == 0) { mProcessID = - fopAcM_create(PROC_ShopItem, getType() | (getGroupID() << 28), + fopAcM_create(fpcNm_ShopItem_e, getType() | (getGroupID() << 28), ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle, NULL, -1); } else { @@ -185,18 +185,18 @@ static actor_method_class daTag_ShopItem_MethodTable = { }; actor_process_profile_definition g_profile_TAG_SHOPITM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_TAG_SHOPITM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTag_ShopItem_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 75, // mPriority - &daTag_ShopItem_MethodTable, // sub_method - 0x64100, // mStatus - 5, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_SHOPITM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_ShopItem_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_SHOPITM_e, + /* Actor SubMtd */ &daTag_ShopItem_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_smk_emt.cpp b/src/d/actor/d_a_tag_smk_emt.cpp index 865474bc18..262804610e 100644 --- a/src/d/actor/d_a_tag_smk_emt.cpp +++ b/src/d/actor/d_a_tag_smk_emt.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_smk_emt.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include daTagSmkEmt_c::daTagSmkEmt_c() { @@ -85,18 +85,18 @@ static actor_method_class daTagSmkEmt_METHODS = { }; actor_process_profile_definition g_profile_Tag_SmkEmt = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_SmkEmt, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagSmkEmt_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 743, // mPriority - &daTagSmkEmt_METHODS, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_SmkEmt_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagSmkEmt_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_SmkEmt_e, + /* Actor SubMtd */ &daTagSmkEmt_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_spinner.cpp b/src/d/actor/d_a_tag_spinner.cpp index 5f553929c7..f4f64d6eea 100644 --- a/src/d/actor/d_a_tag_spinner.cpp +++ b/src/d/actor/d_a_tag_spinner.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_tag_spinner.h" #include "d/d_debug_viewer.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" class daTagSpinner_HIO_c : public mDoHIO_entry_c { public: @@ -45,7 +45,7 @@ static void* search_spinner_sub(void* tag_0, void* tag_1) { if (actor != NULL && fopAcM_IsActor(actor) != 0 && - fopAcM_GetProfName(actor) == PROC_SPINNER) { + fopAcM_GetProfName(actor) == fpcNm_SPINNER_e) { f32 latDist = actor->current.pos.absXZ(actor2->current.pos); if (latDist < actor2->GetR()) { return actor; @@ -164,18 +164,18 @@ static actor_method_class l_daTagSpinner_Method = { }; actor_process_profile_definition g_profile_Tag_Spinner = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Spinner, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagSpinner_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 605, // mPriority - &l_daTagSpinner_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Spinner_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagSpinner_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Spinner_e, + /* Actor SubMtd */ &l_daTagSpinner_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_sppath.cpp b/src/d/actor/d_a_tag_sppath.cpp index f1d2cb6a1a..b40908b387 100644 --- a/src/d/actor/d_a_tag_sppath.cpp +++ b/src/d/actor/d_a_tag_sppath.cpp @@ -220,18 +220,18 @@ static actor_method_class l_daTagSppath_Method = { }; actor_process_profile_definition g_profile_Tag_Sppath = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Sppath, // mProcName, - &g_fpcLf_Method.base, // sub_method - sizeof(daTagSppath_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 258, // mPriority - &l_daTagSppath_Method, // sub_method - 0x44000, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Sppath_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagSppath_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Sppath_e, + /* Actor SubMtd */ &l_daTagSppath_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_spring.cpp b/src/d/actor/d_a_tag_spring.cpp index 4eabdf3db2..f7aa3b26ba 100644 --- a/src/d/actor/d_a_tag_spring.cpp +++ b/src/d/actor/d_a_tag_spring.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_player.h" #include "d/d_debug_viewer.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" class daTagSpring_HIO_c : public mDoHIO_entry_c { public: @@ -163,18 +163,18 @@ static actor_method_class l_daTagSpring_Method = { }; actor_process_profile_definition g_profile_Tag_Spring = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Spring, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagSpring_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 587, // mPriority - &l_daTagSpring_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Spring_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagSpring_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Spring_e, + /* Actor SubMtd */ &l_daTagSpring_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_ss_drink.cpp b/src/d/actor/d_a_tag_ss_drink.cpp index 86a25148bf..8916feae7a 100644 --- a/src/d/actor/d_a_tag_ss_drink.cpp +++ b/src/d/actor/d_a_tag_ss_drink.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_tag_ss_drink.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_msg_object.h" #include "d/actor/d_a_myna.h" @@ -259,18 +259,18 @@ static actor_method_class daTag_SSDrink_MethodTable = { }; actor_process_profile_definition g_profile_TAG_SSDRINK = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_TAG_SSDRINK, - &g_fpcLf_Method.base, - sizeof(daTag_SSDrink_c), - 0, - 0, - &g_fopAc_Method.base, - 0x46, - &daTag_SSDrink_MethodTable, - 0x64100, - 5, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_SSDRINK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_SSDrink_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_SSDRINK_e, + /* Actor SubMtd */ &daTag_SSDrink_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_statue_evt.cpp b/src/d/actor/d_a_tag_statue_evt.cpp index 3017abcb07..806d8ee3b6 100644 --- a/src/d/actor/d_a_tag_statue_evt.cpp +++ b/src/d/actor/d_a_tag_statue_evt.cpp @@ -33,7 +33,7 @@ static int CheckCreateHeap(fopAc_ac_c* i_this) { // Returns ID of Owl Statue corresponding to tag static void* s_s_sub(void* i_proc, void* param_1) { UNUSED(param_1); - if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_CSTAF) { + if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_CSTAF_e) { return i_proc; } @@ -355,11 +355,11 @@ int daTagStatue_c::demoProc() { // If the player already has 5 Sky Characters, reward them with the completed // Ancient Sky Book, otherwise, reward another character if (getLetterCount() == 5) { - item = fpcNm_ITEM_ANCIENT_DOCUMENT2; + item = dItemNo_ANCIENT_DOCUMENT2_e; /* Sky character - Sky character 6 */ dComIfGs_onEventBit(dSv_event_flag_c::F_0796); } else { - item = fpcNm_ITEM_AIR_LETTER; + item = dItemNo_AIR_LETTER_e; } mItemId = @@ -538,18 +538,18 @@ reinterpret_cast(daTagStatue_Draw), }; actor_process_profile_definition g_profile_Tag_Statue = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_Statue, - &g_fpcLf_Method.base, - sizeof(daTagStatue_c), - 0, - 0, - &g_fopAc_Method.base, - 588, - &l_daTagStatue_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Statue_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagStatue_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Statue_e, + /* Actor SubMtd */ &l_daTagStatue_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_stream.cpp b/src/d/actor/d_a_tag_stream.cpp index 60dd5fcba2..40e2dad415 100644 --- a/src/d/actor/d_a_tag_stream.cpp +++ b/src/d/actor/d_a_tag_stream.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_tag_stream.h" #include "d/d_debug_viewer.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_s_play.h" int daTagStream_c::create() { @@ -141,18 +141,18 @@ static actor_method_class l_daTagStream_Method = { }; actor_process_profile_definition g_profile_Tag_Stream = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Stream, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagStream_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 259, // mPriority - &l_daTagStream_Method, // sub_method - 0x44000, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Stream_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagStream_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Stream_e, + /* Actor SubMtd */ &l_daTagStream_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_telop.cpp b/src/d/actor/d_a_tag_telop.cpp index 782a597843..a46102cbf2 100644 --- a/src/d/actor/d_a_tag_telop.cpp +++ b/src/d/actor/d_a_tag_telop.cpp @@ -70,18 +70,18 @@ static actor_method_class l_daTag_Telop_Method = { }; actor_process_profile_definition g_profile_TAG_TELOP = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_TAG_TELOP, - &g_fpcLf_Method.base, - sizeof(daTag_Telop_c), - 0, - 0, - &g_fopAc_Method.base, - 282, - &l_daTag_Telop_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_6_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_TELOP_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_Telop_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_TELOP_e, + /* Actor SubMtd */ &l_daTag_Telop_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_tag_theB_hint.cpp b/src/d/actor/d_a_tag_theB_hint.cpp index 3c1274ae5a..d368d726df 100644 --- a/src/d/actor/d_a_tag_theB_hint.cpp +++ b/src/d/actor/d_a_tag_theB_hint.cpp @@ -21,7 +21,7 @@ int daTagTheBHint_c::execute() { } if (fopAcM_searchPlayerDistanceXZ2(this) < field_0x568) { - daNpcTheB_c* the_b = (daNpcTheB_c*)fpcM_SearchByName(PROC_NPC_THEB); + daNpcTheB_c* the_b = (daNpcTheB_c*)fpcM_SearchByName(fpcNm_NPC_THEB_e); if (the_b) { int roomNo = getRoomNo() == 0xff ? fopAcM_GetRoomNo(this) : getRoomNo(); @@ -55,18 +55,18 @@ static actor_method_class l_daTagTheBHint_Method = { }; actor_process_profile_definition g_profile_Tag_TheBHint = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_TheBHint, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagTheBHint_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 265, // mPriority - &l_daTagTheBHint_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_TheBHint_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagTheBHint_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_TheBHint_e, + /* Actor SubMtd */ &l_daTagTheBHint_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_wara_howl.cpp b/src/d/actor/d_a_tag_wara_howl.cpp index fc55700edf..1a15938c4d 100644 --- a/src/d/actor/d_a_tag_wara_howl.cpp +++ b/src/d/actor/d_a_tag_wara_howl.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_tag_wara_howl.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" daTagWrHowl_c::daTagWrHowl_c() {} @@ -84,18 +84,18 @@ static actor_method_class daTagWrHowl_METHODS = { }; actor_process_profile_definition g_profile_Tag_WaraHowl = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_WaraHowl, - &g_fpcLf_Method.base, - sizeof(daTagWrHowl_c), - 0, - 0, - &g_fopAc_Method.base, - 733, - &daTagWrHowl_METHODS, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_WaraHowl_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagWrHowl_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_WaraHowl_e, + /* Actor SubMtd */ &daTagWrHowl_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_watchge.cpp b/src/d/actor/d_a_tag_watchge.cpp index aeacc17e88..2b87c74d73 100644 --- a/src/d/actor/d_a_tag_watchge.cpp +++ b/src/d/actor/d_a_tag_watchge.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_watchge.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" int daTagWatchGe_c::draw() { return 1; @@ -20,7 +20,7 @@ static s32 m_group_count; static void* s_watchge(void* i_guayP, void* i_this) { u8 group_no = static_cast(i_this)->getGroupNo(); - if (fopAcM_GetName(i_guayP) == PROC_E_GE) { + if (fopAcM_GetName(i_guayP) == fpcNm_E_GE_e) { if (static_cast(i_guayP)->getGroupNo() == group_no) { m_group_count++; } @@ -95,18 +95,18 @@ static actor_method_class l_daTagWatchGe_Method = { }; actor_process_profile_definition g_profile_Tag_WatchGe = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_WatchGe, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagWatchGe_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 193, // mPriority - &l_daTagWatchGe_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_WatchGe_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagWatchGe_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_WatchGe_e, + /* Actor SubMtd */ &l_daTagWatchGe_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tag_waterfall.cpp b/src/d/actor/d_a_tag_waterfall.cpp index fab5afccac..6fac4d4d00 100644 --- a/src/d/actor/d_a_tag_waterfall.cpp +++ b/src/d/actor/d_a_tag_waterfall.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_tag_waterfall.h" #include "d/d_com_inf_game.h" #include "d/d_debug_viewer.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_camera_mng.h" daTagWaterFall_HIO_c::daTagWaterFall_HIO_c() { @@ -125,7 +125,7 @@ void* s_waterfall(void* pProc, void* param_1) { UNUSED(param_1); if (fopAcM_IsActor(pProc) && - fopAcM_GetName(pProc) == PROC_Tag_WaterFall && + fopAcM_GetName(pProc) == fpcNm_Tag_WaterFall_e && !fpcM_IsCreating(fopAcM_GetID(pProc)) && static_cast(pProc)->checkHitWaterFallCamera()) { return pProc; @@ -335,18 +335,18 @@ static actor_method_class l_daTagWaterFall_Method = { }; actor_process_profile_definition g_profile_Tag_WaterFall = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_WaterFall, - &g_fpcLf_Method.base, - sizeof(daTagWaterFall_c), - 0, - 0, - &g_fopAc_Method.base, - 198, - &l_daTagWaterFall_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_WaterFall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagWaterFall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_WaterFall_e, + /* Actor SubMtd */ &l_daTagWaterFall_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tag_wljump.cpp b/src/d/actor/d_a_tag_wljump.cpp index d5d374deec..9c09a8ad71 100644 --- a/src/d/actor/d_a_tag_wljump.cpp +++ b/src/d/actor/d_a_tag_wljump.cpp @@ -2,7 +2,7 @@ #include "d/actor/d_a_tag_wljump.h" #include "d/d_path.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/actor/d_a_player.h" #include "d/actor/d_a_midna.h" @@ -241,18 +241,18 @@ static actor_method_class l_daTagWljump_Method = { }; actor_process_profile_definition g_profile_Tag_Wljump = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_Wljump, - &g_fpcLf_Method.base, - sizeof(daTagWljump_c), - 0, - 0, - &g_fopAc_Method.base, - 260, - &l_daTagWljump_Method, - 0x44000, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Wljump_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagWljump_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Wljump_e, + /* Actor SubMtd */ &l_daTagWljump_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_yami.cpp b/src/d/actor/d_a_tag_yami.cpp index d9491c1e85..19467a0e25 100644 --- a/src/d/actor/d_a_tag_yami.cpp +++ b/src/d/actor/d_a_tag_yami.cpp @@ -132,18 +132,18 @@ static actor_method_class l_daTagYami_Method = { }; actor_process_profile_definition g_profile_TAG_YAMI = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_TAG_YAMI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagYami_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 21, // mPriority - &l_daTagYami_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_YAMI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagYami_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_YAMI_e, + /* Actor SubMtd */ &l_daTagYami_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_talk.cpp b/src/d/actor/d_a_talk.cpp index b77a7069eb..849dea194a 100644 --- a/src/d/actor/d_a_talk.cpp +++ b/src/d/actor/d_a_talk.cpp @@ -107,18 +107,18 @@ static actor_method_class l_daTalk_Method = { }; actor_process_profile_definition g_profile_TALK = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_TALK, - &g_fpcLf_Method.base, - sizeof(daTalk_c), - 0, - 0, - &g_fopAc_Method.base, - 766, - &l_daTalk_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_6_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TALK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTalk_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TALK_e, + /* Actor SubMtd */ &l_daTalk_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 1da82cd477..b936b9b6e7 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -293,7 +293,7 @@ int daTbox_c::checkEnvEffectTbox() { return false; } - if (getItemNo() == fpcNm_ITEM_BOOMERANG || getItemNo() == fpcNm_ITEM_MAP || getItemNo() == fpcNm_ITEM_COMPUS) { + if (getItemNo() == dItemNo_BOOMERANG_e || getItemNo() == dItemNo_MAP_e || getItemNo() == dItemNo_COMPUS_e) { return true; } @@ -1003,7 +1003,7 @@ int daTbox_c::actionDemo() { flagOff(0x18); dComIfGp_event_setItemPartner(NULL); - if (getItemNo() == fpcNm_ITEM_KAKERA_HEART) { + if (getItemNo() == dItemNo_KAKERA_HEART_e) { if (!strcmp(dComIfGp_getStartStageName(), "F_SP121")) { if (fopAcM_GetRoomNo(this) == 0) { switch (getTboxNo()) { @@ -1085,65 +1085,65 @@ int daTbox_c::actionDropDemo() { u8 daTbox_c::getBombItemNo(u8 i_bombType, u8 i_itemNo) { u8 new_item_no = i_itemNo; switch (i_bombType) { - case fpcNm_ITEM_NORMAL_BOMB: + case dItemNo_NORMAL_BOMB_e: switch (i_itemNo) { - case fpcNm_ITEM_WATER_BOMB_5: - case fpcNm_ITEM_WATER_BOMB_30: - case fpcNm_ITEM_BOMB_INSECT_5: - case fpcNm_ITEM_BOMB_INSECT_20: - new_item_no = fpcNm_ITEM_BOMB_5; + case dItemNo_WATER_BOMB_5_e: + case dItemNo_WATER_BOMB_30_e: + case dItemNo_BOMB_INSECT_5_e: + case dItemNo_BOMB_INSECT_20_e: + new_item_no = dItemNo_BOMB_5_e; break; - case fpcNm_ITEM_WATER_BOMB_10: - case fpcNm_ITEM_BOMB_INSECT_10: - new_item_no = fpcNm_ITEM_BOMB_10; + case dItemNo_WATER_BOMB_10_e: + case dItemNo_BOMB_INSECT_10_e: + new_item_no = dItemNo_BOMB_10_e; break; - case fpcNm_ITEM_WATER_BOMB_20: - new_item_no = fpcNm_ITEM_BOMB_20; + case dItemNo_WATER_BOMB_20_e: + new_item_no = dItemNo_BOMB_20_e; break; - case fpcNm_ITEM_BOMB_INSECT_30: - new_item_no = fpcNm_ITEM_BOMB_30; + case dItemNo_BOMB_INSECT_30_e: + new_item_no = dItemNo_BOMB_30_e; break; } break; - case fpcNm_ITEM_WATER_BOMB: + case dItemNo_WATER_BOMB_e: switch (i_itemNo) { - case fpcNm_ITEM_BOMB_INSECT_20: - case fpcNm_ITEM_BOMB_INSECT_30: - new_item_no = fpcNm_ITEM_WATER_BOMB_30; + case dItemNo_BOMB_INSECT_20_e: + case dItemNo_BOMB_INSECT_30_e: + new_item_no = dItemNo_WATER_BOMB_30_e; break; - case fpcNm_ITEM_BOMB_5: - case fpcNm_ITEM_BOMB_INSECT_5: - new_item_no = fpcNm_ITEM_WATER_BOMB_5; + case dItemNo_BOMB_5_e: + case dItemNo_BOMB_INSECT_5_e: + new_item_no = dItemNo_WATER_BOMB_5_e; break; - case fpcNm_ITEM_BOMB_10: - case fpcNm_ITEM_BOMB_INSECT_10: - new_item_no = fpcNm_ITEM_WATER_BOMB_10; + case dItemNo_BOMB_10_e: + case dItemNo_BOMB_INSECT_10_e: + new_item_no = dItemNo_WATER_BOMB_10_e; break; - case fpcNm_ITEM_BOMB_20: - case fpcNm_ITEM_BOMB_30: - new_item_no = fpcNm_ITEM_WATER_BOMB_20; + case dItemNo_BOMB_20_e: + case dItemNo_BOMB_30_e: + new_item_no = dItemNo_WATER_BOMB_20_e; break; } break; - case fpcNm_ITEM_POKE_BOMB: + case dItemNo_POKE_BOMB_e: switch (i_itemNo) { - case fpcNm_ITEM_WATER_BOMB_30: - new_item_no = fpcNm_ITEM_BOMB_INSECT_20; + case dItemNo_WATER_BOMB_30_e: + new_item_no = dItemNo_BOMB_INSECT_20_e; break; - case fpcNm_ITEM_BOMB_5: - case fpcNm_ITEM_WATER_BOMB_5: - new_item_no = fpcNm_ITEM_BOMB_INSECT_5; + case dItemNo_BOMB_5_e: + case dItemNo_WATER_BOMB_5_e: + new_item_no = dItemNo_BOMB_INSECT_5_e; break; - case fpcNm_ITEM_BOMB_10: - case fpcNm_ITEM_BOMB_20: - case fpcNm_ITEM_BOMB_30: - case fpcNm_ITEM_WATER_BOMB_10: - case fpcNm_ITEM_WATER_BOMB_20: - new_item_no = fpcNm_ITEM_BOMB_INSECT_10; + case dItemNo_BOMB_10_e: + case dItemNo_BOMB_20_e: + case dItemNo_BOMB_30_e: + case dItemNo_WATER_BOMB_10_e: + case dItemNo_WATER_BOMB_20_e: + new_item_no = dItemNo_BOMB_INSECT_10_e; break; } break; - case fpcNm_ITEM_BOMB_BAG_LV1: + case dItemNo_BOMB_BAG_LV1_e: break; } @@ -1163,23 +1163,23 @@ u8 daTbox_c::getBombItemNo(u8 i_bombType, u8 i_itemNo) { u8 daTbox_c::getBombItemNo2(u8 i_bombType1, u8 i_bombType2, u8 i_itemNo) { u8 new_type, new_item_no = i_itemNo; switch (i_itemNo) { - case fpcNm_ITEM_BOMB_5: - case fpcNm_ITEM_BOMB_10: - case fpcNm_ITEM_BOMB_20: - case fpcNm_ITEM_BOMB_30: - new_type = fpcNm_ITEM_NORMAL_BOMB; + case dItemNo_BOMB_5_e: + case dItemNo_BOMB_10_e: + case dItemNo_BOMB_20_e: + case dItemNo_BOMB_30_e: + new_type = dItemNo_NORMAL_BOMB_e; break; - case fpcNm_ITEM_WATER_BOMB_5: - case fpcNm_ITEM_WATER_BOMB_10: - case fpcNm_ITEM_WATER_BOMB_20: - case fpcNm_ITEM_WATER_BOMB_30: - new_type = fpcNm_ITEM_WATER_BOMB; + case dItemNo_WATER_BOMB_5_e: + case dItemNo_WATER_BOMB_10_e: + case dItemNo_WATER_BOMB_20_e: + case dItemNo_WATER_BOMB_30_e: + new_type = dItemNo_WATER_BOMB_e; break; - case fpcNm_ITEM_BOMB_INSECT_5: - case fpcNm_ITEM_BOMB_INSECT_10: - case fpcNm_ITEM_BOMB_INSECT_20: - case fpcNm_ITEM_BOMB_INSECT_30: - new_type = fpcNm_ITEM_POKE_BOMB; + case dItemNo_BOMB_INSECT_5_e: + case dItemNo_BOMB_INSECT_10_e: + case dItemNo_BOMB_INSECT_20_e: + case dItemNo_BOMB_INSECT_30_e: + new_type = dItemNo_POKE_BOMB_e; break; } @@ -1191,30 +1191,30 @@ u8 daTbox_c::getBombItemNo2(u8 i_bombType1, u8 i_bombType2, u8 i_itemNo) { if (i_bombType1 == new_type || i_bombType2 == new_type) { // "There's a bag with the same bomb in it\n" OS_REPORT("同じ爆弾入りの袋があるのでそこに入れます\n"); - } else if (i_bombType1 == fpcNm_ITEM_BOMB_BAG_LV1 || i_bombType2 == fpcNm_ITEM_BOMB_BAG_LV1) { + } else if (i_bombType1 == dItemNo_BOMB_BAG_LV1_e || i_bombType2 == dItemNo_BOMB_BAG_LV1_e) { // "This is an empty bag so put it in\n" OS_REPORT("空の袋があるのでそこに入れます\n"); } else { switch (new_type) { - case fpcNm_ITEM_NORMAL_BOMB: - if (i_bombType1 == fpcNm_ITEM_WATER_BOMB || i_bombType2 == fpcNm_ITEM_WATER_BOMB) { - new_item_no = getBombItemNo(fpcNm_ITEM_WATER_BOMB, i_itemNo); + case dItemNo_NORMAL_BOMB_e: + if (i_bombType1 == dItemNo_WATER_BOMB_e || i_bombType2 == dItemNo_WATER_BOMB_e) { + new_item_no = getBombItemNo(dItemNo_WATER_BOMB_e, i_itemNo); } else { - new_item_no = getBombItemNo(fpcNm_ITEM_POKE_BOMB, i_itemNo); + new_item_no = getBombItemNo(dItemNo_POKE_BOMB_e, i_itemNo); } break; - case fpcNm_ITEM_WATER_BOMB: - if (i_bombType1 == fpcNm_ITEM_NORMAL_BOMB || i_bombType2 == fpcNm_ITEM_NORMAL_BOMB) { - new_item_no = getBombItemNo(fpcNm_ITEM_NORMAL_BOMB, i_itemNo); + case dItemNo_WATER_BOMB_e: + if (i_bombType1 == dItemNo_NORMAL_BOMB_e || i_bombType2 == dItemNo_NORMAL_BOMB_e) { + new_item_no = getBombItemNo(dItemNo_NORMAL_BOMB_e, i_itemNo); } else { - new_item_no = getBombItemNo(fpcNm_ITEM_POKE_BOMB, i_itemNo); + new_item_no = getBombItemNo(dItemNo_POKE_BOMB_e, i_itemNo); } break; - case fpcNm_ITEM_POKE_BOMB: - if (i_bombType1 == fpcNm_ITEM_NORMAL_BOMB || i_bombType2 == fpcNm_ITEM_NORMAL_BOMB) { - new_item_no = getBombItemNo(fpcNm_ITEM_NORMAL_BOMB, i_itemNo); + case dItemNo_POKE_BOMB_e: + if (i_bombType1 == dItemNo_NORMAL_BOMB_e || i_bombType2 == dItemNo_NORMAL_BOMB_e) { + new_item_no = getBombItemNo(dItemNo_NORMAL_BOMB_e, i_itemNo); } else { - new_item_no = getBombItemNo(fpcNm_ITEM_WATER_BOMB, i_itemNo); + new_item_no = getBombItemNo(dItemNo_WATER_BOMB_e, i_itemNo); } break; } @@ -1227,23 +1227,23 @@ u8 daTbox_c::getBombItemNo2(u8 i_bombType1, u8 i_bombType2, u8 i_itemNo) { u8 daTbox_c::getBombItemNo3(u8 i_bombType1, u8 i_bombType2, u8 i_bombType3, u8 i_itemNo) { u8 new_type, new_item_no = i_itemNo; switch (i_itemNo) { - case fpcNm_ITEM_BOMB_5: - case fpcNm_ITEM_BOMB_10: - case fpcNm_ITEM_BOMB_20: - case fpcNm_ITEM_BOMB_30: - new_type = fpcNm_ITEM_NORMAL_BOMB; + case dItemNo_BOMB_5_e: + case dItemNo_BOMB_10_e: + case dItemNo_BOMB_20_e: + case dItemNo_BOMB_30_e: + new_type = dItemNo_NORMAL_BOMB_e; break; - case fpcNm_ITEM_WATER_BOMB_5: - case fpcNm_ITEM_WATER_BOMB_10: - case fpcNm_ITEM_WATER_BOMB_20: - case fpcNm_ITEM_WATER_BOMB_30: - new_type = fpcNm_ITEM_WATER_BOMB; + case dItemNo_WATER_BOMB_5_e: + case dItemNo_WATER_BOMB_10_e: + case dItemNo_WATER_BOMB_20_e: + case dItemNo_WATER_BOMB_30_e: + new_type = dItemNo_WATER_BOMB_e; break; - case fpcNm_ITEM_BOMB_INSECT_5: - case fpcNm_ITEM_BOMB_INSECT_10: - case fpcNm_ITEM_BOMB_INSECT_20: - case fpcNm_ITEM_BOMB_INSECT_30: - new_type = fpcNm_ITEM_POKE_BOMB; + case dItemNo_BOMB_INSECT_5_e: + case dItemNo_BOMB_INSECT_10_e: + case dItemNo_BOMB_INSECT_20_e: + case dItemNo_BOMB_INSECT_30_e: + new_type = dItemNo_POKE_BOMB_e; break; } @@ -1255,30 +1255,30 @@ u8 daTbox_c::getBombItemNo3(u8 i_bombType1, u8 i_bombType2, u8 i_bombType3, u8 i if (i_bombType1 == new_type || i_bombType2 == new_type || i_bombType3 == new_type) { // "There's a bag with the same bomb in it\n" OS_REPORT("同じ爆弾入りの袋があるのでそこに入れます\n"); - } else if (i_bombType1 == fpcNm_ITEM_BOMB_BAG_LV1 || i_bombType2 == fpcNm_ITEM_BOMB_BAG_LV1 || i_bombType3 == fpcNm_ITEM_BOMB_BAG_LV1) { + } else if (i_bombType1 == dItemNo_BOMB_BAG_LV1_e || i_bombType2 == dItemNo_BOMB_BAG_LV1_e || i_bombType3 == dItemNo_BOMB_BAG_LV1_e) { // "This is an empty bag so put it in\n" OS_REPORT("空の袋があるのでそこに入れます\n"); } else { switch (new_type) { - case fpcNm_ITEM_NORMAL_BOMB: - if (i_bombType1 == fpcNm_ITEM_WATER_BOMB || i_bombType2 == fpcNm_ITEM_WATER_BOMB || i_bombType3 == fpcNm_ITEM_WATER_BOMB) { - new_item_no = getBombItemNo(fpcNm_ITEM_WATER_BOMB, i_itemNo); + case dItemNo_NORMAL_BOMB_e: + if (i_bombType1 == dItemNo_WATER_BOMB_e || i_bombType2 == dItemNo_WATER_BOMB_e || i_bombType3 == dItemNo_WATER_BOMB_e) { + new_item_no = getBombItemNo(dItemNo_WATER_BOMB_e, i_itemNo); } else { - new_item_no = getBombItemNo(fpcNm_ITEM_POKE_BOMB, i_itemNo); + new_item_no = getBombItemNo(dItemNo_POKE_BOMB_e, i_itemNo); } break; - case fpcNm_ITEM_WATER_BOMB: - if (i_bombType1 == fpcNm_ITEM_NORMAL_BOMB || i_bombType2 == fpcNm_ITEM_NORMAL_BOMB || i_bombType3 == fpcNm_ITEM_NORMAL_BOMB) { - new_item_no = getBombItemNo(fpcNm_ITEM_NORMAL_BOMB, i_itemNo); + case dItemNo_WATER_BOMB_e: + if (i_bombType1 == dItemNo_NORMAL_BOMB_e || i_bombType2 == dItemNo_NORMAL_BOMB_e || i_bombType3 == dItemNo_NORMAL_BOMB_e) { + new_item_no = getBombItemNo(dItemNo_NORMAL_BOMB_e, i_itemNo); } else { - new_item_no = getBombItemNo(fpcNm_ITEM_POKE_BOMB, i_itemNo); + new_item_no = getBombItemNo(dItemNo_POKE_BOMB_e, i_itemNo); } break; - case fpcNm_ITEM_POKE_BOMB: - if (i_bombType1 == fpcNm_ITEM_NORMAL_BOMB || i_bombType2 == fpcNm_ITEM_NORMAL_BOMB || i_bombType3 == fpcNm_ITEM_NORMAL_BOMB) { - new_item_no = getBombItemNo(fpcNm_ITEM_NORMAL_BOMB, i_itemNo); + case dItemNo_POKE_BOMB_e: + if (i_bombType1 == dItemNo_NORMAL_BOMB_e || i_bombType2 == dItemNo_NORMAL_BOMB_e || i_bombType3 == dItemNo_NORMAL_BOMB_e) { + new_item_no = getBombItemNo(dItemNo_NORMAL_BOMB_e, i_itemNo); } else { - new_item_no = getBombItemNo(fpcNm_ITEM_WATER_BOMB, i_itemNo); + new_item_no = getBombItemNo(dItemNo_WATER_BOMB_e, i_itemNo); } break; } @@ -1297,7 +1297,7 @@ u8 daTbox_c::getBombItemNoMain(u8 i_itemNo) { bomb_max[i] = dComIfGs_getBombMax(bomb_type[i]); bomb_num[i] = dComIfGs_getBombNum(i); - if (bomb_type[i] != fpcNm_ITEM_NONE) { + if (bomb_type[i] != dItemNo_NONE_e) { bag_count++; } } @@ -1390,9 +1390,9 @@ u8 daTbox_c::getBombItemNoMain(u8 i_itemNo) { int daTbox_c::setGetDemoItem() { u8 item_no = getItemNo(); - if (item_no == fpcNm_ITEM_BOMB_5 || item_no == fpcNm_ITEM_BOMB_10 || item_no == fpcNm_ITEM_BOMB_20 || item_no == fpcNm_ITEM_BOMB_30 || - item_no == fpcNm_ITEM_WATER_BOMB_5 || item_no == fpcNm_ITEM_WATER_BOMB_10 || item_no == fpcNm_ITEM_WATER_BOMB_20 || item_no == fpcNm_ITEM_WATER_BOMB_30 || - item_no == fpcNm_ITEM_BOMB_INSECT_5 || item_no == fpcNm_ITEM_BOMB_INSECT_10 || item_no == fpcNm_ITEM_BOMB_INSECT_20 || item_no == fpcNm_ITEM_BOMB_INSECT_30) + if (item_no == dItemNo_BOMB_5_e || item_no == dItemNo_BOMB_10_e || item_no == dItemNo_BOMB_20_e || item_no == dItemNo_BOMB_30_e || + item_no == dItemNo_WATER_BOMB_5_e || item_no == dItemNo_WATER_BOMB_10_e || item_no == dItemNo_WATER_BOMB_20_e || item_no == dItemNo_WATER_BOMB_30_e || + item_no == dItemNo_BOMB_INSECT_5_e || item_no == dItemNo_BOMB_INSECT_10_e || item_no == dItemNo_BOMB_INSECT_20_e || item_no == dItemNo_BOMB_INSECT_30_e) { item_no = getBombItemNoMain(item_no); } @@ -1904,20 +1904,20 @@ static actor_method_class daTbox_METHODS = { }; actor_process_profile_definition g_profile_TBOX = { - fpcLy_CURRENT_e, - 4, - fpcPi_CURRENT_e, - PROC_TBOX, - &g_fpcLf_Method.base, - sizeof(daTbox_c), - 0, - 0, - &g_fopAc_Method.base, - 0x10c, - &daTbox_METHODS, - 0x44100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TBOX_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTbox_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TBOX_e, + /* Actor SubMtd */ &daTbox_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_tbox2.cpp b/src/d/actor/d_a_tbox2.cpp index 03c35f49ac..f2ac844bce 100644 --- a/src/d/actor/d_a_tbox2.cpp +++ b/src/d/actor/d_a_tbox2.cpp @@ -456,18 +456,18 @@ static actor_method_class daTbox2_METHODS = { }; actor_process_profile_definition g_profile_TBOX2 = { - fpcLy_CURRENT_e, - 4, - fpcPi_CURRENT_e, - PROC_TBOX2, - &g_fpcLf_Method.base, - sizeof(daTbox2_c), - 0, - 0, - &g_fopAc_Method.base, - 269, - &daTbox2_METHODS, - 0x44100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TBOX2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTbox2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TBOX2_e, + /* Actor SubMtd */ &daTbox2_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tboxSw.cpp b/src/d/actor/d_a_tboxSw.cpp index e0d13dfe7f..e3ab3aed8e 100644 --- a/src/d/actor/d_a_tboxSw.cpp +++ b/src/d/actor/d_a_tboxSw.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_tboxSw.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" int daTboxSw_c::Create() { return 1; @@ -63,18 +63,18 @@ static actor_method_class l_daTboxSw_Method = { }; actor_process_profile_definition g_profile_TBOX_SW = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_TBOX_SW, - &g_fpcLf_Method.base, - sizeof(daTboxSw_c), - 0, - 0, - &g_fopAc_Method.base, - 526, - &l_daTboxSw_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TBOX_SW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTboxSw_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TBOX_SW_e, + /* Actor SubMtd */ &l_daTboxSw_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_title.cpp b/src/d/actor/d_a_title.cpp index 3b3a0034a6..923365993c 100644 --- a/src/d/actor/d_a_title.cpp +++ b/src/d/actor/d_a_title.cpp @@ -310,11 +310,11 @@ void daTitle_c::nextScene_proc() { if (!dScnLogo_c::isOpeningCut()) #endif { - fopScnM_ChangeReq(playScene, PROC_NAME_SCENE, 0, 5); + fopScnM_ChangeReq(playScene, fpcNm_NAME_SCENE_e, 0, 5); } #if DEBUG else { - fopScnM_ChangeReq(playScene, PROC_MENU_SCENE, 0, 5); + fopScnM_ChangeReq(playScene, fpcNm_MENU_SCENE_e, 0, 5); dComIfGs_init(); dComIfG_playerStatusD(); } @@ -434,18 +434,18 @@ static actor_method_class l_daTitle_Method = { }; actor_process_profile_definition g_profile_TITLE = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_TITLE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTitle_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 0xa, // mPriority - &l_daTitle_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TITLE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTitle_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TITLE_e, + /* Actor SubMtd */ &l_daTitle_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_vrbox.cpp b/src/d/actor/d_a_vrbox.cpp index 24fa1fb9d3..e1eedb10c0 100644 --- a/src/d/actor/d_a_vrbox.cpp +++ b/src/d/actor/d_a_vrbox.cpp @@ -153,18 +153,18 @@ static actor_method_class l_daVrbox_Method = { }; actor_process_profile_definition g_profile_VRBOX = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_VRBOX, - &g_fpcLf_Method.base, - sizeof(vrbox_class), - 0, - 0, - &g_fopAc_Method.base, - 7, - &l_daVrbox_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_VRBOX_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(vrbox_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_VRBOX_e, + /* Actor SubMtd */ &l_daVrbox_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp index 11f25a7e08..a980eeb61f 100644 --- a/src/d/actor/d_a_vrbox2.cpp +++ b/src/d/actor/d_a_vrbox2.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_vrbox2.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_kankyo_rain.h" #include "f_op/f_op_camera_mng.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" @@ -458,18 +458,18 @@ static actor_method_class l_daVrbox2_Method = { }; actor_process_profile_definition g_profile_VRBOX2 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_VRBOX2, - &g_fpcLf_Method.base, - sizeof(vrbox2_class), - 0, - 0, - &g_fopAc_Method.base, - 4, - &l_daVrbox2_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_VRBOX2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(vrbox2_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_VRBOX2_e, + /* Actor SubMtd */ &l_daVrbox2_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_warp_bug.cpp b/src/d/actor/d_a_warp_bug.cpp index d317b12fe4..a80953cbb5 100644 --- a/src/d/actor/d_a_warp_bug.cpp +++ b/src/d/actor/d_a_warp_bug.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_warp_bug.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" void daWarpBug_c::create_init() {} @@ -159,18 +159,18 @@ static actor_method_class l_daWarpBug_Method = { }; actor_process_profile_definition g_profile_WarpBug = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_WarpBug, - &g_fpcLf_Method.base, - sizeof(daWarpBug_c), - 0, - 0, - &g_fopAc_Method.base, - 726, - &l_daWarpBug_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_WarpBug_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daWarpBug_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_WarpBug_e, + /* Actor SubMtd */ &l_daWarpBug_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_ykgr.cpp b/src/d/actor/d_a_ykgr.cpp index d059db6862..980da689f5 100644 --- a/src/d/actor/d_a_ykgr.cpp +++ b/src/d/actor/d_a_ykgr.cpp @@ -198,7 +198,13 @@ inline int daYkgr_c::_execute() { if (m_alpha_flag == 0) { if (m_alpha > 0) { if (m_alpha > l_HIO.field_0xc) { - m_alpha = m_alpha - l_HIO.field_0xc; + // this doesn't feel right but it looks an awful lot + // like the cast only exists in Shield+ShieldD +#if PLATFORM_SHIELD + m_alpha -= (u8)l_HIO.field_0xc; +#else + m_alpha -= l_HIO.field_0xc; +#endif } else { m_alpha = 0; } @@ -206,7 +212,11 @@ inline int daYkgr_c::_execute() { } else { if (m_alpha < 0xff) { if (m_alpha < 0xff - l_HIO.field_0xc) { - m_alpha = m_alpha + l_HIO.field_0xc; +#if PLATFORM_SHIELD + m_alpha += (u8)l_HIO.field_0xc; +#else + m_alpha += l_HIO.field_0xc; +#endif } else { m_alpha = 0xff; } @@ -235,10 +245,12 @@ void daYkgr_c::set_mtx() { MTXCopy(mDoMtx_stack_c::get(), field_0x570); } -inline int daYkgr_c::_draw() { - bool rv; +// typically we would expect an int return type, but debug seems to indicate this returns a bool +inline bool daYkgr_c::_draw() { f32 alpha = 255.0f; if (strcmp(dComIfGp_getStartStageName(), "D_MN04A") == 0) { + int dummy; // force stack pointer into r31 on debug + alpha = dComIfGs_BossLife_public_Get() / 100.0f; m_alpha = alpha * 255.0f; if (m_alpha == 0) { @@ -246,7 +258,7 @@ inline int daYkgr_c::_draw() { } } if (m_alpha == 0) { - rv = true; + return true; } else { set_mtx(); if (m_emitter != NULL) { @@ -258,9 +270,8 @@ inline int daYkgr_c::_draw() { m_emitter->setGlobalAlpha(m_alpha); } } - rv = true; + return true; } - return rv; } static int daYkgrDraw(void* i_this) { @@ -280,20 +291,20 @@ static actor_method_class daYkgrMethodTable = { }; actor_process_profile_definition g_profile_Ykgr = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Ykgr, - &g_fpcLf_Method.base, - sizeof(daYkgr_c), - 0, - 0, - &g_fopAc_Method.base, - 0x01AE, - &daYkgrMethodTable, - 0x00044000, - 0, - 0, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Ykgr_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daYkgr_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Ykgr_e, + /* Actor SubMtd */ &daYkgrMethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ 0, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_flower.inc b/src/d/actor/d_flower.inc index c738c22510..07c722e521 100644 --- a/src/d/actor/d_flower.inc +++ b/src/d/actor/d_flower.inc @@ -293,7 +293,7 @@ void dFlower_data_c::WorkAt_NoCutAnim(fopAc_ac_c* i_hitActor, u32 i_massFlg, int cXyz sp14(*var_r26->GetAtVecP()); f32 temp_f31 = sp14.abs2XZ(); - if (cM3d_IsZero(temp_f31) && fopAcM_GetName(i_hitActor) == PROC_ALINK) { + if (cM3d_IsZero(temp_f31) && fopAcM_GetName(i_hitActor) == fpcNm_ALINK_e) { sp14.x = m_pos.x - i_hitActor->current.pos.x; sp14.y = m_pos.y - i_hitActor->current.pos.y; sp14.z = m_pos.z - i_hitActor->current.pos.z; @@ -453,7 +453,7 @@ void dFlower_data_c::hitCheck(fopAc_ac_c* i_hitActor, int i_roomNo) { fopAc_ac_c* hit_actor; u32 mass_flags = dComIfG_Ccsp()->ChkMass(&sp14, &hit_actor, &hitinf); - bool at_hit = (mass_flags & 1) && (hit_actor != NULL && fopAcM_GetName(hit_actor) != PROC_Obj_Carry); + bool at_hit = (mass_flags & 1) && (hit_actor != NULL && fopAcM_GetName(hit_actor) != fpcNm_Obj_Carry_e); if (!(mass_flags & 2) && !at_hit) { if (field_0x01 >= 8) { diff --git a/src/d/actor/d_grass.inc b/src/d/actor/d_grass.inc index c4d22b5ed1..020f504f81 100644 --- a/src/d/actor/d_grass.inc +++ b/src/d/actor/d_grass.inc @@ -373,7 +373,7 @@ void dGrass_data_c::hitCheck(int i_roomNo, u16 i_particleName) { fopAc_ac_c* hit_actor; u32 mass_flags = dComIfG_Ccsp()->ChkMass(&m_pos, &hit_actor, &hitinf); - bool at_hit = (mass_flags & 1) && (hit_actor != NULL && fopAcM_GetName(hit_actor) != PROC_Obj_Carry); + bool at_hit = (mass_flags & 1) && (hit_actor != NULL && fopAcM_GetName(hit_actor) != fpcNm_Obj_Carry_e); if (!(mass_flags & 2) && !at_hit) { if (field_0x02 >= 16) { diff --git a/src/d/d_a_horse_static.cpp b/src/d/d_a_horse_static.cpp index 52cceddaf8..1c196043ed 100644 --- a/src/d/d_a_horse_static.cpp +++ b/src/d/d_a_horse_static.cpp @@ -5,48 +5,48 @@ #include "d/actor/d_a_tag_hstop.h" BOOL e_wb_class::checkWait() { - return mActionMode == 0x2A; + return ride_mode == 0x2A; } void e_wb_class::setPlayerRideNow() { - mActionID = ACT_PL_RIDE_NOW; - mActionMode = 0; - mStatusFlags |= u16(3); + action = ACT_PL_RIDE_NOW; + ride_mode = 0; + status_flag |= u16(3); } void e_wb_class::setPlayerRide() { - mActionID = ACT_PL_RIDE; - mActionMode = 0; - mStatusFlags |= u16(3); + action = ACT_PL_RIDE; + ride_mode = 0; + status_flag |= u16(3); - mZ2Ride.setLinkRiding(true); + sound.setLinkRiding(true); } void e_wb_class::getOff() { - if (!checkDownDamage() || mActionID == ACT_PL_RIDE_NOW) { - mActionID = 0; + if (!checkDownDamage() || action == ACT_PL_RIDE_NOW) { + action = 0; } else { - field_0x692 = 0; + old_action = 0; } - mActionMode = 0; - mStatusFlags &= u16(~3); - mZ2Ride.setLinkRiding(false); + ride_mode = 0; + status_flag &= u16(~3); + sound.setLinkRiding(false); } BOOL e_wb_class::checkDownDamage() { - return mActionID != ACT_PL_RIDE && mActionID != 0x66 && mActionID != ACT_S_DAMAGE; + return action != ACT_PL_RIDE && action != ACT_PL_RIDE2 && action != ACT_S_DAMAGE; } BOOL e_wb_class::checkNormalRideMode() const { - return mActionID != 0x66 || mActionMode < 1; + return action != ACT_PL_RIDE2 || ride_mode < 1; } void e_wb_class::setRunRideMode() { - if (mActionID == ACT_PL_RIDE) { - mActionMode = 0; - mActionID = ACT_S_DAMAGE; - field_0x692 = 0x65; + if (action == ACT_PL_RIDE) { + ride_mode = 0; + action = ACT_S_DAMAGE; + old_action = ACT_PL_RIDE; } } diff --git a/src/d/d_a_obj.cpp b/src/d/d_a_obj.cpp index 7e94661310..b3eec4b77d 100644 --- a/src/d/d_a_obj.cpp +++ b/src/d/d_a_obj.cpp @@ -188,7 +188,7 @@ void HitSeStart(cXyz const* i_sePos, int i_roomNo, dCcD_GObjInf const* i_CcObj, } else if (hit_obj->ChkAtType(AT_TYPE_HOOKSHOT)) { sfx = Z2SE_HIT_HOOKSHOT_REBOUND; } else { - if (fopAcM_GetProfName(hit_actor) == PROC_ALINK) { + if (fopAcM_GetProfName(hit_actor) == fpcNm_ALINK_e) { daPy_py_c* sp14 = (daPy_py_c*)hit_actor; if (sp14->checkMasterSwordEquip()) { master_sword_hit = true; diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index 332194e75f..efa3bfec26 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -636,7 +636,7 @@ int dAttention_c::makeList() { void dAttention_c::setOwnerAttentionPos() { mOwnerAttnPos = mpPlayer->attention_info.position; - if (fopAcM_GetName(mpPlayer) == PROC_ALINK) { + if (fopAcM_GetName(mpPlayer) == fpcNm_ALINK_e) { mOwnerAttnPos.y -= ((daPy_py_c*)mpPlayer)->getAttentionOffsetY(); } } @@ -830,7 +830,7 @@ bool dAttention_c::chaseAttention() { f32 dAttention_c::EnemyDistance(fopAc_ac_c* i_actor) { if (i_actor == mpPlayer || mpPlayer == NULL) { return -1.0f; - } else if (fopAcM_GetProfName(i_actor) == PROC_ALINK) { + } else if (fopAcM_GetProfName(i_actor) == fpcNm_ALINK_e) { return -1.0f; } else if (!(i_actor->attention_info.flags & fopAc_AttnFlag_BATTLE_e) && !(i_actor->attention_info.flags & fopAc_AttnFlag_ENEMY_NOLOCK_e)) { @@ -1749,7 +1749,7 @@ fopAc_ac_c* dAttCatch_c::convPId(fpc_ProcID i_id) { } void dAttCatch_c::init() { - mCatchItemNo = fpcNm_ITEM_WATER_BOTTLE; + mCatchItemNo = dItemNo_WATER_BOTTLE_e; mRequestActorID = fpcM_ERROR_PROCESS_ID_e; mCatghTargetID = fpcM_ERROR_PROCESS_ID_e; field_0x4 = 3; @@ -1760,7 +1760,7 @@ void dAttCatch_c::proc() { mChangeItem = mCatchItemNo; mRequestActorID = fpcM_ERROR_PROCESS_ID_e; field_0x4 = 3; - mCatchItemNo = fpcNm_ITEM_WATER_BOTTLE; + mCatchItemNo = dItemNo_WATER_BOTTLE_e; } int dAttCatch_c::request(fopAc_ac_c* i_reqActor, u8 i_itemNo, f32 i_horizontalDist, f32 i_upDist, diff --git a/src/d/d_bg_parts.cpp b/src/d/d_bg_parts.cpp index 8a168a36a6..930c3f63b1 100644 --- a/src/d/d_bg_parts.cpp +++ b/src/d/d_bg_parts.cpp @@ -660,7 +660,7 @@ int dBgp_c::execute(bool param_0) { angle.x = (unitData->field_0x14 << 8) | unitData->field_0x5; angle.z = (unitData->field_0x4 << 8) | unitData->field_0x3; - fopAcM_create(PROC_SET_BG_OBJ, parameters, &pos, mPacket.getRoomNo(), &angle, &size, -1); + fopAcM_create(fpcNm_SET_BG_OBJ_e, parameters, &pos, mPacket.getRoomNo(), &angle, &size, -1); } unitData++; } diff --git a/src/d/d_bg_s_acch.cpp b/src/d/d_bg_s_acch.cpp index 1f3046128c..0259c3f55d 100644 --- a/src/d/d_bg_s_acch.cpp +++ b/src/d/d_bg_s_acch.cpp @@ -236,7 +236,7 @@ void dBgS_Acch::LineCheck(dBgS& i_bgs) { pos.y += var_f2; if (GetSpeedY() < 0.0f) { - if (m_my_ac != NULL && fopAcM_GetName(m_my_ac) == PROC_ALINK && + if (m_my_ac != NULL && fopAcM_GetName(m_my_ac) == fpcNm_ALINK_e && !static_cast(m_my_ac)->checkPlayerFly() && ChkLink()) { pos.y -= GetSpeedY(); diff --git a/src/d/d_bomb.cpp b/src/d/d_bomb.cpp index 09d05aaf0f..6b48ef87c3 100644 --- a/src/d/d_bomb.cpp +++ b/src/d/d_bomb.cpp @@ -14,14 +14,14 @@ bool dBomb_c::checkStateCarry() { } bool dBomb_c::checkFlowerBombWait(fopAc_ac_c* i_actor) { - return (fopAcM_GetName(i_actor) == PROC_NBOMB && fopAcM_GetParam(i_actor) == PRM_FLOWER_BOMB); + return (fopAcM_GetName(i_actor) == fpcNm_NBOMB_e && fopAcM_GetParam(i_actor) == PRM_FLOWER_BOMB); } bool dBomb_c::checkWaterBomb(fopAc_ac_c* i_actor) { - return (fopAcM_GetName(i_actor) == PROC_NBOMB && ((daNbomb_c*)i_actor)->checkWaterBomb()); + return (fopAcM_GetName(i_actor) == fpcNm_NBOMB_e && ((daNbomb_c*)i_actor)->checkWaterBomb()); } bool dBomb_c::checkInsectBombMove(fopAc_ac_c* i_actor) { - return (fopAcM_GetName(i_actor) == PROC_NBOMB && + return (fopAcM_GetName(i_actor) == fpcNm_NBOMB_e && fopAcM_GetParam(i_actor) == PRM_INSECT_BOMB_MOVE); } diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index c177b7bad2..a24dcd47dc 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -45,7 +45,7 @@ static inline f32 rangef(f32 value1, f32 value2, f32 ratio) { } inline static bool is_player(fopAc_ac_c* actor) { - return fopAcM_GetName(actor) == PROC_ALINK || fopAcM_GetName(actor) == PROC_ALINK; + return fopAcM_GetName(actor) == fpcNm_ALINK_e || fopAcM_GetName(actor) == fpcNm_ALINK_e; } static void hideActor(fopAc_ac_c* actor) { @@ -54,10 +54,10 @@ static void hideActor(fopAc_ac_c* actor) { daPy_py_c* player = (daPy_py_c*)actor; if (player->checkHorseRide()) { daHorse_c* horse = dComIfGp_getHorseActor(); - fopAcM_OnStatus(horse, 0x1000000); + fopAcM_OnStatus(horse, fopAcStts_NODRAW_e); } } else { - fopAcM_OnStatus(actor, 0x1000000); + fopAcM_OnStatus(actor, fopAcStts_NODRAW_e); } } @@ -1705,13 +1705,13 @@ s32 dCamera_c::nextMode(s32 i_curMode) { } else if (link->checkGoatThrow() && dComIfGoat_GetThrow() != NULL) { dComIfGp_getAttention()->LockSoundOff(); mpLockonTarget = dComIfGoat_GetThrow(); - if (fopAcM_GetName(mpLockonTarget) == PROC_E_GOB) { + if (fopAcM_GetName(mpLockonTarget) == fpcNm_E_GOB_e) { if (link->checkGoatThrowAfter()) { next_mode = 2; } else { next_mode = 1; } - } else if (fopAcM_GetName(mpLockonTarget) == PROC_OBJ_GRA) { + } else if (fopAcM_GetName(mpLockonTarget) == fpcNm_OBJ_GRA_e) { next_mode = 1; } else { next_mode = 2; @@ -4166,7 +4166,7 @@ bool dCamera_c::chaseCamera(s32 param_0) { if (player->checkThrowDamage()) { chase->field_0x91 = true; fopAc_ac_c* target = dComIfGp_getAttention()->LockonTarget(0); - if (target != NULL && fopAcM_GetName(target) == PROC_E_HZ) { + if (target != NULL && fopAcM_GetName(target) == fpcNm_E_HZ_e) { setFlag(0x2000); mpAuxTargetActor1 = target; } @@ -4662,8 +4662,8 @@ bool dCamera_c::lockonCamera(s32 param_0) { } if (mpLockonTarget != NULL) { - if (fopAcM_GetName(mpLockonTarget) == PROC_Obj_Bemos - || fopAcM_GetName(mpLockonTarget) == PROC_Obj_Lv6bemos2) + if (fopAcM_GetName(mpLockonTarget) == fpcNm_Obj_Bemos_e + || fopAcM_GetName(mpLockonTarget) == fpcNm_Obj_Lv6bemos2_e) { setUSOAngle(); } @@ -4742,7 +4742,7 @@ bool dCamera_c::lockonCamera(s32 param_0) { } if (mpLockonTarget != NULL && mLockOnActorID != fpcM_ERROR_PROCESS_ID_e - && fopAcM_GetName(mpLockonTarget) != PROC_E_HZ) + && fopAcM_GetName(mpLockonTarget) != fpcNm_E_HZ_e) { val15 = 60.0f; val16 = 20.0f; @@ -4750,12 +4750,12 @@ bool dCamera_c::lockonCamera(s32 param_0) { } if (mpLockonTarget != NULL) { - if (fopAcM_GetName(mpLockonTarget) == PROC_COW) { + if (fopAcM_GetName(mpLockonTarget) == fpcNm_COW_e) { val27 = 0.8f; val22 = 0.8f; val23 = 5.0f; val24 = 10.0f; - } else if (fopAcM_GetName(mpLockonTarget) == PROC_Obj_Cdoor) { + } else if (fopAcM_GetName(mpLockonTarget) == fpcNm_Obj_Cdoor_e) { val23 = 15.0f; val24 = 5.0f; } @@ -4985,7 +4985,7 @@ bool dCamera_c::lockonCamera(s32 param_0) { dComIfG_Bgsp().GetTriPla(lin_chk, &plane); mViewCache.mCenter = lin_chk.GetCross(); mViewCache.mCenter += *plane.GetNP() * 5.0f; - if (fopAcM_GetName(mpLockonTarget) != PROC_E_HZ) { + if (fopAcM_GetName(mpLockonTarget) != fpcNm_E_HZ_e) { ForceLockOff(mLockOnActorID); } } @@ -5323,9 +5323,9 @@ bool dCamera_c::talktoCamera(s32 param_0) { } bool sp5C = false; - if (fopAcM_GetName(speaker) == PROC_NI || fopAcM_GetName(speaker) == PROC_BD - || fopAcM_GetName(speaker) == PROC_SQ || fopAcM_GetName(speaker) == PROC_FR - || fopAcM_GetName(speaker) == PROC_DO || fopAcM_GetName(speaker) == PROC_NPC_NE) + if (fopAcM_GetName(speaker) == fpcNm_NI_e || fopAcM_GetName(speaker) == fpcNm_BD_e + || fopAcM_GetName(speaker) == fpcNm_SQ_e || fopAcM_GetName(speaker) == fpcNm_FR_e + || fopAcM_GetName(speaker) == fpcNm_DO_e || fopAcM_GetName(speaker) == fpcNm_NPC_NE_e) { sp5C = true; talk->field_0x54 = 260.0f; @@ -5336,7 +5336,7 @@ bool dCamera_c::talktoCamera(s32 param_0) { val23 = 40.0f; } - if (fopAcM_GetName(speaker) == PROC_Tag_Mwait) { + if (fopAcM_GetName(speaker) == fpcNm_Tag_Mwait_e) { daTagMwait_c* tagMwait = (daTagMwait_c*)speaker; if (tagMwait->checkEndMessage()) { talk->field_0x3c = 35; @@ -5458,10 +5458,10 @@ bool dCamera_c::talktoCamera(s32 param_0) { sp284.Val(talk->field_0x5c); sp280 = sp284 - talk->field_0x30.U(); talk->field_0x28.U(sp284); - } else if (fopAcM_GetName(speaker) == PROC_OBJ_KANBAN2 - || fopAcM_GetName(speaker) == PROC_TAG_KMSG - || fopAcM_GetName(speaker) == PROC_KNOB20 - || fopAcM_GetName(speaker) == PROC_Obj_NamePlate) { + } else if (fopAcM_GetName(speaker) == fpcNm_OBJ_KANBAN2_e + || fopAcM_GetName(speaker) == fpcNm_TAG_KMSG_e + || fopAcM_GetName(speaker) == fpcNm_KNOB20_e + || fopAcM_GetName(speaker) == fpcNm_Obj_NamePlate_e) { sp284.Val(directionOf(speaker)); sp280 = sp284 - talk->field_0x30.U(); talk->field_0x28.U(sp284); @@ -5553,7 +5553,7 @@ bool dCamera_c::talktoCamera(s32 param_0) { bool sp5B = false; int i = 0; - if (fopAcM_GetName(speaker) == PROC_MIDNA && mMidnaRidingAndVisible) { + if (fopAcM_GetName(speaker) == fpcNm_MIDNA_e && mMidnaRidingAndVisible) { talk->field_0x4 = attentionPos(speaker); talk->field_0x4.y -= 35.0f; f32 fVar36 = talk->field_0x30.U() - talk->field_0x28.U() > cSAngle::_0 ? -40.0f : 40.0f; @@ -5654,8 +5654,8 @@ bool dCamera_c::talktoCamera(s32 param_0) { } } - if ((fopAcM_GetName(speaker) == PROC_Tag_Mhint && ((daTagMhint_c*)speaker)->checkNoAttention()) - || (fopAcM_GetName(speaker) == PROC_Tag_Mstop && ((daTagMstop_c*)speaker)->checkNoAttention())) + if ((fopAcM_GetName(speaker) == fpcNm_Tag_Mhint_e && ((daTagMhint_c*)speaker)->checkNoAttention()) + || (fopAcM_GetName(speaker) == fpcNm_Tag_Mstop_e && ((daTagMstop_c*)speaker)->checkNoAttention())) { bool sp59 = false; if (mIsWolf == 1 && check_owner_action(mPadID, 0x100000)) { @@ -5726,7 +5726,7 @@ bool dCamera_c::talktoCamera(s32 param_0) { if (sp5C) { sp1508.y = attentionPos(speaker).y; } - if (fopAcM_GetName(speaker) == PROC_NPC_KKRI) { + if (fopAcM_GetName(speaker) == fpcNm_NPC_KKRI_e) { sp1508.y = attentionPos(speaker).y - 40.0f; } if (sp58) { @@ -8531,7 +8531,7 @@ bool dCamera_c::rideCamera(s32 param_0) { wk->field_0x98 = (daHorse_c*)wk->field_0xa0; wk->field_0x00 = 0; } else if (player->checkCargoCarry()) { - fopAc_ac_c* spA0 = fopAcM_SearchByName(PROC_KAGO); + fopAc_ac_c* spA0 = fopAcM_SearchByName(fpcNm_KAGO_e); if (spA0 != NULL) { wk->field_0x9c = spA0; wk->field_0xa0 = spA0; @@ -8596,9 +8596,9 @@ bool dCamera_c::rideCamera(s32 param_0) { if (player->checkBoardRide()) { wk->field_0x94 = 0; if (dComIfGs_isTmpBit((u16)dSv_event_tmp_flag_c::tempBitLabels[0x54])) { - wk->field_0x94 = fopAcM_SearchByName(PROC_NPC_YKM); + wk->field_0x94 = fopAcM_SearchByName(fpcNm_NPC_YKM_e); } else if (dComIfGs_isTmpBit((u16)dSv_event_tmp_flag_c::tempBitLabels[0x55])) { - wk->field_0x94 = fopAcM_SearchByName(PROC_NPC_YKW); + wk->field_0x94 = fopAcM_SearchByName(fpcNm_NPC_YKW_e); } } @@ -8720,8 +8720,8 @@ bool dCamera_c::rideCamera(s32 param_0) { } if (sp1AC != NULL && - (fopAcM_GetName(sp1AC) == PROC_E_RD || fopAcM_GetName(sp1AC) == PROC_E_FK || - fopAcM_GetName(sp1AC) == PROC_B_GND || fopAcM_GetName(sp1AC) == PROC_E_KR)) + (fopAcM_GetName(sp1AC) == fpcNm_E_RD_e || fopAcM_GetName(sp1AC) == fpcNm_E_FK_e || + fopAcM_GetName(sp1AC) == fpcNm_B_GND_e || fopAcM_GetName(sp1AC) == fpcNm_E_KR_e)) { cXyz sp4C0 = positionOf(sp1AC) - positionOf(wk->field_0x9c); cSAngle spF8 = -mViewCache.mDirection.U(); @@ -8754,7 +8754,7 @@ bool dCamera_c::rideCamera(s32 param_0) { } } - if (sp1AC != NULL && fopAcM_GetName(sp1AC) == PROC_E_KR) { + if (sp1AC != NULL && fopAcM_GetName(sp1AC) == fpcNm_E_KR_e) { val12 = -5.0f; val15 = 10.0f; val7 = 800.0f; @@ -8762,9 +8762,9 @@ bool dCamera_c::rideCamera(s32 param_0) { val2 = -20.0f; } else { if (sp1AC != NULL && - (fopAcM_GetName(sp1AC) == PROC_E_RD && + (fopAcM_GetName(sp1AC) == fpcNm_E_RD_e && (fopAcM_GetParam(sp1AC) & 4) != 0 || - fopAcM_GetName(sp1AC) == PROC_B_GND) && + fopAcM_GetName(sp1AC) == fpcNm_B_GND_e) && sp1A8 == NULL) { #if DEBUG @@ -8787,10 +8787,10 @@ bool dCamera_c::rideCamera(s32 param_0) { val20 = 15.0f; } } else { - if (sp1AC != NULL && (fopAcM_GetName(sp1AC) == PROC_E_RD || - fopAcM_GetName(sp1AC) == PROC_E_FK) || - sp1A8 != NULL && (fopAcM_GetName(sp1A8) == PROC_E_RD || - fopAcM_GetName(sp1A8) == PROC_E_FK) || + if (sp1AC != NULL && (fopAcM_GetName(sp1AC) == fpcNm_E_RD_e || + fopAcM_GetName(sp1AC) == fpcNm_E_FK_e) || + sp1A8 != NULL && (fopAcM_GetName(sp1A8) == fpcNm_E_RD_e || + fopAcM_GetName(sp1A8) == fpcNm_E_FK_e) || sp1A4 != NULL) { #if DEBUG @@ -11214,43 +11214,43 @@ static leafdraw_method_class method = { }; camera_process_profile_definition g_profile_CAMERA = { - fpcLy_CURRENT_e, - 11, - fpcPi_CURRENT_e, - PROC_CAMERA, - &g_fpcLf_Method.base, - sizeof(camera_process_class), - 0, - 0, - &g_fopVw_Method, - 0, - &g_fopCam_Method, - 0, - 0, - 0, - 0, - 0, - &method, - 0, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 11, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_CAMERA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(camera_process_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* View Leaf SubMtd */ &g_fopVw_Method, + /* Draw Prio */ fpcDwPi_CAMERA_e, + /* fopCam Leaf SubMtd */ &g_fopCam_Method, + 0, + 0, + 0, + 0, + 0, + /* Camera SubMtd */ &method, + 0, }; camera_process_profile_definition g_profile_CAMERA2 = { - fpcLy_CURRENT_e, - 11, - fpcPi_CURRENT_e, - PROC_CAMERA2, - &g_fpcLf_Method.base, - sizeof(camera_process_class), - 0, - 0, - &g_fopVw_Method, - 1, - &g_fopCam_Method, - 0, - 0, - 0, - 0, - 0, - &method, - 0, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 11, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_CAMERA2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(camera_process_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* View Leaf SubMtd */ &g_fopVw_Method, + /* Draw Prio */ fpcDwPi_CAMERA2_e, + /* fopCam Leaf SubMtd */ &g_fopCam_Method, + 0, + 0, + 0, + 0, + 0, + /* Camera SubMtd */ &method, + 0, }; diff --git a/src/d/d_cc_uty.cpp b/src/d/d_cc_uty.cpp index 42116b967f..7d71e490ac 100644 --- a/src/d/d_cc_uty.cpp +++ b/src/d/d_cc_uty.cpp @@ -320,7 +320,7 @@ fopAc_ac_c* at_power_check(dCcU_AtInfo* i_AtInfo) { i_AtInfo->mAttackPower = at_power_get(i_AtInfo); s16 ac_name = fopAcM_GetName(i_AtInfo->mpActor); - if (ac_name == PROC_ALINK || ac_name == PROC_ALINK) { + if (ac_name == fpcNm_ALINK_e || ac_name == fpcNm_ALINK_e) { if (i_AtInfo->mpCollider->ChkAtType(AT_TYPE_8000) || i_AtInfo->mpCollider->ChkAtType(AT_TYPE_IRON_BALL)) { @@ -329,13 +329,13 @@ fopAc_ac_c* at_power_check(dCcU_AtInfo* i_AtInfo) { i_AtInfo->mHitType = HIT_TYPE_LINK_NORMAL_ATTACK; i_AtInfo->mHitBit = cc_pl_cut_bit_get(); } - } else if (ac_name == PROC_NBOMB) { + } else if (ac_name == fpcNm_NBOMB_e) { i_AtInfo->mHitType = HIT_TYPE_BOMB; i_AtInfo->mHitBit = 0x10000000; - } else if (ac_name == PROC_BOOMERANG) { + } else if (ac_name == fpcNm_BOOMERANG_e) { i_AtInfo->mHitType = HIT_TYPE_BOOMERANG; i_AtInfo->mHitBit = 0x40000000; - } else if (ac_name == PROC_ARROW) { + } else if (ac_name == fpcNm_ARROW_e) { i_AtInfo->mHitType = HIT_TYPE_ARROW; i_AtInfo->mHitBit = 0x80000000; } @@ -352,7 +352,7 @@ fopAc_ac_c* at_power_check(dCcU_AtInfo* i_AtInfo) { i_AtInfo->mHitBit = 0x1000; } else { s16 ac_name = fopAcM_GetName(i_AtInfo->mpActor); - if (ac_name == PROC_ALINK || ac_name == PROC_ALINK) { + if (ac_name == fpcNm_ALINK_e || ac_name == fpcNm_ALINK_e) { if (dCcD_GetGObjInf(i_AtInfo->mpCollider)->GetAtSpl() == 1) { i_AtInfo->mHitStatus = 1; } @@ -378,7 +378,7 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* i_enemy, dCcU_AtInfo* i_AtInfo) { f32 z = i_AtInfo->mpActor->speed.z; i_AtInfo->mHitDirection.y = cM_atan2s(-x, -z) + (s16)cM_rndFX(4000.0f); } else { - if (fopAcM_GetName(i_AtInfo->mpActor) == PROC_BOOMERANG) { + if (fopAcM_GetName(i_AtInfo->mpActor) == fpcNm_BOOMERANG_e) { x_diff = i_enemy->current.pos.x - player_p->current.pos.x; z_diff = i_enemy->current.pos.z - player_p->current.pos.z; i_AtInfo->mHitDirection.y = cM_atan2s(-x_diff, -z_diff) + (s16)cM_rndFX(10000.0f); @@ -402,9 +402,9 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* i_enemy, dCcU_AtInfo* i_AtInfo) { } if (static_cast(i_AtInfo->mpCollider)->GetAtMtrl() == dCcD_MTRL_LIGHT) { - if (fopAcM_GetName(i_enemy) == PROC_B_GND) { + if (fopAcM_GetName(i_enemy) == fpcNm_B_GND_e) { i_AtInfo->mAttackPower = 0; - } else if (fopAcM_GetName(i_enemy) != PROC_B_ZANT) { + } else if (fopAcM_GetName(i_enemy) != fpcNm_B_ZANT_e) { i_AtInfo->mAttackPower = 100; } } @@ -467,8 +467,8 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* i_enemy, dCcU_AtInfo* i_AtInfo) { ((daPy_py_c*)dComIfGp_getPlayer(0))->checkHorseRide()) { // actor is Bulblin or Horseback Ganon - if ((fopAcM_GetName(i_enemy) == PROC_E_RD && ((s8*)i_enemy)[0x129a] != 0) || - fopAcM_GetName(i_enemy) == PROC_B_GND) + if ((fopAcM_GetName(i_enemy) == fpcNm_E_RD_e && ((s8*)i_enemy)[0x129a] != 0) || + fopAcM_GetName(i_enemy) == fpcNm_B_GND_e) { pause_time = 3; } else { @@ -478,9 +478,9 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* i_enemy, dCcU_AtInfo* i_AtInfo) { s16 ac_name = fopAcM_GetName(i_enemy); // actor is Stalkin, Chu, Keese, Shadow Keese, Shadow Vermin, Baby Gohma, or Rat - if (ac_name == PROC_E_BS || ac_name == PROC_E_SM2 || ac_name == PROC_E_BA || - ac_name == PROC_E_YK || ac_name == PROC_E_YG || ac_name == PROC_E_GM || - ac_name == PROC_E_MS) + if (ac_name == fpcNm_E_BS_e || ac_name == fpcNm_E_SM2_e || ac_name == fpcNm_E_BA_e || + ac_name == fpcNm_E_YK_e || ac_name == fpcNm_E_YG_e || ac_name == fpcNm_E_GM_e || + ac_name == fpcNm_E_MS_e) { pause_time = 0; } diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index 1753b81ef9..4e0f8da165 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -69,7 +69,7 @@ void dComIfG_play_c::itemInit() { mItemInfo.mNowOxygen = 600; mItemInfo.mMaxOxygen = 600; - if (dComIfGs_checkGetItem(fpcNm_ITEM_HAWK_EYE)) { + if (dComIfGs_checkGetItem(dItemNo_HAWK_EYE_e)) { mItemInfo.field_0x4f4b = 0; } else { mItemInfo.field_0x4f4b = 21; @@ -120,11 +120,11 @@ void dComIfG_play_c::clearItemBombNumCount(u8 i_item) { s16 dComIfG_play_c::getItemMaxBombNumCount(u8 i_bombType) { switch (i_bombType) { - case fpcNm_ITEM_NORMAL_BOMB: + case dItemNo_NORMAL_BOMB_e: return mItemInfo.mItemMaxBombNumCount1; - case fpcNm_ITEM_WATER_BOMB: + case dItemNo_WATER_BOMB_e: return mItemInfo.mItemMaxBombNumCount2; - case fpcNm_ITEM_POKE_BOMB: + case dItemNo_POKE_BOMB_e: return mItemInfo.field_0x4ed8; } return 0; @@ -1238,7 +1238,7 @@ BOOL dComIfG_resetToOpening(scene_class* i_scene) { } #endif - dComIfG_changeOpeningScene(i_scene, PROC_OPENING_SCENE); + dComIfG_changeOpeningScene(i_scene, fpcNm_OPENING_SCENE_e); mDoAud_bgmStop(30); mDoAud_resetProcess(); #if PLATFORM_WII || VERSION == VERSION_SHIELD_DEBUG @@ -1940,7 +1940,7 @@ u8 dComIfGs_getSelectMixItemNoArrowIndex(int i_selmixItemIdx) { return sel_item_slotNo; } - if (mix_item_slotNo != fpcNm_ITEM_NONE && mix_item_slotNo >= SLOT_15 && mix_item_slotNo < SLOT_18) { + if (mix_item_slotNo != dItemNo_NONE_e && mix_item_slotNo >= SLOT_15 && mix_item_slotNo < SLOT_18) { return mix_item_slotNo; } @@ -1961,17 +1961,17 @@ void dComIfGp_setSelectItem(int i_selItemIdx) { dComIfGs_setSelectItemIndex(i_selItemIdx, 0xFF); } } else { - g_dComIfG_gameInfo.play.setSelectItem(i_selItemIdx, fpcNm_ITEM_NONE); + g_dComIfG_gameInfo.play.setSelectItem(i_selItemIdx, dItemNo_NONE_e); } } else if (dComIfGs_getSelectItemIndex(i_selItemIdx) != 0xFF) { u8 item = dComIfGs_getItem(dComIfGs_getSelectItemIndex(i_selItemIdx), false); g_dComIfG_gameInfo.play.setSelectItem(i_selItemIdx, item); - if (item == fpcNm_ITEM_NONE) { + if (item == dItemNo_NONE_e) { dComIfGs_setSelectItemIndex(i_selItemIdx, 0xFF); } } else { - g_dComIfG_gameInfo.play.setSelectItem(i_selItemIdx, fpcNm_ITEM_NONE); + g_dComIfG_gameInfo.play.setSelectItem(i_selItemIdx, dItemNo_NONE_e); } } @@ -1983,35 +1983,35 @@ u8 dComIfGp_getSelectItem(int i_selItemIdx) { { u8 saveItem = dComIfGs_getItem(dComIfGs_getMixItemIndex(i_selItemIdx), false); - if (saveItem == fpcNm_ITEM_BOW) { + if (saveItem == dItemNo_BOW_e) { saveItem = playItem; - playItem = fpcNm_ITEM_BOW; - } else if (saveItem == fpcNm_ITEM_FISHING_ROD_1) { + playItem = dItemNo_BOW_e; + } else if (saveItem == dItemNo_FISHING_ROD_1_e) { saveItem = playItem; - playItem = fpcNm_ITEM_FISHING_ROD_1; + playItem = dItemNo_FISHING_ROD_1_e; } - if (playItem == fpcNm_ITEM_BOW) { + if (playItem == dItemNo_BOW_e) { switch (saveItem) { - case fpcNm_ITEM_NORMAL_BOMB: - case fpcNm_ITEM_WATER_BOMB: - case fpcNm_ITEM_POKE_BOMB: - playItem = fpcNm_ITEM_BOMB_ARROW; + case dItemNo_NORMAL_BOMB_e: + case dItemNo_WATER_BOMB_e: + case dItemNo_POKE_BOMB_e: + playItem = dItemNo_BOMB_ARROW_e; break; - case fpcNm_ITEM_HAWK_EYE: - playItem = fpcNm_ITEM_HAWK_ARROW; + case dItemNo_HAWK_EYE_e: + playItem = dItemNo_HAWK_ARROW_e; break; } - } else if (playItem == fpcNm_ITEM_FISHING_ROD_1) { + } else if (playItem == dItemNo_FISHING_ROD_1_e) { switch (saveItem) { - case fpcNm_ITEM_BEE_CHILD: - playItem = fpcNm_ITEM_BEE_ROD; + case dItemNo_BEE_CHILD_e: + playItem = dItemNo_BEE_ROD_e; break; - case fpcNm_ITEM_WORM: - playItem = fpcNm_ITEM_WORM_ROD; + case dItemNo_WORM_e: + playItem = dItemNo_WORM_ROD_e; break; - case fpcNm_ITEM_ZORAS_JEWEL: - playItem = fpcNm_ITEM_JEWEL_ROD; + case dItemNo_ZORAS_JEWEL_e: + playItem = dItemNo_JEWEL_ROD_e; break; } } @@ -2129,10 +2129,10 @@ JKRExpHeap* dComIfGp_getSubHeap2D(int flag) { u8 dComIfGs_checkGetInsectNum() { static u8 l_itemno[24] = { - fpcNm_ITEM_M_BEETLE, fpcNm_ITEM_F_BEETLE, fpcNm_ITEM_M_BUTTERFLY, fpcNm_ITEM_F_BUTTERFLY, fpcNm_ITEM_M_STAG_BEETLE, fpcNm_ITEM_F_STAG_BEETLE, - fpcNm_ITEM_M_GRASSHOPPER, fpcNm_ITEM_F_GRASSHOPPER, fpcNm_ITEM_M_NANAFUSHI, fpcNm_ITEM_F_NANAFUSHI, fpcNm_ITEM_M_DANGOMUSHI, fpcNm_ITEM_F_DANGOMUSHI, - fpcNm_ITEM_M_MANTIS, fpcNm_ITEM_F_MANTIS, fpcNm_ITEM_M_LADYBUG, fpcNm_ITEM_F_LADYBUG, fpcNm_ITEM_M_SNAIL, fpcNm_ITEM_F_SNAIL, - fpcNm_ITEM_M_DRAGONFLY, fpcNm_ITEM_F_DRAGONFLY, fpcNm_ITEM_M_ANT, fpcNm_ITEM_F_ANT, fpcNm_ITEM_M_MAYFLY, fpcNm_ITEM_F_MAYFLY, + dItemNo_M_BEETLE_e, dItemNo_F_BEETLE_e, dItemNo_M_BUTTERFLY_e, dItemNo_F_BUTTERFLY_e, dItemNo_M_STAG_BEETLE_e, dItemNo_F_STAG_BEETLE_e, + dItemNo_M_GRASSHOPPER_e, dItemNo_F_GRASSHOPPER_e, dItemNo_M_NANAFUSHI_e, dItemNo_F_NANAFUSHI_e, dItemNo_M_DANGOMUSHI_e, dItemNo_F_DANGOMUSHI_e, + dItemNo_M_MANTIS_e, dItemNo_F_MANTIS_e, dItemNo_M_LADYBUG_e, dItemNo_F_LADYBUG_e, dItemNo_M_SNAIL_e, dItemNo_F_SNAIL_e, + dItemNo_M_DRAGONFLY_e, dItemNo_F_DRAGONFLY_e, dItemNo_M_ANT_e, dItemNo_F_ANT_e, dItemNo_M_MAYFLY_e, dItemNo_F_MAYFLY_e, }; u8 insectCount = 0; @@ -2180,14 +2180,14 @@ s16 dComIfGp_getSelectItemNum(int i_selItemIdx) { u8 selectItem = dComIfGp_getSelectItem(i_selItemIdx); s16 itemNum = 0; - if (selectItem == fpcNm_ITEM_NORMAL_BOMB || selectItem == fpcNm_ITEM_WATER_BOMB || selectItem == fpcNm_ITEM_POKE_BOMB || - selectItem == fpcNm_ITEM_BOMB_ARROW) + if (selectItem == dItemNo_NORMAL_BOMB_e || selectItem == dItemNo_WATER_BOMB_e || selectItem == dItemNo_POKE_BOMB_e || + selectItem == dItemNo_BOMB_ARROW_e) { u8 slot_no = dComIfGs_getSelectMixItemNoArrowIndex(i_selItemIdx) - SLOT_15; itemNum = dComIfGs_getBombNum(slot_no); - } else if (selectItem == fpcNm_ITEM_PACHINKO) { + } else if (selectItem == dItemNo_PACHINKO_e) { itemNum = dComIfGs_getPachinkoNum(); - } else if (selectItem == fpcNm_ITEM_BEE_CHILD) { + } else if (selectItem == dItemNo_BEE_CHILD_e) { u8 slot_no = dComIfGs_getSelectItemIndex(i_selItemIdx) - SLOT_11; itemNum = dComIfGs_getBottleNum(slot_no); } @@ -2199,15 +2199,15 @@ int dComIfGp_getSelectItemMaxNum(int i_selItemIdx) { u8 selectItem = dComIfGp_getSelectItem(i_selItemIdx); int itemNum = 0; - if (selectItem == fpcNm_ITEM_BOMB_BAG_LV1) { + if (selectItem == dItemNo_BOMB_BAG_LV1_e) { itemNum = 1; - } else if (selectItem == fpcNm_ITEM_NORMAL_BOMB || selectItem == fpcNm_ITEM_WATER_BOMB || selectItem == fpcNm_ITEM_POKE_BOMB || - selectItem == fpcNm_ITEM_BOMB_ARROW) + } else if (selectItem == dItemNo_NORMAL_BOMB_e || selectItem == dItemNo_WATER_BOMB_e || selectItem == dItemNo_POKE_BOMB_e || + selectItem == dItemNo_BOMB_ARROW_e) { itemNum = dComIfGs_getBombMax(selectItem); - } else if (selectItem == fpcNm_ITEM_PACHINKO) { + } else if (selectItem == dItemNo_PACHINKO_e) { itemNum = dComIfGs_getPachinkoMax(); - } else if (selectItem == fpcNm_ITEM_BEE_CHILD) { + } else if (selectItem == dItemNo_BEE_CHILD_e) { itemNum = dComIfGs_getBottleMax(); } @@ -2217,8 +2217,8 @@ int dComIfGp_getSelectItemMaxNum(int i_selItemIdx) { void dComIfGp_setSelectItemNum(int i_selItemIdx, s16 i_num) { u8 selectItem = dComIfGp_getSelectItem(i_selItemIdx); - if (selectItem == fpcNm_ITEM_NORMAL_BOMB || selectItem == fpcNm_ITEM_WATER_BOMB || selectItem == fpcNm_ITEM_POKE_BOMB || - selectItem == fpcNm_ITEM_BOMB_ARROW) + if (selectItem == dItemNo_NORMAL_BOMB_e || selectItem == dItemNo_WATER_BOMB_e || selectItem == dItemNo_POKE_BOMB_e || + selectItem == dItemNo_BOMB_ARROW_e) { u8 mix_slotNo = dComIfGs_getSelectMixItemNoArrowIndex(i_selItemIdx) - SLOT_15; @@ -2226,9 +2226,9 @@ void dComIfGp_setSelectItemNum(int i_selItemIdx, s16 i_num) { i_num = dComIfGs_getBombMax(selectItem); } dComIfGs_setBombNum(mix_slotNo, i_num); - } else if (selectItem == fpcNm_ITEM_PACHINKO) { + } else if (selectItem == dItemNo_PACHINKO_e) { dComIfGs_setPachinkoNum(i_num); - } else if (selectItem == fpcNm_ITEM_BEE_CHILD) { + } else if (selectItem == dItemNo_BEE_CHILD_e) { u8 bottle_slot_no = dComIfGs_getSelectItemIndex(i_selItemIdx) - SLOT_11; if (i_num > dComIfGs_getBottleMax()) { @@ -2241,14 +2241,14 @@ void dComIfGp_setSelectItemNum(int i_selItemIdx, s16 i_num) { void dComIfGp_addSelectItemNum(int i_selItemIdx, s16 i_num) { u8 selectItem = dComIfGp_getSelectItem(i_selItemIdx); - if (selectItem == fpcNm_ITEM_NORMAL_BOMB || selectItem == fpcNm_ITEM_WATER_BOMB || selectItem == fpcNm_ITEM_POKE_BOMB || - selectItem == fpcNm_ITEM_BOMB_ARROW) + if (selectItem == dItemNo_NORMAL_BOMB_e || selectItem == dItemNo_WATER_BOMB_e || selectItem == dItemNo_POKE_BOMB_e || + selectItem == dItemNo_BOMB_ARROW_e) { u8 slot_no = dComIfGs_getSelectMixItemNoArrowIndex(i_selItemIdx) - SLOT_15; dComIfGp_setItemBombNumCount(slot_no, i_num); - } else if (selectItem == fpcNm_ITEM_PACHINKO) { + } else if (selectItem == dItemNo_PACHINKO_e) { dComIfGp_setItemPachinkoNumCount(i_num); - } else if (selectItem == fpcNm_ITEM_BEE_CHILD) { + } else if (selectItem == dItemNo_BEE_CHILD_e) { u8 slot_no = dComIfGs_getSelectItemIndex(i_selItemIdx) - SLOT_11; dComIfGs_addBottleNum(slot_no, i_num); } @@ -2309,34 +2309,34 @@ void dComIfG_playerStatusD() { dComIfGs_onItemFirstBit(i); } - dComIfGs_offItemFirstBit(fpcNm_ITEM_L2_KEY_PIECES1); - dComIfGs_offItemFirstBit(fpcNm_ITEM_L2_KEY_PIECES2); - dComIfGs_offItemFirstBit(fpcNm_ITEM_L2_KEY_PIECES3); - dComIfGs_offItemFirstBit(fpcNm_ITEM_LV2_BOSS_KEY); - dComIfGs_offItemFirstBit(fpcNm_ITEM_BOMB_BAG_LV2); - dComIfGs_offItemFirstBit(fpcNm_ITEM_TOMATO_PUREE); - dComIfGs_offItemFirstBit(fpcNm_ITEM_TASTE); - dComIfGs_offItemFirstBit(fpcNm_ITEM_POU_FIRE1); - dComIfGs_offItemFirstBit(fpcNm_ITEM_POU_FIRE2); - dComIfGs_offItemFirstBit(fpcNm_ITEM_POU_FIRE3); - dComIfGs_offItemFirstBit(fpcNm_ITEM_POU_FIRE4); + dComIfGs_offItemFirstBit(dItemNo_L2_KEY_PIECES1_e); + dComIfGs_offItemFirstBit(dItemNo_L2_KEY_PIECES2_e); + dComIfGs_offItemFirstBit(dItemNo_L2_KEY_PIECES3_e); + dComIfGs_offItemFirstBit(dItemNo_LV2_BOSS_KEY_e); + dComIfGs_offItemFirstBit(dItemNo_BOMB_BAG_LV2_e); + dComIfGs_offItemFirstBit(dItemNo_TOMATO_PUREE_e); + dComIfGs_offItemFirstBit(dItemNo_TASTE_e); + dComIfGs_offItemFirstBit(dItemNo_POU_FIRE1_e); + dComIfGs_offItemFirstBit(dItemNo_POU_FIRE2_e); + dComIfGs_offItemFirstBit(dItemNo_POU_FIRE3_e); + dComIfGs_offItemFirstBit(dItemNo_POU_FIRE4_e); for (int i = 0; i < 24; i++) { - dComIfGs_offItemFirstBit(i + fpcNm_ITEM_M_BEETLE); + dComIfGs_offItemFirstBit(i + dItemNo_M_BEETLE_e); } - dComIfGs_offItemFirstBit(fpcNm_ITEM_LIGHT_SWORD); - dComIfGs_offItemFirstBit(fpcNm_ITEM_SHIELD); - dComIfGs_offItemFirstBit(fpcNm_ITEM_ZORAS_JEWEL); + dComIfGs_offItemFirstBit(dItemNo_LIGHT_SWORD_e); + dComIfGs_offItemFirstBit(dItemNo_SHIELD_e); + dComIfGs_offItemFirstBit(dItemNo_ZORAS_JEWEL_e); for (int i = 0; i < 19; i++) { dComIfGs_offItemFirstBit(i); } - dComIfGs_setCollectSmell(fpcNm_ITEM_SMELL_PUMPKIN); + dComIfGs_setCollectSmell(dItemNo_SMELL_PUMPKIN_e); if (!mDoCPd_c::isConnect(PAD_3)) { - dComIfGs_offItemFirstBit(fpcNm_ITEM_SMELL_POH); + dComIfGs_offItemFirstBit(dItemNo_SMELL_POH_e); } dComIfGs_setArrowNum(30); @@ -2354,13 +2354,13 @@ void dComIfG_playerStatusD() { dComIfGs_setSaveStartTime(OSGetTime()); dComIfGs_setBombNum(8, 30); - dComIfGs_setBombMax(fpcNm_ITEM_NORMAL_BOMB, 30); - dComIfGs_setBombMax(fpcNm_ITEM_WATER_BOMB, 15); - dComIfGs_setBombMax(fpcNm_ITEM_POKE_BOMB, 10); + dComIfGs_setBombMax(dItemNo_NORMAL_BOMB_e, 30); + dComIfGs_setBombMax(dItemNo_WATER_BOMB_e, 15); + dComIfGs_setBombMax(dItemNo_POKE_BOMB_e, 10); - dMeter2Info_setCloth(fpcNm_ITEM_WEAR_KOKIRI, false); - dMeter2Info_setSword(fpcNm_ITEM_SWORD, false); - dMeter2Info_setShield(fpcNm_ITEM_HYLIA_SHIELD, false); + dMeter2Info_setCloth(dItemNo_WEAR_KOKIRI_e, false); + dMeter2Info_setSword(dItemNo_SWORD_e, false); + dMeter2Info_setShield(dItemNo_HYLIA_SHIELD_e, false); dComIfGs_onGetMagicUseFlag(); dComIfGs_onEventBit(0x540); @@ -2404,15 +2404,15 @@ void dComIfG_playerStatusD_pre_clear() { dComIfGs_setSelectItemIndex(i, 0xFF); } - dComIfGs_setSelectEquipClothes(fpcNm_ITEM_WEAR_CASUAL); - dComIfGp_setSelectEquipClothes(fpcNm_ITEM_WEAR_CASUAL); - dComIfGs_setSelectEquipSword(fpcNm_ITEM_NONE); - dComIfGp_setSelectEquipSword(fpcNm_ITEM_NONE); - dComIfGs_setSelectEquipShield(fpcNm_ITEM_NONE); - dComIfGp_setSelectEquipShield(fpcNm_ITEM_NONE); + dComIfGs_setSelectEquipClothes(dItemNo_WEAR_CASUAL_e); + dComIfGp_setSelectEquipClothes(dItemNo_WEAR_CASUAL_e); + dComIfGs_setSelectEquipSword(dItemNo_NONE_e); + dComIfGp_setSelectEquipSword(dItemNo_NONE_e); + dComIfGs_setSelectEquipShield(dItemNo_NONE_e); + dComIfGp_setSelectEquipShield(dItemNo_NONE_e); for (int i = 0; i < 24; i++) { - dComIfGs_setItem(i, fpcNm_ITEM_NONE); + dComIfGs_setItem(i, dItemNo_NONE_e); } for (int i = 0; i < 0x100; i++) { @@ -2423,8 +2423,8 @@ void dComIfG_playerStatusD_pre_clear() { dComIfGs_setBombNum(0); dComIfGs_setArrowMax(0); dComIfGs_setBombMax(0); - dComIfGs_setSelectEquipShield(fpcNm_ITEM_SHIELD); - dComIfGp_setSelectEquipShield(fpcNm_ITEM_SHIELD); + dComIfGs_setSelectEquipShield(dItemNo_SHIELD_e); + dComIfGp_setSelectEquipShield(dItemNo_SHIELD_e); } #endif @@ -2584,16 +2584,16 @@ void dComIfGs_setSelectEquipClothes(u8 i_itemNo) { void dComIfGs_setSelectEquipSword(u8 i_itemNo) { switch (i_itemNo) { - case fpcNm_ITEM_SWORD: + case dItemNo_SWORD_e: dComIfGs_setCollectSword(COLLECT_ORDON_SWORD); break; - case fpcNm_ITEM_MASTER_SWORD: + case dItemNo_MASTER_SWORD_e: dComIfGs_setCollectSword(COLLECT_MASTER_SWORD); break; - case fpcNm_ITEM_WOOD_STICK: + case dItemNo_WOOD_STICK_e: dComIfGs_setCollectSword(COLLECT_WOODEN_SWORD); break; - case fpcNm_ITEM_LIGHT_SWORD: + case dItemNo_LIGHT_SWORD_e: dComIfGs_setCollectSword(COLLECT_LIGHT_SWORD); break; } @@ -2603,13 +2603,13 @@ void dComIfGs_setSelectEquipSword(u8 i_itemNo) { void dComIfGs_setSelectEquipShield(u8 i_itemNo) { switch (i_itemNo) { - case fpcNm_ITEM_WOOD_SHIELD: + case dItemNo_WOOD_SHIELD_e: dComIfGs_setCollectShield(COLLECT_WOODEN_SHIELD); break; - case fpcNm_ITEM_SHIELD: + case dItemNo_SHIELD_e: dComIfGs_setCollectShield(COLLECT_ORDON_SHIELD); break; - case fpcNm_ITEM_HYLIA_SHIELD: + case dItemNo_HYLIA_SHIELD_e: dComIfGs_setCollectShield(COLLECT_HYLIAN_SHIELD); break; } diff --git a/src/d/d_envse.cpp b/src/d/d_envse.cpp index 67bd1de067..cbcd32ccf7 100644 --- a/src/d/d_envse.cpp +++ b/src/d/d_envse.cpp @@ -249,15 +249,15 @@ static leafdraw_method_class l_dEnvSe_Method = { }; kankyo_process_profile_definition g_profile_ENVSE = { - fpcLy_CURRENT_e, - 2, - fpcPi_CURRENT_e, - PROC_ENVSE, - &g_fpcLf_Method.base, - sizeof(dEnvSe_c), - 0, - 0, - &g_fopKy_Method, - 689, - &l_dEnvSe_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 2, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ENVSE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dEnvSe_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopKy_Method, + /* Draw Prio */ fpcDwPi_ENVSE_e, + /* Kankyo SubMtd */ &l_dEnvSe_Method, }; diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp index cdf3a9efe8..73891276df 100644 --- a/src/d/d_event.cpp +++ b/src/d/d_event.cpp @@ -231,9 +231,9 @@ int dEvt_control_c::commonCheck(dEvt_order_c* order, u16 condition, u16 command) int dEvt_control_c::talkCheck(dEvt_order_c* order) { char* eventname = "DEFAULT_TALK"; fopAc_ac_c* actor = order->mpTargetActor; - if ((fopAcM_GetName(actor) == PROC_Tag_Mhint && ((daTagMhint_c*)actor)->checkNoAttention()) || - (fopAcM_GetName(actor) == PROC_Tag_Mstop && ((daTagMstop_c*)actor)->checkNoAttention()) || - fopAcM_GetName(actor) == PROC_MIDNA) + if ((fopAcM_GetName(actor) == fpcNm_Tag_Mhint_e && ((daTagMhint_c*)actor)->checkNoAttention()) || + (fopAcM_GetName(actor) == fpcNm_Tag_Mstop_e && ((daTagMstop_c*)actor)->checkNoAttention()) || + fopAcM_GetName(actor) == fpcNm_MIDNA_e) { daMidna_c* midna = (daMidna_c*)daPy_py_c::getMidnaActor(); if (!daPy_py_c::checkNowWolf() || midna->checkNoDraw()) { @@ -303,7 +303,7 @@ int dEvt_control_c::talkXyCheck(dEvt_order_c* order) { return 0; } - if (dComIfGp_getSelectItem(itemIndex) == fpcNm_ITEM_NONE) { + if (dComIfGp_getSelectItem(itemIndex) == dItemNo_NONE_e) { return 0; } @@ -381,7 +381,7 @@ int dEvt_control_c::talkEnd() { } daItemBase_c* item = (daItemBase_c*)fopAcM_getItemEventPartner(NULL); - if (item != NULL && fopAcM_GetName(item) == PROC_ITEM) { + if (item != NULL && fopAcM_GetName(item) == fpcNm_ITEM_e) { item->dead(); } @@ -580,7 +580,7 @@ int dEvt_control_c::endProc() { field_0xec = 0xFF; mTalkXyType = 0; mUnkEventId = 255; - mPreItemNo = fpcNm_ITEM_NONE; + mPreItemNo = dItemNo_NONE_e; dComIfGp_getEventManager().setStartDemo(-2); return 1; } @@ -1133,7 +1133,7 @@ int dEvt_control_c::Step() { int dEvt_control_c::moveApproval(void* param_0) { fopAc_ac_c* actor = (fopAc_ac_c*)param_0; - if (fopAcM_CheckStatus(actor, 0x20000)) { + if (fopAcM_CheckStatus(actor, fopAcStts_NOPAUSE_e)) { return 2; } @@ -1163,11 +1163,11 @@ int dEvt_control_c::moveApproval(void* param_0) { break; } - if (fopAcM_CheckStatus(actor, 0x8000)) { + if (fopAcM_CheckStatus(actor, fopAcStts_STAFF_PRIMARY_e)) { return 2; } - if (fopAcM_CheckStatus(actor, 0x800)) { + if (fopAcM_CheckStatus(actor, fopAcStts_STAFF_EXTRA_e)) { return 1; } @@ -1176,7 +1176,7 @@ int dEvt_control_c::moveApproval(void* param_0) { return 0; } - if (mMode == dEvt_mode_TALK_e && fopAcM_CheckStatus(actor, 0x40)) { + if (mMode == dEvt_mode_TALK_e && fopAcM_CheckStatus(actor, fopAcStts_UNK_0x40_e)) { return 1; } @@ -1184,15 +1184,15 @@ int dEvt_control_c::moveApproval(void* param_0) { return 1; } - if ((getMode() == 3 || getMode() == dEvt_mode_TALK_e) && fopAcM_CheckStatus(actor, 0x4000000)) { + if ((getMode() == 3 || getMode() == dEvt_mode_TALK_e) && fopAcM_CheckStatus(actor, fopAcStts_BOSS_e)) { return 0; } - if (fopAcM_CheckStatus(actor, 0x4000)) { + if (fopAcM_CheckStatus(actor, fopAcStts_UNK_0x4000_e)) { return 1; } - if (fopAcM_CheckStatus(actor, 0x2000)) { + if (fopAcM_CheckStatus(actor, fopAcStts_CARRY_NOW_e)) { return 1; } @@ -1222,7 +1222,7 @@ void dEvt_control_c::remove() { mStageEventDt = NULL; mUnkEventId = 255; mTalkXyType = 0; - mPreItemNo = fpcNm_ITEM_NONE; + mPreItemNo = dItemNo_NONE_e; mEventFlag = 0; mFlag2 = 0; mChangeActor = NULL; diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp index 5343ee7ed3..598b973b84 100644 --- a/src/d/d_event_manager.cpp +++ b/src/d/d_event_manager.cpp @@ -298,7 +298,7 @@ int dEvent_manager_c::create() { OS_REPORT("event manager: BASE_KEEPは読み込めなかった\n"); } #endif - + mEventList[BASE_ACTOR].init(); #if DEBUG @@ -495,19 +495,19 @@ void dEvent_manager_c::remove() { } static void* extraOnObjectCallBack(fopAc_ac_c* actor, void* data) { - fopAcM_OnStatus(actor, fopAcM_STATUS_UNK_0x800); + fopAcM_OnStatus(actor, fopAcStts_STAFF_EXTRA_e); return NULL; } static void* extraOffObjectCallBack(fopAc_ac_c* actor, void* data) { - fopAcM_OffStatus(actor, fopAcM_STATUS_UNK_0x800); + fopAcM_OffStatus(actor, fopAcStts_STAFF_EXTRA_e); return NULL; } static void* allOffObjectCallBack(fopAc_ac_c* actor, void* data) { fopAc_ac_c* spC = (fopAc_ac_c*)data; - fopAcM_OffStatus(actor, fopAcM_STATUS_UNK_0x8000 | fopAcM_STATUS_UNK_0x1000); + fopAcM_OffStatus(actor, fopAcStts_STAFF_PRIMARY_e | fopAcStts_STAFF_SHUTTER_e); return NULL; } @@ -542,7 +542,7 @@ void dEvent_manager_c::startProc(dEvDtEvent_c* event) { } if (event_actor_p != NULL) { - fopAcM_OnStatus(event_actor_p, fopAcM_STATUS_UNK_0x8000); + fopAcM_OnStatus(event_actor_p, fopAcStts_STAFF_PRIMARY_e); // "event manager: C:Staff ON %s!!" OS_REPORT("\x1B[34m%06d: event manager: Ｃ：スタッフ　ON　%s!!\n\x1B[m", g_Counter.mCounter0, dStage_getName(fopAcM_GetProfName(event_actor_p), -1)); } else { @@ -1029,7 +1029,7 @@ int dEvent_manager_c::getMyStaffId(const char* staffName, fopAc_ac_c* actor, int dEvDtEvent_c* event = getEventData(mCurrentEvId); if (event != NULL && (event->mEventState == dEvDt_State_START_e || event->mEventState == dEvDt_State_END_e)) { n_staff = event->getNStaff(); - + bool hasDp = false; if (strchr(staffName, ':') != NULL) { hasDp = true; @@ -1312,7 +1312,7 @@ void dEvent_manager_c::issueStaff(const char* staffname) { char nameBuf[32]; strcpy(nameBuf, staffname); fopAc_ac_c* actor = fopAcM_searchFromName4Event(nameBuf, -1); - fopAcM_OnStatus(actor, fopAcM_STATUS_UNK_0x800); + fopAcM_OnStatus(actor, fopAcStts_STAFF_EXTRA_e); } } @@ -1323,7 +1323,7 @@ void dEvent_manager_c::cancelStaff(const char* staffname) { char nameBuf[32]; strcpy(nameBuf, staffname); fopAc_ac_c* actor = fopAcM_searchFromName4Event(nameBuf, -1); - fopAcM_OffStatus(actor, fopAcM_STATUS_UNK_0x800); + fopAcM_OffStatus(actor, fopAcStts_STAFF_EXTRA_e); } } @@ -1414,18 +1414,18 @@ fopAc_ac_c* dEvent_manager_c::specialCast(const char* staffname, BOOL param_1) { } if (strcmp(staffname, "SHUTTER_DOOR") == 0) { - shutterActor = specialCast_Shutter(PROC_KNOB20, param_1); + shutterActor = specialCast_Shutter(fpcNm_KNOB20_e, param_1); if (shutterActor == NULL) { - shutterActor = specialCast_Shutter(PROC_BOSS_DOOR, param_1); + shutterActor = specialCast_Shutter(fpcNm_BOSS_DOOR_e, param_1); } if (shutterActor == NULL) { - shutterActor = specialCast_Shutter(PROC_L1BOSS_DOOR, param_1); + shutterActor = specialCast_Shutter(fpcNm_L1BOSS_DOOR_e, param_1); } if (shutterActor == NULL) { - shutterActor = specialCast_Shutter(PROC_L1MBOSS_DOOR, param_1); + shutterActor = specialCast_Shutter(fpcNm_L1MBOSS_DOOR_e, param_1); } if (shutterActor == NULL) { - shutterActor = specialCast_Shutter(PROC_L5BOSS_DOOR, param_1); + shutterActor = specialCast_Shutter(fpcNm_L5BOSS_DOOR_e, param_1); } if (shutterActor != NULL) { dComIfGp_getEvent()->onEventFlag(0x10); @@ -1434,9 +1434,9 @@ fopAc_ac_c* dEvent_manager_c::specialCast(const char* staffname, BOOL param_1) { if (shutterActor != NULL) { if (param_1) { - fopAcM_OnStatus(shutterActor, 0x1000); + fopAcM_OnStatus(shutterActor, fopAcStts_STAFF_SHUTTER_e); } else { - fopAcM_OffStatus(shutterActor, 0x1000); + fopAcM_OffStatus(shutterActor, fopAcStts_STAFF_SHUTTER_e); } } diff --git a/src/d/d_file_select.cpp b/src/d/d_file_select.cpp index 0c5055b5ed..69c2afa152 100644 --- a/src/d/d_file_select.cpp +++ b/src/d/d_file_select.cpp @@ -1007,10 +1007,10 @@ void dFile_select_c::makeRecInfo(u8 i_dataNo) { ken0->hide(); ken1->hide(); - if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_SWORD)) { + if (pSave->getPlayer().getGetItem().isFirstBit(dItemNo_SWORD_e)) { ken0->hide(); ken1->show(); - } else if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_WOOD_STICK) && + } else if (pSave->getPlayer().getGetItem().isFirstBit(dItemNo_WOOD_STICK_e) && !pSave->getEvent().isEventBit(dSv_event_flag_c::F_0026)) { ken0->show(); @@ -1018,8 +1018,8 @@ void dFile_select_c::makeRecInfo(u8 i_dataNo) { } J2DPane* ken2 = mSelDt.ScrDt->search(MULTI_CHAR('ken_02')); - if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_MASTER_SWORD) || - pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_LIGHT_SWORD)) + if (pSave->getPlayer().getGetItem().isFirstBit(dItemNo_MASTER_SWORD_e) || + pSave->getPlayer().getGetItem().isFirstBit(dItemNo_LIGHT_SWORD_e)) { ken2->show(); } else { @@ -1031,37 +1031,37 @@ void dFile_select_c::makeRecInfo(u8 i_dataNo) { tate0->hide(); tate1->hide(); - if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_SHIELD)) { + if (pSave->getPlayer().getGetItem().isFirstBit(dItemNo_SHIELD_e)) { tate0->show(); tate1->hide(); - } else if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_WOOD_SHIELD)) { + } else if (pSave->getPlayer().getGetItem().isFirstBit(dItemNo_WOOD_SHIELD_e)) { tate0->hide(); tate1->show(); } J2DPane* tate2 = mSelDt.ScrDt->search(MULTI_CHAR('tate_02')); - if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_HYLIA_SHIELD)) { + if (pSave->getPlayer().getGetItem().isFirstBit(dItemNo_HYLIA_SHIELD_e)) { tate2->show(); } else { tate2->hide(); } J2DPane* fuku0 = mSelDt.ScrDt->search(MULTI_CHAR('fuku_00')); - if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_WEAR_KOKIRI)) { + if (pSave->getPlayer().getGetItem().isFirstBit(dItemNo_WEAR_KOKIRI_e)) { fuku0->show(); } else { fuku0->hide(); } J2DPane* fuku1 = mSelDt.ScrDt->search(MULTI_CHAR('fuku_01')); - if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_WEAR_ZORA)) { + if (pSave->getPlayer().getGetItem().isFirstBit(dItemNo_WEAR_ZORA_e)) { fuku1->show(); } else { fuku1->hide(); } J2DPane* fuku2 = mSelDt.ScrDt->search(MULTI_CHAR('fuku_02')); - if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_ARMOR)) { + if (pSave->getPlayer().getGetItem().isFirstBit(dItemNo_ARMOR_e)) { fuku2->show(); } else { fuku2->hide(); diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index 1320ebcb7a..236cad603c 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -152,7 +152,7 @@ int dGameover_c::_create() { if (!strcmp(dComIfGp_getLastPlayStageName(), "D_MN10A")) { // Last stage was Stallord Arena // Remove Ooccoo from inventory - dComIfGs_setItem(SLOT_18, fpcNm_ITEM_NONE); + dComIfGs_setItem(SLOT_18, dItemNo_NONE_e); dComIfGs_resetLastWarpAcceptStage(); } @@ -307,8 +307,8 @@ void dGameover_c::saveClose_proc() { } // Reset Lantern and oil status back into inventory if gameover during monkey steal sequence - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_KANTERA) && dComIfGs_getItem(SLOT_1, true) == fpcNm_ITEM_NONE) { - dComIfGs_setItem(SLOT_1, fpcNm_ITEM_KANTERA); + if (dComIfGs_isItemFirstBit(dItemNo_KANTERA_e) && dComIfGs_getItem(SLOT_1, true) == dItemNo_NONE_e) { + dComIfGs_setItem(SLOT_1, dItemNo_KANTERA_e); dComIfGs_setOil(dMeter2Info_getOilGaugeBackUp()); } @@ -478,7 +478,7 @@ static int dGameover_Create(msg_class* i_this) { s32 d_GameOver_Create(u8 i_gameoverType) { dMeter2Info_setGameOverType(i_gameoverType); - return fopMsgM_create(PROC_GAMEOVER, NULL, NULL, NULL, NULL, NULL); + return fopMsgM_create(fpcNm_GAMEOVER_e, NULL, NULL, NULL, NULL, NULL); } bool d_GameOver_Delete(fpc_ProcID& i_id) { @@ -501,15 +501,15 @@ static leafdraw_method_class l_dGameover_Method = { }; msg_process_profile_definition g_profile_GAMEOVER = { - fpcLy_CURRENT_e, - 0x0C, - fpcPi_CURRENT_e, - PROC_GAMEOVER, - &g_fpcLf_Method.base, - sizeof(dGameover_c), - 0, - 0, - &g_fopMsg_Method, - 0x303, - &l_dGameover_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 12, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_GAMEOVER_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dGameover_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopMsg_Method, + /* Draw Prio */ fpcDwPi_GAMEOVER_e, + /* Msg SubMtd */ &l_dGameover_Method, }; diff --git a/src/d/d_insect.cpp b/src/d/d_insect.cpp index bed8ca1ed6..3f1d2fae11 100644 --- a/src/d/d_insect.cpp +++ b/src/d/d_insect.cpp @@ -16,7 +16,7 @@ dInsect_c::dInsect_c() { field_0x56c = 0; mDraw = true; m_mode = 0; - m_itemNo = fpcNm_ITEM_M_MAYFLY; + m_itemNo = dItemNo_M_MAYFLY_e; field_0x584 = 0; field_0x585 = 0; } @@ -63,7 +63,7 @@ void dInsect_c::Insect_GetDemoMain() { mDraw = true; m_mode = 0; if (field_0x584 == 0) { - fopAcM_createItem(¤t.pos, fpcNm_ITEM_HEART, -1, -1, NULL, NULL, 0); + fopAcM_createItem(¤t.pos, dItemNo_HEART_e, -1, -1, NULL, NULL, 0); field_0x584 = 1; } } else { diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp index 0a7314fb31..cb525139db 100644 --- a/src/d/d_item.cpp +++ b/src/d/d_item.cpp @@ -592,19 +592,19 @@ void item_func_L_MAGIC() { } void item_func_BOMB_5() { - addBombCount(fpcNm_ITEM_NORMAL_BOMB, 5); + addBombCount(dItemNo_NORMAL_BOMB_e, 5); } void item_func_BOMB_10() { - addBombCount(fpcNm_ITEM_NORMAL_BOMB, 10); + addBombCount(dItemNo_NORMAL_BOMB_e, 10); } void item_func_BOMB_20() { - addBombCount(fpcNm_ITEM_NORMAL_BOMB, 20); + addBombCount(dItemNo_NORMAL_BOMB_e, 20); } void item_func_BOMB_30() { - addBombCount(fpcNm_ITEM_NORMAL_BOMB, 30); + addBombCount(dItemNo_NORMAL_BOMB_e, 30); } void item_func_ARROW_10() { @@ -628,31 +628,31 @@ void item_func_PACHINKO_SHOT() { } void item_func_WATER_BOMB_5() { - addBombCount(fpcNm_ITEM_WATER_BOMB, 5); + addBombCount(dItemNo_WATER_BOMB_e, 5); } void item_func_WATER_BOMB_10() { - addBombCount(fpcNm_ITEM_WATER_BOMB, 10); + addBombCount(dItemNo_WATER_BOMB_e, 10); } void item_func_WATER_BOMB_20() { - addBombCount(fpcNm_ITEM_WATER_BOMB, 15); + addBombCount(dItemNo_WATER_BOMB_e, 15); } void item_func_WATER_BOMB_30() { - addBombCount(fpcNm_ITEM_WATER_BOMB, 3); + addBombCount(dItemNo_WATER_BOMB_e, 3); } void item_func_BOMB_INSECT_5() { - addBombCount(fpcNm_ITEM_POKE_BOMB, 5); + addBombCount(dItemNo_POKE_BOMB_e, 5); } void item_func_BOMB_INSECT_10() { - addBombCount(fpcNm_ITEM_POKE_BOMB, 10); + addBombCount(dItemNo_POKE_BOMB_e, 10); } void item_func_BOMB_INSECT_20() { - addBombCount(fpcNm_ITEM_POKE_BOMB, 3); + addBombCount(dItemNo_POKE_BOMB_e, 3); } void item_func_BOMB_INSECT_30() {} @@ -692,7 +692,7 @@ void item_func_COMPUS() { void item_func_DUNGEON_EXIT() { dComIfGs_onDungeonItemWarp(); - dComIfGs_setItem(SLOT_18, fpcNm_ITEM_DUNGEON_EXIT); + dComIfGs_setItem(SLOT_18, dItemNo_DUNGEON_EXIT_e); } void item_func_BOSS_KEY() { @@ -700,22 +700,22 @@ void item_func_BOSS_KEY() { } void item_func_DUNGEON_BACK() { - dComIfGs_setItem(SLOT_18, fpcNm_ITEM_DUNGEON_BACK); + dComIfGs_setItem(SLOT_18, dItemNo_DUNGEON_BACK_e); } void item_func_SWORD() { dComIfGs_setCollectSword(COLLECT_ORDON_SWORD); - dComIfGs_setSelectEquipSword(fpcNm_ITEM_SWORD); + dComIfGs_setSelectEquipSword(dItemNo_SWORD_e); } void item_func_MASTER_SWORD() { dComIfGs_setCollectSword(COLLECT_MASTER_SWORD); - dComIfGs_setSelectEquipSword(fpcNm_ITEM_MASTER_SWORD); + dComIfGs_setSelectEquipSword(dItemNo_MASTER_SWORD_e); } void item_func_WOOD_SHIELD() { dComIfGs_setCollectShield(COLLECT_WOODEN_SHIELD); - dComIfGs_setSelectEquipShield(fpcNm_ITEM_WOOD_SHIELD); + dComIfGs_setSelectEquipShield(dItemNo_WOOD_SHIELD_e); } void item_func_SHIELD() {} @@ -723,16 +723,16 @@ void item_func_SHIELD() {} void item_func_HYLIA_SHIELD() {} void item_func_TKS_LETTER() { - dComIfGs_setItem(SLOT_18, fpcNm_ITEM_TKS_LETTER); + dComIfGs_setItem(SLOT_18, dItemNo_TKS_LETTER_e); } void item_func_WEAR_CASUAL() { - dComIfGs_setSelectEquipClothes(fpcNm_ITEM_WEAR_CASUAL); + dComIfGs_setSelectEquipClothes(dItemNo_WEAR_CASUAL_e); } void item_func_WEAR_KOKIRI() { dComIfGs_setCollectClothes(KOKIRI_CLOTHES_FLAG); - dComIfGs_setSelectEquipClothes(fpcNm_ITEM_WEAR_KOKIRI); + dComIfGs_setSelectEquipClothes(dItemNo_WEAR_KOKIRI_e); } void item_func_ARMOR() {} @@ -745,7 +745,7 @@ void item_func_MAGIC_LV1() { } void item_func_DUNGEON_EXIT_2() { - dComIfGs_setItem(SLOT_18, fpcNm_ITEM_DUNGEON_EXIT); + dComIfGs_setItem(SLOT_18, dItemNo_DUNGEON_EXIT_e); } void item_func_WALLET_LV1() { @@ -764,93 +764,93 @@ void item_func_ZORAS_JEWEL() { if (item_getcheck_func_FISHING_ROD_1()) { dComIfGs_setRodTypeLevelUp(); } else { - dComIfGs_setItem(SLOT_20, fpcNm_ITEM_ZORAS_JEWEL); + dComIfGs_setItem(SLOT_20, dItemNo_ZORAS_JEWEL_e); } } void item_func_HAWK_EYE() { - dComIfGs_setItem(SLOT_5, fpcNm_ITEM_HAWK_EYE); + dComIfGs_setItem(SLOT_5, dItemNo_HAWK_EYE_e); } void item_func_WOOD_STICK() { dComIfGs_setCollectSword(COLLECT_WOODEN_SWORD); - dComIfGs_setSelectEquipSword(fpcNm_ITEM_WOOD_STICK); + dComIfGs_setSelectEquipSword(dItemNo_WOOD_STICK_e); dComIfGs_onSwitch(28, dComIfGp_roomControl_getStayNo()); } void item_func_BOOMERANG() { - dComIfGs_setItem(SLOT_0, fpcNm_ITEM_BOOMERANG); + dComIfGs_setItem(SLOT_0, dItemNo_BOOMERANG_e); } void item_func_SPINNER() { - dComIfGs_setItem(SLOT_2, fpcNm_ITEM_SPINNER); + dComIfGs_setItem(SLOT_2, dItemNo_SPINNER_e); } void item_func_IRONBALL() { - dComIfGs_setItem(SLOT_6, fpcNm_ITEM_IRONBALL); + dComIfGs_setItem(SLOT_6, dItemNo_IRONBALL_e); } void item_func_BOW() { - dComIfGs_setItem(SLOT_4, fpcNm_ITEM_BOW); + dComIfGs_setItem(SLOT_4, dItemNo_BOW_e); dComIfGs_setArrowNum(30); dComIfGs_setArrowMax(30); } void item_func_HOOKSHOT() { - dComIfGs_setItem(SLOT_9, fpcNm_ITEM_HOOKSHOT); + dComIfGs_setItem(SLOT_9, dItemNo_HOOKSHOT_e); } void item_func_HVY_BOOTS() { - dComIfGs_setItem(SLOT_3, fpcNm_ITEM_HVY_BOOTS); + dComIfGs_setItem(SLOT_3, dItemNo_HVY_BOOTS_e); } void item_func_COPY_ROD() { - dComIfGs_setItem(SLOT_8, fpcNm_ITEM_COPY_ROD); + dComIfGs_setItem(SLOT_8, dItemNo_COPY_ROD_e); } void item_func_W_HOOKSHOT() { - dComIfGs_setItem(SLOT_9, fpcNm_ITEM_NONE); - dComIfGs_setItem(SLOT_10, fpcNm_ITEM_W_HOOKSHOT); + dComIfGs_setItem(SLOT_9, dItemNo_NONE_e); + dComIfGs_setItem(SLOT_10, dItemNo_W_HOOKSHOT_e); } void item_func_KANTERA() { dComIfGs_setMaxOil(21600); dComIfGs_setOil(21600); - dComIfGs_setItem(SLOT_1, fpcNm_ITEM_KANTERA); + dComIfGs_setItem(SLOT_1, dItemNo_KANTERA_e); } void item_func_LIGHT_SWORD() { dComIfGs_setCollectSword(COLLECT_LIGHT_SWORD); - dMeter2Info_setSword(fpcNm_ITEM_LIGHT_SWORD, false); + dMeter2Info_setSword(dItemNo_LIGHT_SWORD_e, false); } void item_func_FISHING_ROD_1() { - dComIfGs_setItem(SLOT_20, fpcNm_ITEM_FISHING_ROD_1); + dComIfGs_setItem(SLOT_20, dItemNo_FISHING_ROD_1_e); } void item_func_PACHINKO() { u8 pachinko_max = dComIfGs_getPachinkoMax(); dComIfGp_setItemPachinkoNumCount(pachinko_max); - dComIfGs_setItem(SLOT_23, fpcNm_ITEM_PACHINKO); + dComIfGs_setItem(SLOT_23, dItemNo_PACHINKO_e); } void item_func_COPY_ROD_2() { - dComIfGs_setItem(SLOT_8, fpcNm_ITEM_COPY_ROD); + dComIfGs_setItem(SLOT_8, dItemNo_COPY_ROD_e); } void item_func_BOMB_BAG_LV2() {} void item_func_BOMB_BAG_LV1() { - dComIfGs_setEmptyBombBag(fpcNm_ITEM_NORMAL_BOMB, 30); + dComIfGs_setEmptyBombBag(dItemNo_NORMAL_BOMB_e, 30); } void item_func_BOMB_IN_BAG() { - dComIfGs_setEmptyBombBag(fpcNm_ITEM_NORMAL_BOMB, 30); + dComIfGs_setEmptyBombBag(dItemNo_NORMAL_BOMB_e, 30); } void item_func_LIGHT_ARROW() { - dComIfGs_setItem(SLOT_4, fpcNm_ITEM_LIGHT_ARROW); + dComIfGs_setItem(SLOT_4, dItemNo_LIGHT_ARROW_e); } void item_func_ARROW_LV1() { @@ -889,55 +889,55 @@ void item_func_EMPTY_BOTTLE() { } void item_func_RED_BOTTLE() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_RED_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_RED_BOTTLE_e); } void item_func_GREEN_BOTTLE() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_GREEN_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_GREEN_BOTTLE_e); } void item_func_BLUE_BOTTLE() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_BLUE_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_BLUE_BOTTLE_e); } void item_func_MILK_BOTTLE() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_MILK_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_MILK_BOTTLE_e); } void item_func_HALF_MILK_BOTTLE() { - dComIfGs_setEmptyBottle(fpcNm_ITEM_HALF_MILK_BOTTLE); + dComIfGs_setEmptyBottle(dItemNo_HALF_MILK_BOTTLE_e); } void item_func_OIL_BOTTLE() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_OIL_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_OIL_BOTTLE_e); } void item_func_WATER_BOTTLE() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_WATER_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_WATER_BOTTLE_e); } void item_func_OIL_BOTTLE2() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_OIL_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_OIL_BOTTLE_e); } void item_func_RED_BOTTLE2() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_RED_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_RED_BOTTLE_e); } void item_func_UGLY_SOUP() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_UGLY_SOUP); + dComIfGs_setEmptyBottleItemIn(dItemNo_UGLY_SOUP_e); } void item_func_HOT_SPRING() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_HOT_SPRING); + dComIfGs_setEmptyBottleItemIn(dItemNo_HOT_SPRING_e); } void item_func_FAIRY_BOTTLE() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_FAIRY); + dComIfGs_setEmptyBottleItemIn(dItemNo_FAIRY_e); } void item_func_HOT_SPRING2() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_HOT_SPRING); + dComIfGs_setEmptyBottleItemIn(dItemNo_HOT_SPRING_e); } void item_func_OIL2() {} @@ -945,27 +945,27 @@ void item_func_OIL2() {} void item_func_OIL() {} void item_func_NORMAL_BOMB() { - dComIfGs_setEmptyBombBag(fpcNm_ITEM_NORMAL_BOMB, 60); + dComIfGs_setEmptyBombBag(dItemNo_NORMAL_BOMB_e, 60); } void item_func_WATER_BOMB() { dComIfGs_setEmptyBombBag(); - dComIfGs_setEmptyBombBagItemIn(fpcNm_ITEM_WATER_BOMB, true); + dComIfGs_setEmptyBombBagItemIn(dItemNo_WATER_BOMB_e, true); } void item_func_POKE_BOMB() { dComIfGs_setEmptyBombBag(); - dComIfGs_setEmptyBombBagItemIn(fpcNm_ITEM_POKE_BOMB, true); + dComIfGs_setEmptyBombBagItemIn(dItemNo_POKE_BOMB_e, true); } void item_func_FAIRY_DROP() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_FAIRY_DROP); + dComIfGs_setEmptyBottleItemIn(dItemNo_FAIRY_DROP_e); } void item_func_WORM() {} void item_func_DROP_BOTTLE() { - dComIfGs_setEmptyBottle(fpcNm_ITEM_FAIRY_DROP); + dComIfGs_setEmptyBottle(dItemNo_FAIRY_DROP_e); } void item_func_BEE_CHILD() { @@ -975,7 +975,7 @@ void item_func_BEE_CHILD() { for (bottleIdx = 0xFF, i = 0; i < 4; i++) { u8 getItem = dComIfGs_getItem(i + SLOT_11, true); - if (getItem == fpcNm_ITEM_EMPTY_BOTTLE) { + if (getItem == dItemNo_EMPTY_BOTTLE_e) { bottleIdx = i; break; } @@ -983,82 +983,82 @@ void item_func_BEE_CHILD() { if (bottleIdx != 0xff) { dComIfGs_setBottleNum(bottleIdx, 10); - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_BEE_CHILD); + dComIfGs_setEmptyBottleItemIn(dItemNo_BEE_CHILD_e); } } void item_func_CHUCHU_RARE() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_CHUCHU_RARE); + dComIfGs_setEmptyBottleItemIn(dItemNo_CHUCHU_RARE_e); } void item_func_CHUCHU_RED() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_CHUCHU_RED); + dComIfGs_setEmptyBottleItemIn(dItemNo_CHUCHU_RED_e); } void item_func_CHUCHU_BLUE() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_CHUCHU_BLUE); + dComIfGs_setEmptyBottleItemIn(dItemNo_CHUCHU_BLUE_e); } void item_func_CHUCHU_GREEN() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_CHUCHU_GREEN); + dComIfGs_setEmptyBottleItemIn(dItemNo_CHUCHU_GREEN_e); } void item_func_CHUCHU_YELLOW() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_CHUCHU_YELLOW); + dComIfGs_setEmptyBottleItemIn(dItemNo_CHUCHU_YELLOW_e); } void item_func_CHUCHU_PURPLE() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_CHUCHU_PURPLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_CHUCHU_PURPLE_e); } void item_func_LV1_SOUP() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_LV1_SOUP); + dComIfGs_setEmptyBottleItemIn(dItemNo_LV1_SOUP_e); } void item_func_LV2_SOUP() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_LV2_SOUP); + dComIfGs_setEmptyBottleItemIn(dItemNo_LV2_SOUP_e); } void item_func_LV3_SOUP() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_LV3_SOUP); + dComIfGs_setEmptyBottleItemIn(dItemNo_LV3_SOUP_e); } void item_func_LETTER() { - dComIfGs_setItem(SLOT_21, fpcNm_ITEM_LETTER); + dComIfGs_setItem(SLOT_21, dItemNo_LETTER_e); } void item_func_BILL() { - dComIfGs_setItem(SLOT_21, fpcNm_ITEM_BILL); + dComIfGs_setItem(SLOT_21, dItemNo_BILL_e); } void item_func_WOOD_STATUE() { /* dSv_event_flag_c::F_283 - Hyrule Field - Get wood carving */ dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[283]); - dComIfGs_setItem(SLOT_21, fpcNm_ITEM_WOOD_STATUE); + dComIfGs_setItem(SLOT_21, dItemNo_WOOD_STATUE_e); } void item_func_IRIAS_PENDANT() { - dComIfGs_setItem(SLOT_21, fpcNm_ITEM_IRIAS_PENDANT); + dComIfGs_setItem(SLOT_21, dItemNo_IRIAS_PENDANT_e); } void item_func_HORSE_FLUTE() { - dComIfGs_setItem(SLOT_21, fpcNm_ITEM_HORSE_FLUTE); + dComIfGs_setItem(SLOT_21, dItemNo_HORSE_FLUTE_e); } void item_func_RAFRELS_MEMO() { - dComIfGs_setItem(SLOT_19, fpcNm_ITEM_RAFRELS_MEMO); + dComIfGs_setItem(SLOT_19, dItemNo_RAFRELS_MEMO_e); } void item_func_ASHS_SCRIBBLING() { - dComIfGs_setItem(SLOT_19, fpcNm_ITEM_ASHS_SCRIBBLING); + dComIfGs_setItem(SLOT_19, dItemNo_ASHS_SCRIBBLING_e); } void item_func_CHUCHU_YELLOW2() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_CHUCHU_YELLOW); + dComIfGs_setEmptyBottleItemIn(dItemNo_CHUCHU_YELLOW_e); } void item_func_OIL_BOTTLE3() { - dComIfGs_setEmptyBottle(fpcNm_ITEM_OIL_BOTTLE); + dComIfGs_setEmptyBottle(dItemNo_OIL_BOTTLE_e); } void item_func_SHOP_BEE_CHILD() { @@ -1066,7 +1066,7 @@ void item_func_SHOP_BEE_CHILD() { } void item_func_CHUCHU_BLACK() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_CHUCHU_BLACK); + dComIfGs_setEmptyBottleItemIn(dItemNo_CHUCHU_BLACK_e); } void item_func_LIGHT_DROP() {} @@ -1154,19 +1154,19 @@ void item_func_F_MAYFLY() {} void item_func_POU_SPIRIT() {} void item_func_ANCIENT_DOCUMENT() { - dComIfGs_setItem(SLOT_22, fpcNm_ITEM_ANCIENT_DOCUMENT); + dComIfGs_setItem(SLOT_22, dItemNo_ANCIENT_DOCUMENT_e); } void item_func_AIR_LETTER() { - dComIfGs_setItem(SLOT_22, fpcNm_ITEM_AIR_LETTER); + dComIfGs_setItem(SLOT_22, dItemNo_AIR_LETTER_e); } void item_func_ANCIENT_DOCUMENT2() { - dComIfGs_setItem(SLOT_22, fpcNm_ITEM_ANCIENT_DOCUMENT2); + dComIfGs_setItem(SLOT_22, dItemNo_ANCIENT_DOCUMENT2_e); } void item_func_LV7_DUNGEON_EXIT() { - dComIfGs_setItem(SLOT_18, fpcNm_ITEM_LV7_DUNGEON_EXIT); + dComIfGs_setItem(SLOT_18, dItemNo_LV7_DUNGEON_EXIT_e); } void item_func_LINKS_SAVINGS() { @@ -1226,31 +1226,31 @@ int item_getcheck_func_HEART() { } int item_getcheck_func_GREEN_RUPEE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_GREEN_RUPEE); + return dComIfGs_isItemFirstBit(dItemNo_GREEN_RUPEE_e); } int item_getcheck_func_BLUE_RUPEE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_BLUE_RUPEE); + return dComIfGs_isItemFirstBit(dItemNo_BLUE_RUPEE_e); } int item_getcheck_func_YELLOW_RUPEE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_YELLOW_RUPEE); + return dComIfGs_isItemFirstBit(dItemNo_YELLOW_RUPEE_e); } int item_getcheck_func_RED_RUPEE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_RED_RUPEE); + return dComIfGs_isItemFirstBit(dItemNo_RED_RUPEE_e); } int item_getcheck_func_PURPLE_RUPEE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_PURPLE_RUPEE); + return dComIfGs_isItemFirstBit(dItemNo_PURPLE_RUPEE_e); } int item_getcheck_func_ORANGE_RUPEE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_ORANGE_RUPEE); + return dComIfGs_isItemFirstBit(dItemNo_ORANGE_RUPEE_e); } int item_getcheck_func_SILVER_RUPEE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_SILVER_RUPEE); + return dComIfGs_isItemFirstBit(dItemNo_SILVER_RUPEE_e); } int item_getcheck_func_S_MAGIC() { @@ -1262,39 +1262,39 @@ int item_getcheck_func_L_MAGIC() { } int item_getcheck_func_BOMB_5() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_5); + return dComIfGs_isItemFirstBit(dItemNo_BOMB_5_e); } int item_getcheck_func_BOMB_10() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_10); + return dComIfGs_isItemFirstBit(dItemNo_BOMB_10_e); } int item_getcheck_func_BOMB_20() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_20); + return dComIfGs_isItemFirstBit(dItemNo_BOMB_20_e); } int item_getcheck_func_BOMB_30() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_30); + return dComIfGs_isItemFirstBit(dItemNo_BOMB_30_e); } int item_getcheck_func_ARROW_10() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_ARROW_10); + return dComIfGs_isItemFirstBit(dItemNo_ARROW_10_e); } int item_getcheck_func_ARROW_20() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_ARROW_20); + return dComIfGs_isItemFirstBit(dItemNo_ARROW_20_e); } int item_getcheck_func_ARROW_30() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_ARROW_30); + return dComIfGs_isItemFirstBit(dItemNo_ARROW_30_e); } int item_getcheck_func_ARROW_1() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_ARROW_1); + return dComIfGs_isItemFirstBit(dItemNo_ARROW_1_e); } int item_getcheck_func_PACHINKO_SHOT() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_PACHINKO_SHOT); + return dComIfGs_isItemFirstBit(dItemNo_PACHINKO_SHOT_e); } int item_getcheck_func_WATER_BOMB_5() { @@ -1318,15 +1318,15 @@ int item_getcheck_func_BOMB_INSECT_5() { } int item_getcheck_func_BOMB_INSECT_10() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_INSECT_10); + return dComIfGs_isItemFirstBit(dItemNo_BOMB_INSECT_10_e); } int item_getcheck_func_BOMB_INSECT_20() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_INSECT_20); + return dComIfGs_isItemFirstBit(dItemNo_BOMB_INSECT_20_e); } int item_getcheck_func_BOMB_INSECT_30() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_INSECT_30); + return dComIfGs_isItemFirstBit(dItemNo_BOMB_INSECT_30_e); } int item_getcheck_func_RECOVER_FAILY() { @@ -1358,7 +1358,7 @@ int item_getcheck_func_COMPUS() { } int item_getcheck_func_DUNGEON_EXIT() { - return dComIfGs_getItem(SLOT_18, true) == fpcNm_ITEM_DUNGEON_EXIT ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_18, true) == dItemNo_DUNGEON_EXIT_e ? TRUE : FALSE; } int item_getcheck_func_BOSS_KEY() { @@ -1366,7 +1366,7 @@ int item_getcheck_func_BOSS_KEY() { } int item_getcheck_func_DUNGEON_BACK() { - return dComIfGs_getItem(SLOT_18, true) == fpcNm_ITEM_DUNGEON_BACK ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_18, true) == dItemNo_DUNGEON_BACK_e ? TRUE : FALSE; } int item_getcheck_func_SWORD() { @@ -1378,23 +1378,23 @@ int item_getcheck_func_MASTER_SWORD() { } int item_getcheck_func_WOOD_SHIELD() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_WOOD_SHIELD); + return dComIfGs_isItemFirstBit(dItemNo_WOOD_SHIELD_e); } int item_getcheck_func_SHIELD() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_SHIELD); + return dComIfGs_isItemFirstBit(dItemNo_SHIELD_e); } int item_getcheck_func_HYLIA_SHIELD() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_HYLIA_SHIELD); + return dComIfGs_isItemFirstBit(dItemNo_HYLIA_SHIELD_e); } int item_getcheck_func_TKS_LETTER() { - return dComIfGs_getItem(SLOT_18, true) == fpcNm_ITEM_TKS_LETTER ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_18, true) == dItemNo_TKS_LETTER_e ? TRUE : FALSE; } int item_getcheck_func_WEAR_CASUAL() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_WEAR_CASUAL); + return dComIfGs_isItemFirstBit(dItemNo_WEAR_CASUAL_e); } int item_getcheck_func_WEAR_KOKIRI() { @@ -1402,11 +1402,11 @@ int item_getcheck_func_WEAR_KOKIRI() { } int item_getcheck_func_ARMOR() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_ARMOR); + return dComIfGs_isItemFirstBit(dItemNo_ARMOR_e); } int item_getcheck_func_WEAR_ZORA() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_WEAR_ZORA); + return dComIfGs_isItemFirstBit(dItemNo_WEAR_ZORA_e); } int item_getcheck_func_MAGIC_LV1() { @@ -1414,7 +1414,7 @@ int item_getcheck_func_MAGIC_LV1() { } int item_getcheck_func_DUNGEON_EXIT_2() { - return dComIfGs_getItem(SLOT_18, true) == fpcNm_ITEM_DUNGEON_EXIT ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_18, true) == dItemNo_DUNGEON_EXIT_e ? TRUE : FALSE; } int item_getcheck_func_WALLET_LV1() { @@ -1430,51 +1430,51 @@ int item_getcheck_func_WALLET_LV3() { } int item_getcheck_func_ZORAS_JEWEL() { - return dComIfGs_getItem(SLOT_20, true) == fpcNm_ITEM_ZORAS_JEWEL ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_20, true) == dItemNo_ZORAS_JEWEL_e ? TRUE : FALSE; } int item_getcheck_func_HAWK_EYE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_HAWK_EYE); + return dComIfGs_isItemFirstBit(dItemNo_HAWK_EYE_e); } int item_getcheck_func_WOOD_STICK() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_WOOD_STICK); + return dComIfGs_isItemFirstBit(dItemNo_WOOD_STICK_e); } int item_getcheck_func_BOOMERANG() { - return dComIfGs_getItem(SLOT_0, true) == fpcNm_ITEM_BOOMERANG ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_0, true) == dItemNo_BOOMERANG_e ? TRUE : FALSE; } int item_getcheck_func_SPINNER() { - return dComIfGs_getItem(SLOT_2, true) == fpcNm_ITEM_SPINNER ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_2, true) == dItemNo_SPINNER_e ? TRUE : FALSE; } int item_getcheck_func_IRONBALL() { - return dComIfGs_getItem(SLOT_6, true) == fpcNm_ITEM_IRONBALL ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_6, true) == dItemNo_IRONBALL_e ? TRUE : FALSE; } int item_getcheck_func_BOW() { - return dComIfGs_getItem(SLOT_4, false) == fpcNm_ITEM_BOW ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_4, false) == dItemNo_BOW_e ? TRUE : FALSE; } int item_getcheck_func_HOOKSHOT() { - return dComIfGs_getItem(SLOT_9, true) == fpcNm_ITEM_HOOKSHOT ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_9, true) == dItemNo_HOOKSHOT_e ? TRUE : FALSE; } int item_getcheck_func_HVY_BOOTS() { - return dComIfGs_getItem(SLOT_3, true) == fpcNm_ITEM_HVY_BOOTS ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_3, true) == dItemNo_HVY_BOOTS_e ? TRUE : FALSE; } int item_getcheck_func_COPY_ROD() { - return dComIfGs_getItem(SLOT_8, true) == fpcNm_ITEM_COPY_ROD ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_8, true) == dItemNo_COPY_ROD_e ? TRUE : FALSE; } int item_getcheck_func_W_HOOKSHOT() { - return dComIfGs_getItem(SLOT_10, true) == fpcNm_ITEM_W_HOOKSHOT ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_10, true) == dItemNo_W_HOOKSHOT_e ? TRUE : FALSE; } int item_getcheck_func_KANTERA() { - return dComIfGs_getItem(SLOT_1, true) == fpcNm_ITEM_KANTERA ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_1, true) == dItemNo_KANTERA_e ? TRUE : FALSE; } int item_getcheck_func_LIGHT_SWORD() { @@ -1482,18 +1482,18 @@ int item_getcheck_func_LIGHT_SWORD() { } int item_getcheck_func_FISHING_ROD_1() { - return (dComIfGs_getItem(SLOT_20, true) == fpcNm_ITEM_FISHING_ROD_1 || - dComIfGs_getItem(SLOT_20, true) == fpcNm_ITEM_BEE_ROD || - dComIfGs_getItem(SLOT_20, true) == fpcNm_ITEM_WORM_ROD || - dComIfGs_getItem(SLOT_20, true) == fpcNm_ITEM_JEWEL_ROD || - dComIfGs_getItem(SLOT_20, true) == fpcNm_ITEM_JEWEL_BEE_ROD || - dComIfGs_getItem(SLOT_20, true) == fpcNm_ITEM_JEWEL_WORM_ROD) ? + return (dComIfGs_getItem(SLOT_20, true) == dItemNo_FISHING_ROD_1_e || + dComIfGs_getItem(SLOT_20, true) == dItemNo_BEE_ROD_e || + dComIfGs_getItem(SLOT_20, true) == dItemNo_WORM_ROD_e || + dComIfGs_getItem(SLOT_20, true) == dItemNo_JEWEL_ROD_e || + dComIfGs_getItem(SLOT_20, true) == dItemNo_JEWEL_BEE_ROD_e || + dComIfGs_getItem(SLOT_20, true) == dItemNo_JEWEL_WORM_ROD_e) ? TRUE : FALSE; } int item_getcheck_func_PACHINKO() { - return dComIfGs_getItem(SLOT_23, true) == fpcNm_ITEM_PACHINKO ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_23, true) == dItemNo_PACHINKO_e ? TRUE : FALSE; } int item_getcheck_func_COPY_ROD_2() { @@ -1501,31 +1501,31 @@ int item_getcheck_func_COPY_ROD_2() { } int item_getcheck_func_BOMB_BAG_LV2() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_BAG_LV2); + return dComIfGs_isItemFirstBit(dItemNo_BOMB_BAG_LV2_e); } int item_getcheck_func_BOMB_BAG_LV1() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_BAG_LV1); + return dComIfGs_isItemFirstBit(dItemNo_BOMB_BAG_LV1_e); } int item_getcheck_func_BOMB_IN_BAG() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_IN_BAG); + return dComIfGs_isItemFirstBit(dItemNo_BOMB_IN_BAG_e); } int item_getcheck_func_LIGHT_ARROW() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_LIGHT_ARROW); + return dComIfGs_isItemFirstBit(dItemNo_LIGHT_ARROW_e); } int item_getcheck_func_ARROW_LV1() { - return (dComIfGs_getItem(SLOT_4, false) == fpcNm_ITEM_BOW && dComIfGs_getArrowMax() >= 30) ? TRUE : FALSE; + return (dComIfGs_getItem(SLOT_4, false) == dItemNo_BOW_e && dComIfGs_getArrowMax() >= 30) ? TRUE : FALSE; } int item_getcheck_func_ARROW_LV2() { - return (dComIfGs_getItem(SLOT_4, false) == fpcNm_ITEM_BOW && dComIfGs_getArrowMax() >= 60) ? TRUE : FALSE; + return (dComIfGs_getItem(SLOT_4, false) == dItemNo_BOW_e && dComIfGs_getArrowMax() >= 60) ? TRUE : FALSE; } int item_getcheck_func_ARROW_LV3() { - return (dComIfGs_getItem(SLOT_4, false) == fpcNm_ITEM_BOW && dComIfGs_getArrowMax() >= 100) ? TRUE : FALSE; + return (dComIfGs_getItem(SLOT_4, false) == dItemNo_BOW_e && dComIfGs_getArrowMax() >= 100) ? TRUE : FALSE; } int item_getcheck_func_LURE_ROD() { @@ -1561,91 +1561,91 @@ int item_getcheck_func_JEWEL_WORM_ROD() { } int item_getcheck_func_EMPTY_BOTTLE() { - return dComIfGs_checkBottle(fpcNm_ITEM_EMPTY_BOTTLE); + return dComIfGs_checkBottle(dItemNo_EMPTY_BOTTLE_e); } int item_getcheck_func_RED_BOTTLE() { - return dComIfGs_checkBottle(fpcNm_ITEM_RED_BOTTLE); + return dComIfGs_checkBottle(dItemNo_RED_BOTTLE_e); } int item_getcheck_func_GREEN_BOTTLE() { - return dComIfGs_checkBottle(fpcNm_ITEM_GREEN_BOTTLE); + return dComIfGs_checkBottle(dItemNo_GREEN_BOTTLE_e); } int item_getcheck_func_BLUE_BOTTLE() { - return dComIfGs_checkBottle(fpcNm_ITEM_BLUE_BOTTLE); + return dComIfGs_checkBottle(dItemNo_BLUE_BOTTLE_e); } int item_getcheck_func_MILK_BOTTLE() { - return dComIfGs_checkBottle(fpcNm_ITEM_MILK_BOTTLE); + return dComIfGs_checkBottle(dItemNo_MILK_BOTTLE_e); } int item_getcheck_func_HALF_MILK_BOTTLE() { - return dComIfGs_checkBottle(fpcNm_ITEM_HALF_MILK_BOTTLE); + return dComIfGs_checkBottle(dItemNo_HALF_MILK_BOTTLE_e); } int item_getcheck_func_OIL_BOTTLE() { - return dComIfGs_checkBottle(fpcNm_ITEM_OIL_BOTTLE); + return dComIfGs_checkBottle(dItemNo_OIL_BOTTLE_e); } int item_getcheck_func_WATER_BOTTLE() { - return dComIfGs_checkBottle(fpcNm_ITEM_WATER_BOTTLE); + return dComIfGs_checkBottle(dItemNo_WATER_BOTTLE_e); } int item_getcheck_func_OIL_BOTTLE2() { - return dComIfGs_checkBottle(fpcNm_ITEM_OIL_BOTTLE_2); + return dComIfGs_checkBottle(dItemNo_OIL_BOTTLE_2_e); } int item_getcheck_func_RED_BOTTLE2() { - return dComIfGs_checkBottle(fpcNm_ITEM_RED_BOTTLE_2); + return dComIfGs_checkBottle(dItemNo_RED_BOTTLE_2_e); } int item_getcheck_func_UGLY_SOUP() { - return dComIfGs_checkBottle(fpcNm_ITEM_UGLY_SOUP); + return dComIfGs_checkBottle(dItemNo_UGLY_SOUP_e); } int item_getcheck_func_HOT_SPRING() { - return dComIfGs_checkBottle(fpcNm_ITEM_HOT_SPRING); + return dComIfGs_checkBottle(dItemNo_HOT_SPRING_e); } int item_getcheck_func_FAIRY_BOTTLE() { - return dComIfGs_checkBottle(fpcNm_ITEM_FAIRY); + return dComIfGs_checkBottle(dItemNo_FAIRY_e); } int item_getcheck_func_HOT_SPRING2() { - return dComIfGs_checkBottle(fpcNm_ITEM_HOT_SPRING); + return dComIfGs_checkBottle(dItemNo_HOT_SPRING_e); } int item_getcheck_func_OIL2() { - return dComIfGs_checkBottle(fpcNm_ITEM_OIL2); + return dComIfGs_checkBottle(dItemNo_OIL2_e); } int item_getcheck_func_OIL() { - return dComIfGs_checkBottle(fpcNm_ITEM_OIL); + return dComIfGs_checkBottle(dItemNo_OIL_e); } int item_getcheck_func_NORMAL_BOMB() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_NORMAL_BOMB); + return dComIfGs_isItemFirstBit(dItemNo_NORMAL_BOMB_e); } int item_getcheck_func_WATER_BOMB() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_WATER_BOMB); + return dComIfGs_isItemFirstBit(dItemNo_WATER_BOMB_e); } int item_getcheck_func_POKE_BOMB() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_POKE_BOMB); + return dComIfGs_isItemFirstBit(dItemNo_POKE_BOMB_e); } int item_getcheck_func_FAIRY_DROP() { - return dComIfGs_checkBottle(fpcNm_ITEM_FAIRY_DROP); + return dComIfGs_checkBottle(dItemNo_FAIRY_DROP_e); } int item_getcheck_func_WORM() { - return dComIfGs_checkBottle(fpcNm_ITEM_WORM); + return dComIfGs_checkBottle(dItemNo_WORM_e); } int item_getcheck_func_DROP_BOTTLE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_DROP_BOTTLE); + return dComIfGs_isItemFirstBit(dItemNo_DROP_BOTTLE_e); } int item_getcheck_func_BEE_CHILD() { @@ -1653,71 +1653,71 @@ int item_getcheck_func_BEE_CHILD() { } int item_getcheck_func_CHUCHU_RARE() { - return dComIfGs_checkBottle(fpcNm_ITEM_CHUCHU_RARE); + return dComIfGs_checkBottle(dItemNo_CHUCHU_RARE_e); } int item_getcheck_func_CHUCHU_RED() { - return dComIfGs_checkBottle(fpcNm_ITEM_CHUCHU_RED); + return dComIfGs_checkBottle(dItemNo_CHUCHU_RED_e); } int item_getcheck_func_CHUCHU_BLUE() { - return dComIfGs_checkBottle(fpcNm_ITEM_CHUCHU_BLUE); + return dComIfGs_checkBottle(dItemNo_CHUCHU_BLUE_e); } int item_getcheck_func_CHUCHU_GREEN() { - return dComIfGs_checkBottle(fpcNm_ITEM_CHUCHU_GREEN); + return dComIfGs_checkBottle(dItemNo_CHUCHU_GREEN_e); } int item_getcheck_func_CHUCHU_YELLOW() { - return dComIfGs_checkBottle(fpcNm_ITEM_CHUCHU_YELLOW); + return dComIfGs_checkBottle(dItemNo_CHUCHU_YELLOW_e); } int item_getcheck_func_CHUCHU_PURPLE() { - return dComIfGs_checkBottle(fpcNm_ITEM_CHUCHU_PURPLE); + return dComIfGs_checkBottle(dItemNo_CHUCHU_PURPLE_e); } int item_getcheck_func_LV1_SOUP() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_LV1_SOUP); + return dComIfGs_isItemFirstBit(dItemNo_LV1_SOUP_e); } int item_getcheck_func_LV2_SOUP() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_LV2_SOUP); + return dComIfGs_isItemFirstBit(dItemNo_LV2_SOUP_e); } int item_getcheck_func_LV3_SOUP() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_LV3_SOUP); + return dComIfGs_isItemFirstBit(dItemNo_LV3_SOUP_e); } int item_getcheck_func_LETTER() { - return dComIfGs_getItem(SLOT_21, true) == fpcNm_ITEM_LETTER ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_21, true) == dItemNo_LETTER_e ? TRUE : FALSE; } int item_getcheck_func_BILL() { - return dComIfGs_getItem(SLOT_21, true) == fpcNm_ITEM_BILL ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_21, true) == dItemNo_BILL_e ? TRUE : FALSE; } int item_getcheck_func_WOOD_STATUE() { - return dComIfGs_getItem(SLOT_21, true) == fpcNm_ITEM_WOOD_STATUE ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_21, true) == dItemNo_WOOD_STATUE_e ? TRUE : FALSE; } int item_getcheck_func_IRIAS_PENDANT() { - return dComIfGs_getItem(SLOT_21, true) == fpcNm_ITEM_IRIAS_PENDANT ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_21, true) == dItemNo_IRIAS_PENDANT_e ? TRUE : FALSE; } int item_getcheck_func_HORSE_FLUTE() { - return dComIfGs_getItem(SLOT_22, true) == fpcNm_ITEM_HORSE_FLUTE ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_22, true) == dItemNo_HORSE_FLUTE_e ? TRUE : FALSE; } int item_getcheck_func_RAFRELS_MEMO() { - return dComIfGs_getItem(SLOT_19, true) == fpcNm_ITEM_RAFRELS_MEMO ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_19, true) == dItemNo_RAFRELS_MEMO_e ? TRUE : FALSE; } int item_getcheck_func_ASHS_SCRIBBLING() { - return dComIfGs_getItem(SLOT_19, true) == fpcNm_ITEM_ASHS_SCRIBBLING ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_19, true) == dItemNo_ASHS_SCRIBBLING_e ? TRUE : FALSE; } int item_getcheck_func_CHUCHU_YELLOW2() { - return dComIfGs_checkBottle(fpcNm_ITEM_CHUCHU_YELLOW2); + return dComIfGs_checkBottle(dItemNo_CHUCHU_YELLOW2_e); } int item_getcheck_func_OIL_BOTTLE3() { @@ -1729,11 +1729,11 @@ int item_getcheck_func_SHOP_BEE_CHILD() { } int item_getcheck_func_CHUCHU_BLACK() { - return dComIfGs_checkBottle(fpcNm_ITEM_CHUCHU_BLACK); + return dComIfGs_checkBottle(dItemNo_CHUCHU_BLACK_e); } int item_getcheck_func_LIGHT_DROP() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_LIGHT_DROP); + return dComIfGs_isItemFirstBit(dItemNo_LIGHT_DROP_e); } int item_getcheck_func_DROP_CONTAINER() { @@ -1765,7 +1765,7 @@ int item_getcheck_func_MIRROR_PIECE_4() { } int item_getcheck_func_SMELL_YELIA_POUCH() { - return dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_YELIA_POUCH ? TRUE : FALSE; + return dComIfGs_getCollectSmell() == dItemNo_SMELL_YELIA_POUCH_e ? TRUE : FALSE; } int item_getcheck_func_SMELL_PUMPKIN() { @@ -1773,115 +1773,115 @@ int item_getcheck_func_SMELL_PUMPKIN() { } int item_getcheck_func_SMELL_POH() { - return dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_POH ? TRUE : FALSE; + return dComIfGs_getCollectSmell() == dItemNo_SMELL_POH_e ? TRUE : FALSE; } int item_getcheck_func_SMELL_FISH() { - return dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_FISH ? TRUE : FALSE; + return dComIfGs_getCollectSmell() == dItemNo_SMELL_FISH_e ? TRUE : FALSE; } int item_getcheck_func_SMELL_CHILDREN() { - return dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_CHILDREN ? TRUE : FALSE; + return dComIfGs_getCollectSmell() == dItemNo_SMELL_CHILDREN_e ? TRUE : FALSE; } int item_getcheck_func_SMELL_MEDICINE() { - return dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_MEDICINE ? TRUE : FALSE; + return dComIfGs_getCollectSmell() == dItemNo_SMELL_MEDICINE_e ? TRUE : FALSE; } int item_getcheck_func_M_BEETLE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_BEETLE); + return dComIfGs_isItemFirstBit(dItemNo_M_BEETLE_e); } int item_getcheck_func_F_BEETLE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_BEETLE); + return dComIfGs_isItemFirstBit(dItemNo_F_BEETLE_e); } int item_getcheck_func_M_BUTTERFLY() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_BUTTERFLY); + return dComIfGs_isItemFirstBit(dItemNo_M_BUTTERFLY_e); } int item_getcheck_func_F_BUTTERFLY() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_BUTTERFLY); + return dComIfGs_isItemFirstBit(dItemNo_F_BUTTERFLY_e); } int item_getcheck_func_M_STAG_BEETLE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_STAG_BEETLE); + return dComIfGs_isItemFirstBit(dItemNo_M_STAG_BEETLE_e); } int item_getcheck_func_F_STAG_BEETLE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_STAG_BEETLE); + return dComIfGs_isItemFirstBit(dItemNo_F_STAG_BEETLE_e); } int item_getcheck_func_M_GRASSHOPPER() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_GRASSHOPPER); + return dComIfGs_isItemFirstBit(dItemNo_M_GRASSHOPPER_e); } int item_getcheck_func_F_GRASSHOPPER() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_GRASSHOPPER); + return dComIfGs_isItemFirstBit(dItemNo_F_GRASSHOPPER_e); } int item_getcheck_func_M_NANAFUSHI() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_NANAFUSHI); + return dComIfGs_isItemFirstBit(dItemNo_M_NANAFUSHI_e); } int item_getcheck_func_F_NANAFUSHI() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_NANAFUSHI); + return dComIfGs_isItemFirstBit(dItemNo_F_NANAFUSHI_e); } int item_getcheck_func_M_DANGOMUSHI() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_DANGOMUSHI); + return dComIfGs_isItemFirstBit(dItemNo_M_DANGOMUSHI_e); } int item_getcheck_func_F_DANGOMUSHI() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_DANGOMUSHI); + return dComIfGs_isItemFirstBit(dItemNo_F_DANGOMUSHI_e); } int item_getcheck_func_M_MANTIS() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_MANTIS); + return dComIfGs_isItemFirstBit(dItemNo_M_MANTIS_e); } int item_getcheck_func_F_MANTIS() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_MANTIS); + return dComIfGs_isItemFirstBit(dItemNo_F_MANTIS_e); } int item_getcheck_func_M_LADYBUG() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_LADYBUG); + return dComIfGs_isItemFirstBit(dItemNo_M_LADYBUG_e); } int item_getcheck_func_F_LADYBUG() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_LADYBUG); + return dComIfGs_isItemFirstBit(dItemNo_F_LADYBUG_e); } int item_getcheck_func_M_SNAIL() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_SNAIL); + return dComIfGs_isItemFirstBit(dItemNo_M_SNAIL_e); } int item_getcheck_func_F_SNAIL() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_SNAIL); + return dComIfGs_isItemFirstBit(dItemNo_F_SNAIL_e); } int item_getcheck_func_M_DRAGONFLY() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_DRAGONFLY); + return dComIfGs_isItemFirstBit(dItemNo_M_DRAGONFLY_e); } int item_getcheck_func_F_DRAGONFLY() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_DRAGONFLY); + return dComIfGs_isItemFirstBit(dItemNo_F_DRAGONFLY_e); } int item_getcheck_func_M_ANT() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_ANT); + return dComIfGs_isItemFirstBit(dItemNo_M_ANT_e); } int item_getcheck_func_F_ANT() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_ANT); + return dComIfGs_isItemFirstBit(dItemNo_F_ANT_e); } int item_getcheck_func_M_MAYFLY() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_MAYFLY); + return dComIfGs_isItemFirstBit(dItemNo_M_MAYFLY_e); } int item_getcheck_func_F_MAYFLY() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_MAYFLY); + return dComIfGs_isItemFirstBit(dItemNo_F_MAYFLY_e); } int item_getcheck_func_POU_SPIRIT() { @@ -1889,19 +1889,19 @@ int item_getcheck_func_POU_SPIRIT() { } int item_getcheck_func_ANCIENT_DOCUMENT() { - return dComIfGs_getItem(SLOT_22, true) == fpcNm_ITEM_ANCIENT_DOCUMENT ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_22, true) == dItemNo_ANCIENT_DOCUMENT_e ? TRUE : FALSE; } int item_getcheck_func_AIR_LETTER() { - return dComIfGs_getItem(SLOT_22, true) == fpcNm_ITEM_AIR_LETTER ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_22, true) == dItemNo_AIR_LETTER_e ? TRUE : FALSE; } int item_getcheck_func_ANCIENT_DOCUMENT2() { - return dComIfGs_getItem(SLOT_22, true) == fpcNm_ITEM_ANCIENT_DOCUMENT2 ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_22, true) == dItemNo_ANCIENT_DOCUMENT2_e ? TRUE : FALSE; } int item_getcheck_func_LV7_DUNGEON_EXIT() { - return dComIfGs_getItem(SLOT_18, true) == fpcNm_ITEM_LV7_DUNGEON_EXIT ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_18, true) == dItemNo_LV7_DUNGEON_EXIT_e ? TRUE : FALSE; } int item_getcheck_func_LINKS_SAVINGS() { @@ -1933,11 +1933,11 @@ int item_getcheck_func_BOSSRIDER_KEY() { } int item_getcheck_func_TOMATO_PUREE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_TOMATO_PUREE); + return dComIfGs_isItemFirstBit(dItemNo_TOMATO_PUREE_e); } int item_getcheck_func_TASTE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_TASTE); + return dComIfGs_isItemFirstBit(dItemNo_TASTE_e); } int item_getcheck_func_LV5_BOSS_KEY() { @@ -1953,19 +1953,19 @@ int item_getcheck_func_KANTERA2() { } int item_getcheck_func_L2_KEY_PIECES1() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_L2_KEY_PIECES1); + return dComIfGs_isItemFirstBit(dItemNo_L2_KEY_PIECES1_e); } int item_getcheck_func_L2_KEY_PIECES2() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_L2_KEY_PIECES2); + return dComIfGs_isItemFirstBit(dItemNo_L2_KEY_PIECES2_e); } int item_getcheck_func_L2_KEY_PIECES3() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_L2_KEY_PIECES3); + return dComIfGs_isItemFirstBit(dItemNo_L2_KEY_PIECES3_e); } int item_getcheck_func_KEY_OF_CARAVAN() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_KEY_OF_CARAVAN); + return dComIfGs_isItemFirstBit(dItemNo_KEY_OF_CARAVAN_e); } int item_getcheck_func_LV2_BOSS_KEY() { @@ -1979,8 +1979,8 @@ int item_getcheck_func_KEY_OF_FILONE() { int isBomb(u8 i_itemNo) { int is_bomb = false; - if (i_itemNo == fpcNm_ITEM_BOMB_5 || i_itemNo == fpcNm_ITEM_BOMB_10 || i_itemNo == fpcNm_ITEM_BOMB_20 || i_itemNo == fpcNm_ITEM_BOMB_30 || - i_itemNo == fpcNm_ITEM_NORMAL_BOMB | i_itemNo == fpcNm_ITEM_WATER_BOMB || i_itemNo == fpcNm_ITEM_POKE_BOMB) + if (i_itemNo == dItemNo_BOMB_5_e || i_itemNo == dItemNo_BOMB_10_e || i_itemNo == dItemNo_BOMB_20_e || i_itemNo == dItemNo_BOMB_30_e || + i_itemNo == dItemNo_NORMAL_BOMB_e | i_itemNo == dItemNo_WATER_BOMB_e || i_itemNo == dItemNo_POKE_BOMB_e) { is_bomb = true; } @@ -1991,7 +1991,7 @@ int isBomb(u8 i_itemNo) { int isArrow(u8 i_itemNo) { int is_arrow = false; - if (i_itemNo == fpcNm_ITEM_ARROW_1 || i_itemNo == fpcNm_ITEM_ARROW_10 || i_itemNo == fpcNm_ITEM_ARROW_20 || i_itemNo == fpcNm_ITEM_ARROW_30) + if (i_itemNo == dItemNo_ARROW_1_e || i_itemNo == dItemNo_ARROW_10_e || i_itemNo == dItemNo_ARROW_20_e || i_itemNo == dItemNo_ARROW_30_e) { is_arrow = true; } @@ -2001,37 +2001,37 @@ int isArrow(u8 i_itemNo) { BOOL isBottleItem(u8 i_itemNo) { switch (i_itemNo) { - case fpcNm_ITEM_OIL_BOTTLE3: - case fpcNm_ITEM_EMPTY_BOTTLE: - case fpcNm_ITEM_RED_BOTTLE: - case fpcNm_ITEM_GREEN_BOTTLE: - case fpcNm_ITEM_BLUE_BOTTLE: - case fpcNm_ITEM_MILK_BOTTLE: - case fpcNm_ITEM_HALF_MILK_BOTTLE: - case fpcNm_ITEM_OIL_BOTTLE: - case fpcNm_ITEM_WATER_BOTTLE: - case fpcNm_ITEM_OIL_BOTTLE_2: - case fpcNm_ITEM_RED_BOTTLE_2: - case fpcNm_ITEM_UGLY_SOUP: - case fpcNm_ITEM_HOT_SPRING: - case fpcNm_ITEM_FAIRY: - case fpcNm_ITEM_FAIRY_DROP: - case fpcNm_ITEM_WORM: - case fpcNm_ITEM_BEE_CHILD: - case fpcNm_ITEM_CHUCHU_RARE: - case fpcNm_ITEM_CHUCHU_RED: - case fpcNm_ITEM_CHUCHU_BLUE: - case fpcNm_ITEM_CHUCHU_GREEN: - case fpcNm_ITEM_CHUCHU_YELLOW: - case fpcNm_ITEM_CHUCHU_PURPLE: - case fpcNm_ITEM_LV1_SOUP: - case fpcNm_ITEM_LV2_SOUP: - case fpcNm_ITEM_LV3_SOUP: - case fpcNm_ITEM_CHUCHU_BLACK: - case fpcNm_ITEM_POU_FIRE1: - case fpcNm_ITEM_POU_FIRE2: - case fpcNm_ITEM_POU_FIRE3: - case fpcNm_ITEM_POU_FIRE4: + case dItemNo_OIL_BOTTLE3_e: + case dItemNo_EMPTY_BOTTLE_e: + case dItemNo_RED_BOTTLE_e: + case dItemNo_GREEN_BOTTLE_e: + case dItemNo_BLUE_BOTTLE_e: + case dItemNo_MILK_BOTTLE_e: + case dItemNo_HALF_MILK_BOTTLE_e: + case dItemNo_OIL_BOTTLE_e: + case dItemNo_WATER_BOTTLE_e: + case dItemNo_OIL_BOTTLE_2_e: + case dItemNo_RED_BOTTLE_2_e: + case dItemNo_UGLY_SOUP_e: + case dItemNo_HOT_SPRING_e: + case dItemNo_FAIRY_e: + case dItemNo_FAIRY_DROP_e: + case dItemNo_WORM_e: + case dItemNo_BEE_CHILD_e: + case dItemNo_CHUCHU_RARE_e: + case dItemNo_CHUCHU_RED_e: + case dItemNo_CHUCHU_BLUE_e: + case dItemNo_CHUCHU_GREEN_e: + case dItemNo_CHUCHU_YELLOW_e: + case dItemNo_CHUCHU_PURPLE_e: + case dItemNo_LV1_SOUP_e: + case dItemNo_LV2_SOUP_e: + case dItemNo_LV3_SOUP_e: + case dItemNo_CHUCHU_BLACK_e: + case dItemNo_POU_FIRE1_e: + case dItemNo_POU_FIRE2_e: + case dItemNo_POU_FIRE3_e: + case dItemNo_POU_FIRE4_e: return TRUE; default: return FALSE; @@ -2041,7 +2041,7 @@ BOOL isBottleItem(u8 i_itemNo) { BOOL isHeart(u8 i_itemNo) { BOOL is_heart = false; - if (i_itemNo == fpcNm_ITEM_HEART || i_itemNo == fpcNm_ITEM_TRIPLE_HEART) { + if (i_itemNo == dItemNo_HEART_e || i_itemNo == dItemNo_TRIPLE_HEART_e) { is_heart = true; } @@ -2052,30 +2052,30 @@ BOOL isInsect(u8 i_itemNo) { BOOL is_insect = false; switch (i_itemNo) { - case fpcNm_ITEM_M_BEETLE: - case fpcNm_ITEM_F_BEETLE: - case fpcNm_ITEM_M_BUTTERFLY: - case fpcNm_ITEM_F_BUTTERFLY: - case fpcNm_ITEM_M_STAG_BEETLE: - case fpcNm_ITEM_F_STAG_BEETLE: - case fpcNm_ITEM_M_GRASSHOPPER: - case fpcNm_ITEM_F_GRASSHOPPER: - case fpcNm_ITEM_M_NANAFUSHI: - case fpcNm_ITEM_F_NANAFUSHI: - case fpcNm_ITEM_M_DANGOMUSHI: - case fpcNm_ITEM_F_DANGOMUSHI: - case fpcNm_ITEM_M_MANTIS: - case fpcNm_ITEM_F_MANTIS: - case fpcNm_ITEM_M_LADYBUG: - case fpcNm_ITEM_F_LADYBUG: - case fpcNm_ITEM_M_SNAIL: - case fpcNm_ITEM_F_SNAIL: - case fpcNm_ITEM_M_DRAGONFLY: - case fpcNm_ITEM_F_DRAGONFLY: - case fpcNm_ITEM_M_ANT: - case fpcNm_ITEM_F_ANT: - case fpcNm_ITEM_M_MAYFLY: - case fpcNm_ITEM_F_MAYFLY: + case dItemNo_M_BEETLE_e: + case dItemNo_F_BEETLE_e: + case dItemNo_M_BUTTERFLY_e: + case dItemNo_F_BUTTERFLY_e: + case dItemNo_M_STAG_BEETLE_e: + case dItemNo_F_STAG_BEETLE_e: + case dItemNo_M_GRASSHOPPER_e: + case dItemNo_F_GRASSHOPPER_e: + case dItemNo_M_NANAFUSHI_e: + case dItemNo_F_NANAFUSHI_e: + case dItemNo_M_DANGOMUSHI_e: + case dItemNo_F_DANGOMUSHI_e: + case dItemNo_M_MANTIS_e: + case dItemNo_F_MANTIS_e: + case dItemNo_M_LADYBUG_e: + case dItemNo_F_LADYBUG_e: + case dItemNo_M_SNAIL_e: + case dItemNo_F_SNAIL_e: + case dItemNo_M_DRAGONFLY_e: + case dItemNo_F_DRAGONFLY_e: + case dItemNo_M_ANT_e: + case dItemNo_F_ANT_e: + case dItemNo_M_MAYFLY_e: + case dItemNo_F_MAYFLY_e: is_insect = true; } @@ -2083,18 +2083,18 @@ BOOL isInsect(u8 i_itemNo) { } u8 check_itemno(int i_itemNo) { - if (!dComIfGs_isGetMagicUseFlag() && (i_itemNo == fpcNm_ITEM_S_MAGIC || i_itemNo == fpcNm_ITEM_L_MAGIC)) { - return fpcNm_ITEM_GREEN_RUPEE; + if (!dComIfGs_isGetMagicUseFlag() && (i_itemNo == dItemNo_S_MAGIC_e || i_itemNo == dItemNo_L_MAGIC_e)) { + return dItemNo_GREEN_RUPEE_e; } - if (i_itemNo == fpcNm_ITEM_ARROW_1) { - if (!dComIfGs_isItemFirstBit(fpcNm_ITEM_BOW)) { - return fpcNm_ITEM_GREEN_RUPEE; + if (i_itemNo == dItemNo_ARROW_1_e) { + if (!dComIfGs_isItemFirstBit(dItemNo_BOW_e)) { + return dItemNo_GREEN_RUPEE_e; } } else { if (isArrow(i_itemNo)) { - if (!dComIfGs_isItemFirstBit(fpcNm_ITEM_BOW)) { - return fpcNm_ITEM_GREEN_RUPEE; + if (!dComIfGs_isItemFirstBit(dItemNo_BOW_e)) { + return dItemNo_GREEN_RUPEE_e; } if (g_dComIfG_gameInfo.play.getLayerNo(0) == 0xD || @@ -2103,23 +2103,23 @@ u8 check_itemno(int i_itemNo) { const char* stage_name = dComIfGp_getStartStageName(); // D_MN08: Palace of Twilight if (strncmp(stage_name, "D_MN08", 6)) { - return fpcNm_ITEM_GREEN_RUPEE; + return dItemNo_GREEN_RUPEE_e; } } } } - if (!dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_BAG_LV1) && isBomb(i_itemNo)) { - return fpcNm_ITEM_GREEN_RUPEE; + if (!dComIfGs_isItemFirstBit(dItemNo_BOMB_BAG_LV1_e) && isBomb(i_itemNo)) { + return dItemNo_GREEN_RUPEE_e; } else { - if (i_itemNo == fpcNm_ITEM_TRIPLE_HEART) { - i_itemNo = fpcNm_ITEM_HEART; + if (i_itemNo == dItemNo_TRIPLE_HEART_e) { + i_itemNo = dItemNo_HEART_e; } - if (!checkItemGet(fpcNm_ITEM_PACHINKO, 1) && i_itemNo == fpcNm_ITEM_PACHINKO_SHOT) { - i_itemNo = fpcNm_ITEM_GREEN_RUPEE; + if (!checkItemGet(dItemNo_PACHINKO_e, 1) && i_itemNo == dItemNo_PACHINKO_SHOT_e) { + i_itemNo = dItemNo_GREEN_RUPEE_e; } - if (i_itemNo == fpcNm_ITEM_S_MAGIC || i_itemNo == fpcNm_ITEM_L_MAGIC) { - i_itemNo = fpcNm_ITEM_GREEN_RUPEE; + if (i_itemNo == dItemNo_S_MAGIC_e || i_itemNo == dItemNo_L_MAGIC_e) { + i_itemNo = dItemNo_GREEN_RUPEE_e; } } return i_itemNo; @@ -2132,7 +2132,7 @@ int addBombCount(u8 i_bombType, u8 i_addNum) { for (u8 i = 0; i < 3; i++) { bombType[i] = dComIfGs_getItem(i + SLOT_15, false); - if (bombType[i] == fpcNm_ITEM_BOMB_BAG_LV1) { + if (bombType[i] == dItemNo_BOMB_BAG_LV1_e) { bombNum[i] = 0; } else if (bombType[i] == i_bombType) { bombNum[i] = dComIfGs_getBombNum(i); diff --git a/src/d/d_k_wmark.cpp b/src/d/d_k_wmark.cpp index f3f089d564..8021494be2 100644 --- a/src/d/d_k_wmark.cpp +++ b/src/d/d_k_wmark.cpp @@ -169,15 +169,15 @@ static leafdraw_method_class l_dkWmark_Method = { }; kankyo_process_profile_definition g_profile_WMARK = { - fpcLy_CURRENT_e, - 9, - fpcPi_CURRENT_e, - PROC_WMARK, - &g_fpcLf_Method.base, - sizeof(dkWmark_c), - 0, - 0, - &g_fopKy_Method, - 760, - &l_dkWmark_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 9, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_WMARK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dkWmark_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopKy_Method, + /* Draw Prio */ fpcDwPi_WMARK_e, + /* Kankyo SubMtd */ &l_dkWmark_Method, }; diff --git a/src/d/d_k_wpillar.cpp b/src/d/d_k_wpillar.cpp index bb70b50cf9..10a00a4441 100644 --- a/src/d/d_k_wpillar.cpp +++ b/src/d/d_k_wpillar.cpp @@ -2,7 +2,7 @@ #include "d/d_k_wpillar.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_actor_mng.h" static const char l_arcName[] = "Always"; @@ -133,15 +133,15 @@ static leafdraw_method_class l_dkWpillar_Method = { }; kankyo_process_profile_definition g_profile_WPILLAR = { - fpcLy_CURRENT_e, - 9, - fpcPi_CURRENT_e, - PROC_WPILLAR, - &g_fpcLf_Method.base, - sizeof(dkWpillar_c), - 0, - 0, - &g_fopKy_Method, - 759, - &l_dkWpillar_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 9, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_WPILLAR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dkWpillar_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopKy_Method, + /* Draw Prio */ fpcDwPi_WPILLAR_e, + /* Kankyo SubMtd */ &l_dkWpillar_Method, }; diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index df6175b237..8c6d3215ea 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -8303,17 +8303,17 @@ static leafdraw_method_class l_dKy_Method = { }; kankyo_process_profile_definition g_profile_KANKYO = { - fpcLy_CURRENT_e, - 1, - fpcPi_CURRENT_e, - PROC_KANKYO, - &g_fpcLf_Method.base, - sizeof(sub_kankyo__class), - 0, - 0, - &g_fopKy_Method, - 2, - &l_dKy_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KANKYO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(sub_kankyo__class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopKy_Method, + /* Draw Prio */ fpcDwPi_KANKYO_e, + /* Kankyo SubMtd */ &l_dKy_Method, }; static void dummy_str_0x40a0() { diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index dd27a01978..d4175c666e 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -5040,7 +5040,7 @@ void dKyr_thunder_move() { effect->mLightInfluence.mFluctuation = 1.0f; dKy_efplight_set(&effect->mLightInfluence); effect->field_0x1c = 0.6f + cM_rndF(0.4f); - fopKyM_create(PROC_KY_THUNDER, -1, NULL, NULL, NULL); + fopKyM_create(fpcNm_KY_THUNDER_e, -1, NULL, NULL, NULL); effect->mState++; } } else if (strcmp(dComIfGp_getStartStageName(), "D_MN09B") == 0 && dComIfGp_event_runCheck()) { @@ -5055,14 +5055,14 @@ void dKyr_thunder_move() { effect->mLightInfluence.mFluctuation = 1.0f; dKy_efplight_set(&effect->mLightInfluence); effect->field_0x1c = 0.6f + cM_rndF(0.4f); - fopKyM_create(PROC_KY_THUNDER, -1, NULL, NULL, NULL); + fopKyM_create(fpcNm_KY_THUNDER_e, -1, NULL, NULL, NULL); effect->mState++; } } else if (cM_rndF(1.0f) < 0.007f) { effect->field_0x1c = 0.6f + cM_rndF(0.4f); effect->mState = 11; if (cM_rndF(1.0f) < 0.2f) { - fopKyM_create(PROC_KY_THUNDER, -1, NULL, NULL, NULL); + fopKyM_create(fpcNm_KY_THUNDER_e, -1, NULL, NULL, NULL); } } else if (cM_rndF(1.0f) < 0.005f && g_env_light.mThunderEff.mMode < 10 && sp10 != 1) { effect->mLightInfluence.mPosition = camera->view.lookat.eye; @@ -5073,7 +5073,7 @@ void dKyr_thunder_move() { effect->mLightInfluence.mFluctuation = 1.0f; dKy_efplight_set(&effect->mLightInfluence); effect->field_0x1c = 0.6f + cM_rndF(0.4f); - fopKyM_create(PROC_KY_THUNDER, -1, NULL, NULL, NULL); + fopKyM_create(fpcNm_KY_THUNDER_e, -1, NULL, NULL, NULL); effect->mState++; } break; @@ -5102,7 +5102,7 @@ void dKyr_thunder_move() { } else if (effect->mFlashTimer <= 0.5f && effect->mFlashTimer > 0.4f && cM_rndF(1.0f) < 0.3f) { effect->field_0x1c = 0.6f + cM_rndF(0.4f); if (cM_rndF(1.0f) < 0.05f) { - fopKyM_create(PROC_KY_THUNDER, -1, NULL, NULL, NULL); + fopKyM_create(fpcNm_KY_THUNDER_e, -1, NULL, NULL, NULL); } effect->mState--; } @@ -5326,7 +5326,7 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) { #endif switch (dComIfGs_getCollectSmell()) { - case fpcNm_ITEM_SMELL_YELIA_POUCH: + case dItemNo_SMELL_YELIA_POUCH_e: color_reg0.r = 0xFF; color_reg0.g = 0xFF; color_reg0.b = 0xFF; @@ -5336,7 +5336,7 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) { color_reg1.b = 0xA8; color_reg1.a = 0xFF; break; - case fpcNm_ITEM_SMELL_FISH: + case dItemNo_SMELL_FISH_e: color_reg0.r = 0xFF; color_reg0.g = 0xA1; color_reg0.b = 0x3B; @@ -5346,7 +5346,7 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) { color_reg1.b = 0x32; color_reg1.a = 0xFF; break; - case fpcNm_ITEM_SMELL_CHILDREN: + case dItemNo_SMELL_CHILDREN_e: color_reg0.r = 0xFF; color_reg0.g = 0xDB; color_reg0.b = 0xFF; @@ -5356,7 +5356,7 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) { color_reg1.b = 0x52; color_reg1.a = 0xFF; break; - case fpcNm_ITEM_SMELL_MEDICINE: + case dItemNo_SMELL_MEDICINE_e: color_reg0.r = 0xD5; color_reg0.g = 0xCE; color_reg0.b = 0xA7; @@ -5366,7 +5366,7 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) { color_reg1.b = 0x27; color_reg1.a = 0xFF; break; - case fpcNm_ITEM_SMELL_POH: + case dItemNo_SMELL_POH_e: color_reg0.r = 0xFF; color_reg0.g = 0xC8; color_reg0.b = 0xFF; diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index bcb5ccb690..13112cac91 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -273,15 +273,15 @@ static leafdraw_method_class l_dThunder_Method = { }; kankyo_process_profile_definition g_profile_KY_THUNDER = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KY_THUNDER, - &g_fpcLf_Method.base, - sizeof(dThunder_c), - 0, - 0, - &g_fopKy_Method, - 6, - &l_dThunder_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KY_THUNDER_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dThunder_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopKy_Method, + /* Draw Prio */ fpcDwPi_KY_THUNDER_e, + /* Kankyo SubMtd */ &l_dThunder_Method, }; diff --git a/src/d/d_kyeff.cpp b/src/d/d_kyeff.cpp index 447cb916c3..4f64365901 100644 --- a/src/d/d_kyeff.cpp +++ b/src/d/d_kyeff.cpp @@ -144,15 +144,15 @@ static leafdraw_method_class l_dKyeff_Method = { }; kankyo_process_profile_definition g_profile_KYEFF = { - fpcLy_CURRENT_e, - 12, - fpcPi_CURRENT_e, - PROC_KYEFF, - &g_fpcLf_Method.base, - sizeof(dKyeff_c), - 0, - 0, - &g_fopKy_Method, - 5, - &l_dKyeff_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 12, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYEFF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dKyeff_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopKy_Method, + /* Draw Prio */ fpcDwPi_KYEFF_e, + /* Kankyo SubMtd */ &l_dKyeff_Method, }; diff --git a/src/d/d_kyeff2.cpp b/src/d/d_kyeff2.cpp index b58d781ff4..2fb6b42588 100644 --- a/src/d/d_kyeff2.cpp +++ b/src/d/d_kyeff2.cpp @@ -44,15 +44,15 @@ static leafdraw_method_class l_dKyeff2_Method = { }; kankyo_process_profile_definition g_profile_KYEFF2 = { - fpcLy_CURRENT_e, - 12, - fpcPi_CURRENT_e, - PROC_KYEFF2, - &g_fpcLf_Method.base, - sizeof(dKyeff2_c), - 0, - 0, - &g_fopKy_Method, - 3, - &l_dKyeff2_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 12, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYEFF2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dKyeff2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopKy_Method, + /* Draw Prio */ fpcDwPi_KYEFF2_e, + /* Kankyo SubMtd */ &l_dKyeff2_Method, }; diff --git a/src/d/d_menu_collect.cpp b/src/d/d_menu_collect.cpp index 09b13561ed..4f18e74391 100644 --- a/src/d/d_menu_collect.cpp +++ b/src/d/d_menu_collect.cpp @@ -404,7 +404,7 @@ void dMenu_Collect2D_c::screenSet() { field_0x22d[0][2] = 0; field_0x22d[1][2] = 0; field_0x22d[2][2] = 0; - if (dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_WEAR_CASUAL) { + if (dComIfGs_getSelectEquipClothes() == dItemNo_WEAR_CASUAL_e) { field_0x22d[3][2] = 0; field_0x22d[4][2] = 0; field_0x22d[5][2] = 0; @@ -415,7 +415,7 @@ void dMenu_Collect2D_c::screenSet() { } field_0x22d[6][2] = 0; field_0x22d[0][3] = 1; - if (checkItemGet(fpcNm_ITEM_BOW, 1)) { + if (checkItemGet(dItemNo_BOW_e, 1)) { field_0x22d[1][3] = 1; } else { field_0x22d[1][3] = 0; @@ -429,7 +429,7 @@ void dMenu_Collect2D_c::screenSet() { field_0x22d[4][3] = 0; field_0x22d[5][3] = 0; field_0x22d[6][3] = 0; - if (dComIfGs_getCollectSmell() != fpcNm_ITEM_NONE) { + if (dComIfGs_getCollectSmell() != dItemNo_NONE_e) { field_0x22d[0][4] = 1; } else { field_0x22d[0][4] = 0; @@ -1015,39 +1015,39 @@ void dMenu_Collect2D_c::cursorPosSet() { void dMenu_Collect2D_c::changeSword() { switch (mCursorX) { case 3: - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_SWORD)) { - if (dComIfGs_getSelectEquipSword() != fpcNm_ITEM_SWORD) { - dMeter2Info_setSword(fpcNm_ITEM_SWORD, false); + if (dComIfGs_isItemFirstBit(dItemNo_SWORD_e)) { + if (dComIfGs_getSelectEquipSword() != dItemNo_SWORD_e) { + dMeter2Info_setSword(dItemNo_SWORD_e, false); setEquipItemFrameColorSword(0); mDoAud_seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0); dMeter2Info_set2DVibration(); } - } else if (dComIfGs_getSelectEquipSword() != fpcNm_ITEM_WOOD_STICK) { - dMeter2Info_setSword(fpcNm_ITEM_WOOD_STICK, false); + } else if (dComIfGs_getSelectEquipSword() != dItemNo_WOOD_STICK_e) { + dMeter2Info_setSword(dItemNo_WOOD_STICK_e, false); setEquipItemFrameColorSword(0); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); dMeter2Info_set2DVibration(); } break; case 4: - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_LIGHT_SWORD)) { - if (dComIfGs_getSelectEquipSword() != fpcNm_ITEM_LIGHT_SWORD) { - dMeter2Info_setSword(fpcNm_ITEM_LIGHT_SWORD, false); + if (dComIfGs_isItemFirstBit(dItemNo_LIGHT_SWORD_e)) { + if (dComIfGs_getSelectEquipSword() != dItemNo_LIGHT_SWORD_e) { + dMeter2Info_setSword(dItemNo_LIGHT_SWORD_e, false); setEquipItemFrameColorSword(1); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); dMeter2Info_set2DVibration(); } - } else if (dComIfGs_getSelectEquipSword() != fpcNm_ITEM_MASTER_SWORD) { - dMeter2Info_setSword(fpcNm_ITEM_MASTER_SWORD, false); + } else if (dComIfGs_getSelectEquipSword() != dItemNo_MASTER_SWORD_e) { + dMeter2Info_setSword(dItemNo_MASTER_SWORD_e, false); setEquipItemFrameColorSword(1); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); dMeter2Info_set2DVibration(); } break; case 5: - if (dComIfGs_getSelectEquipSword() != fpcNm_ITEM_LIGHT_SWORD) { - dMeter2Info_setSword(fpcNm_ITEM_LIGHT_SWORD, false); + if (dComIfGs_getSelectEquipSword() != dItemNo_LIGHT_SWORD_e) { + dMeter2Info_setSword(dItemNo_LIGHT_SWORD_e, false); setEquipItemFrameColorSword(2); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); dMeter2Info_set2DVibration(); @@ -1059,18 +1059,18 @@ void dMenu_Collect2D_c::changeSword() { void dMenu_Collect2D_c::changeShield() { switch (mCursorX) { case 3: - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_SHIELD)) { - if (dComIfGs_getSelectEquipShield() != fpcNm_ITEM_SHIELD) { - dMeter2Info_setShield(fpcNm_ITEM_SHIELD, false); + if (dComIfGs_isItemFirstBit(dItemNo_SHIELD_e)) { + if (dComIfGs_getSelectEquipShield() != dItemNo_SHIELD_e) { + dMeter2Info_setShield(dItemNo_SHIELD_e, false); setEquipItemFrameColorShield(0); daAlink_getAlinkActorClass()->setShieldChange(); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); dMeter2Info_set2DVibration(); } - } else if (dComIfGs_isItemFirstBit(fpcNm_ITEM_WOOD_SHIELD)) { - if (dComIfGs_getSelectEquipShield() != fpcNm_ITEM_WOOD_SHIELD) { - dMeter2Info_setShield(fpcNm_ITEM_WOOD_SHIELD, false); + } else if (dComIfGs_isItemFirstBit(dItemNo_WOOD_SHIELD_e)) { + if (dComIfGs_getSelectEquipShield() != dItemNo_WOOD_SHIELD_e) { + dMeter2Info_setShield(dItemNo_WOOD_SHIELD_e, false); setEquipItemFrameColorShield(0); daAlink_getAlinkActorClass()->setShieldChange(); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, @@ -1080,8 +1080,8 @@ void dMenu_Collect2D_c::changeShield() { } break; case 4: - if (dComIfGs_getSelectEquipShield() != fpcNm_ITEM_HYLIA_SHIELD) { - dMeter2Info_setShield(fpcNm_ITEM_HYLIA_SHIELD, false); + if (dComIfGs_getSelectEquipShield() != dItemNo_HYLIA_SHIELD_e) { + dMeter2Info_setShield(dItemNo_HYLIA_SHIELD_e, false); setEquipItemFrameColorShield(1); daAlink_getAlinkActorClass()->setShieldChange(); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); @@ -1094,8 +1094,8 @@ void dMenu_Collect2D_c::changeShield() { void dMenu_Collect2D_c::changeClothe() { switch (mCursorX) { case 3: - if (dComIfGs_getSelectEquipClothes() != fpcNm_ITEM_WEAR_KOKIRI) { - dMeter2Info_setCloth(fpcNm_ITEM_WEAR_KOKIRI, false); + if (dComIfGs_getSelectEquipClothes() != dItemNo_WEAR_KOKIRI_e) { + dMeter2Info_setCloth(dItemNo_WEAR_KOKIRI_e, false); setEquipItemFrameColorClothes(0); daPy_getPlayerActorClass()->setClothesChange(0); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); @@ -1103,8 +1103,8 @@ void dMenu_Collect2D_c::changeClothe() { } break; case 4: - if (dComIfGs_getSelectEquipClothes() != fpcNm_ITEM_WEAR_ZORA) { - dMeter2Info_setCloth(fpcNm_ITEM_WEAR_ZORA, false); + if (dComIfGs_getSelectEquipClothes() != dItemNo_WEAR_ZORA_e) { + dMeter2Info_setCloth(dItemNo_WEAR_ZORA_e, false); setEquipItemFrameColorClothes(1); daPy_getPlayerActorClass()->setClothesChange(0); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); @@ -1112,8 +1112,8 @@ void dMenu_Collect2D_c::changeClothe() { } break; case 5: - if (dComIfGs_getSelectEquipClothes() != fpcNm_ITEM_ARMOR) { - dMeter2Info_setCloth(fpcNm_ITEM_ARMOR, false); + if (dComIfGs_getSelectEquipClothes() != dItemNo_ARMOR_e) { + dMeter2Info_setCloth(dItemNo_ARMOR_e, false); setEquipItemFrameColorClothes(2); daPy_getPlayerActorClass()->setClothesChange(0); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); @@ -1174,19 +1174,19 @@ void dMenu_Collect2D_c::setSmellType() { }; s32 smellType = -1; switch (dComIfGs_getCollectSmell()) { - case fpcNm_ITEM_SMELL_YELIA_POUCH: + case dItemNo_SMELL_YELIA_POUCH_e: smellType = 3; break; - case fpcNm_ITEM_SMELL_POH: + case dItemNo_SMELL_POH_e: smellType = 4; break; - case fpcNm_ITEM_SMELL_FISH: + case dItemNo_SMELL_FISH_e: smellType = 2; break; - case fpcNm_ITEM_SMELL_CHILDREN: + case dItemNo_SMELL_CHILDREN_e: smellType = 1; break; - case fpcNm_ITEM_SMELL_MEDICINE: + case dItemNo_SMELL_MEDICINE_e: smellType = 0; break; } @@ -1265,20 +1265,20 @@ void dMenu_Collect2D_c::setEquipItemFrameColorSword(int i_frame) { mEquippedSword = dComIfGs_getSelectEquipSword(); switch (mEquippedSword) { - case fpcNm_ITEM_SWORD: + case dItemNo_SWORD_e: i_frame = 0; break; - case fpcNm_ITEM_WOOD_STICK: + case dItemNo_WOOD_STICK_e: i_frame = 0; break; - case fpcNm_ITEM_MASTER_SWORD: + case dItemNo_MASTER_SWORD_e: i_frame = 1; break; - case fpcNm_ITEM_LIGHT_SWORD: - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_LIGHT_SWORD)) { + case dItemNo_LIGHT_SWORD_e: + if (dComIfGs_isItemFirstBit(dItemNo_LIGHT_SWORD_e)) { i_frame = 1; } break; @@ -1322,12 +1322,12 @@ void dMenu_Collect2D_c::setEquipItemFrameColorShield(int i_frame) { mEquippedShield = dComIfGs_getSelectEquipShield(); switch (mEquippedShield) { - case fpcNm_ITEM_SHIELD: - case fpcNm_ITEM_WOOD_SHIELD: + case dItemNo_SHIELD_e: + case dItemNo_WOOD_SHIELD_e: i_frame = 0; break; - case fpcNm_ITEM_HYLIA_SHIELD: + case dItemNo_HYLIA_SHIELD_e: i_frame = 1; break; } @@ -1371,15 +1371,15 @@ void dMenu_Collect2D_c::setEquipItemFrameColorClothes(int i_frame) { mEquippedClothes = dComIfGs_getSelectEquipClothes(); switch (mEquippedClothes) { - case fpcNm_ITEM_WEAR_KOKIRI: + case dItemNo_WEAR_KOKIRI_e: i_frame = 0; break; - case fpcNm_ITEM_WEAR_ZORA: + case dItemNo_WEAR_ZORA_e: i_frame = 1; break; - case fpcNm_ITEM_ARMOR: + case dItemNo_ARMOR_e: i_frame = 2; break; } diff --git a/src/d/d_menu_dmap.cpp b/src/d/d_menu_dmap.cpp index 28f86cfd12..537d264b3b 100644 --- a/src/d/d_menu_dmap.cpp +++ b/src/d/d_menu_dmap.cpp @@ -1162,13 +1162,13 @@ void dMenu_Dmap_c::screenInit() { mpDrawBg->mBaseScreen->search(MULTI_CHAR('nor_k_n'))->hide(); u8 key_num = 0; - if (checkItemGet(fpcNm_ITEM_L2_KEY_PIECES1, 1)) { + if (checkItemGet(dItemNo_L2_KEY_PIECES1_e, 1)) { key_num = 1; } - if (checkItemGet(fpcNm_ITEM_L2_KEY_PIECES2, 1)) { + if (checkItemGet(dItemNo_L2_KEY_PIECES2_e, 1)) { key_num++; } - if (checkItemGet(fpcNm_ITEM_L2_KEY_PIECES3, 1)) { + if (checkItemGet(dItemNo_L2_KEY_PIECES3_e, 1)) { key_num++; } @@ -1201,34 +1201,34 @@ void dMenu_Dmap_c::screenInit() { mpDrawBg->mBaseScreen->search(MULTI_CHAR('nor_k_n'))->hide(); mpDrawBg->mBaseScreen->search(MULTI_CHAR('key_n_n'))->hide(); - u8 itemNo = fpcNm_ITEM_NONE; + u8 itemNo = dItemNo_NONE_e; field_0x174[2] = 0; if (g_fmapHIO.mMapIconHIO.mLV5DungeonItemDebug) { itemNo = g_fmapHIO.mMapIconHIO.mLV5DungeonItem; - if (itemNo != fpcNm_ITEM_NONE) { + if (itemNo != dItemNo_NONE_e) { field_0x174[2] = itemNo; } } else { if (dComIfGs_isDungeonItemBossKey()) { - itemNo = fpcNm_ITEM_LV5_BOSS_KEY; - field_0x174[2] = (u8)dComIfGs_isDungeonItemBossKey() ? fpcNm_ITEM_LV5_BOSS_KEY : 0; + itemNo = dItemNo_LV5_BOSS_KEY_e; + field_0x174[2] = (u8)dComIfGs_isDungeonItemBossKey() ? dItemNo_LV5_BOSS_KEY_e : 0; /* dSv_event_flag_c::F_0003 - Snowpeak Ruins - Handed over tomato puree and left room */ - } else if (checkItemGet(fpcNm_ITEM_TOMATO_PUREE, 1) && !dComIfGs_isEventBit(2)) { - itemNo = fpcNm_ITEM_TOMATO_PUREE; - field_0x174[2] = fpcNm_ITEM_TOMATO_PUREE; + } else if (checkItemGet(dItemNo_TOMATO_PUREE_e, 1) && !dComIfGs_isEventBit(2)) { + itemNo = dItemNo_TOMATO_PUREE_e; + field_0x174[2] = dItemNo_TOMATO_PUREE_e; /* dSv_event_flag_c::F_0004 - Snowpeak Ruins - Handed over secret ingredient and left room */ - } else if (checkItemGet(fpcNm_ITEM_TASTE, 1) && !dComIfGs_isEventBit(1)) { - itemNo = fpcNm_ITEM_TASTE; - field_0x174[2] = fpcNm_ITEM_TASTE; + } else if (checkItemGet(dItemNo_TASTE_e, 1) && !dComIfGs_isEventBit(1)) { + itemNo = dItemNo_TASTE_e; + field_0x174[2] = dItemNo_TASTE_e; } } switch (itemNo) { - case fpcNm_ITEM_TOMATO_PUREE: - case fpcNm_ITEM_TASTE: + case dItemNo_TOMATO_PUREE_e: + case dItemNo_TASTE_e: dMeter2Info_readItemTexture(itemNo, mItemTexBuf, (J2DPicture*)mpDrawBg->mBaseScreen->search(MULTI_CHAR('lv5_boss')), NULL, NULL, NULL, NULL, NULL, NULL, -1); @@ -1238,11 +1238,11 @@ void dMenu_Dmap_c::screenInit() { mpDrawBg->mBaseScreen->search(MULTI_CHAR('i_key_n'))->hide(); mpDrawBg->mBaseScreen->search(MULTI_CHAR('lv5_k_n'))->hide(); mpDrawBg->mBaseScreen->search(MULTI_CHAR('key_n_n'))->hide(); - field_0x174[2] = (u8)dComIfGs_isDungeonItemBossKey() ? fpcNm_ITEM_BOSS_KEY : 0; + field_0x174[2] = (u8)dComIfGs_isDungeonItemBossKey() ? dItemNo_BOSS_KEY_e : 0; } - field_0x174[0] = (u8)dComIfGs_isDungeonItemMap() ? fpcNm_ITEM_MAP : 0; - field_0x174[1] = (u8)dComIfGs_isDungeonItemCompass() ? fpcNm_ITEM_COMPUS : 0; + field_0x174[0] = (u8)dComIfGs_isDungeonItemMap() ? dItemNo_MAP_e : 0; + field_0x174[1] = (u8)dComIfGs_isDungeonItemCompass() ? dItemNo_COMPUS_e : 0; field_0x177 = 0; int bVar6 = 0; diff --git a/src/d/d_menu_insect.cpp b/src/d/d_menu_insect.cpp index 2ca08206f7..82be9287b6 100644 --- a/src/d/d_menu_insect.cpp +++ b/src/d/d_menu_insect.cpp @@ -546,10 +546,10 @@ void dMenu_Insect_c::screenSetDoIcon() { u8 dMenu_Insect_c::getGetInsectNum() { static u8 l_itemno[MAX_INSECT_NUM] = { - fpcNm_ITEM_M_BEETLE, fpcNm_ITEM_F_BEETLE, fpcNm_ITEM_M_BUTTERFLY, fpcNm_ITEM_F_BUTTERFLY, fpcNm_ITEM_M_STAG_BEETLE, fpcNm_ITEM_F_STAG_BEETLE, - fpcNm_ITEM_M_GRASSHOPPER, fpcNm_ITEM_F_GRASSHOPPER, fpcNm_ITEM_M_NANAFUSHI, fpcNm_ITEM_F_NANAFUSHI, fpcNm_ITEM_M_DANGOMUSHI, fpcNm_ITEM_F_DANGOMUSHI, - fpcNm_ITEM_M_MANTIS, fpcNm_ITEM_F_MANTIS, fpcNm_ITEM_M_LADYBUG, fpcNm_ITEM_F_LADYBUG, fpcNm_ITEM_M_SNAIL, fpcNm_ITEM_F_SNAIL, - fpcNm_ITEM_M_DRAGONFLY, fpcNm_ITEM_F_DRAGONFLY, fpcNm_ITEM_M_ANT, fpcNm_ITEM_F_ANT, fpcNm_ITEM_M_MAYFLY, fpcNm_ITEM_F_MAYFLY, + dItemNo_M_BEETLE_e, dItemNo_F_BEETLE_e, dItemNo_M_BUTTERFLY_e, dItemNo_F_BUTTERFLY_e, dItemNo_M_STAG_BEETLE_e, dItemNo_F_STAG_BEETLE_e, + dItemNo_M_GRASSHOPPER_e, dItemNo_F_GRASSHOPPER_e, dItemNo_M_NANAFUSHI_e, dItemNo_F_NANAFUSHI_e, dItemNo_M_DANGOMUSHI_e, dItemNo_F_DANGOMUSHI_e, + dItemNo_M_MANTIS_e, dItemNo_F_MANTIS_e, dItemNo_M_LADYBUG_e, dItemNo_F_LADYBUG_e, dItemNo_M_SNAIL_e, dItemNo_F_SNAIL_e, + dItemNo_M_DRAGONFLY_e, dItemNo_F_DRAGONFLY_e, dItemNo_M_ANT_e, dItemNo_F_ANT_e, dItemNo_M_MAYFLY_e, dItemNo_F_MAYFLY_e, }; u8 insectNum = 0; @@ -567,10 +567,10 @@ u8 dMenu_Insect_c::getGetInsectNum() { u8 dMenu_Insect_c::getInsectItemID(int param_0, int param_1) { static u8 l_itemno[MAX_INSECT_NUM] = { - fpcNm_ITEM_M_ANT, fpcNm_ITEM_F_ANT, fpcNm_ITEM_M_MAYFLY, fpcNm_ITEM_F_MAYFLY, fpcNm_ITEM_M_BEETLE, fpcNm_ITEM_F_BEETLE, - fpcNm_ITEM_M_MANTIS, fpcNm_ITEM_F_MANTIS, fpcNm_ITEM_M_STAG_BEETLE, fpcNm_ITEM_F_STAG_BEETLE, fpcNm_ITEM_M_DANGOMUSHI, fpcNm_ITEM_F_DANGOMUSHI, - fpcNm_ITEM_M_BUTTERFLY, fpcNm_ITEM_F_BUTTERFLY, fpcNm_ITEM_M_LADYBUG, fpcNm_ITEM_F_LADYBUG, fpcNm_ITEM_M_SNAIL, fpcNm_ITEM_F_SNAIL, - fpcNm_ITEM_M_NANAFUSHI, fpcNm_ITEM_F_NANAFUSHI, fpcNm_ITEM_M_GRASSHOPPER, fpcNm_ITEM_F_GRASSHOPPER, fpcNm_ITEM_M_DRAGONFLY, fpcNm_ITEM_F_DRAGONFLY, + dItemNo_M_ANT_e, dItemNo_F_ANT_e, dItemNo_M_MAYFLY_e, dItemNo_F_MAYFLY_e, dItemNo_M_BEETLE_e, dItemNo_F_BEETLE_e, + dItemNo_M_MANTIS_e, dItemNo_F_MANTIS_e, dItemNo_M_STAG_BEETLE_e, dItemNo_F_STAG_BEETLE_e, dItemNo_M_DANGOMUSHI_e, dItemNo_F_DANGOMUSHI_e, + dItemNo_M_BUTTERFLY_e, dItemNo_F_BUTTERFLY_e, dItemNo_M_LADYBUG_e, dItemNo_F_LADYBUG_e, dItemNo_M_SNAIL_e, dItemNo_F_SNAIL_e, + dItemNo_M_NANAFUSHI_e, dItemNo_F_NANAFUSHI_e, dItemNo_M_GRASSHOPPER_e, dItemNo_F_GRASSHOPPER_e, dItemNo_M_DRAGONFLY_e, dItemNo_F_DRAGONFLY_e, }; int index = param_0 + param_1 * 6; @@ -613,14 +613,14 @@ bool dMenu_Insect_c::isGiveInsect(int param_0, int param_1) { } bool dMenu_Insect_c::isCatchInsect(u8 i_insectID) { - if (i_insectID >= fpcNm_ITEM_M_BEETLE && i_insectID <= fpcNm_ITEM_F_MAYFLY) { + if (i_insectID >= dItemNo_M_BEETLE_e && i_insectID <= dItemNo_F_MAYFLY_e) { return dComIfGs_isItemFirstBit(i_insectID); } return false; } bool dMenu_Insect_c::isGiveInsect(u8 i_insectID) { - if (i_insectID >= fpcNm_ITEM_M_BEETLE && i_insectID <= fpcNm_ITEM_F_MAYFLY) { + if (i_insectID >= dItemNo_M_BEETLE_e && i_insectID <= dItemNo_F_MAYFLY_e) { int label = i_insectID + 0xd1; return dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[label]); } diff --git a/src/d/d_menu_item_explain.cpp b/src/d/d_menu_item_explain.cpp index a9db695937..21a3a32fdd 100644 --- a/src/d/d_menu_item_explain.cpp +++ b/src/d/d_menu_item_explain.cpp @@ -364,7 +364,7 @@ void dMenu_ItemExplain_c::open_init() { if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == dStage_SaveTbl_LV2) { s32 itemsObtained = 0; for (int i = 0; i < 3; i++) { - if (checkItemGet(i + fpcNm_ITEM_L2_KEY_PIECES1, 1) != 0) { + if (checkItemGet(i + dItemNo_L2_KEY_PIECES1_e, 1) != 0) { itemsObtained++; } } @@ -625,7 +625,7 @@ u8 dMenu_ItemExplain_c::openExplainDmap(u8 param_0, u8 param_1, u8 param_2, bool if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == dStage_SaveTbl_LV2 && param_0 == 0x26) { for (int i = 0; i < 3; i++) { - if (checkItemGet(i + fpcNm_ITEM_L2_KEY_PIECES1, 1) != 0) { + if (checkItemGet(i + dItemNo_L2_KEY_PIECES1_e, 1) != 0) { itemsObtained++; } } diff --git a/src/d/d_menu_ring.cpp b/src/d/d_menu_ring.cpp index 06588bcfe6..d1fa57dd4d 100644 --- a/src/d/d_menu_ring.cpp +++ b/src/d/d_menu_ring.cpp @@ -206,7 +206,7 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i mItemSlotParam1[i] = 0.0f; } for (int i = 0; i < MAX_ITEM_SLOTS; i++) { - if (dComIfGs_getLineUpItem(i) != fpcNm_ITEM_NONE) { + if (dComIfGs_getLineUpItem(i) != dItemNo_NONE_e) { mTotalItemTexToAlloc++; } } @@ -280,10 +280,10 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i mpItemBuf[i][j] = (ResTIMG*)mpHeap->alloc(0xC00, 0x20); } u8 item = dComIfGs_getItem(mItemSlots[i], false); - if (item != fpcNm_ITEM_NONE) { - if (item == fpcNm_ITEM_LIGHT_ARROW) { + if (item != dItemNo_NONE_e) { + if (item == dItemNo_LIGHT_ARROW_e) { // safety check to prevent attempts setting up a light arrow texture - item = fpcNm_ITEM_BOW; + item = dItemNo_BOW_e; } s32 i_textureNum = dMeter2Info_readItemTexture(item, mpItemBuf[i][0], NULL, mpItemBuf[i][1], NULL, @@ -430,7 +430,7 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i mpItemExplain = JKR_NEW dMenu_ItemExplain_c(mpHeap, dComIfGp_getRingResArchive(), i_stick, true); setRotate(); mpDrawCursor->setPos(mItemSlotPosX[0] + mCenterPosX, mItemSlotPosY[0] + mCenterPosY); - if (dComIfGs_getItem(mItemSlots[0], false) != fpcNm_ITEM_NONE) { + if (dComIfGs_getItem(mItemSlots[0], false) != dItemNo_NONE_e) { mpDrawCursor->setParam(mItemSlotParam1[0], mItemSlotParam2[0], 0.1f, 0.6f, 0.5f); } else { mpDrawCursor->setParam(1.0f, 1.0f, 0.1f, 0.6f, 0.5f); @@ -666,7 +666,7 @@ bool dMenu_Ring_c::isOpen() { } setScale(); mpDrawCursor->setPos(mItemSlotPosX[SLOT_0] + mCenterPosX, mItemSlotPosY[SLOT_0] + mCenterPosY); - if (dComIfGs_getItem(mItemSlots[SLOT_0], false) != fpcNm_ITEM_NONE) { + if (dComIfGs_getItem(mItemSlots[SLOT_0], false) != dItemNo_NONE_e) { mpDrawCursor->setParam(mItemSlotParam1[0], mItemSlotParam2[0], 0.1f, 0.6f, 0.5f); } else { mpDrawCursor->setParam(1.0f, 1.0f, 0.1f, 0.6f, 0.5f); @@ -728,7 +728,7 @@ bool dMenu_Ring_c::isClose() { } mpDrawCursor->setPos(mItemSlotPosX[mCurrentSlot] + mCenterPosX, mItemSlotPosY[mCurrentSlot] + mCenterPosY); - if (dComIfGs_getItem(mItemSlots[mCurrentSlot], false) != fpcNm_ITEM_NONE) { + if (dComIfGs_getItem(mItemSlots[mCurrentSlot], false) != dItemNo_NONE_e) { mpDrawCursor->setParam(mItemSlotParam1[mCurrentSlot], mItemSlotParam2[mCurrentSlot], 0.1f, 0.6f, 0.5f); } else { @@ -885,25 +885,25 @@ void dMenu_Ring_c::setItem() { u8 uVar3; u8 uVar4; - if (mXButtonSlot != fpcNm_ITEM_NONE) { + if (mXButtonSlot != dItemNo_NONE_e) { uVar1 = mItemSlots[mXButtonSlot]; } else { - uVar1 = fpcNm_ITEM_NONE; + uVar1 = dItemNo_NONE_e; } - if (mYButtonSlot != fpcNm_ITEM_NONE) { + if (mYButtonSlot != dItemNo_NONE_e) { uVar2 = mItemSlots[mYButtonSlot]; } else { - uVar2 = fpcNm_ITEM_NONE; + uVar2 = dItemNo_NONE_e; } - if (field_0x6ac != fpcNm_ITEM_NONE) { + if (field_0x6ac != dItemNo_NONE_e) { uVar3 = mItemSlots[field_0x6ac]; } else { - uVar3 = fpcNm_ITEM_NONE; + uVar3 = dItemNo_NONE_e; } - if (field_0x6ad != fpcNm_ITEM_NONE) { + if (field_0x6ad != dItemNo_NONE_e) { uVar4 = mItemSlots[field_0x6ad]; } else { - uVar4 = fpcNm_ITEM_NONE; + uVar4 = dItemNo_NONE_e; } u8 mixItemIndex0 = dComIfGs_getMixItemIndex(0); @@ -919,30 +919,30 @@ void dMenu_Ring_c::setItem() { if (mItemSlots[mCurrentSlot] == uVar1) { uVar2 = dComIfGs_getSelectItemIndex(0); mixItemIndex1 = dComIfGs_getMixItemIndex(0); - if (uVar2 == fpcNm_ITEM_NONE) { - mYButtonSlot = fpcNm_ITEM_NONE; + if (uVar2 == dItemNo_NONE_e) { + mYButtonSlot = dItemNo_NONE_e; } else { mYButtonSlot = mXButtonSlot; } mXButtonSlot = mCurrentSlot; uVar1 = mItemSlots[mXButtonSlot]; - mixItemIndex0 = fpcNm_ITEM_NONE; + mixItemIndex0 = dItemNo_NONE_e; } else { if (dComIfGs_getMixItemIndex(1) == mItemSlots[mCurrentSlot]) { uVar2 = dComIfGs_getSelectItemIndex(0); - mixItemIndex1 = fpcNm_ITEM_NONE; - if (uVar2 == fpcNm_ITEM_NONE) { - mYButtonSlot = fpcNm_ITEM_NONE; + mixItemIndex1 = dItemNo_NONE_e; + if (uVar2 == dItemNo_NONE_e) { + mYButtonSlot = dItemNo_NONE_e; } else { mYButtonSlot = mXButtonSlot; } mXButtonSlot = mCurrentSlot; uVar1 = mItemSlots[mXButtonSlot]; - mixItemIndex0 = fpcNm_ITEM_NONE; + mixItemIndex0 = dItemNo_NONE_e; } else { mXButtonSlot = mCurrentSlot; uVar1 = mItemSlots[mXButtonSlot]; - mixItemIndex0 = fpcNm_ITEM_NONE; + mixItemIndex0 = dItemNo_NONE_e; } } } else if (field_0x6b3 == 1) { @@ -950,30 +950,30 @@ void dMenu_Ring_c::setItem() { u8 temp = dComIfGs_getSelectItemIndex(1); uVar1 = temp; mixItemIndex0 = dComIfGs_getMixItemIndex(1); - if (temp == fpcNm_ITEM_NONE) { - mXButtonSlot = fpcNm_ITEM_NONE; + if (temp == dItemNo_NONE_e) { + mXButtonSlot = dItemNo_NONE_e; } else { mXButtonSlot = mYButtonSlot; } mYButtonSlot = mCurrentSlot; uVar2 = mItemSlots[mYButtonSlot]; - mixItemIndex1 = fpcNm_ITEM_NONE; + mixItemIndex1 = dItemNo_NONE_e; } else { if (dComIfGs_getMixItemIndex(0) == mItemSlots[mCurrentSlot]) { uVar1 = dComIfGs_getSelectItemIndex(1); - mixItemIndex0 = fpcNm_ITEM_NONE; - if (uVar1 == fpcNm_ITEM_NONE) { - mXButtonSlot = fpcNm_ITEM_NONE; + mixItemIndex0 = dItemNo_NONE_e; + if (uVar1 == dItemNo_NONE_e) { + mXButtonSlot = dItemNo_NONE_e; } else { mXButtonSlot = mYButtonSlot; } mYButtonSlot = mCurrentSlot; uVar2 = mItemSlots[mYButtonSlot]; - mixItemIndex1 = fpcNm_ITEM_NONE; + mixItemIndex1 = dItemNo_NONE_e; } else { mYButtonSlot = mCurrentSlot; uVar2 = mItemSlots[mYButtonSlot]; - mixItemIndex1 = fpcNm_ITEM_NONE; + mixItemIndex1 = dItemNo_NONE_e; } } } @@ -983,9 +983,9 @@ void dMenu_Ring_c::setItem() { field_0x6b4[3] = uVar4; field_0x6b8[0] = mixItemIndex0; field_0x6b8[1] = mixItemIndex1; - field_0x6b8[2] = fpcNm_ITEM_NONE; - field_0x6b8[3] = fpcNm_ITEM_NONE; - field_0x6cd = fpcNm_ITEM_NONE; + field_0x6b8[2] = dItemNo_NONE_e; + field_0x6b8[3] = dItemNo_NONE_e; + field_0x6cd = dItemNo_NONE_e; setJumpItem(true); } @@ -999,19 +999,19 @@ void dMenu_Ring_c::setJumpItem(bool i_useVibrationM) { setSelectItem(i, getItem(field_0x6b4[i], field_0x6b8[i])); } } - if (mXButtonSlot != fpcNm_ITEM_NONE) { + if (mXButtonSlot != dItemNo_NONE_e) { field_0x518[0] = mItemSlotPosX[mXButtonSlot]; field_0x528[0] = mItemSlotPosY[mXButtonSlot]; } - if (mYButtonSlot != fpcNm_ITEM_NONE) { + if (mYButtonSlot != dItemNo_NONE_e) { field_0x518[1] = mItemSlotPosX[mYButtonSlot]; field_0x528[1] = mItemSlotPosY[mYButtonSlot]; } - if (field_0x6ac != fpcNm_ITEM_NONE) { + if (field_0x6ac != dItemNo_NONE_e) { field_0x518[2] = mItemSlotPosX[field_0x6ac]; field_0x528[2] = mItemSlotPosY[field_0x6ac]; } - if (field_0x6ad != fpcNm_ITEM_NONE) { + if (field_0x6ad != dItemNo_NONE_e) { field_0x518[3] = mItemSlotPosX[field_0x6ad]; field_0x528[3] = mItemSlotPosY[field_0x6ad]; } @@ -1127,12 +1127,12 @@ void dMenu_Ring_c::setNameString(u32 i_stringID) { void dMenu_Ring_c::setActiveCursor() { u8 item = dComIfGs_getItem(mItemSlots[mCurrentSlot], false); if (mStatus == STATUS_WAIT && mOldStatus != STATUS_EXPLAIN_FORCE && mOldStatus != STATUS_EXPLAIN && mpItemExplain->getStatus() == 0) { - if (mDoCPd_c::getTrigR(PAD_1) && !mPlayerIsWolf && item != fpcNm_ITEM_NONE) { + if (mDoCPd_c::getTrigR(PAD_1) && !mPlayerIsWolf && item != dItemNo_NONE_e) { for (int i = 0; i < MAX_SELECT_ITEM; i++) { setSelectItemForce(i); } setMixItem(); - } else if (mDoCPd_c::getTrigX(PAD_1) && !mPlayerIsWolf && item != fpcNm_ITEM_NONE) { + } else if (mDoCPd_c::getTrigX(PAD_1) && !mPlayerIsWolf && item != dItemNo_NONE_e) { for (int i = 0; i < MAX_SELECT_ITEM; i++) { setSelectItemForce(i); } @@ -1144,7 +1144,7 @@ void dMenu_Ring_c::setActiveCursor() { (this->*stick_init[mStatus])(); } } - } else if (mDoCPd_c::getTrigY(PAD_1) && !mPlayerIsWolf && item != fpcNm_ITEM_NONE) { + } else if (mDoCPd_c::getTrigY(PAD_1) && !mPlayerIsWolf && item != dItemNo_NONE_e) { for (int i = 0; i < MAX_SELECT_ITEM; i++) { setSelectItemForce(i); } @@ -1168,7 +1168,7 @@ void dMenu_Ring_c::setMixItem() { bool bVar1 = false; u8 selectItemIndex0 = dComIfGs_getSelectItemIndex(0); u8 selectItemIndex1 = dComIfGs_getSelectItemIndex(1); - u8 local_28[4] = {fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE}; + u8 local_28[4] = {dItemNo_NONE_e, dItemNo_NONE_e, dItemNo_NONE_e, dItemNo_NONE_e}; if (dComIfGs_getMixItemIndex(0) == SLOT_4 && mItemSlots[mCurrentSlot] == dComIfGs_getSelectItemIndex(0)) @@ -1194,11 +1194,11 @@ void dMenu_Ring_c::setMixItem() { bVar1 = true; } else { switch (item) { - case fpcNm_ITEM_NORMAL_BOMB: - case fpcNm_ITEM_WATER_BOMB: - case fpcNm_ITEM_POKE_BOMB: - case fpcNm_ITEM_HAWK_EYE: - if ((dComIfGs_getSelectItemIndex(0) == 4 && dComIfGs_getMixItemIndex(0) == fpcNm_ITEM_NONE) || + case dItemNo_NORMAL_BOMB_e: + case dItemNo_WATER_BOMB_e: + case dItemNo_POKE_BOMB_e: + case dItemNo_HAWK_EYE_e: + if ((dComIfGs_getSelectItemIndex(0) == 4 && dComIfGs_getMixItemIndex(0) == dItemNo_NONE_e) || (dComIfGs_getMixItemIndex(0) == 4)) { Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_COMBINE_ON, NULL, 0, 0, 1.0f, 1.0f, -1.0f, @@ -1214,7 +1214,7 @@ void dMenu_Ring_c::setMixItem() { mYButtonSlot = 0xff; } } else if ((dComIfGs_getSelectItemIndex(1) == 4 && - dComIfGs_getMixItemIndex(1) == fpcNm_ITEM_NONE) || + dComIfGs_getMixItemIndex(1) == dItemNo_NONE_e) || (dComIfGs_getMixItemIndex(1) == 4)) { Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_COMBINE_ON, NULL, 0, 0, 1.0f, 1.0f, -1.0f, @@ -1237,10 +1237,10 @@ void dMenu_Ring_c::setMixItem() { field_0x6b4[0] = selectItemIndex0; field_0x6b4[1] = selectItemIndex1; setJumpItem(false); - if (local_28[0] != fpcNm_ITEM_NONE) { + if (local_28[0] != dItemNo_NONE_e) { mXButtonSlot = local_28[0]; } - if (local_28[1] != fpcNm_ITEM_NONE) { + if (local_28[1] != dItemNo_NONE_e) { mYButtonSlot = local_28[1]; } } @@ -1283,7 +1283,7 @@ void dMenu_Ring_c::drawItem() { f32 y = (48.0f - f1) * 0.5f + (mItemSlotPosY[i] - 24.0f + mCenterPosY); mpItemTex[i][j]->draw(x, y, f0, f1, 0, 0, 0); u8 item = dComIfGs_getItem(mItemSlots[i], false); - if ((j == 0 && item != fpcNm_ITEM_BEE_CHILD) || (j == 2 && item == fpcNm_ITEM_BEE_CHILD)) { + if ((j == 0 && item != dItemNo_BEE_CHILD_e) || (j == 2 && item == dItemNo_BEE_CHILD_e)) { u8 itemNum = getItemNum(mItemSlots[i]); u8 itemMaxNum = getItemMaxNum(mItemSlots[i]); if (itemMaxNum != 0) { @@ -1291,7 +1291,7 @@ void dMenu_Ring_c::drawItem() { drawNumber(itemNum, itemMaxNum, x + 24.0f, y + 48.0f); } } - if (j == 0 && item == fpcNm_ITEM_KANTERA /* Lantern */) { + if (j == 0 && item == dItemNo_KANTERA_e /* Lantern */) { setKanteraPos(x + 24.0f + 15.0f, y + 48.0f + 10.0f); mpKanteraMeter->setScale(0.64f, 0.64f); mpKanteraMeter->setNowGauge(dComIfGs_getMaxOil(), dComIfGs_getOil()); @@ -1327,7 +1327,7 @@ void dMenu_Ring_c::drawItem2() { f32 y = (48.0f - f1) * 0.5f + (mItemSlotPosY[idx] - 24.0f + mCenterPosY); mpItemTex[idx][i]->draw(x, y, f0, f1, 0, 0, 0); u8 item = dComIfGs_getItem(mItemSlots[idx], false); - if ((i == 0 && item != fpcNm_ITEM_BEE_CHILD) || (i == 2 && item == fpcNm_ITEM_BEE_CHILD)) { + if ((i == 0 && item != dItemNo_BEE_CHILD_e) || (i == 2 && item == dItemNo_BEE_CHILD_e)) { u8 itemNum = getItemNum(mItemSlots[idx]); u8 itemMaxNum = getItemMaxNum(mItemSlots[idx]); if (itemMaxNum != 0) { @@ -1335,7 +1335,7 @@ void dMenu_Ring_c::drawItem2() { drawNumber(itemNum, itemMaxNum, x + 24.0f, y + 48.0f); } } - if (i == 0 && item == fpcNm_ITEM_KANTERA) { + if (i == 0 && item == dItemNo_KANTERA_e) { setKanteraPos(x + 24.0f + 15.0f, y + 48.0f + 10.0f); mpKanteraMeter->setScale(0.64f, 0.64f); mpKanteraMeter->setNowGauge(dComIfGs_getMaxOil(), dComIfGs_getOil()); @@ -1365,7 +1365,7 @@ void dMenu_Ring_c::stick_wait_init() { void dMenu_Ring_c::stick_wait_proc() { u8 item = dComIfGs_getItem(mItemSlots[mCurrentSlot], false); - if (item != fpcNm_ITEM_NONE) { + if (item != dItemNo_NONE_e) { setDoStatus(0x24); } else { setDoStatus(0); @@ -1414,7 +1414,7 @@ void dMenu_Ring_c::stick_move_proc() { field_0x66e = field_0x670; mpDrawCursor->setPos(mItemSlotPosX[mCurrentSlot], mItemSlotPosY[mCurrentSlot]); u8 item = dComIfGs_getItem(mItemSlots[mCurrentSlot], false); - if (item != fpcNm_ITEM_NONE) { + if (item != dItemNo_NONE_e) { mpDrawCursor->setParam(mItemSlotParam1[mCurrentSlot], mItemSlotParam2[mCurrentSlot], 0.1f, 0.6f, 0.5f); } else { @@ -1441,7 +1441,7 @@ void dMenu_Ring_c::stick_move_proc() { field_0x66e = field_0x670; mpDrawCursor->setPos(mItemSlotPosX[mCurrentSlot], mItemSlotPosY[mCurrentSlot]); u8 item = dComIfGs_getItem(mItemSlots[mCurrentSlot], false); - if (item != fpcNm_ITEM_NONE) { + if (item != dItemNo_NONE_e) { mpDrawCursor->setParam(mItemSlotParam1[mCurrentSlot], mItemSlotParam2[mCurrentSlot], 0.1f, 0.6f, 0.5f); } else { @@ -1501,7 +1501,7 @@ void dMenu_Ring_c::stick_explain_force_proc() { void dMenu_Ring_c::setSelectItem(int i_idx, u8 i_itemNo) { f32 texScale = 1.0f; - if (i_itemNo != fpcNm_ITEM_NONE) { + if (i_itemNo != dItemNo_NONE_e) { if (field_0x6be[i_idx] == 0) { field_0x6be[i_idx] = 1; } else { @@ -1596,26 +1596,26 @@ u8 dMenu_Ring_c::getItemNum(u8 i_slotNo) { u8 ret = 0; switch (item) { - case fpcNm_ITEM_BOMB_BAG_LV1: + case dItemNo_BOMB_BAG_LV1_e: ret = 0; break; - case fpcNm_ITEM_NORMAL_BOMB: - case fpcNm_ITEM_WATER_BOMB: - case fpcNm_ITEM_POKE_BOMB: + case dItemNo_NORMAL_BOMB_e: + case dItemNo_WATER_BOMB_e: + case dItemNo_POKE_BOMB_e: ret = dComIfGs_getBombNum(i_slotNo - 0xF); break; - case fpcNm_ITEM_BEE_CHILD: + case dItemNo_BEE_CHILD_e: ret = dComIfGs_getBottleNum(i_slotNo - 0xB); break; - case fpcNm_ITEM_BOW: - case fpcNm_ITEM_LIGHT_ARROW: - case fpcNm_ITEM_ARROW_LV1: - case fpcNm_ITEM_ARROW_LV2: - case fpcNm_ITEM_ARROW_LV3: + case dItemNo_BOW_e: + case dItemNo_LIGHT_ARROW_e: + case dItemNo_ARROW_LV1_e: + case dItemNo_ARROW_LV2_e: + case dItemNo_ARROW_LV3_e: ret = dComIfGs_getArrowNum(); break; - case fpcNm_ITEM_PACHINKO: + case dItemNo_PACHINKO_e: ret = dComIfGs_getPachinkoNum(); break; } @@ -1635,26 +1635,26 @@ u8 dMenu_Ring_c::getItemMaxNum(u8 i_slotNo) { u8 ret = 0; switch (item) { - case fpcNm_ITEM_BOMB_BAG_LV1: + case dItemNo_BOMB_BAG_LV1_e: ret = 1; break; - case fpcNm_ITEM_NORMAL_BOMB: - case fpcNm_ITEM_WATER_BOMB: - case fpcNm_ITEM_POKE_BOMB: + case dItemNo_NORMAL_BOMB_e: + case dItemNo_WATER_BOMB_e: + case dItemNo_POKE_BOMB_e: ret = dComIfGs_getBombMax(item); break; - case fpcNm_ITEM_BEE_CHILD: + case dItemNo_BEE_CHILD_e: ret = dComIfGs_getBottleMax(); break; - case fpcNm_ITEM_BOW: - case fpcNm_ITEM_LIGHT_ARROW: - case fpcNm_ITEM_ARROW_LV1: - case fpcNm_ITEM_ARROW_LV2: - case fpcNm_ITEM_ARROW_LV3: + case dItemNo_BOW_e: + case dItemNo_LIGHT_ARROW_e: + case dItemNo_ARROW_LV1_e: + case dItemNo_ARROW_LV2_e: + case dItemNo_ARROW_LV3_e: ret = dComIfGs_getArrowMax(); break; - case fpcNm_ITEM_PACHINKO: + case dItemNo_PACHINKO_e: ret = dComIfGs_getPachinkoMax(); break; } @@ -1671,105 +1671,105 @@ bool dMenu_Ring_c::checkExplainForce() { u8 item = dComIfGs_getItem(mItemSlots[mCurrentSlot], true); for (int i = 0; i < 4; i++) { - local_18[i] = fpcNm_ITEM_NONE; + local_18[i] = dItemNo_NONE_e; } switch (item) { - case fpcNm_ITEM_BOW: + case dItemNo_BOW_e: switch (item0) { - case fpcNm_ITEM_NORMAL_BOMB: - case fpcNm_ITEM_WATER_BOMB: - case fpcNm_ITEM_POKE_BOMB: - local_18[0] = fpcNm_ITEM_BOMB_ARROW; + case dItemNo_NORMAL_BOMB_e: + case dItemNo_WATER_BOMB_e: + case dItemNo_POKE_BOMB_e: + local_18[0] = dItemNo_BOMB_ARROW_e; break; - case fpcNm_ITEM_HAWK_EYE: - local_18[0] = fpcNm_ITEM_HAWK_ARROW; + case dItemNo_HAWK_EYE_e: + local_18[0] = dItemNo_HAWK_ARROW_e; break; } switch (item1) { - case fpcNm_ITEM_NORMAL_BOMB: - case fpcNm_ITEM_WATER_BOMB: - case fpcNm_ITEM_POKE_BOMB: - local_18[1] = fpcNm_ITEM_BOMB_ARROW; + case dItemNo_NORMAL_BOMB_e: + case dItemNo_WATER_BOMB_e: + case dItemNo_POKE_BOMB_e: + local_18[1] = dItemNo_BOMB_ARROW_e; break; - case fpcNm_ITEM_HAWK_EYE: - local_18[1] = fpcNm_ITEM_HAWK_ARROW; + case dItemNo_HAWK_EYE_e: + local_18[1] = dItemNo_HAWK_ARROW_e; break; } break; - case fpcNm_ITEM_NORMAL_BOMB: - case fpcNm_ITEM_WATER_BOMB: - case fpcNm_ITEM_POKE_BOMB: - if (item0 == fpcNm_ITEM_BOW) { - local_18[0] = fpcNm_ITEM_BOMB_ARROW; - } else if (item1 == fpcNm_ITEM_BOW) { - local_18[1] = fpcNm_ITEM_BOMB_ARROW; + case dItemNo_NORMAL_BOMB_e: + case dItemNo_WATER_BOMB_e: + case dItemNo_POKE_BOMB_e: + if (item0 == dItemNo_BOW_e) { + local_18[0] = dItemNo_BOMB_ARROW_e; + } else if (item1 == dItemNo_BOW_e) { + local_18[1] = dItemNo_BOMB_ARROW_e; } break; - case fpcNm_ITEM_HAWK_EYE: - if (item0 == fpcNm_ITEM_BOW) { - local_18[0] = fpcNm_ITEM_HAWK_ARROW; - } else if (item1 == fpcNm_ITEM_BOW) { - local_18[1] = fpcNm_ITEM_HAWK_ARROW; + case dItemNo_HAWK_EYE_e: + if (item0 == dItemNo_BOW_e) { + local_18[0] = dItemNo_HAWK_ARROW_e; + } else if (item1 == dItemNo_BOW_e) { + local_18[1] = dItemNo_HAWK_ARROW_e; } break; - case fpcNm_ITEM_BEE_CHILD: - if (item0 == fpcNm_ITEM_FISHING_ROD_1) { - local_18[0] = fpcNm_ITEM_BEE_ROD; - } else if (item1 == fpcNm_ITEM_FISHING_ROD_1) { - local_18[1] = fpcNm_ITEM_BEE_ROD; + case dItemNo_BEE_CHILD_e: + if (item0 == dItemNo_FISHING_ROD_1_e) { + local_18[0] = dItemNo_BEE_ROD_e; + } else if (item1 == dItemNo_FISHING_ROD_1_e) { + local_18[1] = dItemNo_BEE_ROD_e; } break; - case fpcNm_ITEM_WORM: - if (item0 == fpcNm_ITEM_FISHING_ROD_1) { - local_18[0] = fpcNm_ITEM_WORM_ROD; - } else if (item1 == fpcNm_ITEM_FISHING_ROD_1) { - local_18[1] = fpcNm_ITEM_WORM_ROD; + case dItemNo_WORM_e: + if (item0 == dItemNo_FISHING_ROD_1_e) { + local_18[0] = dItemNo_WORM_ROD_e; + } else if (item1 == dItemNo_FISHING_ROD_1_e) { + local_18[1] = dItemNo_WORM_ROD_e; } break; - case fpcNm_ITEM_ZORAS_JEWEL: - if (item0 == fpcNm_ITEM_FISHING_ROD_1) { - local_18[0] = fpcNm_ITEM_JEWEL_ROD; - } else if (item1 == fpcNm_ITEM_FISHING_ROD_1) { - local_18[1] = fpcNm_ITEM_JEWEL_ROD; + case dItemNo_ZORAS_JEWEL_e: + if (item0 == dItemNo_FISHING_ROD_1_e) { + local_18[0] = dItemNo_JEWEL_ROD_e; + } else if (item1 == dItemNo_FISHING_ROD_1_e) { + local_18[1] = dItemNo_JEWEL_ROD_e; } break; - case fpcNm_ITEM_FISHING_ROD_1: - if (item0 == fpcNm_ITEM_BEE_CHILD) { - local_18[0] = fpcNm_ITEM_BEE_ROD; - } else if (item1 == fpcNm_ITEM_BEE_CHILD) { - local_18[1] = fpcNm_ITEM_BEE_ROD; - } else if (item0 == fpcNm_ITEM_ZORAS_JEWEL) { - local_18[0] = fpcNm_ITEM_JEWEL_ROD; - } else if (item1 == fpcNm_ITEM_ZORAS_JEWEL) { - local_18[1] = fpcNm_ITEM_JEWEL_ROD; - } else if (item0 == fpcNm_ITEM_WORM) { - local_18[0] = fpcNm_ITEM_WORM_ROD; - } else if (item1 == fpcNm_ITEM_WORM) { - local_18[1] = fpcNm_ITEM_WORM_ROD; + case dItemNo_FISHING_ROD_1_e: + if (item0 == dItemNo_BEE_CHILD_e) { + local_18[0] = dItemNo_BEE_ROD_e; + } else if (item1 == dItemNo_BEE_CHILD_e) { + local_18[1] = dItemNo_BEE_ROD_e; + } else if (item0 == dItemNo_ZORAS_JEWEL_e) { + local_18[0] = dItemNo_JEWEL_ROD_e; + } else if (item1 == dItemNo_ZORAS_JEWEL_e) { + local_18[1] = dItemNo_JEWEL_ROD_e; + } else if (item0 == dItemNo_WORM_e) { + local_18[0] = dItemNo_WORM_ROD_e; + } else if (item1 == dItemNo_WORM_e) { + local_18[1] = dItemNo_WORM_ROD_e; } break; } - if (local_18[0] != fpcNm_ITEM_NONE && local_18[1] == fpcNm_ITEM_NONE && local_18[2] == fpcNm_ITEM_NONE && local_18[3] == fpcNm_ITEM_NONE && - dComIfGs_getMixItemIndex(0) == fpcNm_ITEM_NONE) + if (local_18[0] != dItemNo_NONE_e && local_18[1] == dItemNo_NONE_e && local_18[2] == dItemNo_NONE_e && local_18[3] == dItemNo_NONE_e && + dComIfGs_getMixItemIndex(0) == dItemNo_NONE_e) { field_0x6c7[0] = local_18[0]; - field_0x6c7[1] = fpcNm_ITEM_NONE; - field_0x6c7[2] = fpcNm_ITEM_NONE; - field_0x6c7[3] = fpcNm_ITEM_NONE; - } else if (local_18[0] == fpcNm_ITEM_NONE && local_18[1] != fpcNm_ITEM_NONE && local_18[2] == fpcNm_ITEM_NONE && - local_18[3] == fpcNm_ITEM_NONE && dComIfGs_getMixItemIndex(1) == fpcNm_ITEM_NONE) + field_0x6c7[1] = dItemNo_NONE_e; + field_0x6c7[2] = dItemNo_NONE_e; + field_0x6c7[3] = dItemNo_NONE_e; + } else if (local_18[0] == dItemNo_NONE_e && local_18[1] != dItemNo_NONE_e && local_18[2] == dItemNo_NONE_e && + local_18[3] == dItemNo_NONE_e && dComIfGs_getMixItemIndex(1) == dItemNo_NONE_e) { - field_0x6c7[0] = fpcNm_ITEM_NONE; + field_0x6c7[0] = dItemNo_NONE_e; field_0x6c7[1] = local_18[1]; - field_0x6c7[2] = fpcNm_ITEM_NONE; - field_0x6c7[3] = fpcNm_ITEM_NONE; + field_0x6c7[2] = dItemNo_NONE_e; + field_0x6c7[3] = dItemNo_NONE_e; } else { - field_0x6c7[0] = fpcNm_ITEM_NONE; - field_0x6c7[1] = fpcNm_ITEM_NONE; - field_0x6c7[2] = fpcNm_ITEM_NONE; - field_0x6c7[3] = fpcNm_ITEM_NONE; + field_0x6c7[0] = dItemNo_NONE_e; + field_0x6c7[1] = dItemNo_NONE_e; + field_0x6c7[2] = dItemNo_NONE_e; + field_0x6c7[3] = dItemNo_NONE_e; } return 0; } @@ -1869,19 +1869,19 @@ void dMenu_Ring_c::setDoStatus(u8 i_doStatus) { } bool dMenu_Ring_c::isMixItemOn() { - if (!mPlayerIsWolf && dComIfGs_getItem(mItemSlots[mCurrentSlot], false) != fpcNm_ITEM_NONE) { + if (!mPlayerIsWolf && dComIfGs_getItem(mItemSlots[mCurrentSlot], false) != dItemNo_NONE_e) { u8 item = dComIfGs_getItem(mItemSlots[mCurrentSlot], false); switch (item) { - case fpcNm_ITEM_HAWK_EYE: - case fpcNm_ITEM_NORMAL_BOMB: - case fpcNm_ITEM_WATER_BOMB: - case fpcNm_ITEM_POKE_BOMB: - if ((dComIfGs_getSelectItemIndex(0) == SLOT_4) && (dComIfGs_getMixItemIndex(0) == fpcNm_ITEM_NONE) || + case dItemNo_HAWK_EYE_e: + case dItemNo_NORMAL_BOMB_e: + case dItemNo_WATER_BOMB_e: + case dItemNo_POKE_BOMB_e: + if ((dComIfGs_getSelectItemIndex(0) == SLOT_4) && (dComIfGs_getMixItemIndex(0) == dItemNo_NONE_e) || (dComIfGs_getMixItemIndex(0) == SLOT_4)) { return true; } - if ((dComIfGs_getSelectItemIndex(1) == SLOT_4) && (dComIfGs_getMixItemIndex(1) == fpcNm_ITEM_NONE) || + if ((dComIfGs_getSelectItemIndex(1) == SLOT_4) && (dComIfGs_getMixItemIndex(1) == dItemNo_NONE_e) || (dComIfGs_getMixItemIndex(1) == SLOT_4)) { return true; @@ -1893,7 +1893,7 @@ bool dMenu_Ring_c::isMixItemOn() { } bool dMenu_Ring_c::isMixItemOff() { - if ((!mPlayerIsWolf) && (dComIfGs_getItem(mItemSlots[mCurrentSlot], 0) != fpcNm_ITEM_NONE)) { + if ((!mPlayerIsWolf) && (dComIfGs_getItem(mItemSlots[mCurrentSlot], 0) != dItemNo_NONE_e)) { if ((dComIfGs_getMixItemIndex(0) == SLOT_4) && (mItemSlots[mCurrentSlot] == dComIfGs_getSelectItemIndex(0))) { diff --git a/src/d/d_menu_save.cpp b/src/d/d_menu_save.cpp index e6ad7a5a70..ef1fb9d61e 100644 --- a/src/d/d_menu_save.cpp +++ b/src/d/d_menu_save.cpp @@ -1556,8 +1556,8 @@ void dMenu_save_c::restartInit() { dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[225]); // Monkey dropped lantern } - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_KANTERA) && dComIfGs_getItem(SLOT_1, true) == fpcNm_ITEM_NONE) { - dComIfGs_setItem(SLOT_1, fpcNm_ITEM_KANTERA); + if (dComIfGs_isItemFirstBit(dItemNo_KANTERA_e) && dComIfGs_getItem(SLOT_1, true) == dItemNo_NONE_e) { + dComIfGs_setItem(SLOT_1, dItemNo_KANTERA_e); dComIfGs_setOil(dMeter2Info_getOilGaugeBackUp()); } diff --git a/src/d/d_menu_window.cpp b/src/d/d_menu_window.cpp index 04f1184a31..5f207c07a6 100644 --- a/src/d/d_menu_window.cpp +++ b/src/d/d_menu_window.cpp @@ -1729,15 +1729,15 @@ static leafdraw_method_class l_dMw_Method = { }; msg_process_profile_definition g_profile_MENUWINDOW = { - fpcLy_CURRENT_e, - 12, - fpcPi_CURRENT_e, - PROC_MENUWINDOW, - &g_fpcLf_Method.base, - sizeof(dMw_c), - 0, - 0, - &g_fopMsg_Method, - 0x02FF, - &l_dMw_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 12, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MENUWINDOW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dMw_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopMsg_Method, + /* Draw Prio */ fpcDwPi_MENUWINDOW_e, + /* Msg SubMtd */ &l_dMw_Method, }; diff --git a/src/d/d_menu_window_HIO.cpp b/src/d/d_menu_window_HIO.cpp index 7fe6ba153a..c48e62d0a8 100644 --- a/src/d/d_menu_window_HIO.cpp +++ b/src/d/d_menu_window_HIO.cpp @@ -13,9 +13,9 @@ dMw_HIO_c::dMw_HIO_c() { } void dMw_HIO_c::init() { - static u8 m_cloth_item[3] = {fpcNm_ITEM_WEAR_KOKIRI, fpcNm_ITEM_ARMOR, fpcNm_ITEM_WEAR_ZORA}; - static u8 m_sword_item[4] = {fpcNm_ITEM_SWORD, fpcNm_ITEM_MASTER_SWORD, fpcNm_ITEM_LIGHT_SWORD, fpcNm_ITEM_WOOD_STICK}; - static u8 m_shield_item[3] = {fpcNm_ITEM_SHIELD, fpcNm_ITEM_HYLIA_SHIELD, fpcNm_ITEM_WOOD_SHIELD}; + static u8 m_cloth_item[3] = {dItemNo_WEAR_KOKIRI_e, dItemNo_ARMOR_e, dItemNo_WEAR_ZORA_e}; + static u8 m_sword_item[4] = {dItemNo_SWORD_e, dItemNo_MASTER_SWORD_e, dItemNo_LIGHT_SWORD_e, dItemNo_WOOD_STICK_e}; + static u8 m_shield_item[3] = {dItemNo_SHIELD_e, dItemNo_HYLIA_SHIELD_e, dItemNo_WOOD_SHIELD_e}; mArrowFlag = 0; mBombFlag = 0; @@ -57,8 +57,8 @@ void dMw_HIO_c::init() { mDonationAmount = 0; for (int i = 0; i < 24; i++) { - mItemsCopy[i] = fpcNm_ITEM_NONE; - mItems[i] = fpcNm_ITEM_NONE; + mItemsCopy[i] = dItemNo_NONE_e; + mItems[i] = dItemNo_NONE_e; field_0x7a[i] = 0; } @@ -72,8 +72,8 @@ void dMw_HIO_c::init() { mBombNum[i] = 0; } - mScentCopy = fpcNm_ITEM_NONE; - mScent = fpcNm_ITEM_NONE; + mScentCopy = dItemNo_NONE_e; + mScent = dItemNo_NONE_e; field_0xa8 = 0; field_0xf4 = 0; field_0xea = 0; diff --git a/src/d/d_meter2.cpp b/src/d/d_meter2.cpp index 1d236f11bf..aa5496dbba 100644 --- a/src/d/d_meter2.cpp +++ b/src/d/d_meter2.cpp @@ -195,22 +195,22 @@ int dMeter2_c::_create() { for (int i = 0; i < 2; i++) { if (field_0x128 == 0) { - if (mItemStatus[i * 2] == fpcNm_ITEM_BOMB_BAG_LV1 || mItemStatus[i * 2] == fpcNm_ITEM_NORMAL_BOMB || - mItemStatus[i * 2] == fpcNm_ITEM_WATER_BOMB || mItemStatus[i * 2] == fpcNm_ITEM_POKE_BOMB) + if (mItemStatus[i * 2] == dItemNo_BOMB_BAG_LV1_e || mItemStatus[i * 2] == dItemNo_NORMAL_BOMB_e || + mItemStatus[i * 2] == dItemNo_WATER_BOMB_e || mItemStatus[i * 2] == dItemNo_POKE_BOMB_e) { mpMeterDraw->setItemNum(i, dComIfGp_getSelectItemNum(i), dComIfGp_getSelectItemMaxNum(i)); - } else if (mItemStatus[i * 2] == fpcNm_ITEM_BEE_CHILD) { + } else if (mItemStatus[i * 2] == dItemNo_BEE_CHILD_e) { mpMeterDraw->setItemNum(i, dComIfGp_getSelectItemNum(i), dComIfGp_getSelectItemMaxNum(i)); - } else if (mItemStatus[i * 2] == fpcNm_ITEM_BOW || mItemStatus[i * 2] == fpcNm_ITEM_LIGHT_ARROW || - mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV1 || mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV2 || - mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV3 || mItemStatus[i * 2] == fpcNm_ITEM_HAWK_ARROW) + } else if (mItemStatus[i * 2] == dItemNo_BOW_e || mItemStatus[i * 2] == dItemNo_LIGHT_ARROW_e || + mItemStatus[i * 2] == dItemNo_ARROW_LV1_e || mItemStatus[i * 2] == dItemNo_ARROW_LV2_e || + mItemStatus[i * 2] == dItemNo_ARROW_LV3_e || mItemStatus[i * 2] == dItemNo_HAWK_ARROW_e) { mpMeterDraw->setItemNum(i, mArrowNum, dComIfGs_getArrowMax()); - } else if (mItemStatus[i * 2] == fpcNm_ITEM_PACHINKO) { + } else if (mItemStatus[i * 2] == dItemNo_PACHINKO_e) { mpMeterDraw->setItemNum(i, mPachinkoNum, dComIfGs_getPachinkoMax()); - } else if (mItemStatus[i * 2] == fpcNm_ITEM_BOMB_ARROW) { + } else if (mItemStatus[i * 2] == dItemNo_BOMB_ARROW_e) { u8 item_num = dComIfGp_getSelectItemNum(i); u8 item_max = dComIfGp_getSelectItemMaxNum(i); if (item_num > mArrowNum) { @@ -2479,7 +2479,7 @@ void dMeter2_c::moveBombNum() { temp_r31 = dComIfGs_getItem((u8)(i + SLOT_15), true); temp_r28 = dComIfGs_getItem((u8)(i + SLOT_15), false); - if (temp_r31 != fpcNm_ITEM_NONE && temp_r31 != fpcNm_ITEM_BOMB_BAG_LV1) { + if (temp_r31 != dItemNo_NONE_e && temp_r31 != dItemNo_BOMB_BAG_LV1_e) { if (g_mwHIO.getBombFlag() || (dMeter2Info_getMiniGameItemSetFlag() == 1 && i == dMeter2Info_getRentalBombBag())) { @@ -2507,7 +2507,7 @@ void dMeter2_c::moveBombNum() { } if (var_r22 == 0) { - if (temp_r31 == fpcNm_ITEM_BOMB_ARROW) { + if (temp_r31 == dItemNo_BOMB_ARROW_e) { for (int j = 0; j < 2; j++) { if (i + SLOT_15 == dComIfGs_getSelectItemIndex(j) || i + SLOT_15 == dComIfGs_getMixItemIndex(j)) @@ -2518,8 +2518,8 @@ void dMeter2_c::moveBombNum() { } } } - dComIfGs_setItem(i + SLOT_15, fpcNm_ITEM_BOMB_BAG_LV1); - dComIfGp_setItem(i + SLOT_15, fpcNm_ITEM_BOMB_BAG_LV1); + dComIfGs_setItem(i + SLOT_15, dItemNo_BOMB_BAG_LV1_e); + dComIfGp_setItem(i + SLOT_15, dItemNo_BOMB_BAG_LV1_e); for (int j = 0; j < 2; j++) { if (i + SLOT_15 == dComIfGs_getSelectMixItemNoArrowIndex(j)) { @@ -2531,7 +2531,7 @@ void dMeter2_c::moveBombNum() { dComIfGs_setBombNum(i, var_r22); mBombMax[i] = dComIfGs_getBombMax(temp_r28); - if (temp_r31 != fpcNm_ITEM_BOMB_ARROW) { + if (temp_r31 != dItemNo_BOMB_ARROW_e) { for (int j = 0; j < 2; j++) { if (i + SLOT_15 == dComIfGs_getSelectMixItemNoArrowIndex(j)) { mpMeterDraw->setItemNum(j, dComIfGp_getSelectItemNum(j), @@ -2541,7 +2541,7 @@ void dMeter2_c::moveBombNum() { } } } else { - if (temp_r31 != fpcNm_ITEM_BOMB_BAG_LV1) { + if (temp_r31 != dItemNo_BOMB_BAG_LV1_e) { dComIfGs_setBombNum(i, 0); } @@ -2571,7 +2571,7 @@ void dMeter2_c::moveBombNum() { void dMeter2_c::moveBottleNum() { for (int i = 0; i < 4; i++) { - if (dComIfGs_getItem((u8)(i + SLOT_11), true) == fpcNm_ITEM_BEE_CHILD) { + if (dComIfGs_getItem((u8)(i + SLOT_11), true) == dItemNo_BEE_CHILD_e) { if (mBottleNum[i] != dComIfGs_getBottleNum(i)) { for (int j = 0; j < 2; j++) { if (i + SLOT_11 == dComIfGs_getSelectItemIndex(j)) { @@ -2646,14 +2646,14 @@ void dMeter2_c::moveArrowNum() { i = 0; var_r28 = 0; for (; i < 2; i++, var_r28 += 2) { - if (mItemStatus[var_r28] == fpcNm_ITEM_BOW || mItemStatus[var_r28] == fpcNm_ITEM_LIGHT_ARROW || - mItemStatus[var_r28] == fpcNm_ITEM_ARROW_LV1 || mItemStatus[var_r28] == fpcNm_ITEM_ARROW_LV2 || - mItemStatus[var_r28] == fpcNm_ITEM_ARROW_LV3 || mItemStatus[var_r28] == fpcNm_ITEM_HAWK_ARROW) + if (mItemStatus[var_r28] == dItemNo_BOW_e || mItemStatus[var_r28] == dItemNo_LIGHT_ARROW_e || + mItemStatus[var_r28] == dItemNo_ARROW_LV1_e || mItemStatus[var_r28] == dItemNo_ARROW_LV2_e || + mItemStatus[var_r28] == dItemNo_ARROW_LV3_e || mItemStatus[var_r28] == dItemNo_HAWK_ARROW_e) { mpMeterDraw->setItemNum(i, mArrowNum, dComIfGs_getArrowMax()); - } else if (mItemStatus[var_r28] == fpcNm_ITEM_PACHINKO) { + } else if (mItemStatus[var_r28] == dItemNo_PACHINKO_e) { mpMeterDraw->setItemNum(i, mPachinkoNum, dComIfGs_getPachinkoMax()); - } else if (mItemStatus[var_r28] == fpcNm_ITEM_BOMB_ARROW) { + } else if (mItemStatus[var_r28] == dItemNo_BOMB_ARROW_e) { var_r27 = dComIfGp_getSelectItemNum(i); var_r6_2 = dComIfGp_getSelectItemMaxNum(i); @@ -2727,7 +2727,7 @@ void dMeter2_c::movePachinkoNum() { } for (int i = 0; i < 2; i++) { - if (mItemStatus[i * 2] == fpcNm_ITEM_PACHINKO) { + if (mItemStatus[i * 2] == dItemNo_PACHINKO_e) { mpMeterDraw->setItemNum(i, mPachinkoNum, dComIfGs_getPachinkoMax()); } } @@ -2752,7 +2752,7 @@ void dMeter2_c::alphaAnimeLife() { } void dMeter2_c::alphaAnimeKantera() { - if (dComIfGs_getMaxOil() == 0 || dComIfGs_getItem(SLOT_1, true) != fpcNm_ITEM_KANTERA || + if (dComIfGs_getMaxOil() == 0 || dComIfGs_getItem(SLOT_1, true) != dItemNo_KANTERA_e || !daPy_getPlayerActorClass()->checkUseKandelaar(0) || (mStatus & 0x4000) || ((mStatus & 0x40) && dComIfGp_event_checkHind(0x400)) || dComIfGp_getOxygenShowFlag() || ((daPy_getPlayerActorClass()->getSumouMode() != 0) || @@ -2909,20 +2909,20 @@ void dMeter2_c::alphaAnimeButton() { field_0x128 == 0 ? true : false); if (field_0x128 == 0 && dMeter2Info_getMiniGameItemSetFlag() != 1 && - (mItemStatus[i * 2] == fpcNm_ITEM_BOW || mItemStatus[i * 2] == fpcNm_ITEM_LIGHT_ARROW || - mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV1 || mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV2 || - mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV3 || mItemStatus[i * 2] == fpcNm_ITEM_BOMB_BAG_LV1 || - mItemStatus[i * 2] == fpcNm_ITEM_NORMAL_BOMB || mItemStatus[i * 2] == fpcNm_ITEM_WATER_BOMB || - mItemStatus[i * 2] == fpcNm_ITEM_POKE_BOMB || mItemStatus[i * 2] == fpcNm_ITEM_HAWK_ARROW || - mItemStatus[i * 2] == fpcNm_ITEM_BOMB_ARROW || mItemStatus[i * 2] == fpcNm_ITEM_PACHINKO || - mItemStatus[i * 2] == fpcNm_ITEM_BEE_CHILD)) + (mItemStatus[i * 2] == dItemNo_BOW_e || mItemStatus[i * 2] == dItemNo_LIGHT_ARROW_e || + mItemStatus[i * 2] == dItemNo_ARROW_LV1_e || mItemStatus[i * 2] == dItemNo_ARROW_LV2_e || + mItemStatus[i * 2] == dItemNo_ARROW_LV3_e || mItemStatus[i * 2] == dItemNo_BOMB_BAG_LV1_e || + mItemStatus[i * 2] == dItemNo_NORMAL_BOMB_e || mItemStatus[i * 2] == dItemNo_WATER_BOMB_e || + mItemStatus[i * 2] == dItemNo_POKE_BOMB_e || mItemStatus[i * 2] == dItemNo_HAWK_ARROW_e || + mItemStatus[i * 2] == dItemNo_BOMB_ARROW_e || mItemStatus[i * 2] == dItemNo_PACHINKO_e || + mItemStatus[i * 2] == dItemNo_BEE_CHILD_e)) { mpMeterDraw->drawItemNum(i, 1.0f); } else { mpMeterDraw->drawItemNum(i, 0.0f); } - if (field_0x128 == 0 && mItemStatus[i * 2] == fpcNm_ITEM_KANTERA) { + if (field_0x128 == 0 && mItemStatus[i * 2] == dItemNo_KANTERA_e) { mpMeterDraw->drawKanteraMeter(i, 1.0f); } else { mpMeterDraw->drawKanteraMeter(i, 0.0f); @@ -3028,10 +3028,10 @@ u8 dMeter2_c::isKeyVisible() { int dMeter2_c::isArrowEquip() { for (int i = 0; i < 2; i++) { - if (mItemStatus[i * 2] == fpcNm_ITEM_BOW || mItemStatus[i * 2] == fpcNm_ITEM_LIGHT_ARROW || - mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV1 || mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV2 || - mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV3 || mItemStatus[i * 2] == fpcNm_ITEM_HAWK_ARROW || - mItemStatus[i * 2] == fpcNm_ITEM_BOMB_ARROW) + if (mItemStatus[i * 2] == dItemNo_BOW_e || mItemStatus[i * 2] == dItemNo_LIGHT_ARROW_e || + mItemStatus[i * 2] == dItemNo_ARROW_LV1_e || mItemStatus[i * 2] == dItemNo_ARROW_LV2_e || + mItemStatus[i * 2] == dItemNo_ARROW_LV3_e || mItemStatus[i * 2] == dItemNo_HAWK_ARROW_e || + mItemStatus[i * 2] == dItemNo_BOMB_ARROW_e) { return i + 1; } @@ -3041,7 +3041,7 @@ int dMeter2_c::isArrowEquip() { int dMeter2_c::isPachinkoEquip() { for (int i = 0; i < 2; i++) { - if (mItemStatus[i * 2] == fpcNm_ITEM_PACHINKO) { + if (mItemStatus[i * 2] == dItemNo_PACHINKO_e) { return i + 1; } } @@ -3068,14 +3068,14 @@ static int dMeter2_Delete(dMeter2_c* i_this) { static int dMeter2_Create(msg_class* i_this) { dMeter2Info_setMeterClass(static_cast(i_this)); dComIfGp_2dShowOn(); - fopMsgM_Create(PROC_MENUWINDOW, NULL, NULL); + fopMsgM_Create(fpcNm_MENUWINDOW_e, NULL, NULL); g_drawHIO.field_0x4 = -1; g_ringHIO.field_0x4 = -1; g_fmapHIO.field_0x4 = -1; g_cursorHIO.field_0x4 = -1; - u32 id = fopMsgM_Create(PROC_MSG_OBJECT, NULL, NULL); + u32 id = fopMsgM_Create(fpcNm_MSG_OBJECT_e, NULL, NULL); fopMsgM_setMessageID(id); dTimer_createStockTimer(); @@ -3091,15 +3091,15 @@ static leafdraw_method_class l_dMeter2_Method = { }; msg_process_profile_definition g_profile_METER2 = { - fpcLy_CURRENT_e, - 12, - fpcPi_CURRENT_e, - PROC_METER2, - &g_fpcLf_Method.base, - sizeof(dMeter2_c), - 0, - 0, - &g_fopMsg_Method, - 0x0301, - &l_dMeter2_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 12, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_METER2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dMeter2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopMsg_Method, + /* Draw Prio */ fpcDwPi_METER2_e, + /* Msg SubMtd */ &l_dMeter2_Method, }; diff --git a/src/d/d_meter2_draw.cpp b/src/d/d_meter2_draw.cpp index 78adf89d9f..f222ee752a 100644 --- a/src/d/d_meter2_draw.cpp +++ b/src/d/d_meter2_draw.cpp @@ -1168,7 +1168,7 @@ void dMeter2Draw_c::initButton() { } } - mButtonBItem = fpcNm_ITEM_SWORD; + mButtonBItem = dItemNo_SWORD_e; changeTextureItemB(mButtonBItem); for (int i = 0; i < 2; i++) { @@ -2302,10 +2302,10 @@ void dMeter2Draw_c::drawButtonB(u8 i_action, bool param_1, f32 i_posX, f32 i_pos mButtonBItem = dComIfGs_getSelectEquipSword(); switch (dComIfGs_getSelectEquipSword()) { - case fpcNm_ITEM_WOOD_STICK: - case fpcNm_ITEM_SWORD: - case fpcNm_ITEM_MASTER_SWORD: - case fpcNm_ITEM_LIGHT_SWORD: + case dItemNo_WOOD_STICK_e: + case dItemNo_SWORD_e: + case dItemNo_MASTER_SWORD_e: + case dItemNo_LIGHT_SWORD_e: changeTextureItemB(mButtonBItem); break; default: @@ -2315,8 +2315,8 @@ void dMeter2Draw_c::drawButtonB(u8 i_action, bool param_1, f32 i_posX, f32 i_pos } } else if (param_1 == true && i_action == 0x4F) { mpScreen->search(MULTI_CHAR('item_b_n'))->show(); - mButtonBItem = fpcNm_ITEM_LURE_ROD; - changeTextureItemB(fpcNm_ITEM_LURE_ROD); + mButtonBItem = dItemNo_LURE_ROD_e; + changeTextureItemB(dItemNo_LURE_ROD_e); var_r31 = 2; } else { mpScreen->search(MULTI_CHAR('item_b_n'))->hide(); @@ -2415,7 +2415,7 @@ void dMeter2Draw_c::drawButtonS(u8 i_action) { void dMeter2Draw_c::drawButtonBin(u8 i_action) { int bottle_num = 0; for (int i = 0; i < 4; i++) { - if (dComIfGs_getItem((u8)(SLOT_11 + i), true) != fpcNm_ITEM_NONE) { + if (dComIfGs_getItem((u8)(SLOT_11 + i), true) != dItemNo_NONE_e) { bottle_num++; } } @@ -2489,7 +2489,7 @@ void dMeter2Draw_c::drawButtonXY(int i_no, u8 i_itemNo, u8 i_action, bool param_ mpTextXY[i_no]->hide(); int var_r29; - if (i_itemNo == fpcNm_ITEM_NONE || i_itemNo == 0) { + if (i_itemNo == dItemNo_NONE_e || i_itemNo == 0) { mpScreen->search(tag[i_no])->hide(); var_r29 = 1; } else { @@ -3272,10 +3272,10 @@ char* dMeter2Draw_c::getActionString(u8 i_action, u8 i_type, u8* param_2) { void dMeter2Draw_c::changeTextureItemB(u8 i_itemNo) { int var_r31 = 0; - if (i_itemNo == fpcNm_ITEM_LURE_ROD) { + if (i_itemNo == dItemNo_LURE_ROD_e) { var_r31 = 2; - } else if (i_itemNo == fpcNm_ITEM_SWORD || i_itemNo == fpcNm_ITEM_MASTER_SWORD || i_itemNo == fpcNm_ITEM_WOOD_STICK || - i_itemNo == fpcNm_ITEM_LIGHT_SWORD) + } else if (i_itemNo == dItemNo_SWORD_e || i_itemNo == dItemNo_MASTER_SWORD_e || i_itemNo == dItemNo_WOOD_STICK_e || + i_itemNo == dItemNo_LIGHT_SWORD_e) { var_r31 = 1; } @@ -3317,8 +3317,8 @@ void dMeter2Draw_c::changeTextureItemB(u8 i_itemNo) { void dMeter2Draw_c::changeTextureItemXY(int i_no, u8 i_itemNo) { JUT_ASSERT(0, i_no < SELECT_MAX_e); - if (i_itemNo == fpcNm_ITEM_LIGHT_ARROW) { - i_itemNo = fpcNm_ITEM_BOW; + if (i_itemNo == dItemNo_LIGHT_ARROW_e) { + i_itemNo = dItemNo_BOW_e; } if (field_0x76c[i_no] == 0) { @@ -3509,7 +3509,7 @@ void dMeter2Draw_c::setItemParamX(u8 i_itemNo) { mItemParams[SELECT_X_e].num_scale = g_drawHIO.mXItemNumScale; } else { switch (i_itemNo) { - case fpcNm_ITEM_BOOMERANG: + case dItemNo_BOOMERANG_e: mItemParams[SELECT_X_e].pos_x = 4.0f; mItemParams[SELECT_X_e].pos_y = -11.0f; mItemParams[SELECT_X_e].scale = 1.7f; @@ -3518,7 +3518,7 @@ void dMeter2Draw_c::setItemParamX(u8 i_itemNo) { mItemParams[SELECT_X_e].num_pos_y = -9.2f; mItemParams[SELECT_X_e].num_scale = 0.95f; break; - case fpcNm_ITEM_BOW: + case dItemNo_BOW_e: mItemParams[SELECT_X_e].pos_x = 9.2f; mItemParams[SELECT_X_e].pos_y = -14.0f; mItemParams[SELECT_X_e].scale = 2.0f; @@ -3527,7 +3527,7 @@ void dMeter2Draw_c::setItemParamX(u8 i_itemNo) { mItemParams[SELECT_X_e].num_pos_y = -9.2f; mItemParams[SELECT_X_e].num_scale = 0.95f; break; - case fpcNm_ITEM_HVY_BOOTS: + case dItemNo_HVY_BOOTS_e: mItemParams[SELECT_X_e].pos_x = 4.0f; mItemParams[SELECT_X_e].pos_y = -14.0f; mItemParams[SELECT_X_e].scale = 1.7f; @@ -3536,7 +3536,7 @@ void dMeter2Draw_c::setItemParamX(u8 i_itemNo) { mItemParams[SELECT_X_e].num_pos_y = -9.2f; mItemParams[SELECT_X_e].num_scale = 0.95f; break; - case fpcNm_ITEM_HOOKSHOT: + case dItemNo_HOOKSHOT_e: mItemParams[SELECT_X_e].pos_x = 17.0f; mItemParams[SELECT_X_e].pos_y = -14.0f; mItemParams[SELECT_X_e].scale = 1.5f; @@ -3545,7 +3545,7 @@ void dMeter2Draw_c::setItemParamX(u8 i_itemNo) { mItemParams[SELECT_X_e].num_pos_y = -9.2f; mItemParams[SELECT_X_e].num_scale = 0.95f; break; - case fpcNm_ITEM_KANTERA: + case dItemNo_KANTERA_e: mItemParams[SELECT_X_e].pos_x = -2.0f; mItemParams[SELECT_X_e].pos_y = -15.0f; mItemParams[SELECT_X_e].scale = g_drawHIO.mButtonXItemScale; @@ -3588,7 +3588,7 @@ void dMeter2Draw_c::setItemParamY(u8 i_itemNo) { mItemParams[SELECT_Y_e].num_scale = g_drawHIO.mYItemNumScale; } else { switch (i_itemNo) { - case fpcNm_ITEM_BOOMERANG: + case dItemNo_BOOMERANG_e: mItemParams[SELECT_Y_e].pos_x = 14.0f; mItemParams[SELECT_Y_e].pos_y = 1.3f; mItemParams[SELECT_Y_e].scale = 1.7f; @@ -3597,7 +3597,7 @@ void dMeter2Draw_c::setItemParamY(u8 i_itemNo) { mItemParams[SELECT_Y_e].num_pos_y = -9.2f; mItemParams[SELECT_Y_e].num_scale = 0.95f; break; - case fpcNm_ITEM_BOW: + case dItemNo_BOW_e: mItemParams[SELECT_Y_e].pos_x = -1.3f; mItemParams[SELECT_Y_e].pos_y = -6.6f; mItemParams[SELECT_Y_e].scale = 2.0f; @@ -3606,7 +3606,7 @@ void dMeter2Draw_c::setItemParamY(u8 i_itemNo) { mItemParams[SELECT_Y_e].num_pos_y = -9.2f; mItemParams[SELECT_Y_e].num_scale = 0.95f; break; - case fpcNm_ITEM_HVY_BOOTS: + case dItemNo_HVY_BOOTS_e: mItemParams[SELECT_Y_e].pos_x = 1.3f; mItemParams[SELECT_Y_e].pos_y = 1.3f; mItemParams[SELECT_Y_e].scale = 1.7f; @@ -3615,7 +3615,7 @@ void dMeter2Draw_c::setItemParamY(u8 i_itemNo) { mItemParams[SELECT_Y_e].num_pos_y = -9.2f; mItemParams[SELECT_Y_e].num_scale = 0.95f; break; - case fpcNm_ITEM_HOOKSHOT: + case dItemNo_HOOKSHOT_e: mItemParams[SELECT_Y_e].pos_x = 6.6f; mItemParams[SELECT_Y_e].pos_y = -4.0f; mItemParams[SELECT_Y_e].scale = 1.5f; @@ -3624,7 +3624,7 @@ void dMeter2Draw_c::setItemParamY(u8 i_itemNo) { mItemParams[SELECT_Y_e].num_pos_y = -9.2f; mItemParams[SELECT_Y_e].num_scale = 0.95f; break; - case fpcNm_ITEM_KANTERA: + case dItemNo_KANTERA_e: mItemParams[SELECT_Y_e].pos_x = -1.8f; mItemParams[SELECT_Y_e].pos_y = g_drawHIO.mButtonYItemPosY; mItemParams[SELECT_Y_e].scale = g_drawHIO.mButtonYItemScale; @@ -3667,7 +3667,7 @@ void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) { mItemParams[SELECT_Z_e].num_scale = g_drawHIO.field_0x218; } else { switch (i_itemNo) { - case fpcNm_ITEM_BOOMERANG: + case dItemNo_BOOMERANG_e: mItemParams[SELECT_Z_e].pos_x = 4.0f; mItemParams[SELECT_Z_e].pos_y = 1.3f; mItemParams[SELECT_Z_e].scale = 2.2f; @@ -3676,7 +3676,7 @@ void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) { mItemParams[SELECT_Z_e].num_pos_y = -30.0f; mItemParams[SELECT_Z_e].num_scale = 0.75f; break; - case fpcNm_ITEM_BOW: + case dItemNo_BOW_e: mItemParams[SELECT_Z_e].pos_x = -1.3f; mItemParams[SELECT_Z_e].pos_y = 1.3f; mItemParams[SELECT_Z_e].scale = 2.2f; @@ -3685,7 +3685,7 @@ void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) { mItemParams[SELECT_Z_e].num_pos_y = -30.0f; mItemParams[SELECT_Z_e].num_scale = 0.75f; break; - case fpcNm_ITEM_HVY_BOOTS: + case dItemNo_HVY_BOOTS_e: mItemParams[SELECT_Z_e].pos_x = -6.6f; mItemParams[SELECT_Z_e].pos_y = 9.2f; mItemParams[SELECT_Z_e].scale = 2.2f; @@ -3694,7 +3694,7 @@ void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) { mItemParams[SELECT_Z_e].num_pos_y = -30.0f; mItemParams[SELECT_Z_e].num_scale = 0.8f; break; - case fpcNm_ITEM_HOOKSHOT: + case dItemNo_HOOKSHOT_e: mItemParams[SELECT_Z_e].pos_x = -4.0f; mItemParams[SELECT_Z_e].pos_y = 1.3f; mItemParams[SELECT_Z_e].scale = 1.7f; @@ -3703,7 +3703,7 @@ void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) { mItemParams[SELECT_Z_e].num_pos_y = -30.0f; mItemParams[SELECT_Z_e].num_scale = 0.8f; break; - case fpcNm_ITEM_KANTERA: + case dItemNo_KANTERA_e: mItemParams[SELECT_Z_e].pos_x = -6.6f; mItemParams[SELECT_Z_e].pos_y = 6.6f; mItemParams[SELECT_Z_e].scale = g_drawHIO.field_0x1d4; @@ -3755,13 +3755,13 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { mItemParams[3].num_scale = 0.75f; } else { switch (i_itemNo) { - case fpcNm_ITEM_LURE_ROD: - case fpcNm_ITEM_BEE_ROD: - case fpcNm_ITEM_JEWEL_ROD: - case fpcNm_ITEM_JEWEL_BEE_ROD: - case fpcNm_ITEM_JEWEL_WORM_ROD: - case fpcNm_ITEM_HORSE_FLUTE: - case fpcNm_ITEM_FISHING_ROD_1: + case dItemNo_LURE_ROD_e: + case dItemNo_BEE_ROD_e: + case dItemNo_JEWEL_ROD_e: + case dItemNo_JEWEL_BEE_ROD_e: + case dItemNo_JEWEL_WORM_ROD_e: + case dItemNo_HORSE_FLUTE_e: + case dItemNo_FISHING_ROD_1_e: mItemParams[3].pos_x = 17.3f; mItemParams[3].pos_y = -46.8f; mItemParams[3].scale = 1.7f; @@ -3770,7 +3770,7 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { mItemParams[3].num_pos_y = -30.0f; mItemParams[3].num_scale = 0.75f; break; - case fpcNm_ITEM_BOOMERANG: + case dItemNo_BOOMERANG_e: mItemParams[3].pos_x = 26.0f; mItemParams[3].pos_y = -54.7f; mItemParams[3].scale = 2.2f; @@ -3779,7 +3779,7 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { mItemParams[3].num_pos_y = -30.0f; mItemParams[3].num_scale = 0.75f; break; - case fpcNm_ITEM_BOW: + case dItemNo_BOW_e: mItemParams[3].pos_x = 20.7f; mItemParams[3].pos_y = -55.7f; mItemParams[3].scale = 2.2f; @@ -3788,7 +3788,7 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { mItemParams[3].num_pos_y = -30.0f; mItemParams[3].num_scale = 0.75f; break; - case fpcNm_ITEM_HVY_BOOTS: + case dItemNo_HVY_BOOTS_e: mItemParams[3].pos_x = 15.4f; mItemParams[3].pos_y = -47.8f; mItemParams[3].scale = 2.2f; @@ -3797,8 +3797,8 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { mItemParams[3].num_pos_y = -30.0f; mItemParams[3].num_scale = 0.8f; break; - case fpcNm_ITEM_SPINNER: - case fpcNm_ITEM_HAWK_EYE: + case dItemNo_SPINNER_e: + case dItemNo_HAWK_EYE_e: mItemParams[3].pos_x = 23.3f; mItemParams[3].pos_y = -47.8f; mItemParams[3].scale = 1.7f; @@ -3807,9 +3807,9 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { mItemParams[3].num_pos_y = -30.0f; mItemParams[3].num_scale = 0.8f; break; - case fpcNm_ITEM_COPY_ROD: - case fpcNm_ITEM_W_HOOKSHOT: - case fpcNm_ITEM_IRONBALL: + case dItemNo_COPY_ROD_e: + case dItemNo_W_HOOKSHOT_e: + case dItemNo_IRONBALL_e: mItemParams[3].pos_x = 29.3f; mItemParams[3].pos_y = -47.8f; mItemParams[3].scale = 1.7f; @@ -3818,13 +3818,13 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { mItemParams[3].num_pos_y = -30.0f; mItemParams[3].num_scale = 0.8f; break; - case fpcNm_ITEM_PACHINKO: - case fpcNm_ITEM_BOMB_BAG_LV1: - case fpcNm_ITEM_NORMAL_BOMB: - case fpcNm_ITEM_WATER_BOMB: - case fpcNm_ITEM_POKE_BOMB: - case fpcNm_ITEM_RAFRELS_MEMO: - case fpcNm_ITEM_TKS_LETTER: + case dItemNo_PACHINKO_e: + case dItemNo_BOMB_BAG_LV1_e: + case dItemNo_NORMAL_BOMB_e: + case dItemNo_WATER_BOMB_e: + case dItemNo_POKE_BOMB_e: + case dItemNo_RAFRELS_MEMO_e: + case dItemNo_TKS_LETTER_e: mItemParams[3].pos_x = 20.3f; mItemParams[3].pos_y = -47.8f; mItemParams[3].scale = 1.7f; @@ -3833,7 +3833,7 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { mItemParams[3].num_pos_y = -22.0f; mItemParams[3].num_scale = 0.8f; break; - case fpcNm_ITEM_HOOKSHOT: + case dItemNo_HOOKSHOT_e: mItemParams[3].pos_x = 21.0f; mItemParams[3].pos_y = -46.7f; mItemParams[3].scale = 1.7f; @@ -3842,7 +3842,7 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { mItemParams[3].num_pos_y = -30.0f; mItemParams[3].num_scale = 0.8f; break; - case fpcNm_ITEM_KANTERA: + case dItemNo_KANTERA_e: mItemParams[3].pos_x = 19.0f; mItemParams[3].pos_y = -45.0f; mItemParams[3].scale = g_drawHIO.mButtonBItemScale[0]; diff --git a/src/d/d_meter2_info.cpp b/src/d/d_meter2_info.cpp index a0963a31a5..61cf7ae5ee 100644 --- a/src/d/d_meter2_info.cpp +++ b/src/d/d_meter2_info.cpp @@ -622,8 +622,8 @@ void dMeter2Info_c::warpInProc() { dComIfGs_setWarpMarkFlag(0); dComIfGs_resetLastWarpAcceptStage(); - if (dComIfGs_getItem(SLOT_18, true) != fpcNm_ITEM_LV7_DUNGEON_EXIT) { - dComIfGs_setItem(SLOT_18, fpcNm_ITEM_DUNGEON_EXIT); + if (dComIfGs_getItem(SLOT_18, true) != dItemNo_LV7_DUNGEON_EXIT_e) { + dComIfGs_setItem(SLOT_18, dItemNo_DUNGEON_EXIT_e); } } @@ -654,7 +654,7 @@ void dMeter2Info_c::warpOutProc() { } dComIfGs_setWarpItemData(dComIfGp_getStartStageName(), pos, angle.y, room_no, 0, 1); - dComIfGs_setItem(SLOT_18, fpcNm_ITEM_DUNGEON_BACK); + dComIfGs_setItem(SLOT_18, dItemNo_DUNGEON_BACK_e); } void dMeter2Info_c::resetMeterString() { @@ -674,114 +674,114 @@ void dMeter2Info_c::setWarpInfo(const char* i_stageName, const cXyz& i_position, u8 dMeter2Info_c::getItemType(u8 i_itemNo) { u8 type; switch (i_itemNo) { - case fpcNm_ITEM_GREEN_RUPEE: + case dItemNo_GREEN_RUPEE_e: type = ItemType_GREEN_RUPEE; break; - case fpcNm_ITEM_BLUE_RUPEE: + case dItemNo_BLUE_RUPEE_e: type = ItemType_BLUE_RUPEE; break; - case fpcNm_ITEM_YELLOW_RUPEE: + case dItemNo_YELLOW_RUPEE_e: type = ItemType_YELLOW_RUPEE; break; - case fpcNm_ITEM_RED_RUPEE: + case dItemNo_RED_RUPEE_e: type = ItemType_RED_RUPEE; break; - case fpcNm_ITEM_PURPLE_RUPEE: - case fpcNm_ITEM_LINKS_SAVINGS: + case dItemNo_PURPLE_RUPEE_e: + case dItemNo_LINKS_SAVINGS_e: type = ItemType_PURPLE_RUPEE; break; - case fpcNm_ITEM_ORANGE_RUPEE: + case dItemNo_ORANGE_RUPEE_e: type = ItemType_ORANGE_RUPEE; break; - case fpcNm_ITEM_SILVER_RUPEE: + case dItemNo_SILVER_RUPEE_e: type = ItemType_SILVER_RUPEE; break; - case fpcNm_ITEM_EMPTY_BOTTLE: + case dItemNo_EMPTY_BOTTLE_e: type = ItemType_EMPTY_BOTTLE; break; - case fpcNm_ITEM_RED_BOTTLE: - case fpcNm_ITEM_RED_BOTTLE_2: + case dItemNo_RED_BOTTLE_e: + case dItemNo_RED_BOTTLE_2_e: type = ItemType_RED_BOTTLE; break; - case fpcNm_ITEM_GREEN_BOTTLE: + case dItemNo_GREEN_BOTTLE_e: type = ItemType_GREEN_BOTTLE; break; - case fpcNm_ITEM_BLUE_BOTTLE: + case dItemNo_BLUE_BOTTLE_e: type = ItemType_BLUE_BOTTLE; break; - case fpcNm_ITEM_MILK_BOTTLE: + case dItemNo_MILK_BOTTLE_e: type = ItemType_MILK_BOTTLE; break; - case fpcNm_ITEM_HALF_MILK_BOTTLE: + case dItemNo_HALF_MILK_BOTTLE_e: type = ItemType_HALF_MILK_BOTTLE; break; - case fpcNm_ITEM_OIL_BOTTLE: - case fpcNm_ITEM_OIL_BOTTLE_2: - case fpcNm_ITEM_OIL_BOTTLE3: + case dItemNo_OIL_BOTTLE_e: + case dItemNo_OIL_BOTTLE_2_e: + case dItemNo_OIL_BOTTLE3_e: type = ItemType_OIL_BOTTLE; break; - case fpcNm_ITEM_WATER_BOTTLE: + case dItemNo_WATER_BOTTLE_e: type = ItemType_WATER_BOTTLE; break; - case fpcNm_ITEM_HOT_SPRING: - case fpcNm_ITEM_HOT_SPRING_2: + case dItemNo_HOT_SPRING_e: + case dItemNo_HOT_SPRING_2_e: type = ItemType_HOT_SPRING; break; - case fpcNm_ITEM_LV1_SOUP: + case dItemNo_LV1_SOUP_e: type = ItemType_LV1_SOUP; break; - case fpcNm_ITEM_LV2_SOUP: - case fpcNm_ITEM_LV3_SOUP: + case dItemNo_LV2_SOUP_e: + case dItemNo_LV3_SOUP_e: type = ItemType_LV2_3_SOUP; break; - case fpcNm_ITEM_UGLY_SOUP: + case dItemNo_UGLY_SOUP_e: type = ItemType_UGLY_SOUP; break; - case fpcNm_ITEM_CHUCHU_RED: + case dItemNo_CHUCHU_RED_e: type = ItemType_CHUCHU_RED; break; - case fpcNm_ITEM_CHUCHU_BLUE: + case dItemNo_CHUCHU_BLUE_e: type = ItemType_CHUCHU_BLUE; break; - case fpcNm_ITEM_CHUCHU_GREEN: + case dItemNo_CHUCHU_GREEN_e: type = ItemType_CHUCHU_GREEN; break; - case fpcNm_ITEM_CHUCHU_YELLOW: + case dItemNo_CHUCHU_YELLOW_e: type = ItemType_CHUCHU_YELLOW; break; - case fpcNm_ITEM_CHUCHU_PURPLE: + case dItemNo_CHUCHU_PURPLE_e: type = ItemType_CHUCHU_PURPLE; break; - case fpcNm_ITEM_CHUCHU_RARE: + case dItemNo_CHUCHU_RARE_e: type = ItemType_CHUCHU_RARE; break; - case fpcNm_ITEM_CHUCHU_BLACK: + case dItemNo_CHUCHU_BLACK_e: type = ItemType_CHUCHU_BLACK; break; - case fpcNm_ITEM_POU_FIRE1: - case fpcNm_ITEM_POU_FIRE2: - case fpcNm_ITEM_POU_FIRE3: - case fpcNm_ITEM_POU_FIRE4: + case dItemNo_POU_FIRE1_e: + case dItemNo_POU_FIRE2_e: + case dItemNo_POU_FIRE3_e: + case dItemNo_POU_FIRE4_e: type = ItemType_POU_FIRE; break; - case fpcNm_ITEM_FAIRY: + case dItemNo_FAIRY_e: type = ItemType_FAIRY; break; - case fpcNm_ITEM_BEE_CHILD: - case fpcNm_ITEM_SHOP_BEE_CHILD: + case dItemNo_BEE_CHILD_e: + case dItemNo_SHOP_BEE_CHILD_e: type = ItemType_BEE_CHILD; break; - case fpcNm_ITEM_WORM: + case dItemNo_WORM_e: type = ItemType_WORM; break; - case fpcNm_ITEM_FAIRY_DROP: - case fpcNm_ITEM_DROP_BOTTLE: + case dItemNo_FAIRY_DROP_e: + case dItemNo_DROP_BOTTLE_e: type = ItemType_DROP_BOTTLE; break; - case fpcNm_ITEM_BOMB_ARROW: + case dItemNo_BOMB_ARROW_e: type = ItemType_BOMB_ARROW; break; - case fpcNm_ITEM_HAWK_ARROW: + case dItemNo_HAWK_ARROW_e: type = ItemType_HAWK_ARROW; break; default: @@ -799,10 +799,10 @@ int dMeter2Info_c::readItemTexture(u8 i_itemNo, void* i_texBuf1, J2DPicture* i_p int tex_num = 0; if (i_texBuf1 != NULL) { - if ((i_itemNo == fpcNm_ITEM_KANTERA && dComIfGs_getOil() == 0) || i_itemNo == fpcNm_ITEM_KANTERA2) { + if ((i_itemNo == dItemNo_KANTERA_e && dComIfGs_getOil() == 0) || i_itemNo == dItemNo_KANTERA2_e) { u32 size = JKRReadIdxResource(i_texBuf1, 0xC00, ITEMICON_BTI_IM_KANTERA_OFF_48, dComIfGp_getItemIconArchive()); JUT_ASSERT(1166, size != 0); - } else if (i_itemNo == fpcNm_ITEM_COPY_ROD && !daPy_getPlayerActorClass()->checkCopyRodTopUse() && param_9 == -1) { + } else if (i_itemNo == dItemNo_COPY_ROD_e && !daPy_getPlayerActorClass()->checkCopyRodTopUse() && param_9 == -1) { u32 size = JKRReadIdxResource(i_texBuf1, 0xC00, ITEMICON_BTI_ST_COPY_ROD_B, dComIfGp_getItemIconArchive()); JUT_ASSERT(1173, size != 0); } else if ((itemType == ItemType_POU_FIRE || itemType == ItemType_FAIRY || itemType == ItemType_BEE_CHILD || itemType == ItemType_WORM) && i_texBuf3 == NULL) { @@ -1265,8 +1265,8 @@ void dMeter2Info_c::changeWater(u8 i_slotNo) { mHotSpringTimer[i_bottleIdx] = 0; - if (dComIfGs_getItem(i_slotNo, true) == fpcNm_ITEM_HOT_SPRING) { - dComIfGs_setItem(i_slotNo, fpcNm_ITEM_WATER_BOTTLE); + if (dComIfGs_getItem(i_slotNo, true) == dItemNo_HOT_SPRING_e) { + dComIfGs_setItem(i_slotNo, dItemNo_WATER_BOTTLE_e); for (int i = 0; i < 3; i++) { if (i_slotNo == dComIfGs_getSelectItemIndex(i)) { @@ -1286,7 +1286,7 @@ void dMeter2Info_c::setMiniGameItem(u8 i_minigameFlag) { u8 setRentBagIdx = false; for (int bagIdx = 0; bagIdx < 3; bagIdx++) { - if (!setRentBagIdx && dComIfGs_getItem((u8)(bagIdx + SLOT_15), true) == fpcNm_ITEM_NONE) { + if (!setRentBagIdx && dComIfGs_getItem((u8)(bagIdx + SLOT_15), true) == dItemNo_NONE_e) { mRentalBombBagIdx = bagIdx; setRentBagIdx = true; } @@ -1322,12 +1322,12 @@ void dMeter2Info_c::setMiniGameItem(u8 i_minigameFlag) { dComIfGs_setArrowNum(mSaveArrowNumMG); } - dComIfGs_setItem((u8)(mRentalBombBagIdx + SLOT_15), fpcNm_ITEM_NORMAL_BOMB); - dComIfGp_setItem((u8)(mRentalBombBagIdx + SLOT_15), fpcNm_ITEM_NORMAL_BOMB); + dComIfGs_setItem((u8)(mRentalBombBagIdx + SLOT_15), dItemNo_NORMAL_BOMB_e); + dComIfGp_setItem((u8)(mRentalBombBagIdx + SLOT_15), dItemNo_NORMAL_BOMB_e); if (mMiniGameItemSetFlag != 3) { - dComIfGs_setItem(SLOT_4, fpcNm_ITEM_BOW); - dComIfGp_setItem(SLOT_4, fpcNm_ITEM_BOW); + dComIfGs_setItem(SLOT_4, dItemNo_BOW_e); + dComIfGp_setItem(SLOT_4, dItemNo_BOW_e); dComIfGs_setMixItemIndex(SELECT_ITEM_Y, 0xFF); dComIfGs_setSelectItemIndex(SELECT_ITEM_Y, 0xFF); dComIfGs_setMixItemIndex(SELECT_ITEM_X, SLOT_4); @@ -1445,18 +1445,18 @@ u8 dMeter2Info_getPixel(f32 i_posX, f32 i_posY, f32 param_2, f32 param_3, f32 i_ void dMeter2Info_setCloth(u8 i_clothId, bool i_offItemBit) { switch (i_clothId) { - case fpcNm_ITEM_WEAR_CASUAL: - case fpcNm_ITEM_WEAR_KOKIRI: - case fpcNm_ITEM_ARMOR: - case fpcNm_ITEM_WEAR_ZORA: + case dItemNo_WEAR_CASUAL_e: + case dItemNo_WEAR_KOKIRI_e: + case dItemNo_ARMOR_e: + case dItemNo_WEAR_ZORA_e: break; default: OS_REPORT("cloth item id error!! ==> %d\n", i_clothId); - i_clothId = fpcNm_ITEM_WEAR_CASUAL; + i_clothId = dItemNo_WEAR_CASUAL_e; i_offItemBit = false; } - if (i_offItemBit && dComIfGs_getSelectEquipClothes() != fpcNm_ITEM_NONE) { + if (i_offItemBit && dComIfGs_getSelectEquipClothes() != dItemNo_NONE_e) { dComIfGs_offItemFirstBit(dComIfGs_getSelectEquipClothes()); } @@ -1466,15 +1466,15 @@ void dMeter2Info_setCloth(u8 i_clothId, bool i_offItemBit) { void dMeter2Info_setSword(u8 i_itemId, bool i_offItemBit) { switch (i_itemId) { - case fpcNm_ITEM_NONE: - case fpcNm_ITEM_WOOD_STICK: - case fpcNm_ITEM_SWORD: - case fpcNm_ITEM_MASTER_SWORD: - case fpcNm_ITEM_LIGHT_SWORD: + case dItemNo_NONE_e: + case dItemNo_WOOD_STICK_e: + case dItemNo_SWORD_e: + case dItemNo_MASTER_SWORD_e: + case dItemNo_LIGHT_SWORD_e: break; default: OS_REPORT("sword item id error!! ==> %d\n", i_itemId); - i_itemId = fpcNm_ITEM_NONE; + i_itemId = dItemNo_NONE_e; i_offItemBit = false; } @@ -1488,14 +1488,14 @@ void dMeter2Info_setSword(u8 i_itemId, bool i_offItemBit) { void dMeter2Info_setShield(u8 i_itemId, bool i_offItemBit) { switch (i_itemId) { - case fpcNm_ITEM_NONE: - case fpcNm_ITEM_WOOD_SHIELD: - case fpcNm_ITEM_SHIELD: - case fpcNm_ITEM_HYLIA_SHIELD: + case dItemNo_NONE_e: + case dItemNo_WOOD_SHIELD_e: + case dItemNo_SHIELD_e: + case dItemNo_HYLIA_SHIELD_e: break; default: OS_REPORT("shield item id error!! ==> %d\n", i_itemId); - i_itemId = fpcNm_ITEM_NONE; + i_itemId = dItemNo_NONE_e; i_offItemBit = false; } diff --git a/src/d/d_meter_HIO.cpp b/src/d/d_meter_HIO.cpp index 90d5f98192..685f9c580c 100644 --- a/src/d/d_meter_HIO.cpp +++ b/src/d/d_meter_HIO.cpp @@ -3605,7 +3605,7 @@ dMeter_mapIconHIO_c::dMeter_mapIconHIO_c() { mCannonBallZoomScale[1] = 0.8f; mLV5DungeonItemDebug = false; - mLV5DungeonItem = fpcNm_ITEM_NONE; + mLV5DungeonItem = dItemNo_NONE_e; mIconDebug = false; for (int i = 0; i < ARRAY_SIZE(mIconDisplay); i++) { diff --git a/src/d/d_meter_button.cpp b/src/d/d_meter_button.cpp index 22d6e6b830..5de89f1da3 100644 --- a/src/d/d_meter_button.cpp +++ b/src/d/d_meter_button.cpp @@ -1158,11 +1158,11 @@ void dMeterButton_c::screenInitButton() { u8 fishing_item = dComIfGs_getItem(SLOT_20, false); if (dMeter2Info_getMeterClass()->getMeterDrawPtr()->getCanoeFishing()) { - fishing_item = fpcNm_ITEM_LURE_ROD; + fishing_item = dItemNo_LURE_ROD_e; } - if (fishing_item == fpcNm_ITEM_NONE) { - fishing_item = fpcNm_ITEM_FISHING_ROD_1; + if (fishing_item == dItemNo_NONE_e) { + fishing_item = dItemNo_FISHING_ROD_1_e; } dMeter2Info_readItemTexture(fishing_item, mpFishingTex, diff --git a/src/d/d_msg_class.cpp b/src/d/d_msg_class.cpp index e63ffd4412..debea084dc 100644 --- a/src/d/d_msg_class.cpp +++ b/src/d/d_msg_class.cpp @@ -1325,13 +1325,13 @@ bool jmessage_tMeasureProcessor::do_tag(u32 i_tag, void const* i_data, u32 i_siz return true; } case MSGTAG_BOMB_MAX: { - u8 bomb_type = fpcNm_ITEM_NORMAL_BOMB; + u8 bomb_type = dItemNo_NORMAL_BOMB_e; const u8 type = *(u8*)i_data; if (type == 1) { - bomb_type = fpcNm_ITEM_WATER_BOMB; + bomb_type = dItemNo_WATER_BOMB_e; } else if (type == 2) { - bomb_type = fpcNm_ITEM_POKE_BOMB; + bomb_type = dItemNo_POKE_BOMB_e; } char buffer[40]; @@ -4090,11 +4090,11 @@ bool jmessage_string_tMeasureProcessor::do_tag(u32 i_tag, void const* i_data, u3 break; } case MSGTAG_BOMB_MAX: { - u8 bombType = fpcNm_ITEM_NORMAL_BOMB; + u8 bombType = dItemNo_NORMAL_BOMB_e; if ((*(u8*)i_data) == 1) { - bombType = fpcNm_ITEM_WATER_BOMB; + bombType = dItemNo_WATER_BOMB_e; } else if ((*(s8*)i_data & 0xFFU) == 2) { - bombType = fpcNm_ITEM_POKE_BOMB; + bombType = dItemNo_POKE_BOMB_e; } char buffer[40]; @@ -4703,11 +4703,11 @@ bool jmessage_string_tRenderingProcessor::do_tag(u32 i_tag, void const* i_data, break; } case MSGTAG_BOMB_MAX: { - u8 bombType = fpcNm_ITEM_NORMAL_BOMB; + u8 bombType = dItemNo_NORMAL_BOMB_e; if ((*(u8*)i_data) == 1) { - bombType = fpcNm_ITEM_WATER_BOMB; + bombType = dItemNo_WATER_BOMB_e; } else if ((*(s8*)i_data & 0xFFU) == 2) { - bombType = fpcNm_ITEM_POKE_BOMB; + bombType = dItemNo_POKE_BOMB_e; } char buffer[40]; diff --git a/src/d/d_msg_flow.cpp b/src/d/d_msg_flow.cpp index 3da5b65c1c..827c92bf6e 100644 --- a/src/d/d_msg_flow.cpp +++ b/src/d/d_msg_flow.cpp @@ -1087,23 +1087,23 @@ u16 dMsgFlow_c::query021(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea u16 ret = 0; switch (prm0) { - case fpcNm_ITEM_SWORD: - case fpcNm_ITEM_MASTER_SWORD: - case fpcNm_ITEM_LIGHT_SWORD: + case dItemNo_SWORD_e: + case dItemNo_MASTER_SWORD_e: + case dItemNo_LIGHT_SWORD_e: if (dComIfGs_getSelectEquipSword() == prm0) { ret = 1; } break; - case fpcNm_ITEM_WOOD_SHIELD: - case fpcNm_ITEM_SHIELD: - case fpcNm_ITEM_HYLIA_SHIELD: + case dItemNo_WOOD_SHIELD_e: + case dItemNo_SHIELD_e: + case dItemNo_HYLIA_SHIELD_e: if (dComIfGs_getSelectEquipShield() == prm0) { ret = 1; } break; - case fpcNm_ITEM_WEAR_KOKIRI: - case fpcNm_ITEM_ARMOR: - case fpcNm_ITEM_WEAR_ZORA: + case dItemNo_WEAR_KOKIRI_e: + case dItemNo_ARMOR_e: + case dItemNo_WEAR_ZORA_e: if (dComIfGs_getSelectEquipClothes() == prm0) { ret = 1; } @@ -1145,7 +1145,7 @@ u16 dMsgFlow_c::query022(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea u16 dMsgFlow_c::query023(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) { const u8 prm0 = i_flowNode_p->param; - int i_bagNum = 3 - dComIfGs_checkBombBag(fpcNm_ITEM_NONE); + int i_bagNum = 3 - dComIfGs_checkBombBag(dItemNo_NONE_e); JUT_ASSERT(2312, i_bagNum >= 0); u16 ret = i_bagNum; @@ -1398,13 +1398,13 @@ u16 dMsgFlow_c::query038(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea u8 ret = 0; switch(dComIfGs_getItem((u8)(BombBag + SLOT_15), false)) { - case fpcNm_ITEM_NORMAL_BOMB: + case dItemNo_NORMAL_BOMB_e: ret = 1; break; - case fpcNm_ITEM_WATER_BOMB: + case dItemNo_WATER_BOMB_e: ret = 2; break; - case fpcNm_ITEM_POKE_BOMB: + case dItemNo_POKE_BOMB_e: ret = 3; break; } @@ -1425,7 +1425,7 @@ u16 dMsgFlow_c::query039(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea u8 BombBag = dComIfGs_getTmpReg(0xFBFF) - 1; u8 BombNum = dComIfGs_getBombNum(BombBag); - u8 BombMax = dComIfGs_getBombMax(fpcNm_ITEM_NORMAL_BOMB); + u8 BombMax = dComIfGs_getBombMax(dItemNo_NORMAL_BOMB_e); u8 ret = 0; if (BombMax < BombNum + prm0) { @@ -1484,7 +1484,7 @@ u16 dMsgFlow_c::query041(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea u8 BombBag = dComIfGs_getTmpReg(0xFBFF) - 1; u8 BombNum = dComIfGs_getBombNum(BombBag); - u8 BombMax = dComIfGs_getBombMax(fpcNm_ITEM_WATER_BOMB); + u8 BombMax = dComIfGs_getBombMax(dItemNo_WATER_BOMB_e); u8 ret = 0; if (BombMax < BombNum + prm0) { @@ -1529,7 +1529,7 @@ u16 dMsgFlow_c::query043(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea const int prm0 = i_flowNode_p->param; u8 BombBag = dComIfGs_getTmpReg(0xFBFF) - 1; u8 BombNum = dComIfGs_getBombNum(BombBag); - u8 BombMax = dComIfGs_getBombMax(fpcNm_ITEM_POKE_BOMB); + u8 BombMax = dComIfGs_getBombMax(dItemNo_POKE_BOMB_e); u8 ret = 0; if (BombMax < BombNum + prm0) { @@ -2031,15 +2031,15 @@ int dMsgFlow_c::event017(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak if (prm1 <= 1) { switch (prm0) { - case fpcNm_ITEM_DROP_CONTAINER: + case dItemNo_DROP_CONTAINER_e: dMeter2Info_setLightDropGetFlag(0, 1); dComIfGs_onLightDropGetFlag(0); break; - case fpcNm_ITEM_DROP_CONTAINER02: + case dItemNo_DROP_CONTAINER02_e: dMeter2Info_setLightDropGetFlag(1, 1); dComIfGs_onLightDropGetFlag(1); break; - case fpcNm_ITEM_DROP_CONTAINER03: + case dItemNo_DROP_CONTAINER03_e: dMeter2Info_setLightDropGetFlag(2, 1); dComIfGs_onLightDropGetFlag(2); break; @@ -2151,25 +2151,25 @@ int dMsgFlow_c::event023(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak switch (prm0) { case 1: - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_RED_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_RED_BOTTLE_e); break; case 2: - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_GREEN_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_GREEN_BOTTLE_e); break; case 3: - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_BLUE_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_BLUE_BOTTLE_e); break; case 4: - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_MILK_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_MILK_BOTTLE_e); break; case 5: - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_HALF_MILK_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_HALF_MILK_BOTTLE_e); break; case 6: - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_OIL_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_OIL_BOTTLE_e); break; case 7: - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_HOT_SPRING); + dComIfGs_setEmptyBottleItemIn(dItemNo_HOT_SPRING_e); break; } @@ -2205,7 +2205,7 @@ int dMsgFlow_c::event025(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak int dMsgFlow_c::event026(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) { fopAc_ac_c* speaker_p; - if (fopAcM_GetName(i_speaker_p) == PROC_MYNA) { + if (fopAcM_GetName(i_speaker_p) == fpcNm_MYNA_e) { daMyna_c* myna = (daMyna_c*)i_speaker_p; speaker_p = myna->getSpeakActorPtr(); } else { @@ -2213,9 +2213,9 @@ int dMsgFlow_c::event026(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak } if (speaker_p != NULL) { - if (fopAcM_GetName(speaker_p) == PROC_OBJ_SSITEM || - fopAcM_GetName(speaker_p) == PROC_OBJ_SSDRINK || - fopAcM_GetName(speaker_p) == PROC_TAG_SSDRINK) + if (fopAcM_GetName(speaker_p) == fpcNm_OBJ_SSITEM_e || + fopAcM_GetName(speaker_p) == fpcNm_OBJ_SSDRINK_e || + fopAcM_GetName(speaker_p) == fpcNm_TAG_SSDRINK_e) { daObj_SSBase_c* ss_item = (daObj_SSBase_c*)speaker_p; ss_item->setSoldOut(); @@ -2252,36 +2252,36 @@ int dMsgFlow_c::event027(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak switch (aParam8[1]) { case 0: - if (dComIfGs_getItem((u8)(SLOT_15 + BombBag), false) == fpcNm_ITEM_BOMB_BAG_LV1) { - dComIfGs_setItem((u8)(SLOT_15 + BombBag), fpcNm_ITEM_NORMAL_BOMB); + if (dComIfGs_getItem((u8)(SLOT_15 + BombBag), false) == dItemNo_BOMB_BAG_LV1_e) { + dComIfGs_setItem((u8)(SLOT_15 + BombBag), dItemNo_NORMAL_BOMB_e); } if (prm1 != 0) { dComIfGp_setItemBombNumCount(BombBag, (u8)prm1); } else { - dComIfGp_setItemBombNumCount(BombBag, dComIfGs_getBombMax(fpcNm_ITEM_NORMAL_BOMB)); + dComIfGp_setItemBombNumCount(BombBag, dComIfGs_getBombMax(dItemNo_NORMAL_BOMB_e)); } break; case 1: - if (dComIfGs_getItem((u8)(SLOT_15 + BombBag), false) == fpcNm_ITEM_BOMB_BAG_LV1) { - dComIfGs_setItem((u8)(SLOT_15 + BombBag), fpcNm_ITEM_WATER_BOMB); + if (dComIfGs_getItem((u8)(SLOT_15 + BombBag), false) == dItemNo_BOMB_BAG_LV1_e) { + dComIfGs_setItem((u8)(SLOT_15 + BombBag), dItemNo_WATER_BOMB_e); } if (prm1 != 0) { dComIfGp_setItemBombNumCount(BombBag, (u8)prm1); } else { - dComIfGp_setItemBombNumCount(BombBag, dComIfGs_getBombMax(fpcNm_ITEM_WATER_BOMB)); + dComIfGp_setItemBombNumCount(BombBag, dComIfGs_getBombMax(dItemNo_WATER_BOMB_e)); } break; case 2: - if (dComIfGs_getItem((u8)(SLOT_15 + BombBag), false) == fpcNm_ITEM_BOMB_BAG_LV1) { - dComIfGs_setItem((u8)(SLOT_15 + BombBag), fpcNm_ITEM_POKE_BOMB); + if (dComIfGs_getItem((u8)(SLOT_15 + BombBag), false) == dItemNo_BOMB_BAG_LV1_e) { + dComIfGs_setItem((u8)(SLOT_15 + BombBag), dItemNo_POKE_BOMB_e); } if (prm1 != 0) { dComIfGp_setItemBombNumCount(BombBag, (u8)prm1); } else { - dComIfGp_setItemBombNumCount(BombBag, dComIfGs_getBombMax(fpcNm_ITEM_POKE_BOMB)); + dComIfGp_setItemBombNumCount(BombBag, dComIfGs_getBombMax(dItemNo_POKE_BOMB_e)); } break; case 3: @@ -2291,16 +2291,16 @@ int dMsgFlow_c::event027(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak dComIfGp_setItemBombNumCount(BombBag, (u8)prm1); break; case 6: - dComIfGs_setItem((u8)(SLOT_15 + BombBag), fpcNm_ITEM_NORMAL_BOMB); - dComIfGp_setItemBombNumCount(BombBag, dComIfGs_getBombMax(fpcNm_ITEM_NORMAL_BOMB)); + dComIfGs_setItem((u8)(SLOT_15 + BombBag), dItemNo_NORMAL_BOMB_e); + dComIfGp_setItemBombNumCount(BombBag, dComIfGs_getBombMax(dItemNo_NORMAL_BOMB_e)); break; case 7: - dComIfGs_setItem((u8)(SLOT_15 + BombBag), fpcNm_ITEM_WATER_BOMB); - dComIfGp_setItemBombNumCount(BombBag, dComIfGs_getBombMax(fpcNm_ITEM_WATER_BOMB)); + dComIfGs_setItem((u8)(SLOT_15 + BombBag), dItemNo_WATER_BOMB_e); + dComIfGp_setItemBombNumCount(BombBag, dComIfGs_getBombMax(dItemNo_WATER_BOMB_e)); break; case 8: - dComIfGs_setItem((u8)(SLOT_15 + BombBag), fpcNm_ITEM_POKE_BOMB); - dComIfGp_setItemBombNumCount(BombBag, dComIfGs_getBombMax(fpcNm_ITEM_POKE_BOMB)); + dComIfGs_setItem((u8)(SLOT_15 + BombBag), dItemNo_POKE_BOMB_e); + dComIfGp_setItemBombNumCount(BombBag, dComIfGs_getBombMax(dItemNo_POKE_BOMB_e)); break; case 9: case 10: @@ -2324,20 +2324,20 @@ int dMsgFlow_c::event028(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak dComIfGp_setItemRupeeCount(BombPrice); dComIfGs_setBombNum(BombBag, 0); - if (dComIfGs_getItem((u8)(SLOT_15 + BombBag), true) != fpcNm_ITEM_BOMB_ARROW) { - dComIfGs_setItem((u8)(SLOT_15 + BombBag), fpcNm_ITEM_BOMB_BAG_LV1); + if (dComIfGs_getItem((u8)(SLOT_15 + BombBag), true) != dItemNo_BOMB_ARROW_e) { + dComIfGs_setItem((u8)(SLOT_15 + BombBag), dItemNo_BOMB_BAG_LV1_e); } else { for (int i = 0; i < 3; i++) { if (SLOT_15 + BombBag == dComIfGs_getSelectItemIndex(i)) { u8 mix_item = dComIfGs_getMixItemIndex(i); - dComIfGs_setMixItemIndex(i, fpcNm_ITEM_NONE); + dComIfGs_setMixItemIndex(i, dItemNo_NONE_e); dComIfGs_setSelectItemIndex(i, mix_item); dComIfGp_setSelectItem(i); } } - dComIfGs_setItem((u8)(SLOT_15 + BombBag), fpcNm_ITEM_BOMB_BAG_LV1); + dComIfGs_setItem((u8)(SLOT_15 + BombBag), dItemNo_BOMB_BAG_LV1_e); } // "Bomb Purchase" @@ -2467,12 +2467,12 @@ int dMsgFlow_c::event034(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak int dMsgFlow_c::event035(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) { int prm0 = getParam(i_flowNode_p->params); - if (prm0 == fpcNm_ITEM_TOMATO_PUREE || prm0 == fpcNm_ITEM_TASTE) { + if (prm0 == dItemNo_TOMATO_PUREE_e || prm0 == dItemNo_TASTE_e) { dComIfGs_offItemFirstBit(prm0); - } else if (prm0 == fpcNm_ITEM_RAFRELS_MEMO || prm0 == fpcNm_ITEM_ASHS_SCRIBBLING) { - dComIfGs_setItem(SLOT_19, fpcNm_ITEM_NONE); - } else if (prm0 == fpcNm_ITEM_LETTER || prm0 == fpcNm_ITEM_BILL || prm0 == fpcNm_ITEM_WOOD_STATUE || prm0 == fpcNm_ITEM_IRIAS_PENDANT) { - dComIfGs_setWarashibeItem(fpcNm_ITEM_NONE); + } else if (prm0 == dItemNo_RAFRELS_MEMO_e || prm0 == dItemNo_ASHS_SCRIBBLING_e) { + dComIfGs_setItem(SLOT_19, dItemNo_NONE_e); + } else if (prm0 == dItemNo_LETTER_e || prm0 == dItemNo_BILL_e || prm0 == dItemNo_WOOD_STATUE_e || prm0 == dItemNo_IRIAS_PENDANT_e) { + dComIfGs_setWarashibeItem(dItemNo_NONE_e); } // "Item Remove" @@ -2538,25 +2538,25 @@ int dMsgFlow_c::event040(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak case 0: break; case 1: - dComIfGs_setBottleItemIn(fpcNm_ITEM_RED_BOTTLE, fpcNm_ITEM_EMPTY_BOTTLE); + dComIfGs_setBottleItemIn(dItemNo_RED_BOTTLE_e, dItemNo_EMPTY_BOTTLE_e); break; case 2: - dComIfGs_setBottleItemIn(fpcNm_ITEM_GREEN_BOTTLE, fpcNm_ITEM_EMPTY_BOTTLE); + dComIfGs_setBottleItemIn(dItemNo_GREEN_BOTTLE_e, dItemNo_EMPTY_BOTTLE_e); break; case 3: - dComIfGs_setBottleItemIn(fpcNm_ITEM_BLUE_BOTTLE, fpcNm_ITEM_EMPTY_BOTTLE); + dComIfGs_setBottleItemIn(dItemNo_BLUE_BOTTLE_e, dItemNo_EMPTY_BOTTLE_e); break; case 4: - dComIfGs_setBottleItemIn(fpcNm_ITEM_MILK_BOTTLE, fpcNm_ITEM_EMPTY_BOTTLE); + dComIfGs_setBottleItemIn(dItemNo_MILK_BOTTLE_e, dItemNo_EMPTY_BOTTLE_e); break; case 5: - dComIfGs_setBottleItemIn(fpcNm_ITEM_HALF_MILK_BOTTLE, fpcNm_ITEM_EMPTY_BOTTLE); + dComIfGs_setBottleItemIn(dItemNo_HALF_MILK_BOTTLE_e, dItemNo_EMPTY_BOTTLE_e); break; case 6: - dComIfGs_setBottleItemIn(fpcNm_ITEM_OIL_BOTTLE, fpcNm_ITEM_EMPTY_BOTTLE); + dComIfGs_setBottleItemIn(dItemNo_OIL_BOTTLE_e, dItemNo_EMPTY_BOTTLE_e); break; case 7: - dComIfGs_setBottleItemIn(fpcNm_ITEM_HOT_SPRING, fpcNm_ITEM_EMPTY_BOTTLE); + dComIfGs_setBottleItemIn(dItemNo_HOT_SPRING_e, dItemNo_EMPTY_BOTTLE_e); break; } diff --git a/src/d/d_msg_object.cpp b/src/d/d_msg_object.cpp index 32c0b807ef..39c44b1470 100644 --- a/src/d/d_msg_object.cpp +++ b/src/d/d_msg_object.cpp @@ -39,7 +39,7 @@ s16 dMsgObject_getGroupID() { static int dMsgObject_searchSSItem(void* param_1, void* param_2) { daPy_py_c* player = daPy_getPlayerActorClass(); - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_OBJ_SSITEM) { + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_OBJ_SSITEM_e) { if (static_cast(param_1)->getProcessID() == player->getGrabActorID()) { static_cast(param_1)->setSoldOut(); return 0; @@ -2130,7 +2130,7 @@ void dMsgObject_c::setDemoMessageLocal(u32 param_1) { u16 dMsgObject_c::getSmellTypeMessageIDLocal() { u16 msgId = 0; int smell = dComIfGs_getCollectSmell(); - if (smell < fpcNm_ITEM_SMELL_MEDICINE + 1 && smell >= fpcNm_ITEM_SMELL_YELIA_POUCH) { + if (smell < dItemNo_SMELL_MEDICINE_e + 1 && smell >= dItemNo_SMELL_YELIA_POUCH_e) { msgId = smell + 0x165; } else { if (dComIfGs_getCollectSmell() != -1) { @@ -2463,15 +2463,15 @@ static leafdraw_method_class l_dMsgObject_Method = { }; msg_process_profile_definition g_profile_MSG_OBJECT = { - fpcLy_CURRENT_e, // mLayerID - 12, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_MSG_OBJECT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(dMsgObject_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopMsg_Method, // sub_method - 770, // mPriority - &l_dMsgObject_Method, // sub_method + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 12, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MSG_OBJECT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dMsgObject_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopMsg_Method, + /* Draw Prio */ fpcDwPi_MSG_OBJECT_e, + /* Msg SubMtd */ &l_dMsgObject_Method, }; diff --git a/src/d/d_ovlp_fade.cpp b/src/d/d_ovlp_fade.cpp index d8edae5d33..1ae49ab74a 100644 --- a/src/d/d_ovlp_fade.cpp +++ b/src/d/d_ovlp_fade.cpp @@ -37,9 +37,9 @@ static int dOvlpFd_FadeOut(overlap1_class* i_this) { if (i_this->field_0xcc == 0) { mDoAud_setFadeInStart(0); - if (fpcM_GetProfName(i_this) == PROC_OVERLAP11) { + if (fpcM_GetProfName(i_this) == fpcNm_OVERLAP11_e) { i_this->field_0xcc = 10; - } else if (fpcM_GetProfName(i_this) != PROC_OVERLAP6) { + } else if (fpcM_GetProfName(i_this) != fpcNm_OVERLAP6_e) { dOvlpFd_startFadeIn(var_r31); i_this->field_0xcc = var_r31; } else { @@ -48,7 +48,7 @@ static int dOvlpFd_FadeOut(overlap1_class* i_this) { } } - if (fpcM_GetProfName(i_this) == PROC_OVERLAP11 && i_this->field_0xcc == 7) { + if (fpcM_GetProfName(i_this) == fpcNm_OVERLAP11_e && i_this->field_0xcc == 7) { dOvlpFd_startFadeIn(7); } @@ -76,7 +76,7 @@ static int dOvlpFd_FadeIn(overlap1_class* i_this) { int var_r30 = 30; if (i_this->field_0xd0 == 0) { - if (fpcM_GetProfName(i_this) == PROC_OVERLAP0 || fpcM_GetProfName(i_this) == PROC_OVERLAP7) + if (fpcM_GetProfName(i_this) == fpcNm_OVERLAP0_e || fpcM_GetProfName(i_this) == fpcNm_OVERLAP7_e) { if (dComIfGp_isEnableNextStage() == 1) { var_r30 = dComIfGp_getNextStageWipeSpeed(); @@ -87,8 +87,8 @@ static int dOvlpFd_FadeIn(overlap1_class* i_this) { } i_this->field_0xd0 = var_r30; - } else if (fpcM_GetProfName(i_this) == PROC_OVERLAP10 || - fpcM_GetProfName(i_this) == PROC_OVERLAP11) + } else if (fpcM_GetProfName(i_this) == fpcNm_OVERLAP10_e || + fpcM_GetProfName(i_this) == fpcNm_OVERLAP11_e) { i_this->field_0xd0 = 1; } else { @@ -133,113 +133,113 @@ static leafdraw_method_class l_dOvlpFd_Method = { }; overlap_process_profile_definition g_profile_OVERLAP0 = { - fpcLy_ROOT_e, - 0, - fpcPi_CURRENT_e, - PROC_OVERLAP0, - &g_fpcLf_Method.base, - sizeof(overlap1_class), - 0, - 0, - &g_fopOvlp_Method, - 773, - &l_dOvlpFd_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 0, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP0_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(overlap1_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP0_e, + /* Fade SubMtd */ &l_dOvlpFd_Method, }; overlap_process_profile_definition g_profile_OVERLAP1 = { - fpcLy_ROOT_e, - 0, - fpcPi_CURRENT_e, - PROC_OVERLAP1, - &g_fpcLf_Method.base, - sizeof(overlap1_class), - 0, - 0, - &g_fopOvlp_Method, - 774, - &l_dOvlpFd_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 0, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP1_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(overlap1_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP1_e, + /* Fade SubMtd */ &l_dOvlpFd_Method, }; overlap_process_profile_definition g_profile_OVERLAP6 = { - fpcLy_ROOT_e, - 0, - fpcPi_CURRENT_e, - PROC_OVERLAP6, - &g_fpcLf_Method.base, - sizeof(overlap1_class), - 0, - 0, - &g_fopOvlp_Method, - 777, - &l_dOvlpFd_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 0, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP6_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(overlap1_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP6_e, + /* Fade SubMtd */ &l_dOvlpFd_Method, }; overlap_process_profile_definition g_profile_OVERLAP7 = { - fpcLy_ROOT_e, - 0, - fpcPi_CURRENT_e, - PROC_OVERLAP7, - &g_fpcLf_Method.base, - sizeof(overlap1_class), - 0, - 0, - &g_fopOvlp_Method, - 778, - &l_dOvlpFd_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 0, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP7_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(overlap1_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP7_e, + /* Fade SubMtd */ &l_dOvlpFd_Method, }; overlap_process_profile_definition g_profile_OVERLAP8 = { - fpcLy_ROOT_e, - 0, - fpcPi_CURRENT_e, - PROC_OVERLAP8, - &g_fpcLf_Method.base, - sizeof(overlap1_class), - 0, - 0, - &g_fopOvlp_Method, - 779, - &l_dOvlpFd_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 0, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP8_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(overlap1_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP8_e, + /* Fade SubMtd */ &l_dOvlpFd_Method, }; overlap_process_profile_definition g_profile_OVERLAP9 = { - fpcLy_ROOT_e, - 0, - fpcPi_CURRENT_e, - PROC_OVERLAP9, - &g_fpcLf_Method.base, - sizeof(overlap1_class), - 0, - 0, - &g_fopOvlp_Method, - 780, - &l_dOvlpFd_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 0, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP9_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(overlap1_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP9_e, + /* Fade SubMtd */ &l_dOvlpFd_Method, }; overlap_process_profile_definition g_profile_OVERLAP10 = { - fpcLy_ROOT_e, - 0, - fpcPi_CURRENT_e, - PROC_OVERLAP10, - &g_fpcLf_Method.base, - sizeof(overlap1_class), - 0, - 0, - &g_fopOvlp_Method, - 781, - &l_dOvlpFd_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 0, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP10_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(overlap1_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP10_e, + /* Fade SubMtd */ &l_dOvlpFd_Method, }; overlap_process_profile_definition g_profile_OVERLAP11 = { - fpcLy_ROOT_e, - 0, - fpcPi_CURRENT_e, - PROC_OVERLAP11, - &g_fpcLf_Method.base, - sizeof(overlap1_class), - 0, - 0, - &g_fopOvlp_Method, - 782, - &l_dOvlpFd_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 0, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP11_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(overlap1_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP11_e, + /* Fade SubMtd */ &l_dOvlpFd_Method, }; diff --git a/src/d/d_ovlp_fade2.cpp b/src/d/d_ovlp_fade2.cpp index f10c188a7f..4dbd84bd0f 100644 --- a/src/d/d_ovlp_fade2.cpp +++ b/src/d/d_ovlp_fade2.cpp @@ -245,15 +245,15 @@ static leafdraw_method_class l_dOvlpFd2_Method = { }; overlap_process_profile_definition g_profile_OVERLAP2 = { - fpcLy_ROOT_e, - 2, - fpcPi_CURRENT_e, - PROC_OVERLAP2, - &g_fpcLf_Method.base, - sizeof(dOvlpFd2_c), - 0, - 0, - &g_fopOvlp_Method, - 775, - &l_dOvlpFd2_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 2, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dOvlpFd2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP2_e, + /* Fade SubMtd */ &l_dOvlpFd2_Method, }; diff --git a/src/d/d_ovlp_fade3.cpp b/src/d/d_ovlp_fade3.cpp index 5221c28b83..80c7fcf663 100644 --- a/src/d/d_ovlp_fade3.cpp +++ b/src/d/d_ovlp_fade3.cpp @@ -243,15 +243,15 @@ static leafdraw_method_class l_dOvlpFd3_Method = { }; overlap_process_profile_definition g_profile_OVERLAP3 = { - fpcLy_ROOT_e, - 0, - fpcPi_CURRENT_e, - PROC_OVERLAP3, - &g_fpcLf_Method.base, - sizeof(dOvlpFd3_c), - 0, - 0, - &g_fopOvlp_Method, - 776, - &l_dOvlpFd3_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 0, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP3_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dOvlpFd3_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP3_e, + /* Fade SubMtd */ &l_dOvlpFd3_Method, }; diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp index 8220d92bb5..9ce746b35e 100644 --- a/src/d/d_s_logo.cpp +++ b/src/d/d_s_logo.cpp @@ -164,20 +164,20 @@ static execFunc l_execFunc[] = { }; static s16 const l_preLoad_dylKeyTbl[14] = { - PROC_BG, - PROC_DEMO00, - PROC_NBOMB, - PROC_SPINNER, - PROC_Obj_LifeContainer, - PROC_CROD, - PROC_DISAPPEAR, - PROC_Tag_Attp, - PROC_MG_ROD, - PROC_BOOMERANG, - PROC_ARROW, - PROC_SUSPEND, - PROC_MIDNA, - PROC_Obj_Yousei, + fpcNm_BG_e, + fpcNm_DEMO00_e, + fpcNm_NBOMB_e, + fpcNm_SPINNER_e, + fpcNm_Obj_LifeContainer_e, + fpcNm_CROD_e, + fpcNm_DISAPPEAR_e, + fpcNm_Tag_Attp_e, + fpcNm_MG_ROD_e, + fpcNm_BOOMERANG_e, + fpcNm_ARROW_e, + fpcNm_SUSPEND_e, + fpcNm_MIDNA_e, + fpcNm_Obj_Yousei_e, }; bool dScnLogo_c::preLoad_dyl() { @@ -751,10 +751,10 @@ void dScnLogo_c::nextSceneChange() { if (!mDoRst::isReset()) { if (!isOpeningCut()) { - dComIfG_changeOpeningScene(this, PROC_OPENING_SCENE); + dComIfG_changeOpeningScene(this, fpcNm_OPENING_SCENE_e); } else { #if DEBUG - fopScnM_ChangeReq(this, PROC_MENU_SCENE, 0, 30); + fopScnM_ChangeReq(this, fpcNm_MENU_SCENE_e, 0, 30); dComIfGs_init(); dComIfG_playerStatusD(); return; @@ -1461,7 +1461,7 @@ static int dScnLogo_Execute(dScnLogo_c* i_this) { fpc_ProcID id = fpcM_GetID(i_this); if (mDoRst::isReset()) { - fopScnM_ChangeReq(i_this, PROC_LOGO_SCENE, 0, 5); + fopScnM_ChangeReq(i_this, fpcNm_LOGO_SCENE_e, 0, 5); } return 1; @@ -1625,15 +1625,15 @@ static scene_method_class l_dScnLogo_Method = { }; scene_process_profile_definition g_profile_LOGO_SCENE = { - fpcLy_ROOT_e, - 1, - fpcPi_CURRENT_e, - PROC_LOGO_SCENE, - &g_fpcNd_Method.base, - sizeof(dScnLogo_c), - 0, - 0, - &g_fopScn_Method.base, - &l_dScnLogo_Method, - 0, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_LOGO_SCENE_e, + /* Proc SubMtd */ &g_fpcNd_Method.base, + /* Size */ sizeof(dScnLogo_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopScn_Method.base, + /* Scene SubMtd */ &l_dScnLogo_Method, + 0, }; diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp index be1d61035a..34f02908bb 100644 --- a/src/d/d_s_menu.cpp +++ b/src/d/d_s_menu.cpp @@ -217,19 +217,19 @@ u8 dSm_read_presettxt(u8* i_data) { OS_REPORT("\nsword[%d]", value); switch (value) { case 0: - dMeter2Info_setSword(fpcNm_ITEM_NONE, false); + dMeter2Info_setSword(dItemNo_NONE_e, false); break; case 1: - dMeter2Info_setSword(fpcNm_ITEM_SWORD, false); + dMeter2Info_setSword(dItemNo_SWORD_e, false); break; case 2: - dMeter2Info_setSword(fpcNm_ITEM_MASTER_SWORD, false); + dMeter2Info_setSword(dItemNo_MASTER_SWORD_e, false); break; case 3: - dMeter2Info_setSword(fpcNm_ITEM_WOOD_STICK, false); + dMeter2Info_setSword(dItemNo_WOOD_STICK_e, false); break; case 4: - dMeter2Info_setSword(fpcNm_ITEM_LIGHT_SWORD, false); + dMeter2Info_setSword(dItemNo_LIGHT_SWORD_e, false); break; } } @@ -243,16 +243,16 @@ u8 dSm_read_presettxt(u8* i_data) { OS_REPORT("\nshield[%d]", value); switch (value) { case 0: - dMeter2Info_setShield(fpcNm_ITEM_NONE, false); + dMeter2Info_setShield(dItemNo_NONE_e, false); break; case 1: - dMeter2Info_setShield(fpcNm_ITEM_WOOD_SHIELD, false); + dMeter2Info_setShield(dItemNo_WOOD_SHIELD_e, false); break; case 2: - dMeter2Info_setShield(fpcNm_ITEM_SHIELD, false); + dMeter2Info_setShield(dItemNo_SHIELD_e, false); break; case 3: - dMeter2Info_setShield(fpcNm_ITEM_HYLIA_SHIELD, false); + dMeter2Info_setShield(dItemNo_HYLIA_SHIELD_e, false); break; } } @@ -266,10 +266,10 @@ u8 dSm_read_presettxt(u8* i_data) { OS_REPORT("\nboomerang[%d]", value); switch (value) { case 0: - dScnMenu_setItem(SLOT_0, fpcNm_ITEM_NONE); + dScnMenu_setItem(SLOT_0, dItemNo_NONE_e); break; case 1: - dScnMenu_setItem(SLOT_0, fpcNm_ITEM_BOOMERANG); + dScnMenu_setItem(SLOT_0, dItemNo_BOOMERANG_e); break; } } @@ -282,13 +282,13 @@ u8 dSm_read_presettxt(u8* i_data) { } else { OS_REPORT("\nbow max[%d]", value); if (value == 0) { - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_NONE); + dScnMenu_setItem(SLOT_4, dItemNo_NONE_e); } else if (value <= 10) { - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_ARROW_10); + dScnMenu_setItem(SLOT_4, dItemNo_ARROW_10_e); } else if (value <= 20) { - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_ARROW_20); + dScnMenu_setItem(SLOT_4, dItemNo_ARROW_20_e); } else { - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_ARROW_30); + dScnMenu_setItem(SLOT_4, dItemNo_ARROW_30_e); } dComIfGs_setArrowMax(value); } @@ -309,7 +309,7 @@ u8 dSm_read_presettxt(u8* i_data) { error = 1; } else if (value == 1) { OS_REPORT("\narror-fire[%d]", value); - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_LIGHT_ARROW); + dScnMenu_setItem(SLOT_4, dItemNo_LIGHT_ARROW_e); } } else if (dSm_read_comp_keyword(pos, i_data, "arrow-light", 11) == 0) { value = dSm_read_get_number(i_data, &pos); @@ -319,7 +319,7 @@ u8 dSm_read_presettxt(u8* i_data) { error = 1; } else if (value == 1) { OS_REPORT("\narror-light[%d]", value); - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_LIGHT_ARROW); + dScnMenu_setItem(SLOT_4, dItemNo_LIGHT_ARROW_e); } } else if (dSm_read_comp_keyword(pos, i_data, "bomb", 4) == 0) { value = dSm_read_get_number(i_data, &pos); @@ -330,10 +330,10 @@ u8 dSm_read_presettxt(u8* i_data) { } else { OS_REPORT("\nbomb max [%d]", value); if (value == 0) { - dScnMenu_setItem(SLOT_15, fpcNm_ITEM_NONE); + dScnMenu_setItem(SLOT_15, dItemNo_NONE_e); dComIfGs_setBombMax(value); } else { - dScnMenu_setItem(SLOT_15, fpcNm_ITEM_BOMB_BAG_LV1); + dScnMenu_setItem(SLOT_15, dItemNo_BOMB_BAG_LV1_e); dComIfGs_setBombMax(value); } } @@ -356,7 +356,7 @@ u8 dSm_read_presettxt(u8* i_data) { OS_REPORT("\nbottle [%d]", value); if (value <= 4) { for (int i = 0; i < value; i++) { - dScnMenu_setItem((u8)(i + SLOT_11), fpcNm_ITEM_EMPTY_BOTTLE); + dScnMenu_setItem((u8)(i + SLOT_11), dItemNo_EMPTY_BOTTLE_e); } } } @@ -768,7 +768,7 @@ int toGameScene(dScnMenu_c* i_this) { dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[550]); /* Secret techniques - Obtained 1 secret techinques - Shield attack */ dComIfGs_offEventBit(dSv_event_flag_c::F_0338); - rt = fopScnM_ChangeReq(i_this, PROC_PLAY_SCENE, 0, 5); + rt = fopScnM_ChangeReq(i_this, fpcNm_PLAY_SCENE_e, 0, 5); dComIfGs_init(); dComIfGp_offEnableNextStage(); daNpcMsg_setEvtNum(7); @@ -788,7 +788,7 @@ int toGameScene(dScnMenu_c* i_this) { g_env_light.light_mask_type = (u8)(g_env_light.light_mask_type | 0xF0); } - rt = fopScnM_ChangeReq(i_this, PROC_PLAY_SCENE, 0, 5); + rt = fopScnM_ChangeReq(i_this, fpcNm_PLAY_SCENE_e, 0, 5); dComIfGs_setRestartRoomParam(0); } @@ -840,30 +840,30 @@ void setEnvData(menu_data_class* i_data) { dComIfGs_onDarkClearLV(4); } else if (memcmp(&i_data->env_data[i], "剣無", 4) == 0) { // "No Sword" - dMeter2Info_setSword(fpcNm_ITEM_NONE, false); - dComIfGs_offItemFirstBit(fpcNm_ITEM_WOOD_STICK); - dComIfGs_offItemFirstBit(fpcNm_ITEM_SWORD); - dComIfGs_offItemFirstBit(fpcNm_ITEM_MASTER_SWORD); - dComIfGs_offItemFirstBit(fpcNm_ITEM_LIGHT_SWORD); - dMeter2Info_setShield(fpcNm_ITEM_NONE, false); - dComIfGs_offItemFirstBit(fpcNm_ITEM_SHIELD); - dComIfGs_offItemFirstBit(fpcNm_ITEM_WOOD_SHIELD); - dComIfGs_offItemFirstBit(fpcNm_ITEM_HYLIA_SHIELD); + dMeter2Info_setSword(dItemNo_NONE_e, false); + dComIfGs_offItemFirstBit(dItemNo_WOOD_STICK_e); + dComIfGs_offItemFirstBit(dItemNo_SWORD_e); + dComIfGs_offItemFirstBit(dItemNo_MASTER_SWORD_e); + dComIfGs_offItemFirstBit(dItemNo_LIGHT_SWORD_e); + dMeter2Info_setShield(dItemNo_NONE_e, false); + dComIfGs_offItemFirstBit(dItemNo_SHIELD_e); + dComIfGs_offItemFirstBit(dItemNo_WOOD_SHIELD_e); + dComIfGs_offItemFirstBit(dItemNo_HYLIA_SHIELD_e); } else if (memcmp(&i_data->env_data[i], "神剣", 4) == 0) { // "Master Sword" - dMeter2Info_setSword(fpcNm_ITEM_MASTER_SWORD, false); - dComIfGs_onItemFirstBit(fpcNm_ITEM_WOOD_STICK); - dComIfGs_onItemFirstBit(fpcNm_ITEM_SWORD); - dComIfGs_onItemFirstBit(fpcNm_ITEM_MASTER_SWORD); - dComIfGs_onItemFirstBit(fpcNm_ITEM_LIGHT_SWORD); + dMeter2Info_setSword(dItemNo_MASTER_SWORD_e, false); + dComIfGs_onItemFirstBit(dItemNo_WOOD_STICK_e); + dComIfGs_onItemFirstBit(dItemNo_SWORD_e); + dComIfGs_onItemFirstBit(dItemNo_MASTER_SWORD_e); + dComIfGs_onItemFirstBit(dItemNo_LIGHT_SWORD_e); } else if (memcmp(&i_data->env_data[i], "木刀", 4) == 0) { // "Wooden Sword" - dMeter2Info_setSword(fpcNm_ITEM_WOOD_STICK, false); - dComIfGs_onItemFirstBit(fpcNm_ITEM_WOOD_STICK); - dMeter2Info_setShield(fpcNm_ITEM_NONE, false); - dComIfGs_offItemFirstBit(fpcNm_ITEM_SHIELD); - dComIfGs_offItemFirstBit(fpcNm_ITEM_WOOD_SHIELD); - dComIfGs_offItemFirstBit(fpcNm_ITEM_HYLIA_SHIELD); + dMeter2Info_setSword(dItemNo_WOOD_STICK_e, false); + dComIfGs_onItemFirstBit(dItemNo_WOOD_STICK_e); + dMeter2Info_setShield(dItemNo_NONE_e, false); + dComIfGs_offItemFirstBit(dItemNo_SHIELD_e); + dComIfGs_offItemFirstBit(dItemNo_WOOD_SHIELD_e); + dComIfGs_offItemFirstBit(dItemNo_HYLIA_SHIELD_e); } else if (memcmp(&i_data->env_data[i], "童", 2) == 0) { // "Child" if (g_playerKind == 0) { @@ -880,8 +880,8 @@ void setEnvData(menu_data_class* i_data) { // "Green Tunic" if (g_playerKind == 0) { g_playerKind = 3; - dMeter2Info_setSword(fpcNm_ITEM_SWORD, false); - dMeter2Info_setShield(fpcNm_ITEM_HYLIA_SHIELD, false); + dMeter2Info_setSword(dItemNo_SWORD_e, false); + dMeter2Info_setShield(dItemNo_HYLIA_SHIELD_e, false); } } else if (memcmp(&i_data->env_data[i], "SET", 3) == 0 && i_data->env_data[i + 3] >= '0' && i_data->env_data[i + 3] <= '9') @@ -1023,17 +1023,17 @@ void setEnvData(menu_data_class* i_data) { i--; } else if (memcmp(&i_data->env_data[i], "鉄靴", 4) == 0) { // "Iron Boots" - dScnMenu_setItem(SLOT_3, fpcNm_ITEM_HVY_BOOTS); + dScnMenu_setItem(SLOT_3, dItemNo_HVY_BOOTS_e); dComIfGs_setSelectItemIndex(SELECT_ITEM_Y, SLOT_3); } else if (memcmp(&i_data->env_data[i], "水服", 4) == 0) { // "Water Tunic" - dMeter2Info_setCloth(fpcNm_ITEM_WEAR_ZORA, false); + dMeter2Info_setCloth(dItemNo_WEAR_ZORA_e, false); } else if (memcmp(&i_data->env_data[i], "(初)", 4) == 0 || memcmp(&i_data->env_data[i], "（初）", 6) == 0) { // "(First)" dComIfGs_offGetMagicUseFlag(); - dComIfGs_offItemFirstBit(fpcNm_ITEM_BOW); + dComIfGs_offItemFirstBit(dItemNo_BOW_e); } else if (memcmp(&i_data->env_data[i], "ミドナ瀕死", 10) == 0) { // "Midna Dying" dComIfGs_onDarkClearLV(0); @@ -1331,7 +1331,7 @@ block_24: if (g_presetHIO.field_0x2717 == 2) { g_presetHIO.field_0x2717 = 0; dSm_read_stageset(g_presetHIO.mPresetData); - fopScnM_ChangeReq(i_this, PROC_MENU_SCENE, 0, 5); + fopScnM_ChangeReq(i_this, fpcNm_MENU_SCENE_e, 0, 5); } else { dScnMenu_c::cursolStageName[0] = 0; toGameScene(i_this); @@ -1655,7 +1655,7 @@ int dScnMenu_Create(scene_class* i_this) { void dScnMenu_setItem(int i_slotNo, u8 i_itemNo) { dComIfGs_setItem(i_slotNo, i_itemNo); - if (i_itemNo != fpcNm_ITEM_NONE) { + if (i_itemNo != dItemNo_NONE_e) { dComIfGs_onItemFirstBit(i_itemNo); } } @@ -1663,8 +1663,8 @@ void dScnMenu_setItem(int i_slotNo, u8 i_itemNo) { void dScnMenu_setPlayerDebugMode() { if (mDoCPd_c::isConnect(PAD_3) || !dScnMenu_setPlayerDebugModeDungeon()) { if (strcmp(dComIfGp_getNextStageName(), "D_MN05") == 0) { - dScnMenu_setItem(SLOT_11, fpcNm_ITEM_EMPTY_BOTTLE); - dScnMenu_setItem(SLOT_12, fpcNm_ITEM_RED_BOTTLE); + dScnMenu_setItem(SLOT_11, dItemNo_EMPTY_BOTTLE_e); + dScnMenu_setItem(SLOT_12, dItemNo_RED_BOTTLE_e); dComIfGs_setSelectItemIndex(SELECT_ITEM_X, SLOT_11); dComIfGs_setSelectItemIndex(SELECT_ITEM_Y, SLOT_12); dComIfGs_setRupee(0); @@ -1674,36 +1674,36 @@ void dScnMenu_setPlayerDebugMode() { strcmp(dComIfGp_getNextStageName(), "D_MN04A") == 0) { for (int i = 0x17; i >= 0; i--) { - dScnMenu_setItem(i, fpcNm_ITEM_NONE); + dScnMenu_setItem(i, dItemNo_NONE_e); } for (int i = 0; i < 0x100; i++) { dComIfGs_offItemFirstBit(i); } - dComIfGs_onItemFirstBit(fpcNm_ITEM_L2_KEY_PIECES1); - dComIfGs_onItemFirstBit(fpcNm_ITEM_L2_KEY_PIECES2); - dComIfGs_onItemFirstBit(fpcNm_ITEM_L2_KEY_PIECES3); - dComIfGs_onItemFirstBit(fpcNm_ITEM_LV2_BOSS_KEY); - dComIfGs_onItemFirstBit(fpcNm_ITEM_BOW); - dComIfGs_onItemFirstBit(fpcNm_ITEM_HOOKSHOT); - dComIfGs_onItemFirstBit(fpcNm_ITEM_BOOMERANG); - dComIfGs_onItemFirstBit(fpcNm_ITEM_RED_BOTTLE); - dComIfGs_onItemFirstBit(fpcNm_ITEM_OIL_BOTTLE); - dComIfGs_onItemFirstBit(fpcNm_ITEM_FAIRY); - dComIfGs_onItemFirstBit(fpcNm_ITEM_KANTERA); - dComIfGs_onItemFirstBit(fpcNm_ITEM_PACHINKO); - dComIfGs_onItemFirstBit(fpcNm_ITEM_HVY_BOOTS); + dComIfGs_onItemFirstBit(dItemNo_L2_KEY_PIECES1_e); + dComIfGs_onItemFirstBit(dItemNo_L2_KEY_PIECES2_e); + dComIfGs_onItemFirstBit(dItemNo_L2_KEY_PIECES3_e); + dComIfGs_onItemFirstBit(dItemNo_LV2_BOSS_KEY_e); + dComIfGs_onItemFirstBit(dItemNo_BOW_e); + dComIfGs_onItemFirstBit(dItemNo_HOOKSHOT_e); + dComIfGs_onItemFirstBit(dItemNo_BOOMERANG_e); + dComIfGs_onItemFirstBit(dItemNo_RED_BOTTLE_e); + dComIfGs_onItemFirstBit(dItemNo_OIL_BOTTLE_e); + dComIfGs_onItemFirstBit(dItemNo_FAIRY_e); + dComIfGs_onItemFirstBit(dItemNo_KANTERA_e); + dComIfGs_onItemFirstBit(dItemNo_PACHINKO_e); + dComIfGs_onItemFirstBit(dItemNo_HVY_BOOTS_e); - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_BOW); - dScnMenu_setItem(SLOT_9, fpcNm_ITEM_HOOKSHOT); - dScnMenu_setItem(SLOT_0, fpcNm_ITEM_BOOMERANG); - dScnMenu_setItem(SLOT_13, fpcNm_ITEM_FAIRY); - dScnMenu_setItem(SLOT_12, fpcNm_ITEM_OIL_BOTTLE); - dScnMenu_setItem(SLOT_11, fpcNm_ITEM_RED_BOTTLE); - dScnMenu_setItem(SLOT_1, fpcNm_ITEM_KANTERA); - dScnMenu_setItem(SLOT_23, fpcNm_ITEM_PACHINKO); - dScnMenu_setItem(SLOT_3, fpcNm_ITEM_HVY_BOOTS); + dScnMenu_setItem(SLOT_4, dItemNo_BOW_e); + dScnMenu_setItem(SLOT_9, dItemNo_HOOKSHOT_e); + dScnMenu_setItem(SLOT_0, dItemNo_BOOMERANG_e); + dScnMenu_setItem(SLOT_13, dItemNo_FAIRY_e); + dScnMenu_setItem(SLOT_12, dItemNo_OIL_BOTTLE_e); + dScnMenu_setItem(SLOT_11, dItemNo_RED_BOTTLE_e); + dScnMenu_setItem(SLOT_1, dItemNo_KANTERA_e); + dScnMenu_setItem(SLOT_23, dItemNo_PACHINKO_e); + dScnMenu_setItem(SLOT_3, dItemNo_HVY_BOOTS_e); dComIfGs_setMixItemIndex(SELECT_ITEM_X, 0xFF); dComIfGs_setMixItemIndex(SELECT_ITEM_Y, 0xFF); @@ -1731,15 +1731,15 @@ void dScnMenu_setPlayerDebugMode() { dMeter2Info_onTempBit(0); } } else if (strcmp(dComIfGp_getNextStageName(), "R_SP107") == 0) { - dMeter2Info_setSword(fpcNm_ITEM_NONE, false); - dMeter2Info_setShield(fpcNm_ITEM_NONE, false); + dMeter2Info_setSword(dItemNo_NONE_e, false); + dMeter2Info_setShield(dItemNo_NONE_e, false); } else if (dMeter2Info_isNextStage("F_SP102", 0, 0, 0) == 0) { if (strcmp(dComIfGp_getNextStageName(), "D_MN01A") == 0) { - dScnMenu_setItem(SLOT_9, fpcNm_ITEM_HOOKSHOT); - dScnMenu_setItem(SLOT_3, fpcNm_ITEM_HVY_BOOTS); + dScnMenu_setItem(SLOT_9, dItemNo_HOOKSHOT_e); + dScnMenu_setItem(SLOT_3, dItemNo_HVY_BOOTS_e); dComIfGs_setSelectItemIndex(SELECT_ITEM_X, SLOT_9); dComIfGs_setSelectItemIndex(SELECT_ITEM_Y, SLOT_3); - dMeter2Info_setCloth(fpcNm_ITEM_WEAR_ZORA, false); + dMeter2Info_setCloth(dItemNo_WEAR_ZORA_e, false); } } } @@ -1747,23 +1747,23 @@ void dScnMenu_setPlayerDebugMode() { void dScnMenu_setPlayerItemReset() { for (int i = 23; i >= 0; i--) { - dScnMenu_setItem(i, fpcNm_ITEM_NONE); + dScnMenu_setItem(i, dItemNo_NONE_e); } for (int i = 0; i < 0x100; i++) { dComIfGs_offItemFirstBit(i); } - dComIfGs_onItemFirstBit(fpcNm_ITEM_SWORD); - dComIfGs_onItemFirstBit(fpcNm_ITEM_MASTER_SWORD); - dComIfGs_onItemFirstBit(fpcNm_ITEM_WOOD_STICK); - dComIfGs_offItemFirstBit(fpcNm_ITEM_LIGHT_SWORD); - dComIfGs_onItemFirstBit(fpcNm_ITEM_SHIELD); - dComIfGs_onItemFirstBit(fpcNm_ITEM_HYLIA_SHIELD); - dComIfGs_onItemFirstBit(fpcNm_ITEM_WEAR_CASUAL); - dComIfGs_onItemFirstBit(fpcNm_ITEM_WEAR_KOKIRI); - dComIfGs_onItemFirstBit(fpcNm_ITEM_ARMOR); - dComIfGs_onItemFirstBit(fpcNm_ITEM_WEAR_ZORA); + dComIfGs_onItemFirstBit(dItemNo_SWORD_e); + dComIfGs_onItemFirstBit(dItemNo_MASTER_SWORD_e); + dComIfGs_onItemFirstBit(dItemNo_WOOD_STICK_e); + dComIfGs_offItemFirstBit(dItemNo_LIGHT_SWORD_e); + dComIfGs_onItemFirstBit(dItemNo_SHIELD_e); + dComIfGs_onItemFirstBit(dItemNo_HYLIA_SHIELD_e); + dComIfGs_onItemFirstBit(dItemNo_WEAR_CASUAL_e); + dComIfGs_onItemFirstBit(dItemNo_WEAR_KOKIRI_e); + dComIfGs_onItemFirstBit(dItemNo_ARMOR_e); + dComIfGs_onItemFirstBit(dItemNo_WEAR_ZORA_e); dComIfGs_setMixItemIndex(SELECT_ITEM_X, 0xFF); dComIfGs_setSelectItemIndex(SELECT_ITEM_X, 0xFF); @@ -1778,10 +1778,10 @@ void dScnMenu_setPlayerItemReset() { bool dScnMenu_setPlayerDebugModeDungeon() { if (strcmp(dComIfGp_getNextStageName(), "D_MN05") == 0) { dScnMenu_setPlayerItemReset(); - dScnMenu_setItem(SLOT_1, fpcNm_ITEM_KANTERA); - dScnMenu_setItem(SLOT_23, fpcNm_ITEM_PACHINKO); - dScnMenu_setItem(SLOT_11, fpcNm_ITEM_OIL_BOTTLE); - dScnMenu_setItem(SLOT_12, fpcNm_ITEM_RED_BOTTLE); + dScnMenu_setItem(SLOT_1, dItemNo_KANTERA_e); + dScnMenu_setItem(SLOT_23, dItemNo_PACHINKO_e); + dScnMenu_setItem(SLOT_11, dItemNo_OIL_BOTTLE_e); + dScnMenu_setItem(SLOT_12, dItemNo_RED_BOTTLE_e); dComIfGs_setSelectItemIndex(SELECT_ITEM_X, SLOT_11); dComIfGs_setSelectItemIndex(SELECT_ITEM_Y, SLOT_12); dComIfGs_setMaxLife(20); @@ -1792,14 +1792,14 @@ bool dScnMenu_setPlayerDebugModeDungeon() { strcmp(dComIfGp_getNextStageName(), "D_MN04A") == 0) { dScnMenu_setPlayerItemReset(); - dScnMenu_setItem(SLOT_0, fpcNm_ITEM_BOOMERANG); - dScnMenu_setItem(SLOT_1, fpcNm_ITEM_KANTERA); - dScnMenu_setItem(SLOT_23, fpcNm_ITEM_PACHINKO); - dScnMenu_setItem(SLOT_3, fpcNm_ITEM_HVY_BOOTS); - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_BOW); - dScnMenu_setItem(SLOT_15, fpcNm_ITEM_NORMAL_BOMB); - dScnMenu_setItem(SLOT_11, fpcNm_ITEM_OIL_BOTTLE); - dScnMenu_setItem(SLOT_12, fpcNm_ITEM_RED_BOTTLE); + dScnMenu_setItem(SLOT_0, dItemNo_BOOMERANG_e); + dScnMenu_setItem(SLOT_1, dItemNo_KANTERA_e); + dScnMenu_setItem(SLOT_23, dItemNo_PACHINKO_e); + dScnMenu_setItem(SLOT_3, dItemNo_HVY_BOOTS_e); + dScnMenu_setItem(SLOT_4, dItemNo_BOW_e); + dScnMenu_setItem(SLOT_15, dItemNo_NORMAL_BOMB_e); + dScnMenu_setItem(SLOT_11, dItemNo_OIL_BOTTLE_e); + dScnMenu_setItem(SLOT_12, dItemNo_RED_BOTTLE_e); dComIfGs_setSelectItemIndex(SELECT_ITEM_X, 0); dComIfGs_setSelectItemIndex(SELECT_ITEM_Y, 3); dComIfGs_setMaxLife(25); @@ -1813,15 +1813,15 @@ bool dScnMenu_setPlayerDebugModeDungeon() { strcmp(dComIfGp_getNextStageName(), "D_MN01B") == 0) { dScnMenu_setPlayerItemReset(); - dScnMenu_setItem(SLOT_0, fpcNm_ITEM_BOOMERANG); - dScnMenu_setItem(SLOT_1, fpcNm_ITEM_KANTERA); - dScnMenu_setItem(SLOT_23, fpcNm_ITEM_PACHINKO); - dScnMenu_setItem(SLOT_3, fpcNm_ITEM_HVY_BOOTS); - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_BOW); - dScnMenu_setItem(SLOT_15, fpcNm_ITEM_NORMAL_BOMB); - dScnMenu_setItem(SLOT_16, fpcNm_ITEM_WATER_BOMB); - dScnMenu_setItem(SLOT_11, fpcNm_ITEM_OIL_BOTTLE); - dScnMenu_setItem(SLOT_12, fpcNm_ITEM_RED_BOTTLE); + dScnMenu_setItem(SLOT_0, dItemNo_BOOMERANG_e); + dScnMenu_setItem(SLOT_1, dItemNo_KANTERA_e); + dScnMenu_setItem(SLOT_23, dItemNo_PACHINKO_e); + dScnMenu_setItem(SLOT_3, dItemNo_HVY_BOOTS_e); + dScnMenu_setItem(SLOT_4, dItemNo_BOW_e); + dScnMenu_setItem(SLOT_15, dItemNo_NORMAL_BOMB_e); + dScnMenu_setItem(SLOT_16, dItemNo_WATER_BOMB_e); + dScnMenu_setItem(SLOT_11, dItemNo_OIL_BOTTLE_e); + dScnMenu_setItem(SLOT_12, dItemNo_RED_BOTTLE_e); dComIfGs_setSelectItemIndex(SELECT_ITEM_X, SLOT_16); dComIfGs_setSelectItemIndex(SELECT_ITEM_Y, SLOT_3); dComIfGs_setMaxLife(30); @@ -1836,16 +1836,16 @@ bool dScnMenu_setPlayerDebugModeDungeon() { strcmp(dComIfGp_getNextStageName(), "D_MN10B") == 0) { dScnMenu_setPlayerItemReset(); - dScnMenu_setItem(SLOT_0, fpcNm_ITEM_BOOMERANG); - dScnMenu_setItem(SLOT_1, fpcNm_ITEM_KANTERA); - dScnMenu_setItem(SLOT_23, fpcNm_ITEM_PACHINKO); - dScnMenu_setItem(SLOT_3, fpcNm_ITEM_HVY_BOOTS); - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_BOW); - dScnMenu_setItem(SLOT_9, fpcNm_ITEM_HOOKSHOT); - dScnMenu_setItem(SLOT_15, fpcNm_ITEM_NORMAL_BOMB); - dScnMenu_setItem(SLOT_16, fpcNm_ITEM_WATER_BOMB); - dScnMenu_setItem(SLOT_11, fpcNm_ITEM_GREEN_BOTTLE); - dScnMenu_setItem(SLOT_12, fpcNm_ITEM_RED_BOTTLE); + dScnMenu_setItem(SLOT_0, dItemNo_BOOMERANG_e); + dScnMenu_setItem(SLOT_1, dItemNo_KANTERA_e); + dScnMenu_setItem(SLOT_23, dItemNo_PACHINKO_e); + dScnMenu_setItem(SLOT_3, dItemNo_HVY_BOOTS_e); + dScnMenu_setItem(SLOT_4, dItemNo_BOW_e); + dScnMenu_setItem(SLOT_9, dItemNo_HOOKSHOT_e); + dScnMenu_setItem(SLOT_15, dItemNo_NORMAL_BOMB_e); + dScnMenu_setItem(SLOT_16, dItemNo_WATER_BOMB_e); + dScnMenu_setItem(SLOT_11, dItemNo_GREEN_BOTTLE_e); + dScnMenu_setItem(SLOT_12, dItemNo_RED_BOTTLE_e); dComIfGs_setSelectItemIndex(SELECT_ITEM_X, SLOT_9); dComIfGs_setSelectItemIndex(SELECT_ITEM_Y, SLOT_4); dComIfGs_setMaxLife(40); @@ -1860,17 +1860,17 @@ bool dScnMenu_setPlayerDebugModeDungeon() { strcmp(dComIfGp_getNextStageName(), "D_MN11B") == 0) { dScnMenu_setPlayerItemReset(); - dScnMenu_setItem(SLOT_0, fpcNm_ITEM_BOOMERANG); - dScnMenu_setItem(SLOT_1, fpcNm_ITEM_KANTERA); - dScnMenu_setItem(SLOT_23, fpcNm_ITEM_PACHINKO); - dScnMenu_setItem(SLOT_2, fpcNm_ITEM_SPINNER); - dScnMenu_setItem(SLOT_3, fpcNm_ITEM_HVY_BOOTS); - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_BOW); - dScnMenu_setItem(SLOT_9, fpcNm_ITEM_HOOKSHOT); - dScnMenu_setItem(SLOT_15, fpcNm_ITEM_NORMAL_BOMB); - dScnMenu_setItem(SLOT_16, fpcNm_ITEM_WATER_BOMB); - dScnMenu_setItem(SLOT_11, fpcNm_ITEM_GREEN_BOTTLE); - dScnMenu_setItem(SLOT_12, fpcNm_ITEM_RED_BOTTLE); + dScnMenu_setItem(SLOT_0, dItemNo_BOOMERANG_e); + dScnMenu_setItem(SLOT_1, dItemNo_KANTERA_e); + dScnMenu_setItem(SLOT_23, dItemNo_PACHINKO_e); + dScnMenu_setItem(SLOT_2, dItemNo_SPINNER_e); + dScnMenu_setItem(SLOT_3, dItemNo_HVY_BOOTS_e); + dScnMenu_setItem(SLOT_4, dItemNo_BOW_e); + dScnMenu_setItem(SLOT_9, dItemNo_HOOKSHOT_e); + dScnMenu_setItem(SLOT_15, dItemNo_NORMAL_BOMB_e); + dScnMenu_setItem(SLOT_16, dItemNo_WATER_BOMB_e); + dScnMenu_setItem(SLOT_11, dItemNo_GREEN_BOTTLE_e); + dScnMenu_setItem(SLOT_12, dItemNo_RED_BOTTLE_e); dComIfGs_setSelectItemIndex(SELECT_ITEM_X, SLOT_2); dComIfGs_setSelectItemIndex(SELECT_ITEM_Y, SLOT_12); dComIfGs_setMaxLife(45); @@ -1884,18 +1884,18 @@ bool dScnMenu_setPlayerDebugModeDungeon() { strcmp(dComIfGp_getNextStageName(), "T_MN06") == 0) { dScnMenu_setPlayerItemReset(); - dScnMenu_setItem(SLOT_0, fpcNm_ITEM_BOOMERANG); - dScnMenu_setItem(SLOT_1, fpcNm_ITEM_KANTERA); - dScnMenu_setItem(SLOT_23, fpcNm_ITEM_PACHINKO); - dScnMenu_setItem(SLOT_2, fpcNm_ITEM_SPINNER); - dScnMenu_setItem(SLOT_3, fpcNm_ITEM_HVY_BOOTS); - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_BOW); - dScnMenu_setItem(SLOT_9, fpcNm_ITEM_HOOKSHOT); - dScnMenu_setItem(SLOT_6, fpcNm_ITEM_IRONBALL); - dScnMenu_setItem(SLOT_15, fpcNm_ITEM_NORMAL_BOMB); - dScnMenu_setItem(SLOT_16, fpcNm_ITEM_WATER_BOMB); - dScnMenu_setItem(SLOT_11, fpcNm_ITEM_FAIRY); - dScnMenu_setItem(SLOT_12, fpcNm_ITEM_RED_BOTTLE); + dScnMenu_setItem(SLOT_0, dItemNo_BOOMERANG_e); + dScnMenu_setItem(SLOT_1, dItemNo_KANTERA_e); + dScnMenu_setItem(SLOT_23, dItemNo_PACHINKO_e); + dScnMenu_setItem(SLOT_2, dItemNo_SPINNER_e); + dScnMenu_setItem(SLOT_3, dItemNo_HVY_BOOTS_e); + dScnMenu_setItem(SLOT_4, dItemNo_BOW_e); + dScnMenu_setItem(SLOT_9, dItemNo_HOOKSHOT_e); + dScnMenu_setItem(SLOT_6, dItemNo_IRONBALL_e); + dScnMenu_setItem(SLOT_15, dItemNo_NORMAL_BOMB_e); + dScnMenu_setItem(SLOT_16, dItemNo_WATER_BOMB_e); + dScnMenu_setItem(SLOT_11, dItemNo_FAIRY_e); + dScnMenu_setItem(SLOT_12, dItemNo_RED_BOTTLE_e); dComIfGs_setSelectItemIndex(SELECT_ITEM_X, SLOT_6); dComIfGs_setSelectItemIndex(SELECT_ITEM_Y, SLOT_12); dComIfGs_setMaxLife(50); @@ -1909,19 +1909,19 @@ bool dScnMenu_setPlayerDebugModeDungeon() { strcmp(dComIfGp_getNextStageName(), "T_MN07") == 0) { dScnMenu_setPlayerItemReset(); - dScnMenu_setItem(SLOT_0, fpcNm_ITEM_BOOMERANG); - dScnMenu_setItem(SLOT_1, fpcNm_ITEM_KANTERA); - dScnMenu_setItem(SLOT_23, fpcNm_ITEM_PACHINKO); - dScnMenu_setItem(SLOT_2, fpcNm_ITEM_SPINNER); - dScnMenu_setItem(SLOT_3, fpcNm_ITEM_HVY_BOOTS); - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_BOW); - dScnMenu_setItem(SLOT_9, fpcNm_ITEM_HOOKSHOT); - dScnMenu_setItem(SLOT_6, fpcNm_ITEM_IRONBALL); - dScnMenu_setItem(SLOT_8, fpcNm_ITEM_COPY_ROD); - dScnMenu_setItem(SLOT_15, fpcNm_ITEM_NORMAL_BOMB); - dScnMenu_setItem(SLOT_16, fpcNm_ITEM_WATER_BOMB); - dScnMenu_setItem(SLOT_11, fpcNm_ITEM_GREEN_BOTTLE); - dScnMenu_setItem(SLOT_12, fpcNm_ITEM_RED_BOTTLE); + dScnMenu_setItem(SLOT_0, dItemNo_BOOMERANG_e); + dScnMenu_setItem(SLOT_1, dItemNo_KANTERA_e); + dScnMenu_setItem(SLOT_23, dItemNo_PACHINKO_e); + dScnMenu_setItem(SLOT_2, dItemNo_SPINNER_e); + dScnMenu_setItem(SLOT_3, dItemNo_HVY_BOOTS_e); + dScnMenu_setItem(SLOT_4, dItemNo_BOW_e); + dScnMenu_setItem(SLOT_9, dItemNo_HOOKSHOT_e); + dScnMenu_setItem(SLOT_6, dItemNo_IRONBALL_e); + dScnMenu_setItem(SLOT_8, dItemNo_COPY_ROD_e); + dScnMenu_setItem(SLOT_15, dItemNo_NORMAL_BOMB_e); + dScnMenu_setItem(SLOT_16, dItemNo_WATER_BOMB_e); + dScnMenu_setItem(SLOT_11, dItemNo_GREEN_BOTTLE_e); + dScnMenu_setItem(SLOT_12, dItemNo_RED_BOTTLE_e); dComIfGs_setSelectItemIndex(SELECT_ITEM_X, SLOT_8); dComIfGs_setSelectItemIndex(SELECT_ITEM_Y, SLOT_12); dComIfGs_setMaxLife(55); @@ -1933,20 +1933,20 @@ bool dScnMenu_setPlayerDebugModeDungeon() { dComIfGs_setBombNum(1, 15); } else if (strcmp(dComIfGp_getNextStageName(), "D_MN08") == 0) { dScnMenu_setPlayerItemReset(); - dScnMenu_setItem(SLOT_0, fpcNm_ITEM_BOOMERANG); - dScnMenu_setItem(SLOT_1, fpcNm_ITEM_KANTERA); - dScnMenu_setItem(SLOT_23, fpcNm_ITEM_PACHINKO); - dScnMenu_setItem(SLOT_2, fpcNm_ITEM_SPINNER); - dScnMenu_setItem(SLOT_3, fpcNm_ITEM_HVY_BOOTS); - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_BOW); - dScnMenu_setItem(SLOT_9, fpcNm_ITEM_HOOKSHOT); - dScnMenu_setItem(SLOT_6, fpcNm_ITEM_IRONBALL); - dScnMenu_setItem(SLOT_8, fpcNm_ITEM_COPY_ROD); - dScnMenu_setItem(SLOT_10, fpcNm_ITEM_W_HOOKSHOT); - dScnMenu_setItem(SLOT_15, fpcNm_ITEM_NORMAL_BOMB); - dScnMenu_setItem(SLOT_16, fpcNm_ITEM_WATER_BOMB); - dScnMenu_setItem(SLOT_11, fpcNm_ITEM_BLUE_BOTTLE); - dScnMenu_setItem(SLOT_12, fpcNm_ITEM_RED_BOTTLE); + dScnMenu_setItem(SLOT_0, dItemNo_BOOMERANG_e); + dScnMenu_setItem(SLOT_1, dItemNo_KANTERA_e); + dScnMenu_setItem(SLOT_23, dItemNo_PACHINKO_e); + dScnMenu_setItem(SLOT_2, dItemNo_SPINNER_e); + dScnMenu_setItem(SLOT_3, dItemNo_HVY_BOOTS_e); + dScnMenu_setItem(SLOT_4, dItemNo_BOW_e); + dScnMenu_setItem(SLOT_9, dItemNo_HOOKSHOT_e); + dScnMenu_setItem(SLOT_6, dItemNo_IRONBALL_e); + dScnMenu_setItem(SLOT_8, dItemNo_COPY_ROD_e); + dScnMenu_setItem(SLOT_10, dItemNo_W_HOOKSHOT_e); + dScnMenu_setItem(SLOT_15, dItemNo_NORMAL_BOMB_e); + dScnMenu_setItem(SLOT_16, dItemNo_WATER_BOMB_e); + dScnMenu_setItem(SLOT_11, dItemNo_BLUE_BOTTLE_e); + dScnMenu_setItem(SLOT_12, dItemNo_RED_BOTTLE_e); dComIfGs_setSelectItemIndex(SELECT_ITEM_X, SLOT_10); dComIfGs_setSelectItemIndex(SELECT_ITEM_Y, SLOT_11); dComIfGs_setMaxLife(65); @@ -1958,20 +1958,20 @@ bool dScnMenu_setPlayerDebugModeDungeon() { dComIfGs_setBombNum(1, 15); } else if (strcmp(dComIfGp_getNextStageName(), "D_MN09") == 0) { dScnMenu_setPlayerItemReset(); - dScnMenu_setItem(SLOT_0, fpcNm_ITEM_BOOMERANG); - dScnMenu_setItem(SLOT_1, fpcNm_ITEM_KANTERA); - dScnMenu_setItem(SLOT_23, fpcNm_ITEM_PACHINKO); - dScnMenu_setItem(SLOT_2, fpcNm_ITEM_SPINNER); - dScnMenu_setItem(SLOT_3, fpcNm_ITEM_HVY_BOOTS); - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_BOW); - dScnMenu_setItem(SLOT_9, fpcNm_ITEM_HOOKSHOT); - dScnMenu_setItem(SLOT_6, fpcNm_ITEM_IRONBALL); - dScnMenu_setItem(SLOT_8, fpcNm_ITEM_COPY_ROD); - dScnMenu_setItem(SLOT_10, fpcNm_ITEM_W_HOOKSHOT); - dScnMenu_setItem(SLOT_15, fpcNm_ITEM_NORMAL_BOMB); - dScnMenu_setItem(SLOT_16, fpcNm_ITEM_WATER_BOMB); - dScnMenu_setItem(SLOT_11, fpcNm_ITEM_BLUE_BOTTLE); - dScnMenu_setItem(SLOT_12, fpcNm_ITEM_RED_BOTTLE); + dScnMenu_setItem(SLOT_0, dItemNo_BOOMERANG_e); + dScnMenu_setItem(SLOT_1, dItemNo_KANTERA_e); + dScnMenu_setItem(SLOT_23, dItemNo_PACHINKO_e); + dScnMenu_setItem(SLOT_2, dItemNo_SPINNER_e); + dScnMenu_setItem(SLOT_3, dItemNo_HVY_BOOTS_e); + dScnMenu_setItem(SLOT_4, dItemNo_BOW_e); + dScnMenu_setItem(SLOT_9, dItemNo_HOOKSHOT_e); + dScnMenu_setItem(SLOT_6, dItemNo_IRONBALL_e); + dScnMenu_setItem(SLOT_8, dItemNo_COPY_ROD_e); + dScnMenu_setItem(SLOT_10, dItemNo_W_HOOKSHOT_e); + dScnMenu_setItem(SLOT_15, dItemNo_NORMAL_BOMB_e); + dScnMenu_setItem(SLOT_16, dItemNo_WATER_BOMB_e); + dScnMenu_setItem(SLOT_11, dItemNo_BLUE_BOTTLE_e); + dScnMenu_setItem(SLOT_12, dItemNo_RED_BOTTLE_e); dComIfGs_setSelectItemIndex(SELECT_ITEM_X, SLOT_4); dComIfGs_setSelectItemIndex(SELECT_ITEM_Y, SLOT_12); dComIfGs_setMaxLife(75); @@ -2005,28 +2005,28 @@ static scene_method_class l_dScnMenu_Method = { }; scene_process_profile_definition g_profile_MENU_SCENE = { - fpcLy_ROOT_e, // mLayerID - 1, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_MENU_SCENE, // mProcName - &g_fpcNd_Method.base, // sub_method - sizeof(dScnMenu_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopScn_Method.base, // sub_method - &l_dScnMenu_Method, // mpMtd + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MENU_SCENE_e, + /* Proc SubMtd */ &g_fpcNd_Method.base, + /* Size */ sizeof(dScnMenu_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopScn_Method.base, + /* Scene SubMtd */ &l_dScnMenu_Method, }; #else scene_process_profile_definition g_profile_MENU_SCENE = { - fpcLy_ROOT_e, // mLayerID - 1, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_MENU_SCENE, // mProcName - &g_fpcNd_Method.base, // sub_method - 0, // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopScn_Method.base, // sub_method - NULL, // mpMtd + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MENU_SCENE_e, + /* Proc SubMtd */ &g_fpcNd_Method.base, + /* Size */ 0, + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopScn_Method.base, + /* Scene SubMtd */ NULL, }; #endif diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp index 533da65784..76cb243937 100644 --- a/src/d/d_s_name.cpp +++ b/src/d/d_s_name.cpp @@ -87,7 +87,7 @@ s32 dScnName_c::create() { dFs_c->_create(); - if (fpcM_GetName(this) == PROC_NAME_SCENE) { + if (fpcM_GetName(this) == fpcNm_NAME_SCENE_e) { dFs_c->setUseType(0); #if !PLATFORM_SHIELD @@ -194,7 +194,7 @@ static void setBaseCsrColor(int i_no) { #if VERSION == VERSION_GCN_PAL void dScnName_c::bmg_data_set() { - if (fopAcM_GetName(this) == PROC_NAMEEX_SCENE) { + if (fopAcM_GetName(this) == fpcNm_NAMEEX_SCENE_e) { mBmgStatus = 10; } } @@ -221,7 +221,7 @@ s32 dScnName_c::execute() { #if DEBUG if (!fopOvlpM_IsPeek() && dComIfG_isSceneResetButton()) { - fopScnM_ChangeReq(this, PROC_MENU_SCENE, 0, 5); + fopScnM_ChangeReq(this, fpcNm_MENU_SCENE_e, 0, 5); dComIfGs_init(); dComIfG_playerStatusD(); } @@ -286,7 +286,7 @@ void dScnName_c::FileSelectOpen() { void dScnName_c::FileSelectMain() { dFs_c->_move(); - if (fpcM_GetName(this) == PROC_NAME_SCENE) { + if (fpcM_GetName(this) == fpcNm_NAME_SCENE_e) { FileSelectMainNormal(); } } @@ -337,13 +337,13 @@ void dScnName_c::brightCheck() { mProc = dScnName_PROC_ChangeGameScene; // Reset rupee "first-time collection" flags so the collection cutscene will play again - dComIfGs_offItemFirstBit(fpcNm_ITEM_GREEN_RUPEE); - dComIfGs_offItemFirstBit(fpcNm_ITEM_BLUE_RUPEE); - dComIfGs_offItemFirstBit(fpcNm_ITEM_YELLOW_RUPEE); - dComIfGs_offItemFirstBit(fpcNm_ITEM_RED_RUPEE); - dComIfGs_offItemFirstBit(fpcNm_ITEM_PURPLE_RUPEE); - dComIfGs_offItemFirstBit(fpcNm_ITEM_ORANGE_RUPEE); - dComIfGs_offItemFirstBit(fpcNm_ITEM_SILVER_RUPEE); + dComIfGs_offItemFirstBit(dItemNo_GREEN_RUPEE_e); + dComIfGs_offItemFirstBit(dItemNo_BLUE_RUPEE_e); + dComIfGs_offItemFirstBit(dItemNo_YELLOW_RUPEE_e); + dComIfGs_offItemFirstBit(dItemNo_RED_RUPEE_e); + dComIfGs_offItemFirstBit(dItemNo_PURPLE_RUPEE_e); + dComIfGs_offItemFirstBit(dItemNo_ORANGE_RUPEE_e); + dComIfGs_offItemFirstBit(dItemNo_SILVER_RUPEE_e); } } @@ -354,7 +354,7 @@ void dScnName_c::changeGameScene() { #if DEBUG // Goto Map Select debug menu if opening File 1 with development mode on if (dFs_c->getSelectNum() == 0 && mDoMain::developmentMode) { - fopScnM_ChangeReq(this, PROC_MENU_SCENE, 0, 5); + fopScnM_ChangeReq(this, fpcNm_MENU_SCENE_e, 0, 5); dComIfGs_init(); dComIfG_playerStatusD(); return; @@ -362,9 +362,9 @@ void dScnName_c::changeGameScene() { #endif #if VERSION == VERSION_SHIELD_DEBUG - fopScnM_ChangeReq(this, PROC_PLAY_SCENE, 0, 5); + fopScnM_ChangeReq(this, fpcNm_PLAY_SCENE_e, 0, 5); #else - fopScnM_ChangeReq(this, field_0x41f == 0 ? PROC_PLAY_SCENE : PROC_PLAY_SCENE, 0, 5); + fopScnM_ChangeReq(this, field_0x41f == 0 ? fpcNm_PLAY_SCENE_e : fpcNm_PLAY_SCENE_e, 0, 5); #endif dComIfGp_offEnableNextStage(); @@ -419,29 +419,29 @@ static scene_method_class l_dScnName_Method = { }; scene_process_profile_definition g_profile_NAME_SCENE = { - fpcLy_ROOT_e, - 1, - fpcPi_CURRENT_e, - PROC_NAME_SCENE, - &g_fpcNd_Method.base, - sizeof(dScnName_c), - 0, - 0, - &g_fopScn_Method.base, - &l_dScnName_Method, - 0, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NAME_SCENE_e, + /* Proc SubMtd */ &g_fpcNd_Method.base, + /* Size */ sizeof(dScnName_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopScn_Method.base, + /* Scene SubMtd */ &l_dScnName_Method, + 0, }; scene_process_profile_definition g_profile_NAMEEX_SCENE = { - fpcLy_ROOT_e, - 1, - fpcPi_CURRENT_e, - PROC_NAMEEX_SCENE, - &g_fpcNd_Method.base, - sizeof(dScnName_c), - 0, - 0, - &g_fopScn_Method.base, - &l_dScnName_Method, - 0, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NAMEEX_SCENE_e, + /* Proc SubMtd */ &g_fpcNd_Method.base, + /* Size */ sizeof(dScnName_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopScn_Method.base, + /* Scene SubMtd */ &l_dScnName_Method, + 0, }; diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 818f5d3487..64811ef8e2 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -98,7 +98,7 @@ u8 dScnPly_c::debugPause; #endif static const s16 T_JOINT_dylKeyTbl[1] = { - PROC_COW, + fpcNm_COW_e, }; static const char* T_JOINT_resName[1] = {"Always"}; @@ -464,10 +464,10 @@ static u32 l_usedMemoryBlockSize = 0xFFFFFFFF; static int checkObjectSize(void* i_process, void* i_data) { s16 profname = fpcM_GetProfName(i_process); - if (profname == PROC_BG) { + if (profname == fpcNm_BG_e) { fopAc_ac_c* actor = (fopAc_ac_c*)i_process; *((u32*)i_data) += ((l_usedMemoryBlockSize != 0 && actor->heap == NULL) ? 0 : actor->heap->getHeapSize()) + actor->base.base.profile->process_size; - } else if (profname == PROC_PLAY_SCENE || profname == PROC_ROOM_SCENE) { + } else if (profname == fpcNm_PLAY_SCENE_e || profname == fpcNm_ROOM_SCENE_e) { *((u32*)i_data) += ((base_process_class*)i_process)->profile->process_size; } else if (fopKyM_IsKy(i_process)) { *((u32*)i_data + 1) += ((base_process_class*)i_process)->profile->process_size; @@ -475,10 +475,10 @@ static int checkObjectSize(void* i_process, void* i_data) { fopAc_ac_c* actor = (fopAc_ac_c*)i_process; *((u32*)i_data + 1) += (actor->heap == NULL ? 0 : actor->heap->getHeapSize()) + actor->base.base.profile->process_size; - if (profname == PROC_ALINK) { + if (profname == fpcNm_ALINK_e) { daAlink_c* alink = (daAlink_c*)actor; *((u32*)i_data + 1) += alink->getOtherHeapSize(); - } else if (profname == PROC_MIDNA) { + } else if (profname == fpcNm_MIDNA_e) { daMidna_c* midna = (daMidna_c*)actor; *((u32*)i_data + 1) += midna->getOtherHeapSize(); } @@ -565,7 +565,7 @@ static int dScnPly_Draw(dScnPly_c* i_this) { } #endif - int rt = fopScnM_ChangeReq(i_this, PROC_PLAY_SCENE, l_wipeType[wipe], 5); + int rt = fopScnM_ChangeReq(i_this, fpcNm_PLAY_SCENE_e, l_wipeType[wipe], 5); int hour = dKy_getdaytime_hour(); BOOL isDaytime = (hour >= 6 && hour < 18) ? FALSE : TRUE; @@ -596,7 +596,7 @@ static int dScnPly_Draw(dScnPly_c* i_this) { && !fapGm_HIO_c::isCaptureScreen() #endif ) { - if (fpcM_GetName(i_this) == PROC_PLAY_SCENE) { + if (fpcM_GetName(i_this) == fpcNm_PLAY_SCENE_e) { dComIfGp_getVibration().Run(); } daSus_c::execute(); @@ -633,10 +633,10 @@ static int dScnPly_Draw(dScnPly_c* i_this) { spA = 7; } - fopScnM_ChangeReq(i_this, PROC_MENU_SCENE, spA, 5); + fopScnM_ChangeReq(i_this, fpcNm_MENU_SCENE_e, spA, 5); mDoAud_bgmStop(30); - if (fpcM_GetName(i_this) != PROC_PLAY_SCENE) { + if (fpcM_GetName(i_this) != fpcNm_PLAY_SCENE_e) { dComIfG_playerStatusD(); } } @@ -1013,7 +1013,7 @@ static BOOL heapSizeCheck() { #endif bool dScnPly_c::resetGame() { - if (fpcM_GetName(this) == PROC_OPENING_SCENE) { + if (fpcM_GetName(this) == fpcNm_OPENING_SCENE_e) { if (!dStage_roomControl_c::resetArchiveBank(0)) { return false; } @@ -1138,7 +1138,7 @@ static int phase_1(dScnPly_c* i_this) { dComIfGp_getStartStagePoint() == 3) { dComIfGs_onDarkClearLV(0); - execItemGet(fpcNm_ITEM_WEAR_KOKIRI); + execItemGet(dItemNo_WEAR_KOKIRI_e); } // Stage: Kakariko Village, Room: Kakariko Village else if (!strcmp(dComIfGp_getStartStageName(), "F_SP109") && @@ -1163,8 +1163,8 @@ static int phase_1(dScnPly_c* i_this) { if (!strcmp(dComIfGp_getStartStageName(), "F_SP104") && dComIfGp_getStartStageRoomNo() == 1 && dComIfGp_getStartStagePoint() == 23 && dComIfGp_getStartStageLayer() == 12) { - dComIfGs_onItemFirstBit(fpcNm_ITEM_HORSE_FLUTE); - dComIfGs_setItem(SLOT_21, fpcNm_ITEM_HORSE_FLUTE); + dComIfGs_onItemFirstBit(dItemNo_HORSE_FLUTE_e); + dComIfGs_setItem(SLOT_21, dItemNo_HORSE_FLUTE_e); } if ((u8)dKy_darkworld_stage_check(dComIfGp_getStartStageName(), @@ -1441,17 +1441,17 @@ static int phase_4(dScnPly_c* i_this) { JUT_ASSERT(2709, heap2 != NULL); dComIfGp_setMsgExpHeap(heap2); - if (fpcM_GetName(i_this) == PROC_OPENING_SCENE) { - fopAcM_create(PROC_TITLE, 0, NULL, -1, NULL, NULL, -1); + if (fpcM_GetName(i_this) == fpcNm_OPENING_SCENE_e) { + fopAcM_create(fpcNm_TITLE_e, 0, NULL, -1, NULL, NULL, -1); #if DEBUG g_playerKind = 0; #endif dComIfGs_init(); dComIfGs_setOptPointer(0); dComIfGs_setLife(12); - dMeter2Info_setCloth(fpcNm_ITEM_WEAR_KOKIRI, false); - dMeter2Info_setSword(fpcNm_ITEM_SWORD, false); - dMeter2Info_setShield(fpcNm_ITEM_HYLIA_SHIELD, false); + dMeter2Info_setCloth(dItemNo_WEAR_KOKIRI_e, false); + dMeter2Info_setSword(dItemNo_SWORD_e, false); + dMeter2Info_setShield(dItemNo_HYLIA_SHIELD_e, false); dComIfGs_onEventBit(0x0601); // Epona Tamed } @@ -1605,27 +1605,27 @@ static scene_method_class l_dScnPly_Method = { }; scene_process_profile_definition g_profile_PLAY_SCENE = { - fpcLy_ROOT_e, // mLayerID - 1, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_PLAY_SCENE, // mProcName - &g_fpcNd_Method.base, // sub_method - sizeof(dScnPly_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopScn_Method.base, // sub_method - &l_dScnPly_Method, // mpMtd + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_PLAY_SCENE_e, + /* Proc SubMtd */ &g_fpcNd_Method.base, + /* Size */ sizeof(dScnPly_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopScn_Method.base, + /* Scene SubMtd */ &l_dScnPly_Method, }; scene_process_profile_definition g_profile_OPENING_SCENE = { - fpcLy_ROOT_e, // mLayerID - 1, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OPENING_SCENE, // mProcName - &g_fpcNd_Method.base, // sub_method - sizeof(dScnPly_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopScn_Method.base, // sub_method - &l_dScnPly_Method, // mpMtd + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OPENING_SCENE_e, + /* Proc SubMtd */ &g_fpcNd_Method.base, + /* Size */ sizeof(dScnPly_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopScn_Method.base, + /* Scene SubMtd */ &l_dScnPly_Method, }; diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index 396a032355..0fcdb58ac0 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -123,7 +123,7 @@ static bool setArchiveBank(int i_roomNo) { } static int objectDeleteJugge(void* i_process, void* i_data) { - if (fpcM_GetProfName(i_process) != PROC_BG) { + if (fpcM_GetProfName(i_process) != fpcNm_BG_e) { if (fopAcM_IsActor(i_process)) { #if DEBUG char namebuf[16]; @@ -233,7 +233,7 @@ static bool objectSetCheck(room_of_scene_class* i_this) { } } - fopAcM_create(PROC_BG, roomNo, NULL, -1, NULL, NULL, -1); + fopAcM_create(fpcNm_BG_e, roomNo, NULL, -1, NULL, NULL, -1); dComIfGp_getPEvtManager()->demoInit(); dComIfGp_getPEvtManager()->roomInit(roomNo); dStage_dt_c_roomReLoader(i_this->roomInfo, i_this->roomDt, roomNo); @@ -512,14 +512,14 @@ static scene_method_class l_dScnRoom_Method = { }; scene_process_profile_definition g_profile_ROOM_SCENE = { - fpcLy_CURRENT_e, // mLayerID - 0, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_ROOM_SCENE, // mProcName - &g_fpcNd_Method.base, // sub_method - sizeof(room_of_scene_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopScn_Method.base, // sub_method - &l_dScnRoom_Method, // mpMtd + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ROOM_SCENE_e, + /* Proc SubMtd */ &g_fpcNd_Method.base, + /* Size */ sizeof(room_of_scene_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopScn_Method.base, + /* Scene SubMtd */ &l_dScnRoom_Method, }; diff --git a/src/d/d_s_title.cpp b/src/d/d_s_title.cpp index cf91ed7b17..16a29a437e 100644 --- a/src/d/d_s_title.cpp +++ b/src/d/d_s_title.cpp @@ -10,27 +10,27 @@ #include "f_pc/f_pc_leaf.h" scene_process_profile_definition g_profile_WARNING_SCENE = { - fpcLy_ROOT_e, // mLayerID - 1, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_WARNING_SCENE, // mProcName - &g_fpcNd_Method.base, // sub_method - 0x204, // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopScn_Method.base, // sub_method - NULL, // mpMtd + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_WARNING_SCENE_e, + /* Proc SubMtd */ &g_fpcNd_Method.base, + /* Size */ 0x204, + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopScn_Method.base, + /* Scene SubMtd */ NULL, }; scene_process_profile_definition g_profile_WARNING2_SCENE = { - fpcLy_ROOT_e, // mLayerID - 1, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_WARNING2_SCENE, // mProcName - &g_fpcNd_Method.base, // sub_method - 0x204, // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopScn_Method.base, // sub_method - NULL, // mpMtd + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_WARNING2_SCENE_e, + /* Proc SubMtd */ &g_fpcNd_Method.base, + /* Size */ 0x204, + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopScn_Method.base, + /* Scene SubMtd */ NULL, }; diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index 01bdb19ddf..52daf21404 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -27,12 +27,12 @@ static u8 dSv_item_rename(u8 i_itemNo) { switch (i_itemNo) { - case fpcNm_ITEM_OIL_BOTTLE_2: - return fpcNm_ITEM_OIL_BOTTLE; - case fpcNm_ITEM_RED_BOTTLE_2: - return fpcNm_ITEM_RED_BOTTLE; - case fpcNm_ITEM_OIL2: - return fpcNm_ITEM_OIL; + case dItemNo_OIL_BOTTLE_2_e: + return dItemNo_OIL_BOTTLE_e; + case dItemNo_RED_BOTTLE_2_e: + return dItemNo_RED_BOTTLE_e; + case dItemNo_OIL2_e: + return dItemNo_OIL_e; default: return i_itemNo; } @@ -56,11 +56,11 @@ void dSv_player_status_a_c::init() { mSelectEquip[i] = 0; } - mSelectEquip[COLLECT_CLOTHING] = fpcNm_ITEM_WEAR_CASUAL; - mSelectEquip[COLLECT_SWORD] = fpcNm_ITEM_NONE; - mSelectEquip[COLLECT_SHIELD] = fpcNm_ITEM_NONE; - mSelectEquip[COLLECT_SMELL] = fpcNm_ITEM_NONE; - mSelectEquip[B_BUTTON_ITEM] = fpcNm_ITEM_NONE; + mSelectEquip[COLLECT_CLOTHING] = dItemNo_WEAR_CASUAL_e; + mSelectEquip[COLLECT_SWORD] = dItemNo_NONE_e; + mSelectEquip[COLLECT_SHIELD] = dItemNo_NONE_e; + mSelectEquip[COLLECT_SMELL] = dItemNo_NONE_e; + mSelectEquip[B_BUTTON_ITEM] = dItemNo_NONE_e; mWalletSize = WALLET; mMaxMagic = 0; mMagic = 0; @@ -293,8 +293,8 @@ void dSv_player_last_mark_info_c::setWarpItemData(const char* i_name, const cXyz void dSv_player_item_c::init() { for (int i = 0; i < MAX_ITEM_SLOTS; i++) { - mItems[i] = fpcNm_ITEM_NONE; - mItemSlots[i] = fpcNm_ITEM_NONE; + mItems[i] = dItemNo_NONE_e; + mItemSlots[i] = dItemNo_NONE_e; } } @@ -316,51 +316,51 @@ u8 dSv_player_item_c::getItem(int i_slotNo, bool i_checkCombo) const { if (i_checkCombo) { for (int i = 0; i < SELECT_ITEM_NUM; i++) { if ((i_slotNo == dComIfGs_getSelectItemIndex(i) || i_slotNo == dComIfGs_getMixItemIndex(i)) && - dComIfGs_getMixItemIndex(i) != fpcNm_ITEM_NONE) + dComIfGs_getMixItemIndex(i) != dItemNo_NONE_e) { u8 select_item = mItems[dComIfGs_getSelectItemIndex(i)]; u8 mix_item = mItems[dComIfGs_getMixItemIndex(i)]; // Get Bomb arrow check: Bow + Normal Bombs - if ((select_item == fpcNm_ITEM_BOW && mix_item == fpcNm_ITEM_NORMAL_BOMB) || - (mix_item == fpcNm_ITEM_BOW && select_item == fpcNm_ITEM_NORMAL_BOMB)) { - return fpcNm_ITEM_BOMB_ARROW; + if ((select_item == dItemNo_BOW_e && mix_item == dItemNo_NORMAL_BOMB_e) || + (mix_item == dItemNo_BOW_e && select_item == dItemNo_NORMAL_BOMB_e)) { + return dItemNo_BOMB_ARROW_e; } // Get Bomb arrow check: Bow + Water Bombs - if ((select_item == fpcNm_ITEM_BOW && mix_item == fpcNm_ITEM_WATER_BOMB) || - (mix_item == fpcNm_ITEM_BOW && select_item == fpcNm_ITEM_WATER_BOMB)) { - return fpcNm_ITEM_BOMB_ARROW; + if ((select_item == dItemNo_BOW_e && mix_item == dItemNo_WATER_BOMB_e) || + (mix_item == dItemNo_BOW_e && select_item == dItemNo_WATER_BOMB_e)) { + return dItemNo_BOMB_ARROW_e; } // Get Bomb arrow check: Bow + Bomblings - if ((select_item == fpcNm_ITEM_BOW && mix_item == fpcNm_ITEM_POKE_BOMB) || - (mix_item == fpcNm_ITEM_BOW && select_item == fpcNm_ITEM_POKE_BOMB)) { - return fpcNm_ITEM_BOMB_ARROW; + if ((select_item == dItemNo_BOW_e && mix_item == dItemNo_POKE_BOMB_e) || + (mix_item == dItemNo_BOW_e && select_item == dItemNo_POKE_BOMB_e)) { + return dItemNo_BOMB_ARROW_e; } // Get Hawkeye check - if ((select_item == fpcNm_ITEM_BOW && mix_item == fpcNm_ITEM_HAWK_EYE) || - (mix_item == fpcNm_ITEM_BOW && select_item == fpcNm_ITEM_HAWK_EYE)) { - return fpcNm_ITEM_HAWK_ARROW; + if ((select_item == dItemNo_BOW_e && mix_item == dItemNo_HAWK_EYE_e) || + (mix_item == dItemNo_BOW_e && select_item == dItemNo_HAWK_EYE_e)) { + return dItemNo_HAWK_ARROW_e; } // Get Rod w/ bee larva - if ((select_item == fpcNm_ITEM_FISHING_ROD_1 && mix_item == fpcNm_ITEM_BEE_CHILD) || - (mix_item == fpcNm_ITEM_FISHING_ROD_1 && select_item == fpcNm_ITEM_BEE_CHILD)) { - return fpcNm_ITEM_BEE_ROD; + if ((select_item == dItemNo_FISHING_ROD_1_e && mix_item == dItemNo_BEE_CHILD_e) || + (mix_item == dItemNo_FISHING_ROD_1_e && select_item == dItemNo_BEE_CHILD_e)) { + return dItemNo_BEE_ROD_e; } // Get Rod w/ coral earring - if ((select_item == fpcNm_ITEM_FISHING_ROD_1 && mix_item == fpcNm_ITEM_ZORAS_JEWEL) || - (mix_item == fpcNm_ITEM_FISHING_ROD_1 && select_item == fpcNm_ITEM_ZORAS_JEWEL)) { - return fpcNm_ITEM_JEWEL_ROD; + if ((select_item == dItemNo_FISHING_ROD_1_e && mix_item == dItemNo_ZORAS_JEWEL_e) || + (mix_item == dItemNo_FISHING_ROD_1_e && select_item == dItemNo_ZORAS_JEWEL_e)) { + return dItemNo_JEWEL_ROD_e; } // Get Rod w/ worm - if ((select_item == fpcNm_ITEM_FISHING_ROD_1 && mix_item == fpcNm_ITEM_WORM) || - (mix_item == fpcNm_ITEM_FISHING_ROD_1 && select_item == fpcNm_ITEM_WORM)) { - return fpcNm_ITEM_WORM_ROD; + if ((select_item == dItemNo_FISHING_ROD_1_e && mix_item == dItemNo_WORM_e) || + (mix_item == dItemNo_FISHING_ROD_1_e && select_item == dItemNo_WORM_e)) { + return dItemNo_WORM_ROD_e; } // This block will only run on the Wii version @@ -370,9 +370,9 @@ u8 dSv_player_item_c::getItem(int i_slotNo, bool i_checkCombo) const { if (dComIfGs_getSelectItemIndex(i) == 0 && dComIfGs_getMixItemIndex(i) == 0) { - dComIfGs_setSelectItemIndex(i, fpcNm_ITEM_NONE); - dComIfGs_setMixItemIndex(i, fpcNm_ITEM_NONE); - return fpcNm_ITEM_NONE; + dComIfGs_setSelectItemIndex(i, dItemNo_NONE_e); + dComIfGs_setMixItemIndex(i, dItemNo_NONE_e); + return dItemNo_NONE_e; } } // Uncertain combination item＝＝＝＞%d, %d\n @@ -384,7 +384,7 @@ u8 dSv_player_item_c::getItem(int i_slotNo, bool i_checkCombo) const { return mItems[i_slotNo]; } - return fpcNm_ITEM_NONE; + return dItemNo_NONE_e; } void dSv_player_item_c::setLineUpItem() { @@ -398,12 +398,12 @@ void dSv_player_item_c::setLineUpItem() { int slot_idx = 0; for (int i = 0; i < 24; i++) { - mItemSlots[i] = fpcNm_ITEM_NONE; + mItemSlots[i] = dItemNo_NONE_e; } for (int i = 0; i < 23; i++) { u8 current = i_item_lst[i]; - if (mItems[current] != fpcNm_ITEM_NONE) { + if (mItems[current] != dItemNo_NONE_e) { mItemSlots[slot_idx] = current; slot_idx++; } @@ -415,7 +415,7 @@ u8 dSv_player_item_c::getLineUpItem(int i_slotNo) const { return mItemSlots[i_slotNo]; } - return fpcNm_ITEM_NONE; + return dItemNo_NONE_e; } void dSv_player_item_c::setBottleItemIn(u8 curItemIn, u8 newItemIn) { @@ -425,7 +425,7 @@ void dSv_player_item_c::setBottleItemIn(u8 curItemIn, u8 newItemIn) { for (int i = 0; i < 4; i++) { if (curItemIn == mItems[i + SLOT_11]) { setItem(i + SLOT_11, newItemIn); - if (newItemIn == fpcNm_ITEM_HOT_SPRING) { + if (newItemIn == dItemNo_HOT_SPRING_e) { dMeter2Info_setHotSpringTimer(i + SLOT_11); } @@ -441,13 +441,13 @@ void dSv_player_item_c::setBottleItemIn(u8 curItemIn, u8 newItemIn) { void dSv_player_item_c::setEmptyBottleItemIn(u8 i_itemNo) { i_itemNo = dSv_item_rename(i_itemNo); - setBottleItemIn(fpcNm_ITEM_EMPTY_BOTTLE, i_itemNo); + setBottleItemIn(dItemNo_EMPTY_BOTTLE_e, i_itemNo); } void dSv_player_item_c::setEmptyBottle() { for (int i = 0; i < 4; i++) { - if (dComIfGs_getItem((u8)(i + SLOT_11), true) == fpcNm_ITEM_NONE) { - dComIfGs_setItem((u8)(i + SLOT_11), fpcNm_ITEM_EMPTY_BOTTLE); + if (dComIfGs_getItem((u8)(i + SLOT_11), true) == dItemNo_NONE_e) { + dComIfGs_setItem((u8)(i + SLOT_11), dItemNo_EMPTY_BOTTLE_e); return; } } @@ -455,7 +455,7 @@ void dSv_player_item_c::setEmptyBottle() { void dSv_player_item_c::setEmptyBottle(u8 i_itemNo) { for (int i = 0; i < 4; i++) { - if (dComIfGs_getItem((u8)(i + SLOT_11), true) == fpcNm_ITEM_NONE) { + if (dComIfGs_getItem((u8)(i + SLOT_11), true) == dItemNo_NONE_e) { dComIfGs_setItem((u8)(i + SLOT_11), i_itemNo); return; } @@ -467,7 +467,7 @@ void dSv_player_item_c::setEquipBottleItemIn(u8 curItemIn, u8 newItemIn) { if (dComIfGs_getSelectItemIndex(curItemIn) >= SLOT_11 && dComIfGs_getSelectItemIndex(curItemIn) <= SLOT_14) { - if (newItemIn == fpcNm_ITEM_HOT_SPRING) { + if (newItemIn == dItemNo_HOT_SPRING_e) { dMeter2Info_setHotSpringTimer(dComIfGs_getSelectItemIndex(curItemIn)); } @@ -479,7 +479,7 @@ void dSv_player_item_c::setEquipBottleItemIn(u8 curItemIn, u8 newItemIn) { } void dSv_player_item_c::setEquipBottleItemEmpty(u8 curItemIn) { - setEquipBottleItemIn(curItemIn, fpcNm_ITEM_EMPTY_BOTTLE); + setEquipBottleItemIn(curItemIn, dItemNo_EMPTY_BOTTLE_e); } u8 dSv_player_item_c::checkBottle(u8 i_itemNo) { @@ -496,7 +496,7 @@ u8 dSv_player_item_c::checkBottle(u8 i_itemNo) { BOOL dSv_player_item_c::checkInsectBottle() { for (int i = 0; i < 24; i++) { - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_M_BEETLE + i) && + if (dComIfGs_isItemFirstBit(dItemNo_M_BEETLE_e + i) && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x191 + i])) { return TRUE; } @@ -508,7 +508,7 @@ u8 dSv_player_item_c::checkEmptyBottle() { u8 bottleNum = 0; for (int i = 0; i < BOTTLE_MAX; i++) { - if (mItems[i + SLOT_11] == fpcNm_ITEM_EMPTY_BOTTLE) { + if (mItems[i + SLOT_11] == dItemNo_EMPTY_BOTTLE_e) { bottleNum++; } } @@ -520,7 +520,7 @@ void dSv_player_item_c::setBombBagItemIn(u8 i_curBomb, u8 i_newBomb, bool i_setN if (i_curBomb == mItems[i + SLOT_15]) { setItem(i + SLOT_15, i_newBomb); - if (i_setNum == true && i_newBomb != fpcNm_ITEM_BOMB_BAG_LV1) { + if (i_setNum == true && i_newBomb != dItemNo_BOMB_BAG_LV1_e) { dComIfGs_setBombNum(i, dComIfGs_getBombMax(i_newBomb)); } @@ -539,7 +539,7 @@ void dSv_player_item_c::setBombBagItemIn(u8 i_curBomb, u8 i_newBomb, u8 i_bombNu if (i_curBomb == mItems[i + SLOT_15]) { setItem(i + SLOT_15, i_newBomb); - if (i_setNum == 1 && i_newBomb != fpcNm_ITEM_BOMB_BAG_LV1) { + if (i_setNum == 1 && i_newBomb != dItemNo_BOMB_BAG_LV1_e) { if (i_bombNum > dComIfGs_getBombMax(i_newBomb)) { i_bombNum = dComIfGs_getBombMax(i_newBomb); } @@ -557,17 +557,17 @@ void dSv_player_item_c::setBombBagItemIn(u8 i_curBomb, u8 i_newBomb, u8 i_bombNu } void dSv_player_item_c::setEmptyBombBagItemIn(u8 i_newBomb, bool i_setNum) { - setBombBagItemIn(fpcNm_ITEM_BOMB_BAG_LV1, i_newBomb, i_setNum); + setBombBagItemIn(dItemNo_BOMB_BAG_LV1_e, i_newBomb, i_setNum); } void dSv_player_item_c::setEmptyBombBagItemIn(u8 i_newBomb, u8 i_bombNum, bool i_setNum) { - setBombBagItemIn(fpcNm_ITEM_BOMB_BAG_LV1, i_newBomb, i_bombNum, i_setNum); + setBombBagItemIn(dItemNo_BOMB_BAG_LV1_e, i_newBomb, i_bombNum, i_setNum); } void dSv_player_item_c::setEmptyBombBag() { for (int i = 0; i < 3; i++) { - if (dComIfGs_getItem((u8)(i + SLOT_15), true) == fpcNm_ITEM_NONE) { - dComIfGs_setItem((u8)(i + SLOT_15), fpcNm_ITEM_BOMB_BAG_LV1); + if (dComIfGs_getItem((u8)(i + SLOT_15), true) == dItemNo_NONE_e) { + dComIfGs_setItem((u8)(i + SLOT_15), dItemNo_BOMB_BAG_LV1_e); return; } } @@ -575,10 +575,10 @@ void dSv_player_item_c::setEmptyBombBag() { void dSv_player_item_c::setEmptyBombBag(u8 i_newBomb, u8 i_bombNum) { for (int i = 0; i < 3; i++) { - if (dComIfGs_getItem((u8)(i + SLOT_15), true) == fpcNm_ITEM_NONE) { + if (dComIfGs_getItem((u8)(i + SLOT_15), true) == dItemNo_NONE_e) { dComIfGs_setItem((u8)(i + SLOT_15), i_newBomb); - if (i_newBomb != fpcNm_ITEM_BOMB_BAG_LV1) { + if (i_newBomb != dItemNo_BOMB_BAG_LV1_e) { if (i_bombNum > dComIfGs_getBombMax(i_newBomb)) { i_bombNum = dComIfGs_getBombMax(i_newBomb); } @@ -614,16 +614,16 @@ void dSv_player_item_c::setWarashibeItem(u8 i_itemNo) { void dSv_player_item_c::setRodTypeLevelUp() { switch (mItems[SLOT_20]) { - case fpcNm_ITEM_BEE_ROD: { - mItems[SLOT_20] = fpcNm_ITEM_JEWEL_BEE_ROD; + case dItemNo_BEE_ROD_e: { + mItems[SLOT_20] = dItemNo_JEWEL_BEE_ROD_e; break; } - case fpcNm_ITEM_WORM_ROD: { - mItems[SLOT_20] = fpcNm_ITEM_JEWEL_WORM_ROD; + case dItemNo_WORM_ROD_e: { + mItems[SLOT_20] = dItemNo_JEWEL_WORM_ROD_e; break; } - case fpcNm_ITEM_FISHING_ROD_1: { - mItems[SLOT_20] = fpcNm_ITEM_JEWEL_ROD; + case dItemNo_FISHING_ROD_1_e: { + mItems[SLOT_20] = dItemNo_JEWEL_ROD_e; break; } } @@ -635,27 +635,27 @@ void dSv_player_item_c::setRodTypeLevelUp() { void dSv_player_item_c::setBaitItem(u8 i_itemNo) { switch (i_itemNo) { - case fpcNm_ITEM_BEE_CHILD: { - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_ZORAS_JEWEL)) { - mItems[SLOT_20] = fpcNm_ITEM_JEWEL_BEE_ROD; + case dItemNo_BEE_CHILD_e: { + if (dComIfGs_isItemFirstBit(dItemNo_ZORAS_JEWEL_e)) { + mItems[SLOT_20] = dItemNo_JEWEL_BEE_ROD_e; } else { - mItems[SLOT_20] = fpcNm_ITEM_BEE_ROD; + mItems[SLOT_20] = dItemNo_BEE_ROD_e; } break; } - case fpcNm_ITEM_WORM: { - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_ZORAS_JEWEL)) { - mItems[SLOT_20] = fpcNm_ITEM_JEWEL_WORM_ROD; + case dItemNo_WORM_e: { + if (dComIfGs_isItemFirstBit(dItemNo_ZORAS_JEWEL_e)) { + mItems[SLOT_20] = dItemNo_JEWEL_WORM_ROD_e; } else { - mItems[SLOT_20] = fpcNm_ITEM_WORM_ROD; + mItems[SLOT_20] = dItemNo_WORM_ROD_e; } break; } - case fpcNm_ITEM_NONE: { - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_ZORAS_JEWEL)) { - mItems[SLOT_20] = fpcNm_ITEM_JEWEL_ROD; + case dItemNo_NONE_e: { + if (dComIfGs_isItemFirstBit(dItemNo_ZORAS_JEWEL_e)) { + mItems[SLOT_20] = dItemNo_JEWEL_ROD_e; } else { - mItems[SLOT_20] = fpcNm_ITEM_FISHING_ROD_1; + mItems[SLOT_20] = dItemNo_FISHING_ROD_1_e; } break; } @@ -761,37 +761,37 @@ void dSv_player_item_max_c::init() { for (int i = 0; i < 7; i++) { mItemMax[i] = 30; } - setBombNum(fpcNm_ITEM_NORMAL_BOMB, 30); - setBombNum(fpcNm_ITEM_WATER_BOMB, 15); - setBombNum(fpcNm_ITEM_POKE_BOMB, 10); + setBombNum(dItemNo_NORMAL_BOMB_e, 30); + setBombNum(dItemNo_WATER_BOMB_e, 15); + setBombNum(dItemNo_POKE_BOMB_e, 10); mItemMax[7] = 0; } void dSv_player_item_max_c::setBombNum(u8 i_bombType, u8 i_maxNum) { switch (i_bombType) { - case fpcNm_ITEM_NORMAL_BOMB: + case dItemNo_NORMAL_BOMB_e: mItemMax[NORMAL_BOMB_MAX] = i_maxNum; return; - case fpcNm_ITEM_WATER_BOMB: + case dItemNo_WATER_BOMB_e: mItemMax[WATER_BOMB_MAX] = i_maxNum; return; - case fpcNm_ITEM_POKE_BOMB: + case dItemNo_POKE_BOMB_e: mItemMax[POKE_BOMB_MAX] = i_maxNum; } } u8 dSv_player_item_max_c::getBombNum(u8 i_bombType) const { u8 lv_multiplier = 1; - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_BAG_LV2)) { + if (dComIfGs_isItemFirstBit(dItemNo_BOMB_BAG_LV2_e)) { lv_multiplier = 2; } switch (i_bombType) { - case fpcNm_ITEM_NORMAL_BOMB: + case dItemNo_NORMAL_BOMB_e: return (u8)(mItemMax[NORMAL_BOMB_MAX] * lv_multiplier); - case fpcNm_ITEM_WATER_BOMB: + case dItemNo_WATER_BOMB_e: return (u8)(mItemMax[WATER_BOMB_MAX] * lv_multiplier); - case fpcNm_ITEM_POKE_BOMB: + case dItemNo_POKE_BOMB_e: return (u8)(mItemMax[POKE_BOMB_MAX] * lv_multiplier); default: return 0; @@ -1752,9 +1752,9 @@ int dSv_info_c::memory_to_card(char* card_ptr, int dataNum) { } // If have the lantern and Slot 1 in the item wheel is blank - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_KANTERA) && dComIfGs_getItem(SLOT_1, 1) == fpcNm_ITEM_NONE) { + if (dComIfGs_isItemFirstBit(dItemNo_KANTERA_e) && dComIfGs_getItem(SLOT_1, 1) == dItemNo_NONE_e) { // Set Slot 1 to Lantern and fetch current oil - dComIfGs_setItem(SLOT_1, fpcNm_ITEM_KANTERA); + dComIfGs_setItem(SLOT_1, dItemNo_KANTERA_e); current_lantern_oil = dComIfGs_getOil(); // Set oil to oil gauge backup @@ -1804,7 +1804,7 @@ int dSv_info_c::memory_to_card(char* card_ptr, int dataNum) { // Now that we've saved, reset slot if needed if (tmp_lantern_check == true) { - dComIfGs_setItem(SLOT_1, fpcNm_ITEM_NONE); + dComIfGs_setItem(SLOT_1, dItemNo_NONE_e); dComIfGs_setOil(current_lantern_oil); } @@ -1844,13 +1844,13 @@ int dSv_info_c::card_to_memory(char* i_cardPtr, int i_dataNum) { dComIfGs_setKeyNum(6, 0); - if (dComIfGs_getItem(SLOT_9, true) == fpcNm_ITEM_W_HOOKSHOT) { - dComIfGs_setItem(SLOT_10, fpcNm_ITEM_W_HOOKSHOT); - dComIfGs_setItem(SLOT_9, fpcNm_ITEM_NONE); + if (dComIfGs_getItem(SLOT_9, true) == dItemNo_W_HOOKSHOT_e) { + dComIfGs_setItem(SLOT_10, dItemNo_W_HOOKSHOT_e); + dComIfGs_setItem(SLOT_9, dItemNo_NONE_e); } - if (dComIfGs_getItem(SLOT_9, true) == fpcNm_ITEM_HOOKSHOT && dComIfGs_getItem(SLOT_10, true) == fpcNm_ITEM_W_HOOKSHOT) { - dComIfGs_setItem(SLOT_9, fpcNm_ITEM_NONE); + if (dComIfGs_getItem(SLOT_9, true) == dItemNo_HOOKSHOT_e && dComIfGs_getItem(SLOT_10, true) == dItemNo_W_HOOKSHOT_e) { + dComIfGs_setItem(SLOT_9, dItemNo_NONE_e); } dComIfGs_setLineUpItem(); diff --git a/src/d/d_shop_system.cpp b/src/d/d_shop_system.cpp index 1395bff729..779fe75d4d 100644 --- a/src/d/d_shop_system.cpp +++ b/src/d/d_shop_system.cpp @@ -25,7 +25,7 @@ static daTag_ShopItem_c* dShopSystem_itemActor[7] = { }; static u8 dShopSystem_itemNo[7] = { - fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, + dItemNo_NONE_e, dItemNo_NONE_e, dItemNo_NONE_e, dItemNo_NONE_e, dItemNo_NONE_e, dItemNo_NONE_e, dItemNo_NONE_e, }; static u8 dShopSystem_sellItemMax; @@ -35,7 +35,7 @@ static int dShopSystem_item_count; static u8 data_80451060; static int dShopSystem_searchItemActor(void* i_actor, void* param_1) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_TAG_SHOPITM) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_TAG_SHOPITM_e) { if ((fopAcM_GetParam(param_1) & 0xF0000000) == (fopAcM_GetParam(i_actor) & 0xF0000000) && dShopSystem_item_count < dShopSystem_sellItemMax) { @@ -54,7 +54,7 @@ static int dShopSystem_searchItemActor(void* i_actor, void* param_1) { if ((sw == 0xFF || !dComIfGs_isSaveSwitch(sw)) && (sw2 == 0xFF || dComIfGs_isSaveSwitch(sw2))) { - if (sw != 0xFF && item_no == fpcNm_ITEM_HYLIA_SHIELD && checkItemGet(item_no, true)) { + if (sw != 0xFF && item_no == dItemNo_HYLIA_SHIELD_e && checkItemGet(item_no, true)) { dComIfGs_onSaveSwitch(sw); } else { if (i_posID == 0) { @@ -82,7 +82,7 @@ static fopAc_ac_c* dShopSystem_cameraActor[2] = {NULL, NULL}; static int dShopSystem_camera_count; static int dShopSystem_searchCameraActor(void* i_actor, void* param_1) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_TAG_SHOPCAM) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_TAG_SHOPCAM_e) { if ((fopAcM_GetParam(param_1) & 0xf0000000) == (fopAcM_GetParam(i_actor) & 0xf0000000) && dShopSystem_camera_count < 2) { @@ -113,7 +113,7 @@ void dShopSystem_c::initShopSystem() { for (int i = 0; i < 7; i++) { dShopSystem_itemActor[i] = NULL; - dShopSystem_itemNo[i] = fpcNm_ITEM_NONE; + dShopSystem_itemNo[i] = dItemNo_NONE_e; } dShopSystem_item_count = 0; @@ -181,7 +181,7 @@ dShopSystem_c::~dShopSystem_c() { for (int i = 0; i < 7; i++) { dShopSystem_itemActor[i] = NULL; - dShopSystem_itemNo[i] = fpcNm_ITEM_NONE; + dShopSystem_itemNo[i] = dItemNo_NONE_e; } dShopSystem_item_count = 0; @@ -690,7 +690,7 @@ int dShopSystem_c::itemRotate() { u8 cursor_pos = mCursorPos; if (cursor_pos != 0 && mSeq != SEQ_WAIT) { - if (dShopSystem_itemNo[cursor_pos - 1] == fpcNm_ITEM_ARMOR) { + if (dShopSystem_itemNo[cursor_pos - 1] == dItemNo_ARMOR_e) { int tmp_index; if (isFlag(8) == false) { tmp_index = 0; @@ -724,7 +724,7 @@ int dShopSystem_c::itemZoom(cXyz* param_0) { if (field_0xf60 >= 0) { local_1c.set(*param_0); - if (dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_OIL_BOTTLE) { + if (dShopSystem_itemNo[mCursorPos - 1] == dItemNo_OIL_BOTTLE_e) { mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mSeraShopObjZoomAngleX + -5000, isFlag(8) ? true : false); @@ -775,9 +775,9 @@ int dShopSystem_c::itemZoom(cXyz* param_0) { g_cursorHIO.mObjZoom.z + 150.0f); } else { if (mMasterType == 5) { - if (dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_ARROW_10 || - dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_ARROW_20 || - dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_ARROW_30) + if (dShopSystem_itemNo[mCursorPos - 1] == dItemNo_ARROW_10_e || + dShopSystem_itemNo[mCursorPos - 1] == dItemNo_ARROW_20_e || + dShopSystem_itemNo[mCursorPos - 1] == dItemNo_ARROW_30_e) { local_34.set(g_cursorHIO.mObjZoom.x, -50.0f + g_cursorHIO.mObjZoom.y + 5.0f, (g_cursorHIO.mObjZoom.z + 250.0f) - 60.0f); @@ -808,7 +808,7 @@ int dShopSystem_c::itemZoom(cXyz* param_0) { u8 dvar1 = mMasterType; if (dvar1 == 1) { - if (dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_OIL_BOTTLE) { + if (dShopSystem_itemNo[mCursorPos - 1] == dItemNo_OIL_BOTTLE_e) { mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX + -7000, isFlag(8) ? true : false); @@ -817,7 +817,7 @@ int dShopSystem_c::itemZoom(cXyz* param_0) { isFlag(8) ? true : false); } } else if (dvar1 == 2) { - if (dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_RED_BOTTLE) { + if (dShopSystem_itemNo[mCursorPos - 1] == dItemNo_RED_BOTTLE_e) { mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX - 3000, isFlag(8) ? true : false); } else { @@ -825,9 +825,9 @@ int dShopSystem_c::itemZoom(cXyz* param_0) { isFlag(8) ? true : false); } } else if (dvar1 == 5) { - if (dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_ARROW_10 || - dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_ARROW_20 || - dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_ARROW_30) + if (dShopSystem_itemNo[mCursorPos - 1] == dItemNo_ARROW_10_e || + dShopSystem_itemNo[mCursorPos - 1] == dItemNo_ARROW_20_e || + dShopSystem_itemNo[mCursorPos - 1] == dItemNo_ARROW_30_e) { mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX - 4000, isFlag(8) ? true : false); @@ -1297,7 +1297,7 @@ static shop_item_data* shop_item_pos_data_tbl = &item_seira_shop; void dShopSystem_c::createShopItem(int itemType) { static const u8 item_no[6] = { - fpcNm_ITEM_MILK_BOTTLE, fpcNm_ITEM_BEE_CHILD, fpcNm_ITEM_PACHINKO, fpcNm_ITEM_MILK_BOTTLE, fpcNm_ITEM_BEE_CHILD, fpcNm_ITEM_NONE, + dItemNo_MILK_BOTTLE_e, dItemNo_BEE_CHILD_e, dItemNo_PACHINKO_e, dItemNo_MILK_BOTTLE_e, dItemNo_BEE_CHILD_e, dItemNo_NONE_e, }; if (itemType != -1) { @@ -1312,8 +1312,8 @@ void dShopSystem_c::createShopItem(int itemType) { pos.y = shop_item_pos_data_tbl->mItemPos[i].y + current.pos.y; pos.z = shop_item_pos_data_tbl->mItemPos[i].z + current.pos.z; - if (itemTbl[i] != fpcNm_ITEM_NONE) { - u32 index = fopAcM_create(PROC_ShopItem, itemTbl[i], &pos, fopAcM_GetRoomNo(this), + if (itemTbl[i] != dItemNo_NONE_e) { + u32 index = fopAcM_create(fpcNm_ShopItem_e, itemTbl[i], &pos, fopAcM_GetRoomNo(this), ¤t.angle, NULL, -1); mItemCtrl.setItemIndex(i, index); offFlag(i); @@ -1352,19 +1352,19 @@ void dShopSystem_c::setSoldOut() { return; } else if (index == 0) { dShopSystem_itemActor[0] = NULL; - dShopSystem_itemNo[0] = fpcNm_ITEM_NONE; + dShopSystem_itemNo[0] = dItemNo_NONE_e; dShopSystem_item_count = 2; } else if (index == 1) { dShopSystem_itemActor[1] = NULL; - dShopSystem_itemNo[1] = fpcNm_ITEM_NONE; + dShopSystem_itemNo[1] = dItemNo_NONE_e; dShopSystem_item_count = 2; } else if (index == 2) { dShopSystem_itemActor[2] = NULL; - dShopSystem_itemNo[2] = fpcNm_ITEM_NONE; + dShopSystem_itemNo[2] = dItemNo_NONE_e; dShopSystem_item_count = 2; } else if (index == 6) { dShopSystem_itemActor[6] = NULL; - dShopSystem_itemNo[6] = fpcNm_ITEM_NONE; + dShopSystem_itemNo[6] = dItemNo_NONE_e; dShopSystem_item_count = 6; } diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index c40e0877b2..1f6186112b 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -268,7 +268,7 @@ static int createRoomScene(int param_0) { } *ptr = param_0; - if (!fopScnM_CreateReq(PROC_ROOM_SCENE, 0x7FFF, 0, (uintptr_t)ptr)) { + if (!fopScnM_CreateReq(fpcNm_ROOM_SCENE_e, 0x7FFF, 0, (uintptr_t)ptr)) { JKRFree(ptr); return 0; } @@ -487,927 +487,927 @@ void* dStage_roomControl_c::roomDzs_c::add(u8 i_no, u8 roomNo) { { name, proc, sub } static dStage_objectNameInf l_objectName[] = { - OBJNAME("Grass", PROC_GRASS, -1), - OBJNAME("kusax1", PROC_GRASS, -1), - OBJNAME("kusax7", PROC_GRASS, -1), - OBJNAME("kusax21", PROC_GRASS, -1), - OBJNAME("flower", PROC_GRASS, -1), - OBJNAME("flwr7", PROC_GRASS, -1), - OBJNAME("flwr17", PROC_GRASS, -1), - OBJNAME("pflower", PROC_GRASS, -1), - OBJNAME("pflwrx7", PROC_GRASS, -1), - OBJNAME("door", PROC_DOOR20, -1), - OBJNAME("kdoor", PROC_KNOB20, -1), - OBJNAME("ddoor", PROC_DBDOOR, -1), - OBJNAME("bdoor", PROC_BOSS_DOOR, -1), - OBJNAME("ndoor", PROC_DOOR20, -1), - OBJNAME("tadoor", PROC_DOOR20, -1), - OBJNAME("yodoor", PROC_DOOR20, -1), - OBJNAME("nadoor", PROC_DOOR20, -1), - OBJNAME("l9door", PROC_DOOR20, -1), - OBJNAME("l7door", PROC_DOOR20, -1), - OBJNAME("pdoor", PROC_PushDoor, -1), - OBJNAME("bigdoor", PROC_DOOR20, -1), - OBJNAME("kshtr00", PROC_Obj_Kshutter, -1), - OBJNAME("vshuter", PROC_Obj_Kshutter, -1), - OBJNAME("IzmGate", PROC_Izumi_Gate, -1), - OBJNAME("NoneCam", PROC_CAMERA, -1), - OBJNAME("NormCam", PROC_CAMERA, -1), - OBJNAME("Link", PROC_ALINK, -1), - OBJNAME("carry00", PROC_Obj_Carry, -1), - OBJNAME("carry01", PROC_Obj_Carry, -1), - OBJNAME("carry02", PROC_Obj_Carry, -1), - OBJNAME("carry04", PROC_Obj_Carry, -1), - OBJNAME("carry05", PROC_Obj_Carry, -1), - OBJNAME("carry06", PROC_Obj_Carry, -1), - OBJNAME("carry07", PROC_Obj_Carry, -1), - OBJNAME("carry08", PROC_Obj_Carry, -1), - OBJNAME("carry09", PROC_Obj_Carry, -1), - OBJNAME("ball1", PROC_Obj_Carry, -1), - OBJNAME("ball2", PROC_Obj_Carry, -1), - OBJNAME("ball3", PROC_Obj_Carry, -1), - OBJNAME("carry12", PROC_Obj_Carry, -1), - OBJNAME("carry13", PROC_Obj_Carry, -1), - OBJNAME("TagLite", PROC_Tag_LightBall, -1), - OBJNAME("InoBone", PROC_Obj_InoBone, -1), - OBJNAME("osiBLK0", PROC_Obj_Movebox, 0x00), - OBJNAME("dmblk", PROC_Obj_Movebox, 0x00), - OBJNAME("Kkiba", PROC_Obj_Movebox, 0x02), - OBJNAME("smblk", PROC_Obj_Movebox, 0x02), - OBJNAME("Lv4blk", PROC_Obj_Movebox, -1), - OBJNAME("Lv4blk2", PROC_Obj_Movebox, -1), - OBJNAME("gstone", PROC_Obj_Movebox, -1), - OBJNAME("TagAtt", PROC_Tag_Attp, -1), - OBJNAME("mmvbg", PROC_SET_BG_OBJ, -1), - OBJNAME("Drop", PROC_Obj_Drop, -1), - OBJNAME("BkLeaf", PROC_Obj_BkLeaf, -1), - OBJNAME("cylwind", PROC_Obj_Tornado, -1), - OBJNAME("TagTrnd", PROC_Obj_Tornado2, -1), - OBJNAME("mvstair", PROC_Obj_MvStair, -1), - OBJNAME("UHDoor", PROC_Obj_Cowdoor, -1), - OBJNAME("SwBoom", PROC_Obj_Swpropeller, -1), - OBJNAME("Swboom", PROC_Obj_Swpropeller, -1), - OBJNAME("BoomSht", PROC_Obj_BoomShutter, -1), - OBJNAME("haihai", PROC_Obj_Hfuta, -1), - OBJNAME("stopper", PROC_Obj_Stopper, -1), - OBJNAME("dstop", PROC_Obj_Stopper2, -1), - OBJNAME("mhole", PROC_Obj_MHole, -1), - OBJNAME("mhole2", PROC_Obj_MHole, -1), - OBJNAME("TagMag", PROC_Tag_Magne, -1), - OBJNAME("P_Warp", PROC_Obj_BossWarp, -1), - OBJNAME("fpillar", PROC_Obj_FirePillar, -1), - OBJNAME("yfire", PROC_Obj_FirePillar2, -1), - OBJNAME("pfire", PROC_Obj_FirePillar2, -1), - OBJNAME("Huriko1", PROC_Obj_WoodPendulum, -1), - OBJNAME("VolBall", PROC_Obj_VolcanicBall, -1), - OBJNAME("VolBom", PROC_Obj_VolcanicBall, -1), - OBJNAME("BigVolc", PROC_Obj_VolcanicBomb, -1), - OBJNAME("geyser", PROC_Obj_Geyser, -1), - OBJNAME("Cwall", PROC_Obj_ChainWall, -1), - OBJNAME("Tansu", PROC_Obj_Chest, -1), - OBJNAME("Onsen", PROC_Obj_Onsen, -1), - OBJNAME("Obj_bm", PROC_Obj_Bemos, -1), - OBJNAME("lv6bm", PROC_Obj_Lv6bemos, -1), - OBJNAME("E_bm6", PROC_Obj_Lv6bemos2, -1), - OBJNAME("stone", PROC_Obj_Stone, -1), - OBJNAME("stoneB", PROC_Obj_Stone, -1), - OBJNAME("TagSpin", PROC_Tag_Spinner, -1), - OBJNAME("L_RopeS", PROC_Obj_RopeBridge, -1), - OBJNAME("L_RopeB", PROC_Obj_RopeBridge, -1), - OBJNAME("wcover", PROC_Obj_WellCover, -1), - OBJNAME("rstair", PROC_Obj_RotStair, -1), - OBJNAME("marm", PROC_Obj_MagneArm, -1), - OBJNAME("turnSw", PROC_Obj_SwTurn, -1), - OBJNAME("chainSw", PROC_Obj_SwChain, -1), - OBJNAME("wsword", PROC_Obj_WoodenSword, -1), - OBJNAME("iceblk", PROC_Obj_IceBlock, -1), - OBJNAME("KkrSmk", PROC_Obj_Smoke, -1), - OBJNAME("dmele", PROC_Obj_Elevator, -1), - OBJNAME("wfall", PROC_Obj_WaterFall, -1), - OBJNAME("izora", PROC_Obj_ZoraCloth, -1), - OBJNAME("smgdoor", PROC_Obj_SmgDoor, -1), - OBJNAME("smkdoor", PROC_Obj_SmgDoor, -1), - OBJNAME("Obj_ava", PROC_Obj_Avalanche, -1), - OBJNAME("thdoor", PROC_Obj_TDoor, -1), - OBJNAME("mstrsrd", PROC_Obj_MasterSword, -1), - OBJNAME("wimage", PROC_Obj_WoodStatue, -1), - OBJNAME("sword", PROC_Obj_Sword, -1), - OBJNAME("spring", PROC_Tag_Spring, -1), - OBJNAME("BkDoorL", PROC_Obj_BkDoor, -1), - OBJNAME("BkDoorR", PROC_Obj_BkDoor, -1), - OBJNAME("IGateL", PROC_Obj_MGate, -1), - OBJNAME("IGateR", PROC_Obj_MGate, -1), - OBJNAME("HGateL", PROC_Obj_MGate, -1), - OBJNAME("HGateR", PROC_Obj_MGate, -1), - OBJNAME("K_Gate", PROC_Obj_KkrGate, -1), - OBJNAME("R_Gate", PROC_Obj_RiderGate, -1), - OBJNAME("kkanban", PROC_Obj_KKanban, -1), - OBJNAME("Mhsg6", PROC_Obj_Ladder, 0x00), - OBJNAME("Mhsg9", PROC_Obj_Ladder, 0x01), - OBJNAME("Mhsg12", PROC_Obj_Ladder, 0x02), - OBJNAME("Mhsg15", PROC_Obj_Ladder, 0x03), - OBJNAME("Mhsg4h", PROC_Obj_Ladder, 0x04), - OBJNAME("Mhsg3", PROC_Obj_Ladder, 0x05), - OBJNAME("bonbori", PROC_EP, -1), - OBJNAME("Cow", PROC_COW, -1), - OBJNAME("Peru", PROC_PERU, -1), - OBJNAME("Kago", PROC_KAGO, -1), - OBJNAME("TagFall", PROC_Tag_WaterFall, -1), - OBJNAME("Kbota_A", PROC_Obj_Swpush, 0x00), - OBJNAME("Kbota_B", PROC_Obj_Swpush, 0x01), - OBJNAME("KbotaC", PROC_Obj_Swpush, 0x02), - OBJNAME("Swpush", PROC_Obj_Swpush, 0x00), - OBJNAME("Lv3bota", PROC_Obj_Swpush, 0x00), - OBJNAME("Ksw00_C", PROC_Obj_Swpush2, 0x02), - OBJNAME("hvySw", PROC_Obj_Swpush5, 0x00), - OBJNAME("buraA", PROC_Obj_SwHang, 0x00), - OBJNAME("buraB", PROC_Obj_SwHang, 0x00), - OBJNAME("buraA2", PROC_Obj_SwHang, 0x00), - OBJNAME("buraB2", PROC_Obj_SwHang, 0x00), - OBJNAME("bura7A", PROC_Obj_SwHang, 0x00), - OBJNAME("bura7B", PROC_Obj_SwHang, 0x00), - OBJNAME("bura7C", PROC_Obj_SwHang, 0x00), - OBJNAME("bura7D", PROC_Obj_SwHang, 0x00), - OBJNAME("bura7E", PROC_Obj_SwHang, 0x00), - OBJNAME("tbox_sw", PROC_TBOX_SW, 0x00), - OBJNAME("swLight", PROC_Obj_SwLight, 0x00), - OBJNAME("iceleaf", PROC_Obj_IceLeaf, 0x00), - OBJNAME("swHit", PROC_SWHIT0, 0x00), - OBJNAME("swHit2", PROC_SWHIT0, 0x01), - OBJNAME("ObjTime", PROC_Obj_Timer, -1), - OBJNAME("AND_SW", PROC_ANDSW, -1), - OBJNAME("AND_SW2", PROC_ANDSW2, -1), - OBJNAME("ALLdie", PROC_ALLDIE, -1), - OBJNAME("rvback", PROC_Tag_RiverBack, -1), - OBJNAME("kagoFal", PROC_Tag_KagoFall, -1), - OBJNAME("CrvGate", PROC_Obj_CRVGATE, -1), - OBJNAME("CrvSaku", PROC_Obj_CRVFENCE, -1), - OBJNAME("CrvWood", PROC_Obj_CRVHAHEN, -1), - OBJNAME("CrvStel", PROC_Obj_CRVSTEEL, -1), - OBJNAME("CrvLH", PROC_Obj_CRVLH_DW, -1), - OBJNAME("RvRock", PROC_Obj_RIVERROCK, -1), - OBJNAME("P2a", PROC_NPC_P2, 0x00), - OBJNAME("P2b", PROC_NPC_P2, 0x01), - OBJNAME("P2c", PROC_NPC_P2, 0x02), - OBJNAME("Gnd", PROC_NPC_GND, -1), - OBJNAME("grA", PROC_NPC_GRA, -1), - OBJNAME("Obj_grA", PROC_OBJ_GRA, -1), - OBJNAME("Tag_grA", PROC_TAG_GRA, -1), - OBJNAME("TagYami", PROC_TAG_YAMI, -1), - OBJNAME("grC", PROC_NPC_GRC, -1), - OBJNAME("grM", PROC_NPC_GRM, -1), - OBJNAME("grMC", PROC_NPC_GRMC, -1), - OBJNAME("grS", PROC_NPC_GRS, -1), - OBJNAME("grD1", PROC_NPC_GRD, -1), - OBJNAME("grD", PROC_NPC_WRESTLER, 0x01), - OBJNAME("grR", PROC_NPC_GRR, -1), - OBJNAME("grO", PROC_NPC_GRO, -1), - OBJNAME("grZ", PROC_NPC_GRZ, -1), - OBJNAME("grARock", PROC_Obj_GraRock, -1), - OBJNAME("grZRock", PROC_Obj_GrzRock, -1), - OBJNAME("osnFire", PROC_OBJ_ONSEN_FIRE, -1), - OBJNAME("yamiD", PROC_NPC_YAMID, -1), - OBJNAME("yamiT", PROC_NPC_YAMIT, -1), - OBJNAME("yamiS", PROC_NPC_YAMIS, -1), - OBJNAME("Blue_NS", PROC_NPC_BLUENS, -1), - OBJNAME("Kakashi", PROC_NPC_KAKASHI, 0x00), - OBJNAME("Kdk", PROC_NPC_KDK, -1), - OBJNAME("Aru", PROC_NPC_ARU, -1), - OBJNAME("Bans", PROC_NPC_BANS, -1), - OBJNAME("Besu", PROC_NPC_BESU, -1), - OBJNAME("Bou", PROC_NPC_BOU, -1), - OBJNAME("BouS", PROC_NPC_BOU_S, 0x00), - OBJNAME("clerkA", PROC_NPC_CLERKA, 0x00), - OBJNAME("clerkB", PROC_NPC_CLERKB, 0x00), - OBJNAME("clerkT", PROC_NPC_CLERKT, 0x00), - OBJNAME("Ash", PROC_NPC_ASH, -1), - OBJNAME("AshB", PROC_NPC_ASHB, -1), - OBJNAME("Shad", PROC_NPC_SHAD, -1), - OBJNAME("Rafrel", PROC_NPC_RAFREL, -1), - OBJNAME("MoiR", PROC_NPC_MOIR, -1), - OBJNAME("impal", PROC_NPC_IMPAL, -1), - OBJNAME("Coach", PROC_NPC_COACH, -1), - OBJNAME("TheB", PROC_NPC_THEB, -1), - OBJNAME("TgArena", PROC_Tag_Arena, -1), - OBJNAME("TagInst", PROC_Tag_Instruction, -1), - OBJNAME("GWolf", PROC_NPC_GWOLF, -1), - OBJNAME("Len", PROC_NPC_LEN, -1), - OBJNAME("Lud", PROC_NPC_LUD, -1), - OBJNAME("Doc", PROC_NPC_DOC, -1), - OBJNAME("FSeirei", PROC_NPC_FAIRY_SEIREI, -1), - OBJNAME("Fairy", PROC_NPC_FAIRY, -1), - OBJNAME("Hanjo", PROC_NPC_HANJO, -1), - OBJNAME("Hoz", PROC_NPC_HOZ, -1), - OBJNAME("Jagar", PROC_NPC_JAGAR, -1), - OBJNAME("Kkri", PROC_NPC_KKRI, -1), - OBJNAME("Kn", PROC_NPC_KN, -1), - OBJNAME("KnBlt", PROC_KN_BULLET, -1), - OBJNAME("Knj", PROC_NPC_KNJ, -1), - OBJNAME("Kolin", PROC_NPC_KOLIN, -1), - OBJNAME("Kolinb", PROC_NPC_KOLINB, -1), - OBJNAME("Kyury", PROC_NPC_KYURY, -1), - OBJNAME("Maro", PROC_NPC_MARO, -1), - OBJNAME("midP", PROC_NPC_MIDP, -1), - OBJNAME("Moi", PROC_NPC_MOI, -1), - OBJNAME("Raca", PROC_NPC_RACA, -1), - OBJNAME("Post", PROC_NPC_POST, -1), - OBJNAME("Pouya", PROC_NPC_POUYA, -1), - OBJNAME("Saru", PROC_NPC_SARU, -1), - OBJNAME("seiB", PROC_NPC_SEIB, -1), - OBJNAME("seiC", PROC_NPC_SEIC, -1), - OBJNAME("seiD", PROC_NPC_SEID, -1), - OBJNAME("Seira", PROC_NPC_SEIRA, -1), - OBJNAME("Seira2", PROC_NPC_SERA2, -1), - OBJNAME("Seirei", PROC_NPC_SEIREI, -1), - OBJNAME("Sha", PROC_NPC_SHAMAN, -1), - OBJNAME("sMaro", PROC_NPC_SMARO, -1), - OBJNAME("solA", PROC_NPC_SOLA, -1), - OBJNAME("Taro", PROC_NPC_TARO, -1), - OBJNAME("PA_Besu", PROC_NPC_PACHI_BESU, -1), - OBJNAME("PA_Taro", PROC_NPC_PACHI_TARO, -1), - OBJNAME("PA_Maro", PROC_NPC_PACHI_MARO, -1), - OBJNAME("TagPati", PROC_TAG_PATI, -1), - OBJNAME("The", PROC_NPC_THE, -1), - OBJNAME("Tkj", PROC_NPC_TKJ, -1), - OBJNAME("Tks", PROC_NPC_TKS, -1), - OBJNAME("ObjTks", PROC_OBJ_TKS, -1), - OBJNAME("Tkc", PROC_NPC_TKC, -1), - OBJNAME("Tkj2", PROC_NPC_TKJ2, -1), - OBJNAME("Toby", PROC_NPC_TOBY, -1), - OBJNAME("Uri", PROC_NPC_URI, -1), - OBJNAME("Yelia", PROC_NPC_YELIA, -1), - OBJNAME("ykM", PROC_NPC_YKM, -1), - OBJNAME("ykW", PROC_NPC_YKW, -1), - OBJNAME("zanB", PROC_NPC_ZANB, -1), - OBJNAME("Zant", PROC_NPC_ZANT, -1), - OBJNAME("Zelda", PROC_NPC_ZELDA, -1), - OBJNAME("ZelR", PROC_NPC_ZELR, -1), - OBJNAME("ZelRo", PROC_NPC_ZELRO, -1), - OBJNAME("zrA", PROC_NPC_ZRA, 0x00), - OBJNAME("zrS", PROC_NPC_ZRA, 0x01), - OBJNAME("zrWF", PROC_NPC_ZRA, 0x02), - OBJNAME("zrR", PROC_NPC_ZRA, 0x03), - OBJNAME("zrD", PROC_NPC_ZRA, 0x04), - OBJNAME("zrSP", PROC_NPC_ZRA, 0x05), - OBJNAME("zrSPA", PROC_NPC_ZRA, 0x06), - OBJNAME("zrF", PROC_OBJ_ZRAFREEZE, 0x00), - OBJNAME("zrF2", PROC_OBJ_ZRAFREEZE, 0x01), - OBJNAME("zrF3", PROC_OBJ_ZRAFREEZE, 0x02), - OBJNAME("zrC", PROC_NPC_ZRC, -1), - OBJNAME("zrZ", PROC_NPC_ZRZ, -1), - OBJNAME("GrvStn", PROC_Obj_GraveStone, -1), - OBJNAME("zrARock", PROC_Obj_ZraRock, -1), - OBJNAME("StAndGl", PROC_START_AND_GOAL, -1), - OBJNAME("zrAMark", PROC_ZRA_MARK, -1), - OBJNAME("myna2", PROC_MYNA2, -1), - OBJNAME("myn2tag", PROC_TAG_MYNA2, -1), - OBJNAME("MAN_a", PROC_NPC_CD3, 0x00), - OBJNAME("MAD_a", PROC_NPC_CD3, 0x01), - OBJNAME("MCN_a", PROC_NPC_CD3, 0x02), - OBJNAME("MON_a", PROC_NPC_CD3, 0x03), - OBJNAME("MAN_b", PROC_NPC_CD3, 0x04), - OBJNAME("MAN_c", PROC_NPC_CD3, 0x05), - OBJNAME("MAS_a", PROC_NPC_CD3, 0x06), - OBJNAME("MBN_a", PROC_NPC_CD3, 0x07), - OBJNAME("MAN_a2", PROC_NPC_CD3, 0x08), - OBJNAME("MAD_a2", PROC_NPC_CD3, 0x09), - OBJNAME("MCN_a2", PROC_NPC_CD3, 0x0A), - OBJNAME("MON_a2", PROC_NPC_CD3, 0x0B), - OBJNAME("MAN_b2", PROC_NPC_CD3, 0x0C), - OBJNAME("MAN_c2", PROC_NPC_CD3, 0x0D), - OBJNAME("MAS_a2", PROC_NPC_CD3, 0x0E), - OBJNAME("MBN_a2", PROC_NPC_CD3, 0x0F), - OBJNAME("WAN_a", PROC_NPC_CD3, 0x10), - OBJNAME("WAD_a", PROC_NPC_CD3, 0x11), - OBJNAME("MAT_a", PROC_NPC_CD3, 0x12), - OBJNAME("WCN_a", PROC_NPC_CD3, 0x13), - OBJNAME("WON_a", PROC_NPC_CD3, 0x14), - OBJNAME("WGN_a", PROC_NPC_CD3, 0x15), - OBJNAME("WAN_b", PROC_NPC_CD3, 0x16), - OBJNAME("WAN_a2", PROC_NPC_CD3, 0x17), - OBJNAME("WAD_a2", PROC_NPC_CD3, 0x18), - OBJNAME("MAT_a2", PROC_NPC_CD3, 0x19), - OBJNAME("WCN_a2", PROC_NPC_CD3, 0x1A), - OBJNAME("WON_a2", PROC_NPC_CD3, 0x1B), - OBJNAME("WGN_a2", PROC_NPC_CD3, 0x1C), - OBJNAME("WAN_b2", PROC_NPC_CD3, 0x1D), - OBJNAME("shoe", PROC_NPC_SHOE, -1), - OBJNAME("DoorBoy", PROC_NPC_DOORBOY, -1), - OBJNAME("prayer", PROC_NPC_PRAYER, -1), - OBJNAME("km_Hana", PROC_NPC_KASIHANA, -1), - OBJNAME("km_Kyu", PROC_NPC_KASIKYU, -1), - OBJNAME("km_Mich", PROC_NPC_KASIMICH, -1), - OBJNAME("NpcChat", PROC_NPC_CHAT, -1), - OBJNAME("chtSolA", PROC_NPC_SOLDIERa, -1), - OBJNAME("chtSolB", PROC_NPC_SOLDIERb, -1), - OBJNAME("DrSol1", PROC_NPC_DRSOL, 0x00), - OBJNAME("DrSol2", PROC_NPC_DRSOL, 0x01), - OBJNAME("chin", PROC_NPC_CHIN, -1), - OBJNAME("ins", PROC_NPC_INS, -1), - OBJNAME("Shop0", PROC_NPC_SHOP0, -1), - OBJNAME("TagSch", PROC_Tag_Schedule, -1), - OBJNAME("TagEsc", PROC_Tag_Escape, -1), - OBJNAME("passer", PROC_PASSER_MNG, 0x00), - OBJNAME("passerL", PROC_PASSER_MNG, 0x01), - OBJNAME("fmtion", PROC_FORMATION_MNG, 0x00), - OBJNAME("fmtionL", PROC_FORMATION_MNG, 0x01), - OBJNAME("guard", PROC_GUARD_MNG, -1), - OBJNAME("TgGuard", PROC_TAG_GUARD, -1), - OBJNAME("Mk", PROC_NPC_MK, -1), - OBJNAME("Obj_Tbi", PROC_Obj_Yobikusa, 0x00), - OBJNAME("Obj_Uma", PROC_Obj_Yobikusa, 0x01), - OBJNAME("Obj_knk", PROC_Obj_KazeNeko, -1), - OBJNAME("Obj_nmp", PROC_Obj_NamePlate, -1), - OBJNAME("Obj_Tie", PROC_Obj_OnCloth, -1), - OBJNAME("Obj_Lrp", PROC_Obj_LndRope, -1), - OBJNAME("Obj_Sit", PROC_Obj_ItaRope, -1), - OBJNAME("Ikada", PROC_Obj_Ikada, -1), - OBJNAME("Dust", PROC_Obj_DUST, -1), - OBJNAME("Obj_Ita", PROC_Obj_ITA, -1), - OBJNAME("Ice_l", PROC_Obj_Ice_l, -1), - OBJNAME("Ice_s", PROC_Obj_Ice_s, -1), - OBJNAME("E_Make", PROC_Obj_E_CREATE, -1), - OBJNAME("Bhhashi", PROC_Obj_Bhbridge, -1), - OBJNAME("Yousei", PROC_Obj_Yousei, -1), - OBJNAME("G_Kabe", PROC_Obj_GOMIKABE, -1), - OBJNAME("B_ling", PROC_Obj_Mato, -1), - OBJNAME("kab_o", PROC_Obj_Kabuto, -1), - OBJNAME("I_Cho", PROC_Obj_Cho, -1), - OBJNAME("I_Kuw", PROC_Obj_Kuw, -1), - OBJNAME("I_Nan", PROC_Obj_Nan, -1), - OBJNAME("I_Dan", PROC_Obj_Dan, -1), - OBJNAME("I_Kam", PROC_Obj_Kam, -1), - OBJNAME("I_Ten", PROC_Obj_Ten, -1), - OBJNAME("I_Ari", PROC_Obj_Ari, -1), - OBJNAME("I_Kag", PROC_Obj_Kag, -1), - OBJNAME("I_Tom", PROC_Obj_Tombo, -1), - OBJNAME("I_Bat", PROC_Obj_Batta, -1), - OBJNAME("I_Kat", PROC_Obj_Kat, -1), - OBJNAME("H_Saku", PROC_Obj_H_Saku, -1), - OBJNAME("sm_door", PROC_Obj_SM_DOOR, -1), - OBJNAME("Kaisou", PROC_Obj_Kaisou, -1), - OBJNAME("Ni", PROC_NI, -1), - OBJNAME("Fr", PROC_FR, -1), - OBJNAME("Sq", PROC_SQ, -1), - OBJNAME("Bd", PROC_BD, -1), - OBJNAME("Obj_ki", PROC_OBJ_KI, -1), - OBJNAME("Do", PROC_DO, -1), - OBJNAME("Lm", PROC_NPC_FISH, 0x00), - OBJNAME("Tr", PROC_NPC_FISH, 0x05), - OBJNAME("Npc_tr", PROC_NPC_TR, -1), - OBJNAME("Npc_lf", PROC_NPC_LF, -1), - OBJNAME("Fish", PROC_MG_FISH, -1), - OBJNAME("NPC_TK", PROC_NPC_TK, -1), - OBJNAME("Obj_fd", PROC_OBJ_FOOD, -1), - OBJNAME("MYNA", PROC_MYNA, -1), - OBJNAME("SSITEM", PROC_OBJ_SSITEM, -1), - OBJNAME("SSDRINK", PROC_OBJ_SSDRINK, -1), - OBJNAME("TGDRINK", PROC_TAG_SSDRINK, -1), - OBJNAME("Tag_Btl", PROC_TAG_BTLITM, -1), - OBJNAME("lv5soup", PROC_TAG_LV5SOUP, -1), - OBJNAME("TGMNLIG", PROC_TAG_MNLIGHT, -1), - OBJNAME("TGSPCAM", PROC_TAG_SHOPCAM, -1), - OBJNAME("TGSPITM", PROC_TAG_SHOPITM, -1), - OBJNAME("OilTubo", PROC_OBJ_OILTUBO, -1), - OBJNAME("Roten", PROC_OBJ_ROTEN, -1), - OBJNAME("Pleaf", PROC_OBJ_PLEAF, -1), - OBJNAME("KBacket", PROC_OBJ_KBACKET, -1), - OBJNAME("YBag", PROC_OBJ_YBAG, -1), - OBJNAME("Pumpkin", PROC_OBJ_PUMPKIN, -1), - OBJNAME("Obj_kg", PROC_OBJ_KAGO, -1), - OBJNAME("BbKago", PROC_OBJ_KAGO, 0x00), - OBJNAME("OnKago", PROC_OBJ_KAGO, 0x01), - OBJNAME("ObjHasi", PROC_Obj_HHASHI, -1), - OBJNAME("Thashi", PROC_Obj_THASHI, -1), - OBJNAME("B_Hashi", PROC_Obj_BHASHI, -1), - OBJNAME("E_MD", PROC_E_MD, -1), - OBJNAME("E_s1", PROC_E_S1, -1), - OBJNAME("E_wb", PROC_E_WB, -1), - OBJNAME("E_rd", PROC_E_RD, -1), - OBJNAME("E_rdb", PROC_E_RDB, -1), - OBJNAME("E_rdy", PROC_E_RDY, -1), - OBJNAME("E_fm", PROC_E_FM, -1), - OBJNAME("E_dn", PROC_E_DN, -1), - OBJNAME("E_mf", PROC_E_MF, -1), - OBJNAME("TreeSh", PROC_TREESH, -1), - OBJNAME("E_bug", PROC_E_BUG, -1), - OBJNAME("E_bee", PROC_E_BEE, -1), - OBJNAME("E_nest", PROC_E_NEST, -1), - OBJNAME("E_kr", PROC_E_KR, -1), - OBJNAME("E_st", PROC_E_ST, -1), - OBJNAME("E_tk", PROC_E_TK, -1), - OBJNAME("E_tk2", PROC_E_TK2, -1), - OBJNAME("E_th", PROC_E_TH, -1), - OBJNAME("E_cr", PROC_E_CR, -1), - OBJNAME("E_df", PROC_E_DF, -1), - OBJNAME("E_ph", PROC_E_PH, -1), - OBJNAME("E_fs", PROC_E_FS, -1), - OBJNAME("E_SB", PROC_E_SB, -1), - OBJNAME("E_HM", PROC_E_HM, -1), - OBJNAME("E_fk", PROC_E_FK, -1), - OBJNAME("E_pm", PROC_E_PM, -1), - OBJNAME("Npc_ne", PROC_NPC_NE, -1), - OBJNAME("E_db", PROC_E_DB, -1), - OBJNAME("E_kg", PROC_E_KG, -1), - OBJNAME("E_sh", PROC_E_SH, -1), - OBJNAME("E_sf", PROC_E_SF, -1), - OBJNAME("Obj_lb", PROC_OBJ_LBOX, -1), - OBJNAME("Obj_kb", PROC_OBJ_KBOX, -1), - OBJNAME("E_bs", PROC_E_BS, -1), - OBJNAME("Sekizoa", PROC_OBJ_SEKIZOA, 0x00), - OBJNAME("Sekizob", PROC_OBJ_SEKIZOA, 0x01), - OBJNAME("E_sm", PROC_E_SM, -1), - OBJNAME("E_sm2", PROC_E_SM2, -1), - OBJNAME("ky_tag0", PROC_KYTAG00, -1), - OBJNAME("ky_tag1", PROC_KYTAG01, 0x00), - OBJNAME("ky_tag2", PROC_KYTAG02, -1), - OBJNAME("ky_tag3", PROC_KYTAG01, 0x01), - OBJNAME("kytag3", PROC_KYTAG03, -1), - OBJNAME("DK_tag", PROC_KYTAG04, -1), - OBJNAME("PPHole", PROC_KYTAG05, -1), - OBJNAME("KY_chg", PROC_KYTAG06, -1), - OBJNAME("Plight", PROC_KYTAG07, -1), - OBJNAME("KY_mk", PROC_KYTAG08, -1), - OBJNAME("Bound", PROC_KYTAG09, -1), - OBJNAME("WC_tag", PROC_KYTAG01, 0x02), - OBJNAME("Sparks", PROC_KYTAG10, -1), - OBJNAME("Tcntrl", PROC_KYTAG11, -1), - OBJNAME("Drkmst", PROC_KYTAG12, -1), - OBJNAME("Blsnow", PROC_KYTAG13, -1), - OBJNAME("Savmem", PROC_KYTAG14, -1), - OBJNAME("Zshake", PROC_KYTAG15, -1), - OBJNAME("Pikari", PROC_KYTAG16, -1), - OBJNAME("Lmask", PROC_KYTAG17, -1), - OBJNAME("E_is", PROC_E_IS, -1), - OBJNAME("E_ai", PROC_E_AI, -1), - OBJNAME("E_ba", PROC_E_BA, -1), - OBJNAME("E_bu", PROC_E_BU, -1), - OBJNAME("E_sw", PROC_E_SW, -1), - OBJNAME("E_ge", PROC_E_GE, -1), - OBJNAME("TagGe", PROC_Tag_WatchGe, -1), - OBJNAME("E_ym", PROC_E_YM, -1), - OBJNAME("E_ymt", PROC_E_YM_TAG, -1), - OBJNAME("E_ymb", PROC_E_YMB, -1), - OBJNAME("Fwall", PROC_Tag_FWall, -1), - OBJNAME("E_hz", PROC_E_HZ, -1), - OBJNAME("E_ws", PROC_E_WS, -1), - OBJNAME("E_oc", PROC_E_OC, -1), - OBJNAME("E_dt", PROC_E_DT, -1), - OBJNAME("E_bg", PROC_E_BG, -1), - OBJNAME("E_octbg", PROC_E_OctBg, -1), - OBJNAME("E_tt", PROC_E_TT, -1), - OBJNAME("E_dk", PROC_E_DK, -1), - OBJNAME("E_vt", PROC_E_VT, -1), - OBJNAME("E_ww", PROC_E_WW, -1), - OBJNAME("E_gi", PROC_E_GI, -1), - OBJNAME("E_mk", PROC_E_MK, -1), - OBJNAME("B_gm", PROC_B_GM, -1), - OBJNAME("E_gm", PROC_E_GM, -1), - OBJNAME("E_gs", PROC_E_GS, -1), - OBJNAME("Npc_ne", PROC_NPC_NE, -1), - OBJNAME("Obj_gm", PROC_OBJ_GM, -1), - OBJNAME("E_mm", PROC_E_MM, -1), - OBJNAME("E_mm2", PROC_E_MM, 0x01), - OBJNAME("E_fz", PROC_E_FZ, -1), - OBJNAME("E_fb", PROC_E_FB, -1), - OBJNAME("E_Zs", PROC_E_ZS, -1), - OBJNAME("E_kk", PROC_E_KK, -1), - OBJNAME("E_hp", PROC_E_HP, -1), - OBJNAME("E_zh", PROC_E_ZH, -1), - OBJNAME("E_zm", PROC_E_ZM, -1), - OBJNAME("E_zm2", PROC_E_ZM, 0x01), - OBJNAME("E_pz", PROC_E_PZ, -1), - OBJNAME("Kita", PROC_OBJ_KITA, -1), - OBJNAME("E_nz", PROC_E_NZ, -1), - OBJNAME("E_po", PROC_E_PO, -1), - OBJNAME("Obj_w0", PROC_OBJ_WEB0, -1), - OBJNAME("Obj_w1", PROC_OBJ_WEB1, -1), - OBJNAME("Obj_cb", PROC_OBJ_CB, -1), - OBJNAME("Obj_mak", PROC_OBJ_MAKI, -1), - OBJNAME("Obj_brg", PROC_OBJ_BRG, -1), - OBJNAME("E_rb", PROC_E_RB, -1), - OBJNAME("E_sg", PROC_E_SG, -1), - OBJNAME("Obj_tby", PROC_OBJ_TOBY, -1), - OBJNAME("Obj_sw", PROC_OBJ_SW, -1), - OBJNAME("Npc_ks", PROC_NPC_KS, -1), - OBJNAME("Obj_so", PROC_OBJ_SO, -1), - OBJNAME("E_bi", PROC_E_BI, -1), - OBJNAME("Obj_key", PROC_OBJ_KEY, -1), - OBJNAME("E_hb", PROC_E_HB, -1), - OBJNAME("Obj_hb", PROC_OBJ_HB, -1), - OBJNAME("B_bq", PROC_B_BQ, -1), - OBJNAME("B_bh", PROC_B_BH, -1), - OBJNAME("B_go", PROC_B_GO, -1), - OBJNAME("Obj_fw", PROC_OBJ_FW, -1), - OBJNAME("E_ga", PROC_E_GA, -1), - OBJNAME("E_gb", PROC_E_GB, -1), - OBJNAME("E_wap", PROC_E_WAP, -1), - OBJNAME("Obj_sui", PROC_OBJ_SUISYA, -1), - OBJNAME("Obj_bal", PROC_OBJ_BALLOON, -1), - OBJNAME("Obj_lp", PROC_OBJ_LP, -1), - OBJNAME("Obj_nd", PROC_OBJ_NDOOR, -1), - OBJNAME("Obj_ud", PROC_OBJ_UDOOR, -1), - OBJNAME("Obj_us", PROC_OBJ_USAKU, -1), - OBJNAME("Obj_kn2", PROC_OBJ_KANBAN2, -1), - OBJNAME("Obj_kyh", PROC_OBJ_KEYHOLE, -1), - OBJNAME("Bed", PROC_OBJ_BED, -1), - OBJNAME("BouMato", PROC_OBJ_BOUMATO, -1), - OBJNAME("AutoMt", PROC_OBJ_AUTOMATA, -1), - OBJNAME("Gadget", PROC_OBJ_GADGET, -1), - OBJNAME("ItaMato", PROC_OBJ_ITAMATO, -1), - OBJNAME("Nougu", PROC_OBJ_NOUGU, -1), - OBJNAME("Stick", PROC_OBJ_STICK, -1), - OBJNAME("Mie", PROC_OBJ_MIE, -1), - OBJNAME("SkDoor", PROC_OBJ_SEKIDOOR, -1), - OBJNAME("Sekizo", PROC_OBJ_SEKIZO, -1), - OBJNAME("SMTile", PROC_OBJ_SMTILE, -1), - OBJNAME("H_kage", PROC_OBJ_KAGE, -1), - OBJNAME("E_ms", PROC_E_MS, -1), - OBJNAME("Obj_tp", PROC_OBJ_TP, -1), - OBJNAME("Obj_ms", PROC_OBJ_MSIMA, -1), - OBJNAME("E_gob", PROC_E_GOB, -1), - OBJNAME("E_yk", PROC_E_YK, -1), - OBJNAME("E_yr", PROC_E_YR, -1), - OBJNAME("E_yg", PROC_E_YG, -1), - OBJNAME("Obj_fm", PROC_OBJ_FMOBJ, -1), - OBJNAME("B_ob", PROC_B_OB, -1), - OBJNAME("OcHashi", PROC_OCTHASHI, -1), - OBJNAME("E_dd", PROC_E_DD, -1), - OBJNAME("Obj_rw", PROC_OBJ_RW, -1), - OBJNAME("Obj_ih", PROC_OBJ_IHASI, -1), - OBJNAME("E_yc", PROC_E_YC, -1), - OBJNAME("B_ds", PROC_B_DS, -1), - OBJNAME("B_dr", PROC_B_DR, -1), - OBJNAME("B_gg", PROC_B_GG, -1), - OBJNAME("B_yo", PROC_B_YO, -1), - OBJNAME("B_tn", PROC_B_TN, -1), - OBJNAME("B_zant", PROC_B_ZANT, -1), - OBJNAME("B_zntm", PROC_B_ZANTZ, -1), - OBJNAME("B_znts", PROC_B_ZANTS, -1), - OBJNAME("E_yd", PROC_E_YD, -1), - OBJNAME("E_yh", PROC_E_YH, -1), - OBJNAME("Henna", PROC_NPC_HENNA, -1), - OBJNAME("Henna0", PROC_NPC_HENNA0, -1), - OBJNAME("Npc_du", PROC_NPC_DU, 0x00), - OBJNAME("Econt", PROC_ECONT, -1), - OBJNAME("B_mgn", PROC_B_MGN, -1), - OBJNAME("Hzelda", PROC_E_HZELDA, -1), - OBJNAME("Worm", PROC_NPC_WORM, -1), - OBJNAME("B_gnd", PROC_B_GND, -1), - OBJNAME("Obj_gb", PROC_OBJ_GB, -1), - OBJNAME("tboxA0", PROC_TBOX, -1), - OBJNAME("tboxA1", PROC_TBOX, -1), - OBJNAME("tboxA2", PROC_TBOX, -1), - OBJNAME("tboxB0", PROC_TBOX, -1), - OBJNAME("tboxB1", PROC_TBOX, -1), - OBJNAME("tboxB2", PROC_TBOX, -1), - OBJNAME("tboxJ0", PROC_TBOX, -1), - OBJNAME("tboxP0", PROC_TBOX, -1), - OBJNAME("tboxB00", PROC_TBOX, -1), - OBJNAME("tboxB01", PROC_TBOX, -1), - OBJNAME("tboxW0", PROC_TBOX, -1), - OBJNAME("tboxEL0", PROC_TBOX2, -1), - OBJNAME("tboxEL1", PROC_TBOX2, -1), - OBJNAME("l8warp", PROC_Obj_BossWarp, -1), - OBJNAME("L1Bdoor", PROC_L1BOSS_DOOR, -1), - OBJNAME("L2Bdoor", PROC_L1BOSS_DOOR, -1), - OBJNAME("L3Bdoor", PROC_Obj_Kshutter, -1), - OBJNAME("L4Bdoor", PROC_L1BOSS_DOOR, -1), - OBJNAME("L5Bdoor", PROC_L5BOSS_DOOR, -1), - OBJNAME("L6Bdoor", PROC_L1BOSS_DOOR, -1), - OBJNAME("L7Bdoor", PROC_L1BOSS_DOOR, -1), - OBJNAME("L8Bdoor", PROC_L1BOSS_DOOR, -1), - OBJNAME("L9Bdoor", PROC_L1BOSS_DOOR, -1), - OBJNAME("L1Mdoor", PROC_L1MBOSS_DOOR, 0x01), - OBJNAME("L2Mdoor", PROC_L1MBOSS_DOOR, 0x02), - OBJNAME("L3Mdoor", PROC_L1MBOSS_DOOR, 0x03), - OBJNAME("L4Mdoor", PROC_L1MBOSS_DOOR, 0x04), - OBJNAME("L5Mdoor", PROC_L1MBOSS_DOOR, 0x05), - OBJNAME("L6Mdoor", PROC_L1MBOSS_DOOR, 0x06), - OBJNAME("L7Mdoor", PROC_L1MBOSS_DOOR, 0x07), - OBJNAME("L8Mdoor", PROC_L1MBOSS_DOOR, 0x08), - OBJNAME("L7door", PROC_L1MBOSS_DOOR, 0x0A), - OBJNAME("L5door", PROC_L1MBOSS_DOOR, 0x0B), - OBJNAME("Horse", PROC_HORSE, -1), - OBJNAME("Canoe", PROC_CANOE, -1), - OBJNAME("Crope", PROC_Obj_Crope, -1), - OBJNAME("Cstatue", PROC_CSTATUE, -1), - OBJNAME("CstaF", PROC_CSTAF, -1), - OBJNAME("HoZelda", PROC_HOZELDA, -1), - OBJNAME("Mhint", PROC_Tag_Mhint, -1), - OBJNAME("Mmsg", PROC_Tag_Mmsg, -1), - OBJNAME("Mwait", PROC_Tag_Mwait, -1), - OBJNAME("Mstop", PROC_Tag_Mstop, -1), - OBJNAME("MstopE", PROC_Tag_Mstop, -1), - OBJNAME("Hinit", PROC_Tag_Hinit, -1), - OBJNAME("Hjump", PROC_Tag_Hjump, -1), - OBJNAME("Hstop", PROC_Tag_Hstop, -1), - OBJNAME("AJnot", PROC_Tag_AJnot, -1), - OBJNAME("Wljump", PROC_Tag_Wljump, -1), - OBJNAME("Sppath", PROC_Tag_Sppath, -1), - OBJNAME("Stream", PROC_Tag_Stream, -1), - OBJNAME("Gstart", PROC_Tag_Gstart, -1), - OBJNAME("TgTGate", PROC_Tag_TWGate, -1), - OBJNAME("Lv6Gate", PROC_Tag_Lv6Gate, -1), - OBJNAME("Lv7Gate", PROC_Tag_Lv7Gate, -1), - OBJNAME("Lv8Gate", PROC_Tag_Lv8Gate, -1), - OBJNAME("TgTHint", PROC_Tag_TheBHint, -1), - OBJNAME("TagAsst", PROC_Tag_Assist, -1), - OBJNAME("Dmidna", PROC_DMIDNA, -1), - OBJNAME("Fchain", PROC_Obj_Fchain, -1), - OBJNAME("Wchain", PROC_Obj_Wchain, -1), - OBJNAME("Cdoor", PROC_Obj_Cdoor, -1), - OBJNAME("Cgate", PROC_Obj_Cdoor, -1), - OBJNAME("Water00", PROC_GRDWATER, -1), - OBJNAME("Digpl", PROC_Obj_Digpl, -1), - OBJNAME("Digholl", PROC_Obj_Digholl, -1), - OBJNAME("Bombf", PROC_Obj_Bombf, -1), - OBJNAME("hider", PROC_SUSPEND, -1), - OBJNAME("SwAreaC", PROC_SWC00, -1), - OBJNAME("SwAreaS", PROC_SWC00, -1), - OBJNAME("SwLBall", PROC_SwLBall, -1), - OBJNAME("SwBall", PROC_SwBall, -1), - OBJNAME("thouse", PROC_Obj_TobyHouse, -1), - OBJNAME("ironbox", PROC_Obj_MetalBox, -1), - OBJNAME("l6swtrn", PROC_Obj_Lv6SwTurn, -1), - OBJNAME("l2bmtag", PROC_Tag_Lv2PrChk, -1), - OBJNAME("swspin", PROC_Obj_SwSpinner, -1), - OBJNAME("spnGear", PROC_Obj_Lv4Gear, -1), - OBJNAME("fan", PROC_Obj_Fan, -1), - OBJNAME("tgake", PROC_Obj_Gake, -1), - OBJNAME("tmoon", PROC_Obj_TMoon, -1), - OBJNAME("gwall", PROC_Obj_GanonWall, -1), - OBJNAME("gwall2", PROC_Obj_GanonWall2, -1), - OBJNAME("scnChg", PROC_SCENE_EXIT, -1), - OBJNAME("scnChg2", PROC_SCENE_EXIT2, -1), - OBJNAME("noChgRm", PROC_NO_CHG_ROOM, -1), - OBJNAME("readRm", PROC_NO_CHG_ROOM, 0x00), - OBJNAME("Tetd", PROC_DSHUTTER, -1), - OBJNAME("fence", PROC_DSHUTTER, -1), - OBJNAME("lv7saku", PROC_DSHUTTER, -1), - OBJNAME("YkgrON", PROC_Ykgr, -1), - OBJNAME("YkgrOFF", PROC_Ykgr, -1), - OBJNAME("TagEv", PROC_TAG_EVENT, -1), - OBJNAME("TagEvC", PROC_TAG_EVENT, -1), - OBJNAME("TagEvt", PROC_TAG_EVT, 0x00), - OBJNAME("TagEvt1", PROC_TAG_EVT, 0x01), - OBJNAME("TagHowl", PROC_TAG_HOWL, 0x01), - OBJNAME("Tag_ms", PROC_TAG_MSG, 0x00), - OBJNAME("LntnTag", PROC_TAG_LANTERN, -1), - OBJNAME("EvtArea", PROC_TAG_EVTAREA, -1), - OBJNAME("AllMato", PROC_TAG_ALLMATO, -1), - OBJNAME("EvtMsg", PROC_TAG_EVTMSG, -1), - OBJNAME("KMsg", PROC_TAG_KMSG, -1), - OBJNAME("Push", PROC_TAG_PUSH, -1), - OBJNAME("Teloper", PROC_TAG_TELOP, -1), - OBJNAME("CamChg", PROC_TAG_CAMERA, -1), - OBJNAME("CamArea", PROC_TAG_CAMERA, -1), - OBJNAME("CamAreC", PROC_TAG_CAMERA, -1), - OBJNAME("ChkPntS", PROC_TAG_CHKPOINT, -1), - OBJNAME("ChkPntC", PROC_TAG_CHKPOINT, -1), - OBJNAME("setball", PROC_Tag_SetBall, -1), - OBJNAME("atkItem", PROC_Tag_AttackItem, -1), - OBJNAME("TagStat", PROC_Tag_Statue, -1), - OBJNAME("zdoor", PROC_Obj_ZDoor, -1), - OBJNAME("rdoor", PROC_Obj_ZDoor, -1), - OBJNAME("STDoa", PROC_Obj_ZDoor, -1), - OBJNAME("hasi00", PROC_Obj_Pillar, -1), - OBJNAME("hasi01", PROC_Obj_Pillar, -1), - OBJNAME("window", PROC_Obj_Window, -1), - OBJNAME("bbox", PROC_Obj_BBox, -1), - OBJNAME("spiralC", PROC_Obj_Lv3R10Saka, -1), - OBJNAME("spiral2", PROC_Obj_Lv3R10Saka, -1), - OBJNAME("digsnow", PROC_Obj_DigSnow, -1), - OBJNAME("digsand", PROC_Obj_Lv4DigSand, -1), - OBJNAME("fallobj", PROC_Obj_FallObj, -1), - OBJNAME("l7brg", PROC_Obj_Lv7Bridge, -1), - OBJNAME("dr", PROC_DR, -1), - OBJNAME("L7lowDr", PROC_L7lowDr, -1), - OBJNAME("swTime", PROC_SwTime, -1), - OBJNAME("pdrobj", PROC_Obj_PushDoor, -1), - OBJNAME("crystal", PROC_Obj_Crystal, -1), - OBJNAME("WarpBrg", PROC_Obj_KakarikoBrg, -1), - OBJNAME("WarpB2", PROC_Obj_KakarikoBrg, -1), - OBJNAME("WarpOB1", PROC_Obj_OrdinBrg, 0x00), - OBJNAME("WarpOB2", PROC_Obj_OrdinBrg, 0x01), - OBJNAME("VolcGnd", PROC_Obj_VolcGnd, -1), - OBJNAME("r09wtr", PROC_Obj_WaterEff, -1), - OBJNAME("ballSw", PROC_Obj_SwBallA, -1), - OBJNAME("lballSw", PROC_Obj_SwBallB, -1), - OBJNAME("lbsw", PROC_Obj_SwBallC, -1), - OBJNAME("R50Sand", PROC_Obj_Lv4Sand, -1), - OBJNAME("rwall", PROC_Obj_Lv4RailWall, -1), - OBJNAME("l4brg", PROC_Obj_Lv4Bridge, -1), - OBJNAME("l4floor", PROC_Obj_Lv4Floor, -1), - OBJNAME("item", PROC_ITEM, -1), - OBJNAME("itemKey", PROC_Obj_SmallKey, -1), - OBJNAME("kantera", PROC_Obj_Kantera, -1), - OBJNAME("witem", PROC_ITEM, -1), - OBJNAME("wshield", PROC_Obj_Shield, -1), - OBJNAME("htPiece", PROC_Obj_LifeContainer, -1), - OBJNAME("htCase", PROC_Obj_LifeContainer, -1), - OBJNAME("Mbrid15", PROC_Obj_RotBridge, -1), - OBJNAME("Mbrid9", PROC_Obj_RotBridge, -1), - OBJNAME("maglift", PROC_Obj_MagLift, -1), - OBJNAME("Cldst00", PROC_Obj_Lv1Cdl00, -1), - OBJNAME("Cldst01", PROC_Obj_Lv1Cdl01, -1), - OBJNAME("RMback0", PROC_Tag_Restart, -1), - OBJNAME("RMback1", PROC_Tag_ChgRestart, -1), - OBJNAME("Mist", PROC_Tag_Mist, -1), - OBJNAME("magLifR", PROC_Obj_MagLiftRot, -1), - OBJNAME("TCdlst", PROC_Obj_TvCdlst, -1), - OBJNAME("wdstick", PROC_Obj_WdStick, -1), - OBJNAME("stBlock", PROC_Obj_StairBlock, -1), - OBJNAME("hsMato", PROC_Obj_HsTarget, -1), - OBJNAME("ktFire", PROC_Tag_KtOnFire, -1), - OBJNAME("hswitch", PROC_Obj_HeavySw, -1), - OBJNAME("goGate", PROC_Obj_GoGate, -1), - OBJNAME("taAmi", PROC_Obj_TaFence, -1), - OBJNAME("fireWd", PROC_Obj_FireWood, -1), - OBJNAME("fireWd2", PROC_Obj_FireWood2, -1), - OBJNAME("altar", PROC_Obj_Saidan, -1), - OBJNAME("gpTaru", PROC_Obj_GpTaru, -1), - OBJNAME("spinLf", PROC_Obj_SpinLift, -1), - OBJNAME("bmWin", PROC_Obj_BmWindow, -1), - OBJNAME("roofHl", PROC_Obj_RfHole, -1), - OBJNAME("syRock", PROC_Obj_SyRock, -1), - OBJNAME("wColumn", PROC_Obj_WaterPillar, -1), - OBJNAME("kpot", PROC_Obj_KiPot, -1), - OBJNAME("bsGate", PROC_Obj_BsGate, -1), - OBJNAME("amiShut", PROC_Obj_AmiShutter, -1), - OBJNAME("kwhel00", PROC_Obj_KWheel00, -1), - OBJNAME("kwhel01", PROC_Obj_KWheel01, -1), - OBJNAME("PRElvtr", PROC_Obj_PRElvtr, -1), - OBJNAME("swhel00", PROC_Obj_KWheel00, -1), - OBJNAME("M_hasu", PROC_Obj_MHasu, -1), - OBJNAME("yiblltr", PROC_Obj_YIblltray, -1), - OBJNAME("l6egate", PROC_Obj_Lv6EGate, -1), - OBJNAME("l6eleva", PROC_Obj_Lv6ElevtA, -1), - OBJNAME("wtGate", PROC_Obj_WtGate, -1), - OBJNAME("candlL2", PROC_Obj_Lv2Candle, -1), - OBJNAME("togeTp", PROC_Obj_TogeTrap, -1), - OBJNAME("rotTrap", PROC_Obj_RotTrap, -1), - OBJNAME("klift00", PROC_Obj_KLift00, -1), - OBJNAME("l4chand", PROC_Obj_Lv4Chan, -1), - OBJNAME("Ychndlr", PROC_Obj_Ychndlr, -1), - OBJNAME("hbmbkoy", PROC_Obj_HBombkoya, -1), - OBJNAME("TagCsw", PROC_TAG_CSW, -1), - OBJNAME("TagCswO", PROC_TAG_CSW, -1), - OBJNAME("P_Rwall", PROC_Obj_Lv4PRwall, -1), - OBJNAME("PDtile", PROC_Obj_PDtile, -1), - OBJNAME("PDwall", PROC_Obj_PDwall, -1), - OBJNAME("Qs", PROC_TAG_QS, -1), - OBJNAME("mirror", PROC_MIRROR, -1), - OBJNAME("rGate", PROC_Obj_SwallShutter, -1), - OBJNAME("l3water", PROC_Obj_Lv3Water, -1), - OBJNAME("l3wat02", PROC_Obj_Lv3Water2, -1), - OBJNAME("l3watB", PROC_OBJ_LV3WATERB, -1), - OBJNAME("szbridg", PROC_Obj_SZbridge, -1), - OBJNAME("kjgjs", PROC_Obj_KJgjs, -1), - OBJNAME("kjs", PROC_Obj_KJgjs, -1), - OBJNAME("candlL3", PROC_Obj_Lv3Candle, -1), - OBJNAME("l5icewl", PROC_Obj_IceWall, -1), - OBJNAME("Turara", PROC_Obj_Turara, -1), - OBJNAME("twGate", PROC_Obj_TwGate, -1), - OBJNAME("L4cdlTg", PROC_Tag_Lv4Candle, -1), - OBJNAME("L4cddTg", PROC_Tag_Lv4CandleDm, -1), - OBJNAME("togeRol", PROC_Obj_Lv6TogeRoll, -1), - OBJNAME("l6TogeT", PROC_Obj_Lv6TogeTrap, -1), - OBJNAME("Tenbin", PROC_Obj_Lv6Tenbin, -1), - OBJNAME("l6Lblk", PROC_Obj_Lv6Lblock, -1), - OBJNAME("l6SwGt", PROC_Obj_Lv6SwGate, -1), - OBJNAME("l6ChBlk", PROC_Obj_Lv6ChgGate, -1), - OBJNAME("l6FuriT", PROC_Obj_Lv6FuriTrap, -1), - OBJNAME("KHdesk", PROC_Obj_BarDesk, -1), - OBJNAME("Ytaihou", PROC_Obj_Ytaihou, -1), - OBJNAME("L4eShut", PROC_Obj_Lv4EdShutter, -1), - OBJNAME("pofire", PROC_Obj_poFire, -1), - OBJNAME("pofiTg", PROC_Tag_poFire, -1), - OBJNAME("poCandl", PROC_Obj_poCandle, -1), - OBJNAME("L4Gate", PROC_Obj_Lv4Gate, -1), - OBJNAME("L4Pgate", PROC_Obj_Lv4PoGate, -1), - OBJNAME("L4SWall", PROC_Obj_Lv4SlideWall, -1), - OBJNAME("L4hmato", PROC_Obj_Lv4HsTarget, -1), - OBJNAME("propy", PROC_Obj_Lv7PropY, -1), - OBJNAME("L7BsGt", PROC_Obj_Lv7BsGate, -1), - OBJNAME("optLift", PROC_Obj_Lv8OptiLift, -1), - OBJNAME("kkiTrap", PROC_Obj_Lv8KekkaiTrap, -1), - OBJNAME("L8LiftX", PROC_Obj_Lv8Lift, -1), - OBJNAME("swStep", PROC_Obj_Lv8UdFloor, -1), - OBJNAME("L9SwSht", PROC_Obj_Lv9SwShutter, -1), - OBJNAME("L5SwIce", PROC_Obj_Lv5SwIce, -1), - OBJNAME("glwSph", PROC_Obj_glowSphere, -1), - OBJNAME("MR_Scrw", PROC_Obj_MirrorScrew, -1), - OBJNAME("MR_Sand", PROC_Obj_MirrorSand, -1), - OBJNAME("MR_Tble", PROC_Obj_MirrorTable, -1), - OBJNAME("MR_Chin", PROC_Obj_MirrorChain, -1), - OBJNAME("MR_Pole", PROC_Obj_Mirror6Pole, -1), - OBJNAME("PPolamp", PROC_PPolamp, -1), - OBJNAME("l5hYuka", PROC_Obj_Lv5FBoard, -1), - OBJNAME("BYRock", PROC_BkyRock, -1), - OBJNAME("zrDrock", PROC_Obj_zrTurara, -1), - OBJNAME("tkrDai", PROC_Obj_TakaraDai, -1), - OBJNAME("Table", PROC_Obj_Table, -1), - OBJNAME("CatDoor", PROC_Obj_CatDoor, -1), - OBJNAME("RetTag", PROC_Tag_RetRoom, -1), - OBJNAME("WdStone", PROC_Obj_WindStone, -1), - OBJNAME("HwlWara", PROC_Tag_WaraHowl, -1), - OBJNAME("SCannon", PROC_Obj_SCannon, -1), - OBJNAME("szGate", PROC_Obj_Lv6SzGate, -1), - OBJNAME("onsTaru", PROC_Obj_OnsenTaru, -1), - OBJNAME("WStoneF", PROC_Obj_SmWStone, -1), - OBJNAME("SCanCrs", PROC_Obj_SCannonCrs, -1), - OBJNAME("snwEfTg", PROC_Tag_SnowEff, -1), - OBJNAME("tmFire", PROC_Obj_TimeFire, -1), - OBJNAME("L7Prop", PROC_Obj_Prop, -1), - OBJNAME("awaPlar", PROC_Obj_awaPlar, -1), - OBJNAME("poTbox", PROC_Obj_poTbox, -1), - OBJNAME("SnwSoup", PROC_Obj_SnowSoup, -1), - OBJNAME("Nagaisu", PROC_Obj_Nagaisu, -1), - OBJNAME("RCircle", PROC_Obj_RCircle, -1), - OBJNAME("L9Chand", PROC_Obj_Chandelier, -1), - OBJNAME("L9Pictr", PROC_Obj_Picture, -1), - OBJNAME("SmkEmt", PROC_Tag_SmkEmt, -1), - OBJNAME("HFtr", PROC_Obj_HFtr, -1), - OBJNAME("HBarrel", PROC_Obj_HBarrel, -1), - OBJNAME("SCanTen", PROC_Obj_SCannonTen, -1), - OBJNAME("cstaSw", PROC_Tag_CstaSw, -1), - OBJNAME("l6cstSw", PROC_Tag_Lv6CstaSw, -1), - OBJNAME("Hata", PROC_Obj_Hata, -1), - OBJNAME("RmbitSw", PROC_Tag_RmbitSw, -1), - OBJNAME("T_Maki", PROC_Obj_ToaruMaki, -1), - OBJNAME("d_act", PROC_DEMO00, -1), - OBJNAME("d_act0", PROC_DEMO00, 0x00), - OBJNAME("d_act1", PROC_DEMO00, 0x01), - OBJNAME("d_act2", PROC_DEMO00, 0x02), - OBJNAME("d_act3", PROC_DEMO00, 0x03), - OBJNAME("d_act4", PROC_DEMO00, 0x04), - OBJNAME("d_act5", PROC_DEMO00, 0x05), - OBJNAME("d_act6", PROC_DEMO00, 0x06), - OBJNAME("d_act7", PROC_DEMO00, 0x07), - OBJNAME("d_act8", PROC_DEMO00, 0x08), - OBJNAME("d_act9", PROC_DEMO00, 0x09), - OBJNAME("d_act10", PROC_DEMO00, 0x0A), - OBJNAME("d_act11", PROC_DEMO00, 0x0B), - OBJNAME("d_act12", PROC_DEMO00, 0x0C), - OBJNAME("d_act13", PROC_DEMO00, 0x0D), - OBJNAME("d_act14", PROC_DEMO00, 0x0E), - OBJNAME("d_act15", PROC_DEMO00, 0x0F), - OBJNAME("d_act16", PROC_DEMO00, 0x10), - OBJNAME("d_act17", PROC_DEMO00, 0x11), - OBJNAME("d_act18", PROC_DEMO00, 0x12), - OBJNAME("d_act19", PROC_DEMO00, 0x13), - OBJNAME("d_act20", PROC_DEMO00, 0x14), - OBJNAME("d_act21", PROC_DEMO00, 0x15), - OBJNAME("d_act22", PROC_DEMO00, 0x16), - OBJNAME("d_act23", PROC_DEMO00, 0x17), - OBJNAME("d_act24", PROC_DEMO00, 0x18), - OBJNAME("d_act25", PROC_DEMO00, 0x19), - OBJNAME("d_act26", PROC_DEMO00, 0x1A), - OBJNAME("d_act27", PROC_DEMO00, 0x1B), - OBJNAME("d_act28", PROC_DEMO00, 0x1C), - OBJNAME("d_act29", PROC_DEMO00, 0x1D), - OBJNAME("d_act30", PROC_DEMO00, 0x1E), - OBJNAME("d_act31", PROC_DEMO00, 0x1F), - OBJNAME("TLogo", PROC_TITLE, -1), + OBJNAME("Grass", fpcNm_GRASS_e, -1), + OBJNAME("kusax1", fpcNm_GRASS_e, -1), + OBJNAME("kusax7", fpcNm_GRASS_e, -1), + OBJNAME("kusax21", fpcNm_GRASS_e, -1), + OBJNAME("flower", fpcNm_GRASS_e, -1), + OBJNAME("flwr7", fpcNm_GRASS_e, -1), + OBJNAME("flwr17", fpcNm_GRASS_e, -1), + OBJNAME("pflower", fpcNm_GRASS_e, -1), + OBJNAME("pflwrx7", fpcNm_GRASS_e, -1), + OBJNAME("door", fpcNm_DOOR20_e, -1), + OBJNAME("kdoor", fpcNm_KNOB20_e, -1), + OBJNAME("ddoor", fpcNm_DBDOOR_e, -1), + OBJNAME("bdoor", fpcNm_BOSS_DOOR_e, -1), + OBJNAME("ndoor", fpcNm_DOOR20_e, -1), + OBJNAME("tadoor", fpcNm_DOOR20_e, -1), + OBJNAME("yodoor", fpcNm_DOOR20_e, -1), + OBJNAME("nadoor", fpcNm_DOOR20_e, -1), + OBJNAME("l9door", fpcNm_DOOR20_e, -1), + OBJNAME("l7door", fpcNm_DOOR20_e, -1), + OBJNAME("pdoor", fpcNm_PushDoor_e, -1), + OBJNAME("bigdoor", fpcNm_DOOR20_e, -1), + OBJNAME("kshtr00", fpcNm_Obj_Kshutter_e, -1), + OBJNAME("vshuter", fpcNm_Obj_Kshutter_e, -1), + OBJNAME("IzmGate", fpcNm_Izumi_Gate_e, -1), + OBJNAME("NoneCam", fpcNm_CAMERA_e, -1), + OBJNAME("NormCam", fpcNm_CAMERA_e, -1), + OBJNAME("Link", fpcNm_ALINK_e, -1), + OBJNAME("carry00", fpcNm_Obj_Carry_e, -1), + OBJNAME("carry01", fpcNm_Obj_Carry_e, -1), + OBJNAME("carry02", fpcNm_Obj_Carry_e, -1), + OBJNAME("carry04", fpcNm_Obj_Carry_e, -1), + OBJNAME("carry05", fpcNm_Obj_Carry_e, -1), + OBJNAME("carry06", fpcNm_Obj_Carry_e, -1), + OBJNAME("carry07", fpcNm_Obj_Carry_e, -1), + OBJNAME("carry08", fpcNm_Obj_Carry_e, -1), + OBJNAME("carry09", fpcNm_Obj_Carry_e, -1), + OBJNAME("ball1", fpcNm_Obj_Carry_e, -1), + OBJNAME("ball2", fpcNm_Obj_Carry_e, -1), + OBJNAME("ball3", fpcNm_Obj_Carry_e, -1), + OBJNAME("carry12", fpcNm_Obj_Carry_e, -1), + OBJNAME("carry13", fpcNm_Obj_Carry_e, -1), + OBJNAME("TagLite", fpcNm_Tag_LightBall_e, -1), + OBJNAME("InoBone", fpcNm_Obj_InoBone_e, -1), + OBJNAME("osiBLK0", fpcNm_Obj_Movebox_e, 0x00), + OBJNAME("dmblk", fpcNm_Obj_Movebox_e, 0x00), + OBJNAME("Kkiba", fpcNm_Obj_Movebox_e, 0x02), + OBJNAME("smblk", fpcNm_Obj_Movebox_e, 0x02), + OBJNAME("Lv4blk", fpcNm_Obj_Movebox_e, -1), + OBJNAME("Lv4blk2", fpcNm_Obj_Movebox_e, -1), + OBJNAME("gstone", fpcNm_Obj_Movebox_e, -1), + OBJNAME("TagAtt", fpcNm_Tag_Attp_e, -1), + OBJNAME("mmvbg", fpcNm_SET_BG_OBJ_e, -1), + OBJNAME("Drop", fpcNm_Obj_Drop_e, -1), + OBJNAME("BkLeaf", fpcNm_Obj_BkLeaf_e, -1), + OBJNAME("cylwind", fpcNm_Obj_Tornado_e, -1), + OBJNAME("TagTrnd", fpcNm_Obj_Tornado2_e, -1), + OBJNAME("mvstair", fpcNm_Obj_MvStair_e, -1), + OBJNAME("UHDoor", fpcNm_Obj_Cowdoor_e, -1), + OBJNAME("SwBoom", fpcNm_Obj_Swpropeller_e, -1), + OBJNAME("Swboom", fpcNm_Obj_Swpropeller_e, -1), + OBJNAME("BoomSht", fpcNm_Obj_BoomShutter_e, -1), + OBJNAME("haihai", fpcNm_Obj_Hfuta_e, -1), + OBJNAME("stopper", fpcNm_Obj_Stopper_e, -1), + OBJNAME("dstop", fpcNm_Obj_Stopper2_e, -1), + OBJNAME("mhole", fpcNm_Obj_MHole_e, -1), + OBJNAME("mhole2", fpcNm_Obj_MHole_e, -1), + OBJNAME("TagMag", fpcNm_Tag_Magne_e, -1), + OBJNAME("P_Warp", fpcNm_Obj_BossWarp_e, -1), + OBJNAME("fpillar", fpcNm_Obj_FirePillar_e, -1), + OBJNAME("yfire", fpcNm_Obj_FirePillar2_e, -1), + OBJNAME("pfire", fpcNm_Obj_FirePillar2_e, -1), + OBJNAME("Huriko1", fpcNm_Obj_WoodPendulum_e, -1), + OBJNAME("VolBall", fpcNm_Obj_VolcanicBall_e, -1), + OBJNAME("VolBom", fpcNm_Obj_VolcanicBall_e, -1), + OBJNAME("BigVolc", fpcNm_Obj_VolcanicBomb_e, -1), + OBJNAME("geyser", fpcNm_Obj_Geyser_e, -1), + OBJNAME("Cwall", fpcNm_Obj_ChainWall_e, -1), + OBJNAME("Tansu", fpcNm_Obj_Chest_e, -1), + OBJNAME("Onsen", fpcNm_Obj_Onsen_e, -1), + OBJNAME("Obj_bm", fpcNm_Obj_Bemos_e, -1), + OBJNAME("lv6bm", fpcNm_Obj_Lv6bemos_e, -1), + OBJNAME("E_bm6", fpcNm_Obj_Lv6bemos2_e, -1), + OBJNAME("stone", fpcNm_Obj_Stone_e, -1), + OBJNAME("stoneB", fpcNm_Obj_Stone_e, -1), + OBJNAME("TagSpin", fpcNm_Tag_Spinner_e, -1), + OBJNAME("L_RopeS", fpcNm_Obj_RopeBridge_e, -1), + OBJNAME("L_RopeB", fpcNm_Obj_RopeBridge_e, -1), + OBJNAME("wcover", fpcNm_Obj_WellCover_e, -1), + OBJNAME("rstair", fpcNm_Obj_RotStair_e, -1), + OBJNAME("marm", fpcNm_Obj_MagneArm_e, -1), + OBJNAME("turnSw", fpcNm_Obj_SwTurn_e, -1), + OBJNAME("chainSw", fpcNm_Obj_SwChain_e, -1), + OBJNAME("wsword", fpcNm_Obj_WoodenSword_e, -1), + OBJNAME("iceblk", fpcNm_Obj_IceBlock_e, -1), + OBJNAME("KkrSmk", fpcNm_Obj_Smoke_e, -1), + OBJNAME("dmele", fpcNm_Obj_Elevator_e, -1), + OBJNAME("wfall", fpcNm_Obj_WaterFall_e, -1), + OBJNAME("izora", fpcNm_Obj_ZoraCloth_e, -1), + OBJNAME("smgdoor", fpcNm_Obj_SmgDoor_e, -1), + OBJNAME("smkdoor", fpcNm_Obj_SmgDoor_e, -1), + OBJNAME("Obj_ava", fpcNm_Obj_Avalanche_e, -1), + OBJNAME("thdoor", fpcNm_Obj_TDoor_e, -1), + OBJNAME("mstrsrd", fpcNm_Obj_MasterSword_e, -1), + OBJNAME("wimage", fpcNm_Obj_WoodStatue_e, -1), + OBJNAME("sword", fpcNm_Obj_Sword_e, -1), + OBJNAME("spring", fpcNm_Tag_Spring_e, -1), + OBJNAME("BkDoorL", fpcNm_Obj_BkDoor_e, -1), + OBJNAME("BkDoorR", fpcNm_Obj_BkDoor_e, -1), + OBJNAME("IGateL", fpcNm_Obj_MGate_e, -1), + OBJNAME("IGateR", fpcNm_Obj_MGate_e, -1), + OBJNAME("HGateL", fpcNm_Obj_MGate_e, -1), + OBJNAME("HGateR", fpcNm_Obj_MGate_e, -1), + OBJNAME("K_Gate", fpcNm_Obj_KkrGate_e, -1), + OBJNAME("R_Gate", fpcNm_Obj_RiderGate_e, -1), + OBJNAME("kkanban", fpcNm_Obj_KKanban_e, -1), + OBJNAME("Mhsg6", fpcNm_Obj_Ladder_e, 0x00), + OBJNAME("Mhsg9", fpcNm_Obj_Ladder_e, 0x01), + OBJNAME("Mhsg12", fpcNm_Obj_Ladder_e, 0x02), + OBJNAME("Mhsg15", fpcNm_Obj_Ladder_e, 0x03), + OBJNAME("Mhsg4h", fpcNm_Obj_Ladder_e, 0x04), + OBJNAME("Mhsg3", fpcNm_Obj_Ladder_e, 0x05), + OBJNAME("bonbori", fpcNm_EP_e, -1), + OBJNAME("Cow", fpcNm_COW_e, -1), + OBJNAME("Peru", fpcNm_PERU_e, -1), + OBJNAME("Kago", fpcNm_KAGO_e, -1), + OBJNAME("TagFall", fpcNm_Tag_WaterFall_e, -1), + OBJNAME("Kbota_A", fpcNm_Obj_Swpush_e, 0x00), + OBJNAME("Kbota_B", fpcNm_Obj_Swpush_e, 0x01), + OBJNAME("KbotaC", fpcNm_Obj_Swpush_e, 0x02), + OBJNAME("Swpush", fpcNm_Obj_Swpush_e, 0x00), + OBJNAME("Lv3bota", fpcNm_Obj_Swpush_e, 0x00), + OBJNAME("Ksw00_C", fpcNm_Obj_Swpush2_e, 0x02), + OBJNAME("hvySw", fpcNm_Obj_Swpush5_e, 0x00), + OBJNAME("buraA", fpcNm_Obj_SwHang_e, 0x00), + OBJNAME("buraB", fpcNm_Obj_SwHang_e, 0x00), + OBJNAME("buraA2", fpcNm_Obj_SwHang_e, 0x00), + OBJNAME("buraB2", fpcNm_Obj_SwHang_e, 0x00), + OBJNAME("bura7A", fpcNm_Obj_SwHang_e, 0x00), + OBJNAME("bura7B", fpcNm_Obj_SwHang_e, 0x00), + OBJNAME("bura7C", fpcNm_Obj_SwHang_e, 0x00), + OBJNAME("bura7D", fpcNm_Obj_SwHang_e, 0x00), + OBJNAME("bura7E", fpcNm_Obj_SwHang_e, 0x00), + OBJNAME("tbox_sw", fpcNm_TBOX_SW_e, 0x00), + OBJNAME("swLight", fpcNm_Obj_SwLight_e, 0x00), + OBJNAME("iceleaf", fpcNm_Obj_IceLeaf_e, 0x00), + OBJNAME("swHit", fpcNm_SWHIT0_e, 0x00), + OBJNAME("swHit2", fpcNm_SWHIT0_e, 0x01), + OBJNAME("ObjTime", fpcNm_Obj_Timer_e, -1), + OBJNAME("AND_SW", fpcNm_ANDSW_e, -1), + OBJNAME("AND_SW2", fpcNm_ANDSW2_e, -1), + OBJNAME("ALLdie", fpcNm_ALLDIE_e, -1), + OBJNAME("rvback", fpcNm_Tag_RiverBack_e, -1), + OBJNAME("kagoFal", fpcNm_Tag_KagoFall_e, -1), + OBJNAME("CrvGate", fpcNm_Obj_CRVGATE_e, -1), + OBJNAME("CrvSaku", fpcNm_Obj_CRVFENCE_e, -1), + OBJNAME("CrvWood", fpcNm_Obj_CRVHAHEN_e, -1), + OBJNAME("CrvStel", fpcNm_Obj_CRVSTEEL_e, -1), + OBJNAME("CrvLH", fpcNm_Obj_CRVLH_DW_e, -1), + OBJNAME("RvRock", fpcNm_Obj_RIVERROCK_e, -1), + OBJNAME("P2a", fpcNm_NPC_P2_e, 0x00), + OBJNAME("P2b", fpcNm_NPC_P2_e, 0x01), + OBJNAME("P2c", fpcNm_NPC_P2_e, 0x02), + OBJNAME("Gnd", fpcNm_NPC_GND_e, -1), + OBJNAME("grA", fpcNm_NPC_GRA_e, -1), + OBJNAME("Obj_grA", fpcNm_OBJ_GRA_e, -1), + OBJNAME("Tag_grA", fpcNm_TAG_GRA_e, -1), + OBJNAME("TagYami", fpcNm_TAG_YAMI_e, -1), + OBJNAME("grC", fpcNm_NPC_GRC_e, -1), + OBJNAME("grM", fpcNm_NPC_GRM_e, -1), + OBJNAME("grMC", fpcNm_NPC_GRMC_e, -1), + OBJNAME("grS", fpcNm_NPC_GRS_e, -1), + OBJNAME("grD1", fpcNm_NPC_GRD_e, -1), + OBJNAME("grD", fpcNm_NPC_WRESTLER_e, 0x01), + OBJNAME("grR", fpcNm_NPC_GRR_e, -1), + OBJNAME("grO", fpcNm_NPC_GRO_e, -1), + OBJNAME("grZ", fpcNm_NPC_GRZ_e, -1), + OBJNAME("grARock", fpcNm_Obj_GraRock_e, -1), + OBJNAME("grZRock", fpcNm_Obj_GrzRock_e, -1), + OBJNAME("osnFire", fpcNm_OBJ_ONSEN_FIRE_e, -1), + OBJNAME("yamiD", fpcNm_NPC_YAMID_e, -1), + OBJNAME("yamiT", fpcNm_NPC_YAMIT_e, -1), + OBJNAME("yamiS", fpcNm_NPC_YAMIS_e, -1), + OBJNAME("Blue_NS", fpcNm_NPC_BLUENS_e, -1), + OBJNAME("Kakashi", fpcNm_NPC_KAKASHI_e, 0x00), + OBJNAME("Kdk", fpcNm_NPC_KDK_e, -1), + OBJNAME("Aru", fpcNm_NPC_ARU_e, -1), + OBJNAME("Bans", fpcNm_NPC_BANS_e, -1), + OBJNAME("Besu", fpcNm_NPC_BESU_e, -1), + OBJNAME("Bou", fpcNm_NPC_BOU_e, -1), + OBJNAME("BouS", fpcNm_NPC_BOU_S_e, 0x00), + OBJNAME("clerkA", fpcNm_NPC_CLERKA_e, 0x00), + OBJNAME("clerkB", fpcNm_NPC_CLERKB_e, 0x00), + OBJNAME("clerkT", fpcNm_NPC_CLERKT_e, 0x00), + OBJNAME("Ash", fpcNm_NPC_ASH_e, -1), + OBJNAME("AshB", fpcNm_NPC_ASHB_e, -1), + OBJNAME("Shad", fpcNm_NPC_SHAD_e, -1), + OBJNAME("Rafrel", fpcNm_NPC_RAFREL_e, -1), + OBJNAME("MoiR", fpcNm_NPC_MOIR_e, -1), + OBJNAME("impal", fpcNm_NPC_IMPAL_e, -1), + OBJNAME("Coach", fpcNm_NPC_COACH_e, -1), + OBJNAME("TheB", fpcNm_NPC_THEB_e, -1), + OBJNAME("TgArena", fpcNm_Tag_Arena_e, -1), + OBJNAME("TagInst", fpcNm_Tag_Instruction_e, -1), + OBJNAME("GWolf", fpcNm_NPC_GWOLF_e, -1), + OBJNAME("Len", fpcNm_NPC_LEN_e, -1), + OBJNAME("Lud", fpcNm_NPC_LUD_e, -1), + OBJNAME("Doc", fpcNm_NPC_DOC_e, -1), + OBJNAME("FSeirei", fpcNm_NPC_FAIRY_SEIREI_e, -1), + OBJNAME("Fairy", fpcNm_NPC_FAIRY_e, -1), + OBJNAME("Hanjo", fpcNm_NPC_HANJO_e, -1), + OBJNAME("Hoz", fpcNm_NPC_HOZ_e, -1), + OBJNAME("Jagar", fpcNm_NPC_JAGAR_e, -1), + OBJNAME("Kkri", fpcNm_NPC_KKRI_e, -1), + OBJNAME("Kn", fpcNm_NPC_KN_e, -1), + OBJNAME("KnBlt", fpcNm_KN_BULLET_e, -1), + OBJNAME("Knj", fpcNm_NPC_KNJ_e, -1), + OBJNAME("Kolin", fpcNm_NPC_KOLIN_e, -1), + OBJNAME("Kolinb", fpcNm_NPC_KOLINB_e, -1), + OBJNAME("Kyury", fpcNm_NPC_KYURY_e, -1), + OBJNAME("Maro", fpcNm_NPC_MARO_e, -1), + OBJNAME("midP", fpcNm_NPC_MIDP_e, -1), + OBJNAME("Moi", fpcNm_NPC_MOI_e, -1), + OBJNAME("Raca", fpcNm_NPC_RACA_e, -1), + OBJNAME("Post", fpcNm_NPC_POST_e, -1), + OBJNAME("Pouya", fpcNm_NPC_POUYA_e, -1), + OBJNAME("Saru", fpcNm_NPC_SARU_e, -1), + OBJNAME("seiB", fpcNm_NPC_SEIB_e, -1), + OBJNAME("seiC", fpcNm_NPC_SEIC_e, -1), + OBJNAME("seiD", fpcNm_NPC_SEID_e, -1), + OBJNAME("Seira", fpcNm_NPC_SEIRA_e, -1), + OBJNAME("Seira2", fpcNm_NPC_SERA2_e, -1), + OBJNAME("Seirei", fpcNm_NPC_SEIREI_e, -1), + OBJNAME("Sha", fpcNm_NPC_SHAMAN_e, -1), + OBJNAME("sMaro", fpcNm_NPC_SMARO_e, -1), + OBJNAME("solA", fpcNm_NPC_SOLA_e, -1), + OBJNAME("Taro", fpcNm_NPC_TARO_e, -1), + OBJNAME("PA_Besu", fpcNm_NPC_PACHI_BESU_e, -1), + OBJNAME("PA_Taro", fpcNm_NPC_PACHI_TARO_e, -1), + OBJNAME("PA_Maro", fpcNm_NPC_PACHI_MARO_e, -1), + OBJNAME("TagPati", fpcNm_TAG_PATI_e, -1), + OBJNAME("The", fpcNm_NPC_THE_e, -1), + OBJNAME("Tkj", fpcNm_NPC_TKJ_e, -1), + OBJNAME("Tks", fpcNm_NPC_TKS_e, -1), + OBJNAME("ObjTks", fpcNm_OBJ_TKS_e, -1), + OBJNAME("Tkc", fpcNm_NPC_TKC_e, -1), + OBJNAME("Tkj2", fpcNm_NPC_TKJ2_e, -1), + OBJNAME("Toby", fpcNm_NPC_TOBY_e, -1), + OBJNAME("Uri", fpcNm_NPC_URI_e, -1), + OBJNAME("Yelia", fpcNm_NPC_YELIA_e, -1), + OBJNAME("ykM", fpcNm_NPC_YKM_e, -1), + OBJNAME("ykW", fpcNm_NPC_YKW_e, -1), + OBJNAME("zanB", fpcNm_NPC_ZANB_e, -1), + OBJNAME("Zant", fpcNm_NPC_ZANT_e, -1), + OBJNAME("Zelda", fpcNm_NPC_ZELDA_e, -1), + OBJNAME("ZelR", fpcNm_NPC_ZELR_e, -1), + OBJNAME("ZelRo", fpcNm_NPC_ZELRO_e, -1), + OBJNAME("zrA", fpcNm_NPC_ZRA_e, 0x00), + OBJNAME("zrS", fpcNm_NPC_ZRA_e, 0x01), + OBJNAME("zrWF", fpcNm_NPC_ZRA_e, 0x02), + OBJNAME("zrR", fpcNm_NPC_ZRA_e, 0x03), + OBJNAME("zrD", fpcNm_NPC_ZRA_e, 0x04), + OBJNAME("zrSP", fpcNm_NPC_ZRA_e, 0x05), + OBJNAME("zrSPA", fpcNm_NPC_ZRA_e, 0x06), + OBJNAME("zrF", fpcNm_OBJ_ZRAFREEZE_e, 0x00), + OBJNAME("zrF2", fpcNm_OBJ_ZRAFREEZE_e, 0x01), + OBJNAME("zrF3", fpcNm_OBJ_ZRAFREEZE_e, 0x02), + OBJNAME("zrC", fpcNm_NPC_ZRC_e, -1), + OBJNAME("zrZ", fpcNm_NPC_ZRZ_e, -1), + OBJNAME("GrvStn", fpcNm_Obj_GraveStone_e, -1), + OBJNAME("zrARock", fpcNm_Obj_ZraRock_e, -1), + OBJNAME("StAndGl", fpcNm_START_AND_GOAL_e, -1), + OBJNAME("zrAMark", fpcNm_ZRA_MARK_e, -1), + OBJNAME("myna2", fpcNm_MYNA2_e, -1), + OBJNAME("myn2tag", fpcNm_TAG_MYNA2_e, -1), + OBJNAME("MAN_a", fpcNm_NPC_CD3_e, 0x00), + OBJNAME("MAD_a", fpcNm_NPC_CD3_e, 0x01), + OBJNAME("MCN_a", fpcNm_NPC_CD3_e, 0x02), + OBJNAME("MON_a", fpcNm_NPC_CD3_e, 0x03), + OBJNAME("MAN_b", fpcNm_NPC_CD3_e, 0x04), + OBJNAME("MAN_c", fpcNm_NPC_CD3_e, 0x05), + OBJNAME("MAS_a", fpcNm_NPC_CD3_e, 0x06), + OBJNAME("MBN_a", fpcNm_NPC_CD3_e, 0x07), + OBJNAME("MAN_a2", fpcNm_NPC_CD3_e, 0x08), + OBJNAME("MAD_a2", fpcNm_NPC_CD3_e, 0x09), + OBJNAME("MCN_a2", fpcNm_NPC_CD3_e, 0x0A), + OBJNAME("MON_a2", fpcNm_NPC_CD3_e, 0x0B), + OBJNAME("MAN_b2", fpcNm_NPC_CD3_e, 0x0C), + OBJNAME("MAN_c2", fpcNm_NPC_CD3_e, 0x0D), + OBJNAME("MAS_a2", fpcNm_NPC_CD3_e, 0x0E), + OBJNAME("MBN_a2", fpcNm_NPC_CD3_e, 0x0F), + OBJNAME("WAN_a", fpcNm_NPC_CD3_e, 0x10), + OBJNAME("WAD_a", fpcNm_NPC_CD3_e, 0x11), + OBJNAME("MAT_a", fpcNm_NPC_CD3_e, 0x12), + OBJNAME("WCN_a", fpcNm_NPC_CD3_e, 0x13), + OBJNAME("WON_a", fpcNm_NPC_CD3_e, 0x14), + OBJNAME("WGN_a", fpcNm_NPC_CD3_e, 0x15), + OBJNAME("WAN_b", fpcNm_NPC_CD3_e, 0x16), + OBJNAME("WAN_a2", fpcNm_NPC_CD3_e, 0x17), + OBJNAME("WAD_a2", fpcNm_NPC_CD3_e, 0x18), + OBJNAME("MAT_a2", fpcNm_NPC_CD3_e, 0x19), + OBJNAME("WCN_a2", fpcNm_NPC_CD3_e, 0x1A), + OBJNAME("WON_a2", fpcNm_NPC_CD3_e, 0x1B), + OBJNAME("WGN_a2", fpcNm_NPC_CD3_e, 0x1C), + OBJNAME("WAN_b2", fpcNm_NPC_CD3_e, 0x1D), + OBJNAME("shoe", fpcNm_NPC_SHOE_e, -1), + OBJNAME("DoorBoy", fpcNm_NPC_DOORBOY_e, -1), + OBJNAME("prayer", fpcNm_NPC_PRAYER_e, -1), + OBJNAME("km_Hana", fpcNm_NPC_KASIHANA_e, -1), + OBJNAME("km_Kyu", fpcNm_NPC_KASIKYU_e, -1), + OBJNAME("km_Mich", fpcNm_NPC_KASIMICH_e, -1), + OBJNAME("NpcChat", fpcNm_NPC_CHAT_e, -1), + OBJNAME("chtSolA", fpcNm_NPC_SOLDIERa_e, -1), + OBJNAME("chtSolB", fpcNm_NPC_SOLDIERb_e, -1), + OBJNAME("DrSol1", fpcNm_NPC_DRSOL_e, 0x00), + OBJNAME("DrSol2", fpcNm_NPC_DRSOL_e, 0x01), + OBJNAME("chin", fpcNm_NPC_CHIN_e, -1), + OBJNAME("ins", fpcNm_NPC_INS_e, -1), + OBJNAME("Shop0", fpcNm_NPC_SHOP0_e, -1), + OBJNAME("TagSch", fpcNm_Tag_Schedule_e, -1), + OBJNAME("TagEsc", fpcNm_Tag_Escape_e, -1), + OBJNAME("passer", fpcNm_PASSER_MNG_e, 0x00), + OBJNAME("passerL", fpcNm_PASSER_MNG_e, 0x01), + OBJNAME("fmtion", fpcNm_FORMATION_MNG_e, 0x00), + OBJNAME("fmtionL", fpcNm_FORMATION_MNG_e, 0x01), + OBJNAME("guard", fpcNm_GUARD_MNG_e, -1), + OBJNAME("TgGuard", fpcNm_TAG_GUARD_e, -1), + OBJNAME("Mk", fpcNm_NPC_MK_e, -1), + OBJNAME("Obj_Tbi", fpcNm_Obj_Yobikusa_e, 0x00), + OBJNAME("Obj_Uma", fpcNm_Obj_Yobikusa_e, 0x01), + OBJNAME("Obj_knk", fpcNm_Obj_KazeNeko_e, -1), + OBJNAME("Obj_nmp", fpcNm_Obj_NamePlate_e, -1), + OBJNAME("Obj_Tie", fpcNm_Obj_OnCloth_e, -1), + OBJNAME("Obj_Lrp", fpcNm_Obj_LndRope_e, -1), + OBJNAME("Obj_Sit", fpcNm_Obj_ItaRope_e, -1), + OBJNAME("Ikada", fpcNm_Obj_Ikada_e, -1), + OBJNAME("Dust", fpcNm_Obj_DUST_e, -1), + OBJNAME("Obj_Ita", fpcNm_Obj_ITA_e, -1), + OBJNAME("Ice_l", fpcNm_Obj_Ice_l_e, -1), + OBJNAME("Ice_s", fpcNm_Obj_Ice_s_e, -1), + OBJNAME("E_Make", fpcNm_Obj_E_CREATE_e, -1), + OBJNAME("Bhhashi", fpcNm_Obj_Bhbridge_e, -1), + OBJNAME("Yousei", fpcNm_Obj_Yousei_e, -1), + OBJNAME("G_Kabe", fpcNm_Obj_GOMIKABE_e, -1), + OBJNAME("B_ling", fpcNm_Obj_Mato_e, -1), + OBJNAME("kab_o", fpcNm_Obj_Kabuto_e, -1), + OBJNAME("I_Cho", fpcNm_Obj_Cho_e, -1), + OBJNAME("I_Kuw", fpcNm_Obj_Kuw_e, -1), + OBJNAME("I_Nan", fpcNm_Obj_Nan_e, -1), + OBJNAME("I_Dan", fpcNm_Obj_Dan_e, -1), + OBJNAME("I_Kam", fpcNm_Obj_Kam_e, -1), + OBJNAME("I_Ten", fpcNm_Obj_Ten_e, -1), + OBJNAME("I_Ari", fpcNm_Obj_Ari_e, -1), + OBJNAME("I_Kag", fpcNm_Obj_Kag_e, -1), + OBJNAME("I_Tom", fpcNm_Obj_Tombo_e, -1), + OBJNAME("I_Bat", fpcNm_Obj_Batta_e, -1), + OBJNAME("I_Kat", fpcNm_Obj_Kat_e, -1), + OBJNAME("H_Saku", fpcNm_Obj_H_Saku_e, -1), + OBJNAME("sm_door", fpcNm_Obj_SM_DOOR_e, -1), + OBJNAME("Kaisou", fpcNm_Obj_Kaisou_e, -1), + OBJNAME("Ni", fpcNm_NI_e, -1), + OBJNAME("Fr", fpcNm_FR_e, -1), + OBJNAME("Sq", fpcNm_SQ_e, -1), + OBJNAME("Bd", fpcNm_BD_e, -1), + OBJNAME("Obj_ki", fpcNm_OBJ_KI_e, -1), + OBJNAME("Do", fpcNm_DO_e, -1), + OBJNAME("Lm", fpcNm_NPC_FISH_e, 0x00), + OBJNAME("Tr", fpcNm_NPC_FISH_e, 0x05), + OBJNAME("Npc_tr", fpcNm_NPC_TR_e, -1), + OBJNAME("Npc_lf", fpcNm_NPC_LF_e, -1), + OBJNAME("Fish", fpcNm_MG_FISH_e, -1), + OBJNAME("NPC_TK", fpcNm_NPC_TK_e, -1), + OBJNAME("Obj_fd", fpcNm_OBJ_FOOD_e, -1), + OBJNAME("MYNA", fpcNm_MYNA_e, -1), + OBJNAME("SSITEM", fpcNm_OBJ_SSITEM_e, -1), + OBJNAME("SSDRINK", fpcNm_OBJ_SSDRINK_e, -1), + OBJNAME("TGDRINK", fpcNm_TAG_SSDRINK_e, -1), + OBJNAME("Tag_Btl", fpcNm_TAG_BTLITM_e, -1), + OBJNAME("lv5soup", fpcNm_TAG_LV5SOUP_e, -1), + OBJNAME("TGMNLIG", fpcNm_TAG_MNLIGHT_e, -1), + OBJNAME("TGSPCAM", fpcNm_TAG_SHOPCAM_e, -1), + OBJNAME("TGSPITM", fpcNm_TAG_SHOPITM_e, -1), + OBJNAME("OilTubo", fpcNm_OBJ_OILTUBO_e, -1), + OBJNAME("Roten", fpcNm_OBJ_ROTEN_e, -1), + OBJNAME("Pleaf", fpcNm_OBJ_PLEAF_e, -1), + OBJNAME("KBacket", fpcNm_OBJ_KBACKET_e, -1), + OBJNAME("YBag", fpcNm_OBJ_YBAG_e, -1), + OBJNAME("Pumpkin", fpcNm_OBJ_PUMPKIN_e, -1), + OBJNAME("Obj_kg", fpcNm_OBJ_KAGO_e, -1), + OBJNAME("BbKago", fpcNm_OBJ_KAGO_e, 0x00), + OBJNAME("OnKago", fpcNm_OBJ_KAGO_e, 0x01), + OBJNAME("ObjHasi", fpcNm_Obj_HHASHI_e, -1), + OBJNAME("Thashi", fpcNm_Obj_THASHI_e, -1), + OBJNAME("B_Hashi", fpcNm_Obj_BHASHI_e, -1), + OBJNAME("E_MD", fpcNm_E_MD_e, -1), + OBJNAME("E_s1", fpcNm_E_S1_e, -1), + OBJNAME("E_wb", fpcNm_E_WB_e, -1), + OBJNAME("E_rd", fpcNm_E_RD_e, -1), + OBJNAME("E_rdb", fpcNm_E_RDB_e, -1), + OBJNAME("E_rdy", fpcNm_E_RDY_e, -1), + OBJNAME("E_fm", fpcNm_E_FM_e, -1), + OBJNAME("E_dn", fpcNm_E_DN_e, -1), + OBJNAME("E_mf", fpcNm_E_MF_e, -1), + OBJNAME("TreeSh", fpcNm_TREESH_e, -1), + OBJNAME("E_bug", fpcNm_E_BUG_e, -1), + OBJNAME("E_bee", fpcNm_E_BEE_e, -1), + OBJNAME("E_nest", fpcNm_E_NEST_e, -1), + OBJNAME("E_kr", fpcNm_E_KR_e, -1), + OBJNAME("E_st", fpcNm_E_ST_e, -1), + OBJNAME("E_tk", fpcNm_E_TK_e, -1), + OBJNAME("E_tk2", fpcNm_E_TK2_e, -1), + OBJNAME("E_th", fpcNm_E_TH_e, -1), + OBJNAME("E_cr", fpcNm_E_CR_e, -1), + OBJNAME("E_df", fpcNm_E_DF_e, -1), + OBJNAME("E_ph", fpcNm_E_PH_e, -1), + OBJNAME("E_fs", fpcNm_E_FS_e, -1), + OBJNAME("E_SB", fpcNm_E_SB_e, -1), + OBJNAME("E_HM", fpcNm_E_HM_e, -1), + OBJNAME("E_fk", fpcNm_E_FK_e, -1), + OBJNAME("E_pm", fpcNm_E_PM_e, -1), + OBJNAME("Npc_ne", fpcNm_NPC_NE_e, -1), + OBJNAME("E_db", fpcNm_E_DB_e, -1), + OBJNAME("E_kg", fpcNm_E_KG_e, -1), + OBJNAME("E_sh", fpcNm_E_SH_e, -1), + OBJNAME("E_sf", fpcNm_E_SF_e, -1), + OBJNAME("Obj_lb", fpcNm_OBJ_LBOX_e, -1), + OBJNAME("Obj_kb", fpcNm_OBJ_KBOX_e, -1), + OBJNAME("E_bs", fpcNm_E_BS_e, -1), + OBJNAME("Sekizoa", fpcNm_OBJ_SEKIZOA_e, 0x00), + OBJNAME("Sekizob", fpcNm_OBJ_SEKIZOA_e, 0x01), + OBJNAME("E_sm", fpcNm_E_SM_e, -1), + OBJNAME("E_sm2", fpcNm_E_SM2_e, -1), + OBJNAME("ky_tag0", fpcNm_KYTAG00_e, -1), + OBJNAME("ky_tag1", fpcNm_KYTAG01_e, 0x00), + OBJNAME("ky_tag2", fpcNm_KYTAG02_e, -1), + OBJNAME("ky_tag3", fpcNm_KYTAG01_e, 0x01), + OBJNAME("kytag3", fpcNm_KYTAG03_e, -1), + OBJNAME("DK_tag", fpcNm_KYTAG04_e, -1), + OBJNAME("PPHole", fpcNm_KYTAG05_e, -1), + OBJNAME("KY_chg", fpcNm_KYTAG06_e, -1), + OBJNAME("Plight", fpcNm_KYTAG07_e, -1), + OBJNAME("KY_mk", fpcNm_KYTAG08_e, -1), + OBJNAME("Bound", fpcNm_KYTAG09_e, -1), + OBJNAME("WC_tag", fpcNm_KYTAG01_e, 0x02), + OBJNAME("Sparks", fpcNm_KYTAG10_e, -1), + OBJNAME("Tcntrl", fpcNm_KYTAG11_e, -1), + OBJNAME("Drkmst", fpcNm_KYTAG12_e, -1), + OBJNAME("Blsnow", fpcNm_KYTAG13_e, -1), + OBJNAME("Savmem", fpcNm_KYTAG14_e, -1), + OBJNAME("Zshake", fpcNm_KYTAG15_e, -1), + OBJNAME("Pikari", fpcNm_KYTAG16_e, -1), + OBJNAME("Lmask", fpcNm_KYTAG17_e, -1), + OBJNAME("E_is", fpcNm_E_IS_e, -1), + OBJNAME("E_ai", fpcNm_E_AI_e, -1), + OBJNAME("E_ba", fpcNm_E_BA_e, -1), + OBJNAME("E_bu", fpcNm_E_BU_e, -1), + OBJNAME("E_sw", fpcNm_E_SW_e, -1), + OBJNAME("E_ge", fpcNm_E_GE_e, -1), + OBJNAME("TagGe", fpcNm_Tag_WatchGe_e, -1), + OBJNAME("E_ym", fpcNm_E_YM_e, -1), + OBJNAME("E_ymt", fpcNm_E_YM_TAG_e, -1), + OBJNAME("E_ymb", fpcNm_E_YMB_e, -1), + OBJNAME("Fwall", fpcNm_Tag_FWall_e, -1), + OBJNAME("E_hz", fpcNm_E_HZ_e, -1), + OBJNAME("E_ws", fpcNm_E_WS_e, -1), + OBJNAME("E_oc", fpcNm_E_OC_e, -1), + OBJNAME("E_dt", fpcNm_E_DT_e, -1), + OBJNAME("E_bg", fpcNm_E_BG_e, -1), + OBJNAME("E_octbg", fpcNm_E_OctBg_e, -1), + OBJNAME("E_tt", fpcNm_E_TT_e, -1), + OBJNAME("E_dk", fpcNm_E_DK_e, -1), + OBJNAME("E_vt", fpcNm_E_VT_e, -1), + OBJNAME("E_ww", fpcNm_E_WW_e, -1), + OBJNAME("E_gi", fpcNm_E_GI_e, -1), + OBJNAME("E_mk", fpcNm_E_MK_e, -1), + OBJNAME("B_gm", fpcNm_B_GM_e, -1), + OBJNAME("E_gm", fpcNm_E_GM_e, -1), + OBJNAME("E_gs", fpcNm_E_GS_e, -1), + OBJNAME("Npc_ne", fpcNm_NPC_NE_e, -1), + OBJNAME("Obj_gm", fpcNm_OBJ_GM_e, -1), + OBJNAME("E_mm", fpcNm_E_MM_e, -1), + OBJNAME("E_mm2", fpcNm_E_MM_e, 0x01), + OBJNAME("E_fz", fpcNm_E_FZ_e, -1), + OBJNAME("E_fb", fpcNm_E_FB_e, -1), + OBJNAME("E_Zs", fpcNm_E_ZS_e, -1), + OBJNAME("E_kk", fpcNm_E_KK_e, -1), + OBJNAME("E_hp", fpcNm_E_HP_e, -1), + OBJNAME("E_zh", fpcNm_E_ZH_e, -1), + OBJNAME("E_zm", fpcNm_E_ZM_e, -1), + OBJNAME("E_zm2", fpcNm_E_ZM_e, 0x01), + OBJNAME("E_pz", fpcNm_E_PZ_e, -1), + OBJNAME("Kita", fpcNm_OBJ_KITA_e, -1), + OBJNAME("E_nz", fpcNm_E_NZ_e, -1), + OBJNAME("E_po", fpcNm_E_PO_e, -1), + OBJNAME("Obj_w0", fpcNm_OBJ_WEB0_e, -1), + OBJNAME("Obj_w1", fpcNm_OBJ_WEB1_e, -1), + OBJNAME("Obj_cb", fpcNm_OBJ_CB_e, -1), + OBJNAME("Obj_mak", fpcNm_OBJ_MAKI_e, -1), + OBJNAME("Obj_brg", fpcNm_OBJ_BRG_e, -1), + OBJNAME("E_rb", fpcNm_E_RB_e, -1), + OBJNAME("E_sg", fpcNm_E_SG_e, -1), + OBJNAME("Obj_tby", fpcNm_OBJ_TOBY_e, -1), + OBJNAME("Obj_sw", fpcNm_OBJ_SW_e, -1), + OBJNAME("Npc_ks", fpcNm_NPC_KS_e, -1), + OBJNAME("Obj_so", fpcNm_OBJ_SO_e, -1), + OBJNAME("E_bi", fpcNm_E_BI_e, -1), + OBJNAME("Obj_key", fpcNm_OBJ_KEY_e, -1), + OBJNAME("E_hb", fpcNm_E_HB_e, -1), + OBJNAME("Obj_hb", fpcNm_OBJ_HB_e, -1), + OBJNAME("B_bq", fpcNm_B_BQ_e, -1), + OBJNAME("B_bh", fpcNm_B_BH_e, -1), + OBJNAME("B_go", fpcNm_B_GO_e, -1), + OBJNAME("Obj_fw", fpcNm_OBJ_FW_e, -1), + OBJNAME("E_ga", fpcNm_E_GA_e, -1), + OBJNAME("E_gb", fpcNm_E_GB_e, -1), + OBJNAME("E_wap", fpcNm_E_WAP_e, -1), + OBJNAME("Obj_sui", fpcNm_OBJ_SUISYA_e, -1), + OBJNAME("Obj_bal", fpcNm_OBJ_BALLOON_e, -1), + OBJNAME("Obj_lp", fpcNm_OBJ_LP_e, -1), + OBJNAME("Obj_nd", fpcNm_OBJ_NDOOR_e, -1), + OBJNAME("Obj_ud", fpcNm_OBJ_UDOOR_e, -1), + OBJNAME("Obj_us", fpcNm_OBJ_USAKU_e, -1), + OBJNAME("Obj_kn2", fpcNm_OBJ_KANBAN2_e, -1), + OBJNAME("Obj_kyh", fpcNm_OBJ_KEYHOLE_e, -1), + OBJNAME("Bed", fpcNm_OBJ_BED_e, -1), + OBJNAME("BouMato", fpcNm_OBJ_BOUMATO_e, -1), + OBJNAME("AutoMt", fpcNm_OBJ_AUTOMATA_e, -1), + OBJNAME("Gadget", fpcNm_OBJ_GADGET_e, -1), + OBJNAME("ItaMato", fpcNm_OBJ_ITAMATO_e, -1), + OBJNAME("Nougu", fpcNm_OBJ_NOUGU_e, -1), + OBJNAME("Stick", fpcNm_OBJ_STICK_e, -1), + OBJNAME("Mie", fpcNm_OBJ_MIE_e, -1), + OBJNAME("SkDoor", fpcNm_OBJ_SEKIDOOR_e, -1), + OBJNAME("Sekizo", fpcNm_OBJ_SEKIZO_e, -1), + OBJNAME("SMTile", fpcNm_OBJ_SMTILE_e, -1), + OBJNAME("H_kage", fpcNm_OBJ_KAGE_e, -1), + OBJNAME("E_ms", fpcNm_E_MS_e, -1), + OBJNAME("Obj_tp", fpcNm_OBJ_TP_e, -1), + OBJNAME("Obj_ms", fpcNm_OBJ_MSIMA_e, -1), + OBJNAME("E_gob", fpcNm_E_GOB_e, -1), + OBJNAME("E_yk", fpcNm_E_YK_e, -1), + OBJNAME("E_yr", fpcNm_E_YR_e, -1), + OBJNAME("E_yg", fpcNm_E_YG_e, -1), + OBJNAME("Obj_fm", fpcNm_OBJ_FMOBJ_e, -1), + OBJNAME("B_ob", fpcNm_B_OB_e, -1), + OBJNAME("OcHashi", fpcNm_OCTHASHI_e, -1), + OBJNAME("E_dd", fpcNm_E_DD_e, -1), + OBJNAME("Obj_rw", fpcNm_OBJ_RW_e, -1), + OBJNAME("Obj_ih", fpcNm_OBJ_IHASI_e, -1), + OBJNAME("E_yc", fpcNm_E_YC_e, -1), + OBJNAME("B_ds", fpcNm_B_DS_e, -1), + OBJNAME("B_dr", fpcNm_B_DR_e, -1), + OBJNAME("B_gg", fpcNm_B_GG_e, -1), + OBJNAME("B_yo", fpcNm_B_YO_e, -1), + OBJNAME("B_tn", fpcNm_B_TN_e, -1), + OBJNAME("B_zant", fpcNm_B_ZANT_e, -1), + OBJNAME("B_zntm", fpcNm_B_ZANTZ_e, -1), + OBJNAME("B_znts", fpcNm_B_ZANTS_e, -1), + OBJNAME("E_yd", fpcNm_E_YD_e, -1), + OBJNAME("E_yh", fpcNm_E_YH_e, -1), + OBJNAME("Henna", fpcNm_NPC_HENNA_e, -1), + OBJNAME("Henna0", fpcNm_NPC_HENNA0_e, -1), + OBJNAME("Npc_du", fpcNm_NPC_DU_e, 0x00), + OBJNAME("Econt", fpcNm_ECONT_e, -1), + OBJNAME("B_mgn", fpcNm_B_MGN_e, -1), + OBJNAME("Hzelda", fpcNm_E_HZELDA_e, -1), + OBJNAME("Worm", fpcNm_NPC_WORM_e, -1), + OBJNAME("B_gnd", fpcNm_B_GND_e, -1), + OBJNAME("Obj_gb", fpcNm_OBJ_GB_e, -1), + OBJNAME("tboxA0", fpcNm_TBOX_e, -1), + OBJNAME("tboxA1", fpcNm_TBOX_e, -1), + OBJNAME("tboxA2", fpcNm_TBOX_e, -1), + OBJNAME("tboxB0", fpcNm_TBOX_e, -1), + OBJNAME("tboxB1", fpcNm_TBOX_e, -1), + OBJNAME("tboxB2", fpcNm_TBOX_e, -1), + OBJNAME("tboxJ0", fpcNm_TBOX_e, -1), + OBJNAME("tboxP0", fpcNm_TBOX_e, -1), + OBJNAME("tboxB00", fpcNm_TBOX_e, -1), + OBJNAME("tboxB01", fpcNm_TBOX_e, -1), + OBJNAME("tboxW0", fpcNm_TBOX_e, -1), + OBJNAME("tboxEL0", fpcNm_TBOX2_e, -1), + OBJNAME("tboxEL1", fpcNm_TBOX2_e, -1), + OBJNAME("l8warp", fpcNm_Obj_BossWarp_e, -1), + OBJNAME("L1Bdoor", fpcNm_L1BOSS_DOOR_e, -1), + OBJNAME("L2Bdoor", fpcNm_L1BOSS_DOOR_e, -1), + OBJNAME("L3Bdoor", fpcNm_Obj_Kshutter_e, -1), + OBJNAME("L4Bdoor", fpcNm_L1BOSS_DOOR_e, -1), + OBJNAME("L5Bdoor", fpcNm_L5BOSS_DOOR_e, -1), + OBJNAME("L6Bdoor", fpcNm_L1BOSS_DOOR_e, -1), + OBJNAME("L7Bdoor", fpcNm_L1BOSS_DOOR_e, -1), + OBJNAME("L8Bdoor", fpcNm_L1BOSS_DOOR_e, -1), + OBJNAME("L9Bdoor", fpcNm_L1BOSS_DOOR_e, -1), + OBJNAME("L1Mdoor", fpcNm_L1MBOSS_DOOR_e, 0x01), + OBJNAME("L2Mdoor", fpcNm_L1MBOSS_DOOR_e, 0x02), + OBJNAME("L3Mdoor", fpcNm_L1MBOSS_DOOR_e, 0x03), + OBJNAME("L4Mdoor", fpcNm_L1MBOSS_DOOR_e, 0x04), + OBJNAME("L5Mdoor", fpcNm_L1MBOSS_DOOR_e, 0x05), + OBJNAME("L6Mdoor", fpcNm_L1MBOSS_DOOR_e, 0x06), + OBJNAME("L7Mdoor", fpcNm_L1MBOSS_DOOR_e, 0x07), + OBJNAME("L8Mdoor", fpcNm_L1MBOSS_DOOR_e, 0x08), + OBJNAME("L7door", fpcNm_L1MBOSS_DOOR_e, 0x0A), + OBJNAME("L5door", fpcNm_L1MBOSS_DOOR_e, 0x0B), + OBJNAME("Horse", fpcNm_HORSE_e, -1), + OBJNAME("Canoe", fpcNm_CANOE_e, -1), + OBJNAME("Crope", fpcNm_Obj_Crope_e, -1), + OBJNAME("Cstatue", fpcNm_CSTATUE_e, -1), + OBJNAME("CstaF", fpcNm_CSTAF_e, -1), + OBJNAME("HoZelda", fpcNm_HOZELDA_e, -1), + OBJNAME("Mhint", fpcNm_Tag_Mhint_e, -1), + OBJNAME("Mmsg", fpcNm_Tag_Mmsg_e, -1), + OBJNAME("Mwait", fpcNm_Tag_Mwait_e, -1), + OBJNAME("Mstop", fpcNm_Tag_Mstop_e, -1), + OBJNAME("MstopE", fpcNm_Tag_Mstop_e, -1), + OBJNAME("Hinit", fpcNm_Tag_Hinit_e, -1), + OBJNAME("Hjump", fpcNm_Tag_Hjump_e, -1), + OBJNAME("Hstop", fpcNm_Tag_Hstop_e, -1), + OBJNAME("AJnot", fpcNm_Tag_AJnot_e, -1), + OBJNAME("Wljump", fpcNm_Tag_Wljump_e, -1), + OBJNAME("Sppath", fpcNm_Tag_Sppath_e, -1), + OBJNAME("Stream", fpcNm_Tag_Stream_e, -1), + OBJNAME("Gstart", fpcNm_Tag_Gstart_e, -1), + OBJNAME("TgTGate", fpcNm_Tag_TWGate_e, -1), + OBJNAME("Lv6Gate", fpcNm_Tag_Lv6Gate_e, -1), + OBJNAME("Lv7Gate", fpcNm_Tag_Lv7Gate_e, -1), + OBJNAME("Lv8Gate", fpcNm_Tag_Lv8Gate_e, -1), + OBJNAME("TgTHint", fpcNm_Tag_TheBHint_e, -1), + OBJNAME("TagAsst", fpcNm_Tag_Assist_e, -1), + OBJNAME("Dmidna", fpcNm_DMIDNA_e, -1), + OBJNAME("Fchain", fpcNm_Obj_Fchain_e, -1), + OBJNAME("Wchain", fpcNm_Obj_Wchain_e, -1), + OBJNAME("Cdoor", fpcNm_Obj_Cdoor_e, -1), + OBJNAME("Cgate", fpcNm_Obj_Cdoor_e, -1), + OBJNAME("Water00", fpcNm_GRDWATER_e, -1), + OBJNAME("Digpl", fpcNm_Obj_Digpl_e, -1), + OBJNAME("Digholl", fpcNm_Obj_Digholl_e, -1), + OBJNAME("Bombf", fpcNm_Obj_Bombf_e, -1), + OBJNAME("hider", fpcNm_SUSPEND_e, -1), + OBJNAME("SwAreaC", fpcNm_SWC00_e, -1), + OBJNAME("SwAreaS", fpcNm_SWC00_e, -1), + OBJNAME("SwLBall", fpcNm_SwLBall_e, -1), + OBJNAME("SwBall", fpcNm_SwBall_e, -1), + OBJNAME("thouse", fpcNm_Obj_TobyHouse_e, -1), + OBJNAME("ironbox", fpcNm_Obj_MetalBox_e, -1), + OBJNAME("l6swtrn", fpcNm_Obj_Lv6SwTurn_e, -1), + OBJNAME("l2bmtag", fpcNm_Tag_Lv2PrChk_e, -1), + OBJNAME("swspin", fpcNm_Obj_SwSpinner_e, -1), + OBJNAME("spnGear", fpcNm_Obj_Lv4Gear_e, -1), + OBJNAME("fan", fpcNm_Obj_Fan_e, -1), + OBJNAME("tgake", fpcNm_Obj_Gake_e, -1), + OBJNAME("tmoon", fpcNm_Obj_TMoon_e, -1), + OBJNAME("gwall", fpcNm_Obj_GanonWall_e, -1), + OBJNAME("gwall2", fpcNm_Obj_GanonWall2_e, -1), + OBJNAME("scnChg", fpcNm_SCENE_EXIT_e, -1), + OBJNAME("scnChg2", fpcNm_SCENE_EXIT2_e, -1), + OBJNAME("noChgRm", fpcNm_NO_CHG_ROOM_e, -1), + OBJNAME("readRm", fpcNm_NO_CHG_ROOM_e, 0x00), + OBJNAME("Tetd", fpcNm_DSHUTTER_e, -1), + OBJNAME("fence", fpcNm_DSHUTTER_e, -1), + OBJNAME("lv7saku", fpcNm_DSHUTTER_e, -1), + OBJNAME("YkgrON", fpcNm_Ykgr_e, -1), + OBJNAME("YkgrOFF", fpcNm_Ykgr_e, -1), + OBJNAME("TagEv", fpcNm_TAG_EVENT_e, -1), + OBJNAME("TagEvC", fpcNm_TAG_EVENT_e, -1), + OBJNAME("TagEvt", fpcNm_TAG_EVT_e, 0x00), + OBJNAME("TagEvt1", fpcNm_TAG_EVT_e, 0x01), + OBJNAME("TagHowl", fpcNm_TAG_HOWL_e, 0x01), + OBJNAME("Tag_ms", fpcNm_TAG_MSG_e, 0x00), + OBJNAME("LntnTag", fpcNm_TAG_LANTERN_e, -1), + OBJNAME("EvtArea", fpcNm_TAG_EVTAREA_e, -1), + OBJNAME("AllMato", fpcNm_TAG_ALLMATO_e, -1), + OBJNAME("EvtMsg", fpcNm_TAG_EVTMSG_e, -1), + OBJNAME("KMsg", fpcNm_TAG_KMSG_e, -1), + OBJNAME("Push", fpcNm_TAG_PUSH_e, -1), + OBJNAME("Teloper", fpcNm_TAG_TELOP_e, -1), + OBJNAME("CamChg", fpcNm_TAG_CAMERA_e, -1), + OBJNAME("CamArea", fpcNm_TAG_CAMERA_e, -1), + OBJNAME("CamAreC", fpcNm_TAG_CAMERA_e, -1), + OBJNAME("ChkPntS", fpcNm_TAG_CHKPOINT_e, -1), + OBJNAME("ChkPntC", fpcNm_TAG_CHKPOINT_e, -1), + OBJNAME("setball", fpcNm_Tag_SetBall_e, -1), + OBJNAME("atkItem", fpcNm_Tag_AttackItem_e, -1), + OBJNAME("TagStat", fpcNm_Tag_Statue_e, -1), + OBJNAME("zdoor", fpcNm_Obj_ZDoor_e, -1), + OBJNAME("rdoor", fpcNm_Obj_ZDoor_e, -1), + OBJNAME("STDoa", fpcNm_Obj_ZDoor_e, -1), + OBJNAME("hasi00", fpcNm_Obj_Pillar_e, -1), + OBJNAME("hasi01", fpcNm_Obj_Pillar_e, -1), + OBJNAME("window", fpcNm_Obj_Window_e, -1), + OBJNAME("bbox", fpcNm_Obj_BBox_e, -1), + OBJNAME("spiralC", fpcNm_Obj_Lv3R10Saka_e, -1), + OBJNAME("spiral2", fpcNm_Obj_Lv3R10Saka_e, -1), + OBJNAME("digsnow", fpcNm_Obj_DigSnow_e, -1), + OBJNAME("digsand", fpcNm_Obj_Lv4DigSand_e, -1), + OBJNAME("fallobj", fpcNm_Obj_FallObj_e, -1), + OBJNAME("l7brg", fpcNm_Obj_Lv7Bridge_e, -1), + OBJNAME("dr", fpcNm_DR_e, -1), + OBJNAME("L7lowDr", fpcNm_L7lowDr_e, -1), + OBJNAME("swTime", fpcNm_SwTime_e, -1), + OBJNAME("pdrobj", fpcNm_Obj_PushDoor_e, -1), + OBJNAME("crystal", fpcNm_Obj_Crystal_e, -1), + OBJNAME("WarpBrg", fpcNm_Obj_KakarikoBrg_e, -1), + OBJNAME("WarpB2", fpcNm_Obj_KakarikoBrg_e, -1), + OBJNAME("WarpOB1", fpcNm_Obj_OrdinBrg_e, 0x00), + OBJNAME("WarpOB2", fpcNm_Obj_OrdinBrg_e, 0x01), + OBJNAME("VolcGnd", fpcNm_Obj_VolcGnd_e, -1), + OBJNAME("r09wtr", fpcNm_Obj_WaterEff_e, -1), + OBJNAME("ballSw", fpcNm_Obj_SwBallA_e, -1), + OBJNAME("lballSw", fpcNm_Obj_SwBallB_e, -1), + OBJNAME("lbsw", fpcNm_Obj_SwBallC_e, -1), + OBJNAME("R50Sand", fpcNm_Obj_Lv4Sand_e, -1), + OBJNAME("rwall", fpcNm_Obj_Lv4RailWall_e, -1), + OBJNAME("l4brg", fpcNm_Obj_Lv4Bridge_e, -1), + OBJNAME("l4floor", fpcNm_Obj_Lv4Floor_e, -1), + OBJNAME("item", fpcNm_ITEM_e, -1), + OBJNAME("itemKey", fpcNm_Obj_SmallKey_e, -1), + OBJNAME("kantera", fpcNm_Obj_Kantera_e, -1), + OBJNAME("witem", fpcNm_ITEM_e, -1), + OBJNAME("wshield", fpcNm_Obj_Shield_e, -1), + OBJNAME("htPiece", fpcNm_Obj_LifeContainer_e, -1), + OBJNAME("htCase", fpcNm_Obj_LifeContainer_e, -1), + OBJNAME("Mbrid15", fpcNm_Obj_RotBridge_e, -1), + OBJNAME("Mbrid9", fpcNm_Obj_RotBridge_e, -1), + OBJNAME("maglift", fpcNm_Obj_MagLift_e, -1), + OBJNAME("Cldst00", fpcNm_Obj_Lv1Cdl00_e, -1), + OBJNAME("Cldst01", fpcNm_Obj_Lv1Cdl01_e, -1), + OBJNAME("RMback0", fpcNm_Tag_Restart_e, -1), + OBJNAME("RMback1", fpcNm_Tag_ChgRestart_e, -1), + OBJNAME("Mist", fpcNm_Tag_Mist_e, -1), + OBJNAME("magLifR", fpcNm_Obj_MagLiftRot_e, -1), + OBJNAME("TCdlst", fpcNm_Obj_TvCdlst_e, -1), + OBJNAME("wdstick", fpcNm_Obj_WdStick_e, -1), + OBJNAME("stBlock", fpcNm_Obj_StairBlock_e, -1), + OBJNAME("hsMato", fpcNm_Obj_HsTarget_e, -1), + OBJNAME("ktFire", fpcNm_Tag_KtOnFire_e, -1), + OBJNAME("hswitch", fpcNm_Obj_HeavySw_e, -1), + OBJNAME("goGate", fpcNm_Obj_GoGate_e, -1), + OBJNAME("taAmi", fpcNm_Obj_TaFence_e, -1), + OBJNAME("fireWd", fpcNm_Obj_FireWood_e, -1), + OBJNAME("fireWd2", fpcNm_Obj_FireWood2_e, -1), + OBJNAME("altar", fpcNm_Obj_Saidan_e, -1), + OBJNAME("gpTaru", fpcNm_Obj_GpTaru_e, -1), + OBJNAME("spinLf", fpcNm_Obj_SpinLift_e, -1), + OBJNAME("bmWin", fpcNm_Obj_BmWindow_e, -1), + OBJNAME("roofHl", fpcNm_Obj_RfHole_e, -1), + OBJNAME("syRock", fpcNm_Obj_SyRock_e, -1), + OBJNAME("wColumn", fpcNm_Obj_WaterPillar_e, -1), + OBJNAME("kpot", fpcNm_Obj_KiPot_e, -1), + OBJNAME("bsGate", fpcNm_Obj_BsGate_e, -1), + OBJNAME("amiShut", fpcNm_Obj_AmiShutter_e, -1), + OBJNAME("kwhel00", fpcNm_Obj_KWheel00_e, -1), + OBJNAME("kwhel01", fpcNm_Obj_KWheel01_e, -1), + OBJNAME("PRElvtr", fpcNm_Obj_PRElvtr_e, -1), + OBJNAME("swhel00", fpcNm_Obj_KWheel00_e, -1), + OBJNAME("M_hasu", fpcNm_Obj_MHasu_e, -1), + OBJNAME("yiblltr", fpcNm_Obj_YIblltray_e, -1), + OBJNAME("l6egate", fpcNm_Obj_Lv6EGate_e, -1), + OBJNAME("l6eleva", fpcNm_Obj_Lv6ElevtA_e, -1), + OBJNAME("wtGate", fpcNm_Obj_WtGate_e, -1), + OBJNAME("candlL2", fpcNm_Obj_Lv2Candle_e, -1), + OBJNAME("togeTp", fpcNm_Obj_TogeTrap_e, -1), + OBJNAME("rotTrap", fpcNm_Obj_RotTrap_e, -1), + OBJNAME("klift00", fpcNm_Obj_KLift00_e, -1), + OBJNAME("l4chand", fpcNm_Obj_Lv4Chan_e, -1), + OBJNAME("Ychndlr", fpcNm_Obj_Ychndlr_e, -1), + OBJNAME("hbmbkoy", fpcNm_Obj_HBombkoya_e, -1), + OBJNAME("TagCsw", fpcNm_TAG_CSW_e, -1), + OBJNAME("TagCswO", fpcNm_TAG_CSW_e, -1), + OBJNAME("P_Rwall", fpcNm_Obj_Lv4PRwall_e, -1), + OBJNAME("PDtile", fpcNm_Obj_PDtile_e, -1), + OBJNAME("PDwall", fpcNm_Obj_PDwall_e, -1), + OBJNAME("Qs", fpcNm_TAG_QS_e, -1), + OBJNAME("mirror", fpcNm_MIRROR_e, -1), + OBJNAME("rGate", fpcNm_Obj_SwallShutter_e, -1), + OBJNAME("l3water", fpcNm_Obj_Lv3Water_e, -1), + OBJNAME("l3wat02", fpcNm_Obj_Lv3Water2_e, -1), + OBJNAME("l3watB", fpcNm_OBJ_LV3WATERB_e, -1), + OBJNAME("szbridg", fpcNm_Obj_SZbridge_e, -1), + OBJNAME("kjgjs", fpcNm_Obj_KJgjs_e, -1), + OBJNAME("kjs", fpcNm_Obj_KJgjs_e, -1), + OBJNAME("candlL3", fpcNm_Obj_Lv3Candle_e, -1), + OBJNAME("l5icewl", fpcNm_Obj_IceWall_e, -1), + OBJNAME("Turara", fpcNm_Obj_Turara_e, -1), + OBJNAME("twGate", fpcNm_Obj_TwGate_e, -1), + OBJNAME("L4cdlTg", fpcNm_Tag_Lv4Candle_e, -1), + OBJNAME("L4cddTg", fpcNm_Tag_Lv4CandleDm_e, -1), + OBJNAME("togeRol", fpcNm_Obj_Lv6TogeRoll_e, -1), + OBJNAME("l6TogeT", fpcNm_Obj_Lv6TogeTrap_e, -1), + OBJNAME("Tenbin", fpcNm_Obj_Lv6Tenbin_e, -1), + OBJNAME("l6Lblk", fpcNm_Obj_Lv6Lblock_e, -1), + OBJNAME("l6SwGt", fpcNm_Obj_Lv6SwGate_e, -1), + OBJNAME("l6ChBlk", fpcNm_Obj_Lv6ChgGate_e, -1), + OBJNAME("l6FuriT", fpcNm_Obj_Lv6FuriTrap_e, -1), + OBJNAME("KHdesk", fpcNm_Obj_BarDesk_e, -1), + OBJNAME("Ytaihou", fpcNm_Obj_Ytaihou_e, -1), + OBJNAME("L4eShut", fpcNm_Obj_Lv4EdShutter_e, -1), + OBJNAME("pofire", fpcNm_Obj_poFire_e, -1), + OBJNAME("pofiTg", fpcNm_Tag_poFire_e, -1), + OBJNAME("poCandl", fpcNm_Obj_poCandle_e, -1), + OBJNAME("L4Gate", fpcNm_Obj_Lv4Gate_e, -1), + OBJNAME("L4Pgate", fpcNm_Obj_Lv4PoGate_e, -1), + OBJNAME("L4SWall", fpcNm_Obj_Lv4SlideWall_e, -1), + OBJNAME("L4hmato", fpcNm_Obj_Lv4HsTarget_e, -1), + OBJNAME("propy", fpcNm_Obj_Lv7PropY_e, -1), + OBJNAME("L7BsGt", fpcNm_Obj_Lv7BsGate_e, -1), + OBJNAME("optLift", fpcNm_Obj_Lv8OptiLift_e, -1), + OBJNAME("kkiTrap", fpcNm_Obj_Lv8KekkaiTrap_e, -1), + OBJNAME("L8LiftX", fpcNm_Obj_Lv8Lift_e, -1), + OBJNAME("swStep", fpcNm_Obj_Lv8UdFloor_e, -1), + OBJNAME("L9SwSht", fpcNm_Obj_Lv9SwShutter_e, -1), + OBJNAME("L5SwIce", fpcNm_Obj_Lv5SwIce_e, -1), + OBJNAME("glwSph", fpcNm_Obj_glowSphere_e, -1), + OBJNAME("MR_Scrw", fpcNm_Obj_MirrorScrew_e, -1), + OBJNAME("MR_Sand", fpcNm_Obj_MirrorSand_e, -1), + OBJNAME("MR_Tble", fpcNm_Obj_MirrorTable_e, -1), + OBJNAME("MR_Chin", fpcNm_Obj_MirrorChain_e, -1), + OBJNAME("MR_Pole", fpcNm_Obj_Mirror6Pole_e, -1), + OBJNAME("PPolamp", fpcNm_PPolamp_e, -1), + OBJNAME("l5hYuka", fpcNm_Obj_Lv5FBoard_e, -1), + OBJNAME("BYRock", fpcNm_BkyRock_e, -1), + OBJNAME("zrDrock", fpcNm_Obj_zrTurara_e, -1), + OBJNAME("tkrDai", fpcNm_Obj_TakaraDai_e, -1), + OBJNAME("Table", fpcNm_Obj_Table_e, -1), + OBJNAME("CatDoor", fpcNm_Obj_CatDoor_e, -1), + OBJNAME("RetTag", fpcNm_Tag_RetRoom_e, -1), + OBJNAME("WdStone", fpcNm_Obj_WindStone_e, -1), + OBJNAME("HwlWara", fpcNm_Tag_WaraHowl_e, -1), + OBJNAME("SCannon", fpcNm_Obj_SCannon_e, -1), + OBJNAME("szGate", fpcNm_Obj_Lv6SzGate_e, -1), + OBJNAME("onsTaru", fpcNm_Obj_OnsenTaru_e, -1), + OBJNAME("WStoneF", fpcNm_Obj_SmWStone_e, -1), + OBJNAME("SCanCrs", fpcNm_Obj_SCannonCrs_e, -1), + OBJNAME("snwEfTg", fpcNm_Tag_SnowEff_e, -1), + OBJNAME("tmFire", fpcNm_Obj_TimeFire_e, -1), + OBJNAME("L7Prop", fpcNm_Obj_Prop_e, -1), + OBJNAME("awaPlar", fpcNm_Obj_awaPlar_e, -1), + OBJNAME("poTbox", fpcNm_Obj_poTbox_e, -1), + OBJNAME("SnwSoup", fpcNm_Obj_SnowSoup_e, -1), + OBJNAME("Nagaisu", fpcNm_Obj_Nagaisu_e, -1), + OBJNAME("RCircle", fpcNm_Obj_RCircle_e, -1), + OBJNAME("L9Chand", fpcNm_Obj_Chandelier_e, -1), + OBJNAME("L9Pictr", fpcNm_Obj_Picture_e, -1), + OBJNAME("SmkEmt", fpcNm_Tag_SmkEmt_e, -1), + OBJNAME("HFtr", fpcNm_Obj_HFtr_e, -1), + OBJNAME("HBarrel", fpcNm_Obj_HBarrel_e, -1), + OBJNAME("SCanTen", fpcNm_Obj_SCannonTen_e, -1), + OBJNAME("cstaSw", fpcNm_Tag_CstaSw_e, -1), + OBJNAME("l6cstSw", fpcNm_Tag_Lv6CstaSw_e, -1), + OBJNAME("Hata", fpcNm_Obj_Hata_e, -1), + OBJNAME("RmbitSw", fpcNm_Tag_RmbitSw_e, -1), + OBJNAME("T_Maki", fpcNm_Obj_ToaruMaki_e, -1), + OBJNAME("d_act", fpcNm_DEMO00_e, -1), + OBJNAME("d_act0", fpcNm_DEMO00_e, 0x00), + OBJNAME("d_act1", fpcNm_DEMO00_e, 0x01), + OBJNAME("d_act2", fpcNm_DEMO00_e, 0x02), + OBJNAME("d_act3", fpcNm_DEMO00_e, 0x03), + OBJNAME("d_act4", fpcNm_DEMO00_e, 0x04), + OBJNAME("d_act5", fpcNm_DEMO00_e, 0x05), + OBJNAME("d_act6", fpcNm_DEMO00_e, 0x06), + OBJNAME("d_act7", fpcNm_DEMO00_e, 0x07), + OBJNAME("d_act8", fpcNm_DEMO00_e, 0x08), + OBJNAME("d_act9", fpcNm_DEMO00_e, 0x09), + OBJNAME("d_act10", fpcNm_DEMO00_e, 0x0A), + OBJNAME("d_act11", fpcNm_DEMO00_e, 0x0B), + OBJNAME("d_act12", fpcNm_DEMO00_e, 0x0C), + OBJNAME("d_act13", fpcNm_DEMO00_e, 0x0D), + OBJNAME("d_act14", fpcNm_DEMO00_e, 0x0E), + OBJNAME("d_act15", fpcNm_DEMO00_e, 0x0F), + OBJNAME("d_act16", fpcNm_DEMO00_e, 0x10), + OBJNAME("d_act17", fpcNm_DEMO00_e, 0x11), + OBJNAME("d_act18", fpcNm_DEMO00_e, 0x12), + OBJNAME("d_act19", fpcNm_DEMO00_e, 0x13), + OBJNAME("d_act20", fpcNm_DEMO00_e, 0x14), + OBJNAME("d_act21", fpcNm_DEMO00_e, 0x15), + OBJNAME("d_act22", fpcNm_DEMO00_e, 0x16), + OBJNAME("d_act23", fpcNm_DEMO00_e, 0x17), + OBJNAME("d_act24", fpcNm_DEMO00_e, 0x18), + OBJNAME("d_act25", fpcNm_DEMO00_e, 0x19), + OBJNAME("d_act26", fpcNm_DEMO00_e, 0x1A), + OBJNAME("d_act27", fpcNm_DEMO00_e, 0x1B), + OBJNAME("d_act28", fpcNm_DEMO00_e, 0x1C), + OBJNAME("d_act29", fpcNm_DEMO00_e, 0x1D), + OBJNAME("d_act30", fpcNm_DEMO00_e, 0x1E), + OBJNAME("d_act31", fpcNm_DEMO00_e, 0x1F), + OBJNAME("TLogo", fpcNm_TITLE_e, -1), #if DEBUG - OBJNAME("unitC00", PROC_Obj_TestCube, -1), - OBJNAME("unitS00", PROC_Obj_TestCube, -1), - OBJNAME("unitCy0", PROC_Obj_TestCube, -1), - OBJNAME("damCps", PROC_Obj_DamCps, -1), - OBJNAME("railDrw", PROC_PATH_LINE, -1), - OBJNAME("sdoor", PROC_SPIRAL_DOOR, -1), + OBJNAME("unitC00", fpcNm_Obj_TestCube_e, -1), + OBJNAME("unitS00", fpcNm_Obj_TestCube_e, -1), + OBJNAME("unitCy0", fpcNm_Obj_TestCube_e, -1), + OBJNAME("damCps", fpcNm_Obj_DamCps_e, -1), + OBJNAME("railDrw", fpcNm_PATH_LINE_e, -1), + OBJNAME("sdoor", fpcNm_SPIRAL_DOOR_e, -1), #endif - OBJNAME("ClearB", PROC_Obj_Cboard, -1), - OBJNAME("Bg", PROC_BG, -1), - OBJNAME("Boom", PROC_BOOMERANG, -1), - OBJNAME("Nbomb", PROC_NBOMB, -1), - OBJNAME("Arrow", PROC_ARROW, -1), - OBJNAME("E_Arrow", PROC_E_ARROW, -1), - OBJNAME("Spinner", PROC_SPINNER, -1), - OBJNAME("Crod", PROC_CROD, -1), - OBJNAME("Midna", PROC_MIDNA, -1), - OBJNAME("Vrbox", PROC_VRBOX, -1), - OBJNAME("Vrbox2", PROC_VRBOX2, -1), - OBJNAME("mvbg_a", PROC_BG_OBJ, -1), - OBJNAME("burnBox", PROC_Obj_BurnBox, -1), - OBJNAME("stnMark", PROC_Obj_StoneMark, -1), + OBJNAME("ClearB", fpcNm_Obj_Cboard_e, -1), + OBJNAME("Bg", fpcNm_BG_e, -1), + OBJNAME("Boom", fpcNm_BOOMERANG_e, -1), + OBJNAME("Nbomb", fpcNm_NBOMB_e, -1), + OBJNAME("Arrow", fpcNm_ARROW_e, -1), + OBJNAME("E_Arrow", fpcNm_E_ARROW_e, -1), + OBJNAME("Spinner", fpcNm_SPINNER_e, -1), + OBJNAME("Crod", fpcNm_CROD_e, -1), + OBJNAME("Midna", fpcNm_MIDNA_e, -1), + OBJNAME("Vrbox", fpcNm_VRBOX_e, -1), + OBJNAME("Vrbox2", fpcNm_VRBOX2_e, -1), + OBJNAME("mvbg_a", fpcNm_BG_OBJ_e, -1), + OBJNAME("burnBox", fpcNm_Obj_BurnBox_e, -1), + OBJNAME("stnMark", fpcNm_Obj_StoneMark_e, -1), #if PLATFORM_GCN - OBJNAME("Passer", PROC_NPC_PASSER, -1), + OBJNAME("Passer", fpcNm_NPC_PASSER_e, -1), #endif - OBJNAME("Passer2", PROC_NPC_PASSER2, -1), - OBJNAME("ShopItm", PROC_ShopItem, -1), - OBJNAME("E_yd_lf", PROC_E_YD_LEAF, -1), - OBJNAME("E_db_lf", PROC_E_DB_LEAF, -1), - OBJNAME("E_hb_lf", PROC_E_HB_LEAF, -1), - OBJNAME("E_bi_lf", PROC_E_BI_LEAF, -1), - OBJNAME("O_Mato", PROC_Obj_Mato, -1), - OBJNAME("O_Flag", PROC_Obj_Flag, -1), - OBJNAME("O_Flag2", PROC_Obj_Flag2, -1), - OBJNAME("O_Flag3", PROC_Obj_Flag3, -1), - OBJNAME("CRVLH_U", PROC_Obj_CRVLH_UP, -1), - OBJNAME("DemoItm", PROC_Demo_Item, -1), - OBJNAME("EndCode", PROC_PLAY_SCENE, -1), + OBJNAME("Passer2", fpcNm_NPC_PASSER2_e, -1), + OBJNAME("ShopItm", fpcNm_ShopItem_e, -1), + OBJNAME("E_yd_lf", fpcNm_E_YD_LEAF_e, -1), + OBJNAME("E_db_lf", fpcNm_E_DB_LEAF_e, -1), + OBJNAME("E_hb_lf", fpcNm_E_HB_LEAF_e, -1), + OBJNAME("E_bi_lf", fpcNm_E_BI_LEAF_e, -1), + OBJNAME("O_Mato", fpcNm_Obj_Mato_e, -1), + OBJNAME("O_Flag", fpcNm_Obj_Flag_e, -1), + OBJNAME("O_Flag2", fpcNm_Obj_Flag2_e, -1), + OBJNAME("O_Flag3", fpcNm_Obj_Flag3_e, -1), + OBJNAME("CRVLH_U", fpcNm_Obj_CRVLH_UP_e, -1), + OBJNAME("DemoItm", fpcNm_Demo_Item_e, -1), + OBJNAME("EndCode", fpcNm_PLAY_SCENE_e, -1), }; // clang-format on @@ -1581,7 +1581,7 @@ static void dStage_actorCreate(stage_actor_data_class* i_actorData, fopAcM_prm_c JKRFree(i_actorPrm); } else { i_actorPrm->argument = actorInf->argument; - if (actorInf->procname == PROC_SUSPEND) { + if (actorInf->procname == fpcNm_SUSPEND_e) { fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_FastCreate(actorInf->procname, NULL, NULL, i_actorPrm); if (actor != NULL) { @@ -1596,7 +1596,7 @@ static void dStage_actorCreate(stage_actor_data_class* i_actorData, fopAcM_prm_c static int dStage_cameraCreate(stage_camera2_data_class* i_cameraData, int i_cameraIdx, int param_2) { - s16 procname = PROC_CAMERA; + s16 procname = fpcNm_CAMERA_e; if (procname < 0) { return 0; } @@ -1688,9 +1688,9 @@ static int dStage_playerInit(dStage_dt_c* i_stage, void* i_data, int num, void* base_process_class* stageProc = (base_process_class*)fopScnM_SearchByID(dStage_roomControl_c::getProcID()); JUT_ASSERT(1683, stageProc != NULL); - if (fpcM_GetName(stageProc) == PROC_PLAY_SCENE) { + if (fpcM_GetName(stageProc) == fpcNm_PLAY_SCENE_e) { if (strcmp(dComIfGp_getStartStageName(), "S_MV000")) { - fopMsgM_Create(PROC_METER2, NULL, NULL); + fopMsgM_Create(fpcNm_METER2_e, NULL, NULL); } } @@ -2473,10 +2473,10 @@ static int dStage_elstInfoInit(dStage_dt_c* i_stage, void* i_data, int param_2, } static void dKankyo_create() { - fopKyM_fastCreate(PROC_KANKYO, 0, NULL, NULL, NULL); - fopKyM_fastCreate(PROC_KYEFF, 0, NULL, NULL, NULL); - fopKyM_fastCreate(PROC_KYEFF2, 0, NULL, NULL, NULL); - fopKyM_fastCreate(PROC_ENVSE, 0, NULL, NULL, NULL); + fopKyM_fastCreate(fpcNm_KANKYO_e, 0, NULL, NULL, NULL); + fopKyM_fastCreate(fpcNm_KYEFF_e, 0, NULL, NULL, NULL); + fopKyM_fastCreate(fpcNm_KYEFF2_e, 0, NULL, NULL, NULL); + fopKyM_fastCreate(fpcNm_ENVSE_e, 0, NULL, NULL, NULL); } static void layerMemoryInfoLoader(void* i_data, dStage_dt_c* i_stage, int param_2) { @@ -2731,8 +2731,8 @@ void dStage_Create() { dKankyo_create(); if (dComIfG_getStageRes("vrbox_sora.bmd")) { - fopAcM_Create(PROC_VRBOX, NULL, NULL); - fopAcM_Create(PROC_VRBOX2, NULL, NULL); + fopAcM_Create(fpcNm_VRBOX_e, NULL, NULL); + fopAcM_Create(fpcNm_VRBOX2_e, NULL, NULL); } dComIfGp_evmng_create(); diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index c35b5c7a22..5299ebeb04 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -1539,7 +1539,7 @@ static int dTimer_Create(msg_class* i_this) { fpc_ProcID dTimer_createTimer(s32 i_mode, u32 i_limitMs, u8 i_type, u8 param_3, f32 param_4, f32 param_5, f32 param_6, f32 param_7) { if (dComIfG_getTimerMode() == -1) { - return fopMsgM_Timer_create(PROC_TIMER, i_mode, i_limitMs, i_type, param_3, param_4, + return fopMsgM_Timer_create(fpcNm_TIMER_e, i_mode, i_limitMs, i_type, param_3, param_4, param_5, param_6, param_7, NULL); } @@ -1555,7 +1555,7 @@ s32 dTimer_createStockTimer() { return -1; } else { u8 timer_type = dComIfG_getTimerType(); - return fopMsgM_Timer_create(PROC_TIMER, 10, 0, timer_type, 0, 221.0f, 439.0f, 32.0f, + return fopMsgM_Timer_create(fpcNm_TIMER_e, 10, 0, timer_type, 0, 221.0f, 439.0f, 32.0f, 419.0f, NULL); } } else { @@ -1634,15 +1634,15 @@ static leafdraw_method_class l_dTimer_Method = { }; msg_process_profile_definition g_profile_TIMER = { - fpcLy_CURRENT_e, - 12, - fpcPi_CURRENT_e, - PROC_TIMER, - &g_fpcLf_Method.base, - sizeof(dTimer_c), - 0, - 0, - &g_fopMsg_Method, - 768, - &l_dTimer_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 12, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TIMER_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dTimer_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopMsg_Method, + /* Draw Prio */ fpcDwPi_TIMER_e, + /* Msg SubMtd */ &l_dTimer_Method, }; diff --git a/src/dusk/imgui/ImGuiProcessOverlay.cpp b/src/dusk/imgui/ImGuiProcessOverlay.cpp index 24d1015603..38d8beed26 100644 --- a/src/dusk/imgui/ImGuiProcessOverlay.cpp +++ b/src/dusk/imgui/ImGuiProcessOverlay.cpp @@ -2,7 +2,7 @@ #include -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_pc/f_pc_create_iter.h" #include "f_pc/f_pc_create_req.h" #include "f_pc/f_pc_layer.h" diff --git a/src/f_ap/f_ap_game.cpp b/src/f_ap/f_ap_game.cpp index 6c61acb5dc..520d85d20f 100644 --- a/src/f_ap/f_ap_game.cpp +++ b/src/f_ap/f_ap_game.cpp @@ -207,10 +207,10 @@ int dumpTagObject(void* i_object, void*) { } u32 other_heap_size = 0; - if (profname == PROC_ALINK) { + if (profname == fpcNm_ALINK_e) { fopAc_ac_c* spC = a_actor; other_heap_size = daAlink_c::getOtherHeapSize(); - } else if (profname == PROC_MIDNA) { + } else if (profname == fpcNm_MIDNA_e) { fopAc_ac_c* sp8 = a_actor; other_heap_size = daMidna_c::getOtherHeapSize(); } @@ -237,10 +237,10 @@ int dumpObject(void* i_object, void* i_data) { u32 actor_size = a_actor->base.base.profile->process_size + (a_actor->heap == NULL ? 0 : a_actor->heap->getHeapSize()); u32 other_heap_size = 0; - if (profname == PROC_ALINK) { + if (profname == fpcNm_ALINK_e) { fopAc_ac_c* sp24 = a_actor; other_heap_size = daAlink_c::getOtherHeapSize(); - } else if (profname == PROC_MIDNA) { + } else if (profname == fpcNm_MIDNA_e) { fopAc_ac_c* sp20 = a_actor; other_heap_size = daMidna_c::getOtherHeapSize(); } diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index db39a252ed..d2240327b0 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -245,7 +245,7 @@ static int fopAc_Draw(void* i_this) { int var_r28 = dComIfGp_event_moveApproval(actor); if ((var_r28 == 2 || (!fopAcM_CheckStatus(actor, fopAc_ac_c::getStopStatus()) && (!fopAcM_CheckStatus(actor, fopAcStts_CULL_e) || !fopAcM_cullingCheck(actor)))) && - !fopAcM_CheckStatus(actor, 0x21000000)) + !fopAcM_CheckStatus(actor, fopAcStts_UNK_0x20000000_e | fopAcStts_NODRAW_e)) { fopAcM_OffCondition(actor, fopAcCnd_NODRAW_e); @@ -320,9 +320,9 @@ static int fopAc_Execute(void* i_this) { daSus_c::check(actor); actor->eventInfo.beforeProc(); s32 move = dComIfGp_event_moveApproval(actor); - fopAcM_OffStatus(actor, 0x40000000); + fopAcM_OffStatus(actor, fopAcStts_UNK_0x40000000_e); - if (!fopAcM_CheckStatus(actor, 0x20000000) && + if (!fopAcM_CheckStatus(actor, fopAcStts_UNK_0x20000000_e) && (move == 2 || (move != 0 && !fopAcM_CheckStatus(actor, fopAc_ac_c::getStopStatus()) && (!fopAcM_CheckStatus(actor, fopAcStts_NOEXEC_e) || !fopAcM_CheckCondition(actor, fopAcCnd_NODRAW_e))))) @@ -345,7 +345,7 @@ static int fopAc_Execute(void* i_this) { fopAcM_OnCondition(actor, fopAcCnd_NOEXEC_e); } - if (fopAcM_CheckStatus(actor, 0x20) && + if (fopAcM_CheckStatus(actor, fopAcStts_UNK_0x20_e) && actor->home.pos.y - actor->current.pos.y > 5000.0f) { fopAcM_delete(actor); @@ -385,7 +385,7 @@ static int fopAc_IsDelete(void* i_this) { #endif ret = fpcMtd_IsDelete((process_method_class*)actor->sub_method, actor); - + #if DEBUG } #endif @@ -407,7 +407,7 @@ static int fopAc_Delete(void* i_this) { #endif ret = fpcMtd_Delete((process_method_class*)actor->sub_method, actor); - + #if DEBUG } #endif @@ -533,13 +533,13 @@ static int fopAc_Create(void* i_this) { #endif ret = fpcMtd_Create((process_method_class*)actor->sub_method, actor); - + #if DEBUG } fopAcM_assert(1113, actor, fopAcM_CheckCondition(actor, fopAcCnd_INIT_e), "fopAcM_ct No Call !!"); #endif - + if (ret == cPhs_COMPLEATE_e) { fopDwTg_ToDrawQ(&actor->draw_tag, fpcM_DrawPriority(actor)); } else if (ret == cPhs_ERROR_e) { diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 77134afb01..fa4da69e68 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -5,7 +5,7 @@ #if TARGET_PC #define PROCS_DUMP_NAMES 1 -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #endif #include "d/dolzel.h" // IWYU pragma: keep @@ -1147,11 +1147,11 @@ s32 fopAcM_orderDoorEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_prio s16 evid = i_actorB->eventInfo.getEventId(); u8 toolid = i_actorB->eventInfo.getMapToolId(); - if (fopAcM_GetProfName(i_actorB) == PROC_Obj_Kshutter) { + if (fopAcM_GetProfName(i_actorB) == fpcNm_Obj_Kshutter_e) { if (toolid != 0xFF) { evid = dComIfGp_getEventManager().getEventIdx(i_actorA, NULL, toolid); } - } else if (fopAcM_GetProfName(i_actorB) == PROC_Obj_SmgDoor) { + } else if (fopAcM_GetProfName(i_actorB) == fpcNm_Obj_SmgDoor_e) { } OS_REPORT("toolid<%d>evid<%d>\n", toolid, evid); @@ -1383,7 +1383,7 @@ fpc_ProcID fopAcM_createItemForPresentDemo(cXyz const* i_pos, int i_itemNo, u8 p JUT_ASSERT(3214, 0 <= i_itemNo && i_itemNo < 256); dComIfGp_event_setGtItm(i_itemNo); - if (i_itemNo == fpcNm_ITEM_NONE) { + if (i_itemNo == dItemNo_NONE_e) { OS_REPORT("プレゼントデモ用なのに「ハズレ」です！[%d]\n", i_itemNo); // Even though it is for a Present Demo, it is a 'Miss'! return fpcM_ERROR_PROCESS_ID_e; } @@ -1397,7 +1397,7 @@ fpc_ProcID fopAcM_createItemForTrBoxDemo(cXyz const* i_pos, int i_itemNo, int i_ JUT_ASSERT(3259, 0 <= i_itemNo && i_itemNo < 256); dComIfGp_event_setGtItm(i_itemNo); - if (i_itemNo == fpcNm_ITEM_NONE) { + if (i_itemNo == dItemNo_NONE_e) { OS_REPORT("ゲットデモ用なのに「ハズレ」です！[%d]\n", i_itemNo); // Even though it is for a Get Demo, it is a 'Miss'! return fpcM_ERROR_PROCESS_ID_e; } @@ -1530,7 +1530,7 @@ fpc_ProcID fopAcM_createItemFromTable(cXyz const* i_pos, int i_itemNo, int i_ite #endif i_itemNo = fopAcM_getItemNoFromTableNo(i_itemNo); - if (i_itemNo == fpcNm_ITEM_NONE) { + if (i_itemNo == dItemNo_NONE_e) { return fpcM_ERROR_PROCESS_ID_e; } @@ -1556,12 +1556,12 @@ fpc_ProcID fopAcM_createDemoItem(const cXyz* i_pos, int i_itemNo, int i_itemBitN JUT_ASSERT(3824, 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo < (dSv_info_c::DAN_ITEM + dSv_info_c::MEMORY_ITEM + dSv_info_c::ZONE_ITEM )) || i_itemBitNo == 255); // clang-format on - if (i_itemNo == fpcNm_ITEM_NONE) { + if (i_itemNo == dItemNo_NONE_e) { return fpcM_ERROR_PROCESS_ID_e; } u32 params = (i_itemNo & 0xFF) << 0x0 | (i_itemBitNo & 0x7F) << 0x8 | (param_7 & 0xFF) << 0x10; - return fopAcM_create(PROC_Demo_Item, params, i_pos, i_roomNo, i_angle, scale, -1); + return fopAcM_create(fpcNm_Demo_Item_e, params, i_pos, i_roomNo, i_angle, scale, -1); } fpc_ProcID fopAcM_createItemForBoss(const cXyz* i_pos, int i_itemNo, int i_roomNo, @@ -1570,7 +1570,7 @@ fpc_ProcID fopAcM_createItemForBoss(const cXyz* i_pos, int i_itemNo, int i_roomN int _ = -1; u32 params = 0xFFFF0000 | param_8 << 8 | (i_itemNo & 0xFF); - fopAc_ac_c* actor = fopAcM_fastCreate(PROC_Obj_LifeContainer, params, i_pos, i_roomNo, i_angle, + fopAc_ac_c* actor = fopAcM_fastCreate(fpcNm_Obj_LifeContainer_e, params, i_pos, i_roomNo, i_angle, i_scale, -1, NULL, NULL); if (actor != NULL) { actor->speedF = i_speedF; @@ -1615,7 +1615,7 @@ fpc_ProcID fopAcM_createItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, i JUT_ASSERT(4067, 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo < (dSv_info_c::DAN_ITEM + dSv_info_c::MEMORY_ITEM + dSv_info_c::ZONE_ITEM )) || i_itemBitNo == 255); // clang-format on - if (i_itemNo == fpcNm_ITEM_NONE) { + if (i_itemNo == dItemNo_NONE_e) { return fpcM_ERROR_PROCESS_ID_e; } @@ -1635,38 +1635,38 @@ fpc_ProcID fopAcM_createItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, i u32 params = MAKE_ITEM_PARAMS(item_no, i_itemBitNo, unk, param_7); switch (i_itemNo) { - case fpcNm_ITEM_RECOVERY_FAILY: - ret = fopAcM_create(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1); + case dItemNo_RECOVERY_FAILY_e: + ret = fopAcM_create(fpcNm_Obj_Yousei_e, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1); break; #if DEBUG // Return pointer fopAc_ac_c* is uninitialized for these branches - case fpcNm_ITEM_SMALL_KEY: + case dItemNo_SMALL_KEY_e: // "Small Key: Can't support map display, so program generation is prohibited!\n" OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); JUT_ASSERT(4145, FALSE); break; - case fpcNm_ITEM_KANTERA: + case dItemNo_KANTERA_e: // "Lantern: Program generation is prohibited!\n" OS_REPORT_ERROR("カンテラ：プログラム生成禁止！\n"); JUT_ASSERT(4149, FALSE); break; - case fpcNm_ITEM_LIGHT_DROP: + case dItemNo_LIGHT_DROP_e: // "Light Drop: Program generation is prohibited!\n" OS_REPORT_ERROR("光の雫：プログラム生成禁止！\n"); JUT_ASSERT(4153, FALSE); break; #endif - case fpcNm_ITEM_KAKERA_HEART: - case fpcNm_ITEM_UTAWA_HEART: - ret = fopAcM_create(PROC_Obj_LifeContainer, params, i_pos, i_roomNo, i_angle, i_scale, -1); + case dItemNo_KAKERA_HEART_e: + case dItemNo_UTAWA_HEART_e: + ret = fopAcM_create(fpcNm_Obj_LifeContainer_e, params, i_pos, i_roomNo, i_angle, i_scale, -1); break; - case fpcNm_ITEM_TRIPLE_HEART: + case dItemNo_TRIPLE_HEART_e: for (i = 0; i < 2; i++) { - fopAcM_create(PROC_ITEM, params, i_pos, i_roomNo, &item_angle, i_scale, -1); + fopAcM_create(fpcNm_ITEM_e, params, i_pos, i_roomNo, &item_angle, i_scale, -1); item_angle.y = cM_rndFX(0x7FFF); } default: - ret = fopAcM_create(PROC_ITEM, params, i_pos, i_roomNo, &item_angle, i_scale, -1); + ret = fopAcM_create(fpcNm_ITEM_e, params, i_pos, i_roomNo, &item_angle, i_scale, -1); break; } @@ -1681,7 +1681,7 @@ fopAc_ac_c* fopAcM_fastCreateItem2(const cXyz* i_pos, int i_itemNo, int i_itemBi csXyz item_angle(csXyz::Zero); - if (i_itemNo == fpcNm_ITEM_NONE) { + if (i_itemNo == dItemNo_NONE_e) { return NULL; } @@ -1700,41 +1700,41 @@ fopAc_ac_c* fopAcM_fastCreateItem2(const cXyz* i_pos, int i_itemNo, int i_itemBi u32 params = MAKE_ITEM_PARAMS(item_no, i_itemBitNo, unk, param_5); switch (i_itemNo) { - case fpcNm_ITEM_RECOVERY_FAILY: - ret = fopAcM_fastCreate(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1, + case dItemNo_RECOVERY_FAILY_e: + ret = fopAcM_fastCreate(fpcNm_Obj_Yousei_e, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1, NULL, NULL); break; #if DEBUG // Return pointer fopAc_ac_c* is uninitialized for these branches - case fpcNm_ITEM_SMALL_KEY: + case dItemNo_SMALL_KEY_e: // "Small Key: Can't support map display, so program generation is prohibited!\n" OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); JUT_ASSERT(4268, FALSE); break; - case fpcNm_ITEM_KANTERA: + case dItemNo_KANTERA_e: // "Lantern: Program generation is prohibited!\n" OS_REPORT_ERROR("カンテラ：プログラム生成禁止！\n"); JUT_ASSERT(4272, FALSE); break; - case fpcNm_ITEM_LIGHT_DROP: + case dItemNo_LIGHT_DROP_e: // "Light Drop: Program generation is prohibited!\n" OS_REPORT_ERROR("光の雫：プログラム生成禁止！\n"); JUT_ASSERT(4276, FALSE); break; #endif - case fpcNm_ITEM_KAKERA_HEART: - case fpcNm_ITEM_UTAWA_HEART: - ret = fopAcM_fastCreate(PROC_Obj_LifeContainer, params, i_pos, i_roomNo, i_angle, i_scale, + case dItemNo_KAKERA_HEART_e: + case dItemNo_UTAWA_HEART_e: + ret = fopAcM_fastCreate(fpcNm_Obj_LifeContainer_e, params, i_pos, i_roomNo, i_angle, i_scale, -1, NULL, NULL); break; - case fpcNm_ITEM_TRIPLE_HEART: + case dItemNo_TRIPLE_HEART_e: for (i = 0; i < 2; i++) { - ret = fopAcM_fastCreate(PROC_ITEM, params, i_pos, i_roomNo, &item_angle, i_scale, -1, + ret = fopAcM_fastCreate(fpcNm_ITEM_e, params, i_pos, i_roomNo, &item_angle, i_scale, -1, NULL, NULL); item_angle.y = cM_rndFX(0x7FFF); } default: - ret = fopAcM_fastCreate(PROC_ITEM, params, i_pos, i_roomNo, &item_angle, i_scale, -1, NULL, + ret = fopAcM_fastCreate(fpcNm_ITEM_e, params, i_pos, i_roomNo, &item_angle, i_scale, -1, NULL, NULL); } return ret; @@ -1747,7 +1747,7 @@ fopAc_ac_c* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, JUT_ASSERT(4324, 0 <= i_itemNo && i_itemNo < 256); csXyz angle; - if (i_itemNo == fpcNm_ITEM_NONE) { + if (i_itemNo == dItemNo_NONE_e) { return NULL; } @@ -1765,34 +1765,34 @@ fopAc_ac_c* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, } switch (i_itemNo) { - case fpcNm_ITEM_RECOVERY_FAILY: - ret = fopAcM_fastCreate(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1, + case dItemNo_RECOVERY_FAILY_e: + ret = fopAcM_fastCreate(fpcNm_Obj_Yousei_e, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1, NULL, NULL); break; #if DEBUG // Return pointer fopAc_ac_c* is uninitialized for these branches - case fpcNm_ITEM_SMALL_KEY: + case dItemNo_SMALL_KEY_e: // "Small Key: Can't support map display, so program generation is prohibited!\n" OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); JUT_ASSERT(4383, FALSE); break; - case fpcNm_ITEM_KANTERA: + case dItemNo_KANTERA_e: // "Lantern: Program generation is prohibited!\n" OS_REPORT_ERROR("カンテラ：プログラム生成禁止！\n"); JUT_ASSERT(4387, FALSE); break; - case fpcNm_ITEM_LIGHT_DROP: + case dItemNo_LIGHT_DROP_e: // "Light Drop: Program generation is prohibited!\n" OS_REPORT_ERROR("光の雫：プログラム生成禁止！\n"); JUT_ASSERT(4391, FALSE); break; #endif - case fpcNm_ITEM_KAKERA_HEART: - case fpcNm_ITEM_UTAWA_HEART: - ret = fopAcM_fastCreate(PROC_Obj_LifeContainer, params, i_pos, i_roomNo, i_angle, i_scale, + case dItemNo_KAKERA_HEART_e: + case dItemNo_UTAWA_HEART_e: + ret = fopAcM_fastCreate(fpcNm_Obj_LifeContainer_e, params, i_pos, i_roomNo, i_angle, i_scale, -1, NULL, NULL); break; - case fpcNm_ITEM_TRIPLE_HEART: + case dItemNo_TRIPLE_HEART_e: for (i = 0; i < 2; i++) { if (i_angle != NULL) { angle = *i_angle; @@ -1803,7 +1803,7 @@ fopAc_ac_c* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, ANGLE_ADD(angle.y, cM_rndFX(0x2000)); ret = (fopAc_ac_c*)fopAcM_fastCreate( - PROC_ITEM, params, i_pos, i_roomNo, &angle, i_scale, -1, i_createFunc, NULL); + fpcNm_ITEM_e, params, i_pos, i_roomNo, &angle, i_scale, -1, i_createFunc, NULL); if (ret != NULL) { if (i_speedF != NULL) { @@ -1823,7 +1823,7 @@ fopAc_ac_c* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, } angle.z = 0xFF; - ret = fopAcM_fastCreate(PROC_ITEM, params, i_pos, i_roomNo, + ret = fopAcM_fastCreate(fpcNm_ITEM_e, params, i_pos, i_roomNo, &angle, i_scale, -1, i_createFunc, NULL); if (ret != NULL) { @@ -1855,7 +1855,7 @@ fpc_ProcID fopAcM_createBokkuri(u16 i_setId, const cXyz* i_pos, int i_itemNo, in } daObjCarry_c::make_prm_bokkuri(¶ms, ¶ms_ex, i_itemNo, i_itemBit, i_itemType, param_8); - return fopAcM_create(PROC_Obj_Carry, i_setId, params, i_pos, i_roomNo, ¶ms_ex, NULL, -1, NULL); + return fopAcM_create(fpcNm_Obj_Carry_e, i_setId, params, i_pos, i_roomNo, ¶ms_ex, NULL, -1, NULL); } fpc_ProcID fopAcM_createWarpHole(const cXyz* i_pos, const csXyz* i_angle, int i_roomNo, u8 param_4, @@ -1865,7 +1865,7 @@ fpc_ProcID fopAcM_createWarpHole(const cXyz* i_pos, const csXyz* i_angle, int i_ } u32 actorParams = 0x17000000 + 0xFF; u32 actorParamsOut = actorParams | (param_5 << 0x1B) | (param_6 << 0x10) | (param_4 << 0x8); - return fopAcM_create(PROC_Obj_BossWarp, actorParamsOut, i_pos, i_roomNo, i_angle, NULL, -1); + return fopAcM_create(fpcNm_Obj_BossWarp_e, actorParamsOut, i_pos, i_roomNo, i_angle, NULL, -1); } void* enemySearchJugge(void* i_actor, void* i_data) { @@ -1962,13 +1962,13 @@ fpc_ProcID fopAcM_createDisappear(const fopAc_ac_c* i_actor, const cXyz* i_pos, u8 i_type, u8 i_enemyID) { u32 param = (i_enemyID << 0x10) | (i_size << 0x8) | i_type; fopAc_ac_c* actor = fopAcM_fastCreate( - PROC_DISAPPEAR, param, i_pos, fopAcM_GetRoomNo(i_actor), &i_actor->current.angle, NULL, 0xFF, + fpcNm_DISAPPEAR_e, param, i_pos, fopAcM_GetRoomNo(i_actor), &i_actor->current.angle, NULL, 0xFF, NULL, NULL); return fopAcM_GetID(actor); } void fopAcM_setCarryNow(fopAc_ac_c* i_actor, int param_1) { - i_actor->actor_status |= 0x2000; + i_actor->actor_status |= fopAcStts_CARRY_NOW_e; if (param_1 != 0) { fopAcM_setStageLayer(i_actor); @@ -1978,7 +1978,7 @@ void fopAcM_setCarryNow(fopAc_ac_c* i_actor, int param_1) { void fopAcM_cancelCarryNow(fopAc_ac_c* i_actor) { if (fopAcM_checkCarryNow(i_actor)) { - i_actor->actor_status &= ~0x2000; + i_actor->actor_status &= ~fopAcStts_CARRY_NOW_e; if (fopAcM_GetHomeRoomNo(i_actor) != -1 && fopScnM_SearchByID(dStage_roomControl_c::getStatusProcID(fopAcM_GetRoomNo(i_actor))) != @@ -1990,8 +1990,8 @@ void fopAcM_cancelCarryNow(fopAc_ac_c* i_actor) { i_actor->shape_angle.z = 0; i_actor->shape_angle.x = 0; - if (dComIfGp_event_runCheck() && fopAcM_GetGroup(i_actor) != 2) { - i_actor->actor_status |= 0x800; + if (dComIfGp_event_runCheck() && fopAcM_GetGroup(i_actor) != fopAc_ENEMY_e) { + i_actor->actor_status |= fopAcStts_STAFF_EXTRA_e; } } } diff --git a/src/f_op/f_op_kankyo.cpp b/src/f_op/f_op_kankyo.cpp index c66860e79f..00e2eb838c 100644 --- a/src/f_op/f_op_kankyo.cpp +++ b/src/f_op/f_op_kankyo.cpp @@ -48,7 +48,7 @@ static int fopKy_Execute(void* i_this) { fapGm_HIO_c::startCpuTimer(); #endif - if (!dScnPly_c::isPause() && (!dComIfGp_isPauseFlag() || fpcM_GetName(a_this) == PROC_ENVSE)) { + if (!dScnPly_c::isPause() && (!dComIfGp_isPauseFlag() || fpcM_GetName(a_this) == fpcNm_ENVSE_e)) { ret = fpcMtd_Execute(&((kankyo_class*)i_this)->sub_method->base, i_this); } diff --git a/src/f_op/f_op_kankyo_mng.cpp b/src/f_op/f_op_kankyo_mng.cpp index fe71a828c2..13b6e62819 100644 --- a/src/f_op/f_op_kankyo_mng.cpp +++ b/src/f_op/f_op_kankyo_mng.cpp @@ -84,7 +84,7 @@ fpc_ProcID fopKyM_createWpillar(cXyz const* i_pos, f32 scale, int i_param) { append->scale.set(scale, scale, scale); append->parameters = i_param; - return fopKyM_Create(PROC_WPILLAR, NULL, append); + return fopKyM_Create(fpcNm_WPILLAR_e, NULL, append); } fpc_ProcID fopKyM_createMpillar(cXyz const* i_pos, f32 i_size) { diff --git a/src/f_pc/f_pc_base.cpp b/src/f_pc/f_pc_base.cpp index 08a462ead8..848153b836 100644 --- a/src/f_pc/f_pc_base.cpp +++ b/src/f_pc/f_pc_base.cpp @@ -19,7 +19,7 @@ #include "dusk/logging.h" #if TARGET_PC -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static const char* getProcName(s16 id) { for (auto procName : procNames) {