diff --git a/include/d/d_bg/d_bg_s/polypass/asm/func_80078D64.s b/include/d/d_bg/d_bg_s/polypass/asm/func_80078D64.s deleted file mode 100644 index 0e69b6aa8e5..00000000000 --- a/include/d/d_bg/d_bg_s/polypass/asm/func_80078D64.s +++ /dev/null @@ -1,19 +0,0 @@ -/* 80078D64 00075CA4 3C 80 80 3B */ lis r4, lbl_803ABA44@ha -/* 80078D68 00075CA8 38 04 BA 44 */ addi r0, r4, lbl_803ABA44@l -/* 80078D6C 00075CAC 90 03 00 00 */ stw r0, 0(r3) -/* 80078D70 00075CB0 3C 80 80 3B */ lis r4, lbl_803ABA38@ha -/* 80078D74 00075CB4 38 04 BA 38 */ addi r0, r4, lbl_803ABA38@l -/* 80078D78 00075CB8 90 03 00 00 */ stw r0, 0(r3) -/* 80078D7C 00075CBC 38 00 00 00 */ li r0, 0 -/* 80078D80 00075CC0 98 03 00 04 */ stb r0, 4(r3) -/* 80078D84 00075CC4 98 03 00 05 */ stb r0, 5(r3) -/* 80078D88 00075CC8 98 03 00 06 */ stb r0, 6(r3) -/* 80078D8C 00075CCC 98 03 00 07 */ stb r0, 7(r3) -/* 80078D90 00075CD0 98 03 00 08 */ stb r0, 8(r3) -/* 80078D94 00075CD4 98 03 00 09 */ stb r0, 9(r3) -/* 80078D98 00075CD8 98 03 00 0A */ stb r0, 0xa(r3) -/* 80078D9C 00075CDC 98 03 00 0B */ stb r0, 0xb(r3) -/* 80078DA0 00075CE0 98 03 00 0C */ stb r0, 0xc(r3) -/* 80078DA4 00075CE4 98 03 00 0D */ stb r0, 0xd(r3) -/* 80078DA8 00075CE8 98 03 00 0E */ stb r0, 0xe(r3) -/* 80078DAC 00075CEC 4E 80 00 20 */ blr diff --git a/include/d/d_bg/d_bg_s/polypass/asm/func_80078DB0.s b/include/d/d_bg/d_bg_s/polypass/asm/func_80078DB0.s deleted file mode 100644 index 51174a11b6f..00000000000 --- a/include/d/d_bg/d_bg_s/polypass/asm/func_80078DB0.s +++ /dev/null @@ -1,25 +0,0 @@ -/* 80078DB0 00075CF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80078DB4 00075CF4 7C 08 02 A6 */ mflr r0 -/* 80078DB8 00075CF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80078DBC 00075CFC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80078DC0 00075D00 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80078DC4 00075D04 41 82 00 30 */ beq lbl_80078DF4 -/* 80078DC8 00075D08 3C 60 80 3B */ lis r3, lbl_803ABA38@ha -/* 80078DCC 00075D0C 38 03 BA 38 */ addi r0, r3, lbl_803ABA38@l -/* 80078DD0 00075D10 90 1F 00 00 */ stw r0, 0(r31) -/* 80078DD4 00075D14 41 82 00 10 */ beq lbl_80078DE4 -/* 80078DD8 00075D18 3C 60 80 3B */ lis r3, lbl_803ABA44@ha -/* 80078DDC 00075D1C 38 03 BA 44 */ addi r0, r3, lbl_803ABA44@l -/* 80078DE0 00075D20 90 1F 00 00 */ stw r0, 0(r31) -lbl_80078DE4: -/* 80078DE4 00075D24 7C 80 07 35 */ extsh. r0, r4 -/* 80078DE8 00075D28 40 81 00 0C */ ble lbl_80078DF4 -/* 80078DEC 00075D2C 7F E3 FB 78 */ mr r3, r31 -/* 80078DF0 00075D30 48 25 5F 4D */ bl __dl__FPv -lbl_80078DF4: -/* 80078DF4 00075D34 7F E3 FB 78 */ mr r3, r31 -/* 80078DF8 00075D38 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80078DFC 00075D3C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80078E00 00075D40 7C 08 03 A6 */ mtlr r0 -/* 80078E04 00075D44 38 21 00 10 */ addi r1, r1, 0x10 -/* 80078E08 00075D48 4E 80 00 20 */ blr diff --git a/src/d/d_bg/d_bg_s_poly_pass_chk.cpp b/src/d/d_bg/d_bg_s_poly_pass_chk.cpp index 89fc47cadd0..14096e407d6 100644 --- a/src/d/d_bg/d_bg_s_poly_pass_chk.cpp +++ b/src/d/d_bg/d_bg_s_poly_pass_chk.cpp @@ -3,19 +3,11 @@ #include "d/d_bg/d_bg_s/d_bg_s_poly_pass_chk.h" #include "global.h" -// __ct__16dBgS_PolyPassChkFv -// dBgS_PolyPassChk::dBgS_PolyPassChk(void) -asm dBgS_PolyPassChk::dBgS_PolyPassChk() { - nofralloc - #include "d/d_bg/d_bg_s/polypass/asm/func_80078D64.s" -} +dBgS_PolyPassChk::dBgS_PolyPassChk() + : mObject(false), mCamera(false), mLink(false), mArrow(false), mBomb(false), mBoomerang(false), + mRope(false), mUnderwaterRoof(false), mHorse(false), mStatue(false), mIronBall(false) {} -// __dt__16dBgS_PolyPassChkFv -// dBgS_PolyPassChk::~dBgS_PolyPassChk(void) -asm dBgS_PolyPassChk::~dBgS_PolyPassChk() { - nofralloc - #include "d/d_bg/d_bg_s/polypass/asm/func_80078DB0.s" -} +dBgS_PolyPassChk::~dBgS_PolyPassChk() {} void dBgS_PolyPassChk::SetPassChkInfo(dBgS_PolyPassChk& chk) { mObject = chk.mObject;