Match 5 d_bg_w_kcol funcs (#2856)

* dBgWKCol::CaptPoly equivalent

* dBgWKCol::CaptPoly OK

* Switch s32->int for the rest of the dBgW functions just in case

This doesn't immediately help any other functions besides CaptPoly, but I suspect it could help prevent issues in the future since it's more likely to be what the original devs did.

* Debug var fix

* Match 3 more kcol funcs

* Remove unused lits

* Update nonmatching comments

* Fix ChkShdwDrawThrough

3 files changed, 32 insertions, 32 deletions

diff --git a/include/d/d_bg_w.h b/include/d/d_bg_w.h
index 0de571eacc..0c2dc40170 100644
--- a/include/d/d_bg_w.h
+++ b/include/d/d_bg_w.h
@@ -175,9 +175,9 @@ public:
     virtual bool RoofChk(dBgS_RoofChk*) = 0;
     virtual bool SplGrpChk(dBgS_SplGrpChk*) = 0;
     virtual bool SphChk(dBgS_SphChk*, void*) = 0;
-    /* 8007B0E4 */ virtual s32 GetGrpRoomIndex(cBgS_PolyInfo const&) const;
-    virtual s32 GetExitId(cBgS_PolyInfo const&) = 0;
-    virtual s32 GetPolyColor(cBgS_PolyInfo const&) = 0;
+    /* 8007B0E4 */ virtual int GetGrpRoomIndex(cBgS_PolyInfo const&) const;
+    virtual int GetExitId(cBgS_PolyInfo const&) = 0;
+    virtual int GetPolyColor(cBgS_PolyInfo const&) = 0;
     virtual BOOL GetHorseNoEntry(cBgS_PolyInfo const&) = 0;
     virtual int GetSpecialCode(cBgS_PolyInfo const&) = 0;
     virtual int GetSpecialCode(int) = 0;
@@ -194,16 +194,16 @@ public:
     virtual u32 GetUnderwaterRoofCode(int) = 0;
     virtual int GetMonkeyBarsCode(cBgS_PolyInfo const&) = 0;
     virtual int GetLinkNo(cBgS_PolyInfo const&) = 0;
-    virtual s32 GetWallCode(cBgS_PolyInfo const&) = 0;
+    virtual int GetWallCode(cBgS_PolyInfo const&) = 0;
     virtual int GetPolyAtt0(cBgS_PolyInfo const&) = 0;
     virtual int GetPolyAtt1(cBgS_PolyInfo const&) = 0;
     virtual int GetGroundCode(cBgS_PolyInfo const&) = 0;
     virtual u32 GetIronBallThrough(int) = 0;
     virtual u32 GetAttackThrough(int) = 0;
-    virtual s32 GetCamMoveBG(cBgS_PolyInfo const&) = 0;
-    virtual s32 GetRoomCamId(cBgS_PolyInfo const&) = 0;
-    virtual s32 GetRoomPathId(cBgS_PolyInfo const&) = 0;
-    virtual s32 GetRoomPathPntNo(cBgS_PolyInfo const&) = 0;
+    virtual int GetCamMoveBG(cBgS_PolyInfo const&) = 0;
+    virtual int GetRoomCamId(cBgS_PolyInfo const&) = 0;
+    virtual int GetRoomPathId(cBgS_PolyInfo const&) = 0;
+    virtual int GetRoomPathPntNo(cBgS_PolyInfo const&) = 0;
     virtual u8 GetPolyGrpRoomInfId(cBgS_PolyInfo const&) = 0;
     virtual int GetGrpSoundId(cBgS_PolyInfo const&) = 0;
     virtual void CrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*) = 0;
@@ -287,8 +287,8 @@ public:
     /* 8007D470 */ virtual bool RoofChk(dBgS_RoofChk*);
     /* 8007D830 */ virtual bool SplGrpChk(dBgS_SplGrpChk*);
     /* 8007DF00 */ virtual bool SphChk(dBgS_SphChk*, void*);
-    /* 8007B3AC */ virtual s32 GetExitId(cBgS_PolyInfo const&);
-    /* 8007B3D8 */ virtual s32 GetPolyColor(cBgS_PolyInfo const&);
+    /* 8007B3AC */ virtual int GetExitId(cBgS_PolyInfo const&);
+    /* 8007B3D8 */ virtual int GetPolyColor(cBgS_PolyInfo const&);
     /* 8007B404 */ virtual BOOL GetHorseNoEntry(cBgS_PolyInfo const&);
     /* 8007B430 */ virtual int GetSpecialCode(cBgS_PolyInfo const&);
     /* 8007B460 */ virtual int GetSpecialCode(int);
