Merge branch 'main' of https://github.com/zeldaret/tp

src/JSystem/JAudio2/JASAramStream.cpp

@@ -498,7 +498,7 @@ void JASAramStream::updateChannel(u32 i_callbackType, JASChannel* i_channel,
                 field_0x0b4 = i_dspChannel->field_0x074 + i_dspChannel->field_0x064;
                 if (field_0x118 >= field_0x160 - 2) {
                     JUT_WARN_DEVICE(810, 1, "%s", "buffer under error");
-                    field_0x0ae |= 4;
+                    field_0x0ae |= (u8)4;
                 }
             } else {
                 if (field_0x12c & 1) {

src/JSystem/JAudio2/JASBNKParser.cpp

@@ -305,3 +305,7 @@ JASOscillator::Point const* JASBNKParser::Ver0::getOscTableEndPtr(JASOscillator:
     } while (tmp <= 10);
     return points;
 }
+
+// Fakematch? Why is this here?
+template<>
+JASMemPool_MultiThreaded<JASChannel> JASPoolAllocObject_MultiThreaded<JASChannel>::memPool_;

src/JSystem/JAudio2/JASHeapCtrl.cpp

@@ -195,11 +195,19 @@ JASGenericMemPool::~JASGenericMemPool() {
 
 JKRSolidHeap* JASDram;
 
-void JASGenericMemPool::newMemPool(u32 size, int param_1) {
+// TODO: What is this and Where does it go?
+struct TNextOnFreeList {
+    u8 pad[4];
+};  // Size: 0x4
+
+void JASGenericMemPool::newMemPool(u32 n, int param_1) {
+    JUT_ASSERT(734, n >= sizeof(TNextOnFreeList));
+    void* runner;
     for (int i = 0; i < param_1; i++) {
-        void* chunk = new (JASDram, 0) u8[size];
-        *(void**)chunk = field_0x0;
-        field_0x0 = chunk;
+        runner = new (JASDram, 0) u8[n];
+        JUT_ASSERT(739, runner);
+        *(void**)runner = field_0x0;
+        field_0x0 = runner;
     }
     freeMemCount += param_1;
     totalMemCount += param_1;

src/JSystem/JAudio2/JASTaskThread.cpp

@@ -81,12 +81,11 @@ int JASTaskThread::sendCmdMsg(JASThreadCallback callback, void* msg) {
     return iVar2;
 }
 
-// NONMATCHING Regalloc
 void* JASTaskThread::run() {
     JASThreadCallStack* callstack;
     OSInitFastCast();
     do {
-        callstack = (JASThreadCallStack*)waitMessageBlock();
+        callstack = static_cast<JASThreadCallStack*>(waitMessageBlock());
         if (field_0x84) {
             OSSleepThread(&threadQueue_);
         }

src/JSystem/JFramework/JFWDisplay.cpp

@@ -9,6 +9,7 @@
 #include "dolphin/gx.h"
 #include <dolphin/vi.h>
 #include "global.h"
+#include "stdint.h"
 
 void JFWDisplay::ctor_subroutine(bool enableAlpha) {
     mEnableAlpha = enableAlpha;
@@ -362,8 +363,8 @@ static void waitForTick(u32 p1, u16 p2) {
             if (!OSReceiveMessage(JUTVideo::getManager()->getMessageQueue(), &msg, OS_MESSAGE_BLOCK)) {
                 msg = 0;
             }
-        } while (((int)msg - (int)nextCount) < 0);
-        nextCount = (int)msg + uVar1;
+        } while (((intptr_t)msg - (intptr_t)nextCount) < 0);
+        nextCount = (intptr_t)msg + uVar1;
     }
 }
 

src/JSystem/JHostIO/JHIMccBuf.cpp

@@ -3,7 +3,7 @@
 #include "JSystem/JHostIO/JHIMccBuf.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JHostIO/JHIRMcc.h"
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <cstring.h>
 
 extern "C" int HIO2Read(u32, u32, void*, u32);

src/JSystem/JHostIO/JHIMemBuf.cpp

@@ -2,7 +2,7 @@
 
 #include "JSystem/JHostIO/JHICommonMem.h"
 #include "JSystem/JKernel/JKRHeap.h"
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 
 int JHIMemBuf::create() {
     int rt = 1;

src/JSystem/JHostIO/JHIhioASync.cpp

@@ -2,7 +2,7 @@
 
 #include "JSystem/JHostIO/JHIMccBuf.h"
 #include "JSystem/JHostIO/JHIRMcc.h"
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include "global.h"
 
 u32 gsEnableHostio;

src/JSystem/JHostIO/JORFile.cpp

@@ -2,7 +2,7 @@
 
 #include "JSystem/JHostIO/JORFile.h"
 #include "JSystem/JHostIO/JORServer.h"
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 
 JORFile::JORFile()
 : mHandle(0),

src/JSystem/JStudio/JStudio/functionvalue.cpp

@@ -778,8 +778,8 @@ f64 TFunctionValue_list_parameter::update_INTERPOLATE_BSPLINE_dataMore3_(
     local_68[2] = pfVar2[1];
     local_48[2] = pfVar2[-2];
     local_48[3] = pfVar2[0];
-    s32 iVar5 = ((int)pfVar2 - (int)rThis.dat1.get()) / 4;
-    s32 iVar3 = ((int)rThis.dat2.get() - (int)pfVar2) / 4;
+    s32 iVar5 = ((intptr_t)pfVar2 - (intptr_t)rThis.dat1.get()) / 4;
+    s32 iVar3 = ((intptr_t)rThis.dat2.get() - (intptr_t)pfVar2) / 4;
     switch(iVar5) {
     case 2:
         local_68[0] = 2.0 * local_68[1] - local_68[2];

src/JSystem/JStudio/JStudio/jstudio-object.cpp

@@ -186,7 +186,7 @@ void JStudio::TAdaptor::adaptor_setVariableValue_n(JStudio::TControl* pControl,
     JGadget::TEnumerator<const u32*> enumerator(param_2, param_2 + param_3);
     while (enumerator) {
         (*pcVar6)(this, pControl, **enumerator, param_5, iVar7);
-        param_5 = (const void*)((int)param_5 + iVar7);
+        param_5 = (const void*)((intptr_t)param_5 + iVar7);
     }
 }
 

src/JSystem/JStudio/JStudio/stb-data-parse.cpp

@@ -3,6 +3,7 @@
 #include "JSystem/JStudio/JStudio/stb-data-parse.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "dolphin/os.h"
+#include "stdint.h"
 
 namespace JStudio {
 namespace stb {
@@ -22,12 +23,12 @@ void TParse_TSequence::getData(TData* pData) const {
     if (type == 0)
         return;
     
-    const void* next = (const void*)((int)getRaw() + 4);
+    const void* next = (const void*)((intptr_t)getRaw() + 4);
     if (type <= 0x7f) {
         pData->next = next;
     } else {
         pData->content = next;
-        pData->next = (const void*)((int)next + param);
+        pData->next = (const void*)((intptr_t)next + param);
     }
 }
 
@@ -43,7 +44,7 @@ void TParse_TParagraph::getData(TData* pData) const {
         pData->next = data;
     } else {
         pData->content = data;
-        pData->next = (const void*)((int)data + align_roundUp(result, 4));
+        pData->next = (const void*)((intptr_t)data + align_roundUp(result, 4));
     }
 }
 

src/JSystem/JStudio/JStudio_JStage/object-light.cpp

@@ -40,7 +40,6 @@ void JStudio_JStage::TAdaptor_light::adaptor_do_prepare() {
     }
 }
 
-// NONMATCHING - regalloc
 void JStudio_JStage::TAdaptor_light::adaptor_do_begin() {
     {
         adaptor_object_begin_();
@@ -56,7 +55,8 @@ void JStudio_JStage::TAdaptor_light::adaptor_do_begin() {
         pLightObj->JSGGetPosition(&lightObjTransform.position);
         pLightObj->JSGGetDirection(&lightObjTransform.direction);
         const JStudio::TControl::TTransform_position_direction* finalTransform =
-        pControl->transformOnGet_transform_ifEnabled(lightObjTransform, &aTStack_b8);
+            (const JStudio::TControl::TTransform_position_direction*)
+            pControl->transformOnGet_transform_ifEnabled(lightObjTransform, &aTStack_b8);
         adaptor_setVariableValue_Vec(sauVariableValue_3_POSITION_XYZ, finalTransform->position);
         f32 dirx = finalTransform->direction.x;
         f32 diry = finalTransform->direction.y;

src/JSystem/JSupport/JSUInputStream.cpp

@@ -2,7 +2,7 @@
 
 #include "JSystem/JSupport/JSUInputStream.h"
 #include "JSystem/JSupport/JSURandomInputStream.h"
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 
 JSUInputStream::~JSUInputStream() {
     if (!isGood()) {

src/JSystem/JSupport/JSUOutputStream.cpp

@@ -2,7 +2,7 @@
 
 #include "JSystem/JSupport/JSUOutputStream.h"
 #include "JSystem/JSupport/JSURandomOutputStream.h"
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <cstring.h>
 
 JSUOutputStream::~JSUOutputStream() {

src/JSystem/JUtility/JUTException.cpp

@@ -7,7 +7,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <stdint.h>
 
 OSMessageQueue JUTException::sMessageQueue = {0};

src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp

@@ -1,6 +1,6 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include "global.h"
 
 extern u8 const JUTResFONT_Ascfont_fix12[16736] ATTRIBUTE_ALIGN(32) = {

src/PowerPC_EABI_Support/Runtime/Src/__mem.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 
 __declspec(section ".init") void* memcpy(void* dst, const void* src, size_t n) {
     const unsigned char* s;

src/PowerPC_EABI_Support/Runtime/Src/runtime.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 
 #ifdef __cplusplus
 extern "C" {

src/Z2AudioLib/Z2Audience.cpp

@@ -500,7 +500,11 @@ Z2Audience::Z2Audience() : JASGlobalInstance<Z2Audience>(true), field_0x4(1.0f),
 }
 
 Z2Audience::~Z2Audience() {
-    // JUT_ASSERT(751, !isActive()); // TODO: need to setup rest of JASMemPool stuff
+    JUT_ASSERT(751, !isActive());
+}
+
+bool Z2Audience::isActive() const {
+    return Z2Audible::getTotalMemCount() != Z2Audible::getFreeMemCount();
 }
 
 void Z2Audience::setAudioCamera(f32 (*param_0)[4], Vec& pos, Vec& param_2, f32 param_3,

src/Z2AudioLib/Z2LinkMgr.cpp

@@ -317,7 +317,7 @@ JAISoundHandle* Z2CreatureLink::startLinkSoundLevel(JAISoundID soundID, u32 mapi
         case Z2SE_AL_SNOBO_RIDE:
         case Z2SE_AL_SNOBO_BREAK:
                 /* dSv_event_flag_c::F_0266 - Snowpeak Ruins - Snowpeak Ruins clear */
-            if (dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[266])
+            if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[266])
                 && Z2GetSeqMgr()->getSubBgmID() != Z2BGM_SNOW_BOARD) {
                 volume = 0.0f;
                 volumeMoveSteps = 0;

src/Z2AudioLib/Z2SeqMgr.cpp

@@ -131,7 +131,7 @@ Z2SeqMgr::Z2SeqMgr() : JASGlobalInstance<Z2SeqMgr>(true) {
 
 void Z2SeqMgr::bgmStart(u32 bgmID, u32 fadeTime, s32 param_2) {
     switch (bgmID) {
-    case -1:
+    case 0xFFFFFFFF:
         return;
     case 0x200005D:
         bgmAllUnMute(33);

src/c/c_dylink.cpp

@@ -795,7 +795,7 @@ static DynamicNameTableEntry const DynamicNameTable[] = {
     #if !PLATFORM_SHIELD
     {PROC_GRASS, "d_a_grass"},
     #endif
-    {0xFFFF, NULL},
+    {-1, NULL},
 };
 
 static DynamicModuleControlBase* DMC[PROC_MAX_NUM];

src/d/actor/d_a_demo00.cpp

@@ -1089,7 +1089,7 @@ inline int daDemo00_c::execute() {
                             break;
                         }
                         case 1:
-                            dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[sp0E]);
+                            dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[sp0E]);
                             break;
 
                         case 2: {

src/d/actor/d_a_e_hp.cpp

@@ -730,7 +730,7 @@ void daE_HP_c::executeDead() {
         field_0x784 = -1;
 
         if (dComIfGs_getPohSpiritNum() == 20) {
-            dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[0x1c9]);
+            dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[0x1c9]);
         }
 
         movemode++;

src/d/actor/d_a_e_rdy.cpp

@@ -4277,7 +4277,7 @@ static int daE_RDY_Execute(e_rdy_class* i_this) {
         }
     }
 
-    if (i_this->field_0x5b8 == 12 && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[239] & 0xffff)) {
+    if (i_this->field_0x5b8 == 12 && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[239])) {
         fopAcM_OffStatus(a_this, 0);
         a_this->attention_info.flags = 0;
         return 1;

src/d/actor/d_a_e_sm2.cpp

@@ -40,6 +40,16 @@ daE_SM2_HIO_c::daE_SM2_HIO_c() {
     color_debug_B = 91;
 }
 
+#if DEBUG
+void daE_SM2_HIO_c::genMessage(JORMContext* ctx) {
+    ctx->genCheckBox("合体しない", &merge_OFF, 1, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18);
+    ctx->genCheckBox("色調整する", &color_debug_ON, 1, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18);
+    ctx->genSlider("色調整R", &color_debug_R, 0, 0xFF, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18);
+    ctx->genSlider("色調整G", &color_debug_G, 0, 0xFF, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18);
+    ctx->genSlider("色調整B", &color_debug_B, 0, 0xFF, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18);
+}
+#endif
+
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -65,7 +75,7 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
 }
 
 static int daE_SM2_Draw(e_sm2_class* i_this) {
-    fopAc_ac_c* actor = &i_this->enemy;
+    fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->enemy;
     g_env_light.settingTevStruct(0, &actor->current.pos, &actor->tevStr);
 
     if (!i_this->isPiece) {
@@ -82,15 +92,15 @@ static int daE_SM2_Draw(e_sm2_class* i_this) {
         i_this->invisModel.entryDL(NULL);
 
         if (i_this->shadowId != 353535) {
-            cXyz sp8;
-            sp8.set(actor->current.pos.x, 50.0f + actor->current.pos.y + BREG_F(18), actor->current.pos.z);
+            cXyz pos;
+            pos.set(actor->current.pos.x, 50.0f + actor->current.pos.y + BREG_F(18), actor->current.pos.z);
             
             f32 var_f31 = i_this->size * (2500.0f + BREG_F(19)) * i_this->field_0x830;
             if (var_f31 < 700.0f) {
                 var_f31 = 700.0f;
             }
 
-            i_this->shadowId = dComIfGd_setShadow(i_this->shadowId, 1, model, &sp8, var_f31, 0.0f, actor->current.pos.y, i_this->acch.GetGroundH(), i_this->acch.m_gnd, &actor->tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex());
+            i_this->shadowId = dComIfGd_setShadow(i_this->shadowId, 1, model, &pos, var_f31, 0.0f, actor->current.pos.y, i_this->acch.GetGroundH(), i_this->acch.m_gnd, &actor->tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex());
         }
     } else {
         J3DModel* model = i_this->pieceModelMorf->getModel();
@@ -144,8 +154,6 @@ static void sm2_delete(e_sm2_class* i_this) {
 }
 
 static void cc_stts_init(e_sm2_class* i_this) {
-    fopAc_ac_c* actor = &i_this->enemy;
-
     static u8 w_d[] = {
         200,
         210,
@@ -154,7 +162,7 @@ static void cc_stts_init(e_sm2_class* i_this) {
         250,
     };
 
-    i_this->ccStts.Init(w_d[i_this->sizetype], 0, actor);
+    i_this->ccStts.Init(w_d[i_this->sizetype], 0, &i_this->enemy);
 
     static f32 bg_h[] = {
         50.0f,
@@ -176,14 +184,14 @@ static void cc_stts_init(e_sm2_class* i_this) {
 }
 
 static void* s_s_sub(void* i_actor, void* i_data) {
-    cXyz sp18;
+    cXyz pos_delta;
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_SM2) {
         e_sm2_class* pother = (e_sm2_class*)i_data;
         e_sm2_class* pactor = (e_sm2_class*)i_actor;
 
         if (pother != pactor && pactor->action == ACTION_NORMAL_MOVE && pactor->combine_off_timer == 0) {
-            sp18 = pactor->enemy.current.pos - pother->enemy.current.pos;
-            f32 other_dist = sp18.abs();
+            pos_delta = pactor->enemy.current.pos - pother->enemy.current.pos;
+            f32 other_dist = pos_delta.abs();
             if (other_dist < 600.0f && other_dist < pother->dist_to_pl && !fopAcM_otherBgCheck(&pother->enemy, &pactor->enemy)) {
                 return pactor;
             }
@@ -209,16 +217,16 @@ static daE_SM2_HIO_c l_HIO;
 static void normal_move(e_sm2_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
-    cXyz sp24;
-    cXyz sp18;
+    cXyz unused;
+    cXyz unused_2;
     f32 move_speed = 0.0f;
     f32 speed_step = 1.0f;
-    s16 spA = 1000;
+    s16 step_target = 1000;
 
     if (pl_check(i_this, 700.0f)) {
         i_this->field_0x6a8 = 1;
         speed_step = 6.0f + TREG_F(10);
-        spA = TREG_S(3) + 2000;
+        step_target = TREG_S(3) + 2000;
     } else {
         i_this->field_0x6a8 = 0;
     }
@@ -227,13 +235,13 @@ static void normal_move(e_sm2_class* i_this) {
     case 0:
         if (i_this->timers[0] == 0) {
             if (i_this->field_0x6a8 == 0) {
-                i_this->field_0x6a4 = cM_rndF(65536.0f);
+                i_this->mCurrentAngleYTarget = cM_rndF(65536.0f);
                 i_this->timers[0] = 23.0f + cM_rndF(3.0f);
             } else {
                 i_this->timers[0] = 8.0f + cM_rndF(3.0f);
             }
 
-            i_this->field_0x6a6 = 0;
+            i_this->mCurrentAngleYTargetStep = 0;
             i_this->mode = 1;
         }
         break;
@@ -242,7 +250,7 @@ static void normal_move(e_sm2_class* i_this) {
             move_speed = 15.0f + TREG_F(2);
         } else {
             move_speed = 25.0f + TREG_F(11);
-            i_this->field_0x6a4 = i_this->angle_to_pl;
+            i_this->mCurrentAngleYTarget = i_this->angle_to_pl;
         }
 
         if (i_this->timers[0] == 0) {
@@ -256,7 +264,7 @@ static void normal_move(e_sm2_class* i_this) {
             if (i_this->field_0x6a8 == 0) {
                 i_this->timers[0] = 23.0f + cM_rndF(3.0f);
             } else {
-                s16 sp8 = actor->current.angle.y - i_this->field_0x6a4;
+                s16 sp8 = actor->current.angle.y - i_this->mCurrentAngleYTarget;
                 if (sp8 < 0x1000 && sp8 > -0x1000 && i_this->dist_to_pl < (400.0f + (100.0f * i_this->size))) {
                     i_this->action = ACTION_ATTACK;
                     i_this->mode = 0;
@@ -270,11 +278,12 @@ static void normal_move(e_sm2_class* i_this) {
 
     cLib_addCalc2(&actor->speedF, move_speed, 0.2f, 0.5f * speed_step);
     if (move_speed > 0.0f) {
-        cLib_addCalcAngleS2(&actor->current.angle.y, i_this->field_0x6a4, 4, i_this->field_0x6a6);
-        cLib_addCalcAngleS2(&i_this->field_0x6a6, spA, 1, 400);
+        cLib_addCalcAngleS2(&actor->current.angle.y, (s16)i_this->mCurrentAngleYTarget, 4, i_this->mCurrentAngleYTargetStep);
+        cLib_addCalcAngleS2(&i_this->mCurrentAngleYTargetStep, step_target, 1, 400);
     }
 
-    cLib_addCalc2(&i_this->field_0x830, 0.65f + TREG_F(7) + (actor->speedF * (0.03f + TREG_F(9))), 0.1f, (0.02f * speed_step) + TREG_F(8));
+    f32 target = 0.65f + TREG_F(7) + (actor->speedF * (0.03f + TREG_F(9)));
+    cLib_addCalc2(&i_this->field_0x830, target, 0.1f, (0.02f * speed_step) + TREG_F(8));
 
     if (!l_HIO.merge_OFF && (i_this->counter & 7) == 0 && i_this->sizetype < 4 && i_this->combine_off_timer == 0 && !fopAcM_CheckCondition(actor, 4)) {
         e_sm2_class* pother = (e_sm2_class*)fpcM_Search(s_s_sub, i_this);
@@ -293,8 +302,8 @@ static void normal_move(e_sm2_class* i_this) {
 static void attack(e_sm2_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
-    cXyz sp28;
-    cXyz sp1C;
+    cXyz unused;
+    cXyz unused_2;
     f32 move_speed = 0.0f;
 
     switch (i_this->mode) {
@@ -371,8 +380,8 @@ static void attack(e_sm2_class* i_this) {
 static s8 combine(e_sm2_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
-    cXyz sp28;
-    cXyz sp1C;
+    cXyz work;
+    cXyz unused;
 
     e_sm2_class* combine_actor = (e_sm2_class*)fopAcM_SearchByID(i_this->combine_actor_pid);
     s8 cc_co_ON = TRUE;
@@ -384,13 +393,14 @@ static s8 combine(e_sm2_class* i_this) {
         return cc_co_ON;
     }
 
-    sp28 = combine_actor->enemy.current.pos - actor->current.pos;
+    work = combine_actor->enemy.current.pos - actor->current.pos;
 
-    f32 var_f28 = sp28.abs();
+    f32 var_f28 = work.abs();
     f32 move_speed = 0.0f;
-    s8 sp8 = 0;
-    f32 speed_step = 6.0f + TREG_F(10);
-    s16 spA = TREG_S(3) + 2000;
+    f32 speed_step = 1.0f;
+    s8 unk_flag = 0;
+    speed_step = 6.0f + TREG_F(10);
+    s16 step_target = TREG_S(3) + 2000;
 
     i_this->field_0x6a8 = 1;
 
@@ -405,7 +415,7 @@ static s8 combine(e_sm2_class* i_this) {
         break;
     case 1:
         move_speed = 25.0f + TREG_F(11);
-        i_this->field_0x6a4 = cM_atan2s(sp28.x, sp28.z);
+        i_this->mCurrentAngleYTarget = cM_atan2s(work.x, work.z);
 
         if (i_this->timers[0] == 0) {
             i_this->mode = 0;
@@ -418,9 +428,9 @@ static s8 combine(e_sm2_class* i_this) {
         i_this->combine_off_timer = 10;
         i_this->field_0x82c = 3.5f;
 
-        sp8 = 1;
+        unk_flag = 1;
         i_this->field_0x6a8 = 2;
-        i_this->field_0x6a4 = combine_actor->enemy.current.angle.y + 0x8000;
+        i_this->mCurrentAngleYTarget = combine_actor->enemy.current.angle.y + 0x8000;
         break;
     case 10:
         cc_co_ON = FALSE;
@@ -433,22 +443,22 @@ static s8 combine(e_sm2_class* i_this) {
         cLib_addCalc2(&actor->current.pos.x, combine_actor->field_0x708[6].x, 1.0f, 10.0f * i_this->size);
         cLib_addCalc2(&actor->current.pos.z, combine_actor->field_0x708[6].z, 1.0f, 10.0f * i_this->size);
 
-        i_this->field_0x6a4 = combine_actor->enemy.current.angle.y + 0x8000;
-        sp8 = 1;
+        i_this->mCurrentAngleYTarget = combine_actor->enemy.current.angle.y + 0x8000;
+        unk_flag = 1;
         i_this->field_0x6a8 = 2;
 
-        sp28.x = actor->current.pos.x - combine_actor->field_0x708[6].x;
-        sp28.z = actor->current.pos.z - combine_actor->field_0x708[6].z;
-        if (i_this->timers[0] == 0 || JMAFastSqrt((sp28.x * sp28.x) + (sp28.z * sp28.z)) <= i_this->size) {
+        work.x = actor->current.pos.x - combine_actor->field_0x708[6].x;
+        work.z = actor->current.pos.z - combine_actor->field_0x708[6].z;
+        if (i_this->timers[0] == 0 || JMAFastSqrt((work.x * work.x) + (work.z * work.z)) <= i_this->size) {
             sm2_delete(i_this);
         }
         break;
     }
 
     cLib_addCalc2(&actor->speedF, move_speed, 0.2f, 0.5f * speed_step);
-    if (move_speed > 0.0f || sp8 != 0) {
-        cLib_addCalcAngleS2(&actor->current.angle.y, i_this->field_0x6a4, 4, i_this->field_0x6a6);
-        cLib_addCalcAngleS2(&i_this->field_0x6a6, spA, 1, 400);
+    if (move_speed > 0.0f || unk_flag != 0) {
+        cLib_addCalcAngleS2(&actor->current.angle.y, (s16)i_this->mCurrentAngleYTarget, 4, i_this->mCurrentAngleYTargetStep);
+        cLib_addCalcAngleS2(&i_this->mCurrentAngleYTargetStep, step_target, 1, 400);
     }
 
     cLib_addCalc2(&i_this->field_0x830, var_f29, 0.1f, (0.02f * speed_step) + TREG_F(8));
@@ -458,8 +468,8 @@ static s8 combine(e_sm2_class* i_this) {
 static s8 roof(e_sm2_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
-    cXyz sp34;
-    cXyz sp28;
+    cXyz unused;
+    cXyz unused_2;
     s8 do_pos_crr = FALSE;
 
     actor->current.angle.x = actor->shape_angle.x = KREG_S(0) + 0x3F00;
@@ -490,16 +500,14 @@ static s8 roof(e_sm2_class* i_this) {
                 i_this->timers[0] = 2.0f + cM_rndF(50.0f);
                 i_this->timers[1] = i_this->timers[0] + 50;
             }
-        } else {
-            if (fopAcM_searchPlayerDistanceXZ(actor) < (100.0f * i_this->field_0x5b6)) {
-                i_this->mode = 2;
-                if (strcmp(dComIfGp_getStartStageName(), "D_SB07") == 0) {
-                    i_this->timers[0] = 2.0f + cM_rndF(50.0f);
-                } else {
-                    i_this->timers[0] = 2;
-                }
-                i_this->timers[1] = i_this->timers[0] + 50;
+        } else if (fopAcM_searchPlayerDistanceXZ(actor) < (100.0f * i_this->field_0x5b6)) {
+            i_this->mode = 2;
+            if (strcmp(dComIfGp_getStartStageName(), "D_SB07") == 0) {
+                i_this->timers[0] = 2.0f + cM_rndF(50.0f);
+            } else {
+                i_this->timers[0] = 2;
             }
+            i_this->timers[1] = i_this->timers[0] + 50;
         }
         break;
     case 2:
@@ -601,7 +609,7 @@ static void eff_set(e_sm2_class* i_this, cXyz* i_pos, f32 i_size) {
 
     cXyz effsize(i_size, i_size, i_size);
 
-    dComIfGp_particle_set(0x85BE, i_pos, &actor->tevStr, &actor->shape_angle, &effsize, 0xFF, NULL, fopAcM_GetRoomNo(actor), &e_prim_A[i_this->type], &e_env_A[i_this->type], NULL);
+    dComIfGp_particle_set(dPa_RM(ID_ZI_S_SM_DEAD_A), i_pos, &actor->tevStr, &actor->shape_angle, &effsize, 0xFF, NULL, fopAcM_GetRoomNo(actor), &e_prim_A[i_this->type], &e_env_A[i_this->type], NULL);
 
     static GXColor e_prim_B[] = {
         {0x8C, 0xB4, 0x78, 0x00},
@@ -623,13 +631,13 @@ static void eff_set(e_sm2_class* i_this, cXyz* i_pos, f32 i_size) {
         {0x14, 0x14, 0x14, 0x00},
     };
 
-    dComIfGp_particle_set(0x85BF, i_pos, &actor->tevStr, &actor->shape_angle, &effsize, 0xFF, NULL, fopAcM_GetRoomNo(actor), &e_prim_B[i_this->type], &e_env_B[i_this->type], NULL);
+    dComIfGp_particle_set(dPa_RM(ID_ZI_S_SM_DEAD_B), i_pos, &actor->tevStr, &actor->shape_angle, &effsize, 0xFF, NULL, fopAcM_GetRoomNo(actor), &e_prim_B[i_this->type], &e_env_B[i_this->type], NULL);
 }
 
 static void fail(e_sm2_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
-    cXyz sp14;
-    cXyz sp8;
+    cXyz work;
+    cXyz pos;
 
     i_this->invulernabilityTimer = 10;
     actor->speedF = 0.0f;
@@ -671,11 +679,16 @@ static void fail(e_sm2_class* i_this) {
             dComIfGp_att_CatchRequest(actor, item_no[i_this->type], 100.0f, 50.0f, -150.0f, 0x5000, 1);
             actor->eventInfo.onCondition(0x40);
         }
-    } else if (i_this->mode == 2 && i_this->timers[0] == 1) {
+        
+        return;
+    }
+    
+    if (i_this->mode == 2 && i_this->timers[0] == 1) {
         MTXCopy(daPy_getPlayerActorClass()->getLeftItemMatrix(), *calc_mtx);
-        sp14.set(0.0f, 0.0f, 0.0f);
-        MtxPosition(&sp14, &sp8);
-        eff_set(i_this, &sp8, 0.1f + TREG_F(14));
+        work.set(0.0f, 0.0f, 0.0f);
+        MtxPosition(&work, &pos);
+        f32 size = 0.1f + TREG_F(14);
+        eff_set(i_this, &pos, size);
     }
 }
 
@@ -683,7 +696,7 @@ static void dmcalc(e_sm2_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     int i;
 
-    cXyz sp5C;
+    cXyz work;
     cXyz sp50;
     cXyz* var_r28 = &i_this->field_0x708[1];
     csXyz* sp14 = &i_this->field_0x768[1];
@@ -692,22 +705,22 @@ static void dmcalc(e_sm2_class* i_this) {
     cMtx_YrotS(*calc_mtx, actor->shape_angle.y);
     cMtx_XrotM(*calc_mtx, actor->shape_angle.x);
 
-    sp5C.x = 0.0f;
-    sp5C.y = 0.0f;
-    sp5C.z = i_this->size * (-5.0f + WREG_F(18)) * i_this->field_0x830;
-    if (sp5C.z > -1.5f + WREG_F(17)) {
-        sp5C.z = -1.5f + WREG_F(17);
+    work.x = 0.0f;
+    work.y = 0.0f;
+    work.z = ((-5.0f + WREG_F(18)) * i_this->size) * i_this->field_0x830;
+    if (work.z > -1.5f + WREG_F(17)) {
+        work.z = -1.5f + WREG_F(17);
     }
 
     if (i_this->field_0x6a8 == 1) {
-        sp5C.z *= 1.4f;
+        work.z *= 1.4f;
     } else if (i_this->field_0x6a8 == 2) {
-        sp5C.z *= 5.0f;
+        work.z *= 5.0f;
     } else if (i_this->field_0x6a8 == 3) {
-        sp5C.z = -2000.0f;
+        work.z = -2000.0f;
     }
 
-    MtxPosition(&sp5C, &sp44);
+    MtxPosition(&work, &sp44);
 
     f32 var_f31 = 1.0f;
     f32 temp_f30;
@@ -744,9 +757,9 @@ static void dmcalc(e_sm2_class* i_this) {
         spA = swsp_d[i_this->sizetype];
     }
 
-    sp5C.x = 0.0f;
-    sp5C.y = 0.0f;
-    sp5C.z = i_this->size * (100.0f + WREG_F(1)) * i_this->field_0x830;
+    work.x = 0.0f;
+    work.y = 0.0f;
+    work.z = ((100.0f + WREG_F(1)) * i_this->size) * i_this->field_0x830;
 
     for (i = 1; i < 8; i++, var_r28++, sp14++) {
         if (i_this->field_0x6aa != 0) {
@@ -783,7 +796,7 @@ static void dmcalc(e_sm2_class* i_this) {
         spE = -cM_atan2s(temp_f26, JMAFastSqrt((temp_f30 * temp_f30) + (temp_f29 * temp_f29)));
         cMtx_YrotS(*calc_mtx, spC);
         cMtx_XrotM(*calc_mtx, spE);
-        MtxPosition(&sp5C, &sp50);
+        MtxPosition(&work, &sp50);
 
         var_r28[0].x = var_r28[-1].x + sp50.x;
         var_r28[0].y = var_r28[-1].y + sp50.y;
@@ -798,7 +811,14 @@ static void dmcalc(e_sm2_class* i_this) {
 static u8 new_col_d[] = {
     TYPE_GREEN,  TYPE_BLUE,   TYPE_PURPLE, TYPE_PURPLE, TYPE_PURPLE, TYPE_PURPLE, TYPE_RARE,
     TYPE_BLUE,   TYPE_RED,    TYPE_PURPLE, TYPE_PURPLE, TYPE_PURPLE, TYPE_PURPLE, TYPE_RARE,
-    TYPE_PURPLE, TYPE_PURPLE, TYPE_BLUE,   TYPE_PURPLE, TYPE_PURPLE, TYPE_PURPLE, TYPE_RARE,
+    TYPE_PURPLE, TYPE_PURPLE, TYPE_BLUE,
+    // For some reason, the data differs here between retail and ShieldD?
+    #if VERSION == VERSION_SHIELD_DEBUG
+    TYPE_GREEN,
+    #else
+    TYPE_PURPLE,
+    #endif
+    TYPE_PURPLE, TYPE_PURPLE, TYPE_RARE,
     TYPE_PURPLE, TYPE_PURPLE, TYPE_PURPLE, TYPE_YELLOW, TYPE_PURPLE, TYPE_PURPLE, TYPE_RARE,
     TYPE_PURPLE, TYPE_PURPLE, TYPE_PURPLE, TYPE_PURPLE, TYPE_PURPLE, TYPE_PURPLE, TYPE_RARE,
     TYPE_PURPLE, TYPE_PURPLE, TYPE_PURPLE, TYPE_PURPLE, TYPE_PURPLE, TYPE_RARE,   TYPE_RARE,
@@ -808,7 +828,7 @@ static u8 new_col_d[] = {
 static void damage_check(e_sm2_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
 
-    cXyz sp78;
+    cXyz work;
     i_this->ccStts.Move();
 
     if (i_this->combine_off_timer == 0 && i_this->action == ACTION_COMBINE && i_this->mode < 5) {
@@ -901,26 +921,26 @@ static void damage_check(e_sm2_class* i_this) {
                         i_this->field_0x830 = 0.1f;
                         i_this->field_0xfd4 = 1;
 
-                        sp78 = i_this->field_0x708[0] - i_this->field_0x708[3];
-                        actor->current.angle.y = cM_atan2s(sp78.x, sp78.z);
+                        work = i_this->field_0x708[0] - i_this->field_0x708[3];
+                        actor->current.angle.y = cM_atan2s(work.x, work.z);
                         i_this->invulernabilityTimer = 20;
 
                         u32 parameters = 0xFF000000 | (i_this->sizetype << 8) | (i_this->type << 4) | 0xA;
                         csXyz rotation(0, 0, 0);
 
-                        sp78 = i_this->field_0x708[6] - i_this->field_0x708[3];
-                        rotation.y = cM_atan2s(sp78.x, sp78.z);
+                        work = i_this->field_0x708[6] - i_this->field_0x708[3];
+                        rotation.y = cM_atan2s(work.x, work.z);
 
-                        sp78 = actor->current.pos;
-                        sp78.y += 20.0f;
+                        work = actor->current.pos;
+                        work.y += 20.0f;
 
                         cXyz pos(i_this->field_0x708[6]);
                         pos.y += 20.0f;
 
                         dBgS_LinChk linchk;
-                        linchk.Set(&sp78, &pos, actor);
+                        linchk.Set(&work, &pos, actor);
                         if (dComIfG_Bgsp().LineCross(&linchk)) {
-                            pos = sp78;
+                            pos = work;
                         }
 
                         fopAcM_createChild(PROC_E_SM2, fopAcM_GetID(actor), parameters, &pos, fopAcM_GetRoomNo(actor), &rotation, NULL, -1, NULL);
@@ -946,8 +966,8 @@ static void damage_check(e_sm2_class* i_this) {
 
 static void action(e_sm2_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
-    cXyz sp58;
-    cXyz sp4C;
+    cXyz work;
+    cXyz offset;
 
     i_this->angle_to_pl = fopAcM_searchPlayerAngleY(actor);
     i_this->dist_to_pl = fopAcM_searchPlayerDistance(actor);
@@ -992,11 +1012,11 @@ static void action(e_sm2_class* i_this) {
         dBgS_ObjGndChk sp10C;
         dBgS_ObjGndChk_Spl spB8;
 
-        sp58 = actor->current.pos;
-        sp58.y += 150.0f;
+        work = actor->current.pos;
+        work.y += 150.0f;
 
-        spB8.SetPos(&sp58);
-        sp10C.SetPos(&sp58);
+        spB8.SetPos(&work);
+        sp10C.SetPos(&work);
 
         f32 ground_y = dComIfG_Bgsp().GroundCross(&spB8);
         f32 temp_f26 = ground_y - dComIfG_Bgsp().GroundCross(&sp10C);
@@ -1026,13 +1046,13 @@ static void action(e_sm2_class* i_this) {
         actor->attention_info.flags = 0;
     }
 
-    cMtx_YrotS(*calc_mtx, actor->shape_angle.y);
-    sp58.x = 0.0f;
-    sp58.y = 0.0f;
-    sp58.z = actor->speedF * i_this->size;
-    MtxPosition(&sp58, &sp4C);
-    actor->speed.x = sp4C.x;
-    actor->speed.z = sp4C.z;
+    cMtx_YrotS(*calc_mtx, (s16)actor->shape_angle.y);
+    work.x = 0.0f;
+    work.y = 0.0f;
+    work.z = actor->speedF * i_this->size;
+    MtxPosition(&work, &offset);
+    actor->speed.x = offset.x;
+    actor->speed.z = offset.z;
     actor->speed.y += actor->gravity;
     if (actor->speed.y < -100.0f) {
         actor->speed.y = -100.0f;
@@ -1055,29 +1075,29 @@ static void action(e_sm2_class* i_this) {
             dBgS_GndChk gndchk;
 
             cMtx_YrotS(*calc_mtx, actor->shape_angle.y);
-            sp58.x = 0.0f;
-            sp58.y = 0.0f;
-            sp58.z = -25.0f * i_this->size;
-            MtxPosition(&sp58, &sp4C);
-            sp4C += actor->current.pos;
+            work.x = 0.0f;
+            work.y = 0.0f;
+            work.z = -25.0f * i_this->size;
+            MtxPosition(&work, &offset);
+            offset += actor->current.pos;
 
-            Vec sp40;
-            sp40.x = sp4C.x;
-            sp40.y = 100.0f + sp4C.y;
-            sp40.z = sp4C.z;
+            Vec pos;
+            pos.x = offset.x;
+            pos.y = 100.0f + offset.y;
+            pos.z = offset.z;
 
-            gndchk.SetPos(&sp40);
-            sp4C.y = dComIfG_Bgsp().GroundCross(&gndchk);
+            gndchk.SetPos(&pos);
+            offset.y = dComIfG_Bgsp().GroundCross(&gndchk);
 
-            sp58 = sp4C - actor->current.pos;
-            if (fabsf(sp58.y) < 200.0f) {
-                actor->current.angle.x = cM_atan2s(sp58.y, JMAFastSqrt((sp58.x * sp58.x) + (sp58.z * sp58.z)));
+            work = offset - actor->current.pos;
+            if (fabsf(work.y) < 200.0f) {
+                actor->current.angle.x = (s16)cM_atan2s(work.y, JMAFastSqrt((work.x * work.x) + (work.z * work.z)));
             } else {
                 actor->current.angle.x = 0;
             }
         } else {
-            sp58 = actor->speed;
-            actor->current.angle.x = -cM_atan2s(sp58.y, JMAFastSqrt((sp58.x * sp58.x) + (sp58.z * sp58.z)));
+            work = actor->speed;
+            actor->current.angle.x = -cM_atan2s(work.y, JMAFastSqrt((work.x * work.x) + (work.z * work.z)));
         }
     }
 
@@ -1095,8 +1115,8 @@ static void action(e_sm2_class* i_this) {
         }
     }
 
-    f32 var_f31 = 0.1f;
-    s16 spC = 4;
+    f32 pos_scale = 0.1f;
+    s16 angle_scale = 4;
 
     if (i_this->field_0x6a9 == 0 && i_this->field_0x6aa < 10 && i_this->field_0x83f != 0) {
         i_this->field_0x83f--;
@@ -1139,22 +1159,22 @@ static void action(e_sm2_class* i_this) {
                 0x0003,
             };
 
-            var_f31 = pf_d[i_this->field_0x83f];
-            spC = ps_d[i_this->field_0x83f];
+            pos_scale = pf_d[i_this->field_0x83f];
+            angle_scale = ps_d[i_this->field_0x83f];
         }
 
-        cLib_addCalc2(&i_this->field_0x840.x, actor->current.pos.x, var_f31, 500.0f + JREG_F(8));
-        cLib_addCalc2(&i_this->field_0x840.y, actor->current.pos.y, var_f31, 500.0f + JREG_F(8));
-        cLib_addCalc2(&i_this->field_0x840.z, actor->current.pos.z, var_f31, 500.0f + JREG_F(8));
-        cLib_addCalcAngleS2(&i_this->field_0x84c.x, actor->shape_angle.x, spC, JREG_S(8) + 0x800);
-        cLib_addCalcAngleS2(&i_this->field_0x84c.y, actor->shape_angle.y, spC, JREG_S(8) + 0x800);
+        cLib_addCalc2(&i_this->field_0x840.x, actor->current.pos.x, pos_scale, 500.0f + JREG_F(8));
+        cLib_addCalc2(&i_this->field_0x840.y, actor->current.pos.y, pos_scale, 500.0f + JREG_F(8));
+        cLib_addCalc2(&i_this->field_0x840.z, actor->current.pos.z, pos_scale, 500.0f + JREG_F(8));
+        cLib_addCalcAngleS2(&i_this->field_0x84c.x, actor->shape_angle.x, angle_scale, JREG_S(8) + 0x800);
+        cLib_addCalcAngleS2(&i_this->field_0x84c.y, actor->shape_angle.y, angle_scale, JREG_S(8) + 0x800);
 
         for (int i = 1; i < 8; i++) {
-            cLib_addCalc2(&i_this->jnt_pos[i].x, i_this->field_0x708[i].x, var_f31, 500.0f + JREG_F(8));
-            cLib_addCalc2(&i_this->jnt_pos[i].y, i_this->field_0x708[i].y, var_f31, 500.0f + JREG_F(8));
-            cLib_addCalc2(&i_this->jnt_pos[i].z, i_this->field_0x708[i].z, var_f31, 500.0f + JREG_F(8));
-            cLib_addCalcAngleS2(&i_this->field_0x7f8[i].x, i_this->field_0x768[i].x, spC, JREG_S(8) + 0x800);
-            cLib_addCalcAngleS2(&i_this->field_0x7f8[i].y, i_this->field_0x768[i].y, spC, JREG_S(8) + 0x800);
+            cLib_addCalc2(&i_this->jnt_pos[i].x, i_this->field_0x708[i].x, pos_scale, 500.0f + JREG_F(8));
+            cLib_addCalc2(&i_this->jnt_pos[i].y, i_this->field_0x708[i].y, pos_scale, 500.0f + JREG_F(8));
+            cLib_addCalc2(&i_this->jnt_pos[i].z, i_this->field_0x708[i].z, pos_scale, 500.0f + JREG_F(8));
+            cLib_addCalcAngleS2(&i_this->field_0x7f8[i].x, i_this->field_0x768[i].x, angle_scale, JREG_S(8) + 0x800);
+            cLib_addCalcAngleS2(&i_this->field_0x7f8[i].y, i_this->field_0x768[i].y, angle_scale, JREG_S(8) + 0x800);
         }
     } else {
         i_this->field_0x840 = actor->current.pos;
@@ -1178,8 +1198,8 @@ static void action(e_sm2_class* i_this) {
         mDoMtx_stack_c::transM(0.0f, TREG_F(3), 100.0f + TREG_F(4));
         model->setBaseTRMtx(mDoMtx_stack_c::get());
 
-        sp58.set(0.0f, 60.0f + VREG_F(1), VREG_F(2));
-        mDoMtx_stack_c::multVec(&sp58, &i_this->field_0x708[0]);
+        work.set(0.0f, 60.0f + VREG_F(1), VREG_F(2));
+        mDoMtx_stack_c::multVec(&work, &i_this->field_0x708[0]);
 
         f32 btk_frame = 9.0f - (12.0f * (i_this->size - 0.25f));
         if (btk_frame < 0.0f) {
@@ -1216,7 +1236,7 @@ static void action(e_sm2_class* i_this) {
     static int cc_idx[] = {1, 3, 4, 6};
     static f32 cc_size[] = {0.7f, 1.0f, 1.0f, 0.7f};
 
-    static u16 key_eno[] = {0x827A, 0x827B};
+    static u16 key_eno[] = {dPa_RM(ID_ZM_S_KEYLIGHT00), dPa_RM(ID_ZM_S_KEYLIGHT01)};
 
     for (int i = 0; i < 4; i++) {
         if (i_this->type == TYPE_RARE) {
@@ -1379,7 +1399,12 @@ static int daE_SM2_IsDelete(e_sm2_class* i_this) {
 
 static int daE_SM2_Delete(e_sm2_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
-    fpc_ProcID id = fopAcM_GetID(actor);
+    fpc_ProcID id = fopAcM_GetID(&i_this->enemy);
+
+    #if DEBUG
+    l_HIO.removeHIO(i_this->enemy);
+    #endif
+    
     dComIfG_resDelete(&i_this->phase, "E_sm2");
 
     if (actor->heap != NULL) {
@@ -1433,7 +1458,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
 
 static int daE_SM2_Create(fopAc_ac_c* i_this) {
     e_sm2_class* a_this = (e_sm2_class*)i_this;
-    fopAcM_ct(i_this, e_sm2_class);
+    fopAcM_ct(&a_this->enemy, e_sm2_class);
 
     OS_REPORT("E_SM2//////////////E_SM2 SET 0 !!\n");
 
@@ -1500,8 +1525,7 @@ static int daE_SM2_Create(fopAc_ac_c* i_this) {
         }
 
         a_this->field_0x5b8 = i_this->home.angle.z & 0xFF;
-        i_this->shape_angle.z = 0;
-        i_this->current.angle.z = 0;
+        i_this->current.angle.z = i_this->shape_angle.z = 0;
         a_this->size = size_get(a_this->sizetype);
     
         OS_REPORT("E_SM2//////////////E_SM2 SET 1 !!\n");
@@ -1526,9 +1550,12 @@ static int daE_SM2_Create(fopAc_ac_c* i_this) {
             a_this->jnt_pos[i] = i_this->current.pos;
             a_this->field_0x6c8[i] = 1.0f;
         }
+        
+        #if DEBUG
+        l_HIO.entryHIO("スライム(豪華）");
+        #endif
 
-        i_this->health = 100;
-        i_this->field_0x560 = 100;
+        i_this->field_0x560 = i_this->health = 100;
 
         fopAcM_SetMtx(i_this, a_this->modelMorf->getModel()->getBaseTRMtx());
         fopAcM_SetMin(i_this, -1000.0f, -600.0f, -1000.0f);

src/d/actor/d_a_kago.cpp

@@ -522,7 +522,7 @@ void daKago_c::demo_skip(int param_0) {
         setPlayerRideOn();
         field_0x718 = field_0x71a = 0;
         /* dSv_event_flag_c::M_051 - Main Event - Shadow Kargorok (?) (Large) event complete (Horse grass appears in various places) */
-        dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[84]);
+        dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[84]);
         field_0x748 = 7;
         field_0x74c = NULL;
         break;

src/d/actor/d_a_kytag14.cpp

@@ -27,7 +27,7 @@ static int daKytag14_Execute(kytag14_class* i_this) {
     }
 
     if (i_this->mEventID1 != 0xFFFF) {
-        if (dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[i_this->mEventID1])) {
+        if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_this->mEventID1])) {
             event1_set = true;
         } else {
             event1_set = false;
@@ -35,7 +35,7 @@ static int daKytag14_Execute(kytag14_class* i_this) {
     }
 
     if (i_this->mEventID2 != 0xFFFF) {
-        if (!dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[i_this->mEventID2])) {
+        if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_this->mEventID2])) {
             event2_unset = true;
         } else {
             event2_unset = false;

src/d/actor/d_a_mg_rod.cpp

@@ -2570,7 +2570,7 @@ static void lure_catch(dmg_rod_class* i_this) {
     }
 
     if (i_this->play_cam_timer == 40) {
-        if (!dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[467])) {
+        if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[467])) {
             Z2GetAudioMgr()->subBgmStart(Z2BGM_FISHING_GET1);
         } else if (fish_kind == 3) {
             Z2GetAudioMgr()->subBgmStart(Z2BGM_FISHING_GET3);
@@ -2582,7 +2582,7 @@ static void lure_catch(dmg_rod_class* i_this) {
     } else if (i_this->play_cam_timer == 80) {
         u8 sp8 = 1;
         if (i_this->field_0x14c0 != 0) {
-            if (!dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[467])) {
+            if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[467])) {
                 sp8 = 2;
             } else if (fish_kind != 3) {
                 sp8 = 2;
@@ -2609,7 +2609,7 @@ static void lure_catch(dmg_rod_class* i_this) {
                 data_80450C9A = 200;
             }
 
-            dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[467]);
+            dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[467]);
 
             static u16 catch_msgn_20[] = {0x02CE, 0x02D1, 0x02CF, 0x02D0};
             static u16 catch_msgn_21[] = {0x02D2, 0x02D5, 0x02D3, 0x02D4};
@@ -4921,7 +4921,7 @@ static void play_camera(dmg_rod_class* i_this) {
                     i_this->msgflow.init(actor, 0x2C9, 0, NULL);
                     henna->field_0x6ba = 50;
                     henna->field_0x7b8 = 0;
-                } else if (!dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[467])) {
+                } else if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[467])) {
                     if (i_this->field_0x1470 == 0) {
                         sp174.x = -2800.0f;
                         sp174.z = 4608.0f;
@@ -4998,11 +4998,11 @@ static void play_camera(dmg_rod_class* i_this) {
             ) {
                 int sp20 = 0;
                 int sp1C = 1;
-                if (dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[466])) {
+                if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[466])) {
                     sp20 = 1;
                 }
 
-                if (dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[469])) {
+                if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[469])) {
                     sp1C = 0;
                 }
 
@@ -5195,7 +5195,7 @@ static void play_camera(dmg_rod_class* i_this) {
                 camera->mCamera.SetTrimSize(0);
                 i_this->play_cam_mode = 0;
                 i_this->field_0x146c = 30;
-                dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[466]);
+                dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[466]);
                 i_this->field_0xf81 = 1;
             }
         }

src/d/actor/d_a_npc.cpp

@@ -2897,15 +2897,15 @@ u8 daNpcT_getDistTableIdx(int param_0, int param_1) {
 }
 
 void daNpcT_onEvtBit(u32 i_no) {
-    dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[i_no]);
+    dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[i_no]);
 }
 
 void daNpcT_offEvtBit(u32 i_no) {
-    dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[i_no]);
+    dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[i_no]);
 }
 
 BOOL daNpcT_chkEvtBit(u32 i_no) {
-    return dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[i_no]);
+    return dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_no]);
 }
 
 void daNpcT_onTmpBit(u32 i_no) {

src/d/actor/d_a_npc4.cpp

@@ -1848,11 +1848,11 @@ s16 daNpcF_getGroundAngle(cBgS_PolyInfo* param_0, s16 param_1) {
 }
 
 BOOL daNpcF_chkEvtBit(u32 i_no) {
-    return dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[i_no]);
+    return dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_no]);
 }
 
 void daNpcF_onEvtBit(u32 i_no) {
-    dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[i_no]);
+    dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[i_no]);
 }
 
 BOOL daNpcF_chkTmpBit(u32 i_no) {

src/d/actor/d_a_npc_blue_ns.cpp

@@ -216,8 +216,7 @@ int daNpcBlueNS_c::Execute() {
     return 1;
 }
 
-// NONMATCHING - small regalloc
-int daNpcBlueNS_c::_Execute() {
+void daNpcBlueNS_c::_Execute() {
     setParam();
 
     if (main()) {
@@ -255,7 +254,10 @@ int daNpcBlueNS_c::_Execute() {
     field_0x9f3 = 0;
 
     for (int i = 0; i < 5; i++) {
-        if ((mAttnChangeTimer == 0 || mAttnIdx != i) && mAttnActorTimer[i] != 0 && cLib_calcTimer<int>(&mAttnActorTimer[i]) == 0) {
+        if (mAttnChangeTimer != 0 && mAttnIdx == i) {
+            continue;
+        }
+        if (mAttnActorTimer[i] != 0 && cLib_calcTimer<int>(&mAttnActorTimer[i]) == 0) {
             mAttnActor[i].remove();
         }
     }

src/d/actor/d_a_npc_chat.cpp

@@ -2383,7 +2383,7 @@ int daNpcChat_c::getObjNum() {
         }
 
         // dSv_event_flag_c::F_0281 - Shop - Malo Mart opens in Castle Town
-        if (dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[281]) &&
+        if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[281]) &&
             objNum == OBJ_CELEB_BAG_M) {
             objNum = OBJ_MARO_BAG_M;
         }
@@ -2427,7 +2427,7 @@ int daNpcChat_c::getObjNum() {
         }
 
         // dSv_event_flag_c::F_0281 - Shop - Malo Mart opens in Castle Town
-        if (dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[281]) &&
+        if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[281]) &&
             objNum == OBJ_CELEB_BAG_W) {
             objNum = OBJ_MARO_BAG_W;
         }

src/d/actor/d_a_npc_henna.cpp

@@ -379,7 +379,7 @@ static void henna_shop(npc_henna_class* i_this) {
     }
     cLib_addCalcAngleS2(&i_this->actor.current.angle.y, i_this->field_0x618, 2, unkInt1);
     /* dSv_event_flag_c::F_0461 - Fishing Pond - First time entered fishing house */
-    if ((!dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[461]) || data_80450C9C != 0) &&
+    if ((!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[461]) || data_80450C9C != 0) &&
         i_this->field_0x7d7 == 0 && i_this->field_0x6a0 == 56 + TREG_S(7))
     {
         dComIfGp_event_reset();
@@ -388,7 +388,7 @@ static void henna_shop(npc_henna_class* i_this) {
             i_this->cam_mode = 60;
         } else {
             /* dSv_event_flag_c::F_0461 - Fishing Pond - First time entered fishing house */
-            dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[461]);
+            dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[461]);
             i_this->cam_mode = 1;
         }
         i_this->field_0x7d7 = 1;
@@ -890,9 +890,9 @@ static void demo_camera(npc_henna_class* i_this) {
                 i_this->cam_mode = 0;
             }
             /* dSv_event_flag_c::F_0463 - Fishing Pond - Reserved for fishing */
-            dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[0x1cf]);
+            dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[0x1cf]);
             /* dSv_event_flag_c::F_0464 - Fishing Pond - Reserved for fishing */
-            dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[0x1d0]);
+            dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[0x1d0]);
         }
     }
 
@@ -994,7 +994,7 @@ static void demo_camera_shop(npc_henna_class* i_this) {
 
     if (!dComIfGp_event_runCheck()
             /* dSv_event_flag_c::F_0465 - Fishing Pond - Reserved for fishing */
-        && !dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[0x1d1]))
+        && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x1d1]))
     {
         i_this->field_0x756++;
         if (i_this->field_0x756 < 200) {
@@ -2728,9 +2728,9 @@ static int daNpc_Henna_Create(fopAc_ac_c* i_this) {
                 }
             }
             /* dSv_event_flag_c::F_0463 - Fishing Pond - Reserved for fishing */
-            dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[0x1cf]);
+            dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[0x1cf]);
             /* dSv_event_flag_c::F_0464 - Fishing Pond - Reserved for fishing */
-            dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[0x1d0]);
+            dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[0x1d0]);
             a_this->field_0x618 = i_this->shape_angle.y = i_this->current.angle.y = newAngle;
             lbl_82_bss_91 = dComIfGs_getEventReg(0xf63f);
             daNpc_Henna_Execute(a_this);
@@ -2775,7 +2775,7 @@ static int daNpc_Henna_Create(fopAc_ac_c* i_this) {
                               NULL, -1);
                 data_80450C99 = 0;
                 /* dSv_event_flag_c::F_0463 - Fishing Pond - Reserved for fishing */
-                if (!dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[0x1cf])) {
+                if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x1cf])) {
                     a_this->field_0x70a = 4;
                     a_this->field_0x734 = 1;
                 } else {

src/d/actor/d_a_npc_ks.cpp

@@ -5818,7 +5818,7 @@ static int npc_ks_fsdemo(npc_ks_class* i_this) {
 
     switch (i_this->mMode) {
         case 0:
-            if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x220] & 0xFFFF)) {
+            if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x220])) {
                 i_this->mMode = 40;
             } else {
                 fpcM_Search(s_fs_sub, i_this);
@@ -6628,7 +6628,7 @@ static void kantera_sub(npc_ks_class* i_this) {
             fopAcM_cancelCarryNow(a_this);
             cLib_offBit<u32>(a_this->attention_info.flags, fopAc_AttnFlag_CARRY_e);
             i_this->field_0xc17 = 0;
-            dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[0xE2] & 0xFFFF);
+            dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[0xE2]);
         } else {
             i_this->field_0xc04.x = -30715.0f + AREG_F(8);
             i_this->field_0xc04.z = -17200.0f + AREG_F(9);
@@ -7260,7 +7260,7 @@ static BOOL start_check(npc_ks_class* i_this) {
             break;
 
         case 21:
-            if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x20A] & 0xFFFF)) {
+            if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x20A])) {
                 rv = FALSE;
             } else {
                 i_this->mActionID = 301;
@@ -7268,7 +7268,7 @@ static BOOL start_check(npc_ks_class* i_this) {
             break;
 
         case 22:
-            if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x241] & 0xFFFF)) {
+            if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x241])) {
                 rv = FALSE;
             } else {
                 i_this->mActionID = 302;

src/d/actor/d_a_obj_ihasi.cpp

@@ -83,7 +83,7 @@ static int daObj_Ihasi_Execute(obj_ihasi_class* i_this) {
         dComIfG_Bgsp().Release(i_this->mpBgW);
         i_this->mpBgW = NULL;
         /* dSv_event_flag_c::M_050 - Main Event - Eldin Bridge disappears */
-        dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[0x53]);
+        dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[0x53]);
     }
 
     action(i_this);
@@ -162,7 +162,7 @@ static int daObj_Ihasi_Create(fopAc_ac_c* i_actor) {
         csXyz angle;
 
         /* dSv_event_flag_c::M_050 - Main Event - Eldin Bridge disappears */
-        if (dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[0x53])) {
+        if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x53])) {
             angle.set(0x0, -0x8000, 0x0);
             pos.set(34750.0f, -300.0f, -44000.0f);
 

src/d/actor/d_a_obj_kamakiri.cpp

@@ -734,9 +734,9 @@ u8 daObjKAM_c::CreateChk() {
     if (field_0x9c0 != 2) {
         if (unkInt1 != 0) {
             if (!dComIfGs_isEventBit(
-                    (u16)dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_MALE]]) ||
+                    dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_MALE]]) ||
                 !dComIfGs_isEventBit(
-                    (u16)dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_FEMALE]]))
+                    dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_FEMALE]]))
             {
                 return 0;
             }
@@ -750,10 +750,10 @@ u8 daObjKAM_c::CreateChk() {
 
                 if (mSex == SEX_MALE &&
                         !dComIfGs_isEventBit(
-                            (u16)dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]]) ||
+                            dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]]) ||
                     mSex == SEX_FEMALE &&
                         !dComIfGs_isEventBit(
-                            (u16)dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]]))
+                            dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]]))
                 {
                     return 0;
                 }

src/d/actor/d_a_obj_katatsumuri.cpp

@@ -665,10 +665,10 @@ bool daObjKAT_c::CreateChk() {
     }
     if (field_0x808 != 2) {
         if (uVar4) {
-            if (dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_MALE]]) ==
+            if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_MALE]]) ==
                     0 ||
                 dComIfGs_isEventBit(
-                    (u16)dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_FEMALE]]) == 0)
+                    dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_FEMALE]]) == 0)
             {
                 return false;
             }
