From 4bcd3d4ca1bc9deec81ba1a919bece6af2ec226e Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 22 Jan 2021 07:02:22 -0500 Subject: [PATCH] dBgs: Implement all dBgS_PolyPassChk Set and Clr functions --- .../d_bg/d_bg_s/polypass/asm/func_80078E0C.s | 23 --- .../d_bg/d_bg_s/polypass/asm/func_80078E68.s | 3 - .../d_bg/d_bg_s/polypass/asm/func_80078E74.s | 3 - .../d_bg/d_bg_s/polypass/asm/func_80078E80.s | 3 - .../d_bg/d_bg_s/polypass/asm/func_80078E8C.s | 3 - .../d_bg/d_bg_s/polypass/asm/func_80078E98.s | 3 - .../d_bg/d_bg_s/polypass/asm/func_80078EA4.s | 3 - .../d_bg/d_bg_s/polypass/asm/func_80078EB0.s | 3 - .../d_bg/d_bg_s/polypass/asm/func_80078EBC.s | 3 - .../d_bg/d_bg_s/polypass/asm/func_80078EC8.s | 3 - .../d_bg/d_bg_s/polypass/asm/func_80078ED4.s | 3 - .../d_bg/d_bg_s/polypass/asm/func_80078EE0.s | 3 - .../d_bg/d_bg_s/polypass/asm/func_80078EEC.s | 3 - .../d_bg/d_bg_s/polypass/asm/func_80078EF8.s | 3 - .../d_bg/d_bg_s/polypass/asm/func_80078F7C.s | 3 - .../d_bg/d_bg_s/polypass/asm/func_80078F88.s | 3 - .../d_bg/d_bg_s/polypass/asm/func_80078F94.s | 3 - .../d_bg/d_bg_s/polypass/asm/func_80078FA0.s | 3 - src/d/d_bg/d_bg_s_poly_pass_chk.cpp | 136 ++++++------------ 19 files changed, 46 insertions(+), 164 deletions(-) delete mode 100644 include/d/d_bg/d_bg_s/polypass/asm/func_80078E0C.s delete mode 100644 include/d/d_bg/d_bg_s/polypass/asm/func_80078E68.s delete mode 100644 include/d/d_bg/d_bg_s/polypass/asm/func_80078E74.s delete mode 100644 include/d/d_bg/d_bg_s/polypass/asm/func_80078E80.s delete mode 100644 include/d/d_bg/d_bg_s/polypass/asm/func_80078E8C.s delete mode 100644 include/d/d_bg/d_bg_s/polypass/asm/func_80078E98.s delete mode 100644 include/d/d_bg/d_bg_s/polypass/asm/func_80078EA4.s delete mode 100644 include/d/d_bg/d_bg_s/polypass/asm/func_80078EB0.s delete mode 100644 include/d/d_bg/d_bg_s/polypass/asm/func_80078EBC.s delete mode 100644 include/d/d_bg/d_bg_s/polypass/asm/func_80078EC8.s delete mode 100644 include/d/d_bg/d_bg_s/polypass/asm/func_80078ED4.s delete mode 100644 include/d/d_bg/d_bg_s/polypass/asm/func_80078EE0.s delete mode 100644 include/d/d_bg/d_bg_s/polypass/asm/func_80078EEC.s delete mode 100644 include/d/d_bg/d_bg_s/polypass/asm/func_80078EF8.s delete mode 100644 include/d/d_bg/d_bg_s/polypass/asm/func_80078F7C.s delete mode 100644 include/d/d_bg/d_bg_s/polypass/asm/func_80078F88.s delete mode 100644 include/d/d_bg/d_bg_s/polypass/asm/func_80078F94.s delete mode 100644 include/d/d_bg/d_bg_s/polypass/asm/func_80078FA0.s diff --git a/include/d/d_bg/d_bg_s/polypass/asm/func_80078E0C.s b/include/d/d_bg/d_bg_s/polypass/asm/func_80078E0C.s deleted file mode 100644 index e8c0130aee4..00000000000 --- a/include/d/d_bg/d_bg_s/polypass/asm/func_80078E0C.s +++ /dev/null @@ -1,23 +0,0 @@ -/* 80078E0C 00075D4C 88 04 00 04 */ lbz r0, 4(r4) -/* 80078E10 00075D50 98 03 00 04 */ stb r0, 4(r3) -/* 80078E14 00075D54 88 04 00 05 */ lbz r0, 5(r4) -/* 80078E18 00075D58 98 03 00 05 */ stb r0, 5(r3) -/* 80078E1C 00075D5C 88 04 00 06 */ lbz r0, 6(r4) -/* 80078E20 00075D60 98 03 00 06 */ stb r0, 6(r3) -/* 80078E24 00075D64 88 04 00 07 */ lbz r0, 7(r4) -/* 80078E28 00075D68 98 03 00 07 */ stb r0, 7(r3) -/* 80078E2C 00075D6C 88 04 00 08 */ lbz r0, 8(r4) -/* 80078E30 00075D70 98 03 00 08 */ stb r0, 8(r3) -/* 80078E34 00075D74 88 04 00 09 */ lbz r0, 9(r4) -/* 80078E38 00075D78 98 03 00 09 */ stb r0, 9(r3) -/* 80078E3C 00075D7C 88 04 00 0A */ lbz r0, 0xa(r4) -/* 80078E40 00075D80 98 03 00 0A */ stb r0, 0xa(r3) -/* 80078E44 00075D84 88 04 00 0B */ lbz r0, 0xb(r4) -/* 80078E48 00075D88 98 03 00 0B */ stb r0, 0xb(r3) -/* 80078E4C 00075D8C 88 04 00 0C */ lbz r0, 0xc(r4) -/* 80078E50 00075D90 98 03 00 0C */ stb r0, 0xc(r3) -/* 80078E54 00075D94 88 04 00 0D */ lbz r0, 0xd(r4) -/* 80078E58 00075D98 98 03 00 0D */ stb r0, 0xd(r3) -/* 80078E5C 00075D9C 88 04 00 0E */ lbz r0, 0xe(r4) -/* 80078E60 00075DA0 98 03 00 0E */ stb r0, 0xe(r3) -/* 80078E64 00075DA4 4E 80 00 20 */ blr diff --git a/include/d/d_bg/d_bg_s/polypass/asm/func_80078E68.s b/include/d/d_bg/d_bg_s/polypass/asm/func_80078E68.s deleted file mode 100644 index 5b62843804f..00000000000 --- a/include/d/d_bg/d_bg_s/polypass/asm/func_80078E68.s +++ /dev/null @@ -1,3 +0,0 @@ -/* 80078E68 00075DA8 38 00 00 01 */ li r0, 1 -/* 80078E6C 00075DAC 98 03 00 04 */ stb r0, 4(r3) -/* 80078E70 00075DB0 4E 80 00 20 */ blr diff --git a/include/d/d_bg/d_bg_s/polypass/asm/func_80078E74.s b/include/d/d_bg/d_bg_s/polypass/asm/func_80078E74.s deleted file mode 100644 index 268c9fdbc61..00000000000 --- a/include/d/d_bg/d_bg_s/polypass/asm/func_80078E74.s +++ /dev/null @@ -1,3 +0,0 @@ -/* 80078E74 00075DB4 38 00 00 00 */ li r0, 0 -/* 80078E78 00075DB8 98 03 00 04 */ stb r0, 4(r3) -/* 80078E7C 00075DBC 4E 80 00 20 */ blr diff --git a/include/d/d_bg/d_bg_s/polypass/asm/func_80078E80.s b/include/d/d_bg/d_bg_s/polypass/asm/func_80078E80.s deleted file mode 100644 index 314ce622f9a..00000000000 --- a/include/d/d_bg/d_bg_s/polypass/asm/func_80078E80.s +++ /dev/null @@ -1,3 +0,0 @@ -/* 80078E80 00075DC0 38 00 00 01 */ li r0, 1 -/* 80078E84 00075DC4 98 03 00 05 */ stb r0, 5(r3) -/* 80078E88 00075DC8 4E 80 00 20 */ blr diff --git a/include/d/d_bg/d_bg_s/polypass/asm/func_80078E8C.s b/include/d/d_bg/d_bg_s/polypass/asm/func_80078E8C.s deleted file mode 100644 index 3c1acf6bc4f..00000000000 --- a/include/d/d_bg/d_bg_s/polypass/asm/func_80078E8C.s +++ /dev/null @@ -1,3 +0,0 @@ -/* 80078E8C 00075DCC 38 00 00 00 */ li r0, 0 -/* 80078E90 00075DD0 98 03 00 05 */ stb r0, 5(r3) -/* 80078E94 00075DD4 4E 80 00 20 */ blr diff --git a/include/d/d_bg/d_bg_s/polypass/asm/func_80078E98.s b/include/d/d_bg/d_bg_s/polypass/asm/func_80078E98.s deleted file mode 100644 index 3df7be2908c..00000000000 --- a/include/d/d_bg/d_bg_s/polypass/asm/func_80078E98.s +++ /dev/null @@ -1,3 +0,0 @@ -/* 80078E98 00075DD8 38 00 00 01 */ li r0, 1 -/* 80078E9C 00075DDC 98 03 00 06 */ stb r0, 6(r3) -/* 80078EA0 00075DE0 4E 80 00 20 */ blr diff --git a/include/d/d_bg/d_bg_s/polypass/asm/func_80078EA4.s b/include/d/d_bg/d_bg_s/polypass/asm/func_80078EA4.s deleted file mode 100644 index 61fa9c62fac..00000000000 --- a/include/d/d_bg/d_bg_s/polypass/asm/func_80078EA4.s +++ /dev/null @@ -1,3 +0,0 @@ -/* 80078EA4 00075DE4 38 00 00 00 */ li r0, 0 -/* 80078EA8 00075DE8 98 03 00 06 */ stb r0, 6(r3) -/* 80078EAC 00075DEC 4E 80 00 20 */ blr diff --git a/include/d/d_bg/d_bg_s/polypass/asm/func_80078EB0.s b/include/d/d_bg/d_bg_s/polypass/asm/func_80078EB0.s deleted file mode 100644 index eedd2cc2012..00000000000 --- a/include/d/d_bg/d_bg_s/polypass/asm/func_80078EB0.s +++ /dev/null @@ -1,3 +0,0 @@ -/* 80078EB0 00075DF0 38 00 00 01 */ li r0, 1 -/* 80078EB4 00075DF4 98 03 00 07 */ stb r0, 7(r3) -/* 80078EB8 00075DF8 4E 80 00 20 */ blr diff --git a/include/d/d_bg/d_bg_s/polypass/asm/func_80078EBC.s b/include/d/d_bg/d_bg_s/polypass/asm/func_80078EBC.s deleted file mode 100644 index 8b33698729f..00000000000 --- a/include/d/d_bg/d_bg_s/polypass/asm/func_80078EBC.s +++ /dev/null @@ -1,3 +0,0 @@ -/* 80078EBC 00075DFC 38 00 00 01 */ li r0, 1 -/* 80078EC0 00075E00 98 03 00 08 */ stb r0, 8(r3) -/* 80078EC4 00075E04 4E 80 00 20 */ blr diff --git a/include/d/d_bg/d_bg_s/polypass/asm/func_80078EC8.s b/include/d/d_bg/d_bg_s/polypass/asm/func_80078EC8.s deleted file mode 100644 index 0e2834f402f..00000000000 --- a/include/d/d_bg/d_bg_s/polypass/asm/func_80078EC8.s +++ /dev/null @@ -1,3 +0,0 @@ -/* 80078EC8 00075E08 38 00 00 00 */ li r0, 0 -/* 80078ECC 00075E0C 98 03 00 08 */ stb r0, 8(r3) -/* 80078ED0 00075E10 4E 80 00 20 */ blr diff --git a/include/d/d_bg/d_bg_s/polypass/asm/func_80078ED4.s b/include/d/d_bg/d_bg_s/polypass/asm/func_80078ED4.s deleted file mode 100644 index a77120fccaa..00000000000 --- a/include/d/d_bg/d_bg_s/polypass/asm/func_80078ED4.s +++ /dev/null @@ -1,3 +0,0 @@ -/* 80078ED4 00075E14 38 00 00 01 */ li r0, 1 -/* 80078ED8 00075E18 98 03 00 09 */ stb r0, 9(r3) -/* 80078EDC 00075E1C 4E 80 00 20 */ blr diff --git a/include/d/d_bg/d_bg_s/polypass/asm/func_80078EE0.s b/include/d/d_bg/d_bg_s/polypass/asm/func_80078EE0.s deleted file mode 100644 index c3d34718ed9..00000000000 --- a/include/d/d_bg/d_bg_s/polypass/asm/func_80078EE0.s +++ /dev/null @@ -1,3 +0,0 @@ -/* 80078EE0 00075E20 38 00 00 01 */ li r0, 1 -/* 80078EE4 00075E24 98 03 00 0A */ stb r0, 0xa(r3) -/* 80078EE8 00075E28 4E 80 00 20 */ blr diff --git a/include/d/d_bg/d_bg_s/polypass/asm/func_80078EEC.s b/include/d/d_bg/d_bg_s/polypass/asm/func_80078EEC.s deleted file mode 100644 index 228c4091a5d..00000000000 --- a/include/d/d_bg/d_bg_s/polypass/asm/func_80078EEC.s +++ /dev/null @@ -1,3 +0,0 @@ -/* 80078EEC 00075E2C 38 00 00 01 */ li r0, 1 -/* 80078EF0 00075E30 98 03 00 0B */ stb r0, 0xb(r3) -/* 80078EF4 00075E34 4E 80 00 20 */ blr diff --git a/include/d/d_bg/d_bg_s/polypass/asm/func_80078EF8.s b/include/d/d_bg/d_bg_s/polypass/asm/func_80078EF8.s deleted file mode 100644 index 8caeac7a7a5..00000000000 --- a/include/d/d_bg/d_bg_s/polypass/asm/func_80078EF8.s +++ /dev/null @@ -1,3 +0,0 @@ -/* 80078EF8 00075E38 38 00 00 01 */ li r0, 1 -/* 80078EFC 00075E3C 98 03 00 0C */ stb r0, 0xc(r3) -/* 80078F00 00075E40 4E 80 00 20 */ blr diff --git a/include/d/d_bg/d_bg_s/polypass/asm/func_80078F7C.s b/include/d/d_bg/d_bg_s/polypass/asm/func_80078F7C.s deleted file mode 100644 index 345d3954796..00000000000 --- a/include/d/d_bg/d_bg_s/polypass/asm/func_80078F7C.s +++ /dev/null @@ -1,3 +0,0 @@ -/* 80078F7C 00075EBC 38 00 00 01 */ li r0, 1 -/* 80078F80 00075EC0 98 03 00 0D */ stb r0, 0xd(r3) -/* 80078F84 00075EC4 4E 80 00 20 */ blr diff --git a/include/d/d_bg/d_bg_s/polypass/asm/func_80078F88.s b/include/d/d_bg/d_bg_s/polypass/asm/func_80078F88.s deleted file mode 100644 index 93f965d9528..00000000000 --- a/include/d/d_bg/d_bg_s/polypass/asm/func_80078F88.s +++ /dev/null @@ -1,3 +0,0 @@ -/* 80078F88 00075EC8 38 00 00 00 */ li r0, 0 -/* 80078F8C 00075ECC 98 03 00 0D */ stb r0, 0xd(r3) -/* 80078F90 00075ED0 4E 80 00 20 */ blr diff --git a/include/d/d_bg/d_bg_s/polypass/asm/func_80078F94.s b/include/d/d_bg/d_bg_s/polypass/asm/func_80078F94.s deleted file mode 100644 index 3494326297c..00000000000 --- a/include/d/d_bg/d_bg_s/polypass/asm/func_80078F94.s +++ /dev/null @@ -1,3 +0,0 @@ -/* 80078F94 00075ED4 38 00 00 01 */ li r0, 1 -/* 80078F98 00075ED8 98 03 00 0E */ stb r0, 0xe(r3) -/* 80078F9C 00075EDC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_bg/d_bg_s/polypass/asm/func_80078FA0.s b/include/d/d_bg/d_bg_s/polypass/asm/func_80078FA0.s deleted file mode 100644 index 7322295e25e..00000000000 --- a/include/d/d_bg/d_bg_s/polypass/asm/func_80078FA0.s +++ /dev/null @@ -1,3 +0,0 @@ -/* 80078FA0 00075EE0 38 00 00 00 */ li r0, 0 -/* 80078FA4 00075EE4 98 03 00 0E */ stb r0, 0xe(r3) -/* 80078FA8 00075EE8 4E 80 00 20 */ blr \ No newline at end of file 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 990a5d612af..d84ce81d185 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 @@ -17,102 +17,70 @@ asm dBgS_PolyPassChk::~dBgS_PolyPassChk() { #include "d/d_bg/d_bg_s/polypass/asm/func_80078DB0.s" } -// SetPassChkInfo__16dBgS_PolyPassChkFR16dBgS_PolyPassChk -// dBgS_PolyPassChk::SetPassChkInfo(dBgS_PolyPassChk&) -asm void dBgS_PolyPassChk::SetPassChkInfo(dBgS_PolyPassChk&) { - nofralloc - #include "d/d_bg/d_bg_s/polypass/asm/func_80078E0C.s" +void dBgS_PolyPassChk::SetPassChkInfo(dBgS_PolyPassChk& chk) { + mObject = chk.mObject; + mCamera = chk.mCamera; + mLink = chk.mLink; + mArrow = chk.mArrow; + mBomb = chk.mBomb; + mBoomerang = chk.mBoomerang; + mRope = chk.mRope; + mUnderwaterRoof = chk.mUnderwaterRoof; + mHorse = chk.mHorse; + mStatue = chk.mStatue; + mIronBall = chk.mIronBall; } -// SetObj__16dBgS_PolyPassChkFv -// dBgS_PolyPassChk::SetObj(void) -asm void dBgS_PolyPassChk::SetObj() { - nofralloc - #include "d/d_bg/d_bg_s/polypass/asm/func_80078E68.s" +void dBgS_PolyPassChk::SetObj() { + mObject = true; } -// ClrObj__16dBgS_PolyPassChkFv -// dBgS_PolyPassChk::ClrObj(void) -asm void dBgS_PolyPassChk::ClrObj() { - nofralloc - #include "d/d_bg/d_bg_s/polypass/asm/func_80078E74.s" +void dBgS_PolyPassChk::ClrObj() { + mObject = false; } -// SetCam__16dBgS_PolyPassChkFv -// dBgS_PolyPassChk::SetCam(void) -asm void dBgS_PolyPassChk::SetCam() { - nofralloc - #include "d/d_bg/d_bg_s/polypass/asm/func_80078E80.s" +void dBgS_PolyPassChk::SetCam() { + mCamera = true; } -// ClrCam__16dBgS_PolyPassChkFv -// dBgS_PolyPassChk::ClrCam(void) -asm void dBgS_PolyPassChk::ClrCam() { - nofralloc - #include "d/d_bg/d_bg_s/polypass/asm/func_80078E8C.s" +void dBgS_PolyPassChk::ClrCam() { + mCamera = false; } -// SetLink__16dBgS_PolyPassChkFv -// dBgS_PolyPassChk::SetLink(void) -asm void dBgS_PolyPassChk::SetLink() { - nofralloc - #include "d/d_bg/d_bg_s/polypass/asm/func_80078E98.s" +void dBgS_PolyPassChk::SetLink() { + mLink = true; } -// ClrLink__16dBgS_PolyPassChkFv -// dBgS_PolyPassChk::ClrLink(void) -asm void dBgS_PolyPassChk::ClrLink() { - nofralloc - #include "d/d_bg/d_bg_s/polypass/asm/func_80078EA4.s" +void dBgS_PolyPassChk::ClrLink() { + mLink = false; } -// SetArrow__16dBgS_PolyPassChkFv -// dBgS_PolyPassChk::SetArrow(void) -asm void dBgS_PolyPassChk::SetArrow() { - nofralloc - #include "d/d_bg/d_bg_s/polypass/asm/func_80078EB0.s" +void dBgS_PolyPassChk::SetArrow() { + mArrow = true; } -// SetBomb__16dBgS_PolyPassChkFv -// dBgS_PolyPassChk::SetBomb(void) -asm void dBgS_PolyPassChk::SetBomb() { - nofralloc - #include "d/d_bg/d_bg_s/polypass/asm/func_80078EBC.s" +void dBgS_PolyPassChk::SetBomb() { + mBomb = true; } -// ClrBomb__16dBgS_PolyPassChkFv -// dBgS_PolyPassChk::ClrBomb(void) -asm void dBgS_PolyPassChk::ClrBomb() { - nofralloc - #include "d/d_bg/d_bg_s/polypass/asm/func_80078EC8.s" +void dBgS_PolyPassChk::ClrBomb() { + mBomb = false; } -// SetBoomerang__16dBgS_PolyPassChkFv -// dBgS_PolyPassChk::SetBoomerang(void) -asm void dBgS_PolyPassChk::SetBoomerang() { - nofralloc - #include "d/d_bg/d_bg_s/polypass/asm/func_80078ED4.s" +void dBgS_PolyPassChk::SetBoomerang() { + mBoomerang = true; } -// SetRope__16dBgS_PolyPassChkFv -// dBgS_PolyPassChk::SetRope(void) -asm void dBgS_PolyPassChk::SetRope() { - nofralloc - #include "d/d_bg/d_bg_s/polypass/asm/func_80078EE0.s" +void dBgS_PolyPassChk::SetRope() { + mRope = true; } -// SetUnderwaterRoof__16dBgS_PolyPassChkFv -// dBgS_PolyPassChk::SetUnderwaterRoof(void) -asm void dBgS_PolyPassChk::SetUnderwaterRoof() { - nofralloc - #include "d/d_bg/d_bg_s/polypass/asm/func_80078EEC.s" +void dBgS_PolyPassChk::SetUnderwaterRoof() { + mUnderwaterRoof = true; } -// SetHorse__16dBgS_PolyPassChkFv -// dBgS_PolyPassChk::SetHorse(void) -asm void dBgS_PolyPassChk::SetHorse() { - nofralloc - #include "d/d_bg/d_bg_s/polypass/asm/func_80078EF8.s" +void dBgS_PolyPassChk::SetHorse() { + mHorse = true; } // ChkNoHorse__16dBgS_PolyPassChkFv @@ -122,32 +90,20 @@ asm bool dBgS_PolyPassChk::ChkNoHorse() { #include "d/d_bg/d_bg_s/polypass/asm/func_80078F04.s" } -// SetStatue__16dBgS_PolyPassChkFv -// dBgS_PolyPassChk::SetStatue(void) -asm void dBgS_PolyPassChk::SetStatue() { - nofralloc - #include "d/d_bg/d_bg_s/polypass/asm/func_80078F7C.s" +void dBgS_PolyPassChk::SetStatue() { + mStatue = true; } -// ClrStatue__16dBgS_PolyPassChkFv -// dBgS_PolyPassChk::ClrStatue(void) -asm void dBgS_PolyPassChk::ClrStatue() { - nofralloc - #include "d/d_bg/d_bg_s/polypass/asm/func_80078F88.s" +void dBgS_PolyPassChk::ClrStatue() { + mStatue = false; } -// SetIronBall__16dBgS_PolyPassChkFv -// dBgS_PolyPassChk::SetIronBall(void) -asm void dBgS_PolyPassChk::SetIronBall() { - nofralloc - #include "d/d_bg/d_bg_s/polypass/asm/func_80078F94.s" +void dBgS_PolyPassChk::SetIronBall() { + mIronBall = true; } -// ClrIronBall__16dBgS_PolyPassChkFv -// dBgS_PolyPassChk::ClrIronBall(void) -asm void dBgS_PolyPassChk::ClrIronBall() { - nofralloc - #include "d/d_bg/d_bg_s/polypass/asm/func_80078FA0.s" +void dBgS_PolyPassChk::ClrIronBall() { + mIronBall = false; } extern "C" {