kankyo mostly done (#2269)

* work on kankyo

* some more kankyo work

* kankyo almost done

* kankyo mostly done

* first cleanup pass

* some more renaming

* rename a bunch of kankyo vars

* fix regression

1 files changed, 4 insertions, 4 deletions

diff --git a/src/d/actor/d_a_npc_fish.cpp b/src/d/actor/d_a_npc_fish.cpp
index ac8bdf0a00..b36a5a3dbd 100644
--- a/src/d/actor/d_a_npc_fish.cpp
+++ b/src/d/actor/d_a_npc_fish.cpp
@@ -35,7 +35,7 @@ static void fish_set(fopAc_ac_c* i_this, fish_data_s* data) {
         }
         u32 param = data->param;
         pos = data->pos;
-        if ((param == 1u) && envLight->mPondSeason != 2) {
+        if ((param == 1u) && envLight->fishing_hole_season != 2) {
             param = 2;
         }
         param |= data->field_0x10 << 8;
@@ -138,9 +138,9 @@ static int daNpc_Fish_Create(fopAc_ac_c* i_this) {
     } else {
         dScnKy_env_light_c* envLight = dKy_getEnvlight();
         s32 param = 0;
-        if (envLight->mPondSeason == 2) {
+        if (envLight->fishing_hole_season == 2) {
             param = 160;
-        } else if (envLight->mPondSeason == 3) {
+        } else if (envLight->fishing_hole_season == 3) {
             param = 64;
         }
         if (param != 0) {
@@ -149,7 +149,7 @@ static int daNpc_Fish_Create(fopAc_ac_c* i_this) {
                           NULL, -1);
         }
     }
-    if (g_env_light.mPondSeason == 2) {
+    if (g_env_light.fishing_hole_season == 2) {
         for (int i = 0; i < 4; i++) {
             pos.set(cM_rndFX(700.0f) + -2936.0f, 0.0f, cM_rndFX(700.0f) + -7865.0f);
             csXyz angle(0, 0, -1);