Kytag00 / Vrbox2 work, some cphase / kankyo doc (#1886)

* kytag00 work

* d_a_vrbox2 close to done

* rename cPhase enum values

* some enums from noclip / kankyo doc

* remove asm

* use macro

* uncomment ok-check.yml

1 files changed, 10 insertions, 10 deletions

diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp
index 34e31291e3..a3071c2e2d 100644
--- a/src/d/com/d_com_inf_game.cpp
+++ b/src/d/com/d_com_inf_game.cpp
@@ -1026,7 +1026,7 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room
 
             // Stage is Fishing Pond or Hena's Hut
             else if (!strcmp(i_stageName, "F_SP127") || !strcmp(i_stageName, "R_SP127")) {
-                switch (g_env_light.field_0x12fe) {
+                switch (g_env_light.mPondSeason) {
                 case 1:
                     o_layer = 0;
                     break;
@@ -1270,7 +1270,7 @@ static int phase_1(char* i_arcName) {
         return cPhs_ERROR_e;
     }
 
-    return cPhs_TWO_e;
+    return cPhs_NEXT_e;
 }
 
 /* 8002CE38-8002CEB4 027778 007C+00 1/0 0/0 0/0 .text            phase_2__FPc */
@@ -1296,7 +1296,7 @@ int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* i_arcNa
     static int (*l_method[3])(void*) = {(int (*)(void*))phase_1, (int (*)(void*))phase_2,
                                         (int (*)(void*))phase_3};
 
-    if (i_phase->id == cPhs_TWO_e) {
+    if (i_phase->id == cPhs_NEXT_e) {
         return cPhs_COMPLEATE_e;
     }
 
@@ -1333,7 +1333,7 @@ int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* i_resNa
     static int (*l_method[3])(void*) = {(int (*)(void*))phase_01, (int (*)(void*))phase_02,
                                         (int (*)(void*))phase_03};
 
-    if (i_phase->id == cPhs_TWO_e) {
+    if (i_phase->id == cPhs_NEXT_e) {
         return cPhs_COMPLEATE_e;
     }
 
@@ -1344,12 +1344,12 @@ int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* i_resNa
 /* 8002D008-8002D06C 027948 0064+00 1/1 10/10 540/540 .text
  * dComIfG_resDelete__FP30request_of_phase_process_classPCc     */
 int dComIfG_resDelete(request_of_phase_process_class* i_phase, char const* i_resName) {
-    if (i_phase->id != cPhs_TWO_e) {
+    if (i_phase->id != cPhs_NEXT_e) {
         return 0;
     }
 
     dComIfG_deleteObjectResMain(i_resName);
-    i_phase->id = cPhs_ZERO_e;
+    i_phase->id = cPhs_INIT_e;
     return 1;
 }
 
@@ -2184,7 +2184,7 @@ void dComIfGs_setWarpMarkFlag(u8) {}
 /* 8002F314-8002F328 029C54 0014+00 0/0 0/0 1/1 .text            __ct__19dComIfG_resLoader_cFv */
 dComIfG_resLoader_c::dComIfG_resLoader_c() {
     field_0x0 = NULL;
-    field_0x4.id = cPhs_ZERO_e;
+    field_0x4.id = cPhs_INIT_e;
     field_0xc = 0;
 }
 
@@ -2193,7 +2193,7 @@ dComIfG_resLoader_c::~dComIfG_resLoader_c() {
     if (field_0x0 != NULL) {
         for (int i = field_0xc; i >= 0; i--) {
             dComIfG_resDelete(&field_0x4, field_0x0[i]);
-            field_0x4.id = cPhs_TWO_e;
+            field_0x4.id = cPhs_NEXT_e;
         }
     }
 }
@@ -2206,8 +2206,8 @@ int dComIfG_resLoader_c::load(char const** i_resNameTbl, JKRHeap* i_heap) {
     if (phase_state == cPhs_COMPLEATE_e) {
         if (field_0x0[field_0xc + 1][0] != 0) {
             field_0xc++;
-            field_0x4.id = cPhs_ZERO_e;
-            phase_state = cPhs_ZERO_e;
+            field_0x4.id = cPhs_INIT_e;
+            phase_state = cPhs_INIT_e;
         }
     }