d_a_npc_people Almost OK (#658)

* daNpcPeople Work

* Oops

Somehow I break this file every time I touch it

src/d/d_com_inf_game.cpp

@@ -95,7 +95,7 @@ void dComIfG_play_c::itemInit() {
     mMessageRupee = 0;
     mAuctionRupee = 0;
     mAuctionGauge = 0;
-    field_0x4922 = 0;
+    mItemTimer = 0;
     mCurrHP = 0;
     mRupyCountDisplay = 0;
     field_0x4928 = 0;
@@ -131,7 +131,7 @@ void dComIfG_play_c::itemInit() {
     }
 
     field_0x4944 = 7;
-    field_0x4945 = 0;
+    mScopeType = 0;
     field_0x4946 = 0;
     field_0x4947 = 0;
     mMesgSendButton = 0;
@@ -146,18 +146,18 @@ void dComIfG_play_c::itemInit() {
     field_0x4952 = 0;
     field_0x4953 = 0;
     field_0x4954 = 0;
-    field_0x4955 = 0;
+    mStartItemTimer = false;
     mFwaterTimer = 0;
     mPlacenameIndex = 0;
     mPlacenameState = 0;
     mGameoverStatus = 0;
     field_0x495a = 0;
     mPictureFlag = 0;
-    field_0x495c = 0;
-    field_0x495d = 0;
+    mPictureResult = 0;
+    mPictureResultDetail = 0;
     mPictureStatus = 0;
     field_0x495f = 0;
-    field_0x4960 = 0;
+    mPictureFormat = 0;
     field_0x4961 = 0;
     mHeapLockFlag = 0;
     field_0x4965 = 0;

src/d/d_com_static.cpp

@@ -211,13 +211,13 @@ const u16 daDai_c::m_savelabel[] = {
 };
 
 /* 800568A8-800568B0       .text getMaxDaiza__7daDai_cFv */
-s8 daDai_c::getMaxDaiza() {
-    return mNowDaizaNum;
+int daDai_c::getMaxDaiza() {
+    return (u8)mNowDaizaNum; // cast is weird, but it's the only way I've found to match its uses in d_a_npc_people
 }
 
 /* 800568B0-800568B8       .text getDaizaSetItemNum__7daDai_cFv */
-s8 daDai_c::getDaizaSetItemNum() {
-    return mNowItemNum;
+int daDai_c::getDaizaSetItemNum() {
+    return (u8)mNowItemNum; // cast is weird, but it's the only way I've found to match its uses in d_a_npc_people
 }
 
 bool daNpc_Os_c::m_playerRoom[3] = { false, false, false };

src/d/d_kankyo.cpp

@@ -3450,9 +3450,9 @@ s32 dKy_moon_type_chk() {
 }
 
 /* 80197404-80197504       .text dKy_telescope_lookin_chk__FP4cXyzff */
-bool dKy_telescope_lookin_chk(cXyz* pPos, f32 maxDist, f32 minFov) {
-    bool ret = false;
-    if (dComIfGp_getScopeType() != 0 && dComIfGd_getView()->mFovy > minFov) {
+BOOL dKy_telescope_lookin_chk(cXyz* pPos, f32 maxDist, f32 minFov) {
+    BOOL ret = false;
+    if (dComIfGp_getScopeMesgStatus() != 0 && dComIfGd_getView()->mFovy > minFov) {
         cXyz proj;
         cXyz center;
         mDoLib_project((Vec*)pPos, &proj);
@@ -3464,8 +3464,8 @@ bool dKy_telescope_lookin_chk(cXyz* pPos, f32 maxDist, f32 minFov) {
 }
 
 /* 80197504-80197558       .text dKy_moon_look_chk__Fv */
-bool dKy_moon_look_chk() {
-    bool rt = false;
+BOOL dKy_moon_look_chk() {
+    BOOL rt = false;
     if (dKyr_moon_arrival_check()) {
         rt = dKy_telescope_lookin_chk(&g_env_light.mMoonPos, 100.0f, 20.0f);
     }
@@ -3474,13 +3474,13 @@ bool dKy_moon_look_chk() {
 }
 
 /* 80197558-801975A4       .text dKy_orion_look_chk__Fv */
-bool dKy_orion_look_chk() {
+BOOL dKy_orion_look_chk() {
     cXyz pos = dKy_get_orion_pos();
     return dKy_telescope_lookin_chk(&pos, 100.0f, 20.0f);
 }
 
 /* 801975A4-801975F0       .text dKy_hokuto_look_chk__Fv */
-bool dKy_hokuto_look_chk() {
+BOOL dKy_hokuto_look_chk() {
     cXyz pos = dKy_get_hokuto_pos();
     return dKy_telescope_lookin_chk(&pos, 100.0f, 20.0f);
 }

src/f_op/f_op_msg_mng.cpp

@@ -312,7 +312,7 @@ void fopMsgM_getScopeMode() {
 
 /* 8002C624-8002C650       .text fopMsgM_forceSendOn__Fv */
 bool fopMsgM_forceSendOn() {
-    if (dComIfGp_getScopeType() == 10) {
+    if (dComIfGp_getScopeMesgStatus() == 10) {
         pushButton = true;
         return true;
     }
@@ -347,8 +347,8 @@ bool fopMsgM_checkMessageSend() {
 
 /* 8002C684-8002C6B0       .text fopMsgM_releaseScopeMode__Fv */
 bool fopMsgM_releaseScopeMode() {
-    if (dComIfGp_getScopeType() == 13) {
-        dComIfGp_setScopeType(11);
+    if (dComIfGp_getScopeMesgStatus() == 13) {
+        dComIfGp_setScopeMesgStatus(11);
         return true;
     }