d_com_inf_game debug (#3075)

* d_com_inf_game debug

* inline sorting

src/d/d_drawlist.cpp

@@ -870,7 +870,7 @@ void dDlst_2D_c::draw() {
 }
 
 void dDlst_blo_c::draw() {
-    mScreen.draw(anm.field_0x4, anm.field_0x8, dComIfGp_getCurrentGrafPort());
+    mScreen.draw(field_0x120, field_0x124, dComIfGp_getCurrentGrafPort());
 }
 
 // stand-in for a function that pulls in a bunch of inline functions but was presumably stripped
@@ -1105,12 +1105,12 @@ static BOOL realPolygonCheck(cXyz* param_0, f32 param_1, f32 param_2, cXyz* para
     ShdwDrawPoly_c shdwDrawPoly;
     cXyz local_8c;
     cXyz local_98;
-    f32 tmp1 = param_1 * param_1 * 0.002f;
-    f32 tmp2 = cLib_maxLimit(tmp1, 120.0f);
-    f32 var1 = param_1 + param_2 - tmp2;
-    local_8c.y = param_0->y - var1;
+    f32 f31 = param_1 * param_1 * 0.002f;
+    f31 = cLib_maxLimit(f31, 120.0f);
+    f31 = param_1 + param_2 - f31;
+    local_8c.y = param_0->y - f31;
     local_98.y = param_0->y + param_1 * 0.15f;
-    local_98.x = param_0->x + param_3->x * var1;
+    local_98.x = param_0->x + param_3->x * f31;
     if (local_98.x < param_0->x) {
         local_8c.x = local_98.x;
         local_98.x = param_0->x;
@@ -1119,9 +1119,8 @@ static BOOL realPolygonCheck(cXyz* param_0, f32 param_1, f32 param_2, cXyz* para
     }
     local_8c.x -= param_1;
     local_98.x += param_1;
-    var1 = param_0->z + param_3->z * var1;
-    local_98.z = var1;
-    if (var1 < param_0->z) {
+    local_98.z = param_0->z + param_3->z * f31;
+    if (local_98.z < param_0->z) {
         local_8c.z = local_98.z;
         local_98.z = param_0->z;
     } else {

src/d/d_file_sel_info.cpp

@@ -88,8 +88,9 @@ void dFile_info_c::screenSet() {
 }
 
 int dFile_info_c::setSaveData(dSv_save_c* i_savedata, BOOL i_validChksum, u8 i_dataNo) {
+    int result;
     if (i_validChksum) {
-        char* player_name = i_savedata->getPlayer().getPlayerInfo().getLinkName();
+        char* player_name = i_savedata->getPlayer().getPlayerInfo().getPlayerName();
         if (*player_name == 0) {
             if (field_0x22 == 1 && i_dataNo == dComIfGs_getDataNum()) {
                 i_savedata->getPlayer().getPlayerStatusA().setLife(dComIfGs_getLife());
@@ -99,22 +100,23 @@ int dFile_info_c::setSaveData(dSv_save_c* i_savedata, BOOL i_validChksum, u8 i_d
                 strcpy(mSaveDate, "");
                 strcpy(mPlayTime, "");
                 dMeter2Info_getString(0x4D, mSaveStatus, NULL);  // New Quest Log
-                return 2;
+                result = 2;
             } else {
                 dMeter2Info_getString(0x4D, mSaveStatus, NULL);  // New Quest Log
-                return 1;
+                result = 1;
             }
         } else {
             setHeartCnt(i_savedata);
             strcpy(mPlayerName, player_name);
             setSaveDate(i_savedata);
             setPlayTime(i_savedata);
-            return 0;
+            result = 0;
         }
     } else {
         dMeter2Info_getString(0x51, mSaveStatus, NULL);  // This Quest Log is Corrupted
-        return -1;
+        result = -1;
     }
+    return result;
 }
 
 void dFile_info_c::setHeartCnt(dSv_save_c* i_savedata) {

src/d/d_item.cpp

@@ -1071,15 +1071,15 @@ void item_func_CHUCHU_BLACK() {
 void item_func_LIGHT_DROP() {}
 
 void item_func_DROP_CONTAINER() {
-    dComIfGs_onLightDropFlag(FARON_VESSEL);
+    dComIfGs_onLightDropGetFlag(FARON_VESSEL);
 }
 
 void item_func_DROP_CONTAINER02() {
-    dComIfGs_onLightDropFlag(ELDIN_VESSEL);
+    dComIfGs_onLightDropGetFlag(ELDIN_VESSEL);
 }
 
 void item_func_DROP_CONTAINER03() {
-    dComIfGs_onLightDropFlag(LANAYRU_VESSEL);
+    dComIfGs_onLightDropGetFlag(LANAYRU_VESSEL);
 }
 
 void item_func_FILLED_CONTAINER() {}

src/d/d_menu_item_explain.cpp

@@ -784,7 +784,7 @@ void dMenu_ItemExplain_c::setNumber() {
     }
 }
 
-bool dMenu_ItemExplain_c::getWarpMarkFlag() {
+u8 dMenu_ItemExplain_c::getWarpMarkFlag() {
     if (dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 1) {
         return dComIfGs_getWarpMarkFlag();
     }

src/d/d_s_room.cpp

@@ -406,10 +406,6 @@ static int phase_2(room_of_scene_class* i_this) {
     return cPhs_NEXT_e;
 }
 
-void dStage_roomControl_c::setZoneNo(int i_roomNo, int i_zoneNo) {
-    mStatus[i_roomNo].mZoneNo = i_zoneNo;
-}
-
 static int phase_3(room_of_scene_class* i_this) {
     if (objectSetCheck(i_this)) {
         return cPhs_NEXT_e;

src/d/d_save.cpp

@@ -1793,7 +1793,8 @@ int dSv_info_c::card_to_memory(char* i_cardPtr, int i_dataNum) {
     i_cardPtr = i_cardPtr + i_dataNum * QUEST_LOG_SIZE;
     char* var_r30 = i_cardPtr;
 
-    memcpy(dComIfGs_getSaveData(), i_cardPtr, sizeof(dSv_save_c));
+    dSv_save_c* pSave = dComIfGs_getSaveData();
+    memcpy(pSave, i_cardPtr, sizeof(dSv_save_c));
     i_cardPtr += sizeof(dSv_save_c);
 
 #if PLATFORM_GCN
@@ -1846,7 +1847,8 @@ int dSv_info_c::initdata_to_card(char* i_cardPtr, int i_dataNum) {
     save.init();
     save.getPlayer().getPlayerInfo().setPlayerName("");
     save.getPlayer().getPlayerInfo().setHorseName("");
-    memcpy(i_cardPtr, &save, sizeof(dSv_save_c));
+    dSv_save_c* pSave = &save;
+    memcpy(i_cardPtr, pSave, sizeof(dSv_save_c));
     i_cardPtr += sizeof(dSv_save_c);
 
     if (i_cardPtr - var_r30 > (QUEST_LOG_SIZE - 8)) {