Minor cleanup for d_resorce inlines and d_a_npc_people

include/d/d_resorce.h

@@ -67,53 +67,53 @@ public:
     int getObjectResName2Index(char const*, char const*);
 
     int setObjectRes(const char* name, u8 direction, JKRHeap* heap) {
-        return setRes(name, &mObjectInfo[0], ARRAY_SIZE(mObjectInfo), "/res/Object/", direction, heap);
+        return setRes(name, mObjectInfo, ARRAY_SIZE(mObjectInfo), "/res/Object/", direction, heap);
     }
 
     void* getObjectRes(const char* arcName, const char* resName) {
-        return getRes(arcName, resName, &mObjectInfo[0], ARRAY_SIZE(mObjectInfo));
+        return getRes(arcName, resName, mObjectInfo, ARRAY_SIZE(mObjectInfo));
     }
 
     void* getObjectRes(const char* arcName, s32 index) {
-        return getRes(arcName, index, &mObjectInfo[0], ARRAY_SIZE(mObjectInfo));
+        return getRes(arcName, index, mObjectInfo, ARRAY_SIZE(mObjectInfo));
     }
 
     void* getObjectIDRes(const char* arcName, u16 id) {
-        return getIDRes(arcName, id, &mObjectInfo[0], ARRAY_SIZE(mObjectInfo));
+        return getIDRes(arcName, id, mObjectInfo, ARRAY_SIZE(mObjectInfo));
     }
 
     int syncObjectRes(const char* name) {
-        return syncRes(name, &mObjectInfo[0], ARRAY_SIZE(mObjectInfo));
+        return syncRes(name, mObjectInfo, ARRAY_SIZE(mObjectInfo));
     }
 
     int syncStageRes(const char* name) {
-        return syncRes(name, &mStageInfo[0], ARRAY_SIZE(mStageInfo));
+        return syncRes(name, mStageInfo, ARRAY_SIZE(mStageInfo));
     }
 
-    int syncAllObjectRes() { return syncAllRes(&mObjectInfo[0], ARRAY_SIZE(mObjectInfo)); }
+    int syncAllObjectRes() { return syncAllRes(mObjectInfo, ARRAY_SIZE(mObjectInfo)); }
 
     int deleteObjectRes(const char* name) {
-        return deleteRes(name, &mObjectInfo[0], ARRAY_SIZE(mObjectInfo));
+        return deleteRes(name, mObjectInfo, ARRAY_SIZE(mObjectInfo));
     }
 
     int deleteStageRes(const char* name) {
-        return deleteRes(name, &mStageInfo[0], ARRAY_SIZE(mStageInfo));
+        return deleteRes(name, mStageInfo, ARRAY_SIZE(mStageInfo));
     }
 
     void* getStageRes(const char* arcName, const char* resName) {
-        return getRes(arcName, resName, &mStageInfo[0], ARRAY_SIZE(mStageInfo));
+        return getRes(arcName, resName, mStageInfo, ARRAY_SIZE(mStageInfo));
     }
 
     void* getStageRes(const char* arcName, s32 index) {
-        return getRes(arcName, index, &mStageInfo[0], ARRAY_SIZE(mStageInfo));
+        return getRes(arcName, index, mStageInfo, ARRAY_SIZE(mStageInfo));
     }
 
     dRes_info_c* getObjectResInfo(const char* arcName) {
-        return getResInfo(arcName, &mObjectInfo[0], ARRAY_SIZE(mObjectInfo));
+        return getResInfo(arcName, mObjectInfo, ARRAY_SIZE(mObjectInfo));
     }
 
     dRes_info_c* getStageResInfo(const char* arcName) {
-        return getResInfo(arcName, &mStageInfo[0], ARRAY_SIZE(mStageInfo));
+        return getResInfo(arcName, mStageInfo, ARRAY_SIZE(mStageInfo));
     }
 
     /* 0x0000 */ dRes_info_c mObjectInfo[64];

src/d/actor/d_a_npc_people.cpp

@@ -3871,9 +3871,9 @@ struct PsoData {
     /* 0x0C */ f32 field_0x0C;
     /* 0x10 */ f32 field_0x10;
     /* 0x14 */ s16 field_0x14;
-    /* 0x16 */ u8 field_0x16;
-    /* 0x17 */ u8 field_0x17;
-    /* 0x18 */ u8 photoNo;
+    /* 0x16 */ s8 field_0x16;
+    /* 0x17 */ s8 field_0x17;
+    /* 0x18 */ s8 photoNo;
 }; // Size: 0x19
 
 static PsoData l_pso_uo2 = {
@@ -4651,8 +4651,8 @@ bool daNpcPeople_c::_draw() {
     else {
         headModel = mpHeadMorf->getModel();
     }
-
     J3DModelData* headModelData = headModel->getModelData();
+
     g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
     g_env_light.setLightTevColorType(mpMorf->getModel(), &tevStr);
     g_env_light.setLightTevColorType(headModel, &tevStr);
@@ -4907,7 +4907,7 @@ bool daNpcPeople_c::_execute() {
     setCollision(&mCyl, current.pos, m74C, mpNpcDat->field_0x40);
     cXyz temp(mpNpcDat->field_0x18, mpNpcDat->field_0x1C, mpNpcDat->field_0x20);
     mDoMtx_stack_c::YrotS(current.angle.y);
-    mDoMtx_stack_c::multVec(&temp, &temp);
+    cMtx_multVec(mDoMtx_stack_c::get(), &temp, &temp);
     temp += current.pos;
     attention_info.position = temp;
     eyePos.set(current.pos.x, current.pos.y + mpNpcDat->field_0x24, current.pos.z);
@@ -7625,7 +7625,7 @@ u8 daNpcPeople_c::getPrmArg0() {
 /* 00007BA0-00007C28       .text setMtx__13daNpcPeople_cFv */
 void daNpcPeople_c::setMtx() {
     mpMorf->getModel()->setBaseScale(scale);
-    mDoMtx_stack_c::transS(current.pos);
+    mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(current.angle.y);
     mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get());
 }

src/d/actor/d_a_npc_photo.cpp

@@ -538,8 +538,8 @@ struct PsoData {
     /* 0x0C */ f32 field_0x0C;
     /* 0x10 */ f32 field_0x10;
     /* 0x14 */ s16 field_0x14;
-    /* 0x16 */ u8 field_0x16;
-    /* 0x17 */ u8 field_0x17;
+    /* 0x16 */ s8 field_0x16;
+    /* 0x17 */ s8 field_0x17;
 };  // Size: 0x18
 
 static PsoData l_pso_photo = {