@@ -681,10 +681,10 @@ bool daObjKAT_c::CreateChk() {
                 }
                 if ((mSex == SEX_MALE &&
                      dComIfGs_isEventBit(
-                         (u16)dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]]) == 0) ||
+                         dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]]) == 0) ||
                     (mSex == SEX_FEMALE &&
                      dComIfGs_isEventBit(
-                         (u16)dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]]) == 0))
+                         dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]]) == 0))
                 {
                     return false;
                 }

src/d/actor/d_a_obj_volcbom.cpp

@@ -592,7 +592,7 @@ void daObjVolcBom_c::actionWait() {
     if (checkTalkDistance()
            /* dSv_event_flag_c::M_051 - Main Event - Shadow Kargorok (?) (Large) event complete 
                                                      (Horse grass appears in various places) */
-        && dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[84])) {
+        && dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[84])) {
         setAction(ACTION_ORDER_EVENT);
         actionOrderEvent();
     }

src/d/actor/d_a_player.cpp

@@ -517,7 +517,7 @@ bool daPy_py_c::checkBoomerangCharge() {
     return daAlink_getAlinkActorClass()->checkBoomerangChargeEnd();
 }
 
-u8 daPy_py_c::checkBoomerangChargeTime() {
+bool daPy_py_c::checkBoomerangChargeTime() {
     return 0;
 }
 

src/d/actor/d_a_scene_exit.cpp

@@ -22,12 +22,12 @@ int daScex_c::checkWork() {
     }
 
     u16 eventBit = getOffEventBit();
-    if (eventBit != 0x0FFF && dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[eventBit])) {
+    if (eventBit != 0x0FFF && dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[eventBit])) {
         return 0;
     }
 
     eventBit = getOnEventBit();
