big d_a_alink pass (#214)

* d_a_alink pass1 wip

* more d_a_alink work

* remove asm

* more daalink work

* 20% dol code decompiled

* fixed some nonmatchings for building

* a few daalink functions and labeling some HIO data

2 files changed, 11 insertions, 11 deletions

diff --git a/src/d/kankyo/d_kankyo_rain.cpp b/src/d/kankyo/d_kankyo_rain.cpp
index f40ca4158d..b803a409a9 100644
--- a/src/d/kankyo/d_kankyo_rain.cpp
+++ b/src/d/kankyo/d_kankyo_rain.cpp
@@ -745,10 +745,10 @@ asm void dKyr_rain_move() {
 static bool d_krain_cut_turn_check() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
 
-    return player != NULL && (player->getCutType() == daPy_py_c::TYPE_CUT_TURN_RIGHT ||
-                              player->getCutType() == daPy_py_c::TYPE_CUT_TURN_LEFT ||
-                              player->getCutType() == daPy_py_c::TYPE_CUT_LARGE_TURN_LEFT ||
-                              player->getCutType() == daPy_py_c::TYPE_CUT_LARGE_TURN_RIGHT);
+    return player != NULL && (player->getCutType() == daPy_py_c::CUT_TYPE_TURN_RIGHT ||
+                              player->getCutType() == daPy_py_c::CUT_TYPE_TURN_LEFT ||
+                              player->getCutType() == daPy_py_c::CUT_TYPE_LARGE_TURN_LEFT ||
+                              player->getCutType() == daPy_py_c::CUT_TYPE_LARGE_TURN_RIGHT);
 }
 
 /* ############################################################################################## */
@@ -2027,8 +2027,8 @@ asm void dKyr_evil_draw(f32 (*param_0)[4], u8** param_1) {
 
 /* 8006F160-8006F168 069AA0 0008+00 0/0 1/0 0/0 .text            getKandelaarFlamePos__9daPy_py_cFv
  */
-bool daPy_py_c::getKandelaarFlamePos() {
-    return false;
+cXyz* daPy_py_c::getKandelaarFlamePos() {
+    return NULL;
 }
 
 /* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
diff --git a/src/d/kankyo/d_kankyo_wether.cpp b/src/d/kankyo/d_kankyo_wether.cpp
index 49368d2616..0665fb820c 100644
--- a/src/d/kankyo/d_kankyo_wether.cpp
+++ b/src/d/kankyo/d_kankyo_wether.cpp
@@ -533,7 +533,7 @@ SECTION_SDATA2 static u8 lit_4378[4] = {
 SECTION_SDATA2 static f32 lit_4379 = 1.0f;
 
 // remove these once float data is fixed
-inline u32 tmp_dComIfGp_particle_set(u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3,
+inline JPABaseEmitter* tmp_dComIfGp_particle_set(u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3,
                                      const csXyz* param_4, const cXyz* param_5, u8 param_6,
                                      dPa_levelEcallBack* param_7, s8 param_8,
                                      const GXColor* param_9, const GXColor* param_10,
@@ -543,7 +543,7 @@ inline u32 tmp_dComIfGp_particle_set(u16 param_1, const cXyz* param_2, const dKy
                                                             param_9, param_10, param_11, lit_4379);
 }
 
-inline u32 tmp_dComIfGp_particle_set(u16 param_0, const cXyz* param_1, const csXyz* param_2,
+inline JPABaseEmitter* tmp_dComIfGp_particle_set(u16 param_0, const cXyz* param_1, const csXyz* param_2,
                                      const cXyz* param_3) {
     return tmp_dComIfGp_particle_set(param_0, param_1, NULL, param_2, param_3, 0xFF, NULL, -1, NULL,
                                      NULL, NULL);
@@ -920,7 +920,7 @@ static void wether_move_rain() {
 
         if (g_env_light.mSnowCount == 0 && cam != NULL) {
             // Stage is not Fishing Pond
-            if (strcmp(dComIfGp_getStartStageName(), "R_SP127") || cam->field_0xd8.y > 0.0f) {
+            if (strcmp(dComIfGp_getStartStageName(), "R_SP127") || cam->mLookat.mEye.y > 0.0f) {
                 if (g_env_light.mRainCount < 125.0f) {
                     mDoAud_rainPlay(FALSE);
                 } else {
@@ -1503,14 +1503,14 @@ void dKyw_wether_proc() {
     if (!strcmp(dComIfGp_getStartStageName(), "F_SP108") ||
         !strcmp(dComIfGp_getStartStageName(), "F_SP127") ||
         (!strcmp(dComIfGp_getStartStageName(), "F_SP121") &&
-         FLOAT_LABEL(lit_4378) != g_env_light.field_0x11d8)) {
+         FLOAT_LABEL(lit_4378) != g_env_light.mDiceWeatherTime)) {
         if (!dKy_darkworld_check()) {
             // Stage is Hyrule Field
             if (!strcmp(dComIfGp_getStartStageName(), "F_SP121") || g_env_light.mDaytime >= 75.0f ||
                 g_env_light.mDaytime <= 120.0f) {
                 // Stage is Hyrule Field
                 if (!strcmp(dComIfGp_getStartStageName(), "F_SP121") &&
-                    g_env_light.field_0x12c9 >= 1 && g_env_light.field_0x12c9 < 6) {
+                    g_env_light.mDiceWeatherMode >= 1 && g_env_light.mDiceWeatherMode < 6) {
                     dKy_get_dayofweek();
                     cLib_addCalc(&g_env_light.field_0xebc, lit_4379, lit_5362, lit_5363, lit_4770);
                     g_env_light.mMoyaMode = 7;