@@ -305,16 +305,16 @@ public:
     /* 8007B630 */ virtual u32 GetUnderwaterRoofCode(int);
     /* 8007B4B4 */ virtual int GetMonkeyBarsCode(cBgS_PolyInfo const&);
     /* 8007B6AC */ virtual int GetLinkNo(cBgS_PolyInfo const&);
-    /* 8007B6D8 */ virtual s32 GetWallCode(cBgS_PolyInfo const&);
+    /* 8007B6D8 */ virtual int GetWallCode(cBgS_PolyInfo const&);
     /* 8007B704 */ virtual int GetPolyAtt0(cBgS_PolyInfo const&);
     /* 8007B734 */ virtual int GetPolyAtt1(cBgS_PolyInfo const&);
     /* 8007B760 */ virtual int GetGroundCode(cBgS_PolyInfo const&);
     /* 8007B7DC */ virtual u32 GetIronBallThrough(int);
     /* 8007B800 */ virtual u32 GetAttackThrough(int);
-    /* 8007B87C */ virtual s32 GetCamMoveBG(cBgS_PolyInfo const&);
-    /* 8007B8A8 */ virtual s32 GetRoomCamId(cBgS_PolyInfo const&);
-    /* 8007B8D8 */ virtual s32 GetRoomPathId(cBgS_PolyInfo const&);
-    /* 8007B904 */ virtual s32 GetRoomPathPntNo(cBgS_PolyInfo const&);
+    /* 8007B87C */ virtual int GetCamMoveBG(cBgS_PolyInfo const&);
+    /* 8007B8A8 */ virtual int GetRoomCamId(cBgS_PolyInfo const&);
+    /* 8007B8D8 */ virtual int GetRoomPathId(cBgS_PolyInfo const&);
+    /* 8007B904 */ virtual int GetRoomPathPntNo(cBgS_PolyInfo const&);
     /* 8007DF28 */ virtual u8 GetPolyGrpRoomInfId(cBgS_PolyInfo const&);
     /* 8007DF58 */ virtual int GetGrpSoundId(cBgS_PolyInfo const&);
     /* 8007DF88 */ virtual void CrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*,
diff --git a/include/d/d_bg_w_base.h b/include/d/d_bg_w_base.h
index bcd0246279..d13f9df49f 100644
--- a/include/d/d_bg_w_base.h
+++ b/include/d/d_bg_w_base.h
@@ -67,9 +67,9 @@ public:
     virtual bool RoofChk(dBgS_RoofChk*) = 0;
     virtual bool SplGrpChk(dBgS_SplGrpChk*) = 0;
     virtual bool SphChk(dBgS_SphChk*, void*) = 0;
-    virtual s32 GetGrpRoomIndex(cBgS_PolyInfo const&) const = 0;
-    virtual s32 GetExitId(cBgS_PolyInfo const&) = 0;
-    virtual s32 GetPolyColor(cBgS_PolyInfo const&) = 0;
+    virtual int GetGrpRoomIndex(cBgS_PolyInfo const&) const = 0;
+    virtual int GetExitId(cBgS_PolyInfo const&) = 0;
+    virtual int GetPolyColor(cBgS_PolyInfo const&) = 0;
     virtual BOOL GetHorseNoEntry(cBgS_PolyInfo const&) = 0;
     virtual int GetSpecialCode(cBgS_PolyInfo const&) = 0;
     virtual int GetSpecialCode(int) = 0;
@@ -86,16 +86,16 @@ public:
     virtual u32 GetUnderwaterRoofCode(int) = 0;
     virtual int GetMonkeyBarsCode(cBgS_PolyInfo const&) = 0;
     virtual int GetLinkNo(cBgS_PolyInfo const&) = 0;
-    virtual s32 GetWallCode(cBgS_PolyInfo const&) = 0;
+    virtual int GetWallCode(cBgS_PolyInfo const&) = 0;
     virtual int GetPolyAtt0(cBgS_PolyInfo const&) = 0;
     virtual int GetPolyAtt1(cBgS_PolyInfo const&) = 0;
     virtual int GetGroundCode(cBgS_PolyInfo const&) = 0;
     virtual u32 GetIronBallThrough(int) = 0;
     virtual u32 GetAttackThrough(int) = 0;
-    virtual s32 GetCamMoveBG(cBgS_PolyInfo const&) = 0;
-    virtual s32 GetRoomCamId(cBgS_PolyInfo const&) = 0;
-    virtual s32 GetRoomPathId(cBgS_PolyInfo const&) = 0;
-    virtual s32 GetRoomPathPntNo(cBgS_PolyInfo const&) = 0;
+    virtual int GetCamMoveBG(cBgS_PolyInfo const&) = 0;
+    virtual int GetRoomCamId(cBgS_PolyInfo const&) = 0;
+    virtual int GetRoomPathId(cBgS_PolyInfo const&) = 0;
+    virtual int GetRoomPathPntNo(cBgS_PolyInfo const&) = 0;
     virtual u8 GetPolyGrpRoomInfId(cBgS_PolyInfo const&) = 0;
     virtual int GetGrpSoundId(cBgS_PolyInfo const&) = 0;
     virtual void CrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*) = 0;
