diff --git a/src/d/actor/d_a_obj_crvhahen.cpp b/src/d/actor/d_a_obj_crvhahen.cpp index 2ab0ea95377..a67e53b5410 100644 --- a/src/d/actor/d_a_obj_crvhahen.cpp +++ b/src/d/actor/d_a_obj_crvhahen.cpp @@ -78,16 +78,7 @@ extern "C" u8 now__14mDoMtx_stack_c[48]; // Declarations: // -/* ############################################################################################## */ -/* 80BD4048-80BD4048 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -// #pragma push -// #pragma force_active on -// SECTION_DEAD static char const* const stringBase_80BD4048 = "CrvFence"; -// SECTION_DEAD static char const* const stringBase_80BD4051 = "CaravanPiece.bmd"; -// #pragma pop - /* 80BD4064-80BD4068 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -// SECTION_DATA static const char* l_arcName = "CrvFence"; static const char* l_arcName = "CrvFence"; int daObjCRVHAHEN_c::CreateHeap() { @@ -119,32 +110,6 @@ static int daObjCRVHAHEN_Delete(daObjCRVHAHEN_c* i_this) { return 1; } -/* ############################################################################################## */ -/* 80BD3FF0-80BD3FF4 000000 0004+00 5/5 0/0 0/0 .rodata @3703 */ -// SECTION_RODATA static f32 const lit_3703 = 0.5f; -// COMPILER_STRIP_GATE(0x80BD3FF0, &lit_3703); - -// /* 80BD3FF4-80BD3FF8 000004 0004+00 0/1 0/0 0/0 .rodata @3704 */ -// #pragma push -// #pragma force_active on -// SECTION_RODATA static f32 const lit_3704 = 1.0f; -// COMPILER_STRIP_GATE(0x80BD3FF4, &lit_3704); -// #pragma pop - -// /* 80BD3FF8-80BD3FFC 000008 0004+00 0/1 0/0 0/0 .rodata @3705 */ -// #pragma push -// #pragma force_active on -// SECTION_RODATA static f32 const lit_3705 = 5000.0f; -// COMPILER_STRIP_GATE(0x80BD3FF8, &lit_3705); -// #pragma pop - -// /* 80BD3FFC-80BD4000 00000C 0004+00 0/1 0/0 0/0 .rodata @3706 */ -// #pragma push -// #pragma force_active on -// SECTION_RODATA static f32 const lit_3706 = 65536.0f; -// COMPILER_STRIP_GATE(0x80BD3FFC, &lit_3706); -// #pragma pop - /* 80BD342C-80BD3628 00016C 01FC+00 0/0 0/0 2/2 .text * HahenSet__15daObjCRVHAHEN_cF4cXyz4cXyz4cXyz4cXyzf */ int daObjCRVHAHEN_c::HahenSet(cXyz param_1, cXyz param_2, cXyz param_3, cXyz param_4, f32 param_5) { @@ -200,35 +165,6 @@ extern "C" void __dt__4cXyzFv() { // NONMATCHING } -/* ############################################################################################## */ -/* 80BD4000-80BD4004 000010 0004+00 0/2 0/0 0/0 .rodata @3773 */ -// #pragma push -// #pragma force_active on -// SECTION_RODATA static f32 const lit_3773 = -9.0f; -// COMPILER_STRIP_GATE(0x80BD4000, &lit_3773); -// #pragma pop - -// /* 80BD4004-80BD4008 000014 0004+00 0/1 0/0 0/0 .rodata @3774 */ -// #pragma push -// #pragma force_active on -// SECTION_RODATA static f32 const lit_3774 = 13.0f; -// COMPILER_STRIP_GATE(0x80BD4004, &lit_3774); -// #pragma pop - -// /* 80BD4008-80BD400C 000018 0004+00 0/1 0/0 0/0 .rodata @3775 */ -// #pragma push -// #pragma force_active on -// SECTION_RODATA static f32 const lit_3775 = -3.0f / 5.0f; -// COMPILER_STRIP_GATE(0x80BD4008, &lit_3775); -// #pragma pop - -// /* 80BD400C-80BD4010 00001C 0004+00 0/1 0/0 0/0 .rodata @3776 */ -// #pragma push -// #pragma force_active on -// SECTION_RODATA static f32 const lit_3776 = 4.0f / 5.0f; -// COMPILER_STRIP_GATE(0x80BD400C, &lit_3776); -// #pragma pop - /* 80BD3720-80BD38DC 000460 01BC+00 1/1 0/0 0/0 .text Hahen_Hakai__15daObjCRVHAHEN_cFii */ void daObjCRVHAHEN_c::Hahen_Hakai(int start, int end) { @@ -269,43 +205,6 @@ void daObjCRVHAHEN_c::Hahen_Hakai(int start, int end) { } } -/* ############################################################################################## */ -/* 80BD4010-80BD4018 000020 0004+04 0/2 0/0 0/0 .rodata @3836 */ -// #pragma push -// #pragma force_active on -// SECTION_RODATA static u8 const lit_3836[4 + 4 /* padding */] = { -// 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -// }; -// COMPILER_STRIP_GATE(0x80BD4010, &lit_3836); -// #pragma pop - -// /* 80BD4018-80BD4020 000028 0008+00 0/1 0/0 0/0 .rodata @3837 */ -// #pragma push -// #pragma force_active on -// SECTION_RODATA static u8 const lit_3837[8] = { -// 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -// }; -// COMPILER_STRIP_GATE(0x80BD4018, &lit_3837); -// #pragma pop - -// /* 80BD4020-80BD4028 000030 0008+00 0/1 0/0 0/0 .rodata @3838 */ -// #pragma push -// #pragma force_active on -// SECTION_RODATA static u8 const lit_3838[8] = { -// 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -// }; -// COMPILER_STRIP_GATE(0x80BD4020, &lit_3838); -// #pragma pop - -// /* 80BD4028-80BD4030 000038 0008+00 0/1 0/0 0/0 .rodata @3839 */ -// #pragma push -// #pragma force_active on -// SECTION_RODATA static u8 const lit_3839[8] = { -// 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -// }; -// COMPILER_STRIP_GATE(0x80BD4028, &lit_3839); -// #pragma pop - /* 80BD38DC-80BD3A9C 00061C 01C0+00 1/1 0/0 0/0 .text CheckCull__15daObjCRVHAHEN_cFv */ void daObjCRVHAHEN_c::CheckCull() { daPy_py_c* player = daPy_getPlayerActorClass(); @@ -323,21 +222,6 @@ void daObjCRVHAHEN_c::CheckCull() { } } -/* ############################################################################################## */ -/* 80BD4030-80BD4034 000040 0004+00 0/1 0/0 0/0 .rodata @3852 */ -// #pragma push -// #pragma force_active on -// SECTION_RODATA static f32 const lit_3852 = 608.0f; -// COMPILER_STRIP_GATE(0x80BD4030, &lit_3852); -// #pragma pop - -// /* 80BD4034-80BD4038 000044 0004+00 0/1 0/0 0/0 .rodata @3853 */ -// #pragma push -// #pragma force_active on -// SECTION_RODATA static f32 const lit_3853 = 448.0f; -// COMPILER_STRIP_GATE(0x80BD4034, &lit_3853); -// #pragma pop - /* 80BD3A9C-80BD3B20 0007DC 0084+00 1/1 0/0 0/0 .text checkViewArea__15daObjCRVHAHEN_cFP4cXyz */ bool daObjCRVHAHEN_c::checkViewArea(cXyz* i_this) { Vec proj; @@ -414,40 +298,11 @@ static int daObjCRVHAHEN_Draw(daObjCRVHAHEN_c* i_this) { return 1; } -/* 80BD3D9C-80BD3DBC 000ADC 0020+00 2/1 0/0 0/0 .text daObjCRVHAHEN_Execute__FP15daObjCRVHAHEN_c - */ +/* 80BD3D9C-80BD3DBC 000ADC 0020+00 2/1 0/0 0/0 .text daObjCRVHAHEN_Execute__FP15daObjCRVHAHEN_c */ static void daObjCRVHAHEN_Execute(daObjCRVHAHEN_c* i_this) { static_cast(i_this)->Execute(); } -/* ############################################################################################## */ -/* 80BD4038-80BD403C 000048 0004+00 0/1 0/0 0/0 .rodata @3993 */ -// #pragma push -// #pragma force_active on -// SECTION_RODATA static f32 const lit_3993 = -1000.0f; -// COMPILER_STRIP_GATE(0x80BD4038, &lit_3993); -// #pragma pop - -// /* 80BD403C-80BD4040 00004C 0004+00 0/1 0/0 0/0 .rodata @3994 */ -// #pragma push -// #pragma force_active on -// SECTION_RODATA static f32 const lit_3994 = -500.0f; -// COMPILER_STRIP_GATE(0x80BD403C, &lit_3994); -// #pragma pop - -// /* 80BD4040-80BD4044 000050 0004+00 0/1 0/0 0/0 .rodata @3995 */ -// #pragma push -// #pragma force_active on -// SECTION_RODATA static f32 const lit_3995 = 1000.0f; -// COMPILER_STRIP_GATE(0x80BD4040, &lit_3995); -// #pragma pop - -// /* 80BD4044-80BD4048 000054 0004+00 0/1 0/0 0/0 .rodata @3996 */ -// #pragma push -// #pragma force_active on -// SECTION_RODATA static f32 const lit_3996 = 500.0f; -// COMPILER_STRIP_GATE(0x80BD4044, &lit_3996); -// #pragma pop /* 80BD3DBC-80BD3F9C 000AFC 01E0+00 1/1 0/0 0/0 .text create__15daObjCRVHAHEN_cFv */ int daObjCRVHAHEN_c::create() {