d_s_play OK, work on d_a_ykgr (#2035)

src/d/com/d_com_static.cpp

@@ -16,17 +16,12 @@
 #include "rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.h"
 #include "rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.h"
 #include "rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.h"
+#include "rel/d/a/d_a_ykgr/d_a_ykgr.h"
 
 //
 // Types:
 //
 
-struct daYkgr_c {
-    static u8 m_aim_rate[4];
-    static u8 m_path[4];
-    static u8 m_emitter[4];
-};
-
 struct daObjMovebox {
     struct Act_c {
         static void* M_dir_base[2];
@@ -273,14 +268,15 @@ u8 daSus_c::mRoom[256];
 /* 80450D88-80450D8C -00001 0004+00 1/1 0/0 2/2 .sbss            None */
 /* 80450D88 0002+00 data_80450D88 m_count__9daArrow_c */
 extern s16 m_count__9daArrow_c;
+#pragma push
+#pragma force_active on
 s16 m_count__9daArrow_c;
+#pragma pop
 
 /* 80450D8A 0002+00 data_80450D8A mSetTop__7daSus_c */
 s16 daSus_c::mSetTop;
 
 /* 80031248-800313BC 02BB88 0174+00 0/0 0/0 1/1 .text newData__7daSus_cFScRC4cXyzRC4cXyzUcUcUc */
-// Issues with mSetTop and m_count__9daArrow_c relocation
-#ifdef NONMATCHING
 int daSus_c::newData(s8 i_roomNo, cXyz const& param_1, cXyz const& param_2, u8 param_3, u8 param_4,
                      u8 i_type) {
     s16 setTop = mSetTop;
@@ -307,17 +303,6 @@ int daSus_c::newData(s8 i_roomNo, cXyz const& param_1, cXyz const& param_2, u8 p
 
     return 0;
 }
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm int daSus_c::newData(s8 param_0, cXyz const& param_1, cXyz const& param_2, u8 param_3,
-                         u8 param_4, u8 param_5) {
-    nofralloc
-#include "asm/d/com/d_com_static/newData__7daSus_cFScRC4cXyzRC4cXyzUcUcUc.s"
-}
-#pragma pop
-#endif
 
 /* 800313BC-80031434 02BCFC 0078+00 0/0 1/1 0/0 .text            reset__7daSus_cFv */
 void daSus_c::reset() {
@@ -429,34 +414,24 @@ void daNpcKakashi_clrSuccessCount() {
     dComIfGs_setTmpReg(0xFEFF, 0);
 }
 
-/* ############################################################################################## */
-/* 803790B0-803790B0 005710 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-SECTION_DEAD static char const* const stringBase_803790B8 = "@bg%04x";
-#pragma pop
-
 /* 80450D8C-80450D90 -00001 0004+00 0/0 1/1 3/3 .sbss            None */
 /* 80450D8C 0001+00 data_80450D8C None */
-// u8 daYkgr_c::m_flag;
+bool daYkgr_c::m_flag;
 
 /* 80450D8D 0001+00 data_80450D8D None */
-// u8 daYkgr_c::m_alpha_flag;
+bool daYkgr_c::m_alpha_flag;
 
 /* 80450D8E 0002+00 data_80450D8E None */
-// u8 daYkgr_c::m_alpha;
-
-extern u8 struct_80450D8C[4];
-u8 struct_80450D8C[4];
+u8 daYkgr_c::m_alpha;
 
 /* 80450D90-80450D94 000290 0004+00 0/0 0/0 1/1 .sbss            m_aim_rate__8daYkgr_c */
-u8 daYkgr_c::m_aim_rate[4];
+f32 daYkgr_c::m_aim_rate;
 
 /* 80450D94-80450D98 000294 0004+00 0/0 0/0 2/2 .sbss            m_path__8daYkgr_c */
-u8 daYkgr_c::m_path[4];
+dPath* daYkgr_c::m_path;
 
 /* 80450D98-80450D9C 000298 0004+00 0/0 1/1 2/2 .sbss            m_emitter__8daYkgr_c */
-u8 daYkgr_c::m_emitter[4];
+JPABaseEmitter* daYkgr_c::m_emitter;
 
 /* 80031870-800318B4 02C1B0 0044+00 0/0 0/0 19/19 .text getArcName__12daSetBgObj_cFP10fopAc_ac_c
  */

src/d/d_eye_hl.cpp

@@ -45,7 +45,7 @@ dEyeHL_c* dEyeHL_mng_c::m_obj;
 void dEyeHL_mng_c::update() {
     dEyeHL_c* obj = m_obj;
 
-    if (g_envHIO[0x10] == 0 || !i_dComIfGp_event_runCheck()) {
+    if (g_envHIO.mOther.mLODBias == 0 || !i_dComIfGp_event_runCheck()) {
         for (; obj != NULL; obj = obj->m_next) {
             obj->m_timg->LODBias = obj->m_lodBias;
         }

src/d/d_stage.cpp

@@ -2172,7 +2172,7 @@ static int dStage_lgtvInfoInit(dStage_dt_c* stageDt, void* i_data, int entryNum,
 
 /* 80025738-80025744 020078 000C+00 0/0 1/1 0/0 .text
  * dStage_stagInfo_GetParticleNo__FP21stage_stag_info_classi    */
-u8 dStage_stagInfo_GetParticleNo(stage_stag_info_class* p_info, int layer) {
+u32 dStage_stagInfo_GetParticleNo(stage_stag_info_class* p_info, int layer) {
     return p_info->mParticleNo[layer];
 }
 

src/d/s/d_s_logo.cpp

@@ -1,5 +1,4 @@
 //
-// Generated By: dol2asm
 // Translation Unit: d/s/d_s_logo
 //
 
@@ -10,7 +9,6 @@
 #include "d/com/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "d/map/d_map_path_dmap.h"
-#include "dol2asm.h"
 #include "m_Do/m_Do_Reset.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_graphic.h"
@@ -79,11 +77,10 @@ void dScnLogo_c::preLoad_dyl_remove() {
 
 /* ############################################################################################## */
 /* 80399FE0-80399FFC 026640 001C+00 1/1 0/0 0/0 .rodata          l_preLoad_dylKeyTbl */
-SECTION_RODATA static s16 const l_preLoad_dylKeyTbl[14] = {
+static s16 const l_preLoad_dylKeyTbl[14] = {
     0x02DC, 0x02CE, 0x0221, 0x00F2, 0x021B, 0x02F4, 0x0139,
     0x015A, 0x02E4, 0x00FE, 0x0308, 0x030F, 0x00FF, 0x013F,
 };
-COMPILER_STRIP_GATE(0x80399FE0, &l_preLoad_dylKeyTbl);
 
 /* 8025611C-80256198 250A5C 007C+00 2/2 0/0 0/0 .text            preLoad_dyl__10dScnLogo_cFv */
 bool dScnLogo_c::preLoad_dyl() {

src/d/s/d_s_name.cpp

@@ -1,5 +1,4 @@
 //
-// Generated By: dol2asm
 // Translation Unit: d/s/d_s_name
 //