diff --git a/include/d/d_bg_w_kcol.h b/include/d/d_bg_w_kcol.h
index 01173fca9a..be26509a29 100644
--- a/include/d/d_bg_w_kcol.h
+++ b/include/d/d_bg_w_kcol.h
@@ -47,7 +47,7 @@ public:
     /* 8007E9D4 */ bool GetTriPnt(KC_PrismData const*, Vec*, Vec*, Vec*) const;
     /* 8007EB70 */ void getPolyCode(int, dBgPc*) const;
     /* 8007EBC4 */ bool chkPolyThrough(dBgPc*, cBgS_PolyPassChk*, cBgS_GrpPassChk*, cXyz&) const;
-    /* 8007FF00 */ u8 ChkShdwDrawThrough(dBgPc*);
+    /* 8007FF00 */ bool ChkShdwDrawThrough(dBgPc*);
 
     /* 8007E74C */ virtual ~dBgWKCol();
     /* 8007E86C */ virtual bool ChkNotReady() const;
@@ -69,9 +69,9 @@ public:
     /* 80081E18 */ virtual bool RoofChk(dBgS_RoofChk*);
     /* 80082184 */ virtual bool SplGrpChk(dBgS_SplGrpChk*);
     /* 800824EC */ virtual bool SphChk(dBgS_SphChk*, void*);
-    /* 800829F0 */ virtual s32 GetGrpRoomIndex(cBgS_PolyInfo const&) const;
-    /* 80082A20 */ virtual s32 GetExitId(cBgS_PolyInfo const&);
-    /* 80082A50 */ virtual s32 GetPolyColor(cBgS_PolyInfo const&);
+    /* 800829F0 */ virtual int GetGrpRoomIndex(cBgS_PolyInfo const&) const;
+    /* 80082A20 */ virtual int GetExitId(cBgS_PolyInfo const&);
+    /* 80082A50 */ virtual int GetPolyColor(cBgS_PolyInfo const&);
     /* 80082A80 */ virtual BOOL GetHorseNoEntry(cBgS_PolyInfo const&);
     /* 80082AB0 */ virtual int GetSpecialCode(cBgS_PolyInfo const&);
     /* 80082AE0 */ virtual int GetSpecialCode(int);
@@ -88,16 +88,16 @@ public:
     /* 80082CCC */ virtual u32 GetUnderwaterRoofCode(int);
     /* 80082B3C */ virtual int GetMonkeyBarsCode(cBgS_PolyInfo const&);
     /* 80082D24 */ virtual int GetLinkNo(cBgS_PolyInfo const&);
-    /* 80082D54 */ virtual s32 GetWallCode(cBgS_PolyInfo const&);
+    /* 80082D54 */ virtual int GetWallCode(cBgS_PolyInfo const&);
     /* 80082D84 */ virtual int GetPolyAtt0(cBgS_PolyInfo const&);
     /* 80082DB4 */ virtual int GetPolyAtt1(cBgS_PolyInfo const&);
     /* 80082DE4 */ virtual int GetGroundCode(cBgS_PolyInfo const&);
     /* 80082E14 */ virtual u32 GetIronBallThrough(int);
     /* 80082E40 */ virtual u32 GetAttackThrough(int);
-    /* 80082E6C */ virtual s32 GetCamMoveBG(cBgS_PolyInfo const&);
-    /* 80082E9C */ virtual s32 GetRoomCamId(cBgS_PolyInfo const&);
-    /* 80082ECC */ virtual s32 GetRoomPathId(cBgS_PolyInfo const&);
-    /* 80082EFC */ virtual s32 GetRoomPathPntNo(cBgS_PolyInfo const&);
+    /* 80082E6C */ virtual int GetCamMoveBG(cBgS_PolyInfo const&);
+    /* 80082E9C */ virtual int GetRoomCamId(cBgS_PolyInfo const&);
+    /* 80082ECC */ virtual int GetRoomPathId(cBgS_PolyInfo const&);
+    /* 80082EFC */ virtual int GetRoomPathPntNo(cBgS_PolyInfo const&);
     /* 80082F2C */ virtual u8 GetPolyGrpRoomInfId(cBgS_PolyInfo const&);
     /* 80082F5C */ virtual int GetGrpSoundId(cBgS_PolyInfo const&);
     /* 80082F8C */ virtual void CrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*,