-    if (eventBit != 0x0FFF && !dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[eventBit])) {
+    if (eventBit != 0x0FFF && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[eventBit])) {
         return 0;
     }
 

src/d/d_bg_w_kcol.cpp

@@ -364,15 +364,15 @@ bool dBgWKCol::LineCheck(cBgS_LinChk* plinchk) {
                                               ((u32)y_sp3C >> shift) << m_pkc_head->m_area_x_blocks_shift |
                                                (u32)x_sp38 >> shift) << 2;
 
-                                while ((offset = *(int*)((int)block + offset)) >= 0) {
-                                    block = (u16*)((int)block + offset);
+                                while ((offset = *(int*)((intptr_t)block + offset)) >= 0) {
+                                    block = (u16*)((intptr_t)block + offset);
                                     shift--;
                                     offset = (((u32)z_sp40 >> shift & 1) << 2 |
                                               ((u32)y_sp3C >> shift & 1) << 1 |
                                               ((u32)x_sp38 >> shift & 1) << 0) << 2;
                                 }
 
-                                u16* sp28 = (u16*)((int)block + (offset & 0x7FFFFFFF));
+                                u16* sp28 = (u16*)((intptr_t)block + (offset & 0x7FFFFFFF));
 
                                 shift = 1 << shift;
                                 int cellSize = shift - 1;
@@ -927,15 +927,15 @@ void dBgWKCol::CaptPoly(dBgS_CaptPoly& i_captpoly) {
                                 4 * (((u32)sp24 >> r29) << m_pkc_head->m_area_xy_blocks_shift |
                                      ((u32)sp20 >> r29) << m_pkc_head->m_area_x_blocks_shift |
                                       (u32)sp1C >> r29);
-                            while ((sp14 = (*(int*)((int)sp18 + sp14))) >= 0) {
-                                sp18 = (u16*)((int)sp18 + sp14);
+                            while ((sp14 = (*(int*)((intptr_t)sp18 + sp14))) >= 0) {
+                                sp18 = (u16*)((intptr_t)sp18 + sp14);
                                 r29--;
                                 sp14 = (((u32)sp24 >> r29 & 1) << 2 |
                                         ((u32)sp20 >> r29 & 1) << 1 |
                                         ((u32)sp1C >> r29 & 1) << 0) << 2;
                             }
 
-                            u16* r28 = (u16*)((int)sp18 + (sp14 & 0x7FFFFFFF));
+                            u16* r28 = (u16*)((intptr_t)sp18 + (sp14 & 0x7FFFFFFF));
 
                             r29 = 1 << r29;
                             int sp10 = r29 - 1;
@@ -1098,8 +1098,8 @@ bool dBgWKCol::WallCorrectSort(dBgS_Acch* pwi) {
                     ((u32)sp_e0 >> shift_d0) << m_pkc_head->m_area_xy_blocks_shift |
                     ((u32)sp_dc >> shift_d0) << m_pkc_head->m_area_x_blocks_shift |
                     ((u32)sp_d8 >> shift_d0));
-                while ((sp_cc = *(int*)((int)block_d4 + sp_cc)) >= 0) {
-                    block_d4 = (u16*)((int)block_d4 + sp_cc);
+                while ((sp_cc = *(int*)((intptr_t)block_d4 + sp_cc)) >= 0) {
+                    block_d4 = (u16*)((intptr_t)block_d4 + sp_cc);
                     shift_d0--;
                     sp_cc = 4 * (
                         ((((u32)sp_e0 >> shift_d0) & 1) << 2) |
@@ -1107,7 +1107,7 @@ bool dBgWKCol::WallCorrectSort(dBgS_Acch* pwi) {
                         ((((u32)sp_d8 >> shift_d0) & 1) << 0)
                     );
                 }
-                u16* sp_c8 = (u16*)((int)block_d4 + (sp_cc & 0x7fffffff));
+                u16* sp_c8 = (u16*)((intptr_t)block_d4 + (sp_cc & 0x7fffffff));
                 shift_d0 = 1 << shift_d0;
                 int sp_c4 = shift_d0 - 1;
                 sp_108 = shift_d0 - (sp_d8 & sp_c4);
@@ -1556,15 +1556,15 @@ bool dBgWKCol::WallCorrect(dBgS_Acch* pwi) {
                          ((u32)spB8 >> spAC) << m_pkc_head->m_area_x_blocks_shift |
                           (u32)spB4 >> spAC);
 
-                while ((spA8 = *(int*)((int)spB0 + spA8)) >= 0) {
-                    spB0 = (u16*)((int)spB0 + spA8);
+                while ((spA8 = *(int*)((intptr_t)spB0 + spA8)) >= 0) {
+                    spB0 = (u16*)((intptr_t)spB0 + spA8);
                     spAC--;
                     spA8 = ((((u32)spBC >> spAC) & 1) << 2 |
                             (((u32)spB8 >> spAC) & 1) << 1 |
                             (((u32)spB4 >> spAC) & 1) << 0) * 4;
                 }
 
-                u16* spA4 = (u16*)((int)spB0 + (spA8 & 0x7FFFFFFF));
+                u16* spA4 = (u16*)((intptr_t)spB0 + (spA8 & 0x7FFFFFFF));
                 spAC = 1 << spAC;
                 u32 spA0 = spAC - 1;
                 spDC = spAC - (spB4 & spA0);
@@ -2012,8 +2012,8 @@ bool dBgWKCol::SplGrpChk(dBgS_SplGrpChk* param_0) {
         int sp20 = 4 * (((u32)sp34 >> sp24) << m_pkc_head->m_area_xy_blocks_shift |
                         ((u32)sp2C >> sp24) << m_pkc_head->m_area_x_blocks_shift |
                          (u32)sp38 >> sp24);
-        while ((sp20 = *(int*)((int)sp28 + sp20)) >= 0) {
-            sp28 = ((int)sp28 + sp20);
+        while ((sp20 = *(int*)((intptr_t)sp28 + sp20)) >= 0) {
+            sp28 = ((intptr_t)sp28 + sp20);
             sp24--;
             sp20 = 4 *
                 (((u32)sp34 >> sp24 & 1) << 2 |
@@ -2172,15 +2172,15 @@ bool dBgWKCol::SphChk(dBgS_SphChk* param_0, void* param_1) {
                 int sp1C = (((u32)sp2C >> var_r29 << m_pkc_head->m_area_xy_blocks_shift) |
                             ((u32)sp28 >> var_r29 << m_pkc_head->m_area_x_blocks_shift) |
                             ((u32)sp24 >> var_r29)) * 4;
-                while ((sp1C = *(int*)((int)sp20 + sp1C)) >= 0) {
-                    sp20 = (u16*)((int)sp20 + sp1C);
+                while ((sp1C = *(int*)((intptr_t)sp20 + sp1C)) >= 0) {
+                    sp20 = (u16*)((intptr_t)sp20 + sp1C);
                     var_r29--;
                     sp1C = (((u32)sp2C >> var_r29 & 1) << 2 |
                             ((u32)sp28 >> var_r29 & 1) << 1 |
                             ((u32)sp24 >> var_r29 & 1)) * 4;
                 }
 
-                u16* var_r28 = (u16*)((int)sp20 + (sp1C & 0x7fffffff));
+                u16* var_r28 = (u16*)((intptr_t)sp20 + (sp1C & 0x7fffffff));
                 var_r29 = 1 << var_r29;
                 int sp18 = var_r29 - 1;
                 sp4C = var_r29 - (sp24 & sp18);

src/d/d_kankyo.cpp

@@ -1,7 +1,7 @@
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_kankyo.h"
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/gf/GFPixel.h>
 
 #include "JSystem/JHostIO/JORFile.h"
@@ -8669,8 +8669,8 @@ static int dKy_Create(void* i_this) {
 
     #if DEBUG
     if (strcmp(dComIfGp_getStartStageName(), "T_SASA0") == 0) {
-        dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[142]);
-        dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[167]);
+        dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[142]);
+        dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[167]);
     }
     #endif
 

src/d/d_kankyo_debug.cpp

@@ -689,9 +689,11 @@ void dKydb_timedisp() {
         }
     }
 
+#if __MWERKS__ || DEBUG
     if (g_presetHIO.field_0x2716 != 0) {
         dDbVw_Report(0x1E, 0x55, "JYOKYO FILE YOMIKOMI SIPPAI!");
     }
+#endif
 
     int var_r31 = 0x55;
     if ((g_kankyoHIO.navy.field_0x22a & 1)) {

src/d/d_map_path_dmap.cpp

@@ -422,7 +422,7 @@ int dMpath_c::setPointer(dDrawPath_c::room_class* i_room, s8* param_1, s8* param
     i_room->mpFloatData = (f32*)((uintptr_t)i_room + (uintptr_t)i_room->mpFloatData);
 
     dDrawPath_c::floor_class* floor_p = i_room->mpFloor;
-    int room = (int)i_room;
+    int room = (intptr_t)i_room;
     for (int i = 0; i < i_room->mFloorNum; i++) {
         floor_p->mpGroup = (dDrawPath_c::group_class*)(room + (uintptr_t)floor_p->mpGroup);
 

src/d/d_menu_fmap.cpp

@@ -105,7 +105,7 @@ const char* dMenuFmap_getStartStageName(void* i_fieldData) {
     stage_stag_info_class* stag_info = dComIfGp_getStage()->getStagInfo();
     if (dStage_stagInfo_GetUpButton(stag_info) == 5) {
         dMenu_Fmap_virtual_stage_data_c* data_list = (dMenu_Fmap_virtual_stage_data_c*)
-                ((int)i_fieldData + ((dMenu_Fmap_field_data_c*)i_fieldData)->mVirtualStageOffset);
+                ((intptr_t)i_fieldData + ((dMenu_Fmap_field_data_c*)i_fieldData)->mVirtualStageOffset);
         dMenu_Fmap_virtual_stage_data_c::data* data = data_list->mData;
         for (int i = 0; i < data_list->mCount; i++) {
             if (!strcmp(dComIfGp_getStartStageName(), data[i].mStageName)) {
@@ -1801,7 +1801,7 @@ bool dMenu_Fmap_c::isRoomCheck(int i_stageNo, int i_roomNo) {
     }
 
     dMenuMapCommon_c::Stage_c* stage_data
-        = (dMenuMapCommon_c::Stage_c*)((int)mpFieldDat + mpFieldDat->mStageDataOffset);
+        = (dMenuMapCommon_c::Stage_c*)((intptr_t)mpFieldDat + mpFieldDat->mStageDataOffset);
     dMenuMapCommon_c::Stage_c::data* stages = stage_data->mData;
     u8 stage_no = 0;
     int i = 0;
@@ -1890,7 +1890,7 @@ bool dMenu_Fmap_c::isRoomCheck(int i_stageNo, int i_roomNo) {
 
 u16 dMenu_Fmap_c::checkStRoomData() {
     dMenu_Fmap_field_room_data_c* room_data
-        = (dMenu_Fmap_field_room_data_c*)((int)mpFieldDat + mpFieldDat->mRoomDataOffset);
+        = (dMenu_Fmap_field_room_data_c*)((intptr_t)mpFieldDat + mpFieldDat->mRoomDataOffset);
     dMenu_Fmap_field_room_data_c::data* data = room_data->mData;
     int count = room_data->mCount;
     for (int i = 0; i < count; i++) {
@@ -1909,7 +1909,7 @@ u16 dMenu_Fmap_c::checkStRoomData() {
             }
         }
 
-        data = (dMenu_Fmap_field_room_data_c::data*)((int)data + offset);
+        data = (dMenu_Fmap_field_room_data_c::data*)((intptr_t)data + offset);
     }
 
     mFlashRoomCount = 0;
@@ -2010,7 +2010,7 @@ bool dMenu_Fmap_c::readAreaData(u8 i_regionNo, bool i_isSelectedRegion) {
     char tmp_stage_name[8];
 
     dMenuMapCommon_c::Stage_c::data* stages
-        = ((dMenuMapCommon_c::Stage_c*)((int)mpFieldDat + mpFieldDat->mStageDataOffset))->mData;
+        = ((dMenuMapCommon_c::Stage_c*)((intptr_t)mpFieldDat + mpFieldDat->mStageDataOffset))->mData;
     u8 stage_no = 0;
     dMenu_Fmap_stage_data_c* prev_stage_data = NULL;
     dMenuMapCommon_c::RoomData_c* prev_room_data = NULL;
@@ -2254,7 +2254,7 @@ bool dMenu_Fmap_c::readFieldMapData(void** o_data, char const* i_path, bool para
 }
 
 void dMenu_Fmap_c::decodeFieldMapData() {
-    int field_data = (int)mpFieldDat;
+    int field_data = (intptr_t)mpFieldDat;
     dMenu_Fmap_field_region_data_c* region_data
         = (dMenu_Fmap_field_region_data_c*)(field_data + mpFieldDat->mRegionDataOffset);
     dMenuMapCommon_c::Stage_c* stage_data
@@ -2682,7 +2682,7 @@ void dMenu_Fmap_c::drawPortalIcon() {
 u8 dMenu_Fmap_c::getRegionStageNum(int param_0) {
     if (mpFieldDat != NULL) {
         dMenu_Fmap_field_region_data_c* region_data
-            = (dMenu_Fmap_field_region_data_c*)((int)mpFieldDat + mpFieldDat->mRegionDataOffset);
+            = (dMenu_Fmap_field_region_data_c*)((intptr_t)mpFieldDat + mpFieldDat->mRegionDataOffset);
         dMenu_Fmap_field_region_data_c::data* regions = region_data->mData;
         for (int i = 0; i < region_data->mCount; i++) {
             if (param_0 == regions[i].mTextureReadNum) {

src/d/d_menu_save.cpp

@@ -926,7 +926,7 @@ void dMenu_save_c::memCardCheck() {
             field_0x1c0 = 0;
             errDispInitSet(0x3B4);  // There is Insufficient space on the Memory Card in Slot A.
             field_0x9e = 0;
-            mpErrFunc = &iplSelMsgInitSet;
+            mpErrFunc = &dMenu_save_c::iplSelMsgInitSet;
             mErrProc = PROC_IPL_SELECT_DISP1;
             field_0x1b4 = 9;
             break;
@@ -938,7 +938,7 @@ void dMenu_save_c::memCardCheck() {
             field_0x1c0 = 0;
             errDispInitSet(0x3C4);  // There is no save for this game on the Memory Card in Slot A.
             field_0x9e = 0;
-            mpErrFunc = &gameFileMakeSelInitSet;
+            mpErrFunc = &dMenu_save_c::gameFileMakeSelInitSet;
             mErrProc = PROC_MAKE_GAME_FILE_SEL_DISP;
             field_0x1b4 = 9;
             break;
@@ -1048,7 +1048,7 @@ void dMenu_save_c::iplSelInitSet() {
 
 void dMenu_save_c::IPLSelectDisp1() {
     if (errorTxtChangeAnm() == true) {
-        mpErrFunc = &iplSelInitSet;
+        mpErrFunc = &dMenu_save_c::iplSelInitSet;
         mErrProc = PROC_IPL_SELECT_DISP2;
         mMenuProc = PROC_MEMCARD_ERRMSG_WAIT_KEY;
     }

src/d/d_meter2_info.cpp

@@ -1414,7 +1414,7 @@ const char* dMeter2Info_getPlusTextureName() {
     return tex_name;
 }
 
-bool dMeter2Info_getPixel(f32 i_posX, f32 i_posY, f32 param_2, f32 param_3, f32 i_sizeX,
+u8 dMeter2Info_getPixel(f32 i_posX, f32 i_posY, f32 param_2, f32 param_3, f32 i_sizeX,
                           f32 i_sizeY, ResTIMG const* i_resTimg) {
     f32 temp_f31 = i_posX - param_2;
     f32 temp_f30 = i_posY - param_3;
@@ -1442,7 +1442,7 @@ bool dMeter2Info_getPixel(f32 i_posX, f32 i_posY, f32 param_2, f32 param_3, f32
         return 1;
     }
 
-    return var_r24 & 0x7000;
+    return (var_r24 & 0x7000) != 0;
 }
 
 void dMeter2Info_setCloth(u8 i_clothId, bool i_offItemBit) {

src/d/d_model.cpp

@@ -15,8 +15,8 @@ void dMdl_c::draw() {
     mpModelData->getMaterialNodePointer(mMaterialId)->loadSharedDL();
     shape->loadPreDrawSetting();
 
-    GXColor amb_color = {mpTevstr->AmbCol.r, mpTevstr->AmbCol.g, mpTevstr->AmbCol.b,
-                         mpTevstr->AmbCol.a};
+    GXColor amb_color = {(u8)mpTevstr->AmbCol.r, (u8)mpTevstr->AmbCol.g, (u8)mpTevstr->AmbCol.b,
+                         (u8)mpTevstr->AmbCol.a};
     GXSetChanAmbColor(GX_COLOR0A0, amb_color);
     GXSetChanMatColor(GX_COLOR0A0, g_whiteColor);
     dKy_setLight_nowroom_actor(mpTevstr);

src/d/d_msg_flow.cpp

@@ -767,7 +767,7 @@ void dMsgFlow_c::dbgPrint() {}
 
 u16 dMsgFlow_c::query001(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const u16 prm0 = i_flowNode_p->param;
-    u16 ret = dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[prm0]) == false;
+    u16 ret = dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[prm0]) == false;
 
     if (param_2 != 0) {
         // "Flag Check"
@@ -1753,11 +1753,11 @@ int dMsgFlow_c::event000(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     OS_REPORT("flow:%d, prm0:%d, prm1:%d\n", mFlow, prm0, prm1);
 
     if (prm0 != 0) {
-        dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[prm0]);
+        dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[prm0]);
     }
 
     if (prm1 != 0) {
-        dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[prm1]);
+        dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[prm1]);
     }
 
     return 1;
@@ -1772,11 +1772,11 @@ int dMsgFlow_c::event001(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     OS_REPORT("flow:%d, prm0:%d, prm1:%d\n", mFlow, prm0, prm1);
 
     if (prm0 != 0) {
-        dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[prm0]);
+        dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[prm0]);
     }
 
     if (prm1 != 0) {
-        dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[prm1]);
+        dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[prm1]);
     }
 
     return 1;

src/d/d_name.cpp

@@ -467,7 +467,7 @@ void dName_c::MojiSelectAnm3() {}
 
 int dName_c::mojiChange(u8 idx) {
     if (mChrInfo[idx].field_0x3 == 0 || mChrInfo[idx].mMojiSet == MOJI_EIGO ||
-        mChrInfo[idx].mCharacter == '　')
+        mChrInfo[idx].mCharacter == SJIS('　', 0x8140U))
     {
         return 0;
     }
@@ -481,20 +481,20 @@ int dName_c::mojiChange(u8 idx) {
     switch (mChrInfo[idx].mColumn) {
     case 0:
     case 10: {
-        if (mChrInfo[idx].mCharacter == 'ウ' || mChrInfo[idx].mCharacter == 'ゥ' ||
-            mChrInfo[idx].mCharacter == 'ヴ')
+        if (mChrInfo[idx].mCharacter == SJIS('ウ', 0x8345U) || mChrInfo[idx].mCharacter == SJIS('ゥ', 0x8344U) ||
+            mChrInfo[idx].mCharacter == SJIS('ヴ', 0x8394U))
         {
             mChrInfo[idx].mCharacter++;
 
-            if (mChrInfo[idx].mCharacter == 'ェ') {
-                mChrInfo[idx].mCharacter = 'ヴ';
+            if (mChrInfo[idx].mCharacter == SJIS('ェ', 0x8346U)) {
+                mChrInfo[idx].mCharacter = SJIS('ヴ', 0x8394U);
             }
 
-            if (mChrInfo[idx].mCharacter == 'ヵ') {
-                mChrInfo[idx].mCharacter = 'ゥ';
+            if (mChrInfo[idx].mCharacter == SJIS('ヵ', 0x8395U)) {
+                mChrInfo[idx].mCharacter = SJIS('ゥ', 0x8344U);
             }
         } else {
-            int c = mChrInfo[idx].mMojiSet != MOJI_HIRA ? 'ァ' : 'ぁ';
+            int c = mChrInfo[idx].mMojiSet != MOJI_HIRA ? SJIS('ァ', 0x8340U) : SJIS('ぁ', 0x829fU);
 
             if ((mChrInfo[idx].mCharacter - c) % 2) {
                 --mChrInfo[idx].mCharacter;
@@ -505,7 +505,7 @@ int dName_c::mojiChange(u8 idx) {
         break;
     }
     case 1: {
-        int c = mChrInfo[idx].mMojiSet != MOJI_HIRA ? 'カ' : 'か';
+        int c = mChrInfo[idx].mMojiSet != MOJI_HIRA ? SJIS('カ', 0x834aU) : SJIS('か', 0x82a9U);
         c = ((mChrInfo[idx].mCharacter - c) % 2);
 
         int c2 = c + 1;
@@ -513,7 +513,7 @@ int dName_c::mojiChange(u8 idx) {
         break;
     }
     case 2: {
-        int c = mChrInfo[idx].mMojiSet != MOJI_HIRA ? 'サ' : 'さ';
+        int c = mChrInfo[idx].mMojiSet != MOJI_HIRA ? SJIS('サ', 0x8354U) : SJIS('さ', 0x82b3U);
         c = ((mChrInfo[idx].mCharacter - c) % 2);
 
         int c2 = c + 1;
@@ -523,24 +523,24 @@ int dName_c::mojiChange(u8 idx) {
     case 3:
     case 12: {
         if (mChrInfo[idx].mCharacter != (u32)0x815b) {
-            if (mChrInfo[idx].mCharacter <= (mChrInfo[idx].mMojiSet != MOJI_HIRA ? 'ヂ' : 'ぢ')) {
-                int c = mChrInfo[idx].mMojiSet != MOJI_HIRA ? 'タ' : 'た';
+            if (mChrInfo[idx].mCharacter <= (mChrInfo[idx].mMojiSet != MOJI_HIRA ? SJIS('ヂ', 0x8361U) : SJIS('ぢ', 0x82c0U))) {
+                int c = mChrInfo[idx].mMojiSet != MOJI_HIRA ? SJIS('タ', 0x835eU) : SJIS('た', 0x82bdU);
                 c = ((mChrInfo[idx].mCharacter - c) % 2);
 
                 int c2 = c + 1;
                 mChrInfo[idx].mCharacter = (mChrInfo[idx].mCharacter - c) + (c2 & 1);
             } else if (mChrInfo[idx].mCharacter <=
-                           (mChrInfo[idx].mMojiSet != MOJI_HIRA ? 'ド' : 'ど') &&
+                           (mChrInfo[idx].mMojiSet != MOJI_HIRA ? SJIS('ド', 0x8368U) : SJIS('ど', 0x82c7U)) &&
                        mChrInfo[idx].mCharacter >=
-                           (mChrInfo[idx].mMojiSet != MOJI_HIRA ? 'テ' : 'て'))
+                           (mChrInfo[idx].mMojiSet != MOJI_HIRA ? SJIS('テ', 0x8365U) : SJIS('て', 0x82c4U)))
             {
-                int c = mChrInfo[idx].mMojiSet != MOJI_HIRA ? 'テ' : 'て';
+                int c = mChrInfo[idx].mMojiSet != MOJI_HIRA ? SJIS('テ', 0x8365U) : SJIS('て', 0x82c4U);
                 c = ((mChrInfo[idx].mCharacter - c) % 2);
 
                 int c2 = c + 1;
                 mChrInfo[idx].mCharacter = (mChrInfo[idx].mCharacter - c) + (c2 & 1);
             } else {
-                int c = mChrInfo[idx].mMojiSet != MOJI_HIRA ? 'ッ' : 'っ';
+                int c = mChrInfo[idx].mMojiSet != MOJI_HIRA ? SJIS('ッ', 0x8362U) : SJIS('っ', 0x82c1U);
                 int c2 = (mChrInfo[idx].mCharacter - c) % 3;
 
                 int ivar2 = c2 + 1;
@@ -554,7 +554,7 @@ int dName_c::mojiChange(u8 idx) {
         break;
     }
     case 5: {
-        int c = mChrInfo[idx].mMojiSet != MOJI_HIRA ? 'ハ' : 'は';
+        int c = mChrInfo[idx].mMojiSet != MOJI_HIRA ? SJIS('ハ', 0x836eU) : SJIS('は', 0x82cdU);
         int c2 = (mChrInfo[idx].mCharacter - c) % 3;
 
         int ivar2 = c2 + 1;
@@ -567,7 +567,7 @@ int dName_c::mojiChange(u8 idx) {
     }
     case 7:
     case 11: {
-        int c = mChrInfo[idx].mMojiSet != MOJI_HIRA ? 'ャ' : 'ゃ';
+        int c = mChrInfo[idx].mMojiSet != MOJI_HIRA ? SJIS('ャ', 0x8383U) : SJIS('ゃ', 0x82e1U);
         c = ((mChrInfo[idx].mCharacter - c) % 2);
 
         int c2 = c + 1;

src/d/d_s_menu.cpp

@@ -766,7 +766,7 @@ int toGameScene(dScnMenu_c* i_this) {
         /* Main Event - Get shadow crystal (can now transform) */
         dComIfGs_offEventBit(dSv_event_flag_c::M_077);
         /* dSv_event_flag_c::F_0550 - Main Event - Gain ability to use sense */
-        dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[550]);
+        dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[550]);
         /* Secret techniques - Obtained 1 secret techinques - Shield attack */
         dComIfGs_offEventBit(dSv_event_flag_c::F_0338);
         rt = fopScnM_ChangeReq(i_this, PROC_PLAY_SCENE, 0, 5);
@@ -909,7 +909,7 @@ void setEnvData(menu_data_class* i_data) {
 
                 label_no = atoi(string);
                 if (label_no >= 0 && label_no <= 999) {
-                    dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[label_no]);
+                    dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[label_no]);
                 }
 
                 if (i_data->env_data[i] != '+') {
@@ -944,7 +944,7 @@ void setEnvData(menu_data_class* i_data) {
 
                 label_no = atoi(string);
                 if (label_no >= 0 && label_no <= 999) {
-                    dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[label_no]);
+                    dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[label_no]);
                 }
 
                 if (i_data->env_data[i] != '+') {
@@ -1636,7 +1636,7 @@ int phase_2(dScnMenu_c* i_this) {
     /* Main Event - when OFF, wolf carries sword and shield on back */
     dComIfGs_onEventBit(dSv_event_flag_c::M_068);
     /* dSv_event_flag_c::F_0550 - Main Event - Gain ability to use sense */
-    dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[550]);
+    dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[550]);
     return cPhs_COMPLEATE_e;
 }
 

src/d/d_save.cpp

@@ -1708,14 +1708,14 @@ int dSv_info_c::memory_to_card(char* card_ptr, int dataNum) {
     #endif
     
     // If haven't gotten then lantern back from the monkey
-    if (!dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[226])) {
+    if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[226])) {
         // Store whether or not it's stolen and dropped
-        lantern_dropped = dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[224]);
-        lantern_stolen = dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[225]);
+        lantern_dropped = dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[224]);
+        lantern_stolen = dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[225]);
 
         // Then turn those events off
-        dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[224]);
-        dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[225]);
+        dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[224]);
+        dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[225]);
 
         // Used to turn events back on later
         lantern_not_recovered = true;
@@ -1765,10 +1765,10 @@ int dSv_info_c::memory_to_card(char* card_ptr, int dataNum) {
     // Now that we've saved, reset events if needed
     if (lantern_not_recovered == true) {
         if (lantern_dropped) {
-            dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[224]);
+            dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[224]);
         }
         if (lantern_stolen) {
-            dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[225]);
+            dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[225]);
         }
     }
 
@@ -2014,7 +2014,12 @@ BOOL flagFile_c::check_flag(u16 i_flag) {
 #if VERSION > VERSION_GCN_JPN
 const
 #endif
-u16 dSv_event_flag_c::saveBitLabels[822] = {
+#if PLATFORM_SHIELD
+s16
+#else
+u16
+#endif
+dSv_event_flag_c::saveBitLabels[822] = {
     UNUSED, TEST_001, TEST_002, TEST_003, TEST_004, F_0001, F_0002, F_0003, F_0004, F_0005, F_0006, 
     F_0007, F_0008, F_0009, F_0010, F_0011, F_0012, F_0013, F_0014, F_0015, F_0016, F_0017, F_0018, 
     F_0019, F_0020, D_0001, F_0021, F_0022, F_0023, F_0024, F_0025, F_0026, F_0027, F_0028, F_0029, 

src/d/d_stage.cpp

@@ -1962,9 +1962,9 @@ static int dStage_roomReadInit(dStage_dt_c* i_stage, void* i_data, int param_2,
     i_stage->setRoom(p_node);
 
     for (int i = 0; i < p_node->num; i++) {
-        if ((int)rtbl[i] < 0x80000000) {
-            rtbl[i] = (roomRead_data_class*)((int)rtbl[i] + (int)param_3);
-            rtbl[i]->m_rooms = (u8*)((int)rtbl[i]->m_rooms + (int)param_3);
+        if ((intptr_t)rtbl[i] < 0x80000000) {
+            rtbl[i] = (roomRead_data_class*)((intptr_t)rtbl[i] + (intptr_t)param_3);
+            rtbl[i]->m_rooms = (u8*)((intptr_t)rtbl[i]->m_rooms + (intptr_t)param_3);
         }
     }
 

src/dolphin/G2D/G2D.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/gx.h>
 #include <dolphin/G2D.h>
 #include "fake_tgmath.h"

src/dolphin/am/am.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/am.h>
 
 #include "__am.h"

src/dolphin/amcnotstub/amcnotstub.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 
 // this file is a stub.
 DECL_WEAK int AMC_IsStub(void);

src/dolphin/amcstubs/AmcExi2Stubs.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/amc/AmcExi2Comm.h>
 
 // prototypes

src/dolphin/ar/ar.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ar.h>
 #include "fake_tgmath.h"
 

src/dolphin/ar/arq.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ar.h>
 
 #include "__ar.h"

src/dolphin/ax/AX.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 
 #include "__ax.h"

src/dolphin/ax/AXAlloc.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 
 #include "__ax.h"

src/dolphin/ax/AXAux.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 
 #include "__ax.h"

src/dolphin/ax/AXCL.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 
 #include "__ax.h"

src/dolphin/ax/AXComp.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 
 #include "__ax.h"

src/dolphin/ax/AXOut.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/dsp.h>
 #include <dolphin/ax.h>
 

src/dolphin/ax/AXProf.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 
 #include "__ax.h"

src/dolphin/ax/AXSPB.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 
 #include "__ax.h"

src/dolphin/ax/AXVPB.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 #include "fake_tgmath.h"
 

src/dolphin/ax/DSPCode.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 
 u16 axDspSlaveLength = (AX_DSP_SLAVE_LENGTH * 2);

src/dolphin/axfx/axfx.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 
 static void* __AXFXAllocFunction(u32 bytes) {

src/dolphin/axfx/chorus.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 #include <dolphin/axfx.h>
 

src/dolphin/axfx/delay.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 #include <dolphin/axfx.h>
 

src/dolphin/axfx/reverb_hi.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 #include <dolphin/axfx.h>
 #include "fake_tgmath.h"

src/dolphin/axfx/reverb_hi_4ch.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 #include <dolphin/axfx.h>
 #include "fake_tgmath.h"

src/dolphin/axfx/reverb_std.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 #include <dolphin/axfx.h>
 #include "fake_tgmath.h"

src/dolphin/base/PPCArch.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/base/PPCArch.h>
 
 asm u32 PPCMfmsr() {

src/dolphin/base/PPCPm.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/base/PPCArch.h>
 
 void PMBegin(void) {

src/dolphin/card/CARDStatEx.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/card.h>
 
 #include "__card.h"

src/dolphin/card/CARDUnlock.c

@@ -1,5 +1,5 @@
 #include <stdlib.h>
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/card.h>
 
 #include "__card.h"

src/dolphin/demo/DEMOAVX.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/gx.h>
 #include <dolphin/demo.h>
 #include "fake_tgmath.h"

src/dolphin/demo/DEMOFont.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/demo.h>
 
 u32 DEMOFontBitmap[768] ATTRIBUTE_ALIGN(32) = {

src/dolphin/demo/DEMOInit.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/pad.h>
 #include <dolphin/gx.h>
 #include <dolphin/vi.h>

src/dolphin/demo/DEMOPad.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/pad.h>
 #include <dolphin/demo.h>
 

src/dolphin/demo/DEMOPuts.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/gx.h>
 #include <dolphin/demo.h>
 #include <dolphin/mtx.h>

src/dolphin/demo/DEMOStats.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/gx.h>
 #include <dolphin/demo.h>
 

src/dolphin/demo/DEMOWin.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/gx.h>
 #include <dolphin/demo.h>
 

src/dolphin/dsp/dsp.c

@@ -1,5 +1,5 @@
 #include <stddef.h>
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/hw_regs.h>
 
 #include "__dsp.h"

src/dolphin/dsp/dsp_task.c

@@ -1,6 +1,6 @@
 #include <stddef.h>
 
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/hw_regs.h>
 
 #include "__dsp.h"

src/dolphin/dvd/dvd.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 #include <dolphin/dvd.h>
 

src/dolphin/dvd/dvdFatal.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/dvd.h>
 
 #include "__dvd.h"

src/dolphin/dvd/dvderror.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 #include <dolphin/dvd.h>
 

src/dolphin/dvd/dvdfs.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/dvd.h>
 
 #include "__dvd.h"

src/dolphin/dvd/dvdidutils.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/dvd.h>
 
 #include "__dvd.h"

src/dolphin/dvd/dvdlow.c

@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/dvd.h>
 
 #include "__dvd.h"